fedipod 1.50.2 → 1.55.2

package/lib/gateway/held-mail.mjs

@@ -211,7 +211,31 @@ export async function routeHereApi(request, pathname, ctx, deps) {
   const flushed = await flushHeld(ctx, handle, rec)
     .catch((e) => { console.log(`here @${handle}: held mail not delivered: ${e?.message || e}`); return 0; });
   // `hold`: with it off, a browser working from a copy goes back to the pod.
-  return j(200, { ok: true, handle, flushed, hold: holdOn(ctx) });
+  // `missingLetter`: the gateway's test letter has not arrived (check-letter.mjs).
+  const missing = await deps.missingLetter?.(handle).catch(() => null);
+  return j(200, { ok: true, handle, flushed, hold: holdOn(ctx), ...(missing ? { missingLetter: missing } : {}) });
+}
+
+// FediPod could not read some of its owner's mail: they are told on the phones
+// and browsers they signed up for notifications, in FediPod's own words.
+// Proved like /api/here. Returns a response, or null for other paths.
+export async function routeAlertApi(request, pathname, ctx, deps) {
+  if (pathname !== '/api/alert') return null;
+  const { j } = deps;
+  if (request.method === 'OPTIONS') return deps.apiPreflight();
+  if (request.method !== 'POST') return null;
+  let body;
+  try { body = JSON.parse(await request.clone().text()); } catch { return j(400, { error: 'bad JSON' }); }
+  const handle = String(body.handle || '').toLowerCase();
+  const text = typeof body.text === 'string' ? body.text.trim().slice(0, 200) : '';
+  if (!text) return j(400, { error: 'text required' });
+  const rec = await ctx.lookup(handle);
+  if (!rec) return j(404, { error: 'no such account' });
+  const who = await deps.provedOwner(request, pathname, ctx, rec, deps);
+  if (who.error) return who.error;
+  if (!ctx.startPush || !await ctx.pushWanted?.(handle).catch(() => false)) return j(200, { ok: true, handle, pushing: 0 });
+  await ctx.startPush(handle, { alert: text }).catch((e) => console.log(`alert @${handle}: not started: ${e?.message || e}`));
+  return j(200, { ok: true, handle, pushing: 1 });
 }
 
 // FediPod open in a browser reads its own mail, so nothing is held for the

package/lib/gateway/keeper.mjs

@@ -19,6 +19,7 @@ import { flushHeld, heldEntries } from './held-mail.mjs';
 import { publishDue, nextDue } from '../core/scheduled.mjs';
 import { lockCopy } from './copy.mjs';
 import { reachAccount, settle, stateAndLease, actingAgent } from './account-agent.mjs';
+import { checkLettersFor } from './check-letter.mjs';
 
 export { keeperSession };
 
