@develit-services/bank 0.7.0 → 0.7.1

package/dist/export/worker.mjs

@@ -1,16 +1,16 @@
 import { uuidv4, first, bankAccountMetadataSchema, workflowInstanceStatusSchema, develitWorker, createInternalError, action, service } from '@develit-io/backend-sdk';
-import { t as tables, e as encrypt, i as importAesKey, b as getCredentialsByAccountId, u as upsertBatchCommand, g as getBatchByIdQuery, d as createPaymentCommand, a as getAccountByIdQuery } from '../shared/bank.pd7-Rbo-.mjs';
+import { t as tables, e as encrypt, i as importAesKey, b as getCredentialsByAccountId, u as upsertBatchCommand, g as getBatchByIdQuery, d as createPaymentCommand, a as getAccountByIdQuery } from '../shared/bank.e8T8fQDG.mjs';
 import { WorkerEntrypoint } from 'cloudflare:workers';
 import { drizzle } from 'drizzle-orm/d1';
 import { z } from 'zod';
-import { I as INSTRUCTION_PRIORITIES, C as CHARGE_BEARERS, e as PAYMENT_TYPES, a as CONNECTOR_KEYS, B as BATCH_STATUSES, d as PAYMENT_STATUSES, P as PAYMENT_DIRECTIONS, i as accountInsertSchema } from '../shared/bank.DLWegh_f.mjs';
+import { I as INSTRUCTION_PRIORITIES, C as CHARGE_BEARERS, e as PAYMENT_TYPES, a as CONNECTOR_KEYS, B as BATCH_STATUSES, d as PAYMENT_STATUSES, P as PAYMENT_DIRECTIONS, i as accountInsertSchema } from '../shared/bank.BnIYdBEF.mjs';
 import { CURRENCY_CODES } from '@develit-io/general-codes';
 import 'date-fns';
 import 'jose';
 import { eq, sql, inArray, and, asc, desc, gte, lte } from 'drizzle-orm';
 import 'node:crypto';
-import { i as initiateConnector, g as toIncomingPayment, d as assignAccount, t as toBatchedPayment } from '../shared/bank.Dq27-5wD.mjs';
-import '../shared/bank.DFIwAQqg.mjs';
+import { i as initiateConnector, g as toIncomingPayment, d as assignAccount, t as toBatchedPayment } from '../shared/bank.CkUMU1sJ.mjs';
+import '../shared/bank.CTtFAN03.mjs';
 import 'drizzle-orm/relations';
 import 'drizzle-orm/sqlite-core';
 import 'drizzle-zod';
@@ -222,11 +222,12 @@ const getBatchesQuery = async (db, {
   };
 };
 
-const getAccountOpenBatchesQuery = async (db, { accountId }) => {
+const getAccountOpenBatchesQuery = async (db, { accountId, paymentType }) => {
   return await db.select().from(tables.batch).where(
     and(
       eq(tables.batch.accountId, accountId),
-      eq(tables.batch.status, "OPEN")
+      eq(tables.batch.status, "OPEN"),
+      paymentType ? eq(tables.batch.paymentType, paymentType) : void 0
     )
   );
 };
@@ -483,7 +484,8 @@ let BankServiceBase = class extends develitWorker(WorkerEntrypoint) {
             iban: acc.iban,
             token: credentials.value,
             id: acc.id,
-            connectorKey: acc.connectorKey
+            connectorKey: acc.connectorKey,
+            bankRefId: acc.bankRefId
           };
         })
       );
