@fedify/fedify 1.9.6 → 1.9.8

package/dist/{middleware-CGbvIGvy.cjs → middleware-C188G4Go.cjs}

@@ -1,27 +1,23 @@
-
-          const { Temporal } = require("@js-temporal/polyfill");
-          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-BIFI3OS7.cjs');
-const require_actor = require('./actor-DlS-Q8hE.cjs');
-const require_lookup = require('./lookup-C4_dVYz7.cjs');
-const require_key = require('./key-DjS1X9TG.cjs');
-const require_http = require('./http-BgopPF-8.cjs');
-const require_proof = require('./proof-CX7ujFFX.cjs');
-const require_types = require('./types-CGnM1vft.cjs');
-const require_authdocloader = require('./authdocloader-CT_V4Z7G.cjs');
-const require_vocab = require('./vocab-BFy1CS5L.cjs');
-const __logtape_logtape = require_chunk.__toESM(require("@logtape/logtape"));
-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 __opentelemetry_semantic_conventions = require_chunk.__toESM(require("@opentelemetry/semantic-conventions"));
-const node_url = require_chunk.__toESM(require("node:url"));
-
+const { Temporal } = require("@js-temporal/polyfill");
+const { URLPattern } = require("urlpattern-polyfill");
+const require_docloader = require("./docloader-BVuUhBLI.cjs");
+const require_transformers = require("./transformers-BM0M8hnW.cjs");
+const require_actor = require("./actor-DxfJk4lY.cjs");
+const require_lookup = require("./lookup-BiIPmTwB.cjs");
+const require_key = require("./key-B-wFdaPB.cjs");
+const require_http = require("./http-DKw-O_VY.cjs");
+const require_proof = require("./proof-DLOy7HYU.cjs");
+const require_types = require("./types-DpM4FhjW.cjs");
+const require_authdocloader = require("./authdocloader-BrhFB421.cjs");
+const require_vocab_mod = require("./vocab/mod.cjs");
+let _logtape_logtape = require("@logtape/logtape");
+let _opentelemetry_api = require("@opentelemetry/api");
+let byte_encodings_hex = require("byte-encodings/hex");
+let es_toolkit = require("es-toolkit");
+let uri_template_router = require("uri-template-router");
+let url_template = require("url-template");
+let _opentelemetry_semantic_conventions = require("@opentelemetry/semantic-conventions");
+let node_url = require("node:url");
 //#region src/federation/inbox.ts
 var InboxListenerSet = class InboxListenerSet {
 	#listeners;
@@ -58,7 +54,7 @@ var InboxListenerSet = class InboxListenerSet {
 };
 let warnedAboutDefaultIdempotency = false;
 async function routeActivity({ context: ctx, json, activity, recipient, inboxListeners, inboxContextFactory, inboxErrorHandler, kv, kvPrefixes, queue, span, tracerProvider, idempotencyStrategy }) {
-	const logger$1 = (0, __logtape_logtape.getLogger)([
+	const logger = (0, _logtape_logtape.getLogger)([
 		"fedify",
 		"federation",
 		"inbox"
@@ -68,14 +64,12 @@ async function routeActivity({ context: ctx, json, activity, recipient, inboxLis
 		const inboxContext = inboxContextFactory(recipient, json, activity.id?.href, require_actor.getTypeId(activity).href);
 		const strategy = idempotencyStrategy ?? "per-origin";
 		if (idempotencyStrategy === void 0 && !warnedAboutDefaultIdempotency) {
-			logger$1.warn("Using default idempotency strategy 'per-origin'. This default will change to 'per-inbox' in Fedify 2.0. Please explicitly set the idempotency strategy using .withIdempotency().");
+			logger.warn("Using default idempotency strategy 'per-origin'. This default will change to 'per-inbox' in Fedify 2.0. Please explicitly set the idempotency strategy using .withIdempotency().");
 			warnedAboutDefaultIdempotency = true;
 		}
 		let keyString;
-		if (typeof strategy === "function") {
-			const result = await strategy(inboxContext, activity);
-			keyString = result;
-		} else switch (strategy) {
+		if (typeof strategy === "function") keyString = await strategy(inboxContext, activity);
+		else switch (strategy) {
 			case "global":
 				keyString = activity.id.href;
 				break;
@@ -90,24 +84,23 @@ async function routeActivity({ context: ctx, json, activity, recipient, inboxLis
 		if (keyString != null) cacheKey = [...kvPrefixes.activityIdempotence, keyString];
 	}
 	if (cacheKey != null) {
-		const cached = await kv.get(cacheKey);
-		if (cached === true) {
-			logger$1.debug("Activity {activityId} has already been processed.", {
+		if (await kv.get(cacheKey) === true) {
+			logger.debug("Activity {activityId} has already been processed.", {
 				activityId: activity.id?.href,
 				activity: json,
 				recipient
 			});
 			span.setStatus({
-				code: __opentelemetry_api.SpanStatusCode.UNSET,
+				code: _opentelemetry_api.SpanStatusCode.UNSET,
 				message: `Activity ${activity.id?.href} has already been processed.`
 			});
 			return "alreadyProcessed";
 		}
 	}
 	if (activity.actorId == null) {
-		logger$1.error("Missing actor.", { activity: json });
+		logger.error("Missing actor.", { activity: json });
 		span.setStatus({
-			code: __opentelemetry_api.SpanStatusCode.ERROR,
+			code: _opentelemetry_api.SpanStatusCode.ERROR,
 			message: "Missing actor."
 		});
 		return "missingActor";
@@ -115,7 +108,7 @@ async function routeActivity({ context: ctx, json, activity, recipient, inboxLis
 	span.setAttribute("activitypub.actor.id", activity.actorId.href);
 	if (queue != null) {
 		const carrier = {};
-		__opentelemetry_api.propagation.inject(__opentelemetry_api.context.active(), carrier);
+		_opentelemetry_api.propagation.inject(_opentelemetry_api.context.active(), carrier);
 		try {
 			await queue.enqueue({
 				type: "inbox",
@@ -128,80 +121,78 @@ async function routeActivity({ context: ctx, json, activity, recipient, inboxLis
 				traceContext: carrier
 			});
 		} catch (error) {
-			logger$1.error("Failed to enqueue the incoming activity {activityId}:\n{error}", {
+			logger.error("Failed to enqueue the incoming activity {activityId}:\n{error}", {
 				error,
 				activityId: activity.id?.href,
 				activity: json,
 				recipient
 			});
 			span.setStatus({
-				code: __opentelemetry_api.SpanStatusCode.ERROR,
+				code: _opentelemetry_api.SpanStatusCode.ERROR,
 				message: `Failed to enqueue the incoming activity ${activity.id?.href}.`
 			});
 			throw error;
 		}
-		logger$1.info("Activity {activityId} is enqueued.", {
+		logger.info("Activity {activityId} is enqueued.", {
 			activityId: activity.id?.href,
 			activity: json,
 			recipient
 		});
 		return "enqueued";
 	}
-	tracerProvider = tracerProvider ?? __opentelemetry_api.trace.getTracerProvider();
-	const tracer = tracerProvider.getTracer(require_docloader.deno_default.name, require_docloader.deno_default.version);
-	return await tracer.startActiveSpan("activitypub.dispatch_inbox_listener", { kind: __opentelemetry_api.SpanKind.INTERNAL }, async (span$1) => {
+	tracerProvider = tracerProvider ?? _opentelemetry_api.trace.getTracerProvider();
+	return await tracerProvider.getTracer(require_docloader.name, require_docloader.version).startActiveSpan("activitypub.dispatch_inbox_listener", { kind: _opentelemetry_api.SpanKind.INTERNAL }, async (span) => {
 		const dispatched = inboxListeners?.dispatchWithClass(activity);
 		if (dispatched == null) {
-			logger$1.error("Unsupported activity type:\n{activity}", {
+			logger.error("Unsupported activity type:\n{activity}", {
 				activity: json,
 				recipient
 			});
-			span$1.setStatus({
-				code: __opentelemetry_api.SpanStatusCode.UNSET,
+			span.setStatus({
+				code: _opentelemetry_api.SpanStatusCode.UNSET,
 				message: `Unsupported activity type: ${require_actor.getTypeId(activity).href}`
 			});
-			span$1.end();
+			span.end();
 			return "unsupportedActivity";
 		}
 		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(inboxContextFactory(recipient, json, activity?.id?.href, require_actor.getTypeId(activity).href), activity);
 		} catch (error) {
 			try {
 				await inboxErrorHandler?.(ctx, error);
-			} catch (error$1) {
-				logger$1.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,
 					activityId: activity.id?.href,
 					activity: json,
 					recipient
 				});
 			}
-			logger$1.error("Failed to process the incoming activity {activityId}:\n{error}", {
+			logger.error("Failed to process the incoming activity {activityId}:\n{error}", {
 				error,
 				activityId: activity.id?.href,
 				activity: json,
 				recipient
 			});
-			span$1.setStatus({
-				code: __opentelemetry_api.SpanStatusCode.ERROR,
+			span.setStatus({
+				code: _opentelemetry_api.SpanStatusCode.ERROR,
 				message: String(error)
 			});
-			span$1.end();
+			span.end();
 			return "error";
 		}
 		if (cacheKey != null) await kv.set(cacheKey, true, { ttl: Temporal.Duration.from({ days: 1 }) });
-		logger$1.info("Activity {activityId} has been processed.", {
+		logger.info("Activity {activityId} has been processed.", {
 			activityId: activity.id?.href,
 			activity: json,
 			recipient
 		});
-		span$1.end();
+		span.end();
 		return "success";
 	});
 }
-
 //#endregion
 //#region src/federation/router.ts
 function cloneInnerRouter(router) {
@@ -309,7 +300,6 @@ var RouterError = class extends Error {
 		this.name = "RouterError";
 	}
 };
-
 //#endregion
 //#region src/federation/builder.ts
 var FederationBuilderImpl = class {
@@ -345,8 +335,8 @@ var FederationBuilderImpl = class {
 		this.collectionTypeIds = {};
 	}
 	async build(options) {
-		const { FederationImpl: FederationImpl$1 } = await Promise.resolve().then(() => require("./middleware-CJ4W2ir5.cjs"));
-		const f = new FederationImpl$1(options);
+		const { FederationImpl } = await Promise.resolve().then(() => require("./middleware-9ByEpBvV.cjs"));
+		const f = new FederationImpl(options);
 		const trailingSlashInsensitiveValue = f.router.trailingSlashInsensitive;
 		f.router = this.router.clone();
 		f.router.trailingSlashInsensitive = trailingSlashInsensitiveValue;
@@ -371,31 +361,31 @@ var FederationBuilderImpl = class {
 		return f;
 	}
 	_getTracer() {
-		return __opentelemetry_api.trace.getTracer(require_docloader.deno_default.name, require_docloader.deno_default.version);
+		return _opentelemetry_api.trace.getTracer(require_docloader.name, require_docloader.version);
 	}
 	setActorDispatcher(path, dispatcher) {
 		if (this.router.has("actor")) throw new RouterError("Actor dispatcher already set.");
 		const variables = this.router.add(path, "actor");
 		if (variables.size !== 1 || !(variables.has("identifier") || variables.has("handle"))) throw new RouterError("Path for actor dispatcher must have one variable: {identifier}");
-		if (variables.has("handle")) (0, __logtape_logtape.getLogger)([
+		if (variables.has("handle")) (0, _logtape_logtape.getLogger)([
 			"fedify",
 			"federation",
 			"actor"
 		]).warn("The {{handle}} variable in the actor dispatcher path is deprecated. Use {{identifier}} instead.");
-		const callbacks = { dispatcher: async (context$2, identifier) => {
+		const callbacks = { dispatcher: async (context, identifier) => {
 			const actor = await this._getTracer().startActiveSpan("activitypub.dispatch_actor", {
-				kind: __opentelemetry_api.SpanKind.SERVER,
+				kind: _opentelemetry_api.SpanKind.SERVER,
 				attributes: { "fedify.actor.identifier": identifier }
 			}, async (span) => {
 				try {
-					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);
-					return actor$1;
+					const actor = await dispatcher(context, identifier);
+					span.setAttribute("activitypub.actor.id", (actor?.id ?? context.getActorUri(identifier)).href);
+					if (actor == null) span.setStatus({ code: _opentelemetry_api.SpanStatusCode.ERROR });
+					else span.setAttribute("activitypub.actor.type", require_actor.getTypeId(actor).href);
+					return actor;
 				} catch (error) {
 					span.setStatus({
-						code: __opentelemetry_api.SpanStatusCode.ERROR,
+						code: _opentelemetry_api.SpanStatusCode.ERROR,
 						message: String(error)
 					});
 					throw error;
@@ -404,64 +394,64 @@ var FederationBuilderImpl = class {
 				}
 			});
 			if (actor == null) return null;
-			const logger$1 = (0, __logtape_logtape.getLogger)([
+			const logger = (0, _logtape_logtape.getLogger)([
 				"fedify",
 				"federation",
 				"actor"
 			]);
-			if (actor.id == null) logger$1.warn("Actor dispatcher returned an actor without an id property.  Set the property with Context.getActorUri(identifier).");
-			else if (actor.id.href != context$2.getActorUri(identifier).href) logger$1.warn("Actor dispatcher returned an actor with an id property that does not match the actor URI.  Set the property with Context.getActorUri(identifier).");
+			if (actor.id == null) logger.warn("Actor dispatcher returned an actor without an id property.  Set the property with Context.getActorUri(identifier).");
+			else if (actor.id.href != context.getActorUri(identifier).href) logger.warn("Actor dispatcher returned an actor with an id property that does not match the actor URI.  Set the property with Context.getActorUri(identifier).");
 			if (this.followingCallbacks != null && this.followingCallbacks.dispatcher != null) {
-				if (actor.followingId == null) logger$1.warn("You configured a following collection dispatcher, but the actor does not have a following property.  Set the property with Context.getFollowingUri(identifier).");
-				else if (actor.followingId.href != context$2.getFollowingUri(identifier).href) logger$1.warn("You configured a following collection dispatcher, but the actor's following property does not match the following collection URI.  Set the property with Context.getFollowingUri(identifier).");
+				if (actor.followingId == null) logger.warn("You configured a following collection dispatcher, but the actor does not have a following property.  Set the property with Context.getFollowingUri(identifier).");
+				else if (actor.followingId.href != context.getFollowingUri(identifier).href) logger.warn("You configured a following collection dispatcher, but the actor's following property does not match the following collection URI.  Set the property with Context.getFollowingUri(identifier).");
 			}
 			if (this.followersCallbacks != null && this.followersCallbacks.dispatcher != null) {
-				if (actor.followersId == null) logger$1.warn("You configured a followers collection dispatcher, but the actor does not have a followers property.  Set the property with Context.getFollowersUri(identifier).");
-				else if (actor.followersId.href != context$2.getFollowersUri(identifier).href) logger$1.warn("You configured a followers collection dispatcher, but the actor's followers property does not match the followers collection URI.  Set the property with Context.getFollowersUri(identifier).");
+				if (actor.followersId == null) logger.warn("You configured a followers collection dispatcher, but the actor does not have a followers property.  Set the property with Context.getFollowersUri(identifier).");
+				else if (actor.followersId.href != context.getFollowersUri(identifier).href) logger.warn("You configured a followers collection dispatcher, but the actor's followers property does not match the followers collection URI.  Set the property with Context.getFollowersUri(identifier).");
 			}
 			if (this.outboxCallbacks != null && this.outboxCallbacks.dispatcher != null) {
-				if (actor?.outboxId == null) logger$1.warn("You configured an outbox collection dispatcher, but the actor does not have an outbox property.  Set the property with Context.getOutboxUri(identifier).");
-				else if (actor.outboxId.href != context$2.getOutboxUri(identifier).href) logger$1.warn("You configured an outbox collection dispatcher, but the actor's outbox property does not match the outbox collection URI.  Set the property with Context.getOutboxUri(identifier).");
+				if (actor?.outboxId == null) logger.warn("You configured an outbox collection dispatcher, but the actor does not have an outbox property.  Set the property with Context.getOutboxUri(identifier).");
+				else if (actor.outboxId.href != context.getOutboxUri(identifier).href) logger.warn("You configured an outbox collection dispatcher, but the actor's outbox property does not match the outbox collection URI.  Set the property with Context.getOutboxUri(identifier).");
 			}
 			if (this.likedCallbacks != null && this.likedCallbacks.dispatcher != null) {
-				if (actor?.likedId == null) logger$1.warn("You configured a liked collection dispatcher, but the actor does not have a liked property.  Set the property with Context.getLikedUri(identifier).");
-				else if (actor.likedId.href != context$2.getLikedUri(identifier).href) logger$1.warn("You configured a liked collection dispatcher, but the actor's liked property does not match the liked collection URI.  Set the property with Context.getLikedUri(identifier).");
+				if (actor?.likedId == null) logger.warn("You configured a liked collection dispatcher, but the actor does not have a liked property.  Set the property with Context.getLikedUri(identifier).");
+				else if (actor.likedId.href != context.getLikedUri(identifier).href) logger.warn("You configured a liked collection dispatcher, but the actor's liked property does not match the liked collection URI.  Set the property with Context.getLikedUri(identifier).");
 			}
 			if (this.featuredCallbacks != null && this.featuredCallbacks.dispatcher != null) {
-				if (actor?.featuredId == null) logger$1.warn("You configured a featured collection dispatcher, but the actor does not have a featured property.  Set the property with Context.getFeaturedUri(identifier).");
-				else if (actor.featuredId.href != context$2.getFeaturedUri(identifier).href) logger$1.warn("You configured a featured collection dispatcher, but the actor's featured property does not match the featured collection URI.  Set the property with Context.getFeaturedUri(identifier).");
+				if (actor?.featuredId == null) logger.warn("You configured a featured collection dispatcher, but the actor does not have a featured property.  Set the property with Context.getFeaturedUri(identifier).");
+				else if (actor.featuredId.href != context.getFeaturedUri(identifier).href) logger.warn("You configured a featured collection dispatcher, but the actor's featured property does not match the featured collection URI.  Set the property with Context.getFeaturedUri(identifier).");
 			}
 			if (this.featuredTagsCallbacks != null && this.featuredTagsCallbacks.dispatcher != null) {
-				if (actor?.featuredTagsId == null) logger$1.warn("You configured a featured tags collection dispatcher, but the actor does not have a featuredTags property.  Set the property with Context.getFeaturedTagsUri(identifier).");
-				else if (actor.featuredTagsId.href != context$2.getFeaturedTagsUri(identifier).href) logger$1.warn("You configured a featured tags collection dispatcher, but the actor's featuredTags property does not match the featured tags collection URI.  Set the property with Context.getFeaturedTagsUri(identifier).");
+				if (actor?.featuredTagsId == null) logger.warn("You configured a featured tags collection dispatcher, but the actor does not have a featuredTags property.  Set the property with Context.getFeaturedTagsUri(identifier).");
+				else if (actor.featuredTagsId.href != context.getFeaturedTagsUri(identifier).href) logger.warn("You configured a featured tags collection dispatcher, but the actor's featuredTags property does not match the featured tags collection URI.  Set the property with Context.getFeaturedTagsUri(identifier).");
 			}
 			if (this.router.has("inbox")) {
-				if (actor.inboxId == null) logger$1.warn("You configured inbox listeners, but the actor does not have an inbox property.  Set the property with Context.getInboxUri(identifier).");
-				else if (actor.inboxId.href != context$2.getInboxUri(identifier).href) logger$1.warn("You configured inbox listeners, but the actor's inbox property does not match the inbox URI.  Set the property with Context.getInboxUri(identifier).");
-				if (actor.endpoints == null || actor.endpoints.sharedInbox == null) logger$1.warn("You configured inbox listeners, but the actor does not have a endpoints.sharedInbox property.  Set the property with Context.getInboxUri().");
-				else if (actor.endpoints.sharedInbox.href != context$2.getInboxUri().href) logger$1.warn("You configured inbox listeners, but the actor's endpoints.sharedInbox property does not match the shared inbox URI.  Set the property with Context.getInboxUri().");
+				if (actor.inboxId == null) logger.warn("You configured inbox listeners, but the actor does not have an inbox property.  Set the property with Context.getInboxUri(identifier).");
+				else if (actor.inboxId.href != context.getInboxUri(identifier).href) logger.warn("You configured inbox listeners, but the actor's inbox property does not match the inbox URI.  Set the property with Context.getInboxUri(identifier).");
+				if (actor.endpoints == null || actor.endpoints.sharedInbox == null) logger.warn("You configured inbox listeners, but the actor does not have a endpoints.sharedInbox property.  Set the property with Context.getInboxUri().");
+				else if (actor.endpoints.sharedInbox.href != context.getInboxUri().href) logger.warn("You configured inbox listeners, but the actor's endpoints.sharedInbox property does not match the shared inbox URI.  Set the property with Context.getInboxUri().");
 			}
 			if (callbacks.keyPairsDispatcher != null) {
-				if (actor.publicKeyId == null) logger$1.warn("You configured a key pairs dispatcher, but the actor does not have a publicKey property.  Set the property with Context.getActorKeyPairs(identifier).");
-				if (actor.assertionMethodId == null) logger$1.warn("You configured a key pairs dispatcher, but the actor does not have an assertionMethod property.  Set the property with Context.getActorKeyPairs(identifier).");
+				if (actor.publicKeyId == null) logger.warn("You configured a key pairs dispatcher, but the actor does not have a publicKey property.  Set the property with Context.getActorKeyPairs(identifier).");
+				if (actor.assertionMethodId == null) logger.warn("You configured a key pairs dispatcher, but the actor does not have an assertionMethod property.  Set the property with Context.getActorKeyPairs(identifier).");
 			}
 			return actor;
 		} };
 		this.actorCallbacks = callbacks;
 		const setters = {
-			setKeyPairsDispatcher: (dispatcher$1) => {
+			setKeyPairsDispatcher: (dispatcher) => {
 				callbacks.keyPairsDispatcher = (ctx, identifier) => this._getTracer().startActiveSpan("activitypub.dispatch_actor_key_pairs", {
-					kind: __opentelemetry_api.SpanKind.SERVER,
+					kind: _opentelemetry_api.SpanKind.SERVER,
 					attributes: {
 						"activitypub.actor.id": ctx.getActorUri(identifier).href,
 						"fedify.actor.identifier": identifier
 					}
 				}, async (span) => {
 					try {
-						return await dispatcher$1(ctx, identifier);
+						return await dispatcher(ctx, identifier);
 					} catch (e) {
 						span.setStatus({
-							code: __opentelemetry_api.SpanStatusCode.ERROR,
+							code: _opentelemetry_api.SpanStatusCode.ERROR,
 							message: String(e)
 						});
 						throw e;
@@ -488,8 +478,7 @@ var FederationBuilderImpl = class {
 	}
 	setNodeInfoDispatcher(path, dispatcher) {
 		if (this.router.has("nodeInfo")) throw new RouterError("NodeInfo dispatcher already set.");
-		const variables = this.router.add(path, "nodeInfo");
-		if (variables.size !== 0) throw new RouterError("Path for NodeInfo dispatcher must have no variables.");
+		if (this.router.add(path, "nodeInfo").size !== 0) throw new RouterError("Path for NodeInfo dispatcher must have no variables.");
 		this.nodeInfoDispatcher = dispatcher;
 	}
 	setWebFingerLinksDispatcher(dispatcher) {
@@ -502,9 +491,8 @@ var FederationBuilderImpl = class {
 		if (variables.size < 1) throw new RouterError("Path for object dispatcher must have at least one variable.");
 		const callbacks = {
 			dispatcher: (ctx, values) => {
-				const tracer = this._getTracer();
-				return tracer.startActiveSpan("activitypub.dispatch_object", {
-					kind: __opentelemetry_api.SpanKind.SERVER,
+				return this._getTracer().startActiveSpan("activitypub.dispatch_object", {
+					kind: _opentelemetry_api.SpanKind.SERVER,
 					attributes: {
 						"fedify.object.type": cls.typeId.href,
 						...globalThis.Object.fromEntries(globalThis.Object.entries(values).map(([k, v]) => [`fedify.object.values.${k}`, v]))
@@ -513,12 +501,12 @@ var FederationBuilderImpl = class {
 					try {
 						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 });
+						if (object == null) span.setStatus({ code: _opentelemetry_api.SpanStatusCode.ERROR });
 						else span.setAttribute("activitypub.object.type", require_actor.getTypeId(object).href);
 						return object;
 					} catch (e) {
 						span.setStatus({
-							code: __opentelemetry_api.SpanStatusCode.ERROR,
+							code: _opentelemetry_api.SpanStatusCode.ERROR,
 							message: String(e)
 						});
 						throw e;
@@ -544,7 +532,7 @@ var FederationBuilderImpl = class {
 		} else {
 			const variables = this.router.add(path, "inbox");
 			if (variables.size !== 1 || !(variables.has("identifier") || variables.has("handle"))) throw new RouterError("Path for inbox dispatcher must have one variable: {identifier}");
-			if (variables.has("handle")) (0, __logtape_logtape.getLogger)([
+			if (variables.has("handle")) (0, _logtape_logtape.getLogger)([
 				"fedify",
 				"federation",
 				"inbox"
@@ -577,7 +565,7 @@ var FederationBuilderImpl = class {
 		if (this.router.has("outbox")) throw new RouterError("Outbox dispatcher already set.");
 		const variables = this.router.add(path, "outbox");
 		if (variables.size !== 1 || !(variables.has("identifier") || variables.has("handle"))) throw new RouterError("Path for outbox dispatcher must have one variable: {identifier}");
-		if (variables.has("handle")) (0, __logtape_logtape.getLogger)([
+		if (variables.has("handle")) (0, _logtape_logtape.getLogger)([
 			"fedify",
 			"federation",
 			"outbox"
@@ -608,7 +596,7 @@ var FederationBuilderImpl = class {
 		if (this.router.has("following")) throw new RouterError("Following collection dispatcher already set.");
 		const variables = this.router.add(path, "following");
 		if (variables.size !== 1 || !(variables.has("identifier") || variables.has("handle"))) throw new RouterError("Path for following collection dispatcher must have one variable: {identifier}");
-		if (variables.has("handle")) (0, __logtape_logtape.getLogger)([
+		if (variables.has("handle")) (0, _logtape_logtape.getLogger)([
 			"fedify",
 			"federation",
 			"collection"
@@ -639,7 +627,7 @@ var FederationBuilderImpl = class {
 		if (this.router.has("followers")) throw new RouterError("Followers collection dispatcher already set.");
 		const variables = this.router.add(path, "followers");
 		if (variables.size !== 1 || !(variables.has("identifier") || variables.has("handle"))) throw new RouterError("Path for followers collection dispatcher must have one variable: {identifier}");
-		if (variables.has("handle")) (0, __logtape_logtape.getLogger)([
+		if (variables.has("handle")) (0, _logtape_logtape.getLogger)([
 			"fedify",
 			"federation",
 			"collection"
@@ -670,7 +658,7 @@ var FederationBuilderImpl = class {
 		if (this.router.has("liked")) throw new RouterError("Liked collection dispatcher already set.");
 		const variables = this.router.add(path, "liked");
 		if (variables.size !== 1 || !(variables.has("identifier") || variables.has("handle"))) throw new RouterError("Path for liked collection dispatcher must have one variable: {identifier}");
-		if (variables.has("handle")) (0, __logtape_logtape.getLogger)([
+		if (variables.has("handle")) (0, _logtape_logtape.getLogger)([
 			"fedify",
 			"federation",
 			"collection"
@@ -701,7 +689,7 @@ var FederationBuilderImpl = class {
 		if (this.router.has("featured")) throw new RouterError("Featured collection dispatcher already set.");
 		const variables = this.router.add(path, "featured");
 		if (variables.size !== 1 || !(variables.has("identifier") || variables.has("handle"))) throw new RouterError("Path for featured collection dispatcher must have one variable: {identifier}");
-		if (variables.has("handle")) (0, __logtape_logtape.getLogger)([
+		if (variables.has("handle")) (0, _logtape_logtape.getLogger)([
 			"fedify",
 			"federation",
 			"collection"
@@ -732,7 +720,7 @@ var FederationBuilderImpl = class {
 		if (this.router.has("featuredTags")) throw new RouterError("Featured tags collection dispatcher already set.");
 		const variables = this.router.add(path, "featuredTags");
 		if (variables.size !== 1 || !(variables.has("identifier") || variables.has("handle"))) throw new RouterError("Path for featured tags collection dispatcher must have one variable: {identifier}");
-		if (variables.has("handle")) (0, __logtape_logtape.getLogger)([
+		if (variables.has("handle")) (0, _logtape_logtape.getLogger)([
 			"fedify",
 			"federation",
 			"collection"
@@ -767,15 +755,14 @@ var FederationBuilderImpl = class {
 			const variables = this.router.add(inboxPath, "inbox");
 			if (variables.size !== 1 || !(variables.has("identifier") || variables.has("handle"))) throw new RouterError("Path for inbox must have one variable: {identifier}");
 			this.inboxPath = inboxPath;
-			if (variables.has("handle")) (0, __logtape_logtape.getLogger)([
+			if (variables.has("handle")) (0, _logtape_logtape.getLogger)([
 				"fedify",
 				"federation",
 				"inbox"
 			]).warn("The {{handle}} variable in the inbox path is deprecated. Use {{identifier}} instead.");
 		}
 		if (sharedInboxPath != null) {
-			const siVars = this.router.add(sharedInboxPath, "sharedInbox");
-			if (siVars.size !== 0) throw new RouterError("Path for shared inbox must have no variables.");
+			if (this.router.add(sharedInboxPath, "sharedInbox").size !== 0) throw new RouterError("Path for shared inbox must have no variables.");
 		}
 		const listeners = this.inboxListeners = new InboxListenerSet();
 		const setters = {
@@ -809,8 +796,7 @@ var FederationBuilderImpl = class {
 		const routeName = `${collectionType}:${this.#uniqueCollectionId(name)}`;
 		if (this.router.has(routeName)) throw new RouterError(`Collection dispatcher for ${strName} already set.`);
 		if (this.collectionCallbacks[name] != null) throw new RouterError(`Collection dispatcher for ${strName} already set.`);
-		const variables = this.router.add(path, routeName);
-		if (variables.size < 1) throw new RouterError("Path for collection dispatcher must have at least one variable.");
+		if (this.router.add(path, routeName).size < 1) throw new RouterError("Path for collection dispatcher must have at least one variable.");
 		const callbacks = { dispatcher };
 		this.collectionCallbacks[name] = callbacks;
 		this.collectionTypeIds[name] = itemType;
@@ -845,8 +831,7 @@ var FederationBuilderImpl = class {
 	getCollectionPath(name, values) {
 		if (!(name in this.collectionCallbacks)) return null;
 		const routeName = this.#uniqueCollectionId(name);
-		const path = this.router.build(`collection:${routeName}`, values) ?? this.router.build(`orderedCollection:${routeName}`, values);
-		return path;
+		return this.router.build(`collection:${routeName}`, values) ?? this.router.build(`orderedCollection:${routeName}`, values);
 	}
 	/**
 	* Converts a name (string or symbol) to a unique string identifier.
@@ -869,7 +854,6 @@ var FederationBuilderImpl = class {
 function createFederationBuilder() {
 	return new FederationBuilderImpl();
 }
-
 //#endregion
 //#region src/federation/collection.ts
 /**
@@ -888,8 +872,8 @@ async function digest(uris) {
 		if (processed.has(u)) continue;
 		processed.add(u);
 		const encoded = encoder.encode(u);
-		const digest$1 = new Uint8Array(await crypto.subtle.digest("SHA-256", encoded));
-		for (let i = 0; i < 32; i++) result[i] ^= digest$1[i];
+		const digest = new Uint8Array(await crypto.subtle.digest("SHA-256", encoded));
+		for (let i = 0; i < 32; i++) result[i] ^= digest[i];
 	}
 	return result;
 }
@@ -907,10 +891,8 @@ async function buildCollectionSynchronizationHeader(collectionId, actorIds) {
 	const baseUrl = new URL(anyActorId);
 	const url = new URL(collectionId);
 	url.searchParams.set("base-url", `${baseUrl.origin}/`);
-	const hash = (0, byte_encodings_hex.encodeHex)(await digest(actorIds));
-	return `collectionId="${collectionId}", url="${url}", digest="${hash}"`;
+	return `collectionId="${collectionId}", url="${url}", digest="${(0, byte_encodings_hex.encodeHex)(await digest(actorIds))}"`;
 }
-
 //#endregion
 //#region src/federation/keycache.ts
 const NULL_KEY_CACHE_VALUE = { _fedify: "key-unavailable" };
@@ -944,7 +926,7 @@ var KvKeyCache = class {
 				return await require_actor.Multikey.fromJsonLd(serialized, this.options);
 			} catch {
 				await this.kv.delete([...this.prefix, keyId.href]);
-				return void 0;
+				return;
 			}
 		}
 	}
@@ -959,7 +941,6 @@ var KvKeyCache = class {
 		await this.kv.set([...this.prefix, keyId.href], serialized);
 	}
 };
-
 //#endregion
 //#region src/federation/negotiation.ts
 function compareSpecs(a, b) {
@@ -1004,8 +985,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;
@@ -1014,10 +995,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) {
@@ -1034,24 +1013,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$2, actorDispatcher, authorizePredicate, onNotFound, onNotAcceptable, onUnauthorized }) {
-	const logger$1 = (0, __logtape_logtape.getLogger)([
+async function handleActor(request, { identifier, context, actorDispatcher, authorizePredicate, onNotFound, onNotAcceptable, onUnauthorized }) {
+	const logger = (0, _logtape_logtape.getLogger)([
 		"fedify",
 		"federation",
 		"actor"
 	]);
 	if (actorDispatcher == null) {
-		logger$1.debug("Actor dispatcher is not set.", { identifier });
+		logger.debug("Actor dispatcher is not set.", { identifier });
 		return await onNotFound(request);
 	}
-	const actor = await actorDispatcher(context$2, identifier);
+	const actor = await actorDispatcher(context, identifier);
 	if (actor == null) {
-		logger$1.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$2.getSignedKey();
+		let key = await context.getSignedKey();
 		key = key?.clone({}, { $warning: {
 			category: [
 				"fedify",
@@ -1060,7 +1039,7 @@ async function handleActor(request, { identifier, context: context$2, 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$2.getSignedKeyOwner();
+		let keyOwner = await context.getSignedKeyOwner();
 		keyOwner = keyOwner?.clone({}, { $warning: {
 			category: [
 				"fedify",
@@ -1069,9 +1048,9 @@ async function handleActor(request, { identifier, context: context$2, 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$2, identifier, key, keyOwner)) return await onUnauthorized(request);
+		if (!await authorizePredicate(context, identifier, key, keyOwner)) return await onUnauthorized(request);
 	}
-	const jsonLd = await actor.toJsonLd(context$2);
+	const jsonLd = await actor.toJsonLd(context);
 	return new Response(JSON.stringify(jsonLd), { headers: {
 		"Content-Type": "application/activity+json",
 		Vary: "Accept"
@@ -1084,13 +1063,13 @@ 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, objectDispatcher, authorizePredicate, onNotFound, onNotAcceptable, onUnauthorized }) {
 	if (objectDispatcher == null) return await onNotFound(request);
-	const object = await objectDispatcher(context$2, 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$2.getSignedKey();
+		let key = await context.getSignedKey();
 		key = key?.clone({}, { $warning: {
 			category: [
 				"fedify",
@@ -1099,7 +1078,7 @@ async function handleObject(request, { values, context: context$2, 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$2.getSignedKeyOwner();
+		let keyOwner = await context.getSignedKeyOwner();
 		keyOwner = keyOwner?.clone({}, { $warning: {
 			category: [
 				"fedify",
@@ -1108,9 +1087,9 @@ async function handleObject(request, { values, context: context$2, 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$2, values, key, keyOwner)) return await onUnauthorized(request);
+		if (!await authorizePredicate(context, values, key, keyOwner)) return await onUnauthorized(request);
 	}
-	const jsonLd = await object.toJsonLd(context$2);
+	const jsonLd = await object.toJsonLd(context);
 	return new Response(JSON.stringify(jsonLd), { headers: {
 		"Content-Type": "application/activity+json",
 		Vary: "Accept"
@@ -1126,21 +1105,20 @@ 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 }) {
-	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 url = new URL(request.url);
-	const cursor = url.searchParams.get("cursor");
+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 ?? _opentelemetry_api.trace.getTracerProvider();
+	const tracer = tracerProvider.getTracer(require_docloader.name, require_docloader.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$2, identifier);
-		const totalItems = filter == null ? await collectionCallbacks.counter?.(context$2, 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: __opentelemetry_api.SpanKind.SERVER,
+				kind: _opentelemetry_api.SpanKind.SERVER,
 				attributes: {
 					"activitypub.collection.id": baseUri.href,
 					"activitypub.collection.type": require_actor.OrderedCollection.typeId.href
@@ -1148,9 +1126,9 @@ 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$2, identifier, null, filter);
+					const page = await collectionCallbacks.dispatcher(context, identifier, null, filter);
 					if (page == null) {
-						span.setStatus({ code: __opentelemetry_api.SpanStatusCode.ERROR });
+						span.setStatus({ code: _opentelemetry_api.SpanStatusCode.ERROR });
 						return await onNotFound(request);
 					}
 					const { items } = page;
@@ -1158,7 +1136,7 @@ async function handleCollection(request, { name, identifier, uriGetter, filter,
 					return items;
 				} catch (e) {
 					span.setStatus({
-						code: __opentelemetry_api.SpanStatusCode.ERROR,
+						code: _opentelemetry_api.SpanStatusCode.ERROR,
 						message: String(e)
 					});
 					throw e;
@@ -1170,15 +1148,15 @@ async function handleCollection(request, { name, identifier, uriGetter, filter,
 			collection = new require_actor.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$2, identifier);
-			const first = new URL(context$2.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$2.url);
+				last = new URL(context.url);
 				last.searchParams.set("cursor", lastCursor);
 			}
 			collection = new require_actor.OrderedCollection({
@@ -1191,8 +1169,8 @@ 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}`, {
-			kind: __opentelemetry_api.SpanKind.SERVER,
+		const pageOrResponse = await tracer.startActiveSpan(`activitypub.dispatch_collection_page ${name$2}`, {
+			kind: _opentelemetry_api.SpanKind.SERVER,
 			attributes: {
 				"activitypub.collection.id": uri.href,
 				"activitypub.collection.type": require_actor.OrderedCollectionPage.typeId.href,
@@ -1200,16 +1178,16 @@ async function handleCollection(request, { name, identifier, uriGetter, filter,
 			}
 		}, async (span) => {
 			try {
-				const page = await collectionCallbacks.dispatcher(context$2, identifier, cursor, filter);
+				const page = await collectionCallbacks.dispatcher(context, identifier, cursor, filter);
 				if (page == null) {
-					span.setStatus({ code: __opentelemetry_api.SpanStatusCode.ERROR });
+					span.setStatus({ code: _opentelemetry_api.SpanStatusCode.ERROR });
 					return await onNotFound(request);
 				}
 				span.setAttribute("fedify.collection.items", page.items.length);
 				return page;
 			} catch (e) {
 				span.setStatus({
-					code: __opentelemetry_api.SpanStatusCode.ERROR,
+					code: _opentelemetry_api.SpanStatusCode.ERROR,
 					message: String(e)
 				});
 				throw e;
@@ -1221,27 +1199,27 @@ async function handleCollection(request, { name, identifier, uriGetter, filter,
 		const { items, prevCursor, nextCursor } = pageOrResponse;
 		let prev = null;
 		if (prevCursor != null) {
-			prev = new URL(context$2.url);
+			prev = new URL(context.url);
 			prev.searchParams.set("cursor", prevCursor);
 		}
 		let next = null;
 		if (nextCursor != null) {
-			next = new URL(context$2.url);
+			next = new URL(context.url);
 			next.searchParams.set("cursor", nextCursor);
 		}
-		const partOf = new URL(context$2.url);
+		const partOf = new URL(context.url);
 		partOf.searchParams.delete("cursor");
 		collection = new require_actor.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$2.getSignedKey();
+		let key = await context.getSignedKey();
 		key = key?.clone({}, { $warning: {
 			category: [
 				"fedify",
@@ -1250,7 +1228,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$2.getSignedKeyOwner();
+		let keyOwner = await context.getSignedKeyOwner();
 		keyOwner = keyOwner?.clone({}, { $warning: {
 			category: [
 				"fedify",
@@ -1259,9 +1237,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$2, 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$2);
+	const jsonLd = await collection.toJsonLd(context);
 	return new Response(JSON.stringify(jsonLd), { headers: {
 		"Content-Type": "application/activity+json",
 		Vary: "Accept"
@@ -1285,7 +1263,7 @@ function filterCollectionItems(items, collectionName, filterPredicate) {
 		else mappedItem = item.id;
 		if (filterPredicate != null && !filterPredicate(item)) {
 			if (!logged) {
-				(0, __logtape_logtape.getLogger)([
+				(0, _logtape_logtape.getLogger)([
 					"fedify",
 					"federation",
 					"collection"
@@ -1306,10 +1284,8 @@ function filterCollectionItems(items, collectionName, filterPredicate) {
 * @returns A promise that resolves to an HTTP response.
 */
 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);
-	return await tracer.startActiveSpan("activitypub.inbox", {
-		kind: options.queue == null ? __opentelemetry_api.SpanKind.SERVER : __opentelemetry_api.SpanKind.PRODUCER,
+	return await (options.tracerProvider ?? _opentelemetry_api.trace.getTracerProvider()).getTracer(require_docloader.name, require_docloader.version).startActiveSpan("activitypub.inbox", {
+		kind: options.queue == null ? _opentelemetry_api.SpanKind.SERVER : _opentelemetry_api.SpanKind.PRODUCER,
 		attributes: { "activitypub.shared_inbox": options.recipient == null }
 	}, async (span) => {
 		if (options.recipient != null) span.setAttribute("fedify.inbox.recipient", options.recipient);
@@ -1317,7 +1293,7 @@ async function handleInbox(request, options) {
 			return await handleInboxInternal(request, options, span);
 		} catch (e) {
 			span.setStatus({
-				code: __opentelemetry_api.SpanStatusCode.ERROR,
+				code: _opentelemetry_api.SpanStatusCode.ERROR,
 				message: String(e)
 			});
 			throw e;
@@ -1336,33 +1312,32 @@ 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$1 = (0, __logtape_logtape.getLogger)([
+	const logger = (0, _logtape_logtape.getLogger)([
 		"fedify",
 		"federation",
 		"inbox"
 	]);
 	if (actorDispatcher == null) {
-		logger$1.error("Actor dispatcher is not set.", { recipient });
+		logger.error("Actor dispatcher is not set.", { recipient });
 		span.setStatus({
-			code: __opentelemetry_api.SpanStatusCode.ERROR,
+			code: _opentelemetry_api.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$1.error("Actor {recipient} not found.", { recipient });
+		if (await actorDispatcher(ctx, recipient) == null) {
+			logger.error("Actor {recipient} not found.", { recipient });
 			span.setStatus({
-				code: __opentelemetry_api.SpanStatusCode.ERROR,
+				code: _opentelemetry_api.SpanStatusCode.ERROR,
 				message: `Actor ${recipient} not found.`
 			});
 			return await onNotFound(request);
 		}
 	}
 	if (request.bodyUsed) {
-		logger$1.error("Request body has already been read.", { recipient });
+		logger.error("Request body has already been read.", { recipient });
 		span.setStatus({
-			code: __opentelemetry_api.SpanStatusCode.ERROR,
+			code: _opentelemetry_api.SpanStatusCode.ERROR,
 			message: "Request body has already been read."
 		});
 		return new Response("Internal server error.", {
@@ -1370,9 +1345,9 @@ async function handleInboxInternal(request, parameters, span) {
 			headers: { "Content-Type": "text/plain; charset=utf-8" }
 		});
 	} else if (request.body?.locked) {
-		logger$1.error("Request body is locked.", { recipient });
+		logger.error("Request body is locked.", { recipient });
 		span.setStatus({
-			code: __opentelemetry_api.SpanStatusCode.ERROR,
+			code: _opentelemetry_api.SpanStatusCode.ERROR,
 			message: "Request body is locked."
 		});
 		return new Response("Internal server error.", {
@@ -1384,21 +1359,21 @@ async function handleInboxInternal(request, parameters, span) {
 	try {
 		json = await request.clone().json();
 	} catch (error) {
-		logger$1.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$1.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
 			});
 		}
 		span.setStatus({
-			code: __opentelemetry_api.SpanStatusCode.ERROR,
+			code: _opentelemetry_api.SpanStatusCode.ERROR,
 			message: `Failed to parse JSON:\n${error}`
 		});
 		return new Response("Invalid JSON.", {
@@ -1417,7 +1392,7 @@ async function handleInboxInternal(request, parameters, span) {
 		});
 	} catch (error) {
 		if (error instanceof Error && error.name === "jsonld.SyntaxError") {
-			logger$1.error("Failed to parse JSON-LD:\n{error}", {
+			logger.error("Failed to parse JSON-LD:\n{error}", {
 				recipient,
 				error
 			});
@@ -1431,13 +1406,13 @@ async function handleInboxInternal(request, parameters, span) {
 	const jsonWithoutSig = require_proof.detachSignature(json);
 	let activity = null;
 	if (ldSigVerified) {
-		logger$1.debug("Linked Data Signatures are verified.", {
+		logger.debug("Linked Data Signatures are verified.", {
 			recipient,
 			json
 		});
 		activity = await require_actor.Activity.fromJsonLd(jsonWithoutSig, ctx);
 	} else {
-		logger$1.debug("Linked Data Signatures are not verified.", {
+		logger.debug("Linked Data Signatures are not verified.", {
 			recipient,
 			json
 		});
@@ -1449,22 +1424,22 @@ async function handleInboxInternal(request, parameters, span) {
 				tracerProvider
 			});
 		} catch (error) {
-			logger$1.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$1.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
 				});
 			}
 			span.setStatus({
-				code: __opentelemetry_api.SpanStatusCode.ERROR,
+				code: _opentelemetry_api.SpanStatusCode.ERROR,
 				message: `Failed to parse activity:\n${error}`
 			});
 			return new Response("Invalid activity.", {
@@ -1472,11 +1447,11 @@ async function handleInboxInternal(request, parameters, span) {
 				headers: { "Content-Type": "text/plain; charset=utf-8" }
 			});
 		}
-		if (activity == null) logger$1.debug("Object Integrity Proofs are not verified.", {
+		if (activity == null) logger.debug("Object Integrity Proofs are not verified.", {
 			recipient,
 			activity: json
 		});
-		else logger$1.debug("Object Integrity Proofs are verified.", {
+		else logger.debug("Object Integrity Proofs are verified.", {
 			recipient,
 			activity: json
 		});
@@ -1492,17 +1467,16 @@ async function handleInboxInternal(request, parameters, span) {
 				tracerProvider
 			});
 			if (key == null) {
-				logger$1.error("Failed to verify the request's HTTP Signatures.", { recipient });
+				logger.error("Failed to verify the request's HTTP Signatures.", { recipient });
 				span.setStatus({
-					code: __opentelemetry_api.SpanStatusCode.ERROR,
+					code: _opentelemetry_api.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$1.debug("HTTP Signatures are verified.", { recipient });
+			} else logger.debug("HTTP Signatures are verified.", { recipient });
 			httpSigKey = key;
 		}
 		activity = await require_actor.Activity.fromJsonLd(jsonWithoutSig, ctx);
@@ -1510,14 +1484,14 @@ async function handleInboxInternal(request, parameters, span) {
 	if (activity.id != null) span.setAttribute("activitypub.activity.id", activity.id.href);
 	span.setAttribute("activitypub.activity.type", require_actor.getTypeId(activity).href);
 	if (httpSigKey != null && !await require_proof.doesActorOwnKey(activity, httpSigKey, ctx)) {
-		logger$1.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,
 			actorId: activity.actorId?.href
 		});
 		span.setStatus({
-			code: __opentelemetry_api.SpanStatusCode.ERROR,
+			code: _opentelemetry_api.SpanStatusCode.ERROR,
 			message: `The signer (${httpSigKey.id?.href}) and the actor (${activity.actorId?.href}) do not match.`
 		});
 		return new Response("The signer and the actor do not match.", {
@@ -1577,12 +1551,12 @@ async function handleInboxInternal(request, parameters, span) {
 * @since 1.8.0
 */
 const handleCustomCollection = exceptWrapper(_handleCustomCollection);
-async function _handleCustomCollection(request, { name, values, context: context$2, tracerProvider, collectionCallbacks: callbacks, filterPredicate }) {
+async function _handleCustomCollection(request, { name, values, context, tracerProvider, collectionCallbacks: callbacks, filterPredicate }) {
 	verifyDefined(callbacks);
 	verifyJsonLdRequest(request);
-	await authIfNeeded(context$2, values, callbacks);
+	await authIfNeeded(context, 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, callbacks, tracerProvider, require_actor.Collection, require_actor.CollectionPage, filterPredicate).fetchCollection(cursor).toJsonLd().then(respondAsActivity);
 }
 /**
 * Handles an ordered collection request.
@@ -1596,12 +1570,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$2, tracerProvider, collectionCallbacks: callbacks, filterPredicate }) {
+async function _handleOrderedCollection(request, { name, values, context, tracerProvider, collectionCallbacks: callbacks, filterPredicate }) {
 	verifyDefined(callbacks);
 	verifyJsonLdRequest(request);
-	await authIfNeeded(context$2, values, callbacks);
+	await authIfNeeded(context, 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, callbacks, tracerProvider, require_actor.OrderedCollection, require_actor.OrderedCollectionPage, filterPredicate).fetchCollection(cursor).toJsonLd().then(respondAsActivity);
 }
 /**
 * Handling custom collections with support for pagination and filtering.
@@ -1651,17 +1625,17 @@ var CustomCollectionHandler = class {
 	* @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;
+	constructor(name$1, values, context, callbacks, tracerProvider = _opentelemetry_api.trace.getTracerProvider(), Collection, CollectionPage, filterPredicate) {
+		this.name = name$1;
 		this.values = values;
-		this.context = context$2;
+		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(require_docloader.deno_default.name, require_docloader.deno_default.version);
+		this.#tracer = this.tracerProvider.getTracer(require_docloader.name, require_docloader.version);
 		this.#id = new URL(this.context.url);
 		this.#dispatcher = callbacks.dispatcher.bind(callbacks);
 	}
@@ -1690,8 +1664,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();
@@ -1752,7 +1726,7 @@ var CustomCollectionHandler = class {
 	* @returns A promise that resolves to the page items.
 	*/
 	async getPages({ cursor = null, totalItems = null }) {
-		return await this.#tracer.startActiveSpan(`${this.ATTRS.DISPATCH_COLLECTION} ${this.name}`, this.spanOptions(__opentelemetry_api.SpanKind.SERVER, cursor), this.spanPages({
+		return await this.#tracer.startActiveSpan(`${this.ATTRS.DISPATCH_COLLECTION} ${this.name}`, this.spanOptions(_opentelemetry_api.SpanKind.SERVER, cursor), this.spanPages({
 			cursor,
 			totalItems
 		}));
@@ -1785,7 +1759,7 @@ var CustomCollectionHandler = class {
 		} catch (e) {
 			const message = e instanceof Error ? e.message : String(e);
 			span.setStatus({
-				code: __opentelemetry_api.SpanStatusCode.ERROR,
+				code: _opentelemetry_api.SpanStatusCode.ERROR,
 				message
 			});
 			throw e;
@@ -1839,7 +1813,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));
 	}
 	/**
@@ -1913,11 +1887,9 @@ const verifyJsonLdRequest = (request) => {
 * @throws {UnauthorizedError} If authorization fails.
 * @since 1.8.0
 */
-const authIfNeeded = async (context$2, values, { authorizePredicate: authorize = void 0 }) => {
+const authIfNeeded = async (context, values, { authorizePredicate: authorize = void 0 }) => {
 	if (authorize === void 0) return;
-	const key = (await context$2.getSignedKey())?.clone({}, warning.key) ?? null;
-	const keyOwner = (await context$2.getSignedKeyOwner())?.clone({}, warning.keyOwner) ?? null;
-	if (!await authorize(context$2, 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 = {
@@ -2031,7 +2003,6 @@ async function respondWithObjectIfAcceptable(object, request, options) {
 	response.headers.set("Vary", "Accept");
 	return response;
 }
-
 //#endregion
 //#region src/nodeinfo/handler.ts
 /**
@@ -2041,10 +2012,9 @@ async function respondWithObjectIfAcceptable(object, request, options) {
 * @param parameters The parameters for handling the request.
 * @returns The response to the request.
 */
-async function handleNodeInfo(_request, { context: context$2, nodeInfoDispatcher }) {
-	const promise = nodeInfoDispatcher(context$2);
-	const nodeInfo = promise instanceof Promise ? await promise : promise;
-	const json = require_types.nodeInfoToJson(nodeInfo);
+async function handleNodeInfo(_request, { context, nodeInfoDispatcher }) {
+	const promise = nodeInfoDispatcher(context);
+	const json = require_types.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#\"" } });
 }
 /**
@@ -2054,25 +2024,23 @@ async function handleNodeInfo(_request, { context: context$2, nodeInfoDispatcher
 * @param context The request context.
 * @returns The response to the request.
 */
-function handleNodeInfoJrd(_request, context$2) {
+function handleNodeInfoJrd(_request, context) {
 	const links = [];
 	try {
 		links.push({
 			rel: "http://nodeinfo.diaspora.software/ns/schema/2.1",
-			href: context$2.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/webfinger/handler.ts
-const logger = (0, __logtape_logtape.getLogger)([
+const logger = (0, _logtape_logtape.getLogger)([
 	"fedify",
 	"webfinger",
 	"server"
@@ -2086,14 +2054,14 @@ const logger = (0, __logtape_logtape.getLogger)([
 */
 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) => {
+	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 });
+			span.setStatus({ code: response.ok ? _opentelemetry_api.SpanStatusCode.UNSET : _opentelemetry_api.SpanStatusCode.ERROR });
 			return response;
 		} catch (error) {
 			span.setStatus({
-				code: __opentelemetry_api.SpanStatusCode.ERROR,
+				code: _opentelemetry_api.SpanStatusCode.ERROR,
 				message: String(error)
 			});
 			throw error;
@@ -2102,12 +2070,12 @@ async function handleWebFinger(request, options) {
 		}
 	});
 }
-async function handleWebFingerInternal(request, { context: context$2, 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$2.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;
@@ -2123,26 +2091,26 @@ async function handleWebFingerInternal(request, { context: context$2, 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$2, 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$2.parseUri(resourceUrl);
+	const uriParsed = context.parseUri(resourceUrl);
 	if (uriParsed?.type != "actor") {
 		const match = /^acct:([^@]+)@([^@]+)$/.exec(resource);
 		if (match == null) {
-			const result = await actorAliasMapper?.(context$2, 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 ? (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);
+			if (normalizedHost != context.url.host && normalizedHost != host) return await onNotFound(request);
 			else {
 				identifier = await mapUsernameToIdentifier(match[1]);
 				resourceUrl = new URL(`acct:${match[1]}@${normalizedHost}`);
@@ -2150,14 +2118,14 @@ async function handleWebFingerInternal(request, { context: context$2, host, acto
 		}
 	} else identifier = uriParsed.identifier;
 	if (identifier == null) return await onNotFound(request);
-	const actor = await actorDispatcher(context$2, 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$2.getActorUri(identifier).href,
+		href: context.getActorUri(identifier).href,
 		type: "application/activity+json"
 	}];
 	for (const url of actor.urls) if (url instanceof require_actor.Link && url.href != null) links.push({
@@ -2179,16 +2147,16 @@ async function handleWebFingerInternal(request, { context: context$2, host, acto
 		links.push(link);
 	}
 	if (webFingerLinksDispatcher != null) {
-		const customLinks = await webFingerLinksDispatcher(context$2, 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$2.url.host}`);
-		if (host != null && host !== context$2.url.host) aliases.push(`acct:${actor.preferredUsername}@${context$2.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$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}`)) {
+	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}`);
 	}
@@ -2202,7 +2170,6 @@ async function handleWebFingerInternal(request, { context: context$2, host, acto
 		"Access-Control-Allow-Origin": "*"
 	} });
 }
-
 //#endregion
 //#region src/federation/retry.ts
 /**
@@ -2233,7 +2200,6 @@ function createExponentialBackoffPolicy(options = {}) {
 		return Temporal.Duration.compare(delay, maxDelay) > 0 ? maxDelay : delay;
 	};
 }
-
 //#endregion
 //#region src/federation/send.ts
 /**
@@ -2270,10 +2236,9 @@ function extractInboxes({ recipients, preferSharedInbox, excludeBaseUris }) {
 * @throws {Error} If the activity fails to send.
 */
 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);
-	return tracer.startActiveSpan("activitypub.send_activity", {
-		kind: __opentelemetry_api.SpanKind.CLIENT,
+	const tracerProvider = options.tracerProvider ?? _opentelemetry_api.trace.getTracerProvider();
+	return tracerProvider.getTracer(require_docloader.name, require_docloader.version).startActiveSpan("activitypub.send_activity", {
+		kind: _opentelemetry_api.SpanKind.CLIENT,
 		attributes: { "activitypub.shared_inbox": options.sharedInbox ?? false }
 	}, async (span) => {
 		if (options.activityId != null) span.setAttribute("activitypub.activity.id", options.activityId);
@@ -2285,7 +2250,7 @@ function sendActivity(options) {
 			});
 		} catch (e) {
 			span.setStatus({
-				code: __opentelemetry_api.SpanStatusCode.ERROR,
+				code: _opentelemetry_api.SpanStatusCode.ERROR,
 				message: String(e)
 			});
 			throw e;
@@ -2295,7 +2260,7 @@ function sendActivity(options) {
 	});
 }
 async function sendActivityInternal({ activity, activityId, keys, inbox, headers, specDeterminer, tracerProvider }) {
-	const logger$1 = (0, __logtape_logtape.getLogger)([
+	const logger = (0, _logtape_logtape.getLogger)([
 		"fedify",
 		"federation",
 		"outbox"
@@ -2312,7 +2277,7 @@ async function sendActivityInternal({ activity, activityId, keys, inbox, headers
 		rsaKey = key;
 		break;
 	}
-	if (rsaKey == null) logger$1.warn("No supported key found to sign the request to {inbox}.  The request will be sent without a signature.  In order to sign the request, at least one RSASSA-PKCS1-v1_5 key must be provided.", {
+	if (rsaKey == null) logger.warn("No supported key found to sign the request to {inbox}.  The request will be sent without a signature.  In order to sign the request, at least one RSASSA-PKCS1-v1_5 key must be provided.", {
 		inbox: inbox.href,
 		keys: keys.map((pair) => ({
 			keyId: pair.keyId.href,
@@ -2326,7 +2291,7 @@ async function sendActivityInternal({ activity, activityId, keys, inbox, headers
 			specDeterminer
 		});
 	} catch (error) {
-		logger$1.error("Failed to send activity {activityId} to {inbox}:\n{error}", {
+		logger.error("Failed to send activity {activityId} to {inbox}:\n{error}", {
 			activityId,
 			inbox: inbox.href,
 			error
@@ -2340,7 +2305,7 @@ async function sendActivityInternal({ activity, activityId, keys, inbox, headers
 		} catch (_) {
 			error = "";
 		}
-		logger$1.error("Failed to send activity {activityId} to {inbox} ({status} {statusText}):\n{error}", {
+		logger.error("Failed to send activity {activityId} to {inbox} ({status} {statusText}):\n{error}", {
 			activityId,
 			inbox: inbox.href,
 			status: response.status,
@@ -2350,7 +2315,6 @@ 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}`);
 	}
 }
-
 //#endregion
 //#region src/federation/middleware.ts
 /**
@@ -2388,7 +2352,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 	firstKnock;
 	constructor(options) {
 		super();
-		const logger$1 = (0, __logtape_logtape.getLogger)(["fedify", "federation"]);
+		const logger = (0, _logtape_logtape.getLogger)(["fedify", "federation"]);
 		this.kv = options.kv;
 		this.kvPrefixes = {
 			activityIdempotence: ["_fedify", "activityIdempotence"],
@@ -2445,7 +2409,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$1.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 require_docloader.kvCache({
 				loader: require_docloader.getDocumentLoader({
@@ -2459,7 +2423,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$1.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) => require_authdocloader.getAuthenticatedDocumentLoader(identity, {
 			allowPrivateAddress,
@@ -2474,7 +2438,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 		this.outboxRetryPolicy = options.outboxRetryPolicy ?? createExponentialBackoffPolicy();
 		this.inboxRetryPolicy = options.inboxRetryPolicy ?? createExponentialBackoffPolicy();
 		this.activityTransformers = options.activityTransformers ?? require_transformers.getDefaultActivityTransformers();
-		this.tracerProvider = options.tracerProvider ?? __opentelemetry_api.trace.getTracerProvider();
+		this.tracerProvider = options.tracerProvider ?? _opentelemetry_api.trace.getTracerProvider();
 		this.firstKnock = options.firstKnock;
 	}
 	_initializeRouter() {
@@ -2482,28 +2446,28 @@ 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_docloader.name, require_docloader.version);
 	}
 	async _startQueueInternal(ctxData, signal, queue) {
 		if (this.inboxQueue == null && this.outboxQueue == null) return;
-		const logger$1 = (0, __logtape_logtape.getLogger)([
+		const logger = (0, _logtape_logtape.getLogger)([
 			"fedify",
 			"federation",
 			"queue"
 		]);
 		const promises = [];
 		if (this.inboxQueue != null && (queue == null || queue === "inbox") && !this.inboxQueueStarted) {
-			logger$1.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$1.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$1.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 }));
 		}
@@ -2511,10 +2475,10 @@ var FederationImpl = class extends FederationBuilderImpl {
 	}
 	processQueuedTask(contextData, message) {
 		const tracer = this._getTracer();
-		const extractedContext = __opentelemetry_api.propagation.extract(__opentelemetry_api.context.active(), message.traceContext);
-		return (0, __logtape_logtape.withContext)({ messageId: message.id }, async () => {
+		const extractedContext = _opentelemetry_api.propagation.extract(_opentelemetry_api.context.active(), message.traceContext);
+		return (0, _logtape_logtape.withContext)({ messageId: message.id }, async () => {
 			if (message.type === "fanout") await tracer.startActiveSpan("activitypub.fanout", {
-				kind: __opentelemetry_api.SpanKind.CONSUMER,
+				kind: _opentelemetry_api.SpanKind.CONSUMER,
 				attributes: { "activitypub.activity.type": message.activityType }
 			}, extractedContext, async (span) => {
 				if (message.activityId != null) span.setAttribute("activitypub.activity.id", message.activityId);
@@ -2522,7 +2486,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 					await this.#listenFanoutMessage(contextData, message);
 				} catch (e) {
 					span.setStatus({
-						code: __opentelemetry_api.SpanStatusCode.ERROR,
+						code: _opentelemetry_api.SpanStatusCode.ERROR,
 						message: String(e)
 					});
 					throw e;
@@ -2531,7 +2495,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 				}
 			});
 			else if (message.type === "outbox") await tracer.startActiveSpan("activitypub.outbox", {
-				kind: __opentelemetry_api.SpanKind.CONSUMER,
+				kind: _opentelemetry_api.SpanKind.CONSUMER,
 				attributes: {
 					"activitypub.activity.type": message.activityType,
 					"activitypub.activity.retries": message.attempt
@@ -2542,7 +2506,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 					await this.#listenOutboxMessage(contextData, message, span);
 				} catch (e) {
 					span.setStatus({
-						code: __opentelemetry_api.SpanStatusCode.ERROR,
+						code: _opentelemetry_api.SpanStatusCode.ERROR,
 						message: String(e)
 					});
 					throw e;
@@ -2551,14 +2515,14 @@ var FederationImpl = class extends FederationBuilderImpl {
 				}
 			});
 			else if (message.type === "inbox") await tracer.startActiveSpan("activitypub.inbox", {
-				kind: __opentelemetry_api.SpanKind.CONSUMER,
+				kind: _opentelemetry_api.SpanKind.CONSUMER,
 				attributes: { "activitypub.shared_inbox": message.identifier == null }
 			}, extractedContext, async (span) => {
 				try {
 					await this.#listenInboxMessage(contextData, message, span);
 				} catch (e) {
 					span.setStatus({
-						code: __opentelemetry_api.SpanStatusCode.ERROR,
+						code: _opentelemetry_api.SpanStatusCode.ERROR,
 						message: String(e)
 					});
 					throw e;
@@ -2569,12 +2533,11 @@ var FederationImpl = class extends FederationBuilderImpl {
 		});
 	}
 	async #listenFanoutMessage(data, message) {
-		const logger$1 = (0, __logtape_logtape.getLogger)([
+		(0, _logtape_logtape.getLogger)([
 			"fedify",
 			"federation",
 			"fanout"
-		]);
-		logger$1.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
 		});
@@ -2593,17 +2556,17 @@ var FederationImpl = class extends FederationBuilderImpl {
 			}),
 			tracerProvider: this.tracerProvider
 		});
-		const context$2 = 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$2
+			context
 		});
 	}
 	async #listenOutboxMessage(_, message, span) {
-		const logger$1 = (0, __logtape_logtape.getLogger)([
+		const logger = (0, _logtape_logtape.getLogger)([
 			"fedify",
 			"federation",
 			"outbox"
@@ -2640,7 +2603,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 			});
 		} catch (error) {
 			span.setStatus({
-				code: __opentelemetry_api.SpanStatusCode.ERROR,
+				code: _opentelemetry_api.SpanStatusCode.ERROR,
 				message: String(error)
 			});
 			const loaderOptions = this.#getLoaderOptions(message.baseUrl);
@@ -2651,14 +2614,14 @@ var FederationImpl = class extends FederationBuilderImpl {
 			});
 			try {
 				this.onOutboxError?.(error, activity);
-			} catch (error$1) {
-				logger$1.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$1.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
 				});
@@ -2669,7 +2632,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 				attempts: message.attempt
 			});
 			if (delay != null) {
-				logger$1.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
 				});
@@ -2677,39 +2640,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$1.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$1.info("Successfully sent activity {activityId} to {inbox}.", { ...logData });
+		logger.info("Successfully sent activity {activityId} to {inbox}.", { ...logData });
 	}
 	async #listenInboxMessage(ctxData, message, span) {
-		const logger$1 = (0, __logtape_logtape.getLogger)([
+		const logger = (0, _logtape_logtape.getLogger)([
 			"fedify",
 			"federation",
 			"inbox"
 		]);
 		const baseUrl = new URL(message.baseUrl);
-		let context$2 = this.#createContext(baseUrl, ctxData);
-		if (message.identifier != null) context$2 = this.#createContext(baseUrl, ctxData, { documentLoader: await context$2.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$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 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 require_actor.Activity.fromJsonLd(message.activity, context$2);
+		const activity = await require_actor.Activity.fromJsonLd(message.activity, context);
 		span.setAttribute("activitypub.activity.type", require_actor.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$2.origin,
+			context.origin,
 			activity.id.href
 		];
 		if (cacheKey != null) {
-			const cached = await this.kv.get(cacheKey);
-			if (cached === true) {
-				logger$1.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
@@ -2717,32 +2679,32 @@ var FederationImpl = class extends FederationBuilderImpl {
 				return;
 			}
 		}
-		await this._getTracer().startActiveSpan("activitypub.dispatch_inbox_listener", { kind: __opentelemetry_api.SpanKind.INTERNAL }, async (span$1) => {
+		await this._getTracer().startActiveSpan("activitypub.dispatch_inbox_listener", { kind: _opentelemetry_api.SpanKind.INTERNAL }, async (span) => {
 			const dispatched = this.inboxListeners?.dispatchWithClass(activity);
 			if (dispatched == null) {
-				logger$1.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({
-					code: __opentelemetry_api.SpanStatusCode.ERROR,
+				span.setStatus({
+					code: _opentelemetry_api.SpanStatusCode.ERROR,
 					message: `Unsupported activity type: ${require_actor.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$2.toInboxContext(message.identifier, message.activity, activity.id?.href, require_actor.getTypeId(activity).href), activity);
+				await listener(context.toInboxContext(message.identifier, message.activity, activity.id?.href, require_actor.getTypeId(activity).href), activity);
 			} catch (error) {
 				try {
-					await this.inboxErrorHandler?.(context$2, error);
-				} catch (error$1) {
-					logger$1.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,
@@ -2750,17 +2712,17 @@ var FederationImpl = class extends FederationBuilderImpl {
 					});
 				}
 				if (this.inboxQueue?.nativeRetrial) {
-					logger$1.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({
-						code: __opentelemetry_api.SpanStatusCode.ERROR,
+					span.setStatus({
+						code: _opentelemetry_api.SpanStatusCode.ERROR,
 						message: String(error)
 					});
-					span$1.end();
+					span.end();
 					throw error;
 				}
 				const delay = this.inboxRetryPolicy({
@@ -2768,7 +2730,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 					attempts: message.attempt
 				});
 				if (delay != null) {
-					logger$1.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,
@@ -2779,26 +2741,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$1.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({
-					code: __opentelemetry_api.SpanStatusCode.ERROR,
+				span.setStatus({
+					code: _opentelemetry_api.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$1.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 = {}) {
@@ -2842,7 +2804,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 		};
 	}
 	async sendActivity(keys, inboxes, activity, options) {
-		const logger$1 = (0, __logtape_logtape.getLogger)([
+		const logger = (0, _logtape_logtape.getLogger)([
 			"fedify",
 			"federation",
 			"outbox"
@@ -2876,7 +2838,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 			format: "compact",
 			contextLoader
 		});
-		if (rsaKey == null) logger$1.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,
@@ -2887,7 +2849,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 			contextLoader,
 			tracerProvider: this.tracerProvider
 		});
-		if (!proofCreated) logger$1.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,
@@ -2895,11 +2857,11 @@ var FederationImpl = class extends FederationBuilderImpl {
 			}))
 		});
 		if (immediate || this.outboxQueue == null) {
-			if (immediate) logger$1.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$1.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
 			});
@@ -2918,7 +2880,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 			await Promise.all(promises);
 			return;
 		}
-		logger$1.debug("Enqueuing activity {activityId} to send later.", {
+		logger.debug("Enqueuing activity {activityId} to send later.", {
 			activityId: activity.id.href,
 			activity: jsonLd
 		});
@@ -2932,7 +2894,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 		}
 		if (!this.manuallyStartQueue) this._startQueueInternal(ctx.data);
 		const carrier = {};
-		__opentelemetry_api.propagation.inject(__opentelemetry_api.context.active(), carrier);
+		_opentelemetry_api.propagation.inject(_opentelemetry_api.context.active(), carrier);
 		const messages = [];
 		for (const inbox in inboxes) {
 			const message = {
@@ -2955,10 +2917,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$1.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
 				});
@@ -2968,7 +2929,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 		} else try {
 			await outboxQueue.enqueueMany(messages);
 		} catch (error) {
-			logger$1.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
 			});
@@ -2976,22 +2937,21 @@ var FederationImpl = class extends FederationBuilderImpl {
 		}
 	}
 	fetch(request, options) {
-		const requestId = getRequestId(request);
-		return (0, __logtape_logtape.withContext)({ requestId }, async () => {
+		return (0, _logtape_logtape.withContext)({ requestId: getRequestId(request) }, async () => {
 			const tracer = this._getTracer();
 			return await tracer.startActiveSpan(request.method, {
-				kind: __opentelemetry_api.SpanKind.SERVER,
+				kind: _opentelemetry_api.SpanKind.SERVER,
 				attributes: {
-					[__opentelemetry_semantic_conventions.ATTR_HTTP_REQUEST_METHOD]: request.method,
-					[__opentelemetry_semantic_conventions.ATTR_URL_FULL]: request.url
+					[_opentelemetry_semantic_conventions.ATTR_HTTP_REQUEST_METHOD]: request.method,
+					[_opentelemetry_semantic_conventions.ATTR_URL_FULL]: request.url
 				}
 			}, async (span) => {
-				const logger$1 = (0, __logtape_logtape.getLogger)([
+				const logger = (0, _logtape_logtape.getLogger)([
 					"fedify",
 					"federation",
 					"http"
 				]);
-				if (span.isRecording()) for (const [k, v] of request.headers) span.setAttribute((0, __opentelemetry_semantic_conventions.ATTR_HTTP_REQUEST_HEADER)(k), [v]);
+				if (span.isRecording()) for (const [k, v] of request.headers) span.setAttribute((0, _opentelemetry_semantic_conventions.ATTR_HTTP_REQUEST_HEADER)(k), [v]);
 				let response;
 				try {
 					response = await this.#fetch(request, {
@@ -3001,11 +2961,11 @@ var FederationImpl = class extends FederationBuilderImpl {
 					});
 				} catch (error) {
 					span.setStatus({
-						code: __opentelemetry_api.SpanStatusCode.ERROR,
+						code: _opentelemetry_api.SpanStatusCode.ERROR,
 						message: `${error}`
 					});
 					span.end();
-					logger$1.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
@@ -3013,10 +2973,10 @@ var FederationImpl = class extends FederationBuilderImpl {
 					throw error;
 				}
 				if (span.isRecording()) {
-					span.setAttribute(__opentelemetry_semantic_conventions.ATTR_HTTP_RESPONSE_STATUS_CODE, response.status);
-					for (const [k, v] of response.headers) span.setAttribute((0, __opentelemetry_semantic_conventions.ATTR_HTTP_RESPONSE_HEADER)(k), [v]);
+					span.setAttribute(_opentelemetry_semantic_conventions.ATTR_HTTP_RESPONSE_STATUS_CODE, response.status);
+					for (const [k, v] of response.headers) span.setAttribute((0, _opentelemetry_semantic_conventions.ATTR_HTTP_RESPONSE_HEADER)(k), [v]);
 					span.setStatus({
-						code: response.status >= 500 ? __opentelemetry_api.SpanStatusCode.ERROR : __opentelemetry_api.SpanStatusCode.UNSET,
+						code: response.status >= 500 ? _opentelemetry_api.SpanStatusCode.ERROR : _opentelemetry_api.SpanStatusCode.UNSET,
 						message: response.statusText
 					});
 				}
@@ -3029,9 +2989,9 @@ var FederationImpl = class extends FederationBuilderImpl {
 					url: request.url,
 					status: response.status
 				};
-				if (response.status >= 500) logger$1.error(logTpl, values);
-				else if (response.status >= 400) logger$1.warn(logTpl, values);
-				else logger$1.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;
 			});
 		});
@@ -3044,11 +3004,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$2 = 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$2,
+				context,
 				host: this.origin?.handleHost,
 				actorDispatcher: this.actorCallbacks?.dispatcher,
 				actorHandleMapper: this.actorCallbacks?.handleMapper,
@@ -3057,16 +3017,16 @@ var FederationImpl = class extends FederationBuilderImpl {
 				onNotFound,
 				tracer
 			});
-			case "nodeInfoJrd": return await handleNodeInfoJrd(request, context$2);
+			case "nodeInfoJrd": return await handleNodeInfoJrd(request, context);
 			case "nodeInfo": return await handleNodeInfo(request, {
-				context: context$2,
+				context,
 				nodeInfoDispatcher: this.nodeInfoDispatcher
 			});
 			case "actor":
-				context$2 = 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$2,
+					context,
 					actorDispatcher: this.actorCallbacks?.dispatcher,
 					authorizePredicate: this.actorCallbacks?.authorizePredicate,
 					onUnauthorized,
@@ -3077,13 +3037,13 @@ var FederationImpl = class extends FederationBuilderImpl {
 				const typeId = route.name.replace(/^object:/, "");
 				const callbacks = this.objectCallbacks[typeId];
 				const cls = this.objectTypeIds[typeId];
-				context$2 = this.#createContext(request, contextData, { invokedFromObjectDispatcher: {
+				context = this.#createContext(request, contextData, { invokedFromObjectDispatcher: {
 					cls,
 					values: route.values
 				} });
 				return await handleObject(request, {
 					values: route.values,
-					context: context$2,
+					context,
 					objectDispatcher: callbacks?.dispatcher,
 					authorizePredicate: callbacks?.authorizePredicate,
 					onUnauthorized,
@@ -3094,8 +3054,8 @@ var FederationImpl = class extends FederationBuilderImpl {
 			case "outbox": return await handleCollection(request, {
 				name: "outbox",
 				identifier: route.values.identifier ?? route.values.handle,
-				uriGetter: context$2.getOutboxUri.bind(context$2),
-				context: context$2,
+				uriGetter: context.getOutboxUri.bind(context),
+				context,
 				collectionCallbacks: this.outboxCallbacks,
 				tracerProvider: this.tracerProvider,
 				onUnauthorized,
@@ -3106,25 +3066,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$2.getInboxUri.bind(context$2),
-					context: context$2,
+					uriGetter: context.getInboxUri.bind(context),
+					context,
 					collectionCallbacks: this.inboxCallbacks,
 					tracerProvider: this.tracerProvider,
 					onUnauthorized,
 					onNotFound,
 					onNotAcceptable
 				});
-				context$2 = this.#createContext(request, contextData, { documentLoader: await context$2.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$2);
-					if (identity != null) context$2 = this.#createContext(request, contextData, { documentLoader: "identifier" in identity || "username" in identity || "handle" in identity ? await context$2.getDocumentLoader(identity) : context$2.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$2,
-					inboxContextFactory: context$2.toInboxContext.bind(context$2),
+					context,
+					inboxContextFactory: context.toInboxContext.bind(context),
 					kv: this.kv,
 					kvPrefixes: this.kvPrefixes,
 					queue: this.inboxQueue,
@@ -3140,8 +3100,8 @@ var FederationImpl = class extends FederationBuilderImpl {
 			case "following": return await handleCollection(request, {
 				name: "following",
 				identifier: route.values.identifier ?? route.values.handle,
-				uriGetter: context$2.getFollowingUri.bind(context$2),
-				context: context$2,
+				uriGetter: context.getFollowingUri.bind(context),
+				context,
 				collectionCallbacks: this.followingCallbacks,
 				tracerProvider: this.tracerProvider,
 				onUnauthorized,
@@ -3158,14 +3118,14 @@ var FederationImpl = class extends FederationBuilderImpl {
 				return await handleCollection(request, {
 					name: "followers",
 					identifier: route.values.identifier ?? route.values.handle,
-					uriGetter: baseUrl == null ? context$2.getFollowersUri.bind(context$2) : (identifier) => {
-						const uri = context$2.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$2,
+					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,
@@ -3176,8 +3136,8 @@ var FederationImpl = class extends FederationBuilderImpl {
 			case "liked": return await handleCollection(request, {
 				name: "liked",
 				identifier: route.values.identifier ?? route.values.handle,
-				uriGetter: context$2.getLikedUri.bind(context$2),
-				context: context$2,
+				uriGetter: context.getLikedUri.bind(context),
+				context,
 				collectionCallbacks: this.likedCallbacks,
 				tracerProvider: this.tracerProvider,
 				onUnauthorized,
@@ -3187,8 +3147,8 @@ var FederationImpl = class extends FederationBuilderImpl {
 			case "featured": return await handleCollection(request, {
 				name: "featured",
 				identifier: route.values.identifier ?? route.values.handle,
-				uriGetter: context$2.getFeaturedUri.bind(context$2),
-				context: context$2,
+				uriGetter: context.getFeaturedUri.bind(context),
+				context,
 				collectionCallbacks: this.featuredCallbacks,
 				tracerProvider: this.tracerProvider,
 				onUnauthorized,
@@ -3198,8 +3158,8 @@ var FederationImpl = class extends FederationBuilderImpl {
 			case "featuredTags": return await handleCollection(request, {
 				name: "featured tags",
 				identifier: route.values.identifier ?? route.values.handle,
-				uriGetter: context$2.getFeaturedTagsUri.bind(context$2),
-				context: context$2,
+				uriGetter: context.getFeaturedTagsUri.bind(context),
+				context,
 				collectionCallbacks: this.featuredTagsCallbacks,
 				tracerProvider: this.tracerProvider,
 				onUnauthorized,
@@ -3211,7 +3171,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 				const callbacks = this.collectionCallbacks[name];
 				return await handleCustomCollection(request, {
 					name,
-					context: context$2,
+					context,
 					values: route.values,
 					collectionCallbacks: callbacks,
 					tracerProvider: this.tracerProvider,
@@ -3225,7 +3185,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 				const callbacks = this.collectionCallbacks[name];
 				return await handleOrderedCollection(request, {
 					name,
-					context: context$2,
+					context,
 					values: route.values,
 					collectionCallbacks: callbacks,
 					tracerProvider: this.tracerProvider,
@@ -3323,9 +3283,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,
@@ -3383,14 +3343,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$1 = (0, __logtape_logtape.getLogger)(["fedify", "federation"]);
+		const logger = (0, _logtape_logtape.getLogger)(["fedify", "federation"]);
 		if (route == null) return null;
 		else if (route.name === "sharedInbox") return {
 			type: "inbox",
 			identifier: void 0,
 			get handle() {
-				logger$1.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;
@@ -3398,7 +3357,7 @@ var ContextImpl = class ContextImpl {
 			type: "actor",
 			identifier,
 			get handle() {
-				logger$1.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;
 			}
 		};
@@ -3414,7 +3373,7 @@ var ContextImpl = class ContextImpl {
 			type: "inbox",
 			identifier,
 			get handle() {
-				logger$1.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;
 			}
 		};
@@ -3422,7 +3381,7 @@ var ContextImpl = class ContextImpl {
 			type: "outbox",
 			identifier,
 			get handle() {
-				logger$1.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;
 			}
 		};
@@ -3430,7 +3389,7 @@ var ContextImpl = class ContextImpl {
 			type: "following",
 			identifier,
 			get handle() {
-				logger$1.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;
 			}
 		};
@@ -3438,7 +3397,7 @@ var ContextImpl = class ContextImpl {
 			type: "followers",
 			identifier,
 			get handle() {
-				logger$1.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;
 			}
 		};
@@ -3446,7 +3405,7 @@ var ContextImpl = class ContextImpl {
 			type: "liked",
 			identifier,
 			get handle() {
-				logger$1.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;
 			}
 		};
@@ -3454,7 +3413,7 @@ var ContextImpl = class ContextImpl {
 			type: "featured",
 			identifier,
 			get handle() {
-				logger$1.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;
 			}
 		};
@@ -3462,12 +3421,11 @@ var ContextImpl = class ContextImpl {
 			type: "featuredTags",
 			identifier,
 			get handle() {
-				logger$1.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;
@@ -3483,12 +3441,12 @@ var ContextImpl = class ContextImpl {
 		return null;
 	}
 	async getActorKeyPairs(identifier) {
-		const logger$1 = (0, __logtape_logtape.getLogger)([
+		const logger = (0, _logtape_logtape.getLogger)([
 			"fedify",
 			"federation",
 			"actor"
 		]);
-		if (this.invokedFromActorKeyPairsDispatcher != null) logger$1.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
 		});
@@ -3496,7 +3454,7 @@ var ContextImpl = class ContextImpl {
 		try {
 			keyPairs = await this.getKeyPairsFromIdentifier(identifier);
 		} catch (_) {
-			logger$1.warn("No actor key pairs dispatcher registered.");
+			logger.warn("No actor key pairs dispatcher registered.");
 			return [];
 		}
 		const owner = this.getActorUri(identifier);
@@ -3520,7 +3478,7 @@ var ContextImpl = class ContextImpl {
 		return result;
 	}
 	async getKeyPairsFromIdentifier(identifier) {
-		const logger$1 = (0, __logtape_logtape.getLogger)([
+		const logger = (0, _logtape_logtape.getLogger)([
 			"fedify",
 			"federation",
 			"actor"
@@ -3531,7 +3489,7 @@ var ContextImpl = class ContextImpl {
 			actorUri = this.getActorUri(identifier);
 		} catch (error) {
 			if (error instanceof RouterError) {
-				logger$1.warn(error.message);
+				logger.warn(error.message);
 				return [];
 			}
 			throw error;
@@ -3540,7 +3498,7 @@ var ContextImpl = class ContextImpl {
 			...this,
 			invokedFromActorKeyPairsDispatcher: { identifier }
 		}), identifier);
-		if (keyPairs.length < 1) logger$1.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) {
@@ -3558,7 +3516,7 @@ var ContextImpl = class ContextImpl {
 			const { privateKey } = keyPair;
 			if (privateKey.algorithm.name === "RSASSA-PKCS1-v1_5" && privateKey.algorithm.hash.name === "SHA-256") return keyPair;
 		}
-		(0, __logtape_logtape.getLogger)([
+		(0, _logtape_logtape.getLogger)([
 			"fedify",
 			"federation",
 			"actor"
@@ -3573,7 +3531,7 @@ var ContextImpl = class ContextImpl {
 				if ("username" in identity) username = identity.username;
 				else {
 					username = identity.handle;
-					(0, __logtape_logtape.getLogger)([
+					(0, _logtape_logtape.getLogger)([
 						"fedify",
 						"runtime",
 						"docloader"
@@ -3588,14 +3546,13 @@ 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);
 	}
 	lookupObject(identifier, options = {}) {
-		return require_vocab.lookupObject(identifier, {
+		return require_vocab_mod.lookupObject(identifier, {
 			...options,
 			documentLoader: options.documentLoader ?? this.documentLoader,
 			contextLoader: options.contextLoader ?? this.contextLoader,
@@ -3605,7 +3562,7 @@ var ContextImpl = class ContextImpl {
 		});
 	}
 	traverseCollection(collection, options = {}) {
-		return require_vocab.traverseCollection(collection, {
+		return require_vocab_mod.traverseCollection(collection, {
 			...options,
 			documentLoader: options.documentLoader ?? this.documentLoader,
 			contextLoader: options.contextLoader ?? this.contextLoader
@@ -3631,9 +3588,8 @@ var ContextImpl = class ContextImpl {
 		});
 	}
 	sendActivity(sender, recipients, activity, options = {}) {
-		const tracer = this.tracerProvider.getTracer(require_docloader.deno_default.name, require_docloader.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,
+		return this.tracerProvider.getTracer(require_docloader.name, require_docloader.version).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.to": activity.toIds.map((to) => to.href),
@@ -3647,7 +3603,7 @@ var ContextImpl = class ContextImpl {
 				await this.sendActivityInternal(sender, recipients, activity, options, span);
 			} catch (e) {
 				span.setStatus({
-					code: __opentelemetry_api.SpanStatusCode.ERROR,
+					code: _opentelemetry_api.SpanStatusCode.ERROR,
 					message: String(e)
 				});
 				throw e;
@@ -3657,7 +3613,7 @@ var ContextImpl = class ContextImpl {
 		});
 	}
 	async sendActivityInternal(sender, recipients, activity, options, span) {
-		const logger$1 = (0, __logtape_logtape.getLogger)([
+		const logger = (0, _logtape_logtape.getLogger)([
 			"fedify",
 			"federation",
 			"outbox"
@@ -3671,7 +3627,7 @@ var ContextImpl = class ContextImpl {
 				if ("username" in sender) username = sender.username;
 				else {
 					username = sender.handle;
-					logger$1.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 {
@@ -3707,7 +3663,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$1.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
 			});
@@ -3718,7 +3674,7 @@ var ContextImpl = class ContextImpl {
 			preferSharedInbox: options.preferSharedInbox,
 			excludeBaseUris: options.excludeBaseUris
 		});
-		logger$1.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
@@ -3732,7 +3688,7 @@ var ContextImpl = class ContextImpl {
 			privateKey: await require_key.exportJwk(privateKey)
 		})));
 		const carrier = {};
-		__opentelemetry_api.propagation.inject(__opentelemetry_api.context.active(), carrier);
+		_opentelemetry_api.propagation.inject(_opentelemetry_api.context.active(), carrier);
 		const message = {
 			type: "fanout",
 			id: crypto.randomUUID(),
@@ -3752,7 +3708,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.");
@@ -3763,23 +3719,21 @@ var ContextImpl = class ContextImpl {
 		}
 		if (this.federation.followersCallbacks.firstCursor == null) throw new Error("No first cursor dispatcher registered for followers collection.");
 		let cursor = await this.federation.followersCallbacks.firstCursor(this, identifier);
-		if (cursor != null) (0, __logtape_logtape.getLogger)([
+		if (cursor != null) (0, _logtape_logtape.getLogger)([
 			"fedify",
 			"federation",
 			"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(require_docloader.deno_default.name, require_docloader.deno_default.version);
-		return tracer.startActiveSpan("activitypub.inbox", {
-			kind: this.federation.inboxQueue == null || options.immediate ? __opentelemetry_api.SpanKind.INTERNAL : __opentelemetry_api.SpanKind.PRODUCER,
+		return (this.tracerProvider ?? this.tracerProvider).getTracer(require_docloader.name, require_docloader.version).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 }
 		}, async (span) => {
 			if (activity.id != null) span.setAttribute("activitypub.activity.id", activity.id.href);
@@ -3792,11 +3746,11 @@ var ContextImpl = class ContextImpl {
 				if (ok) {
 					span.setAttribute("activitypub.shared_inbox", recipient == null);
 					if (recipient != null) span.setAttribute("fedify.inbox.recipient", recipient);
-				} else span.setStatus({ code: __opentelemetry_api.SpanStatusCode.ERROR });
+				} else span.setStatus({ code: _opentelemetry_api.SpanStatusCode.ERROR });
 				return ok;
 			} catch (e) {
 				span.setStatus({
-					code: __opentelemetry_api.SpanStatusCode.ERROR,
+					code: _opentelemetry_api.SpanStatusCode.ERROR,
 					message: String(e)
 				});
 				throw e;
@@ -3806,7 +3760,7 @@ var ContextImpl = class ContextImpl {
 		});
 	}
 	async routeActivityInternal(recipient, activity, options = {}, span) {
-		const logger$1 = (0, __logtape_logtape.getLogger)([
+		const logger = (0, _logtape_logtape.getLogger)([
 			"fedify",
 			"federation",
 			"inbox"
@@ -3814,19 +3768,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 require_proof.verifyObject(require_actor.Activity, json, {
+		if (await require_proof.verifyObject(require_actor.Activity, json, {
 			contextLoader,
 			documentLoader: options.documentLoader ?? this.documentLoader,
 			tracerProvider: options.tracerProvider ?? this.tracerProvider,
 			keyCache
-		});
-		if (verified == null) {
-			logger$1.debug("Object Integrity Proofs are not verified.", {
+		}) == null) {
+			logger.debug("Object Integrity Proofs are not verified.", {
 				recipient,
 				activity: json
 			});
 			if (activity.id == null) {
-				logger$1.debug("Activity is missing an ID; unable to fetch.", {
+				logger.debug("Activity is missing an ID; unable to fetch.", {
 					recipient,
 					activity: json
 				});
@@ -3834,26 +3787,26 @@ var ContextImpl = class ContextImpl {
 			}
 			const fetched = await this.lookupObject(activity.id, options);
 			if (fetched == null) {
-				logger$1.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 require_actor.Activity)) {
-				logger$1.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$1.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$1.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 })
 				});
@@ -3861,15 +3814,15 @@ var ContextImpl = class ContextImpl {
 			}
 			const activityId = fetched.id;
 			if (!fetched.actorIds.every((actor) => actor.origin === activityId.origin)) {
-				logger$1.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$1.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$1.debug("Object Integrity Proofs are verified.", {
+		} else logger.debug("Object Integrity Proofs are verified.", {
 			recipient,
 			activity: json
 		});
@@ -3918,7 +3871,7 @@ var RequestContextImpl = class RequestContextImpl extends ContextImpl {
 	}
 	async getActor(identifier) {
 		if (this.federation.actorCallbacks == null || this.federation.actorCallbacks.dispatcher == null) throw new Error("No actor dispatcher registered.");
-		if (this.#invokedFromActorDispatcher != null) (0, __logtape_logtape.getLogger)([
+		if (this.#invokedFromActorDispatcher != null) (0, _logtape_logtape.getLogger)([
 			"fedify",
 			"federation",
 			"actor"
@@ -3935,7 +3888,7 @@ var RequestContextImpl = class RequestContextImpl extends ContextImpl {
 		const callbacks = this.federation.objectCallbacks[cls.typeId.href];
 		if (callbacks == null) throw new Error("No object dispatcher registered.");
 		for (const param of callbacks.parameters) if (!(param in values)) throw new TypeError(`Missing parameter: ${param}`);
-		if (this.#invokedFromObjectDispatcher != null) (0, __logtape_logtape.getLogger)(["fedify", "federation"]).warn("RequestContext.getObject({getObjectClass}, {getObjectValues}) is invoked from the object dispatcher ({actorDispatcherClass}, {actorDispatcherValues}); this may cause an infinite loop.", {
+		if (this.#invokedFromObjectDispatcher != null) (0, _logtape_logtape.getLogger)(["fedify", "federation"]).warn("RequestContext.getObject({getObjectClass}, {getObjectValues}) is invoked from the object dispatcher ({actorDispatcherClass}, {actorDispatcherValues}); this may cause an infinite loop.", {
 			getObjectClass: cls.name,
 			getObjectValues: values,
 			actorDispatcherClass: this.#invokedFromObjectDispatcher.cls.name,
@@ -3995,9 +3948,8 @@ 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);
-		return tracer.startActiveSpan("activitypub.outbox", {
-			kind: this.federation.outboxQueue == null || options?.immediate ? __opentelemetry_api.SpanKind.CLIENT : __opentelemetry_api.SpanKind.PRODUCER,
+		return this.tracerProvider.getTracer(require_docloader.name, require_docloader.version).startActiveSpan("activitypub.outbox", {
+			kind: this.federation.outboxQueue == null || options?.immediate ? _opentelemetry_api.SpanKind.CLIENT : _opentelemetry_api.SpanKind.PRODUCER,
 			attributes: { "activitypub.activity.type": this.activityType }
 		}, async (span) => {
 			try {
@@ -4005,7 +3957,7 @@ var InboxContextImpl = class InboxContextImpl extends ContextImpl {
 				await this.forwardActivityInternal(forwarder, recipients, options);
 			} catch (e) {
 				span.setStatus({
-					code: __opentelemetry_api.SpanStatusCode.ERROR,
+					code: _opentelemetry_api.SpanStatusCode.ERROR,
 					message: String(e)
 				});
 				throw e;
@@ -4015,7 +3967,7 @@ var InboxContextImpl = class InboxContextImpl extends ContextImpl {
 		});
 	}
 	async forwardActivityInternal(forwarder, recipients, options) {
-		const logger$1 = (0, __logtape_logtape.getLogger)([
+		const logger = (0, _logtape_logtape.getLogger)([
 			"fedify",
 			"federation",
 			"inbox"
@@ -4029,7 +3981,7 @@ var InboxContextImpl = class InboxContextImpl extends ContextImpl {
 				if ("username" in forwarder) username = forwarder.username;
 				else {
 					username = forwarder.handle;
-					logger$1.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 {
@@ -4047,14 +3999,13 @@ 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);
-				hasProof = await activity.getProof() != null;
+				hasProof = await (await require_actor.Activity.fromJsonLd(this.activity, this)).getProof() != null;
 			} catch {
 				hasProof = false;
 			}
 			if (!hasProof) {
 				if (options?.skipIfUnsigned) return;
-				logger$1.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") {
@@ -4068,14 +4019,14 @@ var InboxContextImpl = class InboxContextImpl extends ContextImpl {
 			preferSharedInbox: options?.preferSharedInbox,
 			excludeBaseUris: options?.excludeBaseUris
 		});
-		logger$1.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$1.debug("Forwarding activity immediately without queue since immediate option is set.");
-			else logger$1.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,
@@ -4090,7 +4041,7 @@ var InboxContextImpl = class InboxContextImpl extends ContextImpl {
 			await Promise.all(promises);
 			return;
 		}
-		logger$1.debug("Enqueuing activity {activityId} to forward later.", {
+		logger.debug("Enqueuing activity {activityId} to forward later.", {
 			activityId: this.activityId,
 			activity: this.activity
 		});
@@ -4103,7 +4054,7 @@ var InboxContextImpl = class InboxContextImpl extends ContextImpl {
 			});
 		}
 		const carrier = {};
-		__opentelemetry_api.propagation.inject(__opentelemetry_api.context.active(), carrier);
+		_opentelemetry_api.propagation.inject(_opentelemetry_api.context.active(), carrier);
 		const messages = [];
 		for (const inbox in inboxes) {
 			const message = {
@@ -4126,10 +4077,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$1.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
 				});
@@ -4139,7 +4089,7 @@ var InboxContextImpl = class InboxContextImpl extends ContextImpl {
 		} else try {
 			await outboxQueue.enqueueMany(messages);
 		} catch (error) {
-			logger$1.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
 			});
@@ -4194,87 +4144,84 @@ 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
-Object.defineProperty(exports, 'ContextImpl', {
-  enumerable: true,
-  get: function () {
-    return ContextImpl;
-  }
+Object.defineProperty(exports, "ContextImpl", {
+	enumerable: true,
+	get: function() {
+		return ContextImpl;
+	}
 });
-Object.defineProperty(exports, 'FederationImpl', {
-  enumerable: true,
-  get: function () {
-    return FederationImpl;
-  }
+Object.defineProperty(exports, "FederationImpl", {
+	enumerable: true,
+	get: function() {
+		return FederationImpl;
+	}
 });
-Object.defineProperty(exports, 'InboxContextImpl', {
-  enumerable: true,
-  get: function () {
-    return InboxContextImpl;
-  }
+Object.defineProperty(exports, "InboxContextImpl", {
+	enumerable: true,
+	get: function() {
+		return InboxContextImpl;
+	}
 });
-Object.defineProperty(exports, 'KvSpecDeterminer', {
-  enumerable: true,
-  get: function () {
-    return KvSpecDeterminer;
-  }
+Object.defineProperty(exports, "KvSpecDeterminer", {
+	enumerable: true,
+	get: function() {
+		return KvSpecDeterminer;
+	}
 });
-Object.defineProperty(exports, 'Router', {
-  enumerable: true,
-  get: function () {
-    return Router;
-  }
+Object.defineProperty(exports, "Router", {
+	enumerable: true,
+	get: function() {
+		return Router;
+	}
 });
-Object.defineProperty(exports, 'RouterError', {
-  enumerable: true,
-  get: function () {
-    return RouterError;
-  }
+Object.defineProperty(exports, "RouterError", {
+	enumerable: true,
+	get: function() {
+		return RouterError;
+	}
 });
-Object.defineProperty(exports, 'buildCollectionSynchronizationHeader', {
-  enumerable: true,
-  get: function () {
-    return buildCollectionSynchronizationHeader;
-  }
+Object.defineProperty(exports, "buildCollectionSynchronizationHeader", {
+	enumerable: true,
+	get: function() {
+		return buildCollectionSynchronizationHeader;
+	}
+});
+Object.defineProperty(exports, "createExponentialBackoffPolicy", {
+	enumerable: true,
+	get: function() {
+		return createExponentialBackoffPolicy;
+	}
 });
-Object.defineProperty(exports, 'createExponentialBackoffPolicy', {
-  enumerable: true,
-  get: function () {
-    return createExponentialBackoffPolicy;
-  }
+Object.defineProperty(exports, "createFederation", {
+	enumerable: true,
+	get: function() {
+		return createFederation;
+	}
 });
-Object.defineProperty(exports, 'createFederation', {
-  enumerable: true,
-  get: function () {
-    return createFederation;
-  }
+Object.defineProperty(exports, "createFederationBuilder", {
+	enumerable: true,
+	get: function() {
+		return createFederationBuilder;
+	}
 });
-Object.defineProperty(exports, 'createFederationBuilder', {
-  enumerable: true,
-  get: function () {
-    return createFederationBuilder;
-  }
+Object.defineProperty(exports, "digest", {
+	enumerable: true,
+	get: function() {
+		return digest;
+	}
 });
-Object.defineProperty(exports, 'digest', {
-  enumerable: true,
-  get: function () {
-    return digest;
-  }
+Object.defineProperty(exports, "respondWithObject", {
+	enumerable: true,
+	get: function() {
+		return respondWithObject;
+	}
 });
-Object.defineProperty(exports, 'respondWithObject', {
-  enumerable: true,
-  get: function () {
-    return respondWithObject;
-  }
+Object.defineProperty(exports, "respondWithObjectIfAcceptable", {
+	enumerable: true,
+	get: function() {
+		return respondWithObjectIfAcceptable;
+	}
 });
-Object.defineProperty(exports, 'respondWithObjectIfAcceptable', {
-  enumerable: true,
-  get: function () {
-    return respondWithObjectIfAcceptable;
-  }
-});