dsh-miniflux 0.8.0 → 0.9.0

package/README.md

@@ -22,6 +22,20 @@ Settings → Plugins → Miniflux. Changes apply live, no restart.
 
 ## 安装 / Install
 
+**从 npm 安装（发布后可用）**
+
+```bash
+dsh plugin --profile <name> add dsh-miniflux
+```
+
+**从 GitHub 安装（当前可用）**
+
+```bash
+git clone https://github.com/niupkk/dsh-miniflux.git
+cd dsh-miniflux && npm install
+dsh plugin --profile <name> add link:$PWD
+```
+
 **从仓库链接安装（开发态）**
 
 ```bash
@@ -34,6 +48,17 @@ dsh plugin --profile <name> add link:$PWD
 
 装完重启一次 dsh web，左侧栏就会出现 **Miniflux** 图标。
 
+
+### 自选源 EPUB（不经过模型）
+
+按设置的源列表，把最近的文章打包成一本电子书：
+
+- **纯本地拼装**，不调用任何模型，所以零 token 消耗、速度只取决于图片下载
+- **按 RSS 源分组**：一本书里一个源一章，文章在它下面按时间倒序
+- **双层目录**：阅读器的目录面板是「源 → 文章」的嵌套结构；书开头还有一页可见的目录，能先总览再读
+- 篇数上限由 `feedEpubMax` 控制（默认 120，最大 500）
+- 生成完成后，收录的条目会标为已读
+
 ## 设置项 / Settings
 
 | 字段 Field | 说明 Description |

package/lib/client.js

@@ -67,6 +67,7 @@ window.__ModuleLoader__.load({
       { key: 'aiBatchSize', label: 'AI 每批篇数 / AI batch size', placeholder: '12' },
       { key: 'maxCandidates', label: '日报候选上限 / Digest candidates', placeholder: '200' },
       { key: 'picksCandidates', label: '精选取未读篇数 / Picks candidates', placeholder: '200' },
+      { key: 'feedEpubMax', label: '自选源篇数上限 / Feed EPUB max', placeholder: '120' },
       { key: 'imageProxy', label: '抓图代理 / Image proxy', placeholder: 'http://user:pass@host:port' },
       { key: 'language', label: '语言 / Language', placeholder: '中文' },
     ]

package/lib/index.js

@@ -72,6 +72,8 @@ export const Config = z.object({
     .description(B('日报：每次最多把多少篇交给模型（24 小时内的文章）', 'Daily digest: max entries handed to the model (within the lookback window)')),
   picksSkipScreened: z.boolean().default(true).volatile()
     .description(B('精选跳过已筛过的条目（避免每次重复消耗模型）', 'Picks skip entries already screened (avoids re-spending model calls)')),
+  feedEpubMax: z.number().step(10).min(10).max(500).default(120).volatile()
+    .description(B('自选源每本最多收多少篇（按源分组，纯本地拼装不调模型）', 'Max entries per per-feed EPUB (grouped by feed, no model calls)')),
   picksCandidates: z.number().step(10).min(10).max(500).default(200).volatile()
     .description(B('精选：每次从最新未读里取多少篇交给模型', 'Picks: how many newest unread entries to hand to the model')),
   digestMaxItems: z.number().step(1).min(0).max(60).default(0).volatile()
@@ -334,6 +336,12 @@ function makeZip(entries) {
 }
 
 const EPUB_CSS = `
