libp2r2p 0.11.12 → 0.11.13

package/README.md

@@ -991,7 +991,10 @@ messages, history and files while preserving automatic NIP-65 updates. Successfu
 latency, and short-lived channel/recipient preferences avoid recently refused
 relays without changing receive subscriptions. See the
 [session coordinator](private-messenger/session/README.md) for deferred offline
-attempts and final failure notifications.
+attempts and final failure notifications. Sends attempted while the messenger is
+paused or otherwise unavailable now stay pending in the outbox and retry on a
+bounded session backoff (1–30 seconds, 20% jitter) instead of surfacing a
+user-facing send error.
 
 
 ### Relay backpressure and bounded synchronization (0.11.7)
@@ -1030,10 +1033,12 @@ readiness on the replacement. Callbacks and completions are generation-fenced.
 Equal watch settings cannot keep a dead subscription registered as active.
 
 Overflow recovery keeps one timer per relay with exponential 1–30 second
-backoff and 20% jitter, reset after a stable minute. Other relays remain live.
-Removal, pause and close cancel pending work. Fragment storage stays scoped to
-the same session across replacement subscriptions. Permanent refusals remain
-reported and do not trigger this automatic retry loop.
+backoff and 20% jitter, reset after a stable minute. Relay-pool capacity closes
+(1013, "relay pool capacity") use the same relay backoff instead of stopping
+until an explicit rebuild, because the launcher pool bucket budget is transient.
+Other relays remain live. Removal, pause and close cancel pending work. Fragment
+storage stays scoped to the same session across replacement subscriptions.
+Permanent refusals remain reported and do not trigger this automatic retry loop.
 
 PrivateMessenger persists each interrupted interval before reopening, then
 uses paged `fetchHistory` to repair the gap while listening for new messages.

package/package.json

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

package/private-message/index.js

@@ -21,6 +21,18 @@ function uniq (values) {
   return [...new Set((values || []).filter(Boolean))]
 }
 
