chore: bump libsession-util and use own fork for now

Author: Bilb

.gitattributes

@@ -2,5 +2,8 @@
 .github export-ignore
 libsession-util/external/libsodium-internal/test export-ignore
 libsession-util/external/zstd/doc export-ignore
+libsession-util/external/zstd/tests export-ignore
 libsession-util/tests export-ignore
-libsession-util/external/oxen-encoding/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,61 @@
+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 for macos
+        if: runner.os == 'macOS'
+        shell: bash
+        run: |
+          export SDKROOT="$(xcrun --sdk macosx --show-sdk-path)" && yarn install --frozen-lockfile --network-timeout 600000
+
+      - name: build libsession-util-nodejs for others
+        shell: bash
+        if: runner.os != 'macOS'
+        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

BUILDING.md

@@ -1,5 +1,5 @@
 # Building instructions
 
-    pnpm install
+    yarn install
 
-For more advanced/customized builds, you may want to invoke `pnpm cmake-js ...` directly.
+For more advanced/customized builds, you may want to invoke `yarn cmake-js ...` directly.

CMakeLists.txt

@@ -1,11 +1,22 @@
 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)
@@ -15,6 +26,7 @@ file(GLOB SOURCE_FILES src/*.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 pnpm
+### 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
 
@@ -20,16 +20,16 @@ git clone --recursive [email protected]:oxen-io/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.
-Then, you can quickly compile a non-electron build by running `pnpm cmake-js` from that folder. This is a quick incremental build which can check for C++ compilation errors.
+Then, you can quickly compile a non-electron build by running `yarn cmake-js` from that folder. This is a quick incremental build which can check for C++ compilation errors.
 Once your changes are ready to be tested in the `session-desktop` you can compile an electron build using this command:
 
 ```
-cd [SESSION_DESKTOP_PATH]; rm -rf node_modules/libsession_util_nodejs; cp -R [THIS_PROJECT_PATH] node_modules/libsession_util_nodejs; cd node_modules/libsession_util_nodejs && rm -rf build && pnpm install && cd [SESSION_DESKTOP_PATH] && pnpm build:workers
+cd [SESSION_DESKTOP_PATH]; rm -rf node_modules/libsession_util_nodejs; cp -R [THIS_PROJECT_PATH] node_modules/libsession_util_nodejs; cd node_modules/libsession_util_nodejs && rm -rf build && yarn install && cd [SESSION_DESKTOP_PATH] && yarn build:workers
 ```
 
 Replace `[SESSION_DESKTOP_PATH]` with the full path to your `session-desktop` folder, replace `[THIS_PROJECT_PATH]` with the path to the root of this project folder.
 
-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 `pnpm build:workers` command.
+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.
 
@@ -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
 ```
@@ -62,15 +65,15 @@ And then upload the generated `libsession_util_nodejs-v$PACKAGE_VERSION.tar.gz`
 The git-archive-all relies on the `.gitattributes` to know what to include or exclude.
 
 Once this is done, update the dependency on `session-desktop`.
-Make sure to remove the existing one first (with the include `pnpm remove` below) as you might have messed up your `node_modules` doing the dev instructions.
+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.
 
 ```
-pnpm remove libsession_util_nodejs && pnpm 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/oxen-io/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.
 
-The cmake-js script will be run on the pnpm add and should recompile your latest release of the `libsession-util-nodejs` as part of the build process and as part of the github actions on `session-desktop`.
-You most likely need to recompile the workers to include those new changes: `pnpm worker:utils && pnpm worker:libsession`.
+The cmake-js script will be run on the yarn add and should recompile your latest release of the `libsession-util-nodejs` as part of the build process and as part of the github actions on `session-desktop`.
+You most likely need to recompile the workers to include those new changes: `yarn worker:utils && yarn worker:libsession`.
 
 You should have your changes in the next release!

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

@@ -2,18 +2,14 @@
   "main": "index.js",
   "name": "libsession_util_nodejs",
   "description": "Wrappers for the Session Util Library",
-  "version": "0.3.5",
+  "version": "0.3.16",
   "license": "GPL-3.0",
   "author": {
     "name": "Oxen Project",
     "email": "[email protected]"
   },
-  "config": {
-    "electron": ""
-  },
   "scripts": {
-    "preinstall": "npx only-allow pnpm",
-    "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"