@libp2p/circuit-relay-v2 3.2.24 → 4.0.0-049bfa0fa

package/dist/src/constants.d.ts

@@ -1,7 +1,3 @@
-/**
- * Multicodec code
- */
-export declare const CIRCUIT_PROTO_CODE = 290;
 /**
  * The maximum number of relay reservations the relay server will accept
  */
@@ -17,14 +13,13 @@ export declare const DEFAULT_RESERVATION_CONCURRENCY = 1;
 /**
  * How long to wait for a reservation attempt to finish
  */
-export declare const DEFAULT_RESERVATION_COMPLETION_TIMEOUT = 2000;
+export declare const DEFAULT_RESERVATION_COMPLETION_TIMEOUT = 5000;
 /**
  * How long to let the reservation attempt queue to grow
  */
 export declare const DEFAULT_MAX_RESERVATION_QUEUE_LENGTH = 100;
 export declare const RELAY_SOURCE_TAG = "circuit-relay-source";
 export declare const KEEP_ALIVE_TAG = "keep-alive-circuit-relay";
-export declare const KEEP_ALIVE_SOURCE_TAG = "keep-alive-circuit-relay-source";
 export declare const DEFAULT_DURATION_LIMIT: number;
 export declare const DEFAULT_DATA_LIMIT: bigint;
 /**

package/dist/src/constants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/constants.ts"],"names":[],"mappings":"AAKA;;GAEG;AACH,eAAO,MAAM,kBAAkB,MAAM,CAAA;AAErC;;GAEG;AACH,eAAO,MAAM,kCAAkC,KAAK,CAAA;AAEpD;;GAEG;AACH,eAAO,MAAM,2BAA2B,QAAkB,CAAA;AAE1D;;GAEG;AACH,eAAO,MAAM,+BAA+B,IAAI,CAAA;AAEhD;;GAEG;AACH,eAAO,MAAM,sCAAsC,OAAO,CAAA;AAE1D;;GAEG;AACH,eAAO,MAAM,oCAAoC,MAAM,CAAA;AAEvD,eAAO,MAAM,gBAAgB,yBAAyB,CAAA;AAEtD,eAAO,MAAM,cAAc,6BAAgC,CAAA;AAC3D,eAAO,MAAM,qBAAqB,oCAAuC,CAAA;AAMzE,eAAO,MAAM,sBAAsB,QAAa,CAAA;AAGhD,eAAO,MAAM,kBAAkB,QAAkB,CAAA;AAEjD;;GAEG;AACH,eAAO,MAAM,kBAAkB,oCAAoC,CAAA;AAEnE;;GAEG;AACH,eAAO,MAAM,mBAAmB,qCAAqC,CAAA;AAErE;;GAEG;AACH,eAAO,MAAM,mBAAmB,QAAc,CAAA;AAE9C;;GAEG;AACH,eAAO,MAAM,yBAAyB,QAAc,CAAA;AAEpD,eAAO,MAAM,eAAe,MAAM,CAAA;AAElC,eAAO,MAAM,6BAA6B,OAAO,CAAA;AACjD,eAAO,MAAM,mCAAmC,QAAQ,CAAA"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/constants.ts"],"names":[],"mappings":"AAKA;;GAEG;AACH,eAAO,MAAM,kCAAkC,KAAK,CAAA;AAEpD;;GAEG;AACH,eAAO,MAAM,2BAA2B,QAAkB,CAAA;AAE1D;;GAEG;AACH,eAAO,MAAM,+BAA+B,IAAI,CAAA;AAEhD;;GAEG;AACH,eAAO,MAAM,sCAAsC,OAAQ,CAAA;AAE3D;;GAEG;AACH,eAAO,MAAM,oCAAoC,MAAM,CAAA;AAEvD,eAAO,MAAM,gBAAgB,yBAAyB,CAAA;AAEtD,eAAO,MAAM,cAAc,6BAAgC,CAAA;AAM3D,eAAO,MAAM,sBAAsB,QAAa,CAAA;AAGhD,eAAO,MAAM,kBAAkB,QAAkB,CAAA;AAEjD;;GAEG;AACH,eAAO,MAAM,kBAAkB,oCAAoC,CAAA;AAEnE;;GAEG;AACH,eAAO,MAAM,mBAAmB,qCAAqC,CAAA;AAErE;;GAEG;AACH,eAAO,MAAM,mBAAmB,QAAc,CAAA;AAE9C;;GAEG;AACH,eAAO,MAAM,yBAAyB,QAAc,CAAA;AAEpD,eAAO,MAAM,eAAe,MAAM,CAAA;AAElC,eAAO,MAAM,6BAA6B,OAAO,CAAA;AACjD,eAAO,MAAM,mCAAmC,QAAQ,CAAA"}

package/dist/src/constants.js

@@ -1,10 +1,6 @@
 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
  */
