@fedify/fedify 2.3.0-dev.1110 → 2.3.0-dev.1119

package/dist/{middleware-CjzI3aYo.js → middleware-Dtjz-hSk.js}

@@ -2,10 +2,10 @@ import { Temporal } from "@js-temporal/polyfill";
 import { URLPattern } from "urlpattern-polyfill";
 import { t as __exportAll } from "./chunk-CRNNMoPX.js";
 import { r as getDefaultActivityTransformers } from "./transformers-BGMIq1cs.js";
-import { _ as version, a as verifyRequestDetailed, d as validateCryptoKey, f as formatAcceptSignature, g as name, i as verifyRequest, n as parseRfc9421SignatureInput, o as exportJwk, t as doubleKnock, u as importJwk } from "./http-O8MYWwk8.js";
-import { c as getKeyOwner, d as detachSignature, f as hasSignatureLike, i as verifyObject, m as verifyJsonLd, n as hasProofLike, o as normalizeOutgoingActivityJsonLd, p as signJsonLd, r as signObject, s as doesActorOwnKey } from "./proof-5kT7OUPV.js";
+import { E as version, T as name, _ as recordFanoutRecipients, a as verifyRequestDetailed, b as recordOutboxEnqueue, d as validateCryptoKey, f as getDurationMs, h as isAbortError, i as verifyRequest, m as getRemoteHost, n as parseRfc9421SignatureInput, o as exportJwk, p as getFederationMetrics, t as doubleKnock, u as importJwk, v as recordInboxActivity, x as formatAcceptSignature, y as recordOutboxActivity } from "./http-CouJSFVK.js";
+import { c as getKeyOwner, d as detachSignature, f as hasSignatureLike, i as verifyObject, m as verifyJsonLd, n as hasProofLike, o as normalizeOutgoingActivityJsonLd, p as signJsonLd, r as signObject, s as doesActorOwnKey } from "./proof-n60t8o9P.js";
 import { n as getNodeInfo, t as nodeInfoToJson } from "./types-CAY3OdLq.js";
-import { n as getAuthenticatedDocumentLoader, t as kvCache } from "./kv-cache-C3NWWiTg.js";
+import { n as getAuthenticatedDocumentLoader, t as kvCache } from "./kv-cache-DBNpsneh.js";
 import { getLogger, withContext } from "@logtape/logtape";
 import { Activity, Collection, CollectionPage, CryptographicKey, Link, Multikey, Object as Object$1, OrderedCollection, OrderedCollectionPage, Tombstone, getTypeId, lookupObject, traverseCollection } from "@fedify/vocab";
 import { SpanKind, SpanStatusCode, context, metrics, propagation, trace } from "@opentelemetry/api";
@@ -779,264 +779,6 @@ async function buildCollectionSynchronizationHeader(collectionId, actorIds) {
 	return `collectionId="${collectionId}", url="${url}", digest="${encodeHex(await digest(actorIds))}"`;
 }
 //#endregion
