add libsession encrypt/decrypt with pro proof

.github/workflows/test.yml

@@ -4,9 +4,11 @@ on:
   push:
     branches:
       - main
+      - feat-add-pro-backend-fns
   pull_request:
     branches:
       - main
+      - feat-add-pro-backend-fns
 
 concurrency:
   group: ${{ github.workflow }}
@@ -19,7 +21,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-2022, macos-13, macos-14, ubuntu-22.04]
+        os: [windows-2022, macos-13, macos-14, ubuntu-24.04]
     env:
       SIGNAL_ENV: production
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -29,16 +31,21 @@ jobs:
       - name: Checkout git repo
         uses: actions/checkout@v4
         with:
-          submodules: 'recursive'
+          submodules: "recursive"
+
+      - name: Install correct clang versions
+        if: runner.os == 'Linux'
+        run: sudo apt update && sudo apt search clang && sudo apt install clang-format-19 #clang-tidy-19
+        shell: bash
 
       - name: Install node
         uses: actions/setup-node@v3
         with:
-          node-version-file: '.nvmrc'
+          node-version-file: ".nvmrc"
 
       - uses: actions/setup-python@v4
         with:
-          python-version: '3.11'
+          python-version: "3.11"
 
       - name: Add msbuild to PATH
         uses: microsoft/setup-msbuild@v1.3.1
@@ -48,7 +55,15 @@ jobs:
         shell: bash
         run: yarn update_version
 
-
       - name: build libsession-util-nodejs
         shell: bash
         run: yarn install --frozen-lockfile
+
+      - name: Check formatting
+        if: runner.os == 'Linux'
+        run: clang-format-19 --dry-run --Werror src/*.cpp include/*.hpp src/**/*.cpp include/**/*.hpp
+        shell: bash
+
+      # - name: Run clang-tidy
+      #   run: clang-tidy-19 -p build src/*.cpp include/*.hpp src/**/*.cpp include/**/*.hpp
+      #   shell: bash

CMakeLists.txt

@@ -37,18 +37,17 @@ set(ENABLE_ONIONREQ OFF)
 # 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)
