@raevon/n8n-nodes-whatsapp 1.0.5 → 1.0.7

package/dist/nodes/WhatsApp/WhatsAppApiHelper.d.ts

@@ -22,6 +22,11 @@ interface AntiBanConfig {
 }
 export declare function getWhatsAppCredentials(credentials: Record<string, any>): Promise<WhatsAppCredentials>;
 export declare function ensureConnected(cfg: WhatsAppCredentials): Promise<WASocket>;
+export declare function connectOrGetQr(cfg: WhatsAppCredentials): Promise<{
+    connected: boolean;
+    qrUrl?: string;
+    message: string;
+}>;
 export declare function simulateTyping(jid: string, content: {
     text?: string;
     caption?: string;

package/dist/nodes/WhatsApp/WhatsAppApiHelper.js

@@ -38,6 +38,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getWhatsAppCredentials = getWhatsAppCredentials;
 exports.ensureConnected = ensureConnected;
+exports.connectOrGetQr = connectOrGetQr;
 exports.simulateTyping = simulateTyping;
 exports.sendMessageWithAntiBan = sendMessageWithAntiBan;
 exports.getConnectionStatus = getConnectionStatus;
@@ -47,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
@@ -155,7 +157,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
@@ -163,10 +165,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;
             }
         }
@@ -230,26 +232,26 @@ async function ensureConnected(cfg) {
     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 scan
+    // If no session, wait for QR with a reasonable timeout
     if (!hasSession) {
         const qrData = await new Promise((resolve) => {
             qrResolve = resolve;
-            // Timeout after 2 minutes — QR codes expire quickly
+            // 90 second timeout — QR codes expire quickly, user needs to act fast
             setTimeout(() => {
                 if (qrResolve) {
                     qrResolve(null);
                     qrResolve = null;
                 }
-            }, 120000);
+            }, 90000);
         });
         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
+        // Wait for connection to open after scan (30s timeout)
         await new Promise((resolve, reject) => {
-            const timeout = setTimeout(() => reject(new Error('Connection timeout after QR scan')), 60000);
+            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);
@@ -266,6 +268,67 @@ async function ensureConnected(cfg) {
     }
     return sock;
 }
+// Non-blocking version for Connect node — starts socket, returns QR URL if needed, doesn't wait
+async function connectOrGetQr(cfg) {
+    if (socketStatus === 'connected' && socketInstance) {
+        return { connected: true, message: 'Already connected' };
+    }
+    const antiBanCfg = {
+        messageDelayMinMs: cfg.messageDelayMinMs,
+        messageDelayMaxMs: cfg.messageDelayMaxMs,
+        burstSize: cfg.burstSize,
+        burstPauseMinMs: cfg.burstPauseMinMs,
+        burstPauseMaxMs: cfg.burstPauseMaxMs,
+        typingSimulation: cfg.typingSimulation,
+        dailySendLimit: cfg.dailySendLimit,
+        checkRecipientExists: cfg.checkRecipientExists,
+    };
+    socketConfig = antiBanCfg;
+    sessionPath = cfg.sessionPath;
+    if (!queue) {
+        queue = new p_queue_1.default({ concurrency: 1 });
+    }
+    const resolvedPath = expandHome(cfg.sessionPath);
+    const hasSession = node_fs_1.default.existsSync(resolvedPath) && node_fs_1.default.readdirSync(resolvedPath).length > 0;
+    // If session exists, just connect (no QR needed)
+    if (hasSession) {
+        await initSocket(antiBanCfg, cfg.sessionPath);
+        // Wait up to 15s for connection
+        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') {
+            return { connected: true, message: 'Connected successfully' };
+        }
+        return { connected: false, message: `Connection status: ${socketStatus}. Check n8n logs for details.` };
+    }
+    // No session — start socket and wait for QR (up to 30s)
+    const sock = await initSocket(antiBanCfg, cfg.sessionPath);
+    const qrData = await new Promise((resolve) => {
+        qrResolve = resolve;
+        setTimeout(() => {
+            if (qrResolve) {
+                qrResolve(null);
+                qrResolve = null;
+            }
+        }, 30000);
+    });
+    if (!qrData) {
+        return { connected: false, message: 'QR code not generated yet. Try again in a moment.' };
+    }
+    // Return QR URL immediately — user opens it in browser, scans, then runs Connect again
+    return {
+        connected: false,
+        qrUrl: qrData.qrUrl,
+        message: `Open this URL in your browser to scan QR:\n${qrData.qrUrl}\n\nAfter scanning, run this node again to complete connection.`,
+    };
+}
 async function simulateTyping(jid, content, cfg) {
     if (!cfg.typingSimulation || !socketInstance)
         return;

package/dist/nodes/WhatsApp/WhatsAppConnect.node.js

@@ -41,17 +41,11 @@ class WhatsAppConnect {
         for (let i = 0; i < items.length; i++) {
             try {
                 if (operation === 'connect') {
-                    // Connect to WhatsApp — this triggers QR flow on first run
-                    const sock = await (0, WhatsAppApiHelper_1.ensureConnected)(cfg);
-                    const status = (0, WhatsAppApiHelper_1.getConnectionStatus)();
+                    // Non-blocking: returns QR URL immediately if needed, doesn't wait for scan
+                    const result = await (0, WhatsAppApiHelper_1.connectOrGetQr)(cfg);
                     returnData.push({
                         json: {
-                            success: true,
-                            status: status.status,
-                            connected: status.connected,
-                            message: status.connected
-                                ? 'WhatsApp connected successfully. You can now use Send and Trigger nodes.'
-                                : 'Waiting for QR scan...',
+                            ...result,
                             sessionPath: cfg.sessionPath,
                         },
                         pairedItem: { item: i },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@raevon/n8n-nodes-whatsapp",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "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",