@fedify/fedify 2.3.0-dev.1079 → 2.3.0-dev.1099

package/dist/federation/middleware.test.mjs

@@ -11,17 +11,18 @@ import { t as assertNotEquals } from "../assert_not_equals--wG9hV7u.mjs";
 import { t as assertStrictEquals } from "../assert_strict_equals-Dmjbg-bA.mjs";
 import { t as assert } from "../assert-DikXweDx.mjs";
 import { t as esm_default } from "../esm-sdtqOUPu.mjs";
-import { l as verifyRequest, s as signRequest } from "../http-DM4ZAFCe.mjs";
+import { l as verifyRequest, s as signRequest } from "../http-5G18W3NP.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-C3kae-6B.mjs";
-import { t as getAuthenticatedDocumentLoader } from "../docloader-vsZP01ww.mjs";
-import { a as signJsonLd, o as verifyJsonLd, r as detachSignature } from "../ld-L9w529xq.mjs";
-import { t as doesActorOwnKey } from "../owner-C30LGgMz.mjs";
-import { i as verifyObject, r as signObject } from "../proof-BjToRsXF.mjs";
+import { t as getAuthenticatedDocumentLoader } from "../docloader-DA5FzJOR.mjs";
+import { a as signJsonLd, o as verifyJsonLd, r as detachSignature } from "../ld-hbxDLO1k.mjs";
+import { t as doesActorOwnKey } from "../owner-DwJe0BH9.mjs";
+import { i as verifyObject, r as signObject } from "../proof-erpV_J_n.mjs";
 import { t as MemoryKvStore } from "../kv-x2IvBUyq.mjs";
-import { i as KvSpecDeterminer, n as FederationImpl, o as createFederation, r as InboxContextImpl, t as ContextImpl } from "../middleware-CTdNwf_s.mjs";
+import { i as KvSpecDeterminer, n as FederationImpl, o as createFederation, r as InboxContextImpl, t as ContextImpl } from "../middleware-BXnhAGF9.mjs";
 import { configure, reset } from "@logtape/logtape";
 import * as vocab from "@fedify/vocab";
 import { getTypeId, lookupObject } from "@fedify/vocab";
