weapp-ide-cli 5.2.5 → 5.2.6

package/dist/{cli-D7gUmbTG.js → cli-lB9HDuk-.js}

@@ -7,6 +7,7 @@ import { PNG } from "pngjs";
 import pixelmatch from "pixelmatch";
 import { createInterface } from "node:readline/promises";
 import { emitKeypressEvents } from "node:readline";
+import { execa } from "execa";
 import { inspect } from "node:util";
 import { cac } from "cac";
 //#region src/cli/automator-argv.ts
@@ -1231,6 +1232,9 @@ function createEngineBuildError(message, code) {
 	error.code = code;
 	return error;
 }
+const ENGINE_BUILD_ENDPOINT_MISSING_PATTERNS = [/Cannot GET \/engine\/build\b/i, /Cannot GET \/engine\/buildResult\//i];
+const ENGINE_BUILD_CLI_OPENED_PATTERN = /打开项目成功|project\s+opened|open\s+project\s+success/i;
+const COMPACT_WHITESPACE_PATTERN = /\s+/g;
 function sleep(ms) {
 	return new Promise((resolve) => setTimeout(resolve, ms));
 }
@@ -1259,6 +1263,38 @@ async function writeEngineBuildLog(logPath, content) {
 	const filePath = await resolveEngineBuildLogFilePath(logPath);
 	await fs.writeFile(filePath, content, "utf8");
 }
+function isEngineBuildEndpointMissingError(error) {
+	const message = error instanceof Error ? error.message : String(error);
+	return ENGINE_BUILD_ENDPOINT_MISSING_PATTERNS.some((pattern) => pattern.test(message));
+}
+function compactOutput(value) {
+	return typeof value === "string" ? value.replace(COMPACT_WHITESPACE_PATTERN, " ").trim() : "";
+}
+async function runWechatIdeEngineBuildByCli(projectPath, options = {}) {
+	const { cliPath } = await resolveCliPath();
+	if (!cliPath) throw createEngineBuildError("WECHAT_DEVTOOLS_CLI_NOT_FOUND", "WECHAT_DEVTOOLS_CLI_NOT_FOUND");
+	const result = await execa(cliPath, [
+		"engine",
+		"build",
+		path.resolve(projectPath)
+	], {
+		reject: false,
+		timeout: options.overallTimeoutMs ?? 12e4
+	});
+	const stdout = typeof result.stdout === "string" ? result.stdout : "";
+	const stderr = typeof result.stderr === "string" ? result.stderr : "";
+	const output = [stdout, stderr].filter(Boolean).join("\n");
+	await writeEngineBuildLog(options.logPath, output);
+	if ((result.exitCode ?? 1) === 0) {
+		if (stdout) process.stdout.write(stdout);
+		if (stderr) process.stderr.write(stderr);
+		return;
+	}
+	if (ENGINE_BUILD_CLI_OPENED_PATTERN.test(output)) return;
+	if (stdout) process.stdout.write(stdout);
+	if (stderr) process.stderr.write(stderr);
+	throw createEngineBuildError(compactOutput(stderr) || compactOutput(stdout) || `WECHAT_DEVTOOLS_ENGINE_BUILD_CLI_FAILED:${result.exitCode ?? 1}`, "WECHAT_DEVTOOLS_ENGINE_BUILD_CLI_FAILED");
+}
 /**
 * @description 通过开发者工具 HTTP 服务端口执行 engine build，并轮询直到构建结束。
 */
@@ -1294,6 +1330,7 @@ async function runWechatIdeEngineBuild(projectPath, options = {}) {
 		await writeEngineBuildLog(options.logPath, logs.join("\n"));
 		return result;
 	} catch (error) {
+		if (isEngineBuildEndpointMissingError(error)) return await runWechatIdeEngineBuildByCli(projectPath, options);
 		logs.push(error instanceof Error ? error.message : String(error));
 		await writeEngineBuildLog(options.logPath, logs.join("\n"));
 		throw error;
@@ -1762,6 +1799,22 @@ async function runWechatCliWithRetry(cliPath, argv) {
 function shouldBootstrapWechatDevtools(command) {
 	return command === "open" || command === "auto" || command === "auto-preview";
 }
+function appendOptionValue(argv, sourceArgv, optionName) {
+	const value = readOptionValue(sourceArgv, optionName);
+	if (value !== void 0) argv.push(optionName, value);
+}
+function createAutoPreviewWakeArgv(argv, trustProject) {
+	if (argv[0] !== "auto-preview") return;
+	const projectPath = readOptionValue(argv, "--project");
+	const appid = readOptionValue(argv, "--appid");
+	if (!projectPath && !appid) return;
+	const wakeArgv = ["open"];
+	appendOptionValue(wakeArgv, argv, "--project");
+	appendOptionValue(wakeArgv, argv, "--appid");
+	appendOptionValue(wakeArgv, argv, "--ext-appid");
+	if (trustProject === true) wakeArgv.push("--trust-project");
+	return wakeArgv;
+}
 function resolveBooleanCliOption(argv, optionName) {
 	if (argv.includes(optionName)) return true;
 	const rawValue = readOptionValue(argv, optionName);
@@ -1783,10 +1836,12 @@ async function maybeBootstrapWechatDevtoolsSettings(argv) {
 	if (config.autoBootstrapDevtools === false) return;
 	const projectPath = readOptionValue(argv, "--project");
 	const trustProjectOption = resolveBooleanCliOption(argv, "--trust-project");
+	const trustProject = trustProjectOption === void 0 ? config.autoTrustProject ?? false : trustProjectOption;
 	await bootstrapWechatDevtoolsSettings({
 		projectPath,
-		trustProject: trustProjectOption === void 0 ? config.autoTrustProject ?? false : trustProjectOption
+		trustProject
 	});
+	return { trustProject };
 }
 /**
 * @description 执行微信开发者工具 CLI 阶段，包括环境检查、路径解析、bootstrap 与登录重试。
@@ -1801,7 +1856,8 @@ async function runWechatCliCommand(argv) {
 		await handleMissingCliPath(source);
 		return;
 	}
-	await maybeBootstrapWechatDevtoolsSettings(argv);
+	const wakeArgv = createAutoPreviewWakeArgv(argv, (await maybeBootstrapWechatDevtoolsSettings(argv))?.trustProject);
+	if (wakeArgv) await runWechatCliWithRetry(cliPath, wakeArgv);
 	await runWechatCliWithRetry(cliPath, argv);
 }
 //#endregion

package/dist/cli.js

@@ -1,5 +1,5 @@
 import { q as logger_default } from "./commands-XD_wemcg.js";
-import { n as parse } from "./cli-D7gUmbTG.js";
+import { n as parse } from "./cli-lB9HDuk-.js";
 import process from "node:process";
 //#region src/cli.ts
 const argv = process.argv.slice(2);

package/dist/index.d.ts

@@ -1,8 +1,8 @@
 import { Buffer } from "node:buffer";
 import * as _$_weapp_vite_miniprogram_automator0 from "@weapp-vite/miniprogram-automator";
 import { Element, MiniProgram, Page } from "@weapp-vite/miniprogram-automator";
-import * as _$cac from "cac";
 import * as _$execa from "execa";
+import * as _$cac from "cac";
 
 //#region src/cli/automator.d.ts
 interface AutomatorOptions {
@@ -316,7 +316,7 @@ declare function runWechatIdeEngineBuildByHttp(projectPath: string, options?: Ru
 /**
  * @description 以更接近官方 CLI 的方式执行 engine build，并支持将构建日志写入文件。
  */
-declare function runWechatIdeEngineBuild(projectPath: string, options?: RunWechatIdeEngineBuildOptions): Promise<PollWechatIdeEngineBuildResult>;
+declare function runWechatIdeEngineBuild(projectPath: string, options?: RunWechatIdeEngineBuildOptions): Promise<void | PollWechatIdeEngineBuildResult>;
 //#endregion
 //#region src/cli/forwardConsole.d.ts
 type ForwardConsoleLogLevel = 'debug' | 'log' | 'info' | 'warn' | 'error';
@@ -480,12 +480,12 @@ declare function runWechatCliWithRetry(cliPath: string, argv: string[]): Promise
 //#endregion
 //#region src/cli/run-login-executor.d.ts
 interface RetryableCommandExecutorOptions<TResult, TPromptResult> {
-  createCancelError: (error: unknown) => Error;
+  createCancelError: (result: TResult) => Error;
   execute: () => Promise<TResult>;
   isRetryableResult: (result: TResult) => boolean;
-  onCancel?: (error: unknown) => void;
+  onCancel?: (result: TResult) => void;
   onRetry?: () => void;
-  promptRetry: (error: unknown, retryCount: number) => Promise<TPromptResult>;
+  promptRetry: (result: TResult, retryCount: number) => Promise<TPromptResult>;
   shouldRetry: (result: TPromptResult) => boolean;
 }
 /**

package/dist/index.js

@@ -1,3 +1,3 @@
 import { $ as readCustomConfig, A as isAutomatorProtocolTimeoutError, B as getConfiguredLocale, D as formatAutomatorLoginError, E as connectOpenedAutomator, F as launchAutomator, G as operatingSystemName, H as SupportedPlatformsMap, I as bootstrapWechatDevtoolsSettings, J as createAutoBootstrapDevtoolsConfig, L as detectWechatDevtoolsServicePort, M as isDevtoolsExtensionContextInvalidatedError, N as isDevtoolsHttpPortError, O as getAutomatorProtocolTimeoutMethod, P as isRetryableAutomatorLaunchError, Q as overwriteCustomConfig, R as resolveCliPath, S as withMiniProgram, U as getDefaultCliPath, V as resolveDevtoolsAutomationDefaults, W as isOperatingSystemSupported, X as createCustomConfig, Y as createAutoTrustProjectConfig, Z as createLocaleConfig, _ as acquireSharedMiniProgram, a as navigateBack, b as getSharedMiniProgramSessionCount, c as pageStack, d as remote, et as removeCustomConfigKey, f as scrollTo, g as tap, h as takeScreenshot, i as input, j as isAutomatorWsConnectError, k as isAutomatorLoginError, l as reLaunch, m as systemInfo, n as captureScreenshotBuffer, nt as defaultCustomConfigFilePath, o as navigateTo, p as switchTab, r as currentPage, rt as resolvePath, s as pageData, t as audit, tt as defaultCustomConfigDirPath, u as redirectTo, v as closeSharedMiniProgram, x as releaseSharedMiniProgram, y as connectMiniProgram, z as getConfig } from "./commands-XD_wemcg.js";
-import { $ as resetWechatIdeFileUtilsByHttp, A as RETRY_CANCEL_KEYS, B as waitForRetryKeypress, C as refreshWechatIdeTicket, D as validateWechatCliCommandArgs, E as uploadWechatIde, F as formatRetryHotkeyPrompt, G as transformArgv, H as execute, I as formatWechatIdeLoginRequiredError, J as runWechatIdeEngineBuildByHttp, K as startForwardConsole, L as isWechatIdeLoginRequiredError, M as RETRY_PROMPT_INITIAL_IGNORE_MS, N as createWechatIdeLoginRequiredExitError, O as runWechatCliWithRetry, P as extractExecutionErrorText, Q as requestWechatDevtoolsHttp, R as promptRetryKeypress, S as quitWechatIde, St as removeOption, T as setWechatIdeTicket, U as createAlias, V as runMinidev, W as createPathCompat, X as openWechatIdeProjectByHttp, Y as WECHAT_DEVTOOLS_ENGINE_BUILD_STATUSES, Z as pollWechatIdeEngineBuildResultByHttp, _ as isWechatIdeLoggedIn, _t as parseCompareArgs, a as autoReplayWechatIde, at as waitForExclusiveKeypress, b as openWechatIdeOtherProject, bt as readBooleanOption, c as buildWechatIdeIpa, ct as WEAPP_IDE_TOP_LEVEL_COMMAND_NAMES, d as clearWechatIdeCacheByAutomator, dt as AUTOMATOR_COMMAND_NAMES, et as startWechatIdeEngineBuildByHttp, f as closeWechatIdeProject, ft as getAutomatorCommandHelp, g as getWechatIdeToolInfo, gt as printScreenshotHelp, h as getWechatIdeTicket, ht as parseScreenshotArgs, i as autoPreviewWechatIde, it as runWithSuspendedSharedInput, j as RETRY_CONFIRM_KEYS, k as runRetryableCommand, l as buildWechatIdeNpm, lt as WECHAT_CLI_COMMAND_NAMES, m as getWechatIdeTestAccounts, mt as runAutomatorCommand, n as parse, nt as promptForCliPath, o as autoWechatIde, ot as CONFIG_COMMAND_NAME, p as compileWechatIdeByAutomator, pt as isAutomatorCommand, q as runWechatIdeEngineBuild, r as dispatchWechatCliCommand, rt as createSharedInputSession, s as buildWechatIdeApk, st as MINIDEV_NAMESPACE_COMMAND_NAMES, t as createCli, tt as handleConfigCommand, u as clearWechatIdeCache, ut as isWeappIdeTopLevelCommand, v as loginWechatIde, vt as printCompareHelp, w as resetWechatIdeFileUtils, x as previewWechatIde, xt as readOptionValue, y as openWechatIde, yt as parseAutomatorArgs, z as promptWechatIdeLoginRetry } from "./cli-D7gUmbTG.js";
+import { $ as resetWechatIdeFileUtilsByHttp, A as RETRY_CANCEL_KEYS, B as waitForRetryKeypress, C as refreshWechatIdeTicket, D as validateWechatCliCommandArgs, E as uploadWechatIde, F as formatRetryHotkeyPrompt, G as transformArgv, H as execute, I as formatWechatIdeLoginRequiredError, J as runWechatIdeEngineBuildByHttp, K as startForwardConsole, L as isWechatIdeLoginRequiredError, M as RETRY_PROMPT_INITIAL_IGNORE_MS, N as createWechatIdeLoginRequiredExitError, O as runWechatCliWithRetry, P as extractExecutionErrorText, Q as requestWechatDevtoolsHttp, R as promptRetryKeypress, S as quitWechatIde, St as removeOption, T as setWechatIdeTicket, U as createAlias, V as runMinidev, W as createPathCompat, X as openWechatIdeProjectByHttp, Y as WECHAT_DEVTOOLS_ENGINE_BUILD_STATUSES, Z as pollWechatIdeEngineBuildResultByHttp, _ as isWechatIdeLoggedIn, _t as parseCompareArgs, a as autoReplayWechatIde, at as waitForExclusiveKeypress, b as openWechatIdeOtherProject, bt as readBooleanOption, c as buildWechatIdeIpa, ct as WEAPP_IDE_TOP_LEVEL_COMMAND_NAMES, d as clearWechatIdeCacheByAutomator, dt as AUTOMATOR_COMMAND_NAMES, et as startWechatIdeEngineBuildByHttp, f as closeWechatIdeProject, ft as getAutomatorCommandHelp, g as getWechatIdeToolInfo, gt as printScreenshotHelp, h as getWechatIdeTicket, ht as parseScreenshotArgs, i as autoPreviewWechatIde, it as runWithSuspendedSharedInput, j as RETRY_CONFIRM_KEYS, k as runRetryableCommand, l as buildWechatIdeNpm, lt as WECHAT_CLI_COMMAND_NAMES, m as getWechatIdeTestAccounts, mt as runAutomatorCommand, n as parse, nt as promptForCliPath, o as autoWechatIde, ot as CONFIG_COMMAND_NAME, p as compileWechatIdeByAutomator, pt as isAutomatorCommand, q as runWechatIdeEngineBuild, r as dispatchWechatCliCommand, rt as createSharedInputSession, s as buildWechatIdeApk, st as MINIDEV_NAMESPACE_COMMAND_NAMES, t as createCli, tt as handleConfigCommand, u as clearWechatIdeCache, ut as isWeappIdeTopLevelCommand, v as loginWechatIde, vt as printCompareHelp, w as resetWechatIdeFileUtils, x as previewWechatIde, xt as readOptionValue, y as openWechatIde, yt as parseAutomatorArgs, z as promptWechatIdeLoginRetry } from "./cli-lB9HDuk-.js";
 export { AUTOMATOR_COMMAND_NAMES, CONFIG_COMMAND_NAME, MINIDEV_NAMESPACE_COMMAND_NAMES, RETRY_CANCEL_KEYS, RETRY_CONFIRM_KEYS, RETRY_PROMPT_INITIAL_IGNORE_MS, SupportedPlatformsMap, WEAPP_IDE_TOP_LEVEL_COMMAND_NAMES, WECHAT_CLI_COMMAND_NAMES, WECHAT_DEVTOOLS_ENGINE_BUILD_STATUSES, acquireSharedMiniProgram, audit, autoPreviewWechatIde, autoReplayWechatIde, autoWechatIde, bootstrapWechatDevtoolsSettings, buildWechatIdeApk, buildWechatIdeIpa, buildWechatIdeNpm, captureScreenshotBuffer, clearWechatIdeCache, clearWechatIdeCacheByAutomator, closeSharedMiniProgram, closeWechatIdeProject, compileWechatIdeByAutomator, connectMiniProgram, connectOpenedAutomator, createAlias, createAutoBootstrapDevtoolsConfig, createAutoTrustProjectConfig, createCli, createCustomConfig, createLocaleConfig, createPathCompat, createSharedInputSession, createWechatIdeLoginRequiredExitError, currentPage, defaultCustomConfigDirPath, defaultCustomConfigFilePath, detectWechatDevtoolsServicePort, dispatchWechatCliCommand, execute, extractExecutionErrorText, formatAutomatorLoginError, formatRetryHotkeyPrompt, formatWechatIdeLoginRequiredError, getAutomatorCommandHelp, getAutomatorProtocolTimeoutMethod, getConfig, getConfiguredLocale, getDefaultCliPath, getSharedMiniProgramSessionCount, getWechatIdeTestAccounts, getWechatIdeTicket, getWechatIdeToolInfo, handleConfigCommand, input, isAutomatorCommand, isAutomatorLoginError, isAutomatorProtocolTimeoutError, isAutomatorWsConnectError, isDevtoolsExtensionContextInvalidatedError, isDevtoolsHttpPortError, isOperatingSystemSupported, isRetryableAutomatorLaunchError, isWeappIdeTopLevelCommand, isWechatIdeLoggedIn, isWechatIdeLoginRequiredError, launchAutomator, loginWechatIde, navigateBack, navigateTo, openWechatIde, openWechatIdeOtherProject, openWechatIdeProjectByHttp, operatingSystemName, overwriteCustomConfig, pageData, pageStack, parse, parseAutomatorArgs, parseCompareArgs, parseScreenshotArgs, pollWechatIdeEngineBuildResultByHttp, previewWechatIde, printCompareHelp, printScreenshotHelp, promptForCliPath, promptRetryKeypress, promptWechatIdeLoginRetry, quitWechatIde, reLaunch, readBooleanOption, readCustomConfig, readOptionValue, redirectTo, refreshWechatIdeTicket, releaseSharedMiniProgram, remote, removeCustomConfigKey, removeOption, requestWechatDevtoolsHttp, resetWechatIdeFileUtils, resetWechatIdeFileUtilsByHttp, resolveCliPath, resolveDevtoolsAutomationDefaults, resolvePath, runAutomatorCommand, runMinidev, runRetryableCommand, runWechatCliWithRetry, runWechatIdeEngineBuild, runWechatIdeEngineBuildByHttp, runWithSuspendedSharedInput, scrollTo, setWechatIdeTicket, startForwardConsole, startWechatIdeEngineBuildByHttp, switchTab, systemInfo, takeScreenshot, tap, transformArgv, uploadWechatIde, validateWechatCliCommandArgs, waitForExclusiveKeypress, waitForRetryKeypress, withMiniProgram };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "weapp-ide-cli",
   "type": "module",
-  "version": "5.2.5",
+  "version": "5.2.6",
   "description": "让微信开发者工具，用起来更加方便！",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -67,9 +67,9 @@
     "pathe": "^2.0.3",
     "pixelmatch": "^7.1.0",
     "pngjs": "^7.0.0",
+    "@weapp-core/logger": "^3.1.1",
     "@weapp-core/shared": "^3.0.4",
-    "@weapp-vite/miniprogram-automator": "1.0.4",
-    "@weapp-core/logger": "^3.1.1"
+    "@weapp-vite/miniprogram-automator": "1.0.4"
   },
   "scripts": {
     "dev": "tsdown -w --sourcemap",