@libp2p/daemon-server 0.0.1 → 0.0.2

package/dist/src/pubsub.js

@@ -1,39 +1,60 @@
 /* eslint max-depth: ["error", 6] */
 import { PSMessage } from '@libp2p/daemon-protocol';
-import { OkResponse } from './responses.js';
+import { ErrorResponse, OkResponse } from './responses.js';
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string';
 import { pushable } from 'it-pushable';
+import { CustomEvent } from '@libp2p/interfaces';
+import { logger } from '@libp2p/logger';
+const log = logger('libp2p:daemon-server:pubsub');
 export class PubSubOperations {
     constructor(init) {
         const { pubsub } = init;
         this.pubsub = pubsub;
     }
     async *getTopics() {
-        yield OkResponse({
-            pubsub: {
-                topics: this.pubsub.getTopics()
-            }
-        });
+        try {
+            yield OkResponse({
+                pubsub: {
+                    topics: this.pubsub.getTopics()
+                }
+            });
+        }
+        catch (err) {
+            log.error(err);
+            yield ErrorResponse(err);
+        }
     }
     async *subscribe(topic) {
-        const onMessage = pushable();
-        await this.pubsub.addEventListener(topic, (evt) => {
-            const msg = evt.detail;
-            onMessage.push(PSMessage.encode({
-                from: msg.from.toBytes(),
-                data: msg.data,
-                seqno: msg.sequenceNumber == null ? undefined : uint8ArrayFromString(msg.sequenceNumber.toString(16).padStart(16, '0'), 'base16'),
-                topicIDs: [msg.topic],
-                signature: msg.signature,
-                key: msg.key
-            }).finish());
-        });
-        yield OkResponse();
-        yield* onMessage;
+        try {
+            const onMessage = pushable();
+            await this.pubsub.addEventListener(topic, (evt) => {
+                const msg = evt.detail;
+                onMessage.push(PSMessage.encode({
+                    from: msg.from.toBytes(),
+                    data: msg.data,
+                    seqno: msg.sequenceNumber == null ? undefined : uint8ArrayFromString(msg.sequenceNumber.toString(16).padStart(16, '0'), 'base16'),
+                    topicIDs: [msg.topic],
+                    signature: msg.signature,
+                    key: msg.key
+                }).finish());
+            });
+            yield OkResponse();
+            yield* onMessage;
+        }
+        catch (err) {
+            log.error(err);
+            yield ErrorResponse(err);
+        }
     }
     async *publish(topic, data) {
-        this.pubsub.dispatchEvent(new CustomEvent(topic, { detail: data }));
-        yield OkResponse();
+        try {
+            this.pubsub.dispatchEvent(new CustomEvent(topic, { detail: data }));
+            yield OkResponse();
+        }
+        catch (err) {
+            log.error(err);
+            yield ErrorResponse(err);
+        }
     }
 }
 //# sourceMappingURL=pubsub.js.map

package/dist/src/pubsub.js.map

