@libp2p/daemon-protocol 6.0.0 → 6.0.1

package/dist/src/stream-handler.d.ts

@@ -14,7 +14,7 @@ export declare class StreamHandler {
     /**
      * Read and decode message
      */
-    read(): Promise<Uint8Array | undefined>;
+    read(): Promise<Uint8ArrayList | undefined>;
     write(msg: Uint8Array | Uint8ArrayList): Promise<void>;
     /**
      * Return the handshake rest stream and invalidate handler

package/dist/src/stream-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"stream-handler.d.ts","sourceRoot":"","sources":["../../src/stream-handler.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAA;AAC5D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAIpD,MAAM,WAAW,oBAAoB;IACnC,MAAM,EAAE,mBAAmB,CAAA;IAC3B,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB;AAED,qBAAa,aAAa;IACxB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAqB;IAC5C,OAAO,CAAC,QAAQ,CAAC,EAAE,CAA2C;IAE9D;;OAEG;gBACU,IAAI,EAAE,oBAAoB;IAOvC;;OAEG;IACG,IAAI,IAAK,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC;IAYxC,KAAK,CAAE,GAAG,EAAE,UAAU,GAAG,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAK7D;;OAEG;IACH,IAAI,IAAK,mBAAmB;IAI5B;;OAEG;IACG,KAAK,IAAK,OAAO,CAAC,IAAI,CAAC;CAI9B"}
+{"version":3,"file":"stream-handler.d.ts","sourceRoot":"","sources":["../../src/stream-handler.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAA;AAC5D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAIpD,MAAM,WAAW,oBAAoB;IACnC,MAAM,EAAE,mBAAmB,CAAA;IAC3B,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB;AAED,qBAAa,aAAa;IACxB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAqB;IAC5C,OAAO,CAAC,QAAQ,CAAC,EAAE,CAA2C;IAE9D;;OAEG;gBACU,IAAI,EAAE,oBAAoB;IAOvC;;OAEG;IACG,IAAI,IAAK,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC;IAQ5C,KAAK,CAAE,GAAG,EAAE,UAAU,GAAG,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAK7D;;OAEG;IACH,IAAI,IAAK,mBAAmB;IAI5B;;OAEG;IACG,KAAK,IAAK,OAAO,CAAC,IAAI,CAAC;CAI9B"}

package/dist/src/stream-handler.js

@@ -16,14 +16,12 @@ export class StreamHandler {
      * Read and decode message
      */
     async read() {
-        // @ts-expect-error decoder is really a generator
-        const msg = await this.decoder.next();
-        if (msg.value != null) {
-            return msg.value.subarray();
+        try {
+            return await this.lp.read();
+        }
+        catch (err) {
+            log.error('read received no value', err);
         }
-        log('read received no value, closing stream');
-        // End the stream, we didn't get data
-        await this.close();
     }
     async write(msg) {
         log('write message');

package/dist/src/stream-handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"stream-handler.js","sourceRoot":"","sources":["../../src/stream-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AACvC,OAAO,EAAE,QAAQ,EAA6B,MAAM,2BAA2B,CAAA;AAI/E,MAAM,GAAG,GAAG,MAAM,CAAC,uCAAuC,CAAC,CAAA;AAO3D,MAAM,OAAO,aAAa;IACP,MAAM,CAAqB;IAC3B,EAAE,CAA2C;IAE9D;;OAEG;IACH,YAAa,IAA0B;QACrC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,CAAA;QAElC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,EAAE,GAAG,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,aAAa,EAAE,SAAS,IAAI,IAAI,EAAE,CAAC,CAAA;IACvE,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,IAAI;QACR,iDAAiD;QACjD,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAA;QACrC,IAAI,GAAG,CAAC,KAAK,IAAI,IAAI,EAAE,CAAC;YACtB,OAAO,GAAG,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAA;QAC7B,CAAC;QAED,GAAG,CAAC,wCAAwC,CAAC,CAAA;QAC7C,qCAAqC;QACrC,MAAM,IAAI,CAAC,KAAK,EAAE,CAAA;IACpB,CAAC;IAED,KAAK,CAAC,KAAK,CAAE,GAAgC;QAC3C,GAAG,CAAC,eAAe,CAAC,CAAA;QACpB,MAAM,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IAC1B,CAAC;IAED;;OAEG;IACH,IAAI;QACF,OAAO,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,CAAA;IACzB,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,KAAK;QACT,GAAG,CAAC,oBAAoB,CAAC,CAAA;QACzB,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC,KAAK,EAAE,CAAA;IAC3B,CAAC;CACF"}
+{"version":3,"file":"stream-handler.js","sourceRoot":"","sources":["../../src/stream-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AACvC,OAAO,EAAE,QAAQ,EAA6B,MAAM,2BAA2B,CAAA;AAI/E,MAAM,GAAG,GAAG,MAAM,CAAC,uCAAuC,CAAC,CAAA;AAO3D,MAAM,OAAO,aAAa;IACP,MAAM,CAAqB;IAC3B,EAAE,CAA2C;IAE9D;;OAEG;IACH,YAAa,IAA0B;QACrC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,CAAA;QAElC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,EAAE,GAAG,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,aAAa,EAAE,SAAS,IAAI,IAAI,EAAE,CAAC,CAAA;IACvE,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,IAAI;QACR,IAAI,CAAC;YACH,OAAO,MAAM,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,CAAA;QAC7B,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,GAAG,CAAC,KAAK,CAAC,wBAAwB,EAAE,GAAG,CAAC,CAAA;QAC1C,CAAC;IACH,CAAC;IAED,KAAK,CAAC,KAAK,CAAE,GAAgC;QAC3C,GAAG,CAAC,eAAe,CAAC,CAAA;QACpB,MAAM,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IAC1B,CAAC;IAED;;OAEG;IACH,IAAI;QACF,OAAO,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,CAAA;IACzB,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,KAAK;QACT,GAAG,CAAC,oBAAoB,CAAC,CAAA;QACzB,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC,KAAK,EAAE,CAAA;IAC3B,CAAC;CACF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@libp2p/daemon-protocol",
-  "version": "6.0.0",
+  "version": "6.0.1",
   "description": "Communication protocol between libp2p daemons and clients",
   "author": "",
   "license": "Apache-2.0 OR MIT",

package/src/stream-handler.ts

@@ -27,16 +27,12 @@ export class StreamHandler {
   /**
    * Read and decode message
    */
-  async read (): Promise<Uint8Array | undefined> {
-    // @ts-expect-error decoder is really a generator
-    const msg = await this.decoder.next()
-    if (msg.value != null) {
-      return msg.value.subarray()
+  async read (): Promise<Uint8ArrayList | undefined> {
+    try {
+      return await this.lp.read()
+    } catch (err) {
+      log.error('read received no value', err)
     }
-
-    log('read received no value, closing stream')
-    // End the stream, we didn't get data
-    await this.close()
   }
 
   async write (msg: Uint8Array | Uint8ArrayList): Promise<void> {