@xmtp/node-sdk 3.2.1-dev.cb2628c → 3.2.2

package/dist/index.js

@@ -1,7 +1,7 @@
 import { GroupUpdatedCodec, ContentTypeGroupUpdated } from '@xmtp/content-type-group-updated';
 import { ContentTypeText, TextCodec } from '@xmtp/content-type-text';
-import { generateInboxId as generateInboxId$1, getInboxIdForIdentifier as getInboxIdForIdentifier$1, createClient as createClient$1, verifySignedWithPublicKey, isAddressAuthorized, isInstallationAuthorized } from '@xmtp/node-bindings';
-export { ConsentEntityType, ConsentState, ConversationType, DeliveryStatus, GroupMember, GroupMembershipState, GroupMessageKind, GroupMetadata, GroupPermissions, GroupPermissionsOptions, IdentifierKind, LogLevel, MetadataField, PermissionLevel, PermissionPolicy, PermissionUpdateType, SignatureRequestType, SortDirection } from '@xmtp/node-bindings';
+import { generateInboxId as generateInboxId$1, getInboxIdForIdentifier as getInboxIdForIdentifier$1, createClient as createClient$1, revokeInstallationsSignatureRequest, applySignatureRequest, inboxStateFromInboxIds, verifySignedWithPublicKey, isAddressAuthorized, isInstallationAuthorized } from '@xmtp/node-bindings';
+export { ConsentEntityType, ConsentState, ConversationType, DeliveryStatus, GroupMember, GroupMembershipState, GroupMessageKind, GroupMetadata, GroupPermissions, GroupPermissionsOptions, IdentifierKind, LogLevel, MetadataField, PermissionLevel, PermissionPolicy, PermissionUpdateType, SignatureRequestHandle, SortDirection } from '@xmtp/node-bindings';
 import { ContentTypeId } from '@xmtp/content-type-primitives';
 import { join } from 'node:path';
 import process from 'node:process';
@@ -35,83 +35,99 @@ const HistorySyncUrls = {
 };
 
 class AsyncStream {
-    #done = false;
-    #resolveNext;
-    #rejectNext;
+    #isDone = false;
+    #pendingPromises = [];
     #queue;
     #error;
-    onReturn = undefined;
-    onError = undefined;
+    #onDone;
+    #onReturn;
+    #onError;
     constructor() {
         this.#queue = [];
-        this.#resolveNext = null;
-        this.#rejectNext = null;
-        this.#error = null;
-        this.#done = false;
+        this.#isDone = false;
     }
-    #endStream() {
+    #flush(value) {
+        while (this.#pendingPromises.length > 0) {
+            const nextPendingPromise = this.#pendingPromises.shift();
+            if (nextPendingPromise) {
+                nextPendingPromise.resolve({ done: true, value });
+            }
+        }
+    }
+    #done(value) {
+        this.#flush(value);
         this.#queue = [];