@@ -1 +1 @@
-{"version":3,"file":"pubsub.js","sourceRoot":"","sources":["../../src/pubsub.ts"],"names":[],"mappings":"AAAA,oCAAoC;AAEpC,OAAO,EACL,SAAS,EACV,MAAM,yBAAyB,CAAA;AAChC,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAE3C,OAAO,EAAE,UAAU,IAAI,oBAAoB,EAAE,MAAM,yBAAyB,CAAA;AAC5E,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AAMtC,MAAM,OAAO,gBAAgB;IAG3B,YAAa,IAA0B;QACrC,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAA;QAEvB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACtB,CAAC;IAED,KAAK,CAAC,CAAE,SAAS;QACf,MAAM,UAAU,CAAC;YACf,MAAM,EAAE;gBACN,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE;aAChC;SACF,CAAC,CAAA;IACJ,CAAC;IAED,KAAK,CAAC,CAAE,SAAS,CAAE,KAAa;QAC9B,MAAM,SAAS,GAAG,QAAQ,EAAc,CAAA;QAExC,MAAM,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,KAAK,EAAE,CAAC,GAAG,EAAE,EAAE;YAChD,MAAM,GAAG,GAAG,GAAG,CAAC,MAAM,CAAA;YAEtB,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC;gBAC9B,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE;gBACxB,IAAI,EAAE,GAAG,CAAC,IAAI;gBACd,KAAK,EAAE,GAAG,CAAC,cAAc,IAAI,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,oBAAoB,CAAC,GAAG,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,GAAG,CAAC,EAAE,QAAQ,CAAC;gBACjI,QAAQ,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC;gBACrB,SAAS,EAAE,GAAG,CAAC,SAAS;gBACxB,GAAG,EAAE,GAAG,CAAC,GAAG;aACb,CAAC,CAAC,MAAM,EAAE,CAAC,CAAA;QACd,CAAC,CAAC,CAAA;QAEF,MAAM,UAAU,EAAE,CAAA;QAClB,KAAM,CAAC,CAAC,SAAS,CAAA;IACnB,CAAC;IAED,KAAK,CAAC,CAAE,OAAO,CAAE,KAAa,EAAE,IAAgB;QAC9C,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,WAAW,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAA;QACnE,MAAM,UAAU,EAAE,CAAA;IACpB,CAAC;CAEF"}
+{"version":3,"file":"pubsub.js","sourceRoot":"","sources":["../../src/pubsub.ts"],"names":[],"mappings":"AAAA,oCAAoC;AAEpC,OAAO,EACL,SAAS,EACV,MAAM,yBAAyB,CAAA;AAChC,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAE1D,OAAO,EAAE,UAAU,IAAI,oBAAoB,EAAE,MAAM,yBAAyB,CAAA;AAC5E,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AACtC,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AAEvC,MAAM,GAAG,GAAG,MAAM,CAAC,6BAA6B,CAAC,CAAA;AAMjD,MAAM,OAAO,gBAAgB;IAG3B,YAAa,IAA0B;QACrC,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAA;QAEvB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACtB,CAAC;IAED,KAAK,CAAC,CAAE,SAAS;QACf,IAAI;YACF,MAAM,UAAU,CAAC;gBACf,MAAM,EAAE;oBACN,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE;iBAChC;aACF,CAAC,CAAA;SACH;QAAC,OAAO,GAAQ,EAAE;YACjB,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YACd,MAAM,aAAa,CAAC,GAAG,CAAC,CAAA;SACzB;IACH,CAAC;IAED,KAAK,CAAC,CAAE,SAAS,CAAE,KAAa;QAC9B,IAAI;YACF,MAAM,SAAS,GAAG,QAAQ,EAAc,CAAA;YAExC,MAAM,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,KAAK,EAAE,CAAC,GAAG,EAAE,EAAE;gBAChD,MAAM,GAAG,GAAG,GAAG,CAAC,MAAM,CAAA;gBAEtB,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC;oBAC9B,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE;oBACxB,IAAI,EAAE,GAAG,CAAC,IAAI;oBACd,KAAK,EAAE,GAAG,CAAC,cAAc,IAAI,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,oBAAoB,CAAC,GAAG,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,GAAG,CAAC,EAAE,QAAQ,CAAC;oBACjI,QAAQ,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC;oBACrB,SAAS,EAAE,GAAG,CAAC,SAAS;oBACxB,GAAG,EAAE,GAAG,CAAC,GAAG;iBACb,CAAC,CAAC,MAAM,EAAE,CAAC,CAAA;YACd,CAAC,CAAC,CAAA;YAEF,MAAM,UAAU,EAAE,CAAA;YAClB,KAAM,CAAC,CAAC,SAAS,CAAA;SAClB;QAAC,OAAO,GAAQ,EAAE;YACjB,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YACd,MAAM,aAAa,CAAC,GAAG,CAAC,CAAA;SACzB;IACH,CAAC;IAED,KAAK,CAAC,CAAE,OAAO,CAAE,KAAa,EAAE,IAAgB;QAC9C,IAAI;YACF,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,WAAW,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAA;YACnE,MAAM,UAAU,EAAE,CAAA;SACnB;QAAC,OAAO,GAAQ,EAAE;YACjB,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YACd,MAAM,aAAa,CAAC,GAAG,CAAC,CAAA;SACzB;IACH,CAAC;CACF"}

