libp2p 0.46.19-fb8a6f188 → 0.46.19

package/src/connection-manager/utils.ts

@@ -1,12 +1,14 @@
 import { setMaxListeners } from '@libp2p/interface/events'
+import { logger } from '@libp2p/logger'
 import { type AbortOptions, multiaddr, type Multiaddr } from '@multiformats/multiaddr'
 import { type ClearableSignal, anySignal } from 'any-signal'
-import type { LoggerOptions } from '@libp2p/interface'
+
+const log = logger('libp2p:connection-manager:utils')
 
 /**
  * Resolve multiaddr recursively
  */
-export async function resolveMultiaddrs (ma: Multiaddr, options: AbortOptions & LoggerOptions): Promise<Multiaddr[]> {
+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')
@@ -29,7 +31,7 @@ export async function resolveMultiaddrs (ma: Multiaddr, options: AbortOptions &
     return array
   }, ([]))
 
-  options.log('resolved %s to', ma, output.map(ma => ma.toString()))
+  log('resolved %s to', ma, output.map(ma => ma.toString()))
 
   return output
 }
@@ -37,13 +39,13 @@ export async function resolveMultiaddrs (ma: Multiaddr, options: AbortOptions &
 /**
  * Resolve a given multiaddr. If this fails, an empty array will be returned
  */
-async function resolveRecord (ma: Multiaddr, options: AbortOptions & LoggerOptions): Promise<Multiaddr[]> {
+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) {
-    options.log.error(`multiaddr ${ma.toString()} could not be resolved`, err)
+    log.error(`multiaddr ${ma.toString()} could not be resolved`, err)
     return []
   }
 }

package/src/identify/identify.ts

@@ -1,5 +1,6 @@
 import { CodeError } from '@libp2p/interface/errors'
 import { setMaxListeners } from '@libp2p/interface/events'
+import { logger } from '@libp2p/logger'
 import { peerIdFromKeys } from '@libp2p/peer-id'
 import { RecordEnvelope, PeerRecord } from '@libp2p/peer-record'
 import { type Multiaddr, multiaddr, protocols } from '@multiformats/multiaddr'
@@ -19,7 +20,7 @@ import {
 } from './consts.js'
 import { Identify } from './pb/message.js'
 import type { IdentifyService, IdentifyServiceComponents, IdentifyServiceInit } from './index.js'
-import type { Libp2pEvents, IdentifyResult, SignedPeerRecord, AbortOptions, Logger } from '@libp2p/interface'
+import type { Libp2pEvents, IdentifyResult, SignedPeerRecord, AbortOptions } from '@libp2p/interface'
 import type { Connection, Stream } from '@libp2p/interface/connection'
 import type { TypedEventTarget } from '@libp2p/interface/events'
 import type { PeerId } from '@libp2p/interface/peer-id'
@@ -29,6 +30,8 @@ import type { AddressManager } from '@libp2p/interface-internal/address-manager'
 import type { ConnectionManager } from '@libp2p/interface-internal/connection-manager'
 import type { IncomingStreamData, Registrar } from '@libp2p/interface-internal/registrar'
 
+const log = logger('libp2p:identify')
+
 // https://github.com/libp2p/go-libp2p/blob/8d2e54e1637041d5cf4fac1e531287560bd1f4ac/p2p/protocol/identify/id.go#L52
 const MAX_IDENTIFY_MESSAGE_SIZE = 1024 * 8
 
