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

package/README.md

@@ -50,8 +50,7 @@ const DAPIClient = require('@dashevo/dapi-client');
 var client = new DAPIClient({
   seeds: [{
      host: 'seed-1.evonet.networks.dash.org',
-     httpPort: 3000,
-     grpcPort: 3010,
+     port: 3000,
   }],
 });
 
@@ -71,8 +70,8 @@ const DAPIClient = require('@dashevo/dapi-client');
 
 var client = new DAPIClient({
   dapiAddresses: [
-    '127.0.0.1:3000:3010',
-    '127.0.0.2:3000:3010',
+    '127.0.0.1:3000',
+    '127.0.0.2:3000',
   ],
 });
 

package/lib/dapiAddressProvider/DAPIAddress.js

@@ -10,13 +10,12 @@ class DAPIAddress {
     }
 
     if (typeof address === 'string') {
-      const [host, httpPort, grpcPort, ssl] = address.split(':');
+      const [host, port, ssl] = address.split(':');
 
       // eslint-disable-next-line no-param-reassign
       address = {
         host,
-        httpPort: httpPort ? parseInt(httpPort, 10) : DAPIAddress.DEFAULT_HTTP_PORT,
-        grpcPort: grpcPort ? parseInt(grpcPort, 10) : DAPIAddress.DEFAULT_GRPC_PORT,
+        port: port ? parseInt(port, 10) : DAPIAddress.DEFAULT_PORT,
         protocol: ssl === 'no-ssl' ? 'http' : DAPIAddress.DEFAULT_PROTOCOL,
         allowSelfSignedCertificate: ssl === 'self-signed',
       };
@@ -28,8 +27,7 @@ class DAPIAddress {
 
     this.protocol = address.protocol || DAPIAddress.DEFAULT_PROTOCOL;
     this.host = address.host;
-    this.httpPort = address.httpPort || DAPIAddress.DEFAULT_HTTP_PORT;
-    this.grpcPort = address.grpcPort || DAPIAddress.DEFAULT_GRPC_PORT;
+    this.port = address.port || DAPIAddress.DEFAULT_PORT;
     this.proRegTxHash = address.proRegTxHash;
     this.allowSelfSignedCertificate = address.allowSelfSignedCertificate || false;
 
@@ -68,43 +66,22 @@ class DAPIAddress {
   }
 
   /**
-   * Get HTTP port
+   * Get port
    *
    * @returns {number}
    */
-  getHttpPort() {
-    return this.httpPort;
+  getPort() {
+    return this.port;
   }
 
   /**
-   * Set HTTP port
+   * Set port
    *
    * @param {number} port
    * @returns {DAPIAddress}
    */
-  setHttpPort(port) {
-    this.httpPort = port;
-
-    return this;
-  }
-
-  /**
-   * Get gRPC port
-   *
-   * @returns {number}
-   */
-  getGrpcPort() {
-    return this.grpcPort;
-  }
-
-  /**
-   * Set gRPC port
-   *
-   * @param {number} port
-   * @returns {DAPIAddress}
-   */
-  setGrpcPort(port) {
-    this.grpcPort = port;
+  setPort(port) {
+    this.port = port;
 
     return this;
   }
@@ -179,28 +156,25 @@ class DAPIAddress {
     return {
       protocol: this.getProtocol(),
       host: this.getHost(),
-      httpPort: this.getHttpPort(),
-      grpcPort: this.getGrpcPort(),
+      port: this.getPort(),
       proRegTxHash: this.getProRegTxHash(),
       allowSelfSignedCertificate: this.isSelfSignedCertificateAllowed(),
     };
   }
 
   toString() {
-    return `${this.getProtocol()}://${this.getHost()}:${this.getHttpPort()}:${this.getGrpcPort()}`;
+    return `${this.getProtocol()}://${this.getHost()}:${this.getPort()}`;
   }
 }
 
-DAPIAddress.DEFAULT_HTTP_PORT = 3000;
-DAPIAddress.DEFAULT_GRPC_PORT = 3010;
-DAPIAddress.DEFAULT_PROTOCOL = 'http';
+DAPIAddress.DEFAULT_PORT = 3000;
+DAPIAddress.DEFAULT_PROTOCOL = 'https';
 
 /**
  * @typedef {object} RawDAPIAddress
  * @property {string} protocol
  * @property {string} host
- * @property {number} [httpPort=3000]
- * @property {number} [grpcPort=3010]
+ * @property {number} [port=3000]
  * @property {string} [proRegTxHash]
  * @property {bool} [selfSigned]
  */

package/lib/dapiAddressProvider/ListDAPIAddressProvider.js

@@ -39,8 +39,7 @@ class ListDAPIAddressProvider {
       liveAddress.protocol = 'https';
       liveAddress.host = '127.0.0.1';
       liveAddress.allowSelfSignedCertificate = true;
-      liveAddress.httpPort = 3000 + randomNodeIndex * 100;
-      liveAddress.grpcPort = 3010 + randomNodeIndex * 100;
+      liveAddress.port = 3000 + randomNodeIndex * 100;
     }
 
     return liveAddress;

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/GrpcTransport/GrpcTransport.js

@@ -133,20 +133,15 @@ class GrpcTransport {
    */
   makeGrpcUrlFromAddress(address) {
     let protocol = address.getProtocol();
-    let port = address.getHttpPort();
-
     // For NodeJS Client
     if (typeof process !== 'undefined'
       && process.versions != null
-      && process.versions.node != null) {
-      port = address.getGrpcPort();
-
-      if (address.isSelfSignedCertificateAllowed()) {
-        protocol = 'http';
-      }
+      && process.versions.node != null
+      && address.isSelfSignedCertificateAllowed()) {
+      protocol = 'http';
     }
 
-    return `${protocol}://${address.getHost()}:${port}`;
+    return `${protocol}://${address.getHost()}:${address.getPort()}`;
   }
 }
 

package/lib/transport/JsonRpcTransport/JsonRpcTransport.js

@@ -67,7 +67,7 @@ class JsonRpcTransport {
       const result = await this.requestJsonRpc(
         address.getProtocol(),
         address.getHost(),
-        address.getHttpPort(),
+        address.getPort(),
         address.isSelfSignedCertificateAllowed(),
         method,
         params,

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.13",
   "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.13",
+    "@dashevo/dash-spv": "0.24.0-dev.13",
     "@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.13",
+    "@dashevo/grpc-common": "0.24.0-dev.13",
     "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"
   },
@@ -77,7 +77,8 @@
   },
   "files": [
     "docs",
-    "lib"
+    "lib",
+    "polyfills"
   ],
   "scripts": {
     "build:web": "webpack",

package/polyfills/fetch-polyfill.js

@@ -0,0 +1,10 @@
+/* eslint-disable */
+
+const { default: fetch, Headers, Request, Response } = require('node-fetch');
+
+if (!globalThis.fetch) {
+  globalThis.fetch = fetch;
+  globalThis.Headers = Headers;
+  globalThis.Request = Request;
+  globalThis.Response = Response;
+}