package/dist/src/responses.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"responses.d.ts","sourceRoot":"","sources":["../../src/responses.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAY,MAAM,yBAAyB,CAAA;AAE7D;;GAEG;AACF,wBAAgB,UAAU,CAAE,IAAI,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC,GAAG,UAAU,CAKlE;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAE,GAAG,EAAE,KAAK,GAAG,UAAU,CAOrD"}
+{"version":3,"file":"responses.d.ts","sourceRoot":"","sources":["../../src/responses.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAY,MAAM,yBAAyB,CAAA;AAE7D;;GAEG;AACH,wBAAgB,UAAU,CAAE,IAAI,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC,GAAG,UAAU,CAKjE;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAE,GAAG,EAAE,KAAK,GAAG,UAAU,CAOrD"}

package/dist/src/responses.js.map

@@ -1 +1 @@
-{"version":3,"file":"responses.js","sourceRoot":"","sources":["../../src/responses.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAE7D;;GAEG;AACF,MAAM,UAAU,UAAU,CAAE,IAAyB;IACpD,OAAO,QAAQ,CAAC,MAAM,CAAC;QACrB,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,EAAE;QACtB,GAAG,IAAI;KACR,CAAC,CAAC,MAAM,EAAE,CAAA;AACb,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,aAAa,CAAE,GAAU;IACvC,OAAO,QAAQ,CAAC,MAAM,CAAC;QACrB,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,KAAK;QACzB,KAAK,EAAE;YACL,GAAG,EAAE,GAAG,CAAC,OAAO;SACjB;KACF,CAAC,CAAC,MAAM,EAAE,CAAA;AACb,CAAC"}
+{"version":3,"file":"responses.js","sourceRoot":"","sources":["../../src/responses.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAE7D;;GAEG;AACH,MAAM,UAAU,UAAU,CAAE,IAAyB;IACnD,OAAO,QAAQ,CAAC,MAAM,CAAC;QACrB,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,EAAE;QACtB,GAAG,IAAI;KACR,CAAC,CAAC,MAAM,EAAE,CAAA;AACb,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,aAAa,CAAE,GAAU;IACvC,OAAO,QAAQ,CAAC,MAAM,CAAC;QACrB,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,KAAK;QACzB,KAAK,EAAE;YACL,GAAG,EAAE,GAAG,CAAC,OAAO;SACjB;KACF,CAAC,CAAC,MAAM,EAAE,CAAA;AACb,CAAC"}

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@libp2p/daemon-server",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "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": [
@@ -130,30 +127,27 @@
     "dep-check": "aegir dep-check dist/src/**/*.js dist/test/**/*.js",
     "build": "tsc",
     "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",
+    "test": "aegir test -t node -f dist/test/*.js dist/test/**/*.js",
+    "test:node": "aegir test -t node -f dist/test/*.js dist/test/**/*.js",
     "release": "semantic-release"
   },
   "dependencies": {
-    "@chainsafe/libp2p-noise": "^6.0.0",
-    "@libp2p/daemon-protocol": "^0.0.0",
+    "@libp2p/daemon-protocol": "^0.0.1",
     "@libp2p/interfaces": "^1.3.17",
+    "@libp2p/logger": "^1.1.2",
+    "@libp2p/tcp": "^1.0.6",
+    "@libp2p/peer-id": "^1.1.8",
     "@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"
+    "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) {
@@ -50,22 +58,11 @@ export class DHTOperations {
 
   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
           }
         }
       }