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

package/dist/{middleware-xtTRaiJL.mjs → middleware-DHM2Pjqf.mjs}

@@ -1,26 +1,26 @@
 import { Temporal } from "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-O_rwum1q.mjs";
-import { a as instrumentDocumentLoader, d as recordInboxActivity, h as recordWebFingerHandle, i as getRemoteHost, m as recordOutboxEnqueue, n as getDurationMs, o as isAbortError, p as recordOutboxActivity, r as getFederationMetrics, u as recordFanoutRecipients } from "./metrics-oMUWaw6W.mjs";
+import { n as version, t as name } from "./deno-Cb_y5qEi.mjs";
+import { _ as recordOutboxActivity, a as instrumentDocumentLoader, c as recordCollectionDispatchDuration, d as recordCollectionTotalItems, h as recordInboxActivity, i as getRemoteHost, l as recordCollectionPageItems, m as recordFanoutRecipients, n as getDurationMs, o as isAbortError, r as getFederationMetrics, u as recordCollectionRequest, v as recordOutboxEnqueue, y as recordWebFingerHandle } from "./metrics-CKticT28.mjs";
 import { t as formatAcceptSignature } from "./accept-CceiKpCy.mjs";
-import { a as importJwk, o as validateCryptoKey, t as exportJwk } from "./key-DyATZSWG.mjs";
-import { l as verifyRequest, o as parseRfc9421SignatureInput, u as verifyRequestDetailed } from "./http-BoRhhcgB.mjs";
-import { t as getAuthenticatedDocumentLoader } from "./docloader-Ct8PhKFS.mjs";
-import { n as kvCache } from "./kv-cache-DeJE8EeD.mjs";
-import { _ as wrapContextLoaderForJsonLd, a as compactJsonLd, c as getNormalizationContextLoader, d as isClearlyMalformedContextReference, f as isInvalidUrlTypeError, l as hasSignature, m as verifyCompactJsonLd, p as signJsonLd, r as assertSafeJsonLd, s as detachSignature, t as InvalidContextReferenceError, u as hasSignatureLike } from "./ld-B8wjsKDJ.mjs";
-import { n as getKeyOwner, t as doesActorOwnKey } from "./owner-BxjgK8PG.mjs";
+import { a as importJwk, o as validateCryptoKey, t as exportJwk } from "./key-Cl_bixZo.mjs";
+import { l as verifyRequest, o as parseRfc9421SignatureInput, u as verifyRequestDetailed } from "./http--aE0vk2u.mjs";
+import { t as getAuthenticatedDocumentLoader } from "./docloader-Bv4TW6eo.mjs";
+import { n as kvCache } from "./kv-cache-DQUblF4f.mjs";
+import { _ as wrapContextLoaderForJsonLd, a as compactJsonLd, c as getNormalizationContextLoader, d as isClearlyMalformedContextReference, f as isInvalidUrlTypeError, l as hasSignature, m as verifyCompactJsonLd, p as signJsonLd, r as assertSafeJsonLd, s as detachSignature, t as InvalidContextReferenceError, u as hasSignatureLike } from "./ld-xVq6y31b.mjs";
+import { n as getKeyOwner, t as doesActorOwnKey } from "./owner-DmU2qEh_.mjs";
 import { r as normalizeOutgoingActivityJsonLd } from "./outgoing-jsonld-BgFLCJQ_.mjs";
-import { i as verifyObject, n as hasProofLike, r as signObject } from "./proof-42Q9NiqN.mjs";
+import { i as verifyObject, n as hasProofLike, r as signObject } from "./proof-1XBgQ0Z0.mjs";
 import { t as getNodeInfo } from "./client-B_A6mfn3.mjs";
 import { t as nodeInfoToJson } from "./types-BFowWFTT.mjs";
