source: Klonkt/src/routes/guardian.js@ c26cc18

main
Last change on this file since c26cc18 was c26cc18, checked in by Robin Genis <roboburr@…>, 7 weeks ago

Guardian-PWA: duidelijker + verstuurde offer altijd zichtbaar

Twee klachten opgelost.

"Ik zie niet dat ik verstuurd heb": de offer werd wél opgeslagen, maar als de
directe bezorging aan de remote ward faalde gaf de flow 502 en ververste de
PWA niet, dus de kaart verscheen niet. Nu: bezorging is async met retry (de
delivery-queue), de handshake geeft altijd 202 (opgeslagen) met een
delivered-vlag, en de PWA ververst altijd en toont de offer onder een eigen
sectie "Verzonden aanvragen · wacht op antwoord". Faalt de eerste bezorging,
dan meldt de UI dat we blijven proberen.

"Mag allemaal duidelijker": de pagina is herzien met vaste secties met kop en
uitleg: Hulpverzoeken (met teller), Ward adopteren (met uitleg wat er gebeurt),
Verzonden aanvragen, Mijn wards (actief-tag), Meldingen. Statussen als tags,
nette lege staten, alles via i18n (nl/en/de).

Changed files:
src/services/ActivityPubService.js

  • deliverToActor: enqueue+retry+logging, geeft {delivered, inbox}

src/services/guardianship/handshake.js

src/routes/guardian.js

  • /adopt niet meer hard falen op bezorg-hik; delivered terug; meer strings

src/views/pages/guardian.ejs

  • herziene, duidelijke secties

src/assets/js/guardian.js

  • aparte "Verzonden aanvragen"-sectie, altijd verversen na adopt

src/assets/css/guardian.css

  • sectie-koppen, status-tags, nette lege staten

src/services/i18n.js

  • uitgebreide guardian.*-teksten nl/en/de

remarks: als de offer "niet binnenkomt" bij de ward, moet diens Klonkt de
nieuwe code draaien (demo/beta/demohub zijn bij); een oude Klonkt of Mastodon
snapt de Offer-Relationship niet.

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

  • Property mode set to 100644
