Merge branch 'main' into feat/no-ref/blind_version_sign_request

Author: yougotwill

.github/workflows/test.yml

@@ -4,7 +4,9 @@ on:
   push:
     branches:
       - main
-      - dev
+  pull_request:
+    branches:
+      - main
 
 concurrency:
   group: ${{ github.workflow }}
@@ -13,6 +15,7 @@ concurrency:
 jobs:
   build:
     runs-on: ${{ matrix.os }}
+
     strategy:
       fail-fast: false
       matrix:
@@ -47,6 +50,13 @@ jobs:
         run: |
           yarn global add node-gyp@latest
 
+      # - 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
-        run: yarn install --frozen-lockfile --network-timeout 600000
+        run: yarn install --frozen-lockfile

.gitignore

@@ -9,3 +9,7 @@
 /package-lock.json
 /compile_commands.json
 /.cache
+.yarn/
+*.cjs
+*.mjs
+

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "libsession-util"]
 	path = libsession-util
-	url = https://github.com/oxen-io/libsession-util.git
+	url = https://github.com/session-foundation/libsession-util.git

.yarnrc

@@ -0,0 +1,3 @@
+nodeLinker: node-modules
+
+patchFolder: patches

.yarnrc.yml

@@ -6,6 +6,19 @@ set(CMAKE_POLICY_DEFAULT_CMP0069 NEW)
 
 set(VERBOSE ON)
 
+# Detect the number of processors
+include(ProcessorCount)
+ProcessorCount(N)
+
+# Set a default value in case the detection fails
+if(NOT N EQUAL 0)
+  set(CMAKE_BUILD_PARALLEL_LEVEL ${N})
+else()
+  set(CMAKE_BUILD_PARALLEL_LEVEL 4)  # Fallback to 16 if detection fails
+endif()
+message(STATUS "Number of processors detected: ${N}")
+
+
 add_definitions(-DNAPI_VERSION=8)
 set(CMAKE_CONFIGURATION_TYPES Release)
 
