libp2p 2.3.1 → 2.4.0-5c4a79e5a

package/dist/src/address-manager/ip-mappings.js

@@ -0,0 +1,143 @@
+import { isIPv4 } from '@chainsafe/is-ip';
+import { multiaddr, protocols } from '@multiformats/multiaddr';
+export const defaultValues = {
+    maxObservedAddresses: 10
+};
+const CODEC_IP4 = 0x04;
+const CODEC_IP6 = 0x29;
+const CODEC_TCP = 0x06;
+const CODEC_UDP = 0x0111;
+export class IPMappings {
+    log;
+    mappings;
+    constructor(components, init = {}) {
+        this.log = components.logger.forComponent('libp2p:address-manager:ip-mappings');
+        this.mappings = new Map();
+    }
+    has(ma) {
+        const tuples = ma.stringTuples();
+        for (const mappings of this.mappings.values()) {
+            for (const mapping of mappings) {
+                if (mapping.externalIp === tuples[0][1]) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+    add(internalIp, internalPort, externalIp, externalPort = internalPort, protocol = 'tcp') {
+        const key = `${internalIp}-${internalPort}-${protocol}`;
+        const mappings = this.mappings.get(key) ?? [];
+        const mapping = {
+            internalIp,
+            internalPort,
+            externalIp,
+            externalPort,
+            externalFamily: isIPv4(externalIp) ? 4 : 6,
+            protocol,
+            verified: false,
+            expires: 0
+        };
+        mappings.push(mapping);
+        this.mappings.set(key, mappings);
+    }
+    remove(ma) {
+        const tuples = ma.stringTuples();
+        const host = tuples[0][1] ?? '';
+        const protocol = tuples[1][0] === CODEC_TCP ? 'tcp' : 'udp';
+        const port = parseInt(tuples[1][1] ?? '0');
+        let wasConfident = false;
+        for (const [key, mappings] of this.mappings.entries()) {
+            for (let i = 0; i < mappings.length; i++) {
+                const mapping = mappings[i];
+                if (mapping.externalIp === host && mapping.externalPort === port && mapping.protocol === protocol) {
+                    this.log('removing %s:%s to %s:%s %s IP mapping', mapping.externalIp, mapping.externalPort, host, port, protocol);
+                    wasConfident = wasConfident || mapping.verified;
+                    mappings.splice(i, 1);
+                    i--;
+                }
+            }
+            if (mappings.length === 0) {
+                this.mappings.delete(key);
+            }
+        }
+        return wasConfident;
+    }
+    getAll(addresses) {
+        const ipMappedAddresses = [];
+        for (const { multiaddr: ma } of addresses) {
+            const tuples = ma.stringTuples();
+            let tuple;
+            // see if the internal host/port/protocol tuple has been mapped externally
+            if ((tuples[0][0] === CODEC_IP4 || tuples[0][0] === CODEC_IP6) && tuples[1][0] === CODEC_TCP) {
+                tuple = `${tuples[0][1]}-${tuples[1][1]}-tcp`;
+            }
+            else if ((tuples[0][0] === CODEC_IP4 || tuples[0][0] === CODEC_IP6) && tuples[1][0] === CODEC_UDP) {
+                tuple = `${tuples[0][1]}-${tuples[1][1]}-udp`;
+            }
+            if (tuple == null) {
+                continue;
+            }
+            const mappings = this.mappings.get(tuple);
+            if (mappings == null) {
+                continue;
+            }
+            for (const mapping of mappings) {
+                tuples[0][0] = mapping.externalFamily === 4 ? CODEC_IP4 : CODEC_IP6;
+                tuples[0][1] = mapping.externalIp;
+                tuples[1][1] = `${mapping.externalPort}`;
+                ipMappedAddresses.push({
+                    multiaddr: multiaddr(`/${tuples.map(tuple => {
+                        return [
+                            protocols(tuple[0]).name,
+                            tuple[1]
+                        ].join('/');
+                    }).join('/')}`),
+                    verified: mapping.verified,
+                    type: 'ip-mapping',
+                    expires: mapping.expires,
+                    lastVerified: mapping.lastVerified
+                });
+            }
+        }
+        return ipMappedAddresses;
+    }
+    confirm(ma, ttl) {
+        const tuples = ma.stringTuples();
+        const host = tuples[0][1];
+        let startingConfidence = false;
+        for (const mappings of this.mappings.values()) {
+            for (const mapping of mappings) {
+                // eslint-disable-next-line max-depth
+                if (mapping.externalIp === host) {
+                    this.log('marking %s to %s IP mapping as verified', mapping.internalIp, mapping.externalIp);
+                    startingConfidence = mapping.verified;
+                    mapping.verified = true;
+                    mapping.expires = Date.now() + ttl;
+                    mapping.lastVerified = Date.now();
+                }
+            }
+        }
+        return startingConfidence;
+    }
+    unconfirm(ma, ttl) {
+        const tuples = ma.stringTuples();
+        const host = tuples[0][1] ?? '';
+        const protocol = tuples[1][0] === CODEC_TCP ? 'tcp' : 'udp';
+        const port = parseInt(tuples[1][1] ?? '0');
+        let wasConfident = false;
+        for (const mappings of this.mappings.values()) {
+            for (let i = 0; i < mappings.length; i++) {
+                const mapping = mappings[i];
+                if (mapping.externalIp === host && mapping.externalPort === port && mapping.protocol === protocol) {
+                    this.log('removing verification of %s:%s to %s:%s %s IP mapping', mapping.externalIp, mapping.externalPort, host, port, protocol);
+                    wasConfident = wasConfident || mapping.verified;
+                    mapping.verified = false;
+                    mapping.expires = Date.now() + ttl;
+                }
+            }
+        }
+        return wasConfident;
+    }
+}
+//# sourceMappingURL=ip-mappings.js.map

package/dist/src/address-manager/ip-mappings.js.map

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

package/dist/src/address-manager/observed-addresses.d.ts

@@ -0,0 +1,19 @@
+import type { AddressManagerComponents, AddressManagerInit } from './index.js';
+import type { NodeAddress } from '@libp2p/interface-internal';
+import type { Multiaddr } from '@multiformats/multiaddr';
+export declare const defaultValues: {
+    maxObservedAddresses: number;
+};
+export declare class ObservedAddresses {
+    private readonly log;
+    private readonly addresses;
+    private readonly maxObservedAddresses;
+    constructor(components: AddressManagerComponents, init?: AddressManagerInit);
+    has(ma: Multiaddr): boolean;
+    removePrefixed(prefix: string): void;
+    add(ma: Multiaddr): void;
+    getAll(): NodeAddress[];
+    remove(ma: Multiaddr): boolean;
+    confirm(ma: Multiaddr, ttl: number): boolean;
+}
+//# sourceMappingURL=observed-addresses.d.ts.map

package/dist/src/address-manager/observed-addresses.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"observed-addresses.d.ts","sourceRoot":"","sources":["../../../src/address-manager/observed-addresses.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,wBAAwB,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAA;AAE9E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAA;AAC7D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAExD,eAAO,MAAM,aAAa;;CAEzB,CAAA;AAQD,qBAAa,iBAAiB;IAC5B,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAQ;IAC5B,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAsC;IAChE,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAQ;gBAEhC,UAAU,EAAE,wBAAwB,EAAE,IAAI,GAAE,kBAAuB;IAMhF,GAAG,CAAE,EAAE,EAAE,SAAS,GAAG,OAAO;IAI5B,cAAc,CAAE,MAAM,EAAE,MAAM,GAAG,IAAI;IAQrC,GAAG,CAAE,EAAE,EAAE,SAAS,GAAG,IAAI;IAgBzB,MAAM,IAAK,WAAW,EAAE;IAWxB,MAAM,CAAE,EAAE,EAAE,SAAS,GAAG,OAAO;IAS/B,OAAO,CAAE,EAAE,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO;CAgB9C"}

package/dist/src/address-manager/observed-addresses.js

@@ -0,0 +1,70 @@
+import { isLinkLocal } from '@libp2p/utils/multiaddr/is-link-local';
+import { isPrivate } from '@libp2p/utils/multiaddr/is-private';
+import { multiaddr } from '@multiformats/multiaddr';
+export const defaultValues = {
+    maxObservedAddresses: 10
+};
+export class ObservedAddresses {
+    log;
+    addresses;
+    maxObservedAddresses;
+    constructor(components, init = {}) {
+        this.log = components.logger.forComponent('libp2p:address-manager:observed-addresses');
+        this.addresses = new Map();
+        this.maxObservedAddresses = init.maxObservedAddresses ?? defaultValues.maxObservedAddresses;
+    }
+    has(ma) {
+        return this.addresses.has(ma.toString());
+    }
+    removePrefixed(prefix) {
+        for (const key of this.addresses.keys()) {
+            if (key.toString().startsWith(prefix)) {
+                this.addresses.delete(key);
+            }
+        }
+    }
+    add(ma) {
+        if (this.addresses.size === this.maxObservedAddresses) {
+            return;
+        }
+        if (isPrivate(ma) || isLinkLocal(ma)) {
+            return;
+        }
+        this.log('adding observed address %a', ma);
+        this.addresses.set(ma.toString(), {
+            verified: false,
+            expires: 0
+        });
+    }
+    getAll() {
+        return Array.from(this.addresses)
+            .map(([ma, metadata]) => ({
+            multiaddr: multiaddr(ma),
+            verified: metadata.verified,
+            type: 'observed',
+            expires: metadata.expires,
+            lastVerified: metadata.lastVerified
+        }));
+    }
+    remove(ma) {
+        const startingConfidence = this.addresses.get(ma.toString())?.verified ?? false;
+        this.log('removing observed address %a', ma);
+        this.addresses.delete(ma.toString());
+        return startingConfidence;
+    }
+    confirm(ma, ttl) {
+        const addrString = ma.toString();
+        const metadata = this.addresses.get(addrString) ?? {
+            verified: false,
+            expires: Date.now() + ttl,
+            lastVerified: Date.now()
+        };
+        const startingConfidence = metadata.verified;
+        metadata.verified = true;
+        metadata.lastVerified = Date.now();
+        this.log('marking observed address %a as verified', addrString);
+        this.addresses.set(addrString, metadata);
+        return startingConfidence;
+    }
+}
+//# sourceMappingURL=observed-addresses.js.map

package/dist/src/address-manager/observed-addresses.js.map

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

package/dist/src/address-manager/transport-addresses.d.ts

@@ -0,0 +1,19 @@
+import type { AddressManagerComponents, AddressManagerInit } from './index.js';
+import type { NodeAddress } from '@libp2p/interface-internal';
+import type { Multiaddr } from '@multiformats/multiaddr';
+export declare const defaultValues: {
+    maxObservedAddresses: number;
+};
+export declare class TransportAddresses {
+    private readonly log;
+    private readonly addresses;
+    private readonly maxObservedAddresses;
+    constructor(components: AddressManagerComponents, init?: AddressManagerInit);
+    get(multiaddr: Multiaddr, ttl: number): NodeAddress;
+    has(ma: Multiaddr): boolean;
+    remove(ma: Multiaddr): boolean;
+    confirm(ma: Multiaddr, ttl: number): boolean;
+    unconfirm(ma: Multiaddr, ttl: number): boolean;
+    private toKey;
+}
+//# sourceMappingURL=transport-addresses.d.ts.map

package/dist/src/address-manager/transport-addresses.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"transport-addresses.d.ts","sourceRoot":"","sources":["../../../src/address-manager/transport-addresses.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,wBAAwB,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAA;AAE9E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAA;AAC7D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAExD,eAAO,MAAM,aAAa;;CAEzB,CAAA;AAQD,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAQ;IAC5B,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAuC;IACjE,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAQ;gBAEhC,UAAU,EAAE,wBAAwB,EAAE,IAAI,GAAE,kBAAuB;IAMhF,GAAG,CAAE,SAAS,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,GAAG,WAAW;IAgCpD,GAAG,CAAE,EAAE,EAAE,SAAS,GAAG,OAAO;IAK5B,MAAM,CAAE,EAAE,EAAE,SAAS,GAAG,OAAO;IAU/B,OAAO,CAAE,EAAE,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO;IAmB7C,SAAS,CAAE,EAAE,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO;IAiB/C,OAAO,CAAC,KAAK;CAKd"}

package/dist/src/address-manager/transport-addresses.js

@@ -0,0 +1,83 @@
+import { isPrivate } from '@libp2p/utils/multiaddr/is-private';
+export const defaultValues = {
+    maxObservedAddresses: 10
+};
+export class TransportAddresses {
+    log;
+    addresses;
+    maxObservedAddresses;
+    constructor(components, init = {}) {
+        this.log = components.logger.forComponent('libp2p:address-manager:observed-addresses');
+        this.addresses = new Map();
+        this.maxObservedAddresses = init.maxObservedAddresses ?? defaultValues.maxObservedAddresses;
+    }
+    get(multiaddr, ttl) {
+        if (isPrivate(multiaddr)) {
+            return {
+                multiaddr,
+                verified: true,
+                type: 'transport',
+                expires: Date.now() + ttl,
+                lastVerified: Date.now()
+            };
+        }
+        const key = this.toKey(multiaddr);
+        let metadata = this.addresses.get(key);
+        if (metadata == null) {
+            metadata = {
+                verified: false,
+                expires: 0
+            };
+            this.addresses.set(key, metadata);
+        }
+        return {
+            multiaddr,
+            verified: metadata.verified,
+            type: 'transport',
+            expires: metadata.expires,
+            lastVerified: metadata.lastVerified
+        };
+    }
+    has(ma) {
+        const key = this.toKey(ma);
+        return this.addresses.has(key);
+    }
+    remove(ma) {
+        const key = this.toKey(ma);
+        const startingConfidence = this.addresses.get(key)?.verified ?? false;
+        this.log('removing observed address %a', ma);
+        this.addresses.delete(key);
+        return startingConfidence;
+    }
+    confirm(ma, ttl) {
+        const key = this.toKey(ma);
+        const metadata = this.addresses.get(key) ?? {
+            verified: false,
+            expires: 0,
+            lastVerified: 0
+        };
+        const startingConfidence = metadata.verified;
+        metadata.verified = true;
+        metadata.expires = Date.now() + ttl;
+        metadata.lastVerified = Date.now();
+        this.addresses.set(key, metadata);
+        return startingConfidence;
+    }
+    unconfirm(ma, ttl) {
+        const key = this.toKey(ma);
+        const metadata = this.addresses.get(key) ?? {
+            verified: false,
+            expires: 0
+        };
+        const startingConfidence = metadata.verified;
+        metadata.verified = false;
+        metadata.expires = Date.now() + ttl;
+        this.addresses.set(key, metadata);
+        return startingConfidence;
+    }
+    toKey(ma) {
+        const options = ma.toOptions();
+        return `${options.host}-${options.port}-${options.transport}`;
+    }
+}
+//# sourceMappingURL=transport-addresses.js.map

package/dist/src/address-manager/transport-addresses.js.map

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

package/dist/src/config/connection-gater.browser.d.ts

@@ -1,8 +1,12 @@
 import type { ConnectionGater } from '@libp2p/interface';
 /**
- * Returns a connection gater that disallows dialling private addresses by
- * default. Browsers are severely limited in their resource usage so don't
- * waste time trying to dial undiallable addresses.
+ * Returns a connection gater that disallows dialling private addresses or
+ * insecure websockets by default.
+ *
+ * Browsers are severely limited in their resource usage so don't waste time
+ * trying to dial undiallable addresses, and they also print verbose error
+ * messages when making connections over insecure transports which causes
+ * confusion.
  */
 export declare function connectionGater(gater?: ConnectionGater): ConnectionGater;
 //# sourceMappingURL=connection-gater.browser.d.ts.map

package/dist/src/config/connection-gater.browser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"connection-gater.browser.d.ts","sourceRoot":"","sources":["../../../src/config/connection-gater.browser.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AAGxD;;;;GAIG;AACH,wBAAgB,eAAe,CAAE,KAAK,GAAE,eAAoB,GAAG,eAAe,CAqB7E"}
+{"version":3,"file":"connection-gater.browser.d.ts","sourceRoot":"","sources":["../../../src/config/connection-gater.browser.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AAMxD;;;;;;;;GAQG;AACH,wBAAgB,eAAe,CAAE,KAAK,GAAE,eAAoB,GAAG,eAAe,CA2B7E"}

package/dist/src/config/connection-gater.browser.js

@@ -1,15 +1,27 @@
 import { isPrivateIp } from '@libp2p/utils/private-ip';
+import { WebSockets } from '@multiformats/multiaddr-matcher';
+const CODEC_IP4 = 0x04;
+const CODEC_IP6 = 0x29;
 /**
- * Returns a connection gater that disallows dialling private addresses by
- * default. Browsers are severely limited in their resource usage so don't
- * waste time trying to dial undiallable addresses.
+ * Returns a connection gater that disallows dialling private addresses or
+ * insecure websockets by default.
+ *
+ * Browsers are severely limited in their resource usage so don't waste time
+ * trying to dial undiallable addresses, and they also print verbose error
+ * messages when making connections over insecure transports which causes
+ * confusion.
  */
 export function connectionGater(gater = {}) {
     return {
         denyDialPeer: async () => false,
         denyDialMultiaddr: async (multiaddr) => {
+            // do not connect to insecure websockets by default
+            if (WebSockets.matches(multiaddr)) {
+                return false;
+            }
             const tuples = multiaddr.stringTuples();
-            if (tuples[0][0] === 4 || tuples[0][0] === 41) {
+            // do not connect to private addresses by default
+            if (tuples[0][0] === CODEC_IP4 || tuples[0][0] === CODEC_IP6) {
                 return Boolean(isPrivateIp(`${tuples[0][1]}`));
             }
             return false;

package/dist/src/config/connection-gater.browser.js.map

@@ -1 +1 @@
-{"version":3,"file":"connection-gater.browser.js","sourceRoot":"","sources":["../../../src/config/connection-gater.browser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAA;AAItD;;;;GAIG;AACH,MAAM,UAAU,eAAe,CAAE,QAAyB,EAAE;IAC1D,OAAO;QACL,YAAY,EAAE,KAAK,IAAI,EAAE,CAAC,KAAK;QAC/B,iBAAiB,EAAE,KAAK,EAAE,SAAoB,EAAE,EAAE;YAChD,MAAM,MAAM,GAAG,SAAS,CAAC,YAAY,EAAE,CAAA;YAEvC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC;gBAC9C,OAAO,OAAO,CAAC,WAAW,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;YAChD,CAAC;YAED,OAAO,KAAK,CAAA;QACd,CAAC;QACD,qBAAqB,EAAE,KAAK,IAAI,EAAE,CAAC,KAAK;QACxC,sBAAsB,EAAE,KAAK,IAAI,EAAE,CAAC,KAAK;QACzC,8BAA8B,EAAE,KAAK,IAAI,EAAE,CAAC,KAAK;QACjD,+BAA+B,EAAE,KAAK,IAAI,EAAE,CAAC,KAAK;QAClD,6BAA6B,EAAE,KAAK,IAAI,EAAE,CAAC,KAAK;QAChD,8BAA8B,EAAE,KAAK,IAAI,EAAE,CAAC,KAAK;QACjD,sBAAsB,EAAE,KAAK,IAAI,EAAE,CAAC,IAAI;QACxC,GAAG,KAAK;KACT,CAAA;AACH,CAAC"}
+{"version":3,"file":"connection-gater.browser.js","sourceRoot":"","sources":["../../../src/config/connection-gater.browser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAA;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAA;AAI5D,MAAM,SAAS,GAAG,IAAI,CAAA;AACtB,MAAM,SAAS,GAAG,IAAI,CAAA;AAEtB;;;;;;;;GAQG;AACH,MAAM,UAAU,eAAe,CAAE,QAAyB,EAAE;IAC1D,OAAO;QACL,YAAY,EAAE,KAAK,IAAI,EAAE,CAAC,KAAK;QAC/B,iBAAiB,EAAE,KAAK,EAAE,SAAoB,EAAE,EAAE;YAChD,mDAAmD;YACnD,IAAI,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;gBAClC,OAAO,KAAK,CAAA;YACd,CAAC;YAED,MAAM,MAAM,GAAG,SAAS,CAAC,YAAY,EAAE,CAAA;YAEvC,iDAAiD;YACjD,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,SAAS,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,SAAS,EAAE,CAAC;gBAC7D,OAAO,OAAO,CAAC,WAAW,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;YAChD,CAAC;YAED,OAAO,KAAK,CAAA;QACd,CAAC;QACD,qBAAqB,EAAE,KAAK,IAAI,EAAE,CAAC,KAAK;QACxC,sBAAsB,EAAE,KAAK,IAAI,EAAE,CAAC,KAAK;QACzC,8BAA8B,EAAE,KAAK,IAAI,EAAE,CAAC,KAAK;QACjD,+BAA+B,EAAE,KAAK,IAAI,EAAE,CAAC,KAAK;QAClD,6BAA6B,EAAE,KAAK,IAAI,EAAE,CAAC,KAAK;QAChD,8BAA8B,EAAE,KAAK,IAAI,EAAE,CAAC,KAAK;QACjD,sBAAsB,EAAE,KAAK,IAAI,EAAE,CAAC,IAAI;QACxC,GAAG,KAAK;KACT,CAAA;AACH,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"connection-pruner.d.ts","sourceRoot":"","sources":["../../../src/connection-manager/connection-pruner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAA;AAGlD,OAAO,KAAK,EAAE,YAAY,EAAU,eAAe,EAAE,gBAAgB,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AACvH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAA;AACnE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAExD,UAAU,oBAAoB;IAC5B,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,KAAK,CAAC,EAAE,SAAS,EAAE,CAAA;CACpB;AAED,UAAU,0BAA0B;IAClC,iBAAiB,EAAE,iBAAiB,CAAA;IACpC,SAAS,EAAE,SAAS,CAAA;IACpB,MAAM,EAAE,gBAAgB,CAAC,YAAY,CAAC,CAAA;IACtC,MAAM,EAAE,eAAe,CAAA;CACxB;AAOD;;GAEG;AACH,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAQ;IACvC,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAmB;IACrD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAW;IACrC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAa;IACnC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAgC;IACvD,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAQ;gBAEf,UAAU,EAAE,0BAA0B,EAAE,IAAI,GAAE,oBAAyB;IAUpF,KAAK,IAAK,IAAI;IAId,IAAI,IAAK,IAAI;IAIb,qBAAqB,IAAK,IAAI;IAO9B;;;OAGG;YACW,sBAAsB;IAwEpC,eAAe,CAAE,WAAW,EAAE,UAAU,EAAE,EAAE,UAAU,EAAE,OAAO,CAAC,MAAM,CAAC,GAAG,UAAU,EAAE;CAyDvF"}
+{"version":3,"file":"connection-pruner.d.ts","sourceRoot":"","sources":["../../../src/connection-manager/connection-pruner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAA;AAKlD,OAAO,KAAK,EAAE,YAAY,EAAU,eAAe,EAAE,gBAAgB,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AACvH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAA;AACnE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAExD,UAAU,oBAAoB;IAC5B,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,KAAK,CAAC,EAAE,SAAS,EAAE,CAAA;CACpB;AAED,UAAU,0BAA0B;IAClC,iBAAiB,EAAE,iBAAiB,CAAA;IACpC,SAAS,EAAE,SAAS,CAAA;IACpB,MAAM,EAAE,gBAAgB,CAAC,YAAY,CAAC,CAAA;IACtC,MAAM,EAAE,eAAe,CAAA;CACxB;AAOD;;GAEG;AACH,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAQ;IACvC,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAmB;IACrD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAW;IACrC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAS;IAC/B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAgC;IACvD,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAQ;gBAEf,UAAU,EAAE,0BAA0B,EAAE,IAAI,GAAE,oBAAyB;IAUpF,KAAK,IAAK,IAAI;IAId,IAAI,IAAK,IAAI;IAIb,qBAAqB,IAAK,IAAI;IAO9B;;;OAGG;YACW,sBAAsB;IAwEpC,eAAe,CAAE,WAAW,EAAE,UAAU,EAAE,EAAE,UAAU,EAAE,OAAO,CAAC,MAAM,CAAC,GAAG,UAAU,EAAE;CAyDvF"}

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

@@ -1,6 +1,7 @@
 import { PeerMap } from '@libp2p/peer-collections';
 import { safelyCloseConnectionIfUnused } from '@libp2p/utils/close';
 import { MAX_CONNECTIONS } from './constants.js';
+import { multiaddrToIpNet } from './utils.js';
 const defaultOptions = {
     maxConnections: MAX_CONNECTIONS,
     allow: []
@@ -17,7 +18,7 @@ export class ConnectionPruner {
     log;
     constructor(components, init = {}) {
         this.maxConnections = init.maxConnections ?? defaultOptions.maxConnections;
-        this.allow = init.allow ?? defaultOptions.allow;
+        this.allow = (init.allow ?? []).map(ma => multiaddrToIpNet(ma));
         this.connectionManager = components.connectionManager;
         this.peerStore = components.peerStore;
         this.events = components.events;
@@ -75,8 +76,8 @@ export class ConnectionPruner {
         for (const connection of sortedConnections) {
             this.log('too many connections open - closing a connection to %p', connection.remotePeer);
             // check allow list
-            const connectionInAllowList = this.allow.some((ma) => {
-                return connection.remoteAddr.toString().startsWith(ma.toString());
+            const connectionInAllowList = this.allow.some((ipNet) => {
+                return ipNet.contains(connection.remoteAddr.nodeAddress().address);
             });
             // Connections in the allow list should be excluded from pruning
             if (!connectionInAllowList) {

package/dist/src/connection-manager/connection-pruner.js.map

@@ -1 +1 @@
-{"version":3,"file":"connection-pruner.js","sourceRoot":"","sources":["../../../src/connection-manager/connection-pruner.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"connection-pruner.js","sourceRoot":"","sources":["../../../src/connection-manager/connection-pruner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAA;AAClD,OAAO,EAAE,6BAA6B,EAAE,MAAM,qBAAqB,CAAA;AACnE,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAChD,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAkB7C,MAAM,cAAc,GAAG;IACrB,cAAc,EAAE,eAAe;IAC/B,KAAK,EAAE,EAAE;CACV,CAAA;AAED;;GAEG;AACH,MAAM,OAAO,gBAAgB;IACV,cAAc,CAAQ;IACtB,iBAAiB,CAAmB;IACpC,SAAS,CAAW;IACpB,KAAK,CAAS;IACd,MAAM,CAAgC;IACtC,GAAG,CAAQ;IAE5B,YAAa,UAAsC,EAAE,OAA6B,EAAE;QAClF,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,cAAc,IAAI,cAAc,CAAC,cAAc,CAAA;QAC1E,IAAI,CAAC,KAAK,GAAG,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAC,CAAA;QAC/D,IAAI,CAAC,iBAAiB,GAAG,UAAU,CAAC,iBAAiB,CAAA;QACrD,IAAI,CAAC,SAAS,GAAG,UAAU,CAAC,SAAS,CAAA;QACrC,IAAI,CAAC,MAAM,GAAG,UAAU,CAAC,MAAM,CAAA;QAC/B,IAAI,CAAC,GAAG,GAAG,UAAU,CAAC,MAAM,CAAC,YAAY,CAAC,6CAA6C,CAAC,CAAA;QACxF,IAAI,CAAC,qBAAqB,GAAG,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IACpE,CAAC;IAED,KAAK;QACH,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,iBAAiB,EAAE,IAAI,CAAC,qBAAqB,CAAC,CAAA;IAC7E,CAAC;IAED,IAAI;QACF,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC,iBAAiB,EAAE,IAAI,CAAC,qBAAqB,CAAC,CAAA;IAChF,CAAC;IAED,qBAAqB;QACnB,IAAI,CAAC,sBAAsB,EAAE;aAC1B,KAAK,CAAC,GAAG,CAAC,EAAE;YACX,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,oCAAoC,EAAE,GAAG,CAAC,CAAA;QAC3D,CAAC,CAAC,CAAA;IACN,CAAC;IAED;;;OAGG;IACK,KAAK,CAAC,sBAAsB;QAClC,MAAM,WAAW,GAAG,IAAI,CAAC,iBAAiB,CAAC,cAAc,EAAE,CAAA;QAC3D,MAAM,cAAc,GAAG,WAAW,CAAC,MAAM,CAAA;QAEzC,IAAI,CAAC,GAAG,CAAC,sCAAsC,EAAE,cAAc,EAAE,IAAI,CAAC,cAAc,CAAC,CAAA;QAErF,IAAI,cAAc,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;YAC1C,OAAM;QACR,CAAC;QAED,MAAM,UAAU,GAAG,IAAI,OAAO,EAAU,CAAA;QAExC,uBAAuB;QACvB,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;YACrC,MAAM,UAAU,GAAG,UAAU,CAAC,UAAU,CAAA;YAExC,IAAI,UAAU,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC;gBAC/B,SAAQ;YACV,CAAC;YAED,UAAU,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC,CAAC,CAAA;YAE7B,IAAI,CAAC;gBACH,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;gBAEjD,qBAAqB;gBACrB,UAAU,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;oBACtE,OAAO,GAAG,GAAG,IAAI,CAAC,KAAK,CAAA;gBACzB,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;YACR,CAAC;YAAC,OAAO,GAAQ,EAAE,CAAC;gBAClB,IAAI,GAAG,CAAC,IAAI,KAAK,eAAe,EAAE,CAAC;oBACjC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,yBAAyB,EAAE,GAAG,CAAC,CAAA;gBAChD,CAAC;YACH,CAAC;QACH,CAAC;QAED,MAAM,iBAAiB,GAAG,IAAI,CAAC,eAAe,CAAC,WAAW,EAAE,UAAU,CAAC,CAAA;QAEvE,yBAAyB;QACzB,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,cAAc,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC,CAAA;QACjE,MAAM,OAAO,GAAG,EAAE,CAAA;QAElB,KAAK,MAAM,UAAU,IAAI,iBAAiB,EAAE,CAAC;YAC3C,IAAI,CAAC,GAAG,CAAC,wDAAwD,EAAE,UAAU,CAAC,UAAU,CAAC,CAAA;YACzF,mBAAmB;YACnB,MAAM,qBAAqB,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE;gBACtD,OAAO,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,CAAA;YACpE,CAAC,CAAC,CAAA;YAEF,gEAAgE;YAChE,IAAI,CAAC,qBAAqB,EAAE,CAAC;gBAC3B,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;YAC1B,CAAC;YAED,IAAI,OAAO,CAAC,MAAM,KAAK,OAAO,EAAE,CAAC;gBAC/B,MAAK;YACP,CAAC;QACH,CAAC;QAED,oBAAoB;QACpB,MAAM,OAAO,CAAC,GAAG,CACf,OAAO,CAAC,GAAG,CAAC,KAAK,EAAC,UAAU,EAAC,EAAE;YAC7B,MAAM,6BAA6B,CAAC,UAAU,EAAE;gBAC9C,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC;aAClC,CAAC,CAAA;QACJ,CAAC,CAAC,CACH,CAAA;QAED,uBAAuB;QACvB,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,kBAAkB,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAA;IACxE,CAAC;IAED,eAAe,CAAE,WAAyB,EAAE,UAA2B;QACrE,OAAO,WAAW;YAChB,2CAA2C;aAC1C,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;YACb,MAAM,mBAAmB,GAAG,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAA;YAC3C,MAAM,mBAAmB,GAAG,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAA;YAE3C,IAAI,mBAAmB,GAAG,mBAAmB,EAAE,CAAC;gBAC9C,OAAO,CAAC,CAAA;YACV,CAAC;YAED,IAAI,mBAAmB,GAAG,mBAAmB,EAAE,CAAC;gBAC9C,OAAO,CAAC,CAAC,CAAA;YACX,CAAC;YAED,OAAO,CAAC,CAAA;QACV,CAAC,CAAC;YACF,kDAAkD;aACjD,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;YACb,IAAI,CAAC,CAAC,SAAS,KAAK,UAAU,IAAI,CAAC,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;gBAC5D,OAAO,CAAC,CAAA;YACV,CAAC;YAED,IAAI,CAAC,CAAC,SAAS,KAAK,SAAS,IAAI,CAAC,CAAC,SAAS,KAAK,UAAU,EAAE,CAAC;gBAC5D,OAAO,CAAC,CAAC,CAAA;YACX,CAAC;YAED,OAAO,CAAC,CAAA;QACV,CAAC,CAAC;YACF,+CAA+C;aAC9C,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;YACb,IAAI,CAAC,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;gBACxC,OAAO,CAAC,CAAA;YACV,CAAC;YAED,IAAI,CAAC,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;gBACxC,OAAO,CAAC,CAAC,CAAA;YACX,CAAC;YAED,OAAO,CAAC,CAAA;QACV,CAAC,CAAC;YACF,uCAAuC;aACtC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;YACb,MAAM,UAAU,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,CAAA;YACpD,MAAM,UAAU,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,CAAA;YAEpD,IAAI,UAAU,GAAG,UAAU,EAAE,CAAC;gBAC5B,OAAO,CAAC,CAAA;YACV,CAAC;YAED,IAAI,UAAU,GAAG,UAAU,EAAE,CAAC;gBAC5B,OAAO,CAAC,CAAC,CAAA;YACX,CAAC;YAED,OAAO,CAAC,CAAA;QACV,CAAC,CAAC,CAAA;IACN,CAAC;CACF"}

package/dist/src/connection-manager/dial-queue.d.ts

@@ -1,9 +1,10 @@
 import { PeerMap } from '@libp2p/peer-collections';
-import { PriorityQueue, type PriorityQueueJobOptions } from '@libp2p/utils/priority-queue';
-import { type Multiaddr, type Resolver } from '@multiformats/multiaddr';
+import { PriorityQueue } from '@libp2p/utils/priority-queue';
 import type { AddressSorter, ComponentLogger, Connection, ConnectionGater, Metrics, PeerId, PeerStore, PeerRouting, IsDialableOptions, OpenConnectionProgressEvents } from '@libp2p/interface';
 import type { OpenConnectionOptions, TransportManager } from '@libp2p/interface-internal';
+import type { PriorityQueueJobOptions } from '@libp2p/utils/priority-queue';
 import type { DNS } from '@multiformats/dns';
+import type { Multiaddr, Resolver } from '@multiformats/multiaddr';
 import type { ProgressOptions } from 'progress-events';
 export interface PendingDialTarget {
     resolve(value: any): void;
@@ -61,7 +62,6 @@ export declare class DialQueue {
      * connection will be used, all other dials will be aborted when that happens.
      */
     dial(peerIdOrMultiaddr: PeerId | Multiaddr | Multiaddr[], options?: OpenConnectionOptions): Promise<Connection>;
-    private createDialAbortController;
     private calculateMultiaddrs;
     isDialable(multiaddr: Multiaddr | Multiaddr[], options?: IsDialableOptions): Promise<boolean>;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"dial-queue.d.ts","sourceRoot":"","sources":["../../../src/connection-manager/dial-queue.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAA;AAClD,OAAO,EAAE,aAAa,EAAE,KAAK,uBAAuB,EAAE,MAAM,8BAA8B,CAAA;AAC1F,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,QAAQ,EAAwB,MAAM,yBAAyB,CAAA;AAmB7F,OAAO,KAAK,EAAE,aAAa,EAAE,eAAe,EAAU,UAAU,EAAE,eAAe,EAAE,OAAO,EAAE,MAAM,EAAW,SAAS,EAAE,WAAW,EAAE,iBAAiB,EAAE,4BAA4B,EAAE,MAAM,mBAAmB,CAAA;AAC/M,OAAO,KAAK,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAA;AACzF,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAA;AAC5C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAEtD,MAAM,WAAW,iBAAiB;IAChC,OAAO,CAAC,KAAK,EAAE,GAAG,GAAG,IAAI,CAAA;IACzB,MAAM,CAAC,GAAG,EAAE,KAAK,GAAG,IAAI,CAAA;CACzB;AAED,UAAU,mBAAoB,SAAQ,uBAAuB,EAAE,eAAe,CAAC,4BAA4B,CAAC;IAC1G,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;CACxB;AAED,UAAU,UAAU;IAClB,aAAa,CAAC,EAAE,aAAa,CAAA;IAC7B,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAC3B,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAC3B,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;IACpC,WAAW,CAAC,EAAE,OAAO,CAAC,UAAU,EAAE,CAAC,CAAA;CACpC;AAYD,UAAU,mBAAmB;IAC3B,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,SAAS,EAAE,SAAS,CAAA;IACpB,WAAW,EAAE,WAAW,CAAA;IACxB,gBAAgB,EAAE,gBAAgB,CAAA;IAClC,eAAe,EAAE,eAAe,CAAA;IAChC,MAAM,EAAE,eAAe,CAAA;IACvB,GAAG,CAAC,EAAE,GAAG,CAAA;CACV;AAED,qBAAa,SAAS;IACb,KAAK,EAAE,aAAa,CAAC,UAAU,EAAE,mBAAmB,CAAC,CAAA;IAC5D,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAqB;IAChD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAe;IAC9C,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAQ;IAC3C,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAQ;IAC3C,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAQ;IACpC,OAAO,CAAC,kBAAkB,CAAiB;IAC3C,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAuB;IACnD,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAQ;gBAEf,UAAU,EAAE,mBAAmB,EAAE,IAAI,GAAE,UAAe;IA8BnE,KAAK,IAAK,IAAI;IAKd;;OAEG;IACH,IAAI,IAAK,IAAI;IAKb;;;;;;;;;;;OAWG;IACG,IAAI,CAAE,iBAAiB,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS,EAAE,EAAE,OAAO,GAAE,qBAA0B,GAAG,OAAO,CAAC,UAAU,CAAC;IA2K1H,OAAO,CAAC,yBAAyB;YAenB,mBAAmB;IAgK3B,UAAU,CAAE,SAAS,EAAE,SAAS,GAAG,SAAS,EAAE,EAAE,OAAO,GAAE,iBAAsB,GAAG,OAAO,CAAC,OAAO,CAAC;CAsBzG"}
+{"version":3,"file":"dial-queue.d.ts","sourceRoot":"","sources":["../../../src/connection-manager/dial-queue.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAA;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAA;AAoB5D,OAAO,KAAK,EAAE,aAAa,EAAE,eAAe,EAAU,UAAU,EAAE,eAAe,EAAE,OAAO,EAAE,MAAM,EAAW,SAAS,EAAE,WAAW,EAAE,iBAAiB,EAAE,4BAA4B,EAAE,MAAM,mBAAmB,CAAA;AAC/M,OAAO,KAAK,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAA;AACzF,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAA;AAC3E,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAA;AAC5C,OAAO,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAClE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAEtD,MAAM,WAAW,iBAAiB;IAChC,OAAO,CAAC,KAAK,EAAE,GAAG,GAAG,IAAI,CAAA;IACzB,MAAM,CAAC,GAAG,EAAE,KAAK,GAAG,IAAI,CAAA;CACzB;AAED,UAAU,mBAAoB,SAAQ,uBAAuB,EAAE,eAAe,CAAC,4BAA4B,CAAC;IAC1G,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;CACxB;AAED,UAAU,UAAU;IAClB,aAAa,CAAC,EAAE,aAAa,CAAA;IAC7B,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAC3B,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAC3B,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;IACpC,WAAW,CAAC,EAAE,OAAO,CAAC,UAAU,EAAE,CAAC,CAAA;CACpC;AAYD,UAAU,mBAAmB;IAC3B,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,SAAS,EAAE,SAAS,CAAA;IACpB,WAAW,EAAE,WAAW,CAAA;IACxB,gBAAgB,EAAE,gBAAgB,CAAA;IAClC,eAAe,EAAE,eAAe,CAAA;IAChC,MAAM,EAAE,eAAe,CAAA;IACvB,GAAG,CAAC,EAAE,GAAG,CAAA;CACV;AAED,qBAAa,SAAS;IACb,KAAK,EAAE,aAAa,CAAC,UAAU,EAAE,mBAAmB,CAAC,CAAA;IAC5D,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAqB;IAChD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAe;IAC9C,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAQ;IAC3C,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAQ;IAC3C,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAQ;IACpC,OAAO,CAAC,kBAAkB,CAAiB;IAC3C,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAuB;IACnD,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAQ;gBAEf,UAAU,EAAE,mBAAmB,EAAE,IAAI,GAAE,UAAe;IA8BnE,KAAK,IAAK,IAAI;IAKd;;OAEG;IACH,IAAI,IAAK,IAAI;IAKb;;;;;;;;;;;OAWG;IACG,IAAI,CAAE,iBAAiB,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS,EAAE,EAAE,OAAO,GAAE,qBAA0B,GAAG,OAAO,CAAC,UAAU,CAAC;YAiL5G,mBAAmB;IAgK3B,UAAU,CAAE,SAAS,EAAE,SAAS,GAAG,SAAS,EAAE,EAAE,OAAO,GAAE,iBAAsB,GAAG,OAAO,CAAC,OAAO,CAAC;CAsBzG"}

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

@@ -138,7 +138,11 @@ export class DialQueue {
             options?.onProgress?.(new CustomProgressEvent('dial-queue:start-dial'));
             // create abort conditions - need to do this before `calculateMultiaddrs` as
             // we may be about to resolve a dns addr which can time out
-            const signal = this.createDialAbortController(options?.signal);
+            const signal = anySignal([
+                this.shutDownController.signal,
+                options.signal
+            ]);
+            setMaxListeners(Infinity, signal);
             let addrsToDial;
             try {
                 // load addresses from address book, resolve and dnsaddrs, filter
@@ -222,21 +226,10 @@ export class DialQueue {
             peerId,
             priority: options.priority ?? DEFAULT_DIAL_PRIORITY,
             multiaddrs: new Set(multiaddrs.map(ma => ma.toString())),
-            signal: options.signal,
+            signal: options.signal ?? AbortSignal.timeout(this.dialTimeout),
             onProgress: options.onProgress
         });
     }
-    createDialAbortController(userSignal) {
-        // let any signal abort the dial
-        const signal = anySignal([
-            AbortSignal.timeout(this.dialTimeout),
-            this.shutDownController.signal,
-            userSignal
-        ]);
-        // This emitter gets listened to a lot
-        setMaxListeners(Infinity, signal);
-        return signal;
-    }
     // eslint-disable-next-line complexity
     async calculateMultiaddrs(peerId, multiaddrs = new Set(), options = {}) {
         const addrs = [...multiaddrs].map(ma => ({