appium-ios-tuntap 0.2.2 → 0.2.4

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [0.2.4](https://github.com/appium/appium-ios-tuntap/compare/v0.2.3...v0.2.4) (2026-05-13)
+
+### Code Refactoring
+
+* eliminate tun_backend_common.cc indirection ([#41](https://github.com/appium/appium-ios-tuntap/issues/41)) ([5fd387e](https://github.com/appium/appium-ios-tuntap/commit/5fd387e230fb772dbf280472dbadb43d131a4a2e))
+
+## [0.2.3](https://github.com/appium/appium-ios-tuntap/compare/v0.2.2...v0.2.3) (2026-05-13)
+
 ## [0.2.2](https://github.com/appium/appium-ios-tuntap/compare/v0.2.1...v0.2.2) (2026-04-30)
 
 ### Bug Fixes

package/README.md

@@ -291,11 +291,6 @@ To manually verify the fix for signal handling (introduced in v0.0.4):
 
 This ensures the signal handler works as intended.
 
-Apache-2.0
->>>>>>> upstream/main
 ## License
 
 Apache-2.0
-=======
-Apache-2.0
->>>>>>> upstream/main

package/binding.gyp

@@ -4,8 +4,7 @@
       "target_name": "tuntap",
       "sources": [
         "src/tuntap.cc",
-        "src/native/file_descriptor.cc",
-        "src/native/tun_backend_common.cc"
+        "src/native/file_descriptor.cc"
       ],
       "include_dirs": [
         "<!@(node -p \"require('node-addon-api').include\")"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "appium-ios-tuntap",
-  "version": "0.2.2",
+  "version": "0.2.4",
   "description": "Native TUN/TAP interface module for Node.js",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

package/src/native/tun_backend.h

@@ -33,6 +33,5 @@ public:
   virtual ssize_t WritePacket(int fd, const uint8_t* data, size_t length, std::string& error) = 0;
 };
 
-bool SetNonBlocking(int fd, std::string& error);
 std::unique_ptr<TunPlatformBackend> CreatePlatformBackend();
 

package/src/native/tun_backend_darwin.cc

@@ -14,10 +14,25 @@
 #include <netinet/in.h>
 #include <netinet6/in6_var.h>
 
+#include <fcntl.h>
+
 #define UTUN_CONTROL_NAME "com.apple.net.utun_control"
 
 namespace {
 
+bool SetNonBlocking(int fd, std::string& error) {
+  int flags = fcntl(fd, F_GETFL, 0);
+  if (flags < 0) {
+    error = std::string("Failed to get file descriptor flags: ") + strerror(errno);
+    return false;
+  }
+  if (fcntl(fd, F_SETFL, flags | O_NONBLOCK) < 0) {
+    error = std::string("Failed to set non-blocking mode: ") + strerror(errno);
+    return false;
+  }
+  return true;
+}
+
 class DarwinTunBackend : public TunPlatformBackend {
 public:
   static constexpr size_t kUtunHeaderSize = 4;
@@ -65,6 +80,10 @@ public:
       return false;
     }
 
+    if (!SetNonBlocking(temp_fd.get(), error)) {
+      return false;
+    }
+
     out.fd = std::move(temp_fd);
     out.interface_name = std::string(interface_name);
     return true;
@@ -144,7 +163,7 @@ private:
 
 } // namespace
 
-std::unique_ptr<TunPlatformBackend> CreatePlatformTunBackend() {
+std::unique_ptr<TunPlatformBackend> CreatePlatformBackend() {
   return std::make_unique<DarwinTunBackend>();
 }
 

package/src/native/tun_backend_linux.cc

@@ -13,6 +13,20 @@
 #include <linux/if_tun.h>
 
 namespace {
+
+bool SetNonBlocking(int fd, std::string& error) {
+  int flags = fcntl(fd, F_GETFL, 0);
+  if (flags < 0) {
+    error = std::string("Failed to get file descriptor flags: ") + strerror(errno);
+    return false;
+  }
+  if (fcntl(fd, F_SETFL, flags | O_NONBLOCK) < 0) {
+    error = std::string("Failed to set non-blocking mode: ") + strerror(errno);
+    return false;
+  }
+  return true;
+}
+
 constexpr const char* kTunDevicePath = "/dev/net/tun";
 
 class LinuxTunBackend : public TunPlatformBackend {
@@ -49,6 +63,10 @@ public:
       return false;
     }
 
+    if (!SetNonBlocking(temp_fd.get(), error)) {
+      return false;
+    }
+
     out.fd = std::move(temp_fd);
     out.interface_name = std::string(ifr.ifr_name);
     return true;
@@ -86,7 +104,7 @@ public:
 
 } // namespace
 
-std::unique_ptr<TunPlatformBackend> CreatePlatformTunBackend() {
+std::unique_ptr<TunPlatformBackend> CreatePlatformBackend() {
   return std::make_unique<LinuxTunBackend>();
 }
 

package/src/tuntap.cc

@@ -107,11 +107,6 @@ Napi::Value TunDevice::Open(const Napi::CallbackInfo& info) {
     return Napi::Boolean::New(env, false);
   }
 
-  if (!SetNonBlocking(result.fd.get(), error)) {
-    Napi::Error::New(env, error).ThrowAsJavaScriptException();
-    return Napi::Boolean::New(env, false);
-  }
-
   fd_ = std::move(result.fd);
   name_ = result.interface_name;
   is_open_ = true;

package/src/native/tun_backend_common.cc

@@ -1,27 +0,0 @@
-#include "tun_backend.h"
-
-#include <errno.h>
-#include <fcntl.h>
-#include <string.h>
-
-std::unique_ptr<TunPlatformBackend> CreatePlatformTunBackend();
-
-bool SetNonBlocking(int fd, std::string& error) {
-  int flags = fcntl(fd, F_GETFL, 0);
-  if (flags < 0) {
-    error = std::string("Failed to get file descriptor flags: ") + strerror(errno);
-    return false;
-  }
-
-  if (fcntl(fd, F_SETFL, flags | O_NONBLOCK) < 0) {
-    error = std::string("Failed to set non-blocking mode: ") + strerror(errno);
-    return false;
-  }
-
-  return true;
-}
-
-std::unique_ptr<TunPlatformBackend> CreatePlatformBackend() {
-  return CreatePlatformTunBackend();
-}
-