libp2p 0.43.4 → 0.44.0-17eb162a

package/dist/src/connection-manager/dial-queue.js

@@ -0,0 +1,374 @@
+import { logger } from '@libp2p/logger';
+import { AbortError, CodeError } from '@libp2p/interfaces/errors';
+import { resolvers } from '@multiformats/multiaddr';
+import { TimeoutController } from 'timeout-abort-controller';
+import { publicAddressesFirst } from '@libp2p/utils/address-sort';
+import { codes } from '../errors.js';
+import { DIAL_TIMEOUT, MAX_PARALLEL_DIALS_PER_PEER, MAX_PARALLEL_DIALS, MAX_PEER_ADDRS_TO_DIAL } from './constants.js';
+import { getPeerAddress } from '../get-peer.js';
+import PQueue from 'p-queue';
+import { dnsaddrResolver } from '@multiformats/multiaddr/resolvers';
+import { combineSignals, resolveMultiaddrs } from './utils.js';
+import pDefer from 'p-defer';
+const log = logger('libp2p:connection-manager:dial-queue');
+const defaultOptions = {
+    addressSorter: publicAddressesFirst,
+    maxParallelDials: MAX_PARALLEL_DIALS,
+    maxPeerAddrsToDial: MAX_PEER_ADDRS_TO_DIAL,
+    maxParallelDialsPerPeer: MAX_PARALLEL_DIALS_PER_PEER,
+    dialTimeout: DIAL_TIMEOUT,
+    resolvers: {
+        dnsaddr: dnsaddrResolver
+    }
+};
+export class DialQueue {
+    constructor(components, init = {}) {
+        this.addressSorter = init.addressSorter ?? defaultOptions.addressSorter;
+        this.maxPeerAddrsToDial = init.maxPeerAddrsToDial ?? defaultOptions.maxPeerAddrsToDial;
+        this.maxParallelDialsPerPeer = init.maxParallelDialsPerPeer ?? defaultOptions.maxParallelDialsPerPeer;
+        this.dialTimeout = init.dialTimeout ?? defaultOptions.dialTimeout;
+        this.peerId = components.peerId;
+        this.peerStore = components.peerStore;
+        this.connectionGater = components.connectionGater;
+        this.transportManager = components.transportManager;
+        this.shutDownController = new AbortController();
+        this.pendingDialCount = components.metrics?.registerMetric('libp2p_dialler_pending_dials');
+        this.inProgressDialCount = components.metrics?.registerMetric('libp2p_dialler_in_progress_dials');
+        this.pendingDials = [];
+        for (const [key, value] of Object.entries(init.resolvers ?? {})) {
+            resolvers.set(key, value);
+        }
+        // controls dial concurrency
+        this.queue = new PQueue({
+            concurrency: init.maxParallelDials ?? defaultOptions.maxParallelDials
+        });
+        // a job was added to the queue
+        this.queue.on('add', () => {
+            this.pendingDialCount?.update(this.queue.size);
+            this.inProgressDialCount?.update(this.queue.pending);
+        });
+        // a queued job started
+        this.queue.on('active', () => {
+            this.pendingDialCount?.update(this.queue.size);
+            this.inProgressDialCount?.update(this.queue.pending);
+        });
+        // a started job completed without error
+        this.queue.on('completed', () => {
+            this.pendingDialCount?.update(this.queue.size);
+            this.inProgressDialCount?.update(this.queue.pending);
+        });
+        // a started job errored
+        this.queue.on('error', (err) => {
+            log.error('error in dial queue', err);
+            this.pendingDialCount?.update(this.queue.size);
+            this.inProgressDialCount?.update(this.queue.pending);
+        });
+        // all queued jobs have been started
+        this.queue.on('empty', () => {
+            this.pendingDialCount?.update(this.queue.size);
+            this.inProgressDialCount?.update(this.queue.pending);
+        });
+        // add started jobs have run and the queue is empty
+        this.queue.on('idle', () => {
+            this.pendingDialCount?.update(this.queue.size);
+            this.inProgressDialCount?.update(this.queue.pending);
+        });
+    }
+    /**
+     * Clears any pending dials
+     */
+    stop() {
+        this.shutDownController.abort();
+    }
+    /**
+     * Connects to a given peer, multiaddr or list of multiaddrs.
+     *
+     * If a peer is passed, all known multiaddrs will be tried. If a multiaddr or
+     * multiaddrs are passed only those will be dialled.
+     *
+     * Where a list of multiaddrs is passed, if any contain a peer id then all
+     * multiaddrs in the list must contain the same peer id.
+     *
+     * The dial to the first address that is successfully able to upgrade a connection
+     * will be used, all other dials will be aborted when that happens.
+     */
+    async dial(peerIdOrMultiaddr, options = {}) {
+        const { peerId, multiaddrs } = getPeerAddress(peerIdOrMultiaddr);
+        const addrs = multiaddrs.map(multiaddr => ({
+            multiaddr,
+            isCertified: false
+        }));
+        // create abort conditions - need to do this before `calculateMultiaddrs` as we may be about to
+        // resolve a dns addr which can time out
+        const { timeoutController, signal } = this.createDialAbortControllers(options.signal);
+        let addrsToDial;
+        try {
+            // load addresses from address book, resolve and dnsaddrs, filter undiallables, add peer IDs, etc
+            addrsToDial = await this.calculateMultiaddrs(peerId, addrs, {
+                ...options,
+                signal
+            });
+        }
+        catch (err) {
+            signal.clear();
+            timeoutController.clear();
+            throw err;
+        }
+        // ready to dial, all async work finished - make sure we don't have any
+        // pending dials in progress for this peer or set of multiaddrs
+        const existingDial = this.pendingDials.find(dial => {
+            // is the dial for the same peer id?
+            if (dial.peerId != null && peerId != null && dial.peerId.equals(peerId)) {
+                return true;
+            }
+            // is the dial for the same set of multiaddrs?
+            if (addrsToDial.map(({ multiaddr }) => multiaddr.toString()).join() === dial.multiaddrs.map(multiaddr => multiaddr.toString()).join()) {
+                return true;
+            }
+            return false;
+        });
+        if (existingDial != null) {
+            log('joining existing dial target for %p', peerId);
+            signal.clear();
+            timeoutController.clear();
+            return await existingDial.promise;
+        }
+        log('creating dial target for', addrsToDial.map(({ multiaddr }) => multiaddr.toString()));
+        // @ts-expect-error .promise property is set below
+        const pendingDial = {
+            id: randomId(),
+            status: 'queued',
+            peerId,
+            multiaddrs: addrsToDial.map(({ multiaddr }) => multiaddr)
+        };
+        pendingDial.promise = this.performDial(pendingDial, {
+            ...options,
+            signal
+        })
+            .finally(() => {
+            // remove our pending dial entry
+            this.pendingDials = this.pendingDials.filter(p => p.id !== pendingDial.id);
+            // clean up abort signals/controllers
+            signal.clear();
+            timeoutController.clear();
+        })
+            .catch(err => {
+            log.error('dial failed to %s', addrsToDial.map(({ multiaddr }) => multiaddr.toString()).join(', '), err);
+            // Error is a timeout
+            if (timeoutController.signal.aborted) {
+                const error = new CodeError(err.message, codes.ERR_TIMEOUT);
+                throw error;
+            }
+            throw err;
+        });
+        // let other dials join this one
+        this.pendingDials.push(pendingDial);
+        return await pendingDial.promise;
+    }
+    createDialAbortControllers(userSignal) {
+        // ensure we throw if the dial takes longer than the dial timeout
+        const timeoutController = new TimeoutController(this.dialTimeout);
+        // let any signal abort the dial
+        const signal = combineSignals(timeoutController.signal, this.shutDownController.signal, userSignal);
+        return { timeoutController, signal };
+    }
+    async calculateMultiaddrs(peerId, addrs = [], options = {}) {
+        // if a peer id or multiaddr(s) with a peer id, make sure it isn't our peer id and that we are allowed to dial it
+        if (peerId != null) {
+            if (this.peerId.equals(peerId)) {
+                throw new CodeError('Tried to dial self', codes.ERR_DIALED_SELF);
+            }
+            if ((await this.connectionGater.denyDialPeer?.(peerId)) === true) {
+                throw new CodeError('The dial request is blocked by gater.allowDialPeer', codes.ERR_PEER_DIAL_INTERCEPTED);
+            }
+            // if just a peer id was passed, load available multiaddrs for this peer from the address book
+            if (addrs.length === 0) {
+                log('loading multiaddrs for %p', peerId);
+                try {
+                    const peer = await this.peerStore.get(peerId);
+                    addrs.push(...peer.addresses);
+                    log('loaded multiaddrs for %p', peerId, addrs.map(({ multiaddr }) => multiaddr.toString()));
+                }
+                catch (err) {
+                    if (err.code !== codes.ERR_NOT_FOUND) {
+                        throw err;
+                    }
+                }
+            }
+        }
+        // resolve addresses - this can result in a one-to-many translation when dnsaddrs are resolved
+        const resolvedAddresses = (await Promise.all(addrs.map(async (addr) => {
+            const result = await resolveMultiaddrs(addr.multiaddr, options);
+            if (result.length === 1 && result[0].equals(addr.multiaddr)) {
+                return addr;
+            }
+            return result.map(multiaddr => ({
+                multiaddr,
+                isCertified: false
+            }));
+        })))
+            .flat();
+        // filter out any multiaddrs that we do not have transports for
+        const filteredAddrs = resolvedAddresses.filter(addr => Boolean(this.transportManager.transportForMultiaddr(addr.multiaddr)));
+        // deduplicate addresses
+        const dedupedAddrs = new Map();
+        for (const addr of filteredAddrs) {
+            const maStr = addr.multiaddr.toString();
+            const existing = dedupedAddrs.get(maStr);
+            if (existing != null) {
+                existing.isCertified = existing.isCertified || addr.isCertified || false;
+                continue;
+            }
+            dedupedAddrs.set(maStr, addr);
+        }
+        let dedupedMultiaddrs = [...dedupedAddrs.values()];
+        if (dedupedMultiaddrs.length === 0 || dedupedMultiaddrs.length > this.maxPeerAddrsToDial) {
+            log('addresses for %p before filtering', peerId ?? 'unknown peer', resolvedAddresses.map(({ multiaddr }) => multiaddr.toString()));
+            log('addresses for %p after filtering', peerId ?? 'unknown peer', dedupedMultiaddrs.map(({ multiaddr }) => multiaddr.toString()));
+        }
+        // make sure we actually have some addresses to dial
+        if (dedupedMultiaddrs.length === 0) {
+            throw new CodeError('The dial request has no valid addresses', codes.ERR_NO_VALID_ADDRESSES);
+        }
+        // make sure we don't have too many addresses to dial
+        if (dedupedMultiaddrs.length > this.maxPeerAddrsToDial) {
+            throw new CodeError('dial with more addresses than allowed', codes.ERR_TOO_MANY_ADDRESSES);
+        }
+        // ensure the peer id is appended to the multiaddr
+        if (peerId != null) {
+            const peerIdMultiaddr = `/p2p/${peerId.toString()}`;
+            dedupedMultiaddrs = dedupedMultiaddrs.map(addr => {
+                const addressPeerId = addr.multiaddr.getPeerId();
+                const lastProto = addr.multiaddr.protos().pop();
+                // do not append peer id to path multiaddrs
+                if (lastProto?.path === true) {
+                    return addr;
+                }
+                // append peer id to multiaddr if it is not already present
+                if (addressPeerId !== peerId.toString()) {
+                    return {
+                        multiaddr: addr.multiaddr.encapsulate(peerIdMultiaddr),
+                        isCertified: addr.isCertified
+                    };
+                }
+                return addr;
+            });
+        }
+        const gatedAdrs = [];
+        for (const addr of dedupedMultiaddrs) {
+            if (this.connectionGater.denyDialMultiaddr != null && await this.connectionGater.denyDialMultiaddr(addr.multiaddr)) {
+                continue;
+            }
+            gatedAdrs.push(addr);
+        }
+        return gatedAdrs.sort(this.addressSorter);
+    }
+    async performDial(pendingDial, options = {}) {
+        const dialAbortControllers = pendingDial.multiaddrs.map(() => new AbortController());
+        try {
+            // internal peer dial queue to ensure we only dial the configured number of addresses
+            // per peer at the same time to prevent one peer with a lot of addresses swamping
+            // the dial queue
+            const peerDialQueue = new PQueue({
+                concurrency: this.maxParallelDialsPerPeer
+            });
+            peerDialQueue.on('error', (err) => {
+                log.error('error dialling', err);
+            });
+            const conn = await Promise.any(pendingDial.multiaddrs.map(async (addr, i) => {
+                const controller = dialAbortControllers[i];
+                if (controller == null) {
+                    throw new CodeError('dialAction did not come with an AbortController', codes.ERR_INVALID_PARAMETERS);
+                }
+                // let any signal abort the dial
+                const signal = combineSignals(controller.signal, options.signal);
+                signal.addEventListener('abort', () => {
+                    log('dial to %s aborted', addr);
+                });
+                const deferred = pDefer();
+                await peerDialQueue.add(async () => {
+                    if (signal.aborted) {
+                        log('dial to %s was aborted before reaching the head of the peer dial queue', addr);
+                        deferred.reject(new AbortError());
+                        return;
+                    }
+                    // add the individual dial to the dial queue so we don't breach maxConcurrentDials
+                    await this.queue.add(async () => {
+                        try {
+                            if (signal.aborted) {
+                                log('dial to %s was aborted before reaching the head of the dial queue', addr);
+                                deferred.reject(new AbortError());
+                                return;
+                            }
+                            // update dial status
+                            pendingDial.status = 'active';
+                            const conn = await this.transportManager.dial(addr, {
+                                ...options,
+                                signal
+                            });
+                            if (controller.signal.aborted) {
+                                // another dial succeeded faster than this one
+                                log('multiple dials succeeded, closing superfluous connection');
+                                conn.close().catch(err => {
+                                    log.error('error closing superfluous connection', err);
+                                });
+                                deferred.reject(new AbortError());
+                                return;
+                            }
+                            // remove the successful AbortController so it is not aborted
+                            dialAbortControllers[i] = undefined;
+                            // immediately abort any other dials
+                            dialAbortControllers.forEach(c => {
+                                if (c !== undefined) {
+                                    c.abort();
+                                }
+                            });
+                            log('dial to %s succeeded', addr);
+                            // resolve the connection promise
+                            deferred.resolve(conn);
+                        }
+                        catch (err) {
+                            // something only went wrong if our signal was not aborted
+                            log.error('error during dial of %s', addr, err);
+                            deferred.reject(err);
+                        }
+                    }, {
+                        ...options,
+                        signal
+                    }).catch(err => {
+                        deferred.reject(err);
+                    });
+                }, {
+                    signal
+                }).catch(err => {
+                    deferred.reject(err);
+                }).finally(() => {
+                    signal.clear();
+                });
+                return await deferred.promise;
+            }));
+            // dial succeeded or failed
+            if (conn == null) {
+                throw new CodeError('successful dial led to empty object returned from peer dial queue', codes.ERR_TRANSPORT_DIAL_FAILED);
+            }
+            pendingDial.status = 'success';
+            return conn;
+        }
+        catch (err) {
+            pendingDial.status = 'error';
+            // if we only dialled one address, unwrap the AggregateError to provide more
+            // useful feedback to the user
+            if (pendingDial.multiaddrs.length === 1 && err.name === 'AggregateError') {
+                throw err.errors[0];
+            }
+            throw err;
+        }
+    }
+}
+/**
+ * Returns a random string
+ */
+function randomId() {
+    return `${(parseInt(String(Math.random() * 1e9), 10)).toString()}${Date.now()}`;
+}
+//# sourceMappingURL=dial-queue.js.map

