@fedify/fedify 2.4.0-dev.2155 → 2.4.0-dev.2157

package/dist/federation/mq.test.mjs

@@ -1,8 +1,7 @@
 import { Temporal } from "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { t as AssertionError } from "../assertion_error-B-cx0fFA.mjs";
-import { s as format, t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
+import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
 import { t as assertFalse } from "../assert_false-CPdRnc3E.mjs";
 import { t as assertGreaterOrEqual } from "../assert_greater_or_equal-BlafOF4-.mjs";
 import "../std__assert-DvMDRPes.mjs";
@@ -11,31 +10,6 @@ import { t as assert } from "../assert-D1Eafmd_.mjs";
 import { n as ParallelMessageQueue, t as InProcessMessageQueue } from "../mq-Dm1Wmtm-.mjs";
 import { delay } from "es-toolkit";
 import { test } from "@fedify/fixture";
-//#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 src/federation/mq.test.ts
 async function disposeMessageQueue(mq) {
 	if (Symbol.asyncDispose in mq) {
@@ -70,50 +44,105 @@ test("InProcessMessageQueue", async (t) => {
 	const listening = mq.listen((message) => {
 		messages.push(message);
 	}, controller);
-	await t.step("enqueue()", async () => {
-		await mq.enqueue("Hello, world!");
-	});
-	await waitFor(() => messages.length > 0, 15e3);
-	await t.step("listen()", () => {
-		assertEquals(messages, ["Hello, world!"]);
-	});
-	let started = 0;
-	await t.step("enqueue() with delay", async () => {
-		started = Date.now();
-		await mq.enqueue("Delayed message", { delay: Temporal.Duration.from({ seconds: 3 }) });
-		assertEquals(messages, ["Hello, world!"]);
-	});
-	await waitFor(() => messages.length > 1, 15e3);
-	await t.step("listen() with delay", () => {
-		assertEquals(messages, ["Hello, world!", "Delayed message"]);
-		assertGreater(Date.now() - started, 3e3);
-	});
-	while (messages.length > 0) messages.pop();
-	await t.step("enqueueMany()", async () => {
-		const testMessages = Array.from({ length: 5 }, (_, i) => `Batch message ${i}!`);
-		await mq.enqueueMany(testMessages);
-	});
-	await waitFor(() => messages.length >= 5, 15e3);
-	await t.step("listen() [multiple]", () => {
-		assertEquals(messages.length, 5);
-		for (let i = 0; i < 5; i++) assertEquals(messages[i], `Batch message ${i}!`);
-	});
-	while (messages.length > 0) messages.pop();
-	started = 0;
-	await t.step("enqueueMany() with delay", async () => {
-		started = Date.now();
-		const testMessages = Array.from({ length: 3 }, (_, i) => `Delayed batch ${i}!`);
-		await mq.enqueueMany(testMessages, { delay: Temporal.Duration.from({ seconds: 2 }) });
-		assertEquals(messages.length, 0);
+	try {
+		await t.step("enqueue()", async () => {
+			await mq.enqueue("Hello, world!");
+		});
+		await waitFor(() => messages.length > 0, 15e3);
+		await t.step("listen()", () => {
+			assertEquals(messages, ["Hello, world!"]);
+		});
+		await t.step("enqueue() with delay", async () => {
+			const { timers, enqueued } = captureTimers(() => mq.enqueue("Delayed message", { delay: Temporal.Duration.from({ seconds: 3 }) }));
+			await enqueued;
+			assertEquals(timers.length, 1);
+			assertEquals(timers[0].delay, 3e3);
+			await mq.enqueue("Single delay marker");
+			await waitFor(() => messages.includes("Single delay marker"), 15e3);
+			assertEquals(messages, ["Hello, world!", "Single delay marker"]);
+			timers[0].callback();
+		});
+		await waitFor(() => messages.length >= 3, 15e3);
+		await t.step("listen() with delay", () => {
+			assertEquals(messages, [
+				"Hello, world!",
+				"Single delay marker",
+				"Delayed message"
+			]);
+		});
+		while (messages.length > 0) messages.pop();
+		await t.step("enqueueMany()", async () => {
+			const testMessages = Array.from({ length: 5 }, (_, i) => `Batch message ${i}!`);
+			await mq.enqueueMany(testMessages);
+		});
+		await waitFor(() => messages.length >= 5, 15e3);
+		await t.step("listen() [multiple]", () => {
+			assertEquals(messages.length, 5);
+			for (let i = 0; i < 5; i++) assertEquals(messages[i], `Batch message ${i}!`);
+		});
+		while (messages.length > 0) messages.pop();
+		await t.step("enqueueMany() with delay", async () => {
+			const testMessages = Array.from({ length: 3 }, (_, i) => `Delayed batch ${i}!`);
+			const { timers, enqueued } = captureTimers(() => mq.enqueueMany(testMessages, { delay: Temporal.Duration.from({ seconds: 2 }) }));
+			await enqueued;
+			assertEquals(timers.length, 1);
+			assertEquals(timers[0].delay, 2e3);
+			await mq.enqueue("Batch delay marker");
+			await waitFor(() => messages.includes("Batch delay marker"), 15e3);
+			assertEquals(messages, ["Batch delay marker"]);
+			timers[0].callback();
+		});
+		await waitFor(() => messages.length >= 4, 15e3);
+		await t.step("listen() [delayed multiple]", () => {
+			assertEquals(messages.length, 4);
+			assertEquals(messages[0], "Batch delay marker");
+			for (let i = 0; i < 3; i++) assertEquals(messages[i + 1], `Delayed batch ${i}!`);
+		});
+	} finally {
+		controller.abort();
+		await listening;
+	}
+});
+function captureTimers(enqueue) {
+	const timers = [];
+	const original = globalThis.setTimeout;
+	globalThis.setTimeout = ((callback, delay) => {
+		timers.push({
+			callback,
+			delay
+		});
+		return 0;
 	});
-	await waitFor(() => messages.length >= 3, 15e3);
-	await t.step("listen() [delayed multiple]", () => {
-		assertEquals(messages.length, 3);
-		assertGreater(Date.now() - started, 2e3);
-		for (let i = 0; i < 3; i++) assertEquals(messages[i], `Delayed batch ${i}!`);
+	try {
+		return {
+			timers,
+			enqueued: enqueue()
+		};
+	} finally {
+		globalThis.setTimeout = original;
+	}
+}
+test("InProcessMessageQueue real delay", async (t) => {
+	for (const batch of [false, true]) await t.step(batch ? "enqueueMany()" : "enqueue()", async () => {
+		const mq = new InProcessMessageQueue();
+		const messages = [];
+		const controller = new AbortController();
+		const listening = mq.listen((message) => {
+			messages.push(message);
+		}, controller);
+		try {
+			const delayed = batch ? ["Delayed 1", "Delayed 2"] : ["Delayed"];
+			const options = { delay: Temporal.Duration.from({ milliseconds: 100 }) };
+			if (batch) await mq.enqueueMany(delayed, options);
+			else await mq.enqueue(delayed[0], options);
+			await mq.enqueue("Immediate");
+			await waitFor(() => messages.length >= delayed.length + 1, 15e3);
+			assertEquals(messages, ["Immediate", ...delayed]);
+		} finally {
+			controller.abort();
+			await listening;
+		}
 	});
-	controller.abort();
-	await listening;
 });
 test("InProcessMessageQueue.getDepth()", async () => {
 	const mq = new InProcessMessageQueue();

package/dist/federation/outgoing-proof.test.mjs

@@ -7,12 +7,12 @@ import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
 import "../std__assert-DvMDRPes.mjs";
 import { t as assertRejects } from "../assert_rejects-CTptdYck.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
-import { n as exportJwk } from "../key-BZ-Z4uez.mjs";
-import { s as detachSignature } from "../ld-Djxsq6JR.mjs";
-import { a as signObject } from "../proof-vZ04IAjq.mjs";
+import { n as exportJwk } from "../key-CPM4r6tP.mjs";
+import { s as detachSignature } from "../ld-lU_ZqzsQ.mjs";
+import { a as signObject } from "../proof-C2YwD8a_.mjs";
 import { i as rsaPrivateKey2, n as ed25519PrivateKey, r as ed25519PublicKey, s as rsaPublicKey2 } from "../keys-DIJNHW-Y.mjs";
-import { c as assertPortableActorActivity, n as FederationImpl, o as createFederation } from "../middleware-DDa8pCUa.mjs";
-import { a as verifyCompoundPortableObjectProofs } from "../compound-proof-nhrXTRQO.mjs";
+import { c as assertPortableActorActivity, n as FederationImpl, o as createFederation } from "../middleware-xdukzV3x.mjs";
+import { a as verifyCompoundPortableObjectProofs } from "../compound-proof-D7K94KPz.mjs";
 import { configure, reset } from "@logtape/logtape";
 import { Create, Note, Person } from "@fedify/vocab";
 import { mockDocumentLoader, test } from "@fedify/fixture";

package/dist/federation/portable-actor.test.mjs

@@ -8,10 +8,10 @@ import { t as assertInstanceOf } from "../assert_instance_of-mrXWWNY-.mjs";
 import { t as assertThrows } from "../assert_throws-BYITOvPO.mjs";
 import "../std__assert-DvMDRPes.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
-import { a as signObject, c as verifyPortableObjectProof } from "../proof-vZ04IAjq.mjs";
-import { d as verifyRequest, l as signRequest } from "../http-CXnNbRe_.mjs";
+import { a as signObject, c as verifyPortableObjectProof } from "../proof-C2YwD8a_.mjs";
+import { d as verifyRequest, l as signRequest } from "../http-CGcLv8rh.mjs";
 import { a as rsaPrivateKey3, c as rsaPublicKey3, i as rsaPrivateKey2, n as ed25519PrivateKey, r as ed25519PublicKey, s as rsaPublicKey2 } from "../keys-DIJNHW-Y.mjs";
-import { b as PORTABLE_OBJECT_CONTENT_TYPE, o as createFederation } from "../middleware-DDa8pCUa.mjs";
+import { b as PORTABLE_OBJECT_CONTENT_TYPE, o as createFederation } from "../middleware-xdukzV3x.mjs";
 import { n as RouterError } from "../router-u5O5KCQr.mjs";
 import { configure, reset } from "@logtape/logtape";
 import { Note, Person, Tombstone, lookupObject } from "@fedify/vocab";

package/dist/federation/portable-chain.test.mjs

@@ -7,10 +7,10 @@ import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
 import { t as assertInstanceOf } from "../assert_instance_of-mrXWWNY-.mjs";
 import "../std__assert-DvMDRPes.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
-import { n as exportJwk } from "../key-BZ-Z4uez.mjs";
-import { c as verifyPortableObjectProof, s as verifyObject } from "../proof-vZ04IAjq.mjs";
+import { n as exportJwk } from "../key-CPM4r6tP.mjs";
+import { c as verifyPortableObjectProof, s as verifyObject } from "../proof-C2YwD8a_.mjs";
 import { i as rsaPrivateKey2, n as ed25519PrivateKey, r as ed25519PublicKey, s as rsaPublicKey2 } from "../keys-DIJNHW-Y.mjs";
-import { n as FederationImpl } from "../middleware-DDa8pCUa.mjs";
+import { n as FederationImpl } from "../middleware-xdukzV3x.mjs";
 import { Create, DataIntegrityProof, Note, OrderedCollection, Person, traverseCollection } from "@fedify/vocab";
 import { mockDocumentLoader, test } from "@fedify/fixture";
 import { FetchError, encodeMultibase, exportDidKey } from "@fedify/vocab-runtime";

package/dist/federation/portable-collection.test.mjs

@@ -7,11 +7,11 @@ import { t as assertFalse } from "../assert_false-CPdRnc3E.mjs";
 import { t as assertThrows } from "../assert_throws-BYITOvPO.mjs";
 import "../std__assert-DvMDRPes.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
-import { a as signObject } from "../proof-vZ04IAjq.mjs";
+import { a as signObject } from "../proof-C2YwD8a_.mjs";
 import { n as ed25519PrivateKey, r as ed25519PublicKey } from "../keys-DIJNHW-Y.mjs";
-import { b as PORTABLE_OBJECT_CONTENT_TYPE, o as createFederation } from "../middleware-DDa8pCUa.mjs";
-import { t as verifyPortableObject } from "../portable-collection-DAV7Ho3m.mjs";
-import { s as verifyServedPortableObjects } from "../compound-proof-nhrXTRQO.mjs";
+import { b as PORTABLE_OBJECT_CONTENT_TYPE, o as createFederation } from "../middleware-xdukzV3x.mjs";
+import { t as verifyPortableObject } from "../portable-collection-_lZg-osX.mjs";
+import { s as verifyServedPortableObjects } from "../compound-proof-D7K94KPz.mjs";
 import { n as RouterError } from "../router-u5O5KCQr.mjs";
 import { configure, reset } from "@logtape/logtape";
 import { Create, Note, Object as Object$1, OrderedCollection, Person, Tombstone, lookupObject, traverseCollection } from "@fedify/vocab";

package/dist/federation/portable-gateway-keys.test.mjs

@@ -2,15 +2,15 @@ import "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { t as esm_default } from "../esm-BHXXx4Wx.mjs";
-import { r as createRequestContext, t as createInboxContext } from "../context-OrnjnuMq.mjs";
+import { r as createRequestContext, t as createInboxContext } from "../context-B2rlkkyJ.mjs";
 import { t as MemoryKvStore } from "../kv-DCHkaJ9-.mjs";
 import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
 import "../std__assert-DvMDRPes.mjs";
 import { t as assertRejects } from "../assert_rejects-CTptdYck.mjs";
-import { p as signJsonLd } from "../ld-Djxsq6JR.mjs";
-import { l as signRequest } from "../http-CXnNbRe_.mjs";
+import { p as signJsonLd } from "../ld-lU_ZqzsQ.mjs";
+import { l as signRequest } from "../http-CGcLv8rh.mjs";
 import { i as rsaPrivateKey2, n as ed25519PrivateKey, r as ed25519PublicKey, s as rsaPublicKey2 } from "../keys-DIJNHW-Y.mjs";
-import { f as handleInbox, n as FederationImpl, o as createFederation } from "../middleware-DDa8pCUa.mjs";
+import { f as handleInbox, n as FederationImpl, o as createFederation } from "../middleware-xdukzV3x.mjs";
 import { t as ActivityListenerSet } from "../activity-listener-C-BSbKI7.mjs";
 import { t as KvKeyCache } from "../keycache-BInaECGj.mjs";
 import { Create, CryptographicKey, Person } from "@fedify/vocab";

package/dist/federation/portable-inbox.test.mjs

@@ -8,11 +8,11 @@ import { t as assertFalse } from "../assert_false-CPdRnc3E.mjs";
 import { t as assertThrows } from "../assert_throws-BYITOvPO.mjs";
 import "../std__assert-DvMDRPes.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
-import { p as signJsonLd } from "../ld-Djxsq6JR.mjs";
-import { a as signObject } from "../proof-vZ04IAjq.mjs";
-import { f as verifyRequestDetailed, l as signRequest } from "../http-CXnNbRe_.mjs";
+import { p as signJsonLd } from "../ld-lU_ZqzsQ.mjs";
+import { a as signObject } from "../proof-C2YwD8a_.mjs";
+import { f as verifyRequestDetailed, l as signRequest } from "../http-CGcLv8rh.mjs";
 import { a as rsaPrivateKey3, c as rsaPublicKey3, i as rsaPrivateKey2, n as ed25519PrivateKey, r as ed25519PublicKey, s as rsaPublicKey2 } from "../keys-DIJNHW-Y.mjs";
-import { _ as coversDelivery, o as createFederation, v as forwardPortableInboxActivity, y as resolvePortableInboxForwardingOptions } from "../middleware-DDa8pCUa.mjs";
+import { _ as coversDelivery, o as createFederation, v as forwardPortableInboxActivity, y as resolvePortableInboxForwardingOptions } from "../middleware-xdukzV3x.mjs";
 import { Create, CryptographicKey, Follow, Note, Person, Tombstone } from "@fedify/vocab";
 import { mockDocumentLoader, test } from "@fedify/fixture";
 import { exportDidKey, formatIri, parseIri } from "@fedify/vocab-runtime";

package/dist/federation/portable.test.mjs

@@ -8,10 +8,10 @@ import { t as assertThrows } from "../assert_throws-BYITOvPO.mjs";
 import "../std__assert-DvMDRPes.mjs";
 import { t as assertStrictEquals } from "../assert_strict_equals-CYvBmkpC.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
-import { a as signObject, c as verifyPortableObjectProof } from "../proof-vZ04IAjq.mjs";
-import { l as signRequest } from "../http-CXnNbRe_.mjs";
+import { a as signObject, c as verifyPortableObjectProof } from "../proof-C2YwD8a_.mjs";
+import { l as signRequest } from "../http-CGcLv8rh.mjs";
 import { a as rsaPrivateKey3, c as rsaPublicKey3, i as rsaPrivateKey2, n as ed25519PrivateKey, r as ed25519PublicKey, s as rsaPublicKey2 } from "../keys-DIJNHW-Y.mjs";
-import { b as PORTABLE_OBJECT_CONTENT_TYPE, o as createFederation } from "../middleware-DDa8pCUa.mjs";
+import { b as PORTABLE_OBJECT_CONTENT_TYPE, o as createFederation } from "../middleware-xdukzV3x.mjs";
 import { configure, reset } from "@logtape/logtape";
 import { Collection, Create, Note, Object as Object$1, Person, Tombstone, lookupObject } from "@fedify/vocab";
 import { mockDocumentLoader, test } from "@fedify/fixture";

package/dist/federation/send.test.mjs

@@ -10,13 +10,14 @@ import { t as assertNotEquals } from "../assert_not_equals-CpPK2t89.mjs";
 import "../std__assert-DvMDRPes.mjs";
 import { t as assertRejects } from "../assert_rejects-CTptdYck.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
-import { d as verifyRequest } from "../http-CXnNbRe_.mjs";
+import { d as verifyRequest } from "../http-CGcLv8rh.mjs";
 import { i as rsaPrivateKey2, n as ed25519PrivateKey, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-DIJNHW-Y.mjs";
-import { t as doesActorOwnKey } from "../owner-OdWSE8am.mjs";
-import { n as extractInboxes, r as sendActivity, t as SendActivityError } from "../send-ylV8KCLx.mjs";
+import { t as doesActorOwnKey } from "../owner-D63yPo_i.mjs";
+import { n as extractInboxes, r as sendActivity, t as SendActivityError } from "../send-D9SGhxTB.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()", () => {
@@ -690,5 +691,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/tasks/enqueue.test.mjs

@@ -2,9 +2,9 @@ import { Temporal } from "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { t as MemoryKvStore } from "../../kv-DCHkaJ9-.mjs";
-import { a as numberSchema, i as makeSchema, n as baseOptions, o as stringSchema, t as MockQueue } from "../../tasks-dbCShlCb.mjs";
-import "../../testing-CKaJhcA0.mjs";
-import { o as createFederation } from "../../middleware-DDa8pCUa.mjs";
+import { a as numberSchema, i as makeSchema, n as baseOptions, o as stringSchema, t as MockQueue } from "../../tasks-IG3pHfvZ.mjs";
+import "../../testing-C1itIjqW.mjs";
+import { o as createFederation } from "../../middleware-xdukzV3x.mjs";
 import { n as ParallelMessageQueue } from "../../mq-Dm1Wmtm-.mjs";
 import { configure, reset } from "@logtape/logtape";
 import { delay } from "es-toolkit";

package/dist/federation/tasks/tasks.test.mjs

@@ -2,10 +2,10 @@ import { Temporal } from "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { t as MemoryKvStore } from "../../kv-DCHkaJ9-.mjs";
-import { a as numberSchema, i as makeSchema, n as baseOptions, o as stringSchema, t as MockQueue } from "../../tasks-dbCShlCb.mjs";
-import "../../testing-CKaJhcA0.mjs";
-import { o as createFederation } from "../../middleware-DDa8pCUa.mjs";
-import { r as createFederationBuilder } from "../../builder-CxHALSwA.mjs";
+import { a as numberSchema, i as makeSchema, n as baseOptions, o as stringSchema, t as MockQueue } from "../../tasks-IG3pHfvZ.mjs";
+import "../../testing-C1itIjqW.mjs";
+import { o as createFederation } from "../../middleware-xdukzV3x.mjs";
+import { r as createFederationBuilder } from "../../builder-CLaS4-yA.mjs";
 import { t as TaskCodec } from "../../codec-C6rTrpIp.mjs";
 import { t as InProcessMessageQueue } from "../../mq-Dm1Wmtm-.mjs";
 import { W3CTraceContextPropagator } from "@opentelemetry/core";

package/dist/federation/temporal.test.mjs

@@ -4,7 +4,7 @@ globalThis.addEventListener = () => {};
 import { t as assertFalse } from "../assert_false-CPdRnc3E.mjs";
 import "../std__assert-DvMDRPes.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
-import { t as hasMalformedKnownTemporalLiteral } from "../temporal-BTD4f_mZ.mjs";
+import { t as hasMalformedKnownTemporalLiteral } from "../temporal-q6FSekcN.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 "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { r as createRequestContext } from "../context-OrnjnuMq.mjs";
+import { r as createRequestContext } from "../context-B2rlkkyJ.mjs";
 import { t as MemoryKvStore } from "../kv-DCHkaJ9-.mjs";
 import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
 import { t as assertNotEquals } from "../assert_not_equals-CpPK2t89.mjs";
 import "../std__assert-DvMDRPes.mjs";
-import { o as createFederation, s as handleWebFinger } from "../middleware-DDa8pCUa.mjs";
+import { o as createFederation, s as handleWebFinger } from "../middleware-xdukzV3x.mjs";
 import { Image, Link, Person, Tombstone } from "@fedify/vocab";
 import { createTestMeterProvider, test } from "@fedify/fixture";
 import { parseIri } from "@fedify/vocab-runtime";

package/dist/{federation-D9TufmIO.cjs → federation-2e8XrN7q.cjs}

@@ -1,10 +1,10 @@
 const { URLPattern } = require("urlpattern-polyfill");
 const require_rolldown_runtime = require("./rolldown-runtime-Dmm3t92W.cjs");
 const require_transformers = require("./transformers-BalCrSsr.cjs");
-const require_http = require("./http-eqYXHRkz.cjs");
-const require_types = require("./types-Be2zbyeG.cjs");
-const require_portable_collection = require("./portable-collection-wBWbuHOH.cjs");
-const require_kv_cache = require("./kv-cache-DzClEalR.cjs");
+const require_http = require("./http-BObQoB0j.cjs");
+const require_types = require("./types-poIao40f.cjs");
+const require_portable_collection = require("./portable-collection-B8ojoQ50.cjs");
+const require_kv_cache = require("./kv-cache-D2fnB8qu.cjs");
 let _logtape_logtape = require("@logtape/logtape");
 let _fedify_uri_template = require("@fedify/uri-template");
 let _fedify_vocab = require("@fedify/vocab");
@@ -3016,6 +3016,15 @@ async function sendActivityInternal({ activity, activityId, activityType, keys,
 		if (!allowPrivateAddress) try {
 			await (0, _fedify_vocab_runtime.validatePublicUrl)(url);
 		} catch (error) {
+			if (error instanceof _fedify_vocab_runtime.UrlError && error.reason === "dns") {
+				logger.error("DNS resolution failed for URL: {url}", {
+					url,
+					error
+				});
+				const failure = new _fedify_vocab_runtime.FetchError(url, error.message);
+				failure.cause = error;
+				throw failure;
+			}
 			if (error instanceof _fedify_vocab_runtime.UrlError) logger.error("Disallowed private URL: {url}", {
 				url,
 				error
@@ -3023,7 +3032,12 @@ async function sendActivityInternal({ activity, activityId, activityType, keys,
 			throw error;
 		}
 	}
-	await validateUrl(inbox.href);
+	try {
+		await validateUrl(inbox.href);
+	} catch (error) {
+		if (error instanceof _fedify_vocab_runtime.FetchError) federationMetrics.recordDelivery(inbox, require_http.getDurationMs(started), false, activityType);
+		throw error;
+	}
 	headers = new Headers(headers);
 	headers.set("Content-Type", "application/activity+json");
 	const request = new Request(inbox, {

package/dist/{http-eqYXHRkz.cjs → http-BObQoB0j.cjs}

@@ -16,7 +16,7 @@ json_canon = require_rolldown_runtime.__toESM(json_canon, 1);
 let _opentelemetry_semantic_conventions = require("@opentelemetry/semantic-conventions");
 //#region deno.json
 var name = "@fedify/fedify";
-var version = "2.4.0-dev.2155+2ccc5085";
+var version = "2.4.0-dev.2157+b76e5888";
 //#endregion
 //#region src/sig/portable-key-id.ts
 const COMPATIBLE_KEY_ID_PATH_PATTERN = /^\/\.well-known\/apgateway\/did(?::|%3A)/i;
@@ -5804,7 +5804,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();
@@ -8908,6 +8908,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)));
@@ -8959,7 +8961,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-CXnNbRe_.mjs → http-CGcLv8rh.mjs}

@@ -1,12 +1,12 @@
 import { Temporal } from "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-YLLbRq06.mjs";
-import { n as getDurationMs, r as getFederationMetrics, s as measureSignatureKeyFetch } from "./metrics-CBHhbHgG.mjs";
+import { n as version, t as name } from "./deno-D1gcWWqB.mjs";
+import { n as getDurationMs, r as getFederationMetrics, s as measureSignatureKeyFetch } from "./metrics-B41pRPfd.mjs";
 import { i as validateAcceptSignature, n as fulfillAcceptSignature, r as parseAcceptSignature } from "./accept-CPVqki78.mjs";
 import { f as parseKeyIdString } from "./portable-key-id-Bg259c4Z.mjs";
-import { a as fetchKeyDetailed, c as validateCryptoKey, t as bypassKeyCacheReads } from "./key-BZ-Z4uez.mjs";
-import { n as resolvePortableActorKey, r as verifyPortableGatewayKeyDocument } from "./portable-key-BL6K88p2.mjs";
+import { a as fetchKeyDetailed, c as validateCryptoKey, t as bypassKeyCacheReads } from "./key-CPM4r6tP.mjs";
+import { n as resolvePortableActorKey, r as verifyPortableGatewayKeyDocument } from "./portable-key-D8uWZF7b.mjs";
 import { getLogger } from "@logtape/logtape";
 import { CryptographicKey } from "@fedify/vocab";
 import { SpanStatusCode, trace } from "@opentelemetry/api";
@@ -804,6 +804,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)));
@@ -855,7 +857,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-Dk4O3WM0.js → http-Dgtt45-K.js}

@@ -14,7 +14,7 @@ import serialize from "json-canon";
 import { ATTR_HTTP_REQUEST_HEADER, ATTR_HTTP_REQUEST_METHOD, ATTR_URL_FULL } from "@opentelemetry/semantic-conventions";
 //#region deno.json
 var name = "@fedify/fedify";
-var version = "2.4.0-dev.2155+2ccc5085";
+var version = "2.4.0-dev.2157+b76e5888";
 //#endregion
 //#region src/sig/portable-key-id.ts
 const COMPATIBLE_KEY_ID_PATH_PATTERN = /^\/\.well-known\/apgateway\/did(?::|%3A)/i;
@@ -2238,7 +2238,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();
@@ -5340,6 +5340,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)));
@@ -5391,7 +5393,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;