@openziti/ziti-sdk-nodejs 0.28.0 → 0.28.1

package/lib/connect.js

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 const http = require('node:http');
+const https = require('node:https');
 const net = require('node:net');
 
 const connect = (dialInfo, cb) => {
@@ -34,18 +35,47 @@ function getDialInfo(protocol, host, port) {
     return ziti.get_ziti_service(protocol, host, port);
 }
 
+function doConnect(options, callback) {
+    let dialInfo;
+    try {
+        dialInfo = getDialInfo('tcp', options.host, options.port);
+    } catch (e) {
+        // construct forwarding data just in case hosting side needs it
+        const data = {
+            dst_protocol: "tcp",
+            dst_hostname: options.host,
+            dst_port: options.port.toString(),
+        }
+        dialInfo = {
+            service: options.host,
+            dial_data: JSON.stringify(data),
+        }
+    }
+
+    connect(dialInfo, callback)
+    return undefined
+}
+
+
 class HttpAgent extends http.Agent {
+    constructor(options) {
+        super(options);
+    }
     createConnection(options, callback) {
-        let dialInfo;
-        try {
-            dialInfo = getDialInfo('tcp', options.host, options.port);
-        } catch (e) {
-            dialInfo = {
-                service: options.host,
+        return doConnect(options, (err, sock) => {
+            if (err) {
+                console.error('Error from ziti.ziti_connect:', err);
+                return super.createConnection(options, callback);
             }
-        }
 
-        connect(dialInfo, (err, sock) => {
+            callback(undefined, sock);
+        });
+    }
+}
+
+class HttpsAgent extends https.Agent {
+    createConnection(options, callback) {
+        return doConnect(options, (err, sock) => {
             if (err) {
                 console.error('Error from ziti.ziti_connect:', err);
                 // fallback to default connect
@@ -53,13 +83,15 @@ class HttpAgent extends http.Agent {
             }
 
             callback(undefined, sock);
-        })
-        return undefined
+        });
     }
 }
 
-const mkAgent = () => {
-    return new HttpAgent();
+function mkAgent(url) {
+    if (typeof url === 'string') {
+        return url.startsWith('http://') ? new HttpAgent() : new HttpsAgent();
+    }
+    return url === http ? new HttpAgent() : new HttpsAgent();
 }
 
 exports.connect = connect;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openziti/ziti-sdk-nodejs",
   "description": "A NodeJS-based SDK for delivering secure applications over a Ziti Network",
-  "version": "0.28.0",
+  "version": "0.28.1",
   "main": "./lib/ziti",
   "scripts": {
     "build": "npm run build:configure && npm run build:make",

package/samples/http-get.mjs

@@ -1,4 +1,5 @@
 import ziti from '../ziti.js';
+import https from 'node:https';
 import http from 'node:http';
 
 // Usage node http-get.mjs <identity.json> <url>
@@ -15,8 +16,10 @@ console.log('Initializing...');
 await ziti.init(IDENTITY_FILE);
 console.log('Init done');
 
-http.get(URL,
-    { agent: ziti.httpAgent() },
+const client = URL.startsWith('https://') ? https : http;
+
+client.get(URL,
+    { agent: ziti.httpAgent(client) },
     (res) => {
         console.log(`HTTP status code: ${res.statusCode} ${res.statusMessage}`);
         for (const k in res.headers) {