@fedify/fedify 2.3.0-dev.1119 → 2.3.0-dev.1137

package/dist/{middleware-CmsDtIHI.cjs → middleware-BWLUrbS9.cjs}

@@ -2,17 +2,16 @@ const { Temporal } = require("@js-temporal/polyfill");
 const { URLPattern } = require("urlpattern-polyfill");
 const require_chunk = require("./chunk-DDcVe30Y.cjs");
 const require_transformers = require("./transformers-NeAONrAq.cjs");
-const require_http = require("./http-CubOB9wq.cjs");
-const require_proof = require("./proof-BUWfVr6Q.cjs");
+const require_http = require("./http-CWoeyogl.cjs");
+const require_proof = require("./proof-CcsIJLTn.cjs");
 const require_types = require("./types-KC4QAoxe.cjs");
-const require_kv_cache = require("./kv-cache-Dz31ATUT.cjs");
+const require_kv_cache = require("./kv-cache-DuEwFYcN.cjs");
 let _logtape_logtape = require("@logtape/logtape");
+let _fedify_uri_template = require("@fedify/uri-template");
 let _fedify_vocab = require("@fedify/vocab");
 let _opentelemetry_api = require("@opentelemetry/api");
-let es_toolkit = require("es-toolkit");
-let uri_template_router = require("uri-template-router");
-let url_template = require("url-template");
 let byte_encodings_hex = require("byte-encodings/hex");
+let es_toolkit = require("es-toolkit");
 let _fedify_vocab_runtime = require("@fedify/vocab-runtime");
 let _opentelemetry_semantic_conventions = require("@opentelemetry/semantic-conventions");
 let _fedify_webfinger = require("@fedify/webfinger");
@@ -52,126 +51,33 @@ var ActivityListenerSet = class {
 	}
 };
 //#endregion
-//#region src/federation/router.ts
-function cloneInnerRouter(router) {
-	const clone = new uri_template_router.Router();
-	clone.nid = router.nid;
-	clone.fsm = (0, es_toolkit.cloneDeep)(router.fsm);
-	clone.routeSet = new Set(router.routeSet);
-	clone.templateRouteMap = new Map(router.templateRouteMap);
-	clone.valueRouteMap = new Map(router.valueRouteMap);
-	clone.hierarchy = (0, es_toolkit.cloneDeep)(router.hierarchy);
-	return clone;
-}
+//#region src/federation/builder.ts
+const ACTOR_ALIAS_PREFIX = "actorAlias:";
 /**
-* URL router and constructor based on URI Template
-* ([RFC 6570](https://tools.ietf.org/html/rfc6570)).
+* Route options shared by every dispatcher whose path must expose exactly
+* one `{identifier}` variable bound to a single, non-empty value
+* for `setOutboxDispatcher/Listener()`.
 */
