app-manager-edge-worker 1.1.0 → 1.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "app-manager-edge-worker",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "Distributed Scraper Edge Worker for Apps Manager. Run on any local machine, VPS, or Termux Android device to serve browser and HTTP scraping jobs.",
   "type": "module",
   "bin": {

package/src/handlers/whatsappHandler.js

@@ -112,7 +112,7 @@ export class WhatsAppWorkerHandler {
      * Can be invoked for pairing (requestQr=true) or on-demand send.
      */
     async initialize(requestQr = false) {
-        if (this.sock && this.status === "CONNECTED") {
+        if (this.sock && this.status === "CONNECTED" && !requestQr) {
             this._resetIdleTimer();
             return this.sock;
         }
@@ -126,19 +126,31 @@ export class WhatsAppWorkerHandler {
             }
         }
 
+        if (requestQr) {
+            // Clean slate for fresh pairing request
+            if (this.sock) {
+                try {
+                    this.sock.end(undefined);
+                } catch (_) {}
+                this.sock = null;
+            }
+            this.clearAuth();
+        }
+
         this.isInitializing = true;
         this.status = requestQr ? "PAIRING" : "STANDBY";
 
         try {
             const { state, saveCreds } = await useMultiFileAuthState(this.authDir);
-            const { version } = await fetchLatestBaileysVersion().catch(() => ({
-                version: [2, 3000, 1015901307],
-            }));
+            let version = undefined;
+            try {
+                const fetched = await fetchLatestBaileysVersion();
+                if (fetched?.version) version = fetched.version;
+            } catch (_) {}
 
             const logger = pino({ level: "silent" });
 
-            this.sock = makeWASocket({
-                version,
+            const socketConfig = {
                 auth: state,
                 logger,
                 printQRInTerminal: false,
@@ -146,7 +158,14 @@ export class WhatsAppWorkerHandler {
                 syncFullHistory: false,
                 markOnlineOnConnect: false, // Stealth Presence: Does NOT broadcast green online dot
                 generateHighQualityLinkPreview: true,
-            });
+                defaultQueryTimeoutMs: 60000,
+                connectTimeoutMs: 60000,
+                keepAliveIntervalMs: 25000,
+                getMessage: async () => undefined,
+            };
+            if (version) socketConfig.version = version;
+
+            this.sock = makeWASocket(socketConfig);
 
             this.sock.ev.on("creds.update", saveCreds);
 
@@ -173,6 +192,10 @@ export class WhatsAppWorkerHandler {
                     try {
                         this.currentQrDataUrl = await qrcode.toDataURL(qr);
                         this.onQrGenerated({ qrDataUrl: this.currentQrDataUrl });
+                        this.onStatusChange({
+                            status: "PAIRING",
+                            qrCodeDataUrl: this.currentQrDataUrl,
+                        });
                     } catch (err) {
                         console.error("[WhatsApp Worker] Failed to render QR Data URL:", err);
                     }
@@ -193,6 +216,8 @@ export class WhatsAppWorkerHandler {
 
                     this._resetIdleTimer();
 
+                    console.log(`[WhatsApp Worker] Companion Device paired successfully! User: ${this.user.name || "WhatsApp User"} (+${this.user.phone})`);
+
                     this.onStatusChange({
                         status: "CONNECTED",
                         phone: this.user.phone,
@@ -203,12 +228,15 @@ export class WhatsAppWorkerHandler {
 
                 if (connection === "close") {
                     this.isInitializing = false;
-                    const statusCode = (lastDisconnect?.error)?.output?.statusCode;
+                    const error = lastDisconnect?.error;
+                    const statusCode = error?.output?.statusCode;
                     const isLoggedOut =
                         statusCode === DisconnectReason.loggedOut ||
                         statusCode === 401 ||
                         statusCode === DisconnectReason.badSession;
 
+                    console.log(`[WhatsApp Worker] Connection closed. StatusCode: ${statusCode}. LoggedOut: ${isLoggedOut}`);
+
                     if (isLoggedOut) {
                         // Mobile App or Meta unlinked this companion device
                         this.status = "DISCONNECTED";
@@ -228,8 +256,21 @@ export class WhatsAppWorkerHandler {
                             reason: "LOGGED_OUT_BY_PHONE",
                         });
                     } else {
-                        // Temporary disconnect / network blip
-                        this.status = "STANDBY";
+                        // Post-scan restart (code 515 restartRequired) or temporary network glitch:
+                        // WhatsApp protocol REQUIRES immediate socket reconnection to finalize the multi-device key exchange!
+                        if (this.sock) {
+                            try {
+                                this.sock.end(undefined);
+                            } catch (_) {}
+                            this.sock = null;
+                        }
+
+                        console.log("[WhatsApp Worker] Reconnecting to finalize credentials and establish active session...");
+                        setTimeout(() => {
+                            this.initialize(false).catch((err) => {
+                                console.error("[WhatsApp Worker] Reconnection error:", err.message);
+                            });
+                        }, 1000);
                     }
                 }
             });