fedipod 1.40.0 → 1.42.0

package/lib/{device/admin → surface}/routes/lifecycle.mjs

@@ -2,9 +2,9 @@
 // pruning the inbox, rebuilding posts, republishing, parking and reviving,
 // rotating the key, moving, aliases, importing, retiring.
 
-import { resolveHandle } from '../../../core/social.mjs';
-import { webfingerHost } from '../../../core/wire.mjs';
-import { normalizeImport, IMPORT_KINDS } from '../../../connections/import.mjs';
+import { resolveHandle } from '../../core/social.mjs';
+import { webfingerHost } from '../../core/wire.mjs';
+import { normalizeImport, IMPORT_KINDS } from '../../connections/import.mjs';
 
 export async function post(p, body, ctx, req, res) {   // eslint-disable-line no-unused-vars
   const { agent, log, allowed, embedded, port, publicOrigin, versionOnDisk, isGroup } = ctx;   // eslint-disable-line no-unused-vars

package/lib/{device/admin → surface}/routes/owner.mjs

@@ -3,13 +3,11 @@
 
 import fs from 'node:fs';
 import path from 'node:path';
-import { announceModeration } from '../../../core/social.mjs';
-import { addRemoveActivity, publicHandle } from '../../../core/wire.mjs';
-import { hashPassword } from '../../../client/masto/index.mjs';
-import { identityHomes, rootOf, tildify, defaultProfile } from '../../home.mjs';
-import { localFetch } from '../../../client/localapi.mjs';
+import { announceModeration } from '../../core/social.mjs';
+import { addRemoveActivity, publicHandle } from '../../core/wire.mjs';
+import { hashPassword } from '../../client/masto/index.mjs';
+import { tildify } from '../../shared/files.mjs';
 import { AGENT_VERSION } from '../static.mjs';
-import { secureOrigin } from '../origins.mjs';
 
 // The identity itself. Changing any of these means a different actor at a
 // different address, which is a new setup, not an edit.
@@ -42,60 +40,6 @@ export async function get(p, ctx, req, res, url) {   // eslint-disable-line no-u
       stats: agent.store.read('gateway-stats.json', { verified: 0, unverified: 0, lastAt: null }),
     });
   }
-  // The other identities on this machine, so the page can link to each one.
-  // Their `agent.json` is the only file read — a port and a handle. A
-  // sibling's credential and keys are never opened; anything else shown
-  // here comes from that agent answering /status for itself.
-  if (req.method === 'GET' && p === '/profiles') {
-    const here = path.resolve(agent.home || '');
-    // Which identity a plain command means: the last one started. A
-    // different question from `current`, which is the page you are on.
-    const wasLast = defaultProfile(rootOf(here));
-    const rows = await Promise.all(identityHomes(rootOf(here)).map(async ({ name, dir }) => {
-      // agent.json holds a port AND a handle — setup records both, exactly
-      // so the named origin can be built before that agent has said a word.
-      let rec = {};
-      try { rec = JSON.parse(fs.readFileSync(path.join(dir, 'agent.json'), 'utf8')) || {}; } catch {}
-      const port = rec.port || null;
-      // A directory under profiles/ is not an identity until it holds a
-      // credential or has run somewhere. A half-finished setup leaves one
-      // behind, and listing it offers a page that cannot exist yet.
-      if (!port && !fs.existsSync(path.join(dir, 'credential.json'))) return null;
-      const current = path.resolve(dir) === here;
-      const live = current ? agent.status() : port
-        ? await localFetch(agent.home, port, '/status', { timeout: 1200 })
-          .then(r => r.json()).catch(() => null)
-        : null;
-      // The handle is right here — spending it on the origin is the whole
-      // point of having asked that agent who it is. A stopped one never
-      // answers, so its recorded handle stands in: the link has to be named
-      // before you get there, or starting it lands you on the shared origin.
-      const handle = live?.handle || rec.handle || null;
-      const origin = port
-        ? secureOrigin(handle, port)
-        : null;
-      // The fediverse address, assembled from the two things /status has:
-      // the handle, and the pod host its actor URL sits on.
-      let address = null;
-      if (live?.handle && live?.actor) {
-        try {
-          const front = live.actor.match(/\/u\/([^/]+)\/ap\/actor\/?$/)?.[1];
-          address = `${front || live.handle}@${new URL(live.actor).host}`;
-        } catch { /* not a URL yet */ }
-      }
-      return {
-        name, port, current,
-        admin: origin ? `${origin}/admin/` : null,
-        app: origin ? `${origin}/` : null,
-        handle,
-        address,
-        lastUsed: name === wasLast,
-        kind: live?.kind || null,
-        mode: live ? live.mode : null,
-      };
-    }));
-    return json(res, 200, { identities: rows.filter(Boolean) });
-  }
   if (req.method === 'GET' && p === '/blocks') return json(res, 200, agent.store.getBlocklist());
   if (req.method === 'GET' && p === '/log') return json(res, 200, { lines: agent.logLines(200) });
   if (req.method === 'GET' && p === '/deadletter') return json(res, 200, { items: agent.store.getDeadLetters() });