-        this.#resolveNext = null;
-        this.#rejectNext = null;
-        this.#done = true;
+        this.#pendingPromises = [];
+        this.#isDone = true;
+        this.#onDone?.();
+        if (this.#error) {
+            this.#onError?.(this.#error);
+        }
     }
     get error() {
         return this.#error;
     }
     get isDone() {
-        return this.#done;
+        return this.#isDone;
+    }
+    set onReturn(callback) {
+        this.#onReturn = callback;
+    }
+    set onError(callback) {
+        this.#onError = callback;
+    }
+    set onDone(callback) {
+        this.#onDone = callback;
     }
     callback = (error, value) => {
-        if (error) {
-            this.#error = error;
-            if (this.#rejectNext) {
-                this.#rejectNext(error);
-                this.#endStream();
-                this.onError?.(error);
-            }
-            return;
-        }
-        if (this.#done) {
+        if (this.#isDone) {
             return;
         }
-        if (this.#resolveNext) {
-            this.#resolveNext({
-                done: false,
-                value,
-            });
-            this.#resolveNext = null;
-            this.#rejectNext = null;
+        const nextPendingPromise = this.#pendingPromises.shift();
+        if (nextPendingPromise) {
+            const { resolve, reject } = nextPendingPromise;
+            if (error) {
+                this.#error = error;
+                reject(error);
+                this.#done();
+            }
+            else {
+                resolve({
+                    done: false,
+                    value,
+                });
+            }
         }
         else {
-            this.#queue.push(value);
+            this.#queue.push(error ?? value);
         }
     };
     next = () => {
-        if (this.#error) {
-            this.#endStream();
-            this.onError?.(this.#error);
-            return Promise.reject(this.#error);
-        }
-        if (this.#queue.length > 0) {
+        if (this.#isDone) {
             return Promise.resolve({
-                done: false,
-                value: this.#queue.shift(),
+                done: true,
+                value: undefined,
             });
         }
-        if (this.#done) {
+        if (this.#queue.length > 0) {
+            const value = this.#queue.shift();
+            if (value instanceof Error) {
+                this.#error = value;
+                this.#done();
+                return Promise.reject(value);
+            }
             return Promise.resolve({
-                done: true,
-                value: undefined,
+                done: false,
+                value,
             });
         }
         return new Promise((resolve, reject) => {
-            this.#resolveNext = resolve;
-            this.#rejectNext = reject;
+            this.#pendingPromises.push({ resolve, reject });
         });
     };
     return = (value) => {
-        this.#endStream();
-        this.onReturn?.();
+        this.#onReturn?.();
+        this.#done(value);
         return Promise.resolve({
             done: true,
             value,
@@ -222,29 +238,6 @@ class AccountAlreadyAssociatedError extends Error {
         super(`Account already associated with inbox ${inboxId}`);
     }
 }
-class GenerateSignatureError extends Error {
-    constructor(signatureType) {
-        let type = "";
-        switch (signatureType) {
-            case 0 /* SignatureRequestType.AddWallet */:
-                type = "add account";
-                break;
-            case 1 /* SignatureRequestType.CreateInbox */:
-                type = "create inbox";
-                break;
-            case 2 /* SignatureRequestType.RevokeWallet */:
-                type = "remove account";
-                break;
-            case 3 /* SignatureRequestType.RevokeInstallations */:
-                type = "revoke installations";
-                break;
-            case 4 /* SignatureRequestType.ChangeRecoveryIdentifier */:
-                type = "change recovery identifier";
-                break;
-        }
-        super(`Failed to generate ${type} signature text`);
-    }
-}
 class InvalidGroupMembershipChangeError extends Error {
     constructor(messageId) {
         super(`Invalid group membership change for message ${messageId}`);
@@ -353,7 +346,7 @@ class Conversation {
      * @param callback - Optional callback function for handling new stream values
      * @returns Stream instance for new messages
      */
-    stream(callback) {
+    stream(callback, onFail) {
         const asyncStream = new AsyncStream();
         const stream = this.#conversation.stream((error, value) => {
             let err = error;
@@ -368,8 +361,10 @@ class Conversation {
             }
             asyncStream.callback(err, message);
             callback?.(err, message);
-        });
-        asyncStream.onReturn = stream.end.bind(stream);
+        }, onFail ?? (() => { }));
+        asyncStream.onDone = () => {
+            stream.end();
+        };
         return asyncStream;
     }
     /**
@@ -921,7 +916,7 @@ class Conversations {
      * @param callback - Optional callback function for handling new stream value
      * @returns Stream instance for new conversations
      */
-    stream(callback) {
+    stream(callback, onFail) {
         const asyncStream = new AsyncStream();
         const stream = this.#conversations.stream((err, value) => {
             if (err) {
@@ -951,8 +946,10 @@ class Conversations {
                 asyncStream.callback(error, undefined);
                 callback?.(error, undefined);
             });
-        });
-        asyncStream.onReturn = stream.end.bind(stream);
+        }, onFail ?? (() => { }));
+        asyncStream.onDone = () => {
+            stream.end();
+        };
         return asyncStream;
     }
     /**
@@ -961,7 +958,7 @@ class Conversations {
      * @param callback - Optional callback function for handling new stream value
      * @returns Stream instance for new group conversations
      */
-    streamGroups(callback) {
+    streamGroups(callback, onFail) {
         const asyncStream = new AsyncStream();
         const stream = this.#conversations.stream((error, value) => {
             let err = error;
@@ -976,8 +973,10 @@ class Conversations {
             }
             asyncStream.callback(err, group);
             callback?.(err, group);
-        }, 1 /* ConversationType.Group */);
-        asyncStream.onReturn = stream.end.bind(stream);
+        }, onFail ?? (() => { }), 1 /* ConversationType.Group */);
+        asyncStream.onDone = () => {
+            stream.end();
+        };
         return asyncStream;
     }
     /**
@@ -986,7 +985,7 @@ class Conversations {
      * @param callback - Optional callback function for handling new stream value
      * @returns Stream instance for new DM conversations
      */
