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

package/dist/federation/mq.test.mjs

@@ -1,11 +1,13 @@
 import { Temporal } from "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { t as assertEquals } from "../assert_equals-BV7oLMxm.mjs";
-import { n as assertGreater } from "../std__assert-B2NnY9bq.mjs";
-import { n as assertGreaterOrEqual, r as assertFalse, t as assertRejects } from "../assert_rejects-EgstcQy5.mjs";
-import { t as assert } from "../assert-CJ1KXcvv.mjs";
-import { n as ParallelMessageQueue, t as InProcessMessageQueue } from "../mq-llHKivST.mjs";
+import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
+import { t as assertFalse } from "../assert_false-CPdRnc3E.mjs";
+import { t as assertGreaterOrEqual } from "../assert_greater_or_equal-BlafOF4-.mjs";
+import "../std__assert-DvMDRPes.mjs";
+import { t as assertRejects } from "../assert_rejects-CTptdYck.mjs";
+import { t as assert } from "../assert-D1Eafmd_.mjs";
+import { n as ParallelMessageQueue, t as InProcessMessageQueue } from "../mq-Dm1Wmtm-.mjs";
 import { delay } from "es-toolkit";
 import { test } from "@fedify/fixture";
 //#region src/federation/mq.test.ts
@@ -42,50 +44,105 @@ test("InProcessMessageQueue", async (t) => {
 	const listening = mq.listen((message) => {
 		messages.push(message);
 	}, controller);
-	await t.step("enqueue()", async () => {
-		await mq.enqueue("Hello, world!");
-	});
-	await waitFor(() => messages.length > 0, 15e3);
-	await t.step("listen()", () => {
-		assertEquals(messages, ["Hello, world!"]);
-	});
-	let started = 0;
-	await t.step("enqueue() with delay", async () => {
-		started = Date.now();
-		await mq.enqueue("Delayed message", { delay: Temporal.Duration.from({ seconds: 3 }) });
-		assertEquals(messages, ["Hello, world!"]);
-	});
-	await waitFor(() => messages.length > 1, 15e3);
-	await t.step("listen() with delay", () => {
-		assertEquals(messages, ["Hello, world!", "Delayed message"]);
-		assertGreater(Date.now() - started, 3e3);
-	});
-	while (messages.length > 0) messages.pop();
-	await t.step("enqueueMany()", async () => {
-		const testMessages = Array.from({ length: 5 }, (_, i) => `Batch message ${i}!`);
-		await mq.enqueueMany(testMessages);
-	});
-	await waitFor(() => messages.length >= 5, 15e3);
-	await t.step("listen() [multiple]", () => {
-		assertEquals(messages.length, 5);
-		for (let i = 0; i < 5; i++) assertEquals(messages[i], `Batch message ${i}!`);
-	});
-	while (messages.length > 0) messages.pop();
-	started = 0;
-	await t.step("enqueueMany() with delay", async () => {
-		started = Date.now();
-		const testMessages = Array.from({ length: 3 }, (_, i) => `Delayed batch ${i}!`);
-		await mq.enqueueMany(testMessages, { delay: Temporal.Duration.from({ seconds: 2 }) });
-		assertEquals(messages.length, 0);
+	try {
+		await t.step("enqueue()", async () => {
+			await mq.enqueue("Hello, world!");
+		});
+		await waitFor(() => messages.length > 0, 15e3);
+		await t.step("listen()", () => {
+			assertEquals(messages, ["Hello, world!"]);
+		});
+		await t.step("enqueue() with delay", async () => {
+			const { timers, enqueued } = captureTimers(() => mq.enqueue("Delayed message", { delay: Temporal.Duration.from({ seconds: 3 }) }));
+			await enqueued;
+			assertEquals(timers.length, 1);
+			assertEquals(timers[0].delay, 3e3);
+			await mq.enqueue("Single delay marker");
+			await waitFor(() => messages.includes("Single delay marker"), 15e3);
+			assertEquals(messages, ["Hello, world!", "Single delay marker"]);
+			timers[0].callback();
+		});
+		await waitFor(() => messages.length >= 3, 15e3);
+		await t.step("listen() with delay", () => {
+			assertEquals(messages, [
+				"Hello, world!",
+				"Single delay marker",
+				"Delayed message"
+			]);
+		});
+		while (messages.length > 0) messages.pop();
+		await t.step("enqueueMany()", async () => {
+			const testMessages = Array.from({ length: 5 }, (_, i) => `Batch message ${i}!`);
+			await mq.enqueueMany(testMessages);
+		});
+		await waitFor(() => messages.length >= 5, 15e3);
+		await t.step("listen() [multiple]", () => {
+			assertEquals(messages.length, 5);
+			for (let i = 0; i < 5; i++) assertEquals(messages[i], `Batch message ${i}!`);
+		});
+		while (messages.length > 0) messages.pop();
+		await t.step("enqueueMany() with delay", async () => {
+			const testMessages = Array.from({ length: 3 }, (_, i) => `Delayed batch ${i}!`);
+			const { timers, enqueued } = captureTimers(() => mq.enqueueMany(testMessages, { delay: Temporal.Duration.from({ seconds: 2 }) }));
+			await enqueued;
+			assertEquals(timers.length, 1);
+			assertEquals(timers[0].delay, 2e3);
+			await mq.enqueue("Batch delay marker");
+			await waitFor(() => messages.includes("Batch delay marker"), 15e3);
+			assertEquals(messages, ["Batch delay marker"]);
+			timers[0].callback();
+		});
+		await waitFor(() => messages.length >= 4, 15e3);
+		await t.step("listen() [delayed multiple]", () => {
+			assertEquals(messages.length, 4);
+			assertEquals(messages[0], "Batch delay marker");
+			for (let i = 0; i < 3; i++) assertEquals(messages[i + 1], `Delayed batch ${i}!`);
+		});
+	} finally {
+		controller.abort();
+		await listening;
+	}
+});
+function captureTimers(enqueue) {
+	const timers = [];
+	const original = globalThis.setTimeout;
+	globalThis.setTimeout = ((callback, delay) => {
+		timers.push({
+			callback,
+			delay
+		});
+		return 0;
 	});
-	await waitFor(() => messages.length >= 3, 15e3);
-	await t.step("listen() [delayed multiple]", () => {
-		assertEquals(messages.length, 3);
-		assertGreater(Date.now() - started, 2e3);
-		for (let i = 0; i < 3; i++) assertEquals(messages[i], `Delayed batch ${i}!`);
+	try {
+		return {
+			timers,
+			enqueued: enqueue()
+		};
+	} finally {
+		globalThis.setTimeout = original;
+	}
+}
+test("InProcessMessageQueue real delay", async (t) => {
+	for (const batch of [false, true]) await t.step(batch ? "enqueueMany()" : "enqueue()", async () => {
+		const mq = new InProcessMessageQueue();
+		const messages = [];
+		const controller = new AbortController();
+		const listening = mq.listen((message) => {
+			messages.push(message);
+		}, controller);
+		try {
+			const delayed = batch ? ["Delayed 1", "Delayed 2"] : ["Delayed"];
+			const options = { delay: Temporal.Duration.from({ milliseconds: 100 }) };
+			if (batch) await mq.enqueueMany(delayed, options);
+			else await mq.enqueue(delayed[0], options);
+			await mq.enqueue("Immediate");
+			await waitFor(() => messages.length >= delayed.length + 1, 15e3);
+			assertEquals(messages, ["Immediate", ...delayed]);
+		} finally {
+			controller.abort();
+			await listening;
+		}
 	});
-	controller.abort();
-	await listening;
 });
 test("InProcessMessageQueue.getDepth()", async () => {
 	const mq = new InProcessMessageQueue();
@@ -327,6 +384,21 @@ test("ParallelMessageQueue inherits nativeDeduplication", () => {
 	}
 	assert(new ParallelMessageQueue(new NativeDeduplicationQueue(), 5).nativeDeduplication);
 });
+test("ParallelMessageQueue inherits atomicEnqueueMany", () => {
+	class NonAtomicBatchQueue {
+		atomicEnqueueMany = false;
+		enqueue() {
+			return Promise.resolve();
+		}
+		enqueueMany() {
+			return Promise.resolve();
+		}
+		listen() {
+			return Promise.resolve();
+		}
+	}
+	assertFalse(new ParallelMessageQueue(new NonAtomicBatchQueue(), 5).atomicEnqueueMany);
+});
 test("ParallelMessageQueue forwards deduplicationKey to the wrapped queue", async () => {
 	class RecordingQueue {
 		nativeDeduplication = true;
@@ -365,6 +437,7 @@ test("ParallelMessageQueue rejects a deduplicated batch when the wrapped queue l
 	}
 	const inner = new NoBulkQueue();
 	const workers = new ParallelMessageQueue(inner, 5);
+	assertFalse(workers.atomicEnqueueMany);
 	await assertRejects(() => workers.enqueueMany([{ x: 1 }, { x: 2 }], { deduplicationKey: "k" }), TypeError, "enqueueMany");
 	assertEquals(inner.enqueued.length, 0);
 });
@@ -424,6 +497,9 @@ for (const mqName in queues) test({
 		await t.step("nativeDeduplication property inheritance", () => {
 			assertEquals(workers.nativeDeduplication, mq.nativeDeduplication);
 		});
+		await t.step("atomicEnqueueMany capability propagation", () => {
+			assertEquals(workers.atomicEnqueueMany, mq.enqueueMany == null ? false : mq.atomicEnqueueMany);
+		});
 		await t.step("getDepth() delegation", async () => {
 			if (mq.getDepth == null) assertEquals(workers.getDepth, void 0);
 			else assertEquals(await workers.getDepth?.(), await mq.getDepth());

package/dist/federation/negotiation.test.mjs

@@ -1,10 +1,10 @@
 import "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import "../std__assert-B2NnY9bq.mjs";
-import { r as assertFalse } from "../assert_rejects-EgstcQy5.mjs";
-import { t as assert } from "../assert-CJ1KXcvv.mjs";
-import { t as acceptsJsonLd } from "../negotiation-RuwrPFqi.mjs";
+import { t as assertFalse } from "../assert_false-CPdRnc3E.mjs";
+import "../std__assert-DvMDRPes.mjs";
+import { t as assert } from "../assert-D1Eafmd_.mjs";
+import { t as acceptsJsonLd } from "../negotiation-CCocWT_N.mjs";
 import { test } from "@fedify/fixture";
 //#region src/federation/negotiation.test.ts
 test("acceptsJsonLd()", () => {

package/dist/federation/outgoing-proof.test.d.mts

@@ -0,0 +1,2 @@
+import { Temporal } from "temporal-polyfill";
+import { URLPattern } from "urlpattern-polyfill";