@fedify/fedify 2.0.0-dev.1641 → 2.0.0-dev.166

package/dist/{middleware-LyCG_YVM.cjs → middleware-CvNusBTn.cjs}

@@ -3,23 +3,21 @@
           const { URLPattern } = require("urlpattern-polyfill");
         
 const require_chunk = require('./chunk-DqRYRqnO.cjs');
-const require_transformers = require('./transformers-CoBS-oFG.cjs');
-const require_docloader = require('./docloader-kae6M-GI.cjs');
-const require_actor = require('./actor-CP03csrm.cjs');
-const require_lookup = require('./lookup-QHjmy4Og.cjs');
-const require_key = require('./key-HqzOCwDc.cjs');
-const require_http = require('./http-ZhcoaYEa.cjs');
-const require_proof = require('./proof-2Gcor0_N.cjs');
-const require_types = require('./types-Bqt2EgP0.cjs');
-const require_authdocloader = require('./authdocloader-BnsFSERg.cjs');
-const require_vocab = require('./vocab-B0-5a8pw.cjs');
+const require_transformers = require('./transformers-BjBg6Lag.cjs');
+const require_http = require('./http-DfyrqzT4.cjs');
+const require_proof = require('./proof-CJZ5gNjq.cjs');
+const require_types = require('./types-B6z6CqIz.cjs');
+const require_kv_cache = require('./kv-cache-Cerg94jw.cjs');
 const __logtape_logtape = require_chunk.__toESM(require("@logtape/logtape"));
+const __fedify_vocab = require_chunk.__toESM(require("@fedify/vocab"));
 const __opentelemetry_api = require_chunk.__toESM(require("@opentelemetry/api"));
-const byte_encodings_hex = require_chunk.__toESM(require("byte-encodings/hex"));
 const es_toolkit = require_chunk.__toESM(require("es-toolkit"));
 const uri_template_router = require_chunk.__toESM(require("uri-template-router"));
 const url_template = require_chunk.__toESM(require("url-template"));
+const byte_encodings_hex = require_chunk.__toESM(require("byte-encodings/hex"));
 const __opentelemetry_semantic_conventions = require_chunk.__toESM(require("@opentelemetry/semantic-conventions"));
+const __fedify_vocab_runtime = require_chunk.__toESM(require("@fedify/vocab-runtime"));
+const __fedify_webfinger = require_chunk.__toESM(require("@fedify/webfinger"));
 const node_url = require_chunk.__toESM(require("node:url"));
 
 //#region src/federation/inbox.ts
@@ -43,7 +41,7 @@ var InboxListenerSet = class InboxListenerSet {
 		if (inboxListeners == null) return null;
 		while (true) {
 			if (inboxListeners.has(cls)) break;
-			if (cls === require_actor.Activity) return null;
+			if (cls === __fedify_vocab.Activity) return null;
 			cls = globalThis.Object.getPrototypeOf(cls);
 		}
 		const listener = inboxListeners.get(cls);
@@ -56,17 +54,34 @@ var InboxListenerSet = class InboxListenerSet {
 		return this.dispatchWithClass(activity)?.listener ?? null;
 	}
 };
