libp2p 0.42.2-45fc415b → 0.42.2-593deefe

package/dist/src/circuit/relay.js

@@ -0,0 +1,61 @@
+import { logger } from '@libp2p/logger';
+import { codes } from '../errors.js';
+import { setDelayedInterval, clearDelayedInterval
+// @ts-expect-error set-delayed-interval does not export types
+ } from 'set-delayed-interval';
+import { namespaceToCid } from './utils.js';
+import { RELAY_RENDEZVOUS_NS } from './constants.js';
+const log = logger('libp2p:circuit:relay');
+export class Relay {
+    /**
+     * Creates an instance of Relay
+     */
+    constructor(components, init) {
+        this.components = components;
+        this.started = false;
+        this.init = init;
+        this._advertiseService = this._advertiseService.bind(this);
+    }
+    isStarted() {
+        return this.started;
+    }
+    /**
+     * Start Relay service
+     */
+    async start() {
+        // Advertise service if HOP enabled and advertising enabled
+        if (this.init.hop.enabled === true && this.init.advertise.enabled === true) {
+            this.timeout = setDelayedInterval(this._advertiseService, this.init.advertise.ttl, this.init.advertise.bootDelay);
+        }
+        this.started = true;
+    }
+    /**
+     * Stop Relay service
+     */
+    async stop() {
+        try {
+            clearDelayedInterval(this.timeout);
+        }
+        catch (err) { }
+        this.started = false;
+    }
+    /**
+     * Advertise hop relay service in the network.
+     */
+    async _advertiseService() {
+        try {
+            const cid = await namespaceToCid(RELAY_RENDEZVOUS_NS);
+            await this.components.contentRouting.provide(cid);
+        }
+        catch (err) {
+            if (err.code === codes.ERR_NO_ROUTERS_AVAILABLE) {
+                log.error('a content router, such as a DHT, must be provided in order to advertise the relay service', err);
+                await this.stop();
+            }
+            else {
+                log.error('could not advertise service: ', err);
+            }
+        }
+    }
+}
+//# sourceMappingURL=relay.js.map

package/dist/src/circuit/relay.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"relay.js","sourceRoot":"","sources":["../../../src/circuit/relay.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AACvC,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,CAAA;AACpC,OAAO,EACL,kBAAkB,EAClB,oBAAoB;AACpB,8DAA8D;EAC/D,MAAM,sBAAsB,CAAA;AAC7B,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAC3C,OAAO,EACL,mBAAmB,EACpB,MAAM,gBAAgB,CAAA;AAMvB,MAAM,GAAG,GAAG,MAAM,CAAC,sBAAsB,CAAC,CAAA;AAS1C,MAAM,OAAO,KAAK;IAMhB;;OAEG;IACH,YAAa,UAAsB,EAAE,IAAe;QAClD,IAAI,CAAC,UAAU,GAAG,UAAU,CAAA;QAC5B,IAAI,CAAC,OAAO,GAAG,KAAK,CAAA;QACpB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;QAChB,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAC5D,CAAC;IAED,SAAS;QACP,OAAO,IAAI,CAAC,OAAO,CAAA;IACrB,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,KAAK;QACT,2DAA2D;QAC3D,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,KAAK,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,KAAK,IAAI,EAAE;YAC1E,IAAI,CAAC,OAAO,GAAG,kBAAkB,CAC/B,IAAI,CAAC,iBAAiB,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,CAC/E,CAAA;SACF;QAED,IAAI,CAAC,OAAO,GAAG,IAAI,CAAA;IACrB,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,IAAI;QACR,IAAI;YACF,oBAAoB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;SACnC;QAAC,OAAO,GAAG,EAAE,GAAG;QAEjB,IAAI,CAAC,OAAO,GAAG,KAAK,CAAA;IACtB,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,iBAAiB;QACrB,IAAI;YACF,MAAM,GAAG,GAAG,MAAM,cAAc,CAAC,mBAAmB,CAAC,CAAA;YACrD,MAAM,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;SAClD;QAAC,OAAO,GAAQ,EAAE;YACjB,IAAI,GAAG,CAAC,IAAI,KAAK,KAAK,CAAC,wBAAwB,EAAE;gBAC/C,GAAG,CAAC,KAAK,CAAC,2FAA2F,EAAE,GAAG,CAAC,CAAA;gBAC3G,MAAM,IAAI,CAAC,IAAI,EAAE,CAAA;aAClB;iBAAM;gBACL,GAAG,CAAC,KAAK,CAAC,+BAA+B,EAAE,GAAG,CAAC,CAAA;aAChD;SACF;IACH,CAAC;CACF"}

