@unicitylabs/sphere-sdk 0.2.1 → 0.2.3

package/dist/impl/nodejs/index.cjs

@@ -74,7 +74,9 @@ var STORAGE_KEYS_GLOBAL = {
   /** Nametag cache per address (separate from tracked addresses registry) */
   ADDRESS_NAMETAGS: "address_nametags",
   /** Active addresses registry (JSON: TrackedAddressesStorage) */
-  TRACKED_ADDRESSES: "tracked_addresses"
+  TRACKED_ADDRESSES: "tracked_addresses",
+  /** Last processed Nostr wallet event timestamp (unix seconds), keyed per pubkey */
+  LAST_WALLET_EVENT_TS: "last_wallet_event_ts"
 };
 var STORAGE_KEYS_ADDRESS = {
   /** Pending transfers for this address */
@@ -1141,6 +1143,9 @@ var NostrTransportProvider = class {
   type = "p2p";
   description = "P2P messaging via Nostr protocol";
   config;
+  storage = null;
+  /** In-memory max event timestamp to avoid read-before-write races in updateLastEventTimestamp. */
+  lastEventTs = 0;
   identity = null;
   keyManager = null;
   status = "disconnected";
@@ -1166,6 +1171,7 @@ var NostrTransportProvider = class {
       createWebSocket: config.createWebSocket,
       generateUUID: config.generateUUID ?? defaultUUIDGenerator
     };
+    this.storage = config.storage ?? null;
   }
   // ===========================================================================
   // BaseProvider Implementation
@@ -1204,7 +1210,14 @@ var NostrTransportProvider = class {
           this.emitEvent({ type: "transport:connected", timestamp: Date.now() });
         }
       });
-      await this.nostrClient.connect(...this.config.relays);
+      await Promise.race([
+        this.nostrClient.connect(...this.config.relays),
+        new Promise(
+          (_, reject) => setTimeout(() => reject(new Error(
+            `Transport connection timed out after ${this.config.timeout}ms`
+          )), this.config.timeout)
+        )
+      ]);
       if (!this.nostrClient.isConnected()) {
         throw new Error("Failed to connect to any relay");
       }
@@ -1212,7 +1225,7 @@ var NostrTransportProvider = class {
       this.emitEvent({ type: "transport:connected", timestamp: Date.now() });
       this.log("Connected to", this.nostrClient.getConnectedRelays().size, "relays");
       if (this.identity) {
-        this.subscribeToEvents();
+        await this.subscribeToEvents();
       }
     } catch (error) {
       this.status = "error";
@@ -1365,11 +1378,18 @@ var NostrTransportProvider = class {
           this.log("NostrClient reconnected to relay:", url);
         }
       });
