@fedify/fedify 2.0.0-dev.241 → 2.0.0-dev.323

package/dist/{middleware-DbwwSEOr.js → middleware-DaOdxVOc.js}

@@ -3,24 +3,24 @@
       import { URLPattern } from "urlpattern-polyfill";
       globalThis.addEventListener = () => {};
     
-import { deno_default } from "./deno-DOeSTfhz.js";
+import { deno_default } from "./deno-BTAi5-ur.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-3_vbTfr8.js";
-import { verifyRequest } from "./http-DGkEl4mw.js";
-import { detachSignature, hasSignature, signJsonLd, verifyJsonLd } from "./ld-BQxhMgOJ.js";
-import { doesActorOwnKey, getKeyOwner } from "./owner-Bod8mCab.js";
-import { signObject, verifyObject } from "./proof--60Adidu.js";
-import { getAuthenticatedDocumentLoader } from "./docloader-C1AGOQQm.js";
+import { exportJwk, importJwk, validateCryptoKey } from "./key-BI6sqU5u.js";
+import { verifyRequest } from "./http-C4WANccp.js";
+import { detachSignature, hasSignature, signJsonLd, verifyJsonLd } from "./ld-qTcTL2A4.js";
+import { doesActorOwnKey, getKeyOwner } from "./owner-Cfmtlwoe.js";
+import { signObject, verifyObject } from "./proof-Bc8ULrzP.js";
+import { getAuthenticatedDocumentLoader } from "./docloader-D8dzb6AT.js";
 import { kvCache } from "./kv-cache-B__dHl7g.js";
-import { routeActivity } from "./inbox-Cp87HRVs.js";
-import { FederationBuilderImpl } from "./builder-CR-ZQZJR.js";
+import { routeActivity } from "./inbox-CdBcxHA7.js";
+import { FederationBuilderImpl } from "./builder-CvKuNW7P.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 { extractInboxes, sendActivity } from "./send-B3fWpYN9.js";
+import { extractInboxes, sendActivity } from "./send-BKW3wSXo.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";
@@ -1518,6 +1518,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 		}) });
 		await this.sendActivity(keys, message.inboxes, activity, {
 			collectionSync: message.collectionSync,
+			orderingKey: message.orderingKey,
 			context: context$1
 		});
 	}
@@ -1766,7 +1767,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.");
@@ -1854,6 +1855,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(),
@@ -1867,13 +1870,29 @@ var FederationImpl = class extends FederationBuilderImpl {
 				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) {
@@ -1885,7 +1904,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,
@@ -2601,20 +2620,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 ?? "");
@@ -2661,10 +2685,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.");
@@ -3016,8 +3041,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(),
@@ -3031,13 +3058,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) {
@@ -3049,7 +3092,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,

package/dist/middleware-Dsrm1uhx.cjs

@@ -0,0 +1,12 @@
+
+          const { Temporal } = require("@js-temporal/polyfill");
+          const { URLPattern } = require("urlpattern-polyfill");
+        
+require('./transformers-3g8GZwkZ.cjs');
+require('./http-BCfCt7nq.cjs');
+const require_middleware = require('./middleware-nW8ONmt3.cjs');
+require('./proof-BoqEqbih.cjs');
+require('./types-Cd_hszr_.cjs');
+require('./kv-cache-Dk9UX_M2.cjs');
+
+exports.FederationImpl = require_middleware.FederationImpl;

package/dist/{middleware-ixha9m0b.js → middleware-LQKxYF7X.js}

@@ -2,11 +2,11 @@
           import { Temporal } from "@js-temporal/polyfill";
           import { URLPattern } from "urlpattern-polyfill";
         
-import { getDefaultActivityTransformers } from "./transformers-N_ip_y4P.js";
-import { deno_default, doubleKnock, exportJwk, importJwk, validateCryptoKey, verifyRequest } from "./http-i8VdY2df.js";
-import { detachSignature, doesActorOwnKey, getKeyOwner, hasSignature, signJsonLd, signObject, verifyJsonLd, verifyObject } from "./proof-vG4ePLF2.js";
-import { getNodeInfo, nodeInfoToJson } from "./types-8l28uC8o.js";
-import { getAuthenticatedDocumentLoader, kvCache } from "./kv-cache-B4CFgxYq.js";
+import { getDefaultActivityTransformers } from "./transformers-C3FLHUd6.js";
+import { deno_default, doubleKnock, exportJwk, importJwk, validateCryptoKey, verifyRequest } from "./http-C02fQ5SX.js";
+import { detachSignature, doesActorOwnKey, getKeyOwner, hasSignature, signJsonLd, signObject, verifyJsonLd, verifyObject } from "./proof-OjMPhNWs.js";
+import { getNodeInfo, nodeInfoToJson } from "./types-C93Ob9cU.js";
+import { getAuthenticatedDocumentLoader, kvCache } from "./kv-cache-BLxaWwPk.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 { SpanKind, SpanStatusCode, context, propagation, trace } from "@opentelemetry/api";
@@ -337,7 +337,7 @@ var FederationBuilderImpl = class {
 		this.collectionTypeIds = {};
 	}
 	async build(options) {
-		const { FederationImpl: FederationImpl$1 } = await import("./middleware-C52jAnyA.js");
+		const { FederationImpl: FederationImpl$1 } = await import("./middleware-BhYGJwH9.js");
 		const f = new FederationImpl$1(options);
 		const trailingSlashInsensitiveValue = f.router.trailingSlashInsensitive;
 		f.router = this.router.clone();
@@ -2560,6 +2560,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 		}) });
 		await this.sendActivity(keys, message.inboxes, activity, {
 			collectionSync: message.collectionSync,
+			orderingKey: message.orderingKey,
 			context: context$1
 		});
 	}
