@dashevo/dapi-client 0.23.0-dev.4 → 0.23.0-dev.7

package/lib/dapiAddressProvider/ListDAPIAddressProvider.js

@@ -26,7 +26,7 @@ class ListDAPIAddressProvider {
     const liveAddress = sample(liveAddresses);
 
     if (liveAddress === undefined) {
-      return liveAddress;
+      return undefined;
     }
 
     // This is a temporary fix for a localhost masternode.
@@ -34,7 +34,11 @@ class ListDAPIAddressProvider {
     // not really possible to bind to that address, so that workaround is introduced.
     const network = networks.get(this.options.network);
     if (network && network.regtestEnabled) {
+      const randomNodeIndex = Math.floor(Math.random() * liveAddresses.length);
+
       liveAddress.host = '127.0.0.1';
+      liveAddress.httpPort = 3000 + randomNodeIndex * 100;
+      liveAddress.grpcPort = 3010 + randomNodeIndex * 100;
     }
 
     return liveAddress;

package/lib/transport/GrpcTransport/createGrpcTransportError.js

@@ -47,36 +47,34 @@ function createGrpcTransportError(grpcError, dapiAddress) {
   // Extract error code and data
   let data = {};
   let { code } = grpcError;
+
   const message = grpcError.details || grpcError.message;
 
   if (grpcError.metadata) {
-    let encodedData;
-
+    // In cases of gRPC-Web client we get plain map instead of Metadata instance
+    let metadataMap = grpcError.metadata;
     if (grpcError.metadata instanceof Metadata) {
-      const cboredMetaData = grpcError.metadata.get('drive-error-data-bin');
-      if (cboredMetaData && cboredMetaData.length > 0) {
-        [encodedData] = cboredMetaData;
-      }
+      metadataMap = grpcError.metadata.getMap();
+    }
 
-      // since gRPC doesn't allow to use custom error codes
-      // DAPI pass them as a part of metadata
-      const metaCode = grpcError.metadata.get('code');
-      if (metaCode && metaCode.length > 0) {
-        [code] = metaCode;
-      }
-    } else {
-      if (grpcError.metadata['drive-error-data-bin']) {
-        encodedData = Buffer.from(grpcError.metadata['drive-error-data-bin'], 'base64');
-      }
+    // Error data
+    const driveErrorData = metadataMap['drive-error-data-bin'];
+    if (driveErrorData) {
+      const encodedData = Buffer.from(driveErrorData, 'base64');
+      data = cbor.decode(encodedData);
+    }
 
-      const metaCode = grpcError.metadata.code;
-      if (metaCode !== undefined) {
-        code = Number(metaCode);
-      }
+    // Error code
+    const driveErrorCode = metadataMap.code;
+    if (driveErrorCode) {
+      code = Number(driveErrorCode);
     }
 
-    if (encodedData) {
-      data = cbor.decode(encodedData);
+    // Error stack
+    const driveErrorStack = metadataMap['stack-bin'];
+    if (driveErrorStack) {
+      const encodedStack = Buffer.from(driveErrorStack, 'base64');
+      data.stack = cbor.decode(encodedStack);
     }
   }
 

package/lib/transport/JsonRpcTransport/JsonRpcTransport.js

@@ -84,14 +84,14 @@ class JsonRpcTransport {
         throw error;
       }
 
-      address.markAsBanned();
-
       const responseError = this.createJsonTransportError(error, address);
 
       if (!(responseError instanceof RetriableResponseError)) {
         throw responseError;
       }
 
+      address.markAsBanned();
+
       if (options.retries === 0) {
         throw new MaxRetriesReachedError(responseError);
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dashevo/dapi-client",
-  "version": "0.23.0-dev.4",
+  "version": "0.23.0-dev.7",
   "description": "Client library used to access Dash DAPI endpoints",
   "main": "lib/index.js",
   "contributors": [
@@ -26,11 +26,11 @@
     }
   ],
   "dependencies": {
-    "@dashevo/dapi-grpc": "~0.23.0-dev.4",
-    "@dashevo/dash-spv": "~1.1.7-1",
+    "@dashevo/dapi-grpc": "~0.23.0-dev.7",
+    "@dashevo/dash-spv": "~1.1.7-4",
     "@dashevo/dashcore-lib": "~0.19.39",
-    "@dashevo/dpp": "~0.23.0-dev.4",
-    "@dashevo/grpc-common": "~0.23.0-dev.4",
+    "@dashevo/dpp": "~0.23.0-dev.7",
+    "@dashevo/grpc-common": "~0.23.0-dev.7",
     "@grpc/grpc-js": "^1.3.7",
     "axios": "^0.21.1",
     "bs58": "^4.0.1",