@remit/imap-worker 0.0.70 → 0.0.72

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remit/imap-worker",
-  "version": "0.0.70",
+  "version": "0.0.72",
   "type": "module",
   "main": "dist/index.js",
   "exports": {
@@ -39,7 +39,6 @@
     "@remit/logger-lambda": "*",
     "@remit/mailbox-service": "*",
     "@remit/search-index-worker": "*",
-    "@remit/search-service": "*",
     "@remit/sqs-client": "*",
     "@remit/backend": "*",
     "@remit/domain-enums": "*",

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]),