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

Author: Bilb

.github/workflows/test.yml

@@ -20,8 +20,7 @@ jobs:
 
 
       matrix:
-        os: [windows-latest, macos-latest, ubuntu-latest]
-
+        os: [windows-2022, macos-12, ubuntu-20.04]
     env:
       SIGNAL_ENV: production
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -1,6 +1,9 @@
-/build/
-/.vscode/
+# ide files
 /.vscrof/
+/.vscode/
+/.idea/
+
+/build/
 /node_modules/
 /*.tar.gz
 /package-lock.json

.gitmodules

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

CMakeLists.txt

@@ -47,7 +47,7 @@ if(MSVC)
 endif()
 
 add_library(${PROJECT_NAME} SHARED ${SOURCE_FILES} ${CMAKE_JS_SRC})
-target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_JS_INC} "src/" "node_modules/node-addon-api" "../../node_modules/node-addon-api")
+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_STATIC_BUNDLE_LIBS})

Readme.md renamed to README.md

@@ -35,12 +35,15 @@ Note: The `electron` property in the `config` object will need to be updated in
 
 ### Making a Release and updating Session-desktop
 
-First, make sure all your changes are commited and pushed to the `libsession-util-nodejs` project from your `[FOLDER_NOT_IN_SESSION_DESKTOP]` folder.
-Then, bump the version in the package.json of the nodejs wrapper.
+1. First, make sure all your changes are commited and pushed to the `libsession-util-nodejs` project from your `[FOLDER_NOT_IN_SESSION_DESKTOP]` folder.
 
-- A **patch** version bump is required only if you have changed the implementation of an existing function or doing a hot fix for libsession version used by `session-desktop`.
+2. Then make sure the `libsession-util` is using the latest `dev` branch (unless there is a reason not to).
 
-- A **minor** version bump is required if you have added a new function or changed the signature of an existing one.
+3. Then, bump the version in the package.json of the nodejs wrapper.
+
+   - A **patch** version bump is required only if you have changed the implementation of an existing function or doing a hot fix for libsession version used by `session-desktop`.
+
+   - A **minor** version bump is required if you have added a new function or changed the signature of an existing one.
 
 Then, run these commands:
 

index.d.ts

@@ -1,7 +1,5 @@
-/// <reference path="./types/shared.d.ts" />
-/// <reference path="./types/user/index.d.ts" />
-/// <reference path="./types/groups/index.d.ts" />
-/// <reference path="./types/multi_encrypt/index.d.ts" />
+
+/// <reference path="./types/index.d.ts" />
 
 declare module 'libsession_util_nodejs' {
   /**
@@ -11,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.
    *

package.json

@@ -9,10 +9,12 @@
     "email": "[email protected]"
   },
   "scripts": {
-    "install": "cmake-js compile --runtime=electron --runtime-version=25.8.4  --CDLOCAL_MIRROR=https://oxen.rocks/deps --CDENABLE_ONIONREQ=OFF --CDWITH_TESTS=OFF"
+    "clean": "rimraf .cache build",
+    "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"
+    "clang-format": "^1.8.0",
+    "rimraf": "2.6.2"
   },
   "dependencies": {
     "cmake-js": "7.2.1",

src/addon.cpp

@@ -1,5 +1,7 @@
 #include <napi.h>
 
+#include "blinding/blinding.hpp"
+#include "constants.hpp"
 #include "contacts_config.hpp"
 #include "convo_info_volatile_config.hpp"
 #include "groups/meta_group_wrapper.hpp"
@@ -9,6 +11,8 @@
 
 Napi::Object InitAll(Napi::Env env, Napi::Object exports) {
     using namespace session::nodeapi;
+    ConstantsWrapper::Init(env, exports);
+
     // Group wrappers init
     MetaGroupWrapper::Init(env, exports);
 
@@ -20,6 +24,7 @@ Napi::Object InitAll(Napi::Env env, Napi::Object exports) {
 
     // Fully static wrappers init
     MultiEncryptWrapper::Init(env, exports);
+    BlindingWrapper::Init(env, exports);
 
     return exports;
 }

src/blinding/blinding.hpp

@@ -0,0 +1,93 @@
+#pragma once
+
+#include <napi.h>
+
+#include <algorithm>
+
+#include "../meta/meta_base_wrapper.hpp"
+#include "../utilities.hpp"
+#include "oxenc/hex.h"
+#include "session/blinding.hpp"
+#include "session/config/user_profile.hpp"
+#include "session/platform.hpp"
+#include "session/random.hpp"
+
+namespace session::nodeapi {
+
+class BlindingWrapper : public Napi::ObjectWrap<BlindingWrapper> {
+
+  public:
+    BlindingWrapper(const Napi::CallbackInfo& info) : Napi::ObjectWrap<BlindingWrapper>{info} {
+        throw std::invalid_argument(
+                "BlindingWrapper is all static and don't need to be constructed");
+    }
+
+    static void Init(Napi::Env env, Napi::Object exports) {
+        MetaBaseWrapper::NoBaseClassInitHelper<BlindingWrapper>(
+                env,
+                exports,
+                "BlindingWrapperNode",
+                {
+                        StaticMethod<&BlindingWrapper::blindVersionPubkey>(
+                                "blindVersionPubkey",
+                                static_cast<napi_property_attributes>(
+                                        napi_writable | napi_configurable)),
+                        StaticMethod<&BlindingWrapper::blindVersionSign>(
+                                "blindVersionSign",
+                                static_cast<napi_property_attributes>(
+                                        napi_writable | napi_configurable)),
+
+                });
+    }
+
+  private:
+    static Napi::Value blindVersionPubkey(const Napi::CallbackInfo& info) {
+        return wrapResult(info, [&] {
+            assertInfoLength(info, 1);
+            assertIsObject(info[0]);
+            auto obj = info[0].As<Napi::Object>();
+
+            if (obj.IsEmpty())
+                throw std::invalid_argument("blindVersionPubkey received empty");
+
+            assertIsUInt8Array(obj.Get("ed25519SecretKey"), "BlindingWrapper::blindVersionPubkey");
+            auto ed25519_secret_key =
+                    toCppBuffer(obj.Get("ed25519SecretKey"), "blindVersionPubkey.ed25519SecretKey");
+
+            auto keypair = session::blind_version_key_pair(ed25519_secret_key);
+            session::uc32 pk_arr = std::get<0>(keypair);
+            ustring blinded_pk = session::ustring(
+                    session::to_unsigned_sv(std::string(pk_arr.begin(), pk_arr.end())));
+            std::string blinded_pk_hex;
+            blinded_pk_hex.reserve(66);
+            blinded_pk_hex += "07";
+            oxenc::to_hex(blinded_pk.begin(), blinded_pk.end(), std::back_inserter(blinded_pk_hex));
+
+            return blinded_pk_hex;
+        });
+    };
+
+    static Napi::Value blindVersionSign(const Napi::CallbackInfo& info) {
+        return wrapResult(info, [&] {
+            assertInfoLength(info, 1);
+            assertIsObject(info[0]);
+            auto obj = info[0].As<Napi::Object>();
+
+            if (obj.IsEmpty())
+                throw std::invalid_argument("blindVersionSign received empty");
+
+            assertIsUInt8Array(obj.Get("ed25519SecretKey"), "BlindingWrapper::blindVersionSign");
+            auto ed25519_secret_key =
+                    toCppBuffer(obj.Get("ed25519SecretKey"), "blindVersionSign.ed25519SecretKey");
+
+            assertIsNumber(obj.Get("sigTimestampSeconds"), "BlindingWrapper::blindVersionSign");
+            auto sig_timestamp = toCppInteger(
+                    obj.Get("sigTimestampSeconds"), "blindVersionSign.sigTimestampSeconds", false);
+
+            return session::blind_version_sign(
+                    ed25519_secret_key, Platform::desktop, sig_timestamp);
+        });
+    };
+};
+
+}  // namespace session::nodeapi

src/constants.cpp

@@ -0,0 +1,40 @@
+#include "constants.hpp"
+
+#include "session/config/contacts.hpp"
+#include "session/config/groups/info.hpp"
+#include "session/config/user_groups.hpp"
+
+namespace session::nodeapi {
+ConstantsWrapper::ConstantsWrapper(const Napi::CallbackInfo& info) :
+        Napi::ObjectWrap<ConstantsWrapper>(info) {}
+
+Napi::Object ConstantsWrapper::Init(Napi::Env env, Napi::Object exports) {
+    const char* class_name = "CONSTANTS";
+
+    // construct javascript constants object
+    Napi::Function cls = DefineClass(
+            env,
+            class_name,
+            {ObjectWrap::StaticValue(
+                     "CONTACT_MAX_NAME_LENGTH",
+                     Napi::Number::New(env, session::config::contact_info::MAX_NAME_LENGTH),
+                     napi_enumerable),
+             ObjectWrap::StaticValue(
+                     "BASE_GROUP_MAX_NAME_LENGTH",
+                     Napi::Number::New(env, session::config::base_group_info::NAME_MAX_LENGTH),
+                     napi_enumerable),
+             ObjectWrap::StaticValue(
+                     "GROUP_INFO_MAX_NAME_LENGTH",
+                     Napi::Number::New(env, session::config::groups::Info::NAME_MAX_LENGTH),
+                     napi_enumerable),
+             ObjectWrap::StaticValue(
+                     "COMMUNITY_FULL_URL_MAX_LENGTH",
+                     Napi::Number::New(env, session::config::community::FULL_URL_MAX_LENGTH),
+                     napi_enumerable)});
+
+    // export object as javascript module
+    exports.Set(class_name, cls);
+    return exports;
+}
+
+}  // namespace session::nodeapi