@xenon-device-management/xenon 2.9.0 → 2.9.2

package/lib/src/device-managers/ios/IOSDiscoveryService.js

@@ -1,43 +1,10 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
@@ -61,10 +28,7 @@ const lodash_1 = require("lodash");
 const appium_ios_device_1 = require("appium-ios-device");
 const appleIdentity_1 = require("./appleIdentity");
 const deviceIdentity_1 = require("../deviceIdentity");
-const helpers_1 = require("../../helpers");
 const logger_1 = __importDefault(require("../../logger"));
-const path_1 = __importDefault(require("path"));
-const fs_extra_1 = __importDefault(require("fs-extra"));
 const device_utils_1 = require("../../device-utils");
 const device_store_1 = require("../../data-service/device-store");
 const PluginContext_1 = require("../../PluginContext");
@@ -161,8 +125,7 @@ let IOSDiscoveryService = class IOSDiscoveryService {
                 try {
                     const existingDevice = existingDeviceDetails.find((device) => device.udid === udid && device.host === ownHost);
                     if (existingDevice) {
-                        const networkIp = yield this.fetchRealDeviceNetworkIp(udid);
-                        return Object.assign(Object.assign({}, existingDevice), { ip: networkIp || (0, networkAddresses_1.sanitizeDeviceNetworkIp)(existingDevice.ip) || '' });
+                        return Object.assign(Object.assign({}, existingDevice), { ip: (0, networkAddresses_1.sanitizeDeviceNetworkIp)(existingDevice.ip) || '' });
                     }
                     return yield this.getDeviceInfo(udid);
                 }
@@ -193,7 +156,6 @@ let IOSDiscoveryService = class IOSDiscoveryService {
             const totalUtilizationTimeMilliSec = yield (0, device_utils_1.getUtilizationTime)(udid);
             let sdk = 'Unknown';
             let name = 'iPhone';
-            const ipAddress = yield this.fetchRealDeviceNetworkIp(udid);
             try {
                 [sdk, name] = yield Promise.all([appium_ios_device_1.utilities.getOSVersion(udid), appium_ios_device_1.utilities.getDeviceName(udid)]);
             }
@@ -212,7 +174,11 @@ let IOSDiscoveryService = class IOSDiscoveryService {
                 mjpegServerPort,
                 udid,
                 sdk,
-                name, ip: ipAddress, busy: false, realDevice: true, deviceType: 'real', cpuArchitecture: 'arm64', platform: (name.toLowerCase().includes('tv') ? 'tvos' : 'ios'), host: host, totalUtilizationTimeMilliSec, sessionStartTime: 0, state: (storeDevice === null || storeDevice === void 0 ? void 0 : storeDevice.state) || 'Unknown', userBlocked: (storeDevice === null || storeDevice === void 0 ? void 0 : storeDevice.userBlocked) || false }, (storeDevice || {})), (0, deviceIdentity_1.nonNullIdentity)(identity));
+                name, 
+                // go-ios can't tell a phone's network address (its lockdown values
+                // carry none), and Xenon reaches a phone only through its forwarded
+                // ports, so nothing asks for it.
+                ip: '', busy: false, realDevice: true, deviceType: 'real', cpuArchitecture: 'arm64', platform: (name.toLowerCase().includes('tv') ? 'tvos' : 'ios'), host: host, totalUtilizationTimeMilliSec, sessionStartTime: 0, state: (storeDevice === null || storeDevice === void 0 ? void 0 : storeDevice.state) || 'Unknown', userBlocked: (storeDevice === null || storeDevice === void 0 ? void 0 : storeDevice.userBlocked) || false }, (storeDevice || {})), (0, deviceIdentity_1.nonNullIdentity)(identity));
         });
     }
     getSimulators() {
@@ -281,33 +247,6 @@ let IOSDiscoveryService = class IOSDiscoveryService {
     resolveNodeLanIp() {
         return (0, networkAddresses_1.resolveAdvertisedBindHost)(this.pluginArgs.bindHostOrIp);
     }
-    fetchRealDeviceNetworkIp(udid) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return (0, networkAddresses_1.sanitizeDeviceNetworkIp)(yield this.fetchIpViaGoIos(udid));
-        });
-    }
-    fetchIpViaGoIos(udid) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const goIOSDir = (0, helpers_1.cachePath)('goIOS');
-            const goIOSPath = path_1.default.join(goIOSDir, 'ios');
-            if (!fs_extra_1.default.existsSync(goIOSPath))
-                return '';
-            const { exec } = yield Promise.resolve().then(() => __importStar(require('child_process')));
-            const { promisify } = yield Promise.resolve().then(() => __importStar(require('util')));
-            const execPromise = promisify(exec);
-            try {
-                const { stdout } = yield execPromise(`"${goIOSPath}" info --udid ${udid}`, {
-                    env: Object.assign(Object.assign({}, process.env), { ENABLE_GO_IOS_AGENT: 'yes' }),
-                });
-                const info = JSON.parse(stdout);
-                return info.IPAddress || '';
-            }
-            catch (e) {
-                logger_1.default.debug(`Failed to fetch IP via go-ios for ${udid}: ${e}`);
-                return '';
-            }
-        });
-    }
     trackIOSDevices() {
         if (this.trackingInitialized)
             return;

package/lib/src/device-managers/ios/IOSStreamService.js

@@ -74,7 +74,6 @@ const fs_extra_1 = __importDefault(require("fs-extra"));
 const tcp_port_used_1 = __importDefault(require("tcp-port-used"));
 const InternalHttpClient_1 = require("../../InternalHttpClient");
 const logger_1 = __importDefault(require("../../logger"));
-const helpers_1 = require("../../helpers");
 const singleFlight_1 = require("../../helpers/singleFlight");
 const PortAllocator_1 = require("../../services/PortAllocator");
 const device_store_1 = require("../../data-service/device-store");
@@ -82,6 +81,7 @@ const ownDeviceRow_1 = require("../ownDeviceRow");
 const iosStreamDiagnostics_1 = require("./iosStreamDiagnostics");
 const tunnelProcess_1 = require("./tunnelProcess");
 const IOSTunnels_1 = require("./IOSTunnels");
+const goIosBinary_1 = require("./goIosBinary");
 const device_service_1 = require("../../data-service/device-service");
 const manualLock_1 = require("../../services/recording/manualLock");
 const recording_store_1 = require("../../services/recording/recording-store");
@@ -119,11 +119,7 @@ let IOSStreamService = class IOSStreamService {
         this.startFlight = new singleFlight_1.SingleFlight();
         this.recoveryCooldowns = new Map(); // Track last recovery attempt time
         this.RECOVERY_COOLDOWN_MS = 30000; // 30s cooldown between recovery attempts
-        // Port-lease TTL for an active stream. Longer than the watchdog interval (1h),
-        // which refreshes it each tick, so a long-lived stream's port never expires
-        // and gets reallocated to another device; stopStream() releases it explicitly.
-        this.STREAM_PORT_TTL_MS = 90 * 60 * 1000; // 1.5h
-        this.goIOSPath = this.getGoIOSPath();
+        this.goIOSPath = (0, goIosBinary_1.goIosBinaryPath)();
         this.startWatchdog();
     }
     /**
@@ -143,8 +139,8 @@ let IOSStreamService = class IOSStreamService {
                     // its ports to another device mid-stream (TTL > this 1h interval).
                     try {
                         const portAllocator = typedi_2.Container.get(PortAllocator_1.PortAllocator);
-                        yield portAllocator.touch(session.wdaPort, this.STREAM_PORT_TTL_MS);
-                        yield portAllocator.touch(session.mjpegPort, this.STREAM_PORT_TTL_MS);
+                        yield portAllocator.touch(session.wdaPort, IOSTunnels_1.IOS_STREAM_LEASE_TTL_MS);
+                        yield portAllocator.touch(session.mjpegPort, IOSTunnels_1.IOS_STREAM_LEASE_TTL_MS);
                         yield this.tunnels().touch(udid);
                     }
                     catch (_a) {
@@ -223,10 +219,6 @@ let IOSStreamService = class IOSStreamService {
             }
         });
     }
-    getGoIOSPath() {
-        const goIOSDir = (0, helpers_1.cachePath)('goIOS');
-        return path_1.default.join(goIOSDir, 'ios');
-    }
     /**
      * Check if go-ios binary exists
      */
@@ -409,9 +401,10 @@ let IOSStreamService = class IOSStreamService {
         });
     }
     /**
-     * Comprehensive process-level and endpoint-level health check.
-     * Principal Intelligence: Differentiates between 'Process dead' and 'Network unreachable'.
-     * If only the tunnel is dead but WDA is alive via IP, it will trigger a tunnel restart.
+     * Comprehensive process-level and endpoint-level health check: WDA and its
+     * forwarders are running, and WDA answers on the stream's own port. Only
+     * that port: WDA names no phone, so nothing that answers elsewhere (a
+     * simulator's address is this Mac's own) is known to be this phone's.
      */
     isStreamResponsive(udid) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -427,78 +420,18 @@ let IOSStreamService = class IOSStreamService {
                 return false;
             }
             if (!isWdaIproxyAlive || !isMjpegIproxyAlive) {
-                logger_1.default.warn(`🛡️ [${udid}] [Watchdog] Tunnel processes are dead. Attempting tunnel-only recovery...`);
-                const device = yield (0, ownDeviceRow_1.findOwnDevice)(udid);
-                if (device && device.ip) {
-                    // Double check if WDA is alive via network IP
-                    const isWdaAccessibleViaNetwork = yield this.isWDARunningOnHost(device.ip, 8100);
-                    if (isWdaAccessibleViaNetwork) {
-                        logger_1.default.info(`🛡️ [${udid}] [Watchdog] WDA is alive on network ${device.ip}. Restarting tunnels...`);
-                        yield this.restartTunnelsOnly(session);
-                        return true; // We healed it!
-                    }
-                }
-                return false; // Cannot heal without network access or if WDA is also dead
+                logger_1.default.warn(`🛡️ [${udid}] [Watchdog] Port forwarder processes are dead.`);
+                return false;
             }
             // 2. Network Check: verify endpoint is responding via tunnel
             const isRespondingViaTunnel = yield this.isWDARunning(session.wdaPort);
             if (!isRespondingViaTunnel) {
-                logger_1.default.warn(`🛡️ [${udid}] [Watchdog] WDA tunnel on port ${session.wdaPort} is unresponsive. checking network...`);
-                const device = yield (0, ownDeviceRow_1.findOwnDevice)(udid);
-                if (device && device.ip) {
-                    const isWdaAccessibleViaNetwork = yield this.isWDARunningOnHost(device.ip, 8100);
-                    if (isWdaAccessibleViaNetwork) {
-                        logger_1.default.info(`🛡️ [${udid}] [Watchdog] WDA is alive on network but tunnel is hung. Restarting tunnels...`);
-                        yield this.restartTunnelsOnly(session);
-                        return true;
-                    }
-                }
+                logger_1.default.warn(`🛡️ [${udid}] [Watchdog] WDA on port ${session.wdaPort} is unresponsive.`);
                 return false;
             }
             return true;
         });
     }
