libp2p 0.41.0-3e53c19 → 0.41.0-3e8501d

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "libp2p",
-  "version": "0.41.0-3e53c19",
+  "version": "0.41.0-3e8501d",
   "description": "JavaScript implementation of libp2p, a modular peer to peer network stack",
   "license": "Apache-2.0 OR MIT",
   "homepage": "https://github.com/libp2p/js-libp2p#readme",
@@ -59,10 +59,6 @@
     "./pnet": {
       "types": "./dist/src/pnet/index.d.ts",
       "import": "./dist/src/pnet/index.js"
-    },
-    "./transport-manager": {
-      "types": "./dist/src/transport-manager.d.ts",
-      "import": "./dist/src/transport-manager.js"
     }
   },
   "eslintConfig": {
@@ -104,27 +100,27 @@
     "@libp2p/interface-connection": "^3.0.2",
     "@libp2p/interface-connection-encrypter": "^3.0.1",
     "@libp2p/interface-connection-manager": "^1.1.1",
-    "@libp2p/interface-content-routing": "^1.0.2",
-    "@libp2p/interface-dht": "^1.0.1",
+    "@libp2p/interface-content-routing": "^2.0.0",
+    "@libp2p/interface-dht": "^2.0.0",
     "@libp2p/interface-libp2p": "^1.0.0",
     "@libp2p/interface-metrics": "^4.0.0",
     "@libp2p/interface-peer-discovery": "^1.0.1",
-    "@libp2p/interface-peer-id": "^1.0.4",
+    "@libp2p/interface-peer-id": "^2.0.0",
     "@libp2p/interface-peer-info": "^1.0.3",
     "@libp2p/interface-peer-routing": "^1.0.1",
     "@libp2p/interface-peer-store": "^1.2.2",
     "@libp2p/interface-pubsub": "^3.0.0",
     "@libp2p/interface-registrar": "^2.0.3",
     "@libp2p/interface-stream-muxer": "^3.0.0",
-    "@libp2p/interface-transport": "^2.0.0",
+    "@libp2p/interface-transport": "^2.1.0",
     "@libp2p/interfaces": "^3.0.3",
     "@libp2p/logger": "^2.0.1",
     "@libp2p/multistream-select": "^3.0.0",
-    "@libp2p/peer-collections": "^2.0.0",
-    "@libp2p/peer-id": "^1.1.15",
-    "@libp2p/peer-id-factory": "^1.0.18",
-    "@libp2p/peer-record": "^4.0.3",
-    "@libp2p/peer-store": "^5.0.0",
+    "@libp2p/peer-collections": "^3.0.0",
+    "@libp2p/peer-id": "^2.0.0",
+    "@libp2p/peer-id-factory": "^2.0.0",
+    "@libp2p/peer-record": "^5.0.0",
+    "@libp2p/peer-store": "^6.0.0",
     "@libp2p/tracked-map": "^3.0.0",
     "@libp2p/utils": "^3.0.2",
     "@multiformats/mafmt": "^11.0.2",
@@ -150,7 +146,7 @@
     "it-sort": "^2.0.0",
     "it-stream-types": "^1.0.4",
     "merge-options": "^3.0.4",
-    "multiformats": "^10.0.0",
+    "multiformats": "^11.0.0",
     "node-forge": "^1.3.1",
     "p-fifo": "^1.0.0",
     "p-retry": "^5.0.0",
@@ -168,24 +164,24 @@
     "xsalsa20": "^1.1.0"
   },
   "devDependencies": {
-    "@chainsafe/libp2p-noise": "^10.0.1",
+    "@chainsafe/libp2p-noise": "^11.0.0",
     "@chainsafe/libp2p-yamux": "^3.0.3",
-    "@libp2p/bootstrap": "^5.0.0",
-    "@libp2p/daemon-client": "^3.0.5",
-    "@libp2p/daemon-server": "^3.0.4",
-    "@libp2p/floodsub": "^5.0.0",
+    "@libp2p/bootstrap": "^6.0.0",
+    "@libp2p/daemon-client": "^4.0.1",
+    "@libp2p/daemon-server": "^4.0.1",
+    "@libp2p/floodsub": "^6.0.0",
     "@libp2p/interface-compliance-tests": "^3.0.2",
     "@libp2p/interface-connection-compliance-tests": "^2.0.3",
-    "@libp2p/interface-connection-encrypter-compliance-tests": "^3.0.0",
-    "@libp2p/interface-mocks": "^8.0.0",
-    "@libp2p/interop": "^3.0.1",
-    "@libp2p/kad-dht": "^6.0.0",
-    "@libp2p/mdns": "^5.0.0",
+    "@libp2p/interface-connection-encrypter-compliance-tests": "^4.0.0",
+    "@libp2p/interface-mocks": "^9.0.0",
+    "@libp2p/interop": "^4.0.0",
+    "@libp2p/kad-dht": "^7.0.0",
+    "@libp2p/mdns": "^6.0.0",
     "@libp2p/mplex": "^7.0.0",
-    "@libp2p/pubsub": "^5.0.0",
+    "@libp2p/pubsub": "^6.0.0",
     "@libp2p/tcp": "^6.0.0",
-    "@libp2p/topology": "^3.0.1",
-    "@libp2p/webrtc-star": "^5.0.2",
+    "@libp2p/topology": "^4.0.0",
+    "@libp2p/webrtc-star": "^6.0.0",
     "@libp2p/websockets": "^5.0.0",
     "@types/node-forge": "^1.0.0",
     "@types/p-fifo": "^1.0.0",

package/src/config.ts

@@ -4,7 +4,7 @@ import * as Constants from './constants.js'
 import { AGENT_VERSION } from './identify/consts.js'
 import * as RelayConstants from './circuit/constants.js'
 import { publicAddressesFirst } from '@libp2p/utils/address-sort'
-import { FaultTolerance } from './transport-manager.js'
+import { FaultTolerance } from '@libp2p/interface-transport'
 import type { Multiaddr } from '@multiformats/multiaddr'
 import type { Libp2pInit } from './index.js'
 import { codes, messages } from './errors.js'
@@ -31,15 +31,7 @@ const DefaultConfig: Partial<Libp2pInit> = {
     resolvers: {
       dnsaddr: dnsaddrResolver
     },
-    addressSorter: publicAddressesFirst,
-    maxEventLoopDelay: Infinity,
-    pollInterval: Infinity,
-    maxAddrsToDial: Infinity,
-    startupReconnectTimeout: Infinity,
-    allow: [],
-    deny: [],
-    maxIncomingPendingConnections: Infinity,
-    inboundConnectionThreshold: Infinity
+    addressSorter: publicAddressesFirst
   },
   connectionGater: {},
   transportManager: {
@@ -50,8 +42,7 @@ const DefaultConfig: Partial<Libp2pInit> = {
       enabled: true,
       interval: 6e5,
       bootDelay: 10e3
-    },
-    routers: []
+    }
   },
   nat: {
     enabled: true,

package/src/connection-manager/index.ts

@@ -143,7 +143,7 @@ export interface DefaultConnectionManagerComponents {
   dialer: Dialer
 }
 
-export type ConnectionManagerInit = Required<ConnectionManagerConfig>
+export type ConnectionManagerInit = ConnectionManagerConfig
 
 /**
  * Responsible for managing known connections.
@@ -153,7 +153,7 @@ export class DefaultConnectionManager extends EventEmitter<ConnectionManagerEven
   private readonly opts: ConnectionManagerInit
   private readonly connections: Map<string, Connection[]>
   private started: boolean
-  private readonly latencyMonitor: LatencyMonitor
+  private readonly latencyMonitor?: LatencyMonitor
   private readonly startupReconnectTimeout: number
   private connectOnStartupController?: TimeoutController
   private readonly dialTimeout: number
@@ -182,10 +182,12 @@ export class DefaultConnectionManager extends EventEmitter<ConnectionManagerEven
 
     this.started = false
 
-    this.latencyMonitor = new LatencyMonitor({
-      latencyCheckIntervalMs: init.pollInterval,
-      dataEmitIntervalMs: init.pollInterval
-    })
+    if (init.maxEventLoopDelay != null && init.maxEventLoopDelay > 0 && init.maxEventLoopDelay !== Infinity) {
+      this.latencyMonitor = new LatencyMonitor({
+        latencyCheckIntervalMs: init.pollInterval,
+        dataEmitIntervalMs: init.pollInterval
+      })
+    }
 
     try {
       // This emitter gets listened to a lot
@@ -297,9 +299,9 @@ export class DefaultConnectionManager extends EventEmitter<ConnectionManagerEven
     })
 
     // latency monitor
-    this.latencyMonitor.start()
+    this.latencyMonitor?.start()
     this._onLatencyMeasure = this._onLatencyMeasure.bind(this)
-    this.latencyMonitor.addEventListener('data', this._onLatencyMeasure)
+    this.latencyMonitor?.addEventListener('data', this._onLatencyMeasure)
 
     this.started = true
     log('started')
@@ -361,8 +363,8 @@ export class DefaultConnectionManager extends EventEmitter<ConnectionManagerEven
    * Stops the Connection Manager
    */
   async stop () {
-    this.latencyMonitor.removeEventListener('data', this._onLatencyMeasure)
-    this.latencyMonitor.stop()
+    this.latencyMonitor?.removeEventListener('data', this._onLatencyMeasure)
+    this.latencyMonitor?.stop()
 
     this.started = false
     await this._close()
@@ -579,6 +581,12 @@ export class DefaultConnectionManager extends EventEmitter<ConnectionManagerEven
    */
   async _checkMaxLimit (name: keyof ConnectionManagerInit, value: number, toPrune: number = 1) {
     const limit = this.opts[name]
+
+    if (limit == null) {
+      log.trace('limit %s was not set so it cannot be applied', name)
+      return
+    }
+
     log.trace('checking limit of %s. current value: %d of %d', name, value, limit)
     if (value > limit) {
       log('%s: limit exceeded: %p, %d/%d, pruning %d connection(s)', this.components.peerId, name, value, limit, toPrune)
@@ -623,6 +631,18 @@ export class DefaultConnectionManager extends EventEmitter<ConnectionManagerEven
         return -1
       }
 
+      // if the peers have an equal tag value then we want to close short-lived connections first
+      const connectionALifespan = a.stat.timeline.open
+      const connectionBLifespan = b.stat.timeline.open
+
+      if (connectionALifespan < connectionBLifespan) {
+        return 1
+      }
+
+      if (connectionALifespan > connectionBLifespan) {
+        return -1
+      }
+
       return 0
     })
 

package/src/identify/index.ts

@@ -79,7 +79,7 @@ export class IdentifyService implements Startable {
   private readonly components: IdentifyServiceComponents
   private readonly identifyProtocolStr: string
   private readonly identifyPushProtocolStr: string
-  private readonly host: {
+  public readonly host: {
     protocolVersion: string
     agentVersion: string
   }

package/src/libp2p.ts

@@ -32,7 +32,7 @@ import type { Connection } from '@libp2p/interface-connection'
 import type { PeerRouting } from '@libp2p/interface-peer-routing'
 import type { ContentRouting } from '@libp2p/interface-content-routing'
 import type { PubSub } from '@libp2p/interface-pubsub'
-import type { Registrar, StreamHandler, StreamHandlerOptions } from '@libp2p/interface-registrar'
+import type { Registrar, StreamHandler, StreamHandlerOptions, Topology } from '@libp2p/interface-registrar'
 import type { ConnectionManager } from '@libp2p/interface-connection-manager'
 import type { PeerInfo } from '@libp2p/interface-peer-info'
 import type { Libp2p, Libp2pEvents, Libp2pInit, Libp2pOptions } from './index.js'
@@ -56,7 +56,7 @@ export class Libp2pNode extends EventEmitter<Libp2pEvents> implements Libp2p {
   public peerId: PeerId
   public dht: DualDHT
   public pubsub: PubSub
-  public identifyService?: IdentifyService
+  public identifyService: IdentifyService
   public fetchService: FetchService
   public pingService: PingService
   public components: Components
@@ -132,6 +132,14 @@ export class Libp2pNode extends EventEmitter<Libp2pEvents> implements Libp2p {
     // Create the Connection Manager
     this.connectionManager = this.components.connectionManager = new DefaultConnectionManager(this.components, init.connectionManager)
 
+    // forward connection manager events
+    this.components.connectionManager.addEventListener('peer:disconnect', (event) => {
+      this.dispatchEvent(new CustomEvent<Connection>('peer:disconnect', { detail: event.detail }))
+    })
+    this.components.connectionManager.addEventListener('peer:connect', (event) => {
+      this.dispatchEvent(new CustomEvent<Connection>('peer:connect', { detail: event.detail }))
+    })
+
     // Create the Registrar
     this.registrar = this.components.registrar = new DefaultRegistrar(this.components)
 
@@ -373,6 +381,10 @@ export class Libp2pNode extends EventEmitter<Libp2pEvents> implements Libp2p {
     return this.components.addressManager.getAddresses()
   }
 
+  getProtocols (): string[] {
+    return this.components.registrar.getProtocols()
+  }
+
   async hangUp (peer: PeerId | Multiaddr): Promise<void> {
     const { id } = getPeer(peer)
 
@@ -462,6 +474,14 @@ export class Libp2pNode extends EventEmitter<Libp2pEvents> implements Libp2p {
     )
   }
 
+  async register (protocol: string, topology: Topology): Promise<string> {
+    return await this.registrar.register(protocol, topology)
+  }
+
+  unregister (id: string) {
+    this.registrar.unregister(id)
+  }
+
   /**
    * Called whenever peer discovery services emit `peer` events.
    * Known peers may be emitted.

package/src/peer-routing.ts

@@ -50,7 +50,7 @@ export interface RefreshManagerInit {
 }
 
 export interface PeerRoutingInit {
-  routers: PeerRouting[]
+  routers?: PeerRouting[]
   refreshManager?: RefreshManagerInit
 }
 
@@ -69,7 +69,7 @@ export class DefaultPeerRouting implements PeerRouting, Startable {
 
   constructor (components: DefaultPeerRoutingComponents, init: PeerRoutingInit) {
     this.components = components
-    this.routers = init.routers
+    this.routers = init.routers ?? []
     this.refreshManagerInit = init.refreshManager ?? {}
     this.started = false
 

package/src/transport-manager.ts

@@ -2,6 +2,7 @@ import { logger } from '@libp2p/logger'
 import pSettle from 'p-settle'
 import { codes } from './errors.js'
 import errCode from 'err-code'
+import { FaultTolerance } from '@libp2p/interface-transport'
 import type { Listener, Transport, TransportManager, TransportManagerEvents, Upgrader } from '@libp2p/interface-transport'
 import type { Multiaddr } from '@multiformats/multiaddr'
 import type { Connection } from '@libp2p/interface-connection'
@@ -270,18 +271,3 @@ export class DefaultTransportManager extends EventEmitter<TransportManagerEvents
     await Promise.all(tasks)
   }
 }
-
-/**
- * Enum Transport Manager Fault Tolerance values
- */
-export enum FaultTolerance {
-  /**
-   * should be used for failing in any listen circumstance
-   */
-  FATAL_ALL = 0,
-
-  /**
-   * should be used for not failing when not listening
-   */
-  NO_FATAL
-}

package/src/version.ts

@@ -1,2 +1,2 @@
-export const version = '0.41.0-3e53c19'
+export const version = '0.41.0-3e8501d'
 export const name = 'libp2p'