@fedify/fedify 2.3.0-dev.1131 → 2.3.0-dev.1145

package/dist/{middleware-DtOddSVg.js → middleware-BrGIM_Ra.js}

@@ -2,17 +2,16 @@ import { Temporal } from "@js-temporal/polyfill";
 import { URLPattern } from "urlpattern-polyfill";
 import { t as __exportAll } from "./chunk-CRNNMoPX.js";
 import { r as getDefaultActivityTransformers } from "./transformers-BGMIq1cs.js";
-import { C as formatAcceptSignature, D as name, O as version, S as recordOutboxEnqueue, a as verifyRequestDetailed, b as recordInboxActivity, d as validateCryptoKey, f as getDurationMs, g as isAbortError, h as instrumentDocumentLoader, i as verifyRequest, m as getRemoteHost, n as parseRfc9421SignatureInput, o as exportJwk, p as getFederationMetrics, t as doubleKnock, u as importJwk, x as recordOutboxActivity, y as recordFanoutRecipients } from "./http-cqujdCRz.js";
-import { c as getKeyOwner, d as detachSignature, f as hasSignatureLike, i as verifyObject, m as verifyJsonLd, n as hasProofLike, o as normalizeOutgoingActivityJsonLd, p as signJsonLd, r as signObject, s as doesActorOwnKey } from "./proof-DMGIjHYH.js";
+import { C as recordWebFingerHandle, O as name, S as recordOutboxEnqueue, a as verifyRequestDetailed, b as recordInboxActivity, d as validateCryptoKey, f as getDurationMs, g as isAbortError, h as instrumentDocumentLoader, i as verifyRequest, k as version, m as getRemoteHost, n as parseRfc9421SignatureInput, o as exportJwk, p as getFederationMetrics, t as doubleKnock, u as importJwk, w as formatAcceptSignature, x as recordOutboxActivity, y as recordFanoutRecipients } from "./http-B2hxA7dO.js";
+import { c as getKeyOwner, d as detachSignature, f as hasSignatureLike, i as verifyObject, m as verifyJsonLd, n as hasProofLike, o as normalizeOutgoingActivityJsonLd, p as signJsonLd, r as signObject, s as doesActorOwnKey } from "./proof-BkRyFchv.js";
 import { n as getNodeInfo, t as nodeInfoToJson } from "./types-CAY3OdLq.js";
-import { n as getAuthenticatedDocumentLoader, t as kvCache } from "./kv-cache-pEejzYq4.js";
+import { n as getAuthenticatedDocumentLoader, t as kvCache } from "./kv-cache-b22dNkjt.js";
 import { getLogger, withContext } from "@logtape/logtape";
+import { Router, RouterError, assertPath } from "@fedify/uri-template";
 import { Activity, Collection, CollectionPage, CryptographicKey, Link, Multikey, Object as Object$1, OrderedCollection, OrderedCollectionPage, Tombstone, getTypeId, lookupObject, traverseCollection } from "@fedify/vocab";
 import { SpanKind, SpanStatusCode, context, metrics, propagation, trace } from "@opentelemetry/api";
-import { cloneDeep, uniq } from "es-toolkit";
-import { Router } from "uri-template-router";
-import { parseTemplate } from "url-template";
 import { encodeHex } from "byte-encodings/hex";
+import { uniq } from "es-toolkit";
 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";
@@ -52,126 +51,33 @@ var ActivityListenerSet = class {
 	}
 };
 //#endregion
