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

package/dist/core/index.cjs

@@ -2514,9 +2514,9 @@ var NostrTransportProvider = class _NostrTransportProvider {
         if (subId) {
           this.nostrClient?.unsubscribe(subId);
         }
-        logger.warn("Nostr", `queryEvents timed out after 15s, returning ${events.length} event(s)`, { kinds: filterObj.kinds, limit: filterObj.limit });
+        logger.warn("Nostr", `queryEvents timed out after 5s, returning ${events.length} event(s)`, { kinds: filterObj.kinds, limit: filterObj.limit });
         resolve(events);
-      }, 15e3);
+      }, 5e3);
       const subId = this.nostrClient.subscribe(filter, {
         onEvent: (event) => {
           events.push({
@@ -12326,48 +12326,45 @@ var GroupChatModule = class {
     if (!this.client) return;
     const groupIds = Array.from(this.groups.keys());
     if (groupIds.length === 0) return;
-    const sinceTimestamp = this.getLatestKnownTimestamp(groupIds);
+    const latestTimestamp = this.getLatestMessageTimestamp(groupIds);
     this.trackSubscription(
       createNip29Filter({
         kinds: [NIP29_KINDS.CHAT_MESSAGE, NIP29_KINDS.THREAD_ROOT, NIP29_KINDS.THREAD_REPLY],
         "#h": groupIds,
-        ...sinceTimestamp ? { since: sinceTimestamp } : {}
+        ...latestTimestamp ? { since: latestTimestamp } : {}
       }),
       { onEvent: (event) => this.handleGroupEvent(event) }
     );
     this.trackSubscription(
       createNip29Filter({
         kinds: [NIP29_KINDS.GROUP_METADATA, NIP29_KINDS.GROUP_MEMBERS, NIP29_KINDS.GROUP_ADMINS],
-        "#d": groupIds,
-        ...sinceTimestamp ? { since: sinceTimestamp } : {}
+        "#d": groupIds
       }),
       { onEvent: (event) => this.handleMetadataEvent(event) }
     );
     this.trackSubscription(
       createNip29Filter({
         kinds: [NIP29_KINDS.DELETE_EVENT, NIP29_KINDS.REMOVE_USER, NIP29_KINDS.DELETE_GROUP],
-        "#h": groupIds,
-        ...sinceTimestamp ? { since: sinceTimestamp } : {}
+        "#h": groupIds
       }),
       { onEvent: (event) => this.handleModerationEvent(event) }
     );
   }
   subscribeToGroup(groupId) {
     if (!this.client) return;
-    const sinceTimestamp = this.getLatestKnownTimestamp([groupId]);
+    const latestTimestamp = this.getLatestMessageTimestamp([groupId]);
     this.trackSubscription(
       createNip29Filter({
         kinds: [NIP29_KINDS.CHAT_MESSAGE, NIP29_KINDS.THREAD_ROOT, NIP29_KINDS.THREAD_REPLY],
         "#h": [groupId],
-        ...sinceTimestamp ? { since: sinceTimestamp } : {}
+        ...latestTimestamp ? { since: latestTimestamp } : {}
       }),
       { onEvent: (event) => this.handleGroupEvent(event) }
     );
     this.trackSubscription(
       createNip29Filter({
         kinds: [NIP29_KINDS.DELETE_EVENT, NIP29_KINDS.REMOVE_USER, NIP29_KINDS.DELETE_GROUP],
-        "#h": [groupId],
-        ...sinceTimestamp ? { since: sinceTimestamp } : {}
+        "#h": [groupId]
       }),
       { onEvent: (event) => this.handleModerationEvent(event) }
     );
@@ -12434,7 +12431,7 @@ var GroupChatModule = class {
       }
       group.updatedAt = event.created_at * 1e3;
       this.groups.set(groupId, group);
-      this.schedulePersist();
+      this.persistGroups();
     } else if (event.kind === NIP29_KINDS.GROUP_MEMBERS) {
       this.updateMembersFromEvent(groupId, event);
     } else if (event.kind === NIP29_KINDS.GROUP_ADMINS) {
@@ -12455,7 +12452,7 @@ var GroupChatModule = class {
         }
       }
       this.deps.emitEvent("groupchat:updated", {});
-      this.schedulePersist();
+      this.persistMessages();
     } else if (event.kind === NIP29_KINDS.REMOVE_USER) {
       if (this.processedEventIds.has(event.id)) return;
       const eventTimestampMs = event.created_at * 1e3;
@@ -12516,7 +12513,7 @@ var GroupChatModule = class {
       };
       this.saveMemberToMemory(member);
     }
-    this.schedulePersist();
+    this.persistMembers();
   }
   updateAdminsFromEvent(groupId, event) {
     const pTags = event.tags.filter((t) => t[0] === "p");
@@ -12536,7 +12533,7 @@ var GroupChatModule = class {
         });
       }
     }
-    this.schedulePersist();
+    this.persistMembers();
   }
   // ===========================================================================
   // Group Membership Restoration
