Skip to content

fix: use host machine IP for real devices instead of adb reverse #94

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
slava-markovski-unity wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: use host machine IP for real devices instead of adb reverse #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 2 additions & 12 deletions src/utils/adb.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion src/utils/proxy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()) {
Expand Down