@dashevo/dapi-client 0.23.0-dev.8 → 0.24.0-dev.1

package/lib/dapiAddressProvider/DAPIAddress.js

@@ -10,13 +10,15 @@ class DAPIAddress {
     }
 
     if (typeof address === 'string') {
-      const [host, httpPort, grpcPort] = address.split(':');
+      const [host, httpPort, grpcPort, 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,
+        protocol: ssl === 'no-ssl' ? 'http' : 'https',
+        allowSelfSignedCertificate: ssl === 'self-signed',
       };
     }
 
@@ -24,15 +26,26 @@ class DAPIAddress {
       throw new DAPIAddressHostMissingError();
     }
 
+    this.protocol = address.protocol || 'https';
     this.host = address.host;
     this.httpPort = address.httpPort || DAPIAddress.DEFAULT_HTTP_PORT;
     this.grpcPort = address.grpcPort || DAPIAddress.DEFAULT_GRPC_PORT;
     this.proRegTxHash = address.proRegTxHash;
+    this.allowSelfSignedCertificate = address.allowSelfSignedCertificate || false;
 
     this.banCount = 0;
     this.banStartTime = undefined;
   }
 
+  /**
+   * Get protocol
+   *
+   * @returns {string}
+   */
+  getProtocol() {
+    return this.protocol;
+  }
+
   /**
    * Get host
    *
@@ -150,6 +163,13 @@ class DAPIAddress {
     return this.banCount > 0;
   }
 
+  /**
+   * @returns {boolean}
+   */
+  isSelfSignedCertificateAllowed() {
+    return this.allowSelfSignedCertificate;
+  }
+
   /**
    * Return DAPIAddress as plain object
    *
@@ -157,15 +177,17 @@ class DAPIAddress {
    */
   toJSON() {
     return {
+      protocol: this.getProtocol(),
       host: this.getHost(),
       httpPort: this.getHttpPort(),
       grpcPort: this.getGrpcPort(),
       proRegTxHash: this.getProRegTxHash(),
+      allowSelfSignedCertificate: this.isSelfSignedCertificateAllowed(),
     };
   }
 
   toString() {
-    return `${this.getHost()}:${this.getHttpPort()}:${this.getGrpcPort()}`;
+    return `${this.getProtocol()}://${this.getHost()}:${this.getHttpPort()}:${this.getGrpcPort()}`;
   }
 }
 
@@ -174,10 +196,12 @@ DAPIAddress.DEFAULT_GRPC_PORT = 3010;
 
 /**
  * @typedef {object} RawDAPIAddress
+ * @property {string} protocol
  * @property {string} host
  * @property {number} [httpPort=3000]
  * @property {number} [grpcPort=3010]
  * @property {string} [proRegTxHash]
+ * @property {bool} [selfSigned]
  */
 
 module.exports = DAPIAddress;

package/lib/dapiAddressProvider/ListDAPIAddressProvider.js

@@ -37,6 +37,7 @@ class ListDAPIAddressProvider {
       const randomNodeIndex = Math.floor(Math.random() * liveAddresses.length);
 
       liveAddress.host = '127.0.0.1';
+      liveAddress.allowSelfSignedCertificate = true;
       liveAddress.httpPort = 3000 + randomNodeIndex * 100;
       liveAddress.grpcPort = 3010 + randomNodeIndex * 100;
     }

package/lib/transport/GrpcTransport/GrpcTransport.js

@@ -132,6 +132,7 @@ class GrpcTransport {
    * @returns {string}
    */
   makeGrpcUrlFromAddress(address) {
+    let protocol = address.getProtocol();
     let port = address.getHttpPort();
 
     // For NodeJS Client
@@ -139,9 +140,11 @@ class GrpcTransport {
       && process.versions != null
       && process.versions.node != null) {
       port = address.getGrpcPort();
-    }
 
-    const protocol = address.getHttpPort() === 443 ? 'https' : 'http';
+      if (address.isSelfSignedCertificateAllowed()) {
+        protocol = 'http';
+      }
+    }
 
     return `${protocol}://${address.getHost()}:${port}`;
   }

package/lib/transport/GrpcTransport/createGrpcTransportError.js

