@openclaw/whatsapp 2026.9.6 → 2026.9.7

package/dist/.setup/{login-qr-CgKtO_ef.mjs → login-qr-Ayb8i25J.mjs}

@@ -1,50 +1,36 @@
-import { a as resolveWhatsAppAccount } from "./accounts-D_NGDjCx.mjs";
-import { c as logoutWeb, f as readWebAuthExistsForDecision, g as readWebSelfId, n as WHATSAPP_AUTH_UNSTABLE_CODE } from "./auth-store-Dh8a3cba.mjs";
+import { a as resolveWhatsAppAccount } from "./accounts-CtRPAQCL.mjs";
+import { c as logoutWeb, f as readWebAuthExistsForDecision, g as readWebSelfId, n as WHATSAPP_AUTH_UNSTABLE_CODE } from "./auth-store-BBonwKks.mjs";
 import { t as getActiveWebListener } from "./active-listener-CDjoX9QR.mjs";
-import { r as createWaSocket, u as resolveWhatsAppSocketTiming } from "./socket-close-CCVSFufF.mjs";
-import { t as formatError } from "./session-errors-JuazczrA.mjs";
-import { i as closeWaSocket, o as waitForWhatsAppLoginResult, t as WHATSAPP_LOGGED_OUT_QR_MESSAGE } from "./connection-controller-C60mU7j7.mjs";
+import { h as resolveWhatsAppSocketTiming, r as createWaSocket } from "./socket-close-CT__V2fz.mjs";
+import { t as formatError } from "./session-errors-B8UcAnZN.mjs";
+import { i as closeWaSocket, o as waitForWhatsAppLoginResult, t as WHATSAPP_LOGGED_OUT_QR_MESSAGE } from "./connection-controller-CHo1oRJA.mjs";
 import { logInfo } from "openclaw/plugin-sdk/logging-core";
 import { danger, defaultRuntime, info, success } from "openclaw/plugin-sdk/runtime-env";
 import { renderQrPngDataUrl } from "openclaw/plugin-sdk/media-runtime";
 import { resolveTimerTimeoutMs } from "openclaw/plugin-sdk/number-runtime";
+import { createDeferred } from "openclaw/plugin-sdk/extension-shared";
 import { randomUUID } from "node:crypto";
 import { getRuntimeConfig } from "openclaw/plugin-sdk/runtime-config-snapshot";
+import { setImmediate } from "node:timers/promises";
 //#region extensions/whatsapp/src/login-qr.ts
-function waitForNextTask() {
-	return new Promise((resolve) => {
-		setImmediate(resolve);
-	});
-}
 const ACTIVE_LOGIN_TTL_MS = 18e4;
 const MAX_QR_RENDER_CHASES = 10;
 const activeLogins = /* @__PURE__ */ new Map();
-function resolveWhatsAppLoginTimeoutMs(value, fallbackMs, minMs) {
-	return resolveTimerTimeoutMs(value, fallbackMs, minMs);
-}
-function closeSocket(sock) {
-	closeWaSocket(sock);
-}
 async function resetActiveLogin(accountId, reason) {
 	const login = activeLogins.get(accountId);
 	if (login) {
 		activeLogins.delete(accountId);
-		closeSocket(login.sock);
+		closeWaSocket(login.sock);
 	}
 	if (reason) logInfo(reason);
 }
 function isLoginFresh(login) {
 	return Date.now() - login.startedAt < ACTIVE_LOGIN_TTL_MS;
 }
-function resetQrUpdateSignal(login) {
-	login.qrUpdatePromise = new Promise((resolve) => {
-		login.resolveQrUpdate = resolve;
-	});
-}
 function notifyQrUpdate(login) {
-	const resolve = login.resolveQrUpdate;
-	resetQrUpdateSignal(login);
-	resolve?.();
+	const previous = login.qrUpdate;
+	login.qrUpdate = createDeferred();
+	previous.resolve();
 }
 function updateLoginQrState(login, qr) {
 	login.qr = qr;
@@ -141,28 +127,7 @@ async function waitForQrOrRecoveredLogin(params) {
 		outcome: "failed",
 		message: `Failed to get QR: ${String(err)}`
 	}));
