weapp-vite 6.17.2 → 6.17.3

package/dist/cli.mjs

@@ -23,7 +23,7 @@ import { generateJs, generateJson, generateWxml, generateWxss } from "@weapp-cor
 import { determineAgent } from "@vercel/detect-agent";
 import { initConfig } from "@weapp-core/init";
 import { createInterface } from "node:readline/promises";
-import { clearTimeout, setTimeout as setTimeout$1 } from "node:timers";
+import { clearTimeout as clearTimeout$1, setTimeout as setTimeout$1 } from "node:timers";
 import net from "node:net";
 //#region src/cli/runtime.ts
 function logRuntimeTarget(targets, options = {}) {
@@ -277,12 +277,28 @@ function logWechatIdeServicePortDisabledHint(projectPath) {
 }
 //#endregion
 //#region src/cli/openIde/reuse.ts
+const OPENED_PROJECT_HEALTH_CHECK_TIMEOUT = 3e3;
 function formatReuseOpenedWechatIdePrompt() {
-	return `目标项目已在微信开发者工具中打开，已跳过重复打开。按 ${colors.bold(colors.green("r"))} 关闭当前窗口后重新打开。`;
+	return `目标项目已在微信开发者工具中打开，已跳过重复打开。按 ${RETRY_CONFIRM_KEYS.map((key) => colors.bold(colors.green(key))).join(" / ")} 关闭当前窗口后重新打开。`;
 }
 function disconnectMiniProgram(miniProgram) {
 	miniProgram.disconnect();
 }
+function withTimeout(task, timeoutMs) {
+	let timer;
+	const timeout = new Promise((_, reject) => {
+		timer = setTimeout(() => {
+			reject(/* @__PURE__ */ new Error(`opened automator health check timed out after ${timeoutMs}ms`));
+		}, timeoutMs);
+	});
+	return Promise.race([task, timeout]).finally(() => {
+		if (timer) clearTimeout(timer);
+	});
+}
+async function verifyOpenedProjectHealth(miniProgram) {
+	if (typeof miniProgram.screenshot !== "function") return;
+	await withTimeout(miniProgram.screenshot({ timeout: OPENED_PROJECT_HEALTH_CHECK_TIMEOUT }), OPENED_PROJECT_HEALTH_CHECK_TIMEOUT);
+}
 async function openWechatIdeByAutomator(projectPath) {
 	disconnectMiniProgram(await launchAutomator({
 		persistAsDefaultSession: true,
@@ -293,13 +309,17 @@ async function openWechatIdeByAutomator(projectPath) {
 	}));
 }
 async function connectOpenedProject(projectPath) {
+	let miniProgram = null;
 	try {
-		return await connectOpenedAutomator({
+		miniProgram = await connectOpenedAutomator({
 			projectPath,
 			port: resolveProjectAutomatorPort(projectPath),
 			timeout: 3e3
 		});
+		await verifyOpenedProjectHealth(miniProgram);
+		return miniProgram;
 	} catch {
+		if (miniProgram) disconnectMiniProgram(miniProgram);
 		return null;
 	}
 }
@@ -444,6 +464,32 @@ async function prepareOpenedWechatIdeAutomatorSession(projectPath, options) {
 		};
 	}
 }
+async function connectOpenedWechatIdeAutomatorSession(projectPath) {
+	try {
+		(await connectOpenedAutomator({
+			projectPath,
+			port: resolveProjectAutomatorPort(projectPath),
+			timeout: PREPARE_AUTOMATOR_SESSION_TIMEOUT
+		})).disconnect?.();
+		return { ok: true };
+	} catch (error) {
+		logger_default.warn("连接当前项目的微信开发者工具自动化会话失败，截图、MCP 或 IDE 联动命令首次运行时将重新连接。");
+		logWechatIdeRecoveryHint({
+			projectPath,
+			reason: "当前项目已完成打开流程，但尚未连接到可复用的自动化会话。"
+		});
+		if (shouldLogAutomatorFallbackError()) logger_default.error(error);
+		return {
+			ok: false,
+			reason: "automator-session-failed",
+			error
+		};
+	}
+}
+async function prepareWechatIdeAutomatorSession(projectPath, options) {
+	if (options.prepareAutomatorSession === "connect-opened") return await connectOpenedWechatIdeAutomatorSession(projectPath);
+	return await prepareOpenedWechatIdeAutomatorSession(projectPath, options);
+}
 async function stabilizeOpenedWechatIdeProject(projectPath, servicePortEnabled, options = {}) {
 	if (servicePortEnabled === false) return {
 		ok: false,
@@ -478,7 +524,7 @@ async function stabilizeOpenedWechatIdeProject(projectPath, servicePortEnabled,
 			if (!isWechatIdeEngineBuildEndpointMissingError(error)) throw error;
 			logger_default.warn("当前微信开发者工具不支持自动 engine build 刷新，已跳过该步骤；如模拟器显示旧状态，可在开发者工具内手动编译。");
 		}
-		if (options.useAutomatorOpen !== false) try {
+		if (options.useAutomatorOpen !== false && options.skipAutomatorCompile !== true) try {
 			await executeWechatIdeCliCommand(appendLoginRetryArgv(["compile"], options), {
 				automatorMode: "require",
 				httpMode: "skip",
@@ -572,7 +618,7 @@ async function openIde(platform, projectPath, options = {}) {
 		if (!await closeIde()) logger_default.warn("关闭当前微信开发者工具失败，仍继续尝试打开目标项目。");
 	}
 	await runWechatIdeOpenWithRetry(createIdeOpenArgv(platform, projectPath, normalizedOptions));
-	if (platform === "weapp" && projectPath && normalizedOptions.prepareAutomatorSession) await prepareOpenedWechatIdeAutomatorSession(projectPath, normalizedOptions);
+	if (platform === "weapp" && projectPath && normalizedOptions.prepareAutomatorSession) await prepareWechatIdeAutomatorSession(projectPath, normalizedOptions);
 	if (platform === "weapp" && projectPath && !normalizedOptions.skipPostOpenHealthCheck) await verifyAndRecoverOpenedWechatIdeProject(platform, projectPath, bootstrapResult?.servicePortEnabled, normalizedOptions);
 }
 /**
@@ -2861,6 +2907,7 @@ const DEFAULT_FORWARD_CONSOLE_LEVELS = [
 	"error"
 ];
 let activeForwardConsoleSession;
+let activeForwardConsoleBridgeOptions;
 const FORWARD_CONSOLE_RETRY_DELAY_MS = 1e3;
 const FORWARD_CONSOLE_RETRY_TIMES = 5;
 async function detectAgent() {
@@ -2975,6 +3022,31 @@ async function startForwardConsoleBridge(options) {
 	});
 }
 /**
+* @description 暂停当前 DevTools 日志桥，并返回恢复函数。
+*/
+async function pauseActiveForwardConsole() {
+	const session = activeForwardConsoleSession;
+	const bridgeOptions = activeForwardConsoleBridgeOptions;
+	if (!session || !bridgeOptions) return;
+	activeForwardConsoleSession = void 0;
+	activeForwardConsoleBridgeOptions = void 0;
+	await session.close();
+	return async () => {
+		if (activeForwardConsoleSession) return true;
+		try {
+			activeForwardConsoleSession = await startForwardConsoleBridge(bridgeOptions);
+			activeForwardConsoleBridgeOptions = bridgeOptions;
+			return true;
+		} catch (error) {
+			activeForwardConsoleSession = void 0;
+			activeForwardConsoleBridgeOptions = void 0;
+			const message = error instanceof Error ? error.message : String(error);
+			logger_default.warn(`[forwardConsole] 恢复失败：${message}`);
+			return false;
+		}
+	};
+}
+/**
 * @description 在 weapp 开发态按需启动控制台转发。
 */
 async function maybeStartForwardConsole(options) {
@@ -2996,10 +3068,12 @@ async function maybeStartForwardConsole(options) {
 	};
 	try {
 		activeForwardConsoleSession = await startForwardConsoleBridge(bridgeOptions);
+		activeForwardConsoleBridgeOptions = bridgeOptions;
 		return true;
 	} catch (error) {
 		if (!isDevtoolsPortNotReadyError(error)) {
 			activeForwardConsoleSession = void 0;
+			activeForwardConsoleBridgeOptions = void 0;
 			const message = error instanceof Error ? error.message : String(error);
 			logger_default.warn(`[forwardConsole] 启动失败，回退到普通 IDE 打开流程：${message}`);
 			return false;
@@ -3010,9 +3084,15 @@ async function maybeStartForwardConsole(options) {
 				openedOnly: true,
 				port: void 0
 			});
+			activeForwardConsoleBridgeOptions = {
+				...bridgeOptions,
+				openedOnly: true,
+				port: void 0
+			};
 			return true;
 		} catch (fallbackError) {
 			activeForwardConsoleSession = void 0;
+			activeForwardConsoleBridgeOptions = void 0;
 			const message = fallbackError instanceof Error ? fallbackError.message : String(fallbackError);
 			logger_default.warn(`[forwardConsole] 启动失败，回退到普通 IDE 打开流程：${message}`);
 			return false;
@@ -3365,7 +3445,7 @@ async function probeHttpEndpoint(url) {
 	} catch {
 		return false;
 	} finally {
-		clearTimeout(timer);
+		clearTimeout$1(timer);
 		controller.abort();
 	}
 }
@@ -3876,7 +3956,7 @@ async function runOpenIdeAction(options) {
 //#endregion
 //#region src/cli/devHotkeys/screenshot.ts
 const DEV_SCREENSHOT_DIR = ".weapp-vite/dev-screenshots";
-const DEFAULT_SCREENSHOT_TIMEOUT = 3e4;
+const DEFAULT_SCREENSHOT_TIMEOUT = 12e4;
 /**
 * @description 生成开发态截图输出路径。
 */
@@ -3892,24 +3972,42 @@ function formatLogPath(cwd, targetPath) {
 function formatResolvedScreenshotPath(cwd, fallbackPath, result) {
 	return formatLogPath(cwd, result.path ?? fallbackPath);
 }
+async function resolveDefaultScreenshotPage(cwd) {
+	try {
+		const raw = await fs$2.readFile(path.join(cwd, "app.json"), "utf8");
+		const appJson = JSON.parse(raw);
+		const [firstPage] = Array.isArray(appJson.pages) ? appJson.pages : [];
+		return typeof firstPage === "string" && firstPage.trim() ? firstPage : void 0;
+	} catch {
+		return;
+	}
+}
 /**
 * @description 执行当前页面截图并输出结果日志。
 */
 async function runScreenshotAction(options) {
 	const outputPath = resolveDevScreenshotOutputPath(options.cwd);
 	await fs$2.mkdir(path.dirname(outputPath), { recursive: true });
+	const page = await resolveDefaultScreenshotPage(options.cwd);
 	logger_default.info(`[dev action] 正在截图当前页面，输出到 ${colors.cyan(formatLogPath(options.cwd, outputPath))}`);
-	const result = await takeScreenshot({
-		fullPage: true,
-		projectPath: options.projectPath,
-		preserveProjectRoot: true,
-		sharedSession: true,
-		outputPath,
-		timeout: DEFAULT_SCREENSHOT_TIMEOUT
-	});
-	const resolvedPath = formatResolvedScreenshotPath(options.cwd, outputPath, result);
-	logger_default.success(`[dev action] 当前页面截图完成：${colors.cyan(resolvedPath)}`);
-	return resolvedPath;
+	const resumeForwardConsole = await pauseActiveForwardConsole();
+	try {
+		const result = await takeScreenshot({
+			projectPath: options.projectPath,
+			fullPage: true,
+			...page ? { page } : {},
+			preserveProjectRoot: true,
+			port: resolveProjectAutomatorPort(options.projectPath),
+			retryWithFreshSession: false,
+			outputPath,
+			timeout: DEFAULT_SCREENSHOT_TIMEOUT
+		});
+		const resolvedPath = formatResolvedScreenshotPath(options.cwd, outputPath, result);
+		logger_default.success(`[dev action] 当前页面截图完成：${colors.cyan(resolvedPath)}`);
+		return resolvedPath;
+	} finally {
+		await resumeForwardConsole?.();
+	}
 }
 //#endregion
 //#region src/cli/devHotkeys/actions.ts
@@ -4024,7 +4122,7 @@ function resolveRunnableHotkeyDefinition(input) {
 }
 //#endregion
 //#region package.json
-var version = "6.17.2";
+var version = "6.17.3";
 //#endregion
 //#region src/cli/devHotkeys/format.ts
 const FULLWIDTH_ASCII_START = 65281;
@@ -4640,6 +4738,12 @@ function createAnalyzeController(options) {
 }
 //#endregion
 //#region src/cli/commands/serve/shared.ts
+function startBackgroundForwardConsoleReuse(tryReuseForwardConsole) {
+	if (!tryReuseForwardConsole) return;
+	try {
+		tryReuseForwardConsole().catch(() => {});
+	} catch {}
+}
 function resolveWebHost(host) {
 	if (host === void 0) return;
 	if (typeof host === "boolean") return host;
@@ -4656,7 +4760,7 @@ function createServeMiniProgramDevActions(options) {
 		openIde: async (openOptions = {}) => {
 			if (!openOptions.forceOpen && await options.tryReuseForwardConsole?.()) return "已通过控制台转发复用当前开发者工具会话";
 			await options.openIde(projectPath, openOptions);
-			await options.tryReuseForwardConsole?.();
+			startBackgroundForwardConsoleReuse(options.tryReuseForwardConsole);
 			return openOptions.forceReopen ? "已重新打开微信开发者工具项目" : "已打开或复用微信开发者工具项目";
 		},
 		rebuild: async () => {
@@ -4724,6 +4828,7 @@ function registerServeCommand(cli) {
 			configFile,
 			inlineConfig,
 			cliPlatform: targets.rawPlatform,
+			preloadAppEntry: false,
 			projectConfigPath: options.projectConfig
 		});
 		const { buildService, configService, webService } = ctx;
@@ -4738,16 +4843,18 @@ function registerServeCommand(cli) {
 			},
 			fallbackProjectPath: configService.cwd,
 			openIde: async (projectPath, openOptions) => {
+				const forceReopen = openOptions?.forceReopen === true;
 				await openIde(configService.platform, projectPath, {
 					loginRetry: options.loginRetry,
 					loginRetryTimeout: options.loginRetryTimeout,
 					nonInteractive: options.nonInteractive,
 					openRecovery: false,
-					prepareAutomatorSession: true,
-					reuseOpenedProject: !openOptions?.forceReopen,
+					prepareAutomatorSession: forceReopen ? true : "connect-opened",
+					reuseOpenedProject: !forceReopen,
+					skipAutomatorCompile: !forceReopen,
 					skipPostOpenHealthCheck: true,
 					trustProject: options.trustProject,
-					useAutomatorOpen: true
+					useAutomatorOpen: forceReopen
 				});
 				writePostOpenSeparator();
 			},

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "weapp-vite",
   "type": "module",
-  "version": "6.17.2",
+  "version": "6.17.3",
   "description": "weapp-vite 一个现代化的小程序打包工具",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -111,30 +111,30 @@
     "pathe": "^2.0.3",
     "picomatch": "^4.0.4",
     "postcss": "^8.5.15",
-    "rolldown": "1.1.2",
+    "rolldown": "1.1.3",
     "rolldown-plugin-dts": "0.26.0",
     "semver": "^7.8.5",
     "typescript": "^6.0.3",
-    "vite": "8.0.16",
+    "vite": "8.1.0",
     "vite-tsconfig-paths": "^6.1.1",
     "vue": "^3.5.38",
     "vue-tsc": "^3.3.5",
+    "@weapp-core/constants": "0.1.12",
     "@weapp-core/init": "6.0.11",
     "@weapp-core/logger": "3.1.1",
     "@weapp-core/schematics": "6.0.4",
-    "@weapp-core/constants": "0.1.12",
     "@weapp-core/shared": "3.0.5",
-    "@weapp-vite/ast": "6.17.2",
+    "@weapp-vite/ast": "6.17.3",
     "@weapp-vite/mcp": "1.4.6",
-    "@weapp-vite/volar": "2.1.0",
     "@weapp-vite/miniprogram-automator": "1.2.5",
+    "@weapp-vite/volar": "2.1.0",
     "@weapp-vite/web": "1.3.33",
     "@wevu/api": "0.2.11",
     "@wevu/web-apis": "1.2.25",
     "rolldown-require": "2.0.19",
     "vite-plugin-performance": "2.0.1",
-    "weapp-ide-cli": "5.4.9",
-    "wevu": "6.17.2"
+    "weapp-ide-cli": "5.4.10",
+    "wevu": "6.17.3"
   },
   "publishConfig": {
     "access": "public",