@fedify/fedify 2.3.9-dev.2048 → 2.3.10

package/dist/federation/middleware.test.mjs

@@ -3,21 +3,21 @@ import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { t as esm_default } from "../esm-vrlUxr60.mjs";
 import { t as assertEquals } from "../assert_equals-C-ZRDbaf.mjs";
-import { r as assertExists } from "../std__assert-BBjXFNOb.mjs";
+import { n as assertExists } from "../std__assert-BvGuO4xO.mjs";
 import { r as assertFalse, t as assertRejects } from "../assert_rejects-DN60FHPX.mjs";
 import { n as assertInstanceOf, t as assert } from "../assert-jSdZMYam.mjs";
 import { t as assertThrows } from "../assert_throws-BOkhLGYc.mjs";
 import { t as assertNotEquals } from "../assert_not_equals-DkVK8oqV.mjs";
 import { t as assertStrictEquals } from "../assert_strict_equals-XEgZAlrj.mjs";
-import { g as recordInboxActivity } from "../metrics-Ce55disp.mjs";
-import { l as verifyRequest, s as signRequest } from "../http-B2u6PvNX.mjs";
+import { g as recordInboxActivity } from "../metrics-QrVsKSG9.mjs";
+import { l as verifyRequest, s as signRequest } from "../http-BNDHRNJP.mjs";
 import { a as rsaPrivateKey3, c as rsaPublicKey3, i as rsaPrivateKey2, n as ed25519PrivateKey, r as ed25519PublicKey, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-BAK-tUlf.mjs";
-import { t as getAuthenticatedDocumentLoader } from "../docloader-C-JrNL14.mjs";
-import { a as compactJsonLd, h as verifyJsonLd, p as signJsonLd, s as detachSignature } from "../ld-DNl7KwLY.mjs";
-import { t as doesActorOwnKey } from "../owner-DqqDBw-l.mjs";
-import { i as verifyObject, r as signObject } from "../proof-D5vP7VIN.mjs";
+import { t as getAuthenticatedDocumentLoader } from "../docloader-w72ipM49.mjs";
+import { a as compactJsonLd, h as verifyJsonLd, p as signJsonLd, s as detachSignature } from "../ld-BYV2Luge.mjs";
+import { t as doesActorOwnKey } from "../owner-BsBzJADO.mjs";
+import { i as verifyObject, r as signObject } from "../proof-cXVkPBIU.mjs";
 import { t as MemoryKvStore } from "../kv-CX8qfaad.mjs";
-import { g as handleBenchmarkTrigger, i as KvSpecDeterminer, n as FederationImpl, o as createFederation, r as InboxContextImpl, t as ContextImpl } from "../middleware-BCG2BX1n.mjs";
+import { g as handleBenchmarkTrigger, i as KvSpecDeterminer, n as FederationImpl, o as createFederation, r as InboxContextImpl, t as ContextImpl } from "../middleware-Bj9s3J_0.mjs";
 import { t as CircuitBreaker } from "../circuit-breaker-CDABzqVf.mjs";
 import { t as markCircuitBreakerLegacySweepDone } from "../circuit-breaker-test-utils-Dm5MM6l9.mjs";
 import { configure, reset } from "@logtape/logtape";
@@ -27,6 +27,7 @@ import { Create, Offer, Person, getTypeId, lookupObject } from "@fedify/vocab";
 import { SpanStatusCode, metrics } from "@opentelemetry/api";
 import { createTestMeterProvider, createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
 import { FetchError, UrlError, getDocumentLoader } from "@fedify/vocab-runtime";
+import dns from "node:dns/promises";
 import serialize from "json-canon";
 import { DataPointType, MeterProvider as MeterProvider$1, MetricReader } from "@opentelemetry/sdk-metrics";
 //#region ../fixture/src/fixtures/example.com/create.json
@@ -1168,6 +1169,31 @@ test({
 		esm_default.hardReset();
 	}
 });
+test("Federation.fetch() [rfc9421] multiple POST signatures", async (t) => {
+	for (const validSecond of [true, false]) await t.step(validSecond ? "valid second signature" : "both signatures invalid", async () => {
+		const inbox = [];
+		const federation = createFederation({
+			kv: new MemoryKvStore(),
+			documentLoaderFactory: () => mockDocumentLoader,
+			contextLoaderFactory: () => mockDocumentLoader
+		});
+		federation.setActorDispatcher("/users/{identifier}", (ctx, identifier) => new vocab.Person({ id: ctx.getActorUri(identifier) }));
+		federation.setInboxListeners("/users/{identifier}/inbox", "/inbox").on(vocab.Create, (_ctx, activity) => {
+			inbox.push(activity.id.href);
+		});
+		const signed = await signRequest(new Request("https://example.com/inbox", {
+			method: "POST",
+			headers: { "Content-Type": "application/activity+json" },
+			body: JSON.stringify(create_default)
+		}), rsaPrivateKey2, rsaPublicKey2.id, { spec: "rfc9421" });
+		const input = signed.headers.get("Signature-Input");
+		const signature = signed.headers.get("Signature");
+		signed.headers.set("Signature-Input", `${input}, ${input.replace(/^sig1=/, "sig2=")}`);
+		signed.headers.set("Signature", `sig1=:AAAAAA==:, ${validSecond ? signature.replace(/^sig1=/, "sig2=") : "sig2=:AAAAAA==:"}`);
+		assertEquals((await federation.fetch(signed, { contextData: void 0 })).status, validSecond ? 202 : 401);
+		assertEquals(inbox, validSecond ? [id$2] : []);
+	});
+});
 test("Federation.fetch()", async (t) => {
 	esm_default.spyGlobal();
 	esm_default.get("https://example.com/key2", {
@@ -2655,6 +2681,7 @@ test("FederationImpl.processQueuedTask()", async (t) => {
 		const kv = new MemoryKvStore();
 		const queuedMessages = [];
 		const federation = new FederationImpl({
+			allowPrivateAddress: true,
 			kv,
 			queue: {
 				nativeRetrial: true,
@@ -2717,6 +2744,7 @@ test("FederationImpl.processQueuedTask()", async (t) => {
 		const kv = new MemoryKvStore();
 		let queuedMessages = [];
 		const federation = new FederationImpl({
+			allowPrivateAddress: true,
 			kv,
 			queue: {
 				enqueue(message, _options) {
@@ -4484,6 +4512,157 @@ test("FederationImpl.processQueuedTask()", async (t) => {
 		assertEquals(queuedMessages, []);
 	});
 });
+test({
+	name: "FederationImpl.processQueuedTask() accounts for destination validation failures",
+	ignore: "Deno" in globalThis && (await Deno.permissions.query({ name: "net" })).state !== "granted",
+	async fn(t) {
+		for (const result of [
+			"throws",
+			"empty",
+			"private"
+		]) for (const failureThreshold of [1, 5]) for (const redirected of [false, true]) await t.step(`${result}, threshold: ${failureThreshold}, redirected: ${redirected}`, async () => {
+			const destination = "https://delivery.invalid/inbox";
+			const publicInbox = "https://8.8.8.8/inbox";
+			const queuedMessages = [];
+			const delays = [];
+			const errors = [];
+			const activities = [];
+			const attempts = [];
+			const delay = Temporal.Duration.from({ seconds: 5 });
+			const kv = new MemoryKvStore();
+			await markCircuitBreakerLegacySweepDone(kv);
+			const [meterProvider, recorder] = createTestMeterProvider();
+			const recoveryDelay = Temporal.Duration.from({ minutes: 30 });
+			const federation = new FederationImpl({
+				kv,
+				meterProvider,
+				circuitBreaker: {
+					failureThreshold,
+					recoveryDelay
+				},
+				queue: {
+					enqueue(message, options) {
+						queuedMessages.push(message);
+						delays.push(options?.delay);
+						return Promise.resolve();
+					},
+					listen() {
+						return Promise.resolve();
+					}
+				},
+				documentLoaderFactory: () => mockDocumentLoader,
+				contextLoaderFactory: () => mockDocumentLoader,
+				onOutboxError(error, activity) {
+					errors.push(error);
+					activities.push(activity);
+				},
+				outboxRetryPolicy(options) {
+					attempts.push(options.attempts);
+					return delay;
+				}
+			});
+			const message = {
+				type: "outbox",
+				id: crypto.randomUUID(),
+				baseUrl: "https://example.com",
+				keys: [],
+				activity: {
+					"@context": "https://www.w3.org/ns/activitystreams",
+					type: "Create",
+					id: "https://example.com/activities/dns-failure",
+					actor: "https://example.com/users/alice",
+					object: {
+						type: "Note",
+						content: "test"
+					}
+				},
+				activityType: "https://www.w3.org/ns/activitystreams#Create",
+				inbox: redirected ? publicInbox : destination,
+				sharedInbox: false,
+				started: (/* @__PURE__ */ new Date()).toISOString(),
+				attempt: 0,
+				headers: {},
+				traceContext: {}
+			};
+			const originalLookup = dns.lookup;
+			const resolverError = /* @__PURE__ */ new Error("Resolver unavailable");
+			const lookups = [];
+			dns.lookup = ((hostname) => {
+				lookups.push(hostname);
+				assertEquals(hostname, "delivery.invalid");
+				if (result === "throws") return Promise.reject(resolverError);
+				return Promise.resolve(result === "empty" ? [] : [{
+					address: "127.0.0.1",
+					family: 4
+				}]);
+			});
+			try {
+				esm_default.mockGlobal().catch(202);
+				if (redirected) esm_default.route(publicInbox, {
+					status: 307,
+					headers: { Location: destination }
+				});
+				await federation.processQueuedTask(void 0, message);
+				assertEquals(errors.length, 1);
+				const error = errors[0];
+				if (result === "private") {
+					assertInstanceOf(error, UrlError);
+					assertEquals(error.reason, "disallowed");
+				} else {
+					assertInstanceOf(error, FetchError);
+					assertEquals(error.url.href, destination);
+					assertInstanceOf(error.cause, UrlError);
+					assertEquals(error.cause.reason, "dns");
+					assertStrictEquals(error.cause.cause, result === "throws" ? resolverError : void 0);
+				}
+				assertEquals(activities.length, 1);
+				assertInstanceOf(activities[0], Create);
+				assertEquals(activities[0].id?.href, "https://example.com/activities/dns-failure");
+				assertEquals(attempts, [0]);
+				const host = new URL(message.inbox).host;
+				const state = await kv.get([
+					"_fedify",
+					"circuit",
+					host
+				]);
+				if (result === "private") assertEquals(state, void 0);
+				else {
+					assertExists(state);
+					assertEquals(state.failures.length, 1);
+					assertEquals(state.state, failureThreshold === 1 ? "open" : "closed");
+				}
+				if (result !== "private" && failureThreshold === 1) {
+					assertEquals(queuedMessages.length, 1);
+					const held = queuedMessages[0];
+					assertEquals(held.attempt, 0);
+					assertEquals(held.circuitHeld, true);
+					assertExists(held.circuitHeldSince);
+					assertEquals(delays, [recoveryDelay]);
+				} else {
+					assertEquals(queuedMessages, [{
+						...message,
+						attempt: 1
+					}]);
+					assertEquals(delays, [delay]);
+				}
+				const expectedCount = result === "private" && !redirected ? 0 : 1;
+				const sent = recorder.getMeasurements("activitypub.delivery.sent");
+				assertEquals(sent.length, expectedCount);
+				if (expectedCount === 1) {
+					assertEquals(sent[0].value, 1);
+					assertEquals(sent[0].attributes["activitypub.delivery.success"], false);
+					assertEquals(sent[0].attributes["activitypub.remote.host"], host);
+				}
+				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();
+			}
+		});
+	}
+});
 test("FederationImpl.processQueuedTask() permanent failure", async (t) => {
 	esm_default.spyGlobal();
 	esm_default.post("https://gone.example/inbox", {
@@ -6656,6 +6835,80 @@ test({
 		assertEquals(rejected[1].attributes["activitypub.activity.type"], "https://www.w3.org/ns/activitystreams#Offer");
 	}
 });
+for (const queued of [false, true]) test(`ContextImpl.routeActivity() routes the fetched document (queued: ${queued})`, async () => {
+	const id = new URL("https://example.com/verified-create");
+	const genuine = new Create({
+		id,
+		actor: new URL("https://example.com/person"),
+		object: new vocab.Note({ content: "Genuine content" }),
+		to: new URL("https://example.com/recipient")
+	});
+	const genuineJson = await genuine.toJsonLd({ contextLoader: mockDocumentLoader });
+	const forged = new Create({
+		id,
+		actor: new URL("https://victim.example/actor"),
+		object: new vocab.Note({ content: "Forged content" }),
+		to: new URL("https://attacker.example/recipient")
+	});
+	const messages = [];
+	const queue = {
+		enqueue(message) {
+			messages.push(message);
+			return Promise.resolve();
+		},
+		async listen() {}
+	};
+	const federation = createFederation({
+		kv: new MemoryKvStore(),
+		documentLoaderFactory: () => async (url, options) => url === id.href ? {
+			document: genuineJson,
+			documentUrl: id.href,
+			contextUrl: null
+		} : await mockDocumentLoader(url, options),
+		contextLoaderFactory: () => mockDocumentLoader,
+		queue: {
+			inbox: queued ? queue : void 0,
+			outbox: queue
+		},
+		manuallyStartQueue: true
+	});
+	const received = [];
+	const contextDocuments = [];
+	federation.setInboxListeners("/users/{identifier}/inbox", "/inbox").on(Create, async (ctx, activity) => {
+		received.push(await activity.toJsonLd({ contextLoader: mockDocumentLoader }));
+		assertInstanceOf(ctx, InboxContextImpl);
+		contextDocuments.push(ctx.activity);
+		await ctx.forwardActivity({
+			privateKey: ed25519PrivateKey,
+			keyId: ed25519Multikey.id
+		}, {
+			id: new URL("https://example.com/recipient"),
+			inboxId: new URL("https://example.com/inbox")
+		});
+	});
+	const ctx = federation.createContext(new URL("https://local.example/"));
+	async function processInbox() {
+		const inboxMessages = messages.filter((message) => message.type === "inbox");
+		for (const message of inboxMessages) await federation.processQueuedTask(void 0, message);
+	}
+	assert(await ctx.routeActivity(null, forged));
+	if (queued) {
+		assertEquals(received, []);
+		assertEquals(messages.length, 1);
+		assertEquals(messages[0].activity, genuineJson);
+		await processInbox();
+	}
+	assertEquals(received, [genuineJson]);
+	assertEquals(contextDocuments, [genuineJson]);
+	const forwarded = messages.filter((message) => message.type === "outbox");
+	assertEquals(forwarded.length, 1);
+	assertEquals(forwarded[0].activity, genuineJson);
+	assert(await ctx.routeActivity(null, genuine));
+	if (queued) await processInbox();
+	assertEquals(received, [genuineJson]);
+	assertEquals(contextDocuments, [genuineJson]);
+	assertEquals(messages.filter((message) => message.type === "outbox").length, 1);
+});
 test("ContextImpl.routeActivity() marks queued signed activities as non-LDS", async () => {
 	let queuedMessage = null;
 	const federation = new FederationImpl({
@@ -6715,6 +6968,47 @@ test("ContextImpl.getCollectionUri()", () => {
 	assertThrows(() => ctx.getCollectionUri(Symbol(notReg), values));
 	assertThrows(() => ctx.getCollectionUri(Symbol.for(notReg), values));
 });
+test("symbol-named custom collections are served and parsed", async () => {
+	const federation = createFederation({ kv: new MemoryKvStore() });
+	const names = [Symbol("bookmarks"), Symbol("bookmarks")];
+	const paths = ["bookmarks", "ordered-bookmarks"];
+	const calls = [];
+	federation.setCollectionDispatcher(names[0], vocab.Object, "/users/{identifier}/bookmarks", (_ctx, _values, cursor) => {
+		calls.push([0, cursor]);
+		return { items: [] };
+	});
+	federation.setOrderedCollectionDispatcher(names[1], vocab.Object, "/users/{identifier}/ordered-bookmarks", (_ctx, _values, cursor) => {
+		calls.push([1, cursor]);
+		return { items: [] };
+	});
+	const ctx = federation.createContext(new URL("https://example.com/"));
+	for (const [index, name] of names.entries()) {
+		const uri = ctx.getCollectionUri(name, { identifier: "alice" });
+		assertEquals(uri.pathname, `/users/alice/${paths[index]}`);
+		const parsed = ctx.parseUri(uri);
+		assertEquals(parsed?.type, index === 0 ? "collection" : "orderedCollection");
+		if (parsed?.type !== "collection" && parsed?.type !== "orderedCollection") throw new Error("Expected a custom collection URI");
+		assertStrictEquals(parsed.name, name);
+		assertStrictEquals(parsed.class, vocab.Object);
+		assertEquals(parsed.typeId, vocab.Object.typeId);
+		assertEquals(parsed.values, { identifier: "alice" });
+		for (const cursor of [null, "next"]) {
+			const pageUri = new URL(uri);
+			if (cursor != null) pageUri.searchParams.set("cursor", cursor);
+			const response = await federation.fetch(new Request(pageUri, { headers: { accept: "application/activity+json" } }), { contextData: void 0 });
+			assertEquals(response.status, 200);
+			const body = await response.json();
+			assert(body !== null && typeof body === "object" && "type" in body);
+			assertEquals(body.type, `${index === 0 ? "Collection" : "OrderedCollection"}${cursor == null ? "" : "Page"}`);
+		}
+	}
+	assertEquals(calls, [
+		[0, null],
+		[0, "next"],
+		[1, null],
+		[1, "next"]
+	]);
+});
 test("InboxContextImpl.forwardActivity()", async (t) => {
 	esm_default.spyGlobal();
 	let verified = null;

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-BZojifnF.cjs");
+const require_middleware = require("../middleware-Dv-L7Plm.cjs");
 let _logtape_logtape = require("@logtape/logtape");
 let _fedify_uri_template = require("@fedify/uri-template");
 let es_toolkit = require("es-toolkit");

package/dist/federation/mod.d.cts

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

package/dist/federation/mod.d.ts

@@ -1,6 +1,6 @@
 /// <reference lib="esnext.temporal" />
-import { $ as CustomCollectionCursor, A as Rfc6570Expression, At as parseCircuitBreakerKvState, B as createFederationBuilder, C as FederationStartQueueOptions, Ct as CircuitBreakerFailurePolicy, D as InboxListenerSetters, Dt as CircuitBreakerStateChange, E as InboxChallengePolicy, Et as CircuitBreakerState, F as CreateExponentialBackoffPolicyOptions, G as ActorDispatcher, H as respondWithObject, I as RetryContext, J as AuthorizePredicate, K as ActorHandleMapper, L as RetryPolicy, M as FederationOrigin, N as FederationQueueOptions, O as ObjectCallbackSetters, Ot as NormalizedCircuitBreakerOptions, P as createFederation, Q as CustomCollectionCounter, R as createExponentialBackoffPolicy, S as FederationOptions, St as CircuitBreakerCreateOptions, T as IdempotencyStrategy, Tt as CircuitBreakerOptions, U as respondWithObjectIfAcceptable, V as RespondWithObjectOptions, W as ActorAliasMapper, X as CollectionCursor, Y as CollectionCounter, Z as CollectionDispatcher, _ as Federatable, _t as buildCollectionSynchronizationHeader, a as GetSignedKeyOptions, at as ObjectDispatcher, b as FederationBuilder, bt as CircuitBreakerActivityDrop, c as ParseUriResult, ct as OutboxListenerErrorHandler, d as SendActivityOptions, dt as UnverifiedActivityHandler, et as CustomCollectionDispatcher, f as SendActivityOptionsForCollection, ft as UnverifiedActivityReason, g as CustomCollectionCallbackSetters, gt as PageItems, h as ConstructorWithTypeId, ht as SenderKeyPair, i as GetActorOptions, it as ObjectAuthorizePredicate, j as FederationKvPrefixes, k as OutboxListenerSetters, kt as normalizeCircuitBreakerOptions, l as RequestContext, lt as OutboxPermanentFailureHandler, m as CollectionCallbackSetters, mt as SendActivityError, n as Context, nt as InboxListener, o as InboxContext, ot as OutboxErrorHandler, p as ActorCallbackSetters, pt as WebFingerLinksDispatcher, q as ActorKeyPairsDispatcher, r as ForwardActivityOptions, rt as NodeInfoDispatcher, s as OutboxContext, st as OutboxListener, t as ActorKeyPair, tt as InboxErrorHandler, u as RouteActivityOptions, ut as SharedInboxKeyDispatcher, v as Federation, vt as digest, w as IdempotencyKeyCallback, wt as CircuitBreakerKvState, x as FederationFetchOptions, xt as CircuitBreakerBeforeSendDecision, y as FederationBenchmarkOptions, yt as CircuitBreaker, z as Message } from "../context-CAKnQy1x.js";
-import { a as MemoryKvStore, i as KvStoreSetOptions, n as KvStore, r as KvStoreListEntry, t as KvKey } from "../kv-D6hNiMTK.js";
+import { $ as CustomCollectionCursor, A as Rfc6570Expression, At as parseCircuitBreakerKvState, B as createFederationBuilder, C as FederationStartQueueOptions, Ct as CircuitBreakerFailurePolicy, D as InboxListenerSetters, Dt as CircuitBreakerStateChange, E as InboxChallengePolicy, Et as CircuitBreakerState, F as CreateExponentialBackoffPolicyOptions, G as ActorDispatcher, H as respondWithObject, I as RetryContext, J as AuthorizePredicate, K as ActorHandleMapper, L as RetryPolicy, M as FederationOrigin, N as FederationQueueOptions, O as ObjectCallbackSetters, Ot as NormalizedCircuitBreakerOptions, P as createFederation, Q as CustomCollectionCounter, R as createExponentialBackoffPolicy, S as FederationOptions, St as CircuitBreakerCreateOptions, T as IdempotencyStrategy, Tt as CircuitBreakerOptions, U as respondWithObjectIfAcceptable, V as RespondWithObjectOptions, W as ActorAliasMapper, X as CollectionCursor, Y as CollectionCounter, Z as CollectionDispatcher, _ as Federatable, _t as buildCollectionSynchronizationHeader, a as GetSignedKeyOptions, at as ObjectDispatcher, b as FederationBuilder, bt as CircuitBreakerActivityDrop, c as ParseUriResult, ct as OutboxListenerErrorHandler, d as SendActivityOptions, dt as UnverifiedActivityHandler, et as CustomCollectionDispatcher, f as SendActivityOptionsForCollection, ft as UnverifiedActivityReason, g as CustomCollectionCallbackSetters, gt as PageItems, h as ConstructorWithTypeId, ht as SenderKeyPair, i as GetActorOptions, it as ObjectAuthorizePredicate, j as FederationKvPrefixes, k as OutboxListenerSetters, kt as normalizeCircuitBreakerOptions, l as RequestContext, lt as OutboxPermanentFailureHandler, m as CollectionCallbackSetters, mt as SendActivityError, n as Context, nt as InboxListener, o as InboxContext, ot as OutboxErrorHandler, p as ActorCallbackSetters, pt as WebFingerLinksDispatcher, q as ActorKeyPairsDispatcher, r as ForwardActivityOptions, rt as NodeInfoDispatcher, s as OutboxContext, st as OutboxListener, t as ActorKeyPair, tt as InboxErrorHandler, u as RouteActivityOptions, ut as SharedInboxKeyDispatcher, v as Federation, vt as digest, w as IdempotencyKeyCallback, wt as CircuitBreakerKvState, x as FederationFetchOptions, xt as CircuitBreakerBeforeSendDecision, y as FederationBenchmarkOptions, yt as CircuitBreaker, z as Message } from "../context-BWbdE_MZ.js";
+import { a as MemoryKvStore, i as KvStoreSetOptions, n as KvStore, r as KvStoreListEntry, t as KvKey } from "../kv-CxaI4eGo.js";
 import { a as MessageQueueEnqueueOptions, i as MessageQueueDepth, n as InProcessMessageQueueOptions, o as MessageQueueListenOptions, r as MessageQueue, s as ParallelMessageQueue, t as InProcessMessageQueue } from "../mq-D-nlpY04.js";
-import { a as RouterOptions, i as RouterError, n as handleWebFinger, o as RouterRouteResult, r as Router, t as WebFingerHandlerParameters } from "../mod-CFuyfw3c.js";
+import { a as RouterOptions, i as RouterError, n as handleWebFinger, o as RouterRouteResult, r as Router, t as WebFingerHandlerParameters } from "../mod-LmD03uRA.js";
 export { ActorAliasMapper, ActorCallbackSetters, ActorDispatcher, ActorHandleMapper, ActorKeyPair, ActorKeyPairsDispatcher, AuthorizePredicate, CircuitBreaker, CircuitBreakerActivityDrop, CircuitBreakerBeforeSendDecision, CircuitBreakerCreateOptions, CircuitBreakerFailurePolicy, CircuitBreakerKvState, CircuitBreakerOptions, CircuitBreakerState, CircuitBreakerStateChange, CollectionCallbackSetters, CollectionCounter, CollectionCursor, CollectionDispatcher, ConstructorWithTypeId, Context, CreateExponentialBackoffPolicyOptions, CustomCollectionCallbackSetters, CustomCollectionCounter, CustomCollectionCursor, CustomCollectionDispatcher, Federatable, Federation, FederationBenchmarkOptions, FederationBuilder, FederationFetchOptions, FederationKvPrefixes, FederationOptions, FederationOrigin, FederationQueueOptions, FederationStartQueueOptions, ForwardActivityOptions, GetActorOptions, GetSignedKeyOptions, IdempotencyKeyCallback, IdempotencyStrategy, InProcessMessageQueue, InProcessMessageQueueOptions, InboxChallengePolicy, InboxContext, InboxErrorHandler, InboxListener, InboxListenerSetters, KvKey, KvStore, KvStoreListEntry, KvStoreSetOptions, MemoryKvStore, Message, MessageQueue, MessageQueueDepth, MessageQueueEnqueueOptions, MessageQueueListenOptions, NodeInfoDispatcher, NormalizedCircuitBreakerOptions, ObjectAuthorizePredicate, ObjectCallbackSetters, ObjectDispatcher, OutboxContext, OutboxErrorHandler, OutboxListener, OutboxListenerErrorHandler, OutboxListenerSetters, 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, normalizeCircuitBreakerOptions, parseCircuitBreakerKvState, 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 SendActivityError, c as buildCollectionSynchronizationHeader, d as normalizeCircuitBreakerOptions, f as parseCircuitBreakerKvState, i as createExponentialBackoffPolicy, l as digest, o as respondWithObject, p as createFederationBuilder, r as handleWebFinger, s as respondWithObjectIfAcceptable, t as createFederation, u as CircuitBreaker } from "../middleware-C_utyVa_.js";
+import { a as SendActivityError, c as buildCollectionSynchronizationHeader, d as normalizeCircuitBreakerOptions, f as parseCircuitBreakerKvState, i as createExponentialBackoffPolicy, l as digest, o as respondWithObject, p as createFederationBuilder, r as handleWebFinger, s as respondWithObjectIfAcceptable, t as createFederation, u as CircuitBreaker } from "../middleware-B4FNnN3W.js";
 import { getLogger } from "@logtape/logtape";
 import { Router as Router$1, RouterError as RouterError$1, assertPath, isPath } from "@fedify/uri-template";
 import { isEqual } from "es-toolkit";

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-C-ZRDbaf.mjs";
-import { n as assertGreater } from "../std__assert-BBjXFNOb.mjs";
+import "../std__assert-BvGuO4xO.mjs";
 import { n as assertGreaterOrEqual, r as assertFalse } from "../assert_rejects-DN60FHPX.mjs";
 import { t as assert } from "../assert-jSdZMYam.mjs";
 import { test } from "@fedify/fixture";
@@ -294,50 +294,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/negotiation.test.mjs

@@ -1,7 +1,7 @@
 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 acceptsJsonLd } from "../negotiation-CDW-_gUU.mjs";

package/dist/federation/router.test.mjs

@@ -2,7 +2,7 @@ import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-C-ZRDbaf.mjs";
-import "../std__assert-BBjXFNOb.mjs";
+import "../std__assert-BvGuO4xO.mjs";
 import { r as assertFalse } from "../assert_rejects-DN60FHPX.mjs";
 import { t as assert } from "../assert-jSdZMYam.mjs";
 import { t as assertThrows } from "../assert_throws-BOkhLGYc.mjs";