@@ -2808,7 +2809,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.");
@@ -2896,6 +2897,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(),
@@ -2909,13 +2912,29 @@ var FederationImpl = class extends FederationBuilderImpl {
 				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$1.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) {
@@ -2927,7 +2946,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$1.error("Failed to enqueue activity {activityId} to send later: {error}", {
 				activityId: activity.id.href,
@@ -3643,20 +3662,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 ?? "");
@@ -3703,10 +3727,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.");
@@ -4058,8 +4083,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(),
@@ -4073,13 +4100,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$1.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) {
@@ -4091,7 +4134,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$1.error("Failed to enqueue activity {activityId} to forward later:\n{error}", {
 				activityId: this.activityId,

package/dist/{middleware-D4Eexdig.cjs → middleware-nW8ONmt3.cjs}

@@ -2,12 +2,12 @@
           const { Temporal } = require("@js-temporal/polyfill");
           const { URLPattern } = require("urlpattern-polyfill");
         
-const require_chunk = require('./chunk-DqRYRqnO.cjs');
-const require_transformers = require('./transformers-BjBg6Lag.cjs');
-const require_http = require('./http-C1LrW2D3.cjs');
-const require_proof = require('./proof-C8MAHWxQ.cjs');
-const require_types = require('./types-B6z6CqIz.cjs');
-const require_kv_cache = require('./kv-cache-DOgKf8lH.cjs');
+const require_chunk = require('./chunk-CGaQZ11T.cjs');
+const require_transformers = require('./transformers-3g8GZwkZ.cjs');
+const require_http = require('./http-BCfCt7nq.cjs');
+const require_proof = require('./proof-BoqEqbih.cjs');
+const require_types = require('./types-Cd_hszr_.cjs');
+const require_kv_cache = require('./kv-cache-Dk9UX_M2.cjs');
 const __logtape_logtape = require_chunk.__toESM(require("@logtape/logtape"));
 const __fedify_vocab = require_chunk.__toESM(require("@fedify/vocab"));
 const __opentelemetry_api = require_chunk.__toESM(require("@opentelemetry/api"));
@@ -338,7 +338,7 @@ var FederationBuilderImpl = class {
 		this.collectionTypeIds = {};
 	}
 	async build(options) {
-		const { FederationImpl: FederationImpl$1 } = await Promise.resolve().then(() => require("./middleware-XsmW-sAa.cjs"));
+		const { FederationImpl: FederationImpl$1 } = await Promise.resolve().then(() => require("./middleware-Dsrm1uhx.cjs"));
 		const f = new FederationImpl$1(options);
 		const trailingSlashInsensitiveValue = f.router.trailingSlashInsensitive;
 		f.router = this.router.clone();
@@ -2561,6 +2561,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 		}) });
 		await this.sendActivity(keys, message.inboxes, activity, {
 			collectionSync: message.collectionSync,
+			orderingKey: message.orderingKey,
 			context: context$2
 		});
 	}
