@cloud411716/fancy-webnovel 0.1.97 → 0.1.99

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloud411716/fancy-webnovel",
-  "version": "0.1.97",
+  "version": "0.1.99",
   "type": "module",
   "main": "index.js",
   "exports": {

package/plugins/fancy-scan/index.js

@@ -162,17 +162,28 @@ async function runScanWithChromiumFix(ctx, session, invocation, { platform, leng
       notify(session, '⏳ 正在下载 Chromium 浏览器（首次约 2-3 分钟），请耐心等待...\n');
       const installStop = startActivity(session);
 
+      // 预先弹出密码框（不等 sudo 提示出现）
+      // 密码通过 stdin pipe 传入，用 sudo -S 确保 sudo 从 stdin 读
+      const pwdAskPromise = ctx.userQuestions.ask({
+        questions: [{
+          question: '🔐 安装 Chromium 需要 sudo 权限，请输入密码：',
+          hideCustomInput: false,
+        }],
+      }).then(() => {
+        notify(session, '✅ 密码已收到，正在安装...\n');
+      });
+
       const installProc = spawn('sh', ['-c',
-        'npm install -g playwright@1.40.0 --registry=https://registry.npmmirror.com && PLAYWRIGHT_DOWNLOAD_HOST=https://npmmirror.com/mirrors/playwright/ playwright install chromium --with-deps'
+        'sudo -S npm install -g playwright@1.40.0 --registry=https://registry.npmmirror.com && ' +
+        'sudo -S PLAYWRIGHT_DOWNLOAD_HOST=https://npmmirror.com/mirrors/playwright/ playwright install chromium --with-deps'
       ], {
         stdio: ['pipe', 'pipe', 'pipe'],
         cwd: process.cwd(),
-        setsid: true,  // 创建新 session，无 controlling TTY，sudo 密码不会跑到输入框
       });
-      const installOut = [];
+      const installOut = [], installErr = [];
 
       installProc.stdout.on('data', d => { installOut.push(d.toString()); });
-      // stderr 不进 installOut（sudo 提示等交互信息不要混入最终报告）
+      installProc.stderr.on('data', d => { installErr.push(d.toString()); });
 
       // 注册 CTRL+C 取消处理：kill 安装进程
       const stopCancel = onUserCancel(session, () => {
@@ -180,33 +191,19 @@ async function runScanWithChromiumFix(ctx, session, invocation, { platform, leng
         installStop();
       });
 
-      let sudoDialogPromise = null;
-      // sudo 密码提示走 stdout，不是 stderr
-      installProc.stdout.on('data', async (d) => {
-        if (sudoDialogPromise) return;
-        const text = d.toString();
-        if (/password|密码|sudo/i.test(text)) {
-          sudoDialogPromise = ctx.userQuestions.ask({
-            questions: [{
-              question: '🔐 安装过程需要 sudo 权限，请输入密码：',
-              hideCustomInput: false,
-            }],
-          }).then(async (pwdResult) => {
-            const pwd = pwdResult.answers[0]?.custom ?? '';
-            installProc.stdin?.write(pwd + '\n');
-          }).catch(() => {});
-        }
-      });
+      // 预先弹出的密码框结果 → 写入子进程 stdin
+      pwdAskPromise.then(async (pwdResult) => {
+        const pwd = pwdResult.answers[0]?.custom ?? '';
+        if (pwd) installProc.stdin?.write(pwd + '\n');
+      }).catch(() => {});
 
       return new Promise((resolve) => {
         installProc.on('close', async (code) => {
-          // 如果弹过 sudo 框，等弹框结果（最多等 3 分钟，防止卡死）
-          if (sudoDialogPromise) {
-            await Promise.race([
-              sudoDialogPromise.catch(() => {}),
-              new Promise(r => setTimeout(r, 180000)),
-            ]);
-          }
+          // 等预弹框完成
+          await Promise.race([
+            pwdAskPromise.catch(() => {}),
+            new Promise(r => setTimeout(r, 180000)),
+          ]);
           stopCancel(); // 移除取消监听
           installStop();
           if (code === 0) {
@@ -222,7 +219,8 @@ async function runScanWithChromiumFix(ctx, session, invocation, { platform, leng
             resolve('retry');
           } else {
             const out = installOut.join('').slice(-300);
-            notify(session, `❌ Chromium 安装失败（exit ${code}）。\n请手动运行以下命令后重试：\n  npm install -g playwright@1.40.0 --registry=https://registry.npmmirror.com && PLAYWRIGHT_DOWNLOAD_HOST=https://npmmirror.com/mirrors/playwright/ playwright install chromium --with-deps\n\n安装日志末尾：\n${out}`);
+            const err = installErr.join('').slice(-300);
+            notify(session, `❌ Chromium 安装失败（exit ${code}）。\n请手动运行以下命令后重试：\n  npm install -g playwright@1.40.0 --registry=https://registry.npmmirror.com && PLAYWRIGHT_DOWNLOAD_HOST=https://npmmirror.com/mirrors/playwright/ playwright install chromium --with-deps\n\nstdout末尾：\n${out}\n\nstderr末尾：\n${err}`);
             resolve(undefined);
           }
         });