@remit/imap-worker 0.0.64 → 0.0.65

package/package.json

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

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

@@ -10,6 +10,7 @@ import {
 	buildMailMessage,
 	renderRawMessage,
 } from "@remit/smtp-service/message-builder";
+import { attemptBudget } from "@remit/sqs-client/attempt-budget";
 import { isAccountDeleted } from "../account-check.js";
 import { createConnectionScopeWithCredentials } from "../connection-scope.js";
 import type { AppendSentMessageEvent } from "../events.js";
@@ -29,23 +30,9 @@ const ROW_SURVIVED_ITS_DELETE =
 const unfiledAppendRefused = (fullPath: string, error: unknown): string =>
 	`Sent, but not filed: the mail server refused to store a copy in ${fullPath} (${error instanceof Error ? error.message : String(error)}).`;
 
-/**
- * Fallback when `APPEND_SENT_MAX_ATTEMPTS` is unset (local dev, unit tests).
- * Matches the shared `MAX_RECEIVE_COUNT` every queue's redrive policy uses,
- * same pattern as `FLAG_PUSH_MAX_ATTEMPTS` / `BODY_SYNC_MAX_ATTEMPTS`.
- */
-const DEFAULT_APPEND_SENT_MAX_ATTEMPTS = 3;
-
 export const getAppendSentMaxAttempts = (
 	processEnv: NodeJS.ProcessEnv = process.env,
-): number => {
-	const raw = processEnv.APPEND_SENT_MAX_ATTEMPTS;
-	if (!raw) return DEFAULT_APPEND_SENT_MAX_ATTEMPTS;
-	const parsed = Number.parseInt(raw, 10);
-	return Number.isFinite(parsed) && parsed > 0
-		? parsed
-		: DEFAULT_APPEND_SENT_MAX_ATTEMPTS;
-};
+): number => attemptBudget("APPEND_SENT_MAX_ATTEMPTS", 3, processEnv);
 
 export const APPEND_SENT_MAX_ATTEMPTS = getAppendSentMaxAttempts();
 

package/src/handlers/flag-push.ts

@@ -8,6 +8,7 @@ import {
 	MailboxCursorPausedError,
 	resolveExhaustedFlagPushFailure,
 } from "@remit/mailbox-service";
+import { attemptBudget } from "@remit/sqs-client/attempt-budget";
 import { isAccountDeleted } from "../account-check.js";
 import { createConnectionScopeWithCredentials } from "../connection-scope.js";
 import type { FlagPushEvent } from "../events.js";
@@ -15,24 +16,9 @@ import { isNotFoundError } from "../is-not-found.js";
 import { withOAuthLifecycle } from "../with-oauth-lifecycle.js";
 import { buildLifecycleDeps } from "../with-oauth-lifecycle-deps.js";
 
-/**
- * Fallback when `FLAG_PUSH_MAX_ATTEMPTS` is unset (local dev, unit tests).
- * Matches the shared `MAX_RECEIVE_COUNT` every queue's redrive policy uses
- * (`infra/stacks/dev/stacks/remit-queue-stack.ts`), same pattern as
- * `BODY_SYNC_MAX_ATTEMPTS` (#1270) / `PLACEMENT_MOVE_MAX_ATTEMPTS` (#1289).
- */
-const DEFAULT_FLAG_PUSH_MAX_ATTEMPTS = 3;
-
 export const getFlagPushMaxAttempts = (
 	processEnv: NodeJS.ProcessEnv = process.env,
-): number => {
-	const raw = processEnv.FLAG_PUSH_MAX_ATTEMPTS;
-	if (!raw) return DEFAULT_FLAG_PUSH_MAX_ATTEMPTS;
-	const parsed = Number.parseInt(raw, 10);
-	return Number.isFinite(parsed) && parsed > 0
-		? parsed
-		: DEFAULT_FLAG_PUSH_MAX_ATTEMPTS;
-};
+): number => attemptBudget("FLAG_PUSH_MAX_ATTEMPTS", 3, processEnv);
 
 export const FLAG_PUSH_MAX_ATTEMPTS = getFlagPushMaxAttempts();
 

package/src/handlers/message-copy.ts

@@ -9,6 +9,7 @@ import {
 	MailboxCursorPausedError,
 	reconcileStaleMessage,
 } from "@remit/mailbox-service";
+import { attemptBudget } from "@remit/sqs-client/attempt-budget";
 import { isAccountDeleted } from "../account-check.js";
 import { createConnectionScopeWithCredentials } from "../connection-scope.js";
 import type { MessageCopyEvent } from "../events.js";
@@ -31,24 +32,9 @@ const defaultDeps: MessageCopyDeps = {
 	createConnectionScope: createConnectionScopeWithCredentials,
 };
 