-    streamDms(callback) {
+    streamDms(callback, onFail) {
         const asyncStream = new AsyncStream();
         const stream = this.#conversations.stream((error, value) => {
             let err = error;
@@ -1001,8 +1000,10 @@ class Conversations {
             }
             asyncStream.callback(err, dm);
             callback?.(err, dm);
-        }, 0 /* ConversationType.Dm */);
-        asyncStream.onReturn = stream.end.bind(stream);
+        }, onFail ?? (() => { }), 0 /* ConversationType.Dm */);
+        asyncStream.onDone = () => {
+            stream.end();
+        };
         return asyncStream;
     }
     /**
@@ -1011,7 +1012,7 @@ class Conversations {
      * @param callback - Optional callback function for handling new stream value
      * @returns Stream instance for new messages
      */
-    async streamAllMessages(callback, conversationType, consentStates) {
+    async streamAllMessages(callback, conversationType, consentStates, onFail) {
         // sync conversations first
         await this.sync();
         const asyncStream = new AsyncStream();
@@ -1028,8 +1029,10 @@ class Conversations {
             }
             asyncStream.callback(err, message);
             callback?.(err, message);
-        }, conversationType, consentStates);
-        asyncStream.onReturn = stream.end.bind(stream);
+        }, onFail ?? (() => { }), conversationType, consentStates);
+        asyncStream.onDone = () => {
+            stream.end();
+        };
         return asyncStream;
     }
     /**
@@ -1038,8 +1041,8 @@ class Conversations {
      * @param callback - Optional callback function for handling new stream value
      * @returns Stream instance for new group messages
      */
-    async streamAllGroupMessages(callback, consentStates) {
-        return this.streamAllMessages(callback, 1 /* ConversationType.Group */, consentStates);
+    async streamAllGroupMessages(callback, consentStates, onFail) {
+        return this.streamAllMessages(callback, 1 /* ConversationType.Group */, consentStates, onFail);
     }
     /**
      * Creates a stream for all new DM messages
@@ -1047,8 +1050,8 @@ class Conversations {
      * @param callback - Optional callback function for handling new stream value
      * @returns Stream instance for new DM messages
      */
-    async streamAllDmMessages(callback, consentStates) {
-        return this.streamAllMessages(callback, 0 /* ConversationType.Dm */, consentStates);
+    async streamAllDmMessages(callback, consentStates, onFail) {
+        return this.streamAllMessages(callback, 0 /* ConversationType.Dm */, consentStates, onFail);
     }
     /**
      * Retrieves HMAC keys for all conversations
@@ -1060,6 +1063,37 @@ class Conversations {
     }
 }
 
+/**
+ * Debug information helpers for the client
+ *
+ * This class is not intended to be initialized directly.
+ */
+class DebugInformation {
+    #client;
+    #options;
+    constructor(client, options) {
+        this.#client = client;
+        this.#options = options;
+    }
+    apiStatistics() {
+        return this.#client.apiStatistics();
+    }
+    apiIdentityStatistics() {
+        return this.#client.apiIdentityStatistics();
+    }
+    apiAggregateStatistics() {
+        return this.#client.apiAggregateStatistics();
+    }
+    clearAllStatistics() {
+        this.#client.clearAllStatistics();
+    }
+    uploadDebugArchive(serverUrl) {
+        const env = this.#options?.env || "dev";
+        const historySyncUrl = this.#options?.historySyncUrl || HistorySyncUrls[env];
+        return this.#client.uploadDebugArchive(serverUrl || historySyncUrl);
+    }
+}
+
 /**
  * Manages user preferences and consent states
  *
@@ -1134,7 +1168,7 @@ class Preferences {
      * @param callback - Optional callback function for handling stream updates
      * @returns Stream instance for consent updates
      */
-    streamConsent(callback) {
+    streamConsent(callback, onFail) {
         const asyncStream = new AsyncStream();
         const stream = this.#conversations.streamConsent((err, value) => {
             if (err) {
@@ -1144,8 +1178,10 @@ class Preferences {
             }
             asyncStream.callback(null, value);
             callback?.(null, value);
-        });
-        asyncStream.onReturn = stream.end.bind(stream);
+        }, onFail ?? (() => { }));
+        asyncStream.onDone = () => {
+            stream.end();
+        };
         return asyncStream;
     }
     /**
@@ -1154,7 +1190,7 @@ class Preferences {
      * @param callback - Optional callback function for handling stream updates
      * @returns Stream instance for preference updates
      */
