@openziti/ziti-sdk-nodejs 0.6.0 → 0.9.0

package/lib/ziti-socket.js

@@ -0,0 +1,119 @@
+/*
+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 EventEmitter = require('events');
+const stream = require('node:stream');
+const zitiWrite = require('./write').write;
+
+
+
+class ZitiSocket extends EventEmitter {
+
+    constructor(opts) {
+
+        super();
+
+        if (typeof opts !== 'undefined') {
+            if (typeof opts.client !== 'undefined') {
+                this.client = opts.client;
+            }
+        }
+
+        this._writableState = new stream.Writable.WritableState({}, this, true);
+         
+        /**
+         * This stream is where we'll put any data returned from Ziti (see on_listen_client_data cb)
+         */
+        let self = this;
+        this.readableZitiStream = new ReadableStream({
+            start(controller) {
+                self.readableZitiStreamController = controller;
+            }
+        });
+    }
+
+
+    /**
+     * 
+     */
+    captureData(data) {
+
+        if ((typeof data !== 'undefined') && (data.byteLength > 0)) {
+
+            this.readableZitiStreamController.enqueue(data);
+            this.emit('data', data);
+
+        } else {
+
+            this.emit('close');
+
+        }
+    }
+     
+
+    /**
+     * Implements the writeable stream method `_write` by pushing the data onto the underlying Ziti connection.
+    */
+    async write(chunk, encoding, cb) {
+
+        let buffer;
+
+        if (typeof chunk === 'string' || chunk instanceof String) {
+            buffer = Buffer.from(chunk, 'utf8');
+        } else if (Buffer.isBuffer(chunk)) {
+            buffer = chunk;
+        } else if (chunk instanceof Uint8Array) {
+            buffer = Buffer.from(chunk, 'utf8');
+        } else {
+            throw new Error('chunk type of [' + typeof chunk + '] is not a supported type');
+        }
+
+        if (buffer.length > 0) {
+            zitiWrite(this.client, buffer);
+        }
+        if (cb) {
+            cb();
+        }
+    }
+
+    /**
+     *
+     */
+    _read() { /* NOP */ }
+    read()  { /* NOP */ }
+    destroy() { /* NOP */ } 
+    cork() { /* NOP */ }
+    uncork() { /* NOP */ }
+    pause() { /* NOP */ }
+    resume() { /* NOP */ }
+    destroy() { /* NOP */ }
+    end(data, encoding, callback) { /* NOP */ }
+    _final(cb) { cb(); }
+    setTimeout() { /* NOP */ }
+    setNoDelay() { /* NOP */ }
+    unshift(head) { /* NOP */ }
+}
+
+Object.defineProperty(ZitiSocket.prototype, 'writable', {
+    get() {
+      return (
+        true
+      );
+    }
+});
+
+
+exports.ZitiSocket = ZitiSocket;

package/lib/ziti.js

