@fedify/fedify 2.4.0-pr.936.41 → 2.5.0-dev.2271

package/dist/{builder-DonuxRl_.mjs → builder-Bda6LK7A.mjs}

@@ -1,12 +1,15 @@
 import "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-BHzKn9Ig.mjs";
-import { t as ActivityListenerSet } from "./activity-listener-BtTSxZWA.mjs";
+import { i as getPortableDid, l as isPortableId, n as getCanonicalPortableId } from "./portable-key-id-Ca30-hOa.mjs";
+import { n as version, t as name } from "./deno-oR5aJKpU.mjs";
+import { t as ActivityListenerSet } from "./activity-listener-C-BSbKI7.mjs";
 import { getLogger } from "@logtape/logtape";
 import { Router, RouterError, assertPath } from "@fedify/uri-template";
 import { Tombstone, getTypeId } from "@fedify/vocab";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
+import { fromCompatibleEf61Id, isGatewayUrl } from "@fedify/vocab-runtime";
+import { isCompatibleEf61Iri } from "@fedify/vocab-runtime/internal/portable-dereference";
 //#region src/federation/builder.ts
 const ACTOR_ALIAS_PREFIX = "actorAlias:";
 /**
@@ -52,12 +55,14 @@ var FederationBuilderImpl = class {
 	featuredTagsCallbacks;
 	inboxListeners;
 	outboxListeners;
+	inboxRequestFinishedHandler;
 	inboxErrorHandler;
 	outboxListenerErrorHandler;
 	outboxAuthorizePredicate;
 	mediaUploaderPath;
 	mediaUploaderCallback;
 	mediaUploaderAuthorizePredicate;
+	hashlinkMediaDispatcher;
 	sharedInboxKeyDispatcher;
 	unverifiedActivityHandler;
 	outboxPermanentFailureHandler;
@@ -69,6 +74,7 @@ var FederationBuilderImpl = class {
 	* Symbol registry for unique identification of unnamed symbols.
 	*/
 	#symbolRegistry = /* @__PURE__ */ new Map();
