libp2p 0.42.2 → 0.43.0

package/src/upgrader.ts

@@ -1,11 +1,11 @@
 import { logger } from '@libp2p/logger'
-import errCode from 'err-code'
+import { CodeError } from '@libp2p/interfaces/errors'
 import * as mss from '@libp2p/multistream-select'
 import { codes } from './errors.js'
 import { createConnection } from './connection/index.js'
 import { CustomEvent, EventEmitter } from '@libp2p/interfaces/events'
 import { peerIdFromString } from '@libp2p/peer-id'
-import type { MultiaddrConnection, Connection, Stream, ConnectionGater, ConnectionProtector } from '@libp2p/interface-connection'
+import type { MultiaddrConnection, Connection, Stream, ConnectionProtector } from '@libp2p/interface-connection'
 import type { ConnectionEncrypter, SecuredConnection } from '@libp2p/interface-connection-encrypter'
 import type { StreamMuxer, StreamMuxerFactory } from '@libp2p/interface-stream-muxer'
 import type { PeerId } from '@libp2p/interface-peer-id'
@@ -20,6 +20,7 @@ import { setMaxListeners } from 'events'
 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'
 
 const log = logger('libp2p:upgrader')
 
@@ -53,7 +54,7 @@ export interface UpgraderInit {
   inboundUpgradeTimeout: number
 }
 
