@unicitylabs/sphere-sdk 0.4.6 → 0.4.7

package/dist/index.cjs

@@ -8517,10 +8517,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);
     this.trackSubscription(
       createNip29Filter({
         kinds: [NIP29_KINDS.CHAT_MESSAGE, NIP29_KINDS.THREAD_ROOT, NIP29_KINDS.THREAD_REPLY],
-        "#h": groupIds
+        "#h": groupIds,
+        ...latestTimestamp ? { since: latestTimestamp } : {}
       }),
       { onEvent: (event) => this.handleGroupEvent(event) }
     );
@@ -8541,10 +8543,12 @@ var GroupChatModule = class {
   }
   subscribeToGroup(groupId) {
     if (!this.client) return;
+    const latestTimestamp = this.getLatestMessageTimestamp([groupId]);
     this.trackSubscription(
       createNip29Filter({
         kinds: [NIP29_KINDS.CHAT_MESSAGE, NIP29_KINDS.THREAD_ROOT, NIP29_KINDS.THREAD_REPLY],
-        "#h": [groupId]
+        "#h": [groupId],
+        ...latestTimestamp ? { since: latestTimestamp } : {}
       }),
       { onEvent: (event) => this.handleGroupEvent(event) }
     );
@@ -9236,6 +9240,23 @@ var GroupChatModule = class {
   getMyPublicKey() {
     return this.keyManager?.getPublicKeyHex() || null;
   }
+  /**
+   * Returns the latest message timestamp (in Nostr seconds) across the given groups,
+   * 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) {
+    let latest = 0;
+    for (const gid of groupIds) {
+      const msgs = this.messages.get(gid);
+      if (!msgs) continue;
+      for (const m of msgs) {
+        const ts = Math.floor(m.timestamp / 1e3);
+        if (ts > latest) latest = ts;
+      }
+    }
+    return latest;
+  }
   // ===========================================================================
   // Private — Relay Admin
   // ===========================================================================
@@ -13682,55 +13703,44 @@ var Sphere = class _Sphere {
    * ```
    */
   static async importFromJSON(options) {
+    const { jsonContent, password, ...baseOptions } = options;
     try {
-      const data = JSON.parse(options.jsonContent);
+      const data = JSON.parse(jsonContent);
       if (data.version !== "1.0" || data.type !== "sphere-wallet") {
         return { success: false, error: "Invalid wallet format" };
       }
       let mnemonic = data.mnemonic;
       let masterKey = data.wallet.masterPrivateKey;
-      if (data.encrypted && options.password) {
+      if (data.encrypted && password) {
         if (mnemonic) {
-          const decrypted = decryptSimple(mnemonic, options.password);
+          const decrypted = decryptSimple(mnemonic, password);
           if (!decrypted) {
             return { success: false, error: "Failed to decrypt mnemonic - wrong password?" };
           }
           mnemonic = decrypted;
         }
         if (masterKey) {
-          const decrypted = decryptSimple(masterKey, options.password);
+          const decrypted = decryptSimple(masterKey, password);
           if (!decrypted) {
             return { success: false, error: "Failed to decrypt master key - wrong password?" };
           }
           masterKey = decrypted;
         }
-      } else if (data.encrypted && !options.password) {
+      } else if (data.encrypted && !password) {
         return { success: false, error: "Password required for encrypted wallet" };
       }
       const basePath = data.wallet.descriptorPath ? `m/${data.wallet.descriptorPath}` : DEFAULT_BASE_PATH;
       if (mnemonic) {
-        await _Sphere.import({
-          mnemonic,
-          basePath,
-          storage: options.storage,
-          transport: options.transport,
-          oracle: options.oracle,
-          tokenStorage: options.tokenStorage,
-          l1: options.l1
-        });
+        await _Sphere.import({ ...baseOptions, mnemonic, basePath });
         return { success: true, mnemonic };
       }
       if (masterKey) {
         await _Sphere.import({
+          ...baseOptions,
           masterKey,
           chainCode: data.wallet.chainCode,
           basePath,
-          derivationMode: data.derivationMode || (data.wallet.isBIP32 ? "bip32" : "wif_hmac"),
-          storage: options.storage,
-          transport: options.transport,
-          oracle: options.oracle,
-          tokenStorage: options.tokenStorage,
-          l1: options.l1
+          derivationMode: data.derivationMode || (data.wallet.isBIP32 ? "bip32" : "wif_hmac")
         });
         return { success: true };
       }
@@ -13773,7 +13783,7 @@ var Sphere = class _Sphere {
    * ```
    */
   static async importFromLegacyFile(options) {
-    const { fileContent, fileName, password, onDecryptProgress } = options;
+    const { fileContent, fileName, password, onDecryptProgress, ...baseOptions } = options;
     const fileType = _Sphere.detectLegacyFileType(fileName, fileContent);
     if (fileType === "unknown") {
       return { success: false, error: "Unknown file format" };
@@ -13783,15 +13793,7 @@ var Sphere = class _Sphere {
       if (!_Sphere.validateMnemonic(mnemonic)) {
         return { success: false, error: "Invalid mnemonic phrase" };
       }
-      const sphere = await _Sphere.import({
-        mnemonic,
-        storage: options.storage,
-        transport: options.transport,
-        oracle: options.oracle,
-        tokenStorage: options.tokenStorage,
-        nametag: options.nametag,
-        l1: options.l1
-      });
+      const sphere = await _Sphere.import({ ...baseOptions, mnemonic });
       return { success: true, sphere, mnemonic };
     }
     if (fileType === "dat") {
@@ -13811,16 +13813,11 @@ var Sphere = class _Sphere {
       const { masterKey, chainCode, descriptorPath, derivationMode } = parseResult.data;
       const basePath = descriptorPath ? `m/${descriptorPath}` : DEFAULT_BASE_PATH;
       const sphere = await _Sphere.import({
+        ...baseOptions,
         masterKey,
         chainCode,
         basePath,
-        derivationMode: derivationMode || (chainCode ? "bip32" : "wif_hmac"),
-        storage: options.storage,
-        transport: options.transport,
-        oracle: options.oracle,
-        tokenStorage: options.tokenStorage,
-        nametag: options.nametag,
-        l1: options.l1
+        derivationMode: derivationMode || (chainCode ? "bip32" : "wif_hmac")
       });
       return { success: true, sphere };
     }
@@ -13843,16 +13840,11 @@ var Sphere = class _Sphere {
       const { masterKey, chainCode, descriptorPath, derivationMode } = parseResult.data;
       const basePath = descriptorPath ? `m/${descriptorPath}` : DEFAULT_BASE_PATH;
       const sphere = await _Sphere.import({
+        ...baseOptions,
         masterKey,
         chainCode,
         basePath,
-        derivationMode: derivationMode || (chainCode ? "bip32" : "wif_hmac"),
-        storage: options.storage,
-        transport: options.transport,
-        oracle: options.oracle,
-        tokenStorage: options.tokenStorage,
-        nametag: options.nametag,
-        l1: options.l1
+        derivationMode: derivationMode || (chainCode ? "bip32" : "wif_hmac")
       });
       return { success: true, sphere };
     }
@@ -13866,13 +13858,9 @@ var Sphere = class _Sphere {
       }
       if (parsed.type === "sphere-wallet") {
         const result = await _Sphere.importFromJSON({
+          ...baseOptions,
           jsonContent: content,
-          password,
-          storage: options.storage,
-          transport: options.transport,
-          oracle: options.oracle,
-          tokenStorage: options.tokenStorage,
-          l1: options.l1
+          password
         });
         if (result.success) {
           const sphere2 = _Sphere.getInstance();
@@ -13914,29 +13902,15 @@ var Sphere = class _Sphere {
       const isBIP32 = derivationMode === "bip32" || !!chainCode;
       const basePath = descriptorPath ? `m/${descriptorPath}` : isBIP32 ? "m/84'/1'/0'" : DEFAULT_BASE_PATH;
       if (mnemonic) {
-        const sphere2 = await _Sphere.import({
-          mnemonic,
-          basePath,
-          storage: options.storage,
-          transport: options.transport,
-          oracle: options.oracle,
-          tokenStorage: options.tokenStorage,
-          nametag: options.nametag,
-          l1: options.l1
-        });
+        const sphere2 = await _Sphere.import({ ...baseOptions, mnemonic, basePath });
         return { success: true, sphere: sphere2, mnemonic };
       }
       const sphere = await _Sphere.import({
+        ...baseOptions,
         masterKey,
         chainCode,
         basePath,
-        derivationMode: derivationMode || (chainCode ? "bip32" : "wif_hmac"),
-        storage: options.storage,
-        transport: options.transport,
-        oracle: options.oracle,
-        tokenStorage: options.tokenStorage,
-        nametag: options.nametag,
-        l1: options.l1
+        derivationMode: derivationMode || (chainCode ? "bip32" : "wif_hmac")
       });
       return { success: true, sphere };
     }