@raevon/n8n-nodes-whatsapp 1.0.10 → 1.0.12

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

@@ -58,6 +58,7 @@ export declare function getConnectionStatus(): {
     queueSize: number;
     sentToday: number;
     dailyLimit: number;
+    lastError: string | null;
 };
 export declare function parseIncomingMessage(msg: any): Record<string, any> | null;
 export {};

package/dist/nodes/WhatsApp/WhatsAppApiHelper.js

@@ -88,6 +88,8 @@ let reconnectTimer = null;
 let qrResolve = null;
 let latestQr = null;
 let generation = 0; // #10: Generation counter — prevents stale handlers on reconnect
+let credsSavedPromise = null; // Track credential save completion
+let lastDisconnectError = null; // Track last disconnect reason for output
 function todayStartIso() {
     return new Date().toISOString().slice(0, 10) + 'T00:00:00.000Z';
 }
@@ -161,12 +163,13 @@ async function initSocket(cfg, authPath) {
     sock.ev.on('creds.update', () => {
         if (gen !== generation)
             return; // #10: Ignore stale connection events
-        saveCreds().catch((err) => {
+        // Track credential save completion — ensures session is persisted before execution ends
+        credsSavedPromise = saveCreds().catch((err) => {
             console.error('[WhatsApp] Failed to save credentials:', err.message);
         });
     });
     sock.ev.on('connection.update', async (update) => {
-        var _a, _b;
+        var _a, _b, _c;
         if (gen !== generation)
             return; // #10: Ignore stale connection events
         const { connection, lastDisconnect, qr } = update;
@@ -184,22 +187,27 @@ async function initSocket(cfg, authPath) {
             socketStatus = 'connected';
             reconnectAttempts = 0;
             latestQr = null;
-            console.log('[WhatsApp] Connected successfully');
+            lastDisconnectError = null;
             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 errorMsg = ((_c = lastDisconnect === null || lastDisconnect === void 0 ? void 0 : lastDisconnect.error) === null || _c === void 0 ? void 0 : _c.message) || 'Unknown error';
             const reason = baileys_1.DisconnectReason[code] || 'Unknown';
-            console.log(`[WhatsApp] Connection closed: ${reason} (code: ${code})`);
+            // Store error for output in nodes
+            lastDisconnectError = `Code: ${code} (${reason}), Error: ${errorMsg}`;
             if (code === baileys_1.DisconnectReason.loggedOut) {
                 socketStatus = 'logged_out';
                 socketInstance = null;
-                ++generation; // #10: Invalidate all handlers from this session
+                ++generation;
             }
             else {
                 socketStatus = 'disconnected';
                 socketInstance = null;
-                scheduleReconnect(cfg);
+                // Don't auto-reconnect if we're in a loop — let the node handle it
+                if (reconnectAttempts < 3) {
+                    scheduleReconnect(cfg);
+                }
             }
         }
     });
@@ -241,27 +249,26 @@ async function ensureConnected(cfg) {
     // 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;
-    console.log(`[WhatsApp] Session path: ${resolvedPath}, exists: ${hasSession}`);
     if (!hasSession) {
         throw new n8n_workflow_1.NodeApiError({}, {
             message: 'No WhatsApp session found. Run the WhatsApp Connect node first to scan QR code.',
         });
     }
-    // Check if current socket is actually alive
-    console.log(`[WhatsApp] Current status: ${socketStatus}, socket exists: ${!!socketInstance}`);
+    // Check if current socket is alive — reuse if possible
     if (socketInstance && socketStatus === 'connected') {
         try {
-            if (socketInstance.user) {
-                console.log('[WhatsApp] Reusing existing connection');
-                return socketInstance;
-            }
+            // Test if socket is actually responding
+            await socketInstance.query({ tag: 'iq', attrs: { id: 'ping', to: 's.whatsapp.net', type: 'get', xmlns: 'w:p' } });
+            return socketInstance;
         }
         catch {
-            console.log('[WhatsApp] Existing socket is dead, reconnecting...');
+            // Socket is dead, create new one
+            socketInstance = null;
+            socketStatus = 'stopped';
         }
     }
-    // Session exists — connect using saved credentials
-    console.log('[WhatsApp] Connecting from saved session...');
+    // Create fresh connection from saved session
+    console.log('[WhatsApp] Creating fresh connection from saved session...');
     const sock = await initSocket(antiBanCfg, cfg.sessionPath);
     // Wait for connection to open (up to 20s)
     const connected = await new Promise((resolve) => {
@@ -282,6 +289,11 @@ async function ensureConnected(cfg) {
             message: `WhatsApp connection failed (status: ${socketStatus}). Try running Connect node again.`,
         });
     }
+    // Wait for credentials to be saved
+    if (credsSavedPromise) {
+        await credsSavedPromise;
+        credsSavedPromise = null;
+    }
     return sock;
 }
 // Non-blocking version for Connect node — starts socket, returns QR URL if needed, doesn't wait
@@ -319,6 +331,11 @@ async function connectOrGetQr(cfg) {
             }, 500);
             setTimeout(() => { clearInterval(check); resolve(); }, 15000);
         });
+        // Wait for credentials to be fully saved to disk before returning
+        if (credsSavedPromise) {
+            await credsSavedPromise;
+            credsSavedPromise = null;
+        }
         if (socketStatus === 'connected') {
             return { connected: true, message: 'Connected successfully' };
         }
@@ -465,6 +482,7 @@ function getConnectionStatus() {
         queueSize: queue ? queue.size + queue.pending : 0,
         sentToday: sentTodayCount,
         dailyLimit: (_a = socketConfig === null || socketConfig === void 0 ? void 0 : socketConfig.dailySendLimit) !== null && _a !== void 0 ? _a : 0,
+        lastError: lastDisconnectError,
     };
 }
 function parseIncomingMessage(msg) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@raevon/n8n-nodes-whatsapp",
-  "version": "1.0.10",
+  "version": "1.0.12",
   "description": "n8n community node for WhatsApp — send and receive messages with anti-ban protection via the Baileys library",
   "keywords": [
     "n8n-community-node-package",