feat: add keysAdmin and memberConstruct&Set

Author: Bilb

package.json

@@ -18,5 +18,6 @@
     "cmake-js": "7.2.1",
     "node-addon-api": "^6.1.0"
   },
-  "typings": "index.d.ts"
+  "typings": "index.d.ts",
+  "packageManager": "[email protected]"
 }

src/groups/meta_group_wrapper.cpp

@@ -37,6 +37,9 @@ void MetaGroupWrapper::Init(Napi::Env env, Napi::Object exports) {
                     // members exposed functions
                     InstanceMethod("memberGet", &MetaGroupWrapper::memberGet),
                     InstanceMethod("memberGetOrConstruct", &MetaGroupWrapper::memberGetOrConstruct),
+                    InstanceMethod(
+                            "memberConstructAndSet", &MetaGroupWrapper::memberConstructAndSet),
+
                     InstanceMethod("memberGetAll", &MetaGroupWrapper::memberGetAll),
                     InstanceMethod(
                             "memberGetAllPendingRemovals",
@@ -417,6 +420,17 @@ Napi::Value MetaGroupWrapper::memberGetOrConstruct(const Napi::CallbackInfo& inf
     });
 }
 
+void MetaGroupWrapper::memberConstructAndSet(const Napi::CallbackInfo& info) {
+    wrapExceptions(info, [&] {
+        assertInfoLength(info, 1);
+        assertIsString(info[0]);
+
+        auto pubkeyHex = toCppString(info[0], __PRETTY_FUNCTION__);
+        auto created = meta_group->members->get_or_construct(pubkeyHex);
+        meta_group->members->set(created);
+    });
+}
+
 void MetaGroupWrapper::memberSetName(const Napi::CallbackInfo& info) {
     wrapExceptions(info, [&] {
         assertIsString(info[0]);
@@ -477,17 +491,17 @@ void MetaGroupWrapper::memberSetPromoted(const Napi::CallbackInfo& info) {
 }
 
 void MetaGroupWrapper::memberSetAdmin(const Napi::CallbackInfo& info) {
-
     wrapExceptions(info, [&] {
         assertInfoLength(info, 1);
         assertIsString(info[0]);
         auto pubkeyHex = toCppString(info[0], __PRETTY_FUNCTION__);
         // Note: this step might add an admin which was removed back once he accepts the promotion,
         // but there is not much we can do about it
         auto m = this->meta_group->members->get(pubkeyHex);
-        m->admin = true;
-
-        this->meta_group->members->set(*m);
+        if (m) {
+            m->admin = true;
+            this->meta_group->members->set(*m);
+        }
     });
 }
 
@@ -689,6 +703,14 @@ Napi::Value MetaGroupWrapper::loadAdminKeys(const Napi::CallbackInfo& info) {
     });
 }
 
+
+Napi::Value MetaGroupWrapper::keysAdmin(const Napi::CallbackInfo& info) {
+    return wrapResult(info, [&] {
+        assertInfoLength(info, 0);
+        return this->meta_group->keys->admin();
+    });
+}
+
 Napi::Value MetaGroupWrapper::generateSupplementKeys(const Napi::CallbackInfo& info) {
     return wrapResult(info, [&] {
         assertInfoLength(info, 1);

src/groups/meta_group_wrapper.hpp

@@ -73,6 +73,8 @@ class MetaGroupWrapper : public Napi::ObjectWrap<MetaGroupWrapper> {
     Napi::Value memberGetAllPendingRemovals(const Napi::CallbackInfo& info);
     Napi::Value memberGet(const Napi::CallbackInfo& info);
     Napi::Value memberGetOrConstruct(const Napi::CallbackInfo& info);
+    void memberConstructAndSet(const Napi::CallbackInfo& info);
+
     void memberSetName(const Napi::CallbackInfo& info);
     void memberSetInvited(const Napi::CallbackInfo& info);
     void memberSetAccepted(const Napi::CallbackInfo& info);
@@ -98,6 +100,7 @@ class MetaGroupWrapper : public Napi::ObjectWrap<MetaGroupWrapper> {
     Napi::Value swarmSubaccountSign(const Napi::CallbackInfo& info);
     Napi::Value swarmVerifySubAccount(const Napi::CallbackInfo& info);
     Napi::Value loadAdminKeys(const Napi::CallbackInfo& info);
+    Napi::Value keysAdmin(const Napi::CallbackInfo& info);
 };
 
 }  // namespace session::nodeapi

types/groups/groupkeys.d.ts

@@ -7,6 +7,7 @@ declare module 'libsession_util_nodejs' {
     keyRekey: () => Uint8Array;
     keyGetAll: () => Array<Uint8Array>;
     loadKeyMessage: (hash: string, data: Uint8Array, timestampMs: number) => boolean;
+    keysAdmin: () => boolean;
     keyGetCurrentGen: () => number;
 
     currentHashes: () => Array<string>;

types/groups/groupmembers.d.ts

@@ -31,6 +31,8 @@ declare module 'libsession_util_nodejs' {
     // GroupMember related methods
     memberGet: (pubkeyHex: PubkeyType) => GroupMemberGet | null;
     memberGetOrConstruct: (pubkeyHex: PubkeyType) => GroupMemberGet;
+    memberConstructAndSet: (pubkeyHex: PubkeyType) => void;
+
     memberGetAll: () => Array<GroupMemberGet>;
     memberGetAllPendingRemovals: () => Array<GroupMemberGet>;
 

types/groups/metagroup.d.ts

@@ -76,6 +76,7 @@ declare module 'libsession_util_nodejs' {
     // members
     public memberGet: MetaGroupWrapper['memberGet'];
     public memberGetOrConstruct: MetaGroupWrapper['memberGetOrConstruct'];
+    public memberConstructAndSet: MetaGroupWrapper['memberConstructAndSet'];
     public memberGetAll: MetaGroupWrapper['memberGetAll'];
     public memberGetAllPendingRemovals: MetaGroupWrapper['memberGetAllPendingRemovals'];
     public memberSetAccepted: MetaGroupWrapper['memberSetAccepted'];
@@ -92,6 +93,7 @@ declare module 'libsession_util_nodejs' {
     public keysNeedsRekey: MetaGroupWrapper['keysNeedsRekey'];
     public keyRekey: MetaGroupWrapper['keyRekey'];
     public loadKeyMessage: MetaGroupWrapper['loadKeyMessage'];
+    public keysAdmin: MetaGroupWrapper['keysAdmin'];
     public keyGetCurrentGen: MetaGroupWrapper['keyGetCurrentGen'];
     public encryptMessages: MetaGroupWrapper['encryptMessages'];
     public decryptMessage: MetaGroupWrapper['decryptMessage'];
@@ -119,6 +121,7 @@ declare module 'libsession_util_nodejs' {
     // member actions
     | MakeActionCall<MetaGroupWrapper, 'memberGet'>
     | MakeActionCall<MetaGroupWrapper, 'memberGetOrConstruct'>
+    | MakeActionCall<MetaGroupWrapper, 'memberConstructAndSet'>
     | MakeActionCall<MetaGroupWrapper, 'memberGetAll'>
     | MakeActionCall<MetaGroupWrapper, 'memberGetAllPendingRemovals'>
     | MakeActionCall<MetaGroupWrapper, 'memberSetAccepted'>
@@ -135,6 +138,7 @@ declare module 'libsession_util_nodejs' {
     | MakeActionCall<MetaGroupWrapper, 'keyRekey'>
     | MakeActionCall<MetaGroupWrapper, 'keyGetAll'>
     | MakeActionCall<MetaGroupWrapper, 'loadKeyMessage'>
+    | MakeActionCall<MetaGroupWrapper, 'keysAdmin'>
     | MakeActionCall<MetaGroupWrapper, 'keyGetCurrentGen'>
     | MakeActionCall<MetaGroupWrapper, 'currentHashes'>
     | MakeActionCall<MetaGroupWrapper, 'encryptMessages'>