device-shots 0.5.7 → 0.5.9

package/dist/index.js

@@ -334,49 +334,34 @@ async function discoverAndroidDevices(bundleId) {
   }
   return devices;
 }
-async function adbShell(serial, cmd) {
-  const adb = getAdbPath();
-  const { stdout, stderr } = await run(adb, ["-s", serial, "shell", cmd]);
-  return stdout || stderr;
-}
 function sleep(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
+async function adbExec(serial, args) {
+  const adb = getAdbPath();
+  const { stdout, stderr } = await run(adb, ["-s", serial, ...args]);
+  return stdout || stderr;
+}
 async function setAndroidDemoMode(serial, time = "9:30") {
   const hhmm = time.replace(":", "");
-  await adbShell(serial, "settings put global sysui_demo_allowed 1");
-  await adbShell(
-    serial,
-    "am broadcast -a com.android.systemui.demo -e command enter"
-  );
-  await sleep(500);
-  await adbShell(
-    serial,
-    `am broadcast -a com.android.systemui.demo -e command clock -e hhmm ${hhmm}`
-  );
-  await adbShell(
-    serial,
-    "am broadcast -a com.android.systemui.demo -e command network -e wifi show -e level 4"
-  );
-  await adbShell(
-    serial,
-    "am broadcast -a com.android.systemui.demo -e command network -e mobile show -e datatype none -e level 4"
-  );
-  await adbShell(
-    serial,
-    "am broadcast -a com.android.systemui.demo -e command battery -e level 100 -e plugged false"
-  );
-  await adbShell(
-    serial,
-    "am broadcast -a com.android.systemui.demo -e command notifications -e visible false"
-  );
-  await sleep(500);
+  const ACTION = "com.android.systemui.demo";
+  await adbExec(serial, ["shell", "settings", "put", "global", "sysui_demo_allowed", "1"]);
+  await sleep(300);
+  await adbExec(serial, ["shell", "am", "broadcast", "-a", ACTION, "-e", "command", "enter"]);
+  await sleep(1e3);
+  await adbExec(serial, ["shell", "am", "broadcast", "-a", ACTION, "-e", "command", "clock", "-e", "hhmm", hhmm]);
+  await sleep(300);
+  await adbExec(serial, ["shell", "am", "broadcast", "-a", ACTION, "-e", "command", "network", "-e", "wifi", "show", "-e", "level", "4"]);
+  await sleep(300);
+  await adbExec(serial, ["shell", "am", "broadcast", "-a", ACTION, "-e", "command", "network", "-e", "mobile", "show", "-e", "datatype", "none", "-e", "level", "4"]);
+  await sleep(300);
+  await adbExec(serial, ["shell", "am", "broadcast", "-a", ACTION, "-e", "command", "battery", "-e", "level", "100", "-e", "plugged", "false"]);
+  await sleep(300);
+  await adbExec(serial, ["shell", "am", "broadcast", "-a", ACTION, "-e", "command", "notifications", "-e", "visible", "false"]);
+  await sleep(1e3);
 }
 async function clearAndroidDemoMode(serial) {
-  await adbShell(
-    serial,
-    "am broadcast -a com.android.systemui.demo -e command exit"
-  );
+  await adbExec(serial, ["shell", "am", "broadcast", "-a", "com.android.systemui.demo", "-e", "command", "exit"]);
 }
 async function captureAndroidScreenshot(serial, outputPath) {
   const adb = getAdbPath();
@@ -860,7 +845,7 @@ async function frameCommand(dir, options) {
 var program = new Command();
 program.name("device-shots").description(
   "Capture and frame mobile app screenshots from iOS simulators and Android emulators"
-).version("0.5.7");
+).version("0.5.9");
 program.command("capture").description("Capture screenshots from running devices").argument("[name]", "Screenshot name").option("-b, --bundle-id <id>", "App bundle ID").option("-o, --output <dir>", "Output directory").option("-p, --platform <platform>", "ios, android, or both").option("--no-frame", "Skip framing after capture").option("--time <time>", "Status bar time", "9:41").action(async (name, opts) => {
   await captureCommand({ name, ...opts });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "device-shots",
-  "version": "0.5.7",
+  "version": "0.5.9",
   "description": "Capture and frame mobile app screenshots from iOS simulators and Android emulators",
   "type": "module",
   "bin": {