@openziti/ziti-sdk-nodejs 0.7.0 → 0.8.0

package/binding.gyp

@@ -36,6 +36,7 @@
         "./src/Ziti_https_request_data.c",
         "./src/Ziti_https_request_end.c",
         "./src/ziti_init.c",
+        "./src/ziti_listen.c",
         "./src/ziti_service_available.c",
         "./src/ziti_shutdown.c",
         "./src/ziti_write.c",
@@ -105,18 +106,19 @@
             "GCC_ENABLE_PASCAL_STRINGS": "NO",        # No -mpascal-strings
             "GCC_THREADSAFE_STATICS": "NO",           # -fno-threadsafe-statics
             "PREBINDING": "NO",                       # No -Wl,-prebind
-            "MACOSX_DEPLOYMENT_TARGET": "10.15",      # -mmacosx-version-min=10.14
+            "MACOSX_DEPLOYMENT_TARGET": "12",         # -mmacosx-version-min=10.14
             "USE_HEADERMAP": "NO",
             "OTHER_CFLAGS": [
               "-fno-strict-aliasing",
               "-g",
               "-fno-pie",
               "-DSOURCE_PATH_SIZE=3",
-              "-DZITI_OS=macos"
+              "-DZITI_OS=macos",
+              "-DCXXFLAGS=-mmacosx-version-min=11",
             ],
             "OTHER_LDFLAGS": [
               "-g",
-              "-mmacosx-version-min=10.15",
+              "-mmacosx-version-min=11",
             ],
             "WARNING_CFLAGS": [
               "-Wall",

package/lib/express-listener.js

@@ -0,0 +1,267 @@
+/*
+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 zitiListen = require('./listen').listen;
+const EventEmitter = require('events');
+
+const normalizedArgsSymbol = Symbol('normalizedArgs');
+
+
+var _serversIndex = 1;
+var _servers = new Map();
+
+/**
+ * on_listen()   
+ * 
+ * @param {*} status 
+ */
+Server.prototype.on_listen = ( status ) => {
+
+    console.log('----------- Now inside on_listen callback ----------, status is: %o', status);
+  
+};
+  
+/**
+ * on_listen_client()   
+ * 
+ * @param {*} obj 
+ */
+ Server.prototype.on_listen_client = ( obj ) => {
+  
+    console.log('----------- Now inside on_listen_client callback ----------, obj is: %o', obj);
+  
+};
+  
+/**
+ * on_client_write()   
+ * 
+ * @param {*} obj 
+ */
+ Server.prototype.on_client_write = ( obj ) => {
+  
+    console.log('----------- Now inside on_client_write callback ----------, obj is: %o', obj);
+  
+};
+
+/**
+ * on_listen_client_connect()   
+ * 
+ * @param {*} obj 
+ */
+ Server.prototype.on_listen_client_connect = ( obj ) => {
+  
+    console.log('----------- Now inside on_listen_client_connect callback ----------, obj is: %o', obj);
+
+    let self = _servers.get(obj.js_arb_data);
+
+    // console.log('----------- Now inside on_listen_client_connect callback ----------, self is: %o', self);
+
+    console.log('----------- Now inside on_listen_client_connect callback ----------, emitting `connection` event for client/socket: %o', obj.client);
+    self.emit('connection', obj.client);
+
+      
+};
+
+/**
+ * on_listen_client_data()   
+ * 
+ * @param {*} obj 
+ */
+ Server.prototype.on_listen_client_data = ( obj ) => {
+  
+    console.log('----------- Now inside on_listen_client_data callback ----------, obj is: %o', obj);
+  
+    if (obj.app_data) {
+      console.log('----------- app_data ----------, app_data string is: \n%o', obj.app_data.toString());
+    }
+  
+};
+  
+
+/**
+ * 
+ * @param {*} args 
+ * @returns 
+ */
+function normalizeArgs(args) {
+    let arr;
+  
+    if (args.length === 0) {
+      arr = [{}, null];
+      arr[normalizedArgsSymbol] = true;
+      return arr;
+    }
+  
+    const arg0 = args[0];
+    let options = {};
+    if (typeof arg0 === 'object' && arg0 !== null) {
+      // (options[...][, cb])
+      options = arg0;
+    } else {
+      // ([port][, host][...][, cb])
+      options.port = arg0;
+      if (args.length > 1 && typeof args[1] === 'string') {
+        options.host = args[1];
+      }
+    }
+  
+    const cb = args[args.length - 1];
+    if (typeof cb !== 'function')
+      arr = [options, null];
+    else
+      arr = [options, cb];
+  
+    arr[normalizedArgsSymbol] = true;
+    return arr;
+}
+  
+function Server(serviceName, options, connectionListener) {
+
+    if (!(this instanceof Server))
+      return new Server(options, connectionListener);
+  
+    EventEmitter.call(this);
+  
+    if (typeof options === 'function') {
+      connectionListener = options;
+      options = {};
+      this.on('connection', connectionListener);
+    } else if (options == null || typeof options === 'object') {
+      options = { ...options };
+  
+      if (typeof connectionListener === 'function') {
+        this.on('connection', connectionListener);
+      }
+    } else {
+      throw new ERR_INVALID_ARG_TYPE('options', 'Object', options);
+    }
+    if (typeof options.keepAliveInitialDelay !== 'undefined') {
+      validateNumber(
+        options.keepAliveInitialDelay, 'options.keepAliveInitialDelay'
+      );
+  
+      if (options.keepAliveInitialDelay < 0) {
+        options.keepAliveInitialDelay = 0;
+      }
+    }
+
+    this._serviceName = serviceName;
+
+    this._connections = 0;
+  
+    // this[async_id_symbol] = -1;
+    this._handle = null;
+    this._usingWorkers = false;
+    this._workers = [];
+    this._unref = false;
+  
+    this.allowHalfOpen = options.allowHalfOpen || false;
+    this.pauseOnConnect = !!options.pauseOnConnect;
+    this.noDelay = Boolean(options.noDelay);
+    this.keepAlive = Boolean(options.keepAlive);
+    this.keepAliveInitialDelay = ~~(options.keepAliveInitialDelay / 1000);
+
+}
+Object.setPrototypeOf(Server.prototype, EventEmitter.prototype);
+Object.setPrototypeOf(Server, EventEmitter);
+  
+
+Server.prototype.listen = function( serviceName, ...args ) {
+
+    console.log('=======================> express-listener: Server.prototype.listen() entered: arguments: ', arguments);
+
+    let normalized = normalizeArgs(args);
+    normalized = normalizeArgs(normalized[0]);
+    console.log('=======================> express-listener: Server.prototype.listen() normalized: ', normalized);
+
+    // let options = normalized[0];             // we currently ignore options (a.k.a. `port`)
+    let cb = normalized[1];
+    if (cb === null) { cb = this.on_listen; }   // Use our on_listen cb is necessary, else use cb from teh calling app
+
+    let index = _serversIndex++;
+    _servers.set(index, this);
+
+    zitiListen( serviceName, index, cb, this.on_listen_client, this.on_listen_client_connect, this.on_listen_client_data );
+
+};
+
+Server.prototype.address = function() {
+    if (this._handle && this._handle.getsockname) {
+      const out = {};
+      const err = this._handle.getsockname(out);
+      if (err) {
+        throw errnoException(err, 'address');
+      }
+      return out;
+    } else if (this._pipeName) {
+      return this._pipeName;
+    }
+    return null;
+};
+  
+Server.prototype.close = function(cb) {
+    if (typeof cb === 'function') {
+      if (!this._handle) {
+        this.once('close', function close() {
+          cb(new ERR_SERVER_NOT_RUNNING());
+        });
+      } else {
+        this.once('close', cb);
+      }
+    }
+  
+    if (this._handle) {
+      this._handle.close();
+      this._handle = null;
+    }
+  
+    if (this._usingWorkers) {
+      let left = this._workers.length;
+      const onWorkerClose = () => {
+        if (--left !== 0) return;
+  
+        this._connections = 0;
+        this._emitCloseIfDrained();
+      };
+  
+      // Increment connections to be sure that, even if all sockets will be closed
+      // during polling of workers, `close` event will be emitted only once.
+      this._connections++;
+  
+      // Poll workers
+      for (let n = 0; n < this._workers.length; n++)
+        this._workers[n].close(onWorkerClose);
+    } else {
+      this._emitCloseIfDrained();
+    }
+  
+    return this;
+};
+  
+Object.defineProperty(Server.prototype, 'listening', {
+    __proto__: null,
+    get: function() {
+      return !!this._handle;
+    },
+    configurable: true,
+    enumerable: true
+});
+  
+
+module.exports = {
+    Server,
+  };
+  

package/lib/express.js

@@ -0,0 +1,120 @@
+/*
+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 net = require('./express-listener');
+
+const { Server } = require('_http_server'); // from NodeJS internals
+
+
+
+
+const getWrappedExpressApp = ( express, serviceName ) => {
+
+  var wrappedExpressApp = express();
+
+  /**
+   * Listen for connections.
+   *
+   * A node `http.Server` is returned, with this
+   * application (which is a `Function`) as its
+   * callback. If you wish to create both an HTTP
+   * and HTTPS server you may do so with the "http"
+   * and "https" modules as shown here:
+   *
+   *    var http = require('http')
+   *      , https = require('https')
+   *      , express = require('express')
+   *      , app = express();
+   *
+   *    http.createServer(app).listen(80);
+   *    https.createServer({ ... }, app).listen(443);
+   *
+   * @return {http.Server}
+   * @public
+   */  
+  wrappedExpressApp.listen = function() {
+
+    console.log('=======================> wrappedExpressApp.listen() entered: arguments: ', arguments);
+
+    // var server = http.createServer(this);
+    // console.log('=======================> wrappedExpressApp.listen() 1 server: ', server);
+
+    Object.setPrototypeOf(Server.prototype, net.Server.prototype);
+    Object.setPrototypeOf(Server, net.Server);
+    var server = new Server(this);
+
+
+    net.Server.call(
+      server,
+      serviceName,
+      { 
+        // allowHalfOpen: true, 
+        // noDelay: options.noDelay,
+        // keepAlive: options.keepAlive,
+        // keepAliveInitialDelay: options.keepAliveInitialDelay 
+      });
+  
+
+    // zitiListen( serviceName, on_listen, on_listen_client, on_listen_client_connect, on_listen_client_data );
+
+    // return server.listen.apply(server, serviceName, arguments);
+    return server.listen(serviceName, arguments);
+
+  };
+
+  return wrappedExpressApp;
+
+};
+
+
+/**
+ * express()   
+ * 
+ * @param {*} express 
+ * @param {*} serviceName 
+ */
+const express = ( express, serviceName ) => {
+
+  var app = getWrappedExpressApp( express, serviceName);
+
+  // console.log('wrappedExpressApp: ', app);
+
+  // const wrappedExpressResponse = Object.create( app.response, {
+
+  //   data: {
+  //     value: function(data) {
+  //       return this.status(200).json({status: true, data: data});
+  //     },
+  //   },
+
+  //   message: {
+  //     value: function(msg) {
+  //       return this.status(200).json({status: true, message: msg});
+  //     },
+  //   },
+
+  // });
+
+  // app.response = Object.create(wrappedExpressResponse);
+
+  return app;
+
+};
+
+exports.express = express;
+
+
+

