@openziti/ziti-sdk-nodejs 0.14.1 → 0.15.0

package/.github/workflows/build.yml

@@ -45,7 +45,7 @@ jobs:
           - { os: ubuntu-20.04,   target: "linux", arch: "arm64" }
           - { os: macos-latest,   target: "macos", arch: "x64" }
           - { os: macos-latest,   target: "macos", arch: "arm64" }
-        node_ver: [ 16, 18, 19, 20]
+        node_ver: [ 16, 18, 19, 20, 21]
       fail-fast: false
 
     steps:

package/README.md

@@ -50,7 +50,7 @@ Please star us.
 
 # Associated Article(s)
 For more context on this SDK, you may be interested in this
-[article concerning how to secure NodeJS applications](https://openziti.io/securing-nodejs-applications)
+[article concerning how to secure NodeJS applications](https://blog.openziti.io/securing-nodejs-applications)
 
 
 
@@ -61,6 +61,7 @@ The `@openziti/ziti-sdk-nodejs` module works with the following Node.js versions
 - v18.x
 - v19.x
 - v20.x
+- v21.x
 
 The `@openziti/ziti-sdk-nodejs` module works with the following architectures:
 - amd64

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

package/src/ziti_dial.c

@@ -328,8 +328,6 @@ napi_value _ziti_dial(napi_env env, const napi_callback_info info) {
     napi_throw_error(env, NULL, "Unable to napi_create_threadsafe_function");
   }
   
-  ziti_set_timeout(ztx, 5*1000);
-
   // Init a Ziti connection object, and attach our add-on data to it so we can 
   // pass context around between our callbacks, as propagate it all the way out
   // to the JavaScript callbacks

package/src/ziti_init.c

@@ -31,6 +31,12 @@ static const char *ALL_CONFIG_TYPES[] = {
         NULL
 };
 
+#define ZROK_PROXY_CFG_V1 "zrok.proxy.v1"
+#define ZROK_PROXY_CFG_V1_MODEL(XX, ...) \
+XX(auth_scheme, string, none, auth_scheme, __VA_ARGS__) \
+XX(basic_auth, string, none, basic_auth, __VA_ARGS__) \
+XX(oauth, string, none, oauth, __VA_ARGS__)
+DECLARE_MODEL(zrok_proxy_cfg_v1, ZROK_PROXY_CFG_V1_MODEL)
 
 /**
  * This function is responsible for calling the JavaScript callback function 
@@ -86,12 +92,6 @@ void on_ziti_init(ziti_context _ztx, int status, void* ctx) {
   // Set the global ztx context variable
   ztx = _ztx;
 
-  if (status == ZITI_OK) {
-
-    ziti_set_timeout(ztx, 5*1000);
-
-  }
-
   AddonData* addon_data = (AddonData*)ctx;
 
   // Initiate the call into the JavaScript callback. 
@@ -136,18 +136,21 @@ static void on_ziti_event(ziti_context _ztx, const ziti_event_t *event) {
       if (event->event.service.removed != NULL) {
           for (ziti_service **sp = event->event.service.removed; *sp != NULL; sp++) {
               // service_check_cb(ztx, *sp, ZITI_SERVICE_UNAVAILABLE, app_ctx);
+              ZITI_NODEJS_LOG(INFO, "Service removed [%s]", (*sp)->name);
           }
       }
 
       if (event->event.service.added != NULL) {
           for (ziti_service **sp = event->event.service.added; *sp != NULL; sp++) {
               // service_check_cb(ztx, *sp, ZITI_OK, app_ctx);
+              ZITI_NODEJS_LOG(INFO, "Service added [%s]", (*sp)->name);
           }
       }
 
       if (event->event.service.changed != NULL) {
           for (ziti_service **sp = event->event.service.changed; *sp != NULL; sp++) {
               // service_check_cb(ztx, *sp, ZITI_OK, app_ctx);
+              ZITI_NODEJS_LOG(INFO, "Service changed [%s]", (*sp)->name);
           }
       }
 
@@ -160,6 +163,11 @@ static void on_ziti_event(ziti_context _ztx, const ziti_event_t *event) {
           .hostname = {0},
           .port = 0
         };
+        zrok_proxy_cfg_v1 zrok_cfg = {
+          .auth_scheme = "",
+          .basic_auth = "",
+          .oauth = ""
+        };
 
         if (ziti_service_get_config(s, ZITI_INTERCEPT_CFG_V1, intercept, (int (*)(void *, const char *, size_t))parse_ziti_intercept_cfg_v1) == ZITI_OK) {
 
@@ -177,6 +185,9 @@ static void on_ziti_event(ziti_context _ztx, const ziti_event_t *event) {
 
         } else if (ziti_service_get_config(s, ZITI_CLIENT_CFG_V1, &clt_cfg, (int (*)(void *, const char *, unsigned long))parse_ziti_client_cfg_v1) == ZITI_OK) {
             track_service_to_hostname(s->name, clt_cfg.hostname.addr.hostname, clt_cfg.port);
+
+        } else if (ziti_service_get_config(s, ZROK_PROXY_CFG_V1, &zrok_cfg, (int (*)(void *, const char *, unsigned long))parse_ziti_client_cfg_v1) == ZITI_OK) {
+            track_service_to_hostname(s->name, s->name, 80);
         }
 
         free_ziti_intercept_cfg_v1(intercept);

package/vcpkg.json

@@ -10,9 +10,11 @@
     "openssl",
     "zlib",
     "llhttp",
-    "libsodium"
+    "libsodium",
+    "json-c",
+    "protobuf-c"
   ],
   "features": {
   },
   "builtin-baseline": "f14984af3738e69f197bf0e647a8dca12de92996"
-}
+}