elpaypg 2.0.7 → 2.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "elpaypg",
-  "version": "2.0.7",
+  "version": "2.1.0",
   "description": "ELPAY PG - single-backend payment gateway module",
   "type": "module",
   "main": "./src/index.js",
@@ -14,6 +14,8 @@
     ".env.example"
   ],
   "dependencies": {
+    "@berrysdk/core": "^0.1.10",
+    "berryprotocol": "^0.1.10",
     "express": "^4.19.0",
     "qrcode": "^1.5.4"
   },

package/public/views/checkout.html

@@ -981,9 +981,6 @@
       const vBlocked = document.getElementById('viewBlockedContent'); if (vBlocked) vBlocked.hidden = true;
       const vDup = document.getElementById('viewDuplicateSessionContent'); if (vDup) vDup.hidden = true;
     }
-      const vDup = document.getElementById('viewDuplicateSessionContent');
-      if (vDup) vDup.hidden = true;
-    }
 
     function formatTime(totalSec) {
       const m = Math.floor(totalSec / 60);

package/src/index.js

@@ -25,6 +25,7 @@ import {
   PaymentVerificationPipeline
 } from './vendor/core/index.js';
 import { createRouter } from './router.js';
+import { getWhatsAppBerryService, WhatsAppBerryService } from './services/whatsapp-berry.service.js';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
@@ -110,10 +111,22 @@ export async function elpay(options = {}) {
     server: null, eventEmitter
   });
 
+  const whatsappDataDir = options.whatsappDataDir || path.resolve(process.cwd(), 'data', 'whatsapp');
+  const whatsappEnabled = options.whatsapp !== false;
+  const whatsappBerryService = !whatsappEnabled
+    ? null
+    : (options.whatsappBerryService || getWhatsAppBerryService({
+        sessionId: options.whatsappSessionId || 'elpay_berry_session',
+        sessionPath: path.join(whatsappDataDir, 'auth'),
+        databasePath: path.join(whatsappDataDir, 'store.db'),
+        metaFile: path.join(whatsappDataDir, 'session.json')
+      }));
+
   const ctx = {
     db, merchantRepo, accountRepo, customerRepo, customerSessionRepo, sessionRepo, deviceRepo,
     obsRepo, ticketRepo, auditRepo, queueEngine, timingEngine, attributionEngine, pipeline,
     recoveryEngine, eventEmitter, defaultMerchant, checkoutBaseUrl, webhookEngine,
+    whatsappBerryService,
     baseUrl: options.baseUrl || process.env.BASE_URL || 'http://localhost:5000',
     otpCooldownMs: options.otpCooldownMs,
     theme: options.theme || {}
@@ -124,12 +137,20 @@ export async function elpay(options = {}) {
   const destroy = () => {
     timingEngine.destroy?.();
     attributionEngine.destroy?.();
+    if (whatsappBerryService && typeof whatsappBerryService.disconnect === 'function') {
+      whatsappBerryService.disconnect({ cleanSession: false }).catch(() => {});
+    }
   };
 
   return {
     router,
+    whatsappBerryService,
     on: (event, cb) => eventEmitter.on(event, cb),
-    init: async () => {},
+    init: async () => {
+      if (whatsappBerryService && typeof whatsappBerryService.initialize === 'function') {
+        whatsappBerryService.initialize().catch(() => {});
+      }
+    },
     destroy,
   };
 }

package/src/services/whatsapp-berry.service.js

@@ -16,11 +16,8 @@ async function loadDependencies() {
     const candidates = [
       'berryprotocol',
       pathToFileURL(path.resolve(rootDir, 'node_modules/berryprotocol/dist/index.js')).href,
-      pathToFileURL(path.resolve(rootDir, 'apps/payment-api/node_modules/berryprotocol/dist/index.js')).href,
-      'file:///D:/WA-USERAUTH DEV/node_modules/berryprotocol/dist/index.js',
-      'file:///D:/E-Commerce PKG/services/whatsapp-worker/node_modules/berryprotocol/dist/index.js',
-      'file:///D:/ECOM AND ELPAY PG INTEGRATION/E-Commerce PACKAGE/services/whatsapp-worker/node_modules/berryprotocol/dist/index.js',
-      'file:///D:/distribution/services/whatsapp-worker/node_modules/berryprotocol/dist/index.js'
+      pathToFileURL(path.resolve(process.cwd(), 'node_modules/berryprotocol/dist/index.js')).href,
+      pathToFileURL(path.resolve(process.cwd(), 'node_modules/elpaypg/node_modules/berryprotocol/dist/index.js')).href
     ];
     for (const p of candidates) {
       try {
@@ -37,11 +34,7 @@ async function loadDependencies() {
     const qrCandidates = [
       'qrcode',
       pathToFileURL(path.resolve(rootDir, 'node_modules/qrcode/lib/index.js')).href,
-      pathToFileURL(path.resolve(rootDir, 'apps/payment-api/node_modules/qrcode/lib/index.js')).href,
-      'file:///D:/WA-USERAUTH DEV/node_modules/qrcode/lib/index.js',
-      'file:///D:/E-Commerce PKG/services/whatsapp-worker/node_modules/qrcode/lib/index.js',
-      'file:///D:/ECOM AND ELPAY PG INTEGRATION/E-Commerce PACKAGE/services/whatsapp-worker/node_modules/qrcode/lib/index.js',
-      'file:///D:/distribution/services/whatsapp-worker/node_modules/qrcode/lib/index.js'
+      pathToFileURL(path.resolve(process.cwd(), 'node_modules/qrcode/lib/index.js')).href
     ];
     for (const p of qrCandidates) {
       try {