@libp2p/kad-dht 1.0.0 → 1.0.3

package/dist/src/rpc/index.js.map

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

package/dist/src/topology-listener.d.ts

@@ -1,9 +1,8 @@
 import { EventEmitter } from '@libp2p/interfaces';
-import type { Registrar } from '@libp2p/interfaces/registrar';
 import type { Startable } from '@libp2p/interfaces';
 import type { PeerId } from '@libp2p/interfaces/peer-id';
-export interface TopologyListenerOptions {
-    registrar: Registrar;
+import { Components, Initializable } from '@libp2p/interfaces/components';
+export interface TopologyListenerInit {
     protocol: string;
     lan: boolean;
 }
@@ -13,13 +12,14 @@ export interface TopologyListenerEvents {
 /**
  * Receives notifications of new peers joining the network that support the DHT protocol
  */
-export declare class TopologyListener extends EventEmitter<TopologyListenerEvents> implements Startable {
+export declare class TopologyListener extends EventEmitter<TopologyListenerEvents> implements Startable, Initializable {
     private readonly log;
-    private readonly registrar;
+    private components;
     private readonly protocol;
     private running;
     private registrarId?;
-    constructor(options: TopologyListenerOptions);
+    constructor(init: TopologyListenerInit);
+    init(components: Components): void;
     isStarted(): boolean;
     /**
      * Start the network

package/dist/src/topology-listener.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"topology-listener.d.ts","sourceRoot":"","sources":["../../src/topology-listener.ts"],"names":[],"mappings":"AACA,OAAO,EAAe,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAE9D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAA;AAE7D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AACnD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAA;AAExD,MAAM,WAAW,uBAAuB;IACtC,SAAS,EAAE,SAAS,CAAA;IACpB,QAAQ,EAAE,MAAM,CAAA;IAChB,GAAG,EAAE,OAAO,CAAA;CACb;AAED,MAAM,WAAW,sBAAsB;IACrC,MAAM,EAAE,WAAW,CAAC,MAAM,CAAC,CAAA;CAC5B;AAED;;GAEG;AACH,qBAAa,gBAAiB,SAAQ,YAAY,CAAC,sBAAsB,CAAE,YAAW,SAAS;IAC7F,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAQ;IAC5B,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAW;IACrC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAQ;IACjC,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,WAAW,CAAC,CAAQ;gBAEf,OAAO,EAAE,uBAAuB;IAW7C,SAAS;IAIT;;OAEG;IACG,KAAK;IAmBX;;OAEG;IACH,IAAI;CASL"}
+{"version":3,"file":"topology-listener.d.ts","sourceRoot":"","sources":["../../src/topology-listener.ts"],"names":[],"mappings":"AACA,OAAO,EAAe,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAG9D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AACnD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAA;AACxD,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAA;AAEzE,MAAM,WAAW,oBAAoB;IACnC,QAAQ,EAAE,MAAM,CAAA;IAChB,GAAG,EAAE,OAAO,CAAA;CACb;AAED,MAAM,WAAW,sBAAsB;IACrC,MAAM,EAAE,WAAW,CAAC,MAAM,CAAC,CAAA;CAC5B;AAED;;GAEG;AACH,qBAAa,gBAAiB,SAAQ,YAAY,CAAC,sBAAsB,CAAE,YAAW,SAAS,EAAE,aAAa;IAC5G,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAQ;IAC5B,OAAO,CAAC,UAAU,CAA+B;IACjD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAQ;IACjC,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,WAAW,CAAC,CAAQ;gBAEf,IAAI,EAAE,oBAAoB;IAUvC,IAAI,CAAE,UAAU,EAAE,UAAU,GAAG,IAAI;IAInC,SAAS;IAIT;;OAEG;IACG,KAAK;IAmBX;;OAEG;IACH,IAAI;CASL"}

package/dist/src/topology-listener.js

@@ -1,18 +1,22 @@
 import { createTopology } from '@libp2p/topology';
 import { CustomEvent, EventEmitter } from '@libp2p/interfaces';
 import { logger } from '@libp2p/logger';
+import { Components } from '@libp2p/interfaces/components';
 /**
  * Receives notifications of new peers joining the network that support the DHT protocol
  */
 export class TopologyListener extends EventEmitter {
-    constructor(options) {
+    constructor(init) {
         super();
-        const { registrar, protocol, lan } = options;
+        this.components = new Components();
+        const { protocol, lan } = init;
         this.log = logger(`libp2p:kad-dht:topology-listener:${lan ? 'lan' : 'wan'}`);
         this.running = false;
-        this.registrar = registrar;
         this.protocol = protocol;
     }
+    init(components) {
+        this.components = components;
+    }
     isStarted() {
         return this.running;
     }
@@ -33,7 +37,7 @@ export class TopologyListener extends EventEmitter {
                 }));
             }
         });
-        this.registrarId = await this.registrar.register(this.protocol, topology);
+        this.registrarId = await this.components.getRegistrar().register(this.protocol, topology);
     }
     /**
      * Stop all network activity
@@ -42,7 +46,7 @@ export class TopologyListener extends EventEmitter {
         this.running = false;
         // unregister protocol and handlers
         if (this.registrarId != null) {
-            this.registrar.unregister(this.registrarId);
+            this.components.getRegistrar().unregister(this.registrarId);
             this.registrarId = undefined;
         }
     }

package/dist/src/topology-listener.js.map

@@ -1 +1 @@
-{"version":3,"file":"topology-listener.js","sourceRoot":"","sources":["../../src/topology-listener.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AACjD,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAC9D,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AAgBvC;;GAEG;AACH,MAAM,OAAO,gBAAiB,SAAQ,YAAoC;IAOxE,YAAa,OAAgC;QAC3C,KAAK,EAAE,CAAA;QAEP,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,OAAO,CAAA;QAE5C,IAAI,CAAC,GAAG,GAAG,MAAM,CAAC,oCAAoC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAA;QAC5E,IAAI,CAAC,OAAO,GAAG,KAAK,CAAA;QACpB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;QAC1B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;IAC1B,CAAC;IAED,SAAS;QACP,OAAO,IAAI,CAAC,OAAO,CAAA;IACrB,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,KAAK;QACT,IAAI,IAAI,CAAC,OAAO,EAAE;YAChB,OAAM;SACP;QAED,IAAI,CAAC,OAAO,GAAG,IAAI,CAAA;QAEnB,kCAAkC;QAClC,MAAM,QAAQ,GAAG,cAAc,CAAC;YAC9B,SAAS,EAAE,CAAC,MAAM,EAAE,EAAE;gBACpB,IAAI,CAAC,GAAG,CAAC,mCAAmC,EAAE,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAA;gBACpE,IAAI,CAAC,aAAa,CAAC,IAAI,WAAW,CAAC,MAAM,EAAE;oBACzC,MAAM,EAAE,MAAM;iBACf,CAAC,CAAC,CAAA;YACL,CAAC;SACF,CAAC,CAAA;QACF,IAAI,CAAC,WAAW,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAA;IAC3E,CAAC;IAED;;OAEG;IACH,IAAI;QACF,IAAI,CAAC,OAAO,GAAG,KAAK,CAAA;QAEpB,mCAAmC;QACnC,IAAI,IAAI,CAAC,WAAW,IAAI,IAAI,EAAE;YAC5B,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;YAC3C,IAAI,CAAC,WAAW,GAAG,SAAS,CAAA;SAC7B;IACH,CAAC;CACF"}
+{"version":3,"file":"topology-listener.js","sourceRoot":"","sources":["../../src/topology-listener.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AACjD,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAC9D,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AAIvC,OAAO,EAAE,UAAU,EAAiB,MAAM,+BAA+B,CAAA;AAWzE;;GAEG;AACH,MAAM,OAAO,gBAAiB,SAAQ,YAAoC;IAOxE,YAAa,IAA0B;QACrC,KAAK,EAAE,CAAA;QAND,eAAU,GAAe,IAAI,UAAU,EAAE,CAAA;QAQ/C,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,IAAI,CAAA;QAE9B,IAAI,CAAC,GAAG,GAAG,MAAM,CAAC,oCAAoC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAA;QAC5E,IAAI,CAAC,OAAO,GAAG,KAAK,CAAA;QACpB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;IAC1B,CAAC;IAED,IAAI,CAAE,UAAsB;QAC1B,IAAI,CAAC,UAAU,GAAG,UAAU,CAAA;IAC9B,CAAC;IAED,SAAS;QACP,OAAO,IAAI,CAAC,OAAO,CAAA;IACrB,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,KAAK;QACT,IAAI,IAAI,CAAC,OAAO,EAAE;YAChB,OAAM;SACP;QAED,IAAI,CAAC,OAAO,GAAG,IAAI,CAAA;QAEnB,kCAAkC;QAClC,MAAM,QAAQ,GAAG,cAAc,CAAC;YAC9B,SAAS,EAAE,CAAC,MAAM,EAAE,EAAE;gBACpB,IAAI,CAAC,GAAG,CAAC,mCAAmC,EAAE,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAA;gBACpE,IAAI,CAAC,aAAa,CAAC,IAAI,WAAW,CAAC,MAAM,EAAE;oBACzC,MAAM,EAAE,MAAM;iBACf,CAAC,CAAC,CAAA;YACL,CAAC;SACF,CAAC,CAAA;QACF,IAAI,CAAC,WAAW,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,YAAY,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAA;IAC3F,CAAC;IAED;;OAEG;IACH,IAAI;QACF,IAAI,CAAC,OAAO,GAAG,KAAK,CAAA;QAEpB,mCAAmC;QACnC,IAAI,IAAI,CAAC,WAAW,IAAI,IAAI,EAAE;YAC5B,IAAI,CAAC,UAAU,CAAC,YAAY,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;YAC3D,IAAI,CAAC,WAAW,GAAG,SAAS,CAAA;SAC7B;IACH,CAAC;CACF"}

package/dist/src/utils.d.ts

@@ -1,8 +1,8 @@
 import { Key } from 'interface-datastore/key';
-import type { PeerData } from '@libp2p/interfaces/peer-data';
+import type { PeerInfo } from '@libp2p/interfaces/peer-info';
 import type { PeerId } from '@libp2p/interfaces/peer-id';
-export declare function removePrivateAddresses(peer: PeerData): PeerData;
-export declare function removePublicAddresses(peer: PeerData): PeerData;
+export declare function removePrivateAddresses(peer: PeerInfo): PeerInfo;
+export declare function removePublicAddresses(peer: PeerInfo): PeerInfo;
 /**
  * Creates a DHT ID by hashing a given Uint8Array
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@libp2p/kad-dht",
-  "version": "1.0.0",
+  "version": "1.0.3",
   "description": "JavaScript implementation of the Kad-DHT for libp2p",
   "license": "Apache-2.0 OR MIT",
   "homepage": "https://github.com/libp2p/js-libp2p-kad-dht#readme",
@@ -136,48 +136,48 @@
     "release": "semantic-release"
   },
   "dependencies": {
-    "@libp2p/crypto": "^0.22.7",
-    "@libp2p/interfaces": "^1.3.2",
-    "@libp2p/logger": "^1.0.2",
-    "@libp2p/peer-id": "^1.0.4",
+    "@libp2p/crypto": "^0.22.9",
+    "@libp2p/interfaces": "^1.3.18",
+    "@libp2p/logger": "^1.1.2",
+    "@libp2p/peer-id": "^1.1.8",
     "@libp2p/record": "^1.0.0",
-    "@libp2p/topology": "^1.0.3",
-    "@multiformats/multiaddr": "^10.0.0",
+    "@libp2p/topology": "^1.1.6",
+    "@multiformats/multiaddr": "^10.1.5",
     "any-signal": "^3.0.0",
     "datastore-core": "^7.0.0",
-    "err-code": "^3.0.0",
+    "err-code": "^3.0.1",
     "hashlru": "^2.3.0",
-    "interface-datastore": "^6.0.2",
-    "it-all": "^1.0.5",
-    "it-drain": "^1.0.4",
-    "it-first": "^1.0.4",
+    "interface-datastore": "^6.1.0",
+    "it-all": "^1.0.6",
+    "it-drain": "^1.0.5",
+    "it-first": "^1.0.6",
     "it-length": "^1.0.3",
-    "it-length-prefixed": "^7.0.0",
-    "it-map": "^1.0.5",
+    "it-length-prefixed": "^7.0.1",
+    "it-map": "^1.0.6",
     "it-merge": "^1.0.3",
     "it-parallel": "^2.0.1",
     "it-pipe": "^2.0.3",
     "it-stream-types": "^1.0.4",
     "it-take": "^1.0.2",
     "k-bucket": "^5.1.0",
-    "multiformats": "^9.4.5",
+    "multiformats": "^9.6.3",
     "p-defer": "^4.0.0",
     "p-map": "^5.3.0",
     "p-queue": "^7.2.0",
     "private-ip": "^2.3.3",
-    "protobufjs": "^6.10.2",
+    "protobufjs": "^6.11.2",
     "streaming-iterables": "^6.0.0",
     "timeout-abort-controller": "^3.0.0",
     "uint8arrays": "^3.0.0",
     "varint": "^6.0.0"
   },
   "devDependencies": {
-    "@libp2p/interface-compliance-tests": "^1.1.3",
-    "@libp2p/peer-id-factory": "^1.0.4",
-    "@libp2p/peer-store": "^1.0.1",
+    "@libp2p/interface-compliance-tests": "^1.1.20",
+    "@libp2p/peer-id-factory": "^1.0.8",
+    "@libp2p/peer-store": "^1.0.7",
     "@types/lodash.random": "^3.2.6",
     "@types/lodash.range": "^3.2.6",
-    "@types/node": "^16.11.7",
+    "@types/node": "^16.11.26",
     "@types/varint": "^6.0.0",
     "@types/which": "^2.0.1",
     "aegir": "^36.1.3",
@@ -187,11 +187,11 @@
     "it-filter": "^1.0.3",
     "it-last": "^1.0.6",
     "it-pair": "^2.0.2",
-    "libp2p": "^0.36.2",
     "lodash.random": "^3.2.0",
     "lodash.range": "^3.2.0",
     "p-retry": "^5.0.0",
     "sinon": "^13.0.1",
+    "ts-sinon": "^2.0.2",
     "which": "^2.0.2"
   },
   "browser": {

package/src/content-fetching/index.ts

@@ -16,9 +16,7 @@ import {
 } from '../constants.js'
 import { createPutRecord, convertBuffer, bufferToRecordKey } from '../utils.js'
 import { logger } from '@libp2p/logger'
-import type { PeerId } from '@libp2p/interfaces/peer-id'
 import type { Validators, Selectors, ValueEvent, QueryOptions } from '@libp2p/interfaces/dht'
-import type { Datastore } from 'interface-datastore'
 import type { PeerRouting } from '../peer-routing/index.js'
 import type { QueryManager } from '../query/manager.js'
 import type { RoutingTable } from '../routing-table/index.js'
@@ -26,10 +24,9 @@ import type { Network } from '../network.js'
 import type { Logger } from '@libp2p/logger'
 import type { AbortOptions } from '@libp2p/interfaces'
 import type { QueryFunc } from '../query/types.js'
+import { Components, Initializable } from '@libp2p/interfaces/components'
 
-export interface ContentFetchingOptions {
-  peerId: PeerId
-  datastore: Datastore
+export interface ContentFetchingInit {
   validators: Validators
   selectors: Selectors
   peerRouting: PeerRouting
@@ -39,10 +36,9 @@ export interface ContentFetchingOptions {
   lan: boolean
 }
 
-export class ContentFetching {
+export class ContentFetching implements Initializable {
   private readonly log: Logger
-  private readonly peerId: PeerId
-  private readonly datastore: Datastore
+  private components: Components = new Components()
   private readonly validators: Validators
   private readonly selectors: Selectors
   private readonly peerRouting: PeerRouting
@@ -50,11 +46,9 @@ export class ContentFetching {
   private readonly routingTable: RoutingTable
   private readonly network: Network
 
-  constructor (options: ContentFetchingOptions) {
-    const { peerId, datastore, validators, selectors, peerRouting, queryManager, routingTable, network, lan } = options
-    this.log = logger(`libp2p:kad-dht:${lan ? 'lan' : 'wan'}:content-fetching:${peerId.toString()}`)
-    this.peerId = peerId
-    this.datastore = datastore
+  constructor (init: ContentFetchingInit) {
+    const { validators, selectors, peerRouting, queryManager, routingTable, network, lan } = init
+    this.log = logger(`libp2p:kad-dht:${lan ? 'lan' : 'wan'}:content-fetching`)
     this.validators = validators
     this.selectors = selectors
     this.peerRouting = peerRouting
@@ -63,9 +57,13 @@ export class ContentFetching {
     this.network = network
   }
 
+  init (components: Components): void {
+    this.components = components
+  }
+
   async putLocal (key: Uint8Array, rec: Uint8Array) { // eslint-disable-line require-await
     const dsKey = bufferToRecordKey(key)
-    await this.datastore.put(dsKey, rec)
+    await this.components.getDatastore().put(dsKey, rec)
   }
 
   /**
@@ -79,7 +77,7 @@ export class ContentFetching {
 
     this.log('fetching record for key %k', dsKey)
 
-    const raw = await this.datastore.get(dsKey)
+    const raw = await this.components.getDatastore().get(dsKey)
     this.log('found %k in local datastore', dsKey)
 
     const rec = Libp2pRecord.deserialize(raw)
@@ -104,11 +102,11 @@ export class ContentFetching {
       }
 
       // correct ourself
-      if (this.peerId.equals(from)) {
+      if (this.components.getPeerId().equals(from)) {
         try {
           const dsKey = bufferToRecordKey(key)
           this.log(`Storing corrected record for key ${dsKey.toString()}`)
-          await this.datastore.put(dsKey, fixupRec)
+          await this.components.getDatastore().put(dsKey, fixupRec)
         } catch (err: any) {
           this.log.error('Failed error correcting self', err)
         }
@@ -149,7 +147,7 @@ export class ContentFetching {
     // store the record locally
     const dsKey = bufferToRecordKey(key)
     this.log(`storing record for key ${dsKey.toString()}`)
-    await this.datastore.put(dsKey, record)
+    await this.components.getDatastore().put(dsKey, record)
 
     // put record to the closest peers
     yield * pipe(
@@ -247,7 +245,7 @@ export class ContentFetching {
 
       yield valueEvent({
         value: localRec.value,
-        from: this.peerId
+        from: this.components.getPeerId()
       })
     } catch (err: any) {
       this.log('error getting local value for %b', key, err)

package/src/content-routing/index.ts

@@ -10,7 +10,6 @@ import {
   providerEvent
 } from '../query/events.js'
 import { logger } from '@libp2p/logger'
-import type { PeerId } from '@libp2p/interfaces/peer-id'
 import type { QueryEvent, QueryOptions } from '@libp2p/interfaces/dht'
 import type { PeerRouting } from '../peer-routing/index.js'
 import type { QueryManager } from '../query/manager.js'
@@ -18,46 +17,44 @@ import type { RoutingTable } from '../routing-table/index.js'
 import type { Network } from '../network.js'
 import type { Logger } from '@libp2p/logger'
 import type { Providers } from '../providers.js'
-import type { PeerStore } from '@libp2p/interfaces/peer-store'
 import type { QueryFunc } from '../query/types.js'
 import type { CID } from 'multiformats/cid'
 import type { AbortOptions } from '@libp2p/interfaces'
 import type { Multiaddr } from '@multiformats/multiaddr'
-import type { PeerData } from '@libp2p/interfaces/peer-data'
-import { base58btc } from 'multiformats/bases/base58'
+import type { PeerInfo } from '@libp2p/interfaces/peer-info'
+import { Components, Initializable } from '@libp2p/interfaces/components'
 
-export interface ContentRoutingOptions {
-  peerId: PeerId
+export interface ContentRoutingInit {
   network: Network
   peerRouting: PeerRouting
   queryManager: QueryManager
   routingTable: RoutingTable
   providers: Providers
-  peerStore: PeerStore
   lan: boolean
 }
 
-export class ContentRouting {
+export class ContentRouting implements Initializable {
   private readonly log: Logger
-  private readonly peerId: PeerId
+  private components: Components = new Components()
   private readonly network: Network
   private readonly peerRouting: PeerRouting
   private readonly queryManager: QueryManager
   private readonly routingTable: RoutingTable
   private readonly providers: Providers
-  private readonly peerStore: PeerStore
 
-  constructor (options: ContentRoutingOptions) {
-    const { peerId, network, peerRouting, queryManager, routingTable, providers, peerStore, lan } = options
+  constructor (init: ContentRoutingInit) {
+    const { network, peerRouting, queryManager, routingTable, providers, lan } = init
 
     this.log = logger(`libp2p:kad-dht:${lan ? 'lan' : 'wan'}:content-routing`)
-    this.peerId = peerId
     this.network = network
     this.peerRouting = peerRouting
     this.queryManager = queryManager
     this.routingTable = routingTable
     this.providers = providers
-    this.peerStore = peerStore
+  }
+
+  init (components: Components): void {
+    this.components = components
   }
 
   /**
@@ -68,11 +65,11 @@ export class ContentRouting {
     this.log('provide %s', key)
 
     // Add peer as provider
-    await this.providers.addProvider(key, this.peerId)
+    await this.providers.addProvider(key, this.components.getPeerId())
 
     const msg = new Message(MESSAGE_TYPE.ADD_PROVIDER, key.bytes, 0)
     msg.providerPeers = [{
-      id: this.peerId,
+      id: this.components.getPeerId(),
       multiaddrs,
       protocols: []
     }]
@@ -142,18 +139,18 @@ export class ContentRouting {
 
     // yield values if we have some, also slice because maybe we got lucky and already have too many?
     if (provs.length > 0) {
-      const providers: PeerData[] = []
+      const providers: PeerInfo[] = []
 
       for (const peerId of provs.slice(0, toFind)) {
         providers.push({
           id: peerId,
-          multiaddrs: ((await this.peerStore.addressBook.get(peerId)) ?? []).map(address => address.multiaddr),
+          multiaddrs: ((await this.components.getPeerStore().addressBook.get(peerId)) ?? []).map(address => address.multiaddr),
           protocols: []
         })
       }
 
-      yield peerResponseEvent({ from: this.peerId, messageType: MESSAGE_TYPE.GET_PROVIDERS, providers })
-      yield providerEvent({ from: this.peerId, providers: providers })
+      yield peerResponseEvent({ from: this.components.getPeerId(), messageType: MESSAGE_TYPE.GET_PROVIDERS, providers })
+      yield providerEvent({ from: this.components.getPeerId(), providers: providers })
     }
 
     // All done
@@ -170,7 +167,7 @@ export class ContentRouting {
       yield * self.network.sendRequest(peer, request, { signal })
     }
 
-    const providers = new Set(provs.map(p => p.toString(base58btc)))
+    const providers = new Set(provs.map(p => p.toString()))
 
     for await (const event of this.queryManager.run(target, this.routingTable.closestPeers(id), findProvidersQuery, options)) {
       yield event
@@ -181,11 +178,11 @@ export class ContentRouting {
         const newProviders = []
 
         for (const peer of event.providers) {
-          if (providers.has(peer.id.toString(base58btc))) {
+          if (providers.has(peer.id.toString())) {
             continue
           }
 
-          providers.add(peer.id.toString(base58btc))
+          providers.add(peer.id.toString())
           newProviders.push(peer)
         }
 

package/src/dual-kad-dht.ts

@@ -3,12 +3,12 @@ import errCode from 'err-code'
 import merge from 'it-merge'
 import { queryErrorEvent } from './query/events.js'
 import type { KadDHT } from './kad-dht.js'
-import type { DHT, QueryOptions } from '@libp2p/interfaces/dht'
+import type { DualDHT, QueryOptions } from '@libp2p/interfaces/dht'
 import { AbortOptions, EventEmitter, CustomEvent } from '@libp2p/interfaces'
 import type { CID } from 'multiformats'
 import type { PeerId } from '@libp2p/interfaces/peer-id'
 import type { PeerDiscoveryEvents } from '@libp2p/interfaces/peer-discovery'
-import type { PeerStore } from '@libp2p/interfaces/peer-store'
+import { Components, Initializable } from '@libp2p/interfaces/components'
 
 const log = logger('libp2p:kad-dht')
 
@@ -16,19 +16,16 @@ const log = logger('libp2p:kad-dht')
  * A DHT implementation modelled after Kademlia with S/Kademlia modifications.
  * Original implementation in go: https://github.com/libp2p/go-libp2p-kad-dht.
  */
