@dashevo/dapi-client 4.1.1 → 4.2.0-dev.2

package/lib/BlockHeadersProvider/BlockHeadersReader.js

@@ -8,6 +8,8 @@ const EVENTS = {
   ERROR: 'error',
 };
 
+const CLIENT_ALREADY_CLOSED_ERROR_MESSAGE = 'Client already closed - cannot .close()';
+
 /**
  * @typedef BlockHeadersReaderOptions
  * @property {number} [maxParallelStreams]
@@ -132,8 +134,9 @@ class BlockHeadersReader extends EventEmitter {
          * @param e
          */
         const rejectHeaders = async (e) => {
-          // Don't use cancelStream there because it's going to unsubscribe from events
-          stream.cancel();
+          // Cancel the transport only: the retry below needs the listeners, so
+          // this cannot go through cancelStream, which unsubscribes from events
+          this.cancelStreamTransport(stream);
           stream.retryOnError(e);
         };
 
@@ -294,9 +297,25 @@ class BlockHeadersReader extends EventEmitter {
   }
 
   // eslint-disable-next-line class-methods-use-this
+  /**
+   * Cancels the stream's transport, tolerating one the transport has already
+   * closed. Listeners are left in place for callers that keep using the stream.
+   * @param {ReconnectableStream} stream
+   */
+  // eslint-disable-next-line class-methods-use-this
+  cancelStreamTransport(stream) {
+    try {
+      stream.cancel();
+    } catch (e) {
+      if (e.message !== CLIENT_ALREADY_CLOSED_ERROR_MESSAGE) {
+        throw e;
+      }
+    }
+  }
+
   cancelStream(stream) {
     stream.removeAllListeners();
-    stream.cancel();
+    this.cancelStreamTransport(stream);
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dashevo/dapi-client",
-  "version": "4.1.1",
+  "version": "4.2.0-dev.2",
   "description": "Client library used to access Dash DAPI endpoints",
   "main": "lib/index.js",
   "contributors": [
@@ -26,11 +26,11 @@
     }
   ],
   "dependencies": {
-    "@dashevo/dapi-grpc": "4.1.1",
-    "@dashevo/dash-spv": "5.1.1",
+    "@dashevo/dapi-grpc": "4.2.0-dev.2",
+    "@dashevo/dash-spv": "5.2.0-dev.2",
     "@dashevo/dashcore-lib": "~0.22.0",
-    "@dashevo/grpc-common": "4.1.1",
-    "@dashevo/wasm-dpp": "4.1.1",
+    "@dashevo/grpc-common": "4.2.0-dev.2",
+    "@dashevo/wasm-dpp": "4.2.0-dev.2",
     "cbor": "^8.0.0",
     "google-protobuf": "^3.12.2",
     "undici": "^6.0.0",