From e8bc8777f815fe1b7474e78f1dbdc44a7a209e5c Mon Sep 17 00:00:00 2001
From: slava-markovski-unity3d <slava.markovski@unity3d.com>
Date: Wed, 3 Jun 2026 13:08:42 +0200
Subject: [PATCH] fix: use host machine IP for real devices instead of adb
 reverse
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

adb reverse silently fails through ADB relay setups (STF, Headspin,
and any device farm that proxies ADB connections). The reverse tunnel
command exits 0 but is never established on the device side, so
connections to localhost:PORT on the device get nothing and fail with
'unexpected end of stream'.

Using the host machine's public IPv4 directly works for both physical
devices (reachable over Wi-Fi on the same network as the Appium host)
and emulators, with no regression.

Verified on:
- Local AVD (Android emulator) — fix works
- STF with physical Pixel 6 running Android 16 — fix works
---
 src/utils/adb.ts   | 14 ++------------
 src/utils/proxy.ts |  2 +-
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/src/utils/adb.ts b/src/utils/adb.ts
index 3628107..3915393 100644
--- a/src/utils/adb.ts
+++ b/src/utils/adb.ts
@@ -28,14 +28,12 @@ export async function isRealDevice(adb: ADBInstance, udid: UDID): Promise<boolea
 
 /**
  * Configures the global HTTP proxy settings for Wi-Fi traffic on the target Android device via ADB.
- * If a valid proxy configuration is provided:
- * 1. It sets up an 'adb reverse' tunnel for real devices to ensure the device can reach the host-side proxy.
- * 2. It sets the 'http_proxy' global setting to 'IP:PORT'.
+ * If a valid proxy configuration is provided, sets the 'http_proxy' global setting to 'IP:PORT'.
  * If the configuration is invalid or missing, it sets the 'http_proxy' to ':0' (which disables the proxy).
  *
  * @param adb - The ADB instance established by Appium.
  * @param udid - The Unique Device Identifier (UDID) of the Android device or emulator.
- * @param isRealDevice - Boolean indicating if the target is a physical device (requires adb reverse).
+ * @param isRealDevice - Boolean indicating if the target is a physical device.
  * @param proxyConfig - Optional configuration object containing the IP and port for the proxy.
  * @returns A Promise resolving to the output of the final ADB shell command.
  * @throws {Error} Throws an error if any ADB command execution fails.
@@ -65,14 +63,6 @@ export async function configureWifiProxy(
 
     const host = isConfigValid ? `${proxyConfig.ip}:${proxyConfig.port}` : ':0';
 
-    if (isRealDevice && isConfigValid) {
-      await adbExecWithDevice(adb, udid, [
-        'reverse',
-        `tcp:${proxyConfig.port}`,
-        `tcp:${proxyConfig.port}`,
-      ]);
-    }
-
     return await adbExecWithDevice(adb, udid, [
       'shell',
       'settings',
diff --git a/src/utils/proxy.ts b/src/utils/proxy.ts
index c979bf8..2458506 100644
--- a/src/utils/proxy.ts
+++ b/src/utils/proxy.ts
@@ -119,7 +119,7 @@ export async function setupProxyServer(
 ) {
   const certificatePath = prepareCertificate(sessionId, certDirectory);
   const port = await getPort();
-  const _ip = isRealDevice ? 'localhost' : ip.address('public', 'ipv4');
+  const _ip = ip.address('public', 'ipv4');
   const proxy = new Proxy({ deviceUDID, sessionId, certificatePath, port, ip: _ip, previousConfig: currentWifiProxyConfig, whitelistedDomains, blacklistedDomains});
   await proxy.start();
   if (!proxy.isStarted()) {