@openziti/ziti-sdk-nodejs 0.13.1 → 0.13.2

package/README.md

@@ -104,13 +104,13 @@ const on_resp_data = ( obj ) => {
 
 // Perform an HTTP GET request to a dark OpenZiti web service
 ziti.httpRequest(
-  'myDarkWebService', 
-  'GET', 
-  '/',              // path
+  'myDarkWebService',            // OpenZiti Service name or HTTP origin part of the URL
+  'GET',
+  '/',                           // path part of the URL including query params
   ['Accept: application/json' ], // headers
-  undefined,        // optional on_req cb 
-  undefined,        // optional on_req_data cb
-  on_resp_data      // optional on_resp_data cb
+  undefined,                     // optional on_req cb 
+  undefined,                     // optional on_req_data cb
+  on_resp_data                   // optional on_resp_data cb
 );
 
 ```

package/lib/httpRequest.js

@@ -48,7 +48,7 @@ const on_resp_data = ( obj ) => {
 
 const httpRequest = ( url, method, path, headers, on_req_cb, on_resp_cb, on_resp_data_cb ) => {
 
-    console.log('httpRequest entered: ', url, method, headers);
+    console.log(`httpRequest entered: httpOrigin|serviceName: "${url}", method: "${method}", path: "${path}", headers: "${headers}"`);
 
     let _on_req_cb;
     let _on_resp_cb;

package/lib/init.js

@@ -27,11 +27,8 @@ const init = ( identityPath ) => {
 
       let rc = ziti.ziti_init( identityPath, ( result ) => {
 
-        setTimeout( () => {
-
           return resolve( result );
         
-        }, 1000);
       });
 
       if (rc < 0) {

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.13.1",
+  "version": "0.13.2",
   "main": "./lib/ziti",
   "scripts": {
     "build": "npm run build:init; npm run build:c-sdk; npm install --build-from-source --clang=1",

package/src/Ziti_https_request.c

@@ -726,9 +726,9 @@ void on_client(uv_work_t* req, int status) {
 /**
  * Initiate an HTTPS request
  * 
- * @param {string}   [0] serviceName | URL
+ * @param {string}   [0] serviceName | url         Ziti service name or HTTP origin
  * @param {string}   [1] method
- * @param {string}   [2] path
+ * @param {string}   [2] path                      path part of the URL including query params
  * @param {string[]} [3] headers;                  Array of strings of the form "name:value"
  * @param {func}     [4] JS on_req  callback;      This is invoked from 'on_client' function above
  * @param {func}     [5] JS on_resp callback;      This is invoked from 'on_resp' function above

package/src/ziti_init.c

@@ -21,6 +21,8 @@ ziti_context ztx = NULL;
 typedef struct {
   napi_async_work work;
   napi_threadsafe_function tsfn;
+  int zitiContextEventStatus;
+  bool on_init_cb_invoked;
 } AddonData;
 
 
@@ -129,16 +131,8 @@ static void on_ziti_event(ziti_context _ztx, const ziti_event_t *event) {
           ZITI_NODEJS_LOG(ERROR, "Failed to connect to controller: %s", event->event.ctx.err);
       }
 
-      // Initiate the call into the JavaScript callback. 
-      // The call into JavaScript will not have happened 
-      // when this function returns, but it will be queued.
-      nstatus = napi_call_threadsafe_function(
-          addon_data->tsfn,
-          (void*) (long) event->event.ctx.ctrl_status,
-          napi_tsfn_blocking);
-      if (nstatus != napi_ok) {
-        ZITI_NODEJS_LOG(ERROR, "Unable to napi_call_threadsafe_function");
-      }
+      addon_data->zitiContextEventStatus = event->event.ctx.ctrl_status;
+
       break;
 
     case ZitiServiceEvent:
@@ -223,6 +217,15 @@ static void on_ziti_event(ziti_context _ztx, const ziti_event_t *event) {
         free(intercept);
       }
 
+      // Initiate the call into the JavaScript 'on_init' callback, now that we know about all the services
+      ZITI_NODEJS_LOG(DEBUG, "addon_data->on_init_cb_invoked %o", addon_data->on_init_cb_invoked);
+      if (!addon_data->on_init_cb_invoked) {
+        nstatus = napi_call_threadsafe_function(
+            addon_data->tsfn,
+            (void*) (long) addon_data->zitiContextEventStatus,
+            napi_tsfn_blocking);
+        addon_data->on_init_cb_invoked = true;
+      }
 
       break;
 
@@ -293,7 +296,7 @@ napi_value _ziti_init(napi_env env, const napi_callback_info info) {
   // Obtain ptr to JS callback function
   napi_value js_cb = args[1];
   napi_value work_name;
-  AddonData* addon_data = malloc(sizeof(AddonData));
+  AddonData* addon_data = calloc(1, sizeof(AddonData));
 
   // Create a string to describe this asynchronous operation.
   status = napi_create_string_utf8(