@xmtp/browser-sdk 2.2.1 → 3.0.1

package/src/utils/errors.ts

@@ -1,5 +1,4 @@
 import type { ContentTypeId } from "@xmtp/content-type-primitives";
-import { SignatureRequestType } from "@xmtp/wasm-bindings";
 
 export class ClientNotInitializedError extends Error {
   constructor() {
@@ -37,32 +36,6 @@ export class AccountAlreadyAssociatedError extends Error {
   }
 }
 
-export class GenerateSignatureError extends Error {
-  constructor(signatureType: SignatureRequestType) {
-    let type = "";
-
-    switch (signatureType) {
-      case SignatureRequestType.AddWallet:
-        type = "add account";
-        break;
-      case SignatureRequestType.CreateInbox:
-        type = "create inbox";
-        break;
-      case SignatureRequestType.RevokeWallet:
-        type = "remove account";
-        break;
-      case SignatureRequestType.RevokeInstallations:
-        type = "revoke installations";
-        break;
-      case SignatureRequestType.ChangeRecoveryIdentifier:
-        type = "change recovery identifier";
-        break;
-    }
-
-    super(`Failed to generate ${type} signature text`);
-  }
-}
-
 export class GroupNotFoundError extends Error {
   constructor(groupId: string) {
     super(`Group "${groupId}" not found`);

package/src/utils/signer.ts

@@ -21,3 +21,39 @@ export type Signer =
 
 export type EOASigner = Extract<Signer, { type: "EOA" }>;
 export type SCWSigner = Extract<Signer, { type: "SCW" }>;
+
+export type SafeSigner =
+  | {
+      type: "EOA";
+      identifier: Identifier;
+      signature: Uint8Array;
+    }
+  | {
+      type: "SCW";
+      identifier: Identifier;
+      signature: Uint8Array;
+      chainId: bigint;
+      blockNumber?: bigint;
+    };
+
+export const toSafeSigner = async (
+  signer: Signer,
+  signature: Uint8Array,
+): Promise<SafeSigner> => {
+  switch (signer.type) {
+    case "EOA":
+      return {
+        type: "EOA",
+        identifier: await signer.getIdentifier(),
+        signature,
+      };
+    case "SCW":
+      return {
+        type: "SCW",
+        identifier: await signer.getIdentifier(),
+        signature,
+        chainId: signer.getChainId(),
+        blockNumber: signer.getBlockNumber?.(),
+      };
+  }
+};

package/src/workers/client.ts

@@ -2,6 +2,7 @@ import init, {
   type Consent,
   type Conversation,
   type Message,
+  type SignatureRequestHandle,
   type StreamCloser,
   type UserPreference,
 } from "@xmtp/wasm-bindings";
@@ -43,6 +44,12 @@ let maybeClient: WorkerClient | undefined;
 let enableLogging = false;
 
 const streamClosers = new Map<string, StreamCloser>();
+const signatureRequests = new Map<string, SignatureRequestHandle>();
+
+type SignatureRequestResult = {
+  signatureText: string;
+  signatureRequestId: string;
+};
 
 /**
  * Type-safe postMessage
@@ -143,61 +150,154 @@ self.onmessage = async (
       /**
        * Client actions
        */
+      case "client.applySignatureRequest": {
+        const signatureRequest = signatureRequests.get(data.signatureRequestId);
+        if (!signatureRequest) {
+          throw new Error("Signature request not found");
+        }
+        await client.processSignatureRequest(data.signer, signatureRequest);
+        signatureRequests.delete(data.signatureRequestId);
+        postMessage({ id, action, result: undefined });
+        break;
+      }
       case "client.createInboxSignatureText": {
-        const result = client.createInboxSignatureText();
-        postMessage({ id, action, result });
+        const result: Partial<SignatureRequestResult> = {
+          signatureText: undefined,
+          signatureRequestId: undefined,
+        };
+        try {
+          const signatureRequest = client.createInboxSignatureRequest();
+          if (signatureRequest) {
+            result.signatureText = await signatureRequest.signatureText();
+            result.signatureRequestId = data.signatureRequestId;
+            signatureRequests.set(data.signatureRequestId, signatureRequest);
+          }
+        } finally {
+          postMessage({ id, action, result });
+        }
         break;
       }
       case "client.addAccountSignatureText": {
-        const result = await client.addAccountSignatureText(data.newIdentifier);
+        const signatureRequest = await client.addAccountSignatureRequest(
+          data.newIdentifier,
+        );
+        const result: SignatureRequestResult = {
+          signatureText: await signatureRequest.signatureText(),
+          signatureRequestId: data.signatureRequestId,
+        };
+        signatureRequests.set(data.signatureRequestId, signatureRequest);
         postMessage({ id, action, result });
         break;
       }
       case "client.removeAccountSignatureText": {
-        const result = await client.removeAccountSignatureText(data.identifier);
+        const signatureRequest = await client.removeAccountSignatureRequest(
+          data.identifier,
+        );
+        const result: SignatureRequestResult = {
+          signatureText: await signatureRequest.signatureText(),
+          signatureRequestId: data.signatureRequestId,
+        };
+        signatureRequests.set(data.signatureRequestId, signatureRequest);
         postMessage({ id, action, result });
         break;
       }
       case "client.revokeAllOtherInstallationsSignatureText": {
-        const result = await client.revokeAllAOtherInstallationsSignatureText();
+        const signatureRequest =
+          await client.revokeAllOtherInstallationsSignatureRequest();
+        const result: SignatureRequestResult = {
+          signatureText: await signatureRequest.signatureText(),
+          signatureRequestId: data.signatureRequestId,
+        };
+        signatureRequests.set(data.signatureRequestId, signatureRequest);
         postMessage({ id, action, result });
         break;
       }
       case "client.revokeInstallationsSignatureText": {
-        const result = await client.revokeInstallationsSignatureText(
-          data.installationIds,
-        );
+        const signatureRequest =
+          await client.revokeInstallationsSignatureRequest(
+            data.installationIds,
+          );
+        const result: SignatureRequestResult = {
+          signatureText: await signatureRequest.signatureText(),
+          signatureRequestId: data.signatureRequestId,
+        };
+        signatureRequests.set(data.signatureRequestId, signatureRequest);
         postMessage({ id, action, result });
         break;
       }
       case "client.changeRecoveryIdentifierSignatureText": {
-        const result = await client.changeRecoveryIdentifierSignatureText(
-          data.identifier,
-        );
+        const signatureRequest =
+          await client.changeRecoveryIdentifierSignatureRequest(
+            data.identifier,
+          );
+        const result: SignatureRequestResult = {
+          signatureText: await signatureRequest.signatureText(),
+          signatureRequestId: data.signatureRequestId,
+        };
+        signatureRequests.set(data.signatureRequestId, signatureRequest);
         postMessage({ id, action, result });
         break;
       }
-      case "client.addEcdsaSignature":
-        await client.addEcdsaSignature(data.type, data.bytes);
+      case "client.registerIdentity": {
+        const signatureRequest = signatureRequests.get(data.signatureRequestId);
+        if (!signatureRequest) {
+          throw new Error("Signature request not found");
+        }
+        await client.registerIdentity(data.signer, signatureRequest);
+        signatureRequests.delete(data.signatureRequestId);
         postMessage({ id, action, result: undefined });
         break;
-      case "client.addScwSignature":
-        await client.addScwSignature(
-          data.type,
-          data.bytes,
-          data.chainId,
-          data.blockNumber,
-        );
+      }
+      case "client.addAccount": {
+        const signatureRequest = signatureRequests.get(data.signatureRequestId);
+        if (!signatureRequest) {
+          throw new Error("Signature request not found");
+        }
+        await client.processSignatureRequest(data.signer, signatureRequest);
+        signatureRequests.delete(data.signatureRequestId);
         postMessage({ id, action, result: undefined });
         break;
-      case "client.applySignatures":
-        await client.applySignatures();
+      }
+      case "client.removeAccount": {
+        const signatureRequest = signatureRequests.get(data.signatureRequestId);
+        if (!signatureRequest) {
+          throw new Error("Signature request not found");
+        }
+        await client.processSignatureRequest(data.signer, signatureRequest);
+        signatureRequests.delete(data.signatureRequestId);
         postMessage({ id, action, result: undefined });
         break;
-      case "client.registerIdentity":
-        await client.registerIdentity();
+      }
+      case "client.revokeAllOtherInstallations": {
+        const signatureRequest = signatureRequests.get(data.signatureRequestId);
+        if (!signatureRequest) {
+          throw new Error("Signature request not found");
+        }
+        await client.processSignatureRequest(data.signer, signatureRequest);
+        signatureRequests.delete(data.signatureRequestId);
         postMessage({ id, action, result: undefined });
         break;
+      }
+      case "client.revokeInstallations": {
+        const signatureRequest = signatureRequests.get(data.signatureRequestId);
+        if (!signatureRequest) {
+          throw new Error("Signature request not found");
+        }
+        await client.processSignatureRequest(data.signer, signatureRequest);
+        signatureRequests.delete(data.signatureRequestId);
+        postMessage({ id, action, result: undefined });
+        break;
+      }
+      case "client.changeRecoveryIdentifier": {
+        const signatureRequest = signatureRequests.get(data.signatureRequestId);
+        if (!signatureRequest) {
+          throw new Error("Signature request not found");
+        }
+        await client.processSignatureRequest(data.signer, signatureRequest);
+        signatureRequests.delete(data.signatureRequestId);
+        postMessage({ id, action, result: undefined });
+        break;
+      }
       case "client.isRegistered": {
         const result = client.isRegistered;
         postMessage({ id, action, result });
@@ -252,30 +352,36 @@ self.onmessage = async (
         });
         break;
       }
-      case "client.apiStatistics": {
-        const apiStats = client.apiStatistics();
+      /**
+       * Debug information actions
+       */
+      case "debugInformation.apiStatistics": {
+        const apiStats = client.debugInformation.apiStatistics();
         const result = toSafeApiStats(apiStats);
         postMessage({ id, action, result });
         break;
       }
-      case "client.apiIdentityStatistics": {
-        const apiIdentityStats = client.apiIdentityStatistics();
+      case "debugInformation.apiIdentityStatistics": {
+        const apiIdentityStats =
+          client.debugInformation.apiIdentityStatistics();
         const result = toSafeIdentityStats(apiIdentityStats);
         postMessage({ id, action, result });
         break;
       }
-      case "client.apiAggregateStatistics": {
-        const result = client.apiAggregateStatistics();
+      case "debugInformation.apiAggregateStatistics": {
+        const result = client.debugInformation.apiAggregateStatistics();
         postMessage({ id, action, result });
         break;
       }
-      case "client.clearAllStatistics": {
-        client.clearAllStatistics();
+      case "debugInformation.clearAllStatistics": {
+        client.debugInformation.clearAllStatistics();
         postMessage({ id, action, result: undefined });
         break;
       }
-      case "client.uploadDebugArchive": {
-        const result = await client.uploadDebugArchive(data.serverUrl);
+      case "debugInformation.uploadDebugArchive": {
+        const result = await client.debugInformation.uploadDebugArchive(
+          data.serverUrl,
+        );
         postMessage({ id, action, result });
         break;
       }

package/src/workers/utils.ts

@@ -1,6 +1,9 @@
 import init, {
+  applySignatureRequest,
   generateInboxId,
   getInboxIdForIdentifier as get_inbox_id_for_identifier,
+  inboxStateFromInboxIds,
+  revokeInstallationsSignatureRequest,
   type Identifier,
 } from "@xmtp/wasm-bindings";
 import { ApiUrls } from "@/constants";
@@ -12,6 +15,7 @@ import type {
 } from "@/types/actions";
 import type { UtilsWorkerAction } from "@/types/actions/utils";
 import type { XmtpEnv } from "@/types/options";
+import { toSafeInboxState } from "@/utils/conversions";
 
 /**
  * Type-safe postMessage
@@ -72,6 +76,52 @@ self.onmessage = async (
         postMessage({ id, action, result });
         break;
       }
+      case "utils.revokeInstallationsSignatureText": {
+        const host = ApiUrls[data.env ?? "dev"];
+        const signatureRequest = await revokeInstallationsSignatureRequest(
+          host,
+          data.identifier,
+          data.inboxId,
+          data.installationIds,
+        );
+        const signatureText = await signatureRequest.signatureText();
+        postMessage({ id, action, result: signatureText });
+        break;
+      }
+      case "utils.revokeInstallations": {
+        const host = ApiUrls[data.env ?? "dev"];
+        const signatureRequest = await revokeInstallationsSignatureRequest(
+          host,
+          data.signer.identifier,
+          data.inboxId,
+          data.installationIds,
+        );
+        switch (data.signer.type) {
+          case "EOA":
+            await signatureRequest.addEcdsaSignature(data.signer.signature);
+            break;
+          case "SCW":
+            await signatureRequest.addScwSignature(
+              data.signer.identifier,
+              data.signer.signature,
+              data.signer.chainId,
+              data.signer.blockNumber,
+            );
+            break;
+        }
+        await applySignatureRequest(host, signatureRequest);
+        postMessage({ id, action, result: undefined });
+        break;
+      }
+      case "utils.inboxStateFromInboxIds": {
+        const host = ApiUrls[data.env ?? "dev"];
+        const inboxStates = await inboxStateFromInboxIds(host, data.inboxIds);
+        const result = inboxStates.map((inboxState) =>
+          toSafeInboxState(inboxState),
+        );
+        postMessage({ id, action, result });
+        break;
+      }
     }
   } catch (e) {
     postMessageError({ id, action, error: e as Error });