Merge remote-tracking branch 'upstream/main' into groups-chunk-2

Author: Bilb

.gitattributes

@@ -2,8 +2,8 @@
 .github export-ignore
 libsession-util/external/libsodium-internal/test export-ignore
 libsession-util/external/zstd/doc export-ignore
-libsession-util/tests export-ignore
-libsession-util/external/oxen-encoding/tests export-ignore
 libsession-util/external/zstd/tests export-ignore
+libsession-util/tests export-ignore
 libsession-util/external/nlohmann-json/tests export-ignore
 libsession-util/external/nlohmann-json/docs export-ignore
+libsession-util/external/oxen-encoding/tests export-ignore

.github/workflows/test.yml

@@ -0,0 +1,52 @@
+name: libession-util-nodejs build test
+
+on:
+  push:
+    branches:
+      - main
+      - dev
+
+concurrency:
+  group: ${{ github.workflow }}
+  cancel-in-progress: true
+
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [windows-2022, macos-11, ubuntu-20.04]
+    env:
+      SIGNAL_ENV: production
+      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    steps:
+      - run: git config --global core.autocrlf false
+
+      - name: Checkout git repo
+        uses: actions/checkout@v4
+        with:
+          submodules: 'recursive'
+
+      - name: Install node
+        uses: actions/setup-node@v3
+        with:
+          node-version-file: '.nvmrc'
+
+      - uses: actions/setup-python@v4
+        with:
+          python-version: '3.11'
+
+      - name: Add msbuild to PATH
+        uses: microsoft/[email protected]
+        if: runner.os == 'Windows'
+
+      - name: Setup node for windows
+        if: runner.os == 'Windows'
+        shell: bash
+        run: |
+          yarn global add node-gyp@latest
+
+      - name: build libsession-util-nodejs
+        shell: bash
+        run: yarn install --frozen-lockfile --network-timeout 600000

.gitmodules

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

CMakeLists.txt

@@ -1,11 +1,19 @@
 cmake_minimum_required(VERSION 3.19)
 cmake_policy(SET CMP0091 NEW)
 cmake_policy(SET CMP0042 NEW)
+cmake_policy(SET CMP0069 NEW)
+set(CMAKE_POLICY_DEFAULT_CMP0069 NEW)
+
+set(VERBOSE ON)
+
 add_definitions(-DNAPI_VERSION=8)
+set(CMAKE_CONFIGURATION_TYPES Release)
 
 project(libsession_util_nodejs LANGUAGES CXX)
 
 SET(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+SET(CMAKE_BUILD_TYPE Release)
+SET(WITH_TESTS OFF)
 
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
@@ -19,6 +27,7 @@ file(GLOB SOURCE_FILES src/*.cpp src/groups/*.cpp src/multi_encrypt/*.cpp)
 
 add_subdirectory(libsession-util)
 
+
 if(MSVC)
   # Windows is horrible
   add_compile_definitions(NOMINMAX)

Readme.md

@@ -2,7 +2,7 @@
 
 This library is the wrappers around libsession-util for NodeJS. It is built using the [node-addon-api](https://github.com/nodejs/node-addon-api) and [cmake-js](https://github.com/cmake-js/cmake-js). The build and dev instructions are quite custom, so check them out below.
 
-### Issue with Yarn
+### Issue with yarn
 
 The yarn package manager (used on session-desktop) does understand what is a git url in a dependency as part of a package.json file, but won't do a full clone including submodules when forking such a repository. For more details, see https://github.com/yarnpkg/yarn/issues/1488
 
@@ -51,9 +51,12 @@ git commit
 git push upstream main
 # Make sure you do the steps above, otherwise the tag won't be on the right commit with the `gh release create`
 
+virtualenv venv
+source venv/bin/activate
 pip install git-archive-all
 PACKAGE_VERSION=$(cat package.json | grep version | head -1 | awk -F: '{ print $2 }' | sed 's/[", ]//g')
-git-archive-all libsession_util_nodejs-v$PACKAGE_VERSION.tar.gz
+echo $PACKAGE_VERSION
+python3 build_release_archive.py libsession_util_nodejs-v$PACKAGE_VERSION.tar.gz
 gh release create v$PACKAGE_VERSION -t v$PACKAGE_VERSION --latest --generate-notes
 gh release upload v$PACKAGE_VERSION libsession_util_nodejs-v$PACKAGE_VERSION.tar.gz
 ```

build_release_archive.py

@@ -0,0 +1,7 @@
+#!/usr/bin/python3
+# -*- coding: utf-8 -*-
+import sys
+from git_archive_all import main
+
+sys.exit(main())
+

libsession-util

@@ -9,7 +9,7 @@
     "email": "[email protected]"
   },
   "scripts": {
-    "install": "cmake-js compile --runtime=electron --runtime-version=25.8.4 -p16"
+    "install": "cmake-js compile --runtime=electron --runtime-version=25.8.4 -p16 --CDSUBMODULE_CHECK=OFF --CDLOCAL_MIRROR=https://oxen.rocks/deps --CDENABLE_ONIONREQ=OFF"
   },
   "devDependencies": {
     "clang-format": "^1.8.0"

package.json

@@ -101,7 +101,24 @@ class ConfigBaseImpl {
             if (!second.IsEmpty() && !second.IsNull() && !second.IsUndefined())
                 dump = toCppBufferView(second, class_name + ".new");
 
-            return std::make_shared<Config>(secretKey, dump);
+            // return std::make_shared<Config>(secretKey, dump);
+            std::shared_ptr<Config> config = std::make_shared<Config>(secretKey, dump);
+
+            Napi::Env env = info.Env();
+
+            config->logger = [env, class_name](session::config::LogLevel, std::string_view x) {
+                std::string toLog =
+                        "libsession-util:" + std::string(class_name) + ": " + std::string(x) + "\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;
         });
     }
 

src/base_config.hpp

@@ -248,7 +248,7 @@ has-unicode@^2.0.1:
   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
   integrity sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==
 
-hasown@^2.0.0:
+hasown@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.2.tgz#003eaf91be7adc372e84ec59dc37252cedb80003"
   integrity sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==
@@ -274,11 +274,11 @@ ini@~1.3.0:
   integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
 
 is-core-module@^2.13.0:
-  version "2.13.1"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.13.1.tgz#ad0d7532c6fea9da1ebdc82742d74525c6273384"
-  integrity sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==
+  version "2.14.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.14.0.tgz#43b8ef9f46a6a08888db67b1ffd4ec9e3dfd59d1"
+  integrity sha512-a5dFJih5ZLYlRtDc0dZWP7RiKr6xIKzmn/oAYCDvdLThadVgyJwlaoQPmRtMSpz+rk0OGAgIu+TcM9HUF0fk1A==
   dependencies:
-    hasown "^2.0.0"
+    hasown "^2.0.2"
 
 is-fullwidth-code-point@^3.0.0:
   version "3.0.0"