@@ -20,14 +16,13 @@ export const DEFAULT_RESERVATION_CONCURRENCY = 1;
 /**
  * How long to wait for a reservation attempt to finish
  */
-export const DEFAULT_RESERVATION_COMPLETION_TIMEOUT = 2000;
+export const DEFAULT_RESERVATION_COMPLETION_TIMEOUT = 5_000;
 /**
  * How long to let the reservation attempt queue to grow
  */
 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
 // 2 min is the default connection duration

package/dist/src/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/constants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAE9C,MAAM,MAAM,GAAG,IAAI,CAAA;AACnB,MAAM,MAAM,GAAG,EAAE,GAAG,MAAM,CAAA;AAE1B;;GAEG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,GAAG,CAAA;AAErC;;GAEG;AACH,MAAM,CAAC,MAAM,kCAAkC,GAAG,EAAE,CAAA;AAEpD;;GAEG;AACH,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAAC,GAAG,EAAE,GAAG,MAAM,CAAA;AAE1D;;GAEG;AACH,MAAM,CAAC,MAAM,+BAA+B,GAAG,CAAC,CAAA;AAEhD;;GAEG;AACH,MAAM,CAAC,MAAM,sCAAsC,GAAG,IAAI,CAAA;AAE1D;;GAEG;AACH,MAAM,CAAC,MAAM,oCAAoC,GAAG,GAAG,CAAA;AAEvD,MAAM,CAAC,MAAM,gBAAgB,GAAG,sBAAsB,CAAA;AAEtD,MAAM,CAAC,MAAM,cAAc,GAAG,GAAG,UAAU,gBAAgB,CAAA;AAC3D,MAAM,CAAC,MAAM,qBAAqB,GAAG,GAAG,UAAU,uBAAuB,CAAA;AAEzE,+BAA+B;AAC/B,oGAAoG;AAEpG,2CAA2C;AAC3C,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,GAAG,MAAM,CAAA;AAEhD,iCAAiC;AACjC,MAAM,CAAC,MAAM,kBAAkB,GAAG,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC,CAAA;AAEjD;;GAEG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,iCAAiC,CAAA;AAEnE;;GAEG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,kCAAkC,CAAA;AAErE;;GAEG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,EAAE,GAAG,MAAM,CAAA;AAE9C;;GAEG;AACH,MAAM,CAAC,MAAM,yBAAyB,GAAG,EAAE,GAAG,MAAM,CAAA;AAEpD,MAAM,CAAC,MAAM,eAAe,GAAG,GAAG,CAAA;AAElC,MAAM,CAAC,MAAM,6BAA6B,GAAG,IAAI,CAAA;AACjD,MAAM,CAAC,MAAM,mCAAmC,GAAG,KAAK,CAAA"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/constants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAE9C,MAAM,MAAM,GAAG,IAAI,CAAA;AACnB,MAAM,MAAM,GAAG,EAAE,GAAG,MAAM,CAAA;AAE1B;;GAEG;AACH,MAAM,CAAC,MAAM,kCAAkC,GAAG,EAAE,CAAA;AAEpD;;GAEG;AACH,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAAC,GAAG,EAAE,GAAG,MAAM,CAAA;AAE1D;;GAEG;AACH,MAAM,CAAC,MAAM,+BAA+B,GAAG,CAAC,CAAA;AAEhD;;GAEG;AACH,MAAM,CAAC,MAAM,sCAAsC,GAAG,KAAK,CAAA;AAE3D;;GAEG;AACH,MAAM,CAAC,MAAM,oCAAoC,GAAG,GAAG,CAAA;AAEvD,MAAM,CAAC,MAAM,gBAAgB,GAAG,sBAAsB,CAAA;AAEtD,MAAM,CAAC,MAAM,cAAc,GAAG,GAAG,UAAU,gBAAgB,CAAA;AAE3D,+BAA+B;AAC/B,oGAAoG;AAEpG,2CAA2C;AAC3C,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,GAAG,MAAM,CAAA;AAEhD,iCAAiC;AACjC,MAAM,CAAC,MAAM,kBAAkB,GAAG,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC,CAAA;AAEjD;;GAEG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,iCAAiC,CAAA;AAEnE;;GAEG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,kCAAkC,CAAA;AAErE;;GAEG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,EAAE,GAAG,MAAM,CAAA;AAE9C;;GAEG;AACH,MAAM,CAAC,MAAM,yBAAyB,GAAG,EAAE,GAAG,MAAM,CAAA;AAEpD,MAAM,CAAC,MAAM,eAAe,GAAG,GAAG,CAAA;AAElC,MAAM,CAAC,MAAM,6BAA6B,GAAG,IAAI,CAAA;AACjD,MAAM,CAAC,MAAM,mCAAmC,GAAG,KAAK,CAAA"}

