@develit-services/bank 6.0.0 → 6.1.1

package/dist/base.cjs

@@ -2,11 +2,11 @@
 
 const backendSdk = require('@develit-io/backend-sdk');
 const paymentDirection = require('./shared/bank.BsWBG0gb.cjs');
-const bank = require('./shared/bank.DQZxSHKV.cjs');
 const drizzleOrm = require('drizzle-orm');
 const cloudflare_workers = require('cloudflare:workers');
 const d1 = require('drizzle-orm/d1');
 require('jose');
+const bank = require('./shared/bank.CSmuzdUJ.cjs');
 const zod = require('zod');
 const database_schema = require('./shared/bank.Ca3jzmIb.cjs');
 const generalCodes = require('@develit-io/general-codes');
@@ -107,50 +107,14 @@ async function heartbeatSyncWorkflows({
   );
 }
 
-async function dispatchSyncWorkflows({
-  entities,
-  createInstance,
-  logger,
-  now = Date.now,
-  recoveryWindowMs = bank.DISPATCH_RECOVERY_WINDOW_MS
-}) {
-  const at = now();
-  await Promise.all(
-    entities.map(async (entity) => {
-      const { id, lastSyncAt } = entity;
-      if (!lastSyncAt) {
-        logger.warn("sync-workflow.dispatch.sync-age-unknown", { id });
-        return;
-      }
-      const instanceId = bank.buildDispatchInstanceId(id, at, recoveryWindowMs);
-      try {
-        await createInstance(instanceId, id);
-        logger.info("sync-workflow.dispatch.created", {
-          id,
-          instanceId,
-          lastSyncAt: lastSyncAt.toISOString()
-        });
-      } catch (err) {
-        if (bank.isAlreadyExists(err)) return;
-        logger.error("sync-workflow.dispatch.failed", {
-          id,
-          instanceId,
-          error: err instanceof Error ? err.message : String(err)
-        });
-      }
-    })
-  );
+function isAlreadyExists(err) {
+  return /already exists/i.test(extractMessage(err));
 }
-
-function isDispatchEnabled(accountId, selection) {
-  const raw = selection?.trim();
-  if (!raw) return false;
-  if (raw.toLowerCase() === "all") return true;
-  return raw.split(",").map((id) => id.trim()).includes(accountId);
+function isInstanceNotFound(err) {
+  return /instance.*not.?found|not.?found.*instance/i.test(extractMessage(err));
 }
-function isDispatchActive(accountId, selection, dispatchCron) {
-  if (!dispatchCron?.trim()) return false;
-  return isDispatchEnabled(accountId, selection);
+function extractMessage(err) {
+  return err instanceof Error ? err.message : typeof err === "object" && err !== null && "message" in err ? String(err.message) : "";
 }
 
 const FINITE_STATUSES = /* @__PURE__ */ new Set([
@@ -987,32 +951,18 @@ exports.BankServiceBase = class BankServiceBase extends backendSdk.develitWorker
       { successMessage: "Account sync workflow started" },
       async ({ accountId }) => {
         await this.setSyncEnabledOrThrow(accountId, true);
-        if (isDispatchActive(
-          accountId,
-          this.env.SYNC_DISPATCH_ACCOUNT_IDS,
-          this.env.CRON_SYNC_WORKFLOW_DISPATCH
-        )) {
-          const instanceId = bank.buildDispatchInstanceId(accountId, Date.now());
-          let instance2;
-          try {
-            instance2 = await this.env.SYNC_ACCOUNT_PAYMENTS_WORKFLOW.create(
-              bank.buildDispatchCreateOptions(instanceId, accountId)
-            );
-          } catch (err) {
-            if (!bank.isAlreadyExists(err)) throw err;
-            instance2 = await this.env.SYNC_ACCOUNT_PAYMENTS_WORKFLOW.get(instanceId);
-          }
-          return {
-            instanceId: instance2.id,
-            details: await instance2.status()
-          };
+        let instance;
+        try {
+          instance = await this.env.SYNC_ACCOUNT_PAYMENTS_WORKFLOW.create({
+            id: accountId,
+            params: {
+              accountId
+            }
+          });
+        } catch (err) {
+          if (!isAlreadyExists(err)) throw err;
+          instance = await this.env.SYNC_ACCOUNT_PAYMENTS_WORKFLOW.get(accountId);
         }
-        const instance = await this.env.SYNC_ACCOUNT_PAYMENTS_WORKFLOW.create({
-          id: accountId,
-          params: {
-            accountId
-          }
-        });
         return {
           instanceId: instance.id,
           details: await instance.status()
@@ -1039,34 +989,13 @@ exports.BankServiceBase = class BankServiceBase extends backendSdk.develitWorker
       { successMessage: "Account sync workflow restarted" },
       async ({ accountId }) => {
         await this.setSyncEnabledOrThrow(accountId, true);
-        if (isDispatchActive(
-          accountId,
-          this.env.SYNC_DISPATCH_ACCOUNT_IDS,
-          this.env.CRON_SYNC_WORKFLOW_DISPATCH
-        )) {
-          const instanceId = bank.buildDispatchInstanceId(accountId, Date.now());
-          let instance2;
-          try {
-            instance2 = await this.env.SYNC_ACCOUNT_PAYMENTS_WORKFLOW.create(
-              bank.buildDispatchCreateOptions(instanceId, accountId)
-            );
-          } catch (err) {
-            if (!bank.isAlreadyExists(err)) throw err;
-            instance2 = await this.env.SYNC_ACCOUNT_PAYMENTS_WORKFLOW.get(instanceId);
-            await instance2.restart();
-          }
-          return {
-            instanceId: instance2.id,
-            details: await instance2.status()
-          };
-        }
         let instance;
         try {
           const existing = await this.getCurrentSyncInstance(accountId);
           await existing.restart();
           instance = existing;
         } catch (err) {
-          if (!bank.isInstanceNotFound(err)) throw err;
+          if (!isInstanceNotFound(err)) throw err;
         }
         if (!instance) {
           instance = await this.env.SYNC_ACCOUNT_PAYMENTS_WORKFLOW.create({
@@ -1376,19 +1305,11 @@ exports.BankServiceBase = class BankServiceBase extends backendSdk.develitWorker
       console.log("Scheduled CRON payment request statuses");
       await this.updatePaymentRequestStatuses();
     }
-    if (controller.cron === this.env.CRON_SYNC_WORKFLOW_DISPATCH) {
-      await this.dispatchSyncWorkflows();
-    }
     if (controller.cron === this.env.CRON_SYNC_WORKFLOW_HEARTBEAT) {
       console.log("Scheduled CRON sync workflow heartbeat");
       await this.heartbeatSyncWorkflows();
     }
   }
-  /**
-   * Lifecycle actions must target the instance that actually syncs the
-   * account — under dispatch that is the windowed instance recorded with the
-   * last sync write, not the legacy canonical id.
-   */
   async setSyncEnabledOrThrow(accountId, syncEnabled) {
     const [updated] = await updateAccountSyncEnabledCommand(this.db, {
       accountId,
@@ -1399,25 +1320,7 @@ exports.BankServiceBase = class BankServiceBase extends backendSdk.develitWorker
     }
   }
   async getCurrentSyncInstance(accountId) {
-    const account = await bank.getAccountByIdQuery(this.db, { accountId });
-    return this.env.SYNC_ACCOUNT_PAYMENTS_WORKFLOW.get(
-      bank.resolveCurrentSyncInstanceId(
-        accountId,
-        account?.lastSyncMetadata?.instanceId
-      )
-    );
-  }
-  async dispatchSyncWorkflows() {
-    const selection = this.env.SYNC_DISPATCH_ACCOUNT_IDS;
-    if (!selection?.trim()) return;
-    const accounts = await getSyncCandidateAccountsQuery(this.db);
-    await dispatchSyncWorkflows({
-      entities: accounts.filter((a) => isDispatchEnabled(a.id, selection)),
-      createInstance: (instanceId, accountId) => this.env.SYNC_ACCOUNT_PAYMENTS_WORKFLOW.create(
-        bank.buildDispatchCreateOptions(instanceId, accountId)
-      ),
-      logger: syncEventConsoleLogger
-    });
+    return this.env.SYNC_ACCOUNT_PAYMENTS_WORKFLOW.get(accountId);
   }
   async heartbeatSyncWorkflows() {
     const accounts = await getSyncCandidateAccountsQuery(this.db);
@@ -1432,13 +1335,7 @@ exports.BankServiceBase = class BankServiceBase extends backendSdk.develitWorker
       return;
     }
     await heartbeatSyncWorkflows({
-      entities: accounts.filter(
-        (a) => !isDispatchActive(
-          a.id,
-          this.env.SYNC_DISPATCH_ACCOUNT_IDS,
-          this.env.CRON_SYNC_WORKFLOW_DISPATCH
-        )
-      ).map((a) => ({
+      entities: accounts.map((a) => ({
         id: a.id,
         iterationCount: a.lastSyncMetadata?.iterationCount,
         syncIntervalS: a.syncIntervalS,
@@ -2210,12 +2107,7 @@ exports.BankServiceBase = class BankServiceBase extends backendSdk.develitWorker
             if (includeWorkflow) {
               let status;
               try {
-                const instance = await this.env.SYNC_ACCOUNT_PAYMENTS_WORKFLOW.get(
-                  bank.resolveCurrentSyncInstanceId(
-                    a.id,
-                    a.lastSyncMetadata?.instanceId
-                  )
-                );
+                const instance = await this.env.SYNC_ACCOUNT_PAYMENTS_WORKFLOW.get(a.id);
                 status = await instance.status();
               } catch (_) {
                 status = null;
@@ -2315,12 +2207,7 @@ exports.BankServiceBase = class BankServiceBase extends backendSdk.develitWorker
           throw accountNotFoundError();
         }
         try {
-          const instance = await this.env.SYNC_ACCOUNT_PAYMENTS_WORKFLOW.get(
-            bank.resolveCurrentSyncInstanceId(
-              accountId,
-              account.lastSyncMetadata?.instanceId
-            )
-          );
+          const instance = await this.env.SYNC_ACCOUNT_PAYMENTS_WORKFLOW.get(accountId);
           await terminateSyncWorkflow(instance);
         } catch (error) {
           this.log({

package/dist/base.d.cts

@@ -4212,14 +4212,8 @@ declare class BankServiceBase extends BankServiceBase_base {
         statusChanged: number;
     }>>;
     scheduled(controller: ScheduledController): Promise<void>;
-    /**
-     * Lifecycle actions must target the instance that actually syncs the
-     * account — under dispatch that is the windowed instance recorded with the
-     * last sync write, not the legacy canonical id.
-     */
     private setSyncEnabledOrThrow;
     private getCurrentSyncInstance;
-    private dispatchSyncWorkflows;
     private heartbeatSyncWorkflows;
     handleAuthorizationCallback(input: HandleAuthorizationCallbackInput): Promise<IRPCResponse<HandleAuthorizationCallbackOutput>>;
     closePaymentRequest(input: ClosePaymentRequestInput): Promise<IRPCResponse<ClosePaymentRequestOutput>>;

package/dist/base.d.mts

@@ -4212,14 +4212,8 @@ declare class BankServiceBase extends BankServiceBase_base {
         statusChanged: number;
     }>>;
     scheduled(controller: ScheduledController): Promise<void>;
-    /**
-     * Lifecycle actions must target the instance that actually syncs the
-     * account — under dispatch that is the windowed instance recorded with the
-     * last sync write, not the legacy canonical id.
-     */
     private setSyncEnabledOrThrow;
     private getCurrentSyncInstance;
-    private dispatchSyncWorkflows;
     private heartbeatSyncWorkflows;
     handleAuthorizationCallback(input: HandleAuthorizationCallbackInput): Promise<IRPCResponse<HandleAuthorizationCallbackOutput>>;
     closePaymentRequest(input: ClosePaymentRequestInput): Promise<IRPCResponse<ClosePaymentRequestOutput>>;

package/dist/base.d.ts

@@ -4212,14 +4212,8 @@ declare class BankServiceBase extends BankServiceBase_base {
         statusChanged: number;
     }>>;
     scheduled(controller: ScheduledController): Promise<void>;
-    /**
-     * Lifecycle actions must target the instance that actually syncs the
-     * account — under dispatch that is the windowed instance recorded with the
-     * last sync write, not the legacy canonical id.
-     */
     private setSyncEnabledOrThrow;
     private getCurrentSyncInstance;
-    private dispatchSyncWorkflows;
     private heartbeatSyncWorkflows;
     handleAuthorizationCallback(input: HandleAuthorizationCallbackInput): Promise<IRPCResponse<HandleAuthorizationCallbackOutput>>;
     closePaymentRequest(input: ClosePaymentRequestInput): Promise<IRPCResponse<ClosePaymentRequestOutput>>;

package/dist/base.mjs

@@ -1,10 +1,10 @@
 import { uuidv4, first, buildMultiFilterConditions as buildMultiFilterConditions$1, bankAccountMetadataSchema, structuredAddressSchema, workflowInstanceStatusSchema, develitWorker, createInternalError, action, service } from '@develit-io/backend-sdk';
 import { G as tables, g as accountInsertSchema, H as relations, o as isProcessedStatus, p as isTerminalStatus, L as getNonTerminalPaymentRequestsQuery, x as toIncomingPayment, N as calculateCzechIban, j as assignAccount, u as toBatchedPayment, y as toPaymentRequestInsert, a as FinbricksClient, F as FINBRICKS_ENDPOINTS } from './shared/bank.kz-PKVi5.mjs';
-import { k as isAlreadyExists, D as DISPATCH_RECOVERY_WINDOW_MS, l as buildDispatchInstanceId, m as encrypt, d as createCredentialsResolver, i as initiateConnector, n as buildDispatchCreateOptions, o as isInstanceNotFound, e as updatePaymentRequestStatusCommand, a as getPaymentRequestsByBatchIdQuery, g as getBatchByIdQuery, u as upsertBatchCommand, b as getAccountByIdQuery, r as resolveCurrentSyncInstanceId, p as importAesKey, j as createPaymentCommand } from './shared/bank.D9DoIABz.mjs';
 import { eq, sql, and, like, asc, desc, inArray, gte, lte, isNull, count } from 'drizzle-orm';
 import { WorkerEntrypoint } from 'cloudflare:workers';
 import { drizzle } from 'drizzle-orm/d1';
 import 'jose';
+import { h as encrypt, d as createCredentialsResolver, i as initiateConnector, e as updatePaymentRequestStatusCommand, a as getPaymentRequestsByBatchIdQuery, g as getBatchByIdQuery, u as upsertBatchCommand, j as importAesKey, f as createPaymentCommand, b as getAccountByIdQuery } from './shared/bank.BWR4dqQ5.mjs';
 import { z } from 'zod';
 import { I as INSTRUCTION_PRIORITIES, C as CHARGE_BEARERS, g as PAYMENT_TYPES, b as CONNECTOR_KEYS, a as BATCH_STATUSES, f as PAYMENT_STATUSES, P as PAYMENT_DIRECTIONS, e as PAYMENT_REQUEST_STATUSES } from './shared/bank.BT7HayCV.mjs';
 import { CURRENCY_CODES } from '@develit-io/general-codes';
@@ -105,50 +105,14 @@ async function heartbeatSyncWorkflows({
   );
 }
 
-async function dispatchSyncWorkflows({
-  entities,
-  createInstance,
-  logger,
-  now = Date.now,
-  recoveryWindowMs = DISPATCH_RECOVERY_WINDOW_MS
-}) {
-  const at = now();
-  await Promise.all(
-    entities.map(async (entity) => {
-      const { id, lastSyncAt } = entity;
-      if (!lastSyncAt) {
-        logger.warn("sync-workflow.dispatch.sync-age-unknown", { id });
-        return;
-      }
-      const instanceId = buildDispatchInstanceId(id, at, recoveryWindowMs);
-      try {
-        await createInstance(instanceId, id);
-        logger.info("sync-workflow.dispatch.created", {
-          id,
-          instanceId,
-          lastSyncAt: lastSyncAt.toISOString()
-        });
-      } catch (err) {
-        if (isAlreadyExists(err)) return;
-        logger.error("sync-workflow.dispatch.failed", {
-          id,
-          instanceId,
-          error: err instanceof Error ? err.message : String(err)
-        });
-      }
-    })
-  );
+function isAlreadyExists(err) {
+  return /already exists/i.test(extractMessage(err));
 }
-
-function isDispatchEnabled(accountId, selection) {
-  const raw = selection?.trim();
-  if (!raw) return false;
-  if (raw.toLowerCase() === "all") return true;
-  return raw.split(",").map((id) => id.trim()).includes(accountId);
+function isInstanceNotFound(err) {
+  return /instance.*not.?found|not.?found.*instance/i.test(extractMessage(err));
 }
-function isDispatchActive(accountId, selection, dispatchCron) {
-  if (!dispatchCron?.trim()) return false;
-  return isDispatchEnabled(accountId, selection);
+function extractMessage(err) {
+  return err instanceof Error ? err.message : typeof err === "object" && err !== null && "message" in err ? String(err.message) : "";
 }
 
 const FINITE_STATUSES = /* @__PURE__ */ new Set([
@@ -985,32 +949,18 @@ let BankServiceBase = class extends develitWorker(WorkerEntrypoint) {
       { successMessage: "Account sync workflow started" },
       async ({ accountId }) => {
         await this.setSyncEnabledOrThrow(accountId, true);
-        if (isDispatchActive(
-          accountId,
-          this.env.SYNC_DISPATCH_ACCOUNT_IDS,
-          this.env.CRON_SYNC_WORKFLOW_DISPATCH
-        )) {
-          const instanceId = buildDispatchInstanceId(accountId, Date.now());
-          let instance2;
-          try {
-            instance2 = await this.env.SYNC_ACCOUNT_PAYMENTS_WORKFLOW.create(
-              buildDispatchCreateOptions(instanceId, accountId)
-            );
-          } catch (err) {
-            if (!isAlreadyExists(err)) throw err;
-            instance2 = await this.env.SYNC_ACCOUNT_PAYMENTS_WORKFLOW.get(instanceId);
-          }
-          return {
-            instanceId: instance2.id,
-            details: await instance2.status()
-          };
+        let instance;
+        try {
+          instance = await this.env.SYNC_ACCOUNT_PAYMENTS_WORKFLOW.create({
+            id: accountId,
+            params: {
+              accountId
+            }
+          });
+        } catch (err) {
+          if (!isAlreadyExists(err)) throw err;
+          instance = await this.env.SYNC_ACCOUNT_PAYMENTS_WORKFLOW.get(accountId);
         }
-        const instance = await this.env.SYNC_ACCOUNT_PAYMENTS_WORKFLOW.create({
-          id: accountId,
-          params: {
-            accountId
-          }
-        });
         return {
           instanceId: instance.id,
           details: await instance.status()
@@ -1037,27 +987,6 @@ let BankServiceBase = class extends develitWorker(WorkerEntrypoint) {
       { successMessage: "Account sync workflow restarted" },
       async ({ accountId }) => {
         await this.setSyncEnabledOrThrow(accountId, true);
-        if (isDispatchActive(
-          accountId,
-          this.env.SYNC_DISPATCH_ACCOUNT_IDS,
-          this.env.CRON_SYNC_WORKFLOW_DISPATCH
-        )) {
-          const instanceId = buildDispatchInstanceId(accountId, Date.now());
-          let instance2;
-          try {
-            instance2 = await this.env.SYNC_ACCOUNT_PAYMENTS_WORKFLOW.create(
-              buildDispatchCreateOptions(instanceId, accountId)
-            );
-          } catch (err) {
-            if (!isAlreadyExists(err)) throw err;
-            instance2 = await this.env.SYNC_ACCOUNT_PAYMENTS_WORKFLOW.get(instanceId);
-            await instance2.restart();
-          }
-          return {
-            instanceId: instance2.id,
-            details: await instance2.status()
-          };
-        }
         let instance;
         try {
           const existing = await this.getCurrentSyncInstance(accountId);
@@ -1374,19 +1303,11 @@ let BankServiceBase = class extends develitWorker(WorkerEntrypoint) {
       console.log("Scheduled CRON payment request statuses");
       await this.updatePaymentRequestStatuses();
     }
-    if (controller.cron === this.env.CRON_SYNC_WORKFLOW_DISPATCH) {
-      await this.dispatchSyncWorkflows();
-    }
     if (controller.cron === this.env.CRON_SYNC_WORKFLOW_HEARTBEAT) {
       console.log("Scheduled CRON sync workflow heartbeat");
       await this.heartbeatSyncWorkflows();
     }
   }
-  /**
-   * Lifecycle actions must target the instance that actually syncs the
-   * account — under dispatch that is the windowed instance recorded with the
-   * last sync write, not the legacy canonical id.
-   */
   async setSyncEnabledOrThrow(accountId, syncEnabled) {
     const [updated] = await updateAccountSyncEnabledCommand(this.db, {
       accountId,
@@ -1397,25 +1318,7 @@ let BankServiceBase = class extends develitWorker(WorkerEntrypoint) {
     }
   }
   async getCurrentSyncInstance(accountId) {
-    const account = await getAccountByIdQuery(this.db, { accountId });
-    return this.env.SYNC_ACCOUNT_PAYMENTS_WORKFLOW.get(
-      resolveCurrentSyncInstanceId(
-        accountId,
-        account?.lastSyncMetadata?.instanceId
-      )
-    );
-  }
-  async dispatchSyncWorkflows() {
-    const selection = this.env.SYNC_DISPATCH_ACCOUNT_IDS;
-    if (!selection?.trim()) return;
-    const accounts = await getSyncCandidateAccountsQuery(this.db);
-    await dispatchSyncWorkflows({
-      entities: accounts.filter((a) => isDispatchEnabled(a.id, selection)),
-      createInstance: (instanceId, accountId) => this.env.SYNC_ACCOUNT_PAYMENTS_WORKFLOW.create(
-        buildDispatchCreateOptions(instanceId, accountId)
-      ),
-      logger: syncEventConsoleLogger
-    });
+    return this.env.SYNC_ACCOUNT_PAYMENTS_WORKFLOW.get(accountId);
   }
   async heartbeatSyncWorkflows() {
     const accounts = await getSyncCandidateAccountsQuery(this.db);
@@ -1430,13 +1333,7 @@ let BankServiceBase = class extends develitWorker(WorkerEntrypoint) {
       return;
     }
     await heartbeatSyncWorkflows({
-      entities: accounts.filter(
-        (a) => !isDispatchActive(
-          a.id,
-          this.env.SYNC_DISPATCH_ACCOUNT_IDS,
-          this.env.CRON_SYNC_WORKFLOW_DISPATCH
-        )
-      ).map((a) => ({
+      entities: accounts.map((a) => ({
         id: a.id,
         iterationCount: a.lastSyncMetadata?.iterationCount,
         syncIntervalS: a.syncIntervalS,
@@ -2208,12 +2105,7 @@ let BankServiceBase = class extends develitWorker(WorkerEntrypoint) {
             if (includeWorkflow) {
               let status;
               try {
-                const instance = await this.env.SYNC_ACCOUNT_PAYMENTS_WORKFLOW.get(
-                  resolveCurrentSyncInstanceId(
-                    a.id,
-                    a.lastSyncMetadata?.instanceId
-                  )
-                );
+                const instance = await this.env.SYNC_ACCOUNT_PAYMENTS_WORKFLOW.get(a.id);
                 status = await instance.status();
               } catch (_) {
                 status = null;
@@ -2313,12 +2205,7 @@ let BankServiceBase = class extends develitWorker(WorkerEntrypoint) {
           throw accountNotFoundError();
         }
         try {
-          const instance = await this.env.SYNC_ACCOUNT_PAYMENTS_WORKFLOW.get(
-            resolveCurrentSyncInstanceId(
-              accountId,
-              account.lastSyncMetadata?.instanceId
-            )
-          );
+          const instance = await this.env.SYNC_ACCOUNT_PAYMENTS_WORKFLOW.get(accountId);
           await terminateSyncWorkflow(instance);
         } catch (error) {
           this.log({

package/dist/export/workflows.cjs

@@ -4,7 +4,7 @@ const backendSdk = require('@develit-io/backend-sdk');
 const paymentDirection = require('../shared/bank.BsWBG0gb.cjs');
 const batchLifecycle = require('../shared/bank.NF8bZBy0.cjs');
 const drizzleOrm = require('drizzle-orm');
-const bank = require('../shared/bank.DQZxSHKV.cjs');
+const bank = require('../shared/bank.CSmuzdUJ.cjs');
 const cloudflare_workers = require('cloudflare:workers');
 const cloudflare_workflows = require('cloudflare:workflows');
 const d1 = require('drizzle-orm/d1');
@@ -66,18 +66,54 @@ const mergeLastSyncBankRefIds = (previous, incoming, cap = LAST_SYNC_BANK_REF_ID
   return [...new Set(merged)].slice(-cap);
 };
 
-async function pushToQueue$1(queue, message) {
-  if (!Array.isArray(message)) {
-    await queue.send(message, { contentType: "v8" });
-    return;
+const MAX_BATCH_MESSAGES = 100;
+const MESSAGE_BYTE_CEILING = 112 * 1024;
+const BATCH_BYTE_CEILING = 224 * 1024;
+function estimateMessageBytes(message) {
+  return new TextEncoder().encode(JSON.stringify(message)).length;
+}
+function planQueueBatches(messages) {
+  const chunks = [];
+  const oversized = [];
+  let current = [];
+  let currentBytes = 0;
+  for (const message of messages) {
+    const bytes = estimateMessageBytes(message);
+    if (bytes > MESSAGE_BYTE_CEILING) {
+      oversized.push({ message, bytes });
+      continue;
+    }
+    if (current.length >= MAX_BATCH_MESSAGES || currentBytes + bytes > BATCH_BYTE_CEILING) {
+      chunks.push(current);
+      current = [];
+      currentBytes = 0;
+    }
+    current.push(message);
+    currentBytes += bytes;
   }
-  await queue.sendBatch(
-    message.map((m) => ({
-      body: m,
-      contentType: "v8"
-    }))
-  );
+  if (current.length > 0) {
+    chunks.push(current);
+  }
+  return { chunks, oversized };
+}
+async function pushToQueue(queue, message) {
+  const messages = Array.isArray(message) ? message : [message];
+  const { chunks, oversized } = planQueueBatches(messages);
+  for (const chunk of chunks) {
+    if (chunk.length === 1) {
+      await queue.send(chunk[0], { contentType: "v8" });
+      continue;
+    }
+    await queue.sendBatch(
+      chunk.map((m) => ({
+        body: m,
+        contentType: "v8"
+      }))
+    );
+  }
+  return { sent: messages.length - oversized.length, oversized };
 }
+
 async function failBatchAndPayments(db, batch, paymentRequests, reason) {
   const prCmds = paymentRequests.filter((p) => p.status !== "REJECTED").map(
     (p) => bank.updatePaymentRequestStatusCommand(db, {
@@ -289,7 +325,7 @@ class BankProcessBatch extends cloudflare_workers.WorkflowEntrypoint {
             timestamp: /* @__PURE__ */ new Date()
           }
         }));
-        await pushToQueue$1(
+        await pushToQueue(
           this.env.QUEUE_BUS_QUEUE,
           eventsToEmit
         );
@@ -301,7 +337,7 @@ class BankProcessBatch extends cloudflare_workers.WorkflowEntrypoint {
     }
     if (!isMockConnector) {
       await step.do("enqueue authorization email", async () => {
-        await pushToQueue$1(this.env.NOTIFICATIONS_QUEUE, {
+        await pushToQueue(this.env.NOTIFICATIONS_QUEUE, {
           type: "email",
           payload: {
             email: {
@@ -411,18 +447,6 @@ async function fetchBoundedByWindow({
   }
 }
 
-async function pushToQueue(queue, message) {
-  if (!Array.isArray(message)) {
-    await queue.send(message, { contentType: "v8" });
-    return;
-  }
-  await queue.sendBatch(
-    message.map((m) => ({
-      body: m,
-      contentType: "v8"
-    }))
-  );
-}
 class BankSyncAccountPayments extends cloudflare_workers.WorkflowEntrypoint {
   async run(event, step) {
     const { accountId } = event.payload;
@@ -431,7 +455,6 @@ class BankSyncAccountPayments extends cloudflare_workers.WorkflowEntrypoint {
     if (!accountId) {
       throw new cloudflare_workflows.NonRetryableError(`Haven't obtained accountId to load.`);
     }
-    const deadlineMs = bank.computeWindowDeadline(event.instanceId, accountId);
     const workflowStartedAt = await step.do(
       "capture workflow start time",
       async () => Date.now()
@@ -455,19 +478,6 @@ class BankSyncAccountPayments extends cloudflare_workers.WorkflowEntrypoint {
       if (!account.lastSyncAt) {
         throw new Error(`lastSyncedAt is not set for account: ${accountId}`);
       }
-      if (bank.isSupersededBy(
-        event.instanceId,
-        account.lastSyncMetadata?.instanceId,
-        accountId
-      )) {
-        logger.info("sync.superseded", {
-          accountId,
-          instanceId: event.instanceId,
-          supersededBy: account.lastSyncMetadata?.instanceId,
-          iteration
-        });
-        return;
-      }
       const lastSyncAtMs = account.lastSyncAt.getTime();
       const windowMs = await step.do("resolve sync window", async () => {
         const window = resolveSyncWindow(
@@ -481,15 +491,6 @@ class BankSyncAccountPayments extends cloudflare_workers.WorkflowEntrypoint {
           isCatchUp: window.isCatchUp
         };
       });
-      if (deadlineMs != null && windowMs.dateFromMs >= deadlineMs) {
-        logger.info("sync.window-elapsed", {
-          accountId,
-          instanceId: event.instanceId,
-          iteration,
-          deadline: new Date(deadlineMs).toISOString()
-        });
-        return;
-      }
       const syncWindow = {
         dateFrom: new Date(windowMs.dateFromMs),
         dateTo: new Date(windowMs.dateToMs),
@@ -705,10 +706,18 @@ class BankSyncAccountPayments extends cloudflare_workers.WorkflowEntrypoint {
             seenInstanceId: account.lastSyncMetadata?.instanceId ?? null
           }).command;
           if (eventsToEmit.length) {
-            await pushToQueue(
+            const { oversized } = await pushToQueue(
               this.env.QUEUE_BUS_QUEUE,
               eventsToEmit
             );
+            for (const { message, bytes } of oversized) {
+              logger.error("queue.event-oversized", {
+                accountId,
+                bytes,
+                eventSignal: message.eventSignal,
+                bankRefId: message.bankPayment.bankRefId
+              });
+            }
           }
           let syncStateRows;
           if (createCommands.length) {

package/dist/export/workflows.mjs

@@ -2,7 +2,7 @@ import { first, uuidv4, asNonEmpty } from '@develit-io/backend-sdk';
 import { G as tables, H as relations, v as toBatchedPaymentFromPaymentRequest, z as toPreparedPayment, m as isPaymentCompleted } from '../shared/bank.kz-PKVi5.mjs';
 import { i as isBatchAuthorized, b as isBatchFailed, d as isBatchProcessing } from '../shared/bank.XqSw509X.mjs';
 import { sql, and, eq, inArray } from 'drizzle-orm';
-import { g as getBatchByIdQuery, a as getPaymentRequestsByBatchIdQuery, c as checksum, u as upsertBatchCommand, b as getAccountByIdQuery, d as createCredentialsResolver, i as initiateConnector, e as updatePaymentRequestStatusCommand, f as computeWindowDeadline, h as isSupersededBy, j as createPaymentCommand } from '../shared/bank.D9DoIABz.mjs';
+import { g as getBatchByIdQuery, a as getPaymentRequestsByBatchIdQuery, c as checksum, u as upsertBatchCommand, b as getAccountByIdQuery, d as createCredentialsResolver, i as initiateConnector, e as updatePaymentRequestStatusCommand, f as createPaymentCommand } from '../shared/bank.BWR4dqQ5.mjs';
 import { WorkflowEntrypoint } from 'cloudflare:workers';
 import { NonRetryableError } from 'cloudflare:workflows';
 import { drizzle } from 'drizzle-orm/d1';
@@ -64,18 +64,54 @@ const mergeLastSyncBankRefIds = (previous, incoming, cap = LAST_SYNC_BANK_REF_ID
   return [...new Set(merged)].slice(-cap);
 };
 
-async function pushToQueue$1(queue, message) {
-  if (!Array.isArray(message)) {
-    await queue.send(message, { contentType: "v8" });
-    return;
+const MAX_BATCH_MESSAGES = 100;
+const MESSAGE_BYTE_CEILING = 112 * 1024;
+const BATCH_BYTE_CEILING = 224 * 1024;
+function estimateMessageBytes(message) {
+  return new TextEncoder().encode(JSON.stringify(message)).length;
+}
+function planQueueBatches(messages) {
+  const chunks = [];
+  const oversized = [];
+  let current = [];
+  let currentBytes = 0;
+  for (const message of messages) {
+    const bytes = estimateMessageBytes(message);
+    if (bytes > MESSAGE_BYTE_CEILING) {
+      oversized.push({ message, bytes });
+      continue;
+    }
+    if (current.length >= MAX_BATCH_MESSAGES || currentBytes + bytes > BATCH_BYTE_CEILING) {
+      chunks.push(current);
+      current = [];
+      currentBytes = 0;
+    }
+    current.push(message);
+    currentBytes += bytes;
   }
-  await queue.sendBatch(
-    message.map((m) => ({
-      body: m,
-      contentType: "v8"
-    }))
-  );
+  if (current.length > 0) {
+    chunks.push(current);
+  }
+  return { chunks, oversized };
+}
+async function pushToQueue(queue, message) {
+  const messages = Array.isArray(message) ? message : [message];
+  const { chunks, oversized } = planQueueBatches(messages);
+  for (const chunk of chunks) {
+    if (chunk.length === 1) {
+      await queue.send(chunk[0], { contentType: "v8" });
+      continue;
+    }
+    await queue.sendBatch(
+      chunk.map((m) => ({
+        body: m,
+        contentType: "v8"
+      }))
+    );
+  }
+  return { sent: messages.length - oversized.length, oversized };
 }
+
 async function failBatchAndPayments(db, batch, paymentRequests, reason) {
   const prCmds = paymentRequests.filter((p) => p.status !== "REJECTED").map(
     (p) => updatePaymentRequestStatusCommand(db, {
@@ -287,7 +323,7 @@ class BankProcessBatch extends WorkflowEntrypoint {
             timestamp: /* @__PURE__ */ new Date()
           }
         }));
-        await pushToQueue$1(
+        await pushToQueue(
           this.env.QUEUE_BUS_QUEUE,
           eventsToEmit
         );
@@ -299,7 +335,7 @@ class BankProcessBatch extends WorkflowEntrypoint {
     }
     if (!isMockConnector) {
       await step.do("enqueue authorization email", async () => {
-        await pushToQueue$1(this.env.NOTIFICATIONS_QUEUE, {
+        await pushToQueue(this.env.NOTIFICATIONS_QUEUE, {
           type: "email",
           payload: {
             email: {
@@ -409,18 +445,6 @@ async function fetchBoundedByWindow({
   }
 }
 
-async function pushToQueue(queue, message) {
-  if (!Array.isArray(message)) {
-    await queue.send(message, { contentType: "v8" });
-    return;
-  }
-  await queue.sendBatch(
-    message.map((m) => ({
-      body: m,
-      contentType: "v8"
-    }))
-  );
-}
 class BankSyncAccountPayments extends WorkflowEntrypoint {
   async run(event, step) {
     const { accountId } = event.payload;
@@ -429,7 +453,6 @@ class BankSyncAccountPayments extends WorkflowEntrypoint {
     if (!accountId) {
       throw new NonRetryableError(`Haven't obtained accountId to load.`);
     }
-    const deadlineMs = computeWindowDeadline(event.instanceId, accountId);
     const workflowStartedAt = await step.do(
       "capture workflow start time",
       async () => Date.now()
@@ -453,19 +476,6 @@ class BankSyncAccountPayments extends WorkflowEntrypoint {
       if (!account.lastSyncAt) {
         throw new Error(`lastSyncedAt is not set for account: ${accountId}`);
       }
-      if (isSupersededBy(
-        event.instanceId,
-        account.lastSyncMetadata?.instanceId,
-        accountId
-      )) {
-        logger.info("sync.superseded", {
-          accountId,
-          instanceId: event.instanceId,
-          supersededBy: account.lastSyncMetadata?.instanceId,
-          iteration
-        });
-        return;
-      }
       const lastSyncAtMs = account.lastSyncAt.getTime();
       const windowMs = await step.do("resolve sync window", async () => {
         const window = resolveSyncWindow(
@@ -479,15 +489,6 @@ class BankSyncAccountPayments extends WorkflowEntrypoint {
           isCatchUp: window.isCatchUp
         };
       });
-      if (deadlineMs != null && windowMs.dateFromMs >= deadlineMs) {
-        logger.info("sync.window-elapsed", {
-          accountId,
-          instanceId: event.instanceId,
-          iteration,
-          deadline: new Date(deadlineMs).toISOString()
-        });
-        return;
-      }
       const syncWindow = {
         dateFrom: new Date(windowMs.dateFromMs),
         dateTo: new Date(windowMs.dateToMs),
@@ -703,10 +704,18 @@ class BankSyncAccountPayments extends WorkflowEntrypoint {
             seenInstanceId: account.lastSyncMetadata?.instanceId ?? null
           }).command;
           if (eventsToEmit.length) {
-            await pushToQueue(
+            const { oversized } = await pushToQueue(
               this.env.QUEUE_BUS_QUEUE,
               eventsToEmit
             );
+            for (const { message, bytes } of oversized) {
+              logger.error("queue.event-oversized", {
+                accountId,
+                bytes,
+                eventSignal: message.eventSignal,
+                bankRefId: message.bankPayment.bankRefId
+              });
+            }
           }
           let syncStateRows;
           if (createCommands.length) {

package/dist/service.d.cts

@@ -17,8 +17,6 @@ interface BankServiceVariables {
     DBUCS_TX_AUTH_URI: string;
     REDIRECT_URI: string;
     SYNC_WORKFLOW_RESET_AFTER_ITERATIONS: string;
-    CRON_SYNC_WORKFLOW_DISPATCH: string;
-    SYNC_DISPATCH_ACCOUNT_IDS: string;
     [key: string]: string | number | boolean;
 }
 declare const BANK_SERVICE_BINDINGS: {

package/dist/service.d.mts

@@ -17,8 +17,6 @@ interface BankServiceVariables {
     DBUCS_TX_AUTH_URI: string;
     REDIRECT_URI: string;
     SYNC_WORKFLOW_RESET_AFTER_ITERATIONS: string;
-    CRON_SYNC_WORKFLOW_DISPATCH: string;
-    SYNC_DISPATCH_ACCOUNT_IDS: string;
     [key: string]: string | number | boolean;
 }
 declare const BANK_SERVICE_BINDINGS: {

package/dist/service.d.ts

@@ -17,8 +17,6 @@ interface BankServiceVariables {
     DBUCS_TX_AUTH_URI: string;
     REDIRECT_URI: string;
     SYNC_WORKFLOW_RESET_AFTER_ITERATIONS: string;
-    CRON_SYNC_WORKFLOW_DISPATCH: string;
-    SYNC_DISPATCH_ACCOUNT_IDS: string;
     [key: string]: string | number | boolean;
 }
 declare const BANK_SERVICE_BINDINGS: {

package/dist/shared/{bank.D9DoIABz.mjs → bank.BWR4dqQ5.mjs}

@@ -7,53 +7,6 @@ import 'jose';
 import '@develit-io/general-codes';
 import { createHash } from 'node:crypto';
 
-const DISPATCH_RECOVERY_WINDOW_MS = 5 * 60 * 1e3;
-function parseInstanceWindow(instanceId, accountId) {
-  const prefix = `${accountId}-`;
-  if (!instanceId.startsWith(prefix)) return -1;
-  const suffix = instanceId.slice(prefix.length);
-  if (!/^\d+$/.test(suffix)) return -1;
-  return Number(suffix);
-}
-function buildDispatchInstanceId(accountId, nowMs, recoveryWindowMs = DISPATCH_RECOVERY_WINDOW_MS) {
-  return `${accountId}-${Math.floor(nowMs / recoveryWindowMs)}`;
-}
-function buildDispatchCreateOptions(instanceId, accountId) {
-  return {
-    id: instanceId,
-    params: { accountId },
-    // Dispatch mints ~24 instances per account per day and step outputs carry
-    // bank payloads — the default 30-day retention would pile up billable
-    // storage for state nobody reads after success.
-    retention: {
-      successRetention: "1 day",
-      errorRetention: "7 days"
-    }
-  };
-}
-function computeWindowDeadline(instanceId, accountId, recoveryWindowMs = DISPATCH_RECOVERY_WINDOW_MS) {
-  const window = parseInstanceWindow(instanceId, accountId);
-  if (window < 0) return null;
-  return (window + 1) * recoveryWindowMs;
-}
-function isAlreadyExists(err) {
-  return /already exists/i.test(extractMessage(err));
-}
-function isInstanceNotFound(err) {
-  return /instance.*not.?found|not.?found.*instance/i.test(extractMessage(err));
-}
-function extractMessage(err) {
-  return err instanceof Error ? err.message : typeof err === "object" && err !== null && "message" in err ? String(err.message) : "";
-}
-
-function resolveCurrentSyncInstanceId(accountId, recordedInstanceId) {
-  return recordedInstanceId ?? accountId;
-}
-function isSupersededBy(myInstanceId, recordedInstanceId, accountId) {
-  if (recordedInstanceId == null) return false;
-  return parseInstanceWindow(recordedInstanceId, accountId) > parseInstanceWindow(myInstanceId, accountId);
-}
-
 const createPaymentCommand = (db, { payment }) => {
   return {
     command: db.insert(tables.payment).values({
@@ -406,4 +359,4 @@ const initiateConnector = async ({
   }
 };
 
-export { DISPATCH_RECOVERY_WINDOW_MS as D, getPaymentRequestsByBatchIdQuery as a, getAccountByIdQuery as b, checksum as c, createCredentialsResolver as d, updatePaymentRequestStatusCommand as e, computeWindowDeadline as f, getBatchByIdQuery as g, isSupersededBy as h, initiateConnector as i, createPaymentCommand as j, isAlreadyExists as k, buildDispatchInstanceId as l, encrypt as m, buildDispatchCreateOptions as n, isInstanceNotFound as o, importAesKey as p, resolveCurrentSyncInstanceId as r, upsertBatchCommand as u };
+export { getPaymentRequestsByBatchIdQuery as a, getAccountByIdQuery as b, checksum as c, createCredentialsResolver as d, updatePaymentRequestStatusCommand as e, createPaymentCommand as f, getBatchByIdQuery as g, encrypt as h, initiateConnector as i, importAesKey as j, upsertBatchCommand as u };

package/dist/shared/{bank.DQZxSHKV.cjs → bank.CSmuzdUJ.cjs}

@@ -9,53 +9,6 @@ require('jose');
 require('@develit-io/general-codes');
 const node_crypto = require('node:crypto');
 
-const DISPATCH_RECOVERY_WINDOW_MS = 5 * 60 * 1e3;
-function parseInstanceWindow(instanceId, accountId) {
-  const prefix = `${accountId}-`;
-  if (!instanceId.startsWith(prefix)) return -1;
-  const suffix = instanceId.slice(prefix.length);
-  if (!/^\d+$/.test(suffix)) return -1;
-  return Number(suffix);
-}
-function buildDispatchInstanceId(accountId, nowMs, recoveryWindowMs = DISPATCH_RECOVERY_WINDOW_MS) {
-  return `${accountId}-${Math.floor(nowMs / recoveryWindowMs)}`;
-}
-function buildDispatchCreateOptions(instanceId, accountId) {
-  return {
-    id: instanceId,
-    params: { accountId },
-    // Dispatch mints ~24 instances per account per day and step outputs carry
-    // bank payloads — the default 30-day retention would pile up billable
-    // storage for state nobody reads after success.
-    retention: {
-      successRetention: "1 day",
-      errorRetention: "7 days"
-    }
-  };
-}
-function computeWindowDeadline(instanceId, accountId, recoveryWindowMs = DISPATCH_RECOVERY_WINDOW_MS) {
-  const window = parseInstanceWindow(instanceId, accountId);
-  if (window < 0) return null;
-  return (window + 1) * recoveryWindowMs;
-}
-function isAlreadyExists(err) {
-  return /already exists/i.test(extractMessage(err));
-}
-function isInstanceNotFound(err) {
-  return /instance.*not.?found|not.?found.*instance/i.test(extractMessage(err));
-}
-function extractMessage(err) {
-  return err instanceof Error ? err.message : typeof err === "object" && err !== null && "message" in err ? String(err.message) : "";
-}
-
-function resolveCurrentSyncInstanceId(accountId, recordedInstanceId) {
-  return recordedInstanceId ?? accountId;
-}
-function isSupersededBy(myInstanceId, recordedInstanceId, accountId) {
-  if (recordedInstanceId == null) return false;
-  return parseInstanceWindow(recordedInstanceId, accountId) > parseInstanceWindow(myInstanceId, accountId);
-}
-
 const createPaymentCommand = (db, { payment }) => {
   return {
     command: db.insert(paymentDirection.tables.payment).values({
@@ -408,11 +361,7 @@ const initiateConnector = async ({
   }
 };
 
-exports.DISPATCH_RECOVERY_WINDOW_MS = DISPATCH_RECOVERY_WINDOW_MS;
-exports.buildDispatchCreateOptions = buildDispatchCreateOptions;
-exports.buildDispatchInstanceId = buildDispatchInstanceId;
 exports.checksum = checksum;
-exports.computeWindowDeadline = computeWindowDeadline;
 exports.createCredentialsResolver = createCredentialsResolver;
 exports.createPaymentCommand = createPaymentCommand;
 exports.encrypt = encrypt;
@@ -421,9 +370,5 @@ exports.getBatchByIdQuery = getBatchByIdQuery;
 exports.getPaymentRequestsByBatchIdQuery = getPaymentRequestsByBatchIdQuery;
 exports.importAesKey = importAesKey;
 exports.initiateConnector = initiateConnector;
-exports.isAlreadyExists = isAlreadyExists;
-exports.isInstanceNotFound = isInstanceNotFound;
-exports.isSupersededBy = isSupersededBy;
-exports.resolveCurrentSyncInstanceId = resolveCurrentSyncInstanceId;
 exports.updatePaymentRequestStatusCommand = updatePaymentRequestStatusCommand;
 exports.upsertBatchCommand = upsertBatchCommand;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@develit-services/bank",
-  "version": "6.0.0",
+  "version": "6.1.1",
   "author": "Develit.io s.r.o.",
   "type": "module",
   "exports": {