@openziti/ziti-sdk-nodejs 0.7.0 → 0.9.1

package/src/ziti_service_available.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_shutdown.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_websocket_connect.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_websocket_write.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_write.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.
@@ -32,6 +32,8 @@ typedef struct WriteItem {
 static void CallJs_on_write(napi_env env, napi_value js_cb, void* context, void* data) {
   napi_status status;
 
+  ZITI_NODEJS_LOG(DEBUG, "CallJs_on_write entered");
+
   // This parameter is not used.
   (void) context;
 
@@ -106,6 +108,8 @@ static void on_write(ziti_connection conn, ssize_t status, void *ctx) {
 
   ConnAddonData* addon_data = (ConnAddonData*) ziti_conn_data(conn);
 
+  ZITI_NODEJS_LOG(DEBUG, "on_write cb entered: addon_data: %p", addon_data);
+
   WriteItem* item = memset(malloc(sizeof(*item)), 0, sizeof(*item));
   item->conn = conn;
   item->status = status;
@@ -164,6 +168,8 @@ napi_value _ziti_write(napi_env env, const napi_callback_info info) {
 
   // Obtain ptr to JS 'write' callback function
   napi_value js_write_cb = args[2];
+  ZITI_NODEJS_LOG(DEBUG, "js_write_cb: %p", js_write_cb);
+
   napi_value work_name;
 
   // Create a string to describe this asynchronous operation.
@@ -195,7 +201,9 @@ napi_value _ziti_write(napi_env env, const napi_callback_info info) {
   }
 
   // Now, call the C-SDK to actually write the data over to the service
+  ZITI_NODEJS_LOG(DEBUG, "call ziti_write");
   ziti_write(conn, chunk, bufferLength, on_write, NULL);
+  ZITI_NODEJS_LOG(DEBUG, "back from ziti_write");
 
   return NULL;
 }

package/tests/https-test.js

@@ -30,7 +30,9 @@ const Ziti_http_request = async (url, method, headers) => {
                 // on_resp_data callback
                 (obj) => {
                     console.log('----------- Now inside Ziti_http_request on_resp_data callback ----------, obj is: \n%o', obj);
-                    console.log('----------- obj.body is: \n%o', obj.body.toString());
+                    if (obj.body) {
+                        console.log('----------- obj.body is: \n%o', obj.body.toString());
+                    }
                 },
             );
 
@@ -167,21 +169,21 @@ const sendChunk = (req) => {
             process.exit(-1);
         });
 
-        console.log('inside JS main(), req is (%o)', req);
+        // console.log('inside JS main(), req is (%o)', req);
 
 
         // setTimeout( async () => {
         
-        for (let i=0; i<3; i++ ) {
+        // for (let i=0; i<3; i++ ) {
 
-            let req2 = await Ziti_http_request(url, method, []).catch((err) => {
-                console.log('Ziti_http_request failed with error (%o)', err);
-                process.exit(-1);
-            });
+        //     let req2 = await Ziti_http_request(url, method, []).catch((err) => {
+        //         console.log('Ziti_http_request failed with error (%o)', err);
+        //         process.exit(-1);
+        //     });
     
-            console.log('inside JS main() setTimeout(), req is (%o)', req2);
+        //     console.log('inside JS main() setTimeout(), req is (%o)', req2);
 
-        }
+        // }
 
         // }, 100);