@fedify/fedify 2.1.1 → 2.1.3

package/dist/{middleware-CvS6hWm3.js → middleware-Dn1kk96N.js}

@@ -1,12 +1,11 @@
-
-          import { Temporal } from "@js-temporal/polyfill";
-          import { URLPattern } from "urlpattern-polyfill";
-        
-import { getDefaultActivityTransformers } from "./transformers-C3FLHUd6.js";
-import { deno_default, doubleKnock, exportJwk, formatAcceptSignature, importJwk, parseRfc9421SignatureInput, validateCryptoKey, verifyRequest, verifyRequestDetailed } from "./http-EUQ6crVa.js";
-import { detachSignature, doesActorOwnKey, getKeyOwner, hasSignature, signJsonLd, signObject, verifyJsonLd, verifyObject } from "./proof-6Zw1FW7t.js";
-import { getNodeInfo, nodeInfoToJson } from "./types-C93Ob9cU.js";
-import { getAuthenticatedDocumentLoader, kvCache } from "./kv-cache-SKgbvvu4.js";
+import { Temporal } from "@js-temporal/polyfill";
+import "urlpattern-polyfill";
+import { t as __exportAll } from "./chunk-nlSIicah.js";
+import { r as getDefaultActivityTransformers } from "./transformers-ve6e2xcg.js";
+import { _ as version, a as verifyRequestDetailed, d as validateCryptoKey, f as formatAcceptSignature, g as name, i as verifyRequest, n as parseRfc9421SignatureInput, o as exportJwk, t as doubleKnock, u as importJwk } from "./http-PS3wuU8D.js";
+import { a as doesActorOwnKey, d as signJsonLd, f as verifyJsonLd, l as detachSignature, n as signObject, o as getKeyOwner, r as verifyObject, u as hasSignature } from "./proof-Dpgqx9RS.js";
+import { n as getNodeInfo, t as nodeInfoToJson } from "./types-hvL8ElAs.js";
+import { n as getAuthenticatedDocumentLoader, t as kvCache } from "./kv-cache-B2Qi5MGv.js";
 import { getLogger, withContext } from "@logtape/logtape";
 import { Activity, Collection, CollectionPage, CryptographicKey, Link, Multikey, Object as Object$1, OrderedCollection, OrderedCollectionPage, getTypeId, lookupObject, traverseCollection } from "@fedify/vocab";
 import { SpanKind, SpanStatusCode, context, propagation, trace } from "@opentelemetry/api";
@@ -18,7 +17,6 @@ import { FetchError, getDocumentLoader } from "@fedify/vocab-runtime";
 import { ATTR_HTTP_REQUEST_HEADER, ATTR_HTTP_REQUEST_METHOD, ATTR_HTTP_RESPONSE_HEADER, ATTR_HTTP_RESPONSE_STATUS_CODE, ATTR_URL_FULL } from "@opentelemetry/semantic-conventions";
 import { lookupWebFinger } from "@fedify/webfinger";
 import { domainToASCII } from "node:url";
