@fedify/fedify 1.9.6 → 1.9.8

package/dist/{middleware-DrhEvfTo.js → middleware-Db1yZQaT.mjs}

@@ -1,29 +1,27 @@
-
-      import { Temporal } from "@js-temporal/polyfill";
-      import { URLPattern } from "urlpattern-polyfill";
-      globalThis.addEventListener = () => {};
-    
-import { Activity, Collection, CollectionPage, CryptographicKey, Link, Multikey, Object as Object$1, OrderedCollection, OrderedCollectionPage, deno_default, getDocumentLoader, getTypeId, kvCache, lookupWebFinger } from "./type-COPv6pMi.js";
-import { getNodeInfo } from "./client-UG5wpNhG.js";
-import { RouterError, lookupObject, traverseCollection } from "./lookup-BMAWLsP2.js";
-import { nodeInfoToJson } from "./types-BIgY6c-l.js";
-import { exportJwk, importJwk, validateCryptoKey } from "./key-CPJcJjp-.js";
-import { verifyRequest } from "./http-05HxN-lp.js";
-import { getAuthenticatedDocumentLoader } from "./authdocloader-BLqMyboS.js";
-import { detachSignature, hasSignature, signJsonLd, verifyJsonLd } from "./ld-DHNA2RSQ.js";
-import { doesActorOwnKey, getKeyOwner } from "./owner-DDHsHYQO.js";
-import { signObject, verifyObject } from "./proof-exgGRW88.js";
-import { routeActivity } from "./inbox-DcJN1cxM.js";
-import { FederationBuilderImpl } from "./builder-BO61xeXE.js";
-import { buildCollectionSynchronizationHeader } from "./collection-CSzG2j1P.js";
-import { KvKeyCache } from "./keycache-CMUfqYqr.js";
-import { createExponentialBackoffPolicy } from "./retry-D4GJ670a.js";
-import { extractInboxes, sendActivity } from "./send-BfMYakUE.js";
+import { Temporal } from "@js-temporal/polyfill";
+import "urlpattern-polyfill";
+globalThis.addEventListener = () => {};
+import { J as getDocumentLoader, U as getTypeId, W as lookupWebFinger, Z as kvCache, a as CollectionPage, b as OrderedCollection, g as Multikey, h as Link, i as Collection, ot as name, s as CryptographicKey, st as version, t as Activity, v as Object$1, x as OrderedCollectionPage } from "./vocab-DuW9rL1h.mjs";
+import { i as RouterError, n as traverseCollection, t as lookupObject } from "./lookup-DmeJ8WUw.mjs";
+import { t as getNodeInfo } from "./client-MXqit6c-.mjs";
+import { t as nodeInfoToJson } from "./types-CAnkAQGM.mjs";
+import "./actor-DGa1EWaV.mjs";
+import { a as validateCryptoKey, i as importJwk, t as exportJwk } from "./key-BNMK_IVr.mjs";
+import { l as verifyRequest } from "./http-Bu5ZNlhZ.mjs";
+import { t as getAuthenticatedDocumentLoader } from "./authdocloader-BC2rYCy1.mjs";
+import { a as signJsonLd, i as hasSignature, o as verifyJsonLd, r as detachSignature } from "./ld-6jAVu3jV.mjs";
+import { n as getKeyOwner, t as doesActorOwnKey } from "./owner-CKuGt_T9.mjs";
+import { n as signObject, r as verifyObject } from "./proof-mJLL2gSA.mjs";
+import { n as routeActivity } from "./inbox-DkbTULXE.mjs";
+import { t as FederationBuilderImpl } from "./builder-CIkAhIGC.mjs";
+import { t as buildCollectionSynchronizationHeader } from "./collection-BD6-SZ6O.mjs";
+import { t as KvKeyCache } from "./keycache-D-Vj8z88.mjs";
+import { t as createExponentialBackoffPolicy } from "./retry-Ddbq3AcK.mjs";
+import { n as sendActivity, t as extractInboxes } from "./send-BsQbGuw4.mjs";
 import { getLogger, withContext } from "@logtape/logtape";
 import { SpanKind, SpanStatusCode, context, propagation, trace } from "@opentelemetry/api";
 import { ATTR_HTTP_REQUEST_HEADER, ATTR_HTTP_REQUEST_METHOD, ATTR_HTTP_RESPONSE_HEADER, ATTR_HTTP_RESPONSE_STATUS_CODE, ATTR_URL_FULL } from "@opentelemetry/semantic-conventions";
 import { domainToASCII } from "node:url";