-import { n as FederationBuilderImpl, t as ACTOR_ALIAS_PREFIX } from "./builder-B66L9i5E.mjs";
+import { n as FederationBuilderImpl, t as ACTOR_ALIAS_PREFIX } from "./builder-JoFBmqfM.mjs";
 import { t as buildCollectionSynchronizationHeader } from "./collection-CA3V5zyK.mjs";
 import { t as KvKeyCache } from "./keycache-BYMd8q7F.mjs";
 import { t as acceptsJsonLd } from "./negotiation-CDW-_gUU.mjs";
-import { t as hasMalformedKnownTemporalLiteral } from "./temporal-8kDX3E4q.mjs";
+import { t as hasMalformedKnownTemporalLiteral } from "./temporal-DE9_a2nI.mjs";
 import { t as createExponentialBackoffPolicy } from "./retry-_VvV0h9f.mjs";
-import { n as extractInboxes, r as sendActivity, t as SendActivityError } from "./send-R1_K46CH.mjs";
+import { n as extractInboxes, r as sendActivity, t as SendActivityError } from "./send-CmtB8w5D.mjs";
 import { getLogger, withContext } from "@logtape/logtape";
 import { RouterError } from "@fedify/uri-template";
 import { Activity, Collection, CollectionPage, CryptographicKey, Link, Multikey, Object as Object$1, OrderedCollection, OrderedCollectionPage, Tombstone, getTypeId, lookupObject, traverseCollection } from "@fedify/vocab";
@@ -402,6 +402,33 @@ async function handleObject(request, { values, context, objectDispatcher, author
 		Vary: "Accept"
 	} });
 }
+const BUILT_IN_COLLECTION_METRIC_KINDS = new Set([
+	"inbox",
+	"outbox",
+	"following",
+	"followers",
+	"liked",
+	"featured",
+	"featured_tags"
+]);
+function getCollectionMetricKind(name) {
+	const normalized = name.trim().replace(/([a-z0-9])([A-Z])/g, "$1_$2").toLowerCase().replace(/\s+/g, "_");
+	return BUILT_IN_COLLECTION_METRIC_KINDS.has(normalized) ? normalized : "custom";
+}
+function collectionAttributes(base, result, response) {
+	return {
+		...base,
+		result,
+		...response == null ? {} : { statusCode: response.status }
+	};
+}
+function recordCollectionMetrics(meterProvider, base, result, options = {}) {
+	const attrs = collectionAttributes(base, result, options.response);
+	recordCollectionRequest(meterProvider, attrs);
+	if (options.dispatchDurationMs != null) recordCollectionDispatchDuration(meterProvider, options.dispatchDurationMs, attrs);
+	if (options.itemCount != null) recordCollectionPageItems(meterProvider, options.itemCount, attrs);
+	if (options.totalItems != null) recordCollectionTotalItems(meterProvider, options.totalItems, attrs);
+}
 /**
 * Handles a collection request.
 * @template TItem The type of items in the collection.
@@ -412,36 +439,118 @@ async function handleObject(request, { values, context, objectDispatcher, author
 * @param parameters The parameters for handling the collection.
 * @returns A promise that resolves to an HTTP response.
 */
