@fedify/fedify 2.3.0-dev.1048 → 2.3.0-dev.1069

package/dist/{middleware-0n0ctSu_.js → middleware-De241etq.js}

@@ -2,10 +2,10 @@ 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-CA4xKsSY.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-Cdxbeq4n.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-D2EDlTr2.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-DLDsFYfD.js";
 import { n as getNodeInfo, t as nodeInfoToJson } from "./types-hvL8ElAs.js";
-import { n as getAuthenticatedDocumentLoader, t as kvCache } from "./kv-cache-DarvCOHt.js";
+import { n as getAuthenticatedDocumentLoader, t as kvCache } from "./kv-cache-KLjvIlKt.js";
 import { getLogger, withContext } from "@logtape/logtape";
 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";
@@ -786,6 +786,8 @@ var FederationMetrics = class {
 	signatureVerificationFailure;
 	deliveryDuration;
 	inboxProcessingDuration;
+	httpServerRequestCount;
+	httpServerRequestDuration;
 	constructor(meterProvider) {
 		const meter = meterProvider.getMeter(name, version);
 		this.deliverySent = meter.createCounter("activitypub.delivery.sent", {
@@ -808,6 +810,30 @@ var FederationMetrics = class {
 			description: "Duration of ActivityPub inbox listener processing.",
 			unit: "ms"
 		});
+		this.httpServerRequestCount = meter.createCounter("fedify.http.server.request.count", {
+			description: "HTTP requests handled by Federation.fetch().",
+			unit: "{request}"
+		});
+		this.httpServerRequestDuration = meter.createHistogram("fedify.http.server.request.duration", {
+			description: "Duration of HTTP requests handled by Federation.fetch().",
+			unit: "ms",
+			advice: { explicitBucketBoundaries: [
+				5,
+				10,
+				25,
+				50,
+				75,
+				100,
+				250,
+				500,
+				750,
+				1e3,
+				2500,
+				5e3,
+				7500,
+				1e4
+			] }
+		});
 	}
 	recordDelivery(inbox, durationMs, success, activityType) {
 		const deliveryAttributes = {
@@ -832,7 +858,33 @@ var FederationMetrics = class {
 	recordInboxProcessingDuration(activityType, durationMs) {
 		this.inboxProcessingDuration.record(durationMs, { "activitypub.activity.type": activityType });
 	}
+	recordHttpServerRequest(method, endpoint, durationMs, options = {}) {
+		const attributes = {
+			"http.request.method": normalizeHttpMethod(method),
+			"fedify.endpoint": endpoint
+		};
+		if (options.statusCode != null) attributes["http.response.status_code"] = options.statusCode;
+		if (options.routeTemplate != null) attributes["fedify.route.template"] = options.routeTemplate;
+		this.httpServerRequestCount.add(1, attributes);
+		this.httpServerRequestDuration.record(durationMs, attributes);
+	}
 };
+const KNOWN_HTTP_METHODS = new Set([
+	"CONNECT",
+	"DELETE",
+	"GET",
+	"HEAD",
+	"OPTIONS",
+	"PATCH",
+	"POST",
+	"PUT",
+	"QUERY",
+	"TRACE"
+]);
+function normalizeHttpMethod(method) {
+	const upper = method.toUpperCase();
+	return KNOWN_HTTP_METHODS.has(upper) ? upper : "_OTHER";
+}
 const federationMetrics = /* @__PURE__ */ new WeakMap();
 /**
 * Gets the cached Fedify metric instruments for a meter provider.
@@ -3577,6 +3629,8 @@ var FederationImpl = class extends FederationBuilderImpl {
 	fetch(request, options) {
 		return withContext({ requestId: getRequestId(request) }, async () => {
 			const tracer = this._getTracer();
+			const metricState = {};
+			const metricStart = performance.now();
 			return await tracer.startActiveSpan(request.method, {
 				kind: SpanKind.SERVER,
 				attributes: {
@@ -3600,10 +3654,12 @@ var FederationImpl = class extends FederationBuilderImpl {
 						response = await this.#fetch(request, {
 							...options,
 							span,
-							tracer
+							tracer,
+							metricState
 						});
 						if (acceptsJsonLd(request)) response.headers.set("Vary", "Accept");
 					} catch (error) {
+						getFederationMetrics(this.meterProvider).recordHttpServerRequest(request.method, metricState.endpoint ?? "error", getDurationMs(metricStart), { routeTemplate: metricState.routeTemplate });
 						span.setStatus({
 							code: SpanStatusCode.ERROR,
 							message: `${error}`
@@ -3616,6 +3672,10 @@ var FederationImpl = class extends FederationBuilderImpl {
 						});
 						throw error;
 					}
+					getFederationMetrics(this.meterProvider).recordHttpServerRequest(request.method, metricState.endpoint ?? "error", getDurationMs(metricStart), {
+						statusCode: response.status,
+						routeTemplate: metricState.routeTemplate
+					});
 					if (span.isRecording()) {
 						span.setAttribute(ATTR_HTTP_RESPONSE_STATUS_CODE, response.status);
 						for (const [k, v] of response.headers) span.setAttribute(ATTR_HTTP_RESPONSE_HEADER(k), [v]);
@@ -3641,13 +3701,18 @@ var FederationImpl = class extends FederationBuilderImpl {
 			});
 		});
 	}
-	async #fetch(request, { onNotFound, onNotAcceptable, onUnauthorized, contextData, span, tracer }) {
+	async #fetch(request, { onNotFound, onNotAcceptable, onUnauthorized, contextData, span, tracer, metricState }) {
 		onNotFound ??= notFound;
 		onNotAcceptable ??= notAcceptable;
 		onUnauthorized ??= unauthorized;
 		const url = new URL(request.url);
 		const route = this.router.route(url.pathname);
-		if (route == null) return await onNotFound(request);
+		if (route == null) {
+			metricState.endpoint = "not_found";
+			return await onNotFound(request);
+		}
+		metricState.routeTemplate = route.template;
+		metricState.endpoint = getEndpointCategory(route.name);
 		span.updateName(`${request.method} ${route.template}`);
 		let context = this.#createContext(request, contextData);
 		const routeName = route.name.replace(/:.*$/, "");
@@ -3668,7 +3733,10 @@ var FederationImpl = class extends FederationBuilderImpl {
 				nodeInfoDispatcher: this.nodeInfoDispatcher
 			});
 		}
-		if (request.method !== "POST" && !acceptsJsonLd(request)) return await onNotAcceptable(request);
+		if (request.method !== "POST" && !acceptsJsonLd(request)) {
+			metricState.endpoint = "not_acceptable";
+			return await onNotAcceptable(request);
+		}
 		switch (routeName) {
 			case "actor":
 			case "actorAlias": {
@@ -3859,12 +3927,33 @@ var FederationImpl = class extends FederationBuilderImpl {
 				});
 			}
 			default: {
+				metricState.endpoint = "not_found";
 				const response = onNotFound(request);
 				return response instanceof Promise ? await response : response;
 			}
 		}
 	}
 };
+function getEndpointCategory(routeName) {
+	if (routeName.startsWith("object:")) return "object";
+	if (routeName.startsWith("collection:") || routeName.startsWith("orderedCollection:")) return "collection";
+	if (routeName.startsWith("actorAlias:")) return "actor";
+	switch (routeName) {
+		case "webfinger": return "webfinger";
+		case "nodeInfoJrd":
+		case "nodeInfo": return "nodeinfo";
+		case "actor": return "actor";
+		case "inbox": return "inbox";
+		case "sharedInbox": return "shared_inbox";
+		case "outbox": return "outbox";
+		case "following": return "following";
+		case "followers": return "followers";
+		case "liked": return "liked";
+		case "featured": return "featured";
+		case "featuredTags": return "featured_tags";
+		default: return "not_found";
+	}
+}
 const FANOUT_THRESHOLD = 5;
 var ContextImpl = class ContextImpl {
 	url;

package/dist/{middleware-THfK90u_.mjs → middleware-DsGmXfXz.mjs}

@@ -2,21 +2,21 @@ import { Temporal } from "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { n as RouterError } from "./router-CrMLXoOr.mjs";
-import { n as version, t as name } from "./deno-D9LpbVQR.mjs";
+import { n as version, t as name } from "./deno-CFXqOz6w.mjs";
 import { t as formatAcceptSignature } from "./accept-CceiKpCy.mjs";
-import { a as importJwk, o as validateCryptoKey, t as exportJwk } from "./key-BPjHWwyv.mjs";
-import { l as verifyRequest, o as parseRfc9421SignatureInput, u as verifyRequestDetailed } from "./http-D6yvDhyL.mjs";
-import { t as getAuthenticatedDocumentLoader } from "./docloader-y2viZ2Tx.mjs";
+import { a as importJwk, o as validateCryptoKey, t as exportJwk } from "./key-CpAxygvh.mjs";
+import { l as verifyRequest, o as parseRfc9421SignatureInput, u as verifyRequestDetailed } from "./http-QHJGzUe8.mjs";
+import { t as getAuthenticatedDocumentLoader } from "./docloader-QNtAtTZF.mjs";
 import { n as kvCache } from "./kv-cache-Bmv7tUzz.mjs";
-import { a as signJsonLd, i as hasSignatureLike, o as verifyJsonLd, r as detachSignature } from "./ld-D9yQwfkO.mjs";
-import { n as getKeyOwner, t as doesActorOwnKey } from "./owner-CebIXUof.mjs";
+import { a as signJsonLd, i as hasSignatureLike, o as verifyJsonLd, r as detachSignature } from "./ld-Ce_vkKjG.mjs";
+import { n as getKeyOwner, t as doesActorOwnKey } from "./owner-DmgzyItA.mjs";
 import { r as normalizeOutgoingActivityJsonLd } from "./outgoing-jsonld-Bi7n-dEy.mjs";
-import { i as verifyObject, n as hasProofLike, r as signObject } from "./proof-UXZOysVc.mjs";
+import { i as verifyObject, n as hasProofLike, r as signObject } from "./proof-C3q2IhUr.mjs";
 import { t as getNodeInfo } from "./client-CIiz1WX7.mjs";
 import { t as nodeInfoToJson } from "./types-BFowWFTT.mjs";
-import { n as FederationBuilderImpl, t as ACTOR_ALIAS_PREFIX } from "./builder-BhiIuyGK.mjs";
+import { n as FederationBuilderImpl, t as ACTOR_ALIAS_PREFIX } from "./builder-DQ2zYTeA.mjs";
 import { t as buildCollectionSynchronizationHeader } from "./collection-CA3V5zyK.mjs";
-import { a as getFederationMetrics, i as getDurationMs, n as extractInboxes, o as getRemoteHost, r as sendActivity, t as SendActivityError } from "./send-_8qtDYZA.mjs";
+import { a as getFederationMetrics, i as getDurationMs, n as extractInboxes, o as getRemoteHost, r as sendActivity, t as SendActivityError } from "./send-CTi2iPXp.mjs";
 import { t as KvKeyCache } from "./keycache-BeU0LCII.mjs";
 import { t as acceptsJsonLd } from "./negotiation-VnHNB0Q5.mjs";
 import { t as createExponentialBackoffPolicy } from "./retry-_VvV0h9f.mjs";
@@ -2425,6 +2425,8 @@ var FederationImpl = class extends FederationBuilderImpl {
 	fetch(request, options) {
 		return withContext({ requestId: getRequestId(request) }, async () => {
 			const tracer = this._getTracer();
+			const metricState = {};
+			const metricStart = performance.now();
 			return await tracer.startActiveSpan(request.method, {
 				kind: SpanKind.SERVER,
 				attributes: {
@@ -2448,10 +2450,12 @@ var FederationImpl = class extends FederationBuilderImpl {
 						response = await this.#fetch(request, {
 							...options,
 							span,
-							tracer
+							tracer,
+							metricState
 						});
 						if (acceptsJsonLd(request)) response.headers.set("Vary", "Accept");
 					} catch (error) {
+						getFederationMetrics(this.meterProvider).recordHttpServerRequest(request.method, metricState.endpoint ?? "error", getDurationMs(metricStart), { routeTemplate: metricState.routeTemplate });
 						span.setStatus({
 							code: SpanStatusCode.ERROR,
 							message: `${error}`
@@ -2464,6 +2468,10 @@ var FederationImpl = class extends FederationBuilderImpl {
 						});
 						throw error;
 					}
+					getFederationMetrics(this.meterProvider).recordHttpServerRequest(request.method, metricState.endpoint ?? "error", getDurationMs(metricStart), {
+						statusCode: response.status,
+						routeTemplate: metricState.routeTemplate
+					});
 					if (span.isRecording()) {
 						span.setAttribute(ATTR_HTTP_RESPONSE_STATUS_CODE, response.status);
 						for (const [k, v] of response.headers) span.setAttribute(ATTR_HTTP_RESPONSE_HEADER(k), [v]);
@@ -2489,13 +2497,18 @@ var FederationImpl = class extends FederationBuilderImpl {
 			});
 		});
 	}
-	async #fetch(request, { onNotFound, onNotAcceptable, onUnauthorized, contextData, span, tracer }) {
+	async #fetch(request, { onNotFound, onNotAcceptable, onUnauthorized, contextData, span, tracer, metricState }) {
 		onNotFound ??= notFound;
 		onNotAcceptable ??= notAcceptable;
 		onUnauthorized ??= unauthorized;
 		const url = new URL(request.url);
 		const route = this.router.route(url.pathname);
-		if (route == null) return await onNotFound(request);
+		if (route == null) {
+			metricState.endpoint = "not_found";
+			return await onNotFound(request);
+		}
+		metricState.routeTemplate = route.template;
+		metricState.endpoint = getEndpointCategory(route.name);
 		span.updateName(`${request.method} ${route.template}`);
 		let context = this.#createContext(request, contextData);
 		const routeName = route.name.replace(/:.*$/, "");
@@ -2516,7 +2529,10 @@ var FederationImpl = class extends FederationBuilderImpl {
 				nodeInfoDispatcher: this.nodeInfoDispatcher
 			});
 		}
-		if (request.method !== "POST" && !acceptsJsonLd(request)) return await onNotAcceptable(request);
+		if (request.method !== "POST" && !acceptsJsonLd(request)) {
+			metricState.endpoint = "not_acceptable";
+			return await onNotAcceptable(request);
+		}
 		switch (routeName) {
 			case "actor":
 			case "actorAlias": {
@@ -2707,12 +2723,33 @@ var FederationImpl = class extends FederationBuilderImpl {
 				});
 			}
 			default: {
+				metricState.endpoint = "not_found";
 				const response = onNotFound(request);
 				return response instanceof Promise ? await response : response;
 			}
 		}
 	}
 };
+function getEndpointCategory(routeName) {
+	if (routeName.startsWith("object:")) return "object";
+	if (routeName.startsWith("collection:") || routeName.startsWith("orderedCollection:")) return "collection";
+	if (routeName.startsWith("actorAlias:")) return "actor";
+	switch (routeName) {
+		case "webfinger": return "webfinger";
+		case "nodeInfoJrd":
+		case "nodeInfo": return "nodeinfo";
+		case "actor": return "actor";
+		case "inbox": return "inbox";
+		case "sharedInbox": return "shared_inbox";
+		case "outbox": return "outbox";
+		case "following": return "following";
+		case "followers": return "followers";
+		case "liked": return "liked";
+		case "featured": return "featured";
+		case "featuredTags": return "featured_tags";
+		default: return "not_found";
+	}
+}
 const FANOUT_THRESHOLD = 5;
 var ContextImpl = class ContextImpl {
 	url;

package/dist/mod.cjs

@@ -4,11 +4,11 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 require("./chunk-DDcVe30Y.cjs");
 const require_transformers = require("./transformers-NeAONrAq.cjs");
 require("./compat/mod.cjs");
-const require_http = require("./http-Bj0uN6d-.cjs");
-const require_middleware = require("./middleware-Ccpokmfe.cjs");
-const require_proof = require("./proof-C2QsttUL.cjs");
+const require_http = require("./http-e1wtIlFo.cjs");
+const require_middleware = require("./middleware-DOLrvK_b.cjs");
+const require_proof = require("./proof-BU1TpFYI.cjs");
 const require_types = require("./types-KC4QAoxe.cjs");
-const require_kv_cache = require("./kv-cache-BdSTsjLb.cjs");
+const require_kv_cache = require("./kv-cache-B3GfB70S.cjs");
 const require_federation_mod = require("./federation/mod.cjs");
 require("./nodeinfo/mod.cjs");
 require("./runtime/mod.cjs");

package/dist/mod.js

@@ -3,11 +3,11 @@ import "urlpattern-polyfill";
 import "./chunk-nlSIicah.js";
 import { n as autoIdAssigner, r as getDefaultActivityTransformers, t as actorDehydrator } from "./transformers-ve6e2xcg.js";
 import "./compat/mod.js";
-import { a as verifyRequestDetailed, c as fetchKeyDetailed, f as formatAcceptSignature, h as validateAcceptSignature, i as verifyRequest, l as generateCryptoKeyPair, m as parseAcceptSignature, o as exportJwk, p as fulfillAcceptSignature, r as signRequest, s as fetchKey, u as importJwk } from "./http-CA4xKsSY.js";
-import { a as createExponentialBackoffPolicy, c as buildCollectionSynchronizationHeader, d as Router, f as RouterError, i as SendActivityError, l as digest, o as respondWithObject, r as handleWebFinger, s as respondWithObjectIfAcceptable, t as createFederation, u as createFederationBuilder } from "./middleware-0n0ctSu_.js";
-import { a as verifyProof, c as getKeyOwner, d as detachSignature, f as hasSignatureLike, h as verifySignature, i as verifyObject, l as attachSignature, m as verifyJsonLd, n as hasProofLike, p as signJsonLd, r as signObject, s as doesActorOwnKey, t as createProof, u as createSignature } from "./proof-Cdxbeq4n.js";
+import { a as verifyRequestDetailed, c as fetchKeyDetailed, f as formatAcceptSignature, h as validateAcceptSignature, i as verifyRequest, l as generateCryptoKeyPair, m as parseAcceptSignature, o as exportJwk, p as fulfillAcceptSignature, r as signRequest, s as fetchKey, u as importJwk } from "./http-D2EDlTr2.js";
+import { a as createExponentialBackoffPolicy, c as buildCollectionSynchronizationHeader, d as Router, f as RouterError, i as SendActivityError, l as digest, o as respondWithObject, r as handleWebFinger, s as respondWithObjectIfAcceptable, t as createFederation, u as createFederationBuilder } from "./middleware-De241etq.js";
+import { a as verifyProof, c as getKeyOwner, d as detachSignature, f as hasSignatureLike, h as verifySignature, i as verifyObject, l as attachSignature, m as verifyJsonLd, n as hasProofLike, p as signJsonLd, r as signObject, s as doesActorOwnKey, t as createProof, u as createSignature } from "./proof-DLDsFYfD.js";
 import { n as getNodeInfo, r as parseNodeInfo, t as nodeInfoToJson } from "./types-hvL8ElAs.js";
-import { n as getAuthenticatedDocumentLoader, t as kvCache } from "./kv-cache-DarvCOHt.js";
+import { n as getAuthenticatedDocumentLoader, t as kvCache } from "./kv-cache-KLjvIlKt.js";
 import { InProcessMessageQueue, MemoryKvStore, ParallelMessageQueue } from "./federation/mod.js";
 import "./nodeinfo/mod.js";
 import "./runtime/mod.js";

package/dist/nodeinfo/handler.test.mjs

@@ -5,7 +5,7 @@ import { r as createRequestContext } from "../context-7Azky82W.mjs";
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
 import "../std__assert-CRDpx_HF.mjs";
 import { t as MemoryKvStore } from "../kv-x2IvBUyq.mjs";
-import { _ as handleNodeInfoJrd, g as handleNodeInfo, o as createFederation } from "../middleware-THfK90u_.mjs";
+import { _ as handleNodeInfoJrd, g as handleNodeInfo, o as createFederation } from "../middleware-DsGmXfXz.mjs";
 import { test } from "@fedify/fixture";
 //#region src/nodeinfo/handler.test.ts
 test("handleNodeInfo()", async () => {

package/dist/{owner-CebIXUof.mjs → owner-DmgzyItA.mjs}

@@ -1,8 +1,8 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-D9LpbVQR.mjs";
-import "./key-BPjHWwyv.mjs";
+import { n as version, t as name } from "./deno-CFXqOz6w.mjs";
+import "./key-CpAxygvh.mjs";
 import { CryptographicKey, Object as Object$1, isActor } from "@fedify/vocab";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
 import { getDocumentLoader } from "@fedify/vocab-runtime";

package/dist/{proof-C2QsttUL.cjs → proof-BU1TpFYI.cjs}

@@ -1,7 +1,7 @@
 const { Temporal } = require("@js-temporal/polyfill");
 const { URLPattern } = require("urlpattern-polyfill");
 const require_chunk = require("./chunk-DDcVe30Y.cjs");
-const require_http = require("./http-Bj0uN6d-.cjs");
+const require_http = require("./http-e1wtIlFo.cjs");
 let _logtape_logtape = require("@logtape/logtape");
 let _fedify_vocab = require("@fedify/vocab");
 let _opentelemetry_api = require("@opentelemetry/api");

package/dist/{proof-UXZOysVc.mjs → proof-C3q2IhUr.mjs}

@@ -1,8 +1,8 @@
 import { Temporal } from "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-D9LpbVQR.mjs";
-import { n as fetchKey, o as validateCryptoKey } from "./key-BPjHWwyv.mjs";
+import { n as version, t as name } from "./deno-CFXqOz6w.mjs";
+import { n as fetchKey, o as validateCryptoKey } from "./key-CpAxygvh.mjs";
 import { n as preloadedOnlyDocumentLoader } from "./public-audience-PVTwU_Ex.mjs";
 import { r as normalizeOutgoingActivityJsonLd } from "./outgoing-jsonld-Bi7n-dEy.mjs";
 import { Activity, DataIntegrityProof, Multikey, getTypeId } from "@fedify/vocab";

package/dist/{proof-Cdxbeq4n.js → proof-DLDsFYfD.js}

@@ -1,6 +1,6 @@
 import { Temporal } from "@js-temporal/polyfill";
 import "urlpattern-polyfill";
-import { _ as version, d as validateCryptoKey, g as name, s as fetchKey } from "./http-CA4xKsSY.js";
+import { _ as version, d as validateCryptoKey, g as name, s as fetchKey } from "./http-D2EDlTr2.js";
 import { getLogger } from "@logtape/logtape";
 import { Activity, CryptographicKey, DataIntegrityProof, Multikey, Object as Object$1, PUBLIC_COLLECTION, getTypeId, isActor } from "@fedify/vocab";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";

package/dist/{send-_8qtDYZA.mjs → send-CTi2iPXp.mjs}

@@ -1,8 +1,8 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-D9LpbVQR.mjs";
-import { n as doubleKnock } from "./http-D6yvDhyL.mjs";
+import { n as version, t as name } from "./deno-CFXqOz6w.mjs";
+import { n as doubleKnock } from "./http-QHJGzUe8.mjs";
 import { SpanKind, SpanStatusCode, metrics, trace } from "@opentelemetry/api";
 import { getLogger } from "@logtape/logtape";
 //#region src/federation/metrics.ts
@@ -12,6 +12,8 @@ var FederationMetrics = class {
 	signatureVerificationFailure;
 	deliveryDuration;
 	inboxProcessingDuration;
+	httpServerRequestCount;
+	httpServerRequestDuration;
 	constructor(meterProvider) {
 		const meter = meterProvider.getMeter(name, version);
 		this.deliverySent = meter.createCounter("activitypub.delivery.sent", {
@@ -34,6 +36,30 @@ var FederationMetrics = class {
 			description: "Duration of ActivityPub inbox listener processing.",
 			unit: "ms"
 		});
+		this.httpServerRequestCount = meter.createCounter("fedify.http.server.request.count", {
+			description: "HTTP requests handled by Federation.fetch().",
+			unit: "{request}"
+		});
+		this.httpServerRequestDuration = meter.createHistogram("fedify.http.server.request.duration", {
+			description: "Duration of HTTP requests handled by Federation.fetch().",
+			unit: "ms",
+			advice: { explicitBucketBoundaries: [
+				5,
+				10,
+				25,
+				50,
+				75,
+				100,
+				250,
+				500,
+				750,
+				1e3,
+				2500,
+				5e3,
+				7500,
+				1e4
+			] }
+		});
 	}
 	recordDelivery(inbox, durationMs, success, activityType) {
 		const deliveryAttributes = {
@@ -58,7 +84,33 @@ var FederationMetrics = class {
 	recordInboxProcessingDuration(activityType, durationMs) {
 		this.inboxProcessingDuration.record(durationMs, { "activitypub.activity.type": activityType });
 	}
+	recordHttpServerRequest(method, endpoint, durationMs, options = {}) {
+		const attributes = {
+			"http.request.method": normalizeHttpMethod(method),
+			"fedify.endpoint": endpoint
+		};
+		if (options.statusCode != null) attributes["http.response.status_code"] = options.statusCode;
+		if (options.routeTemplate != null) attributes["fedify.route.template"] = options.routeTemplate;
+		this.httpServerRequestCount.add(1, attributes);
+		this.httpServerRequestDuration.record(durationMs, attributes);
+	}
 };
+const KNOWN_HTTP_METHODS = new Set([
+	"CONNECT",
+	"DELETE",
+	"GET",
+	"HEAD",
+	"OPTIONS",
+	"PATCH",
+	"POST",
+	"PUT",
+	"QUERY",
+	"TRACE"
+]);
+function normalizeHttpMethod(method) {
+	const upper = method.toUpperCase();
+	return KNOWN_HTTP_METHODS.has(upper) ? upper : "_OTHER";
+}
 const federationMetrics = /* @__PURE__ */ new WeakMap();
 /**
 * Gets the cached Fedify metric instruments for a meter provider.

package/dist/sig/http.test.mjs

@@ -7,8 +7,8 @@ import { n as assertFalse, t as assertRejects } from "../assert_rejects-B-qJtC9Z
 import { t as assertThrows } from "../assert_throws-4NwKEy2q.mjs";
 import { t as assert } from "../assert-DikXweDx.mjs";
 import { t as esm_default } from "../esm-DhnRLoG9.mjs";
-import { t as exportJwk } from "../key-BPjHWwyv.mjs";
-import { a as parseRfc9421Signature, c as timingSafeEqual, i as formatRfc9421SignatureParameters, l as verifyRequest, n as doubleKnock, o as parseRfc9421SignatureInput, r as formatRfc9421Signature, s as signRequest, t as createRfc9421SignatureBase, u as verifyRequestDetailed } from "../http-D6yvDhyL.mjs";
+import { t as exportJwk } from "../key-CpAxygvh.mjs";
+import { a as parseRfc9421Signature, c as timingSafeEqual, i as formatRfc9421SignatureParameters, l as verifyRequest, n as doubleKnock, o as parseRfc9421SignatureInput, r as formatRfc9421Signature, s as signRequest, t as createRfc9421SignatureBase, u as verifyRequestDetailed } from "../http-QHJGzUe8.mjs";
 import { i as rsaPrivateKey2, l as rsaPublicKey5, o as rsaPublicKey1, s as rsaPublicKey2 } from "../keys-C3kae-6B.mjs";
 import { createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
 import { FetchError, exportSpki } from "@fedify/vocab-runtime";

package/dist/sig/key.test.mjs

@@ -5,7 +5,7 @@ import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
 import "../std__assert-CRDpx_HF.mjs";
 import { t as assertRejects } from "../assert_rejects-B-qJtC9Z.mjs";
 import { t as assertThrows } from "../assert_throws-4NwKEy2q.mjs";
-import { a as importJwk, i as generateCryptoKeyPair, n as fetchKey, o as validateCryptoKey, r as fetchKeyDetailed, t as exportJwk } from "../key-BPjHWwyv.mjs";
+import { a as importJwk, i as generateCryptoKeyPair, n as fetchKey, o as validateCryptoKey, r as fetchKeyDetailed, t as exportJwk } from "../key-CpAxygvh.mjs";
 import { c as rsaPublicKey3, i as rsaPrivateKey2, o as rsaPublicKey1, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-C3kae-6B.mjs";
 import { createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
 import { CryptographicKey, Multikey } from "@fedify/vocab";

package/dist/sig/ld.test.mjs

@@ -5,9 +5,9 @@ import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
 import { n as assertFalse, t as assertRejects } from "../assert_rejects-B-qJtC9Z.mjs";
 import { t as assertThrows } from "../assert_throws-4NwKEy2q.mjs";
 import { t as assert } from "../assert-DikXweDx.mjs";
-import { i as generateCryptoKeyPair } from "../key-BPjHWwyv.mjs";
+import { i as generateCryptoKeyPair } from "../key-CpAxygvh.mjs";
 import { a as rsaPrivateKey3, c as rsaPublicKey3, i as rsaPrivateKey2, n as ed25519PrivateKey, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-C3kae-6B.mjs";
-import { a as signJsonLd, i as hasSignatureLike, n as createSignature, o as verifyJsonLd, r as detachSignature, s as verifySignature, t as attachSignature } from "../ld-D9yQwfkO.mjs";
+import { a as signJsonLd, i as hasSignatureLike, n as createSignature, o as verifyJsonLd, r as detachSignature, s as verifySignature, t as attachSignature } from "../ld-Ce_vkKjG.mjs";
 import { mockDocumentLoader, test } from "@fedify/fixture";
 import { CryptographicKey } from "@fedify/vocab";
 import { encodeBase64 } from "byte-encodings/base64";

package/dist/sig/mod.cjs

@@ -1,8 +1,8 @@
 const { Temporal } = require("@js-temporal/polyfill");
 const { URLPattern } = require("urlpattern-polyfill");
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_http = require("../http-Bj0uN6d-.cjs");
-const require_proof = require("../proof-C2QsttUL.cjs");
+const require_http = require("../http-e1wtIlFo.cjs");
+const require_proof = require("../proof-BU1TpFYI.cjs");
 exports.attachSignature = require_proof.attachSignature;
 exports.createProof = require_proof.createProof;
 exports.createSignature = require_proof.createSignature;

package/dist/sig/mod.js

@@ -1,5 +1,5 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
-import { a as verifyRequestDetailed, c as fetchKeyDetailed, f as formatAcceptSignature, h as validateAcceptSignature, i as verifyRequest, l as generateCryptoKeyPair, m as parseAcceptSignature, o as exportJwk, p as fulfillAcceptSignature, r as signRequest, s as fetchKey, u as importJwk } from "../http-CA4xKsSY.js";
-import { a as verifyProof, c as getKeyOwner, d as detachSignature, f as hasSignatureLike, h as verifySignature, i as verifyObject, l as attachSignature, m as verifyJsonLd, n as hasProofLike, p as signJsonLd, r as signObject, s as doesActorOwnKey, t as createProof, u as createSignature } from "../proof-Cdxbeq4n.js";
+import { a as verifyRequestDetailed, c as fetchKeyDetailed, f as formatAcceptSignature, h as validateAcceptSignature, i as verifyRequest, l as generateCryptoKeyPair, m as parseAcceptSignature, o as exportJwk, p as fulfillAcceptSignature, r as signRequest, s as fetchKey, u as importJwk } from "../http-D2EDlTr2.js";
+import { a as verifyProof, c as getKeyOwner, d as detachSignature, f as hasSignatureLike, h as verifySignature, i as verifyObject, l as attachSignature, m as verifyJsonLd, n as hasProofLike, p as signJsonLd, r as signObject, s as doesActorOwnKey, t as createProof, u as createSignature } from "../proof-DLDsFYfD.js";
 export { attachSignature, createProof, createSignature, detachSignature, doesActorOwnKey, exportJwk, fetchKey, fetchKeyDetailed, formatAcceptSignature, fulfillAcceptSignature, generateCryptoKeyPair, getKeyOwner, hasProofLike, hasSignatureLike, importJwk, parseAcceptSignature, signJsonLd, signObject, signRequest, validateAcceptSignature, verifyJsonLd, verifyObject, verifyProof, verifyRequest, verifyRequestDetailed, verifySignature };

package/dist/sig/owner.test.mjs

@@ -6,7 +6,7 @@ import "../std__assert-CRDpx_HF.mjs";
 import { n as assertFalse } from "../assert_rejects-B-qJtC9Z.mjs";
 import { t as assert } from "../assert-DikXweDx.mjs";
 import { o as rsaPublicKey1, s as rsaPublicKey2 } from "../keys-C3kae-6B.mjs";
-import { n as getKeyOwner, t as doesActorOwnKey } from "../owner-CebIXUof.mjs";
+import { n as getKeyOwner, t as doesActorOwnKey } from "../owner-DmgzyItA.mjs";
 import { createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
 import { Create, CryptographicKey, lookupObject } from "@fedify/vocab";
 //#region src/sig/owner.test.ts

package/dist/sig/proof.test.mjs

@@ -8,7 +8,7 @@ import { t as assertInstanceOf } from "../assert_instance_of-C4Ri6VuN.mjs";
 import { t as assert } from "../assert-DikXweDx.mjs";
 import { i as rsaPrivateKey2, n as ed25519PrivateKey, r as ed25519PublicKey, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-C3kae-6B.mjs";
 import { r as normalizeOutgoingActivityJsonLd } from "../outgoing-jsonld-Bi7n-dEy.mjs";
-import { a as verifyProof, i as verifyObject, n as hasProofLike, r as signObject, t as createProof } from "../proof-UXZOysVc.mjs";
+import { a as verifyProof, i as verifyObject, n as hasProofLike, r as signObject, t as createProof } from "../proof-C3q2IhUr.mjs";
 import { mockDocumentLoader, test } from "@fedify/fixture";
 import { Create, DataIntegrityProof, Document, Multikey, Note, PUBLIC_COLLECTION, Place } from "@fedify/vocab";
 import { decodeMultibase, importMultibaseKey } from "@fedify/vocab-runtime";

package/dist/utils/docloader.test.mjs

@@ -5,9 +5,9 @@ import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
 import "../std__assert-CRDpx_HF.mjs";
 import { t as assertRejects } from "../assert_rejects-B-qJtC9Z.mjs";
 import { t as esm_default } from "../esm-DhnRLoG9.mjs";
-import { l as verifyRequest } from "../http-D6yvDhyL.mjs";
+import { l as verifyRequest } from "../http-QHJGzUe8.mjs";
 import { i as rsaPrivateKey2 } from "../keys-C3kae-6B.mjs";
-import { t as getAuthenticatedDocumentLoader } from "../docloader-y2viZ2Tx.mjs";
+import { t as getAuthenticatedDocumentLoader } from "../docloader-QNtAtTZF.mjs";
 import { mockDocumentLoader, test } from "@fedify/fixture";
 import { UrlError } from "@fedify/vocab-runtime";
 //#region src/utils/docloader.test.ts

package/dist/utils/mod.cjs

@@ -1,6 +1,6 @@
 const { Temporal } = require("@js-temporal/polyfill");
 const { URLPattern } = require("urlpattern-polyfill");
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_kv_cache = require("../kv-cache-BdSTsjLb.cjs");
+const require_kv_cache = require("../kv-cache-B3GfB70S.cjs");
 exports.getAuthenticatedDocumentLoader = require_kv_cache.getAuthenticatedDocumentLoader;
 exports.kvCache = require_kv_cache.kvCache;

package/dist/utils/mod.js

@@ -1,4 +1,4 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
-import { n as getAuthenticatedDocumentLoader, t as kvCache } from "../kv-cache-DarvCOHt.js";
+import { n as getAuthenticatedDocumentLoader, t as kvCache } from "../kv-cache-KLjvIlKt.js";
 export { getAuthenticatedDocumentLoader, kvCache };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/fedify",
-  "version": "2.3.0-dev.1048+2da74497",
+  "version": "2.3.0-dev.1069+81e910ce",
   "description": "An ActivityPub server framework",
   "keywords": [
     "ActivityPub",
@@ -153,9 +153,9 @@
     "uri-template-router": "^1.0.0",
     "url-template": "^3.1.1",
     "urlpattern-polyfill": "^10.1.0",
-    "@fedify/webfinger": "2.3.0-dev.1048+2da74497",
-    "@fedify/vocab-runtime": "2.3.0-dev.1048+2da74497",
-    "@fedify/vocab": "2.3.0-dev.1048+2da74497"
+    "@fedify/vocab": "2.3.0-dev.1069+81e910ce",
+    "@fedify/vocab-runtime": "2.3.0-dev.1069+81e910ce",
+    "@fedify/webfinger": "2.3.0-dev.1069+81e910ce"
   },
   "devDependencies": {
     "@opentelemetry/sdk-metrics": "2.5.0",
@@ -169,7 +169,7 @@
     "typescript": "^5.9.2",
     "wrangler": "^4.17.0",
     "@fedify/fixture": "2.0.0",
-    "@fedify/vocab-tools": "^2.3.0-dev.1048+2da74497"
+    "@fedify/vocab-tools": "^2.3.0-dev.1069+81e910ce"
   },
   "scripts": {
     "build:self": "tsdown",