@remit/imap-worker 0.0.70 → 0.0.71

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remit/imap-worker",
-  "version": "0.0.70",
+  "version": "0.0.71",
   "type": "module",
   "main": "dist/index.js",
   "exports": {

package/src/handlers/append-sent-message.test.ts

@@ -1,6 +1,6 @@
 import assert from "node:assert/strict";
 import { beforeEach, describe, it } from "node:test";
-import type { Logger } from "@remit/logger-lambda";
+import { noopLogger } from "@remit/logger-lambda/noop-logger";
 import type { AppendSentMessageEvent } from "../events.js";
 import {
 	APPEND_SENT_MAX_ATTEMPTS,
@@ -8,16 +8,6 @@ import {
 	handleAppendSentMessage,
 } from "./append-sent-message.js";
 
-const noopLog = {
-	info: () => {},
-	warn: () => {},
-	error: () => {},
-	debug: () => {},
-	fatal: () => {},
-	trace: () => {},
-	child: () => noopLog,
-} as unknown as Logger;
-
 interface Call {
 	method: string;
 	args: unknown[];
@@ -175,7 +165,7 @@ describe("handleAppendSentMessage", () => {
 	});
 
 	it("appends a seen RFC822 copy to the Sent folder and drops the outbox row", async () => {
-		await handleAppendSentMessage(event, noopLog, 1, deps());
+		await handleAppendSentMessage(event, noopLogger, 1, deps());
 
 		const append = called("connection.append")[0];
 		assert.equal(append?.args[0], "INBOX/Sent");
@@ -188,7 +178,7 @@ describe("handleAppendSentMessage", () => {
 	});
 
 	it("takes the draft's stored attachments with the row (#679)", async () => {
-		await handleAppendSentMessage(event, noopLog, 1, deps());
+		await handleAppendSentMessage(event, noopLogger, 1, deps());
 
 		// The row is the only reference to those objects. Sweeping has to happen
 		// here too, not only on a discard, or a sent message leaves its files
@@ -201,7 +191,7 @@ describe("handleAppendSentMessage", () => {
 	});
 
 	it("builds the message from the outbox row's own headers", async () => {
-		await handleAppendSentMessage(event, noopLog, 1, deps());
+		await handleAppendSentMessage(event, noopLogger, 1, deps());
 
 		const raw = String(called("connection.append")[0]?.args[1] as Buffer);
 		assert.match(raw, /^From: Alice <alice@example\.com>$/m);
@@ -216,7 +206,7 @@ describe("handleAppendSentMessage", () => {
 	it("uses a bare address when the outbox row carries no display name", async () => {
 		h.outbox = { ...h.outbox, fromName: undefined };
 
-		await handleAppendSentMessage(event, noopLog, 1, deps());
+		await handleAppendSentMessage(event, noopLogger, 1, deps());
 
 		const raw = String(called("connection.append")[0]?.args[1] as Buffer);
 		assert.match(raw, /^From: alice@example\.com$/m);
@@ -225,7 +215,7 @@ describe("handleAppendSentMessage", () => {
 	it("settles the row as unfiled when the account has no Sent folder at all", async () => {
 		h.sentMailbox = null;
 
-		await handleAppendSentMessage(event, noopLog, 1, deps());
+		await handleAppendSentMessage(event, noopLogger, 1, deps());
 
 		assert.equal(called("connection.append").length, 0);
 		assert.equal(called("outboxMessage.delete").length, 0);
@@ -243,7 +233,7 @@ describe("handleAppendSentMessage", () => {
 	it("skips the append while the outbox row is not yet sent", async () => {
 		h.outbox = { ...h.outbox, status: "pending" };
 
-		await handleAppendSentMessage(event, noopLog, 1, deps());
+		await handleAppendSentMessage(event, noopLogger, 1, deps());
 
 		assert.equal(called("connection.append").length, 0);
 		assert.equal(called("outboxMessage.delete").length, 0);
@@ -252,7 +242,7 @@ describe("handleAppendSentMessage", () => {
 	it("returns early without touching the outbox when the account is soft-deleted", async () => {
 		h.account = { ...h.account, deletedAt: Date.now() };
 
-		await handleAppendSentMessage(event, noopLog, 1, deps());
+		await handleAppendSentMessage(event, noopLogger, 1, deps());
 
 		assert.equal(called("connection.append").length, 0);
 		assert.equal(called("outboxMessage.delete").length, 0);
@@ -264,7 +254,7 @@ describe("handleAppendSentMessage", () => {
 		};
 
 		await assert.rejects(
-			handleAppendSentMessage(event, noopLog, 1, deps()),
+			handleAppendSentMessage(event, noopLogger, 1, deps()),
 			/server exploded/,
 		);
 
@@ -282,7 +272,7 @@ describe("handleAppendSentMessage", () => {
 
 		await handleAppendSentMessage(
 			event,
-			noopLog,
+			noopLogger,
 			APPEND_SENT_MAX_ATTEMPTS,
 			deps(),
 		);
@@ -301,7 +291,7 @@ describe("handleAppendSentMessage", () => {
 	it("settles the row as unfiled when a terminal auth failure acks the record", async () => {
 		h.ackWithoutWork = true;
 
-		await handleAppendSentMessage(event, noopLog, 1, deps());
+		await handleAppendSentMessage(event, noopLogger, 1, deps());
 
 		const patch = called("outboxMessage.update")[0]?.args[2] as {
 			status: string;
@@ -313,7 +303,7 @@ describe("handleAppendSentMessage", () => {
 
 	it("leaves the row alone when the APPEND landed but the delete did not", async () => {
 		await assert.rejects(
-			handleAppendSentMessage(event, noopLog, 1, depsWithFailingDelete()),
+			handleAppendSentMessage(event, noopLogger, 1, depsWithFailingDelete()),
 			/storage down/,
 		);
 
@@ -325,7 +315,7 @@ describe("handleAppendSentMessage", () => {
 	it("stops redelivering a landed APPEND at the budget instead of filing another copy", async () => {
 		await handleAppendSentMessage(
 			event,
-			noopLog,
+			noopLogger,
 			APPEND_SENT_MAX_ATTEMPTS,
 			depsWithFailingDelete(),
 		);
@@ -335,7 +325,7 @@ describe("handleAppendSentMessage", () => {
 	});
 
 	it("records the uid the APPEND produced before it deletes the row", async () => {
-		await handleAppendSentMessage(event, noopLog, 1, deps());
+		await handleAppendSentMessage(event, noopLogger, 1, deps());
 
 		// Order is the whole of it: a uid written after the delete is a uid a
 		// redelivery never sees, and the redelivery is what files the second copy.
@@ -352,7 +342,7 @@ describe("handleAppendSentMessage", () => {
 		// nothing, and "filed" still has to be told apart from "not filed".
 		h.append = async () => ({ uid: 0, uidValidity: 0 });
 
-		await handleAppendSentMessage(event, noopLog, 1, deps());
+		await handleAppendSentMessage(event, noopLogger, 1, deps());
 
 		assert.deepEqual(patches(), [{ appendedUid: -1 }]);
 		assert.equal(called("outboxMessage.delete").length, 1);
@@ -361,7 +351,7 @@ describe("handleAppendSentMessage", () => {
 	it("files nothing a second time when a redelivery finds a recorded uid (#858)", async () => {
 		h.outbox = { ...h.outbox, appendedUid: 55 };
 
-		await handleAppendSentMessage(event, noopLog, 1, deps());
+		await handleAppendSentMessage(event, noopLogger, 1, deps());
 
 		// The copy is already in the user's Sent folder. All this redelivery owes
 		// is the delete the last attempt could not make.
@@ -382,7 +372,7 @@ describe("handleAppendSentMessage", () => {
 		h.outbox = { ...h.outbox, appendedUid: 55 };
 
 		await assert.rejects(
-			handleAppendSentMessage(event, noopLog, 1, depsWithFailingDelete()),
+			handleAppendSentMessage(event, noopLogger, 1, depsWithFailingDelete()),
 			/storage down/,
 		);
 
@@ -392,7 +382,7 @@ describe("handleAppendSentMessage", () => {
 
 	it("keeps the row when the uid cannot be recorded", async () => {
 		await assert.rejects(
-			handleAppendSentMessage(event, noopLog, 1, depsWithFailingUpdate()),
+			handleAppendSentMessage(event, noopLogger, 1, depsWithFailingUpdate()),
 			/storage down/,
 		);
 
@@ -425,7 +415,7 @@ describe("handleAppendSentMessage", () => {
 			},
 		};
 
-		await handleAppendSentMessage(event, noopLog, 1, failing);
+		await handleAppendSentMessage(event, noopLogger, 1, failing);
 
 		assert.equal(called("connection.append").length, 0);
 		assert.deepEqual(patches(), []);
@@ -436,7 +426,7 @@ describe("handleAppendSentMessage", () => {
 
 		await handleAppendSentMessage(
 			event,
-			noopLog,
+			noopLogger,
 			APPEND_SENT_MAX_ATTEMPTS,
 			depsWithFailingDelete(),
 		);

package/src/handlers/delete-account-objects.test.ts

@@ -6,21 +6,11 @@ import {
 	S3Client,
 } from "@aws-sdk/client-s3";
 import { SendMessageCommand, SQSClient } from "@aws-sdk/client-sqs";
-import type { Logger } from "@remit/logger-lambda";
+import { noopLogger } from "@remit/logger-lambda/noop-logger";
 import { mockClient } from "aws-sdk-client-mock";
 import type { DeleteAccountObjectsEvent } from "../events.js";
 import { handleDeleteAccountObjects } from "./delete-account-objects.js";
 
-const noopLog = {
-	info: () => {},
-	warn: () => {},
-	error: () => {},
-	debug: () => {},
-	fatal: () => {},
-	trace: () => {},
-	child: () => noopLog,
-} as unknown as Logger;
-
 const s3Mock = mockClient(S3Client);
 const sqsMock = mockClient(SQSClient);
 
@@ -45,7 +35,7 @@ describe("handleDeleteAccountObjects", () => {
 		});
 		s3Mock.on(DeleteObjectsCommand).resolves({});
 
-		await handleDeleteAccountObjects(event, noopLog);
+		await handleDeleteAccountObjects(event, noopLogger);
 
 		const listCall = s3Mock.commandCalls(ListObjectsV2Command)[0];
 		assert.equal(listCall.args[0].input.Prefix, "accounts/cfg-1/");
@@ -72,7 +62,7 @@ describe("handleDeleteAccountObjects", () => {
 			});
 		s3Mock.on(DeleteObjectsCommand).resolves({});
 
-		await handleDeleteAccountObjects(event, noopLog);
+		await handleDeleteAccountObjects(event, noopLogger);
 
 		const listCalls = s3Mock.commandCalls(ListObjectsV2Command);
 		assert.equal(listCalls.length, 2);
@@ -83,7 +73,7 @@ describe("handleDeleteAccountObjects", () => {
 	it("skips the delete call when a page holds no keys", async () => {
 		s3Mock.on(ListObjectsV2Command).resolves({ IsTruncated: false });
 
-		await handleDeleteAccountObjects(event, noopLog);
+		await handleDeleteAccountObjects(event, noopLogger);
 
 		assert.equal(s3Mock.commandCalls(DeleteObjectsCommand).length, 0);
 	});
@@ -94,7 +84,7 @@ describe("handleDeleteAccountObjects", () => {
 
 		await handleDeleteAccountObjects(
 			{ ...event, continuationToken: "tok-mid" },
-			noopLog,
+			noopLogger,
 			() => 5_000,
 		);
 
@@ -119,7 +109,7 @@ describe("handleDeleteAccountObjects", () => {
 		});
 		s3Mock.on(DeleteObjectsCommand).resolves({});
 
-		await handleDeleteAccountObjects(event, noopLog, () => 120_000);
+		await handleDeleteAccountObjects(event, noopLogger, () => 120_000);
 
 		assert.equal(s3Mock.commandCalls(ListObjectsV2Command).length, 1);
 		assert.equal(sqsMock.commandCalls(SendMessageCommand).length, 0);

package/src/handlers/empty-trash.test.ts

@@ -1,20 +1,10 @@
 import assert from "node:assert/strict";
 import { beforeEach, describe, it } from "node:test";
 import type { RoleResolution } from "@remit/data-ports/folder-role";
-import type { Logger } from "@remit/logger-lambda";
+import { noopLogger } from "@remit/logger-lambda/noop-logger";
 import type { EmptyTrashEvent } from "../events.js";
 import { type EmptyTrashDeps, handleEmptyTrash } from "./empty-trash.js";
 
-const noopLog = {
-	info: () => {},
-	warn: () => {},
-	error: () => {},
-	debug: () => {},
-	fatal: () => {},
-	trace: () => {},
-	child: () => noopLog,
-} as unknown as Logger;
-
 interface Call {
 	method: string;
 	args: unknown[];
@@ -224,7 +214,7 @@ describe("handleEmptyTrash", () => {
 	});
 
 	it("expunges every server uid and both local rows for each trashed message", async () => {
-		await handleEmptyTrash(event, noopLog, deps());
+		await handleEmptyTrash(event, noopLogger, deps());
 
 		assert.deepEqual(called("connection.deleteMessages")[0]?.args, [[10, 11]]);
 		assert.deepEqual(
@@ -245,7 +235,7 @@ describe("handleEmptyTrash", () => {
 			{ messageId: "msg-late", uid: 12, status: "active" },
 		];
 
-		await handleEmptyTrash(event, noopLog, deps());
+		await handleEmptyTrash(event, noopLogger, deps());
 
 		assert.deepEqual(
 			called("message.delete").map((c) => c.args[0]),
@@ -259,7 +249,7 @@ describe("handleEmptyTrash", () => {
 		// exists anywhere, with nothing left to clear the mark.
 		h.connection.search = async () => [];
 
-		await handleEmptyTrash(event, noopLog, deps());
+		await handleEmptyTrash(event, noopLogger, deps());
 
 		assert.equal(called("connection.deleteMessages").length, 0);
 		assert.equal(called("message.delete").length, 0);
@@ -274,7 +264,7 @@ describe("handleEmptyTrash", () => {
 		h.localMessages = [deleting("msg-2", 11)];
 		h.connection.search = async () => [];
 
-		await handleEmptyTrash(event, noopLog, deps());
+		await handleEmptyTrash(event, noopLogger, deps());
 
 		assert.equal(called("message.delete").length, 0);
 		assert.deepEqual(revertedMessageIds(), ["msg-2"]);
@@ -288,7 +278,7 @@ describe("handleEmptyTrash", () => {
 		h.messagesWithoutListingRow = ["msg-expunging"];
 		h.connection.search = async () => [];
 
-		await handleEmptyTrash(event, noopLog, deps());
+		await handleEmptyTrash(event, noopLogger, deps());
 
 		assert.deepEqual(revertedMessageIds(), ["msg-1"]);
 	});
@@ -296,7 +286,7 @@ describe("handleEmptyTrash", () => {
 	it("deletes the message even when it has no thread row", async () => {
 		h.threadMessage = false;
 
-		await handleEmptyTrash(event, noopLog, deps());
+		await handleEmptyTrash(event, noopLogger, deps());
 
 		assert.equal(called("message.delete").length, 2);
 		assert.equal(called("threadMessage.delete").length, 0);
@@ -309,7 +299,7 @@ describe("handleEmptyTrash", () => {
 			deletedAt: Date.now(),
 		};
 
-		await handleEmptyTrash(event, noopLog, deps());
+		await handleEmptyTrash(event, noopLogger, deps());
 
 		assert.equal(h.getConnectionCount, 0);
 	});
@@ -317,7 +307,10 @@ describe("handleEmptyTrash", () => {
 	it("throws when the account no longer exists", async () => {
 		h.account = null;
 
-		await assert.rejects(handleEmptyTrash(event, noopLog, deps()), /not found/);
+		await assert.rejects(
+			handleEmptyTrash(event, noopLogger, deps()),
+			/not found/,
+		);
 	});
 
 	it("acks terminally without connecting when the Trash mailbox was deleted", async () => {
@@ -325,7 +318,7 @@ describe("handleEmptyTrash", () => {
 			name: "NotFoundError",
 		});
 
-		await handleEmptyTrash(event, noopLog, deps());
+		await handleEmptyTrash(event, noopLogger, deps());
 
 		assert.equal(h.getConnectionCount, 0);
 		assert.equal(called("message.delete").length, 0);
@@ -339,7 +332,7 @@ describe("handleEmptyTrash", () => {
 			trashMailboxPath: "Trash",
 		} as unknown as EmptyTrashEvent;
 
-		await handleEmptyTrash(unversioned, noopLog, deps());
+		await handleEmptyTrash(unversioned, noopLogger, deps());
 
 		assert.equal(h.getConnectionCount, 0, "no connection is ever opened");
 		assert.equal(called("connection.deleteMessages").length, 0);
@@ -353,7 +346,7 @@ describe("handleEmptyTrash", () => {
 			mailbox: { mailboxId: "other-mbx", fullPath: "INBOX/Bak" },
 		};
 
-		await handleEmptyTrash(event, noopLog, deps());
+		await handleEmptyTrash(event, noopLogger, deps());
 
 		assert.equal(h.getConnectionCount, 0);
 		assert.equal(called("connection.deleteMessages").length, 0);
@@ -366,7 +359,7 @@ describe("handleEmptyTrash", () => {
 			mailbox: { mailboxId: "trash-mbx", fullPath: "Trash" },
 		};
 
-		await handleEmptyTrash(event, noopLog, deps());
+		await handleEmptyTrash(event, noopLogger, deps());
 
 		assert.equal(called("connection.deleteMessages").length, 0);
 		assert.deepEqual(revertedMessageIds(), ["msg-1", "msg-2"]);
@@ -378,7 +371,7 @@ describe("handleEmptyTrash", () => {
 		h.connection.openBox = async () => ({ uidvalidity: 77 });
 		h.mailbox = { mailboxId: "trash-mbx", uidValidity: 77 };
 
-		await handleEmptyTrash(event, noopLog, deps());
+		await handleEmptyTrash(event, noopLogger, deps());
 
 		assert.equal(called("connection.deleteMessages").length, 0);
 		assert.deepEqual(revertedMessageIds(), ["msg-1", "msg-2"]);
@@ -394,7 +387,7 @@ describe("handleEmptyTrash", () => {
 		h.connection.openBox = async () => ({ uidvalidity: 77 });
 		h.mailbox = { mailboxId: "trash-mbx", uidValidity: 77 };
 
-		await handleEmptyTrash(event, noopLog, deps());
+		await handleEmptyTrash(event, noopLogger, deps());
 
 		assert.deepEqual(revertedMessageIds(), ["msg-1"]);
 		assert.deepEqual(undeletedThreadMessageIds(), ["tm-msg-1"]);
@@ -405,7 +398,7 @@ describe("handleEmptyTrash", () => {
 		// marked `deleting` hides healthy mail until the user notices.
 		h.connection.openBox = async () => ({ uidvalidity: 999 });
 
-		await handleEmptyTrash(event, noopLog, deps());
+		await handleEmptyTrash(event, noopLogger, deps());
 
 		assert.equal(
 			(called("mailbox.update")[0]?.args[2] as { cursorState?: string })
@@ -424,7 +417,7 @@ describe("handleEmptyTrash", () => {
 			cursorState: "rebuilding",
 		};
 
-		await handleEmptyTrash(event, noopLog, deps());
+		await handleEmptyTrash(event, noopLogger, deps());
 
 		assert.equal(h.getConnectionCount, 0);
 		assert.equal(called("message.delete").length, 0);
@@ -437,7 +430,7 @@ describe("handleEmptyTrash", () => {
 		};
 
 		await assert.rejects(
-			handleEmptyTrash(event, noopLog, deps()),
+			handleEmptyTrash(event, noopLogger, deps()),
 			/server exploded/,
 		);
 
@@ -463,7 +456,7 @@ describe("handleEmptyTrash and an unsettled placement", () => {
 			movingIntoTrash("msg-moving", 10),
 		];
 
-		await handleEmptyTrash(event, noopLog, deps());
+		await handleEmptyTrash(event, noopLogger, deps());
 
 		assert.deepEqual(
 			called("message.delete").map((c) => c.args[0]),
@@ -480,7 +473,7 @@ describe("handleEmptyTrash and an unsettled placement", () => {
 		// uid is somebody else's.
 		h.localMessages = [retryingIntoTrash("msg-retrying", 11)];
 
-		await handleEmptyTrash(event, noopLog, deps());
+		await handleEmptyTrash(event, noopLogger, deps());
 
 		assert.equal(called("message.delete").length, 0);
 		assert.equal(called("threadMessage.delete").length, 0);
@@ -495,7 +488,7 @@ describe("handleEmptyTrash and an unsettled placement", () => {
 		// `deleting` is hidden from every listing for good.
 		h.localMessages = [deleting("msg-1", 10), markedMidMove("msg-marked", 11)];
 
-		await handleEmptyTrash(event, noopLog, deps());
+		await handleEmptyTrash(event, noopLogger, deps());
 
 		assert.deepEqual(
 			called("message.delete").map((c) => c.args[0]),
@@ -522,7 +515,7 @@ describe("handleEmptyTrash and an unsettled placement", () => {
 			},
 		];
 
-		await handleEmptyTrash(event, noopLog, deps());
+		await handleEmptyTrash(event, noopLogger, deps());
 
 		assert.deepEqual(
 			called("message.delete").map((c) => c.args[0]),
@@ -547,7 +540,7 @@ describe("handleEmptyTrash and an unsettled placement", () => {
 			},
 		];
 
-		await handleEmptyTrash(event, noopLog, deps());
+		await handleEmptyTrash(event, noopLogger, deps());
 
 		assert.deepEqual(
 			called("message.delete").map((c) => c.args[0]),

package/src/handlers/mailbox-management.test.ts

@@ -1,6 +1,6 @@
 import assert from "node:assert/strict";
 import { beforeEach, describe, it } from "node:test";
-import type { Logger } from "@remit/logger-lambda";
+import { noopLogger } from "@remit/logger-lambda/noop-logger";
 import type {
 	MailboxCreateEvent,
 	MailboxDeleteEvent,
@@ -11,16 +11,6 @@ import {
 	processMailboxManagement,
 } from "./mailbox-management.js";
 
-const noopLog = {
-	info: () => {},
-	warn: () => {},
-	error: () => {},
-	debug: () => {},
-	fatal: () => {},
-	trace: () => {},
-	child: () => noopLog,
-} as unknown as Logger;
-
 interface Call {
 	method: string;
 	args: unknown[];
@@ -163,7 +153,7 @@ describe("processMailboxManagement — MAILBOX_CREATE", () => {
 	});
 
 	it("creates the folder and writes back the server's UIDVALIDITY and counts", async () => {
-		await processMailboxManagement(createEvent, noopLog, deps());
+		await processMailboxManagement(createEvent, noopLogger, deps());
 
 		assert.equal(called("connection.createMailbox")[0]?.args[0], "Archive");
 		assert.deepEqual(lastUpdate(), {
@@ -176,13 +166,13 @@ describe("processMailboxManagement — MAILBOX_CREATE", () => {
 	});
 
 	it("subscribes only when the event asks for it", async () => {
-		await processMailboxManagement(createEvent, noopLog, deps());
+		await processMailboxManagement(createEvent, noopLogger, deps());
 		assert.equal(called("connection.subscribeMailbox").length, 0);
 
 		h = fresh();
 		await processMailboxManagement(
 			{ ...createEvent, subscribe: true },
-			noopLog,
+			noopLogger,
 			deps(),
 		);
 		assert.equal(called("connection.subscribeMailbox")[0]?.args[0], "Archive");
@@ -191,7 +181,7 @@ describe("processMailboxManagement — MAILBOX_CREATE", () => {
 	it("still marks the mailbox synced when the server does not list the new folder", async () => {
 		h.connection.listMailboxes = async () => [];
 
-		await processMailboxManagement(createEvent, noopLog, deps());
+		await processMailboxManagement(createEvent, noopLogger, deps());
 
 		assert.deepEqual(lastUpdate(), { syncStatus: "synced" });
 	});
@@ -201,7 +191,7 @@ describe("processMailboxManagement — MAILBOX_CREATE", () => {
 			throw new Error("Mailbox already exists");
 		};
 
-		await processMailboxManagement(createEvent, noopLog, deps());
+		await processMailboxManagement(createEvent, noopLogger, deps());
 
 		assert.deepEqual(lastUpdate(), { syncStatus: "synced" });
 	});
@@ -212,7 +202,7 @@ describe("processMailboxManagement — MAILBOX_CREATE", () => {
 		};
 
 		await assert.rejects(
-			processMailboxManagement(createEvent, noopLog, deps()),
+			processMailboxManagement(createEvent, noopLogger, deps()),
 			/server exploded/,
 		);
 
@@ -225,7 +215,7 @@ describe("processMailboxManagement — MAILBOX_CREATE", () => {
 		// create is moot and must not poison the account's FIFO.
 		h.mailboxUpdateError = notFoundError();
 
-		await processMailboxManagement(createEvent, noopLog, deps());
+		await processMailboxManagement(createEvent, noopLogger, deps());
 
 		assert.equal(h.disconnectCount, 1, "the scope is still disconnected");
 	});
@@ -237,7 +227,7 @@ describe("processMailboxManagement — MAILBOX_CREATE", () => {
 			deletedAt: Date.now(),
 		};
 
-		await processMailboxManagement(createEvent, noopLog, deps());
+		await processMailboxManagement(createEvent, noopLogger, deps());
 
 		assert.equal(called("connection.createMailbox").length, 0);
 	});
@@ -246,7 +236,7 @@ describe("processMailboxManagement — MAILBOX_CREATE", () => {
 		h.account = null;
 
 		await assert.rejects(
-			processMailboxManagement(createEvent, noopLog, deps()),
+			processMailboxManagement(createEvent, noopLogger, deps()),
 			/not found/,
 		);
 	});
@@ -258,7 +248,7 @@ describe("processMailboxManagement — MAILBOX_RENAME", () => {
 	});
 
 	it("renames on the server and clears the pending oldPath", async () => {
-		await processMailboxManagement(renameEvent, noopLog, deps());
+		await processMailboxManagement(renameEvent, noopLogger, deps());
 
 		assert.deepEqual(called("connection.renameMailbox")[0]?.args, [
 			"Archive",
@@ -275,7 +265,7 @@ describe("processMailboxManagement — MAILBOX_RENAME", () => {
 			throw new Error("Mailbox not found");
 		};
 
-		await processMailboxManagement(renameEvent, noopLog, deps());
+		await processMailboxManagement(renameEvent, noopLogger, deps());
 
 		assert.deepEqual(called("mailbox.delete")[0]?.args, ["acc-1", "mbx-1"]);
 		assert.equal(called("mailbox.update").length, 0);
@@ -287,7 +277,7 @@ describe("processMailboxManagement — MAILBOX_RENAME", () => {
 		};
 		h.mailboxUpdateError = notFoundError();
 
-		await processMailboxManagement(renameEvent, noopLog, deps());
+		await processMailboxManagement(renameEvent, noopLogger, deps());
 
 		assert.equal(h.disconnectCount, 1, "the scope is still disconnected");
 	});
@@ -298,7 +288,7 @@ describe("processMailboxManagement — MAILBOX_RENAME", () => {
 		};
 
 		await assert.rejects(
-			processMailboxManagement(renameEvent, noopLog, deps()),
+			processMailboxManagement(renameEvent, noopLogger, deps()),
 			/server exploded/,
 		);
 
@@ -316,7 +306,7 @@ describe("processMailboxManagement — MAILBOX_DELETE", () => {
 	});
 
 	it("deletes on the server and drops the local row", async () => {
-		await processMailboxManagement(deleteEvent, noopLog, deps());
+		await processMailboxManagement(deleteEvent, noopLogger, deps());
 
 		assert.equal(called("connection.deleteMailbox")[0]?.args[0], "Archive");
 		assert.deepEqual(called("mailbox.delete")[0]?.args, ["acc-1", "mbx-1"]);
@@ -327,7 +317,7 @@ describe("processMailboxManagement — MAILBOX_DELETE", () => {
 			throw new Error("Mailbox not found");
 		};
 
-		await processMailboxManagement(deleteEvent, noopLog, deps());
+		await processMailboxManagement(deleteEvent, noopLogger, deps());
 
 		assert.equal(called("mailbox.delete").length, 1);
 	});
@@ -337,7 +327,7 @@ describe("processMailboxManagement — MAILBOX_DELETE", () => {
 			throw new Error("Cannot delete INBOX");
 		};
 
-		await processMailboxManagement(deleteEvent, noopLog, deps());
+		await processMailboxManagement(deleteEvent, noopLogger, deps());
 
 		assert.deepEqual(lastUpdate(), { syncStatus: "synced" });
 		assert.equal(called("mailbox.delete").length, 0);
@@ -349,7 +339,7 @@ describe("processMailboxManagement — MAILBOX_DELETE", () => {
 		};
 
 		await assert.rejects(
-			processMailboxManagement(deleteEvent, noopLog, deps()),
+			processMailboxManagement(deleteEvent, noopLogger, deps()),
 			/server exploded/,
 		);
 
@@ -362,7 +352,7 @@ describe("processMailboxManagement — MAILBOX_DELETE", () => {
 		};
 		h.mailboxUpdateError = notFoundError();
 
-		await processMailboxManagement(deleteEvent, noopLog, deps());
+		await processMailboxManagement(deleteEvent, noopLogger, deps());
 
 		assert.equal(h.disconnectCount, 1, "the scope is still disconnected");
 	});
@@ -388,7 +378,7 @@ describe("processMailboxManagement — a tagged NO the server means as success (
 		};
 
 		await assert.doesNotReject(
-			processMailboxManagement(deleteEvent, noopLog, deps()),
+			processMailboxManagement(deleteEvent, noopLogger, deps()),
 		);
 		assert.deepEqual(called("mailbox.delete")[0]?.args, ["acc-1", "mbx-1"]);
 		assert.equal(called("mailbox.update").length, 0);
@@ -403,7 +393,7 @@ describe("processMailboxManagement — a tagged NO the server means as success (
 		};
 
 		await assert.rejects(
-			processMailboxManagement(deleteEvent, noopLog, deps()),
+			processMailboxManagement(deleteEvent, noopLogger, deps()),
 			/Command failed/,
 		);
 		assert.deepEqual(lastUpdate(), { syncStatus: "failed" });
@@ -424,7 +414,7 @@ describe("processMailboxManagement — a tagged NO the server means as success (
 		};
 
 		await assert.doesNotReject(
-			processMailboxManagement(createEvent, noopLog, deps()),
+			processMailboxManagement(createEvent, noopLogger, deps()),
 		);
 		assert.deepEqual(lastUpdate(), { syncStatus: "synced" });
 	});
@@ -438,7 +428,7 @@ describe("processMailboxManagement — a tagged NO the server means as success (
 		};
 
 		await assert.rejects(
-			processMailboxManagement(createEvent, noopLog, deps()),
+			processMailboxManagement(createEvent, noopLogger, deps()),
 			/Command failed/,
 		);
 		assert.deepEqual(lastUpdate(), { syncStatus: "failed" });
@@ -453,7 +443,7 @@ describe("processMailboxManagement — a tagged NO the server means as success (
 		};
 
 		await assert.doesNotReject(
-			processMailboxManagement(renameEvent, noopLog, deps()),
+			processMailboxManagement(renameEvent, noopLogger, deps()),
 		);
 		assert.deepEqual(called("mailbox.delete")[0]?.args, ["acc-1", "mbx-1"]);
 	});
@@ -467,7 +457,7 @@ describe("processMailboxManagement — a tagged NO the server means as success (
 		};
 
 		await assert.rejects(
-			processMailboxManagement(renameEvent, noopLog, deps()),
+			processMailboxManagement(renameEvent, noopLogger, deps()),
 			/Command failed/,
 		);
 		assert.equal(lastUpdate()?.syncStatus, "failed");

package/src/handlers/message-copy.test.ts

@@ -1,19 +1,9 @@
 import assert from "node:assert/strict";
 import { beforeEach, describe, it } from "node:test";
-import type { Logger } from "@remit/logger-lambda";
+import { noopLogger } from "@remit/logger-lambda/noop-logger";
 import type { MessageCopyEvent } from "../events.js";
 import { handleMessageCopy, type MessageCopyDeps } from "./message-copy.js";
 
-const noopLog = {
-	info: () => {},
-	warn: () => {},
-	error: () => {},
-	debug: () => {},
-	fatal: () => {},
-	trace: () => {},
-	child: () => noopLog,
-} as unknown as Logger;
-
 interface Call {
 	method: string;
 	args: unknown[];
@@ -194,7 +184,7 @@ describe("handleMessageCopy", () => {
 	});
 
 	it("writes the new UID, marks the copy synced, and updates the thread row", async () => {
-		await handleMessageCopy(event, noopLog, 1, deps());
+		await handleMessageCopy(event, noopLogger, 1, deps());
 
 		assert.deepEqual(called("message.updateUid")[0]?.args, [
 			"new-msg",
@@ -214,7 +204,7 @@ describe("handleMessageCopy", () => {
 		h.connection.copyMessages = async () => ({ uidMap: new Map() });
 		h.destinationHolds = [42];
 
-		await handleMessageCopy(event, noopLog, 1, deps());
+		await handleMessageCopy(event, noopLogger, 1, deps());
 
 		assert.ok(askedTheDestination(), "the destination was asked for the copy");
 		assert.deepEqual(called("message.updateUid")[0]?.args, [
@@ -240,7 +230,7 @@ describe("handleMessageCopy", () => {
 		h.connection.copyMessages = async () => ({ uidMap: new Map() });
 		h.destinationHolds = [12, 42];
 
-		await handleMessageCopy(event, noopLog, 1, deps());
+		await handleMessageCopy(event, noopLogger, 1, deps());
 
 		assert.deepEqual(called("message.updateUid")[0]?.args, [
 			"new-msg",
@@ -253,7 +243,7 @@ describe("handleMessageCopy", () => {
 		h.connection.copyMessages = async () => ({ uidMap: new Map() });
 		h.destinationHolds = [];
 
-		await handleMessageCopy(event, noopLog, 1, deps());
+		await handleMessageCopy(event, noopLogger, 1, deps());
 
 		assert.ok(askedTheDestination());
 		assert.equal(called("message.delete")[0]?.args[0], "new-msg");
@@ -269,7 +259,7 @@ describe("handleMessageCopy", () => {
 		};
 		h.copyRow = { ...unsettledCopyRow(), messageIdHeader: undefined };
 
-		await handleMessageCopy(event, noopLog, 1, deps());
+		await handleMessageCopy(event, noopLogger, 1, deps());
 
 		assert.equal(copies, 1, "the COPY is issued once");
 		assert.equal(called("search").length, 0, "there is nothing to ask with");
@@ -285,7 +275,7 @@ describe("handleMessageCopy", () => {
 	it("never copies twice when a redelivered copy already landed", async () => {
 		h.destinationHolds = [42];
 
-		await handleMessageCopy(event, noopLog, 2, deps());
+		await handleMessageCopy(event, noopLogger, 2, deps());
 
 		assert.equal(called("copyMessages").length, 0);
 		assert.deepEqual(called("message.updateUid")[0]?.args, [
@@ -305,10 +295,10 @@ describe("handleMessageCopy", () => {
 		};
 
 		await assert.rejects(
-			handleMessageCopy(event, noopLog, 1, deps()),
+			handleMessageCopy(event, noopLogger, 1, deps()),
 			/connection reset/,
 		);
-		await handleMessageCopy(event, noopLog, 2, deps());
+		await handleMessageCopy(event, noopLogger, 2, deps());
 
 		assert.equal(copies, 1, "the redelivery issues no second COPY");
 		assert.equal(called("search").length, 0);
@@ -324,7 +314,7 @@ describe("handleMessageCopy", () => {
 			syncStatus: "synced",
 		};
 
-		await handleMessageCopy(event, noopLog, 2, deps());
+		await handleMessageCopy(event, noopLogger, 2, deps());
 
 		assert.equal(h.getConnectionCount, 0);
 		assert.equal(called("copyMessages").length, 0);
@@ -333,7 +323,7 @@ describe("handleMessageCopy", () => {
 	it("acks when the copy row no longer exists", async () => {
 		h.copyRow = null;
 
-		await handleMessageCopy(event, noopLog, 1, deps());
+		await handleMessageCopy(event, noopLogger, 1, deps());
 
 		assert.equal(h.getConnectionCount, 0);
 		assert.equal(called("message.update").length, 0);
@@ -346,7 +336,7 @@ describe("handleMessageCopy", () => {
 			deletedAt: Date.now(),
 		};
 
-		await handleMessageCopy(event, noopLog, 1, deps());
+		await handleMessageCopy(event, noopLogger, 1, deps());
 
 		assert.equal(h.getConnectionCount, 0);
 	});
@@ -355,7 +345,7 @@ describe("handleMessageCopy", () => {
 		h.account = null;
 
 		await assert.rejects(
-			handleMessageCopy(event, noopLog, 1, deps()),
+			handleMessageCopy(event, noopLogger, 1, deps()),
 			/not found/,
 		);
 	});
@@ -363,7 +353,7 @@ describe("handleMessageCopy", () => {
 	it("acks terminally without connecting when the source mailbox was deleted", async () => {
 		h.mailboxError = notFoundError();
 
-		await handleMessageCopy(event, noopLog, 1, deps());
+		await handleMessageCopy(event, noopLogger, 1, deps());
 
 		assert.equal(h.getConnectionCount, 0);
 		assert.equal(called("message.updateUid").length, 0);
@@ -382,7 +372,7 @@ describe("handleMessageCopy", () => {
 			cursorState: "rebuilding",
 		};
 
-		await handleMessageCopy(event, noopLog, 1, deps());
+		await handleMessageCopy(event, noopLogger, 1, deps());
 
 		assert.equal(h.getConnectionCount, 0);
 		assert.equal(called("message.updateUid").length, 0);
@@ -405,7 +395,7 @@ describe("handleMessageCopy", () => {
 		};
 		h.destinationHolds = [42];
 
-		await handleMessageCopy(event, noopLog, 2, deps());
+		await handleMessageCopy(event, noopLogger, 2, deps());
 
 		assert.ok(askedTheDestination(), "the destination was asked for the copy");
 		assert.deepEqual(called("message.updateUid")[0]?.args, [
@@ -429,7 +419,7 @@ describe("handleMessageCopy", () => {
 		};
 		h.copyRow = { ...unsettledCopyRow(), messageIdHeader: undefined };
 
-		await handleMessageCopy(event, noopLog, 2, deps());
+		await handleMessageCopy(event, noopLogger, 2, deps());
 
 		assert.equal(
 			called("message.delete").length,
@@ -453,7 +443,7 @@ describe("handleMessageCopy", () => {
 			cursorState: "rebuilding",
 		};
 
-		await handleMessageCopy(event, noopLog, 1, deps());
+		await handleMessageCopy(event, noopLogger, 1, deps());
 
 		assert.deepEqual(
 			called("emitEvent").map((c) => c.args[0]),
@@ -472,7 +462,7 @@ describe("handleMessageCopy", () => {
 		};
 		h.destinationHolds = [];
 
-		await handleMessageCopy(event, noopLog, 2, deps());
+		await handleMessageCopy(event, noopLogger, 2, deps());
 
 		assert.ok(askedTheDestination());
 		assert.deepEqual(called("message.delete")[0]?.args, ["new-msg"]);
@@ -481,7 +471,7 @@ describe("handleMessageCopy", () => {
 	it("reconciles the optimistic copy row away when openBox trips a UIDVALIDITY mismatch", async () => {
 		h.connection.openBox = async () => ({ uidvalidity: 999 });
 
-		await handleMessageCopy(event, noopLog, 1, deps());
+		await handleMessageCopy(event, noopLogger, 1, deps());
 
 		assert.equal(
 			(called("mailbox.update")[0]?.args[2] as { cursorState?: string })
@@ -500,7 +490,7 @@ describe("handleMessageCopy", () => {
 		};
 
 		await assert.rejects(
-			handleMessageCopy(event, noopLog, 1, deps()),
+			handleMessageCopy(event, noopLogger, 1, deps()),
 			/TRYCREATE/,
 		);
 
@@ -513,7 +503,7 @@ describe("handleMessageCopy", () => {
 			throw new Error("NONEXISTENT source message");
 		};
 
-		await handleMessageCopy(event, noopLog, 1, deps());
+		await handleMessageCopy(event, noopLogger, 1, deps());
 
 		const update = called("message.update")[0];
 		assert.equal((update?.args[1] as { status?: string })?.status, "deleted");
@@ -526,7 +516,7 @@ describe("handleMessageCopy", () => {
 		};
 
 		await assert.rejects(
-			handleMessageCopy(event, noopLog, 1, deps()),
+			handleMessageCopy(event, noopLogger, 1, deps()),
 			/server exploded/,
 		);
 
@@ -548,7 +538,7 @@ describe("handleMessageCopy", () => {
 			return asked === 1 ? [] : [42];
 		};
 
-		await handleMessageCopy(event, noopLog, 3, deps());
+		await handleMessageCopy(event, noopLogger, 3, deps());
 
 		assert.deepEqual(called("message.updateUid")[0]?.args, [
 			"new-msg",
@@ -563,7 +553,7 @@ describe("handleMessageCopy", () => {
 		};
 		h.destinationHolds = [];
 
-		await handleMessageCopy(event, noopLog, 3, deps());
+		await handleMessageCopy(event, noopLogger, 3, deps());
 
 		assert.equal(called("message.delete")[0]?.args[0], "new-msg");
 		assert.equal(called("threadMessage.deleteMany").length, 1);

package/src/handlers/message-delete.test.ts

@@ -3,6 +3,7 @@ import { beforeEach, describe, it, mock } from "node:test";
 import type { ThreadMessageItem } from "@remit/data-ports";
 import type { Logger } from "@remit/logger-lambda";
 import { renderMetrics, resetMetrics } from "@remit/logger-lambda";
+import { noopLogger } from "@remit/logger-lambda/noop-logger";
 import type { MessageDeleteEvent } from "../events.js";
 import {
 	deleteAllThreadMessagesForMessage,
@@ -256,16 +257,6 @@ describe("deleteAllThreadMessagesForMessage (#212)", () => {
 	});
 });
 
-const noopLog = {
-	info: () => {},
-	warn: () => {},
-	error: () => {},
-	debug: () => {},
-	fatal: () => {},
-	trace: () => {},
-	child: () => noopLog,
-} as unknown as Logger;
-
 interface Call {
 	method: string;
 	args: unknown[];
@@ -543,7 +534,7 @@ describe("handleMessageDelete", () => {
 	});
 
 	it("moves to trash, rewrites the uid, and flips the thread row to deleted", async () => {
-		await handleMessageDelete(moveEvent, noopLog, 1, deps());
+		await handleMessageDelete(moveEvent, noopLogger, 1, deps());
 
 		assert.deepEqual(called("message.updateUid")[0]?.args, [
 			"msg-1",
@@ -569,7 +560,7 @@ describe("handleMessageDelete", () => {
 			sourceNoLongerHoldsTheUid();
 			h.destinationSearchUids = [77];
 
-			await handleMessageDelete(moveEvent, noopLog, 1, deps());
+			await handleMessageDelete(moveEvent, noopLogger, 1, deps());
 
 			assert.deepEqual(called("message.updateUid")[0]?.args, [
 				"msg-1",
@@ -598,7 +589,7 @@ describe("handleMessageDelete", () => {
 			sourceNoLongerHoldsTheUid();
 			h.destinationSearchUids = [12, 77];
 
-			await handleMessageDelete(moveEvent, noopLog, 1, deps());
+			await handleMessageDelete(moveEvent, noopLogger, 1, deps());
 
 			assert.deepEqual(called("message.updateUid")[0]?.args, [
 				"msg-1",
@@ -623,7 +614,7 @@ describe("handleMessageDelete", () => {
 				return { uidvalidity: 1 };
 			}) as Connection["openBox"];
 
-			await handleMessageDelete(moveEvent, noopLog, 1, deps());
+			await handleMessageDelete(moveEvent, noopLogger, 1, deps());
 
 			assert.deepEqual(
 				opened,
@@ -650,7 +641,7 @@ describe("handleMessageDelete", () => {
 			h.destinationSearchUids = [];
 
 			await assert.rejects(
-				handleMessageDelete(moveEvent, noopLog, 1, deps()),
+				handleMessageDelete(moveEvent, noopLogger, 1, deps()),
 				/unconfirmed/,
 			);
 
@@ -683,7 +674,7 @@ describe("handleMessageDelete", () => {
 			sourceNoLongerHoldsTheUid();
 			h.destinationSearchUids = [];
 
-			await handleMessageDelete(moveEvent, noopLog, 3, deps());
+			await handleMessageDelete(moveEvent, noopLogger, 3, deps());
 
 			assert.equal(
 				called("threadMessage.deleteMany").length,
@@ -710,7 +701,7 @@ describe("handleMessageDelete", () => {
 			sourceNoLongerHoldsTheUid();
 			h.messageRow = {};
 
-			await handleMessageDelete(moveEvent, noopLog, 1, deps());
+			await handleMessageDelete(moveEvent, noopLogger, 1, deps());
 
 			assert.equal(
 				called("connection.search").filter((c) =>
@@ -739,7 +730,7 @@ describe("handleMessageDelete", () => {
 			sourceNoLongerHoldsTheUid();
 			h.messageRow = undefined;
 
-			await handleMessageDelete(moveEvent, noopLog, 1, deps());
+			await handleMessageDelete(moveEvent, noopLogger, 1, deps());
 
 			assert.equal(called("message.update").length, 0);
 			assert.equal(called("message.delete").length, 0);
@@ -757,7 +748,7 @@ describe("handleMessageDelete", () => {
 			h.destinationSearchUids = [100];
 
 			await assert.rejects(
-				handleMessageDelete(moveEvent, noopLog, 1, deps()),
+				handleMessageDelete(moveEvent, noopLogger, 1, deps()),
 				/unconfirmed/,
 			);
 
@@ -797,7 +788,7 @@ describe("handleMessageDelete", () => {
 				},
 			];
 
-			await handleMessageDelete(moveEvent, noopLog, 3, deps());
+			await handleMessageDelete(moveEvent, noopLogger, 3, deps());
 
 			assert.equal(called("message.delete").length, 0);
 			assert.equal(called("threadMessage.deleteMany").length, 0);
@@ -845,7 +836,7 @@ describe("handleMessageDelete", () => {
 			h.connection.moveMessages = async () => ({ uidMap: new Map() });
 			h.destinationSearchUids = [100];
 
-			await handleMessageDelete(moveEvent, noopLog, 3, deps());
+			await handleMessageDelete(moveEvent, noopLogger, 3, deps());
 
 			assert.deepEqual(
 				called("emitEvent").map((c) => c.args[0]),
@@ -874,7 +865,7 @@ describe("handleMessageDelete", () => {
 				moveThrows();
 
 				await assert.rejects(
-					handleMessageDelete(moveEvent, noopLog, 1, deps()),
+					handleMessageDelete(moveEvent, noopLogger, 1, deps()),
 					/UID MOVE failed/,
 				);
 
@@ -891,7 +882,7 @@ describe("handleMessageDelete", () => {
 				moveThrows();
 				sourceNoLongerHoldsTheUid();
 
-				await handleMessageDelete(moveEvent, noopLog, 3, deps());
+				await handleMessageDelete(moveEvent, noopLogger, 3, deps());
 
 				assert.equal(
 					called("threadMessage.deleteMany").length,
@@ -905,7 +896,7 @@ describe("handleMessageDelete", () => {
 			it("settles a still-present message at the ceiling back onto its source", async () => {
 				moveThrows();
 
-				await handleMessageDelete(moveEvent, noopLog, 3, deps());
+				await handleMessageDelete(moveEvent, noopLogger, 3, deps());
 
 				assert.deepEqual(
 					called("message.updateForMove").at(-1)?.args,
@@ -927,7 +918,7 @@ describe("handleMessageDelete", () => {
 			}) as Connection["openBox"];
 
 			await assert.rejects(
-				handleMessageDelete(moveEvent, noopLog, 1, deps()),
+				handleMessageDelete(moveEvent, noopLogger, 1, deps()),
 				/unconfirmed/,
 			);
 
@@ -958,7 +949,7 @@ describe("handleMessageDelete", () => {
 				operation,
 			} as unknown as MessageDeleteEvent;
 
-			await handleMessageDelete(malformed, noopLog, 1, deps());
+			await handleMessageDelete(malformed, noopLogger, 1, deps());
 
 			assert.equal(
 				called("connection.deleteMessages").length,
@@ -991,7 +982,7 @@ describe("handleMessageDelete", () => {
 			destinationMailboxPath: undefined,
 		} as MessageDeleteEvent;
 
-		await handleMessageDelete(destinationless, noopLog, 1, deps());
+		await handleMessageDelete(destinationless, noopLogger, 1, deps());
 
 		assert.equal(called("connection.deleteMessages").length, 0);
 		assert.equal(called("message.delete").length, 0);
@@ -1002,7 +993,7 @@ describe("handleMessageDelete", () => {
 	});
 
 	it("expunges on the server and removes every thread row before the message row", async () => {
-		await handleMessageDelete(permanentEvent, noopLog, 1, deps());
+		await handleMessageDelete(permanentEvent, noopLogger, 1, deps());
 
 		assert.deepEqual(called("connection.deleteMessages")[0]?.args, [[10]]);
 		assert.equal(called("threadMessage.delete").length, 2);
@@ -1021,7 +1012,7 @@ describe("handleMessageDelete", () => {
 		};
 		sourceNoLongerHoldsTheUid();
 
-		await handleMessageDelete(permanentEvent, noopLog, 1, deps());
+		await handleMessageDelete(permanentEvent, noopLogger, 1, deps());
 
 		assert.equal(called("message.delete").length, 1);
 		assert.equal(called("threadMessage.delete").length, 2);
@@ -1042,7 +1033,7 @@ describe("handleMessageDelete", () => {
 		sourceNoLongerHoldsTheUid();
 
 		await assert.rejects(
-			handleMessageDelete(moveEvent, noopLog, 1, deps()),
+			handleMessageDelete(moveEvent, noopLogger, 1, deps()),
 			/not found/,
 		);
 
@@ -1070,7 +1061,7 @@ describe("handleMessageDelete", () => {
 		};
 
 		await assert.rejects(
-			handleMessageDelete(moveEvent, noopLog, 1, deps()),
+			handleMessageDelete(moveEvent, noopLogger, 1, deps()),
 			/NONEXISTENT/,
 		);
 
@@ -1092,7 +1083,7 @@ describe("handleMessageDelete", () => {
 		h.connection.fetchMessages = async () => [];
 
 		await assert.rejects(
-			handleMessageDelete(permanentEvent, noopLog, 1, deps()),
+			handleMessageDelete(permanentEvent, noopLogger, 1, deps()),
 			/NONEXISTENT/,
 		);
 
@@ -1117,7 +1108,7 @@ describe("handleMessageDelete", () => {
 		};
 
 		await assert.rejects(
-			handleMessageDelete(permanentEvent, noopLog, 1, deps()),
+			handleMessageDelete(permanentEvent, noopLogger, 1, deps()),
 			/NONEXISTENT mailbox does not exist/,
 		);
 
@@ -1138,7 +1129,7 @@ describe("handleMessageDelete", () => {
 			throw new Error("TRYCREATE: no such mailbox");
 		};
 
-		await handleMessageDelete(moveEvent, noopLog, 1, deps());
+		await handleMessageDelete(moveEvent, noopLogger, 1, deps());
 
 		assert.equal(called("connection.createMailbox").length, 0);
 		assert.deepEqual(
@@ -1158,7 +1149,7 @@ describe("handleMessageDelete", () => {
 			schemaVersion: undefined,
 		} as unknown as MessageDeleteEvent;
 
-		await handleMessageDelete(unversioned, noopLog, 1, deps());
+		await handleMessageDelete(unversioned, noopLogger, 1, deps());
 
 		assert.equal(h.getConnectionCount, 0);
 		assert.equal(called("connection.deleteMessages").length, 0);
@@ -1179,7 +1170,7 @@ describe("handleMessageDelete", () => {
 			schemaVersion: undefined,
 		} as unknown as MessageDeleteEvent;
 
-		await handleMessageDelete(unversioned, noopLog, 1, deps());
+		await handleMessageDelete(unversioned, noopLogger, 1, deps());
 
 		assert.deepEqual(
 			called("threadMessage.update").map((c) => c.args[1]),
@@ -1198,7 +1189,7 @@ describe("handleMessageDelete", () => {
 			schemaVersion: undefined,
 		} as unknown as MessageDeleteEvent;
 
-		await handleMessageDelete(unversioned, noopLog, 1, deps());
+		await handleMessageDelete(unversioned, noopLogger, 1, deps());
 
 		assert.equal(called("connection.deleteMessages").length, 0);
 		assert.deepEqual(called("message.delete")[0]?.args, ["msg-1"]);
@@ -1215,7 +1206,7 @@ describe("handleMessageDelete", () => {
 		};
 
 		await assert.rejects(
-			handleMessageDelete(moveEvent, noopLog, 1, deps()),
+			handleMessageDelete(moveEvent, noopLogger, 1, deps()),
 			/server exploded/,
 		);
 
@@ -1234,7 +1225,7 @@ describe("handleMessageDelete", () => {
 	it("hands the optimistic trash move back when openBox trips a UIDVALIDITY mismatch", async () => {
 		h.connection.openBox = async () => ({ uidvalidity: 999 });
 
-		await handleMessageDelete(moveEvent, noopLog, 1, deps());
+		await handleMessageDelete(moveEvent, noopLogger, 1, deps());
 
 		assert.equal(
 			(called("mailbox.update")[0]?.args[2] as { cursorState?: string })
@@ -1269,7 +1260,7 @@ describe("handleMessageDelete", () => {
 
 		await handleMessageDelete(
 			moveEvent,
-			noopLog,
+			noopLogger,
 			MESSAGE_DELETE_MAX_ATTEMPTS,
 			deps(),
 		);
@@ -1403,7 +1394,7 @@ describe("handleMessageDelete", () => {
 			cursorState: "rebuilding",
 		};
 
-		await handleMessageDelete(moveEvent, noopLog, 1, deps());
+		await handleMessageDelete(moveEvent, noopLogger, 1, deps());
 
 		assert.equal(called("threadMessage.findAllByMessageId").length, 1);
 	});
@@ -1487,7 +1478,7 @@ describe("handleMessageDelete", () => {
 		h.sourceSearchUids = [4];
 		h.destinationSearchUids = [12];
 
-		await handleMessageDelete(moveEvent, noopLog, 2, deps());
+		await handleMessageDelete(moveEvent, noopLogger, 2, deps());
 
 		assert.equal(called("message.updateUid").length, 0);
 		assert.deepEqual(
@@ -1507,7 +1498,7 @@ describe("handleMessageDelete", () => {
 			cursorState: "rebuilding",
 		};
 
-		await handleMessageDelete(moveEvent, noopLog, 1, deps());
+		await handleMessageDelete(moveEvent, noopLogger, 1, deps());
 
 		assert.deepEqual(
 			called("emitEvent").map((c) => c.args[0]),
@@ -1525,7 +1516,7 @@ describe("handleMessageDelete", () => {
 			cursorState: "rebuilding",
 		};
 
-		await handleMessageDelete(moveEvent, noopLog, 1, deps());
+		await handleMessageDelete(moveEvent, noopLogger, 1, deps());
 
 		assert.equal(h.getConnectionCount, 0);
 		assert.deepEqual(
@@ -1549,7 +1540,7 @@ describe("handleMessageDelete", () => {
 		};
 		h.allThreadMessages = [];
 
-		await handleMessageDelete(permanentEvent, noopLog, 1, deps());
+		await handleMessageDelete(permanentEvent, noopLogger, 1, deps());
 
 		assert.equal(h.getConnectionCount, 0);
 		assert.deepEqual(called("message.delete")[0]?.args, ["msg-1"]);
@@ -1568,7 +1559,7 @@ describe("handleMessageDelete", () => {
 		};
 		h.allThreadMessages = [];
 
-		await handleMessageDelete(moveEvent, noopLog, 1, deps());
+		await handleMessageDelete(moveEvent, noopLogger, 1, deps());
 
 		assert.deepEqual(called("message.delete")[0]?.args, ["msg-1"]);
 		assert.equal(
@@ -1583,7 +1574,7 @@ describe("handleMessageDelete", () => {
 			name: "NotFoundError",
 		});
 
-		await handleMessageDelete(moveEvent, noopLog, 1, deps());
+		await handleMessageDelete(moveEvent, noopLogger, 1, deps());
 
 		assert.equal(h.getConnectionCount, 0);
 		assert.equal(called("message.updateUid").length, 0);
@@ -1597,7 +1588,7 @@ describe("handleMessageDelete", () => {
 			deletedAt: Date.now(),
 		};
 
-		await handleMessageDelete(moveEvent, noopLog, 1, deps());
+		await handleMessageDelete(moveEvent, noopLogger, 1, deps());
 
 		assert.equal(h.getConnectionCount, 0);
 	});
@@ -1606,7 +1597,7 @@ describe("handleMessageDelete", () => {
 		h.account = null;
 
 		await assert.rejects(
-			handleMessageDelete(moveEvent, noopLog, 1, deps()),
+			handleMessageDelete(moveEvent, noopLogger, 1, deps()),
 			/not found/,
 		);
 	});