@yoqa/runner 1.0.6 → 1.0.7

package/dist/index.js

@@ -27918,6 +27918,8 @@ function installedBrowserId(browser) {
 function everydayBrowserId(browser) {
   return `web-${browser}-everyday`;
 }
+var REMOTE_DEBUGGING_SETTING_URL = "chrome://inspect/#remote-debugging";
+var EVERYDAY_ALLOW_TIMEOUT_MS = 60000;
 function webBrowserOf(deviceId) {
   return WEB_BROWSERS.find(({ browser }) => deviceId === installedBrowserId(browser) || deviceId === everydayBrowserId(browser));
 }
@@ -28149,7 +28151,9 @@ async function launchChromium(browser, deps = {}, request = {}) {
 }
 
 // src/domains/devices/chromium-everyday.ts
+import { execFile } from "child_process";
 import { join as join3 } from "path";
+import { promisify } from "util";
 
 // src/domains/devices/cdp-client.ts
 class CdpClosedError extends Error {
@@ -28339,9 +28343,15 @@ async function findEverydayBrowsers(deps = discoveryDeps()) {
   const roots = ["/Applications", join3(deps.home, "Applications")];
   const found = await Promise.all(EVERYDAY_BROWSERS.map(async ({ id, name, app, userData }) => {
     for (const root of roots) {
-      if (!await deps.isExecutable(join3(root, `${app}.app`, "Contents/MacOS", app)))
+      const executable = join3(root, `${app}.app`, "Contents/MacOS", app);
+      if (!await deps.isExecutable(executable))
         continue;
-      return { id, name, userDataDir: join3(deps.home, "Library/Application Support", userData) };
+      return {
+        id,
+        name,
+        userDataDir: join3(deps.home, "Library/Application Support", userData),
+        executable
+      };
     }
     return null;
   }));
@@ -28363,13 +28373,26 @@ async function portAnswers(port, fetchFn) {
     signal: AbortSignal.timeout(PROBE_TIMEOUT_MS)
   }).then(() => true, () => false);
 }
+async function debuggingAnswers(browser, deps) {
+  const active = await readActivePort2(browser, deps.readText);
+  return active && await portAnswers(active.port, deps.fetch ?? fetch) ? active : null;
+}
+async function psArgs() {
+  const { stdout } = await promisify(execFile)("ps", ["-axww", "-o", "args="]);
+  return stdout.split(`
+`);
+}
+async function isEverydayRunning(executable, deps) {
+  const lines = await (deps.processArgs ?? psArgs)().catch(() => null);
+  if (lines === null)
+    return true;
+  return lines.some((line) => (line === executable || line.startsWith(`${executable} `)) && !line.includes(" --user-data-dir"));
+}
 async function listEverydayDevices(options = {}, deps = discoveryDeps()) {
   const includeUnavailable = options.includeUnavailable ?? true;
   const browsers = await findEverydayBrowsers(deps);
   const devices = await Promise.all(browsers.map(async (browser) => {
-    const active = await readActivePort2(browser, deps.readText);
-    const ready = active !== null && await portAnswers(active.port, deps.fetch ?? fetch);
-    const state = ready ? "ready" : "remote debugging off";
+    const state = await debuggingAnswers(browser, deps) ? "ready" : await isEverydayRunning(browser.executable, deps) ? "remote debugging off" : "not running";
     return {
       id: browser.id,
       name: `${browser.name} (everyday)`,
@@ -28382,7 +28405,7 @@ async function listEverydayDevices(options = {}, deps = discoveryDeps()) {
   }));
   return devices.filter((device) => includeUnavailable || device.state === "ready");
 }
-var ALLOW_TIMEOUT_MS = 60000;
+var ALLOW_TIMEOUT_MS = EVERYDAY_ALLOW_TIMEOUT_MS;
 
 class EverydayConnectError extends Error {
   constructor(message) {
@@ -28394,9 +28417,9 @@ function seconds(ms) {
   return `${Number((ms / 1000).toFixed(3))} s`;
 }
 async function openEverydaySocket(browser, deps) {
-  const active = await readActivePort2(browser, deps.readText);
+  const active = await debuggingAnswers(browser, deps);
   if (!active) {
-    throw new EverydayConnectError(`Remote debugging is off in ${browser.name}. Turn it on at chrome://inspect/#remote-debugging, then connect again`);
+    throw new EverydayConnectError(await isEverydayRunning(browser.executable, deps) ? `Remote debugging is off in ${browser.name}. Turn it on at ${REMOTE_DEBUGGING_SETTING_URL}, then connect again` : `${browser.name} is not running. Open it, turn on remote debugging at ${REMOTE_DEBUGGING_SETTING_URL}, then connect again`);
   }
   const allowTimeoutMs = deps.allowTimeoutMs ?? ALLOW_TIMEOUT_MS;
   const connect = deps.connect ?? connectCdp;
@@ -28876,6 +28899,42 @@ function parseDevicectlApps(json) {
   const others = apps2.filter((app) => !app.builtByDeveloper);
   return [...developerBuilt, ...others].map((app) => app.bundleIdentifier);
 }
+function parseDevicectlAppUrl(json, bundleId) {
+  const items = json?.result?.apps;
+  if (!Array.isArray(items))
+    return;
+  const app = items.find((item) => item.bundleIdentifier === bundleId);
+  return typeof app?.url === "string" && app.url ? app.url : undefined;
+}
+function parseDevicectlProcesses(json) {
+  const items = json?.result?.runningProcesses;
+  if (!Array.isArray(items))
+    return null;
+  const processes = [];
+  for (const item of items) {
+    if (typeof item?.processIdentifier !== "number" || typeof item.executable !== "string")
+      continue;
+    processes.push({ pid: item.processIdentifier, executable: item.executable });
+  }
+  return processes;
+}
+function decoded(url) {
+  try {
+    return decodeURI(url);
+  } catch {
+    return url;
+  }
+}
+function appMainProcess(processes, appUrl) {
+  const bundle = decoded(appUrl.endsWith("/") ? appUrl : `${appUrl}/`);
+  return processes.find((process2) => {
+    const executable = decoded(process2.executable);
+    if (!executable.startsWith(bundle))
+      return false;
+    const inside = executable.slice(bundle.length);
+    return inside !== "" && !inside.includes("/");
+  });
+}
 
 // src/domains/devices/application.ts
 async function runCommand(command, options) {
@@ -31818,8 +31877,8 @@ async function readProfiles(products, exec) {
     const path = join12(platform, app, "embedded.mobileprovision");
     if (!existsSync6(path))
       continue;
-    const decoded = await exec(["security", "cms", "-D", "-i", path]);
-    const profile = decoded.exitCode === 0 ? parseProfile(decoded.stdout) : null;
+    const decoded2 = await exec(["security", "cms", "-D", "-i", path]);
+    const profile = decoded2.exitCode === 0 ? parseProfile(decoded2.stdout) : null;
     if (profile)
       profiles.push(profile);
   }
@@ -32224,6 +32283,9 @@ var PHONE_KEY_SUPPORT = {
 };
 var RECORDING_PULL_MS = 400;
 var UNREACHABLE_GRACE_MS = 20000;
+var TERMINATE_GRACE_MS = 3000;
+var TERMINATE_POLL_MS = 250;
+var KILL_REAP_MS = 1000;
 function errorMessage5(error) {
   return error instanceof Error ? error.message : String(error);
 }
@@ -32371,28 +32433,28 @@ async function createIosDeviceSession(options, deps = iosDeviceDeps()) {
     }
     return { width: size.width, height: size.height };
   });
+  const devicectl = async (args, label) => {
+    const result = await deps.devicectl(args);
+    if (result.exitCode !== 0) {
+      throw new Error(`${label}: ${result.stderr.trim() || result.stdout.trim() || `exit ${result.exitCode}`}`);
+    }
+  };
+  const devicectlJson = async (args, label) => {
+    const dir = await mkdtemp4(join13(tmpdir5(), "yoqa-devicectl-"));
+    const jsonPath = join13(dir, "out.json");
+    try {
+      await devicectl([...args, "--json-output", jsonPath], label);
+      return JSON.parse(await readFile5(jsonPath, "utf8"));
+    } finally {
+      await rm5(dir, { recursive: true, force: true });
+    }
+  };
   const installedApps = remember(async () => {
-    const dir = await mkdtemp4(join13(tmpdir5(), "yoqa-apps-"));
-    const jsonPath = join13(dir, "apps.json");
     try {
-      const result = await deps.devicectl([
-        "device",
-        "info",
-        "apps",
-        "--device",
-        udid,
-        "--json-output",
-        jsonPath
-      ]);
-      if (result.exitCode !== 0) {
-        throw new Error(result.stderr.trim() || result.stdout.trim() || `exit ${result.exitCode}`);
-      }
-      return parseDevicectlApps(JSON.parse(await readFile5(jsonPath, "utf8")));
+      return parseDevicectlApps(await devicectlJson(["device", "info", "apps", "--device", udid], "devicectl apps"));
     } catch (error) {
       console.warn(`[yoqa-runner] devicectl could not list the apps on iPhone ${udid} (${errorMessage5(error)}); with no target app, the tree is SpringBoard's`);
       return [];
-    } finally {
-      await rm5(dir, { recursive: true, force: true });
     }
   });
   const readPageSource = async () => {
@@ -32503,11 +32565,52 @@ async function createIosDeviceSession(options, deps = iosDeviceDeps()) {
   };
   let pointerStart = null;
   let pointerActive = false;
-  const devicectl = async (args, label) => {
-    const result = await deps.devicectl(args);
-    if (result.exitCode !== 0) {
-      throw new Error(`${label}: ${result.stderr.trim() || result.stdout.trim() || `exit ${result.exitCode}`}`);
-    }
+  const installedAt = async (id) => {
+    const appUrl = parseDevicectlAppUrl(await devicectlJson(["device", "info", "apps", "--device", udid, "--bundle-id", id, "--include-all-apps"], "devicectl apps"), id);
+    if (!appUrl)
+      throw new Error(`${id} is not installed on the iPhone`);
+    return appUrl;
+  };
+  const appProcess = async (appUrl) => {
+    const processes = parseDevicectlProcesses(await devicectlJson(["device", "info", "processes", "--device", udid], "devicectl processes"));
+    if (!processes)
+      throw new Error("devicectl processes: the process list was unreadable");
+    return appMainProcess(processes, appUrl);
+  };
+  const terminateGraceMs = deps.terminateGraceMs ?? TERMINATE_GRACE_MS;
+  const terminate = async (id) => {
+    const appUrl = await installedAt(id);
+    const running2 = await appProcess(appUrl);
+    if (!running2)
+      return;
+    const signal = (force) => devicectl([
+      "device",
+      "process",
+      "terminate",
+      "--device",
+      udid,
+      "--pid",
+      String(running2.pid),
+      ...force ? ["--kill"] : []
+    ], "devicectl terminate");
+    const exited = async (waitMs) => {
+      const deadline = performance.now() + waitMs;
+      for (;; ) {
+        if ((await appProcess(appUrl))?.pid !== running2.pid)
+          return true;
+        const left = deadline - performance.now();
+        if (left <= 0)
+          return false;
+        await Bun.sleep(Math.min(TERMINATE_POLL_MS, left));
+      }
+    };
+    await signal(false);
+    if (await exited(terminateGraceMs))
+      return;
+    await signal(true);
+    if (await exited(Math.min(KILL_REAP_MS, terminateGraceMs)))
+      return;
+    throw new Error(`${id} is still running on the iPhone after a force-kill (pid ${running2.pid}); close it on the phone`);
   };
   return {
     lane: "direct",
@@ -32547,7 +32650,7 @@ async function createIosDeviceSession(options, deps = iosDeviceDeps()) {
       appId = id;
     },
     targetApp: () => appId,
-    terminateApp: notYet("Terminating an app"),
+    terminateApp: (id) => withActionLock(() => terminate(id)),
     backgroundApp: (seconds2 = 3) => withActionLock(async () => {
       await call("button", { name: "home" }, true);
       if (!appId)
@@ -107960,6 +108063,7 @@ async function performAction(session, body, options) {
       } else {
         await session.terminateApp(body.appId);
         await session.activateApp(body.appId);
+        storage = "kept";
       }
       break;
     }
@@ -110241,15 +110345,15 @@ var HonoRequest = class {
     return param && tryDecodeURIComponent(param);
   }
   #getAllDecodedParams() {
-    const decoded = {};
+    const decoded2 = {};
     const keys = Object.keys(this.#matchResult[0][this.routeIndex][1]);
     for (const key of keys) {
       const value = this.#getParamValue(this.#matchResult[0][this.routeIndex][1][key]);
       if (value !== undefined) {
-        decoded[key] = tryDecodeURIComponent(value);
+        decoded2[key] = tryDecodeURIComponent(value);
       }
     }
-    return decoded;
+    return decoded2;
   }
   #getParamValue(paramKey) {
     return this.#matchResult[1] ? this.#matchResult[1][paramKey] : paramKey;
@@ -111859,7 +111963,7 @@ import { join as join23 } from "path";
 // package.json
 var package_default = {
   name: "@yoqa/runner",
-  version: "1.0.6",
+  version: "1.0.7",
   description: "Yoqa local runner \u2014 device control + catalog HTTP API (Bun). Start with yoqa serve or the yoqa-runner bin.",
   license: "UNLICENSED",
   type: "module",

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@yoqa/runner",
-	"version": "1.0.6",
+	"version": "1.0.7",
 	"description": "Yoqa local runner — device control + catalog HTTP API (Bun). Start with yoqa serve or the yoqa-runner bin.",
 	"license": "UNLICENSED",
 	"type": "module",