@unicitylabs/sphere-sdk 0.2.5 → 0.3.0

package/dist/impl/browser/ipfs.js

@@ -1184,9 +1184,13 @@ function mergeTxfData(local, remote) {
     remote._invalid ?? [],
     "tokenId"
   );
+  const localNametags = local._nametags ?? [];
+  const remoteNametags = remote._nametags ?? [];
+  const mergedNametags = mergeNametagsByName(localNametags, remoteNametags);
   const merged = {
     _meta: mergedMeta,
     _tombstones: mergedTombstones.length > 0 ? mergedTombstones : void 0,
+    _nametags: mergedNametags.length > 0 ? mergedNametags : void 0,
     _outbox: mergedOutbox.length > 0 ? mergedOutbox : void 0,
     _sent: mergedSent.length > 0 ? mergedSent : void 0,
     _invalid: mergedInvalid.length > 0 ? mergedInvalid : void 0,
@@ -1213,6 +1217,7 @@ function getTokenKeys(data) {
     "_sent",
     "_invalid",
     "_nametag",
+    "_nametags",
     "_mintOutbox",
     "_invalidatedNametags",
     "_integrity"
@@ -1220,7 +1225,7 @@ function getTokenKeys(data) {
   const keys = /* @__PURE__ */ new Set();
   for (const key of Object.keys(data)) {
     if (reservedKeys.has(key)) continue;
-    if (key.startsWith("archived-") || key.startsWith("_forked_") || key.startsWith("nametag-")) continue;
+    if (key.startsWith("archived-") || key.startsWith("_forked_")) continue;
     keys.add(key);
   }
   return keys;
@@ -1235,6 +1240,18 @@ function isTokenTombstoned(tokenId, localToken, remoteToken, tombstoneKeys) {
   void remoteToken;
   return false;
 }
+function mergeNametagsByName(local, remote) {
+  const seen = /* @__PURE__ */ new Map();
+  for (const item of local) {
+    if (item.name) seen.set(item.name, item);
+  }
+  for (const item of remote) {
+    if (item.name && !seen.has(item.name)) {
+      seen.set(item.name, item);
+    }
+  }
+  return Array.from(seen.values());
+}
 function mergeArrayById(local, remote, idField) {
   const seen = /* @__PURE__ */ new Map();
   for (const item of local) {
@@ -1597,14 +1614,11 @@ var AsyncSerialQueue = class {
 var WriteBuffer = class {
   /** Full TXF data from save() calls — latest wins */
   txfData = null;
-  /** Individual token mutations: key -> { op: 'save'|'delete', data? } */
-  tokenMutations = /* @__PURE__ */ new Map();
   get isEmpty() {
-    return this.txfData === null && this.tokenMutations.size === 0;
+    return this.txfData === null;
   }
   clear() {
     this.txfData = null;
-    this.tokenMutations.clear();
   }
   /**
    * Merge another buffer's contents into this one (for rollback).
@@ -1614,11 +1628,6 @@ var WriteBuffer = class {
     if (other.txfData && !this.txfData) {
       this.txfData = other.txfData;
     }
-    for (const [id, mutation] of other.tokenMutations) {
-      if (!this.tokenMutations.has(id)) {
-        this.tokenMutations.set(id, mutation);
-      }
-    }
   }
 };
 
@@ -1647,7 +1656,17 @@ var STORAGE_KEYS_GLOBAL = {
   /** Active addresses registry (JSON: TrackedAddressesStorage) */
   TRACKED_ADDRESSES: "tracked_addresses",
   /** Last processed Nostr wallet event timestamp (unix seconds), keyed per pubkey */
-  LAST_WALLET_EVENT_TS: "last_wallet_event_ts"
+  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_RELAY_URL: "group_chat_relay_url"
 };
 var STORAGE_KEYS_ADDRESS = {
   /** Pending transfers for this address */
@@ -1719,9 +1738,6 @@ var IpfsStorageProvider = class {
   subscriptionClient = null;
   /** Unsubscribe function from subscription client */
   subscriptionUnsubscribe = null;
-  /** In-memory buffer for individual token save/delete calls */
-  tokenBuffer = /* @__PURE__ */ new Map();
-  deletedTokenIds = /* @__PURE__ */ new Set();
   /** Write-behind buffer: serializes flush / sync / shutdown */
   flushQueue = new AsyncSerialQueue();
   /** Pending mutations not yet flushed to IPFS */
@@ -1910,14 +1926,6 @@ var IpfsStorageProvider = class {
         metaUpdate.lastCid = this.remoteCid;
       }
       const updatedData = { ...data, _meta: metaUpdate };
-      for (const [tokenId, tokenData] of this.tokenBuffer) {
-        if (!this.deletedTokenIds.has(tokenId)) {
-          updatedData[tokenId] = tokenData;
-        }
-      }
-      for (const tokenId of this.deletedTokenIds) {
-        delete updatedData[tokenId];
-      }
       const { cid } = await this.httpClient.upload(updatedData);
       this.log(`Content uploaded: CID=${cid}`);
       const baseSeq = this.ipnsSequenceNumber > this.lastKnownRemoteSequence ? this.ipnsSequenceNumber : this.lastKnownRemoteSequence;
@@ -1956,7 +1964,6 @@ var IpfsStorageProvider = class {
         lastCid: cid,
         version: this.dataVersion
       });
-      this.deletedTokenIds.clear();
       this.emitEvent({
         type: "storage:saved",
         timestamp: Date.now(),
@@ -2068,7 +2075,6 @@ var IpfsStorageProvider = class {
       if (typeof remoteVersion === "number" && remoteVersion > this.dataVersion) {
         this.dataVersion = remoteVersion;
       }
-      this.populateTokenBuffer(data);
       this.emitEvent({
         type: "storage:loaded",
         timestamp: Date.now(),
@@ -2114,7 +2120,7 @@ var IpfsStorageProvider = class {
           this.emitEvent({ type: "sync:completed", timestamp: Date.now() });
           return {
             success: saveResult2.success,
-            merged: this.enrichWithTokenBuffer(localData),
+            merged: localData,
             added: 0,
             removed: 0,
             conflicts: 0,
@@ -2129,7 +2135,7 @@ var IpfsStorageProvider = class {
           this.emitEvent({ type: "sync:completed", timestamp: Date.now() });
           return {
             success: true,
-            merged: this.enrichWithTokenBuffer(localData),
+            merged: localData,
             added: 0,
             removed: 0,
             conflicts: 0
@@ -2152,7 +2158,7 @@ var IpfsStorageProvider = class {
         });
         return {
           success: saveResult.success,
-          merged: this.enrichWithTokenBuffer(merged),
+          merged,
           added,
           removed,
           conflicts,
@@ -2178,21 +2184,6 @@ var IpfsStorageProvider = class {
   // ---------------------------------------------------------------------------
   // Private Helpers
   // ---------------------------------------------------------------------------
-  /**
-   * Enrich TXF data with individually-buffered tokens before returning to caller.
-   * PaymentsModule.createStorageData() passes empty tokens (they're stored via
-   * saveToken()), but loadFromStorageData() needs them in the merged result.
-   */
-  enrichWithTokenBuffer(data) {
-    if (this.tokenBuffer.size === 0) return data;
-    const enriched = { ...data };
-    for (const [tokenId, tokenData] of this.tokenBuffer) {
-      if (!this.deletedTokenIds.has(tokenId)) {
-        enriched[tokenId] = tokenData;
-      }
-    }
-    return enriched;
-  }
   // ---------------------------------------------------------------------------
   // Optional Methods
   // ---------------------------------------------------------------------------
@@ -2222,8 +2213,6 @@ var IpfsStorageProvider = class {
     const result = await this._doSave(emptyData);
     if (result.success) {
       this.cache.clear();
-      this.tokenBuffer.clear();
-      this.deletedTokenIds.clear();
       await this.statePersistence.clear(this.ipnsName);
     }
     return result.success;
@@ -2234,27 +2223,6 @@ var IpfsStorageProvider = class {
       this.eventCallbacks.delete(callback);
     };
   }
-  async saveToken(tokenId, tokenData) {
-    this.pendingBuffer.tokenMutations.set(tokenId, { op: "save", data: tokenData });
-    this.tokenBuffer.set(tokenId, tokenData);
-    this.deletedTokenIds.delete(tokenId);
-    this.scheduleFlush();
-  }
-  async getToken(tokenId) {
-    if (this.deletedTokenIds.has(tokenId)) return null;
-    return this.tokenBuffer.get(tokenId) ?? null;
-  }
-  async listTokenIds() {
-    return Array.from(this.tokenBuffer.keys()).filter(
-      (id) => !this.deletedTokenIds.has(id)
-    );
-  }
-  async deleteToken(tokenId) {
-    this.pendingBuffer.tokenMutations.set(tokenId, { op: "delete" });
-    this.tokenBuffer.delete(tokenId);
-    this.deletedTokenIds.add(tokenId);
-    this.scheduleFlush();
-  }
   // ---------------------------------------------------------------------------
   // Public Accessors
   // ---------------------------------------------------------------------------
@@ -2346,26 +2314,6 @@ var IpfsStorageProvider = class {
       console.log(`[IPFS-Storage] ${message}`);
     }
   }
-  META_KEYS = /* @__PURE__ */ new Set([
-    "_meta",
-    "_tombstones",
-    "_outbox",
-    "_sent",
-    "_invalid",
-    "_nametag",
-    "_mintOutbox",
-    "_invalidatedNametags",
-    "_integrity"
-  ]);
-  populateTokenBuffer(data) {
-    this.tokenBuffer.clear();
-    this.deletedTokenIds.clear();
-    for (const key of Object.keys(data)) {
-      if (!this.META_KEYS.has(key)) {
-        this.tokenBuffer.set(key, data[key]);
-      }
-    }
-  }
 };
 
 // impl/browser/ipfs/browser-ipfs-state-persistence.ts