package/lib/{device/admin → surface}/routes/social.mjs

@@ -2,7 +2,7 @@
 // moderating: posting, the tag feed, follows, mutes, blocks, ejecting,
 // retracting, review, joins, the moderation queue.
 
-import { followHandle, followActor, unfollowActor, ejectFollower, retractAnnouncement, admitRequest, refuseRequest, applyModeration } from '../../../core/social.mjs';
+import { followHandle, followActor, unfollowActor, ejectFollower, retractAnnouncement, admitRequest, refuseRequest, applyModeration } from '../../core/social.mjs';
 
 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

package/lib/{device/admin → surface}/static.mjs

@@ -10,7 +10,7 @@ import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { wsOrigins } from './origins.mjs';
 
-export const projectRoot = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '../../..');
+export const projectRoot = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '../..');
 
 const PHANPY_DIR = path.join(projectRoot, 'phanpy/dist');
 // The vendored client is upstream's build, byte for byte, so the integrity
@@ -63,6 +63,11 @@ export const webMount = (pathname) => {
 export const SETUP_PAGE = '/admin/setup/';
 
 export const AGENT_VERSION = JSON.parse(fs.readFileSync(path.join(projectRoot, 'package.json'), 'utf8')).version;
+// Read again on each ask: the checkout can move while a process stays up.
+export const readVersionOnDisk = () => {
+  try { return JSON.parse(fs.readFileSync(path.join(projectRoot, 'package.json'), 'utf8')).version || null; }
+  catch { return null; }
+};
 
 const MIME = {
   '.html': 'text/html; charset=utf-8', '.js': 'text/javascript', '.css': 'text/css',

package/lib/{device/admin → surface}/surface.mjs

@@ -8,17 +8,14 @@
 
 import fs from 'node:fs';
 import path from 'node:path';
-import { MastoApi } from '../../client/masto/index.mjs';
-import { C2S } from '../../client/c2s.mjs';
-import { makeC2sAuth } from '../../client/oidc-auth.mjs';
-import { Streaming } from '../../client/streaming.mjs';
-import { nodeinfoPointer, nodeinfoDoc } from '../../core/wire.mjs';
-import { checkRequest } from '../../shared/guard.mjs';
-import { hasCredential } from '../setup.mjs';
-import { localVersion } from '../update.mjs';
-import { projectRoot, AGENT_VERSION, SETUP_PAGE, securityHeaders, sendJson, serveStatic, serveWeb, webDirRedirect, webMount } from './static.mjs';
+import { MastoApi } from '../client/masto/index.mjs';
+import { C2S } from '../client/c2s.mjs';
+import { makeC2sAuth } from '../client/oidc-auth.mjs';
+import { Streaming } from '../client/streaming.mjs';
+import { nodeinfoPointer, nodeinfoDoc } from '../core/wire.mjs';
+import { checkRequest } from '../shared/guard.mjs';
+import { projectRoot, AGENT_VERSION, SETUP_PAGE, readVersionOnDisk, securityHeaders, sendJson, serveStatic, serveWeb, webDirRedirect, webMount } from './static.mjs';
 import * as owner from './routes/owner.mjs';
-import * as setup from './routes/setup.mjs';
 import * as lifecycle from './routes/lifecycle.mjs';
 import * as gateway from './routes/gateway.mjs';
 import * as social from './routes/social.mjs';
@@ -65,9 +62,8 @@ function readBody(req) {
   });
 }
 
