fix: Respect adb settings provided to the driver (#19)

Author: mykola-mokhnach

src/android.ts

@@ -23,20 +23,16 @@ export const startAndroidSession = async (
 };
 
 export async function androidPortForward(
-  udid: string,
+  adb: ADB,
   systemPort: number,
   devicePort: number,
 ) {
-  let adb = new ADB();
-  if (udid) adb.setDeviceId(udid);
   await adb.forwardPort(systemPort!, devicePort);
 }
 
 export async function androidRemovePortForward(
-  udid: string,
+  adb: ADB,
   systemPort: number,
 ) {
-  let adb = new ADB();
-  if (udid) adb.setDeviceId(udid);
   await adb.removePortForward(systemPort);
 }

src/driver.ts

@@ -31,7 +31,7 @@ import {
 import { W3C_WEB_ELEMENT_IDENTIFIER } from '@appium/support/build/lib/util';
 import { androidPortForward, androidRemovePortForward } from './android';
 import { iosPortForward, iosRemovePortForward } from './iOS';
-import { sleep } from 'asyncbox';
+import type { PortForwardCallback, PortReleaseCallback } from './types';
 
 export class AppiumFlutterDriver extends BaseDriver<FlutterDriverConstraints> {
   // @ts-ignore
@@ -228,17 +228,25 @@ export class AppiumFlutterDriver extends BaseDriver<FlutterDriverConstraints> {
         ? this.proxydriver.opts.appPackage!
         : this.proxydriver.opts.bundleId!;
 
-    let portcallbacks = {};
+    const portcallbacks: {
+      portForwardCallback?: PortForwardCallback,
+      portReleaseCallback?: PortReleaseCallback,
+    } = {};
     if (this.proxydriver instanceof AndroidUiautomator2Driver) {
-      portcallbacks = {
-        portForwardCallback: androidPortForward,
-        portReleaseCallback: androidRemovePortForward,
-      };
+      portcallbacks.portForwardCallback = async (_: string, systemPort: number, devicePort: number) => await androidPortForward(
+        // @ts-ignore ADB instance is ok
+        (this.proxydriver as AndroidUiautomator2Driver).adb,
+        systemPort,
+        devicePort
+      );
+      portcallbacks.portReleaseCallback = async (_: string, systemPort: number) => await androidRemovePortForward(
+        // @ts-ignore ADB instance is ok
+        (this.proxydriver as AndroidUiautomator2Driver).adb,
+        systemPort
+      );
     } else if (this.proxydriver.isRealDevice()) {
-      portcallbacks = {
-        portForwardCallback: iosPortForward,
-        portReleaseCallback: iosRemovePortForward,
-      };
+      portcallbacks.portForwardCallback = iosPortForward;
+      portcallbacks.portReleaseCallback = iosRemovePortForward;
     }
     const flutterCaps: DriverCaps<FlutterDriverConstraints> = {
       flutterServerLaunchTimeout: this.internalCaps.flutterServerLaunchTimeout || 5000,

src/types.ts

@@ -0,0 +1,2 @@
+export type PortForwardCallback = (udid: string, systemPort: number, devicePort: number) => any;
+export type PortReleaseCallback = (udid: string, systemPort: number) => any;

src/utils.ts

@@ -6,6 +6,7 @@ import { waitForCondition } from 'asyncbox';
 import { JWProxy } from '@appium/base-driver';
 import { desiredCapConstraints } from './desiredCaps';
 import { DriverCaps } from '@appium/types';
+import type { PortForwardCallback, PortReleaseCallback } from './types';
 
 const DEVICE_PORT_RANGE = [9000, 9020];
 const SYSTEM_PORT_RANGE = [10000, 11000];
@@ -99,12 +100,8 @@ export async function fetchFlutterServerPort({
 }: {
   udid: string;
   systemPort?: number | null;
-  portForwardCallback?: (
-    udid: string,
-    systemPort: number,
-    devicePort: number,
-  ) => any;
-  portReleaseCallback?: (udid: string, systemPort: number) => any;
+  portForwardCallback?: PortForwardCallback;
+  portReleaseCallback?: PortReleaseCallback;
   packageName: string;
   flutterCaps: DriverCaps<FlutterDriverConstraints>;
 }): Promise<number | null> {