fluxy-bot 0.13.4 → 0.13.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fluxy-bot",
-  "version": "0.13.4",
+  "version": "0.13.5",
   "releaseNotes": [
     "1. react router implemented",
     "2. new workspace design",

package/supervisor/channels/whatsapp-channel.ts

@@ -4,8 +4,7 @@
  * Session persisted in ~/.fluxy/whatsapp-session/.
  *
  * Baileys is imported dynamically so the supervisor starts even if
- * @whiskeysockets/baileys is not installed. Install it with:
- *   npm install @whiskeysockets/baileys
+ * @whiskeysockets/baileys is not installed.
  */
 
 import path from 'path';
@@ -14,13 +13,17 @@ import { log } from '../../shared/logger.js';
 import type { Channel, ChannelRouter, OutgoingMessage } from './types.js';
 
 const SESSION_DIR = path.join(DATA_DIR, 'whatsapp-session');
+const MAX_RECONNECT_ATTEMPTS = 5;
+const RECONNECT_BASE_DELAY = 5_000; // 5s, doubles each retry
 
 export class WhatsAppChannel implements Channel {
   readonly type = 'whatsapp' as const;
   private sock: any = null;
   private router: ChannelRouter | null = null;
   private onQR?: (qr: string) => void;
-  private reconnecting = false;
+  private reconnectAttempts = 0;
+  private reconnectTimer: ReturnType<typeof setTimeout> | null = null;
+  private shuttingDown = false;
 
   constructor(onQR?: (qr: string) => void) {
     this.onQR = onQR;
@@ -28,11 +31,18 @@ export class WhatsAppChannel implements Channel {
 
   async initialize(router: ChannelRouter): Promise<void> {
     this.router = router;
-    await this.connect();
+    try {
+      await this.connect();
+    } catch (err: any) {
+      // Don't let baileys crash the supervisor — log and move on
+      log.warn(`[whatsapp] Initial connection failed: ${err.message}`);
+      log.warn('[whatsapp] WhatsApp will remain inactive. Restart Fluxy after scanning QR to retry.');
+    }
   }
 
   private async connect(): Promise<void> {
-    // Dynamic import — fails gracefully if baileys is not installed
+    if (this.shuttingDown) return;
+
     const baileys = await import('@whiskeysockets/baileys');
     const makeWASocket = baileys.default;
     const { useMultiFileAuthState, DisconnectReason } = baileys;
@@ -41,7 +51,7 @@ export class WhatsAppChannel implements Channel {
 
     this.sock = makeWASocket({
       auth: state,
-      printQRInTerminal: true,
+      // printQRInTerminal is deprecated in baileys v7 — we handle QR via connection.update
     });
 
     this.sock.ev.on('creds.update', saveCreds);
@@ -49,31 +59,46 @@ export class WhatsAppChannel implements Channel {
     this.sock.ev.on('connection.update', (update: any) => {
       const { connection, lastDisconnect, qr } = update;
 
-      if (qr && this.onQR) {
-        this.onQR(qr);
+      // Handle QR code — surface it to chat UI
+      if (qr) {
+        log.info('[whatsapp] QR code received — scan with your phone to link');
+        if (this.onQR) this.onQR(qr);
       }
 
       if (connection === 'close') {
         const statusCode = (lastDisconnect?.error as any)?.output?.statusCode;
-        const shouldReconnect = statusCode !== DisconnectReason.loggedOut;
-
-        log.warn(`[whatsapp] Connection closed: ${statusCode}. Reconnect: ${shouldReconnect}`);
-
-        if (shouldReconnect && !this.reconnecting) {
-          this.reconnecting = true;
-          setTimeout(() => {
-            this.reconnecting = false;
-            this.connect().catch((err) => {
-              log.warn(`[whatsapp] Reconnect failed: ${err.message}`);
-            });
-          }, 5000);
-        } else if (!shouldReconnect) {
-          log.warn('[whatsapp] Logged out — scan QR again to reconnect');
+        const isLoggedOut = statusCode === DisconnectReason.loggedOut;
+
+        if (isLoggedOut) {
+          log.warn('[whatsapp] Logged out. Scan QR again to reconnect.');
+          this.sock = null;
+          return;
         }
+
+        this.reconnectAttempts++;
+
+        if (this.reconnectAttempts > MAX_RECONNECT_ATTEMPTS) {
+          log.warn(`[whatsapp] Max reconnect attempts (${MAX_RECONNECT_ATTEMPTS}) reached. Giving up.`);
+          log.warn('[whatsapp] WhatsApp will remain inactive. Restart Fluxy to retry.');
+          this.sock = null;
+          return;
+        }
+
+        // Exponential backoff: 5s, 10s, 20s, 40s, 80s
+        const delay = RECONNECT_BASE_DELAY * Math.pow(2, this.reconnectAttempts - 1);
+        log.warn(`[whatsapp] Connection closed (${statusCode}). Reconnecting in ${delay / 1000}s (attempt ${this.reconnectAttempts}/${MAX_RECONNECT_ATTEMPTS})`);
+
+        this.reconnectTimer = setTimeout(() => {
+          this.reconnectTimer = null;
+          this.connect().catch((err) => {
+            log.warn(`[whatsapp] Reconnect failed: ${err.message}`);
+          });
+        }, delay);
       }
 
       if (connection === 'open') {
         log.ok('[whatsapp] Connected to WhatsApp');
+        this.reconnectAttempts = 0; // Reset on successful connection
       }
     });
 
@@ -133,6 +158,11 @@ export class WhatsAppChannel implements Channel {
   }
 
   async shutdown(): Promise<void> {
+    this.shuttingDown = true;
+    if (this.reconnectTimer) {
+      clearTimeout(this.reconnectTimer);
+      this.reconnectTimer = null;
+    }
     if (this.sock) {
       this.sock.end(undefined);
       this.sock = null;