libp2p 0.36.2-fab4f13 → 0.37.0-d5386df

package/dist/src/connection-manager/dialer/auto-dialer.js

@@ -0,0 +1,37 @@
+import { logger } from '@libp2p/logger';
+import { TimeoutController } from 'timeout-abort-controller';
+const log = logger('libp2p:dialer:auto-dialer');
+export class AutoDialer {
+    constructor(components, init) {
+        this.components = components;
+        this.enabled = init.enabled;
+        this.minConnections = init.minConnections;
+        this.dialTimeout = init.dialTimeout;
+    }
+    handle(evt) {
+        const { detail: peer } = evt;
+        if (!this.enabled) {
+            return;
+        }
+        const connections = this.components.getConnectionManager().getConnections(peer.id);
+        // If auto dialing is on and we have no connection to the peer, check if we should dial
+        if (connections.length === 0) {
+            const minConnections = this.minConnections ?? 0;
+            const allConnections = this.components.getConnectionManager().getConnections();
+            if (minConnections > allConnections.length) {
+                log('auto-dialing discovered peer %p with timeout %d', peer.id, this.dialTimeout);
+                const controller = new TimeoutController(this.dialTimeout);
+                void this.components.getConnectionManager().openConnection(peer.id, {
+                    signal: controller.signal
+                })
+                    .catch(err => {
+                    log.error('could not connect to discovered peer %p with %o', peer.id, err);
+                })
+                    .finally(() => {
+                    controller.clear();
+                });
+            }
+        }
+    }
+}
+//# sourceMappingURL=auto-dialer.js.map

package/dist/src/connection-manager/dialer/auto-dialer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"auto-dialer.js","sourceRoot":"","sources":["../../../../src/connection-manager/dialer/auto-dialer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AAEvC,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAA;AAE5D,MAAM,GAAG,GAAG,MAAM,CAAC,2BAA2B,CAAC,CAAA;AAQ/C,MAAM,OAAO,UAAU;IAMrB,YAAa,UAAsB,EAAE,IAAoB;QACvD,IAAI,CAAC,UAAU,GAAG,UAAU,CAAA;QAC5B,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAA;QAC3B,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,cAAc,CAAA;QACzC,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAA;IACrC,CAAC;IAEM,MAAM,CAAE,GAA0B;QACvC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,CAAA;QAE5B,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACjB,OAAM;SACP;QAED,MAAM,WAAW,GAAG,IAAI,CAAC,UAAU,CAAC,oBAAoB,EAAE,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QAElF,uFAAuF;QACvF,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE;YAC5B,MAAM,cAAc,GAAG,IAAI,CAAC,cAAc,IAAI,CAAC,CAAA;YAE/C,MAAM,cAAc,GAAG,IAAI,CAAC,UAAU,CAAC,oBAAoB,EAAE,CAAC,cAAc,EAAE,CAAA;YAE9E,IAAI,cAAc,GAAG,cAAc,CAAC,MAAM,EAAE;gBAC1C,GAAG,CAAC,iDAAiD,EAAE,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,WAAW,CAAC,CAAA;gBAEjF,MAAM,UAAU,GAAG,IAAI,iBAAiB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;gBAE1D,KAAK,IAAI,CAAC,UAAU,CAAC,oBAAoB,EAAE,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,EAAE;oBAClE,MAAM,EAAE,UAAU,CAAC,MAAM;iBAC1B,CAAC;qBACC,KAAK,CAAC,GAAG,CAAC,EAAE;oBACX,GAAG,CAAC,KAAK,CAAC,iDAAiD,EAAE,IAAI,CAAC,EAAE,EAAE,GAAG,CAAC,CAAA;gBAC5E,CAAC,CAAC;qBACD,OAAO,CAAC,GAAG,EAAE;oBACZ,UAAU,CAAC,KAAK,EAAE,CAAA;gBACpB,CAAC,CAAC,CAAA;aACL;SACF;IACH,CAAC;CACF"}

