@openziti/ziti-sdk-nodejs 0.25.0 → 0.27.0

package/lib/connect.js

@@ -0,0 +1,55 @@
+/*
+Copyright NetFoundry Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+https://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+const http = require('node:http');
+const net = require('node:net');
+
+const connect = (service, cb) => {
+    ziti.ziti_connect(service, (err, sock) => {
+        if (err) {
+            return cb(err);
+        }
+
+        cb(undefined, new net.Socket({fd: sock}));
+    });
+}
+
+function getService(protocol, host, port) {
+    return ziti.get_ziti_service(protocol, host, port);
+}
+
+class HttpAgent extends http.Agent {
+    createConnection(options, callback) {
+        const service = getService('tcp', options.host, options.port) || options.host;
+        connect(service, (err, sock) => {
+            if (err) {
+                console.error('Error from ziti.ziti_connect:', err);
+                // fallback to default connect
+                return super.createConnection(options, callback);
+            }
+
+            callback(undefined, sock);
+        })
+        return undefined
+    }
+}
+
+const mkAgent = () => {
+    return new HttpAgent();
+}
+
+exports.connect = connect;
+exports.httpAgent = mkAgent;

package/lib/enroll.js

@@ -15,35 +15,43 @@ limitations under the License.
 */
 
 
-
 /**
- * on_enroll()   
- * 
- */
- const on_enroll = ( status ) => {
-
-};
-
-
-/**
- * enroll()   
- * 
+ * enroll    Enrolls a Ziti Identity using the provided JWT file path.
+ * The callback receives an error (if any) or the Ziti configuration JSON upon successful enrollment.
+ *
+ * if callback is not provided, returns a Promise that resolves with the Ziti configuration JSON or rejects with an error.
+ *
  * @param {*} jwt_path 
- * @param {*} on_enroll_cb callback 
+ * @param {*} on_enroll_cb callback (err, cfg) => {}  where cfg is the Ziti configuration object
+ * @return {Promise|undefined} Returns a Promise if no callback is provided, otherwise returns undefined.
  */
 const enroll = ( jwt_path, on_enroll_cb ) => {
 
-  let enroll_cb;
-
-  if (typeof on_enroll_cb === 'undefined') {
-    enroll_cb = on_enroll;
-  } else {
-    enroll_cb = on_enroll_cb;
+  if (on_enroll_cb) {
+    ziti.ziti_enroll(jwt_path, (err, cfg) => {
+        if (err) {
+            on_enroll_cb(err);
+        } else {
+            on_enroll_cb(undefined, JSON.parse(cfg));
+        }
+    });
+    return undefined;
   }
 
-  ziti.ziti_enroll(jwt_path, enroll_cb);
-
-};
-
+  return new Promise((resolve, reject) => {
+      try {
+          ziti.ziti_enroll(jwt_path, (err, cfg) => {
+              if (err) {
+                  reject(err);
+              } else {
+                  resolve(JSON.parse(cfg));
+              }
+          });
+      } catch (e) {
+          reject(e);
+      }
+  });
+
+}
 
 exports.enroll = enroll;

package/lib/ziti.js

@@ -225,3 +225,7 @@ exports.serviceAvailable  = require('./serviceAvailable').serviceAvailable;
  * @returns {void} No return value.
  */
  exports.write             = require('./write').write;