-// The routes, in the order the one if-chain and the one switch used to be
-// read: the first module that answers a path wins.
-const ROUTES = [owner, setup, lifecycle, gateway, social, connections];
+// Whether this home has been set up: the credential FILE, never configured().
+const hasCredential = (home) => fs.existsSync(path.join(home, 'credential.json'));
 
 // The whole admin/facade surface as one request handler, with nothing that
 // belongs to a process of its own. startAdmin wraps it in listeners; the CSS
@@ -83,10 +79,17 @@ const SESSION_FILES = {
   '/oauth/session/oidc-session.mjs': 'lib/session/oidc-session.mjs',
 };
 
+// `extraRoutes` are the routes a host process adds after the owner's — the
+// DeviceAgent's setup and process routes; a pod server adds none. `restart`
+// restarts the host process, for the changes that need one; a host that
+// cannot passes nothing, and those changes are refused.
 export function buildAdminSurface({ agent, gate, allowed, log = console.log,
   port = null, handle = null, embedded = false, basePath = '/', mount = '',
-  publicOrigin = null, scheme = null,
-  versionOnDisk = () => localVersion(projectRoot) }) {
+  publicOrigin = null, scheme = null, extraRoutes = [], restart = null,
+  versionOnDisk = readVersionOnDisk }) {
+  // The routes, in the order the one if-chain and the one switch used to be
+  // read: the first module that answers a path wins.
+  const ROUTES = [owner, ...extraRoutes, lifecycle, gateway, social, connections];
   const json = (res, status, obj) => sendJson(res, status, obj, allowed);
   const masto = new MastoApi({ agent, log, allowed, scheme, embedded, mount,
     throughDoor: (req) => Boolean(gate?.upgradeOk?.(req)) });
@@ -123,7 +126,7 @@ export function buildAdminSurface({ agent, gate, allowed, log = console.log,
   const atPath = (p_) => mount + (basePath === '/' ? p_ : basePath.slice(0, -1) + p_);
 
   // What every route may reach: the agent and the deployment's facts.
-  const ctx = { agent, log, allowed, embedded, port, handle, publicOrigin, versionOnDisk, isGroup, json, setup: setup_ };
+  const ctx = { agent, log, allowed, embedded, port, handle, publicOrigin, versionOnDisk, isGroup, json, setup: setup_, restart };
 
   const handler = async (req, res) => {
     const url = new URL(req.url, 'http://localhost');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fedipod",
-  "version": "1.40.0",
+  "version": "1.42.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",
@@ -14,6 +14,24 @@
   "bin": {
     "fedipod": "bin/fedipod.mjs"
   },
+  "exports": {
+    "./embed": "./lib/server/embed.mjs",
+    "./front": "./lib/gateway/front-core.mjs",
+    "./front-pages": "./lib/gateway/front-pages.mjs",
+    "./surface": "./lib/surface/index.mjs",
+    "./agent": "./lib/core/agent.mjs",
+    "./remote": "./lib/core/remote.mjs",
+    "./place": "./lib/core/place.mjs",
+    "./core/*": "./lib/core/*",
+    "./pod/*": "./lib/pod/*",
+    "./client/*": "./lib/client/*",
+    "./connections/*": "./lib/connections/*",
+    "./gateway/*": "./lib/gateway/*",
+    "./shared/*": "./lib/shared/*",
+    "./surface/*": "./lib/surface/*",
+    "./vendor/*": "./vendor/*",
+    "./package.json": "./package.json"
+  },
   "files": [
     "bin",
     "lib",
@@ -30,22 +48,22 @@
     "architecture.svg",
     "device-agent.md",
     "architecture.md",
-    "gateway.md",
-    "browser.svg"
+    "gateway.md"
   ],
   "scripts": {
     "start": "node bin/fedipod.mjs up",
     "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/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 --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",
     "build:app": "npm run build:sw && npm run build:boot",
     "stage": "node scripts/stage-site.mjs",
     "audit": "npm audit --omit=dev",
-    "agent": "node run-agent.mjs"
+    "agent": "node run-agent.mjs",
+    "vendor:sanitize": "node scripts/vendor-sanitize.mjs"
   },
   "dependencies": {
     "@fedify/fedify": "^2.3.4",