droidsuite 1.0.0-beta.10 → 1.0.0-beta.11

package/bin/droidsuite.mjs

@@ -26,9 +26,11 @@ import { runMenu } from '../src/menu.mjs';
 import { createShortcuts } from '../src/shortcut.mjs';
 import { openUrl } from '../src/browser.mjs';
 import { hasAgents, installSkill, SKILL_SOURCE } from '../src/skill.mjs';
+import { checkForUpdate, updateMessage } from '../src/updatecheck.mjs';
 
 const { version: VERSION } = JSON.parse(readFileSync(new URL('../package.json', import.meta.url), 'utf8'));
 const CLI_PATH = fileURLToPath(import.meta.url);
+const updateAvailable = () => checkForUpdate({ current: VERSION, load: () => loadConfig().updateCheck, save: (updateCheck) => updateConfig({ updateCheck }) });
 
 const c = process.stdout.isTTY && !process.env.NO_COLOR
   ? { dim: (s) => `\x1b[2m${s}\x1b[22m`, bold: (s) => `\x1b[1m${s}\x1b[22m`, green: (s) => `\x1b[32m${s}\x1b[39m`, red: (s) => `\x1b[31m${s}\x1b[39m`, yellow: (s) => `\x1b[33m${s}\x1b[39m` }
