chore: to merge somehoiw

Author: Bilb

include/pro/pro.hpp

@@ -14,6 +14,30 @@
 
 namespace session::nodeapi {
 
+template <>
+struct toJs_impl<pro_backend::ProRevocationItem> {
+    auto operator()(const Napi::Env& env, pro_backend::ProRevocationItem i) const {
+
+        auto obj = Napi::Object::New(env);
+        obj["genIndexHashB64"] = toJs(env, to_base64(i.gen_index_hash));
+        obj["expiryUnixTsMs"] = toJs(env, i.expiry_unix_ts);
+
+        return obj;
+    }
+};
+
+template <>
+struct toJs_impl<pro_backend::ResponseHeader> {
+    auto operator()(const Napi::Env& env, pro_backend::ResponseHeader r) const {
+
+        auto obj = Napi::Object::New(env);
+        obj["status"] = toJs(env, r.status);
+        obj["errors"] = toJs(env, r.errors);
+
+        return obj;
+    }
+};
+
 class ProWrapper : public Napi::ObjectWrap<ProWrapper> {
 
   public:
@@ -36,11 +60,15 @@ class ProWrapper : public Napi::ObjectWrap<ProWrapper> {
                                 "proProofRequestBody",
                                 static_cast<napi_property_attributes>(
                                         napi_writable | napi_configurable)),
-                        // Pro requests body
+                        // Pro requests
                         StaticMethod<&ProWrapper::proRevocationRequestBody>(
                                 "proRevocationRequestBody",
                                 static_cast<napi_property_attributes>(
                                         napi_writable | napi_configurable)),
+                        StaticMethod<&ProWrapper::proRevocationParseResponse>(
+                                "proRevocationParseResponse",
+                                static_cast<napi_property_attributes>(
+                                        napi_writable | napi_configurable)),
                 });
     }
 
@@ -176,6 +204,36 @@ class ProWrapper : public Napi::ObjectWrap<ProWrapper> {
             return req.to_json();
         });
     };
+
+    static Napi::Value proRevocationParseResponse(const Napi::CallbackInfo& info) {
+        return wrapResult(info, [&] {
+            // we expect one argument that matches:
+            // first: {
+            //   "body": string,
+            // }
+
+            assertInfoLength(info, 1);
+            assertIsObject(info[0]);
+            auto env = info.Env();
+
+            auto first = info[0].As<Napi::Object>();
+
+            if (first.IsEmpty())
+                throw std::invalid_argument("proRevocationParseResponse first received empty");
+
+            assertIsString(first.Get("json"), "proRevocationParseResponse.version");
+            auto bodyCpp = first.Get("json").As<Napi::String>().Utf8Value();
+
+            auto parsed = session::pro_backend::GetProRevocationsResponse::parse(bodyCpp);
+
+            auto obj = toJs(env, static_cast<pro_backend::ResponseHeader>(parsed));
+            // if error is set, the body might not be parsable so don't try to use it
+            obj["ticket"] = parsed.errors.size() ? env.Null() : toJs(env, parsed.ticket);
+            obj["items"] = parsed.errors.size() ? env.Null() : toJs(env, parsed.items);
+
+            return obj;
+        });
+    };
 };
 
 };  // namespace session::nodeapi

include/utilities.hpp

@@ -239,6 +239,14 @@ struct toJs_impl<std::chrono::sys_seconds> {
     }
 };
 
+template <>
+struct toJs_impl<std::chrono::sys_time<std::chrono::milliseconds>> {
+    auto operator()(
+            const Napi::Env& env, std::chrono::sys_time<std::chrono::milliseconds> t) const {
+        return Napi::Number::New(env, t.time_since_epoch().count());
+    }
+};
+
 // Returns {"url": "...", "key": buffer} object; both values will be Null if the pic is not set.
 
 template <>
@@ -383,10 +391,11 @@ template <std::size_t N>
 std::array<uint8_t, N> from_hex_to_array(std::string x) {
     std::string as_hex = oxenc::from_hex(x);
     if (as_hex.size() != N) {
-        throw std::invalid_argument(fmt::format(
-                "from_hex_to_array: Decoded hex size mismatch: expected {}, got {}",
-                N,
-                as_hex.size()));
+        throw std::invalid_argument(
+                fmt::format(
+                        "from_hex_to_array: Decoded hex size mismatch: expected {}, got {}",
+                        N,
+                        as_hex.size()));
     }
 
     std::array<uint8_t, N> result;
@@ -402,16 +411,15 @@ std::vector<unsigned char> from_base64_to_vector(std::string_view x);
 // Concept to match containers with a size() method
 template <typename T>
 concept HasSize = requires(T t) {
-    {
-        t.size()
-    } -> std::convertible_to<size_t>;
+    {t.size()}->std::convertible_to<size_t>;
 };
 
 template <HasSize T>
 void assert_length(const T& x, size_t n, std::string_view base_identifier) {
     if (x.size() != n) {
-        throw std::invalid_argument(fmt::format(
-                "assert_length: expected {}, got {} for {}", n, x.size(), base_identifier));
+        throw std::invalid_argument(
+                fmt::format(
+                        "assert_length: expected {}, got {} for {}", n, x.size(), base_identifier));
     }
 }
 

src/pro/pro.cpp

@@ -1 +1 @@
-#include "pro/pro.hpp"
+#include "pro/pro.hpp"

types/pro/pro.d.ts

@@ -65,6 +65,11 @@ declare module 'libsession_util_nodejs' {
     support_url: string;
   };
 
+  type ProRevocationItem = {
+    genIndexHashB64: string;
+    expiryUnixTsMs: number;
+  };
+
   type ProWrapper = {
     proFeaturesForMessage: (args: {
       utf16: string;
@@ -83,11 +88,18 @@ declare module 'libsession_util_nodejs' {
     /**
      *
      * @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 `GetProRevocationResponse` to allow
+     * @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
      */
     proRevocationRequestBody: ({ version, ticket }: { version: number; ticket: number }) => string;
+
+    proRevocationParseResponse: ({ json }: { json: string }) => {
+      status: number;
+      errors: Array<string>;
+      ticket: number | null;
+      items: Array<ProRevocationItem> | null;
+    };
   };
 
   export type ProActionsCalls = MakeWrapperActionCalls<ProWrapper>;
@@ -99,6 +111,7 @@ declare module 'libsession_util_nodejs' {
     public static proFeaturesForMessage: ProWrapper['proFeaturesForMessage'];
     public static proProofRequestBody: ProWrapper['proProofRequestBody'];
     public static proRevocationRequestBody: ProWrapper['proRevocationRequestBody'];
+    public static proRevocationParseResponse: ProWrapper['proRevocationParseResponse'];
   }
 
   /**
@@ -109,5 +122,6 @@ declare module 'libsession_util_nodejs' {
   export type ProActionsType =
     | MakeActionCall<ProWrapper, 'proFeaturesForMessage'>
     | MakeActionCall<ProWrapper, 'proProofRequestBody'>
-    | MakeActionCall<ProWrapper, 'proRevocationRequestBody'>;
+    | MakeActionCall<ProWrapper, 'proRevocationRequestBody'>
+    | MakeActionCall<ProWrapper, 'proRevocationParseResponse'>;
 }