@fedify/fedify 2.3.9-dev.2048 → 2.3.10

package/dist/{send-CBtR8DQK.mjs → send-omt23uTA.mjs}

@@ -1,9 +1,9 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-ayal9buz.mjs";
-import { n as getDurationMs, r as getFederationMetrics } from "./metrics-Ce55disp.mjs";
-import { n as doubleKnock } from "./http-B2u6PvNX.mjs";
+import { n as version, t as name } from "./deno-DUgFsCmM.mjs";
+import { n as getDurationMs, r as getFederationMetrics } from "./metrics-QrVsKSG9.mjs";
+import { n as doubleKnock } from "./http-BNDHRNJP.mjs";
 import { getLogger } from "@logtape/logtape";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
 import { FetchError, UrlError, validatePublicUrl } from "@fedify/vocab-runtime";
@@ -125,6 +125,15 @@ async function sendActivityInternal({ activity, activityId, activityType, keys,
 		if (!allowPrivateAddress) try {
 			await validatePublicUrl(url);
 		} catch (error) {
+			if (error instanceof UrlError && error.reason === "dns") {
+				logger.error("DNS resolution failed for URL: {url}", {
+					url,
+					error
+				});
+				const failure = new FetchError(url, error.message);
+				failure.cause = error;
+				throw failure;
+			}
 			if (error instanceof UrlError) logger.error("Disallowed private URL: {url}", {
 				url,
 				error
@@ -132,7 +141,12 @@ async function sendActivityInternal({ activity, activityId, activityType, keys,
 			throw error;
 		}
 	}
-	await validateUrl(inbox.href);
+	try {
+		await validateUrl(inbox.href);
+	} catch (error) {
+		if (error instanceof FetchError) federationMetrics.recordDelivery(inbox, getDurationMs(started), false, activityType);
+		throw error;
+	}
 	headers = new Headers(headers);
 	headers.set("Content-Type", "application/activity+json");
 	const request = new Request(inbox, {

package/dist/sig/http.test.mjs

@@ -3,12 +3,12 @@ import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { t as esm_default } from "../esm-vrlUxr60.mjs";
 import { t as assertEquals } from "../assert_equals-C-ZRDbaf.mjs";
-import { r as assertExists, t as assertStringIncludes } from "../std__assert-BBjXFNOb.mjs";
+import { n as assertExists, t as assertStringIncludes } from "../std__assert-BvGuO4xO.mjs";
 import { n as assertGreaterOrEqual, r as assertFalse, t as assertRejects } from "../assert_rejects-DN60FHPX.mjs";
 import { t as assert } from "../assert-jSdZMYam.mjs";
 import { t as assertThrows } from "../assert_throws-BOkhLGYc.mjs";
-import { t as exportJwk } from "../key-C9DkrWwb.mjs";
-import { a as parseRfc9421Signature, c as timingSafeEqual, i as formatRfc9421SignatureParameters, l as verifyRequest, n as doubleKnock, o as parseRfc9421SignatureInput, r as formatRfc9421Signature, s as signRequest, t as createRfc9421SignatureBase, u as verifyRequestDetailed } from "../http-B2u6PvNX.mjs";
+import { t as exportJwk } from "../key-BbuFo4CW.mjs";
+import { a as parseRfc9421Signature, c as timingSafeEqual, i as formatRfc9421SignatureParameters, l as verifyRequest, n as doubleKnock, o as parseRfc9421SignatureInput, r as formatRfc9421Signature, s as signRequest, t as createRfc9421SignatureBase, u as verifyRequestDetailed } from "../http-BNDHRNJP.mjs";
 import { i as rsaPrivateKey2, l as rsaPublicKey5, o as rsaPublicKey1, s as rsaPublicKey2 } from "../keys-BAK-tUlf.mjs";
 import { createTestMeterProvider, createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
 import { FetchError, exportSpki } from "@fedify/vocab-runtime";
@@ -628,6 +628,46 @@ test("verifyRequest() [rfc9421] successful GET verification", async () => {
 		currentTime: Temporal.Instant.from(`${(/* @__PURE__ */ new Date(currentTimestamp * 1e3)).toISOString()}`)
 	}), rsaPublicKey2, "Valid signature should verify to the correct public key");
 });
+for (const failure of [
+	"missing key",
+	"invalid signature",
+	"digest mismatch",
+	"empty body",
+	"cached key"
+]) test(`verifyRequest() [rfc9421] multiple POST signatures: ${failure}`, async () => {
+	const body = failure === "empty body" ? "" : "Hello, world!";
+	const currentTime = Temporal.Instant.from("2024-03-05T08:09:44Z");
+	const signed = await signRequest(new Request("https://example.com/inbox", {
+		method: "POST",
+		body
+	}), rsaPrivateKey2, new URL("https://example.com/key2"), {
+		spec: "rfc9421",
+		currentTime
+	});
+	const input = signed.headers.get("Signature-Input");
+	const signature = signed.headers.get("Signature");
+	const firstInput = failure === "missing key" ? input.replace("https://example.com/key2", "https://example.com/missing-key") : input;
+	signed.headers.set("Signature-Input", `${firstInput}, ${input.replace(/^sig1=/, "sig2=")}`);
+	signed.headers.set("Signature", `sig1=:AAAAAA==:, ${signature.replace(/^sig1=/, "sig2=")}`);
+	const request = failure === "digest mismatch" ? new Request(signed, { body: "Tampered body" }) : signed;
+	const loaded = [];
+	assertEquals(await verifyRequest(request, {
+		keyCache: failure === "cached key" ? {
+			get: () => Promise.resolve(rsaPublicKey1),
+			set: async () => {}
+		} : void 0,
+		spec: "rfc9421",
+		currentTime,
+		contextLoader: mockDocumentLoader,
+		documentLoader: (url, options) => {
+			loaded.push(url);
+			return mockDocumentLoader(url, options);
+		}
+	}), failure === "digest mismatch" ? null : rsaPublicKey2);
+	assertEquals(loaded, failure === "digest mismatch" ? [] : failure === "missing key" ? ["https://example.com/missing-key", "https://example.com/key2"] : ["https://example.com/key2", "https://example.com/key2"]);
+	assertFalse(request.bodyUsed);
+	assertEquals(await request.text(), failure === "digest mismatch" ? "Tampered body" : body);
+});
 test("verifyRequest() [rfc9421] manual POST verification", async () => {
 	const currentTimestamp = 1709626184;
 	const currentTime = Temporal.Instant.from("2024-03-05T08:09:44Z");

package/dist/sig/key.test.mjs

@@ -2,11 +2,11 @@ import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-C-ZRDbaf.mjs";
-import "../std__assert-BBjXFNOb.mjs";
+import "../std__assert-BvGuO4xO.mjs";
 import { t as assertRejects } from "../assert_rejects-DN60FHPX.mjs";
 import { t as assert } from "../assert-jSdZMYam.mjs";
 import { t as assertThrows } from "../assert_throws-BOkhLGYc.mjs";
-import { a as generateCryptoKeyPair, i as fetchKeyDetailed, o as importJwk, r as fetchKey, s as validateCryptoKey, t as exportJwk } from "../key-C9DkrWwb.mjs";
+import { a as generateCryptoKeyPair, i as fetchKeyDetailed, o as importJwk, r as fetchKey, s as validateCryptoKey, t as exportJwk } from "../key-BbuFo4CW.mjs";
 import { c as rsaPublicKey3, i as rsaPrivateKey2, o as rsaPublicKey1, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-BAK-tUlf.mjs";
 import { CryptographicKey, Multikey } from "@fedify/vocab";
 import { createTestMeterProvider, createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";

package/dist/sig/ld.test.mjs

@@ -5,14 +5,17 @@ import { t as assertEquals } from "../assert_equals-C-ZRDbaf.mjs";
 import { n as assertGreaterOrEqual, r as assertFalse, t as assertRejects } from "../assert_rejects-DN60FHPX.mjs";
 import { n as assertInstanceOf, t as assert } from "../assert-jSdZMYam.mjs";
 import { t as assertThrows } from "../assert_throws-BOkhLGYc.mjs";
-import { a as generateCryptoKeyPair } from "../key-C9DkrWwb.mjs";
+import { a as generateCryptoKeyPair } from "../key-BbuFo4CW.mjs";
 import { a as rsaPrivateKey3, c as rsaPublicKey3, i as rsaPrivateKey2, n as ed25519PrivateKey, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-BAK-tUlf.mjs";
-import { a as compactJsonLd, f as isInvalidUrlTypeError, g as verifySignature, h as verifyJsonLd, i as attachSignature, n as UnsafeJsonLdError, o as createSignature, p as signJsonLd, s as detachSignature, u as hasSignatureLike } from "../ld-DNl7KwLY.mjs";
+import { a as compactJsonLd, f as isInvalidUrlTypeError, g as verifySignature, h as verifyJsonLd, i as attachSignature, n as UnsafeJsonLdError, o as createSignature, p as signJsonLd, s as detachSignature, u as hasSignatureLike } from "../ld-BYV2Luge.mjs";
 import { CryptographicKey } from "@fedify/vocab";
 import { createTestMeterProvider, mockDocumentLoader, test } from "@fedify/fixture";
 import { encodeBase64 } from "byte-encodings/base64";
 //#region src/sig/ld.test.ts
 test("isInvalidUrlTypeError()", () => {
+	assert(isInvalidUrlTypeError(/* @__PURE__ */ new TypeError("Invalid URL string.")));
+	assertFalse(isInvalidUrlTypeError(/* @__PURE__ */ new Error("Invalid URL string.")));
+	assertFalse(isInvalidUrlTypeError(/* @__PURE__ */ new TypeError("Invalid URL string. Other error")));
 	assert(isInvalidUrlTypeError(/* @__PURE__ */ new TypeError("Invalid URL: http://[")));
 	assert(isInvalidUrlTypeError(/* @__PURE__ */ new TypeError("\"http://[\" cannot be parsed as a URL.")));
 	const error = /* @__PURE__ */ new TypeError("Failed to parse URL");

package/dist/sig/mod.cjs

@@ -1,8 +1,8 @@
 const { Temporal } = require("@js-temporal/polyfill");
 const { URLPattern } = require("urlpattern-polyfill");
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_http = require("../http-BGP2QCbe.cjs");
-const require_proof = require("../proof-I6YcKRRq.cjs");
+const require_http = require("../http-CTYio50W.cjs");
+const require_proof = require("../proof-CGKQFT2M.cjs");
 exports.attachSignature = require_proof.attachSignature;
 exports.createProof = require_proof.createProof;
 exports.createSignature = require_proof.createSignature;

package/dist/sig/mod.js

@@ -1,5 +1,5 @@
 import { Temporal } from "@js-temporal/polyfill";
 import { URLPattern } from "urlpattern-polyfill";
-import { F as validateAcceptSignature, M as formatAcceptSignature, N as fulfillAcceptSignature, P as parseAcceptSignature, a as verifyRequestDetailed, c as fetchKey, d as importJwk, i as verifyRequest, l as fetchKeyDetailed, o as exportJwk, r as signRequest, u as generateCryptoKeyPair } from "../http-BPPCh0xN.js";
-import { C as verifySignature, S as verifyJsonLd, _ as hasSignatureLike, a as verifyProof, b as signJsonLd, c as getKeyOwner, d as attachSignature, i as verifyObject, m as detachSignature, n as hasProofLike, p as createSignature, r as signObject, s as doesActorOwnKey, t as createProof } from "../proof-Dz9ObvUq.js";
+import { F as validateAcceptSignature, M as formatAcceptSignature, N as fulfillAcceptSignature, P as parseAcceptSignature, a as verifyRequestDetailed, c as fetchKey, d as importJwk, i as verifyRequest, l as fetchKeyDetailed, o as exportJwk, r as signRequest, u as generateCryptoKeyPair } from "../http-BY8PpQzP.js";
+import { C as verifySignature, S as verifyJsonLd, _ as hasSignatureLike, a as verifyProof, b as signJsonLd, c as getKeyOwner, d as attachSignature, i as verifyObject, m as detachSignature, n as hasProofLike, p as createSignature, r as signObject, s as doesActorOwnKey, t as createProof } from "../proof-BxS2Xa8B.js";
 export { attachSignature, createProof, createSignature, detachSignature, doesActorOwnKey, exportJwk, fetchKey, fetchKeyDetailed, formatAcceptSignature, fulfillAcceptSignature, generateCryptoKeyPair, getKeyOwner, hasProofLike, hasSignatureLike, importJwk, parseAcceptSignature, signJsonLd, signObject, signRequest, validateAcceptSignature, verifyJsonLd, verifyObject, verifyProof, verifyRequest, verifyRequestDetailed, verifySignature };

package/dist/sig/owner.test.mjs

@@ -2,11 +2,11 @@ import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-C-ZRDbaf.mjs";
-import "../std__assert-BBjXFNOb.mjs";
+import "../std__assert-BvGuO4xO.mjs";
 import { r as assertFalse } from "../assert_rejects-DN60FHPX.mjs";
 import { t as assert } from "../assert-jSdZMYam.mjs";
 import { o as rsaPublicKey1, s as rsaPublicKey2 } from "../keys-BAK-tUlf.mjs";
-import { n as getKeyOwner, t as doesActorOwnKey } from "../owner-DqqDBw-l.mjs";
+import { n as getKeyOwner, t as doesActorOwnKey } from "../owner-BsBzJADO.mjs";
 import { Create, CryptographicKey, lookupObject } from "@fedify/vocab";
 import { createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
 //#region src/sig/owner.test.ts

package/dist/sig/proof.test.mjs

@@ -2,12 +2,12 @@ import { Temporal } from "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-C-ZRDbaf.mjs";
-import "../std__assert-BBjXFNOb.mjs";
+import "../std__assert-BvGuO4xO.mjs";
 import { n as assertGreaterOrEqual, r as assertFalse, t as assertRejects } from "../assert_rejects-DN60FHPX.mjs";
 import { n as assertInstanceOf, t as assert } from "../assert-jSdZMYam.mjs";
 import { i as rsaPrivateKey2, n as ed25519PrivateKey, r as ed25519PublicKey, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-BAK-tUlf.mjs";
 import { r as normalizeOutgoingActivityJsonLd } from "../outgoing-jsonld-HOAywiid.mjs";
-import { a as verifyProof, i as verifyObject, n as hasProofLike, r as signObject, t as createProof } from "../proof-D5vP7VIN.mjs";
+import { a as verifyProof, i as verifyObject, n as hasProofLike, r as signObject, t as createProof } from "../proof-cXVkPBIU.mjs";
 import { Create, DataIntegrityProof, Document, Multikey, Note, PUBLIC_COLLECTION, Place } from "@fedify/vocab";
 import { createTestMeterProvider, mockDocumentLoader, test } from "@fedify/fixture";
 import { decodeMultibase, importMultibaseKey } from "@fedify/vocab-runtime";

package/dist/{std__assert-BBjXFNOb.mjs → std__assert-BvGuO4xO.mjs}

@@ -1,7 +1,7 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { l as AssertionError, s as format } from "./assert_equals-C-ZRDbaf.mjs";
+import { l as AssertionError } from "./assert_equals-C-ZRDbaf.mjs";
 import "./assert_rejects-DN60FHPX.mjs";
 import "./assert_throws-BOkhLGYc.mjs";
 import "./assert_strict_equals-XEgZAlrj.mjs";
@@ -28,31 +28,6 @@ import "./assert_strict_equals-XEgZAlrj.mjs";
 	}
 }
 //#endregion
-//#region ../../node_modules/.pnpm/@jsr+std__assert@0.226.0/node_modules/@jsr/std__assert/assert_greater.js
-/**
-* Make an assertion that `actual` is greater than `expected`.
-* If not then throw.
-*
-* @example Usage
-* ```ts no-eval
-* import { assertGreater } from "@std/assert/assert-greater";
-*
-* assertGreater(2, 1); // Doesn't throw
-* assertGreater(1, 1); // Throws
-* assertGreater(0, 1); // Throws
-* ```
-*
-* @typeParam T The type of the values to compare.
-* @param actual The actual value to compare.
-* @param expected The expected value to compare.
-* @param msg The optional message to display if the assertion fails.
-*/ function assertGreater(actual, expected, msg) {
-	if (actual > expected) return;
-	const actualString = format(actual);
-	const expectedString = format(expected);
-	throw new AssertionError(msg ?? `Expect ${actualString} > ${expectedString}`);
-}
-//#endregion
 //#region ../../node_modules/.pnpm/@jsr+std__assert@0.226.0/node_modules/@jsr/std__assert/assert_string_includes.js
 /**
 * Make an assertion that actual includes expected. If not
@@ -76,4 +51,4 @@ import "./assert_strict_equals-XEgZAlrj.mjs";
 	}
 }
 //#endregion
-export { assertGreater as n, assertExists as r, assertStringIncludes as t };
+export { assertExists as n, assertStringIncludes as t };

package/dist/{temporal-B9t2tY9A.mjs → temporal-ZUAQe754.mjs}

@@ -1,7 +1,7 @@
 import { Temporal } from "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { c as getNormalizationContextLoader } from "./ld-DNl7KwLY.mjs";
+import { c as getNormalizationContextLoader } from "./ld-BYV2Luge.mjs";
 import jsonld from "@fedify/vocab-runtime/jsonld";
 //#region src/federation/temporal.ts
 function isPlainObject(value) {

package/dist/testing/mod.mjs

@@ -1,5 +1,5 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { i as testDefinitions, n as createOutboxContext, r as createRequestContext, t as createInboxContext } from "../context-BepjCFHN.mjs";
+import { i as testDefinitions, n as createOutboxContext, r as createRequestContext, t as createInboxContext } from "../context-CxbCIptr.mjs";
 export { createInboxContext, createOutboxContext, createRequestContext, testDefinitions };

package/dist/{types-DWs-qZaY.cjs → types-DRPjmHVV.cjs}

@@ -93,8 +93,8 @@ const DEFAULT_MAX_REDIRECTION = 5;
 * bounce the request to an internal address.
 * @param url The URL to fetch.
 * @param headers The request headers.
-* @returns The final response, or `null` if the URL is disallowed or there
-*          are too many redirects.
+* @returns The final response, or `null` if the URL is disallowed, its
+*          hostname cannot be resolved, or there are too many redirects.
 */
 async function fetchPublicUrl(url, headers) {
 	let current = url instanceof URL ? url : new URL(url);
@@ -104,7 +104,11 @@ async function fetchPublicUrl(url, headers) {
 			await (0, _fedify_vocab_runtime.validatePublicUrl)(current.href);
 		} catch (e) {
 			if (e instanceof _fedify_vocab_runtime.UrlError) {
-				logger.error("Refused to fetch a private or invalid URL {url}: {error}", {
+				if (e.reason === "dns") logger.error("DNS lookup failed for {url}: {error}", {
+					url: current.href,
+					error: e
+				});
+				else logger.error("Refused to fetch a private or invalid URL {url}: {error}", {
 					url: current.href,
 					error: e
 				});

package/dist/{types-sXITXcWa.js → types-miAYfiGO.js}

@@ -92,8 +92,8 @@ const DEFAULT_MAX_REDIRECTION = 5;
 * bounce the request to an internal address.
 * @param url The URL to fetch.
 * @param headers The request headers.
-* @returns The final response, or `null` if the URL is disallowed or there
-*          are too many redirects.
+* @returns The final response, or `null` if the URL is disallowed, its
+*          hostname cannot be resolved, or there are too many redirects.
 */
 async function fetchPublicUrl(url, headers) {
 	let current = url instanceof URL ? url : new URL(url);
@@ -103,7 +103,11 @@ async function fetchPublicUrl(url, headers) {
 			await validatePublicUrl(current.href);
 		} catch (e) {
 			if (e instanceof UrlError) {
-				logger.error("Refused to fetch a private or invalid URL {url}: {error}", {
+				if (e.reason === "dns") logger.error("DNS lookup failed for {url}: {error}", {
+					url: current.href,
+					error: e
+				});
+				else logger.error("Refused to fetch a private or invalid URL {url}: {error}", {
 					url: current.href,
 					error: e
 				});

package/dist/utils/docloader.test.mjs

@@ -3,13 +3,16 @@ import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { t as esm_default } from "../esm-vrlUxr60.mjs";
 import { t as assertEquals } from "../assert_equals-C-ZRDbaf.mjs";
-import "../std__assert-BBjXFNOb.mjs";
+import "../std__assert-BvGuO4xO.mjs";
 import { t as assertRejects } from "../assert_rejects-DN60FHPX.mjs";
-import { l as verifyRequest } from "../http-B2u6PvNX.mjs";
+import { l as verifyRequest } from "../http-BNDHRNJP.mjs";
 import { i as rsaPrivateKey2 } from "../keys-BAK-tUlf.mjs";
-import { t as getAuthenticatedDocumentLoader } from "../docloader-C-JrNL14.mjs";
+import { t as getAuthenticatedDocumentLoader } from "../docloader-w72ipM49.mjs";
+import { configure, reset } from "@logtape/logtape";
 import { mockDocumentLoader, test } from "@fedify/fixture";
 import { FetchError, UrlError } from "@fedify/vocab-runtime";
+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();
@@ -160,5 +163,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/kv-cache.test.mjs

@@ -1,7 +1,7 @@
 import { Temporal } from "@js-temporal/polyfill";
 import { URLPattern } from "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as kvCache, t as MockKvStore } from "../kv-cache-qJSjfLGm.mjs";
+import { n as kvCache, t as MockKvStore } from "../kv-cache-CNZOaZYq.mjs";
 import { deepStrictEqual, throws } from "node:assert";
 import { createTestMeterProvider, mockDocumentLoader, test } from "@fedify/fixture";
 import { preloadedContexts } from "@fedify/vocab-runtime";

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-C1TC_e9y.cjs");
+const require_kv_cache = require("../kv-cache-CrcqGkT-.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-1TuoXkGs.cjs";
+import { n as getAuthenticatedDocumentLoader, t as kvCache } from "../mod-Co1M3Ux0.cjs";
 export { getAuthenticatedDocumentLoader, kvCache };