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

package/dist/federation/idempotency.test.js

@@ -8,25 +8,25 @@ import { assertEquals } from "../assert_equals-DSbWqCm3.js";
 import "../assert-MZs1qjMx.js";
 import "../assert_instance_of-DHz7EHNU.js";
 import { MemoryKvStore } from "../kv-QzKcOQgP.js";
-import "../deno-DOeSTfhz.js";
-import { createFederation } from "../middleware-DbwwSEOr.js";
+import "../deno-BTAi5-ur.js";
+import { createFederation } from "../middleware-DaOdxVOc.js";
 import "../client-Dg7OfUDA.js";
 import "../router-D9eI0s4b.js";
 import "../types-CPz01LGH.js";
-import "../key-3_vbTfr8.js";
-import "../http-DGkEl4mw.js";
-import "../ld-BQxhMgOJ.js";
-import "../owner-Bod8mCab.js";
-import { signObject } from "../proof--60Adidu.js";
-import "../docloader-C1AGOQQm.js";
+import "../key-BI6sqU5u.js";
+import "../http-C4WANccp.js";
+import "../ld-qTcTL2A4.js";
+import "../owner-Cfmtlwoe.js";
+import { signObject } from "../proof-Bc8ULrzP.js";
+import "../docloader-D8dzb6AT.js";
 import "../kv-cache-B__dHl7g.js";
-import "../inbox-Cp87HRVs.js";
-import "../builder-CR-ZQZJR.js";
+import "../inbox-CdBcxHA7.js";
+import "../builder-CvKuNW7P.js";
 import "../collection-CcnIw1qY.js";
 import "../keycache-DRxpZ5r9.js";
 import "../negotiation-5NPJL6zp.js";
 import "../retry-D4GJ670a.js";
-import "../send-B3fWpYN9.js";
+import "../send-BKW3wSXo.js";
 import "../std__assert-DWivtrGR.js";
 import "../assert_rejects-Ce45JcFg.js";
 import "../assert_throws-BNXdRGWP.js";
@@ -198,5 +198,41 @@ test("Federation.setInboxListeners().withIdempotency() - custom callback", async
 	assertEquals(response.status, 202);
 	assertEquals(processedActivities.length, 3);
 });
+test("Federation.setInboxListeners() - default strategy is per-inbox", async () => {
+	const federation = createTestFederation();
+	const processedActivities = [];
+	federation.setInboxListeners("/users/{identifier}/inbox", "/inbox").on(Create, (ctx, activity$1) => {
+		processedActivities.push([ctx.recipient, activity$1]);
+	});
+	const activity = new Create({
+		id: new URL("https://example.com/activities/6"),
+		actor: new URL("https://example.com/person2")
+	});
+	const signedActivity = await signObject(activity, ed25519PrivateKey, ed25519Multikey.id);
+	const body = JSON.stringify(await signedActivity.toJsonLd({ contextLoader: mockDocumentLoader }));
+	let response = await federation.fetch(new Request("https://example.com/users/john/inbox", {
+		method: "POST",
+		headers: { "Content-Type": "application/activity+json" },
+		body
+	}), { contextData: void 0 });
+	assertEquals(response.status, 202);
+	assertEquals(processedActivities.length, 1);
+	assertEquals(processedActivities[0][0], "john");
+	response = await federation.fetch(new Request("https://example.com/inbox", {
+		method: "POST",
+		headers: { "Content-Type": "application/activity+json" },
+		body
+	}), { contextData: void 0 });
+	assertEquals(response.status, 202);
+	assertEquals(processedActivities.length, 2);
+	assertEquals(processedActivities[1][0], null);
+	response = await federation.fetch(new Request("https://example.com/users/john/inbox", {
+		method: "POST",
+		headers: { "Content-Type": "application/activity+json" },
+		body
+	}), { contextData: void 0 });
+	assertEquals(response.status, 202);
+	assertEquals(processedActivities.length, 2);
+});
 
 //#endregion

package/dist/federation/inbox.test.js

@@ -5,8 +5,8 @@
     
 import { test } from "../dist-B5f6a8Tt.js";
 import { assertEquals } from "../assert_equals-DSbWqCm3.js";
-import "../deno-DOeSTfhz.js";
-import { InboxListenerSet } from "../inbox-Cp87HRVs.js";
+import "../deno-BTAi5-ur.js";
+import { InboxListenerSet } from "../inbox-CdBcxHA7.js";
 import { assertThrows } from "../assert_throws-BNXdRGWP.js";
 import { Activity, Create, Invite, Offer, Update } from "@fedify/vocab";
 

package/dist/federation/middleware.test.js

@@ -8,25 +8,25 @@ import { assertEquals } from "../assert_equals-DSbWqCm3.js";
 import { assert } from "../assert-MZs1qjMx.js";
 import { assertInstanceOf } from "../assert_instance_of-DHz7EHNU.js";
 import { MemoryKvStore } from "../kv-QzKcOQgP.js";