-    /**
-     * Check if WDA is running on a specific host/port
-     */
-    isWDARunningOnHost(host, port) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
-            const axios = (yield Promise.resolve().then(() => __importStar(require('axios')))).default;
-            try {
-                const response = yield axios.get(`http://${host}:${port}/status`, {
-                    timeout: 3000,
-                    validateStatus: (status) => status === 200,
-                });
-                return ((_b = (_a = response.data) === null || _a === void 0 ? void 0 : _a.value) === null || _b === void 0 ? void 0 : _b.ready) === true;
-            }
-            catch (e) {
-                return false;
-            }
-        });
-    }
-    /**
-     * Restarts only the iproxy tunnels without stopping WDA
-     */
-    restartTunnelsOnly(session) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const udid = session.udid;
-            const isolationService = typedi_2.Container.get(ResourceIsolationService_1.ResourceIsolationService);
-            // 1. Kill old tunnels
-            if (session.forwardWDAProcess)
-                session.forwardWDAProcess.kill('SIGKILL');
-            if (session.forwardMJPEGProcess)
-                session.forwardMJPEGProcess.kill('SIGKILL');
-            // 2. Start new tunnels
-            const wdaIproxy = isolationService.wrapSpawn('iproxy', ['-u', udid, `${session.wdaPort}:8100`], 'Performance');
-            const mjpegIproxy = isolationService.wrapSpawn('iproxy', ['-u', udid, `${session.mjpegPort}:9100`], 'Performance');
-            session.forwardWDAProcess = (0, child_process_1.spawn)(wdaIproxy.command, wdaIproxy.args);
-            typedi_2.Container.get(ProcessRegistry_1.ProcessRegistry).track({ kind: 'other', udid, process: session.forwardWDAProcess });
-            session.forwardMJPEGProcess = (0, child_process_1.spawn)(mjpegIproxy.command, mjpegIproxy.args);
-            typedi_2.Container.get(ProcessRegistry_1.ProcessRegistry).track({ kind: 'ios-mjpeg', udid, process: session.forwardMJPEGProcess });
-            logger_1.default.info(`🛡️ [${udid}] [Watchdog] Tunnels restarted successfully.`);
-        });
-    }
     /**
      * Start streaming for a device
      */