-	const loginResult = params.login.waitPromise.then(async () => {
-		if (activeLogins.get(params.accountId)?.id !== params.login.id) return {
-			outcome: "failed",
-			message: "WhatsApp login was replaced by a newer request."
-		};
-		await waitForNextTask();
-		const latest = activeLogins.get(params.accountId);
-		if (latest?.id !== params.login.id) return {
-			outcome: "failed",
-			message: "WhatsApp login was replaced by a newer request."
-		};
-		if (latest.qr) return {
-			outcome: "qr",
-			qr: latest.qr
-		};
-		if (latest.connected) return { outcome: "connected" };
-		return {
-			outcome: "failed",
-			message: latest.error ? `WhatsApp login failed: ${latest.error}` : "WhatsApp login failed."
-		};
-	});
-	const qrUpdateResult = params.login.qrUpdatePromise.then(() => {
+	const readLoginResult = (fallbackMessage) => {
 		const current = activeLogins.get(params.accountId);
 		if (current?.id !== params.login.id) return {
 			outcome: "failed",
@@ -175,9 +140,14 @@ async function waitForQrOrRecoveredLogin(params) {
 		if (current.connected) return { outcome: "connected" };
 		return {
 			outcome: "failed",
-			message: current.error ? `WhatsApp login failed: ${current.error}` : "WhatsApp QR update ended without an active QR."
+			message: current.error ? `WhatsApp login failed: ${current.error}` : fallbackMessage
 		};
+	};
+	const loginResult = params.login.waitPromise.then(async () => {
+		if (activeLogins.get(params.accountId)?.id === params.login.id) await setImmediate();
+		return readLoginResult("WhatsApp login failed.");
 	});
+	const qrUpdateResult = params.login.qrUpdate.promise.then(() => readLoginResult("WhatsApp QR update ended without an active QR."));
 	return await Promise.race([
 		qrResult,
 		loginResult,
@@ -212,7 +182,7 @@ async function startWebLoginWithQr(opts = {}) {
 		return { message: `WhatsApp login failed: ${formatError(err)}` };
 	}
 	const existing = activeLogins.get(account.accountId);
-	if (existing && isLoginFresh(existing) && existing.qrDataUrl) return {
+	if (!opts.force && existing && isLoginFresh(existing) && !existing.connected && existing.error === void 0 && existing.qrDataUrl) return {
 		qrDataUrl: existing.qrDataUrl,
 		message: "QR already active. Scan it in WhatsApp → Linked Devices."
 	};
@@ -225,7 +195,7 @@ async function startWebLoginWithQr(opts = {}) {
 	});
 	const qrTimer = setTimeout(() => {
 		rejectQr?.(/* @__PURE__ */ new Error("Timed out waiting for WhatsApp QR"));
-	}, resolveWhatsAppLoginTimeoutMs(opts.timeoutMs, 3e4, 5e3));
+	}, resolveTimerTimeoutMs(opts.timeoutMs, 3e4, 5e3));
 	let sock;
 	let pendingQr = null;
 	const loginId = randomUUID();
@@ -270,7 +240,6 @@ async function startWebLoginWithQr(opts = {}) {
 		return { message: `Failed to start WhatsApp login: ${String(err)}` };
 	}
 	const nextLogin = {
-		accountId: account.accountId,
 		authDir: account.authDir,
 		isLegacyAuthDir: account.isLegacyAuthDir,
 		id: loginId,
@@ -279,8 +248,7 @@ async function startWebLoginWithQr(opts = {}) {
 		connected: false,
 		waitPromise: Promise.resolve(),
 		qrVersion: 0,
-		qrUpdatePromise: Promise.resolve(),
-		resolveQrUpdate: null,
+		qrUpdate: createDeferred(),
 		qrRenderPromise: null,
 		verbose: Boolean(opts.verbose),
 		runtime,
@@ -291,11 +259,10 @@ async function startWebLoginWithQr(opts = {}) {
 		await opts.beforeCredentialPersistence?.();
 	} catch (err) {
 		clearTimeout(qrTimer);
-		closeSocket(sock);
+		closeWaSocket(sock);
 		return { message: `Failed to start WhatsApp login: ${String(err)}` };
 	}
 	operationOwner.current = nextLogin;
-	resetQrUpdateSignal(nextLogin);
 	activeLogins.set(account.accountId, nextLogin);
 	if (pendingQr) {
 		const qrVersion = updateLoginQrState(nextLogin, pendingQr);
@@ -370,21 +337,12 @@ async function waitForWebLogin(opts = {}) {
 			message: "The login QR expired. Ask me to generate a new one."
 		};
 	}
-	const timeoutMs = resolveWhatsAppLoginTimeoutMs(opts.timeoutMs, 12e4, 1e3);
+	const timeoutMs = resolveTimerTimeoutMs(opts.timeoutMs, 12e4, 1e3);
 	const deadline = Date.now() + timeoutMs;
 	const currentQrDataUrl = opts.currentQrDataUrl;
 	while (true) {
 		if (login.error) {
-			if (login.errorStatus === 401) {
-				const message = WHATSAPP_LOGGED_OUT_QR_MESSAGE;
-				await resetActiveLogin(account.accountId, message);
-				runtime.log(danger(message));
-				return {
-					connected: false,
-					message
-				};
-			}
-			const message = `WhatsApp login failed: ${login.error}`;
+			const message = login.errorStatus === 401 ? WHATSAPP_LOGGED_OUT_QR_MESSAGE : `WhatsApp login failed: ${login.error}`;
 			await resetActiveLogin(account.accountId, message);
 			runtime.log(danger(message));
 			return {
@@ -411,26 +369,20 @@ async function waitForWebLogin(opts = {}) {
 			connected: false,
 			message: "Still waiting for the QR scan. Let me know when you’ve scanned it."
 		};
+		let timer;
 		const timeout = new Promise((resolve) => {
-			setTimeout(() => resolve("timeout"), remaining);
+			timer = setTimeout(() => resolve("timeout"), remaining);
 		});
 		const result = await Promise.race([
 			login.waitPromise.then(() => "done"),
-			login.qrUpdatePromise.then(() => "qr-update"),
+			login.qrUpdate.promise.then(() => "qr-update"),
 			timeout
-		]);
+		]).finally(() => clearTimeout(timer));
 		if (result === "timeout") return {
 			connected: false,
 			message: "Still waiting for the QR scan. Let me know when you’ve scanned it."
 		};
-		if (result === "qr-update") continue;
-		if (result === "done") {
-			if (login.connected || login.error) continue;
-			return {
-				connected: false,
-				message: "Login ended without a connection."
-			};
-		}
+		if (result === "qr-update" || login.connected || login.error) continue;
 		return {
 			connected: false,
 			message: "Login ended without a connection."