@fedify/fedify 2.4.0-dev.2159 → 2.4.0-dev.2164

package/dist/{key-C6jnekFI.mjs → key-D5awqp7u.mjs}

@@ -1,9 +1,10 @@
-import "temporal-polyfill";
+import { Temporal } from "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-CE_s0yQb.mjs";
-import { _ as recordKeyLookup, n as getDurationMs, t as classifyFetchError } from "./metrics-ByOQOHHS.mjs";
+import { n as version, t as name } from "./deno-CizGaYeG.mjs";
+import { _ as recordKeyLookup, n as getDurationMs, t as classifyFetchError } from "./metrics-CFBEehTc.mjs";
 import { c as isPortableId, f as parseKeyIdString, o as isCompatibleKeyId, s as isPortableActorDocument, u as isPortableUri } from "./portable-key-id-Bg259c4Z.mjs";
+import { n as attachKeyOwnerEvidence, t as MAX_PORTABLE_KEY_TTL } from "./key-owner-evidence-Bo3yaeL5.mjs";
 import { getLogger } from "@logtape/logtape";
 import { CryptographicKey, Multikey, Object as Object$1, isActor } from "@fedify/vocab";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
@@ -230,6 +231,7 @@ function bypassKeyCacheReads(keyCache) {
 		const scoped = cache.compatibleKeyScope(scope);
 		return {
 			get: () => Promise.resolve(void 0),
+			getEntry: () => Promise.resolve(void 0),
 			set: async (keyId, key, options) => await scoped.set(keyId, key, options),
 			delete: async (keyId) => await scoped.delete(keyId)
 		};
@@ -397,6 +399,49 @@ function checkCachedKeyHit(cachedKey, keyId, cls, logger) {
 	}
 	return null;
 }
+/**
+* Looks up a key at a compatible identifier, or at an `ap:` or `ap+ef61:`
+* URI, in the cache namespace of a purpose, like {@link getCachedFetchKey}.
+* A key that the verified document of its portable actor was cached with
+* gets the actor's evidence attached from the same entry; see
+* {@link attachKeyOwnerEvidence}.
+*/
+async function getCachedCompatibleKey(cacheKey, keyId, cls, scopedCache, logger) {
+	if (scopedCache?.getEntry == null) return await getCachedFetchKey(cacheKey, keyId, cls, scopedCache, logger);
+	const entry = await scopedCache.getEntry(cacheKey);
+	if (entry === void 0) return null;
+	if (entry === null) {
+		logger.debug("Entry {keyId} found in cache, but it is unavailable.", { keyId });
+		return {
+			key: null,
+			cached: true
+		};
+	}
+	const hit = checkCachedKeyHit(entry.key, keyId, cls, logger);
+	if (hit?.key instanceof CryptographicKey && entry.owner != null) attachKeyOwnerEvidence(hit.key, entry.owner, entry.expires);
+	return hit;
+}
+/**
+* Attaches the evidence of the portable actor whose document has just
+* vouched for a key to the key.  The evidence expires with the cache entry
+* of the key, so that it is never trusted longer than the key is cached.
+* Without a cache, it expires with the proof of the document, but no later
+* than {@link MAX_PORTABLE_KEY_TTL}, as a cache entry would.
+* @param resolution The resolution of the key.
+* @param scopedCache The cache namespace the key was stored in, if any.
+* @param cached When the cache entry expires, if the cache stored one.
+*/
+function attachResolvedKeyOwnerEvidence(resolution, scopedCache, cached) {
+	let expires;
+	if (scopedCache != null) {
+		if (cached == null) return;
+		expires = cached;
+	} else {
+		expires = Temporal.Now.instant().add(MAX_PORTABLE_KEY_TTL);
+		if (resolution.expires != null && Temporal.Instant.compare(resolution.expires, expires) < 0) expires = resolution.expires;
+	}
+	attachKeyOwnerEvidence(resolution.key, resolution.document, expires);
+}
 async function clearFetchErrorMetadata(keyId, keyCache) {
 	await keyCache?.setFetchError?.(keyId, null);
 }
@@ -521,7 +566,10 @@ async function resolveFetchedKey(document, cacheKey, documentUrl, keyId, cls, {
 				cached: false
 			};
 		}
