@fedify/fedify 2.3.9-dev.2048 → 2.3.10

package/dist/federation/send.test.mjs

@@ -3,17 +3,18 @@ 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 { 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 assertNotEquals } from "../assert_not_equals-DkVK8oqV.mjs";
-import { l as verifyRequest } from "../http-B2u6PvNX.mjs";
+import { l as verifyRequest } from "../http-BNDHRNJP.mjs";
 import { i as rsaPrivateKey2, n as ed25519PrivateKey, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-BAK-tUlf.mjs";
-import { t as doesActorOwnKey } from "../owner-DqqDBw-l.mjs";
-import { n as extractInboxes, r as sendActivity, t as SendActivityError } from "../send-CBtR8DQK.mjs";
+import { t as doesActorOwnKey } from "../owner-BsBzJADO.mjs";
+import { n as extractInboxes, r as sendActivity, t as SendActivityError } from "../send-omt23uTA.mjs";
 import { Activity, Application, Endpoints, Group, Person, Service } from "@fedify/vocab";
 import { createTestMeterProvider, createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
 import { FetchError, UrlError } from "@fedify/vocab-runtime";
+import dns from "node:dns/promises";
 import { AggregationTemporality, InMemoryMetricExporter, MeterProvider, PeriodicExportingMetricReader } from "@opentelemetry/sdk-metrics";
 //#region src/federation/send.test.ts
 test("extractInboxes()", () => {
@@ -687,5 +688,85 @@ for (const signed of [false, true]) {
 		});
 	});
 }
+for (const signed of [false, true]) test({
+	name: `sendActivity() classifies DNS failures (signed: ${signed})`,
+	ignore: "Deno" in globalThis && (await Deno.permissions.query({ name: "net" })).state !== "granted",
+	async fn(t) {
+		const activity = {
+			type: "Create",
+			id: "https://example.com/activity"
+		};
+		const destination = "https://delivery.invalid/inbox";
+		const publicInbox = "https://8.8.8.8/inbox";
+		const keys = signed ? [{
+			privateKey: rsaPrivateKey2,
+			keyId: rsaPublicKey2.id
+		}] : [];
+		for (const result of [
+			"throws",
+			"empty",
+			"cname",
+			"private"
+		]) for (const redirected of [false, true]) await t.step(`${result}, redirected: ${redirected}`, async () => {
+			const [meterProvider, recorder] = createTestMeterProvider();
+			const originalLookup = dns.lookup;
+			const resolverError = /* @__PURE__ */ new Error("Resolver unavailable");
+			const lookups = [];
+			dns.lookup = ((hostname, options) => {
+				lookups.push(hostname);
+				assertEquals(hostname, "delivery.invalid");
+				assertEquals(options, { all: true });
+				if (result === "throws") return Promise.reject(resolverError);
+				return Promise.resolve(result === "empty" ? [] : [{
+					address: result === "private" ? "127.0.0.1" : "alias.invalid.",
+					family: 4
+				}]);
+			});
+			try {
+				esm_default.mockGlobal().catch(202);
+				if (redirected) esm_default.route(publicInbox, {
+					status: 307,
+					headers: { Location: destination }
+				});
+				const send = () => sendActivity({
+					activity,
+					activityType: "https://www.w3.org/ns/activitystreams#Create",
+					meterProvider,
+					keys,
+					inbox: new URL(redirected ? publicInbox : destination)
+				});
+				if (result === "private") assertEquals((await assertRejects(send, UrlError)).reason, "disallowed");
+				else {
+					const error = await assertRejects(send, FetchError);
+					assertEquals(error.url.href, destination);
+					assertInstanceOf(error.cause, UrlError);
+					assertEquals(error.cause.reason, "dns");
+					assertEquals(error.cause.cause, result === "throws" ? resolverError : void 0);
+				}
+				const expectedCount = result === "private" && !redirected ? 0 : 1;
+				const sent = recorder.getMeasurements("activitypub.delivery.sent");
+				const durations = recorder.getMeasurements("activitypub.delivery.duration");
+				assertEquals(sent.length, expectedCount);
+				assertEquals(durations.length, expectedCount);
+				if (expectedCount === 1) {
+					assertEquals(sent[0].value, 1);
+					assertEquals(sent[0].attributes, {
+						"activitypub.remote.host": redirected ? "8.8.8.8" : "delivery.invalid",
+						"activitypub.activity.type": "https://www.w3.org/ns/activitystreams#Create",
+						"activitypub.delivery.success": false
+					});
+					assertEquals(durations[0].attributes, sent[0].attributes);
+					assertGreaterOrEqual(durations[0].value, 0);
+				}
+				assertEquals(lookups, ["delivery.invalid"]);
+				assertEquals(esm_default.callHistory.calls(destination).length, 0);
+				assertEquals(esm_default.callHistory.calls().length, redirected ? 1 : 0);
+			} finally {
+				dns.lookup = originalLookup;
+				esm_default.hardReset();
+			}
+		});
+	}
+});
 //#endregion
 export {};