-    streamPreferences(callback) {
+    streamPreferences(callback, onFail) {
         const asyncStream = new AsyncStream();
         const stream = this.#conversations.streamPreferences((err, value) => {
             if (err) {
@@ -1165,8 +1201,10 @@ class Preferences {
             // TODO: remove this once the node bindings type is updated
             asyncStream.callback(null, value);
             callback?.(null, value);
-        });
-        asyncStream.onReturn = stream.end.bind(stream);
+        }, onFail ?? (() => { }));
+        asyncStream.onDone = () => {
+            stream.end();
+        };
         return asyncStream;
     }
 }
@@ -1210,6 +1248,7 @@ const version = `${bindingsVersion.branch}@${bindingsVersion.version} (${binding
 class Client {
     #client;
     #conversations;
+    #debugInformation;
     #preferences;
     #signer;
     #codecs;
@@ -1248,6 +1287,7 @@ class Client {
         this.#client = await createClient(identifier, this.#options);
         const conversations = this.#client.conversations();
         this.#conversations = new Conversations(this, conversations);
+        this.#debugInformation = new DebugInformation(this.#client, this.#options);
         this.#preferences = new Preferences(this.#client, conversations);
     }
     /**
@@ -1352,6 +1392,17 @@ class Client {
         }
         return this.#conversations;
     }
+    /**
+     * Gets the debug information helpersfor this client
+     *
+     * @throws {ClientNotInitializedError} if the client is not initialized
+     */
+    get debugInformation() {
+        if (!this.#debugInformation) {
+            throw new ClientNotInitializedError();
+        }
+        return this.#debugInformation;
+    }
     /**
      * Gets the preferences manager for this client
      *
@@ -1364,31 +1415,61 @@ class Client {
         return this.#preferences;
     }
     /**
-     * Creates signature text for creating a new inbox
+     * Adds a signature to a signature request using the client's signer (or the
+     * provided signer)
      *
      * WARNING: This function should be used with caution. It is only provided
      * for use in special cases where the provided workflows do not meet the
      * requirements of an application.
      *
-     * It is highly recommended to use the `register` method instead.
+     * It is highly recommended to use the `register`, `unsafe_addAccount`,
+     * `removeAccount`, `revokeAllOtherInstallations`, or `revokeInstallations`
+     * methods instead.
      *
-     * @returns The signature text
+     * @param signatureRequest - The signature request to add the signature to
      * @throws {ClientNotInitializedError} if the client is not initialized
+     * @throws {SignerUnavailableError} if no signer is available
      */
-    async unsafe_createInboxSignatureText() {
+    async unsafe_addSignature(signatureRequest, signer) {
         if (!this.#client) {
             throw new ClientNotInitializedError();
         }
-        try {
-            const signatureText = await this.#client.createInboxSignatureText();
-            return signatureText;
+        if (!this.#signer) {
+            throw new SignerUnavailableError();
         }
-        catch {
-            return undefined;
+        const finalSigner = signer ?? this.#signer;
+        const signature = await finalSigner.signMessage(await signatureRequest.signatureText());
+        const identifier = await finalSigner.getIdentifier();
+        switch (finalSigner.type) {
+            case "SCW":
+                await signatureRequest.addScwSignature(identifier, signature, finalSigner.getChainId(), finalSigner.getBlockNumber?.());
+                break;
+            case "EOA":
+                await signatureRequest.addEcdsaSignature(signature);
+                break;
+        }
+    }
+    /**
+     * Returns a signature request handler for creating a new inbox
+     *
+     * WARNING: This function should be used with caution. It is only provided
+     * for use in special cases where the provided workflows do not meet the
+     * requirements of an application.
+     *
+     * It is highly recommended to use the `register` method instead.
+     *
+     * @returns The signature text
+     * @throws {ClientNotInitializedError} if the client is not initialized
+     */
+    async unsafe_createInboxSignatureRequest() {
+        if (!this.#client) {
+            throw new ClientNotInitializedError();
         }
+        return this.#client.createInboxSignatureRequest();
     }
     /**
-     * Creates signature text for adding a new account to the client's inbox
+     * Returns a signature request handler for adding a new account to the
+     * client's inbox
      *
      * WARNING: This function should be used with caution. It is only provided
      * for use in special cases where the provided workflows do not meet the
@@ -1404,23 +1485,18 @@ class Client {
      * @returns The signature text
      * @throws {ClientNotInitializedError} if the client is not initialized
      */
-    async unsafe_addAccountSignatureText(newAccountIdentifier, allowInboxReassign = false) {
+    async unsafe_addAccountSignatureRequest(newAccountIdentifier, allowInboxReassign = false) {
         if (!this.#client) {
             throw new ClientNotInitializedError();
         }
         if (!allowInboxReassign) {
             throw new InboxReassignError();
         }
-        try {
-            const signatureText = await this.#client.addIdentifierSignatureText(newAccountIdentifier);
-            return signatureText;
-        }
-        catch {
-            return undefined;
-        }
+        return this.#client.addIdentifierSignatureRequest(newAccountIdentifier);
     }
     /**
-     * Creates signature text for removing an account from the client's inbox
+     * Returns a signature request handler for removing an account from the
+     * client's inbox
      *
      * WARNING: This function should be used with caution. It is only provided
      * for use in special cases where the provided workflows do not meet the
@@ -1432,21 +1508,15 @@ class Client {
      * @returns The signature text
      * @throws {ClientNotInitializedError} if the client is not initialized
      */
-    async unsafe_removeAccountSignatureText(identifier) {
+    async unsafe_removeAccountSignatureRequest(identifier) {
         if (!this.#client) {
             throw new ClientNotInitializedError();
         }
-        try {
-            const signatureText = await this.#client.revokeIdentifierSignatureText(identifier);
-            return signatureText;
-        }
-        catch {
-            return undefined;
-        }
+        return this.#client.revokeIdentifierSignatureRequest(identifier);
     }
     /**
-     * Creates signature text for revoking all other installations of the
-     * client's inbox
+     * Returns a signature request handler for revoking all other installations
+     * of the client's inbox
      *
      * WARNING: This function should be used with caution. It is only provided
      * for use in special cases where the provided workflows do not meet the
@@ -1457,21 +1527,15 @@ class Client {
      * @returns The signature text
      * @throws {ClientNotInitializedError} if the client is not initialized
      */
-    async unsafe_revokeAllOtherInstallationsSignatureText() {
+    async unsafe_revokeAllOtherInstallationsSignatureRequest() {
         if (!this.#client) {
             throw new ClientNotInitializedError();
         }
-        try {
-            const signatureText = await this.#client.revokeAllOtherInstallationsSignatureText();
-            return signatureText;
-        }
-        catch {
-            return undefined;
-        }
+        return this.#client.revokeAllOtherInstallationsSignatureRequest();
     }
     /**
-     * Creates signature text for revoking specific installations of the
-     * client's inbox
+     * Returns a signature request handler for revoking specific installations
+     * of the client's inbox
      *
      * WARNING: This function should be used with caution. It is only provided
      * for use in special cases where the provided workflows do not meet the
@@ -1483,21 +1547,15 @@ class Client {
      * @returns The signature text
      * @throws {ClientNotInitializedError} if the client is not initialized
      */
-    async unsafe_revokeInstallationsSignatureText(installationIds) {
+    async unsafe_revokeInstallationsSignatureRequest(installationIds) {
         if (!this.#client) {
             throw new ClientNotInitializedError();
         }
-        try {
-            const signatureText = await this.#client.revokeInstallationsSignatureText(installationIds);
-            return signatureText;
-        }
-        catch {
-            return undefined;
-        }
+        return this.#client.revokeInstallationsSignatureRequest(installationIds);
     }
     /**
-     * Creates signature text for changing the recovery identifier for this
-     * client's inbox
+     * Returns a signature request handler for changing the recovery identifier
+     * for this client's inbox
      *
      * WARNING: This function should be used with caution. It is only provided
      * for use in special cases where the provided workflows do not meet the
@@ -1509,49 +1567,14 @@ class Client {
      * @returns The signature text
      * @throws {ClientNotInitializedError} if the client is not initialized
      */
-    async unsafe_changeRecoveryIdentifierSignatureText(identifier) {
-        if (!this.#client) {
-            throw new ClientNotInitializedError();
-        }
-        try {
-            const signatureText = await this.#client.changeRecoveryIdentifierSignatureText(identifier);
-            return signatureText;
-        }
-        catch {
-            return undefined;
-        }
-    }
-    /**
-     * Adds a signature for a specific request type
-     *
-     * WARNING: This function should be used with caution. It is only provided
-     * for use in special cases where the provided workflows do not meet the
-     * requirements of an application.
-     *
-     * It is highly recommended to use the `register`, `unsafe_addAccount`,
-     * `removeAccount`, `revokeAllOtherInstallations`, or `revokeInstallations`
-     * methods instead.
-     *
-     * @param signatureType - The type of signature request
-     * @param signatureText - The text to sign
-     * @param signer - The signer to use
-     * @throws {ClientNotInitializedError} if the client is not initialized
-     */
-    async unsafe_addSignature(signatureType, signatureText, signer) {
+    async unsafe_changeRecoveryIdentifierSignatureRequest(identifier) {
         if (!this.#client) {
             throw new ClientNotInitializedError();
         }
-        switch (signer.type) {
-            case "SCW":
-                await this.#client.addScwSignature(signatureType, await signer.signMessage(signatureText), signer.getChainId(), signer.getBlockNumber?.());
-                break;
-            case "EOA":
-                await this.#client.addEcdsaSignature(signatureType, await signer.signMessage(signatureText));
-                break;
-        }
+        return this.#client.changeRecoveryIdentifierSignatureRequest(identifier);
     }
     /**
-     * Applies all pending signatures
+     * Applies a signature request to the client
      *
      * WARNING: This function should be used with caution. It is only provided
      * for use in special cases where the provided workflows do not meet the
@@ -1563,11 +1586,11 @@ class Client {
      *
      * @throws {ClientNotInitializedError} if the client is not initialized
      */
-    async unsafe_applySignatures() {
+    async unsafe_applySignatureRequest(signatureRequest) {
         if (!this.#client) {
             throw new ClientNotInitializedError();
         }
-        return this.#client.applySignatureRequests();
+        return this.#client.applySignatureRequest(signatureRequest);
     }
     /**
      * Registers the client with the XMTP network
@@ -1578,19 +1601,12 @@ class Client {
      * @throws {SignerUnavailableError} if no signer is available
      */
     async register() {
-        if (!this.#client) {
-            throw new ClientNotInitializedError();
-        }
-        if (!this.#signer) {
-            throw new SignerUnavailableError();
-        }
-        const signatureText = await this.unsafe_createInboxSignatureText();
-        // if the signature text is not available, the client is already registered
-        if (!signatureText) {
+        const signatureRequest = await this.unsafe_createInboxSignatureRequest();
+        if (!signatureRequest) {
             return;
         }
-        await this.unsafe_addSignature(1 /* SignatureRequestType.CreateInbox */, signatureText, this.#signer);
-        return this.#client.registerIdentity();
+        await this.unsafe_addSignature(signatureRequest);
+        await this.#client?.registerIdentity(signatureRequest);
     }
     /**
      * Adds a new account to the client inbox
@@ -1606,27 +1622,20 @@ class Client {
      *
      * @param newAccountSigner - The signer for the new account
      * @param allowInboxReassign - Whether to allow inbox reassignment
-     * @throws {ClientNotInitializedError} if the client is not initialized
      * @throws {AccountAlreadyAssociatedError} if the account is already associated with an inbox ID
-     * @throws {GenerateSignatureError} if the signature cannot be generated
+     * @throws {ClientNotInitializedError} if the client is not initialized
      * @throws {SignerUnavailableError} if no signer is available
      */
     async unsafe_addAccount(newAccountSigner, allowInboxReassign = false) {
-        if (!this.#client) {
-            throw new ClientNotInitializedError();
-        }
         // check for existing inbox id
         const identifier = await newAccountSigner.getIdentifier();
         const existingInboxId = await this.getInboxIdByIdentifier(identifier);
         if (existingInboxId && !allowInboxReassign) {
             throw new AccountAlreadyAssociatedError(existingInboxId);
         }
-        const signatureText = await this.unsafe_addAccountSignatureText(identifier, true);
-        if (!signatureText) {
-            throw new GenerateSignatureError(0 /* SignatureRequestType.AddWallet */);
-        }
-        await this.unsafe_addSignature(0 /* SignatureRequestType.AddWallet */, signatureText, newAccountSigner);
-        await this.unsafe_applySignatures();
+        const signatureRequest = await this.unsafe_addAccountSignatureRequest(identifier, allowInboxReassign);
+        await this.unsafe_addSignature(signatureRequest, newAccountSigner);
+        await this.unsafe_applySignatureRequest(signatureRequest);
     }
     /**
      * Removes an account from the client's inbox
@@ -1635,22 +1644,12 @@ class Client {
      *
      * @param identifier - The identifier of the account to remove
      * @throws {ClientNotInitializedError} if the client is not initialized
-     * @throws {GenerateSignatureError} if the signature cannot be generated
      * @throws {SignerUnavailableError} if no signer is available
      */
     async removeAccount(identifier) {
-        if (!this.#client) {
-            throw new ClientNotInitializedError();
-        }
-        if (!this.#signer) {
-            throw new SignerUnavailableError();
-        }
-        const signatureText = await this.unsafe_removeAccountSignatureText(identifier);
-        if (!signatureText) {
-            throw new GenerateSignatureError(2 /* SignatureRequestType.RevokeWallet */);
-        }
-        await this.unsafe_addSignature(2 /* SignatureRequestType.RevokeWallet */, signatureText, this.#signer);
-        await this.unsafe_applySignatures();
+        const signatureRequest = await this.unsafe_removeAccountSignatureRequest(identifier);
+        await this.unsafe_addSignature(signatureRequest);
+        await this.unsafe_applySignatureRequest(signatureRequest);
     }
     /**
      * Revokes all other installations of the client's inbox
@@ -1658,22 +1657,12 @@ class Client {
      * Requires a signer, use `Client.create` to create a client with a signer.
      *
      * @throws {ClientNotInitializedError} if the client is not initialized
-     * @throws {GenerateSignatureError} if the signature cannot be generated
      * @throws {SignerUnavailableError} if no signer is available
      */
     async revokeAllOtherInstallations() {
-        if (!this.#client) {
-            throw new ClientNotInitializedError();
-        }
-        if (!this.#signer) {
-            throw new SignerUnavailableError();
-        }
-        const signatureText = await this.unsafe_revokeAllOtherInstallationsSignatureText();
-        if (!signatureText) {
-            throw new GenerateSignatureError(3 /* SignatureRequestType.RevokeInstallations */);
-        }
-        await this.unsafe_addSignature(3 /* SignatureRequestType.RevokeInstallations */, signatureText, this.#signer);
-        await this.unsafe_applySignatures();
+        const signatureRequest = await this.unsafe_revokeAllOtherInstallationsSignatureRequest();
+        await this.unsafe_addSignature(signatureRequest);
+        await this.unsafe_applySignatureRequest(signatureRequest);
     }
     /**
      * Revokes specific installations of the client's inbox
@@ -1683,21 +1672,46 @@ class Client {
      * @param installationIds - The installation IDs to revoke
      * @throws {ClientNotInitializedError} if the client is not initialized
      * @throws {SignerUnavailableError} if no signer is available
-     * @throws {GenerateSignatureError} if the signature cannot be generated
      */
     async revokeInstallations(installationIds) {
-        if (!this.#client) {
-            throw new ClientNotInitializedError();
-        }
-        if (!this.#signer) {
-            throw new SignerUnavailableError();
-        }
-        const signatureText = await this.unsafe_revokeInstallationsSignatureText(installationIds);
-        if (!signatureText) {
-            throw new GenerateSignatureError(3 /* SignatureRequestType.RevokeInstallations */);
+        const signatureRequest = await this.unsafe_revokeInstallationsSignatureRequest(installationIds);
+        await this.unsafe_addSignature(signatureRequest);
+        await this.unsafe_applySignatureRequest(signatureRequest);
+    }
+    /**
+     * Revokes specific installations of the client's inbox without a client
+     *
+     * @param env - The environment to use
+     * @param signer - The signer to use
+     * @param inboxId - The inbox ID to revoke installations for
+     * @param installationIds - The installation IDs to revoke
+     */
+    static async revokeInstallations(signer, inboxId, installationIds, env) {
+        const host = ApiUrls[env ?? "dev"];
+        const identifier = await signer.getIdentifier();
+        const signatureRequest = await revokeInstallationsSignatureRequest(host, identifier, inboxId, installationIds);
+        const signatureText = await signatureRequest.signatureText();
+        const signature = await signer.signMessage(signatureText);
+        switch (signer.type) {
+            case "SCW":
+                await signatureRequest.addScwSignature(identifier, signature, signer.getChainId(), signer.getBlockNumber?.());
+                break;
+            case "EOA":
+                await signatureRequest.addEcdsaSignature(signature);
+                break;
         }
-        await this.unsafe_addSignature(3 /* SignatureRequestType.RevokeInstallations */, signatureText, this.#signer);
-        await this.unsafe_applySignatures();
+        await applySignatureRequest(host, signatureRequest);
+    }
+    /**
+     * Gets the inbox state for the specified inbox IDs without a client
+     *
+     * @param env - The environment to use
+     * @param inboxIds - The inbox IDs to get the state for
+     * @returns The inbox state for the specified inbox IDs
+     */
+    static async inboxStateFromInboxIds(inboxIds, env) {
+        const host = ApiUrls[env ?? "dev"];
+        return inboxStateFromInboxIds(host, inboxIds);
     }
     /**
      * Changes the recovery identifier for the client's inbox
@@ -1707,21 +1721,11 @@ class Client {
      * @param identifier - The new recovery identifier
      * @throws {ClientNotInitializedError} if the client is not initialized
      * @throws {SignerUnavailableError} if no signer is available
-     * @throws {GenerateSignatureError} if the signature cannot be generated
      */
     async changeRecoveryIdentifier(identifier) {
-        if (!this.#client) {
-            throw new ClientNotInitializedError();
-        }
-        if (!this.#signer) {
-            throw new SignerUnavailableError();
-        }
-        const signatureText = await this.unsafe_changeRecoveryIdentifierSignatureText(identifier);
-        if (!signatureText) {
-            throw new GenerateSignatureError(4 /* SignatureRequestType.ChangeRecoveryIdentifier */);
-        }
-        await this.unsafe_addSignature(4 /* SignatureRequestType.ChangeRecoveryIdentifier */, signatureText, this.#signer);
-        await this.unsafe_applySignatures();
+        const signatureRequest = await this.unsafe_changeRecoveryIdentifierSignatureRequest(identifier);
+        await this.unsafe_addSignature(signatureRequest);
+        await this.unsafe_applySignatureRequest(signatureRequest);
     }
     /**
      * Checks if the client can message the specified identifiers
@@ -1886,8 +1890,8 @@ class Client {
      * @param options - Optional network options
      * @returns Whether the address is authorized
      */
-    static async isAddressAuthorized(inboxId, address, options) {
-        const host = options?.apiUrl || ApiUrls[options?.env || "dev"];
+    static async isAddressAuthorized(inboxId, address, env) {
+        const host = ApiUrls[env ?? "dev"];
         return await isAddressAuthorized(host, inboxId, address);
     }
     /**
@@ -1898,8 +1902,8 @@ class Client {
      * @param options - Optional network options
      * @returns Whether the installation is authorized
      */
-    static async isInstallationAuthorized(inboxId, installation, options) {
-        const host = options?.apiUrl || ApiUrls[options?.env || "dev"];
+    static async isInstallationAuthorized(inboxId, installation, env) {
+        const host = ApiUrls[env ?? "dev"];
         return await isInstallationAuthorized(host, inboxId, installation);
     }
     /**
@@ -1910,5 +1914,5 @@ class Client {
     }
 }
 
-export { ApiUrls, Client, Conversation, Conversations, DecodedMessage, Dm, Group, HistorySyncUrls, generateInboxId, getInboxIdForIdentifier };
+export { AccountAlreadyAssociatedError, ApiUrls, Client, ClientNotInitializedError, CodecNotFoundError, Conversation, Conversations, DecodedMessage, Dm, Group, HistorySyncUrls, InboxReassignError, InvalidGroupMembershipChangeError, MissingContentTypeError, SignerUnavailableError, generateInboxId, getInboxIdForIdentifier };
 //# sourceMappingURL=index.js.map