@remit/smtp-worker 0.0.22 → 0.0.24

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remit/smtp-worker",
-  "version": "0.0.22",
+  "version": "0.0.24",
   "type": "module",
   "main": "dist/index.js",
   "exports": {

package/src/handlers/send-message-core.ts

@@ -7,6 +7,7 @@ import type {
 import { AccountAuthType, OutboxMessageStatus } from "@remit/domain-enums";
 import { type Logger, recordSmtpFailure } from "@remit/logger-lambda";
 import { RefreshTokenError } from "@remit/mail-oauth-service";
+import type { CredentialResolution } from "@remit/mailbox-service/account-credentials";
 import type { SecretsService } from "@remit/secrets-service";
 import {
 	buildMailMessage,
@@ -14,6 +15,7 @@ import {
 	SmtpConnectionError,
 	type sendMail,
 } from "@remit/smtp-service";
+import { attemptBudget } from "@remit/sqs-client/attempt-budget";
 import type { SendMessageEvent } from "../events.js";
 import { writeEngagementCounters } from "./engagement-counters.js";
 import {
@@ -72,10 +74,11 @@ export interface SendMessageDeps {
 	 * Resolve credentials for the account. Called after fetching the account.
 	 * For password accounts this may resolve immediately from the stored hash.
 	 * For OAuth accounts this mints an access token via the token service.
+	 * Returns `{ status: "missing" }` when the account stores no credential.
 	 * Throws RefreshTokenError on OAuth failures — callers should not need to
 	 * handle this here; the caller of sendMessage handles it.
 	 */
-	resolveCredentials: (account: AccountItem) => Promise<SmtpCredentials>;
+	resolveCredentials: (account: AccountItem) => Promise<CredentialResolution>;
 	/**
 	 * Persist the account's connectionState. Called when a terminal OAuth/SMTP
 	 * auth failure is detected so the account is fenced off until the user
@@ -131,24 +134,9 @@ const SENDABLE_STATUSES: ReadonlySet<OutboxMessageItem["status"]> = new Set([
 	OutboxMessageStatus.sending,
 ]);
 
-/**
- * Fallback when `SEND_MESSAGE_MAX_ATTEMPTS` is unset (local dev, unit tests).
- * Matches `remit-smtp`'s `maxReceiveCount` (`deploy/vps/queues.json`), same
- * pattern as `MESSAGE_MOVE_MAX_ATTEMPTS` / `FLAG_PUSH_MAX_ATTEMPTS` in
- * imap-worker.
- */
-const DEFAULT_SEND_MESSAGE_MAX_ATTEMPTS = 3;
-
 export const getSendMessageMaxAttempts = (
 	processEnv: NodeJS.ProcessEnv = process.env,
-): number => {
-	const raw = processEnv.SEND_MESSAGE_MAX_ATTEMPTS;
-	if (!raw) return DEFAULT_SEND_MESSAGE_MAX_ATTEMPTS;
-	const parsed = Number.parseInt(raw, 10);
-	return Number.isFinite(parsed) && parsed > 0
-		? parsed
-		: DEFAULT_SEND_MESSAGE_MAX_ATTEMPTS;
-};
+): number => attemptBudget("SEND_MESSAGE_MAX_ATTEMPTS", 3, processEnv);
 
 export const SEND_MESSAGE_MAX_ATTEMPTS = getSendMessageMaxAttempts();
 
@@ -203,9 +191,26 @@ export const sendMessage = async (
 	// Resolve credentials. On a terminal OAuth auth failure (token revoked),
 	// flip the account to reauth_required and ACK — do not retry. Transient /
 	// config failures rethrow for SQS retry/backoff.
-	let credentials: SmtpCredentials;
+	let credentials: SmtpCredentials | undefined;
 	try {
-		credentials = await deps.resolveCredentials(account);
+		const resolution = await deps.resolveCredentials(account);
+		if (resolution.status === "missing") {
+			// Terminal, never a retry (issue #1120). The account still sends if it
+			// carries an SMTP-specific credential of its own, so this hands
+			// resolveSmtpConfig no credential and lets it decide; where there is
+			// none either, the send settles `blocked` below.
+			log.warn(
+				{
+					accountId,
+					reason: resolution.reason,
+					connectionState: resolution.terminalState,
+				},
+				"Account stores no credential",
+			);
+			await deps.updateConnectionState(accountId, resolution.terminalState);
+		} else {
+			credentials = resolution.credentials;
+		}
 	} catch (err) {
 		if (err instanceof RefreshTokenError) {
 			if (err.error.kind === "reauth-required") {

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

@@ -145,10 +145,13 @@ const buildDeps = (
 			(async (_account) => {
 				recorded.resolveCalls += 1;
 				return {
-					kind: "password" as const,
-					password: _account.passwordHash
-						? "resolved-password"
-						: "no-password-configured",
+					status: "resolved" as const,
+					credentials: {
+						kind: "password" as const,
+						password: _account.passwordHash
+							? "resolved-password"
+							: "no-password-configured",
+					},
 				};
 			}),
 		updateConnectionState: async (accountId, state) => {
@@ -568,6 +571,25 @@ describe("sendMessage OAuth reauth/ACK contract", () => {
 		});
 	});
 
+	it("account storing no credential: settles `blocked` and never retries (issue #1120)", async () => {
+		const { deps, recorded } = buildDeps({
+			account: buildAccount({ passwordHash: undefined }),
+			resolveCredentials: async () => ({
+				status: "missing" as const,
+				terminalState: "credentials_missing" as const,
+				reason: "authType=password but no passwordHash",
+			}),
+		});
+
+		await sendMessage(event, silentLogger, deps);
+
+		assert.equal(recorded.sendCalls, 0, "must not send");
+		assert.deepEqual(recorded.connectionStateUpdates, [
+			{ accountId: "acc-1", state: "credentials_missing" },
+		]);
+		assert.equal(recorded.updates[0]?.patch.status, "blocked");
+	});
+
 	it("on transient credential error: rethrows", async () => {
 		const { deps, recorded } = buildDeps({
 			account: buildAccount({ smtpHost: "smtp.example.com", smtpPort: 587 }),