Merge pull request #13 from mpretty-cyro/feature/libQuic-changes

Fixes for libQuic merge

Author: Bilb

.github/workflows/test.yml

@@ -19,7 +19,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-2022, macos-13, ubuntu-20.04]
+        os: [windows-2022, macos-13, ubuntu-22.04]
     env:
       SIGNAL_ENV: production
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -44,12 +44,12 @@ jobs:
         uses: microsoft/[email protected]
         if: runner.os == 'Windows'
 
-      # - name: sed it
-      #   if: runner.os == 'Windows'
-      #   shell: bash
-      #   run: |
-      #     sed -i "s/target_compile_options(oxen-logging-warnings INTERFACE/#target_compile_options(oxen-logging-warnings INTERFACE/" libsession-util/external/oxen-libquic/external/oxen-logging/CMakeLists.txt
-      #     cat libsession-util/external/oxen-libquic/external/oxen-logging/CMakeLists.txt
+      - name: sed it
+        if: runner.os == 'Windows'
+        shell: bash
+        run: |
+          sed -i "s/target_compile_options(oxen-logging-warnings INTERFACE/#target_compile_options(oxen-logging-warnings INTERFACE/" libsession-util/external/oxen-libquic/external/oxen-logging/CMakeLists.txt
+          cat libsession-util/external/oxen-libquic/external/oxen-logging/CMakeLists.txt
 
       - name: build libsession-util-nodejs
         shell: bash

CMakeLists.txt

@@ -31,6 +31,7 @@ SET(WITH_TESTS OFF)
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
+set(ENABLE_ONIONREQ OFF)
 
 # when building from a release of libsession on desktop, it complains that ios-cmake is not up to date
 # as it is not part of the archive. We actually don't care about it on session-desktop

libsession-util

@@ -9,6 +9,7 @@
 #include <unordered_set>
 
 #include "session/config/base.hpp"
+#include "session/logging.hpp"
 #include "session/types.hpp"
 #include "utilities.hpp"
 
@@ -106,6 +107,18 @@ class ConfigBaseImpl {
 
             Napi::Env env = info.Env();
 
+            session::add_logger([env, class_name](auto msg) {
+                std::string toLog =
+                        "libsession-util:" + std::string(class_name) + ": " + std::string(msg) + "\n";
+
+                Napi::Function consoleLog = env.Global()
+                                                    .Get("console")
+                                                    .As<Napi::Object>()
+                                                    .Get("log")
+                                                    .As<Napi::Function>();
+                consoleLog.Call({Napi::String::New(env, toLog)});
+            });
+
             return config;
         });
     }