@dashevo/dapi-client 0.24.0-dev.11 → 0.24.0-dev.12

package/lib/index.js

@@ -1,3 +1,5 @@
+require('../polyfills/fetch-polyfill');
+
 const DAPIClient = require('./DAPIClient');
 
 const NotFoundError = require('./transport/GrpcTransport/errors/NotFoundError');

package/lib/test/bootstrap.js

@@ -1,3 +1,5 @@
+require('../../polyfills/fetch-polyfill');
+
 const { expect, use } = require('chai');
 const sinon = require('sinon');
 const sinonChai = require('sinon-chai');

package/lib/transport/JsonRpcTransport/requestJsonRpc.js

@@ -1,6 +1,4 @@
-const axios = require('axios');
 const https = require('https');
-
 const JsonRpcError = require('./errors/JsonRpcError');
 const WrongHttpCodeError = require('./errors/WrongHttpCodeError');
 
@@ -25,11 +23,6 @@ async function requestJsonRpc(protocol, host, port, selfSigned, method, params,
     id: 1,
   };
 
-  const postOptions = {};
-  if (options.timeout !== undefined) {
-    postOptions.timeout = options.timeout;
-  }
-
   const requestInfo = {
     protocol,
     host,
@@ -40,40 +33,44 @@ async function requestJsonRpc(protocol, host, port, selfSigned, method, params,
     options,
   };
 
-  let response;
+  const requestOptions = {
+    method: 'POST',
+    body: JSON.stringify(payload),
+    headers: {
+      'Content-Type': 'application/json',
+    },
+  };
+
+  let requestTimeoutId;
+  if (options.timeout) {
+    const controller = new AbortController();
+    requestTimeoutId = setTimeout(() => controller.abort(), options.timeout);
+    Object.assign(requestOptions, { signal: controller.signal });
+  }
 
-  const config = { timeout: options.timeout };
   // For NodeJS Client
   if (typeof process !== 'undefined'
     && process.versions != null
     && process.versions.node != null
     && protocol === 'https'
     && selfSigned) {
-    config.httpsAgent = new https.Agent({
+    requestOptions.agent = new https.Agent({
       rejectUnauthorized: false,
     });
   }
 
-  try {
-    response = await axios.post(
-      url,
-      payload,
-      config,
-    );
-  } catch (error) {
-    if (error.response && error.response.status >= 500) {
-      throw new WrongHttpCodeError(requestInfo, error.response.status, error.response.statusText);
-    }
+  // eslint-disable-next-line
+  const response = await fetch(url, requestOptions);
 
-    throw error;
+  if (typeof requestTimeoutId !== 'undefined') {
+    clearTimeout(requestTimeoutId);
   }
+  const data = await response.json();
 
-  if (response.status !== 200) {
-    throw new WrongHttpCodeError(requestInfo, response.status, response.statusMessage);
+  if (!response.ok) {
+    throw new WrongHttpCodeError(requestInfo, response.status, response.statusText);
   }
 
-  const { data } = response;
-
   if (data.error) {
     throw new JsonRpcError(requestInfo, data.error);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dashevo/dapi-client",
-  "version": "0.24.0-dev.11",
+  "version": "0.24.0-dev.12",
   "description": "Client library used to access Dash DAPI endpoints",
   "main": "lib/index.js",
   "contributors": [
@@ -26,15 +26,15 @@
     }
   ],
   "dependencies": {
-    "@dashevo/dapi-grpc": "0.24.0-dev.11",
-    "@dashevo/dash-spv": "0.24.0-dev.11",
+    "@dashevo/dapi-grpc": "0.24.0-dev.12",
+    "@dashevo/dash-spv": "0.24.0-dev.12",
     "@dashevo/dashcore-lib": "~0.19.44",
-    "@dashevo/dpp": "0.24.0-dev.11",
-    "@dashevo/grpc-common": "0.24.0-dev.11",
-    "axios": "^0.27.2",
+    "@dashevo/dpp": "0.24.0-dev.12",
+    "@dashevo/grpc-common": "0.24.0-dev.12",
     "bs58": "^4.0.1",
     "cbor": "^8.0.0",
     "lodash": "^4.17.21",
+    "node-fetch": "^2.6.7",
     "node-inspect-extracted": "^1.0.8",
     "wasm-x11-hash": "~0.0.2"
   },