-async function handleCollection(request, { name: name$1, identifier, uriGetter, filter, filterPredicate, context, collectionCallbacks, tracerProvider, onUnauthorized, onNotFound }) {
+async function handleCollection(request, { name: name$1, identifier, uriGetter, filter, filterPredicate, context, collectionCallbacks, tracerProvider, meterProvider, onUnauthorized, onNotFound }) {
 	const spanName = name$1.trim().replace(/\s+/g, "_");
 	tracerProvider = tracerProvider ?? trace.getTracerProvider();
 	const tracer = tracerProvider.getTracer(name, version);
 	const cursor = new URL(request.url).searchParams.get("cursor");
-	if (collectionCallbacks == null) return await onNotFound(request);
-	let collection;
-	const baseUri = uriGetter(identifier);
-	if (cursor == null) {
-		const firstCursor = await collectionCallbacks.firstCursor?.(context, identifier);
-		const totalItems = filter == null ? await collectionCallbacks.counter?.(context, identifier) : void 0;
-		if (firstCursor == null) {
-			const itemsOrResponse = await tracer.startActiveSpan(`activitypub.dispatch_collection ${spanName}`, {
+	const metricBase = {
+		kind: getCollectionMetricKind(name$1),
+		page: cursor != null,
+		dispatcher: "built_in"
+	};
+	let dispatchDurationMs;
+	let itemCount;
+	let totalItemCount;
+	const finish = (response, result) => {
+		recordCollectionMetrics(meterProvider, metricBase, result, {
+			response,
+			dispatchDurationMs,
+			itemCount,
+			totalItems: totalItemCount
+		});
+		return response;
+	};
+	try {
+		if (collectionCallbacks == null) return finish(await onNotFound(request), "not_found");
+		let collection;
+		const baseUri = uriGetter(identifier);
+		if (cursor == null) {
+			const firstCursor = await collectionCallbacks.firstCursor?.(context, identifier);
+			const totalItems = filter == null ? await collectionCallbacks.counter?.(context, identifier) : void 0;
+			totalItemCount = totalItems == null ? void 0 : Number(totalItems);
+			if (firstCursor == null) {
+				const itemsOrResponse = await tracer.startActiveSpan(`activitypub.dispatch_collection ${spanName}`, {
+					kind: SpanKind.SERVER,
+					attributes: {
+						"activitypub.collection.id": baseUri.href,
+						"activitypub.collection.type": OrderedCollection.typeId.href
+					}
+				}, async (span) => {
+					if (totalItemCount != null) span.setAttribute("activitypub.collection.total_items", totalItemCount);
+					const started = performance.now();
+					try {
+						const page = await collectionCallbacks.dispatcher(context, identifier, null, filter);
+						dispatchDurationMs = getDurationMs(started);
+						if (page == null) {
+							span.setStatus({ code: SpanStatusCode.ERROR });
+							return await onNotFound(request);
+						}
+						const items = filterCollectionItems(page.items, name$1, filterPredicate);
+						itemCount = items.length;
+						span.setAttribute("fedify.collection.items", itemCount);
+						return items;
+					} catch (e) {
+						if (dispatchDurationMs == null) dispatchDurationMs = getDurationMs(started);
+						span.setStatus({
+							code: SpanStatusCode.ERROR,
+							message: String(e)
+						});
+						throw e;
+					} finally {
+						span.end();
+					}
+				});
+				if (itemsOrResponse instanceof Response) return finish(itemsOrResponse, "not_found");
+				collection = new OrderedCollection({
+					id: baseUri,
+					totalItems: totalItemCount ?? null,
+					items: itemsOrResponse
+				});
+			} else {
+				const lastCursor = await collectionCallbacks.lastCursor?.(context, identifier);
+				const first = new URL(context.url);
+				first.searchParams.set("cursor", firstCursor);
+				let last = null;
+				if (lastCursor != null) {
+					last = new URL(context.url);
+					last.searchParams.set("cursor", lastCursor);
+				}
+				collection = new OrderedCollection({
+					id: baseUri,
+					totalItems: totalItemCount ?? null,
+					first,
+					last
+				});
+			}
+		} else {
+			const uri = new URL(baseUri);
+			uri.searchParams.set("cursor", cursor);
+			const pageOrResponse = await tracer.startActiveSpan(`activitypub.dispatch_collection_page ${name$1}`, {
 				kind: SpanKind.SERVER,
 				attributes: {
-					"activitypub.collection.id": baseUri.href,
-					"activitypub.collection.type": OrderedCollection.typeId.href
+					"activitypub.collection.id": uri.href,
+					"activitypub.collection.type": OrderedCollectionPage.typeId.href,
+					"fedify.collection.cursor": cursor
 				}
 			}, async (span) => {
-				if (totalItems != null) span.setAttribute("activitypub.collection.total_items", Number(totalItems));
+				const started = performance.now();
 				try {
-					const page = await collectionCallbacks.dispatcher(context, identifier, null, filter);
+					const page = await collectionCallbacks.dispatcher(context, identifier, cursor, filter);
+					dispatchDurationMs = getDurationMs(started);
 					if (page == null) {
 						span.setStatus({ code: SpanStatusCode.ERROR });
 						return await onNotFound(request);
 					}
-					const { items } = page;
-					span.setAttribute("fedify.collection.items", items.length);
-					return items;
+					const items = filterCollectionItems(page.items, name$1, filterPredicate);
+					itemCount = items.length;
+					span.setAttribute("fedify.collection.items", itemCount);
+					return {
+						...page,
+						items
+					};
 				} catch (e) {
+					if (dispatchDurationMs == null) dispatchDurationMs = getDurationMs(started);
 					span.setStatus({
 						code: SpanStatusCode.ERROR,
 						message: String(e)
@@ -451,87 +560,44 @@ async function handleCollection(request, { name: name$1, identifier, uriGetter,
 					span.end();
 				}
 			});
-			if (itemsOrResponse instanceof Response) return itemsOrResponse;
-			collection = new OrderedCollection({
-				id: baseUri,
-				totalItems: totalItems == null ? null : Number(totalItems),
-				items: filterCollectionItems(itemsOrResponse, name$1, filterPredicate)
-			});
-		} else {
-			const lastCursor = await collectionCallbacks.lastCursor?.(context, identifier);
-			const first = new URL(context.url);
-			first.searchParams.set("cursor", firstCursor);
-			let last = null;
-			if (lastCursor != null) {
-				last = new URL(context.url);
-				last.searchParams.set("cursor", lastCursor);
+			if (pageOrResponse instanceof Response) return finish(pageOrResponse, "not_found");
+			const { items, prevCursor, nextCursor } = pageOrResponse;
+			let prev = null;
+			if (prevCursor != null) {
+				prev = new URL(context.url);
+				prev.searchParams.set("cursor", prevCursor);
 			}
-			collection = new OrderedCollection({
-				id: baseUri,
-				totalItems: totalItems == null ? null : Number(totalItems),
-				first,
-				last
-			});
-		}
-	} else {
-		const uri = new URL(baseUri);
-		uri.searchParams.set("cursor", cursor);
-		const pageOrResponse = await tracer.startActiveSpan(`activitypub.dispatch_collection_page ${name$1}`, {
-			kind: SpanKind.SERVER,
-			attributes: {
-				"activitypub.collection.id": uri.href,
-				"activitypub.collection.type": OrderedCollectionPage.typeId.href,
-				"fedify.collection.cursor": cursor
+			let next = null;
+			if (nextCursor != null) {
+				next = new URL(context.url);
+				next.searchParams.set("cursor", nextCursor);
 			}
-		}, async (span) => {
-			try {
-				const page = await collectionCallbacks.dispatcher(context, identifier, cursor, filter);
-				if (page == null) {
-					span.setStatus({ code: SpanStatusCode.ERROR });
-					return await onNotFound(request);
-				}
-				span.setAttribute("fedify.collection.items", page.items.length);
-				return page;
-			} catch (e) {
-				span.setStatus({
-					code: SpanStatusCode.ERROR,
-					message: String(e)
-				});
-				throw e;
-			} finally {
-				span.end();
-			}
-		});
-		if (pageOrResponse instanceof Response) return pageOrResponse;
-		const { items, prevCursor, nextCursor } = pageOrResponse;
-		let prev = null;
-		if (prevCursor != null) {
-			prev = new URL(context.url);
-			prev.searchParams.set("cursor", prevCursor);
+			const partOf = new URL(context.url);
+			partOf.searchParams.delete("cursor");
+			collection = new OrderedCollectionPage({
+				id: uri,
+				prev,
+				next,
+				items,
+				partOf
+			});
 		}
-		let next = null;
-		if (nextCursor != null) {
-			next = new URL(context.url);
-			next.searchParams.set("cursor", nextCursor);
+		if (collectionCallbacks.authorizePredicate != null) {
+			if (!await collectionCallbacks.authorizePredicate(context, identifier)) return finish(await onUnauthorized(request), "unauthorized");
 		}
-		const partOf = new URL(context.url);
-		partOf.searchParams.delete("cursor");
-		collection = new OrderedCollectionPage({
-			id: uri,
-			prev,
-			next,
-			items: filterCollectionItems(items, name$1, filterPredicate),
-			partOf
+		const jsonLd = await collection.toJsonLd(context);
+		return finish(new Response(JSON.stringify(jsonLd), { headers: {
+			"Content-Type": "application/activity+json",
+			Vary: "Accept"
+		} }), "served");
+	} catch (e) {
+		recordCollectionMetrics(meterProvider, metricBase, "error", {
+			dispatchDurationMs,
+			itemCount,
+			totalItems: totalItemCount
 		});
+		throw e;
 	}
-	if (collectionCallbacks.authorizePredicate != null) {
-		if (!await collectionCallbacks.authorizePredicate(context, identifier)) return await onUnauthorized(request);
-	}
-	const jsonLd = await collection.toJsonLd(context);
-	return new Response(JSON.stringify(jsonLd), { headers: {
-		"Content-Type": "application/activity+json",
-		Vary: "Accept"
-	} });
 }
 /**
 * Filters collection items based on the provided predicate.
@@ -1234,11 +1300,31 @@ async function handleInboxInternal(request, parameters, span) {
 * @since 1.8.0
 */
 const handleCustomCollection = exceptWrapper(_handleCustomCollection);
-async function _handleCustomCollection(request, { name, values, context, tracerProvider, collectionCallbacks: callbacks, filterPredicate }) {
+const pendingCollectionMetricRecorders = /* @__PURE__ */ new WeakMap();
+function deferPendingCollectionMetrics(error, recorder) {
+	if (error == null || typeof error !== "object" && typeof error !== "function") return false;
+	pendingCollectionMetricRecorders.set(error, recorder);
+	return true;
+}
+function recordDeferredPendingCollectionMetrics(error, result, response) {
+	if (error == null || typeof error !== "object" && typeof error !== "function") return;
+	const recorder = pendingCollectionMetricRecorders.get(error);
+	pendingCollectionMetricRecorders.delete(error);
+	recorder?.(result, response);
+}
+async function _handleCustomCollection(request, { name, values, context, tracerProvider, meterProvider, collectionCallbacks: callbacks, filterPredicate }) {
 	verifyDefined(callbacks);
 	await authIfNeeded(context, values, callbacks);
 	const cursor = new URL(request.url).searchParams.get("cursor");
-	return await new CustomCollectionHandler(name, values, context, callbacks, tracerProvider, Collection, CollectionPage, filterPredicate).fetchCollection(cursor).toJsonLd().then(respondAsActivity);
+	const handler = new CustomCollectionHandler(name, values, context, callbacks, tracerProvider, meterProvider, Collection, CollectionPage, filterPredicate).fetchCollection(cursor);
+	try {
+		const response = await handler.toJsonLd().then(respondAsActivity);
+		handler.recordPendingCollectionMetrics("served", response);
+		return response;
+	} catch (e) {
+		if (!deferPendingCollectionMetrics(e, (result, response) => handler.recordPendingCollectionMetrics(result, response))) handler.recordPendingCollectionMetrics("error");
+		throw e;
+	}
 }
 /**
 * Handles an ordered collection request.
@@ -1252,11 +1338,19 @@ async function _handleCustomCollection(request, { name, values, context, tracerP
 * @since 1.8.0
 */
 const handleOrderedCollection = exceptWrapper(_handleOrderedCollection);
-async function _handleOrderedCollection(request, { name, values, context, tracerProvider, collectionCallbacks: callbacks, filterPredicate }) {
+async function _handleOrderedCollection(request, { name, values, context, tracerProvider, meterProvider, collectionCallbacks: callbacks, filterPredicate }) {
 	verifyDefined(callbacks);
 	await authIfNeeded(context, values, callbacks);
 	const cursor = new URL(request.url).searchParams.get("cursor");
-	return await new CustomCollectionHandler(name, values, context, callbacks, tracerProvider, OrderedCollection, OrderedCollectionPage, filterPredicate).fetchCollection(cursor).toJsonLd().then(respondAsActivity);
+	const handler = new CustomCollectionHandler(name, values, context, callbacks, tracerProvider, meterProvider, OrderedCollection, OrderedCollectionPage, filterPredicate).fetchCollection(cursor);
+	try {
+		const response = await handler.toJsonLd().then(respondAsActivity);
+		handler.recordPendingCollectionMetrics("served", response);
+		return response;
+	} catch (e) {
+		if (!deferPendingCollectionMetrics(e, (result, response) => handler.recordPendingCollectionMetrics(result, response))) handler.recordPendingCollectionMetrics("error");
+		throw e;
+	}
 }
 /**
 * Handling custom collections with support for pagination and filtering.
@@ -1276,6 +1370,7 @@ var CustomCollectionHandler = class {
 	context;
 	callbacks;
 	tracerProvider;
+	meterProvider;
 	Collection;
 	CollectionPage;
 	filterPredicate;
@@ -1303,6 +1398,7 @@ var CustomCollectionHandler = class {
 	*/
 	#dispatcher;
 	#collection = null;
+	#pendingCollectionMetrics = [];
 	/**
 	* Creates a new CustomCollection instance.
 	* @param name The name of the collection.
@@ -1314,12 +1410,13 @@ var CustomCollectionHandler = class {
 	* @param CollectionPage The CollectionPage constructor.
 	* @param filterPredicate Optional filter predicate for items.
 	*/
-	constructor(name$2, values, context, callbacks, tracerProvider = trace.getTracerProvider(), Collection, CollectionPage, filterPredicate) {
+	constructor(name$2, values, context, callbacks, tracerProvider = trace.getTracerProvider(), meterProvider, Collection, CollectionPage, filterPredicate) {
 		this.name = name$2;
 		this.values = values;
 		this.context = context;
 		this.callbacks = callbacks;
 		this.tracerProvider = tracerProvider;
+		this.meterProvider = meterProvider;
 		this.Collection = Collection;
 		this.CollectionPage = CollectionPage;
 		this.filterPredicate = filterPredicate;
@@ -1372,10 +1469,12 @@ var CustomCollectionHandler = class {
 		const { prevCursor, nextCursor } = pages;
 		const partOf = new URL(id);
 		partOf.searchParams.delete("cursor");
+		const items = this.filterItems(pages.items);
+		this.recordPendingCollectionItemCount(true, items.length);
 		return {
 			id,
 			partOf,
-			items: this.filterItems(pages.items),
+			items,
 			prev: this.appendToUrl(prevCursor),
 			next: this.appendToUrl(nextCursor)
 		};
@@ -1388,11 +1487,16 @@ var CustomCollectionHandler = class {
 	*/
 	async getProps(firstCursor) {
 		const lastCursor = await this.callbacks.lastCursor?.(this.context, this.values);
+		const totalItems = await this.totalItems;
+		if (totalItems != null) this.#pendingCollectionMetrics.push({
+			page: false,
+			totalItems: Number(totalItems)
+		});
 		return {
 			id: this.#id,
 			first: this.appendToUrl(firstCursor),
 			last: this.appendToUrl(lastCursor),
-			totalItems: await this.totalItems
+			totalItems
 		};
 	}
 	/**
@@ -1402,10 +1506,12 @@ var CustomCollectionHandler = class {
 	async getPropsWithoutCursor() {
 		const totalItems = await this.totalItems;
 		const pages = await this.getPages({ totalItems });
+		const items = this.filterItems(pages.items);
+		this.recordPendingCollectionItemCount(false, items.length);
 		return {
 			id: this.#id,
 			totalItems,
-			items: this.filterItems(pages.items)
+			items
 		};
 	}
 	/**
@@ -1440,12 +1546,24 @@ var CustomCollectionHandler = class {
 	* @returns A function that handles the span operation.
 	*/
 	spanPages = ({ totalItems = null, cursor = null }) => async (span) => {
+		const pageMetricBase = this.metricBase(cursor !== null);
+		const started = performance.now();
 		try {
 			if (totalItems !== null) span.setAttribute(this.ATTRS.TOTAL_ITEMS, totalItems);
 			const page = await this.dispatch(cursor);
+			const durationMs = getDurationMs(started);
 			span.setAttribute(this.ATTRS.ITEMS, page.items.length);
+			this.#pendingCollectionMetrics.push({
+				page: pageMetricBase.page,
+				dispatchDurationMs: durationMs,
+				totalItems: totalItems == null ? void 0 : Number(totalItems)
+			});
 			return page;
 		} catch (e) {
+			this.#pendingCollectionMetrics.push({
+				page: cursor !== null,
+				dispatchDurationMs: getDurationMs(started)
+			});
 			const message = e instanceof Error ? e.message : String(e);
 			span.setStatus({
 				code: SpanStatusCode.ERROR,
@@ -1472,6 +1590,37 @@ var CustomCollectionHandler = class {
 	filterItems(items) {
 		return filterCollectionItems(items, this.name, this.filterPredicate);
 	}
+	metricBase(page) {
+		return {
+			kind: "custom",
+			page,
+			dispatcher: "custom"
+		};
+	}
+	metricAttributes(page, result, response) {
+		return collectionAttributes(this.metricBase(page), result, response);
+	}
+	recordPendingCollectionItemCount(page, itemCount) {
+		for (let i = this.#pendingCollectionMetrics.length - 1; i >= 0; i--) {
+			const measurement = this.#pendingCollectionMetrics[i];
+			if (measurement.page === page && measurement.dispatchDurationMs != null && measurement.itemCount == null) {
+				measurement.itemCount = itemCount;
+				return;
+			}
+		}
+		this.#pendingCollectionMetrics.push({
+			page,
+			itemCount
+		});
+	}
+	recordPendingCollectionMetrics(result, response) {
+		for (const measurement of this.#pendingCollectionMetrics.splice(0)) {
+			const attrs = this.metricAttributes(measurement.page, result, response);
+			if (measurement.dispatchDurationMs != null) recordCollectionDispatchDuration(this.meterProvider, measurement.dispatchDurationMs, attrs);
+			if (measurement.itemCount != null) recordCollectionPageItems(this.meterProvider, measurement.itemCount, attrs);
+			if (measurement.totalItems != null) recordCollectionTotalItems(this.meterProvider, measurement.totalItems, attrs);
+		}
+	}
 	/**
 	* Appends a cursor to the URL if it exists.
 	* @param cursor The cursor to append, or null/undefined.
@@ -1535,14 +1684,36 @@ var CustomCollectionHandler = class {
 */
 function exceptWrapper(handler) {
 	return async (request, handlerParams) => {
+		const page = new URL(request.url).searchParams.get("cursor") != null;
+		const { meterProvider } = handlerParams;
+		const metricBase = {
+			kind: "custom",
+			page,
+			dispatcher: "custom"
+		};
 		try {
-			return await handler(request, handlerParams);
+			const response = await handler(request, handlerParams);
+			recordCollectionRequest(meterProvider, collectionAttributes(metricBase, "served", response));
+			return response;
 		} catch (error) {
 			const { onNotFound, onUnauthorized } = handlerParams;
 			switch (error?.constructor) {
-				case ItemsNotFoundError: return await onNotFound(request);
-				case UnauthorizedError: return await onUnauthorized(request);
-				default: throw error;
+				case ItemsNotFoundError: {
+					const response = await onNotFound(request);
+					recordDeferredPendingCollectionMetrics(error, "not_found", response);
+					recordCollectionRequest(meterProvider, collectionAttributes(metricBase, "not_found", response));
+					return response;
+				}
+				case UnauthorizedError: {
+					const response = await onUnauthorized(request);
+					recordDeferredPendingCollectionMetrics(error, "unauthorized", response);
+					recordCollectionRequest(meterProvider, collectionAttributes(metricBase, "unauthorized", response));
+					return response;
+				}
+				default:
+					recordDeferredPendingCollectionMetrics(error, "error");
+					recordCollectionRequest(meterProvider, collectionAttributes(metricBase, "error"));
+					throw error;
 			}
 		}
 	};
@@ -2930,7 +3101,15 @@ var FederationImpl = class extends FederationBuilderImpl {
 		}
 		if (request.method !== "POST" && !acceptsJsonLd(request)) {
 			metricState.endpoint = "not_acceptable";
-			return await onNotAcceptable(request);
+			const response = await onNotAcceptable(request);
+			const collectionRoute = getCollectionMetricRoute(routeName);
+			if (collectionRoute != null) recordCollectionRequest(this._meterProvider, {
+				...collectionRoute,
+				page: url.searchParams.get("cursor") != null,
+				result: "not_acceptable",
+				statusCode: response.status
+			});
+			return response;
 		}
 		switch (routeName) {
 			case "actor":
@@ -2991,6 +3170,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 					context,
 					collectionCallbacks: this.outboxCallbacks,
 					tracerProvider: this.tracerProvider,
+					meterProvider: this._meterProvider,
 					onUnauthorized,
 					onNotFound
 				});
@@ -3002,6 +3182,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 					context,
 					collectionCallbacks: this.inboxCallbacks,
 					tracerProvider: this.tracerProvider,
+					meterProvider: this._meterProvider,
 					onUnauthorized,
 					onNotFound
 				});
@@ -3041,6 +3222,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 				context,
 				collectionCallbacks: this.followingCallbacks,
 				tracerProvider: this.tracerProvider,
+				meterProvider: this._meterProvider,
 				onUnauthorized,
 				onNotFound
 			});
@@ -3064,6 +3246,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 					filterPredicate: baseUrl != null ? ((i) => (i instanceof URL ? i.href : i.id?.href ?? "").startsWith(baseUrl)) : void 0,
 					collectionCallbacks: this.followersCallbacks,
 					tracerProvider: this.tracerProvider,
+					meterProvider: this._meterProvider,
 					onUnauthorized,
 					onNotFound
 				});
@@ -3075,6 +3258,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 				context,
 				collectionCallbacks: this.likedCallbacks,
 				tracerProvider: this.tracerProvider,
+				meterProvider: this._meterProvider,
 				onUnauthorized,
 				onNotFound
 			});
@@ -3085,6 +3269,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 				context,
 				collectionCallbacks: this.featuredCallbacks,
 				tracerProvider: this.tracerProvider,
+				meterProvider: this._meterProvider,
 				onUnauthorized,
 				onNotFound
 			});
@@ -3095,6 +3280,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 				context,
 				collectionCallbacks: this.featuredTagsCallbacks,
 				tracerProvider: this.tracerProvider,
+				meterProvider: this._meterProvider,
 				onUnauthorized,
 				onNotFound
 			});
@@ -3107,6 +3293,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 					values: route.values,
 					collectionCallbacks: callbacks,
 					tracerProvider: this.tracerProvider,
+					meterProvider: this._meterProvider,
 					onUnauthorized,
 					onNotFound
 				});
@@ -3120,6 +3307,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 					values: route.values,
 					collectionCallbacks: callbacks,
 					tracerProvider: this.tracerProvider,
+					meterProvider: this._meterProvider,
 					onUnauthorized,
 					onNotFound
 				});
@@ -3152,6 +3340,29 @@ function getEndpointCategory(routeName) {
 		default: return "not_found";
 	}
 }
+function getCollectionMetricRoute(routeName) {
+	switch (routeName) {
+		case "inbox":
+		case "outbox":
+		case "following":
+		case "followers":
+		case "liked":
+		case "featured": return {
+			kind: routeName,
+			dispatcher: "built_in"
+		};
+		case "featuredTags": return {
+			kind: "featured_tags",
+			dispatcher: "built_in"
+		};
+		case "collection":
+		case "orderedCollection": return {
+			kind: "custom",
+			dispatcher: "custom"
+		};
+		default: return;
+	}
+}
 const FANOUT_THRESHOLD = 5;
 var ContextImpl = class ContextImpl {
 	url;