-export class DualKadDHT extends EventEmitter<PeerDiscoveryEvents> implements DHT {
+export class DualKadDHT extends EventEmitter<PeerDiscoveryEvents> implements DualDHT, Initializable {
   public wan: KadDHT
   public lan: KadDHT
-  public peerId: PeerId
-  public peerStore: PeerStore
+  public components: Components = new Components()
 
-  constructor (wan: KadDHT, lan: KadDHT, peerId: PeerId, peerStore: PeerStore) {
+  constructor (wan: KadDHT, lan: KadDHT) {
     super()
 
     this.wan = wan
     this.lan = lan
-    this.peerId = peerId
-    this.peerStore = peerStore
 
     // handle peers being discovered during processing of DHT messages
     this.wan.addEventListener('peer', (evt) => {
@@ -43,6 +40,12 @@ export class DualKadDHT extends EventEmitter<PeerDiscoveryEvents> implements DHT
     })
   }
 
+  init (components: Components): void {
+    this.components = components
+    this.wan.init(components)
+    this.lan.init(components)
+  }
+
   /**
    * Is this DHT running.
    */
@@ -133,7 +136,7 @@ export class DualKadDHT extends EventEmitter<PeerDiscoveryEvents> implements DHT
 
     if (!foundValue) {
       yield queryErrorEvent({
-        from: this.peerId,
+        from: this.components.getPeerId(),
         error: errCode(new Error('Not found'), 'ERR_NOT_FOUND')
       })
     }

package/src/index.ts

@@ -1,21 +1,29 @@
-import { KadDHT, KadDHTOptions } from './kad-dht.js'
+import { KadDHT as SingleKadDHT } from './kad-dht.js'
 import { DualKadDHT } from './dual-kad-dht.js'
-import type { DHT } from '@libp2p/interfaces/dht'
+import type { Selectors, Validators } from '@libp2p/interfaces/dht'
 
-export function createKadDHT (opts: KadDHTOptions): DHT {
-  return new DualKadDHT(
-    new KadDHT({
-      ...opts,
-      protocol: '/ipfs/kad/1.0.0',
+export interface KadDHTInit {
+  kBucketSize?: number
+  clientMode?: boolean
+  selectors?: Selectors
+  validators?: Validators
+  querySelfInterval?: number
+  lan?: boolean
+  protocolPrefix?: string
+}
+
+export class KadDHT extends DualKadDHT {
+  constructor (init?: KadDHTInit) {
+    super(new SingleKadDHT({
+      protocolPrefix: '/ipfs',
+      ...init,
       lan: false
     }),
-    new KadDHT({
-      ...opts,
-      protocol: '/ipfs/lan/kad/1.0.0',
+    new SingleKadDHT({
+      protocolPrefix: '/ipfs',
+      ...init,
       clientMode: false,
       lan: true
-    }),
-    opts.peerId,
-    opts.peerStore
-  )
+    }))
+  }
 }