tilt-live 0.1.0 → 0.3.0

package/README.md

@@ -6,9 +6,10 @@ See and control any Linux desktop, right in your browser.
 npx tilt-live
 ```
 
-Open the link it prints, click the cursor button, and the desktop is yours.
+Run it on the Linux machine or VM whose screen you want, open the link it prints, click the cursor
+button, and the desktop is yours.
 
+- The first run downloads [tilt](https://github.com/cloudycotton/tilt) (checksum-verified). After
+  that tilt updates itself whenever it starts; `TILT_NO_UPDATE=1` turns this off.
 - `npx tilt-live --display :1`: every flag goes to [tilt](https://github.com/cloudycotton/tilt/blob/main/docs/guide.md#flags).
-- Always runs the latest release (checksum-verified). Pin one with `TILT_VERSION=0.2.0`, skip the check with `TILT_NO_UPDATE=1`.
-- Keeps its token in `~/.config/tilt-live/token` unless you pass `--token`, `--token-file` or `--no-auth`.
 - Linux on x86_64 or arm64, Node 18+. MIT licensed.

package/bin/tilt-live.js

@@ -1,12 +1,7 @@
 #!/usr/bin/env node
-// tilt-live: runs the latest tilt release (https://github.com/cloudycotton/tilt), downloading or
-// updating it first when a newer one is out, and passes every argument through to it.
-//
-//   TILT_VERSION=0.2.0   run that release instead of the latest
-//   TILT_NO_UPDATE=1     do not look for updates (run the newest one already downloaded)
-//
-// With no --token, --token-file or --no-auth (nor their TILT_* variables), it makes a token,
-// keeps it in ~/.config/tilt-live/token and prints the link to open.
+// tilt-live: runs tilt (https://github.com/cloudycotton/tilt) with every argument passed through.
+// The first run downloads the latest release (checksum-verified); after that tilt updates itself
+// whenever it starts. Linux on x86_64 or arm64.
 'use strict';
 
 const crypto = require('node:crypto');
@@ -15,130 +10,44 @@ const os = require('node:os');
 const path = require('node:path');
 const { spawn } = require('node:child_process');
 
-// TILT_RELEASES points elsewhere for tests: a URL with GitHub's /latest and /download layout.
+// TILT_RELEASES points elsewhere for tests: a URL with GitHub's /latest/download layout.
 const RELEASES = process.env.TILT_RELEASES || 'https://github.com/cloudycotton/tilt/releases';
-const CHECK_TIMEOUT_MS = 2000;
-const DOWNLOAD_TIMEOUT_MS = 120_000;
-const KEEP_VERSIONS = 2;
-const TRIPLES = { x64: 'x86_64-unknown-linux-musl', arm64: 'aarch64-unknown-linux-musl' };
-
-const home = os.homedir();
-const cacheDir = path.join(process.env.XDG_CACHE_HOME || path.join(home, '.cache'), 'tilt-live');
-const configDir = path.join(process.env.XDG_CONFIG_HOME || path.join(home, '.config'), 'tilt-live');
+const TRIPLE = { x64: 'x86_64-unknown-linux-musl', arm64: 'aarch64-unknown-linux-musl' }[process.arch];
+const cacheDir = path.join(process.env.XDG_CACHE_HOME || path.join(os.homedir(), '.cache'), 'tilt-live');
+const bin = path.join(cacheDir, 'tilt');
 
 function fail(msg) {
   process.stderr.write(`tilt-live: ${msg}\n`);
   process.exit(1);
 }
 
-const cmp = (a, b) => {
-  const pa = a.split(/[.-]/).map(Number);
-  const pb = b.split(/[.-]/).map(Number);
-  for (let i = 0; i < 3; i++) if ((pa[i] || 0) !== (pb[i] || 0)) return (pa[i] || 0) - (pb[i] || 0);
-  return 0;
-};
-
-/** Versions already downloaded, newest first. */
-function cached() {
-  try {
-    return fs.readdirSync(cacheDir)
-      .filter((v) => /^\d+\.\d+\.\d+$/.test(v) && fs.existsSync(path.join(cacheDir, v, 'tilt')))
-      .sort(cmp)
-      .reverse();
-  } catch {
-    return [];
-  }
-}
-
-/** The newest release's version, from the redirect of /releases/latest; null when unknown. */
-async function latest() {
-  try {
-    const res = await fetch(`${RELEASES}/latest`, {
-      redirect: 'manual',
-      signal: AbortSignal.timeout(CHECK_TIMEOUT_MS),
-    });
-    const m = /\/tag\/v?(\d+\.\d+\.\d+)$/.exec(res.headers.get('location') || '');
-    return m ? m[1] : null;
-  } catch {
-    return null;
-  }
-}
-
-async function download(version, triple) {
-  const base = `${RELEASES}/download/v${version}`;
+async function download() {
   const get = async (name) => {
-    const res = await fetch(`${base}/${name}`, { signal: AbortSignal.timeout(DOWNLOAD_TIMEOUT_MS) });
+    const res = await fetch(`${RELEASES}/latest/download/${name}`, { signal: AbortSignal.timeout(120_000) });
     if (!res.ok) throw new Error(`${name}: HTTP ${res.status}`);
     return Buffer.from(await res.arrayBuffer());
   };
-  const name = `tilt-${triple}`;
-  const [bin, sums] = await Promise.all([get(name), get('SHA256SUMS')]);
+  const name = `tilt-${TRIPLE}`;
+  const [data, sums] = await Promise.all([get(name), get('SHA256SUMS')]);
   const want = sums.toString().split('\n').map((l) => l.trim().split(/\s+/)).find((f) => f[1] === name)?.[0];
-  const got = crypto.createHash('sha256').update(bin).digest('hex');
-  if (want !== got) throw new Error(`${name}: checksum mismatch`);
-  const dir = path.join(cacheDir, version);
-  fs.mkdirSync(dir, { recursive: true });
-  const tmp = path.join(dir, `tilt.${process.pid}`);
-  fs.writeFileSync(tmp, bin, { mode: 0o755 });
-  fs.renameSync(tmp, path.join(dir, 'tilt'));
-  for (const old of cached().slice(KEEP_VERSIONS)) fs.rmSync(path.join(cacheDir, old), { recursive: true, force: true });
+  if (crypto.createHash('sha256').update(data).digest('hex') !== want) throw new Error(`${name}: checksum mismatch`);
+  fs.mkdirSync(cacheDir, { recursive: true });
+  const tmp = `${bin}.${process.pid}`;
+  fs.writeFileSync(tmp, data, { mode: 0o755 });
+  fs.renameSync(tmp, bin);
 }
 
-/** The binary to run: the release asked for, else the latest, downloaded if need be. */
-async function binary() {
-  const triple = TRIPLES[process.arch];
-  if (process.platform !== 'linux' || !triple) fail('tilt runs on Linux, on x86_64 or arm64');
-  const have = cached();
-  let version = process.env.TILT_VERSION;
-  if (!version && !process.env.TILT_NO_UPDATE) version = await latest();
-  version ||= have[0];
-  if (!version) fail('cannot find the latest tilt release (check the network, or set TILT_VERSION)');
-  if (!have.includes(version)) {
-    process.stderr.write(`tilt-live: downloading tilt ${version}...\n`);
-    try {
-      await download(version, triple);
-    } catch (e) {
-      if (!have[0]) fail(`download failed: ${e.message}`);
-      process.stderr.write(`tilt-live: download failed (${e.message}); running ${have[0]}\n`);
-      version = have[0];
-    }
+async function main() {
+  if (process.platform !== 'linux') fail('tilt streams a Linux desktop: run it on the Linux machine or VM whose screen you want');
+  if (!TRIPLE) fail('tilt runs on x86_64 or arm64');
+  if (!fs.existsSync(bin)) {
+    process.stderr.write('tilt-live: downloading tilt...\n');
+    await download().catch((e) => fail(`download failed: ${e.message}`));
   }
-  return path.join(cacheDir, version, 'tilt');
-}
-
-/** Adds --token-file with a kept token when no access control was given, and says where to go. */
-function withAuth(args) {
-  const given = args.some((a) => /^--(token|token-file|no-auth)(=|$)/.test(a))
-    || ['TILT_TOKEN', 'TILT_TOKEN_FILE', 'TILT_NO_AUTH'].some((v) => process.env[v]);
-  const info = ['-h', '--help', '-V', '--version'].some((a) => args.includes(a));
-  if (given || info) return args;
-  const file = path.join(configDir, 'token');
-  let token = '';
-  try { token = fs.readFileSync(file, 'utf8').trim(); } catch { /* none yet */ }
-  if (!token) {
-    token = crypto.randomBytes(16).toString('hex');
-    fs.mkdirSync(configDir, { recursive: true, mode: 0o700 });
-    fs.writeFileSync(file, `${token}\n`, { mode: 0o600 });
-  }
-  const bind = (args.find((a) => a.startsWith('--bind='))?.slice(7))
-    || (args.includes('--bind') ? args[args.indexOf('--bind') + 1] : null)
-    || process.env.TILT_BIND || '0.0.0.0:6090';
-  const at = bind.lastIndexOf(':');
-  const [host, port] = [bind.slice(0, at).replace(/^\[|\]$/g, ''), bind.slice(at + 1)];
-  // Bound to every interface: the machine's own addresses; else the one it is bound to.
-  const hosts = host === '0.0.0.0' || host === '::'
-    ? ['localhost', ...Object.values(os.networkInterfaces()).flat()
-      .filter((i) => i && i.family === 'IPv4' && !i.internal).map((i) => i.address)]
-    : [host.includes(':') ? `[${host}]` : host];
-  process.stderr.write(`tilt-live: open ${hosts.map((h) => `http://${h}:${port}/#token=${token}`).join('\n           or ')}\n`);
-  return [...args, '--token-file', file];
-}
-
-(async () => {
-  const bin = await binary();
-  const args = withAuth(process.argv.slice(2));
-  const child = spawn(bin, args, { stdio: 'inherit' });
+  const child = spawn(bin, process.argv.slice(2), { stdio: 'inherit' });
   for (const sig of ['SIGINT', 'SIGTERM', 'SIGHUP', 'SIGQUIT']) process.on(sig, () => child.kill(sig));
   child.on('error', (e) => fail(e.message));
-  child.on('exit', (code, sig) => process.exit(code ?? (sig ? 128 + os.constants.signals[sig] : 1)));
-})();
+  child.on('exit', (code, sig) => process.exit(code ?? 128 + (os.constants.signals[sig] || 0)));
+}
+
+main();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "tilt-live",
-  "version": "0.1.0",
-  "description": "See and control any Linux desktop, right in your browser (runs the latest tilt release)",
+  "version": "0.3.0",
+  "description": "See and control any Linux desktop, right in your browser (downloads tilt, which then keeps itself up to date)",
   "keywords": [
     "vnc",
     "remote-desktop",