@fedify/fedify 2.1.24 → 2.1.26

package/dist/federation/mod.cjs

@@ -2,7 +2,7 @@ const { Temporal } = require("@js-temporal/polyfill");
 const { URLPattern } = require("urlpattern-polyfill");
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 require("../chunk-DDcVe30Y.cjs");
-const require_middleware = require("../middleware-CCYqHlzn.cjs");
+const require_middleware = require("../middleware-DHGVHIUj.cjs");
 let es_toolkit = require("es-toolkit");
 //#region src/federation/kv.ts
 /**

package/dist/federation/mod.d.cts

@@ -1,5 +1,5 @@
 /// <reference lib="esnext.temporal" />
-import { $ as ActorKeyPairsDispatcher, A as createFederation, B as RouterRouteResult, C as InboxChallengePolicy, D as FederationKvPrefixes, E as Rfc6570Expression, F as Message, G as InProcessMessageQueueOptions, H as respondWithObject, I as createFederationBuilder, J as MessageQueueListenOptions, K as MessageQueue, L as Router, M as RetryContext, N as RetryPolicy, O as FederationOrigin, P as createExponentialBackoffPolicy, Q as ActorHandleMapper, R as RouterError, S as IdempotencyStrategy, St as digest, T as ObjectCallbackSetters, U as respondWithObjectIfAcceptable, V as RespondWithObjectOptions, W as InProcessMessageQueue, X as ActorAliasMapper, Y as ParallelMessageQueue, Z as ActorDispatcher, _ as FederationBuilder, _t as WebFingerLinksDispatcher, a as InboxContext, at as CustomCollectionCursor, b as FederationStartQueueOptions, bt as PageItems, c as RouteActivityOptions, ct as InboxListener, d as ActorCallbackSetters, dt as ObjectDispatcher, et as AuthorizePredicate, f as CollectionCallbackSetters, ft as OutboxErrorHandler, g as Federation, gt as UnverifiedActivityReason, h as Federatable, ht as UnverifiedActivityHandler, i as GetSignedKeyOptions, it as CustomCollectionCounter, j as CreateExponentialBackoffPolicyOptions, k as FederationQueueOptions, l as SendActivityOptions, lt as NodeInfoDispatcher, m as CustomCollectionCallbackSetters, mt as SharedInboxKeyDispatcher, n as Context, nt as CollectionCursor, o as ParseUriResult, ot as CustomCollectionDispatcher, p as ConstructorWithTypeId, pt as OutboxPermanentFailureHandler, q as MessageQueueEnqueueOptions, r as ForwardActivityOptions, rt as CollectionDispatcher, s as RequestContext, st as InboxErrorHandler, t as ActorKeyPair, tt as CollectionCounter, u as SendActivityOptionsForCollection, ut as ObjectAuthorizePredicate, v as FederationFetchOptions, vt as SendActivityError, w as InboxListenerSetters, x as IdempotencyKeyCallback, xt as buildCollectionSynchronizationHeader, y as FederationOptions, yt as SenderKeyPair, z as RouterOptions } from "../context-D4s0Wk3N.cjs";
-import { a as MemoryKvStore, i as KvStoreSetOptions, n as KvStore, r as KvStoreListEntry, t as KvKey } from "../kv-gJ8LYbxX.cjs";
-import { n as handleWebFinger, t as WebFingerHandlerParameters } from "../mod-Bx80LUTA.cjs";
+import { $ as ActorKeyPairsDispatcher, A as createFederation, B as RouterRouteResult, C as InboxChallengePolicy, D as FederationKvPrefixes, E as Rfc6570Expression, F as Message, G as InProcessMessageQueueOptions, H as respondWithObject, I as createFederationBuilder, J as MessageQueueListenOptions, K as MessageQueue, L as Router, M as RetryContext, N as RetryPolicy, O as FederationOrigin, P as createExponentialBackoffPolicy, Q as ActorHandleMapper, R as RouterError, S as IdempotencyStrategy, St as digest, T as ObjectCallbackSetters, U as respondWithObjectIfAcceptable, V as RespondWithObjectOptions, W as InProcessMessageQueue, X as ActorAliasMapper, Y as ParallelMessageQueue, Z as ActorDispatcher, _ as FederationBuilder, _t as WebFingerLinksDispatcher, a as InboxContext, at as CustomCollectionCursor, b as FederationStartQueueOptions, bt as PageItems, c as RouteActivityOptions, ct as InboxListener, d as ActorCallbackSetters, dt as ObjectDispatcher, et as AuthorizePredicate, f as CollectionCallbackSetters, ft as OutboxErrorHandler, g as Federation, gt as UnverifiedActivityReason, h as Federatable, ht as UnverifiedActivityHandler, i as GetSignedKeyOptions, it as CustomCollectionCounter, j as CreateExponentialBackoffPolicyOptions, k as FederationQueueOptions, l as SendActivityOptions, lt as NodeInfoDispatcher, m as CustomCollectionCallbackSetters, mt as SharedInboxKeyDispatcher, n as Context, nt as CollectionCursor, o as ParseUriResult, ot as CustomCollectionDispatcher, p as ConstructorWithTypeId, pt as OutboxPermanentFailureHandler, q as MessageQueueEnqueueOptions, r as ForwardActivityOptions, rt as CollectionDispatcher, s as RequestContext, st as InboxErrorHandler, t as ActorKeyPair, tt as CollectionCounter, u as SendActivityOptionsForCollection, ut as ObjectAuthorizePredicate, v as FederationFetchOptions, vt as SendActivityError, w as InboxListenerSetters, x as IdempotencyKeyCallback, xt as buildCollectionSynchronizationHeader, y as FederationOptions, yt as SenderKeyPair, z as RouterOptions } from "../context-BNwv9Q1v.cjs";
+import { a as MemoryKvStore, i as KvStoreSetOptions, n as KvStore, r as KvStoreListEntry, t as KvKey } from "../kv-CZKl1IUS.cjs";
+import { n as handleWebFinger, t as WebFingerHandlerParameters } from "../mod-BmlfRBmU.cjs";
 export { ActorAliasMapper, ActorCallbackSetters, ActorDispatcher, ActorHandleMapper, ActorKeyPair, ActorKeyPairsDispatcher, AuthorizePredicate, CollectionCallbackSetters, CollectionCounter, CollectionCursor, CollectionDispatcher, ConstructorWithTypeId, Context, CreateExponentialBackoffPolicyOptions, CustomCollectionCallbackSetters, CustomCollectionCounter, CustomCollectionCursor, CustomCollectionDispatcher, Federatable, Federation, FederationBuilder, FederationFetchOptions, FederationKvPrefixes, FederationOptions, FederationOrigin, FederationQueueOptions, FederationStartQueueOptions, ForwardActivityOptions, GetSignedKeyOptions, IdempotencyKeyCallback, IdempotencyStrategy, InProcessMessageQueue, InProcessMessageQueueOptions, InboxChallengePolicy, InboxContext, InboxErrorHandler, InboxListener, InboxListenerSetters, KvKey, KvStore, KvStoreListEntry, KvStoreSetOptions, MemoryKvStore, Message, MessageQueue, MessageQueueEnqueueOptions, MessageQueueListenOptions, NodeInfoDispatcher, ObjectAuthorizePredicate, ObjectCallbackSetters, ObjectDispatcher, OutboxErrorHandler, OutboxPermanentFailureHandler, PageItems, ParallelMessageQueue, ParseUriResult, RequestContext, RespondWithObjectOptions, RetryContext, RetryPolicy, Rfc6570Expression, RouteActivityOptions, Router, RouterError, RouterOptions, RouterRouteResult, SendActivityError, SendActivityOptions, SendActivityOptionsForCollection, SenderKeyPair, SharedInboxKeyDispatcher, UnverifiedActivityHandler, UnverifiedActivityReason, WebFingerHandlerParameters, WebFingerLinksDispatcher, buildCollectionSynchronizationHeader, createExponentialBackoffPolicy, createFederation, createFederationBuilder, digest, handleWebFinger, respondWithObject, respondWithObjectIfAcceptable };

package/dist/federation/mod.d.ts

@@ -1,5 +1,5 @@
 /// <reference lib="esnext.temporal" />
-import { $ as ActorKeyPairsDispatcher, A as createFederation, B as RouterRouteResult, C as InboxChallengePolicy, D as FederationKvPrefixes, E as Rfc6570Expression, F as Message, G as InProcessMessageQueueOptions, H as respondWithObject, I as createFederationBuilder, J as MessageQueueListenOptions, K as MessageQueue, L as Router, M as RetryContext, N as RetryPolicy, O as FederationOrigin, P as createExponentialBackoffPolicy, Q as ActorHandleMapper, R as RouterError, S as IdempotencyStrategy, St as digest, T as ObjectCallbackSetters, U as respondWithObjectIfAcceptable, V as RespondWithObjectOptions, W as InProcessMessageQueue, X as ActorAliasMapper, Y as ParallelMessageQueue, Z as ActorDispatcher, _ as FederationBuilder, _t as WebFingerLinksDispatcher, a as InboxContext, at as CustomCollectionCursor, b as FederationStartQueueOptions, bt as PageItems, c as RouteActivityOptions, ct as InboxListener, d as ActorCallbackSetters, dt as ObjectDispatcher, et as AuthorizePredicate, f as CollectionCallbackSetters, ft as OutboxErrorHandler, g as Federation, gt as UnverifiedActivityReason, h as Federatable, ht as UnverifiedActivityHandler, i as GetSignedKeyOptions, it as CustomCollectionCounter, j as CreateExponentialBackoffPolicyOptions, k as FederationQueueOptions, l as SendActivityOptions, lt as NodeInfoDispatcher, m as CustomCollectionCallbackSetters, mt as SharedInboxKeyDispatcher, n as Context, nt as CollectionCursor, o as ParseUriResult, ot as CustomCollectionDispatcher, p as ConstructorWithTypeId, pt as OutboxPermanentFailureHandler, q as MessageQueueEnqueueOptions, r as ForwardActivityOptions, rt as CollectionDispatcher, s as RequestContext, st as InboxErrorHandler, t as ActorKeyPair, tt as CollectionCounter, u as SendActivityOptionsForCollection, ut as ObjectAuthorizePredicate, v as FederationFetchOptions, vt as SendActivityError, w as InboxListenerSetters, x as IdempotencyKeyCallback, xt as buildCollectionSynchronizationHeader, y as FederationOptions, yt as SenderKeyPair, z as RouterOptions } from "../context-BgU5UWTx.js";
-import { a as MemoryKvStore, i as KvStoreSetOptions, n as KvStore, r as KvStoreListEntry, t as KvKey } from "../kv-D6hNiMTK.js";
-import { n as handleWebFinger, t as WebFingerHandlerParameters } from "../mod-DcAiY74j.js";
+import { $ as ActorKeyPairsDispatcher, A as createFederation, B as RouterRouteResult, C as InboxChallengePolicy, D as FederationKvPrefixes, E as Rfc6570Expression, F as Message, G as InProcessMessageQueueOptions, H as respondWithObject, I as createFederationBuilder, J as MessageQueueListenOptions, K as MessageQueue, L as Router, M as RetryContext, N as RetryPolicy, O as FederationOrigin, P as createExponentialBackoffPolicy, Q as ActorHandleMapper, R as RouterError, S as IdempotencyStrategy, St as digest, T as ObjectCallbackSetters, U as respondWithObjectIfAcceptable, V as RespondWithObjectOptions, W as InProcessMessageQueue, X as ActorAliasMapper, Y as ParallelMessageQueue, Z as ActorDispatcher, _ as FederationBuilder, _t as WebFingerLinksDispatcher, a as InboxContext, at as CustomCollectionCursor, b as FederationStartQueueOptions, bt as PageItems, c as RouteActivityOptions, ct as InboxListener, d as ActorCallbackSetters, dt as ObjectDispatcher, et as AuthorizePredicate, f as CollectionCallbackSetters, ft as OutboxErrorHandler, g as Federation, gt as UnverifiedActivityReason, h as Federatable, ht as UnverifiedActivityHandler, i as GetSignedKeyOptions, it as CustomCollectionCounter, j as CreateExponentialBackoffPolicyOptions, k as FederationQueueOptions, l as SendActivityOptions, lt as NodeInfoDispatcher, m as CustomCollectionCallbackSetters, mt as SharedInboxKeyDispatcher, n as Context, nt as CollectionCursor, o as ParseUriResult, ot as CustomCollectionDispatcher, p as ConstructorWithTypeId, pt as OutboxPermanentFailureHandler, q as MessageQueueEnqueueOptions, r as ForwardActivityOptions, rt as CollectionDispatcher, s as RequestContext, st as InboxErrorHandler, t as ActorKeyPair, tt as CollectionCounter, u as SendActivityOptionsForCollection, ut as ObjectAuthorizePredicate, v as FederationFetchOptions, vt as SendActivityError, w as InboxListenerSetters, x as IdempotencyKeyCallback, xt as buildCollectionSynchronizationHeader, y as FederationOptions, yt as SenderKeyPair, z as RouterOptions } from "../context-DLLaDau8.js";
+import { a as MemoryKvStore, i as KvStoreSetOptions, n as KvStore, r as KvStoreListEntry, t as KvKey } from "../kv-CxaI4eGo.js";
+import { n as handleWebFinger, t as WebFingerHandlerParameters } from "../mod-CWJNbyju.js";
 export { ActorAliasMapper, ActorCallbackSetters, ActorDispatcher, ActorHandleMapper, ActorKeyPair, ActorKeyPairsDispatcher, AuthorizePredicate, CollectionCallbackSetters, CollectionCounter, CollectionCursor, CollectionDispatcher, ConstructorWithTypeId, Context, CreateExponentialBackoffPolicyOptions, CustomCollectionCallbackSetters, CustomCollectionCounter, CustomCollectionCursor, CustomCollectionDispatcher, Federatable, Federation, FederationBuilder, FederationFetchOptions, FederationKvPrefixes, FederationOptions, FederationOrigin, FederationQueueOptions, FederationStartQueueOptions, ForwardActivityOptions, GetSignedKeyOptions, IdempotencyKeyCallback, IdempotencyStrategy, InProcessMessageQueue, InProcessMessageQueueOptions, InboxChallengePolicy, InboxContext, InboxErrorHandler, InboxListener, InboxListenerSetters, KvKey, KvStore, KvStoreListEntry, KvStoreSetOptions, MemoryKvStore, Message, MessageQueue, MessageQueueEnqueueOptions, MessageQueueListenOptions, NodeInfoDispatcher, ObjectAuthorizePredicate, ObjectCallbackSetters, ObjectDispatcher, OutboxErrorHandler, OutboxPermanentFailureHandler, PageItems, ParallelMessageQueue, ParseUriResult, RequestContext, RespondWithObjectOptions, RetryContext, RetryPolicy, Rfc6570Expression, RouteActivityOptions, Router, RouterError, RouterOptions, RouterRouteResult, SendActivityError, SendActivityOptions, SendActivityOptionsForCollection, SenderKeyPair, SharedInboxKeyDispatcher, UnverifiedActivityHandler, UnverifiedActivityReason, WebFingerHandlerParameters, WebFingerLinksDispatcher, buildCollectionSynchronizationHeader, createExponentialBackoffPolicy, createFederation, createFederationBuilder, digest, handleWebFinger, respondWithObject, respondWithObjectIfAcceptable };

package/dist/federation/mod.js

@@ -1,6 +1,6 @@
 import { Temporal } from "@js-temporal/polyfill";
 import { URLPattern } from "urlpattern-polyfill";
-import { a as createExponentialBackoffPolicy, c as buildCollectionSynchronizationHeader, d as Router, f as RouterError, i as SendActivityError, l as digest, o as respondWithObject, r as handleWebFinger, s as respondWithObjectIfAcceptable, t as createFederation, u as createFederationBuilder } from "../middleware-Do50b12a.js";
+import { a as createExponentialBackoffPolicy, c as buildCollectionSynchronizationHeader, d as Router, f as RouterError, i as SendActivityError, l as digest, o as respondWithObject, r as handleWebFinger, s as respondWithObjectIfAcceptable, t as createFederation, u as createFederationBuilder } from "../middleware-C-45wr85.js";
 import { isEqual } from "es-toolkit";
 //#region src/federation/kv.ts
 /**

package/dist/federation/mq.test.mjs

@@ -2,7 +2,7 @@ import { Temporal } from "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
-import { i as assertGreaterOrEqual, r as assertGreater } from "../std__assert-Duiq_YC9.mjs";
+import { r as assertGreaterOrEqual } from "../std__assert-BUOJXi-Z.mjs";
 import { n as assertFalse } from "../assert_rejects-B-qJtC9Z.mjs";
 import { t as assert } from "../assert-BhQd8QHP.mjs";
 import { test } from "@fedify/fixture";
@@ -248,50 +248,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 orderingKey", async (t) => {
 	const mq = new InProcessMessageQueue();

package/dist/federation/negotiation.test.mjs

@@ -1,7 +1,7 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import "../std__assert-Duiq_YC9.mjs";
+import "../std__assert-BUOJXi-Z.mjs";
 import { n as assertFalse } from "../assert_rejects-B-qJtC9Z.mjs";
 import { t as assert } from "../assert-BhQd8QHP.mjs";
 import { t as acceptsJsonLd } from "../negotiation-BehA2uul.mjs";

package/dist/federation/router.test.mjs

@@ -3,7 +3,7 @@ import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { n as RouterError, t as Router } from "../router-CrMLXoOr.mjs";
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
-import "../std__assert-Duiq_YC9.mjs";
+import "../std__assert-BUOJXi-Z.mjs";
 import { n as assertFalse } from "../assert_rejects-B-qJtC9Z.mjs";
 import { t as assert } from "../assert-BhQd8QHP.mjs";
 import { t as assertThrows } from "../assert_throws-4NwKEy2q.mjs";

package/dist/federation/send.test.mjs

@@ -3,17 +3,18 @@ import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { t as esm_default } from "../esm-DVILvP5e.mjs";
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
-import "../std__assert-Duiq_YC9.mjs";
+import "../std__assert-BUOJXi-Z.mjs";
 import { n as assertFalse, t as assertRejects } from "../assert_rejects-B-qJtC9Z.mjs";
 import { n as assertInstanceOf, t as assert } from "../assert-BhQd8QHP.mjs";
 import { t as assertNotEquals } from "../assert_not_equals--wG9hV7u.mjs";
-import { l as verifyRequest } from "../http-UyebnM2c.mjs";
+import { l as verifyRequest } from "../http-B_M80hBW.mjs";
 import { i as rsaPrivateKey2, n as ed25519PrivateKey, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-CtZLJq76.mjs";
-import { t as doesActorOwnKey } from "../owner-CaaCVHsG.mjs";
-import { n as extractInboxes, r as sendActivity, t as SendActivityError } from "../send-B1CRgb14.mjs";
+import { t as doesActorOwnKey } from "../owner-B3ZkY-Ov.mjs";
+import { n as extractInboxes, r as sendActivity, t as SendActivityError } from "../send-N2w1IwXT.mjs";
 import { createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
 import { Activity, Application, Endpoints, Group, Person, Service } from "@fedify/vocab";
-import { UrlError } from "@fedify/vocab-runtime";
+import { FetchError, UrlError } from "@fedify/vocab-runtime";
+import dns from "node:dns/promises";
 //#region src/federation/send.test.ts
 test("extractInboxes()", () => {
 	const recipients = [
@@ -547,5 +548,67 @@ 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 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,
+					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);
+				}
+				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-Duiq_YC9.mjs";
+import "../std__assert-BUOJXi-Z.mjs";
 import { n as assertFalse } from "../assert_rejects-B-qJtC9Z.mjs";
 import { t as assert } from "../assert-BhQd8QHP.mjs";
-import { t as hasMalformedKnownTemporalLiteral } from "../temporal-Pmk5ouB1.mjs";
+import { t as hasMalformedKnownTemporalLiteral } from "../temporal-CpT0u5Mx.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

@@ -3,9 +3,9 @@ import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { n as createRequestContext } from "../context-Juj6bdHC.mjs";
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
-import "../std__assert-Duiq_YC9.mjs";
+import "../std__assert-BUOJXi-Z.mjs";
 import { t as MemoryKvStore } from "../kv-BrZHNugx.mjs";
-import { a as createFederation, o as handleWebFinger } from "../middleware-Dy18K1xP.mjs";
+import { a as createFederation, o as handleWebFinger } from "../middleware-Co_QOX9H.mjs";
 import { test } from "@fedify/fixture";
 import { Image, Link, Person } from "@fedify/vocab";
 //#region src/federation/webfinger.test.ts

package/dist/{http-7FmLhLDv.cjs → http-BOH-uFLj.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.1.24";
+var version = "2.1.26";
 //#endregion
 //#region src/sig/accept.ts
 /**
@@ -1315,6 +1315,8 @@ async function verifyRequestRfc9421(request, span, { documentLoader, contextLoad
 		return invalidSignatureResult(null);
 	}
 	let failure = noSignatureResult();
+	let body = null;
+	let digestValid = null;
 	for (const sigName of signatureNames) {
 		if (!signatures[sigName]) {
 			failure = invalidSignatureResult(parseKeyId(signatureInputs[sigName]?.keyId));
@@ -1366,7 +1368,9 @@ async function verifyRequestRfc9421(request, span, { documentLoader, contextLoad
 				failure = 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 });
 				failure = invalidSignatureResult(keyId);
 				continue;

package/dist/{http-UyebnM2c.mjs → http-B_M80hBW.mjs}

@@ -1,9 +1,9 @@
 import { Temporal } from "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-BXkm_rws.mjs";
+import { n as version, t as name } from "./deno-ChmEXNOv.mjs";
 import { i as validateAcceptSignature, n as fulfillAcceptSignature, r as parseAcceptSignature } from "./accept-BavzedPB.mjs";
-import { i as fetchKeyDetailed, s as validateCryptoKey } from "./key-A8SuFznD.mjs";
+import { i as fetchKeyDetailed, s as validateCryptoKey } from "./key-BJcK-1Av.mjs";
 import { CryptographicKey } from "@fedify/vocab";
 import { SpanStatusCode, trace } from "@opentelemetry/api";
 import { FetchError } from "@fedify/vocab-runtime";
@@ -674,6 +674,8 @@ async function verifyRequestRfc9421(request, span, { documentLoader, contextLoad
 		return invalidSignatureResult(null);
 	}
 	let failure = noSignatureResult();
+	let body = null;
+	let digestValid = null;
 	for (const sigName of signatureNames) {
 		if (!signatures[sigName]) {
 			failure = invalidSignatureResult(parseKeyId(signatureInputs[sigName]?.keyId));
@@ -725,7 +727,9 @@ async function verifyRequestRfc9421(request, span, { documentLoader, contextLoad
 				failure = 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 });
 				failure = invalidSignatureResult(keyId);
 				continue;

package/dist/{http-Chr54tTL.js → http-CeK9QmL_.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.1.24";
+var version = "2.1.26";
 //#endregion
 //#region src/sig/accept.ts
 /**
@@ -1314,6 +1314,8 @@ async function verifyRequestRfc9421(request, span, { documentLoader, contextLoad
 		return invalidSignatureResult(null);
 	}
 	let failure = noSignatureResult();
+	let body = null;
+	let digestValid = null;
 	for (const sigName of signatureNames) {
 		if (!signatures[sigName]) {
 			failure = invalidSignatureResult(parseKeyId(signatureInputs[sigName]?.keyId));
@@ -1365,7 +1367,9 @@ async function verifyRequestRfc9421(request, span, { documentLoader, contextLoad
 				failure = 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 });
 				failure = invalidSignatureResult(keyId);
 				continue;

package/dist/{inbox-ByQ2iD14.mjs → inbox-B_O6TjZS.mjs}

@@ -1,7 +1,7 @@
 import { Temporal } from "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-BXkm_rws.mjs";
+import { n as version, t as name } from "./deno-ChmEXNOv.mjs";
 import { Activity, getTypeId } from "@fedify/vocab";
 import { SpanKind, SpanStatusCode, context, propagation, trace } from "@opentelemetry/api";
 import { getLogger } from "@logtape/logtape";

package/dist/{key-A8SuFznD.mjs → key-BJcK-1Av.mjs}

@@ -1,7 +1,7 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-BXkm_rws.mjs";
+import { n as version, t as name } from "./deno-ChmEXNOv.mjs";
 import { CryptographicKey, Object as Object$1, isActor } from "@fedify/vocab";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
 import { FetchError, getDocumentLoader } from "@fedify/vocab-runtime";

package/dist/{kv-gJ8LYbxX.d.cts → 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-D6hNiMTK.d.ts → 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-DJhBDA9T.cjs → kv-cache-BlOG31SS.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-7FmLhLDv.cjs");
+const require_http = require("./http-BOH-uFLj.cjs");
 let _logtape_logtape = require("@logtape/logtape");
 let es_toolkit = require("es-toolkit");
 let _fedify_vocab_runtime = require("@fedify/vocab-runtime");
@@ -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,28 +27,51 @@ const logger$1 = (0, _logtape_logtape.getLogger)([
 */
 function getAuthenticatedDocumentLoader(identity, { allowPrivateAddress, 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, {
 			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