+nav ol, .book-toc ol { list-style: none; padding-left: 0; }
+nav ol ol, .book-toc ol ol { padding-left: 1.1em; margin: 0.25em 0 0.9em; }
+.toc-group > a strong { font-size: 1.05em; }
+.toc-count { opacity: 0.6; font-size: 0.85em; margin-left: 0.35em; }
+.toc-list li, .book-toc li { margin: 0.3em 0; line-height: 1.45; }
+
 body{font-family:"Noto Serif CJK SC","Source Han Serif SC",serif;line-height:1.75;margin:0 4%;color:#222}
 h1{font-size:1.5em;margin:0 0 .3em}.meta{color:#777;font-size:.82em;margin-bottom:1.4em;border-bottom:1px solid #ddd;padding-bottom:.6em}
 .meta a{color:#4a90d9;text-decoration:none}p{margin:0 0 .85em;text-align:justify}
@@ -357,7 +365,9 @@ function randomId() {
   return `${out.slice(0, 8)}-${out.slice(8, 12)}-${out.slice(12, 16)}-${out.slice(16, 20)}-${out.slice(20)}`
 }
 
-function buildEpub({ title, author = 'dsh-miniflux', chapters }) {
+function buildEpub({ title, author = 'dsh-miniflux', chapters, groups }) {
+  // groups: [{ title, articles: [chapter...] }]；不传则退化成平铺 chapters
+  const sources = Array.isArray(groups) && groups.length ? groups : [{ title: '', articles: chapters || [] }]
   const files = [
     { name: 'mimetype', data: 'application/epub+zip', store: true },
     { name: 'META-INF/container.xml', data: `<?xml version="1.0" encoding="UTF-8"?>
@@ -368,33 +378,69 @@ function buildEpub({ title, author = 'dsh-miniflux', chapters }) {
   ]
   const manifest = ['<item id="css" href="style.css" media-type="text/css"/>',
     '<item id="nav" href="nav.xhtml" media-type="application/xhtml+xml" properties="nav"/>',
-    '<item id="cover" href="cover.xhtml" media-type="application/xhtml+xml"/>']
-  const spine = ['<itemref idref="cover"/>']
-  const navItems = []
+    '<item id="cover" href="cover.xhtml" media-type="application/xhtml+xml"/>',
+    '<item id="toc" href="toc.xhtml" media-type="application/xhtml+xml"/>']
+  const spine = ['cover', 'toc']
+  const navGroups = []
   const seenImages = new Set()
+  let articleIndex = 0
+  let groupIndex = 0
+
+  for (const group of sources) {
+    const articles = group.articles || []
+    if (!articles.length) continue
+
+    const entries = []
+    for (const chapter of articles) {
+      articleIndex += 1
+      const id = `c${String(articleIndex).padStart(3, '0')}`
+      files.push({
+        name: `OEBPS/${id}.xhtml`,
+        data: xhtml(chapter.title, `<h1>${escapeHtml(chapter.title)}</h1>${chapter.meta ? `<div class="meta">${chapter.meta}</div>` : ''}${chapter.html || ''}`),
+      })
+      manifest.push(`<item id="${id}" href="${id}.xhtml" media-type="application/xhtml+xml"/>`)
+      entries.push({ id, title: chapter.title })
+
+      for (const image of chapter.images || []) {
+        if (seenImages.has(image.name)) continue
+        seenImages.add(image.name)
+        files.push({ name: `OEBPS/images/${image.name}`, data: image.data, store: true })
+        manifest.push(`<item id="img${seenImages.size}" href="images/${image.name}" media-type="${image.type}"/>`)
+      }
+    }
 
-  chapters.forEach((chapter, index) => {
-    const id = `c${String(index + 1).padStart(3, '0')}`
-    files.push({
-      name: `OEBPS/${id}.xhtml`,
-      data: xhtml(chapter.title, `<h1>${escapeHtml(chapter.title)}</h1>${chapter.meta ? `<div class="meta">${chapter.meta}</div>` : ''}${chapter.html || ''}`),
-    })
-    manifest.push(`<item id="${id}" href="${id}.xhtml" media-type="application/xhtml+xml"/>`)
-    spine.push(`<itemref idref="${id}"/>`)
-    navItems.push(`<li><a href="${id}.xhtml">${escapeHtml(chapter.title)}</a></li>`)
-
-    for (const image of chapter.images || []) {
-      if (seenImages.has(image.name)) continue
-      seenImages.add(image.name)
-      files.push({ name: `OEBPS/images/${image.name}`, data: image.data, store: true })
-      manifest.push(`<item id="img${seenImages.size}" href="images/${image.name}" media-type="${image.type}"/>`)
+    let groupId = null
+    if (group.title) {
+      groupIndex += 1
+      groupId = `g${String(groupIndex).padStart(3, '0')}`
+      const list = entries.map((entry) => `<li><a href="${entry.id}.xhtml">${escapeHtml(entry.title)}</a></li>`).join('')
+      files.push({
+        name: `OEBPS/${groupId}.xhtml`,
+        data: xhtml(group.title, `<h1>${escapeHtml(group.title)}</h1><div class="meta">${articles.length} 篇</div><ol class="toc-list">${list}</ol>`),
+      })
+      manifest.push(`<item id="${groupId}" href="${groupId}.xhtml" media-type="application/xhtml+xml"/>`)
+      spine.push(groupId)
     }
-  })
+    for (const entry of entries) spine.push(entry.id)
+    navGroups.push({ id: groupId, title: group.title || entries[0].title, entries })
+  }
+
+  const navList = navGroups.map((group) => (group.id
+    ? `<li><a href="${group.id}.xhtml">${escapeHtml(group.title)}</a><ol>${group.entries.map((entry) => `<li><a href="${entry.id}.xhtml">${escapeHtml(entry.title)}</a></li>`).join('')}</ol></li>`
+    : group.entries.map((entry) => `<li><a href="${entry.id}.xhtml">${escapeHtml(entry.title)}</a></li>`).join(''))).join('')
 
-  files.push({ name: 'OEBPS/cover.xhtml', data: xhtml(title, `<div class="cover"><h1>${escapeHtml(title)}</h1><div class="sub">${escapeHtml(author)} · ${chapters.length} 篇 · ${new Date().toISOString().slice(0, 10)}</div></div>`) })
-  files.push({ name: 'OEBPS/nav.xhtml', data: xhtml('目录', `<nav epub:type="toc" xmlns:epub="http://www.idpf.org/2007/ops"><h1>目录</h1><ol>${navItems.join('')}</ol></nav>`) })
+  const tocList = navGroups.map((group) => (group.id
+    ? `<li class="toc-group"><a href="${group.id}.xhtml"><strong>${escapeHtml(group.title)}</strong></a> <span class="toc-count">${group.entries.length} 篇</span><ol>${group.entries.map((entry) => `<li><a href="${entry.id}.xhtml">${escapeHtml(entry.title)}</a></li>`).join('')}</ol></li>`
+    : group.entries.map((entry) => `<li><a href="${entry.id}.xhtml">${escapeHtml(entry.title)}</a></li>`).join(''))).join('')
+
+  const articleCount = articleIndex
+  const groupCount = navGroups.filter((group) => group.id).length
+  files.push({ name: 'OEBPS/cover.xhtml', data: xhtml(title, `<div class="cover"><h1>${escapeHtml(title)}</h1><div class="sub">${escapeHtml(author)} · ${articleCount} 篇${groupCount ? ` · ${groupCount} 个源` : ''} · ${new Date().toISOString().slice(0, 10)}</div></div>`) })
+  files.push({ name: 'OEBPS/toc.xhtml', data: xhtml('目录', `<h1>目录</h1><nav class="book-toc"><ol class="toc-groups">${tocList}</ol></nav>`) })
+  files.push({ name: 'OEBPS/nav.xhtml', data: xhtml('目录', `<nav epub:type="toc" xmlns:epub="http://www.idpf.org/2007/ops"><h1>目录</h1><ol>${navList}</ol></nav>`) })
 
   const now = new Date().toISOString().replace(/\.\d+Z$/, 'Z')
+  const cover = files.filter((file) => file.name === 'OEBPS/cover.xhtml')
   files.splice(2, 0, {
     name: 'OEBPS/content.opf',
     data: `<?xml version="1.0" encoding="utf-8"?>
@@ -405,14 +451,14 @@ function buildEpub({ title, author = 'dsh-miniflux', chapters }) {
     <dc:creator>${escapeHtml(author)}</dc:creator><dc:date>${now}</dc:date>
     <meta property="dcterms:modified">${now}</meta>
   </metadata>
-  <manifest>${manifest.join('')}</manifest><spine>${spine.join('')}</spine>
+  <manifest>${manifest.join('')}</manifest>
+  <spine>${spine.map((ref) => `<itemref idref="${ref}"/>`).join('')}</spine>
 </package>`,
   })
 
   return makeZip(files)
 }
 
-/** 文章正文 -> 清洗 + 抓图 + 改写成本地路径。 */
 async function chapterFromEntry(entry, cfg, index, cache) {
   const images = []
   const raw = sanitize(stripProxyUrls(entry.content))
@@ -671,25 +717,43 @@ async function collectNewestUnread(client, cfg) {
   return (data?.entries || []).filter((entry) => scope.has(entry.feed?.id))
 }
 
-async function writeEpub(cfg, name, chapters, title, author = 'dsh-miniflux') {
+async function writeEpub(cfg, name, chapters, title, author = 'dsh-miniflux', groups) {
   const dir = resolveDir(cfg)
   await mkdir(dir, { recursive: true })
   const target = join(dir, `${name}.epub`)
   const cache = new Map()
-  const built = []
-  for (let i = 0; i < chapters.length; i++) {
-    const chapter = chapters[i]
+  let counter = 0
+
+  const build = async (chapter) => {
+    counter += 1
     if (chapter.rawHtml !== undefined) {
-      const { html, images } = await chapterFromEntry({ content: chapter.rawHtml }, cfg, i + 1, cache)
-      built.push({ title: chapter.title, meta: chapter.meta, html, images })
-    } else {
-      built.push({ title: chapter.title, meta: chapter.meta, html: chapter.html })
+      const { html, images } = await chapterFromEntry({ content: chapter.rawHtml }, cfg, counter, cache)
+      return { title: chapter.title, meta: chapter.meta, html, images }
+    }
+    return { title: chapter.title, meta: chapter.meta, html: chapter.html }
+  }
+
+  let buffer
+  let builtCount = 0
+  if (Array.isArray(groups) && groups.length) {
+    const builtGroups = []
+    for (const group of groups) {
+      const articles = []
+      for (const chapter of group.articles || []) articles.push(await build(chapter))
+      if (articles.length) builtGroups.push({ title: group.title, articles })
+      builtCount += articles.length
     }
+    buffer = buildEpub({ title, author, groups: builtGroups })
+  } else {
+    const built = []
+    for (const chapter of chapters || []) built.push(await build(chapter))
+    builtCount = built.length
+    buffer = buildEpub({ title, author, chapters: built })
   }
-  const buffer = buildEpub({ title, author, chapters: built })
+
   await writeFile(target, buffer)
-  const images = built.reduce((sum, chapter) => sum + (chapter.images?.length || 0), 0)
-  return { target, bytes: buffer.length, chapters: built.length, images }
+  const images = [...cache.values()].reduce((sum, list) => sum + list.length, 0)
+  return { target, bytes: buffer.length, chapters: builtCount, images }
 }
 
 async function generateDigest(ctx, client, cfg, kind) {
@@ -839,16 +903,34 @@ async function generatePicks(ctx, client, cfg) {
 async function generateFeedEpub(client, cfg) {
   const candidates = await collect(client, cfg)
   if (!candidates.length) return { ok: false, message: '自选源最近没有新文章 / no entries in the selected feeds' }
-  const title = `${stamp()} 自选源`
-  const picked = candidates.slice(0, 40)
-  const epub = await writeEpub(cfg, `${stamp()}-自选源`, picked.map((entry) => ({
-    title: entry.title,
-    meta: `${escapeHtml(entry.feed?.title || '')} · <a href="${escapeHtml(entry.url)}">原文</a>`,
-    rawHtml: entry.content,
-  })), title)
+
+  const limit = Math.max(10, Number(cfg.feedEpubMax) || 120)
+  const picked = candidates.slice(0, limit)
+
+  // 纯本地拼装，不经过模型：按源分组，一个源一章，文章按时间倒序
+  const byFeed = new Map()
+  for (const entry of picked) {
+    const key = entry.feed?.title || entry.feed?.id || '未分类'
+    if (!byFeed.has(key)) byFeed.set(key, [])
+    byFeed.get(key).push(entry)
+  }
+  const groups = [...byFeed.entries()]
+    .sort((a, b) => b[1].length - a[1].length)
+    .map(([feedTitle, entries]) => ({
+      title: feedTitle,
+      articles: entries.map((entry) => ({
+        title: entry.title,
+        meta: `<a href="${escapeHtml(entry.url)}">原文</a> · ${new Date(entry.published_at).toLocaleString('zh-CN', { hour12: false })}`,
+        rawHtml: entry.content,
+      })),
+    }))
+
+  const title = `${stamp()} 自选源 · ${groups.length} 个源 ${picked.length} 篇`
+  const clock = new Date().toTimeString().slice(0, 5).replace(':', '')
+  const epub = await writeEpub(cfg, `${stamp()}-${clock}-自选源`, [], title, 'dsh-miniflux', groups)
   // 自选源：生成完成后已读化
   await client.call('PUT', '/v1/entries', { entry_ids: picked.map((entry) => entry.id), status: 'read' })
-  return { ok: true, title, epub, candidates: candidates.length, read: picked.length }
+  return { ok: true, title, epub, candidates: candidates.length, read: picked.length, feeds: groups.length }
 }
 
 // ---------------------------------------------------------------------------
@@ -1081,7 +1163,7 @@ async function writeStore(patch) {
 const EDITABLE_FIELDS = ['minifluxUrl', 'minifluxToken', 'aiSource', 'dshProvider', 'dshModel',
   'aiBaseUrl', 'aiApiKey', 'aiModel', 'digestCron', 'picksCron', 'feedEpubCron',
   'epubFeedNames', 'epubDir', 'withImages', 'imageProxy', 'autoStar', 'language',
-  'lookbackHours', 'digestMaxItems', 'aiMaxPicks', 'modelTimeoutSec', 'aiBatchSize', 'maxCandidates', 'picksCandidates', 'picksSkipScreened']
+  'lookbackHours', 'digestMaxItems', 'aiMaxPicks', 'modelTimeoutSec', 'aiBatchSize', 'maxCandidates', 'picksCandidates', 'picksSkipScreened', 'feedEpubMax']
 
 function applyImpl(ctx, config) {
   // 面板保存的值；启动时从文件载入，保存后即时替换
@@ -1105,6 +1187,7 @@ function applyImpl(ctx, config) {
     lookbackHours: Number(value(config?.lookbackHours, 24)) || 24,
     maxCandidates: Number(value(config?.maxCandidates, 200)) || 200,
     picksSkipScreened: value(config?.picksSkipScreened, true),
+    feedEpubMax: Number(value(config?.feedEpubMax, 120)) || 120,
     picksCandidates: Number(value(config?.picksCandidates, 200)) || 200,
     digestMaxItems: Number(value(config?.digestMaxItems, 0)) || 0,
     aiMaxPicks: Number(value(config?.aiMaxPicks, 0)) || 0,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-miniflux",
-  "version": "0.8.0",
+  "version": "0.9.0",
   "description": "Miniflux for the dsh web GUI: AI-written morning/evening digests, per-feed daily EPUB picks, agent tools (miniflux_feeds / miniflux_search / miniflux_read / miniflux_digest / miniflux_epub / miniflux_star). Configured from the plugin settings page.",
   "type": "module",
   "main": "lib/index.js",