@fedify/fedify 2.3.0-dev.1212 → 2.3.0-dev.1213

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-CcGypkzd.mjs";
+import { t as hasMalformedKnownTemporalLiteral } from "../temporal-gfUaZjGU.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

@@ -5,8 +5,8 @@ import { r as createRequestContext } from "../context-DVoTs_wM.mjs";
 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-BmSzD5U9.mjs";
+import { t as MemoryKvStore } from "../kv-rV3vodCc.mjs";
+import { o as createFederation, s as handleWebFinger } from "../middleware-Cq9S8A5O.mjs";
 import { Image, Link, Person, Tombstone } from "@fedify/vocab";
 import { createTestMeterProvider, test } from "@fedify/fixture";
 //#region src/federation/webfinger.test.ts

package/dist/{http-Czeyq7if.cjs → http-B1zlPuh3.cjs}

@@ -11,7 +11,7 @@ let _opentelemetry_semantic_conventions = require("@opentelemetry/semantic-conve
 let byte_encodings_base64 = require("byte-encodings/base64");
 //#region deno.json
 var name = "@fedify/fedify";
-var version = "2.3.0-dev.1212+3737de7f";
+var version = "2.3.0-dev.1213+8ffffeb8";
 //#endregion
 //#region src/sig/accept.ts
 /**
@@ -169,6 +169,7 @@ var FederationMetrics = class {
 	queueTaskFailed;
 	queueTaskDuration;
 	queueTaskInFlight;
+	queueDepth;
 	fanoutRecipients;
 	inboxActivity;
 	outboxActivity;
@@ -200,7 +201,22 @@ var FederationMetrics = class {
 		});
 		this.signatureVerificationDuration = meter.createHistogram("activitypub.signature.verification.duration", {
 			description: "Duration of ActivityPub signature verification, including local key lookup and remote key fetches.",
-			unit: "ms"
+			unit: "ms",
+			advice: { explicitBucketBoundaries: [
+				.1,
+				.25,
+				.5,
+				1,
+				2.5,
+				5,
+				10,
+				25,
+				50,
+				100,
+				250,
+				500,
+				1e3
+			] }
 		});
 		this.signatureKeyFetchDuration = meter.createHistogram("activitypub.signature.key_fetch.duration", {
 			description: "Duration of public key lookup performed during ActivityPub signature verification.",
@@ -278,6 +294,10 @@ var FederationMetrics = class {
 			description: "Queue tasks currently being processed in this Fedify process.",
 			unit: "{task}"
 		});
+		this.queueDepth = meter.createObservableGauge("fedify.queue.depth", {
+			description: "Messages waiting in configured Fedify queues, as reported by the queue backend.",
+			unit: "{message}"
+		});
 		this.fanoutRecipients = meter.createHistogram("activitypub.fanout.recipients", {
 			description: "Number of recipient inboxes produced by an ActivityPub fanout task.",
 			unit: "{recipient}"
@@ -585,6 +605,57 @@ function getQueueBackend(queue) {
 	return name;
 }
 /**
+* Registers a callback for observing queue backend depth.
+* @since 2.3.0
+*/
+function registerQueueDepthGauge(meterProvider, entries, options = {}) {
+	const uniqueQueues = /* @__PURE__ */ new Map();
+	for (const { role, queue } of entries) {
+		if (queue?.getDepth == null) continue;
+		const roles = uniqueQueues.get(queue);
+		if (roles == null) uniqueQueues.set(queue, [role]);
+		else if (!roles.includes(role)) roles.push(role);
+	}
+	if (uniqueQueues.size < 1) return;
+	const queueEntries = Array.from(uniqueQueues.entries());
+	getFederationMetrics(meterProvider).queueDepth.addCallback(async (observableResult) => {
+		await Promise.all(queueEntries.map(async ([queue, roles]) => {
+			let depth;
+			try {
+				depth = await queue.getDepth();
+			} catch {
+				return;
+			}
+			if (depth == null) return;
+			const attributes = buildQueueDepthAttributes(queue, roles, options);
+			observableResult.observe(depth.queued, {
+				...attributes,
+				"fedify.queue.depth.state": "queued"
+			});
+			if (depth.ready != null) observableResult.observe(depth.ready, {
+				...attributes,
+				"fedify.queue.depth.state": "ready"
+			});
+			if (depth.delayed != null) observableResult.observe(depth.delayed, {
+				...attributes,
+				"fedify.queue.depth.state": "delayed"
+			});
+		}));
+	});
+}
+function buildQueueDepthAttributes(queue, roles, options) {
+	const sortedRoles = roles.toSorted();
+	const role = sortedRoles.length === 1 ? sortedRoles[0] : "shared";
+	const attributes = { "fedify.queue.role": role };
+	if (options.sourceId != null) attributes["fedify.federation.instance_id"] = options.sourceId;
+	if (role === "shared") attributes["fedify.queue.roles"] = sortedRoles.join(",");
+	const backend = getQueueBackend(queue);
+	if (backend != null) attributes["fedify.queue.backend"] = backend;
+	const nativeRetrial = queue.nativeRetrial;
+	if (typeof nativeRetrial === "boolean") attributes["fedify.queue.native_retrial"] = nativeRetrial;
+	return attributes;
+}
+/**
 * Records `fedify.queue.task.enqueued` for an outgoing outbox enqueue and,
 * for the initial attempt, also records
 * `activitypub.outbox.activity{queued}`.
@@ -2500,6 +2571,12 @@ Object.defineProperty(exports, "recordWebFingerHandle", {
 		return recordWebFingerHandle;
 	}
 });
+Object.defineProperty(exports, "registerQueueDepthGauge", {
+	enumerable: true,
+	get: function() {
+		return registerQueueDepthGauge;
+	}
+});
 Object.defineProperty(exports, "signRequest", {
 	enumerable: true,
 	get: function() {

package/dist/{http-BEG9kx13.js → http-B_WbYMnB.js}

@@ -10,7 +10,7 @@ import { ATTR_HTTP_REQUEST_HEADER, ATTR_HTTP_REQUEST_METHOD, ATTR_URL_FULL } fro
 import { decodeBase64, encodeBase64 } from "byte-encodings/base64";
 //#region deno.json
 var name = "@fedify/fedify";
-var version = "2.3.0-dev.1212+3737de7f";
+var version = "2.3.0-dev.1213+8ffffeb8";
 //#endregion
 //#region src/sig/accept.ts
 /**
@@ -168,6 +168,7 @@ var FederationMetrics = class {
 	queueTaskFailed;
 	queueTaskDuration;
 	queueTaskInFlight;
+	queueDepth;
 	fanoutRecipients;
 	inboxActivity;
 	outboxActivity;
@@ -199,7 +200,22 @@ var FederationMetrics = class {
 		});
 		this.signatureVerificationDuration = meter.createHistogram("activitypub.signature.verification.duration", {
 			description: "Duration of ActivityPub signature verification, including local key lookup and remote key fetches.",
-			unit: "ms"
+			unit: "ms",
+			advice: { explicitBucketBoundaries: [
+				.1,
+				.25,
+				.5,
+				1,
+				2.5,
+				5,
+				10,
+				25,
+				50,
+				100,
+				250,
+				500,
+				1e3
+			] }
 		});
 		this.signatureKeyFetchDuration = meter.createHistogram("activitypub.signature.key_fetch.duration", {
 			description: "Duration of public key lookup performed during ActivityPub signature verification.",
@@ -277,6 +293,10 @@ var FederationMetrics = class {
 			description: "Queue tasks currently being processed in this Fedify process.",
 			unit: "{task}"
 		});
+		this.queueDepth = meter.createObservableGauge("fedify.queue.depth", {
+			description: "Messages waiting in configured Fedify queues, as reported by the queue backend.",
+			unit: "{message}"
+		});
 		this.fanoutRecipients = meter.createHistogram("activitypub.fanout.recipients", {
 			description: "Number of recipient inboxes produced by an ActivityPub fanout task.",
 			unit: "{recipient}"
@@ -584,6 +604,57 @@ function getQueueBackend(queue) {
 	return name;
 }
 /**
+* Registers a callback for observing queue backend depth.
+* @since 2.3.0
+*/
+function registerQueueDepthGauge(meterProvider, entries, options = {}) {
+	const uniqueQueues = /* @__PURE__ */ new Map();
+	for (const { role, queue } of entries) {
+		if (queue?.getDepth == null) continue;
+		const roles = uniqueQueues.get(queue);
+		if (roles == null) uniqueQueues.set(queue, [role]);
+		else if (!roles.includes(role)) roles.push(role);
+	}
+	if (uniqueQueues.size < 1) return;
+	const queueEntries = Array.from(uniqueQueues.entries());
+	getFederationMetrics(meterProvider).queueDepth.addCallback(async (observableResult) => {
+		await Promise.all(queueEntries.map(async ([queue, roles]) => {
+			let depth;
+			try {
+				depth = await queue.getDepth();
+			} catch {
+				return;
+			}
+			if (depth == null) return;
+			const attributes = buildQueueDepthAttributes(queue, roles, options);
+			observableResult.observe(depth.queued, {
+				...attributes,
+				"fedify.queue.depth.state": "queued"
+			});
+			if (depth.ready != null) observableResult.observe(depth.ready, {
+				...attributes,
+				"fedify.queue.depth.state": "ready"
+			});
+			if (depth.delayed != null) observableResult.observe(depth.delayed, {
+				...attributes,
+				"fedify.queue.depth.state": "delayed"
+			});
+		}));
+	});
+}
+function buildQueueDepthAttributes(queue, roles, options) {
+	const sortedRoles = roles.toSorted();
+	const role = sortedRoles.length === 1 ? sortedRoles[0] : "shared";
+	const attributes = { "fedify.queue.role": role };
+	if (options.sourceId != null) attributes["fedify.federation.instance_id"] = options.sourceId;
+	if (role === "shared") attributes["fedify.queue.roles"] = sortedRoles.join(",");
+	const backend = getQueueBackend(queue);
+	if (backend != null) attributes["fedify.queue.backend"] = backend;
+	const nativeRetrial = queue.nativeRetrial;
+	if (typeof nativeRetrial === "boolean") attributes["fedify.queue.native_retrial"] = nativeRetrial;
+	return attributes;
+}
+/**
 * Records `fedify.queue.task.enqueued` for an outgoing outbox enqueue and,
 * for the initial attempt, also records
 * `activitypub.outbox.activity{queued}`.
@@ -2331,4 +2402,4 @@ function timingSafeEqual(a, b) {
 	return result === 0;
 }
 //#endregion
-export { fulfillAcceptSignature as A, recordDocumentCache as C, recordOutboxEnqueue as D, recordOutboxActivity as E, validateAcceptSignature as M, name as N, recordWebFingerHandle as O, version as P, recordCollectionTotalItems as S, recordInboxActivity as T, measureSignatureKeyFetch as _, verifyRequestDetailed as a, recordCollectionPageItems as b, fetchKeyDetailed as c, validateCryptoKey as d, getDurationMs as f, isAbortError$1 as g, instrumentDocumentLoader as h, verifyRequest as i, parseAcceptSignature as j, formatAcceptSignature as k, generateCryptoKeyPair as l, getRemoteHost as m, parseRfc9421SignatureInput as n, exportJwk as o, getFederationMetrics as p, signRequest as r, fetchKey as s, doubleKnock as t, importJwk as u, recordCircuitBreakerStateChange as v, recordFanoutRecipients as w, recordCollectionRequest as x, recordCollectionDispatchDuration as y };
+export { formatAcceptSignature as A, recordDocumentCache as C, recordOutboxEnqueue as D, recordOutboxActivity as E, version as F, parseAcceptSignature as M, validateAcceptSignature as N, recordWebFingerHandle as O, name as P, recordCollectionTotalItems as S, recordInboxActivity as T, measureSignatureKeyFetch as _, verifyRequestDetailed as a, recordCollectionPageItems as b, fetchKeyDetailed as c, validateCryptoKey as d, getDurationMs as f, isAbortError$1 as g, instrumentDocumentLoader as h, verifyRequest as i, fulfillAcceptSignature as j, registerQueueDepthGauge as k, generateCryptoKeyPair as l, getRemoteHost as m, parseRfc9421SignatureInput as n, exportJwk as o, getFederationMetrics as p, signRequest as r, fetchKey as s, doubleKnock as t, importJwk as u, recordCircuitBreakerStateChange as v, recordFanoutRecipients as w, recordCollectionRequest as x, recordCollectionDispatchDuration as y };

package/dist/{http-ByCfCX5K.mjs → http-CDaMGwCP.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-DTaoLXHr.mjs";
-import { n as getDurationMs, r as getFederationMetrics, s as measureSignatureKeyFetch } from "./metrics-uwSF8DLC.mjs";
-import { i as validateAcceptSignature, n as fulfillAcceptSignature, r as parseAcceptSignature } from "./accept-CceiKpCy.mjs";
-import { o as validateCryptoKey, r as fetchKeyDetailed } from "./key-Bhsx9PrC.mjs";
+import { n as version, t as name } from "./deno-BUzynMVz.mjs";
+import { n as getDurationMs, r as getFederationMetrics, s as measureSignatureKeyFetch } from "./metrics-B5vvJYMV.mjs";
+import { i as validateAcceptSignature, n as fulfillAcceptSignature, r as parseAcceptSignature } from "./accept-CPkZzmGN.mjs";
+import { o as validateCryptoKey, r as fetchKeyDetailed } from "./key-DdP4HxTK.mjs";
 import { getLogger } from "@logtape/logtape";
 import { CryptographicKey } from "@fedify/vocab";
 import { SpanStatusCode, trace } from "@opentelemetry/api";

package/dist/{key-Bhsx9PrC.mjs → key-DdP4HxTK.mjs}

@@ -1,8 +1,8 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-DTaoLXHr.mjs";
-import { _ as recordKeyLookup, n as getDurationMs, t as classifyFetchError } from "./metrics-uwSF8DLC.mjs";
+import { n as version, t as name } from "./deno-BUzynMVz.mjs";
+import { _ as recordKeyLookup, n as getDurationMs, t as classifyFetchError } from "./metrics-B5vvJYMV.mjs";
 import { getLogger } from "@logtape/logtape";
 import { CryptographicKey, Object as Object$1, isActor } from "@fedify/vocab";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";

package/dist/{kv-cache-qRBN2G2Z.cjs → kv-cache-CPIfTWt5.cjs}

@@ -1,7 +1,7 @@
 const { Temporal } = require("@js-temporal/polyfill");
 const { URLPattern } = require("urlpattern-polyfill");
 require("./chunk-DDcVe30Y.cjs");
-const require_http = require("./http-Czeyq7if.cjs");
+const require_http = require("./http-B1zlPuh3.cjs");
 let _logtape_logtape = require("@logtape/logtape");
 let es_toolkit = require("es-toolkit");
 let _fedify_vocab_runtime = require("@fedify/vocab-runtime");

package/dist/{kv-cache-D9U1AnXH.js → kv-cache-CXo8QM4m.js}

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

package/dist/{kv-cache-D4jzgeYW.mjs → kv-cache-DSjv5Aeh.mjs}

@@ -1,7 +1,7 @@
 import { Temporal } from "@js-temporal/polyfill";
 import { URLPattern } from "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { p as recordDocumentCache } from "./metrics-uwSF8DLC.mjs";
+import { p as recordDocumentCache } from "./metrics-B5vvJYMV.mjs";
 import { getLogger } from "@logtape/logtape";
 import { preloadedContexts } from "@fedify/vocab-runtime";
 //#region src/utils/kv-cache.ts

package/dist/{ld-CHtLb_Uh.mjs → ld-CuOEh5aB.mjs}

@@ -1,9 +1,9 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-DTaoLXHr.mjs";
-import { n as getDurationMs, r as getFederationMetrics, s as measureSignatureKeyFetch } from "./metrics-uwSF8DLC.mjs";
-import { n as fetchKey, o as validateCryptoKey } from "./key-Bhsx9PrC.mjs";
+import { n as version, t as name } from "./deno-BUzynMVz.mjs";
+import { n as getDurationMs, r as getFederationMetrics, s as measureSignatureKeyFetch } from "./metrics-B5vvJYMV.mjs";
+import { n as fetchKey, o as validateCryptoKey } from "./key-DdP4HxTK.mjs";
 import { getLogger } from "@logtape/logtape";
 import { Activity, CryptographicKey, Object as Object$1, getTypeId } from "@fedify/vocab";
 import { SpanStatusCode, trace } from "@opentelemetry/api";

package/dist/{metrics-uwSF8DLC.mjs → metrics-B5vvJYMV.mjs}

@@ -1,7 +1,7 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-DTaoLXHr.mjs";
+import { n as version, t as name } from "./deno-BUzynMVz.mjs";
 import { metrics } from "@opentelemetry/api";
 import { FetchError } from "@fedify/vocab-runtime";
 //#region src/federation/metrics.ts
@@ -21,6 +21,7 @@ var FederationMetrics = class {
 	queueTaskFailed;
 	queueTaskDuration;
 	queueTaskInFlight;
+	queueDepth;
 	fanoutRecipients;
 	inboxActivity;
 	outboxActivity;
@@ -52,7 +53,22 @@ var FederationMetrics = class {
 		});
 		this.signatureVerificationDuration = meter.createHistogram("activitypub.signature.verification.duration", {
 			description: "Duration of ActivityPub signature verification, including local key lookup and remote key fetches.",
-			unit: "ms"
+			unit: "ms",
+			advice: { explicitBucketBoundaries: [
+				.1,
+				.25,
+				.5,
+				1,
+				2.5,
+				5,
+				10,
+				25,
+				50,
+				100,
+				250,
+				500,
+				1e3
+			] }
 		});
 		this.signatureKeyFetchDuration = meter.createHistogram("activitypub.signature.key_fetch.duration", {
 			description: "Duration of public key lookup performed during ActivityPub signature verification.",
@@ -130,6 +146,10 @@ var FederationMetrics = class {
 			description: "Queue tasks currently being processed in this Fedify process.",
 			unit: "{task}"
 		});
+		this.queueDepth = meter.createObservableGauge("fedify.queue.depth", {
+			description: "Messages waiting in configured Fedify queues, as reported by the queue backend.",
+			unit: "{message}"
+		});
 		this.fanoutRecipients = meter.createHistogram("activitypub.fanout.recipients", {
 			description: "Number of recipient inboxes produced by an ActivityPub fanout task.",
 			unit: "{recipient}"
@@ -437,6 +457,57 @@ function getQueueBackend(queue) {
 	return name;
 }
 /**
+* Registers a callback for observing queue backend depth.
+* @since 2.3.0
+*/
+function registerQueueDepthGauge(meterProvider, entries, options = {}) {
+	const uniqueQueues = /* @__PURE__ */ new Map();
+	for (const { role, queue } of entries) {
+		if (queue?.getDepth == null) continue;
+		const roles = uniqueQueues.get(queue);
+		if (roles == null) uniqueQueues.set(queue, [role]);
+		else if (!roles.includes(role)) roles.push(role);
+	}
+	if (uniqueQueues.size < 1) return;
+	const queueEntries = Array.from(uniqueQueues.entries());
+	getFederationMetrics(meterProvider).queueDepth.addCallback(async (observableResult) => {
+		await Promise.all(queueEntries.map(async ([queue, roles]) => {
+			let depth;
+			try {
+				depth = await queue.getDepth();
+			} catch {
+				return;
+			}
+			if (depth == null) return;
+			const attributes = buildQueueDepthAttributes(queue, roles, options);
+			observableResult.observe(depth.queued, {
+				...attributes,
+				"fedify.queue.depth.state": "queued"
+			});
+			if (depth.ready != null) observableResult.observe(depth.ready, {
+				...attributes,
+				"fedify.queue.depth.state": "ready"
+			});
+			if (depth.delayed != null) observableResult.observe(depth.delayed, {
+				...attributes,
+				"fedify.queue.depth.state": "delayed"
+			});
+		}));
+	});
+}
+function buildQueueDepthAttributes(queue, roles, options) {
+	const sortedRoles = roles.toSorted();
+	const role = sortedRoles.length === 1 ? sortedRoles[0] : "shared";
+	const attributes = { "fedify.queue.role": role };
+	if (options.sourceId != null) attributes["fedify.federation.instance_id"] = options.sourceId;
+	if (role === "shared") attributes["fedify.queue.roles"] = sortedRoles.join(",");
+	const backend = getQueueBackend(queue);
+	if (backend != null) attributes["fedify.queue.backend"] = backend;
+	const nativeRetrial = queue.nativeRetrial;
+	if (typeof nativeRetrial === "boolean") attributes["fedify.queue.native_retrial"] = nativeRetrial;
+	return attributes;
+}
+/**
 * Records `fedify.queue.task.enqueued` for an outgoing outbox enqueue and,
 * for the initial attempt, also records
 * `activitypub.outbox.activity{queued}`.
@@ -741,4 +812,4 @@ function getDurationMs(start) {
 	return Math.max(0, performance.now() - start);
 }
 //#endregion
-export { recordKeyLookup as _, instrumentDocumentLoader as a, recordWebFingerHandle as b, recordCircuitBreakerStateChange as c, recordCollectionRequest as d, recordCollectionTotalItems as f, recordInboxActivity as g, recordFanoutRecipients as h, getRemoteHost as i, recordCollectionDispatchDuration as l, recordDocumentFetch as m, getDurationMs as n, isAbortError as o, recordDocumentCache as p, getFederationMetrics as r, measureSignatureKeyFetch as s, classifyFetchError as t, recordCollectionPageItems as u, recordOutboxActivity as v, recordOutboxEnqueue as y };
+export { recordKeyLookup as _, instrumentDocumentLoader as a, recordWebFingerHandle as b, recordCircuitBreakerStateChange as c, recordCollectionRequest as d, recordCollectionTotalItems as f, recordInboxActivity as g, recordFanoutRecipients as h, getRemoteHost as i, recordCollectionDispatchDuration as l, recordDocumentFetch as m, getDurationMs as n, isAbortError as o, recordDocumentCache as p, getFederationMetrics as r, measureSignatureKeyFetch as s, classifyFetchError as t, recordCollectionPageItems as u, recordOutboxActivity as v, registerQueueDepthGauge as x, recordOutboxEnqueue as y };