@fedify/fedify 2.4.0-dev.2108 → 2.4.0-dev.2122

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

@@ -4,6 +4,11 @@ globalThis.addEventListener = () => {};
 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 });
+function isCompatibleKeyEntry(value) {
+	return value != null && typeof value === "object" && "key" in value && "expires" in value && typeof value.expires === "number";
+}
 var KvKeyCache = class {
 	kv;
 	prefix;
@@ -66,6 +71,69 @@ var KvKeyCache = class {
 		const serialized = await key.toJsonLd(this.options);
 		await this.kv.set(this.#entryKey(keyId), serialized, { ttl: this.keyTtl });
 	}
+	/**
+	* Returns the namespace of keys at FEP-ef61 compatible identifiers looked
+	* up for the given purpose.  Its entries carry the time they expire, which
+	* is checked when they are read, so that an entry is never used after
+	* the proof that vouched for its key expired, however late the underlying
+	* store evicts it.
+	* @param scope The purpose of the lookups.
+	* @returns The namespace.
+	* @internal
+	*/
+	compatibleKeyScope(scope) {
+		const now = this.options.now ?? (() => Temporal.Now.instant());
+		const entryKey = (keyId) => [
+			...this.prefix,
+			COMPATIBLE_KEY_SEGMENT,
+			scope,
+			keyId.href
+		];
+		const isExpired = (entry) => entry.expires <= now().epochMilliseconds;
+		const keyTtl = Math.min(this.keyTtl.total("millisecond"), MAX_COMPATIBLE_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;
+				try {
+					key = await CryptographicKey.fromJsonLd(entry.key, this.options);
+				} catch {
+					try {
+						key = await Multikey.fromJsonLd(entry.key, this.options);
+					} catch {
+						await this.kv.delete(entryKey(keyId));
+						return;
+					}
+				}
+				return isExpired(entry) ? void 0 : key;
+			},
+			set: async (keyId, key, options) => {
+				const serialized = key == null ? null : await key.toJsonLd(this.options);
+				const current = now();
+				let expires = current.epochMilliseconds + (key == null ? unavailableKeyTtl : keyTtl);
+				if (options?.expires != null) expires = Math.min(expires, options.expires.epochMilliseconds);
+				const ttl = expires - current.epochMilliseconds;
+				if (ttl <= 0) {
+					await this.kv.delete(entryKey(keyId));
+					return;
+				}
+				await this.kv.set(entryKey(keyId), {
+					key: serialized,
+					expires
+				}, { ttl: Temporal.Duration.from({ milliseconds: ttl }) });
+			},
+			delete: async (keyId) => {
+				await this.kv.delete(entryKey(keyId));
+			}
+		};
+	}
 	async getFetchError(keyId) {
 		const cached = await this.kv.get(this.#getFetchErrorKey(keyId));
 		if (cached == null || typeof cached !== "object") return void 0;

package/dist/{kv-cache-ibncHN1D.js → kv-cache-C4mv2ZFQ.js}

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

package/dist/{kv-cache-CTdvf_Iq.mjs → kv-cache-CPqUxRL3.mjs}

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

package/dist/{kv-cache-0pYMPrkL.cjs → kv-cache-D2Bz6t_c.cjs}

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

package/dist/{ld-BTMJHEGV.mjs → ld-u4JOD4iO.mjs}

@@ -1,9 +1,9 @@
 import "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-CC4RKEEp.mjs";
-import { n as getDurationMs, r as getFederationMetrics, s as measureSignatureKeyFetch } from "./metrics-CF1TEvdS.mjs";
-import { r as fetchKey, s as validateCryptoKey } from "./key-B8u1vdvF.mjs";
+import { n as version, t as name } from "./deno-BZrnW0Qz.mjs";
+import { n as getDurationMs, r as getFederationMetrics, s as measureSignatureKeyFetch } from "./metrics-DCLoLvLz.mjs";
+import { c as validateCryptoKey, i as fetchKey, t as bypassKeyCacheReads } from "./key-PyYvun0F.mjs";
 import { getLogger } from "@logtape/logtape";
 import { Activity, CryptographicKey, Object as Object$1, getTypeId } from "@fedify/vocab";
 import { SpanStatusCode, trace } from "@opentelemetry/api";
@@ -503,10 +503,7 @@ async function verifySignature(jsonLd, options = {}) {
 		});
 		const { key } = await measureSignatureKeyFetch(options.meterProvider, "linked_data", () => fetchKey(new URL(sig.creator), CryptographicKey, {
 			...options,
-			keyCache: {
-				get: () => Promise.resolve(void 0),
-				set: async (keyId, key) => await options.keyCache?.set(keyId, key)
-			}
+			keyCache: bypassKeyCacheReads(options.keyCache)
 		}));
 		if (key == null) return null;
 		return await crypto.subtle.verify("RSASSA-PKCS1-v1_5", key.publicKey, signature.slice(), messageBytes) ? key : null;

package/dist/{metrics-CF1TEvdS.mjs → metrics-DCLoLvLz.mjs}

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

package/dist/{middleware-DCMTJT3_.mjs → middleware-B7bmtONC.mjs}

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

package/dist/{middleware-B-rZ7oE-.mjs → middleware-CgOqRkK-.mjs}

@@ -1,28 +1,28 @@
 import { Temporal } from "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-CC4RKEEp.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-CF1TEvdS.mjs";
+import { n as version, t as name } from "./deno-BZrnW0Qz.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-DCLoLvLz.mjs";
 import { t as formatAcceptSignature } from "./accept-CPVqki78.mjs";
-import { a as isCompatibleKeyId, c as isPortableUri, i as hasPortableActor, n as getGatewayKeyBase, r as getPortableDid, s as isPortableId, t as getCanonicalPortableId } from "./portable-key-id-Bva5iT3W.mjs";
-import { o as importJwk, s as validateCryptoKey, t as exportJwk } from "./key-B8u1vdvF.mjs";
+import { a as isCompatibleKeyId, c as isPortableUri, i as hasPortableActor, n as getGatewayKeyBase, r as getPortableDid, s as isPortableId, t as getCanonicalPortableId } from "./portable-key-id-T7lecIbt.mjs";
+import { c as validateCryptoKey, n as exportJwk, s as importJwk } from "./key-PyYvun0F.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-BTMJHEGV.mjs";
-import { i as signObject, l as verifyPortableObjectProofWithRoot, o as verifyObject, r as hasProofLike, s as verifyPortableObjectProof, t as InvalidPortableObjectIdError } from "./proof-DDw0i9b1.mjs";
-import { a as listRequestSignatures, c as selectRequestSignature, d as verifyRequest, f as verifyRequestDetailed, s as parseRfc9421SignatureInput } from "./http-CHEYA5fH.mjs";
-import { t as getAuthenticatedDocumentLoader } from "./docloader-D3_m98fe.mjs";
-import { n as kvCache } from "./kv-cache-CTdvf_Iq.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-u4JOD4iO.mjs";
+import { i as signObject, l as verifyPortableObjectProofWithRoot, o as verifyObject, r as hasProofLike, s as verifyPortableObjectProof, t as InvalidPortableObjectIdError } from "./proof-BCOg7Njv.mjs";
+import { a as listRequestSignatures, c as selectRequestSignature, d as verifyRequest, f as verifyRequestDetailed, s as parseRfc9421SignatureInput } from "./http-B9BQDNIy.mjs";
+import { t as getAuthenticatedDocumentLoader } from "./docloader-3BHaS20Z.mjs";
+import { n as kvCache } from "./kv-cache-CPqUxRL3.mjs";
 import { d as readBoundedText, l as BodyTooLargeError, t as getNodeInfo, u as MAX_BODY_SIZE } from "./client-DpnpgjyX.mjs";
 import { t as nodeInfoToJson } from "./types-DE_LV1JB.mjs";
-import { n as getKeyOwner, t as doesActorOwnKey } from "./owner-CY--JSqO.mjs";
-import { n as extractInboxes, r as sendActivity, t as SendActivityError } from "./send-CU3sHGPt.mjs";
-import { n as FederationBuilderImpl, t as ACTOR_ALIAS_PREFIX } from "./builder-BRlYEsrV.mjs";
+import { n as getKeyOwner, t as doesActorOwnKey } from "./owner-CPFM-sqo.mjs";
+import { n as extractInboxes, r as sendActivity, t as SendActivityError } from "./send-C8eOPat3.mjs";
+import { n as FederationBuilderImpl, t as ACTOR_ALIAS_PREFIX } from "./builder-BCXywsZF.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, t as containsCompoundPortableObject } from "./compound-proof-CHGINiJg.mjs";
-import { t as KvKeyCache } from "./keycache-BUDHB5rY.mjs";
+import { a as verifyCompoundPortableObjectProofs, i as inspectCompoundPortableObjectApplicability, r as findUnsupportedCompoundProofShape, t as containsCompoundPortableObject } from "./compound-proof-Fxd45Oy5.mjs";
+import { t as KvKeyCache } from "./keycache-BInaECGj.mjs";
 import { t as acceptsJsonLd } from "./negotiation-CCocWT_N.mjs";
-import { t as hasMalformedKnownTemporalLiteral } from "./temporal-NHiSpGcW.mjs";
+import { t as hasMalformedKnownTemporalLiteral } from "./temporal-vjHOhBpy.mjs";
 import { t as createExponentialBackoffPolicy } from "./retry-zX5xw5e0.mjs";
 import { t as TaskCodec } from "./codec-C6rTrpIp.mjs";
 import { getLogger, withContext } from "@logtape/logtape";
@@ -1173,6 +1173,11 @@ async function handleObject(request, { values, context, objectDispatcher, author
 * dispatcher, or the actor dispatcher adapted to one.  The object is served
 * only if its ID canonically matches the requested portable ID and it
 * satisfies the FEP-ef61 proof policy.
+*
+* A {@link Tombstone} is served with `410 Gone` if it has an Object Integrity
+* Proof made with a key of the DID in its ID.  An unsigned tombstone cannot
+* be served as a portable object, so the response is the same as for
+* an object that this server does not store, i.e., `404 Not Found`.
 * @template TContextData The context data to pass to the context.
 * @param request The HTTP request.
 * @param parameters The parameters for handling the portable object.
@@ -1220,17 +1225,27 @@ async function handlePortableObject(request, { values, context, objectDispatcher
 		logger.debug("The serialized object does not match the requested portable object {portableId}.", { portableId: canonicalId });
 		return await onNotFound(request);
 	}
-	if (!result.verified && result.reason.type !== "unsecuredCollection" && result.reason.type !== "unsupportedObjectType") {
-		logger.error("Refusing to serve the portable object {portableId}, as it does not satisfy the FEP-ef61 proof policy: {reason}.  Portable actors, activities, and objects need an Object Integrity Proof made with a key of the DID in their ID.", {
-			portableId: canonicalId,
-			reason: result.reason.type
-		});
-		return portableObjectInternalServerError(request);
+	const tombstone = object instanceof Tombstone;
+	if (!result.verified) {
+		if (tombstone && result.reason.type === "missingProof") {
+			logger.debug("Not serving the tombstone of the portable object {portableId}, as it has no Object Integrity Proof; responding as if this server did not store the object.", { portableId: canonicalId });
+			return await onNotFound(request);
+		}
+		if (tombstone || result.reason.type !== "unsecuredCollection" && result.reason.type !== "unsupportedObjectType") {
+			logger.error("Refusing to serve the portable object {portableId}, as it does not satisfy the FEP-ef61 proof policy: {reason}.  Portable actors, activities, objects, and tombstones need an Object Integrity Proof made with a key of the DID in their ID.", {
+				portableId: canonicalId,
+				reason: result.reason.type
+			});
+			return portableObjectInternalServerError(request);
+		}
 	}
-	return new Response(request.method === "HEAD" ? null : JSON.stringify(jsonLd), { headers: {
-		"Content-Type": PORTABLE_OBJECT_CONTENT_TYPE,
-		Vary: "Accept"
-	} });
+	return new Response(request.method === "HEAD" ? null : JSON.stringify(jsonLd), {
+		status: tombstone ? 410 : 200,
+		headers: {
+			"Content-Type": PORTABLE_OBJECT_CONTENT_TYPE,
+			Vary: "Accept"
+		}
+	});
 }
 function isRequestedPortableObject(object, canonicalId) {
 	return object.id != null && getCanonicalPortableId(object.id) === canonicalId;
@@ -1296,13 +1311,13 @@ function recordCollectionMetrics(meterProvider, base, result, options = {}) {
 * @param parameters The parameters for handling the collection.
 * @returns A promise that resolves to an HTTP response.
 */
-async function handleCollection(request, { name: name$2, identifier, uriGetter, filter, filterPredicate, context, collectionCallbacks, tracerProvider, meterProvider, onUnauthorized, onNotFound }) {
-	const spanName = name$2.trim().replace(/\s+/g, "_");
+async function handleCollection(request, { name: name$1, identifier, uriGetter, filter, filterPredicate, context, collectionCallbacks, tracerProvider, meterProvider, onUnauthorized, onNotFound }) {
+	const spanName = name$1.trim().replace(/\s+/g, "_");
 	tracerProvider = tracerProvider ?? trace.getTracerProvider();
 	const tracer = tracerProvider.getTracer(name, version);
 	const cursor = new URL(request.url).searchParams.get("cursor");
 	const metricBase = {
-		kind: getCollectionMetricKind(name$2),
+		kind: getCollectionMetricKind(name$1),
 		page: cursor != null,
 		dispatcher: "built_in"
 	};
@@ -1343,7 +1358,7 @@ async function handleCollection(request, { name: name$2, identifier, uriGetter,
 							span.setStatus({ code: SpanStatusCode.ERROR });
 							return await onNotFound(request);
 						}
-						const items = filterCollectionItems(page.items, name$2, filterPredicate);
+						const items = filterCollectionItems(page.items, name$1, filterPredicate);
 						itemCount = items.length;
 						span.setAttribute("fedify.collection.items", itemCount);
 						return items;
@@ -1383,7 +1398,7 @@ async function handleCollection(request, { name: name$2, identifier, uriGetter,
 		} else {
 			const uri = new URL(baseUri);
 			uri.searchParams.set("cursor", cursor);
-			const pageOrResponse = await tracer.startActiveSpan(`activitypub.dispatch_collection_page ${name$2}`, {
+			const pageOrResponse = await tracer.startActiveSpan(`activitypub.dispatch_collection_page ${name$1}`, {
 				kind: SpanKind.SERVER,
 				attributes: {
 					"activitypub.collection.id": uri.href,
@@ -1399,7 +1414,7 @@ async function handleCollection(request, { name: name$2, identifier, uriGetter,
 						span.setStatus({ code: SpanStatusCode.ERROR });
 						return await onNotFound(request);
 					}
-					const items = filterCollectionItems(page.items, name$2, filterPredicate);
+					const items = filterCollectionItems(page.items, name$1, filterPredicate);
 					itemCount = items.length;
 					span.setAttribute("fedify.collection.items", itemCount);
 					return {
@@ -2587,8 +2602,8 @@ var CustomCollectionHandler = class {
 	* @param CollectionPage The CollectionPage constructor.
 	* @param filterPredicate Optional filter predicate for items.
 	*/
-	constructor(name$1, values, context, callbacks, tracerProvider = trace.getTracerProvider(), meterProvider, Collection, CollectionPage, filterPredicate) {
-		this.name = name$1;
+	constructor(name$2, values, context, callbacks, tracerProvider = trace.getTracerProvider(), meterProvider, Collection, CollectionPage, filterPredicate) {
+		this.name = name$2;
 		this.values = values;
 		this.context = context;
 		this.callbacks = callbacks;
@@ -5525,10 +5540,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 			return await handlePortableObject(request, {
 				values: { identifier },
 				context,
-				objectDispatcher: actorDispatcher == null ? void 0 : async (ctx) => {
-					const actor = await actorDispatcher(ctx, identifier);
-					return actor instanceof Tombstone ? null : actor;
-				},
+				objectDispatcher: actorDispatcher == null ? void 0 : (ctx) => actorDispatcher(ctx, identifier),
 				authorizePredicate: authorizePredicate == null ? void 0 : (ctx) => authorizePredicate(ctx, identifier),
 				canonicalId: portable.canonicalId,
 				onUnauthorized,

package/dist/{middleware-Dl-Y_ZlC.js → middleware-DWlAGlyP.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 recordCollectionTotalItems, A as isInvalidUrlTypeError, C as compactJsonLd, D as hasSignature, E as getNormalizationContextLoader, F as wrapContextLoaderForJsonLd, G as getFederationMetrics, H as validateCryptoKey, I as exportJwk, J as isAbortError, K as getRemoteHost, M as verifyCompactJsonLd, O as hasSignatureLike, Q as recordCollectionRequest, T as detachSignature, V as importJwk, W as getDurationMs, X as recordCollectionDispatchDuration, Y as recordCircuitBreakerStateChange, Z as recordCollectionPageItems, _ as verifyPortableObjectProofWithRoot, _t as isPortableId, at as recordWebFingerHandle, b as InvalidContextReferenceError, bt as name, ct as formatAcceptSignature, d as hasProofLike, f as signObject, ft as getCanonicalPortableId, g as verifyPortableObjectProofPolicy, gt as isCompatibleKeyId, h as verifyPortableObjectProof, ht as hasPortableActor, i as selectRequestSignature, it as recordOutboxEnqueue, j as signJsonLd, k as isClearlyMalformedContextReference, l as InvalidPortableObjectIdError, m as verifyObject, mt as getPortableDid, n as listRequestSignatures, nt as recordInboxActivity, o as verifyRequest, ot as registerQueueDepthGauge, p as verifyMapLocalProof, pt as getGatewayKeyBase, q as instrumentDocumentLoader, r as parseRfc9421SignatureInput, rt as recordOutboxActivity, s as verifyRequestDetailed, st as preloadedOnlyDocumentLoader, t as doubleKnock, tt as recordFanoutRecipients, vt as isPortableUri, x as assertSafeJsonLd, xt as version, y as normalizeOutgoingActivityJsonLd } from "./http-CaUBCHYJ.js";
+import { $ as recordCollectionTotalItems, A as isInvalidUrlTypeError, C as compactJsonLd, D as hasSignature, E as getNormalizationContextLoader, F as wrapContextLoaderForJsonLd, G as getFederationMetrics, H as validateCryptoKey, I as exportJwk, J as isAbortError, K as getRemoteHost, M as verifyCompactJsonLd, O as hasSignatureLike, Q as recordCollectionRequest, T as detachSignature, V as importJwk, W as getDurationMs, X as recordCollectionDispatchDuration, Y as recordCircuitBreakerStateChange, Z as recordCollectionPageItems, _ as verifyPortableObjectProofWithRoot, _t as isPortableId, at as recordWebFingerHandle, b as InvalidContextReferenceError, bt as name, ct as formatAcceptSignature, d as hasProofLike, f as signObject, ft as getCanonicalPortableId, g as verifyPortableObjectProofPolicy, gt as isCompatibleKeyId, h as verifyPortableObjectProof, ht as hasPortableActor, i as selectRequestSignature, it as recordOutboxEnqueue, j as signJsonLd, k as isClearlyMalformedContextReference, l as InvalidPortableObjectIdError, m as verifyObject, mt as getPortableDid, n as listRequestSignatures, nt as recordInboxActivity, o as verifyRequest, ot as registerQueueDepthGauge, p as verifyMapLocalProof, pt as getGatewayKeyBase, q as instrumentDocumentLoader, r as parseRfc9421SignatureInput, rt as recordOutboxActivity, s as verifyRequestDetailed, st as preloadedOnlyDocumentLoader, t as doubleKnock, tt as recordFanoutRecipients, vt as isPortableUri, x as assertSafeJsonLd, xt as version, y as normalizeOutgoingActivityJsonLd } from "./http-BETASGl0.js";
 import { a as MAX_BODY_SIZE, i as BodyTooLargeError, n as getNodeInfo, o as readBoundedText, t as nodeInfoToJson } from "./types-C_cNlNVK.js";
-import { n as getKeyOwner, t as doesActorOwnKey } from "./owner-M8dOKEl6.js";
-import { n as getAuthenticatedDocumentLoader, t as kvCache } from "./kv-cache-ibncHN1D.js";
+import { n as getKeyOwner, t as doesActorOwnKey } from "./owner-wNinn7RK.js";
+import { n as getAuthenticatedDocumentLoader, t as kvCache } from "./kv-cache-C4mv2ZFQ.js";
 import { getLogger, withContext } from "@logtape/logtape";
 import { Router, RouterError, assertPath } from "@fedify/uri-template";
 import { Activity, Collection, CollectionPage, CryptographicKey, Link, Multikey, Object as Object$1, OrderedCollection, OrderedCollectionPage, Tombstone, getTypeId, lookupObject, traverseCollection } from "@fedify/vocab";
@@ -750,7 +750,7 @@ function warnMismatchedTombstoneId(context, cls, values, tombstone) {
 		});
 		return;
 	}
-	if (tombstone.id.protocol === "ap:" || tombstone.id.protocol === "ap+ef61:") return;
+	if (isPortableId(tombstone.id)) return;
 	const expected = context.getObjectUri(cls, values);
 	if (tombstone.id.href !== expected.href) logger.warn("Object dispatcher for {class} returned a tombstone with an id property {tombstoneId} that does not match the object URI {objectUri}.  Set the property with Context.getObjectUri().", {
 		class: cls.name,
@@ -2233,6 +2233,11 @@ async function routeActivity({ context: ctx, json, originalJson, normalizedActiv
 //#endregion
 //#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 });
+function isCompatibleKeyEntry(value) {
+	return value != null && typeof value === "object" && "key" in value && "expires" in value && typeof value.expires === "number";
+}
 var KvKeyCache = class {
 	kv;
 	prefix;
@@ -2295,6 +2300,69 @@ var KvKeyCache = class {
 		const serialized = await key.toJsonLd(this.options);
 		await this.kv.set(this.#entryKey(keyId), serialized, { ttl: this.keyTtl });
 	}
+	/**
+	* Returns the namespace of keys at FEP-ef61 compatible identifiers looked
+	* up for the given purpose.  Its entries carry the time they expire, which
+	* is checked when they are read, so that an entry is never used after
+	* the proof that vouched for its key expired, however late the underlying
+	* store evicts it.
+	* @param scope The purpose of the lookups.
+	* @returns The namespace.
+	* @internal
+	*/
+	compatibleKeyScope(scope) {
+		const now = this.options.now ?? (() => Temporal.Now.instant());
+		const entryKey = (keyId) => [
+			...this.prefix,
+			COMPATIBLE_KEY_SEGMENT,
+			scope,
+			keyId.href
+		];
+		const isExpired = (entry) => entry.expires <= now().epochMilliseconds;
+		const keyTtl = Math.min(this.keyTtl.total("millisecond"), MAX_COMPATIBLE_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;
+				try {
+					key = await CryptographicKey.fromJsonLd(entry.key, this.options);
+				} catch {
+					try {
+						key = await Multikey.fromJsonLd(entry.key, this.options);
+					} catch {
+						await this.kv.delete(entryKey(keyId));
+						return;
+					}
+				}
+				return isExpired(entry) ? void 0 : key;
+			},
+			set: async (keyId, key, options) => {
+				const serialized = key == null ? null : await key.toJsonLd(this.options);
+				const current = now();
+				let expires = current.epochMilliseconds + (key == null ? unavailableKeyTtl : keyTtl);
+				if (options?.expires != null) expires = Math.min(expires, options.expires.epochMilliseconds);
+				const ttl = expires - current.epochMilliseconds;
+				if (ttl <= 0) {
+					await this.kv.delete(entryKey(keyId));
+					return;
+				}
+				await this.kv.set(entryKey(keyId), {
+					key: serialized,
+					expires
+				}, { ttl: Temporal.Duration.from({ milliseconds: ttl }) });
+			},
+			delete: async (keyId) => {
+				await this.kv.delete(entryKey(keyId));
+			}
+		};
+	}
 	async getFetchError(keyId) {
 		const cached = await this.kv.get(this.#getFetchErrorKey(keyId));
 		if (cached == null || typeof cached !== "object") return void 0;
@@ -3462,6 +3530,11 @@ async function handleObject(request, { values, context, objectDispatcher, author
 * dispatcher, or the actor dispatcher adapted to one.  The object is served
 * only if its ID canonically matches the requested portable ID and it
 * satisfies the FEP-ef61 proof policy.
+*
+* A {@link Tombstone} is served with `410 Gone` if it has an Object Integrity
+* Proof made with a key of the DID in its ID.  An unsigned tombstone cannot
+* be served as a portable object, so the response is the same as for
+* an object that this server does not store, i.e., `404 Not Found`.
 * @template TContextData The context data to pass to the context.
 * @param request The HTTP request.
 * @param parameters The parameters for handling the portable object.
@@ -3509,17 +3582,27 @@ async function handlePortableObject(request, { values, context, objectDispatcher
 		logger.debug("The serialized object does not match the requested portable object {portableId}.", { portableId: canonicalId });
 		return await onNotFound(request);
 	}
-	if (!result.verified && result.reason.type !== "unsecuredCollection" && result.reason.type !== "unsupportedObjectType") {
-		logger.error("Refusing to serve the portable object {portableId}, as it does not satisfy the FEP-ef61 proof policy: {reason}.  Portable actors, activities, and objects need an Object Integrity Proof made with a key of the DID in their ID.", {
-			portableId: canonicalId,
-			reason: result.reason.type
-		});
-		return portableObjectInternalServerError(request);
+	const tombstone = object instanceof Tombstone;
+	if (!result.verified) {
+		if (tombstone && result.reason.type === "missingProof") {
+			logger.debug("Not serving the tombstone of the portable object {portableId}, as it has no Object Integrity Proof; responding as if this server did not store the object.", { portableId: canonicalId });
+			return await onNotFound(request);
+		}
+		if (tombstone || result.reason.type !== "unsecuredCollection" && result.reason.type !== "unsupportedObjectType") {
+			logger.error("Refusing to serve the portable object {portableId}, as it does not satisfy the FEP-ef61 proof policy: {reason}.  Portable actors, activities, objects, and tombstones need an Object Integrity Proof made with a key of the DID in their ID.", {
+				portableId: canonicalId,
+				reason: result.reason.type
+			});
+			return portableObjectInternalServerError(request);
+		}
 	}
-	return new Response(request.method === "HEAD" ? null : JSON.stringify(jsonLd), { headers: {
-		"Content-Type": PORTABLE_OBJECT_CONTENT_TYPE,
-		Vary: "Accept"
-	} });
+	return new Response(request.method === "HEAD" ? null : JSON.stringify(jsonLd), {
+		status: tombstone ? 410 : 200,
+		headers: {
+			"Content-Type": PORTABLE_OBJECT_CONTENT_TYPE,
+			Vary: "Accept"
+		}
+	});
 }
 function isRequestedPortableObject(object, canonicalId) {
 	return object.id != null && getCanonicalPortableId(object.id) === canonicalId;
@@ -3585,13 +3668,13 @@ function recordCollectionMetrics(meterProvider, base, result, options = {}) {
 * @param parameters The parameters for handling the collection.
 * @returns A promise that resolves to an HTTP response.
 */
-async function handleCollection(request, { name: name$2, identifier, uriGetter, filter, filterPredicate, context, collectionCallbacks, tracerProvider, meterProvider, onUnauthorized, onNotFound }) {
-	const spanName = name$2.trim().replace(/\s+/g, "_");
+async function handleCollection(request, { name: name$1, identifier, uriGetter, filter, filterPredicate, context, collectionCallbacks, tracerProvider, meterProvider, onUnauthorized, onNotFound }) {
+	const spanName = name$1.trim().replace(/\s+/g, "_");
 	tracerProvider = tracerProvider ?? trace.getTracerProvider();
 	const tracer = tracerProvider.getTracer(name, version);
 	const cursor = new URL(request.url).searchParams.get("cursor");
 	const metricBase = {
-		kind: getCollectionMetricKind(name$2),
+		kind: getCollectionMetricKind(name$1),
 		page: cursor != null,
 		dispatcher: "built_in"
 	};
@@ -3632,7 +3715,7 @@ async function handleCollection(request, { name: name$2, identifier, uriGetter,
 							span.setStatus({ code: SpanStatusCode.ERROR });
 							return await onNotFound(request);
 						}
-						const items = filterCollectionItems(page.items, name$2, filterPredicate);
+						const items = filterCollectionItems(page.items, name$1, filterPredicate);
 						itemCount = items.length;
 						span.setAttribute("fedify.collection.items", itemCount);
 						return items;
@@ -3672,7 +3755,7 @@ async function handleCollection(request, { name: name$2, identifier, uriGetter,
 		} else {
 			const uri = new URL(baseUri);
 			uri.searchParams.set("cursor", cursor);
-			const pageOrResponse = await tracer.startActiveSpan(`activitypub.dispatch_collection_page ${name$2}`, {
+			const pageOrResponse = await tracer.startActiveSpan(`activitypub.dispatch_collection_page ${name$1}`, {
 				kind: SpanKind.SERVER,
 				attributes: {
 					"activitypub.collection.id": uri.href,
@@ -3688,7 +3771,7 @@ async function handleCollection(request, { name: name$2, identifier, uriGetter,
 						span.setStatus({ code: SpanStatusCode.ERROR });
 						return await onNotFound(request);
 					}
-					const items = filterCollectionItems(page.items, name$2, filterPredicate);
+					const items = filterCollectionItems(page.items, name$1, filterPredicate);
 					itemCount = items.length;
 					span.setAttribute("fedify.collection.items", itemCount);
 					return {
@@ -4876,8 +4959,8 @@ var CustomCollectionHandler = class {
 	* @param CollectionPage The CollectionPage constructor.
 	* @param filterPredicate Optional filter predicate for items.
 	*/
-	constructor(name$1, values, context, callbacks, tracerProvider = trace.getTracerProvider(), meterProvider, Collection, CollectionPage, filterPredicate) {
-		this.name = name$1;
+	constructor(name$2, values, context, callbacks, tracerProvider = trace.getTracerProvider(), meterProvider, Collection, CollectionPage, filterPredicate) {
+		this.name = name$2;
 		this.values = values;
 		this.context = context;
 		this.callbacks = callbacks;
@@ -8223,10 +8306,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 			return await handlePortableObject(request, {
 				values: { identifier },
 				context,
-				objectDispatcher: actorDispatcher == null ? void 0 : async (ctx) => {
-					const actor = await actorDispatcher(ctx, identifier);
-					return actor instanceof Tombstone ? null : actor;
-				},
+				objectDispatcher: actorDispatcher == null ? void 0 : (ctx) => actorDispatcher(ctx, identifier),
 				authorizePredicate: authorizePredicate == null ? void 0 : (ctx) => authorizePredicate(ctx, identifier),
 				canonicalId: portable.canonicalId,
 				onUnauthorized,

package/dist/{mod-4s_XgF17.d.ts → mod-COWgSo2v.d.ts}

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

package/dist/{mod-Coacostr.d.ts → mod-CTh7ijx5.d.ts}

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

package/dist/{mod-xGFCHqq_.d.cts → mod-Cr79cQlc.d.cts}

@@ -1,5 +1,5 @@
 /// <reference lib="esnext.temporal" />
-import { n as HttpMessageSignaturesSpecDeterminer } from "./http-xlG-jRdB.cjs";
+import { n as HttpMessageSignaturesSpecDeterminer } from "./http-D76Py0M4.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-CVZrXSdm.d.ts → mod-Cwdt_CWU.d.ts}

@@ -1,5 +1,5 @@
 /// <reference lib="esnext.temporal" />
-import { n as HttpMessageSignaturesSpecDeterminer } from "./http-n2v6DPxu.js";
+import { n as HttpMessageSignaturesSpecDeterminer } from "./http-BrQgkJay.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-C8LieBzF.d.cts → mod-DMdGFMEl.d.cts}

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

package/dist/{mod-BuFmStNT.d.cts → mod-DnElMslb.d.cts}

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

package/dist/mod.cjs

@@ -3,14 +3,14 @@ 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-B7wEqv49.cjs");
-const require_federation = require("./federation-dqo6ZzgT.cjs");
+const require_http = require("./http-4bmgw-mA.cjs");
+const require_federation = require("./federation-Ml6NrgRV.cjs");
 const require_types = require("./types-Be2zbyeG.cjs");
-const require_owner = require("./owner-CGnHPl4k.cjs");
-const require_kv_cache = require("./kv-cache-0pYMPrkL.cjs");
+const require_owner = require("./owner-DkA0Lz7v.cjs");
+const require_kv_cache = require("./kv-cache-D2Bz6t_c.cjs");
 require("./nodeinfo/mod.cjs");
 require("./runtime/mod.cjs");
-const require_sig = require("./sig-C2CORtvg.cjs");
+const require_sig = require("./sig-Cb9VSeiF.cjs");
 require("./utils/mod.cjs");
 //#endregion
 exports.CircuitBreaker = require_federation.CircuitBreaker;