@waterwx/dsh-novel-forge 1.3.0 → 1.3.1-alpha

package/src/client/run-status.ts

@@ -0,0 +1,143 @@
+/**
+ * 运行状态芯片：固定在页面顶部的「小说工坊生成状态」小徽标。
+ * 轮询 /run/status，实时显示 生成中/暂停/完成/停止/出错 + 当前章号；
+ * 点击可打开/关闭小说工坊面板。独立 DOM 注入，不触碰主面板逻辑，挂载失败静默降级。
+ *
+ * P0 重写说明（原实现的三个问题）：
+ *   1. 整块背景染状态色 + 固定白字 → 浅色主题下「白字配亮底」对比度崩坏。
+ *      现在改为「玻璃底 + 主题前景色文字 + 左侧状态色点」，状态只由色点承载，
+ *      文字永远跟随主题，任何深浅色下都可读。
+ *   2. 样式写死在 JS 的 inline style 里，切主题纹丝不动。
+ *      现在改用 CSS Module class，配色走 --nf-chip-* 令牌，
+ *      由 body[data-ds-dark-theme] 跟随宿主深浅色。
+ *   3. role="button" 却没有 tabindex、没有键盘处理，键盘用户完全用不了。
+ *      现在补 tabindex + Enter/Space 激活 + aria-label/live。
+ */
+import type { NovelApi } from './api.ts'
+import type { PanelController } from './panel/controller.ts'
+import type { RunState } from '../protocol.ts'
+import css from './panel/panel.module.css'
+
+const REFRESH_MS = 4000
+
+/** 状态文案。状态语义由左侧色点承载，这里不再放 emoji（避免与色点重复表意）。 */
+function label(s: RunState): string {
+  const no = s.currentNo
+  switch (s.status) {
+    case 'running': return `小说工坊 生成中 · 第${no}章`
+    case 'paused': return `小说工坊 已暂停 · 第${no}章`
+    case 'done': return `小说工坊 批完成 ${s.startNo}–${s.endNo}`
+    case 'stopped': return `小说工坊 已停止 · 第${no}章`
+    case 'error': return `小说工坊 出错 · 第${no}章`
+    default: return '小说工坊'
+  }
+}
+
+/** 生成一个固定顶部的状态芯片并开始轮询。返回 dispose。 */
+export function mountRunStatus(controller: PanelController, api: NovelApi): () => void {
+  const chip = document.createElement('div')
+  chip.className = css.runChip
+  chip.setAttribute('role', 'button')
+  // P0: role="button" 必须可聚焦、可键盘激活，否则对键盘/读屏用户等同不存在。
+  chip.setAttribute('tabindex', '0')
+  chip.setAttribute('title', '小说工坊生成状态（点击打开工坊）')
+  // 状态是异步轮询出来的，用 aria-live 让读屏用户也能感知变化。
+  chip.setAttribute('aria-live', 'polite')
+
+  const dot = document.createElement('span')
+  dot.className = css.runChipDot
+  // 纯装饰，颜色信息已由文字表达，不要让读屏重复播报。
+  dot.setAttribute('aria-hidden', 'true')
+
+  const text = document.createElement('span')
+  text.className = css.runChipText
+
+  chip.append(dot, text)
+
+  const toggle = (): void => { controller.toggle() }
+
+  // 自由拖拽 + 位置记忆（与 AI 进度浮窗一致）
+  const POS_KEY = 'dsh-novel-forge.runChip.pos'
+  let dragging = false, moved = false, sx = 0, sy = 0, ox = 0, oy = 0
+  const readPos = (): { x: number; y: number } | null => {
+    try { const p = window.localStorage.getItem(POS_KEY); return p === null ? null : JSON.parse(p) as { x: number; y: number } } catch { return null }
+  }
+  const writePos = (x: number, y: number): void => {
+    try { window.localStorage.setItem(POS_KEY, JSON.stringify({ x, y })) } catch { /* ignore */ }
+  }
+  const clampX = (x: number): number => Math.max(0, Math.min(Math.max(0, window.innerWidth - 40), x))
+  const clampY = (y: number): number => Math.max(0, Math.min(Math.max(0, window.innerHeight - 40), y))
+  const applyPos = (x: number, y: number): void => {
+    chip.style.left = clampX(x) + 'px'
+    chip.style.top = clampY(y) + 'px'
+    chip.style.right = 'auto'
+  }
+  chip.addEventListener('pointerdown', (e) => {
+    if (e.button !== 0) return
+    dragging = true; moved = false; sx = e.clientX; sy = e.clientY
+    ox = chip.offsetLeft; oy = chip.offsetTop
+    try { chip.setPointerCapture(e.pointerId) } catch { /* ignore */ }
+  })
+  chip.addEventListener('pointermove', (e) => {
+    if (!dragging) return
+    const dx = e.clientX - sx, dy = e.clientY - sy
+    if (Math.abs(dx) > 3 || Math.abs(dy) > 3) moved = true
+    if (moved) {
+      applyPos(ox + dx, oy + dy)
+      writePos(chip.offsetLeft, chip.offsetTop)
+    }
+  })
+  const endDrag = (): void => { dragging = false }
+  chip.addEventListener('pointerup', endDrag)
+  chip.addEventListener('pointercancel', endDrag)
+  // 拖拽后松开不触发开合
+  chip.addEventListener('click', (e) => {
+    if (moved) { e.preventDefault(); e.stopImmediatePropagation(); moved = false; return }
+    toggle()
+  })
+  chip.addEventListener('keydown', (e) => {
+    if (e.key === 'Enter' || e.key === ' ' || e.key === 'Spacebar') {
+      e.preventDefault()
+      toggle()
+    }
+  })
+
+  document.body.appendChild(chip)
+
+  // 恢复上次拖拽位置（若曾移动过）
+  const saved = readPos()
+  if (saved !== null) applyPos(saved.x, saved.y)
+
+  let disposed = false
+  let timer: number | undefined
+
+  const render = (s: RunState | null): void => {
+    if (s === null) {
+      chip.dataset.visible = 'false'
+      return
+    }
+    let body = label(s)
+    if (s.status === 'running' && s.stats.error > 0) body += ` · ×${s.stats.error}`
+    text.textContent = body
+    chip.dataset.status = s.status
+    chip.dataset.visible = 'true'
+    chip.setAttribute('aria-label', body)
+  }
+
+  const tick = async (): Promise<void> => {
+    if (disposed) return
+    try {
+      const s = await api.runStatus()
+      render(s)
+    } catch { /* best-effort */ }
+    if (!disposed) timer = window.setTimeout(() => { void tick() }, REFRESH_MS)
+  }
+
+  void tick()
+
+  return () => {
+    disposed = true
+    if (timer !== undefined) window.clearTimeout(timer)
+    chip.remove()
+  }
+}

