@libp2p/circuit-relay-v2 3.2.24-6059227cb → 3.2.24-87bc8d4fb

package/src/transport/index.ts

@@ -1,357 +1,65 @@
-import { DialError, InvalidMessageError, serviceCapabilities, serviceDependencies, start, stop, transportSymbol } from '@libp2p/interface'
-import { peerFilter } from '@libp2p/peer-collections'
-import { peerIdFromMultihash, peerIdFromString } from '@libp2p/peer-id'
-import { pbStream } from '@libp2p/utils'
-import { CODE_P2P, multiaddr } from '@multiformats/multiaddr'
-import { Circuit } from '@multiformats/multiaddr-matcher'
-import { setMaxListeners } from 'main-event'
-import * as Digest from 'multiformats/hashes/digest'
-import { CustomProgressEvent } from 'progress-events'
-import { DEFAULT_DISCOVERY_FILTER_ERROR_RATE, DEFAULT_DISCOVERY_FILTER_SIZE, MAX_CONNECTIONS, RELAY_V2_HOP_CODEC, RELAY_V2_STOP_CODEC } from '../constants.js'
-import { StopMessage, HopMessage, Status } from '../pb/index.js'
-import { CircuitListen, CircuitSearch, LimitTracker } from '../utils.js'
-import { RelayDiscovery } from './discovery.js'
-import { createListener } from './listener.js'
-import { ReservationStore } from './reservation-store.js'
-import { streamToMaConnection } from './stream-to-conn.js'
-import type { CircuitRelayTransportComponents, CircuitRelayTransportInit } from '../index.ts'
-import type { Transport, CreateListenerOptions, Listener, Logger, Connection, Stream, OutboundConnectionUpgradeEvents, DialTransportOptions, OpenConnectionProgressEvents } from '@libp2p/interface'
-import type { Multiaddr } from '@multiformats/multiaddr'
-import type { ProgressEvent } from 'progress-events'
-
-const isValidStop = (request: StopMessage): request is Required<StopMessage> => {
-  if (request.peer == null) {
-    return false
-  }
-
-  try {
-    request.peer.addrs.forEach(multiaddr)
-  } catch {
-    return false
-  }
-
-  return true
+import { CircuitRelayTransport } from './transport.js'
+import type { RelayDiscoveryComponents } from './discovery.js'
+import type { ReservationStoreInit } from './reservation-store.js'
+import type { Transport, Upgrader, Libp2pEvents, ConnectionGater, PeerId, TopologyFilter } from '@libp2p/interface'
+import type { AddressManager, Registrar } from '@libp2p/interface-internal'
+import type { TypedEventTarget } from 'main-event'
+
+export interface CircuitRelayTransportComponents extends RelayDiscoveryComponents {
+  peerId: PeerId
+  registrar: Registrar
+  upgrader: Upgrader
+  addressManager: AddressManager
+  connectionGater: ConnectionGater
+  events: TypedEventTarget<Libp2pEvents>
 }
 
-const defaults = {
-  maxInboundStopStreams: MAX_CONNECTIONS,
-  maxOutboundStopStreams: MAX_CONNECTIONS,
-  stopTimeout: 30000
-}
-
-export type CircuitRelayDialEvents =
-  OutboundConnectionUpgradeEvents |
-  OpenConnectionProgressEvents |
-  ProgressEvent<'circuit-relay:open-connection'> |
-  ProgressEvent<'circuit-relay:reuse-connection'> |
-  ProgressEvent<'circuit-relay:open-hop-stream'> |
-  ProgressEvent<'circuit-relay:write-connect-message'> |
-  ProgressEvent<'circuit-relay:read-connect-response'>
-
-export class CircuitRelayTransport implements Transport<CircuitRelayDialEvents> {
-  private readonly components: CircuitRelayTransportComponents
-  private readonly discovery?: RelayDiscovery
-  public readonly reservationStore: ReservationStore
-  private readonly maxInboundStopStreams: number
-  private readonly maxOutboundStopStreams?: number
-  private started: boolean
-  private readonly log: Logger
-  private shutdownController: AbortController
-
-  constructor (components: CircuitRelayTransportComponents, init: CircuitRelayTransportInit = {}) {
-    this.components = components
-    this.log = components.logger.forComponent('libp2p:circuit-relay:transport')
-    this.maxInboundStopStreams = init.maxInboundStopStreams ?? defaults.maxInboundStopStreams
-    this.maxOutboundStopStreams = init.maxOutboundStopStreams ?? defaults.maxOutboundStopStreams
-    this.shutdownController = new AbortController()
-
-    this.discovery = new RelayDiscovery(components, {
-      filter: init.discoveryFilter ?? peerFilter(DEFAULT_DISCOVERY_FILTER_SIZE, DEFAULT_DISCOVERY_FILTER_ERROR_RATE)
-    })
-    this.discovery.addEventListener('relay:discover', (evt) => {
-      this.reservationStore.addRelay(evt.detail, 'discovered')
-        .catch(err => {
-          if (err.name !== 'HadEnoughRelaysError' && err.name !== 'RelayQueueFullError') {
-            this.log.error('could not add discovered relay %p', evt.detail, err)
-          }
-        })
-    })
-    this.reservationStore = new ReservationStore(components, init)
-    this.reservationStore.addEventListener('relay:not-enough-relays', () => {
-      this.discovery?.startDiscovery()
-    })
-    this.reservationStore.addEventListener('relay:found-enough-relays', () => {
-      this.discovery?.stopDiscovery()
-    })
-
-    this.started = false
-
-    this.onStop = this.onStop.bind(this)
-  }
-
-  readonly [Symbol.toStringTag] = '@libp2p/circuit-relay-v2-transport'
-
-  readonly [serviceCapabilities]: string[] = [
-    '@libp2p/transport',
-    '@libp2p/circuit-relay-v2-transport'
-  ]
-
-  get [serviceDependencies] (): string[] {
-    // we only need identify if discovery is enabled
-    if (this.discovery != null) {
-      return [
-        '@libp2p/identify'
-      ]
-    }
-
-    return []
-  }
-
-  readonly [transportSymbol] = true
-
-  isStarted (): boolean {
-    return this.started
-  }
-
-  async start (): Promise<void> {
-    this.shutdownController = new AbortController()
-    setMaxListeners(Infinity, this.shutdownController.signal)
-
-    await this.components.registrar.handle(RELAY_V2_STOP_CODEC, this.onStop, {
-      maxInboundStreams: this.maxInboundStopStreams,
-      maxOutboundStreams: this.maxOutboundStopStreams,
-      runOnLimitedConnection: true
-    })
-
-    await start(this.discovery, this.reservationStore)
-
-    this.started = true
-  }
-
-  async stop (): Promise<void> {
-    this.shutdownController.abort()
-    await stop(this.discovery, this.reservationStore)
-    await this.components.registrar.unhandle(RELAY_V2_STOP_CODEC)
-
-    this.started = false
-  }
-
+/**
+ * RelayConfig configures the circuit v2 relay transport.
+ */
+export interface CircuitRelayTransportInit extends ReservationStoreInit {
   /**
-   * Dial a peer over a relay
+   * An optional filter used to prevent duplicate attempts to reserve relay
+   * slots on the same peer
    */
-  async dial (ma: Multiaddr, options: DialTransportOptions<CircuitRelayDialEvents>): Promise<Connection> {
-    // Check the multiaddr to see if it contains a relay and a destination peer
-    const addrs = ma.toString().split('/p2p-circuit')
-    const relayAddr = multiaddr(addrs[0])
-    const destinationAddr = multiaddr(addrs[addrs.length - 1])
-    const relayId = relayAddr.getComponents().find(c => c.code === CODE_P2P)?.value
-    const destinationId = destinationAddr.getComponents().find(c => c.code === CODE_P2P)?.value
-
-    if (relayId == null || destinationId == null) {
-      const errMsg = `ircuit relay dial to ${ma.toString()} failed as address did not have both relay and destination PeerIDs`
-      this.log.error(`c${errMsg}`)
-      throw new DialError(`C${errMsg}`)
-    }
-
-    const relayPeer = peerIdFromString(relayId)
-    const destinationPeer = peerIdFromString(destinationId)
-
-    const relayConnections = this.components.connectionManager.getConnections(relayPeer)
-    let relayConnection = relayConnections[0]
-
-    if (relayConnection == null) {
-      await this.components.peerStore.merge(relayPeer, {
-        multiaddrs: [relayAddr]
-      })
-
-      options.onProgress?.(new CustomProgressEvent('circuit-relay:open-connection'))
-      relayConnection = await this.components.connectionManager.openConnection(relayPeer, options)
-    } else {
-      options.onProgress?.(new CustomProgressEvent('circuit-relay:reuse-connection'))
-    }
-
-    let stream: Stream | undefined
-
-    try {
-      options.onProgress?.(new CustomProgressEvent('circuit-relay:open-hop-stream'))
-      stream = await relayConnection.newStream(RELAY_V2_HOP_CODEC, options)
-
-      const hopstr = pbStream(stream).pb(HopMessage)
-
-      options.onProgress?.(new CustomProgressEvent('circuit-relay:write-connect-message'))
-      await hopstr.write({
-        type: HopMessage.Type.CONNECT,
-        peer: {
-          id: destinationPeer.toMultihash().bytes,
-          addrs: [multiaddr(destinationAddr).bytes]
-        }
-      }, options)
-
-      options.onProgress?.(new CustomProgressEvent('circuit-relay:read-connect-response'))
-      const status = await hopstr.read(options)
-
-      if (status.status !== Status.OK) {
-        throw new InvalidMessageError(`failed to connect via relay with status ${status?.status?.toString() ?? 'undefined'}`)
-      }
-
-      const limits = new LimitTracker(status.limit)
-
-      const maConn = streamToMaConnection({
-        stream: hopstr.unwrap().unwrap(),
-        remoteAddr: ma,
-        localAddr: relayAddr.encapsulate(`/p2p-circuit/p2p/${this.components.peerId.toString()}`),
-        onDataRead: limits.onData,
-        onDataWrite: limits.onData,
-        log: stream.log.newScope('circuit-relay:connection')
-      })
-
-      const conn = await this.components.upgrader.upgradeOutbound(maConn, {
-        ...options,
-        limits: limits.getLimits()
-      })
-
-      conn.log('outbound relayed connection established to %p with limits %o, over connection %s', conn.remotePeer, status.limit ?? 'none', relayConnection.id)
-
-      return conn
-    } catch (err: any) {
-      this.log.error('circuit relay dial to destination %p via relay %p failed', destinationPeer, relayPeer, err)
-      stream?.abort(err)
-
-      throw err
-    }
-  }
+  discoveryFilter?: TopologyFilter
 
   /**
-   * Create a listener
+   * The maximum number of simultaneous STOP inbound streams that can be open at
+   * once - each inbound relayed connection uses a STOP stream
+   *
+   * @default 300
    */
-  createListener (options: CreateListenerOptions): Listener {
-    return createListener({
-      peerId: this.components.peerId,
-      connectionManager: this.components.connectionManager,
-      addressManager: this.components.addressManager,
-      reservationStore: this.reservationStore,
-      logger: this.components.logger
-    })
-  }
+  maxInboundStopStreams?: number
 
   /**
-   * Filter check for all Multiaddrs that this transport can listen on
+   * The maximum number of simultaneous STOP outbound streams that can be open
+   * at once. If this transport is used along with the relay server these
+   * settings should be set to the same value
+   *
+   * @default 300
    */
-  listenFilter (multiaddrs: Multiaddr[]): Multiaddr[] {
-    multiaddrs = Array.isArray(multiaddrs) ? multiaddrs : [multiaddrs]
-
-    return multiaddrs.filter((ma) => {
-      return CircuitListen.exactMatch(ma) || CircuitSearch.exactMatch(ma)
-    })
-  }
+  maxOutboundStopStreams?: number
 
   /**
-   * Filter check for all Multiaddrs that this transport can dial
+   * Incoming STOP requests (e.g. when a remote peer wants to dial us via a
+   * relay) must finish the initial protocol negotiation within this timeout in
+   * ms
+   *
+   * @deprecated Configure `connectionManager.inboundUpgradeTimeout` instead
    */
-  dialFilter (multiaddrs: Multiaddr[]): Multiaddr[] {
-    multiaddrs = Array.isArray(multiaddrs) ? multiaddrs : [multiaddrs]
-
-    return multiaddrs.filter((ma) => {
-      return Circuit.exactMatch(ma)
-    })
-  }
+  stopTimeout?: number
 
   /**
-   * An incoming STOP request means a remote peer wants to dial us via a relay
+   * When creating a reservation it must complete within this number of ms
+   *
+   * @default 10_000
    */
-  async onStop (stream: Stream, connection: Connection): Promise<void> {
-    const signal = this.components.upgrader.createInboundAbortSignal(this.shutdownController.signal)
-
-    try {
-      if (!this.reservationStore.hasReservation(connection.remotePeer)) {
-        try {
-          this.log('dialed via relay we did not have a reservation on, start listening on that relay address')
-          await this.components.transportManager.listen([connection.remoteAddr.encapsulate('/p2p-circuit')])
-        } catch (err: any) {
-          // failed to refresh our hitherto unknown relay reservation but allow the connection attempt anyway
-          this.log.error('failed to listen on a relay peer we were dialed via but did not have a reservation on', err)
-        }
-      }
-
-      const stopStream = pbStream(stream).pb(StopMessage)
-      const request = await stopStream.read({
-        signal
-      })
-
-      this.log('new circuit relay v2 stop stream from %p with type %s', connection.remotePeer, request.type)
-
-      if (request?.type === undefined) {
-        this.log.error('type was missing from circuit v2 stop protocol request from %s', connection.remotePeer)
-        await stopStream.write({ type: StopMessage.Type.STATUS, status: Status.MALFORMED_MESSAGE }, {
-          signal
-        })
-        await stream.close({
-          signal
-        })
-        return
-      }
-
-      // Validate the STOP request has the required input
-      if (request.type !== StopMessage.Type.CONNECT) {
-        this.log.error('invalid stop connect request via peer %p', connection.remotePeer)
-        await stopStream.write({ type: StopMessage.Type.STATUS, status: Status.UNEXPECTED_MESSAGE }, {
-          signal
-        })
-        await stream.close({
-          signal
-        })
-        return
-      }
-
-      if (!isValidStop(request)) {
-        this.log.error('invalid stop connect request via peer %p', connection.remotePeer)
-        await stopStream.write({ type: StopMessage.Type.STATUS, status: Status.MALFORMED_MESSAGE }, {
-          signal
-        })
-        await stream.close({
-          signal
-        })
-        return
-      }
-
-      const remotePeerId = peerIdFromMultihash(Digest.decode(request.peer.id))
-
-      if ((await this.components.connectionGater.denyInboundRelayedConnection?.(connection.remotePeer, remotePeerId)) === true) {
-        this.log.error('connection gater denied inbound relayed connection from %p', connection.remotePeer)
-        await stopStream.write({ type: StopMessage.Type.STATUS, status: Status.PERMISSION_DENIED }, {
-          signal
-        })
-        await stream.close({
-          signal
-        })
-        return
-      }
-
-      this.log.trace('sending success response to %p', connection.remotePeer)
-      await stopStream.write({ type: StopMessage.Type.STATUS, status: Status.OK }, {
-        signal
-      })
-
-      const limits = new LimitTracker(request.limit)
-      const remoteAddr = connection.remoteAddr.encapsulate(`/p2p-circuit/p2p/${remotePeerId.toString()}`)
-      const localAddr = this.components.addressManager.getAddresses()[0]
-      const maConn = streamToMaConnection({
-        stream: stopStream.unwrap().unwrap(),
-        remoteAddr,
-        localAddr,
-        onDataRead: limits.onData,
-        onDataWrite: limits.onData,
-        log: stream.log.newScope('circuit-relay:connection')
-      })
-
-      await this.components.upgrader.upgradeInbound(maConn, {
-        limits: limits.getLimits(),
-        signal
-      })
+  reservationCompletionTimeout?: number
+}
 
-      maConn.log('inbound relayed connection established to %p with limits %o, over connection %s', remotePeerId, request.limit ?? 'none', connection.id)
-    } finally {
-      signal?.clear()
-    }
+export function circuitRelayTransport (init: CircuitRelayTransportInit = {}): (components: CircuitRelayTransportComponents) => Transport {
+  return (components) => {
+    return new CircuitRelayTransport(components, init)
   }
 }

package/src/transport/reservation-store.ts

@@ -1,19 +1,20 @@
 import { ListenError } from '@libp2p/interface'
 import { PeerMap } from '@libp2p/peer-collections'
-import { createScalableCuckooFilter, PeerQueue, pbStream } from '@libp2p/utils'
-import { CODE_P2P, multiaddr } from '@multiformats/multiaddr'
+import { createScalableCuckooFilter } from '@libp2p/utils/filters'
+import { PeerQueue } from '@libp2p/utils/peer-queue'
+import { multiaddr } from '@multiformats/multiaddr'
 import { Circuit } from '@multiformats/multiaddr-matcher'
+import { pbStream } from 'it-protobuf-stream'
 import { TypedEventEmitter, setMaxListeners } from 'main-event'
 import { nanoid } from 'nanoid'
 import { DEFAULT_MAX_RESERVATION_QUEUE_LENGTH, DEFAULT_RESERVATION_COMPLETION_TIMEOUT, DEFAULT_RESERVATION_CONCURRENCY, KEEP_ALIVE_TAG, RELAY_V2_HOP_CODEC } from '../constants.js'
 import { DoubleRelayError, HadEnoughRelaysError, RelayQueueFullError } from '../errors.js'
 import { HopMessage, Status } from '../pb/index.js'
 import { getExpirationMilliseconds } from '../utils.js'
-import type { TransportReservationStoreComponents, TransportReservationStoreInit } from '../index.ts'
 import type { Reservation } from '../pb/index.js'
-import type { AbortOptions, Libp2pEvents, Logger, PeerId, PeerStore, Startable, Peer, Connection } from '@libp2p/interface'
+import type { AbortOptions, Libp2pEvents, ComponentLogger, Logger, PeerId, PeerStore, Startable, Metrics, Peer, Connection } from '@libp2p/interface'
 import type { ConnectionManager } from '@libp2p/interface-internal'
-import type { Filter } from '@libp2p/utils'
+import type { Filter } from '@libp2p/utils/filters'
 import type { TypedEventTarget } from 'main-event'
 
 // allow refreshing a relay reservation if it will expire in the next 10 minutes
@@ -25,6 +26,43 @@ const REFRESH_TIMEOUT = (60 * 1000) * 5
 // minimum duration before which a reservation must not be refreshed
 const REFRESH_TIMEOUT_MIN = 30 * 1000
 
+export interface ReservationStoreComponents {
+  peerId: PeerId
+  connectionManager: ConnectionManager
+  peerStore: PeerStore
+  events: TypedEventTarget<Libp2pEvents>
+  logger: ComponentLogger
+  metrics?: Metrics
+}
+
+export interface ReservationStoreInit {
+  /**
+   * Multiple relays may be discovered simultaneously - to prevent listening
+   * on too many relays, this value controls how many to attempt to reserve a
+   * slot on at once. If set to more than one, we may end up listening on
+   * more relays than the `maxReservations` value, but on networks with poor
+   * connectivity the user may wish to attempt to reserve on multiple relays
+   * simultaneously.
+   *
+   * @default 1
+   */
+  reservationConcurrency?: number
+
+  /**
+   * Limit the number of potential relays we will dial
+   *
+   * @default 100
+   */
+  maxReservationQueueLength?: number
+
+  /**
+   * When creating a reservation it must complete within this number of ms
+   *
+   * @default 5000
+   */
+  reservationCompletionTimeout?: number
+}
+
 export type RelayType = 'discovered' | 'configured'
 
 export interface DiscoveredRelayEntry {
@@ -82,7 +120,7 @@ export class ReservationStore extends TypedEventEmitter<ReservationStoreEvents>
   private readonly log: Logger
   private relayFilter: Filter
 
-  constructor (components: TransportReservationStoreComponents, init?: TransportReservationStoreInit) {
+  constructor (components: ReservationStoreComponents, init?: ReservationStoreInit) {
     super()
 
     this.log = components.logger.forComponent('libp2p:circuit-relay:transport:reservation-store')
@@ -415,7 +453,7 @@ export class ReservationStore extends TypedEventEmitter<ReservationStoreEvents>
       }
     }
 
-    this.log.trace('read response %s', response.status)
+    this.log.trace('read response %o', response)
 
     if (response.status === Status.OK && response.reservation != null) {
       // check that the returned relay has the relay address - this can be
@@ -427,7 +465,7 @@ export class ReservationStore extends TypedEventEmitter<ReservationStoreEvents>
       for (const buf of response.reservation.addrs) {
         let ma = multiaddr(buf)
 
-        if (ma.getComponents().find(c => c.code === CODE_P2P) == null) {
+        if (ma.getPeerId() == null) {
           ma = ma.encapsulate(`/p2p/${connection.remotePeer}`)
         }