@raevon/n8n-nodes-whatsapp 1.0.7 → 1.0.9

package/dist/nodes/WhatsApp/WhatsAppApiHelper.js

@@ -123,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)) {
@@ -176,16 +184,20 @@ async function initSocket(cfg, authPath) {
             socketStatus = 'connected';
             reconnectAttempts = 0;
             latestQr = null;
+            console.log('[WhatsApp] Connected successfully');
             return;
         }
         if (connection === 'close') {
             const code = (_b = (_a = lastDisconnect === null || lastDisconnect === void 0 ? void 0 : lastDisconnect.error) === null || _a === void 0 ? void 0 : _a.output) === null || _b === void 0 ? void 0 : _b.statusCode;
+            const reason = baileys_1.DisconnectReason[code] || 'Unknown';
+            console.log(`[WhatsApp] Connection closed: ${reason} (code: ${code})`);
             if (code === baileys_1.DisconnectReason.loggedOut) {
                 socketStatus = 'logged_out';
                 socketInstance = null;
                 ++generation; // #10: Invalidate all handlers from this session
             }
             else {
+                socketStatus = 'disconnected';
                 socketInstance = null;
                 scheduleReconnect(cfg);
             }
@@ -210,8 +222,6 @@ async function getWhatsAppCredentials(credentials) {
     };
 }
 async function ensureConnected(cfg) {
-    if (socketStatus === 'connected' && socketInstance)
-        return socketInstance;
     const antiBanCfg = {
         messageDelayMinMs: cfg.messageDelayMinMs,
         messageDelayMaxMs: cfg.messageDelayMaxMs,
@@ -228,42 +238,46 @@ async function ensureConnected(cfg) {
     if (!queue) {
         queue = new p_queue_1.default({ concurrency: 1 });
     }
-    // Check if session already exists
+    // Check if session 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.',
-            });
+    }
+    // Check if current socket is actually alive
+    if (socketInstance && socketStatus === 'connected') {
+        try {
+            if (socketInstance.user) {
+                console.log('[WhatsApp] Reusing existing connection');
+                return socketInstance;
+            }
         }
-        // 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);
+        catch {
+            console.log('[WhatsApp] Existing socket is dead, reconnecting...');
+        }
+    }
+    // Session exists — connect using saved credentials
+    console.log('[WhatsApp] Connecting from saved session...');
+    const sock = await initSocket(antiBanCfg, cfg.sessionPath);
+    // Wait for connection to open (up to 20s)
+    const connected = await new Promise((resolve) => {
+        const check = setInterval(() => {
+            if (socketStatus === 'connected') {
+                clearInterval(check);
+                resolve(true);
+            }
+            if (socketStatus === 'logged_out' || socketStatus === 'error') {
+                clearInterval(check);
+                resolve(false);
+            }
+        }, 500);
+        setTimeout(() => { clearInterval(check); resolve(false); }, 20000);
+    });
+    if (!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.7",
+  "version": "1.0.9",
   "description": "n8n community node for WhatsApp — send and receive messages with anti-ban protection via the Baileys library",
   "keywords": [
     "n8n-community-node-package",