@unicitylabs/sphere-sdk 0.6.8-dev.1 → 0.6.8-dev.3

package/dist/core/index.cjs

@@ -191,6 +191,8 @@ var init_constants = __esm({
       TRACKED_ADDRESSES: "tracked_addresses",
       /** Last processed Nostr wallet event timestamp (unix seconds), keyed per pubkey */
       LAST_WALLET_EVENT_TS: "last_wallet_event_ts",
+      /** Last processed Nostr DM (gift-wrap) event timestamp (unix seconds), keyed per pubkey */
+      LAST_DM_EVENT_TS: "last_dm_event_ts",
       /** 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) */
@@ -1314,8 +1316,12 @@ var NostrTransportProvider = class _NostrTransportProvider {
   storage = null;
   /** In-memory max event timestamp to avoid read-before-write races in updateLastEventTimestamp. */
   lastEventTs = 0;
+  /** In-memory max DM (gift-wrap) event timestamp. */
+  lastDmEventTs = 0;
   /** Fallback 'since' timestamp for first-time address subscriptions (consumed once). */
   fallbackSince = null;
+  /** Fallback 'since' timestamp for DM (gift-wrap) subscriptions (consumed once). */
+  fallbackDmSince = null;
   identity = null;
   keyManager = null;
   status = "disconnected";
@@ -1570,6 +1576,8 @@ var NostrTransportProvider = class _NostrTransportProvider {
     this.identity = identity;
     this.processedEventIds.clear();
     this.lastEventTs = 0;
+    this.lastDmEventTs = 0;
+    this.fallbackDmSince = null;
     const secretKey = import_buffer.Buffer.from(identity.privateKey, "hex");
     this.keyManager = import_nostr_js_sdk.NostrKeyManager.fromPrivateKey(secretKey);
     const nostrPubkey = this.keyManager.getPublicKeyHex();
@@ -1615,6 +1623,9 @@ var NostrTransportProvider = class _NostrTransportProvider {
   setFallbackSince(sinceSeconds) {
     this.fallbackSince = sinceSeconds;
   }
+  setFallbackDmSince(sinceSeconds) {
+    this.fallbackDmSince = sinceSeconds;
+  }
   /**
    * Get the Nostr-format public key (32 bytes / 64 hex chars)
    * This is the x-coordinate only, without the 02/03 prefix.
@@ -2149,6 +2160,17 @@ var NostrTransportProvider = class _NostrTransportProvider {
       logger.debug("Nostr", "Failed to save last event timestamp:", err);
     });
   }
+  /** Persist the max DM (gift-wrap) event timestamp for the since filter on next connect. */
+  updateLastDmEventTimestamp(createdAt) {
+    if (!this.storage || !this.keyManager) return;
+    if (createdAt <= this.lastDmEventTs) return;
+    this.lastDmEventTs = createdAt;
+    const pubkey = this.keyManager.getPublicKeyHex();
+    const storageKey = `${STORAGE_KEYS_GLOBAL.LAST_DM_EVENT_TS}_${pubkey.slice(0, 16)}`;
+    this.storage.set(storageKey, createdAt.toString()).catch((err) => {
+      logger.debug("Nostr", "Failed to save last DM event timestamp:", err);
+    });
+  }
   async handleDirectMessage(event) {
     logger.debug("Nostr", "Ignoring NIP-04 kind 4 event (DMs use NIP-17):", event.id?.slice(0, 12));
   }
@@ -2159,6 +2181,9 @@ var NostrTransportProvider = class _NostrTransportProvider {
     }
     try {
       const pm = import_nostr_js_sdk.NIP17.unwrap(event, this.keyManager);
+      if (event.created_at) {
+        this.updateLastDmEventTimestamp(event.created_at);
+      }
       logger.debug("Nostr", "Gift wrap unwrapped, sender:", pm.senderPubkey?.slice(0, 16), "kind:", pm.kind);
       if (pm.senderPubkey === this.keyManager.getPublicKeyHex()) {
         try {
@@ -2605,9 +2630,50 @@ var NostrTransportProvider = class _NostrTransportProvider {
       }
     });
     logger.debug("Nostr", "Wallet subscription created, subId:", this.walletSubscriptionId);
+    let dmSince;
+    if (this.storage) {
+      const dmStorageKey = `${STORAGE_KEYS_GLOBAL.LAST_DM_EVENT_TS}_${nostrPubkey.slice(0, 16)}`;
+      try {
+        const stored = await this.storage.get(dmStorageKey);
+        const parsed = stored ? parseInt(stored, 10) : NaN;
+        if (Number.isFinite(parsed)) {
+          dmSince = parsed;
+          this.lastDmEventTs = dmSince;
+          this.fallbackDmSince = null;
+          logger.debug("Nostr", "DM resuming from stored timestamp:", dmSince);
+        } else if (this.fallbackDmSince !== null) {
+          dmSince = this.fallbackDmSince;
+          this.lastDmEventTs = dmSince;
+          this.fallbackDmSince = null;
+          logger.debug("Nostr", "DM using fallback since timestamp:", dmSince);
+        } else {
+          dmSince = Math.floor(Date.now() / 1e3);
+          logger.debug("Nostr", "No stored DM timestamp, starting from now:", dmSince);
+        }
+      } catch (err) {
+        if (this.fallbackDmSince !== null) {
+          dmSince = this.fallbackDmSince;
+          this.lastDmEventTs = dmSince;
+          this.fallbackDmSince = null;
+          logger.debug("Nostr", "Storage read failed, using DM fallback since:", dmSince, err);
+        } else {
+          dmSince = Math.floor(Date.now() / 1e3);
+          logger.debug("Nostr", "Failed to read last DM event timestamp, falling back to now:", err);
+        }
+      }
+    } else if (this.fallbackDmSince !== null) {
+      dmSince = this.fallbackDmSince;
+      this.lastDmEventTs = dmSince;
+      this.fallbackDmSince = null;
+      logger.debug("Nostr", "No storage adapter for DM, using fallback since:", dmSince);
+    } else {
+      dmSince = Math.floor(Date.now() / 1e3);
+      logger.debug("Nostr", "No storage adapter for DM, starting from now:", dmSince);
+    }
     const chatFilter = new import_nostr_js_sdk.Filter();
     chatFilter.kinds = [import_nostr_js_sdk.EventKinds.GIFT_WRAP];
     chatFilter["#p"] = [nostrPubkey];
+    chatFilter.since = dmSince;
     this.chatSubscriptionId = this.nostrClient.subscribe(chatFilter, {
       onEvent: (event) => {
         logger.debug("Nostr", "Received chat event kind:", event.kind, "id:", event.id?.slice(0, 12));
@@ -2852,7 +2918,9 @@ var MultiAddressTransportMux = class {
       nostrPubkey,
       adapter,
       lastEventTs: 0,
-      fallbackSince: null
+      lastDmEventTs: 0,
+      fallbackSince: null,
+      fallbackDmSince: null
     };
     this.addresses.set(index, entry);
     this.pubkeyToIndex.set(nostrPubkey, index);
@@ -2894,6 +2962,12 @@ var MultiAddressTransportMux = class {
       entry.fallbackSince = sinceSeconds;
     }
   }
+  setFallbackDmSince(index, sinceSeconds) {
+    const entry = this.addresses.get(index);
+    if (entry) {
+      entry.fallbackDmSince = sinceSeconds;
+    }
+  }
   // ===========================================================================
   // Connection Management (delegated from adapters)
   // ===========================================================================
@@ -3029,11 +3103,20 @@ var MultiAddressTransportMux = class {
     }
     logger.debug("Mux", `Subscribing for ${allPubkeys.length} address(es):`, allPubkeys.map((p) => p.slice(0, 12)).join(", "));
     let globalSince = Math.floor(Date.now() / 1e3);
-    for (const entry of this.addresses.values()) {
-      const since = await this.getAddressSince(entry);
-      if (since < globalSince) {
-        globalSince = since;
-      }
+    let globalDmSince = Math.floor(Date.now() / 1e3);
+    const entries = [...this.addresses.values()];
+    const sinceResults = await Promise.all(
+      entries.map(async (entry) => {
+        const [walletSince, dmSince] = await Promise.all([
+          this.getAddressSince(entry),
+          this.getAddressDmSince(entry)
+        ]);
+        return { walletSince, dmSince };
+      })
+    );
+    for (const { walletSince, dmSince } of sinceResults) {
+      if (walletSince < globalSince) globalSince = walletSince;
+      if (dmSince < globalDmSince) globalDmSince = dmSince;
     }
     const walletFilter = new import_nostr_js_sdk2.Filter();
     walletFilter.kinds = [
@@ -3066,6 +3149,7 @@ var MultiAddressTransportMux = class {
     const chatFilter = new import_nostr_js_sdk2.Filter();
     chatFilter.kinds = [import_nostr_js_sdk2.EventKinds.GIFT_WRAP];
     chatFilter["#p"] = allPubkeys;
+    chatFilter.since = globalDmSince;
     this.chatSubscriptionId = this.nostrClient.subscribe(chatFilter, {
       onEvent: (event) => {
         this.handleEvent({
@@ -3172,6 +3256,9 @@ var MultiAddressTransportMux = class {
     for (const entry of this.addresses.values()) {
       try {
         const pm = import_nostr_js_sdk2.NIP17.unwrap(event, entry.keyManager);
+        if (event.created_at) {
+          this.updateLastDmEventTimestamp(entry, event.created_at);
+        }
         logger.debug("Mux", `Gift wrap decrypted by address ${entry.index}, sender: ${pm.senderPubkey?.slice(0, 16)}`);
         if (pm.senderPubkey === entry.nostrPubkey) {
           try {
@@ -3528,6 +3615,47 @@ var MultiAddressTransportMux = class {
       logger.debug("Mux", "Failed to save last event timestamp:", err);
     });
   }
+  updateLastDmEventTimestamp(entry, createdAt) {
+    if (!this.storage) return;
+    if (createdAt <= entry.lastDmEventTs) return;
+    entry.lastDmEventTs = createdAt;
+    const storageKey = `${STORAGE_KEYS_GLOBAL.LAST_DM_EVENT_TS}_${entry.nostrPubkey.slice(0, 16)}`;
+    this.storage.set(storageKey, createdAt.toString()).catch((err) => {
+      logger.debug("Mux", "Failed to save last DM event timestamp:", err);
+    });
+  }
+  async getAddressDmSince(entry) {
+    if (this.storage) {
+      const storageKey = `${STORAGE_KEYS_GLOBAL.LAST_DM_EVENT_TS}_${entry.nostrPubkey.slice(0, 16)}`;
+      try {
+        const stored = await this.storage.get(storageKey);
+        const parsed = stored ? parseInt(stored, 10) : NaN;
+        if (Number.isFinite(parsed)) {
+          entry.lastDmEventTs = parsed;
+          entry.fallbackDmSince = null;
+          return parsed;
+        } else if (entry.fallbackDmSince !== null) {
+          const ts = entry.fallbackDmSince;
+          entry.lastDmEventTs = ts;
+          entry.fallbackDmSince = null;
+          return ts;
+        }
+      } catch {
+        if (entry.fallbackDmSince !== null) {
+          const ts = entry.fallbackDmSince;
+          entry.lastDmEventTs = ts;
+          entry.fallbackDmSince = null;
+          return ts;
+        }
+      }
+    } else if (entry.fallbackDmSince !== null) {
+      const ts = entry.fallbackDmSince;
+      entry.lastDmEventTs = ts;
+      entry.fallbackDmSince = null;
+      return ts;
+    }
+    return Math.floor(Date.now() / 1e3);
+  }
   // ===========================================================================
   // Mux-level event system
   // ===========================================================================
@@ -3824,6 +3952,9 @@ var AddressTransportAdapter = class {
   setFallbackSince(sinceSeconds) {
     this.mux.setFallbackSince(this.addressIndex, sinceSeconds);
   }
+  setFallbackDmSince(sinceSeconds) {
+    this.mux.setFallbackDmSince(this.addressIndex, sinceSeconds);
+  }
   async fetchPendingEvents() {
   }
   onChatReady(handler) {
@@ -16482,6 +16613,8 @@ var Sphere = class _Sphere {
   // Per-address module instances (Phase 2: independent parallel operation)
   _addressModules = /* @__PURE__ */ new Map();
   _transportMux = null;
+  /** Fallback DM since timestamp from init options, forwarded to mux on creation. */
+  _dmSince = null;
   // Stored configs for creating per-address modules
   _l1Config;
   _groupChatConfig;
@@ -16583,6 +16716,9 @@ var Sphere = class _Sphere {
         discoverAddresses: options.discoverAddresses,
         onProgress: options.onProgress
       });
+      if (options.dmSince != null) {
+        sphere2._dmSince = options.dmSince;
+      }
       return { sphere: sphere2, created: false };
     }
     let mnemonic = options.mnemonic;
@@ -16614,6 +16750,9 @@ var Sphere = class _Sphere {
       discoverAddresses: options.discoverAddresses,
       onProgress: options.onProgress
     });
+    if (options.dmSince != null) {
+      sphere._dmSince = options.dmSince;
+    }
     return { sphere, created: true, generatedMnemonic };
   }
   /**
@@ -17887,6 +18026,9 @@ var Sphere = class _Sphere {
     const emitEvent = this.emitEvent.bind(this);
     const adapter = await this.ensureTransportMux(index, identity);
     const addressTransport = adapter ?? this._transport;
+    if (!adapter && this._dmSince != null && addressTransport.setFallbackDmSince) {
+      addressTransport.setFallbackDmSince(this._dmSince);
+    }
     const payments = createPaymentsModule({ l1: this._l1Config });
     const communications = createCommunicationsModule();
     const groupChat = this._groupChatConfig ? createGroupChatModule(this._groupChatConfig) : null;
@@ -17970,6 +18112,9 @@ var Sphere = class _Sphere {
       }
       logger.debug("Sphere", "Transport mux created and connected");
     }
+    if (this._dmSince != null) {
+      this._transportMux.setFallbackDmSince(index, this._dmSince);
+    }
     const adapter = await this._transportMux.addAddress(index, identity, this._transport);
     return adapter;
   }