fix: wrap up requestbody for pro backend

Author: Bilb

include/pro/pro.hpp

@@ -110,19 +110,21 @@ class ProWrapper : public Napi::ObjectWrap<ProWrapper> {
                                 static_cast<napi_property_attributes>(
                                         napi_writable | napi_configurable)),
 
+                        // Note: those are not plugged in for now as we do this parsing through zod
+                        // on desktop.
                         // Pro responses parsing
-                        StaticMethod<&ProWrapper::proProofParseResponse>(
-                                "proProofParseResponse",
-                                static_cast<napi_property_attributes>(
-                                        napi_writable | napi_configurable)),
-                        StaticMethod<&ProWrapper::proRevocationsParseResponse>(
-                                "proRevocationsParseResponse",
-                                static_cast<napi_property_attributes>(
-                                        napi_writable | napi_configurable)),
-                        StaticMethod<&ProWrapper::proStatusParseResponse>(
-                                "proStatusParseResponse",
-                                static_cast<napi_property_attributes>(
-                                        napi_writable | napi_configurable)),
+                        // StaticMethod<&ProWrapper::proProofParseResponse>(
+                        //         "proProofParseResponse",
+                        //         static_cast<napi_property_attributes>(
+                        //                 napi_writable | napi_configurable)),
+                        // StaticMethod<&ProWrapper::proRevocationsParseResponse>(
+                        //         "proRevocationsParseResponse",
+                        //         static_cast<napi_property_attributes>(
+                        //                 napi_writable | napi_configurable)),
+                        // StaticMethod<&ProWrapper::proStatusParseResponse>(
+                        //         "proStatusParseResponse",
+                        //         static_cast<napi_property_attributes>(
+                        //                 napi_writable | napi_configurable)),
                 });
     }
 
