@remit/imap-worker 0.0.28 → 0.0.29

package/package.json

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

package/src/cli.ts

@@ -1,4 +1,10 @@
 #!/usr/bin/env node
+// Plain text on purpose, and the one deliberate exception to the log field
+// contract in deploy/vps/README.md ("Logs"). That contract covers what a
+// container's log driver ships; this file is the `remit-worker` bin, run by hand
+// against a terminal, and is not an entrypoint of any image (see the target list
+// in npm-scripts/docker-bundle.mjs). Do not route it through the logger — usage
+// text and argument errors are for the person who typed the command.
 import { parseArgs } from "node:util";
 import { emitEvent } from "./emit.js";
 

package/src/e2e-processor-shim.ts

@@ -1,5 +1,6 @@
 #!/usr/bin/env node
 import cluster from "node:cluster";
+import { randomUUID } from "node:crypto";
 import {
 	DeleteMessageCommand,
 	ReceiveMessageCommand,
@@ -129,11 +130,16 @@ if (cluster.isPrimary) {
 		isShuttingDown = true;
 	});
 
-	// Minimal Lambda Context: `withTelemetry` only reads `functionName`, for the
-	// line it logs per invocation; the prod handler never touches the rest.
-	const lambdaContext = {
-		functionName: `e2e-imap-worker-${queueName}`,
-	} as Context;
+	// Minimal Lambda Context: `withTelemetry` reads `functionName` for the line it
+	// logs per invocation and `awsRequestId` for the scope it opens around it, so
+	// every line one batch produces shares a `requestId` (deploy/vps/README.md,
+	// "Logs"). Minted per batch, like the production poller does — a context built
+	// once would put the whole run under one id, which correlates nothing.
+	const nextContext = (): Context =>
+		({
+			functionName: `e2e-imap-worker-${queueName}`,
+			awsRequestId: randomUUID(),
+		}) as Context;
 
 	const pollQueue = async (): Promise<void> => {
 		log.info({ maxMessages }, "Worker started, polling...");
@@ -200,7 +206,7 @@ if (cluster.isPrimary) {
 				})),
 			};
 
-			const result = (await activeHandler(event, lambdaContext, () => {})) as
+			const result = (await activeHandler(event, nextContext(), () => {})) as
 				| SQSBatchResponse
 				| undefined;
 

package/src/handlers/sync-mailboxes.ts

@@ -183,6 +183,7 @@ const syncMailboxesForAccount = async (
 	const mailboxSyncService = new MailboxSyncService(
 		mailboxService,
 		mailboxSpecialUseService,
+		log,
 	);
 
 	const result = await mailboxSyncService