-import "../deno-DOeSTfhz.js";
-import { ContextImpl, FederationImpl, InboxContextImpl, KvSpecDeterminer, createFederation } from "../middleware-DbwwSEOr.js";
+import "../deno-BTAi5-ur.js";
+import { ContextImpl, FederationImpl, InboxContextImpl, KvSpecDeterminer, createFederation } from "../middleware-DaOdxVOc.js";
 import "../client-Dg7OfUDA.js";
 import { RouterError } from "../router-D9eI0s4b.js";
 import "../types-CPz01LGH.js";
-import "../key-3_vbTfr8.js";
-import { signRequest, verifyRequest } from "../http-DGkEl4mw.js";
-import { detachSignature, signJsonLd, verifyJsonLd } from "../ld-BQxhMgOJ.js";
-import { doesActorOwnKey } from "../owner-Bod8mCab.js";
-import { signObject, verifyObject } from "../proof--60Adidu.js";
-import { fetchDocumentLoader, getAuthenticatedDocumentLoader } from "../docloader-C1AGOQQm.js";
+import "../key-BI6sqU5u.js";
+import { signRequest, verifyRequest } from "../http-C4WANccp.js";
+import { detachSignature, signJsonLd, verifyJsonLd } from "../ld-qTcTL2A4.js";
+import { doesActorOwnKey } from "../owner-Cfmtlwoe.js";
+import { signObject, verifyObject } from "../proof-Bc8ULrzP.js";
+import { fetchDocumentLoader, getAuthenticatedDocumentLoader } from "../docloader-D8dzb6AT.js";
 import "../kv-cache-B__dHl7g.js";
-import "../inbox-Cp87HRVs.js";
-import "../builder-CR-ZQZJR.js";
+import "../inbox-CdBcxHA7.js";
+import "../builder-CvKuNW7P.js";
 import "../collection-CcnIw1qY.js";
 import "../keycache-DRxpZ5r9.js";
 import "../negotiation-5NPJL6zp.js";
 import "../retry-D4GJ670a.js";
-import "../send-B3fWpYN9.js";
+import "../send-BKW3wSXo.js";
 import { assertStrictEquals } from "../std__assert-DWivtrGR.js";
 import { assertFalse, assertRejects } from "../assert_rejects-Ce45JcFg.js";
 import { assertThrows } from "../assert_throws-BNXdRGWP.js";
@@ -1635,6 +1635,7 @@ test("ContextImpl.sendActivity()", async (t) => {
 				sharedInbox: false
 			} },
 			keys: queue.messages[0].type === "fanout" ? queue.messages[0].keys : [],
+			orderingKey: void 0,
 			traceContext: {}
 		}]);
 	});
@@ -1732,6 +1733,57 @@ test("ContextImpl.sendActivity()", async (t) => {
 		});
 		assertNotEquals(collectionSyncHeader, null);
 	});