-
 //#region src/federation/inbox.ts
 var InboxListenerSet = class InboxListenerSet {
 	#listeners;
@@ -54,7 +52,7 @@ var InboxListenerSet = class InboxListenerSet {
 	}
 };
 async function routeActivity({ context: ctx, json, activity, recipient, inboxListeners, inboxContextFactory, inboxErrorHandler, kv, kvPrefixes, queue, span, tracerProvider, idempotencyStrategy }) {
-	const logger$1 = getLogger([
+	const logger = getLogger([
 		"fedify",
 		"federation",
 		"inbox"
@@ -64,10 +62,8 @@ async function routeActivity({ context: ctx, json, activity, recipient, inboxLis
 		const inboxContext = inboxContextFactory(recipient, json, activity.id?.href, getTypeId(activity).href);
 		const strategy = idempotencyStrategy ?? "per-inbox";
 		let keyString;
-		if (typeof strategy === "function") {
-			const result = await strategy(inboxContext, activity);
-			keyString = result;
-		} else switch (strategy) {
+		if (typeof strategy === "function") keyString = await strategy(inboxContext, activity);
+		else switch (strategy) {
 			case "global":
 				keyString = activity.id.href;
 				break;
@@ -82,9 +78,8 @@ 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
@@ -97,7 +92,7 @@ async function routeActivity({ context: ctx, json, activity, recipient, inboxLis
 		}
 	}
 	if (activity.actorId == null) {
-		logger$1.error("Missing actor.", { activity: json });
+		logger.error("Missing actor.", { activity: json });
 		span.setStatus({
 			code: SpanStatusCode.ERROR,
 			message: "Missing actor."
@@ -120,7 +115,7 @@ 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,
@@ -132,7 +127,7 @@ async function routeActivity({ context: ctx, json, activity, recipient, inboxLis
 			});
 			throw error;
 		}
-		logger$1.info("Activity {activityId} is enqueued.", {
+		logger.info("Activity {activityId} is enqueued.", {
 			activityId: activity.id?.href,
 			activity: json,
 			recipient
@@ -140,60 +135,58 @@ async function routeActivity({ context: ctx, json, activity, recipient, inboxLis
 		return "enqueued";
 	}
 	tracerProvider = tracerProvider ?? trace.getTracerProvider();
-	const tracer = tracerProvider.getTracer(deno_default.name, deno_default.version);
-	return await tracer.startActiveSpan("activitypub.dispatch_inbox_listener", { kind: SpanKind.INTERNAL }, async (span$1) => {
+	return await tracerProvider.getTracer(name, version).startActiveSpan("activitypub.dispatch_inbox_listener", { kind: 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({
+			span.setStatus({
 				code: SpanStatusCode.UNSET,
 				message: `Unsupported activity type: ${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, 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({
+			span.setStatus({
 				code: 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) {
@@ -301,7 +294,6 @@ var RouterError = class extends Error {
 		this.name = "RouterError";
 	}
 };
-
 //#endregion
 //#region src/federation/builder.ts
 var FederationBuilderImpl = class {
@@ -339,8 +331,8 @@ var FederationBuilderImpl = class {
 		this.collectionTypeIds = {};
 	}
 	async build(options) {
-		const { FederationImpl: FederationImpl$1 } = await import("./middleware-BVp930fR.js");
-		const f = new FederationImpl$1(options);
+		const { FederationImpl } = await Promise.resolve().then(() => middleware_exports);
+		const f = new FederationImpl(options);
 		const trailingSlashInsensitiveValue = f.router.trailingSlashInsensitive;
 		f.router = this.router.clone();
 		f.router.trailingSlashInsensitive = trailingSlashInsensitiveValue;
@@ -367,23 +359,23 @@ var FederationBuilderImpl = class {
 		return f;
 	}
 	_getTracer() {
-		return trace.getTracer(deno_default.name, deno_default.version);
+		return trace.getTracer(name, 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")) throw new RouterError("Path for actor dispatcher must have one variable: {identifier}");
-		const callbacks = { dispatcher: async (context$1, identifier) => {
+		const callbacks = { dispatcher: async (context, identifier) => {
 			const actor = await this._getTracer().startActiveSpan("activitypub.dispatch_actor", {
 				kind: SpanKind.SERVER,
 				attributes: { "fedify.actor.identifier": identifier }
 			}, async (span) => {
 				try {
-					const actor$1 = await dispatcher(context$1, identifier);
-					span.setAttribute("activitypub.actor.id", (actor$1?.id ?? context$1.getActorUri(identifier)).href);
-					if (actor$1 == null) span.setStatus({ code: SpanStatusCode.ERROR });
-					else span.setAttribute("activitypub.actor.type", 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: SpanStatusCode.ERROR });
+					else span.setAttribute("activitypub.actor.type", getTypeId(actor).href);
+					return actor;
 				} catch (error) {
 					span.setStatus({
 						code: SpanStatusCode.ERROR,
@@ -395,52 +387,52 @@ var FederationBuilderImpl = class {
 				}
 			});
 			if (actor == null) return null;
-			const logger$1 = getLogger([
+			const logger = 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$1.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$1.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$1.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$1.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$1.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$1.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$1.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$1.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$1.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: SpanKind.SERVER,
 					attributes: {
@@ -449,7 +441,7 @@ var FederationBuilderImpl = class {
 					}
 				}, async (span) => {
 					try {
-						return await dispatcher$1(ctx, identifier);
+						return await dispatcher(ctx, identifier);
 					} catch (e) {
 						span.setStatus({
 							code: SpanStatusCode.ERROR,
@@ -479,8 +471,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) {
@@ -493,8 +484,7 @@ 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", {
+				return this._getTracer().startActiveSpan("activitypub.dispatch_object", {
 					kind: SpanKind.SERVER,
 					attributes: {
 						"fedify.object.type": cls.typeId.href,
@@ -725,8 +715,7 @@ var FederationBuilderImpl = class {
 			this.inboxPath = inboxPath;
 		}
 		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 = {
@@ -764,8 +753,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;
@@ -800,8 +788,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);
 	}
 	setOutboxPermanentFailureHandler(handler) {
 		this.outboxPermanentFailureHandler = handler;
@@ -827,7 +814,6 @@ var FederationBuilderImpl = class {
 function createFederationBuilder() {
 	return new FederationBuilderImpl();
 }
-
 //#endregion
 //#region src/federation/collection.ts
 /**
@@ -846,8 +832,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;
 }
@@ -865,10 +851,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 = encodeHex(await digest(actorIds));
-	return `collectionId="${collectionId}", url="${url}", digest="${hash}"`;
+	return `collectionId="${collectionId}", url="${url}", digest="${encodeHex(await digest(actorIds))}"`;
 }
-
 //#endregion
 //#region src/federation/keycache.ts
 var KvKeyCache = class {
@@ -910,7 +894,7 @@ var KvKeyCache = class {
 				return await Multikey.fromJsonLd(serialized, this.options);
 			} catch {
 				await this.kv.delete([...this.prefix, keyId.href]);
-				return void 0;
+				return;
 			}
 		}
 	}
@@ -940,7 +924,6 @@ var KvKeyCache = class {
 			error.name = cached.errorName;
 			return { error };
 		}
-		return void 0;
 	}
 	async setFetchError(keyId, error) {
 		if (error == null) {
@@ -962,7 +945,6 @@ var KvKeyCache = class {
 		}, { ttl: this.unavailableKeyTtl });
 	}
 };
-
 //#endregion
 //#region src/federation/negotiation.ts
 function compareSpecs(a, b) {
@@ -1007,8 +989,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;
@@ -1017,8 +999,7 @@ 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);
 }
 function acceptsJsonLd(request) {
 	const accept = request.headers.get("Accept");
@@ -1027,7 +1008,6 @@ function acceptsJsonLd(request) {
 	if (types[0] === "text/html" || types[0] === "application/xhtml+xml") return false;
 	return types.includes("application/activity+json") || types.includes("application/ld+json") || types.includes("application/json");
 }
-
 //#endregion
 //#region src/federation/handler.ts
 /**
@@ -1037,25 +1017,25 @@ function acceptsJsonLd(request) {
 * @param parameters The parameters for handling the actor.
 * @returns A promise that resolves to an HTTP response.
 */
-async function handleActor(request, { identifier, context: context$1, actorDispatcher, authorizePredicate, onNotFound, onUnauthorized }) {
-	const logger$1 = getLogger([
+async function handleActor(request, { identifier, context, actorDispatcher, authorizePredicate, onNotFound, onUnauthorized }) {
+	const logger = 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$1, 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 (authorizePredicate != null) {
-		if (!await authorizePredicate(context$1, identifier)) return await onUnauthorized(request);
+		if (!await authorizePredicate(context, identifier)) return await onUnauthorized(request);
 	}
-	const jsonLd = await actor.toJsonLd(context$1);
+	const jsonLd = await actor.toJsonLd(context);
 	return new Response(JSON.stringify(jsonLd), { headers: {
 		"Content-Type": "application/activity+json",
 		Vary: "Accept"
@@ -1068,14 +1048,14 @@ async function handleActor(request, { identifier, context: context$1, actorDispa
 * @param parameters The parameters for handling the object.
 * @returns A promise that resolves to an HTTP response.
 */
-async function handleObject(request, { values, context: context$1, objectDispatcher, authorizePredicate, onNotFound, onUnauthorized }) {
+async function handleObject(request, { values, context, objectDispatcher, authorizePredicate, onNotFound, onUnauthorized }) {
 	if (objectDispatcher == null) return await onNotFound(request);
-	const object = await objectDispatcher(context$1, values);
+	const object = await objectDispatcher(context, values);
 	if (object == null) return await onNotFound(request);
 	if (authorizePredicate != null) {
-		if (!await authorizePredicate(context$1, values)) return await onUnauthorized(request);
+		if (!await authorizePredicate(context, values)) return await onUnauthorized(request);
 	}
-	const jsonLd = await object.toJsonLd(context$1);
+	const jsonLd = await object.toJsonLd(context);
 	return new Response(JSON.stringify(jsonLd), { headers: {
 		"Content-Type": "application/activity+json",
 		Vary: "Accept"
@@ -1091,18 +1071,17 @@ async function handleObject(request, { values, context: context$1, objectDispatc
 * @param parameters The parameters for handling the collection.
 * @returns A promise that resolves to an HTTP response.
 */
-async function handleCollection(request, { name, identifier, uriGetter, filter, filterPredicate, context: context$1, collectionCallbacks, tracerProvider, onUnauthorized, onNotFound }) {
-	const spanName = name.trim().replace(/\s+/g, "_");
+async function handleCollection(request, { name: name$2, identifier, uriGetter, filter, filterPredicate, context, collectionCallbacks, tracerProvider, onUnauthorized, onNotFound }) {
+	const spanName = name$2.trim().replace(/\s+/g, "_");
 	tracerProvider = tracerProvider ?? trace.getTracerProvider();
-	const tracer = tracerProvider.getTracer(deno_default.name, deno_default.version);
-	const url = new URL(request.url);
-	const cursor = url.searchParams.get("cursor");
+	const tracer = tracerProvider.getTracer(name, version);
+	const cursor = new URL(request.url).searchParams.get("cursor");
 	if (collectionCallbacks == null) return await onNotFound(request);
 	let collection;
 	const baseUri = uriGetter(identifier);
 	if (cursor == null) {
-		const firstCursor = await collectionCallbacks.firstCursor?.(context$1, identifier);
-		const totalItems = filter == null ? await collectionCallbacks.counter?.(context$1, identifier) : void 0;
+		const firstCursor = await collectionCallbacks.firstCursor?.(context, identifier);
+		const totalItems = filter == null ? await collectionCallbacks.counter?.(context, identifier) : void 0;
 		if (firstCursor == null) {
 			const itemsOrResponse = await tracer.startActiveSpan(`activitypub.dispatch_collection ${spanName}`, {
 				kind: SpanKind.SERVER,
@@ -1113,7 +1092,7 @@ async function handleCollection(request, { name, identifier, uriGetter, filter,
 			}, async (span) => {
 				if (totalItems != null) span.setAttribute("activitypub.collection.total_items", Number(totalItems));
 				try {
-					const page = await collectionCallbacks.dispatcher(context$1, identifier, null, filter);
+					const page = await collectionCallbacks.dispatcher(context, identifier, null, filter);
 					if (page == null) {
 						span.setStatus({ code: SpanStatusCode.ERROR });
 						return await onNotFound(request);
@@ -1135,15 +1114,15 @@ async function handleCollection(request, { name, identifier, uriGetter, filter,
 			collection = new OrderedCollection({
 				id: baseUri,
 				totalItems: totalItems == null ? null : Number(totalItems),
-				items: filterCollectionItems(itemsOrResponse, name, filterPredicate)
+				items: filterCollectionItems(itemsOrResponse, name$2, filterPredicate)
 			});
 		} else {
-			const lastCursor = await collectionCallbacks.lastCursor?.(context$1, identifier);
-			const first = new URL(context$1.url);
+			const lastCursor = await collectionCallbacks.lastCursor?.(context, identifier);
+			const first = new URL(context.url);
 			first.searchParams.set("cursor", firstCursor);
 			let last = null;
 			if (lastCursor != null) {
-				last = new URL(context$1.url);
+				last = new URL(context.url);
 				last.searchParams.set("cursor", lastCursor);
 			}
 			collection = new OrderedCollection({
@@ -1156,7 +1135,7 @@ async function handleCollection(request, { name, identifier, uriGetter, filter,
 	} else {
 		const uri = new URL(baseUri);
 		uri.searchParams.set("cursor", cursor);
-		const pageOrResponse = await tracer.startActiveSpan(`activitypub.dispatch_collection_page ${name}`, {
+		const pageOrResponse = await tracer.startActiveSpan(`activitypub.dispatch_collection_page ${name$2}`, {
 			kind: SpanKind.SERVER,
 			attributes: {
 				"activitypub.collection.id": uri.href,
@@ -1165,7 +1144,7 @@ async function handleCollection(request, { name, identifier, uriGetter, filter,
 			}
 		}, async (span) => {
 			try {
-				const page = await collectionCallbacks.dispatcher(context$1, identifier, cursor, filter);
+				const page = await collectionCallbacks.dispatcher(context, identifier, cursor, filter);
 				if (page == null) {
 					span.setStatus({ code: SpanStatusCode.ERROR });
 					return await onNotFound(request);
@@ -1186,28 +1165,28 @@ async function handleCollection(request, { name, identifier, uriGetter, filter,
 		const { items, prevCursor, nextCursor } = pageOrResponse;
 		let prev = null;
 		if (prevCursor != null) {
-			prev = new URL(context$1.url);
+			prev = new URL(context.url);
 			prev.searchParams.set("cursor", prevCursor);
 		}
 		let next = null;
 		if (nextCursor != null) {
-			next = new URL(context$1.url);
+			next = new URL(context.url);
 			next.searchParams.set("cursor", nextCursor);
 		}
-		const partOf = new URL(context$1.url);
+		const partOf = new URL(context.url);
 		partOf.searchParams.delete("cursor");
 		collection = new OrderedCollectionPage({
 			id: uri,
 			prev,
 			next,
-			items: filterCollectionItems(items, name, filterPredicate),
+			items: filterCollectionItems(items, name$2, filterPredicate),
 			partOf
 		});
 	}
 	if (collectionCallbacks.authorizePredicate != null) {
-		if (!await collectionCallbacks.authorizePredicate(context$1, identifier)) return await onUnauthorized(request);
+		if (!await collectionCallbacks.authorizePredicate(context, identifier)) return await onUnauthorized(request);
 	}
-	const jsonLd = await collection.toJsonLd(context$1);
+	const jsonLd = await collection.toJsonLd(context);
 	return new Response(JSON.stringify(jsonLd), { headers: {
 		"Content-Type": "application/activity+json",
 		Vary: "Accept"
@@ -1252,9 +1231,7 @@ function filterCollectionItems(items, collectionName, filterPredicate) {
 * @returns A promise that resolves to an HTTP response.
 */
 async function handleInbox(request, options) {
-	const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
-	const tracer = tracerProvider.getTracer(deno_default.name, deno_default.version);
-	return await tracer.startActiveSpan("activitypub.inbox", {
+	return await (options.tracerProvider ?? trace.getTracerProvider()).getTracer(name, version).startActiveSpan("activitypub.inbox", {
 		kind: options.queue == null ? SpanKind.SERVER : SpanKind.PRODUCER,
 		attributes: { "activitypub.shared_inbox": options.recipient == null }
 	}, async (span) => {
@@ -1282,22 +1259,21 @@ async function handleInbox(request, options) {
 */
 async function handleInboxInternal(request, parameters, span) {
 	const { recipient, context: ctx, inboxContextFactory, kv, kvPrefixes, queue, actorDispatcher, inboxListeners, inboxErrorHandler, unverifiedActivityHandler, onNotFound, signatureTimeWindow, skipSignatureVerification, inboxChallengePolicy, tracerProvider } = parameters;
-	const logger$1 = getLogger([
+	const logger = 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: 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: SpanStatusCode.ERROR,
 				message: `Actor ${recipient} not found.`
@@ -1306,7 +1282,7 @@ async function handleInboxInternal(request, parameters, span) {
 		}
 	}
 	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: SpanStatusCode.ERROR,
 			message: "Request body has already been read."
@@ -1316,7 +1292,7 @@ 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: SpanStatusCode.ERROR,
 			message: "Request body is locked."
@@ -1330,15 +1306,15 @@ 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
 			});
@@ -1363,7 +1339,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
 			});
@@ -1378,14 +1354,14 @@ async function handleInboxInternal(request, parameters, span) {
 	let activity = null;
 	let activityVerified = false;
 	if (ldSigVerified) {
-		logger$1.debug("Linked Data Signatures are verified.", {
+		logger.debug("Linked Data Signatures are verified.", {
 			recipient,
 			json
 		});
 		activity = await Activity.fromJsonLd(jsonWithoutSig, ctx);
 		activityVerified = true;
 	} else {
-		logger$1.debug("Linked Data Signatures are not verified.", {
+		logger.debug("Linked Data Signatures are not verified.", {
 			recipient,
 			json
 		});
@@ -1397,16 +1373,16 @@ 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
 				});
@@ -1420,12 +1396,12 @@ 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.", {
+			logger.debug("Object Integrity Proofs are verified.", {
 				recipient,
 				activity: json
 			});
@@ -1445,7 +1421,7 @@ async function handleInboxInternal(request, parameters, span) {
 			});
 			if (verification.verified === false) {
 				const reason = verification.reason;
-				logger$1.error("Failed to verify the request's HTTP Signatures.", {
+				logger.error("Failed to verify the request's HTTP Signatures.", {
 					recipient,
 					reason: reason.type,
 					keyId: "keyId" in reason ? reason.keyId?.href : void 0
@@ -1458,16 +1434,16 @@ async function handleInboxInternal(request, parameters, span) {
 				try {
 					activity = await Activity.fromJsonLd(jsonWithoutSig, ctx);
 				} 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
 						});
@@ -1494,16 +1470,16 @@ async function handleInboxInternal(request, parameters, span) {
 				try {
 					response = await unverifiedActivityHandler(ctx, activity, reason);
 				} catch (error) {
-					logger$1.error("An unexpected error occurred in unverified activity handler:\n{error}", {
+					logger.error("An unexpected error occurred in unverified activity handler:\n{error}", {
 						error,
 						activity: json,
 						recipient
 					});
 					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
 						});
@@ -1514,7 +1490,7 @@ async function handleInboxInternal(request, parameters, span) {
 				return await getFailedSignatureResponse(inboxChallengePolicy, kv, kvPrefixes);
 			} else {
 				if (inboxChallengePolicy?.enabled && inboxChallengePolicy.requestNonce) pendingNonceLabel = verification.signatureLabel;
-				logger$1.debug("HTTP Signatures are verified.", { recipient });
+				logger.debug("HTTP Signatures are verified.", { recipient });
 				activityVerified = true;
 			}
 			httpSigKey = verification.key;
@@ -1531,7 +1507,7 @@ async function handleInboxInternal(request, parameters, span) {
 		"http_signatures.key_id": httpSigKey?.id?.href ?? ""
 	});
 	if (httpSigKey != null && !await 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,
@@ -1547,9 +1523,8 @@ async function handleInboxInternal(request, parameters, span) {
 		});
 	}
 	if (pendingNonceLabel != null) {
-		const nonceValid = await verifySignatureNonce(request, kv, kvPrefixes.acceptSignatureNonce, pendingNonceLabel);
-		if (!nonceValid) {
-			logger$1.error("Signature nonce verification failed (missing, expired, or replayed).", { recipient });
+		if (!await verifySignatureNonce(request, kv, kvPrefixes.acceptSignatureNonce, pendingNonceLabel)) {
+			logger.error("Signature nonce verification failed (missing, expired, or replayed).", { recipient });
 			return await getFailedSignatureResponse(inboxChallengePolicy, kv, kvPrefixes);
 		}
 	}
@@ -1605,11 +1580,11 @@ async function handleInboxInternal(request, parameters, span) {
 * @since 1.8.0
 */
 const handleCustomCollection = exceptWrapper(_handleCustomCollection);
-async function _handleCustomCollection(request, { name, values, context: context$1, tracerProvider, collectionCallbacks: callbacks, filterPredicate }) {
+async function _handleCustomCollection(request, { name, values, context, tracerProvider, collectionCallbacks: callbacks, filterPredicate }) {
 	verifyDefined(callbacks);
-	await authIfNeeded(context$1, values, callbacks);
+	await authIfNeeded(context, values, callbacks);
 	const cursor = new URL(request.url).searchParams.get("cursor");
-	return await new CustomCollectionHandler(name, values, context$1, callbacks, tracerProvider, Collection, CollectionPage, filterPredicate).fetchCollection(cursor).toJsonLd().then(respondAsActivity);
+	return await new CustomCollectionHandler(name, values, context, callbacks, tracerProvider, Collection, CollectionPage, filterPredicate).fetchCollection(cursor).toJsonLd().then(respondAsActivity);
 }
 /**
 * Handles an ordered collection request.
@@ -1623,11 +1598,11 @@ async function _handleCustomCollection(request, { name, values, context: context
 * @since 1.8.0
 */
 const handleOrderedCollection = exceptWrapper(_handleOrderedCollection);
-async function _handleOrderedCollection(request, { name, values, context: context$1, tracerProvider, collectionCallbacks: callbacks, filterPredicate }) {
+async function _handleOrderedCollection(request, { name, values, context, tracerProvider, collectionCallbacks: callbacks, filterPredicate }) {
 	verifyDefined(callbacks);
-	await authIfNeeded(context$1, values, callbacks);
+	await authIfNeeded(context, values, callbacks);
 	const cursor = new URL(request.url).searchParams.get("cursor");
-	return await new CustomCollectionHandler(name, values, context$1, callbacks, tracerProvider, OrderedCollection, OrderedCollectionPage, filterPredicate).fetchCollection(cursor).toJsonLd().then(respondAsActivity);
+	return await new CustomCollectionHandler(name, values, context, callbacks, tracerProvider, OrderedCollection, OrderedCollectionPage, filterPredicate).fetchCollection(cursor).toJsonLd().then(respondAsActivity);
 }
 /**
 * Handling custom collections with support for pagination and filtering.
@@ -1677,17 +1652,17 @@ var CustomCollectionHandler = class {
 	* @param CollectionPage The CollectionPage constructor.
 	* @param filterPredicate Optional filter predicate for items.
 	*/
-	constructor(name, values, context$1, callbacks, tracerProvider = trace.getTracerProvider(), Collection$1, CollectionPage$1, filterPredicate) {
-		this.name = name;
+	constructor(name$1, values, context, callbacks, tracerProvider = trace.getTracerProvider(), Collection, CollectionPage, filterPredicate) {
+		this.name = name$1;
 		this.values = values;
-		this.context = context$1;
+		this.context = context;
 		this.callbacks = callbacks;
 		this.tracerProvider = tracerProvider;
-		this.Collection = Collection$1;
-		this.CollectionPage = CollectionPage$1;
+		this.Collection = Collection;
+		this.CollectionPage = CollectionPage;
 		this.filterPredicate = filterPredicate;
 		this.name = this.name.trim().replace(/\s+/g, "_");
-		this.#tracer = this.tracerProvider.getTracer(deno_default.name, deno_default.version);
+		this.#tracer = this.tracerProvider.getTracer(name, version);
 		this.#id = new URL(this.context.url);
 		this.#dispatcher = callbacks.dispatcher.bind(callbacks);
 	}
@@ -1716,8 +1691,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();
@@ -1865,7 +1840,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));
 	}
 	/**
@@ -1929,9 +1904,9 @@ const verifyDefined = (callbacks) => {
 * @throws {UnauthorizedError} If authorization fails.
 * @since 1.8.0
 */
-const authIfNeeded = async (context$1, values, { authorizePredicate: authorize = void 0 }) => {
+const authIfNeeded = async (context, values, { authorizePredicate: authorize = void 0 }) => {
 	if (authorize === void 0) return;
-	if (!await authorize(context$1, values)) throw new UnauthorizedError();
+	if (!await authorize(context, values)) throw new UnauthorizedError();
 };
 /**
 * Appends a cursor parameter to a URL if the cursor exists.
@@ -2033,8 +2008,7 @@ async function verifySignatureNonce(request, kv, noncePrefix, verifiedLabel) {
 	if (nonce == null) return false;
 	const key = [...noncePrefix, nonce];
 	if (kv.cas != null) return await kv.cas(key, true, void 0);
-	const stored = await kv.get(key);
-	if (stored != null) {
+	if (await kv.get(key) != null) {
 		await kv.delete(key);
 		return true;
 	}
@@ -2059,18 +2033,16 @@ async function buildAcceptSignatureHeader(policy, kv, noncePrefix) {
 	const parameters = { created: true };
 	if (policy.requestNonce) {
 		const nonce = generateNonce();
-		const key = [...noncePrefix, nonce];
-		await setKey(kv, key, policy);
+		await setKey(kv, [...noncePrefix, nonce], policy);
 		parameters.nonce = nonce;
 	}
 	const baseComponents = policy.components ?? DEF_COMPONENTS;
-	const components = uniq(MIN_COMPONENTS.concat(baseComponents)).filter((c) => c !== "@status").map((v) => ({
-		value: v,
-		params: {}
-	}));
 	return formatAcceptSignature([{
 		label: "sig1",
-		components,
+		components: uniq(MIN_COMPONENTS.concat(baseComponents)).filter((c) => c !== "@status").map((v) => ({
+			value: v,
+			params: {}
+		})),
 		parameters
 	}]);
 }
@@ -2090,7 +2062,6 @@ const MIN_COMPONENTS = [
 	"@target-uri",
 	"@authority"
 ];
-
 //#endregion
 //#region src/nodeinfo/handler.ts
 /**
@@ -2100,10 +2071,9 @@ const MIN_COMPONENTS = [
 * @param parameters The parameters for handling the request.
 * @returns The response to the request.
 */
-async function handleNodeInfo(_request, { context: context$1, nodeInfoDispatcher }) {
-	const promise = nodeInfoDispatcher(context$1);
-	const nodeInfo = promise instanceof Promise ? await promise : promise;
-	const json = nodeInfoToJson(nodeInfo);
+async function handleNodeInfo(_request, { context, nodeInfoDispatcher }) {
+	const promise = nodeInfoDispatcher(context);
+	const json = nodeInfoToJson(promise instanceof Promise ? await promise : promise);
 	return new Response(JSON.stringify(json), { headers: { "Content-Type": "application/json; profile=\"http://nodeinfo.diaspora.software/ns/schema/2.1#\"" } });
 }
 /**
@@ -2113,22 +2083,20 @@ async function handleNodeInfo(_request, { context: context$1, nodeInfoDispatcher
 * @param context The request context.
 * @returns The response to the request.
 */
-function handleNodeInfoJrd(_request, context$1) {
+function handleNodeInfoJrd(_request, context) {
 	const links = [];
 	try {
 		links.push({
 			rel: "http://nodeinfo.diaspora.software/ns/schema/2.1",
-			href: context$1.getNodeInfoUri().href,
+			href: context.getNodeInfoUri().href,
 			type: "application/json; profile=\"http://nodeinfo.diaspora.software/ns/schema/2.1#\""
 		});
 	} catch (e) {
 		if (!(e instanceof RouterError)) throw e;
 	}
-	const jrd = { links };
-	const response = new Response(JSON.stringify(jrd), { headers: { "Content-Type": "application/jrd+json" } });
+	const response = new Response(JSON.stringify({ links }), { headers: { "Content-Type": "application/jrd+json" } });
 	return Promise.resolve(response);
 }
-
 //#endregion
 //#region src/federation/retry.ts
 /**
@@ -2159,7 +2127,6 @@ function createExponentialBackoffPolicy(options = {}) {
 		return Temporal.Duration.compare(delay, maxDelay) > 0 ? maxDelay : delay;
 	};
 }
-
 //#endregion
 //#region src/federation/send.ts
 /**
@@ -2197,8 +2164,7 @@ function extractInboxes({ recipients, preferSharedInbox, excludeBaseUris }) {
 */
 function sendActivity(options) {
 	const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
-	const tracer = tracerProvider.getTracer(deno_default.name, deno_default.version);
-	return tracer.startActiveSpan("activitypub.send_activity", {
+	return tracerProvider.getTracer(name, version).startActiveSpan("activitypub.send_activity", {
 		kind: SpanKind.CLIENT,
 		attributes: { "activitypub.shared_inbox": options.sharedInbox ?? false }
 	}, async (span) => {
@@ -2249,7 +2215,7 @@ async function readLimitedResponseBody(response, maxBytes) {
 	return result;
 }
 async function sendActivityInternal({ activity, activityId, keys, inbox, headers, specDeterminer, tracerProvider }, span) {
-	const logger$1 = getLogger([
+	const logger = getLogger([
 		"fedify",
 		"federation",
 		"outbox"
@@ -2266,7 +2232,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,
@@ -2280,7 +2246,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
@@ -2294,7 +2260,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,
@@ -2346,7 +2312,6 @@ var SendActivityError = class extends Error {
 		this.responseBody = responseBody;
 	}
 };
-
 //#endregion
 //#region src/federation/webfinger.ts
 const logger = getLogger([
@@ -2379,12 +2344,12 @@ async function handleWebFinger(request, options) {
 		}
 	});
 }
-async function handleWebFingerInternal(request, { context: context$1, host, actorDispatcher, actorHandleMapper, actorAliasMapper, onNotFound, span, webFingerLinksDispatcher }) {
+async function handleWebFingerInternal(request, { context, host, actorDispatcher, actorHandleMapper, actorAliasMapper, onNotFound, span, webFingerLinksDispatcher }) {
 	if (actorDispatcher == null) {
 		logger.error("Actor dispatcher is not set.");
 		return await onNotFound(request);
 	}
-	const resource = context$1.url.searchParams.get("resource");
+	const resource = context.url.searchParams.get("resource");
 	if (resource == null) return new Response("Missing resource parameter.", { status: 400 });
 	span?.setAttribute("webfinger.resource", resource);
 	let resourceUrl;
@@ -2400,26 +2365,26 @@ async function handleWebFingerInternal(request, { context: context$1, host, acto
 			logger.error("No actor handle mapper is set; use the WebFinger username {username} as the actor's internal identifier.", { username });
 			return username;
 		}
-		const identifier$1 = await actorHandleMapper(context$1, username);
-		if (identifier$1 == null) {
+		const identifier = await actorHandleMapper(context, username);
+		if (identifier == null) {
 			logger.error("Actor {username} not found.", { username });
 			return null;
 		}
-		return identifier$1;
+		return identifier;
 	}
 	let identifier = null;
-	const uriParsed = context$1.parseUri(resourceUrl);
+	const uriParsed = context.parseUri(resourceUrl);
 	if (uriParsed?.type != "actor") {
 		const match = /^acct:([^@]+)@([^@]+)$/.exec(resource);
 		if (match == null) {
-			const result = await actorAliasMapper?.(context$1, resourceUrl);
+			const result = await actorAliasMapper?.(context, resourceUrl);
 			if (result == null) return await onNotFound(request);
 			if ("identifier" in result) identifier = result.identifier;
 			else identifier = await mapUsernameToIdentifier(result.username);
 		} else {
 			const portMatch = /:\d+$/.exec(match[2]);
 			const normalizedHost = portMatch == null ? domainToASCII(match[2].toLowerCase()) : domainToASCII(match[2].substring(0, portMatch.index).toLowerCase()) + portMatch[0];
-			if (normalizedHost != context$1.url.host && normalizedHost != host) return await onNotFound(request);
+			if (normalizedHost != context.url.host && normalizedHost != host) return await onNotFound(request);
 			else {
 				identifier = await mapUsernameToIdentifier(match[1]);
 				resourceUrl = new URL(`acct:${match[1]}@${normalizedHost}`);
@@ -2427,14 +2392,14 @@ async function handleWebFingerInternal(request, { context: context$1, host, acto
 		}
 	} else identifier = uriParsed.identifier;
 	if (identifier == null) return await onNotFound(request);
-	const actor = await actorDispatcher(context$1, identifier);
+	const actor = await actorDispatcher(context, identifier);
 	if (actor == null) {
 		logger.error("Actor {identifier} not found.", { identifier });
 		return await onNotFound(request);
 	}
 	const links = [{
 		rel: "self",
-		href: context$1.getActorUri(identifier).href,
+		href: context.getActorUri(identifier).href,
 		type: "application/activity+json"
 	}];
 	for (const url of actor.urls) if (url instanceof Link && url.href != null) links.push({
@@ -2455,16 +2420,16 @@ async function handleWebFingerInternal(request, { context: context$1, host, acto
 		});
 	}
 	if (webFingerLinksDispatcher != null) {
-		const customLinks = await webFingerLinksDispatcher(context$1, resourceUrl);
+		const customLinks = await webFingerLinksDispatcher(context, resourceUrl);
 		if (customLinks != null) for (const link of customLinks) links.push(link);
 	}
 	const aliases = [];
 	if (resourceUrl.protocol != "acct:" && actor.preferredUsername != null) {
-		aliases.push(`acct:${actor.preferredUsername}@${host ?? context$1.url.host}`);
-		if (host != null && host !== context$1.url.host) aliases.push(`acct:${actor.preferredUsername}@${context$1.url.host}`);
+		aliases.push(`acct:${actor.preferredUsername}@${host ?? context.url.host}`);
+		if (host != null && host !== context.url.host) aliases.push(`acct:${actor.preferredUsername}@${context.url.host}`);
 	}
-	if (resourceUrl.href !== context$1.getActorUri(identifier).href) aliases.push(context$1.getActorUri(identifier).href);
-	if (resourceUrl.protocol === "acct:" && host != null && host !== context$1.url.host && !resourceUrl.href.endsWith(`@${host}`)) {
+	if (resourceUrl.href !== context.getActorUri(identifier).href) aliases.push(context.getActorUri(identifier).href);
+	if (resourceUrl.protocol === "acct:" && host != null && host !== context.url.host && !resourceUrl.href.endsWith(`@${host}`)) {
 		const username = resourceUrl.href.replace(/^acct:/, "").replace(/@.*$/, "");
 		aliases.push(`acct:${username}@${host}`);
 	}
@@ -2478,9 +2443,15 @@ async function handleWebFingerInternal(request, { context: context$1, host, acto
 		"Access-Control-Allow-Origin": "*"
 	} });
 }
-
 //#endregion
 //#region src/federation/middleware.ts
+var middleware_exports = /* @__PURE__ */ __exportAll({
+	ContextImpl: () => ContextImpl,
+	FederationImpl: () => FederationImpl,
+	InboxContextImpl: () => InboxContextImpl,
+	KvSpecDeterminer: () => KvSpecDeterminer,
+	createFederation: () => createFederation
+});
 /**
 * Create a new {@link Federation} instance.
 * @param parameters Parameters for initializing the instance.
@@ -2609,28 +2580,28 @@ var FederationImpl = class extends FederationBuilderImpl {
 		this.router.add("/.well-known/nodeinfo", "nodeInfoJrd");
 	}
 	_getTracer() {
-		return this.tracerProvider.getTracer(deno_default.name, deno_default.version);
+		return this.tracerProvider.getTracer(name, version);
 	}
 	async _startQueueInternal(ctxData, signal, queue) {
 		if (this.inboxQueue == null && this.outboxQueue == null) return;
-		const logger$1 = getLogger([
+		const logger = 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 }));
 		}
@@ -2714,12 +2685,11 @@ var FederationImpl = class extends FederationBuilderImpl {
 		});
 	}
 	async #listenFanoutMessage(data, message) {
-		const logger$1 = getLogger([
+		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
 		});
@@ -2738,18 +2708,18 @@ var FederationImpl = class extends FederationBuilderImpl {
 			}),
 			tracerProvider: this.tracerProvider
 		});
-		const context$1 = this.#createContext(new URL(message.baseUrl), data, { documentLoader: this.documentLoaderFactory({
+		const context = this.#createContext(new URL(message.baseUrl), data, { documentLoader: this.documentLoaderFactory({
 			allowPrivateAddress: this.allowPrivateAddress,
 			userAgent: this.userAgent
 		}) });
 		await this.sendActivity(keys, message.inboxes, activity, {
 			collectionSync: message.collectionSync,
 			orderingKey: message.orderingKey,
-			context: context$1
+			context
 		});
 	}
 	async #listenOutboxMessage(_, message, span) {
-		const logger$1 = getLogger([
+		const logger = getLogger([
 			"fedify",
 			"federation",
 			"outbox"
@@ -2797,14 +2767,14 @@ var FederationImpl = class extends FederationBuilderImpl {
 			});
 			try {
 				await 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 (error instanceof SendActivityError && this.permanentFailureStatusCodes.includes(error.statusCode)) {
-				logger$1.warn("Permanent delivery failure for activity {activityId} to {inbox} ({status}); not retrying.", {
+				logger.warn("Permanent delivery failure for activity {activityId} to {inbox} ({status}); not retrying.", {
 					...logData,
 					status: error.statusCode
 				});
@@ -2820,13 +2790,13 @@ var FederationImpl = class extends FederationBuilderImpl {
 								try {
 									return [new URL(id)];
 								} catch {
-									logger$1.warn("Invalid actorId URL in OutboxMessage: {id}", { id });
+									logger.warn("Invalid actorId URL in OutboxMessage: {id}", { id });
 									return [];
 								}
 							})
 						});
 					} catch (handlerError) {
-						logger$1.error("An unexpected error occurred in outboxPermanentFailureHandler:\n{error}", {
+						logger.error("An unexpected error occurred in outboxPermanentFailureHandler:\n{error}", {
 							...logData,
 							error: handlerError
 						});
@@ -2835,7 +2805,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 				return;
 			}
 			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
 				});
@@ -2846,7 +2816,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
 				});
@@ -2854,39 +2824,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 = getLogger([
+		const logger = getLogger([
 			"fedify",
 			"federation",
 			"inbox"
 		]);
 		const baseUrl = new URL(message.baseUrl);
-		let context$1 = this.#createContext(baseUrl, ctxData);
-		if (message.identifier != null) context$1 = this.#createContext(baseUrl, ctxData, { documentLoader: await context$1.getDocumentLoader({ identifier: message.identifier }) });
+		let context = this.#createContext(baseUrl, ctxData);
+		if (message.identifier != null) context = this.#createContext(baseUrl, ctxData, { documentLoader: await context.getDocumentLoader({ identifier: message.identifier }) });
 		else if (this.sharedInboxKeyDispatcher != null) {
-			const identity = await this.sharedInboxKeyDispatcher(context$1);
-			if (identity != null) context$1 = this.#createContext(baseUrl, ctxData, { documentLoader: "identifier" in identity || "username" in identity ? await context$1.getDocumentLoader(identity) : context$1.getDocumentLoader(identity) });
+			const identity = await this.sharedInboxKeyDispatcher(context);
+			if (identity != null) context = this.#createContext(baseUrl, ctxData, { documentLoader: "identifier" in identity || "username" in identity ? await context.getDocumentLoader(identity) : context.getDocumentLoader(identity) });
 		}
-		const activity = await Activity.fromJsonLd(message.activity, context$1);
+		const activity = await Activity.fromJsonLd(message.activity, context);
 		span.setAttribute("activitypub.activity.type", getTypeId(activity).href);
 		if (activity.id != null) span.setAttribute("activitypub.activity.id", activity.id.href);
 		const cacheKey = activity.id == null ? null : [
 			...this.kvPrefixes.activityIdempotence,
-			context$1.origin,
+			context.origin,
 			activity.id.href
 		];
 		if (cacheKey != null) {
-			const cached = await this.kv.get(cacheKey);
-			if (cached === true) {
-				logger$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
@@ -2894,32 +2863,32 @@ var FederationImpl = class extends FederationBuilderImpl {
 				return;
 			}
 		}
-		await this._getTracer().startActiveSpan("activitypub.dispatch_inbox_listener", { kind: SpanKind.INTERNAL }, async (span$1) => {
+		await this._getTracer().startActiveSpan("activitypub.dispatch_inbox_listener", { kind: SpanKind.INTERNAL }, async (span) => {
 			const dispatched = this.inboxListeners?.dispatchWithClass(activity);
 			if (dispatched == null) {
-				logger$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({
+				span.setStatus({
 					code: SpanStatusCode.ERROR,
 					message: `Unsupported activity type: ${getTypeId(activity).href}`
 				});
-				span$1.end();
+				span.end();
 				return;
 			}
 			const { class: cls, listener } = dispatched;
-			span$1.updateName(`activitypub.dispatch_inbox_listener ${cls.name}`);
+			span.updateName(`activitypub.dispatch_inbox_listener ${cls.name}`);
 			try {
-				await listener(context$1.toInboxContext(message.identifier, message.activity, activity.id?.href, getTypeId(activity).href), activity);
+				await listener(context.toInboxContext(message.identifier, message.activity, activity.id?.href, getTypeId(activity).href), activity);
 			} catch (error) {
 				try {
-					await this.inboxErrorHandler?.(context$1, error);
-				} catch (error$1) {
-					logger$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,
@@ -2927,17 +2896,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({
+					span.setStatus({
 						code: SpanStatusCode.ERROR,
 						message: String(error)
 					});
-					span$1.end();
+					span.end();
 					throw error;
 				}
 				const delay = this.inboxRetryPolicy({
@@ -2945,7 +2914,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,
@@ -2956,26 +2925,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({
+				span.setStatus({
 					code: SpanStatusCode.ERROR,
 					message: String(error)
 				});
-				span$1.end();
+				span.end();
 				return;
 			}
 			if (cacheKey != null) await this.kv.set(cacheKey, true, { ttl: Temporal.Duration.from({ days: 1 }) });
-			logger$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 = {}) {
@@ -3019,7 +2988,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 		};
 	}
 	async sendActivity(keys, inboxes, activity, options) {
-		const logger$1 = getLogger([
+		const logger = getLogger([
 			"fedify",
 			"federation",
 			"outbox"
@@ -3053,7 +3022,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,
@@ -3064,7 +3033,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,
@@ -3072,11 +3041,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
 			});
@@ -3095,7 +3064,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
 		});
@@ -3139,10 +3108,9 @@ var FederationImpl = class extends FederationBuilderImpl {
 		const { outboxQueue } = this;
 		if (outboxQueue.enqueueMany == null) {
 			const promises = messages.map((m) => outboxQueue.enqueue(m.message, { orderingKey: m.orderingKey }));
-			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
 				});
@@ -3151,10 +3119,9 @@ var FederationImpl = class extends FederationBuilderImpl {
 			}
 		} else if (orderingKey != null) {
 			const promises = messages.map((m) => outboxQueue.enqueue(m.message, { orderingKey: m.orderingKey }));
-			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
 				});
@@ -3164,7 +3131,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 		} else try {
 			await outboxQueue.enqueueMany(messages.map((m) => m.message));
 		} 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
 			});
@@ -3172,8 +3139,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 		}
 	}
 	fetch(request, options) {
-		const requestId = getRequestId(request);
-		return withContext({ requestId }, async () => {
+		return withContext({ requestId: getRequestId(request) }, async () => {
 			const tracer = this._getTracer();
 			return await tracer.startActiveSpan(request.method, {
 				kind: SpanKind.SERVER,
@@ -3187,7 +3153,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 					traceId: spanCtx.traceId,
 					spanId: spanCtx.spanId
 				}, async () => {
-					const logger$1 = getLogger([
+					const logger = getLogger([
 						"fedify",
 						"federation",
 						"http"
@@ -3207,7 +3173,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 							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
@@ -3231,9 +3197,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;
 				});
 			});
@@ -3247,11 +3213,11 @@ var FederationImpl = class extends FederationBuilderImpl {
 		const route = this.router.route(url.pathname);
 		if (route == null) return await onNotFound(request);
 		span.updateName(`${request.method} ${route.template}`);
-		let context$1 = this.#createContext(request, contextData);
+		let context = this.#createContext(request, contextData);
 		const routeName = route.name.replace(/:.*$/, "");
 		switch (routeName) {
 			case "webfinger": return await handleWebFinger(request, {
-				context: context$1,
+				context,
 				host: this.origin?.handleHost,
 				actorDispatcher: this.actorCallbacks?.dispatcher,
 				actorHandleMapper: this.actorCallbacks?.handleMapper,
@@ -3260,19 +3226,19 @@ var FederationImpl = class extends FederationBuilderImpl {
 				onNotFound,
 				tracer
 			});
-			case "nodeInfoJrd": return await handleNodeInfoJrd(request, context$1);
+			case "nodeInfoJrd": return await handleNodeInfoJrd(request, context);
 			case "nodeInfo": return await handleNodeInfo(request, {
-				context: context$1,
+				context,
 				nodeInfoDispatcher: this.nodeInfoDispatcher
 			});
 		}
 		if (request.method !== "POST" && !acceptsJsonLd(request)) return await onNotAcceptable(request);
 		switch (routeName) {
 			case "actor":
-				context$1 = this.#createContext(request, contextData, { invokedFromActorDispatcher: { identifier: route.values.identifier } });
+				context = this.#createContext(request, contextData, { invokedFromActorDispatcher: { identifier: route.values.identifier } });
 				return await handleActor(request, {
 					identifier: route.values.identifier,
-					context: context$1,
+					context,
 					actorDispatcher: this.actorCallbacks?.dispatcher,
 					authorizePredicate: this.actorCallbacks?.authorizePredicate,
 					onUnauthorized,
@@ -3282,13 +3248,13 @@ var FederationImpl = class extends FederationBuilderImpl {
 				const typeId = route.name.replace(/^object:/, "");
 				const callbacks = this.objectCallbacks[typeId];
 				const cls = this.objectTypeIds[typeId];
-				context$1 = this.#createContext(request, contextData, { invokedFromObjectDispatcher: {
+				context = this.#createContext(request, contextData, { invokedFromObjectDispatcher: {
 					cls,
 					values: route.values
 				} });
 				return await handleObject(request, {
 					values: route.values,
-					context: context$1,
+					context,
 					objectDispatcher: callbacks?.dispatcher,
 					authorizePredicate: callbacks?.authorizePredicate,
 					onUnauthorized,
@@ -3298,8 +3264,8 @@ var FederationImpl = class extends FederationBuilderImpl {
 			case "outbox": return await handleCollection(request, {
 				name: "outbox",
 				identifier: route.values.identifier,
-				uriGetter: context$1.getOutboxUri.bind(context$1),
-				context: context$1,
+				uriGetter: context.getOutboxUri.bind(context),
+				context,
 				collectionCallbacks: this.outboxCallbacks,
 				tracerProvider: this.tracerProvider,
 				onUnauthorized,
@@ -3309,24 +3275,24 @@ var FederationImpl = class extends FederationBuilderImpl {
 				if (request.method !== "POST") return await handleCollection(request, {
 					name: "inbox",
 					identifier: route.values.identifier,
-					uriGetter: context$1.getInboxUri.bind(context$1),
-					context: context$1,
+					uriGetter: context.getInboxUri.bind(context),
+					context,
 					collectionCallbacks: this.inboxCallbacks,
 					tracerProvider: this.tracerProvider,
 					onUnauthorized,
 					onNotFound
 				});
-				context$1 = this.#createContext(request, contextData, { documentLoader: await context$1.getDocumentLoader({ identifier: route.values.identifier }) });
+				context = this.#createContext(request, contextData, { documentLoader: await context.getDocumentLoader({ identifier: route.values.identifier }) });
 			case "sharedInbox":
 				if (routeName !== "inbox" && this.sharedInboxKeyDispatcher != null) {
-					const identity = await this.sharedInboxKeyDispatcher(context$1);
-					if (identity != null) context$1 = this.#createContext(request, contextData, { documentLoader: "identifier" in identity || "username" in identity ? await context$1.getDocumentLoader(identity) : context$1.getDocumentLoader(identity) });
+					const identity = await this.sharedInboxKeyDispatcher(context);
+					if (identity != null) context = this.#createContext(request, contextData, { documentLoader: "identifier" in identity || "username" in identity ? await context.getDocumentLoader(identity) : context.getDocumentLoader(identity) });
 				}
 				if (!this.manuallyStartQueue) this._startQueueInternal(contextData);
 				return await handleInbox(request, {
 					recipient: route.values.identifier ?? null,
-					context: context$1,
-					inboxContextFactory: context$1.toInboxContext.bind(context$1),
+					context,
+					inboxContextFactory: context.toInboxContext.bind(context),
 					kv: this.kv,
 					kvPrefixes: this.kvPrefixes,
 					queue: this.inboxQueue,
@@ -3344,8 +3310,8 @@ var FederationImpl = class extends FederationBuilderImpl {
 			case "following": return await handleCollection(request, {
 				name: "following",
 				identifier: route.values.identifier,
-				uriGetter: context$1.getFollowingUri.bind(context$1),
-				context: context$1,
+				uriGetter: context.getFollowingUri.bind(context),
+				context,
 				collectionCallbacks: this.followingCallbacks,
 				tracerProvider: this.tracerProvider,
 				onUnauthorized,
@@ -3361,14 +3327,14 @@ var FederationImpl = class extends FederationBuilderImpl {
 				return await handleCollection(request, {
 					name: "followers",
 					identifier: route.values.identifier,
-					uriGetter: baseUrl == null ? context$1.getFollowersUri.bind(context$1) : (identifier) => {
-						const uri = context$1.getFollowersUri(identifier);
+					uriGetter: baseUrl == null ? context.getFollowersUri.bind(context) : (identifier) => {
+						const uri = context.getFollowersUri(identifier);
 						uri.searchParams.set("base-url", baseUrl);
 						return uri;
 					},
-					context: context$1,
+					context,
 					filter: baseUrl != null ? new URL(baseUrl) : void 0,
-					filterPredicate: baseUrl != null ? (i) => (i instanceof URL ? i.href : i.id?.href ?? "").startsWith(baseUrl) : void 0,
+					filterPredicate: baseUrl != null ? ((i) => (i instanceof URL ? i.href : i.id?.href ?? "").startsWith(baseUrl)) : void 0,
 					collectionCallbacks: this.followersCallbacks,
 					tracerProvider: this.tracerProvider,
 					onUnauthorized,
@@ -3378,8 +3344,8 @@ var FederationImpl = class extends FederationBuilderImpl {
 			case "liked": return await handleCollection(request, {
 				name: "liked",
 				identifier: route.values.identifier,
-				uriGetter: context$1.getLikedUri.bind(context$1),
-				context: context$1,
+				uriGetter: context.getLikedUri.bind(context),
+				context,
 				collectionCallbacks: this.likedCallbacks,
 				tracerProvider: this.tracerProvider,
 				onUnauthorized,
@@ -3388,8 +3354,8 @@ var FederationImpl = class extends FederationBuilderImpl {
 			case "featured": return await handleCollection(request, {
 				name: "featured",
 				identifier: route.values.identifier,
-				uriGetter: context$1.getFeaturedUri.bind(context$1),
-				context: context$1,
+				uriGetter: context.getFeaturedUri.bind(context),
+				context,
 				collectionCallbacks: this.featuredCallbacks,
 				tracerProvider: this.tracerProvider,
 				onUnauthorized,
@@ -3398,8 +3364,8 @@ var FederationImpl = class extends FederationBuilderImpl {
 			case "featuredTags": return await handleCollection(request, {
 				name: "featured tags",
 				identifier: route.values.identifier,
-				uriGetter: context$1.getFeaturedTagsUri.bind(context$1),
-				context: context$1,
+				uriGetter: context.getFeaturedTagsUri.bind(context),
+				context,
 				collectionCallbacks: this.featuredTagsCallbacks,
 				tracerProvider: this.tracerProvider,
 				onUnauthorized,
@@ -3410,7 +3376,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 				const callbacks = this.collectionCallbacks[name];
 				return await handleCustomCollection(request, {
 					name,
-					context: context$1,
+					context,
 					values: route.values,
 					collectionCallbacks: callbacks,
 					tracerProvider: this.tracerProvider,
@@ -3423,7 +3389,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 				const callbacks = this.collectionCallbacks[name];
 				return await handleOrderedCollection(request, {
 					name,
-					context: context$1,
+					context,
 					values: route.values,
 					collectionCallbacks: callbacks,
 					tracerProvider: this.tracerProvider,
@@ -3514,9 +3480,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 });
 		if (path == null) throw new RouterError("No inbox path registered.");
@@ -3602,8 +3568,7 @@ var ContextImpl = class ContextImpl {
 			type: "featuredTags",
 			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;
@@ -3619,12 +3584,12 @@ var ContextImpl = class ContextImpl {
 		return null;
 	}
 	async getActorKeyPairs(identifier) {
-		const logger$1 = getLogger([
+		const logger = 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
 		});
@@ -3632,7 +3597,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);
@@ -3656,7 +3621,7 @@ var ContextImpl = class ContextImpl {
 		return result;
 	}
 	async getKeyPairsFromIdentifier(identifier) {
-		const logger$1 = getLogger([
+		const logger = getLogger([
 			"fedify",
 			"federation",
 			"actor"
@@ -3667,7 +3632,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;
@@ -3676,7 +3641,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) {
@@ -3715,8 +3680,7 @@ var ContextImpl = class ContextImpl {
 			} else identifierPromise = Promise.resolve(identity.identifier);
 			return identifierPromise.then((identifier) => {
 				if (identifier == null) return this.documentLoader;
-				const keyPair = this.getRsaKeyPairFromIdentifier(identifier);
-				return keyPair.then((pair) => pair == null ? this.documentLoader : this.federation.authenticatedDocumentLoaderFactory(pair));
+				return this.getRsaKeyPairFromIdentifier(identifier).then((pair) => pair == null ? this.documentLoader : this.federation.authenticatedDocumentLoaderFactory(pair));
 			});
 		}
 		return this.federation.authenticatedDocumentLoaderFactory(identity);
@@ -3758,8 +3722,7 @@ var ContextImpl = class ContextImpl {
 		});
 	}
 	sendActivity(sender, recipients, activity, options = {}) {
-		const tracer = this.tracerProvider.getTracer(deno_default.name, deno_default.version);
-		return tracer.startActiveSpan(this.federation.outboxQueue == null || options.immediate ? "activitypub.outbox" : "activitypub.fanout", {
+		return this.tracerProvider.getTracer(name, version).startActiveSpan(this.federation.outboxQueue == null || options.immediate ? "activitypub.outbox" : "activitypub.fanout", {
 			kind: this.federation.outboxQueue == null || options.immediate ? SpanKind.CLIENT : SpanKind.PRODUCER,
 			attributes: {
 				"activitypub.activity.type": getTypeId(activity).href,
@@ -3784,7 +3747,7 @@ var ContextImpl = class ContextImpl {
 		});
 	}
 	async sendActivityInternal(sender, recipients, activity, options, span) {
-		const logger$1 = getLogger([
+		const logger = getLogger([
 			"fedify",
 			"federation",
 			"outbox"
@@ -3834,7 +3797,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
 			});
@@ -3845,7 +3808,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
@@ -3897,16 +3860,14 @@ var ContextImpl = class ContextImpl {
 			"outbox"
 		]).warn("Since the followers collection dispatcher returned null for no cursor (i.e., one-shot dispatcher), the pagination is used to fetch \"followers\".  However, it is recommended to implement the one-shot dispatcher for better performance.", { identifier });
 		while (cursor != null) {
-			const result$1 = await this.federation.followersCallbacks.dispatcher(this, identifier, cursor);
-			if (result$1 == null) break;
-			for (const recipient of result$1.items) yield recipient;
-			cursor = result$1.nextCursor ?? null;
+			const result = await this.federation.followersCallbacks.dispatcher(this, identifier, cursor);
+			if (result == null) break;
+			for (const recipient of result.items) yield recipient;
+			cursor = result.nextCursor ?? null;
 		}
 	}
 	routeActivity(recipient, activity, options = {}) {
-		const tracerProvider = this.tracerProvider ?? this.tracerProvider;
-		const tracer = tracerProvider.getTracer(deno_default.name, deno_default.version);
-		return tracer.startActiveSpan("activitypub.inbox", {
+		return (this.tracerProvider ?? this.tracerProvider).getTracer(name, version).startActiveSpan("activitypub.inbox", {
 			kind: this.federation.inboxQueue == null || options.immediate ? SpanKind.INTERNAL : SpanKind.PRODUCER,
 			attributes: { "activitypub.activity.type": getTypeId(activity).href }
 		}, async (span) => {
@@ -3934,7 +3895,7 @@ var ContextImpl = class ContextImpl {
 		});
 	}
 	async routeActivityInternal(recipient, activity, options = {}, span) {
-		const logger$1 = getLogger([
+		const logger = getLogger([
 			"fedify",
 			"federation",
 			"inbox"
@@ -3942,19 +3903,18 @@ var ContextImpl = class ContextImpl {
 		const contextLoader = options.contextLoader ?? this.contextLoader;
 		const json = await activity.toJsonLd({ contextLoader });
 		const keyCache = new KvKeyCache(this.federation.kv, this.federation.kvPrefixes.publicKey, this);
-		const verified = await verifyObject(Activity, json, {
+		if (await verifyObject(Activity, json, {
 			contextLoader,
 			documentLoader: options.documentLoader ?? this.documentLoader,
 			tracerProvider: options.tracerProvider ?? this.tracerProvider,
 			keyCache
-		});
-		if (verified == null) {
-			logger$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
 				});
@@ -3962,26 +3922,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 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 })
 				});
@@ -3989,15 +3949,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
 		});
@@ -4139,8 +4099,7 @@ var InboxContextImpl = class InboxContextImpl extends ContextImpl {
 		});
 	}
 	forwardActivity(forwarder, recipients, options) {
-		const tracer = this.tracerProvider.getTracer(deno_default.name, deno_default.version);
-		return tracer.startActiveSpan("activitypub.outbox", {
+		return this.tracerProvider.getTracer(name, version).startActiveSpan("activitypub.outbox", {
 			kind: this.federation.outboxQueue == null || options?.immediate ? SpanKind.CLIENT : SpanKind.PRODUCER,
 			attributes: { "activitypub.activity.type": this.activityType }
 		}, async (span) => {
@@ -4159,7 +4118,7 @@ var InboxContextImpl = class InboxContextImpl extends ContextImpl {
 		});
 	}
 	async forwardActivityInternal(forwarder, recipients, options) {
-		const logger$1 = getLogger([
+		const logger = getLogger([
 			"fedify",
 			"federation",
 			"inbox"
@@ -4186,14 +4145,13 @@ var InboxContextImpl = class InboxContextImpl extends ContextImpl {
 		if (!hasSignature(this.activity)) {
 			let hasProof;
 			try {
-				const activity = await Activity.fromJsonLd(this.activity, this);
-				hasProof = await activity.getProof() != null;
+				hasProof = await (await Activity.fromJsonLd(this.activity, this)).getProof() != null;
 			} catch {
 				hasProof = false;
 			}
 			if (!hasProof) {
 				if (options?.skipIfUnsigned) return;
-				logger$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") {
@@ -4207,14 +4165,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,
@@ -4229,7 +4187,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
 		});
@@ -4271,10 +4229,9 @@ var InboxContextImpl = class InboxContextImpl extends ContextImpl {
 		const { outboxQueue } = this.federation;
 		if (outboxQueue.enqueueMany == null) {
 			const promises = messages.map((m) => outboxQueue.enqueue(m.message, { orderingKey: m.orderingKey }));
-			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
 				});
@@ -4283,10 +4240,9 @@ var InboxContextImpl = class InboxContextImpl extends ContextImpl {
 			}
 		} else if (orderingKey != null) {
 			const promises = messages.map((m) => outboxQueue.enqueue(m.message, { orderingKey: m.orderingKey }));
-			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
 				});
@@ -4296,7 +4252,7 @@ var InboxContextImpl = class InboxContextImpl extends ContextImpl {
 		} else try {
 			await outboxQueue.enqueueMany(messages.map((m) => m.message));
 		} 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
 			});
@@ -4351,10 +4307,7 @@ function unauthorized(_request) {
 function getRequestId(request) {
 	const traceId = request.headers.get("X-Request-Id") || request.headers.get("X-Correlation-Id") || request.headers.get("Traceparent")?.split("-")[1];
 	if (traceId != null) return traceId;
-	const timestamp = Date.now().toString(36);
-	const random = Math.random().toString(36).slice(2, 8);
-	return `req_${timestamp}${random}`;
+	return `req_${Date.now().toString(36)}${Math.random().toString(36).slice(2, 8)}`;
 }
-
 //#endregion
-export { ContextImpl, FederationImpl, InboxContextImpl, KvSpecDeterminer, Router$1 as Router, RouterError, SendActivityError, buildCollectionSynchronizationHeader, createExponentialBackoffPolicy, createFederation, createFederationBuilder, digest, handleWebFinger, respondWithObject, respondWithObjectIfAcceptable };
+export { createExponentialBackoffPolicy as a, buildCollectionSynchronizationHeader as c, Router$1 as d, RouterError as f, SendActivityError as i, digest as l, middleware_exports as n, respondWithObject as o, handleWebFinger as r, respondWithObjectIfAcceptable as s, createFederation as t, createFederationBuilder as u };