@@ -80,7 +82,13 @@ async function serve(argv, { defaultFolder = true } = {}) {
   pushes.sweep(); // leftovers from a serve that was killed
   const installVia = values['install-via'] ?? 'auto';
   if (!['auto', 'app'].includes(installVia)) throw new Error('--install-via is auto (adb when Wireless debugging is connected, else the app) or app');
+  let newerVersion = null;
+  updateAvailable().then((latest) => { // in the background: serving never waits for npm
+    newerVersion = latest;
+    if (latest) console.log(c.dim(updateMessage(latest)));
+  });
   const bridge = createBridgeServer({
+    updateAvailable: () => newerVersion,
     index, config, hosts, debug: debugService, app, inbox, pushes, installVia,
     // Uses adb only if it's already here; serve never downloads it or accepts its license.
     adb: async () => (findAdb() ? debugService.adb() : null),
@@ -467,6 +475,8 @@ async function setup(argv) {
     if (!installThenSetup(argv)) process.exitCode = 1;
     return;
   }
+  const newer = await updateAvailable();
+  if (newer) console.log(`${updateMessage(newer)}\n`);
   const { values } = parseArgs({ args: argv, options: { yes: { type: 'boolean', short: 'y' }, 'skip-adb': { type: 'boolean' }, shortcut: { type: 'boolean' }, 'no-shortcut': { type: 'boolean' } } });
   // With no terminal (CI, a script) nobody asked for an icon, unless --yes or --shortcut says so.
   const wantsIcon = !values['no-shortcut'] && (values.shortcut || values.yes || process.stdin.isTTY);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "droidsuite",
-  "version": "1.0.0-beta.10",
+  "version": "1.0.0-beta.11",
   "description": "Your Android phone on your computer, no cable: see and control its screen, type on it, move files and clipboard both ways, install builds and debug over Wi-Fi.",
   "keywords": [
     "android",
@@ -34,7 +34,7 @@
   },
   "scripts": {
     "start": "node bin/droidsuite.mjs serve",
-    "test": "node --test \"test/*.test.mjs\""
+    "test": "node run-tests.mjs"
   },
   "dependencies": {
     "bonjour-service": "^1.3.0",

package/skills/droidsuite/SKILL.md

@@ -100,7 +100,9 @@ droidsuite adb -s <serial> exec-out screencap -p > screen.png
 ```
 - Read only the logs of the app you're testing, as above. Other apps' logs can hold the person's private data, and
   whatever you read goes into this conversation. No output from the crash command means this app hasn't crashed.
-- Find `applicationId` in `app/build.gradle(.kts)` or with `droidsuite adb shell pm list packages <part>`.
+- Find `applicationId` in `app/build.gradle(.kts)`, or read `builds[].packageName` from the status script while `serve`
+  watches the build. Failing that, ask the person, or search with part of the app's name:
+  `droidsuite adb shell pm list packages <part>`. Never list every package: which apps someone has is private.
 - `INSTALL_FAILED_UPDATE_INCOMPATIBLE` = signed with another key: uninstalling deletes the app's data, so ask first,
   then `adb uninstall <applicationId>`.
 - Use `logcat -d` (dump and exit). A plain `logcat` streams forever and blocks you. To see only one launch, note the

package/src/server.mjs

@@ -138,7 +138,7 @@ function parseRange(header, size) {
  */
 export function createBridgeServer({
   index, config, hosts, debug = null, app = null, inbox = null, pushes = null,
-  installVia = 'auto', adb = null, autoConnect = null, log = () => {}, screen = null, rememberFolder = null, quit = null, nearby: nearbyOption = null,
+  installVia = 'auto', adb = null, autoConnect = null, log = () => {}, screen = null, rememberFolder = null, quit = null, updateAvailable = () => null, nearby: nearbyOption = null,
 }) {
   const phones = new Map(); // response -> phone record (see openPhone)
   let appSha = null; // the bundled phone app's sha256, computed on its first download
@@ -174,7 +174,7 @@ export function createBridgeServer({
     id: config.id, name: config.name, hosts, port, link: link(),
     qrSvg: await QRCode.toString(link(), { type: 'svg', margin: 1, errorCorrectionLevel: 'M' }),
     typing: { address: hosts[0] ? `${hosts[0]}:${port}` : null, code: typingCode, expiresAt: typingExpiresAt },
-    roots: index.roots, builds: index.list(), phones: phoneList(),
+    roots: index.roots, builds: index.list(), phones: phoneList(), update: updateAvailable(),
     app: app ? { available: true, versionName: app.versionName ?? null, size: app.size, ...await appQr() } : { available: false },
     inbox: inbox ? { dir: inbox.dir, recent: inbox.recent.map(({ name, size, from, time }) => ({ name, size, from, time })) } : null,
   });

package/src/updatecheck.mjs

@@ -0,0 +1,55 @@
+// Tells people when a newer DroidSuite is on npm. Asks npm at most once a day, sends nothing about the user, and never
+// gets in the way: no network, or npm being slow, just means no notice. DROIDSUITE_NO_UPDATE_CHECK=1 turns it off.
+const DAY = 24 * 3600_000;
+const LATEST_URL = 'https://registry.npmjs.org/droidsuite/latest';
+
+function parts(version) {
+  const [main, pre] = String(version).split('-');
+  return { main: main.split('.').map(Number), pre: pre ? pre.split('.') : null };
+}
+
+/** True when [candidate] is a later version than [current], counting prereleases: beta.10 comes after beta.9. */
+export function isNewer(candidate, current) {
+  const a = parts(candidate);
+  const b = parts(current);
+  for (let i = 0; i < 3; i++) {
+    if ((a.main[i] ?? 0) !== (b.main[i] ?? 0)) return (a.main[i] ?? 0) > (b.main[i] ?? 0);
+  }
+  if (!a.pre || !b.pre) return !a.pre && !!b.pre; // a final release comes after its prereleases
+  for (let i = 0; i < Math.max(a.pre.length, b.pre.length); i++) {
+    const [x, y] = [a.pre[i], b.pre[i]];
+    if (x === undefined) return false;
+    if (y === undefined) return true;
+    if (x === y) continue;
+    const bothNumbers = /^\d+$/.test(x) && /^\d+$/.test(y);
+    return bothNumbers ? Number(x) > Number(y) : x > y;
+  }
+  return false;
+}
+
+async function latestOnNpm() {
+  const res = await fetch(LATEST_URL, { signal: AbortSignal.timeout(8000) });
+  if (!res.ok) throw new Error(`npm answered ${res.status}`);
+  return (await res.json()).version;
+}
+
+/**
+ * The newer version available, or null. [load] and [save] keep `{ at, latest }` between runs.
+ * Never throws.
+ */
+export async function checkForUpdate({ current, load, save, fetchLatest = latestOnNpm, now = Date.now(), env = process.env }) {
+  if (env.DROIDSUITE_NO_UPDATE_CHECK || env.CI) return null;
+  try {
+    const saved = load();
+    let latest = saved?.latest ?? null;
+    if (!saved?.at || now - saved.at >= DAY) {
+      latest = await fetchLatest();
+      save({ at: now, latest });
+    }
+    return latest && isNewer(latest, current) ? latest : null;
+  } catch {
+    return null;
+  }
+}
+
+export const updateMessage = (latest) => `A newer DroidSuite is available (${latest}). To update, run: npx droidsuite@latest setup`;

package/web/index.html

@@ -261,6 +261,7 @@
 </head>
 <body>
 <div class="wrap">
+  <div class="note" id="update-note" role="status" hidden>A newer DroidSuite is available (<span id="update-version"></span>). To update, run <code class="mono">npx droidsuite@latest setup</code> in a terminal.</div>
   <header>
     <div class="mark" aria-hidden="true"><svg viewBox="0 0 96 96"><path fill="#fff" fill-rule="evenodd" d="M23.5 16h7a6.5 6.5 0 0 1 6.5 6.5v51a6.5 6.5 0 0 1-6.5 6.5h-7a6.5 6.5 0 0 1-6.5-6.5v-51a6.5 6.5 0 0 1 6.5-6.5zM24.6 70.5a1.6 1.6 0 0 0 0 3.2h4.8a1.6 1.6 0 0 0 0-3.2z"/><path fill="none" stroke="#fff" stroke-width="8" stroke-linecap="round" d="M46 20a28 28 0 0 1 0 56"/><path fill="none" stroke="#E89B2F" stroke-width="8" stroke-linecap="round" d="M46 38a10 10 0 0 1 0 20"/></svg></div>
     <h1>DroidSuite</h1>
@@ -539,6 +540,8 @@
   let folderOpen = false; // the Builds folder field, opened with "Change"
   function render(s) {
     last = s;
+    $('update-note').hidden = !s.update;
+    $('update-version').textContent = s.update ?? '';
     renderBridge();
     if (!pairTouched) $('pair-card').open = !s.phones.length;
     $('serving').innerHTML = `${esc(s.name)} · serving on <span class="mono">${esc(s.hosts[0] ?? 'localhost')}:${s.port}</span>`;