+	#collectionNames = /* @__PURE__ */ new Map();
 	constructor() {
 		this.router = new Router();
 		this.objectCallbacks = {};
@@ -85,7 +91,7 @@ var FederationBuilderImpl = class {
 	* specified.
 	*/
 	async build(options) {
-		const { FederationImpl } = await import("./middleware-CEctxBN6.mjs");
+		const { FederationImpl } = await import("./middleware-DWjrfpcz.mjs");
 		const f = new FederationImpl(options);
 		const trailingSlashInsensitiveValue = f.router.trailingSlashInsensitive;
 		f.router = this.router.clone();
@@ -96,6 +102,10 @@ var FederationBuilderImpl = class {
 		f.webFingerLinksDispatcher = this.webFingerLinksDispatcher;
 		f.objectCallbacks = { ...this.objectCallbacks };
 		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 };
@@ -107,12 +117,14 @@ var FederationBuilderImpl = class {
 		f.featuredTagsCallbacks = this.featuredTagsCallbacks == null ? void 0 : { ...this.featuredTagsCallbacks };
 		f.inboxListeners = this.inboxListeners?.clone();
 		f.outboxListeners = this.outboxListeners?.clone();
+		f.inboxRequestFinishedHandler = this.inboxRequestFinishedHandler;
 		f.inboxErrorHandler = this.inboxErrorHandler;
 		f.outboxListenerErrorHandler = this.outboxListenerErrorHandler;
 		f.outboxAuthorizePredicate = this.outboxAuthorizePredicate;
 		f.mediaUploaderPath = this.mediaUploaderPath;
 		f.mediaUploaderCallback = this.mediaUploaderCallback;
 		f.mediaUploaderAuthorizePredicate = this.mediaUploaderAuthorizePredicate;
+		f.hashlinkMediaDispatcher = this.hashlinkMediaDispatcher;
 		f.sharedInboxKeyDispatcher = this.sharedInboxKeyDispatcher;
 		f.unverifiedActivityHandler = this.unverifiedActivityHandler;
 		f.outboxPermanentFailureHandler = this.outboxPermanentFailureHandler;
@@ -154,38 +166,42 @@ var FederationBuilderImpl = class {
 				"federation",
 				"actor"
 			]);
+			const portable = actor.id != null && isPortableId(actor.id);
 			if (actor.id == null) logger.warn("Actor dispatcher returned an actor without an id property.  Set the property with Context.getActorUri(identifier).");
-			else if (actor.id.href != context.getActorUri(identifier).href) logger.warn("Actor dispatcher returned an actor with an id property that does not match the actor URI.  Set the property with Context.getActorUri(identifier).");
+			else if (!portable && actor.id.href != context.getActorUri(identifier).href) logger.warn("Actor dispatcher returned an actor with an id property that does not match the actor URI.  Set the property with Context.getActorUri(identifier).");
 			if (actor instanceof Tombstone) return actor;
+			if (portable && actor.id != null) warnPortableActorGateways(actor.id, actor.gateways);
+			if (actor.id != null && isCompatibleEf61Iri(actor.id)) warnCompatibleActorId(actor.id, actor.gateway);
+			if (portable) this.#warnPortableCollectionIds(context, identifier, actor);
 			if (this.followingCallbacks != null && this.followingCallbacks.dispatcher != null) {
 				if (actor.followingId == null) logger.warn("You configured a following collection dispatcher, but the actor does not have a following property.  Set the property with Context.getFollowingUri(identifier).");
-				else if (actor.followingId.href != context.getFollowingUri(identifier).href) logger.warn("You configured a following collection dispatcher, but the actor's following property does not match the following collection URI.  Set the property with Context.getFollowingUri(identifier).");
+				else if (!portable && actor.followingId.href != context.getFollowingUri(identifier).href) logger.warn("You configured a following collection dispatcher, but the actor's following property does not match the following collection URI.  Set the property with Context.getFollowingUri(identifier).");
 			}
 			if (this.followersCallbacks != null && this.followersCallbacks.dispatcher != null) {
 				if (actor.followersId == null) logger.warn("You configured a followers collection dispatcher, but the actor does not have a followers property.  Set the property with Context.getFollowersUri(identifier).");
-				else if (actor.followersId.href != context.getFollowersUri(identifier).href) logger.warn("You configured a followers collection dispatcher, but the actor's followers property does not match the followers collection URI.  Set the property with Context.getFollowersUri(identifier).");
+				else if (!portable && actor.followersId.href != context.getFollowersUri(identifier).href) logger.warn("You configured a followers collection dispatcher, but the actor's followers property does not match the followers collection URI.  Set the property with Context.getFollowersUri(identifier).");
 			}
 			if (this.outboxCallbacks != null && this.outboxCallbacks.dispatcher != null) {
 				if (actor?.outboxId == null) logger.warn("You configured an outbox collection dispatcher, but the actor does not have an outbox property.  Set the property with Context.getOutboxUri(identifier).");
-				else if (actor.outboxId.href != context.getOutboxUri(identifier).href) logger.warn("You configured an outbox collection dispatcher, but the actor's outbox property does not match the outbox collection URI.  Set the property with Context.getOutboxUri(identifier).");
+				else if (!portable && actor.outboxId.href != context.getOutboxUri(identifier).href) logger.warn("You configured an outbox collection dispatcher, but the actor's outbox property does not match the outbox collection URI.  Set the property with Context.getOutboxUri(identifier).");
 			}
 			if (this.likedCallbacks != null && this.likedCallbacks.dispatcher != null) {
 				if (actor?.likedId == null) logger.warn("You configured a liked collection dispatcher, but the actor does not have a liked property.  Set the property with Context.getLikedUri(identifier).");
-				else if (actor.likedId.href != context.getLikedUri(identifier).href) logger.warn("You configured a liked collection dispatcher, but the actor's liked property does not match the liked collection URI.  Set the property with Context.getLikedUri(identifier).");
+				else if (!portable && actor.likedId.href != context.getLikedUri(identifier).href) logger.warn("You configured a liked collection dispatcher, but the actor's liked property does not match the liked collection URI.  Set the property with Context.getLikedUri(identifier).");
 			}
 			if (this.featuredCallbacks != null && this.featuredCallbacks.dispatcher != null) {
 				if (actor?.featuredId == null) logger.warn("You configured a featured collection dispatcher, but the actor does not have a featured property.  Set the property with Context.getFeaturedUri(identifier).");
-				else if (actor.featuredId.href != context.getFeaturedUri(identifier).href) logger.warn("You configured a featured collection dispatcher, but the actor's featured property does not match the featured collection URI.  Set the property with Context.getFeaturedUri(identifier).");
+				else if (!portable && actor.featuredId.href != context.getFeaturedUri(identifier).href) logger.warn("You configured a featured collection dispatcher, but the actor's featured property does not match the featured collection URI.  Set the property with Context.getFeaturedUri(identifier).");
 			}
 			if (this.featuredTagsCallbacks != null && this.featuredTagsCallbacks.dispatcher != null) {
 				if (actor?.featuredTagsId == null) logger.warn("You configured a featured tags collection dispatcher, but the actor does not have a featuredTags property.  Set the property with Context.getFeaturedTagsUri(identifier).");
-				else if (actor.featuredTagsId.href != context.getFeaturedTagsUri(identifier).href) logger.warn("You configured a featured tags collection dispatcher, but the actor's featuredTags property does not match the featured tags collection URI.  Set the property with Context.getFeaturedTagsUri(identifier).");
+				else if (!portable && actor.featuredTagsId.href != context.getFeaturedTagsUri(identifier).href) logger.warn("You configured a featured tags collection dispatcher, but the actor's featuredTags property does not match the featured tags collection URI.  Set the property with Context.getFeaturedTagsUri(identifier).");
 			}
 			if (this.router.has("inbox")) {
 				if (actor.inboxId == null) logger.warn("You configured inbox listeners, but the actor does not have an inbox property.  Set the property with Context.getInboxUri(identifier).");
-				else if (actor.inboxId.href != context.getInboxUri(identifier).href) logger.warn("You configured inbox listeners, but the actor's inbox property does not match the inbox URI.  Set the property with Context.getInboxUri(identifier).");
+				else if (!portable && actor.inboxId.href != context.getInboxUri(identifier).href) logger.warn("You configured inbox listeners, but the actor's inbox property does not match the inbox URI.  Set the property with Context.getInboxUri(identifier).");
 				if (actor.endpoints == null || actor.endpoints.sharedInbox == null) logger.warn("You configured inbox listeners, but the actor does not have a endpoints.sharedInbox property.  Set the property with Context.getInboxUri().");
-				else if (actor.endpoints.sharedInbox.href != context.getInboxUri().href) logger.warn("You configured inbox listeners, but the actor's endpoints.sharedInbox property does not match the shared inbox URI.  Set the property with Context.getInboxUri().");
+				else if (!portable && actor.endpoints.sharedInbox.href != context.getInboxUri().href) logger.warn("You configured inbox listeners, but the actor's endpoints.sharedInbox property does not match the shared inbox URI.  Set the property with Context.getInboxUri().");
 			}
 			if (callbacks.keyPairsDispatcher != null) {
 				if (actor.publicKeyId == null) logger.warn("You configured a key pairs dispatcher, but the actor does not have a publicKey property.  Set the property with Context.getActorKeyPairs(identifier).");
@@ -229,6 +245,10 @@ var FederationBuilderImpl = class {
 				callbacks.aliasMapper = mapper;
 				return setters;
 			},
+			mapPortableActorId(mapper) {
+				callbacks.portableActorIdMapper = mapper;
+				return setters;
+			},
 			mapActorAlias: (path, identifier) => {
 				if (identifier === "") throw new RouterError("Identifier cannot be empty.");
 				if (this.router.has(`actorAlias:${identifier}`)) throw new RouterError(`Actor alias for "${identifier}" already set.`);
@@ -284,8 +304,8 @@ var FederationBuilderImpl = class {
 		const variables = Router.variables(path);
 		this.router.add(path, routeName);
 		const callbacks = {
-			dispatcher: (ctx, values) => {
-				return this._getTracer().startActiveSpan("activitypub.dispatch_object", {
+			dispatcher: async (ctx, values) => {
+				const object = await this._getTracer().startActiveSpan("activitypub.dispatch_object", {
 					kind: SpanKind.SERVER,
 					attributes: {
 						"fedify.object.type": cls.typeId.href,
@@ -308,6 +328,8 @@ var FederationBuilderImpl = class {
 						span.end();
 					}
 				});
+				if (object instanceof Tombstone) warnMismatchedTombstoneId(ctx, cls, values, object);
+				return object;
 			},
 			parameters: variables
 		};
@@ -419,6 +441,10 @@ var FederationBuilderImpl = class {
 		} };
 		return setters;
 	}
+	setHashlinkMediaDispatcher(dispatcher) {
+		if (this.hashlinkMediaDispatcher != null) throw new RouterError("Hashlink media dispatcher already set.");
+		this.hashlinkMediaDispatcher = dispatcher;
+	}
 	setFollowingDispatcher(path, dispatcher) {
 		if (this.router.has("following")) throw new RouterError("Following collection dispatcher already set.");
 		assertPath(path);
@@ -572,6 +598,10 @@ var FederationBuilderImpl = class {
 				this.inboxErrorHandler = handler;
 				return setters;
 			},
+			onRequestFinished: (handler) => {
+				this.inboxRequestFinishedHandler = handler;
+				return setters;
+			},
 			onUnverifiedActivity: (handler) => {
 				this.unverifiedActivityHandler = handler;
 				return setters;
@@ -612,6 +642,7 @@ var FederationBuilderImpl = class {
 		if (this.collectionCallbacks[name] != null) throw new RouterError(`Collection dispatcher for ${strName} already set.`);
 		assertPath(path);
 		if (Router.variables(path).size < 1) throw new 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;
@@ -632,6 +663,10 @@ var FederationBuilderImpl = class {
 			authorize(predicate) {
 				callbacks.authorizePredicate = predicate;
 				return setters;
+			},
+			mapPortableOwner(mapper) {
+				callbacks.portableOwnerMapper = mapper;
+				return setters;
 			}
 		};
 		return setters;
@@ -649,10 +684,62 @@ 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;
 	}
 	/**
+	* Warns if a portable actor's collection properties that are portable IDs
+	* or compatible identifiers do not refer to the collections that
+	* the registered collection dispatchers serve through the FEP-ef61 gateway
+	* endpoint for the actor's DID.  Properties with ordinary HTTP(S) URLs are
+	* not compared, since a portable actor may keep ordinary collections.
+	*/
+	#warnPortableCollectionIds(context, identifier, actor) {
+		const did = actor.id == null ? null : getPortableDid(actor.id);
+		if (did == null) return;
+		const logger = getLogger([
+			"fedify",
+			"federation",
+			"actor"
+		]);
+		const check = (registered, property, value, helper, build) => {
+			if (!registered || value == null || !isPortableId(value)) return;
+			const actual = getCanonicalPortableId(value);
+			if (actual == null) {
+				logger.warn("The actor's {property} property, {value}, is a malformed FEP-ef61 portable ID or compatible identifier.", {
+					property,
+					value: value.href
+				});
+				return;
+			}
+			let expected;
+			try {
+				expected = build();
+			} catch (error) {
+				if (error instanceof TypeError || error instanceof RouterError) return;
+				throw error;
+			}
+			if (actual === getCanonicalPortableId(expected)) return;
+			logger.warn("The portable actor's {property} property, {value}, does not match the portable ID of the collection that the gateway endpoint serves, {expected}.  Set the property with Context.{helper}(identifier, did).", {
+				property,
+				value: value.href,
+				expected: expected.href,
+				helper
+			});
+		};
+		check(this.outboxCallbacks?.dispatcher != null, "outbox", actor.outboxId, "getPortableOutboxUri", () => context.getPortableOutboxUri(identifier, did));
+		check(this.inboxCallbacks?.dispatcher != null || this.router.has("inbox"), "inbox", actor.inboxId, "getPortableInboxUri", () => context.getPortableInboxUri(identifier, did));
+		check(this.followingCallbacks?.dispatcher != null, "following", actor.followingId, "getPortableFollowingUri", () => context.getPortableFollowingUri(identifier, did));
+		check(this.followersCallbacks?.dispatcher != null, "followers", actor.followersId, "getPortableFollowersUri", () => context.getPortableFollowersUri(identifier, did));
+		check(this.likedCallbacks?.dispatcher != null, "liked", actor.likedId, "getPortableLikedUri", () => context.getPortableLikedUri(identifier, did));
+		check(this.featuredCallbacks?.dispatcher != null, "featured", actor.featuredId, "getPortableFeaturedUri", () => context.getPortableFeaturedUri(identifier, did));
+		check(this.featuredTagsCallbacks?.dispatcher != null, "featuredTags", actor.featuredTagsId, "getPortableFeaturedTagsUri", () => context.getPortableFeaturedTagsUri(identifier, did));
+	}
+	/**
 	* Converts a name (string or symbol) to a unique string identifier.
 	* For symbols, generates and caches a UUID if not already present.
 	* For strings, returns the string as-is.
@@ -673,5 +760,73 @@ var FederationBuilderImpl = class {
 function createFederationBuilder() {
 	return new FederationBuilderImpl();
 }
+function warnMismatchedTombstoneId(context, cls, values, tombstone) {
+	const logger = getLogger([
+		"fedify",
+		"federation",
+		"object"
+	]);
+	if (tombstone.id == null) {
+		logger.warn("Object dispatcher for {class} returned a tombstone without an id property.  Set the property with Context.getObjectUri().", {
+			class: cls.name,
+			values
+		});
+		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,
+		values,
+		tombstoneId: tombstone.id.href,
+		objectUri: expected.href
+	});
+}
+/**
+* Warns about an FEP-ef61 portable actor whose `gateways` is empty or has
+* an item that is not an HTTP(S) origin, which FEP-ef61 does not allow.
+* Every item is checked, since the list and its URLs can be mutated after
+* the actor is constructed.
+*/
+function warnPortableActorGateways(actorId, gateways) {
+	if (gateways.length > 0 && gateways.every(isGatewayUrl)) return;
+	getLogger([
+		"fedify",
+		"federation",
+		"actor"
+	]).warn("Actor dispatcher returned an FEP-ef61 portable actor, {actorId}, whose gateways property is empty or has an item that is not an HTTP(S) origin.  FEP-ef61 requires a portable actor to have at least one gateway, and every gateway to be an HTTP(S) URI with an empty path, query, and fragment.  Set the gateways property.", {
+		actorId: actorId.href,
+		gateways: gateways.map((g) => g.href)
+	});
+}
+/**
+* Warns about an FEP-ef61 portable actor identified by a compatible identifier
+* that is malformed, or is not on the actor's first gateway, where FEP-ef61
+* requires publishers to construct compatible identifiers.  A missing or
+* invalid first gateway is reported by {@link warnPortableActorGateways}
+* instead.
+*/
+function warnCompatibleActorId(actorId, gateway) {
+	const logger = getLogger([
+		"fedify",
+		"federation",
+		"actor"
+	]);
+	try {
+		fromCompatibleEf61Id(actorId);
+	} catch (error) {
+		if (!(error instanceof TypeError)) throw error;
+		logger.warn("Actor dispatcher returned an actor whose id property, {actorId}, is a malformed FEP-ef61 compatible identifier: {error}", {
+			actorId: actorId.href,
+			error
+		});
+		return;
+	}
+	if (gateway == null || !isGatewayUrl(gateway)) return;
+	if (actorId.origin !== gateway.origin) logger.warn("Actor dispatcher returned an actor whose id property, {actorId}, is an FEP-ef61 compatible identifier on another gateway than its first gateway, {gateway}.  FEP-ef61 requires publishers to construct compatible identifiers with the first gateway in the actor's gateways.", {
+		actorId: actorId.href,
+		gateway: gateway.origin
+	});
+}
 //#endregion
 export { FederationBuilderImpl as n, createFederationBuilder as r, ACTOR_ALIAS_PREFIX as t };