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

package/dist/sig/key.test.mjs

@@ -1,14 +1,14 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-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-BoWaYRHm.mjs";
-import { c as rsaPublicKey3, i as rsaPrivateKey2, o as rsaPublicKey1, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-CSYsOMFG.mjs";
+import { t as assertEquals } from "../assert_equals-C-ZRDbaf.mjs";
+import "../std__assert-BBjXFNOb.mjs";
+import { t as assertRejects } from "../assert_rejects-DN60FHPX.mjs";
+import { t as assertThrows } from "../assert_throws-BOkhLGYc.mjs";
+import { a as importJwk, i as generateCryptoKeyPair, n as fetchKey, o as validateCryptoKey, r as fetchKeyDetailed, t as exportJwk } from "../key-CkkMJBjF.mjs";
+import { c as rsaPublicKey3, i as rsaPrivateKey2, o as rsaPublicKey1, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-C3kae-6B.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

@@ -1,13 +1,13 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-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-BoWaYRHm.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-B5K1mSuG.mjs";
+import { t as assertEquals } from "../assert_equals-C-ZRDbaf.mjs";
+import { n as assertGreaterOrEqual, r as assertFalse, t as assertRejects } from "../assert_rejects-DN60FHPX.mjs";
+import { t as assertThrows } from "../assert_throws-BOkhLGYc.mjs";
+import { t as assert } from "../assert-OguE97r2.mjs";
+import { i as generateCryptoKeyPair } from "../key-CkkMJBjF.mjs";
+import { a as rsaPrivateKey3, c as rsaPublicKey3, i as rsaPrivateKey2, n as ed25519PrivateKey, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-C3kae-6B.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-k8yqD2a-.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-CubOB9wq.cjs");
-const require_proof = require("../proof-BUWfVr6Q.cjs");
+const require_http = require("../http-CWoeyogl.cjs");
+const require_proof = require("../proof-CcsIJLTn.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 { C as parseAcceptSignature, S as fulfillAcceptSignature, 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 validateAcceptSignature, x as formatAcceptSignature } from "../http-CouJSFVK.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-n60t8o9P.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-CToqG5ap.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-NRmtrTDu.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

@@ -1,12 +1,12 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
-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-hDxI0ufu.mjs";
+import { t as assertEquals } from "../assert_equals-C-ZRDbaf.mjs";
+import "../std__assert-BBjXFNOb.mjs";
+import { r as assertFalse } from "../assert_rejects-DN60FHPX.mjs";
+import { t as assert } from "../assert-OguE97r2.mjs";
+import { o as rsaPublicKey1, s as rsaPublicKey2 } from "../keys-C3kae-6B.mjs";
+import { n as getKeyOwner, t as doesActorOwnKey } from "../owner-nmXdvXpc.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

@@ -1,14 +1,14 @@
 import { Temporal } from "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
-import "../std__assert-BTEgfoJo.mjs";
-import { n as assertGreaterOrEqual, r as assertFalse, t as assertRejects } from "../assert_rejects-DQP-q39h.mjs";
-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-DhVuz4bc.mjs";
+import { t as assertEquals } from "../assert_equals-C-ZRDbaf.mjs";
+import "../std__assert-BBjXFNOb.mjs";
+import { n as assertGreaterOrEqual, r as assertFalse, t as assertRejects } from "../assert_rejects-DN60FHPX.mjs";
+import { t as assertInstanceOf } from "../assert_instance_of-DBC5X09g.mjs";
+import { t as assert } from "../assert-OguE97r2.mjs";
+import { i as rsaPrivateKey2, n as ed25519PrivateKey, r as ed25519PublicKey, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-C3kae-6B.mjs";
+import { r as normalizeOutgoingActivityJsonLd } from "../outgoing-jsonld-BgFLCJQ_.mjs";
+import { a as verifyProof, i as verifyObject, n as hasProofLike, r as signObject, t as createProof } from "../proof-DpwO1T4S.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/{std__assert-BTEgfoJo.mjs → std__assert-BBjXFNOb.mjs}

@@ -1,10 +1,10 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { l as AssertionError, s as format } from "./assert_equals-Ew3jOFa3.mjs";
-import "./assert_rejects-DQP-q39h.mjs";
-import "./assert_throws-4NwKEy2q.mjs";
-import "./assert_strict_equals-Dmjbg-bA.mjs";
+import { l as AssertionError, s as format } from "./assert_equals-C-ZRDbaf.mjs";
+import "./assert_rejects-DN60FHPX.mjs";
+import "./assert_throws-BOkhLGYc.mjs";
+import "./assert_strict_equals-XEgZAlrj.mjs";
 //#region ../../node_modules/.pnpm/@jsr+std__assert@0.226.0/node_modules/@jsr/std__assert/assert_exists.js
 /**
 * Make an assertion that actual is not null or undefined.

package/dist/testing/mod.d.mts

@@ -1,6 +1,7 @@
 import { Temporal } from "@js-temporal/polyfill";
 import { URLPattern } from "urlpattern-polyfill";
 import { ExportResultCode } from "@opentelemetry/core";
+import { Router } from "@fedify/uri-template";
 import { Activity, Actor, Collection, CryptographicKey, Hashtag, Link, LookupObjectOptions, Multikey, Object as Object$1, Recipient, Tombstone, TraverseCollectionOptions } from "@fedify/vocab";
 import { Link as Link$1, LookupWebFingerOptions, ResourceDescriptor } from "@fedify/webfinger";
 import { MeterProvider, TracerProvider } from "@opentelemetry/api";

package/dist/testing/mod.mjs

@@ -1,5 +1,5 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { i as testDefinitions, n as createOutboxContext, r as createRequestContext, t as createInboxContext } from "../context-BAE7AKLA.mjs";
+import { i as testDefinitions, n as createOutboxContext, r as createRequestContext, t as createInboxContext } from "../context-DVoTs_wM.mjs";
 export { createInboxContext, createOutboxContext, createRequestContext, testDefinitions };

package/dist/utils/docloader.test.mjs

@@ -1,13 +1,13 @@
 import { Temporal } from "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-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-DUV8ysti.mjs";
-import { i as rsaPrivateKey2 } from "../keys-CSYsOMFG.mjs";
-import { t as getAuthenticatedDocumentLoader } from "../docloader-WsWfKaE5.mjs";
+import { t as assertEquals } from "../assert_equals-C-ZRDbaf.mjs";
+import "../std__assert-BBjXFNOb.mjs";
+import { t as assertRejects } from "../assert_rejects-DN60FHPX.mjs";
+import { t as esm_default } from "../esm-BQRw925N.mjs";
+import { l as verifyRequest } from "../http-Cyx5SNuu.mjs";
+import { i as rsaPrivateKey2 } from "../keys-C3kae-6B.mjs";
+import { t as getAuthenticatedDocumentLoader } from "../docloader-BT89tyFr.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-VHFP42vY.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-Dz31ATUT.cjs");
+const require_kv_cache = require("../kv-cache-DuEwFYcN.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-DBNpsneh.js";
+import { n as getAuthenticatedDocumentLoader, t as kvCache } from "../kv-cache-CuCn2xvM.js";
 export { getAuthenticatedDocumentLoader, kvCache };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/fedify",
-  "version": "2.3.0-dev.1119+6cc02662",
+  "version": "2.3.0-dev.1137+53a1f26d",
   "description": "An ActivityPub server framework",
   "keywords": [
     "ActivityPub",
@@ -150,12 +150,11 @@
     "json-canon": "^1.0.1",
     "jsonld": "^9.0.0",
     "structured-field-values": "^2.0.4",
-    "uri-template-router": "^1.0.0",
-    "url-template": "^3.1.1",
     "urlpattern-polyfill": "^10.1.0",
-    "@fedify/vocab": "2.3.0-dev.1119+6cc02662",
-    "@fedify/vocab-runtime": "2.3.0-dev.1119+6cc02662",
-    "@fedify/webfinger": "2.3.0-dev.1119+6cc02662"
+    "@fedify/vocab-runtime": "2.3.0-dev.1137+53a1f26d",
+    "@fedify/webfinger": "2.3.0-dev.1137+53a1f26d",
+    "@fedify/vocab": "2.3.0-dev.1137+53a1f26d",
+    "@fedify/uri-template": "2.3.0-dev.1137+53a1f26d"
   },
   "devDependencies": {
     "@opentelemetry/sdk-metrics": "2.7.1",
@@ -169,7 +168,7 @@
     "typescript": "^6.0.0",
     "wrangler": "^4.17.0",
     "@fedify/fixture": "2.0.0",
-    "@fedify/vocab-tools": "^2.3.0-dev.1119+6cc02662"
+    "@fedify/vocab-tools": "^2.3.0-dev.1137+53a1f26d"
   },
   "scripts": {
     "build:self": "tsdown",

package/dist/mod-C6E8rkcz.d.ts

@@ -1,63 +0,0 @@
-/// <reference lib="esnext.temporal" />
-import { Ct as WebFingerLinksDispatcher, et as ActorAliasMapper, l as RequestContext, nt as ActorHandleMapper, tt as ActorDispatcher } from "./context-cSUMk2da.js";
-import { Span, Tracer } from "@opentelemetry/api";
-
-//#region src/federation/webfinger.d.ts
-/**
-* Parameters for {@link handleWebFinger}.
-*/
-interface WebFingerHandlerParameters<TContextData> {
-  /**
-  * The request context.
-  */
-  context: RequestContext<TContextData>;
-  /**
-  * The canonical hostname of the server, if it's explicitly configured.
-  * @since 1.5.0
-  */
-  host?: string;
-  /**
-  * The callback for dispatching the actor.
-  */
-  actorDispatcher?: ActorDispatcher<TContextData>;
-  /**
-  * The callback for mapping a WebFinger username to the corresponding actor's
-  * internal identifier, or `null` if the username is not found.
-  * @since 0.15.0
-  */
-  actorHandleMapper?: ActorHandleMapper<TContextData>;
-  /**
-  * The callback for mapping a WebFinger query to the corresponding actor's
-  * internal identifier or username, or `null` if the query is not found.
-  * @since 1.4.0
-  */
-  actorAliasMapper?: ActorAliasMapper<TContextData>;
-  /**
-  * The callback for dispatching the Links of webFinger.
-  */
-  webFingerLinksDispatcher?: WebFingerLinksDispatcher<TContextData>;
-  /**
-  * The function to call when the actor is not found.
-  */
-  onNotFound(request: Request): Response | Promise<Response>;
-  /**
-  * The OpenTelemetry tracer.
-  * @since 1.3.0
-  */
-  tracer?: Tracer;
-  /**
-  * The span for the request.
-  * @since 1.3.0
-  */
-  span?: Span;
-}
-/**
-* Handles a WebFinger request.  You would not typically call this function
-* directly, but instead use {@link Federation.fetch} method.
-* @param request The WebFinger request to handle.
-* @param parameters The parameters for handling the request.
-* @returns The response to the request.
-*/
-declare function handleWebFinger<TContextData>(request: Request, options: WebFingerHandlerParameters<TContextData>): Promise<Response>;
-//#endregion
-export { handleWebFinger as n, WebFingerHandlerParameters as t };

package/dist/mod-P9tE2WmM.d.cts

@@ -1,63 +0,0 @@
-/// <reference lib="esnext.temporal" />
-import { Ct as WebFingerLinksDispatcher, et as ActorAliasMapper, l as RequestContext, nt as ActorHandleMapper, tt as ActorDispatcher } from "./context-Ch-ZLyTQ.cjs";
-import { Span, Tracer } from "@opentelemetry/api";
-
-//#region src/federation/webfinger.d.ts
-/**
-* Parameters for {@link handleWebFinger}.
-*/
-interface WebFingerHandlerParameters<TContextData> {
-  /**
-  * The request context.
-  */
-  context: RequestContext<TContextData>;
-  /**
-  * The canonical hostname of the server, if it's explicitly configured.
-  * @since 1.5.0
-  */
-  host?: string;
-  /**
-  * The callback for dispatching the actor.
-  */
-  actorDispatcher?: ActorDispatcher<TContextData>;
-  /**
-  * The callback for mapping a WebFinger username to the corresponding actor's
-  * internal identifier, or `null` if the username is not found.
-  * @since 0.15.0
-  */
-  actorHandleMapper?: ActorHandleMapper<TContextData>;
-  /**
-  * The callback for mapping a WebFinger query to the corresponding actor's
-  * internal identifier or username, or `null` if the query is not found.
-  * @since 1.4.0
-  */
-  actorAliasMapper?: ActorAliasMapper<TContextData>;
-  /**
-  * The callback for dispatching the Links of webFinger.
-  */
-  webFingerLinksDispatcher?: WebFingerLinksDispatcher<TContextData>;
-  /**
-  * The function to call when the actor is not found.
-  */
-  onNotFound(request: Request): Response | Promise<Response>;
-  /**
-  * The OpenTelemetry tracer.
-  * @since 1.3.0
-  */
-  tracer?: Tracer;
-  /**
-  * The span for the request.
-  * @since 1.3.0
-  */
-  span?: Span;
-}
-/**
-* Handles a WebFinger request.  You would not typically call this function
-* directly, but instead use {@link Federation.fetch} method.
-* @param request The WebFinger request to handle.
-* @param parameters The parameters for handling the request.
-* @returns The response to the request.
-*/
-declare function handleWebFinger<TContextData>(request: Request, options: WebFingerHandlerParameters<TContextData>): Promise<Response>;
-//#endregion
-export { handleWebFinger as n, WebFingerHandlerParameters as t };