Update test and remove addon key gen

Signed-off-by: Matheus Sampaio Queiroga <[email protected]>
Sirherobrine23 · Jan 24, 2024 · 38dca1b · 38dca1b
1 parent d1bf97a
commit 38dca1b
Show file tree

Hide file tree

Showing 11 changed files with 364 additions and 530 deletions.
diff --git a/addons/tools/wginterface.hh b/addons/tools/wginterface.hh
@@ -18,7 +18,7 @@ class deleteInterface : public Napi::AsyncWorker {
   private:
     std::string wgName;
   public:
-  deleteInterface(const Napi::Env env, std::string name): AsyncWorker(env), deletePromise{env}, wgName{name} {}
+  deleteInterface(const Napi::Env env, std::string name): AsyncWorker(env), wgName{name}, deletePromise{env} {}
   ~deleteInterface() {}
   const Napi::Promise::Deferred deletePromise;
 
@@ -163,7 +163,7 @@ class setConfig : public Napi::AsyncWorker {
   }
 
   ~setConfig() {}
-  setConfig(const Napi::Env env, std::string name, const Napi::Object &config) : AsyncWorker(env), setPromise{env}, wgName{name} {
+  setConfig(const Napi::Env env, std::string name, const Napi::Object &config) : AsyncWorker(env), wgName{name}, setPromise{env} {
     // Wireguard public key
     const auto sppk = config.Get("publicKey");
     if (sppk.IsString()) {
@@ -278,7 +278,7 @@ class getConfig : public Napi::AsyncWorker {
     std::map<std::string, Peer> peersVector;
   public:
   ~getConfig() {}
-  getConfig(const Napi::Env env, std::string name): AsyncWorker(env), getPromise{env}, wgName{name} {}
+  getConfig(const Napi::Env env, std::string name): AsyncWorker(env), wgName{name}, getPromise{env} {}
   const Napi::Promise::Deferred getPromise;
 
   void OnError(const Napi::Error& e) override {

diff --git a/binding.gyp b/binding.gyp
@@ -43,24 +43,6 @@
     ]
   },
   "targets": [
-    {
-      "target_name": "keygen",
-      "sources": [
-        "addons/genKey/wgkeys.cpp",
-        "addons/genKey/key_gen.cpp"
-      ],
-      "conditions": [
-        ["OS=='mac'", {
-          "cflags!": [ "-fno-exceptions" ],
-          "cflags_cc!": [ "-fno-exceptions" ],
-          "cflags_cc": [ "-fexceptions" ],
-          "cflags": [ "-fexceptions" ],
-          "xcode_settings": {
-            "GCC_ENABLE_CPP_EXCEPTIONS": "YES"
-          }
-        }]
-      ]
-    },
     {
       "target_name": "wginterface",
       "include_dirs": [

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wireguard-tools.js",
-  "version": "1.8.2",
+  "version": "1.8.3",
   "description": "Control your wireguard interface from node.js, not a wireguard-tools/wg wrapper!",
   "private": false,
   "type": "commonjs",

diff --git a/src/experimental/key.ts b/src/experimental/key.ts
diff --git a/src/experimental/key_test.ts b/src/experimental/key_test.ts
diff --git a/src/index.ts b/src/index.ts
@@ -1,4 +1,3 @@
-export * as key_experimental from "./experimental/key";
 export * as key from "./key";
 export * as wgQuick from "./quick";
 export * from "./wginterface";

diff --git a/src/index_test.ts b/src/index_test.ts
@@ -1,3 +1,2 @@
 import "./quick_test";
-import "./key_test";
-import "./experimental/key_test";
+import "./key_test";