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

package/dist/{middleware-DUWeXjZR.cjs → middleware-EqTYPG4F.cjs}

@@ -2,10 +2,10 @@ const { Temporal } = require("@js-temporal/polyfill");
 const { URLPattern } = require("urlpattern-polyfill");
 const require_chunk = require("./chunk-DDcVe30Y.cjs");
 const require_transformers = require("./transformers-NeAONrAq.cjs");
-const require_http = require("./http-DV0il3vk.cjs");
-const require_proof = require("./proof-BD92WeqV.cjs");
+const require_http = require("./http-CKCgOPkX.cjs");
+const require_proof = require("./proof-DIoqrKnX.cjs");
 const require_types = require("./types-KC4QAoxe.cjs");
-const require_kv_cache = require("./kv-cache-Dya-TWMe.cjs");
+const require_kv_cache = require("./kv-cache-DY-XWOqM.cjs");
 let _logtape_logtape = require("@logtape/logtape");
 let _fedify_vocab = require("@fedify/vocab");
 let _opentelemetry_api = require("@opentelemetry/api");
@@ -779,264 +779,6 @@ async function buildCollectionSynchronizationHeader(collectionId, actorIds) {
 	return `collectionId="${collectionId}", url="${url}", digest="${(0, byte_encodings_hex.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(require_http.name, require_http.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 = _opentelemetry_api.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 = (0, _logtape_logtape.getLogger)([
@@ -1114,7 +856,7 @@ async function routeActivity({ context: ctx, json, activity, recipient, inboxLis
 			});
 			throw error;
 		}
-		getFederationMetrics(meterProvider).recordQueueTaskEnqueued({
+		require_http.getFederationMetrics(meterProvider).recordQueueTaskEnqueued({
 			role: "inbox",
 			queue,
 			activityType: (0, _fedify_vocab.getTypeId)(activity).href
@@ -1149,7 +891,7 @@ async function routeActivity({ context: ctx, json, activity, recipient, inboxLis
 			try {
 				await listener(inboxContextFactory(recipient, json, activity?.id?.href, activityType), activity);
 			} finally {
-				getFederationMetrics(meterProvider).recordInboxProcessingDuration(activityType, getDurationMs(started));
+				require_http.getFederationMetrics(meterProvider).recordInboxProcessingDuration(activityType, require_http.getDurationMs(started));
 			}
 		} catch (error) {
 			try {
@@ -1442,8 +1184,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 ?? _opentelemetry_api.trace.getTracerProvider();
 	const tracer = tracerProvider.getTracer(require_http.name, require_http.version);
 	const cursor = new URL(request.url).searchParams.get("cursor");
@@ -1485,7 +1227,7 @@ async function handleCollection(request, { name: name$1, identifier, uriGetter,
 			collection = new _fedify_vocab.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 +1248,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: _opentelemetry_api.SpanKind.SERVER,
 			attributes: {
 				"activitypub.collection.id": uri.href,
@@ -1550,7 +1292,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 +1567,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 = (0, _logtape_logtape.getLogger)([
 		"fedify",
 		"federation",
@@ -1903,6 +1645,7 @@ async function handleInboxInternal(request, parameters, span) {
 			contextLoader: ctx.contextLoader,
 			documentLoader: ctx.documentLoader,
 			keyCache,
+			meterProvider,
 			tracerProvider
 		});
 	} catch (error) {
@@ -1938,6 +1681,7 @@ async function handleInboxInternal(request, parameters, span) {
 				contextLoader: ctx.contextLoader,
 				documentLoader: ctx.documentLoader,
 				keyCache,
+				meterProvider,
 				tracerProvider
 			});
 		} catch (error) {
@@ -1985,12 +1729,13 @@ async function handleInboxInternal(request, parameters, span) {
 				documentLoader: ctx.documentLoader,
 				timeWindow: signatureTimeWindow,
 				keyCache,
+				meterProvider,
 				tracerProvider
 			});
 			if (verification.verified === false) {
 				const reason = verification.reason;
-				const remoteHost = "keyId" in reason && reason.keyId != null ? getRemoteHost(reason.keyId) : void 0;
-				getFederationMetrics(parameters.meterProvider).recordSignatureVerificationFailure(reason.type, remoteHost);
+				const remoteHost = "keyId" in reason && reason.keyId != null ? require_http.getRemoteHost(reason.keyId) : void 0;
+				require_http.getFederationMetrics(parameters.meterProvider).recordSignatureVerificationFailure(reason.type, remoteHost);
 				logger.error("Failed to verify the request's HTTP Signatures.", {
 					recipient,
 					reason: reason.type,
@@ -2077,7 +1822,7 @@ async function handleInboxInternal(request, parameters, span) {
 		"http_signatures.key_id": httpSigKey?.id?.href ?? ""
 	});
 	if (httpSigKey != null && !await require_proof.doesActorOwnKey(activity, httpSigKey, ctx)) {
-		getFederationMetrics(parameters.meterProvider).recordSignatureVerificationFailure("actorKeyMismatch", httpSigKey.id == null ? void 0 : getRemoteHost(httpSigKey.id));
+		require_http.getFederationMetrics(parameters.meterProvider).recordSignatureVerificationFailure("actorKeyMismatch", httpSigKey.id == null ? void 0 : require_http.getRemoteHost(httpSigKey.id));
 		logger.error("The signer ({keyId}) and the actor ({actorId}) do not match.", {
 			activity: json,
 			recipient,
@@ -2095,7 +1840,7 @@ async function handleInboxInternal(request, parameters, span) {
 	}
 	if (pendingNonceLabel != null) {
 		if (!await verifySignatureNonce(request, kv, kvPrefixes.acceptSignatureNonce, pendingNonceLabel)) {
-			getFederationMetrics(parameters.meterProvider).recordSignatureVerificationFailure("invalidNonce", httpSigKey?.id == null ? void 0 : getRemoteHost(httpSigKey.id));
+			require_http.getFederationMetrics(parameters.meterProvider).recordSignatureVerificationFailure("invalidNonce", httpSigKey?.id == null ? void 0 : require_http.getRemoteHost(httpSigKey.id));
 			logger.error("Signature nonce verification failed (missing, expired, or replayed).", { recipient });
 			return await getFailedSignatureResponse(inboxChallengePolicy, kv, kvPrefixes);
 		}
@@ -2233,8 +1978,8 @@ var CustomCollectionHandler = class {
 	* @param CollectionPage The CollectionPage constructor.
 	* @param filterPredicate Optional filter predicate for items.
 	*/
-	constructor(name$2, values, context, callbacks, tracerProvider = _opentelemetry_api.trace.getTracerProvider(), Collection, CollectionPage, filterPredicate) {
-		this.name = name$2;
+	constructor(name$1, values, context, callbacks, tracerProvider = _opentelemetry_api.trace.getTracerProvider(), Collection, CollectionPage, filterPredicate) {
+		this.name = name$1;
 		this.values = values;
 		this.context = context;
 		this.callbacks = callbacks;
@@ -2820,7 +2565,7 @@ async function sendActivityInternal({ activity, activityId, activityType, keys,
 		"federation",
 		"outbox"
 	]);
-	const federationMetrics = getFederationMetrics(meterProvider);
+	const federationMetrics = require_http.getFederationMetrics(meterProvider);
 	const started = performance.now();
 	let deliverySuccess = false;
 	headers = new Headers(headers);
@@ -2854,7 +2599,7 @@ async function sendActivityInternal({ activity, activityId, activityType, keys,
 			inbox: inbox.href,
 			error
 		});
-		federationMetrics.recordDelivery(inbox, getDurationMs(started), false, activityType);
+		federationMetrics.recordDelivery(inbox, require_http.getDurationMs(started), false, activityType);
 		throw error;
 	}
 	try {
@@ -2884,7 +2629,7 @@ async function sendActivityInternal({ activity, activityId, activityType, keys,
 		if (actorId != null) eventAttributes["activitypub.actor.id"] = actorId;
 		span.addEvent("activitypub.activity.sent", eventAttributes);
 	} finally {
-		federationMetrics.recordDelivery(inbox, getDurationMs(started), deliverySuccess, activityType);
+		federationMetrics.recordDelivery(inbox, require_http.getDurationMs(started), deliverySuccess, activityType);
 	}
 }
 /**
@@ -3233,7 +2978,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 	processQueuedTask(contextData, message) {
 		const tracer = this._getTracer();
 		const extractedContext = _opentelemetry_api.propagation.extract(_opentelemetry_api.context.active(), message.traceContext);
-		const meter = getFederationMetrics(this.meterProvider);
+		const meter = require_http.getFederationMetrics(this.meterProvider);
 		return (0, _logtape_logtape.withContext)({ messageId: message.id }, async () => {
 			if (message.type === "fanout") {
 				const common = {
@@ -3258,7 +3003,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 						try {
 							await this.#listenFanoutMessage(contextData, message);
 						} catch (e) {
-							const aborted = isAbortError(e);
+							const aborted = require_http.isAbortError(e);
 							outcome = aborted ? "aborted" : "failed";
 							if (!aborted) span.setStatus({
 								code: _opentelemetry_api.SpanStatusCode.ERROR,
@@ -3266,7 +3011,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 							});
 							throw e;
 						} finally {
-							meter.recordQueueTaskOutcome(common, outcome, getDurationMs(startedAt));
+							meter.recordQueueTaskOutcome(common, outcome, require_http.getDurationMs(startedAt));
 							meter.decrementQueueTaskInFlight(common);
 							span.end();
 						}
@@ -3298,7 +3043,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 						try {
 							await this.#listenOutboxMessage(contextData, message, span);
 						} catch (e) {
-							const aborted = isAbortError(e);
+							const aborted = require_http.isAbortError(e);
 							outcome = aborted ? "aborted" : "failed";
 							if (!aborted) span.setStatus({
 								code: _opentelemetry_api.SpanStatusCode.ERROR,
@@ -3306,7 +3051,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 							});
 							throw e;
 						} finally {
-							meter.recordQueueTaskOutcome(common, outcome, getDurationMs(startedAt));
+							meter.recordQueueTaskOutcome(common, outcome, require_http.getDurationMs(startedAt));
 							meter.decrementQueueTaskInFlight(common);
 							span.end();
 						}
@@ -3335,7 +3080,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 								common.activityType = activityType;
 							});
 						} catch (e) {
-							const aborted = isAbortError(e);
+							const aborted = require_http.isAbortError(e);
 							outcome = aborted ? "aborted" : "failed";
 							if (!aborted) span.setStatus({
 								code: _opentelemetry_api.SpanStatusCode.ERROR,
@@ -3343,7 +3088,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 							});
 							throw e;
 						} finally {
-							meter.recordQueueTaskOutcome(common, outcome, getDurationMs(startedAt));
+							meter.recordQueueTaskOutcome(common, outcome, require_http.getDurationMs(startedAt));
 							meter.decrementQueueTaskInFlight(common);
 							span.end();
 						}
@@ -3430,9 +3175,9 @@ var FederationImpl = class extends FederationBuilderImpl {
 				message: String(error)
 			});
 			const remoteHost = (() => {
-				if (error instanceof SendActivityError) return getRemoteHost(error.inbox);
+				if (error instanceof SendActivityError) return require_http.getRemoteHost(error.inbox);
 				try {
-					return getRemoteHost(new URL(message.inbox));
+					return require_http.getRemoteHost(new URL(message.inbox));
 				} catch (_) {
 					logger.warn("Invalid inbox URL in queued outbox message: {inbox}", logData);
 					return;
@@ -3459,7 +3204,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 				});
 			}
 			if (error instanceof SendActivityError && this.permanentFailureStatusCodes.includes(error.statusCode)) {
-				getFederationMetrics(this.meterProvider).recordPermanentFailure(error.inbox, error.statusCode);
+				require_http.getFederationMetrics(this.meterProvider).recordPermanentFailure(error.inbox, error.statusCode);
 				logger.warn("Permanent delivery failure for activity {activityId} to {inbox} ({status}); not retrying.", {
 					...logData,
 					status: error.statusCode
@@ -3513,7 +3258,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 				const { outboxQueue } = this;
 				if (outboxQueue != null) {
 					await outboxQueue.enqueue(retryMessage, { delay: Temporal.Duration.compare(delay, { seconds: 0 }) < 0 ? Temporal.Duration.from({ seconds: 0 }) : delay });
-					getFederationMetrics(this.meterProvider).recordQueueTaskEnqueued({
+					require_http.getFederationMetrics(this.meterProvider).recordQueueTaskEnqueued({
 						role: "outbox",
 						queue: outboxQueue,
 						activityType: retryMessage.activityType
@@ -3583,7 +3328,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 				try {
 					await listener(context.toInboxContext(message.identifier, message.activity, activity.id?.href, activityType), activity);
 				} finally {
-					getFederationMetrics(this.meterProvider).recordInboxProcessingDuration(activityType, getDurationMs(started));
+					require_http.getFederationMetrics(this.meterProvider).recordInboxProcessingDuration(activityType, require_http.getDurationMs(started));
 				}
 			} catch (error) {
 				try {
@@ -3630,7 +3375,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 					const { inboxQueue } = this;
 					if (inboxQueue != null) {
 						await inboxQueue.enqueue(retryMessage, { delay: Temporal.Duration.compare(delay, { seconds: 0 }) < 0 ? Temporal.Duration.from({ seconds: 0 }) : delay });
-						getFederationMetrics(this.meterProvider).recordQueueTaskEnqueued({
+						require_http.getFederationMetrics(this.meterProvider).recordQueueTaskEnqueued({
 							role: "inbox",
 							queue: inboxQueue,
 							activityType
@@ -3827,7 +3572,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 		if (outboxQueue.enqueueMany == null || orderingKey != null) {
 			const errors = (await Promise.allSettled(messages.map(async (m) => {
 				await outboxQueue.enqueue(m.message, { orderingKey: m.orderingKey });
-				recordOutboxEnqueue(this.meterProvider, outboxQueue, m.message);
+				require_http.recordOutboxEnqueue(this.meterProvider, outboxQueue, m.message);
 			}))).filter((r) => r.status === "rejected").map((r) => r.reason);
 			if (errors.length > 0) {
 				logger.error("Failed to enqueue activity {activityId} to send later: {errors}", {
@@ -3847,7 +3592,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 				});
 				throw error;
 			}
-			for (const m of messages) recordOutboxEnqueue(this.meterProvider, outboxQueue, m.message);
+			for (const m of messages) require_http.recordOutboxEnqueue(this.meterProvider, outboxQueue, m.message);
 		}
 	}
 	fetch(request, options) {
@@ -3883,7 +3628,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 						});
 						if (acceptsJsonLd(request)) response.headers.set("Vary", "Accept");
 					} catch (error) {
-						getFederationMetrics(this.meterProvider).recordHttpServerRequest(request.method, metricState.endpoint ?? "error", getDurationMs(metricStart), { routeTemplate: metricState.routeTemplate });
+						require_http.getFederationMetrics(this.meterProvider).recordHttpServerRequest(request.method, metricState.endpoint ?? "error", require_http.getDurationMs(metricStart), { routeTemplate: metricState.routeTemplate });
 						span.setStatus({
 							code: _opentelemetry_api.SpanStatusCode.ERROR,
 							message: `${error}`
@@ -3896,7 +3641,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 						});
 						throw error;
 					}
-					getFederationMetrics(this.meterProvider).recordHttpServerRequest(request.method, metricState.endpoint ?? "error", getDurationMs(metricStart), {
+					require_http.getFederationMetrics(this.meterProvider).recordHttpServerRequest(request.method, metricState.endpoint ?? "error", require_http.getDurationMs(metricStart), {
 						statusCode: response.status,
 						routeTemplate: metricState.routeTemplate
 					});
@@ -4663,7 +4408,7 @@ var ContextImpl = class ContextImpl {
 		};
 		if (!this.federation.manuallyStartQueue) this.federation._startQueueInternal(this.data);
 		await this.federation.fanoutQueue.enqueue(message, { orderingKey: options.orderingKey });
-		getFederationMetrics(this.federation.meterProvider).recordQueueTaskEnqueued({
+		require_http.getFederationMetrics(this.federation.meterProvider).recordQueueTaskEnqueued({
 			role: "fanout",
 			queue: this.federation.fanoutQueue,
 			activityType: message.activityType
@@ -4731,6 +4476,7 @@ var ContextImpl = class ContextImpl {
 		if (await require_proof.verifyObject(_fedify_vocab.Activity, json, {
 			contextLoader,
 			documentLoader: options.documentLoader ?? this.documentLoader,
+			meterProvider: this.meterProvider,
 			tracerProvider: options.tracerProvider ?? this.tracerProvider,
 			keyCache
 		}) == null) {
@@ -4873,6 +4619,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
 		});
 	}
@@ -5050,7 +4797,7 @@ async function forwardActivityInternal(ctx, loggerCategory, forwarder, recipient
 	if (outboxQueue.enqueueMany == null || orderingKey != null) {
 		const errors = (await Promise.allSettled(messages.map(async (m) => {
 			await outboxQueue.enqueue(m.message, { orderingKey: m.orderingKey });
-			recordOutboxEnqueue(ctx.federation.meterProvider, outboxQueue, m.message);
+			require_http.recordOutboxEnqueue(ctx.federation.meterProvider, outboxQueue, m.message);
 		}))).filter((r) => r.status === "rejected").map((r) => r.reason);
 		if (errors.length > 0) {
 			logger.error("Failed to enqueue activity {activityId} to forward later:\n{errors}", {
@@ -5070,7 +4817,7 @@ async function forwardActivityInternal(ctx, loggerCategory, forwarder, recipient
 			});
 			throw error;
 		}
-		for (const m of messages) recordOutboxEnqueue(ctx.federation.meterProvider, outboxQueue, m.message);
+		for (const m of messages) require_http.recordOutboxEnqueue(ctx.federation.meterProvider, outboxQueue, m.message);
 	}
 	return true;
 }

package/dist/{mod-DXY9JF28.d.cts → mod-B-Lin9Sy.d.ts}

@@ -1,8 +1,8 @@
 /// <reference lib="esnext.temporal" />
-import { S as KeyCache } from "./http-C87EWkO0.cjs";
+import { S as KeyCache } from "./http-D6LP89UO.js";
 import { CryptographicKey, DataIntegrityProof, Multikey, Object as Object$1 } from "@fedify/vocab";
+import { MeterProvider, TracerProvider } from "@opentelemetry/api";
 import { DocumentLoader } from "@fedify/vocab-runtime";
-import { TracerProvider } from "@opentelemetry/api";
 
 //#region src/sig/ld.d.ts
 /**
@@ -127,9 +127,26 @@ interface VerifySignatureOptions {
   * @since 1.3.0
   */
   tracerProvider?: TracerProvider;
+  /**
+  * The OpenTelemetry meter provider.  If omitted, the global meter provider
+  * is used.
+  * @since 2.3.0
+  */
+  meterProvider?: MeterProvider;
 }
 /**
 * Verifies Linked Data Signatures of the given JSON-LD document.
+*
+* This is a low-level utility that only checks the cryptographic signature
+* and (optionally) the cached key.  It does not run the JSON-LD parsing,
+* attribution, and owner checks that a complete inbound LD verification
+* needs.  For incoming activities, prefer {@link verifyJsonLd}, which is
+* the public verification entry point and the one that emits the
+* `activitypub.signature.verification.duration` metric for the LD path.
+* `verifySignature` itself only emits
+* `activitypub.signature.key_fetch.duration`, since the rest of the work
+* that the verification-duration metric is meant to cover happens in
+* `verifyJsonLd`.
 * @param jsonLd The JSON-LD document to verify.
 * @param options Options for verifying the signature.
 * @returns The public key that signed the document or `null` if the signature
@@ -246,6 +263,12 @@ interface VerifyProofOptions {
   * @since 1.3.0
   */
   tracerProvider?: TracerProvider;
+  /**
+  * The OpenTelemetry meter provider.  If omitted, the global meter provider
+  * is used.
+  * @since 2.3.0
+  */
+  meterProvider?: MeterProvider;
 }
 /**
 * Verifies the given proof for the object.