@@ -50,32 +50,34 @@ function createGrpcTransportError(grpcError, dapiAddress) {
 
   const message = grpcError.details || grpcError.message;
 
+  let metadata = {};
+
   if (grpcError.metadata) {
     // In cases of gRPC-Web client we get plain map instead of Metadata instance
-    let metadataMap = grpcError.metadata;
+    metadata = grpcError.metadata;
     if (grpcError.metadata instanceof Metadata) {
-      metadataMap = grpcError.metadata.getMap();
+      metadata = grpcError.metadata.getMap();
     }
+  }
 
-    // Error data
-    const driveErrorData = metadataMap['drive-error-data-bin'];
-    if (driveErrorData) {
-      const encodedData = Buffer.from(driveErrorData, 'base64');
-      data = cbor.decode(encodedData);
-    }
+  // Error data
+  const driveErrorData = metadata['drive-error-data-bin'];
+  if (driveErrorData) {
+    const encodedData = Buffer.from(driveErrorData, 'base64');
+    data = cbor.decode(encodedData);
+  }
 
-    // Error code
-    const driveErrorCode = metadataMap.code;
-    if (driveErrorCode) {
-      code = Number(driveErrorCode);
-    }
+  // Error code
+  const driveErrorCode = metadata.code;
+  if (driveErrorCode) {
+    code = Number(driveErrorCode);
+  }
 
-    // Error stack
-    const driveErrorStack = metadataMap['stack-bin'];
-    if (driveErrorStack) {
-      const encodedStack = Buffer.from(driveErrorStack, 'base64');
-      data.stack = cbor.decode(encodedStack);
-    }
+  // Error stack
+  const driveErrorStack = metadata['stack-bin'];
+  if (driveErrorStack) {
+    const encodedStack = Buffer.from(driveErrorStack, 'base64');
+    data.stack = cbor.decode(encodedStack);
   }
 
   // Specialized classes
@@ -100,13 +102,6 @@ function createGrpcTransportError(grpcError, dapiAddress) {
   }
 
   if (code === GrpcErrorCodes.INTERNAL) {
-    if (grpcError.metadata) {
-      const metaStack = grpcError.metadata.get('stack-bin');
-      if (metaStack && metaStack.length > 0) {
-        data.stack = cbor.decode(metaStack[0]);
-      }
-    }
-
     return new InternalServerError(
       code,
       message,

package/lib/transport/JsonRpcTransport/JsonRpcTransport.js

@@ -65,8 +65,10 @@ class JsonRpcTransport {
 
     try {
       const result = await this.requestJsonRpc(
+        address.getProtocol(),
         address.getHost(),
         address.getHttpPort(),
+        address.isSelfSignedCertificateAllowed(),
         method,
         params,
         requestOptions,

package/lib/transport/JsonRpcTransport/requestJsonRpc.js

@@ -1,20 +1,21 @@
 const axios = require('axios');
+const https = require('https');
 
 const JsonRpcError = require('./errors/JsonRpcError');
 const WrongHttpCodeError = require('./errors/WrongHttpCodeError');
 
 /**
  * @typedef {requestJsonRpc}
+ * @param {string} protocol
  * @param {string} host
  * @param {number} port
+ * @param {boolean} selfSigned
  * @param {string} method
  * @param {object} params
  * @param {object} [options]
  * @returns {Promise<*>}
  */
-async function requestJsonRpc(host, port, method, params, options = {}) {
-  const protocol = port === 443 ? 'https' : 'http';
-
+async function requestJsonRpc(protocol, host, port, selfSigned, method, params, options = {}) {
   const url = `${protocol}://${host}${port && port !== 443 ? `:${port}` : ''}`;
 
   const payload = {
@@ -30,8 +31,10 @@ async function requestJsonRpc(host, port, method, params, options = {}) {
   }
 
   const requestInfo = {
+    protocol,
     host,
     port,
+    selfSigned,
     method,
     params,
     options,
@@ -39,11 +42,23 @@ async function requestJsonRpc(host, port, method, params, options = {}) {
 
   let response;
 
+  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({
+      rejectUnauthorized: false,
+    });
+  }
+
   try {
     response = await axios.post(
       url,
       payload,
-      { timeout: options.timeout },
+      config,
     );
   } catch (error) {
     if (error.response && error.response.status >= 500) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dashevo/dapi-client",
-  "version": "0.23.0-dev.8",
+  "version": "0.24.0-dev.1",
   "description": "Client library used to access Dash DAPI endpoints",
   "main": "lib/index.js",
   "contributors": [
@@ -26,13 +26,13 @@
     }
   ],
   "dependencies": {
-    "@dashevo/dapi-grpc": "~0.23.0-dev.8",
-    "@dashevo/dash-spv": "~1.1.7-5",
-    "@dashevo/dashcore-lib": "~0.19.39",
-    "@dashevo/dpp": "~0.23.0-dev.8",
-    "@dashevo/grpc-common": "~0.23.0-dev.8",
+    "@dashevo/dapi-grpc": "~0.24.0-dev.1",
+    "@dashevo/dash-spv": "~0.24.0-dev.1",
+    "@dashevo/dashcore-lib": "~0.19.44",
+    "@dashevo/dpp": "~0.24.0-dev.1",
+    "@dashevo/grpc-common": "~0.24.0-dev.1",
     "@grpc/grpc-js": "^1.3.7",
-    "axios": "^0.21.1",
+    "axios": "^0.27.2",
     "bs58": "^4.0.1",
     "cbor": "^8.0.0",
     "lodash.sample": "^4.2.1",
@@ -54,7 +54,7 @@
     "eslint-plugin-import": "^2.24.2",
     "eslint-plugin-jsdoc": "^27.0.0",
     "events": "^3.3.0",
-    "karma": "^6.3.4",
+    "karma": "^6.4.1",
     "karma-chai": "^0.1.0",
     "karma-chrome-launcher": "^3.1.0",
     "karma-firefox-launcher": "^2.1.1",