deps: update @libp2p/interface-peer-discovery to 2.0.0 (libp2p#469)

Updates the interface and symbol return type

package.json

@@ -147,9 +147,8 @@
     "@libp2p/interface-connection": "^5.0.1",
     "@libp2p/interface-connection-manager": "^3.0.0",
     "@libp2p/interface-content-routing": "^2.1.0",
-    "@libp2p/interface-dht": "^2.0.0",
     "@libp2p/interface-metrics": "^4.0.0",
-    "@libp2p/interface-peer-discovery": "^1.0.1",
+    "@libp2p/interface-peer-discovery": "^2.0.0",
     "@libp2p/interface-peer-id": "^2.0.0",
     "@libp2p/interface-peer-info": "^1.0.3",
     "@libp2p/interface-peer-routing": "^1.1.0",
@@ -191,7 +190,7 @@
   },
   "devDependencies": {
     "@libp2p/interface-libp2p": "^3.0.0",
-    "@libp2p/interface-mocks": "^11.0.0",
+    "@libp2p/interface-mocks": "^12.0.0",
     "@libp2p/peer-id-factory": "^2.0.0",
     "@libp2p/peer-store": "^8.0.0",
     "@types/lodash.random": "^3.2.6",

src/content-fetching/index.ts

@@ -16,13 +16,12 @@ import {
   queryErrorEvent
 } from '../query/events.js'
 import { createPutRecord, convertBuffer, bufferToRecordKey } from '../utils.js'
-import type { KadDHTComponents } from '../index.js'
+import type { KadDHTComponents, Validators, Selectors, ValueEvent, QueryOptions, QueryEvent } from '../index.js'
 import type { Network } from '../network.js'
 import type { PeerRouting } from '../peer-routing/index.js'
 import type { QueryManager } from '../query/manager.js'
 import type { QueryFunc } from '../query/types.js'
 import type { RoutingTable } from '../routing-table/index.js'
-import type { Validators, Selectors, ValueEvent, QueryOptions, QueryEvent } from '@libp2p/interface-dht'
 import type { AbortOptions } from '@libp2p/interfaces'
 import type { Logger } from '@libp2p/logger'
 

src/content-routing/index.ts

@@ -10,14 +10,13 @@ import {
   providerEvent
 } from '../query/events.js'
 import { convertBuffer } from '../utils.js'
-import type { KadDHTComponents } from '../index.js'
+import type { KadDHTComponents, PeerResponseEvent, ProviderEvent, QueryEvent, QueryOptions } from '../index.js'
 import type { Network } from '../network.js'
 import type { PeerRouting } from '../peer-routing/index.js'
 import type { Providers } from '../providers.js'
 import type { QueryManager } from '../query/manager.js'
 import type { QueryFunc } from '../query/types.js'
 import type { RoutingTable } from '../routing-table/index.js'
-import type { PeerResponseEvent, ProviderEvent, QueryEvent, QueryOptions } from '@libp2p/interface-dht'
 import type { PeerInfo } from '@libp2p/interface-peer-info'
 import type { AbortOptions } from '@libp2p/interfaces'
 import type { Logger } from '@libp2p/logger'

src/dual-kad-dht.ts

@@ -1,34 +1,117 @@
-import { symbol } from '@libp2p/interface-peer-discovery'
+import { type ContentRouting, contentRouting } from '@libp2p/interface-content-routing'
+import { type PeerDiscovery, peerDiscovery, type PeerDiscoveryEvents } from '@libp2p/interface-peer-discovery'
+import { type PeerRouting, peerRouting } from '@libp2p/interface-peer-routing'
 import { CodeError } from '@libp2p/interfaces/errors'
 import { EventEmitter, CustomEvent } from '@libp2p/interfaces/events'
 import { logger } from '@libp2p/logger'
+import drain from 'it-drain'
 import merge from 'it-merge'
+import { DefaultKadDHT } from './kad-dht.js'
 import { queryErrorEvent } from './query/events.js'
-import type { KadDHTComponents } from './index.js'
-import type { KadDHT } from './kad-dht.js'
-import type { DualDHT, QueryEvent, QueryOptions } from '@libp2p/interface-dht'
-import type { PeerDiscoveryEvents } from '@libp2p/interface-peer-discovery'
+import type { DualKadDHT, KadDHT, KadDHTComponents, KadDHTInit, QueryEvent, QueryOptions } from './index.js'
 import type { PeerId } from '@libp2p/interface-peer-id'
+import type { PeerInfo } from '@libp2p/interface-peer-info'
 import type { AbortOptions } from '@libp2p/interfaces'
-import type { CID } from 'multiformats'
+import type { CID } from 'multiformats/cid'
 
 const log = logger('libp2p:kad-dht')
 
+/**
+ * Wrapper class to convert events into returned values
+ */
+class DHTContentRouting implements ContentRouting {
+  private readonly dht: KadDHT
+
+  constructor (dht: KadDHT) {
+    this.dht = dht
+  }
+
+  async provide (cid: CID): Promise<void> {
+    await drain(this.dht.provide(cid))
+  }
+
+  async * findProviders (cid: CID, options: AbortOptions = {}): AsyncGenerator<PeerInfo, void, undefined> {
+    for await (const event of this.dht.findProviders(cid, options)) {
+      if (event.name === 'PROVIDER') {
+        yield * event.providers
+      }
+    }
+  }
+
+  async put (key: Uint8Array, value: Uint8Array, options?: AbortOptions): Promise<void> {
+    await drain(this.dht.put(key, value, options))
+  }
+
+  async get (key: Uint8Array, options?: AbortOptions): Promise<Uint8Array> {
+    for await (const event of this.dht.get(key, options)) {
+      if (event.name === 'VALUE') {
+        return event.value
+      }
+    }
+
+    throw new CodeError('Not found', 'ERR_NOT_FOUND')
+  }
+}
+
+/**
+ * Wrapper class to convert events into returned values
+ */
+class DHTPeerRouting implements PeerRouting {
+  private readonly dht: KadDHT
+
+  constructor (dht: KadDHT) {
+    this.dht = dht
+  }
+
+  async findPeer (peerId: PeerId, options: AbortOptions = {}): Promise<PeerInfo> {
+    for await (const event of this.dht.findPeer(peerId, options)) {
+      if (event.name === 'FINAL_PEER') {
+        return event.peer
+      }
+    }
+
+    throw new CodeError('Not found', 'ERR_NOT_FOUND')
+  }
+
+  async * getClosestPeers (key: Uint8Array, options: AbortOptions = {}): AsyncIterable<PeerInfo> {
+    for await (const event of this.dht.getClosestPeers(key, options)) {
+      if (event.name === 'FINAL_PEER') {
+        yield event.peer
+      }
+    }
+  }
+}
+
 /**
  * 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 {
-  public readonly wan: KadDHT
-  public readonly lan: KadDHT
+export class DefaultDualKadDHT extends EventEmitter<PeerDiscoveryEvents> implements DualKadDHT, PeerDiscovery {
+  public readonly wan: DefaultKadDHT
+  public readonly lan: DefaultKadDHT
   public readonly components: KadDHTComponents
+  private readonly contentRouting: ContentRouting
+  private readonly peerRouting: PeerRouting
 
-  constructor (components: KadDHTComponents, wan: KadDHT, lan: KadDHT) {
+  constructor (components: KadDHTComponents, init: KadDHTInit = {}) {
     super()
 
     this.components = components
-    this.wan = wan
-    this.lan = lan
+
+    this.wan = new DefaultKadDHT(components, {
+      protocolPrefix: '/ipfs',
+      ...init,
+      lan: false
+    })
+    this.lan = new DefaultKadDHT(components, {
+      protocolPrefix: '/ipfs',
+      ...init,
+      clientMode: false,
+      lan: true
+    })
+
+    this.contentRouting = new DHTContentRouting(this)
+    this.peerRouting = new DHTPeerRouting(this)
 
     // handle peers being discovered during processing of DHT messages
     this.wan.addEventListener('peer', (evt) => {
@@ -43,10 +126,20 @@ export class DualKadDHT extends EventEmitter<PeerDiscoveryEvents> implements Dua
     })
   }
 
-  readonly [symbol] = true
-
   readonly [Symbol.toStringTag] = '@libp2p/dual-kad-dht'
 
+  get [contentRouting] (): ContentRouting {
+    return this.contentRouting
+  }
+
+  get [peerRouting] (): PeerRouting {
+    return this.peerRouting
+  }
+
+  get [peerDiscovery] (): PeerDiscovery {
+    return this
+  }
+
   /**
    * Is this DHT running.
    */