@unicitylabs/sphere-sdk 0.4.4 → 0.4.5

package/dist/index.cjs

@@ -2664,15 +2664,7 @@ var STORAGE_KEYS_GLOBAL = {
   TRACKED_ADDRESSES: "tracked_addresses",
   /** Last processed Nostr wallet event timestamp (unix seconds), keyed per pubkey */
   LAST_WALLET_EVENT_TS: "last_wallet_event_ts",
-  /** Group chat: joined groups */
-  GROUP_CHAT_GROUPS: "group_chat_groups",
-  /** Group chat: messages */
-  GROUP_CHAT_MESSAGES: "group_chat_messages",
-  /** Group chat: members */
-  GROUP_CHAT_MEMBERS: "group_chat_members",
-  /** Group chat: processed event IDs for deduplication */
-  GROUP_CHAT_PROCESSED_EVENTS: "group_chat_processed_events",
-  /** Group chat: last used relay URL (stale data detection) */
+  /** Group chat: last used relay URL (stale data detection) — global, same relay for all addresses */
   GROUP_CHAT_RELAY_URL: "group_chat_relay_url",
   /** Cached token registry JSON (fetched from remote) */
   TOKEN_REGISTRY_CACHE: "token_registry_cache",
@@ -2695,7 +2687,15 @@ var STORAGE_KEYS_ADDRESS = {
   /** Transaction history for this address */
   TRANSACTION_HISTORY: "transaction_history",
   /** Pending V5 finalization tokens (unconfirmed instant split tokens) */
-  PENDING_V5_TOKENS: "pending_v5_tokens"
+  PENDING_V5_TOKENS: "pending_v5_tokens",
+  /** Group chat: joined groups for this address */
+  GROUP_CHAT_GROUPS: "group_chat_groups",
+  /** Group chat: messages for this address */
+  GROUP_CHAT_MESSAGES: "group_chat_messages",
+  /** Group chat: members for this address */
+  GROUP_CHAT_MEMBERS: "group_chat_members",
+  /** Group chat: processed event IDs for deduplication */
+  GROUP_CHAT_PROCESSED_EVENTS: "group_chat_processed_events"
 };
 var STORAGE_KEYS = {
   ...STORAGE_KEYS_GLOBAL,
@@ -7806,6 +7806,8 @@ var CommunicationsModule = class {
   dmHandlers = /* @__PURE__ */ new Set();
   composingHandlers = /* @__PURE__ */ new Set();
   broadcastHandlers = /* @__PURE__ */ new Set();
+  // Timestamp of module initialization — messages older than this are historical
+  initializedAt = 0;
   constructor(config) {
     this.config = {
       autoSave: config?.autoSave ?? true,
@@ -7824,6 +7826,7 @@ var CommunicationsModule = class {
     this.unsubscribeMessages?.();
     this.unsubscribeComposing?.();
     this.deps = deps;
+    this.initializedAt = Date.now();
     this.unsubscribeMessages = deps.transport.onMessage((msg) => {
       this.handleIncomingMessage(msg);
     });
@@ -8115,6 +8118,7 @@ var CommunicationsModule = class {
   // Private: Message Handling
   // ===========================================================================
   handleIncomingMessage(msg) {
+    const isHistorical = msg.timestamp < this.initializedAt;
     if (msg.isSelfWrap && msg.recipientTransportPubkey) {
       if (this.messages.has(msg.id)) return;
       const message2 = {
@@ -8124,7 +8128,7 @@ var CommunicationsModule = class {
         recipientPubkey: msg.recipientTransportPubkey,
         content: msg.content,
         timestamp: msg.timestamp,
-        isRead: false
+        isRead: isHistorical
       };
       this.messages.set(message2.id, message2);
       this.deps.emitEvent("message:dm", message2);
@@ -8142,7 +8146,7 @@ var CommunicationsModule = class {
       recipientPubkey: this.deps.identity.chainPubkey,
       content: msg.content,
       timestamp: msg.timestamp,
-      isRead: false
+      isRead: isHistorical
     };
     this.messages.set(message.id, message);
     this.deps.emitEvent("message:dm", message);
@@ -8314,22 +8318,24 @@ var GroupChatModule = class {
   async load() {
     this.ensureInitialized();
     const storage = this.deps.storage;
-    const groupsJson = await storage.get(STORAGE_KEYS_GLOBAL.GROUP_CHAT_GROUPS);
+    this.groups.clear();
+    this.messages.clear();
+    this.members.clear();
+    this.processedEventIds.clear();
+    const groupsJson = await storage.get(STORAGE_KEYS_ADDRESS.GROUP_CHAT_GROUPS);
     if (groupsJson) {
       try {
         const parsed = JSON.parse(groupsJson);
-        this.groups.clear();
         for (const g of parsed) {
           this.groups.set(g.id, g);
         }
       } catch {
       }
     }
-    const messagesJson = await storage.get(STORAGE_KEYS_GLOBAL.GROUP_CHAT_MESSAGES);
+    const messagesJson = await storage.get(STORAGE_KEYS_ADDRESS.GROUP_CHAT_MESSAGES);
     if (messagesJson) {
       try {
         const parsed = JSON.parse(messagesJson);
-        this.messages.clear();
         for (const m of parsed) {
           const groupId = m.groupId;
           if (!this.messages.has(groupId)) {
@@ -8340,11 +8346,10 @@ var GroupChatModule = class {
       } catch {
       }
     }
-    const membersJson = await storage.get(STORAGE_KEYS_GLOBAL.GROUP_CHAT_MEMBERS);
+    const membersJson = await storage.get(STORAGE_KEYS_ADDRESS.GROUP_CHAT_MEMBERS);
     if (membersJson) {
       try {
         const parsed = JSON.parse(membersJson);
-        this.members.clear();
         for (const m of parsed) {
           const groupId = m.groupId;
           if (!this.members.has(groupId)) {
@@ -8355,7 +8360,7 @@ var GroupChatModule = class {
       } catch {
       }
     }
-    const processedJson = await storage.get(STORAGE_KEYS_GLOBAL.GROUP_CHAT_PROCESSED_EVENTS);
+    const processedJson = await storage.get(STORAGE_KEYS_ADDRESS.GROUP_CHAT_PROCESSED_EVENTS);
     if (processedJson) {
       try {
         const parsed = JSON.parse(processedJson);
@@ -8409,7 +8414,10 @@ var GroupChatModule = class {
   // Connection
   // ===========================================================================
   async connect() {
-    if (this.connected) return;
+    if (this.connected) {
+      await this.refreshSubscriptions();
+      return;
+    }
     if (this.connectPromise) {
       return this.connectPromise;
     }
@@ -8423,6 +8431,28 @@ var GroupChatModule = class {
   getConnectionStatus() {
     return this.connected;
   }
+  /**
+   * Refresh subscriptions after load() switched to a different address.
+   * Clears old subscriptions, restores groups if needed, and re-subscribes.
+   */
+  async refreshSubscriptions() {
+    if (!this.client) return;
+    for (const subId of this.subscriptionIds) {
+      try {
+        this.client.unsubscribe(subId);
+      } catch {
+      }
+    }
+    this.subscriptionIds = [];
+    const secretKey = Buffer.from(this.deps.identity.privateKey, "hex");
+    this.keyManager = import_nostr_js_sdk2.NostrKeyManager.fromPrivateKey(secretKey);
+    if (this.groups.size === 0) {
+      await this.restoreJoinedGroups();
+    } else {
+      await this.subscribeToJoinedGroups();
+    }
+    this.deps.emitEvent("groupchat:connection", { connected: true });
+  }
   async doConnect() {
     this.ensureInitialized();
     if (!this.keyManager) {
@@ -8438,12 +8468,12 @@ var GroupChatModule = class {
       await this.client.connect(...this.config.relays);
       this.connected = true;
       this.reconnectAttempts = 0;
-      this.deps.emitEvent("groupchat:connection", { connected: true });
       if (this.groups.size === 0) {
         await this.restoreJoinedGroups();
       } else {
         await this.subscribeToJoinedGroups();
       }
+      this.deps.emitEvent("groupchat:connection", { connected: true });
     } catch (error) {
       console.error("[GroupChat] Failed to connect to relays", error);
       this.deps.emitEvent("groupchat:connection", { connected: false });
@@ -9426,7 +9456,7 @@ var GroupChatModule = class {
   async persistGroups() {
     if (!this.deps) return;
     const data = Array.from(this.groups.values());
-    await this.deps.storage.set(STORAGE_KEYS_GLOBAL.GROUP_CHAT_GROUPS, JSON.stringify(data));
+    await this.deps.storage.set(STORAGE_KEYS_ADDRESS.GROUP_CHAT_GROUPS, JSON.stringify(data));
   }
   async persistMessages() {
     if (!this.deps) return;
@@ -9434,7 +9464,7 @@ var GroupChatModule = class {
     for (const msgs of this.messages.values()) {
       allMessages.push(...msgs);
     }
-    await this.deps.storage.set(STORAGE_KEYS_GLOBAL.GROUP_CHAT_MESSAGES, JSON.stringify(allMessages));
+    await this.deps.storage.set(STORAGE_KEYS_ADDRESS.GROUP_CHAT_MESSAGES, JSON.stringify(allMessages));
   }
   async persistMembers() {
     if (!this.deps) return;
@@ -9442,12 +9472,12 @@ var GroupChatModule = class {
     for (const mems of this.members.values()) {
       allMembers.push(...mems);
     }
-    await this.deps.storage.set(STORAGE_KEYS_GLOBAL.GROUP_CHAT_MEMBERS, JSON.stringify(allMembers));
+    await this.deps.storage.set(STORAGE_KEYS_ADDRESS.GROUP_CHAT_MEMBERS, JSON.stringify(allMembers));
   }
   async persistProcessedEvents() {
     if (!this.deps) return;
     const arr = Array.from(this.processedEventIds);
-    await this.deps.storage.set(STORAGE_KEYS_GLOBAL.GROUP_CHAT_PROCESSED_EVENTS, JSON.stringify(arr));
+    await this.deps.storage.set(STORAGE_KEYS_ADDRESS.GROUP_CHAT_PROCESSED_EVENTS, JSON.stringify(arr));
   }
   // ===========================================================================
   // Private — Relay URL Change Detection