Merge pull request #27 from Bilb/enable-logging-back

chore: enable logging back to console.log

Author: Bilb

.github/workflows/test.yml

@@ -19,7 +19,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-2022, macos-13, ubuntu-22.04]
+        os: [windows-2022, macos-13, macos-14, ubuntu-22.04]
     env:
       SIGNAL_ENV: production
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

package.json

@@ -2,7 +2,7 @@
   "main": "index.js",
   "name": "libsession_util_nodejs",
   "description": "Wrappers for the Session Util Library",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "license": "GPL-3.0",
   "author": {
     "name": "Oxen Project",

src/addon.cpp

@@ -11,47 +11,35 @@
 #include "user_config.hpp"
 #include "user_groups_config.hpp"
 
-/**
- * Note: After days of trying to get the libsession-util logger to play nice with console.log,
- * I've decided to just not log anything from libsession for now.
- * Note for my future self:
- * - we need a thread-safe function to be called in the add_logger callback here because if
- *   the `env` is not valid it will crash the whole app without an error at all,
- * - macos crashes a lot more easily than linux, so better to debug this issue on macOS,
- * - using the thread-safe function below is working for linux, and kind of working for macOS, but
- *   it also prevents the normal logging from being written to the inspector (macOS only)
- *
- * For all those reasons, and because we want a point release soon, there is no logging from
- * libsession-util for now.
- */
-// Napi::ThreadSafeFunction tsfn;
-// tsfn = Napi::ThreadSafeFunction::New(
-//         env,
-//         Napi::Function::New(env, [](const Napi::CallbackInfo& info) {}),
-//         "LoggerCallback",
-//         0,
-//         1);
-
-// session::add_logger([](std::string_view msg) {
-//     tsfn.BlockingCall(
-//             new std::string(msg),
-//             [](Napi::Env env, Napi::Function jsCallback, std::string* msg) {
-//                 Napi::HandleScope scope(env);
-//                 Napi::Function consoleLog = env.Global()
-//                                                     .Get("console")
-//                                                     .As<Napi::Object>()
-//                                                     .Get("log")
-//                                                     .As<Napi::Function>();
-//                 Napi::String jsStr = Napi::String::New(env, "libsession-util: " + *msg);
-//                 consoleLog.Call({jsStr});
-//                 delete msg;
-//             });
-// });
-// oxen::log::set_level_default(oxen::log::Level::info);
+Napi::ThreadSafeFunction tsfn;
 
 Napi::Object InitAll(Napi::Env env, Napi::Object exports) {
     using namespace session::nodeapi;
 
+    tsfn = Napi::ThreadSafeFunction::New(
+            env,
+            Napi::Function::New(env, [](const Napi::CallbackInfo& info) {}),
+            "LoggerCallback",
+            0,
+            1);
+
+    session::add_logger([](std::string_view msg) {
+        tsfn.BlockingCall(
+                new std::string(msg),
+                [](Napi::Env env, Napi::Function jsCallback, std::string* msg) {
+                    Napi::HandleScope scope(env);
+                    Napi::Function consoleLog = env.Global()
+                                                        .Get("console")
+                                                        .As<Napi::Object>()
+                                                        .Get("log")
+                                                        .As<Napi::Function>();
+                    Napi::String jsStr = Napi::String::New(env, "libsession-util: " + *msg);
+                    consoleLog.Call({jsStr});
+                    delete msg;
+                });
+    });
+    oxen::log::set_level_default(oxen::log::Level::info);
+
     ConstantsWrapper::Init(env, exports);
 
     // Group wrappers init