File size: 6.3 KB
Line 
1/**
2 * The Guardian PWA (FEP-633c): a separate, installable corner of Klonkt for
3 * guardians. One place to add and manage wards, a message centre for
4 * incoming help requests and adoption traffic, and its own push channel
5 * (alert types 'help' and 'guardian', web-push slice reused).
6 *
7 * Everything is scoped to a site the logged-in user OWNS: the guardian acts
8 * as one of their own actors (?site=slug picks one when they own several).
9 * Views carry no inline scripts (CSP): logic lives in /assets/js/guardian.js.
10 */
11import express from 'express';
12import db from '../config/database.js';
13import { requireAuth } from '../middleware/auth.js';
14import AP from '../services/ActivityPubService.js';
15import * as Guardianship from '../services/guardianship/index.js';
16import { t as i18nT, resolveLang } from '../services/i18n.js';
17
18const router = express.Router();
19
20/** The acting site: ?site=slug when owned, else the user's first site. */
21function siteForUser(req) {
22 const userId = req.session.user.id;
23 const want = String(req.query.site || req.body?.site || '').trim();
24 if (want) {
25 const s = db.prepare('SELECT * FROM sites WHERE slug = ? AND owner_id = ?').get(want, userId);
26 if (s) return s;
27 }
28 return db.prepare('SELECT * FROM sites WHERE owner_id = ? ORDER BY id LIMIT 1').get(userId);
29}
30
31/** Everything the dashboard shows, one shape for page and API. */
32function uiStrings(L) {
33 const keys = ['sent', 'sent_retry', 'sending', 'not_found', 'failed', 'network',
34 'pending', 'active', 'retract', 'release', 'open', 'push_unavailable'];
35 return Object.fromEntries(keys.map((k) => [k, i18nT(L, `guardian.${k}`)]));
36}
37
38function dashboardState(site, L) {
39 const wards = Guardianship.listWards(site.slug);
40 const help = db.prepare(
41 `SELECT object_uri, note_url, actor_uri, actor_name, actor_handle, actor_icon, content, published, created_at
42 FROM ap_mentions WHERE slug = ? AND help_request = 1 ORDER BY created_at DESC LIMIT 50`
43 ).all(site.slug);
44 return {
45 site: site.slug,
46 wards: wards.filter((w) => w.status === 'accepted'),
47 pendingOffers: wards.filter((w) => w.status === 'offered'),
48 help,
49 strings: uiStrings(L),
50 };
51}
52
53// ── The PWA page ─────────────────────────────────────────────────────────
54router.get('/', requireAuth, (req, res) => {
55 const site = siteForUser(req);
56 const L = resolveLang(req);
57 if (!site) return res.status(404).send('No site for this account.');
58 const sites = db.prepare('SELECT slug, title FROM sites WHERE owner_id = ? ORDER BY id').all(req.session.user.id);
59 res.render('pages/guardian', {
60 state: dashboardState(site, L),
61 sites,
62 lang: L,
63 t: (k, v) => i18nT(L, k, v),
64 cspNonce: res.locals.cspNonce,
65 });
66});
67
68// ── JSON state for refreshes ─────────────────────────────────────────────
69router.get('/api/state', requireAuth, (req, res) => {
70 const site = siteForUser(req);
71 if (!site) return res.status(404).json({ error: 'no_site' });
72 res.json(dashboardState(site, resolveLang(req)));
73});
74
75// ── Adopt a ward: handle → resolve → C2S Offer through the same pipeline
76// the Shaer apps use (one path, one behavior).
77router.post('/adopt', requireAuth, express.json({ limit: '4kb' }), async (req, res) => {
78 const site = siteForUser(req);
79 if (!site) return res.status(404).json({ error: 'no_site' });
80 const handle = String(req.body?.handle || '').trim();
81 if (!handle) return res.status(400).json({ error: 'empty_handle' });
82 const wardUri = /^https?:\/\//i.test(handle) ? handle : await AP.webfingerResolve(handle).catch(() => null);
83 if (!wardUri) return res.status(404).json({ error: 'not_found' }); // the handle does not resolve to an account
84 const base = (process.env.PUBLIC_BASE_URL || '').replace(/\/+$/, '');
85 const me = AP.actorId(base, site.slug);
86 const r = await AP.ingestOutboxActivity(site, req.session.user, {
87 type: 'Offer',
88 object: { type: 'Relationship', subject: wardUri, relationship: 'shaer:Guardian', object: me },
89 });
90 // 403/400 = a real refusal (e.g. you are a ward yourself); anything else the
91 // offer is recorded and delivery is retried in the background.
92 if (!r || (r.status >= 400 && r.status !== 502)) return res.status(r?.status || 500).json({ error: r?.error || 'offer_failed' });
93 res.json({ ok: true, ward: wardUri, delivered: r.delivered !== false });
94});
95
96// ── Manage: retract a pending offer / release a ward ─────────────────────
97router.post('/wards/remove', requireAuth, express.json({ limit: '4kb' }), (req, res) => {
98 const site = siteForUser(req);
99 if (!site) return res.status(404).json({ error: 'no_site' });
100 const uri = String(req.body?.uri || '').trim();
101 if (!uri) return res.status(400).json({ error: 'empty_uri' });
102 Guardianship.removeRelation(site.slug, 'guardian', uri);
103 res.json({ ok: true });
104});
105
106// ── The installable identity: own scope so the Guardian corner installs as
107// its own app next to the site PWA.
108router.get('/manifest.webmanifest', (req, res) => {
109 const site = res.locals.site;
110 res.set('Cache-Control', 'no-cache');
111 res.json({
112 id: `klonkt-guardian-${site?.slug || 'guardian'}`,
113 name: 'Klonkt Guardian',
114 short_name: 'Guardian',
115 description: 'Ward management and help requests for guardians.',
116 scope: '/guardian/',
117 start_url: '/guardian?source=pwa',
118 display: 'standalone',
119 display_override: ['standalone', 'minimal-ui'],
120 orientation: 'any',
121 background_color: '#141a24',
122 theme_color: '#ff6b35',
123 lang: site?.language || 'nl',
124 icons: [
125 { src: '/guardian/icon.svg', sizes: 'any', type: 'image/svg+xml' },
126 ],
127 });
128});
129
130// The buoy mark, in the guardian accent (mirrors the site favicon pattern).
131router.get('/icon.svg', (req, res) => {
132 const svg = `<?xml version="1.0" encoding="UTF-8"?>
133<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
134 <rect width="64" height="64" rx="14" fill="#ff6b35"/>
135 <text x="50%" y="50%" dy="0.35em" text-anchor="middle" font-size="36">&#128735;</text>
136</svg>`;
137 res.set('Content-Type', 'image/svg+xml');
138 res.set('Cache-Control', 'public, max-age=86400');
139 res.send(svg);
140});
141
142export default router;
Note: See TracBrowser for help on using the repository browser.