owpenwork 0.1.9 → 0.1.11

package/dist/cli.js

@@ -9,7 +9,7 @@ import { BridgeStore } from "./db.js";
 import { createLogger } from "./logger.js";
 import { createClient } from "./opencode.js";
 import { loginWhatsApp, unpairWhatsApp } from "./whatsapp.js";
-const VERSION = "0.1.9";
+const VERSION = "0.1.11";
 const STEP_OPTIONS = [
     {
         value: "config",

package/dist/whatsapp.js

@@ -120,55 +120,74 @@ export async function loginWhatsApp(config, logger) {
     const log = logger.child({ channel: "whatsapp" });
     const { state, saveCreds } = await useMultiFileAuthState(authDir);
     const { version } = await fetchLatestBaileysVersion();
-    await new Promise((resolve) => {
-        let finished = false;
-        const sock = makeWASocket({
-            auth: {
-                creds: state.creds,
-                keys: makeCacheableSignalKeyStore(state.keys, log),
-            },
-            version,
-            logger: log,
-            printQRInTerminal: false,
-            syncFullHistory: false,
-            markOnlineOnConnect: false,
-            browser: ["owpenbot", "cli", "0.1.0"],
-        });
-        const finish = (reason) => {
-            if (finished)
-                return;
-            finished = true;
-            log.info({ reason }, "whatsapp login finished");
-            sock.end(undefined);
-            resolve();
-        };
-        sock.ev.on("creds.update", async () => {
-            await saveCreds();
-            if (state.creds?.registered) {
-                finish("creds.registered");
-            }
-        });
-        sock.ev.on("connection.update", (update) => {
-            if (update.qr) {
-                qrcode.generate(update.qr, { small: true });
-                log.info("scan the QR code to connect WhatsApp");
-            }
-            if (update.connection === "open") {
-                finish("connection.open");
-            }
-            if (update.connection === "close") {
-                const lastDisconnect = update.lastDisconnect;
-                const statusCode = lastDisconnect?.error?.output?.statusCode;
-                if (statusCode === 515 && state.creds?.registered) {
-                    finish("connection.close.registered");
+    const credsPath = path.join(authDir, "creds.json");
+    const maxAttempts = 2;
+    for (let attempt = 1; attempt <= maxAttempts; attempt += 1) {
+        const result = await new Promise((resolve) => {
+            let finished = false;
+            const sock = makeWASocket({
+                auth: {
+                    creds: state.creds,
+                    keys: makeCacheableSignalKeyStore(state.keys, log),
+                },
+                version,
+                logger: log,
+                printQRInTerminal: false,
+                syncFullHistory: false,
+                markOnlineOnConnect: false,
+                browser: ["owpenbot", "cli", "0.1.0"],
+            });
+            const finish = (reason, status) => {
+                if (finished)
                     return;
-                }
+                finished = true;
+                log.info({ reason }, "whatsapp login finished");
+                sock.end(undefined);
+                resolve(status);
+            };
+            sock.ev.on("creds.update", async () => {
+                await saveCreds();
                 if (state.creds?.registered) {
-                    finish("connection.close.registered");
+                    finish("creds.registered", "linked");
                 }
-            }
+            });
+            sock.ev.on("connection.update", (update) => {
+                if (update.qr) {
+                    qrcode.generate(update.qr, { small: true });
+                    log.info("scan the QR code to connect WhatsApp");
+                }
+                if (update.connection === "open") {
+                    finish("connection.open", "linked");
+                }
+                if (update.connection === "close") {
+                    const lastDisconnect = update.lastDisconnect;
+                    const statusCode = lastDisconnect?.error?.output?.statusCode;
+                    if (statusCode === 515) {
+                        if (state.creds?.registered || fs.existsSync(credsPath)) {
+                            log.info("whatsapp login requires reconnect; completing login");
+                            finish("connection.restart.required", "linked");
+                        }
+                        else {
+                            log.warn("whatsapp restart requested before creds registered");
+                            finish("connection.restart.required", "restart");
+                        }
+                        return;
+                    }
+                    if (state.creds?.registered) {
+                        finish("connection.close.registered", "linked");
+                    }
+                }
+            });
         });
-    });
+        if (result === "linked") {
+            return;
+        }
+        if (attempt < maxAttempts) {
+            log.warn("retrying whatsapp login after restart");
+            await new Promise((resolve) => setTimeout(resolve, 1500));
+        }
+    }
+    throw new Error("WhatsApp login failed after restart");
 }
 export function unpairWhatsApp(config, logger) {
     const authDir = path.resolve(config.whatsappAuthDir);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "owpenwork",
-  "version": "0.1.9",
+  "version": "0.1.11",
   "description": "WhatsApp bridge for a running OpenCode server",
   "private": false,
   "type": "module",