@@ -594,7 +527,7 @@ let IOSStreamService = class IOSStreamService {
                     // guarantee a non-colliding port; the lease is refreshed by the watchdog
                     // and released in stopStream().
                     const portAllocator = typedi_2.Container.get(PortAllocator_1.PortAllocator);
-                    const ttl = { ttlMs: this.STREAM_PORT_TTL_MS };
+                    const ttl = { ttlMs: IOSTunnels_1.IOS_STREAM_LEASE_TTL_MS };
                     // Principal Discovery: attach to the WDA an Appium session runs on this
                     // device instead of launching a second one over it. The one exception
                     // to the rule above: that session's forwarder listens on the Device
@@ -1101,7 +1034,9 @@ let IOSStreamService = class IOSStreamService {
      * server owns no legitimate tunnel — i.e. on fresh boot (orphans from a
      * previous run, or a hard-killed / crashed process whose graceful cleanup
      * never ran) or during full shutdown. This is the catch-all that stops the
-     * self-forking go-ios agent storm from surviving across restarts.
+     * self-forking go-ios agent storm from surviving across restarts. It kills
+     * this process's own go-ios calls too, so boot runs it before device
+     * detection starts (ServerManager.reapLeftoverGoIos).
      */
     reapOrphanTunnels() {
         return __awaiter(this, void 0, void 0, function* () {

package/lib/src/device-managers/ios/IOSTunnels.js

@@ -18,7 +18,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.IOSTunnels = exports.TUNNEL_BORROW_IDLE_MS = exports.TUNNEL_CHECK_MS = exports.TUNNEL_LEASE_TTL_MS = exports.TUNNEL_READY_POLL_MS = exports.TUNNEL_READY_TIMEOUT_MS = void 0;
+exports.IOSTunnels = exports.TUNNEL_BORROW_IDLE_MS = exports.TUNNEL_CHECK_MS = exports.IOS_STREAM_LEASE_TTL_MS = exports.TUNNEL_READY_POLL_MS = exports.TUNNEL_READY_TIMEOUT_MS = void 0;
 exports.iosVersionOf = iosVersionOf;
 exports.goIosReason = goIosReason;
 /**
@@ -48,25 +48,26 @@ exports.goIosReason = goIosReason;
 const typedi_1 = require("typedi");
 const child_process_1 = require("child_process");
 const http_1 = __importDefault(require("http"));
-const path_1 = __importDefault(require("path"));
 const util_1 = require("util");
 const logger_1 = __importDefault(require("../../logger"));
-const helpers_1 = require("../../helpers");
 const PortAllocator_1 = require("../../services/PortAllocator");
 const ProcessRegistry_1 = require("../../services/ProcessRegistry");
 const ResourceIsolationService_1 = require("../../services/ResourceIsolationService");
 const iosStreamDiagnostics_1 = require("./iosStreamDiagnostics");
+const goIosBinary_1 = require("./goIosBinary");
 const tunnelProcess_1 = require("./tunnelProcess");
 const execPromise = (0, util_1.promisify)(child_process_1.exec);
 /** How long a new tunnel has to answer for its phone before the start goes on without it. */
 exports.TUNNEL_READY_TIMEOUT_MS = 20000;
 exports.TUNNEL_READY_POLL_MS = 500;
 /**
- * A tunnel's port lease: the same as the stream's own ports
- * (IOSStreamService's STREAM_PORT_TTL_MS). The stream watchdog refreshes both
- * every hour, the tunnel's through {@link IOSTunnels.touch}.
+ * How long an iPhone stream's port leases last: its WDA and MJPEG ports
+ * (IOSStreamService) and its tunnel's pair. Longer than the stream watchdog's
+ * hourly tick, which refreshes them (the tunnel's through
+ * {@link IOSTunnels.touch}), so a long stream never loses its ports to another
+ * phone. Stopping the stream or the tunnel releases them.
  */
-exports.TUNNEL_LEASE_TTL_MS = 90 * 60 * 1000;
+exports.IOS_STREAM_LEASE_TTL_MS = 90 * 60 * 1000;
 /** How often running tunnels are checked for a phone that went away. */
 exports.TUNNEL_CHECK_MS = 5000;
 /**
@@ -126,7 +127,7 @@ let IOSTunnels = class IOSTunnels {
         this.tunnels = new Map();
         this.checking = false;
         this.versionCache = new Map();
-        this.goIOSPath = path_1.default.join((0, helpers_1.cachePath)('goIOS'), 'ios');
+        this.goIOSPath = (0, goIosBinary_1.goIosBinaryPath)();
     }
     /**
      * The phone's tunnel-info port for its stream, starting its tunnel if it
@@ -169,7 +170,7 @@ let IOSTunnels = class IOSTunnels {
             if (version === null || version < 17)
                 return null;
             const port = yield this.allocator().acquirePair('tunnel', udid, {
-                ttlMs: exports.TUNNEL_LEASE_TTL_MS,
+                ttlMs: exports.IOS_STREAM_LEASE_TTL_MS,
             });
             let proc;
             try {
@@ -209,7 +210,9 @@ let IOSTunnels = class IOSTunnels {
                 void this.releasePair(port, udid);
             };
             proc.once('exit', ended);
-            proc.once('error', (err) => {
+            // `on`, not `once`: a second 'error' with no listener left would be
+            // thrown, and take the server down. ended() only acts once.
+            proc.on('error', (err) => {
                 this.log.warn(`[${udid}] go-ios tunnel failed: ${err.message}`);
                 ended();
             });
@@ -230,10 +233,16 @@ let IOSTunnels = class IOSTunnels {
     waitUntilReady(udid, tunnel) {
         return __awaiter(this, void 0, void 0, function* () {
             const { port, process: proc } = tunnel;
-            const polls = exports.TUNNEL_READY_TIMEOUT_MS / exports.TUNNEL_READY_POLL_MS;
-            for (let poll = 0; poll <= polls; poll++) {
-                if (poll > 0)
-                    yield this.sleep(exports.TUNNEL_READY_POLL_MS);
+            // By the clock, not a count of checks: each check can take up to its own
+            // 1 s timeout, which stretched 41 checks to about a minute.
+            const deadline = this.now() + exports.TUNNEL_READY_TIMEOUT_MS;
+            for (let first = true;; first = false) {
+                if (!first) {
+                    const left = deadline - this.now();
+                    if (left <= 0)
+                        break;
+                    yield this.sleep(Math.min(exports.TUNNEL_READY_POLL_MS, left));
+                }
                 if (this.tunnels.get(udid) !== tunnel) {
                     throw new Error(`The go-ios tunnel for ${udid} exited before it was ready (exit code ${proc.exitCode})` +
                         (tunnel.reason ? `: ${tunnel.reason}` : ''));
@@ -376,8 +385,8 @@ let IOSTunnels = class IOSTunnels {
             if (!tunnel)
                 return;
             const allocator = this.allocator();
-            yield allocator.touch(tunnel.port, exports.TUNNEL_LEASE_TTL_MS);
-            yield allocator.touch(tunnel.port + 1, exports.TUNNEL_LEASE_TTL_MS);
+            yield allocator.touch(tunnel.port, exports.IOS_STREAM_LEASE_TTL_MS);
+            yield allocator.touch(tunnel.port + 1, exports.IOS_STREAM_LEASE_TTL_MS);
         });
     }
     releasePair(port, udid) {

package/lib/src/device-managers/ios/WDAClient.js

@@ -92,96 +92,75 @@ let WDAClient = WDAClient_1 = class WDAClient {
             }
             const prefixes = (cached === null || cached === void 0 ? void 0 : cached.sessionId) ? [`/session/${cached.sessionId}`] : ['', '/session/any'];
             let lastError;
-            // Principal Intelligence: Prioritize the host that worked last time.
-            // Usually localhost (tunnel) is fastest, but if it's lagging, network IP is a solid fallback.
-            const hosts = [];
-            if (cached === null || cached === void 0 ? void 0 : cached.host) {
-                hosts.push(cached.host);
-                if (cached.host === '127.0.0.1' && device.ip)
-                    hosts.push(device.ip);
-                if (cached.host !== '127.0.0.1')
-                    hosts.push('127.0.0.1');
-            }
-            else {
-                hosts.push('127.0.0.1');
-                if (device.ip)
-                    hosts.push(device.ip);
-            }
-            for (const targetHost of hosts) {
-                const isNetworkHost = targetHost !== '127.0.0.1';
-                const targetPort = isNetworkHost ? 8100 : port;
-                for (const prefix of prefixes) {
-                    try {
-                        const isSessionless = !(options === null || options === void 0 ? void 0 : options.useSessionPath) &&
-                            (['/status', '/health', '/wda/healthcheck'].includes(endpoint));
-                        const url = `http://${targetHost}:${targetPort}${isSessionless ? '' : prefix}${endpoint}`;
-                        // Principal Stability: Screenshots, activation, and script execution need longer timeouts.
-                        // Heartbeats and Status checks should be snappy to fail-over quickly.
-                        const isHeavyCommand = endpoint.includes('screenshot') ||
-                            endpoint.includes('source') ||
-                            endpoint.includes('swipe') ||
-                            endpoint.includes('touchAndHold') ||
-                            endpoint.includes('activate') ||
-                            endpoint.includes('execute') ||
-                            endpoint.includes('actions');
-                        const timeout = isHeavyCommand ? 30000 : 5000; // Snappy 5s timeout for standard commands
-                        const res = method === 'post'
-                            ? yield axios_1.default.post(url, data || {}, { timeout })
-                            : yield axios_1.default.get(url, { timeout });
-                        // If we reached a host but it returned a logical error (e.g. 404 for session),
-                        // we should update our cache and potentially stop retrying this host/prefix combo.
-                        // However, for simplicity, we treat any successful HTTP response as "Host is alive".
-                        if (isNetworkHost && targetHost !== (cached === null || cached === void 0 ? void 0 : cached.host)) {
-                            this.log.debug(`[WDA] Successful fallback to network IP ${targetHost} for ${udid}`);
-                        }
-                        const sid = ((_a = res.data) === null || _a === void 0 ? void 0 : _a.sessionId) || ((_c = (_b = res.data) === null || _b === void 0 ? void 0 : _b.value) === null || _c === void 0 ? void 0 : _c.sessionId);
-                        if (sid && sid !== (cached === null || cached === void 0 ? void 0 : cached.sessionId)) {
-                            this.log.debug(`[WDA] Detected new session ID: ${sid} via ${targetHost}`);
-                            this.wdaConnectionCache.set(cacheKey, {
-                                host: targetHost,
-                                pathPrefix: `/session/${sid}`,
-                                sessionId: sid,
-                            });
-                            typedi_1.Container.get(IOSStreamService_1.default).setWDASessionId(udid, sid);
-                        }
-                        return res;
+            // Only the phone's own forwarded port. WDA names no phone, so no address
+            // on the network is known to be this phone's: a simulator's is this
+            // Mac's own, where port 8100 can be an iPhone's WDA forward.
+            const targetHost = '127.0.0.1';
+            for (const prefix of prefixes) {
+                try {
+                    const isSessionless = !(options === null || options === void 0 ? void 0 : options.useSessionPath) &&
+                        (['/status', '/health', '/wda/healthcheck'].includes(endpoint));
+                    const url = `http://${targetHost}:${port}${isSessionless ? '' : prefix}${endpoint}`;
+                    // Principal Stability: Screenshots, activation, and script execution need longer timeouts.
+                    // Heartbeats and Status checks should be snappy to fail-over quickly.
+                    const isHeavyCommand = endpoint.includes('screenshot') ||
+                        endpoint.includes('source') ||
+                        endpoint.includes('swipe') ||
+                        endpoint.includes('touchAndHold') ||
+                        endpoint.includes('activate') ||
+                        endpoint.includes('execute') ||
+                        endpoint.includes('actions');
+                    const timeout = isHeavyCommand ? 30000 : 5000; // Snappy 5s timeout for standard commands
+                    const res = method === 'post'
+                        ? yield axios_1.default.post(url, data || {}, { timeout })
+                        : yield axios_1.default.get(url, { timeout });
+                    // If we reached a host but it returned a logical error (e.g. 404 for session),
+                    // we should update our cache and potentially stop retrying this host/prefix combo.
+                    // However, for simplicity, we treat any successful HTTP response as "Host is alive".
+                    const sid = ((_a = res.data) === null || _a === void 0 ? void 0 : _a.sessionId) || ((_c = (_b = res.data) === null || _b === void 0 ? void 0 : _b.value) === null || _c === void 0 ? void 0 : _c.sessionId);
+                    if (sid && sid !== (cached === null || cached === void 0 ? void 0 : cached.sessionId)) {
+                        this.log.debug(`[WDA] Detected new session ID: ${sid} via ${targetHost}`);
+                        this.wdaConnectionCache.set(cacheKey, {
+                            host: targetHost,
+                            pathPrefix: `/session/${sid}`,
+                            sessionId: sid,
+                        });
+                        typedi_1.Container.get(IOSStreamService_1.default).setWDASessionId(udid, sid);
                     }
-                    catch (err) {
-                        lastError = err;
-                        if (err.response) {
-                            const status = err.response.status;
-                            const errorMsg = JSON.stringify(err.response.data);
-                            this.log.info(`[WDA] Command ${method.toUpperCase()} ${endpoint} failed (${status}): ${errorMsg}`);
-                            // Principal Resiliency: Multi-Phase Recovery
-                            if (retryCount < 2) {
-                                // Phase 1: Dead Session Recovery (404)
-                                if (status === 404 && prefix.includes('/session/')) {
-                                    // Special Intelligence: Some WDA versions don't support /execute, /wda/homescreen, etc.
-                                    // We should NOT clear the session if these specific commands fail with 404,
-                                    // as they might just be unsupported features.
-                                    const NON_FATAL_ENDPOINTS = ['execute', 'homescreen', 'pressButton'];
-                                    if (NON_FATAL_ENDPOINTS.some((e) => endpoint.includes(e))) {
-                                        this.log.debug(`[WDA] Command ${endpoint} failed with 404 (Unsupported or Logical Error). Skipping session reset.`);
-                                        throw err;
-                                    }
-                                    this.log.warn(`[WDA] Session ${cached === null || cached === void 0 ? void 0 : cached.sessionId} appears dead. Resetting and retrying...`);
-                                    this.wdaConnectionCache.delete(cacheKey);
-                                    typedi_1.Container.get(IOSStreamService_1.default).setWDASessionId(udid, '');
-                                    return this.performWDACommand(udid, method, endpoint, data, retryCount + 1, options);
-                                }
-                                // Phase 2: Transient State Recovery (500)
-                                // This handles "Focused" errors, "Internal" errors, or transient locks during app switches.
-                                if (status === 500) {
-                                    this.log.warn(`[WDA] Transient error (500) for ${udid}, retrying in 1s... (Reason: ${errorMsg})`);
-                                    yield new Promise((r) => setTimeout(r, 1000));
-                                    return this.performWDACommand(udid, method, endpoint, data, retryCount + 1, options);
+                    return res;
+                }
+                catch (err) {
+                    lastError = err;
+                    if (err.response) {
+                        const status = err.response.status;
+                        const errorMsg = JSON.stringify(err.response.data);
+                        this.log.info(`[WDA] Command ${method.toUpperCase()} ${endpoint} failed (${status}): ${errorMsg}`);
+                        // Principal Resiliency: Multi-Phase Recovery
+                        if (retryCount < 2) {
+                            // Phase 1: Dead Session Recovery (404)
+                            if (status === 404 && prefix.includes('/session/')) {
+                                // Special Intelligence: Some WDA versions don't support /execute, /wda/homescreen, etc.
+                                // We should NOT clear the session if these specific commands fail with 404,
+                                // as they might just be unsupported features.
+                                const NON_FATAL_ENDPOINTS = ['execute', 'homescreen', 'pressButton'];
+                                if (NON_FATAL_ENDPOINTS.some((e) => endpoint.includes(e))) {
+                                    this.log.debug(`[WDA] Command ${endpoint} failed with 404 (Unsupported or Logical Error). Skipping session reset.`);
+                                    throw err;
                                 }
+                                this.log.warn(`[WDA] Session ${cached === null || cached === void 0 ? void 0 : cached.sessionId} appears dead. Resetting and retrying...`);
+                                this.wdaConnectionCache.delete(cacheKey);
+                                typedi_1.Container.get(IOSStreamService_1.default).setWDASessionId(udid, '');
+                                return this.performWDACommand(udid, method, endpoint, data, retryCount + 1, options);
+                            }
+                            // Phase 2: Transient State Recovery (500)
+                            // This handles "Focused" errors, "Internal" errors, or transient locks during app switches.
+                            if (status === 500) {
+                                this.log.warn(`[WDA] Transient error (500) for ${udid}, retrying in 1s... (Reason: ${errorMsg})`);
+                                yield new Promise((r) => setTimeout(r, 1000));
+                                return this.performWDACommand(udid, method, endpoint, data, retryCount + 1, options);
                             }
-                            throw err;
                         }
-                        // If network host fails, don't retry other prefixes if it's just a status check
-                        if (isNetworkHost && ['/status', '/health'].includes(endpoint))
-                            break;
+                        throw err;
                     }
                 }
             }

package/lib/src/device-managers/ios/goIosBinary.js

@@ -0,0 +1,16 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.goIosBinaryPath = goIosBinaryPath;
+const path_1 = __importDefault(require("path"));
+const helpers_1 = require("../../helpers");
+/**
+ * The go-ios binary Xenon vendors, where src/scripts/install-go-ios.ts puts
+ * it. Every go-ios command Xenon runs uses this one path: the boot and
+ * shutdown reaps find go-ios processes by it.
+ */
+function goIosBinaryPath() {
+    return path_1.default.join((0, helpers_1.cachePath)('goIOS'), 'ios');
+}

package/lib/src/plugin.js

@@ -157,16 +157,8 @@ class XenonPlugin extends base_plugin_1.default {
             catch (err) {
                 logger_1.default.warn(`[plugin] RecordingOrchestrator.recoverOnBoot failed: ${err === null || err === void 0 ? void 0 : err.message}`);
             }
-            // Reap orphan go-ios tunnels left by a previous run or a hard-killed/crashed
-            // process. A fresh server owns no tunnels, so any surviving go-ios agents are
-            // orphans that would otherwise keep self-forking into a runaway process storm.
-            try {
-                const { default: IOSStreamService } = yield Promise.resolve().then(() => __importStar(require('./device-managers/ios/IOSStreamService')));
-                yield typedi_1.Container.get(IOSStreamService).reapOrphanTunnels();
-            }
-            catch (err) {
-                logger_1.default.warn(`[plugin] IOSStreamService.reapOrphanTunnels failed: ${err === null || err === void 0 ? void 0 : err.message}`);
-            }
+            // Leftover go-ios is reaped by ServerManager.updateServer, before device
+            // detection starts: here, the reap killed detection's own go-ios calls.
         });
     }
     createSession(next, driver, jwpDesCaps, jwpReqCaps, caps) {

package/lib/src/services/PortAllocator.js

@@ -291,9 +291,16 @@ let PortAllocator = class PortAllocator {
                 .catch(() => undefined);
         });
     }
+    /**
+     * Delete a phone's leases when a session on it ends. Not its go-ios
+     * tunnel's pair: the phone's stream, and so its tunnel, can outlive the
+     * session, and IOSTunnels gives the pair back when the tunnel stops.
+     */
     releaseForUdid(udid) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield prisma_1.prisma.portLease.deleteMany({ where: { leasedToUdid: udid } });
+            yield prisma_1.prisma.portLease.deleteMany({
+                where: { leasedToUdid: udid, purpose: { not: 'tunnel' } },
+            });
         });
     }
     purgeExpired() {