@fedify/fedify 2.4.0-dev.1570 → 2.4.0-dev.1571

package/dist/{key-o0_ipvUR.mjs → key-C5fRM_21.mjs}

@@ -1,12 +1,12 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-klNxGW7W.mjs";
-import { _ as recordKeyLookup, n as getDurationMs, t as classifyFetchError } from "./metrics-CLSPm4dZ.mjs";
+import { n as version, t as name } from "./deno-ColSXZB4.mjs";
+import { _ as recordKeyLookup, n as getDurationMs, t as classifyFetchError } from "./metrics-C60MEuIn.mjs";
 import { getLogger } from "@logtape/logtape";
-import { CryptographicKey, Object as Object$1, isActor } from "@fedify/vocab";
+import { CryptographicKey, Multikey, Object as Object$1, isActor } from "@fedify/vocab";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
-import { FetchError, getDocumentLoader } from "@fedify/vocab-runtime";
+import { FetchError, getDocumentLoader, parseDidKeyVerificationMethod } from "@fedify/vocab-runtime";
 //#region src/sig/key.ts
 /**
 * Checks if the given key is valid and supported.  No-op if the key is valid,
@@ -195,16 +195,22 @@ async function fetchKeyDetailed(keyId, cls, options = {}) {
 async function getCachedFetchKey(cacheKey, keyId, cls, keyCache, logger) {
 	if (keyCache == null) return null;
 	const cachedKey = await keyCache.get(cacheKey);
-	if (cachedKey instanceof cls && cachedKey.publicKey != null) {
-		logger.debug("Key {keyId} found in cache.", { keyId });
+	const hit = checkCachedKeyHit(cachedKey, keyId, cls, logger);
+	if (hit != null) return hit;
+	if (cachedKey === null) {
+		logger.debug("Entry {keyId} found in cache, but it is unavailable.", { keyId });
 		return {
-			key: cachedKey,
+			key: null,
 			cached: true
 		};
-	} else if (cachedKey === null) {
-		logger.debug("Entry {keyId} found in cache, but it is unavailable.", { keyId });
+	}
+	return null;
+}
+function checkCachedKeyHit(cachedKey, keyId, cls, logger) {
+	if (cachedKey instanceof cls && cachedKey.publicKey != null) {
+		logger.debug("Key {keyId} found in cache.", { keyId });
 		return {
-			key: null,
+			key: cachedKey,
 			cached: true
 		};
 	}
@@ -213,6 +219,61 @@ async function getCachedFetchKey(cacheKey, keyId, cls, keyCache, logger) {
 async function clearFetchErrorMetadata(keyId, keyCache) {
 	await keyCache?.setFetchError?.(keyId, null);
 }
+function isDidKeyUrl(keyId) {
+	return keyId.protocol === "did:" && keyId.pathname.startsWith("key:");
+}
+async function doRawKeysMatch(left, right) {
+	const [leftRaw, rightRaw] = await Promise.all([crypto.subtle.exportKey("raw", left), crypto.subtle.exportKey("raw", right)]);
+	if (leftRaw.byteLength !== rightRaw.byteLength) return false;
+	const leftBytes = new Uint8Array(leftRaw);
+	const rightBytes = new Uint8Array(rightRaw);
+	return leftBytes.every((byte, index) => byte === rightBytes[index]);
+}
+async function isCachedDidKeyValid(key, verificationMethod) {
+	try {
+		return key.id?.href === verificationMethod.id.href && key.controllerId?.href === verificationMethod.controller.href && await doRawKeysMatch(key.publicKey, verificationMethod.publicKey);
+	} catch {
+		return false;
+	}
+}
+async function resolveDidKey(cacheKey, cls, keyCache, logger) {
+	if (!isDidKeyUrl(cacheKey)) return null;
+	const keyId = cacheKey.href;
+	if (!(cls === Multikey)) {
+		logger.debug("Failed to resolve did:key {keyId}; did:key verification methods are only supported as Multikey values.", { keyId });
+		return {
+			key: null,
+			cached: false
+		};
+	}
+	let verificationMethod;
+	try {
+		verificationMethod = await parseDidKeyVerificationMethod(cacheKey);
+	} catch (error) {
+		logger.debug("Failed to resolve did:key verification method {keyId}: {error}", {
+			keyId,
+			error
+		});
+		return {
+			key: null,
+			cached: false
+		};
+	}
+	const hit = checkCachedKeyHit(await keyCache?.get(cacheKey), keyId, cls, logger);
+	if (hit?.key instanceof Multikey && await isCachedDidKeyValid(hit.key, verificationMethod)) return hit;
+	const key = new Multikey({
+		id: verificationMethod.id,
+		controller: verificationMethod.controller,
+		publicKey: verificationMethod.publicKey
+	});
+	await keyCache?.set(cacheKey, key);
+	await clearFetchErrorMetadata(cacheKey, keyCache);
+	logger.debug("Resolved did:key verification method {keyId}.", { keyId });
+	return {
+		key,
+		cached: false
+	};
+}
 async function resolveFetchedKey(document, cacheKey, keyId, cls, { documentLoader, contextLoader, keyCache, tracerProvider }, logger) {
 	let object;
 	try {
@@ -327,6 +388,11 @@ async function fetchKeyWithResult(cacheKey, cls, options, onCachedUnavailable, o
 		]);
 		const keyId = cacheKey.href;
 		const keyCache = options.keyCache;
+		const didKey = await resolveDidKey(cacheKey, cls, keyCache, logger);
+		if (didKey != null) {
+			outcome = { result: didKey.key == null ? "invalid" : didKey.cached ? "hit" : "fetched" };
+			return didKey;
+		}
 		const cached = await getCachedFetchKey(cacheKey, keyId, cls, keyCache, logger);
 		if (cached?.key === null && cached.cached) {
 			const cachedUnavailable = await onCachedUnavailable(cacheKey, keyId, keyCache, logger);

package/dist/{kv-cache-DSWq2JHU.js → kv-cache-6cpvv2tC.js}

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

package/dist/{kv-cache-CM7w20U5.mjs → kv-cache-Bn_DvESZ.mjs}

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

package/dist/{kv-cache-C3rqzQvu.cjs → kv-cache-C51pYkUU.cjs}

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

package/dist/{ld-C__CEgQH.mjs → ld-DxtnUVwj.mjs}

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

package/dist/{metrics-CLSPm4dZ.mjs → metrics-C60MEuIn.mjs}

@@ -1,7 +1,7 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-klNxGW7W.mjs";
+import { n as version, t as name } from "./deno-ColSXZB4.mjs";
 import { metrics } from "@opentelemetry/api";
 import { FetchError } from "@fedify/vocab-runtime";
 //#region src/federation/metrics.ts
@@ -167,11 +167,11 @@ var FederationMetrics = class {
 			unit: "{change}"
 		});
 		this.keyLookup = meter.createCounter("activitypub.key.lookup", {
-			description: "Public-key lookup attempts performed by Fedify, including both cache hits and remote fetches.",
+			description: "Public-key lookup attempts performed by Fedify, including cache hits, local resolutions, and remote fetches.",
 			unit: "{lookup}"
 		});
 		this.keyLookupDuration = meter.createHistogram("activitypub.key.lookup.duration", {
-			description: "Duration of public-key lookups performed by Fedify, including any remote fetch.",
+			description: "Duration of public-key lookups performed by Fedify, including cache hits, local resolutions, and any remote fetch.",
 			unit: "ms",
 			advice: { explicitBucketBoundaries: [
 				5,

package/dist/{middleware-CdMiavoh.mjs → middleware-B9bNYUM5.mjs}

@@ -1,5 +1,5 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as FederationImpl } from "./middleware-CjHqy-1i.mjs";
+import { n as FederationImpl } from "./middleware-DkRMEKQc.mjs";
 export { FederationImpl };

package/dist/{middleware-B502nwxx.cjs → middleware-Cp410Lku.cjs}

@@ -2,10 +2,10 @@ const { Temporal } = require("@js-temporal/polyfill");
 const { URLPattern } = require("urlpattern-polyfill");
 const require_chunk = require("./chunk-DDcVe30Y.cjs");
 const require_transformers = require("./transformers-NeAONrAq.cjs");
-const require_http = require("./http-DeuPW1Oh.cjs");
-const require_proof = require("./proof-CiDzRtr0.cjs");
+const require_http = require("./http-Be6MS-3k.cjs");
+const require_proof = require("./proof-CB7yrPSS.cjs");
 const require_types = require("./types-KC4QAoxe.cjs");
-const require_kv_cache = require("./kv-cache-C3rqzQvu.cjs");
+const require_kv_cache = require("./kv-cache-C51pYkUU.cjs");
 let _logtape_logtape = require("@logtape/logtape");
 let _fedify_uri_template = require("@fedify/uri-template");
 let _fedify_vocab = require("@fedify/vocab");

package/dist/{middleware-zuLSkPIk.js → middleware-DY9SToNd.js}

@@ -2,10 +2,10 @@ import { Temporal } from "@js-temporal/polyfill";
 import { URLPattern } from "urlpattern-polyfill";
 import { t as __exportAll } from "./chunk-CRNNMoPX.js";
 import { r as getDefaultActivityTransformers } from "./transformers-BGMIq1cs.js";
-import { A as formatAcceptSignature, D as recordOutboxEnqueue, E as recordOutboxActivity, F as version, O as recordWebFingerHandle, P as name, S as recordCollectionTotalItems, T as recordInboxActivity, a as verifyRequestDetailed, b as recordCollectionPageItems, d as validateCryptoKey, f as getDurationMs, g as isAbortError, h as instrumentDocumentLoader, i as verifyRequest, k as registerQueueDepthGauge, m as getRemoteHost, n as parseRfc9421SignatureInput, o as exportJwk, p as getFederationMetrics, t as doubleKnock, u as importJwk, v as recordCircuitBreakerStateChange, w as recordFanoutRecipients, x as recordCollectionRequest, y as recordCollectionDispatchDuration } from "./http-D0jH0kco.js";
-import { _ as hasSignatureLike, b as signJsonLd, c as getKeyOwner, f as compactJsonLd, g as hasSignature, h as getNormalizationContextLoader, i as verifyObject, l as InvalidContextReferenceError, m as detachSignature, n as hasProofLike, o as normalizeOutgoingActivityJsonLd, r as signObject, s as doesActorOwnKey, u as assertSafeJsonLd, v as isClearlyMalformedContextReference, w as wrapContextLoaderForJsonLd, x as verifyCompactJsonLd, y as isInvalidUrlTypeError } from "./proof-DQWTf6oB.js";
+import { A as formatAcceptSignature, D as recordOutboxEnqueue, E as recordOutboxActivity, F as version, O as recordWebFingerHandle, P as name, S as recordCollectionTotalItems, T as recordInboxActivity, a as verifyRequestDetailed, b as recordCollectionPageItems, d as validateCryptoKey, f as getDurationMs, g as isAbortError, h as instrumentDocumentLoader, i as verifyRequest, k as registerQueueDepthGauge, m as getRemoteHost, n as parseRfc9421SignatureInput, o as exportJwk, p as getFederationMetrics, t as doubleKnock, u as importJwk, v as recordCircuitBreakerStateChange, w as recordFanoutRecipients, x as recordCollectionRequest, y as recordCollectionDispatchDuration } from "./http-BciNZ5qO.js";
+import { _ as hasSignatureLike, b as signJsonLd, c as getKeyOwner, f as compactJsonLd, g as hasSignature, h as getNormalizationContextLoader, i as verifyObject, l as InvalidContextReferenceError, m as detachSignature, n as hasProofLike, o as normalizeOutgoingActivityJsonLd, r as signObject, s as doesActorOwnKey, u as assertSafeJsonLd, v as isClearlyMalformedContextReference, w as wrapContextLoaderForJsonLd, x as verifyCompactJsonLd, y as isInvalidUrlTypeError } from "./proof-BlD1HSeA.js";
 import { n as getNodeInfo, t as nodeInfoToJson } from "./types-CAY3OdLq.js";
-import { n as getAuthenticatedDocumentLoader, t as kvCache } from "./kv-cache-DSWq2JHU.js";
+import { n as getAuthenticatedDocumentLoader, t as kvCache } from "./kv-cache-6cpvv2tC.js";
 import { getLogger, withContext } from "@logtape/logtape";
 import { Router, RouterError, assertPath } from "@fedify/uri-template";
 import { Activity, Collection, CollectionPage, CryptographicKey, Link, Multikey, Object as Object$1, OrderedCollection, OrderedCollectionPage, Tombstone, getTypeId, lookupObject, traverseCollection } from "@fedify/vocab";

package/dist/{middleware-CjHqy-1i.mjs → middleware-DkRMEKQc.mjs}

@@ -1,26 +1,26 @@
 import { Temporal } from "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-klNxGW7W.mjs";
-import { a as instrumentDocumentLoader, b as recordWebFingerHandle, c as recordCircuitBreakerStateChange, d as recordCollectionRequest, f as recordCollectionTotalItems, g as recordInboxActivity, h as recordFanoutRecipients, i as getRemoteHost, l as recordCollectionDispatchDuration, n as getDurationMs, o as isAbortError, r as getFederationMetrics, u as recordCollectionPageItems, v as recordOutboxActivity, x as registerQueueDepthGauge, y as recordOutboxEnqueue } from "./metrics-CLSPm4dZ.mjs";
+import { n as version, t as name } from "./deno-ColSXZB4.mjs";
+import { a as instrumentDocumentLoader, b as recordWebFingerHandle, c as recordCircuitBreakerStateChange, d as recordCollectionRequest, f as recordCollectionTotalItems, g as recordInboxActivity, h as recordFanoutRecipients, i as getRemoteHost, l as recordCollectionDispatchDuration, n as getDurationMs, o as isAbortError, r as getFederationMetrics, u as recordCollectionPageItems, v as recordOutboxActivity, x as registerQueueDepthGauge, y as recordOutboxEnqueue } from "./metrics-C60MEuIn.mjs";
 import { t as formatAcceptSignature } from "./accept-CgDcxvjV.mjs";
-import { a as importJwk, o as validateCryptoKey, t as exportJwk } from "./key-o0_ipvUR.mjs";
-import { l as verifyRequest, o as parseRfc9421SignatureInput, u as verifyRequestDetailed } from "./http-JdRPUYku.mjs";
-import { t as getAuthenticatedDocumentLoader } from "./docloader-CuFH35j1.mjs";
-import { n as kvCache } from "./kv-cache-CM7w20U5.mjs";
-import { _ as wrapContextLoaderForJsonLd, a as compactJsonLd, c as getNormalizationContextLoader, d as isClearlyMalformedContextReference, f as isInvalidUrlTypeError, l as hasSignature, m as verifyCompactJsonLd, p as signJsonLd, r as assertSafeJsonLd, s as detachSignature, t as InvalidContextReferenceError, u as hasSignatureLike } from "./ld-C__CEgQH.mjs";
-import { n as getKeyOwner, t as doesActorOwnKey } from "./owner-gz4TUfKG.mjs";
+import { a as importJwk, o as validateCryptoKey, t as exportJwk } from "./key-C5fRM_21.mjs";
+import { l as verifyRequest, o as parseRfc9421SignatureInput, u as verifyRequestDetailed } from "./http-CuG4iKEH.mjs";
+import { t as getAuthenticatedDocumentLoader } from "./docloader-BQGU0tG-.mjs";
+import { n as kvCache } from "./kv-cache-Bn_DvESZ.mjs";
+import { _ as wrapContextLoaderForJsonLd, a as compactJsonLd, c as getNormalizationContextLoader, d as isClearlyMalformedContextReference, f as isInvalidUrlTypeError, l as hasSignature, m as verifyCompactJsonLd, p as signJsonLd, r as assertSafeJsonLd, s as detachSignature, t as InvalidContextReferenceError, u as hasSignatureLike } from "./ld-DxtnUVwj.mjs";
+import { n as getKeyOwner, t as doesActorOwnKey } from "./owner-DA4lyeXg.mjs";
 import { r as normalizeOutgoingActivityJsonLd } from "./outgoing-jsonld-BNL8AC14.mjs";
-import { i as verifyObject, n as hasProofLike, r as signObject } from "./proof-CuQpZ_AT.mjs";
+import { i as verifyObject, n as hasProofLike, r as signObject } from "./proof-BpDfPXQU.mjs";
 import { t as getNodeInfo } from "./client-B_A6mfn3.mjs";
 import { t as nodeInfoToJson } from "./types-BFowWFTT.mjs";
-import { n as extractInboxes, r as sendActivity, t as SendActivityError } from "./send-B60teucv.mjs";
-import { n as FederationBuilderImpl, t as ACTOR_ALIAS_PREFIX } from "./builder-CJnWbgbj.mjs";
+import { n as extractInboxes, r as sendActivity, t as SendActivityError } from "./send-DfeB83F0.mjs";
+import { n as FederationBuilderImpl, t as ACTOR_ALIAS_PREFIX } from "./builder-CBgmNPaS.mjs";
 import { t as CircuitBreaker } from "./circuit-breaker-hJBB6jwA.mjs";
 import { t as buildCollectionSynchronizationHeader } from "./collection-Dp5ky45w.mjs";
 import { t as KvKeyCache } from "./keycache-CaOR6NYg.mjs";
 import { t as acceptsJsonLd } from "./negotiation-m_L2nyS3.mjs";
-import { t as hasMalformedKnownTemporalLiteral } from "./temporal-CvVMrvJJ.mjs";
+import { t as hasMalformedKnownTemporalLiteral } from "./temporal-CIHMi9QT.mjs";
 import { t as createExponentialBackoffPolicy } from "./retry-DI4O-zYl.mjs";
 import { t as TaskCodec } from "./codec-nfBU4Up4.mjs";
 import { n as ParallelMessageQueue } from "./mq-03vS-C9P.mjs";

package/dist/mod.cjs

@@ -4,11 +4,11 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 require("./chunk-DDcVe30Y.cjs");
 const require_transformers = require("./transformers-NeAONrAq.cjs");
 require("./compat/mod.cjs");
-const require_http = require("./http-DeuPW1Oh.cjs");
-const require_middleware = require("./middleware-B502nwxx.cjs");
-const require_proof = require("./proof-CiDzRtr0.cjs");
+const require_http = require("./http-Be6MS-3k.cjs");
+const require_middleware = require("./middleware-Cp410Lku.cjs");
+const require_proof = require("./proof-CB7yrPSS.cjs");
 const require_types = require("./types-KC4QAoxe.cjs");
-const require_kv_cache = require("./kv-cache-C3rqzQvu.cjs");
+const require_kv_cache = require("./kv-cache-C51pYkUU.cjs");
 const require_federation_mod = require("./federation/mod.cjs");
 require("./nodeinfo/mod.cjs");
 require("./runtime/mod.cjs");

package/dist/mod.js

@@ -3,11 +3,11 @@ import { URLPattern } from "urlpattern-polyfill";
 import "./chunk-CRNNMoPX.js";
 import { n as autoIdAssigner, r as getDefaultActivityTransformers, t as actorDehydrator } from "./transformers-BGMIq1cs.js";
 import "./compat/mod.js";
-import { A as formatAcceptSignature, M as parseAcceptSignature, N as validateAcceptSignature, a as verifyRequestDetailed, c as fetchKeyDetailed, i as verifyRequest, j as fulfillAcceptSignature, l as generateCryptoKeyPair, o as exportJwk, r as signRequest, s as fetchKey, u as importJwk } from "./http-D0jH0kco.js";
-import { a as ParallelMessageQueue, c as respondWithObject, d as digest, f as CircuitBreaker, h as createFederationBuilder, i as InProcessMessageQueue, l as respondWithObjectIfAcceptable, m as parseCircuitBreakerKvState, o as createExponentialBackoffPolicy, p as normalizeCircuitBreakerOptions, r as handleWebFinger, s as SendActivityError, t as createFederation, u as buildCollectionSynchronizationHeader } from "./middleware-zuLSkPIk.js";
-import { C as verifySignature, S as verifyJsonLd, _ as hasSignatureLike, a as verifyProof, b as signJsonLd, c as getKeyOwner, d as attachSignature, i as verifyObject, m as detachSignature, n as hasProofLike, p as createSignature, r as signObject, s as doesActorOwnKey, t as createProof } from "./proof-DQWTf6oB.js";
+import { A as formatAcceptSignature, M as parseAcceptSignature, N as validateAcceptSignature, a as verifyRequestDetailed, c as fetchKeyDetailed, i as verifyRequest, j as fulfillAcceptSignature, l as generateCryptoKeyPair, o as exportJwk, r as signRequest, s as fetchKey, u as importJwk } from "./http-BciNZ5qO.js";
+import { a as ParallelMessageQueue, c as respondWithObject, d as digest, f as CircuitBreaker, h as createFederationBuilder, i as InProcessMessageQueue, l as respondWithObjectIfAcceptable, m as parseCircuitBreakerKvState, o as createExponentialBackoffPolicy, p as normalizeCircuitBreakerOptions, r as handleWebFinger, s as SendActivityError, t as createFederation, u as buildCollectionSynchronizationHeader } from "./middleware-DY9SToNd.js";
+import { C as verifySignature, S as verifyJsonLd, _ as hasSignatureLike, a as verifyProof, b as signJsonLd, c as getKeyOwner, d as attachSignature, i as verifyObject, m as detachSignature, n as hasProofLike, p as createSignature, r as signObject, s as doesActorOwnKey, t as createProof } from "./proof-BlD1HSeA.js";
 import { n as getNodeInfo, r as parseNodeInfo, t as nodeInfoToJson } from "./types-CAY3OdLq.js";
-import { n as getAuthenticatedDocumentLoader, t as kvCache } from "./kv-cache-DSWq2JHU.js";
+import { n as getAuthenticatedDocumentLoader, t as kvCache } from "./kv-cache-6cpvv2tC.js";
 import { MemoryKvStore, Router, RouterError } from "./federation/mod.js";
 import "./nodeinfo/mod.js";
 import "./runtime/mod.js";

package/dist/nodeinfo/handler.test.mjs

@@ -5,7 +5,7 @@ import { r as createRequestContext } from "../context-BBRTgkrs.mjs";
 import { t as MemoryKvStore } from "../kv-CIvR3Non.mjs";
 import { t as assertEquals } from "../assert_equals-PBVKNMJd.mjs";
 import "../std__assert-Dh6uLf_q.mjs";
-import { _ as handleNodeInfo, o as createFederation, v as handleNodeInfoJrd } from "../middleware-CjHqy-1i.mjs";
+import { _ as handleNodeInfo, o as createFederation, v as handleNodeInfoJrd } from "../middleware-DkRMEKQc.mjs";
 import { test } from "@fedify/fixture";
 //#region src/nodeinfo/handler.test.ts
 test("handleNodeInfo()", async () => {

package/dist/{owner-gz4TUfKG.mjs → owner-DA4lyeXg.mjs}

@@ -1,8 +1,8 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-klNxGW7W.mjs";
-import "./key-o0_ipvUR.mjs";
+import { n as version, t as name } from "./deno-ColSXZB4.mjs";
+import "./key-C5fRM_21.mjs";
 import { CryptographicKey, Object as Object$1, isActor } from "@fedify/vocab";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
 import { getDocumentLoader } from "@fedify/vocab-runtime";

package/dist/{proof-DQWTf6oB.js → proof-BlD1HSeA.js}

@@ -1,6 +1,6 @@
 import { Temporal } from "@js-temporal/polyfill";
 import { URLPattern } from "urlpattern-polyfill";
-import { F as version, P as name, _ as measureSignatureKeyFetch, d as validateCryptoKey, f as getDurationMs, p as getFederationMetrics, s as fetchKey } from "./http-D0jH0kco.js";
+import { F as version, P as name, _ as measureSignatureKeyFetch, d as validateCryptoKey, f as getDurationMs, p as getFederationMetrics, s as fetchKey } from "./http-BciNZ5qO.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/{proof-CuQpZ_AT.mjs → proof-BpDfPXQU.mjs}

@@ -1,9 +1,9 @@
 import { Temporal } from "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-klNxGW7W.mjs";
-import { n as getDurationMs, r as getFederationMetrics, s as measureSignatureKeyFetch } from "./metrics-CLSPm4dZ.mjs";
-import { n as fetchKey, o as validateCryptoKey } from "./key-o0_ipvUR.mjs";
+import { n as version, t as name } from "./deno-ColSXZB4.mjs";
+import { n as getDurationMs, r as getFederationMetrics, s as measureSignatureKeyFetch } from "./metrics-C60MEuIn.mjs";
+import { n as fetchKey, o as validateCryptoKey } from "./key-C5fRM_21.mjs";
 import { n as preloadedOnlyDocumentLoader } from "./public-audience-c9zmYKgA.mjs";
 import { r as normalizeOutgoingActivityJsonLd } from "./outgoing-jsonld-BNL8AC14.mjs";
 import { getLogger } from "@logtape/logtape";

package/dist/{proof-CiDzRtr0.cjs → proof-CB7yrPSS.cjs}

@@ -1,7 +1,7 @@
 const { Temporal } = require("@js-temporal/polyfill");
 const { URLPattern } = require("urlpattern-polyfill");
 const require_chunk = require("./chunk-DDcVe30Y.cjs");
-const require_http = require("./http-DeuPW1Oh.cjs");
+const require_http = require("./http-Be6MS-3k.cjs");
 let _logtape_logtape = require("@logtape/logtape");
 let _fedify_vocab = require("@fedify/vocab");
 let _opentelemetry_api = require("@opentelemetry/api");

package/dist/{send-B60teucv.mjs → send-DfeB83F0.mjs}

@@ -1,9 +1,9 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-klNxGW7W.mjs";
-import { n as getDurationMs, r as getFederationMetrics } from "./metrics-CLSPm4dZ.mjs";
-import { n as doubleKnock } from "./http-JdRPUYku.mjs";
+import { n as version, t as name } from "./deno-ColSXZB4.mjs";
+import { n as getDurationMs, r as getFederationMetrics } from "./metrics-C60MEuIn.mjs";
+import { n as doubleKnock } from "./http-CuG4iKEH.mjs";
 import { getLogger } from "@logtape/logtape";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
 import { FetchError } from "@fedify/vocab-runtime";

package/dist/sig/http.test.mjs

@@ -7,8 +7,8 @@ import { r as assertExists, t as assertStringIncludes } from "../std__assert-Dh6
 import { n as assertGreaterOrEqual, r as assertFalse, t as assertRejects } from "../assert_rejects-DAdaaIWM.mjs";
 import { t as assertThrows } from "../assert_throws-zN79lgIC.mjs";
 import { t as assert } from "../assert-DvVHoIZ0.mjs";
-import { t as exportJwk } from "../key-o0_ipvUR.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-JdRPUYku.mjs";
+import { t as exportJwk } from "../key-C5fRM_21.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-CuG4iKEH.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";

package/dist/sig/key.test.mjs

@@ -5,11 +5,11 @@ import { t as assertEquals } from "../assert_equals-PBVKNMJd.mjs";
 import "../std__assert-Dh6uLf_q.mjs";
 import { t as assertRejects } from "../assert_rejects-DAdaaIWM.mjs";
 import { t as assertThrows } from "../assert_throws-zN79lgIC.mjs";
-import { a as importJwk, i as generateCryptoKeyPair, n as fetchKey, o as validateCryptoKey, r as fetchKeyDetailed, t as exportJwk } from "../key-o0_ipvUR.mjs";
-import { c as rsaPublicKey3, i as rsaPrivateKey2, o as rsaPublicKey1, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-CSYsOMFG.mjs";
+import { a as importJwk, i as generateCryptoKeyPair, n as fetchKey, o as validateCryptoKey, r as fetchKeyDetailed, t as exportJwk } from "../key-C5fRM_21.mjs";
+import { c as rsaPublicKey3, i as rsaPrivateKey2, o as rsaPublicKey1, r as ed25519PublicKey, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-CSYsOMFG.mjs";
 import { CryptographicKey, Multikey } from "@fedify/vocab";
 import { createTestMeterProvider, createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
-import { FetchError } from "@fedify/vocab-runtime";
+import { FetchError, exportDidKey } from "@fedify/vocab-runtime";
 //#region src/sig/key.test.ts
 test("validateCryptoKey()", async () => {
 	const pkcs1v15 = await crypto.subtle.generateKey({
@@ -303,6 +303,190 @@ 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() resolves did:key Multikeys without document loading", async () => {
+	const did = await exportDidKey(ed25519PublicKey.publicKey);
+	const keyId = `${did}#${did.slice(8)}`;
+	const expectedKey = new Multikey({
+		id: new URL(keyId),
+		controller: new URL(did),
+		publicKey: ed25519PublicKey.publicKey
+	});
+	const cache = { [keyId]: null };
+	let documentLoaderCalls = 0;
+	const options = {
+		documentLoader() {
+			documentLoaderCalls++;
+			throw new TypeError("did:key must not use the document loader");
+		},
+		contextLoader: mockDocumentLoader,
+		keyCache: {
+			get(keyId) {
+				return Promise.resolve(cache[keyId.href]);
+			},
+			set(keyId, key) {
+				cache[keyId.href] = key;
+				return Promise.resolve();
+			}
+		}
+	};
+	assertEquals(await fetchKey(keyId, Multikey, options), {
+		key: expectedKey,
+		cached: false
+	});
+	assertEquals(documentLoaderCalls, 0);
+	assertEquals(cache[keyId], expectedKey);
+	assertEquals(await fetchKey(keyId, Multikey, options), {
+		key: expectedKey,
+		cached: true
+	});
+	assertEquals(documentLoaderCalls, 0);
+});
+test("fetchKey() validates cached did:key Multikeys", async () => {
+	const did = await exportDidKey(ed25519PublicKey.publicKey);
+	const keyId = `${did}#${did.slice(8)}`;
+	const wrongKeyPair = await generateCryptoKeyPair("Ed25519");
+	const cachedKey = new Multikey({
+		id: new URL(keyId),
+		controller: new URL(did),
+		publicKey: wrongKeyPair.publicKey
+	});
+	const expectedKey = new Multikey({
+		id: new URL(keyId),
+		controller: new URL(did),
+		publicKey: ed25519PublicKey.publicKey
+	});
+	const cache = { [keyId]: cachedKey };
+	let documentLoaderCalls = 0;
+	assertEquals(await fetchKey(keyId, Multikey, {
+		documentLoader() {
+			documentLoaderCalls++;
+			throw new TypeError("did:key must not use the document loader");
+		},
+		contextLoader: mockDocumentLoader,
+		keyCache: {
+			get(keyId) {
+				return Promise.resolve(cache[keyId.href]);
+			},
+			set(keyId, key) {
+				cache[keyId.href] = key;
+				return Promise.resolve();
+			}
+		}
+	}), {
+		key: expectedKey,
+		cached: false
+	});
+	assertEquals(documentLoaderCalls, 0);
+	assertEquals(cache[keyId], expectedKey);
+});
+test("fetchKey() rejects unsupported did:key values locally", async () => {
+	const invalidKeyId = "did:key:z6MksHj1MJnidCtDiyYW9ugNFftoX9fLK4bornTxmMZ6X7vq#z6MkhaXgBZDvotDkL5257faiztiGiC2QtKLGpbnnEGta2doK";
+	const cache = {};
+	let documentLoaderCalls = 0;
+	const [meterProvider, recorder] = createTestMeterProvider();
+	assertEquals(await fetchKey(invalidKeyId, Multikey, {
+		documentLoader() {
+			documentLoaderCalls++;
+			throw new TypeError("did:key must not use the document loader");
+		},
+		contextLoader: mockDocumentLoader,
+		meterProvider,
+		keyCache: {
+			get(keyId) {
+				return Promise.resolve(cache[keyId.href]);
+			},
+			set(keyId, key) {
+				cache[keyId.href] = key;
+				return Promise.resolve();
+			}
+		}
+	}), {
+		key: null,
+		cached: false
+	});
+	assertEquals(documentLoaderCalls, 0);
+	assertEquals(cache, {});
+	assertEquals(recorder.getMeasurement("activitypub.key.lookup")?.attributes["activitypub.lookup.result"], "invalid");
+});
+test("fetchKeyDetailed() resolves did:key without fetchError", async () => {
+	const did = await exportDidKey(ed25519PublicKey.publicKey);
+	const result = await fetchKeyDetailed(`${did}#${did.slice(8)}`, Multikey, {
+		documentLoader() {
+			throw new TypeError("did:key must not use the document loader");
+		},
+		contextLoader: mockDocumentLoader
+	});
+	assertEquals(result.key instanceof Multikey, true);
+	assertEquals(result.cached, false);
+	assertEquals(result.fetchError, void 0);
+});
+test("fetchKeyDetailed() rejects invalid did:key without fetchError", async () => {
+	const invalidKeyId = "did:key:z6MksHj1MJnidCtDiyYW9ugNFftoX9fLK4bornTxmMZ6X7vq#z6MkhaXgBZDvotDkL5257faiztiGiC2QtKLGpbnnEGta2doK";
+	const cache = {};
+	let documentLoaderCalls = 0;
+	const result = await fetchKeyDetailed(invalidKeyId, Multikey, {
+		documentLoader() {
+			documentLoaderCalls++;
+			throw new TypeError("did:key must not use the document loader");
+		},
+		contextLoader: mockDocumentLoader,
+		keyCache: {
+			get(keyId) {
+				return Promise.resolve(cache[keyId.href]);
+			},
+			set(keyId, key) {
+				cache[keyId.href] = key;
+				return Promise.resolve();
+			}
+		}
+	});
+	assertEquals(result.key, null);
+	assertEquals(result.cached, false);
+	assertEquals(result.fetchError, void 0);
+	assertEquals(documentLoaderCalls, 0);
+	assertEquals(cache, {});
+});
+test("fetchKey() does not resolve did:key as CryptographicKey", async () => {
+	const did = await exportDidKey(ed25519PublicKey.publicKey);
+	const keyId = `${did}#${did.slice(8)}`;
+	let cacheGets = 0;
+	let documentLoaderCalls = 0;
+	assertEquals(await fetchKey(keyId, CryptographicKey, {
+		documentLoader() {
+			documentLoaderCalls++;
+			throw new TypeError("did:key must not use the document loader");
+		},
+		contextLoader: mockDocumentLoader,
+		keyCache: {
+			get() {
+				cacheGets++;
+				throw new TypeError("did:key must not check the cache");
+			},
+			set() {
+				throw new TypeError("did:key must not write to the cache");
+			}
+		}
+	}), {
+		key: null,
+		cached: false
+	});
+	assertEquals(cacheGets, 0);
+	assertEquals(documentLoaderCalls, 0);
+});
+test("fetchKey() records did:key lookup metrics", async () => {
+	const did = await exportDidKey(ed25519PublicKey.publicKey);
+	const keyId = `${did}#${did.slice(8)}`;
+	const [meterProvider, recorder] = createTestMeterProvider();
+	assertEquals((await fetchKey(keyId, Multikey, {
+		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"], "");
+});
 test("fetchKey() records activitypub.key.lookup with hit on cached key", async () => {
 	const [meterProvider, recorder] = createTestMeterProvider();
 	const cache = {};

package/dist/sig/ld.test.mjs

@@ -5,9 +5,9 @@ import { t as assertEquals } from "../assert_equals-PBVKNMJd.mjs";
 import { n as assertGreaterOrEqual, r as assertFalse, t as assertRejects } from "../assert_rejects-DAdaaIWM.mjs";
 import { t as assertThrows } from "../assert_throws-zN79lgIC.mjs";
 import { t as assert } from "../assert-DvVHoIZ0.mjs";
-import { i as generateCryptoKeyPair } from "../key-o0_ipvUR.mjs";
+import { i as generateCryptoKeyPair } from "../key-C5fRM_21.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 compactJsonLd, f as isInvalidUrlTypeError, g as verifySignature, h as verifyJsonLd, i as attachSignature, n as UnsafeJsonLdError, o as createSignature, p as signJsonLd, s as detachSignature, u as hasSignatureLike } from "../ld-C__CEgQH.mjs";
+import { a as compactJsonLd, f as isInvalidUrlTypeError, g as verifySignature, h as verifyJsonLd, i as attachSignature, n as UnsafeJsonLdError, o as createSignature, p as signJsonLd, s as detachSignature, u as hasSignatureLike } from "../ld-DxtnUVwj.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-DeuPW1Oh.cjs");
-const require_proof = require("../proof-CiDzRtr0.cjs");
+const require_http = require("../http-Be6MS-3k.cjs");
+const require_proof = require("../proof-CB7yrPSS.cjs");
 exports.attachSignature = require_proof.attachSignature;
 exports.createProof = require_proof.createProof;
 exports.createSignature = require_proof.createSignature;

package/dist/sig/mod.js

@@ -1,5 +1,5 @@
 import { Temporal } from "@js-temporal/polyfill";
 import { URLPattern } from "urlpattern-polyfill";
-import { A as formatAcceptSignature, M as parseAcceptSignature, N as validateAcceptSignature, a as verifyRequestDetailed, c as fetchKeyDetailed, i as verifyRequest, j as fulfillAcceptSignature, l as generateCryptoKeyPair, o as exportJwk, r as signRequest, s as fetchKey, u as importJwk } from "../http-D0jH0kco.js";
-import { C as verifySignature, S as verifyJsonLd, _ as hasSignatureLike, a as verifyProof, b as signJsonLd, c as getKeyOwner, d as attachSignature, i as verifyObject, m as detachSignature, n as hasProofLike, p as createSignature, r as signObject, s as doesActorOwnKey, t as createProof } from "../proof-DQWTf6oB.js";
+import { A as formatAcceptSignature, M as parseAcceptSignature, N as validateAcceptSignature, a as verifyRequestDetailed, c as fetchKeyDetailed, i as verifyRequest, j as fulfillAcceptSignature, l as generateCryptoKeyPair, o as exportJwk, r as signRequest, s as fetchKey, u as importJwk } from "../http-BciNZ5qO.js";
+import { C as verifySignature, S as verifyJsonLd, _ as hasSignatureLike, a as verifyProof, b as signJsonLd, c as getKeyOwner, d as attachSignature, i as verifyObject, m as detachSignature, n as hasProofLike, p as createSignature, r as signObject, s as doesActorOwnKey, t as createProof } from "../proof-BlD1HSeA.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 };