-//#region src/federation/router.ts
-function cloneInnerRouter(router) {
-	const clone = new Router();
-	clone.nid = router.nid;
-	clone.fsm = cloneDeep(router.fsm);
-	clone.routeSet = new Set(router.routeSet);
-	clone.templateRouteMap = new Map(router.templateRouteMap);
-	clone.valueRouteMap = new Map(router.valueRouteMap);
-	clone.hierarchy = 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$1 = class Router$1 {
-	#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 Router();
-		this.#templates = {};
-		this.#templateStrings = {};
-		this.trailingSlashInsensitive = options.trailingSlashInsensitive ?? false;
-	}
-	clone() {
-		const clone = new Router$1({ 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] = 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$1().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$1();
+		this.router = new Router();
 		this.objectCallbacks = {};
 		this.objectTypeIds = {};
 		this.collectionCallbacks = {};
@@ -247,8 +153,8 @@ var FederationBuilderImpl = class {
 	}
 	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}");
+		assertPath(path);
+		this.router.add(path, "actor", identifierSingularAllowPlus);
 		const callbacks = { dispatcher: async (context, identifier) => {
 			const actor = await this._getTracer().startActiveSpan("activitypub.dispatch_actor", {
 				kind: SpanKind.SERVER,
@@ -350,7 +256,7 @@ var FederationBuilderImpl = class {
 			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$1().add(path, "temp").size > 0) throw new RouterError("Path for actor alias must have no variables.");
+				if (Router.variables(path).size > 0) throw new 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}".`);
 				this.router.add(path, `${ACTOR_ALIAS_PREFIX}${identifier}`);
@@ -365,7 +271,8 @@ var FederationBuilderImpl = class {
 	}
 	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 (Router.variables(path).size !== 0) throw new RouterError("Path for NodeInfo dispatcher must have no variables.");
+		this.router.add(path, "nodeInfo");
 		this.nodeInfoDispatcher = dispatcher;
 	}
 	setWebFingerLinksDispatcher(dispatcher) {
@@ -374,8 +281,9 @@ 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.");
+		assertPath(path);
+		const variables = Router.variables(path);
+		this.router.add(path, routeName);
 		const callbacks = {
 			dispatcher: (ctx, values) => {
 				return this._getTracer().startActiveSpan("activitypub.dispatch_object", {
@@ -417,8 +325,8 @@ var FederationBuilderImpl = class {
 		if (this.router.has("inbox")) {
 			if (this.inboxPath !== path) throw new 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}");
+			assertPath(path);
+			this.router.add(path, "inbox", identifierSingularAllowPlus);
 			this.inboxPath = path;
 		}
 		const callbacks = { dispatcher };
@@ -448,8 +356,8 @@ var FederationBuilderImpl = class {
 		if (this.router.has("outbox")) {
 			if (this.outboxPath !== path) throw new 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");
+			assertPath(path);
+			this.router.add(path, "outbox", identifierSingular);
 			this.outboxPath = path;
 		}
 		const callbacks = { dispatcher };
@@ -479,8 +387,8 @@ var FederationBuilderImpl = class {
 		if (this.router.has("outbox")) {
 			if (this.outboxPath !== outboxPath) throw new 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");
+			assertPath(outboxPath);
+			this.router.add(outboxPath, "outbox", identifierSingular);
 			this.outboxPath = outboxPath;
 		}
 		const listeners = this.outboxListeners = new ActivityListenerSet();
@@ -502,8 +410,8 @@ var FederationBuilderImpl = class {
 	}
 	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}");
+		assertPath(path);
+		this.router.add(path, "following", identifierSingularAllowPlus);
 		const callbacks = { dispatcher };
 		this.followingCallbacks = callbacks;
 		const setters = {
@@ -528,8 +436,8 @@ var FederationBuilderImpl = class {
 	}
 	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}");
+		assertPath(path);
+		this.router.add(path, "followers", identifierSingularAllowPlus);
 		const callbacks = { dispatcher };
 		this.followersCallbacks = callbacks;
 		const setters = {
@@ -554,8 +462,8 @@ var FederationBuilderImpl = class {
 	}
 	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}");
+		assertPath(path);
+		this.router.add(path, "liked", identifierSingularAllowPlus);
 		const callbacks = { dispatcher };
 		this.likedCallbacks = callbacks;
 		const setters = {
@@ -580,8 +488,8 @@ var FederationBuilderImpl = class {
 	}
 	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}");
+		assertPath(path);
+		this.router.add(path, "featured", identifierSingularAllowPlus);
 		const callbacks = { dispatcher };
 		this.featuredCallbacks = callbacks;
 		const setters = {
@@ -606,8 +514,8 @@ var FederationBuilderImpl = class {
 	}
 	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}");
+		assertPath(path);
+		this.router.add(path, "featuredTags", identifierSingularAllowPlus);
 		const callbacks = { dispatcher };
 		this.featuredTagsCallbacks = callbacks;
 		const setters = {
@@ -635,12 +543,13 @@ var FederationBuilderImpl = class {
 		if (this.router.has("inbox")) {
 			if (this.inboxPath !== inboxPath) throw new 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}");
+			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 (Router.variables(sharedInboxPath).size !== 0) throw new RouterError("Path for shared inbox must have no variables.");
+			this.router.add(sharedInboxPath, "sharedInbox");
 		}
 		const listeners = this.inboxListeners = new ActivityListenerSet();
 		const setters = {
@@ -678,7 +587,9 @@ 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.`);
-		if (this.router.add(path, routeName).size < 1) throw new RouterError("Path for collection dispatcher must have at least one variable.");
+		assertPath(path);
+		if (Router.variables(path).size < 1) throw new 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;
@@ -2690,22 +2601,72 @@ const logger = getLogger([
 * @returns The response to the request.
 */
 async function handleWebFinger(request, options) {
-	if (options.tracer == null) return await handleWebFingerInternal(request, options);
-	return await options.tracer.startActiveSpan("webfinger.handle", { kind: SpanKind.SERVER }, async (span) => {
-		try {
-			const response = await handleWebFingerInternal(request, options);
-			span.setStatus({ code: response.ok ? SpanStatusCode.UNSET : SpanStatusCode.ERROR });
-			return response;
-		} catch (error) {
-			span.setStatus({
-				code: SpanStatusCode.ERROR,
-				message: String(error)
-			});
-			throw error;
-		} finally {
-			span.end();
+	const meterProvider = options.meterProvider;
+	const start = meterProvider == null ? 0 : performance.now();
+	const scheme = computeResourceScheme(options.context.url.searchParams.get("resource"));
+	let notFoundResponse;
+	const wrappedOptions = {
+		...options,
+		async onNotFound(req) {
+			const r = await options.onNotFound(req);
+			notFoundResponse = r;
+			return r;
 		}
-	});
+	};
+	let response;
+	try {
+		if (options.tracer == null) response = await handleWebFingerInternal(request, wrappedOptions);
+		else response = await options.tracer.startActiveSpan("webfinger.handle", { kind: SpanKind.SERVER }, async (span) => {
+			try {
+				const inner = await handleWebFingerInternal(request, wrappedOptions);
+				span.setStatus({ code: inner.ok ? SpanStatusCode.UNSET : SpanStatusCode.ERROR });
+				return inner;
+			} catch (error) {
+				span.setStatus({
+					code: SpanStatusCode.ERROR,
+					message: String(error)
+				});
+				throw error;
+			} finally {
+				span.end();
+			}
+		});
+		return response;
+	} finally {
+		if (meterProvider != null) recordWebFingerHandle(meterProvider, {
+			durationMs: Math.max(0, performance.now() - start),
+			result: classifyWebFingerHandleResult(response, notFoundResponse),
+			scheme,
+			statusCode: response?.status
+		});
+	}
+}
+const WEBFINGER_HANDLE_SCHEME_WHITELIST = new Set([
+	"acct",
+	"http",
+	"https",
+	"mailto"
+]);
+function isAllowedResourceScheme(scheme) {
+	return WEBFINGER_HANDLE_SCHEME_WHITELIST.has(scheme);
+}
+function computeResourceScheme(resource) {
+	if (resource == null) return void 0;
+	const colon = resource.indexOf(":");
+	if (colon <= 0) return void 0;
+	const candidate = resource.substring(0, colon).toLowerCase();
+	return isAllowedResourceScheme(candidate) ? candidate : "other";
+}
+function classifyWebFingerHandleResult(response, notFoundResponse) {
+	if (response == null) return "error";
+	if (notFoundResponse != null && response === notFoundResponse) return "not_found";
+	switch (response.status) {
+		case 200: return "resolved";
+		case 400: return "invalid";
+		case 404: return "not_found";
+		case 410: return "tombstoned";
+		default: return "error";
+	}
 }
 async function handleWebFingerInternal(request, { context, host, actorDispatcher, actorHandleMapper, actorAliasMapper, onNotFound, span, webFingerLinksDispatcher }) {
 	if (actorDispatcher == null) {
@@ -3739,7 +3700,8 @@ var FederationImpl = class extends FederationBuilderImpl {
 				actorAliasMapper: this.actorCallbacks?.aliasMapper,
 				webFingerLinksDispatcher: this.webFingerLinksDispatcher,
 				onNotFound,
-				tracer
+				tracer,
+				meterProvider: this._meterProvider
 			});
 			case "nodeInfoJrd": return await handleNodeInfoJrd(request, context);
 			case "nodeInfo": return await handleNodeInfo(request, {
@@ -4298,6 +4260,7 @@ var ContextImpl = class ContextImpl {
 			...options,
 			userAgent: options.userAgent ?? this.federation.userAgent,
 			tracerProvider: options.tracerProvider ?? this.tracerProvider,
+			meterProvider: options.meterProvider ?? this.federation._meterProvider,
 			allowPrivateAddress: this.federation.allowPrivateAddress
 		});
 	}
@@ -5002,4 +4965,4 @@ function getRequestId(request) {
 	return `req_${Date.now().toString(36)}${Math.random().toString(36).slice(2, 8)}`;
 }
 //#endregion
-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 };
+export { createExponentialBackoffPolicy as a, buildCollectionSynchronizationHeader as c, 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 };

package/dist/{middleware-BB0IbDow.mjs → middleware-CyJDCmNg.mjs}

@@ -1,33 +1,33 @@
 import { Temporal } from "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as RouterError } from "./router-BT_F5748.mjs";
-import { n as version, t as name } from "./deno--CS-SBS9.mjs";
-import { a as instrumentDocumentLoader, d as recordInboxActivity, i as getRemoteHost, m as recordOutboxEnqueue, n as getDurationMs, o as isAbortError, p as recordOutboxActivity, r as getFederationMetrics, u as recordFanoutRecipients } from "./metrics-BTOMkW8C.mjs";
-import { t as formatAcceptSignature } from "./accept-CgDcxvjV.mjs";
-import { a as importJwk, o as validateCryptoKey, t as exportJwk } from "./key-Df3tMleh.mjs";
-import { l as verifyRequest, o as parseRfc9421SignatureInput, u as verifyRequestDetailed } from "./http-IywnQdiX.mjs";
-import { t as getAuthenticatedDocumentLoader } from "./docloader-k6huZLQL.mjs";
-import { n as kvCache } from "./kv-cache-q9Ec2ryS.mjs";
-import { a as signJsonLd, i as hasSignatureLike, o as verifyJsonLd, r as detachSignature } from "./ld-BGwiJpl3.mjs";
-import { n as getKeyOwner, t as doesActorOwnKey } from "./owner-CIt4hvmM.mjs";
-import { r as normalizeOutgoingActivityJsonLd } from "./outgoing-jsonld-BNL8AC14.mjs";
-import { i as verifyObject, n as hasProofLike, r as signObject } from "./proof-BYlrRSmZ.mjs";
-import { t as getNodeInfo } from "./client-Bneh_DYR.mjs";
-import { t as nodeInfoToJson } from "./types-D09GN0uZ.mjs";
-import { n as FederationBuilderImpl, t as ACTOR_ALIAS_PREFIX } from "./builder-DckAhD27.mjs";
-import { t as buildCollectionSynchronizationHeader } from "./collection-Cc3DVAhE.mjs";
-import { t as KvKeyCache } from "./keycache-BeU0LCII.mjs";
-import { t as acceptsJsonLd } from "./negotiation-DDstyBvc.mjs";
-import { t as createExponentialBackoffPolicy } from "./retry-_VvV0h9f.mjs";
-import { n as extractInboxes, r as sendActivity, t as SendActivityError } from "./send-DJFpze7B.mjs";
+import { n as version, t as name } from "./deno-h0TWFuEz.mjs";
+import { a as instrumentDocumentLoader, d as recordInboxActivity, h as recordWebFingerHandle, i as getRemoteHost, m as recordOutboxEnqueue, n as getDurationMs, o as isAbortError, p as recordOutboxActivity, r as getFederationMetrics, u as recordFanoutRecipients } from "./metrics-E0hAHtLZ.mjs";
+import { t as formatAcceptSignature } from "./accept-CceiKpCy.mjs";
+import { a as importJwk, o as validateCryptoKey, t as exportJwk } from "./key-Dh2OK1XQ.mjs";
+import { l as verifyRequest, o as parseRfc9421SignatureInput, u as verifyRequestDetailed } from "./http-QzW9IWfs.mjs";
+import { t as getAuthenticatedDocumentLoader } from "./docloader-BdDN0Aqx.mjs";
+import { n as kvCache } from "./kv-cache-EZRIPZXD.mjs";
+import { a as signJsonLd, i as hasSignatureLike, o as verifyJsonLd, r as detachSignature } from "./ld-eZbar1rr.mjs";
+import { n as getKeyOwner, t as doesActorOwnKey } from "./owner-ByO_Fw6U.mjs";
+import { r as normalizeOutgoingActivityJsonLd } from "./outgoing-jsonld-BgFLCJQ_.mjs";
+import { i as verifyObject, n as hasProofLike, r as signObject } from "./proof-CSo0S8OK.mjs";
+import { t as getNodeInfo } from "./client-B_A6mfn3.mjs";
+import { t as nodeInfoToJson } from "./types-BFowWFTT.mjs";
+import { n as FederationBuilderImpl, t as ACTOR_ALIAS_PREFIX } from "./builder-ShiR1K6b.mjs";
+import { t as buildCollectionSynchronizationHeader } from "./collection-CA3V5zyK.mjs";
+import { t as KvKeyCache } from "./keycache-BYMd8q7F.mjs";
+import { t as acceptsJsonLd } from "./negotiation-CDW-_gUU.mjs";
+import { t as createExponentialBackoffPolicy } from "./retry-v_sGLH1d.mjs";
+import { n as extractInboxes, r as sendActivity, t as SendActivityError } from "./send-jzrTV1FU.mjs";
 import { getLogger, withContext } from "@logtape/logtape";
+import { RouterError } from "@fedify/uri-template";
 import { Activity, Collection, CollectionPage, CryptographicKey, Link, Multikey, Object as Object$1, OrderedCollection, OrderedCollectionPage, Tombstone, getTypeId, lookupObject, traverseCollection } from "@fedify/vocab";
 import { lookupWebFinger } from "@fedify/webfinger";
 import { SpanKind, SpanStatusCode, context, metrics, propagation, trace } from "@opentelemetry/api";
-import { uniq } from "es-toolkit";
 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 { uniq } from "es-toolkit";
 import { domainToASCII } from "node:url";
 //#region src/compat/transformers.ts
 const logger$1 = getLogger([
@@ -1600,22 +1600,72 @@ const logger = getLogger([
 * @returns The response to the request.
 */
 async function handleWebFinger(request, options) {
-	if (options.tracer == null) return await handleWebFingerInternal(request, options);
-	return await options.tracer.startActiveSpan("webfinger.handle", { kind: SpanKind.SERVER }, async (span) => {
-		try {
-			const response = await handleWebFingerInternal(request, options);
-			span.setStatus({ code: response.ok ? SpanStatusCode.UNSET : SpanStatusCode.ERROR });
-			return response;
-		} catch (error) {
-			span.setStatus({
-				code: SpanStatusCode.ERROR,
-				message: String(error)
-			});
-			throw error;
-		} finally {
-			span.end();
+	const meterProvider = options.meterProvider;
+	const start = meterProvider == null ? 0 : performance.now();
+	const scheme = computeResourceScheme(options.context.url.searchParams.get("resource"));
+	let notFoundResponse;
+	const wrappedOptions = {
+		...options,
+		async onNotFound(req) {
+			const r = await options.onNotFound(req);
+			notFoundResponse = r;
+			return r;
 		}
-	});
+	};
+	let response;
+	try {
+		if (options.tracer == null) response = await handleWebFingerInternal(request, wrappedOptions);
+		else response = await options.tracer.startActiveSpan("webfinger.handle", { kind: SpanKind.SERVER }, async (span) => {
+			try {
+				const inner = await handleWebFingerInternal(request, wrappedOptions);
+				span.setStatus({ code: inner.ok ? SpanStatusCode.UNSET : SpanStatusCode.ERROR });
+				return inner;
+			} catch (error) {
+				span.setStatus({
+					code: SpanStatusCode.ERROR,
+					message: String(error)
+				});
+				throw error;
+			} finally {
+				span.end();
+			}
+		});
+		return response;
+	} finally {
+		if (meterProvider != null) recordWebFingerHandle(meterProvider, {
+			durationMs: Math.max(0, performance.now() - start),
+			result: classifyWebFingerHandleResult(response, notFoundResponse),
+			scheme,
+			statusCode: response?.status
+		});
+	}
+}
+const WEBFINGER_HANDLE_SCHEME_WHITELIST = new Set([
+	"acct",
+	"http",
+	"https",
+	"mailto"
+]);
+function isAllowedResourceScheme(scheme) {
+	return WEBFINGER_HANDLE_SCHEME_WHITELIST.has(scheme);
+}
+function computeResourceScheme(resource) {
+	if (resource == null) return void 0;
+	const colon = resource.indexOf(":");
+	if (colon <= 0) return void 0;
+	const candidate = resource.substring(0, colon).toLowerCase();
+	return isAllowedResourceScheme(candidate) ? candidate : "other";
+}
+function classifyWebFingerHandleResult(response, notFoundResponse) {
+	if (response == null) return "error";
+	if (notFoundResponse != null && response === notFoundResponse) return "not_found";
+	switch (response.status) {
+		case 200: return "resolved";
+		case 400: return "invalid";
+		case 404: return "not_found";
+		case 410: return "tombstoned";
+		default: return "error";
+	}
 }
 async function handleWebFingerInternal(request, { context, host, actorDispatcher, actorHandleMapper, actorAliasMapper, onNotFound, span, webFingerLinksDispatcher }) {
 	if (actorDispatcher == null) {
@@ -2641,7 +2691,8 @@ var FederationImpl = class extends FederationBuilderImpl {
 				actorAliasMapper: this.actorCallbacks?.aliasMapper,
 				webFingerLinksDispatcher: this.webFingerLinksDispatcher,
 				onNotFound,
-				tracer
+				tracer,
+				meterProvider: this._meterProvider
 			});
 			case "nodeInfoJrd": return await handleNodeInfoJrd(request, context);
 			case "nodeInfo": return await handleNodeInfo(request, {
@@ -3200,6 +3251,7 @@ var ContextImpl = class ContextImpl {
 			...options,
 			userAgent: options.userAgent ?? this.federation.userAgent,
 			tracerProvider: options.tracerProvider ?? this.tracerProvider,
+			meterProvider: options.meterProvider ?? this.federation._meterProvider,
 			allowPrivateAddress: this.federation.allowPrivateAddress
 		});
 	}

package/dist/{middleware-Dnql59Y8.mjs → middleware-mToCR2tG.mjs}

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