package/src/client/sidebar-entry.ts

@@ -11,7 +11,7 @@ import css from './panel/panel.module.css'
 export const ENTRY_SELECTOR = '[data-dsh-novelforge-entry]'
 
 /** Inline icon: an open book / writing glyph. */
-const ICON = '<svg viewBox="0 0 16 16" width="14" height="14" fill="none" stroke="currentColor" stroke-width="1.3" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M2.5 3.5h4a2 2 0 0 1 2 2v7a2 2 0 0 0-2-2h-4z"/><path d="M13.5 3.5h-4a2 2 0 0 0-2 2v7a2 2 0 0 1 2-2h4z"/><path d="M8 5.5v7"/></svg>'
+const ICON = '<svg viewBox="0 0 24 24" width="16" height="16" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M12.67 19a2 2 0 0 0 1.416-.588l6.154-6.172a6 6 0 0 0-8.49-8.49L5.586 9.914A2 2 0 0 0 5 11.328V18a1 1 0 0 0 1 1z"/><path d="M16 8 2 22"/><path d="M17.5 15H9"/></svg>'
 
 /** Find the sidebar shell root element. */
 function sidebarRoot(): HTMLElement | undefined {

package/src/client/text.ts

@@ -0,0 +1,28 @@
+/**
+ * 客户端文件文本智能解码：兼容 UTF-8 BOM / UTF-16 / UTF-8 / GB18030(GBK)。
+ * 浏览器 File.text() 固定按 UTF-8 解码，GBK 中文网文 txt 会乱码，这里兜底。
+ */
+
+/**
+ * 读取一个 File 的文本，按编码探测兜底解码。
+ * @returns 解码后的文本。
+ */
+export async function readFileTextSmart(file: File): Promise<string> {
+  const buf = await file.arrayBuffer()
+  const u8 = new Uint8Array(buf)
+  // UTF-8 BOM
+  if (u8.length >= 3 && u8[0] === 0xEF && u8[1] === 0xBB && u8[2] === 0xBF) {
+    return new TextDecoder('utf-8').decode(u8.subarray(3))
+  }
+  // UTF-16 LE / BE
+  if (u8.length >= 2 && u8[0] === 0xFF && u8[1] === 0xFE) return new TextDecoder('utf-16le').decode(u8.subarray(2))
+  if (u8.length >= 2 && u8[0] === 0xFE && u8[1] === 0xFF) return new TextDecoder('utf-16be').decode(u8.subarray(2))
+  // UTF-8（宽松），含替换符则回退 GB18030
+  const utf8 = new TextDecoder('utf-8', { fatal: false }).decode(u8)
+  if (!utf8.includes('\uFFFD')) return utf8
+  try {
+    return new TextDecoder('gb18030').decode(u8)
+  } catch {
+    return utf8
+  }
+}

package/src/docx-core.ts

@@ -0,0 +1,53 @@
+/**
+ * docx 文本提取共享核心：服务端（src/docx.ts）与浏览器端（src/client/docx.ts）
+ * 共用 XML → 纯文本的解析逻辑，避免两份实现漂移。
+ * zip 解压入口因运行时不同（fflate vs fflate/browser，浏览器端必须走 browser
+ * 入口以避开 node:module 的 require 探测）留在两端各自处理。
+ */
+
+/** 解码 docx 正文实际会用到的少量 XML 实体。 */
+export function decodeEntities(text: string): string {
+  return text
+    .replace(/&lt;/g, '<')
+    .replace(/&gt;/g, '>')
+    .replace(/&quot;/g, '"')
+    .replace(/&apos;/g, "'")
+    .replace(/&amp;/g, '&')
+    .replace(/&nbsp;/g, ' ')
+}
+
+/**
+ * 从 word/document.xml 的 XML 字符串提取纯文本：每个 <w:p> 段落一行，
+ * <w:tab>/<w:br> 保留为空白符；表格与嵌套结构按文档顺序拍平
+ * （它们的段落同样是 <w:p>）。
+ * @param xml - document.xml 解码后的字符串。
+ * @returns 正文文本（空文本时抛错）。
+ */
+export function extractDocxTextFromXml(xml: string): string {
+  const paragraphs: string[] = []
+  // 按段落边界切分；逐段取 run 文本。
+  const parts = xml.split(/<w:p\b[^>]*>/)
+  for (let i = 1; i < parts.length; i++) {
+    const segment = parts[i]!
+    // 匹配 <w:t ...>…</w:t>；同时把 <w:tab/> 与 <w:br/> 当作空白保留。
+    const runs: string[] = []
+    const runRe = /<w:t(?:\s[^>]*)?>([\s\S]*?)<\/w:t>|<w:tab\b[^>]*\/>|<w:br\b[^>]*\/>/g
+    for (const match of segment.matchAll(runRe)) {
+      if (match[0].startsWith('<w:tab')) {
+        runs.push('\t')
+      } else if (match[0].startsWith('<w:br')) {
+        runs.push('\n')
+      } else {
+        runs.push(decodeEntities(match[1] ?? ''))
+      }
+    }
+    paragraphs.push(runs.join('').replace(/\u00a0/g, ' ').trimEnd())
+  }
+
+  // 折叠 3+ 连续空行并去首尾空白。
+  const text = paragraphs.join('\n').replace(/\n{3,}/g, '\n\n').trim()
+  if (text.length === 0) {
+    throw new Error('docx 中没有可提取的文本')
+  }
+  return text
+}

package/src/docx.ts

@@ -1,83 +1,44 @@
-/**
- * docx outline extraction: a .docx is a zip whose word/document.xml holds the
- * body text in <w:t> runs inside <w:p> paragraphs. We unzip with fflate and
- * walk the XML with a tiny tokenizer — no heavyweight XML/DOM dependency.
- */
-
-import { readFileSync } from 'node:fs'
-import { unzipSync, strFromU8 } from 'fflate'
-
-/** Decode the handful of XML entities docx bodies actually use. */
-function decodeEntities(text: string): string {
-  return text
-    .replace(/&lt;/g, '<')
-    .replace(/&gt;/g, '>')
-    .replace(/&quot;/g, '"')
-    .replace(/&apos;/g, "'")
-    .replace(/&amp;/g, '&')
-    .replace(/&nbsp;/g, ' ')
-}
-
-/**
- * Extract plain text from a docx buffer: one line per <w:p> paragraph, with
- * <w:tab>/<w:br> preserved as whitespace. Tables and nested structures are
- * flattened in document order (their paragraphs are just <w:p> too).
- * @param buffer - the raw .docx bytes.
- * @returns the body text.
- */
-export function extractDocxText(buffer: Uint8Array): string {
-  let files: ReturnType<typeof unzipSync>
-  try {
-    files = unzipSync(buffer)
-  } catch (error) {
-    throw new Error(`not a valid docx (zip open failed): ${(error as Error).message}`)
-  }
-  const document = files['word/document.xml']
-  if (document === undefined) {
-    throw new Error('not a valid docx (word/document.xml missing)')
-  }
-  const xml = strFromU8(document)
-
-  const paragraphs: string[] = []
-  // Split on paragraph boundaries; keep the segment text of each.
-  const parts = xml.split(/<w:p\b[^>]*>/)
-  for (let i = 1; i < parts.length; i++) {
-    const segment = parts[i]!
-    // Runs <w:t ...>…</w:t>; also honor <w:tab/> and <w:br/> as spaces.
-    const runs: string[] = []
-    const runRe = /<w:t(?:\s[^>]*)?>([\s\S]*?)<\/w:t>|<w:tab\b[^>]*\/>|<w:br\b[^>]*\/>/g
-    for (const match of segment.matchAll(runRe)) {
-      if (match[0].startsWith('<w:tab')) {
-        runs.push('\t')
-      } else if (match[0].startsWith('<w:br')) {
-        runs.push('\n')
-      } else {
-        runs.push(decodeEntities(match[1] ?? ''))
-      }
-    }
-    const line = runs.join('').replace(/\u00a0/g, ' ').trimEnd()
-    paragraphs.push(line)
-  }
-
-  // Collapse 3+ blank lines and trim.
-  const text = paragraphs.join('\n').replace(/\n{3,}/g, '\n\n').trim()
-  if (text.length === 0) {
-    throw new Error('docx contains no extractable text')
-  }
-  return text
-}
-
-/**
- * Read and extract a docx outline from disk.
- * @param path - absolute path to the .docx file.
- * @returns the extracted outline text.
- */
-export function readOutlineFromDocx(path: string): string {
-  let buffer: Buffer
-  try {
-    buffer = readFileSync(path)
-  } catch (error) {
-    throw new Error(`cannot read outline file "${path}": ${(error as Error).message}`)
-  }
-  return extractDocxText(new Uint8Array(buffer))
-}
+/**
+ * docx outline extraction: a .docx is a zip whose word/document.xml holds the
+ * body text in <w:t> runs inside <w:p> paragraphs. We unzip with fflate and
+ * walk the XML with a tiny tokenizer — no heavyweight XML/DOM dependency.
+ * XML 解析共享核心在 ./docx-core.ts（与浏览器端同源）。
+ */
+
+import { readFileSync } from 'node:fs'
+import { unzipSync, strFromU8 } from 'fflate'
+import { extractDocxTextFromXml } from './docx-core.ts'
+
+/**
+ * Extract plain text from a docx buffer: one line per <w:p> paragraph.
+ * @param buffer - the raw .docx bytes.
+ * @returns the body text.
+ */
+export function extractDocxText(buffer: Uint8Array): string {
+  let files: ReturnType<typeof unzipSync>
+  try {
+    files = unzipSync(buffer)
+  } catch (error) {
+    throw new Error(`不是有效的 docx（zip 解压失败）：${(error as Error).message}`)
+  }
+  const document = files['word/document.xml']
+  if (document === undefined) {
+    throw new Error('不是有效的 docx（缺少 word/document.xml）')
+  }
+  return extractDocxTextFromXml(strFromU8(document))
+}
+
+/**
+ * Read and extract a docx outline from disk.
+ * @param path - absolute path to the .docx file.
+ * @returns the extracted outline text.
+ */
+export function readOutlineFromDocx(path: string): string {
+  let buffer: Buffer
+  try {
+    buffer = readFileSync(path)
+  } catch (error) {
+    throw new Error(`cannot read outline file "${path}": ${(error as Error).message}`)
+  }
+  return extractDocxText(new Uint8Array(buffer))
+}