Changeset da71f9d in Klonkt for src/routes/admin-updates.js

Timestamp:

07/04/2026 05:47:49 PM (2 months ago)

Author:

roboburr <roboburr@…>

Branches:

main

Children:

8e7f0ec

Parents:

0a93c15

Message:

fix(updates): Android "Latest" reads the installable bundle version

The Android Updates page read the stable branch's package.json, which
runs ahead of the phone bundle during the CI window in which the bundle
is still being built - the page showed "1.3.4 available" while the
update button could only install the 1.3.3 tarball, so updating
appeared stuck on the same version.

"Latest" now reads BUILD-INFO.txt's new bundle-version line from the
release (= exactly what klonkt-update installs), falling back to the
stable branch for releases that predate the line. Parse logic verified
against the workflow's BUILD-INFO shape (with and without the line).

• src/routes/admin-updates.js - androidLatestVersion(): BUILD-INFO first, stable-branch fallback; shared fetchWithTimeout helper
• CHANGELOG(.nl/.de).md - Unreleased entry (3 languages)

Co-Authored-By: Claude <noreply@…>

File:

• src/routes/admin-updates.js (modified) (1 diff)

src/routes/admin-updates.js

@@ -45 +45 @@
 const IS_ANDROID = process.platform === 'android'
   || (() => { try { return fs.existsSync('/data/data/com.termux/files/usr/bin'); } catch { return false; } })();
-// Phone tarballs are built from the stable branch → that's the phone's "latest".
-const ANDROID_LATEST_URL = 'https://raw.githubusercontent.com/roboburr/klonkt/stable/package.json';
+// "Latest" for a phone = what the update button can actually INSTALL: the version
+// of the prebuilt bundle on the release (BUILD-INFO.txt's bundle-version). Reading
+// the stable branch instead showed a new version during the CI window in which the
+// bundle was still being built — pressing update then reinstalled the old version.
+const ANDROID_BUILDINFO_URL = 'https://github.com/roboburr/klonkt-android/releases/download/termux-latest/BUILD-INFO.txt';
+const ANDROID_STABLE_URL = 'https://raw.githubusercontent.com/roboburr/klonkt/stable/package.json';
+
+async function fetchWithTimeout(url, ms) {
+  const ctl = new AbortController();
+  const t = setTimeout(() => ctl.abort(), ms);
+  try { return await fetch(url, { signal: ctl.signal, redirect: 'follow' }); }
+  finally { clearTimeout(t); }
+}
 
 async function androidLatestVersion() {
   try {
-    const ctl = new AbortController();
-    const t = setTimeout(() => ctl.abort(), 8000);
-    const r = await fetch(ANDROID_LATEST_URL, { signal: ctl.signal });
-    clearTimeout(t);
+    const r = await fetchWithTimeout(ANDROID_BUILDINFO_URL, 8000);
+    if (r.ok) {
+      const m = (await r.text()).match(/^bundle-version:\s*(\S+)/m);
+      if (m) return m[1];
+    }
+  } catch { /* fall through */ }
+  // Older releases have no bundle-version line → fall back to the stable branch.
+  try {
+    const r = await fetchWithTimeout(ANDROID_STABLE_URL, 8000);
     if (!r.ok) return null;
     return (await r.json()).version || null;