@xmtp/browser-sdk 0.0.17 → 0.0.19

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,
   );
 
@@ -210,8 +221,7 @@ export type SafePermissionPolicySet = {
   updateGroupDescriptionPolicy: PermissionPolicy;
   updateGroupImageUrlSquarePolicy: PermissionPolicy;
   updateGroupNamePolicy: PermissionPolicy;
-  updateGroupPinnedFrameUrlPolicy: PermissionPolicy;
-  updateMessageExpirationPolicy: PermissionPolicy;
+  updateMessageDisappearingPolicy: PermissionPolicy;
 };
 
 export const toSafePermissionPolicySet = (
@@ -224,8 +234,7 @@ export const toSafePermissionPolicySet = (
   updateGroupDescriptionPolicy: policySet.updateGroupDescriptionPolicy,
   updateGroupImageUrlSquarePolicy: policySet.updateGroupImageUrlSquarePolicy,
   updateGroupNamePolicy: policySet.updateGroupNamePolicy,
-  updateGroupPinnedFrameUrlPolicy: policySet.updateGroupPinnedFrameUrlPolicy,
-  updateMessageExpirationPolicy: policySet.updateMessageExpirationPolicy,
+  updateMessageDisappearingPolicy: policySet.updateMessageDisappearingPolicy,
 });
 
 export const fromSafePermissionPolicySet = (
@@ -239,28 +248,29 @@ export const fromSafePermissionPolicySet = (
     policySet.updateGroupNamePolicy,
     policySet.updateGroupDescriptionPolicy,
     policySet.updateGroupImageUrlSquarePolicy,
-    policySet.updateGroupPinnedFrameUrlPolicy,
-    policySet.updateMessageExpirationPolicy,
+    policySet.updateMessageDisappearingPolicy,
   );
 
 export type SafeCreateGroupOptions = {
   customPermissionPolicySet?: SafePermissionPolicySet;
   description?: string;
   imageUrlSquare?: string;
+  messageDisappearingSettings?: SafeMessageDisappearingSettings;
   name?: string;
   permissions?: GroupPermissionsOptions;
-  pinnedFrameUrl?: string;
 };
 
 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,
-  pinnedFrameUrl: options.groupPinnedFrameUrl,
   permissions: options.permissions,
-  customPermissionPolicySet: options.customPermissionPolicySet,
 });
 
 export const fromSafeCreateGroupOptions = (
@@ -271,12 +281,35 @@ export const fromSafeCreateGroupOptions = (
     options.name,
     options.imageUrlSquare,
     options.description,
-    options.pinnedFrameUrl,
     // only include custom policy set if permissions are set to CustomPolicy
     options.customPermissionPolicySet &&
     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 = {
@@ -284,7 +317,6 @@ export type SafeConversation = {
   name: string;
   imageUrl: string;
   description: string;
-  pinnedFrameUrl: string;
   permissions: {
     policyType: GroupPermissionsOptions;
     policySet: {
@@ -295,8 +327,7 @@ export type SafeConversation = {
       updateGroupDescriptionPolicy: PermissionPolicy;
       updateGroupImageUrlSquarePolicy: PermissionPolicy;
       updateGroupNamePolicy: PermissionPolicy;
-      updateGroupPinnedFrameUrlPolicy: PermissionPolicy;
-      updateMessageExpirationPolicy: PermissionPolicy;
+      updateMessageDisappearingPolicy: PermissionPolicy;
     };
   };
   isActive: boolean;
@@ -317,7 +348,6 @@ export const toSafeConversation = async (
   const name = conversation.name;
   const imageUrl = conversation.imageUrl;
   const description = conversation.description;
-  const pinnedFrameUrl = conversation.pinnedFrameUrl;
   const permissions = conversation.permissions;
   const isActive = conversation.isActive;
   const addedByInboxId = conversation.addedByInboxId;
@@ -332,7 +362,6 @@ export const toSafeConversation = async (
     name,
     imageUrl,
     description,
-    pinnedFrameUrl,
     permissions: {
       policyType,
       policySet: {
@@ -344,9 +373,8 @@ export const toSafeConversation = async (
         updateGroupImageUrlSquarePolicy:
           policySet.updateGroupImageUrlSquarePolicy,
         updateGroupNamePolicy: policySet.updateGroupNamePolicy,
-        updateGroupPinnedFrameUrlPolicy:
-          policySet.updateGroupPinnedFrameUrlPolicy,
-        updateMessageExpirationPolicy: policySet.updateMessageExpirationPolicy,
+        updateMessageDisappearingPolicy:
+          policySet.updateMessageDisappearingPolicy,
       },
     },
     isActive,
@@ -438,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

@@ -1,9 +1,15 @@
+import type { Conversation, Message, StreamCloser } from "@xmtp/wasm-bindings";
 import type {
   ClientEventsActions,
   ClientEventsClientMessageData,
   ClientEventsErrorData,
   ClientEventsWorkerPostMessageData,
 } from "@/types";
+import type {
+  ClientStreamEventsErrorData,
+  ClientStreamEventsTypes,
+  ClientStreamEventsWorkerPostMessageData,
+} from "@/types/clientStreamEvents";
 import {
   fromEncodedContent,
   fromSafeEncodedContent,
@@ -11,12 +17,16 @@ import {
   toSafeHmacKey,
   toSafeInboxState,
   toSafeMessage,
+  toSafeMessageDisappearingSettings,
 } from "@/utils/conversions";
 import { WorkerClient } from "@/WorkerClient";
+import { WorkerConversation } from "@/WorkerConversation";
 
 let client: WorkerClient;
 let enableLogging = false;
 
+const streamClosers = new Map<string, StreamCloser>();
+
 /**
  * Type-safe postMessage
  */
@@ -33,6 +43,22 @@ const postMessageError = (data: ClientEventsErrorData) => {
   self.postMessage(data);
 };
 
+/**
+ * Type-safe postMessage for streams
+ */
+const postStreamMessage = <A extends ClientStreamEventsTypes>(
+  data: ClientStreamEventsWorkerPostMessageData<A>,
+) => {
+  self.postMessage(data);
+};
+
+/**
+ * Type-safe postMessage for stream errors
+ */
+const postStreamMessageError = (data: ClientStreamEventsErrorData) => {
+  self.postMessage(data);
+};
+
 self.onmessage = async (event: MessageEvent<ClientEventsClientMessageData>) => {
   const { action, id, data } = event.data;
 
@@ -53,6 +79,28 @@ self.onmessage = async (event: MessageEvent<ClientEventsClientMessageData>) => {
 
   try {
     switch (action) {
+      /**
+       * Stream actions
+       */
+      case "endStream": {
+        const streamCloser = streamClosers.get(data.streamId);
+        if (streamCloser) {
+          streamCloser.end();
+          streamClosers.delete(data.streamId);
+          postMessage({
+            id,
+            action,
+            result: undefined,
+          });
+        } else {
+          postMessageError({
+            id,
+            action,
+            error: `Stream "${data.streamId}" not found`,
+          });
+        }
+        break;
+      }
       /**
        * Client actions
        */
@@ -76,7 +124,7 @@ self.onmessage = async (event: MessageEvent<ClientEventsClientMessageData>) => {
         });
         break;
       case "createInboxSignatureText": {
-        const result = await client.createInboxSignatureText();
+        const result = client.createInboxSignatureText();
         postMessage({
           id,
           action,
@@ -266,6 +314,72 @@ self.onmessage = async (event: MessageEvent<ClientEventsClientMessageData>) => {
       /**
        * Conversations actions
        */
+      case "streamAllGroups": {
+        const streamCallback = async (
+          error: Error | null,
+          value: Conversation | undefined,
+        ) => {
+          if (error) {
+            postStreamMessageError({
+              type: "group",
+              streamId: data.streamId,
+              error: error.message,
+            });
+          } else {
+            postStreamMessage({
+              type: "group",
+              streamId: data.streamId,
+              result: value
+                ? await toSafeConversation(
+                    new WorkerConversation(client, value),
+                  )
+                : undefined,
+            });
+          }
+        };
+        const streamCloser = client.conversations.stream(
+          streamCallback,
+          data.conversationType,
+        );
+        streamClosers.set(data.streamId, streamCloser);
+        postMessage({
+          id,
+          action,
+          result: undefined,
+        });
+        break;
+      }
+      case "streamAllMessages": {
+        const streamCallback = (
+          error: Error | null,
+          value: Message | undefined,
+        ) => {
+          if (error) {
+            postStreamMessageError({
+              type: "message",
+              streamId: data.streamId,
+              error: error.message,
+            });
+          } else {
+            postStreamMessage({
+              type: "message",
+              streamId: data.streamId,
+              result: value ? toSafeMessage(value) : undefined,
+            });
+          }
+        };
+        const streamCloser = client.conversations.streamAllMessages(
+          streamCallback,
+          data.conversationType,
+        );
+        streamClosers.set(data.streamId, streamCloser);
+        postMessage({
+          id,
+          action,
+          result: undefined,
+        });
+        break;
+      }
       case "getConversations": {
         const conversations = client.conversations.list(data.options);
         postMessage({
@@ -317,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,
@@ -338,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,
@@ -466,24 +605,6 @@ self.onmessage = async (event: MessageEvent<ClientEventsClientMessageData>) => {
         }
         break;
       }
-      case "updateGroupPinnedFrameUrl": {
-        const group = client.conversations.getConversationById(data.id);
-        if (group) {
-          await group.updatePinnedFrameUrl(data.pinnedFrameUrl);
-          postMessage({
-            id,
-            action,
-            result: undefined,
-          });
-        } else {
-          postMessageError({
-            id,
-            action,
-            error: "Group not found",
-          });
-        }
-        break;
-      }
       case "sendGroupMessage": {
         const group = client.conversations.getConversationById(data.id);
         if (group) {
@@ -885,6 +1006,117 @@ 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) {
+          const streamCallback = (
+            error: Error | null,
+            value: Message | undefined,
+          ) => {
+            if (error) {
+              postStreamMessageError({
+                type: "message",
+                streamId: data.streamId,
+                error: error.message,
+              });
+            } else {
+              postStreamMessage({
+                type: "message",
+                streamId: data.streamId,
+                result: value ? toSafeMessage(value) : undefined,
+              });
+            }
+          };
+          const streamCloser = group.stream(streamCallback);
+          streamClosers.set(data.streamId, streamCloser);
+          postMessage({
+            id,
+            action,
+            result: undefined,
+          });
+        } else {
+          postMessageError({
+            id,
+            action,
+            error: "Group not found",
+          });
+        }
+        break;
+      }
     }
   } catch (e) {
     postMessageError({