package/dist/src/connection-manager/dial-queue.js.map

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

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

@@ -1,48 +1,69 @@
-import { SummaryObject } from './latency-monitor.js';
 import type { AbortOptions } from '@libp2p/interfaces';
-import { EventEmitter } from '@libp2p/interfaces/events';
+import type { EventEmitter } from '@libp2p/interfaces/events';
 import type { Startable } from '@libp2p/interfaces/startable';
-import { PeerId } from '@libp2p/interface-peer-id';
+import type { PeerId } from '@libp2p/interface-peer-id';
 import type { Connection, MultiaddrConnection } from '@libp2p/interface-connection';
-import type { ConnectionManager, ConnectionManagerEvents, Dialer } from '@libp2p/interface-connection-manager';
-import type { AddressSorter, PeerStore } from '@libp2p/interface-peer-store';
+import type { ConnectionManager } from '@libp2p/interface-connection-manager';
+import type { PeerStore } from '@libp2p/interface-peer-store';
 import { Multiaddr, Resolver } from '@multiformats/multiaddr';
 import type { Metrics } from '@libp2p/interface-metrics';
-import type { Upgrader } from '@libp2p/interface-transport';
-export interface ConnectionManagerConfig {
+import type { TransportManager } from '@libp2p/interface-transport';
+import { AutoDial } from './auto-dial.js';
+import { DialQueue } from './dial-queue.js';
+import { ConnectionPruner } from './connection-pruner.js';
+import type { ConnectionGater } from '@libp2p/interface-connection-gater';
+import { PeerMap } from '@libp2p/peer-collections';
+import type { PendingDial, AddressSorter, Libp2pEvents } from '@libp2p/interface-libp2p';
+export interface ConnectionManagerInit {
     /**
-     * The maximum number of connections libp2p is willing to have before it starts disconnecting. Defaults to `Infinity`
+     * The maximum number of connections libp2p is willing to have before it starts
+     * pruning connections to reduce resource usage. (default: 300)
      */
-    maxConnections: number;
+    maxConnections?: number;
     /**
-     * The minimum number of connections below which libp2p not activate preemptive disconnections. Defaults to `0`.
+     * The minimum number of connections below which libp2p will start to dial peers
+     * from the peer book. Setting this to 0 effectively disables this behaviour.
+     * (default: 50)
      */
-    minConnections: number;
+    minConnections?: number;
     /**
-     * Sets the maximum event loop delay (measured in milliseconds) this node is willing to endure before it starts disconnecting peers. Defaults to `Infinity`.
+     * How long to wait between attempting to keep our number of concurrent connections
+     * above minConnections (default: 5000)
      */
-    maxEventLoopDelay?: number;
+    autoDialInterval?: number;
     /**
-     * Sets the poll interval (in milliseconds) for assessing the current state and determining if this peer needs to force a disconnect. Defaults to `2000` (2 seconds).
+     * When dialling peers from the peer book to keep the number of open connections
+     * above `minConnections`, add dials for this many peers to the dial queue
+     * at once. (default: 25)
      */
-    pollInterval?: number;
+    autoDialConcurrency?: number;
     /**
-     * How long to wait between attempting to keep our number of concurrent connections
-     * above minConnections
+     * To allow user dials to take priority over auto dials, use this value as the
+     * dial priority. (default: 0)
      */
-    autoDialInterval: number;
+    autoDialPriority?: number;
     /**
-     * Sort the known addresses of a peer before trying to dial
+     * Sort the known addresses of a peer before trying to dial, By default public
+     * addresses will be dialled before private (e.g. loopback or LAN) addresses.
      */
     addressSorter?: AddressSorter;
     /**
-     * Number of max concurrent dials
+     * The maximum number of dials across all peers to execute in parallel.
+     * (default: 100)
      */
     maxParallelDials?: number;
     /**
-     * Number of max addresses to dial for a given peer
+     * To prevent individual peers with large amounts of multiaddrs swamping the
+     * dial queue, this value controls how many addresses to dial in parallel per
+     * peer. So for example if two peers have 10 addresses and this value is set
+     * at 5, we will dial 5 addresses from each at a time. (default: 10)
+     */
+    maxParallelDialsPerPeer?: number;
+    /**
+     * Maximum number of addresses allowed for a given peer - if a peer has more
+     * addresses than this then the dial will fail. (default: 25)
      */
-    maxAddrsToDial?: number;
+    maxPeerAddrsToDial?: number;
     /**
      * How long a dial attempt is allowed to take, including DNS resolution
      * of the multiaddr, opening a socket and upgrading it to a Connection.
@@ -50,22 +71,13 @@ export interface ConnectionManagerConfig {
     dialTimeout?: number;
     /**
      * When a new inbound connection is opened, the upgrade process (e.g. protect,
-     * encrypt, multiplex etc) must complete within this number of ms.
-     */
-    inboundUpgradeTimeout: number;
-    /**
-     * Number of max concurrent dials per peer
+     * encrypt, multiplex etc) must complete within this number of ms. (default: 30s)
      */
-    maxDialsPerPeer?: number;
+    inboundUpgradeTimeout?: number;
     /**
-     * Multiaddr resolvers to use when dialing
+     * Multiaddr resolvers to use when dialling
      */
     resolvers?: Record<string, Resolver>;
-    /**
-     * On startup we try to dial any peer that has previously been
-     * tagged with KEEP_ALIVE up to this timeout in ms. (default: 60000)
-     */
-    startupReconnectTimeout?: number;
     /**
      * A list of multiaddrs that will always be allowed (except if they are in the
      * deny list) to open connections to this node even if we've reached maxConnections
@@ -78,40 +90,46 @@ export interface ConnectionManagerConfig {
     deny?: string[];
     /**
      * If more than this many connections are opened per second by a single
-     * host, reject subsequent connections
+     * host, reject subsequent connections. (default: 5)
      */
     inboundConnectionThreshold?: number;
     /**
      * The maximum number of parallel incoming connections allowed that have yet to
-     * complete the connection upgrade - e.g. choosing connection encryption, muxer, etc
+     * complete the connection upgrade - e.g. choosing connection encryption, muxer, etc.
+     * (default: 10)
      */
     maxIncomingPendingConnections?: number;
 }
 export interface DefaultConnectionManagerComponents {
     peerId: PeerId;
     metrics?: Metrics;
-    upgrader: Upgrader;
     peerStore: PeerStore;
-    dialer: Dialer;
+    transportManager: TransportManager;
+    connectionGater: ConnectionGater;
+    events: EventEmitter<Libp2pEvents>;
+}
+export interface OpenConnectionOptions extends AbortOptions {
+    priority?: number;
 }
-export type ConnectionManagerInit = ConnectionManagerConfig;
 /**
  * Responsible for managing known connections.
  */
-export declare class DefaultConnectionManager extends EventEmitter<ConnectionManagerEvents> implements ConnectionManager, Startable {
-    private readonly components;
-    private readonly opts;
-    private readonly connections;
+export declare class DefaultConnectionManager implements ConnectionManager, Startable {
     private started;
-    private readonly latencyMonitor?;
-    private readonly startupReconnectTimeout;
-    private connectOnStartupController?;
-    private readonly dialTimeout;
+    private readonly connections;
     private readonly allow;
     private readonly deny;
-    private readonly inboundConnectionRateLimiter;
+    private readonly maxIncomingPendingConnections;
     private incomingPendingConnections;
-    constructor(components: DefaultConnectionManagerComponents, init: ConnectionManagerConfig);
+    private readonly maxConnections;
+    readonly dialQueue: DialQueue;
+    readonly autoDial: AutoDial;
+    readonly connectionPruner: ConnectionPruner;
+    private readonly inboundConnectionRateLimiter;
+    private readonly peerStore;
+    private readonly metrics?;
+    private readonly events;
+    constructor(components: DefaultConnectionManagerComponents, init?: ConnectionManagerInit);
     isStarted(): boolean;
     /**
      * Starts the Connection Manager. If Metrics are not enabled on libp2p
@@ -119,15 +137,10 @@ export declare class DefaultConnectionManager extends EventEmitter<ConnectionMan
      */
     start(): Promise<void>;
     afterStart(): Promise<void>;
-    beforeStop(): Promise<void>;
     /**
      * Stops the Connection Manager
      */
     stop(): Promise<void>;
-    /**
-     * Cleans up the connections
-     */
-    _close(): Promise<void>;
     onConnect(evt: CustomEvent<Connection>): void;
     /**
      * Tracks the incoming connection and check the connection limit
@@ -138,27 +151,11 @@ export declare class DefaultConnectionManager extends EventEmitter<ConnectionMan
      */
     onDisconnect(evt: CustomEvent<Connection>): void;
     getConnections(peerId?: PeerId): Connection[];
-    getConnectionsMap(): Map<string, Connection[]>;
-    openConnection(peerIdOrMultiaddr: PeerId | Multiaddr | Multiaddr[], options?: AbortOptions): Promise<Connection>;
+    getConnectionsMap(): PeerMap<Connection[]>;
+    openConnection(peerIdOrMultiaddr: PeerId | Multiaddr | Multiaddr[], options?: OpenConnectionOptions): Promise<Connection>;
     closeConnections(peerId: PeerId): Promise<void>;
-    /**
-     * Get all open connections with a peer
-     */
-    getAll(peerId: PeerId): Connection[];
-    /**
-     * If the event loop is slow, maybe close a connection
-     */
-    _onLatencyMeasure(evt: CustomEvent<SummaryObject>): void;
-    /**
-     * If the `value` of `name` has exceeded its limit, maybe close a connection
-     */
-    _checkMaxLimit(name: keyof ConnectionManagerInit, value: number, toPrune?: number): Promise<void>;
-    /**
-     * If we have more connections than our maximum, select some excess connections
-     * to prune based on peer value
-     */
-    _pruneConnections(toPrune: number): Promise<void>;
     acceptIncomingConnection(maConn: MultiaddrConnection): Promise<boolean>;
     afterUpgradeInbound(): void;
+    getDialQueue(): PendingDial[];
 }
 //# sourceMappingURL=index.d.ts.map

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