@remit/imap-worker 0.0.11 → 0.0.13

package/package.json

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

package/src/handlers/placement-move-push.test.ts

@@ -12,8 +12,10 @@ const buildConnection = (opts: {
 	moveError?: Error;
 	/** Message-ID search hits in the destination mailbox — the verification probe. */
 	destinationSearchUids?: number[];
-	/** Whether the uid is still found via fetchMessages on the source mailbox. */
+	/** Whether the message is still in the source mailbox. */
 	stillAtSource?: boolean;
+	/** The source FETCH drops the row for a message that is still there. */
+	sourceFetchDrops?: boolean;
 }): IImapConnection =>
 	({
 		openBox: async () => ({}) as never,
@@ -25,9 +27,15 @@ const buildConnection = (opts: {
 				uidMap: opts.uidMap ?? new Map(),
 			};
 		},
-		search: async (_criteria: unknown[]) => opts.destinationSearchUids ?? [],
+		search: async (criteria: unknown[]) => {
+			const [first] = criteria;
+			if (Array.isArray(first) && first[0] === "UID") {
+				return opts.stillAtSource ? [Number(first[1])] : [];
+			}
+			return opts.destinationSearchUids ?? [];
+		},
 		fetchMessages: async (uids: number[]) =>
-			opts.stillAtSource
+			opts.stillAtSource && !opts.sourceFetchDrops
 				? uids.map((uid) => ({ uid }) as unknown as never)
 				: [],
 	}) as unknown as IImapConnection;
@@ -151,7 +159,29 @@ describe("attemptMove — the IMAP push (issue #1271)", () => {
 			);
 		});
 
