chore: address PR comments and cleanup

Author: Bilb

src/addon.cpp

@@ -11,6 +11,17 @@
 
 Napi::Object InitAll(Napi::Env env, Napi::Object exports) {
     using namespace session::nodeapi;
+
+    session::add_logger([env](std::string_view msg) {
+        std::string toLog = std::string("libsession-util: ") + 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)});
+    });
+
+    // session::logger_set_level_default(session::LogLevel::debug);
+
     ConstantsWrapper::Init(env, exports);
 
     // Group wrappers init

src/base_config.cpp

@@ -48,11 +48,10 @@ Napi::Value ConfigBaseImpl::makeDump(const Napi::CallbackInfo& info) {
 }
 
 void ConfigBaseImpl::confirmPushed(const Napi::CallbackInfo& info) {
-    return wrapResult(info, [&]() {
+    return wrapExceptions(info, [&]() {
         assertInfoLength(info, 1);
         assertIsObject(info[0]);
         auto obj = info[0].As<Napi::Object>();
-
         auto confirmed_pushed_entry = confirm_pushed_entry_from_JS(info.Env(), obj);
 
         get_config<ConfigBase>().confirm_pushed(

src/base_config.hpp

@@ -5,6 +5,7 @@
 
 #include <cassert>
 #include <memory>
+#include <oxen/log.hpp>
 #include <span>
 #include <stdexcept>
 #include <unordered_set>
@@ -101,24 +102,7 @@ class ConfigBaseImpl {
             if (!second.IsEmpty() && !second.IsNull() && !second.IsUndefined())
                 dump = toCppBuffer(second, class_name + ".new");
 
-            // return std::make_shared<Config>(secretKey, dump);
-            std::shared_ptr<Config> config = std::make_shared<Config>(secretKey, dump);
-
-            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;
+            return std::make_shared<Config>(secretKey, dump);
         });
     }
 

src/utilities.cpp

@@ -232,7 +232,6 @@ Napi::Object decrypt_result_to_JS(
 }
 
 confirm_pushed_entry_t confirm_pushed_entry_from_JS(const Napi::Env& env, const Napi::Object& obj) {
-
     auto seqnoJsValue = obj.Get("seqno");
     assertIsNumber(seqnoJsValue, "confirm_pushed_entry_from_JS.seqno");
     int64_t seqno = toCppInteger(seqnoJsValue, "confirm_pushed_entry_from_JS.seqno", false);

types/blinding/blinding.d.ts

@@ -1,4 +1,4 @@
-/// <reference path="../../shared.d.ts" />
+/// <reference path="../shared.d.ts" />
 
 declare module 'libsession_util_nodejs' {
   type BlindingWrapper = {

types/blinding/index.d.ts

@@ -1,2 +1,2 @@
-/// <reference path="../../shared.d.ts" />
+/// <reference path="../shared.d.ts" />
 /// <reference path="./blinding.d.ts" />

types/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference path="./utilities/index.d.ts" />
 /// <reference path="./blinding/index.d.ts" />
 /// <reference path="./groups/index.d.ts" />
 /// <reference path="./multi_encrypt/index.d.ts" />

types/shared.d.ts

@@ -97,7 +97,7 @@ declare module 'libsession_util_nodejs' {
   export type PubkeyType = `05${string}`; // type of a string which starts by the 05 prefixed used for **legacy** closed group and session ids
   export type BlindedPubkeyType = `15${string}`;
 
-  type MakeGroupActionCall<A extends BaseConfigWrapper, B extends keyof A> = [
+  type MakeGroupActionCall<A extends RecordOfFunctions, B extends keyof A> = [
     B,
     ...Parameters<A[B]>
   ]; // all of the groupActionCalls need the pubkey of the group we are targeting

types/utilities/index.d.ts

@@ -0,0 +1,2 @@
+/// <reference path="../shared.d.ts" />
+/// <reference path="./utilities.d.ts" />

types/utilities/utilities.d.ts

@@ -0,0 +1,23 @@
+/// <reference path="../shared.d.ts" />
+
+declare module 'libsession_util_nodejs' {
+  type UtilitiesWrapper = {
+    freeAllWrappers: () => void;
+  };
+
+  /**
+   * To be used inside the web worker only (calls are synchronous and won't work asynchronously)
+   */
+  export class UtilitiesWrapperNode {
+    public static freeAllWrappers: UtilitiesWrapper['freeAllWrappers'];
+  }
+
+  export type UtilitiesWrapperActionsCalls = MakeWrapperActionCalls<UtilitiesWrapper>;
+
+  /**
+   * Those actions are used internally for the web worker communication.
+   * You should never need to import them in Session directly
+   * You will need to add an entry here if you add a new function
+   */
+  export type UtilitiesActionsType = MakeActionCall<UtilitiesWrapper, 'freeAllWrappers'>;
+}