+file(GLOB SOURCE_FILES src/*.cpp src/groups/*.cpp src/encrypt_decrypt/*.cpp src/pro/*.cpp src/meta/*.cpp )
 
 add_subdirectory(libsession-util)
 
-
 if(MSVC)
   # Windows is horrible
   add_compile_definitions(NOMINMAX)
 endif()
 
 add_library(${PROJECT_NAME} SHARED ${SOURCE_FILES} ${CMAKE_JS_SRC})
-target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_JS_INC} "include/" "node_modules/node-addon-api" "../../node_modules/node-addon-api" "node_modules/node-api-headers/include" "../../node_modules/node-api-headers/include")
+target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_JS_INC} "include/" "${CMAKE_CURRENT_SOURCE_DIR}/node_modules/node-addon-api" "${CMAKE_CURRENT_SOURCE_DIR}/node_modules" "${CMAKE_CURRENT_SOURCE_DIR}/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})

include/base_config.hpp

@@ -6,13 +6,10 @@
 #include <cassert>
 #include <memory>
 #include <oxen/log.hpp>
-#include <span>
 #include <stdexcept>
 #include <unordered_set>
 
 #include "session/config/base.hpp"
-#include "session/logging.hpp"
-#include "session/types.hpp"
 #include "utilities.hpp"
 
 namespace session::nodeapi {

include/encrypt_decrypt/encrypt_decrypt.hpp

@@ -0,0 +1,111 @@
+#pragma once
+
+#include <napi.h>
+#include <oxenc/base64.h>
+#include <oxenc/hex.h>
+
+#include "meta/meta_base_wrapper.hpp"
+
+namespace session::nodeapi {
+
+class MultiEncryptWrapper : public Napi::ObjectWrap<MultiEncryptWrapper> {
+  public:
+    MultiEncryptWrapper(const Napi::CallbackInfo& info) :
+            Napi::ObjectWrap<MultiEncryptWrapper>{info} {
+        throw std::invalid_argument(
+                "MultiEncryptWrapper is static and doesn't need to be constructed");
+    }
+
+    static void Init(Napi::Env env, Napi::Object exports) {
+        MetaBaseWrapper::NoBaseClassInitHelper<MultiEncryptWrapper>(
+                env,
+                exports,
+                "MultiEncryptWrapperNode",
+                {
+                        StaticMethod<&MultiEncryptWrapper::multiEncrypt>(
+                                "multiEncrypt",
+                                static_cast<napi_property_attributes>(
+                                        napi_writable | napi_configurable)),
+                        StaticMethod<&MultiEncryptWrapper::multiDecryptEd25519>(
+                                "multiDecryptEd25519",
+                                static_cast<napi_property_attributes>(
+                                        napi_writable | napi_configurable)),
+                        // Attachments encrypt/decrypt
+                        StaticMethod<&MultiEncryptWrapper::attachmentDecrypt>(
+                                "attachmentDecrypt",
+                                static_cast<napi_property_attributes>(
+                                        napi_writable | napi_configurable)),
+                        StaticMethod<&MultiEncryptWrapper::attachmentEncrypt>(
+                                "attachmentEncrypt",
+                                static_cast<napi_property_attributes>(
+                                        napi_writable | napi_configurable)),
+
+                        // Destination encrypt
+                        StaticMethod<&MultiEncryptWrapper::encryptFor1o1>(
+                                "encryptFor1o1",
+                                static_cast<napi_property_attributes>(
+                                        napi_writable | napi_configurable)),
+
+                        StaticMethod<&MultiEncryptWrapper::encryptForCommunity>(
+                                "encryptForCommunity",
+                                static_cast<napi_property_attributes>(
+                                        napi_writable | napi_configurable)),
+                        StaticMethod<&MultiEncryptWrapper::encryptForCommunityInbox>(
+                                "encryptForCommunityInbox",
+                                static_cast<napi_property_attributes>(
+                                        napi_writable | napi_configurable)),
+                        StaticMethod<&MultiEncryptWrapper::encryptForGroup>(
+                                "encryptForGroup",
+                                static_cast<napi_property_attributes>(
+                                        napi_writable | napi_configurable)),
+
+                        // Destination decrypt
+                        StaticMethod<&MultiEncryptWrapper::decryptForCommunity>(
+                                "decryptForCommunity",
+                                static_cast<napi_property_attributes>(
+                                        napi_writable | napi_configurable)),
+                        StaticMethod<&MultiEncryptWrapper::decryptFor1o1>(
+                                "decryptFor1o1",
+                                static_cast<napi_property_attributes>(
+                                        napi_writable | napi_configurable)),
+                        StaticMethod<&MultiEncryptWrapper::decryptForGroup>(
+                                "decryptForGroup",
+                                static_cast<napi_property_attributes>(
+                                        napi_writable | napi_configurable)),
+                });
+    }
+
+  private:
+    static Napi::Value multiEncrypt(const Napi::CallbackInfo& info);
+    static Napi::Value multiDecryptEd25519(const Napi::CallbackInfo& info);
+
+    /**
+     * ===========================================
+     * =========== ATTACHMENTS CALLS =============
+     * ===========================================
+     */
+
+    static Napi::Value attachmentEncrypt(const Napi::CallbackInfo& info);
+    static Napi::Value attachmentDecrypt(const Napi::CallbackInfo& info);
+
+    /**
+     * ===========================================
+     * ============= ENCRYPT CALLS ===============
+     * ===========================================
+     */
+
+    static Napi::Value encryptFor1o1(const Napi::CallbackInfo& info);
+    static Napi::Value encryptForCommunityInbox(const Napi::CallbackInfo& info);
+    static Napi::Value encryptForCommunity(const Napi::CallbackInfo& info);
+    static Napi::Value encryptForGroup(const Napi::CallbackInfo& info);
+    /**
+     * ===========================================
+     * ============= DECRYPT CALLS ===============
+     * ===========================================
+     */
+
+    static Napi::Value decryptForCommunity(const Napi::CallbackInfo& info);
+    static Napi::Value decryptFor1o1(const Napi::CallbackInfo& info);
+    static Napi::Value decryptForGroup(const Napi::CallbackInfo& info);
+};
+};  // namespace session::nodeapi

include/groups/meta_group.hpp

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <napi.h>
+
 #include <vector>
 
 #include "session/config/groups/info.hpp"
@@ -35,7 +36,10 @@ class MetaGroup {
             shared_ptr<config::groups::Keys> keys,
             std::vector<unsigned char> edGroupPubKey,
             std::optional<std::vector<unsigned char>> edGroupSecKey) :