-//#region src/federation/metrics.ts
-var FederationMetrics = class {
-	deliverySent;
-	deliveryPermanentFailure;
-	signatureVerificationFailure;
-	deliveryDuration;
-	inboxProcessingDuration;
-	httpServerRequestCount;
-	httpServerRequestDuration;
-	queueTaskEnqueued;
-	queueTaskStarted;
-	queueTaskCompleted;
-	queueTaskFailed;
-	queueTaskDuration;
-	queueTaskInFlight;
-	constructor(meterProvider) {
-		const meter = meterProvider.getMeter(name, version);
-		this.deliverySent = meter.createCounter("activitypub.delivery.sent", {
-			description: "ActivityPub delivery attempts.",
-			unit: "{attempt}"
-		});
-		this.deliveryPermanentFailure = meter.createCounter("activitypub.delivery.permanent_failure", {
-			description: "ActivityPub deliveries abandoned as permanent failures.",
-			unit: "{failure}"
-		});
-		this.signatureVerificationFailure = meter.createCounter("activitypub.signature.verification_failure", {
-			description: "ActivityPub signature verification failures.",
-			unit: "{failure}"
-		});
-		this.deliveryDuration = meter.createHistogram("activitypub.delivery.duration", {
-			description: "Duration of ActivityPub delivery attempts.",
-			unit: "ms"
-		});
-		this.inboxProcessingDuration = meter.createHistogram("activitypub.inbox.processing_duration", {
-			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
-			] }
-		});
-		this.queueTaskEnqueued = meter.createCounter("fedify.queue.task.enqueued", {
-			description: "Tasks Fedify enqueued for inbox, outbox, or fanout work.",
-			unit: "{task}"
-		});
-		this.queueTaskStarted = meter.createCounter("fedify.queue.task.started", {
-			description: "Tasks Fedify began processing as a queue worker.",
-			unit: "{task}"
-		});
-		this.queueTaskCompleted = meter.createCounter("fedify.queue.task.completed", {
-			description: "Queue tasks Fedify finished processing without throwing.",
-			unit: "{task}"
-		});
-		this.queueTaskFailed = meter.createCounter("fedify.queue.task.failed", {
-			description: "Queue tasks Fedify abandoned because processing threw.",
-			unit: "{task}"
-		});
-		this.queueTaskDuration = meter.createHistogram("fedify.queue.task.duration", {
-			description: "Duration of queue task processing in Fedify workers.",
-			unit: "ms",
-			advice: { explicitBucketBoundaries: [
-				5,
-				10,
-				25,
-				50,
-				75,
-				100,
-				250,
-				500,
-				750,
-				1e3,
-				2500,
-				5e3,
-				7500,
-				1e4
-			] }
-		});
-		this.queueTaskInFlight = meter.createUpDownCounter("fedify.queue.task.in_flight", {
-			description: "Queue tasks currently being processed in this Fedify process.",
-			unit: "{task}"
-		});
-	}
-	recordDelivery(inbox, durationMs, success, activityType) {
-		const deliveryAttributes = {
-			"activitypub.remote.host": getRemoteHost(inbox),
-			"activitypub.delivery.success": success
-		};
-		if (activityType != null) deliveryAttributes["activitypub.activity.type"] = activityType;
-		this.deliverySent.add(1, deliveryAttributes);
-		this.deliveryDuration.record(durationMs, deliveryAttributes);
-	}
-	recordPermanentFailure(inbox, statusCode) {
-		this.deliveryPermanentFailure.add(1, {
-			"activitypub.remote.host": getRemoteHost(inbox),
-			"http.response.status_code": statusCode
-		});
-	}
-	recordSignatureVerificationFailure(reason, remoteHost) {
-		const attributes = { "activitypub.verification.failure_reason": reason };
-		if (remoteHost != null) attributes["activitypub.remote.host"] = remoteHost;
-		this.signatureVerificationFailure.add(1, attributes);
-	}
-	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);
-	}
-	recordQueueTaskEnqueued(common, attempt) {
-		const attributes = buildQueueTaskAttributes(common);
-		attributes["fedify.queue.task.attempt"] = attempt;
-		this.queueTaskEnqueued.add(1, attributes);
-	}
-	recordQueueTaskStarted(common) {
-		this.queueTaskStarted.add(1, buildQueueTaskAttributes(common));
-	}
-	incrementQueueTaskInFlight(common) {
-		this.queueTaskInFlight.add(1, buildQueueTaskInFlightAttributes(common));
-	}
-	decrementQueueTaskInFlight(common) {
-		this.queueTaskInFlight.add(-1, buildQueueTaskInFlightAttributes(common));
-	}
-	recordQueueTaskOutcome(common, result, durationMs) {
-		const attributes = buildQueueTaskAttributes(common);
-		attributes["fedify.queue.task.result"] = result;
-		if (result === "completed") this.queueTaskCompleted.add(1, attributes);
-		else if (result === "failed") this.queueTaskFailed.add(1, attributes);
-		this.queueTaskDuration.record(durationMs, attributes);
-	}
-};
-function buildQueueTaskAttributes(common) {
-	const attributes = { "fedify.queue.role": common.role };
-	const backend = getQueueBackend(common.queue);
-	if (backend != null) attributes["fedify.queue.backend"] = backend;
-	const nativeRetrial = common.queue?.nativeRetrial;
-	if (typeof nativeRetrial === "boolean") attributes["fedify.queue.native_retrial"] = nativeRetrial;
-	if (common.activityType != null) attributes["activitypub.activity.type"] = common.activityType;
-	return attributes;
-}
-function buildQueueTaskInFlightAttributes(common) {
-	return buildQueueTaskAttributes({
-		role: common.role,
-		queue: common.queue
-	});
-}
-/**
-* Returns the constructor name of the given message queue, when it is a
-* meaningful identifier.  Used as a best-effort `fedify.queue.backend`
-* attribute on queue task metrics; returns `undefined` for plain object
-* literals (whose constructor is `Object`) so the attribute does not appear
-* with a non-informative value.
-* @since 2.3.0
-*/
-function getQueueBackend(queue) {
-	const name = queue?.constructor?.name;
-	if (name == null || name === "" || name === "Object") return void 0;
-	return name;
-}
-/**
-* Records `fedify.queue.task.enqueued` for an outgoing outbox enqueue.
-*
-* Both `Context.sendActivity()` and `OutboxContext.forwardActivity()` enqueue
-* outbox messages with the same metric attributes (role, queue, activity
-* type, attempt), so they share this helper rather than each defining a local
-* closure.
-* @since 2.3.0
-*/
-function recordOutboxEnqueue(meterProvider, outboxQueue, message) {
-	getFederationMetrics(meterProvider).recordQueueTaskEnqueued({
-		role: "outbox",
-		queue: outboxQueue,
-		activityType: message.activityType
-	}, message.attempt);
-}
-/**
-* Whether the given thrown value is an `AbortError`.
-*
-* `processQueuedTask` distinguishes aborted tasks (recorded as
-* `fedify.queue.task.result=aborted`) from other failures so that backend
-* shutdown signals do not inflate the `fedify.queue.task.failed` counter.
-* @since 2.3.0
-*/
-function isAbortError(error) {
-	if (error == null || typeof error !== "object") return false;
-	const name = error.name;
-	return typeof name === "string" && name === "AbortError";
-}
-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.
-* @since 2.3.0
-*/
-function getFederationMetrics(meterProvider = metrics.getMeterProvider()) {
-	let instruments = federationMetrics.get(meterProvider);
-	if (instruments == null) {
-		instruments = new FederationMetrics(meterProvider);
-		federationMetrics.set(meterProvider, instruments);
-	}
-	return instruments;
-}
-/**
-* Gets the bounded remote host attribute value for a URL.
-* @since 2.3.0
-*/
-function getRemoteHost(url) {
-	return url.hostname;
-}
-/**
-* Gets an elapsed duration in milliseconds from a `performance.now()` value.
-* @since 2.3.0
-*/
-function getDurationMs(start) {
-	return Math.max(0, performance.now() - start);
-}
-//#endregion
 //#region src/federation/inbox.ts
 async function routeActivity({ context: ctx, json, activity, recipient, inboxListeners, inboxContextFactory, inboxErrorHandler, kv, kvPrefixes, queue, span, meterProvider, tracerProvider, idempotencyStrategy }) {
 	const logger = getLogger([
@@ -1075,6 +817,7 @@ async function routeActivity({ context: ctx, json, activity, recipient, inboxLis
 				code: SpanStatusCode.UNSET,
 				message: `Activity ${activity.id?.href} has already been processed.`
 			});
+			recordInboxActivity(meterProvider, "rejected", getTypeId(activity).href);
 			return "alreadyProcessed";
 		}
 	}
@@ -1084,6 +827,7 @@ async function routeActivity({ context: ctx, json, activity, recipient, inboxLis
 			code: SpanStatusCode.ERROR,
 			message: "Missing actor."
 		});
+		recordInboxActivity(meterProvider, "rejected", getTypeId(activity).href);
 		return "missingActor";
 	}
 	span.setAttribute("activitypub.actor.id", activity.actorId.href);