@@ -725,6 +727,7 @@ let BankServiceBase = class extends develitWorker(WorkerEntrypoint) {
               id: uuidv4(),
               authorizationUrls: [],
               accountId: acc.id,
+              paymentType: singlePayment.paymentType,
               payments: [batchedPayment],
               status: "OPEN",
               metadata: {
@@ -734,40 +737,47 @@ let BankServiceBase = class extends develitWorker(WorkerEntrypoint) {
           });
           await command.execute();
           this.log({
-            message: `\u2728 Created single payment batch for account ${acc.id}`
+            message: `\u2728 Created single payment batch (${singlePayment.paymentType}) for account ${acc.id}`
           });
         }
         if (regularPayments.length > 0) {
-          const openBatches = await getAccountOpenBatchesQuery(this.db, {
-            accountId: acc.id
-          });
-          const availableBatch = openBatches.find(
-            (batch) => batch.payments.length < (batch.metadata?.sizeLimit ?? acc.batchSizeLimit)
+          const paymentsByType = Map.groupBy(
+            regularPayments,
+            (p) => p.paymentType
           );
-          this.log({
-            message: availableBatch ? `\u{1F504} Found existing OPEN batch for account ${acc.id}, merging ${availableBatch.payments.length} existing + ${regularPayments.length} new payments` : `\u2728 Creating new batch for account ${acc.id} with ${regularPayments.length} payments`
-          });
-          const batchedPayments = regularPayments.map(toBatchedPayment);
-          const { command } = upsertBatchCommand(this.db, {
-            batch: availableBatch ? {
-              ...availableBatch,
-              payments: [...availableBatch.payments, ...batchedPayments]
-            } : {
-              id: uuidv4(),
-              authorizationUrls: [],
+          for (const [paymentType, paymentsOfType] of paymentsByType) {
+            const openBatches = await getAccountOpenBatchesQuery(this.db, {
               accountId: acc.id,
-              payments: batchedPayments,
-              status: "OPEN",
-              metadata: {
-                sizeLimit: acc.batchSizeLimit
+              paymentType
+            });
+            const availableBatch = openBatches.find(
+              (batch) => batch.payments.length < (batch.metadata?.sizeLimit ?? acc.batchSizeLimit)
+            );
+            this.log({
+              message: availableBatch ? `\u{1F504} Found existing OPEN batch (${paymentType}) for account ${acc.id}, merging ${availableBatch.payments.length} existing + ${paymentsOfType.length} new payments` : `\u2728 Creating new batch (${paymentType}) for account ${acc.id} with ${paymentsOfType.length} payments`
+            });
+            const batchedPayments = paymentsOfType.map(toBatchedPayment);
+            const { command } = upsertBatchCommand(this.db, {
+              batch: availableBatch ? {
+                ...availableBatch,
+                payments: [...availableBatch.payments, ...batchedPayments]
+              } : {
+                id: uuidv4(),
+                authorizationUrls: [],
+                accountId: acc.id,
+                paymentType,
+                payments: batchedPayments,
+                status: "OPEN",
+                metadata: {
+                  sizeLimit: acc.batchSizeLimit
+                }
               }
-            }
-          });
-          const upsertedBatch = await command.execute();
-          this.log({
-            message: `\u2705 Batch upserted successfully for account ${acc.id}`
-          });
-          return upsertedBatch;
+            });
+            await command.execute();
+            this.log({
+              message: `\u2705 Batch (${paymentType}) upserted successfully for account ${acc.id}`
+            });
+          }
         }
       }
     });
@@ -877,7 +887,8 @@ let BankServiceBase = class extends develitWorker(WorkerEntrypoint) {
           });
         }
         const connector = await this._initiateBankConnector({
-          connectorKey: ottRow.refId
+          connectorKey: ottRow.refId,
+          skipAccounts: true
         });
         const { credentials, accounts } = await connector.authorizeAccount({
           urlParams

package/dist/export/workflows.cjs

@@ -1,15 +1,15 @@
 'use strict';
 
 const backendSdk = require('@develit-io/backend-sdk');
-const drizzle = require('../shared/bank.DEvSNsEs.cjs');
+const drizzle = require('../shared/bank.CTqIXnHg.cjs');
 const batchLifecycle = require('../shared/bank.Bg3Pdwm4.cjs');
-const mock_connector = require('../shared/bank.DNHA-HFP.cjs');
+const mock_connector = require('../shared/bank.iEgK7rge.cjs');
 const drizzleOrm = require('drizzle-orm');
 const cloudflare_workers = require('cloudflare:workers');
 const cloudflare_workflows = require('cloudflare:workflows');
 const d1 = require('drizzle-orm/d1');
-require('../shared/bank.c38V_FCq.cjs');
-require('../shared/bank.BeIpkWR-.cjs');
+require('../shared/bank.DlW1XNug.cjs');
+require('../shared/bank.D7kwLMqF.cjs');
 require('drizzle-orm/relations');
 require('drizzle-orm/sqlite-core');
 require('date-fns');
@@ -127,17 +127,32 @@ class BankProcessBatch extends cloudflare_workers.WorkflowEntrypoint {
             }
           ]
         });
