@cloud411716/fancy-webnovel 0.2.0 → 0.2.2

package/infra.js

@@ -101,18 +101,28 @@ export function onUserCancel(session, onCancel) {
 export function spawnScript(cmd, args, { timeout = 30000, cwd, stop } = {}) {
   return new Promise(async (resolve) => {
     const { spawn } = await import('child_process');
-    const proc = spawn(cmd, args, { timeout, cwd, stdio: ['ignore', 'pipe', 'pipe'] });
+    const proc = spawn(cmd, args, { cwd, stdio: ['ignore', 'pipe', 'pipe'] });
     const outParts = [], errParts = [];
+    let settled = false;
+    const settle = (v) => { if (!settled) { settled = true; resolve(v); } };
+
+    const timer = timeout > 0 ? setTimeout(() => {
+      proc.kill('SIGTERM');
+      settle({ ok: false, output: outParts.join(''), error: 'timeout after ' + timeout + 'ms' });
+    }, timeout) : null;
+
     proc.stdout.on('data', (d) => { outParts.push(d.toString()); });
     proc.stderr.on('data', (d) => { errParts.push(d.toString()); });
 
     const cleanup = () => { try { stop?.(); } catch (_) {} };
     proc.on('close', (code) => {
-      const stdout = outParts.join(''), stderr = errParts.join('');
+      clearTimeout(timer);
       cleanup();
+      if (settled) return;
+      const stdout = outParts.join(''), stderr = errParts.join('');
       try {
         const parsed = JSON.parse(stdout);
-        resolve({
+        settle({
           ok: parsed.ok === true,
           output: stdout,
           error: parsed.error
@@ -122,9 +132,9 @@ export function spawnScript(cmd, args, { timeout = 30000, cwd, stop } = {}) {
             : stderr || undefined,
         });
       } catch (_) {
-        resolve({ ok: false, output: stdout, error: stderr || ('exit ' + code) });
+        settle({ ok: false, output: stdout, error: stderr || ('exit ' + code) });
       }
     });
-    proc.on('error', (err) => { cleanup(); resolve({ ok: false, output: '', error: err.message }); });
+    proc.on('error', (err) => { clearTimeout(timer); cleanup(); settle({ ok: false, output: '', error: err.message }); });
   });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloud411716/fancy-webnovel",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "type": "module",
   "main": "index.js",
   "exports": {
@@ -14,7 +14,7 @@
     "plugins/"
   ],
   "dependencies": {
-    "playwright-core": "^1.40.0"
+    "playwright-core": "1.48.0"
   },
   "peerDependencies": {
     "@deepseek-ai/dsh-llm": "^0.1.1-rc.2"

package/plugins/fancy-bootstrap/scripts/init.js

@@ -1,7 +1,7 @@
 /**
  * fancy-bootstrap init — 项目初始化
  */
-import { writeFileSync, mkdirSync, existsSync, appendFileSync } from 'fs';
+import { writeFileSync, mkdirSync, existsSync } from 'fs';
 import { expandHome, resolvePath, joinPath } from './path-utils.js';
 
 const DIRS = [
@@ -27,10 +27,7 @@ function nowIso() {
 function main() {
   const projectRootRaw = process.argv[2] ?? '';
 
-  // 调试：打印接收到的参数
-  try { appendFileSync('/tmp/fancy-init-debug.txt', `argv=${JSON.stringify(process.argv)}\nraw=${projectRootRaw}\n`); } catch(e) {}
-
-  if (projectRootRaw.includes('..') || /[<>:"'|?*]/.test(projectRootRaw) || /[\x00-\x1f]/.test(projectRootRaw)) {
+  if (projectRootRaw.includes('..') || /[<>:\"'|?*]/.test(projectRootRaw) || /[\x00-\x1f]/.test(projectRootRaw)) {
     console.log(JSON.stringify({ ok: false, error: { code: 1, code_name: 'EC001', message: '路径不合法' } }));
     process.exit(1);
   }
@@ -99,7 +96,6 @@ function main() {
 
   } catch (e) {
     const errMsg = e instanceof Error ? e.message : String(e);
-    try { appendFileSync('/tmp/fancy-init-debug.txt', `catch: ${errMsg}\n`); } catch(_) {}
     console.log(JSON.stringify({ ok: false, error: { code: 17, code_name: 'EC017', message: `初始化失败: ${errMsg}` } }));
     process.exit(17);
   }

package/plugins/fancy-bootstrap/templates.js

@@ -34,8 +34,8 @@ export const bootstrap = {
 
   confirmOptions() {
     return [
-      { label: '确认创建', description: '开始在此目录初始化项目' },
-      { label: '取消',     description: '取消本次操作' },
+      { label: '确认创建' },
+      { label: '取消' },
     ];
   },
 };

package/plugins/fancy-scan/index.js

@@ -150,7 +150,7 @@ async function runScanWithChromiumFix(ctx, session, invocation, { platform, leng
       notify(session,
         '⚠️ 未找到 Chromium 浏览器，请手动安装后再次运行 /fancy-scan。\n\n' +
         '安装命令：\n' +
-        '  npm install -g playwright@1.40.0 --registry=https://registry.npmmirror.com\n' +
+        '  npm install -g playwright@1.48.0 --registry=https://registry.npmmirror.com\n' +
         '  PLAYWRIGHT_DOWNLOAD_HOST=https://npmmirror.com/mirrors/playwright/ playwright install chromium --with-deps\n\n' +
         '安装完成后重新运行 /fancy-scan 即可。'
       );

package/plugins/fancy-scan/templates.js

@@ -43,24 +43,13 @@ export const scan = {
       question: `${platformLabel(platform)} 同时支持长篇和短篇，请选择：`,
       hideCustomInput: true,
       options: [
-        { label: '长篇', description: '' },
-        { label: '短篇', description: '' },
+        { label: '长篇' },
+        { label: '短篇' },
       ],
     };
   },
 
-  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 }) {
+  notify({ type, platform, length, files, topicFile, projectRoot, err }) {
     const lenStr = length === 'long' ? '长篇' : '短篇';
     const pLabel = platformLabel(platform);
 
@@ -77,14 +66,6 @@ export const scan = {
       case 'cancelled_with_hint':
         return '⚠️ 已取消。请再次调用 /fancy-scan 继续。';
 
-      case 'collecting':
-        return `⏳ 开始采集 ${pLabel}（${lenStr}）...`;
-
-      case 'scan_complete':
-        if (!files || files.length === 0) return `✅ ${pLabel}（${lenStr}）采集完成`;
-        const fileList = files.map(f => '  - ' + f.replace(projectRoot + '/', '')).join('\n');
-        return `✅ ${pLabel}（${lenStr}）采集完成\n\n📁 生成文件：\n${fileList}`;
-
       case 'failed':
         return '❌ 采集失败：' + err;