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

package/dist/federation/temporal.test.mjs

@@ -1,10 +1,10 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 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-bBIy2G-F.mjs";
+import "../std__assert-Dh6uLf_q.mjs";
+import { r as assertFalse } from "../assert_rejects-DAdaaIWM.mjs";
+import { t as assert } from "../assert-DvVHoIZ0.mjs";
+import { t as hasMalformedKnownTemporalLiteral } from "../temporal-CvVMrvJJ.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

@@ -1,12 +1,12 @@
 import { Temporal } from "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { r as createRequestContext } from "../context-DVoTs_wM.mjs";
-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-DfBPuuvp.mjs";
+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 { t as assertNotEquals } from "../assert_not_equals-C8vcTTA3.mjs";
+import { o as createFederation, s as handleWebFinger } from "../middleware-CjHqy-1i.mjs";
 import { Image, Link, Person, Tombstone } from "@fedify/vocab";
 import { createTestMeterProvider, test } from "@fedify/fixture";
 //#region src/federation/webfinger.test.ts

package/dist/{http-sngIMb9S.js → http-D0jH0kco.js}

@@ -1,16 +1,16 @@
 import { Temporal } from "@js-temporal/polyfill";
 import { URLPattern } from "urlpattern-polyfill";
 import { getLogger } from "@logtape/logtape";
-import { CryptographicKey, Multikey, Object as Object$1, isActor } from "@fedify/vocab";
+import { CryptographicKey, 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, parseDidKeyVerificationMethod } from "@fedify/vocab-runtime";
+import { FetchError, getDocumentLoader } 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.1567+12e6a3c0";
+var version = "2.4.0-dev.1570+f1b6aaa3";
 //#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 cache hits, local resolutions, and remote fetches.",
