device-shots 0.5.10 → 0.5.12

package/dist/index.js

@@ -269,6 +269,7 @@ async function captureIosScreenshot(udid, outputPath) {
 }
 
 // src/devices/android.ts
+import { execSync } from "child_process";
 function sanitizeName2(name) {
   return name.replace(/[ (),]/g, "_").replace(/[^A-Za-z0-9_-]/g, "");
 }
@@ -337,47 +338,50 @@ async function discoverAndroidDevices(bundleId) {
 function sleep(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
-async function demoBroadcast(serial, extras) {
-  const adb = getAdbPath();
-  const cmd = `am broadcast -a com.android.systemui.demo ${extras}`;
-  const { stdout, stderr } = await run(adb, ["-s", serial, "shell", "sh", "-c", cmd]);
-  return stdout || stderr;
+function adbShellSync(adb, serial, cmd) {
+  try {
+    const result = execSync(`${adb} -s ${serial} shell ${cmd}`, {
+      encoding: "utf-8",
+      timeout: 1e4
+    });
+    return result.trim();
+  } catch (e) {
+    return e.stdout?.trim() || e.stderr?.trim() || "";
+  }
 }
 async function setAndroidDemoMode(serial, time = "9:30") {
   const hhmm = time.replace(":", "");
   const adb = getAdbPath();
-  await run(adb, ["-s", serial, "shell", "settings", "put", "global", "sysui_demo_allowed", "1"]);
-  await run(adb, ["-s", serial, "shell", "settings", "put", "global", "sysui_tuner_demo_on", "1"]);
+  const ACTION = "com.android.systemui.demo";
+  adbShellSync(adb, serial, "settings put global sysui_demo_allowed 1");
+  adbShellSync(adb, serial, "settings put global sysui_tuner_demo_on 1");
   await sleep(500);
-  let result = await demoBroadcast(serial, "-e command enter");
-  process.stderr.write(`[demo] enter: ${result.trim()}
+  let r = adbShellSync(adb, serial, `am broadcast -a ${ACTION} --es command enter`);
+  process.stderr.write(`[demo] enter: ${r}
 `);
   await sleep(1e3);
-  result = await demoBroadcast(serial, `-e command clock -e hhmm ${hhmm}`);
-  process.stderr.write(`[demo] clock: ${result.trim()}
+  r = adbShellSync(adb, serial, `am broadcast -a ${ACTION} --es command clock --es hhmm ${hhmm}`);
+  process.stderr.write(`[demo] clock: ${r}
 `);
-  await sleep(300);
-  result = await demoBroadcast(serial, "-e command network -e wifi show -e level 4");
-  process.stderr.write(`[demo] wifi: ${result.trim()}
+  r = adbShellSync(adb, serial, `am broadcast -a ${ACTION} --es command network --es wifi show --es level 4`);
+  process.stderr.write(`[demo] wifi: ${r}
 `);
-  await sleep(300);
-  result = await demoBroadcast(serial, "-e command network -e mobile show -e datatype none -e level 4");
-  process.stderr.write(`[demo] mobile: ${result.trim()}
+  r = adbShellSync(adb, serial, `am broadcast -a ${ACTION} --es command network --es mobile show --es datatype none --es level 4`);
+  process.stderr.write(`[demo] mobile: ${r}
 `);
-  await sleep(300);
-  result = await demoBroadcast(serial, "-e command battery -e level 100 -e plugged false");
-  process.stderr.write(`[demo] battery: ${result.trim()}
+  r = adbShellSync(adb, serial, `am broadcast -a ${ACTION} --es command battery --es level 100 --es plugged false`);
+  process.stderr.write(`[demo] battery: ${r}
 `);
-  await sleep(300);
-  result = await demoBroadcast(serial, "-e command notifications -e visible false");
-  process.stderr.write(`[demo] notif: ${result.trim()}
+  r = adbShellSync(adb, serial, `am broadcast -a ${ACTION} --es command notifications --es visible false`);
+  process.stderr.write(`[demo] notif: ${r}
 `);
   await sleep(1e3);
 }
 async function clearAndroidDemoMode(serial) {
-  await demoBroadcast(serial, "-e command exit");
   const adb = getAdbPath();
-  await run(adb, ["-s", serial, "shell", "settings", "put", "global", "sysui_tuner_demo_on", "0"]);
+  const ACTION = "com.android.systemui.demo";
+  adbShellSync(adb, serial, `am broadcast -a ${ACTION} --es command exit`);
+  adbShellSync(adb, serial, "settings put global sysui_tuner_demo_on 0");
 }
 async function captureAndroidScreenshot(serial, outputPath) {
   const adb = getAdbPath();
@@ -861,7 +865,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.10");
+).version("0.5.12");
 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.10",
+  "version": "0.5.12",
   "description": "Capture and frame mobile app screenshots from iOS simulators and Android emulators",
   "type": "module",
   "bin": {