@fedify/fedify 2.1.24 → 2.1.26

package/dist/utils/docloader.test.mjs

@@ -3,13 +3,16 @@ import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { t as esm_default } from "../esm-DVILvP5e.mjs";
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
-import "../std__assert-Duiq_YC9.mjs";
+import "../std__assert-BUOJXi-Z.mjs";
 import { t as assertRejects } from "../assert_rejects-B-qJtC9Z.mjs";
-import { l as verifyRequest } from "../http-UyebnM2c.mjs";
+import { l as verifyRequest } from "../http-B_M80hBW.mjs";
 import { i as rsaPrivateKey2 } from "../keys-CtZLJq76.mjs";
-import { t as getAuthenticatedDocumentLoader } from "../docloader-DdEK2tXP.mjs";
+import { t as getAuthenticatedDocumentLoader } from "../docloader-DEVImb5e.mjs";
 import { mockDocumentLoader, test } from "@fedify/fixture";
 import { FetchError, UrlError } from "@fedify/vocab-runtime";
+import { configure, reset } from "@logtape/logtape";
+import dns from "node:dns/promises";
+import { deepStrictEqual, ok, rejects } from "node:assert/strict";
 //#region src/utils/docloader.test.ts
 test("getAuthenticatedDocumentLoader()", async (t) => {
 	esm_default.spyGlobal();
@@ -144,5 +147,298 @@ test("getAuthenticatedDocumentLoader() bounds JSON after redirects", async () =>
 		esm_default.hardReset();
 	}
 });
