Changeset 14f54a7 in Klonkt

Timestamp:

07/04/2026 05:31:45 PM (2 months ago)

Author:

roboburr <roboburr@…>

Branches:

main

Children:

6ec0433

Parents:

6dd1a3f

Message:

fix(ap): self-heal retries until a clean pass; feed re-boost also refreshes

Scale fix (think 1M instances, not this one row): the previous remedies
still had two gaps that only showed up per-user.

• selfHealTimeline consumed its version even when some origins were unreachable at that exact moment - phone-hosted instances are offline routinely, so their notes stayed stale forever with no retry. The version is now only persisted after a CLEAN pass (0 unreachable); otherwise it retries on the next boots and gives up after 5 attempts (dead origins answer 404/410 and are pruned, so no infinite loop). SELFHEAL_VERSION 6 -> 7 so already-healed instances rerun with the new semantics.
• The /news feed boost only did markBoosted, so "boost again to heal a stale copy" silently worked from the interact page but not the feed. Boosting from the feed now also re-resolves the note (fire-and-forget) and refreshes the cached row via upsertBoostedNote.

Retry state machine verified in isolation (offline-then-reachable ->
heals; permanently dead -> gives up after 5 passes, then skips). Suite
45/45.

• src/services/ActivityPubService.js - clean-pass gating + attempts counter (app_settings, no schema change); SELFHEAL_VERSION 7
• src/routes/posts.js - /news/boost refreshes the cached row on boost
• CHANGELOG(.nl/.de).md - extended the Unreleased bullet (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/posts.js (modified) (1 diff)
• src/services/ActivityPubService.js (modified) (3 diffs)

CHANGELOG.de.md

@@ -9 +9 @@
 - **Boosts, die ihr Cover verloren hatten, bekommen es automatisch zurück.**
   Beiträge, die du vor dem Cover-Fix geboostet hast, waren ohne Artwork
-  gespeichert; sie werden beim nächsten Neustart einmalig aufgefrischt. Einen
-  Beitrag erneut zu boosten aktualisiert jetzt ebenfalls die gespeicherte Kopie
-  (Cover, Inhalt) — ein veralteter Boost lässt sich also auch von Hand heilen.
+  gespeichert; sie werden beim nächsten Neustart einmalig aufgefrischt. Ist der
+  Heimserver eines Beitrags in dem Moment kurz nicht erreichbar, wird es bei den
+  nächsten Neustarts erneut versucht statt endgültig übersprungen. Einen Beitrag
+  erneut zu boosten aktualisiert jetzt ebenfalls die gespeicherte Kopie (Cover,
+  Inhalt) — aus dem Feed wie von der Interact-Seite.
 
 ## [1.3.3] — 2026-07-03

CHANGELOG.md

@@ -9 +9 @@
 - **Boosts that lost their cover get it back automatically.** Posts you boosted
   before the cover fix were cached without their artwork; they are refreshed
-  once on the next restart. Boosting a post again now also refreshes its cached
-  copy (cover, content), so a stale boost can always be healed by hand too.
+  once on the next restart. If a post's home server is briefly unreachable at
+  that moment, it is retried on the next restarts instead of being skipped for
+  good. Boosting a post again now also refreshes its cached copy (cover,
+  content) — from the feed as well as the interact page.
 
 ## [1.3.3] — 2026-07-03

CHANGELOG.nl.md

@@ -9 +9 @@
 - **Boosts die hun cover kwijt waren krijgen 'm automatisch terug.** Posts die
   je vóór de cover-fix boostte waren zonder artwork opgeslagen; die worden bij
-  de volgende herstart eenmalig ververst. Een post opnieuw boosten ververst nu
-  ook de opgeslagen kopie (cover, inhoud), dus een oude boost is altijd ook
-  handmatig te genezen.
+  de volgende herstart eenmalig ververst. Is de thuis-server van een post op dat
+  moment even onbereikbaar, dan wordt het bij volgende herstarts opnieuw
+  geprobeerd in plaats van voorgoed overgeslagen. Een post opnieuw boosten
+  ververst nu ook de opgeslagen kopie (cover, inhoud) — vanuit de feed én de
+  interact-pagina.
 
 ## [1.3.3] — 2026-07-03

src/routes/posts.js

@@ -867 +867 @@
     on = !ActivityPubService.getTimelineReaction(site.slug, note).boosted;
     try { await ActivityPubService.sendInteraction(site, on ? 'boost' : 'unboost', note, (req.body.author || '').toString()); } catch (e) { /* ignore */ }
-    if (on) ActivityPubService.markBoosted(site.slug, note); else ActivityPubService.unmarkBoosted(site.slug, note);
+    if (on) {
+      ActivityPubService.markBoosted(site.slug, note); // instant UI state
+      // Fire-and-forget: re-resolve the note so the cached row is refreshed
+      // (cover/content) — boosting again heals a stale copy from EVERY boost
+      // path, not just the interact page.
+      ActivityPubService.resolveRemoteNote(note)
+        .then((n) => { if (n) ActivityPubService.upsertBoostedNote(site.slug, n); })
+        .catch(() => { /* best-effort */ });
+    } else {
+      ActivityPubService.unmarkBoosted(site.slug, note);
+    }
   }
   if (req.get('X-Requested-With') === 'fetch') return res.json({ ok: true, on });