+import { SpanStatusCode } from "@opentelemetry/api";
 import { createTestMeterProvider, createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
 import { FetchError, getDocumentLoader } from "@fedify/vocab-runtime";
 import serialize from "json-canon";
@@ -1918,19 +1919,22 @@ test("Federation.setOutboxListeners()", async (t) => {
 		};
 		let listenCalled = false;
 		const enqueued = [];
+		const queue = {
+			enqueue(message) {
+				enqueued.push(message);
+				return Promise.resolve();
+			},
+			listen() {
+				listenCalled = true;
+				return Promise.resolve();
+			}
+		};
+		const [meterProvider, recorder] = createTestMeterProvider();
 		const federation = new FederationImpl({
 			kv,
 			contextLoaderFactory: () => mockDocumentLoader,
-			queue: {
-				enqueue(message) {
-					enqueued.push(message);
-					return Promise.resolve();
-				},
-				listen() {
-					listenCalled = true;
-					return Promise.resolve();
-				}
-			}
+			meterProvider,
+			queue
 		});
 		federation.setActorDispatcher("/users/{identifier}", (_ctx, identifier) => identifier === "john" ? new vocab.Person({}) : null).setKeyPairsDispatcher(() => [{
 			privateKey: rsaPrivateKey2,
@@ -1956,6 +1960,10 @@ test("Federation.setOutboxListeners()", async (t) => {
 		assertEquals(enqueued.length, 1);
 		assertEquals(enqueued[0].type, "outbox");
 		assertEquals(enqueued[0].actorIds, ["https://remote.example/users/alice"]);
+		const enqueuedMetrics = recorder.getMeasurements("fedify.queue.task.enqueued");
+		assertEquals(enqueuedMetrics.length, 1);
+		assertEquals(enqueuedMetrics[0].attributes["fedify.queue.role"], "outbox");
+		assertEquals(enqueuedMetrics[0].attributes["fedify.queue.task.attempt"], 0);
 	});
 });
 test("Federation.setInboxDispatcher()", async (t) => {
@@ -2321,6 +2329,28 @@ test("FederationImpl.processQueuedTask()", async (t) => {
 		const durations = recorder.getMeasurements("activitypub.inbox.processing_duration");
 		assertEquals(durations.length, 1);
 		assertEquals(durations[0].attributes["activitypub.activity.type"], "https://www.w3.org/ns/activitystreams#Create");
+		const started = recorder.getMeasurements("fedify.queue.task.started");
+		assertEquals(started.length, 1);
+		assertEquals(started[0].attributes["fedify.queue.role"], "inbox");
+		const completed = recorder.getMeasurements("fedify.queue.task.completed");
+		assertEquals(completed.length, 1);
+		assertEquals(completed[0].attributes["fedify.queue.role"], "inbox");
+		assertEquals(completed[0].attributes["fedify.queue.task.result"], "completed");
+		assertEquals(completed[0].attributes["activitypub.activity.type"], "https://www.w3.org/ns/activitystreams#Create");
+		assertEquals(recorder.getMeasurements("fedify.queue.task.failed").length, 0);
+		const taskDurations = recorder.getMeasurements("fedify.queue.task.duration");
+		assertEquals(taskDurations.length, 1);
+		assertEquals(taskDurations[0].type, "histogram");
+		assertEquals(taskDurations[0].attributes["fedify.queue.role"], "inbox");
+		assertEquals(taskDurations[0].attributes["fedify.queue.task.result"], "completed");
+		const inFlight = recorder.getMeasurements("fedify.queue.task.in_flight");
+		assertEquals(inFlight.length, 2);
+		assertEquals(inFlight[0].type, "upDownCounter");
+		assertEquals(inFlight[0].value, 1);
+		assertEquals(inFlight[1].value, -1);
+		assertEquals(inFlight[0].attributes, inFlight[1].attributes);
+		assertEquals(inFlight[0].attributes["fedify.queue.role"], "inbox");
+		assertEquals(inFlight[0].attributes["activitypub.activity.type"], void 0);
 	});
 });
 test("FederationImpl.processQueuedTask() permanent failure", async (t) => {
@@ -2530,6 +2560,304 @@ test("FederationImpl.processQueuedTask() permanent failure", async (t) => {
 	});
 	esm_default.hardReset();
 });
+test("FederationImpl.processQueuedTask() queue task metrics", async (t) => {
+	await t.step("records failed result when worker re-throws (nativeRetrial)", async () => {
+		const kv = new MemoryKvStore();
+		const [meterProvider, recorder] = createTestMeterProvider();
+		const federation = new FederationImpl({
+			kv,
+			meterProvider,
+			queue: {
+				nativeRetrial: true,
+				enqueue(_message, _options) {
+					return Promise.resolve();
+				},
+				listen(_handler, _options) {
+					return Promise.resolve();
+				}
+			}
+		});
+		federation.setInboxListeners("/users/{identifier}/inbox", "/inbox").on(vocab.Create, () => {
+			throw new Error("Intended error for testing");
+		});
+		await assertRejects(() => federation.processQueuedTask(void 0, {
+			type: "inbox",
+			id: crypto.randomUUID(),
+			baseUrl: "https://example.com",
+			activity: {
+				"@context": "https://www.w3.org/ns/activitystreams",
+				type: "Create",
+				id: "https://remote.example/activities/2",
+				actor: "https://remote.example/users/alice",
+				object: {
+					type: "Note",
+					content: "Hello world"
+				}
+			},
+			started: (/* @__PURE__ */ new Date()).toISOString(),
+			attempt: 0,
+			identifier: null,
+			traceContext: {}
+		}), Error);
+		assertEquals(recorder.getMeasurements("fedify.queue.task.completed").length, 0);
+		const failed = recorder.getMeasurements("fedify.queue.task.failed");
+		assertEquals(failed.length, 1);
+		assertEquals(failed[0].attributes["fedify.queue.role"], "inbox");
+		assertEquals(failed[0].attributes["fedify.queue.task.result"], "failed");
+		assertEquals(failed[0].attributes["fedify.queue.native_retrial"], true);
+		assertEquals(failed[0].attributes["activitypub.activity.type"], "https://www.w3.org/ns/activitystreams#Create");
+		const taskDurations = recorder.getMeasurements("fedify.queue.task.duration");
+		assertEquals(taskDurations.length, 1);
+		assertEquals(taskDurations[0].attributes["fedify.queue.task.result"], "failed");
+		const inFlight = recorder.getMeasurements("fedify.queue.task.in_flight");
+		assertEquals(inFlight.length, 2);
+		assertEquals(inFlight[0].value, 1);
+		assertEquals(inFlight[1].value, -1);
+		assertEquals(inFlight[0].attributes, inFlight[1].attributes);
+	});
+	await t.step("records completed when retry handler swallows listener error", async () => {
+		const kv = new MemoryKvStore();
+		const [meterProvider, recorder] = createTestMeterProvider();
+		const queuedMessages = [];
+		const federation = new FederationImpl({
+			kv,
+			meterProvider,
+			queue: {
+				enqueue(message, _options) {
+					queuedMessages.push(message);
+					return Promise.resolve();
+				},
+				listen(_handler, _options) {
+					return Promise.resolve();
+				}
+			}
+		});
+		federation.setInboxListeners("/users/{identifier}/inbox", "/inbox").on(vocab.Create, () => {
+			throw new Error("Intended error for testing");
+		});
+		await federation.processQueuedTask(void 0, {
+			type: "inbox",
+			id: crypto.randomUUID(),
+			baseUrl: "https://example.com",
+			activity: {
+				"@context": "https://www.w3.org/ns/activitystreams",
+				type: "Create",
+				id: "https://remote.example/activities/retry",
+				actor: "https://remote.example/users/alice",
+				object: {
+					type: "Note",
+					content: "Hello world"
+				}
+			},
+			started: (/* @__PURE__ */ new Date()).toISOString(),
+			attempt: 0,
+			identifier: null,
+			traceContext: {}
+		});
+		assertEquals(queuedMessages.length, 1);
+		const completed = recorder.getMeasurements("fedify.queue.task.completed");
+		assertEquals(completed.length, 1);
+		assertEquals(completed[0].attributes["fedify.queue.task.result"], "completed");
+		const enqueued = recorder.getMeasurements("fedify.queue.task.enqueued");
+		assertEquals(enqueued.length, 1);
+		assertEquals(enqueued[0].attributes["fedify.queue.role"], "inbox");
+		assertEquals(enqueued[0].attributes["fedify.queue.task.attempt"], 1);
+		assertEquals(enqueued[0].attributes["activitypub.activity.type"], "https://www.w3.org/ns/activitystreams#Create");
+	});
+	await t.step("records aborted result when worker re-throws AbortError", async () => {
+		const kv = new MemoryKvStore();
+		const [meterProvider, recorder] = createTestMeterProvider();
+		const [tracerProvider, exporter] = createTestTracerProvider();
+		const federation = new FederationImpl({
+			kv,
+			meterProvider,
+			tracerProvider,
+			queue: {
+				nativeRetrial: true,
+				enqueue(_message, _options) {
+					return Promise.resolve();
+				},
+				listen(_handler, _options) {
+					return Promise.resolve();
+				}
+			}
+		});
+		federation.setInboxListeners("/users/{identifier}/inbox", "/inbox").on(vocab.Create, () => {
+			throw new DOMException("aborted", "AbortError");
+		});
+		await assertRejects(() => federation.processQueuedTask(void 0, {
+			type: "inbox",
+			id: crypto.randomUUID(),
+			baseUrl: "https://example.com",
+			activity: {
+				"@context": "https://www.w3.org/ns/activitystreams",
+				type: "Create",
+				id: "https://remote.example/activities/3",
+				actor: "https://remote.example/users/alice",
+				object: {
+					type: "Note",
+					content: "Hello world"
+				}
+			},
+			started: (/* @__PURE__ */ new Date()).toISOString(),
+			attempt: 0,
+			identifier: null,
+			traceContext: {}
+		}), DOMException);
+		assertEquals(recorder.getMeasurements("fedify.queue.task.failed").length, 0);
+		assertEquals(recorder.getMeasurements("fedify.queue.task.completed").length, 0);
+		const taskDurations = recorder.getMeasurements("fedify.queue.task.duration");
+		assertEquals(taskDurations.length, 1);
+		assertEquals(taskDurations[0].attributes["fedify.queue.task.result"], "aborted");
+		const inboxSpans = exporter.getSpans("activitypub.inbox");
+		assertEquals(inboxSpans.length, 1);
+		assertEquals(inboxSpans[0].status.code, SpanStatusCode.UNSET);
+	});
+	await t.step("records native_retrial and backend attributes", async () => {
+		const kv = new MemoryKvStore();
+		const [meterProvider, recorder] = createTestMeterProvider();
+		class TestMessageQueue {
+			nativeRetrial = true;
+			enqueue(_message, _options) {
+				return Promise.resolve();
+			}
+			listen(_handler, _options) {
+				return Promise.resolve();
+			}
+		}
+		const federation = new FederationImpl({
+			kv,
+			meterProvider,
+			queue: new TestMessageQueue()
+		});
+		federation.setInboxListeners("/users/{identifier}/inbox", "/inbox").on(vocab.Create, () => {});
+		await federation.processQueuedTask(void 0, {
+			type: "inbox",
+			id: crypto.randomUUID(),
+			baseUrl: "https://example.com",
+			activity: {
+				"@context": "https://www.w3.org/ns/activitystreams",
+				type: "Create",
+				id: "https://remote.example/activities/4",
+				actor: "https://remote.example/users/alice",
+				object: {
+					type: "Note",
+					content: "Hello world"
+				}
+			},
+			started: (/* @__PURE__ */ new Date()).toISOString(),
+			attempt: 0,
+			identifier: null,
+			traceContext: {}
+		});
+		const completed = recorder.getMeasurements("fedify.queue.task.completed");
+		assertEquals(completed.length, 1);
+		assertEquals(completed[0].attributes["fedify.queue.backend"], "TestMessageQueue");
+		assertEquals(completed[0].attributes["fedify.queue.native_retrial"], true);
+	});
+	await t.step("records outbox worker metrics on successful delivery", async () => {
+		const kv = new MemoryKvStore();
+		const [meterProvider, recorder] = createTestMeterProvider();
+		const federation = new FederationImpl({
+			kv,
+			meterProvider,
+			queue: {
+				enqueue(_message, _options) {
+					return Promise.resolve();
+				},
+				listen(_handler, _options) {
+					return Promise.resolve();
+				}
+			}
+		});
+		federation.setInboxListeners("/users/{identifier}/inbox", "/inbox");
+		esm_default.spyGlobal();
+		esm_default.post("https://remote.example/inbox", { status: 202 });
+		try {
+			await federation.processQueuedTask(void 0, {
+				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/1",
+					actor: "https://example.com/users/alice",
+					object: {
+						type: "Note",
+						content: "test"
+					}
+				},
+				activityType: "https://www.w3.org/ns/activitystreams#Create",
+				inbox: "https://remote.example/inbox",
+				sharedInbox: false,
+				started: (/* @__PURE__ */ new Date()).toISOString(),
+				attempt: 0,
+				headers: {},
+				traceContext: {}
+			});
+		} finally {
+			esm_default.hardReset();
+		}
+		const started = recorder.getMeasurements("fedify.queue.task.started");
+		assertEquals(started.length, 1);
+		assertEquals(started[0].attributes["fedify.queue.role"], "outbox");
+		assertEquals(started[0].attributes["activitypub.activity.type"], "https://www.w3.org/ns/activitystreams#Create");
+		const completed = recorder.getMeasurements("fedify.queue.task.completed");
+		assertEquals(completed.length, 1);
+		assertEquals(completed[0].attributes["fedify.queue.task.result"], "completed");
+		assertEquals(recorder.getMeasurements("fedify.queue.task.enqueued").length, 0);
+	});
+	await t.step("records started/completed for a fanout task with no recipients", async () => {
+		const kv = new MemoryKvStore();
+		const [meterProvider, recorder] = createTestMeterProvider();
+		const exportedKey = await crypto.subtle.exportKey("jwk", rsaPrivateKey3);
+		const federation = new FederationImpl({
+			kv,
+			meterProvider,
+			queue: {
+				enqueue(_message, _options) {
+					return Promise.resolve();
+				},
+				listen(_handler, _options) {
+					return Promise.resolve();
+				}
+			}
+		});
+		federation.setInboxListeners("/users/{identifier}/inbox", "/inbox");
+		await federation.processQueuedTask(void 0, {
+			type: "fanout",
+			id: crypto.randomUUID(),
+			baseUrl: "https://example.com",
+			keys: [{
+				keyId: "https://example.com/users/alice#main-key",
+				privateKey: exportedKey
+			}],
+			inboxes: {},
+			activity: {
+				"@context": "https://www.w3.org/ns/activitystreams",
+				type: "Create",
+				id: "https://example.com/activities/1",
+				actor: "https://example.com/users/alice",
+				object: {
+					type: "Note",
+					content: "test"
+				}
+			},
+			activityType: "https://www.w3.org/ns/activitystreams#Create",
+			traceContext: {}
+		});
+		const started = recorder.getMeasurements("fedify.queue.task.started");
+		assertEquals(started.length, 1);
+		assertEquals(started[0].attributes["fedify.queue.role"], "fanout");
+		assertEquals(started[0].attributes["activitypub.activity.type"], "https://www.w3.org/ns/activitystreams#Create");
+		const completed = recorder.getMeasurements("fedify.queue.task.completed");
+		assertEquals(completed.length, 1);
+		assertEquals(completed[0].attributes["fedify.queue.role"], "fanout");
+		assertEquals(completed[0].attributes["fedify.queue.task.result"], "completed");
+	});
+});
 test("ContextImpl.lookupObject()", async (t) => {
 	esm_default.spyGlobal();
 	esm_default.get("begin:https://localhost/.well-known/webfinger", {
@@ -3158,6 +3486,45 @@ test({
 		]);
 	}
 });
+test({
+	name: "ContextImpl.routeActivity() forwards meterProvider to inbox enqueue",
+	permissions: {
+		env: true,
+		read: true
+	},
+	async fn() {
+		const [meterProvider, recorder] = createTestMeterProvider();
+		const enqueued = [];
+		const federation = new FederationImpl({
+			kv: new MemoryKvStore(),
+			meterProvider,
+			queue: {
+				enqueue(message) {
+					enqueued.push(message);
+					return Promise.resolve();
+				},
+				listen() {
+					return Promise.resolve();
+				}
+			}
+		});
+		federation.setInboxListeners("/u/{identifier}/i", "/i");
+		const ctx = new ContextImpl({
+			url: new URL("https://example.com/"),
+			federation,
+			data: void 0,
+			documentLoader: mockDocumentLoader,
+			contextLoader: documentLoader
+		});
+		const signedOffer = await signObject(new vocab.Offer({ actor: new URL("https://example.com/person2") }), ed25519PrivateKey, ed25519Multikey.id);
+		assert(await ctx.routeActivity(null, signedOffer));
+		assertEquals(enqueued.length, 1);
+		const enqueuedMetrics = recorder.getMeasurements("fedify.queue.task.enqueued");
+		assertEquals(enqueuedMetrics.length, 1);
+		assertEquals(enqueuedMetrics[0].attributes["fedify.queue.role"], "inbox");
+		assertEquals(enqueuedMetrics[0].attributes["fedify.queue.task.attempt"], 0);
+	}
+});
 test("ContextImpl.getCollectionUri()", () => {
 	const federation = new FederationImpl({ kv: new MemoryKvStore() });
 	const base = "https://example.com";

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

package/dist/federation/mod.d.cts

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

package/dist/federation/mod.d.ts

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

package/dist/federation/mod.js

@@ -1,6 +1,6 @@
 import { Temporal } from "@js-temporal/polyfill";
-import "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-DZNHpEbh.js";
+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-vCF_cKAq.js";
 import { isEqual } from "es-toolkit";
 //#region src/federation/kv.ts
 /**

package/dist/federation/send.test.mjs

@@ -9,10 +9,10 @@ import { t as assertInstanceOf } from "../assert_instance_of-C4Ri6VuN.mjs";
 import { t as assertNotEquals } from "../assert_not_equals--wG9hV7u.mjs";
 import { t as assert } from "../assert-DikXweDx.mjs";
 import { t as esm_default } from "../esm-sdtqOUPu.mjs";
-import { l as verifyRequest } from "../http-DM4ZAFCe.mjs";
+import { l as verifyRequest } from "../http-5G18W3NP.mjs";
 import { i as rsaPrivateKey2, n as ed25519PrivateKey, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-C3kae-6B.mjs";
-import { t as doesActorOwnKey } from "../owner-C30LGgMz.mjs";
-import { n as extractInboxes, r as sendActivity, t as SendActivityError } from "../send-DzbMznU6.mjs";
+import { t as doesActorOwnKey } from "../owner-DwJe0BH9.mjs";
+import { n as extractInboxes, r as sendActivity, t as SendActivityError } from "../send-BOwz4Hw5.mjs";
 import { Activity, Application, Endpoints, Group, Person, Service } from "@fedify/vocab";
 import { createTestMeterProvider, createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
 //#region ../../node_modules/.pnpm/@opentelemetry+sdk-metrics@2.7.1_@opentelemetry+api@1.9.1/node_modules/@opentelemetry/sdk-metrics/build/src/export/AggregationTemporality.js

package/dist/federation/webfinger.test.mjs

@@ -5,7 +5,7 @@ import { r as createRequestContext } from "../context-BAE7AKLA.mjs";
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
 import "../std__assert-CRDpx_HF.mjs";
 import { t as MemoryKvStore } from "../kv-x2IvBUyq.mjs";
-import { o as createFederation, s as handleWebFinger } from "../middleware-CTdNwf_s.mjs";
+import { o as createFederation, s as handleWebFinger } from "../middleware-BXnhAGF9.mjs";
 import { Image, Link, Person, Tombstone } from "@fedify/vocab";
 import { test } from "@fedify/fixture";
 //#region src/federation/webfinger.test.ts

package/dist/{http-DM4ZAFCe.mjs → http-5G18W3NP.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-BxqkYxIf.mjs";
+import { n as version, t as name } from "./deno-DBabeupC.mjs";
 import { i as validateAcceptSignature, n as fulfillAcceptSignature, r as parseAcceptSignature } from "./accept-CceiKpCy.mjs";
-import { o as validateCryptoKey, r as fetchKeyDetailed } from "./key-BNp_b9oE.mjs";
+import { o as validateCryptoKey, r as fetchKeyDetailed } from "./key-D9dUsyow.mjs";
 import { getLogger } from "@logtape/logtape";
 import { CryptographicKey } from "@fedify/vocab";
 import { SpanStatusCode, trace } from "@opentelemetry/api";
@@ -14,6 +14,7 @@ import { encodeHex } from "byte-encodings/hex";
 import { Item, decodeDict, encodeItem } from "structured-field-values";
 //#region src/sig/http.ts
 const DEFAULT_MAX_REDIRECTION = 20;
+const DOUBLE_KNOCK_TRANSPORT_RETRY_DELAY_MS = 100;
 /**
 * Signs a request using the given private key.
 * @param request The request to sign.
@@ -842,6 +843,59 @@ function createRedirectRequest(request, location, body) {
 		cache: request.cache
 	});
 }
+async function fetchDoubleKnockRequest(request, signedRequest, signal) {
+	const maxAttempts = request.method === "GET" || request.method === "HEAD" ? 2 : 1;
+	for (let attempt = 1;; attempt++) try {
+		return await fetch(signedRequest, {
+			redirect: "manual",
+			signal
+		});
+	} catch (error) {
+		const abortedSignal = getAbortedSignal(signal, request.signal, signedRequest.signal);
+		if (abortedSignal != null) throw getAbortReason(abortedSignal);
+		if (isAbortError(error)) throw error;
+		if (attempt >= maxAttempts) throw createFetchError(request.url, error);
+		await sleep(DOUBLE_KNOCK_TRANSPORT_RETRY_DELAY_MS, signal, request.signal, signedRequest.signal);
+	}
+}
+function createFetchError(url, cause) {
+	const error = new FetchError(url, cause instanceof Error ? cause.message : String(cause));
+	error.cause = cause;
+	return error;
+}
+function isAbortError(error) {
+	return error instanceof Error && error.name === "AbortError";
+}
+async function sleep(ms, ...signals) {
+	const abortSignals = signals.filter((signal) => signal != null);
+	const abortedSignal = getAbortedSignal(...abortSignals);
+	if (abortedSignal != null) throw getAbortReason(abortedSignal);
+	if (abortSignals.length < 1) {
+		await new Promise((resolve) => setTimeout(resolve, ms));
+		return;
+	}
+	await new Promise((resolve, reject) => {
+		const removeAbortListeners = () => {
+			for (const signal of abortSignals) signal.removeEventListener("abort", handleAbort);
+		};
+		const timeout = setTimeout(() => {
+			removeAbortListeners();
+			resolve();
+		}, ms);
+		function handleAbort(event) {
+			clearTimeout(timeout);
+			removeAbortListeners();
+			reject(getAbortReason(event.currentTarget));
+		}
+		for (const signal of abortSignals) signal.addEventListener("abort", handleAbort, { once: true });
+	});
+}
+function getAbortedSignal(...signals) {
+	return signals.find((signal) => signal?.aborted);
+}
+function getAbortReason(signal) {
+	return signal.reason ?? new DOMException("The operation was aborted.", "AbortError");
+}
 /**
 * Performs a double-knock request to the given URL.  For the details of
 * double-knocking, see
@@ -868,10 +922,7 @@ async function doubleKnockInternal(request, identity, options, redirected = 0, v
 		body
 	});
 	log?.(signedRequest);
-	let response = await fetch(signedRequest, {
-		redirect: "manual",
-		signal
-	});
+	let response = await fetchDoubleKnockRequest(request, signedRequest, signal);
 	if (response.status >= 300 && response.status < 400 && response.headers.has("Location")) {
 		if (redirected >= maximumRedirection) throw new FetchError(request.url, `Too many redirections (${redirected + 1})`);
 		const redirectRequest = createRedirectRequest(request, response.headers.get("Location"), body);
@@ -946,10 +997,7 @@ async function doubleKnockInternal(request, identity, options, redirected = 0, v
 			body
 		});
 		log?.(signedRequest);
-		response = await fetch(signedRequest, {
-			redirect: "manual",
-			signal
-		});
+		response = await fetchDoubleKnockRequest(request, signedRequest, signal);
 		if (response.status >= 300 && response.status < 400 && response.headers.has("Location")) {
 			if (redirected >= maximumRedirection) throw new FetchError(request.url, `Too many redirections (${redirected + 1})`);
 			const redirectRequest = createRedirectRequest(request, response.headers.get("Location"), body);

package/dist/{http-CrGuipxe.d.cts → http-BDZeS5om.d.ts}

@@ -1,6 +1,7 @@
+/// <reference lib="esnext.temporal" />
 import { CryptographicKey, Multikey } from "@fedify/vocab";
-import { DocumentLoader } from "@fedify/vocab-runtime";
 import { TracerProvider } from "@opentelemetry/api";
+import { DocumentLoader } from "@fedify/vocab-runtime";
 
 //#region src/sig/key.d.ts
 /**