-        const result = await connector.initiateBatch({
-          batchId: batch.id,
-          payments: batch.payments
-        });
+        const initiateBatchByType = () => {
+          const args = { batchId: batch.id, payments: batch.payments };
+          switch (batch.paymentType) {
+            case "SEPA":
+              return connector.initiateSEPABatch(args);
+            case "SWIFT":
+              return connector.initiateForeignBatch(args);
+            case "DOMESTIC":
+            default:
+              return connector.initiateDomesticBatch(args);
+          }
+        };
+        let result;
+        try {
+          result = await initiateBatchByType();
+        } catch (err) {
+          const message = err instanceof Error ? err.message : typeof err === "object" && err !== null && "message" in err ? String(err.message) : String(err);
+          throw new cloudflare_workflows.NonRetryableError(message);
+        }
         const {
           authorizationUrls,
           payments: preparedPayments,
           metadata
         } = result;
         if (!authorizationUrls || authorizationUrls.length === 0) {
-          throw new Error("Failed to retrieve authorization URLs");
+          throw new cloudflare_workflows.NonRetryableError("Failed to retrieve authorization URLs");
         }
         return {
           authorizationUrls,

package/dist/export/workflows.mjs

@@ -1,13 +1,13 @@
 import { first, uuidv4, asNonEmpty } from '@develit-io/backend-sdk';
-import { t as tables, g as getBatchByIdQuery, c as checksum, u as upsertBatchCommand, a as getAccountByIdQuery, i as importAesKey, b as getCredentialsByAccountId, d as createPaymentCommand } from '../shared/bank.pd7-Rbo-.mjs';
+import { t as tables, g as getBatchByIdQuery, c as checksum, u as upsertBatchCommand, a as getAccountByIdQuery, i as importAesKey, b as getCredentialsByAccountId, d as createPaymentCommand } from '../shared/bank.e8T8fQDG.mjs';
 import { f as isBatchSigned, a as isBatchFailed, c as isBatchOpen, g as isPaymentCompleted } from '../shared/bank.CbAwwIhZ.mjs';
-import { h as toPreparedPayment, i as initiateConnector, f as toCompletedPayment } from '../shared/bank.Dq27-5wD.mjs';
+import { h as toPreparedPayment, i as initiateConnector, f as toCompletedPayment } from '../shared/bank.CkUMU1sJ.mjs';
 import { eq } from 'drizzle-orm';
 import { WorkflowEntrypoint } from 'cloudflare:workers';
 import { NonRetryableError } from 'cloudflare:workflows';
 import { drizzle } from 'drizzle-orm/d1';
-import '../shared/bank.DFIwAQqg.mjs';
-import '../shared/bank.DLWegh_f.mjs';
+import '../shared/bank.CTtFAN03.mjs';
+import '../shared/bank.BnIYdBEF.mjs';
 import 'drizzle-orm/relations';
 import 'drizzle-orm/sqlite-core';
 import 'date-fns';
@@ -125,17 +125,32 @@ class BankProcessBatch extends WorkflowEntrypoint {
             }
           ]
         });
-        const result = await connector.initiateBatch({
-          batchId: batch.id,
-          payments: batch.payments
-        });
+        const initiateBatchByType = () => {
+          const args = { batchId: batch.id, payments: batch.payments };
+          switch (batch.paymentType) {
+            case "SEPA":
+              return connector.initiateSEPABatch(args);
+            case "SWIFT":
+              return connector.initiateForeignBatch(args);
+            case "DOMESTIC":
+            default:
+              return connector.initiateDomesticBatch(args);
+          }
+        };
+        let result;
+        try {
+          result = await initiateBatchByType();
+        } catch (err) {
+          const message = err instanceof Error ? err.message : typeof err === "object" && err !== null && "message" in err ? String(err.message) : String(err);
+          throw new NonRetryableError(message);
+        }
         const {
           authorizationUrls,
           payments: preparedPayments,
           metadata
         } = result;
         if (!authorizationUrls || authorizationUrls.length === 0) {
-          throw new Error("Failed to retrieve authorization URLs");
+          throw new NonRetryableError("Failed to retrieve authorization URLs");
         }
         return {
           authorizationUrls,

package/dist/export/wrangler.cjs

@@ -46,6 +46,13 @@ function defineBankServiceWrangler(config) {
         class_name: "BankProcessBatch"
       }
     ],