+
+const connect = require('./connect')
+exports.connect = connect.connect
+exports.httpAgent = connect.httpAgent

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.25.0",
+  "version": "0.27.0",
   "main": "./lib/ziti",
   "scripts": {
     "build": "npm run build:configure && npm run build:make",

package/samples/enroll.mjs

@@ -0,0 +1,18 @@
+// import ziti from '@openziti/ziti-sdk-nodejs';
+import ziti from '../ziti.js';
+
+const jwt_path = process.argv[2];
+
+if (!jwt_path) {
+    console.error('Usage: node enroll.mjs <jwt_path>');
+    process.exit(1);
+}
+
+console.log("JS ziti_Enroll() entered ")
+const identity = await ziti.enroll(jwt_path).catch((err) => {
+    console.log('ziti enrollments failed with error: %o', err);
+});
+
+// Note: identity is the Ziti configuration JSON object that can be used for ziti.init()
+// or saved to a file for later use.
+console.log(identity);

package/samples/http-get.mjs

@@ -0,0 +1,29 @@
+import ziti from '../ziti.js';
+import http from 'node:http';
+
+// Usage node http-get.mjs <identity.json> <url>
+// <url> can be a Ziti service intercept (e.g. http://myserver.ziti:8080) or http://<service-name> (port does not matter)
+const IDENTITY_FILE = process.argv[2];
+const URL    = process.argv[3];
+
+if (!IDENTITY_FILE) {
+    console.error('Set ZITI_IDENTITY_FILE to your identity JSON path');
+    process.exit(1);
+}
+
+console.log('Initializing...');
+await ziti.init(IDENTITY_FILE);
+console.log('Init done');
+
+http.get(URL,
+    { agent: ziti.httpAgent() },
+    (res) => {
+        console.log(`HTTP status code: ${res.statusCode} ${res.statusMessage}`);
+        for (const k in res.headers) {
+            const header = res.headers[k];
+            console.log(`  ${k}: ${header}`);
+        }
+        res.on('data', (chunk) => {
+            console.log('Received body chunk:', chunk.toString());
+        }).on('end', ziti.ziti_shutdown)
+    });

package/vcpkg-configuration.json

@@ -0,0 +1,5 @@
+{
+  "overlay-ports": [
+    "vcpkg-overlays"
+  ]
+}

package/vcpkg-overlays/llhttp/README.md

@@ -0,0 +1,5 @@
+update llhttp to 9.3.0 to avoid conflicts with nodejs runtime
+
+llhttp@9.3.0 changes the layout of http parser 
+
+this can be removed once https://github.com/microsoft/vcpkg/issues/49956 is fixed and released

package/vcpkg-overlays/llhttp/fix-usage.patch

@@ -0,0 +1,15 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index bdef288..72555c6 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -77,6 +77,10 @@ function(config_library target)
+     NAMESPACE llhttp::
+     DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/llhttp
+   )
++  target_include_directories(${target}
++    PRIVATE include ${CMAKE_CURRENT_BINARY_DIR}
++    INTERFACE $<INSTALL_INTERFACE:include>
++  )
+ endfunction(config_library target)
+ 
+ if(BUILD_SHARED_LIBS)

package/vcpkg-overlays/llhttp/portfile.cmake

@@ -0,0 +1,31 @@
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO nodejs/llhttp
+    REF refs/tags/release/v${VERSION}
+    SHA512 6f659bbdc4e7efc431a506a1889d074cbde0c47dc5daca735f3ac4a31d670f62d29882575cabace832c9523c0dcf93192f8810b05f42ed00bd828bf709feee15
+    PATCHES
+        fix-usage.patch
+)
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" LLHTTP_BUILD_STATIC)
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" LLHTTP_BUILD_SHARED)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    DISABLE_PARALLEL_CONFIGURE
+    OPTIONS
+        -DBUILD_SHARED_LIBS=${LLHTTP_BUILD_SHARED}
+        -DBUILD_STATIC_LIBS=${LLHTTP_BUILD_STATIC}
+)
+
+vcpkg_cmake_install()
+vcpkg_copy_pdbs()
+
+vcpkg_cmake_config_fixup(
+    CONFIG_PATH "/lib/cmake/${PORT}"
+)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE-MIT")
+
+vcpkg_fixup_pkgconfig()

package/vcpkg-overlays/llhttp/vcpkg.json

@@ -0,0 +1,17 @@
+{
+  "name": "llhttp",
+  "version": "9.3.0",
+  "description": "Port of http_parser to llparse.",
+  "homepage": "https://github.com/nodejs/llhttp",
+  "license": "MIT",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}