-/**
- * Fallback when `MESSAGE_COPY_MAX_ATTEMPTS` is unset (local dev, unit tests).
- * Matches the `maxReceiveCount` the message queue's redrive policy uses
- * (`remit-messages.fifo`, `deploy/vps/queues.json`), same pattern as
- * `MESSAGE_MOVE_MAX_ATTEMPTS`.
- */
-const DEFAULT_MESSAGE_COPY_MAX_ATTEMPTS = 3;
-
 export const getMessageCopyMaxAttempts = (
 	processEnv: NodeJS.ProcessEnv = process.env,
-): number => {
-	const raw = processEnv.MESSAGE_COPY_MAX_ATTEMPTS;
-	if (!raw) return DEFAULT_MESSAGE_COPY_MAX_ATTEMPTS;
-	const parsed = Number.parseInt(raw, 10);
-	return Number.isFinite(parsed) && parsed > 0
-		? parsed
-		: DEFAULT_MESSAGE_COPY_MAX_ATTEMPTS;
-};
+): number => attemptBudget("MESSAGE_COPY_MAX_ATTEMPTS", 3, processEnv);
 
 export const MESSAGE_COPY_MAX_ATTEMPTS = getMessageCopyMaxAttempts();
 

package/src/handlers/message-delete.ts

@@ -14,6 +14,7 @@ import {
 	isMessageGoneFromOpenMailbox,
 	MailboxCursorPausedError,
 } from "@remit/mailbox-service";
+import { attemptBudget } from "@remit/sqs-client/attempt-budget";
 import { isAccountDeleted } from "../account-check.js";
 import { createConnectionScopeWithCredentials } from "../connection-scope.js";
 import { emitEvent } from "../emit.js";
@@ -28,24 +29,9 @@ import {
 	buildThreadMessageTrashUpdate,
 } from "./thread-message-rows.js";
 
-/**
- * Fallback when `MESSAGE_DELETE_MAX_ATTEMPTS` is unset (local dev, unit tests).
- * Matches the `maxReceiveCount` the redrive policy of the queue `emit.ts`
- * routes MESSAGE_DELETE onto uses (`remit-message-mgmt`,
- * `deploy/vps/queues.json`), same pattern as `MESSAGE_MOVE_MAX_ATTEMPTS`.
- */
-const DEFAULT_MESSAGE_DELETE_MAX_ATTEMPTS = 3;
-
 export const getMessageDeleteMaxAttempts = (
 	processEnv: NodeJS.ProcessEnv = process.env,
-): number => {
-	const raw = processEnv.MESSAGE_DELETE_MAX_ATTEMPTS;
-	if (!raw) return DEFAULT_MESSAGE_DELETE_MAX_ATTEMPTS;
-	const parsed = Number.parseInt(raw, 10);
-	return Number.isFinite(parsed) && parsed > 0
-		? parsed
-		: DEFAULT_MESSAGE_DELETE_MAX_ATTEMPTS;
-};
+): number => attemptBudget("MESSAGE_DELETE_MAX_ATTEMPTS", 3, processEnv);
 
 export const MESSAGE_DELETE_MAX_ATTEMPTS = getMessageDeleteMaxAttempts();
 

package/src/handlers/message-move.ts

@@ -10,6 +10,7 @@ import {
 	isPlacementUnsettled,
 	MailboxCursorPausedError,
 } from "@remit/mailbox-service";
+import { attemptBudget } from "@remit/sqs-client/attempt-budget";
 import { isAccountDeleted } from "../account-check.js";
 import { createConnectionScopeWithCredentials } from "../connection-scope.js";
 import { emitEvent } from "../emit.js";
@@ -19,24 +20,9 @@ import { withOAuthLifecycle } from "../with-oauth-lifecycle.js";
 import { buildLifecycleDeps } from "../with-oauth-lifecycle-deps.js";
 import { resolveExhaustedMessageMoveFailure } from "./message-move-terminal.js";
 
-/**
- * Fallback when `MESSAGE_MOVE_MAX_ATTEMPTS` is unset (local dev, unit tests).
- * Matches the `maxReceiveCount` the message queue's redrive policy uses
- * (`remit-messages.fifo`, `deploy/vps/queues.json`), same pattern as
- * `FLAG_PUSH_MAX_ATTEMPTS` and `PLACEMENT_MOVE_MAX_ATTEMPTS`.
- */
-const DEFAULT_MESSAGE_MOVE_MAX_ATTEMPTS = 3;
-
 export const getMessageMoveMaxAttempts = (
 	processEnv: NodeJS.ProcessEnv = process.env,
-): number => {
-	const raw = processEnv.MESSAGE_MOVE_MAX_ATTEMPTS;
-	if (!raw) return DEFAULT_MESSAGE_MOVE_MAX_ATTEMPTS;
-	const parsed = Number.parseInt(raw, 10);
-	return Number.isFinite(parsed) && parsed > 0
-		? parsed
-		: DEFAULT_MESSAGE_MOVE_MAX_ATTEMPTS;
-};
+): number => attemptBudget("MESSAGE_MOVE_MAX_ATTEMPTS", 3, processEnv);
 
 export const MESSAGE_MOVE_MAX_ATTEMPTS = getMessageMoveMaxAttempts();
 

