@cloud411716/fancy-webnovel 0.1.82 → 0.1.84

package/infra.js

@@ -4,8 +4,9 @@
  * 提供：
  *   notify(session, text)       — 打印消息给用户（不触发 LLM）
  *   llmFollowup(invocation, prompt) — 发送消息给 LLM，让 LLM 继续处理
- *   spawnScript(cmd, args, opts)    — spawn 子进程，解析 stdout JSON
  *   startActivity(session)  — 开始 Activity Line 计时，返回 stop 函数
+ *   onUserCancel(session, onCancel) — 监听 CTRL+C / ESC 取消信号，返回 stop 函数
+ *   spawnScript(cmd, args, opts) — spawn 子进程，解析 stdout JSON
  *
  * 所有 fancy-* 插件均直接 import 此文件。
  */
@@ -41,15 +42,57 @@ export function llmFollowup(invocation, content) {
 // 调用 startActivity() 返回 stop 函数，进入新阶段时先 stop 再 start
 // --------------------------------------------------------------------------
 
-/**
- * @param {import('@deepseek-ai/dsh-session').Session} session
- * @returns {() => void} stop — 调用后停止计时
- */
 export function startActivity(session) {
   session.append('turn/start', { source: 'fancy-plugin' });
   return () => session.append('turn/end', { source: 'fancy-plugin' });
 }
 
+// --------------------------------------------------------------------------
+// onUserCancel — 监听用户按 CTRL+C 或 ESC 取消信号
+//
+// 调用时传入 session + onCancel 回调（清理函数，如 kill 子进程、停止计时等）
+// 返回 stop 函数（调用以移除监听器，流程正常结束时调用）
+// 注意：不在弹窗场景下使用（弹窗自身有取消逻辑）
+// --------------------------------------------------------------------------
+const _cancelHandlers = new Map(); // session → { stopFn, onCancel }
+
+export function onUserCancel(session, onCancel) {
+  if (_cancelHandlers.has(session)) {
+    const existing = _cancelHandlers.get(session);
+    const orig = existing.onCancel;
+    existing.onCancel = () => { orig?.(); onCancel?.(); };
+    return existing.stopFn;
+  }
+
+  let cancelled = false;
+
+  const handler = () => {
+    if (cancelled) return;
+    cancelled = true;
+    for (const fn of stopFns) { try { fn(); } catch (_) {} }
+    cleanup();
+    notify(session, '🚫 操作已取消。');
+  };
+
+  const cleanup = () => {
+    process.removeListener('SIGINT', handler);
+    _cancelHandlers.delete(session);
+  };
+
+  const stopFns = [onCancel].filter(Boolean);
+  process.on('SIGINT', handler);
+
+  const stopFn = () => {
+    if (!cancelled) {
+      for (const fn of stopFns) { try { fn(); } catch (_) {} }
+      cleanup();
+    }
+  };
+
+  _cancelHandlers.set(session, { stopFn });
+  return stopFn;
+}
+
 // --------------------------------------------------------------------------
 // spawnScript — spawn 子进程，stdout 只收集 JSON，stderr 单独收集
 // opts.stop() 会在进程终止时自动调用（用于清理 turn/start）

package/package.json

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

package/plugins/fancy-scan/index.js

@@ -4,7 +4,7 @@
 import { fileURLToPath } from 'url';
 import { dirname, join } from 'path';
 import { existsSync } from 'fs';
-import { notify, llmFollowup, spawnScript, startActivity } from '../../infra.js';
+import { notify, llmFollowup, spawnScript, startActivity, onUserCancel } from '../../infra.js';
 import { scan, PLATFORM_TABLE, platformLabel } from './templates.js';
 
 export const inject = ['commands', 'userQuestions'];
@@ -162,15 +162,22 @@ async function runScanWithChromiumFix(ctx, session, invocation, { platform, leng
       notify(session, '⏳ 正在下载 Chromium 浏览器（首次约 2-3 分钟），请耐心等待...\n');
       const installStop = startActivity(session);
 
-      const installProc = spawn('npx', ['playwright', 'install', 'chromium'], {
+      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()); });
 
+      // 注册 CTRL+C 取消处理：kill 安装进程
+      const stopCancel = onUserCancel(session, () => {
+        installProc.kill('SIGTERM');
+        installStop();
+      });
+
       return new Promise((resolve) => {
         installProc.on('close', async (code) => {
+          stopCancel(); // 移除取消监听
           installStop();
           if (code === 0) {
             notify(session, '✅ Chromium 安装完成，正在重新采集...\n');