+    vpc_services: [
+      {
+        binding: "DBU_CBS_BACKOFFICE_DEV",
+        service_id: "019c2962-172c-75a2-a000-b76e246d25d7",
+        remote: true
+      }
+    ],
     queues: {
       producers: [
         {

package/dist/export/wrangler.d.cts

@@ -1,4 +1,4 @@
-import { B as BankServiceWranglerConfig } from '../shared/bank.Coi0lSqK.cjs';
+import { B as BankServiceWranglerConfig } from '../shared/bank.BC06Rbrx.cjs';
 
 declare function defineBankServiceWrangler(config: BankServiceWranglerConfig): {
     vars: {
@@ -13,6 +13,7 @@ declare function defineBankServiceWrangler(config: BankServiceWranglerConfig): {
         BANK_AUTH_RECIPIENT: string;
         DBUCS_BASE_URI: string;
         DBUCS_USERNAME: string;
+        DBUCS_TX_AUTH_URI: string;
         REDIRECT_URI: string;
     };
     services: {
@@ -37,6 +38,11 @@ declare function defineBankServiceWrangler(config: BankServiceWranglerConfig): {
         binding: string;
         class_name: string;
     }[];
+    vpc_services: {
+        binding: string;
+        service_id: string;
+        remote: boolean;
+    }[];
     queues: {
         producers: {
             binding: string;

package/dist/export/wrangler.d.mts

@@ -1,4 +1,4 @@
-import { B as BankServiceWranglerConfig } from '../shared/bank.Coi0lSqK.mjs';
+import { B as BankServiceWranglerConfig } from '../shared/bank.BC06Rbrx.mjs';
 
 declare function defineBankServiceWrangler(config: BankServiceWranglerConfig): {
     vars: {
@@ -13,6 +13,7 @@ declare function defineBankServiceWrangler(config: BankServiceWranglerConfig): {
         BANK_AUTH_RECIPIENT: string;
         DBUCS_BASE_URI: string;
         DBUCS_USERNAME: string;
+        DBUCS_TX_AUTH_URI: string;
         REDIRECT_URI: string;
     };
     services: {
@@ -37,6 +38,11 @@ declare function defineBankServiceWrangler(config: BankServiceWranglerConfig): {
         binding: string;
         class_name: string;
     }[];
+    vpc_services: {
+        binding: string;
+        service_id: string;
+        remote: boolean;
+    }[];
     queues: {
         producers: {
             binding: string;

package/dist/export/wrangler.d.ts

@@ -1,4 +1,4 @@
-import { B as BankServiceWranglerConfig } from '../shared/bank.Coi0lSqK.js';
+import { B as BankServiceWranglerConfig } from '../shared/bank.BC06Rbrx.js';
 
 declare function defineBankServiceWrangler(config: BankServiceWranglerConfig): {
     vars: {
@@ -13,6 +13,7 @@ declare function defineBankServiceWrangler(config: BankServiceWranglerConfig): {
         BANK_AUTH_RECIPIENT: string;
         DBUCS_BASE_URI: string;
         DBUCS_USERNAME: string;
+        DBUCS_TX_AUTH_URI: string;
         REDIRECT_URI: string;
     };
     services: {
@@ -37,6 +38,11 @@ declare function defineBankServiceWrangler(config: BankServiceWranglerConfig): {
         binding: string;
         class_name: string;
     }[];
+    vpc_services: {
+        binding: string;
+        service_id: string;
+        remote: boolean;
+    }[];
     queues: {
         producers: {
             binding: string;

package/dist/export/wrangler.mjs

@@ -44,6 +44,13 @@ function defineBankServiceWrangler(config) {
         class_name: "BankProcessBatch"
       }
     ],
+    vpc_services: [
+      {
+        binding: "DBU_CBS_BACKOFFICE_DEV",
+        service_id: "019c2962-172c-75a2-a000-b76e246d25d7",
+        remote: true
+      }
+    ],
     queues: {
       producers: [
         {

package/dist/shared/{bank.Coi0lSqK.d.cts → bank.BC06Rbrx.d.cts}

@@ -31,6 +31,7 @@ interface BankServiceEnvironmentConfig {
         BANK_AUTH_RECIPIENT: string;
         DBUCS_BASE_URI: string;
         DBUCS_USERNAME: string;
+        DBUCS_TX_AUTH_URI: string;
         REDIRECT_URI: string;
     };
 }

package/dist/shared/{bank.Coi0lSqK.d.mts → bank.BC06Rbrx.d.mts}

@@ -31,6 +31,7 @@ interface BankServiceEnvironmentConfig {
         BANK_AUTH_RECIPIENT: string;
         DBUCS_BASE_URI: string;
         DBUCS_USERNAME: string;
+        DBUCS_TX_AUTH_URI: string;
         REDIRECT_URI: string;
     };
 }

package/dist/shared/{bank.Coi0lSqK.d.ts → bank.BC06Rbrx.d.ts}

@@ -31,6 +31,7 @@ interface BankServiceEnvironmentConfig {
         BANK_AUTH_RECIPIENT: string;
         DBUCS_BASE_URI: string;
         DBUCS_USERNAME: string;
+        DBUCS_TX_AUTH_URI: string;
         REDIRECT_URI: string;
     };
 }

package/dist/shared/{bank.DLWegh_f.mjs → bank.BnIYdBEF.mjs}

@@ -122,6 +122,9 @@ const batch = sqliteTable("batch", {
   statusResponse: text("status_response", { mode: "json" }).$type(),
   payments: text("payments", { mode: "json" }).$type().notNull(),
   metadata: text("metadata", { mode: "json" }).$type(),
+  paymentType: text("payment_type", {
+    enum: PAYMENT_TYPES
+  }).$type(),
   paymentsChecksum: text("payments_checksum")
 });
 
@@ -151,6 +154,12 @@ const payment = sqliteTable(
     ss: text("ss"),
     ks: text("ks"),
     message: text("message"),
+    chargeBearer: text("charge_bearer", {
+      enum: CHARGE_BEARERS
+    }).$type(),
+    instructionPriority: text("instruction_priority", {
+      enum: INSTRUCTION_PRIORITIES
+    }).$type(),
     processedAt: integer("processed_at", {
       mode: "timestamp_ms"
     }),