@libp2p/kad-dht 1.0.0 → 1.0.3

package/src/rpc/index.ts

@@ -11,49 +11,50 @@ import { GetValueHandler } from './handlers/get-value.js'
 import { PingHandler } from './handlers/ping.js'
 import { PutValueHandler } from './handlers/put-value.js'
 import type { IncomingStreamData } from '@libp2p/interfaces/registrar'
-import type { KeyBook, AddressBook } from '@libp2p/interfaces/peer-store'
 import type { Providers } from '../providers'
 import type { PeerRouting } from '../peer-routing'
-import type { Datastore } from 'interface-datastore'
 import type { Validators } from '@libp2p/interfaces/dht'
+import type { Components, Initializable } from '@libp2p/interfaces/components'
 
 export interface DHTMessageHandler {
   handle: (peerId: PeerId, msg: Message) => Promise<Message | undefined>
 }
 
-export interface RPCOptions {
-  peerId: PeerId
+export interface RPCInit {
   routingTable: RoutingTable
-  keyBook: KeyBook
-  addressBook: AddressBook
   providers: Providers
   peerRouting: PeerRouting
-  datastore: Datastore
   validators: Validators
   lan: boolean
 }
 
-export class RPC {
-  private readonly handlers: Record<number, DHTMessageHandler>
+export class RPC implements Initializable {
+  private readonly handlers: Record<number, DHTMessageHandler & Initializable>
   private readonly routingTable: RoutingTable
   private readonly log: Logger
 
-  constructor (options: RPCOptions) {
-    const { keyBook, addressBook, providers, peerRouting, datastore, validators, lan, peerId } = options
+  constructor (init: RPCInit) {
+    const { providers, peerRouting, validators, lan } = init
 
-    this.log = logger('libp2p:kad-dht:rpc:' + peerId.toString())
+    this.log = logger('libp2p:kad-dht:rpc')
 
-    this.routingTable = options.routingTable
+    this.routingTable = init.routingTable
     this.handlers = {
-      [MESSAGE_TYPE.GET_VALUE]: new GetValueHandler({ keyBook, peerRouting, datastore }),
-      [MESSAGE_TYPE.PUT_VALUE]: new PutValueHandler({ peerId, validators, datastore }),
+      [MESSAGE_TYPE.GET_VALUE]: new GetValueHandler({ peerRouting }),
+      [MESSAGE_TYPE.PUT_VALUE]: new PutValueHandler({ validators }),
       [MESSAGE_TYPE.FIND_NODE]: new FindNodeHandler({ peerRouting, lan }),
       [MESSAGE_TYPE.ADD_PROVIDER]: new AddProviderHandler({ providers }),
-      [MESSAGE_TYPE.GET_PROVIDERS]: new GetProvidersHandler({ peerRouting, providers, addressBook, lan }),
+      [MESSAGE_TYPE.GET_PROVIDERS]: new GetProvidersHandler({ peerRouting, providers, lan }),
       [MESSAGE_TYPE.PING]: new PingHandler()
     }
   }
 
+  init (components: Components): void {
+    for (const handler of Object.values(this.handlers)) {
+      handler.init(components)
+    }
+  }
+
   /**
    * Process incoming DHT messages
    */
@@ -78,9 +79,9 @@ export class RPC {
   /**
    * Handle incoming streams on the dht protocol
    */
-  onIncomingStream (evt: CustomEvent<IncomingStreamData>) {
+  onIncomingStream (data: IncomingStreamData) {
     Promise.resolve().then(async () => {
-      const { stream, connection } = evt.detail
+      const { stream, connection } = data
       const peerId = connection.remotePeer
 
       try {

package/src/topology-listener.ts

@@ -1,13 +1,12 @@
 import { createTopology } from '@libp2p/topology'
 import { CustomEvent, EventEmitter } from '@libp2p/interfaces'
 import { logger } from '@libp2p/logger'
-import type { Registrar } from '@libp2p/interfaces/registrar'
 import type { Logger } from '@libp2p/logger'
 import type { Startable } from '@libp2p/interfaces'
 import type { PeerId } from '@libp2p/interfaces/peer-id'
+import { Components, Initializable } from '@libp2p/interfaces/components'
 
-export interface TopologyListenerOptions {
-  registrar: Registrar
+export interface TopologyListenerInit {
   protocol: string
   lan: boolean
 }
@@ -19,24 +18,27 @@ export interface TopologyListenerEvents {
 /**
  * Receives notifications of new peers joining the network that support the DHT protocol
  */
-export class TopologyListener extends EventEmitter<TopologyListenerEvents> implements Startable {
+export class TopologyListener extends EventEmitter<TopologyListenerEvents> implements Startable, Initializable {
   private readonly log: Logger
-  private readonly registrar: Registrar
+  private components: Components = new Components()
   private readonly protocol: string
   private running: boolean
   private registrarId?: string
 
-  constructor (options: TopologyListenerOptions) {
+  constructor (init: TopologyListenerInit) {
     super()
 
-    const { registrar, protocol, lan } = options
+    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: Components): void {
+    this.components = components
+  }
+
   isStarted () {
     return this.running
   }
@@ -60,7 +62,7 @@ export class TopologyListener extends EventEmitter<TopologyListenerEvents> imple
         }))
       }
     })
-    this.registrarId = await this.registrar.register(this.protocol, topology)
+    this.registrarId = await this.components.getRegistrar().register(this.protocol, topology)
   }
 
   /**
@@ -71,7 +73,7 @@ export class TopologyListener extends EventEmitter<TopologyListenerEvents> imple
 
     // unregister protocol and handlers
     if (this.registrarId != null) {
-      this.registrar.unregister(this.registrarId)
+      this.components.getRegistrar().unregister(this.registrarId)
       this.registrarId = undefined
     }
   }

package/src/utils.ts

@@ -5,7 +5,7 @@ import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
 import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
 import { concat as uint8ArrayConcat } from 'uint8arrays/concat'
 import isPrivateIp from 'private-ip'
-import type { PeerData } from '@libp2p/interfaces/peer-data'
+import type { PeerInfo } from '@libp2p/interfaces/peer-info'
 import { peerIdFromBytes } from '@libp2p/peer-id'
 import type { PeerId } from '@libp2p/interfaces/peer-id'
 import { RECORD_KEY_PREFIX } from './constants.js'
@@ -13,7 +13,7 @@ import { RECORD_KEY_PREFIX } from './constants.js'
 // const IPNS_PREFIX = uint8ArrayFromString('/ipns/')
 const PK_PREFIX = uint8ArrayFromString('/pk/')
 
-export function removePrivateAddresses (peer: PeerData): PeerData {
+export function removePrivateAddresses (peer: PeerInfo): PeerInfo {
   return {
     ...peer,
     multiaddrs: peer.multiaddrs.filter(multiaddr => {
@@ -29,7 +29,7 @@ export function removePrivateAddresses (peer: PeerData): PeerData {
   }
 }
 
-export function removePublicAddresses (peer: PeerData): PeerData {
+export function removePublicAddresses (peer: PeerInfo): PeerInfo {
   return {
     ...peer,
     multiaddrs: peer.multiaddrs.filter(multiaddr => {