@raevon/n8n-nodes-whatsapp 1.0.6 → 1.0.8

package/dist/nodes/WhatsApp/WhatsAppApiHelper.js

@@ -48,6 +48,7 @@ const baileys_1 = __importStar(require("@whiskeysockets/baileys"));
 const p_queue_1 = __importDefault(require("p-queue"));
 const node_path_1 = __importDefault(require("node:path"));
 const node_fs_1 = __importDefault(require("node:fs"));
+const qrcode_1 = __importDefault(require("qrcode"));
 const sleep = (ms) => new Promise(resolve => setTimeout(resolve, ms));
 const randBetween = (min, max) => max > min ? min + Math.floor(Math.random() * (max - min + 1)) : min;
 // Silent logger — Baileys expects pino-compatible logger with these methods
@@ -122,8 +123,16 @@ async function scheduleReconnect(cfg) {
     }, delay);
 }
 async function initSocket(cfg, authPath) {
-    if (socketInstance && socketStatus === 'connected')
-        return socketInstance;
+    // Always create fresh socket if current one is dead
+    if (socketInstance && socketStatus === 'connected') {
+        try {
+            if (socketInstance.user)
+                return socketInstance;
+        }
+        catch {
+            // Socket dead, create new one
+        }
+    }
     const gen = ++generation; // #10: Snapshot generation for this connection attempt
     const resolvedPath = expandHome(authPath);
     if (!node_fs_1.default.existsSync(resolvedPath)) {
@@ -156,7 +165,7 @@ async function initSocket(cfg, authPath) {
             console.error('[WhatsApp] Failed to save credentials:', err.message);
         });
     });
-    sock.ev.on('connection.update', (update) => {
+    sock.ev.on('connection.update', async (update) => {
         var _a, _b;
         if (gen !== generation)
             return; // #10: Ignore stale connection events
@@ -164,10 +173,10 @@ async function initSocket(cfg, authPath) {
         if (qr) {
             latestQr = qr;
             socketStatus = 'qr_ready';
-            // Output quickchart URL — works from anywhere, no localhost needed
+            // Generate QR locally using qrcode package — no external service
             if (qrResolve) {
-                const qrUrl = `https://quickchart.io/qr?text=${encodeURIComponent(qr)}&size=300`;
-                qrResolve({ qr, qrUrl });
+                const qrDataUrl = await qrcode_1.default.toDataURL(qr, { width: 300, margin: 2 });
+                qrResolve({ qr, qrUrl: qrDataUrl });
                 qrResolve = null;
             }
         }
@@ -209,8 +218,17 @@ async function getWhatsAppCredentials(credentials) {
     };
 }
 async function ensureConnected(cfg) {
-    if (socketStatus === 'connected' && socketInstance)
-        return socketInstance;
+    // Always try to use existing socket first, but verify it's actually alive
+    if (socketInstance && socketStatus === 'connected') {
+        try {
+            // Quick check — if socket user is set, it's alive
+            if (socketInstance.user)
+                return socketInstance;
+        }
+        catch {
+            // Socket is dead, reconnect below
+        }
+    }
     const antiBanCfg = {
         messageDelayMinMs: cfg.messageDelayMinMs,
         messageDelayMaxMs: cfg.messageDelayMaxMs,
@@ -227,42 +245,29 @@ async function ensureConnected(cfg) {
     if (!queue) {
         queue = new p_queue_1.default({ concurrency: 1 });
     }
-    // Check if session already exists
+    // Check if session already exists on disk
     const resolvedPath = expandHome(cfg.sessionPath);
     const hasSession = node_fs_1.default.existsSync(resolvedPath) && node_fs_1.default.readdirSync(resolvedPath).length > 0;
-    const sock = await initSocket(antiBanCfg, cfg.sessionPath);
-    // If no session, wait for QR with a reasonable timeout
     if (!hasSession) {
-        const qrData = await new Promise((resolve) => {
-            qrResolve = resolve;
-            // 90 second timeout — QR codes expire quickly, user needs to act fast
-            setTimeout(() => {
-                if (qrResolve) {
-                    qrResolve(null);
-                    qrResolve = null;
-                }
-            }, 90000);
+        throw new n8n_workflow_1.NodeApiError({}, {
+            message: 'No WhatsApp session found. Run the WhatsApp Connect node first to scan QR code.',
         });
-        if (!qrData) {
-            throw new n8n_workflow_1.NodeApiError({}, {
-                message: 'QR code expired. Run the Connect node again to get a new QR code.',
-            });
-        }
-        // Wait for connection to open after scan (30s timeout)
-        await new Promise((resolve, reject) => {
-            const timeout = setTimeout(() => reject(new Error('Connection timeout — QR was scanned but connection did not open in time')), 30000);
-            const checkInterval = setInterval(() => {
-                if (socketStatus === 'connected') {
-                    clearTimeout(timeout);
-                    clearInterval(checkInterval);
-                    resolve();
-                }
-                if (socketStatus === 'logged_out' || socketStatus === 'error') {
-                    clearTimeout(timeout);
-                    clearInterval(checkInterval);
-                    reject(new Error('Connection failed after QR scan'));
-                }
-            }, 1000);
+    }
+    // Session exists — connect using saved credentials (no QR needed)
+    const sock = await initSocket(antiBanCfg, cfg.sessionPath);
+    // Wait for connection to open (up to 15s)
+    await new Promise((resolve) => {
+        const check = setInterval(() => {
+            if (socketStatus === 'connected' || socketStatus === 'error' || socketStatus === 'logged_out') {
+                clearInterval(check);
+                resolve();
+            }
+        }, 500);
+        setTimeout(() => { clearInterval(check); resolve(); }, 15000);
+    });
+    if (socketStatus !== 'connected') {
+        throw new n8n_workflow_1.NodeApiError({}, {
+            message: `WhatsApp connection failed (status: ${socketStatus}). Try running Connect node again.`,
         });
     }
     return sock;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@raevon/n8n-nodes-whatsapp",
-  "version": "1.0.6",
+  "version": "1.0.8",
   "description": "n8n community node for WhatsApp — send and receive messages with anti-ban protection via the Baileys library",
   "keywords": [
     "n8n-community-node-package",
@@ -36,10 +36,12 @@
   },
   "dependencies": {
     "@whiskeysockets/baileys": "^7.0.0-rc13",
-    "p-queue": "^8.0.1"
+    "p-queue": "^8.0.1",
+    "qrcode": "^1.5.4"
   },
   "devDependencies": {
     "@types/node": "^20.19.39",
+    "@types/qrcode": "^1.5.6",
     "@typescript-eslint/eslint-plugin": "^6.21.0",
     "@typescript-eslint/parser": "^6.21.0",
     "eslint": "^8.57.1",