package/lib/index.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.

package/lib/init.js

@@ -0,0 +1,39 @@
+/*
+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.
+*/
+
+
+/**
+ * init()   
+ * 
+ * @param {*} identityPath 
+ * @returns 
+ */
+const init = ( identityPath ) => {
+
+  return new Promise((resolve, reject) => {
+
+      let rc = ziti.ziti_init( identityPath, ( result ) => {
+          return resolve( result );
+      });
+
+      if (rc < 0) {
+        return reject(`ziti.init() failed with return code ${rc}`);
+      }
+      
+  });
+};
+
+exports.init = init;

package/lib/listen.js

@@ -0,0 +1,30 @@
+/*
+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.
+*/
+
+
+/**
+ * listen()   
+ * 
+ * @param {*} identityPath 
+ * @returns 
+ */
+const listen = ( serviceName, js_arb_data, on_listen, on_listen_client, on_client_connect, on_client_data ) => {
+
+  ziti.ziti_listen( serviceName, js_arb_data, on_listen, on_listen_client, on_client_connect, on_client_data );
+
+};
+
+exports.listen = listen;

package/lib/write.js

@@ -0,0 +1,31 @@
+/*
+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.
+*/
+
+
+/**
+ * write()   
+ * 
+ * @param {*} conn 
+ * @param {*} buf 
+ * @param {*} on_write callback 
+ */
+const write = ( conn, buf, on_write ) => {
+
+  ziti.ziti_write( conn, buf, on_write );
+
+};
+
+exports.write = write;

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.
@@ -25,7 +25,7 @@ function importAll (r) {
 
 if (typeof require.context == 'function') {
 
-    importAll( require.context("../build/", true, /\.node$/) );
+  importAll( require.context("../build/", true, /\.node$/) );
 
 } else {
 
@@ -37,4 +37,14 @@ 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.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.7.0",
+  "version": "0.8.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.