package/dist/src/{dialer → connection-manager/dialer}/dial-request.d.ts

@@ -1,14 +1,14 @@
 import type { Multiaddr } from '@multiformats/multiaddr';
 import type { Connection } from '@libp2p/interfaces/connection';
 import type { AbortOptions } from '@libp2p/interfaces';
-import type { DefaultDialer } from './index.js';
+import type { Dialer } from './index.js';
 export interface DialAction {
     (m: Multiaddr, options: AbortOptions): Promise<Connection>;
 }
 export interface DialRequestOptions {
     addrs: Multiaddr[];
     dialAction: DialAction;
-    dialer: DefaultDialer;
+    dialer: Dialer;
 }
 export declare class DialRequest {
     private readonly addrs;

package/dist/src/connection-manager/dialer/dial-request.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"dial-request.d.ts","sourceRoot":"","sources":["../../../../src/connection-manager/dialer/dial-request.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AACxD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAA;AAC/D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACtD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAIxC,MAAM,WAAW,UAAU;IACzB,CAAC,CAAC,EAAE,SAAS,EAAE,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,UAAU,CAAC,CAAA;CAC3D;AAED,MAAM,WAAW,kBAAkB;IACjC,KAAK,EAAE,SAAS,EAAE,CAAA;IAClB,UAAU,EAAE,UAAU,CAAA;IACtB,MAAM,EAAE,MAAM,CAAA;CACf;AAED,qBAAa,WAAW;IACtB,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAa;IACnC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAQ;IAC/B,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAY;IAEvC;;;;;;OAMG;gBACU,OAAO,EAAE,kBAAkB;IAYlC,GAAG,CAAE,OAAO,GAAE,YAAiB,GAAG,OAAO,CAAC,UAAU,CAAC;CA+D5D"}

package/dist/src/{dialer → connection-manager/dialer}/dial-request.js

@@ -3,7 +3,7 @@ import { anySignal } from 'any-signal';
 import FIFO from 'p-fifo';
 // @ts-expect-error setMaxListeners is missing from the node 16 types
 import { setMaxListeners } from 'events';
-import { codes } from '../errors.js';
+import { codes } from '../../errors.js';
 import { logger } from '@libp2p/logger';
 const log = logger('libp2p:dialer:dial-request');
 export class DialRequest {

package/dist/src/connection-manager/dialer/dial-request.js.map

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

package/dist/src/{dialer → connection-manager/dialer}/index.d.ts

@@ -1,11 +1,13 @@
-import { Multiaddr } from '@multiformats/multiaddr';
+import { Multiaddr, Resolver } from '@multiformats/multiaddr';
 import { TimeoutController } from 'timeout-abort-controller';
 import { DialRequest } from './dial-request.js';
 import type { Connection } from '@libp2p/interfaces/connection';
-import type { AbortOptions, Startable } from '@libp2p/interfaces';
+import type { AbortOptions } from '@libp2p/interfaces';
+import type { Startable } from '@libp2p/interfaces/startable';
 import type { PeerId } from '@libp2p/interfaces/peer-id';
-import type { Components } from '@libp2p/interfaces/components';
-import type { Dialer, DialerInit } from '@libp2p/interfaces/dialer';
+import { Components, Initializable } from '@libp2p/interfaces/components';
+import type { AddressSorter } from '@libp2p/interfaces/peer-store';
+import type { ComponentMetricsTracker } from '@libp2p/interfaces/metrics';
 export interface DialTarget {
     id: string;
     addrs: Multiaddr[];
@@ -20,8 +22,35 @@ export interface PendingDialTarget {
     resolve: (value: any) => void;
     reject: (err: Error) => void;
 }
-export declare class DefaultDialer implements Dialer, Startable {
-    private readonly components;
+export interface DialerInit {
+    /**
+     * Sort the known addresses of a peer before trying to dial
+     */
+    addressSorter?: AddressSorter;
+    /**
+     * Number of max concurrent dials
+     */
+    maxParallelDials?: number;
+    /**
+     * Number of max addresses to dial for a given peer
+     */
+    maxAddrsToDial?: number;
+    /**
+     * How long a dial attempt is allowed to take
+     */
+    dialTimeout?: number;
+    /**
+     * Number of max concurrent dials per peer
+     */
+    maxDialsPerPeer?: number;
+    /**
+     * Multiaddr resolvers to use when dialing
+     */
+    resolvers?: Record<string, Resolver>;
+    metrics?: ComponentMetricsTracker;
+}
+export declare class Dialer implements Startable, Initializable {
+    private components;
     private readonly addressSorter;
     private readonly maxAddrsToDial;
     private readonly timeout;
@@ -30,7 +59,8 @@ export declare class DefaultDialer implements Dialer, Startable {
     pendingDials: Map<string, PendingDial>;
     pendingDialTargets: Map<string, PendingDialTarget>;
     private started;
-    constructor(components: Components, init?: DialerInit);
+    constructor(init?: DialerInit);
+    init(components: Components): void;
     isStarted(): boolean;
     start(): Promise<void>;
     /**
@@ -43,7 +73,6 @@ export declare class DefaultDialer implements Dialer, Startable {
      * will be used.
      */
     dial(peer: PeerId | Multiaddr, options?: AbortOptions): Promise<Connection>;
-    dialProtocol(peer: PeerId | Multiaddr, protocols: string | string[], options?: AbortOptions): Promise<import("@libp2p/interfaces/connection").ProtocolStream>;
     /**
      * Connects to a given `peer` by dialing all of its known addresses.
      * The dial to the first address that is successfully able to upgrade a connection

package/dist/src/connection-manager/dialer/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/connection-manager/dialer/index.ts"],"names":[],"mappings":"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"}

package/dist/src/{dialer → connection-manager/dialer}/index.js

@@ -12,18 +12,19 @@ import { setMaxListeners } from 'events';
 import { DialRequest } from './dial-request.js';
 import { publicAddressesFirst } from '@libp2p/utils/address-sort';
 import { trackedMap } from '@libp2p/tracked-map';
-import { codes } from '../errors.js';
-import { DIAL_TIMEOUT, MAX_PARALLEL_DIALS, MAX_PER_PEER_DIALS, MAX_ADDRS_TO_DIAL } from '../constants.js';
-import { getPeer } from '../get-peer.js';
+import { codes } from '../../errors.js';
+import { DIAL_TIMEOUT, MAX_PARALLEL_DIALS, MAX_PER_PEER_DIALS, MAX_ADDRS_TO_DIAL } from '../../constants.js';
+import { getPeer } from '../../get-peer.js';
 import sort from 'it-sort';
+import { Components } from '@libp2p/interfaces/components';
 import map from 'it-map';
 const log = logger('libp2p:dialer');
 const METRICS_COMPONENT = 'dialler';
 const METRICS_PENDING_DIALS = 'pending-dials';
 const METRICS_PENDING_DIAL_TARGETS = 'pending-dial-targets';
-export class DefaultDialer {
-    constructor(components, init = {}) {
-        this.components = components;
+export class Dialer {
+    constructor(init = {}) {
+        this.components = new Components();
         this.started = false;
         this.addressSorter = init.addressSorter ?? publicAddressesFirst;
         this.maxAddrsToDial = init.maxAddrsToDial ?? MAX_ADDRS_TO_DIAL;
@@ -44,6 +45,9 @@ export class DefaultDialer {
             Multiaddr.resolvers.set(key, value);
         }
     }
+    init(components) {
+        this.components = components;
+    }
     isStarted() {
         return this.started;
     }
@@ -87,12 +91,6 @@ export class DefaultDialer {
         if (await this.components.getConnectionGater().denyDialPeer(id)) {
             throw errCode(new Error('The dial request is blocked by gater.allowDialPeer'), codes.ERR_PEER_DIAL_INTERCEPTED);
         }
-        log('dial to %p', id);
-        const existingConnection = this.components.getConnectionManager().getConnection(id);
-        if (existingConnection != null) {
-            log('had an existing connection to %p', id);
-            return existingConnection;
-        }
         log('creating dial target for %p', id);
         const dialTarget = await this._createCancellableDialTarget(id);
         if (dialTarget.addrs.length === 0) {
@@ -117,17 +115,6 @@ export class DefaultDialer {
             pendingDial.destroy();
         }
     }
-    async dialProtocol(peer, protocols, options = {}) {
-        if (protocols == null) {
-            throw errCode(new Error('no protocols were provided to open a stream'), codes.ERR_INVALID_PROTOCOLS_FOR_STREAM);
-        }
-        protocols = Array.isArray(protocols) ? protocols : [protocols];
-        if (protocols.length === 0) {
-            throw errCode(new Error('no protocols were provided to open a stream'), codes.ERR_INVALID_PROTOCOLS_FOR_STREAM);
-        }
-        const connection = await this.dial(peer, options);
-        return await connection.newStream(protocols);
-    }
     /**
      * Connects to a given `peer` by dialing all of its known addresses.
      * The dial to the first address that is successfully able to upgrade a connection

package/dist/src/connection-manager/dialer/index.js.map

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

package/dist/src/connection-manager/index.d.ts

@@ -1,22 +1,23 @@
 import { SummaryObject } from './latency-monitor.js';
-import { EventEmitter, Startable } from '@libp2p/interfaces';
+import type { AbortOptions } from '@libp2p/interfaces';
+import { EventEmitter } from '@libp2p/interfaces/events';
+import type { Startable } from '@libp2p/interfaces/startable';
 import { PeerId } from '@libp2p/interfaces/peer-id';
 import type { Connection } from '@libp2p/interfaces/connection';
-import type { ConnectionManager } from '@libp2p/interfaces/registrar';
-import type { Components } from '@libp2p/interfaces/components';
-export interface ConnectionManagerEvents {
-    'peer:connect': CustomEvent<PeerId>;
-    'peer:disconnect': CustomEvent<PeerId>;
-}
+import type { ConnectionManager } from '@libp2p/interfaces/connection-manager';
+import { Components, Initializable } from '@libp2p/interfaces/components';
+import { Dialer } from './dialer/index.js';
+import type { AddressSorter } from '@libp2p/interfaces/peer-store';
+import type { Resolver } from '@multiformats/multiaddr';
 export interface ConnectionManagerInit {
     /**
-     * The maximum number of connections allowed
+     * The maximum number of connections to keep open
      */
-    maxConnections?: number;
+    maxConnections: number;
     /**
-     * The minimum number of connections to avoid pruning
+     * The minimum number of connections to keep open
      */
-    minConnections?: number;
+    minConnections: number;
     /**
      * The max data (in and out), per average interval to allow
      */
@@ -46,32 +47,65 @@ export interface ConnectionManagerInit {
      */
     defaultPeerValue?: number;
     /**
-     * Should preemptively guarantee connections are above the low watermark
+     * If true, try to connect to all discovered peers up to the connection manager limit
      */
     autoDial?: boolean;
     /**
-     * How often, in milliseconds, it should preemptively guarantee connections are above the low watermark
+     * How long to wait between attempting to keep our number of concurrent connections
+     * above minConnections
+     */
+    autoDialInterval: number;
+    /**
+     * Sort the known addresses of a peer before trying to dial
+     */
+    addressSorter?: AddressSorter;
+    /**
+     * Number of max concurrent dials
+     */
+    maxParallelDials?: number;
+    /**
+     * Number of max addresses to dial for a given peer
+     */
+    maxAddrsToDial?: number;
+    /**
+     * How long a dial attempt is allowed to take
+     */
+    dialTimeout?: number;
+    /**
+     * Number of max concurrent dials per peer
      */
-    autoDialInterval?: number;
+    maxDialsPerPeer?: number;
+    /**
+     * Multiaddr resolvers to use when dialing
+     */
+    resolvers?: Record<string, Resolver>;
+}
+export interface ConnectionManagerEvents {
+    'peer:connect': CustomEvent<PeerId>;
+    'peer:disconnect': CustomEvent<PeerId>;
 }
 /**
  * Responsible for managing known connections.
  */
-export declare class DefaultConnectionManager extends EventEmitter<ConnectionManagerEvents> implements ConnectionManager, Startable {
-    private readonly components;
-    private readonly init;
+export declare class DefaultConnectionManager extends EventEmitter<ConnectionManagerEvents> implements ConnectionManager, Startable, Initializable {
+    readonly dialer: Dialer;
+    private components;
+    private readonly opts;
     private readonly peerValues;
     private readonly connections;
     private started;
     private timer?;
     private readonly latencyMonitor;
-    constructor(components: Components, init?: ConnectionManagerInit);
+    constructor(init: ConnectionManagerInit);
+    init(components: Components): void;
     isStarted(): boolean;
     /**
      * Starts the Connection Manager. If Metrics are not enabled on libp2p
      * only event loop and connection limits will be monitored.
      */
     start(): Promise<void>;
+    afterStart(): Promise<void>;
+    beforeStop(): Promise<void>;
     /**
      * Stops the Connection Manager
      */
@@ -92,21 +126,18 @@ export declare class DefaultConnectionManager extends EventEmitter<ConnectionMan
      * @private
      */
     _checkMetrics(): Promise<void>;
+    onConnect(evt: CustomEvent<Connection>): void;
     /**
      * Tracks the incoming connection and check the connection limit
      */
-    onConnect(evt: CustomEvent<Connection>): Promise<void>;
+    _onConnect(evt: CustomEvent<Connection>): Promise<void>;
     /**
      * Removes the connection from tracking
      */
     onDisconnect(evt: CustomEvent<Connection>): void;
-    getConnectionMap(): Map<string, Connection[]>;
-    getConnectionList(): Connection[];
-    getConnections(peerId: PeerId): Connection[];
-    /**
-     * Get a connection with a peer
-     */
-    getConnection(peerId: PeerId): Connection | undefined;
+    getConnections(peerId?: PeerId): Connection[];
+    openConnection(peerId: PeerId, options?: AbortOptions): Promise<Connection>;
+    closeConnections(peerId: PeerId): Promise<void>;
     /**
      * Get all open connections with a peer
      */

package/dist/src/connection-manager/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/connection-manager/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAkB,aAAa,EAAE,MAAM,sBAAsB,CAAA;AAGpE,OAAO,EAAe,YAAY,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AAGzE,OAAO,EAAY,MAAM,EAAE,MAAM,4BAA4B,CAAA;AAG7D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAA;AAC/D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAA;AACrE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAA;AAsB/D,MAAM,WAAW,uBAAuB;IACtC,cAAc,EAAE,WAAW,CAAC,MAAM,CAAC,CAAA;IACnC,iBAAiB,EAAE,WAAW,CAAC,MAAM,CAAC,CAAA;CACvC;AAED,MAAM,WAAW,qBAAqB;IACpC;;OAEG;IACH,cAAc,CAAC,EAAE,MAAM,CAAA;IAEvB;;OAEG;IACH,cAAc,CAAC,EAAE,MAAM,CAAA;IAEvB;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAA;IAEhB;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAA;IAEpB;;OAEG;IACH,eAAe,CAAC,EAAE,MAAM,CAAA;IAExB;;OAEG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAA;IAE1B;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAA;IAErB;;OAEG;IACH,qBAAqB,CAAC,EAAE,MAAM,CAAA;IAE9B;;OAEG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAA;IAEzB;;OAEG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAA;IAElB;;OAEG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAA;CAC1B;AAED;;GAEG;AACH,qBAAa,wBAAyB,SAAQ,YAAY,CAAC,uBAAuB,CAAE,YAAW,iBAAiB,EAAE,SAAS;IACzH,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAY;IACvC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAiC;IACtD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAqB;IAChD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA2B;IACvD,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,KAAK,CAAC,CAAqB;IACnC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAgB;gBAElC,UAAU,EAAE,UAAU,EAAE,IAAI,GAAE,qBAA0B;IAqDrE,SAAS;IAIT;;;OAGG;IACG,KAAK;IAcX;;OAEG;IACG,IAAI;IAWV;;OAEG;IACG,MAAM;IAcZ;;;OAGG;IACH,YAAY,CAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;IAQ3C;;;;;OAKG;IACG,aAAa;IAmBnB;;OAEG;IACG,SAAS,CAAE,GAAG,EAAE,WAAW,CAAC,UAAU,CAAC;IAgC7C;;OAEG;IACH,YAAY,CAAE,GAAG,EAAE,WAAW,CAAC,UAAU,CAAC;IAuB1C,gBAAgB,IAAK,GAAG,CAAC,MAAM,EAAE,UAAU,EAAE,CAAC;IAI9C,iBAAiB,IAAK,UAAU,EAAE;IAUlC,cAAc,CAAE,MAAM,EAAE,MAAM,GAAG,UAAU,EAAE;IAI7C;;OAEG;IACH,aAAa,CAAE,MAAM,EAAE,MAAM,GAAG,UAAU,GAAG,SAAS;IAUtD;;OAEG;IACH,MAAM,CAAE,MAAM,EAAE,MAAM,GAAG,UAAU,EAAE;IAgBrC;;OAEG;IACH,iBAAiB,CAAE,GAAG,EAAE,WAAW,CAAC,aAAa,CAAC;IASlD;;OAEG;IACG,cAAc,CAAE,IAAI,EAAE,MAAM,qBAAqB,EAAE,KAAK,EAAE,MAAM;IAStE;;;OAGG;IACG,mBAAmB;CA6B1B"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/connection-manager/index.ts"],"names":[],"mappings":"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"}

package/dist/src/connection-manager/index.js

@@ -4,13 +4,15 @@ import mergeOptions from 'merge-options';
 import { LatencyMonitor } from './latency-monitor.js';
 // @ts-expect-error retimer does not have types
 import retimer from 'retimer';
-import { CustomEvent, EventEmitter } from '@libp2p/interfaces';
+import { CustomEvent, EventEmitter } from '@libp2p/interfaces/events';
 import { trackedMap } from '@libp2p/tracked-map';
 import { codes } from '../errors.js';
 import { isPeerId } from '@libp2p/interfaces/peer-id';
 // @ts-expect-error setMaxListeners is missing from the node 16 types
 import { setMaxListeners } from 'events';
+import { Components } from '@libp2p/interfaces/components';
 import * as STATUS from '@libp2p/interfaces/connection/status';
+import { Dialer } from './dialer/index.js';
 const log = logger('libp2p:connection-manager');
 const defaultOptions = {
     maxConnections: Infinity,
@@ -31,14 +33,14 @@ const METRICS_PEER_VALUES = 'peer-values';
  * Responsible for managing known connections.
  */
 export class DefaultConnectionManager extends EventEmitter {
-    constructor(components, init = {}) {
+    constructor(init) {
         super();
-        this.components = components;
-        this.init = mergeOptions.call({ ignoreUndefined: true }, defaultOptions, init);
-        if (this.init.maxConnections < this.init.minConnections) {
+        this.components = new Components();
+        this.opts = mergeOptions.call({ ignoreUndefined: true }, defaultOptions, init);
+        if (this.opts.maxConnections < this.opts.minConnections) {
             throw errCode(new Error('Connection Manager maxConnections must be greater than minConnections'), codes.ERR_INVALID_PARAMETERS);
         }
-        log('options: %o', this.init);
+        log('options: %o', this.opts);
         /**
          * Map of peer identifiers to their peer value for pruning connections.
          *
@@ -68,12 +70,13 @@ export class DefaultConnectionManager extends EventEmitter {
             setMaxListeners?.(Infinity, this);
         }
         catch { }
-        this.components.getUpgrader().addEventListener('connection', (evt) => {
-            void this.onConnect(evt).catch(err => {
-                log.error(err);
-            });
-        });
-        this.components.getUpgrader().addEventListener('connectionEnd', this.onDisconnect.bind(this));
+        this.dialer = new Dialer(this.opts);
+        this.onConnect = this.onConnect.bind(this);
+        this.onDisconnect = this.onDisconnect.bind(this);
+    }
+    init(components) {
+        this.components = components;
+        this.dialer.init(components);
     }
     isStarted() {
         return this.started;
@@ -84,15 +87,24 @@ export class DefaultConnectionManager extends EventEmitter {
      */
     async start() {
         if (this.components.getMetrics() != null) {
-            this.timer = this.timer ?? retimer(this._checkMetrics, this.init.pollInterval);
+            this.timer = this.timer ?? retimer(this._checkMetrics, this.opts.pollInterval);
         }
         // latency monitor
         this.latencyMonitor.start();
         this._onLatencyMeasure = this._onLatencyMeasure.bind(this);
         this.latencyMonitor.addEventListener('data', this._onLatencyMeasure);
+        await this.dialer.start();
         this.started = true;
         log('started');
     }
+    async afterStart() {
+        this.components.getUpgrader().addEventListener('connection', this.onConnect);
+        this.components.getUpgrader().addEventListener('connectionEnd', this.onDisconnect);
+    }
+    async beforeStop() {
+        this.components.getUpgrader().removeEventListener('connection', this.onConnect);
+        this.components.getUpgrader().removeEventListener('connectionEnd', this.onDisconnect);
+    }
     /**
      * Stops the Connection Manager
      */
@@ -100,6 +112,7 @@ export class DefaultConnectionManager extends EventEmitter {
         this.timer?.clear();
         this.latencyMonitor.removeEventListener('data', this._onLatencyMeasure);
         this.latencyMonitor.stop();
+        await this.dialer.stop();
         this.started = false;
         await this._close();
         log('stopped');
@@ -140,23 +153,28 @@ export class DefaultConnectionManager extends EventEmitter {
         if (metrics != null) {
             try {
                 const movingAverages = metrics.getGlobal().getMovingAverages();
-                const received = movingAverages.dataReceived[this.init.movingAverageInterval].movingAverage;
+                const received = movingAverages.dataReceived[this.opts.movingAverageInterval].movingAverage;
                 await this._checkMaxLimit('maxReceivedData', received);
-                const sent = movingAverages.dataSent[this.init.movingAverageInterval].movingAverage;
+                const sent = movingAverages.dataSent[this.opts.movingAverageInterval].movingAverage;
                 await this._checkMaxLimit('maxSentData', sent);
                 const total = received + sent;
                 await this._checkMaxLimit('maxData', total);
-                log('metrics update', total);
+                log.trace('metrics update', total);
             }
             finally {
-                this.timer = retimer(this._checkMetrics, this.init.pollInterval);
+                this.timer = retimer(this._checkMetrics, this.opts.pollInterval);
             }
         }
     }
+    onConnect(evt) {
+        void this._onConnect(evt).catch(err => {
+            log.error(err);
+        });
+    }
     /**
      * Tracks the incoming connection and check the connection limit
      */
-    async onConnect(evt) {
+    async _onConnect(evt) {
         const { detail: connection } = evt;
         if (!this.started) {
             // This can happen when we are in the process of shutting down the node
@@ -166,7 +184,6 @@ export class DefaultConnectionManager extends EventEmitter {
         const peerId = connection.remotePeer;
         const peerIdStr = peerId.toString();
         const storedConns = this.connections.get(peerIdStr);
-        this.dispatchEvent(new CustomEvent('peer:connect', { detail: connection }));
         if (storedConns != null) {
             storedConns.push(connection);
         }
@@ -177,9 +194,10 @@ export class DefaultConnectionManager extends EventEmitter {
             await this.components.getPeerStore().keyBook.set(peerId, peerId.publicKey);
         }
         if (!this.peerValues.has(peerIdStr)) {
-            this.peerValues.set(peerIdStr, this.init.defaultPeerValue);
+            this.peerValues.set(peerIdStr, this.opts.defaultPeerValue);
         }
-        await this._checkMaxLimit('maxConnections', this.getConnectionList().length);
+        await this._checkMaxLimit('maxConnections', this.getConnections().length);
+        this.dispatchEvent(new CustomEvent('peer:connect', { detail: connection }));
     }
     /**
      * Removes the connection from tracking
@@ -203,28 +221,48 @@ export class DefaultConnectionManager extends EventEmitter {
             this.components.getMetrics()?.onPeerDisconnected(connection.remotePeer);
         }
     }
-    getConnectionMap() {
-        return this.connections;
-    }
-    getConnectionList() {
-        let output = [];
-        for (const connections of this.connections.values()) {
-            output = output.concat(connections);
-        }
-        return output;
-    }
     getConnections(peerId) {
-        return this.connections.get(peerId.toString()) ?? [];
+        if (peerId != null) {
+            return this.connections.get(peerId.toString()) ?? [];
+        }
+        let conns = [];
+        for (const c of this.connections.values()) {
+            conns = conns.concat(c);
+        }
+        return conns;
     }
-    /**
-     * Get a connection with a peer
-     */
-    getConnection(peerId) {
-        const connections = this.getAll(peerId);
-        if (connections.length > 0) {
-            return connections[0];
+    async openConnection(peerId, options) {
+        log('dial to %p', peerId);
+        const existingConnections = this.getConnections(peerId);
+        if (existingConnections.length > 0) {
+            log('had an existing connection to %p', peerId);
+            return existingConnections[0];
         }
-        return undefined;
+        const connection = await this.dialer.dial(peerId, options);
+        let peerConnections = this.connections.get(peerId.toString());
+        if (peerConnections == null) {
+            peerConnections = [];
+            this.connections.set(peerId.toString(), peerConnections);
+        }
+        // we get notified of connections via the Upgrader emitting "connection"
+        // events, double check we aren't already tracking this connection before
+        // storing it
+        let trackedConnection = false;
+        for (const conn of peerConnections) {
+            if (conn.id === connection.id) {
+                trackedConnection = true;
+            }
+        }
+        if (!trackedConnection) {
+            peerConnections.push(connection);
+        }
+        return connection;
+    }
+    async closeConnections(peerId) {
+        const connections = this.connections.get(peerId.toString()) ?? [];
+        await Promise.all(connections.map(async (connection) => {
+            return await connection.close();
+        }));
     }
     /**
      * Get all open connections with a peer
@@ -255,7 +293,7 @@ export class DefaultConnectionManager extends EventEmitter {
      * If the `value` of `name` has exceeded its limit, maybe close a connection
      */
     async _checkMaxLimit(name, value) {
-        const limit = this.init[name];
+        const limit = this.opts[name];
         log.trace('checking limit of %s. current value: %d of %d', name, value, limit);
         if (value > limit) {
             log('%s: limit exceeded: %p, %d', this.components.getPeerId(), name, value);
@@ -267,7 +305,7 @@ export class DefaultConnectionManager extends EventEmitter {
      * to the lowest valued peer.
      */
     async _maybeDisconnectOne() {
-        if (this.init.minConnections < this.connections.size) {
+        if (this.opts.minConnections < this.connections.size) {
             const peerValues = Array.from(new Map([...this.peerValues.entries()].sort((a, b) => a[1] - b[1])));
             log('%p: sorted peer values: %j', this.components.getPeerId(), peerValues);
             const disconnectPeer = peerValues[0];