@dashevo/dapi-client 0.25.0-dev.9 → 0.25.0-pr.1545.2

package/lib/transport/GrpcTransport/GrpcTransport.js

@@ -1,3 +1,5 @@
+const logger = require('../../logger');
+
 const MaxRetriesReachedError = require('../errors/response/MaxRetriesReachedError');
 const NoAvailableAddressesForRetryError = require('../errors/response/NoAvailableAddressesForRetryError');
 const NoAvailableAddressesError = require('../errors/NoAvailableAddressesError');
@@ -27,6 +29,7 @@ class GrpcTransport {
     this.globalOptions = globalOptions;
 
     this.lastUsedAddress = null;
+    this.logger = logger.getForId(globalOptions.loggerOptions.identifier);
   }
 
   /**
@@ -67,6 +70,8 @@ class GrpcTransport {
       );
     }
 
+    this.logger.debug(`GRPC Request ${method} to ${address.toString()}`, { options });
+
     try {
       const result = await client[method](requestMessage, {}, requestOptions);
 
@@ -78,6 +83,8 @@ class GrpcTransport {
     } catch (error) {
       this.lastUsedAddress = address;
 
+      this.logger.error(`GRPC Request ${method} to ${address.toString()} failed with error: ${error.message}`);
+
       // for unknown errors
       if (error.code === undefined) {
         throw error;

package/lib/transport/GrpcTransport/errors/InternalServerError.js

@@ -1,6 +1,6 @@
-const ServerError = require('../../errors/response/RetriableResponseError');
+const RetriableResponseError = require('../../errors/response/RetriableResponseError');
 
-class InternalServerError extends ServerError {
+class InternalServerError extends RetriableResponseError {
   /**
    * @param {number} code
    * @param {string} message

package/lib/transport/JsonRpcTransport/JsonRpcTransport.js

@@ -1,3 +1,5 @@
+const logger = require('../../logger');
+
 const MaxRetriesReachedError = require('../errors/response/MaxRetriesReachedError');
 const NoAvailableAddressesForRetryError = require('../errors/response/NoAvailableAddressesForRetryError');
 const NoAvailableAddressesError = require('../errors/NoAvailableAddressesError');
@@ -29,6 +31,8 @@ class JsonRpcTransport {
 
     this.createJsonTransportError = createJsonTransportError;
 
+    this.logger = logger.getForId(globalOptions.loggerOptions.identifier);
+
     this.lastUsedAddress = null;
   }
 
@@ -63,6 +67,8 @@ class JsonRpcTransport {
       requestOptions.timeout = options.timeout;
     }
 
+    this.logger.debug(`JSON-RPC Request ${method} to ${address.toString()}`, { options });
+
     try {
       const result = await this.requestJsonRpc(
         address.getProtocol(),

package/lib/transport/JsonRpcTransport/requestJsonRpc.js

@@ -1,7 +1,6 @@
 const https = require('https');
 const JsonRpcError = require('./errors/JsonRpcError');
 const WrongHttpCodeError = require('./errors/WrongHttpCodeError');
-
 /**
  * @typedef {requestJsonRpc}
  * @param {string} protocol
@@ -58,19 +57,19 @@ async function requestJsonRpc(protocol, host, port, selfSigned, method, params,
       rejectUnauthorized: false,
     });
   }
-
   // eslint-disable-next-line
   const response = await fetch(url, requestOptions);
 
   if (typeof requestTimeoutId !== 'undefined') {
     clearTimeout(requestTimeoutId);
   }
-  const data = await response.json();
 
   if (!response.ok) {
     throw new WrongHttpCodeError(requestInfo, response.status, response.statusText);
   }
 
+  const data = await response.json();
+
   if (data.error) {
     throw new JsonRpcError(requestInfo, data.error);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dashevo/dapi-client",
-  "version": "0.25.0-dev.9",
+  "version": "0.25.0-pr.1545.2",
   "description": "Client library used to access Dash DAPI endpoints",
   "main": "lib/index.js",
   "contributors": [
@@ -26,25 +26,27 @@
     }
   ],
   "dependencies": {
-    "@dashevo/dapi-grpc": "0.25.0-dev.9",
-    "@dashevo/dash-spv": "0.25.0-dev.9",
-    "@dashevo/dashcore-lib": "~0.20.3",
-    "@dashevo/dpp": "0.25.0-dev.9",
-    "@dashevo/grpc-common": "0.25.0-dev.9",
-    "@dashevo/wasm-dpp": "0.25.0-dev.9",
+    "@dashevo/dapi-grpc": "0.25.0-pr.1545.2",
+    "@dashevo/dash-spv": "0.25.0-pr.1545.2",
+    "@dashevo/dashcore-lib": "~0.21.0",
+    "@dashevo/grpc-common": "0.25.0-pr.1545.2",
+    "@dashevo/wasm-dpp": "0.25.0-pr.1545.2",
     "bs58": "^4.0.1",
     "cbor": "^8.0.0",
+    "google-protobuf": "^3.12.2",
     "lodash": "^4.17.21",
     "node-fetch": "^2.6.7",
     "node-inspect-extracted": "^1.0.8",
-    "wasm-x11-hash": "~0.0.2"
+    "wasm-x11-hash": "~0.0.2",
+    "winston": "^3.2.1"
   },
   "devDependencies": {
     "@babel/core": "^7.15.5",
     "assert-browserify": "^2.0.0",
     "babel-loader": "^8.2.2",
+    "browserify-zlib": "^0.2.0",
     "buffer": "^6.0.3",
-    "chai": "^4.3.4",
+    "chai": "^4.3.9",
     "chai-as-promised": "^7.1.1",
     "comment-parser": "^0.7.6",
     "core-js": "^3.17.2",
@@ -55,7 +57,6 @@
     "eslint-plugin-import": "^2.24.2",
     "eslint-plugin-jsdoc": "^27.0.0",
     "events": "^3.3.0",
-    "google-protobuf": "^3.12.2",
     "karma": "^6.4.1",
     "karma-chai": "^0.1.0",
     "karma-chrome-launcher": "^3.1.0",
@@ -65,8 +66,10 @@
     "karma-webpack": "^5.0.0",
     "mocha": "^9.1.2",
     "nyc": "^15.1.0",
+    "os-browserify": "^0.3.0",
     "path-browserify": "^1.0.1",
     "process": "^0.11.10",
+    "setimmediate": "^1.0.5",
     "sinon": "^11.1.2",
     "sinon-chai": "^3.7.0",
     "stream-browserify": "^3.0.0",

package/polyfills/fetch-polyfill.js

@@ -2,7 +2,7 @@
 
 const { default: fetch, Headers, Request, Response } = require('node-fetch');
 
-if (!globalThis.fetch) {
+if (typeof window === 'undefined') {
   globalThis.fetch = fetch;
   globalThis.Headers = Headers;
   globalThis.Request = Request;