package/dist/federation/temporal.test.mjs

@@ -1,10 +1,10 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-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 { t as hasMalformedKnownTemporalLiteral } from "../temporal-B9t2tY9A.mjs";
+import { t as hasMalformedKnownTemporalLiteral } from "../temporal-ZUAQe754.mjs";
 import { test } from "@fedify/fixture";
 //#region src/federation/temporal.test.ts
 test("hasMalformedKnownTemporalLiteral() detects expanded proof timestamps", async () => {

package/dist/federation/webfinger.test.mjs

@@ -1,12 +1,12 @@
 import { Temporal } from "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { r as createRequestContext } from "../context-BepjCFHN.mjs";
+import { r as createRequestContext } from "../context-CxbCIptr.mjs";
 import { t as assertEquals } from "../assert_equals-C-ZRDbaf.mjs";
-import "../std__assert-BBjXFNOb.mjs";
+import "../std__assert-BvGuO4xO.mjs";
 import { t as assertNotEquals } from "../assert_not_equals-DkVK8oqV.mjs";
 import { t as MemoryKvStore } from "../kv-CX8qfaad.mjs";
-import { o as createFederation, s as handleWebFinger } from "../middleware-BCG2BX1n.mjs";
+import { o as createFederation, s as handleWebFinger } from "../middleware-Bj9s3J_0.mjs";
 import { Image, Link, Person, Tombstone } from "@fedify/vocab";
 import { createTestMeterProvider, test } from "@fedify/fixture";
 //#region src/federation/webfinger.test.ts

package/dist/{http-B2u6PvNX.mjs → http-BNDHRNJP.mjs}

@@ -1,10 +1,10 @@
 import { Temporal } from "@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, s as measureSignatureKeyFetch } from "./metrics-Ce55disp.mjs";
+import { n as version, t as name } from "./deno-DUgFsCmM.mjs";
+import { n as getDurationMs, r as getFederationMetrics, s as measureSignatureKeyFetch } from "./metrics-QrVsKSG9.mjs";
 import { i as validateAcceptSignature, n as fulfillAcceptSignature, r as parseAcceptSignature } from "./accept-Dd__NiUL.mjs";
-import { i as fetchKeyDetailed, s as validateCryptoKey } from "./key-C9DkrWwb.mjs";
+import { i as fetchKeyDetailed, s as validateCryptoKey } from "./key-BbuFo4CW.mjs";
 import { getLogger } from "@logtape/logtape";
 import { CryptographicKey } from "@fedify/vocab";
 import { SpanStatusCode, trace } from "@opentelemetry/api";
@@ -718,6 +718,8 @@ async function verifyRequestRfc9421(request, span, metricsContext, { documentLoa
 		failure = result;
 		failureAlgorithm = algorithm;
 	};
+	let body = null;
+	let digestValid = null;
 	for (const sigName of signatureNames) {
 		if (!signatures[sigName]) {
 			setFailure(invalidSignatureResult(parseKeyId(signatureInputs[sigName]?.keyId)));
@@ -769,7 +771,9 @@ async function verifyRequestRfc9421(request, span, metricsContext, { documentLoa
 				setFailure(invalidSignatureResult(keyId));
 				continue;
 			}
-			if (!await verifyRfc9421ContentDigest(contentDigestHeader, await request.arrayBuffer())) {
+			body ??= await request.arrayBuffer();
+			digestValid ??= await verifyRfc9421ContentDigest(contentDigestHeader, body);
+			if (!digestValid) {
 				logger.debug("Failed to verify; Content-Digest verification failed.", { contentDigest: contentDigestHeader });
 				setFailure(invalidSignatureResult(keyId));
 				continue;

package/dist/{http-BPPCh0xN.js → http-BY8PpQzP.js}

@@ -10,7 +10,7 @@ import { ATTR_HTTP_REQUEST_HEADER, ATTR_HTTP_REQUEST_METHOD, ATTR_URL_FULL } fro
 import { decodeBase64, encodeBase64 } from "byte-encodings/base64";
 //#region deno.json
 var name = "@fedify/fedify";
-var version = "2.3.9-dev.2048+c88fcc8c";
+var version = "2.3.10";
 //#endregion
 //#region src/sig/accept.ts
 /**
@@ -2189,6 +2189,8 @@ async function verifyRequestRfc9421(request, span, metricsContext, { documentLoa
 		failure = result;
 		failureAlgorithm = algorithm;
 	};
+	let body = null;
+	let digestValid = null;
 	for (const sigName of signatureNames) {
 		if (!signatures[sigName]) {
 			setFailure(invalidSignatureResult(parseKeyId(signatureInputs[sigName]?.keyId)));
@@ -2240,7 +2242,9 @@ async function verifyRequestRfc9421(request, span, metricsContext, { documentLoa
 				setFailure(invalidSignatureResult(keyId));
 				continue;
 			}
-			if (!await verifyRfc9421ContentDigest(contentDigestHeader, await request.arrayBuffer())) {
+			body ??= await request.arrayBuffer();
+			digestValid ??= await verifyRfc9421ContentDigest(contentDigestHeader, body);
+			if (!digestValid) {
 				logger.debug("Failed to verify; Content-Digest verification failed.", { contentDigest: contentDigestHeader });
 				setFailure(invalidSignatureResult(keyId));
 				continue;

package/dist/{http-BGP2QCbe.cjs → http-CTYio50W.cjs}

@@ -11,7 +11,7 @@ let _opentelemetry_semantic_conventions = require("@opentelemetry/semantic-conve
 let byte_encodings_base64 = require("byte-encodings/base64");
 //#region deno.json
 var name = "@fedify/fedify";
-var version = "2.3.9-dev.2048+c88fcc8c";
+var version = "2.3.10";
 //#endregion
 //#region src/sig/accept.ts
 /**
@@ -2190,6 +2190,8 @@ async function verifyRequestRfc9421(request, span, metricsContext, { documentLoa
 		failure = result;
 		failureAlgorithm = algorithm;
 	};
+	let body = null;
+	let digestValid = null;
 	for (const sigName of signatureNames) {
 		if (!signatures[sigName]) {
 			setFailure(invalidSignatureResult(parseKeyId(signatureInputs[sigName]?.keyId)));
@@ -2241,7 +2243,9 @@ async function verifyRequestRfc9421(request, span, metricsContext, { documentLoa
 				setFailure(invalidSignatureResult(keyId));
 				continue;
 			}
-			if (!await verifyRfc9421ContentDigest(contentDigestHeader, await request.arrayBuffer())) {
+			body ??= await request.arrayBuffer();
+			digestValid ??= await verifyRfc9421ContentDigest(contentDigestHeader, body);
+			if (!digestValid) {
 				logger.debug("Failed to verify; Content-Digest verification failed.", { contentDigest: contentDigestHeader });
 				setFailure(invalidSignatureResult(keyId));
 				continue;

package/dist/{key-C9DkrWwb.mjs → key-BbuFo4CW.mjs}

@@ -1,8 +1,8 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-ayal9buz.mjs";
-import { _ as recordKeyLookup, n as getDurationMs, t as classifyFetchError } from "./metrics-Ce55disp.mjs";
+import { n as version, t as name } from "./deno-DUgFsCmM.mjs";
+import { _ as recordKeyLookup, n as getDurationMs, t as classifyFetchError } from "./metrics-QrVsKSG9.mjs";
 import { getLogger } from "@logtape/logtape";
 import { CryptographicKey, Object as Object$1, isActor } from "@fedify/vocab";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";

package/dist/{kv-D6hNiMTK.d.ts → kv-CZKl1IUS.d.cts}

@@ -41,14 +41,15 @@ interface KvStore {
   /**
   * Gets the value for the given key.
   * @param key The key to get the value for.
-  * @returns The value for the key, or `undefined` if the key does not exist.
+  * @returns The value for the key, including `null` if stored, or `undefined`
+  *          if the key does not exist.
   * @template T The type of the value to get.
   */
   get<T = unknown>(key: KvKey): Promise<T | undefined>;
   /**
   * Sets the value for the given key.
   * @param key The key to set the value for.
-  * @param value The value to set.
+  * @param value The value to set.  `null` is a storable value.
   * @param options Additional options for setting the value.
   */
   set(key: KvKey, value: unknown, options?: KvStoreSetOptions): Promise<void>;

package/dist/{kv-gJ8LYbxX.d.cts → kv-CxaI4eGo.d.ts}

@@ -41,14 +41,15 @@ interface KvStore {
   /**
   * Gets the value for the given key.
   * @param key The key to get the value for.
-  * @returns The value for the key, or `undefined` if the key does not exist.
+  * @returns The value for the key, including `null` if stored, or `undefined`
+  *          if the key does not exist.
   * @template T The type of the value to get.
   */
   get<T = unknown>(key: KvKey): Promise<T | undefined>;
   /**
   * Sets the value for the given key.
   * @param key The key to set the value for.
-  * @param value The value to set.
+  * @param value The value to set.  `null` is a storable value.
   * @param options Additional options for setting the value.
   */
   set(key: KvKey, value: unknown, options?: KvStoreSetOptions): Promise<void>;

package/dist/{kv-cache-qJSjfLGm.mjs → kv-cache-CNZOaZYq.mjs}

@@ -1,7 +1,7 @@
 import { Temporal } from "@js-temporal/polyfill";
 import { URLPattern } from "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { p as recordDocumentCache } from "./metrics-Ce55disp.mjs";
+import { p as recordDocumentCache } from "./metrics-QrVsKSG9.mjs";
 import { getLogger } from "@logtape/logtape";
 import { preloadedContexts } from "@fedify/vocab-runtime";
 //#region src/utils/kv-cache.ts

package/dist/{kv-cache-C1TC_e9y.cjs → kv-cache-CrcqGkT-.cjs}

@@ -1,7 +1,7 @@
 const { Temporal } = require("@js-temporal/polyfill");
 const { URLPattern } = require("urlpattern-polyfill");
 require("./chunk-DDcVe30Y.cjs");
-const require_http = require("./http-BGP2QCbe.cjs");
+const require_http = require("./http-CTYio50W.cjs");
 let _logtape_logtape = require("@logtape/logtape");
 let _fedify_vocab_runtime = require("@fedify/vocab-runtime");
 let es_toolkit = require("es-toolkit");
@@ -11,10 +11,13 @@ const logger$1 = (0, _logtape_logtape.getLogger)([
 	"utils",
 	"docloader"
 ]);
+const DEFAULT_MAX_REDIRECTION = 20;
 /**
 * Gets an authenticated {@link DocumentLoader} for the given identity.
 * Note that an authenticated document loader intentionally does not cache
 * the fetched documents.
+* At most 20 HTTP redirects and alternate document links are followed in total
+* per call.  Revisiting a URL within that chain throws a {@link FetchError}.
 * @param identity The identity to get the document loader for.
 *                 The actor's key pair.
 * @param options The options for the document loader.
@@ -24,29 +27,52 @@ const logger$1 = (0, _logtape_logtape.getLogger)([
 */
 function getAuthenticatedDocumentLoader(identity, { allowPrivateAddress, maxRedirection, userAgent, specDeterminer, tracerProvider } = {}) {
 	require_http.validateCryptoKey(identity.privateKey);
-	async function load(url, options) {
-		await validateUrl(url);
-		return (0, _fedify_vocab_runtime.getRemoteDocument)(url, await require_http.doubleKnock((0, _fedify_vocab_runtime.createActivityPubRequest)(url, { userAgent }), identity, {
+	async function load(url, options, redirected = 0, visited = /* @__PURE__ */ new Set()) {
+		options?.signal?.throwIfAborted();
+		let currentUrl = new URL(url).href;
+		await validateUrl(currentUrl);
+		visited.add(currentUrl);
+		const originalRequest = (0, _fedify_vocab_runtime.createActivityPubRequest)(currentUrl, { userAgent });
+		function follow(nextUrl) {
+			options?.signal?.throwIfAborted();
+			if (redirected >= DEFAULT_MAX_REDIRECTION) throw new _fedify_vocab_runtime.FetchError(currentUrl, `Too many redirections (${redirected + 1})`);
+			if (visited.has(nextUrl)) throw new _fedify_vocab_runtime.FetchError(currentUrl, `Redirect loop detected: ${nextUrl}`);
+			redirected++;
+		}
+		const response = await require_http.doubleKnock(originalRequest, identity, {
 			maxRedirection,
 			specDeterminer,
 			log: (0, es_toolkit.curry)(_fedify_vocab_runtime.logRequest)(logger$1),
 			tracerProvider,
 			signal: options?.signal,
-			validateRedirect: validateUrl
-		}), load);
+			validateRedirect: async (nextUrl) => {
+				follow(nextUrl);
+				await validateUrl(nextUrl);
+				visited.add(nextUrl);
+				currentUrl = nextUrl;
+			}
+		});
+		return (0, _fedify_vocab_runtime.getRemoteDocument)(currentUrl, response, (alternateUrl) => {
+			follow(alternateUrl);
+			return load(alternateUrl, options, redirected, visited);
+		});
 	}
 	async function validateUrl(url) {
 		if (!allowPrivateAddress) try {
 			await (0, _fedify_vocab_runtime.validatePublicUrl)(url);
 		} catch (error) {
-			if (error instanceof _fedify_vocab_runtime.UrlError) logger$1.error("Disallowed private URL: {url}", {
+			if (error instanceof _fedify_vocab_runtime.UrlError) if (error.reason === "dns") logger$1.debug("DNS lookup failed for {url}", {
+				url,
+				error
+			});
+			else logger$1.error("Disallowed private URL: {url}", {
 				url,
 				error
 			});
 			throw error;
 		}
 	}
-	return load;
+	return (url, options) => load(url, options);
 }
 //#endregion
 //#region src/utils/kv-cache.ts

package/dist/{kv-cache-Cl1q1aA9.js → kv-cache-DNnjnc9t.js}

@@ -1,8 +1,8 @@
 import { Temporal } from "@js-temporal/polyfill";
 import { URLPattern } from "urlpattern-polyfill";
-import { T as recordDocumentCache, f as validateCryptoKey, t as doubleKnock } from "./http-BPPCh0xN.js";
+import { T as recordDocumentCache, f as validateCryptoKey, t as doubleKnock } from "./http-BY8PpQzP.js";
 import { getLogger } from "@logtape/logtape";
-import { UrlError, createActivityPubRequest, getRemoteDocument, logRequest, preloadedContexts, validatePublicUrl } from "@fedify/vocab-runtime";
+import { FetchError, UrlError, createActivityPubRequest, getRemoteDocument, logRequest, preloadedContexts, validatePublicUrl } from "@fedify/vocab-runtime";
 import { curry } from "es-toolkit";
 //#region src/utils/docloader.ts
 const logger$1 = getLogger([
@@ -10,10 +10,13 @@ const logger$1 = getLogger([
 	"utils",
 	"docloader"
 ]);
+const DEFAULT_MAX_REDIRECTION = 20;
 /**
 * Gets an authenticated {@link DocumentLoader} for the given identity.
 * Note that an authenticated document loader intentionally does not cache
 * the fetched documents.
+* At most 20 HTTP redirects and alternate document links are followed in total
+* per call.  Revisiting a URL within that chain throws a {@link FetchError}.
 * @param identity The identity to get the document loader for.
 *                 The actor's key pair.
 * @param options The options for the document loader.
@@ -23,29 +26,52 @@ const logger$1 = getLogger([
 */
 function getAuthenticatedDocumentLoader(identity, { allowPrivateAddress, maxRedirection, userAgent, specDeterminer, tracerProvider } = {}) {
 	validateCryptoKey(identity.privateKey);
-	async function load(url, options) {
-		await validateUrl(url);
-		return getRemoteDocument(url, await doubleKnock(createActivityPubRequest(url, { userAgent }), identity, {
+	async function load(url, options, redirected = 0, visited = /* @__PURE__ */ new Set()) {
+		options?.signal?.throwIfAborted();
+		let currentUrl = new URL(url).href;
+		await validateUrl(currentUrl);
+		visited.add(currentUrl);
+		const originalRequest = createActivityPubRequest(currentUrl, { userAgent });
+		function follow(nextUrl) {
+			options?.signal?.throwIfAborted();
+			if (redirected >= DEFAULT_MAX_REDIRECTION) throw new FetchError(currentUrl, `Too many redirections (${redirected + 1})`);
+			if (visited.has(nextUrl)) throw new FetchError(currentUrl, `Redirect loop detected: ${nextUrl}`);
+			redirected++;
+		}
+		const response = await doubleKnock(originalRequest, identity, {
 			maxRedirection,
 			specDeterminer,
 			log: curry(logRequest)(logger$1),
 			tracerProvider,
 			signal: options?.signal,
-			validateRedirect: validateUrl
-		}), load);
+			validateRedirect: async (nextUrl) => {
+				follow(nextUrl);
+				await validateUrl(nextUrl);
+				visited.add(nextUrl);
+				currentUrl = nextUrl;
+			}
+		});
+		return getRemoteDocument(currentUrl, response, (alternateUrl) => {
+			follow(alternateUrl);
+			return load(alternateUrl, options, redirected, visited);
+		});
 	}
 	async function validateUrl(url) {
 		if (!allowPrivateAddress) try {
 			await validatePublicUrl(url);
 		} catch (error) {
-			if (error instanceof UrlError) logger$1.error("Disallowed private URL: {url}", {
+			if (error instanceof UrlError) if (error.reason === "dns") logger$1.debug("DNS lookup failed for {url}", {
+				url,
+				error
+			});
+			else logger$1.error("Disallowed private URL: {url}", {
 				url,
 				error
 			});
 			throw error;
 		}
 	}
-	return load;
+	return (url, options) => load(url, options);
 }
 //#endregion
 //#region src/utils/kv-cache.ts

package/dist/{ld-DNl7KwLY.mjs → ld-BYV2Luge.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, s as measureSignatureKeyFetch } from "./metrics-Ce55disp.mjs";
-import { r as fetchKey, s as validateCryptoKey } from "./key-C9DkrWwb.mjs";
+import { n as version, t as name } from "./deno-DUgFsCmM.mjs";
+import { n as getDurationMs, r as getFederationMetrics, s as measureSignatureKeyFetch } from "./metrics-QrVsKSG9.mjs";
+import { r as fetchKey, s as validateCryptoKey } from "./key-BbuFo4CW.mjs";
 import { getLogger } from "@logtape/logtape";
 import { Activity, CryptographicKey, Object as Object$1, getTypeId } from "@fedify/vocab";
 import { SpanStatusCode, trace } from "@opentelemetry/api";
@@ -206,7 +206,7 @@ function normalizeContextReference(reference, baseUrl) {
 /** @internal */
 function isInvalidUrlTypeError(error) {
 	const code = error.code;
-	return error instanceof TypeError && (code === "ERR_INVALID_URL" || /^Invalid URL(?::|$)/.test(error.message) || / cannot be parsed as a URL\.?$/.test(error.message));
+	return error instanceof TypeError && (code === "ERR_INVALID_URL" || error.message === "Invalid URL string." || /^Invalid URL(?::|$)/.test(error.message) || / cannot be parsed as a URL\.?$/.test(error.message));
 }
 async function applyGraphAliasContext(state, context, documentLoader, remoteContextCache, baseUrl = null, processingContexts = /* @__PURE__ */ new Set()) {
 	if (context === null) return createGraphAliasContextState();

package/dist/{metrics-Ce55disp.mjs → metrics-QrVsKSG9.mjs}

@@ -1,7 +1,7 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-ayal9buz.mjs";
+import { n as version, t as name } from "./deno-DUgFsCmM.mjs";
 import { metrics } from "@opentelemetry/api";
 import { FetchError } from "@fedify/vocab-runtime";
 //#region src/federation/metrics.ts

package/dist/{middleware-C96wm_7x.mjs → middleware-54KSGAQA.mjs}

@@ -1,5 +1,5 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as FederationImpl } from "./middleware-BCG2BX1n.mjs";
+import { n as FederationImpl } from "./middleware-Bj9s3J_0.mjs";
 export { FederationImpl };

package/dist/{middleware-C_utyVa_.js → middleware-B4FNnN3W.js}

@@ -2,10 +2,10 @@ import { Temporal } from "@js-temporal/polyfill";
 import { URLPattern } from "urlpattern-polyfill";
 import { t as __exportAll } from "./chunk-CRNNMoPX.js";
 import { r as getDefaultActivityTransformers } from "./transformers-BGMIq1cs.js";
-import { A as recordWebFingerHandle, C as recordCollectionRequest, D as recordInboxActivity, E as recordFanoutRecipients, I as name, L as version, M as formatAcceptSignature, O as recordOutboxActivity, S as recordCollectionPageItems, _ as instrumentDocumentLoader, a as verifyRequestDetailed, b as recordCircuitBreakerStateChange, d as importJwk, f as validateCryptoKey, g as getRemoteHost, h as getFederationMetrics, i as verifyRequest, j as registerQueueDepthGauge, k as recordOutboxEnqueue, m as getDurationMs, n as parseRfc9421SignatureInput, o as exportJwk, t as doubleKnock, v as isAbortError, w as recordCollectionTotalItems, x as recordCollectionDispatchDuration } from "./http-BPPCh0xN.js";
-import { a as MAX_BODY_SIZE, i as BodyTooLargeError, n as getNodeInfo, o as readBoundedText, t as nodeInfoToJson } from "./types-sXITXcWa.js";
-import { _ as hasSignatureLike, b as signJsonLd, c as getKeyOwner, f as compactJsonLd, g as hasSignature, h as getNormalizationContextLoader, i as verifyObject, l as InvalidContextReferenceError, m as detachSignature, n as hasProofLike, o as normalizeOutgoingActivityJsonLd, r as signObject, s as doesActorOwnKey, u as assertSafeJsonLd, v as isClearlyMalformedContextReference, w as wrapContextLoaderForJsonLd, x as verifyCompactJsonLd, y as isInvalidUrlTypeError } from "./proof-Dz9ObvUq.js";
-import { n as getAuthenticatedDocumentLoader, t as kvCache } from "./kv-cache-Cl1q1aA9.js";
+import { A as recordWebFingerHandle, C as recordCollectionRequest, D as recordInboxActivity, E as recordFanoutRecipients, I as name, L as version, M as formatAcceptSignature, O as recordOutboxActivity, S as recordCollectionPageItems, _ as instrumentDocumentLoader, a as verifyRequestDetailed, b as recordCircuitBreakerStateChange, d as importJwk, f as validateCryptoKey, g as getRemoteHost, h as getFederationMetrics, i as verifyRequest, j as registerQueueDepthGauge, k as recordOutboxEnqueue, m as getDurationMs, n as parseRfc9421SignatureInput, o as exportJwk, t as doubleKnock, v as isAbortError, w as recordCollectionTotalItems, x as recordCollectionDispatchDuration } from "./http-BY8PpQzP.js";
+import { a as MAX_BODY_SIZE, i as BodyTooLargeError, n as getNodeInfo, o as readBoundedText, t as nodeInfoToJson } from "./types-miAYfiGO.js";
+import { _ as hasSignatureLike, b as signJsonLd, c as getKeyOwner, f as compactJsonLd, g as hasSignature, h as getNormalizationContextLoader, i as verifyObject, l as InvalidContextReferenceError, m as detachSignature, n as hasProofLike, o as normalizeOutgoingActivityJsonLd, r as signObject, s as doesActorOwnKey, u as assertSafeJsonLd, v as isClearlyMalformedContextReference, w as wrapContextLoaderForJsonLd, x as verifyCompactJsonLd, y as isInvalidUrlTypeError } from "./proof-BxS2Xa8B.js";
+import { n as getAuthenticatedDocumentLoader, t as kvCache } from "./kv-cache-DNnjnc9t.js";
 import { getLogger, withContext } from "@logtape/logtape";
 import { Router, RouterError, assertPath } from "@fedify/uri-template";
 import { Activity, Collection, CollectionPage, CryptographicKey, Link, Multikey, Object as Object$1, OrderedCollection, OrderedCollectionPage, Tombstone, getTypeId, lookupObject, traverseCollection } from "@fedify/vocab";
@@ -111,6 +111,7 @@ var FederationBuilderImpl = class {
 	* Symbol registry for unique identification of unnamed symbols.
 	*/
 	#symbolRegistry = /* @__PURE__ */ new Map();
+	#collectionNames = /* @__PURE__ */ new Map();
 	constructor() {
 		this.router = new Router();
 		this.objectCallbacks = {};
@@ -139,6 +140,8 @@ var FederationBuilderImpl = class {
 		f.objectTypeIds = { ...this.objectTypeIds };
 		f.collectionCallbacks = { ...this.collectionCallbacks };
 		f.collectionTypeIds = { ...this.collectionTypeIds };
+		f.#symbolRegistry = new Map(this.#symbolRegistry);
+		f.#collectionNames = new Map(this.#collectionNames);
 		f.inboxPath = this.inboxPath;
 		f.outboxPath = this.outboxPath;
 		f.inboxCallbacks = this.inboxCallbacks == null ? void 0 : { ...this.inboxCallbacks };
@@ -618,6 +621,7 @@ var FederationBuilderImpl = class {
 		if (this.collectionCallbacks[name] != null) throw new RouterError(`Collection dispatcher for ${strName} already set.`);
 		assertPath(path);
 		if (Router.variables(path).size < 1) throw new RouterError("Path for collection dispatcher must have at least one variable.");
+		this.#collectionNames.set(routeName, name);
 		this.router.add(path, routeName);
 		const callbacks = { dispatcher };
 		this.collectionCallbacks[name] = callbacks;
@@ -655,6 +659,10 @@ var FederationBuilderImpl = class {
 		const routeName = this.#uniqueCollectionId(name);
 		return this.router.build(`collection:${routeName}`, values) ?? this.router.build(`orderedCollection:${routeName}`, values);
 	}
+	/** Resolves a custom collection route to its original name. */
+	getCollectionName(routeName) {
+		return this.#collectionNames.get(routeName) ?? routeName.replace(/^(collection|orderedCollection):/, "");
+	}
 	setOutboxPermanentFailureHandler(handler) {
 		this.outboxPermanentFailureHandler = handler;
 	}
@@ -3437,6 +3445,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
@@ -3444,7 +3461,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, {
@@ -5607,10 +5629,10 @@ var FederationImpl = class extends FederationBuilderImpl {
 				onNotFound
 			});
 			case "collection": {
-				const name = route.name.replace(/^collection:/, "");
+				const name = this.getCollectionName(route.name);
 				const callbacks = this.collectionCallbacks[name];
 				return await handleCustomCollection(request, {
-					name,
+					name: String(name),
 					context,
 					values: route.values,
 					collectionCallbacks: callbacks,
@@ -5621,10 +5643,10 @@ var FederationImpl = class extends FederationBuilderImpl {
 				});
 			}
 			case "orderedCollection": {
-				const name = route.name.replace(/^orderedCollection:/, "");
+				const name = this.getCollectionName(route.name);
 				const callbacks = this.collectionCallbacks[name];
 				return await handleOrderedCollection(request, {
-					name,
+					name: String(name),
 					context,
 					values: route.values,
 					collectionCallbacks: callbacks,
@@ -5867,8 +5889,10 @@ var ContextImpl = class ContextImpl {
 		const collectionRegex = new RegExp(`^(${["collection", "orderedCollection"].join("|")}):(.*)$`);
 		const match = route.name.match(collectionRegex);
 		if (match !== null) {
-			const [, type, name] = match;
+			const [, type] = match;
+			const name = this.federation.getCollectionName(route.name);
 			const cls = this.federation.collectionTypeIds[name];
+			if (cls == null) return null;
 			return {
 				type,
 				name,
@@ -6238,7 +6262,7 @@ var ContextImpl = class ContextImpl {
 			"inbox"
 		]);
 		const contextLoader = options.contextLoader ?? this.contextLoader;
-		const json = await activity.toJsonLd({ contextLoader });
+		let json = await activity.toJsonLd({ contextLoader });
 		const keyCache = new KvKeyCache(this.federation.kv, this.federation.kvPrefixes.publicKey, this);
 		if (await verifyObject(Activity, json, {
 			contextLoader,
@@ -6295,6 +6319,7 @@ var ContextImpl = class ContextImpl {
 			}
 			logger.debug("Successfully fetched the remote activity object {activityId}; ignore the original activity and use the fetched one, which is trustworthy.");
 			activity = fetched;
+			json = await fetched.toJsonLd({ contextLoader });
 		} else logger.debug("Object Integrity Proofs are verified.", {
 			recipient,
 			activity: json