weapp-ide-cli 5.0.3 → 5.0.4

package/README.md

@@ -110,10 +110,27 @@ weapp config
 2. 首次运行前可通过 `weapp config` 写入 CLI 路径，也可在 CI 中直接向 `~/.weapp-ide-cli/config.json` 写入。
 3. 在自动化流程中建议加上 `--qr-output`、`--result-output` 等参数，以便收集产物或日志。
 
+推荐在 CI 或非交互脚本里显式启用非交互模式，避免登录失效时卡在按键等待：
+
+```sh
+weapp build-npm -p --non-interactive
+```
+
+登录重试相关参数：
+
+- `--non-interactive`：非交互模式，登录失效时直接失败（退出码语义保留为 `10`）。
+- `--login-retry=never|once|always`：控制登录失效后的重试策略。
+- `--login-retry-timeout=<ms>`：交互重试等待超时（默认 `30000`）。
+
+当检测到以下场景时，会自动启用非交互模式：
+
+- `CI=true`
+- `stdin` 非 TTY
+
 ## 常见问题
 
 - **命令执行后无反应**：请确认微信开发者工具已开启服务端口，并尝试重新登录或升级工具版本。
-- **提示 `需要重新登录` 或 `code: 10`**：表示微信开发者工具登录态失效。请先在工具内完成登录，再回到终端按 `r` 重试；按 `q`、`Esc` 或 `Ctrl+C` 可取消本次命令。
+- **提示 `需要重新登录` 或 `code: 10`**：表示微信开发者工具登录态失效。交互模式下可按 `r` 重试，按 `q`、`Esc` 或 `Ctrl+C` 取消；非交互模式（含 CI / 非TTY）会直接失败返回非 0。
 - **提示未找到 CLI**：检查配置文件中的路径是否真实存在，可使用绝对路径避免解析误差。
 - **Linux 环境报错**：需安装社区版工具并将 `wechat-devtools-cli` 加入 `PATH`，否则只能手动指定路径。
 

package/dist/{chunk-A26E3I4U.js → chunk-QTQD5BFV.js}

@@ -328,6 +328,16 @@ function formatWechatIdeLoginRequiredError(error) {
   }
   return lines.join("\n");
 }
