@fedify/fedify 2.4.0-dev.2212 → 2.4.0-dev.2228

package/dist/{federation-B-0EXZPH.cjs → federation-DiycMKQx.cjs}

@@ -1,10 +1,10 @@
 const { URLPattern } = require("urlpattern-polyfill");
 const require_rolldown_runtime = require("./rolldown-runtime-Dmm3t92W.cjs");
 const require_transformers = require("./transformers-BalCrSsr.cjs");
-const require_http = require("./http-ByBlnY3D.cjs");
+const require_http = require("./http-DC5DyShJ.cjs");
 const require_types = require("./types-poIao40f.cjs");
-const require_portable_collection = require("./portable-collection-CXcAlwei.cjs");
-const require_kv_cache = require("./kv-cache-BDwUzxBJ.cjs");
+const require_portable_collection = require("./portable-collection-Cz9K1Tas.cjs");
+const require_kv_cache = require("./kv-cache-CsNDrjVT.cjs");
 let _logtape_logtape = require("@logtape/logtape");
 let _fedify_uri_template = require("@fedify/uri-template");
 let _fedify_vocab = require("@fedify/vocab");
@@ -118,6 +118,7 @@ var FederationBuilderImpl = class {
 	* Symbol registry for unique identification of unnamed symbols.
 	*/
 	#symbolRegistry = /* @__PURE__ */ new Map();
+	#collectionNames = /* @__PURE__ */ new Map();
 	constructor() {
 		this.router = new _fedify_uri_template.Router();
 		this.objectCallbacks = {};
@@ -147,6 +148,8 @@ var FederationBuilderImpl = class {
 		f.objectTypeIds = { ...this.objectTypeIds };
 		f.collectionCallbacks = { ...this.collectionCallbacks };
 		f.collectionTypeIds = { ...this.collectionTypeIds };
+		f.#symbolRegistry = new Map(this.#symbolRegistry);
+		f.#collectionNames = new Map(this.#collectionNames);
 		f.inboxPath = this.inboxPath;
 		f.outboxPath = this.outboxPath;
 		f.inboxCallbacks = this.inboxCallbacks == null ? void 0 : { ...this.inboxCallbacks };
@@ -678,6 +681,7 @@ var FederationBuilderImpl = class {
 		if (this.collectionCallbacks[name] != null) throw new _fedify_uri_template.RouterError(`Collection dispatcher for ${strName} already set.`);
 		(0, _fedify_uri_template.assertPath)(path);
 		if (_fedify_uri_template.Router.variables(path).size < 1) throw new _fedify_uri_template.RouterError("Path for collection dispatcher must have at least one variable.");
+		this.#collectionNames.set(routeName, name);
 		this.router.add(path, routeName);
 		const callbacks = { dispatcher };
 		this.collectionCallbacks[name] = callbacks;
@@ -719,6 +723,10 @@ var FederationBuilderImpl = class {
 		const routeName = this.#uniqueCollectionId(name);
 		return this.router.build(`collection:${routeName}`, values) ?? this.router.build(`orderedCollection:${routeName}`, values);
 	}
+	/** Resolves a custom collection route to its original name. */
+	getCollectionName(routeName) {
+		return this.#collectionNames.get(routeName) ?? routeName.replace(/^(collection|orderedCollection):/, "");
+	}
 	setOutboxPermanentFailureHandler(handler) {
 		this.outboxPermanentFailureHandler = handler;
 	}
@@ -1449,7 +1457,7 @@ const textEncoder = new TextEncoder();
 function isPortableIdValue(value) {
 	return typeof value === "string" && require_http.isPortableId(value);
 }
-function isJsonMap(value) {
+function isJsonMap$1(value) {
 	return typeof value === "object" && value != null && !Array.isArray(value);
 }
 function isCompoundProofJsonObject(value) {
@@ -1515,7 +1523,7 @@ function addBytes(statistics, bytes, limits, path) {
 	if (statistics.byteLength > limits.maxBytes) return limitExceeded("bytes", limits.maxBytes, statistics.byteLength, path);
 }
 function inspectJsonTree(root, limits) {
-	if (!isJsonMap(root)) return {
+	if (!isJsonMap$1(root)) return {
 		status: "unsupported",
 		reason: {
 			type: "invalidJsonTree",
@@ -1578,7 +1586,7 @@ function inspectJsonTree(root, limits) {
 				insideProof: current.insideProof,
 				insideContext: current.insideContext
 			});
-		} else if (isJsonMap(value)) {
+		} else if (isJsonMap$1(value)) {
 			const prototype = Object.getPrototypeOf(value);
 			if (seen.has(value) || !hasOnlyDataProperties(value) || prototype !== Object.prototype && prototype !== null) return {
 				status: "unsupported",
@@ -1599,7 +1607,7 @@ function inspectJsonTree(root, limits) {
 			if (hasDirectProof) {
 				statistics.proofCount++;
 				if (statistics.proofCount > limits.maxProofs) return limitExceeded("proofs", limits.maxProofs, statistics.proofCount, childPath(current.path, "proof"));
-				if (!isJsonMap(value.proof)) return {
+				if (!isJsonMap$1(value.proof)) return {
 					status: "unsupported",
 					reason: {
 						type: "unsupportedProofShape",
@@ -1774,7 +1782,7 @@ function inspectCompoundPortableObjectApplicability(json, limits) {
 				iterator: value.values(),
 				depth: frame.depth + 1
 			});
-		} else if (isJsonMap(value)) {
+		} else if (isJsonMap$1(value)) {
 			mapCount++;
 			if (mapCount > limits.maxMaps) return "indeterminate";
 			if ([value.id, value["@id"]].some(isPortableIdValue)) return "present";
@@ -1870,7 +1878,7 @@ function containsCompoundPortableObject(json) {
 * @internal
 */
 function findUnsupportedCompoundProofShape(json) {
-	return findInJsonMaps(json, (map, path) => Object.hasOwn(map, "proof") && !isJsonMap(map.proof) ? childPath(path, "proof") : void 0) ?? null;
+	return findInJsonMaps(json, (map, path) => Object.hasOwn(map, "proof") && !isJsonMap$1(map.proof) ? childPath(path, "proof") : void 0) ?? null;
 }
 /**
 * Discovers direct literal proof-bearing maps in an immutable JSON snapshot.
@@ -2072,13 +2080,13 @@ async function isEmbeddedPortableKey(parent, member, key, parentId) {
 	}
 	if (expanded.length !== 1 || hasGraphKeyword(expanded)) return false;
 	const node = expanded[0];
-	if (!isJsonMap(node) || typeof node["@id"] !== "string" || getCanonicalPortableIdOf(node["@id"]) !== parentPortableId) return false;
+	if (!isJsonMap$1(node) || typeof node["@id"] !== "string" || getCanonicalPortableIdOf(node["@id"]) !== parentPortableId) return false;
 	const properties = Object.keys(node).filter((property) => property !== "@id" && property !== "@type");
 	if (properties.length !== 1 || properties[0] !== `${SECURITY}${member}`) return false;
 	const values = node[properties[0]];
 	if (!Array.isArray(values) || values.length !== 1) return false;
 	const expandedKey = values[0];
-	if (!isJsonMap(expandedKey) || expandedKey["@id"] !== literalIds[0] || Object.keys(expandedKey).some((property) => !KEY_PROPERTIES.has(property))) return false;
+	if (!isJsonMap$1(expandedKey) || expandedKey["@id"] !== literalIds[0] || Object.keys(expandedKey).some((property) => !KEY_PROPERTIES.has(property))) return false;
 	const types = expandedKey["@type"];
 	if (types !== void 0 && (!Array.isArray(types) || types.some((type) => typeof type !== "string" || !KEY_TYPES.has(type)))) return false;
 	const pem = expandedKey[`${SECURITY}publicKeyPem`];
@@ -2089,7 +2097,7 @@ async function isEmbeddedPortableKey(parent, member, key, parentId) {
 	for (const property of [`${SECURITY}owner`, `${SECURITY}controller`]) {
 		const owners = expandedKey[property];
 		if (owners === void 0) continue;
-		if (!Array.isArray(owners) || owners.length !== 1 || !isJsonMap(owners[0]) || Object.keys(owners[0]).length !== 1 || typeof owners[0]["@id"] !== "string" || getCanonicalPortableIdOf(owners[0]["@id"]) !== parentPortableId) return false;
+		if (!Array.isArray(owners) || owners.length !== 1 || !isJsonMap$1(owners[0]) || Object.keys(owners[0]).length !== 1 || typeof owners[0]["@id"] !== "string" || getCanonicalPortableIdOf(owners[0]["@id"]) !== parentPortableId) return false;
 	}
 	return true;
 }
@@ -2132,7 +2140,7 @@ function isSimpleContext(context) {
 }
 function hasGraphKeyword(value) {
 	if (Array.isArray(value)) return value.some(hasGraphKeyword);
-	if (!isJsonMap(value)) return false;
+	if (!isJsonMap$1(value)) return false;
 	return Object.entries(value).some(([key, child]) => key === "@graph" || key === "@included" || key === "@reverse" || hasGraphKeyword(child));
 }
 /**
@@ -2142,7 +2150,7 @@ function hasGraphKeyword(value) {
 function isSingleStringValue(values, datatype) {
 	if (!Array.isArray(values) || values.length !== 1) return false;
 	const value = values[0];
-	if (!isJsonMap(value) || typeof value["@value"] !== "string") return false;
+	if (!isJsonMap$1(value) || typeof value["@value"] !== "string") return false;
 	const keys = Object.keys(value);
 	return keys.length === 1 || datatype != null && keys.length === 2 && value["@type"] === datatype;
 }
@@ -2197,7 +2205,7 @@ async function verifyServedPortableObjects(json, options = {}) {
 	const maps = collected.maps;
 	const discovered = /* @__PURE__ */ new Map();
 	const ids = maps.map((candidate) => candidate.id);
-	const rootId = isJsonMap(json) ? [json.id, json["@id"]].find(isPortableIdValue) : void 0;
+	const rootId = isJsonMap$1(json) ? [json.id, json["@id"]].find(isPortableIdValue) : void 0;
 	if (rootId != null) ids.push(rootId);
 	for (const id of ids) discovered.set(id, (discovered.get(id) ?? 0) + 1);
 	let hidden;
@@ -2242,7 +2250,7 @@ function findHiddenPortableObject(expanded, discovered) {
 			pending.push(...value);
 			continue;
 		}
-		if (!isJsonMap(value)) continue;
+		if (!isJsonMap$1(value)) continue;
 		const id = value["@id"];
 		if (isPortableIdValue(id) && Object.keys(value).some((key) => key !== "@id")) {
 			const count = remaining.get(id) ?? 0;
@@ -2333,7 +2341,7 @@ function collectServedPortableMaps(json) {
 }
 async function checkServedPortableMap({ map, contexts }, options) {
 	if (Object.hasOwn(map, "proof")) {
-		if (!isJsonMap(map.proof)) return "unsupportedProofShape";
+		if (!isJsonMap$1(map.proof)) return "unsupportedProofShape";
 		if (!Object.hasOwn(map, "@context")) return "missingContext";
 		try {
 			const policy = await require_http.verifyPortableObjectProofPolicy(map, await require_http.verifyMapLocalProof(map, options), options);
@@ -2354,11 +2362,185 @@ async function checkServedPortableMap({ map, contexts }, options) {
 	} catch {
 		return "unsupportedContext";
 	}
-	if (expanded.length !== 1 || !isJsonMap(expanded[0])) return "invalidPortableObject";
+	if (expanded.length !== 1 || !isJsonMap$1(expanded[0])) return "invalidPortableObject";
 	const type = require_http.classifyFep2277CoreType(expanded[0]);
 	return UNSECURED_CORE_TYPES.has(type) ? null : "missingProof";
 }
 //#endregion
+//#region src/federation/compatible-id-warning.ts
+/** Returns a verified first gateway, without dereferencing the actor. */
+async function getLocalFirstGateway(context, ownerId, did) {
+	try {
+		const parsed = context.parseUri(ownerId, { portable: true });
+		if (parsed?.type !== "actor" || parsed.authority !== did) return null;
+		return firstGateway(await context.getActor(parsed.identifier), did);
+	} catch (error) {
+		(0, _logtape_logtape.getLogger)([
+			"fedify",
+			"federation",
+			"object"
+		]).debug("Could not check the first gateway of {ownerId}: {error}", {
+			ownerId: ownerId.href,
+			error
+		});
+		return null;
+	}
+}
+function firstGateway(actor, did) {
+	if (actor?.id == null || require_http.getPortableDid(actor.id) !== did) return null;
+	const gateway = actor.gateway;
+	return gateway != null && (0, _fedify_vocab_runtime.isGatewayUrl)(gateway) ? gateway : null;
+}
+/** Looks for an actor already embedded in the document being published. */
+function getEmbeddedFirstGateway(json, ownerId, did) {
+	const owner = require_http.getCanonicalPortableId(ownerId);
+	if (owner == null) return null;
+	return visitJsonMaps(json, (map) => {
+		const id = parseMapId(map, isJsonMap(json) ? json : null);
+		if (id == null || require_http.getCanonicalPortableId(id) !== owner) return;
+		const gateways = map.gateways ?? map["https://w3id.org/fep/ef61/gateways"];
+		const first = Array.isArray(gateways) ? gateways[0] : isJsonMap(gateways) && Array.isArray(gateways["@list"]) ? gateways["@list"][0] : null;
+		const address = typeof first === "string" ? first : isJsonMap(first) ? first.id ?? first["@id"] : null;
+		if (typeof address !== "string") return;
+		try {
+			const gateway = new URL(address);
+			if (require_http.getPortableDid(id) === did && (0, _fedify_vocab_runtime.isGatewayUrl)(gateway)) return gateway;
+		} catch (error) {
+			if (!(error instanceof TypeError)) throw error;
+		}
+	}) ?? null;
+}
+function isJsonMap(value) {
+	return value != null && typeof value === "object" && !Array.isArray(value);
+}
+/** Warns only when the publisher's actual first gateway is known. */
+function warnCompatibleId(id, did, gateway, kind) {
+	if (!(0, _fedify_vocab_runtime_internal_portable_dereference.isCompatibleEf61Iri)(id) || require_http.getPortableDid(id) !== did || id.origin === gateway.origin) return;
+	(0, _logtape_logtape.getLogger)([
+		"fedify",
+		"federation",
+		kind === "activity" ? "outbox" : "object"
+	]).warn("The {kind} {id} has an FEP-ef61 compatible identifier on another gateway than its owner's first gateway, {gateway}.  FEP-ef61 requires publishers to use the first gateway in the actor's gateways.", {
+		kind,
+		id: id.href,
+		gateway: gateway.origin
+	});
+}
+/** Reads the root ID without dereferencing or expanding the document. */
+function getCompactRootId(json) {
+	return isJsonMap(json) ? parseMapId(json, json) : null;
+}
+/** Checks an activity and its embedded objects against each one's owner. */
+async function warnCompatibleIdsInJson(json, context) {
+	const root = isJsonMap(json) ? json : null;
+	const rootOwners = root == null ? [] : ownerIds(root, "actor", root);
+	const gateways = /* @__PURE__ */ new Map();
+	const maps = [];
+	visitJsonMaps(json, (map, path) => {
+		maps.push({
+			map,
+			path
+		});
+	});
+	for (const { map, path } of maps) {
+		const id = parseMapId(map, root);
+		if (id == null || !(0, _fedify_vocab_runtime_internal_portable_dereference.isCompatibleEf61Iri)(id)) continue;
+		const type = map.type ?? map["@type"];
+		if ((Array.isArray(type) ? type : [type]).some((t) => typeof t === "string" && /(?:^|[#/:])(CryptographicKey|Multikey|JsonWebKey|Key)$/.test(t))) continue;
+		const did = require_http.getPortableDid(id);
+		if (did == null) continue;
+		const owners = path === "" ? rootOwners : [
+			...ownerIds(map, "actor", root),
+			...ownerIds(map, "attributedTo", root),
+			...rootOwners
+		];
+		for (const ownerId of owners) {
+			if (require_http.getPortableDid(ownerId) !== did) continue;
+			const key = require_http.getCanonicalPortableId(ownerId);
+			if (key == null) continue;
+			let gateway = gateways.get(key);
+			if (gateway === void 0) {
+				gateway = getEmbeddedFirstGateway(json, ownerId, did) ?? (context == null ? null : await getLocalFirstGateway(context, ownerId, did));
+				gateways.set(key, gateway);
+			}
+			if (gateway != null) {
+				warnCompatibleId(id, did, gateway, path === "" ? "activity" : "object");
+				break;
+			}
+		}
+	}
+}
+function ownerIds(map, term, root) {
+	const iri = `https://www.w3.org/ns/activitystreams#${term}`;
+	const values = [map[term], map[iri]];
+	for (const context of [map["@context"], root?.["@context"]]) for (const [alias, definition] of localContextEntries(context)) {
+		const mapped = typeof definition === "string" ? definition : isJsonMap(definition) ? definition["@id"] : null;
+		if (mapped === iri || mapped === `as:${term}`) values.push(map[alias]);
+	}
+	return values.flatMap((value) => parseOwnerIds(value, root));
+}
+function localContextEntries(context) {
+	if (Array.isArray(context)) return context.flatMap(localContextEntries);
+	return isJsonMap(context) ? Object.entries(context) : [];
+}
+function parseOwnerIds(value, root) {
+	if (Array.isArray(value)) return value.flatMap((item) => parseOwnerIds(item, root));
+	if (isJsonMap(value)) {
+		const id = parseMapId(value, root);
+		return id == null ? [] : [id];
+	}
+	if (typeof value !== "string") return [];
+	try {
+		return [(0, _fedify_vocab_runtime.parseIri)(value)];
+	} catch (error) {
+		if (error instanceof TypeError) return [];
+		throw error;
+	}
+}
+function parseMapId(map, root) {
+	let raw = map["@id"] ?? map.id;
+	for (const context of [map["@context"], root?.["@context"]]) for (const [alias, definition] of localContextEntries(context)) if ((typeof definition === "string" ? definition : isJsonMap(definition) ? definition["@id"] : null) === "@id" && typeof map[alias] === "string") {
+		raw = map[alias];
+		break;
+	}
+	if (typeof raw !== "string") return null;
+	try {
+		return (0, _fedify_vocab_runtime.parseIri)(raw);
+	} catch (error) {
+		if (error instanceof TypeError) return null;
+		throw error;
+	}
+}
+function visitJsonMaps(json, visit) {
+	const seen = /* @__PURE__ */ new Set();
+	const pending = [{
+		value: json,
+		path: ""
+	}];
+	while (pending.length > 0) {
+		const { value, path } = pending.pop();
+		if (value == null || typeof value !== "object" || seen.has(value)) continue;
+		seen.add(value);
+		if (Array.isArray(value)) {
+			for (let i = value.length - 1; i >= 0; i--) pending.push({
+				value: value[i],
+				path: `${path}/${i}`
+			});
+			continue;
+		}
+		const map = value;
+		const result = visit(map, path);
+		if (result !== void 0) return result;
+		for (const key of Object.keys(map).reverse()) {
+			if (key === "proof" || key === "@context") continue;
+			pending.push({
+				value: map[key],
+				path: `${path}/${key}`
+			});
+		}
+	}
+}
+//#endregion
 //#region src/federation/audience.ts
 const AS_NAMESPACE = "https://www.w3.org/ns/activitystreams#";
 /**
@@ -4153,6 +4335,7 @@ async function handleObject(request, { values, context, objectDispatcher, author
 			Vary: "Accept"
 		}
 	});
+	await warnServedCompatibleObject(context, object, getCompactRootId(jsonLd));
 	return new Response(JSON.stringify(jsonLd), { headers: {
 		"Content-Type": "application/activity+json",
 		Vary: "Accept"
@@ -4256,6 +4439,7 @@ async function handlePortableObject(request, { values, context, objectDispatcher
 			return portableObjectInternalServerError(request);
 		}
 	}
+	if (!tombstone) await warnServedCompatibleObject(context, object, servedId);
 	const headers = new Headers({
 		"Content-Type": PORTABLE_OBJECT_CONTENT_TYPE,
 		Vary: "Accept"
@@ -4266,6 +4450,32 @@ async function handlePortableObject(request, { values, context, objectDispatcher
 		headers
 	});
 }
+async function warnServedCompatibleObject(context, object, serializedId) {
+	try {
+		if ((0, _fedify_vocab.isActor)(object)) return;
+		const id = typeof serializedId === "string" ? (0, _fedify_vocab_runtime.parseIri)(serializedId) : serializedId ?? object.id;
+		if (id == null || !(0, _fedify_vocab_runtime_internal_portable_dereference.isCompatibleEf61Iri)(id)) return;
+		const did = require_http.getPortableDid(id);
+		if (did == null) return;
+		const ownerIds = object instanceof _fedify_vocab.Activity ? object.actorIds : object.attributionIds;
+		for (const ownerId of ownerIds) {
+			if (require_http.getPortableDid(ownerId) !== did) continue;
+			const gateway = await getLocalFirstGateway(context, ownerId, did);
+			if (gateway == null) continue;
+			warnCompatibleId(id, did, gateway, object instanceof _fedify_vocab.Activity ? "activity" : "object");
+			break;
+		}
+	} catch (error) {
+		(0, _logtape_logtape.getLogger)([
+			"fedify",
+			"federation",
+			"object"
+		]).debug("Could not check the first gateway of {objectId}: {error}", {
+			objectId: object.id?.href,
+			error
+		});
+	}
+}
 function isRequestedPortableObject(object, canonicalId) {
 	return object.id != null && require_http.getCanonicalPortableId(object.id) === canonicalId;
 }
@@ -4369,13 +4579,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, portable, 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, portable, tracerProvider, meterProvider, onUnauthorized, onNotFound }) {
+	const spanName = name$1.trim().replace(/\s+/g, "_");
 	tracerProvider = tracerProvider ?? _opentelemetry_api.trace.getTracerProvider();
 	const tracer = tracerProvider.getTracer(require_http.name, require_http.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"
 	};
@@ -4421,7 +4631,7 @@ async function handleCollection(request, { name: name$2, identifier, uriGetter,
 							span.setStatus({ code: _opentelemetry_api.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;
@@ -4463,7 +4673,7 @@ async function handleCollection(request, { name: name$2, identifier, uriGetter,
 		} else {
 			const uri = new URL(portable == null ? baseUri : pageBase);
 			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: _opentelemetry_api.SpanKind.SERVER,
 				attributes: {
 					"activitypub.collection.id": uri.href,
@@ -4479,7 +4689,7 @@ async function handleCollection(request, { name: name$2, identifier, uriGetter,
 						span.setStatus({ code: _opentelemetry_api.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 {
@@ -5670,8 +5880,8 @@ var CustomCollectionHandler = class {
 	* @param CollectionPage The CollectionPage constructor.
 	* @param filterPredicate Optional filter predicate for items.
 	*/
-	constructor(name$1, values, context, callbacks, tracerProvider = _opentelemetry_api.trace.getTracerProvider(), meterProvider, Collection, CollectionPage, filterPredicate, portable) {
-		this.name = name$1;
+	constructor(name$2, values, context, callbacks, tracerProvider = _opentelemetry_api.trace.getTracerProvider(), meterProvider, Collection, CollectionPage, filterPredicate, portable) {
+		this.name = name$2;
 		this.values = values;
 		this.context = context;
 		this.callbacks = callbacks;
@@ -9508,10 +9718,10 @@ var FederationImpl = class extends FederationBuilderImpl {
 				onNotFound
 			});
 			case "collection": {
-				const name = route.name.replace(/^collection:/, "");
+				const name = this.getCollectionName(route.name);
 				const callbacks = this.collectionCallbacks[name];
 				return await handleCustomCollection(request, {
-					name,
+					name: String(name),
 					context,
 					values: route.values,
 					collectionCallbacks: callbacks,
@@ -9522,10 +9732,10 @@ var FederationImpl = class extends FederationBuilderImpl {
 				});
 			}
 			case "orderedCollection": {
-				const name = route.name.replace(/^orderedCollection:/, "");
+				const name = this.getCollectionName(route.name);
 				const callbacks = this.collectionCallbacks[name];
 				return await handleOrderedCollection(request, {
-					name,
+					name: String(name),
 					context,
 					values: route.values,
 					collectionCallbacks: callbacks,
@@ -10291,8 +10501,10 @@ var ContextImpl = class ContextImpl {
 		const collectionRegex = new RegExp(`^(${["collection", "orderedCollection"].join("|")}):(.*)$`);
 		const match = route.name.match(collectionRegex);
 		if (match !== null) {
-			const [, type, name] = match;
+			const [, type] = match;
+			const name = this.federation.getCollectionName(route.name);
 			const cls = this.federation.collectionTypeIds[name];
+			if (cls == null) return null;
 			return {
 				type,
 				name,
@@ -10593,17 +10805,26 @@ var ContextImpl = class ContextImpl {
 			activityId: activity.id?.href,
 			activity
 		});
+		const activityJsonLd = await activity.toJsonLd({
+			format: "compact",
+			contextLoader: this.contextLoader
+		});
+		try {
+			await warnCompatibleIdsInJson(activityJsonLd, this instanceof RequestContextImpl && !this.isInActorDispatcher() ? this : void 0);
+		} catch (error) {
+			logger.debug("Could not check the first gateway of activity {activityId}: {error}", {
+				activityId: activity.id?.href,
+				error
+			});
+		}
 		if (this.federation.fanoutQueue == null || options.immediate || options.fanout === "skip" || (options.fanout ?? "auto") === "auto" && globalThis.Object.keys(inboxes).length < FANOUT_THRESHOLD) {
 			await this.federation.sendActivity(keys, inboxes, activity, {
 				...opts,
+				activityJsonLd,
 				normalizeExistingProofs: proofCreated || options.normalizeExistingProofs
 			});
 			return true;
 		}
-		const activityJsonLd = await activity.toJsonLd({
-			format: "compact",
-			contextLoader: this.contextLoader
-		});
 		assertSupportedCompoundProofShape(activityJsonLd, activity.id?.href);
 		const keyJwkPairs = await Promise.all(keys.map(async ({ keyId, privateKey }) => ({
 			keyId: keyId.href,
@@ -10695,7 +10916,7 @@ var ContextImpl = class ContextImpl {
 			"inbox"
 		]);
 		const contextLoader = options.contextLoader ?? this.contextLoader;
-		const json = await activity.toJsonLd({ contextLoader });
+		let json = await activity.toJsonLd({ contextLoader });
 		const keyCache = new KvKeyCache(this.federation.kv, this.federation.kvPrefixes.publicKey, {
 			documentLoader: this.documentLoader,
 			contextLoader: this.contextLoader,
@@ -10757,6 +10978,7 @@ var ContextImpl = class ContextImpl {
 			}
 			logger.debug("Successfully fetched the remote activity object {activityId}; ignore the original activity and use the fetched one, which is trustworthy.");
 			activity = fetched;
+			json = await fetched.toJsonLd({ contextLoader });
 		} else logger.debug("Object Integrity Proofs are verified.", {
 			recipient,
 			activity: json
@@ -10785,6 +11007,10 @@ var RequestContextImpl = class RequestContextImpl extends ContextImpl {
 	#invokedFromActorDispatcher;
 	#invokedFromObjectDispatcher;
 	request;
+	/** Whether a diagnostic actor lookup would re-enter the actor dispatcher. */
+	isInActorDispatcher() {
+		return this.#invokedFromActorDispatcher != null;
+	}
 	url = void 0;
 	portableRequest;
 	constructor(options) {

package/dist/{http-Di8yiDMY.js → http-CHqz_Jp6.js}

@@ -14,7 +14,7 @@ import serialize from "json-canon";
 import { ATTR_HTTP_REQUEST_HEADER, ATTR_HTTP_REQUEST_METHOD, ATTR_URL_FULL } from "@opentelemetry/semantic-conventions";
 //#region deno.json
 var name = "@fedify/fedify";
-var version = "2.4.0-dev.2212+26ce9858";
+var version = "2.4.0-dev.2228+6d017d55";
 //#endregion
 //#region src/sig/portable-key-id.ts
 const COMPATIBLE_KEY_ID_PATH_PATTERN = /^\/\.well-known\/apgateway\/did(?::|%3A)/i;

package/dist/{http-ByBlnY3D.cjs → http-DC5DyShJ.cjs}

@@ -16,7 +16,7 @@ json_canon = require_rolldown_runtime.__toESM(json_canon, 1);
 let _opentelemetry_semantic_conventions = require("@opentelemetry/semantic-conventions");
 //#region deno.json
 var name = "@fedify/fedify";
-var version = "2.4.0-dev.2212+26ce9858";
+var version = "2.4.0-dev.2228+6d017d55";
 //#endregion
 //#region src/sig/portable-key-id.ts
 const COMPATIBLE_KEY_ID_PATH_PATTERN = /^\/\.well-known\/apgateway\/did(?::|%3A)/i;

package/dist/{http--IGUT1mg.mjs → http-DysQjjJe.mjs}

@@ -2,12 +2,12 @@ import { Temporal } from "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { m as parseKeyIdString } from "./portable-key-id-Ca30-hOa.mjs";
-import { n as version, t as name } from "./deno-BKp9fYB3.mjs";
-import { n as getDurationMs, r as getFederationMetrics, s as measureSignatureKeyFetch } from "./metrics-DPQKFkiJ.mjs";
+import { n as version, t as name } from "./deno-9flirCWb.mjs";
+import { n as getDurationMs, r as getFederationMetrics, s as measureSignatureKeyFetch } from "./metrics-X1lpKWRK.mjs";
 import { i as validateAcceptSignature, n as fulfillAcceptSignature, r as parseAcceptSignature } from "./accept-CPVqki78.mjs";
 import { a as promoteKeyOwnerEvidence } from "./key-owner-evidence-APB6NpSk.mjs";
-import { a as fetchKeyDetailed, c as validateCryptoKey, t as bypassKeyCacheReads } from "./key-ChfV9C3v.mjs";
-import { n as resolvePortableActorKey, r as verifyPortableGatewayKeyDocument } from "./portable-key-U3lW06QJ.mjs";
+import { a as fetchKeyDetailed, c as validateCryptoKey, t as bypassKeyCacheReads } from "./key-TtgqklZ1.mjs";
+import { n as resolvePortableActorKey, r as verifyPortableGatewayKeyDocument } from "./portable-key-DYr6MZUl.mjs";
 import { getLogger } from "@logtape/logtape";
 import { CryptographicKey } from "@fedify/vocab";
 import { SpanStatusCode, trace } from "@opentelemetry/api";

package/dist/{key-ChfV9C3v.mjs → key-TtgqklZ1.mjs}

@@ -2,8 +2,8 @@ import { Temporal } from "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { c as isPortableActorDocument, d as isPortableUri, l as isPortableId, m as parseKeyIdString, s as isCompatibleKeyId } from "./portable-key-id-Ca30-hOa.mjs";
-import { n as version, t as name } from "./deno-BKp9fYB3.mjs";
-import { _ as recordKeyLookup, n as getDurationMs, t as classifyFetchError } from "./metrics-DPQKFkiJ.mjs";
+import { n as version, t as name } from "./deno-9flirCWb.mjs";
+import { _ as recordKeyLookup, n as getDurationMs, t as classifyFetchError } from "./metrics-X1lpKWRK.mjs";
 import { n as attachKeyOwnerEvidence, t as MAX_PORTABLE_KEY_TTL } from "./key-owner-evidence-APB6NpSk.mjs";
 import { getLogger } from "@logtape/logtape";
 import { CryptographicKey, Multikey, Object as Object$1, isActor } from "@fedify/vocab";

package/dist/{kv-BhNbN8Ed.d.cts → kv-B2mzK5tl.d.cts}

@@ -41,14 +41,15 @@ interface KvStore {
   /**
   * Gets the value for the given key.
   * @param key The key to get the value for.
-  * @returns The value for the key, or `undefined` if the key does not exist.
+  * @returns The value for the key, including `null` if stored, or `undefined`
+  *          if the key does not exist.
   * @template T The type of the value to get.
   */
   get<T = unknown>(key: KvKey): Promise<T | undefined>;
   /**
   * Sets the value for the given key.
   * @param key The key to set the value for.
-  * @param value The value to set.
+  * @param value The value to set.  `null` is a storable value.
   * @param options Additional options for setting the value.
   */
   set(key: KvKey, value: unknown, options?: KvStoreSetOptions): Promise<void>;

package/dist/{kv-BhNbN8Ed.d.ts → kv-B2mzK5tl.d.ts}

@@ -41,14 +41,15 @@ interface KvStore {
   /**
   * Gets the value for the given key.
   * @param key The key to get the value for.
-  * @returns The value for the key, or `undefined` if the key does not exist.
+  * @returns The value for the key, including `null` if stored, or `undefined`
+  *          if the key does not exist.
   * @template T The type of the value to get.
   */
   get<T = unknown>(key: KvKey): Promise<T | undefined>;
   /**
   * Sets the value for the given key.
   * @param key The key to set the value for.
-  * @param value The value to set.
+  * @param value The value to set.  `null` is a storable value.
   * @param options Additional options for setting the value.
   */
   set(key: KvKey, value: unknown, options?: KvStoreSetOptions): Promise<void>;

package/dist/{kv-cache-DFIUR-E5.mjs → kv-cache-B7g5Tvl0.mjs}

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

package/dist/{kv-cache-DpwDPt9V.js → kv-cache-CgYK8siN.js}

@@ -1,6 +1,6 @@
 import { Temporal } from "temporal-polyfill";
 import { URLPattern } from "urlpattern-polyfill";
-import { G as validateCryptoKey, ot as recordDocumentCache, t as doubleKnock } from "./http-Di8yiDMY.js";
+import { G as validateCryptoKey, ot as recordDocumentCache, t as doubleKnock } from "./http-CHqz_Jp6.js";
 import { getLogger } from "@logtape/logtape";
 import { FetchError, UrlError, createActivityPubRequest, getRemoteDocument, logRequest, preloadedContexts, resolveDocumentLoaderTimeout, validatePublicUrl, withDocumentLoaderTimeout } from "@fedify/vocab-runtime";
 import { curry } from "es-toolkit";