@remit/imap-worker 0.0.88 → 0.0.90

package/src/stranded-placement.sqlite.test.ts

@@ -84,7 +84,7 @@ const placementMover = (w: World): PlacementMoveService =>
 		addressService: w.client.address,
 		mailboxSpecialUseService: w.client.mailboxSpecialUse,
 		mailboxService: w.client.mailbox,
-		sqsQueueUrl: process.env.SQS_QUEUE_URL_MESSAGE_MGMT ?? "",
+		queue: w.client.queues.messageManagement,
 	});
 
 const placementOf = async (a: Arranged) => {
@@ -131,7 +131,8 @@ const queueRefuses = (w: World): void => {
 };
 
 const queueTakes = (w: World): void => {
-	w.queue.answer(async () => ({ Failed: [] }));
+	w.queue.answer(async () => ({}));
+	w.queue.refuse([]);
 };
 
 const redriveLater = async (
@@ -255,9 +256,7 @@ describe("a move whose event dies leaves no row moving", () => {
 
 	it("hands back a move to Trash whose batch entry the queue refused", async () => {
 		const a = await arrange();
-		a.w.queue.answer(async () => ({
-			Failed: [{ Id: "0", Code: "InvalidParameterValue", SenderFault: true }],
-		}));
+		a.w.queue.refuse([0]);
 
 		await assert.rejects(
 			a.w.client.messageMove.deleteMessages(
@@ -448,6 +447,7 @@ describe("the reconcile re-drives a move or delete already stranded", () => {
 		await handleMessageMove(
 			stamped<MessageMoveEvent>(move),
 			a.w.log,
+			a.w.queues,
 			1,
 			a.w.scope,
 		);
@@ -470,6 +470,7 @@ describe("the reconcile re-drives a move or delete already stranded", () => {
 		await handlePlacementMovePush(
 			stamped<PlacementMovePushEvent>(push),
 			a.w.log,
+			a.w.queues,
 			1,
 			a.w.scope,
 		);
@@ -501,6 +502,7 @@ describe("the reconcile re-drives a move or delete already stranded", () => {
 		await handleMessageMove(
 			stamped<MessageMoveEvent>(emitted[0]),
 			a.w.log,
+			a.w.queues,
 			1,
 			a.w.scope,
 		);
@@ -521,6 +523,7 @@ describe("the reconcile re-drives a move or delete already stranded", () => {
 				messageId: a.message.messageId,
 			}),
 			a.w.log,
+			a.w.queues,
 			1,
 			a.w.scope,
 		);
@@ -646,6 +649,7 @@ describe("a uid-0 copy whose event is gone", () => {
 		await handleMessageCopy(
 			stamped<MessageCopyEvent>(copy),
 			a.w.log,
+			a.w.queues,
 			1,
 			a.w.scope,
 		);

package/src/test-helpers/test-world.ts

@@ -5,10 +5,11 @@ import { tmpdir } from "node:os";
 import { join } from "node:path";
 import {
 	_resetForTest,
-	getClient,
 	type RemitClient,
 	setClient,
 } from "@remit/backend/client";
+import { createRemitClient } from "@remit/backend/create-remit-client";
+import { buildSharedDeps } from "@remit/backend/shared-deps";
 import type {
 	AccountItem,
 	MailboxItem,
@@ -16,11 +17,20 @@ import type {
 	MessageItem,
 	OutboxMessageItem,
 } from "@remit/data-ports";
+import {
+	type RecordingQueue,
+	recordingQueue,
+} from "@remit/data-ports/recording-queue";
 import {
 	AccountAuthType,
 	ConnectionState,
 	MailboxCursorState,
 } from "@remit/domain-enums";
+import {
+	createSqliteRepositories,
+	openSqliteDatabases,
+	sqliteDatabasePathsFromEnv,
+} from "@remit/drizzle-service";
 import { createShippedSqliteFiles } from "@remit/drizzle-service/test-sqlite";
 import type { Logger } from "@remit/logger";
 import type { ManagedConnectionFactory } from "@remit/mailbox-service";
@@ -28,13 +38,11 @@ import {
 	eml,
 	FakeImapServer,
 } from "@remit/mailbox-service/test-helpers/fake-imap";
-import {
-	captureQueue,
-	type QueueCapture,
-} from "@remit/mailbox-service/test-helpers/test-queue";
 import { serializeEncryptedPayload } from "@remit/secrets-service";
 import type { createConnectionScopeWithCredentials } from "../connection-scope.js";
 import { syncMessages } from "../handlers/sync-messages.js";
+import type { WorkerQueues } from "../queues.js";
+import { workerQueuesOn } from "./worker-queues.js";
 
 export interface LogLine {
 	level: string;
@@ -84,8 +92,8 @@ export interface SeededMessage {
 }
 
 /**
- * One SQLite store per test file, over the shipped migrations, composed by the
- * backend's own SQLite composition root over filesystem storage — every
+ * One SQLite store per test file, over the shipped migrations, composed from
+ * the backend's SQLite repositories over filesystem storage — every
  * repository and service a handler reaches is the one a self-host process
  * runs. Each `world()` is a fresh account on it, with its own in-memory mail
  * server at the IMAP port, and a message reaches the store the way mail does:
@@ -103,12 +111,29 @@ export const openStore = async (): Promise<{
 	process.env.BETTER_AUTH_URL = "https://mail.example.com";
 	process.env.BETTER_AUTH_SECRET = "a-signing-secret-of-at-least-32-characters";
 	_resetForTest();
-	const client = await getClient();
+	const repositories = createSqliteRepositories(
+		await openSqliteDatabases(sqliteDatabasePathsFromEnv()),
+	);
+	const queuesOn = (queue: RecordingQueue) => ({
+		sync: queue.fifo,
+		accountFanout: queue,
+		smtp: queue,
+		messageManagement: queue,
+		body: queue,
+	});
+	const shared = buildSharedDeps(queuesOn(recordingQueue()));
+	const clientOn = (queue: RecordingQueue): RemitClient =>
+		createRemitClient({ repositories, ...shared, queues: queuesOn(queue) });
+	const client = clientOn(recordingQueue());
 	setClient(client);
 	return {
 		client,
-		world: (accountConfigId = `cfg-${randomUUID()}`) =>
-			createWorld(client, accountConfigId),
+		world: (accountConfigId = `cfg-${randomUUID()}`) => {
+			const queue = recordingQueue();
+			const worldClient = clientOn(queue);
+			setClient(worldClient);
+			return createWorld(worldClient, queue, accountConfigId);
+		},
 		close: () => {
 			_resetForTest();
 			rmSync(directory, { recursive: true, force: true });
@@ -135,7 +160,8 @@ export interface World {
 	) => Promise<Array<{ mailboxId: string; uid?: number; isDeleted: boolean }>>;
 	queued: () => Array<Record<string, unknown>>;
 	refuseSends: (error: Error | undefined) => void;
-	queue: QueueCapture;
+	queue: RecordingQueue;
+	queues: WorkerQueues;
 	draft: (
 		attachment?: Buffer,
 	) => Promise<{ outbox: OutboxMessageItem; attachmentId?: string }>;
@@ -145,10 +171,9 @@ export interface World {
 
 const createWorld = async (
 	client: RemitClient,
+	queue: RecordingQueue,
 	accountConfigId: string,
 ): Promise<World> => {
-	const queue = captureQueue();
-
 	const imap = new FakeImapServer();
 	const logs: LogLine[] = [];
 	const password = await client.secrets.encrypt("app-password");
@@ -268,6 +293,7 @@ const createWorld = async (
 				mailboxId: mailbox.mailboxId,
 			},
 			capturingLogger([]),
+			workerQueuesOn(queue),
 			connectionFactory,
 		);
 		imap.connections = baseline.connections;
@@ -391,6 +417,7 @@ const createWorld = async (
 		queued,
 		refuseSends,
 		queue,
+		queues: workerQueuesOn(queue),
 		draft,
 		scope,
 		connectionFactory,

package/src/test-helpers/worker-queues.ts

@@ -0,0 +1,11 @@
+import type { RecordingQueue } from "@remit/data-ports/recording-queue";
+import type { WorkerQueues } from "../queues.js";
+
+export const workerQueuesOn = (queue: RecordingQueue): WorkerQueues => ({
+	mailboxes: queue.fifo,
+	messages: queue.fifo,
+	flags: queue.fifo,
+	body: queue,
+	mailboxManagement: queue,
+	messageManagement: queue,
+});

package/src/processor.test.ts

@@ -1,58 +0,0 @@
-import assert from "node:assert/strict";
-import { describe, it } from "node:test";
-import type { Logger } from "@remit/logger";
-import type { ImapWorkerStopEvent } from "./events.js";
-import { processEvent } from "./processor.js";
-
-interface CapturedLogEntry {
-	args: unknown[];
-}
-
-const createCapturingLogger = (): {
-	log: Logger;
-	infoCalls: CapturedLogEntry[];
-} => {
-	const infoCalls: CapturedLogEntry[] = [];
-	const noop = () => {};
-	const log = {
-		info: (...args: unknown[]) => infoCalls.push({ args }),
-		warn: noop,
-		error: noop,
-		debug: noop,
-		fatal: noop,
-		trace: noop,
-		child: () => log,
-	} as unknown as Logger;
-	return { log, infoCalls };
-};
-
-describe("processEvent — IMAP_WORKER_STOP", () => {
-	it("returns undefined and logs the stop signal — tombstone fence on the account row already halts work", async () => {
-		const event: ImapWorkerStopEvent = {
-			type: "IMAP_WORKER_STOP",
-			accountConfigId: "acfg_alice_replay_safe_test_id",
-			accountId: "acct_alice_replay_safe_test_id",
-		};
-		const { log, infoCalls } = createCapturingLogger();
-
-		const result = await processEvent(event, log);
-
-		assert.equal(result, undefined);
-		const matched = infoCalls.find((c) => {
-			const [meta, msg] = c.args;
-			return (
-				typeof msg === "string" &&
-				msg === "Imap worker stop signal received" &&
-				typeof meta === "object" &&
-				meta !== null &&
-				(meta as { accountConfigId?: string }).accountConfigId ===
-					event.accountConfigId &&
-				(meta as { accountId?: string }).accountId === event.accountId
-			);
-		});
-		assert.ok(
-			matched,
-			"processor must log the cascade-contract stop signal with both ids",
-		);
-	});
-});