+// The launcher's shared relay pool closes anonymous members with 1013 when its
+// per-relay buckets are all busy. That is a transient pool condition, not a
+// permanent relay rejection, so the shared subscription must keep the normal
+// relay backoff instead of stopping until something else re-opens it.
+function isRelayPoolCapacity (error) {
+  for (let current = error, depth = 0; current && depth < 3; current = current.cause, depth++) {
+    if (current.closeCode === 1013 || current.code === 'RELAY_POOL_CAPACITY') return true
+    if (/relay pool capacity/i.test(current.message || '')) return true
+  }
+  return false
+}
+
 function normalizeDeletionPubkey (deletionPubkey) {
   if (deletionPubkey === undefined) return undefined
   if (typeof deletionPubkey !== 'string' || !HEX_PUBKEY.test(deletionPubkey)) {
@@ -360,8 +372,9 @@ export function createPrivateMessageSession ({ _setTimeout = setTimeout, _clearT
       delay: entry.readyAt !== undefined && _now() - entry.readyAt >= 60000 ? 1000 : (previous?.delay || entry.retryDelay || 1000),
       notified: new Map(), timer: null
     }
-    if (/^(auth-required:|restricted:|blocked:|invalid:|pow:)/.test(error.message || '') || error.name === 'ValidationError' ||
-        (error.code !== 'RELAY_LIVE_BUFFER_FULL' && !previous)) {
+    const permanent = /^(auth-required:|restricted:|blocked:|invalid:|pow:)/.test(error.message || '') || error.name === 'ValidationError'
+    const retryable = error.code === 'RELAY_LIVE_BUFFER_FULL' || isRelayPoolCapacity(error) || Boolean(previous)
+    if (permanent || !retryable) {
       cancelRelayRecovery(relay)
       notifyInterruption(relay, recovery).catch(error => reportSubscriptionError(entry.channels, error))
       return

package/private-messenger/helpers/send-routing.js

@@ -102,6 +102,11 @@ export function createSendRelayRouting ({ peer, peers = [peer], relaysByPubkey,
         errors: reports.flatMap(report => report.errors || [])
       }))
     })
+    // A lifecycle change (signer/pause) during a batch is not a user abort:
+    // every failure summary stays retryable so the session can re-attempt it.
+    const finished = result => current()
+      ? finish(result)
+      : { ...finish(result), retryWhenAvailable: !signal?.aborted, retryWhenOnline: !signal?.aborted }
     let result = { success: false }
     while ((batch ||= next())) {
       signal?.throwIfAborted()
@@ -124,15 +129,15 @@ export function createSendRelayRouting ({ peer, peers = [peer], relaysByPubkey,
         const report = await settled
         const failed = rejected(report)
         errors.push(...(report?.errors || []))
-        if (!failed.length || errors.some(item => !isReplaceableRelayFailure(item.reason))) return finish(result)
-        if (!next()) { exclusions.clear(); return finish(result) }
-        if (!await online()) return { ...finish(result), retryWhenAvailable: !signal?.aborted, retryWhenOnline: current() }
+        if (!failed.length || errors.some(item => !isReplaceableRelayFailure(item.reason))) return finished(result)
+        if (!next()) { exclusions.clear(); return finished(result) }
+        if (!await online()) return { ...finish(result), retryWhenAvailable: !signal?.aborted, retryWhenOnline: !signal?.aborted }
         remember(failed)
       }
-      if (!current()) return { ...finish(result), retryWhenAvailable: !signal?.aborted, retryWhenOnline: false }
+      if (!current()) return finished(result)
       batch = null
     }
-    return finish(result)
+    return finished(result)
   }
 
   return {

package/private-messenger/session/README.md

@@ -40,6 +40,14 @@ or cancelled/closed sends. Apps own route visibility and user-intent filtering;
 automatic retries may also fail. Callbacks must not throw. Errors are not copied
 into persisted outbox records.
 
+Sends that only failed because the messenger was paused or otherwise
+unavailable (`PRIVATE_MESSENGER_PAUSED`, `CHAT_UNAVAILABLE`) stay pending
+without `onSendError`. The session re-pumps them on a bounded backoff
+(1–30 seconds with 20% jitter) in addition to availability/connectivity
+changes, so a paused messenger recovers without a manual retry. The backoff
+resets on a user `retry`, on `setAvailable(true)`, and once no retryable entry
+remains.
+
 `enqueue({ peer, event, context, requiredFiles, deletion })` preserves prepared
 identities. Local message commits and remote stages have independent checkpoints.
 It sends original/thumbnail chunks before announcements, yields for small messages,

package/private-messenger/session/index.js

@@ -18,8 +18,20 @@ export function wireEvent (value, owner) {
 }
 // Relay rejection text must not be interpreted as a local signer denial.
 const retryable = error => error?.code === 'MESSAGE_NOT_PUBLISHED' || !/DENIED|PERMISSION|REVOKED|READ_ONLY|INVALID|BLOCKED|EXPIRED|NOT_IN_PERSONA/i.test(`${error?.code || ''} ${error?.message || ''}`)
+const unavailableSend = /PRIVATE_MESSENGER_PAUSED|CHAT_UNAVAILABLE|MESSENGER_UNAVAILABLE/i
+const isUnavailableSend = error => unavailableSend.test(`${error?.code || ''} ${error?.message || ''}`)
+const SEND_RETRY_MIN_MS = 1000
+const SEND_RETRY_MAX_MS = 30000
+// A paused or unavailable messenger must keep the outbox entry retryable
+// instead of surfacing a send failure the user has to retry by hand.
+const unavailableError = (error, signal) => Object.assign(new Error(error?.message || 'CHAT_UNAVAILABLE'), {
+  code: error?.code,
+  cause: error,
+  retryWhenAvailable: !signal?.aborted,
+  retryWhenOnline: false
+})
 
-export function createPrivateMessageSession ({ owner, signer, eventStore, messageStorage, chunkStorage, recoveryStorage, fallbackRelays = [], mode = 'seeder', seedersForPeer = peer => [peer], allowedKinds = [5, 9, 1063, 34601], useContentKeys = true, onMedia = () => {}, onOutbox = () => {}, onError = () => {}, onSendError = () => {}, Messenger = createPrivateMessenger, openOutbox = createChatOutbox, FileTransfer = createPrivateFileTransfer, _onOnline = onOnline, _getIykcProofs = getIykcProofs, openDownloads = options => createChatOutbox({ ...options, namespace: 'downloads' }) }) {
+export function createPrivateMessageSession ({ owner, signer, eventStore, messageStorage, chunkStorage, recoveryStorage, fallbackRelays = [], mode = 'seeder', seedersForPeer = peer => [peer], allowedKinds = [5, 9, 1063, 34601], useContentKeys = true, onMedia = () => {}, onOutbox = () => {}, onError = () => {}, onSendError = () => {}, Messenger = createPrivateMessenger, openOutbox = createChatOutbox, FileTransfer = createPrivateFileTransfer, _onOnline = onOnline, _getIykcProofs = getIykcProofs, _setTimeout = setTimeout, _clearTimeout = clearTimeout, _random = Math.random, openDownloads = options => createChatOutbox({ ...options, namespace: 'downloads' }) }) {
   fallbackRelays = normalizeFallbackRelays(fallbackRelays)
   const reportedErrors = new WeakSet()
   const reportError = error => {
@@ -40,6 +52,8 @@ export function createPrivateMessageSession ({ owner, signer, eventStore, messag
   const sendControllers = new Map()
   const offlineSends = new Set()
   let stopOnline
+  let sendRetryTimer
+  let sendRetryDelay = SEND_RETRY_MIN_MS
   let messenger
   let fileTransfers
   let downloads
@@ -60,6 +74,7 @@ export function createPrivateMessageSession ({ owner, signer, eventStore, messag
   let lifecycle = 0
   let configuring = Promise.resolve()
   let sending
+  let repump
   let draining
   const idleWaiters = new Set()
   const settled = () => { if (!sending && !draining) { for (const resolve of idleWaiters) resolve(); idleWaiters.clear() } }
@@ -179,9 +194,15 @@ export function createPrivateMessageSession ({ owner, signer, eventStore, messag
   }
   async function publish (peer, event, signal) {
     if (deniedPeers.has(peer)) throw new Error('PERMISSION_DENIED')
-    if (!available || !peers.has(peer) || !channels.has(peer)) throw new Error('CHAT_UNAVAILABLE')
+    if (!available || !peers.has(peer) || !channels.has(peer)) throw unavailableError(new Error('CHAT_UNAVAILABLE'), signal)
     const options = { channelPubkey: channels.get(peer)?.pubkey, receiverPubkeys: [peer], signal }
-    const report = event.sig ? await messenger.broadcastEvent({ ...options, event }) : await messenger.broadcastRumor({ ...options, rumor: event })
+    let report
+    try {
+      report = event.sig ? await messenger.broadcastEvent({ ...options, event }) : await messenger.broadcastRumor({ ...options, rumor: event })
+    } catch (error) {
+      if (isUnavailableSend(error)) throw unavailableError(error, signal)
+      throw error
+    }
     // Published is relay acceptance, never a peer receipt.
     await assertMessagePublished(report, event)
   }
@@ -245,7 +266,10 @@ export function createPrivateMessageSession ({ owner, signer, eventStore, messag
       await storage.remove(entry.id)
       entries.delete(entry.id)
       emit()
-    } catch (error) {
+    } catch (cause) {
+      // Pauses can surface at any stage (text publication, file authorization
+      // or chunk delivery). Normalize all of them into the retryable path.
+      const error = cause?.retryWhenAvailable ? cause : (isUnavailableSend(cause) ? unavailableError(cause, controller.signal) : cause)
       if (cancelled.has(entry.id)) { await storage.remove(entry.id); entries.delete(entry.id) } else {
         entry.status = error.retryWhenAvailable ? 'pending' : 'error'; entry.failed = true; entry.retryable = retryable(error)
         await storage.put(entry, { existing: true }).catch(reportError)
@@ -253,12 +277,42 @@ export function createPrivateMessageSession ({ owner, signer, eventStore, messag
         // The failed wire event may be a quote or file chunk. Report the
         // owning outbox item separately, without mutating the native error.
         if (error.retryWhenOnline) offlineSends.add(entry.id)
+        if (error.retryWhenAvailable) scheduleSendRetry()
         if (!closed && !entry.deletion && !cancelled.has(entry.id) && !error.retryWhenAvailable) onSendError(error, { id: entry.id, peer: entry.peer })
       }
       emit()
     } finally { sendControllers.delete(entry.id) }
   }
   function stopOnlineRetry () { stopOnline?.(); stopOnline = undefined }
+  // Entries that failed only because the messenger was paused/unavailable do
+  // not receive a connectivity transition, so they own a bounded backoff timer
+  // instead of waiting for the next account-state change.
+  function clearSendRetry () {
+    if (sendRetryTimer) _clearTimeout(sendRetryTimer)
+    sendRetryTimer = undefined
+  }
+  function resetSendRetry () {
+    clearSendRetry()
+    sendRetryDelay = SEND_RETRY_MIN_MS
+  }
+  const pendingRetryable = entry => Boolean(entry.failed && !cancelled.has(entry.id) && (entry.retryable || entry.status === 'pending'))
+  function scheduleSendRetry () {
+    if (closed || !available || sendRetryTimer) return
+    const delay = Math.min(SEND_RETRY_MAX_MS, sendRetryDelay * (0.8 + _random() * 0.4))
+    sendRetryDelay = Math.min(SEND_RETRY_MAX_MS, sendRetryDelay * 2)
+    sendRetryTimer = _setTimeout(() => {
+      sendRetryTimer = undefined
+      if (closed || !available) return
+      let retried = false
+      for (const entry of entries.values()) {
+        if (!pendingRetryable(entry)) continue
+        entry.failed = false
+        retried = true
+      }
+      if (retried) pump()
+    }, delay)
+    sendRetryTimer.unref?.()
+  }
   function watchOfflineSends () {
     if (closed || !available || !offlineSends.size) { stopOnlineRetry(); return }
     if (stopOnline) return
@@ -276,15 +330,26 @@ export function createPrivateMessageSession ({ owner, signer, eventStore, messag
     })
   }
   async function pump () {
-    if (sending || !available || closed || !messenger || !storage) return
+    if (!available || closed || !messenger || !storage) return
+    // A retry that lands while a pump is already running must not be skipped
+    // just because that pass already walked past the entry.
+    if (sending) { repump = true; return }
     sending = true
     try {
-      for (const entry of entries.values()) {
-        if (closed || !available) break
-        if ((entry.peer !== owner && !peers.has(entry.peer)) || entry.failed || cancelled.has(entry.id)) continue
-        await sendEntry(entry)
-      }
-    } finally { sending = false; watchOfflineSends(); settled() }
+      do {
+        repump = false
+        for (const entry of entries.values()) {
+          if (closed || !available) break
+          if ((entry.peer !== owner && !peers.has(entry.peer)) || entry.failed || cancelled.has(entry.id)) continue
+          await sendEntry(entry)
+        }
+      } while (repump && !closed && available)
+    } finally {
+      sending = false
+      watchOfflineSends()
+      if (![...entries.values()].some(pendingRetryable)) resetSendRetry()
+      settled()
+    }
   }
   const intentId = file => getEventHash({ kind: 0, pubkey: owner, created_at: 0, tags: [], content: `${file.peer}:${file.root}` })
   async function download (file, options = {}) {
@@ -359,10 +424,12 @@ export function createPrivateMessageSession ({ owner, signer, eventStore, messag
     async setAvailable (value) {
       available = value === true
       stopOnlineRetry(); offlineSends.clear()
+      if (available) resetSendRetry()
+      else clearSendRetry()
       lifecycle++
       if (!available) { await messenger?.pause('signer'); return }
       await ready()
-      for (const entry of entries.values()) if (entry.retryable) entry.failed = false
+      for (const entry of entries.values()) if (pendingRetryable(entry)) entry.failed = false
       await messenger?.resume('storage')
       return schedule()
     },
@@ -382,7 +449,7 @@ export function createPrivateMessageSession ({ owner, signer, eventStore, messag
       offlineSends.delete(id); watchOfflineSends()
       await ready()
       const entry = entries.get(id)
-      if (entry) { entry.failed = false; if (deniedPeers.delete(entry.peer)) await schedule(); return pump() }
+      if (entry) { entry.failed = false; resetSendRetry(); if (deniedPeers.delete(entry.peer)) await schedule(); return pump() }
     },
     async cancel (id) {
       cancelled.add(id)
@@ -396,6 +463,7 @@ export function createPrivateMessageSession ({ owner, signer, eventStore, messag
     async close () {
       closed = true; available = false; lifecycle++
       stopOnlineRetry(); offlineSends.clear(); activeDownloads.clear(); pendingPriorityRanges.clear()
+      clearSendRetry()
       for (const controller of sendControllers.values()) controller.abort()
       await Promise.allSettled([configuring, initialized])
       await messenger?.pause('closed')