@remit/backend 0.0.31 → 0.0.33

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remit/backend",
-  "version": "0.0.31",
+  "version": "0.0.33",
   "description": "Remit Mail Inspector API backend",
   "license": "MIT",
   "author": "",

package/src/handlers/mailbox.test.ts

@@ -0,0 +1,34 @@
+import assert from "node:assert/strict";
+import { describe, it } from "node:test";
+import type { MailboxItem } from "@remit/data-ports";
+import { MailboxSyncStatus } from "@remit/domain-enums";
+import { excludeDeletingMailboxes } from "./mailbox.js";
+
+const mailbox = (
+	over: Partial<MailboxItem> & { mailboxId: string },
+): MailboxItem =>
+	({ fullPath: over.mailboxId, ...over }) as unknown as MailboxItem;
+
+describe("excludeDeletingMailboxes", () => {
+	it("drops a folder being deleted so it leaves the list before the worker reaps it", () => {
+		const items = [
+			mailbox({ mailboxId: "inbox", syncStatus: MailboxSyncStatus.synced }),
+			mailbox({ mailboxId: "gone", syncStatus: MailboxSyncStatus.deleting }),
+			mailbox({ mailboxId: "new", syncStatus: MailboxSyncStatus.pending }),
+		];
+		assert.deepEqual(
+			excludeDeletingMailboxes(items).map((m) => m.mailboxId),
+			["inbox", "new"],
+		);
+	});
+
+	it("keeps a folder whose delete failed and was restored off `deleting`", () => {
+		const items = [
+			mailbox({ mailboxId: "restored", syncStatus: MailboxSyncStatus.failed }),
+		];
+		assert.deepEqual(
+			excludeDeletingMailboxes(items).map((m) => m.mailboxId),
+			["restored"],
+		);
+	});
+});

package/src/handlers/mailbox.ts

@@ -4,7 +4,7 @@ import type {
 } from "@remit/api-openapi-types";
 import type { IAccountSettingRepository, MailboxItem } from "@remit/data-ports";
 import { ForbiddenError, NotFoundError } from "@remit/data-ports/errors";
-import { MessageSystemFlag } from "@remit/domain-enums";
+import { MailboxSyncStatus, MessageSystemFlag } from "@remit/domain-enums";
 import type { APIGatewayProxyEvent } from "aws-lambda";
 import { getAccountConfigIdFromEvent } from "../auth.js";
 import {
@@ -185,6 +185,24 @@ const toMailboxResponse = (
 	updatedAt: mailbox.updatedAt,
 });
 
+/**
+ * Drop folders the user has deleted but the imap-worker has not yet reaped.
+ *
+ * A delete is a soft delete: the row lives on with syncStatus=deleting until the
+ * worker confirms the IMAP delete and removes it (mailbox-queue.deleteMailbox).
+ * The list is the settings view a client refetches right after confirming, so a
+ * still-`deleting` row here would keep a deleted folder on screen until the
+ * worker finishes. Hiding it makes the folder leave the list the moment the
+ * delete is confirmed; a delete that fails restores the row off `deleting`,
+ * which brings the folder back on the next read.
+ */
+export const excludeDeletingMailboxes = (
+	mailboxes: readonly MailboxItem[],
+): MailboxItem[] =>
+	mailboxes.filter(
+		(mailbox) => mailbox.syncStatus !== MailboxSyncStatus.deleting,
+	);
+
 export const MailboxOperations: Record<
 	MailboxOperationIds,
 	OperationHandler<MailboxOperationIds>
@@ -205,6 +223,8 @@ export const MailboxOperations: Record<
 			continuationToken,
 		});
 
+		const visibleItems = excludeDeletingMailboxes(result.items);
+
 		// Overrides (mute / display-name / role) live in per-mailbox AccountSetting
 		// rows (RFC 032). Load the whole config's set in one query and key it by
 		// mailboxId so each mailbox surfaces its overrides without an N+1.
@@ -222,7 +242,7 @@ export const MailboxOperations: Record<
 			accountId,
 		);
 		const items = applyPendingMoveCountPrediction(
-			result.items,
+			visibleItems,
 			pendingMoves,
 			pendingUnseenFlagPushes,
 		);

package/src/handlers/system-update.test.ts

@@ -130,11 +130,14 @@ describe("GET /system/update", () => {
 		assert.deepEqual(result, okState);
 	});
 
-	it("returns a disabled, empty resource when no state file exists", async () => {
+	it("reports an unknown version, not its own process env, when no state file exists", async () => {
+		// The updater owns the running version and writes it into state.json; with
+		// no state file the backend has nothing authoritative, so it says unknown
+		// rather than surfacing REMIT_TAG, which drifts from the real running tag.
 		const result = await getUpdate(buildEvent(USER));
 
 		assert.deepEqual(result, {
-			currentVersion: "v1.4.1",
+			currentVersion: "unknown",
 			check: { status: "disabled" },
 			run: null,
 		});

package/src/handlers/system-update.ts

@@ -24,7 +24,17 @@ const controlDir = (): string =>
 const manifestUrl = (): string | undefined =>
 	process.env.REMIT_UPDATE_MANIFEST_URL;
 
-const currentVersion = (): string => process.env.REMIT_TAG ?? "unknown";
+/**
+ * The running version is a fact the updater owns: it reads the tag from `.env`
+ * and writes it into `state.json`, which is the only honest source across an
+ * update that rewrites that tag underneath a long-lived backend process. When no
+ * state file exists yet the backend has nothing authoritative to report, so it
+ * reports the version as unknown rather than fabricating one from its own
+ * process environment — a value captured at container start that drifts from the
+ * real running tag the moment an update lands. The first updater check writes a
+ * real `currentVersion` within seconds of the stack coming up.
+ */
+const UNKNOWN_VERSION = "unknown";
 
 const notFound = (): APIGatewayProxyResult => ({
 	statusCode: 404,
@@ -65,7 +75,7 @@ const readState = (): SystemUpdateResponse | null => {
 };
 
 const emptyResource = (): SystemUpdateResponse => ({
-	currentVersion: currentVersion(),
+	currentVersion: UNKNOWN_VERSION,
 	check: { status: "disabled" },
 	run: null,
 });
@@ -115,7 +125,7 @@ const requestedResource = (
 	targetVersion: string,
 	requestedAt: string,
 ): SystemUpdateResponse => {
-	const from = state?.currentVersion ?? currentVersion();
+	const from = state?.currentVersion ?? UNKNOWN_VERSION;
 	return {
 		currentVersion: from,
 		check: state?.check ?? { status: "disabled" },