libp2p 0.46.21 → 1.0.0

package/dist/typedoc-urls.json

@@ -1,71 +1,10 @@
 {
-  "AutoNATComponents": "https://libp2p.github.io/js-libp2p/interfaces/libp2p.autonat.AutoNATComponents.html",
-  "./autonat:AutoNATComponents": "https://libp2p.github.io/js-libp2p/interfaces/libp2p.autonat.AutoNATComponents.html",
-  "AutoNATServiceInit": "https://libp2p.github.io/js-libp2p/interfaces/libp2p.autonat.AutoNATServiceInit.html",
-  "./autonat:AutoNATServiceInit": "https://libp2p.github.io/js-libp2p/interfaces/libp2p.autonat.AutoNATServiceInit.html",
-  "autoNATService": "https://libp2p.github.io/js-libp2p/functions/libp2p.autonat.autoNATService.html",
-  "./autonat:autoNATService": "https://libp2p.github.io/js-libp2p/functions/libp2p.autonat.autoNATService.html",
-  "CircuitRelayService": "https://libp2p.github.io/js-libp2p/interfaces/libp2p.circuit_relay.CircuitRelayService.html",
-  "./circuit-relay:CircuitRelayService": "https://libp2p.github.io/js-libp2p/interfaces/libp2p.circuit_relay.CircuitRelayService.html",
-  "CircuitRelayServiceEvents": "https://libp2p.github.io/js-libp2p/interfaces/libp2p.circuit_relay.CircuitRelayServiceEvents.html",
-  "./circuit-relay:CircuitRelayServiceEvents": "https://libp2p.github.io/js-libp2p/interfaces/libp2p.circuit_relay.CircuitRelayServiceEvents.html",
-  "RelayReservation": "https://libp2p.github.io/js-libp2p/interfaces/libp2p.circuit_relay.RelayReservation.html",
-  "./circuit-relay:RelayReservation": "https://libp2p.github.io/js-libp2p/interfaces/libp2p.circuit_relay.RelayReservation.html",
-  "circuitRelayServer": "https://libp2p.github.io/js-libp2p/functions/libp2p.circuit_relay.circuitRelayServer.html",
-  "circuitRelayTransport": "https://libp2p.github.io/js-libp2p/functions/libp2p.circuit_relay.circuitRelayTransport.html",
-  "FetchService": "https://libp2p.github.io/js-libp2p/interfaces/libp2p.fetch.FetchService.html",
-  "./fetch:FetchService": "https://libp2p.github.io/js-libp2p/interfaces/libp2p.fetch.FetchService.html",
-  "FetchServiceComponents": "https://libp2p.github.io/js-libp2p/interfaces/libp2p.fetch.FetchServiceComponents.html",
-  "./fetch:FetchServiceComponents": "https://libp2p.github.io/js-libp2p/interfaces/libp2p.fetch.FetchServiceComponents.html",
-  "FetchServiceInit": "https://libp2p.github.io/js-libp2p/interfaces/libp2p.fetch.FetchServiceInit.html",
-  "./fetch:FetchServiceInit": "https://libp2p.github.io/js-libp2p/interfaces/libp2p.fetch.FetchServiceInit.html",
-  "HandleMessageOptions": "https://libp2p.github.io/js-libp2p/interfaces/libp2p.fetch.HandleMessageOptions.html",
-  "./fetch:HandleMessageOptions": "https://libp2p.github.io/js-libp2p/interfaces/libp2p.fetch.HandleMessageOptions.html",
-  "LookupFunction": "https://libp2p.github.io/js-libp2p/interfaces/libp2p.fetch.LookupFunction.html",
-  "./fetch:LookupFunction": "https://libp2p.github.io/js-libp2p/interfaces/libp2p.fetch.LookupFunction.html",
-  "fetchService": "https://libp2p.github.io/js-libp2p/functions/libp2p.fetch.fetchService-1.html",
-  "./fetch:fetchService": "https://libp2p.github.io/js-libp2p/functions/libp2p.fetch.fetchService-1.html",
-  "IdentifyService": "https://libp2p.github.io/js-libp2p/interfaces/libp2p.identify.IdentifyService.html",
-  "./identify:IdentifyService": "https://libp2p.github.io/js-libp2p/interfaces/libp2p.identify.IdentifyService.html",
-  "IdentifyServiceComponents": "https://libp2p.github.io/js-libp2p/interfaces/libp2p.identify.IdentifyServiceComponents.html",
-  "./identify:IdentifyServiceComponents": "https://libp2p.github.io/js-libp2p/interfaces/libp2p.identify.IdentifyServiceComponents.html",
-  "IdentifyServiceInit": "https://libp2p.github.io/js-libp2p/interfaces/libp2p.identify.IdentifyServiceInit.html",
-  "./identify:IdentifyServiceInit": "https://libp2p.github.io/js-libp2p/interfaces/libp2p.identify.IdentifyServiceInit.html",
-  "Message": "https://libp2p.github.io/js-libp2p/variables/libp2p.identify.Message.html",
-  "./identify:Message": "https://libp2p.github.io/js-libp2p/variables/libp2p.identify.Message.html",
-  "multicodecs": "https://libp2p.github.io/js-libp2p/variables/libp2p.identify.multicodecs.html",
-  "./identify:multicodecs": "https://libp2p.github.io/js-libp2p/variables/libp2p.identify.multicodecs.html",
-  "identifyService": "https://libp2p.github.io/js-libp2p/functions/libp2p.identify.identifyService-1.html",
-  "./identify:identifyService": "https://libp2p.github.io/js-libp2p/functions/libp2p.identify.identifyService-1.html",
-  "Libp2pInit": "https://libp2p.github.io/js-libp2p/interfaces/libp2p.index.Libp2pInit.html",
-  ".:Libp2pInit": "https://libp2p.github.io/js-libp2p/interfaces/libp2p.index.Libp2pInit.html",
-  "Libp2pOptions": "https://libp2p.github.io/js-libp2p/types/libp2p.index.Libp2pOptions.html",
-  ".:Libp2pOptions": "https://libp2p.github.io/js-libp2p/types/libp2p.index.Libp2pOptions.html",
-  "ServiceFactoryMap": "https://libp2p.github.io/js-libp2p/types/libp2p.index.ServiceFactoryMap.html",
-  ".:ServiceFactoryMap": "https://libp2p.github.io/js-libp2p/types/libp2p.index.ServiceFactoryMap.html",
-  "createLibp2p": "https://libp2p.github.io/js-libp2p/functions/libp2p.index.createLibp2p.html",
-  ".:createLibp2p": "https://libp2p.github.io/js-libp2p/functions/libp2p.index.createLibp2p.html",
-  "plaintext": "https://libp2p.github.io/js-libp2p/functions/libp2p.insecure.plaintext.html",
-  "./insecure:plaintext": "https://libp2p.github.io/js-libp2p/functions/libp2p.insecure.plaintext.html",
-  "PingService": "https://libp2p.github.io/js-libp2p/interfaces/libp2p.ping.PingService.html",
-  "./ping:PingService": "https://libp2p.github.io/js-libp2p/interfaces/libp2p.ping.PingService.html",
-  "PingServiceComponents": "https://libp2p.github.io/js-libp2p/interfaces/libp2p.ping.PingServiceComponents.html",
-  "./ping:PingServiceComponents": "https://libp2p.github.io/js-libp2p/interfaces/libp2p.ping.PingServiceComponents.html",
-  "PingServiceInit": "https://libp2p.github.io/js-libp2p/interfaces/libp2p.ping.PingServiceInit.html",
-  "./ping:PingServiceInit": "https://libp2p.github.io/js-libp2p/interfaces/libp2p.ping.PingServiceInit.html",
-  "pingService": "https://libp2p.github.io/js-libp2p/functions/libp2p.ping.pingService-1.html",
-  "./ping:pingService": "https://libp2p.github.io/js-libp2p/functions/libp2p.ping.pingService-1.html",
-  "ProtectorInit": "https://libp2p.github.io/js-libp2p/interfaces/libp2p.pnet.ProtectorInit.html",
-  "./pnet:ProtectorInit": "https://libp2p.github.io/js-libp2p/interfaces/libp2p.pnet.ProtectorInit.html",
-  "generateKey": "https://libp2p.github.io/js-libp2p/functions/libp2p.pnet.generateKey.html",
-  "preSharedKey": "https://libp2p.github.io/js-libp2p/functions/libp2p.pnet.preSharedKey.html",
-  "./pnet:preSharedKey": "https://libp2p.github.io/js-libp2p/functions/libp2p.pnet.preSharedKey.html",
-  "PMPOptions": "https://libp2p.github.io/js-libp2p/interfaces/libp2p.upnp_nat.PMPOptions.html",
-  "./upnp-nat:PMPOptions": "https://libp2p.github.io/js-libp2p/interfaces/libp2p.upnp_nat.PMPOptions.html",
-  "UPnPNATComponents": "https://libp2p.github.io/js-libp2p/interfaces/libp2p.upnp_nat.UPnPNATComponents.html",
-  "./upnp-nat:UPnPNATComponents": "https://libp2p.github.io/js-libp2p/interfaces/libp2p.upnp_nat.UPnPNATComponents.html",
-  "UPnPNATInit": "https://libp2p.github.io/js-libp2p/interfaces/libp2p.upnp_nat.UPnPNATInit.html",
-  "./upnp-nat:UPnPNATInit": "https://libp2p.github.io/js-libp2p/interfaces/libp2p.upnp_nat.UPnPNATInit.html",
-  "uPnPNATService": "https://libp2p.github.io/js-libp2p/functions/libp2p.upnp_nat.uPnPNATService.html",
-  "./upnp-nat:uPnPNATService": "https://libp2p.github.io/js-libp2p/functions/libp2p.upnp_nat.uPnPNATService.html"
+  "Libp2pInit": "https://libp2p.github.io/js-libp2p/interfaces/libp2p.Libp2pInit.html",
+  ".:Libp2pInit": "https://libp2p.github.io/js-libp2p/interfaces/libp2p.Libp2pInit.html",
+  "Libp2pOptions": "https://libp2p.github.io/js-libp2p/types/libp2p.Libp2pOptions.html",
+  ".:Libp2pOptions": "https://libp2p.github.io/js-libp2p/types/libp2p.Libp2pOptions.html",
+  "ServiceFactoryMap": "https://libp2p.github.io/js-libp2p/types/libp2p.ServiceFactoryMap.html",
+  ".:ServiceFactoryMap": "https://libp2p.github.io/js-libp2p/types/libp2p.ServiceFactoryMap.html",
+  "createLibp2p": "https://libp2p.github.io/js-libp2p/functions/libp2p.createLibp2p.html",
+  ".:createLibp2p": "https://libp2p.github.io/js-libp2p/functions/libp2p.createLibp2p.html"
 }

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "libp2p",
-  "version": "0.46.21",
+  "version": "1.0.0",
   "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/tree/master/packages/libp2p#readme",
