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

package/coredevice.mjs

@@ -1,11 +1,12 @@
 import { execFile } from "node:child_process";
+import { randomUUID } from "node:crypto";
 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";
+import { choose, interactive, step } from "./output.mjs";
 
 const exec = promisify(execFile);
 
@@ -14,7 +15,7 @@ const xcodeMissing =
 
 export async function devicectl(args, { parse = false } = {}) {
   const output = parse
-    ? path.join(os.tmpdir(), `devicectl-${process.pid}.json`)
+    ? path.join(os.tmpdir(), `devicectl-${randomUUID()}.json`)
     : undefined;
   try {
     await exec(
@@ -54,7 +55,7 @@ const reachability =
 const deviceLine = (device) =>
   `  ${device.name}  ${device.udid}${device.offline ? "  (offline)" : ""}`;
 
-export async function coreDevice(context, { required = true } = {}) {
+export async function coreDevice(context, { required = true, filter } = {}) {
   const given = context.options.device;
   const listed = await step(
     "looking for devices",
@@ -104,10 +105,14 @@ export async function coreDevice(context, { required = true } = {}) {
   if (matches.length === 0) {
     throw failure;
   }
+  const choices =
+    filter !== undefined && interactive(context)
+      ? await filter(matches)
+      : matches;
   return choose(
     context,
     "Choose a device",
-    matches.map((device) => ({
+    choices.map((device) => ({
       name: `${device.name}  ${device.udid}`,
       short: device.name,
       value: device,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swipt/cli",
-  "version": "0.1.0-nightly.48",
+  "version": "0.1.0-nightly.49",
   "license": "GPL-3.0-or-later",
   "repository": {
     "type": "git",
@@ -34,11 +34,11 @@
     "react-native-worklets": "0.13.0"
   },
   "peerDependencies": {
-    "@swipt/api": "0.1.0-nightly.48"
+    "@swipt/api": "0.1.0-nightly.49"
   },
   "optionalDependencies": {
-    "@swipt/server-darwin-arm64": "0.1.0-nightly.48",
-    "@swipt/server-darwin-x64": "0.1.0-nightly.48"
+    "@swipt/server-darwin-arm64": "0.1.0-nightly.49",
+    "@swipt/server-darwin-x64": "0.1.0-nightly.49"
   },
   "devDependencies": {
     "@bufbuild/protoc-gen-es": "^2.16.0"

package/sideload.mjs

@@ -478,6 +478,32 @@ const teamChoice = ({ id, name }) => ({
   value: id,
 });
 
+const installHint = '; install it with "swipt sideload install"';
+
+async function sideloadedDevices(devices, hint = "") {
+  const sideloaded = await step(
+    "looking for Swipt on the devices",
+    () =>
+      Promise.all(
+        devices.map((device) =>
+          apps(device.udid).then(
+            (listed) =>
+              listed.some((app) =>
+                sideloadedPattern.test(app.bundleIdentifier),
+              ),
+            () => true,
+          ),
+        ),
+      ),
+    { transient: true },
+  );
+  const found = devices.filter((_, index) => sideloaded[index]);
+  if (found.length === 0) {
+    throw new Error(`Swipt is not sideloaded on any online iOS device${hint}`);
+  }
+  return found;
+}
+
 async function locate(context, device, fresh = false) {
   const { options } = context;
   const listed = await step(
@@ -610,11 +636,16 @@ async function askPasscode(context) {
 }
 
 async function deploy(context, onlyNewer) {
-  const device = await coreDevice(context);
+  const device = await coreDevice(
+    context,
+    onlyNewer
+      ? { filter: (devices) => sideloadedDevices(devices, installHint) }
+      : undefined,
+  );
   const { team, current } = await locate(context, device, !onlyNewer);
   if (current === undefined && onlyNewer) {
     throw new Error(
-      `Swipt is not sideloaded on ${device.name}${team === undefined ? "" : ` by team ${team}`}; install it with "swipt sideload install"`,
+      `Swipt is not sideloaded on ${device.name}${team === undefined ? "" : ` by team ${team}`}${installHint}`,
     );
   }
   const passcode =
@@ -1058,7 +1089,7 @@ async function trustAndOpen(context, device, id, passcode) {
 }
 
 export async function uninstall(context) {
-  const device = await coreDevice(context);
+  const device = await coreDevice(context, { filter: sideloadedDevices });
   const { team, current } = await locate(context, device);
   if (current === undefined) {
     throw new Error(