+			description: "Public-key lookup attempts performed by Fedify, including both cache hits and remote fetches.",
 			unit: "{lookup}"
 		});
 		this.keyLookupDuration = meter.createHistogram("activitypub.key.lookup.duration", {
-			description: "Duration of public-key lookups performed by Fedify, including cache hits, local resolutions, and any remote fetch.",
+			description: "Duration of public-key lookups performed by Fedify, including any remote fetch.",
 			unit: "ms",
 			advice: { explicitBucketBoundaries: [
 				5,
@@ -472,10 +472,10 @@ var FederationMetrics = class {
 		this.httpServerRequestCount.add(1, attributes);
 		this.httpServerRequestDuration.record(durationMs, attributes);
 	}
-	recordQueueTaskEnqueued(common, attempt) {
+	recordQueueTaskEnqueued(common, attempt, count = 1) {
 		const attributes = buildQueueTaskAttributes(common);
 		attributes["fedify.queue.task.attempt"] = attempt;
-		this.queueTaskEnqueued.add(1, attributes);
+		this.queueTaskEnqueued.add(count, attributes);
 	}
 	recordQueueTaskStarted(common) {
 		this.queueTaskStarted.add(1, buildQueueTaskAttributes(common));
@@ -486,9 +486,10 @@ var FederationMetrics = class {
 	decrementQueueTaskInFlight(common) {
 		this.queueTaskInFlight.add(-1, buildQueueTaskInFlightAttributes(common));
 	}
-	recordQueueTaskOutcome(common, result, durationMs) {
+	recordQueueTaskOutcome(common, result, durationMs, failureReason) {
 		const attributes = buildQueueTaskAttributes(common);
 		attributes["fedify.queue.task.result"] = result;
+		if (failureReason != null && result === "failed") attributes["fedify.task.failure_reason"] = failureReason;
 		if (result === "completed") this.queueTaskCompleted.add(1, attributes);
 		else if (result === "failed") this.queueTaskFailed.add(1, attributes);
 		this.queueTaskDuration.record(durationMs, attributes);
@@ -582,6 +583,7 @@ function buildQueueTaskAttributes(common) {
 	const nativeRetrial = common.queue?.nativeRetrial;
 	if (typeof nativeRetrial === "boolean") attributes["fedify.queue.native_retrial"] = nativeRetrial;
 	if (common.activityType != null) attributes["activitypub.activity.type"] = common.activityType;
+	if (common.taskName != null) attributes["fedify.task.name"] = common.taskName;
 	return attributes;
 }
 function buildQueueTaskInFlightAttributes(common) {
@@ -1147,85 +1149,24 @@ 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);
-	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: null,
-			cached: true
-		};
-	}
-	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: cachedKey,
 			cached: true
 		};
+	} else if (cachedKey === null) {
+		logger.debug("Entry {keyId} found in cache, but it is unavailable.", { keyId });
+		return {
+			key: null,
+			cached: true
+		};
 	}
 	return null;
 }
 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 {
@@ -1340,11 +1281,6 @@ 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-C7Lot0it.cjs → http-DeuPW1Oh.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.1567+12e6a3c0";
+var version = "2.4.0-dev.1570+f1b6aaa3";
 //#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 cache hits, local resolutions, and remote fetches.",
+			description: "Public-key lookup attempts performed by Fedify, including both cache hits and remote fetches.",
 			unit: "{lookup}"
 		});
 		this.keyLookupDuration = meter.createHistogram("activitypub.key.lookup.duration", {
-			description: "Duration of public-key lookups performed by Fedify, including cache hits, local resolutions, and any remote fetch.",
+			description: "Duration of public-key lookups performed by Fedify, including any remote fetch.",
 			unit: "ms",
 			advice: { explicitBucketBoundaries: [
 				5,
@@ -473,10 +473,10 @@ var FederationMetrics = class {
 		this.httpServerRequestCount.add(1, attributes);
 		this.httpServerRequestDuration.record(durationMs, attributes);
 	}
-	recordQueueTaskEnqueued(common, attempt) {
+	recordQueueTaskEnqueued(common, attempt, count = 1) {
 		const attributes = buildQueueTaskAttributes(common);
 		attributes["fedify.queue.task.attempt"] = attempt;
-		this.queueTaskEnqueued.add(1, attributes);
+		this.queueTaskEnqueued.add(count, attributes);
 	}
 	recordQueueTaskStarted(common) {
 		this.queueTaskStarted.add(1, buildQueueTaskAttributes(common));
@@ -487,9 +487,10 @@ var FederationMetrics = class {
 	decrementQueueTaskInFlight(common) {
 		this.queueTaskInFlight.add(-1, buildQueueTaskInFlightAttributes(common));
 	}
-	recordQueueTaskOutcome(common, result, durationMs) {
+	recordQueueTaskOutcome(common, result, durationMs, failureReason) {
 		const attributes = buildQueueTaskAttributes(common);
 		attributes["fedify.queue.task.result"] = result;
+		if (failureReason != null && result === "failed") attributes["fedify.task.failure_reason"] = failureReason;
 		if (result === "completed") this.queueTaskCompleted.add(1, attributes);
 		else if (result === "failed") this.queueTaskFailed.add(1, attributes);
 		this.queueTaskDuration.record(durationMs, attributes);
@@ -583,6 +584,7 @@ function buildQueueTaskAttributes(common) {
 	const nativeRetrial = common.queue?.nativeRetrial;
 	if (typeof nativeRetrial === "boolean") attributes["fedify.queue.native_retrial"] = nativeRetrial;
 	if (common.activityType != null) attributes["activitypub.activity.type"] = common.activityType;
+	if (common.taskName != null) attributes["fedify.task.name"] = common.taskName;
 	return attributes;
 }
 function buildQueueTaskInFlightAttributes(common) {
@@ -1148,85 +1150,24 @@ 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);
-	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: null,
-			cached: true
-		};
-	}
-	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: cachedKey,
 			cached: true
 		};
+	} else if (cachedKey === null) {
+		logger.debug("Entry {keyId} found in cache, but it is unavailable.", { keyId });
+		return {
+			key: null,
+			cached: true
+		};
 	}
 	return null;
 }
 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 {
@@ -1341,11 +1282,6 @@ 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-Bf8YhWOi.mjs → http-JdRPUYku.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-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-3rYgSl9f.mjs";
+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 { i as validateAcceptSignature, n as fulfillAcceptSignature, r as parseAcceptSignature } from "./accept-CgDcxvjV.mjs";
+import { o as validateCryptoKey, r as fetchKeyDetailed } from "./key-o0_ipvUR.mjs";
 import { getLogger } from "@logtape/logtape";
 import { CryptographicKey } from "@fedify/vocab";
 import { SpanStatusCode, trace } from "@opentelemetry/api";

package/dist/{key-3rYgSl9f.mjs → key-o0_ipvUR.mjs}

@@ -1,12 +1,12 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-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 { n as version, t as name } from "./deno-klNxGW7W.mjs";
+import { _ as recordKeyLookup, n as getDurationMs, t as classifyFetchError } from "./metrics-CLSPm4dZ.mjs";
 import { getLogger } from "@logtape/logtape";
-import { CryptographicKey, Multikey, Object as Object$1, isActor } from "@fedify/vocab";
+import { CryptographicKey, Object as Object$1, isActor } from "@fedify/vocab";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
-import { FetchError, getDocumentLoader, parseDidKeyVerificationMethod } from "@fedify/vocab-runtime";
+import { FetchError, getDocumentLoader } 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,85 +195,24 @@ 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);
-	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: null,
-			cached: true
-		};
-	}
-	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: cachedKey,
 			cached: true
 		};
+	} else if (cachedKey === null) {
+		logger.debug("Entry {keyId} found in cache, but it is unavailable.", { keyId });
+		return {
+			key: null,
+			cached: true
+		};
 	}
 	return null;
 }
 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 {
@@ -388,11 +327,6 @@ 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-CO2IaDJu.cjs → kv-cache-C3rqzQvu.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-C7Lot0it.cjs");
+const require_http = require("./http-DeuPW1Oh.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-P3scUO6t.mjs → kv-cache-CM7w20U5.mjs}

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

package/dist/{kv-cache-B0siRaoZ.js → kv-cache-DSWq2JHU.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-sngIMb9S.js";
+import { C as recordDocumentCache, d as validateCryptoKey, t as doubleKnock } from "./http-D0jH0kco.js";
 import { getLogger } from "@logtape/logtape";
 import { curry } from "es-toolkit";
 import { UrlError, createActivityPubRequest, getRemoteDocument, logRequest, preloadedContexts, validatePublicUrl } from "@fedify/vocab-runtime";

package/dist/{ld-CCOPy-Co.mjs → ld-C__CEgQH.mjs}

@@ -1,9 +1,9 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-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 { n as fetchKey, o as validateCryptoKey } from "./key-3rYgSl9f.mjs";
+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 { getLogger } from "@logtape/logtape";
 import { Activity, CryptographicKey, Object as Object$1, getTypeId } from "@fedify/vocab";
 import { SpanStatusCode, trace } from "@opentelemetry/api";

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

@@ -1,7 +1,7 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-Dho0TW0X.mjs";
+import { n as version, t as name } from "./deno-klNxGW7W.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 cache hits, local resolutions, and remote fetches.",
+			description: "Public-key lookup attempts performed by Fedify, including both cache hits and remote fetches.",
 			unit: "{lookup}"
 		});
 		this.keyLookupDuration = meter.createHistogram("activitypub.key.lookup.duration", {
-			description: "Duration of public-key lookups performed by Fedify, including cache hits, local resolutions, and any remote fetch.",
+			description: "Duration of public-key lookups performed by Fedify, including any remote fetch.",
 			unit: "ms",
 			advice: { explicitBucketBoundaries: [
 				5,
@@ -325,10 +325,10 @@ var FederationMetrics = class {
 		this.httpServerRequestCount.add(1, attributes);
 		this.httpServerRequestDuration.record(durationMs, attributes);
 	}
-	recordQueueTaskEnqueued(common, attempt) {
+	recordQueueTaskEnqueued(common, attempt, count = 1) {
 		const attributes = buildQueueTaskAttributes(common);
 		attributes["fedify.queue.task.attempt"] = attempt;
-		this.queueTaskEnqueued.add(1, attributes);
+		this.queueTaskEnqueued.add(count, attributes);
 	}
 	recordQueueTaskStarted(common) {
 		this.queueTaskStarted.add(1, buildQueueTaskAttributes(common));
@@ -339,9 +339,10 @@ var FederationMetrics = class {
 	decrementQueueTaskInFlight(common) {
 		this.queueTaskInFlight.add(-1, buildQueueTaskInFlightAttributes(common));
 	}
-	recordQueueTaskOutcome(common, result, durationMs) {
+	recordQueueTaskOutcome(common, result, durationMs, failureReason) {
 		const attributes = buildQueueTaskAttributes(common);
 		attributes["fedify.queue.task.result"] = result;
+		if (failureReason != null && result === "failed") attributes["fedify.task.failure_reason"] = failureReason;
 		if (result === "completed") this.queueTaskCompleted.add(1, attributes);
 		else if (result === "failed") this.queueTaskFailed.add(1, attributes);
 		this.queueTaskDuration.record(durationMs, attributes);
@@ -435,6 +436,7 @@ function buildQueueTaskAttributes(common) {
 	const nativeRetrial = common.queue?.nativeRetrial;
 	if (typeof nativeRetrial === "boolean") attributes["fedify.queue.native_retrial"] = nativeRetrial;
 	if (common.activityType != null) attributes["activitypub.activity.type"] = common.activityType;
+	if (common.taskName != null) attributes["fedify.task.name"] = common.taskName;
 	return attributes;
 }
 function buildQueueTaskInFlightAttributes(common) {