+  "homepage": "https://github.com/libp2p/js-libp2p/tree/main/packages/libp2p#readme",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/libp2p/js-libp2p.git"
@@ -11,6 +11,9 @@
   "bugs": {
     "url": "https://github.com/libp2p/js-libp2p/issues"
   },
+  "publishConfig": {
+    "provenance": true
+  },
   "keywords": [
     "IPFS",
     "libp2p",
@@ -21,22 +24,6 @@
   ],
   "type": "module",
   "types": "./dist/src/index.d.ts",
-  "typesVersions": {
-    "*": {
-      "*": [
-        "*",
-        "dist/*",
-        "dist/src/*",
-        "dist/src/*/index"
-      ],
-      "src/*": [
-        "*",
-        "dist/*",
-        "dist/src/*",
-        "dist/src/*/index"
-      ]
-    }
-  },
   "files": [
     "src",
     "dist",
@@ -47,42 +34,6 @@
     ".": {
       "types": "./dist/src/index.d.ts",
       "import": "./dist/src/index.js"
-    },
-    "./autonat": {
-      "types": "./dist/src/autonat/index.d.ts",
-      "import": "./dist/src/autonat/index.js"
-    },
-    "./circuit-relay": {
-      "types": "./dist/src/circuit-relay/index.d.ts",
-      "import": "./dist/src/circuit-relay/index.js"
-    },
-    "./dcutr": {
-      "types": "./dist/src/dcutr/index.d.ts",
-      "import": "./dist/src/dcutr/index.js"
-    },
-    "./fetch": {
-      "types": "./dist/src/fetch/index.d.ts",
-      "import": "./dist/src/fetch/index.js"
-    },
-    "./identify": {
-      "types": "./dist/src/identify/index.d.ts",
-      "import": "./dist/src/identify/index.js"
-    },
-    "./insecure": {
-      "types": "./dist/src/insecure/index.d.ts",
-      "import": "./dist/src/insecure/index.js"
-    },
-    "./ping": {
-      "types": "./dist/src/ping/index.d.ts",
-      "import": "./dist/src/ping/index.js"
-    },
-    "./pnet": {
-      "types": "./dist/src/pnet/index.d.ts",
-      "import": "./dist/src/pnet/index.js"
-    },
-    "./upnp-nat": {
-      "types": "./dist/src/upnp-nat/index.d.ts",
-      "import": "./dist/src/upnp-nat/index.js"
     }
   },
   "eslintConfig": {
@@ -103,13 +54,6 @@
     "dep-check": "aegir dep-check",
     "prepublishOnly": "node scripts/update-version.js && npm run build",
     "build": "aegir build",
-    "generate": "run-s generate:proto:*",
-    "generate:proto:autonat": "protons ./src/autonat/pb/index.proto",
-    "generate:proto:circuit-relay": "protons ./src/circuit-relay/pb/index.proto",
-    "generate:proto:dcutr": "protons ./src/dcutr/pb/message.proto",
-    "generate:proto:fetch": "protons ./src/fetch/pb/proto.proto",
-    "generate:proto:identify": "protons ./src/identify/pb/message.proto",
-    "generate:proto:plaintext": "protons ./src/insecure/pb/proto.proto",
     "test": "aegir test",
     "test:node": "aegir test -t node -f \"./dist/test/**/*.{node,spec}.js\" --cov",
     "test:chrome": "aegir test -t browser -f \"./dist/test/**/*.spec.js\" --cov",
@@ -120,22 +64,19 @@
     "test:interop": "aegir test -t node -f dist/test/interop.js"
   },
   "dependencies": {
-    "@achingbrain/nat-port-mapper": "^1.0.9",
-    "@libp2p/crypto": "^2.0.8",
-    "@libp2p/interface": "^0.1.6",
-    "@libp2p/interface-internal": "^0.1.9",
-    "@libp2p/keychain": "^3.0.8",
-    "@libp2p/logger": "^3.1.0",
-    "@libp2p/multistream-select": "^4.0.6",
-    "@libp2p/peer-collections": "^4.0.8",
-    "@libp2p/peer-id": "^3.0.6",
-    "@libp2p/peer-id-factory": "^3.0.8",
-    "@libp2p/peer-record": "^6.0.9",
-    "@libp2p/peer-store": "^9.0.9",
-    "@libp2p/utils": "^4.0.7",
-    "@multiformats/mafmt": "^12.1.2",
-    "@multiformats/multiaddr": "^12.1.5",
-    "@multiformats/multiaddr-matcher": "^1.0.0",
+    "@libp2p/crypto": "^3.0.0",
+    "@libp2p/interface": "^1.0.0",
+    "@libp2p/interface-internal": "^0.1.10",
+    "@libp2p/logger": "^4.0.0",
+    "@libp2p/multistream-select": "^4.0.7",
+    "@libp2p/peer-collections": "^4.0.9",
+    "@libp2p/peer-id": "^4.0.0",
+    "@libp2p/peer-id-factory": "^3.0.9",
+    "@libp2p/peer-store": "^9.0.10",
+    "@libp2p/utils": "^5.0.0",
+    "@multiformats/mafmt": "^12.1.6",
+    "@multiformats/multiaddr": "^12.1.10",
+    "@multiformats/multiaddr-matcher": "^1.1.0",
     "any-signal": "^4.1.1",
     "datastore-core": "^9.0.1",
     "delay": "^6.0.0",
@@ -143,55 +84,45 @@
     "it-all": "^3.0.2",
     "it-drain": "^3.0.2",
     "it-filter": "^3.0.1",
-    "it-first": "^3.0.1",
-    "it-handshake": "^4.1.3",
-    "it-length-prefixed": "^9.0.1",
-    "it-map": "^3.0.3",
+    "it-first": "^3.0.3",
+    "it-map": "^3.0.4",
     "it-merge": "^3.0.0",
-    "it-pair": "^2.0.6",
-    "it-parallel": "^3.0.0",
     "it-pipe": "^3.0.1",
-    "it-protobuf-stream": "^1.0.0",
     "it-stream-types": "^2.0.1",
     "merge-options": "^3.0.4",
-    "multiformats": "^12.0.1",
+    "multiformats": "^12.1.3",
     "p-defer": "^4.0.0",
-    "p-queue": "^7.3.4",
-    "p-retry": "^6.0.0",
-    "private-ip": "^3.0.0",
-    "protons-runtime": "^5.0.0",
+    "p-queue": "^7.4.1",
+    "private-ip": "^3.0.1",
     "rate-limiter-flexible": "^3.0.0",
     "uint8arraylist": "^2.4.3",
-    "uint8arrays": "^4.0.6",
-    "wherearewe": "^2.0.1",
-    "xsalsa20": "^1.1.0"
+    "uint8arrays": "^4.0.6"
   },
   "devDependencies": {
     "@chainsafe/libp2p-gossipsub": "^10.0.0",
-    "@chainsafe/libp2p-noise": "^13.0.0",
+    "@chainsafe/libp2p-noise": "^13.0.2",
     "@chainsafe/libp2p-yamux": "^5.0.0",
-    "@libp2p/bootstrap": "^9.0.12",
+    "@libp2p/bootstrap": "^10.0.0",
+    "@libp2p/circuit-relay-v2": "^1.0.0",
     "@libp2p/daemon-client": "^7.0.0",
     "@libp2p/daemon-server": "^6.0.0",
-    "@libp2p/floodsub": "^8.0.13",
-    "@libp2p/interface-compliance-tests": "^4.1.5",
+    "@libp2p/floodsub": "^8.0.14",
+    "@libp2p/identify": "^1.0.0",
+    "@libp2p/interface-compliance-tests": "^5.0.0",
     "@libp2p/interop": "^9.0.0",
-    "@libp2p/kad-dht": "^10.0.15",
-    "@libp2p/mdns": "^9.0.14",
-    "@libp2p/mplex": "^9.0.12",
-    "@libp2p/tcp": "^8.0.13",
-    "@libp2p/websockets": "^7.0.13",
-    "@types/xsalsa20": "^1.1.0",
+    "@libp2p/kad-dht": "^11.0.0",
+    "@libp2p/mdns": "^10.0.0",
+    "@libp2p/mplex": "^10.0.0",
+    "@libp2p/plaintext": "^1.0.0",
+    "@libp2p/tcp": "^9.0.0",
+    "@libp2p/websockets": "^8.0.0",
     "aegir": "^41.0.2",
     "execa": "^8.0.1",
     "go-libp2p": "^1.1.1",
-    "it-pushable": "^3.2.0",
-    "it-to-buffer": "^4.0.1",
-    "npm-run-all": "^4.1.5",
+    "it-pushable": "^3.2.1",
     "p-event": "^6.0.0",
     "p-times": "^4.0.0",
     "p-wait-for": "^5.0.2",
-    "protons": "^7.0.2",
     "sinon": "^17.0.0",
     "sinon-ts": "^2.0.0"
   },