src/services/ActivityPubService.js

@@ -1878 +1878 @@
 // during a flux window, e.g. a fleet-wide update), and drops notes that are gone
 // (404/410). Bump SELFHEAL_VERSION only on a release that warrants a re-sync.
-const SELFHEAL_VERSION = 6; // v6: re-fetch so boosted notes cached coverless (pre image-fallback in resolveRemoteNote) pick up their cover
+const SELFHEAL_VERSION = 7; // v7: rerun v6 with retry-until-clean semantics (origins briefly offline no longer stay stale forever)
 async function fetchNoteAP(url) {
   try {
@@ -2052 +2052 @@
     let rows = [];
     try { rows = db.prepare('SELECT id, content, media_json, nsfw, cw, url FROM ap_timeline ORDER BY rowid DESC LIMIT 200').all(); } catch { /* no table */ }
-    let healed = 0;
+    let healed = 0, failed = 0;
     for (const r of rows) {
       try {
         const note = await fetchNoteAP(r.id);
         if (note === 404) { db.prepare('DELETE FROM ap_timeline WHERE id = ?').run(r.id); healed++; continue; }
-        if (!note || typeof note !== 'object') continue;
+        if (!note || typeof note !== 'object') { failed++; continue; } // origin unreachable right now
         const html = HtmlSanitizerService.sanitize(note.content || '');
         const media = mediaFromNote(note);
@@ -2067 +2067 @@
           healed++;
         }
-      } catch { /* per-note best-effort */ }
-    }
-    try { db.prepare('INSERT OR REPLACE INTO app_settings (key, value) VALUES (?, ?)').run('selfheal_version', String(SELFHEAL_VERSION)); } catch { /* ignore */ }
-    if (rows.length) console.log(`[AP] self-heal v${SELFHEAL_VERSION}: ${healed}/${rows.length} timeline notes`);
+      } catch { failed++; /* per-note best-effort */ }
+    }
+    // Only mark this version DONE after a clean pass. Some origins are briefly
+    // offline exactly when we heal (phone-hosted instances!): skipping them and
+    // consuming the version would leave those rows stale forever. Instead retry
+    // on the next boots, giving up after a few attempts (permanently-dead
+    // origins answer 404/410 and are deleted above, so they don't loop).
+    const setSetting = (k, v) => { try { db.prepare('INSERT OR REPLACE INTO app_settings (key, value) VALUES (?, ?)').run(k, String(v)); } catch { /* ignore */ } };
+    let attempts = 0;
+    try { const a = db.prepare('SELECT value FROM app_settings WHERE key = ?').get('selfheal_attempts'); attempts = a ? (parseInt(a.value, 10) || 0) : 0; } catch { /* ignore */ }
+    if (failed === 0 || attempts >= 4) {
+      setSetting('selfheal_version', SELFHEAL_VERSION);
+      setSetting('selfheal_attempts', 0);
+    } else {
+      setSetting('selfheal_attempts', attempts + 1);
+    }
+    if (rows.length) console.log(`[AP] self-heal v${SELFHEAL_VERSION}: ${healed}/${rows.length} timeline notes${failed ? ` (${failed} unreachable — will retry next boot)` : ''}`);
   } catch { /* never block boot */ } finally { _selfHealing = false; }
 }