@unicitylabs/sphere-sdk 0.6.2 → 0.6.4

package/dist/impl/browser/index.cjs

@@ -818,7 +818,7 @@ var STORE_TOKENS = "tokens";
 var STORE_META = "meta";
 var STORE_HISTORY = "history";
 var connectionSeq2 = 0;
-var IndexedDBTokenStorageProvider = class {
+var IndexedDBTokenStorageProvider = class _IndexedDBTokenStorageProvider {
   id = "indexeddb-token-storage";
   name = "IndexedDB Token Storage";
   type = "local";
@@ -1266,6 +1266,16 @@ var IndexedDBTokenStorageProvider = class {
       db.close();
     }
   }
+  /**
+   * Create an independent instance for a different address.
+   * The new instance shares the same config but has its own IDB connection.
+   */
+  createForAddress() {
+    return new _IndexedDBTokenStorageProvider({
+      dbNamePrefix: this.dbNamePrefix,
+      debug: this.debug
+    });
+  }
 };
 function createIndexedDBTokenStorageProvider(config) {
   return new IndexedDBTokenStorageProvider(config);
@@ -1673,7 +1683,7 @@ function defaultUUIDGenerator() {
 var COMPOSING_INDICATOR_KIND = 25050;
 var TIMESTAMP_RANDOMIZATION = 2 * 24 * 60 * 60;
 var EVENT_KINDS = NOSTR_EVENT_KINDS;
-var NostrTransportProvider = class {
+var NostrTransportProvider = class _NostrTransportProvider {
   id = "nostr";
   name = "Nostr Transport";
   type = "p2p";
@@ -1682,6 +1692,8 @@ var NostrTransportProvider = class {
   storage = null;
   /** In-memory max event timestamp to avoid read-before-write races in updateLastEventTimestamp. */
   lastEventTs = 0;
+  /** Fallback 'since' timestamp for first-time address subscriptions (consumed once). */
+  fallbackSince = null;
   identity = null;
   keyManager = null;
   status = "disconnected";
@@ -1714,6 +1726,48 @@ var NostrTransportProvider = class {
     };
     this.storage = config.storage ?? null;
   }
+  /**
+   * Get the WebSocket factory (used by MultiAddressTransportMux to share the same factory).
+   */
+  getWebSocketFactory() {
+    return this.config.createWebSocket;
+  }
+  /**
+   * Get the configured relay URLs.
+   */
+  getConfiguredRelays() {
+    return [...this.config.relays];
+  }
+  /**
+   * Get the storage adapter.
+   */
+  getStorageAdapter() {
+    return this.storage;
+  }
+  /**
+   * Suppress event subscriptions — unsubscribe wallet/chat filters
+   * but keep the connection alive for resolve/identity-binding operations.
+   * Used when MultiAddressTransportMux takes over event handling.
+   */
+  suppressSubscriptions() {
+    if (!this.nostrClient) return;
+    if (this.walletSubscriptionId) {
+      this.nostrClient.unsubscribe(this.walletSubscriptionId);
+      this.walletSubscriptionId = null;
+    }
+    if (this.chatSubscriptionId) {
+      this.nostrClient.unsubscribe(this.chatSubscriptionId);
+      this.chatSubscriptionId = null;
+    }
+    if (this.mainSubscriptionId) {
+      this.nostrClient.unsubscribe(this.mainSubscriptionId);
+      this.mainSubscriptionId = null;
+    }
+    this._subscriptionsSuppressed = true;
+    logger.debug("Nostr", "Subscriptions suppressed \u2014 mux handles event routing");
+  }
+  // Flag to prevent re-subscription after suppressSubscriptions()
+  _subscriptionsSuppressed = false;
   // ===========================================================================
   // BaseProvider Implementation
   // ===========================================================================
@@ -1892,6 +1946,8 @@ var NostrTransportProvider = class {
   // ===========================================================================
   async setIdentity(identity) {
     this.identity = identity;
+    this.processedEventIds.clear();
+    this.lastEventTs = 0;
     const secretKey = import_buffer.Buffer.from(identity.privateKey, "hex");
     this.keyManager = import_nostr_js_sdk.NostrKeyManager.fromPrivateKey(secretKey);
     const nostrPubkey = this.keyManager.getPublicKeyHex();
@@ -1934,6 +1990,9 @@ var NostrTransportProvider = class {
       await this.subscribeToEvents();
     }
   }
+  setFallbackSince(sinceSeconds) {
+    this.fallbackSince = sinceSeconds;
+  }
   /**
    * Get the Nostr-format public key (32 bytes / 64 hex chars)
    * This is the x-coordinate only, without the 02/03 prefix.
@@ -2155,11 +2214,11 @@ var NostrTransportProvider = class {
     return this.resolveNametagInfo(identifier);
   }
   async resolveNametag(nametag) {
-    this.ensureConnected();
+    await this.ensureConnectedForResolve();
     return this.nostrClient.queryPubkeyByNametag(nametag);
   }
   async resolveNametagInfo(nametag) {
-    this.ensureConnected();
+    await this.ensureConnectedForResolve();
     const binding = await this.nostrClient.queryBindingByNametag(nametag);
     if (!binding) {
       logger.debug("Nostr", `resolveNametagInfo: no binding events found for Unicity ID "${nametag}"`);
@@ -2172,7 +2231,7 @@ var NostrTransportProvider = class {
    * Performs reverse lookup via nostr-js-sdk with first-seen-wins anti-hijacking.
    */
   async resolveAddressInfo(address) {
-    this.ensureConnected();
+    await this.ensureConnectedForResolve();
     const binding = await this.nostrClient.queryBindingByAddress(address);
     if (!binding) return null;
     return this.bindingInfoToPeerInfo(binding);
@@ -2207,7 +2266,7 @@ var NostrTransportProvider = class {
    * Queries binding events authored by the given pubkey.
    */
   async resolveTransportPubkeyInfo(transportPubkey) {
-    this.ensureConnected();
+    await this.ensureConnectedForResolve();
     const events = await this.queryEvents({
       kinds: [EVENT_KINDS.NAMETAG_BINDING],
       authors: [transportPubkey],
@@ -2242,7 +2301,7 @@ var NostrTransportProvider = class {
    * Used for HD address discovery — single relay query with multi-author filter.
    */
   async discoverAddresses(transportPubkeys) {
-    this.ensureConnected();
+    await this.ensureConnectedForResolve();
     if (transportPubkeys.length === 0) return [];
     const events = await this.queryEvents({
       kinds: [EVENT_KINDS.NAMETAG_BINDING],
@@ -2281,7 +2340,10 @@ var NostrTransportProvider = class {
    * @returns Decrypted nametag or null if none found
    */
   async recoverNametag() {
-    this.ensureReady();
+    await this.ensureConnectedForResolve();
+    if (!this.identity) {
+      throw new SphereError("Identity not set", "NOT_INITIALIZED");
+    }
     if (!this.identity || !this.keyManager) {
       throw new SphereError("Identity not set", "NOT_INITIALIZED");
     }
@@ -2841,6 +2903,10 @@ var NostrTransportProvider = class {
   chatEoseFired = false;
   async subscribeToEvents() {
     logger.debug("Nostr", "subscribeToEvents called, identity:", !!this.identity, "keyManager:", !!this.keyManager, "nostrClient:", !!this.nostrClient);
+    if (this._subscriptionsSuppressed) {
+      logger.debug("Nostr", "subscribeToEvents: suppressed \u2014 mux handles event routing");
+      return;
+    }
     if (!this.identity || !this.keyManager || !this.nostrClient) {
       logger.debug("Nostr", "subscribeToEvents: skipped - no identity, keyManager, or nostrClient");
       return;
@@ -2867,7 +2933,13 @@ var NostrTransportProvider = class {
         if (stored) {
           since = parseInt(stored, 10);
           this.lastEventTs = since;
+          this.fallbackSince = null;
           logger.debug("Nostr", "Resuming from stored event timestamp:", since);
+        } else if (this.fallbackSince !== null) {
+          since = this.fallbackSince;
+          this.lastEventTs = since;
+          this.fallbackSince = null;
+          logger.debug("Nostr", "Using fallback since timestamp:", since);
         } else {
           since = Math.floor(Date.now() / 1e3);
           logger.debug("Nostr", "No stored timestamp, starting from now:", since);
@@ -2875,6 +2947,7 @@ var NostrTransportProvider = class {
       } catch (err) {
         logger.debug("Nostr", "Failed to read last event timestamp, falling back to now:", err);
         since = Math.floor(Date.now() / 1e3);
+        this.fallbackSince = null;
       }
     } else {
       since = Math.floor(Date.now() / 1e3) - 86400;
@@ -3006,6 +3079,31 @@ var NostrTransportProvider = class {
       throw new SphereError("NostrTransportProvider not connected", "TRANSPORT_ERROR");
     }
   }
+  /**
+   * Async version of ensureConnected — reconnects if the original transport
+   * lost its WebSocket while subscriptions are suppressed (mux handles events).
+   * Used by resolve methods which are always async.
+   */
+  async ensureConnectedForResolve() {
+    if (this.isConnected()) return;
+    if (this._subscriptionsSuppressed && this.nostrClient) {
+      logger.debug("Nostr", "Suppressed transport disconnected \u2014 reconnecting for resolve");
+      try {
+        await Promise.race([
+          this.nostrClient.connect(...this.config.relays),
+          new Promise(
+            (_, reject) => setTimeout(() => reject(new Error("reconnect timeout")), 5e3)
+          )
+        ]);
+        if (this.nostrClient.isConnected()) {
+          this.status = "connected";
+          return;
+        }
+      } catch {
+      }
+    }
+    throw new SphereError("NostrTransportProvider not connected", "TRANSPORT_ERROR");
+  }
   ensureReady() {
     this.ensureConnected();
     if (!this.identity) {
@@ -3027,16 +3125,23 @@ var NostrTransportProvider = class {
    * because NIP17.createGiftWrap hardcodes kind 14 for the inner rumor.
    */
   createCustomKindGiftWrap(recipientPubkeyHex, content, rumorKind) {
-    const senderPubkey = this.keyManager.getPublicKeyHex();
+    return _NostrTransportProvider.createCustomKindGiftWrap(this.keyManager, recipientPubkeyHex, content, rumorKind);
+  }
+  /**
+   * Create a NIP-17 gift wrap with a custom rumor kind.
+   * Shared between NostrTransportProvider and MultiAddressTransportMux.
+   */
+  static createCustomKindGiftWrap(keyManager, recipientPubkeyHex, content, rumorKind) {
+    const senderPubkey = keyManager.getPublicKeyHex();
     const now = Math.floor(Date.now() / 1e3);
     const rumorTags = [["p", recipientPubkeyHex]];
     const rumorSerialized = JSON.stringify([0, senderPubkey, now, rumorKind, rumorTags, content]);
     const rumorId = bytesToHex(sha256(new TextEncoder().encode(rumorSerialized)));
     const rumor = { id: rumorId, pubkey: senderPubkey, created_at: now, kind: rumorKind, tags: rumorTags, content };
     const recipientPubkeyBytes = hexToBytes(recipientPubkeyHex);
-    const encryptedRumor = import_nostr_js_sdk.NIP44.encrypt(JSON.stringify(rumor), this.keyManager.getPrivateKey(), recipientPubkeyBytes);
+    const encryptedRumor = import_nostr_js_sdk.NIP44.encrypt(JSON.stringify(rumor), keyManager.getPrivateKey(), recipientPubkeyBytes);
     const sealTimestamp = now + Math.floor(Math.random() * 2 * TIMESTAMP_RANDOMIZATION) - TIMESTAMP_RANDOMIZATION;
-    const seal = import_nostr_js_sdk.Event.create(this.keyManager, {
+    const seal = import_nostr_js_sdk.Event.create(keyManager, {
       kind: import_nostr_js_sdk.EventKinds.SEAL,
       tags: [],
       content: encryptedRumor,
@@ -4895,11 +5000,17 @@ var AsyncSerialQueue = class {
 var WriteBuffer = class {
   /** Full TXF data from save() calls — latest wins */
   txfData = null;
+  /** IPNS context captured at save() time — ensures flush writes to the correct
+   *  IPNS record even if identity changes between save() and flush(). */
+  capturedIpnsKeyPair = null;
+  capturedIpnsName = null;
   get isEmpty() {
     return this.txfData === null;
   }
   clear() {
     this.txfData = null;
+    this.capturedIpnsKeyPair = null;
+    this.capturedIpnsName = null;
   }
   /**
    * Merge another buffer's contents into this one (for rollback).
@@ -4908,12 +5019,14 @@ var WriteBuffer = class {
   mergeFrom(other) {
     if (other.txfData && !this.txfData) {
       this.txfData = other.txfData;
+      this.capturedIpnsKeyPair = other.capturedIpnsKeyPair;
+      this.capturedIpnsName = other.capturedIpnsName;
     }
   }
 };
 
 // impl/shared/ipfs/ipfs-storage-provider.ts
-var IpfsStorageProvider = class {
+var IpfsStorageProvider = class _IpfsStorageProvider {
   id = "ipfs";
   name = "IPFS Storage";
   type = "p2p";
@@ -4958,7 +5071,12 @@ var IpfsStorageProvider = class {
   flushDebounceMs;
   /** Set to true during shutdown to prevent new flushes */
   isShuttingDown = false;
+  /** Stored config for createForAddress() cloning */
+  _config;
+  _statePersistenceCtor;
   constructor(config, statePersistence) {
+    this._config = config;
+    this._statePersistenceCtor = statePersistence;
     const gateways = config?.gateways ?? getIpfsGatewayUrls();
     this.debug = config?.debug ?? false;
     this.ipnsLifetimeMs = config?.ipnsLifetimeMs ?? 99 * 365 * 24 * 60 * 60 * 1e3;
@@ -5078,6 +5196,7 @@ var IpfsStorageProvider = class {
   }
   async shutdown() {
     this.isShuttingDown = true;
+    logger.debug("IPFS-Storage", `shutdown: ipnsName=${this.ipnsName?.slice(0, 20)}..., pendingEmpty=${this.pendingBuffer.isEmpty}, capturedIpns=${this.pendingBuffer.capturedIpnsName?.slice(0, 20) ?? "none"}`);
     if (this.flushTimer) {
       clearTimeout(this.flushTimer);
       this.flushTimer = null;
@@ -5110,6 +5229,8 @@ var IpfsStorageProvider = class {
       return { success: false, error: "Not initialized", timestamp: Date.now() };
     }
     this.pendingBuffer.txfData = data;
+    this.pendingBuffer.capturedIpnsKeyPair = this.ipnsKeyPair;
+    this.pendingBuffer.capturedIpnsName = this.ipnsName;
     this.scheduleFlush();
     return { success: true, timestamp: Date.now() };
   }
@@ -5120,8 +5241,12 @@ var IpfsStorageProvider = class {
    * Perform the actual upload + IPNS publish synchronously.
    * Called by executeFlush() and sync() — never by public save().
    */
-  async _doSave(data) {
-    if (!this.ipnsKeyPair || !this.ipnsName) {
+  async _doSave(data, overrideIpns) {
+    const ipnsKeyPair = overrideIpns?.keyPair ?? this.ipnsKeyPair;
+    const ipnsName = overrideIpns?.name ?? this.ipnsName;
+    const metaAddr = data?._meta?.address;
+    logger.debug("IPFS-Storage", `_doSave: ipnsName=${ipnsName?.slice(0, 20)}..., override=${!!overrideIpns}, meta.address=${metaAddr?.slice(0, 20) ?? "none"}`);
+    if (!ipnsKeyPair || !ipnsName) {
       return { success: false, error: "Not initialized", timestamp: Date.now() };
     }
     this.emitEvent({ type: "storage:saving", timestamp: Date.now() });
@@ -5130,7 +5255,7 @@ var IpfsStorageProvider = class {
       const metaUpdate = {
         ...data._meta,
         version: this.dataVersion,
-        ipnsName: this.ipnsName,
+        ipnsName,
         updatedAt: Date.now()
       };
       if (this.remoteCid) {
@@ -5142,13 +5267,13 @@ var IpfsStorageProvider = class {
       const baseSeq = this.ipnsSequenceNumber > this.lastKnownRemoteSequence ? this.ipnsSequenceNumber : this.lastKnownRemoteSequence;
       const newSeq = baseSeq + 1n;
       const marshalledRecord = await createSignedRecord(
-        this.ipnsKeyPair,
+        ipnsKeyPair,
         cid,
         newSeq,
         this.ipnsLifetimeMs
       );
       const publishResult = await this.httpClient.publishIpns(
-        this.ipnsName,
+        ipnsName,
         marshalledRecord
       );
       if (!publishResult.success) {
@@ -5163,14 +5288,14 @@ var IpfsStorageProvider = class {
       this.ipnsSequenceNumber = newSeq;
       this.lastCid = cid;
       this.remoteCid = cid;
-      this.cache.setIpnsRecord(this.ipnsName, {
+      this.cache.setIpnsRecord(ipnsName, {
         cid,
         sequence: newSeq,
         gateway: "local"
       });
       this.cache.setContent(cid, updatedData);
-      this.cache.markIpnsFresh(this.ipnsName);
-      await this.statePersistence.save(this.ipnsName, {
+      this.cache.markIpnsFresh(ipnsName);
+      await this.statePersistence.save(ipnsName, {
         sequenceNumber: newSeq.toString(),
         lastCid: cid,
         version: this.dataVersion
@@ -5222,7 +5347,8 @@ var IpfsStorageProvider = class {
       const baseData = active.txfData ?? {
         _meta: { version: 0, address: this.identity?.directAddress ?? "", formatVersion: "2.0", updatedAt: 0 }
       };
-      const result = await this._doSave(baseData);
+      const overrideIpns = active.capturedIpnsKeyPair && active.capturedIpnsName ? { keyPair: active.capturedIpnsKeyPair, name: active.capturedIpnsName } : void 0;
+      const result = await this._doSave(baseData, overrideIpns);
       if (!result.success) {
         throw new SphereError(result.error ?? "Save failed", "STORAGE_ERROR");
       }
@@ -5525,6 +5651,13 @@ var IpfsStorageProvider = class {
   log(message) {
     logger.debug("IPFS-Storage", message);
   }
+  /**
+   * Create an independent instance for a different address.
+   * Shares the same gateway/timeout config but has fresh IPNS state.
+   */
+  createForAddress() {
+    return new _IpfsStorageProvider(this._config, this._statePersistenceCtor);
+  }
 };
 
 // impl/browser/ipfs/browser-ipfs-state-persistence.ts