@@ -70,7 +73,6 @@ export class DefaultIdentifyService implements Startable, IdentifyService {
   private readonly maxObservedAddresses: number
   private readonly events: TypedEventTarget<Libp2pEvents>
   private readonly runOnTransientConnection: boolean
-  readonly #log: Logger
 
   constructor (components: IdentifyServiceComponents, init: IdentifyServiceInit) {
     this.started = false
@@ -80,7 +82,6 @@ export class DefaultIdentifyService implements Startable, IdentifyService {
     this.addressManager = components.addressManager
     this.connectionManager = components.connectionManager
     this.events = components.events
-    this.#log = components.logger.forComponent('libp2p:identify')
 
     this.identifyProtocolStr = `/${init.protocolPrefix ?? defaultValues.protocolPrefix}/${MULTICODEC_IDENTIFY_PROTOCOL_NAME}/${MULTICODEC_IDENTIFY_PROTOCOL_VERSION}`
     this.identifyPushProtocolStr = `/${init.protocolPrefix ?? defaultValues.protocolPrefix}/${MULTICODEC_IDENTIFY_PUSH_PROTOCOL_NAME}/${MULTICODEC_IDENTIFY_PUSH_PROTOCOL_VERSION}`
@@ -103,13 +104,13 @@ export class DefaultIdentifyService implements Startable, IdentifyService {
       // When a new connection happens, trigger identify
       components.events.addEventListener('connection:open', (evt) => {
         const connection = evt.detail
-        this.identify(connection).catch(err => { this.#log.error('error during identify trigged by connection:open', err) })
+        this.identify(connection).catch(err => { log.error('error during identify trigged by connection:open', err) })
       })
     }
 
     // When self peer record changes, trigger identify-push
     components.events.addEventListener('self:peer:update', (evt) => {
-      void this.push().catch(err => { this.#log.error(err) })
+      void this.push().catch(err => { log.error(err) })
     })
 
     // Append user agent version to default AGENT_VERSION depending on the environment
@@ -140,7 +141,7 @@ export class DefaultIdentifyService implements Startable, IdentifyService {
 
     await this.registrar.handle(this.identifyProtocolStr, (data) => {
       void this._handleIdentify(data).catch(err => {
-        this.#log.error(err)
+        log.error(err)
       })
     }, {
       maxInboundStreams: this.maxInboundStreams,
@@ -149,7 +150,7 @@ export class DefaultIdentifyService implements Startable, IdentifyService {
     })
     await this.registrar.handle(this.identifyPushProtocolStr, (data) => {
       void this._handlePush(data).catch(err => {
-        this.#log.error(err)
+        log.error(err)
       })
     }, {
       maxInboundStreams: this.maxPushIncomingStreams,
@@ -214,7 +215,7 @@ export class DefaultIdentifyService implements Startable, IdentifyService {
         })
       } catch (err: any) {
         // Just log errors
-        this.#log.error('could not push identify update to peer', err)
+        log.error('could not push identify update to peer', err)
         stream?.abort(err)
       }
     })
@@ -275,7 +276,7 @@ export class DefaultIdentifyService implements Startable, IdentifyService {
 
       return message
     } catch (err: any) {
-      this.#log.error('error while reading identify message', err)
+      log.error('error while reading identify message', err)
       stream?.abort(err)
       throw err
     }
@@ -306,12 +307,12 @@ export class DefaultIdentifyService implements Startable, IdentifyService {
     // Get the observedAddr if there is one
     const cleanObservedAddr = getCleanMultiaddr(observedAddr)
 
-    this.#log('identify completed for peer %p and protocols %o', id, protocols)
-    this.#log('our observed address is %a', cleanObservedAddr)
+    log('identify completed for peer %p and protocols %o', id, protocols)
+    log('our observed address is %a', cleanObservedAddr)
 
     if (cleanObservedAddr != null &&
         this.addressManager.getObservedAddrs().length < (this.maxObservedAddresses ?? Infinity)) {
-      this.#log('storing our observed address %a', cleanObservedAddr)
+      log('storing our observed address %a', cleanObservedAddr)
       this.addressManager.addObservedAddr(cleanObservedAddr)
     }
 
@@ -369,7 +370,7 @@ export class DefaultIdentifyService implements Startable, IdentifyService {
         signal
       })
     } catch (err: any) {
-      this.#log.error('could not respond to identify request', err)
+      log.error('could not respond to identify request', err)
       stream.abort(err)
     }
   }
@@ -398,16 +399,16 @@ export class DefaultIdentifyService implements Startable, IdentifyService {
 
       await this.#consumeIdentifyMessage(connection, message)
     } catch (err: any) {
-      this.#log.error('received invalid message', err)
+      log.error('received invalid message', err)
       stream.abort(err)
       return
     }
 
-    this.#log('handled push from %p', connection.remotePeer)
+    log('handled push from %p', connection.remotePeer)
   }
 
   async #consumeIdentifyMessage (connection: Connection, message: Identify): Promise<IdentifyResult> {
-    this.#log('received identify from %p', connection.remotePeer)
+    log('received identify from %p', connection.remotePeer)
 
     if (message == null) {
       throw new CodeError('message was null or undefined', 'ERR_INVALID_MESSAGE')
@@ -440,7 +441,7 @@ export class DefaultIdentifyService implements Startable, IdentifyService {
 
     // if the peer record has been sent, prefer the addresses in the record as they are signed by the remote peer
     if (message.signedPeerRecord != null) {
-      this.#log('received signedPeerRecord in push from %p', connection.remotePeer)
+      log('received signedPeerRecord in push from %p', connection.remotePeer)
 
       let peerRecordEnvelope = message.signedPeerRecord
       const envelope = await RecordEnvelope.openAndCertify(peerRecordEnvelope, PeerRecord.DOMAIN)
@@ -477,7 +478,7 @@ export class DefaultIdentifyService implements Startable, IdentifyService {
 
           // ensure seq is greater than, or equal to, the last received
           if (storedRecord.seqNumber >= peerRecord.seqNumber) {
-            this.#log('sequence number was lower or equal to existing sequence number - stored: %d received: %d', storedRecord.seqNumber, peerRecord.seqNumber)
+            log('sequence number was lower or equal to existing sequence number - stored: %d received: %d', storedRecord.seqNumber, peerRecord.seqNumber)
             peerRecord = storedRecord
             peerRecordEnvelope = existingPeer.peerRecordEnvelope
           }
@@ -498,10 +499,10 @@ export class DefaultIdentifyService implements Startable, IdentifyService {
         addresses: peerRecord.multiaddrs
       }
     } else {
-      this.#log('%p did not send a signed peer record', connection.remotePeer)
+      log('%p did not send a signed peer record', connection.remotePeer)
     }
 
-    this.#log('patching %p with', connection.remotePeer, peer)
+    log('patching %p with', connection.remotePeer, peer)
     await this.peerStore.patch(connection.remotePeer, peer)
 
     if (message.agentVersion != null || message.protocolVersion != null) {
@@ -515,7 +516,7 @@ export class DefaultIdentifyService implements Startable, IdentifyService {
         metadata.ProtocolVersion = uint8ArrayFromString(message.protocolVersion)
       }
 
-      this.#log('merging %p metadata', connection.remotePeer, metadata)
+      log('merging %p metadata', connection.remotePeer, metadata)
       await this.peerStore.merge(connection.remotePeer, {
         metadata
       })

package/src/identify/index.ts

@@ -4,7 +4,7 @@ import {
 } from './consts.js'
 import { DefaultIdentifyService } from './identify.js'
 import { Identify } from './pb/message.js'
-import type { AbortOptions, IdentifyResult, Libp2pEvents, ComponentLogger } from '@libp2p/interface'
+import type { AbortOptions, IdentifyResult, Libp2pEvents } from '@libp2p/interface'
 import type { TypedEventTarget } from '@libp2p/interface/events'
 import type { PeerId } from '@libp2p/interface/peer-id'
 import type { PeerStore } from '@libp2p/interface/peer-store'
@@ -59,7 +59,6 @@ export interface IdentifyServiceComponents {
   registrar: Registrar
   addressManager: AddressManager
   events: TypedEventTarget<Libp2pEvents>
-  logger: ComponentLogger
 }
 
 /**

package/src/index.ts

@@ -19,7 +19,7 @@ import type { AddressManagerInit } from './address-manager/index.js'
 import type { Components } from './components.js'
 import type { ConnectionManagerInit } from './connection-manager/index.js'
 import type { TransportManagerInit } from './transport-manager.js'
-import type { Libp2p, ServiceMap, RecursivePartial, ComponentLogger } from '@libp2p/interface'
+import type { Libp2p, ServiceMap, RecursivePartial } from '@libp2p/interface'
 import type { ConnectionProtector } from '@libp2p/interface/connection'
 import type { ConnectionEncrypter } from '@libp2p/interface/connection-encrypter'
 import type { ConnectionGater } from '@libp2p/interface/connection-gater'
@@ -108,27 +108,6 @@ export interface Libp2pInit<T extends ServiceMap = { x: Record<string, unknown>
    * Arbitrary libp2p modules
    */
   services: ServiceFactoryMap<T>
-
-  /**
-   * An optional logging implementation that can be used to write runtime logs.
-   *
-   * Set the `DEBUG` env var or the `debug` key on LocalStorage to see logs.
-   *
-   * @example
-   *
-   * Node.js:
-   *
-   * ```console
-   * $ DEBUG="*libp2p:*" node myscript.js
-   * ```
-   *
-   * Browsers:
-   *
-   * ```javascript
-   * localStorage.setItem('debug', '*libp2p:*')
-   * ```
-   */
-  logger?: ComponentLogger
 }
 
 export type { Libp2p }

package/src/libp2p.ts

@@ -5,7 +5,7 @@ import { TypedEventEmitter, CustomEvent, setMaxListeners } from '@libp2p/interfa
 import { peerDiscovery } from '@libp2p/interface/peer-discovery'
 import { type PeerRouting, peerRouting } from '@libp2p/interface/peer-routing'
 import { DefaultKeyChain } from '@libp2p/keychain'
-import { defaultLogger } from '@libp2p/logger'
+import { logger } from '@libp2p/logger'
 import { PeerSet } from '@libp2p/peer-collections'
 import { peerIdFromString } from '@libp2p/peer-id'
 import { createEd25519PeerId } from '@libp2p/peer-id-factory'
@@ -28,7 +28,7 @@ import { DefaultTransportManager } from './transport-manager.js'
 import { DefaultUpgrader } from './upgrader.js'
 import type { Components } from './components.js'
 import type { Libp2p, Libp2pInit, Libp2pOptions } from './index.js'
-import type { Libp2pEvents, PendingDial, ServiceMap, AbortOptions, ComponentLogger, Logger } from '@libp2p/interface'
+import type { Libp2pEvents, PendingDial, ServiceMap, AbortOptions } from '@libp2p/interface'
 import type { Connection, NewStreamOptions, Stream } from '@libp2p/interface/connection'
 import type { KeyChain } from '@libp2p/interface/keychain'
 import type { Metrics } from '@libp2p/interface/metrics'
@@ -39,6 +39,8 @@ import type { Topology } from '@libp2p/interface/topology'
 import type { StreamHandler, StreamHandlerOptions } from '@libp2p/interface-internal/registrar'
 import type { Datastore } from 'interface-datastore'
 
+const log = logger('libp2p')
+
 export class Libp2pNode<T extends ServiceMap = Record<string, unknown>> extends TypedEventEmitter<Libp2pEvents> implements Libp2p<T> {
   public peerId: PeerId
   public peerStore: PeerStore
@@ -47,11 +49,9 @@ export class Libp2pNode<T extends ServiceMap = Record<string, unknown>> extends
   public keychain: KeyChain
   public metrics?: Metrics
   public services: T
-  public logger: ComponentLogger
 
   public components: Components
   #started: boolean
-  readonly #log: Logger
 
   constructor (init: Libp2pInit<T>) {
     super()
@@ -74,13 +74,10 @@ export class Libp2pNode<T extends ServiceMap = Record<string, unknown>> extends
 
     this.#started = false
     this.peerId = init.peerId
-    this.logger = init.logger ?? defaultLogger()
-    this.#log = this.logger.forComponent('libp2p')
     // @ts-expect-error {} may not be of type T
     this.services = {}
     const components = this.components = defaultComponents({
       peerId: init.peerId,
-      logger: this.logger,
       events,
       datastore: init.datastore ?? new MemoryDatastore(),
       connectionGater: connectionGater(init.connectionGater)
@@ -173,7 +170,7 @@ export class Libp2pNode<T extends ServiceMap = Record<string, unknown>> extends
         const service: any = createService(this.components)
 
         if (service == null) {
-          this.#log.error('service factory %s returned null or undefined instance', name)
+          log.error('service factory %s returned null or undefined instance', name)
           continue
         }
 
@@ -181,17 +178,17 @@ export class Libp2pNode<T extends ServiceMap = Record<string, unknown>> extends
         this.configureComponent(name, service)
 
         if (service[contentRouting] != null) {
-          this.#log('registering service %s for content routing', name)
+          log('registering service %s for content routing', name)
           contentRouters.push(service[contentRouting])
         }
 
         if (service[peerRouting] != null) {
-          this.#log('registering service %s for peer routing', name)
+          log('registering service %s for peer routing', name)
           peerRouters.push(service[peerRouting])
         }
 
         if (service[peerDiscovery] != null) {
-          this.#log('registering service %s for peer discovery', name)
+          log('registering service %s for peer discovery', name)
           service[peerDiscovery].addEventListener('peer', (evt: CustomEvent<PeerInfo>) => {
             this.#onDiscoveryPeer(evt)
           })
@@ -202,7 +199,7 @@ export class Libp2pNode<T extends ServiceMap = Record<string, unknown>> extends
 
   private configureComponent <T> (name: string, component: T): T {
     if (component == null) {
-      this.#log.error('component %s was null or undefined', name)
+      log.error('component %s was null or undefined', name)
     }
 
     this.components[name] = component
@@ -220,12 +217,12 @@ export class Libp2pNode<T extends ServiceMap = Record<string, unknown>> extends
 
     this.#started = true
 
-    this.#log('libp2p is starting')
+    log('libp2p is starting')
 
     const keys = await this.keychain.listKeys()
 
     if (keys.find(key => key.name === 'self') == null) {
-      this.#log('importing self key into keychain')
+      log('importing self key into keychain')
       await this.keychain.importPeer('self', this.components.peerId)
     }
 
@@ -235,9 +232,9 @@ export class Libp2pNode<T extends ServiceMap = Record<string, unknown>> extends
       await this.components.afterStart?.()
 
       this.safeDispatchEvent('start', { detail: this })
-      this.#log('libp2p has started')
+      log('libp2p has started')
     } catch (err: any) {
-      this.#log.error('An error occurred starting libp2p', err)
+      log.error('An error occurred starting libp2p', err)
       await this.stop()
       throw err
     }
@@ -251,7 +248,7 @@ export class Libp2pNode<T extends ServiceMap = Record<string, unknown>> extends
       return
     }
 
-    this.#log('libp2p is stopping')
+    log('libp2p is stopping')
 
     this.#started = false
 
@@ -260,7 +257,7 @@ export class Libp2pNode<T extends ServiceMap = Record<string, unknown>> extends
     await this.components.afterStop?.()
 
     this.safeDispatchEvent('stop', { detail: this })
-    this.#log('libp2p has stopped')
+    log('libp2p has stopped')
   }
 
   isStarted (): boolean {
@@ -325,7 +322,7 @@ export class Libp2pNode<T extends ServiceMap = Record<string, unknown>> extends
    * Get the public key for the given peer id
    */
   async getPublicKey (peer: PeerId, options: AbortOptions = {}): Promise<Uint8Array> {
-    this.#log('getPublicKey %p', peer)
+    log('getPublicKey %p', peer)
 
     if (peer.publicKey != null) {
       return peer.publicKey
@@ -394,7 +391,7 @@ export class Libp2pNode<T extends ServiceMap = Record<string, unknown>> extends
     const { detail: peer } = evt
 
     if (peer.id.toString() === this.peerId.toString()) {
-      this.#log.error(new Error(codes.ERR_DISCOVERED_SELF))
+      log.error(new Error(codes.ERR_DISCOVERED_SELF))
       return
     }
 
@@ -402,7 +399,7 @@ export class Libp2pNode<T extends ServiceMap = Record<string, unknown>> extends
       multiaddrs: peer.multiaddrs,
       protocols: peer.protocols
     })
-      .catch(err => { this.#log.error(err) })
+      .catch(err => { log.error(err) })
   }
 }