@libp2p/daemon-server 0.0.1 → 1.0.1

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@libp2p/daemon-server",
-  "version": "0.0.1",
+  "version": "1.0.1",
   "description": "API server for libp2p-daemon instances",
   "license": "Apache-2.0 OR MIT",
-  "homepage": "https://github.com/libp2p/js-libp2p-daemon/tree/master/packages/libp2p-daemon#readme",
+  "homepage": "https://github.com/libp2p/js-libp2p-daemon/tree/master/packages/libp2p-daemon-server#readme",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/libp2p/js-libp2p-daemon.git"
@@ -18,9 +18,6 @@
     "node": ">=16.0.0",
     "npm": ">=7.0.0"
   },
-  "bin": {
-    "jsp2pd": "src/cli/bin.js"
-  },
   "type": "module",
   "types": "./dist/src/index.d.ts",
   "files": [
@@ -126,34 +123,32 @@
     ]
   },
   "scripts": {
+    "clean": "aegir clean",
     "lint": "aegir lint",
-    "dep-check": "aegir dep-check dist/src/**/*.js dist/test/**/*.js",
-    "build": "tsc",
+    "dep-check": "aegir dep-check",
+    "build": "aegir build",
     "pretest": "npm run build",
-    "test": "aegir test -t node -f test/*.js test/**/*.js",
-    "test:node": "aegir test -t node -f test/*.js test/**/*.js",
-    "release": "semantic-release"
+    "test": "aegir test -t node",
+    "test:node": "aegir test -t node",
+    "release": "aegir release"
   },
   "dependencies": {
-    "@chainsafe/libp2p-noise": "^6.0.0",
-    "@libp2p/daemon-protocol": "^0.0.0",
+    "@libp2p/daemon-protocol": "^1.0.0",
     "@libp2p/interfaces": "^1.3.17",
+    "@libp2p/logger": "^1.1.2",
+    "@libp2p/peer-id": "^1.1.8",
+    "@libp2p/tcp": "^1.0.6",
     "@multiformats/multiaddr": "^10.1.8",
     "it-drain": "^1.0.5",
-    "it-handshake": "^3.0.1",
     "it-length-prefixed": "^7.0.1",
     "it-pipe": "^2.0.3",
     "it-pushable": "^2.0.1",
-    "multiformats": "^9.4.2",
+    "multiformats": "^9.6.4",
     "uint8arrays": "^3.0.0"
   },
   "devDependencies": {
-    "aegir": "^36.0.0",
-    "delay": "^5.0.0",
-    "it-buffer": "^0.1.3",
-    "it-pair": "^2.0.2",
-    "mocha": "^9.1.1",
-    "p-defer": "^4.0.0",
-    "sinon": "^13.0.1"
+    "aegir": "^37.0.5",
+    "sinon": "^13.0.1",
+    "ts-sinon": "^2.0.2"
   }
 }

package/src/dht.ts

@@ -1,20 +1,23 @@
 /* eslint max-depth: ["error", 6] */
 
 import {
-  DHTResponse,
+  DHTResponse
 } from '@libp2p/daemon-protocol'
 import { ErrorResponse, OkResponse } from './responses.js'
 import type { PeerId } from '@libp2p/interfaces/peer-id'
 import type { DualDHT } from '@libp2p/interfaces/dht'
 import type { CID } from 'multiformats/cid'
 import drain from 'it-drain'
+import { logger } from '@libp2p/logger'
+
+const log = logger('libp2p:daemon-server:dht')
 
 export interface DHTOperationsInit {
   dht: DualDHT
 }
 
 export class DHTOperations {
-  private dht: DualDHT
+  private readonly dht: DualDHT
 
   constructor (init: DHTOperationsInit) {
     const { dht } = init
@@ -23,8 +26,13 @@ export class DHTOperations {
   }
 
   async * provide (cid: CID) {
-    await this.dht.provide(cid)
-    yield OkResponse()
+    try {
+      await drain(this.dht.provide(cid))
+      yield OkResponse()
+    } catch (err: any) {
+      log.error(err)
+      yield ErrorResponse(err)
+    }
   }
 
   async * getClosestPeers (key: Uint8Array) {
@@ -39,33 +47,22 @@ export class DHTOperations {
         yield * event.closer.map(peer => DHTResponse.encode({
           type: DHTResponse.Type.VALUE,
           value: peer.id.toBytes()
-        }).finish())
+        }))
       }
     }
 
     yield DHTResponse.encode({
       type: DHTResponse.Type.END
-    }).finish()
+    })
   }
 
   async * getPublicKey (peerId: PeerId) {
     yield ErrorResponse(new Error('FIX ME: not implemented'))
-
-    /*
-    const pubKey = await this.dht.getPublicKey(peerId)
-
-    yield OkResponse({
-      dht: {
-        type: DHTResponse.Type.VALUE,
-        value: pubKey.bytes
-      }
-    })
-    */
   }
 
   async * getValue (key: Uint8Array) {
     try {
-      for await (const event of this.dht.getClosestPeers(key)) {
+      for await (const event of this.dht.get(key)) {
         if (event.name === 'VALUE') {
           yield OkResponse({
             dht: {
@@ -76,7 +73,8 @@ export class DHTOperations {
         }
       }
     } catch (err: any) {
-      yield ErrorResponse(err.message)
+      log.error(err)
+      yield ErrorResponse(err)
     }
   }
 
@@ -86,7 +84,8 @@ export class DHTOperations {
 
       yield OkResponse()
     } catch (err: any) {
-      yield ErrorResponse(err.message)
+      log.error(err)
+      yield ErrorResponse(err)
     }
   }
 
@@ -108,6 +107,7 @@ export class DHTOperations {
 
       throw new Error('Peer not found')
     } catch (err: any) {
+      log.error(err)
       yield ErrorResponse(err)
     }
   }
@@ -132,13 +132,13 @@ export class DHTOperations {
               type: DHTResponse.Type.VALUE,
               peer: {
                 id: provider.id.toBytes(),
-                addrs: (provider.multiaddrs || []).map(m => m.bytes)
+                addrs: (provider.multiaddrs ?? []).map(m => m.bytes)
               }
-            }).finish()
+            })
           }
 
           if (maxNumProviders === found) {
-            return
+            break
           }
         }
       }
@@ -148,6 +148,6 @@ export class DHTOperations {
 
     yield DHTResponse.encode({
       type: DHTResponse.Type.END
-    }).finish()
+    })
   }
 }