fedipod-server 0.13.0 → 0.13.2

package/web/app/site/sw.js

@@ -34555,8 +34555,40 @@ var PodStore = class {
     this.cache.set("ids.json", ids);
     return id;
   }
+  // The map first, for ids minted under an older scheme. Then, because the
+  // id IS the hash of the url, whatever this store knows is scanned for the
+  // url that hashes to it — actors, posts, contacts, requests, media. The
+  // browser build's worker is stopped whenever it idles, and the in-memory
+  // map went with it: a client clicking an account it had just been shown
+  // reached a fresh worker that held the actor and could not name it.
   urlFor(id) {
-    return this.getIds()[id] || null;
+    const ids = this.getIds();
+    if (ids[id]) return ids[id];
+    if (!/^[a-f0-9]{16}$/u.test(String(id))) return null;
+    const hash = (u) => node_crypto_default.createHash("sha256").update(u).digest("hex").slice(0, 16);
+    const seen = /* @__PURE__ */ new Set();
+    const candidates = function* (store) {
+      for (const u of Object.keys(store.getActors())) yield u;
+      for (const st2 of store.getStatuses()) {
+        yield st2.noteId;
+        yield st2.actor;
+        for (const a of st2.attachments || []) if (a?.url) yield a.url;
+      }
+      const c = store.getContacts();
+      for (const f of [...c.followers, ...c.following]) if (f?.actor) yield f.actor;
+      for (const r of store.getRequests()) if (r?.actor) yield r.actor;
+      for (const u of Object.keys(store.getMedia())) yield u;
+    };
+    for (const u of candidates(this)) {
+      if (typeof u !== "string" || seen.has(u)) continue;
+      seen.add(u);
+      if (hash(u) === id) {
+        ids[id] = u;
+        this.cache.set("ids.json", ids);
+        return u;
+      }
+    }
+    return null;
   }
 };
 
@@ -55555,10 +55587,16 @@ function indexQuads(quads) {
   }
   return { bySubject, objects, blanks };
 }
-function findRoot({ bySubject, objects }) {
-  for (const s of bySubject.keys()) if (!objects.has(s)) return s;
-  for (const [s, preds] of bySubject) if (preds.has(RDF_TYPE)) return s;
-  return bySubject.keys().next().value ?? null;
+function findRoot({ bySubject, objects, blanks }) {
+  const all = [...bySubject.keys()];
+  const named = all.filter((s) => !blanks.has(s));
+  const free = all.filter((s) => !objects.has(s));
+  const freeNamed = free.find((s) => !blanks.has(s));
+  if (freeNamed) return freeNamed;
+  if (free.length) return free[0];
+  for (const s of named) if (bySubject.get(s).has(RDF_TYPE)) return s;
+  for (const s of all) if (bySubject.get(s).has(RDF_TYPE)) return s;
+  return named[0] ?? all[0] ?? null;
 }
 function readList(head, ctx, depth, path) {
   const out = [];
@@ -55636,7 +55674,7 @@ function makeView(subject, ctx, depth = 0, seen = /* @__PURE__ */ new Set()) {
 function graphView(quads, { root = null } = {}) {
   if (!quads || !quads.length) return null;
   const ctx = indexQuads(quads);
-  const subject = root ?? findRoot(ctx);
+  const subject = root && ctx.bySubject.has(root) ? root : findRoot(ctx);
   if (!subject) return null;
   const view = makeView(subject, ctx);
   return view && typeof view === "object" ? view : null;
@@ -55695,19 +55733,21 @@ function groundContext(input) {
   return { ...input, "@context": kept.length === 1 ? kept[0] : kept };
 }
 async function readLenient(raw) {
+  let input = null;
+  try {
+    input = typeof raw === "string" ? JSON.parse(raw) : raw ?? null;
+  } catch {
+  }
+  const own = input && typeof input === "object" ? input.id ?? input["@id"] : null;
+  const root = typeof own === "string" && /^https?:\/\//u.test(own) ? own : null;
   try {
     const { doc, graph: graph2 } = await parseAS2(raw);
-    return { doc, graph: graph2, view: graphView(graph2), degraded: null };
+    return { doc, graph: graph2, view: graphView(graph2, { root }), degraded: null };
   } catch (e) {
-    let input = null;
-    try {
-      input = typeof raw === "string" ? JSON.parse(raw) : raw ?? null;
-    } catch {
-    }
     if (!input || typeof input !== "object") return { doc: null, graph: null, view: null, degraded: e.message };
     try {
       const { graph: graph2 } = await parseAS2(groundContext(input));
-      return { doc: input, graph: graph2, view: graphView(graph2), degraded: e.message };
+      return { doc: input, graph: graph2, view: graphView(graph2, { root }), degraded: e.message };
     } catch (inner) {
       return { doc: input, graph: null, view: null, degraded: `${e.message}; grounded read also failed: ${inner.message}` };
     }
@@ -65423,7 +65463,8 @@ async function handle4(api, ctx) {
     }
     const hit = Object.entries(api.store.getActors()).find(([u, a]) => {
       try {
-        return `${a.preferredUsername}@${new URL(u).host}` === acct;
+        const at = new URL(u);
+        return `${a.preferredUsername}@${at.host}` === acct || `${a.preferredUsername}@${at.hostname}` === acct;
       } catch {
         return false;
       }
@@ -67364,6 +67405,14 @@ var Deliverer = class {
 
 // web/app/deliver-relay.mjs
 init_fedify_sig();
+function doorKeyOf(doorInboxUrl) {
+  try {
+    const seg2 = new URL(doorInboxUrl).pathname.split("/");
+    return seg2[1] === "u" && seg2[2] ? decodeURIComponent(seg2[2]) : null;
+  } catch {
+    return null;
+  }
+}
 var RelayDeliverer = class extends Deliverer {
   constructor(opts) {
     super(opts);
@@ -67388,6 +67437,7 @@ var RelayDeliverer = class extends Deliverer {
       headers: {
         date: s.headers.date,
         digest: s.headers.digest,
+        accept: s.headers.accept,
         "content-type": s.headers["content-type"],
         signature: s.headers.signature
       }
@@ -69615,7 +69665,9 @@ var BrowserAgent = class _BrowserAgent {
       actorId: this.urls.actor,
       log: this.log,
       relayUrl: `${frontOrigin.replace(/\/$/, "")}/api/relay`,
-      handle: config.handle,
+      // The relay finds the account by the front's own key for it, which for a
+      // mail-door account is the full address, not the bare handle.
+      handle: doorKeyOf(config.gateway?.url) || config.handle,
       sessionFetch: session.fetch
     });
     this.publisher = new Publisher({