-function findIncomingStreamLimit (protocol: string, registrar: Registrar) {
+function findIncomingStreamLimit (protocol: string, registrar: Registrar): number | undefined {
   try {
     const { options } = registrar.getHandler(protocol)
 
@@ -67,7 +68,7 @@ function findIncomingStreamLimit (protocol: string, registrar: Registrar) {
   return DEFAULT_MAX_INBOUND_STREAMS
 }
 
-function findOutgoingStreamLimit (protocol: string, registrar: Registrar) {
+function findOutgoingStreamLimit (protocol: string, registrar: Registrar): number | undefined {
   try {
     const { options } = registrar.getHandler(protocol)
 
@@ -81,7 +82,7 @@ function findOutgoingStreamLimit (protocol: string, registrar: Registrar) {
   return DEFAULT_MAX_OUTBOUND_STREAMS
 }
 
-function countStreams (protocol: string, direction: 'inbound' | 'outbound', connection: Connection) {
+function countStreams (protocol: string, direction: 'inbound' | 'outbound', connection: Connection): number {
   let streamCount = 0
 
   connection.streams.forEach(stream => {
@@ -135,7 +136,7 @@ export class DefaultUpgrader extends EventEmitter<UpgraderEvents> implements Upg
     const accept = await this.components.connectionManager.acceptIncomingConnection(maConn)
 
     if (!accept) {
-      throw errCode(new Error('connection denied'), codes.ERR_CONNECTION_DENIED)
+      throw new CodeError('connection denied', codes.ERR_CONNECTION_DENIED)
     }
 
     let encryptedConn
@@ -149,15 +150,15 @@ export class DefaultUpgrader extends EventEmitter<UpgraderEvents> implements Upg
     try {
       // fails on node < 15.4
       setMaxListeners?.(Infinity, timeoutController.signal)
-    } catch {}
+    } catch { }
 
     try {
       const abortableStream = abortableDuplex(maConn, timeoutController.signal)
       maConn.source = abortableStream.source
       maConn.sink = abortableStream.sink
 
-      if (await this.components.connectionGater.denyInboundConnection(maConn)) {
-        throw errCode(new Error('The multiaddr connection is blocked by gater.acceptConnection'), codes.ERR_CONNECTION_INTERCEPTED)
+      if ((await this.components.connectionGater.denyInboundConnection?.(maConn)) === true) {
+        throw new CodeError('The multiaddr connection is blocked by gater.acceptConnection', codes.ERR_CONNECTION_INTERCEPTED)
       }
 
       this.components.metrics?.trackMultiaddrConnection(maConn)
@@ -186,17 +187,17 @@ export class DefaultUpgrader extends EventEmitter<UpgraderEvents> implements Upg
             protocol: cryptoProtocol
           } = await this._encryptInbound(protectedConn))
 
-          if (await this.components.connectionGater.denyInboundEncryptedConnection(remotePeer, {
+          if ((await this.components.connectionGater.denyInboundEncryptedConnection?.(remotePeer, {
             ...protectedConn,
             ...encryptedConn
-          })) {
-            throw errCode(new Error('The multiaddr connection is blocked by gater.acceptEncryptedConnection'), codes.ERR_CONNECTION_INTERCEPTED)
+          })) === true) {
+            throw new CodeError('The multiaddr connection is blocked by gater.acceptEncryptedConnection', codes.ERR_CONNECTION_INTERCEPTED)
           }
         } else {
           const idStr = maConn.remoteAddr.getPeerId()
 
           if (idStr == null) {
-            throw errCode(new Error('inbound connection that skipped encryption must have a peer id'), codes.ERR_INVALID_MULTIADDR)
+            throw new CodeError('inbound connection that skipped encryption must have a peer id', codes.ERR_INVALID_MULTIADDR)
           }
 
           const remotePeerId = peerIdFromString(idStr)
@@ -222,11 +223,11 @@ export class DefaultUpgrader extends EventEmitter<UpgraderEvents> implements Upg
         throw err
       }
 
-      if (await this.components.connectionGater.denyInboundUpgradedConnection(remotePeer, {
+      if ((await this.components.connectionGater.denyInboundUpgradedConnection?.(remotePeer, {
         ...protectedConn,
         ...encryptedConn
-      })) {
-        throw errCode(new Error('The multiaddr connection is blocked by gater.acceptEncryptedConnection'), codes.ERR_CONNECTION_INTERCEPTED)
+      })) === true) {
+        throw new CodeError('The multiaddr connection is blocked by gater.acceptEncryptedConnection', codes.ERR_CONNECTION_INTERCEPTED)
       }
 
       log('Successfully upgraded inbound connection')
@@ -255,8 +256,8 @@ export class DefaultUpgrader extends EventEmitter<UpgraderEvents> implements Upg
     if (idStr != null) {
       remotePeerId = peerIdFromString(idStr)
 
-      if (await this.components.connectionGater.denyOutboundConnection(remotePeerId, maConn)) {
-        throw errCode(new Error('The multiaddr connection is blocked by connectionGater.denyOutboundConnection'), codes.ERR_CONNECTION_INTERCEPTED)
+      if ((await this.components.connectionGater.denyOutboundConnection?.(remotePeerId, maConn)) === true) {
+        throw new CodeError('The multiaddr connection is blocked by connectionGater.denyOutboundConnection', codes.ERR_CONNECTION_INTERCEPTED)
       }
     }
 
@@ -293,15 +294,15 @@ export class DefaultUpgrader extends EventEmitter<UpgraderEvents> implements Upg
           protocol: cryptoProtocol
         } = await this._encryptOutbound(protectedConn, remotePeerId))
 
-        if (await this.components.connectionGater.denyOutboundEncryptedConnection(remotePeer, {
+        if ((await this.components.connectionGater.denyOutboundEncryptedConnection?.(remotePeer, {
           ...protectedConn,
           ...encryptedConn
-        })) {
-          throw errCode(new Error('The multiaddr connection is blocked by gater.acceptEncryptedConnection'), codes.ERR_CONNECTION_INTERCEPTED)
+        })) === true) {
+          throw new CodeError('The multiaddr connection is blocked by gater.acceptEncryptedConnection', codes.ERR_CONNECTION_INTERCEPTED)
         }
       } else {
         if (remotePeerId == null) {
-          throw errCode(new Error('Encryption was skipped but no peer id was passed'), codes.ERR_INVALID_PEER)
+          throw new CodeError('Encryption was skipped but no peer id was passed', codes.ERR_INVALID_PEER)
         }
 
         cryptoProtocol = 'native'
@@ -326,11 +327,11 @@ export class DefaultUpgrader extends EventEmitter<UpgraderEvents> implements Upg
       throw err
     }
 
-    if (await this.components.connectionGater.denyOutboundUpgradedConnection(remotePeer, {
+    if ((await this.components.connectionGater.denyOutboundUpgradedConnection?.(remotePeer, {
       ...protectedConn,
       ...encryptedConn
-    })) {
-      throw errCode(new Error('The multiaddr connection is blocked by gater.acceptEncryptedConnection'), codes.ERR_CONNECTION_INTERCEPTED)
+    })) === true) {
+      throw new CodeError('The multiaddr connection is blocked by gater.acceptEncryptedConnection', codes.ERR_CONNECTION_INTERCEPTED)
     }
 
     log('Successfully upgraded outbound connection')
@@ -386,7 +387,7 @@ export class DefaultUpgrader extends EventEmitter<UpgraderEvents> implements Upg
               const streamCount = countStreams(protocol, 'inbound', connection)
 
               if (streamCount === incomingLimit) {
-                muxedStream.abort(errCode(new Error(`Too many inbound protocol streams for protocol "${protocol}" - limit ${incomingLimit}`), codes.ERR_TOO_MANY_INBOUND_PROTOCOL_STREAMS))
+                muxedStream.abort(new CodeError(`Too many inbound protocol streams for protocol "${protocol}" - limit ${incomingLimit}`, codes.ERR_TOO_MANY_INBOUND_PROTOCOL_STREAMS))
 
                 return
               }
@@ -399,7 +400,7 @@ export class DefaultUpgrader extends EventEmitter<UpgraderEvents> implements Upg
 
               // If a protocol stream has been successfully negotiated and is to be passed to the application,
               // the peerstore should ensure that the peer is registered with that protocol
-              this.components.peerStore.protoBook.add(remotePeer, [protocol]).catch(err => log.error(err))
+              this.components.peerStore.protoBook.add(remotePeer, [protocol]).catch(err => { log.error(err) })
 
               connection.addStream(muxedStream)
               this.components.metrics?.trackProtocolStream(muxedStream, connection)
@@ -422,7 +423,7 @@ export class DefaultUpgrader extends EventEmitter<UpgraderEvents> implements Upg
 
       newStream = async (protocols: string[], options: AbortOptions = {}): Promise<Stream> => {
         if (muxer == null) {
-          throw errCode(new Error('Stream is not multiplexed'), codes.ERR_MUXER_UNAVAILABLE)
+          throw new CodeError('Stream is not multiplexed', codes.ERR_MUXER_UNAVAILABLE)
         }
 
         log('%s: starting new stream on %s', direction, protocols)
@@ -439,7 +440,7 @@ export class DefaultUpgrader extends EventEmitter<UpgraderEvents> implements Upg
             try {
               // fails on node < 15.4
               setMaxListeners?.(Infinity, controller.signal)
-            } catch {}
+            } catch { }
           }
 
           const { stream, protocol } = await mss.select(muxedStream, protocols, options)
@@ -448,7 +449,7 @@ export class DefaultUpgrader extends EventEmitter<UpgraderEvents> implements Upg
           const streamCount = countStreams(protocol, 'outbound', connection)
 
           if (streamCount === outgoingLimit) {
-            const err = errCode(new Error(`Too many outbound protocol streams for protocol "${protocol}" - limit ${outgoingLimit}`), codes.ERR_TOO_MANY_OUTBOUND_PROTOCOL_STREAMS)
+            const err = new CodeError(`Too many outbound protocol streams for protocol "${protocol}" - limit ${outgoingLimit}`, codes.ERR_TOO_MANY_OUTBOUND_PROTOCOL_STREAMS)
             muxedStream.abort(err)
 
             throw err
@@ -456,7 +457,7 @@ export class DefaultUpgrader extends EventEmitter<UpgraderEvents> implements Upg
 
           // If a protocol stream has been successfully negotiated and is to be passed to the application,
           // the peerstore should ensure that the peer is registered with that protocol
-          this.components.peerStore.protoBook.add(remotePeer, [protocol]).catch(err => log.error(err))
+          this.components.peerStore.protoBook.add(remotePeer, [protocol]).catch(err => { log.error(err) })
 
           // after the handshake the returned stream can have early data so override
           // the souce/sink
@@ -478,7 +479,7 @@ export class DefaultUpgrader extends EventEmitter<UpgraderEvents> implements Upg
             throw err
           }
 
-          throw errCode(err, codes.ERR_UNSUPPORTED_PROTOCOL)
+          throw new CodeError(String(err), codes.ERR_UNSUPPORTED_PROTOCOL)
         } finally {
           if (controller != null) {
             controller.clear()
@@ -522,14 +523,14 @@ export class DefaultUpgrader extends EventEmitter<UpgraderEvents> implements Upg
     })
     maConn.timeline.upgraded = Date.now()
 
-    const errConnectionNotMultiplexed = () => {
-      throw errCode(new Error('connection is not multiplexed'), codes.ERR_CONNECTION_NOT_MULTIPLEXED)
+    const errConnectionNotMultiplexed = (): any => {
+      throw new CodeError('connection is not multiplexed', codes.ERR_CONNECTION_NOT_MULTIPLEXED)
     }
 
     // Create the connection
     connection = createConnection({
       remoteAddr: maConn.remoteAddr,
-      remotePeer: remotePeer,
+      remotePeer,
       stat: {
         status: 'OPEN',
         direction,
@@ -538,7 +539,7 @@ export class DefaultUpgrader extends EventEmitter<UpgraderEvents> implements Upg
         encryption: cryptoProtocol
       },
       newStream: newStream ?? errConnectionNotMultiplexed,
-      getStreams: () => muxer != null ? muxer.streams : errConnectionNotMultiplexed(),
+      getStreams: () => { if (muxer != null) { return muxer.streams } else { return errConnectionNotMultiplexed() } },
       close: async () => {
         await maConn.close()
         // Ensure remaining streams are closed
@@ -589,7 +590,7 @@ export class DefaultUpgrader extends EventEmitter<UpgraderEvents> implements Upg
         protocol
       }
     } catch (err: any) {
-      throw errCode(err, codes.ERR_ENCRYPTION_FAILED)
+      throw new CodeError(String(err), codes.ERR_ENCRYPTION_FAILED)
     }
   }
 
@@ -618,7 +619,7 @@ export class DefaultUpgrader extends EventEmitter<UpgraderEvents> implements Upg
         protocol
       }
     } catch (err: any) {
-      throw errCode(err, codes.ERR_ENCRYPTION_FAILED)
+      throw new CodeError(String(err), codes.ERR_ENCRYPTION_FAILED)
     }
   }
 
@@ -626,7 +627,7 @@ export class DefaultUpgrader extends EventEmitter<UpgraderEvents> implements Upg
    * Selects one of the given muxers via multistream-select. That
    * muxer will be used for all future streams on the connection.
    */
-  async _multiplexOutbound (connection: MultiaddrConnection, muxers: Map<string, StreamMuxerFactory>): Promise<{stream: Duplex<Uint8Array>, muxerFactory?: StreamMuxerFactory}> {
+  async _multiplexOutbound (connection: MultiaddrConnection, muxers: Map<string, StreamMuxerFactory>): Promise<{ stream: Duplex<Uint8Array>, muxerFactory?: StreamMuxerFactory }> {
     const protocols = Array.from(muxers.keys())
     log('outbound selecting muxer %s', protocols)
     try {
@@ -638,7 +639,7 @@ export class DefaultUpgrader extends EventEmitter<UpgraderEvents> implements Upg
       return { stream, muxerFactory }
     } catch (err: any) {
       log.error('error multiplexing outbound stream', err)
-      throw errCode(err, codes.ERR_MUXER_UNAVAILABLE)
+      throw new CodeError(String(err), codes.ERR_MUXER_UNAVAILABLE)
     }
   }
 
@@ -646,7 +647,7 @@ export class DefaultUpgrader extends EventEmitter<UpgraderEvents> implements Upg
    * Registers support for one of the given muxers via multistream-select. The
    * selected muxer will be used for all future streams on the connection.
    */
-  async _multiplexInbound (connection: MultiaddrConnection, muxers: Map<string, StreamMuxerFactory>): Promise<{stream: Duplex<Uint8Array>, muxerFactory?: StreamMuxerFactory}> {
+  async _multiplexInbound (connection: MultiaddrConnection, muxers: Map<string, StreamMuxerFactory>): Promise<{ stream: Duplex<Uint8Array>, muxerFactory?: StreamMuxerFactory }> {
     const protocols = Array.from(muxers.keys())
     log('inbound handling muxers %s', protocols)
     try {
@@ -657,7 +658,7 @@ export class DefaultUpgrader extends EventEmitter<UpgraderEvents> implements Upg
       return { stream, muxerFactory }
     } catch (err: any) {
       log.error('error multiplexing inbound stream', err)
-      throw errCode(err, codes.ERR_MUXER_UNAVAILABLE)
+      throw new CodeError(String(err), codes.ERR_MUXER_UNAVAILABLE)
     }
   }
 }

package/src/version.ts

@@ -1,2 +1,2 @@
-export const version = '0.42.2'
+export const version = '0.43.0'
 export const name = 'libp2p'

package/dist/src/circuit/auto-relay.d.ts

@@ -1,46 +0,0 @@
-import type { PeerId } from '@libp2p/interface-peer-id';
-import type { AddressSorter, PeerProtocolsChangeData } from '@libp2p/interface-peer-store';
-import type { Connection } from '@libp2p/interface-connection';
-import type { RelayComponents } from './index.js';
-export interface AutoRelayInit {
-    addressSorter?: AddressSorter;
-    maxListeners?: number;
-    onError?: (error: Error, msg?: string) => void;
-}
-export declare class AutoRelay {
-    private readonly components;
-    private readonly addressSorter;
-    private readonly maxListeners;
-    private readonly listenRelays;
-    private readonly onError;
-    constructor(components: RelayComponents, init: AutoRelayInit);
-    /**
-     * Check if a peer supports the relay protocol.
-     * If the protocol is not supported, check if it was supported before and remove it as a listen relay.
-     * If the protocol is supported, check if the peer supports **HOP** and add it as a listener if
-     * inside the threshold.
-     */
-    _onProtocolChange(evt: CustomEvent<PeerProtocolsChangeData>): Promise<void>;
-    /**
-     * Peer disconnects
-     */
-    _onPeerDisconnected(evt: CustomEvent<Connection>): void;
-    /**
-     * Attempt to listen on the given relay connection
-     */
-    _addListenRelay(connection: Connection, id: string): Promise<void>;
-    /**
-     * Remove listen relay
-     */
-    _removeListenRelay(id: string): Promise<void>;
-    /**
-     * Try to listen on available hop relay connections.
-     * The following order will happen while we do not have enough relays.
-     * 1. Check the metadata store for known relays, try to listen on the ones we are already connected.
-     * 2. Dial and try to listen on the peers we know that support hop but are not connected.
-     * 3. Search the network.
-     */
-    _listenOnAvailableHopRelays(peersToIgnore?: string[]): Promise<void>;
-    _tryToListenOnRelay(peerId: PeerId): Promise<void>;
-}
-//# sourceMappingURL=auto-relay.d.ts.map

package/dist/src/circuit/auto-relay.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"auto-relay.d.ts","sourceRoot":"","sources":["../../../src/circuit/auto-relay.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAA;AACvD,OAAO,KAAK,EAAE,aAAa,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAA;AAC1F,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAA;AAK9D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAMjD,MAAM,WAAW,aAAa;IAC5B,aAAa,CAAC,EAAE,aAAa,CAAA;IAC7B,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,CAAC,EAAE,MAAM,KAAK,IAAI,CAAA;CAC/C;AAED,qBAAa,SAAS;IACpB,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAiB;IAC5C,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAe;IAC7C,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAQ;IACrC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAa;IAC1C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAsC;gBAEjD,UAAU,EAAE,eAAe,EAAE,IAAI,EAAE,aAAa;IAkB7D;;;;;OAKG;IACG,iBAAiB,CAAE,GAAG,EAAE,WAAW,CAAC,uBAAuB,CAAC;IAkDlE;;OAEG;IACH,mBAAmB,CAAE,GAAG,EAAE,WAAW,CAAC,UAAU,CAAC;IAejD;;OAEG;IACG,eAAe,CAAE,UAAU,EAAE,UAAU,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA+CzE;;OAEG;IACG,kBAAkB,CAAE,EAAE,EAAE,MAAM;IAOpC;;;;;;OAMG;IACG,2BAA2B,CAAE,aAAa,GAAE,MAAM,EAAO;IAqFzD,mBAAmB,CAAE,MAAM,EAAE,MAAM;CAS1C"}

package/dist/src/circuit/auto-relay.js

@@ -1,220 +0,0 @@
-import { logger } from '@libp2p/logger';
-import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string';
-import { toString as uint8ArrayToString } from 'uint8arrays/to-string';
-import { RELAY_CODEC } from './multicodec.js';
-import { canHop } from './circuit/hop.js';
-import { namespaceToCid } from './utils.js';
-import { CIRCUIT_PROTO_CODE, HOP_METADATA_KEY, HOP_METADATA_VALUE, RELAY_RENDEZVOUS_NS } from './constants.js';
-import sort from 'it-sort';
-import all from 'it-all';
-import { pipe } from 'it-pipe';
-import { publicAddressesFirst } from '@libp2p/utils/address-sort';
-const log = logger('libp2p:auto-relay');
-const noop = () => { };
-export class AutoRelay {
-    constructor(components, init) {
-        this.components = components;
-        this.addressSorter = init.addressSorter ?? publicAddressesFirst;
-        this.maxListeners = init.maxListeners ?? 1;
-        this.listenRelays = new Set();
-        this.onError = init.onError ?? noop;
-        this._onProtocolChange = this._onProtocolChange.bind(this);
-        this._onPeerDisconnected = this._onPeerDisconnected.bind(this);
-        this.components.peerStore.addEventListener('change:protocols', (evt) => {
-            void this._onProtocolChange(evt).catch(err => {
-                log.error(err);
-            });
-        });
-        this.components.connectionManager.addEventListener('peer:disconnect', this._onPeerDisconnected);
-    }
-    /**
-     * Check if a peer supports the relay protocol.
-     * If the protocol is not supported, check if it was supported before and remove it as a listen relay.
-     * If the protocol is supported, check if the peer supports **HOP** and add it as a listener if
-     * inside the threshold.
-     */
-    async _onProtocolChange(evt) {
-        const { peerId, protocols } = evt.detail;
-        const id = peerId.toString();
-        // Check if it has the protocol
-        const hasProtocol = protocols.find(protocol => protocol === RELAY_CODEC);
-        // If no protocol, check if we were keeping the peer before as a listenRelay
-        if (hasProtocol == null) {
-            if (this.listenRelays.has(id)) {
-                await this._removeListenRelay(id);
-            }
-            return;
-        }
-        if (this.listenRelays.has(id)) {
-            return;
-        }
-        // If protocol, check if can hop, store info in the metadataBook and listen on it
-        try {
-            const connections = this.components.connectionManager.getConnections(peerId);
-            if (connections.length === 0) {
-                return;
-            }
-            const connection = connections[0];
-            // Do not hop on a relayed connection
-            if (connection.remoteAddr.protoCodes().includes(CIRCUIT_PROTO_CODE)) {
-                log(`relayed connection to ${id} will not be used to hop on`);
-                return;
-            }
-            const supportsHop = await canHop({ connection });
-            if (supportsHop) {
-                await this.components.peerStore.metadataBook.setValue(peerId, HOP_METADATA_KEY, uint8ArrayFromString(HOP_METADATA_VALUE));
-                await this._addListenRelay(connection, id);
-            }
-        }
-        catch (err) {
-            this.onError(err);
-        }
-    }
-    /**
-     * Peer disconnects
-     */
-    _onPeerDisconnected(evt) {
-        const connection = evt.detail;
-        const peerId = connection.remotePeer;
-        const id = peerId.toString();
-        // Not listening on this relay
-        if (!this.listenRelays.has(id)) {
-            return;
-        }
-        this._removeListenRelay(id).catch(err => {
-            log.error(err);
-        });
-    }
-    /**
-     * Attempt to listen on the given relay connection
-     */
-    async _addListenRelay(connection, id) {
-        try {
-            // Check if already listening on enough relays
-            if (this.listenRelays.size >= this.maxListeners) {
-                return;
-            }
-            // Get peer known addresses and sort them with public addresses first
-            const remoteAddrs = await pipe(await this.components.peerStore.addressBook.get(connection.remotePeer), (source) => sort(source, this.addressSorter), async (source) => await all(source));
-            // Attempt to listen on relay
-            const result = await Promise.all(remoteAddrs.map(async (addr) => {
-                try {
-                    let multiaddr = addr.multiaddr;
-                    if (multiaddr.getPeerId() == null) {
-                        multiaddr = multiaddr.encapsulate(`/p2p/${connection.remotePeer.toString()}`);
-                    }
-                    multiaddr = multiaddr.encapsulate('/p2p-circuit');
-                    // Announce multiaddrs will update on listen success by TransportManager event being triggered
-                    await this.components.transportManager.listen([multiaddr]);
-                    return true;
-                }
-                catch (err) {
-                    log.error('error listening on circuit address', err);
-                    this.onError(err);
-                }
-                return false;
-            }));
-            if (result.includes(true)) {
-                this.listenRelays.add(id);
-            }
-        }
-        catch (err) {
-            this.onError(err);
-            this.listenRelays.delete(id);
-        }
-    }
-    /**
-     * Remove listen relay
-     */
-    async _removeListenRelay(id) {
-        if (this.listenRelays.delete(id)) {
-            // TODO: this should be responsibility of the connMgr
-            await this._listenOnAvailableHopRelays([id]);
-        }
-    }
-    /**
-     * Try to listen on available hop relay connections.
-     * The following order will happen while we do not have enough relays.
-     * 1. Check the metadata store for known relays, try to listen on the ones we are already connected.
-     * 2. Dial and try to listen on the peers we know that support hop but are not connected.
-     * 3. Search the network.
-     */
-    async _listenOnAvailableHopRelays(peersToIgnore = []) {
-        // TODO: The peer redial issue on disconnect should be handled by connection gating
-        // Check if already listening on enough relays
-        if (this.listenRelays.size >= this.maxListeners) {
-            return;
-        }
-        const knownHopsToDial = [];
-        const peers = await this.components.peerStore.all();
-        // Check if we have known hop peers to use and attempt to listen on the already connected
-        for (const { id, metadata } of peers) {
-            const idStr = id.toString();
-            // Continue to next if listening on this or peer to ignore
-            if (this.listenRelays.has(idStr)) {
-                continue;
-            }
-            if (peersToIgnore.includes(idStr)) {
-                continue;
-            }
-            const supportsHop = metadata.get(HOP_METADATA_KEY);
-            // Continue to next if it does not support Hop
-            if ((supportsHop == null) || uint8ArrayToString(supportsHop) !== HOP_METADATA_VALUE) {
-                continue;
-            }
-            const connections = this.components.connectionManager.getConnections(id);
-            // If not connected, store for possible later use.
-            if (connections.length === 0) {
-                knownHopsToDial.push(id);
-                continue;
-            }
-            await this._addListenRelay(connections[0], idStr);
-            // Check if already listening on enough relays
-            if (this.listenRelays.size >= this.maxListeners) {
-                return;
-            }
-        }
-        // Try to listen on known peers that are not connected
-        for (const peerId of knownHopsToDial) {
-            await this._tryToListenOnRelay(peerId);
-            // Check if already listening on enough relays
-            if (this.listenRelays.size >= this.maxListeners) {
-                return;
-            }
-        }
-        // Try to find relays to hop on the network
-        try {
-            const cid = await namespaceToCid(RELAY_RENDEZVOUS_NS);
-            for await (const provider of this.components.contentRouting.findProviders(cid)) {
-                if (provider.multiaddrs.length === 0) {
-                    continue;
-                }
-                const peerId = provider.id;
-                if (peerId.equals(this.components.peerId)) {
-                    // Skip the provider if it's us as dialing will fail
-                    continue;
-                }
-                await this.components.peerStore.addressBook.add(peerId, provider.multiaddrs);
-                await this._tryToListenOnRelay(peerId);
-                // Check if already listening on enough relays
-                if (this.listenRelays.size >= this.maxListeners) {
-                    return;
-                }
-            }
-        }
-        catch (err) {
-            this.onError(err);
-        }
-    }
-    async _tryToListenOnRelay(peerId) {
-        try {
-            const connection = await this.components.connectionManager.openConnection(peerId);
-            await this._addListenRelay(connection, peerId.toString());
-        }
-        catch (err) {
-            log.error('Could not use %p as relay', peerId, err);
-            this.onError(err, `could not connect and listen on known hop relay ${peerId.toString()}`);
-        }
-    }
-}
-//# sourceMappingURL=auto-relay.js.map

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

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

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

@@ -1,42 +0,0 @@
-import { StreamHandler } from './stream-handler.js';
-import { CircuitRelay as CircuitPB } from '../pb/index.js';
-import type { Connection } from '@libp2p/interface-connection';
-import type { Duplex } from 'it-stream-types';
-import type { Circuit } from '../transport.js';
-import type { ConnectionManager } from '@libp2p/interface-connection-manager';
-import type { AbortOptions } from '@libp2p/interfaces';
-import type { Uint8ArrayList } from 'uint8arraylist';
-export interface HopRequest {
-    connection: Connection;
-    request: CircuitPB;
-    streamHandler: StreamHandler;
-    circuit: Circuit;
-    connectionManager: ConnectionManager;
-}
-export declare function handleHop(hopRequest: HopRequest): Promise<void>;
-export interface HopConfig extends AbortOptions {
-    connection: Connection;
-    request: CircuitPB;
-}
-/**
- * Performs a HOP request to a relay peer, to request a connection to another
- * peer. A new, virtual, connection will be created between the two via the relay.
- */
-export declare function hop(options: HopConfig): Promise<Duplex<Uint8ArrayList, Uint8ArrayList | Uint8Array>>;
-export interface CanHopOptions extends AbortOptions {
-    connection: Connection;
-}
-/**
- * Performs a CAN_HOP request to a relay peer, in order to understand its capabilities
- */
-export declare function canHop(options: CanHopOptions): Promise<boolean>;
-export interface HandleCanHopOptions {
-    connection: Connection;
-    streamHandler: StreamHandler;
-    circuit: Circuit;
-}
-/**
- * Creates an unencoded CAN_HOP response based on the Circuits configuration
- */
-export declare function handleCanHop(options: HandleCanHopOptions): void;
-//# sourceMappingURL=hop.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"hop.d.ts","sourceRoot":"","sources":["../../../../src/circuit/circuit/hop.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AACnD,OAAO,EAAE,YAAY,IAAI,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAK1D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAA;AAE9D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAA;AAC7C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAA;AAC9C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAA;AAC7E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACtD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAIpD,MAAM,WAAW,UAAU;IACzB,UAAU,EAAE,UAAU,CAAA;IACtB,OAAO,EAAE,SAAS,CAAA;IAClB,aAAa,EAAE,aAAa,CAAA;IAC5B,OAAO,EAAE,OAAO,CAAA;IAChB,iBAAiB,EAAE,iBAAiB,CAAA;CACrC;AAED,wBAAsB,SAAS,CAAE,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CA6FtE;AAED,MAAM,WAAW,SAAU,SAAQ,YAAY;IAC7C,UAAU,EAAE,UAAU,CAAA;IACtB,OAAO,EAAE,SAAS,CAAA;CACnB;AAED;;;GAGG;AACH,wBAAsB,GAAG,CAAE,OAAO,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,cAAc,EAAE,cAAc,GAAG,UAAU,CAAC,CAAC,CA+B3G;AAED,MAAM,WAAW,aAAc,SAAQ,YAAY;IACjD,UAAU,EAAE,UAAU,CAAA;CACvB;AAED;;GAEG;AACH,wBAAsB,MAAM,CAAE,OAAO,EAAE,aAAa,oBAyBnD;AAED,MAAM,WAAW,mBAAmB;IAClC,UAAU,EAAE,UAAU,CAAA;IACtB,aAAa,EAAE,aAAa,CAAA;IAC5B,OAAO,EAAE,OAAO,CAAA;CACjB;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAE,OAAO,EAAE,mBAAmB,QAYzD"}