@swipt/cli 0.1.0-nightly.46 → 0.1.0-nightly.48

package/coredevice.mjs

@@ -1,30 +1,44 @@
-import { spawnSync } from "node:child_process";
+import { execFile } from "node:child_process";
 import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
+import { promisify } from "node:util";
 
 import { label, sameName } from "./connection.mjs";
+import { choose, step } from "./output.mjs";
 
-export function devicectl(args, { parse = false } = {}) {
+const exec = promisify(execFile);
+
+const xcodeMissing =
+  "Xcode is missing; install it from the App Store, open it once, and select it with xcode-select";
+
+export async function devicectl(args, { parse = false } = {}) {
   const output = parse
     ? path.join(os.tmpdir(), `devicectl-${process.pid}.json`)
     : undefined;
-  const result = spawnSync(
-    "xcrun",
-    ["devicectl", ...args, ...(parse ? ["--json-output", output] : [])],
-    { encoding: "utf8" },
-  );
-  if (result.error) {
-    throw result.error;
-  }
-  if (result.status !== 0) {
-    const text = `${result.stdout}${result.stderr}`;
+  try {
+    await exec(
+      "xcrun",
+      ["devicectl", ...args, ...(parse ? ["--json-output", output] : [])],
+      { maxBuffer: Infinity },
+    );
+  } catch (error) {
+    if (error.code === "ENOENT") {
+      throw new Error(xcodeMissing);
+    }
+    if (typeof error.code !== "number") {
+      throw error;
+    }
+    const text = `${error.stdout}${error.stderr}`;
+    if (/^(xcrun|xcode-select): /m.test(text)) {
+      throw new Error(`${xcodeMissing} (${text.trim()})`);
+    }
     if (text.includes("4016")) {
       throw new Error(
         "CoreDevice cannot reach the device while its loopback VPN is on; turn off Swipt's VPN on the device, then run this again",
       );
     }
-    throw new Error(text.trim() || `devicectl exited with ${result.status}`);
+    throw new Error(text.trim() || `devicectl exited with ${error.code}`);
   }
   if (!parse) {
     return undefined;
@@ -34,41 +48,85 @@ export function devicectl(args, { parse = false } = {}) {
   return parsed;
 }
 
-export function coreDevice(given, { required = false } = {}) {
-  const devices = devicectl(["list", "devices"], { parse: true })
-    .result.devices.filter(
+const reachability =
+  "unlock the device and connect it with USB or the same network as this Mac";
+
+const deviceLine = (device) =>
+  `  ${device.name}  ${device.udid}${device.offline ? "  (offline)" : ""}`;
+
+export async function coreDevice(context, { required = true } = {}) {
+  const given = context.options.device;
+  const listed = await step(
+    "looking for devices",
+    () => devicectl(["list", "devices"], { parse: true }),
+    { transient: true },
+  );
+  const paired = listed.result.devices
+    .filter(
       (device) =>
         device.hardwareProperties.platform === "iOS" &&
-        device.hardwareProperties.reality === "physical",
+        ["physical", undefined].includes(device.hardwareProperties.reality),
     )
     .map((device) => ({
       name: device.deviceProperties.name,
       udid: device.hardwareProperties.udid,
+      offline: device.connectionProperties.tunnelState === "unavailable",
     }));
-  const matches = given
-    ? devices.filter(
-        (device) =>
-          sameName(device.udid, given) ||
-          sameName(label(device.name), label(given)),
-      )
-    : required
-      ? []
-      : devices;
-  if (matches.length !== 1) {
-    const reason = !given
-      ? "choose a device with -d NAME|UDID"
-      : matches.length === 0
-        ? `no iOS device is named ${given}`
-        : `more than one iOS device is named ${given}; choose one by UDID`;
+  const named = (device) =>
+    sameName(device.udid, given) || sameName(label(device.name), label(given));
+  const devices = paired.filter((device) => !device.offline);
+  const matches = given ? devices.filter(named) : devices;
+  if ((given || !required) && matches.length === 1) {
+    return matches[0];
+  }
+  if (paired.length === 0) {
+    throw new Error(
+      "no iOS device is paired with this Mac; connect one with USB, unlock it, and trust this Mac",
+    );
+  }
+  const offline = given && paired.find(named);
+  if (matches.length === 0 && offline) {
+    throw new Error(`${offline.name} is offline; ${reachability}`);
+  }
+  if (devices.length === 0) {
     throw new Error(
-      devices.length === 0
-        ? `${reason}; no iOS device is paired with this Mac`
-        : `${reason}; paired iOS devices:\n${devices.map((device) => `  ${device.name}  ${device.udid}`).join("\n")}`,
+      `every paired iOS device is offline; ${reachability}:\n${paired.map(deviceLine).join("\n")}`,
     );
   }
-  return matches[0];
+  const reason = !given
+    ? "choose a device with -d NAME|UDID"
+    : matches.length === 0
+      ? `no iOS device is named ${given}`
+      : `more than one iOS device is named ${given}; choose one by UDID`;
+  const failure = new Error(
+    `${reason}; paired iOS devices:\n${paired.map(deviceLine).join("\n")}`,
+  );
+  if (matches.length === 0) {
+    throw failure;
+  }
+  return choose(
+    context,
+    "Choose a device",
+    matches.map((device) => ({
+      name: `${device.name}  ${device.udid}`,
+      short: device.name,
+      value: device,
+    })),
+    failure,
+  );
 }
 
-export const apps = (udid) =>
-  devicectl(["device", "info", "apps", "--device", udid], { parse: true })
-    .result.apps;
+export const apps = async (udid) =>
+  (
+    await devicectl(["device", "info", "apps", "--device", udid], {
+      parse: true,
+    })
+  ).result.apps;
+
+export const provisioningProfiles = async (udid) =>
+  (
+    await devicectl(
+      ["device", "profile", "list", "--type", "provisioning", "--device", udid],
+      { parse: true },
+    )
+  ).result.provisioningProfiles;

package/output.mjs

@@ -1,10 +1,71 @@
+import { styleText } from "node:util";
+
 import { timestampDate } from "@bufbuild/protobuf/wkt";
+import select from "@inquirer/select";
 
 import { LogLevel, LogLevelSchema } from "./proto/common_pb.js";
 import { ServiceStatus, ServiceStatusSchema } from "./proto/swiplets_pb.js";
 
 export class FalseResult extends Error {}
 
+export const interactive = (context) =>
+  context.options.device === undefined &&
+  context.options.team === undefined &&
+  process.stdin.isTTY &&
+  process.stderr.isTTY;
+
+export function choose(context, message, choices, failure) {
+  if (!interactive(context)) {
+    throw failure;
+  }
+  return select(
+    { message, choices },
+    { output: process.stderr, signal: context.signal },
+  );
+}
+
+const spinner = "⠋⠙⠹⠸⠼⠴⠦⠧⠇⠏";
+
+export async function step(label, run, { transient = false } = {}) {
+  const stream = process.stderr;
+  if (!stream.isTTY) {
+    console.error(label);
+    return run(() => {});
+  }
+  const style = (format, text) => styleText(format, text, { stream });
+  const started = Date.now();
+  const elapsed = () => {
+    const seconds = Math.floor((Date.now() - started) / 1000);
+    return seconds > 0 ? style("dim", ` ${seconds}s`) : "";
+  };
+  const draw = (line) => stream.write(`\r\x1b[?7l\x1b[2K${line}\x1b[?7h`);
+  let detail = "";
+  let frame = 0;
+  const render = () => {
+    frame = (frame + 1) % spinner.length;
+    draw(
+      `${style("cyan", spinner[frame])} ${label}${detail && style("dim", `  ${detail}`)}${elapsed()}`,
+    );
+  };
+  stream.write("\x1b[?25l");
+  render();
+  const timer = setInterval(render, 80);
+  try {
+    const result = await run((text) => {
+      detail = text;
+    });
+    clearInterval(timer);
+    draw(transient ? "" : `${style("green", "✔")} ${label}${elapsed()}\n`);
+    return result;
+  } catch (error) {
+    clearInterval(timer);
+    draw(`${style("red", "✖")} ${label}${elapsed()}\n`);
+    throw error;
+  } finally {
+    stream.write("\x1b[?25h");
+  }
+}
+
 export const enumText = (schema, value, prefix) =>
   schema.value[value].name
     .slice(prefix.length)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swipt/cli",
-  "version": "0.1.0-nightly.46",
+  "version": "0.1.0-nightly.48",
   "license": "GPL-3.0-or-later",
   "repository": {
     "type": "git",
@@ -25,6 +25,8 @@
     "@babel/runtime": "^7.29.10",
     "@bufbuild/protobuf": "^2.16.0",
     "@expo/env": "^2.5.3",
+    "@inquirer/password": "^5.2.5",
+    "@inquirer/select": "^5.2.8",
     "babel-preset-expo": "~58.0.23",
     "bonjour-service": "^1.4.4",
     "esbuild": "^0.28.2",
@@ -32,11 +34,11 @@
     "react-native-worklets": "0.13.0"
   },
   "peerDependencies": {
-    "@swipt/api": "0.1.0-nightly.46"
+    "@swipt/api": "0.1.0-nightly.48"
   },
   "optionalDependencies": {
-    "@swipt/server-darwin-arm64": "0.1.0-nightly.46",
-    "@swipt/server-darwin-x64": "0.1.0-nightly.46"
+    "@swipt/server-darwin-arm64": "0.1.0-nightly.48",
+    "@swipt/server-darwin-x64": "0.1.0-nightly.48"
   },
   "devDependencies": {
     "@bufbuild/protoc-gen-es": "^2.16.0"