+	queue.clear();
+	await t.step("orderingKey with fanout: \"force\"", async () => {
+		const activity = new vocab.Create({
+			id: new URL("https://example.com/activity/ordering-1"),
+			actor: new URL("https://example.com/person")
+		});
+		await ctx2.sendActivity({ username: "john" }, {
+			id: new URL("https://example.com/recipient"),
+			inboxId: new URL("https://example.com/inbox")
+		}, activity, {
+			fanout: "force",
+			orderingKey: "https://example.com/note/1"
+		});
+		assertEquals(queue.messages.length, 1);
+		const fanoutMessage = queue.messages[0];
+		assertEquals(fanoutMessage.type, "fanout");
+		if (fanoutMessage.type === "fanout") assertEquals(fanoutMessage.orderingKey, "https://example.com/note/1");
+	});
+	queue.clear();
+	await t.step("orderingKey with fanout: \"skip\"", async () => {
+		const activity = new vocab.Create({
+			id: new URL("https://example.com/activity/ordering-2"),
+			actor: new URL("https://example.com/person")
+		});
+		await ctx2.sendActivity({ username: "john" }, {
+			id: new URL("https://example.com/recipient"),
+			inboxId: new URL("https://example.com/inbox")
+		}, activity, {
+			fanout: "skip",
+			orderingKey: "https://example.com/note/2"
+		});
+		assertEquals(queue.messages.length, 1);
+		const outboxMessage = queue.messages[0];
+		assertEquals(outboxMessage.type, "outbox");
+		if (outboxMessage.type === "outbox") assertEquals(outboxMessage.orderingKey, "https://example.com/note/2\nhttps://example.com");
+	});
+	queue.clear();
+	await t.step("orderingKey not specified", async () => {
+		const activity = new vocab.Create({
+			id: new URL("https://example.com/activity/ordering-3"),
+			actor: new URL("https://example.com/person")
+		});
+		await ctx2.sendActivity({ username: "john" }, {
+			id: new URL("https://example.com/recipient"),
+			inboxId: new URL("https://example.com/inbox")
+		}, activity, { fanout: "force" });
+		assertEquals(queue.messages.length, 1);
+		const fanoutMessage2 = queue.messages[0];
+		assertEquals(fanoutMessage2.type, "fanout");
+		if (fanoutMessage2.type === "fanout") assertEquals(fanoutMessage2.orderingKey, void 0);
+	});
 	esm_default.hardReset();
 });
 test({

package/dist/federation/mod.cjs

@@ -2,13 +2,13 @@
           const { Temporal } = require("@js-temporal/polyfill");
           const { URLPattern } = require("urlpattern-polyfill");
         
-require('../transformers-BjBg6Lag.cjs');
-require('../http-C1LrW2D3.cjs');
-const require_middleware = require('../middleware-D4Eexdig.cjs');
-require('../proof-C8MAHWxQ.cjs');
-const require_federation = require('../federation-B431K2gm.cjs');
-require('../types-B6z6CqIz.cjs');
-require('../kv-cache-DOgKf8lH.cjs');
+require('../transformers-3g8GZwkZ.cjs');
+require('../http-BCfCt7nq.cjs');
+const require_middleware = require('../middleware-nW8ONmt3.cjs');
+require('../proof-BoqEqbih.cjs');
+const require_federation = require('../federation-Bp3HI26G.cjs');
+require('../types-Cd_hszr_.cjs');
+require('../kv-cache-Dk9UX_M2.cjs');
 
 exports.InProcessMessageQueue = require_federation.InProcessMessageQueue;
 exports.MemoryKvStore = require_federation.MemoryKvStore;

package/dist/federation/mod.d.cts

@@ -1,7 +1,7 @@
-import "../client-by-PEGAJ.cjs";
-import "../http-ClB3pLcL.cjs";
-import "../owner-C-zfmVAD.cjs";
-import { ActorAliasMapper, ActorCallbackSetters, ActorDispatcher, ActorHandleMapper, ActorKeyPair, ActorKeyPairsDispatcher, AuthorizePredicate, CollectionCallbackSetters, CollectionCounter, CollectionCursor, CollectionDispatcher, ConstructorWithTypeId, Context, CreateExponentialBackoffPolicyOptions, CreateFederationOptions, CustomCollectionCallbackSetters, CustomCollectionCounter, CustomCollectionCursor, CustomCollectionDispatcher, Federatable, Federation, FederationBuilder, FederationFetchOptions, FederationKvPrefixes, FederationOptions, FederationOrigin, FederationQueueOptions, FederationStartQueueOptions, ForwardActivityOptions, GetSignedKeyOptions, IdempotencyKeyCallback, IdempotencyStrategy, InProcessMessageQueue, InProcessMessageQueueOptions, InboxContext, InboxErrorHandler, InboxListener, InboxListenerSetters, Message, MessageQueue, MessageQueueEnqueueOptions, MessageQueueListenOptions, NodeInfoDispatcher, ObjectAuthorizePredicate, ObjectCallbackSetters, ObjectDispatcher, OutboxErrorHandler, PageItems, ParallelMessageQueue, ParseUriResult, RequestContext, RespondWithObjectOptions, RetryContext, RetryPolicy, Rfc6570Expression, RouteActivityOptions, Router, RouterError, RouterOptions, RouterRouteResult, SendActivityOptions, SendActivityOptionsForCollection, SenderKeyPair, SharedInboxKeyDispatcher, WebFingerLinksDispatcher, buildCollectionSynchronizationHeader, createExponentialBackoffPolicy, createFederation, createFederationBuilder, digest, respondWithObject, respondWithObjectIfAcceptable } from "../context-CrB9RFy5.cjs";
-import { KvKey, KvStore, KvStoreListEntry, KvStoreSetOptions, MemoryKvStore } from "../kv-B4vFhIYL.cjs";
-import { WebFingerHandlerParameters, handleWebFinger } from "../mod-0qnPv4EC.cjs";
+import "../client-CwkOPN13.cjs";
+import "../http-CCEu-x1_.cjs";
+import "../owner-9yZ5Ibsb.cjs";
+import { ActorAliasMapper, ActorCallbackSetters, ActorDispatcher, ActorHandleMapper, ActorKeyPair, ActorKeyPairsDispatcher, AuthorizePredicate, CollectionCallbackSetters, CollectionCounter, CollectionCursor, CollectionDispatcher, ConstructorWithTypeId, Context, CreateExponentialBackoffPolicyOptions, CreateFederationOptions, CustomCollectionCallbackSetters, CustomCollectionCounter, CustomCollectionCursor, CustomCollectionDispatcher, Federatable, Federation, FederationBuilder, FederationFetchOptions, FederationKvPrefixes, FederationOptions, FederationOrigin, FederationQueueOptions, FederationStartQueueOptions, ForwardActivityOptions, GetSignedKeyOptions, IdempotencyKeyCallback, IdempotencyStrategy, InProcessMessageQueue, InProcessMessageQueueOptions, InboxContext, InboxErrorHandler, InboxListener, InboxListenerSetters, Message, MessageQueue, MessageQueueEnqueueOptions, MessageQueueListenOptions, NodeInfoDispatcher, ObjectAuthorizePredicate, ObjectCallbackSetters, ObjectDispatcher, OutboxErrorHandler, PageItems, ParallelMessageQueue, ParseUriResult, RequestContext, RespondWithObjectOptions, RetryContext, RetryPolicy, Rfc6570Expression, RouteActivityOptions, Router, RouterError, RouterOptions, RouterRouteResult, SendActivityOptions, SendActivityOptionsForCollection, SenderKeyPair, SharedInboxKeyDispatcher, WebFingerLinksDispatcher, buildCollectionSynchronizationHeader, createExponentialBackoffPolicy, createFederation, createFederationBuilder, digest, respondWithObject, respondWithObjectIfAcceptable } from "../context-Zqld1re2.cjs";
+import { KvKey, KvStore, KvStoreListEntry, KvStoreSetOptions, MemoryKvStore } from "../kv-g9jFc34-.cjs";
+import { WebFingerHandlerParameters, handleWebFinger } from "../mod-CKtAEVny.cjs";
 export { ActorAliasMapper, ActorCallbackSetters, ActorDispatcher, ActorHandleMapper, ActorKeyPair, ActorKeyPairsDispatcher, AuthorizePredicate, CollectionCallbackSetters, CollectionCounter, CollectionCursor, CollectionDispatcher, ConstructorWithTypeId, Context, CreateExponentialBackoffPolicyOptions, CreateFederationOptions, CustomCollectionCallbackSetters, CustomCollectionCounter, CustomCollectionCursor, CustomCollectionDispatcher, Federatable, Federation, FederationBuilder, FederationFetchOptions, FederationKvPrefixes, FederationOptions, FederationOrigin, FederationQueueOptions, FederationStartQueueOptions, ForwardActivityOptions, GetSignedKeyOptions, IdempotencyKeyCallback, IdempotencyStrategy, InProcessMessageQueue, InProcessMessageQueueOptions, InboxContext, InboxErrorHandler, InboxListener, InboxListenerSetters, KvKey, KvStore, KvStoreListEntry, KvStoreSetOptions, MemoryKvStore, Message, MessageQueue, MessageQueueEnqueueOptions, MessageQueueListenOptions, NodeInfoDispatcher, ObjectAuthorizePredicate, ObjectCallbackSetters, ObjectDispatcher, OutboxErrorHandler, PageItems, ParallelMessageQueue, ParseUriResult, RequestContext, RespondWithObjectOptions, RetryContext, RetryPolicy, Rfc6570Expression, RouteActivityOptions, Router, RouterError, RouterOptions, RouterRouteResult, SendActivityOptions, SendActivityOptionsForCollection, SenderKeyPair, SharedInboxKeyDispatcher, WebFingerHandlerParameters, WebFingerLinksDispatcher, buildCollectionSynchronizationHeader, createExponentialBackoffPolicy, createFederation, createFederationBuilder, digest, handleWebFinger, respondWithObject, respondWithObjectIfAcceptable };

package/dist/federation/mod.d.ts

@@ -1,9 +1,9 @@
 import { Temporal } from "@js-temporal/polyfill";
 import { URLPattern } from "urlpattern-polyfill";
-import "../client-CUTUGgvJ.js";
-import "../http-DLBDPal9.js";
-import "../owner-BgI8C-VY.js";
-import { ActorAliasMapper, ActorCallbackSetters, ActorDispatcher, ActorHandleMapper, ActorKeyPair, ActorKeyPairsDispatcher, AuthorizePredicate, CollectionCallbackSetters, CollectionCounter, CollectionCursor, CollectionDispatcher, ConstructorWithTypeId, Context, CreateExponentialBackoffPolicyOptions, CreateFederationOptions, CustomCollectionCallbackSetters, CustomCollectionCounter, CustomCollectionCursor, CustomCollectionDispatcher, Federatable, Federation, FederationBuilder, FederationFetchOptions, FederationKvPrefixes, FederationOptions, FederationOrigin, FederationQueueOptions, FederationStartQueueOptions, ForwardActivityOptions, GetSignedKeyOptions, IdempotencyKeyCallback, IdempotencyStrategy, InProcessMessageQueue, InProcessMessageQueueOptions, InboxContext, InboxErrorHandler, InboxListener, InboxListenerSetters, Message, MessageQueue, MessageQueueEnqueueOptions, MessageQueueListenOptions, NodeInfoDispatcher, ObjectAuthorizePredicate, ObjectCallbackSetters, ObjectDispatcher, OutboxErrorHandler, PageItems, ParallelMessageQueue, ParseUriResult, RequestContext, RespondWithObjectOptions, RetryContext, RetryPolicy, Rfc6570Expression, RouteActivityOptions, Router, RouterError, RouterOptions, RouterRouteResult, SendActivityOptions, SendActivityOptionsForCollection, SenderKeyPair, SharedInboxKeyDispatcher, WebFingerLinksDispatcher, buildCollectionSynchronizationHeader, createExponentialBackoffPolicy, createFederation, createFederationBuilder, digest, respondWithObject, respondWithObjectIfAcceptable } from "../context-C7vzWilY.js";
-import { KvKey, KvStore, KvStoreListEntry, KvStoreSetOptions, MemoryKvStore } from "../kv-CYySNrsn.js";
-import { WebFingerHandlerParameters, handleWebFinger } from "../mod-C3SOvTD1.js";
+import "../client-a7NwzhA2.js";
+import "../http-CODSJcKx.js";
+import "../owner-DQYAbVmX.js";
+import { ActorAliasMapper, ActorCallbackSetters, ActorDispatcher, ActorHandleMapper, ActorKeyPair, ActorKeyPairsDispatcher, AuthorizePredicate, CollectionCallbackSetters, CollectionCounter, CollectionCursor, CollectionDispatcher, ConstructorWithTypeId, Context, CreateExponentialBackoffPolicyOptions, CreateFederationOptions, CustomCollectionCallbackSetters, CustomCollectionCounter, CustomCollectionCursor, CustomCollectionDispatcher, Federatable, Federation, FederationBuilder, FederationFetchOptions, FederationKvPrefixes, FederationOptions, FederationOrigin, FederationQueueOptions, FederationStartQueueOptions, ForwardActivityOptions, GetSignedKeyOptions, IdempotencyKeyCallback, IdempotencyStrategy, InProcessMessageQueue, InProcessMessageQueueOptions, InboxContext, InboxErrorHandler, InboxListener, InboxListenerSetters, Message, MessageQueue, MessageQueueEnqueueOptions, MessageQueueListenOptions, NodeInfoDispatcher, ObjectAuthorizePredicate, ObjectCallbackSetters, ObjectDispatcher, OutboxErrorHandler, PageItems, ParallelMessageQueue, ParseUriResult, RequestContext, RespondWithObjectOptions, RetryContext, RetryPolicy, Rfc6570Expression, RouteActivityOptions, Router, RouterError, RouterOptions, RouterRouteResult, SendActivityOptions, SendActivityOptionsForCollection, SenderKeyPair, SharedInboxKeyDispatcher, WebFingerLinksDispatcher, buildCollectionSynchronizationHeader, createExponentialBackoffPolicy, createFederation, createFederationBuilder, digest, respondWithObject, respondWithObjectIfAcceptable } from "../context-CJO1oqSa.js";
+import { KvKey, KvStore, KvStoreListEntry, KvStoreSetOptions, MemoryKvStore } from "../kv-jg_8SMc1.js";
+import { WebFingerHandlerParameters, handleWebFinger } from "../mod-C92O3FpJ.js";
 export { ActorAliasMapper, ActorCallbackSetters, ActorDispatcher, ActorHandleMapper, ActorKeyPair, ActorKeyPairsDispatcher, AuthorizePredicate, CollectionCallbackSetters, CollectionCounter, CollectionCursor, CollectionDispatcher, ConstructorWithTypeId, Context, CreateExponentialBackoffPolicyOptions, CreateFederationOptions, CustomCollectionCallbackSetters, CustomCollectionCounter, CustomCollectionCursor, CustomCollectionDispatcher, Federatable, Federation, FederationBuilder, FederationFetchOptions, FederationKvPrefixes, FederationOptions, FederationOrigin, FederationQueueOptions, FederationStartQueueOptions, ForwardActivityOptions, GetSignedKeyOptions, IdempotencyKeyCallback, IdempotencyStrategy, InProcessMessageQueue, InProcessMessageQueueOptions, InboxContext, InboxErrorHandler, InboxListener, InboxListenerSetters, KvKey, KvStore, KvStoreListEntry, KvStoreSetOptions, MemoryKvStore, Message, MessageQueue, MessageQueueEnqueueOptions, MessageQueueListenOptions, NodeInfoDispatcher, ObjectAuthorizePredicate, ObjectCallbackSetters, ObjectDispatcher, OutboxErrorHandler, PageItems, ParallelMessageQueue, ParseUriResult, RequestContext, RespondWithObjectOptions, RetryContext, RetryPolicy, Rfc6570Expression, RouteActivityOptions, Router, RouterError, RouterOptions, RouterRouteResult, SendActivityOptions, SendActivityOptionsForCollection, SenderKeyPair, SharedInboxKeyDispatcher, WebFingerHandlerParameters, WebFingerLinksDispatcher, buildCollectionSynchronizationHeader, createExponentialBackoffPolicy, createFederation, createFederationBuilder, digest, handleWebFinger, respondWithObject, respondWithObjectIfAcceptable };

package/dist/federation/mod.js

@@ -2,12 +2,12 @@
           import { Temporal } from "@js-temporal/polyfill";
           import { URLPattern } from "urlpattern-polyfill";
         
-import "../transformers-N_ip_y4P.js";
-import "../http-i8VdY2df.js";
-import { Router, RouterError, buildCollectionSynchronizationHeader, createExponentialBackoffPolicy, createFederation, createFederationBuilder, digest, handleWebFinger, respondWithObject, respondWithObjectIfAcceptable } from "../middleware-ixha9m0b.js";
-import "../proof-vG4ePLF2.js";
-import { InProcessMessageQueue, MemoryKvStore, ParallelMessageQueue } from "../federation-BbZwNNWj.js";
-import "../types-8l28uC8o.js";
-import "../kv-cache-B4CFgxYq.js";
+import "../transformers-C3FLHUd6.js";
+import "../http-C02fQ5SX.js";
+import { Router, RouterError, buildCollectionSynchronizationHeader, createExponentialBackoffPolicy, createFederation, createFederationBuilder, digest, handleWebFinger, respondWithObject, respondWithObjectIfAcceptable } from "../middleware-LQKxYF7X.js";
+import "../proof-OjMPhNWs.js";
+import { InProcessMessageQueue, MemoryKvStore, ParallelMessageQueue } from "../federation-DaMfqRm4.js";
+import "../types-C93Ob9cU.js";
+import "../kv-cache-BLxaWwPk.js";
 
 export { InProcessMessageQueue, MemoryKvStore, ParallelMessageQueue, Router, RouterError, buildCollectionSynchronizationHeader, createExponentialBackoffPolicy, createFederation, createFederationBuilder, digest, handleWebFinger, respondWithObject, respondWithObjectIfAcceptable };

package/dist/federation/mq.test.js

@@ -26,6 +26,11 @@ var InProcessMessageQueue = class {
 	#monitors;
 	#pollIntervalMs;
 	/**
+	* Tracks which ordering keys are currently being processed to ensure
+	* sequential processing for messages with the same key.
+	*/
+	#processingKeys;
+	/**
 	* In-process message queue does not provide native retry mechanisms.
 	* @since 1.7.0
 	*/
@@ -38,6 +43,7 @@ var InProcessMessageQueue = class {
 		this.#messages = [];
 		this.#monitors = {};
 		this.#pollIntervalMs = Temporal.Duration.from(options.pollInterval ?? { seconds: 5 }).total("millisecond");
+		this.#processingKeys = /* @__PURE__ */ new Set();
 	}
 	enqueue(message, options) {
 		const delay$1 = options?.delay == null ? 0 : Math.max(options.delay.total("millisecond"), 0);
@@ -48,7 +54,11 @@ var InProcessMessageQueue = class {
 			}), delay$1);
 			return Promise.resolve();
 		}
-		this.#messages.push(message);
+		const orderingKey = options?.orderingKey ?? null;
+		this.#messages.push({
+			message,
+			orderingKey
+		});
 		for (const monitorId in this.#monitors) this.#monitors[monitorId]();
 		return Promise.resolve();
 	}
