fedipod 1.40.0 → 1.43.0

package/web/app/dist/sw.js

@@ -46490,6 +46490,10 @@ var StateApiStorage = class {
   }
 };
 
+// lib/core/publisher/index.mjs
+init_node_crypto();
+init_wire();
+
 // web/app/shims/node-fs.mjs
 var PKG = JSON.stringify({ version: "0.18.0", name: "fedipod" });
 var readFileSync = (p) => {
@@ -46508,10 +46512,6 @@ var unlinkSync = nope("unlinkSync");
 var rmSync = nope("rmSync");
 var node_fs_default = { readFileSync, existsSync, writeFileSync, mkdirSync, readdirSync, statSync, unlinkSync, rmSync };
 
-// lib/core/publisher/index.mjs
-init_node_crypto();
-init_wire();
-
 // lib/shared/ua.mjs
 var version = "0";
 try {
@@ -46529,6 +46529,7 @@ try {
   }
 }
 var USER_AGENT = `fedipod/${version} (+https://github.com/jeff-zucker/FediPod)`;
+var AGENT_VERSION = version;
 
 // lib/core/publisher/index.mjs
 init_safefetch();
@@ -57531,11 +57532,31 @@ async function updateObject(publisher, s, patch, { updated = (/* @__PURE__ */ ne
   return update;
 }
 function rowContent(obj) {
+  const text = objectText(obj);
+  const esc = (v) => String(v).replace(/[&<>"]/gu, (c) => ({ "&": "&amp;", "<": "&lt;", ">": "&gt;", '"': "&quot;" })[c]);
+  const on = annotationTarget(obj);
+  const link = on.page ? `<a href="${esc(on.page)}">${esc(on.page)}</a>` : "";
+  const context = on.exact ? `<p>${link ? `text from ${link}:` : "text:"}</p><blockquote><p>${esc(on.exact)}</p></blockquote>` : link ? `<p>${link}</p>` : "";
+  if (text) return context ? `${context}<p>comment:</p>${text}` : text;
+  return context || `<p><a href="${esc(obj?.id || "")}">${esc(obj?.type || "object")}</a></p>`;
+}
+function objectText(obj) {
   if (typeof obj?.content === "string" && obj.content.trim()) return sanitizeHtml(obj.content);
   const plain = [obj?.bodyValue, obj?.name, obj?.summary].find((v) => typeof v === "string" && v.trim());
   if (plain) return contentHtml(plain);
-  const esc = (v) => String(v).replace(/[&<>"]/gu, (c) => ({ "&": "&amp;", "<": "&lt;", ">": "&gt;", '"': "&quot;" })[c]);
-  return `<p><a href="${esc(obj?.id || "")}">${esc(obj?.type || "object")}</a></p>`;
+  const bodies = [].concat(obj?.body || []).map((b) => b && typeof b === "object" && b.purpose !== "tagging" ? b.value && typeof b.value === "object" ? b.value["@value"] : b.value : null).filter((v) => typeof v === "string" && v.trim());
+  return bodies.map((v) => /<[a-z]/iu.test(v) ? sanitizeHtml(v) : contentHtml(v)).join("");
+}
+function annotationTarget(obj) {
+  const val = (v) => v && typeof v === "object" ? v["@value"] ?? v.id : v;
+  for (const t of [].concat(obj?.target || [])) {
+    const page2 = val(typeof t === "string" ? t : t?.source ?? t?.id);
+    const quote = [].concat(t?.selector || []).find((sel) => sel?.type === "TextQuoteSelector");
+    const exact = val(quote?.exact);
+    const ok = typeof page2 === "string" && /^https?:\/\//u.test(page2);
+    if (ok || exact) return { page: ok ? page2 : null, exact: typeof exact === "string" && exact.trim() ? exact.trim() : null };
+  }
+  return { page: null, exact: null };
 }
 async function publishNote(publisher, content, { inReplyTo, attachments, visibility = "public", spoilerText = null, sensitive = false, slug: wanted = null, also = [], deliverTo = [], quote = null } = {}) {
   const { urls } = publisher;
@@ -57637,7 +57658,8 @@ async function publishNote(publisher, content, { inReplyTo, attachments, visibil
   }
   return note;
 }
-async function publishObject(publisher, object, { visibility = "public", slug: wanted = null, also = [], deliverTo = [] } = {}) {
+async function publishObject(publisher, object, { visibility = "public", slug: wanted = null, also = [], deliverTo = [], unaddressed = false } = {}) {
+  if (unaddressed) return publishUnaddressed(publisher, object, wanted);
   const { urls } = publisher;
   const priv = visibility === "private" || visibility === "direct";
   if (priv) {
@@ -57695,6 +57717,45 @@ async function publishObject(publisher, object, { visibility = "public", slug: w
   publisher.log(`${row.type || "object"} published: ${id} \u2192 ${inboxes.length} inbox(es)`);
   return { id, createId, copied: !ownId };
 }
+async function publishUnaddressed(publisher, object, wanted) {
+  const { urls } = publisher;
+  const published = (/* @__PURE__ */ new Date()).toISOString();
+  const pod = publisher.config?.remotePod || urls.base;
+  const ownId = typeof object.id === "string" && /^https?:\/\//u.test(object.id) && object.id.startsWith(pod) ? object.id : null;
+  const name = await slugFor(publisher, urls.notes, wanted, published);
+  const id = ownId || urls.notes + name;
+  let doc = null;
+  if (!ownId) {
+    const { bto, bcc, ...sent } = object;
+    doc = { ...sent, id, attributedTo: urls.actor, published: object.published || published };
+    if (!doc["@context"]) doc["@context"] = AS_CTX;
+    if (typeof doc.content === "string") doc.content = sanitizeHtml(doc.content);
+    await write4(publisher.remote, id, doc);
+  }
+  const row = doc || object;
+  publisher.store.addStatus({
+    noteId: id,
+    actor: urls.actor,
+    content: rowContent(row),
+    published: row.published || published,
+    kind: "post",
+    slug: name,
+    visibility: "direct"
+  });
+  if (await publisher.store.commit?.() === false) publisher.log(`object kept but its timeline row was refused: ${id}`);
+  const create = {
+    "@context": AS_CTX,
+    id: createActivityId(ownId ? urls.notes + name : id),
+    type: "Create",
+    actor: urls.actor,
+    published: row.published || published,
+    object: doc || id
+  };
+  await writeCreate(publisher.remote, create.id, create);
+  publisher.recordOwn?.(create);
+  publisher.log(`${row.type || "object"} kept, addressed to nobody: ${id}`);
+  return { id, createId: create.id, copied: !ownId };
+}
 function rowTags(note) {
   const tags = [].concat(note.tag || []);
   const mentions = tags.filter((t) => t.type === "Mention").map((t) => ({ href: t.href, name: t.name }));
@@ -58372,10 +58433,6 @@ async function writePages(remote, before = {}, pages) {
 }
 
 // lib/core/publisher/index.mjs
-var AGENT_VERSION = JSON.parse(node_fs_default.readFileSync(
-  node_path_default.join(node_path_default.dirname(fileURLToPath(import.meta.url)), "../../../package.json"),
-  "utf8"
-)).version;
 var Publisher = class {
   constructor({
     config,
@@ -66457,6 +66514,11 @@ var ACTIVITY_TYPES = /* @__PURE__ */ new Set([
 ]);
 var arr = (v) => v === void 0 || v === null ? [] : Array.isArray(v) ? v : [v];
 var idOf2 = (v) => typeof v === "string" ? v : v?.id || null;
+var PUBLIC_SPELLINGS = /* @__PURE__ */ new Set(["Public", "as:Public"]);
+var audienceOf = (v) => {
+  const id = idOf2(v);
+  return PUBLIC_SPELLINGS.has(id) ? PUBLIC : id;
+};
 function readBody(req) {
   return new Promise((resolve2, reject) => {
     let size = 0;
@@ -66474,6 +66536,7 @@ function readBody(req) {
     req.on("error", reject);
   });
 }
+var isAnnotation = (o) => arr(o?.type).some((t) => t === "Annotation" || t === "oa:Annotation" || t === "http://www.w3.org/ns/oa#Annotation");
 var C2S = class {
   constructor({ agent: agent2, log: log2 = console.log, auth, scheme = null, mount = "" }) {
     this.agent = agent2;
@@ -66706,8 +66769,8 @@ var C2S = class {
   // every client means by a post with no audience chosen, and what a client
   // that never addresses (dokieli's annotations) needs.
   visibilityOf(activity, object) {
-    const to = arr(activity.to ?? object?.to).map(idOf2);
-    const cc = arr(activity.cc ?? object?.cc).map(idOf2);
+    const to = arr(activity.to ?? object?.to).map(audienceOf);
+    const cc = arr(activity.cc ?? object?.cc).map(audienceOf);
     const blind = arr(activity.bto ?? object?.bto).length + arr(activity.bcc ?? object?.bcc).length;
     if (!to.length && !cc.length) return blind ? "direct" : "public";
     if (to.includes(PUBLIC)) return "public";
@@ -66738,7 +66801,7 @@ var C2S = class {
   // in to/cc are listed and delivered to; the ones in bto/bcc are delivered
   // to and never listed (§6).
   addressedActors(activity, object) {
-    const pick = (...fields) => [...new Set(fields.flatMap((f) => arr(activity[f] ?? object?.[f]).map(idOf2)))].filter((a) => typeof a === "string" && /^https?:\/\//u.test(a) && a !== PUBLIC && a !== this.urls.followers && a !== this.urls.actor);
+    const pick = (...fields) => [...new Set(fields.flatMap((f) => arr(activity[f] ?? object?.[f]).map(audienceOf)))].filter((a) => typeof a === "string" && /^https?:\/\//u.test(a) && a !== PUBLIC && a !== this.urls.followers && a !== this.urls.actor);
     return { also: pick("to", "cc", "audience"), deliverTo: pick("bto", "bcc") };
   }
   async _dispatch(activity, { slug, raw, reply, serial, at }) {
@@ -66760,7 +66823,8 @@ var C2S = class {
         const { also, deliverTo } = this.addressedActors(activity, object);
         if (makes !== "Note" && makes !== "Question") {
           const asSent = raw && typeof raw === "object" && !Array.isArray(raw) ? ACTIVITY_TYPES.has(raw.type) ? raw.object && typeof raw.object === "object" ? raw.object : null : raw : null;
-          const made2 = await agent2.publisher.publishObject(asSent || object, { visibility, slug, also, deliverTo });
+          const unaddressed = isAnnotation(asSent || object) && ["to", "cc", "bto", "bcc", "audience"].every((f) => !arr(activity[f] ?? object[f]).length);
+          const made2 = await agent2.publisher.publishObject(asSent || object, { visibility, slug, also, deliverTo, unaddressed });
           return reply(201, { id: made2.createId, object: made2.id }, { location: made2.createId });
         }
         const text = String(object.source?.content ?? object.content ?? "");
@@ -66973,6 +67037,7 @@ var Lease = class {
     this.timer = null;
     this.heldUntil = 0;
     this.denied = null;
+    this.unreadable = null;
   }
   // null means the lease document is NOT THERE — nobody holds it. UNREADABLE
   // means we could not ask, which is a different answer and must not be read as
@@ -66984,9 +67049,13 @@ var Lease = class {
     try {
       res = await this.fetchImpl(this.url, { headers: { accept: "application/json" } });
       if (res.status === 404 || res.status === 410) return null;
-      if (res.status >= 400) return UNREADABLE;
+      if (res.status >= 400) {
+        this.unreadable = `HTTP ${res.status}`;
+        return UNREADABLE;
+      }
       body = await res.text();
-    } catch {
+    } catch (e) {
+      this.unreadable = e.message;
       return UNREADABLE;
     }
     this.etag = res.headers?.get?.("etag") || null;
@@ -67017,7 +67086,7 @@ var Lease = class {
     const cur = await this.readFresh();
     if (cur === UNREADABLE) {
       this.denied = "unreadable";
-      this.log("lease unreadable \u2014 staying a viewer");
+      this.log(`lease unreadable (${this.unreadable}) \u2014 staying a viewer`);
       return false;
     }
     if (cur && cur.holder !== this.id && Date.now() < cur.expiresAt) {
@@ -67419,7 +67488,7 @@ function sendPodSigninPage(res, client, webId, mount = "") {
     } catch {
     }
     const who = client.name ? escapeHtml(client.name) : where ? escapeHtml(where) : "A client";
-    asking = `<p><strong>${who}</strong> is asking to use your account${where ? `, and will be sent back to <code>${escapeHtml(where)}</code>` : ""}.</p>`;
+    asking = `<p><strong>${who}</strong> is asking to use your account${where ? `, and you will be sent back to <code>${escapeHtml(where)}</code>` : ""}.</p>`;
   }
   res.writeHead(200, { "content-type": "text/html; charset=utf-8", "cache-control": "no-cache" });
   res.end(`<!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width, initial-scale=1">
@@ -71850,7 +71919,7 @@ var fail2 = () => {
 };
 var node_os_default = new Proxy({}, { get: () => fail2 });
 
-// lib/device/home.mjs
+// lib/shared/files.mjs
 function writeFileAtomic(file, body, { mode = 384 } = {}) {
   const tmp = `${file}.${process.pid}.tmp`;
   node_fs_default.mkdirSync(node_path_default.dirname(file), { recursive: true, mode: 448 });
@@ -72951,9 +73020,18 @@ init_urls();
 
 // web/app/copy-mode.mjs
 var RENEW_BEFORE_MS = 2 * 36e5;
-async function openCopy(agent2, frontOrigin, { handle: handle7 = null, kept = null } = {}) {
+var ASK_AGAIN_MS = 15 * 6e4;
+var REMEMBERED = [404, 409, 501, 502, 503];
+var failedKey = (agent2, frontOrigin) => `copy-open-failed:${frontOrigin}:${agent2.webId}`;
+var forgetFailedOpen = (agent2, frontOrigin) => kvDel(failedKey(agent2, frontOrigin)).catch(() => {
+});
+async function openCopy(agent2, frontOrigin, { handle: handle7 = null, kept = null, askAnyway = false, letGo = false } = {}) {
   if (kept && kept.expiresAt - Date.now() > RENEW_BEFORE_MS) return kept;
   if (!agent2.sessionFetch || !frontOrigin) return null;
+  const key = failedKey(agent2, frontOrigin);
+  const failed = await kvGet(key).catch(() => null);
+  const held = letGo && failed?.status === 409;
+  if (!askAnyway && !held && failed && Date.now() - failed.at < ASK_AGAIN_MS) return null;
   let res;
   try {
     res = await agent2.sessionFetch(`${frontOrigin.replace(/\/$/u, "")}/api/state/open`, {
@@ -72966,9 +73044,16 @@ async function openCopy(agent2, frontOrigin, { handle: handle7 = null, kept = nu
     return null;
   }
   if (res.status !== 200) {
-    if (![404, 409, 501].includes(res.status)) agent2.log(`the account's copy: the gateway answered ${res.status}`);
+    if (![404, 409, 501].includes(res.status)) {
+      const why = (await res.json().catch(() => null))?.error;
+      agent2.log(`the account's copy: the gateway answered ${res.status}${why ? ` (${why})` : ""}`);
+    }
+    if (REMEMBERED.includes(res.status)) await kvPut(key, { at: Date.now(), status: res.status }).catch(() => {
+    });
     return null;
   }
+  if (failed) await kvDel(key).catch(() => {
+  });
   const copy = await res.json().catch(() => null);
   return copy?.base && copy?.token ? { handle: copy.handle, base: copy.base, token: copy.token, expiresAt: copy.expiresAt, podHome: copy.podHome || null } : null;
 }
@@ -73052,7 +73137,7 @@ async function moveIntoCopy(agent2, frontOrigin) {
   if (agent2.copy) return true;
   await agent2.store.commit();
   await agent2.lease.release();
-  const copy = await openCopy(agent2, frontOrigin, { handle: agent2.doorKey });
+  const copy = await openCopy(agent2, frontOrigin, { handle: agent2.doorKey, letGo: true });
   if (!copy) {
     if (await agent2.lease.acquire()) agent2.lease.startRenewal();
     return false;
@@ -73257,6 +73342,7 @@ var BrowserAgent = class _BrowserAgent {
     if (!on) return { status: 200, ok: true, kept: false };
     const said = await this.tellGateway("keeper", { handle: this.doorKey, on: true });
     if (said?.status === 200) {
+      await forgetFailedOpen(this, this.frontOrigin);
       this._keeper.kept = true;
       if (this.masto) this.masto.scheduling = true;
       this.log("the gateway keeps this account running while the app is closed");
@@ -73470,7 +73556,7 @@ var BrowserAgent = class _BrowserAgent {
     const warmFrom = restart ? await warmMeta(webId).catch(() => null) : null;
     this.holderId = await this.deviceId();
     this.frontOrigin = frontOrigin || null;
-    this.copy = await openCopy(this, this.frontOrigin, { kept: isWarm(warmFrom) ? warmFrom.copy : null });
+    this.copy = await openCopy(this, this.frontOrigin, { kept: isWarm(warmFrom) ? warmFrom.copy : null, askAnyway: !restart });
     const warmRoot = isWarm(warmFrom) && !!warmFrom.copy === !!this.copy ? warmFrom.root : null;
     const copyRoot = this.copy?.podHome?.startsWith(remotePod) ? this.copy.podHome.slice(remotePod.length) : null;
     this._sweptAt = { ...warmFrom?.sweptAt || {} };