package/dist/src/circuit/reservation-store.d.ts

@@ -0,0 +1,42 @@
+import { Limit } from './pb/index.js';
+import type { ReservationStore as IReservationStore, ReservationStatus, Reservation } from './interfaces.js';
+import type { Multiaddr } from '@multiformats/multiaddr';
+import type { PeerId } from '@libp2p/interface-peer-id';
+import type { Startable } from '@libp2p/interfaces/startable';
+import type { RecursivePartial } from '@libp2p/interfaces';
+export interface ReservationStoreInit {
+    maxReservations: number;
+    reservationClearInterval: number;
+    applyDefaultLimit: boolean;
+    /**
+     * reservation ttl, default: 2 hours
+     */
+    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 type ReservationStoreOptions = RecursivePartial<ReservationStoreInit>;
+export declare class ReservationStore implements IReservationStore, Startable {
+    private readonly reservations;
+    private _started;
+    private interval;
+    private readonly init;
+    constructor(options?: ReservationStoreOptions);
+    isStarted(): boolean;
+    start(): void;
+    stop(): void;
+    reserve(peer: PeerId, addr: Multiaddr, limit?: Limit): {
+        status: ReservationStatus;
+        expire?: number;
+    };
+    removeReservation(peer: PeerId): void;
+    hasReservation(dst: PeerId): boolean;
+    get(peer: PeerId): Reservation | undefined;
+}
+//# sourceMappingURL=reservation-store.d.ts.map

package/dist/src/circuit/reservation-store.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"reservation-store.d.ts","sourceRoot":"","sources":["../../../src/circuit/reservation-store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAU,MAAM,eAAe,CAAA;AAC7C,OAAO,KAAK,EAAE,gBAAgB,IAAI,iBAAiB,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;AAC5G,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AACxD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAA;AACvD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAA;AAE7D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAG1D,MAAM,WAAW,oBAAoB;IAInC,eAAe,EAAE,MAAM,CAAA;IAIvB,wBAAwB,EAAE,MAAM,CAAA;IAIhC,iBAAiB,EAAE,OAAO,CAAA;IAC1B;;OAEG;IACH,cAAc,EAAE,MAAM,CAAA;IACtB;;OAEG;IACH,oBAAoB,CAAC,EAAE,MAAM,CAAA;IAC7B;;OAEG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAA;CAC1B;AAED,MAAM,MAAM,uBAAuB,GAAG,gBAAgB,CAAC,oBAAoB,CAAC,CAAA;AAE5E,qBAAa,gBAAiB,YAAW,iBAAiB,EAAE,SAAS;IACnE,OAAO,CAAC,QAAQ,CAAC,YAAY,CAA6B;IAC1D,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,QAAQ,CAAK;IACrB,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAsB;gBAE9B,OAAO,CAAC,EAAE,uBAAuB;IAW9C,SAAS;IAIT,KAAK;IAkBL,IAAI;IAIJ,OAAO,CAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,CAAC,EAAE,KAAK,GAAG;QAAE,MAAM,EAAE,iBAAiB,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE;IAatG,iBAAiB,CAAE,IAAI,EAAE,MAAM,GAAG,IAAI;IAItC,cAAc,CAAE,GAAG,EAAE,MAAM,GAAG,OAAO;IAIrC,GAAG,CAAE,IAAI,EAAE,MAAM,GAAG,WAAW,GAAG,SAAS;CAG5C"}

package/dist/src/circuit/reservation-store.js

@@ -0,0 +1,59 @@
+import { Status } from './pb/index.js';
+import { PeerMap } from '@libp2p/peer-collections';
+import { DEFAULT_DATA_LIMIT, DEFAULT_DURATION_LIMIT } from './constants.js';
+export class ReservationStore {
+    constructor(options) {
+        this.reservations = new PeerMap();
+        this._started = false;
+        this.init = {
+            maxReservations: options?.maxReservations ?? 15,
+            reservationClearInterval: options?.reservationClearInterval ?? 300 * 1000,
+            applyDefaultLimit: options?.applyDefaultLimit !== false,
+            reservationTtl: options?.reservationTtl ?? 2 * 60 * 60 * 1000,
+            defaultDurationLimit: options?.defaultDurationLimit ?? DEFAULT_DURATION_LIMIT,
+            defaultDataLimit: options?.defaultDataLimit ?? DEFAULT_DATA_LIMIT
+        };
+    }
+    isStarted() {
+        return this._started;
+    }
+    start() {
+        if (this._started) {
+            return;
+        }
+        this._started = true;
+        this.interval = setInterval(() => {
+            const now = (new Date()).getTime();
+            this.reservations.forEach((r, k) => {
+                if (r.expire.getTime() < now) {
+                    this.reservations.delete(k);
+                }
+            });
+        }, this.init.reservationClearInterval);
+    }
+    stop() {
+        clearInterval(this.interval);
+    }
+    reserve(peer, addr, limit) {
+        if (this.reservations.size >= this.init.maxReservations && !this.reservations.has(peer)) {
+            return { status: Status.RESERVATION_REFUSED };
+        }
+        const expire = new Date(Date.now() + this.init.reservationTtl);
+        let checkedLimit;
+        if (this.init.applyDefaultLimit) {
+            checkedLimit = limit ?? { data: this.init.defaultDataLimit, duration: this.init.defaultDurationLimit };
+        }
+        this.reservations.set(peer, { addr, expire, limit: checkedLimit });
+        return { status: Status.OK, expire: expire.getTime() };
+    }
+    removeReservation(peer) {
+        this.reservations.delete(peer);
+    }
+    hasReservation(dst) {
+        return this.reservations.has(dst);
+    }
+    get(peer) {
+        return this.reservations.get(peer);
+    }
+}
+//# sourceMappingURL=reservation-store.js.map

package/dist/src/circuit/reservation-store.js.map

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

package/dist/src/circuit/reservation-voucher.d.ts

@@ -0,0 +1,18 @@
+import type { PeerId } from '@libp2p/interface-peer-id';
+import type { Record } from '@libp2p/interface-record';
+export interface ReservationVoucherOptions {
+    relay: PeerId;
+    peer: PeerId;
+    expiration: number;
+}
+export declare class ReservationVoucherRecord implements Record {
+    readonly domain = "libp2p-relay-rsvp";
+    readonly codec: Uint8Array;
+    private readonly relay;
+    private readonly peer;
+    private readonly expiration;
+    constructor({ relay, peer, expiration }: ReservationVoucherOptions);
+    marshal(): Uint8Array;
+    equals(other: Record): boolean;
+}
+//# sourceMappingURL=reservation-voucher.d.ts.map

package/dist/src/circuit/reservation-voucher.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"reservation-voucher.d.ts","sourceRoot":"","sources":["../../../src/circuit/reservation-voucher.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAA;AACvD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAA;AAGtD,MAAM,WAAW,yBAAyB;IACxC,KAAK,EAAE,MAAM,CAAA;IACb,IAAI,EAAE,MAAM,CAAA;IACZ,UAAU,EAAE,MAAM,CAAA;CACnB;AAED,qBAAa,wBAAyB,YAAW,MAAM;IACrD,SAAgB,MAAM,uBAAsB;IAC5C,SAAgB,KAAK,aAA+B;IAEpD,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAQ;IAC9B,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAQ;IAC7B,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAQ;gBAEtB,EAAE,KAAK,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,yBAAyB;IAMnE,OAAO;IAQP,MAAM,CAAE,KAAK,EAAE,MAAM;CAkBtB"}

package/dist/src/circuit/reservation-voucher.js

@@ -0,0 +1,33 @@
+import { ReservationVoucher } from './pb/index.js';
+export class ReservationVoucherRecord {
+    constructor({ relay, peer, expiration }) {
+        this.domain = 'libp2p-relay-rsvp';
+        this.codec = new Uint8Array([0x03, 0x02]);
+        this.relay = relay;
+        this.peer = peer;
+        this.expiration = expiration;
+    }
+    marshal() {
+        return ReservationVoucher.encode({
+            relay: this.relay.toBytes(),
+            peer: this.peer.toBytes(),
+            expiration: BigInt(this.expiration)
+        });
+    }
+    equals(other) {
+        if (!(other instanceof ReservationVoucherRecord)) {
+            return false;
+        }
+        if (!this.peer.equals(other.peer)) {
+            return false;
+        }
+        if (!this.relay.equals(other.relay)) {
+            return false;
+        }
+        if (this.expiration !== other.expiration) {
+            return false;
+        }
+        return true;
+    }
+}
+//# sourceMappingURL=reservation-voucher.js.map

package/dist/src/circuit/reservation-voucher.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"reservation-voucher.js","sourceRoot":"","sources":["../../../src/circuit/reservation-voucher.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAA;AAQlD,MAAM,OAAO,wBAAwB;IAQnC,YAAa,EAAE,KAAK,EAAE,IAAI,EAAE,UAAU,EAA6B;QAPnD,WAAM,GAAG,mBAAmB,CAAA;QAC5B,UAAK,GAAG,IAAI,UAAU,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAA;QAOlD,IAAI,CAAC,KAAK,GAAG,KAAK,CAAA;QAClB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;QAChB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAA;IAC9B,CAAC;IAED,OAAO;QACL,OAAO,kBAAkB,CAAC,MAAM,CAAC;YAC/B,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE;YAC3B,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACzB,UAAU,EAAE,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC;SACpC,CAAC,CAAA;IACJ,CAAC;IAED,MAAM,CAAE,KAAa;QACnB,IAAI,CAAC,CAAC,KAAK,YAAY,wBAAwB,CAAC,EAAE;YAChD,OAAO,KAAK,CAAA;SACb;QACD,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;YACjC,OAAO,KAAK,CAAA;SACb;QAED,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;YACnC,OAAO,KAAK,CAAA;SACb;QAED,IAAI,IAAI,CAAC,UAAU,KAAK,KAAK,CAAC,UAAU,EAAE;YACxC,OAAO,KAAK,CAAA;SACb;QAED,OAAO,IAAI,CAAA;IACb,CAAC;CACF"}

package/dist/src/circuit/stop.d.ts

@@ -0,0 +1,19 @@
+import { StopMessage } from './pb/index.js';
+import type { Connection, Stream } from '@libp2p/interface-connection';
+import { ProtobufStream } from 'it-pb-stream';
+export interface HandleStopOptions {
+    connection: Connection;
+    request: StopMessage;
+    pbstr: ProtobufStream<Stream>;
+}
+export declare function handleStop({ connection, request, pbstr }: HandleStopOptions): Promise<Stream | undefined>;
+export interface StopOptions {
+    connection: Connection;
+    request: StopMessage;
+}
+/**
+ * Creates a STOP request
+ *
+ */
+export declare function stop({ connection, request }: StopOptions): Promise<Stream | undefined>;
+//# sourceMappingURL=stop.d.ts.map

package/dist/src/circuit/stop.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"stop.d.ts","sourceRoot":"","sources":["../../../src/circuit/stop.ts"],"names":[],"mappings":"AACA,OAAO,EAAU,WAAW,EAAE,MAAM,eAAe,CAAA;AACnD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAA;AAKtE,OAAO,EAAY,cAAc,EAAE,MAAM,cAAc,CAAA;AAIvD,MAAM,WAAW,iBAAiB;IAChC,UAAU,EAAE,UAAU,CAAA;IACtB,OAAO,EAAE,WAAW,CAAA;IACpB,KAAK,EAAE,cAAc,CAAC,MAAM,CAAC,CAAA;CAC9B;AAaD,wBAAsB,UAAU,CAAE,EAChC,UAAU,EACV,OAAO,EACP,KAAK,EACN,EAAE,iBAAiB,+BAoBnB;AAED,MAAM,WAAW,WAAW;IAC1B,UAAU,EAAE,UAAU,CAAA;IACtB,OAAO,EAAE,WAAW,CAAA;CACrB;AAED;;;GAGG;AACH,wBAAsB,IAAI,CAAE,EAC1B,UAAU,EACV,OAAO,EACR,EAAE,WAAW,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAyB3C"}

