@libp2p/kad-dht 4.0.2 → 5.0.0

package/src/content-fetching/index.ts

@@ -24,7 +24,7 @@ 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/components'
+import type { KadDHTComponents } from '../index.js'
 
 export interface ContentFetchingInit {
   validators: Validators
@@ -36,9 +36,9 @@ export interface ContentFetchingInit {
   lan: boolean
 }
 
-export class ContentFetching implements Initializable {
+export class ContentFetching {
   private readonly log: Logger
-  private components: Components = new Components()
+  private readonly components: KadDHTComponents
   private readonly validators: Validators
   private readonly selectors: Selectors
   private readonly peerRouting: PeerRouting
@@ -46,8 +46,10 @@ export class ContentFetching implements Initializable {
   private readonly routingTable: RoutingTable
   private readonly network: Network
 
-  constructor (init: ContentFetchingInit) {
+  constructor (components: KadDHTComponents, init: ContentFetchingInit) {
     const { validators, selectors, peerRouting, queryManager, routingTable, network, lan } = init
+
+    this.components = components
     this.log = logger(`libp2p:kad-dht:${lan ? 'lan' : 'wan'}:content-fetching`)
     this.validators = validators
     this.selectors = selectors
@@ -57,13 +59,9 @@ export class ContentFetching implements Initializable {
     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.components.getDatastore().put(dsKey, rec)
+    await this.components.datastore.put(dsKey, rec)
   }
 
   /**
@@ -77,7 +75,7 @@ export class ContentFetching implements Initializable {
 
     this.log('fetching record for key %k', dsKey)
 
-    const raw = await this.components.getDatastore().get(dsKey)
+    const raw = await this.components.datastore.get(dsKey)
     this.log('found %k in local datastore', dsKey)
 
     const rec = Libp2pRecord.deserialize(raw)
@@ -102,11 +100,11 @@ export class ContentFetching implements Initializable {
       }
 
       // correct ourself
-      if (this.components.getPeerId().equals(from)) {
+      if (this.components.peerId.equals(from)) {
         try {
           const dsKey = bufferToRecordKey(key)
           this.log(`Storing corrected record for key ${dsKey.toString()}`)
-          await this.components.getDatastore().put(dsKey, fixupRec.subarray())
+          await this.components.datastore.put(dsKey, fixupRec.subarray())
         } catch (err: any) {
           this.log.error('Failed error correcting self', err)
         }
@@ -147,7 +145,7 @@ export class ContentFetching implements Initializable {
     // store the record locally
     const dsKey = bufferToRecordKey(key)
     this.log(`storing record for key ${dsKey.toString()}`)
-    await this.components.getDatastore().put(dsKey, record.subarray())
+    await this.components.datastore.put(dsKey, record.subarray())
 
     // put record to the closest peers
     yield * pipe(
@@ -246,7 +244,7 @@ export class ContentFetching implements Initializable {
 
       yield valueEvent({
         value: localRec.value,
-        from: this.components.getPeerId()
+        from: this.components.peerId
       })
     } catch (err: any) {
       this.log('error getting local value for %b', key, err)

package/src/content-routing/index.ts

@@ -22,7 +22,7 @@ import type { CID } from 'multiformats/cid'
 import type { AbortOptions } from '@libp2p/interfaces'
 import type { Multiaddr } from '@multiformats/multiaddr'
 import type { PeerInfo } from '@libp2p/interface-peer-info'
-import { Components, Initializable } from '@libp2p/components'
+import type { KadDHTComponents } from '../index.js'
 
 export interface ContentRoutingInit {
   network: Network
@@ -33,18 +33,19 @@ export interface ContentRoutingInit {
   lan: boolean
 }
 
-export class ContentRouting implements Initializable {
+export class ContentRouting {
   private readonly log: Logger
-  private components: Components = new Components()
+  private readonly components: KadDHTComponents
   private readonly network: Network
   private readonly peerRouting: PeerRouting
   private readonly queryManager: QueryManager
   private readonly routingTable: RoutingTable
   private readonly providers: Providers
 
-  constructor (init: ContentRoutingInit) {
+  constructor (components: KadDHTComponents, init: ContentRoutingInit) {
     const { network, peerRouting, queryManager, routingTable, providers, lan } = init
 
+    this.components = components
     this.log = logger(`libp2p:kad-dht:${lan ? 'lan' : 'wan'}:content-routing`)
     this.network = network
     this.peerRouting = peerRouting
@@ -53,10 +54,6 @@ export class ContentRouting implements Initializable {
     this.providers = providers
   }
 
-  init (components: Components): void {
-    this.components = components
-  }
-
   /**
    * Announce to the network that we can provide the value for a given key and
    * are contactable on the given multiaddrs
@@ -65,11 +62,11 @@ export class ContentRouting implements Initializable {
     this.log('provide %s', key)
 
     // Add peer as provider
-    await this.providers.addProvider(key, this.components.getPeerId())
+    await this.providers.addProvider(key, this.components.peerId)
 
     const msg = new Message(MESSAGE_TYPE.ADD_PROVIDER, key.bytes, 0)
     msg.providerPeers = [{
-      id: this.components.getPeerId(),
+      id: this.components.peerId,
       multiaddrs,
       protocols: []
     }]
@@ -144,13 +141,13 @@ export class ContentRouting implements Initializable {
       for (const peerId of provs.slice(0, toFind)) {
         providers.push({
           id: peerId,
-          multiaddrs: ((await this.components.getPeerStore().addressBook.get(peerId)) ?? []).map(address => address.multiaddr),
+          multiaddrs: ((await this.components.peerStore.addressBook.get(peerId)) ?? []).map(address => address.multiaddr),
           protocols: []
         })
       }
 
-      yield peerResponseEvent({ from: this.components.getPeerId(), messageType: MESSAGE_TYPE.GET_PROVIDERS, providers })
-      yield providerEvent({ from: this.components.getPeerId(), providers: providers })
+      yield peerResponseEvent({ from: this.components.peerId, messageType: MESSAGE_TYPE.GET_PROVIDERS, providers })
+      yield providerEvent({ from: this.components.peerId, providers: providers })
     }
 
     // All done

package/src/dual-kad-dht.ts

@@ -9,8 +9,8 @@ import { EventEmitter, CustomEvent } from '@libp2p/interfaces/events'
 import type { CID } from 'multiformats'
 import type { PeerId } from '@libp2p/interface-peer-id'
 import type { PeerDiscoveryEvents } from '@libp2p/interface-peer-discovery'
-import { Components, Initializable } from '@libp2p/components'
 import { symbol } from '@libp2p/interface-peer-discovery'
+import type { KadDHTComponents } from './index.js'
 
 const log = logger('libp2p:kad-dht')
 
@@ -18,14 +18,15 @@ 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 DualDHT, Initializable {
-  public wan: KadDHT
-  public lan: KadDHT
-  public components: Components = new Components()
+export class DualKadDHT extends EventEmitter<PeerDiscoveryEvents> implements DualDHT {
+  public readonly wan: KadDHT
+  public readonly lan: KadDHT
+  public readonly components: KadDHTComponents
 
-  constructor (wan: KadDHT, lan: KadDHT) {
+  constructor (components: KadDHTComponents, wan: KadDHT, lan: KadDHT) {
     super()
 
+    this.components = components
     this.wan = wan
     this.lan = lan
 
@@ -50,12 +51,6 @@ export class DualKadDHT extends EventEmitter<PeerDiscoveryEvents> implements Dua
     return '@libp2p/dual-kad-dht'
   }
 
-  init (components: Components): void {
-    this.components = components
-    this.wan.init(components)
-    this.lan.init(components)
-  }
-
   /**
    * Is this DHT running.
    */
@@ -146,7 +141,7 @@ export class DualKadDHT extends EventEmitter<PeerDiscoveryEvents> implements Dua
 
     if (!foundValue) {
       yield queryErrorEvent({
-        from: this.components.getPeerId(),
+        from: this.components.peerId,
         error: errCode(new Error('Not found'), 'ERR_NOT_FOUND')
       })
     }

package/src/index.ts

@@ -1,6 +1,13 @@
 import { KadDHT as SingleKadDHT } from './kad-dht.js'
 import { DualKadDHT } from './dual-kad-dht.js'
 import type { Selectors, Validators } from '@libp2p/interface-dht'
+import type { Registrar } from '@libp2p/interface-registrar'
+import type { AddressManager } from '@libp2p/interface-address-manager'
+import type { PeerStore } from '@libp2p/interface-peer-store'
+import type { ConnectionManager } from '@libp2p/interface-connection-manager'
+import type { Metrics } from '@libp2p/interface-metrics'
+import type { PeerId } from '@libp2p/interface-peer-id'
+import type { Datastore } from 'interface-datastore'
 
 export interface KadDHTInit {
   /**
@@ -57,14 +64,24 @@ export interface KadDHTInit {
   maxOutboundStreams?: number
 }
 
-export class KadDHT extends DualKadDHT {
-  constructor (init?: KadDHTInit) {
-    super(new SingleKadDHT({
+export interface KadDHTComponents {
+  peerId: PeerId
+  registrar: Registrar
+  addressManager: AddressManager
+  peerStore: PeerStore
+  metrics?: Metrics
+  connectionManager: ConnectionManager
+  datastore: Datastore
+}
+
+class KadDHT extends DualKadDHT {
+  constructor (components: KadDHTComponents, init?: KadDHTInit) {
+    super(components, new SingleKadDHT(components, {
       protocolPrefix: '/ipfs',
       ...init,
       lan: false
     }),
-    new SingleKadDHT({
+    new SingleKadDHT(components, {
       protocolPrefix: '/ipfs',
       ...init,
       clientMode: false,
@@ -72,3 +89,7 @@ export class KadDHT extends DualKadDHT {
     }))
   }
 }
+
+export function kadDht (init?: KadDHTInit): (components: KadDHTComponents) => DualKadDHT {
+  return (components: KadDHTComponents) => new KadDHT(components, init)
+}

package/src/kad-dht.ts

@@ -20,8 +20,7 @@ import { CustomEvent, EventEmitter } from '@libp2p/interfaces/events'
 import type { PeerId } from '@libp2p/interface-peer-id'
 import type { CID } from 'multiformats/cid'
 import type { PeerDiscoveryEvents } from '@libp2p/interface-peer-discovery'
-import { Components, Initializable } from '@libp2p/components'
-import type { KadDHTInit } from './index.js'
+import type { KadDHTComponents, KadDHTInit } from './index.js'
 import { validators as recordValidators } from '@libp2p/record/validators'
 import { selectors as recordSelectors } from '@libp2p/record/selectors'
 import { symbol } from '@libp2p/interface-peer-discovery'
@@ -41,14 +40,14 @@ export interface SingleKadDHTInit extends KadDHTInit {
  * A DHT implementation modelled after Kademlia with S/Kademlia modifications.
  * Original implementation in go: https://github.com/libp2p/go-libp2p-kad-dht.
  */
-export class KadDHT extends EventEmitter<PeerDiscoveryEvents> implements DHT, Initializable {
+export class KadDHT extends EventEmitter<PeerDiscoveryEvents> implements DHT {
   public protocol: string
   public routingTable: RoutingTable
   public providers: Providers
   public network: Network
   public peerRouting: PeerRouting
 
-  public components: Components = new Components()
+  public readonly components: KadDHTComponents
   private readonly log: Logger
   private running: boolean
   private readonly kBucketSize: number
@@ -69,7 +68,7 @@ export class KadDHT extends EventEmitter<PeerDiscoveryEvents> implements DHT, In
   /**
    * Create a new KadDHT
    */
-  constructor (init: SingleKadDHTInit) {
+  constructor (components: KadDHTComponents, init: SingleKadDHTInit) {
     super()
 
     const {
@@ -87,6 +86,7 @@ export class KadDHT extends EventEmitter<PeerDiscoveryEvents> implements DHT, In
     } = init
 
     this.running = false
+    this.components = components
     this.lan = Boolean(lan)
     this.log = logger(`libp2p:kad-dht:${lan === true ? 'lan' : 'wan'}`)
     this.protocol = `${protocolPrefix ?? PROTOCOL_PREFIX}${lan === true ? LAN_PREFIX : ''}${PROTOCOL_DHT}`
@@ -94,7 +94,7 @@ export class KadDHT extends EventEmitter<PeerDiscoveryEvents> implements DHT, In
     this.clientMode = clientMode ?? true
     this.maxInboundStreams = maxInboundStreams ?? DEFAULT_MAX_INBOUND_STREAMS
     this.maxOutboundStreams = maxOutboundStreams ?? DEFAULT_MAX_OUTBOUND_STREAMS
-    this.routingTable = new RoutingTable({
+    this.routingTable = new RoutingTable(components, {
       kBucketSize,
       lan: this.lan,
       pingTimeout,
@@ -102,7 +102,7 @@ export class KadDHT extends EventEmitter<PeerDiscoveryEvents> implements DHT, In
       protocol: this.protocol
     })
 
-    this.providers = new Providers()
+    this.providers = new Providers(components)
 
     this.validators = {
       ...recordValidators,
@@ -112,25 +112,25 @@ export class KadDHT extends EventEmitter<PeerDiscoveryEvents> implements DHT, In
       ...recordSelectors,
       ...selectors
     }
-    this.network = new Network({
+    this.network = new Network(components, {
       protocol: this.protocol,
       lan: this.lan
     })
-    this.queryManager = new QueryManager({
+    this.queryManager = new QueryManager(components, {
       // Number of disjoint query paths to use - This is set to `kBucketSize/2` per the S/Kademlia paper
       disjointPaths: Math.ceil(this.kBucketSize / 2),
       lan
     })
 
     // DHT components
-    this.peerRouting = new PeerRouting({
+    this.peerRouting = new PeerRouting(components, {
       routingTable: this.routingTable,
       network: this.network,
       validators: this.validators,
       queryManager: this.queryManager,
       lan: this.lan
     })
-    this.contentFetching = new ContentFetching({
+    this.contentFetching = new ContentFetching(components, {
       validators: this.validators,
       selectors: this.selectors,
       peerRouting: this.peerRouting,
@@ -139,7 +139,7 @@ export class KadDHT extends EventEmitter<PeerDiscoveryEvents> implements DHT, In
       network: this.network,
       lan: this.lan
     })
-    this.contentRouting = new ContentRouting({
+    this.contentRouting = new ContentRouting(components, {
       network: this.network,
       peerRouting: this.peerRouting,
       queryManager: this.queryManager,
@@ -152,18 +152,18 @@ export class KadDHT extends EventEmitter<PeerDiscoveryEvents> implements DHT, In
       routingTable: this.routingTable,
       lan: this.lan
     })
-    this.rpc = new RPC({
+    this.rpc = new RPC(components, {
       routingTable: this.routingTable,
       providers: this.providers,
       peerRouting: this.peerRouting,
       validators: this.validators,
       lan: this.lan
     })
-    this.topologyListener = new TopologyListener({
+    this.topologyListener = new TopologyListener(components, {
       protocol: this.protocol,
       lan: this.lan
     })
-    this.querySelf = new QuerySelf({
+    this.querySelf = new QuerySelf(components, {
       peerRouting: this.peerRouting,
       interval: querySelfInterval,
       lan: this.lan
@@ -187,7 +187,7 @@ export class KadDHT extends EventEmitter<PeerDiscoveryEvents> implements DHT, In
       const peerId = evt.detail
 
       Promise.resolve().then(async () => {
-        const multiaddrs = await this.components.getPeerStore().addressBook.get(peerId)
+        const multiaddrs = await this.components.peerStore.addressBook.get(peerId)
 
         const peerData = {
           id: peerId,
@@ -210,22 +210,6 @@ export class KadDHT extends EventEmitter<PeerDiscoveryEvents> implements DHT, In
     return '@libp2p/kad-dht'
   }
 
-  init (components: Components): void {
-    this.components = components
-
-    this.routingTable.init(components)
-    this.providers.init(components)
-    this.network.init(components)
-    this.queryManager.init(components)
-    this.peerRouting.init(components)
-    this.contentFetching.init(components)
-    this.contentRouting.init(components)
-    this.routingTableRefresh.init(components)
-    this.rpc.init(components)
-    this.topologyListener.init(components)
-    this.querySelf.init(components)
-  }
-
   async onPeerConnect (peerData: PeerInfo) {
     this.log('peer %p connected with protocols %s', peerData.id, peerData.protocols)
 
@@ -265,7 +249,7 @@ export class KadDHT extends EventEmitter<PeerDiscoveryEvents> implements DHT, In
    * If 'server' this node will respond to DHT queries, if 'client' this node will not
    */
   async setMode (mode: 'client' | 'server') {
-    await this.components.getRegistrar().unhandle(this.protocol)
+    await this.components.registrar.unhandle(this.protocol)
 
     if (mode === 'client') {
       this.log('enabling client mode')
@@ -273,7 +257,7 @@ export class KadDHT extends EventEmitter<PeerDiscoveryEvents> implements DHT, In
     } else {
       this.log('enabling server mode')
       this.clientMode = false
-      await this.components.getRegistrar().handle(this.protocol, this.rpc.onIncomingStream.bind(this.rpc), {
+      await this.components.registrar.handle(this.protocol, this.rpc.onIncomingStream.bind(this.rpc), {
         maxInboundStreams: this.maxInboundStreams,
         maxOutboundStreams: this.maxOutboundStreams
       })
@@ -339,7 +323,7 @@ export class KadDHT extends EventEmitter<PeerDiscoveryEvents> implements DHT, In
    * Announce to the network that we can provide given key's value
    */
   async * provide (key: CID, options: QueryOptions = {}) { // eslint-disable-line require-await
-    yield * this.contentRouting.provide(key, this.components.getAddressManager().getAddresses(), options)
+    yield * this.contentRouting.provide(key, this.components.addressManager.getAddresses(), options)
   }
 
   /**

package/src/network.ts

@@ -18,10 +18,10 @@ import type { Startable } from '@libp2p/interfaces/startable'
 import type { Logger } from '@libp2p/logger'
 import type { Duplex } from 'it-stream-types'
 import type { PeerInfo } from '@libp2p/interface-peer-info'
-import { Components, Initializable } from '@libp2p/components'
 import type { Stream } from '@libp2p/interface-connection'
 import { abortableDuplex } from 'abortable-iterator'
 import type { Uint8ArrayList } from 'uint8arraylist'
+import type { KadDHTComponents } from './index.js'
 
 export interface NetworkInit {
   protocol: string
@@ -35,28 +35,25 @@ interface NetworkEvents {
 /**
  * Handle network operations for the dht
  */
-export class Network extends EventEmitter<NetworkEvents> implements Startable, Initializable {
+export class Network extends EventEmitter<NetworkEvents> implements Startable {
   private readonly log: Logger
   private readonly protocol: string
   private running: boolean
-  private components: Components = new Components()
+  private readonly components: KadDHTComponents
 
   /**
    * Create a new network
    */
-  constructor (init: NetworkInit) {
+  constructor (components: KadDHTComponents, init: NetworkInit) {
     super()
 
     const { protocol, lan } = init
+    this.components = components
     this.log = logger(`libp2p:kad-dht:${lan ? 'lan' : 'wan'}:network`)
     this.running = false
     this.protocol = protocol
   }
 
-  init (components: Components): void {
-    this.components = components
-  }
-
   /**
    * Start the network
    */
@@ -97,7 +94,7 @@ export class Network extends EventEmitter<NetworkEvents> implements Startable, I
     let stream: Stream | undefined
 
     try {
-      const connection = await this.components.getConnectionManager().openConnection(to, options)
+      const connection = await this.components.connectionManager.openConnection(to, options)
       const stream = await connection.newStream(this.protocol, options)
 
       const response = await this._writeReadMessage(stream, msg.serialize(), options)
@@ -133,7 +130,7 @@ export class Network extends EventEmitter<NetworkEvents> implements Startable, I
     let stream: Stream | undefined
 
     try {
-      const connection = await this.components.getConnectionManager().openConnection(to, options)
+      const connection = await this.components.connectionManager.openConnection(to, options)
       const stream = await connection.newStream(this.protocol, options)
 
       await this._writeMessage(stream, msg.serialize(), options)

package/src/peer-routing/index.ts

@@ -22,7 +22,7 @@ import type { AbortOptions } from '@libp2p/interfaces'
 import type { QueryFunc } from '../query/types.js'
 import type { PeerInfo } from '@libp2p/interface-peer-info'
 import type { PeerId } from '@libp2p/interface-peer-id'
-import { Components, Initializable } from '@libp2p/components'
+import type { KadDHTComponents } from '../index.js'
 
 export interface PeerRoutingInit {
   routingTable: RoutingTable
@@ -32,17 +32,18 @@ export interface PeerRoutingInit {
   lan: boolean
 }
 
-export class PeerRouting implements Initializable {
-  private components: Components = new Components()
+export class PeerRouting {
+  private readonly components: KadDHTComponents
   private readonly log: Logger
   private readonly routingTable: RoutingTable
   private readonly network: Network
   private readonly validators: Validators
   private readonly queryManager: QueryManager
 
-  constructor (init: PeerRoutingInit) {
+  constructor (components: KadDHTComponents, init: PeerRoutingInit) {
     const { routingTable, network, validators, queryManager, lan } = init
 
+    this.components = components
     this.routingTable = routingTable
     this.network = network
     this.validators = validators
@@ -50,10 +51,6 @@ export class PeerRouting implements Initializable {
     this.log = logger(`libp2p:kad-dht:${lan ? 'lan' : 'wan'}:peer-routing`)
   }
 
-  init (components: Components): void {
-    this.components = components
-  }
-
   /**
    * Look if we are connected to a peer with the given id.
    * Returns its id and addresses, if found, otherwise `undefined`.
@@ -66,7 +63,7 @@ export class PeerRouting implements Initializable {
       this.log('findPeerLocal found %p in routing table', peer)
 
       try {
-        peerData = await this.components.getPeerStore().get(p)
+        peerData = await this.components.peerStore.get(p)
       } catch (err: any) {
         if (err.code !== 'ERR_NOT_FOUND') {
           throw err
@@ -76,7 +73,7 @@ export class PeerRouting implements Initializable {
 
     if (peerData == null) {
       try {
-        peerData = await this.components.getPeerStore().get(peer)
+        peerData = await this.components.peerStore.get(peer)
       } catch (err: any) {
         if (err.code !== 'ERR_NOT_FOUND') {
           throw err
@@ -146,7 +143,7 @@ export class PeerRouting implements Initializable {
     if (pi != null) {
       this.log('found local')
       yield finalPeerEvent({
-        from: this.components.getPeerId(),
+        from: this.components.peerId,
         peer: pi
       })
       return
@@ -160,11 +157,11 @@ export class PeerRouting implements Initializable {
 
     if (match != null) {
       try {
-        const peer = await this.components.getPeerStore().get(id)
+        const peer = await this.components.peerStore.get(id)
 
         this.log('found in peerStore')
         yield finalPeerEvent({
-          from: this.components.getPeerId(),
+          from: this.components.peerId,
           peer: {
             id: peer.id,
             multiaddrs: peer.addresses.map((address) => address.multiaddr),
@@ -210,7 +207,7 @@ export class PeerRouting implements Initializable {
     }
 
     if (!foundPeer) {
-      yield queryErrorEvent({ from: this.components.getPeerId(), error: errcode(new Error('Not found'), 'ERR_NOT_FOUND') })
+      yield queryErrorEvent({ from: this.components.peerId, error: errcode(new Error('Not found'), 'ERR_NOT_FOUND') })
     }
   }
 
@@ -246,10 +243,10 @@ export class PeerRouting implements Initializable {
 
     for (const peer of peers.peers) {
       yield finalPeerEvent({
-        from: this.components.getPeerId(),
+        from: this.components.peerId,
         peer: {
           id: peer,
-          multiaddrs: (await (this.components.getPeerStore().addressBook.get(peer)) ?? []).map(addr => addr.multiaddr),
+          multiaddrs: (await (this.components.peerStore.addressBook.get(peer)) ?? []).map(addr => addr.multiaddr),
           protocols: []
         }
       })
@@ -310,8 +307,8 @@ export class PeerRouting implements Initializable {
       }
 
       try {
-        const addresses = await this.components.getPeerStore().addressBook.get(peerId)
-        const protocols = await this.components.getPeerStore().protoBook.get(peerId)
+        const addresses = await this.components.peerStore.addressBook.get(peerId)
+        const protocols = await this.components.peerStore.protoBook.get(peerId)
 
         output.push({
           id: peerId,