-
 //#region src/compat/transformers.ts
 const logger$1 = getLogger([
 	"fedify",
@@ -48,9 +46,9 @@ const logger$1 = getLogger([
 * @return The activity with an ID assigned.
 * @since 1.4.0
 */
-function autoIdAssigner(activity, context$1) {
+function autoIdAssigner(activity, context) {
 	if (activity.id != null) return activity;
-	const id = new URL(`/#${activity.constructor.name}/${crypto.randomUUID()}`, context$1.origin);
+	const id = new URL(`/#${activity.constructor.name}/${crypto.randomUUID()}`, context.origin);
 	logger$1.warn("As the activity to send does not have an id, a new id {id} has been generated for it.  However, it is recommended to explicitly set the id for the activity.", { id: id.href });
 	return activity.clone({ id });
 }
@@ -113,7 +111,6 @@ function actorDehydrator(activity, _context) {
 function getDefaultActivityTransformers() {
 	return [autoIdAssigner, actorDehydrator];
 }
-
 //#endregion
 //#region src/nodeinfo/handler.ts
 /**
@@ -123,10 +120,9 @@ function getDefaultActivityTransformers() {
 * @param parameters The parameters for handling the request.
 * @returns The response to the request.
 */
-async function handleNodeInfo(_request, { context: context$1, nodeInfoDispatcher }) {
-	const promise = nodeInfoDispatcher(context$1);
-	const nodeInfo = promise instanceof Promise ? await promise : promise;
-	const json = nodeInfoToJson(nodeInfo);
+async function handleNodeInfo(_request, { context, nodeInfoDispatcher }) {
+	const promise = nodeInfoDispatcher(context);
+	const json = nodeInfoToJson(promise instanceof Promise ? await promise : promise);
 	return new Response(JSON.stringify(json), { headers: { "Content-Type": "application/json; profile=\"http://nodeinfo.diaspora.software/ns/schema/2.1#\"" } });
 }
 /**
@@ -136,34 +132,21 @@ async function handleNodeInfo(_request, { context: context$1, nodeInfoDispatcher
 * @param context The request context.
 * @returns The response to the request.
 */
-function handleNodeInfoJrd(_request, context$1) {
+function handleNodeInfoJrd(_request, context) {
 	const links = [];
 	try {
 		links.push({
 			rel: "http://nodeinfo.diaspora.software/ns/schema/2.1",
-			href: context$1.getNodeInfoUri().href,
+			href: context.getNodeInfoUri().href,
 			type: "application/json; profile=\"http://nodeinfo.diaspora.software/ns/schema/2.1#\""
 		});
 	} catch (e) {
 		if (!(e instanceof RouterError)) throw e;
 	}
-	const jrd = { links };
-	const response = new Response(JSON.stringify(jrd), { headers: { "Content-Type": "application/jrd+json" } });
+	const response = new Response(JSON.stringify({ links }), { headers: { "Content-Type": "application/jrd+json" } });
 	return Promise.resolve(response);
 }
-
-//#endregion
-//#region src/vocab/constants.ts
-/**
-* The special public collection for [public addressing].  *Do not mutate this
-* object.*
-*
-* [public addressing]: https://www.w3.org/TR/activitypub/#public-addressing
-*
-* @since 0.7.0
-*/
-const PUBLIC_COLLECTION = new URL("https://www.w3.org/ns/activitystreams#Public");
-
+new URL("https://www.w3.org/ns/activitystreams#Public");
 //#endregion
 //#region src/webfinger/handler.ts
 const logger = getLogger([
@@ -196,12 +179,12 @@ async function handleWebFinger(request, options) {
 		}
 	});
 }
-async function handleWebFingerInternal(request, { context: context$1, host, actorDispatcher, actorHandleMapper, actorAliasMapper, onNotFound, span, webFingerLinksDispatcher }) {
+async function handleWebFingerInternal(request, { context, host, actorDispatcher, actorHandleMapper, actorAliasMapper, onNotFound, span, webFingerLinksDispatcher }) {
 	if (actorDispatcher == null) {
 		logger.error("Actor dispatcher is not set.");
 		return await onNotFound(request);
 	}
-	const resource = context$1.url.searchParams.get("resource");
+	const resource = context.url.searchParams.get("resource");
 	if (resource == null) return new Response("Missing resource parameter.", { status: 400 });
 	span?.setAttribute("webfinger.resource", resource);
 	let resourceUrl;
@@ -217,26 +200,26 @@ async function handleWebFingerInternal(request, { context: context$1, host, acto
 			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$1, username);
-		if (identifier$1 == null) {
+		const identifier = await actorHandleMapper(context, username);
+		if (identifier == null) {
 			logger.error("Actor {username} not found.", { username });
 			return null;
 		}
-		return identifier$1;
+		return identifier;
 	}
 	let identifier = null;
-	const uriParsed = context$1.parseUri(resourceUrl);
+	const uriParsed = context.parseUri(resourceUrl);
 	if (uriParsed?.type != "actor") {
 		const match = /^acct:([^@]+)@([^@]+)$/.exec(resource);
 		if (match == null) {
-			const result = await actorAliasMapper?.(context$1, resourceUrl);
+			const result = await actorAliasMapper?.(context, 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 ? domainToASCII(match[2].toLowerCase()) : domainToASCII(match[2].substring(0, portMatch.index).toLowerCase()) + portMatch[0];
-			if (normalizedHost != context$1.url.host && normalizedHost != host) return await onNotFound(request);
+			if (normalizedHost != context.url.host && normalizedHost != host) return await onNotFound(request);
 			else {
 				identifier = await mapUsernameToIdentifier(match[1]);
 				resourceUrl = new URL(`acct:${match[1]}@${normalizedHost}`);
@@ -244,14 +227,14 @@ async function handleWebFingerInternal(request, { context: context$1, host, acto
 		}
 	} else identifier = uriParsed.identifier;
 	if (identifier == null) return await onNotFound(request);
-	const actor = await actorDispatcher(context$1, identifier);
+	const actor = await actorDispatcher(context, identifier);
 	if (actor == null) {
 		logger.error("Actor {identifier} not found.", { identifier });
 		return await onNotFound(request);
 	}
 	const links = [{
 		rel: "self",
-		href: context$1.getActorUri(identifier).href,
+		href: context.getActorUri(identifier).href,
 		type: "application/activity+json"
 	}];
 	for (const url of actor.urls) if (url instanceof Link && url.href != null) links.push({
@@ -273,16 +256,16 @@ async function handleWebFingerInternal(request, { context: context$1, host, acto
 		links.push(link);
 	}
 	if (webFingerLinksDispatcher != null) {
-		const customLinks = await webFingerLinksDispatcher(context$1, resourceUrl);
+		const customLinks = await webFingerLinksDispatcher(context, 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$1.url.host}`);
-		if (host != null && host !== context$1.url.host) aliases.push(`acct:${actor.preferredUsername}@${context$1.url.host}`);
+		aliases.push(`acct:${actor.preferredUsername}@${host ?? context.url.host}`);
+		if (host != null && host !== context.url.host) aliases.push(`acct:${actor.preferredUsername}@${context.url.host}`);
 	}
-	if (resourceUrl.href !== context$1.getActorUri(identifier).href) aliases.push(context$1.getActorUri(identifier).href);
-	if (resourceUrl.protocol === "acct:" && host != null && host !== context$1.url.host && !resourceUrl.href.endsWith(`@${host}`)) {
+	if (resourceUrl.href !== context.getActorUri(identifier).href) aliases.push(context.getActorUri(identifier).href);
+	if (resourceUrl.protocol === "acct:" && host != null && host !== context.url.host && !resourceUrl.href.endsWith(`@${host}`)) {
 		const username = resourceUrl.href.replace(/^acct:/, "").replace(/@.*$/, "");
 		aliases.push(`acct:${username}@${host}`);
 	}
@@ -296,7 +279,6 @@ async function handleWebFingerInternal(request, { context: context$1, host, acto
 		"Access-Control-Allow-Origin": "*"
 	} });
 }
-
 //#endregion
 //#region src/federation/negotiation.ts
 function compareSpecs(a, b) {
@@ -341,8 +323,8 @@ function parseMediaType(str, i) {
 function parseAccept(accept) {
 	const accepts = accept.split(",").map((p) => p.trim());
 	const mediaTypes = [];
-	for (const [index, accept$1] of accepts.entries()) {
-		const mediaType = parseMediaType(accept$1.trim(), index);
+	for (const [index, accept] of accepts.entries()) {
+		const mediaType = parseMediaType(accept.trim(), index);
 		if (mediaType) mediaTypes.push(mediaType);
 	}
 	return mediaTypes;
@@ -351,10 +333,8 @@ function getFullType(spec) {
 	return `${spec.type}/${spec.subtype}`;
 }
 function preferredMediaTypes(accept) {
-	const accepts = parseAccept(accept === void 0 ? "*/*" : accept ?? "");
-	return accepts.filter(isQuality).sort(compareSpecs).map(getFullType);
+	return parseAccept(accept === void 0 ? "*/*" : accept ?? "").filter(isQuality).sort(compareSpecs).map(getFullType);
 }
-
 //#endregion
 //#region src/federation/handler.ts
 function acceptsJsonLd(request) {
@@ -371,24 +351,24 @@ 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$1, actorDispatcher, authorizePredicate, onNotFound, onNotAcceptable, onUnauthorized }) {
-	const logger$2 = getLogger([
+async function handleActor(request, { identifier, context, actorDispatcher, authorizePredicate, onNotFound, onNotAcceptable, onUnauthorized }) {
+	const logger = getLogger([
 		"fedify",
 		"federation",
 		"actor"
 	]);
 	if (actorDispatcher == null) {
-		logger$2.debug("Actor dispatcher is not set.", { identifier });
+		logger.debug("Actor dispatcher is not set.", { identifier });
 		return await onNotFound(request);
 	}
-	const actor = await actorDispatcher(context$1, identifier);
+	const actor = await actorDispatcher(context, identifier);
 	if (actor == null) {
-		logger$2.debug("Actor {identifier} not found.", { identifier });
+		logger.debug("Actor {identifier} not found.", { identifier });
 		return await onNotFound(request);
 	}
 	if (!acceptsJsonLd(request)) return await onNotAcceptable(request);
 	if (authorizePredicate != null) {
-		let key = await context$1.getSignedKey();
+		let key = await context.getSignedKey();
 		key = key?.clone({}, { $warning: {
 			category: [
 				"fedify",
@@ -397,7 +377,7 @@ async function handleActor(request, { identifier, context: context$1, actorDispa
 			],
 			message: "The third parameter of AuthorizePredicate is deprecated in favor of RequestContext.getSignedKey() method.  The third parameter will be removed in a future release."
 		} }) ?? null;
-		let keyOwner = await context$1.getSignedKeyOwner();
+		let keyOwner = await context.getSignedKeyOwner();
 		keyOwner = keyOwner?.clone({}, { $warning: {
 			category: [
 				"fedify",
@@ -406,9 +386,9 @@ async function handleActor(request, { identifier, context: context$1, actorDispa
 			],
 			message: "The fourth parameter of AuthorizePredicate is deprecated in favor of RequestContext.getSignedKeyOwner() method.  The fourth parameter will be removed in a future release."
 		} }) ?? null;
-		if (!await authorizePredicate(context$1, identifier, key, keyOwner)) return await onUnauthorized(request);
+		if (!await authorizePredicate(context, identifier, key, keyOwner)) return await onUnauthorized(request);
 	}
-	const jsonLd = await actor.toJsonLd(context$1);
+	const jsonLd = await actor.toJsonLd(context);
 	return new Response(JSON.stringify(jsonLd), { headers: {
 		"Content-Type": "application/activity+json",
 		Vary: "Accept"
@@ -421,13 +401,13 @@ async function handleActor(request, { identifier, context: context$1, 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$1, objectDispatcher, authorizePredicate, onNotFound, onNotAcceptable, onUnauthorized }) {
+async function handleObject(request, { values, context, objectDispatcher, authorizePredicate, onNotFound, onNotAcceptable, onUnauthorized }) {
 	if (objectDispatcher == null) return await onNotFound(request);
-	const object = await objectDispatcher(context$1, values);
+	const object = await objectDispatcher(context, values);
 	if (object == null) return await onNotFound(request);
 	if (!acceptsJsonLd(request)) return await onNotAcceptable(request);
 	if (authorizePredicate != null) {
-		let key = await context$1.getSignedKey();
+		let key = await context.getSignedKey();
 		key = key?.clone({}, { $warning: {
 			category: [
 				"fedify",
@@ -436,7 +416,7 @@ async function handleObject(request, { values, context: context$1, objectDispatc
 			],
 			message: "The third parameter of ObjectAuthorizePredicate is deprecated in favor of RequestContext.getSignedKey() method.  The third parameter will be removed in a future release."
 		} }) ?? null;
-		let keyOwner = await context$1.getSignedKeyOwner();
+		let keyOwner = await context.getSignedKeyOwner();
 		keyOwner = keyOwner?.clone({}, { $warning: {
 			category: [
 				"fedify",
@@ -445,9 +425,9 @@ async function handleObject(request, { values, context: context$1, objectDispatc
 			],
 			message: "The fourth parameter of ObjectAuthorizePredicate is deprecated in favor of RequestContext.getSignedKeyOwner() method.  The fourth parameter will be removed in a future release."
 		} }) ?? null;
-		if (!await authorizePredicate(context$1, values, key, keyOwner)) return await onUnauthorized(request);
+		if (!await authorizePredicate(context, values, key, keyOwner)) return await onUnauthorized(request);
 	}
-	const jsonLd = await object.toJsonLd(context$1);
+	const jsonLd = await object.toJsonLd(context);
 	return new Response(JSON.stringify(jsonLd), { headers: {
 		"Content-Type": "application/activity+json",
 		Vary: "Accept"
@@ -463,18 +443,17 @@ async function handleObject(request, { values, context: context$1, 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$1, collectionCallbacks, tracerProvider, onUnauthorized, onNotFound, onNotAcceptable }) {
-	const spanName = name.trim().replace(/\s+/g, "_");
+async function handleCollection(request, { name: name$2, identifier, uriGetter, filter, filterPredicate, context, collectionCallbacks, tracerProvider, onUnauthorized, onNotFound, onNotAcceptable }) {
+	const spanName = name$2.trim().replace(/\s+/g, "_");
 	tracerProvider = tracerProvider ?? trace.getTracerProvider();
-	const tracer = tracerProvider.getTracer(deno_default.name, deno_default.version);
-	const url = new URL(request.url);
-	const cursor = url.searchParams.get("cursor");
+	const tracer = tracerProvider.getTracer(name, version);
+	const cursor = new URL(request.url).searchParams.get("cursor");
 	if (collectionCallbacks == null) return await onNotFound(request);
 	let collection;
 	const baseUri = uriGetter(identifier);
 	if (cursor == null) {
-		const firstCursor = await collectionCallbacks.firstCursor?.(context$1, identifier);
-		const totalItems = filter == null ? await collectionCallbacks.counter?.(context$1, identifier) : void 0;
+		const firstCursor = await collectionCallbacks.firstCursor?.(context, identifier);
+		const totalItems = filter == null ? await collectionCallbacks.counter?.(context, identifier) : void 0;
 		if (firstCursor == null) {
 			const itemsOrResponse = await tracer.startActiveSpan(`activitypub.dispatch_collection ${spanName}`, {
 				kind: SpanKind.SERVER,
@@ -485,7 +464,7 @@ async function handleCollection(request, { name, identifier, uriGetter, filter,
 			}, async (span) => {
 				if (totalItems != null) span.setAttribute("activitypub.collection.total_items", Number(totalItems));
 				try {
-					const page = await collectionCallbacks.dispatcher(context$1, identifier, null, filter);
+					const page = await collectionCallbacks.dispatcher(context, identifier, null, filter);
 					if (page == null) {
 						span.setStatus({ code: SpanStatusCode.ERROR });
 						return await onNotFound(request);
@@ -507,15 +486,15 @@ async function handleCollection(request, { name, identifier, uriGetter, filter,
 			collection = new OrderedCollection({
 				id: baseUri,
 				totalItems: totalItems == null ? null : Number(totalItems),
-				items: filterCollectionItems(itemsOrResponse, name, filterPredicate)
+				items: filterCollectionItems(itemsOrResponse, name$2, filterPredicate)
 			});
 		} else {
-			const lastCursor = await collectionCallbacks.lastCursor?.(context$1, identifier);
-			const first = new URL(context$1.url);
+			const lastCursor = await collectionCallbacks.lastCursor?.(context, identifier);
+			const first = new URL(context.url);
 			first.searchParams.set("cursor", firstCursor);
 			let last = null;
 			if (lastCursor != null) {
-				last = new URL(context$1.url);
+				last = new URL(context.url);
 				last.searchParams.set("cursor", lastCursor);
 			}
 			collection = new OrderedCollection({
@@ -528,7 +507,7 @@ async function handleCollection(request, { name, identifier, uriGetter, filter,
 	} else {
 		const uri = new URL(baseUri);
 		uri.searchParams.set("cursor", cursor);
-		const pageOrResponse = await tracer.startActiveSpan(`activitypub.dispatch_collection_page ${name}`, {
+		const pageOrResponse = await tracer.startActiveSpan(`activitypub.dispatch_collection_page ${name$2}`, {
 			kind: SpanKind.SERVER,
 			attributes: {
 				"activitypub.collection.id": uri.href,
@@ -537,7 +516,7 @@ async function handleCollection(request, { name, identifier, uriGetter, filter,
 			}
 		}, async (span) => {
 			try {
-				const page = await collectionCallbacks.dispatcher(context$1, identifier, cursor, filter);
+				const page = await collectionCallbacks.dispatcher(context, identifier, cursor, filter);
 				if (page == null) {
 					span.setStatus({ code: SpanStatusCode.ERROR });
 					return await onNotFound(request);
@@ -558,27 +537,27 @@ async function handleCollection(request, { name, identifier, uriGetter, filter,
 		const { items, prevCursor, nextCursor } = pageOrResponse;
 		let prev = null;
 		if (prevCursor != null) {
-			prev = new URL(context$1.url);
+			prev = new URL(context.url);
 			prev.searchParams.set("cursor", prevCursor);
 		}
 		let next = null;
 		if (nextCursor != null) {
-			next = new URL(context$1.url);
+			next = new URL(context.url);
 			next.searchParams.set("cursor", nextCursor);
 		}
-		const partOf = new URL(context$1.url);
+		const partOf = new URL(context.url);
 		partOf.searchParams.delete("cursor");
 		collection = new OrderedCollectionPage({
 			id: uri,
 			prev,
 			next,
-			items: filterCollectionItems(items, name, filterPredicate),
+			items: filterCollectionItems(items, name$2, filterPredicate),
 			partOf
 		});
 	}
 	if (!acceptsJsonLd(request)) return await onNotAcceptable(request);
 	if (collectionCallbacks.authorizePredicate != null) {
-		let key = await context$1.getSignedKey();
+		let key = await context.getSignedKey();
 		key = key?.clone({}, { $warning: {
 			category: [
 				"fedify",
@@ -587,7 +566,7 @@ async function handleCollection(request, { name, identifier, uriGetter, filter,
 			],
 			message: "The third parameter of AuthorizePredicate is deprecated in favor of RequestContext.getSignedKey() method.  The third parameter will be removed in a future release."
 		} }) ?? null;
-		let keyOwner = await context$1.getSignedKeyOwner();
+		let keyOwner = await context.getSignedKeyOwner();
 		keyOwner = keyOwner?.clone({}, { $warning: {
 			category: [
 				"fedify",
@@ -596,9 +575,9 @@ async function handleCollection(request, { name, identifier, uriGetter, filter,
 			],
 			message: "The fourth parameter of AuthorizePredicate is deprecated in favor of RequestContext.getSignedKeyOwner() method.  The fourth parameter will be removed in a future release."
 		} }) ?? null;
-		if (!await collectionCallbacks.authorizePredicate(context$1, identifier, key, keyOwner)) return await onUnauthorized(request);
+		if (!await collectionCallbacks.authorizePredicate(context, identifier, key, keyOwner)) return await onUnauthorized(request);
 	}
-	const jsonLd = await collection.toJsonLd(context$1);
+	const jsonLd = await collection.toJsonLd(context);
 	return new Response(JSON.stringify(jsonLd), { headers: {
 		"Content-Type": "application/activity+json",
 		Vary: "Accept"
@@ -643,9 +622,7 @@ function filterCollectionItems(items, collectionName, filterPredicate) {
 * @returns A promise that resolves to an HTTP response.
 */
 async function handleInbox(request, options) {
-	const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
-	const tracer = tracerProvider.getTracer(deno_default.name, deno_default.version);
-	return await tracer.startActiveSpan("activitypub.inbox", {
+	return await (options.tracerProvider ?? trace.getTracerProvider()).getTracer(name, version).startActiveSpan("activitypub.inbox", {
 		kind: options.queue == null ? SpanKind.SERVER : SpanKind.PRODUCER,
 		attributes: { "activitypub.shared_inbox": options.recipient == null }
 	}, async (span) => {
@@ -673,22 +650,21 @@ async function handleInbox(request, options) {
 */
 async function handleInboxInternal(request, parameters, span) {
 	const { recipient, context: ctx, inboxContextFactory, kv, kvPrefixes, queue, actorDispatcher, inboxListeners, inboxErrorHandler, onNotFound, signatureTimeWindow, skipSignatureVerification, tracerProvider } = parameters;
-	const logger$2 = getLogger([
+	const logger = getLogger([
 		"fedify",
 		"federation",
 		"inbox"
 	]);
 	if (actorDispatcher == null) {
-		logger$2.error("Actor dispatcher is not set.", { recipient });
+		logger.error("Actor dispatcher is not set.", { recipient });
 		span.setStatus({
 			code: SpanStatusCode.ERROR,
 			message: "Actor dispatcher is not set."
 		});
 		return await onNotFound(request);
 	} else if (recipient != null) {
-		const actor = await actorDispatcher(ctx, recipient);
-		if (actor == null) {
-			logger$2.error("Actor {recipient} not found.", { recipient });
+		if (await actorDispatcher(ctx, recipient) == null) {
+			logger.error("Actor {recipient} not found.", { recipient });
 			span.setStatus({
 				code: SpanStatusCode.ERROR,
 				message: `Actor ${recipient} not found.`
@@ -697,7 +673,7 @@ async function handleInboxInternal(request, parameters, span) {
 		}
 	}
 	if (request.bodyUsed) {
-		logger$2.error("Request body has already been read.", { recipient });
+		logger.error("Request body has already been read.", { recipient });
 		span.setStatus({
 			code: SpanStatusCode.ERROR,
 			message: "Request body has already been read."
@@ -707,7 +683,7 @@ async function handleInboxInternal(request, parameters, span) {
 			headers: { "Content-Type": "text/plain; charset=utf-8" }
 		});
 	} else if (request.body?.locked) {
-		logger$2.error("Request body is locked.", { recipient });
+		logger.error("Request body is locked.", { recipient });
 		span.setStatus({
 			code: SpanStatusCode.ERROR,
 			message: "Request body is locked."
@@ -721,15 +697,15 @@ async function handleInboxInternal(request, parameters, span) {
 	try {
 		json = await request.clone().json();
 	} catch (error) {
-		logger$2.error("Failed to parse JSON:\n{error}", {
+		logger.error("Failed to parse JSON:\n{error}", {
 			recipient,
 			error
 		});
 		try {
 			await inboxErrorHandler?.(ctx, error);
-		} catch (error$1) {
-			logger$2.error("An unexpected error occurred in inbox error handler:\n{error}", {
-				error: error$1,
+		} catch (error) {
+			logger.error("An unexpected error occurred in inbox error handler:\n{error}", {
+				error,
 				activity: json,
 				recipient
 			});
@@ -754,7 +730,7 @@ async function handleInboxInternal(request, parameters, span) {
 		});
 	} catch (error) {
 		if (error instanceof Error && error.name === "jsonld.SyntaxError") {
-			logger$2.error("Failed to parse JSON-LD:\n{error}", {
+			logger.error("Failed to parse JSON-LD:\n{error}", {
 				recipient,
 				error
 			});
@@ -768,13 +744,13 @@ async function handleInboxInternal(request, parameters, span) {
 	const jsonWithoutSig = detachSignature(json);
 	let activity = null;
 	if (ldSigVerified) {
-		logger$2.debug("Linked Data Signatures are verified.", {
+		logger.debug("Linked Data Signatures are verified.", {
 			recipient,
 			json
 		});
 		activity = await Activity.fromJsonLd(jsonWithoutSig, ctx);
 	} else {
-		logger$2.debug("Linked Data Signatures are not verified.", {
+		logger.debug("Linked Data Signatures are not verified.", {
 			recipient,
 			json
 		});
@@ -786,16 +762,16 @@ async function handleInboxInternal(request, parameters, span) {
 				tracerProvider
 			});
 		} catch (error) {
-			logger$2.error("Failed to parse activity:\n{error}", {
+			logger.error("Failed to parse activity:\n{error}", {
 				recipient,
 				activity: json,
 				error
 			});
 			try {
 				await inboxErrorHandler?.(ctx, error);
-			} catch (error$1) {
-				logger$2.error("An unexpected error occurred in inbox error handler:\n{error}", {
-					error: error$1,
+			} catch (error) {
+				logger.error("An unexpected error occurred in inbox error handler:\n{error}", {
+					error,
 					activity: json,
 					recipient
 				});
@@ -809,11 +785,11 @@ async function handleInboxInternal(request, parameters, span) {
 				headers: { "Content-Type": "text/plain; charset=utf-8" }
 			});
 		}
-		if (activity == null) logger$2.debug("Object Integrity Proofs are not verified.", {
+		if (activity == null) logger.debug("Object Integrity Proofs are not verified.", {
 			recipient,
 			activity: json
 		});
-		else logger$2.debug("Object Integrity Proofs are verified.", {
+		else logger.debug("Object Integrity Proofs are verified.", {
 			recipient,
 			activity: json
 		});
@@ -829,17 +805,16 @@ async function handleInboxInternal(request, parameters, span) {
 				tracerProvider
 			});
 			if (key == null) {
-				logger$2.error("Failed to verify the request's HTTP Signatures.", { recipient });
+				logger.error("Failed to verify the request's HTTP Signatures.", { recipient });
 				span.setStatus({
 					code: SpanStatusCode.ERROR,
 					message: `Failed to verify the request's HTTP Signatures.`
 				});
-				const response = new Response("Failed to verify the request signature.", {
+				return new Response("Failed to verify the request signature.", {
 					status: 401,
 					headers: { "Content-Type": "text/plain; charset=utf-8" }
 				});
-				return response;
-			} else logger$2.debug("HTTP Signatures are verified.", { recipient });
+			} else logger.debug("HTTP Signatures are verified.", { recipient });
 			httpSigKey = key;
 		}
 		activity = await Activity.fromJsonLd(jsonWithoutSig, ctx);
@@ -847,7 +822,7 @@ async function handleInboxInternal(request, parameters, span) {
 	if (activity.id != null) span.setAttribute("activitypub.activity.id", activity.id.href);
 	span.setAttribute("activitypub.activity.type", getTypeId(activity).href);
 	if (httpSigKey != null && !await doesActorOwnKey(activity, httpSigKey, ctx)) {
-		logger$2.error("The signer ({keyId}) and the actor ({actorId}) do not match.", {
+		logger.error("The signer ({keyId}) and the actor ({actorId}) do not match.", {
 			activity: json,
 			recipient,
 			keyId: httpSigKey.id?.href,
@@ -914,12 +889,12 @@ async function handleInboxInternal(request, parameters, span) {
 * @since 1.8.0
 */
 const handleCustomCollection = exceptWrapper(_handleCustomCollection);
-async function _handleCustomCollection(request, { name, values, context: context$1, tracerProvider, collectionCallbacks: callbacks, filterPredicate }) {
+async function _handleCustomCollection(request, { name, values, context, tracerProvider, collectionCallbacks: callbacks, filterPredicate }) {
 	verifyDefined(callbacks);
 	verifyJsonLdRequest(request);
-	await authIfNeeded(context$1, values, callbacks);
+	await authIfNeeded(context, values, callbacks);
 	const cursor = new URL(request.url).searchParams.get("cursor");
-	return await new CustomCollectionHandler(name, values, context$1, callbacks, tracerProvider, Collection, CollectionPage, filterPredicate).fetchCollection(cursor).toJsonLd().then(respondAsActivity);
+	return await new CustomCollectionHandler(name, values, context, callbacks, tracerProvider, Collection, CollectionPage, filterPredicate).fetchCollection(cursor).toJsonLd().then(respondAsActivity);
 }
 /**
 * Handles an ordered collection request.
@@ -933,12 +908,12 @@ async function _handleCustomCollection(request, { name, values, context: context
 * @since 1.8.0
 */
 const handleOrderedCollection = exceptWrapper(_handleOrderedCollection);
-async function _handleOrderedCollection(request, { name, values, context: context$1, tracerProvider, collectionCallbacks: callbacks, filterPredicate }) {
+async function _handleOrderedCollection(request, { name, values, context, tracerProvider, collectionCallbacks: callbacks, filterPredicate }) {
 	verifyDefined(callbacks);
 	verifyJsonLdRequest(request);
-	await authIfNeeded(context$1, values, callbacks);
+	await authIfNeeded(context, values, callbacks);
 	const cursor = new URL(request.url).searchParams.get("cursor");
-	return await new CustomCollectionHandler(name, values, context$1, callbacks, tracerProvider, OrderedCollection, OrderedCollectionPage, filterPredicate).fetchCollection(cursor).toJsonLd().then(respondAsActivity);
+	return await new CustomCollectionHandler(name, values, context, callbacks, tracerProvider, OrderedCollection, OrderedCollectionPage, filterPredicate).fetchCollection(cursor).toJsonLd().then(respondAsActivity);
 }
 /**
 * Handling custom collections with support for pagination and filtering.
@@ -988,17 +963,17 @@ var CustomCollectionHandler = class {
 	* @param CollectionPage The CollectionPage constructor.
 	* @param filterPredicate Optional filter predicate for items.
 	*/
-	constructor(name, values, context$1, callbacks, tracerProvider = trace.getTracerProvider(), Collection$1, CollectionPage$1, filterPredicate) {
-		this.name = name;
+	constructor(name$1, values, context, callbacks, tracerProvider = trace.getTracerProvider(), Collection, CollectionPage, filterPredicate) {
+		this.name = name$1;
 		this.values = values;
-		this.context = context$1;
+		this.context = context;
 		this.callbacks = callbacks;
 		this.tracerProvider = tracerProvider;
-		this.Collection = Collection$1;
-		this.CollectionPage = CollectionPage$1;
+		this.Collection = Collection;
+		this.CollectionPage = CollectionPage;
 		this.filterPredicate = filterPredicate;
 		this.name = this.name.trim().replace(/\s+/g, "_");
-		this.#tracer = this.tracerProvider.getTracer(deno_default.name, deno_default.version);
+		this.#tracer = this.tracerProvider.getTracer(name, version);
 		this.#id = new URL(this.context.url);
 		this.#dispatcher = callbacks.dispatcher.bind(callbacks);
 	}
@@ -1027,8 +1002,8 @@ var CustomCollectionHandler = class {
 	*/
 	async getCollection(cursor = null) {
 		if (cursor !== null) {
-			const props$1 = await this.getPageProps(cursor);
-			return new this.CollectionPage(props$1);
+			const props = await this.getPageProps(cursor);
+			return new this.CollectionPage(props);
 		}
 		const firstCursor = await this.firstCursor;
 		const props = typeof firstCursor === "string" ? await this.getProps(firstCursor) : await this.getPropsWithoutCursor();
@@ -1176,7 +1151,7 @@ var CustomCollectionHandler = class {
 	* @param value The total items count or a promise that resolves to it.
 	*/
 	set totalItems(value) {
-		const toNumber = (value$1) => value$1 == null ? null : Number(value$1);
+		const toNumber = (value) => value == null ? null : Number(value);
 		this.#totalItems = value instanceof Promise ? value.then(toNumber) : Promise.resolve(toNumber(value));
 	}
 	/**
@@ -1250,11 +1225,9 @@ const verifyJsonLdRequest = (request) => {
 * @throws {UnauthorizedError} If authorization fails.
 * @since 1.8.0
 */
-const authIfNeeded = async (context$1, values, { authorizePredicate: authorize = void 0 }) => {
+const authIfNeeded = async (context, values, { authorizePredicate: authorize = void 0 }) => {
 	if (authorize === void 0) return;
-	const key = (await context$1.getSignedKey())?.clone({}, warning.key) ?? null;
-	const keyOwner = (await context$1.getSignedKeyOwner())?.clone({}, warning.keyOwner) ?? null;
-	if (!await authorize(context$1, values, key, keyOwner)) throw new UnauthorizedError();
+	if (!await authorize(context, values, (await context.getSignedKey())?.clone({}, warning.key) ?? null, (await context.getSignedKeyOwner())?.clone({}, warning.keyOwner) ?? null)) throw new UnauthorizedError();
 };
 /** Warning messages for `authIfNeeded`. */
 const warning = {
@@ -1368,7 +1341,6 @@ async function respondWithObjectIfAcceptable(object, request, options) {
 	response.headers.set("Vary", "Accept");
 	return response;
 }
-
 //#endregion
 //#region src/federation/middleware.ts
 /**
@@ -1406,7 +1378,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 	firstKnock;
 	constructor(options) {
 		super();
-		const logger$2 = getLogger(["fedify", "federation"]);
+		const logger = getLogger(["fedify", "federation"]);
 		this.kv = options.kv;
 		this.kvPrefixes = {
 			activityIdempotence: ["_fedify", "activityIdempotence"],
@@ -1463,7 +1435,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 		if (options.documentLoader != null) {
 			if (options.documentLoaderFactory != null) throw new TypeError("Cannot set both documentLoader and documentLoaderFactory options at a time; use documentLoaderFactory only.");
 			this.documentLoaderFactory = () => options.documentLoader;
-			logger$2.warn("The documentLoader option is deprecated; use documentLoaderFactory option instead.");
+			logger.warn("The documentLoader option is deprecated; use documentLoaderFactory option instead.");
 		} else this.documentLoaderFactory = options.documentLoaderFactory ?? ((opts) => {
 			return kvCache({
 				loader: getDocumentLoader({
@@ -1477,7 +1449,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 		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$2.warn("The contextLoader option is deprecated; use contextLoaderFactory option instead.");
+			logger.warn("The contextLoader option is deprecated; use contextLoaderFactory option instead.");
 		} else this.contextLoaderFactory = options.contextLoaderFactory ?? this.documentLoaderFactory;
 		this.authenticatedDocumentLoaderFactory = options.authenticatedDocumentLoaderFactory ?? ((identity) => getAuthenticatedDocumentLoader(identity, {
 			allowPrivateAddress,
@@ -1500,28 +1472,28 @@ var FederationImpl = class extends FederationBuilderImpl {
 		this.router.add("/.well-known/nodeinfo", "nodeInfoJrd");
 	}
 	_getTracer() {
-		return this.tracerProvider.getTracer(deno_default.name, deno_default.version);
+		return this.tracerProvider.getTracer(name, version);
 	}
 	async _startQueueInternal(ctxData, signal, queue) {
 		if (this.inboxQueue == null && this.outboxQueue == null) return;
-		const logger$2 = getLogger([
+		const logger = getLogger([
 			"fedify",
 			"federation",
 			"queue"
 		]);
 		const promises = [];
 		if (this.inboxQueue != null && (queue == null || queue === "inbox") && !this.inboxQueueStarted) {
-			logger$2.debug("Starting an inbox task worker.");
+			logger.debug("Starting an inbox task worker.");
 			this.inboxQueueStarted = true;
 			promises.push(this.inboxQueue.listen((msg) => this.processQueuedTask(ctxData, msg), { signal }));
 		}
 		if (this.outboxQueue != null && this.outboxQueue !== this.inboxQueue && (queue == null || queue === "outbox") && !this.outboxQueueStarted) {
-			logger$2.debug("Starting an outbox task worker.");
+			logger.debug("Starting an outbox task worker.");
 			this.outboxQueueStarted = true;
 			promises.push(this.outboxQueue.listen((msg) => this.processQueuedTask(ctxData, msg), { signal }));
 		}
 		if (this.fanoutQueue != null && this.fanoutQueue !== this.inboxQueue && this.fanoutQueue !== this.outboxQueue && (queue == null || queue === "fanout") && !this.fanoutQueueStarted) {
-			logger$2.debug("Starting a fanout task worker.");
+			logger.debug("Starting a fanout task worker.");
 			this.fanoutQueueStarted = true;
 			promises.push(this.fanoutQueue.listen((msg) => this.processQueuedTask(ctxData, msg), { signal }));
 		}
@@ -1587,12 +1559,11 @@ var FederationImpl = class extends FederationBuilderImpl {
 		});
 	}
 	async #listenFanoutMessage(data, message) {
-		const logger$2 = getLogger([
+		getLogger([
 			"fedify",
 			"federation",
 			"fanout"
-		]);
-		logger$2.debug("Fanning out activity {activityId} to {inboxes} inbox(es)...", {
+		]).debug("Fanning out activity {activityId} to {inboxes} inbox(es)...", {
 			activityId: message.activityId,
 			inboxes: globalThis.Object.keys(message.inboxes).length
 		});
@@ -1611,17 +1582,17 @@ var FederationImpl = class extends FederationBuilderImpl {
 			}),
 			tracerProvider: this.tracerProvider
 		});
-		const context$1 = this.#createContext(new URL(message.baseUrl), data, { documentLoader: this.documentLoaderFactory({
+		const context = this.#createContext(new URL(message.baseUrl), data, { documentLoader: this.documentLoaderFactory({
 			allowPrivateAddress: this.allowPrivateAddress,
 			userAgent: this.userAgent
 		}) });
 		await this.sendActivity(keys, message.inboxes, activity, {
 			collectionSync: message.collectionSync,
-			context: context$1
+			context
 		});
 	}
 	async #listenOutboxMessage(_, message, span) {
-		const logger$2 = getLogger([
+		const logger = getLogger([
 			"fedify",
 			"federation",
 			"outbox"
@@ -1669,14 +1640,14 @@ var FederationImpl = class extends FederationBuilderImpl {
 			});
 			try {
 				this.onOutboxError?.(error, activity);
-			} catch (error$1) {
-				logger$2.error("An unexpected error occurred in onError handler:\n{error}", {
+			} catch (error) {
+				logger.error("An unexpected error occurred in onError handler:\n{error}", {
 					...logData,
-					error: error$1
+					error
 				});
 			}
 			if (this.outboxQueue?.nativeRetrial) {
-				logger$2.error("Failed to send activity {activityId} to {inbox}; backend will handle retry:\n{error}", {
+				logger.error("Failed to send activity {activityId} to {inbox}; backend will handle retry:\n{error}", {
 					...logData,
 					error
 				});
@@ -1687,7 +1658,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 				attempts: message.attempt
 			});
 			if (delay != null) {
-				logger$2.error("Failed to send activity {activityId} to {inbox} (attempt #{attempt}); retry...:\n{error}", {
+				logger.error("Failed to send activity {activityId} to {inbox} (attempt #{attempt}); retry...:\n{error}", {
 					...logData,
 					error
 				});
@@ -1695,39 +1666,38 @@ var FederationImpl = class extends FederationBuilderImpl {
 					...message,
 					attempt: message.attempt + 1
 				}, { delay: Temporal.Duration.compare(delay, { seconds: 0 }) < 0 ? Temporal.Duration.from({ seconds: 0 }) : delay });
-			} else logger$2.error("Failed to send activity {activityId} to {inbox} after {attempt} attempts; giving up:\n{error}", {
+			} else logger.error("Failed to send activity {activityId} to {inbox} after {attempt} attempts; giving up:\n{error}", {
 				...logData,
 				error
 			});
 			return;
 		}
-		logger$2.info("Successfully sent activity {activityId} to {inbox}.", { ...logData });
+		logger.info("Successfully sent activity {activityId} to {inbox}.", { ...logData });
 	}
 	async #listenInboxMessage(ctxData, message, span) {
-		const logger$2 = getLogger([
+		const logger = getLogger([
 			"fedify",
 			"federation",
 			"inbox"
 		]);
 		const baseUrl = new URL(message.baseUrl);
-		let context$1 = this.#createContext(baseUrl, ctxData);
-		if (message.identifier != null) context$1 = this.#createContext(baseUrl, ctxData, { documentLoader: await context$1.getDocumentLoader({ identifier: message.identifier }) });
+		let context = this.#createContext(baseUrl, ctxData);
+		if (message.identifier != null) context = this.#createContext(baseUrl, ctxData, { documentLoader: await context.getDocumentLoader({ identifier: message.identifier }) });
 		else if (this.sharedInboxKeyDispatcher != null) {
-			const identity = await this.sharedInboxKeyDispatcher(context$1);
-			if (identity != null) context$1 = this.#createContext(baseUrl, ctxData, { documentLoader: "identifier" in identity || "username" in identity || "handle" in identity ? await context$1.getDocumentLoader(identity) : context$1.getDocumentLoader(identity) });
+			const identity = await this.sharedInboxKeyDispatcher(context);
+			if (identity != null) context = this.#createContext(baseUrl, ctxData, { documentLoader: "identifier" in identity || "username" in identity || "handle" in identity ? await context.getDocumentLoader(identity) : context.getDocumentLoader(identity) });
 		}
-		const activity = await Activity.fromJsonLd(message.activity, context$1);
+		const activity = await Activity.fromJsonLd(message.activity, context);
 		span.setAttribute("activitypub.activity.type", getTypeId(activity).href);
 		if (activity.id != null) span.setAttribute("activitypub.activity.id", activity.id.href);
 		const cacheKey = activity.id == null ? null : [
 			...this.kvPrefixes.activityIdempotence,
-			context$1.origin,
+			context.origin,
 			activity.id.href
 		];
 		if (cacheKey != null) {
-			const cached = await this.kv.get(cacheKey);
-			if (cached === true) {
-				logger$2.debug("Activity {activityId} has already been processed.", {
+			if (await this.kv.get(cacheKey) === true) {
+				logger.debug("Activity {activityId} has already been processed.", {
 					activityId: activity.id?.href,
 					activity: message.activity,
 					recipient: message.identifier
@@ -1735,32 +1705,32 @@ var FederationImpl = class extends FederationBuilderImpl {
 				return;
 			}
 		}
-		await this._getTracer().startActiveSpan("activitypub.dispatch_inbox_listener", { kind: SpanKind.INTERNAL }, async (span$1) => {
+		await this._getTracer().startActiveSpan("activitypub.dispatch_inbox_listener", { kind: SpanKind.INTERNAL }, async (span) => {
 			const dispatched = this.inboxListeners?.dispatchWithClass(activity);
 			if (dispatched == null) {
-				logger$2.error("Unsupported activity type:\n{activity}", {
+				logger.error("Unsupported activity type:\n{activity}", {
 					activityId: activity.id?.href,
 					activity: message.activity,
 					recipient: message.identifier,
 					trial: message.attempt
 				});
-				span$1.setStatus({
+				span.setStatus({
 					code: SpanStatusCode.ERROR,
 					message: `Unsupported activity type: ${getTypeId(activity).href}`
 				});
-				span$1.end();
+				span.end();
 				return;
 			}
 			const { class: cls, listener } = dispatched;
-			span$1.updateName(`activitypub.dispatch_inbox_listener ${cls.name}`);
+			span.updateName(`activitypub.dispatch_inbox_listener ${cls.name}`);
 			try {
-				await listener(context$1.toInboxContext(message.identifier, message.activity, activity.id?.href, getTypeId(activity).href), activity);
+				await listener(context.toInboxContext(message.identifier, message.activity, activity.id?.href, getTypeId(activity).href), activity);
 			} catch (error) {
 				try {
-					await this.inboxErrorHandler?.(context$1, error);
-				} catch (error$1) {
-					logger$2.error("An unexpected error occurred in inbox error handler:\n{error}", {
-						error: error$1,
+					await this.inboxErrorHandler?.(context, error);
+				} catch (error) {
+					logger.error("An unexpected error occurred in inbox error handler:\n{error}", {
+						error,
 						trial: message.attempt,
 						activityId: activity.id?.href,
 						activity: message.activity,
@@ -1768,17 +1738,17 @@ var FederationImpl = class extends FederationBuilderImpl {
 					});
 				}
 				if (this.inboxQueue?.nativeRetrial) {
-					logger$2.error("Failed to process the incoming activity {activityId}; backend will handle retry:\n{error}", {
+					logger.error("Failed to process the incoming activity {activityId}; backend will handle retry:\n{error}", {
 						error,
 						activityId: activity.id?.href,
 						activity: message.activity,
 						recipient: message.identifier
 					});
-					span$1.setStatus({
+					span.setStatus({
 						code: SpanStatusCode.ERROR,
 						message: String(error)
 					});
-					span$1.end();
+					span.end();
 					throw error;
 				}
 				const delay = this.inboxRetryPolicy({
@@ -1786,7 +1756,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 					attempts: message.attempt
 				});
 				if (delay != null) {
-					logger$2.error("Failed to process the incoming activity {activityId} (attempt #{attempt}); retry...:\n{error}", {
+					logger.error("Failed to process the incoming activity {activityId} (attempt #{attempt}); retry...:\n{error}", {
 						error,
 						attempt: message.attempt,
 						activityId: activity.id?.href,
@@ -1797,26 +1767,26 @@ var FederationImpl = class extends FederationBuilderImpl {
 						...message,
 						attempt: message.attempt + 1
 					}, { delay: Temporal.Duration.compare(delay, { seconds: 0 }) < 0 ? Temporal.Duration.from({ seconds: 0 }) : delay });
-				} else logger$2.error("Failed to process the incoming activity {activityId} after {trial} attempts; giving up:\n{error}", {
+				} else logger.error("Failed to process the incoming activity {activityId} after {trial} attempts; giving up:\n{error}", {
 					error,
 					activityId: activity.id?.href,
 					activity: message.activity,
 					recipient: message.identifier
 				});
-				span$1.setStatus({
+				span.setStatus({
 					code: SpanStatusCode.ERROR,
 					message: String(error)
 				});
-				span$1.end();
+				span.end();
 				return;
 			}
 			if (cacheKey != null) await this.kv.set(cacheKey, true, { ttl: Temporal.Duration.from({ days: 1 }) });
-			logger$2.info("Activity {activityId} has been processed.", {
+			logger.info("Activity {activityId} has been processed.", {
 				activityId: activity.id?.href,
 				activity: message.activity,
 				recipient: message.identifier
 			});
-			span$1.end();
+			span.end();
 		});
 	}
 	startQueue(contextData, options = {}) {
@@ -1860,7 +1830,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 		};
 	}
 	async sendActivity(keys, inboxes, activity, options) {
-		const logger$2 = getLogger([
+		const logger = getLogger([
 			"fedify",
 			"federation",
 			"outbox"
@@ -1894,7 +1864,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 			format: "compact",
 			contextLoader
 		});
-		if (rsaKey == null) logger$2.warn("No supported key found to create a Linked Data signature for the activity {activityId}.  The activity will be sent without a Linked Data signature.  In order to create a Linked Data signature, at least one RSASSA-PKCS1-v1_5 key must be provided.", {
+		if (rsaKey == null) logger.warn("No supported key found to create a Linked Data signature for the activity {activityId}.  The activity will be sent without a Linked Data signature.  In order to create a Linked Data signature, at least one RSASSA-PKCS1-v1_5 key must be provided.", {
 			activityId,
 			keys: keys.map((pair) => ({
 				keyId: pair.keyId.href,
@@ -1905,7 +1875,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 			contextLoader,
 			tracerProvider: this.tracerProvider
 		});
-		if (!proofCreated) logger$2.warn("No supported key found to create a proof for the activity {activityId}.  The activity will be sent without a proof.  In order to create a proof, at least one Ed25519 key must be provided.", {
+		if (!proofCreated) logger.warn("No supported key found to create a proof for the activity {activityId}.  The activity will be sent without a proof.  In order to create a proof, at least one Ed25519 key must be provided.", {
 			activityId,
 			keys: keys.map((pair) => ({
 				keyId: pair.keyId.href,
@@ -1913,11 +1883,11 @@ var FederationImpl = class extends FederationBuilderImpl {
 			}))
 		});
 		if (immediate || this.outboxQueue == null) {
-			if (immediate) logger$2.debug("Sending activity immediately without queue since immediate option is set.", {
+			if (immediate) logger.debug("Sending activity immediately without queue since immediate option is set.", {
 				activityId: activity.id.href,
 				activity: jsonLd
 			});
-			else logger$2.debug("Sending activity immediately without queue since queue is not set.", {
+			else logger.debug("Sending activity immediately without queue since queue is not set.", {
 				activityId: activity.id.href,
 				activity: jsonLd
 			});
@@ -1936,7 +1906,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 			await Promise.all(promises);
 			return;
 		}
-		logger$2.debug("Enqueuing activity {activityId} to send later.", {
+		logger.debug("Enqueuing activity {activityId} to send later.", {
 			activityId: activity.id.href,
 			activity: jsonLd
 		});
@@ -1973,10 +1943,9 @@ var FederationImpl = class extends FederationBuilderImpl {
 		const { outboxQueue } = this;
 		if (outboxQueue.enqueueMany == null) {
 			const promises = messages.map((m) => outboxQueue.enqueue(m));
-			const results = await Promise.allSettled(promises);
-			const errors = results.filter((r) => r.status === "rejected").map((r) => r.reason);
+			const errors = (await Promise.allSettled(promises)).filter((r) => r.status === "rejected").map((r) => r.reason);
 			if (errors.length > 0) {
-				logger$2.error("Failed to enqueue activity {activityId} to send later: {errors}", {
+				logger.error("Failed to enqueue activity {activityId} to send later: {errors}", {
 					activityId: activity.id.href,
 					errors
 				});
@@ -1986,7 +1955,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 		} else try {
 			await outboxQueue.enqueueMany(messages);
 		} catch (error) {
-			logger$2.error("Failed to enqueue activity {activityId} to send later: {error}", {
+			logger.error("Failed to enqueue activity {activityId} to send later: {error}", {
 				activityId: activity.id.href,
 				error
 			});
@@ -1994,8 +1963,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 		}
 	}
 	fetch(request, options) {
-		const requestId = getRequestId(request);
-		return withContext({ requestId }, async () => {
+		return withContext({ requestId: getRequestId(request) }, async () => {
 			const tracer = this._getTracer();
 			return await tracer.startActiveSpan(request.method, {
 				kind: SpanKind.SERVER,
@@ -2004,7 +1972,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 					[ATTR_URL_FULL]: request.url
 				}
 			}, async (span) => {
-				const logger$2 = getLogger([
+				const logger = getLogger([
 					"fedify",
 					"federation",
 					"http"
@@ -2023,7 +1991,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 						message: `${error}`
 					});
 					span.end();
-					logger$2.error("An error occurred while serving request {method} {url}: {error}", {
+					logger.error("An error occurred while serving request {method} {url}: {error}", {
 						method: request.method,
 						url: request.url,
 						error
@@ -2047,9 +2015,9 @@ var FederationImpl = class extends FederationBuilderImpl {
 					url: request.url,
 					status: response.status
 				};
-				if (response.status >= 500) logger$2.error(logTpl, values);
-				else if (response.status >= 400) logger$2.warn(logTpl, values);
-				else logger$2.info(logTpl, values);
+				if (response.status >= 500) logger.error(logTpl, values);
+				else if (response.status >= 400) logger.warn(logTpl, values);
+				else logger.info(logTpl, values);
 				return response;
 			});
 		});
@@ -2062,11 +2030,11 @@ var FederationImpl = class extends FederationBuilderImpl {
 		const route = this.router.route(url.pathname);
 		if (route == null) return await onNotFound(request);
 		span.updateName(`${request.method} ${route.template}`);
-		let context$1 = this.#createContext(request, contextData);
+		let context = this.#createContext(request, contextData);
 		const routeName = route.name.replace(/:.*$/, "");
 		switch (routeName) {
 			case "webfinger": return await handleWebFinger(request, {
-				context: context$1,
+				context,
 				host: this.origin?.handleHost,
 				actorDispatcher: this.actorCallbacks?.dispatcher,
 				actorHandleMapper: this.actorCallbacks?.handleMapper,
@@ -2075,16 +2043,16 @@ var FederationImpl = class extends FederationBuilderImpl {
 				onNotFound,
 				tracer
 			});
-			case "nodeInfoJrd": return await handleNodeInfoJrd(request, context$1);
+			case "nodeInfoJrd": return await handleNodeInfoJrd(request, context);
 			case "nodeInfo": return await handleNodeInfo(request, {
-				context: context$1,
+				context,
 				nodeInfoDispatcher: this.nodeInfoDispatcher
 			});
 			case "actor":
-				context$1 = this.#createContext(request, contextData, { invokedFromActorDispatcher: { identifier: route.values.identifier ?? route.values.handle } });
+				context = this.#createContext(request, contextData, { invokedFromActorDispatcher: { identifier: route.values.identifier ?? route.values.handle } });
 				return await handleActor(request, {
 					identifier: route.values.identifier ?? route.values.handle,
-					context: context$1,
+					context,
 					actorDispatcher: this.actorCallbacks?.dispatcher,
 					authorizePredicate: this.actorCallbacks?.authorizePredicate,
 					onUnauthorized,
@@ -2095,13 +2063,13 @@ var FederationImpl = class extends FederationBuilderImpl {
 				const typeId = route.name.replace(/^object:/, "");
 				const callbacks = this.objectCallbacks[typeId];
 				const cls = this.objectTypeIds[typeId];
-				context$1 = this.#createContext(request, contextData, { invokedFromObjectDispatcher: {
+				context = this.#createContext(request, contextData, { invokedFromObjectDispatcher: {
 					cls,
 					values: route.values
 				} });
 				return await handleObject(request, {
 					values: route.values,
-					context: context$1,
+					context,
 					objectDispatcher: callbacks?.dispatcher,
 					authorizePredicate: callbacks?.authorizePredicate,
 					onUnauthorized,
@@ -2112,8 +2080,8 @@ var FederationImpl = class extends FederationBuilderImpl {
 			case "outbox": return await handleCollection(request, {
 				name: "outbox",
 				identifier: route.values.identifier ?? route.values.handle,
-				uriGetter: context$1.getOutboxUri.bind(context$1),
-				context: context$1,
+				uriGetter: context.getOutboxUri.bind(context),
+				context,
 				collectionCallbacks: this.outboxCallbacks,
 				tracerProvider: this.tracerProvider,
 				onUnauthorized,
@@ -2124,25 +2092,25 @@ var FederationImpl = class extends FederationBuilderImpl {
 				if (request.method !== "POST") return await handleCollection(request, {
 					name: "inbox",
 					identifier: route.values.identifier ?? route.values.handle,
-					uriGetter: context$1.getInboxUri.bind(context$1),
-					context: context$1,
+					uriGetter: context.getInboxUri.bind(context),
+					context,
 					collectionCallbacks: this.inboxCallbacks,
 					tracerProvider: this.tracerProvider,
 					onUnauthorized,
 					onNotFound,
 					onNotAcceptable
 				});
-				context$1 = this.#createContext(request, contextData, { documentLoader: await context$1.getDocumentLoader({ identifier: route.values.identifier ?? route.values.handle }) });
+				context = this.#createContext(request, contextData, { documentLoader: await context.getDocumentLoader({ identifier: route.values.identifier ?? route.values.handle }) });
 			case "sharedInbox":
 				if (routeName !== "inbox" && this.sharedInboxKeyDispatcher != null) {
-					const identity = await this.sharedInboxKeyDispatcher(context$1);
-					if (identity != null) context$1 = this.#createContext(request, contextData, { documentLoader: "identifier" in identity || "username" in identity || "handle" in identity ? await context$1.getDocumentLoader(identity) : context$1.getDocumentLoader(identity) });
+					const identity = await this.sharedInboxKeyDispatcher(context);
+					if (identity != null) context = this.#createContext(request, contextData, { documentLoader: "identifier" in identity || "username" in identity || "handle" in identity ? await context.getDocumentLoader(identity) : context.getDocumentLoader(identity) });
 				}
 				if (!this.manuallyStartQueue) this._startQueueInternal(contextData);
 				return await handleInbox(request, {
 					recipient: route.values.identifier ?? route.values.handle ?? null,
-					context: context$1,
-					inboxContextFactory: context$1.toInboxContext.bind(context$1),
+					context,
+					inboxContextFactory: context.toInboxContext.bind(context),
 					kv: this.kv,
 					kvPrefixes: this.kvPrefixes,
 					queue: this.inboxQueue,
@@ -2158,8 +2126,8 @@ var FederationImpl = class extends FederationBuilderImpl {
 			case "following": return await handleCollection(request, {
 				name: "following",
 				identifier: route.values.identifier ?? route.values.handle,
-				uriGetter: context$1.getFollowingUri.bind(context$1),
-				context: context$1,
+				uriGetter: context.getFollowingUri.bind(context),
+				context,
 				collectionCallbacks: this.followingCallbacks,
 				tracerProvider: this.tracerProvider,
 				onUnauthorized,
@@ -2176,14 +2144,14 @@ var FederationImpl = class extends FederationBuilderImpl {
 				return await handleCollection(request, {
 					name: "followers",
 					identifier: route.values.identifier ?? route.values.handle,
-					uriGetter: baseUrl == null ? context$1.getFollowersUri.bind(context$1) : (identifier) => {
-						const uri = context$1.getFollowersUri(identifier);
+					uriGetter: baseUrl == null ? context.getFollowersUri.bind(context) : (identifier) => {
+						const uri = context.getFollowersUri(identifier);
 						uri.searchParams.set("base-url", baseUrl);
 						return uri;
 					},
-					context: context$1,
+					context,
 					filter: baseUrl != null ? new URL(baseUrl) : void 0,
-					filterPredicate: baseUrl != null ? (i) => (i instanceof URL ? i.href : i.id?.href ?? "").startsWith(baseUrl) : void 0,
+					filterPredicate: baseUrl != null ? ((i) => (i instanceof URL ? i.href : i.id?.href ?? "").startsWith(baseUrl)) : void 0,
 					collectionCallbacks: this.followersCallbacks,
 					tracerProvider: this.tracerProvider,
 					onUnauthorized,
@@ -2194,8 +2162,8 @@ var FederationImpl = class extends FederationBuilderImpl {
 			case "liked": return await handleCollection(request, {
 				name: "liked",
 				identifier: route.values.identifier ?? route.values.handle,
-				uriGetter: context$1.getLikedUri.bind(context$1),
-				context: context$1,
+				uriGetter: context.getLikedUri.bind(context),
+				context,
 				collectionCallbacks: this.likedCallbacks,
 				tracerProvider: this.tracerProvider,
 				onUnauthorized,
@@ -2205,8 +2173,8 @@ var FederationImpl = class extends FederationBuilderImpl {
 			case "featured": return await handleCollection(request, {
 				name: "featured",
 				identifier: route.values.identifier ?? route.values.handle,
-				uriGetter: context$1.getFeaturedUri.bind(context$1),
-				context: context$1,
+				uriGetter: context.getFeaturedUri.bind(context),
+				context,
 				collectionCallbacks: this.featuredCallbacks,
 				tracerProvider: this.tracerProvider,
 				onUnauthorized,
@@ -2216,8 +2184,8 @@ var FederationImpl = class extends FederationBuilderImpl {
 			case "featuredTags": return await handleCollection(request, {
 				name: "featured tags",
 				identifier: route.values.identifier ?? route.values.handle,
-				uriGetter: context$1.getFeaturedTagsUri.bind(context$1),
-				context: context$1,
+				uriGetter: context.getFeaturedTagsUri.bind(context),
+				context,
 				collectionCallbacks: this.featuredTagsCallbacks,
 				tracerProvider: this.tracerProvider,
 				onUnauthorized,
@@ -2229,7 +2197,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 				const callbacks = this.collectionCallbacks[name];
 				return await handleCustomCollection(request, {
 					name,
-					context: context$1,
+					context,
 					values: route.values,
 					collectionCallbacks: callbacks,
 					tracerProvider: this.tracerProvider,
@@ -2243,7 +2211,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 				const callbacks = this.collectionCallbacks[name];
 				return await handleOrderedCollection(request, {
 					name,
-					context: context$1,
+					context,
 					values: route.values,
 					collectionCallbacks: callbacks,
 					tracerProvider: this.tracerProvider,
@@ -2341,9 +2309,9 @@ var ContextImpl = class ContextImpl {
 	}
 	getInboxUri(identifier) {
 		if (identifier == null) {
-			const path$1 = this.federation.router.build("sharedInbox", {});
-			if (path$1 == null) throw new RouterError("No shared inbox path registered.");
-			return new URL(path$1, this.canonicalOrigin);
+			const path = this.federation.router.build("sharedInbox", {});
+			if (path == null) throw new RouterError("No shared inbox path registered.");
+			return new URL(path, this.canonicalOrigin);
 		}
 		const path = this.federation.router.build("inbox", {
 			identifier,
@@ -2401,14 +2369,13 @@ var ContextImpl = class ContextImpl {
 		if (uri == null) return null;
 		if (uri.origin !== this.origin && uri.origin !== this.canonicalOrigin) return null;
 		const route = this.federation.router.route(uri.pathname);
-		const logger$2 = getLogger(["fedify", "federation"]);
+		const logger = getLogger(["fedify", "federation"]);
 		if (route == null) return null;
 		else if (route.name === "sharedInbox") return {
 			type: "inbox",
 			identifier: void 0,
 			get handle() {
-				logger$2.warn("The ParseUriResult.handle property is deprecated; use ParseUriResult.identifier instead.");
-				return void 0;
+				logger.warn("The ParseUriResult.handle property is deprecated; use ParseUriResult.identifier instead.");
 			}
 		};
 		const identifier = "identifier" in route.values ? route.values.identifier : route.values.handle;
@@ -2416,7 +2383,7 @@ var ContextImpl = class ContextImpl {
 			type: "actor",
 			identifier,
 			get handle() {
-				logger$2.warn("The ParseUriResult.handle property is deprecated; use ParseUriResult.identifier instead.");
+				logger.warn("The ParseUriResult.handle property is deprecated; use ParseUriResult.identifier instead.");
 				return identifier;
 			}
 		};
@@ -2432,7 +2399,7 @@ var ContextImpl = class ContextImpl {
 			type: "inbox",
 			identifier,
 			get handle() {
-				logger$2.warn("The ParseUriResult.handle property is deprecated; use ParseUriResult.identifier instead.");
+				logger.warn("The ParseUriResult.handle property is deprecated; use ParseUriResult.identifier instead.");
 				return identifier;
 			}
 		};
@@ -2440,7 +2407,7 @@ var ContextImpl = class ContextImpl {
 			type: "outbox",
 			identifier,
 			get handle() {
-				logger$2.warn("The ParseUriResult.handle property is deprecated; use ParseUriResult.identifier instead.");
+				logger.warn("The ParseUriResult.handle property is deprecated; use ParseUriResult.identifier instead.");
 				return identifier;
 			}
 		};
@@ -2448,7 +2415,7 @@ var ContextImpl = class ContextImpl {
 			type: "following",
 			identifier,
 			get handle() {
-				logger$2.warn("The ParseUriResult.handle property is deprecated; use ParseUriResult.identifier instead.");
+				logger.warn("The ParseUriResult.handle property is deprecated; use ParseUriResult.identifier instead.");
 				return identifier;
 			}
 		};
@@ -2456,7 +2423,7 @@ var ContextImpl = class ContextImpl {
 			type: "followers",
 			identifier,
 			get handle() {
-				logger$2.warn("The ParseUriResult.handle property is deprecated; use ParseUriResult.identifier instead.");
+				logger.warn("The ParseUriResult.handle property is deprecated; use ParseUriResult.identifier instead.");
 				return identifier;
 			}
 		};
@@ -2464,7 +2431,7 @@ var ContextImpl = class ContextImpl {
 			type: "liked",
 			identifier,
 			get handle() {
-				logger$2.warn("The ParseUriResult.handle property is deprecated; use ParseUriResult.identifier instead.");
+				logger.warn("The ParseUriResult.handle property is deprecated; use ParseUriResult.identifier instead.");
 				return identifier;
 			}
 		};
@@ -2472,7 +2439,7 @@ var ContextImpl = class ContextImpl {
 			type: "featured",
 			identifier,
 			get handle() {
-				logger$2.warn("The ParseUriResult.handle property is deprecated; use ParseUriResult.identifier instead.");
+				logger.warn("The ParseUriResult.handle property is deprecated; use ParseUriResult.identifier instead.");
 				return identifier;
 			}
 		};
@@ -2480,12 +2447,11 @@ var ContextImpl = class ContextImpl {
 			type: "featuredTags",
 			identifier,
 			get handle() {
-				logger$2.warn("The ParseUriResult.handle property is deprecated; use ParseUriResult.identifier instead.");
+				logger.warn("The ParseUriResult.handle property is deprecated; use ParseUriResult.identifier instead.");
 				return identifier;
 			}
 		};
-		const collectionTypes = ["collection", "orderedCollection"];
-		const collectionRegex = /* @__PURE__ */ new RegExp(`^(${collectionTypes.join("|")}):(.*)$`);
+		const collectionRegex = new RegExp(`^(${["collection", "orderedCollection"].join("|")}):(.*)$`);
 		const match = route.name.match(collectionRegex);
 		if (match !== null) {
 			const [, type, name] = match;
@@ -2501,12 +2467,12 @@ var ContextImpl = class ContextImpl {
 		return null;
 	}
 	async getActorKeyPairs(identifier) {
-		const logger$2 = getLogger([
+		const logger = getLogger([
 			"fedify",
 			"federation",
 			"actor"
 		]);
-		if (this.invokedFromActorKeyPairsDispatcher != null) logger$2.warn("Context.getActorKeyPairs({getActorKeyPairsIdentifier}) method is invoked from the actor key pairs dispatcher ({actorKeyPairsDispatcherIdentifier}); this may cause an infinite loop.", {
+		if (this.invokedFromActorKeyPairsDispatcher != null) logger.warn("Context.getActorKeyPairs({getActorKeyPairsIdentifier}) method is invoked from the actor key pairs dispatcher ({actorKeyPairsDispatcherIdentifier}); this may cause an infinite loop.", {
 			getActorKeyPairsIdentifier: identifier,
 			actorKeyPairsDispatcherIdentifier: this.invokedFromActorKeyPairsDispatcher.identifier
 		});
@@ -2514,7 +2480,7 @@ var ContextImpl = class ContextImpl {
 		try {
 			keyPairs = await this.getKeyPairsFromIdentifier(identifier);
 		} catch (_) {
-			logger$2.warn("No actor key pairs dispatcher registered.");
+			logger.warn("No actor key pairs dispatcher registered.");
 			return [];
 		}
 		const owner = this.getActorUri(identifier);
@@ -2538,7 +2504,7 @@ var ContextImpl = class ContextImpl {
 		return result;
 	}
 	async getKeyPairsFromIdentifier(identifier) {
-		const logger$2 = getLogger([
+		const logger = getLogger([
 			"fedify",
 			"federation",
 			"actor"
@@ -2549,7 +2515,7 @@ var ContextImpl = class ContextImpl {
 			actorUri = this.getActorUri(identifier);
 		} catch (error) {
 			if (error instanceof RouterError) {
-				logger$2.warn(error.message);
+				logger.warn(error.message);
 				return [];
 			}
 			throw error;
@@ -2558,7 +2524,7 @@ var ContextImpl = class ContextImpl {
 			...this,
 			invokedFromActorKeyPairsDispatcher: { identifier }
 		}), identifier);
-		if (keyPairs.length < 1) logger$2.warn("No key pairs found for actor {identifier}.", { identifier });
+		if (keyPairs.length < 1) logger.warn("No key pairs found for actor {identifier}.", { identifier });
 		let i = 0;
 		const result = [];
 		for (const keyPair of keyPairs) {
@@ -2606,8 +2572,7 @@ var ContextImpl = class ContextImpl {
 			} else identifierPromise = Promise.resolve(identity.identifier);
 			return identifierPromise.then((identifier) => {
 				if (identifier == null) return this.documentLoader;
-				const keyPair = this.getRsaKeyPairFromIdentifier(identifier);
-				return keyPair.then((pair) => pair == null ? this.documentLoader : this.federation.authenticatedDocumentLoaderFactory(pair));
+				return this.getRsaKeyPairFromIdentifier(identifier).then((pair) => pair == null ? this.documentLoader : this.federation.authenticatedDocumentLoaderFactory(pair));
 			});
 		}
 		return this.federation.authenticatedDocumentLoaderFactory(identity);
@@ -2649,8 +2614,7 @@ var ContextImpl = class ContextImpl {
 		});
 	}
 	sendActivity(sender, recipients, activity, options = {}) {
-		const tracer = this.tracerProvider.getTracer(deno_default.name, deno_default.version);
-		return tracer.startActiveSpan(this.federation.outboxQueue == null || options.immediate ? "activitypub.outbox" : "activitypub.fanout", {
+		return this.tracerProvider.getTracer(name, version).startActiveSpan(this.federation.outboxQueue == null || options.immediate ? "activitypub.outbox" : "activitypub.fanout", {
 			kind: this.federation.outboxQueue == null || options.immediate ? SpanKind.CLIENT : SpanKind.PRODUCER,
 			attributes: {
 				"activitypub.activity.type": getTypeId(activity).href,
@@ -2675,7 +2639,7 @@ var ContextImpl = class ContextImpl {
 		});
 	}
 	async sendActivityInternal(sender, recipients, activity, options, span) {
-		const logger$2 = getLogger([
+		const logger = getLogger([
 			"fedify",
 			"federation",
 			"outbox"
@@ -2689,7 +2653,7 @@ var ContextImpl = class ContextImpl {
 				if ("username" in sender) username = sender.username;
 				else {
 					username = sender.handle;
-					logger$2.warn("The \"handle\" property for the sender parameter is deprecated; use \"identifier\" or \"username\" instead.", { sender });
+					logger.warn("The \"handle\" property for the sender parameter is deprecated; use \"identifier\" or \"username\" instead.", { sender });
 				}
 				if (this.federation.actorCallbacks?.handleMapper == null) identifier = username;
 				else {
@@ -2725,7 +2689,7 @@ var ContextImpl = class ContextImpl {
 		for (const activityTransformer of this.federation.activityTransformers) activity = activityTransformer(activity, this);
 		span?.setAttribute("activitypub.activity.id", activity?.id?.href ?? "");
 		if (activity.actorId == null) {
-			logger$2.error("Activity {activityId} to send does not have an actor.", {
+			logger.error("Activity {activityId} to send does not have an actor.", {
 				activity,
 				activityId: activity?.id?.href
 			});
@@ -2736,7 +2700,7 @@ var ContextImpl = class ContextImpl {
 			preferSharedInbox: options.preferSharedInbox,
 			excludeBaseUris: options.excludeBaseUris
 		});
-		logger$2.debug("Sending activity {activityId} to inboxes:\n{inboxes}", {
+		logger.debug("Sending activity {activityId} to inboxes:\n{inboxes}", {
 			inboxes: globalThis.Object.keys(inboxes),
 			activityId: activity.id?.href,
 			activity
@@ -2770,7 +2734,7 @@ var ContextImpl = class ContextImpl {
 			traceContext: carrier
 		};
 		if (!this.federation.manuallyStartQueue) this.federation._startQueueInternal(this.data);
-		this.federation.fanoutQueue.enqueue(message);
+		await this.federation.fanoutQueue.enqueue(message);
 	}
 	async *getFollowers(identifier) {
 		if (this.federation.followersCallbacks == null) throw new Error("No followers collection dispatcher registered.");
@@ -2787,16 +2751,14 @@ var ContextImpl = class ContextImpl {
 			"outbox"
 		]).warn("Since the followers collection dispatcher returned null for no cursor (i.e., one-shot dispatcher), the pagination is used to fetch \"followers\".  However, it is recommended to implement the one-shot dispatcher for better performance.", { identifier });
 		while (cursor != null) {
-			const result$1 = await this.federation.followersCallbacks.dispatcher(this, identifier, cursor);
-			if (result$1 == null) break;
-			for (const recipient of result$1.items) yield recipient;
-			cursor = result$1.nextCursor ?? null;
+			const result = await this.federation.followersCallbacks.dispatcher(this, identifier, cursor);
+			if (result == null) break;
+			for (const recipient of result.items) yield recipient;
+			cursor = result.nextCursor ?? null;
 		}
 	}
 	routeActivity(recipient, activity, options = {}) {
-		const tracerProvider = this.tracerProvider ?? this.tracerProvider;
-		const tracer = tracerProvider.getTracer(deno_default.name, deno_default.version);
-		return tracer.startActiveSpan("activitypub.inbox", {
+		return (this.tracerProvider ?? this.tracerProvider).getTracer(name, version).startActiveSpan("activitypub.inbox", {
 			kind: this.federation.inboxQueue == null || options.immediate ? SpanKind.INTERNAL : SpanKind.PRODUCER,
 			attributes: { "activitypub.activity.type": getTypeId(activity).href }
 		}, async (span) => {
@@ -2824,7 +2786,7 @@ var ContextImpl = class ContextImpl {
 		});
 	}
 	async routeActivityInternal(recipient, activity, options = {}, span) {
-		const logger$2 = getLogger([
+		const logger = getLogger([
 			"fedify",
 			"federation",
 			"inbox"
@@ -2832,19 +2794,18 @@ 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 verifyObject(Activity, json, {
+		if (await verifyObject(Activity, json, {
 			contextLoader,
 			documentLoader: options.documentLoader ?? this.documentLoader,
 			tracerProvider: options.tracerProvider ?? this.tracerProvider,
 			keyCache
-		});
-		if (verified == null) {
-			logger$2.debug("Object Integrity Proofs are not verified.", {
+		}) == null) {
+			logger.debug("Object Integrity Proofs are not verified.", {
 				recipient,
 				activity: json
 			});
 			if (activity.id == null) {
-				logger$2.debug("Activity is missing an ID; unable to fetch.", {
+				logger.debug("Activity is missing an ID; unable to fetch.", {
 					recipient,
 					activity: json
 				});
@@ -2852,26 +2813,26 @@ var ContextImpl = class ContextImpl {
 			}
 			const fetched = await this.lookupObject(activity.id, options);
 			if (fetched == null) {
-				logger$2.debug("Failed to fetch the remote activity object {activityId}.", {
+				logger.debug("Failed to fetch the remote activity object {activityId}.", {
 					recipient,
 					activity: json,
 					activityId: activity.id.href
 				});
 				return false;
 			} else if (!(fetched instanceof Activity)) {
-				logger$2.debug("Fetched object is not an Activity.", {
+				logger.debug("Fetched object is not an Activity.", {
 					recipient,
 					activity: await fetched.toJsonLd({ contextLoader })
 				});
 				return false;
 			} else if (fetched.id?.href !== activity.id.href) {
-				logger$2.debug("Fetched activity object has a different ID; failed to verify.", {
+				logger.debug("Fetched activity object has a different ID; failed to verify.", {
 					recipient,
 					activity: await fetched.toJsonLd({ contextLoader })
 				});
 				return false;
 			} else if (fetched.actorIds.length < 1) {
-				logger$2.debug("Fetched activity object is missing an actor; unable to verify.", {
+				logger.debug("Fetched activity object is missing an actor; unable to verify.", {
 					recipient,
 					activity: await fetched.toJsonLd({ contextLoader })
 				});
@@ -2879,15 +2840,15 @@ var ContextImpl = class ContextImpl {
 			}
 			const activityId = fetched.id;
 			if (!fetched.actorIds.every((actor) => actor.origin === activityId.origin)) {
-				logger$2.debug("Fetched activity object has actors from different origins; unable to verify.", {
+				logger.debug("Fetched activity object has actors from different origins; unable to verify.", {
 					recipient,
 					activity: await fetched.toJsonLd({ contextLoader })
 				});
 				return false;
 			}
-			logger$2.debug("Successfully fetched the remote activity object {activityId}; ignore the original activity and use the fetched one, which is trustworthy.");
+			logger.debug("Successfully fetched the remote activity object {activityId}; ignore the original activity and use the fetched one, which is trustworthy.");
 			activity = fetched;
-		} else logger$2.debug("Object Integrity Proofs are verified.", {
+		} else logger.debug("Object Integrity Proofs are verified.", {
 			recipient,
 			activity: json
 		});
@@ -3013,8 +2974,7 @@ var InboxContextImpl = class InboxContextImpl extends ContextImpl {
 		});
 	}
 	forwardActivity(forwarder, recipients, options) {
-		const tracer = this.tracerProvider.getTracer(deno_default.name, deno_default.version);
-		return tracer.startActiveSpan("activitypub.outbox", {
+		return this.tracerProvider.getTracer(name, version).startActiveSpan("activitypub.outbox", {
 			kind: this.federation.outboxQueue == null || options?.immediate ? SpanKind.CLIENT : SpanKind.PRODUCER,
 			attributes: { "activitypub.activity.type": this.activityType }
 		}, async (span) => {
@@ -3033,7 +2993,7 @@ var InboxContextImpl = class InboxContextImpl extends ContextImpl {
 		});
 	}
 	async forwardActivityInternal(forwarder, recipients, options) {
-		const logger$2 = getLogger([
+		const logger = getLogger([
 			"fedify",
 			"federation",
 			"inbox"
@@ -3047,7 +3007,7 @@ var InboxContextImpl = class InboxContextImpl extends ContextImpl {
 				if ("username" in forwarder) username = forwarder.username;
 				else {
 					username = forwarder.handle;
-					logger$2.warn("The \"handle\" property for the forwarder parameter is deprecated; use \"identifier\" or \"username\" instead.", { forwarder });
+					logger.warn("The \"handle\" property for the forwarder parameter is deprecated; use \"identifier\" or \"username\" instead.", { forwarder });
 				}
 				if (this.federation.actorCallbacks?.handleMapper == null) identifier = username;
 				else {
@@ -3065,14 +3025,13 @@ var InboxContextImpl = class InboxContextImpl extends ContextImpl {
 		if (!hasSignature(this.activity)) {
 			let hasProof;
 			try {
-				const activity = await Activity.fromJsonLd(this.activity, this);
-				hasProof = await activity.getProof() != null;
+				hasProof = await (await Activity.fromJsonLd(this.activity, this)).getProof() != null;
 			} catch {
 				hasProof = false;
 			}
 			if (!hasProof) {
 				if (options?.skipIfUnsigned) return;
-				logger$2.warn("The received activity {activityId} is not signed; even if it is forwarded to other servers as is, it may not be accepted by them due to the lack of a signature/proof.");
+				logger.warn("The received activity {activityId} is not signed; even if it is forwarded to other servers as is, it may not be accepted by them due to the lack of a signature/proof.");
 			}
 		}
 		if (recipients === "followers") {
@@ -3086,14 +3045,14 @@ var InboxContextImpl = class InboxContextImpl extends ContextImpl {
 			preferSharedInbox: options?.preferSharedInbox,
 			excludeBaseUris: options?.excludeBaseUris
 		});
-		logger$2.debug("Forwarding activity {activityId} to inboxes:\n{inboxes}", {
+		logger.debug("Forwarding activity {activityId} to inboxes:\n{inboxes}", {
 			inboxes: globalThis.Object.keys(inboxes),
 			activityId: this.activityId,
 			activity: this.activity
 		});
 		if (options?.immediate || this.federation.outboxQueue == null) {
-			if (options?.immediate) logger$2.debug("Forwarding activity immediately without queue since immediate option is set.");
-			else logger$2.debug("Forwarding activity immediately without queue since queue is not set.");
+			if (options?.immediate) logger.debug("Forwarding activity immediately without queue since immediate option is set.");
+			else logger.debug("Forwarding activity immediately without queue since queue is not set.");
 			const promises = [];
 			for (const inbox in inboxes) promises.push(sendActivity({
 				keys,
@@ -3108,7 +3067,7 @@ var InboxContextImpl = class InboxContextImpl extends ContextImpl {
 			await Promise.all(promises);
 			return;
 		}
-		logger$2.debug("Enqueuing activity {activityId} to forward later.", {
+		logger.debug("Enqueuing activity {activityId} to forward later.", {
 			activityId: this.activityId,
 			activity: this.activity
 		});
@@ -3144,10 +3103,9 @@ var InboxContextImpl = class InboxContextImpl extends ContextImpl {
 		const { outboxQueue } = this.federation;
 		if (outboxQueue.enqueueMany == null) {
 			const promises = messages.map((m) => outboxQueue.enqueue(m));
-			const results = await Promise.allSettled(promises);
-			const errors = results.filter((r) => r.status === "rejected").map((r) => r.reason);
+			const errors = (await Promise.allSettled(promises)).filter((r) => r.status === "rejected").map((r) => r.reason);
 			if (errors.length > 0) {
-				logger$2.error("Failed to enqueue activity {activityId} to forward later:\n{errors}", {
+				logger.error("Failed to enqueue activity {activityId} to forward later:\n{errors}", {
 					activityId: this.activityId,
 					errors
 				});
@@ -3157,7 +3115,7 @@ var InboxContextImpl = class InboxContextImpl extends ContextImpl {
 		} else try {
 			await outboxQueue.enqueueMany(messages);
 		} catch (error) {
-			logger$2.error("Failed to enqueue activity {activityId} to forward later:\n{error}", {
+			logger.error("Failed to enqueue activity {activityId} to forward later:\n{error}", {
 				activityId: this.activityId,
 				error
 			});
@@ -3212,10 +3170,7 @@ function unauthorized(_request) {
 function getRequestId(request) {
 	const traceId = request.headers.get("X-Request-Id") || request.headers.get("X-Correlation-Id") || request.headers.get("Traceparent")?.split("-")[1];
 	if (traceId != null) return traceId;
-	const timestamp = Date.now().toString(36);
-	const random = Math.random().toString(36).slice(2, 8);
-	return `req_${timestamp}${random}`;
+	return `req_${Date.now().toString(36)}${Math.random().toString(36).slice(2, 8)}`;
 }
-
 //#endregion
-export { ContextImpl, FederationImpl, InboxContextImpl, KvSpecDeterminer, acceptsJsonLd, actorDehydrator, autoIdAssigner, createFederation, handleActor, handleCollection, handleCustomCollection, handleInbox, handleNodeInfo, handleNodeInfoJrd, handleObject, handleWebFinger, respondWithObject, respondWithObjectIfAcceptable };
+export { actorDehydrator as _, createFederation as a, handleCollection as c, handleObject as d, respondWithObject as f, handleNodeInfoJrd as g, handleNodeInfo as h, KvSpecDeterminer as i, handleCustomCollection as l, handleWebFinger as m, FederationImpl as n, acceptsJsonLd as o, respondWithObjectIfAcceptable as p, InboxContextImpl as r, handleActor as s, ContextImpl as t, handleInbox as u, autoIdAssigner as v };