@@ -62,18 +72,29 @@ var InProcessMessageQueue = class {
 			}), delay$1);
 			return Promise.resolve();
 		}
-		this.#messages.push(...messages);
+		const orderingKey = options?.orderingKey ?? null;
+		for (const message of messages) this.#messages.push({
+			message,
+			orderingKey
+		});
 		for (const monitorId in this.#monitors) this.#monitors[monitorId]();
 		return Promise.resolve();
 	}
 	async listen(handler, options = {}) {
 		const signal = options.signal;
 		while (signal == null || !signal.aborted) {
-			while (this.#messages.length > 0) {
-				const message = this.#messages.shift();
-				await handler(message);
-			}
-			await this.#wait(this.#pollIntervalMs, signal);
+			const idx = this.#messages.findIndex((m) => m.orderingKey == null || !this.#processingKeys.has(m.orderingKey));
+			if (idx >= 0) {
+				const queued = this.#messages.splice(idx, 1)[0];
+				const { message, orderingKey } = queued;
+				if (orderingKey != null) this.#processingKeys.add(orderingKey);
+				try {
+					await handler(message);
+				} finally {
+					if (orderingKey != null) this.#processingKeys.delete(orderingKey);
+				}
+			} else if (this.#messages.length === 0) await this.#wait(this.#pollIntervalMs, signal);
+			else await this.#wait(10, signal);
 		}
 	}
 	#wait(ms, signal) {
@@ -105,6 +126,21 @@ var InProcessMessageQueue = class {
 * for I/O-bound tasks, but not for CPU-bound tasks, which is okay for Fedify's
 * workloads.
 *
+* When using `ParallelMessageQueue`, the ordering guarantee is preserved
+* *only if* the underlying queue implementation delivers messages in a wrapper
+* format that includes the `__fedify_ordering_key__` property.  Currently,
+* only `DenoKvMessageQueue` and `WorkersMessageQueue` use this format.
+* For other queue implementations (e.g., `InProcessMessageQueue`,
+* `RedisMessageQueue`, `PostgresMessageQueue`, `SqliteMessageQueue`,
+* `AmqpMessageQueue`), the ordering key cannot be detected by
+* `ParallelMessageQueue`, so ordering guarantees are handled by those
+* implementations directly rather than at the `ParallelMessageQueue` level.
+*
+* Messages with the same ordering key will never be processed concurrently
+* by different workers, ensuring sequential processing within each key.
+* Messages with different ordering keys (or no ordering key) can still be
+* processed in parallel.
+*
 * @since 1.0.0
 */
 var ParallelMessageQueue = class ParallelMessageQueue {
@@ -116,6 +152,15 @@ var ParallelMessageQueue = class ParallelMessageQueue {
 	*/
 	nativeRetrial;
 	/**
+	* Tracks which ordering keys are currently being processed to ensure
+	* sequential processing for messages with the same key.
+	*/
+	#processingKeys = /* @__PURE__ */ new Set();
+	/**
+	* Pending messages waiting for their ordering key to become available.
+	*/
+	#pendingMessages = [];
+	/**
 	* Constructs a new {@link ParallelMessageQueue} with the given queue and
 	* number of workers.
 	* @param queue The message queue to use under the hood.  Note that
@@ -143,6 +188,25 @@ var ParallelMessageQueue = class ParallelMessageQueue {
 		}
 		await this.queue.enqueueMany(messages, options);
 	}
+	/**
+	* Extracts ordering key from a message if present.
+	*
+	* This method only works for queue implementations that deliver messages
+	* in the wrapper format with `__fedify_ordering_key__` property.  Currently,
+	* only `DenoKvMessageQueue` and `WorkersMessageQueue` use this format.
+	*
+	* For other queue implementations (`InProcessMessageQueue`,
+	* `RedisMessageQueue`, `PostgresMessageQueue`, `SqliteMessageQueue`,
+	* `AmqpMessageQueue`), messages are delivered as raw payloads without the
+	* wrapper, so the ordering key cannot be detected here.  Those
+	* implementations handle ordering guarantees internally.
+	*/
+	#extractOrderingKey(message) {
+		if (message != null && typeof message === "object") {
+			if ("__fedify_ordering_key__" in message) return message.__fedify_ordering_key__;
+		}
+		return void 0;
+	}
 	listen(handler, options = {}) {
 		const workers = /* @__PURE__ */ new Map();
 		return this.queue.listen(async (message) => {
@@ -151,13 +215,33 @@ var ParallelMessageQueue = class ParallelMessageQueue {
 				workers.delete(consumedId);
 			}
 			const workerId = crypto.randomUUID();
-			const promise = this.#work(workerId, handler, message);
+			const orderingKey = this.#extractOrderingKey(message);
+			if (orderingKey != null && this.#processingKeys.has(orderingKey)) await new Promise((resolve) => {
+				this.#pendingMessages.push({
+					message,
+					orderingKey,
+					resolve
+				});
+			});
+			if (orderingKey != null) this.#processingKeys.add(orderingKey);
+			const promise = this.#work(workerId, handler, message, orderingKey);
 			workers.set(workerId, promise);
 		}, options);
 	}