@@ -1119,6 +863,7 @@ async function routeActivity({ context: ctx, json, activity, recipient, inboxLis
 			queue,
 			activityType: getTypeId(activity).href
 		}, 0);
+		recordInboxActivity(meterProvider, "queued", getTypeId(activity).href);
 		logger.info("Activity {activityId} is enqueued.", {
 			activityId: activity.id?.href,
 			activity: json,
@@ -1138,6 +883,7 @@ async function routeActivity({ context: ctx, json, activity, recipient, inboxLis
 				code: SpanStatusCode.UNSET,
 				message: `Unsupported activity type: ${getTypeId(activity).href}`
 			});
+			recordInboxActivity(meterProvider, "rejected", getTypeId(activity).href);
 			span.end();
 			return "unsupportedActivity";
 		}
@@ -1147,7 +893,7 @@ async function routeActivity({ context: ctx, json, activity, recipient, inboxLis
 			const activityType = getTypeId(activity).href;
 			const started = performance.now();
 			try {
-				await listener(inboxContextFactory(recipient, json, activity?.id?.href, activityType), activity);
+				await listener(inboxContextFactory(recipient, json, activity.id?.href, activityType), activity);
 			} finally {
 				getFederationMetrics(meterProvider).recordInboxProcessingDuration(activityType, getDurationMs(started));
 			}
@@ -1172,9 +918,11 @@ async function routeActivity({ context: ctx, json, activity, recipient, inboxLis
 				code: SpanStatusCode.ERROR,
 				message: String(error)
 			});
+			recordInboxActivity(meterProvider, "rejected", getTypeId(activity).href);
 			span.end();
 			return "error";
 		}
+		recordInboxActivity(meterProvider, "processed", getTypeId(activity).href);
 		if (cacheKey != null) await kv.set(cacheKey, true, { ttl: Temporal.Duration.from({ days: 1 }) });
 		logger.info("Activity {activityId} has been processed.", {
 			activityId: activity.id?.href,
@@ -1442,8 +1190,8 @@ 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 }) {
-	const spanName = name$1.trim().replace(/\s+/g, "_");
+async function handleCollection(request, { name: name$2, identifier, uriGetter, filter, filterPredicate, context, collectionCallbacks, tracerProvider, onUnauthorized, onNotFound }) {
+	const spanName = name$2.trim().replace(/\s+/g, "_");
 	tracerProvider = tracerProvider ?? trace.getTracerProvider();
 	const tracer = tracerProvider.getTracer(name, version);
 	const cursor = new URL(request.url).searchParams.get("cursor");
@@ -1485,7 +1233,7 @@ async function handleCollection(request, { name: name$1, identifier, uriGetter,
 			collection = new OrderedCollection({
 				id: baseUri,
 				totalItems: totalItems == null ? null : Number(totalItems),
-				items: filterCollectionItems(itemsOrResponse, name$1, filterPredicate)
+				items: filterCollectionItems(itemsOrResponse, name$2, filterPredicate)
 			});
 		} else {
 			const lastCursor = await collectionCallbacks.lastCursor?.(context, identifier);
@@ -1506,7 +1254,7 @@ async function handleCollection(request, { name: name$1, identifier, uriGetter,
 	} else {
 		const uri = new URL(baseUri);
 		uri.searchParams.set("cursor", cursor);
-		const pageOrResponse = await tracer.startActiveSpan(`activitypub.dispatch_collection_page ${name$1}`, {
+		const pageOrResponse = await tracer.startActiveSpan(`activitypub.dispatch_collection_page ${name$2}`, {
 			kind: SpanKind.SERVER,
 			attributes: {
 				"activitypub.collection.id": uri.href,
@@ -1550,7 +1298,7 @@ async function handleCollection(request, { name: name$1, identifier, uriGetter,
 			id: uri,
 			prev,
 			next,
-			items: filterCollectionItems(items, name$1, filterPredicate),
+			items: filterCollectionItems(items, name$2, filterPredicate),
 			partOf
 		});
 	}
@@ -1825,7 +1573,7 @@ async function handleInbox(request, options) {
 * @returns A promise that resolves to an HTTP response.
 */
 async function handleInboxInternal(request, parameters, span) {
-	const { recipient, context: ctx, inboxContextFactory, kv, kvPrefixes, queue, actorDispatcher, inboxListeners, inboxErrorHandler, unverifiedActivityHandler, onNotFound, signatureTimeWindow, skipSignatureVerification, inboxChallengePolicy, tracerProvider } = parameters;
+	const { recipient, context: ctx, inboxContextFactory, kv, kvPrefixes, queue, actorDispatcher, inboxListeners, inboxErrorHandler, unverifiedActivityHandler, onNotFound, signatureTimeWindow, skipSignatureVerification, inboxChallengePolicy, meterProvider, tracerProvider } = parameters;
 	const logger = getLogger([
 		"fedify",
 		"federation",
@@ -1903,6 +1651,7 @@ async function handleInboxInternal(request, parameters, span) {
 			contextLoader: ctx.contextLoader,
 			documentLoader: ctx.documentLoader,
 			keyCache,
+			meterProvider,
 			tracerProvider
 		});
 	} catch (error) {
@@ -1938,6 +1687,7 @@ async function handleInboxInternal(request, parameters, span) {
 				contextLoader: ctx.contextLoader,
 				documentLoader: ctx.documentLoader,
 				keyCache,
+				meterProvider,
 				tracerProvider
 			});
 		} catch (error) {
@@ -1985,6 +1735,7 @@ async function handleInboxInternal(request, parameters, span) {
 				documentLoader: ctx.documentLoader,
 				timeWindow: signatureTimeWindow,
 				keyCache,
+				meterProvider,
 				tracerProvider
 			});
 			if (verification.verified === false) {
@@ -2233,8 +1984,8 @@ 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) {
-		this.name = name$2;
+	constructor(name$1, values, context, callbacks, tracerProvider = trace.getTracerProvider(), Collection, CollectionPage, filterPredicate) {
+		this.name = name$1;
 		this.values = values;
 		this.context = context;
 		this.callbacks = callbacks;
@@ -3488,6 +3239,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 						});
 					}
 				}
+				recordOutboxActivity(this.meterProvider, "abandoned", message.activityType);
 				return;
 			}
 			if (this.outboxQueue?.nativeRetrial) {
@@ -3518,11 +3270,15 @@ var FederationImpl = class extends FederationBuilderImpl {
 						queue: outboxQueue,
 						activityType: retryMessage.activityType
 					}, retryMessage.attempt);
+					recordOutboxActivity(this.meterProvider, "retried", retryMessage.activityType);
 				}
-			} else logger.error("Failed to send activity {activityId} to {inbox} after {attempt} attempts; giving up:\n{error}", {
-				...logData,
-				error
-			});
+			} else {
+				logger.error("Failed to send activity {activityId} to {inbox} after {attempt} attempts; giving up:\n{error}", {
+					...logData,
+					error
+				});
+				recordOutboxActivity(this.meterProvider, "abandoned", message.activityType);
+			}
 			return;
 		}
 		logger.info("Successfully sent activity {activityId} to {inbox}.", { ...logData });
@@ -3557,6 +3313,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 					activity: message.activity,
 					recipient: message.identifier
 				});
+				recordInboxActivity(this.meterProvider, "rejected", activityType);
 				return;
 			}
 		}
@@ -3573,6 +3330,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 					code: SpanStatusCode.ERROR,
 					message: `Unsupported activity type: ${activityType}`
 				});