-async function routeActivity({ context: ctx, json, activity, recipient, inboxListeners, inboxContextFactory, inboxErrorHandler, kv, kvPrefixes, queue, span, tracerProvider }) {
+async function routeActivity({ context: ctx, json, activity, recipient, inboxListeners, inboxContextFactory, inboxErrorHandler, kv, kvPrefixes, queue, span, tracerProvider, idempotencyStrategy }) {
 	const logger$1 = (0, __logtape_logtape.getLogger)([
 		"fedify",
 		"federation",
 		"inbox"
 	]);
-	const cacheKey = activity.id == null ? null : [
-		...kvPrefixes.activityIdempotence,
-		ctx.origin,
-		activity.id.href
-	];
+	let cacheKey = null;
+	if (activity.id != null) {
+		const inboxContext = inboxContextFactory(recipient, json, activity.id?.href, (0, __fedify_vocab.getTypeId)(activity).href);
+		const strategy = idempotencyStrategy ?? "per-inbox";
+		let keyString;
+		if (typeof strategy === "function") {
+			const result = await strategy(inboxContext, activity);
+			keyString = result;
+		} else switch (strategy) {
+			case "global":
+				keyString = activity.id.href;
+				break;
+			case "per-origin":
+				keyString = `${ctx.origin}\n${activity.id.href}`;
+				break;
+			case "per-inbox":
+				keyString = `${ctx.origin}\n${activity.id.href}\n${recipient == null ? "sharedInbox" : `inbox\n${recipient}`}`;
+				break;
+			default: keyString = `${ctx.origin}\n${activity.id.href}`;
+		}
+		if (keyString != null) cacheKey = [...kvPrefixes.activityIdempotence, keyString];
+	}
 	if (cacheKey != null) {
 		const cached = await kv.get(cacheKey);
 		if (cached === true) {
@@ -126,7 +141,7 @@ async function routeActivity({ context: ctx, json, activity, recipient, inboxLis
 		return "enqueued";
 	}
 	tracerProvider = tracerProvider ?? __opentelemetry_api.trace.getTracerProvider();
-	const tracer = tracerProvider.getTracer(require_docloader.deno_default.name, require_docloader.deno_default.version);
+	const tracer = tracerProvider.getTracer(require_http.deno_default.name, require_http.deno_default.version);
 	return await tracer.startActiveSpan("activitypub.dispatch_inbox_listener", { kind: __opentelemetry_api.SpanKind.INTERNAL }, async (span$1) => {
 		const dispatched = inboxListeners?.dispatchWithClass(activity);
 		if (dispatched == null) {
@@ -136,7 +151,7 @@ async function routeActivity({ context: ctx, json, activity, recipient, inboxLis
 			});
 			span$1.setStatus({
 				code: __opentelemetry_api.SpanStatusCode.UNSET,
-				message: `Unsupported activity type: ${require_actor.getTypeId(activity).href}`
+				message: `Unsupported activity type: ${(0, __fedify_vocab.getTypeId)(activity).href}`
 			});
 			span$1.end();
 			return "unsupportedActivity";
@@ -144,7 +159,7 @@ async function routeActivity({ context: ctx, json, activity, recipient, inboxLis
 		const { class: cls, listener } = dispatched;
 		span$1.updateName(`activitypub.dispatch_inbox_listener ${cls.name}`);
 		try {
-			await listener(inboxContextFactory(recipient, json, activity?.id?.href, require_actor.getTypeId(activity).href), activity);
+			await listener(inboxContextFactory(recipient, json, activity?.id?.href, (0, __fedify_vocab.getTypeId)(activity).href), activity);
 		} catch (error) {
 			try {
 				await inboxErrorHandler?.(ctx, error);
@@ -308,6 +323,7 @@ var FederationBuilderImpl = class {
 	inboxListeners;
 	inboxErrorHandler;
 	sharedInboxKeyDispatcher;
+	idempotencyStrategy;
 	collectionTypeIds;
 	collectionCallbacks;
 	/**
@@ -322,7 +338,7 @@ var FederationBuilderImpl = class {
 		this.collectionTypeIds = {};
 	}
 	async build(options) {
-		const { FederationImpl: FederationImpl$1 } = await Promise.resolve().then(() => require("./middleware-oYqSU5ky.cjs"));
+		const { FederationImpl: FederationImpl$1 } = await Promise.resolve().then(() => require("./middleware-TgcMW8QT.cjs"));
 		const f = new FederationImpl$1(options);
 		const trailingSlashInsensitiveValue = f.router.trailingSlashInsensitive;
 		f.router = this.router.clone();
@@ -344,10 +360,11 @@ var FederationBuilderImpl = class {
 		f.inboxListeners = this.inboxListeners?.clone();
 		f.inboxErrorHandler = this.inboxErrorHandler;
 		f.sharedInboxKeyDispatcher = this.sharedInboxKeyDispatcher;
+		f.idempotencyStrategy = this.idempotencyStrategy;
 		return f;
 	}
 	_getTracer() {
-		return __opentelemetry_api.trace.getTracer(require_docloader.deno_default.name, require_docloader.deno_default.version);
+		return __opentelemetry_api.trace.getTracer(require_http.deno_default.name, require_http.deno_default.version);
 	}
 	setActorDispatcher(path, dispatcher) {
 		if (this.router.has("actor")) throw new RouterError("Actor dispatcher already set.");
@@ -367,7 +384,7 @@ var FederationBuilderImpl = class {
 					const actor$1 = await dispatcher(context$2, identifier);
 					span.setAttribute("activitypub.actor.id", (actor$1?.id ?? context$2.getActorUri(identifier)).href);
 					if (actor$1 == null) span.setStatus({ code: __opentelemetry_api.SpanStatusCode.ERROR });
-					else span.setAttribute("activitypub.actor.type", require_actor.getTypeId(actor$1).href);
+					else span.setAttribute("activitypub.actor.type", (0, __fedify_vocab.getTypeId)(actor$1).href);
 					return actor$1;
 				} catch (error) {
 					span.setStatus({
@@ -490,7 +507,7 @@ var FederationBuilderImpl = class {
 						const object = await dispatcher(ctx, values);
 						span.setAttribute("activitypub.object.id", (object?.id ?? ctx.getObjectUri(cls, values)).href);
 						if (object == null) span.setStatus({ code: __opentelemetry_api.SpanStatusCode.ERROR });
-						else span.setAttribute("activitypub.object.type", require_actor.getTypeId(object).href);
+						else span.setAttribute("activitypub.object.type", (0, __fedify_vocab.getTypeId)(object).href);
 						return object;
 					} catch (e) {
 						span.setStatus({
@@ -766,15 +783,19 @@ var FederationBuilderImpl = class {
 			setSharedKeyDispatcher: (dispatcher) => {
 				this.sharedInboxKeyDispatcher = dispatcher;
 				return setters;
+			},
+			withIdempotency: (strategy) => {
+				this.idempotencyStrategy = strategy;
+				return setters;
 			}
 		};
 		return setters;
 	}
-	setCollectionDispatcher(name, ...args) {
-		return this.#setCustomCollectionDispatcher(name, "collection", ...args);
+	setCollectionDispatcher(name, itemType, path, dispatcher) {
+		return this.#setCustomCollectionDispatcher(name, "collection", itemType, path, dispatcher);
 	}
-	setOrderedCollectionDispatcher(name, ...args) {
-		return this.#setCustomCollectionDispatcher(name, "orderedCollection", ...args);
+	setOrderedCollectionDispatcher(name, itemType, path, dispatcher) {
+		return this.#setCustomCollectionDispatcher(name, "orderedCollection", itemType, path, dispatcher);
 	}
 	#setCustomCollectionDispatcher(name, collectionType, itemType, path, dispatcher) {
 		const strName = String(name);
@@ -901,10 +922,10 @@ var KvKeyCache = class {
 		const serialized = await this.kv.get([...this.prefix, keyId.href]);
 		if (serialized == null) return void 0;
 		try {
-			return await require_actor.CryptographicKey.fromJsonLd(serialized, this.options);
+			return await __fedify_vocab.CryptographicKey.fromJsonLd(serialized, this.options);
 		} catch {
 			try {
-				return await require_actor.Multikey.fromJsonLd(serialized, this.options);
+				return await __fedify_vocab.Multikey.fromJsonLd(serialized, this.options);
 			} catch {
 				await this.kv.delete([...this.prefix, keyId.href]);
 				return void 0;
@@ -980,9 +1001,6 @@ function preferredMediaTypes(accept) {
 	const accepts = parseAccept(accept === void 0 ? "*/*" : accept ?? "");
 	return accepts.filter(isQuality).sort(compareSpecs).map(getFullType);
 }
-
-//#endregion
-//#region src/federation/handler.ts
 function acceptsJsonLd(request) {
 	const accept = request.headers.get("Accept");
 	const types = accept ? preferredMediaTypes(accept) : ["*/*"];
@@ -990,6 +1008,9 @@ function acceptsJsonLd(request) {
 	if (types[0] === "text/html" || types[0] === "application/xhtml+xml") return false;
 	return types.includes("application/activity+json") || types.includes("application/ld+json") || types.includes("application/json");
 }
+
+//#endregion
+//#region src/federation/handler.ts
 /**
 * Handles an actor request.
 * @template TContextData The context data to pass to the context.
@@ -997,7 +1018,7 @@ function acceptsJsonLd(request) {
 * @param parameters The parameters for handling the actor.
 * @returns A promise that resolves to an HTTP response.
 */
-async function handleActor(request, { identifier, context: context$2, actorDispatcher, authorizePredicate, onNotFound, onNotAcceptable, onUnauthorized }) {
+async function handleActor(request, { identifier, context: context$2, actorDispatcher, authorizePredicate, onNotFound, onUnauthorized }) {
 	const logger$1 = (0, __logtape_logtape.getLogger)([
 		"fedify",
 		"federation",
@@ -1012,7 +1033,6 @@ async function handleActor(request, { identifier, context: context$2, actorDispa
 		logger$1.debug("Actor {identifier} not found.", { identifier });
 		return await onNotFound(request);
 	}
-	if (!acceptsJsonLd(request)) return await onNotAcceptable(request);
 	if (authorizePredicate != null) {
 		let key = await context$2.getSignedKey();
 		key = key?.clone({}, { $warning: {
@@ -1047,11 +1067,10 @@ async function handleActor(request, { identifier, context: context$2, actorDispa
 * @param parameters The parameters for handling the object.
 * @returns A promise that resolves to an HTTP response.
 */
-async function handleObject(request, { values, context: context$2, objectDispatcher, authorizePredicate, onNotFound, onNotAcceptable, onUnauthorized }) {
+async function handleObject(request, { values, context: context$2, objectDispatcher, authorizePredicate, onNotFound, onUnauthorized }) {
 	if (objectDispatcher == null) return await onNotFound(request);
 	const object = await objectDispatcher(context$2, values);
 	if (object == null) return await onNotFound(request);
-	if (!acceptsJsonLd(request)) return await onNotAcceptable(request);
 	if (authorizePredicate != null) {
 		let key = await context$2.getSignedKey();
 		key = key?.clone({}, { $warning: {
@@ -1089,10 +1108,10 @@ async function handleObject(request, { values, context: context$2, objectDispatc
 * @param parameters The parameters for handling the collection.
 * @returns A promise that resolves to an HTTP response.
 */
-async function handleCollection(request, { name, identifier, uriGetter, filter, filterPredicate, context: context$2, collectionCallbacks, tracerProvider, onUnauthorized, onNotFound, onNotAcceptable }) {
+async function handleCollection(request, { name, identifier, uriGetter, filter, filterPredicate, context: context$2, collectionCallbacks, tracerProvider, onUnauthorized, onNotFound }) {
 	const spanName = name.trim().replace(/\s+/g, "_");
 	tracerProvider = tracerProvider ?? __opentelemetry_api.trace.getTracerProvider();
-	const tracer = tracerProvider.getTracer(require_docloader.deno_default.name, require_docloader.deno_default.version);
+	const tracer = tracerProvider.getTracer(require_http.deno_default.name, require_http.deno_default.version);
 	const url = new URL(request.url);
 	const cursor = url.searchParams.get("cursor");
 	if (collectionCallbacks == null) return await onNotFound(request);
@@ -1106,7 +1125,7 @@ async function handleCollection(request, { name, identifier, uriGetter, filter,
 				kind: __opentelemetry_api.SpanKind.SERVER,
 				attributes: {
 					"activitypub.collection.id": baseUri.href,
-					"activitypub.collection.type": require_actor.OrderedCollection.typeId.href
+					"activitypub.collection.type": __fedify_vocab.OrderedCollection.typeId.href
 				}
 			}, async (span) => {
 				if (totalItems != null) span.setAttribute("activitypub.collection.total_items", Number(totalItems));
@@ -1130,7 +1149,7 @@ async function handleCollection(request, { name, identifier, uriGetter, filter,
 				}
 			});
 			if (itemsOrResponse instanceof Response) return itemsOrResponse;
-			collection = new require_actor.OrderedCollection({
+			collection = new __fedify_vocab.OrderedCollection({
 				id: baseUri,
 				totalItems: totalItems == null ? null : Number(totalItems),
 				items: filterCollectionItems(itemsOrResponse, name, filterPredicate)
@@ -1144,7 +1163,7 @@ async function handleCollection(request, { name, identifier, uriGetter, filter,
 				last = new URL(context$2.url);
 				last.searchParams.set("cursor", lastCursor);
 			}
-			collection = new require_actor.OrderedCollection({
+			collection = new __fedify_vocab.OrderedCollection({
 				id: baseUri,
 				totalItems: totalItems == null ? null : Number(totalItems),
 				first,
@@ -1158,7 +1177,7 @@ async function handleCollection(request, { name, identifier, uriGetter, filter,
 			kind: __opentelemetry_api.SpanKind.SERVER,
 			attributes: {
 				"activitypub.collection.id": uri.href,
-				"activitypub.collection.type": require_actor.OrderedCollectionPage.typeId.href,
+				"activitypub.collection.type": __fedify_vocab.OrderedCollectionPage.typeId.href,
 				"fedify.collection.cursor": cursor
 			}
 		}, async (span) => {
@@ -1194,7 +1213,7 @@ async function handleCollection(request, { name, identifier, uriGetter, filter,
 		}
 		const partOf = new URL(context$2.url);
 		partOf.searchParams.delete("cursor");
-		collection = new require_actor.OrderedCollectionPage({
+		collection = new __fedify_vocab.OrderedCollectionPage({
 			id: uri,
 			prev,
 			next,
@@ -1202,7 +1221,6 @@ async function handleCollection(request, { name, identifier, uriGetter, filter,
 			partOf
 		});
 	}
-	if (!acceptsJsonLd(request)) return await onNotAcceptable(request);
 	if (collectionCallbacks.authorizePredicate != null) {
 		let key = await context$2.getSignedKey();
 		key = key?.clone({}, { $warning: {
@@ -1243,7 +1261,7 @@ function filterCollectionItems(items, collectionName, filterPredicate) {
 	let logged = false;
 	for (const item of items) {
 		let mappedItem;
-		if (item instanceof require_actor.Object || item instanceof require_actor.Link || item instanceof URL) mappedItem = item;
+		if (item instanceof __fedify_vocab.Object || item instanceof __fedify_vocab.Link || item instanceof URL) mappedItem = item;
 		else if (item.id == null) continue;
 		else mappedItem = item.id;
 		if (filterPredicate != null && !filterPredicate(item)) {
@@ -1270,7 +1288,7 @@ function filterCollectionItems(items, collectionName, filterPredicate) {
 */
 async function handleInbox(request, options) {
 	const tracerProvider = options.tracerProvider ?? __opentelemetry_api.trace.getTracerProvider();
-	const tracer = tracerProvider.getTracer(require_docloader.deno_default.name, require_docloader.deno_default.version);
+	const tracer = tracerProvider.getTracer(require_http.deno_default.name, require_http.deno_default.version);
 	return await tracer.startActiveSpan("activitypub.inbox", {
 		kind: options.queue == null ? __opentelemetry_api.SpanKind.SERVER : __opentelemetry_api.SpanKind.PRODUCER,
 		attributes: { "activitypub.shared_inbox": options.recipient == null }
@@ -1297,7 +1315,8 @@ async function handleInbox(request, options) {
 * @param span The OpenTelemetry span for tracing.
 * @returns A promise that resolves to an HTTP response.
 */
-async function handleInboxInternal(request, { recipient, context: ctx, inboxContextFactory, kv, kvPrefixes, queue, actorDispatcher, inboxListeners, inboxErrorHandler, onNotFound, signatureTimeWindow, skipSignatureVerification, tracerProvider }, span) {
+async function handleInboxInternal(request, parameters, span) {
+	const { recipient, context: ctx, inboxContextFactory, kv, kvPrefixes, queue, actorDispatcher, inboxListeners, inboxErrorHandler, onNotFound, signatureTimeWindow, skipSignatureVerification, tracerProvider } = parameters;
 	const logger$1 = (0, __logtape_logtape.getLogger)([
 		"fedify",
 		"federation",
@@ -1397,14 +1416,14 @@ async function handleInboxInternal(request, { recipient, context: ctx, inboxCont
 			recipient,
 			json
 		});
-		activity = await require_actor.Activity.fromJsonLd(jsonWithoutSig, ctx);
+		activity = await __fedify_vocab.Activity.fromJsonLd(jsonWithoutSig, ctx);
 	} else {
 		logger$1.debug("Linked Data Signatures are not verified.", {
 			recipient,
 			json
 		});
 		try {
-			activity = await require_proof.verifyObject(require_actor.Activity, jsonWithoutSig, {
+			activity = await require_proof.verifyObject(__fedify_vocab.Activity, jsonWithoutSig, {
 				contextLoader: ctx.contextLoader,
 				documentLoader: ctx.documentLoader,
 				keyCache,
@@ -1467,10 +1486,17 @@ async function handleInboxInternal(request, { recipient, context: ctx, inboxCont
 			} else logger$1.debug("HTTP Signatures are verified.", { recipient });
 			httpSigKey = key;
 		}
-		activity = await require_actor.Activity.fromJsonLd(jsonWithoutSig, ctx);
+		activity = await __fedify_vocab.Activity.fromJsonLd(jsonWithoutSig, ctx);
 	}
 	if (activity.id != null) span.setAttribute("activitypub.activity.id", activity.id.href);
-	span.setAttribute("activitypub.activity.type", require_actor.getTypeId(activity).href);
+	span.setAttribute("activitypub.activity.type", (0, __fedify_vocab.getTypeId)(activity).href);
+	span.addEvent("activitypub.activity.received", {
+		"activitypub.activity.json": JSON.stringify(json),
+		"activitypub.activity.verified": activity != null,
+		"ld_signatures.verified": ldSigVerified,
+		"http_signatures.verified": httpSigKey != null,
+		"http_signatures.key_id": httpSigKey?.id?.href ?? ""
+	});
 	if (httpSigKey != null && !await require_proof.doesActorOwnKey(activity, httpSigKey, ctx)) {
 		logger$1.error("The signer ({keyId}) and the actor ({actorId}) do not match.", {
 			activity: json,
@@ -1499,7 +1525,8 @@ async function handleInboxInternal(request, { recipient, context: ctx, inboxCont
 		kvPrefixes,
 		queue,
 		span,
-		tracerProvider
+		tracerProvider,
+		idempotencyStrategy: parameters.idempotencyStrategy
 	});
 	if (routeResult === "alreadyProcessed") return new Response(`Activity <${activity.id}> has already been processed.`, {
 		status: 202,
@@ -1529,7 +1556,7 @@ async function handleInboxInternal(request, { recipient, context: ctx, inboxCont
 /**
 * Handles a custom collection request.
 * @template TItem The type of items in the collection.
-* @template TParams The parameter names of the requested URL.
+* @template TParam The parameter names of the requested URL.
 * @template TContext The type of the context, extending {@link RequestContext}.
 * @template TContextData The context data to pass to the `TContext`.
 * @param request The HTTP request.
@@ -1540,15 +1567,14 @@ async function handleInboxInternal(request, { recipient, context: ctx, inboxCont
 const handleCustomCollection = exceptWrapper(_handleCustomCollection);
 async function _handleCustomCollection(request, { name, values, context: context$2, tracerProvider, collectionCallbacks: callbacks, filterPredicate }) {
 	verifyDefined(callbacks);
-	verifyJsonLdRequest(request);
 	await authIfNeeded(context$2, values, callbacks);
 	const cursor = new URL(request.url).searchParams.get("cursor");
-	return await new CustomCollectionHandler(name, values, context$2, callbacks, tracerProvider, require_actor.Collection, require_actor.CollectionPage, filterPredicate).fetchCollection(cursor).toJsonLd().then(respondAsActivity);
+	return await new CustomCollectionHandler(name, values, context$2, callbacks, tracerProvider, __fedify_vocab.Collection, __fedify_vocab.CollectionPage, filterPredicate).fetchCollection(cursor).toJsonLd().then(respondAsActivity);
 }
 /**
 * Handles an ordered collection request.
 * @template TItem The type of items in the collection.
-* @template TParams The parameter names of the requested URL.
+* @template TParam The parameter names of the requested URL.
 * @template TContext The type of the context, extending {@link RequestContext}.
 * @template TContextData The context data to pass to the `TContext`.
 * @param request The HTTP request.
@@ -1559,17 +1585,16 @@ async function _handleCustomCollection(request, { name, values, context: context
 const handleOrderedCollection = exceptWrapper(_handleOrderedCollection);
 async function _handleOrderedCollection(request, { name, values, context: context$2, tracerProvider, collectionCallbacks: callbacks, filterPredicate }) {
 	verifyDefined(callbacks);
-	verifyJsonLdRequest(request);
 	await authIfNeeded(context$2, values, callbacks);
 	const cursor = new URL(request.url).searchParams.get("cursor");
-	return await new CustomCollectionHandler(name, values, context$2, callbacks, tracerProvider, require_actor.OrderedCollection, require_actor.OrderedCollectionPage, filterPredicate).fetchCollection(cursor).toJsonLd().then(respondAsActivity);
+	return await new CustomCollectionHandler(name, values, context$2, callbacks, tracerProvider, __fedify_vocab.OrderedCollection, __fedify_vocab.OrderedCollectionPage, filterPredicate).fetchCollection(cursor).toJsonLd().then(respondAsActivity);
 }
 /**
 * Handling custom collections with support for pagination and filtering.
 * The main flow is on `getCollection`, `dispatch`.
 *
 * @template TItem The type of items in the collection.
-* @template TParams The parameter names of the requested URL.
+* @template TParam The parameter names of the requested URL.
 * @template TContext The type of the context. {@link Context} or {@link RequestContext}.
 * @template TContextData The context data to pass to the `TContext`.
 * @template TCollection The type of the collection, extending {@link Collection}.
@@ -1603,14 +1628,14 @@ var CustomCollectionHandler = class {
 	#collection = null;
 	/**
 	* Creates a new CustomCollection instance.
-	* @param {string} name The name of the collection.
-	* @param {TParams} values The parameter values for the collection.
-	* @param {TContext} context The request context.
-	* @param {CustomCollectionCallbacks} callbacks The collection callbacks.
-	* @param {TracerProvider} tracerProvider The tracer provider for telemetry.
-	* @param {ConstructorWithTypeId<TCollection>} Collection The Collection constructor.
-	* @param {ConstructorWithTypeId<TCollectionPage>} CollectionPage The CollectionPage constructor.
-	* @param {(item: TItem) => boolean} filterPredicate Optional filter predicate for items.
+	* @param name The name of the collection.
+	* @param values The parameter values for the collection.
+	* @param context The request context.
+	* @param callbacks The collection callbacks.
+	* @param tracerProvider The tracer provider for telemetry.
+	* @param Collection The Collection constructor.
+	* @param CollectionPage The CollectionPage constructor.
+	* @param filterPredicate Optional filter predicate for items.
 	*/
 	constructor(name, values, context$2, callbacks, tracerProvider = __opentelemetry_api.trace.getTracerProvider(), Collection$1, CollectionPage$1, filterPredicate) {
 		this.name = name;
@@ -1622,7 +1647,7 @@ var CustomCollectionHandler = class {
 		this.CollectionPage = CollectionPage$1;
 		this.filterPredicate = filterPredicate;
 		this.name = this.name.trim().replace(/\s+/g, "_");
-		this.#tracer = this.tracerProvider.getTracer(require_docloader.deno_default.name, require_docloader.deno_default.version);
+		this.#tracer = this.tracerProvider.getTracer(require_http.deno_default.name, require_http.deno_default.version);
 		this.#id = new URL(this.context.url);
 		this.#dispatcher = callbacks.dispatcher.bind(callbacks);
 	}
@@ -1735,7 +1760,7 @@ var CustomCollectionHandler = class {
 	/**
 	* Creates a function to wrap the dispatcher so tracing can be applied.
 	* @param params Parameters including cursor and total items.
-	* @returns {(span: Span) => Promise<PageItems<TItem>>} A function that handles the span operation.
+	* @returns A function that handles the span operation.
 	*/
 	spanPages = ({ totalItems = null, cursor = null }) => async (span) => {
 		try {
@@ -1756,23 +1781,23 @@ var CustomCollectionHandler = class {
 	};
 	/**
 	* Dispatches the collection request to get items.
-	* @param {string | null} cursor The cursor for pagination, or null for the first page.
-	* @returns {Promise<PageItems<TItem>>} A promise that resolves to the page items.
+	* @param cursor The cursor for pagination, or null for the first page.
+	* @returns A promise that resolves to the page items.
 	*/
 	async dispatch(cursor = null) {
 		return await this.#dispatcher(this.context, this.values, cursor) ?? new ItemsNotFoundError().throw();
 	}
 	/**
 	* Filters the items in the collection.
-	* @param {TItem[]} items The items to filter.
-	* @returns {(Object | Link | URL)[]} The filtered items.
+	* @param items The items to filter.
+	* @returns The filtered items.
 	*/
 	filterItems(items) {
 		return filterCollectionItems(items, this.name, this.filterPredicate);
 	}
 	/**
 	* Appends a cursor to the URL if it exists.
-	* @param {string | null | undefined} cursor The cursor to append, or null/undefined.
+	* @param cursor The cursor to append, or null/undefined.
 	* @returns The URL with cursor appended, or null if cursor is null/undefined.
 	*/
 	appendToUrl(cursor) {
@@ -1780,8 +1805,7 @@ var CustomCollectionHandler = class {
 	}
 	/**
 	* Gets the stored collection or collection page.
-	* @returns {Promise<TCollection | TCollectionPage>} A promise that resolves to
-	the collection or collection page.
+	* @returns A promise that resolves to the collection or collection page.
 	*/
 	get collection() {
 		if (this.#collection === null) this.#collection = this.getCollection();
@@ -1789,8 +1813,8 @@ var CustomCollectionHandler = class {
 	}
 	/**
 	* Gets the total number of items in the collection.
-	* @returns {Promise<number | null>} A promise that
-	resolves to the total items count, or null if not available.
+	* @returns A promise that resolves to the total items count,
+	*          or null if not available.
 	*/
 	get totalItems() {
 		if (this.#totalItems === void 0) this.totalItems = this.callbacks.counter?.(this.context, this.values);
@@ -1806,8 +1830,8 @@ var CustomCollectionHandler = class {
 	}
 	/**
 	* Gets the first cursor for pagination.
-	* @returns {Promise<string | null>} A promise that resolves to the first cursor,
-	or null if not available.
+	* @returns A promise that resolves to the first cursor,
+	*          or null if not available.
 	*/
 	get firstCursor() {
 		const cursor = this.callbacks.firstCursor?.(this.context, this.values);
@@ -1837,10 +1861,9 @@ function exceptWrapper(handler) {
 		try {
 			return await handler(request, handlerParams);
 		} catch (error) {
-			const { onNotFound, onNotAcceptable, onUnauthorized } = handlerParams;
+			const { onNotFound, onUnauthorized } = handlerParams;
 			switch (error?.constructor) {
 				case ItemsNotFoundError: return await onNotFound(request);
-				case NotAcceptableError: return await onNotAcceptable(request);
 				case UnauthorizedError: return await onUnauthorized(request);
 				default: throw error;
 			}
@@ -1858,15 +1881,6 @@ const verifyDefined = (callbacks) => {
 	if (callbacks === void 0) throw new ItemsNotFoundError();
 };
 /**
-* Verifies that a request accepts JSON-LD content type.
-* @param request The HTTP request to verify.
-* @throws {NotAcceptableError} If the request doesn't accept JSON-LD.
-* @since 1.8.0
-*/
-const verifyJsonLdRequest = (request) => {
-	if (!acceptsJsonLd(request)) throw new NotAcceptableError();
-};
-/**
 * Performs authorization if needed based on the authorization predicate.
 * @template TContextData The context data type.
 * @param {RequestContext<TContextData>} context The request context.
@@ -1950,15 +1964,6 @@ var ItemsNotFoundError = class extends HandlerError {
 	}
 };
 /**
-* Error thrown when the request is not acceptable (e.g., wrong content type).
-* @since 1.8.0
-*/
-var NotAcceptableError = class extends HandlerError {
-	constructor() {
-		super("The request is not acceptable.");
-	}
-};
-/**
 * Error thrown when access to a collection is unauthorized.
 * @since 1.8.0
 */
@@ -2032,139 +2037,6 @@ function handleNodeInfoJrd(_request, context$2) {
 	return Promise.resolve(response);
 }
 
-//#endregion
-//#region src/webfinger/handler.ts
-const logger = (0, __logtape_logtape.getLogger)([
-	"fedify",
-	"webfinger",
-	"server"
-]);
-/**
-* Handles a WebFinger request.  You would not typically call this function
-* directly, but instead use {@link Federation.fetch} method.
-* @param request The WebFinger request to handle.
-* @param parameters The parameters for handling the request.
-* @returns The response to the request.
-*/
-async function handleWebFinger(request, options) {
-	if (options.tracer == null) return await handleWebFingerInternal(request, options);
-	return await options.tracer.startActiveSpan("webfinger.handle", { kind: __opentelemetry_api.SpanKind.SERVER }, async (span) => {
-		try {
-			const response = await handleWebFingerInternal(request, options);
-			span.setStatus({ code: response.ok ? __opentelemetry_api.SpanStatusCode.UNSET : __opentelemetry_api.SpanStatusCode.ERROR });
-			return response;
-		} catch (error) {
-			span.setStatus({
-				code: __opentelemetry_api.SpanStatusCode.ERROR,
-				message: String(error)
-			});
-			throw error;
-		} finally {
-			span.end();
-		}
-	});
-}
-async function handleWebFingerInternal(request, { context: context$2, host, actorDispatcher, actorHandleMapper, actorAliasMapper, onNotFound, span, webFingerLinksDispatcher }) {
-	if (actorDispatcher == null) {
-		logger.error("Actor dispatcher is not set.");
-		return await onNotFound(request);
-	}
-	const resource = context$2.url.searchParams.get("resource");
-	if (resource == null) return new Response("Missing resource parameter.", { status: 400 });
-	span?.setAttribute("webfinger.resource", resource);
-	let resourceUrl;
-	try {
-		resourceUrl = new URL(resource);
-	} catch (e) {
-		if (e instanceof TypeError) return new Response("Invalid resource URL.", { status: 400 });
-		throw e;
-	}
-	span?.setAttribute("webfinger.resource.scheme", resourceUrl.protocol.replace(/:$/, ""));
-	async function mapUsernameToIdentifier(username) {
-		if (actorHandleMapper == null) {
-			logger.error("No actor handle mapper is set; use the WebFinger username {username} as the actor's internal identifier.", { username });
-			return username;
-		}
-		const identifier$1 = await actorHandleMapper(context$2, username);
-		if (identifier$1 == null) {
-			logger.error("Actor {username} not found.", { username });
-			return null;
-		}
-		return identifier$1;
-	}
-	let identifier = null;
-	const uriParsed = context$2.parseUri(resourceUrl);
-	if (uriParsed?.type != "actor") {
-		const match = /^acct:([^@]+)@([^@]+)$/.exec(resource);
-		if (match == null) {
-			const result = await actorAliasMapper?.(context$2, resourceUrl);
-			if (result == null) return await onNotFound(request);
-			if ("identifier" in result) identifier = result.identifier;
-			else identifier = await mapUsernameToIdentifier(result.username);
-		} else {
-			const portMatch = /:\d+$/.exec(match[2]);
-			const normalizedHost = portMatch == null ? (0, node_url.domainToASCII)(match[2].toLowerCase()) : (0, node_url.domainToASCII)(match[2].substring(0, portMatch.index).toLowerCase()) + portMatch[0];
-			if (normalizedHost != context$2.url.host && normalizedHost != host) return await onNotFound(request);
-			else {
-				identifier = await mapUsernameToIdentifier(match[1]);
-				resourceUrl = new URL(`acct:${match[1]}@${normalizedHost}`);
-			}
-		}
-	} else identifier = uriParsed.identifier;
-	if (identifier == null) return await onNotFound(request);
-	const actor = await actorDispatcher(context$2, identifier);
-	if (actor == null) {
-		logger.error("Actor {identifier} not found.", { identifier });
-		return await onNotFound(request);
-	}
-	const links = [{
-		rel: "self",
-		href: context$2.getActorUri(identifier).href,
-		type: "application/activity+json"
-	}];
-	for (const url of actor.urls) if (url instanceof require_actor.Link && url.href != null) links.push({
-		rel: url.rel ?? "http://webfinger.net/rel/profile-page",
-		href: url.href.href,
-		type: url.mediaType == null ? void 0 : url.mediaType
-	});
-	else if (url instanceof URL) links.push({
-		rel: "http://webfinger.net/rel/profile-page",
-		href: url.href
-	});
-	for await (const image of actor.getIcons()) {
-		if (image.url?.href == null) continue;
-		const link = {
-			rel: "http://webfinger.net/rel/avatar",
-			href: image.url.href.toString()
-		};
-		if (image.mediaType != null) link.type = image.mediaType;
-		links.push(link);
-	}
-	if (webFingerLinksDispatcher != null) {
-		const customLinks = await webFingerLinksDispatcher(context$2, resourceUrl);
-		if (customLinks != null) for (const link of customLinks) links.push(link);
-	}
-	const aliases = [];
-	if (resourceUrl.protocol != "acct:" && actor.preferredUsername != null) {
-		aliases.push(`acct:${actor.preferredUsername}@${host ?? context$2.url.host}`);
-		if (host != null && host !== context$2.url.host) aliases.push(`acct:${actor.preferredUsername}@${context$2.url.host}`);
-	}
-	if (resourceUrl.href !== context$2.getActorUri(identifier).href) aliases.push(context$2.getActorUri(identifier).href);
-	if (resourceUrl.protocol === "acct:" && host != null && host !== context$2.url.host && !resourceUrl.href.endsWith(`@${host}`)) {
-		const username = resourceUrl.href.replace(/^acct:/, "").replace(/@.*$/, "");
-		aliases.push(`acct:${username}@${host}`);
-	}
-	const jrd = {
-		subject: resourceUrl.href,
-		aliases,
-		links
-	};
-	return new Response(JSON.stringify(jrd), { headers: {
-		"Content-Type": "application/jrd+json",
-		"Access-Control-Allow-Origin": "*"
-	} });
-}
-
 //#endregion
 //#region src/federation/retry.ts
 /**
@@ -2233,7 +2105,7 @@ function extractInboxes({ recipients, preferSharedInbox, excludeBaseUris }) {
 */
 function sendActivity(options) {
 	const tracerProvider = options.tracerProvider ?? __opentelemetry_api.trace.getTracerProvider();
-	const tracer = tracerProvider.getTracer(require_docloader.deno_default.name, require_docloader.deno_default.version);
+	const tracer = tracerProvider.getTracer(require_http.deno_default.name, require_http.deno_default.version);
 	return tracer.startActiveSpan("activitypub.send_activity", {
 		kind: __opentelemetry_api.SpanKind.CLIENT,
 		attributes: { "activitypub.shared_inbox": options.sharedInbox ?? false }
@@ -2244,7 +2116,7 @@ function sendActivity(options) {
 			await sendActivityInternal({
 				...options,
 				tracerProvider
-			});
+			}, span);
 		} catch (e) {
 			span.setStatus({
 				code: __opentelemetry_api.SpanStatusCode.ERROR,
@@ -2256,7 +2128,7 @@ function sendActivity(options) {
 		}
 	});
 }
-async function sendActivityInternal({ activity, activityId, keys, inbox, headers, specDeterminer, tracerProvider }) {
+async function sendActivityInternal({ activity, activityId, keys, inbox, headers, specDeterminer, tracerProvider }, span) {
 	const logger$1 = (0, __logtape_logtape.getLogger)([
 		"fedify",
 		"federation",
@@ -2311,6 +2183,143 @@ async function sendActivityInternal({ activity, activityId, keys, inbox, headers
 		});
 		throw new Error(`Failed to send activity ${activityId} to ${inbox.href} (${response.status} ${response.statusText}):\n${error}`);
 	}
+	span.addEvent("activitypub.activity.sent", {
+		"activitypub.activity.json": JSON.stringify(activity),
+		"activitypub.inbox.url": inbox.href,
+		"activitypub.activity.id": activityId ?? ""
+	});
+}
+
+//#endregion
+//#region src/federation/webfinger.ts
+const logger = (0, __logtape_logtape.getLogger)([
+	"fedify",
+	"webfinger",
+	"server"
+]);
+/**
+* Handles a WebFinger request.  You would not typically call this function
+* directly, but instead use {@link Federation.fetch} method.
+* @param request The WebFinger request to handle.
+* @param parameters The parameters for handling the request.
+* @returns The response to the request.
+*/
+async function handleWebFinger(request, options) {
+	if (options.tracer == null) return await handleWebFingerInternal(request, options);
+	return await options.tracer.startActiveSpan("webfinger.handle", { kind: __opentelemetry_api.SpanKind.SERVER }, async (span) => {
+		try {
+			const response = await handleWebFingerInternal(request, options);
+			span.setStatus({ code: response.ok ? __opentelemetry_api.SpanStatusCode.UNSET : __opentelemetry_api.SpanStatusCode.ERROR });
+			return response;
+		} catch (error) {
+			span.setStatus({
+				code: __opentelemetry_api.SpanStatusCode.ERROR,
+				message: String(error)
+			});
+			throw error;
+		} finally {
+			span.end();
+		}
+	});
+}
+async function handleWebFingerInternal(request, { context: context$2, host, actorDispatcher, actorHandleMapper, actorAliasMapper, onNotFound, span, webFingerLinksDispatcher }) {
+	if (actorDispatcher == null) {
+		logger.error("Actor dispatcher is not set.");
+		return await onNotFound(request);
+	}
+	const resource = context$2.url.searchParams.get("resource");
+	if (resource == null) return new Response("Missing resource parameter.", { status: 400 });
+	span?.setAttribute("webfinger.resource", resource);
+	let resourceUrl;
+	try {
+		resourceUrl = new URL(resource);
+	} catch (e) {
+		if (e instanceof TypeError) return new Response("Invalid resource URL.", { status: 400 });
+		throw e;
+	}
+	span?.setAttribute("webfinger.resource.scheme", resourceUrl.protocol.replace(/:$/, ""));
+	async function mapUsernameToIdentifier(username) {
+		if (actorHandleMapper == null) {
+			logger.error("No actor handle mapper is set; use the WebFinger username {username} as the actor's internal identifier.", { username });
+			return username;
+		}
+		const identifier$1 = await actorHandleMapper(context$2, username);
+		if (identifier$1 == null) {
+			logger.error("Actor {username} not found.", { username });
+			return null;
+		}
+		return identifier$1;
+	}
+	let identifier = null;
+	const uriParsed = context$2.parseUri(resourceUrl);
+	if (uriParsed?.type != "actor") {
+		const match = /^acct:([^@]+)@([^@]+)$/.exec(resource);
+		if (match == null) {
+			const result = await actorAliasMapper?.(context$2, resourceUrl);
+			if (result == null) return await onNotFound(request);
+			if ("identifier" in result) identifier = result.identifier;
+			else identifier = await mapUsernameToIdentifier(result.username);
+		} else {
+			const portMatch = /:\d+$/.exec(match[2]);
+			const normalizedHost = portMatch == null ? (0, node_url.domainToASCII)(match[2].toLowerCase()) : (0, node_url.domainToASCII)(match[2].substring(0, portMatch.index).toLowerCase()) + portMatch[0];
+			if (normalizedHost != context$2.url.host && normalizedHost != host) return await onNotFound(request);
+			else {
+				identifier = await mapUsernameToIdentifier(match[1]);
+				resourceUrl = new URL(`acct:${match[1]}@${normalizedHost}`);
+			}
+		}
+	} else identifier = uriParsed.identifier;
+	if (identifier == null) return await onNotFound(request);
+	const actor = await actorDispatcher(context$2, identifier);
+	if (actor == null) {
+		logger.error("Actor {identifier} not found.", { identifier });
+		return await onNotFound(request);
+	}
+	const links = [{
+		rel: "self",
+		href: context$2.getActorUri(identifier).href,
+		type: "application/activity+json"
+	}];
+	for (const url of actor.urls) if (url instanceof __fedify_vocab.Link && url.href != null) links.push({
+		rel: url.rel ?? "http://webfinger.net/rel/profile-page",
+		href: url.href.href,
+		type: url.mediaType == null ? void 0 : url.mediaType
+	});
+	else if (url instanceof URL) links.push({
+		rel: "http://webfinger.net/rel/profile-page",
+		href: url.href
+	});
+	for await (const image of actor.getIcons()) {
+		if (image.url?.href == null) continue;
+		links.push({
+			rel: "http://webfinger.net/rel/avatar",
+			href: image.url.href.toString(),
+			...image.mediaType != null && { type: image.mediaType }
+		});
+	}
+	if (webFingerLinksDispatcher != null) {
+		const customLinks = await webFingerLinksDispatcher(context$2, resourceUrl);
+		if (customLinks != null) for (const link of customLinks) links.push(link);
+	}
+	const aliases = [];
+	if (resourceUrl.protocol != "acct:" && actor.preferredUsername != null) {
+		aliases.push(`acct:${actor.preferredUsername}@${host ?? context$2.url.host}`);
+		if (host != null && host !== context$2.url.host) aliases.push(`acct:${actor.preferredUsername}@${context$2.url.host}`);
+	}
+	if (resourceUrl.href !== context$2.getActorUri(identifier).href) aliases.push(context$2.getActorUri(identifier).href);
+	if (resourceUrl.protocol === "acct:" && host != null && host !== context$2.url.host && !resourceUrl.href.endsWith(`@${host}`)) {
+		const username = resourceUrl.href.replace(/^acct:/, "").replace(/@.*$/, "");
+		aliases.push(`acct:${username}@${host}`);
+	}
+	const jrd = {
+		subject: resourceUrl.href,
+		aliases,
+		links
+	};
+	return new Response(JSON.stringify(jrd), { headers: {
+		"Content-Type": "application/jrd+json",
+		"Access-Control-Allow-Origin": "*"
+	} });
 }
 
 //#endregion
@@ -2350,7 +2359,6 @@ var FederationImpl = class extends FederationBuilderImpl {
 	firstKnock;
 	constructor(options) {
 		super();
-		const logger$1 = (0, __logtape_logtape.getLogger)(["fedify", "federation"]);
 		this.kv = options.kv;
 		this.kvPrefixes = {
 			activityIdempotence: ["_fedify", "activityIdempotence"],
@@ -2398,14 +2406,15 @@ var FederationImpl = class extends FederationBuilderImpl {
 		this.router.trailingSlashInsensitive = options.trailingSlashInsensitive ?? false;
 		this._initializeRouter();
 		if (options.allowPrivateAddress || options.userAgent != null) {
-			if (options.contextLoader != null) throw new TypeError("Cannot set contextLoader with allowPrivateAddress or userAgent options.");
-			else if (options.authenticatedDocumentLoaderFactory != null) throw new TypeError("Cannot set authenticatedDocumentLoaderFactory with allowPrivateAddress or userAgent options.");
+			if (options.documentLoaderFactory != null) throw new TypeError("Cannot set documentLoaderFactory with allowPrivateAddress or userAgent options.");
+			if (options.contextLoaderFactory != null) throw new TypeError("Cannot set contextLoaderFactory with allowPrivateAddress or userAgent options.");
+			if (options.authenticatedDocumentLoaderFactory != null) throw new TypeError("Cannot set authenticatedDocumentLoaderFactory with allowPrivateAddress or userAgent options.");
 		}
 		const { allowPrivateAddress, userAgent } = options;
 		this.allowPrivateAddress = allowPrivateAddress ?? false;
 		this.documentLoaderFactory = options.documentLoaderFactory ?? ((opts) => {
-			return require_docloader.kvCache({
-				loader: require_docloader.getDocumentLoader({
+			return require_kv_cache.kvCache({
+				loader: (0, __fedify_vocab_runtime.getDocumentLoader)({
 					allowPrivateAddress: opts?.allowPrivateAddress ?? allowPrivateAddress,
 					userAgent: opts?.userAgent ?? userAgent
 				}),
@@ -2413,12 +2422,8 @@ var FederationImpl = class extends FederationBuilderImpl {
 				prefix: this.kvPrefixes.remoteDocument
 			});
 		});
-		if (options.contextLoader != null) {
-			if (options.contextLoaderFactory != null) throw new TypeError("Cannot set both contextLoader and contextLoaderFactory options at a time; use contextLoaderFactory only.");
-			this.contextLoaderFactory = () => options.contextLoader;
-			logger$1.warn("The contextLoader option is deprecated; use contextLoaderFactory option instead.");
-		} else this.contextLoaderFactory = options.contextLoaderFactory ?? this.documentLoaderFactory;
-		this.authenticatedDocumentLoaderFactory = options.authenticatedDocumentLoaderFactory ?? ((identity) => require_authdocloader.getAuthenticatedDocumentLoader(identity, {
+		this.contextLoaderFactory = options.contextLoaderFactory ?? this.documentLoaderFactory;
+		this.authenticatedDocumentLoaderFactory = options.authenticatedDocumentLoaderFactory ?? ((identity) => require_kv_cache.getAuthenticatedDocumentLoader(identity, {
 			allowPrivateAddress,
 			userAgent,
 			specDeterminer: new KvSpecDeterminer(this.kv, this.kvPrefixes.httpMessageSignaturesSpec, options.firstKnock),
@@ -2439,7 +2444,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 		this.router.add("/.well-known/nodeinfo", "nodeInfoJrd");
 	}
 	_getTracer() {
-		return this.tracerProvider.getTracer(require_docloader.deno_default.name, require_docloader.deno_default.version);
+		return this.tracerProvider.getTracer(require_http.deno_default.name, require_http.deno_default.version);
 	}
 	async _startQueueInternal(ctxData, signal, queue) {
 		if (this.inboxQueue == null && this.outboxQueue == null) return;
@@ -2537,9 +2542,9 @@ var FederationImpl = class extends FederationBuilderImpl {
 		});
 		const keys = await Promise.all(message.keys.map(async ({ keyId, privateKey }) => ({
 			keyId: new URL(keyId),
-			privateKey: await require_key.importJwk(privateKey, "private")
+			privateKey: await require_http.importJwk(privateKey, "private")
 		})));
-		const activity = await require_actor.Activity.fromJsonLd(message.activity, {
+		const activity = await __fedify_vocab.Activity.fromJsonLd(message.activity, {
 			contextLoader: this.contextLoaderFactory({
 				allowPrivateAddress: this.allowPrivateAddress,
 				userAgent: this.userAgent
@@ -2578,7 +2583,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 		for (const { keyId, privateKey } of message.keys) {
 			const pair = {
 				keyId: new URL(keyId),
-				privateKey: await require_key.importJwk(privateKey, "private")
+				privateKey: await require_http.importJwk(privateKey, "private")
 			};
 			if (rsaKeyPair == null && pair.privateKey.algorithm.name === "RSASSA-PKCS1-v1_5") rsaKeyPair = pair;
 			keys.push(pair);
@@ -2601,7 +2606,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 				message: String(error)
 			});
 			const loaderOptions = this.#getLoaderOptions(message.baseUrl);
-			const activity = await require_actor.Activity.fromJsonLd(message.activity, {
+			const activity = await __fedify_vocab.Activity.fromJsonLd(message.activity, {
 				contextLoader: this.contextLoaderFactory(loaderOptions),
 				documentLoader: rsaKeyPair == null ? this.documentLoaderFactory(loaderOptions) : this.authenticatedDocumentLoaderFactory(rsaKeyPair, loaderOptions),
 				tracerProvider: this.tracerProvider
@@ -2655,8 +2660,8 @@ var FederationImpl = class extends FederationBuilderImpl {
 			const identity = await this.sharedInboxKeyDispatcher(context$2);
 			if (identity != null) context$2 = this.#createContext(baseUrl, ctxData, { documentLoader: "identifier" in identity || "username" in identity || "handle" in identity ? await context$2.getDocumentLoader(identity) : context$2.getDocumentLoader(identity) });
 		}
-		const activity = await require_actor.Activity.fromJsonLd(message.activity, context$2);
-		span.setAttribute("activitypub.activity.type", require_actor.getTypeId(activity).href);
+		const activity = await __fedify_vocab.Activity.fromJsonLd(message.activity, context$2);
+		span.setAttribute("activitypub.activity.type", (0, __fedify_vocab.getTypeId)(activity).href);
 		if (activity.id != null) span.setAttribute("activitypub.activity.id", activity.id.href);
 		const cacheKey = activity.id == null ? null : [
 			...this.kvPrefixes.activityIdempotence,
@@ -2685,7 +2690,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 				});
 				span$1.setStatus({
 					code: __opentelemetry_api.SpanStatusCode.ERROR,
-					message: `Unsupported activity type: ${require_actor.getTypeId(activity).href}`
+					message: `Unsupported activity type: ${(0, __fedify_vocab.getTypeId)(activity).href}`
 				});
 				span$1.end();
 				return;
@@ -2693,7 +2698,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 			const { class: cls, listener } = dispatched;
 			span$1.updateName(`activitypub.dispatch_inbox_listener ${cls.name}`);
 			try {
-				await listener(context$2.toInboxContext(message.identifier, message.activity, activity.id?.href, require_actor.getTypeId(activity).href), activity);
+				await listener(context$2.toInboxContext(message.identifier, message.activity, activity.id?.href, (0, __fedify_vocab.getTypeId)(activity).href), activity);
 			} catch (error) {
 				try {
 					await this.inboxErrorHandler?.(context$2, error);
@@ -2813,7 +2818,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 		let proofCreated = false;
 		let rsaKey = null;
 		for (const { keyId, privateKey } of keys) {
-			require_key.validateCryptoKey(privateKey, "private");
+			require_http.validateCryptoKey(privateKey, "private");
 			if (rsaKey == null && privateKey.algorithm.name === "RSASSA-PKCS1-v1_5") {
 				rsaKey = {
 					keyId,
@@ -2865,7 +2870,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 				keys,
 				activity: jsonLd,
 				activityId: activity.id?.href,
-				activityType: require_actor.getTypeId(activity).href,
+				activityType: (0, __fedify_vocab.getTypeId)(activity).href,
 				inbox: new URL(inbox),
 				sharedInbox: inboxes[inbox].sharedInbox,
 				headers: collectionSync == null ? void 0 : new Headers({ "Collection-Synchronization": await buildCollectionSynchronizationHeader(collectionSync, inboxes[inbox].actorIds) }),
@@ -2881,7 +2886,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 		});
 		const keyJwkPairs = [];
 		for (const { keyId, privateKey } of keys) {
-			const privateKeyJwk = await require_key.exportJwk(privateKey);
+			const privateKeyJwk = await require_http.exportJwk(privateKey);
 			keyJwkPairs.push({
 				keyId: keyId.href,
 				privateKey: privateKeyJwk
@@ -2899,7 +2904,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 				keys: keyJwkPairs,
 				activity: jsonLd,
 				activityId: activity.id?.href,
-				activityType: require_actor.getTypeId(activity).href,
+				activityType: (0, __fedify_vocab.getTypeId)(activity).href,
 				inbox,
 				sharedInbox: inboxes[inbox].sharedInbox,
 				started: (/* @__PURE__ */ new Date()).toISOString(),
@@ -2956,6 +2961,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 						span,
 						tracer
 					});
+					if (acceptsJsonLd(request)) response.headers.set("Vary", "Accept");
 				} catch (error) {
 					span.setStatus({
 						code: __opentelemetry_api.SpanStatusCode.ERROR,
@@ -3019,6 +3025,9 @@ var FederationImpl = class extends FederationBuilderImpl {
 				context: context$2,
 				nodeInfoDispatcher: this.nodeInfoDispatcher
 			});
+		}
+		if (request.method !== "POST" && !acceptsJsonLd(request)) return await onNotAcceptable(request);
+		switch (routeName) {
 			case "actor":
 				context$2 = this.#createContext(request, contextData, { invokedFromActorDispatcher: { identifier: route.values.identifier ?? route.values.handle } });
 				return await handleActor(request, {
@@ -3027,8 +3036,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 					actorDispatcher: this.actorCallbacks?.dispatcher,
 					authorizePredicate: this.actorCallbacks?.authorizePredicate,
 					onUnauthorized,
-					onNotFound,
-					onNotAcceptable
+					onNotFound
 				});
 			case "object": {
 				const typeId = route.name.replace(/^object:/, "");
@@ -3044,8 +3052,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 					objectDispatcher: callbacks?.dispatcher,
 					authorizePredicate: callbacks?.authorizePredicate,
 					onUnauthorized,
-					onNotFound,
-					onNotAcceptable
+					onNotFound
 				});
 			}
 			case "outbox": return await handleCollection(request, {
@@ -3056,8 +3063,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 				collectionCallbacks: this.outboxCallbacks,
 				tracerProvider: this.tracerProvider,
 				onUnauthorized,
-				onNotFound,
-				onNotAcceptable
+				onNotFound
 			});
 			case "inbox":
 				if (request.method !== "POST") return await handleCollection(request, {
@@ -3068,8 +3074,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 					collectionCallbacks: this.inboxCallbacks,
 					tracerProvider: this.tracerProvider,
 					onUnauthorized,
-					onNotFound,
-					onNotAcceptable
+					onNotFound
 				});
 				context$2 = this.#createContext(request, contextData, { documentLoader: await context$2.getDocumentLoader({ identifier: route.values.identifier ?? route.values.handle }) });
 			case "sharedInbox":
@@ -3091,7 +3096,8 @@ var FederationImpl = class extends FederationBuilderImpl {
 					onNotFound,
 					signatureTimeWindow: this.signatureTimeWindow,
 					skipSignatureVerification: this.skipSignatureVerification,
-					tracerProvider: this.tracerProvider
+					tracerProvider: this.tracerProvider,
+					idempotencyStrategy: this.idempotencyStrategy
 				});
 			case "following": return await handleCollection(request, {
 				name: "following",
@@ -3101,8 +3107,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 				collectionCallbacks: this.followingCallbacks,
 				tracerProvider: this.tracerProvider,
 				onUnauthorized,
-				onNotFound,
-				onNotAcceptable
+				onNotFound
 			});
 			case "followers": {
 				let baseUrl = url.searchParams.get("base-url");
@@ -3125,8 +3130,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 					collectionCallbacks: this.followersCallbacks,
 					tracerProvider: this.tracerProvider,
 					onUnauthorized,
-					onNotFound,
-					onNotAcceptable
+					onNotFound
 				});
 			}
 			case "liked": return await handleCollection(request, {
@@ -3137,8 +3141,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 				collectionCallbacks: this.likedCallbacks,
 				tracerProvider: this.tracerProvider,
 				onUnauthorized,
-				onNotFound,
-				onNotAcceptable
+				onNotFound
 			});
 			case "featured": return await handleCollection(request, {
 				name: "featured",
@@ -3148,8 +3151,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 				collectionCallbacks: this.featuredCallbacks,
 				tracerProvider: this.tracerProvider,
 				onUnauthorized,
-				onNotFound,
-				onNotAcceptable
+				onNotFound
 			});
 			case "featuredTags": return await handleCollection(request, {
 				name: "featured tags",
@@ -3159,8 +3161,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 				collectionCallbacks: this.featuredTagsCallbacks,
 				tracerProvider: this.tracerProvider,
 				onUnauthorized,
-				onNotFound,
-				onNotAcceptable
+				onNotFound
 			});
 			case "collection": {
 				const name = route.name.replace(/^collection:/, "");
@@ -3172,8 +3173,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 					collectionCallbacks: callbacks,
 					tracerProvider: this.tracerProvider,
 					onUnauthorized,
-					onNotFound,
-					onNotAcceptable
+					onNotFound
 				});
 			}
 			case "orderedCollection": {
@@ -3186,8 +3186,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 					collectionCallbacks: callbacks,
 					tracerProvider: this.tracerProvider,
 					onUnauthorized,
-					onNotFound,
-					onNotAcceptable
+					onNotFound
 				});
 			}
 			default: {
@@ -3460,12 +3459,12 @@ var ContextImpl = class ContextImpl {
 		for (const keyPair of keyPairs) {
 			const newPair = {
 				...keyPair,
-				cryptographicKey: new require_actor.CryptographicKey({
+				cryptographicKey: new __fedify_vocab.CryptographicKey({
 					id: keyPair.keyId,
 					owner,
 					publicKey: keyPair.publicKey
 				}),
-				multikey: new require_actor.Multikey({
+				multikey: new __fedify_vocab.Multikey({
 					id: keyPair.keyId,
 					controller: owner,
 					publicKey: keyPair.publicKey
@@ -3551,7 +3550,7 @@ var ContextImpl = class ContextImpl {
 		return this.federation.authenticatedDocumentLoaderFactory(identity);
 	}
 	lookupObject(identifier, options = {}) {
-		return require_vocab.lookupObject(identifier, {
+		return (0, __fedify_vocab.lookupObject)(identifier, {
 			...options,
 			documentLoader: options.documentLoader ?? this.documentLoader,
 			contextLoader: options.contextLoader ?? this.contextLoader,
@@ -3561,7 +3560,7 @@ var ContextImpl = class ContextImpl {
 		});
 	}
 	traverseCollection(collection, options = {}) {
-		return require_vocab.traverseCollection(collection, {
+		return (0, __fedify_vocab.traverseCollection)(collection, {
 			...options,
 			documentLoader: options.documentLoader ?? this.documentLoader,
 			contextLoader: options.contextLoader ?? this.contextLoader
@@ -3579,7 +3578,7 @@ var ContextImpl = class ContextImpl {
 		});
 	}
 	lookupWebFinger(resource, options = {}) {
-		return require_lookup.lookupWebFinger(resource, {
+		return (0, __fedify_webfinger.lookupWebFinger)(resource, {
 			...options,
 			userAgent: options.userAgent ?? this.federation.userAgent,
 			tracerProvider: options.tracerProvider ?? this.tracerProvider,
@@ -3587,11 +3586,11 @@ var ContextImpl = class ContextImpl {
 		});
 	}
 	sendActivity(sender, recipients, activity, options = {}) {
-		const tracer = this.tracerProvider.getTracer(require_docloader.deno_default.name, require_docloader.deno_default.version);
+		const tracer = this.tracerProvider.getTracer(require_http.deno_default.name, require_http.deno_default.version);
 		return tracer.startActiveSpan(this.federation.outboxQueue == null || options.immediate ? "activitypub.outbox" : "activitypub.fanout", {
 			kind: this.federation.outboxQueue == null || options.immediate ? __opentelemetry_api.SpanKind.CLIENT : __opentelemetry_api.SpanKind.PRODUCER,
 			attributes: {
-				"activitypub.activity.type": require_actor.getTypeId(activity).href,
+				"activitypub.activity.type": (0, __fedify_vocab.getTypeId)(activity).href,
 				"activitypub.activity.to": activity.toIds.map((to) => to.href),
 				"activitypub.activity.cc": activity.toIds.map((cc) => cc.href),
 				"activitypub.activity.bto": activity.btoIds.map((bto) => bto.href),
@@ -3644,7 +3643,7 @@ var ContextImpl = class ContextImpl {
 			keys = sender;
 		} else keys = [sender];
 		if (keys.length < 1) throw new TypeError("The sender's keys must not be empty.");
-		for (const { privateKey } of keys) require_key.validateCryptoKey(privateKey, "private");
+		for (const { privateKey } of keys) require_http.validateCryptoKey(privateKey, "private");
 		const opts = { context: this };
 		let expandedRecipients;
 		if (Array.isArray(recipients)) expandedRecipients = recipients;
@@ -3685,7 +3684,7 @@ var ContextImpl = class ContextImpl {
 		}
 		const keyJwkPairs = await Promise.all(keys.map(async ({ keyId, privateKey }) => ({
 			keyId: keyId.href,
-			privateKey: await require_key.exportJwk(privateKey)
+			privateKey: await require_http.exportJwk(privateKey)
 		})));
 		const carrier = {};
 		__opentelemetry_api.propagation.inject(__opentelemetry_api.context.active(), carrier);
@@ -3703,7 +3702,7 @@ var ContextImpl = class ContextImpl {
 				contextLoader: this.contextLoader
 			}),
 			activityId: activity.id?.href,
-			activityType: require_actor.getTypeId(activity).href,
+			activityType: (0, __fedify_vocab.getTypeId)(activity).href,
 			collectionSync: opts.collectionSync,
 			traceContext: carrier
 		};
@@ -3733,10 +3732,10 @@ var ContextImpl = class ContextImpl {
 	}
 	routeActivity(recipient, activity, options = {}) {
 		const tracerProvider = this.tracerProvider ?? this.tracerProvider;
-		const tracer = tracerProvider.getTracer(require_docloader.deno_default.name, require_docloader.deno_default.version);
+		const tracer = tracerProvider.getTracer(require_http.deno_default.name, require_http.deno_default.version);
 		return tracer.startActiveSpan("activitypub.inbox", {
 			kind: this.federation.inboxQueue == null || options.immediate ? __opentelemetry_api.SpanKind.INTERNAL : __opentelemetry_api.SpanKind.PRODUCER,
-			attributes: { "activitypub.activity.type": require_actor.getTypeId(activity).href }
+			attributes: { "activitypub.activity.type": (0, __fedify_vocab.getTypeId)(activity).href }
 		}, async (span) => {
 			if (activity.id != null) span.setAttribute("activitypub.activity.id", activity.id.href);
 			if (activity.toIds.length > 0) span.setAttribute("activitypub.activity.to", activity.toIds.map((to) => to.href));
@@ -3770,7 +3769,7 @@ var ContextImpl = class ContextImpl {
 		const contextLoader = options.contextLoader ?? this.contextLoader;
 		const json = await activity.toJsonLd({ contextLoader });
 		const keyCache = new KvKeyCache(this.federation.kv, this.federation.kvPrefixes.publicKey, this);
-		const verified = await require_proof.verifyObject(require_actor.Activity, json, {
+		const verified = await require_proof.verifyObject(__fedify_vocab.Activity, json, {
 			contextLoader,
 			documentLoader: options.documentLoader ?? this.documentLoader,
 			tracerProvider: options.tracerProvider ?? this.tracerProvider,
@@ -3796,7 +3795,7 @@ var ContextImpl = class ContextImpl {
 					activityId: activity.id.href
 				});
 				return false;
-			} else if (!(fetched instanceof require_actor.Activity)) {
+			} else if (!(fetched instanceof __fedify_vocab.Activity)) {
 				logger$1.debug("Fetched object is not an Activity.", {
 					recipient,
 					activity: await fetched.toJsonLd({ contextLoader })
@@ -3841,7 +3840,8 @@ var ContextImpl = class ContextImpl {
 			kvPrefixes: this.federation.kvPrefixes,
 			queue: this.federation.inboxQueue,
 			span,
-			tracerProvider: options.tracerProvider ?? this.tracerProvider
+			tracerProvider: options.tracerProvider ?? this.tracerProvider,
+			idempotencyStrategy: this.federation.idempotencyStrategy
 		});
 		return routeResult === "alreadyProcessed" || routeResult === "enqueued" || routeResult === "unsupportedActivity" || routeResult === "success";
 	}
@@ -3950,7 +3950,7 @@ var InboxContextImpl = class InboxContextImpl extends ContextImpl {
 		});
 	}
 	forwardActivity(forwarder, recipients, options) {
-		const tracer = this.tracerProvider.getTracer(require_docloader.deno_default.name, require_docloader.deno_default.version);
+		const tracer = this.tracerProvider.getTracer(require_http.deno_default.name, require_http.deno_default.version);
 		return tracer.startActiveSpan("activitypub.outbox", {
 			kind: this.federation.outboxQueue == null || options?.immediate ? __opentelemetry_api.SpanKind.CLIENT : __opentelemetry_api.SpanKind.PRODUCER,
 			attributes: { "activitypub.activity.type": this.activityType }
@@ -4002,7 +4002,7 @@ var InboxContextImpl = class InboxContextImpl extends ContextImpl {
 		if (!require_proof.hasSignature(this.activity)) {
 			let hasProof;
 			try {
-				const activity = await require_actor.Activity.fromJsonLd(this.activity, this);
+				const activity = await __fedify_vocab.Activity.fromJsonLd(this.activity, this);
 				hasProof = await activity.getProof() != null;
 			} catch {
 				hasProof = false;
@@ -4051,7 +4051,7 @@ var InboxContextImpl = class InboxContextImpl extends ContextImpl {
 		});
 		const keyJwkPairs = [];
 		for (const { keyId, privateKey } of keys) {
-			const privateKeyJwk = await require_key.exportJwk(privateKey);
+			const privateKeyJwk = await require_http.exportJwk(privateKey);
 			keyJwkPairs.push({
 				keyId: keyId.href,
 				privateKey: privateKeyJwk
@@ -4221,6 +4221,12 @@ Object.defineProperty(exports, 'digest', {
     return digest;
   }
 });
+Object.defineProperty(exports, 'handleWebFinger', {
+  enumerable: true,
+  get: function () {
+    return handleWebFinger;
+  }
+});
 Object.defineProperty(exports, 'respondWithObject', {
   enumerable: true,
   get: function () {