@remit/imap-worker 2.0.6 → 2.0.8

package/dist/handlers/sync-messages.js

@@ -1,4 +1,4 @@
-import { isNotFoundError } from "@remit/data-ports/errors";
+import { isNotFoundError, LostLeaseError } from "@remit/data-ports/errors";
 import { SyncPhase } from "@remit/domain-enums";
 import { RefreshTokenError } from "@remit/mail-oauth-service";
 import { isMailboxMutationInFlight, MailConnectionError, MessageSyncService, QuarantineService, SyncWarningService, } from "@remit/mailbox-service";
@@ -85,9 +85,9 @@ export const syncMessages = async (event, ctx) => {
     // mailbox lock and the actual sync run inside the wrapper callback.
     await withOAuthLifecycle(buildLifecycleDeps(secrets, accountService, ctx.oauth), account, log, async (credentials) => {
         // Acquire lock before starting sync operation
-        const { executed } = await mailboxLockService.withMailboxLock(event.mailboxId, "SYNC_MESSAGES", event.accountId, async () => {
+        const { executed } = await mailboxLockService.withMailboxLock(event.mailboxId, "SYNC_MESSAGES", event.accountId, async (lease) => {
             try {
-                await syncMailboxMessages(event, account, pool.borrow(account, credentials), {
+                await syncMailboxMessages(event, account, pool.borrow(account, credentials), lease, {
                     accountService,
                     mailboxService,
                     messageService,
@@ -110,6 +110,17 @@ export const syncMessages = async (event, ctx) => {
                     (err instanceof MailConnectionError && err.kind === "auth")) {
                     throw err;
                 }
+                // A successor took the lapsed lease and now owns this mailbox's
+                // sync, so this round stops without recording an error phase.
+                if (err instanceof LostLeaseError) {
+                    log.warn({
+                        accountId: event.accountId,
+                        mailboxId: event.mailboxId,
+                        eventId: event.eventId,
+                        error: err.message,
+                    }, "Resolving SYNC_MESSAGES: another holder took the lapsed mailbox lock");
+                    return;
+                }
                 // The guard above is a check-then-act: a delete asked for while
                 // this round was in flight lands inside it, and the round then
                 // fails somewhere deeper — on the row (NotFoundError from the
@@ -201,7 +212,7 @@ export const drainPendingFlagPushes = async (flagPushMarkerService, account, mai
 /**
  * Sync one batch of messages for a mailbox. Runs under the mailbox lock.
  */
-const syncMailboxMessages = async (event, account, borrowed, deps, log) => {
+const syncMailboxMessages = async (event, account, borrowed, lease, deps, log) => {
     const { accountService, mailboxService, messageService, envelopeService, addressService, threadMessageService, mailboxSpecialUseService, quarantineService, syncWarningRepository, flagPushMarkerService, messageFlagService, emit, metrics, config, } = deps;
     // Get the mailbox - it must exist (should have been created by mailbox sync)
     const mailbox = await mailboxService.get(account.accountId, event.mailboxId);
@@ -216,6 +227,7 @@ const syncMailboxMessages = async (event, account, borrowed, deps, log) => {
         const syncService = new MessageSyncService(connection, mailboxService, mailboxSpecialUseService, messageService, envelopeService, addressService, threadMessageService, new SyncWarningService(syncWarningRepository), log, flagPushMarkerService, messageFlagService, new QuarantineService(quarantineService, mailboxSpecialUseService, config.workerVersion, log));
         return syncService.syncMessages(mailboxId, account.accountId, account.accountConfigId, MESSAGE_BATCH_SIZE);
     })().finally(() => borrowed.release());
+    await lease.renew();
     log.info({
         syncedCount: result.syncedCount,
         hasMore: result.hasMore,

package/package.json

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

package/README.md

@@ -1,103 +0,0 @@
-# @remit/imap-worker
-
-SQS-driven Lambda worker for handling IMAP lifecycle events in the Remit system.
-
-## Features
-
-- **Event Driven**: Processes events from SQS (`SYNC_MAILBOXES`, `SYNC_MESSAGES`, etc.)
-- **CLI Tool**: Includes a CLI for manually triggering events during development
-- **Bundled**: Built with esbuild for optimal Lambda performance
-
-## Installation
-
-```bash
-npm install
-npm run bundle
-```
-
-## Usage
-
-### Lambda Handler
-
-The package exports a standard AWS Lambda SQS handler:
-
-```typescript
-import { handler } from "@remit/imap-worker";
-```
-
-### CLI (Local Development)
-
-Trigger events manually using the included CLI:
-
-```bash
-# Sync all mailboxes for an account
-npm run cli -- -t SYNC_MAILBOXES -a <accountId>
-
-# Sync messages in a mailbox
-npm run cli -- -t SYNC_MESSAGES -a <accountId> -m <mailboxId>
-
-# Force full sync (ignore lastSyncUid)
-npm run cli -- -t SYNC_MESSAGES -a <accountId> -m <mailboxId> --fullSync
-
-# Sync message bodies for specific messages
-npm run cli -- -t SYNC_MESSAGE_BODY -a <accountId> -m <mailboxId> --messageIds id1,id2,id3
-```
-
-## Environment Variables
-
-| Variable                      | Required | Description                                              |
-| ----------------------------- | -------- | -------------------------------------------------------- |
-| `DATA_BACKEND`                | Yes      | Relational backend to run against (`sqlite`)             |
-| `SQLITE_APP_DB_PATH`          | Yes      | Path to the app SQLite database                          |
-| `SQLITE_MAIL_DB_PATH`         | Yes      | Path to the tenant mail SQLite database                  |
-| `SQLITE_SEARCH_DB_PATH`       | Yes      | Path to the tenant search SQLite database                |
-| `SQS_QUEUE_URL_MAILBOXES`     | Yes      | FIFO queue URL for `SYNC_MAILBOXES` events               |
-| `SQS_QUEUE_URL_MESSAGES`      | Yes      | FIFO queue URL for `SYNC_MESSAGES` events                |
-| `SQS_QUEUE_URL_BODY`          | Yes      | FIFO queue URL for `SYNC_MESSAGE_BODY` events            |
-| `SQS_QUEUE_URL_FLAGS`         | Yes      | FIFO queue URL for `SYNC_FLAGS` events                   |
-| `SQS_QUEUE_URL_MAILBOX_MGMT`  | Yes      | Standard queue URL for mailbox management events         |
-| `SQS_QUEUE_URL_MESSAGE_MGMT`  | Yes      | Standard queue URL for message management events         |
-| `S3_BUCKET`                   | Yes      | S3 bucket for storing raw message content                |
-| `NODE_ENV`                    | No       | Set to `development` for local execution                 |
-| `LOG_LEVEL`                   | No       | Logging level (default: `info`)                          |
-
-## Event Types
-
-| Event               | Description                                    | Required Fields                         |
-| ------------------- | ---------------------------------------------- | --------------------------------------- |
-| `SYNC_MAILBOXES`    | Discovers and syncs mailboxes for an account   | `accountId`                             |
-| `SYNC_MESSAGES`     | Fetches new messages for a mailbox (one batch) | `accountId`, `mailboxId`                |
-| `SYNC_MESSAGE_BODY` | Fetches and stores message bodies in batch     | `accountId`, `mailboxId`, `messageIds`  |
-
-### Event Schema
-
-All events share a base schema:
-
-```typescript
-interface BaseEvent {
-  accountId: string;
-  eventId: string;    // Idempotency key
-  timestamp: number;  // Unix timestamp
-}
-```
-
-## Architecture
-
-```
-SQS Queue
-    │
-    ▼
-┌───────────────┐
-│  Lambda/CLI   │
-│   (index.ts)  │
-└───────┬───────┘
-        │
-        ▼
-┌───────────────┐
-│   processor   │  ─── Routes events to handlers
-└───────┬───────┘
-        │
-        ├──► syncMailboxes
-        ├──► syncMessages
-        └──► syncMessageBody
-```