+test("getAuthenticatedDocumentLoader() logs DNS failures as such", { ignore: "Deno" in globalThis && (await Deno.permissions.query({ name: "net" })).state !== "granted" }, async (t) => {
+	const loader = getAuthenticatedDocumentLoader({
+		keyId: new URL("https://example.com/key2"),
+		privateKey: rsaPrivateKey2
+	});
+	for (const result of [
+		"throws",
+		"empty",
+		"private"
+	]) await t.step(result, async () => {
+		const originalLookup = dns.lookup;
+		dns.lookup = (() => result === "throws" ? Promise.reject(/* @__PURE__ */ new Error("Resolver unavailable")) : Promise.resolve(result === "empty" ? [] : [{
+			address: "127.0.0.1",
+			family: 4
+		}]));
+		const records = [];
+		await configure({
+			sinks: { buffer: (record) => records.push(record) },
+			loggers: [{
+				category: "fedify",
+				sinks: ["buffer"],
+				lowestLevel: "debug"
+			}, {
+				category: ["logtape", "meta"],
+				sinks: []
+			}],
+			reset: true
+		});
+		try {
+			const url = "https://dns-failure.invalid/object";
+			const error = await assertRejects(() => loader(url), UrlError);
+			assertEquals(error.reason, result === "private" ? "disallowed" : "dns");
+			assertEquals(records.map((r) => [
+				r.level,
+				r.rawMessage,
+				r.properties.url
+			]), [result === "private" ? [
+				"error",
+				"Disallowed private URL: {url}",
+				url
+			] : [
+				"debug",
+				"DNS lookup failed for {url}",
+				url
+			]]);
+			assertEquals(records[0].properties.error, error);
+		} finally {
+			await reset();
+			dns.lookup = originalLookup;
+		}
+	});
+});
+test("getAuthenticatedDocumentLoader() bounds alternate document chains", async (t) => {
+	const base = "https://example.com/alternate-chain/";
+	const loader = getAuthenticatedDocumentLoader({
+		keyId: new URL("https://example.com/key2"),
+		privateKey: rsaPrivateKey2
+	}, { allowPrivateAddress: true });
+	for (const mode of [
+		"header",
+		"html",
+		"mixed"
+	]) for (const hops of [20, 21]) await t.step(`${mode}: ${hops} hops`, async () => {
+		esm_default.mockGlobal();
+		let requests = 0;
+		esm_default.get(`begin:${base}`, ({ url }) => {
+			requests++;
+			const index = Number(new URL(url).pathname.split("/").at(-1));
+			if (index === hops || requests > 30) return Response.json({ done: true });
+			const next = `${base}${index + 1}`;
+			if (mode === "mixed" && index % 2 === 1) return Response.redirect(next, 302);
+			return alternate(next, mode === "html");
+		});
+		try {
+			if (hops === 20) deepStrictEqual((await loader(`${base}0`)).document, { done: true });
+			else await rejects(loader(`${base}0`), (error) => {
+				ok(error instanceof FetchError);
+				ok(error.message.includes("Too many redirections (21)"));
+				return true;
+			});
+			deepStrictEqual(requests, 21);
+		} finally {
+			esm_default.hardReset();
+		}
+	});
+	for (const mode of [
+		"header",
+		"html",
+		"alternate-redirect",
+		"redirect-alternate",
+		"redirect-intermediate"
+	]) await t.step(`${mode}: cycle`, async () => {
+		esm_default.mockGlobal();
+		let requests = 0;
+		esm_default.get(`begin:${base}`, ({ url }) => {
+			requests++;
+			if (requests > 30) return Response.json({ stopped: true });
+			const index = Number(new URL(url).pathname.split("/").at(-1));
+			const next = `${base}${mode === "redirect-intermediate" ? index === 0 ? 1 : index === 1 ? 2 : 1 : 1 - index}`;
+			if (mode === "alternate-redirect" && index === 1 || (mode === "redirect-alternate" || mode === "redirect-intermediate") && index === 0) return Response.redirect(next, 302);
+			return alternate(next, mode === "html");
+		});
+		try {
+			await rejects(loader(`${base}0`), (error) => {
+				ok(error instanceof FetchError);
+				ok(error.message.includes("Redirect loop detected:"));
+				return true;
+			});
+			deepStrictEqual(requests, mode === "redirect-intermediate" ? 3 : 2);
+		} finally {
+			esm_default.hardReset();
+		}
+	});
+	await t.step("alternate followed by 20 redirects shares the limit", async () => {
+		esm_default.mockGlobal();
+		let requests = 0;
+		esm_default.get(`begin:${base}`, ({ url }) => {
+			requests++;
+			const index = Number(new URL(url).pathname.split("/").at(-1));
+			if (index === 21) return Response.json({ done: true });
+			return index === 0 ? alternate(`${base}1`, false) : Response.redirect(`${base}${index + 1}`, 302);
+		});
+		try {
+			await rejects(loader(`${base}0`), (error) => {
+				ok(error instanceof FetchError);
+				ok(error.message.includes("Too many redirections (21)"));
+				return true;
+			});
+			deepStrictEqual(requests, 21);
+		} finally {
+			esm_default.hardReset();
+		}
+	});
+	await t.step("relative alternate after redirect and isolated calls", async () => {
+		esm_default.mockGlobal();
+		esm_default.get(`${base}start`, Response.redirect(`${base}html`, 302));
+		esm_default.get(`${base}html`, alternate("./document", true));
+		esm_default.get(`${base}document`, Response.json({ done: true }));
+		try {
+			for (let i = 0; i < 2; i++) {
+				const results = await Promise.all([loader(`${base}start`), loader(`${base}start`)]);
+				for (const result of results) {
+					deepStrictEqual(result.document, { done: true });
+					deepStrictEqual(result.documentUrl, `${base}document`);
+				}
+			}
+		} finally {
+			esm_default.hardReset();
+		}
+	});
+	function alternate(next, html) {
+		return html ? new Response(`<link rel="alternate" type="application/activity+json" href="${next}">`, { headers: { "Content-Type": "text/html" } }) : new Response("not JSON", { headers: {
+			"Content-Type": "text/plain",
+			Link: `<${next}>; rel="alternate"; type="application/activity+json"`
+		} });
+	}
+});
+test("getAuthenticatedDocumentLoader() preserves cancellation across alternates", async (t) => {
+	const base = "https://example.com/alternate-abort/";
+	const loader = getAuthenticatedDocumentLoader({
+		keyId: new URL("https://example.com/key2"),
+		privateKey: rsaPrivateKey2
+	}, { allowPrivateAddress: true });
+	for (const html of [false, true]) await t.step(html ? "HTML" : "Link header", async () => {
+		esm_default.mockGlobal();
+		const controller = new AbortController();
+		const reason = /* @__PURE__ */ new Error("Alternate document loading cancelled");
+		let requests = 0;
+		esm_default.get(`begin:${base}`, ({ url }) => {
+			requests++;
+			const index = Number(new URL(url).pathname.split("/").at(-1));
+			if (index === 2) return Response.json({ done: true });
+			if (index === 1) controller.abort(reason);
+			const next = `${base}${index + 1}`;
+			return new Response(html ? `<link rel="alternate" type="application/activity+json" href="${next}">` : "not JSON", { headers: html ? { "Content-Type": "text/html" } : {
+				"Content-Type": "text/plain",
+				Link: `<${next}>; rel="alternate"; type="application/activity+json"`
+			} });
+		});
+		try {
+			await rejects(loader(`${base}0`, { signal: controller.signal }), (error) => {
+				ok(error === reason);
+				return true;
+			});
+			deepStrictEqual(requests, 2);
+		} finally {
+			esm_default.hardReset();
+		}
+	});
+});
+test("getAuthenticatedDocumentLoader() tracks fallback redirects after alternates", async () => {
+	esm_default.mockGlobal();
+	let requests = 0;
+	let knocks = 0;
+	const first = "https://example.com/fallback-alternate/a";
+	const second = "https://example.com/fallback-alternate/b";
+	esm_default.get(first, () => {
+		requests++;
+		if (requests > 30) return Response.json({ stopped: true });
+		return new Response("", { headers: {
+			"Content-Type": "text/plain",
+			Link: `<${second}>; rel="alternate"; type="application/activity+json"`
+		} });
+	});
+	esm_default.get(second, () => {
+		requests++;
+		return ++knocks % 2 === 1 ? new Response("", { status: 401 }) : Response.redirect(first, 302);
+	});
+	try {
+		const loader = getAuthenticatedDocumentLoader({
+			keyId: new URL("https://example.com/key2"),
+			privateKey: rsaPrivateKey2
+		}, { allowPrivateAddress: true });
+		await assertRejects(() => loader(first), FetchError, "Redirect loop detected:");
+		assertEquals(requests, 3);
+	} finally {
+		esm_default.hardReset();
+	}
+});
+test("getAuthenticatedDocumentLoader() resolves relative alternates without response URLs", async () => {
+	const originalFetch = globalThis.fetch;
+	const base = "https://example.com/empty-response-url/";
+	const urls = [];
+	globalThis.fetch = (input) => {
+		const url = input instanceof Request ? input.url : String(input);
+		urls.push(url);
+		if (url === `${base}start`) return Promise.resolve(Response.redirect(`${base}nested/page`, 302));
+		if (url === `${base}nested/page`) return Promise.resolve(new Response("<link rel=\"alternate\" type=\"application/activity+json\" href=\"document\">", { headers: { "Content-Type": "text/html" } }));
+		assertEquals(url, `${base}nested/document`);
+		return Promise.resolve(Response.json({ done: true }));
+	};
+	try {
+		assertEquals(await getAuthenticatedDocumentLoader({
+			keyId: new URL("https://example.com/key2"),
+			privateKey: rsaPrivateKey2
+		}, { allowPrivateAddress: true })(`${base}start`), {
+			contextUrl: null,
+			document: { done: true },
+			documentUrl: `${base}nested/document`
+		});
+		assertEquals(urls, [
+			`${base}start`,
+			`${base}nested/page`,
+			`${base}nested/document`
+		]);
+	} finally {
+		globalThis.fetch = originalFetch;
+	}
+});
+test("getAuthenticatedDocumentLoader() validates alternate addresses", async () => {
+	esm_default.mockGlobal();
+	let privateRequests = 0;
+	const url = "https://8.8.8.8/alternate";
+	esm_default.get(url, new Response("", { headers: {
+		"Content-Type": "text/plain",
+		Link: "<http://127.0.0.1/private>; rel=\"alternate\"; type=\"application/activity+json\""
+	} }));
+	esm_default.get("http://127.0.0.1/private", () => {
+		privateRequests++;
+		return Response.json({ private: true });
+	});
+	try {
+		const loader = getAuthenticatedDocumentLoader({
+			keyId: new URL("https://example.com/key2"),
+			privateKey: rsaPrivateKey2
+		});
+		await assertRejects(() => loader(url), UrlError);
+		assertEquals(privateRequests, 0);
+	} finally {
+		esm_default.hardReset();
+	}
+});
+test("getAuthenticatedDocumentLoader() rejects cancellation before fetching", async () => {
+	esm_default.mockGlobal();
+	let requests = 0;
+	const url = "https://example.com/pre-aborted-alternate";
+	esm_default.get(url, () => {
+		requests++;
+		return Response.json({ done: true });
+	});
+	try {
+		const loader = getAuthenticatedDocumentLoader({
+			keyId: new URL("https://example.com/key2"),
+			privateKey: rsaPrivateKey2
+		}, { allowPrivateAddress: true });
+		const controller = new AbortController();
+		controller.abort();
+		await rejects(loader(url, { signal: controller.signal }), { name: "AbortError" });
+		deepStrictEqual(requests, 0);
+	} finally {
+		esm_default.hardReset();
+	}
+});
 //#endregion
 export {};