+function createWechatIdeLoginRequiredExitError(error, reason) {
+  const summary = formatWechatIdeLoginRequiredError(error);
+  const message = reason ? `${reason}
+${summary}` : summary;
+  const loginError = new Error(message);
+  loginError.name = "WechatIdeLoginRequiredError";
+  loginError.code = 10;
+  loginError.exitCode = 10;
+  return loginError;
+}
 function extractLoginRequiredMessage(text) {
   if (!text) {
     return "";
@@ -345,9 +355,10 @@ function extractLoginRequiredMessage(text) {
   }
   return firstLine.replace(/^\[error\]\s*/i, "").replace(/^error\s*:\s*/i, "").slice(0, 120);
 }
-async function waitForRetryKeypress() {
+async function waitForRetryKeypress(options = {}) {
+  const { timeoutMs = 3e4 } = options;
   if (!process5.stdin.isTTY) {
-    return false;
+    return "cancel";
   }
   emitKeypressEvents(process5.stdin);
   const hasSetRawMode = typeof process5.stdin.setRawMode === "function";
@@ -356,7 +367,13 @@ async function waitForRetryKeypress() {
   }
   process5.stdin.resume();
   return new Promise((resolve) => {
+    let settled = false;
+    const normalizedTimeoutMs = Number.isFinite(timeoutMs) && timeoutMs > 0 ? timeoutMs : 3e4;
+    const timeout = setTimeout(() => {
+      done("timeout");
+    }, normalizedTimeoutMs);
     const cleanup = () => {
+      clearTimeout(timeout);
       process5.stdin.off("keypress", onKeypress);
       if (hasSetRawMode) {
         process5.stdin.setRawMode(false);
@@ -364,6 +381,10 @@ async function waitForRetryKeypress() {
       process5.stdin.pause();
     };
     const done = (value) => {
+      if (settled) {
+        return;
+      }
+      settled = true;
       cleanup();
       resolve(value);
     };
@@ -372,23 +393,24 @@ async function waitForRetryKeypress() {
         return;
       }
       if (key.ctrl && key.name === "c") {
-        done(false);
+        done("cancel");
         return;
       }
       if (key.name === "r") {
-        done(true);
+        done("retry");
         return;
       }
       if (key.name === "q" || key.name === "escape") {
-        done(false);
+        done("cancel");
       }
     };
     process5.stdin.on("keypress", onKeypress);
   });
 }
-function formatRetryHotkeyPrompt() {
+function formatRetryHotkeyPrompt(timeoutMs = 3e4) {
   const highlight = (key) => highlightHotkey(key);
-  return `\u6309 ${highlight("r")} \u91CD\u8BD5\uFF0C\u6309 ${highlight("q")} / ${highlight("Esc")} / ${highlight("Ctrl+C")} \u9000\u51FA\u3002`;
+  const timeoutSeconds = Math.max(1, Math.ceil(timeoutMs / 1e3));
+  return `\u6309 ${highlight("r")} \u91CD\u8BD5\uFF0C\u6309 ${highlight("q")} / ${highlight("Esc")} / ${highlight("Ctrl+C")} \u9000\u51FA\uFF08${timeoutSeconds}s \u5185\u65E0\u8F93\u5165\u5C06\u81EA\u52A8\u5931\u8D25\uFF09\u3002`;
 }
 function highlightHotkey(key) {
   return colors.bold(colors.green(key));
@@ -398,6 +420,9 @@ function highlightHotkey(key) {
 import process6 from "process";
 var MINIDEV_NAMESPACE = /* @__PURE__ */ new Set(["alipay", "ali", "minidev"]);
 var ALIPAY_PLATFORM_ALIASES = /* @__PURE__ */ new Set(["alipay", "ali", "minidev"]);
+function isStdinInteractive() {
+  return Boolean(process6.stdin && process6.stdin.isTTY);
+}
 var ARG_TRANSFORMS = [
   createAlias({ find: "-p", replacement: "--project" }),
   createPathCompat("--result-output"),
@@ -414,8 +439,10 @@ async function parse(argv) {
     return;
   }
   const formattedArgv = transformArgv(argv, ARG_TRANSFORMS);
-  if (shouldDelegateOpenToMinidev(formattedArgv)) {
-    await runMinidev(createMinidevOpenArgv(formattedArgv));
+  const loginRetryOptions = resolveLoginRetryOptions(formattedArgv);
+  const runtimeArgv = stripLoginRetryControlFlags(formattedArgv);
+  if (shouldDelegateOpenToMinidev(runtimeArgv)) {
+    await runMinidev(createMinidevOpenArgv(runtimeArgv));
     return;
   }
   if (!isOperatingSystemSupported(operatingSystemName)) {
@@ -433,11 +460,11 @@ async function parse(argv) {
     await promptForCliPath();
     return;
   }
-  await runWechatCliWithRetry(cliPath, formattedArgv);
+  await runWechatCliWithRetry(cliPath, runtimeArgv, loginRetryOptions);
 }
-async function runWechatCliWithRetry(cliPath, argv) {
-  let retrying = true;
-  while (retrying) {
+async function runWechatCliWithRetry(cliPath, argv, options) {
+  let retryCount = 0;
+  while (true) {
     try {
       const result = await execute(cliPath, argv, {
         pipeStdout: false,
@@ -447,31 +474,96 @@ async function runWechatCliWithRetry(cliPath, argv) {
         flushExecutionOutput(result);
         return;
       }
-      retrying = await promptLoginRetry(result);
-      if (retrying) {
+      const action = await promptLoginRetry(result, options, retryCount);
+      if (action === "retry") {
+        retryCount += 1;
         logger_default.info("\u6B63\u5728\u91CD\u8BD5\u8FDE\u63A5\u5FAE\u4FE1\u5F00\u53D1\u8005\u5DE5\u5177...");
+        continue;
       }
+      throw createWechatIdeLoginRequiredExitError(result);
     } catch (error) {
       if (!isWechatIdeLoginRequiredError(error)) {
         throw error;
       }
-      retrying = await promptLoginRetry(error);
-      if (retrying) {
+      const action = await promptLoginRetry(error, options, retryCount);
+      if (action === "retry") {
+        retryCount += 1;
         logger_default.info("\u6B63\u5728\u91CD\u8BD5\u8FDE\u63A5\u5FAE\u4FE1\u5F00\u53D1\u8005\u5DE5\u5177...");
+        continue;
       }
+      throw createWechatIdeLoginRequiredExitError(error);
     }
   }
 }
-async function promptLoginRetry(errorLike) {
+async function promptLoginRetry(errorLike, options, retryCount) {
+  const {
+    nonInteractive,
+    retryMode,
+    retryTimeoutMs
+  } = options;
   logger_default.error("\u68C0\u6D4B\u5230\u5FAE\u4FE1\u5F00\u53D1\u8005\u5DE5\u5177\u767B\u5F55\u72B6\u6001\u5931\u6548\uFF0C\u8BF7\u5148\u767B\u5F55\u540E\u91CD\u8BD5\u3002");
   logger_default.warn("\u8BF7\u5148\u6253\u5F00\u5FAE\u4FE1\u5F00\u53D1\u8005\u5DE5\u5177\u5B8C\u6210\u767B\u5F55\u3002");
   logger_default.warn(formatWechatIdeLoginRequiredError(errorLike));
-  logger_default.info(formatRetryHotkeyPrompt());
-  const shouldRetry = await waitForRetryKeypress();
-  if (!shouldRetry) {
+  if (nonInteractive) {
+    logger_default.error("\u5F53\u524D\u4E3A\u975E\u4EA4\u4E92\u6A21\u5F0F\uFF0C\u68C0\u6D4B\u5230\u767B\u5F55\u5931\u6548\u540E\u76F4\u63A5\u5931\u8D25\u3002");
+    return "cancel";
+  }
+  const shouldAllowRetry = retryMode === "always" || retryMode === "once" && retryCount < 1;
+  if (!shouldAllowRetry) {
+    logger_default.info("\u5F53\u524D\u91CD\u8BD5\u7B56\u7565\u4E0D\u5141\u8BB8\u7EE7\u7EED\u91CD\u8BD5\u3002");
+    return "cancel";
+  }
+  logger_default.info(formatRetryHotkeyPrompt(retryTimeoutMs));
+  const action = await waitForRetryKeypress({ timeoutMs: retryTimeoutMs });
+  if (action === "timeout") {
+    logger_default.error(`\u7B49\u5F85\u767B\u5F55\u91CD\u8BD5\u8F93\u5165\u8D85\u65F6\uFF08${retryTimeoutMs}ms\uFF09\uFF0C\u5DF2\u81EA\u52A8\u53D6\u6D88\u3002`);
+    return "cancel";
+  }
+  if (action !== "retry") {
     logger_default.info("\u5DF2\u53D6\u6D88\u91CD\u8BD5\u3002\u5B8C\u6210\u767B\u5F55\u540E\u8BF7\u91CD\u65B0\u6267\u884C\u5F53\u524D\u547D\u4EE4\u3002");
+    return "cancel";
   }
-  return shouldRetry;
+  return "retry";
+}
+function resolveLoginRetryOptions(argv) {
+  const nonInteractiveFlag = readBooleanFlag(argv, "--non-interactive");
+  const ciMode = process6.env.CI === "true";
+  const nonTtyStdin = !isStdinInteractive();
+  const nonInteractive = nonInteractiveFlag || ciMode || nonTtyStdin;
+  const retryModeRaw = readOptionValue(argv, "--login-retry");
+  const retryMode = normalizeLoginRetryMode(retryModeRaw, nonInteractive);
+  const retryTimeoutRaw = readOptionValue(argv, "--login-retry-timeout");
+  const retryTimeoutMs = normalizeLoginRetryTimeout(retryTimeoutRaw);
+  return {
+    nonInteractive,
+    retryMode,
+    retryTimeoutMs
+  };
+}
+function normalizeLoginRetryMode(value, nonInteractive) {
+  if (value === "never" || value === "once" || value === "always") {
+    return value;
+  }
+  return nonInteractive ? "never" : "always";
+}
+function normalizeLoginRetryTimeout(value) {
+  if (!value) {
+    return 3e4;
+  }
+  const parsed = Number.parseInt(value, 10);
+  if (!Number.isFinite(parsed) || parsed <= 0) {
+    return 3e4;
+  }
+  return parsed;
+}
+function readBooleanFlag(argv, optionName) {
+  return argv.includes(optionName);
+}
+function stripLoginRetryControlFlags(argv) {
+  let next = removeOption(argv, "--login-retry");
+  next = removeOption(next, "--login-retry-timeout");
+  next = removeOption(next, "--non-interactive");
+  return next;
 }
 function shouldDelegateOpenToMinidev(argv) {
   if (argv[0] !== "open") {
@@ -562,6 +654,7 @@ export {
   isWechatIdeLoginRequiredError,
   extractExecutionErrorText,
   formatWechatIdeLoginRequiredError,
+  createWechatIdeLoginRequiredExitError,
   waitForRetryKeypress,
   formatRetryHotkeyPrompt,
   parse

package/dist/cli.js

@@ -1,11 +1,20 @@
 import {
   logger_default,
   parse
-} from "./chunk-A26E3I4U.js";
+} from "./chunk-QTQD5BFV.js";
 
 // src/cli.ts
 import process from "process";
 var argv = process.argv.slice(2);
 parse(argv).catch((err) => {
   logger_default.error(err);
+  if (typeof err?.exitCode === "number") {
+    process.exitCode = err.exitCode;
+    return;
+  }
+  if (typeof err?.code === "number") {
+    process.exitCode = err.code;
+    return;
+  }
+  process.exitCode = 1;
 });

package/dist/index.d.ts

@@ -18,6 +18,10 @@ declare function resolveCliPath(): Promise<{
     source: ConfigSource;
 }>;
 
+interface RetryKeypressOptions {
+    timeoutMs?: number;
+}
+type RetryPromptResult = 'retry' | 'cancel' | 'timeout';
 /**
  * @description 判断是否为微信开发者工具登录失效错误。
  */
@@ -30,14 +34,21 @@ declare function extractExecutionErrorText(error: unknown): string;
  * @description 将登录失效错误格式化为更易读的摘要。
  */
 declare function formatWechatIdeLoginRequiredError(error: unknown): string;
+/**
+ * @description 创建登录失效专用错误，并携带退出码语义。
+ */
+declare function createWechatIdeLoginRequiredExitError(error: unknown, reason?: string): Error & {
+    code: number;
+    exitCode: number;
+};
 /**
  * @description 交互等待用户按键重试，按 r 重试，按 q 或 Ctrl+C 取消。
  */
-declare function waitForRetryKeypress(): Promise<boolean>;
+declare function waitForRetryKeypress(options?: RetryKeypressOptions): Promise<RetryPromptResult>;
 /**
  * @description 生成重试按键提示，并高亮关键热键。
  */
-declare function formatRetryHotkeyPrompt(): string;
+declare function formatRetryHotkeyPrompt(timeoutMs?: number): string;
 
 /**
  * @description CLI 入口解析与分发
@@ -144,4 +155,4 @@ declare function execute(cliPath: string, argv: string[], options?: ExecuteOptio
  */
 declare function resolvePath(filePath: string): string;
 
-export { type ArgvTransform, type BaseConfig, type ConfigSource, type ResolvedConfig, type SupportedPlatform, SupportedPlatformsMap, createAlias, createCustomConfig, createPathCompat, defaultCustomConfigDirPath, defaultCustomConfigFilePath, execute, extractExecutionErrorText, formatRetryHotkeyPrompt, formatWechatIdeLoginRequiredError, getConfig, getDefaultCliPath, isOperatingSystemSupported, isWechatIdeLoginRequiredError, operatingSystemName, parse, promptForCliPath, resolveCliPath, resolvePath, runMinidev, transformArgv, waitForRetryKeypress };
+export { type ArgvTransform, type BaseConfig, type ConfigSource, type ResolvedConfig, type RetryKeypressOptions, type RetryPromptResult, type SupportedPlatform, SupportedPlatformsMap, createAlias, createCustomConfig, createPathCompat, createWechatIdeLoginRequiredExitError, defaultCustomConfigDirPath, defaultCustomConfigFilePath, execute, extractExecutionErrorText, formatRetryHotkeyPrompt, formatWechatIdeLoginRequiredError, getConfig, getDefaultCliPath, isOperatingSystemSupported, isWechatIdeLoginRequiredError, operatingSystemName, parse, promptForCliPath, resolveCliPath, resolvePath, runMinidev, transformArgv, waitForRetryKeypress };

package/dist/index.js

@@ -3,6 +3,7 @@ import {
   createAlias,
   createCustomConfig,
   createPathCompat,
+  createWechatIdeLoginRequiredExitError,
   defaultCustomConfigDirPath,
   defaultCustomConfigFilePath,
   execute,
@@ -21,12 +22,13 @@ import {
   runMinidev,
   transformArgv,
   waitForRetryKeypress
-} from "./chunk-A26E3I4U.js";
+} from "./chunk-QTQD5BFV.js";
 export {
   SupportedPlatformsMap,
   createAlias,
   createCustomConfig,
   createPathCompat,
+  createWechatIdeLoginRequiredExitError,
   defaultCustomConfigDirPath,
   defaultCustomConfigFilePath,
   execute,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "weapp-ide-cli",
   "type": "module",
-  "version": "5.0.3",
+  "version": "5.0.4",
   "description": "让微信开发者工具，用起来更加方便！",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",