package/src/address-manager/index.ts

@@ -1,16 +1,10 @@
-import { logger } from '@libp2p/logger'
 import { peerIdFromString } from '@libp2p/peer-id'
 import { multiaddr } from '@multiformats/multiaddr'
 import { debounce } from './utils.js'
-import type { 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'
-import type { TransportManager } from '@libp2p/interface-internal/transport-manager'
+import type { ComponentLogger, Libp2pEvents, Logger, TypedEventTarget, PeerId, PeerStore } from '@libp2p/interface'
+import type { TransportManager } from '@libp2p/interface-internal'
 import type { Multiaddr } from '@multiformats/multiaddr'
 
-const log = logger('libp2p:address-manager')
-
 export interface AddressManagerInit {
   /**
    * Pass an function in this field to override the list of addresses
@@ -39,6 +33,7 @@ export interface DefaultAddressManagerComponents {
   transportManager: TransportManager
   peerStore: PeerStore
   events: TypedEventTarget<Libp2pEvents>
+  logger: ComponentLogger
 }
 
 /**
@@ -75,6 +70,7 @@ function stripPeerId (ma: Multiaddr, peerId: PeerId): Multiaddr {
 }
 
 export class DefaultAddressManager {
+  private readonly log: Logger
   private readonly components: DefaultAddressManagerComponents
   // this is an array to allow for duplicates, e.g. multiples of `/ip4/0.0.0.0/tcp/0`
   private readonly listen: string[]
@@ -92,6 +88,7 @@ export class DefaultAddressManager {
     const { listen = [], announce = [] } = init
 
     this.components = components
+    this.log = components.logger.forComponent('libp2p:address-manager')
     this.listen = listen.map(ma => ma.toString())
     this.announce = new Set(announce.map(ma => ma.toString()))
     this.observed = new Map()
@@ -132,7 +129,7 @@ export class DefaultAddressManager {
     this.components.peerStore.patch(this.components.peerId, {
       multiaddrs: addrs
     })
-      .catch(err => { log.error('error updating addresses', err) })
+      .catch(err => { this.log.error('error updating addresses', err) })
   }
 
   /**

package/src/components.ts

@@ -1,24 +1,12 @@
-import { CodeError } from '@libp2p/interface/errors'
-import { isStartable, type Startable } from '@libp2p/interface/startable'
+import { CodeError } from '@libp2p/interface'
+import { isStartable, type Startable, type Libp2pEvents, type ComponentLogger, type NodeInfo, type ConnectionProtector, type ConnectionGater, type ContentRouting, type TypedEventTarget, type Metrics, type PeerId, type PeerRouting, type PeerStore, type Upgrader } from '@libp2p/interface'
 import { defaultLogger } from '@libp2p/logger'
-import type { Libp2pEvents, ComponentLogger } from '@libp2p/interface'
-import type { ConnectionProtector } from '@libp2p/interface/connection'
-import type { ConnectionGater } from '@libp2p/interface/connection-gater'
-import type { ContentRouting } from '@libp2p/interface/content-routing'
-import type { TypedEventTarget } from '@libp2p/interface/events'
-import type { Metrics } from '@libp2p/interface/metrics'
-import type { PeerId } from '@libp2p/interface/peer-id'
-import type { PeerRouting } from '@libp2p/interface/peer-routing'
-import type { PeerStore } from '@libp2p/interface/peer-store'
-import type { Upgrader } from '@libp2p/interface/transport'
-import type { AddressManager } from '@libp2p/interface-internal/address-manager'
-import type { ConnectionManager } from '@libp2p/interface-internal/connection-manager'
-import type { Registrar } from '@libp2p/interface-internal/registrar'
-import type { TransportManager } from '@libp2p/interface-internal/transport-manager'
+import type { AddressManager, ConnectionManager, Registrar, TransportManager } from '@libp2p/interface-internal'
 import type { Datastore } from 'interface-datastore'
 
 export interface Components extends Record<string, any>, Startable {
   peerId: PeerId
+  nodeInfo: NodeInfo
   logger: ComponentLogger
   events: TypedEventTarget<Libp2pEvents>
   addressManager: AddressManager
@@ -37,6 +25,7 @@ export interface Components extends Record<string, any>, Startable {
 
 export interface ComponentsInit {
   peerId?: PeerId
+  nodeInfo?: NodeInfo
   logger?: ComponentLogger
   events?: TypedEventTarget<Libp2pEvents>
   addressManager?: AddressManager

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

@@ -1,5 +1,5 @@
 import isPrivate from 'private-ip'
-import type { ConnectionGater } from '@libp2p/interface/connection-gater'
+import type { ConnectionGater } from '@libp2p/interface'
 import type { Multiaddr } from '@multiformats/multiaddr'
 
 /**

package/src/config/connection-gater.ts

@@ -1,4 +1,4 @@
-import type { ConnectionGater } from '@libp2p/interface/connection-gater'
+import type { ConnectionGater } from '@libp2p/interface'
 
 /**
  * Returns a default connection gater implementation that allows everything

package/src/config.ts

@@ -1,5 +1,4 @@
-import { CodeError } from '@libp2p/interface/errors'
-import { FaultTolerance } from '@libp2p/interface/transport'
+import { CodeError, FaultTolerance } from '@libp2p/interface'
 import { defaultAddressSort } from '@libp2p/utils/address-sort'
 import { dnsaddrResolver } from '@multiformats/multiaddr/resolvers'
 import mergeOptions from 'merge-options'

package/src/connection/index.ts

@@ -1,9 +1,5 @@
-import { symbol } from '@libp2p/interface/connection'
-import { CodeError } from '@libp2p/interface/errors'
-import { setMaxListeners } from '@libp2p/interface/events'
-import type { AbortOptions, Logger, ComponentLogger } from '@libp2p/interface'
-import type { Direction, Connection, Stream, ConnectionTimeline, ConnectionStatus, NewStreamOptions } from '@libp2p/interface/connection'
-import type { PeerId } from '@libp2p/interface/peer-id'
+import { connectionSymbol, CodeError, setMaxListeners } from '@libp2p/interface'
+import type { AbortOptions, Logger, ComponentLogger, Direction, Connection, Stream, ConnectionTimeline, ConnectionStatus, NewStreamOptions, PeerId } from '@libp2p/interface'
 import type { Multiaddr } from '@multiformats/multiaddr'
 
 const CLOSE_TIMEOUT = 500
@@ -50,6 +46,7 @@ export class ConnectionImpl implements Connection {
   public encryption?: string
   public status: ConnectionStatus
   public transient: boolean
+  public readonly log: Logger
 
   /**
    * User provided tags
@@ -74,8 +71,6 @@ export class ConnectionImpl implements Connection {
    */
   private readonly _getStreams: () => Stream[]
 
-  readonly #log: Logger
-
   /**
    * An implementation of the js-libp2p connection.
    * Any libp2p transport should use an upgrader to return this connection.
@@ -92,7 +87,7 @@ export class ConnectionImpl implements Connection {
     this.multiplexer = init.multiplexer
     this.encryption = init.encryption
     this.transient = init.transient ?? false
-    this.#log = init.logger.forComponent('libp2p:connection')
+    this.log = init.logger.forComponent(`libp2p:connection:${this.direction}:${this.id}`)
 
     if (this.remoteAddr.getPeerId() == null) {
       this.remoteAddr = this.remoteAddr.encapsulate(`/p2p/${this.remotePeer}`)
@@ -107,7 +102,7 @@ export class ConnectionImpl implements Connection {
 
   readonly [Symbol.toStringTag] = 'Connection'
 
-  readonly [symbol] = true
+  readonly [connectionSymbol] = true
 
   /**
    * Get all the streams of the muxer
@@ -151,7 +146,7 @@ export class ConnectionImpl implements Connection {
       return
     }
 
-    this.#log('closing connection to %a', this.remoteAddr)
+    this.log('closing connection to %a', this.remoteAddr)
 
     this.status = 'closing'
 
@@ -166,35 +161,35 @@ export class ConnectionImpl implements Connection {
     }
 
     try {
-      this.#log.trace('closing all streams')
+      this.log.trace('closing all streams')
 
       // close all streams gracefully - this can throw if we're not multiplexed
       await Promise.all(
         this.streams.map(async s => s.close(options))
       )
 
-      this.#log.trace('closing underlying transport')
+      this.log.trace('closing underlying transport')
 
       // close raw connection
       await this._close(options)
 
-      this.#log.trace('updating timeline with close time')
+      this.log.trace('updating timeline with close time')
 
       this.status = 'closed'
       this.timeline.close = Date.now()
     } catch (err: any) {
-      this.#log.error('error encountered during graceful close of connection to %a', this.remoteAddr, err)
+      this.log.error('error encountered during graceful close of connection to %a', this.remoteAddr, err)
       this.abort(err)
     }
   }
 
   abort (err: Error): void {
-    this.#log.error('aborting connection to %a due to error', this.remoteAddr, err)
+    this.log.error('aborting connection to %a due to error', this.remoteAddr, err)
 
     this.status = 'closing'
     this.streams.forEach(s => { s.abort(err) })
 
-    this.#log.error('all streams aborted', this.streams.length)
+    this.log.error('all streams aborted', this.streams.length)
 
     // Abort raw connection
     this._abort(err)