package/dist/utils/mod.cjs

@@ -1,6 +1,6 @@
 const { Temporal } = require("@js-temporal/polyfill");
 const { URLPattern } = require("urlpattern-polyfill");
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_kv_cache = require("../kv-cache-DJhBDA9T.cjs");
+const require_kv_cache = require("../kv-cache-BlOG31SS.cjs");
 exports.getAuthenticatedDocumentLoader = require_kv_cache.getAuthenticatedDocumentLoader;
 exports.kvCache = require_kv_cache.kvCache;

package/dist/utils/mod.d.cts

@@ -1,3 +1,3 @@
 /// <reference lib="esnext.temporal" />
-import { n as getAuthenticatedDocumentLoader, t as kvCache } from "../mod-DniKVJ_C.cjs";
+import { n as getAuthenticatedDocumentLoader, t as kvCache } from "../mod-Cn9GJ5ex.cjs";
 export { getAuthenticatedDocumentLoader, kvCache };

package/dist/utils/mod.d.ts

@@ -1,3 +1,3 @@
 /// <reference lib="esnext.temporal" />
-import { n as getAuthenticatedDocumentLoader, t as kvCache } from "../mod-CMK_S-eX.js";
+import { n as getAuthenticatedDocumentLoader, t as kvCache } from "../mod-DNEgTI8M.js";
 export { getAuthenticatedDocumentLoader, kvCache };

