@fedify/fedify 2.4.0-dev.1531 → 2.4.0-dev.1567

package/dist/{builder-CmQLlEE1.mjs → builder-DGWCUaNQ.mjs}

@@ -1,7 +1,7 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-bSDsva_4.mjs";
+import { n as version, t as name } from "./deno-Dho0TW0X.mjs";
 import { t as ActivityListenerSet } from "./activity-listener-tztVvlNb.mjs";
 import { getLogger } from "@logtape/logtape";
 import { Router, RouterError, assertPath } from "@fedify/uri-template";
@@ -80,7 +80,7 @@ var FederationBuilderImpl = class {
 	* specified.
 	*/
 	async build(options) {
-		const { FederationImpl } = await import("./middleware-DiTi3jC5.mjs");
+		const { FederationImpl } = await import("./middleware-CIteB8IS.mjs");
 		const f = new FederationImpl(options);
 		const trailingSlashInsensitiveValue = f.router.trailingSlashInsensitive;
 		f.router = this.router.clone();

package/dist/compat/transformers.test.mjs

@@ -5,7 +5,7 @@ import { t as assertEquals } from "../assert_equals-C-ZRDbaf.mjs";
 import { t as assertInstanceOf } from "../assert_instance_of-DBC5X09g.mjs";
 import { t as assert } from "../assert-OguE97r2.mjs";
 import { t as MemoryKvStore } from "../kv-rV3vodCc.mjs";
-import { b as autoIdAssigner, n as FederationImpl, y as actorDehydrator } from "../middleware-BWi34Ga3.mjs";
+import { b as autoIdAssigner, n as FederationImpl, y as actorDehydrator } from "../middleware-DfBPuuvp.mjs";
 import { Follow, Person } from "@fedify/vocab";
 import { test } from "@fedify/fixture";
 //#region src/compat/transformers.test.ts

package/dist/{deno-bSDsva_4.mjs → deno-Dho0TW0X.mjs}

@@ -3,6 +3,6 @@ import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 //#region deno.json
 var name = "@fedify/fedify";
-var version = "2.4.0-dev.1531+0896bc51";
+var version = "2.4.0-dev.1567+12e6a3c0";
 //#endregion
 export { version as n, name as t };

package/dist/{docloader-DlmmTFJc.mjs → docloader-DCQSgDOg.mjs}

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

package/dist/federation/builder.test.mjs

@@ -5,7 +5,7 @@ import { t as assertEquals } from "../assert_equals-C-ZRDbaf.mjs";
 import { r as assertExists } from "../std__assert-BBjXFNOb.mjs";
 import { t as assertThrows } from "../assert_throws-BOkhLGYc.mjs";
 import { t as MemoryKvStore } from "../kv-rV3vodCc.mjs";
-import { r as createFederationBuilder } from "../builder-CmQLlEE1.mjs";
+import { r as createFederationBuilder } from "../builder-DGWCUaNQ.mjs";
 import { DisallowedOperatorError, DisallowedVarSpecModifierError, DuplicateRouteVariableError, RouteTemplateOptionsNotMatchedError, RouterError } from "@fedify/uri-template";
 import { Activity, Note, Person } from "@fedify/vocab";
 import { test } from "@fedify/fixture";

package/dist/federation/handler.test.mjs

@@ -8,11 +8,11 @@ import { n as assertGreaterOrEqual, t as assertRejects } from "../assert_rejects
 import { t as assertInstanceOf } from "../assert_instance_of-DBC5X09g.mjs";
 import { t as assert } from "../assert-OguE97r2.mjs";
 import { r as parseAcceptSignature } from "../accept-CPkZzmGN.mjs";
-import { s as signRequest } from "../http-DwsK1LoE.mjs";
+import { s as signRequest } from "../http-Bf8YhWOi.mjs";
 import { a as rsaPrivateKey3, c as rsaPublicKey3, s as rsaPublicKey2 } from "../keys-DGu1NFwu.mjs";
-import { a as compactJsonLd, p as signJsonLd } from "../ld-CBIxjtov.mjs";
+import { a as compactJsonLd, p as signJsonLd } from "../ld-CCOPy-Co.mjs";
 import { t as MemoryKvStore } from "../kv-rV3vodCc.mjs";
-import { c as handleActor, d as handleInbox, f as handleObject, h as respondWithObjectIfAcceptable, l as handleCollection, m as respondWithObject, o as createFederation, p as handleOutbox, u as handleCustomCollection } from "../middleware-BWi34Ga3.mjs";
+import { c as handleActor, d as handleInbox, f as handleObject, h as respondWithObjectIfAcceptable, l as handleCollection, m as respondWithObject, o as createFederation, p as handleOutbox, u as handleCustomCollection } from "../middleware-DfBPuuvp.mjs";
 import { t as ActivityListenerSet } from "../activity-listener-tztVvlNb.mjs";
 import { Activity, Create, Note, Person, Tombstone } from "@fedify/vocab";
 import { createTestMeterProvider, createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
@@ -111,11 +111,16 @@ test("handleActor()", async () => {
 			"https://www.w3.org/ns/did/v1",
 			"https://w3id.org/security/multikey/v1",
 			"https://gotosocial.org/ns",
+			"https://w3id.org/fep/7aa9",
 			{
 				alsoKnownAs: {
 					"@id": "as:alsoKnownAs",
 					"@type": "@id"
 				},
+				featuredCollections: {
+					"@id": "https://w3id.org/fep/7aa9#featuredCollections",
+					"@type": "@id"
+				},
 				manuallyApprovesFollowers: "as:manuallyApprovesFollowers",
 				movedTo: {
 					"@id": "as:movedTo",
@@ -195,11 +200,16 @@ test("handleActor()", async () => {
 			"https://www.w3.org/ns/did/v1",
 			"https://w3id.org/security/multikey/v1",
 			"https://gotosocial.org/ns",
+			"https://w3id.org/fep/7aa9",
 			{
 				alsoKnownAs: {
 					"@id": "as:alsoKnownAs",
 					"@type": "@id"
 				},
+				featuredCollections: {
+					"@id": "https://w3id.org/fep/7aa9#featuredCollections",
+					"@type": "@id"
+				},
 				manuallyApprovesFollowers: "as:manuallyApprovesFollowers",
 				movedTo: {
 					"@id": "as:movedTo",

package/dist/federation/idempotency.test.mjs

@@ -4,9 +4,9 @@ globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-C-ZRDbaf.mjs";
 import "../std__assert-BBjXFNOb.mjs";
 import { n as ed25519PrivateKey, r as ed25519PublicKey, t as ed25519Multikey } from "../keys-DGu1NFwu.mjs";
-import { r as signObject } from "../proof-CZI5KQdk.mjs";
+import { r as signObject } from "../proof-CrI3UpuA.mjs";
 import { t as MemoryKvStore } from "../kv-rV3vodCc.mjs";
-import { o as createFederation } from "../middleware-BWi34Ga3.mjs";
+import { o as createFederation } from "../middleware-DfBPuuvp.mjs";
 import { Create, Follow, Person } from "@fedify/vocab";
 import { mockDocumentLoader, test } from "@fedify/fixture";
 //#region src/federation/idempotency.test.ts

package/dist/federation/metrics.test.mjs

@@ -4,7 +4,7 @@ globalThis.addEventListener = () => {};
 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 { _ as recordKeyLookup, 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, m as recordDocumentFetch, p as recordDocumentCache, r as getFederationMetrics, t as classifyFetchError, u as recordCollectionPageItems, v as recordOutboxActivity, x as registerQueueDepthGauge, y as recordOutboxEnqueue } from "../metrics-CwNvxtP6.mjs";
+import { _ as recordKeyLookup, 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, m as recordDocumentFetch, p as recordDocumentCache, r as getFederationMetrics, t as classifyFetchError, u as recordCollectionPageItems, v as recordOutboxActivity, x as registerQueueDepthGauge, y as recordOutboxEnqueue } from "../metrics-CR4UD_gF.mjs";
 import { createTestMeterProvider, test } from "@fedify/fixture";
 import { FetchError } from "@fedify/vocab-runtime";
 import { DataPointType, MeterProvider, MetricReader } from "@opentelemetry/sdk-metrics";

package/dist/federation/middleware.test.mjs

@@ -10,15 +10,15 @@ import { t as assertThrows } from "../assert_throws-BOkhLGYc.mjs";
 import { t as assertNotEquals } from "../assert_not_equals-DkVK8oqV.mjs";
 import { t as assertStrictEquals } from "../assert_strict_equals-XEgZAlrj.mjs";
 import { t as assert } from "../assert-OguE97r2.mjs";
-import { g as recordInboxActivity } from "../metrics-CwNvxtP6.mjs";
-import { l as verifyRequest, s as signRequest } from "../http-DwsK1LoE.mjs";
+import { g as recordInboxActivity } from "../metrics-CR4UD_gF.mjs";
+import { l as verifyRequest, s as signRequest } from "../http-Bf8YhWOi.mjs";
 import { a as rsaPrivateKey3, c as rsaPublicKey3, i as rsaPrivateKey2, n as ed25519PrivateKey, r as ed25519PublicKey, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-DGu1NFwu.mjs";
-import { t as getAuthenticatedDocumentLoader } from "../docloader-DlmmTFJc.mjs";
-import { a as compactJsonLd, h as verifyJsonLd, p as signJsonLd, s as detachSignature } from "../ld-CBIxjtov.mjs";
-import { t as doesActorOwnKey } from "../owner-SuWJf5wy.mjs";
-import { i as verifyObject, r as signObject } from "../proof-CZI5KQdk.mjs";
+import { t as getAuthenticatedDocumentLoader } from "../docloader-DCQSgDOg.mjs";
+import { a as compactJsonLd, h as verifyJsonLd, p as signJsonLd, s as detachSignature } from "../ld-CCOPy-Co.mjs";
+import { t as doesActorOwnKey } from "../owner-TUz_H-M9.mjs";
+import { i as verifyObject, r as signObject } from "../proof-CrI3UpuA.mjs";
 import { t as MemoryKvStore } from "../kv-rV3vodCc.mjs";
-import { g as handleBenchmarkTrigger, i as KvSpecDeterminer, n as FederationImpl, o as createFederation, r as InboxContextImpl, t as ContextImpl } from "../middleware-BWi34Ga3.mjs";
+import { g as handleBenchmarkTrigger, i as KvSpecDeterminer, n as FederationImpl, o as createFederation, r as InboxContextImpl, t as ContextImpl } from "../middleware-DfBPuuvp.mjs";
 import { t as CircuitBreaker } from "../circuit-breaker-CSWsyoef.mjs";
 import { configure, reset } from "@logtape/logtape";
 import { RouterError } from "@fedify/uri-template";

package/dist/federation/mod.cjs

@@ -2,7 +2,7 @@ const { Temporal } = require("@js-temporal/polyfill");
 const { URLPattern } = require("urlpattern-polyfill");
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 require("../chunk-DDcVe30Y.cjs");
-const require_middleware = require("../middleware-C27Pdo18.cjs");
+const require_middleware = require("../middleware-DUelXs9h.cjs");
 let _logtape_logtape = require("@logtape/logtape");
 let _fedify_uri_template = require("@fedify/uri-template");
 let es_toolkit = require("es-toolkit");

package/dist/federation/mod.js

@@ -1,6 +1,6 @@
 import { Temporal } from "@js-temporal/polyfill";
 import { URLPattern } from "urlpattern-polyfill";
-import { a as SendActivityError, c as buildCollectionSynchronizationHeader, d as normalizeCircuitBreakerOptions, f as parseCircuitBreakerKvState, i as createExponentialBackoffPolicy, l as digest, o as respondWithObject, p as createFederationBuilder, r as handleWebFinger, s as respondWithObjectIfAcceptable, t as createFederation, u as CircuitBreaker } from "../middleware-BpMbjN9m.js";
+import { a as SendActivityError, c as buildCollectionSynchronizationHeader, d as normalizeCircuitBreakerOptions, f as parseCircuitBreakerKvState, i as createExponentialBackoffPolicy, l as digest, o as respondWithObject, p as createFederationBuilder, r as handleWebFinger, s as respondWithObjectIfAcceptable, t as createFederation, u as CircuitBreaker } from "../middleware-BoNiH9CQ.js";
 import { getLogger } from "@logtape/logtape";
 import { Router as Router$1, RouterError as RouterError$1, assertPath, isPath } from "@fedify/uri-template";
 import { isEqual } from "es-toolkit";

package/dist/federation/send.test.mjs

@@ -8,10 +8,10 @@ import { n as assertGreaterOrEqual, r as assertFalse, t as assertRejects } from
 import { t as assertInstanceOf } from "../assert_instance_of-DBC5X09g.mjs";
 import { t as assertNotEquals } from "../assert_not_equals-DkVK8oqV.mjs";
 import { t as assert } from "../assert-OguE97r2.mjs";
-import { l as verifyRequest } from "../http-DwsK1LoE.mjs";
+import { l as verifyRequest } from "../http-Bf8YhWOi.mjs";
 import { i as rsaPrivateKey2, n as ed25519PrivateKey, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-DGu1NFwu.mjs";
-import { t as doesActorOwnKey } from "../owner-SuWJf5wy.mjs";
-import { n as extractInboxes, r as sendActivity, t as SendActivityError } from "../send-1EADALaf.mjs";
+import { t as doesActorOwnKey } from "../owner-TUz_H-M9.mjs";
+import { n as extractInboxes, r as sendActivity, t as SendActivityError } from "../send-BBs_erdP.mjs";
 import { Activity, Application, Endpoints, Group, Person, Service } from "@fedify/vocab";
 import { createTestMeterProvider, createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
 import { FetchError } from "@fedify/vocab-runtime";

package/dist/federation/temporal.test.mjs

@@ -4,7 +4,7 @@ globalThis.addEventListener = () => {};
 import "../std__assert-BBjXFNOb.mjs";
 import { r as assertFalse } from "../assert_rejects-DN60FHPX.mjs";
 import { t as assert } from "../assert-OguE97r2.mjs";
-import { t as hasMalformedKnownTemporalLiteral } from "../temporal-GLaGoMUR.mjs";
+import { t as hasMalformedKnownTemporalLiteral } from "../temporal-bBIy2G-F.mjs";
 import { test } from "@fedify/fixture";
 //#region src/federation/temporal.test.ts
 test("hasMalformedKnownTemporalLiteral() detects expanded proof timestamps", async () => {

package/dist/federation/webfinger.test.mjs

@@ -6,7 +6,7 @@ import { t as assertEquals } from "../assert_equals-C-ZRDbaf.mjs";
 import "../std__assert-BBjXFNOb.mjs";
 import { t as assertNotEquals } from "../assert_not_equals-DkVK8oqV.mjs";
 import { t as MemoryKvStore } from "../kv-rV3vodCc.mjs";
-import { o as createFederation, s as handleWebFinger } from "../middleware-BWi34Ga3.mjs";
+import { o as createFederation, s as handleWebFinger } from "../middleware-DfBPuuvp.mjs";
 import { Image, Link, Person, Tombstone } from "@fedify/vocab";
 import { createTestMeterProvider, test } from "@fedify/fixture";
 //#region src/federation/webfinger.test.ts

package/dist/{http-DwsK1LoE.mjs → http-Bf8YhWOi.mjs}

@@ -1,10 +1,10 @@
 import { Temporal } from "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-bSDsva_4.mjs";
-import { n as getDurationMs, r as getFederationMetrics, s as measureSignatureKeyFetch } from "./metrics-CwNvxtP6.mjs";
+import { n as version, t as name } from "./deno-Dho0TW0X.mjs";
+import { n as getDurationMs, r as getFederationMetrics, s as measureSignatureKeyFetch } from "./metrics-CR4UD_gF.mjs";
 import { i as validateAcceptSignature, n as fulfillAcceptSignature, r as parseAcceptSignature } from "./accept-CPkZzmGN.mjs";
-import { o as validateCryptoKey, r as fetchKeyDetailed } from "./key-C0aqQKRk.mjs";
+import { o as validateCryptoKey, r as fetchKeyDetailed } from "./key-3rYgSl9f.mjs";
 import { getLogger } from "@logtape/logtape";
 import { CryptographicKey } from "@fedify/vocab";
 import { SpanStatusCode, trace } from "@opentelemetry/api";

package/dist/{http-bsrB-Tun.cjs → http-C7Lot0it.cjs}

@@ -11,7 +11,7 @@ let _opentelemetry_semantic_conventions = require("@opentelemetry/semantic-conve
 let byte_encodings_base64 = require("byte-encodings/base64");
 //#region deno.json
 var name = "@fedify/fedify";
-var version = "2.4.0-dev.1531+0896bc51";
+var version = "2.4.0-dev.1567+12e6a3c0";
 //#endregion
 //#region src/sig/accept.ts
 /**
@@ -315,11 +315,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,
@@ -1148,16 +1148,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
 		};
 	}
@@ -1166,6 +1172,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 === _fedify_vocab.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 (0, _fedify_vocab_runtime.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 _fedify_vocab.Multikey && await isCachedDidKeyValid(hit.key, verificationMethod)) return hit;
+	const key = new _fedify_vocab.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 {
@@ -1280,6 +1341,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/{http-yVXJ4RhY.js → http-sngIMb9S.js}

@@ -1,16 +1,16 @@
 import { Temporal } from "@js-temporal/polyfill";
 import { URLPattern } from "urlpattern-polyfill";
 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, metrics, trace } from "@opentelemetry/api";
 import { encodeHex } from "byte-encodings/hex";
 import { Item, decodeDict, encodeDict, encodeItem } from "structured-field-values";
-import { FetchError, getDocumentLoader } from "@fedify/vocab-runtime";
+import { FetchError, getDocumentLoader, parseDidKeyVerificationMethod } from "@fedify/vocab-runtime";
 import { ATTR_HTTP_REQUEST_HEADER, ATTR_HTTP_REQUEST_METHOD, ATTR_URL_FULL } from "@opentelemetry/semantic-conventions";
 import { decodeBase64, encodeBase64 } from "byte-encodings/base64";
 //#region deno.json
 var name = "@fedify/fedify";
-var version = "2.4.0-dev.1531+0896bc51";
+var version = "2.4.0-dev.1567+12e6a3c0";
 //#endregion
 //#region src/sig/accept.ts
 /**
@@ -314,11 +314,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,
@@ -1147,16 +1147,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
 		};
 	}
@@ -1165,6 +1171,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 {
@@ -1279,6 +1340,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/{key-C0aqQKRk.mjs → key-3rYgSl9f.mjs}

@@ -1,12 +1,12 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-bSDsva_4.mjs";
-import { _ as recordKeyLookup, n as getDurationMs, t as classifyFetchError } from "./metrics-CwNvxtP6.mjs";
+import { n as version, t as name } from "./deno-Dho0TW0X.mjs";
+import { _ as recordKeyLookup, n as getDurationMs, t as classifyFetchError } from "./metrics-CR4UD_gF.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-M2xxXg9M.js → kv-cache-B0siRaoZ.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-yVXJ4RhY.js";
+import { C as recordDocumentCache, d as validateCryptoKey, t as doubleKnock } from "./http-sngIMb9S.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-Dv62PM2B.cjs → kv-cache-CO2IaDJu.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-bsrB-Tun.cjs");
+const require_http = require("./http-C7Lot0it.cjs");
 let _logtape_logtape = require("@logtape/logtape");
 let es_toolkit = require("es-toolkit");
 let _fedify_vocab_runtime = require("@fedify/vocab-runtime");

package/dist/{kv-cache-D3EQwzQ4.mjs → kv-cache-P3scUO6t.mjs}

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