-		await scopedCache?.set(cacheKey, resolution.key, { expires: resolution.expires });
+		attachResolvedKeyOwnerEvidence(resolution, scopedCache, await scopedCache?.set(cacheKey, resolution.key, {
+			expires: resolution.expires,
+			owner: resolution.document
+		}));
 		return {
 			key: resolution.key,
 			cached: false
@@ -742,7 +790,7 @@ async function fetchCompatibleKey(cacheKey, cls, options, onCachedUnavailable, o
 	const keyId = cacheKey.href;
 	const sharedCache = options.keyCache;
 	const scopedCache = sharedCache?.compatibleKeyScope?.(getCompatibleKeyScope(cls, options));
-	const cached = await getCachedFetchKey(cacheKey, keyId, cls, scopedCache, logger);
+	const cached = await getCachedCompatibleKey(cacheKey, keyId, cls, scopedCache, logger);
 	if (cached != null) return {
 		result: cached,
 		outcome: { result: "hit" }
@@ -806,7 +854,7 @@ async function fetchPortableActorKey(cacheKey, cls, options, onCachedUnavailable
 	}
 	const sharedCache = options.keyCache;
 	const scopedCache = sharedCache?.compatibleKeyScope?.("httpSignature");
-	const cached = await getCachedFetchKey(cacheKey, keyId, cls, scopedCache, logger);
+	const cached = await getCachedCompatibleKey(cacheKey, keyId, cls, scopedCache, logger);
 	if (cached != null) return {
 		result: cached,
 		outcome: { result: "hit" }
@@ -821,7 +869,10 @@ async function fetchPortableActorKey(cacheKey, cls, options, onCachedUnavailable
 	logger.debug("Resolving key {keyId} to verify signature...", { keyId });
 	const resolution = await resolvers.actorKey(cacheKey);
 	if (resolution.type === "verified") {
-		await scopedCache?.set(cacheKey, resolution.key, { expires: resolution.expires });
+		attachResolvedKeyOwnerEvidence(resolution, scopedCache, await scopedCache?.set(cacheKey, resolution.key, {
+			expires: resolution.expires,
+			owner: resolution.document
+		}));
 		return {
 			result: {
 				key: resolution.key,

package/dist/key-owner-evidence-Bo3yaeL5.mjs

@@ -0,0 +1,108 @@
+import { Temporal } from "temporal-polyfill";
+import "urlpattern-polyfill";
+globalThis.addEventListener = () => {};
+import { i as getRawCanonicalPortableId, s as isPortableActorDocument, t as getCanonicalPortableId } from "./portable-key-id-Bg259c4Z.mjs";
+import { CryptographicKey, Object as Object$1 } from "@fedify/vocab";
+//#region src/sig/key-owner-evidence.ts
+/**
+* How long a key of an [FEP-ef61] portable actor is trusted after its actor's
+* signed document vouched for it, however long the proof of the document is
+* valid.  The actor can drop the key or the gateway from its document at any
+* time, so the key is looked up again at least this often.
+*
+* [FEP-ef61]: https://w3id.org/fep/ef61
+* @internal
+*/
+const MAX_PORTABLE_KEY_TTL = Temporal.Duration.from({ hours: 1 });
+const candidates = /* @__PURE__ */ new WeakMap();
+const verified = /* @__PURE__ */ new WeakMap();
+/**
+* Attaches to a key that was just resolved the evidence of the portable actor
+* that owns it.  The evidence is not used until the key verifies
+* a signature; see {@link promoteKeyOwnerEvidence}.
+*
+* Nothing is attached unless the document, the key's owner, and the actor
+* the key ID belongs to agree on the actor's canonical portable ID.
+* @param key The key, whose owner the document vouched for.
+* @param document The expanded root node of the actor's verified document.
+* @param expires When the evidence must not be used anymore.
+* @returns Whether the evidence was attached.
+* @internal
+*/
+function attachKeyOwnerEvidence(key, document, expires) {
+	if (!(key instanceof CryptographicKey) || key.id == null || key.ownerId == null || key.publicKey == null || document == null || typeof document !== "object" || Array.isArray(document)) return false;
+	const rawId = document["@id"];
+	if (typeof rawId !== "string") return false;
+	const keyBase = new URL(key.id.href);
+	keyBase.hash = "";
+	const ownerId = getCanonicalPortableId(key.ownerId);
+	if (ownerId == null || getRawCanonicalPortableId(rawId) !== ownerId || getCanonicalPortableId(keyBase) !== ownerId) return false;
+	candidates.set(key, {
+		keyId: key.id.href,
+		keyOwner: key.ownerId.href,
+		publicKey: key.publicKey,
+		ownerId,
+		document: structuredClone(document),
+		expires
+	});
+	return true;
+}
+/**
+* Makes the evidence attached to a key usable, as the key has just verified
+* an HTTP Signature.  Nothing happens if the key has no evidence.
+* @param key The key that verified a signature.
+* @internal
+*/
+function promoteKeyOwnerEvidence(key) {
+	const evidence = candidates.get(key);
+	if (evidence == null) return;
+	candidates.delete(key);
+	verified.set(key, evidence);
+}
+/**
+* Gets the evidence of the portable actor that owns a key HTTP Signature
+* verification returned.
+* @param key The key.
+* @param now The current time.
+* @returns The evidence, or `undefined` if the key was not returned by HTTP
+*          Signature verification, if it has no evidence, if the evidence
+*          expired, or if the key has been changed since.
+* @internal
+*/
+function getVerifiedKeyOwnerEvidence(key, now = Temporal.Now.instant()) {
+	const evidence = verified.get(key);
+	if (evidence == null) return void 0;
+	if (Temporal.Instant.compare(now, evidence.expires) >= 0) {
+		verified.delete(key);
+		return;
+	}
+	if (key.id?.href !== evidence.keyId || key.ownerId?.href !== evidence.keyOwner || key.publicKey !== evidence.publicKey) return;
+	return evidence;
+}
+/**
+* Parses the actor from the evidence, i.e., from the expansion of its
+* document whose proof was verified.  Every call returns a new object.
+* @param evidence The evidence.
+* @param options Options for parsing the document.
+* @returns The actor, or `null` if the document is not the actor that
+*          the evidence is about, or the evidence expired meanwhile.
+* @internal
+*/
+async function parseKeyOwnerEvidence(evidence, options = {}) {
+	const refuse = (url) => Promise.reject(/* @__PURE__ */ new Error(`Refusing to fetch ${url}.`));
+	let actor;
+	try {
+		actor = await Object$1.fromJsonLd(structuredClone(evidence.document), {
+			documentLoader: refuse,
+			contextLoader: options.contextLoader,
+			tracerProvider: options.tracerProvider
+		});
+	} catch (error) {
+		if (!(error instanceof TypeError)) throw error;
+		return null;
+	}
+	if (!isPortableActorDocument(actor) || getCanonicalPortableId(actor.id) !== evidence.ownerId || Temporal.Instant.compare(Temporal.Now.instant(), evidence.expires) >= 0) return null;
+	return actor;
+}
+//#endregion
+export { promoteKeyOwnerEvidence as a, parseKeyOwnerEvidence as i, attachKeyOwnerEvidence as n, getVerifiedKeyOwnerEvidence as r, MAX_PORTABLE_KEY_TTL as t };

package/dist/{keycache-BInaECGj.mjs → keycache-PiOM9pM0.mjs}

@@ -1,14 +1,18 @@
 import { Temporal } from "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
+import { t as MAX_PORTABLE_KEY_TTL } from "./key-owner-evidence-Bo3yaeL5.mjs";
 import { CryptographicKey, Multikey } from "@fedify/vocab";
 //#region src/federation/keycache.ts
 const KEY_CACHE_GENERATION = "2";
 const COMPATIBLE_KEY_SEGMENT = "__compatible";
-const MAX_COMPATIBLE_KEY_TTL = Temporal.Duration.from({ hours: 1 });
+const MAX_OWNER_BYTES = 32 * 1024;
 function isCompatibleKeyEntry(value) {
 	return value != null && typeof value === "object" && "key" in value && "expires" in value && typeof value.expires === "number";
 }
+function isJsonObject(value) {
+	return value != null && typeof value === "object" && !Array.isArray(value);
+}
 var KvKeyCache = class {
 	kv;
 	prefix;
@@ -90,30 +94,48 @@ var KvKeyCache = class {
 			keyId.href
 		];
 		const isExpired = (entry) => entry.expires <= now().epochMilliseconds;
-		const keyTtl = Math.min(this.keyTtl.total("millisecond"), MAX_COMPATIBLE_KEY_TTL.total("millisecond"));
+		const keyTtl = Math.min(this.keyTtl.total("millisecond"), MAX_PORTABLE_KEY_TTL.total("millisecond"));
 		const unavailableKeyTtl = this.unavailableKeyTtl.total("millisecond");
-		return {
-			get: async (keyId) => {
-				const entry = await this.kv.get(entryKey(keyId));
-				if (entry === void 0) return void 0;
-				if (!isCompatibleKeyEntry(entry) || isExpired(entry)) {
-					await this.kv.delete(entryKey(keyId));
-					return;
-				}
-				if (entry.key === null) return null;
-				let key;
+		const getEntry = async (keyId) => {
+			const entry = await this.kv.get(entryKey(keyId));
+			if (entry === void 0) return void 0;
+			if (!isCompatibleKeyEntry(entry) || isExpired(entry)) {
+				await this.kv.delete(entryKey(keyId));
+				return;
+			}
+			if (entry.key === null) return null;
+			let expires;
+			try {
+				expires = Temporal.Instant.fromEpochMilliseconds(entry.expires);
+			} catch (error) {
+				if (!(error instanceof RangeError)) throw error;
+				await this.kv.delete(entryKey(keyId));
+				return;
+			}
+			let key;
+			try {
+				key = await CryptographicKey.fromJsonLd(entry.key, this.options);
+			} catch {
 				try {
-					key = await CryptographicKey.fromJsonLd(entry.key, this.options);
+					key = await Multikey.fromJsonLd(entry.key, this.options);
 				} catch {
-					try {
-						key = await Multikey.fromJsonLd(entry.key, this.options);
-					} catch {
-						await this.kv.delete(entryKey(keyId));
-						return;
-					}
+					await this.kv.delete(entryKey(keyId));
+					return;
 				}
-				return isExpired(entry) ? void 0 : key;
+			}
+			if (isExpired(entry)) return void 0;
+			return {
+				key,
+				...isJsonObject(entry.owner) ? { owner: entry.owner } : {},
+				expires
+			};
+		};
+		return {
+			get: async (keyId) => {
+				const entry = await getEntry(keyId);
+				return entry == null ? entry : entry.key;
 			},
+			getEntry,
 			set: async (keyId, key, options) => {
 				const serialized = key == null ? null : await key.toJsonLd(this.options);
 				const current = now();
@@ -124,10 +146,13 @@ var KvKeyCache = class {
 					await this.kv.delete(entryKey(keyId));
 					return;
 				}
+				const owner = key == null || options?.owner == null || new TextEncoder().encode(JSON.stringify(options.owner)).length > MAX_OWNER_BYTES ? void 0 : options.owner;
 				await this.kv.set(entryKey(keyId), {
 					key: serialized,
-					expires
+					expires,
+					...owner == null ? {} : { owner }
 				}, { ttl: Temporal.Duration.from({ milliseconds: ttl }) });
+				return key == null ? void 0 : Temporal.Instant.fromEpochMilliseconds(expires);
 			},
 			delete: async (keyId) => {
 				await this.kv.delete(entryKey(keyId));

package/dist/{kv-cache-Bxm0a0Ww.mjs → kv-cache-C7RWL7hz.mjs}

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

package/dist/{kv-cache-DhIl9YlV.js → kv-cache-CZiBDLPi.js}

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

package/dist/{kv-cache-BHNtQi9e.cjs → kv-cache-Ct-KWRta.cjs}

@@ -1,5 +1,5 @@
 const { URLPattern } = require("urlpattern-polyfill");
-const require_http = require("./http-wdsia0-O.cjs");
+const require_http = require("./http-R4g1McwE.cjs");
 let _logtape_logtape = require("@logtape/logtape");
 let _fedify_vocab_runtime = require("@fedify/vocab-runtime");
 let es_toolkit = require("es-toolkit");

package/dist/{ld-ya2C1Xip.mjs → ld-CyliEU48.mjs}

@@ -1,9 +1,9 @@
 import "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-CE_s0yQb.mjs";
-import { n as getDurationMs, r as getFederationMetrics, s as measureSignatureKeyFetch } from "./metrics-ByOQOHHS.mjs";
-import { c as validateCryptoKey, i as fetchKey, t as bypassKeyCacheReads } from "./key-C6jnekFI.mjs";
+import { n as version, t as name } from "./deno-CizGaYeG.mjs";
+import { n as getDurationMs, r as getFederationMetrics, s as measureSignatureKeyFetch } from "./metrics-CFBEehTc.mjs";
+import { c as validateCryptoKey, i as fetchKey, t as bypassKeyCacheReads } from "./key-D5awqp7u.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-ByOQOHHS.mjs → metrics-CFBEehTc.mjs}

@@ -1,7 +1,7 @@
 import "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-CE_s0yQb.mjs";
+import { n as version, t as name } from "./deno-CizGaYeG.mjs";
 import { metrics } from "@opentelemetry/api";
 import { FetchError } from "@fedify/vocab-runtime";
 //#region src/federation/metrics.ts

package/dist/{middleware-Bdwd_Gg8.mjs → middleware-B99JjvFn.mjs}

@@ -1,29 +1,29 @@
 import { Temporal } from "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-CE_s0yQb.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-ByOQOHHS.mjs";
+import { n as version, t as name } from "./deno-CizGaYeG.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-CFBEehTc.mjs";
 import { t as formatAcceptSignature } from "./accept-CPVqki78.mjs";
 import { a as hasPortableActor, c as isPortableId, l as isPortableKeyId, n as getGatewayKeyBase, o as isCompatibleKeyId, r as getPortableDid, t as getCanonicalPortableId, u as isPortableUri } from "./portable-key-id-Bg259c4Z.mjs";
-import { c as validateCryptoKey, n as exportJwk, s as importJwk } from "./key-C6jnekFI.mjs";
+import { c as validateCryptoKey, n as exportJwk, s as importJwk } from "./key-D5awqp7u.mjs";
 import { r as normalizeOutgoingActivityJsonLd } from "./outgoing-jsonld-4IJqPYos.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-ya2C1Xip.mjs";
-import { a as signObject, c as verifyPortableObjectProof, i as hasProofLike, s as verifyObject, t as InvalidPortableObjectIdError, u as verifyPortableObjectProofWithRoot } from "./proof-BdO3BbLh.mjs";
-import { a as listRequestSignatures, c as selectRequestSignature, d as verifyRequest, f as verifyRequestDetailed, s as parseRfc9421SignatureInput } from "./http-DV_yW4dv.mjs";
-import { t as getAuthenticatedDocumentLoader } from "./docloader-C5p26tpa.mjs";
-import { n as kvCache } from "./kv-cache-Bxm0a0Ww.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-CyliEU48.mjs";
+import { a as signObject, c as verifyPortableObjectProof, i as hasProofLike, s as verifyObject, t as InvalidPortableObjectIdError, u as verifyPortableObjectProofWithRoot } from "./proof-CRTPWbVh.mjs";
+import { a as listRequestSignatures, c as selectRequestSignature, d as verifyRequest, f as verifyRequestDetailed, s as parseRfc9421SignatureInput } from "./http-DRH0n8TD.mjs";
+import { t as getAuthenticatedDocumentLoader } from "./docloader-BBFAItNB.mjs";
+import { n as kvCache } from "./kv-cache-C7RWL7hz.mjs";
 import { d as readBoundedText, l as BodyTooLargeError, t as getNodeInfo, u as MAX_BODY_SIZE } from "./client-CEnNz8O7.mjs";
 import { t as nodeInfoToJson } from "./types-DE_LV1JB.mjs";
-import { n as getKeyOwner, t as doesActorOwnKey } from "./owner-C6Nv5yyw.mjs";
-import { t as verifyPortableObject } from "./portable-collection-uWj3hfzv.mjs";
-import { n as extractInboxes, r as sendActivity, t as SendActivityError } from "./send-BwANxryy.mjs";
-import { n as FederationBuilderImpl, t as ACTOR_ALIAS_PREFIX } from "./builder-D89oOfHC.mjs";
+import { n as getKeyOwner, t as doesActorOwnKey } from "./owner-DKdtsrEq.mjs";
+import { t as verifyPortableObject } from "./portable-collection-Cb5cdPIU.mjs";
+import { n as extractInboxes, r as sendActivity, t as SendActivityError } from "./send-2dULlZc8.mjs";
+import { n as FederationBuilderImpl, t as ACTOR_ALIAS_PREFIX } from "./builder-BqRmnx7p.mjs";
 import { t as CircuitBreaker } from "./circuit-breaker-C5NqoLBJ.mjs";
 import { t as buildCollectionSynchronizationHeader } from "./collection-CnnP1UAv.mjs";
-import { a as verifyCompoundPortableObjectProofs, i as inspectCompoundPortableObjectApplicability, r as findUnsupportedCompoundProofShape, s as verifyServedPortableObjects, t as containsCompoundPortableObject } from "./compound-proof-B02Os8h2.mjs";
-import { t as KvKeyCache } from "./keycache-BInaECGj.mjs";
+import { a as verifyCompoundPortableObjectProofs, i as inspectCompoundPortableObjectApplicability, r as findUnsupportedCompoundProofShape, s as verifyServedPortableObjects, t as containsCompoundPortableObject } from "./compound-proof-CxDBdtNz.mjs";
+import { t as KvKeyCache } from "./keycache-PiOM9pM0.mjs";
 import { t as acceptsJsonLd } from "./negotiation-CCocWT_N.mjs";
-import { t as hasMalformedKnownTemporalLiteral } from "./temporal-CbPfRGZq.mjs";
+import { t as hasMalformedKnownTemporalLiteral } from "./temporal-Dhsk6aUT.mjs";
 import { t as createExponentialBackoffPolicy } from "./retry-zX5xw5e0.mjs";
 import { t as TaskCodec } from "./codec-C6rTrpIp.mjs";
 import { getLogger, withContext } from "@logtape/logtape";

package/dist/{middleware-DoVWq8mE.mjs → middleware-BmqEWsWP.mjs}

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

package/dist/{middleware-WiaN4RS3.js → middleware-CdpTFsa2.js}

@@ -2,10 +2,10 @@ import { Temporal } from "temporal-polyfill";
 import { URLPattern } from "urlpattern-polyfill";
 import { t as __exportAll } from "./rolldown-runtime-BC-Eo5Mj.js";
 import { r as getDefaultActivityTransformers } from "./transformers-DAtXl_Kc.js";
-import { $ as recordCollectionPageItems, A as hasSignatureLike, C as assertSafeJsonLd, D as detachSignature, J as getRemoteHost, K as getDurationMs, L as wrapContextLoaderForJsonLd, M as isInvalidUrlTypeError, N as signJsonLd, O as getNormalizationContextLoader, P as verifyCompactJsonLd, Q as recordCollectionDispatchDuration, R as exportJwk, S as InvalidContextReferenceError, St as isPortableUri, T as compactJsonLd, Tt as version, U as importJwk, W as validateCryptoKey, X as isAbortError, Y as instrumentDocumentLoader, Z as recordCircuitBreakerStateChange, _ as verifyPortableObjectProof, _t as getRawCanonicalPortableId, at as recordOutboxActivity, bt as isPortableId, ct as registerQueueDepthGauge, d as classifyFep2277CoreType, et as recordCollectionRequest, g as verifyObject, gt as getPortableDid, h as verifyMapLocalProof, ht as getGatewayKeyBase, i as selectRequestSignature, it as recordInboxActivity, j as isClearlyMalformedContextReference, k as hasSignature, lt as preloadedOnlyDocumentLoader, m as signObject, mt as getCanonicalPortableId, n as listRequestSignatures, o as verifyRequest, ot as recordOutboxEnqueue, p as hasProofLike, q as getFederationMetrics, r as parseRfc9421SignatureInput, rt as recordFanoutRecipients, s as verifyRequestDetailed, st as recordWebFingerHandle, t as doubleKnock, tt as recordCollectionTotalItems, u as InvalidPortableObjectIdError, ut as formatAcceptSignature, v as verifyPortableObjectProofPolicy, vt as hasPortableActor, wt as name, x as normalizeOutgoingActivityJsonLd, xt as isPortableKeyId, y as verifyPortableObjectProofWithRoot, yt as isCompatibleKeyId } from "./http-nTZuTacw.js";
+import { $ as isAbortError, A as hasSignatureLike, C as assertSafeJsonLd, Ct as isPortableId, D as detachSignature, Dt as name, K as MAX_PORTABLE_KEY_TTL, L as wrapContextLoaderForJsonLd, M as isInvalidUrlTypeError, N as signJsonLd, O as getNormalizationContextLoader, Ot as version, P as verifyCompactJsonLd, Q as instrumentDocumentLoader, R as exportJwk, S as InvalidContextReferenceError, St as isCompatibleKeyId, T as compactJsonLd, Tt as isPortableUri, U as importJwk, W as validateCryptoKey, X as getFederationMetrics, Y as getDurationMs, Z as getRemoteHost, _ as verifyPortableObjectProof, _t as getCanonicalPortableId, bt as getRawCanonicalPortableId, ct as recordOutboxActivity, d as classifyFep2277CoreType, dt as registerQueueDepthGauge, et as recordCircuitBreakerStateChange, ft as preloadedOnlyDocumentLoader, g as verifyObject, h as verifyMapLocalProof, i as selectRequestSignature, it as recordCollectionTotalItems, j as isClearlyMalformedContextReference, k as hasSignature, lt as recordOutboxEnqueue, m as signObject, n as listRequestSignatures, nt as recordCollectionPageItems, o as verifyRequest, ot as recordFanoutRecipients, p as hasProofLike, pt as formatAcceptSignature, r as parseRfc9421SignatureInput, rt as recordCollectionRequest, s as verifyRequestDetailed, st as recordInboxActivity, t as doubleKnock, tt as recordCollectionDispatchDuration, u as InvalidPortableObjectIdError, ut as recordWebFingerHandle, v as verifyPortableObjectProofPolicy, vt as getGatewayKeyBase, wt as isPortableKeyId, x as normalizeOutgoingActivityJsonLd, xt as hasPortableActor, y as verifyPortableObjectProofWithRoot, yt as getPortableDid } from "./http-Baovr6xq.js";
 import { a as MAX_BODY_SIZE, i as BodyTooLargeError, n as getNodeInfo, o as readBoundedText, t as nodeInfoToJson } from "./types-_S2_MeLF.js";
-import { n as doesActorOwnKey, r as getKeyOwner, t as verifyPortableObject } from "./portable-collection-B-mU1F1-.js";
-import { n as getAuthenticatedDocumentLoader, t as kvCache } from "./kv-cache-DhIl9YlV.js";
+import { n as doesActorOwnKey, r as getKeyOwner, t as verifyPortableObject } from "./portable-collection-uv4CuQXm.js";
+import { n as getAuthenticatedDocumentLoader, t as kvCache } from "./kv-cache-CZiBDLPi.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, isActor, lookupObject, traverseCollection } from "@fedify/vocab";
@@ -2494,10 +2494,13 @@ async function routeActivity({ context: ctx, json, originalJson, normalizedActiv
 //#region src/federation/keycache.ts
 const KEY_CACHE_GENERATION = "2";
 const COMPATIBLE_KEY_SEGMENT = "__compatible";
-const MAX_COMPATIBLE_KEY_TTL = Temporal.Duration.from({ hours: 1 });
+const MAX_OWNER_BYTES = 32 * 1024;
 function isCompatibleKeyEntry(value) {
 	return value != null && typeof value === "object" && "key" in value && "expires" in value && typeof value.expires === "number";
 }
+function isJsonObject(value) {
+	return value != null && typeof value === "object" && !Array.isArray(value);
+}
 var KvKeyCache = class {
 	kv;
 	prefix;
@@ -2579,30 +2582,48 @@ var KvKeyCache = class {
 			keyId.href
 		];
 		const isExpired = (entry) => entry.expires <= now().epochMilliseconds;
-		const keyTtl = Math.min(this.keyTtl.total("millisecond"), MAX_COMPATIBLE_KEY_TTL.total("millisecond"));
+		const keyTtl = Math.min(this.keyTtl.total("millisecond"), MAX_PORTABLE_KEY_TTL.total("millisecond"));
 		const unavailableKeyTtl = this.unavailableKeyTtl.total("millisecond");
-		return {
-			get: async (keyId) => {
-				const entry = await this.kv.get(entryKey(keyId));
-				if (entry === void 0) return void 0;
-				if (!isCompatibleKeyEntry(entry) || isExpired(entry)) {
-					await this.kv.delete(entryKey(keyId));
-					return;
-				}
-				if (entry.key === null) return null;
-				let key;
+		const getEntry = async (keyId) => {
+			const entry = await this.kv.get(entryKey(keyId));
+			if (entry === void 0) return void 0;
+			if (!isCompatibleKeyEntry(entry) || isExpired(entry)) {
+				await this.kv.delete(entryKey(keyId));
+				return;
+			}
+			if (entry.key === null) return null;
+			let expires;
+			try {
+				expires = Temporal.Instant.fromEpochMilliseconds(entry.expires);
+			} catch (error) {
+				if (!(error instanceof RangeError)) throw error;
+				await this.kv.delete(entryKey(keyId));
+				return;
+			}
+			let key;
+			try {
+				key = await CryptographicKey.fromJsonLd(entry.key, this.options);
+			} catch {
 				try {
-					key = await CryptographicKey.fromJsonLd(entry.key, this.options);
+					key = await Multikey.fromJsonLd(entry.key, this.options);
 				} catch {
-					try {
-						key = await Multikey.fromJsonLd(entry.key, this.options);
-					} catch {
-						await this.kv.delete(entryKey(keyId));
-						return;
-					}
+					await this.kv.delete(entryKey(keyId));
+					return;
 				}
-				return isExpired(entry) ? void 0 : key;
+			}
+			if (isExpired(entry)) return void 0;
+			return {
+				key,
+				...isJsonObject(entry.owner) ? { owner: entry.owner } : {},
+				expires
+			};
+		};
+		return {
+			get: async (keyId) => {
+				const entry = await getEntry(keyId);
+				return entry == null ? entry : entry.key;
 			},
+			getEntry,
 			set: async (keyId, key, options) => {
 				const serialized = key == null ? null : await key.toJsonLd(this.options);
 				const current = now();
@@ -2613,10 +2634,13 @@ var KvKeyCache = class {
 					await this.kv.delete(entryKey(keyId));
 					return;
 				}
+				const owner = key == null || options?.owner == null || new TextEncoder().encode(JSON.stringify(options.owner)).length > MAX_OWNER_BYTES ? void 0 : options.owner;
 				await this.kv.set(entryKey(keyId), {
 					key: serialized,
-					expires
+					expires,
+					...owner == null ? {} : { owner }
 				}, { ttl: Temporal.Duration.from({ milliseconds: ttl }) });
+				return key == null ? void 0 : Temporal.Instant.fromEpochMilliseconds(expires);
 			},
 			delete: async (keyId) => {
 				await this.kv.delete(entryKey(keyId));

package/dist/{mod-Bz9tFXI2.d.ts → mod--jv6vyrP.d.ts}

@@ -1,5 +1,5 @@
 /// <reference lib="esnext.temporal" />
-import { S as KeyCache } from "./http-C-x_OLSp.js";
+import { S as KeyCache } from "./http-Cok5-vIC.js";
 import { CryptographicKey, DataIntegrityProof, Multikey, Object as Object$1 } from "@fedify/vocab";
 import { MeterProvider, TracerProvider } from "@opentelemetry/api";
 import { DocumentLoader, PortableObjectVerifier, PortableObjectVerifierOptions } from "@fedify/vocab-runtime";

package/dist/{mod-DaiBrWDW.d.ts → mod-B5z_q9TH.d.ts}

@@ -1,5 +1,5 @@
 /// <reference lib="esnext.temporal" />
-import { n as HttpMessageSignaturesSpecDeterminer } from "./http-C-x_OLSp.js";
+import { n as HttpMessageSignaturesSpecDeterminer } from "./http-Cok5-vIC.js";
 import { n as KvStore, t as KvKey } from "./kv-BhNbN8Ed.js";
 import { t as DocumentFetchKind } from "./metrics-DoRtI0qU.js";
 import { MeterProvider, TracerProvider } from "@opentelemetry/api";

package/dist/{mod-Mt4aO3DX.d.cts → mod-BA_F2x53.d.cts}

@@ -1,5 +1,5 @@
 /// <reference lib="esnext.temporal" />
-import { n as HttpMessageSignaturesSpecDeterminer } from "./http-CjezPjFX.cjs";
+import { n as HttpMessageSignaturesSpecDeterminer } from "./http-DC1cqAQ2.cjs";
 import { n as KvStore, t as KvKey } from "./kv-BhNbN8Ed.cjs";
 import { t as DocumentFetchKind } from "./metrics-DVKYY6K1.cjs";
 import { DocumentLoader, DocumentLoaderFactoryOptions } from "@fedify/vocab-runtime";

package/dist/{mod-DSKkTwH2.d.cts → mod-BLOXGs6m.d.cts}

@@ -1,5 +1,5 @@
 /// <reference lib="esnext.temporal" />
-import { bt as ActorDispatcher, f as RequestContext, qt as WebFingerLinksDispatcher, xt as ActorHandleMapper, yt as ActorAliasMapper } from "./context-DpsaHkk1.cjs";
+import { bt as ActorDispatcher, f as RequestContext, qt as WebFingerLinksDispatcher, xt as ActorHandleMapper, yt as ActorAliasMapper } from "./context-L0Fnib9j.cjs";
 import { MeterProvider, Span, Tracer } from "@opentelemetry/api";
 import { RouterError, RouterOptions, RouterRouteResult } from "@fedify/uri-template";
 

package/dist/{mod-S--JxYjo.d.cts → mod-CPPqkyV_.d.cts}

@@ -1,5 +1,5 @@
 /// <reference lib="esnext.temporal" />
-import { S as KeyCache } from "./http-CjezPjFX.cjs";
+import { S as KeyCache } from "./http-DC1cqAQ2.cjs";
 import { CryptographicKey, DataIntegrityProof, Multikey, Object as Object$1 } from "@fedify/vocab";
 import { DocumentLoader, PortableObjectVerifier, PortableObjectVerifierOptions } from "@fedify/vocab-runtime";
 import { MeterProvider, TracerProvider } from "@opentelemetry/api";

package/dist/{mod-_4K05HZF.d.ts → mod-DK0y9fd-.d.ts}

@@ -1,5 +1,5 @@
 /// <reference lib="esnext.temporal" />
-import { bt as ActorDispatcher, f as RequestContext, qt as WebFingerLinksDispatcher, xt as ActorHandleMapper, yt as ActorAliasMapper } from "./context-JDNkUtnu.js";
+import { bt as ActorDispatcher, f as RequestContext, qt as WebFingerLinksDispatcher, xt as ActorHandleMapper, yt as ActorAliasMapper } from "./context-BykNUf04.js";
 import { RouterError, RouterOptions, RouterRouteResult } from "@fedify/uri-template";
 import { MeterProvider, Span, Tracer } from "@opentelemetry/api";
 

package/dist/mod.cjs

@@ -3,11 +3,11 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 require("./rolldown-runtime-Dmm3t92W.cjs");
 const require_transformers = require("./transformers-BalCrSsr.cjs");
 require("./compat/mod.cjs");
-const require_http = require("./http-wdsia0-O.cjs");
-const require_federation = require("./federation-dBOqmJcA.cjs");
+const require_http = require("./http-R4g1McwE.cjs");
+const require_federation = require("./federation-DFCnp94y.cjs");
 const require_types = require("./types-poIao40f.cjs");
-const require_portable_collection = require("./portable-collection-C65SwL2l.cjs");
-const require_kv_cache = require("./kv-cache-BHNtQi9e.cjs");
+const require_portable_collection = require("./portable-collection-UajqDrSL.cjs");
+const require_kv_cache = require("./kv-cache-Ct-KWRta.cjs");
 require("./nodeinfo/mod.cjs");
 require("./runtime/mod.cjs");
 require("./sig/mod.cjs");