@remit/imap-worker 0.0.47 → 0.0.48

package/package.json

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

package/src/handlers/append-sent-message.test.ts

@@ -125,6 +125,27 @@ const event: AppendSentMessageEvent = {
 const called = (method: string): Call[] =>
 	h.calls.filter((c) => c.method === method);
 
+type BackendClient = Awaited<ReturnType<AppendSentMessageDeps["getClient"]>>;
+
+const depsWithFailingDelete = (): AppendSentMessageDeps => {
+	const base = deps();
+	return {
+		...base,
+		getClient: async (): Promise<BackendClient> => {
+			const client = await base.getClient();
+			return {
+				...client,
+				outboxMessage: {
+					...client.outboxMessage,
+					delete: async (): Promise<void> => {
+						throw new Error("storage down");
+					},
+				},
+			};
+		},
+	};
+};
+
 describe("handleAppendSentMessage", () => {
 	beforeEach(() => {
 		h = fresh();
@@ -268,19 +289,8 @@ describe("handleAppendSentMessage", () => {
 	});
 
 	it("leaves the row alone when the APPEND landed but the delete did not", async () => {
-		const failingDeps = deps();
-		const client = await failingDeps.getClient();
-		(
-			client as unknown as { outboxMessage: { delete: () => Promise<void> } }
-		).outboxMessage.delete = async () => {
-			throw new Error("storage down");
-		};
-
 		await assert.rejects(
-			handleAppendSentMessage(event, noopLog, APPEND_SENT_MAX_ATTEMPTS, {
-				...failingDeps,
-				getClient: async () => client,
-			} as AppendSentMessageDeps),
+			handleAppendSentMessage(event, noopLog, 1, depsWithFailingDelete()),
 			/storage down/,
 		);
 
@@ -288,4 +298,18 @@ describe("handleAppendSentMessage", () => {
 		// would say the opposite.
 		assert.equal(called("outboxMessage.update").length, 0);
 	});
+
+	it("stops redelivering a landed APPEND at the budget instead of filing another copy", async () => {
+		// A redelivery starts from the top and appends again, so retrying past the
+		// budget files one copy per attempt in the user's Sent folder (#830).
+		await handleAppendSentMessage(
+			event,
+			noopLog,
+			APPEND_SENT_MAX_ATTEMPTS,
+			depsWithFailingDelete(),
+		);
+
+		assert.equal(called("connection.append").length, 1);
+		assert.equal(called("outboxMessage.update").length, 0);
+	});
 });

package/src/handlers/append-sent-message.ts

@@ -193,16 +193,27 @@ export const handleAppendSentMessage = async (
 			// attempt to pick up. At the budget the record would dead-letter, and a
 			// dead-lettered APPEND is exactly how a delivered message goes missing.
 			//
-			// Once the APPEND itself has landed the copy is in Sent whatever else
-			// failed, so that case keeps the plain retry semantics.
-			if (appended || receiveCount < APPEND_SENT_MAX_ATTEMPTS) throw error;
+			// The budget binds whether or not the APPEND landed. A redelivery
+			// starts from the top and appends again, so an unbudgeted retry files
+			// one copy per attempt in the user's Sent folder.
+			if (receiveCount < APPEND_SENT_MAX_ATTEMPTS) throw error;
 			return error;
 		},
 	);
 
-	// The APPEND landed: the copy is in Sent even if the row delete that follows
-	// it failed, so there is nothing to settle and a retry may still run.
-	if (appended) return;
+	// The APPEND landed: the copy is in Sent whatever failed after it, so there
+	// is nothing to settle as unfiled. A row that outlives its delete holds
+	// `sent`, which every view hides, until the migrator's boot-time stranded-row
+	// repair settles it — the next container start, not sooner (#824).
+	if (appended) {
+		if (failure) {
+			log.error(
+				{ accountId, outboxMessageId, reason: String(failure) },
+				"Sent message was filed but its outbox row survived its delete and stays hidden until the boot-time repair",
+			);
+		}
+		return;
+	}
 
 	// A terminal auth failure returns here without throwing — withOAuthLifecycle
 	// flips the account to reauth_required and ACKs the record, which without