package/dist/utils/mod.js

@@ -1,4 +1,4 @@
 import { Temporal } from "@js-temporal/polyfill";
 import { URLPattern } from "urlpattern-polyfill";
-import { n as getAuthenticatedDocumentLoader, t as kvCache } from "../kv-cache-J6hmiAEd.js";
+import { n as getAuthenticatedDocumentLoader, t as kvCache } from "../kv-cache-CEJICY0R.js";
 export { getAuthenticatedDocumentLoader, kvCache };

package/dist/vocab/cjs.test.mjs

@@ -5,7 +5,7 @@ import { createRequire } from "node:module";
 import { test } from "@fedify/fixture";
 import { strictEqual } from "node:assert";
 //#region src/vocab/cjs.test.ts
-test("CommonJS vocab entry exports Object", { ignore: "Deno" in globalThis }, () => {
+test("CommonJS vocab entry exports Object", { ignore: "Deno" in globalThis || "navigator" in globalThis && navigator.userAgent === "Cloudflare-Workers" }, () => {
 	const vocab = createRequire(import.meta.url)("./mod.cjs");
 	strictEqual(typeof vocab.Object, "function");
 	strictEqual(typeof vocab.Update, "function");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/fedify",
-  "version": "2.1.24",
+  "version": "2.1.26",
   "description": "An ActivityPub server framework",
   "keywords": [
     "ActivityPub",
@@ -144,9 +144,9 @@
     "uri-template-router": "^1.0.0",
     "url-template": "^3.1.1",
     "urlpattern-polyfill": "^10.1.0",
-    "@fedify/vocab": "2.1.24",
-    "@fedify/vocab-runtime": "2.1.24",
-    "@fedify/webfinger": "2.1.24"
+    "@fedify/vocab": "2.1.26",
+    "@fedify/webfinger": "2.1.26",
+    "@fedify/vocab-runtime": "2.1.26"
   },
   "devDependencies": {
     "@std/assert": "npm:@jsr/std__assert@^0.226.0",
@@ -158,8 +158,8 @@
     "tsx": "^4.19.4",
     "typescript": "^6.0.0",
     "wrangler": "^4.17.0",
-    "@fedify/fixture": "2.0.0",
-    "@fedify/vocab-tools": "^2.1.24"
+    "@fedify/vocab-tools": "^2.1.26",
+    "@fedify/fixture": "2.0.0"
   },
   "scripts": {
     "build:self": "tsdown",
@@ -169,6 +169,6 @@
     "test": "cd dist/ && node --test",
     "pretest:bun": "pnpm build",
     "test:bun": "cd dist/ && bun test --timeout 60000",
-    "test:cfworkers": "deno task codegen && wrangler deploy --dry-run --outdir src/cfworkers && node --import=tsx src/cfworkers/client.ts"
+    "test:cfworkers": "deno task codegen && wrangler deploy --dry-run --outdir src/cfworkers && node --import=tsx scripts/check_cfworkers.ts && node --import=tsx src/cfworkers/client.ts"
   }
 }

package/dist/docloader-DdEK2tXP.mjs

@@ -1,52 +0,0 @@
-import "@js-temporal/polyfill";
-import "urlpattern-polyfill";
-globalThis.addEventListener = () => {};
-import { s as validateCryptoKey } from "./key-A8SuFznD.mjs";
-import { n as doubleKnock } from "./http-UyebnM2c.mjs";
-import { curry } from "es-toolkit";
-import { UrlError, createActivityPubRequest, getRemoteDocument, logRequest, validatePublicUrl } from "@fedify/vocab-runtime";
-import { getLogger } from "@logtape/logtape";
-//#region src/utils/docloader.ts
-const logger = getLogger([
-	"fedify",
-	"utils",
-	"docloader"
-]);
-/**
-* Gets an authenticated {@link DocumentLoader} for the given identity.
-* Note that an authenticated document loader intentionally does not cache
-* the fetched documents.
-* @param identity The identity to get the document loader for.
-*                 The actor's key pair.
-* @param options The options for the document loader.
-* @returns The authenticated document loader.
-* @throws {TypeError} If the key is invalid or unsupported.
-* @since 0.4.0
-*/
-function getAuthenticatedDocumentLoader(identity, { allowPrivateAddress, userAgent, specDeterminer, tracerProvider } = {}) {
-	validateCryptoKey(identity.privateKey);
-	async function load(url, options) {
-		await validateUrl(url);
-		return getRemoteDocument(url, await doubleKnock(createActivityPubRequest(url, { userAgent }), identity, {
-			specDeterminer,
-			log: curry(logRequest)(logger),
-			tracerProvider,
-			signal: options?.signal,
-			validateRedirect: validateUrl
-		}), load);
-	}
-	async function validateUrl(url) {
-		if (!allowPrivateAddress) try {
-			await validatePublicUrl(url);
-		} catch (error) {
-			if (error instanceof UrlError) logger.error("Disallowed private URL: {url}", {
-				url,
-				error
-			});
-			throw error;
-		}
-	}
-	return load;
-}
-//#endregion
-export { getAuthenticatedDocumentLoader as t };