libp2p 0.43.4 → 0.44.0

package/src/connection-manager/utils.ts

@@ -0,0 +1,76 @@
+import { AbortOptions, multiaddr } from '@multiformats/multiaddr'
+import type { Multiaddr } from '@multiformats/multiaddr'
+import { logger } from '@libp2p/logger'
+import { ClearableSignal, anySignal } from 'any-signal'
+import { setMaxListeners } from 'events'
+
+const log = logger('libp2p:connection-manager:utils')
+
+/**
+ * Resolve multiaddr recursively
+ */
+export async function resolveMultiaddrs (ma: Multiaddr, options: AbortOptions): Promise<Multiaddr[]> {
+  // TODO: recursive logic should live in multiaddr once dns4/dns6 support is in place
+  // Now only supporting resolve for dnsaddr
+  const resolvableProto = ma.protoNames().includes('dnsaddr')
+
+  // Multiaddr is not resolvable? End recursion!
+  if (!resolvableProto) {
+    return [ma]
+  }
+
+  const resolvedMultiaddrs = await resolveRecord(ma, options)
+  const recursiveMultiaddrs = await Promise.all(resolvedMultiaddrs.map(async (nm) => {
+    return await resolveMultiaddrs(nm, options)
+  }))
+
+  const addrs = recursiveMultiaddrs.flat()
+  const output = addrs.reduce<Multiaddr[]>((array, newM) => {
+    if (array.find(m => m.equals(newM)) == null) {
+      array.push(newM)
+    }
+    return array
+  }, ([]))
+
+  log('resolved %s to', ma, output.map(ma => ma.toString()))
+
+  return output
+}
+
+/**
+ * Resolve a given multiaddr. If this fails, an empty array will be returned
+ */
+async function resolveRecord (ma: Multiaddr, options: AbortOptions): Promise<Multiaddr[]> {
+  try {
+    ma = multiaddr(ma.toString()) // Use current multiaddr module
+    const multiaddrs = await ma.resolve(options)
+    return multiaddrs
+  } catch (err) {
+    log.error(`multiaddr ${ma.toString()} could not be resolved`, err)
+    return []
+  }
+}
+
+export function combineSignals (...signals: Array<AbortSignal | undefined>): ClearableSignal {
+  const sigs: AbortSignal[] = []
+
+  for (const sig of signals) {
+    if (sig != null) {
+      try {
+        // fails on node < 15.4
+        setMaxListeners?.(Infinity, sig)
+      } catch { }
+      sigs.push(sig)
+    }
+  }
+
+  // let any signal abort the dial
+  const signal = anySignal(sigs)
+
+  try {
+    // fails on node < 15.4
+    setMaxListeners?.(Infinity, signal)
+  } catch {}
+
+  return signal
+}

package/src/fetch/index.ts