package/dist/src/circuit/stop.js

@@ -0,0 +1,67 @@
+import { Status, StopMessage } from './pb/index.js';
+import { logger } from '@libp2p/logger';
+import { RELAY_V2_STOP_CODEC } from './multicodec.js';
+import { multiaddr } from '@multiformats/multiaddr';
+import { pbStream } from 'it-pb-stream';
+const log = logger('libp2p:circuit:v2:stop');
+const isValidStop = (request) => {
+    if (request.peer == null) {
+        return false;
+    }
+    try {
+        request.peer.addrs.forEach(multiaddr);
+    }
+    catch (_err) {
+        return false;
+    }
+    return true;
+};
+export async function handleStop({ connection, request, pbstr }) {
+    const stopstr = pbstr.pb(StopMessage);
+    log('new circuit relay v2 stop stream from %s', connection.remotePeer);
+    // Validate the STOP request has the required input
+    if (request.type !== StopMessage.Type.CONNECT) {
+        log.error('invalid stop connect request via peer %s', connection.remotePeer);
+        stopstr.write({ type: StopMessage.Type.STATUS, status: Status.UNEXPECTED_MESSAGE });
+        return;
+    }
+    if (!isValidStop(request)) {
+        log.error('invalid stop connect request via peer %s', connection.remotePeer);
+        stopstr.write({ type: StopMessage.Type.STATUS, status: Status.MALFORMED_MESSAGE });
+        return;
+    }
+    // TODO: go-libp2p marks connection transient if there is limit field present in request.
+    // Cannot find any reference to transient connections in js-libp2p
+    stopstr.write({ type: StopMessage.Type.STATUS, status: Status.OK });
+    return pbstr.unwrap();
+}
+/**
+ * Creates a STOP request
+ *
+ */
+export async function stop({ connection, request }) {
+    const stream = await connection.newStream([RELAY_V2_STOP_CODEC]);
+    log('starting circuit relay v2 stop request to %s', connection.remotePeer);
+    const pbstr = pbStream(stream);
+    const stopstr = pbstr.pb(StopMessage);
+    stopstr.write(request);
+    let response;
+    try {
+        response = await stopstr.read();
+    }
+    catch (err) {
+        log.error('error parsing stop message response from %s', connection.remotePeer);
+    }
+    if (response == null) {
+        log.error('could not read response from %s', connection.remotePeer);
+        stream.close();
+        return;
+    }
+    if (response.status === Status.OK) {
+        log('stop request to %s was successful', connection.remotePeer);
+        return pbstr.unwrap();
+    }
+    log('stop request failed with code %d', response.status);
+    stream.close();
+}
+//# sourceMappingURL=stop.js.map

