fedipod 1.42.0 → 1.43.0

package/lib/core/deliver.mjs

@@ -61,9 +61,14 @@ export class Deliverer {
   // passive: signing-only (viewer-mode agents) — no queue drain timer, so a
   // read-only agent never mutates shared delivery state. startQueue() flips
   // it live when a viewer is promoted to active.
+  // defer: nothing is sent now; every delivery goes on the queue, signed, for
+  // drainQueue() to make. For a process with seconds to answer — a door
+  // placing a post as it lands — which records what to send and leaves the
+  // sending to the run it starts.
   constructor({ store, keyId, rsaPrivate, actorId = null, edPrivate = null, proofKeyId = null,
-    log = console.log, passive = false, onGone = null }) {
+    log = console.log, passive = false, defer = false, onGone = null }) {
     this.store = store;
+    this.defer = defer;
     // Called after followers at a gone inbox are dropped: the agent republishes
     // its followers collection.
     this.onGone = onGone;
@@ -205,6 +210,7 @@ export class Deliverer {
     // Proved before anything else, so the copy that goes on the queue is the
     // copy that was signed — a retry days later must not post a bare activity.
     const signed = await this.proofed(activity);
+    if (this.defer) { this._enqueue({ inbox, activity: signed, attempts: 0, nextAt: Date.now() }); return; }
     if (this._queueIfCooling(inbox, signed)) return;
     const [result] = await this.deliverManyNow([{ inbox, activity: signed }]);
     await this._settle(inbox, signed, result);
@@ -273,6 +279,10 @@ export class Deliverer {
     // by the next.
     const targets = [...new Set(inboxes)].filter((inbox) => !this._blockedInbox(inbox))
       .map((inbox) => ({ inbox, activity: signed }));
+    if (this.defer) {
+      for (const t of targets) this._enqueue({ inbox: t.inbox, activity: signed, attempts: 0, nextAt: Date.now() });
+      return;
+    }
     for (let i = 0; i < targets.length; i += this.batchSize) {
       const chunk = targets.slice(i, i + this.batchSize).filter((t) => !this._queueIfCooling(t.inbox, signed));
       if (!chunk.length) continue;

package/lib/core/intake/group.mjs

@@ -171,6 +171,16 @@ export async function amplify(intake, noteId, { approved = false, activity = nul
     serial: intake.serial++,
     audience: intake.urls.actor,
   });
+  // What the group is about to carry is what the group's conversation holds.
+  // A forum places the post in its topic here, BEFORE the carry: the topic is
+  // what the category vouches for (FEP-7888), and a place that will not take
+  // the post — a locked topic — answers false and nothing is carried. Both
+  // the Announce and what its author sent: a forum reads the author's own
+  // activity — the name they gave the topic they were opening is on that one.
+  if (intake.onCarry) {
+    const placed = await intake.onCarry({ noteId, actor: s.actor, activity: act, sent: activity });
+    if (placed === false) { intake.log(`not amplified — ${noteId} has no place here`); return; }
+  }
   await intake.deliverer.deliverToAll(inboxes, act);
   // Marked carried before recorded: a failed outbox write costs one missing
   // entry, a failed status write would carry the same post twice.
@@ -180,17 +190,6 @@ export async function amplify(intake, noteId, { approved = false, activity = nul
   if (!intake.config.private) await intake.publisher.recordOutbox(act);
   intake.store.setPending(intake.store.getPending().filter(p => p.noteId !== noteId));
   intake.log(`amplified ${noteId} → ${inboxes.length} inbox(es)`);
-  // What the group carried is what the group's conversation holds. A forum
-  // places the post in its topic here — after the carry, so only what the
-  // category vouched for is in the topic (FEP-7888 ownership). Its failure
-  // never undoes the carry.
-  if (intake.onCarried) {
-    // Both: what the group said (the Announce) and what its author sent. A
-    // forum reads the author's own activity — the name they gave the topic
-    // they were opening is on that one, and on no other.
-    await intake.onCarried({ noteId, actor: s.actor, activity: act, sent: activity })
-      .catch(e => intake.log(`after the carry of ${noteId}: ${e.message}`));
-  }
   // The same carry, shown natively to the group's Bluesky followers.
   await intake.bskyGroup?.mirrorCarry(s)
     .catch(e => intake.log(`bluesky mirror of the carry failed: ${e.message}`));

package/lib/gateway/copy.mjs

@@ -149,9 +149,12 @@ export async function holds(kv, h, holder) {
 export class CopyStorage {
   // `podNames`: which of the pod-only documents to list (all, by default). The
   // gateway's own agents need only the key.
-  constructor(kv, handle, { holder, pod = null, onRefused = null, podNames = null }) {
+  // `fence`: the copy whose lease decides who may write this one. A forum's
+  // categories are fenced by the forum's copy, since one lease runs the forum.
+  constructor(kv, handle, { holder, pod = null, onRefused = null, podNames = null, fence = null }) {
     this.kv = kv;
     this.h = account(handle);
+    this.fence = fence ? account(fence) : this.h;
     this.holder = holder;
     this.pod = pod;
     this.onRefused = onRefused;
@@ -186,7 +189,7 @@ export class CopyStorage {
 
   // A refusal is an answer, not a hiccup: the lease is someone else's.
   async _fenced() {
-    if (await holds(this.kv, this.h, this.holder)) return null;
+    if (await holds(this.kv, this.fence, this.holder)) return null;
     this.onRefused?.();
     return { ok: false, retry: false, why: 'another agent holds this account now', lost: true };
   }

package/lib/gateway/front-core.mjs

@@ -813,13 +813,22 @@ async function route(request, ctx) {
     const standing = await accountState(ctx, up.handle, rec);
     // A browser account's mail waits here while its app is closed (held-mail.mjs).
     const held = holdsMail(ctx, rec) && !(await isPresent(ctx, up.handle));
-    const { status, reason, content, bytes, type, notifies } = await handleDelivery(request, identFor(rec, policy),
+    const { status, reason, content, bytes, type, notifies, name, raw, receipt } = await handleDelivery(request, identFor(rec, policy),
       { podPut: held ? holdingPut(ctx, up.handle, rec) : (u, b, ct) => ctx.podPut(up.handle, u, b, ct),
         fetchImpl: ctx.fetchImpl, paused: standing.paused });
     // One line per delivery, so "did it arrive at the door" has an answer.
     console.log(`door @${up.handle}: delivery → ${status} (${reason}${held && status === 202 ? ', held' : ''})`);
     if (status === 202 && content) await noteReceived(ctx, up.handle, rec, bytes);
     if (held && status === 202) await afterHeld(ctx, up.handle, rec, { type, notifies });
+    // A forum fedipod.net keeps: the delivery is placed now, in this request,
+    // and the run that carries it is started. Whatever could not be placed
+    // here is still in the inbox for that run.
+    if (status === 202 && name && ctx.forum?.isForumRow(rec) && rec.keeper) {
+      const placed = await ctx.forum.placeAtDoor(ctx, up.handle, rec, { name, raw, receipt })
+        .catch((e) => ({ placed: false, why: e.message }));
+      console.log(`door @${up.handle}: ${placed.placed ? 'placed' : `not placed (${placed.why})`}`);
+      if (placed.forum && ctx.startKeeper) await ctx.startKeeper(placed.forum).catch((e) => console.log(`keeper @${placed.forum}: not started (${e.message})`));
+    }
     return { status, headers: {}, body: '' };
   }
 

package/lib/gateway/gateway-core.mjs

@@ -138,7 +138,7 @@ export async function handleDelivery(request, ident, { podPut, fetchImpl = fetch
   if (!okA) return { status: 502, reason: 'pod inbox write failed' };
   if (receipt) await inbox.writeReceiptBeside(podPut, ident.inboxUrl, hash, receipt);
   return { status: 202, reason: v.verified ? 'verified' : 'buffered-unverified', content, bytes: Buffer.byteLength(raw),
-    type: activity.type, notifies: notifies(activity, ident) };
+    type: activity.type, notifies: notifies(activity, ident), name: hash, raw, receipt };
 }
 
 // The outbox door: the owner's own post, taken on their behalf.

package/lib/gateway/held-mail.mjs

@@ -166,6 +166,9 @@ export async function routeKeeperApi(request, pathname, ctx, deps) {
   const next = { ...rec };
   if (on) next.keeper = { webId: ctx.keeperWebId, at: new Date().toISOString() };
   else delete next.keeper;
+  // A forum's category names the forum it belongs to, so a delivery to the
+  // category finds the forum's copy and lease.
+  if (typeof body.forum === 'string' && /^[a-z0-9][a-z0-9._-]{0,60}$/u.test(body.forum)) next.forum = body.forum;
   await ctx.putDirectory(handle, next);
   console.log(`keeper @${handle}: ${on ? 'on' : 'off'}, at the owner's word`);
   return j(200, { ok: true, handle, kept: on, keeper: ctx.keeperWebId || null });

package/lib/gateway/keeper.mjs

@@ -33,6 +33,9 @@ export { keeperSession };
  * drain reads it, as before.
  */
 export async function keepOnce(ctx, handle, rec, { log = console.log, session = null } = {}) {
+  // A forum, or one of its categories, is run whole by the forum's own code
+  // (ctx.forum: the forum package's gateway module), not by an account's.
+  if (ctx.forum?.isForumRow(rec)) return ctx.forum.keepOnce(ctx, handle, rec, { log, session });
   const say = (m) => log(`keeper @${handle}: ${m}`);
   const at = await reachAccount(ctx, handle, rec, { log, session });
   if (at.skipped) return { skipped: at.skipped };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fedipod",
-  "version": "1.42.0",
+  "version": "1.43.0",
   "description": "Standalone single-actor ActivityPub agent whose wire face, RDF truth and state all live on a Solid pod (CSS). Bundles a Phanpy UI and a Mastodon client-API facade.",
   "type": "module",
   "license": "MIT",
@@ -55,7 +55,7 @@
     "install-service": "node bin/fedipod.mjs install-service",
     "uninstall-service": "node bin/fedipod.mjs uninstall-service",
     "prepublishOnly": "npm test",
-    "test": "node claude/smoke-tests/agent-smoke.mjs && node claude/smoke-tests/front-hard-test.mjs && node claude/smoke-tests/copy-test.mjs && node claude/smoke-tests/copy-mode-test.mjs && node claude/smoke-tests/masto-gateway-test.mjs && node scripts/check-pod-calls.mjs && node scripts/verify-ui.mjs && node --test packages/fedipod-bb/test/*.test.mjs && node scripts/check-sizes.mjs",
+    "test": "node claude/smoke-tests/agent-smoke.mjs && node claude/smoke-tests/front-hard-test.mjs && node claude/smoke-tests/copy-test.mjs && node claude/smoke-tests/copy-mode-test.mjs && node claude/smoke-tests/masto-gateway-test.mjs && node scripts/check-pod-calls.mjs && node scripts/verify-ui.mjs && node packages/fedipod-bb/scripts/link-fedipod.mjs && node --test packages/fedipod-bb/test/*.test.mjs && node scripts/check-sizes.mjs",
     "verify-ui": "node scripts/verify-ui.mjs",
     "build:sw": "node scripts/build-app.mjs --entry web/app/sw-src.mjs --out web/app/dist/sw.js",
     "build:boot": "node scripts/build-app.mjs --entry web/app/boot.mjs --out web/app/dist/boot.js",

package/run-agent.mjs

@@ -52,22 +52,17 @@ export async function startAgent({
   handle = null,
 } = {}) {
   fs.mkdirSync(home, { recursive: true, mode: 0o700 });
-  // A home can hold a FORUM rather than a person or a group: same profiles
-  // directory, same unit, same startup — a different thing to run. Its
-  // credential says so, and running the agent over it would publish a person
-  // where a forum lives.
-  // The forum package is beside this file in a checkout and absent from an
-  // installed fedipod; a home that holds a forum needs it, a person's does not.
-  let forum = null;
+  // A home can hold a FORUM rather than a person or a group; its credential
+  // says so. A forum is run by its own package (`fedipod-bb start`), and
+  // running this agent over its home would publish a person where a forum
+  // lives.
   try {
-    forum = await import('./packages/fedipod-bb/src/run.mjs');
-  } catch (e) {
-    if (e?.code !== 'ERR_MODULE_NOT_FOUND') throw e;
-  }
-  if (forum?.isForumHome(home)) {
-    console.log(`[bb:${port}] this home holds a forum — running it`);
-    return forum.runForum({ home, port, log: (...a) => console.log(`[bb:${port}]`, ...a) });
-  }
+    const cred = JSON.parse(fs.readFileSync(path.join(home, 'credential.json'), 'utf8'));
+    if (String(cred.root || '').replace(/\/$/u, '') === 'fedipod-bb') {
+      console.error(`${home} holds a forum — run it with: fedipod-bb start --home ${home}`);
+      process.exit(2);
+    }
+  } catch { /* no credential yet, or not a forum */ }
   // connect() sets this from pod state a moment later, but the browser may
   // already be opening — seed it from what setup recorded so the named origin
   // works from the first request.

package/scripts/check-netlify-bundles.mjs

@@ -18,6 +18,10 @@ const tmp = fs.mkdtempSync(path.join(os.tmpdir(), 'fn-bundles-'));
 let fails = 0;
 const check = (ok, msg) => { console.log(`${ok ? 'PASS' : 'FAIL'}  ${msg}`); if (!ok) fails++; };
 try {
+  // The forum the front names (netlify/forum-support.mjs) imports fedipod by
+  // name; in this checkout that must be the checkout itself, or the bundle
+  // carries a registry copy beside the Gateway's own code.
+  execFileSync(process.execPath, [path.join(root, 'packages/fedipod-bb/scripts/link-fedipod.mjs')], { cwd: root, stdio: 'inherit' });
   execFileSync('netlify', ['functions:build', '--src', path.join(root, 'netlify/functions'), '--functions', path.join(tmp, 'zips')],
     { cwd: root, stdio: 'ignore' });
   const manifest = JSON.parse(fs.readFileSync(path.join(tmp, 'zips/manifest.json'), 'utf8'));