@xmtp/browser-sdk 0.0.18 → 0.0.19

package/src/WorkerConversations.ts

@@ -1,14 +1,18 @@
 import {
   ConversationType,
+  type ConsentState,
   type Conversation,
+  type ConversationListItem,
   type Conversations,
   type Message,
 } from "@xmtp/wasm-bindings";
 import type { StreamCallback } from "@/AsyncStream";
 import {
+  fromSafeCreateDmOptions,
   fromSafeCreateGroupOptions,
   fromSafeListConversationsOptions,
   type HmacKeys,
+  type SafeCreateDmOptions,
   type SafeCreateGroupOptions,
   type SafeListConversationsOptions,
 } from "@/utils/conversions";
@@ -29,8 +33,8 @@ export class WorkerConversations {
     return this.#conversations.sync();
   }
 
-  async syncAll() {
-    return this.#conversations.syncAllConversations();
+  async syncAll(consentStates?: ConsentState[]) {
+    return this.#conversations.syncAllConversations(consentStates);
   }
 
   getConversationById(id: string) {
@@ -64,8 +68,10 @@ export class WorkerConversations {
   list(options?: SafeListConversationsOptions) {
     const groups = this.#conversations.list(
       options ? fromSafeListConversationsOptions(options) : undefined,
-    ) as Conversation[];
-    return groups.map((group) => new WorkerConversation(this.#client, group));
+    ) as ConversationListItem[];
+    return groups.map(
+      (item) => new WorkerConversation(this.#client, item.conversation),
+    );
   }
 
   listGroups(
@@ -73,15 +79,19 @@ export class WorkerConversations {
   ) {
     const groups = this.#conversations.listGroups(
       options ? fromSafeListConversationsOptions(options) : undefined,
-    ) as Conversation[];
-    return groups.map((group) => new WorkerConversation(this.#client, group));
+    ) as ConversationListItem[];
+    return groups.map(
+      (item) => new WorkerConversation(this.#client, item.conversation),
+    );
   }
 
   listDms(options?: Omit<SafeListConversationsOptions, "conversation_type">) {
     const groups = this.#conversations.listDms(
       options ? fromSafeListConversationsOptions(options) : undefined,
-    ) as Conversation[];
-    return groups.map((group) => new WorkerConversation(this.#client, group));
+    ) as ConversationListItem[];
+    return groups.map(
+      (item) => new WorkerConversation(this.#client, item.conversation),
+    );
   }
 
   async newGroup(accountAddresses: string[], options?: SafeCreateGroupOptions) {
@@ -92,8 +102,30 @@ export class WorkerConversations {
     return new WorkerConversation(this.#client, group);
   }
 
-  async newDm(accountAddress: string) {
-    const group = await this.#conversations.createDm(accountAddress);
+  async newGroupByInboxIds(
+    inboxIds: string[],
+    options?: SafeCreateGroupOptions,
+  ) {
+    const group = await this.#conversations.createGroupByInboxIds(
+      inboxIds,
+      options ? fromSafeCreateGroupOptions(options) : undefined,
+    );
+    return new WorkerConversation(this.#client, group);
+  }
+
+  async newDm(accountAddress: string, options?: SafeCreateDmOptions) {
+    const group = await this.#conversations.createDm(
+      accountAddress,
+      options ? fromSafeCreateDmOptions(options) : undefined,
+    );
+    return new WorkerConversation(this.#client, group);
+  }
+
+  async newDmByInboxId(inboxId: string, options?: SafeCreateDmOptions) {
+    const group = await this.#conversations.createDmByInboxId(
+      inboxId,
+      options ? fromSafeCreateDmOptions(options) : undefined,
+    );
     return new WorkerConversation(this.#client, group);
   }
 

package/src/types/clientEvents.ts

@@ -20,6 +20,7 @@ import type {
 import type {
   SafeConsent,
   SafeConversation,
+  SafeCreateDmOptions,
   SafeCreateGroupOptions,
   SafeEncodedContent,
   SafeGroupMember,
@@ -28,6 +29,7 @@ import type {
   SafeListConversationsOptions,
   SafeListMessagesOptions,
   SafeMessage,
+  SafeMessageDisappearingSettings,
 } from "@/utils/conversions";
 
 export type ClientEvents =
@@ -269,12 +271,31 @@ export type ClientEvents =
         options?: SafeCreateGroupOptions;
       };
     }
+  | {
+      action: "newGroupByInboxIds";
+      id: string;
+      result: SafeConversation;
+      data: {
+        inboxIds: string[];
+        options?: SafeCreateGroupOptions;
+      };
+    }
   | {
       action: "newDm";
       id: string;
       result: SafeConversation;
       data: {
         accountAddress: string;
+        options?: SafeCreateDmOptions;
+      };
+    }
+  | {
+      action: "newDmByInboxId";
+      id: string;
+      result: SafeConversation;
+      data: {
+        inboxId: string;
+        options?: SafeCreateDmOptions;
       };
     }
   | {
@@ -287,7 +308,9 @@ export type ClientEvents =
       action: "syncAllConversations";
       id: string;
       result: undefined;
-      data: undefined;
+      data: {
+        consentStates?: ConsentState[];
+      };
     }
   | {
       action: "getHmacKeys";
@@ -544,6 +567,38 @@ export type ClientEvents =
         id: string;
       };
     }
+  | {
+      action: "getGroupMessageDisappearingSettings";
+      id: string;
+      result: SafeMessageDisappearingSettings | undefined;
+      data: {
+        id: string;
+      };
+    }
+  | {
+      action: "updateGroupMessageDisappearingSettings";
+      id: string;
+      result: undefined;
+      data: SafeMessageDisappearingSettings & {
+        id: string;
+      };
+    }
+  | {
+      action: "removeGroupMessageDisappearingSettings";
+      id: string;
+      result: undefined;
+      data: {
+        id: string;
+      };
+    }
+  | {
+      action: "isGroupMessageDisappearingEnabled";
+      id: string;
+      result: boolean;
+      data: {
+        id: string;
+      };
+    }
   | {
       action: "streamGroupMessages";
       id: string;

package/src/utils/conversions.ts

@@ -4,11 +4,13 @@ import {
 } from "@xmtp/content-type-primitives";
 import {
   Consent,
+  CreateDMOptions,
   CreateGroupOptions,
   GroupMember,
   GroupPermissionsOptions,
   ListConversationsOptions,
   ListMessagesOptions,
+  MessageDisappearingSettings,
   PermissionPolicySet,
   ContentTypeId as WasmContentTypeId,
   EncodedContent as WasmEncodedContent,
@@ -175,9 +177,12 @@ export const fromSafeListMessagesOptions = (
 
 export type SafeListConversationsOptions = {
   allowedStates?: GroupMembershipState[];
+  consentStates?: ConsentState[];
   conversationType?: ConversationType;
   createdAfterNs?: bigint;
   createdBeforeNs?: bigint;
+  includeDuplicateDms?: boolean;
+  includeSyncGroups?: boolean;
   limit?: bigint;
 };
 
@@ -185,9 +190,12 @@ export const toSafeListConversationsOptions = (
   options: ListConversationsOptions,
 ): SafeListConversationsOptions => ({
   allowedStates: options.allowedStates,
+  consentStates: options.consentStates,
   conversationType: options.conversationType,
   createdAfterNs: options.createdAfterNs,
   createdBeforeNs: options.createdBeforeNs,
+  includeDuplicateDms: options.includeDuplicateDms,
+  includeSyncGroups: options.includeSyncGroups,
   limit: options.limit,
 });
 
@@ -196,9 +204,12 @@ export const fromSafeListConversationsOptions = (
 ): ListConversationsOptions =>
   new ListConversationsOptions(
     options.allowedStates,
+    options.consentStates,
     options.conversationType,
     options.createdAfterNs,
     options.createdBeforeNs,
+    options.includeDuplicateDms ?? false,
+    options.includeSyncGroups ?? false,
     options.limit,
   );
 
@@ -244,6 +255,7 @@ export type SafeCreateGroupOptions = {
   customPermissionPolicySet?: SafePermissionPolicySet;
   description?: string;
   imageUrlSquare?: string;
+  messageDisappearingSettings?: SafeMessageDisappearingSettings;
   name?: string;
   permissions?: GroupPermissionsOptions;
 };
@@ -251,11 +263,14 @@ export type SafeCreateGroupOptions = {
 export const toSafeCreateGroupOptions = (
   options: CreateGroupOptions,
 ): SafeCreateGroupOptions => ({
+  customPermissionPolicySet: options.customPermissionPolicySet,
   description: options.groupDescription,
   imageUrlSquare: options.groupImageUrlSquare,
+  messageDisappearingSettings: options.messageDisappearingSettings
+    ? toSafeMessageDisappearingSettings(options.messageDisappearingSettings)
+    : undefined,
   name: options.groupName,
   permissions: options.permissions,
-  customPermissionPolicySet: options.customPermissionPolicySet,
 });
 
 export const fromSafeCreateGroupOptions = (
@@ -271,6 +286,30 @@ export const fromSafeCreateGroupOptions = (
     options.permissions === GroupPermissionsOptions.CustomPolicy
       ? fromSafePermissionPolicySet(options.customPermissionPolicySet)
       : undefined,
+    options.messageDisappearingSettings
+      ? fromSafeMessageDisappearingSettings(options.messageDisappearingSettings)
+      : undefined,
+  );
+
+export type SafeCreateDmOptions = {
+  messageDisappearingSettings?: SafeMessageDisappearingSettings;
+};
+
+export const toSafeCreateDmOptions = (
+  options: CreateDMOptions,
+): SafeCreateDmOptions => ({
+  messageDisappearingSettings: options.messageDisappearingSettings
+    ? toSafeMessageDisappearingSettings(options.messageDisappearingSettings)
+    : undefined,
+});
+
+export const fromSafeCreateDmOptions = (
+  options: SafeCreateDmOptions,
+): CreateDMOptions =>
+  new CreateDMOptions(
+    options.messageDisappearingSettings
+      ? fromSafeMessageDisappearingSettings(options.messageDisappearingSettings)
+      : undefined,
   );
 
 export type SafeConversation = {
@@ -427,3 +466,20 @@ export const toSafeHmacKey = (hmacKey: HmacKey): SafeHmacKey => ({
 
 export type HmacKeys = Map<string, HmacKey[]>;
 export type SafeHmacKeys = Record<string, SafeHmacKey[]>;
+
+export type SafeMessageDisappearingSettings = {
+  fromNs: bigint;
+  inNs: bigint;
+};
+
+export const toSafeMessageDisappearingSettings = (
+  settings: MessageDisappearingSettings,
+): SafeMessageDisappearingSettings => ({
+  fromNs: settings.fromNs,
+  inNs: settings.inNs,
+});
+
+export const fromSafeMessageDisappearingSettings = (
+  settings: SafeMessageDisappearingSettings,
+): MessageDisappearingSettings =>
+  new MessageDisappearingSettings(settings.fromNs, settings.inNs);

package/src/workers/client.ts

@@ -17,6 +17,7 @@ import {
   toSafeHmacKey,
   toSafeInboxState,
   toSafeMessage,
+  toSafeMessageDisappearingSettings,
 } from "@/utils/conversions";
 import { WorkerClient } from "@/WorkerClient";
 import { WorkerConversation } from "@/WorkerConversation";
@@ -430,9 +431,34 @@ self.onmessage = async (event: MessageEvent<ClientEventsClientMessageData>) => {
         });
         break;
       }
+      case "newGroupByInboxIds": {
+        const conversation = await client.conversations.newGroupByInboxIds(
+          data.inboxIds,
+          data.options,
+        );
+        postMessage({
+          id,
+          action,
+          result: await toSafeConversation(conversation),
+        });
+        break;
+      }
       case "newDm": {
         const conversation = await client.conversations.newDm(
           data.accountAddress,
+          data.options,
+        );
+        postMessage({
+          id,
+          action,
+          result: await toSafeConversation(conversation),
+        });
+        break;
+      }
+      case "newDmByInboxId": {
+        const conversation = await client.conversations.newDmByInboxId(
+          data.inboxId,
+          data.options,
         );
         postMessage({
           id,
@@ -451,7 +477,7 @@ self.onmessage = async (event: MessageEvent<ClientEventsClientMessageData>) => {
         break;
       }
       case "syncAllConversations": {
-        await client.conversations.syncAll();
+        await client.conversations.syncAll(data.consentStates);
         postMessage({
           id,
           action,
@@ -980,6 +1006,80 @@ self.onmessage = async (event: MessageEvent<ClientEventsClientMessageData>) => {
         }
         break;
       }
+      case "getGroupMessageDisappearingSettings": {
+        const group = client.conversations.getConversationById(data.id);
+        if (group) {
+          const result = group.messageDisappearingSettings();
+          postMessage({
+            id,
+            action,
+            result: result
+              ? toSafeMessageDisappearingSettings(result)
+              : undefined,
+          });
+        } else {
+          postMessageError({
+            id,
+            action,
+            error: "Group not found",
+          });
+        }
+        break;
+      }
+      case "updateGroupMessageDisappearingSettings": {
+        const group = client.conversations.getConversationById(data.id);
+        if (group) {
+          await group.updateMessageDisappearingSettings(data.fromNs, data.inNs);
+          postMessage({
+            id,
+            action,
+            result: undefined,
+          });
+        } else {
+          postMessageError({
+            id,
+            action,
+            error: "Group not found",
+          });
+        }
+        break;
+      }
+      case "removeGroupMessageDisappearingSettings": {
+        const group = client.conversations.getConversationById(data.id);
+        if (group) {
+          await group.removeMessageDisappearingSettings();
+          postMessage({
+            id,
+            action,
+            result: undefined,
+          });
+        } else {
+          postMessageError({
+            id,
+            action,
+            error: "Group not found",
+          });
+        }
+        break;
+      }
+      case "isGroupMessageDisappearingEnabled": {
+        const group = client.conversations.getConversationById(data.id);
+        if (group) {
+          const result = group.isMessageDisappearingEnabled();
+          postMessage({
+            id,
+            action,
+            result,
+          });
+        } else {
+          postMessageError({
+            id,
+            action,
+            error: "Group not found",
+          });
+        }
+        break;
+      }
       case "streamGroupMessages": {
         const group = client.conversations.getConversationById(data.groupId);
         if (group) {