Changeset 422b20d in Klonkt

Timestamp:

07/02/2026 03:07:42 PM (2 months ago)

Author:

roboburr <roboburr@…>

Branches:

main

Children:

8b5c076

Parents:

7d61ab8

Message:

fix(updates): in-app updates on the Android app (third topology)

The Updates page only knew git topologies (GitHub checkout / fleet bare
repo); the Android app installs from a prebuilt tarball with no git, so
it showed "no update source reachable" and could never update itself.

New ANDROID topology, detected via process.platform === 'android'
(Termux node) with a filesystem fallback:

• "Latest" = the package.json version on the klonkt STABLE branch (the channel the phone tarballs are built from), fetched with an 8s abort.
• The update button spawns the phone's own klonkt-update detached; the shell survives the pkill/restart the updater performs.
• Renders version chips (v1.3.1) instead of commit hashes; the existing view handles the null git fields as-is.

• src/routes/admin-updates.js — IS_ANDROID detection, androidLatestVersion(), android branches in GET / and POST /run
• CHANGELOG(.nl/.de).md — user-facing entry under Unreleased (3 languages)

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

Files:

• CHANGELOG.de.md (modified) (1 diff)
• CHANGELOG.md (modified) (1 diff)
• CHANGELOG.nl.md (modified) (1 diff)
• src/routes/admin-updates.js (modified) (5 diffs)

CHANGELOG.de.md

@@ -5 +5 @@
 
 ## [Unreleased]
+
+### Behoben
+- **Die Updates-Seite funktioniert jetzt in der Android-App.** Sie zeigt ab
+  sofort die neueste verfügbare Version, und der Aktualisieren-Button lädt und
+  installiert sie direkt auf dem Handy (Beiträge und Einstellungen bleiben
+  erhalten).
 
 ## [1.3.1] — 2026-07-02

CHANGELOG.md

@@ -5 +5 @@
 
 ## [Unreleased]
+
+### Fixed
+- **The Updates page now works in the Android app.** It now shows the newest
+  available version, and the update button downloads and installs it right on
+  your phone (your posts and settings are kept).
 
 ## [1.3.1] — 2026-07-02

CHANGELOG.nl.md

@@ -5 +5 @@
 
 ## [Unreleased]
+
+### Opgelost
+- **De Updates-pagina werkt nu in de Android-app.** Hij toont voortaan de
+  nieuwste beschikbare versie, en de bijwerk-knop downloadt en installeert die
+  direct op je telefoon (je posts en instellingen blijven staan).
 
 ## [1.3.1] — 2026-07-02

src/routes/admin-updates.js

@@ -4 +4 @@
  *   POST /admin/updates/run  -> fetch latest + restart (fleet only; see below)
  *
- * Two topologies are supported, detected automatically:
+ * Three topologies are supported, detected automatically:
  *   - CHECKOUT (external self-hoster): the app dir is itself a git clone with
  *     origin = GitHub. "Latest" = origin/<branch> (fetched on view). Updating is
@@ -12 +12 @@
  *     a `checkout -f` work-tree (no .git). "Latest" = <branch>. The detached
  *     self-update script runs in-app (no root needed) → the button works.
+ *   - ANDROID (the Klonkt phone app, Termux — node reports platform 'android'):
+ *     installed from a prebuilt tarball, no git at all. "Latest" = the package
+ *     version on the klonkt STABLE branch (the channel the phone tarballs are
+ *     built from). The button runs the phone's own `klonkt-update` command
+ *     detached, which survives the server restart it causes.
  * git stderr is ignored so a foreign/missing repo never spams "fatal: ...".
  */
@@ -35 +40 @@
 const IS_CHECKOUT = (() => { try { return fs.existsSync(path.join(APP_DIR, '.git')); } catch { return false; } })();
 const REMOTE_REF = IS_CHECKOUT ? `origin/${BRANCH}` : BRANCH; // what "latest" resolves to
+
+// The Klonkt Android app (Termux): node there reports platform 'android'; the
+// filesystem check is belt-and-braces for exotic node builds.
+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';
+
+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);
+    if (!r.ok) return null;
+    return (await r.json()).version || null;
+  } catch { return null; }
+}
 
 function appVersion() {
@@ -62 +85 @@
 }
 
-router.get('/', requireGod, (req, res) => {
+router.get('/', requireGod, async (req, res) => {
+  // ANDROID: version-based check against the stable branch; the update button
+  // runs the phone's klonkt-update (always present, the start script writes it).
+  if (IS_ANDROID) {
+    const cur = appVersion();
+    const latest = await androidLatestVersion();
+    return renderPage(req, res, 'pages/admin-updates', {
+      pageTitleKey: 'admin.t_updates',
+      bodyClass: 'on-admin',
+      appVersion: cur,
+      currentSha: cur ? 'v' + cur : null,
+      currentDesc: null,
+      latestSha: latest ? 'v' + latest : null,
+      latestDesc: null,
+      upToDate: !!(cur && latest && cur === latest),
+      canCheck: !!latest,
+      canSelfUpdate: true,
+      manualCommand: null,
+      behind: null,
+      changes: [],
+      success: req.query.success || null,
+      error: req.query.error || null,
+    });
+  }
   // For a GitHub checkout, refresh the remote ref so "latest" is current. Quiet +
   // shallow; offline just leaves the last-known ref. stderr ignored (no log noise).
@@ -93 +139 @@
 
 router.post('/run', requireGod, (req, res) => {
+  // ANDROID: run the phone's updater detached. It kills node (this process),
+  // swaps the code while keeping storage/.env, and restarts everything — the
+  // detached shell survives the pkill because it isn't a node process.
+  if (IS_ANDROID) {
+    try {
+      const child = spawn('bash', ['-c', 'klonkt-update >> "$HOME/klonkt-update.log" 2>&1'], { detached: true, stdio: 'ignore' });
+      child.unref();
+    } catch (e) {
+      return res.redirect('/admin/updates?error=' + encodeURIComponent('Kon update niet starten: ' + (e.message || e)));
+    }
+    return res.redirect('/admin/updates?success=' + encodeURIComponent('Bijwerken gestart — de site is ~1 minuut bezig (downloaden + herstarten). Ververs daarna deze pagina.'));
+  }
   if (!fs.existsSync(UPDATE_SCRIPT)) {
     return res.redirect('/admin/updates?error=' + encodeURIComponent('In-app updaten is hier niet beschikbaar — werk bij met `klonkt-update` op de server.'));