@@ -187,8 +189,8 @@ class ProWrapper : public Napi::ObjectWrap<ProWrapper> {
             // we expect arguments that match:
             // first: {
             //   "requestVersion": number,
-            //   "masterPrivkey": Uint8Array,
-            //   "rotatingPrivkey": Uint8Array,
+            //   "masterPrivKeyHex": string,
+            //   "rotatingPrivKeyHex": string,
             //   "unixTsMs": number,
             // }
 
@@ -197,32 +199,35 @@ class ProWrapper : public Napi::ObjectWrap<ProWrapper> {
             auto env = info.Env();
 
             auto first = info[0].As<Napi::Object>();
-
             if (first.IsEmpty())
                 throw std::invalid_argument("proProofRequestBody first received empty");
 
             assertIsNumber(first.Get("requestVersion"), "proProofRequestBody.requestVersion");
+            Napi::Number requestVersion = first.Get("requestVersion").As<Napi::Number>();
             assertIsNumber(first.Get("unixTsMs"), "proProofRequestBody.unixTsMs");
-            auto requestVersion = first.Get("requestVersion").As<Napi::Number>();
             auto unix_ts_ms = toCppSysMs(first.Get("unixTsMs"), "proProofRequestBody.unixTsMs");
 
-            assertIsUInt8Array(first.Get("masterPrivkey"), "proProofRequestBody.masterPrivkey");
-            assertIsUInt8Array(first.Get("rotatingPrivkey"), "proProofRequestBody.rotatingPrivkey");
+            assertIsString(first.Get("masterPrivKeyHex"), "proProofRequestBody.masterPrivKeyHex");
+            assertIsString(
+                    first.Get("rotatingPrivKeyHex"), "proProofRequestBody.rotatingPrivKeyHex");
 
-            auto master_privkey_js = first.Get("masterPrivkey");
-            auto rotating_privkey_js = first.Get("rotatingPrivkey");
-            auto master_privkey =
-                    toCppBuffer(master_privkey_js, "proProofRequestBody.masterPrivkey");
-            auto rotating_privkey =
-                    toCppBuffer(rotating_privkey_js, "proProofRequestBody.rotatingPrivkey");
+            auto master_privkey_js = first.Get("masterPrivKeyHex");
+            auto rotating_privkey_js = first.Get("rotatingPrivKeyHex");
+            std::string master_privkey =
+                    toCppString(master_privkey_js, "proProofRequestBody.masterPrivKeyHex");
+            std::string rotating_privkey =
+                    toCppString(rotating_privkey_js, "proProofRequestBody.rotatingPrivKeyHex");
+
+            assert_length(master_privkey, 64, "masterPrivKeyHex");
+            assert_length(rotating_privkey, 64, "rotatingPrivkey");
 
-            assert_length(master_privkey, 64, "master_privkey");
-            assert_length(rotating_privkey, 64, "rotating_prevkey");
+            auto master_privkey_decoded = from_hex(master_privkey);
+            auto rotating_privkey_decoded = from_hex(rotating_privkey);
 
-            auto json = pro_backend::GetProProofRequest::build_to_json(
+            std::string json = pro_backend::GetProProofRequest::build_to_json(
                     static_cast<uint8_t>(requestVersion.Int32Value()),
-                    master_privkey,
-                    rotating_privkey,
+                    to_span(master_privkey_decoded),
+                    to_span(rotating_privkey_decoded),
                     unix_ts_ms);
 
             return json;
@@ -321,7 +326,7 @@ class ProWrapper : public Napi::ObjectWrap<ProWrapper> {
             // we expect arguments that match:
             // first: {
             //   "requestVersion": number,
-            //   "masterPrivkey": Uint8Array,
+            //   "masterPrivKeyHex": string,
             //   "unixTsMs": number,
             //   "withPaymentHistory": boolean,
             // }
@@ -343,17 +348,17 @@ class ProWrapper : public Napi::ObjectWrap<ProWrapper> {
             auto unix_ts_ms = toCppSysMs(first.Get("unixTsMs"), "proStatusRequestBody.unixTsMs");
             auto withPaymentHistory = toCppBoolean(
                     first.Get("withPaymentHistory"), "proStatusRequestBody.withPaymentHistory");
-            assertIsUInt8Array(first.Get("masterPrivkey"), "proStatusRequestBody.masterPrivkey");
+            assertIsString(first.Get("masterPrivKeyHex"), "proStatusRequestBody.masterPrivKeyHex");
 
-            auto master_privkey_js = first.Get("masterPrivkey");
+            auto master_privkey_js = first.Get("masterPrivKeyHex");
             auto master_privkey =
-                    toCppBuffer(master_privkey_js, "proStatusRequestBody.masterPrivkey");
+                    toCppString(master_privkey_js, "proStatusRequestBody.masterPrivKeyHex");
 
-            assert_length(master_privkey, 64, "proStatusRequestBody.master_privkey");
+            assert_length(master_privkey, 64, "proStatusRequestBody.masterPrivKeyHex");
 
             auto json = pro_backend::GetProStatusRequest::build_to_json(
                     static_cast<uint8_t>(requestVersion.Int32Value()),
-                    master_privkey,
+                    to_span(from_hex(master_privkey)),
                     unix_ts_ms,
                     withPaymentHistory);
 

types/pro/pro.d.ts

@@ -16,6 +16,12 @@ declare module 'libsession_util_nodejs' {
   type WithProFeatures = { proFeatures: ProFeatures };
   type WithGenIndexHash = { genIndexHashB64: string };
 
+  type WithRequestVersion = { requestVersion: number };
+
+  type WithUnixTsMs = {
+    unixTsMs: number;
+  };
+
   type ProProof = WithGenIndexHash & {
     version: number;
     /**
@@ -25,19 +31,22 @@ declare module 'libsession_util_nodejs' {
     expiryMs: number;
   };
 
-  type ProConfig = {
+  type WithRotatingPrivKeyHex = {
     /**
      * 64 bytes, 128 chars
      */
     rotatingPrivKeyHex: string;
-    proProof: ProProof;
   };
 
-  type WithProBackendResponse = {
-    status: number;
-    errors: Array<string>;
+  type ProConfig = WithRotatingPrivKeyHex & {
+    proProof: ProProof;
   };
 
+  // type WithProBackendResponse = {
+  //   status: number;
+  //   errors: Array<string>;
+  // };
+
   // Must match session-desktop
   export enum ProOriginatingPlatform {
     Nil = 'Nil',
@@ -74,7 +83,7 @@ declare module 'libsession_util_nodejs' {
     expiryUnixTsMs: number;
   };
 
-  type WithMasterPrivKey = { masterPrivKey: Uint8Array };
+  type WithMasterPrivKeyHex = { masterPrivKeyHex: string };
 
   type ProPaymentItem = {
     /**
@@ -163,47 +172,43 @@ declare module 'libsession_util_nodejs' {
       proFeatures: ProFeatures;
     }) => WithProFeatures & { success: boolean; error: string | null; codepointCount: number };
     proProofRequestBody: (
-      args: WithMasterPrivKey & {
-        requestVersion: number;
-        rotatingPrivkey: Uint8Array;
-        unixTsMs: number;
-      }
+      args: WithMasterPrivKeyHex & WithRequestVersion & WithUnixTsMs & WithRotatingPrivKeyHex
     ) => string;
 
-    proProofParseResponse: (args: {
-      json: string;
-    }) => WithProBackendResponse & { proof: ProProof | null };
+    // proProofParseResponse: (args: {
+    //   json: string;
+    // }) => WithProBackendResponse & { proof: ProProof | null };
 
     /**
      * @param version: Request version. The latest accepted version is 0
      * @param ticket: 4-byte monotonic integer for the caller's revocation list iteration. Set to 0 if unknown; otherwise, use the latest known `ticket` from a prior `GetProRevocationsResponse` to allow
      the Session Pro Backend to omit the revocation list if it has not changed.
      * @returns the stringified body to include in the request
      */
-    proRevocationsRequestBody: (args: { requestVersion: number; ticket: number }) => string;
+    proRevocationsRequestBody: (args: WithRequestVersion & { ticket: number }) => string;
 
-    proRevocationsParseResponse: (args: { json: string }) => WithProBackendResponse & {
-      ticket: number | null;
-      items: Array<ProRevocationItem> | null;
-    };
+    // proRevocationsParseResponse: (args: { json: string }) => WithProBackendResponse & {
+    //   ticket: number | null;
+    //   items: Array<ProRevocationItem> | null;
+    // };
 
     proStatusRequestBody: (
-      args: WithMasterPrivKey & {
-        requestVersion: number;
-        unixTsMs: number;
-        withPaymentHistory: boolean;
-      }
+      args: WithMasterPrivKeyHex &
+        WithRequestVersion &
+        WithUnixTsMs & {
+          withPaymentHistory: boolean;
+        }
     ) => string;
 
-    proStatusParseResponse: (args: { json: string }) => WithProBackendResponse & {
-      ticket: number | null;
-      items: Array<ProPaymentItem>;
-      userStatus: number;
-      errorReport: number;
-      autoRenewing: boolean;
-      expiryUnixTsMs: number;
-      gracePeriodDurationMs: number;
-    };
+    // proStatusParseResponse: (args: { json: string }) => WithProBackendResponse & {
+    //   ticket: number | null;
+    //   items: Array<ProPaymentItem>;
+    //   userStatus: number;
+    //   errorReport: number;
+    //   autoRenewing: boolean;
+    //   expiryUnixTsMs: number;
+    //   gracePeriodDurationMs: number;
+    // };
   };
 
   export type ProActionsCalls = MakeWrapperActionCalls<ProWrapper>;
@@ -214,11 +219,11 @@ declare module 'libsession_util_nodejs' {
   export class ProWrapperNode {
     public static proFeaturesForMessage: ProWrapper['proFeaturesForMessage'];
     public static proProofRequestBody: ProWrapper['proProofRequestBody'];
-    public static proProofParseResponse: ProWrapper['proProofParseResponse'];
-    public static proRevocationRequestBody: ProWrapper['proRevocationsRequestBody'];
-    public static proRevocationParseResponse: ProWrapper['proRevocationsParseResponse'];
+    public static proRevocationsRequestBody: ProWrapper['proRevocationsRequestBody'];
     public static proStatusRequestBody: ProWrapper['proStatusRequestBody'];
-    public static proStatusParseResponse: ProWrapper['proStatusParseResponse'];
+    // public static proProofParseResponse: ProWrapper['proProofParseResponse'];
+    // public static proRevocationsParseResponse: ProWrapper['proRevocationsParseResponse'];
+    // public static proStatusParseResponse: ProWrapper['proStatusParseResponse'];
   }
 
   /**
@@ -229,9 +234,9 @@ declare module 'libsession_util_nodejs' {
   export type ProActionsType =
     | MakeActionCall<ProWrapper, 'proFeaturesForMessage'>
     | MakeActionCall<ProWrapper, 'proProofRequestBody'>
-    | MakeActionCall<ProWrapper, 'proProofParseResponse'>
     | MakeActionCall<ProWrapper, 'proRevocationsRequestBody'>
-    | MakeActionCall<ProWrapper, 'proRevocationsParseResponse'>
-    | MakeActionCall<ProWrapper, 'proStatusRequestBody'>
-    | MakeActionCall<ProWrapper, 'proStatusParseResponse'>;
+    | MakeActionCall<ProWrapper, 'proStatusRequestBody'>;
+  // | MakeActionCall<ProWrapper, 'proProofParseResponse'>
+  // | MakeActionCall<ProWrapper, 'proRevocationsParseResponse'>
+  // | MakeActionCall<ProWrapper, 'proStatusParseResponse'>
 }