package/src/handlers/placement-move-push.ts

@@ -10,6 +10,7 @@ import {
 	reconcileStaleMessage,
 	resolveExhaustedPlacementMoveFailure,
 } from "@remit/mailbox-service";
+import { attemptBudget } from "@remit/sqs-client/attempt-budget";
 import { isAccountDeleted } from "../account-check.js";
 import { createConnectionScopeWithCredentials } from "../connection-scope.js";
 import { emitEvent } from "../emit.js";
@@ -23,24 +24,9 @@ import {
 	searchMailboxByMessageId,
 } from "./message-move.js";
 
-/**
- * Fallback when `PLACEMENT_MOVE_MAX_ATTEMPTS` is unset (local dev, unit
- * tests). Matches the placement-move queue's own `MAX_RECEIVE_COUNT` default
- * (`infra/stacks/dev/stacks/remit-queue-stack.ts`), same pattern as
- * `BODY_SYNC_MAX_ATTEMPTS` (#1270).
- */
-const DEFAULT_PLACEMENT_MOVE_MAX_ATTEMPTS = 3;
-
 export const getPlacementMoveMaxAttempts = (
 	processEnv: NodeJS.ProcessEnv = process.env,
-): number => {
-	const raw = processEnv.PLACEMENT_MOVE_MAX_ATTEMPTS;
-	if (!raw) return DEFAULT_PLACEMENT_MOVE_MAX_ATTEMPTS;
-	const parsed = Number.parseInt(raw, 10);
-	return Number.isFinite(parsed) && parsed > 0
-		? parsed
-		: DEFAULT_PLACEMENT_MOVE_MAX_ATTEMPTS;
-};
+): number => attemptBudget("PLACEMENT_MOVE_MAX_ATTEMPTS", 3, processEnv);
 
 export const PLACEMENT_MOVE_MAX_ATTEMPTS = getPlacementMoveMaxAttempts();
 

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

@@ -11,6 +11,7 @@ import {
 	QuarantineService,
 	resolveExhaustedBodySyncFailures,
 } from "@remit/mailbox-service";
+import { attemptBudget } from "@remit/sqs-client/attempt-budget";
 import { env } from "expect-env";
 import { isAccountDeleted } from "../account-check.js";
 import { isBodySyncEnabled } from "../body-sync-gate.js";
@@ -27,37 +28,9 @@ import { workerVersion } from "../worker-version.js";
 
 const bodySyncEnabledParameterName = env.BODY_SYNC_ENABLED_PARAMETER_NAME;
 
-/**
- * Fallback when `BODY_SYNC_MAX_ATTEMPTS` is unset (local dev, unit tests).
- * Matches the body queue's own `MAX_RECEIVE_COUNT` default
- * (`infra/stacks/dev/stacks/remit-queue-stack.ts`) so an environment that
- * never injects the var still behaves like production.
- */
-const DEFAULT_BODY_SYNC_MAX_ATTEMPTS = 3;
-
-/**
- * Reads the redelivery-budget-exhaustion threshold. CDK derives
- * `BODY_SYNC_MAX_ATTEMPTS` from the body queue's own `MAX_RECEIVE_COUNT`
- * (`remit-worker-stack.ts`) so the two constants can't drift apart — a
- * hand-copied duplicate here previously risked the worker resolving
- * "last attempt" on a different delivery than the queue's redrive policy
- * actually uses (issue #1270). SQS's own `ApproximateReceiveCount` is the
- * source of truth for how many times a record has been delivered; once it
- * reaches this value, the current invocation is the last attempt before the
- * queue's own redrive would DLQ the record, so retry exhaustion is resolved
- * here (see `resolveExhaustedBodySyncFailures`) instead of letting the
- * record dead-letter with no diagnosis.
- */
 export const getBodySyncMaxAttempts = (
 	processEnv: NodeJS.ProcessEnv = process.env,
-): number => {
-	const raw = processEnv.BODY_SYNC_MAX_ATTEMPTS;
-	if (!raw) return DEFAULT_BODY_SYNC_MAX_ATTEMPTS;
-	const parsed = Number.parseInt(raw, 10);
-	return Number.isFinite(parsed) && parsed > 0
-		? parsed
-		: DEFAULT_BODY_SYNC_MAX_ATTEMPTS;
-};
+): number => attemptBudget("BODY_SYNC_MAX_ATTEMPTS", 3, processEnv);
 
 export const BODY_SYNC_MAX_ATTEMPTS = getBodySyncMaxAttempts();