@openziti/ziti-sdk-nodejs 0.9.3 → 0.10.0

package/binding.gyp

@@ -38,6 +38,7 @@
         "./src/ziti_init.c",
         "./src/ziti_listen.c",
         "./src/ziti_service_available.c",
+        "./src/ziti_set_log_level.c",
         "./src/ziti_shutdown.c",
         "./src/ziti_write.c",
         "./src/ziti_websocket_connect.c",
@@ -106,7 +107,7 @@
             "GCC_ENABLE_PASCAL_STRINGS": "NO",        # No -mpascal-strings
             "GCC_THREADSAFE_STATICS": "NO",           # -fno-threadsafe-statics
             "PREBINDING": "NO",                       # No -Wl,-prebind
-            "MACOSX_DEPLOYMENT_TARGET": "12",         # -mmacosx-version-min=10.14
+            "MACOSX_DEPLOYMENT_TARGET": "10.14",         # -mmacosx-version-min=10.14
             "USE_HEADERMAP": "NO",
             "OTHER_CFLAGS": [
               "-fno-strict-aliasing",

package/lib/httpRequest.js

@@ -0,0 +1,81 @@
+/*
+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.
+*/
+
+
+/**
+ * on_req()   
+ * 
+ */
+const on_req = ( obj ) => {
+
+    console.log('on_req entered: ', obj);
+
+};
+
+/**
+ * on_resp()   
+ * 
+ */
+const on_resp = ( obj ) => {
+
+    console.log('on_resp entered: ', obj);
+
+};
+
+/**
+ * on_resp_data()   
+ * 
+ */
+const on_resp_data = ( obj ) => {
+
+    console.log('on_resp_data entered: ', obj);
+    console.log('as string: ', obj.body.toString('utf8'));
+
+};
+
+const httpRequest = ( url, method, headers, on_req_cb, on_resp_cb, on_resp_data_cb ) => {
+
+    console.log('httpRequest entered: ', url, method, headers);
+
+    let _on_req_cb;
+    let _on_resp_cb;
+    let _on_resp_data_cb;
+
+    if (typeof on_req_cb === 'undefined') {
+        _on_req_cb = on_req;
+    } else {
+        _on_req_cb = on_req_cb;
+    }
+
+    if (typeof on_resp_cb === 'undefined') {
+        _on_resp_cb = on_resp;
+    } else {
+        _on_resp_cb = on_req_cb;
+    }
+
+    if (typeof on_resp_data_cb === 'undefined') {
+        _on_resp_data_cb = on_resp_data;
+    } else {
+        _on_resp_data_cb = on_resp_data_cb;
+    }
+
+    ziti.Ziti_http_request( url, method, headers, _on_req_cb, _on_resp_cb, _on_resp_data_cb );
+
+};
+
+
+exports.httpRequest = httpRequest;
+

package/lib/httpRequestData.js

@@ -0,0 +1,46 @@
+/*
+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.
+*/
+
+
+/**
+ * on_req_data()   
+ * 
+ */
+const on_req_data = ( obj ) => {
+
+    console.log('on_req_data entered: ', obj);
+    console.log('as string: ', obj.body.toString('utf8'));
+
+};
+
+const httpRequestData = ( req, buffer, on_req_data_cb ) => {
+
+    console.log('httpRequestData entered: ', req, buffer);
+
+    let _on_req_data_cb;
+
+    if (typeof on_req_data_cb === 'undefined') {
+        _on_req_data_cb = on_req_data;
+    } else {
+        _on_req_data_cb = on_req_data_cb;
+    }
+
+    ziti.Ziti_http_request_data( req, buffer, _on_req_data_cb );
+};
+
+
+exports.httpRequestData = httpRequestData;
+

package/lib/setLogLevel.js

@@ -0,0 +1,29 @@
+/*
+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.
+*/
+
+
+/**
+ * setLogLevel()   
+ * 
+ * @param {*} lvl 
+ */
+const setLogLevel = ( lvl ) => {
+
+  ziti.ziti_set_log_level( lvl );
+
+};
+
+exports.setLogLevel = setLogLevel;

package/lib/ziti.js

@@ -48,3 +48,6 @@ exports.express   = require('./express').express;
 exports.init      = require('./init').init;
 exports.listen    = require('./listen').listen;
 exports.write     = require('./write').write;
+exports.httpRequest     = require('./httpRequest').httpRequest;
+exports.httpRequestData = require('./httpRequestData').httpRequestData;
+exports.setLogLevel = require('./setLogLevel').setLogLevel;

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.9.3",
+  "version": "0.10.0",
   "main": "./lib/ziti",
   "scripts": {
     "build": "npm run build:init; npm run build:c-sdk; npm install --build-from-source --clang=1",

package/src/utils.c

@@ -16,6 +16,7 @@ limitations under the License.
 
 #include <uv.h>
 #include "utils.h"
+#include <ziti/ziti_log.h>
 
 
 #if !defined(BUILD_DATE)
@@ -43,7 +44,7 @@ limitations under the License.
 #define ZITI_COMMIT sha
 #endif
 
-#define to_str(x) str(x)
+// #define to_str(x) str(x)
 #define str(x) #x
 
 
@@ -69,7 +70,7 @@ const char* ziti_nodejs_git_commit() {
     return to_str(ZITI_COMMIT);
 }
 
-int ziti_nodejs_debug_level = INFO;
+int ziti_nodejs_debug_level = ZITI_LOG_DEFAULT_LEVEL;
 FILE *ziti_nodejs_debug_out;
 
 #if _WIN32

package/src/utils.h

@@ -44,21 +44,21 @@ extern FILE *ziti_nodejs_debug_out;
 
 
 /// for windows compilation NOGDI needs to be set:
-#define DEBUG_LEVELS(XX) \
-    XX(NONE) \
-    XX(ERROR) /*WINDOWS - see comment above wrt NOGDI*/ \
-    XX(WARN) \
-    XX(INFO) \
-    XX(DEBUG) \
-    XX(VERBOSE) \
-    XX(TRACE)
-
-
-enum DebugLevel {
-#define _level(n) n,
-    DEBUG_LEVELS(_level)
-#undef _level
-};
+// #define DEBUG_LEVELS(XX) \
+//     XX(NONE) \
+//     XX(ERROR) /*WINDOWS - see comment above wrt NOGDI*/ \
+//     XX(WARN) \
+//     XX(INFO) \
+//     XX(DEBUG) \
+//     XX(VERBOSE) \
+//     XX(TRACE)
+
+
+// enum DebugLevel {
+// #define _level(n) n,
+//     DEBUG_LEVELS(_level)
+// #undef _level
+// };
 
 // #define container_of(ptr, type, member) ((type *) ((ptr) - offsetof(type, member)))
 

package/src/ziti-add-on.c

@@ -86,6 +86,8 @@ napi_value Init(napi_env env, napi_value exports) {
   expose_ziti_websocket_connect(env, exports);
   expose_ziti_websocket_write(env, exports);
 
+  expose_ziti_set_log_level(env, exports);
+
   return exports;
 }
 

package/src/ziti-nodejs.h

@@ -30,6 +30,7 @@ limitations under the License.
 #include <node_api.h>
 
 #include <ziti/ziti.h>
+#include <ziti/ziti_log.h>
 #include "utils.h"
 
 
@@ -205,6 +206,7 @@ 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_set_log_level(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);
 extern void expose_ziti_https_request(napi_env env, napi_value exports);

package/src/ziti_set_log_level.c

@@ -0,0 +1,73 @@
+/*
+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.
+*/
+
+#include "ziti-nodejs.h"
+
+
+/**
+ * 
+ */
+napi_value _ziti_set_log_level(napi_env env, const napi_callback_info info) {
+  napi_status status;
+  napi_value jsRetval;
+
+  size_t argc = 1;
+  napi_value args[1];
+  status = napi_get_cb_info(env, info, &argc, args, NULL, NULL);
+  if (status != napi_ok) {
+    napi_throw_error(env, NULL, "Failed to parse arguments");
+  }
+
+  if (argc < 1) {
+    napi_throw_error(env, "EINVAL", "Too few arguments");
+    return NULL;
+  }
+
+  int64_t js_log_level;
+  status = napi_get_value_int64(env, args[0], &js_log_level);
+  if (status != napi_ok) {
+    napi_throw_error(env, NULL, "Failed to get logLevel");
+  }
+
+  ZITI_NODEJS_LOG(DEBUG, "js_log_level: %lld", js_log_level);
+
+  ziti_nodejs_debug_level = js_log_level;
+  ziti_log_set_level(js_log_level);
+
+  status = napi_create_int32(env, 0, &jsRetval);
+  if (status != napi_ok) {
+    napi_throw_error(env, NULL, "Unable to create return value");
+  }
+
+  return jsRetval;
+}
+
+
+void expose_ziti_set_log_level(napi_env env, napi_value exports) {
+  napi_status status;
+  napi_value fn;
+
+  status = napi_create_function(env, NULL, 0, _ziti_set_log_level, NULL, &fn);
+  if (status != napi_ok) {
+    napi_throw_error(env, NULL, "Unable to wrap native function '_ziti_set_log_level");
+  }
+
+  status = napi_set_named_property(env, exports, "ziti_set_log_level", fn);
+  if (status != napi_ok) {
+    napi_throw_error(env, NULL, "Unable to populate exports for 'ziti_set_log_level");
+  }
+
+}