+				recordInboxActivity(this.meterProvider, "rejected", activityType);
 				span.end();
 				return;
 			}
@@ -3585,6 +3343,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 				} finally {
 					getFederationMetrics(this.meterProvider).recordInboxProcessingDuration(activityType, getDurationMs(started));
 				}
+				recordInboxActivity(this.meterProvider, "processed", activityType);
 			} catch (error) {
 				try {
 					await this.inboxErrorHandler?.(context, error);
@@ -3635,13 +3394,17 @@ var FederationImpl = class extends FederationBuilderImpl {
 							queue: inboxQueue,
 							activityType
 						}, retryMessage.attempt);
+						recordInboxActivity(this.meterProvider, "retried", activityType);
 					}
-				} else logger.error("Failed to process the incoming activity {activityId} after {trial} attempts; giving up:\n{error}", {
-					error,
-					activityId: activity.id?.href,
-					activity: message.activity,
-					recipient: message.identifier
-				});
+				} else {
+					logger.error("Failed to process the incoming activity {activityId} after {trial} attempts; giving up:\n{error}", {
+						error,
+						activityId: activity.id?.href,
+						activity: message.activity,
+						recipient: message.identifier
+					});
+					recordInboxActivity(this.meterProvider, "abandoned", activityType);
+				}
 				span.setStatus({
 					code: SpanStatusCode.ERROR,
 					message: String(error)
@@ -4668,6 +4431,7 @@ var ContextImpl = class ContextImpl {
 			queue: this.federation.fanoutQueue,
 			activityType: message.activityType
 		}, 0);
+		recordFanoutRecipients(this.federation.meterProvider, globalThis.Object.keys(message.inboxes).length, message.activityType);
 		return true;
 	}
 	async *getFollowers(identifier) {
@@ -4731,6 +4495,7 @@ var ContextImpl = class ContextImpl {
 		if (await verifyObject(Activity, json, {
 			contextLoader,
 			documentLoader: options.documentLoader ?? this.documentLoader,
+			meterProvider: this.meterProvider,
 			tracerProvider: options.tracerProvider ?? this.tracerProvider,
 			keyCache
 		}) == null) {
@@ -4873,6 +4638,7 @@ var RequestContextImpl = class RequestContextImpl extends ContextImpl {
 			contextLoader: options.contextLoader ?? this.contextLoader,
 			documentLoader: options.documentLoader ?? this.documentLoader,
 			timeWindow: this.federation.signatureTimeWindow,
+			meterProvider: this.meterProvider,
 			tracerProvider: options.tracerProvider ?? this.tracerProvider
 		});
 	}