@openziti/ziti-sdk-nodejs 0.9.0 → 0.9.3

package/.github/workflows/build.yml

@@ -30,7 +30,7 @@ jobs:
     strategy:
       matrix:
         config:
-          # - { name: "Win", os: windows-latest, cc: "cl",    cxx: "cl" }
+          # - { os: windows-latest, cc: "cl",    cxx: "cl", node: '16' }
           - { os: ubuntu-18.04,   cc: "gcc",   cxx: "g++", node: '12' }
           - { os: ubuntu-18.04,   cc: "gcc",   cxx: "g++", node: '13' }
           - { os: ubuntu-18.04,   cc: "gcc",   cxx: "g++", node: '14' }
@@ -197,19 +197,12 @@ jobs:
       run: |
         npm run build:cleanup
 
-    - name: Publish Binary to S3 (Mac)
+    - name: Publish Binary to S3 (for all OS's, Node versions, and architectures)
       run: |
         ./node_modules/.bin/node-pre-gyp package unpublish publish
         sleep 5
       if: |
-        steps.extract_branch.outputs.branch == 'main' && matrix.config.os == 'macOS-latest'
-
-    - name: Publish Binary to S3 (Linux)
-      run: |
-        ./node_modules/.bin/node-pre-gyp package unpublish publish
-        sleep 5
-      if: |
-        steps.extract_branch.outputs.branch == 'main' && matrix.config.os == 'ubuntu-18.04' && matrix.config.node != '14'
+        steps.extract_branch.outputs.branch == 'main' 
 
     - name: Install Binary
       run: |
@@ -228,4 +221,4 @@ jobs:
         token: ${{ secrets.NPM_TOKEN }}
         access: public
       if: |
-        matrix.config.os == 'ubuntu-18.04' && matrix.config.node == '14' && matrix.architecture == 'x64' && steps.extract_branch.outputs.branch == 'main'
+        matrix.config.os == 'ubuntu-18.04' && matrix.config.node == '16' && matrix.architecture == 'x64' && steps.extract_branch.outputs.branch == 'main'

package/lib/ziti-socket.js

@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 const EventEmitter = require('events');
-const stream = require('node:stream');
+const stream = require('stream');
 const zitiWrite = require('./write').write;
 
 

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

package/src/ziti-add-on.c

@@ -21,9 +21,6 @@ extern void set_signal_handler();
 
 napi_value Init(napi_env env, napi_value exports) {
 
-  //
-  thread_loop = NULL;
-
   if (uv_mutex_init(&client_pool_lock))
     abort();
 
@@ -65,6 +62,12 @@ napi_value Init(napi_env env, napi_value exports) {
 
 #endif
 
+  napi_status status = napi_get_uv_event_loop(env, &thread_loop);
+  if (status != napi_ok) {
+    ZITI_NODEJS_LOG(ERROR, "napi_get_uv_event_loop failed, status: %d", status);
+    abort();
+  }
+
   // Expose some Ziti SDK functions to JavaScript
   expose_ziti_close(env, exports);
   expose_ziti_dial(env, exports);

package/src/ziti_init.c

@@ -17,11 +17,6 @@ limitations under the License.
 #include "ziti-nodejs.h"
 
 ziti_context ztx = NULL;
-uv_loop_t *loop = NULL;
-
-uv_thread_t thread;
-uv_async_t async;
-
 
 typedef struct {
   napi_async_work work;
@@ -185,16 +180,6 @@ static void on_ziti_event(ziti_context _ztx, const ziti_event_t *event) {
 }
 
 
-
-static void child_thread(void *data){
-    uv_loop_t *thread_loop = (uv_loop_t *) data;
-
-    //Start this loop
-    uv_run(thread_loop, UV_RUN_DEFAULT);
-}
-
-static void consumer_notify(uv_async_t *handle, int status) { }
-
 /**
  * 
  */
@@ -267,13 +252,6 @@ napi_value _ziti_init(napi_env env, const napi_callback_info info) {
     napi_throw_error(env, NULL, "Failed to napi_create_threadsafe_function");
   }
 
-  // Create and set up the consumer thread
-  if (NULL == thread_loop) {  // Spawn the loop only once
-    thread_loop = uv_loop_new();
-    uv_async_init(thread_loop, &async, (uv_async_cb)consumer_notify);
-    uv_thread_create(&thread, (uv_thread_cb)child_thread, thread_loop);
-  }
-
   // Light this candle!
   ziti_options *opts = calloc(1, sizeof(ziti_options));
 

package/src/ziti_listen.c

@@ -128,7 +128,7 @@ static void CallJs_on_listen_client_data(napi_env env, napi_value js_cb, void* c
 
 static ssize_t on_listen_client_data(ziti_connection client, const uint8_t *data, ssize_t len) {
 
-  ZITI_NODEJS_LOG(DEBUG, "on_listen_client_data: client: %p, data: %p, len: %zu", client, data, len);
+  ZITI_NODEJS_LOG(DEBUG, "on_listen_client_data: client: %p, data: %p, len: %zd", client, data, len);
 
   ListenAddonData* addon_data = (ListenAddonData*) ziti_conn_data(client);
 
@@ -145,7 +145,7 @@ static ssize_t on_listen_client_data(ziti_connection client, const uint8_t *data
   if (len > 0) {
     /* NOP */
   }
-  else if (len == ZITI_EOF) {
+  else if ((len == ZITI_EOF) || (len == ZITI_CONN_CLOSED)) {
       ZITI_NODEJS_LOG(DEBUG, "on_listen_client_data: client disconnected");
       ziti_close_write(client);
   }