-      await this.nostrClient.connect(...this.config.relays);
-      this.subscribeToEvents();
+      await Promise.race([
+        this.nostrClient.connect(...this.config.relays),
+        new Promise(
+          (_, reject) => setTimeout(() => reject(new Error(
+            `Transport reconnection timed out after ${this.config.timeout}ms`
+          )), this.config.timeout)
+        )
+      ]);
+      await this.subscribeToEvents();
       oldClient.disconnect();
     } else if (this.isConnected()) {
-      this.subscribeToEvents();
+      await this.subscribeToEvents();
     }
   }
   /**
@@ -1510,7 +1530,7 @@ var NostrTransportProvider = class {
     return this.resolveNametagInfo(identifier);
   }
   async resolveNametag(nametag) {
-    this.ensureReady();
+    this.ensureConnected();
     const hashedNametag = (0, import_nostr_js_sdk.hashNametag)(nametag);
     let events = await this.queryEvents({
       kinds: [EVENT_KINDS.NAMETAG_BINDING],
@@ -1534,7 +1554,7 @@ var NostrTransportProvider = class {
     return null;
   }
   async resolveNametagInfo(nametag) {
-    this.ensureReady();
+    this.ensureConnected();
     const hashedNametag = (0, import_nostr_js_sdk.hashNametag)(nametag);
     let events = await this.queryEvents({
       kinds: [EVENT_KINDS.NAMETAG_BINDING],
@@ -1611,7 +1631,7 @@ var NostrTransportProvider = class {
    * Works with both new identity binding events and legacy nametag binding events.
    */
   async resolveAddressInfo(address) {
-    this.ensureReady();
+    this.ensureConnected();
     const addressHash = hashAddressForTag(address);
     const events = await this.queryEvents({
       kinds: [EVENT_KINDS.NAMETAG_BINDING],
@@ -1646,7 +1666,7 @@ var NostrTransportProvider = class {
    * Queries binding events authored by the given pubkey.
    */
   async resolveTransportPubkeyInfo(transportPubkey) {
-    this.ensureReady();
+    this.ensureConnected();
     const events = await this.queryEvents({
       kinds: [EVENT_KINDS.NAMETAG_BINDING],
       authors: [transportPubkey],
@@ -1897,10 +1917,31 @@ var NostrTransportProvider = class {
           this.handleBroadcast(event);
           break;
       }
+      if (event.created_at && this.storage && this.keyManager) {
+        const kind = event.kind;
+        if (kind === EVENT_KINDS.DIRECT_MESSAGE || kind === EVENT_KINDS.TOKEN_TRANSFER || kind === EVENT_KINDS.PAYMENT_REQUEST || kind === EVENT_KINDS.PAYMENT_REQUEST_RESPONSE) {
+          this.updateLastEventTimestamp(event.created_at);
+        }
+      }
     } catch (error) {
       this.log("Failed to handle event:", error);
     }
   }
+  /**
+   * Save the max event timestamp to storage (fire-and-forget, no await needed by caller).
+   * Uses in-memory `lastEventTs` to avoid read-before-write race conditions
+   * when multiple events arrive in quick succession.
+   */
+  updateLastEventTimestamp(createdAt) {
+    if (!this.storage || !this.keyManager) return;
+    if (createdAt <= this.lastEventTs) return;
+    this.lastEventTs = createdAt;
+    const pubkey = this.keyManager.getPublicKeyHex();
+    const storageKey = `${STORAGE_KEYS_GLOBAL.LAST_WALLET_EVENT_TS}_${pubkey.slice(0, 16)}`;
+    this.storage.set(storageKey, createdAt.toString()).catch((err) => {
+      this.log("Failed to save last event timestamp:", err);
+    });
+  }
   async handleDirectMessage(event) {
     this.log("Ignoring NIP-04 kind 4 event (DMs use NIP-17):", event.id?.slice(0, 12));
   }
@@ -1979,6 +2020,7 @@ var NostrTransportProvider = class {
       const request = {
         id: event.id,
         senderTransportPubkey: event.pubkey,
+        senderNametag: requestData.recipientNametag,
         request: {
           requestId: requestData.requestId,
           amount: requestData.amount,
@@ -2133,7 +2175,7 @@ var NostrTransportProvider = class {
   // Track subscription IDs for cleanup
   walletSubscriptionId = null;
   chatSubscriptionId = null;
-  subscribeToEvents() {
+  async subscribeToEvents() {
     this.log("subscribeToEvents called, identity:", !!this.identity, "keyManager:", !!this.keyManager, "nostrClient:", !!this.nostrClient);
     if (!this.identity || !this.keyManager || !this.nostrClient) {
       this.log("subscribeToEvents: skipped - no identity, keyManager, or nostrClient");
@@ -2153,6 +2195,27 @@ var NostrTransportProvider = class {
     }
     const nostrPubkey = this.keyManager.getPublicKeyHex();
     this.log("Subscribing with Nostr pubkey:", nostrPubkey);
+    let since;
+    if (this.storage) {
+      const storageKey = `${STORAGE_KEYS_GLOBAL.LAST_WALLET_EVENT_TS}_${nostrPubkey.slice(0, 16)}`;
+      try {
+        const stored = await this.storage.get(storageKey);
+        if (stored) {
+          since = parseInt(stored, 10);
+          this.lastEventTs = since;
+          this.log("Resuming from stored event timestamp:", since);
+        } else {
+          since = Math.floor(Date.now() / 1e3);
+          this.log("No stored timestamp, starting from now:", since);
+        }
+      } catch (err) {
+        this.log("Failed to read last event timestamp, falling back to now:", err);
+        since = Math.floor(Date.now() / 1e3);
+      }
+    } else {
+      since = Math.floor(Date.now() / 1e3) - 86400;
+      this.log("No storage adapter, using 24h fallback");
+    }
     const walletFilter = new import_nostr_js_sdk.Filter();
     walletFilter.kinds = [
       EVENT_KINDS.DIRECT_MESSAGE,
@@ -2161,7 +2224,7 @@ var NostrTransportProvider = class {
       EVENT_KINDS.PAYMENT_REQUEST_RESPONSE
     ];
     walletFilter["#p"] = [nostrPubkey];
-    walletFilter.since = Math.floor(Date.now() / 1e3) - 86400;
+    walletFilter.since = since;
     this.walletSubscriptionId = this.nostrClient.subscribe(walletFilter, {
       onEvent: (event) => {
         this.log("Received wallet event kind:", event.kind, "id:", event.id?.slice(0, 12));
@@ -2264,10 +2327,13 @@ var NostrTransportProvider = class {
   // ===========================================================================
   // Private: Helpers
   // ===========================================================================
-  ensureReady() {
+  ensureConnected() {
     if (!this.isConnected()) {
       throw new Error("NostrTransportProvider not connected");
     }
+  }
+  ensureReady() {
+    this.ensureConnected();
     if (!this.identity) {
       throw new Error("Identity not set");
     }
@@ -2955,10 +3021,11 @@ function createNodeProviders(config) {
   const oracleConfig = resolveOracleConfig(network, config?.oracle);
   const l1Config = resolveL1Config(network, config?.l1);
   const priceConfig = resolvePriceConfig(config?.price);
+  const storage = createFileStorageProvider({
+    dataDir: config?.dataDir ?? "./sphere-data"
+  });
   return {
-    storage: createFileStorageProvider({
-      dataDir: config?.dataDir ?? "./sphere-data"
-    }),
+    storage,
     tokenStorage: createFileTokenStorageProvider({
       tokensDir: config?.tokensDir ?? "./sphere-tokens"
     }),
@@ -2966,7 +3033,8 @@ function createNodeProviders(config) {
       relays: transportConfig.relays,
       timeout: transportConfig.timeout,
       autoReconnect: transportConfig.autoReconnect,
-      debug: transportConfig.debug
+      debug: transportConfig.debug,
+      storage
     }),
     oracle: createUnicityAggregatorProvider({
       url: oracleConfig.url,