@openclaw/whatsapp 2026.7.2-beta.7 → 2026.7.33

package/dist/{login-CvY2Dhch.js → .setup/login-7b3M0iBp.mjs}

@@ -1,8 +1,9 @@
-import { t as __exportAll } from "./rolldown-runtime-D7D4PA-g.js";
-import { a as resolveWhatsAppAccount } from "./accounts-CSqLvCY5.js";
-import { b as restoreCredsFromBackupIfNeeded } from "./auth-store-DcEpIOmE.js";
-import { f as renderQrTerminal, r as createWaSocket, u as resolveWhatsAppSocketTiming } from "./socket-close-DridEuzz.js";
-import { a as closeWaSocketSoon, o as waitForWhatsAppLoginResult } from "./connection-controller-BOB2MVKY.js";
+import { t as __exportAll } from "./rolldown-runtime-D7D4PA-g.mjs";
+import { a as resolveWhatsAppAccount } from "./accounts-Dw16pdNl.mjs";
+import { a as resolveWhatsAppSocketTiming } from "./socket-timing-DhbVFjah.mjs";
+import { b as restoreCredsFromBackupIfNeeded } from "./auth-store-BZKGa0tW.mjs";
+import { i as renderQrTerminal, t as createWaSocket } from "./session-vUI41Jel.mjs";
+import { a as closeWaSocketSoon, o as waitForWhatsAppLoginResult } from "./connection-controller-Dt62u6fI.mjs";
 import { formatCliCommand } from "openclaw/plugin-sdk/cli-runtime";
 import { logInfo } from "openclaw/plugin-sdk/logging-core";
 import { danger, defaultRuntime, success } from "openclaw/plugin-sdk/runtime-env";
@@ -11,46 +12,14 @@ import { getRuntimeConfig } from "openclaw/plugin-sdk/runtime-config-snapshot";
 var login_exports = /* @__PURE__ */ __exportAll({ loginWeb: () => loginWeb });
 const QR_LINK_INSTRUCTION = "Open the WhatsApp app, go to Linked Devices, then scan this QR:";
 const CLEAR_TERMINAL = "\x1B[2J\x1B[H";
