@cloud411716/fancy-webnovel 0.1.91 → 0.1.93

package/package.json

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

package/plugins/fancy-scan/index.js

@@ -154,7 +154,7 @@ async function runScanWithChromiumFix(ctx, session, invocation, { platform, leng
       });
       const answer = choice.answers[0]?.selected?.[0] ?? choice.answers[0]?.custom;
       if (!answer || answer === '我自己安装') {
-        notify(session, '⚠️ 已取消。请手动安装 Chromium 后再次运行 /fancy-scan。\n安装命令：npm install -g @playwright/cli@1.40.0 --registry=https://registry.npmmirror.com && PLAYWRIGHT_DOWNLOAD_HOST=https://npmmirror.com/mirrors/playwright/ playwright-cli@1.40.0 install-browser --with-deps');
+        notify(session, '⚠️ 已取消。请手动安装 Chromium 后再次运行 /fancy-scan。\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');
         return undefined;
       }
 
@@ -163,13 +163,12 @@ async function runScanWithChromiumFix(ctx, session, invocation, { platform, leng
       const installStop = startActivity(session);
 
       const installProc = spawn('sh', ['-c',
-        'npm install -g @playwright/cli@1.40.0 --registry=https://registry.npmmirror.com && PLAYWRIGHT_DOWNLOAD_HOST=https://npmmirror.com/mirrors/playwright/ playwright-cli@1.40.0 install-browser --with-deps'
+        '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'
       ], {
         stdio: ['pipe', 'pipe', 'pipe'],
         cwd: process.cwd(),
       });
       const installOut = [];
-      let sudoPrompted = false;
 
       installProc.stdout.on('data', d => { installOut.push(d.toString()); });
       installProc.stderr.on('data', d => { installOut.push(d.toString()); });
@@ -180,27 +179,30 @@ async function runScanWithChromiumFix(ctx, session, invocation, { platform, leng
         installStop();
       });
 
+      let sudoDialogPromise = null;
       // 检测 sudo 密码提示
       installProc.stderr.on('data', async (d) => {
-        if (sudoPrompted) return;
+        if (sudoDialogPromise) return;
         const text = d.toString();
         if (/password|密码|sudo/i.test(text)) {
-          sudoPrompted = true;
-          installProc.pause?.(); // 暂停输出，防止刷屏
-          const pwdResult = await ctx.userQuestions.ask({
+          sudoDialogPromise = ctx.userQuestions.ask({
             questions: [{
               question: '🔐 安装过程需要 sudo 权限，请输入密码：',
               hideCustomInput: false,
             }],
-          });
-          const pwd = pwdResult.answers[0]?.custom ?? '';
-          installProc.stdin?.write(pwd + '\n');
-          installProc.resume?.(); // 恢复输出
+          }).then(async (pwdResult) => {
+            const pwd = pwdResult.answers[0]?.custom ?? '';
+            installProc.stdin?.write(pwd + '\n');
+          }).catch(() => {});
         }
       });
 
       return new Promise((resolve) => {
         installProc.on('close', async (code) => {
+          // 如果弹过 sudo 框，等弹框完成后再处理结果
+          if (sudoDialogPromise) {
+            await sudoDialogPromise.catch(() => {});
+          }
           stopCancel(); // 移除取消监听
           installStop();
           if (code === 0) {
@@ -216,7 +218,7 @@ 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/cli@1.40.0 --registry=https://registry.npmmirror.com && PLAYWRIGHT_DOWNLOAD_HOST=https://npmmirror.com/mirrors/playwright/ playwright-cli@1.40.0 install-browser --with-deps\n\n安装日志末尾：\n${out}`);
+            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}`);
             resolve(undefined);
           }
         });