@remit/backend 0.0.65 → 0.0.67

package/package.json

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

package/src/handlers/address.ts

@@ -36,6 +36,7 @@ const FLAG_KEYS = [
 	"blocked",
 	"muted",
 	"vip",
+	"junkOnly",
 	"category",
 	"autoArchive",
 	"unsubscribed",

package/src/handlers/message.test.ts

@@ -1,6 +1,9 @@
 import assert from "node:assert/strict";
 import { describe, it } from "node:test";
-import { MoveNotSettledError } from "@remit/mailbox-service";
+import {
+	MoveNotSettledError,
+	NoJunkMailboxError,
+} from "@remit/mailbox-service";
 import { GENERIC_FAILURE_REASON, settleSpamReportBulk } from "./message.js";
 
 describe("settleSpamReportBulk", () => {
@@ -25,6 +28,19 @@ describe("settleSpamReportBulk", () => {
 		]);
 	});
 
+	it("tells the user to create the missing Junk folder rather than to try again", async () => {
+		// Retrying cannot resolve this one, so the generic retry copy would be a
+		// dead end. The service's own text names the folder and the fix.
+		const outcome = await settleSpamReportBulk(["msg-1"], async () => {
+			throw new NoJunkMailboxError();
+		});
+
+		const reason = outcome.failures?.[0].reason ?? "";
+		assert.match(reason, /no Junk folder/);
+		assert.match(reason, /Create one/);
+		assert.notEqual(reason, GENERIC_FAILURE_REASON);
+	});
+
 	it("omits failures entirely when every message succeeds", async () => {
 		const outcome = await settleSpamReportBulk(
 			["msg-1", "msg-2"],

package/src/handlers/message.ts

@@ -24,6 +24,7 @@ import {
 	isMessageBodySyncBroken,
 	MailboxCursorPausedError,
 	MoveNotSettledError,
+	NoJunkMailboxError,
 } from "@remit/mailbox-service";
 import {
 	isStorageNotFoundError as isStorageNotFoundErrorFromService,
@@ -339,22 +340,29 @@ export interface SpamReportBulkOutcome {
 }
 
 /**
- * The one designed, allowlisted failure reason returned to the client
- * verbatim — everything else is flattened to `GENERIC_FAILURE_REASON`, same
- * policy as `error.ts`'s "Internal server error" flattening for an unhandled
- * error. Without this, an arbitrary thrown error's raw text — an internal
- * "No Junk mailbox found for account <id>", an AWS SDK message naming a
- * queue URL or `ECONNREFUSED host:port` — would land straight in a 200
- * response body, since `SpamReportBulkResult.reason` is documented as shown
- * to the user as-is.
+ * The fallback for a failure nobody designed copy for — an AWS SDK message
+ * naming a queue URL, an `ECONNREFUSED host:port`, a programmer error.
+ * Everything reaching it is flattened, same policy as `error.ts`'s "Internal
+ * server error" flattening, because `SpamReportBulkResult.reason` is shown to
+ * the user as-is. It says "try again" because retrying is the only thing left
+ * to say about a cause we cannot name; an outcome the service DOES understand
+ * carries its own text through `DESIGNED_FAILURES` instead of landing here.
  */
 export const GENERIC_FAILURE_REASON =
-	"This message could not be processed. Please try again.";
+	"This message could not be processed. Please try again. If it keeps failing, report it.";
+
+/**
+ * The designed, user-facing outcomes whose own message is returned verbatim:
+ * each names what happened and what the user can do about it, which the
+ * generic text cannot.
+ */
+const DESIGNED_FAILURES = [MoveNotSettledError, NoJunkMailboxError];
+
+const isDesignedFailure = (reason: unknown): reason is Error =>
+	DESIGNED_FAILURES.some((designed) => reason instanceof designed);
 
 const failureReason = (reason: unknown): string =>
-	reason instanceof MoveNotSettledError
-		? reason.message
-		: GENERIC_FAILURE_REASON;
+	isDesignedFailure(reason) ? reason.message : GENERIC_FAILURE_REASON;
 
 /**
  * Drive one report-spam/not-spam operation per message, concurrently. Each

package/src/service/create-remit-client.ts

@@ -329,6 +329,7 @@ export const createRemitClient = (deps: RemitClientDeps): RemitClient => {
 				messageService: repositories.message,
 				threadMessageService: repositories.threadMessage,
 				markerService: repositories.placementMove,
+				addressService: repositories.address,
 				sqsQueueUrl: placementMoveQueueUrl,
 			})
 		: undefined;
@@ -364,6 +365,7 @@ export const createRemitClient = (deps: RemitClientDeps): RemitClient => {
 		mailboxService: repositories.mailbox,
 		mailboxSpecialUseService: repositories.mailboxSpecialUse,
 		threadMessageService: repositories.threadMessage,
+		addressService: repositories.address,
 		sqsQueueUrl,
 		logger,
 	});

package/src/service/organize.ts

@@ -492,6 +492,7 @@ export const buildOrganizeMoveService = (
 		messageService: client.message,
 		threadMessageService: client.threadMessage,
 		markerService: client.placementMove,
+		addressService: client.address,
 		sqsQueueUrl: queueUrl,
 	});
 };