update [email protected]

clean up build warnings

Author: ekoby

deps/CMakeLists.txt

@@ -21,7 +21,7 @@ endif (WIN32)
 
 FetchContent_Declare(ziti
         GIT_REPOSITORY https://github.com/openziti/ziti-sdk-c.git
-        GIT_TAG 1.3.7
+        GIT_TAG 1.4.4
 )
 FetchContent_MakeAvailable(ziti)
 

package-lock.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.19.0",
+  "version": "0.20.0",
   "main": "./lib/ziti",
   "scripts": {
     "build": "npm run build:configure && npm run build:make",

package.json

@@ -70,7 +70,7 @@ extern FILE *ziti_nodejs_debug_out;
 if (level <= ziti_nodejs_debug_level) {\
     long elapsed = get_nodejs_elapsed();\
     fprintf(ziti_nodejs_debug_out, "[%9ld.%03ld] " #level "\tziti-sdk-nodejs/%s:%d %s(): " fmt "\n",\
-        elapsed/1000, elapsed%1000, __FILENAME_NODEJS__, __LINE__, __func__, ##__VA_ARGS__);\
+        (long int)(elapsed/1000), (long int)(elapsed%1000), __FILENAME_NODEJS__, __LINE__, __func__, ##__VA_ARGS__);\
 }\
 } while(0)
 #endif

src/utils.h

@@ -75,7 +75,7 @@ static void CallJs_on_listen_client_data(napi_env env, napi_value js_cb, void* c
       if (rc != napi_ok) {
         napi_throw_error(env, "EINVAL", "failure to set named property status");
       }
-      ZITI_NODEJS_LOG(DEBUG, "js_arb_data: %lld", item->js_arb_data);
+      ZITI_NODEJS_LOG(DEBUG, "js_arb_data: %lld", (long long int)item->js_arb_data);
     } else {
       rc = napi_set_named_property(env, js_client_item, "js_arb_data", undefined);
     }
@@ -228,7 +228,7 @@ static void CallJs_on_listen_client_connect(napi_env env, napi_value js_cb, void
       if (rc != napi_ok) {
         napi_throw_error(env, "EINVAL", "failure to set named property status");
       }
-      ZITI_NODEJS_LOG(DEBUG, "js_arb_data: %lld", item->js_arb_data);
+      ZITI_NODEJS_LOG(DEBUG, "js_arb_data: %lld", (long long int)item->js_arb_data);
     } else {
       rc = napi_set_named_property(env, js_client_item, "js_arb_data", undefined);
     }
@@ -303,7 +303,7 @@ static void CallJs_on_listen(napi_env env, napi_value js_cb, void* context, void
   if (env != NULL) {
     napi_value undefined, js_rc;
 
-    ZITI_NODEJS_LOG(INFO, "CallJs_on_listen: data: %lld", (int64_t)data);
+    ZITI_NODEJS_LOG(INFO, "CallJs_on_listen: data: %lld", (long long)data);
 
     // Retrieve the rc created by the worker thread.
     int64_t rc = (int64_t)data;
@@ -401,7 +401,7 @@ static void CallJs_on_listen_client(napi_env env, napi_value js_cb, void* contex
       if (rc != napi_ok) {
         napi_throw_error(env, "EINVAL", "failure to set named property status");
       }
-      ZITI_NODEJS_LOG(DEBUG, "js_arb_data: %lld", item->js_arb_data);
+      ZITI_NODEJS_LOG(DEBUG, "js_arb_data: %lld", (long long)item->js_arb_data);
     } else {
       rc = napi_set_named_property(env, js_client_item, "js_arb_data", undefined);
     }
@@ -592,7 +592,7 @@ napi_value _ziti_listen(napi_env env, const napi_callback_info info) {
     napi_throw_error(env, NULL, "Failed to get js_arb_data");
   }
   addon_data->js_arb_data = js_arb_data;
-  ZITI_NODEJS_LOG(DEBUG, "js_arb_data: %lld", js_arb_data);
+  ZITI_NODEJS_LOG(DEBUG, "js_arb_data: %lld", (long long)js_arb_data);
 
   // Obtain ptr to JS 'on_listen' callback function
   napi_value js_on_listen = args[2];

src/ziti_listen.c

@@ -42,7 +42,7 @@ napi_value _ziti_set_log_level(napi_env env, const napi_callback_info info) {
     napi_throw_error(env, NULL, "Failed to get logLevel");
   }
 
-  ZITI_NODEJS_LOG(DEBUG, "js_log_level: %lld", js_log_level);
+  ZITI_NODEJS_LOG(DEBUG, "js_log_level: %lld", (long long)js_log_level);
 
   ziti_nodejs_debug_level = js_log_level;
   ziti_log_set_level(js_log_level, NULL);