-var Router = class Router {
-	#router;
-	#templates;
-	#templateStrings;
-	/**
-	* Whether to ignore trailing slashes when matching paths.
-	* @since 1.6.0
-	*/
-	trailingSlashInsensitive;
-	/**
-	* Create a new {@link Router}.
-	* @param options Options for the router.
-	*/
-	constructor(options = {}) {
-		this.#router = new uri_template_router.Router();
-		this.#templates = {};
-		this.#templateStrings = {};
-		this.trailingSlashInsensitive = options.trailingSlashInsensitive ?? false;
-	}
-	clone() {
-		const clone = new Router({ trailingSlashInsensitive: this.trailingSlashInsensitive });
-		clone.#router = cloneInnerRouter(this.#router);
-		clone.#templates = { ...this.#templates };
-		clone.#templateStrings = { ...this.#templateStrings };
-		return clone;
-	}
-	/**
-	* Checks if a path name exists in the router.
-	* @param name The name of the path.
-	* @returns `true` if the path name exists, otherwise `false`.
-	*/
-	has(name) {
-		return name in this.#templates;
-	}
-	/**
-	* Adds a new path rule to the router.
-	* @param template The path pattern.
-	* @param name The name of the path.
-	* @returns The names of the variables in the path pattern.
-	*/
-	add(template, name) {
-		if (!template.startsWith("/")) throw new RouterError("Path must start with a slash.");
-		const rule = this.#router.addTemplate(template, {}, name);
-		this.#templates[name] = (0, url_template.parseTemplate)(template);
-		this.#templateStrings[name] = template;
-		return new Set(rule.variables.map((v) => v.varname));
-	}
-	/**
-	* Resolves a path name and values from a URL, if any match.
-	* @param url The URL to resolve.
-	* @returns The name of the path and its values, if any match.  Otherwise,
-	*          `null`.
-	*/
-	route(url) {
-		let match = this.#router.resolveURI(url);
-		if (match == null) {
-			if (!this.trailingSlashInsensitive) return null;
-			url = url.endsWith("/") ? url.replace(/\/+$/, "") : `${url}/`;
-			match = this.#router.resolveURI(url);
-			if (match == null) return null;
-		}
-		return {
-			name: match.matchValue,
-			template: this.#templateStrings[match.matchValue],
-			values: match.params
-		};
-	}
-	/**
-	* Constructs a URL/path from a path name and values.
-	* @param name The name of the path.
-	* @param values The values to expand the path with.
-	* @returns The URL/path, if the name exists.  Otherwise, `null`.
-	*/
-	build(name, values) {
-		if (name in this.#templates) return this.#templates[name].expand(values);
-		return null;
-	}
+const identifierSingular = {
+	exact: true,
+	variables: { identifier: { operatables: [""] } }
 };
 /**
-* An error thrown by the {@link Router}.
+* Route options shared by every dispatcher whose path must expose
+* `{identifier}` and `{+identifier}` variables bound to the same single,
+* non-empty value for following setters:
+* - `setActorDispatcher()` (actor path)
+* - `setInboxDispatcher/Listener()` (inbox path)
+* - `setFollowingDispatcher()` (following path)
+* - `setFollowersDispatcher()` (followers path)
+* - `setLikedDispatcher()` (liked path)
+* - `setFeaturedDispatcher()` (featured path)
+* - `setFeaturedTagsDispatcher()` (featured tags path)
 */
-var RouterError = class extends Error {
-	/**
-	* Create a new {@link RouterError}.
-	* @param message The error message.
-	*/
-	constructor(message) {
-		super(message);
-		this.name = "RouterError";
-	}
+const identifierSingularAllowPlus = {
+	exact: true,
+	variables: { identifier: { operatables: ["", "+"] } }
 };
-//#endregion
-//#region src/federation/builder.ts
-const ACTOR_ALIAS_PREFIX = "actorAlias:";
-function validateSingleIdentifierVariablePath(path, errorMessage) {
-	const operatorMatches = globalThis.Array.from(path.matchAll(/{([+#./;?&]?)([A-Za-z_][A-Za-z0-9_]*)}/g));
-	if (operatorMatches.length !== 1 || operatorMatches[0]?.[2] !== "identifier") throw new RouterError(errorMessage);
-	if (operatorMatches.some((match) => [
-		"?",
-		"&",
-		"#"
-	].includes(match[1]) && match[2] === "identifier")) throw new RouterError(errorMessage);
-	const variables = new Router().add(path, "outbox");
-	if (variables.size !== 1 || !variables.has("identifier")) throw new RouterError(errorMessage);
-}
 var FederationBuilderImpl = class {
 	router;
 	actorCallbacks;
@@ -204,7 +110,7 @@ var FederationBuilderImpl = class {
 	*/
 	#symbolRegistry = /* @__PURE__ */ new Map();
 	constructor() {
-		this.router = new Router();
+		this.router = new _fedify_uri_template.Router();
 		this.objectCallbacks = {};
 		this.objectTypeIds = {};
 		this.collectionCallbacks = {};
@@ -246,9 +152,9 @@ var FederationBuilderImpl = class {
 		return _opentelemetry_api.trace.getTracer(require_http.name, require_http.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}");
+		if (this.router.has("actor")) throw new _fedify_uri_template.RouterError("Actor dispatcher already set.");
+		(0, _fedify_uri_template.assertPath)(path);
+		this.router.add(path, "actor", identifierSingularAllowPlus);
 		const callbacks = { dispatcher: async (context, identifier) => {
 			const actor = await this._getTracer().startActiveSpan("activitypub.dispatch_actor", {
 				kind: _opentelemetry_api.SpanKind.SERVER,
@@ -348,11 +254,11 @@ var FederationBuilderImpl = class {
 				return setters;
 			},
 			mapActorAlias: (path, identifier) => {
-				if (identifier === "") throw new RouterError("Identifier cannot be empty.");
-				if (this.router.has(`actorAlias:${identifier}`)) throw new RouterError(`Actor alias for "${identifier}" already set.`);
-				if (new Router().add(path, "temp").size > 0) throw new RouterError("Path for actor alias must have no variables.");
+				if (identifier === "") throw new _fedify_uri_template.RouterError("Identifier cannot be empty.");
+				if (this.router.has(`actorAlias:${identifier}`)) throw new _fedify_uri_template.RouterError(`Actor alias for "${identifier}" already set.`);
+				if (_fedify_uri_template.Router.variables(path).size > 0) throw new _fedify_uri_template.RouterError("Path for actor alias must have no variables.");
 				const existingRoute = this.router.route(path);
-				if (existingRoute != null) throw new RouterError(`Actor alias path "${path}" conflicts with existing route "${existingRoute.name}".`);
+				if (existingRoute != null) throw new _fedify_uri_template.RouterError(`Actor alias path "${path}" conflicts with existing route "${existingRoute.name}".`);
 				this.router.add(path, `${ACTOR_ALIAS_PREFIX}${identifier}`);
 				return setters;
 			},
@@ -364,8 +270,9 @@ var FederationBuilderImpl = class {
 		return setters;
 	}
 	setNodeInfoDispatcher(path, dispatcher) {
-		if (this.router.has("nodeInfo")) throw new RouterError("NodeInfo dispatcher already set.");
-		if (this.router.add(path, "nodeInfo").size !== 0) throw new RouterError("Path for NodeInfo dispatcher must have no variables.");
+		if (this.router.has("nodeInfo")) throw new _fedify_uri_template.RouterError("NodeInfo dispatcher already set.");
+		if (_fedify_uri_template.Router.variables(path).size !== 0) throw new _fedify_uri_template.RouterError("Path for NodeInfo dispatcher must have no variables.");
+		this.router.add(path, "nodeInfo");
 		this.nodeInfoDispatcher = dispatcher;
 	}
 	setWebFingerLinksDispatcher(dispatcher) {
@@ -373,9 +280,10 @@ var FederationBuilderImpl = class {
 	}
 	setObjectDispatcher(cls, path, dispatcher) {
 		const routeName = `object:${cls.typeId.href}`;
-		if (this.router.has(routeName)) throw new RouterError(`Object dispatcher for ${cls.name} already set.`);
-		const variables = this.router.add(path, routeName);
-		if (variables.size < 1) throw new RouterError("Path for object dispatcher must have at least one variable.");
+		if (this.router.has(routeName)) throw new _fedify_uri_template.RouterError(`Object dispatcher for ${cls.name} already set.`);
+		(0, _fedify_uri_template.assertPath)(path);
+		const variables = _fedify_uri_template.Router.variables(path);
+		this.router.add(path, routeName);
 		const callbacks = {
 			dispatcher: (ctx, values) => {
 				return this._getTracer().startActiveSpan("activitypub.dispatch_object", {
@@ -413,12 +321,12 @@ var FederationBuilderImpl = class {
 		return setters;
 	}
 	setInboxDispatcher(path, dispatcher) {
-		if (this.inboxCallbacks != null) throw new RouterError("Inbox dispatcher already set.");
+		if (this.inboxCallbacks != null) throw new _fedify_uri_template.RouterError("Inbox dispatcher already set.");
 		if (this.router.has("inbox")) {
-			if (this.inboxPath !== path) throw new RouterError("Inbox dispatcher path must match inbox listener path.");
+			if (this.inboxPath !== path) throw new _fedify_uri_template.RouterError("Inbox dispatcher path must match inbox listener path.");
 		} else {
-			const variables = this.router.add(path, "inbox");
-			if (variables.size !== 1 || !variables.has("identifier")) throw new RouterError("Path for inbox dispatcher must have one variable: {identifier}");
+			(0, _fedify_uri_template.assertPath)(path);
+			this.router.add(path, "inbox", identifierSingularAllowPlus);
 			this.inboxPath = path;
 		}
 		const callbacks = { dispatcher };
@@ -444,12 +352,12 @@ var FederationBuilderImpl = class {
 		return setters;
 	}
 	setOutboxDispatcher(path, dispatcher) {
-		if (this.outboxCallbacks != null) throw new RouterError("Outbox dispatcher already set.");
+		if (this.outboxCallbacks != null) throw new _fedify_uri_template.RouterError("Outbox dispatcher already set.");
 		if (this.router.has("outbox")) {
-			if (this.outboxPath !== path) throw new RouterError("Outbox dispatcher path must match outbox listener path.");
+			if (this.outboxPath !== path) throw new _fedify_uri_template.RouterError("Outbox dispatcher path must match outbox listener path.");
 		} else {
-			validateSingleIdentifierVariablePath(path, "Path for outbox dispatcher must have one variable: {identifier}");
-			this.router.add(path, "outbox");
+			(0, _fedify_uri_template.assertPath)(path);
+			this.router.add(path, "outbox", identifierSingular);
 			this.outboxPath = path;
 		}
 		const callbacks = { dispatcher };
@@ -475,12 +383,12 @@ var FederationBuilderImpl = class {
 		return setters;
 	}
 	setOutboxListeners(outboxPath) {
-		if (this.outboxListeners != null) throw new RouterError("Outbox listeners already set.");
+		if (this.outboxListeners != null) throw new _fedify_uri_template.RouterError("Outbox listeners already set.");
 		if (this.router.has("outbox")) {
-			if (this.outboxPath !== outboxPath) throw new RouterError("Outbox listener path must match outbox dispatcher path.");
+			if (this.outboxPath !== outboxPath) throw new _fedify_uri_template.RouterError("Outbox listener path must match outbox dispatcher path.");
 		} else {
-			validateSingleIdentifierVariablePath(outboxPath, "Path for outbox must have one variable: {identifier}");
-			this.router.add(outboxPath, "outbox");
+			(0, _fedify_uri_template.assertPath)(outboxPath);
+			this.router.add(outboxPath, "outbox", identifierSingular);
 			this.outboxPath = outboxPath;
 		}
 		const listeners = this.outboxListeners = new ActivityListenerSet();
@@ -501,9 +409,9 @@ var FederationBuilderImpl = class {
 		return setters;
 	}
 	setFollowingDispatcher(path, dispatcher) {
-		if (this.router.has("following")) throw new RouterError("Following collection dispatcher already set.");
-		const variables = this.router.add(path, "following");
-		if (variables.size !== 1 || !variables.has("identifier")) throw new RouterError("Path for following collection dispatcher must have one variable: {identifier}");
+		if (this.router.has("following")) throw new _fedify_uri_template.RouterError("Following collection dispatcher already set.");
+		(0, _fedify_uri_template.assertPath)(path);
+		this.router.add(path, "following", identifierSingularAllowPlus);
 		const callbacks = { dispatcher };
 		this.followingCallbacks = callbacks;
 		const setters = {
@@ -527,9 +435,9 @@ var FederationBuilderImpl = class {
 		return setters;
 	}
 	setFollowersDispatcher(path, dispatcher) {
-		if (this.router.has("followers")) throw new RouterError("Followers collection dispatcher already set.");
-		const variables = this.router.add(path, "followers");
-		if (variables.size !== 1 || !variables.has("identifier")) throw new RouterError("Path for followers collection dispatcher must have one variable: {identifier}");
+		if (this.router.has("followers")) throw new _fedify_uri_template.RouterError("Followers collection dispatcher already set.");
+		(0, _fedify_uri_template.assertPath)(path);
+		this.router.add(path, "followers", identifierSingularAllowPlus);
 		const callbacks = { dispatcher };
 		this.followersCallbacks = callbacks;
 		const setters = {
@@ -553,9 +461,9 @@ var FederationBuilderImpl = class {
 		return setters;
 	}
 	setLikedDispatcher(path, dispatcher) {
-		if (this.router.has("liked")) throw new RouterError("Liked collection dispatcher already set.");
-		const variables = this.router.add(path, "liked");
-		if (variables.size !== 1 || !variables.has("identifier")) throw new RouterError("Path for liked collection dispatcher must have one variable: {identifier}");
+		if (this.router.has("liked")) throw new _fedify_uri_template.RouterError("Liked collection dispatcher already set.");
+		(0, _fedify_uri_template.assertPath)(path);
+		this.router.add(path, "liked", identifierSingularAllowPlus);
 		const callbacks = { dispatcher };
 		this.likedCallbacks = callbacks;
 		const setters = {
@@ -579,9 +487,9 @@ var FederationBuilderImpl = class {
 		return setters;
 	}
 	setFeaturedDispatcher(path, dispatcher) {
-		if (this.router.has("featured")) throw new RouterError("Featured collection dispatcher already set.");
-		const variables = this.router.add(path, "featured");
-		if (variables.size !== 1 || !variables.has("identifier")) throw new RouterError("Path for featured collection dispatcher must have one variable: {identifier}");
+		if (this.router.has("featured")) throw new _fedify_uri_template.RouterError("Featured collection dispatcher already set.");
+		(0, _fedify_uri_template.assertPath)(path);
+		this.router.add(path, "featured", identifierSingularAllowPlus);
 		const callbacks = { dispatcher };
 		this.featuredCallbacks = callbacks;
 		const setters = {
@@ -605,9 +513,9 @@ var FederationBuilderImpl = class {
 		return setters;
 	}
 	setFeaturedTagsDispatcher(path, dispatcher) {
-		if (this.router.has("featuredTags")) throw new RouterError("Featured tags collection dispatcher already set.");
-		const variables = this.router.add(path, "featuredTags");
-		if (variables.size !== 1 || !variables.has("identifier")) throw new RouterError("Path for featured tags collection dispatcher must have one variable: {identifier}");
+		if (this.router.has("featuredTags")) throw new _fedify_uri_template.RouterError("Featured tags collection dispatcher already set.");
+		(0, _fedify_uri_template.assertPath)(path);
+		this.router.add(path, "featuredTags", identifierSingularAllowPlus);
 		const callbacks = { dispatcher };
 		this.featuredTagsCallbacks = callbacks;
 		const setters = {
@@ -631,16 +539,17 @@ var FederationBuilderImpl = class {
 		return setters;
 	}
 	setInboxListeners(inboxPath, sharedInboxPath) {
-		if (this.inboxListeners != null) throw new RouterError("Inbox listeners already set.");
+		if (this.inboxListeners != null) throw new _fedify_uri_template.RouterError("Inbox listeners already set.");
 		if (this.router.has("inbox")) {
-			if (this.inboxPath !== inboxPath) throw new RouterError("Inbox listener path must match inbox dispatcher path.");
+			if (this.inboxPath !== inboxPath) throw new _fedify_uri_template.RouterError("Inbox listener path must match inbox dispatcher path.");
 		} else {
-			const variables = this.router.add(inboxPath, "inbox");
-			if (variables.size !== 1 || !variables.has("identifier")) throw new RouterError("Path for inbox must have one variable: {identifier}");
+			(0, _fedify_uri_template.assertPath)(inboxPath);
+			this.router.add(inboxPath, "inbox", identifierSingularAllowPlus);
 			this.inboxPath = inboxPath;
 		}
 		if (sharedInboxPath != null) {
-			if (this.router.add(sharedInboxPath, "sharedInbox").size !== 0) throw new RouterError("Path for shared inbox must have no variables.");
+			if (_fedify_uri_template.Router.variables(sharedInboxPath).size !== 0) throw new _fedify_uri_template.RouterError("Path for shared inbox must have no variables.");
+			this.router.add(sharedInboxPath, "sharedInbox");
 		}
 		const listeners = this.inboxListeners = new ActivityListenerSet();
 		const setters = {
@@ -676,9 +585,11 @@ var FederationBuilderImpl = class {
 	#setCustomCollectionDispatcher(name, collectionType, itemType, path, dispatcher) {
 		const strName = String(name);
 		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.`);
-		if (this.router.add(path, routeName).size < 1) throw new RouterError("Path for collection dispatcher must have at least one variable.");
+		if (this.router.has(routeName)) throw new _fedify_uri_template.RouterError(`Collection dispatcher for ${strName} already set.`);
+		if (this.collectionCallbacks[name] != null) throw new _fedify_uri_template.RouterError(`Collection dispatcher for ${strName} already set.`);
+		(0, _fedify_uri_template.assertPath)(path);
+		if (_fedify_uri_template.Router.variables(path).size < 1) throw new _fedify_uri_template.RouterError("Path for collection dispatcher must have at least one variable.");
+		this.router.add(path, routeName);
 		const callbacks = { dispatcher };
 		this.collectionCallbacks[name] = callbacks;
 		this.collectionTypeIds[name] = itemType;
@@ -2424,7 +2335,7 @@ function handleNodeInfoJrd(_request, context) {
 			type: "application/json; profile=\"http://nodeinfo.diaspora.software/ns/schema/2.1#\""
 		});
 	} catch (e) {
-		if (!(e instanceof RouterError)) throw e;
+		if (!(e instanceof _fedify_uri_template.RouterError)) throw e;
 	}
 	const response = new Response(JSON.stringify({ links }), { headers: { "Content-Type": "application/jrd+json" } });
 	return Promise.resolve(response);
@@ -2913,23 +2824,50 @@ var FederationImpl = class extends FederationBuilderImpl {
 		}
 		const { allowPrivateAddress, userAgent } = options;
 		this.allowPrivateAddress = allowPrivateAddress ?? false;
-		this.documentLoaderFactory = options.documentLoaderFactory ?? ((opts) => {
-			return require_kv_cache.kvCache({
-				loader: (0, _fedify_vocab_runtime.getDocumentLoader)({
-					allowPrivateAddress: opts?.allowPrivateAddress ?? allowPrivateAddress,
-					userAgent: opts?.userAgent ?? userAgent
-				}),
-				kv: options.kv,
-				prefix: this.kvPrefixes.remoteDocument
-			});
+		const userDocumentLoaderFactory = options.documentLoaderFactory;
+		const userContextLoaderFactory = options.contextLoaderFactory;
+		const userAuthFactory = options.authenticatedDocumentLoaderFactory;
+		const builtinDocumentLoaderFactory = (opts) => require_kv_cache.kvCache({
+			loader: (0, _fedify_vocab_runtime.getDocumentLoader)({
+				allowPrivateAddress: opts?.allowPrivateAddress ?? allowPrivateAddress,
+				userAgent: opts?.userAgent ?? userAgent
+			}),
+			kv: options.kv,
+			prefix: this.kvPrefixes.remoteDocument,
+			meterProvider: this._meterProvider,
+			kind: "object"
 		});
-		this.contextLoaderFactory = options.contextLoaderFactory ?? this.documentLoaderFactory;
-		this.authenticatedDocumentLoaderFactory = options.authenticatedDocumentLoaderFactory ?? ((identity) => require_kv_cache.getAuthenticatedDocumentLoader(identity, {
-			allowPrivateAddress,
-			userAgent,
+		const builtinContextLoaderFactory = (opts) => require_kv_cache.kvCache({
+			loader: (0, _fedify_vocab_runtime.getDocumentLoader)({
+				allowPrivateAddress: opts?.allowPrivateAddress ?? allowPrivateAddress,
+				userAgent: opts?.userAgent ?? userAgent
+			}),
+			kv: options.kv,
+			prefix: this.kvPrefixes.remoteDocument,
+			meterProvider: this._meterProvider,
+			kind: "context"
+		});
+		this.documentLoaderFactory = (opts) => require_http.instrumentDocumentLoader((userDocumentLoaderFactory ?? builtinDocumentLoaderFactory)(opts), {
+			meterProvider: this._meterProvider,
+			kind: "object",
+			cacheEnabled: userDocumentLoaderFactory == null ? true : void 0
+		});
+		const resolvedContextLoaderFactory = userContextLoaderFactory ?? userDocumentLoaderFactory ?? builtinContextLoaderFactory;
+		this.contextLoaderFactory = (opts) => require_http.instrumentDocumentLoader(resolvedContextLoaderFactory(opts), {
+			meterProvider: this._meterProvider,
+			kind: "context",
+			cacheEnabled: userContextLoaderFactory == null && userDocumentLoaderFactory == null ? true : void 0
+		});
+		this.authenticatedDocumentLoaderFactory = (identity, factoryOpts) => require_http.instrumentDocumentLoader(userAuthFactory != null ? userAuthFactory(identity, factoryOpts) : require_kv_cache.getAuthenticatedDocumentLoader(identity, {
+			allowPrivateAddress: factoryOpts?.allowPrivateAddress ?? allowPrivateAddress,
+			userAgent: factoryOpts?.userAgent ?? userAgent,
 			specDeterminer: new KvSpecDeterminer(this.kv, this.kvPrefixes.httpMessageSignaturesSpec, options.firstKnock),
 			tracerProvider: this.tracerProvider
-		}));
+		}), {
+			meterProvider: this._meterProvider,
+			kind: "object",
+			cacheEnabled: userAuthFactory == null ? false : void 0
+		});
 		this.userAgent = userAgent;
 		this.onOutboxError = options.onOutboxError;
 		this.permanentFailureStatusCodes = options.permanentFailureStatusCodes ?? [404, 410];
@@ -4007,65 +3945,65 @@ var ContextImpl = class ContextImpl {
 	}
 	getNodeInfoUri() {
 		const path = this.federation.router.build("nodeInfo", {});
-		if (path == null) throw new RouterError("No NodeInfo dispatcher registered.");
+		if (path == null) throw new _fedify_uri_template.RouterError("No NodeInfo dispatcher registered.");
 		return new URL(path, this.canonicalOrigin);
 	}
 	getActorUri(identifier) {
 		const path = this.federation.router.build(`actorAlias:${identifier}`, {}) ?? this.federation.router.build("actor", { identifier });
-		if (path == null) throw new RouterError("No actor dispatcher registered.");
+		if (path == null) throw new _fedify_uri_template.RouterError("No actor dispatcher registered.");
 		return new URL(path, this.canonicalOrigin);
 	}
 	getObjectUri(cls, values) {
 		const callbacks = this.federation.objectCallbacks[cls.typeId.href];
-		if (callbacks == null) throw new RouterError("No object dispatcher registered.");
+		if (callbacks == null) throw new _fedify_uri_template.RouterError("No object dispatcher registered.");
 		for (const param of callbacks.parameters) if (!(param in values)) throw new TypeError(`Missing parameter: ${param}`);
 		const path = this.federation.router.build(`object:${cls.typeId.href}`, values);
-		if (path == null) throw new RouterError("No object dispatcher registered.");
+		if (path == null) throw new _fedify_uri_template.RouterError("No object dispatcher registered.");
 		return new URL(path, this.canonicalOrigin);
 	}
 	getOutboxUri(identifier) {
 		const path = this.federation.router.build("outbox", { identifier });
-		if (path == null) throw new RouterError("No outbox dispatcher registered.");
+		if (path == null) throw new _fedify_uri_template.RouterError("No outbox dispatcher registered.");
 		return new URL(path, this.canonicalOrigin);
 	}
 	getInboxUri(identifier) {
 		if (identifier == null) {
 			const path = this.federation.router.build("sharedInbox", {});
-			if (path == null) throw new RouterError("No shared inbox path registered.");
+			if (path == null) throw new _fedify_uri_template.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.");
+		if (path == null) throw new _fedify_uri_template.RouterError("No inbox path registered.");
 		return new URL(path, this.canonicalOrigin);
 	}
 	getFollowingUri(identifier) {
 		const path = this.federation.router.build("following", { identifier });
-		if (path == null) throw new RouterError("No following collection path registered.");
+		if (path == null) throw new _fedify_uri_template.RouterError("No following collection path registered.");
 		return new URL(path, this.canonicalOrigin);
 	}
 	getFollowersUri(identifier) {
 		const path = this.federation.router.build("followers", { identifier });
-		if (path == null) throw new RouterError("No followers collection path registered.");
+		if (path == null) throw new _fedify_uri_template.RouterError("No followers collection path registered.");
 		return new URL(path, this.canonicalOrigin);
 	}
 	getLikedUri(identifier) {
 		const path = this.federation.router.build("liked", { identifier });
-		if (path == null) throw new RouterError("No liked collection path registered.");
+		if (path == null) throw new _fedify_uri_template.RouterError("No liked collection path registered.");
 		return new URL(path, this.canonicalOrigin);
 	}
 	getFeaturedUri(identifier) {
 		const path = this.federation.router.build("featured", { identifier });
-		if (path == null) throw new RouterError("No featured collection path registered.");
+		if (path == null) throw new _fedify_uri_template.RouterError("No featured collection path registered.");
 		return new URL(path, this.canonicalOrigin);
 	}
 	getFeaturedTagsUri(identifier) {
 		const path = this.federation.router.build("featuredTags", { identifier });
-		if (path == null) throw new RouterError("No featured tags collection path registered.");
+		if (path == null) throw new _fedify_uri_template.RouterError("No featured tags collection path registered.");
 		return new URL(path, this.canonicalOrigin);
 	}
 	getCollectionUri(name, values) {
 		const path = this.federation.getCollectionPath(name, values);
-		if (path === null) throw new RouterError(`No collection dispatcher registered for "${String(name)}".`);
+		if (path === null) throw new _fedify_uri_template.RouterError(`No collection dispatcher registered for "${String(name)}".`);
 		return new URL(path, this.canonicalOrigin);
 	}
 	parseUri(uri) {
@@ -4183,7 +4121,7 @@ var ContextImpl = class ContextImpl {
 		try {
 			actorUri = this.getActorUri(identifier);
 		} catch (error) {
-			if (error instanceof RouterError) {
+			if (error instanceof _fedify_uri_template.RouterError) {
 				logger.warn(error.message);
 				return [];
 			}
@@ -4244,6 +4182,7 @@ var ContextImpl = class ContextImpl {
 			contextLoader: options.contextLoader ?? this.contextLoader,
 			userAgent: options.userAgent ?? this.federation.userAgent,
 			tracerProvider: options.tracerProvider ?? this.tracerProvider,
+			meterProvider: options.meterProvider ?? this.meterProvider,
 			allowPrivateAddress: this.federation.allowPrivateAddress
 		});
 	}
@@ -4342,7 +4281,7 @@ var ContextImpl = class ContextImpl {
 			if (options.syncCollection) try {
 				collectionSync = this.getFollowersUri(identifier).href;
 			} catch (error) {
-				if (!(error instanceof RouterError)) throw error;
+				if (!(error instanceof _fedify_uri_template.RouterError)) throw error;
 			}
 		} else expandedRecipients = [recipients];
 		const opts = {
@@ -4974,18 +4913,6 @@ function getRequestId(request) {
 	return `req_${Date.now().toString(36)}${Math.random().toString(36).slice(2, 8)}`;
 }
 //#endregion
-Object.defineProperty(exports, "Router", {
-	enumerable: true,
-	get: function() {
-		return Router;
-	}
-});
-Object.defineProperty(exports, "RouterError", {
-	enumerable: true,
-	get: function() {
-		return RouterError;
-	}
-});
 Object.defineProperty(exports, "SendActivityError", {
 	enumerable: true,
 	get: function() {

package/dist/{middleware-BDKFRjue.mjs → middleware-CztxpARM.mjs}

@@ -1,5 +1,5 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as FederationImpl } from "./middleware-t0jC8I99.mjs";
+import { n as FederationImpl } from "./middleware-DQEgdr83.mjs";
 export { FederationImpl };