source: Klonkt/src/assets/js/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: 8.7 KB
RevLine 
[c26cc18]1/* Guardian PWA client (FEP-633c): renders the dashboard, adopts wards, and
2 manages the guardian push channel. No framework, no inline scripts (CSP).
3 All user-facing text comes from state.strings (server i18n). */
[318d0c2]4(function () {
5 'use strict';
[c26cc18]6 var S = JSON.parse(document.getElementById('guardian-state').textContent || '{}');
7 var T = S.strings || {};
[318d0c2]8
9 function el(tag, cls, text) {
10 var n = document.createElement(tag);
11 if (cls) n.className = cls;
12 if (text != null) n.textContent = text;
13 return n;
14 }
15 function handleOf(uri, cached) {
16 if (cached) return cached;
17 try { var u = new URL(uri); return '@' + u.pathname.split('/').filter(Boolean).pop() + '@' + u.host; }
18 catch (e) { return uri; }
19 }
[c26cc18]20 function when(s) { return String(s || '').slice(0, 16).replace('T', ' '); }
21 function show(id, on) { document.getElementById(id).hidden = !on; }
[318d0c2]22
[c26cc18]23 // ── 1. Help requests ───────────────────────────────────────────────────
[318d0c2]24 function renderHelp() {
25 var list = document.getElementById('help-list');
26 list.textContent = '';
[c26cc18]27 var help = S.help || [];
28 help.forEach(function (h) {
[318d0c2]29 var card = el('div', 'g-card help');
30 var row = el('div', 'row');
[c26cc18]31 row.appendChild(el('span', 'who grow', h.actor_name || handleOf(h.actor_uri, h.actor_handle)));
32 row.appendChild(el('span', 'when', when(h.published || h.created_at)));
[318d0c2]33 card.appendChild(row);
34 var body = el('div', 'body');
[c26cc18]35 body.innerHTML = h.content || ''; // sanitized server-side on ingest
[318d0c2]36 card.appendChild(body);
37 if (h.note_url) {
[c26cc18]38 var a = el('a', 'g-link', T.open || 'open');
39 a.href = h.note_url; a.target = '_blank'; a.rel = 'noopener';
40 card.appendChild(a);
[318d0c2]41 }
42 list.appendChild(card);
43 });
[c26cc18]44 var badge = document.getElementById('help-count');
45 badge.textContent = help.length; badge.hidden = help.length === 0;
46 show('help-empty', help.length === 0);
[318d0c2]47 }
48
[c26cc18]49 // ── 3. Pending offers I sent ───────────────────────────────────────────
50 function renderPending() {
51 var list = document.getElementById('pending-list');
52 list.textContent = '';
53 var pend = S.pendingOffers || [];
54 pend.forEach(function (w) {
55 var card = el('div', 'g-card');
56 var row = el('div', 'row');
57 row.appendChild(el('span', 'who grow', handleOf(w.other_uri, w.other_handle)));
58 row.appendChild(el('span', 'tag wait', T.pending));
59 var btn = el('button', 'quiet small', T.retract);
60 btn.addEventListener('click', function () { remove(w.other_uri, btn); });
61 row.appendChild(btn);
62 card.appendChild(row);
63 list.appendChild(card);
[318d0c2]64 });
[c26cc18]65 show('pending-section', pend.length > 0);
[318d0c2]66 }
[c26cc18]67
68 // ── 4. Accepted wards ──────────────────────────────────────────────────
[318d0c2]69 function renderWards() {
[c26cc18]70 var list = document.getElementById('wards-list');
71 list.textContent = '';
72 var wards = S.wards || [];
73 wards.forEach(function (w) {
74 var card = el('div', 'g-card');
75 var row = el('div', 'row');
76 row.appendChild(el('span', 'who grow', handleOf(w.other_uri, w.other_handle)));
77 row.appendChild(el('span', 'tag ok', T.active));
78 var btn = el('button', 'quiet small', T.release);
79 btn.addEventListener('click', function () { remove(w.other_uri, btn); });
80 row.appendChild(btn);
81 card.appendChild(row);
82 list.appendChild(card);
83 });
84 show('wards-empty', wards.length === 0);
85 }
86
87 function remove(uri, btn) {
88 btn.disabled = true;
89 fetch('/guardian/wards/remove', {
90 method: 'POST', headers: { 'Content-Type': 'application/json' },
91 body: JSON.stringify({ uri: uri, site: S.site }),
92 }).then(refresh);
[318d0c2]93 }
94
[c26cc18]95 function renderAll() { renderHelp(); renderPending(); renderWards(); }
96
[318d0c2]97 function refresh() {
[c26cc18]98 return fetch('/guardian/api/state?site=' + encodeURIComponent(S.site))
[318d0c2]99 .then(function (r) { return r.json(); })
[c26cc18]100 .then(function (s) { if (s && !s.error) { S = s; T = s.strings || T; renderAll(); } });
[318d0c2]101 }
102
[c26cc18]103 // ── 2. Adopt ───────────────────────────────────────────────────────────
104 var form = document.getElementById('adopt-form');
105 var input = document.getElementById('adopt-handle');
106 var adoptBtn = document.getElementById('adopt-btn');
107 var msg = document.getElementById('adopt-msg');
108 function setMsg(text, isErr) { msg.hidden = false; msg.className = 'g-msg' + (isErr ? ' err' : ''); msg.textContent = text; }
109
110 form.addEventListener('submit', function (ev) {
[318d0c2]111 ev.preventDefault();
112 var handle = input.value.trim();
113 if (!handle) return;
[c26cc18]114 adoptBtn.disabled = true;
115 setMsg(T.sending || '…', false);
[318d0c2]116 fetch('/guardian/adopt', {
117 method: 'POST', headers: { 'Content-Type': 'application/json' },
[c26cc18]118 body: JSON.stringify({ handle: handle, site: S.site }),
[318d0c2]119 }).then(function (r) { return r.json().then(function (j) { return { ok: r.ok, j: j }; }); })
120 .then(function (res) {
[c26cc18]121 adoptBtn.disabled = false;
122 if (res.ok) {
123 input.value = '';
124 // Always refresh: the offer is recorded even if delivery is still
125 // in flight. Show it under "Verzonden aanvragen".
126 setMsg(res.j.delivered === false ? T.sent_retry : T.sent, false);
127 refresh();
128 } else {
129 setMsg((res.j.error === 'not_found' ? T.not_found : T.failed) , true);
130 }
[318d0c2]131 })
[c26cc18]132 .catch(function () { adoptBtn.disabled = false; setMsg(T.network, true); });
[318d0c2]133 });
134
135 // ── Site picker ────────────────────────────────────────────────────────
136 var picker = document.getElementById('site-picker');
137 if (picker) picker.addEventListener('change', function () {
138 location.href = '/guardian?site=' + encodeURIComponent(picker.value);
139 });
140
[c26cc18]141 // ── 5. Push ────────────────────────────────────────────────────────────
[318d0c2]142 var toggle = document.getElementById('push-toggle');
143 var pmsg = document.getElementById('push-msg');
144 function pushState() {
145 if (!('serviceWorker' in navigator) || !('PushManager' in window)) { toggle.disabled = true; return; }
146 navigator.serviceWorker.register('/sw.js').catch(function () {});
147 navigator.serviceWorker.ready
148 .then(function (reg) { return reg.pushManager.getSubscription(); })
149 .then(function (sub) {
150 toggle.textContent = sub ? toggle.dataset.onLabel : toggle.dataset.offLabel;
151 toggle.dataset.subscribed = sub ? '1' : '';
[c26cc18]152 toggle.classList.toggle('is-on', !!sub);
[318d0c2]153 });
154 }
155 function urlB64(base64) {
156 var pad = '='.repeat((4 - (base64.length % 4)) % 4);
157 var b = (base64 + pad).replace(/-/g, '+').replace(/_/g, '/');
158 var raw = atob(b); var arr = new Uint8Array(raw.length);
159 for (var i = 0; i < raw.length; i++) arr[i] = raw.charCodeAt(i);
160 return arr;
161 }
162 toggle.addEventListener('click', function () {
163 pmsg.hidden = true;
164 navigator.serviceWorker.ready.then(function (reg) {
165 if (toggle.dataset.subscribed) {
166 reg.pushManager.getSubscription().then(function (sub) {
167 if (!sub) return;
168 fetch('/push/unsubscribe', {
169 method: 'POST', headers: { 'Content-Type': 'application/json' },
170 body: JSON.stringify({ endpoint: sub.endpoint }),
171 }).then(function () { return sub.unsubscribe(); }).then(pushState);
172 });
173 return;
174 }
175 fetch('/push/vapid').then(function (r) { return r.json(); }).then(function (v) {
176 if (!v.publicKey) throw new Error('no key');
177 return reg.pushManager.subscribe({ userVisibleOnly: true, applicationServerKey: urlB64(v.publicKey) });
178 }).then(function (sub) {
179 return fetch('/push/subscribe', {
180 method: 'POST', headers: { 'Content-Type': 'application/json' },
181 body: JSON.stringify({
182 subscription: sub.toJSON(),
183 alerts: { help: 1, guardian: 1, dm: 1, follow: 0, reply: 0, like: 0, boost: 0 },
184 uaLabel: 'Guardian PWA',
185 }),
186 });
187 }).then(pushState).catch(function (e) {
[c26cc18]188 pmsg.hidden = false; pmsg.className = 'g-msg err';
189 pmsg.textContent = (T.push_unavailable || 'Push unavailable') + ': ' + e.message;
[318d0c2]190 });
191 });
192 });
193
[c26cc18]194 renderAll(); pushState();
195 setInterval(refresh, 45000); // live-ish while open
[318d0c2]196})();
Note: See TracBrowser for help on using the repository browser.