-async function loginWeb(verbose, waitForConnection, runtime = defaultRuntime, accountId, options) {
+async function loginWeb(verbose, waitForConnection, runtime = defaultRuntime, accountId) {
+	const cfg = getRuntimeConfig();
 	const account = resolveWhatsAppAccount({
-		cfg: getRuntimeConfig(),
+		cfg,
 		accountId
 	});
-	const socketTiming = resolveWhatsAppSocketTiming();
-	const restoredFromBackup = await restoreCredsFromBackupIfNeeded(account.authDir, { beforeCredentialPersistence: options?.beforeCredentialPersistence });
-	const credentialPersistenceState = { failure: null };
-	let resolveCredentialPersistenceFailure = (_failure) => {};
-	const credentialPersistenceFailurePromise = new Promise((resolve) => {
-		resolveCredentialPersistenceFailure = resolve;
-	});
-	const onCredentialPersistenceError = (error) => {
-		if (credentialPersistenceState.failure) return;
-		credentialPersistenceState.failure = { error };
-		resolveCredentialPersistenceFailure(credentialPersistenceState.failure);
-	};
-	const credentialPersistenceTasks = /* @__PURE__ */ new Set();
-	const onCredentialPersistenceTask = (task) => {
-		credentialPersistenceTasks.add(task);
-		task.then(() => credentialPersistenceTasks.delete(task), () => credentialPersistenceTasks.delete(task));
-	};
-	const waitForCredentialPersistence = async () => {
-		await new Promise((resolve) => {
-			setImmediate(resolve);
-		});
-		while (credentialPersistenceTasks.size > 0) await Promise.allSettled(credentialPersistenceTasks);
-	};
-	const credentialPersistenceOptions = options?.beforeCredentialPersistence ? {
-		beforeCredentialPersistence: async () => {
-			try {
-				await options.beforeCredentialPersistence?.();
-			} catch (error) {
-				onCredentialPersistenceError(error);
-				throw error;
-			}
-		},
-		onCredentialPersistenceError,
-		onCredentialPersistenceTask
-	} : {};
+	const socketTiming = resolveWhatsAppSocketTiming(cfg);
+	const restoredFromBackup = await restoreCredsFromBackupIfNeeded(account.authDir);
 	let qrVersion = 0;
 	const onQr = (qr) => {
 		const currentQrVersion = ++qrVersion;
@@ -67,8 +36,7 @@ async function loginWeb(verbose, waitForConnection, runtime = defaultRuntime, ac
 	let sock = await createWaSocket(false, verbose, {
 		authDir: account.authDir,
 		...socketTiming,
-		onQr,
-		...credentialPersistenceOptions
+		onQr
 	});
 	logInfo("Waiting for WhatsApp connection...", runtime);
 	try {
@@ -81,17 +49,10 @@ async function loginWeb(verbose, waitForConnection, runtime = defaultRuntime, ac
 			waitForConnection,
 			socketTiming,
 			onQr,
-			...credentialPersistenceOptions,
-			...options?.beforeCredentialPersistence ? {
-				credentialPersistenceFailure: credentialPersistenceFailurePromise,
-				getCredentialPersistenceFailure: () => credentialPersistenceState.failure,
-				waitForCredentialPersistence
-			} : {},
 			onSocketReplaced: (replacementSock) => {
 				sock = replacementSock;
 			}
 		});
-		if (credentialPersistenceState.failure) throw credentialPersistenceState.failure.error;
 		if (result.outcome === "connected") {
 			runtime.log(success(result.restarted ? "✅ Linked after restart; web session ready." : restoredFromBackup ? "✅ Recovered from creds.json.bak; web session ready." : "✅ Linked! Credentials saved for future sends."));
 			return;

package/dist/{login-qr-Bncpb6js.js → .setup/login-qr-CbyA4QX5.mjs}

@@ -1,9 +1,10 @@
-import { a as resolveWhatsAppAccount } from "./accounts-CSqLvCY5.js";
-import { c as logoutWeb, f as readWebAuthExistsForDecision, g as readWebSelfId, n as WHATSAPP_AUTH_UNSTABLE_CODE } from "./auth-store-DcEpIOmE.js";
-import { t as getActiveWebListener } from "./active-listener-BEjWsCNM.js";
-import { r as createWaSocket, u as resolveWhatsAppSocketTiming } from "./socket-close-DridEuzz.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-BOB2MVKY.js";
+import { a as resolveWhatsAppAccount } from "./accounts-Dw16pdNl.mjs";
+import { t as formatError } from "./session-errors-BAj9D2La.mjs";
+import { a as resolveWhatsAppSocketTiming } from "./socket-timing-DhbVFjah.mjs";
+import { c as logoutWeb, f as readWebAuthExistsForDecision, g as readWebSelfId, n as WHATSAPP_AUTH_UNSTABLE_CODE } from "./auth-store-BZKGa0tW.mjs";
+import { t as createWaSocket } from "./session-vUI41Jel.mjs";
+import { t as getActiveWebListener } from "./active-listener-CloPBx0S.mjs";
+import { i as closeWaSocket, o as waitForWhatsAppLoginResult, t as WHATSAPP_LOGGED_OUT_QR_MESSAGE } from "./connection-controller-Dt62u6fI.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";
@@ -16,7 +17,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 +29,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 +95,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,11 +187,12 @@ 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();
+	const socketTiming = resolveWhatsAppSocketTiming(cfg);
 	const authState = await readWebAuthExistsForDecision(account.authDir);
 	if (authState.outcome === "unstable") return {
 		code: WHATSAPP_AUTH_UNSTABLE_CODE,
@@ -203,7 +206,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 +230,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 +270,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 +285,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 +327,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 +337,7 @@ async function startWebLoginWithQr(opts = {}) {
 	try {
 		qrDataUrl = await ensureQrDataUrl({
 			accountId: account.accountId,
-			loginId: login.id,
+			loginId: nextLogin.id,
 			qr,
 			qrVersion
 		});
@@ -330,8 +353,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);