@unicitylabs/sphere-sdk 0.6.10-dev.1 → 0.6.10-dev.2

package/dist/core/index.d.cts

@@ -3330,7 +3330,7 @@ declare class GroupChatModule {
      * or 0 if no messages exist.  Used to set `since` on subscriptions so the relay
      * only sends events we don't already have.
      */
-    private getLatestMessageTimestamp;
+    private getLatestKnownTimestamp;
     private fetchRelayAdmins;
     private doFetchRelayAdmins;
     private fetchGroupMetadataInternal;

package/dist/core/index.d.ts

@@ -3330,7 +3330,7 @@ declare class GroupChatModule {
      * or 0 if no messages exist.  Used to set `since` on subscriptions so the relay
      * only sends events we don't already have.
      */
-    private getLatestMessageTimestamp;
+    private getLatestKnownTimestamp;
     private fetchRelayAdmins;
     private doFetchRelayAdmins;
     private fetchGroupMetadataInternal;

package/dist/core/index.js

@@ -12250,45 +12250,48 @@ var GroupChatModule = class {
     if (!this.client) return;
     const groupIds = Array.from(this.groups.keys());
     if (groupIds.length === 0) return;
-    const latestTimestamp = this.getLatestMessageTimestamp(groupIds);
+    const sinceTimestamp = this.getLatestKnownTimestamp(groupIds);
     this.trackSubscription(
       createNip29Filter({
         kinds: [NIP29_KINDS.CHAT_MESSAGE, NIP29_KINDS.THREAD_ROOT, NIP29_KINDS.THREAD_REPLY],
         "#h": groupIds,
-        ...latestTimestamp ? { since: latestTimestamp } : {}
+        ...sinceTimestamp ? { since: sinceTimestamp } : {}
       }),
       { onEvent: (event) => this.handleGroupEvent(event) }
     );
     this.trackSubscription(
       createNip29Filter({
         kinds: [NIP29_KINDS.GROUP_METADATA, NIP29_KINDS.GROUP_MEMBERS, NIP29_KINDS.GROUP_ADMINS],
-        "#d": groupIds
+        "#d": groupIds,
+        ...sinceTimestamp ? { since: sinceTimestamp } : {}
       }),
       { onEvent: (event) => this.handleMetadataEvent(event) }
     );
     this.trackSubscription(
       createNip29Filter({
         kinds: [NIP29_KINDS.DELETE_EVENT, NIP29_KINDS.REMOVE_USER, NIP29_KINDS.DELETE_GROUP],
-        "#h": groupIds
+        "#h": groupIds,
+        ...sinceTimestamp ? { since: sinceTimestamp } : {}
       }),
       { onEvent: (event) => this.handleModerationEvent(event) }
     );
   }
   subscribeToGroup(groupId) {
     if (!this.client) return;
-    const latestTimestamp = this.getLatestMessageTimestamp([groupId]);
+    const sinceTimestamp = this.getLatestKnownTimestamp([groupId]);
     this.trackSubscription(
       createNip29Filter({
         kinds: [NIP29_KINDS.CHAT_MESSAGE, NIP29_KINDS.THREAD_ROOT, NIP29_KINDS.THREAD_REPLY],
         "#h": [groupId],
-        ...latestTimestamp ? { since: latestTimestamp } : {}
+        ...sinceTimestamp ? { since: sinceTimestamp } : {}
       }),
       { onEvent: (event) => this.handleGroupEvent(event) }
     );
     this.trackSubscription(
       createNip29Filter({
         kinds: [NIP29_KINDS.DELETE_EVENT, NIP29_KINDS.REMOVE_USER, NIP29_KINDS.DELETE_GROUP],
-        "#h": [groupId]
+        "#h": [groupId],
+        ...sinceTimestamp ? { since: sinceTimestamp } : {}
       }),
       { onEvent: (event) => this.handleModerationEvent(event) }
     );
@@ -12355,7 +12358,7 @@ var GroupChatModule = class {
       }
       group.updatedAt = event.created_at * 1e3;
       this.groups.set(groupId, group);
-      this.persistGroups();
+      this.schedulePersist();
     } else if (event.kind === NIP29_KINDS.GROUP_MEMBERS) {
       this.updateMembersFromEvent(groupId, event);
     } else if (event.kind === NIP29_KINDS.GROUP_ADMINS) {
@@ -12376,7 +12379,7 @@ var GroupChatModule = class {
         }
       }
       this.deps.emitEvent("groupchat:updated", {});
-      this.persistMessages();
+      this.schedulePersist();
     } else if (event.kind === NIP29_KINDS.REMOVE_USER) {
       if (this.processedEventIds.has(event.id)) return;
       const eventTimestampMs = event.created_at * 1e3;
@@ -12437,7 +12440,7 @@ var GroupChatModule = class {
       };
       this.saveMemberToMemory(member);
     }
-    this.persistMembers();
+    this.schedulePersist();
   }
   updateAdminsFromEvent(groupId, event) {
     const pTags = event.tags.filter((t) => t[0] === "p");
@@ -12457,7 +12460,7 @@ var GroupChatModule = class {
         });
       }
     }
