@libp2p/circuit-relay-v2 3.2.24-6059227cb → 3.2.24-87bc8d4fb

package/dist/src/utils.js

@@ -1,5 +1,3 @@
-import { setMaxListeners } from '@libp2p/interface';
-import { pipe } from '@libp2p/utils';
 import { CODE_P2P_CIRCUIT } from '@multiformats/multiaddr';
 import { P2P } from '@multiformats/multiaddr-matcher';
 import { fmt, code, and } from '@multiformats/multiaddr-matcher/utils';
@@ -7,16 +5,27 @@ import { anySignal } from 'any-signal';
 import { CID } from 'multiformats/cid';
 import { sha256 } from 'multiformats/hashes/sha2';
 import { DurationLimitError, TransferLimitError } from './errors.js';
-function countStreamBytes(source, limit, options) {
+async function* countStreamBytes(source, limit, options) {
     const limitBytes = limit.remaining;
-    const abortIfStreamByteLimitExceeded = (evt) => {
-        const len = BigInt(evt.data.byteLength);
-        limit.remaining -= len;
-        if (limit.remaining < 0) {
-            source.abort(new TransferLimitError(`data limit of ${limitBytes} bytes exceeded`));
+    for await (const buf of source) {
+        const len = BigInt(buf.byteLength);
+        if ((limit.remaining - len) < 0) {
+            // this is a safe downcast since len is guarantee to be in the range for a number
+            const remaining = Number(limit.remaining);
+            limit.remaining = 0n;
+            try {
+                if (remaining !== 0) {
+                    yield buf.subarray(0, remaining);
+                }
+            }
+            catch (err) {
+                options.log.error(err);
+            }
+            throw new TransferLimitError(`data limit of ${limitBytes} bytes exceeded`);
         }
-    };
-    source.addEventListener('message', abortIfStreamByteLimitExceeded);
+        limit.remaining -= len;
+        yield buf;
+    }
 }
 export function createLimitedRelay(src, dst, abortSignal, reservation, options) {
     function abortStreams(err) {
@@ -27,40 +36,54 @@ export function createLimitedRelay(src, dst, abortSignal, reservation, options)
     const signals = [abortSignal, reservation.signal];
     if (reservation.limit?.duration != null) {
         options.log('limiting relayed connection duration to %dms', reservation.limit.duration);
-        const durationSignal = AbortSignal.timeout(reservation.limit.duration);
-        setMaxListeners(Infinity, durationSignal);
-        signals.push(durationSignal);
+        signals.push(AbortSignal.timeout(reservation.limit.duration));
     }
     const signal = anySignal(signals);
-    setMaxListeners(Infinity, signal);
+    let srcDstFinished = false;
+    let dstSrcFinished = false;
     let dataLimit;
     if (reservation.limit?.data != null) {
         dataLimit = {
             remaining: reservation.limit.data
         };
     }
-    const onAbort = () => {
-        let err;
-        if (abortSignal.aborted) {
-            err = abortSignal.reason;
-        }
-        else {
-            err = new DurationLimitError(`duration limit of ${reservation.limit?.duration} ms exceeded`);
-        }
-        abortStreams(err);
-    };
-    signal.addEventListener('abort', onAbort, { once: true });
-    if (dataLimit != null) {
-        countStreamBytes(dst, dataLimit, options);
-        countStreamBytes(src, dataLimit, options);
-    }
-    // join the streams together
-    pipe(src, dst, src)
-        .catch(err => {
-        abortStreams(err);
-    })
-        .finally(() => {
-        signal.clear();
+    queueMicrotask(() => {
+        const onAbort = () => {
+            options.log('relayed connection reached time limit');
+            dst.abort(new DurationLimitError(`duration limit of ${reservation.limit?.duration} ms exceeded`));
+        };
+        signal.addEventListener('abort', onAbort, { once: true });
+        void dst.sink(dataLimit == null ? src.source : countStreamBytes(src.source, dataLimit, options))
+            .catch(err => {
+            options.log.error('error while relaying streams src -> dst', err);
+            abortStreams(err);
+        })
+            .finally(() => {
+            srcDstFinished = true;
+            if (dstSrcFinished) {
+                signal.removeEventListener('abort', onAbort);
+                signal.clear();
+            }
+        });
+    });
+    queueMicrotask(() => {
+        const onAbort = () => {
+            options.log('relayed connection reached time limit');
+            src.abort(new DurationLimitError(`duration limit of ${reservation.limit?.duration} ms exceeded`));
+        };
+        signal.addEventListener('abort', onAbort, { once: true });
+        void src.sink(dataLimit == null ? dst.source : countStreamBytes(dst.source, dataLimit, options))
+            .catch(err => {
+            options.log.error('error while relaying streams dst -> src', err);
+            abortStreams(err);
+        })
+            .finally(() => {
+            dstSrcFinished = true;
+            if (srcDstFinished) {
+                signal.removeEventListener('abort', onAbort);
+                signal.clear();
+            }
+        });
     });
 }
 /**

package/dist/src/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@libp2p/circuit-relay-v2",
-  "version": "3.2.24-6059227cb",
+  "version": "3.2.24-87bc8d4fb",
   "description": "Implementation of Circuit Relay v2",
   "license": "Apache-2.0 OR MIT",
   "homepage": "https://github.com/libp2p/js-libp2p/tree/main/packages/transport-circuit-relay-v2#readme",
@@ -45,35 +45,40 @@
     "doc-check": "aegir doc-check"
   },
   "dependencies": {
-    "@libp2p/crypto": "5.1.8-6059227cb",
-    "@libp2p/interface": "2.11.0-6059227cb",
-    "@libp2p/interface-internal": "2.3.19-6059227cb",
-    "@libp2p/peer-collections": "6.0.35-6059227cb",
-    "@libp2p/peer-id": "5.1.9-6059227cb",
-    "@libp2p/peer-record": "8.0.35-6059227cb",
-    "@libp2p/utils": "6.7.2-6059227cb",
-    "@multiformats/multiaddr": "^13.0.1",
-    "@multiformats/multiaddr-matcher": "^3.0.1",
+    "@libp2p/crypto": "5.1.8-87bc8d4fb",
+    "@libp2p/interface": "2.11.0-87bc8d4fb",
+    "@libp2p/interface-internal": "2.3.19-87bc8d4fb",
+    "@libp2p/peer-collections": "6.0.35-87bc8d4fb",
+    "@libp2p/peer-id": "5.1.9-87bc8d4fb",
+    "@libp2p/peer-record": "8.0.35-87bc8d4fb",
+    "@libp2p/utils": "6.7.2-87bc8d4fb",
+    "@multiformats/multiaddr": "^12.4.4",
+    "@multiformats/multiaddr-matcher": "^2.0.0",
     "any-signal": "^4.1.1",
+    "it-protobuf-stream": "^2.0.2",
+    "it-stream-types": "^2.0.2",
     "main-event": "^1.0.1",
-    "multiformats": "^13.4.0",
+    "multiformats": "^13.3.6",
     "nanoid": "^5.1.5",
     "progress-events": "^1.0.1",
-    "protons-runtime": "^5.6.0",
+    "protons-runtime": "^5.5.0",
     "retimeable-signal": "^1.0.1",
     "uint8arraylist": "^2.4.8",
     "uint8arrays": "^5.1.0"
   },
   "devDependencies": {
-    "@libp2p/logger": "5.2.0-6059227cb",
-    "aegir": "^47.0.22",
+    "@libp2p/interface-compliance-tests": "6.5.0-87bc8d4fb",
+    "@libp2p/logger": "5.2.0-87bc8d4fb",
+    "aegir": "^47.0.14",
     "delay": "^6.0.0",
-    "it-all": "^3.0.9",
-    "it-protobuf-stream": "^2.0.3",
-    "p-event": "^6.0.1",
+    "it-drain": "^3.0.9",
+    "it-pair": "^2.0.6",
+    "it-pushable": "^3.2.3",
+    "it-to-buffer": "^4.0.9",
     "p-wait-for": "^5.0.2",
-    "protons": "^7.7.0",
-    "sinon": "^21.0.0",
+    "protons": "^7.6.1",
+    "race-signal": "^1.1.3",
+    "sinon": "^20.0.0",
     "sinon-ts": "^2.0.0"
   },
   "sideEffects": false

package/src/constants.ts

@@ -3,6 +3,11 @@ import { KEEP_ALIVE } from '@libp2p/interface'
 const second = 1000
 const minute = 60 * second
 
+/**
+ * Multicodec code
+ */
+export const CIRCUIT_PROTO_CODE = 290
+
 /**
  * The maximum number of relay reservations the relay server will accept
  */
@@ -21,7 +26,7 @@ export const DEFAULT_RESERVATION_CONCURRENCY = 1
 /**
  * How long to wait for a reservation attempt to finish
  */
-export const DEFAULT_RESERVATION_COMPLETION_TIMEOUT = 5_000
+export const DEFAULT_RESERVATION_COMPLETION_TIMEOUT = 2000
 
 /**
  * How long to let the reservation attempt queue to grow
@@ -31,6 +36,7 @@ export const DEFAULT_MAX_RESERVATION_QUEUE_LENGTH = 100
 export const RELAY_SOURCE_TAG = 'circuit-relay-source'
 
 export const KEEP_ALIVE_TAG = `${KEEP_ALIVE}-circuit-relay`
+export const KEEP_ALIVE_SOURCE_TAG = `${KEEP_ALIVE}-circuit-relay-source`
 
 // circuit v2 connection limits
 // https://github.com/libp2p/go-libp2p/blob/master/p2p/protocol/circuitv2/relay/resources.go#L61-L66

package/src/index.ts

@@ -40,11 +40,7 @@
  */
 
 import { TypedEventEmitter } from 'main-event'
-import { CircuitRelayServer } from './server/index.js'
-import { CircuitRelayTransport } from './transport/index.ts'
 import type { Limit } from './pb/index.js'
-import type { ComponentLogger, ConnectionGater, Libp2pEvents, Metrics, PeerId, PeerStore, PrivateKey, TopologyFilter, Transport, TypedEventTarget, Upgrader } from '@libp2p/interface'
-import type { AddressManager, ConnectionManager, RandomWalk, Registrar, TransportManager } from '@libp2p/interface-internal'
 import type { PeerMap } from '@libp2p/peer-collections'
 import type { Multiaddr } from '@multiformats/multiaddr'
 import type { RetimeableAbortSignal } from 'retimeable-signal'
@@ -84,201 +80,15 @@ export interface CircuitRelayService extends TypedEventEmitter<CircuitRelayServi
   reservations: PeerMap<RelayReservation>
 }
 
+export { circuitRelayServer } from './server/index.js'
+export type { CircuitRelayServerInit, CircuitRelayServerComponents } from './server/index.js'
+export type { ReservationStoreInit as ServerReservationStoreInit } from './server/reservation-store.js'
+export { circuitRelayTransport } from './transport/index.js'
+export type { RelayDiscoveryComponents } from './transport/discovery.js'
+export type { ReservationStoreInit as TransportReservationStoreInit } from './transport/reservation-store.js'
+export type { CircuitRelayTransportInit, CircuitRelayTransportComponents } from './transport/index.js'
+
 export {
   RELAY_V2_HOP_CODEC,
   RELAY_V2_STOP_CODEC
 } from './constants.js'
-
-export interface ServerReservationStoreInit {
-  /**
-   * maximum number of reservations allowed
-   *
-   * @default 15
-   */
-  maxReservations?: number
-
-  /**
-   * interval after which stale reservations are cleared
-   *
-   * @default 300000
-   */
-  reservationClearInterval?: number
-
-  /**
-   * apply default relay limits to a new reservation
-   *
-   * @default true
-   */
-  applyDefaultLimit?: boolean
-
-  /**
-   * reservation ttl
-   *
-   * @default 7200000
-   */
-  reservationTtl?: number
-
-  /**
-   * The maximum time a relayed connection can be open for
-   */
-  defaultDurationLimit?: number
-
-  /**
-   * The maximum amount of data allowed to be transferred over a relayed connection
-   */
-  defaultDataLimit?: bigint
-}
-
-export interface CircuitRelayServerComponents {
-  registrar: Registrar
-  peerStore: PeerStore
-  addressManager: AddressManager
-  peerId: PeerId
-  privateKey: PrivateKey
-  connectionManager: ConnectionManager
-  connectionGater: ConnectionGater
-  logger: ComponentLogger
-  metrics?: Metrics
-}
-
-export interface CircuitRelayServerInit {
-  /**
-   * Incoming hop requests must complete within this time in ms otherwise
-   * the stream will be reset
-   *
-   * @default 30000
-   */
-  hopTimeout?: number
-
-  /**
-   * Configuration of reservations
-   */
-  reservations?: ServerReservationStoreInit
-
-  /**
-   * The maximum number of simultaneous HOP inbound streams that can be open at once
-   */
-  maxInboundHopStreams?: number
-
-  /**
-   * The maximum number of simultaneous HOP outbound streams that can be open at once
-   */
-  maxOutboundHopStreams?: number
-
-  /**
-   * The maximum number of simultaneous STOP outbound streams that can be open at
-   * once.
-   *
-   * @default 300
-   */
-  maxOutboundStopStreams?: number
-}
-
-export function circuitRelayServer (init: CircuitRelayServerInit = {}): (components: CircuitRelayServerComponents) => CircuitRelayService {
-  return (components) => {
-    return new CircuitRelayServer(components, init)
-  }
-}
-
-export interface RelayDiscoveryEvents {
-  'relay:discover': CustomEvent<PeerId>
-}
-
-export interface TransportReservationStoreComponents {
-  peerId: PeerId
-  connectionManager: ConnectionManager
-  peerStore: PeerStore
-  events: TypedEventTarget<Libp2pEvents>
-  logger: ComponentLogger
-  metrics?: Metrics
-}
-
-export interface TransportReservationStoreInit {
-  /**
-   * Multiple relays may be discovered simultaneously - to prevent listening
-   * on too many relays, this value controls how many to attempt to reserve a
-   * slot on at once. If set to more than one, we may end up listening on
-   * more relays than the `maxReservations` value, but on networks with poor
-   * connectivity the user may wish to attempt to reserve on multiple relays
-   * simultaneously.
-   *
-   * @default 1
-   */
-  reservationConcurrency?: number
-
-  /**
-   * Limit the number of potential relays we will dial
-   *
-   * @default 100
-   */
-  maxReservationQueueLength?: number
-
-  /**
-   * When creating a reservation it must complete within this number of ms
-   *
-   * @default 5000
-   */
-  reservationCompletionTimeout?: number
-}
-
-export interface RelayDiscoveryComponents {
-  peerStore: PeerStore
-  connectionManager: ConnectionManager
-  transportManager: TransportManager
-  registrar: Registrar
-  logger: ComponentLogger
-  randomWalk: RandomWalk
-  events: TypedEventTarget<Libp2pEvents>
-}
-
-export interface RelayDiscoveryInit {
-  filter?: TopologyFilter
-}
-
-export interface CircuitRelayTransportComponents extends RelayDiscoveryComponents {
-  peerId: PeerId
-  upgrader: Upgrader
-  addressManager: AddressManager
-  connectionGater: ConnectionGater
-}
-
-/**
- * RelayConfig configures the circuit v2 relay transport.
- */
-export interface CircuitRelayTransportInit extends TransportReservationStoreInit {
-  /**
-   * An optional filter used to prevent duplicate attempts to reserve relay
-   * slots on the same peer
-   */
-  discoveryFilter?: TopologyFilter
-
-  /**
-   * The maximum number of simultaneous STOP inbound streams that can be open at
-   * once - each inbound relayed connection uses a STOP stream
-   *
-   * @default 300
-   */
-  maxInboundStopStreams?: number
-
-  /**
-   * The maximum number of simultaneous STOP outbound streams that can be open
-   * at once. If this transport is used along with the relay server these
-   * settings should be set to the same value
-   *
-   * @default 300
-   */
-  maxOutboundStopStreams?: number
-
-  /**
-   * When creating a reservation it must complete within this number of ms
-   *
-   * @default 10_000
-   */
-  reservationCompletionTimeout?: number
-}
-
-export function circuitRelayTransport (init: CircuitRelayTransportInit = {}): (components: CircuitRelayTransportComponents) => Transport {
-  return (components) => {
-    return new CircuitRelayTransport(components, init)
-  }
-}