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

package/dist/{proof-Vd8-1EWh.js → proof-DMGIjHYH.js}

@@ -1,6 +1,6 @@
 import { Temporal } from "@js-temporal/polyfill";
 import { URLPattern } from "urlpattern-polyfill";
-import { C as version, S as name, d as validateCryptoKey, f as getDurationMs, g as measureSignatureKeyFetch, p as getFederationMetrics, s as fetchKey } from "./http-CpzZ9zsb.js";
+import { D as name, O as version, _ as measureSignatureKeyFetch, d as validateCryptoKey, f as getDurationMs, p as getFederationMetrics, s as fetchKey } from "./http-cqujdCRz.js";
 import { getLogger } from "@logtape/logtape";
 import { Activity, CryptographicKey, DataIntegrityProof, Multikey, Object as Object$1, PUBLIC_COLLECTION, getTypeId, isActor } from "@fedify/vocab";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";

package/dist/{send-CAYXdUTk.mjs → send-DJFpze7B.mjs}

@@ -1,9 +1,9 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-CF3jMgip.mjs";
-import { n as getFederationMetrics, t as getDurationMs } from "./metrics-ek3ilf6c.mjs";
-import { n as doubleKnock } from "./http-BmOZYc-8.mjs";
+import { n as version, t as name } from "./deno--CS-SBS9.mjs";
+import { n as getDurationMs, r as getFederationMetrics } from "./metrics-BTOMkW8C.mjs";
+import { n as doubleKnock } from "./http-IywnQdiX.mjs";
 import { getLogger } from "@logtape/logtape";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
 //#region src/federation/send.ts

package/dist/sig/http.test.mjs

@@ -7,8 +7,8 @@ import { n as assertGreaterOrEqual, r as assertFalse, t as assertRejects } from
 import { t as assertThrows } from "../assert_throws-4NwKEy2q.mjs";
 import { t as assert } from "../assert-DikXweDx.mjs";
 import { t as esm_default } from "../esm-sdtqOUPu.mjs";