@@ -15,11 +28,15 @@ SET(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 SET(CMAKE_BUILD_TYPE Release)
 SET(WITH_TESTS OFF)
 
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
-file(GLOB SOURCE_FILES src/*.cpp)
+# 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
+set(SUBMODULE_CHECK OFF)
+
+file(GLOB SOURCE_FILES src/*.cpp src/groups/*.cpp src/multi_encrypt/*.cpp)
 
 add_subdirectory(libsession-util)
 
@@ -33,7 +50,7 @@ add_library(${PROJECT_NAME} SHARED ${SOURCE_FILES} ${CMAKE_JS_SRC})
 target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_JS_INC} "node_modules/node-addon-api" "../../node_modules/node-addon-api" "node_modules/node-api-headers/include" "../../node_modules/node-api-headers/include")
 
 set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "" SUFFIX ".node")
-target_link_libraries(${PROJECT_NAME} PRIVATE ${CMAKE_JS_LIB} libsession::config libsession::crypto)
+target_link_libraries(${PROJECT_NAME} PRIVATE ${CMAKE_JS_LIB} ${LIBSESSION_STATIC_BUNDLE_LIBS})
 
 if(MSVC AND CMAKE_JS_NODELIB_DEF AND CMAKE_JS_NODELIB_TARGET)
   # Generate node.lib

CMakeLists.txt

@@ -16,7 +16,7 @@ Clone this project to somewhere **not** part of `session-desktop` node_modules:
 
 ```
 cd [FOLDER_NOT_IN_SESSION_DESKTOP]
-git clone --recursive [email protected]:oxen-io/libsession-util-nodejs.git
+git clone --recursive [email protected]:session-foundation/libsession-util-nodejs.git
 ```
 
 Always do your changes in `[FOLDER_NOT_IN_SESSION_DESKTOP]/libsession-util-nodejs`, never in the one under session-desktop's `node_modules` as you might override your local changes.
@@ -31,7 +31,7 @@ Replace `[SESSION_DESKTOP_PATH]` with the full path to your `session-desktop` fo
 
 Every part of this command is needed and might need to be updated using your paths. Also, the `worker:libsession` needs to be recompiled too to include the just created .node file in itself. This is done by the `yarn build:workers` command.
 
-Note: The `electron` property in the `config` object will need to be updated in the `package.json` every time we update `electron` package in [session-desktop](https://github.com/oxen-io/session-desktop/) so that the versions match. It is a node version, but not part of the official node docs. If you compiled the node module for an incorrect electron/node version you will get an error on `session-desktop` start.
+Note: The `electron` property in the `config` object will need to be updated in the `package.json` every time we update `electron` package in [session-desktop](https://github.com/session-foundation/session-desktop/) so that the versions match. It is a node version, but not part of the official node docs. If you compiled the node module for an incorrect electron/node version you will get an error on `session-desktop` start.
 
 ### Making a Release and updating Session-desktop
 
@@ -71,7 +71,7 @@ Once this is done, update the dependency on `session-desktop`.
 Make sure to remove the existing one first (with the include `yarn remove` below) as you might have messed up your `node_modules` doing the dev instructions.
 
 ```
-yarn remove libsession_util_nodejs && yarn add https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.15/libsession_util_nodejs-v0.1.15.tar.gz
+yarn remove libsession_util_nodejs && yarn add https://github.com/session-foundation/libsession-util-nodejs/releases/download/v0.1.15/libsession_util_nodejs-v0.1.15.tar.gz
 ```
 
 Keep in mind that you need to update the two version numbers (e.g. `0.1.15`) to the just created release version of this project.

README.md

@@ -1,5 +1,4 @@
-/// <reference path="./shared.d.ts" />
-/// <reference path="./user/index.d.ts" />
+
 /// <reference path="./types/index.d.ts" />
 
 declare module 'libsession_util_nodejs' {
@@ -10,7 +9,7 @@ declare module 'libsession_util_nodejs' {
    *  - one side are calls made by the webworker directly to the wrapper
    *  - the other side are calls made by the renderer to the webworker (which should forward them to the wrapper)
    *
-   * We cannot pass unserializable data between those two, so we need to have a serializable way of calling one
+   * We cannot pass non serializable data between those two, so we need to have a serializable way of calling one
    * method of a wrapper with the required arguments.
    * Those serializable data, are `UserConfigActionsType` or just any of the `*ActionsType`. They are defined with a tuple of what each methods accepts on which wrapper with which argument.
    *

index.d.ts

@@ -2,23 +2,24 @@
   "main": "index.js",
   "name": "libsession_util_nodejs",
   "description": "Wrappers for the Session Util Library",
-  "version": "0.3.23",
+  "version": "0.4.5",
   "license": "GPL-3.0",
   "author": {
     "name": "Oxen Project",
     "email": "[email protected]"
   },
   "scripts": {
     "clean": "rimraf .cache build",
-    "install": "cmake-js compile --runtime=electron --runtime-version=25.8.4 -p16 --CDSUBMODULE_CHECK=OFF --CDLOCAL_MIRROR=https://oxen.rocks/deps --CDENABLE_ONIONREQ=OFF"
+    "install": "cmake-js compile --runtime=electron --runtime-version=25.8.4 --CDSUBMODULE_CHECK=OFF --CDLOCAL_MIRROR=https://oxen.rocks/deps --CDENABLE_ONIONREQ=OFF --CDWITH_TESTS=OFF"
   },
   "devDependencies": {
     "clang-format": "^1.8.0",
     "rimraf": "2.6.2"
   },
   "dependencies": {
-    "cmake-js": "^7.2.1",
+    "cmake-js": "7.2.1",
     "node-addon-api": "^6.1.0"
   },
-  "typings": "index.d.ts"
-}
+  "typings": "index.d.ts",
+  "packageManager": "[email protected]"
+}

package.json

@@ -4,19 +4,26 @@
 #include "constants.hpp"
 #include "contacts_config.hpp"
 #include "convo_info_volatile_config.hpp"
+#include "groups/meta_group_wrapper.hpp"
+#include "multi_encrypt/multi_encrypt.hpp"
 #include "user_config.hpp"
 #include "user_groups_config.hpp"
 
 Napi::Object InitAll(Napi::Env env, Napi::Object exports) {
     using namespace session::nodeapi;
-
     ConstantsWrapper::Init(env, exports);
+
+    // Group wrappers init
+    MetaGroupWrapper::Init(env, exports);
+
+    // User wrappers init
     UserConfigWrapper::Init(env, exports);
     ContactsConfigWrapper::Init(env, exports);
     UserGroupsWrapper::Init(env, exports);
     ConvoInfoVolatileWrapper::Init(env, exports);
 
     // Fully static wrappers init
+    MultiEncryptWrapper::Init(env, exports);
     BlindingWrapper::Init(env, exports);
 
     return exports;

shared.d.ts

@@ -15,28 +15,17 @@ Napi::Value ConfigBaseImpl::needsPush(const Napi::CallbackInfo& info) {
     return wrapResult(info, [&] { return get_config<ConfigBase>().needs_push(); });
 }
 
-Napi::Value ConfigBaseImpl::storageNamespace(const Napi::CallbackInfo& info) {
-    return wrapResult(info, [&] {
-        return static_cast<uint16_t>(get_config<ConfigBase>().storage_namespace());
-    });
-}
-
 Napi::Value ConfigBaseImpl::currentHashes(const Napi::CallbackInfo& info) {
     return wrapResult(info, [&] { return (get_config<ConfigBase>().current_hashes()); });
 }
 
 Napi::Value ConfigBaseImpl::push(const Napi::CallbackInfo& info) {
     return wrapResult(info, [&]() {
         assertInfoLength(info, 0);
-        auto [seqno, to_push, hashes] = get_config<ConfigBase>().push();
+        auto& conf = get_config<ConfigBase>();
+        auto to_push = conf.push();
 
-        auto env = info.Env();
-        Napi::Object result = Napi::Object::New(env);
-        result["data"] = toJs(env, to_push);
-        result["seqno"] = toJs(env, seqno);
-        result["hashes"] = toJs(env, hashes);
-
-        return result;
+        return push_result_to_JS(info.Env(), to_push, conf.storage_namespace());
     });
 }
 
@@ -47,10 +36,17 @@ Napi::Value ConfigBaseImpl::dump(const Napi::CallbackInfo& info) {
     });
 }
 
+Napi::Value ConfigBaseImpl::makeDump(const Napi::CallbackInfo& info) {
+    return wrapResult(info, [&]() {
+        assertInfoLength(info, 0);
+        return get_config<ConfigBase>().make_dump();
+    });
+}
+
 void ConfigBaseImpl::confirmPushed(const Napi::CallbackInfo& info) {
     return wrapResult(info, [&]() {
         assertInfoLength(info, 2);
-        assertIsNumber(info[0]);
+        assertIsNumber(info[0], "confirmPushed");
         assertIsString(info[1]);
 
         get_config<ConfigBase>().confirm_pushed(