@@ -53,7 +54,7 @@ export async function keepOnce(ctx, handle, rec, { log = console.log, session =
     if (!await lease.acquire()) return { skipped: 'another device is acting on this account', flushed, retry: 'soon' };
     try {
       await store.load();
-      const agent = await actingAgent(at, store, lease, { log });
+      const agent = await actingAgent(at, store, lease, { log, checkLetters: checkLettersFor(ctx, handle) });
       if (agent.skipped) return { skipped: agent.skipped, flushed };
       let taken = 0;
       if (at.inCopy && ctx.listHeld) {

package/lib/gateway/masto-gateway.mjs

@@ -48,6 +48,9 @@ import { CopyStorage, lockCopy, keptNow, keptBefore, holdOn, waitOutClosing, GAT
 import { HttpStorage } from '../core/storage.mjs';
 import * as podInbox from '../pod/inbox.mjs';
 import { heldEntries } from './held-mail.mjs';
+import { checkLettersFor } from './check-letter.mjs';
+import { readConnectedForApp } from './connected-feeds.mjs';
+import { TagFeed } from '../connections/tagfeed.mjs';
 import { noteOpened } from './quiet.mjs';
 import { Push } from '../client/webpush.mjs';
 import webpush from 'web-push';
@@ -282,6 +285,8 @@ function readingAgent(at, store, acting, log) {
   const publisher = new Publisher({ config, remote: at.remote, store, deliverer: null, publicKeyPem: null, log });
   return {
     store, publisher, remote: at.remote, config, viewer: false, copy: null,
+    // The hashtags followed, for the app to show; FediPod in the browser reads them.
+    tagfeed: new TagFeed({ store, intake: null, log }),
     configured: () => !!store.getConfig(), requestTakeover: async () => true, onScheduled: () => {},
     intake: { fetchAP: async (u) => (await acting()).intake.fetchAP(u) },
   };
@@ -334,7 +339,7 @@ async function readHeld(ctx, handle, rec, { log = console.log, takeover = false,
     const { store, lease } = stateAndLease(ctx, handle, at, { log });
     if (!await lease.acquire() && !(takeover && await lease.takeover())) return 0;
     await store.load();
-    const agent = await actingAgent(at, store, lease, { log });
+    const agent = await actingAgent(at, store, lease, { log, checkLetters: checkLettersFor(ctx, handle) });
     if (agent.skipped) return 0;
     const pushes = [];
     if (await pushWanted(ctx, handle)) {
@@ -433,17 +438,50 @@ export async function pushMade(ctx, handle, rec, ids, { log = console.log, now =
   return fresh.length;
 }
 
+/**
+ * For FediPod, when it could not read some of its owner's mail: one
+ * notification, in its own words, to every phone and browser signed up for
+ * them. Read from the account as it is now, without acting.
+ */
+export async function pushAlert(ctx, handle, rec, text, { log = console.log } = {}) {
+  if (!text || !await pushWanted(ctx, handle)) return 0;
+  await waitOutClosing(ctx.copyKv, handle);
+  const at = await reachAccount(ctx, handle, rec, { log });
+  if (at.skipped) return 0;
+  const store = await readingStore(ctx, handle, at, log);
+  const agent = readingAgent(at, store, async () => { throw new Error('only reading'); }, log);
+  if (!agent) return 0;
+  if (!at.inCopy) await store.refresh(['webpush.json'], { ifChanged: true });
+  const api = facade(agent, null, log, await vapidKeys(ctx.mastoKv), pushContact(ctx), { keep: false });
+  const id = crypto.randomBytes(8).toString('hex');
+  await api.push.notify({ id, type: 'mention' }, {
+    notification_id: id, notification_type: 'mention', preferred_locale: 'en',
+    title: 'FediPod', body: String(text).slice(0, 200), icon: '',
+  });
+  log(`@${handle}: alert pushed`);
+  return 1;
+}
+
 // A request from an app, answered by the account's facade over its copy, or
 // with the hold off, over the pod.
 async function answerForAccount(request, url, ctx, tok, rec, log, tokenHash) {
   const handle = tok.handle;
   forgetOld();
   const repeatKey = request.method === 'GET' && REPEATABLE.test(url.pathname) ? `${handle}\n${tokenHash}\n${url.pathname}${url.search}` : null;
+  // An app checking in: new mail, and the owner's connected accounts when due,
+  // read in beside this answer for the app's next check.
+  const checksIn = request.method === 'GET' && /^\/api\/v[12]\/(timelines\/home|notifications)$/u.test(url.pathname);
+  const readConnected = () => readConnectedForApp(ctx, handle, rec, { log })
+    .then((n) => { if (n) forget(handle); })
+    .catch((e) => log(`app @${handle}: connected accounts: ${e.message}`));
   // The copy's listing as it was: the same answer, without opening the copy.
   // A copy written to the pod and deleted since lists differently.
   if (repeatKey && holdOn(ctx)) {
     const again = await repeatAnswer(ctx, handle, repeatKey, { inCopy: true });
-    if (again) return again;
+    if (again) {
+      if (checksIn) ctx.waitUntil?.(readConnected());
+      return again;
+    }
   }
   // A copy the round is writing to the pod and deleting is waited out; it is
   // made again below.
@@ -457,9 +495,11 @@ async function answerForAccount(request, url, ctx, tok, rec, log, tokenHash) {
     if (!made.ok) return json(made.status === 409 ? 503 : made.status, { error: made.why });
     at.inCopy = true;
   }
-  // New mail read in beside this answer, for the app's next check.
-  if (!writes && /^\/api\/v[12]\/(timelines\/home|notifications)$/u.test(url.pathname)) {
-    ctx.waitUntil?.(readHeldForApp(ctx, handle, rec, { log }).catch((e) => log(`app @${handle}: held mail: ${e.message}`)));
+  if (checksIn) {
+    ctx.waitUntil?.((async () => {
+      await readHeldForApp(ctx, handle, rec, { log }).catch((e) => log(`app @${handle}: held mail: ${e.message}`));
+      await readConnected();
+    })());
   }
   // With the hold off, the pod's listing, after the inbox has been looked at.
   if (repeatKey && !holdOn(ctx)) {
@@ -475,7 +515,7 @@ async function answerForAccount(request, url, ctx, tok, rec, log, tokenHash) {
     const acting = () => (actingP ||= (async () => {
       const s = stateAndLease(ctx, handle, at, { log });
       await s.store.load();
-      const a = await actingAgent(at, s.store, s.lease, { log });
+      const a = await actingAgent(at, s.store, s.lease, { log, checkLetters: checkLettersFor(ctx, handle) });
       if (a.skipped) throw new Error(a.skipped);
       return a;
     })());
@@ -505,7 +545,7 @@ async function answerForAccount(request, url, ctx, tok, rec, log, tokenHash) {
     lease = s.lease;
     const store = s.store;
     await store.load();
-    const agent = await actingAgent(at, store, lease, { log });
+    const agent = await actingAgent(at, store, lease, { log, checkLetters: checkLettersFor(ctx, handle) });
     if (agent.skipped) return json(503, { error: agent.skipped });
     const api = facade(agent, token, log, await vapidKeys(ctx.mastoKv), pushContact(ctx));
     const handled = await api.handle(b.req, b.res, url.pathname, url);

package/lib/surface/routes/owner.mjs

@@ -13,7 +13,7 @@ import { AGENT_VERSION } from '../static.mjs';
 const PERMANENT_CONFIG = ['handle', 'remotePod', 'issuer', 'root', 'kind'];
 // Config the actor document carries, so a change is not real until it is
 // republished.
-const WIRE_CONFIG = ['name', 'summary', 'icon', 'image', 'fields', 'approveJoins', 'moderators'];
+const WIRE_CONFIG = ['name', 'summary', 'icon', 'image', 'fields', 'approveJoins', 'moderators', 'autoAcceptFollows'];
 
 export async function get(p, ctx, req, res, url) {   // eslint-disable-line no-unused-vars
   const { agent, log, allowed, embedded, port, publicOrigin, versionOnDisk, isGroup } = ctx;   // eslint-disable-line no-unused-vars
@@ -70,6 +70,7 @@ export async function get(p, ctx, req, res, url) {   // eslint-disable-line no-u
       approveJoins: !!cfg.approveJoins, review: !!cfg.review,
       aliases: cfg.aliases || [],
       autoAcceptFollows: cfg.autoAcceptFollows !== false,
+      tagsInHome: cfg.tagsInHome !== false,
       quiescedAt: cfg.quiescedAt || null, movedTo: cfg.movedTo || null,
       // Per-machine, so it comes from the credential file, not pod config —
       // and it is a fact here, not a setting: moving it means moving data,
@@ -189,10 +190,12 @@ export async function post(p, body, ctx, req, res) {   // eslint-disable-line no
       if ('approveJoins' in body) cfg.approveJoins = !!body.approveJoins;
       if ('review' in body) cfg.review = !!body.review;
       // A person's queue gate: on, and an inbound Follow is accepted on
-      // arrival instead of waiting in the requests queue. Local behavior,
-      // not on the wire — but intake reads the LIVE config, so it is
-      // patched below whether or not anything republishes.
+      // arrival instead of waiting in the requests queue. The actor says
+      // which (manuallyApprovesFollowers), and intake reads the LIVE config,
+      // so it is patched below as well as republished.
       if ('autoAcceptFollows' in body) cfg.autoAcceptFollows = !!body.autoAcceptFollows;
+      // Whether hashtag posts appear in Home; read as each timeline is answered.
+      if ('tagsInHome' in body) cfg.tagsInHome = !!body.tagsInHome;
       // The moderator roster (FEP-1b12): actor IRIs whose federated
       // moderation asks are queued, published as attributedTo.
       let rosterDiff = null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fedipod",
-  "version": "1.50.2",
+  "version": "1.55.2",
   "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/hold-test.mjs && node claude/smoke-tests/masto-gateway-test.mjs && node scripts/check-pod-calls.mjs && node scripts/verify-ui.mjs && node --test claude/smoke-tests/forum-signup-form.test.mjs claude/smoke-tests/door-verify.test.mjs claude/smoke-tests/oauth-signin.test.mjs claude/smoke-tests/app-registration.test.mjs claude/smoke-tests/push-signout.test.mjs claude/smoke-tests/token-fetches.test.mjs claude/smoke-tests/signin-hardening.test.mjs claude/smoke-tests/load-fixes.test.mjs claude/smoke-tests/unread-docs.test.mjs claude/smoke-tests/post-text-once.test.mjs && node scripts/check-sizes.mjs && node scripts/test-dependents.mjs && node claude/validation/browser-agent/all.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/hold-test.mjs && node claude/smoke-tests/masto-gateway-test.mjs && node claude/smoke-tests/admin-facade-smoke.mjs && node scripts/check-pod-calls.mjs && node scripts/verify-ui.mjs && node --test claude/smoke-tests/forum-signup-form.test.mjs claude/smoke-tests/door-verify.test.mjs claude/smoke-tests/oauth-signin.test.mjs claude/smoke-tests/app-registration.test.mjs claude/smoke-tests/push-signout.test.mjs claude/smoke-tests/token-fetches.test.mjs claude/smoke-tests/signin-hardening.test.mjs claude/smoke-tests/load-fixes.test.mjs claude/smoke-tests/unread-docs.test.mjs claude/smoke-tests/post-text-once.test.mjs claude/smoke-tests/connected-pod-only.test.mjs claude/smoke-tests/check-letter.test.mjs claude/smoke-tests/gone-through-relay.test.mjs claude/smoke-tests/connected-feeds.test.mjs && node scripts/check-sizes.mjs && node scripts/test-dependents.mjs && node claude/validation/browser-agent/all.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",
@@ -98,6 +98,6 @@
   },
   "devDependencies": {
     "esbuild": "^0.28.2",
-    "fedipod-bb": "^0.4.1"
+    "fedipod-bb": "^0.4.4"
   }
 }

package/scripts/stage-site.mjs

@@ -152,8 +152,7 @@ const copyAdmin = (from, to) => { fs.mkdirSync(to, { recursive: true });
         .replace('</head>', '<script src="/admin/client-pick.js"></script>\n</head>')
   .replace('</body>', `${clientNews()}</body>`);
       // Hide controls the browser build does not carry: the manual drain (it
-      // drains automatically over notifications), the local logfile viewer
-      // (there is no local log in a browser), and the "create a handle at the
+      // drains automatically over notifications), and the "create a handle at the
       // gateway" choice — a fronted @you@front identity is not the browser
       // model, and admin-facade.mjs refuses one outright. Leaving the radio
       // visible meant the page checked the name's availability as you typed,
@@ -162,7 +161,7 @@ const copyAdmin = (from, to) => { fs.mkdirSync(to, { recursive: true });
       // And rename "Recover posts" to the plainer "Refresh Feed" for this
       // audience.
       text = text
-        .replace('<style>#actor-pick', '<style>#gw-shape-front,#do-drain,#do-log,#actor-pick')
+        .replace('<style>#actor-pick', '<style>#gw-shape-front,#do-drain,#actor-pick')
         .replace('>Recover posts<', '>Refresh Feed<')
         // The move-to-another-gateway hint: only the browser build can move
         // in (signup.mjs moveIn), so only here does gateway.js get to show it.