Changeset 2a17f0a in Klonkt

Timestamp:

07/30/2026 11:54:08 PM (6 weeks ago)

Author:

Robin <roboburr@…>

Branches:

main

Children:

0f48411

Parents:

ef519a3

Message:

Long-poll op nieuws: de thread blijft live zonder pull-to-refresh

Robins vraag (31-7): pull-to-refresh in een thread dwingt omhoog
scrollen; een knop is een pleister; long-poll is de echte vorm. GET
/ap/users/:slug/inbox/wait (owner-bearer) blijft hangen tot er iets
push-waardigs voor dat account landt (bericht, reply, wave,
hulp-request; dezelfde momenten als de webpush, want de wekker haakt in
pushEvent) en antwoordt dan 200; na ~25s stilte 204 en de app her-wapent.
In-process met opzet: een Klonkt is een proces, een waiter een callback.

Changed files:
src/services/ActivityPubService.js

• onNews/wakeNews (waiter-registry); pushEvent wekt de waiters

src/routes/activitypub.js

• /ap/users/:slug/inbox/wait: 200 bij nieuws, 204 na timeout, opgeruimd bij client-close

New file:
test/long-poll.test.js

• elke waiter een keer gewekt, alleen het eigen account, afgemeld blijft stil

-robo
Co-Authored-By: Claude Opus 4.8 <noreply@…>

Files:

• src/routes/activitypub.js (modified) (1 diff)
• src/services/ActivityPubService.js (modified) (2 diffs)
• test/long-poll.test.js (added)

src/routes/activitypub.js

@@ -174 +174 @@
   <p class="small">No Shaer? Any fediverse app can follow ${esc(handle)}.</p>
 </main></body></html>`);
+});
+
+// ── Long-poll (owner only, Robins verzoek 31-7) ───────────────────
+// Hold the request until something push-worthy lands for this account, then
+// answer 200 (news: re-read your feed) or 204 after ~25s (nothing: re-arm).
+// The thread in the app stays live without interval polling.
+router.get('/ap/users/:slug/inbox/wait', (req, res) => {
+  const auth = OAuth.verifyBearer(req.headers.authorization);
+  if (!auth || auth.site.slug !== req.params.slug) return res.status(403).end();
+  let settled = false;
+  const done = (code) => {
+    if (settled) return;
+    settled = true;
+    clearTimeout(timer);
+    off();
+    if (!res.headersSent) res.status(code).end();
+  };
+  const off = AP.onNews(auth.site.slug, () => done(200));
+  const timer = setTimeout(() => done(204), 25_000);
+  req.on('close', () => done(204));
 });
 

src/services/ActivityPubService.js

@@ -1363 +1363 @@
 function pushEvent(slug, event) {
   try { Push.notifySite(slug, event).catch(() => {}); } catch { /* never throw */ }
+  wakeNews(slug);   // long-poll waiters (Robins verzoek, 31-7): same moments as push
+}
+
+// ── Long-poll on news (Robins verzoek, 31-7) ─────────────────────
+// The app holds GET /ap/users/:slug/inbox/wait open; the moment anything
+// push-worthy lands for that account (a message, a reply, a wave, a help
+// request) every waiter is woken and the app re-reads its feed. In-process
+// on purpose: one Klonkt is one process, and a waiter is one callback.
+const _newsWaiters = new Map();   // slug -> Set<cb>
+export function onNews(slug, cb) {
+  let set = _newsWaiters.get(slug);
+  if (!set) { set = new Set(); _newsWaiters.set(slug, set); }
+  set.add(cb);
+  return () => { set.delete(cb); if (!set.size) _newsWaiters.delete(slug); };
+}
+export function wakeNews(slug) {
+  const set = _newsWaiters.get(slug);
+  if (!set || !set.size) return;
+  const cbs = [...set];
+  set.clear();
+  _newsWaiters.delete(slug);
+  for (const cb of cbs) { try { cb(); } catch { /* a waiter must never break the rest */ } }
 }
 // Hub-aware path prefix for a site's pages ('' in solo).
@@ -4250 +4272 @@
   linkifyBody, bakePostContent, bakePostContentWithMentions, listFollowers, removeFollower, listConnections,
   noteVisibility, belongsInTimeline, playerUrlFor, isRejectedObject, rejectInteraction, interactionReportTarget,
-  getMessages, notificationsSeenAt, ingestOutboxActivity, c2sVisibility, actorDisplay, buildActorRef, prefersEnriched, selfAuthor, getReplyMessages,
+  getMessages, notificationsSeenAt, ingestOutboxActivity, c2sVisibility, actorDisplay, buildActorRef, prefersEnriched, selfAuthor, getReplyMessages, onNews, wakeNews,
 };