@cloud411716/fancy-webnovel 0.1.81 → 0.1.83

package/package.json

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

package/plugins/fancy-scan/index.js

@@ -90,47 +90,112 @@ export async function apply(ctx) {
         length = 'long';
       }
 
-      notify(session, scan.notify({ type: 'collecting', platform, length }));
-
-      const stopActivity = startActivity(session);
-      const scriptResult = await spawnScript(
-        'node',
-        [join(SCAN_SCRIPTS_DIR, 'run-scan.js'),
-         '--project-root', projectRoot, '--platform', platform, '--length', length],
-        { timeout: 120000, stop: stopActivity }
-      );
-
-      if (!scriptResult.ok) {
-        const err = (typeof scriptResult.error === 'object' && scriptResult.error !== null)
-          ? (scriptResult.error.message || JSON.stringify(scriptResult.error))
-          : String(scriptResult.error || '未知错误');
-        notify(session, scan.notify({ type: 'failed', err }));
+      // 执行采集，包含 Chromium 缺失处理
+      const scanResult = await runScanWithChromiumFix(ctx, session, invocation, {
+        platform, length, projectRoot,
+      });
+
+      if (scanResult === 'retry') {
+        // Chromium 安装后重试已完成，runScanWithChromiumFix 已处理所有输出
         return { kind: 'success', text: '' };
       }
-
-      // 解析 receipt
-      let receipt;
-      try { receipt = JSON.parse(scriptResult.output); } catch (_) {
-        notify(session, scan.notify({ type: 'parse_error' }));
+      if (!scanResult) {
         return { kind: 'success', text: '' };
       }
 
-      const files = receipt.scan_files || [];
-      const topicFile = receipt.topic_decision || '';
-
-      // 通知用户 + 触发 LLM 分析
-      notify(session, scan.notify({ type: 'handover', platform, length, files, topicFile, projectRoot }));
+      return { kind: 'success', text: '' };
+    },
+  });
+}
 
-      const prompt = scan.llmAnalysisPrompt({
-        platform, length,
-        date: receipt.date || '',
-        files,
-        topicFile,
-        projectRoot,
+/**
+ * 执行采集，检测 Chromium 缺失并弹框处理。
+ * 返回 undefined 表示已处理完毕（取消/失败），返回 'retry' 表示安装后重试完成。
+ */
+async function runScanWithChromiumFix(ctx, session, invocation, { platform, length, projectRoot }) {
+  const { spawn } = await import('child_process');
+
+  const runOnce = async (isRetry = false) => {
+    const stop = startActivity(session);
+    if (isRetry) notify(session, '⏳ 重新采集...\n');
+    const r = await spawnScript(
+      'node',
+      [join(SCAN_SCRIPTS_DIR, 'run-scan.js'),
+       '--project-root', projectRoot, '--platform', platform, '--length', length],
+      { timeout: 120000, stop }
+    );
+    return r;
+  };
+
+  const handleSuccess = (stdout) => {
+    let receipt;
+    try { receipt = JSON.parse(stdout); } catch (_) {
+      notify(session, scan.notify({ type: 'parse_error' }));
+      return;
+    }
+    const files = receipt.scan_files || [];
+    const topicFile = receipt.topic_decision || '';
+    notify(session, scan.notify({ type: 'handover', platform, length, files, topicFile, projectRoot }));
+    const prompt = scan.llmAnalysisPrompt({ platform, length, date: receipt.date || '', files, topicFile, projectRoot });
+    llmFollowup(invocation, prompt);
+  };
+
+  const scriptResult = await runOnce();
+
+  if (!scriptResult.ok) {
+    const rawErr = (typeof scriptResult.error === 'object' && scriptResult.error !== null)
+      ? (scriptResult.error.message || JSON.stringify(scriptResult.error))
+      : String(scriptResult.error || '未知错误');
+
+    // Chromium 未找到 → 弹框让用户选择
+    if (rawErr.includes("Executable doesn't exist") || rawErr.includes('Executable doesn')) {
+      const choice = await ctx.userQuestions.ask({
+        questions: [scan.askChromiumInstall()],
       });
-      llmFollowup(invocation, prompt);
+      const answer = choice.answers[0]?.selected?.[0] ?? choice.answers[0]?.custom;
+      if (!answer || answer === '我自己安装') {
+        notify(session, '⚠️ 已取消。请手动安装 Chromium 后再次运行 /fancy-scan。\n安装命令：npx playwright install chromium');
+        return undefined;
+      }
 
-      return { kind: 'success', text: '' };
+      // 用户选择自动安装
+      notify(session, '⏳ 正在下载 Chromium 浏览器（首次约 2-3 分钟），请耐心等待...\n');
+      const installStop = startActivity(session);
+
+      const installProc = spawn('npx', ['playwright', 'install', 'chromium', '--registry', 'https://registry.npmmirror.com'], {
+        stdio: ['ignore', 'pipe', 'pipe'],
+      });
+      const installOut = [];
+      installProc.stdout.on('data', d => { installOut.push(d.toString()); });
+      installProc.stderr.on('data', d => { installOut.push(d.toString()); });
+
+      return new Promise((resolve) => {
+        installProc.on('close', async (code) => {
+          installStop();
+          if (code === 0) {
+            notify(session, '✅ Chromium 安装完成，正在重新采集...\n');
+            const retryResult = await runOnce(true);
+            if (!retryResult.ok) {
+              const err2 = String(retryResult.error || '未知错误');
+              notify(session, scan.notify({ type: 'failed', err: err2 }));
+              resolve(undefined);
+              return;
+            }
+            handleSuccess(retryResult.output);
+            resolve('retry');
+          } else {
+            const out = installOut.join('').slice(-300);
+            notify(session, `❌ Chromium 安装失败（exit ${code}）。\n请手动运行以下命令后重试：\n  npx playwright install chromium\n\n安装日志末尾：\n${out}`);
+            resolve(undefined);
+          }
+        });
+      });
     }
-  });
+
+    notify(session, scan.notify({ type: 'failed', err: rawErr }));
+    return undefined;
+  }
+
+  handleSuccess(scriptResult.output);
+  return 'retry';
 }

package/plugins/fancy-scan/templates.js

@@ -49,6 +49,17 @@ export const scan = {
     };
   },
 
+  askChromiumInstall() {
+    return {
+      question: '⚠️ 未检测到 Chromium 浏览器，请选择处理方式：',
+      hideCustomInput: true,
+      options: [
+        { label: '自动安装', description: '下载 Chromium 到 ~/.cache/ms-playwright/（需要网络，首次约 2-3 分钟）' },
+        { label: '我自己安装', description: '手动安装后再次运行 /fancy-scan' },
+      ],
+    };
+  },
+
   notify({ type, platform, length, files, receipt, topicFile, projectRoot, err }) {
     const lenStr = length === 'long' ? '长篇' : '短篇';
     const pLabel = platformLabel(platform);