@openclaw/whatsapp 2026.8.1-beta.3 → 2026.8.2

package/dist/{login-qr-1dpv6jjT.js → login-qr-B3m61NqA.js}

@@ -1,9 +1,9 @@
-import { a as resolveWhatsAppAccount } from "./accounts-BX2fZUyR.js";
-import { c as logoutWeb, f as readWebAuthExistsForDecision, g as readWebSelfId, n as WHATSAPP_AUTH_UNSTABLE_CODE } from "./auth-store-CtpBqH5S.js";
+import { a as resolveWhatsAppAccount } from "./accounts-CeKQbu_s.js";
+import { c as logoutWeb, f as readWebAuthExistsForDecision, g as readWebSelfId, n as WHATSAPP_AUTH_UNSTABLE_CODE } from "./auth-store-DTj1H9pv.js";
 import { t as getActiveWebListener } from "./active-listener-BEjWsCNM.js";
-import { r as createWaSocket, u as resolveWhatsAppSocketTiming } from "./socket-close-2T0_jZTN.js";
+import { r as createWaSocket, u as resolveWhatsAppSocketTiming } from "./socket-close-CpkkJZCU.js";
 import { t as formatError } from "./session-errors-JuazczrA.js";
-import { i as closeWaSocket, o as waitForWhatsAppLoginResult, t as WHATSAPP_LOGGED_OUT_QR_MESSAGE } from "./connection-controller-CIYuBJrs.js";
+import { i as closeWaSocket, o as waitForWhatsAppLoginResult, t as WHATSAPP_LOGGED_OUT_QR_MESSAGE } from "./connection-controller-BvkxsbWi.js";
 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";
@@ -16,7 +16,7 @@ function waitForNextTask() {
 		setImmediate(resolve);
 	});
 }