@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2020 Netfoundry, Inc.
+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.
@@ -18,14 +18,13 @@ var binding;
 
 function importAll (r) {
   r.keys().forEach(key => {
-    console.log('importAll() addon key is: ', key);
     binding = r(key); // Load the addon
   });
 }
 
 if (typeof require.context == 'function') {
 
-    importAll( require.context("../build/", true, /\.node$/) );
+  importAll( require.context("../build/", true, /\.node$/) );
 
 } else {
 
@@ -37,4 +36,15 @@ if (typeof require.context == 'function') {
     
 }
 
-var ziti = module.exports = exports = binding;
+ziti = module.exports = exports = binding;
+
+
+
+/**
+ *  Attach the external, app-facing, API to the 'ziti' object
+ */
+exports.close     = require('./close').close;
+exports.express   = require('./express').express;
+exports.init      = require('./init').init;
+exports.listen    = require('./listen').listen;
+exports.write     = 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.6.0",
+  "version": "0.9.0",
   "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

@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2020 Netfoundry, Inc.
+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.

package/src/Ziti_https_request_data.c

@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2020 Netfoundry, Inc.
+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.
@@ -73,7 +73,7 @@ static void CallJs_on_req_body(napi_env env, napi_value js_cb, void* context, vo
     ZITI_NODEJS_LOG(DEBUG, "status: %zd", item->status);
 
     // obj.body = body
-    rc = napi_create_int32(env, (int32_t)item->body, &js_body);
+    rc = napi_create_int32(env, (int64_t)item->body, &js_body);
     if (rc != napi_ok) {
       napi_throw_error(env, "EINVAL", "failure to create resp.body");
     }

package/src/Ziti_https_request_end.c

@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2020 Netfoundry, Inc.
+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.

package/src/stack_traces.c

@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2020 Netfoundry, Inc.
+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.

package/src/utils.c

@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2020 NetFoundry, Inc.
+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.

package/src/utils.h

@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2020 NetFoundry, Inc.
+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.

package/src/ziti-add-on.c

@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2020 Netfoundry, Inc.
+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.
@@ -71,6 +71,7 @@ napi_value Init(napi_env env, napi_value exports) {
   expose_ziti_enroll(env, exports);
   expose_ziti_hello(env, exports);
   expose_ziti_init(env, exports);
+  expose_ziti_listen(env, exports);
   expose_ziti_service_available(env, exports);
   expose_ziti_shutdown(env, exports);
   expose_ziti_write(env, exports);

package/src/ziti-nodejs.h

@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2020 Netfoundry, Inc.
+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.
@@ -93,6 +93,20 @@ typedef struct {
   napi_threadsafe_function tsfn_on_service_available;
 } ConnAddonData;
 
+/**
+ * 
+ */
+typedef struct {
+  char *service_name;
+  int64_t js_arb_data;
+  ziti_connection server;
+  napi_async_work work;
+  napi_threadsafe_function tsfn_on_listen;
+  napi_threadsafe_function tsfn_on_listen_client;
+  napi_threadsafe_function tsfn_on_listen_client_connect;
+  napi_threadsafe_function tsfn_on_listen_client_data;
+} ListenAddonData;
+
 /**
  * 
  */
@@ -189,6 +203,7 @@ extern void expose_ziti_dial(napi_env env, napi_value exports);
 extern void expose_ziti_enroll(napi_env env, napi_value exports);
 extern void expose_ziti_hello(napi_env env, napi_value exports);
 extern void expose_ziti_init(napi_env env, napi_value exports);
+extern void expose_ziti_listen(napi_env env, napi_value exports);
 extern void expose_ziti_service_available(napi_env env, napi_value exports);
 extern void expose_ziti_shutdown(napi_env env, napi_value exports);
 extern void expose_ziti_write(napi_env env, napi_value exports);

package/src/ziti_close.c

@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2020 Netfoundry, Inc.
+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.

package/src/ziti_dial.c

@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2020 Netfoundry, Inc.
+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.
@@ -20,7 +20,7 @@ limitations under the License.
 // An item that will be generated here and passed into the JavaScript on_data callback
 typedef struct OnDataItem {
 
-  uint8_t *buf;
+  const unsigned char *buf;
   int len;
 
 } OnDataItem;
@@ -139,11 +139,10 @@ static void CallJs_on_data(napi_env env, napi_value js_cb, void* context, void*
 
 
 
-
 /**
  * This function is the callback invoked by the C-SDK when data arrives on the connection.
  */
-ssize_t on_data(ziti_connection conn, uint8_t *buf, ssize_t len) {
+long on_data(struct ziti_conn *conn, const unsigned char *buf, long len) {
   napi_status status;
 
   ConnAddonData* addon_data = (ConnAddonData*) ziti_conn_data(conn);
@@ -168,7 +167,7 @@ ssize_t on_data(ziti_connection conn, uint8_t *buf, ssize_t len) {
     OnDataItem* item = memset(malloc(sizeof(*item)), 0, sizeof(*item));
     item->buf = buf;
     item->buf = calloc(1, len);
-    memcpy(item->buf, buf, len);
+    memcpy((void*)item->buf, buf, len);
     item->len = len;
 
     // if (addon_data->isWebsocket) {

package/src/ziti_enroll.c

@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2020 Netfoundry, Inc.
+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.
@@ -110,7 +110,7 @@ static void CallJs_on_enroll(napi_env env, napi_value js_cb, void* context, void
 /**
  * 
  */
-void on_ziti_enroll(ziti_config *cfg, int status, char *err, void *ctx) {
+void on_ziti_enroll(const ziti_config *cfg, int status, const char *err, void *ctx) {
 
   ZITI_NODEJS_LOG(DEBUG, "\nstatus: %d, \nerr: %s,\nctx: %p", status, err, ctx);
 

package/src/ziti_hello.c

@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2020 Netfoundry, Inc.
+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.

package/src/ziti_init.c

@@ -1,5 +1,5 @@
 /*
-Copyright 2019-2020 Netfoundry, Inc.
+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.
@@ -56,7 +56,7 @@ static void CallJs(napi_env env, napi_value js_cb, void* context, void* data) {
     status = napi_get_undefined(env, &undefined);
 
     // Retrieve the rc created by the worker thread.
-    int rc = (int)data;
+    int64_t rc = (int64_t)data;
     status = napi_create_int64(env, (int64_t)rc, &js_rc);
     if (status != napi_ok) {
       napi_throw_error(env, NULL, "Failed to napi_create_int64");
@@ -269,7 +269,6 @@ napi_value _ziti_init(napi_env env, const napi_callback_info info) {
 
   // Create and set up the consumer thread
   if (NULL == thread_loop) {  // Spawn the loop only once
-    ZITI_NODEJS_LOG(DEBUG, "calling uv_loop_new()");
     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);
@@ -289,6 +288,8 @@ napi_value _ziti_init(napi_env env, const napi_callback_info info) {
 
   int rc = ziti_init_opts(opts, thread_loop);
 
+  ZITI_NODEJS_LOG(DEBUG, "ziti_init_opts rc: %d", rc);
+
   status = napi_create_int32(env, rc, &jsRetval);
   if (status != napi_ok) {
     napi_throw_error(env, NULL, "Unable to create return value");