@@ -2809,7 +2810,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.");
@@ -2897,6 +2898,8 @@ var FederationImpl = class extends FederationBuilderImpl {
 		__opentelemetry_api.propagation.inject(__opentelemetry_api.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(),
@@ -2910,13 +2913,29 @@ var FederationImpl = class extends FederationBuilderImpl {
 				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$1.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) {
@@ -2928,7 +2947,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$1.error("Failed to enqueue activity {activityId} to send later: {error}", {
 				activityId: activity.id.href,
@@ -3644,20 +3663,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) require_http.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 ?? "");
@@ -3704,10 +3728,11 @@ var ContextImpl = class ContextImpl {
 			activityId: activity.id?.href,
 			activityType: (0, __fedify_vocab.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.");
@@ -4059,8 +4084,10 @@ var InboxContextImpl = class InboxContextImpl extends ContextImpl {
 		}
 		const carrier = {};
 		__opentelemetry_api.propagation.inject(__opentelemetry_api.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(),
@@ -4074,13 +4101,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$1.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) {
@@ -4092,7 +4135,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$1.error("Failed to enqueue activity {activityId} to forward later:\n{error}", {
 				activityId: this.activityId,

package/dist/mod-Bh8mqlYw.d.cts

@@ -0,0 +1,9 @@
+import "node:module";
+
+//#region rolldown:runtime
+
+import * as import___fedify_vocab_runtime from "@fedify/vocab-runtime";
+__reExport(mod_d_exports, import___fedify_vocab_runtime);
+
+//#endregion
+export { __export, __reExport, mod_d_exports };

package/dist/{mod-waqu-BL_.d.ts → mod-Bpuc-q64.d.ts}

@@ -1,6 +1,6 @@
 import { Temporal } from "@js-temporal/polyfill";
 import { URLPattern } from "urlpattern-polyfill";
-import { ActivityTransformer, Context } from "./context-C7vzWilY.js";
+import { ActivityTransformer, Context } from "./context-CJO1oqSa.js";
 import { Activity } from "@fedify/vocab";
 
 //#region src/compat/transformers.d.ts

package/dist/{mod-C3SOvTD1.d.ts → mod-C92O3FpJ.d.ts}

@@ -1,6 +1,6 @@
 import { Temporal } from "@js-temporal/polyfill";
 import { URLPattern } from "urlpattern-polyfill";
-import { ActorAliasMapper, ActorDispatcher, ActorHandleMapper, RequestContext, WebFingerLinksDispatcher } from "./context-C7vzWilY.js";
+import { ActorAliasMapper, ActorDispatcher, ActorHandleMapper, RequestContext, WebFingerLinksDispatcher } from "./context-CJO1oqSa.js";
 import { Span, Tracer } from "@opentelemetry/api";
 
 //#region src/federation/webfinger.d.ts

package/dist/{mod-0qnPv4EC.d.cts → mod-CKtAEVny.d.cts}

@@ -1,4 +1,4 @@
-import { ActorAliasMapper, ActorDispatcher, ActorHandleMapper, RequestContext, WebFingerLinksDispatcher } from "./context-CrB9RFy5.cjs";
+import { ActorAliasMapper, ActorDispatcher, ActorHandleMapper, RequestContext, WebFingerLinksDispatcher } from "./context-Zqld1re2.cjs";
 import { Span, Tracer } from "@opentelemetry/api";
 
 //#region src/federation/webfinger.d.ts

package/dist/{mod-BrS8tiad.d.cts → mod-COO7VMcm.d.cts}

@@ -1,4 +1,4 @@
-import { KeyCache } from "./http-ClB3pLcL.cjs";
+import { KeyCache } from "./http-CCEu-x1_.cjs";
 import { CryptographicKey, DataIntegrityProof, Multikey, Object as Object$1 } from "@fedify/vocab";
 import { DocumentLoader } from "@fedify/vocab-runtime";
 import { TracerProvider } from "@opentelemetry/api";

package/dist/{mod-DZmuPaKv.d.ts → mod-CvhyLrjX.d.ts}

@@ -1,7 +1,7 @@
 import { Temporal } from "@js-temporal/polyfill";
 import { URLPattern } from "urlpattern-polyfill";
-import { HttpMessageSignaturesSpecDeterminer } from "./http-DLBDPal9.js";
-import { KvKey, KvStore } from "./kv-CYySNrsn.js";
+import { HttpMessageSignaturesSpecDeterminer } from "./http-CODSJcKx.js";
+import { KvKey, KvStore } from "./kv-jg_8SMc1.js";
 import { TracerProvider } from "@opentelemetry/api";
 import { DocumentLoader, DocumentLoaderFactoryOptions } from "@fedify/vocab-runtime";
 

package/dist/mod-D6HodEq7.d.ts

@@ -0,0 +1,7 @@
+import { Temporal } from "@js-temporal/polyfill";
+import { URLPattern } from "urlpattern-polyfill";
+import * as import___fedify_vocab_runtime from "@fedify/vocab-runtime";
+__reExport(mod_d_exports, import___fedify_vocab_runtime);
+
+//#endregion
+export { mod_d_exports };

package/dist/{mod-D6pS5_xJ.d.cts → mod-DFWeUq2q.d.cts}

@@ -1,4 +1,4 @@
-import { ActivityTransformer, Context } from "./context-CrB9RFy5.cjs";
+import { ActivityTransformer, Context } from "./context-Zqld1re2.cjs";
 import { Activity } from "@fedify/vocab";
 
 //#region src/compat/transformers.d.ts

package/dist/{mod-BHXq4Q3x.d.cts → mod-DWaA45ef.d.cts}

@@ -1,5 +1,5 @@
-import { HttpMessageSignaturesSpecDeterminer } from "./http-ClB3pLcL.cjs";
-import { KvKey, KvStore } from "./kv-B4vFhIYL.cjs";
+import { HttpMessageSignaturesSpecDeterminer } from "./http-CCEu-x1_.cjs";
+import { KvKey, KvStore } from "./kv-g9jFc34-.cjs";
 import { DocumentLoader, DocumentLoaderFactoryOptions } from "@fedify/vocab-runtime";
 import { TracerProvider } from "@opentelemetry/api";