package/dist/src/index.d.ts

@@ -40,6 +40,8 @@
  */
 import { TypedEventEmitter } from 'main-event';
 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';
@@ -71,12 +73,165 @@ export interface CircuitRelayServiceEvents {
 export interface CircuitRelayService extends TypedEventEmitter<CircuitRelayServiceEvents> {
     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 declare function circuitRelayServer(init?: CircuitRelayServerInit): (components: CircuitRelayServerComponents) => CircuitRelayService;
+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 declare function circuitRelayTransport(init?: CircuitRelayTransportInit): (components: CircuitRelayTransportComponents) => Transport;
 //# sourceMappingURL=index.d.ts.map

package/dist/src/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuCG;AAEH,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAA;AAC9C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,eAAe,CAAA;AAC1C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAA;AACvD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AACxD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAA;AAE9D,YAAY,EAAE,KAAK,EAAE,CAAA;AAErB,MAAM,WAAW,gBAAgB;IAC/B;;OAEG;IACH,MAAM,EAAE,IAAI,CAAA;IAEZ;;OAEG;IACH,IAAI,EAAE,SAAS,CAAA;IAEf;;;OAGG;IACH,KAAK,CAAC,EAAE,KAAK,CAAA;IAEb;;OAEG;IACH,MAAM,EAAE,qBAAqB,CAAA;CAC9B;AAED,MAAM,WAAW,yBAAyB;IACxC,mBAAmB,EAAE,WAAW,CAAC,gBAAgB,CAAC,CAAA;IAClD,sBAAsB,EAAE,WAAW,CAAC,OAAO,CAAC,CAAA;IAC5C,oBAAoB,EAAE,WAAW,CAAC,KAAK,CAAC,CAAA;CACzC;AAED,MAAM,WAAW,mBAAoB,SAAQ,iBAAiB,CAAC,yBAAyB,CAAC;IACvF,YAAY,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAA;CACxC;AAED,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAA;AACtD,YAAY,EAAE,sBAAsB,EAAE,4BAA4B,EAAE,MAAM,mBAAmB,CAAA;AAC7F,YAAY,EAAE,oBAAoB,IAAI,0BAA0B,EAAE,MAAM,+BAA+B,CAAA;AACvG,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAA;AAC5D,YAAY,EAAE,wBAAwB,EAAE,MAAM,0BAA0B,CAAA;AACxE,YAAY,EAAE,oBAAoB,IAAI,6BAA6B,EAAE,MAAM,kCAAkC,CAAA;AAC7G,YAAY,EAAE,yBAAyB,EAAE,+BAA+B,EAAE,MAAM,sBAAsB,CAAA;AAEtG,OAAO,EACL,kBAAkB,EAClB,mBAAmB,EACpB,MAAM,gBAAgB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}

package/dist/src/index.js

@@ -39,7 +39,17 @@
  * ```
  */
 import { TypedEventEmitter } from 'main-event';
-export { circuitRelayServer } from './server/index.js';
-export { circuitRelayTransport } from './transport/index.js';
+import { CircuitRelayServer } from './server/index.js';
+import { CircuitRelayTransport } from "./transport/index.js";
 export { RELAY_V2_HOP_CODEC, RELAY_V2_STOP_CODEC } from './constants.js';
+export function circuitRelayServer(init = {}) {
+    return (components) => {
+        return new CircuitRelayServer(components, init);
+    };
+}
+export function circuitRelayTransport(init = {}) {
+    return (components) => {
+        return new CircuitRelayTransport(components, init);
+    };
+}
 //# sourceMappingURL=index.js.map

package/dist/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuCG;AAEH,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAA;AAyC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAA;AAGtD,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAA;AAK5D,OAAO,EACL,kBAAkB,EAClB,mBAAmB,EACpB,MAAM,gBAAgB,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuCG;AAEH,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAA;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAA;AACtD,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAA;AA2C5D,OAAO,EACL,kBAAkB,EAClB,mBAAmB,EACpB,MAAM,gBAAgB,CAAA;AAuFvB,MAAM,UAAU,kBAAkB,CAAE,OAA+B,EAAE;IACnE,OAAO,CAAC,UAAU,EAAE,EAAE;QACpB,OAAO,IAAI,kBAAkB,CAAC,UAAU,EAAE,IAAI,CAAC,CAAA;IACjD,CAAC,CAAA;AACH,CAAC;AAmGD,MAAM,UAAU,qBAAqB,CAAE,OAAkC,EAAE;IACzE,OAAO,CAAC,UAAU,EAAE,EAAE;QACpB,OAAO,IAAI,qBAAqB,CAAC,UAAU,EAAE,IAAI,CAAC,CAAA;IACpD,CAAC,CAAA;AACH,CAAC"}

package/dist/src/server/index.d.ts

@@ -1,37 +1,10 @@
+import { TypedEventEmitter } from 'main-event';
 import { HopMessage, StopMessage } from '../pb/index.js';
-import type { ReservationStoreInit } from './reservation-store.js';
-import type { CircuitRelayService, RelayReservation } from '../index.js';
-import type { ComponentLogger, Connection, Stream, ConnectionGater, PeerId, PeerStore, PrivateKey, Metrics } from '@libp2p/interface';
-import type { AddressManager, ConnectionManager, Registrar } from '@libp2p/interface-internal';
-import type { ProtobufStream } from 'it-protobuf-stream';
-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?: ReservationStoreInit;
-    /**
-     * 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;
-}
+import type { CircuitRelayServerComponents, CircuitRelayServerInit, CircuitRelayService, RelayReservation } from '../index.js';
+import type { Reservation } from '../pb/index.js';
+import type { Connection, Stream, PeerId, Startable, AbortOptions } from '@libp2p/interface';
+import type { PeerMap } from '@libp2p/peer-collections';
+import type { ProtobufStream } from '@libp2p/utils';
 export interface HopProtocolOptions {
     connection: Connection;
     request: HopMessage;
@@ -41,21 +14,44 @@ export interface StopOptions {
     connection: Connection;
     request: StopMessage;
 }
-export interface CircuitRelayServerComponents {
-    registrar: Registrar;
-    peerStore: PeerStore;
-    addressManager: AddressManager;
-    peerId: PeerId;
-    privateKey: PrivateKey;
-    connectionManager: ConnectionManager;
-    connectionGater: ConnectionGater;
-    logger: ComponentLogger;
-    metrics?: Metrics;
-}
 export interface RelayServerEvents {
     'relay:reservation': CustomEvent<RelayReservation>;
     'relay:advert:success': CustomEvent<unknown>;
     'relay:advert:error': CustomEvent<Error>;
 }
-export declare function circuitRelayServer(init?: CircuitRelayServerInit): (components: CircuitRelayServerComponents) => CircuitRelayService;
+export declare class CircuitRelayServer extends TypedEventEmitter<RelayServerEvents> implements Startable, CircuitRelayService {
+    private readonly components;
+    private readonly reservationStore;
+    private started;
+    private readonly hopTimeout;
+    private readonly shutdownController;
+    private readonly maxInboundHopStreams?;
+    private readonly maxOutboundHopStreams?;
+    private readonly maxOutboundStopStreams;
+    private readonly log;
+    /**
+     * Creates an instance of Relay
+     */
+    constructor(components: CircuitRelayServerComponents, init?: CircuitRelayServerInit);
+    readonly [Symbol.toStringTag] = "@libp2p/circuit-relay-v2-server";
+    isStarted(): boolean;
+    /**
+     * Start Relay service
+     */
+    start(): Promise<void>;
+    /**
+     * Stop Relay service
+     */
+    stop(): Promise<void>;
+    onHop(stream: Stream, connection: Connection): Promise<void>;
+    handleHopProtocol({ stream, request, connection }: HopProtocolOptions, options: AbortOptions): Promise<void>;
+    handleReserve({ stream, connection }: HopProtocolOptions, options: AbortOptions): Promise<void>;
+    makeReservation(remotePeer: PeerId, expire: bigint): Promise<Reservation>;
+    handleConnect({ stream, request, connection }: HopProtocolOptions, options: AbortOptions): Promise<void>;
+    /**
+     * Send a STOP request to the target peer that the dialing peer wants to contact
+     */
+    stopHop({ connection, request }: StopOptions, options: AbortOptions): Promise<Stream | undefined>;
+    get reservations(): PeerMap<RelayReservation>;
+}
 //# sourceMappingURL=index.d.ts.map

package/dist/src/server/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/server/index.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,UAAU,EAAU,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAIhE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAClE,OAAO,KAAK,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAExE,OAAO,KAAK,EAAE,eAAe,EAAU,UAAU,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,EAAE,SAAS,EAAa,UAAU,EAAE,OAAO,EAAoC,MAAM,mBAAmB,CAAA;AAC1L,OAAO,KAAK,EAAE,cAAc,EAAE,iBAAiB,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAA;AAG9F,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AAIxD,MAAM,WAAW,sBAAsB;IACrC;;;;;OAKG;IACH,UAAU,CAAC,EAAE,MAAM,CAAA;IAEnB;;OAEG;IACH,YAAY,CAAC,EAAE,oBAAoB,CAAA;IAEnC;;OAEG;IACH,oBAAoB,CAAC,EAAE,MAAM,CAAA;IAE7B;;OAEG;IACH,qBAAqB,CAAC,EAAE,MAAM,CAAA;IAE9B;;;;;OAKG;IACH,sBAAsB,CAAC,EAAE,MAAM,CAAA;CAChC;AAED,MAAM,WAAW,kBAAkB;IACjC,UAAU,EAAE,UAAU,CAAA;IACtB,OAAO,EAAE,UAAU,CAAA;IACnB,MAAM,EAAE,cAAc,CAAC,MAAM,CAAC,CAAA;CAC/B;AAED,MAAM,WAAW,WAAW;IAC1B,UAAU,EAAE,UAAU,CAAA;IACtB,OAAO,EAAE,WAAW,CAAA;CACrB;AAED,MAAM,WAAW,4BAA4B;IAC3C,SAAS,EAAE,SAAS,CAAA;IACpB,SAAS,EAAE,SAAS,CAAA;IACpB,cAAc,EAAE,cAAc,CAAA;IAC9B,MAAM,EAAE,MAAM,CAAA;IACd,UAAU,EAAE,UAAU,CAAA;IACtB,iBAAiB,EAAE,iBAAiB,CAAA;IACpC,eAAe,EAAE,eAAe,CAAA;IAChC,MAAM,EAAE,eAAe,CAAA;IACvB,OAAO,CAAC,EAAE,OAAO,CAAA;CAClB;AAED,MAAM,WAAW,iBAAiB;IAChC,mBAAmB,EAAE,WAAW,CAAC,gBAAgB,CAAC,CAAA;IAClD,sBAAsB,EAAE,WAAW,CAAC,OAAO,CAAC,CAAA;IAC5C,oBAAoB,EAAE,WAAW,CAAC,KAAK,CAAC,CAAA;CACzC;AA+VD,wBAAgB,kBAAkB,CAAE,IAAI,GAAE,sBAA2B,GAAG,CAAC,UAAU,EAAE,4BAA4B,KAAK,mBAAmB,CAIxI"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/server/index.ts"],"names":[],"mappings":"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"}

package/dist/src/server/index.js

@@ -1,27 +1,21 @@
 import { publicKeyToProtobuf } from '@libp2p/crypto/keys';
 import { peerIdFromMultihash } from '@libp2p/peer-id';
 import { RecordEnvelope } from '@libp2p/peer-record';
+import { pbStream } from '@libp2p/utils';
 import { multiaddr } from '@multiformats/multiaddr';
-import { pbStream } from 'it-protobuf-stream';
+import { Circuit } from '@multiformats/multiaddr-matcher';
 import { TypedEventEmitter, setMaxListeners } from 'main-event';
 import * as Digest from 'multiformats/hashes/digest';
-import { CIRCUIT_PROTO_CODE, DEFAULT_HOP_TIMEOUT, KEEP_ALIVE_SOURCE_TAG, MAX_CONNECTIONS, RELAY_SOURCE_TAG, RELAY_V2_HOP_CODEC, RELAY_V2_STOP_CODEC } from '../constants.js';
+import { DEFAULT_HOP_TIMEOUT, MAX_CONNECTIONS, RELAY_SOURCE_TAG, RELAY_V2_HOP_CODEC, RELAY_V2_STOP_CODEC } from '../constants.js';
 import { HopMessage, Status, StopMessage } from '../pb/index.js';
 import { createLimitedRelay } from '../utils.js';
 import { ReservationStore } from './reservation-store.js';
 import { ReservationVoucherRecord } from './reservation-voucher.js';
-const isRelayAddr = (ma) => ma.protoCodes().includes(CIRCUIT_PROTO_CODE);
 const defaults = {
     maxOutboundStopStreams: MAX_CONNECTIONS
 };
-class CircuitRelayServer extends TypedEventEmitter {
-    registrar;
-    peerStore;
-    addressManager;
-    peerId;
-    privateKey;
-    connectionManager;
-    connectionGater;
+export class CircuitRelayServer extends TypedEventEmitter {
+    components;
     reservationStore;
     started;
     hopTimeout;
@@ -36,13 +30,7 @@ class CircuitRelayServer extends TypedEventEmitter {
     constructor(components, init = {}) {
         super();
         this.log = components.logger.forComponent('libp2p:circuit-relay:server');
-        this.registrar = components.registrar;
-        this.peerStore = components.peerStore;
-        this.addressManager = components.addressManager;
-        this.peerId = components.peerId;
-        this.privateKey = components.privateKey;
-        this.connectionManager = components.connectionManager;
-        this.connectionGater = components.connectionGater;
+        this.components = components;
         this.started = false;
         this.hopTimeout = init?.hopTimeout ?? DEFAULT_HOP_TIMEOUT;
         this.maxInboundHopStreams = init.maxInboundHopStreams;
@@ -51,6 +39,7 @@ class CircuitRelayServer extends TypedEventEmitter {
         this.reservationStore = new ReservationStore(components, init.reservations);
         this.shutdownController = new AbortController();
         setMaxListeners(Infinity, this.shutdownController.signal);
+        this.onHop = this.onHop.bind(this);
     }
     [Symbol.toStringTag] = '@libp2p/circuit-relay-v2-server';
     isStarted() {
@@ -63,11 +52,7 @@ class CircuitRelayServer extends TypedEventEmitter {
         if (this.started) {
             return;
         }
-        await this.registrar.handle(RELAY_V2_HOP_CODEC, (data) => {
-            void this.onHop(data).catch(err => {
-                this.log.error(err);
-            });
-        }, {
+        await this.components.registrar.handle(RELAY_V2_HOP_CODEC, this.onHop, {
             maxInboundStreams: this.maxInboundHopStreams,
             maxOutboundStreams: this.maxOutboundHopStreams,
             runOnLimitedConnection: true
@@ -80,13 +65,15 @@ class CircuitRelayServer extends TypedEventEmitter {
     async stop() {
         this.reservationStore.clear();
         this.shutdownController.abort();
-        await this.registrar.unhandle(RELAY_V2_HOP_CODEC);
+        await this.components.registrar.unhandle(RELAY_V2_HOP_CODEC);
         this.started = false;
     }
-    async onHop({ connection, stream }) {
+    async onHop(stream, connection) {
         this.log('received circuit v2 hop protocol stream from %p', connection.remotePeer);
+        const signal = AbortSignal.timeout(this.hopTimeout);
+        setMaxListeners(Infinity, signal);
         const options = {
-            signal: AbortSignal.timeout(this.hopTimeout)
+            signal
         };
         const pbstr = pbStream(stream);
         try {
@@ -128,12 +115,12 @@ class CircuitRelayServer extends TypedEventEmitter {
     async handleReserve({ stream, connection }, options) {
         const hopstr = stream.pb(HopMessage);
         this.log('hop reserve request from %p', connection.remotePeer);
-        if (isRelayAddr(connection.remoteAddr)) {
+        if (Circuit.exactMatch(connection.remoteAddr)) {
             this.log.error('relay reservation over circuit connection denied for peer: %p', connection.remotePeer);
             await hopstr.write({ type: HopMessage.Type.STATUS, status: Status.PERMISSION_DENIED }, options);
             return;
         }
-        if ((await this.connectionGater.denyInboundRelayReservation?.(connection.remotePeer)) === true) {
+        if ((await this.components.connectionGater.denyInboundRelayReservation?.(connection.remotePeer)) === true) {
             this.log.error('reservation for %p denied by connection gater', connection.remotePeer);
             await hopstr.write({ type: HopMessage.Type.STATUS, status: Status.PERMISSION_DENIED }, options);
             return;
@@ -148,12 +135,11 @@ class CircuitRelayServer extends TypedEventEmitter {
             // result.expire is non-null if `ReservationStore.reserve` returns with status == OK
             if (result.expire != null) {
                 const ttl = (result.expire * 1000) - Date.now();
-                await this.peerStore.merge(connection.remotePeer, {
+                await this.components.peerStore.merge(connection.remotePeer, {
                     tags: {
-                        [RELAY_SOURCE_TAG]: { value: 1, ttl },
-                        [KEEP_ALIVE_SOURCE_TAG]: { value: 1, ttl }
+                        [RELAY_SOURCE_TAG]: { value: 1, ttl }
                     }
-                });
+                }, options);
             }
             await hopstr.write({
                 type: HopMessage.Type.STATUS,
@@ -162,17 +148,18 @@ class CircuitRelayServer extends TypedEventEmitter {
                 limit: this.reservationStore.get(connection.remotePeer)?.limit
             }, options);
             this.log('sent confirmation response to %s', connection.remotePeer);
+            // close writable end of stream
+            await hopstr.unwrap().unwrap().close(options);
         }
         catch (err) {
             this.log.error('failed to send confirmation response to %p - %e', connection.remotePeer, err);
             this.reservationStore.removeReservation(connection.remotePeer);
             try {
-                await this.peerStore.merge(connection.remotePeer, {
+                await this.components.peerStore.merge(connection.remotePeer, {
                     tags: {
-                        [RELAY_SOURCE_TAG]: undefined,
-                        [KEEP_ALIVE_SOURCE_TAG]: undefined
+                        [RELAY_SOURCE_TAG]: undefined
                     }
-                });
+                }, options);
             }
             catch (err) {
                 this.log.error('failed to untag relay source peer %p - %e', connection.remotePeer, err);
@@ -181,7 +168,7 @@ class CircuitRelayServer extends TypedEventEmitter {
     }
     async makeReservation(remotePeer, expire) {
         const addrs = [];
-        for (const relayAddr of this.addressManager.getAddresses()) {
+        for (const relayAddr of this.components.addressManager.getAddresses()) {
             if (relayAddr.toString().includes('/p2p-circuit')) {
                 continue;
             }
@@ -189,9 +176,9 @@ class CircuitRelayServer extends TypedEventEmitter {
         }
         const envelope = await RecordEnvelope.seal(new ReservationVoucherRecord({
             peer: remotePeer,
-            relay: this.peerId,
+            relay: this.components.peerId,
             expiration: expire
-        }), this.privateKey);
+        }), this.components.privateKey);
         return {
             addrs,
             expire,
@@ -200,7 +187,7 @@ class CircuitRelayServer extends TypedEventEmitter {
                 payloadType: envelope.payloadType,
                 payload: {
                     peer: remotePeer.toMultihash().bytes,
-                    relay: this.peerId.toMultihash().bytes,
+                    relay: this.components.peerId.toMultihash().bytes,
                     expiration: expire
                 },
                 signature: envelope.signature
@@ -209,7 +196,7 @@ class CircuitRelayServer extends TypedEventEmitter {
     }
     async handleConnect({ stream, request, connection }, options) {
         const hopstr = stream.pb(HopMessage);
-        if (isRelayAddr(connection.remoteAddr)) {
+        if (Circuit.matches(connection.remoteAddr)) {
             this.log.error('relay reservation over circuit connection denied for peer: %p', connection.remotePeer);
             await hopstr.write({ type: HopMessage.Type.STATUS, status: Status.PERMISSION_DENIED }, options);
             return;
@@ -235,12 +222,12 @@ class CircuitRelayServer extends TypedEventEmitter {
             await hopstr.write({ type: HopMessage.Type.STATUS, status: Status.NO_RESERVATION }, options);
             return;
         }
-        if ((await this.connectionGater.denyOutboundRelayedConnection?.(connection.remotePeer, dstPeer)) === true) {
+        if ((await this.components.connectionGater.denyOutboundRelayedConnection?.(connection.remotePeer, dstPeer)) === true) {
             this.log.error('hop connect for %p to %p denied by connection gater', connection.remotePeer, dstPeer);
             await hopstr.write({ type: HopMessage.Type.STATUS, status: Status.PERMISSION_DENIED }, options);
             return;
         }
-        const connections = this.connectionManager.getConnections(dstPeer);
+        const connections = this.components.connectionManager.getConnections(dstPeer);
         if (connections.length === 0) {
             this.log('hop connect denied for destination peer %p not having a connection for %p as there is no destination connection', dstPeer, connection.remotePeer);
             await hopstr.write({ type: HopMessage.Type.STATUS, status: Status.NO_RESERVATION }, options);
@@ -268,10 +255,9 @@ class CircuitRelayServer extends TypedEventEmitter {
             status: Status.OK,
             limit: reservation?.limit
         }, options);
-        const sourceStream = stream.unwrap();
         this.log('connection from %p to %p established - merging streams', connection.remotePeer, dstPeer);
         // Short circuit the two streams to create the relayed connection
-        createLimitedRelay(sourceStream, destinationStream, this.shutdownController.signal, reservation, {
+        createLimitedRelay(stream.unwrap(), destinationStream, this.shutdownController.signal, reservation, {
             log: this.log
         });
     }
@@ -280,7 +266,7 @@ class CircuitRelayServer extends TypedEventEmitter {
      */
     async stopHop({ connection, request }, options) {
         this.log('starting circuit relay v2 stop request to %s', connection.remotePeer);
-        const stream = await connection.newStream([RELAY_V2_STOP_CODEC], {
+        const stream = await connection.newStream(RELAY_V2_STOP_CODEC, {
             maxOutboundStreams: this.maxOutboundStopStreams,
             runOnLimitedConnection: true,
             ...options
@@ -311,9 +297,4 @@ class CircuitRelayServer extends TypedEventEmitter {
         return this.reservationStore.reservations;
     }
 }
-export function circuitRelayServer(init = {}) {
-    return (components) => {
-        return new CircuitRelayServer(components, init);
-    };
-}
 //# sourceMappingURL=index.js.map