package/dist/src/circuit/stop.js.map

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

package/dist/src/circuit/transport.d.ts

@@ -1,15 +1,18 @@
-import type { Multiaddr } from '@multiformats/multiaddr';
-import { symbol, Upgrader } from '@libp2p/interface-transport';
+import { symbol, TransportManager, Upgrader } from '@libp2p/interface-transport';
 import type { AbortOptions } from '@libp2p/interfaces';
 import type { IncomingStreamData, Registrar } from '@libp2p/interface-registrar';
 import type { Listener, Transport, CreateListenerOptions } from '@libp2p/interface-transport';
-import type { Connection } from '@libp2p/interface-connection';
+import type { Connection, Stream } from '@libp2p/interface-connection';
 import type { RelayConfig } from './index.js';
-import type { Startable } from '@libp2p/interfaces/startable';
-import type { ConnectionManager } from '@libp2p/interface-connection-manager';
 import type { PeerId } from '@libp2p/interface-peer-id';
+import type { Multiaddr } from '@multiformats/multiaddr';
 import type { PeerStore } from '@libp2p/interface-peer-store';
+import type { Startable } from '@libp2p/interfaces/dist/src/startable';
+import type { ConnectionManager } from '@libp2p/interface-connection-manager';
 import type { AddressManager } from '@libp2p/interface-address-manager';