-            info{info}, members{members}, keys{keys}, edGroupPubKey{oxenc::to_hex(edGroupPubKey.begin(), edGroupPubKey.end())} {
+            info{info},
+            members{members},
+            keys{keys},
+            edGroupPubKey{oxenc::to_hex(edGroupPubKey.begin(), edGroupPubKey.end())} {
 
         if (edGroupSecKey.has_value()) {
             this->edGroupSecKey = oxenc::to_hex(edGroupSecKey->begin(), edGroupSecKey->end());

include/groups/meta_group_wrapper.hpp

@@ -80,6 +80,7 @@ class MetaGroupWrapper : public Napi::ObjectWrap<MetaGroupWrapper> {
     Napi::Value keysNeedsRekey(const Napi::CallbackInfo& info);
     Napi::Value keyRekey(const Napi::CallbackInfo& info);
     Napi::Value keyGetAll(const Napi::CallbackInfo& info);
+    Napi::Value keyGetEncryptionKeyHex(const Napi::CallbackInfo& info);
     Napi::Value loadKeyMessage(const Napi::CallbackInfo& info);
     Napi::Value keyGetCurrentGen(const Napi::CallbackInfo& info);
     Napi::Value activeHashes(const Napi::CallbackInfo& info);

include/meta/meta_base_wrapper.hpp

@@ -2,18 +2,18 @@
 
 #include <napi.h>
 
-#include <optional>
-#include <span>
+#include <memory>
 #include <vector>
 
 #include "../base_config.hpp"
-#include "../groups/meta_group.hpp"
+#include "groups/meta_group.hpp"
+
 namespace session::nodeapi {
 
 class MetaBaseWrapper {
 
   public:
-    explicit MetaBaseWrapper(){};
+    explicit MetaBaseWrapper() {};
 
     virtual ~MetaBaseWrapper() = default;
 
@@ -35,86 +35,7 @@ class MetaBaseWrapper {
     }
 
     static std::unique_ptr<session::nodeapi::MetaGroup> constructGroupWrapper(
-            const Napi::CallbackInfo& info, const std::string& class_name) {
-        return wrapExceptions(info, [&] {
-            if (!info.IsConstructCall())
-                throw std::invalid_argument{
-                        "You need to call the constructor with the `new` syntax"};
-
-            assertInfoLength(info, 1);
-            auto arg = info[0];
-            assertIsObject(arg);
-            auto obj = arg.As<Napi::Object>();
-
-            if (obj.IsEmpty())
-                throw std::invalid_argument("constructGroupWrapper received empty");
-
-            assertIsUInt8Array(obj.Get("userEd25519Secretkey"), "constructGroupWrapper userEd");
-            auto user_ed25519_secretkey = toCppBuffer(
-                    obj.Get("userEd25519Secretkey"),
-                    class_name + ":constructGroupWrapper.userEd25519Secretkey");
-
-            assertIsUInt8Array(obj.Get("groupEd25519Pubkey"), "constructGroupWrapper groupEd");
-            auto group_ed25519_pubkey = toCppBuffer(
-                    obj.Get("groupEd25519Pubkey"),
-                    class_name + ":constructGroupWrapper.groupEd25519Pubkey");
-
-            std::optional<std::vector<unsigned char>> group_ed25519_secretkey = maybeNonemptyBuffer(
-                    obj.Get("groupEd25519Secretkey"),
-                    class_name + ":constructGroupWrapper.groupEd25519Secretkey");
-
-            std::optional<std::vector<unsigned char>> dumped_meta = maybeNonemptyBuffer(
-                    obj.Get("metaDumped"), class_name + ":constructGroupWrapper.metaDumped");
-
-            std::optional<std::string> dumped_info;
-            std::optional<std::string> dumped_members;
-            std::optional<std::string> dumped_keys;
-
-            if (dumped_meta) {
-                auto dumped_meta_str = to_string(*dumped_meta);
-
-                oxenc::bt_dict_consumer combined{dumped_meta_str};
-                // NB: must read in ascii-sorted order:
-                if (!combined.skip_until("info"))
-                    throw std::runtime_error{"info dump not found in combined dump!"};
-                dumped_info = combined.consume_string();
-
-                if (!combined.skip_until("keys"))
-                    throw std::runtime_error{"keys dump not found in combined dump!"};
-                dumped_keys = combined.consume_string();
-
-                if (!combined.skip_until("members"))
-                    throw std::runtime_error{"members dump not found in combined dump!"};
-                dumped_members = combined.consume_string();
-            }
-
-            // Note, we keep shared_ptr for those as the Keys one need a reference to Members and
-            // Info on its own currently.
-            auto info = std::make_shared<config::groups::Info>(
-                    group_ed25519_pubkey,
-                    group_ed25519_secretkey,
-                    (dumped_info ? std::make_optional(session::to_span(*dumped_info))
-                                 : std::nullopt));
-
-            auto members = std::make_shared<config::groups::Members>(
-                    group_ed25519_pubkey,
-                    group_ed25519_secretkey,
-                    (dumped_members ? std::make_optional(session::to_span(*dumped_members))
-                                    : std::nullopt));
-
-            auto keys = std::make_shared<config::groups::Keys>(
-                    user_ed25519_secretkey,
-                    group_ed25519_pubkey,
-                    group_ed25519_secretkey,
-                    (dumped_keys ? std::make_optional(session::to_span(*dumped_keys))
-                                 : std::nullopt),
-                    *info,
-                    *members);
-
-            return std::make_unique<session::nodeapi::MetaGroup>(
-                    info, members, keys, group_ed25519_pubkey, group_ed25519_secretkey);
-        });
-    }
+            const Napi::CallbackInfo& info, const std::string& class_name);
 };
 
 }  // namespace session::nodeapi