weapp-ide-cli 5.4.0 → 5.4.2

package/dist/{automator-session-RrZjw3X5.js → automator-session-CvStbY9I.js}

@@ -9,6 +9,7 @@ import path$1 from "pathe";
 import logger, { colors } from "@weapp-core/logger";
 import { createHash } from "node:crypto";
 import { acquireSharedMiniProgram, closeSharedMiniProgram, getSharedMiniProgramSessionCount, releaseSharedMiniProgram, withMiniProgram } from "@weapp-vite/devtools-runtime";
+import { emitKeypressEvents } from "node:readline";
 //#region src/utils/path.ts
 /**
 * @description 解析为绝对路径（基于当前工作目录）
@@ -577,7 +578,7 @@ async function removePersistedAutomatorSession(projectPath, sessionId, port) {
 /**
 * @description 提取登录失效时最适合展示给用户的一行信息。
 */
-function extractLoginRequiredMessage(text) {
+function extractLoginRequiredMessage$1(text) {
 	if (!text) return "";
 	if (LOGIN_REQUIRED_CN_RE.test(text)) return "需要重新登录";
 	const englishMatch = text.match(LOGIN_REQUIRED_EN_RE);
@@ -641,7 +642,7 @@ function isAutomatorLoginError(error) {
 function formatAutomatorLoginError(error) {
 	const text = extractErrorText(error);
 	const code = text.match(LOGIN_REQUIRED_CODE_RE)?.[1];
-	const message = extractLoginRequiredMessage(text);
+	const message = extractLoginRequiredMessage$1(text);
 	const lines = ["微信开发者工具返回登录错误："];
 	if (code) lines.push(`- code: ${code}`);
 	if (message) lines.push(`- message: ${message}`);
@@ -767,7 +768,316 @@ function readLangOption(argv) {
 	}
 }
 //#endregion
+//#region src/cli/inputCoordinator.ts
+const sharedSessions = /* @__PURE__ */ new Set();
+const exclusiveKeypressStack = [];
+const EXCLUSIVE_KEYPRESS_CARRYOVER_GUARD_MS = 500;
+let initialized = false;
+let rawModeEnabled = false;
+let dataListenerAttached = false;
+let keypressListenerAttached = false;
+let lastExclusiveResolvedKeypress;
+function hasInteractiveStdin() {
+	return Boolean(process.stdin?.isTTY);
+}
+function canSetRawMode() {
+	return typeof process.stdin?.setRawMode === "function";
+}
+function updateTerminalState() {
+	const shouldKeepInputActive = Array.from(sharedSessions).some((session) => !session.closed && !session.suspended) || exclusiveKeypressStack.length > 0;
+	if (canSetRawMode() && rawModeEnabled !== shouldKeepInputActive) {
+		process.stdin.setRawMode(shouldKeepInputActive);
+		rawModeEnabled = shouldKeepInputActive;
+	}
+	if (shouldKeepInputActive) {
+		process.stdin.resume();
+		return;
+	}
+	process.stdin.pause();
+}
+function handleData(chunk) {
+	if (exclusiveKeypressStack.length > 0) return;
+	for (const session of sharedSessions) {
+		if (session.closed || session.suspended || !session.options.onData) continue;
+		session.options.onData(chunk);
+	}
+}
+function handleKeypress(str, key) {
+	const activeExclusive = exclusiveKeypressStack[exclusiveKeypressStack.length - 1];
+	if (activeExclusive) {
+		const now = Date.now();
+		const signature = `${key?.ctrl ? "ctrl+" : ""}${key?.name ?? str}`;
+		if (lastExclusiveResolvedKeypress && lastExclusiveResolvedKeypress.signature === signature && now - lastExclusiveResolvedKeypress.timestamp <= EXCLUSIVE_KEYPRESS_CARRYOVER_GUARD_MS) {
+			lastExclusiveResolvedKeypress.timestamp = now;
+			return;
+		}
+		if (now < activeExclusive.ignoreUntil) return;
+		const nextValue = activeExclusive.onKeypress(str, key);
+		if (nextValue !== void 0) {
+			clearTimeout(activeExclusive.timeout);
+			exclusiveKeypressStack.pop();
+			lastExclusiveResolvedKeypress = {
+				signature,
+				timestamp: now
+			};
+			updateTerminalState();
+			activeExclusive.resolve(nextValue);
+		}
+		return;
+	}
+	for (const session of sharedSessions) {
+		if (session.closed || session.suspended || !session.options.onKeypress) continue;
+		session.options.onKeypress(str, key);
+	}
+}
+function ensureCoordinatorInitialized() {
+	if (initialized || !hasInteractiveStdin()) return;
+	emitKeypressEvents(process.stdin);
+	if (!dataListenerAttached) {
+		process.stdin.on("data", handleData);
+		dataListenerAttached = true;
+	}
+	if (!keypressListenerAttached) {
+		process.stdin.on("keypress", handleKeypress);
+		keypressListenerAttached = true;
+	}
+	initialized = true;
+}
+function createSharedInputSession(options) {
+	if (!hasInteractiveStdin()) return;
+	ensureCoordinatorInitialized();
+	const session = {
+		closed: false,
+		options,
+		suspended: false
+	};
+	sharedSessions.add(session);
+	updateTerminalState();
+	return {
+		close() {
+			if (session.closed) return;
+			session.closed = true;
+			sharedSessions.delete(session);
+			updateTerminalState();
+		},
+		resume() {
+			if (session.closed) return;
+			session.suspended = false;
+			updateTerminalState();
+		},
+		suspend() {
+			if (session.closed) return;
+			session.suspended = true;
+			updateTerminalState();
+		}
+	};
+}
+async function waitForExclusiveKeypress(options) {
+	if (!hasInteractiveStdin()) return "timeout";
+	ensureCoordinatorInitialized();
+	return await new Promise((resolve) => {
+		const normalizedTimeoutMs = Number.isFinite(options.timeoutMs) && options.timeoutMs && options.timeoutMs > 0 ? options.timeoutMs : 3e4;
+		const normalizedIgnoreInitialMs = Number.isFinite(options.ignoreInitialMs) && options.ignoreInitialMs && options.ignoreInitialMs > 0 ? options.ignoreInitialMs : 0;
+		const record = {
+			ignoreUntil: Date.now() + normalizedIgnoreInitialMs,
+			onKeypress: options.onKeypress,
+			resolve,
+			timeout: setTimeout(() => {
+				const index = exclusiveKeypressStack.lastIndexOf(record);
+				if (index >= 0) exclusiveKeypressStack.splice(index, 1);
+				updateTerminalState();
+				resolve("timeout");
+			}, normalizedTimeoutMs)
+		};
+		exclusiveKeypressStack.push(record);
+		updateTerminalState();
+	});
+}
+async function runWithSuspendedSharedInput(runner) {
+	const previousStates = /* @__PURE__ */ new Map();
+	for (const session of sharedSessions) {
+		if (session.closed) continue;
+		previousStates.set(session, session.suspended);
+		session.suspended = true;
+	}
+	if (canSetRawMode() && rawModeEnabled) {
+		process.stdin.setRawMode(false);
+		rawModeEnabled = false;
+	}
+	process.stdin.resume();
+	try {
+		return await runner();
+	} finally {
+		for (const [session, suspended] of previousStates) if (!session.closed) session.suspended = suspended;
+		updateTerminalState();
+	}
+}
+//#endregion
+//#region src/cli/retry.ts
+const RETRY_PROMPT_INITIAL_IGNORE_MS = 300;
+const RETRY_CONFIRM_KEYS = ["y"];
+const RETRY_CANCEL_KEYS = [
+	"q",
+	"Esc",
+	"Ctrl+C"
+];
+const LOGIN_REQUIRED_PATTERNS = [
+	/code\s*[:=]\s*10/i,
+	/需要重新登录/,
+	/need\s+re-?login/i,
+	/re-?login/i
+];
+/**
+* @description 提取执行错误文本，便于统一匹配与提示。
+*/
+function extractExecutionErrorText(error) {
+	if (!error || typeof error !== "object") return "";
+	const parts = [];
+	const candidate = error;
+	for (const field of [
+		candidate.message,
+		candidate.shortMessage,
+		candidate.stderr,
+		candidate.stdout
+	]) if (typeof field === "string" && field.trim()) parts.push(field);
+	return parts.join("\n");
+}
+function extractLoginRequiredMessage(text) {
+	if (!text) return "";
+	if (/需要重新登录/.test(text)) return "需要重新登录";
+	const englishMatch = text.match(/need\s+re-?login|re-?login/i);
+	if (englishMatch?.[0]) return englishMatch[0].toLowerCase();
+	const firstLine = text.split(/\r?\n/).map((line) => line.trim()).find((line) => Boolean(line) && !line.startsWith("at "));
+	if (!firstLine) return "";
+	return firstLine.replace(/^\[error\]\s*/i, "").replace(/^error\s*:\s*/i, "").slice(0, 120);
+}
+/**
+* @description 判断是否为微信开发者工具登录失效错误。
+*/
+function isWechatIdeLoginRequiredError(error) {
+	const text = extractExecutionErrorText(error);
+	if (!text) return false;
+	return LOGIN_REQUIRED_PATTERNS.some((pattern) => pattern.test(text));
+}
+/**
+* @description 将登录失效错误格式化为更易读的摘要。
+*/
+function formatWechatIdeLoginRequiredError(error) {
+	const text = extractExecutionErrorText(error);
+	const code = text.match(/code\s*[:=]\s*(\d+)/i)?.[1];
+	const message = extractLoginRequiredMessage(text);
+	const lines = ["微信开发者工具返回登录错误："];
+	if (code) lines.push(`- code: ${code}`);
+	if (message) lines.push(`- message: ${message}`);
+	if (!code && !message) lines.push("- message: 需要重新登录");
+	return lines.join("\n");
+}
+/**
+* @description 创建登录失效专用错误，并携带退出码语义。
+*/
+function createWechatIdeLoginRequiredExitError(error, reason) {
+	const summary = formatWechatIdeLoginRequiredError(error);
+	const message = reason ? `${reason}\n${summary}` : summary;
+	const loginError = new Error(message);
+	loginError.name = "WechatIdeLoginRequiredError";
+	loginError.code = 10;
+	loginError.exitCode = 10;
+	return loginError;
+}
+/**
+* @description 判断错误是否为登录失效专用退出错误。
+*/
+function isWechatIdeLoginRequiredExitError(error) {
+	if (!error || typeof error !== "object") return false;
+	const candidate = error;
+	return candidate.name === "WechatIdeLoginRequiredError" || candidate.code === 10 || candidate.exitCode === 10;
+}
+/**
+* @description 交互等待用户按 y 重试，按 q 或 Ctrl+C 取消。
+*/
+async function waitForRetryKeypress(options = {}) {
+	const { timeoutMs = 3e4 } = options;
+	if (!process.stdin.isTTY) return "cancel";
+	return await waitForExclusiveKeypress({
+		ignoreInitialMs: 300,
+		onKeypress: (_str, key) => {
+			if (!key) return;
+			if (key.ctrl && key.name === "c") return "cancel";
+			if (key.name === "y") return "retry";
+			if (key.name === "q" || key.name === "escape") return "cancel";
+		},
+		timeoutMs
+	});
+}
+function highlightHotkey(key) {
+	return colors.bold(colors.green(key));
+}
+/**
+* @description 生成重试按键提示，并高亮关键热键。
+*/
+function formatRetryHotkeyPrompt(timeoutMs = 3e4) {
+	const highlight = (key) => highlightHotkey(key);
+	const timeoutSeconds = Math.max(1, Math.ceil(timeoutMs / 1e3));
+	const confirmKeys = RETRY_CONFIRM_KEYS.map(highlight).join(" / ");
+	const cancelKeys = RETRY_CANCEL_KEYS.map(highlight).join(" / ");
+	return i18nText(`按 ${confirmKeys} 重试，按 ${cancelKeys} 退出（${timeoutSeconds}s 内无输入将自动失败）。`, `Press ${confirmKeys} to retry, ${cancelKeys} to cancel (auto fail in ${timeoutSeconds}s).`);
+}
+/**
+* @description 输出重试热键提示，并独占等待当前提示对应的按键输入。
+*/
+async function promptRetryKeypress(options) {
+	const { logger, timeoutMs = 3e4 } = options;
+	logger.info(formatRetryHotkeyPrompt(timeoutMs));
+	return await waitForRetryKeypress({ timeoutMs });
+}
+/**
+* @description 统一处理微信开发者工具登录失效场景下的提示与重试交互。
+*/
+async function promptWechatIdeLoginRetry(options) {
+	const { allowRetry = true, cancelLevel = "info", error, logger, promptOpenIdeLogin = false, retryTimeoutMs = 3e4 } = options;
+	logger.error(i18nText("检测到微信开发者工具登录状态失效，请先登录后重试。", "Wechat DevTools login has expired. Please login and retry."));
+	if (promptOpenIdeLogin) logger.warn(i18nText("请先打开微信开发者工具完成登录。", "Please open Wechat DevTools and complete login first."));
+	logger.warn(formatWechatIdeLoginRequiredError(error));
+	if (!allowRetry) return "cancel";
+	const action = await promptRetryKeypress({
+		logger,
+		timeoutMs: retryTimeoutMs
+	});
+	if (action === "timeout") {
+		logger.error(i18nText(`等待登录重试输入超时（${retryTimeoutMs}ms），已自动取消。`, `Retry prompt timed out (${retryTimeoutMs}ms), canceled automatically.`));
+		return "cancel";
+	}
+	if (action !== "retry") {
+		logger[cancelLevel](i18nText("已取消重试。完成登录后请重新执行当前命令。", "Retry canceled. Please run the command again after login."));
+		return "cancel";
+	}
+	return "retry";
+}
+//#endregion
+//#region src/cli/run-login-executor.ts
+/**
+* @description 执行可重试命令循环，并将“是否可重试”与“如何提示重试”交给调用方定义。
+*/
+async function runRetryableCommand(options) {
+	const { createCancelError, execute, isRetryableResult, onCancel, onRetry, promptRetry, shouldRetry } = options;
+	let retryCount = 0;
+	while (true) {
+		const result = await execute();
+		if (!isRetryableResult(result)) return result;
+		if (shouldRetry(await promptRetry(result, retryCount))) {
+			retryCount += 1;
+			onRetry?.();
+			continue;
+		}
+		onCancel?.(result);
+		throw createCancelError(result);
+	}
+}
+//#endregion
 //#region src/cli/automator-session.ts
+function unwrapAutomatorConnectionError(result) {
+	return result.kind === "retryable" ? result.error : result.value;
+}
 function normalizeMiniProgramConnectionError(error) {
 	if (isAutomatorLoginError(error)) {
 		logger_default.error(i18nText("检测到微信开发者工具登录状态失效，请先登录后重试。", "Wechat DevTools login has expired. Please login and retry."));
@@ -801,22 +1111,56 @@ function normalizeMiniProgramConnectionError(error) {
 * @description 建立 automator 会话，并统一处理常见连接错误提示。
 */
 async function connectMiniProgram(options) {
-	if (options.preferOpenedSession === false) try {
-		return await launchAutomator(options);
-	} catch (error) {
-		throw normalizeMiniProgramConnectionError(error);
-	}
-	try {
-		return await connectOpenedAutomator(options);
-	} catch (error) {
-		const normalizedOpenSessionError = normalizeMiniProgramConnectionError(error);
-		if (normalizedOpenSessionError instanceof Error && normalizedOpenSessionError.message === "DEVTOOLS_PROTOCOL_TIMEOUT") throw normalizedOpenSessionError;
-		try {
-			return await launchAutomator(options);
-		} catch (launchError) {
-			throw normalizeMiniProgramConnectionError(launchError);
-		}
-	}
+	const result = await runRetryableCommand({
+		createCancelError: (result) => createWechatIdeLoginRequiredExitError(unwrapAutomatorConnectionError(result), "cancelled"),
+		execute: async () => {
+			if (options.preferOpenedSession === false) try {
+				return {
+					kind: "result",
+					value: await launchAutomator(options)
+				};
+			} catch (error) {
+				if (!isAutomatorLoginError(error)) throw normalizeMiniProgramConnectionError(error);
+				return {
+					error,
+					kind: "retryable"
+				};
+			}
+			try {
+				return {
+					kind: "result",
+					value: await connectOpenedAutomator(options)
+				};
+			} catch (error) {
+				const normalizedOpenSessionError = normalizeMiniProgramConnectionError(error);
+				if (normalizedOpenSessionError instanceof Error && normalizedOpenSessionError.message === "DEVTOOLS_PROTOCOL_TIMEOUT") throw normalizedOpenSessionError;
+				try {
+					return {
+						kind: "result",
+						value: await launchAutomator(options)
+					};
+				} catch (launchError) {
+					if (!isAutomatorLoginError(launchError)) throw normalizeMiniProgramConnectionError(launchError);
+					return {
+						error: launchError,
+						kind: "retryable"
+					};
+				}
+			}
+		},
+		isRetryableResult: (result) => result.kind === "retryable",
+		onRetry: () => {
+			logger_default.info(i18nText("正在重试连接微信开发者工具...", "Retrying to connect Wechat DevTools..."));
+		},
+		promptRetry: async (result) => await promptWechatIdeLoginRetry({
+			error: unwrapAutomatorConnectionError(result),
+			logger: logger_default,
+			promptOpenIdeLogin: true
+		}),
+		shouldRetry: (action) => action === "retry"
+	});
+	if (result.kind === "retryable") throw createWechatIdeLoginRequiredExitError(result.error);
+	return result.value;
 }
 const runtimeHooks = {
 	connectMiniProgram,
@@ -835,4 +1179,4 @@ async function withMiniProgram$1(options, runner) {
 	return await withMiniProgram(runtimeHooks, options, runner);
 }
 //#endregion
-export { colors as A, defaultCustomConfigFilePath as B, getConfig as C, getDefaultCliPath as D, SupportedPlatformsMap as E, createLocaleConfig as F, overwriteCustomConfig as I, readCustomConfig as L, createAutoBootstrapDevtoolsConfig as M, createAutoTrustProjectConfig as N, isOperatingSystemSupported as O, createCustomConfig as P, removeCustomConfigKey as R, resolveCliPath as S, resolveDevtoolsAutomationDefaults as T, resolvePath as V, isDevtoolsHttpPortError as _, releaseSharedMiniProgram as a, bootstrapWechatDevtoolsSettings as b, i18nText as c, formatAutomatorLoginError as d, getAutomatorProtocolTimeoutMethod as f, isDevtoolsExtensionContextInvalidatedError as g, isAutomatorWsConnectError as h, getSharedMiniProgramSessionCount as i, logger_default as j, operatingSystemName as k, validateLocaleOption as l, isAutomatorProtocolTimeoutError as m, closeSharedMiniProgram as n, withMiniProgram$1 as o, isAutomatorLoginError as p, connectMiniProgram as r, configureLocaleFromArgv as s, acquireSharedMiniProgram$1 as t, connectOpenedAutomator as u, isRetryableAutomatorLaunchError as v, getConfiguredLocale as w, detectWechatDevtoolsServicePort as x, launchAutomator as y, defaultCustomConfigDirPath as z };
+export { readCustomConfig as $, isAutomatorProtocolTimeoutError as A, getConfiguredLocale as B, configureLocaleFromArgv as C, formatAutomatorLoginError as D, connectOpenedAutomator as E, launchAutomator as F, operatingSystemName as G, SupportedPlatformsMap as H, bootstrapWechatDevtoolsSettings as I, createAutoBootstrapDevtoolsConfig as J, colors as K, detectWechatDevtoolsServicePort as L, isDevtoolsExtensionContextInvalidatedError as M, isDevtoolsHttpPortError as N, getAutomatorProtocolTimeoutMethod as O, isRetryableAutomatorLaunchError as P, overwriteCustomConfig as Q, resolveCliPath as R, waitForExclusiveKeypress as S, validateLocaleOption as T, getDefaultCliPath as U, resolveDevtoolsAutomationDefaults as V, isOperatingSystemSupported as W, createCustomConfig as X, createAutoTrustProjectConfig as Y, createLocaleConfig as Z, promptRetryKeypress as _, releaseSharedMiniProgram as a, createSharedInputSession as b, RETRY_CANCEL_KEYS as c, createWechatIdeLoginRequiredExitError as d, removeCustomConfigKey as et, extractExecutionErrorText as f, isWechatIdeLoginRequiredExitError as g, isWechatIdeLoginRequiredError as h, getSharedMiniProgramSessionCount as i, isAutomatorWsConnectError as j, isAutomatorLoginError as k, RETRY_CONFIRM_KEYS as l, formatWechatIdeLoginRequiredError as m, closeSharedMiniProgram as n, defaultCustomConfigFilePath as nt, withMiniProgram$1 as o, formatRetryHotkeyPrompt as p, logger_default as q, connectMiniProgram as r, resolvePath as rt, runRetryableCommand as s, acquireSharedMiniProgram$1 as t, defaultCustomConfigDirPath as tt, RETRY_PROMPT_INITIAL_IGNORE_MS as u, promptWechatIdeLoginRetry as v, i18nText as w, runWithSuspendedSharedInput as x, waitForRetryKeypress as y, getConfig as z };