@@ -12547,11 +12544,13 @@ var GroupChatModule = class {
     if (!myPubkey) return [];
     const groupIdsWithMembership = /* @__PURE__ */ new Set();
     await this.oneshotSubscription(
-      createNip29Filter({ kinds: [NIP29_KINDS.GROUP_MEMBERS], "#p": [myPubkey] }),
+      new import_nostr_js_sdk4.Filter({ kinds: [NIP29_KINDS.GROUP_MEMBERS] }),
       {
         onEvent: (event) => {
           const groupId = this.getGroupIdFromMetadataEvent(event);
-          if (groupId) {
+          if (!groupId) return;
+          const pTags = event.tags.filter((t) => t[0] === "p");
+          if (pTags.some((tag) => tag[1] === myPubkey)) {
             groupIdsWithMembership.add(groupId);
           }
         },
@@ -12563,24 +12562,22 @@ var GroupChatModule = class {
     );
     if (groupIdsWithMembership.size === 0) return [];
     const restoredGroups = [];
-    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);
+    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)
+          ]);
         }
-      })
-    );
+      } catch (error) {
+        logger.warn("GroupChat", "Failed to restore group", groupId, error);
+      }
+    }
     if (restoredGroups.length > 0) {
       await this.subscribeToJoinedGroups();
       this.deps.emitEvent("groupchat:updated", {});
@@ -12966,7 +12963,7 @@ var GroupChatModule = class {
     if (group && (group.unreadCount || 0) > 0) {
       group.unreadCount = 0;
       this.groups.set(groupId, group);
-      this.schedulePersist();
+      this.persistGroups();
     }
   }
   // ===========================================================================
@@ -12988,7 +12985,7 @@ var GroupChatModule = class {
       if (eventId) {
         this.removeMemberFromMemory(groupId, userPubkey);
         this.deps.emitEvent("groupchat:updated", {});
-        this.schedulePersist();
+        this.persistMembers();
         return true;
       }
       return false;
@@ -13011,7 +13008,7 @@ var GroupChatModule = class {
       if (eventId) {
         this.deleteMessageFromMemory(groupId, messageId);
         this.deps.emitEvent("groupchat:updated", {});
-        this.schedulePersist();
+        this.persistMessages();
         return true;
       }
       return false;
@@ -13091,19 +13088,13 @@ 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.
    */
-  getLatestKnownTimestamp(groupIds) {
+  getLatestMessageTimestamp(groupIds) {
     let latest = 0;
     for (const gid of groupIds) {
       const msgs = this.messages.get(gid);
-      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 (!msgs) continue;
+      for (const m of msgs) {
+        const ts = Math.floor(m.timestamp / 1e3);
         if (ts > latest) latest = ts;
       }
     }
@@ -13178,7 +13169,7 @@ var GroupChatModule = class {
         });
       }
     }
-    this.schedulePersist();
+    this.persistMembers();
   }
   async fetchGroupMembersInternal(groupId) {
     if (!this.client) return [];
@@ -13305,11 +13296,8 @@ var GroupChatModule = class {
   addProcessedEventId(eventId) {
     this.processedEventIds.add(eventId);
     if (this.processedEventIds.size > 1e4) {
-      let toDelete = 5e3;
-      for (const id of this.processedEventIds) {
-        if (toDelete-- <= 0) break;
-        this.processedEventIds.delete(id);
-      }
+      const arr = Array.from(this.processedEventIds);
+      this.processedEventIds = new Set(arr.slice(arr.length - 1e4));
     }
   }
   // ===========================================================================