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

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

@@ -515,6 +515,33 @@ function waitForConnection() {
     connectionCallbacks.push(callback);
   });
 }
+function startPingTimer() {
+  stopPingTimer();
+  pingTimer = setInterval(() => {
+    if (!ws || ws.readyState !== WebSocket.OPEN) return;
+    try {
+      const id = ++requestId;
+      ws.send(JSON.stringify({ jsonrpc: "2.0", id, method: "server.ping", params: [] }));
+      pending[id] = {
+        resolve: () => {
+        },
+        reject: () => {
+        }
+      };
+      const timeoutId = setTimeout(() => {
+        delete pending[id];
+      }, 1e4);
+      pending[id].timeoutId = timeoutId;
+    } catch {
+    }
+  }, PING_INTERVAL);
+}
+function stopPingTimer() {
+  if (pingTimer) {
+    clearInterval(pingTimer);
+    pingTimer = null;
+  }
+}
 function connect(endpoint = DEFAULT_ENDPOINT) {
   if (isConnected) {
     return Promise.resolve();
@@ -537,6 +564,7 @@ function connect(endpoint = DEFAULT_ENDPOINT) {
       isConnected = true;
       isConnecting = false;
       reconnectAttempts = 0;
+      startPingTimer();
       hasResolved = true;
       resolve();
       connectionCallbacks.forEach((cb) => {
@@ -548,6 +576,7 @@ function connect(endpoint = DEFAULT_ENDPOINT) {
     ws.onclose = () => {
       isConnected = false;
       isBlockSubscribed = false;
+      stopPingTimer();
       Object.values(pending).forEach((req) => {
         if (req.timeoutId) clearTimeout(req.timeoutId);
         req.reject(new Error("WebSocket connection closed"));
@@ -730,6 +759,7 @@ async function getCurrentBlockHeight() {
   }
 }
 function disconnect() {
+  stopPingTimer();
   if (ws) {
     intentionalClose = true;
     ws.close();
@@ -750,7 +780,7 @@ function disconnect() {
   blockSubscribers.length = 0;
   lastBlockHeader = null;
 }
-var DEFAULT_ENDPOINT, ws, isConnected, isConnecting, requestId, intentionalClose, reconnectAttempts, isBlockSubscribed, lastBlockHeader, pending, blockSubscribers, connectionCallbacks, MAX_RECONNECT_ATTEMPTS, BASE_DELAY, MAX_DELAY, RPC_TIMEOUT, CONNECTION_TIMEOUT;
+var DEFAULT_ENDPOINT, ws, isConnected, isConnecting, requestId, intentionalClose, reconnectAttempts, isBlockSubscribed, lastBlockHeader, pingTimer, pending, blockSubscribers, connectionCallbacks, MAX_RECONNECT_ATTEMPTS, BASE_DELAY, MAX_DELAY, RPC_TIMEOUT, CONNECTION_TIMEOUT, PING_INTERVAL;
 var init_network = __esm({
   "l1/network.ts"() {
     "use strict";
@@ -766,6 +796,7 @@ var init_network = __esm({
     reconnectAttempts = 0;
     isBlockSubscribed = false;
     lastBlockHeader = null;
+    pingTimer = null;
     pending = {};
     blockSubscribers = [];
     connectionCallbacks = [];
@@ -774,6 +805,7 @@ var init_network = __esm({
     MAX_DELAY = 6e4;
     RPC_TIMEOUT = 3e4;
     CONNECTION_TIMEOUT = 3e4;
+    PING_INTERVAL = 3e4;
   }
 });
 
@@ -2434,9 +2466,9 @@ var NostrTransportProvider = class _NostrTransportProvider {
         if (subId) {
           this.nostrClient?.unsubscribe(subId);
         }
-        logger.warn("Nostr", `queryEvents timed out after 5s, returning ${events.length} event(s)`, { kinds: filterObj.kinds, limit: filterObj.limit });
+        logger.warn("Nostr", `queryEvents timed out after 15s, returning ${events.length} event(s)`, { kinds: filterObj.kinds, limit: filterObj.limit });
         resolve(events);
-      }, 5e3);
+      }, 15e3);
       const subId = this.nostrClient.subscribe(filter, {
         onEvent: (event) => {
           events.push({
@@ -12114,6 +12146,15 @@ var GroupChatModule = class {
   }
   destroy() {
     this.destroyConnection();
+    if (this.persistTimer) {
+      clearTimeout(this.persistTimer);
+      this.persistTimer = null;
+      if (this.deps) {
+        this.doPersistAll().catch(
+          (err) => logger.debug("GroupChat", "Persist on destroy failed", err)
+        );
+      }
+    }
     this.groups.clear();
     this.messages.clear();
     this.members.clear();
@@ -12122,10 +12163,7 @@ var GroupChatModule = class {
     this.messageHandlers.clear();
     this.relayAdminPubkeys = null;
     this.relayAdminFetchPromise = null;
-    if (this.persistTimer) {
-      clearTimeout(this.persistTimer);
-      this.persistTimer = null;
-    }
+    this.persistPromise = null;
     this.deps = null;
   }
   destroyConnection() {
@@ -12250,12 +12288,12 @@ 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) }
     );
@@ -12276,12 +12314,12 @@ var GroupChatModule = class {
   }
   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) }
     );
@@ -12355,7 +12393,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 +12414,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 +12475,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 +12495,7 @@ var GroupChatModule = class {
         });
       }
     }
-    this.persistMembers();
+    this.schedulePersist();
   }
   // ===========================================================================
   // Group Membership Restoration
@@ -12468,13 +12506,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 +12522,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", {});
@@ -12516,47 +12554,24 @@ var GroupChatModule = class {
     await this.ensureConnected();
     if (!this.client) return [];
     const groupsMap = /* @__PURE__ */ new Map();
-    const memberCountsMap = /* @__PURE__ */ new Map();
-    await Promise.all([
-      this.oneshotSubscription(
-        new Filter3({ kinds: [NIP29_KINDS.GROUP_METADATA] }),
-        {
-          onEvent: (event) => {
-            const group = this.parseGroupMetadata(event);
-            if (group && group.visibility === GroupVisibility.PUBLIC) {
-              const existing = groupsMap.get(group.id);
-              if (!existing || group.createdAt > existing.createdAt) {
-                groupsMap.set(group.id, group);
-              }
-            }
-          },
-          onComplete: () => {
-          },
-          timeoutMs: 1e4,
-          timeoutLabel: "fetchAvailableGroups(metadata)"
-        }
-      ),
-      this.oneshotSubscription(
-        new Filter3({ kinds: [NIP29_KINDS.GROUP_MEMBERS] }),
-        {
-          onEvent: (event) => {
-            const groupId = this.getGroupIdFromMetadataEvent(event);
-            if (groupId) {
-              const pTags = event.tags.filter((t) => t[0] === "p");
-              memberCountsMap.set(groupId, pTags.length);
+    await this.oneshotSubscription(
+      new Filter3({ kinds: [NIP29_KINDS.GROUP_METADATA] }),
+      {
+        onEvent: (event) => {
+          const group = this.parseGroupMetadata(event);
+          if (group && group.visibility === GroupVisibility.PUBLIC) {
+            const existing = groupsMap.get(group.id);
+            if (!existing || group.createdAt > existing.createdAt) {
+              groupsMap.set(group.id, group);
             }
-          },
-          onComplete: () => {
-          },
-          timeoutMs: 1e4,
-          timeoutLabel: "fetchAvailableGroups(members)"
-        }
-      )
-    ]);
-    for (const [groupId, count] of memberCountsMap) {
-      const group = groupsMap.get(groupId);
-      if (group) group.memberCount = count;
-    }
+          }
+        },
+        onComplete: () => {
+        },
+        timeoutMs: 1e4,
+        timeoutLabel: "fetchAvailableGroups(metadata)"
+      }
+    );
     return Array.from(groupsMap.values());
   }
   async joinGroup(groupId, inviteCode) {
@@ -12887,7 +12902,7 @@ var GroupChatModule = class {
     if (group && (group.unreadCount || 0) > 0) {
       group.unreadCount = 0;
       this.groups.set(groupId, group);
-      this.persistGroups();
+      this.schedulePersist();
     }
   }
   // ===========================================================================
@@ -12909,7 +12924,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 +12947,7 @@ var GroupChatModule = class {
       if (eventId) {
         this.deleteMessageFromMemory(groupId, messageId);
         this.deps.emitEvent("groupchat:updated", {});
-        this.persistMessages();
+        this.schedulePersist();
         return true;
       }
       return false;
@@ -13012,7 +13027,7 @@ 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);
@@ -13093,7 +13108,7 @@ var GroupChatModule = class {
         });
       }
     }
-    this.persistMembers();
+    this.schedulePersist();
   }
   async fetchGroupMembersInternal(groupId) {
     if (!this.client) return [];
@@ -13220,8 +13235,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);
+      }
     }
   }
   // ===========================================================================
@@ -13358,6 +13376,7 @@ var GroupChatModule = class {
       let name = "Unnamed Group";
       let description;
       let picture;
+      let memberCount;
       let isPrivate = false;
       let writeRestricted = false;
       if (event.content && event.content.trim()) {
@@ -13378,6 +13397,7 @@ var GroupChatModule = class {
         if (tag[0] === "private") isPrivate = true;
         if (tag[0] === "public" && tag[1] === "false") isPrivate = true;
         if (tag[0] === "write-restricted") writeRestricted = true;
+        if (tag[0] === "member_count" && tag[1]) memberCount = parseInt(tag[1], 10) || void 0;
       }
       return {
         id: groupId,
@@ -13385,6 +13405,7 @@ var GroupChatModule = class {
         name,
         description,
         picture,
+        memberCount,
         visibility: isPrivate ? GroupVisibility.PRIVATE : GroupVisibility.PUBLIC,
         writeRestricted: writeRestricted || void 0,
         createdAt: event.created_at * 1e3