+export interface CircuitOptions {
+    limit?: number;
+}
 export interface CircuitComponents {
     peerId: PeerId;
     peerStore: PeerStore;
@@ -17,25 +20,36 @@ export interface CircuitComponents {
     connectionManager: ConnectionManager;
     upgrader: Upgrader;
     addressManager: AddressManager;
+    transportManager: TransportManager;
+}
+interface ConnectOptions {
+    stream: Stream;
+    connection: Connection;
+    destinationPeer: PeerId;
+    destinationAddr: Multiaddr;
+    relayAddr: Multiaddr;
+    ma: Multiaddr;
+    disconnectOnFailure: boolean;
 }
 export declare class Circuit implements Transport, Startable {
     private handler?;
     private readonly components;
+    private readonly reservationStore;
     private readonly _init;
     private _started;
-    constructor(components: CircuitComponents, init: RelayConfig);
+    constructor(components: CircuitComponents, options: RelayConfig);
     isStarted(): boolean;
     start(): Promise<void>;
     stop(): Promise<void>;
-    hopEnabled(): boolean;
-    hopActive(): boolean;
     get [symbol](): true;
     get [Symbol.toStringTag](): string;
-    _onProtocol(data: IncomingStreamData): Promise<void>;
+    onHop({ connection, stream }: IncomingStreamData): Promise<void>;
+    onStop({ connection, stream }: IncomingStreamData): Promise<void>;
     /**
      * Dial a peer over a relay
      */
     dial(ma: Multiaddr, options?: AbortOptions): Promise<Connection>;
+    connectV2({ stream, connection, destinationPeer, destinationAddr, relayAddr, ma, disconnectOnFailure }: ConnectOptions): Promise<Connection>;
     /**
      * Create a listener
      */
@@ -48,4 +62,5 @@ export declare class Circuit implements Transport, Startable {
      */
     filter(multiaddrs: Multiaddr[]): Multiaddr[];
 }
+export {};
 //# sourceMappingURL=transport.d.ts.map

package/dist/src/circuit/transport.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transport.d.ts","sourceRoot":"","sources":["../../../src/circuit/transport.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAUxD,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAA;AAE9D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACtD,OAAO,KAAK,EAAE,kBAAkB,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAA;AAChF,OAAO,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,qBAAqB,EAAqB,MAAM,6BAA6B,CAAA;AAChH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAA;AAC9D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAM7C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAA;AAC7D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAA;AAC7E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAA;AACvD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAA;AAC7D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAA;AAIvE,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,MAAM,CAAA;IACd,SAAS,EAAE,SAAS,CAAA;IACpB,SAAS,EAAE,SAAS,CAAA;IACpB,iBAAiB,EAAE,iBAAiB,CAAA;IACpC,QAAQ,EAAE,QAAQ,CAAA;IAClB,cAAc,EAAE,cAAc,CAAA;CAC/B;AAED,qBAAa,OAAQ,YAAW,SAAS,EAAE,SAAS;IAClD,OAAO,CAAC,OAAO,CAAC,CAAmB;IACnC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAmB;IAC9C,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAa;IACnC,OAAO,CAAC,QAAQ,CAAS;gBAEZ,UAAU,EAAE,iBAAiB,EAAE,IAAI,EAAE,WAAW;IAM7D,SAAS;IAIH,KAAK,IAAK,OAAO,CAAC,IAAI,CAAC;IAiBvB,IAAI;IAIV,UAAU;IAIV,SAAS;IAIT,IAAI,CAAC,MAAM,CAAC,IAAK,IAAI,CAEpB;IAED,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,WAEvB;IAEK,WAAW,CAAE,IAAI,EAAE,kBAAkB;IA6F3C;;OAEG;IACG,IAAI,CAAE,EAAE,EAAE,SAAS,EAAE,OAAO,GAAE,YAAiB,GAAG,OAAO,CAAC,UAAU,CAAC;IA4D3E;;OAEG;IACH,cAAc,CAAE,OAAO,EAAE,qBAAqB,GAAG,QAAQ;IAUzD;;;;;OAKG;IACH,MAAM,CAAE,UAAU,EAAE,SAAS,EAAE,GAAG,SAAS,EAAE;CAO9C"}
+{"version":3,"file":"transport.d.ts","sourceRoot":"","sources":["../../../src/circuit/transport.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAA;AAEhF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACtD,OAAO,KAAK,EAAE,kBAAkB,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAA;AAChF,OAAO,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,qBAAqB,EAAqB,MAAM,6BAA6B,CAAA;AAChH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAA;AACtE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAC7C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAA;AAGvD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AACxD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAA;AAC7D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uCAAuC,CAAA;AACtE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAA;AAC7E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAA;AAMvE,MAAM,WAAW,cAAc;IAC7B,KAAK,CAAC,EAAE,MAAM,CAAA;CACf;AAED,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,MAAM,CAAA;IACd,SAAS,EAAE,SAAS,CAAA;IACpB,SAAS,EAAE,SAAS,CAAA;IACpB,iBAAiB,EAAE,iBAAiB,CAAA;IACpC,QAAQ,EAAE,QAAQ,CAAA;IAClB,cAAc,EAAE,cAAc,CAAA;IAC9B,gBAAgB,EAAE,gBAAgB,CAAA;CACnC;AAED,UAAU,cAAc;IACtB,MAAM,EAAE,MAAM,CAAA;IACd,UAAU,EAAE,UAAU,CAAA;IACtB,eAAe,EAAE,MAAM,CAAA;IACvB,eAAe,EAAE,SAAS,CAAA;IAC1B,SAAS,EAAE,SAAS,CAAA;IACpB,EAAE,EAAE,SAAS,CAAA;IACb,mBAAmB,EAAE,OAAO,CAAA;CAC7B;AAED,qBAAa,OAAQ,YAAW,SAAS,EAAE,SAAS;IAClD,OAAO,CAAC,OAAO,CAAC,CAAmB;IACnC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAmB;IAC9C,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAkB;IACnD,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAa;IACnC,OAAO,CAAC,QAAQ,CAAS;gBAEZ,UAAU,EAAE,iBAAiB,EAAE,OAAO,EAAE,WAAW;IAUhE,SAAS;IAIH,KAAK,IAAK,OAAO,CAAC,IAAI,CAAC;IAiCvB,IAAI;IAQV,IAAI,CAAC,MAAM,CAAC,IAAK,IAAI,CAEpB;IAED,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,WAEvB;IAEK,KAAK,CAAE,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,kBAAkB;IA2CjD,MAAM,CAAE,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,kBAAkB;IA6BxD;;OAEG;IACG,IAAI,CAAE,EAAE,EAAE,SAAS,EAAE,OAAO,GAAE,YAAiB,GAAG,OAAO,CAAC,UAAU,CAAC;IA6CrE,SAAS,CACb,EACE,MAAM,EAAE,UAAU,EAAE,eAAe,EACnC,eAAe,EAAE,SAAS,EAAE,EAAE,EAC9B,mBAAmB,EACpB,EAAE,cAAc;IAqCnB;;OAEG;IACH,cAAc,CAAE,OAAO,EAAE,qBAAqB,GAAG,QAAQ;IAUzD;;;;;OAKG;IACH,MAAM,CAAE,UAAU,EAAE,SAAS,EAAE,GAAG,SAAS,EAAE;CAO9C"}