-import { t as exportJwk } from "../key-B4I8H5Lc.mjs";
-import { a as parseRfc9421Signature, c as timingSafeEqual, i as formatRfc9421SignatureParameters, l as verifyRequest, n as doubleKnock, o as parseRfc9421SignatureInput, r as formatRfc9421Signature, s as signRequest, t as createRfc9421SignatureBase, u as verifyRequestDetailed } from "../http-BmOZYc-8.mjs";
+import { t as exportJwk } from "../key-Df3tMleh.mjs";
+import { a as parseRfc9421Signature, c as timingSafeEqual, i as formatRfc9421SignatureParameters, l as verifyRequest, n as doubleKnock, o as parseRfc9421SignatureInput, r as formatRfc9421Signature, s as signRequest, t as createRfc9421SignatureBase, u as verifyRequestDetailed } from "../http-IywnQdiX.mjs";
 import { i as rsaPrivateKey2, l as rsaPublicKey5, o as rsaPublicKey1, s as rsaPublicKey2 } from "../keys-CSYsOMFG.mjs";
 import { createTestMeterProvider, createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
 import { FetchError, exportSpki } from "@fedify/vocab-runtime";
@@ -259,6 +259,10 @@ test("verifyRequestDetailed() records verification duration metric", async (t) =
 		assertEquals(measurement.attributes["activitypub.signature.result"], "verified");
 		assertEquals(measurement.attributes["http_signatures.algorithm"], "rsa-sha256");
 		assertFalse("http_signatures.failure_reason" in measurement.attributes);
+		const keyLookups = recorder.getMeasurements("activitypub.key.lookup");
+		assertEquals(keyLookups.length, 1);
+		assertEquals(keyLookups[0].attributes["activitypub.lookup.kind"], "public_key");
+		assertEquals(keyLookups[0].attributes["activitypub.lookup.result"], "fetched");
 	});
 	await t.step("missing signature is recorded as result=missing", async () => {
 		const [meterProvider, recorder] = createTestMeterProvider();

package/dist/sig/key.test.mjs

@@ -5,10 +5,10 @@ import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
 import "../std__assert-BTEgfoJo.mjs";
 import { t as assertRejects } from "../assert_rejects-DQP-q39h.mjs";
 import { t as assertThrows } from "../assert_throws-4NwKEy2q.mjs";
-import { a as importJwk, i as generateCryptoKeyPair, n as fetchKey, o as validateCryptoKey, r as fetchKeyDetailed, t as exportJwk } from "../key-B4I8H5Lc.mjs";
+import { a as importJwk, i as generateCryptoKeyPair, n as fetchKey, o as validateCryptoKey, r as fetchKeyDetailed, t as exportJwk } from "../key-Df3tMleh.mjs";
 import { c as rsaPublicKey3, i as rsaPrivateKey2, o as rsaPublicKey1, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-CSYsOMFG.mjs";
 import { CryptographicKey, Multikey } from "@fedify/vocab";
-import { createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
+import { createTestMeterProvider, createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
 import { FetchError } from "@fedify/vocab-runtime";
 //#region src/sig/key.test.ts
 test("validateCryptoKey()", async () => {
@@ -303,5 +303,102 @@ test("fetchKeyDetailed() returns detailed fetch errors", async () => {
 	if (detailedError == null || !("error" in detailedError)) throw new Error("Expected non-HTTP fetch error details.");
 	assertEquals(detailedError.error, failure);
 });
+test("fetchKey() records activitypub.key.lookup with hit on cached key", async () => {
+	const [meterProvider, recorder] = createTestMeterProvider();
+	const cache = {};
+	const options = {
+		documentLoader: mockDocumentLoader,
+		contextLoader: mockDocumentLoader,
+		keyCache: {
+			get(keyId) {
+				return Promise.resolve(cache[keyId.href]);
+			},
+			set(keyId, key) {
+				cache[keyId.href] = key;
+				return Promise.resolve();
+			}
+		},
+		meterProvider
+	};
+	await fetchKey("https://example.com/key", CryptographicKey, options);
+	recorder.clear();
+	assertEquals((await fetchKey("https://example.com/key", CryptographicKey, options)).cached, true);
+	const counters = recorder.getMeasurements("activitypub.key.lookup");
+	assertEquals(counters.length, 1);
+	assertEquals(counters[0].attributes["activitypub.lookup.kind"], "public_key");
+	assertEquals(counters[0].attributes["activitypub.lookup.result"], "hit");
+	assertEquals(counters[0].attributes["activitypub.cache.enabled"], true);
+	assertEquals(counters[0].attributes["activitypub.remote.host"], "example.com");
+	const duration = recorder.getMeasurement("activitypub.key.lookup.duration");
+	assertEquals(duration?.type, "histogram");
+	assertEquals(duration?.attributes["activitypub.lookup.result"], "hit");
+});
+test("fetchKey() records activitypub.key.lookup with fetched on cache miss", async () => {
+	const [meterProvider, recorder] = createTestMeterProvider();
+	assertEquals((await fetchKey("https://example.com/key", CryptographicKey, {
+		documentLoader: mockDocumentLoader,
+		contextLoader: mockDocumentLoader,
+		meterProvider
+	})).cached, false);
+	const counter = recorder.getMeasurement("activitypub.key.lookup");
+	assertEquals(counter?.attributes["activitypub.lookup.result"], "fetched");
+	assertEquals(counter?.attributes["activitypub.cache.enabled"], false);
+	assertEquals(counter?.attributes["activitypub.remote.host"], "example.com");
+	assertEquals(recorder.getMeasurement("activitypub.key.lookup.duration")?.attributes["activitypub.lookup.result"], "fetched");
+});
+test("fetchKey() records not_found and status code on HTTP 404", async () => {
+	const [meterProvider, recorder] = createTestMeterProvider();
+	const missingKeyId = new URL("https://example.com/missing-key");
+	const documentLoader = (url) => {
+		if (url === missingKeyId.href) throw new FetchError(missingKeyId, `HTTP 404: ${missingKeyId.href}`, new Response(null, { status: 404 }));
+		return mockDocumentLoader(url);
+	};
+	assertEquals((await fetchKey(missingKeyId, CryptographicKey, {
+		documentLoader,
+		contextLoader: mockDocumentLoader,
+		meterProvider
+	})).key, null);
+	const counter = recorder.getMeasurement("activitypub.key.lookup");
+	assertEquals(counter?.attributes["activitypub.lookup.result"], "not_found");
+	assertEquals(counter?.attributes["http.response.status_code"], 404);
+	assertEquals(counter?.attributes["activitypub.cache.enabled"], false);
+	assertEquals(counter?.attributes["activitypub.remote.host"], "example.com");
+});
+test("fetchKey() records network_error on TypeError from the document loader", async () => {
+	const [meterProvider, recorder] = createTestMeterProvider();
+	const documentLoader = () => {
+		throw new TypeError("connect failed");
+	};
+	await fetchKey("https://example.com/key", CryptographicKey, {
+		documentLoader,
+		contextLoader: mockDocumentLoader,
+		meterProvider
+	});
+	const counter = recorder.getMeasurement("activitypub.key.lookup");
+	assertEquals(counter?.attributes["activitypub.lookup.result"], "network_error");
+	assertEquals("http.response.status_code" in counter.attributes, false);
+});
+test("fetchKeyDetailed() records activitypub.key.lookup with the same taxonomy", async () => {
+	const [meterProvider, recorder] = createTestMeterProvider();
+	const goneKeyId = new URL("https://example.com/gone-key");
+	const documentLoader = (url) => {
+		if (url === goneKeyId.href) throw new FetchError(goneKeyId, `HTTP 410: ${goneKeyId.href}`, new Response(null, { status: 410 }));
+		return mockDocumentLoader(url);
+	};
+	await fetchKeyDetailed(goneKeyId, CryptographicKey, {
+		documentLoader,
+		contextLoader: mockDocumentLoader,
+		meterProvider
+	});
+	const counter = recorder.getMeasurement("activitypub.key.lookup");
+	assertEquals(counter?.attributes["activitypub.lookup.result"], "not_found");
+	assertEquals(counter?.attributes["http.response.status_code"], 410);
+});
+test("fetchKey() works when meterProvider is omitted", async () => {
+	assertEquals((await fetchKey("https://example.com/key", CryptographicKey, {
+		documentLoader: mockDocumentLoader,
+		contextLoader: mockDocumentLoader
+	})).cached, false);
+});
 //#endregion
 export {};

package/dist/sig/ld.test.mjs

@@ -5,9 +5,9 @@ import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
 import { n as assertGreaterOrEqual, r as assertFalse, t as assertRejects } from "../assert_rejects-DQP-q39h.mjs";
 import { t as assertThrows } from "../assert_throws-4NwKEy2q.mjs";
 import { t as assert } from "../assert-DikXweDx.mjs";
-import { i as generateCryptoKeyPair } from "../key-B4I8H5Lc.mjs";
+import { i as generateCryptoKeyPair } from "../key-Df3tMleh.mjs";
 import { a as rsaPrivateKey3, c as rsaPublicKey3, i as rsaPrivateKey2, n as ed25519PrivateKey, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-CSYsOMFG.mjs";
-import { a as signJsonLd, i as hasSignatureLike, n as createSignature, o as verifyJsonLd, r as detachSignature, s as verifySignature, t as attachSignature } from "../ld-B5D5THhl.mjs";
+import { a as signJsonLd, i as hasSignatureLike, n as createSignature, o as verifyJsonLd, r as detachSignature, s as verifySignature, t as attachSignature } from "../ld-BGwiJpl3.mjs";
 import { CryptographicKey } from "@fedify/vocab";
 import { createTestMeterProvider, mockDocumentLoader, test } from "@fedify/fixture";
 import { encodeBase64 } from "byte-encodings/base64";

package/dist/sig/mod.cjs

@@ -1,8 +1,8 @@
 const { Temporal } = require("@js-temporal/polyfill");
 const { URLPattern } = require("urlpattern-polyfill");
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_http = require("../http-CKCgOPkX.cjs");
-const require_proof = require("../proof-DIoqrKnX.cjs");
+const require_http = require("../http-CJfvRL7D.cjs");
+const require_proof = require("../proof-B1_u25UV.cjs");
 exports.attachSignature = require_proof.attachSignature;
 exports.createProof = require_proof.createProof;
 exports.createSignature = require_proof.createSignature;

package/dist/sig/mod.d.cts

@@ -1,5 +1,5 @@
 /// <reference lib="esnext.temporal" />
-import { C as exportJwk, D as importJwk, E as generateCryptoKeyPair, S as KeyCache, T as fetchKeyDetailed, _ as validateAcceptSignature, a as VerifyRequestDetailedResult, b as FetchKeyOptions, c as signRequest, d as AcceptSignatureMember, f as AcceptSignatureParameters, g as parseAcceptSignature, h as fulfillAcceptSignature, i as SignRequestOptions, l as verifyRequest, m as formatAcceptSignature, n as HttpMessageSignaturesSpecDeterminer, o as VerifyRequestFailureReason, p as FulfillAcceptSignatureResult, r as Rfc9421SignRequestOptions, s as VerifyRequestOptions, t as HttpMessageSignaturesSpec, u as verifyRequestDetailed, v as FetchKeyDetailedResult, w as fetchKey, x as FetchKeyResult, y as FetchKeyErrorResult } from "../http-D6aw3j2U.cjs";
+import { C as exportJwk, D as importJwk, E as generateCryptoKeyPair, S as KeyCache, T as fetchKeyDetailed, _ as validateAcceptSignature, a as VerifyRequestDetailedResult, b as FetchKeyOptions, c as signRequest, d as AcceptSignatureMember, f as AcceptSignatureParameters, g as parseAcceptSignature, h as fulfillAcceptSignature, i as SignRequestOptions, l as verifyRequest, m as formatAcceptSignature, n as HttpMessageSignaturesSpecDeterminer, o as VerifyRequestFailureReason, p as FulfillAcceptSignatureResult, r as Rfc9421SignRequestOptions, s as VerifyRequestOptions, t as HttpMessageSignaturesSpec, u as verifyRequestDetailed, v as FetchKeyDetailedResult, w as fetchKey, x as FetchKeyResult, y as FetchKeyErrorResult } from "../http-VyDTd4G3.cjs";
 import { i as getKeyOwner, n as GetKeyOwnerOptions, r as doesActorOwnKey, t as DoesActorOwnKeyOptions } from "../owner-DEvZuyOE.cjs";
-import { _ as hasSignatureLike, a as createProof, b as verifySignature, c as verifyObject, d as SignJsonLdOptions, f as VerifyJsonLdOptions, g as detachSignature, h as createSignature, i as VerifyProofOptions, l as verifyProof, m as attachSignature, n as SignObjectOptions, o as hasProofLike, p as VerifySignatureOptions, r as VerifyObjectOptions, s as signObject, t as CreateProofOptions, u as CreateSignatureOptions, v as signJsonLd, y as verifyJsonLd } from "../mod-BDhgfjP7.cjs";
+import { _ as hasSignatureLike, a as createProof, b as verifySignature, c as verifyObject, d as SignJsonLdOptions, f as VerifyJsonLdOptions, g as detachSignature, h as createSignature, i as VerifyProofOptions, l as verifyProof, m as attachSignature, n as SignObjectOptions, o as hasProofLike, p as VerifySignatureOptions, r as VerifyObjectOptions, s as signObject, t as CreateProofOptions, u as CreateSignatureOptions, v as signJsonLd, y as verifyJsonLd } from "../mod-B0hW12_O.cjs";
 export { AcceptSignatureMember, AcceptSignatureParameters, CreateProofOptions, CreateSignatureOptions, DoesActorOwnKeyOptions, FetchKeyDetailedResult, FetchKeyErrorResult, FetchKeyOptions, FetchKeyResult, FulfillAcceptSignatureResult, GetKeyOwnerOptions, HttpMessageSignaturesSpec, HttpMessageSignaturesSpecDeterminer, KeyCache, Rfc9421SignRequestOptions, SignJsonLdOptions, SignObjectOptions, SignRequestOptions, VerifyJsonLdOptions, VerifyObjectOptions, VerifyProofOptions, VerifyRequestDetailedResult, VerifyRequestFailureReason, VerifyRequestOptions, VerifySignatureOptions, attachSignature, createProof, createSignature, detachSignature, doesActorOwnKey, exportJwk, fetchKey, fetchKeyDetailed, formatAcceptSignature, fulfillAcceptSignature, generateCryptoKeyPair, getKeyOwner, hasProofLike, hasSignatureLike, importJwk, parseAcceptSignature, signJsonLd, signObject, signRequest, validateAcceptSignature, verifyJsonLd, verifyObject, verifyProof, verifyRequest, verifyRequestDetailed, verifySignature };

package/dist/sig/mod.d.ts

@@ -1,5 +1,5 @@
 /// <reference lib="esnext.temporal" />
-import { C as exportJwk, D as importJwk, E as generateCryptoKeyPair, S as KeyCache, T as fetchKeyDetailed, _ as validateAcceptSignature, a as VerifyRequestDetailedResult, b as FetchKeyOptions, c as signRequest, d as AcceptSignatureMember, f as AcceptSignatureParameters, g as parseAcceptSignature, h as fulfillAcceptSignature, i as SignRequestOptions, l as verifyRequest, m as formatAcceptSignature, n as HttpMessageSignaturesSpecDeterminer, o as VerifyRequestFailureReason, p as FulfillAcceptSignatureResult, r as Rfc9421SignRequestOptions, s as VerifyRequestOptions, t as HttpMessageSignaturesSpec, u as verifyRequestDetailed, v as FetchKeyDetailedResult, w as fetchKey, x as FetchKeyResult, y as FetchKeyErrorResult } from "../http-D6LP89UO.js";
+import { C as exportJwk, D as importJwk, E as generateCryptoKeyPair, S as KeyCache, T as fetchKeyDetailed, _ as validateAcceptSignature, a as VerifyRequestDetailedResult, b as FetchKeyOptions, c as signRequest, d as AcceptSignatureMember, f as AcceptSignatureParameters, g as parseAcceptSignature, h as fulfillAcceptSignature, i as SignRequestOptions, l as verifyRequest, m as formatAcceptSignature, n as HttpMessageSignaturesSpecDeterminer, o as VerifyRequestFailureReason, p as FulfillAcceptSignatureResult, r as Rfc9421SignRequestOptions, s as VerifyRequestOptions, t as HttpMessageSignaturesSpec, u as verifyRequestDetailed, v as FetchKeyDetailedResult, w as fetchKey, x as FetchKeyResult, y as FetchKeyErrorResult } from "../http-lf8Hsd91.js";
 import { i as getKeyOwner, n as GetKeyOwnerOptions, r as doesActorOwnKey, t as DoesActorOwnKeyOptions } from "../owner-CnngXDNJ.js";
-import { _ as hasSignatureLike, a as createProof, b as verifySignature, c as verifyObject, d as SignJsonLdOptions, f as VerifyJsonLdOptions, g as detachSignature, h as createSignature, i as VerifyProofOptions, l as verifyProof, m as attachSignature, n as SignObjectOptions, o as hasProofLike, p as VerifySignatureOptions, r as VerifyObjectOptions, s as signObject, t as CreateProofOptions, u as CreateSignatureOptions, v as signJsonLd, y as verifyJsonLd } from "../mod-B-Lin9Sy.js";
+import { _ as hasSignatureLike, a as createProof, b as verifySignature, c as verifyObject, d as SignJsonLdOptions, f as VerifyJsonLdOptions, g as detachSignature, h as createSignature, i as VerifyProofOptions, l as verifyProof, m as attachSignature, n as SignObjectOptions, o as hasProofLike, p as VerifySignatureOptions, r as VerifyObjectOptions, s as signObject, t as CreateProofOptions, u as CreateSignatureOptions, v as signJsonLd, y as verifyJsonLd } from "../mod-COIAjwRS.js";
 export { AcceptSignatureMember, AcceptSignatureParameters, CreateProofOptions, CreateSignatureOptions, DoesActorOwnKeyOptions, FetchKeyDetailedResult, FetchKeyErrorResult, FetchKeyOptions, FetchKeyResult, FulfillAcceptSignatureResult, GetKeyOwnerOptions, HttpMessageSignaturesSpec, HttpMessageSignaturesSpecDeterminer, KeyCache, Rfc9421SignRequestOptions, SignJsonLdOptions, SignObjectOptions, SignRequestOptions, VerifyJsonLdOptions, VerifyObjectOptions, VerifyProofOptions, VerifyRequestDetailedResult, VerifyRequestFailureReason, VerifyRequestOptions, VerifySignatureOptions, attachSignature, createProof, createSignature, detachSignature, doesActorOwnKey, exportJwk, fetchKey, fetchKeyDetailed, formatAcceptSignature, fulfillAcceptSignature, generateCryptoKeyPair, getKeyOwner, hasProofLike, hasSignatureLike, importJwk, parseAcceptSignature, signJsonLd, signObject, signRequest, validateAcceptSignature, verifyJsonLd, verifyObject, verifyProof, verifyRequest, verifyRequestDetailed, verifySignature };

package/dist/sig/mod.js

@@ -1,5 +1,5 @@
 import { Temporal } from "@js-temporal/polyfill";
 import { URLPattern } from "urlpattern-polyfill";
-import { a as verifyRequestDetailed, b as parseAcceptSignature, c as fetchKeyDetailed, i as verifyRequest, l as generateCryptoKeyPair, o as exportJwk, r as signRequest, s as fetchKey, u as importJwk, v as formatAcceptSignature, x as validateAcceptSignature, y as fulfillAcceptSignature } from "../http-CpzZ9zsb.js";
-import { a as verifyProof, c as getKeyOwner, d as detachSignature, f as hasSignatureLike, h as verifySignature, i as verifyObject, l as attachSignature, m as verifyJsonLd, n as hasProofLike, p as signJsonLd, r as signObject, s as doesActorOwnKey, t as createProof, u as createSignature } from "../proof-Vd8-1EWh.js";
+import { C as formatAcceptSignature, E as validateAcceptSignature, T as parseAcceptSignature, a as verifyRequestDetailed, c as fetchKeyDetailed, i as verifyRequest, l as generateCryptoKeyPair, o as exportJwk, r as signRequest, s as fetchKey, u as importJwk, w as fulfillAcceptSignature } from "../http-cqujdCRz.js";
+import { a as verifyProof, c as getKeyOwner, d as detachSignature, f as hasSignatureLike, h as verifySignature, i as verifyObject, l as attachSignature, m as verifyJsonLd, n as hasProofLike, p as signJsonLd, r as signObject, s as doesActorOwnKey, t as createProof, u as createSignature } from "../proof-DMGIjHYH.js";
 export { attachSignature, createProof, createSignature, detachSignature, doesActorOwnKey, exportJwk, fetchKey, fetchKeyDetailed, formatAcceptSignature, fulfillAcceptSignature, generateCryptoKeyPair, getKeyOwner, hasProofLike, hasSignatureLike, importJwk, parseAcceptSignature, signJsonLd, signObject, signRequest, validateAcceptSignature, verifyJsonLd, verifyObject, verifyProof, verifyRequest, verifyRequestDetailed, verifySignature };

package/dist/sig/owner.test.mjs

@@ -6,7 +6,7 @@ import "../std__assert-BTEgfoJo.mjs";
 import { r as assertFalse } from "../assert_rejects-DQP-q39h.mjs";
 import { t as assert } from "../assert-DikXweDx.mjs";
 import { o as rsaPublicKey1, s as rsaPublicKey2 } from "../keys-CSYsOMFG.mjs";
-import { n as getKeyOwner, t as doesActorOwnKey } from "../owner-DO810N24.mjs";
+import { n as getKeyOwner, t as doesActorOwnKey } from "../owner-CIt4hvmM.mjs";
 import { Create, CryptographicKey, lookupObject } from "@fedify/vocab";
 import { createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
 //#region src/sig/owner.test.ts

package/dist/sig/proof.test.mjs

@@ -8,7 +8,7 @@ import { t as assertInstanceOf } from "../assert_instance_of-C4Ri6VuN.mjs";
 import { t as assert } from "../assert-DikXweDx.mjs";
 import { i as rsaPrivateKey2, n as ed25519PrivateKey, r as ed25519PublicKey, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-CSYsOMFG.mjs";
 import { r as normalizeOutgoingActivityJsonLd } from "../outgoing-jsonld-BNL8AC14.mjs";
-import { a as verifyProof, i as verifyObject, n as hasProofLike, r as signObject, t as createProof } from "../proof-BgfyWv7b.mjs";
+import { a as verifyProof, i as verifyObject, n as hasProofLike, r as signObject, t as createProof } from "../proof-BYlrRSmZ.mjs";
 import { Create, DataIntegrityProof, Document, Multikey, Note, PUBLIC_COLLECTION, Place } from "@fedify/vocab";
 import { createTestMeterProvider, mockDocumentLoader, test } from "@fedify/fixture";
 import { decodeMultibase, importMultibaseKey } from "@fedify/vocab-runtime";

package/dist/utils/docloader.test.mjs

@@ -5,9 +5,9 @@ import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
 import "../std__assert-BTEgfoJo.mjs";
 import { t as assertRejects } from "../assert_rejects-DQP-q39h.mjs";
 import { t as esm_default } from "../esm-sdtqOUPu.mjs";
-import { l as verifyRequest } from "../http-BmOZYc-8.mjs";
+import { l as verifyRequest } from "../http-IywnQdiX.mjs";
 import { i as rsaPrivateKey2 } from "../keys-CSYsOMFG.mjs";
-import { t as getAuthenticatedDocumentLoader } from "../docloader-BENj6vQ4.mjs";
+import { t as getAuthenticatedDocumentLoader } from "../docloader-k6huZLQL.mjs";
 import { mockDocumentLoader, test } from "@fedify/fixture";
 import { UrlError } from "@fedify/vocab-runtime";
 //#region src/utils/docloader.test.ts

package/dist/utils/kv-cache.test.mjs

@@ -1,9 +1,9 @@
 import { Temporal } from "@js-temporal/polyfill";
 import { URLPattern } from "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as kvCache, t as MockKvStore } from "../kv-cache-DihufyAQ.mjs";
+import { n as kvCache, t as MockKvStore } from "../kv-cache-q9Ec2ryS.mjs";
 import { deepStrictEqual, throws } from "node:assert";
-import { mockDocumentLoader, test } from "@fedify/fixture";
+import { createTestMeterProvider, mockDocumentLoader, test } from "@fedify/fixture";
 import { preloadedContexts } from "@fedify/vocab-runtime";
 //#region src/utils/kv-cache.test.ts
 test("kvCache()", async (t) => {
@@ -139,6 +139,71 @@ test("kvCache()", async (t) => {
 			}
 		});
 	});
+	await t.step("records activitypub.document.cache with miss then hit", async () => {
+		const kv = new MockKvStore();
+		const [meterProvider, recorder] = createTestMeterProvider();
+		const loader = kvCache({
+			kv,
+			loader: mockDocumentLoader,
+			rules: [["https://example.com/object", { days: 1 }]],
+			prefix: ["_test", "doc-cache"],
+			meterProvider,
+			kind: "object"
+		});
+		await loader("https://example.com/object");
+		const afterMiss = recorder.getMeasurements("activitypub.document.cache");
+		deepStrictEqual(afterMiss.length, 1);
+		deepStrictEqual(afterMiss[0].type, "counter");
+		deepStrictEqual(afterMiss[0].value, 1);
+		deepStrictEqual(afterMiss[0].attributes["activitypub.lookup.kind"], "object");
+		deepStrictEqual(afterMiss[0].attributes["activitypub.lookup.result"], "miss");
+		deepStrictEqual(afterMiss[0].attributes["activitypub.remote.host"], "example.com");
+		await loader("https://example.com/object");
+		const all = recorder.getMeasurements("activitypub.document.cache");
+		deepStrictEqual(all.length, 2);
+		deepStrictEqual(all[1].attributes["activitypub.lookup.result"], "hit");
+		deepStrictEqual(all[1].attributes["activitypub.lookup.kind"], "object");
+		deepStrictEqual(all[1].attributes["activitypub.remote.host"], "example.com");
+	});
+	await t.step("preloaded contexts emit no activitypub.document.cache", async () => {
+		const kv = new MockKvStore();
+		const [meterProvider, recorder] = createTestMeterProvider();
+		await kvCache({
+			kv,
+			loader: mockDocumentLoader,
+			prefix: ["_test", "doc-cache-preloaded"],
+			meterProvider,
+			kind: "context"
+		})("https://www.w3.org/ns/activitystreams");
+		deepStrictEqual(recorder.getMeasurements("activitypub.document.cache").length, 0, "preloaded contexts must bypass the KV cache and the cache metric");
+	});
+	await t.step("no cache rule match emits no activitypub.document.cache", async () => {
+		const kv = new MockKvStore();
+		const [meterProvider, recorder] = createTestMeterProvider();
+		await kvCache({
+			kv,
+			loader: mockDocumentLoader,
+			rules: [],
+			prefix: ["_test", "doc-cache-no-rule"],
+			meterProvider,
+			kind: "object"
+		})("https://example.com/object");
+		deepStrictEqual(recorder.getMeasurements("activitypub.document.cache").length, 0);
+	});
+	await t.step("omitting meterProvider records no cache measurements", async () => {
+		const kv = new MockKvStore();
+		const [meterProvider, recorder] = createTestMeterProvider();
+		const loader = kvCache({
+			kv,
+			loader: mockDocumentLoader,
+			rules: [["https://example.com/object", { days: 1 }]],
+			prefix: ["_test", "doc-cache-no-mp"]
+		});
+		await loader("https://example.com/object");
+		await loader("https://example.com/object");
+		deepStrictEqual(recorder.getMeasurements("activitypub.document.cache").length, 0);
+		deepStrictEqual(typeof meterProvider.getMeter, "function");
+	});
 	await t.step("preloaded contexts bypass cache", async () => {
 		const kv = new MockKvStore();
 		let loaderCalled = false;

package/dist/utils/mod.cjs

@@ -1,6 +1,6 @@
 const { Temporal } = require("@js-temporal/polyfill");
 const { URLPattern } = require("urlpattern-polyfill");
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_kv_cache = require("../kv-cache-DY-XWOqM.cjs");
+const require_kv_cache = require("../kv-cache-L0SMQkcd.cjs");
 exports.getAuthenticatedDocumentLoader = require_kv_cache.getAuthenticatedDocumentLoader;
 exports.kvCache = require_kv_cache.kvCache;

package/dist/utils/mod.d.cts

@@ -1,3 +1,3 @@
 /// <reference lib="esnext.temporal" />
-import { n as getAuthenticatedDocumentLoader, t as kvCache } from "../mod-BR_BB0bh.cjs";
+import { n as getAuthenticatedDocumentLoader, t as kvCache } from "../mod-yvIXFAEi.cjs";
 export { getAuthenticatedDocumentLoader, kvCache };

package/dist/utils/mod.d.ts

@@ -1,3 +1,3 @@
 /// <reference lib="esnext.temporal" />
-import { n as getAuthenticatedDocumentLoader, t as kvCache } from "../mod-DLrRb0dx.js";
+import { n as getAuthenticatedDocumentLoader, t as kvCache } from "../mod-DFvNJcNb.js";
 export { getAuthenticatedDocumentLoader, kvCache };

package/dist/utils/mod.js

@@ -1,4 +1,4 @@
 import { Temporal } from "@js-temporal/polyfill";
 import { URLPattern } from "urlpattern-polyfill";
-import { n as getAuthenticatedDocumentLoader, t as kvCache } from "../kv-cache-Wc5ezcVW.js";
+import { n as getAuthenticatedDocumentLoader, t as kvCache } from "../kv-cache-pEejzYq4.js";
 export { getAuthenticatedDocumentLoader, kvCache };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/fedify",
-  "version": "2.3.0-dev.1114+15a3316d",
+  "version": "2.3.0-dev.1131+553b59b8",
   "description": "An ActivityPub server framework",
   "keywords": [
     "ActivityPub",
@@ -153,9 +153,9 @@
     "uri-template-router": "^1.0.0",
     "url-template": "^3.1.1",
     "urlpattern-polyfill": "^10.1.0",
-    "@fedify/vocab": "2.3.0-dev.1114+15a3316d",
-    "@fedify/vocab-runtime": "2.3.0-dev.1114+15a3316d",
-    "@fedify/webfinger": "2.3.0-dev.1114+15a3316d"
+    "@fedify/vocab": "2.3.0-dev.1131+553b59b8",
+    "@fedify/webfinger": "2.3.0-dev.1131+553b59b8",
+    "@fedify/vocab-runtime": "2.3.0-dev.1131+553b59b8"
   },
   "devDependencies": {
     "@opentelemetry/sdk-metrics": "2.7.1",
@@ -168,8 +168,8 @@
     "tsx": "^4.21.0",
     "typescript": "^6.0.0",
     "wrangler": "^4.17.0",
-    "@fedify/fixture": "2.0.0",
-    "@fedify/vocab-tools": "^2.3.0-dev.1114+15a3316d"
+    "@fedify/vocab-tools": "^2.3.0-dev.1131+553b59b8",
+    "@fedify/fixture": "2.0.0"
   },
   "scripts": {
     "build:self": "tsdown",