@fedify/fedify 2.1.24 → 2.1.25

package/dist/{builder-BatYe9a2.mjs → builder-DsBAef6b.mjs}

@@ -2,8 +2,8 @@ import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { n as RouterError, t as Router } from "./router-CrMLXoOr.mjs";
-import { n as version, t as name } from "./deno-BXkm_rws.mjs";
-import { t as InboxListenerSet } from "./inbox-ByQ2iD14.mjs";
+import { n as version, t as name } from "./deno-9AaebKOA.mjs";
+import { t as InboxListenerSet } from "./inbox-BSyjaFbo.mjs";
 import { getTypeId } from "@fedify/vocab";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
 import { getLogger } from "@logtape/logtape";
@@ -43,7 +43,7 @@ var FederationBuilderImpl = class {
 		this.collectionTypeIds = {};
 	}
 	async build(options) {
-		const { FederationImpl } = await import("./middleware-DvxNTKpl.mjs");
+		const { FederationImpl } = await import("./middleware-DDT9ljTQ.mjs");
 		const f = new FederationImpl(options);
 		const trailingSlashInsensitiveValue = f.router.trailingSlashInsensitive;
 		f.router = this.router.clone();

package/dist/{client-DNiBssfx.mjs → client-DM72NZuk.mjs}

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

package/dist/compat/transformers.test.mjs

@@ -4,7 +4,7 @@ globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
 import { n as assertInstanceOf, t as assert } from "../assert-BhQd8QHP.mjs";
 import { t as MemoryKvStore } from "../kv-BrZHNugx.mjs";
-import { _ as autoIdAssigner, g as actorDehydrator, n as FederationImpl } from "../middleware-Dy18K1xP.mjs";
+import { _ as autoIdAssigner, g as actorDehydrator, n as FederationImpl } from "../middleware-DHHRwSZH.mjs";
 import { test } from "@fedify/fixture";
 import { Follow, Person } from "@fedify/vocab";
 //#region src/compat/transformers.test.ts

package/dist/{deno-BXkm_rws.mjs → deno-9AaebKOA.mjs}

@@ -3,6 +3,6 @@ import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 //#region deno.json
 var name = "@fedify/fedify";
-var version = "2.1.24";
+var version = "2.1.25";
 //#endregion
 export { version as n, name as t };

package/dist/docloader-DX96uPUj.mjs

@@ -0,0 +1,78 @@
+import "@js-temporal/polyfill";
+import "urlpattern-polyfill";
+globalThis.addEventListener = () => {};
+import { s as validateCryptoKey } from "./key-x9f-H7eO.mjs";
+import { n as doubleKnock } from "./http-B5qAeoJd.mjs";
+import { curry } from "es-toolkit";
+import { FetchError, UrlError, createActivityPubRequest, getRemoteDocument, logRequest, validatePublicUrl } from "@fedify/vocab-runtime";
+import { getLogger } from "@logtape/logtape";
+//#region src/utils/docloader.ts
+const logger = getLogger([
+	"fedify",
+	"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.
+* @returns The authenticated document loader.
+* @throws {TypeError} If the key is invalid or unsupported.
+* @since 0.4.0
+*/
+function getAuthenticatedDocumentLoader(identity, { allowPrivateAddress, userAgent, specDeterminer, tracerProvider } = {}) {
+	validateCryptoKey(identity.privateKey);
+	async function load(url, options, redirected = 0, visited = /* @__PURE__ */ new Set()) {
+		options?.signal?.throwIfAborted();
+		let currentUrl = new URL(url).href;
+		await validateUrl(currentUrl);
+		visited.add(currentUrl);
+		const originalRequest = createActivityPubRequest(currentUrl, { userAgent });
+		function follow(nextUrl) {
+			options?.signal?.throwIfAborted();
+			if (redirected >= DEFAULT_MAX_REDIRECTION) throw new FetchError(currentUrl, `Too many redirections (${redirected + 1})`);
+			if (visited.has(nextUrl)) throw new FetchError(currentUrl, `Redirect loop detected: ${nextUrl}`);
+			redirected++;
+		}
+		const response = await doubleKnock(originalRequest, identity, {
+			specDeterminer,
+			log: curry(logRequest)(logger),
+			tracerProvider,
+			signal: options?.signal,
+			validateRedirect: async (nextUrl) => {
+				follow(nextUrl);
+				await validateUrl(nextUrl);
+				visited.add(nextUrl);
+				currentUrl = nextUrl;
+			}
+		});
+		return getRemoteDocument(currentUrl, response, (alternateUrl) => {
+			follow(alternateUrl);
+			return load(alternateUrl, options, redirected, visited);
+		});
+	}
+	async function validateUrl(url) {
+		if (!allowPrivateAddress) try {
+			await validatePublicUrl(url);
+		} catch (error) {
+			if (error instanceof UrlError) if (error.reason === "dns") logger.debug("DNS lookup failed for {url}", {
+				url,
+				error
+			});
+			else logger.error("Disallowed private URL: {url}", {
+				url,
+				error
+			});
+			throw error;
+		}
+	}
+	return (url, options) => load(url, options);
+}
+//#endregion
+export { getAuthenticatedDocumentLoader as t };

package/dist/federation/builder.test.mjs

@@ -2,10 +2,10 @@ import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
-import { a as assertExists } from "../std__assert-Duiq_YC9.mjs";
+import { i as assertExists } from "../std__assert-BUOJXi-Z.mjs";
 import { t as assertThrows } from "../assert_throws-4NwKEy2q.mjs";
 import { t as MemoryKvStore } from "../kv-BrZHNugx.mjs";
-import { n as createFederationBuilder } from "../builder-BatYe9a2.mjs";
+import { n as createFederationBuilder } from "../builder-DsBAef6b.mjs";
 import { test } from "@fedify/fixture";
 import { Activity, Note, Person } from "@fedify/vocab";
 //#region src/federation/builder.test.ts

package/dist/federation/collection.test.mjs

@@ -2,7 +2,7 @@ import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
-import "../std__assert-Duiq_YC9.mjs";
+import "../std__assert-BUOJXi-Z.mjs";
 import { n as digest, t as buildCollectionSynchronizationHeader } from "../collection-ChgDTHLz.mjs";
 import { test } from "@fedify/fixture";
 import { decodeHex } from "byte-encodings/hex";

package/dist/federation/handler.test.mjs

@@ -3,18 +3,18 @@ import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { n as createRequestContext, t as createInboxContext } 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 assertRejects } from "../assert_rejects-B-qJtC9Z.mjs";
 import { t as assert } from "../assert-BhQd8QHP.mjs";
 import { r as parseAcceptSignature } from "../accept-BavzedPB.mjs";
-import { a as generateCryptoKeyPair } from "../key-A8SuFznD.mjs";
-import { s as signRequest } from "../http-UyebnM2c.mjs";
+import { a as generateCryptoKeyPair } from "../key-x9f-H7eO.mjs";
+import { s as signRequest } from "../http-B5qAeoJd.mjs";
 import { a as rsaPrivateKey3, c as rsaPublicKey3, s as rsaPublicKey2 } from "../keys-CtZLJq76.mjs";
-import { a as compactJsonLd, f as signJsonLd } from "../ld-BSvHU-S0.mjs";
-import { n as signObject } from "../proof-_AyA4r7z.mjs";
+import { a as compactJsonLd, f as signJsonLd } from "../ld-cfUwoi0C.mjs";
+import { n as signObject } from "../proof-CI4rsVLu.mjs";
 import { t as MemoryKvStore } from "../kv-BrZHNugx.mjs";
-import { a as createFederation, c as handleCollection, d as handleObject, f as respondWithObject, l as handleCustomCollection, p as respondWithObjectIfAcceptable, s as handleActor, u as handleInbox } from "../middleware-Dy18K1xP.mjs";
-import { t as InboxListenerSet } from "../inbox-ByQ2iD14.mjs";
+import { a as createFederation, c as handleCollection, d as handleObject, f as respondWithObject, l as handleCustomCollection, p as respondWithObjectIfAcceptable, s as handleActor, u as handleInbox } from "../middleware-DHHRwSZH.mjs";
+import { t as InboxListenerSet } from "../inbox-BSyjaFbo.mjs";
 import { createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
 import { Create, CryptographicKey, Multikey, Note, Person } from "@fedify/vocab";
 import { FetchError } from "@fedify/vocab-runtime";

package/dist/federation/idempotency.test.mjs

@@ -2,11 +2,11 @@ import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
-import "../std__assert-Duiq_YC9.mjs";
+import "../std__assert-BUOJXi-Z.mjs";
 import { n as ed25519PrivateKey, r as ed25519PublicKey, t as ed25519Multikey } from "../keys-CtZLJq76.mjs";
-import { n as signObject } from "../proof-_AyA4r7z.mjs";
+import { n as signObject } from "../proof-CI4rsVLu.mjs";
 import { t as MemoryKvStore } from "../kv-BrZHNugx.mjs";
-import { a as createFederation } from "../middleware-Dy18K1xP.mjs";
+import { a as createFederation } from "../middleware-DHHRwSZH.mjs";
 import { mockDocumentLoader, test } from "@fedify/fixture";
 import { Create, Follow, Person } from "@fedify/vocab";
 //#region src/federation/idempotency.test.ts

package/dist/federation/inbox.test.mjs

@@ -3,7 +3,7 @@ import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
 import { t as assertThrows } from "../assert_throws-4NwKEy2q.mjs";
-import { t as InboxListenerSet } from "../inbox-ByQ2iD14.mjs";
+import { t as InboxListenerSet } from "../inbox-BSyjaFbo.mjs";
 import { test } from "@fedify/fixture";
 import { Activity, Create, Invite, Offer, Update } from "@fedify/vocab";
 //#region src/federation/inbox.test.ts

package/dist/federation/kv.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 "../std__assert-Duiq_YC9.mjs";
+import "../std__assert-BUOJXi-Z.mjs";
 import { t as MemoryKvStore } from "../kv-BrZHNugx.mjs";
 import { test } from "@fedify/fixture";
 //#region src/federation/kv.test.ts

package/dist/federation/middleware.test.mjs

@@ -4,23 +4,24 @@ globalThis.addEventListener = () => {};
 import { t as esm_default } from "../esm-DVILvP5e.mjs";
 import { n as RouterError } from "../router-CrMLXoOr.mjs";
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
-import { n as assertStrictEquals } from "../std__assert-Duiq_YC9.mjs";
+import { n as assertStrictEquals } from "../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 assertThrows } from "../assert_throws-4NwKEy2q.mjs";
 import { t as assertNotEquals } from "../assert_not_equals--wG9hV7u.mjs";
-import { l as verifyRequest, s as signRequest } from "../http-UyebnM2c.mjs";
+import { l as verifyRequest, s as signRequest } from "../http-B5qAeoJd.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-CtZLJq76.mjs";
-import { t as getAuthenticatedDocumentLoader } from "../docloader-DdEK2tXP.mjs";
-import { a as compactJsonLd, f as signJsonLd, m as verifyJsonLd, s as detachSignature } from "../ld-BSvHU-S0.mjs";
-import { t as doesActorOwnKey } from "../owner-CaaCVHsG.mjs";
-import { n as signObject, r as verifyObject } from "../proof-_AyA4r7z.mjs";
+import { t as getAuthenticatedDocumentLoader } from "../docloader-DX96uPUj.mjs";
+import { a as compactJsonLd, f as signJsonLd, m as verifyJsonLd, s as detachSignature } from "../ld-cfUwoi0C.mjs";
+import { t as doesActorOwnKey } from "../owner-DklgvZXn.mjs";
+import { n as signObject, r as verifyObject } from "../proof-CI4rsVLu.mjs";
 import { t as MemoryKvStore } from "../kv-BrZHNugx.mjs";
-import { a as createFederation, i as KvSpecDeterminer, n as FederationImpl, r as InboxContextImpl, t as ContextImpl } from "../middleware-Dy18K1xP.mjs";
+import { a as createFederation, i as KvSpecDeterminer, n as FederationImpl, r as InboxContextImpl, t as ContextImpl } from "../middleware-DHHRwSZH.mjs";
 import { mockDocumentLoader, test } from "@fedify/fixture";
 import * as vocab from "@fedify/vocab";
 import { Create, Offer, Person, getTypeId, lookupObject } from "@fedify/vocab";
 import { FetchError, UrlError, getDocumentLoader } from "@fedify/vocab-runtime";
+import dns from "node:dns/promises";
 //#region ../fixture/src/fixtures/example.com/create.json
 var id$2 = "https://example.com/create";
 var create_default = {
@@ -717,6 +718,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", {
@@ -1426,6 +1452,7 @@ test("FederationImpl.processQueuedTask()", async (t) => {
 		const kv = new MemoryKvStore();
 		const queuedMessages = [];
 		const federation = new FederationImpl({
+			allowPrivateAddress: true,
 			kv,
 			queue: {
 				nativeRetrial: true,
@@ -1488,6 +1515,7 @@ test("FederationImpl.processQueuedTask()", async (t) => {
 		const kv = new MemoryKvStore();
 		let queuedMessages = [];
 		const federation = new FederationImpl({
+			allowPrivateAddress: true,
 			kv,
 			queue: {
 				enqueue(message, _options) {
@@ -2982,6 +3010,105 @@ test("FederationImpl.processQueuedTask()", async (t) => {
 		assertEquals(queuedMessages, []);
 	});
 });
+test({
+	name: "FederationImpl.processQueuedTask() retries DNS failures",
+	ignore: "Deno" in globalThis && (await Deno.permissions.query({ name: "net" })).state !== "granted",
+	async fn(t) {
+		for (const redirected of [false, true]) await t.step(`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 federation = new FederationImpl({
+				kv: new MemoryKvStore(),
+				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);
+				return Promise.reject(resolverError);
+			});
+			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];
+				assertInstanceOf(error, FetchError);
+				assertEquals(error.url.href, destination);
+				assertInstanceOf(error.cause, UrlError);
+				assertEquals(error.cause.reason, "dns");
+				assertStrictEquals(error.cause.cause, resolverError);
+				assertEquals(activities.length, 1);
+				assertInstanceOf(activities[0], Create);
+				assertEquals(activities[0].id?.href, "https://example.com/activities/dns-failure");
+				assertEquals(attempts, [0]);
+				assertEquals(queuedMessages, [{
+					...message,
+					attempt: 1
+				}]);
+				assertEquals(delays, [delay]);
+				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", {

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-XXuSt_6b.cjs");
 let es_toolkit = require("es-toolkit");
 //#region src/federation/kv.ts
 /**

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-CP35ElZv.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";