@openziti/ziti-sdk-nodejs 0.7.0 → 0.9.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.
@@ -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,12 +62,19 @@ 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);
   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.
@@ -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;
@@ -56,7 +51,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");
@@ -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,14 +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
-    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);
-  }
-
   // Light this candle!
   ziti_options *opts = calloc(1, sizeof(ziti_options));
 
@@ -289,6 +266,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");