-const ACTIVE_LOGIN_TTL_MS = 3 * 6e4;
+const ACTIVE_LOGIN_TTL_MS = 18e4;
 const MAX_QR_RENDER_CHASES = 10;
 const activeLogins = /* @__PURE__ */ new Map();
 function resolveWhatsAppLoginTimeoutMs(value, fallbackMs, minMs) {
@@ -28,8 +28,8 @@ function closeSocket(sock) {
 async function resetActiveLogin(accountId, reason) {
 	const login = activeLogins.get(accountId);
 	if (login) {
-		closeSocket(login.sock);
 		activeLogins.delete(accountId);
+		closeSocket(login.sock);
 	}
 	if (reason) logInfo(reason);
 }
@@ -94,6 +94,7 @@ function attachLoginWaiter(accountId, login) {
 		verbose: login.verbose,
 		runtime: login.runtime,
 		socketTiming: login.socketTiming,
+		beforeCredentialPersistence: login.beforeCredentialPersistence,
 		onQr: (qr) => {
 			const current = activeLogins.get(accountId);
 			if (!current || current.id !== login.id) return;
@@ -185,8 +186,9 @@ async function waitForQrOrRecoveredLogin(params) {
 }
 async function startWebLoginWithQr(opts = {}) {
 	const runtime = opts.runtime ?? defaultRuntime;
+	const cfg = getRuntimeConfig();
 	const account = resolveWhatsAppAccount({
-		cfg: getRuntimeConfig(),
+		cfg,
 		accountId: opts.accountId
 	});
 	const socketTiming = resolveWhatsAppSocketTiming();
@@ -203,7 +205,8 @@ async function startWebLoginWithQr(opts = {}) {
 		if (!await logoutWeb({
 			authDir: account.authDir,
 			isLegacyAuthDir: account.isLegacyAuthDir,
-			runtime
+			runtime,
+			beforeCredentialPersistence: opts.beforeCredentialPersistence
 		})) return { message: "WhatsApp login failed: existing auth could not be cleared. Remove or fix the configured WhatsApp auth directory, then retry login." };
 	} catch (err) {
 		return { message: `WhatsApp login failed: ${formatError(err)}` };
@@ -226,10 +229,20 @@ async function startWebLoginWithQr(opts = {}) {
 	let sock;
 	let pendingQr = null;
 	const loginId = randomUUID();
+	const operationOwner = {};
+	const beforeCredentialPersistence = async () => {
+		const login = operationOwner.current;
+		if (!login) {
+			await opts.beforeCredentialPersistence?.();
+			return;
+		}
+		if (activeLogins.get(account.accountId) !== login || !isLoginFresh(login)) throw new Error("WhatsApp login is no longer active.");
+	};
 	try {
 		sock = await createWaSocket(false, Boolean(opts.verbose), {
 			authDir: account.authDir,
 			...socketTiming,
+			beforeCredentialPersistence,
 			onQr: (qr) => {
 				pendingQr = qr;
 				const current = activeLogins.get(account.accountId);
@@ -256,7 +269,7 @@ async function startWebLoginWithQr(opts = {}) {
 		await resetActiveLogin(account.accountId);
 		return { message: `Failed to start WhatsApp login: ${String(err)}` };
 	}
-	const login = {
+	const nextLogin = {
 		accountId: account.accountId,
 		authDir: account.authDir,
 		isLegacyAuthDir: account.isLegacyAuthDir,
@@ -271,23 +284,32 @@ async function startWebLoginWithQr(opts = {}) {
 		qrRenderPromise: null,
 		verbose: Boolean(opts.verbose),
 		runtime,
-		socketTiming
+		socketTiming,
+		beforeCredentialPersistence
 	};
-	resetQrUpdateSignal(login);
-	activeLogins.set(account.accountId, login);
+	try {
+		await opts.beforeCredentialPersistence?.();
+	} catch (err) {
+		clearTimeout(qrTimer);
+		closeSocket(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(login, pendingQr);
+		const qrVersion = updateLoginQrState(nextLogin, pendingQr);
 		renderLatestQrDataUrlInBackground({
 			accountId: account.accountId,
-			loginId: login.id,
+			loginId: nextLogin.id,
 			qr: pendingQr,
 			qrVersion
 		});
 	}
-	attachLoginWaiter(account.accountId, login);
+	attachLoginWaiter(account.accountId, nextLogin);
 	const loginStartResult = await waitForQrOrRecoveredLogin({
 		accountId: account.accountId,
-		login,
+		login: nextLogin,
 		qrPromise
 	});
 	clearTimeout(qrTimer);
@@ -304,8 +326,8 @@ async function startWebLoginWithQr(opts = {}) {
 		await resetActiveLogin(account.accountId);
 		return { message: loginStartResult.message };
 	}
-	const qr = login.qr ?? loginStartResult.qr;
-	const qrVersion = login.qrVersion;
+	const qr = nextLogin.qr ?? loginStartResult.qr;
+	const qrVersion = nextLogin.qrVersion;
 	if (qrVersion === 0) {
 		await resetActiveLogin(account.accountId);
 		return { message: "Failed to capture the active WhatsApp QR. Ask me to generate a new one." };
@@ -314,7 +336,7 @@ async function startWebLoginWithQr(opts = {}) {
 	try {
 		qrDataUrl = await ensureQrDataUrl({
 			accountId: account.accountId,
-			loginId: login.id,
+			loginId: nextLogin.id,
 			qr,
 			qrVersion
 		});
@@ -330,8 +352,9 @@ async function startWebLoginWithQr(opts = {}) {
 }
 async function waitForWebLogin(opts = {}) {
 	const runtime = opts.runtime ?? defaultRuntime;
+	const cfg = getRuntimeConfig();
 	const account = resolveWhatsAppAccount({
-		cfg: getRuntimeConfig(),
+		cfg,
 		accountId: opts.accountId
 	});
 	const activeLogin = activeLogins.get(account.accountId);

package/dist/login-qr-runtime.js

@@ -1,6 +1,6 @@
 import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
 //#region extensions/whatsapp/login-qr-runtime.ts
-const loadLoginQrModule = createLazyRuntimeModule(() => import("./login-qr-1dpv6jjT.js"));
+const loadLoginQrModule = createLazyRuntimeModule(() => import("./login-qr-B3m61NqA.js"));
 async function startWebLoginWithQr(...args) {
 	const { startWebLoginWithQr: startWebLoginWithQrLocal } = await loadLoginQrModule();
 	return await startWebLoginWithQrLocal(...args);