appium-ios-tuntap 0.4.1 → 0.4.2

package/CHANGELOG.md

@@ -1,3 +1,9 @@
+## [0.4.2](https://github.com/appium/appium-ios-tuntap/compare/v0.4.1...v0.4.2) (2026-06-01)
+
+### Miscellaneous Chores
+
+* Tune further tunnel perf ([#46](https://github.com/appium/appium-ios-tuntap/issues/46)) ([d422937](https://github.com/appium/appium-ios-tuntap/commit/d422937a47b16bf1c984030772d1de6e555609e6))
+
 ## [0.4.1](https://github.com/appium/appium-ios-tuntap/compare/v0.4.0...v0.4.1) (2026-05-31)
 
 ### Bug Fixes

package/lib/tunnel/buffer-utils.d.ts

@@ -0,0 +1,4 @@
+/**
+ * Append socket/TUN chunks without repeated Buffer.concat growth copies.
+ */
+export declare function appendBuffer(existing: Buffer, chunk: Buffer): Buffer;

package/lib/tunnel/buffer-utils.js

@@ -0,0 +1,15 @@
+/**
+ * Append socket/TUN chunks without repeated Buffer.concat growth copies.
+ */
+export function appendBuffer(existing, chunk) {
+    if (chunk.length === 0) {
+        return existing;
+    }
+    if (existing.length === 0) {
+        return Buffer.from(chunk);
+    }
+    const combined = Buffer.allocUnsafe(existing.length + chunk.length);
+    existing.copy(combined, 0);
+    chunk.copy(combined, existing.length);
+    return combined;
+}

package/lib/tunnel/manager.js

@@ -3,6 +3,7 @@ import { TunTap } from '../TunTap.js';
 import { EventEmitter } from 'node:events';
 import { Buffer } from 'node:buffer';
 import { CD_TUNNEL_HANDSHAKE_TIMEOUT_MS, CD_TUNNEL_HEADER_SIZE, CD_TUNNEL_MAGIC, CD_TUNNEL_MAGIC_SIZE, CD_TUNNEL_MTU, IPV6_HEADER_SIZE, IPV6_VERSION, IPPROTO_TCP, IPPROTO_UDP, } from './constants.js';
+import { appendBuffer } from './buffer-utils.js';
 /**
  * Bridges a CoreDevice tunnel `Socket` and a {@link TunTap} interface: IPv6 framing, TUN I/O, and packet fan-out.
  * Emits {@link TunnelManagerEvents} (currently `data` with {@link PacketData}) for TCP/UDP packets, same as registered consumers.
@@ -125,14 +126,15 @@ export class TunnelManager extends EventEmitter {
         }
         this.deviceConn = deviceConn;
         log.debug(`Starting bidirectional data forwarding for ${this.tun.name}`);
+        deviceConn.setNoDelay(true);
+        deviceConn.setKeepAlive(true, 1000);
         // Handle data from the device connection
         deviceConn.on('data', (data) => {
             if (this.cancelled) {
                 return;
             }
             try {
-                // Add data to buffer
-                this.buffer = Buffer.concat([this.buffer, data]);
+                this.buffer = appendBuffer(this.buffer, data);
                 // Process IPv6 packets
                 this.processBuffer();
             }
@@ -258,10 +260,10 @@ export class TunnelManager extends EventEmitter {
             if (this.cancelled || !data.length || deviceConn.destroyed) {
                 return;
             }
-            if (data.length >= IPV6_HEADER_SIZE) {
+            if (this.hasPacketTap() && data.length >= IPV6_HEADER_SIZE) {
                 log.debug(`TUN → Device: ${data.length} bytes, IPv6 src=${formatIPv6Address(data.subarray(8, 24))}, dst=${formatIPv6Address(data.subarray(24, 40))}`);
             }
-            else {
+            else if (this.hasPacketTap()) {
                 log.debug(`TUN → Device: ${data.length} bytes (too small for IPv6 header)`);
             }
             deviceConn.write(data);
@@ -401,7 +403,7 @@ function readCdTunnelResponse(socket, timeoutMs) {
         };
         const onData = (chunk) => {
             log.debug('Received data chunk:', chunk.length, 'bytes');
-            buffer = Buffer.concat([buffer, chunk]);
+            buffer = appendBuffer(buffer, chunk);
             if (buffer.length >= CD_TUNNEL_HEADER_SIZE) {
                 const payloadLength = buffer.readUInt16BE(CD_TUNNEL_MAGIC_SIZE);
                 log.debug('Expected total packet length:', CD_TUNNEL_HEADER_SIZE + payloadLength, 'current buffer:', buffer.length);

package/package.json

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

package/src/native/tun_backend_darwin.cc

@@ -91,8 +91,11 @@ public:
       return ReadPacketStatus::Error;
     }
 
-    out.resize(max_payload_size + kUtunHeaderSize);
-    ssize_t bytes_read = read(fd_.get(), out.data(), out.size());
+    const size_t read_cap = max_payload_size + kUtunHeaderSize;
+    if (read_frame_.size() < read_cap) {
+      read_frame_.resize(read_cap);
+    }
+    ssize_t bytes_read = read(fd_.get(), read_frame_.data(), read_cap);
     if (bytes_read < 0) {
       if (errno == EAGAIN || errno == EWOULDBLOCK) {
         out.clear();
@@ -111,9 +114,8 @@ public:
     }
 
     const auto payload_len = static_cast<size_t>(bytes_read - kUtunHeaderSize);
-    // Collapse the utun 4-byte address-family prefix in-place.
-    memmove(out.data(), out.data() + kUtunHeaderSize, payload_len);
     out.resize(payload_len);
+    memcpy(out.data(), read_frame_.data() + kUtunHeaderSize, payload_len);
     return ReadPacketStatus::Data;
   }
 
@@ -168,6 +170,7 @@ private:
     return false;
   }
 
+  std::vector<uint8_t> read_frame_;
   std::vector<uint8_t> write_frame_;
 };
 

package/src/tuntap.cc

@@ -209,12 +209,14 @@ Napi::Value TunDevice::StartPolling(const Napi::CallbackInfo& info) {
     buffer_size = size;
   }
 
+  // Queue depth > 1 lets the poll thread post the next packet while JS is still
+  // handling the previous callback (still serialized on the main thread).
   tsfn_ = Napi::ThreadSafeFunction::New(
       env,
       info[0].As<Napi::Function>(),
       "TunDeviceDataCallback",
       0,
-      1);
+      8);
 
   uv_loop_t* loop = nullptr;
   napi_status napi_st = napi_get_uv_event_loop(env, &loop);