@fedify/fedify 2.3.0-dev.1158 → 2.3.0-dev.1172

package/dist/{builder-B66L9i5E.mjs → builder-JoFBmqfM.mjs}

@@ -1,7 +1,7 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-O_rwum1q.mjs";
+import { n as version, t as name } from "./deno-Cb_y5qEi.mjs";
 import { t as ActivityListenerSet } from "./activity-listener-tztVvlNb.mjs";
 import { getLogger } from "@logtape/logtape";
 import { Router, RouterError, assertPath } from "@fedify/uri-template";
@@ -73,7 +73,7 @@ var FederationBuilderImpl = class {
 		this.collectionTypeIds = {};
 	}
 	async build(options) {
-		const { FederationImpl } = await import("./middleware-BzOa0ncb.mjs");
+		const { FederationImpl } = await import("./middleware-BmPIKmb4.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-C-ZRDbaf.mjs";
 import { t as assertInstanceOf } from "../assert_instance_of-DBC5X09g.mjs";
 import { t as assert } from "../assert-OguE97r2.mjs";
 import { t as MemoryKvStore } from "../kv-x2IvBUyq.mjs";
-import { n as FederationImpl, v as actorDehydrator, y as autoIdAssigner } from "../middleware-xtTRaiJL.mjs";
+import { n as FederationImpl, v as actorDehydrator, y as autoIdAssigner } from "../middleware-DHM2Pjqf.mjs";
 import { Follow, Person } from "@fedify/vocab";
 import { test } from "@fedify/fixture";
 //#region src/compat/transformers.test.ts

package/dist/{deno-O_rwum1q.mjs → deno-Cb_y5qEi.mjs}

@@ -3,6 +3,6 @@ import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 //#region deno.json
 var name = "@fedify/fedify";
-var version = "2.3.0-dev.1158+e7295772";
+var version = "2.3.0-dev.1172+8cc8a23f";
 //#endregion
 export { version as n, name as t };

package/dist/{docloader-Ct8PhKFS.mjs → docloader-Bv4TW6eo.mjs}

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

package/dist/federation/builder.test.mjs

@@ -5,7 +5,7 @@ import { t as assertEquals } from "../assert_equals-C-ZRDbaf.mjs";
 import { r as assertExists } from "../std__assert-BBjXFNOb.mjs";
 import { t as assertThrows } from "../assert_throws-BOkhLGYc.mjs";
 import { t as MemoryKvStore } from "../kv-x2IvBUyq.mjs";
-import { r as createFederationBuilder } from "../builder-B66L9i5E.mjs";
+import { r as createFederationBuilder } from "../builder-JoFBmqfM.mjs";
 import { DisallowedOperatorError, DisallowedVarSpecModifierError, DuplicateRouteVariableError, RouteTemplateOptionsNotMatchedError, RouterError } from "@fedify/uri-template";
 import { Activity, Note, Person } from "@fedify/vocab";
 import { test } from "@fedify/fixture";

package/dist/federation/handler.test.mjs

@@ -8,11 +8,11 @@ import { n as assertGreaterOrEqual, t as assertRejects } from "../assert_rejects
 import { t as assertInstanceOf } from "../assert_instance_of-DBC5X09g.mjs";
 import { t as assert } from "../assert-OguE97r2.mjs";
 import { r as parseAcceptSignature } from "../accept-CceiKpCy.mjs";
-import { s as signRequest } from "../http-BoRhhcgB.mjs";
+import { s as signRequest } from "../http--aE0vk2u.mjs";
 import { a as rsaPrivateKey3, c as rsaPublicKey3, s as rsaPublicKey2 } from "../keys-C3kae-6B.mjs";
-import { a as compactJsonLd, p as signJsonLd } from "../ld-B8wjsKDJ.mjs";
+import { a as compactJsonLd, p as signJsonLd } from "../ld-xVq6y31b.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-xtTRaiJL.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-DHM2Pjqf.mjs";
 import { t as ActivityListenerSet } from "../activity-listener-tztVvlNb.mjs";
 import { Activity, Create, Note, Person, Tombstone } from "@fedify/vocab";
 import { createTestMeterProvider, createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
@@ -928,6 +928,192 @@ test("handleCollection()", async () => {
 	assertEquals(onNotFoundCalled, null);
 	assertEquals(onUnauthorizedCalled, null);
 });
+test("handleCollection() records OpenTelemetry collection metrics", async () => {
+	const [meterProvider, recorder] = createTestMeterProvider();
+	const context = createRequestContext({
+		federation: createFederation({
+			kv: new MemoryKvStore(),
+			meterProvider
+		}),
+		data: void 0,
+		url: new URL("https://example.com/users/someone/followers"),
+		request: new Request("https://example.com/users/someone/followers", { headers: { Accept: "application/activity+json" } }),
+		getActorUri(identifier) {
+			return new URL(`https://example.com/users/${identifier}`);
+		}
+	});
+	const dispatcher = (_ctx, identifier) => identifier === "someone" ? { items: [
+		new Create({ id: new URL("https://example.com/activities/1") }),
+		new Create({ id: new URL("https://example.com/activities/2") }),
+		new Create({ id: new URL("https://example.com/activities/3") })
+	] } : null;
+	const counter = (_ctx, identifier) => identifier === "someone" ? 3 : null;
+	assertEquals((await handleCollection(context.request, {
+		context,
+		name: "followers",
+		identifier: "someone",
+		uriGetter(identifier) {
+			return new URL(`https://example.com/users/${identifier}/followers`);
+		},
+		collectionCallbacks: {
+			dispatcher,
+			counter
+		},
+		meterProvider,
+		onNotFound: () => new Response("Not found", { status: 404 }),
+		onUnauthorized: () => new Response("Unauthorized", { status: 401 })
+	})).status, 200);
+	const requests = recorder.getMeasurements("activitypub.collection.request");
+	assertEquals(requests.length, 1);
+	assertEquals(requests[0].type, "counter");
+	assertEquals(requests[0].value, 1);
+	assertEquals(requests[0].attributes["activitypub.collection.kind"], "followers");
+	assertEquals(requests[0].attributes["activitypub.collection.page"], false);
+	assertEquals(requests[0].attributes["fedify.collection.dispatcher"], "built_in");
+	assertEquals(requests[0].attributes["activitypub.collection.result"], "served");
+	assertEquals(requests[0].attributes["http.response.status_code"], 200);
+	assertEquals("activitypub.collection.id" in requests[0].attributes, false);
+	const durations = recorder.getMeasurements("activitypub.collection.dispatch.duration");
+	assertEquals(durations.length, 1);
+	assertEquals(durations[0].type, "histogram");
+	assert(durations[0].value >= 0);
+	assertEquals(durations[0].attributes["activitypub.collection.result"], "served");
+	const items = recorder.getMeasurements("activitypub.collection.page.items");
+	assertEquals(items.length, 1);
+	assertEquals(items[0].type, "histogram");
+	assertEquals(items[0].value, 3);
+	assertEquals(items[0].attributes["activitypub.collection.page"], false);
+	const totalItems = recorder.getMeasurements("activitypub.collection.total_items");
+	assertEquals(totalItems.length, 1);
+	assertEquals(totalItems[0].type, "histogram");
+	assertEquals(totalItems[0].value, 3);
+});
+test("handleCollection() classifies camelCase collection metric names", async () => {
+	const [meterProvider, recorder] = createTestMeterProvider();
+	const context = createRequestContext({
+		federation: createFederation({
+			kv: new MemoryKvStore(),
+			meterProvider
+		}),
+		data: void 0,
+		url: new URL("https://example.com/users/someone/collections/featured"),
+		request: new Request("https://example.com/users/someone/collections/featured", { headers: { Accept: "application/activity+json" } })
+	});
+	const dispatcher = () => ({ items: [] });
+	assertEquals((await handleCollection(context.request, {
+		context,
+		name: "featuredTags",
+		identifier: "someone",
+		uriGetter(identifier) {
+			return new URL(`https://example.com/users/${identifier}/collections/featured`);
+		},
+		collectionCallbacks: { dispatcher },
+		meterProvider,
+		onNotFound: () => new Response("Not found", { status: 404 }),
+		onUnauthorized: () => new Response("Unauthorized", { status: 401 })
+	})).status, 200);
+	const requests = recorder.getMeasurements("activitypub.collection.request");
+	assertEquals(requests.length, 1);
+	assertEquals(requests[0].attributes["activitypub.collection.kind"], "featured_tags");
+});
+test("handleCollection() records filtered collection item metrics", async () => {
+	const [meterProvider, recorder] = createTestMeterProvider();
+	const context = createRequestContext({
+		federation: createFederation({
+			kv: new MemoryKvStore(),
+			meterProvider
+		}),
+		data: void 0,
+		url: new URL("https://example.com/users/someone/followers"),
+		request: new Request("https://example.com/users/someone/followers", { headers: { Accept: "application/activity+json" } })
+	});
+	const dispatcher = () => ({ items: [new Create({ id: new URL("https://example.com/activities/1") }), new Create({ id: new URL("https://example.com/activities/2") })] });
+	assertEquals((await handleCollection(context.request, {
+		context,
+		name: "followers",
+		identifier: "someone",
+		uriGetter(identifier) {
+			return new URL(`https://example.com/users/${identifier}/followers`);
+		},
+		collectionCallbacks: { dispatcher },
+		filterPredicate: (item) => item.id?.href === "https://example.com/activities/1",
+		meterProvider,
+		onNotFound: () => new Response("Not found", { status: 404 }),
+		onUnauthorized: () => new Response("Unauthorized", { status: 401 })
+	})).status, 200);
+	const items = recorder.getMeasurements("activitypub.collection.page.items");
+	assertEquals(items.length, 1);
+	assertEquals(items[0].value, 1);
+	assertEquals(items[0].attributes["activitypub.collection.page"], false);
+	assertEquals(items[0].attributes["activitypub.collection.result"], "served");
+	assertEquals(items[0].attributes["http.response.status_code"], 200);
+});
+test("handleCollection() records filtered collection page item metrics", async () => {
+	const [meterProvider, recorder] = createTestMeterProvider();
+	const context = createRequestContext({
+		federation: createFederation({
+			kv: new MemoryKvStore(),
+			meterProvider
+		}),
+		data: void 0,
+		url: new URL("https://example.com/users/someone/followers?cursor=2"),
+		request: new Request("https://example.com/users/someone/followers?cursor=2", { headers: { Accept: "application/activity+json" } })
+	});
+	const dispatcher = () => ({ items: [new Create({ id: new URL("https://example.com/activities/1") }), new Create({ id: new URL("https://example.com/activities/2") })] });
+	assertEquals((await handleCollection(context.request, {
+		context,
+		name: "followers",
+		identifier: "someone",
+		uriGetter(identifier) {
+			return new URL(`https://example.com/users/${identifier}/followers`);
+		},
+		collectionCallbacks: { dispatcher },
+		filterPredicate: (item) => item.id?.href === "https://example.com/activities/1",
+		meterProvider,
+		onNotFound: () => new Response("Not found", { status: 404 }),
+		onUnauthorized: () => new Response("Unauthorized", { status: 401 })
+	})).status, 200);
+	const items = recorder.getMeasurements("activitypub.collection.page.items");
+	assertEquals(items.length, 1);
+	assertEquals(items[0].value, 1);
+	assertEquals(items[0].attributes["activitypub.collection.page"], true);
+	assertEquals(items[0].attributes["activitypub.collection.result"], "served");
+	assertEquals(items[0].attributes["http.response.status_code"], 200);
+});
+test("handleCollection() records not_found collection metrics", async () => {
+	const [meterProvider, recorder] = createTestMeterProvider();
+	const context = createRequestContext({
+		federation: createFederation({
+			kv: new MemoryKvStore(),
+			meterProvider
+		}),
+		data: void 0,
+		url: new URL("https://example.com/users/nobody/outbox"),
+		request: new Request("https://example.com/users/nobody/outbox", { headers: { Accept: "application/activity+json" } })
+	});
+	const dispatcher = () => null;
+	assertEquals((await handleCollection(context.request, {
+		context,
+		name: "outbox",
+		identifier: "nobody",
+		uriGetter(identifier) {
+			return new URL(`https://example.com/users/${identifier}/outbox`);
+		},
+		collectionCallbacks: { dispatcher },
+		meterProvider,
+		onNotFound: () => new Response("Not found", { status: 404 }),
+		onUnauthorized: () => new Response("Unauthorized", { status: 401 })
+	})).status, 404);
+	const requests = recorder.getMeasurements("activitypub.collection.request");
+	assertEquals(requests.length, 1);
+	assertEquals(requests[0].attributes["activitypub.collection.kind"], "outbox");
+	assertEquals(requests[0].attributes["activitypub.collection.result"], "not_found");
+	assertEquals(requests[0].attributes["http.response.status_code"], 404);
+	const durations = recorder.getMeasurements("activitypub.collection.dispatch.duration");
+	assertEquals(durations.length, 1);
+	assertEquals(durations[0].attributes["activitypub.collection.result"], "not_found");
+	assertEquals(recorder.getMeasurements("activitypub.collection.page.items").length, 0);
+});
 test("handleInbox()", async () => {
 	const activity = new Create({
 		id: new URL("https://example.com/activities/1"),
@@ -3228,6 +3414,122 @@ test("handleCustomCollection()", async () => {
 	assertEquals(onNotFoundCalled, null);
 	assertEquals(onUnauthorizedCalled, null);
 });
+test("handleCustomCollection() records OpenTelemetry collection metrics", async () => {
+	const [meterProvider, recorder] = createTestMeterProvider();
+	const context = createRequestContext({
+		federation: createFederation({
+			kv: new MemoryKvStore(),
+			meterProvider
+		}),
+		data: void 0,
+		url: new URL("https://example.com/users/someone/custom"),
+		request: new Request("https://example.com/users/someone/custom", { headers: { Accept: "application/activity+json" } })
+	});
+	const dispatcher = (_ctx, values) => values.identifier === "someone" ? { items: [new Create({ id: new URL("https://example.com/activities/1") }), new Create({ id: new URL("https://example.com/activities/2") })] } : null;
+	const counter = (_ctx, values) => values.identifier === "someone" ? 2 : null;
+	assertEquals((await handleCustomCollection(context.request, {
+		context,
+		name: "custom collection",
+		values: { identifier: "someone" },
+		collectionCallbacks: {
+			dispatcher,
+			counter
+		},
+		filterPredicate: (item) => item.id?.href === "https://example.com/activities/1",
+		meterProvider,
+		onNotFound: () => new Response("Not found", { status: 404 }),
+		onUnauthorized: () => new Response("Unauthorized", { status: 401 })
+	})).status, 200);
+	const requests = recorder.getMeasurements("activitypub.collection.request");
+	assertEquals(requests.length, 1);
+	assertEquals(requests[0].attributes["activitypub.collection.kind"], "custom");
+	assertEquals(requests[0].attributes["activitypub.collection.page"], false);
+	assertEquals(requests[0].attributes["fedify.collection.dispatcher"], "custom");
+	assertEquals(requests[0].attributes["activitypub.collection.result"], "served");
+	assertEquals(requests[0].attributes["http.response.status_code"], 200);
+	const durations = recorder.getMeasurements("activitypub.collection.dispatch.duration");
+	assertEquals(durations.length, 1);
+	assertEquals(durations[0].attributes["fedify.collection.dispatcher"], "custom");
+	assertEquals(durations[0].attributes["http.response.status_code"], 200);
+	const items = recorder.getMeasurements("activitypub.collection.page.items");
+	assertEquals(items.length, 1);
+	assertEquals(items[0].value, 1);
+	assertEquals(items[0].attributes["http.response.status_code"], 200);
+	const totalItems = recorder.getMeasurements("activitypub.collection.total_items");
+	assertEquals(totalItems.length, 1);
+	assertEquals(totalItems[0].value, 2);
+	assertEquals(totalItems[0].attributes["http.response.status_code"], 200);
+});
+test("handleCustomCollection() records not_found status on dispatch metrics", async () => {
+	const [meterProvider, recorder] = createTestMeterProvider();
+	const context = createRequestContext({
+		federation: createFederation({
+			kv: new MemoryKvStore(),
+			meterProvider
+		}),
+		data: void 0,
+		url: new URL("https://example.com/users/nobody/custom"),
+		request: new Request("https://example.com/users/nobody/custom", { headers: { Accept: "application/activity+json" } })
+	});
+	const dispatcher = () => null;
+	assertEquals((await handleCustomCollection(context.request, {
+		context,
+		name: "custom collection",
+		values: { identifier: "nobody" },
+		collectionCallbacks: { dispatcher },
+		meterProvider,
+		onNotFound: () => new Response("Not found", { status: 404 }),
+		onUnauthorized: () => new Response("Unauthorized", { status: 401 })
+	})).status, 404);
+	const durations = recorder.getMeasurements("activitypub.collection.dispatch.duration");
+	assertEquals(durations.length, 1);
+	assertEquals(durations[0].attributes["activitypub.collection.result"], "not_found");
+	assertEquals(durations[0].attributes["http.response.status_code"], 404);
+});
+test("handleCustomCollection() classifies deferred collection metrics as error", async () => {
+	const [meterProvider, recorder] = createTestMeterProvider();
+	const context = createRequestContext({
+		federation: createFederation({
+			kv: new MemoryKvStore(),
+			meterProvider
+		}),
+		data: void 0,
+		url: new URL("https://example.com/users/someone/custom"),
+		request: new Request("https://example.com/users/someone/custom", { headers: { Accept: "application/activity+json" } })
+	});
+	const brokenActivity = new Create({ id: new URL("https://example.com/activities/1") });
+	globalThis.Object.defineProperty(brokenActivity, "toJsonLd", { value: () => {
+		throw new Error("serialization failed");
+	} });
+	const dispatcher = () => ({ items: [brokenActivity] });
+	const counter = () => 1;
+	await assertRejects(() => handleCustomCollection(context.request, {
+		context,
+		name: "custom collection",
+		values: { identifier: "someone" },
+		collectionCallbacks: {
+			dispatcher,
+			counter
+		},
+		meterProvider,
+		onNotFound: () => new Response("Not found", { status: 404 }),
+		onUnauthorized: () => new Response("Unauthorized", { status: 401 })
+	}), Error, "serialization failed");
+	const requests = recorder.getMeasurements("activitypub.collection.request");
+	assertEquals(requests.length, 1);
+	assertEquals(requests[0].attributes["activitypub.collection.result"], "error");
+	const durations = recorder.getMeasurements("activitypub.collection.dispatch.duration");
+	assertEquals(durations.length, 1);
+	assertEquals(durations[0].attributes["activitypub.collection.result"], "error");
+	const items = recorder.getMeasurements("activitypub.collection.page.items");
+	assertEquals(items.length, 1);
+	assertEquals(items[0].value, 1);
+	assertEquals(items[0].attributes["activitypub.collection.result"], "error");
+	const totalItems = recorder.getMeasurements("activitypub.collection.total_items");
+	assertEquals(totalItems.length, 1);
+	assertEquals(totalItems[0].value, 1);
+	assertEquals(totalItems[0].attributes["activitypub.collection.result"], "error");
+});
 test("handleInbox() records OpenTelemetry span events", async () => {
 	const [tracerProvider, exporter] = createTestTracerProvider();
 	const [meterProvider, recorder] = createTestMeterProvider();

package/dist/federation/idempotency.test.mjs

@@ -4,9 +4,9 @@ globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-C-ZRDbaf.mjs";
 import "../std__assert-BBjXFNOb.mjs";
 import { n as ed25519PrivateKey, r as ed25519PublicKey, t as ed25519Multikey } from "../keys-C3kae-6B.mjs";
-import { r as signObject } from "../proof-42Q9NiqN.mjs";
+import { r as signObject } from "../proof-1XBgQ0Z0.mjs";
 import { t as MemoryKvStore } from "../kv-x2IvBUyq.mjs";
-import { o as createFederation } from "../middleware-xtTRaiJL.mjs";
+import { o as createFederation } from "../middleware-DHM2Pjqf.mjs";
 import { Create, Follow, Person } from "@fedify/vocab";
 import { mockDocumentLoader, test } from "@fedify/fixture";
 //#region src/federation/idempotency.test.ts

package/dist/federation/metrics.test.mjs

@@ -4,7 +4,7 @@ globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-C-ZRDbaf.mjs";
 import "../std__assert-BBjXFNOb.mjs";
 import { t as assertRejects } from "../assert_rejects-DN60FHPX.mjs";
-import { a as instrumentDocumentLoader, c as recordDocumentCache, d as recordInboxActivity, f as recordKeyLookup, h as recordWebFingerHandle, l as recordDocumentFetch, m as recordOutboxEnqueue, p as recordOutboxActivity, t as classifyFetchError, u as recordFanoutRecipients } from "../metrics-oMUWaw6W.mjs";
+import { _ as recordOutboxActivity, a as instrumentDocumentLoader, c as recordCollectionDispatchDuration, d as recordCollectionTotalItems, f as recordDocumentCache, g as recordKeyLookup, h as recordInboxActivity, l as recordCollectionPageItems, m as recordFanoutRecipients, p as recordDocumentFetch, t as classifyFetchError, u as recordCollectionRequest, v as recordOutboxEnqueue, y as recordWebFingerHandle } from "../metrics-CKticT28.mjs";
 import { createTestMeterProvider, test } from "@fedify/fixture";
 import { FetchError } from "@fedify/vocab-runtime";
 //#region src/federation/metrics.test.ts
@@ -272,6 +272,85 @@ test("recordWebFingerHandle() omits optional attributes when not provided", () =
 	assertEquals("webfinger.resource.scheme" in (counter?.attributes ?? {}), false);
 	assertEquals("http.response.status_code" in (counter?.attributes ?? {}), false);
 });
+test("recordCollectionRequest() records counter with bounded attributes", () => {
+	const [meterProvider, recorder] = createTestMeterProvider();
+	recordCollectionRequest(meterProvider, {
+		kind: "followers",
+		page: true,
+		dispatcher: "built_in",
+		result: "served",
+		statusCode: 200
+	});
+	const counter = recorder.getMeasurement("activitypub.collection.request");
+	assertEquals(counter?.type, "counter");
+	assertEquals(counter?.value, 1);
+	assertEquals(counter?.attributes["activitypub.collection.kind"], "followers");
+	assertEquals(counter?.attributes["activitypub.collection.page"], true);
+	assertEquals(counter?.attributes["fedify.collection.dispatcher"], "built_in");
+	assertEquals(counter?.attributes["activitypub.collection.result"], "served");
+	assertEquals(counter?.attributes["http.response.status_code"], 200);
+});
+test("recordCollectionRequest() omits status code when unavailable", () => {
+	const [meterProvider, recorder] = createTestMeterProvider();
+	recordCollectionRequest(meterProvider, {
+		kind: "custom",
+		page: false,
+		dispatcher: "custom",
+		result: "error"
+	});
+	const counter = recorder.getMeasurement("activitypub.collection.request");
+	assertEquals(counter?.attributes["activitypub.collection.kind"], "custom");
+	assertEquals(counter?.attributes["activitypub.collection.page"], false);
+	assertEquals(counter?.attributes["fedify.collection.dispatcher"], "custom");
+	assertEquals(counter?.attributes["activitypub.collection.result"], "error");
+	assertEquals("http.response.status_code" in (counter?.attributes ?? {}), false);
+});
+test("recordCollectionDispatchDuration() records histogram", () => {
+	const [meterProvider, recorder] = createTestMeterProvider();
+	recordCollectionDispatchDuration(meterProvider, 12, {
+		kind: "outbox",
+		page: false,
+		dispatcher: "built_in",
+		result: "served"
+	});
+	const duration = recorder.getMeasurement("activitypub.collection.dispatch.duration");
+	assertEquals(duration?.type, "histogram");
+	assertEquals(duration?.value, 12);
+	assertEquals(duration?.attributes["activitypub.collection.kind"], "outbox");
+	assertEquals(duration?.attributes["activitypub.collection.page"], false);
+	assertEquals(duration?.attributes["fedify.collection.dispatcher"], "built_in");
+	assertEquals(duration?.attributes["activitypub.collection.result"], "served");
+});
+test("recordCollectionPageItems() records item count histogram", () => {
+	const [meterProvider, recorder] = createTestMeterProvider();
+	recordCollectionPageItems(meterProvider, 3, {
+		kind: "featured_tags",
+		page: true,
+		dispatcher: "built_in",
+		result: "served",
+		statusCode: 200
+	});
+	const items = recorder.getMeasurement("activitypub.collection.page.items");
+	assertEquals(items?.type, "histogram");
+	assertEquals(items?.value, 3);
+	assertEquals(items?.attributes["activitypub.collection.kind"], "featured_tags");
+	assertEquals(items?.attributes["activitypub.collection.page"], true);
+	assertEquals(items?.attributes["http.response.status_code"], 200);
+});
+test("recordCollectionTotalItems() records total item histogram", () => {
+	const [meterProvider, recorder] = createTestMeterProvider();
+	recordCollectionTotalItems(meterProvider, 42, {
+		kind: "liked",
+		page: false,
+		dispatcher: "built_in",
+		result: "served"
+	});
+	const total = recorder.getMeasurement("activitypub.collection.total_items");
+	assertEquals(total?.type, "histogram");
+	assertEquals(total?.value, 42);
+	assertEquals(total?.attributes["activitypub.collection.kind"], "liked");
+	assertEquals(total?.attributes["activitypub.collection.page"], false);
+});
 test("classifyFetchError() classifies FetchError with 404 as not_found", () => {
 	assertEquals(classifyFetchError(new FetchError("https://example.com/k", "not found", new Response("", { status: 404 }))), {
 		result: "not_found",

package/dist/federation/middleware.test.mjs

@@ -10,14 +10,14 @@ import { t as assertNotEquals } from "../assert_not_equals-DkVK8oqV.mjs";
 import { t as assertStrictEquals } from "../assert_strict_equals-XEgZAlrj.mjs";
 import { t as assert } from "../assert-OguE97r2.mjs";
 import { t as esm_default } from "../esm-BQRw925N.mjs";
-import { l as verifyRequest, s as signRequest } from "../http-BoRhhcgB.mjs";
+import { l as verifyRequest, s as signRequest } from "../http--aE0vk2u.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-Ct8PhKFS.mjs";
-import { a as compactJsonLd, h as verifyJsonLd, p as signJsonLd, s as detachSignature } from "../ld-B8wjsKDJ.mjs";
-import { t as doesActorOwnKey } from "../owner-BxjgK8PG.mjs";
-import { i as verifyObject, r as signObject } from "../proof-42Q9NiqN.mjs";
+import { t as getAuthenticatedDocumentLoader } from "../docloader-Bv4TW6eo.mjs";
+import { a as compactJsonLd, h as verifyJsonLd, p as signJsonLd, s as detachSignature } from "../ld-xVq6y31b.mjs";
+import { t as doesActorOwnKey } from "../owner-DmU2qEh_.mjs";
+import { i as verifyObject, r as signObject } from "../proof-1XBgQ0Z0.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-xtTRaiJL.mjs";
+import { i as KvSpecDeterminer, n as FederationImpl, o as createFederation, r as InboxContextImpl, t as ContextImpl } from "../middleware-DHM2Pjqf.mjs";
 import { configure, reset } from "@logtape/logtape";
 import { RouterError } from "@fedify/uri-template";
 import * as vocab from "@fedify/vocab";
@@ -1074,6 +1074,20 @@ test("Federation.fetch() records HTTP server request metrics", async (t) => {
 		assertEquals(counts[0].attributes["http.response.status_code"], 406);
 		assertEquals(counts[0].attributes["fedify.route.template"], "/users/{identifier}");
 	});
+	await t.step("records collection metrics for not_acceptable collection requests", async () => {
+		const { federation, recorder } = createTestContext();
+		assertEquals((await federation.fetch(new Request("https://example.com/users/alice/followers", {
+			method: "GET",
+			headers: { "Accept": "text/html" }
+		}), { contextData: void 0 })).status, 406);
+		const requests = recorder.getMeasurements("activitypub.collection.request");
+		assertEquals(requests.length, 1);
+		assertEquals(requests[0].attributes["activitypub.collection.kind"], "followers");
+		assertEquals(requests[0].attributes["activitypub.collection.page"], false);
+		assertEquals(requests[0].attributes["fedify.collection.dispatcher"], "built_in");
+		assertEquals(requests[0].attributes["activitypub.collection.result"], "not_acceptable");
+		assertEquals(requests[0].attributes["http.response.status_code"], 406);
+	});
 	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", {

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-CcJyVEpv.cjs");
+const require_middleware = require("../middleware-hxnyAewn.cjs");
 let _logtape_logtape = require("@logtape/logtape");
 let _fedify_uri_template = require("@fedify/uri-template");
 let es_toolkit = require("es-toolkit");

package/dist/federation/mod.js

@@ -1,6 +1,6 @@
 import { Temporal } from "@js-temporal/polyfill";
 import { URLPattern } from "urlpattern-polyfill";
-import { a as createExponentialBackoffPolicy, c as buildCollectionSynchronizationHeader, i as SendActivityError, l as digest, o as respondWithObject, r as handleWebFinger, s as respondWithObjectIfAcceptable, t as createFederation, u as createFederationBuilder } from "../middleware-DwZ1ofL9.js";
+import { a as createExponentialBackoffPolicy, c as buildCollectionSynchronizationHeader, i as SendActivityError, l as digest, o as respondWithObject, r as handleWebFinger, s as respondWithObjectIfAcceptable, t as createFederation, u as createFederationBuilder } from "../middleware-BSuEI4Qf.js";
 import { getLogger } from "@logtape/logtape";
 import { Router as Router$1, RouterError as RouterError$1, assertPath, isPath } from "@fedify/uri-template";
 import { isEqual } from "es-toolkit";

package/dist/federation/send.test.mjs

@@ -9,10 +9,10 @@ import { t as assertInstanceOf } from "../assert_instance_of-DBC5X09g.mjs";
 import { t as assertNotEquals } from "../assert_not_equals-DkVK8oqV.mjs";
 import { t as assert } from "../assert-OguE97r2.mjs";
 import { t as esm_default } from "../esm-BQRw925N.mjs";
-import { l as verifyRequest } from "../http-BoRhhcgB.mjs";
+import { l as verifyRequest } from "../http--aE0vk2u.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-BxjgK8PG.mjs";
-import { n as extractInboxes, r as sendActivity, t as SendActivityError } from "../send-R1_K46CH.mjs";
+import { t as doesActorOwnKey } from "../owner-DmU2qEh_.mjs";
+import { n as extractInboxes, r as sendActivity, t as SendActivityError } from "../send-CmtB8w5D.mjs";
 import { Activity, Application, Endpoints, Group, Person, Service } from "@fedify/vocab";
 import { createTestMeterProvider, createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
 //#region ../../node_modules/.pnpm/@opentelemetry+sdk-metrics@2.7.1_@opentelemetry+api@1.9.1/node_modules/@opentelemetry/sdk-metrics/build/src/export/AggregationTemporality.js

package/dist/federation/temporal.test.mjs

@@ -4,7 +4,7 @@ globalThis.addEventListener = () => {};
 import "../std__assert-BBjXFNOb.mjs";
 import { r as assertFalse } from "../assert_rejects-DN60FHPX.mjs";
 import { t as assert } from "../assert-OguE97r2.mjs";
-import { t as hasMalformedKnownTemporalLiteral } from "../temporal-8kDX3E4q.mjs";
+import { t as hasMalformedKnownTemporalLiteral } from "../temporal-DE9_a2nI.mjs";
 import { test } from "@fedify/fixture";
 //#region src/federation/temporal.test.ts
 test("hasMalformedKnownTemporalLiteral() detects expanded proof timestamps", async () => {

package/dist/federation/webfinger.test.mjs

@@ -6,7 +6,7 @@ import { t as assertEquals } from "../assert_equals-C-ZRDbaf.mjs";
 import "../std__assert-BBjXFNOb.mjs";
 import { t as assertNotEquals } from "../assert_not_equals-DkVK8oqV.mjs";
 import { t as MemoryKvStore } from "../kv-x2IvBUyq.mjs";
-import { o as createFederation, s as handleWebFinger } from "../middleware-xtTRaiJL.mjs";
+import { o as createFederation, s as handleWebFinger } from "../middleware-DHM2Pjqf.mjs";
 import { Image, Link, Person, Tombstone } from "@fedify/vocab";
 import { createTestMeterProvider, test } from "@fedify/fixture";
 //#region src/federation/webfinger.test.ts

package/dist/{http-BoRhhcgB.mjs → http--aE0vk2u.mjs}

@@ -1,10 +1,10 @@
 import { Temporal } from "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-O_rwum1q.mjs";
-import { n as getDurationMs, r as getFederationMetrics, s as measureSignatureKeyFetch } from "./metrics-oMUWaw6W.mjs";
+import { n as version, t as name } from "./deno-Cb_y5qEi.mjs";
+import { n as getDurationMs, r as getFederationMetrics, s as measureSignatureKeyFetch } from "./metrics-CKticT28.mjs";
 import { i as validateAcceptSignature, n as fulfillAcceptSignature, r as parseAcceptSignature } from "./accept-CceiKpCy.mjs";
-import { o as validateCryptoKey, r as fetchKeyDetailed } from "./key-DyATZSWG.mjs";
+import { o as validateCryptoKey, r as fetchKeyDetailed } from "./key-Cl_bixZo.mjs";
 import { getLogger } from "@logtape/logtape";
 import { CryptographicKey } from "@fedify/vocab";
 import { SpanStatusCode, trace } from "@opentelemetry/api";