@remit/imap-worker 2.0.5 → 2.0.7

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.5",
+	"version": "2.0.7",
 	"type": "module",
 	"main": "dist/index.js",
 	"exports": {