-	async #work(workerId, handler, message) {
+	async #work(workerId, handler, message, orderingKey) {
 		await this.#sleep(0);
-		await handler(message);
+		try {
+			await handler(message);
+		} finally {
+			if (orderingKey != null) {
+				this.#processingKeys.delete(orderingKey);
+				const pendingIdx = this.#pendingMessages.findIndex((p) => p.orderingKey === orderingKey);
+				if (pendingIdx >= 0) {
+					const pending = this.#pendingMessages.splice(pendingIdx, 1)[0];
+					pending.resolve();
+				}
+			}
+		}
 		return workerId;
 	}
 	#sleep(ms) {
@@ -222,6 +306,74 @@ test("InProcessMessageQueue", async (t) => {
 	controller.abort();
 	await listening;
 });
+test("InProcessMessageQueue orderingKey", async (t) => {
+	const mq = new InProcessMessageQueue();
+	const orderTracker = {
+		keyA: [],
+		keyB: [],
+		noKey: []
+	};
+	const allMessages = [];
+	const controller = new AbortController();
+	const listening = mq.listen((message) => {
+		allMessages.push(message);
+		const trackKey = message.key ?? "noKey";
+		if (trackKey in orderTracker) orderTracker[trackKey].push(message.value);
+	}, controller);
+	await t.step("enqueue with ordering key", async () => {
+		await mq.enqueue({
+			key: "keyA",
+			value: 1
+		}, { orderingKey: "keyA" });
+		await mq.enqueue({
+			key: "keyB",
+			value: 1
+		}, { orderingKey: "keyB" });
+		await mq.enqueue({
+			key: "keyA",
+			value: 2
+		}, { orderingKey: "keyA" });
+		await mq.enqueue({
+			key: "keyB",
+			value: 2
+		}, { orderingKey: "keyB" });
+		await mq.enqueue({
+			key: "keyA",
+			value: 3
+		}, { orderingKey: "keyA" });
+		await mq.enqueue({
+			key: "keyB",
+			value: 3
+		}, { orderingKey: "keyB" });
+		await mq.enqueue({
+			key: null,
+			value: 1
+		});
+		await mq.enqueue({
+			key: null,
+			value: 2
+		});
+	});
+	await waitFor(() => allMessages.length >= 8, 3e4);
+	await t.step("verify ordering key order", () => {
+		assertEquals(orderTracker.keyA, [
+			1,
+			2,
+			3
+		], "Messages with orderingKey 'keyA' should be processed in order");
+		assertEquals(orderTracker.keyB, [
+			1,
+			2,
+			3
+		], "Messages with orderingKey 'keyB' should be processed in order");
+	});
+	await t.step("verify messages without ordering key", () => {
+		assertEquals(orderTracker.noKey.length, 2, "Messages without ordering key should all be received");
+		assert(orderTracker.noKey.includes(1) && orderTracker.noKey.includes(2), "Messages without ordering key should contain values 1 and 2");
+	});
+	controller.abort();
+	await listening;
+});
 test("MessageQueue.nativeRetrial", async (t) => {
 	if ("Deno" in globalThis && "openKv" in globalThis.Deno && typeof globalThis.Deno.openKv === "function") await t.step("DenoKvMessageQueue", async () => {
 		const packageName = () => "@fedify/denokv";

package/dist/federation/send.test.js

@@ -7,11 +7,11 @@ import { createTestTracerProvider, mockDocumentLoader, test } from "../dist-B5f6
 import { assertEquals } from "../assert_equals-DSbWqCm3.js";
 import { assert } from "../assert-MZs1qjMx.js";
 import "../assert_instance_of-DHz7EHNU.js";
-import "../deno-DOeSTfhz.js";
-import "../key-3_vbTfr8.js";
-import { verifyRequest } from "../http-DGkEl4mw.js";
-import { doesActorOwnKey } from "../owner-Bod8mCab.js";
-import { extractInboxes, sendActivity } from "../send-B3fWpYN9.js";
+import "../deno-BTAi5-ur.js";
+import "../key-BI6sqU5u.js";
+import { verifyRequest } from "../http-C4WANccp.js";
+import { doesActorOwnKey } from "../owner-Cfmtlwoe.js";
+import { extractInboxes, sendActivity } from "../send-BKW3wSXo.js";
 import "../std__assert-DWivtrGR.js";
 import { assertFalse, assertRejects } from "../assert_rejects-Ce45JcFg.js";
 import "../assert_throws-BNXdRGWP.js";

package/dist/federation/webfinger.test.js

@@ -8,30 +8,30 @@ import { assertEquals } from "../assert_equals-DSbWqCm3.js";
 import "../assert-MZs1qjMx.js";
 import "../assert_instance_of-DHz7EHNU.js";
 import { MemoryKvStore } from "../kv-QzKcOQgP.js";
-import "../deno-DOeSTfhz.js";
-import { createFederation, handleWebFinger } from "../middleware-DbwwSEOr.js";
+import "../deno-BTAi5-ur.js";
+import { createFederation, handleWebFinger } from "../middleware-DaOdxVOc.js";
 import "../client-Dg7OfUDA.js";
 import "../router-D9eI0s4b.js";
 import "../types-CPz01LGH.js";
-import "../key-3_vbTfr8.js";
-import "../http-DGkEl4mw.js";
-import "../ld-BQxhMgOJ.js";
-import "../owner-Bod8mCab.js";
-import "../proof--60Adidu.js";
-import "../docloader-C1AGOQQm.js";
+import "../key-BI6sqU5u.js";
+import "../http-C4WANccp.js";
+import "../ld-qTcTL2A4.js";
+import "../owner-Cfmtlwoe.js";
+import "../proof-Bc8ULrzP.js";
+import "../docloader-D8dzb6AT.js";
 import "../kv-cache-B__dHl7g.js";
-import "../inbox-Cp87HRVs.js";
-import "../builder-CR-ZQZJR.js";
+import "../inbox-CdBcxHA7.js";
+import "../builder-CvKuNW7P.js";
 import "../collection-CcnIw1qY.js";
 import "../keycache-DRxpZ5r9.js";
 import "../negotiation-5NPJL6zp.js";
 import "../retry-D4GJ670a.js";
-import "../send-B3fWpYN9.js";
+import "../send-BKW3wSXo.js";
 import "../std__assert-DWivtrGR.js";
 import "../assert_rejects-Ce45JcFg.js";
 import "../assert_throws-BNXdRGWP.js";
 import "../assert_not_equals-C80BG-_5.js";
-import { createRequestContext } from "../context-Bns6uTJq.js";
+import { createRequestContext } from "../context-CZ5llAss.js";
 import { Image, Link, Person } from "@fedify/vocab";
 
 //#region src/federation/webfinger.test.ts