@fedify/fedify 2.0.0-pr.490.2 → 2.0.0-pr.559.4

package/dist/{middleware-BIqFwRwI.js → middleware-WokE4qxc.js}

@@ -3,25 +3,28 @@
       import { URLPattern } from "urlpattern-polyfill";
       globalThis.addEventListener = () => {};
     
-import { Activity, Collection, CollectionPage, CryptographicKey, Link, Multikey, Object as Object$1, OrderedCollection, OrderedCollectionPage, RouterError, deno_default, getTypeId, lookupObject, lookupWebFinger, traverseCollection } from "./lookup-Dj9-mgOn.js";
-import { getNodeInfo } from "./client-pY7-3icS.js";
-import { nodeInfoToJson } from "./types-C2XVl6gj.js";
-import { exportJwk, importJwk, validateCryptoKey } from "./key-x7E5PYI0.js";
-import { verifyRequest } from "./http-DH47B-h3.js";
-import { detachSignature, hasSignature, signJsonLd, verifyJsonLd } from "./ld-CRPaU6c8.js";
-import { doesActorOwnKey, getKeyOwner } from "./owner-CIWnopkT.js";
-import { signObject, verifyObject } from "./proof-D-5ri6rf.js";
-import { getAuthenticatedDocumentLoader } from "./docloader-DndkGj0O.js";
-import { kvCache } from "./kv-cache-DN9pfMBe.js";
-import { routeActivity } from "./inbox-CEyHvxOo.js";
-import { FederationBuilderImpl } from "./builder-4syLV1-z.js";
-import { buildCollectionSynchronizationHeader } from "./collection-BzWsN9pB.js";
-import { KvKeyCache } from "./keycache-BRXuBDuy.js";
-import { acceptsJsonLd } from "./negotiation-C4nFufNk.js";
-import { createExponentialBackoffPolicy } from "./retry-CfF8Gn4d.js";
-import { extractInboxes, sendActivity } from "./send-CPGk9QKZ.js";
-import { getDocumentLoader } from "@fedify/vocab-runtime";
+import { deno_default } from "./deno-DGx1JZHr.js";
+import { getNodeInfo } from "./client-Dg7OfUDA.js";
+import { RouterError } from "./router-D9eI0s4b.js";
+import { nodeInfoToJson } from "./types-CPz01LGH.js";
+import { exportJwk, importJwk, validateCryptoKey } from "./key-BCtt1Ugy.js";
+import { verifyRequest } from "./http-LGtYlSfN.js";
+import { detachSignature, hasSignature, signJsonLd, verifyJsonLd } from "./ld-QlZPwGEH.js";
+import { doesActorOwnKey, getKeyOwner } from "./owner-Cejm-F7S.js";
+import { signObject, verifyObject } from "./proof-BOQBHd-i.js";
+import { getAuthenticatedDocumentLoader } from "./docloader-D8UHsyqD.js";
+import { kvCache } from "./kv-cache-B__dHl7g.js";
+import { routeActivity } from "./inbox-DbtWQY2D.js";
+import { FederationBuilderImpl } from "./builder-DTlQwmVF.js";
+import { buildCollectionSynchronizationHeader } from "./collection-CcnIw1qY.js";
+import { KvKeyCache } from "./keycache-DRxpZ5r9.js";
+import { acceptsJsonLd } from "./negotiation-5NPJL6zp.js";
+import { createExponentialBackoffPolicy } from "./retry-D4GJ670a.js";
+import { SendActivityError, extractInboxes, sendActivity } from "./send-jFxXfsN8.js";
 import { getLogger, withContext } from "@logtape/logtape";
+import { Activity, Collection, CollectionPage, CryptographicKey, Link, Multikey, Object as Object$1, OrderedCollection, OrderedCollectionPage, getTypeId, lookupObject, traverseCollection } from "@fedify/vocab";
+import { getDocumentLoader } from "@fedify/vocab-runtime";
+import { lookupWebFinger } from "@fedify/webfinger";
 import { SpanKind, SpanStatusCode, context, propagation, trace } from "@opentelemetry/api";
 import { ATTR_HTTP_REQUEST_HEADER, ATTR_HTTP_REQUEST_METHOD, ATTR_HTTP_RESPONSE_HEADER, ATTR_HTTP_RESPONSE_STATUS_CODE, ATTR_URL_FULL } from "@opentelemetry/semantic-conventions";
 import { domainToASCII } from "node:url";