-		it("not-found: confirmed absent from BOTH destination (search miss) AND source (fetch miss)", async () => {
+		it("throws (never deletes) when the source FETCH drops the row for a message the server still lists", async () => {
+			const connection = buildConnection({
+				uidMap: new Map(),
+				destinationSearchUids: [],
+				stillAtSource: true,
+				sourceFetchDrops: true,
+			});
+
+			await assert.rejects(
+				() =>
+					attemptMove(
+						connection,
+						connection,
+						"Junk",
+						"INBOX",
+						42,
+						MESSAGE_ID_HEADER,
+					),
+				/unresolved/,
+			);
+		});
+
+		it("not-found: confirmed absent from BOTH destination (search miss) AND source (search miss)", async () => {
 			const connection = buildConnection({
 				uidMap: new Map(),
 				destinationSearchUids: [],

package/src/handlers/placement-move-push.ts

@@ -5,6 +5,7 @@ import {
 	guardConnectionCursor,
 	type IImapConnection,
 	isCursorRebuildNeeded,
+	isMessageGoneFromOpenMailbox,
 	MailboxCursorPausedError,
 	reconcileStaleMessage,
 	resolveExhaustedPlacementMoveFailure,
@@ -90,7 +91,8 @@ const searchMailboxByMessageId = async (
  *   gone (PR #1289 review finding 2) — deleting the local row on that
  *   ambiguity would be data loss. `not-found` is only returned once BOTH a
  *   destination Message-ID search (when the header is known) misses AND
- *   the message is confirmed absent from the source.
+ *   {@link isMessageGoneFromOpenMailbox} confirms the message absent from the
+ *   source — a FETCH returning no row does not, on its own, confirm anything.
  */
 export const attemptMove = async (
 	sourceConnection: IImapConnection,
@@ -135,8 +137,7 @@ export const attemptMove = async (
 	}
 
 	await sourceConnection.openBox(sourceMailboxPath, true);
-	const stillAtSource = await sourceConnection.fetchMessages([uid]);
-	if (stillAtSource.length > 0) {
+	if (!(await isMessageGoneFromOpenMailbox(sourceConnection, uid))) {
 		throw new Error(
 			"Placement move unresolved (unconfirmed at destination, still present at source) — retrying",
 		);

package/src/handlers/sync-message-body.ts

@@ -8,6 +8,7 @@ import {
 	isCursorRebuildNeeded,
 	MailboxCursorPausedError,
 	PlacementMoveService,
+	QuarantineService,
 	resolveExhaustedBodySyncFailures,
 } from "@remit/mailbox-service";
 import { env } from "expect-env";
@@ -20,6 +21,7 @@ import {
 import type { SyncMessageBodyEvent } from "../events.js";
 import { withOAuthLifecycle } from "../with-oauth-lifecycle.js";
 import { buildLifecycleDeps } from "../with-oauth-lifecycle-deps.js";
+import { workerVersion } from "../worker-version.js";
 
 const bodySyncEnabledParameterName = env.BODY_SYNC_ENABLED_PARAMETER_NAME;
 
@@ -151,6 +153,8 @@ export const syncMessageBody = async (
 		messageLabel: messageLabelService,
 		storage,
 		secrets,
+		mailboxSpecialUse: mailboxSpecialUseRepository,
+		quarantine: quarantineRepository,
 	} = await getClient();
 
 	const account = await accountService.get(accountId);
@@ -234,6 +238,17 @@ export const syncMessageBody = async (
 				log,
 				placementConfig,
 				filterConfig,
+				{
+					quarantineService: new QuarantineService(
+						quarantineRepository,
+						mailboxSpecialUseRepository,
+						workerVersion(),
+						log,
+					),
+					mailboxId,
+					uidValidity: mailbox.uidValidity ?? 0,
+					attempts: receiveCount,
+				},
 			);
 
 			// Guard at the openBox choke point (epic #1281 invariants 3 & 5). The

package/src/handlers/sync-messages.ts

@@ -5,9 +5,11 @@ import type {
 	IAddressRepository,
 	IEnvelopeRepository,
 	IMailboxRepository,
+	IMailboxSpecialUseRepository,
 	IMessageFlagPushRepository,
 	IMessageFlagRepository,
 	IMessageRepository,
+	IQuarantineRepository,
 	IThreadMessageRepository,
 	IUnitOfWork,
 } from "@remit/data-ports";
@@ -19,6 +21,7 @@ import {
 	MailConnectionError,
 	type MailCredentials,
 	MessageSyncService,
+	QuarantineService,
 	type SyncedMessage,
 } from "@remit/mailbox-service";
 import pMap from "p-map";
@@ -31,6 +34,7 @@ import type {
 } from "../events.js";
 import { withOAuthLifecycle } from "../with-oauth-lifecycle.js";
 import { buildLifecycleDeps } from "../with-oauth-lifecycle-deps.js";
+import { workerVersion } from "../worker-version.js";
 
 // One SYNC_MESSAGE_BODY event maps to one ranged UID FETCH on the consumer.
 export const BODY_BATCH_SIZE = 200;
@@ -70,6 +74,8 @@ export const syncMessages = async (
 		address: addressService,
 		threadMessage: threadMessageService,
 		mailboxLock: mailboxLockService,
+		mailboxSpecialUse: mailboxSpecialUseService,
+		quarantine: quarantineService,
 		flagPush: flagPushMarkerService,
 		messageFlag: messageFlagService,
 		unitOfWork,
@@ -138,6 +144,8 @@ export const syncMessages = async (
 								envelopeService,
 								addressService,
 								threadMessageService,
+								mailboxSpecialUseService,
+								quarantineService,
 								flagPushMarkerService,
 								messageFlagService,
 								unitOfWork,
@@ -181,6 +189,8 @@ interface SyncDeps {
 	envelopeService: IEnvelopeRepository;
 	addressService: IAddressRepository;
 	threadMessageService: IThreadMessageRepository;
+	mailboxSpecialUseService: IMailboxSpecialUseRepository;
+	quarantineService: IQuarantineRepository;
 	flagPushMarkerService: IMessageFlagPushRepository;
 	messageFlagService: IMessageFlagRepository;
 	unitOfWork?: IUnitOfWork;
@@ -272,6 +282,8 @@ const syncMailboxMessages = async (
 		envelopeService,
 		addressService,
 		threadMessageService,
+		mailboxSpecialUseService,
+		quarantineService,
 		flagPushMarkerService,
 		messageFlagService,
 		unitOfWork,
@@ -307,6 +319,12 @@ const syncMailboxMessages = async (
 		unitOfWork,
 		flagPushMarkerService,
 		messageFlagService,
+		new QuarantineService(
+			quarantineService,
+			mailboxSpecialUseService,
+			workerVersion(),
+			log,
+		),
 	);
 
 	// Connect once, reuse for the entire sync operation

package/src/worker-version.ts

@@ -0,0 +1,13 @@
+/**
+ * The build of this worker, stamped onto a quarantine record so a maintainer
+ * reading a filed report knows which commit failed to read the message.
+ *
+ * Deliberately not the client's `APP_SHA`: that is the web build, and pointing
+ * a maintainer at it for a backend parse failure sends them to the wrong
+ * commit. The container bundle replaces this read at build time (see
+ * `npm-scripts/docker-bundle.mjs`); outside an image build it falls back to the
+ * CI-provided SHA, then to `dev`, so a local run is labelled honestly rather
+ * than claiming a release it is not.
+ */
+export const workerVersion = (): string =>
+	process.env.REMIT_WORKER_SHA || process.env.GITHUB_SHA || "dev";