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

package/dist/{builder-BhiIuyGK.mjs → builder-DQ2zYTeA.mjs}

@@ -2,7 +2,7 @@ import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { n as RouterError, t as Router } 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 ActivityListenerSet } from "./activity-listener-tztVvlNb.mjs";
 import { Tombstone, getTypeId } from "@fedify/vocab";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
@@ -59,7 +59,7 @@ var FederationBuilderImpl = class {
 		this.collectionTypeIds = {};
 	}
 	async build(options) {
-		const { FederationImpl } = await import("./middleware-C5ao_lvm.mjs");
+		const { FederationImpl } = await import("./middleware-BJMPv7_l.mjs");
 		const f = new FederationImpl(options);
 		const trailingSlashInsensitiveValue = f.router.trailingSlashInsensitive;
 		f.router = this.router.clone();

package/dist/compat/transformers.test.mjs

@@ -5,7 +5,7 @@ import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
 import { t as assertInstanceOf } from "../assert_instance_of-C4Ri6VuN.mjs";
 import { t as assert } from "../assert-DikXweDx.mjs";
 import { t as MemoryKvStore } from "../kv-x2IvBUyq.mjs";
-import { n as FederationImpl, v as actorDehydrator, y as autoIdAssigner } from "../middleware-THfK90u_.mjs";
+import { n as FederationImpl, v as actorDehydrator, y as autoIdAssigner } from "../middleware-DsGmXfXz.mjs";
 import { test } from "@fedify/fixture";
 import { Follow, Person } from "@fedify/vocab";
 //#region src/compat/transformers.test.ts

package/dist/{deno-D9LpbVQR.mjs → deno-CFXqOz6w.mjs}

@@ -3,6 +3,6 @@ import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 //#region deno.json
 var name = "@fedify/fedify";
-var version = "2.3.0-dev.1048+2da74497";
+var version = "2.3.0-dev.1069+81e910ce";
 //#endregion
 export { version as n, name as t };

package/dist/{docloader-y2viZ2Tx.mjs → docloader-QNtAtTZF.mjs}

@@ -1,8 +1,8 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { o as validateCryptoKey } from "./key-BPjHWwyv.mjs";
-import { n as doubleKnock } from "./http-D6yvDhyL.mjs";
+import { o as validateCryptoKey } from "./key-CpAxygvh.mjs";
+import { n as doubleKnock } from "./http-QHJGzUe8.mjs";
 import { curry } from "es-toolkit";
 import { UrlError, createActivityPubRequest, getRemoteDocument, logRequest, validatePublicUrl } from "@fedify/vocab-runtime";
 import { getLogger } from "@logtape/logtape";

package/dist/federation/builder.test.mjs

@@ -6,7 +6,7 @@ import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
 import { i as assertExists } from "../std__assert-CRDpx_HF.mjs";
 import { t as assertThrows } from "../assert_throws-4NwKEy2q.mjs";
 import { t as MemoryKvStore } from "../kv-x2IvBUyq.mjs";
-import { r as createFederationBuilder } from "../builder-BhiIuyGK.mjs";
+import { r as createFederationBuilder } from "../builder-DQ2zYTeA.mjs";
 import { test } from "@fedify/fixture";
 import { Activity, Note, Person } from "@fedify/vocab";
 //#region src/federation/builder.test.ts

package/dist/federation/handler.test.mjs

@@ -7,10 +7,10 @@ import { r as assertGreaterOrEqual } from "../std__assert-CRDpx_HF.mjs";
 import { t as assertInstanceOf } from "../assert_instance_of-C4Ri6VuN.mjs";
 import { t as assert } from "../assert-DikXweDx.mjs";
 import { r as parseAcceptSignature } from "../accept-CceiKpCy.mjs";
-import { s as signRequest } from "../http-D6yvDhyL.mjs";
+import { s as signRequest } from "../http-QHJGzUe8.mjs";
 import { a as rsaPrivateKey3, c as rsaPublicKey3, s as rsaPublicKey2 } from "../keys-C3kae-6B.mjs";
 import { t as MemoryKvStore } from "../kv-x2IvBUyq.mjs";
-import { c as handleActor, d as handleInbox, f as handleObject, h as respondWithObjectIfAcceptable, l as handleCollection, m as respondWithObject, o as createFederation, p as handleOutbox, u as handleCustomCollection } from "../middleware-THfK90u_.mjs";
+import { c as handleActor, d as handleInbox, f as handleObject, h as respondWithObjectIfAcceptable, l as handleCollection, m as respondWithObject, o as createFederation, p as handleOutbox, u as handleCustomCollection } from "../middleware-DsGmXfXz.mjs";
 import { t as ActivityListenerSet } from "../activity-listener-tztVvlNb.mjs";
 import { createTestMeterProvider, createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
 import { Activity, Create, Note, Person, Tombstone } from "@fedify/vocab";

package/dist/federation/idempotency.test.mjs

@@ -4,9 +4,9 @@ globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
 import "../std__assert-CRDpx_HF.mjs";
 import { n as ed25519PrivateKey, r as ed25519PublicKey, t as ed25519Multikey } from "../keys-C3kae-6B.mjs";
-import { r as signObject } from "../proof-UXZOysVc.mjs";
+import { r as signObject } from "../proof-C3q2IhUr.mjs";
 import { t as MemoryKvStore } from "../kv-x2IvBUyq.mjs";
-import { o as createFederation } from "../middleware-THfK90u_.mjs";
+import { o as createFederation } from "../middleware-DsGmXfXz.mjs";
 import { mockDocumentLoader, test } from "@fedify/fixture";
 import { Create, Follow, Person } from "@fedify/vocab";
 //#region src/federation/idempotency.test.ts

package/dist/federation/middleware.test.mjs

@@ -11,14 +11,14 @@ import { t as assertNotEquals } from "../assert_not_equals--wG9hV7u.mjs";
 import { t as assertStrictEquals } from "../assert_strict_equals-Dmjbg-bA.mjs";
 import { t as assert } from "../assert-DikXweDx.mjs";
 import { t as esm_default } from "../esm-DhnRLoG9.mjs";
-import { l as verifyRequest, s as signRequest } from "../http-D6yvDhyL.mjs";
+import { l as verifyRequest, s as signRequest } from "../http-QHJGzUe8.mjs";
 import { a as rsaPrivateKey3, c as rsaPublicKey3, i as rsaPrivateKey2, n as ed25519PrivateKey, r as ed25519PublicKey, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-C3kae-6B.mjs";
-import { t as getAuthenticatedDocumentLoader } from "../docloader-y2viZ2Tx.mjs";
-import { a as signJsonLd, o as verifyJsonLd, r as detachSignature } from "../ld-D9yQwfkO.mjs";
-import { t as doesActorOwnKey } from "../owner-CebIXUof.mjs";
-import { i as verifyObject, r as signObject } from "../proof-UXZOysVc.mjs";
+import { t as getAuthenticatedDocumentLoader } from "../docloader-QNtAtTZF.mjs";
+import { a as signJsonLd, o as verifyJsonLd, r as detachSignature } from "../ld-Ce_vkKjG.mjs";
+import { t as doesActorOwnKey } from "../owner-DmgzyItA.mjs";
+import { i as verifyObject, r as signObject } from "../proof-C3q2IhUr.mjs";
 import { t as MemoryKvStore } from "../kv-x2IvBUyq.mjs";
-import { i as KvSpecDeterminer, n as FederationImpl, o as createFederation, r as InboxContextImpl, t as ContextImpl } from "../middleware-THfK90u_.mjs";
+import { i as KvSpecDeterminer, n as FederationImpl, o as createFederation, r as InboxContextImpl, t as ContextImpl } from "../middleware-DsGmXfXz.mjs";
 import { createTestMeterProvider, createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
 import * as vocab from "@fedify/vocab";
 import { getTypeId, lookupObject } from "@fedify/vocab";
@@ -956,6 +956,199 @@ test("Federation.fetch()", async (t) => {
 	});
 	esm_default.hardReset();
 });
+test("Federation.fetch() records HTTP server request metrics", async (t) => {
+	const createTestContext = () => {
+		const kv = new MemoryKvStore();
+		const [meterProvider, recorder] = createTestMeterProvider();
+		const federation = createFederation({
+			kv,
+			meterProvider,
+			documentLoaderFactory: () => mockDocumentLoader
+		});
+		federation.setActorDispatcher("/users/{identifier}", (ctx, identifier) => {
+			if (identifier === "boom") throw new Error("explosion in actor dispatcher");
+			return new vocab.Person({
+				id: ctx.getActorUri(identifier),
+				inbox: ctx.getInboxUri(identifier),
+				preferredUsername: identifier
+			});
+		});
+		federation.setNodeInfoDispatcher("/nodeinfo/2.1", () => ({
+			software: {
+				name: "example",
+				version: "1.0.0"
+			},
+			protocols: ["activitypub"],
+			usage: {
+				users: {},
+				localPosts: 0,
+				localComments: 0
+			}
+		}));
+		federation.setFollowersDispatcher("/users/{identifier}/followers", () => ({ items: [] }));
+		federation.setCollectionDispatcher("custom-collection", vocab.Object, "/users/{identifier}/custom/{id}", () => ({ items: [] }));
+		federation.setInboxListeners("/users/{identifier}/inbox", "/inbox");
+		return {
+			federation,
+			recorder
+		};
+	};
+	await t.step("records a successful actor request", async () => {
+		const { federation, recorder } = createTestContext();
+		assertEquals((await federation.fetch(new Request("https://example.com/users/alice", {
+			method: "GET",
+			headers: { "Accept": "application/activity+json" }
+		}), { contextData: void 0 })).status, 200);
+		const counts = recorder.getMeasurements("fedify.http.server.request.count");
+		assertEquals(counts.length, 1);
+		assertEquals(counts[0].type, "counter");
+		assertEquals(counts[0].value, 1);
+		assertEquals(counts[0].attributes["http.request.method"], "GET");
+		assertEquals(counts[0].attributes["fedify.endpoint"], "actor");
+		assertEquals(counts[0].attributes["http.response.status_code"], 200);
+		assertEquals(counts[0].attributes["fedify.route.template"], "/users/{identifier}");
+		const durations = recorder.getMeasurements("fedify.http.server.request.duration");
+		assertEquals(durations.length, 1);
+		assertEquals(durations[0].type, "histogram");
+		assert(durations[0].value >= 0);
+		assertEquals(durations[0].attributes["fedify.endpoint"], "actor");
+		assertEquals(durations[0].attributes["http.response.status_code"], 200);
+		assertEquals(durations[0].attributes["fedify.route.template"], "/users/{identifier}");
+	});
+	await t.step("records WebFinger requests", async () => {
+		const { federation, recorder } = createTestContext();
+		assertEquals((await federation.fetch(new Request("https://example.com/.well-known/webfinger?resource=acct:alice@example.com"), { contextData: void 0 })).status, 200);
+		const counts = recorder.getMeasurements("fedify.http.server.request.count");
+		assertEquals(counts.length, 1);
+		assertEquals(counts[0].attributes["fedify.endpoint"], "webfinger");
+		assertEquals(counts[0].attributes["fedify.route.template"], "/.well-known/webfinger");
+		assertEquals(counts[0].attributes["http.response.status_code"], 200);
+	});
+	await t.step("records NodeInfo JRD requests", async () => {
+		const { federation, recorder } = createTestContext();
+		assertEquals((await federation.fetch(new Request("https://example.com/.well-known/nodeinfo"), { contextData: void 0 })).status, 200);
+		const counts = recorder.getMeasurements("fedify.http.server.request.count");
+		assertEquals(counts.length, 1);
+		assertEquals(counts[0].attributes["fedify.endpoint"], "nodeinfo");
+		assertEquals(counts[0].attributes["fedify.route.template"], "/.well-known/nodeinfo");
+	});
+	await t.step("records NodeInfo dispatcher requests", async () => {
+		const { federation, recorder } = createTestContext();
+		assertEquals((await federation.fetch(new Request("https://example.com/nodeinfo/2.1"), { contextData: void 0 })).status, 200);
+		const counts = recorder.getMeasurements("fedify.http.server.request.count");
+		assertEquals(counts.length, 1);
+		assertEquals(counts[0].attributes["fedify.endpoint"], "nodeinfo");
+		assertEquals(counts[0].attributes["fedify.route.template"], "/nodeinfo/2.1");
+	});
+	await t.step("records 404 not_found for unmatched paths", async () => {
+		const { federation, recorder } = createTestContext();
+		assertEquals((await federation.fetch(new Request("https://example.com/no/such/path"), { contextData: void 0 })).status, 404);
+		const counts = recorder.getMeasurements("fedify.http.server.request.count");
+		assertEquals(counts.length, 1);
+		assertEquals(counts[0].attributes["fedify.endpoint"], "not_found");
+		assertEquals(counts[0].attributes["http.response.status_code"], 404);
+		assertEquals(counts[0].attributes["fedify.route.template"], void 0);
+	});
+	await t.step("records 406 not_acceptable when JSON-LD Accept missing", async () => {
+		const { federation, recorder } = createTestContext();
+		assertEquals((await federation.fetch(new Request("https://example.com/users/alice", {
+			method: "GET",
+			headers: { "Accept": "text/html" }
+		}), { contextData: void 0 })).status, 406);
+		const counts = recorder.getMeasurements("fedify.http.server.request.count");
+		assertEquals(counts.length, 1);
+		assertEquals(counts[0].attributes["fedify.endpoint"], "not_acceptable");
+		assertEquals(counts[0].attributes["http.response.status_code"], 406);
+		assertEquals(counts[0].attributes["fedify.route.template"], "/users/{identifier}");
+	});
+	await t.step("records thrown errors after classification with the matched endpoint", async () => {
+		const { federation, recorder } = createTestContext();
+		await assertRejects(() => federation.fetch(new Request("https://example.com/users/boom", {
+			method: "GET",
+			headers: { "Accept": "application/activity+json" }
+		}), { contextData: void 0 }), Error, "explosion");
+		const counts = recorder.getMeasurements("fedify.http.server.request.count");
+		assertEquals(counts.length, 1);
+		assertEquals(counts[0].attributes["fedify.endpoint"], "actor");
+		assertEquals(counts[0].attributes["http.response.status_code"], void 0);
+		assertEquals(counts[0].attributes["fedify.route.template"], "/users/{identifier}");
+		const durations = recorder.getMeasurements("fedify.http.server.request.duration");
+		assertEquals(durations.length, 1);
+		assertEquals(durations[0].attributes["fedify.endpoint"], "actor");
+	});
+	await t.step("collapses user-defined collection dispatchers to endpoint=collection", async () => {
+		const { federation, recorder } = createTestContext();
+		assertEquals((await federation.fetch(new Request("https://example.com/users/alice/custom/1", {
+			method: "GET",
+			headers: { "Accept": "application/activity+json" }
+		}), { contextData: void 0 })).status, 200);
+		const counts = recorder.getMeasurements("fedify.http.server.request.count");
+		assertEquals(counts.length, 1);
+		assertEquals(counts[0].attributes["fedify.endpoint"], "collection");
+		assertEquals(counts[0].attributes["fedify.route.template"], "/users/{identifier}/custom/{id}");
+	});
+	await t.step("records followers as endpoint=followers", async () => {
+		const { federation, recorder } = createTestContext();
+		assertEquals((await federation.fetch(new Request("https://example.com/users/alice/followers", {
+			method: "GET",
+			headers: { "Accept": "application/activity+json" }
+		}), { contextData: void 0 })).status, 200);
+		const counts = recorder.getMeasurements("fedify.http.server.request.count");
+		assertEquals(counts.length, 1);
+		assertEquals(counts[0].attributes["fedify.endpoint"], "followers");
+		assertEquals(counts[0].attributes["fedify.route.template"], "/users/{identifier}/followers");
+	});
+	await t.step("records sharedInbox as endpoint=shared_inbox", async () => {
+		const kv = new MemoryKvStore();
+		const [meterProvider, recorder] = createTestMeterProvider();
+		const federation = createFederation({
+			kv,
+			meterProvider,
+			documentLoaderFactory: () => mockDocumentLoader
+		});
+		federation.setInboxListeners("/users/{identifier}/inbox", "/inbox");
+		assert((await federation.fetch(new Request("https://example.com/inbox", {
+			method: "POST",
+			headers: { "accept": "application/ld+json" }
+		}), { contextData: void 0 })).status >= 400);
+		const counts = recorder.getMeasurements("fedify.http.server.request.count");
+		assertEquals(counts.length, 1);
+		assertEquals(counts[0].attributes["fedify.endpoint"], "shared_inbox");
+		assertEquals(counts[0].attributes["fedify.route.template"], "/inbox");
+		assertEquals(counts[0].attributes["http.request.method"], "POST");
+	});
+	await t.step("normalizes unknown HTTP methods to _OTHER for cardinality control", async () => {
+		const { federation, recorder } = createTestContext();
+		assert((await federation.fetch(new Request("https://example.com/users/alice", {
+			method: "PROPFIND",
+			headers: { "Accept": "application/activity+json" }
+		}), { contextData: void 0 })).status >= 100);
+		const counts = recorder.getMeasurements("fedify.http.server.request.count");
+		assertEquals(counts.length, 1);
+		assertEquals(counts[0].attributes["http.request.method"], "_OTHER");
+	});
+	await t.step("preserves QUERY as a known HTTP method", async () => {
+		const { federation, recorder } = createTestContext();
+		assert((await federation.fetch(new Request("https://example.com/users/alice", {
+			method: "QUERY",
+			headers: { "Accept": "application/activity+json" }
+		}), { contextData: void 0 })).status >= 100);
+		const counts = recorder.getMeasurements("fedify.http.server.request.count");
+		assertEquals(counts.length, 1);
+		assertEquals(counts[0].attributes["http.request.method"], "QUERY");
+	});
+	await t.step("uses the global meter provider when none is configured", async () => {
+		const federation = createFederation({
+			kv: new MemoryKvStore(),
+			documentLoaderFactory: () => mockDocumentLoader
+		});
+		federation.setActorDispatcher("/users/{identifier}", (ctx, identifier) => new vocab.Person({ id: ctx.getActorUri(identifier) }));
+		assertEquals((await federation.fetch(new Request("https://example.com/users/alice", {
+			method: "GET",
+			headers: { "Accept": "application/activity+json" }
+		}), { contextData: void 0 })).status, 200);
+	});
+});
 test("Federation.setInboxListeners()", async (t) => {
 	const kv = new MemoryKvStore();
 	esm_default.spyGlobal();

package/dist/federation/mod.cjs

@@ -2,7 +2,7 @@ const { Temporal } = require("@js-temporal/polyfill");
 const { URLPattern } = require("urlpattern-polyfill");
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 require("../chunk-DDcVe30Y.cjs");
-const require_middleware = require("../middleware-Ccpokmfe.cjs");
+const require_middleware = require("../middleware-DOLrvK_b.cjs");
 let es_toolkit = require("es-toolkit");
 //#region src/federation/kv.ts
 /**

package/dist/federation/mod.js

@@ -1,6 +1,6 @@
 import { Temporal } from "@js-temporal/polyfill";
 import "urlpattern-polyfill";
-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 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 { isEqual } from "es-toolkit";
 //#region src/federation/kv.ts
 /**

package/dist/federation/send.test.mjs

@@ -9,10 +9,10 @@ import { t as assertInstanceOf } from "../assert_instance_of-C4Ri6VuN.mjs";
 import { t as assertNotEquals } from "../assert_not_equals--wG9hV7u.mjs";
 import { t as assert } from "../assert-DikXweDx.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, n as ed25519PrivateKey, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-C3kae-6B.mjs";
-import { t as doesActorOwnKey } from "../owner-CebIXUof.mjs";
-import { n as extractInboxes, r as sendActivity, t as SendActivityError } from "../send-_8qtDYZA.mjs";
+import { t as doesActorOwnKey } from "../owner-DmgzyItA.mjs";
+import { n as extractInboxes, r as sendActivity, t as SendActivityError } from "../send-CTi2iPXp.mjs";
 import { createTestMeterProvider, createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
 import { Activity, Application, Endpoints, Group, Person, Service } from "@fedify/vocab";
 //#region ../../node_modules/.pnpm/@opentelemetry+sdk-metrics@2.5.0_@opentelemetry+api@1.9.0/node_modules/@opentelemetry/sdk-metrics/build/src/export/AggregationTemporality.js

package/dist/federation/webfinger.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 { o as createFederation, s as handleWebFinger } from "../middleware-THfK90u_.mjs";
+import { o as createFederation, s as handleWebFinger } from "../middleware-DsGmXfXz.mjs";
 import { test } from "@fedify/fixture";
 import { Image, Link, Person, Tombstone } from "@fedify/vocab";
 //#region src/federation/webfinger.test.ts

package/dist/{http-CA4xKsSY.js → http-D2EDlTr2.js}

@@ -10,7 +10,7 @@ import { ATTR_HTTP_REQUEST_HEADER, ATTR_HTTP_REQUEST_METHOD, ATTR_URL_FULL } fro
 import { decodeBase64, encodeBase64 } from "byte-encodings/base64";
 //#region deno.json
 var name = "@fedify/fedify";
-var version = "2.3.0-dev.1048+2da74497";
+var version = "2.3.0-dev.1069+81e910ce";
 //#endregion
 //#region src/sig/accept.ts
 /**

package/dist/{http-D6yvDhyL.mjs → http-QHJGzUe8.mjs}

@@ -1,9 +1,9 @@
 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 version, t as name } from "./deno-CFXqOz6w.mjs";
 import { i as validateAcceptSignature, n as fulfillAcceptSignature, r as parseAcceptSignature } from "./accept-CceiKpCy.mjs";
-import { o as validateCryptoKey, r as fetchKeyDetailed } from "./key-BPjHWwyv.mjs";
+import { o as validateCryptoKey, r as fetchKeyDetailed } from "./key-CpAxygvh.mjs";
 import { CryptographicKey } from "@fedify/vocab";
 import { SpanStatusCode, trace } from "@opentelemetry/api";
 import { FetchError } from "@fedify/vocab-runtime";

package/dist/{http-Bj0uN6d-.cjs → http-e1wtIlFo.cjs}

@@ -11,7 +11,7 @@ let _opentelemetry_semantic_conventions = require("@opentelemetry/semantic-conve
 let byte_encodings_base64 = require("byte-encodings/base64");
 //#region deno.json
 var name = "@fedify/fedify";
-var version = "2.3.0-dev.1048+2da74497";
+var version = "2.3.0-dev.1069+81e910ce";
 //#endregion
 //#region src/sig/accept.ts
 /**

package/dist/{key-BPjHWwyv.mjs → key-CpAxygvh.mjs}

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

package/dist/{kv-cache-BdSTsjLb.cjs → kv-cache-B3GfB70S.cjs}

@@ -1,7 +1,7 @@
 const { Temporal } = require("@js-temporal/polyfill");
 const { URLPattern } = require("urlpattern-polyfill");
 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 es_toolkit = require("es-toolkit");
 let _fedify_vocab_runtime = require("@fedify/vocab-runtime");

package/dist/{kv-cache-DarvCOHt.js → kv-cache-KLjvIlKt.js}

@@ -1,6 +1,6 @@
 import { Temporal } from "@js-temporal/polyfill";
 import { URLPattern } from "urlpattern-polyfill";
-import { d as validateCryptoKey, t as doubleKnock } from "./http-CA4xKsSY.js";
+import { d as validateCryptoKey, t as doubleKnock } from "./http-D2EDlTr2.js";
 import { getLogger } from "@logtape/logtape";
 import { curry } from "es-toolkit";
 import { UrlError, createActivityPubRequest, getRemoteDocument, logRequest, preloadedContexts, validatePublicUrl } from "@fedify/vocab-runtime";

package/dist/{ld-D9yQwfkO.mjs → ld-Ce_vkKjG.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 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 { Activity, CryptographicKey, Object as Object$1, getTypeId } from "@fedify/vocab";
 import { SpanStatusCode, trace } from "@opentelemetry/api";
 import { getDocumentLoader } from "@fedify/vocab-runtime";

package/dist/{middleware-C5ao_lvm.mjs → middleware-BJMPv7_l.mjs}

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

package/dist/{middleware-DTxZNOqy.cjs → middleware-CibncbiT.cjs}

@@ -1,4 +1,4 @@
 const { Temporal } = require("@js-temporal/polyfill");
 const { URLPattern } = require("urlpattern-polyfill");
-const require_middleware = require("./middleware-Ccpokmfe.cjs");
+const require_middleware = require("./middleware-DOLrvK_b.cjs");
 exports.FederationImpl = require_middleware.FederationImpl;

package/dist/{middleware-Ccpokmfe.cjs → middleware-DOLrvK_b.cjs}

@@ -2,10 +2,10 @@ const { Temporal } = require("@js-temporal/polyfill");
 const { URLPattern } = require("urlpattern-polyfill");
 require("./chunk-DDcVe30Y.cjs");
 const require_transformers = require("./transformers-NeAONrAq.cjs");
-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");
 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");
 let _logtape_logtape = require("@logtape/logtape");
 let _fedify_vocab = require("@fedify/vocab");
 let _opentelemetry_api = require("@opentelemetry/api");
@@ -211,7 +211,7 @@ var FederationBuilderImpl = class {
 		this.collectionTypeIds = {};
 	}
 	async build(options) {
-		const { FederationImpl } = await Promise.resolve().then(() => require("./middleware-DTxZNOqy.cjs"));
+		const { FederationImpl } = await Promise.resolve().then(() => require("./middleware-CibncbiT.cjs"));
 		const f = new FederationImpl(options);
 		const trailingSlashInsensitiveValue = f.router.trailingSlashInsensitive;
 		f.router = this.router.clone();
@@ -786,6 +786,8 @@ var FederationMetrics = class {
 	signatureVerificationFailure;
 	deliveryDuration;
 	inboxProcessingDuration;
+	httpServerRequestCount;
+	httpServerRequestDuration;
 	constructor(meterProvider) {
 		const meter = meterProvider.getMeter(require_http.name, require_http.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.
@@ -3569,6 +3621,8 @@ var FederationImpl = class extends FederationBuilderImpl {
 	fetch(request, options) {
 		return (0, _logtape_logtape.withContext)({ requestId: getRequestId(request) }, async () => {
 			const tracer = this._getTracer();
+			const metricState = {};
+			const metricStart = performance.now();
 			return await tracer.startActiveSpan(request.method, {
 				kind: _opentelemetry_api.SpanKind.SERVER,
 				attributes: {
@@ -3592,10 +3646,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: _opentelemetry_api.SpanStatusCode.ERROR,
 							message: `${error}`
@@ -3608,6 +3664,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(_opentelemetry_semantic_conventions.ATTR_HTTP_RESPONSE_STATUS_CODE, response.status);
 						for (const [k, v] of response.headers) span.setAttribute((0, _opentelemetry_semantic_conventions.ATTR_HTTP_RESPONSE_HEADER)(k), [v]);
@@ -3633,13 +3693,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(/:.*$/, "");
@@ -3660,7 +3725,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": {
@@ -3851,12 +3919,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;