@houwert/conductor 0.30.0 → 0.32.0

package/dist/commands/install-app.js

@@ -8,6 +8,7 @@ const sdk_js_1 = require("../android/sdk.js");
 const session_js_1 = require("../session.js");
 const output_js_1 = require("../output.js");
 const bootstrap_js_1 = require("../drivers/bootstrap.js");
+const devicectl_js_1 = require("../drivers/devicectl.js");
 const cli_js_1 = require("../drivers/vega/cli.js");
 async function resolveDeviceId(sessionName) {
     if (sessionName !== 'default')
@@ -46,10 +47,21 @@ async function installApp(appPath, opts = {}, sessionName = 'default') {
         }
     }
     else if (platform === 'ios' || platform === 'tvos') {
-        const result = await (0, runner_js_1.spawnCommand)('xcrun', ['simctl', 'install', deviceId, appPath]);
-        if (!result.success) {
-            (0, output_js_1.printError)(`install-app failed: ${result.stderr}`, opts);
-            return 1;
+        if ((await (0, bootstrap_js_1.detectDeviceKind)(deviceId)) === 'physical') {
+            try {
+                await (0, devicectl_js_1.installApp)(deviceId, appPath);
+            }
+            catch (e) {
+                (0, output_js_1.printError)(`install-app failed: ${e instanceof Error ? e.message : String(e)}`, opts);
+                return 1;
+            }
+        }
+        else {
+            const result = await (0, runner_js_1.spawnCommand)('xcrun', ['simctl', 'install', deviceId, appPath]);
+            if (!result.success) {
+                (0, output_js_1.printError)(`install-app failed: ${result.stderr}`, opts);
+                return 1;
+            }
         }
     }
     else {

package/dist/commands/list-apps.js

@@ -8,6 +8,7 @@ const sdk_js_1 = require("../android/sdk.js");
 const session_js_1 = require("../session.js");
 const output_js_1 = require("../output.js");
 const bootstrap_js_1 = require("../drivers/bootstrap.js");
+const devicectl_js_1 = require("../drivers/devicectl.js");
 const cli_js_1 = require("../drivers/vega/cli.js");
 async function resolveDeviceId(sessionName) {
     if (sessionName !== 'default')
@@ -38,6 +39,16 @@ async function listApps(opts = {}, sessionName = 'default') {
         // Vega is driven through Amazon's CLI, not adb; strip the `vega:` id prefix.
         appIds = (await new cli_js_1.VegaCli(deviceId.replace(/^vega:/, '')).listInstalledApps()).sort();
     }
+    else if ((platform === 'ios' || platform === 'tvos') &&
+        (await (0, bootstrap_js_1.detectDeviceKind)(deviceId)) === 'physical') {
+        try {
+            appIds = (await (0, devicectl_js_1.listApps)(deviceId)).map((a) => a.id).sort();
+        }
+        catch (e) {
+            (0, output_js_1.printError)(`list-apps failed: ${e instanceof Error ? e.message : String(e)}`, opts);
+            return 1;
+        }
+    }
     else if (platform === 'ios' || platform === 'tvos') {
         const result = await (0, runner_js_1.spawnCommand)('bash', [
             '-c',

package/dist/commands/list-devices.js

@@ -18,6 +18,7 @@ const protocol_js_1 = require("../daemon/protocol.js");
 const cli_js_1 = require("../drivers/vega/cli.js");
 const discovery_js_1 = require("../drivers/roku/discovery.js");
 const cdp_discovery_js_1 = require("../drivers/cdp-discovery.js");
+const devicectl_js_1 = require("../drivers/devicectl.js");
 // Captured during discoverAvailableDevices so listDevices() can report it.
 // Module-scoped because the discover function returns Device[]; bolting an
 // extra return field onto the public type would ripple beyond this fix.
@@ -110,6 +111,18 @@ async function discoverBootedDevices() {
             }
         }
     }
+    // Physical iOS/tvOS devices: paired and reachable is the closest analogue to
+    // a booted simulator — that's when conductor can actually drive them.
+    for (const d of await (0, devicectl_js_1.listPhysicalDevices)()) {
+        if (!d.available)
+            continue;
+        devices.push({
+            id: d.identifier,
+            name: d.name,
+            platform: d.platform,
+            status: d.developerModeEnabled ? 'connected' : 'developer mode off',
+        });
+    }
     // Vega (Amazon Fire TV): booted devices reported by the vega CLI. Best-effort —
     // the CLI is absent unless the Vega SDK is installed.
     try {
@@ -166,6 +179,18 @@ async function discoverAvailableDevices() {
             // ignore parse errors
         }
     }
+    // Physical devices that aren't currently reachable — listed so users can see
+    // why a device they expect is missing.
+    for (const d of await (0, devicectl_js_1.listPhysicalDevices)()) {
+        if (d.available)
+            continue;
+        devices.push({
+            id: d.identifier,
+            name: d.name,
+            platform: d.platform,
+            status: 'unavailable',
+        });
+    }
     // Android: list available AVDs
     const emu = await (0, runner_js_1.spawnCommand)((0, sdk_js_1.resolveAndroidTool)('emulator'), ['-list-avds'], {
         env: (0, sdk_js_1.androidSpawnEnv)(),

package/dist/commands/metro.js

@@ -3,12 +3,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.HELP = void 0;
 exports.metroStop = metroStop;
 exports.metroReload = metroReload;
+exports.normalizeMetroLocation = normalizeMetroLocation;
+exports.metroUse = metroUse;
 exports.HELP = `  metro stop [--port N]                Stop the Metro bundler process on a port (default 8081)
-  metro reload [--port N] [--target N]  Reload the JS bundle without restarting native`;
+  metro reload [--port N] [--target N]  Reload the JS bundle without restarting native
+  metro use <port|host:port> [<appId>]  Point an RN app at a Metro other than its compiled-in one
+  metro use --reset [<appId>]           Drop the override, back to the compiled-in port`;
 const child_process_1 = require("child_process");
 const output_js_1 = require("../output.js");
 const metro_cdp_js_1 = require("../drivers/metro-cdp.js");
 const bootstrap_js_1 = require("../drivers/bootstrap.js");
+const runner_js_1 = require("../runner.js");
+const session_js_1 = require("../session.js");
 async function pidsOnPort(port) {
     return new Promise((resolve) => {
         const proc = (0, child_process_1.spawn)('lsof', ['-ti', `tcp:${port}`], {
@@ -109,3 +115,133 @@ async function metroReload(opts, sessionName, metroOpts) {
         }
     }
 }
+/**
+ * NSUserDefaults key RCTBundleURLProvider reads before falling back to the
+ * RCT_METRO_PORT baked into React-Core at pod-install time. Writing it is the
+ * only way to move a build onto another port without recompiling.
+ */
+const JS_LOCATION_KEY = 'RCT_jsLocation';
+/**
+ * `8102` → `localhost:8102`. Also tolerates a pasted `http://host:port/`.
+ *
+ * Takes a number too: minimist turns a bare port argument into one.
+ */
+function normalizeMetroLocation(raw) {
+    const trimmed = String(raw)
+        .trim()
+        .replace(/^https?:\/\//, '')
+        .replace(/\/+$/, '');
+    const match = trimmed.match(/^(?:([A-Za-z0-9._-]+):)?(\d+)$/);
+    if (!match) {
+        throw new Error(`invalid location "${raw}" — expected <port> or <host:port>`);
+    }
+    const [, host = 'localhost', rawPort] = match;
+    const port = Number(rawPort);
+    if (port < 1 || port > 65535) {
+        throw new Error(`invalid port "${rawPort}" in "${raw}" — expected 1-65535`);
+    }
+    return `${host}:${port}`;
+}
+async function isPackagerRunning(location) {
+    try {
+        const res = await fetch(`http://${location}/status`, {
+            signal: AbortSignal.timeout(2000),
+        });
+        return res.ok && (await res.text()).includes('packager-status:running');
+    }
+    catch {
+        return false;
+    }
+}
+/**
+ * Point a React Native app at a specific Metro by writing RCTBundleURLProvider's
+ * `RCT_jsLocation` default into the app's preferences on a simulator.
+ *
+ * The port an app asks for is compiled into React-Core from `RCT_METRO_PORT` at
+ * pod-install time, so a build made against the wrong port (a git worktree with
+ * its own Metro, a pod install from a shell missing the env var) keeps asking
+ * for the old one until it is recompiled. This override survives reinstalls and
+ * needs no rebuild.
+ */
+async function metroUse(opts, sessionName, useOpts) {
+    const deviceId = sessionName && sessionName !== 'default' ? sessionName : await (0, runner_js_1.detectFirstDevice)();
+    if (!deviceId) {
+        (0, output_js_1.printError)('metro use: no device found. Pass --device <id> or boot a simulator.', opts);
+        return 1;
+    }
+    const platform = await (0, bootstrap_js_1.detectPlatform)(deviceId).catch(() => undefined);
+    if (platform !== 'ios' && platform !== 'tvos') {
+        (0, output_js_1.printError)(`metro use: only iOS/tvOS simulators are supported (device is ${platform ?? 'unknown'}).\n` +
+            'On Android, map the port instead: adb -s <serial> reverse tcp:8081 tcp:<metro-port>', opts);
+        return 1;
+    }
+    const kind = await (0, bootstrap_js_1.detectDeviceKind)(deviceId).catch(() => undefined);
+    if (kind === 'physical') {
+        (0, output_js_1.printError)('metro use: physical devices read their packager host from the bundled ip.txt, ' +
+            'not from simulator defaults. Set it from the in-app dev menu instead.', opts);
+        return 1;
+    }
+    const appId = useOpts.appId ?? (await (0, session_js_1.getSession)(sessionName)).appId;
+    if (!appId) {
+        (0, output_js_1.printError)('metro use: no appId given and no active session. Run launch-app first.', opts);
+        return 1;
+    }
+    if (useOpts.reset) {
+        // `defaults delete` exits non-zero when the key was never written, which is
+        // the same end state the caller asked for.
+        await (0, runner_js_1.spawnCommand)('xcrun', [
+            'simctl',
+            'spawn',
+            deviceId,
+            'defaults',
+            'delete',
+            appId,
+            JS_LOCATION_KEY,
+        ]);
+        if (opts.json)
+            (0, output_js_1.printData)({ appId, deviceId, location: null, reset: true }, opts);
+        else
+            (0, output_js_1.printSuccess)(`Cleared Metro override for "${appId}" — relaunch the app to apply`, opts);
+        return 0;
+    }
+    if (!useOpts.location) {
+        (0, output_js_1.printError)('Usage: conductor metro use <port|host:port> [<appId>] | metro use --reset', opts);
+        return 1;
+    }
+    let location;
+    try {
+        location = normalizeMetroLocation(useOpts.location);
+    }
+    catch (err) {
+        (0, output_js_1.printError)(`metro use: ${err instanceof Error ? err.message : String(err)}`, opts);
+        return 1;
+    }
+    const running = await isPackagerRunning(location);
+    const result = await (0, runner_js_1.spawnCommand)('xcrun', [
+        'simctl',
+        'spawn',
+        deviceId,
+        'defaults',
+        'write',
+        appId,
+        JS_LOCATION_KEY,
+        location,
+    ]);
+    if (!result.success) {
+        (0, output_js_1.printError)(`metro use: could not write ${JS_LOCATION_KEY} for "${appId}"\n${result.stderr}`, opts);
+        return 1;
+    }
+    if (!running) {
+        // RCTBundleURLProvider drops a stored location when nothing answers there,
+        // so the app would silently fall back to its compiled-in port.
+        process.stderr.write(`warning: no packager answered at ${location}; the app falls back to its ` +
+            'compiled-in port until Metro is up there.\n');
+    }
+    if (opts.json) {
+        (0, output_js_1.printData)({ appId, deviceId, location, packagerRunning: running, reset: false }, opts);
+    }
+    else {
+        (0, output_js_1.printSuccess)(`"${appId}" → ${location} — relaunch the app to apply`, opts);
+    }
+    return 0;
+}

package/dist/commands/press-key.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ANDROID_KEYCODE = exports.VALID_KEYS = exports.HELP = void 0;
+exports.ANDROID_KEYCODE = exports.TVOS_REMOTE_BUTTONS = exports.VALID_KEYS = exports.HELP = void 0;
 exports.dispatchKey = dispatchKey;
 exports.pressKey = pressKey;
 exports.HELP = `  press-key <key>                     Press a key (Enter, Backspace, Home, ...)
@@ -59,6 +59,12 @@ exports.VALID_KEYS = [
     'Remote Info',
     'Remote Instant Replay',
     'Remote Search',
+    'Remote Page Up',
+    'Remote Page Down',
+    'Remote Guide',
+    'Remote TV Provider',
+    'Remote One Two Three',
+    'Remote Four Colors',
 ];
 // iOS XCTest pressKey accepts these values (maps to XCUIKeyboardKey)
 const IOS_KEY_MAP = {
@@ -74,7 +80,9 @@ const IOS_BUTTON_MAP = {
     Power: 'lock',
 };
 // tvOS remote: map key names to pressButton values
-const TVOS_REMOTE_BUTTONS = {
+// Page Up/Down and Guide need tvOS 14.3; the last three need tvOS 18.1. The
+// driver reports a precondition error when the device's OS is older.
+exports.TVOS_REMOTE_BUTTONS = {
     'Remote Dpad Up': 'up',
     'Remote Dpad Down': 'down',
     'Remote Dpad Left': 'left',
@@ -82,6 +90,12 @@ const TVOS_REMOTE_BUTTONS = {
     'Remote Dpad Center': 'select',
     'Remote Menu': 'menu',
     'Remote Media Play Pause': 'playPause',
+    'Remote Page Up': 'pageUp',
+    'Remote Page Down': 'pageDown',
+    'Remote Guide': 'guide',
+    'Remote TV Provider': 'tvProvider',
+    'Remote One Two Three': 'oneTwoThree',
+    'Remote Four Colors': 'fourColors',
 };
 // vega (Amazon Fire TV) remote: map key names to VegaDriver button values.
 const VEGA_REMOTE_BUTTONS = {
@@ -139,6 +153,10 @@ exports.ANDROID_KEYCODE = {
     'Remote Info': 165,
     'Remote Instant Replay': 273, // KEYCODE_MEDIA_SKIP_BACKWARD
     'Remote Search': 84,
+    // Paging keys — the fast way through a long list. Whether a given app honours
+    // them varies, the same as on tvOS.
+    'Remote Page Up': 92,
+    'Remote Page Down': 93,
 };
 /**
  * Send `key` on an already-connected driver. Split out of `pressKey` so
@@ -148,7 +166,7 @@ exports.ANDROID_KEYCODE = {
 async function dispatchKey(driver, matched, holdSeconds) {
     if (driver instanceof ios_js_1.IOSDriver) {
         if (driver.platform === 'tvos') {
-            const tvosButton = TVOS_REMOTE_BUTTONS[matched];
+            const tvosButton = exports.TVOS_REMOTE_BUTTONS[matched];
             const iosButton = IOS_BUTTON_MAP[matched];
             if (tvosButton) {
                 await driver.pressButton(tvosButton, holdSeconds);

package/dist/commands/stop-device.js

@@ -10,6 +10,7 @@ const sdk_js_1 = require("../android/sdk.js");
 const output_js_1 = require("../output.js");
 const client_js_1 = require("../daemon/client.js");
 const list_devices_js_1 = require("./list-devices.js");
+const bootstrap_js_1 = require("../drivers/bootstrap.js");
 // ── iOS / tvOS ───────────────────────────────────────────────────────────────
 async function shutdownSimulator(udid) {
     const result = await (0, runner_js_1.spawnCommand)('xcrun', ['simctl', 'shutdown', udid]);
@@ -55,7 +56,12 @@ async function stopDevice(nameOrId, opts, flags) {
             if (d.platform === 'roku' && !includeRoku)
                 continue;
             try {
-                if (d.platform === 'ios' || d.platform === 'tvos') {
+                if ((d.platform === 'ios' || d.platform === 'tvos') &&
+                    (await (0, bootstrap_js_1.detectDeviceKind)(d.id)) === 'physical') {
+                    // Real hardware can't be shut down from here — just release our driver.
+                    await (0, client_js_1.stopDaemon)(d.id);
+                }
+                else if (d.platform === 'ios' || d.platform === 'tvos') {
                     await shutdownSimulator(d.id);
                 }
                 else if (d.platform === 'android') {
@@ -101,7 +107,12 @@ async function stopDevice(nameOrId, opts, flags) {
         return 1;
     }
     try {
-        if (match.platform === 'ios' || match.platform === 'tvos') {
+        if ((match.platform === 'ios' || match.platform === 'tvos') &&
+            (await (0, bootstrap_js_1.detectDeviceKind)(match.id)) === 'physical') {
+            // Real hardware can't be shut down from here — just release our driver.
+            await (0, client_js_1.stopDaemon)(match.id);
+        }
+        else if (match.platform === 'ios' || match.platform === 'tvos') {
             await shutdownSimulator(match.id);
         }
         else if (match.platform === 'android') {

package/dist/commands/swipe.js

@@ -26,8 +26,10 @@ async function swipe(direction, opts = {}, sessionName = 'default', flags = {})
     }
     const result = await (0, runner_js_1.runDirect)(async (driver) => {
         if (driver instanceof ios_js_1.IOSDriver && driver.platform === 'tvos') {
-            throw new Error('swipe is not supported on tvOS — Apple TV uses focus-based navigation.\n' +
-                'Use press-key to navigate (e.g. conductor press-key left).');
+            throw new Error('swipe is not supported on tvOS — XCTest has no Siri Remote touch-surface\n' +
+                'gesture ("Swipe events are only implemented for iOS, visionOS, and watchOS").\n' +
+                'Navigate with press-key "Remote Dpad Left"/"Right"/"Up"/"Down", or cover\n' +
+                'long lists faster with press-key "Remote Page Up"/"Remote Page Down".');
         }
         let startX, startY, endX, endY;
         if (driver instanceof ios_js_1.IOSDriver) {

package/dist/daemon/input-backends.js

@@ -34,6 +34,15 @@ const IOS_BUTTON = {
     ArrowDown: 'down',
     ArrowLeft: 'left',
     ArrowRight: 'right',
+    // Newer remote buttons; the driver rejects these on older tvOS.
+    pageUp: 'pageUp',
+    PageUp: 'pageUp',
+    pageDown: 'pageDown',
+    PageDown: 'pageDown',
+    guide: 'guide',
+    tvProvider: 'tvProvider',
+    oneTwoThree: 'oneTwoThree',
+    fourColors: 'fourColors',
 };
 function iosBackend(driver) {
     let size = null;
@@ -52,7 +61,23 @@ function iosBackend(driver) {
                 touch: true,
                 drag: true,
                 multitouch: true,
-                buttons: ['home', 'lock'],
+                // Advertise what this platform actually accepts so clients can hide
+                // controls rather than discover failures at press time.
+                buttons: tvos
+                    ? [
+                        'home',
+                        'menu',
+                        'select',
+                        'up',
+                        'down',
+                        'left',
+                        'right',
+                        'playPause',
+                        'pageUp',
+                        'pageDown',
+                        'guide',
+                    ]
+                    : ['home', 'lock'],
                 keyboard: true,
                 text: true,
                 tvRemote: tvos,

package/dist/daemon/log-collector.js

@@ -35,6 +35,7 @@ const android_js_1 = require("../drivers/log-sources/android.js");
 const vega_js_1 = require("../drivers/log-sources/vega.js");
 const metro_js_1 = require("../drivers/log-sources/metro.js");
 const metro_discovery_js_1 = require("../drivers/log-sources/metro-discovery.js");
+const bootstrap_js_1 = require("../drivers/bootstrap.js");
 const MAX_BUFFER = 5000;
 const RESTART_DELAY_MS = 2000;
 const WEB_POLL_INTERVAL_MS = 500;
@@ -145,6 +146,11 @@ class LogCollector {
             return;
         try {
             if (this.platform === 'ios' || this.platform === 'tvos') {
+                // `simctl spawn ... log stream` has no devicectl equivalent, so OS logs
+                // are simulator-only. Metro still streams over the network below, which
+                // is the useful source for React Native apps anyway.
+                if ((await (0, bootstrap_js_1.detectDeviceKind)(this.deviceId)) === 'physical')
+                    return;
                 this.source = new ios_js_1.IOSLogSource(this.deviceId, this.appId);
             }
             else if (this.platform === 'android') {

package/dist/daemon/server.js

@@ -84,6 +84,20 @@ function dlog(msg) {
 // ── Driver lifecycle ──────────────────────────────────────────────────────────
 let driverPort = 1075;
 let driverPlatform = 'ios';
+/**
+ * Host the driver is reachable on. Simulators and every non-Apple platform use
+ * the host's loopback; a physical device runs the driver on its own, so we talk
+ * to it over the network. Memoised — resolution goes through mDNS.
+ */
+let _driverHost = null;
+async function driverHost() {
+    if (_driverHost)
+        return _driverHost;
+    if (driverPlatform !== 'ios' && driverPlatform !== 'tvos')
+        return '127.0.0.1';
+    _driverHost = await (0, bootstrap_js_1.resolveDriverHost)(sessionName).catch(() => '127.0.0.1');
+    return _driverHost;
+}
 let logCollector = null;
 let inputServer = null;
 let inputPort = null;
@@ -109,7 +123,7 @@ async function startInputServerForPlatform() {
         makeBackend = () => (0, input_backends_js_1.androidBackend)(driver);
     }
     else {
-        const driver = new ios_js_1.IOSDriver(driverPort, '127.0.0.1', sessionName, driverPlatform);
+        const driver = new ios_js_1.IOSDriver(driverPort, await driverHost(), sessionName, driverPlatform, (await (0, bootstrap_js_1.detectDeviceKind)(sessionName)) === 'physical');
         makeBackend = () => (0, input_backends_js_1.iosBackend)(driver);
         // Opt-in native held-touch backend for live drags (iOS only; single-touch).
         if (driverPlatform === 'ios' && process.env.CONDUCTOR_IOS_HID === '1') {
@@ -154,6 +168,12 @@ async function startVideoServerForPlatform() {
         return;
     if (driverPlatform !== 'ios' && driverPlatform !== 'tvos')
         return;
+    // Capture attaches to the Simulator's framebuffer via SimulatorKit, which has
+    // no counterpart on real hardware.
+    if ((await (0, bootstrap_js_1.detectDeviceKind)(sessionName)) === 'physical') {
+        dlog('video capture is simulator-only — stream server disabled for this device');
+        return;
+    }
     const binary = await (0, bootstrap_js_1.getCaptureBinaryPath)();
     if (!binary) {
         dlog('video capture binary not present — stream server disabled for this device');
@@ -189,11 +209,13 @@ async function ensureDriverRunning() {
         probe.close();
     }
     else {
-        // 'ios', 'tvos', and 'web' all use an HTTP server — port open = alive
-        alive = await (0, bootstrap_js_1.isPortOpen)(driverPort);
+        // 'ios', 'tvos', and 'web' all use an HTTP server — port open = alive.
+        // Physical devices answer on the LAN rather than the host's loopback.
+        alive = await (0, bootstrap_js_1.isPortOpen)(driverPort, await driverHost());
     }
     if (!alive) {
         if ((driverPlatform === 'ios' || driverPlatform === 'tvos') &&
+            (await (0, bootstrap_js_1.detectDeviceKind)(sessionName)) === 'simulator' &&
             !(await (0, bootstrap_js_1.isSimulatorBooted)(sessionName))) {
             dlog(`Simulator ${sessionName} is not booted — skipping driver restart`);
             return;
@@ -201,7 +223,11 @@ async function ensureDriverRunning() {
         _restartInProgress = true;
         dlog(`Driver on port ${driverPort} not responding — restarting`);
         try {
-            if (driverPlatform === 'ios') {
+            if ((driverPlatform === 'ios' || driverPlatform === 'tvos') &&
+                (await (0, bootstrap_js_1.detectDeviceKind)(sessionName)) === 'physical') {
+                await (0, bootstrap_js_1.startDeviceDriver)(sessionName, driverPlatform, driverPort);
+            }
+            else if (driverPlatform === 'ios') {
                 await (0, bootstrap_js_1.startIOSDriver)(sessionName, driverPort);
             }
             else if (driverPlatform === 'tvos') {
@@ -333,7 +359,10 @@ async function main() {
             else {
                 dlog(`Stopping driver on port ${driverPort}`);
                 try {
-                    if (driverPlatform === 'ios') {
+                    if (driverPlatform === 'ios' && (await (0, bootstrap_js_1.detectDeviceKind)(sessionName)) === 'physical') {
+                        await (0, bootstrap_js_1.stopDeviceDriver)(sessionName, 'ios');
+                    }
+                    else if (driverPlatform === 'ios') {
                         await (0, bootstrap_js_1.stopIOSDriver)(sessionName);
                     }
                     else {
@@ -510,7 +539,7 @@ async function startDriverForPlatform(platform) {
     }
     else {
         // 'ios', 'tvos', and 'web' all use an HTTP server — port open = alive
-        driverAlive = await (0, bootstrap_js_1.isPortOpen)(driverPort);
+        driverAlive = await (0, bootstrap_js_1.isPortOpen)(driverPort, await driverHost());
     }
     if (driverAlive) {
         _driverStarted = true;
@@ -533,7 +562,11 @@ async function startDriverForPlatform(platform) {
     }
     dlog(`Starting ${platform} driver on port ${driverPort}`);
     try {
-        if (platform === 'ios') {
+        if ((platform === 'ios' || platform === 'tvos') &&
+            (await (0, bootstrap_js_1.detectDeviceKind)(sessionName)) === 'physical') {
+            await (0, bootstrap_js_1.startDeviceDriver)(sessionName, platform, driverPort);
+        }
+        else if (platform === 'ios') {
             await (0, bootstrap_js_1.startIOSDriver)(sessionName, driverPort);
         }
         else if (platform === 'tvos') {