refactor: simplify WhatsApp guardian logic by removing redundant channel status checks and handling session invalidation via error catching

wa-guardian.js

@@ -9,8 +9,10 @@
 
 const fs = require("fs");
 const path = require("path");
-const { WebSocket } = require('/home/node/.openclaw/openclaw-app/node_modules/ws');
-const { randomUUID } = require('node:crypto');
+const {
+  WebSocket,
+} = require("/home/node/.openclaw/openclaw-app/node_modules/ws");
+const { randomUUID } = require("node:crypto");
 
 const GATEWAY_URL = "ws://127.0.0.1:7860";
 const GATEWAY_TOKEN = process.env.GATEWAY_TOKEN || "huggingclaw";
@@ -31,7 +33,8 @@ let last515At = 0;
 function extractErrorMessage(msg) {
   if (!msg || typeof msg !== "object") return "Unknown error";
   if (typeof msg.error === "string") return msg.error;
-  if (msg.error && typeof msg.error.message === "string") return msg.error.message;
+  if (msg.error && typeof msg.error.message === "string")
+    return msg.error.message;
   if (typeof msg.message === "string") return msg.message;
   return "Unknown error";
 }
@@ -40,9 +43,13 @@ function writeResetMarker() {
   try {
     fs.mkdirSync(path.dirname(RESET_MARKER_PATH), { recursive: true });
     fs.writeFileSync(RESET_MARKER_PATH, "reset\n");
-    console.log(`[guardian] Created backup reset marker at ${RESET_MARKER_PATH}`);
+    console.log(
+      `[guardian] Created backup reset marker at ${RESET_MARKER_PATH}`,
+    );
   } catch (error) {
-    console.log(`[guardian] Failed to write backup reset marker: ${error.message}`);
+    console.log(
+      `[guardian] Failed to write backup reset marker: ${error.message}`,
+    );
   }
 }
 
@@ -55,25 +62,32 @@ async function createConnection() {
       const msg = JSON.parse(data.toString());
 
       if (msg.type === "event" && msg.event === "connect.challenge") {
-        ws.send(JSON.stringify({
-          type: "req",
-          id: randomUUID(),
-          method: "connect",
-          params: {
-            minProtocol: 3,
-            maxProtocol: 3,
-            client: {
-              id: "gateway-client",
-              version: "1.0.0",
-              platform: "linux",
-              mode: "backend",
+        ws.send(
+          JSON.stringify({
+            type: "req",
+            id: randomUUID(),
+            method: "connect",
+            params: {
+              minProtocol: 3,
+              maxProtocol: 3,
+              client: {
+                id: "gateway-client",
+                version: "1.0.0",
+                platform: "linux",
+                mode: "backend",
+              },
+              caps: [],
+              auth: { token: GATEWAY_TOKEN },
+              role: "operator",
+              scopes: [
+                "operator.read",
+                "operator.write",
+                "operator.admin",
+                "operator.pairing",
+              ],
             },
-            caps: [],
-            auth: { token: GATEWAY_TOKEN },
-            role: "operator",
-            scopes: ["operator.read", "operator.write", "operator.admin", "operator.pairing"],
-          },
-        }));
+          }),
+        );
         return;
       }
 
@@ -90,8 +104,15 @@ async function createConnection() {
       }
     });
 
-    ws.on("error", (e) => { if (!resolved) reject(e); });
-    setTimeout(() => { if (!resolved) { ws.close(); reject(new Error("Timeout")); } }, 10000);
+    ws.on("error", (e) => {
+      if (!resolved) reject(e);
+    });
+    setTimeout(() => {
+      if (!resolved) {
+        ws.close();
+        reject(new Error("Timeout"));
+      }
+    }, 10000);
   });
 }
 
@@ -111,7 +132,10 @@ async function callRpc(ws, method, params) {
     };
     ws.on("message", handler);
     ws.send(JSON.stringify({ type: "req", id, method, params }));
-    setTimeout(() => { ws.removeListener("message", handler); reject(new Error("RPC Timeout")); }, WAIT_TIMEOUT + 5000);
+    setTimeout(() => {
+      ws.removeListener("message", handler);
+      reject(new Error("RPC Timeout"));
+    }, WAIT_TIMEOUT + 5000);
   });
 }
 
