libp2r2p 0.10.24 → 0.10.26

package/README.md

@@ -854,3 +854,16 @@ A stale token cannot acknowledge a newly reserved or replaced record.
 
 `queue.getCapacity()` returns `{ usedBytes, maxBytes }`; capacity rejections
 also expose `requiredBytes` and `maxBytes`, without retaining the rejected item.
+
+
+### Publication acknowledgement deadlines
+
+`RelayPool.sendEvent` returns immediately when the first relay accepts an event,
+when all relays fail, or when the operation's `timeout` expires (30 seconds by
+default, including connection work). `timeoutUntilFirstFulfillment` now defaults
+to `null`, removing the former 3-second cutoff. Explicit shorter deadlines remain
+supported and still finalize pending reports as timeouts. `promise` provides the
+complete per-relay report without delaying the first-success return. Connection
+establishment retains its separate 3-second deadline. PrivateMessenger inherits
+this publication policy, including seeder/recovery messages. A timeout indicates
+missing acknowledgement and cannot prove that the recipient did not receive it.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "libp2r2p",
-  "version": "0.10.24",
+  "version": "0.10.26",
   "description": "Peer-to-relay-to-peer",
   "keywords": [
     "p2r2p",
@@ -97,7 +97,7 @@
     "@noble/curves": "2.2.0",
     "@noble/hashes": "2.2.0",
     "@scure/base": "2.0.0",
-    "nmmr": "2.0.0"
+    "nmmr": "2.0.1"
   },
   "devDependencies": {
     "eslint": "^9.39.5",

package/relay/services/relay-pool.js

@@ -11,7 +11,6 @@ import { RelayConnection } from './relay-connection.js'
 const CONNECTION_TIMEOUT_MS = 3000
 const COUNT_TIMEOUT_MS = 5000
 const COUNT_TIMEOUT_AFTER_FIRST_COUNT_MS = 500
-const SEND_TIMEOUT_UNTIL_FIRST_FULFILLMENT_MS = 3000
 const SEND_TIMEOUT_MS = 30000
 const LIVE_OVERLAP_SECONDS = 600
 const LIVE_PROGRESS_INTERVAL_MS = 60000
@@ -136,13 +135,23 @@ export class RelayPool {
   #liveSubCounts = new Map() // url -> number of active live subscriptions
   #timeout = 30000 // 30 seconds
   #createRelay
+  #WebSocket
   #admission
 
-  constructor ({ _createRelay = url => new RelayConnection(url), ...capacity } = {}) {
-    this.#createRelay = _createRelay
+  constructor ({ _createRelay, WebSocket: WebSocketImpl, ...capacity } = {}) {
+    this.#WebSocket = WebSocketImpl
+    this.#createRelay = _createRelay ?? (url => new RelayConnection(url, this.#WebSocket ? { WebSocket: this.#WebSocket } : undefined))
     this.#admission = new ReadAdmission(capacity)
   }
 
+  // Injects the WebSocket implementation used by new pooled connections (e.g.
+  // a launcher-owned relay multiplexer). Existing connections keep the
+  // implementation they were created with.
+  setWebSocket (WebSocketImpl) {
+    if (typeof WebSocketImpl !== 'function') throw new ValidationError('INVALID_WEBSOCKET_IMPLEMENTATION')
+    this.#WebSocket = WebSocketImpl
+  }
+
   #scheduleIdleDisconnect (url) {
     clearTimeout(this.#relayTimeouts.get(url))
     this.#relayTimeouts.set(url, maybeUnref(setTimeout(() => {
@@ -1110,8 +1119,8 @@ export class RelayPool {
     }
   }
 
-  // Returns after the first acknowledgement window. timeout is one deadline for
-  // the whole operation, while timeoutUntilFirstFulfillment controls only this
+  // Returns on the first acknowledgement, all failures, or the 30s deadline.
+  // An optional timeoutUntilFirstFulfillment imposes an earlier deadline on this
   // initial return and closes pending reports when it fails. null disables either
   // timer independently. onRelayResult receives one
   // { relay, success, outcome, reason? } result per relay as it settles; outcome
@@ -1120,7 +1129,7 @@ export class RelayPool {
   // Await `promise` for the complete report, including every relay outcome.
   async sendEvent (event, relays, {
     timeout = SEND_TIMEOUT_MS,
-    timeoutUntilFirstFulfillment = SEND_TIMEOUT_UNTIL_FIRST_FULFILLMENT_MS,
+    timeoutUntilFirstFulfillment = null,
     getAuthEvent,
     onRelayResult
   } = {}) {