-    this.persistMembers();
+    this.schedulePersist();
   }
   // ===========================================================================
   // Group Membership Restoration
@@ -12468,13 +12471,11 @@ var GroupChatModule = class {
     if (!myPubkey) return [];
     const groupIdsWithMembership = /* @__PURE__ */ new Set();
     await this.oneshotSubscription(
-      new Filter3({ kinds: [NIP29_KINDS.GROUP_MEMBERS] }),
+      createNip29Filter({ kinds: [NIP29_KINDS.GROUP_MEMBERS], "#p": [myPubkey] }),
       {
         onEvent: (event) => {
           const groupId = this.getGroupIdFromMetadataEvent(event);
-          if (!groupId) return;
-          const pTags = event.tags.filter((t) => t[0] === "p");
-          if (pTags.some((tag) => tag[1] === myPubkey)) {
+          if (groupId) {
             groupIdsWithMembership.add(groupId);
           }
         },
@@ -12486,22 +12487,24 @@ var GroupChatModule = class {
     );
     if (groupIdsWithMembership.size === 0) return [];
     const restoredGroups = [];
-    for (const groupId of groupIdsWithMembership) {
-      if (this.groups.has(groupId)) continue;
-      try {
-        const group = await this.fetchGroupMetadataInternal(groupId);
-        if (group) {
-          this.groups.set(groupId, group);
-          restoredGroups.push(group);
-          await Promise.all([
-            this.fetchAndSaveMembers(groupId),
-            this.fetchMessages(groupId)
-          ]);
+    await Promise.all(
+      Array.from(groupIdsWithMembership).map(async (groupId) => {
+        if (this.groups.has(groupId)) return;
+        try {
+          const group = await this.fetchGroupMetadataInternal(groupId);
+          if (group) {
+            this.groups.set(groupId, group);
+            restoredGroups.push(group);
+            await Promise.all([
+              this.fetchAndSaveMembers(groupId),
+              this.fetchMessages(groupId)
+            ]);
+          }
+        } catch (error) {
+          logger.warn("GroupChat", "Failed to restore group", groupId, error);
         }
-      } catch (error) {
-        logger.warn("GroupChat", "Failed to restore group", groupId, error);
-      }
-    }
+      })
+    );
     if (restoredGroups.length > 0) {
       await this.subscribeToJoinedGroups();
       this.deps.emitEvent("groupchat:updated", {});
@@ -12887,7 +12890,7 @@ var GroupChatModule = class {
     if (group && (group.unreadCount || 0) > 0) {
       group.unreadCount = 0;
       this.groups.set(groupId, group);
-      this.persistGroups();
+      this.schedulePersist();
     }
   }
   // ===========================================================================
@@ -12909,7 +12912,7 @@ var GroupChatModule = class {
       if (eventId) {
         this.removeMemberFromMemory(groupId, userPubkey);
         this.deps.emitEvent("groupchat:updated", {});
-        this.persistMembers();
+        this.schedulePersist();
         return true;
       }
       return false;
@@ -12932,7 +12935,7 @@ var GroupChatModule = class {
       if (eventId) {
         this.deleteMessageFromMemory(groupId, messageId);
         this.deps.emitEvent("groupchat:updated", {});
-        this.persistMessages();
+        this.schedulePersist();
         return true;
       }
       return false;
@@ -13012,13 +13015,19 @@ var GroupChatModule = class {
    * or 0 if no messages exist.  Used to set `since` on subscriptions so the relay
    * only sends events we don't already have.
    */
-  getLatestMessageTimestamp(groupIds) {
+  getLatestKnownTimestamp(groupIds) {
     let latest = 0;
     for (const gid of groupIds) {
       const msgs = this.messages.get(gid);
-      if (!msgs) continue;
-      for (const m of msgs) {
-        const ts = Math.floor(m.timestamp / 1e3);
+      if (msgs) {
+        for (const m of msgs) {
+          const ts = Math.floor(m.timestamp / 1e3);
+          if (ts > latest) latest = ts;
+        }
+      }
+      const group = this.groups.get(gid);
+      if (group) {
+        const ts = Math.floor((group.updatedAt || group.createdAt) / 1e3);
         if (ts > latest) latest = ts;
       }
     }
@@ -13093,7 +13102,7 @@ var GroupChatModule = class {
         });
       }
     }
-    this.persistMembers();
+    this.schedulePersist();
   }
   async fetchGroupMembersInternal(groupId) {
     if (!this.client) return [];
@@ -13220,8 +13229,11 @@ var GroupChatModule = class {
   addProcessedEventId(eventId) {
     this.processedEventIds.add(eventId);
     if (this.processedEventIds.size > 1e4) {
-      const arr = Array.from(this.processedEventIds);
-      this.processedEventIds = new Set(arr.slice(arr.length - 1e4));
+      let toDelete = 5e3;
+      for (const id of this.processedEventIds) {
+        if (toDelete-- <= 0) break;
+        this.processedEventIds.delete(id);
+      }
     }
   }
   // ===========================================================================