@@ -62,7 +65,7 @@ function autoIdAssigner(activity, context$1) {
 * activity like this:
 *
 * ```typescript
-* import { Follow, Person } from "@fedify/fedify/vocab";
+* import { Follow, Person } from "@fedify/vocab";
 * const input = new Follow({
 *   id: new URL("http://example.com/activities/1"),
 *   actor: new Person({
@@ -81,7 +84,7 @@ function autoIdAssigner(activity, context$1) {
 * The result of applying this transformer would be:
 *
 * ```typescript
-* import { Follow, Person } from "@fedify/fedify/vocab";
+* import { Follow, Person } from "@fedify/vocab";
 * const output = new Follow({
 *   id: new URL("http://example.com/activities/1"),
 *   actor: new URL("http://example.com/actors/1"),
@@ -154,151 +157,6 @@ function handleNodeInfoJrd(_request, context$1) {
 	return Promise.resolve(response);
 }
 
-//#endregion
-//#region src/vocab/constants.ts
-/**
-* The special public collection for [public addressing].  *Do not mutate this
-* object.*
-*
-* [public addressing]: https://www.w3.org/TR/activitypub/#public-addressing
-*
-* @since 0.7.0
-*/
-const PUBLIC_COLLECTION = new URL("https://www.w3.org/ns/activitystreams#Public");
-
-//#endregion
-//#region src/webfinger/handler.ts
-const logger = getLogger([
-	"fedify",
-	"webfinger",
-	"server"
-]);
-/**
-* Handles a WebFinger request.  You would not typically call this function
-* directly, but instead use {@link Federation.fetch} method.
-* @param request The WebFinger request to handle.
-* @param parameters The parameters for handling the request.
-* @returns The response to the request.
-*/
-async function handleWebFinger(request, options) {
-	if (options.tracer == null) return await handleWebFingerInternal(request, options);
-	return await options.tracer.startActiveSpan("webfinger.handle", { kind: SpanKind.SERVER }, async (span) => {
-		try {
-			const response = await handleWebFingerInternal(request, options);
-			span.setStatus({ code: response.ok ? SpanStatusCode.UNSET : SpanStatusCode.ERROR });
-			return response;
-		} catch (error) {
-			span.setStatus({
-				code: SpanStatusCode.ERROR,
-				message: String(error)
-			});
-			throw error;
-		} finally {
-			span.end();
-		}
-	});
-}
-async function handleWebFingerInternal(request, { context: context$1, host, actorDispatcher, actorHandleMapper, actorAliasMapper, onNotFound, span, webFingerLinksDispatcher }) {
-	if (actorDispatcher == null) {
-		logger.error("Actor dispatcher is not set.");
-		return await onNotFound(request);
-	}
-	const resource = context$1.url.searchParams.get("resource");
-	if (resource == null) return new Response("Missing resource parameter.", { status: 400 });
-	span?.setAttribute("webfinger.resource", resource);
-	let resourceUrl;
-	try {
-		resourceUrl = new URL(resource);
-	} catch (e) {
-		if (e instanceof TypeError) return new Response("Invalid resource URL.", { status: 400 });
-		throw e;
-	}
-	span?.setAttribute("webfinger.resource.scheme", resourceUrl.protocol.replace(/:$/, ""));
-	async function mapUsernameToIdentifier(username) {
-		if (actorHandleMapper == null) {
-			logger.error("No actor handle mapper is set; use the WebFinger username {username} as the actor's internal identifier.", { username });
-			return username;
-		}
-		const identifier$1 = await actorHandleMapper(context$1, username);
-		if (identifier$1 == null) {
-			logger.error("Actor {username} not found.", { username });
-			return null;
-		}
-		return identifier$1;
-	}
-	let identifier = null;
-	const uriParsed = context$1.parseUri(resourceUrl);
-	if (uriParsed?.type != "actor") {
-		const match = /^acct:([^@]+)@([^@]+)$/.exec(resource);
-		if (match == null) {
-			const result = await actorAliasMapper?.(context$1, resourceUrl);
-			if (result == null) return await onNotFound(request);
-			if ("identifier" in result) identifier = result.identifier;
-			else identifier = await mapUsernameToIdentifier(result.username);
-		} else {
-			const portMatch = /:\d+$/.exec(match[2]);
-			const normalizedHost = portMatch == null ? domainToASCII(match[2].toLowerCase()) : domainToASCII(match[2].substring(0, portMatch.index).toLowerCase()) + portMatch[0];
-			if (normalizedHost != context$1.url.host && normalizedHost != host) return await onNotFound(request);
-			else {
-				identifier = await mapUsernameToIdentifier(match[1]);
-				resourceUrl = new URL(`acct:${match[1]}@${normalizedHost}`);
-			}
-		}
-	} else identifier = uriParsed.identifier;
-	if (identifier == null) return await onNotFound(request);
-	const actor = await actorDispatcher(context$1, identifier);
-	if (actor == null) {
-		logger.error("Actor {identifier} not found.", { identifier });
-		return await onNotFound(request);
-	}
-	const links = [{
-		rel: "self",
-		href: context$1.getActorUri(identifier).href,
-		type: "application/activity+json"
-	}];
-	for (const url of actor.urls) if (url instanceof Link && url.href != null) links.push({
-		rel: url.rel ?? "http://webfinger.net/rel/profile-page",
-		href: url.href.href,
-		type: url.mediaType == null ? void 0 : url.mediaType
-	});
-	else if (url instanceof URL) links.push({
-		rel: "http://webfinger.net/rel/profile-page",
-		href: url.href
-	});
-	for await (const image of actor.getIcons()) {
-		if (image.url?.href == null) continue;
-		const link = {
-			rel: "http://webfinger.net/rel/avatar",
-			href: image.url.href.toString()
-		};
-		if (image.mediaType != null) link.type = image.mediaType;
-		links.push(link);
-	}
-	if (webFingerLinksDispatcher != null) {
-		const customLinks = await webFingerLinksDispatcher(context$1, resourceUrl);
-		if (customLinks != null) for (const link of customLinks) links.push(link);
-	}
-	const aliases = [];
-	if (resourceUrl.protocol != "acct:" && actor.preferredUsername != null) {
-		aliases.push(`acct:${actor.preferredUsername}@${host ?? context$1.url.host}`);
-		if (host != null && host !== context$1.url.host) aliases.push(`acct:${actor.preferredUsername}@${context$1.url.host}`);
-	}
-	if (resourceUrl.href !== context$1.getActorUri(identifier).href) aliases.push(context$1.getActorUri(identifier).href);
-	if (resourceUrl.protocol === "acct:" && host != null && host !== context$1.url.host && !resourceUrl.href.endsWith(`@${host}`)) {
-		const username = resourceUrl.href.replace(/^acct:/, "").replace(/@.*$/, "");
-		aliases.push(`acct:${username}@${host}`);
-	}
-	const jrd = {
-		subject: resourceUrl.href,
-		aliases,
-		links
-	};
-	return new Response(JSON.stringify(jrd), { headers: {
-		"Content-Type": "application/jrd+json",
-		"Access-Control-Allow-Origin": "*"
-	} });
-}
-
 //#endregion
 //#region src/federation/handler.ts
 /**
@@ -1289,6 +1147,138 @@ async function respondWithObjectIfAcceptable(object, request, options) {
 	return response;
 }
 
+//#endregion
+//#region src/federation/webfinger.ts
+const logger = getLogger([
+	"fedify",
+	"webfinger",
+	"server"
+]);
+/**
+* Handles a WebFinger request.  You would not typically call this function
+* directly, but instead use {@link Federation.fetch} method.
+* @param request The WebFinger request to handle.
+* @param parameters The parameters for handling the request.
+* @returns The response to the request.
+*/
+async function handleWebFinger(request, options) {
+	if (options.tracer == null) return await handleWebFingerInternal(request, options);
+	return await options.tracer.startActiveSpan("webfinger.handle", { kind: SpanKind.SERVER }, async (span) => {
+		try {
+			const response = await handleWebFingerInternal(request, options);
+			span.setStatus({ code: response.ok ? SpanStatusCode.UNSET : SpanStatusCode.ERROR });
+			return response;
+		} catch (error) {
+			span.setStatus({
+				code: SpanStatusCode.ERROR,
+				message: String(error)
+			});
+			throw error;
+		} finally {
+			span.end();
+		}
+	});
+}
+async function handleWebFingerInternal(request, { context: context$1, host, actorDispatcher, actorHandleMapper, actorAliasMapper, onNotFound, span, webFingerLinksDispatcher }) {
+	if (actorDispatcher == null) {
+		logger.error("Actor dispatcher is not set.");
+		return await onNotFound(request);
+	}
+	const resource = context$1.url.searchParams.get("resource");
+	if (resource == null) return new Response("Missing resource parameter.", { status: 400 });
+	span?.setAttribute("webfinger.resource", resource);
+	let resourceUrl;
+	try {
+		resourceUrl = new URL(resource);
+	} catch (e) {
+		if (e instanceof TypeError) return new Response("Invalid resource URL.", { status: 400 });
+		throw e;
+	}
+	span?.setAttribute("webfinger.resource.scheme", resourceUrl.protocol.replace(/:$/, ""));
+	async function mapUsernameToIdentifier(username) {
+		if (actorHandleMapper == null) {
+			logger.error("No actor handle mapper is set; use the WebFinger username {username} as the actor's internal identifier.", { username });
+			return username;
+		}
+		const identifier$1 = await actorHandleMapper(context$1, username);
+		if (identifier$1 == null) {
+			logger.error("Actor {username} not found.", { username });
+			return null;
+		}
+		return identifier$1;
+	}
+	let identifier = null;
+	const uriParsed = context$1.parseUri(resourceUrl);
+	if (uriParsed?.type != "actor") {
+		const match = /^acct:([^@]+)@([^@]+)$/.exec(resource);
+		if (match == null) {
+			const result = await actorAliasMapper?.(context$1, resourceUrl);
+			if (result == null) return await onNotFound(request);
+			if ("identifier" in result) identifier = result.identifier;
+			else identifier = await mapUsernameToIdentifier(result.username);
+		} else {
+			const portMatch = /:\d+$/.exec(match[2]);
+			const normalizedHost = portMatch == null ? domainToASCII(match[2].toLowerCase()) : domainToASCII(match[2].substring(0, portMatch.index).toLowerCase()) + portMatch[0];
+			if (normalizedHost != context$1.url.host && normalizedHost != host) return await onNotFound(request);
+			else {
+				identifier = await mapUsernameToIdentifier(match[1]);
+				resourceUrl = new URL(`acct:${match[1]}@${normalizedHost}`);
+			}
+		}
+	} else identifier = uriParsed.identifier;
+	if (identifier == null) return await onNotFound(request);
+	const actor = await actorDispatcher(context$1, identifier);
+	if (actor == null) {
+		logger.error("Actor {identifier} not found.", { identifier });
+		return await onNotFound(request);
+	}
+	const links = [{
+		rel: "self",
+		href: context$1.getActorUri(identifier).href,
+		type: "application/activity+json"
+	}];
+	for (const url of actor.urls) if (url instanceof Link && url.href != null) links.push({
+		rel: url.rel ?? "http://webfinger.net/rel/profile-page",
+		href: url.href.href,
+		type: url.mediaType == null ? void 0 : url.mediaType
+	});
+	else if (url instanceof URL) links.push({
+		rel: "http://webfinger.net/rel/profile-page",
+		href: url.href
+	});
+	for await (const image of actor.getIcons()) {
+		if (image.url?.href == null) continue;
+		links.push({
+			rel: "http://webfinger.net/rel/avatar",
+			href: image.url.href.toString(),
+			...image.mediaType != null && { type: image.mediaType }
+		});
+	}
+	if (webFingerLinksDispatcher != null) {
+		const customLinks = await webFingerLinksDispatcher(context$1, resourceUrl);
+		if (customLinks != null) for (const link of customLinks) links.push(link);
+	}
+	const aliases = [];
+	if (resourceUrl.protocol != "acct:" && actor.preferredUsername != null) {
+		aliases.push(`acct:${actor.preferredUsername}@${host ?? context$1.url.host}`);
+		if (host != null && host !== context$1.url.host) aliases.push(`acct:${actor.preferredUsername}@${context$1.url.host}`);
+	}
+	if (resourceUrl.href !== context$1.getActorUri(identifier).href) aliases.push(context$1.getActorUri(identifier).href);
+	if (resourceUrl.protocol === "acct:" && host != null && host !== context$1.url.host && !resourceUrl.href.endsWith(`@${host}`)) {
+		const username = resourceUrl.href.replace(/^acct:/, "").replace(/@.*$/, "");
+		aliases.push(`acct:${username}@${host}`);
+	}
+	const jrd = {
+		subject: resourceUrl.href,
+		aliases,
+		links
+	};
+	return new Response(JSON.stringify(jrd), { headers: {
+		"Content-Type": "application/jrd+json",
+		"Access-Control-Allow-Origin": "*"
+	} });
+}
+
 //#endregion
 //#region src/federation/middleware.ts
 /**
@@ -1317,6 +1307,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 	allowPrivateAddress;
 	userAgent;
 	onOutboxError;
+	permanentFailureStatusCodes;
 	signatureTimeWindow;
 	skipSignatureVerification;
 	outboxRetryPolicy;
@@ -1398,6 +1389,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 		}));
 		this.userAgent = userAgent;
 		this.onOutboxError = options.onOutboxError;
+		this.permanentFailureStatusCodes = options.permanentFailureStatusCodes ?? [404, 410];
 		this.signatureTimeWindow = options.signatureTimeWindow ?? { hours: 1 };
 		this.skipSignatureVerification = options.skipSignatureVerification ?? false;
 		this.outboxRetryPolicy = options.outboxRetryPolicy ?? createExponentialBackoffPolicy();
@@ -1528,6 +1520,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 		}) });
 		await this.sendActivity(keys, message.inboxes, activity, {
 			collectionSync: message.collectionSync,
+			orderingKey: message.orderingKey,
 			context: context$1
 		});
 	}
@@ -1579,13 +1572,44 @@ var FederationImpl = class extends FederationBuilderImpl {
 				tracerProvider: this.tracerProvider
 			});
 			try {
-				this.onOutboxError?.(error, activity);
+				await this.onOutboxError?.(error, activity);
 			} catch (error$1) {
 				logger$2.error("An unexpected error occurred in onError handler:\n{error}", {
 					...logData,
 					error: error$1
 				});
 			}
+			if (error instanceof SendActivityError && this.permanentFailureStatusCodes.includes(error.statusCode)) {
+				logger$2.warn("Permanent delivery failure for activity {activityId} to {inbox} ({status}); not retrying.", {
+					...logData,
+					status: error.statusCode
+				});
+				if (this.outboxPermanentFailureHandler != null) {
+					const ctx = this.#createContext(new URL(message.baseUrl), _, { documentLoader: this.documentLoaderFactory(loaderOptions) });
+					try {
+						await this.outboxPermanentFailureHandler(ctx, {
+							inbox: new URL(message.inbox),
+							activity,
+							error,
+							statusCode: error.statusCode,
+							actorIds: (message.actorIds ?? []).flatMap((id) => {
+								try {
+									return [new URL(id)];
+								} catch {
+									logger$2.warn("Invalid actorId URL in OutboxMessage: {id}", { id });
+									return [];
+								}
+							})
+						});
+					} catch (handlerError) {
+						logger$2.error("An unexpected error occurred in outboxPermanentFailureHandler:\n{error}", {
+							...logData,
+							error: handlerError
+						});
+					}
+				}
+				return;
+			}
 			if (this.outboxQueue?.nativeRetrial) {
 				logger$2.error("Failed to send activity {activityId} to {inbox}; backend will handle retry:\n{error}", {
 					...logData,
@@ -1776,7 +1800,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 			"federation",
 			"outbox"
 		]);
-		const { immediate, collectionSync, context: ctx } = options;
+		const { immediate, collectionSync, orderingKey, context: ctx } = options;
 		if (activity.id == null) throw new TypeError("The activity to send must have an id.");
 		if (activity.actorId == null) throw new TypeError("The activity to send must have at least one actor property.");
 		else if (keys.length < 1) throw new TypeError("The keys must not be empty.");
@@ -1864,6 +1888,8 @@ var FederationImpl = class extends FederationBuilderImpl {
 		propagation.inject(context.active(), carrier);
 		const messages = [];
 		for (const inbox in inboxes) {
+			const inboxOrigin = new URL(inbox).origin;
+			const messageOrderingKey = orderingKey == null ? void 0 : `${orderingKey}\n${inboxOrigin}`;
 			const message = {
 				type: "outbox",
 				id: crypto.randomUUID(),
@@ -1874,16 +1900,33 @@ var FederationImpl = class extends FederationBuilderImpl {
 				activityType: getTypeId(activity).href,
 				inbox,
 				sharedInbox: inboxes[inbox].sharedInbox,
+				actorIds: [...inboxes[inbox].actorIds],
 				started: (/* @__PURE__ */ new Date()).toISOString(),
 				attempt: 0,
 				headers: collectionSync == null ? {} : { "Collection-Synchronization": await buildCollectionSynchronizationHeader(collectionSync, inboxes[inbox].actorIds) },
+				orderingKey: messageOrderingKey,
 				traceContext: carrier
 			};
-			messages.push(message);
+			messages.push({
+				message,
+				orderingKey: messageOrderingKey
+			});
 		}
 		const { outboxQueue } = this;
 		if (outboxQueue.enqueueMany == null) {
-			const promises = messages.map((m) => outboxQueue.enqueue(m));
+			const promises = messages.map((m) => outboxQueue.enqueue(m.message, { orderingKey: m.orderingKey }));
+			const results = await Promise.allSettled(promises);
+			const errors = results.filter((r) => r.status === "rejected").map((r) => r.reason);
+			if (errors.length > 0) {
+				logger$2.error("Failed to enqueue activity {activityId} to send later: {errors}", {
+					activityId: activity.id.href,
+					errors
+				});
+				if (errors.length > 1) throw new AggregateError(errors, `Failed to enqueue activity ${activityId} to send later.`);
+				throw errors[0];
+			}
+		} else if (orderingKey != null) {
+			const promises = messages.map((m) => outboxQueue.enqueue(m.message, { orderingKey: m.orderingKey }));
 			const results = await Promise.allSettled(promises);
 			const errors = results.filter((r) => r.status === "rejected").map((r) => r.reason);
 			if (errors.length > 0) {
@@ -1895,7 +1938,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 				throw errors[0];
 			}
 		} else try {
-			await outboxQueue.enqueueMany(messages);
+			await outboxQueue.enqueueMany(messages.map((m) => m.message));
 		} catch (error) {
 			logger$2.error("Failed to enqueue activity {activityId} to send later: {error}", {
 				activityId: activity.id.href,
@@ -2611,20 +2654,25 @@ var ContextImpl = class ContextImpl {
 		} else keys = [sender];
 		if (keys.length < 1) throw new TypeError("The sender's keys must not be empty.");
 		for (const { privateKey } of keys) validateCryptoKey(privateKey, "private");
-		const opts = { context: this };
 		let expandedRecipients;
+		let collectionSync;
 		if (Array.isArray(recipients)) expandedRecipients = recipients;
 		else if (recipients === "followers") {
 			if (identifier == null) throw new Error("If recipients is \"followers\", sender must be an actor identifier or username.");
 			expandedRecipients = [];
 			for await (const recipient of this.getFollowers(identifier)) expandedRecipients.push(recipient);
 			if (options.syncCollection) try {
-				opts.collectionSync = this.getFollowersUri(identifier).href;
+				collectionSync = this.getFollowersUri(identifier).href;
 			} catch (error) {
-				if (error instanceof RouterError) opts.collectionSync = void 0;
-				else throw error;
+				if (!(error instanceof RouterError)) throw error;
 			}
 		} else expandedRecipients = [recipients];
+		const opts = {
+			context: this,
+			orderingKey: options.orderingKey,
+			collectionSync,
+			immediate: options.immediate
+		};
 		span.setAttribute("activitypub.inboxes", expandedRecipients.length);
 		for (const activityTransformer of this.federation.activityTransformers) activity = activityTransformer(activity, this);
 		span?.setAttribute("activitypub.activity.id", activity?.id?.href ?? "");
@@ -2671,10 +2719,11 @@ var ContextImpl = class ContextImpl {
 			activityId: activity.id?.href,
 			activityType: getTypeId(activity).href,
 			collectionSync: opts.collectionSync,
+			orderingKey: options.orderingKey,
 			traceContext: carrier
 		};
 		if (!this.federation.manuallyStartQueue) this.federation._startQueueInternal(this.data);
-		this.federation.fanoutQueue.enqueue(message);
+		this.federation.fanoutQueue.enqueue(message, { orderingKey: options.orderingKey });
 	}
 	async *getFollowers(identifier) {
 		if (this.federation.followersCallbacks == null) throw new Error("No followers collection dispatcher registered.");
@@ -3026,8 +3075,10 @@ var InboxContextImpl = class InboxContextImpl extends ContextImpl {
 		}
 		const carrier = {};
 		propagation.inject(context.active(), carrier);
+		const orderingKey = options?.orderingKey;
 		const messages = [];
 		for (const inbox in inboxes) {
+			const inboxUrl = new URL(inbox);
 			const message = {
 				type: "outbox",
 				id: crypto.randomUUID(),
@@ -3041,13 +3092,29 @@ var InboxContextImpl = class InboxContextImpl extends ContextImpl {
 				started: (/* @__PURE__ */ new Date()).toISOString(),
 				attempt: 0,
 				headers: {},
+				orderingKey: orderingKey == null ? void 0 : `${orderingKey}\n${inboxUrl.origin}`,
 				traceContext: carrier
 			};
-			messages.push(message);
+			messages.push({
+				message,
+				orderingKey: message.orderingKey
+			});
 		}
 		const { outboxQueue } = this.federation;
 		if (outboxQueue.enqueueMany == null) {
-			const promises = messages.map((m) => outboxQueue.enqueue(m));
+			const promises = messages.map((m) => outboxQueue.enqueue(m.message, { orderingKey: m.orderingKey }));
+			const results = await Promise.allSettled(promises);
+			const errors = results.filter((r) => r.status === "rejected").map((r) => r.reason);
+			if (errors.length > 0) {
+				logger$2.error("Failed to enqueue activity {activityId} to forward later:\n{errors}", {
+					activityId: this.activityId,
+					errors
+				});
+				if (errors.length > 1) throw new AggregateError(errors, `Failed to enqueue activity ${this.activityId} to forward later.`);
+				throw errors[0];
+			}
+		} else if (orderingKey != null) {
+			const promises = messages.map((m) => outboxQueue.enqueue(m.message, { orderingKey: m.orderingKey }));
 			const results = await Promise.allSettled(promises);
 			const errors = results.filter((r) => r.status === "rejected").map((r) => r.reason);
 			if (errors.length > 0) {
@@ -3059,7 +3126,7 @@ var InboxContextImpl = class InboxContextImpl extends ContextImpl {
 				throw errors[0];
 			}
 		} else try {
-			await outboxQueue.enqueueMany(messages);
+			await outboxQueue.enqueueMany(messages.map((m) => m.message));
 		} catch (error) {
 			logger$2.error("Failed to enqueue activity {activityId} to forward later:\n{error}", {
 				activityId: this.activityId,