@remit/imap-worker 0.0.55 → 0.0.57

package/package.json

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

package/src/handlers/flag-push-placement-race.test.ts

@@ -17,6 +17,7 @@ import { SQSClient } from "@aws-sdk/client-sqs";
 import { getClient, type RemitClient, setClient } from "@remit/backend/client";
 import type {
 	IAddressRepository,
+	IMailboxSpecialUseRepository,
 	IMessageFlagPushRepository,
 	IMessageFlagRepository,
 	IMessagePlacementMoveRepository,
@@ -181,6 +182,12 @@ const buildHarness = (): Harness => {
 		addressService: {
 			reconcileJunkOnlyForMessage: async () => {},
 		} as unknown as IAddressRepository,
+		mailboxSpecialUseService: {
+			resolveJunkRolesForConfig: async () => ({
+				junkMailboxIds: [],
+				trashMailboxIds: [],
+			}),
+		} as unknown as IMailboxSpecialUseRepository,
 		sqsQueueUrl: "https://sqs.eu-west-1.amazonaws.com/000/message-mgmt",
 	});
 

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

@@ -689,7 +689,6 @@ describe("handleMessageDelete", () => {
 			assert.equal(called("message.delete").length, 0);
 			assert.equal(called("threadMessage.deleteMany").length, 0);
 			assert.equal(called("threadMessage.update").length, 0);
-			assert.equal(called("emitEvent").length, 0);
 
 			// The row's mailbox and uid stay put, but `status` must leave
 			// `moving`: `isPlacementUnsettled` reads exactly that value, so a row
@@ -702,6 +701,27 @@ describe("handleMessageDelete", () => {
 			assert.equal(await imapFailures("MESSAGE_DELETE_EXHAUSTED"), 1);
 		});
 
+		// The optimistic `updateForMove` already pointed the row at Trash. The
+		// server has now confirmed the message never left the source, so the row
+		// and the server disagree about where the mail is, and only a resync of
+		// both folders settles that. Without it the user is shown the message in
+		// Trash indefinitely while it sits in the source folder.
+		it("resyncs both folders when the server confirms the message never left the source", async () => {
+			h.connection.moveMessages = async () => ({ uidMap: new Map() });
+			h.destinationSearchUids = [100];
+
+			await handleMessageDelete(moveEvent, noopLog, 3, deps());
+
+			assert.deepEqual(
+				called("emitEvent").map((c) => c.args[0]),
+				[
+					{ type: "SYNC_MESSAGES", accountId: "acc-1", mailboxId: "src-mbx" },
+					{ type: "SYNC_MESSAGES", accountId: "acc-1", mailboxId: "trash-mbx" },
+				],
+				"a confirmed divergence resyncs on the broken verdict too, not only on the reconciled one",
+			);
+		});
+
 		// Issue #980, the failure the budget exists for: every redelivery
 		// re-MOVEs a uid the source no longer holds and throws identically. The
 		// ceiling lives in the error catch, so a throwing `moveMessages` settles

package/src/handlers/message-delete.ts

@@ -357,9 +357,16 @@ export const handleMessageDelete = async (
 
 		if (outcome === "broken") {
 			recordImapFailure("MESSAGE_DELETE_EXHAUSTED", "other");
-			return;
 		}
 
+		// Both verdicts end in a row the server has contradicted, so this delete
+		// reconciles rather than waits (R2): whichever folder actually holds the
+		// message re-projects it with the server's own uid. RECONCILED, the local
+		// rows are gone and the resync rebuilds them. BROKEN, the server has just
+		// confirmed the message is still at the source while the optimistic
+		// `updateForMove` left the row pointing at Trash — without the resync the
+		// user sees it in Trash for as long as that row stands, which is the
+		// silent misdirection the settle exists to end.
 		if (destinationMailboxId) {
 			await emitMoveResync(emitEvent, {
 				accountId,

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

@@ -179,6 +179,7 @@ export const syncMessageBody = async (
 				threadMessageService,
 				markerService,
 				addressService,
+				mailboxSpecialUseService,
 				sqsQueueUrl: placementMoveQueueUrl,
 			})
 		: undefined;