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

package/clients/core/v0/nodejs/CorePromiseClient.js

@@ -17,6 +17,7 @@ const {
   },
 } = require('@dashevo/grpc-common');
 
+const { URL } = require('url');
 const {
   org: {
     dash: {
@@ -55,7 +56,6 @@ const {
 } = require('./core_protoc');
 
 const getCoreDefinition = require('../../../../lib/getCoreDefinition');
-const stripHostname = require('../../../../lib/utils/stripHostname');
 
 const CoreNodeJSClient = getCoreDefinition(0);
 
@@ -65,8 +65,16 @@ class CorePromiseClient {
    * @param {?Object} credentials
    * @param {?Object} options
    */
-  constructor(hostname, credentials = grpc.credentials.createInsecure(), options = {}) {
-    const strippedHostname = stripHostname(hostname);
+  constructor(hostname, credentials, options = {}) {
+    if (credentials !== undefined) {
+      throw new Error('"credentials" option is not supported yet');
+    }
+
+    const url = new URL(hostname);
+    const { protocol, host: strippedHostname } = url;
+
+    // eslint-disable-next-line no-param-reassign
+    credentials = protocol === 'https' ? grpc.credentials.createSsl() : grpc.credentials.createInsecure();
 
     this.client = new CoreNodeJSClient(strippedHostname, credentials, options);
 

package/clients/platform/v0/nodejs/PlatformPromiseClient.js

@@ -17,6 +17,7 @@ const {
   },
 } = require('@dashevo/grpc-common');
 
+const { URL } = require('url');
 const {
   org: {
     dash: {
@@ -55,7 +56,6 @@ const {
 } = require('./platform_protoc');
 
 const getPlatformDefinition = require('../../../../lib/getPlatformDefinition');
-const stripHostname = require('../../../../lib/utils/stripHostname');
 
 const PlatformNodeJSClient = getPlatformDefinition(0);
 
@@ -65,8 +65,16 @@ class PlatformPromiseClient {
    * @param {?Object} credentials
    * @param {?Object} options
    */
-  constructor(hostname, credentials = grpc.credentials.createInsecure(), options = {}) {
-    const strippedHostname = stripHostname(hostname);
+  constructor(hostname, credentials, options = {}) {
+    if (credentials !== undefined) {
+      throw new Error('"credentials" option is not supported yet');
+    }
+
+    const url = new URL(hostname);
+    const { protocol, host: strippedHostname } = url;
+
+    // eslint-disable-next-line no-param-reassign
+    credentials = protocol === 'https' ? grpc.credentials.createSsl() : grpc.credentials.createInsecure();
 
     this.client = new PlatformNodeJSClient(strippedHostname, credentials, options);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dashevo/dapi-grpc",
-  "version": "0.23.0-dev.8",
+  "version": "0.24.0-dev.1",
   "description": "DAPI GRPC definition file and generated clients",
   "browser": "browser.js",
   "main": "node.js",
@@ -33,7 +33,7 @@
   },
   "homepage": "https://github.com/dashevo/dapi-grpc#readme",
   "dependencies": {
-    "@dashevo/grpc-common": "~0.23.0-dev.8",
+    "@dashevo/grpc-common": "~0.24.0-dev.1",
     "@dashevo/protobufjs": "6.10.5",
     "@grpc/grpc-js": "^1.3.7",
     "google-protobuf": "^3.12.2",

package/lib/utils/stripHostname.js

@@ -1,15 +0,0 @@
-const { URL } = require('url');
-
-/**
- * Remove everything except (hostname/ip):port pair
- *
- * @param {string} hostname
- *
- * @returns {string}
- */
-function stripHostname(hostname) {
-  const url = new URL(hostname);
-  return url.host;
-}
-
-module.exports = stripHostname;

package/test/unit/utils/stripHostname.spec.js

@@ -1,23 +0,0 @@
-const stripHostname = require('../../../lib/utils/stripHostname');
-
-describe('stripHostname', () => {
-  let hostname;
-
-  beforeEach(() => {
-    hostname = 'http://ip:3030/';
-  });
-
-  it('should strip everything and leave only hostname:port pair', () => {
-    const result = stripHostname(hostname);
-
-    expect(result).to.equal('ip:3030');
-  });
-
-  it('should strip everything and leave only ip:port pair', () => {
-    hostname = 'http://127.0.0.1:3030/?some=params';
-
-    const result = stripHostname(hostname);
-
-    expect(result).to.equal('127.0.0.1:3030');
-  });
-});