Changeset 780a7c6 in Klonkt for src/routes


Ignore:
Timestamp:
07/24/2026 07:44:15 PM (7 weeks ago)
Author:
Robin Genis <roboburr@…>
Branches:
main
Children:
b5924eb
Parents:
c26cc18
Message:

Guardianship Fase 0+1: de echte multi-party handshake (FEP-633c §3)

De eerste versie committeerde na één accept. Nu de spec: geen enkele partij
maakt een voogdij alleen, en een nieuwe guardian erbij kan niet zonder
toestemming van de bestaande. Daemon als blauwdruk, zodat Klonkt en de
test-daemon exact hetzelfde gedragen en de Shaer-clients één contract lezen.

Fase 0 (datamodel): ap_guardian_offers (per lokale partij een kopie van de
handshake, PK slug+offer_id) + ap_guardian_offer_accepts (de accept-tally).
ap_guardianships houdt alleen nog de GECOMMITTE relaties.

Fase 1 (state-machine): offers.js is een getrouwe port van de daemon-Handshake
(accepts over ward+candidate+existing; ready = ward && candidate && (geen
existing OF >=1 existing); een Reject voidt). handshake.js orchestreert het
gedistribueerd: de kandidaat adresseert de Offer aan ward + alle bestaande
guardians (§3.1.1); elke Accept wordt aan alle andere partijen gebroadcast, dus
elke instance-kopie convergeert; zodra een kopie compleet is committeert die
lokaal (ward schrijft shaer:guardians, guardian schrijft z'n ward), met de
kandidaat-inbox als handle (§6). Volgorde-onafhankelijk.

Ook: §1 wederzijdse uitsluiting (een ward is nooit ook guardian in het
actor-doc), de queues vullen nu de echte accept-tally (needsMyAccept/
readyToCommit/acceptedBy/existingGuardians), en de PWA + Berichten beantwoorden
via de C2S Accept/Reject-pijplijn per offer-id. De co-guardian ziet een
mede-voogdij-aanvraag met accepteer/weiger in de PWA.

Changed files:
src/config/database.js

  • tabellen ap_guardian_offers + ap_guardian_offer_accepts

src/services/guardianship/offers.js (NEW)

  • de handshake-state-machine (daemon-port), per-instance in SQLite

src/services/guardianship/relations.js

  • alleen commit-writers + actor-props (§1 uitsluiting)

src/services/guardianship/handshake.js

  • gedistribueerde multi-party C2S/S2S orchestratie

src/services/guardianship/queues.js

  • offers-queue uit de state-machine

src/services/guardianship/index.js

  • exports bijgewerkt

src/services/ActivityPubService.js

  • wire localSlug + fetchActor; inbound-routing naar alle lokale partijen

src/routes/guardian.js

  • dashboard toont offers met tally; POST /guardian/offer (accept/reject)

src/routes/posts.js

  • Berichten toont ward-offers uit de state-machine; accept via offer-id

src/views/pages/messages.ejs, src/assets/js/guardian.js, src/assets/css/guardian.css

  • offer-kaarten per state (mijn aanvraag / mede-voogdij / wachten)

src/services/i18n.js

  • accept/reject/complete/coguard + co-guardian push (nl/en/de)

test/guardianship.test.js

  • multi-party: eerste guardian, co-approval bestaande guardian, reject voidt, ward-mag-niet-guarden, vaste initiator

remarks: Fase 2 (follow-gating), 3 (hasGuardians + Not-a-Teapot), 4 (Undo/
emancipatie) volgen. 164 tests groen.

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

Location:
src/routes
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • src/routes/guardian.js

    rc26cc18 r780a7c6  
    3232function uiStrings(L) {
    3333  const keys = ['sent', 'sent_retry', 'sending', 'not_found', 'failed', 'network',
    34     'pending', 'active', 'retract', 'release', 'open', 'push_unavailable'];
     34    'pending', 'active', 'retract', 'release', 'open', 'push_unavailable',
     35    'accept', 'reject', 'complete', 'awaiting_others', 'coguard'];
    3536  return Object.fromEntries(keys.map((k) => [k, i18nT(L, `guardian.${k}`)]));
    3637}
    3738
    3839function dashboardState(site, L) {
    39   const wards = Guardianship.listWards(site.slug);
     40  const base = (process.env.PUBLIC_BASE_URL || '').replace(/\/+$/, '');
     41  const me = AP.actorId(base, site.slug);
    4042  const help = db.prepare(
    4143    `SELECT object_uri, note_url, actor_uri, actor_name, actor_handle, actor_icon, content, published, created_at
    … …  
    4446  return {
    4547    site: site.slug,
    46     wards: wards.filter((w) => w.status === 'accepted'),
    47     pendingOffers: wards.filter((w) => w.status === 'offered'),
     48    me,
     49    wards: Guardianship.listWards(site.slug),               // committed wards
     50    offers: Guardianship.offersCollection(`${me}/queues/offers`, site.slug, me).orderedItems,
    4851    help,
    4952    strings: uiStrings(L),
    … …  
    9497});
    9598
    96 // ── Manage: retract a pending offer / release a ward ─────────────────────
     99// ── Answer an offer (co-guardian accept/reject, or the candidate's final
     100//    "complete"). All three are a C2S Accept/Reject on the offer id; the
     101//    handshake module decides when it commits (§3.1).
     102router.post('/offer', requireAuth, express.json({ limit: '4kb' }), async (req, res) => {
     103  const site = siteForUser(req);
     104  if (!site) return res.status(404).json({ error: 'no_site' });
     105  const offerId = String(req.body?.offer || '').trim();
     106  const answer = req.body?.answer === 'reject' ? 'Reject' : 'Accept';
     107  if (!offerId) return res.status(400).json({ error: 'empty_offer' });
     108  const r = await AP.ingestOutboxActivity(site, req.session.user, { type: answer, object: offerId });
     109  if (!r || r.status >= 400) return res.status(r?.status || 500).json({ error: r?.error || 'answer_failed' });
     110  res.json({ ok: true, committed: !!r.committed, readyToCommit: !!r.readyToCommit });
     111});
     112
     113// ── Manage: release a committed ward (local Undo; federation is Fase 4). ──
    97114router.post('/wards/remove', requireAuth, express.json({ limit: '4kb' }), (req, res) => {
    98115  const site = siteForUser(req);

  • src/routes/posts.js

    rc26cc18 r780a7c6  
    931931    return renderPage(req, res, 'partials/messages-append', { items, seen: seenAt, hasMore, nextOffset: offset + FEED_PAGE, moreBase });
    932932  }
    933   // FEP-633c: pending guardianship offers TO this account (ward side) show
    934   // as a special message with an accept button (Robins besluit: the kid
    935   // answers in their own Klonkt; safety is handled out-of-band by the
    936   // guardians themselves).
    937   const guardianOffers = site
    938     ? Guardianship.listOffers(site.slug).filter((o) => o.role === 'ward')
    939     : [];
     933  // FEP-633c: pending guardianship offers TO this account (I am the ward)
     934  // show as a special message with an accept button (Robins besluit: the kid
     935  // answers in its own Klonkt; safety is out-of-band by the guardians).
     936  const gBase = (process.env.PUBLIC_BASE_URL || '').replace(/\/+$/, '');
     937  const gMe = site ? ActivityPubService.actorId(gBase, site.slug) : null;
     938  const guardianOffers = (site
     939    ? Guardianship.offersCollection(`${gMe}/queues/offers`, site.slug, gMe).orderedItems
     940    : []).filter((o) => o['shaer:ward'] === gMe && o['shaer:needsMyAccept']);
    940941  renderPage(req, res, 'pages/messages', {
    941942    pageTitleKey: 'msg.title', bodyClass: 'on-special', items, seenAt,
    … …  
    951952  const back = `${res.locals.siteUrlBase || ''}/messages`;
    952953  const answer = req.body.answer === 'accept' ? 'Accept' : (req.body.answer === 'reject' ? 'Reject' : null);
    953   const guardian = String(req.body.guardian || '').trim();
    954   if (!site || !answer || !guardian) return res.redirect(back + '?error=guardianship');
    955   const row = Guardianship.getRelation(site.slug, 'ward', guardian);
    956   if (!row || row.status !== 'offered') return res.redirect(back + '?error=guardianship');
     954  const offer = String(req.body.offer || '').trim();
     955  if (!site || !answer || !offer) return res.redirect(back + '?error=guardianship');
    957956  try {
    958     const base = (process.env.PUBLIC_BASE_URL || '').replace(/\/+$/, '');
    959     const me = ActivityPubService.actorId(base, site.slug);
    960     const r = await Guardianship.handleGuardianshipOutbox(site, {
    961       type: answer,
    962       object: row.offer_id || { type: 'Relationship', subject: me, relationship: 'shaer:Guardian', object: guardian },
    963     });
     957    // Same C2S Accept/Reject the apps use; the handshake module records the
     958    // ward's accept and (once the candidate returns the handle) commits.
     959    const r = await ActivityPubService.ingestOutboxActivity(site, req.session.user, { type: answer, object: offer });
    964960    if (r && r.status < 400) return res.redirect(back + '?success=' + (answer === 'Accept' ? 'guardian_accepted' : 'guardian_rejected'));
    965961  } catch { /* fall through */ }
Note: See TracChangeset for help on using the changeset viewer.