@@ -121,58 +145,18 @@ async function checkStatus() {
   let ws;
   try {
     ws = await createConnection();
-
-    // Check if WhatsApp channel exists and its status
-    const statusRes = await callRpc(ws, "channels.status", {});
-    const channels = (statusRes.payload || statusRes.result)?.channels || {};
-    const wa = channels.whatsapp;
-
-    if (!wa) {
-      ws.close();
-      return;
-    }
-
-    const lastError = String(wa.lastError || "").toLowerCase();
-    const recentlySaw515 = Date.now() - last515At < POST_515_NO_LOGOUT_MS;
-    const needsLogout = wa.linked && !wa.connected && !recentlySaw515 &&
-      (
-        lastError.includes("401") ||
-        lastError.includes("unauthorized") ||
-        lastError.includes("logged out") ||
-        lastError.includes("440") ||
-        lastError.includes("conflict")
-      );
-
-    if (needsLogout) {
-      console.log("[guardian] Clearing invalid WhatsApp session so a fresh QR can be used...");
-      try {
-        await callRpc(ws, "channels.logout", { channel: "whatsapp" });
-        writeResetMarker();
-        hasShownWaitMessage = false;
-        console.log("[guardian] Logged out invalid WhatsApp session.");
-      } catch (error) {
-        console.log(`[guardian] Failed to log out invalid session: ${error.message}`);
-      }
-      ws.close();
-      return;
-    }
-
-    // If connected, we are good
-    if (wa.connected) {
-      hasShownWaitMessage = false;
-      ws.close();
-      return;
-    }
-
-    // If "Ready to pair", we wait for the scan
     isWaiting = true;
     if (!hasShownWaitMessage) {
-      console.log("\n[guardian] 📱 WhatsApp pairing in progress. Please scan the QR code in the Control UI.");
+      console.log(
+        "\n[guardian] 📱 WhatsApp pairing in progress. Please scan the QR code in the Control UI.",
+      );
       hasShownWaitMessage = true;
     }
 
     console.log("[guardian] Waiting for pairing completion...");
-    const waitRes = await callRpc(ws, "web.login.wait", { timeoutMs: WAIT_TIMEOUT });
+    const waitRes = await callRpc(ws, "web.login.wait", {
+      timeoutMs: WAIT_TIMEOUT,
+    });
     const result = waitRes.payload || waitRes.result;
     const message = result?.message || "";
     const linkedAfter515 = !result?.connected && message.includes("515");
@@ -185,21 +169,49 @@ async function checkStatus() {
       hasShownWaitMessage = false;
 
       if (linkedAfter515) {
-        console.log("[guardian] 515 after scan: credentials saved, reloading config to start WhatsApp...");
+        console.log(
+          "[guardian] 515 after scan: credentials saved, reloading config to start WhatsApp...",
+        );
       } else {
         console.log("[guardian] ✅ Pairing completed! Reloading config...");
       }
 
       const getRes = await callRpc(ws, "config.get", {});
       if (getRes.payload?.raw && getRes.payload?.hash) {
-        await callRpc(ws, "config.apply", { raw: getRes.payload.raw, baseHash: getRes.payload.hash });
+        await callRpc(ws, "config.apply", {
+          raw: getRes.payload.raw,
+          baseHash: getRes.payload.hash,
+        });
         console.log("[guardian] Configuration re-applied.");
       }
-    } else if (!message.includes("No active") && !message.includes("Still waiting")) {
+    } else if (
+      !message.includes("No active") &&
+      !message.includes("Still waiting")
+    ) {
       console.log(`[guardian] Wait result: ${message}`);
     }
-
   } catch (e) {
+    const message = e && e.message ? e.message : "";
+    if (
+      /401|unauthorized|logged out|440|conflict/i.test(message) &&
+      Date.now() - last515At >= POST_515_NO_LOGOUT_MS
+    ) {
+      console.log(
+        "[guardian] Clearing invalid WhatsApp session so a fresh QR can be used...",
+      );
+      try {
+        if (ws) {
+          await callRpc(ws, "channels.logout", { channel: "whatsapp" });
+          writeResetMarker();
+          hasShownWaitMessage = false;
+          console.log("[guardian] Logged out invalid WhatsApp session.");
+        }
+      } catch (error) {
+        console.log(
+          `[guardian] Failed to log out invalid session: ${error.message}`,
+        );
+      }
+    }
     // Normal timeout or gateway starting up; retry on the next interval.
   } finally {
     isWaiting = false;
@@ -207,6 +219,8 @@ async function checkStatus() {
   }
 }
 
-console.log("[guardian] ⚔️ WhatsApp Guardian active. Monitoring pairing status...");
+console.log(
+  "[guardian] ⚔️ WhatsApp Guardian active. Monitoring pairing status...",
+);
 setInterval(checkStatus, CHECK_INTERVAL);
 setTimeout(checkStatus, 15000);