@remit/imap-worker 0.0.11 → 0.0.12

package/package.json

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

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";