@fedify/fedify 2.3.0-dev.1013 → 2.3.0-dev.1034

package/dist/{builder-CROLcFVM.mjs → builder-y06Dq5bp.mjs}

@@ -2,12 +2,13 @@ import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { n as RouterError, t as Router } from "./router-CrMLXoOr.mjs";
-import { n as version, t as name } from "./deno-Ctd-K-t6.mjs";
-import { t as ActivityListenerSet } from "./activity-listener-ell7W1s9.mjs";
+import { n as version, t as name } from "./deno-DB1H1VHx.mjs";
+import { t as ActivityListenerSet } from "./activity-listener-tztVvlNb.mjs";
 import { Tombstone, getTypeId } from "@fedify/vocab";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
 import { getLogger } from "@logtape/logtape";
 //#region src/federation/builder.ts
+const ACTOR_ALIAS_PREFIX = "actorAlias:";
 function validateSingleIdentifierVariablePath(path, errorMessage) {
 	const operatorMatches = globalThis.Array.from(path.matchAll(/{([+#./;?&]?)([A-Za-z_][A-Za-z0-9_]*)}/g));
 	if (operatorMatches.length !== 1 || operatorMatches[0]?.[2] !== "identifier") throw new RouterError(errorMessage);
@@ -58,7 +59,7 @@ var FederationBuilderImpl = class {
 		this.collectionTypeIds = {};
 	}
 	async build(options) {
-		const { FederationImpl } = await import("./middleware-C1cf3_6V.mjs");
+		const { FederationImpl } = await import("./middleware-cMxbPxDe.mjs");
 		const f = new FederationImpl(options);
 		const trailingSlashInsensitiveValue = f.router.trailingSlashInsensitive;
 		f.router = this.router.clone();
@@ -194,6 +195,15 @@ var FederationBuilderImpl = class {
 				callbacks.aliasMapper = mapper;
 				return setters;
 			},
+			mapActorAlias: (path, identifier) => {
+				if (identifier === "") throw new RouterError("Identifier cannot be empty.");
+				if (this.router.has(`actorAlias:${identifier}`)) throw new RouterError(`Actor alias for "${identifier}" already set.`);
+				if (new Router().add(path, "temp").size > 0) throw new RouterError("Path for actor alias must have no variables.");
+				const existingRoute = this.router.route(path);
+				if (existingRoute != null) throw new RouterError(`Actor alias path "${path}" conflicts with existing route "${existingRoute.name}".`);
+				this.router.add(path, `${ACTOR_ALIAS_PREFIX}${identifier}`);
+				return setters;
+			},
 			authorize(predicate) {
 				callbacks.authorizePredicate = predicate;
 				return setters;
@@ -578,4 +588,4 @@ function createFederationBuilder() {
 	return new FederationBuilderImpl();
 }
 //#endregion
-export { createFederationBuilder as n, FederationBuilderImpl as t };
+export { FederationBuilderImpl as n, createFederationBuilder as r, ACTOR_ALIAS_PREFIX as t };

package/dist/chunk-QSgtlS85.mjs

@@ -0,0 +1,29 @@
+import "@js-temporal/polyfill";
+import "urlpattern-polyfill";
+globalThis.addEventListener = () => {};
+import { createRequire } from "node:module";
+//#region \0rolldown/runtime.js
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __commonJSMin = (cb, mod) => () => (mod || cb((mod = { exports: {} }).exports, mod), mod.exports);
+var __copyProps = (to, from, except, desc) => {
+	if (from && typeof from === "object" || typeof from === "function") for (var keys = __getOwnPropNames(from), i = 0, n = keys.length, key; i < n; i++) {
+		key = keys[i];
+		if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
+			get: ((k) => from[k]).bind(null, key),
+			enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
+		});
+	}
+	return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
+	value: mod,
+	enumerable: true
+}) : target, mod));
+var __require = /* @__PURE__ */ createRequire(import.meta.url);
+//#endregion
+export { __require as n, __toESM as r, __commonJSMin as t };

package/dist/compat/mod.d.cts

@@ -1,4 +1,4 @@
-import { kt as ActivityTransformer, n as Context } from "../context-BDl7Y6f-.cjs";
+import { kt as ActivityTransformer, n as Context } from "../context-BKLGj9QO.cjs";
 import { Activity } from "@fedify/vocab";
 
 //#region src/compat/transformers.d.ts

package/dist/compat/mod.d.ts

@@ -1,6 +1,6 @@
 import { Temporal } from "@js-temporal/polyfill";
 import { URLPattern } from "urlpattern-polyfill";
-import { kt as ActivityTransformer, n as Context } from "../context-zTZAI3KP.js";
+import { kt as ActivityTransformer, n as Context } from "../context-DrNqYkPw.js";
 import { Activity } from "@fedify/vocab";
 
 //#region src/compat/transformers.d.ts

package/dist/compat/outgoing-jsonld.test.mjs

@@ -3,7 +3,7 @@ import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
 import { t as assertStrictEquals } from "../assert_strict_equals-Dmjbg-bA.mjs";
-import { n as normalizeAttachmentArrays, r as normalizeOutgoingActivityJsonLd, t as isPreloadedContextAttachmentSafe } from "../outgoing-jsonld-CNmZLixq.mjs";
+import { n as normalizeAttachmentArrays, r as normalizeOutgoingActivityJsonLd, t as isPreloadedContextAttachmentSafe } from "../outgoing-jsonld-Bi7n-dEy.mjs";
 import { mockDocumentLoader, test } from "@fedify/fixture";
 import { Create, Document, Note, PUBLIC_COLLECTION } from "@fedify/vocab";
 //#region src/compat/outgoing-jsonld.test.ts

package/dist/compat/public-audience.test.mjs

@@ -3,7 +3,7 @@ import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
 import { t as assertNotEquals } from "../assert_not_equals--wG9hV7u.mjs";
-import { t as normalizePublicAudience } from "../public-audience-DYFHzm_c.mjs";
+import { t as normalizePublicAudience } from "../public-audience-PVTwU_Ex.mjs";
 import { test } from "@fedify/fixture";
 import { Create, Note, PUBLIC_COLLECTION } from "@fedify/vocab";
 import { getDocumentLoader, preloadedContexts } from "@fedify/vocab-runtime";

package/dist/compat/transformers.test.mjs

@@ -4,8 +4,8 @@ globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
 import { t as assertInstanceOf } from "../assert_instance_of-C4Ri6VuN.mjs";
 import { t as assert } from "../assert-DikXweDx.mjs";
-import { t as MemoryKvStore } from "../kv-rV3vodCc.mjs";
-import { n as FederationImpl, v as actorDehydrator, y as autoIdAssigner } from "../middleware-CEWDB8EB.mjs";
+import { t as MemoryKvStore } from "../kv-x2IvBUyq.mjs";
+import { n as FederationImpl, v as actorDehydrator, y as autoIdAssigner } from "../middleware-pb2EqN_r.mjs";
 import { test } from "@fedify/fixture";
 import { Follow, Person } from "@fedify/vocab";
 //#region src/compat/transformers.test.ts

package/dist/{context-Dk_tacqz.mjs → context-7Azky82W.mjs}

@@ -5,10 +5,10 @@ import { n as RouterError } from "./router-CrMLXoOr.mjs";
 import { mockDocumentLoader } from "@fedify/fixture";
 import { lookupObject, traverseCollection } from "@fedify/vocab";
 import { lookupWebFinger } from "@fedify/webfinger";
-import { trace } from "@opentelemetry/api";
+import { metrics, trace } from "@opentelemetry/api";
 //#region src/testing/context.ts
 function createContext(values) {
-	const { federation, url = new URL("http://example.com/"), canonicalOrigin, data, documentLoader, contextLoader, tracerProvider, clone, getNodeInfoUri, getActorUri, getObjectUri, getCollectionUri, getOutboxUri, getInboxUri, getFollowingUri, getFollowersUri, getLikedUri, getFeaturedUri, getFeaturedTagsUri, parseUri, getActorKeyPairs, getDocumentLoader, lookupObject: lookupObject$1, traverseCollection: traverseCollection$1, lookupNodeInfo, lookupWebFinger: lookupWebFinger$1, sendActivity, routeActivity } = values;
+	const { federation, url = new URL("http://example.com/"), canonicalOrigin, data, documentLoader, contextLoader, meterProvider, tracerProvider, clone, getNodeInfoUri, getActorUri, getObjectUri, getCollectionUri, getOutboxUri, getInboxUri, getFollowingUri, getFollowersUri, getLikedUri, getFeaturedUri, getFeaturedTagsUri, parseUri, getActorKeyPairs, getDocumentLoader, lookupObject: lookupObject$1, traverseCollection: traverseCollection$1, lookupNodeInfo, lookupWebFinger: lookupWebFinger$1, sendActivity, routeActivity } = values;
 	function throwRouterError() {
 		throw new RouterError("Not implemented");
 	}
@@ -21,6 +21,7 @@ function createContext(values) {
 		hostname: url.hostname,
 		documentLoader: documentLoader ?? mockDocumentLoader,
 		contextLoader: contextLoader ?? mockDocumentLoader,
+		meterProvider: meterProvider ?? metrics.getMeterProvider(),
 		tracerProvider: tracerProvider ?? trace.getTracerProvider(),
 		clone: clone ?? ((data) => createContext({
 			...values,

package/dist/{context-BDl7Y6f-.d.cts → context-BKLGj9QO.d.cts}

@@ -5,7 +5,7 @@ import { n as KvStore, t as KvKey } from "./kv-CbLNp3zQ.cjs";
 import { Activity, Actor, Collection, CryptographicKey, Hashtag, Link, LookupObjectOptions, Multikey, Object as Object$1, Recipient, Tombstone, TraverseCollectionOptions } from "@fedify/vocab";
 import { AuthenticatedDocumentLoaderFactory, DocumentLoader, DocumentLoaderFactory, GetUserAgentOptions } from "@fedify/vocab-runtime";
 import { Link as Link$1, LookupWebFingerOptions, ResourceDescriptor } from "@fedify/webfinger";
-import { Span, Tracer, TracerProvider } from "@opentelemetry/api";
+import { MeterProvider, Span, Tracer, TracerProvider } from "@opentelemetry/api";
 
 //#region src/compat/types.d.ts
 /**
@@ -1634,6 +1634,12 @@ interface FederationOptions<TContextData> {
   * @since 1.3.0
   */
   tracerProvider?: TracerProvider;
+  /**
+  * The OpenTelemetry meter provider for recording metrics.  If not provided,
+  * the default global meter provider is used.
+  * @since 2.3.0
+  */
+  meterProvider?: MeterProvider;
 }
 /**
 * Additional settings for the actor dispatcher.
@@ -1681,6 +1687,18 @@ interface ActorCallbackSetters<TContextData> {
   */
   mapAlias(mapper: ActorAliasMapper<TContextData>): ActorCallbackSetters<TContextData>;
   /**
+  * Maps a fixed path to a sentinel identifier.  It is useful for exposing
+  * a single, instance-level actor at a fixed path, such as `/actor` for
+  * a relay or `/bot` for a bot.
+  * @param path The fixed path to map to the identifier.
+  * @param identifier The sentinel identifier to map the path to.
+  * @returns The setters object so that settings can be chained.
+  * @throws {RouterError} If the provided path or identifier is invalid or fails
+  *                       runtime validation.
+  * @since 2.3.0
+  */
+  mapActorAlias(path: `/${string}`, identifier: string): ActorCallbackSetters<TContextData>;
+  /**
   * Specifies the conditions under which requests are authorized.
   * @param predicate A callback that returns whether a request is authorized.
   * @returns The setters object so that settings can be chained.
@@ -2039,6 +2057,11 @@ interface Context<TContextData> {
   */
   readonly tracerProvider: TracerProvider;
   /**
+  * The OpenTelemetry meter provider.
+  * @since 2.3.0
+  */
+  readonly meterProvider?: MeterProvider;
+  /**
   * The document loader for loading remote JSON-LD documents.
   */
   readonly documentLoader: DocumentLoader;

package/dist/{context-zTZAI3KP.d.ts → context-DrNqYkPw.d.ts}

@@ -5,7 +5,7 @@ import { o as VerifyRequestFailureReason, t as HttpMessageSignaturesSpec } from
 import { n as GetKeyOwnerOptions } from "./owner-74ARJ5TL.js";
 import { n as KvStore, t as KvKey } from "./kv-GFYnFoOl.js";
 import { Activity, Actor, Collection, CryptographicKey, Hashtag, Link, LookupObjectOptions, Multikey, Object as Object$1, Recipient, Tombstone, TraverseCollectionOptions } from "@fedify/vocab";
-import { Span, Tracer, TracerProvider } from "@opentelemetry/api";
+import { MeterProvider, Span, Tracer, TracerProvider } from "@opentelemetry/api";
 import { AuthenticatedDocumentLoaderFactory, DocumentLoader, DocumentLoaderFactory, GetUserAgentOptions } from "@fedify/vocab-runtime";
 import { Link as Link$1, LookupWebFingerOptions, ResourceDescriptor } from "@fedify/webfinger";
 
@@ -1636,6 +1636,12 @@ interface FederationOptions<TContextData> {
   * @since 1.3.0
   */
   tracerProvider?: TracerProvider;
+  /**
+  * The OpenTelemetry meter provider for recording metrics.  If not provided,
+  * the default global meter provider is used.
+  * @since 2.3.0
+  */
+  meterProvider?: MeterProvider;
 }
 /**
 * Additional settings for the actor dispatcher.
@@ -1683,6 +1689,18 @@ interface ActorCallbackSetters<TContextData> {
   */
   mapAlias(mapper: ActorAliasMapper<TContextData>): ActorCallbackSetters<TContextData>;
   /**
+  * Maps a fixed path to a sentinel identifier.  It is useful for exposing
+  * a single, instance-level actor at a fixed path, such as `/actor` for
+  * a relay or `/bot` for a bot.
+  * @param path The fixed path to map to the identifier.
+  * @param identifier The sentinel identifier to map the path to.
+  * @returns The setters object so that settings can be chained.
+  * @throws {RouterError} If the provided path or identifier is invalid or fails
+  *                       runtime validation.
+  * @since 2.3.0
+  */
+  mapActorAlias(path: `/${string}`, identifier: string): ActorCallbackSetters<TContextData>;
+  /**
   * Specifies the conditions under which requests are authorized.
   * @param predicate A callback that returns whether a request is authorized.
   * @returns The setters object so that settings can be chained.
@@ -2041,6 +2059,11 @@ interface Context<TContextData> {
   */
   readonly tracerProvider: TracerProvider;
   /**
+  * The OpenTelemetry meter provider.
+  * @since 2.3.0
+  */
+  readonly meterProvider?: MeterProvider;
+  /**
   * The document loader for loading remote JSON-LD documents.
   */
   readonly documentLoader: DocumentLoader;

package/dist/{deno-Ctd-K-t6.mjs → deno-DB1H1VHx.mjs}

@@ -3,6 +3,6 @@ import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 //#region deno.json
 var name = "@fedify/fedify";
-var version = "2.3.0-dev.1013+4aa6a88c";
+var version = "2.3.0-dev.1034+b85b5daa";
 //#endregion
 export { version as n, name as t };

package/dist/{docloader-q9QT51g3.mjs → docloader-3HwiWeYL.mjs}

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

package/dist/{esm-DVILvP5e.mjs → esm-DhnRLoG9.mjs}

@@ -1,30 +1,7 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import "node:module";
-//#region \0rolldown/runtime.js
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __commonJSMin = (cb, mod) => () => (mod || cb((mod = { exports: {} }).exports, mod), mod.exports);
-var __copyProps = (to, from, except, desc) => {
-	if (from && typeof from === "object" || typeof from === "function") for (var keys = __getOwnPropNames(from), i = 0, n = keys.length, key; i < n; i++) {
-		key = keys[i];
-		if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
-			get: ((k) => from[k]).bind(null, key),
-			enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
-		});
-	}
-	return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
-	value: mod,
-	enumerable: true
-}) : target, mod));
-//#endregion
+import { r as __toESM, t as __commonJSMin } from "./chunk-QSgtlS85.mjs";
 //#region ../../node_modules/.pnpm/glob-to-regexp@0.4.1/node_modules/glob-to-regexp/index.js
 var require_glob_to_regexp = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	module.exports = function(glob, opts) {

package/dist/execAsync-eck5rbtb.mjs

@@ -0,0 +1,13 @@
+import "@js-temporal/polyfill";
+import "urlpattern-polyfill";
+globalThis.addEventListener = () => {};
+import { n as __require, t as __commonJSMin } from "./chunk-QSgtlS85.mjs";
+//#region ../../node_modules/.pnpm/@opentelemetry+resources@2.5.0_@opentelemetry+api@1.9.0/node_modules/@opentelemetry/resources/build/src/detectors/platform/node/machine-id/execAsync.js
+var require_execAsync = /* @__PURE__ */ __commonJSMin(((exports) => {
+	Object.defineProperty(exports, "__esModule", { value: true });
+	exports.execAsync = void 0;
+	const child_process = __require("child_process");
+	exports.execAsync = __require("util").promisify(child_process.exec);
+}));
+//#endregion
+export { require_execAsync as t };

package/dist/federation/builder.test.mjs

@@ -5,8 +5,8 @@ import { n as RouterError } from "../router-CrMLXoOr.mjs";
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
 import { i as assertExists } from "../std__assert-CRDpx_HF.mjs";
 import { t as assertThrows } from "../assert_throws-4NwKEy2q.mjs";
-import { t as MemoryKvStore } from "../kv-rV3vodCc.mjs";
-import { n as createFederationBuilder } from "../builder-CROLcFVM.mjs";
+import { t as MemoryKvStore } from "../kv-x2IvBUyq.mjs";
+import { r as createFederationBuilder } from "../builder-y06Dq5bp.mjs";
 import { test } from "@fedify/fixture";
 import { Activity, Note, Person } from "@fedify/vocab";
 //#region src/federation/builder.test.ts
@@ -17,7 +17,11 @@ test("FederationBuilder", async (t) => {
 		const actorDispatcher = (_ctx, _identifier) => {
 			return null;
 		};
-		builder.setActorDispatcher("/users/{identifier}", actorDispatcher);
+		assertThrows(() => createFederationBuilder().setActorDispatcher("/users/{identifier}", actorDispatcher).mapActorAlias("/actor/{id}", "instance"), RouterError, "Path for actor alias must have no variables.");
+		assertThrows(() => createFederationBuilder().setActorDispatcher("/users/{identifier}", actorDispatcher).mapActorAlias("/actor", "instance").mapActorAlias("/bot", "instance"), RouterError, "Actor alias for \"instance\" already set.");
+		assertThrows(() => createFederationBuilder().setActorDispatcher("/users/{identifier}", actorDispatcher).mapActorAlias("/actor", "instance").mapActorAlias("/actor", "bot"), RouterError, "Actor alias path \"/actor\" conflicts with existing route \"actorAlias:instance\".");
+		assertThrows(() => createFederationBuilder().setActorDispatcher("/users/{identifier}", actorDispatcher).mapActorAlias("/actor", ""), RouterError, "Identifier cannot be empty.");
+		builder.setActorDispatcher("/users/{identifier}", actorDispatcher).mapActorAlias("/actor", "instance");
 		const inboxListener = (_ctx, _activity) => {};
 		builder.setInboxListeners("/users/{identifier}/inbox").on(Activity, inboxListener);
 		const outboxListener = (_ctx, _activity) => {};
@@ -52,6 +56,7 @@ test("FederationBuilder", async (t) => {
 		const impl = federation;
 		assertEquals(impl.router.route("/.well-known/webfinger")?.name, "webfinger");
 		assertEquals(impl.router.route("/users/test123")?.name, "actor");
+		assertEquals(impl.router.route("/actor")?.name, "actorAlias:instance");
 		assertEquals(impl.router.route("/users/test123/inbox")?.name, "inbox");
 		assertEquals(impl.router.route("/users/test123/outbox")?.name, "outbox");
 		assertEquals(impl.router.route("/notes/456")?.name, `object:${Note.typeId.href}`);

package/dist/federation/collection.test.mjs

@@ -3,7 +3,7 @@ import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
 import "../std__assert-CRDpx_HF.mjs";
-import { n as digest, t as buildCollectionSynchronizationHeader } from "../collection-D-HqUuA2.mjs";
+import { n as digest, t as buildCollectionSynchronizationHeader } from "../collection-CA3V5zyK.mjs";
 import { test } from "@fedify/fixture";
 import { decodeHex } from "byte-encodings/hex";
 //#region src/federation/collection.test.ts

package/dist/federation/handler.test.mjs

@@ -1,18 +1,18 @@
 import { Temporal } from "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as createOutboxContext, r as createRequestContext, t as createInboxContext } from "../context-Dk_tacqz.mjs";
+import { n as createOutboxContext, r as createRequestContext, t as createInboxContext } from "../context-7Azky82W.mjs";
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
-import "../std__assert-CRDpx_HF.mjs";
+import { r as assertGreaterOrEqual } from "../std__assert-CRDpx_HF.mjs";
 import { t as assertInstanceOf } from "../assert_instance_of-C4Ri6VuN.mjs";
 import { t as assert } from "../assert-DikXweDx.mjs";
-import { r as parseAcceptSignature } from "../accept-CPkZzmGN.mjs";
-import { s as signRequest } from "../http-CX_zHeOD.mjs";
-import { a as rsaPrivateKey3, c as rsaPublicKey3, s as rsaPublicKey2 } from "../keys-DGu1NFwu.mjs";
-import { t as MemoryKvStore } from "../kv-rV3vodCc.mjs";
-import { c as handleActor, d as handleInbox, f as handleObject, h as respondWithObjectIfAcceptable, l as handleCollection, m as respondWithObject, o as createFederation, p as handleOutbox, u as handleCustomCollection } from "../middleware-CEWDB8EB.mjs";
-import { t as ActivityListenerSet } from "../activity-listener-ell7W1s9.mjs";
-import { createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
+import { r as parseAcceptSignature } from "../accept-CceiKpCy.mjs";
+import { s as signRequest } from "../http-D9zG-L9N.mjs";
+import { a as rsaPrivateKey3, c as rsaPublicKey3, s as rsaPublicKey2 } from "../keys-C3kae-6B.mjs";
+import { t as MemoryKvStore } from "../kv-x2IvBUyq.mjs";
+import { c as handleActor, d as handleInbox, f as handleObject, h as respondWithObjectIfAcceptable, l as handleCollection, m as respondWithObject, o as createFederation, p as handleOutbox, u as handleCustomCollection } from "../middleware-pb2EqN_r.mjs";
+import { t as ActivityListenerSet } from "../activity-listener-tztVvlNb.mjs";
+import { createTestMeterProvider, createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
 import { Activity, Create, Note, Person, Tombstone } from "@fedify/vocab";
 import { FetchError } from "@fedify/vocab-runtime";
 //#region src/federation/handler.test.ts
@@ -1910,9 +1910,11 @@ test("handleCustomCollection()", async () => {
 });
 test("handleInbox() records OpenTelemetry span events", async () => {
 	const [tracerProvider, exporter] = createTestTracerProvider();
+	const [meterProvider, recorder] = createTestMeterProvider();
 	const kv = new MemoryKvStore();
 	const federation = createFederation({
 		kv,
+		meterProvider,
 		tracerProvider
 	});
 	const activity = new Create({
@@ -1974,6 +1976,7 @@ test("handleInbox() records OpenTelemetry span events", async () => {
 		onNotFound: (_request) => new Response("Not found", { status: 404 }),
 		signatureTimeWindow: false,
 		skipSignatureVerification: true,
+		meterProvider,
 		tracerProvider
 	})).status, 202);
 	assert(receivedActivity != null);
@@ -1992,12 +1995,19 @@ test("handleInbox() records OpenTelemetry span events", async () => {
 	const recordedActivity = JSON.parse(event.attributes["activitypub.activity.json"]);
 	assertEquals(recordedActivity.id, "https://example.com/activity");
 	assertEquals(recordedActivity.type, "Create");
+	const durations = recorder.getMeasurements("activitypub.inbox.processing_duration");
+	assertEquals(durations.length, 1);
+	assertEquals(durations[0].type, "histogram");
+	assertGreaterOrEqual(durations[0].value, 0);
+	assertEquals(durations[0].attributes["activitypub.activity.type"], "https://www.w3.org/ns/activitystreams#Create");
 });
 test("handleInbox() records unverified HTTP signature details", async () => {
 	const [tracerProvider, exporter] = createTestTracerProvider();
+	const [meterProvider, recorder] = createTestMeterProvider();
 	const kv = new MemoryKvStore();
 	const federation = createFederation({
 		kv,
+		meterProvider,
 		tracerProvider
 	});
 	const keyId = new URL("https://gone.example/users/someone#main-key");
@@ -2062,6 +2072,7 @@ test("handleInbox() records unverified HTTP signature details", async () => {
 		onNotFound: (_request) => new Response("Not found", { status: 404 }),
 		signatureTimeWindow: false,
 		skipSignatureVerification: false,
+		meterProvider,
 		tracerProvider
 	})).status, 202);
 	const verifySpans = exporter.getSpans("http_signatures.verify");
@@ -2074,6 +2085,12 @@ test("handleInbox() records unverified HTTP signature details", async () => {
 	assert(event.attributes != null);
 	assertEquals(event.attributes["http_signatures.failure_reason"], "keyFetchError");
 	assertEquals(event.attributes["http_signatures.key_fetch_status"], 410);
+	const failures = recorder.getMeasurements("activitypub.signature.verification_failure");
+	assertEquals(failures.length, 1);
+	assertEquals(failures[0].type, "counter");
+	assertEquals(failures[0].value, 1);
+	assertEquals(failures[0].attributes["activitypub.remote.host"], "gone.example");
+	assertEquals(failures[0].attributes["activitypub.verification.failure_reason"], "keyFetchError");
 });
 test("handleInbox() challenge policy enabled + unsigned request", async () => {
 	const activity = new Create({
@@ -2476,6 +2493,7 @@ test("handleInbox() nonce consumption on valid signed request", async () => {
 	]), void 0, "Nonce must be consumed after use");
 });
 test("handleInbox() nonce replay prevention", async () => {
+	const [meterProvider, recorder] = createTestMeterProvider();
 	const activity = new Create({
 		id: new URL("https://example.com/activities/nonce-3"),
 		actor: new URL("https://example.com/person2"),
@@ -2496,7 +2514,10 @@ test("handleInbox() nonce replay prevention", async () => {
 		rfc9421: { nonce }
 	});
 	const context = createRequestContext({
-		federation: createFederation({ kv: new MemoryKvStore() }),
+		federation: createFederation({
+			kv: new MemoryKvStore(),
+			meterProvider
+		}),
 		request: signedRequest,
 		url: new URL(signedRequest.url),
 		data: void 0,
@@ -2526,6 +2547,7 @@ test("handleInbox() nonce replay prevention", async () => {
 		onNotFound: () => new Response("Not found", { status: 404 }),
 		signatureTimeWindow: { minutes: 5 },
 		skipSignatureVerification: false,
+		meterProvider,
 		inboxChallengePolicy: {
 			enabled: true,
 			requestNonce: true,
@@ -2540,6 +2562,11 @@ test("handleInbox() nonce replay prevention", async () => {
 	assert(parsed[0].parameters.nonce != null, "Fresh challenge must include a new nonce");
 	assert(parsed[0].parameters.nonce !== nonce, "Fresh nonce must differ from the replayed one");
 	assertEquals(response.headers.get("Cache-Control"), "no-store", "Challenge response must have Cache-Control: no-store");
+	const failures = recorder.getMeasurements("activitypub.signature.verification_failure");
+	assertEquals(failures.length, 1);
+	assertEquals(failures[0].value, 1);
+	assertEquals(failures[0].attributes["activitypub.remote.host"], "example.com");
+	assertEquals(failures[0].attributes["activitypub.verification.failure_reason"], "invalidNonce");
 });
 test("handleInbox() nonce bypass: valid sig without nonce + invalid sig with nonce", async () => {
 	const activity = new Create({
@@ -2619,6 +2646,7 @@ test("handleInbox() nonce bypass: valid sig without nonce + invalid sig with non
 	]), true, "Nonce must not be consumed when it comes from a non-verified signature");
 });
 test("handleInbox() actor/key mismatch does not consume nonce", async () => {
+	const [meterProvider, recorder] = createTestMeterProvider();
 	const maliciousActivity = new Create({
 		id: new URL("https://attacker.example.com/activities/mismatch-nonce-1"),
 		actor: new URL("https://victim.example.com/users/alice"),
@@ -2644,7 +2672,10 @@ test("handleInbox() actor/key mismatch does not consume nonce", async () => {
 		rfc9421: { nonce }
 	});
 	const context = createRequestContext({
-		federation: createFederation({ kv: new MemoryKvStore() }),
+		federation: createFederation({
+			kv: new MemoryKvStore(),
+			meterProvider
+		}),
 		request: maliciousRequest,
 		url: new URL(maliciousRequest.url),
 		data: void 0,
@@ -2674,6 +2705,7 @@ test("handleInbox() actor/key mismatch does not consume nonce", async () => {
 		onNotFound: () => new Response("Not found", { status: 404 }),
 		signatureTimeWindow: { minutes: 5 },
 		skipSignatureVerification: false,
+		meterProvider,
 		inboxChallengePolicy: {
 			enabled: true,
 			requestNonce: true,
@@ -2687,6 +2719,11 @@ test("handleInbox() actor/key mismatch does not consume nonce", async () => {
 		"acceptSignatureNonce",
 		nonce
 	]), true, "Nonce must not be consumed when actor/key ownership check fails");
+	const failures = recorder.getMeasurements("activitypub.signature.verification_failure");
+	assertEquals(failures.length, 1);
+	assertEquals(failures[0].value, 1);
+	assertEquals(failures[0].attributes["activitypub.remote.host"], "example.com");
+	assertEquals(failures[0].attributes["activitypub.verification.failure_reason"], "actorKeyMismatch");
 });
 test("handleInbox() challenge policy enabled + unverifiedActivityHandler returns undefined", async () => {
 	const activity = new Create({

package/dist/federation/idempotency.test.mjs

@@ -3,10 +3,10 @@ import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
 import "../std__assert-CRDpx_HF.mjs";
-import { n as ed25519PrivateKey, r as ed25519PublicKey, t as ed25519Multikey } from "../keys-DGu1NFwu.mjs";
-import { r as signObject } from "../proof-BFyPVl1r.mjs";
-import { t as MemoryKvStore } from "../kv-rV3vodCc.mjs";
-import { o as createFederation } from "../middleware-CEWDB8EB.mjs";
+import { n as ed25519PrivateKey, r as ed25519PublicKey, t as ed25519Multikey } from "../keys-C3kae-6B.mjs";
+import { r as signObject } from "../proof-iVfYyJpY.mjs";
+import { t as MemoryKvStore } from "../kv-x2IvBUyq.mjs";
+import { o as createFederation } from "../middleware-pb2EqN_r.mjs";
 import { mockDocumentLoader, test } from "@fedify/fixture";
 import { Create, Follow, Person } from "@fedify/vocab";
 //#region src/federation/idempotency.test.ts

package/dist/federation/inbox.test.mjs

@@ -3,7 +3,7 @@ import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
 import { t as assertThrows } from "../assert_throws-4NwKEy2q.mjs";
-import { t as ActivityListenerSet } from "../activity-listener-ell7W1s9.mjs";
+import { t as ActivityListenerSet } from "../activity-listener-tztVvlNb.mjs";
 import { test } from "@fedify/fixture";
 import { Activity, Create, Invite, Offer, Update } from "@fedify/vocab";
 //#region src/federation/inbox.test.ts

package/dist/federation/keycache.test.mjs

@@ -4,8 +4,8 @@ globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
 import { t as assertInstanceOf } from "../assert_instance_of-C4Ri6VuN.mjs";
 import { t as assert } from "../assert-DikXweDx.mjs";
-import { t as MemoryKvStore } from "../kv-rV3vodCc.mjs";
-import { t as KvKeyCache } from "../keycache-EGATflN-.mjs";
+import { t as MemoryKvStore } from "../kv-x2IvBUyq.mjs";
+import { t as KvKeyCache } from "../keycache-BeU0LCII.mjs";
 import { test } from "@fedify/fixture";
 import { CryptographicKey, Multikey } from "@fedify/vocab";
 //#region src/federation/keycache.test.ts

package/dist/federation/kv.test.mjs

@@ -3,7 +3,7 @@ import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
 import "../std__assert-CRDpx_HF.mjs";
-import { t as MemoryKvStore } from "../kv-rV3vodCc.mjs";
+import { t as MemoryKvStore } from "../kv-x2IvBUyq.mjs";
 import { test } from "@fedify/fixture";
 //#region src/federation/kv.test.ts
 test("MemoryKvStore", async (t) => {