libp2r2p 0.11.31 → 0.11.32

package/README.md

@@ -1284,3 +1284,9 @@ The 0.11.31 pending-decryption retry groups records by
 remaining records only when the local signer confirms `CONTENT_KEY_NOT_FOUND`
 with `hasOwnContentKey: false`. MAC, proof, parsing and operational failures are
 never generalized to the group, and every deferred record remains persisted.
+
+The 0.11.32 local recovery-seed queue serializes incoming and outgoing writes
+within one PrivateMessenger. Duplicate `bySeedKey` races retry up to five times:
+NYM rows remain idempotent and router rows re-read the winning timestamps before
+replacement. External event-store seed adapters retain their independent batched
+writes.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "libp2r2p",
-  "version": "0.11.31",
+  "version": "0.11.32",
   "description": "Peer-to-relay-to-peer",
   "keywords": [
     "p2r2p",

package/private-messenger/index.js

@@ -108,6 +108,7 @@ export {
 const DEFAULT_OFFLINE_RECOVERY_SECONDS = 7 * 24 * 60 * 60
 const MAX_OFFLINE_RECOVERY_SECONDS = Math.floor(Number.MAX_SAFE_INTEGER / 1000)
 const RECOVERY_STORAGE_BATCH_SIZE = 100
+const SEED_QUEUE_UPSERT_ATTEMPTS = 5
 const STORAGE_POLICY_BROADCAST_CHANNEL = 'libp2r2p:private-messenger:storage-policy'
 const DEFAULT_OFFLINE_SKEW_SECONDS = 30
 const DEFAULT_RELOAD_GAP_DELAY_MS = 500
@@ -374,6 +375,7 @@ export class PrivateMessenger {
     this.watchRevisionByChannel = new Map()
     this.presenceTimers = new Map()
     this.presenceJobs = new Map()
+    this.seedQueueOperationTail = Promise.resolve()
     this.stopRelayListWatcher = null
     this.relayListWatcherPubkey = ''
     this.relayListRefreshPromise = null
@@ -686,6 +688,13 @@ export class PrivateMessenger {
     return this.runQueueOperation(operation)
   }
 
+  runSeedQueueOperation (operation) {
+    if (this.closePromise) return Promise.reject(new Error('PRIVATE_MESSENGER_CLOSED'))
+    const run = this.seedQueueOperationTail.then(operation)
+    this.seedQueueOperationTail = run.catch(() => {})
+    return run
+  }
+
   debug (action, detail = {}) {
     try {
       this.onDebug?.({ source: 'private-messenger', action, ...detail })
@@ -2140,8 +2149,8 @@ export class PrivateMessenger {
 
   async enqueueSeed (channelPubkey, seed) {
     if (!this.offlineRecoverySecondsFor(channelPubkey)) return
-    const receivedAt = nowSeconds()
     if (this.seedStorage) {
+      const receivedAt = nowSeconds()
       const rows = seed.recordType === NYM_CARRIER_SEED_RECORD_TYPE || seed.carriers?.length
         ? [{ recordType: NYM_CARRIER_SEED_RECORD_TYPE, carriers: compactSeedNymCarriers(seed.carriers) }]
         : compactSeedRouterRows(seed)
@@ -2155,22 +2164,37 @@ export class PrivateMessenger {
       }
       return
     }
+    return this.runSeedQueueOperation(() => this.enqueueQueueSeed(channelPubkey, seed))
+  }
+
+  async enqueueQueueSeed (channelPubkey, seed) {
+    this.assertOpen()
+    if (!this.channels.has(channelPubkey) || !this.offlineRecoverySecondsFor(channelPubkey)) return
+    const receivedAt = nowSeconds()
     if (seed.recordType === NYM_CARRIER_SEED_RECORD_TYPE || seed.carriers?.length) {
       const carriers = compactSeedNymCarriers(seed.carriers)
       const recordTime = nymCarrierRecordTime({ carriers }) || seed.outer?.created_at || receivedAt
       const key = nymCarrierSeedKey({ channelPubkey, carriers })
       const seedKey = key ? `nym:${key}` : ''
-      if (seedKey && await this.seedQueue.someBy('bySeedKey', seedKey)) return
-      await this.seedQueue.enqueue({
-        type: 'seed',
-        recordType: NYM_CARRIER_SEED_RECORD_TYPE,
-        channelPubkey,
-        receivedAt,
-        carriers,
-        meta: { channelPubkey: seed.channelPubkey },
-        [SEED_KEY]: seedKey || undefined,
-        [SEED_TIME]: recordTime
-      })
+      for (let attempt = 0; attempt < SEED_QUEUE_UPSERT_ATTEMPTS; attempt++) {
+        if (seedKey && await this.seedQueue.someBy('bySeedKey', seedKey)) break
+        try {
+          await this.seedQueue.enqueue({
+            type: 'seed',
+            recordType: NYM_CARRIER_SEED_RECORD_TYPE,
+            channelPubkey,
+            receivedAt,
+            carriers,
+            meta: { channelPubkey: seed.channelPubkey },
+            [SEED_KEY]: seedKey || undefined,
+            [SEED_TIME]: recordTime
+          })
+          break
+        } catch (error) {
+          if (error?.name !== 'ConstraintError') throw error
+          if (attempt === SEED_QUEUE_UPSERT_ATTEMPTS - 1) throw error
+        }
+      }
       await this.pruneStoredSeeds(channelPubkey)
       return
     }
@@ -2180,21 +2204,29 @@ export class PrivateMessenger {
       const rowTime = row.lastSeenAt || row.router?.created_at || receivedAt
       const rowKey = routerSeedRowKey({ ...row, channelPubkey })
       const seedKey = `router:${rowKey}`
-      const [previous] = await this.seedQueue.removeBy('bySeedKey', seedKey)
-      const firstSeenAt = Math.min(previous?.firstSeenAt ?? rowTime, row.firstSeenAt ?? rowTime)
-      const lastSeenAt = Math.max(previous?.lastSeenAt ?? rowTime, row.lastSeenAt ?? rowTime)
-      await this.seedQueue.enqueue({
-        ...row,
-        type: 'seed',
-        recordType: ROUTER_SEED_RECORD_TYPE,
-        channelPubkey,
-        receivedAt,
-        firstSeenAt,
-        lastSeenAt,
-        meta: { channelPubkey: seed.channelPubkey },
-        [SEED_KEY]: seedKey,
-        [SEED_TIME]: lastSeenAt || rowTime
-      })
+      for (let attempt = 0; attempt < SEED_QUEUE_UPSERT_ATTEMPTS; attempt++) {
+        const [previous] = await this.seedQueue.removeBy('bySeedKey', seedKey)
+        const firstSeenAt = Math.min(previous?.firstSeenAt ?? rowTime, row.firstSeenAt ?? rowTime)
+        const lastSeenAt = Math.max(previous?.lastSeenAt ?? rowTime, row.lastSeenAt ?? rowTime)
+        try {
+          await this.seedQueue.enqueue({
+            ...row,
+            type: 'seed',
+            recordType: ROUTER_SEED_RECORD_TYPE,
+            channelPubkey,
+            receivedAt,
+            firstSeenAt,
+            lastSeenAt,
+            meta: { channelPubkey: seed.channelPubkey },
+            [SEED_KEY]: seedKey,
+            [SEED_TIME]: lastSeenAt || rowTime
+          })
+          break
+        } catch (error) {
+          if (error?.name !== 'ConstraintError') throw error
+          if (attempt === SEED_QUEUE_UPSERT_ATTEMPTS - 1) throw error
+        }
+      }
     }
     await this.pruneStoredSeeds(channelPubkey)
   }