@@ -127,9 +127,9 @@ export class FetchService implements Startable {
 
       const result = await pipe(
         [FetchRequest.encode({ identifier: key })],
-        lp.encode(),
+        (source) => lp.encode(source),
         source,
-        lp.decode(),
+        (source) => lp.decode(source),
         async function (source) {
           const buf = await first(source)
 
@@ -184,7 +184,7 @@ export class FetchService implements Startable {
 
     await pipe(
       stream,
-      lp.decode(),
+      (source) => lp.decode(source),
       async function * (source) {
         const buf = await first(source)
 
@@ -215,7 +215,7 @@ export class FetchService implements Startable {
 
         yield FetchResponse.encode(response)
       },
-      lp.encode(),
+      (source) => lp.encode(source),
       stream
     )
   }

package/src/identify/index.ts

@@ -197,7 +197,7 @@ export class IdentifyService implements Startable {
             signedPeerRecord,
             protocols
           })],
-          lp.encode()
+          (source) => lp.encode(source)
         ))
       } catch (err: any) {
         // Just log errors
@@ -266,7 +266,7 @@ export class IdentifyService implements Startable {
       const data = await pipe(
         [],
         source,
-        lp.decode({
+        (source) => lp.decode(source, {
           maxDataLength: this.init.maxIdentifyMessageSize ?? MAX_IDENTIFY_MESSAGE_SIZE
         }),
         async (source) => await first(source)
@@ -348,7 +348,7 @@ export class IdentifyService implements Startable {
             await this.components.peerStore.metadataBook.setValue(id, 'ProtocolVersion', uint8ArrayFromString(protocolVersion))
           }
 
-          log('identify completed for peer %p with and protocols %o', id, protocols)
+          log('identify completed for peer %p with protocols %o', id, protocols)
 
           return
         }
@@ -431,7 +431,7 @@ export class IdentifyService implements Startable {
       // make stream abortable
       const source = abortableDuplex(stream, timeoutController.signal)
 
-      const msgWithLenPrefix = pipe([message], lp.encode())
+      const msgWithLenPrefix = pipe([message], (source) => lp.encode(source))
       await source.sink(msgWithLenPrefix)
     } catch (err: any) {
       log.error('could not respond to identify request', err)
@@ -461,7 +461,7 @@ export class IdentifyService implements Startable {
       const data = await pipe(
         [],
         source,
-        lp.decode({
+        (source) => lp.decode(source, {
           maxDataLength: this.init.maxIdentifyMessageSize ?? MAX_IDENTIFY_MESSAGE_SIZE
         }),
         async (source) => await first(source)

package/src/insecure/index.ts

@@ -71,8 +71,12 @@ async function encrypt (localId: PeerId, conn: Duplex<Uint8Array>, remoteId?: Pe
   log('write pubkey exchange to peer %p', remoteId)
 
   // Get the Exchange message
-  // @ts-expect-error needs to be generator
   const response = (await lp.decode.fromReader(shake.reader).next()).value
+
+  if (response == null) {
+    throw new Error('Did not read response')
+  }
+
   const id = Exchange.decode(response)
   log('read pubkey exchange from peer %p', remoteId)
 

package/src/libp2p.ts

@@ -9,7 +9,6 @@ import { CompoundContentRouting } from './content-routing/index.js'
 import { codes } from './errors.js'
 import { DefaultAddressManager } from './address-manager/index.js'
 import { DefaultConnectionManager } from './connection-manager/index.js'
-import { AutoDialler } from './connection-manager/auto-dialler.js'
 import { DefaultKeyChain } from '@libp2p/keychain'
 import { DefaultTransportManager } from './transport-manager.js'
 import { DefaultUpgrader } from './upgrader.js'
@@ -46,7 +45,6 @@ import type { Metrics } from '@libp2p/interface-metrics'
 import { DummyDHT } from './dht/dummy-dht.js'
 import { DummyPubSub } from './pubsub/dummy-pubsub.js'
 import { PeerSet } from '@libp2p/peer-collections'
-import { DefaultDialer } from './connection-manager/dialer/index.js'
 import { peerIdFromString } from '@libp2p/peer-id'
 import type { Datastore } from 'interface-datastore'
 import type { KeyChain } from '@libp2p/interface-keychain'
@@ -55,6 +53,15 @@ import type { CircuitRelayService } from './circuit-relay/index.js'
 
 const log = logger('libp2p')
 
+export type PendingDialStatus = 'queued' | 'active' | 'error' | 'success'
+
+export interface PendingDial {
+  id: string
+  status: PendingDialStatus
+  peerId?: PeerId
+  multiaddrs: Multiaddr[]
+}
+
 export class Libp2pNode extends EventEmitter<Libp2pEvents> implements Libp2p {
   public peerId: PeerId
   public dht: DualDHT
@@ -131,8 +138,8 @@ export class Libp2pNode extends EventEmitter<Libp2pEvents> implements Libp2p {
       inboundUpgradeTimeout: init.connectionManager.inboundUpgradeTimeout
     })
 
-    // Create the dialer
-    this.components.dialer = new DefaultDialer(this.components, init.connectionManager)
+    // Setup the transport manager
+    this.components.transportManager = new DefaultTransportManager(this.components, init.transportManager)
 
     // Create the Connection Manager
     this.connectionManager = this.components.connectionManager = new DefaultConnectionManager(this.components, init.connectionManager)
@@ -148,9 +155,6 @@ export class Libp2pNode extends EventEmitter<Libp2pEvents> implements Libp2p {
     // Create the Registrar
     this.registrar = this.components.registrar = new DefaultRegistrar(this.components)
 
-    // Setup the transport manager
-    this.components.transportManager = new DefaultTransportManager(this.components, init.transportManager)
-
     // Addresses {listen, announce, noAnnounce}
     this.components.addressManager = new DefaultAddressManager(this.components, init.addresses)
 
@@ -230,11 +234,6 @@ export class Libp2pNode extends EventEmitter<Libp2pEvents> implements Libp2p {
       ...init.autonat
     }))
 
-    this.configureComponent(new AutoDialler(this.components, {
-      minConnections: init.connectionManager.minConnections,
-      autoDialInterval: init.connectionManager.autoDialInterval
-    }))
-
     if (init.relay != null) {
       this.circuitService = this.configureComponent(init.relay(this.components))
     }
@@ -354,6 +353,10 @@ export class Libp2pNode extends EventEmitter<Libp2pEvents> implements Libp2p {
     return this.components.connectionManager.getConnections(peerId)
   }
 
+  getDialQueue (): PendingDial[] {
+    return this.components.connectionManager.getDialQueue()
+  }
+
   getPeers (): PeerId[] {
     const peerSet = new PeerSet()
 
@@ -365,7 +368,6 @@ export class Libp2pNode extends EventEmitter<Libp2pEvents> implements Libp2p {
   }
 
   async dial (peer: PeerId | Multiaddr | Multiaddr[], options: AbortOptions = {}): Promise<Connection> {
-    // @ts-expect-error
     return await this.components.connectionManager.openConnection(peer, options)
   }
 
@@ -493,8 +495,8 @@ export class Libp2pNode extends EventEmitter<Libp2pEvents> implements Libp2p {
   }
 
   /**
-   * Called whenever peer discovery services emit `peer` events.
-   * Known peers may be emitted.
+   * Called whenever peer discovery services emit `peer` events and adds peers
+   * to the peer store.
    */
   onDiscoveryPeer (evt: CustomEvent<PeerInfo>): void {
     const { detail: peer } = evt

package/src/upgrader.ts

@@ -21,6 +21,7 @@ import type { Metrics } from '@libp2p/interface-metrics'
 import type { ConnectionManager } from '@libp2p/interface-connection-manager'
 import type { PeerStore } from '@libp2p/interface-peer-store'
 import type { ConnectionGater } from '@libp2p/interface-connection-gater'
+import { INBOUND_UPGRADE_TIMEOUT } from './connection-manager/constants.js'
 
 const log = logger('libp2p:upgrader')
 
@@ -51,7 +52,7 @@ export interface UpgraderInit {
    * An amount of ms by which an inbound connection upgrade
    * must complete
    */
-  inboundUpgradeTimeout: number
+  inboundUpgradeTimeout?: number
 }
 
 function findIncomingStreamLimit (protocol: string, registrar: Registrar): number | undefined {
@@ -126,7 +127,7 @@ export class DefaultUpgrader extends EventEmitter<UpgraderEvents> implements Upg
       this.muxers.set(muxer.protocol, muxer)
     })
 
-    this.inboundUpgradeTimeout = init.inboundUpgradeTimeout
+    this.inboundUpgradeTimeout = init.inboundUpgradeTimeout ?? INBOUND_UPGRADE_TIMEOUT
   }
 
   /**

package/src/version.ts

@@ -1,2 +1,2 @@
-export const version = '0.43.4'
+export const version = '0.44.0'
 export const name = 'libp2p'

package/dist/src/connection-manager/auto-dialler.d.ts

@@ -1,42 +0,0 @@
-import type { Startable } from '@libp2p/interfaces/startable';
-import type { PeerId } from '@libp2p/interface-peer-id';
-import type { ConnectionManager } from '@libp2p/interface-connection-manager';
-import type { PeerStore } from '@libp2p/interface-peer-store';
-export interface AutoDiallerInit {
-    /**
-     * The minimum number of connections to avoid pruning
-     */
-    minConnections?: number;
-    /**
-     * How often, in milliseconds, it should preemptively guarantee connections are above the low watermark
-     */
-    autoDialInterval?: number;
-}
-export interface AutoDiallerComponents {
-    peerId: PeerId;
-    connectionManager: ConnectionManager;
-    peerStore: PeerStore;
-}
-export declare class AutoDialler implements Startable {
-    private readonly components;
-    private readonly options;
-    private running;
-    private autoDialTimeout?;
-    /**
-     * Proactively tries to connect to known peers stored in the PeerStore.
-     * It will keep the number of connections below the upper limit and sort
-     * the peers to connect based on wether we know their keys and protocols.
-     */
-    constructor(components: AutoDiallerComponents, init: AutoDiallerInit);
-    isStarted(): boolean;
-    /**
-     * Starts the auto dialer
-     */
-    start(): Promise<void>;
-    /**
-     * Stops the auto dialler
-     */
-    stop(): Promise<void>;
-    _autoDial(): Promise<void>;
-}
-//# sourceMappingURL=auto-dialler.d.ts.map

package/dist/src/connection-manager/auto-dialler.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"auto-dialler.d.ts","sourceRoot":"","sources":["../../../src/connection-manager/auto-dialler.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAA;AAC7D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAA;AACvD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAA;AAC7E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAA;AAI7D,MAAM,WAAW,eAAe;IAC9B;;OAEG;IACH,cAAc,CAAC,EAAE,MAAM,CAAA;IAEvB;;OAEG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAA;CAC1B;AAED,MAAM,WAAW,qBAAqB;IACpC,MAAM,EAAE,MAAM,CAAA;IACd,iBAAiB,EAAE,iBAAiB,CAAA;IACpC,SAAS,EAAE,SAAS,CAAA;CACrB;AAOD,qBAAa,WAAY,YAAW,SAAS;IAC3C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAuB;IAClD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA2B;IACnD,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,eAAe,CAAC,CAAqB;IAE7C;;;;OAIG;gBACU,UAAU,EAAE,qBAAqB,EAAE,IAAI,EAAE,eAAe;IASrE,SAAS,IAAK,OAAO;IAIrB;;OAEG;IACG,KAAK,IAAK,OAAO,CAAC,IAAI,CAAC;IAU7B;;OAEG;IACG,IAAI,IAAK,OAAO,CAAC,IAAI,CAAC;IAUtB,SAAS,IAAK,OAAO,CAAC,IAAI,CAAC;CAyElC"}

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

@@ -1,105 +0,0 @@
-import { logger } from '@libp2p/logger';
-import mergeOptions from 'merge-options';
-// @ts-expect-error retimer does not have types
-import retimer from 'retimer';
-const log = logger('libp2p:connection-manager:auto-dialler');
-const defaultOptions = {
-    minConnections: 0,
-    autoDialInterval: 10000
-};
-export class AutoDialler {
-    /**
-     * Proactively tries to connect to known peers stored in the PeerStore.
-     * It will keep the number of connections below the upper limit and sort
-     * the peers to connect based on wether we know their keys and protocols.
-     */
-    constructor(components, init) {
-        this.components = components;
-        this.options = mergeOptions.call({ ignoreUndefined: true }, defaultOptions, init);
-        this.running = false;
-        this._autoDial = this._autoDial.bind(this);
-        log('options: %j', this.options);
-    }
-    isStarted() {
-        return this.running;
-    }
-    /**
-     * Starts the auto dialer
-     */
-    async start() {
-        this.running = true;
-        void this._autoDial().catch(err => {
-            log.error('could not start autodial', err);
-        });
-        log('started');
-    }
-    /**
-     * Stops the auto dialler
-     */
-    async stop() {
-        this.running = false;
-        if (this.autoDialTimeout != null) {
-            this.autoDialTimeout.clear();
-        }
-        log('stopped');
-    }
-    async _autoDial() {
-        if (this.autoDialTimeout != null) {
-            this.autoDialTimeout.clear();
-        }
-        const minConnections = this.options.minConnections;
-        // Already has enough connections
-        if (this.components.connectionManager.getConnections().length >= minConnections) {
-            this.autoDialTimeout = retimer(this._autoDial, this.options.autoDialInterval);
-            return;
-        }
-        // Sort peers on whether we know protocols or public keys for them
-        let peers = await this.components.peerStore.all();
-        peers = peers.filter((peer) => {
-            // do not dial ourselves
-            if (peer.id.equals(this.components.peerId)) {
-                return false;
-            }
-            // do not dial peers without multiaddrs
-            if (peer.addresses.length === 0) {
-                return false;
-            }
-            return true;
-        });
-        // shuffle the peers
-        peers = peers.sort(() => Math.random() > 0.5 ? 1 : -1);
-        peers = peers.sort((a, b) => {
-            // dial peers with the most protocols first
-            if (b.protocols.length > a.protocols.length) {
-                return 1;
-            }
-            // dial peers with public keys first
-            if (b.id.publicKey != null && a.id.publicKey == null) {
-                return 1;
-            }
-            return -1;
-        });
-        for (let i = 0; this.running && i < peers.length && this.components.connectionManager.getConnections().length < minConnections; i++) {
-            // Connection Manager was stopped during async dial
-            if (!this.running) {
-                return;
-            }
-            const peer = peers[i];
-            if (this.components.connectionManager.getConnections(peer.id).length === 0) {
-                log('connecting to a peerStore stored peer %p', peer.id);
-                try {
-                    await this.components.connectionManager.openConnection(peer.id);
-                }
-                catch (err) {
-                    log.error('could not connect to peerStore stored peer', err);
-                }
-            }
-        }
-        // Connection Manager was stopped
-        if (!this.running) {
-            return;
-        }
-        this.autoDialTimeout = retimer(this._autoDial, this.options.autoDialInterval);
-    }
-}
-//# sourceMappingURL=auto-dialler.js.map

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

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

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

@@ -1,27 +0,0 @@
-import type { Multiaddr } from '@multiformats/multiaddr';
-import type { Connection } from '@libp2p/interface-connection';
-import type { AbortOptions } from '@libp2p/interfaces';
-import type { Dialer } from '@libp2p/interface-connection-manager';
-export interface DialAction {
-    (m: Multiaddr, options: AbortOptions): Promise<Connection>;
-}
-export interface DialRequestOptions {
-    addrs: Multiaddr[];
-    dialAction: DialAction;
-    dialer: Dialer;
-}
-export declare class DialRequest {
-    private readonly addrs;
-    private readonly dialer;
-    private readonly dialAction;
-    /**
-     * Manages running the `dialAction` on multiple provided `addrs` in parallel
-     * up to a maximum determined by the number of tokens returned
-     * from `dialer.getTokens`. Once a DialRequest is created, it can be
-     * started using `DialRequest.run(options)`. Once a single dial has succeeded,
-     * all other dials in the request will be cancelled.
-     */
-    constructor(options: DialRequestOptions);
-    run(options?: AbortOptions): Promise<Connection>;
-}
-//# sourceMappingURL=dial-request.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"dial-request.d.ts","sourceRoot":"","sources":["../../../../src/connection-manager/dialer/dial-request.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AACxD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAA;AAC9D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACtD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sCAAsC,CAAA;AAIlE,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;CAgG5D"}

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

@@ -1,114 +0,0 @@
-import { CodeError } from '@libp2p/interfaces/errors';
-import { anySignal } from 'any-signal';
-import FIFO from 'p-fifo';
-import { setMaxListeners } from 'events';
-import { codes } from '../../errors.js';
-import { logger } from '@libp2p/logger';
-const log = logger('libp2p:dialer:dial-request');
-export class DialRequest {
-    /**
-     * Manages running the `dialAction` on multiple provided `addrs` in parallel
-     * up to a maximum determined by the number of tokens returned
-     * from `dialer.getTokens`. Once a DialRequest is created, it can be
-     * started using `DialRequest.run(options)`. Once a single dial has succeeded,
-     * all other dials in the request will be cancelled.
-     */
-    constructor(options) {
-        const { addrs, dialAction, dialer } = options;
-        this.addrs = addrs;
-        this.dialer = dialer;
-        this.dialAction = dialAction;
-    }
-    async run(options = {}) {
-        const tokens = this.dialer.getTokens(this.addrs.length);
-        // If no tokens are available, throw
-        if (tokens.length < 1) {
-            throw new CodeError('No dial tokens available', codes.ERR_NO_DIAL_TOKENS);
-        }
-        const tokenHolder = new FIFO();
-        for (const token of tokens) {
-            void tokenHolder.push(token).catch(err => {
-                log.error(err);
-            });
-        }
-        const dialAbortControllers = this.addrs.map(() => {
-            const controller = new AbortController();
-            try {
-                // fails on node < 15.4
-                setMaxListeners?.(Infinity, controller.signal);
-            }
-            catch { }
-            return controller;
-        });
-        if (options.signal != null) {
-            try {
-                // fails on node < 15.4
-                setMaxListeners?.(Infinity, options.signal);
-            }
-            catch { }
-        }
-        let completedDials = 0;
-        let done = false;
-        try {
-            return await Promise.any(this.addrs.map(async (addr, i) => {
-                const token = await tokenHolder.shift(); // get token
-                // End attempt once another attempt succeeded
-                if (done) {
-                    this.dialer.releaseToken(tokens.splice(tokens.indexOf(token), 1)[0]);
-                    throw new CodeError('dialAction already succeeded', codes.ERR_ALREADY_SUCCEEDED);
-                }
-                const controller = dialAbortControllers[i];
-                if (controller == null) {
-                    throw new CodeError('dialAction did not come with an AbortController', codes.ERR_INVALID_PARAMETERS);
-                }
-                let conn;
-                try {
-                    const signal = controller.signal;
-                    conn = await this.dialAction(addr, { ...options, signal: (options.signal != null) ? anySignal([signal, options.signal]) : signal });
-                    // Remove the successful AbortController so it is not aborted
-                    dialAbortControllers[i] = undefined;
-                }
-                finally {
-                    completedDials++;
-                    // If we have more or equal dials remaining than tokens, recycle the token, otherwise release it
-                    if (this.addrs.length - completedDials >= tokens.length) {
-                        void tokenHolder.push(token).catch(err => {
-                            log.error(err);
-                        });
-                    }
-                    else {
-                        this.dialer.releaseToken(tokens.splice(tokens.indexOf(token), 1)[0]);
-                    }
-                }
-                if (conn == null) {
-                    // Notify Promise.any that attempt was not successful
-                    // to prevent from returning undefined despite there
-                    // were successful dial attempts
-                    throw new CodeError('dialAction led to empty object', codes.ERR_TRANSPORT_DIAL_FAILED);
-                }
-                else {
-                    // This dial succeeded, don't attempt anything else
-                    done = true;
-                }
-                return conn;
-            }));
-        }
-        catch (err) {
-            // if we only dialed one address, unwrap the AggregateError
-            if (this.addrs.length === 1 && err.name === 'AggregateError') {
-                throw err.errors[0];
-            }
-            throw err;
-        }
-        finally {
-            // success/failure happened, abort everything else
-            dialAbortControllers.forEach(c => {
-                if (c !== undefined) {
-                    c.abort();
-                }
-            });
-            tokens.forEach(token => { this.dialer.releaseToken(token); }); // release tokens back to the dialer
-        }
-    }
-}
-//# sourceMappingURL=dial-request.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"dial-request.js","sourceRoot":"","sources":["../../../../src/connection-manager/dialer/dial-request.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAA;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AACtC,OAAO,IAAI,MAAM,QAAQ,CAAA;AACzB,OAAO,EAAE,eAAe,EAAE,MAAM,QAAQ,CAAA;AACxC,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAA;AACvC,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AAMvC,MAAM,GAAG,GAAG,MAAM,CAAC,4BAA4B,CAAC,CAAA;AAYhD,MAAM,OAAO,WAAW;IAKtB;;;;;;OAMG;IACH,YAAa,OAA2B;QACtC,MAAM,EACJ,KAAK,EACL,UAAU,EACV,MAAM,EACP,GAAG,OAAO,CAAA;QAEX,IAAI,CAAC,KAAK,GAAG,KAAK,CAAA;QAClB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAA;IAC9B,CAAC;IAED,KAAK,CAAC,GAAG,CAAE,UAAwB,EAAE;QACnC,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;QAEvD,oCAAoC;QACpC,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;YACrB,MAAM,IAAI,SAAS,CAAC,0BAA0B,EAAE,KAAK,CAAC,kBAAkB,CAAC,CAAA;SAC1E;QAED,MAAM,WAAW,GAAG,IAAI,IAAI,EAAU,CAAA;QAEtC,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;YAC1B,KAAK,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;gBACvC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAChB,CAAC,CAAC,CAAA;SACH;QAED,MAAM,oBAAoB,GAAyC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE;YACrF,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAA;YACxC,IAAI;gBACF,uBAAuB;gBACvB,eAAe,EAAE,CAAC,QAAQ,EAAE,UAAU,CAAC,MAAM,CAAC,CAAA;aAC/C;YAAC,MAAM,GAAE;YAEV,OAAO,UAAU,CAAA;QACnB,CAAC,CAAC,CAAA;QAEF,IAAI,OAAO,CAAC,MAAM,IAAI,IAAI,EAAE;YAC1B,IAAI;gBACF,uBAAuB;gBACvB,eAAe,EAAE,CAAC,QAAQ,EAAE,OAAO,CAAC,MAAM,CAAC,CAAA;aAC5C;YAAC,MAAM,GAAE;SACX;QAED,IAAI,cAAc,GAAG,CAAC,CAAA;QACtB,IAAI,IAAI,GAAG,KAAK,CAAA;QAEhB,IAAI;YACF,OAAO,MAAM,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE;gBACxD,MAAM,KAAK,GAAG,MAAM,WAAW,CAAC,KAAK,EAAE,CAAA,CAAC,YAAY;gBACpD,6CAA6C;gBAC7C,IAAI,IAAI,EAAE;oBACR,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;oBACpE,MAAM,IAAI,SAAS,CAAC,8BAA8B,EAAE,KAAK,CAAC,qBAAqB,CAAC,CAAA;iBACjF;gBAED,MAAM,UAAU,GAAG,oBAAoB,CAAC,CAAC,CAAC,CAAA;gBAC1C,IAAI,UAAU,IAAI,IAAI,EAAE;oBACtB,MAAM,IAAI,SAAS,CAAC,iDAAiD,EAAE,KAAK,CAAC,sBAAsB,CAAC,CAAA;iBACrG;gBACD,IAAI,IAAI,CAAA;gBACR,IAAI;oBACF,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAA;oBAChC,IAAI,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,EAAE,GAAG,OAAO,EAAE,MAAM,EAAE,CAAC,OAAO,CAAC,MAAM,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAA;oBACnI,6DAA6D;oBAC7D,oBAAoB,CAAC,CAAC,CAAC,GAAG,SAAS,CAAA;iBACpC;wBAAS;oBACR,cAAc,EAAE,CAAA;oBAChB,gGAAgG;oBAChG,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,cAAc,IAAI,MAAM,CAAC,MAAM,EAAE;wBACvD,KAAK,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;4BACvC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;wBAChB,CAAC,CAAC,CAAA;qBACH;yBAAM;wBACL,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;qBACrE;iBACF;gBAED,IAAI,IAAI,IAAI,IAAI,EAAE;oBAChB,qDAAqD;oBACrD,oDAAoD;oBACpD,gCAAgC;oBAChC,MAAM,IAAI,SAAS,CAAC,gCAAgC,EAAE,KAAK,CAAC,yBAAyB,CAAC,CAAA;iBACvF;qBAAM;oBACL,mDAAmD;oBACnD,IAAI,GAAG,IAAI,CAAA;iBACZ;gBAED,OAAO,IAAI,CAAA;YACb,CAAC,CAAC,CAAC,CAAA;SACJ;QAAC,OAAO,GAAQ,EAAE;YACjB,2DAA2D;YAC3D,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,IAAI,GAAG,CAAC,IAAI,KAAK,gBAAgB,EAAE;gBAC5D,MAAM,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;aACpB;YAED,MAAM,GAAG,CAAA;SACV;gBAAS;YACR,kDAAkD;YAClD,oBAAoB,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;gBAC/B,IAAI,CAAC,KAAK,SAAS,EAAE;oBACnB,CAAC,CAAC,KAAK,EAAE,CAAA;iBACV;YACH,CAAC,CAAC,CAAA;YACF,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,CAAA,CAAC,CAAC,CAAC,CAAA,CAAC,oCAAoC;SAClG;IACH,CAAC;CACF"}