koishi-plugin-dwrgbwiki 2.1.1 → 2.1.3

package/codex.js

@@ -36,26 +36,26 @@ async function fetchText(url, timeout) {
 }
 
 async function fetchUrl(url, timeout) {
-  const ctrl = new AbortController()
-  const timer = setTimeout(() => ctrl.abort(), timeout)
-  const doFetch = () => fetch(url, {
-    signal: ctrl.signal,
-    headers: {
-      'User-Agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0 Safari/537.36',
-      'Accept-Language': 'zh-CN,zh;q=0.9',
-    },
-  })
-  try {
-    let res = await doFetch()
-    if (res.status === 567 || res.status === 429 || res.status === 503) {
-      await new Promise(r => setTimeout(r, 3000))
-      res = await doFetch()
-    }
-    if (!res.ok) throw new Error('HTTP ' + res.status)
-    return await res.text()
-  } finally {
-    clearTimeout(timer)
+  const headers = {
+    'User-Agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0 Safari/537.36',
+    'Accept-Language': 'zh-CN,zh;q=0.9',
+  }
+  const doFetch = () => {
+    const ctrl = new AbortController()
+    const timer = setTimeout(() => ctrl.abort(), timeout)
+    const p = fetch(url, { signal: ctrl.signal, headers })
+    p.finally(() => clearTimeout(timer))
+    return p
   }
+  let res = await doFetch()
+  const RETRY_WAIT = [3000, 8000]
+  for (const wait of RETRY_WAIT) {
+    if (res.status !== 567 && res.status !== 429 && res.status !== 503) break
+    await new Promise(r => setTimeout(r, wait))
+    res = await doFetch()
+  }
+  if (!res.ok) throw new Error('HTTP ' + res.status)
+  return await res.text()
 }
 
 async function fetchCategoryMembers(category, config) {
@@ -74,6 +74,14 @@ async function fetchCategoryMembers(category, config) {
   return titles
 }
 
+async function searchPages(query, config) {
+  const q = String(query || '').trim().replace(/[“”"]/g, '')
+  if (!q) return []
+  const url = API_BASE + '/api.php?action=query&list=search&srsearch=' + encodeURIComponent(q) + '&srlimit=5&format=json&formatversion=2'
+  const data = await fetchRaw(url, config.timeout || 15000)
+  return (data.query && data.query.search) || []
+}
+
 function buildRoleHtml(category, titles, config) {
   const width = config.width || 1300
   const total = titles.length
@@ -116,49 +124,28 @@ body { background:#0d1117; color:#c9d1d9; font-family:-apple-system,BlinkMacSyst
 async function resolveTitle(title, config) {
   const q = String(title || '').trim()
   if (!q) throw new Error('请输入页面名')
-  let triedQuotes = false
-  let current = q
-  for (let hop = 0; hop < 3; hop++) {
-    const url = API_BASE + '/api.php?action=query&redirects=1&prop=info&titles=' + encodeURIComponent(current) + '&format=json&formatversion=2'
-    const data = await fetchRaw(url, config.timeout || 15000)
-    const page = (data.query && data.query.pages && data.query.pages[0])
-    if (page && !page.missing && page.title) return page.title
-    if (!triedQuotes && !/[“”"]/.test(q)) {
-      triedQuotes = true
-      current = '“' + q + '”'
-      continue
-    }
-    throw new Error('页面不存在：' + current)
-  }
+  const hasQuote = /[“”"]/.test(q)
+  const candidates = hasQuote ? [q] : [q, '“' + q + '”']
+  const url = API_BASE + '/api.php?action=query&redirects=1&prop=info&titles=' + encodeURIComponent(candidates.join('|')) + '&format=json&formatversion=2'
+  const data = await fetchRaw(url, config.timeout || 15000)
+  const pages = (data.query && data.query.pages) || []
+  const page = pages.find(p => !p.missing && p.title)
+  if (page) return page.title
   throw new Error('页面不存在：' + q)
 }
 
 async function fetchWikitext(title, config) {
   const q = String(title || '').trim()
   if (!q) throw new Error('请输入要查询的名称')
-  let current = q
-  let triedQuotes = false
-  for (let hop = 0; hop < 5; hop++) {
-    const url = API_BASE + '/api.php?action=query&prop=revisions&rvprop=content&format=json&formatversion=2&titles=' + encodeURIComponent(current)
-    const data = await fetchRaw(url, config.timeout || 15000)
-    const pages = (data.query && data.query.pages) || []
-    const page = pages[0]
-    if (!page || page.missing) {
-      if (!triedQuotes && !/[“”"]/.test(q)) {
-        triedQuotes = true
-        current = '“' + q + '”'
-        continue
-      }
-      throw new Error('页面不存在：' + current)
-    }
-    if (!page.revisions || !page.revisions.length) throw new Error('页面「' + current + '」无内容')
-    const content = page.revisions[0].content
-    const rd = content.match(/^\s*#(?:重定向|REDIRECT)\s*\[\[([^\]]+)\]\]/)
-    if (rd && rd[1] && rd[1] !== current) {
-      current = rd[1].split('|')[0].trim()
-      continue
-    }
-    return { title: page.title, content }
+  const hasQuote = /[“”"]/.test(q)
+  const candidates = hasQuote ? [q] : [q, '“' + q + '”']
+  const url = API_BASE + '/api.php?action=query&prop=revisions&rvprop=content&redirects=1&format=json&formatversion=2&titles=' + encodeURIComponent(candidates.join('|'))
+  const data = await fetchRaw(url, config.timeout || 15000)
+  const pages = (data.query && data.query.pages) || []
+  const found = pages.find(p => !p.missing)
+  if (found) {
+    if (found.revisions && found.revisions.length) return { title: found.title, content: found.revisions[0].content }
+    throw new Error('页面「' + found.title + '」无内容')
   }
   throw new Error('页面不存在：' + q)
 }
@@ -510,6 +497,7 @@ module.exports = {
   fetchWikitext,
   resolveTitle,
   fetchCategoryMembers,
+  searchPages,
   buildRoleHtml,
   parseTemplates,
   mergeParams,

package/index.js

@@ -879,7 +879,19 @@ async function codexImage(ctx, config, rest) {
     return [h.image(image, 'image/png')]
   } catch (e) {
     ctx.logger('dwrgbwiki').warn(e)
-    return errorImage(ctx, config, '图鉴查询失败：' + (e && e.message ? e.message : e), '图鉴', codexWidth(sub, config))
+    const msg = e && e.message ? e.message : String(e)
+    if (String(msg).includes('页面不存在')) {
+      try {
+        const results = await codex.searchPages(q, config)
+        if (results.length) {
+          const list = results.slice(0, 5).map(r => '  ' + r.title).join('\n')
+          return '未找到「' + q + '」相关页面，为你找到：\n' + list + '\n可尝试：图鉴 ' + sub.name + ' <上面的名称>'
+        }
+      } catch (e2) {
+        ctx.logger('dwrgbwiki').warn(e2)
+      }
+    }
+    return errorImage(ctx, config, '图鉴查询失败：' + msg, '图鉴', codexWidth(sub, config))
   }
 }
 

package/notice.js

@@ -1,291 +1,293 @@
-'use strict'
-
-// ===== 网易官方公告解析与图片渲染 =====
-// 公告文本格式（网易 h55_notice_version2.txt）：
-//   <t>标题</t> <c2>引言正文</c2>
-//   <t1>大节</t1> <t2>小节</t2> <t3>三级标题</t3>
-//   <c1><l2>/<l3>内容行</c1>（l2/l3 为单标签，标记行类型）
-//   <tt1>表格标题</tt1> <tt2>表头,列</tt2> <tc>行,列</tc>
-//   <te>结尾标题</te><c2>结尾正文</c2>
-//   #cRRGGBB 行内颜色（到 #n 结束） #n/#r 换行 【】高亮
-
-const CACHE = new Map()
-const CACHE_TTL = 6 * 60 * 60 * 1000
-
-function esc(s) {
-  return String(s == null ? '' : s)
-    .replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;')
-    .replace(/"/g, '&quot;').replace(/'/g, '&#39;')
-}
-
-// 行内格式：#cRRGGBB 颜色、#n/#r 换行、【】高亮
-function inlineHtml(raw) {
-  const parts = String(raw == null ? '' : raw).split(/(#c[0-9a-fA-F]{6}|#n|#r)/)
-  let out = ''
-  let color = ''
-  for (let i = 0; i < parts.length; i++) {
-    const p = parts[i]
-    if (/^#c[0-9a-fA-F]{6}$/.test(p)) { color = p.slice(2); continue }
-    if (p === '#n' || p === '#r') { out += '<br>'; color = ''; continue }
-    if (!p) continue
-    const seg = esc(p)
-      .split('\n').map(l => l.trim()).join('<br>')
-      .replace(/【([^】]+)】/g, '<span class="kw">$1</span>')
-    out += color ? '<span style="color:#' + color + '">' + seg + '</span>' : seg
-  }
-  return out
-}
-
-function splitCols(s) {
-  return String(s).split(',').map(x => x.trim()).filter(Boolean)
-}
-
-// 解析一个大节内部的内容（c1 内容行 / t2 / t3 / 表格）
-function parseItems(body) {
-  const items = []
-  const re = /<tt1>([^<]*)<\/tt1>|<tt2>([^<]*)<\/tt2>|<tc>([^<]*)<\/tc>|<t2>([^<]*)<\/t2>|<t3>([^<]*)<\/t3>|<c1>([\s\S]*?)<\/c1>/g
-  let m
-  let table = null
-  while ((m = re.exec(body)) !== null) {
-    if (m[1] !== undefined) { // tt1 表格标题
-      if (table && table.headers.length) { items.push(table); table = null }
-      table = { type: 'table', title: m[1].trim(), headers: [], rows: [] }
-    } else if (m[2] !== undefined) { // tt2 表头
-      if (!table) table = { type: 'table', title: '', headers: [], rows: [] }
-      table.headers = splitCols(m[2])
-    } else if (m[3] !== undefined) { // tc 表格行
-      if (!table) table = { type: 'table', title: '', headers: [], rows: [] }
-      table.rows.push(splitCols(m[3]))
-    } else if (m[4] !== undefined) { // t2 小节标题
-      if (table && table.headers.length) { items.push(table); table = null }
-      items.push({ type: 'sub', text: m[4].trim() })
-    } else if (m[5] !== undefined) { // t3 三级标题
-      if (table && table.headers.length) { items.push(table); table = null }
-      items.push({ type: 'h3', text: m[5].trim() })
-    } else { // c1 内容块
-      if (table && table.headers.length) { items.push(table); table = null }
-      const inner = m[6]
-      const lvMatch = inner.match(/^<l([23])>/)
-      const txt = inner.replace(/^<l[23]>/, '').trim()
-      if (txt) items.push({ type: 'item', lv: lvMatch ? Number(lvMatch[1]) : 2, text: txt })
-    }
-  }
-  if (table && table.headers.length) items.push(table)
-  return items
-}
-
-// 完整解析公告文本 → 结构化对象
-function parseNotice(text) {
-  const s = String(text || '')
-  const title = (s.match(/<t>([^<]*)<\/t>/) || [])[1] || ''
-
-  // 结尾公告（<te> 标题 + 之后的 <c2> 正文）
-  let endTitle = ''
-  let endBody = ''
-  let main = s
-  const teMatch = s.match(/<te>([^<]*)<\/te>([\s\S]*)$/)
-  if (teMatch) {
-    endTitle = teMatch[1].trim()
-    main = s.slice(0, teMatch.index)
-    const endBodyMatch = teMatch[2].match(/<c2>([\s\S]*?)<\/c2>/)
-    endBody = endBodyMatch ? endBodyMatch[1].trim() : teMatch[2].replace(/<[^>]+>/g, '').trim()
-  }
-
-  // 引言（首个 <c2>）
-  let intro = ''
-  const c2Match = main.match(/<c2>([\s\S]*?)<\/c2>/)
-  if (c2Match) {
-    intro = c2Match[1].trim()
-    main = main.replace(c2Match[0], '')
-  }
-
-  // 大节（按 <t1> 切分）
-  const sections = []
-  const parts = main.split(/(?=<t1>[^<]*<\/t1>)/)
-  for (const part of parts) {
-    const m = part.match(/^<t1>([^<]*)<\/t1>([\s\S]*)$/)
-    if (m && m[1].trim()) {
-      sections.push({ title: m[1].trim(), items: parseItems(m[2]) })
-    }
-  }
-  return { title, intro, sections, endTitle, endBody }
-}
-
-// 带缓存的解析（避免重复解析同一公告）
-function parseNoticeCached(text) {
-  const key = require('crypto').createHash('sha256').update(String(text || '')).digest('hex')
-  const hit = CACHE.get(key)
-  if (hit && Date.now() - hit.ts < CACHE_TTL) return hit.data
-  const data = parseNotice(text)
-  CACHE.set(key, { data, ts: Date.now() })
-  return data
-}
-
-// ===== 增量 diff：对比新旧解析结果，找出变化的部分 =====
-
-function itemKey(it) {
-  if (it.type === 'table') {
-    return 'table|' + it.title + '|' + it.headers.join(',') + '|' + it.rows.map(r => r.join(',')).join(';')
-  }
-  return it.type + '|' + String(it.text || '').replace(/\s+/g, ' ').trim()
-}
-
-function normalizeSpace(s) {
-  return String(s || '').replace(/\s+/g, ' ').trim()
-}
-
-// 用 LCS 标记当前 items 中相对 prevItems 有变化（新增/修改）的项
-function diffItems(prevItems, currItems) {
-  const a = prevItems, b = currItems
-  const n = a.length, m = b.length
-  const dp = Array.from({ length: n + 1 }, () => new Array(m + 1).fill(0))
-  for (let i = n - 1; i >= 0; i--) {
-    for (let j = m - 1; j >= 0; j--) {
-      dp[i][j] = itemKey(a[i]) === itemKey(b[j])
-        ? dp[i + 1][j + 1] + 1
-        : Math.max(dp[i + 1][j], dp[i][j + 1])
-    }
-  }
-  const inLcs = new Array(m).fill(false)
-  let i = 0, j = 0
-  while (i < n && j < m) {
-    if (itemKey(a[i]) === itemKey(b[j])) { inLcs[j] = true; i++; j++ }
-    else if (dp[i + 1][j] >= dp[i][j + 1]) i++
-    else j++
-  }
-  return b.map((it, idx) => ({ ...it, changed: !inLcs[idx] }))
-}
-
-// 对比新旧解析结果，返回变化摘要（仅含发生变化的部分）
-function diffNotice(prev, curr) {
-  const prevByTitle = new Map()
-  prev.sections.forEach((s, i) => {
-    if (!prevByTitle.has(s.title)) prevByTitle.set(s.title, [])
-    prevByTitle.get(s.title).push(i)
-  })
-  const used = new Set()
-  const sections = []
-  curr.sections.forEach(sec => {
-    const idxs = prevByTitle.get(sec.title) || []
-    const pIdx = idxs.find(i => !used.has(i))
-    let items, isNew
-    if (pIdx === undefined) {
-      isNew = true
-      items = sec.items.map(it => ({ ...it, changed: true }))
-    } else {
-      used.add(pIdx)
-      isNew = false
-      items = diffItems(prev.sections[pIdx].items, sec.items)
-    }
-    const hasChanged = isNew || items.some(it => it.changed)
-    if (hasChanged) sections.push({ title: sec.title, items, isNew })
-  })
-  const intro = normalizeSpace(prev.intro) !== normalizeSpace(curr.intro)
-  const end = normalizeSpace(prev.endTitle + prev.endBody) !== normalizeSpace(curr.endTitle + curr.endBody)
-  return { intro, end, sections, hasChange: intro || end || sections.length > 0 }
-}
-
-// ===== 图片渲染 =====
-
-function tableHtml(t) {
-  const th = t.headers.map(h => '<th>' + esc(h) + '</th>').join('')
-  const tr = t.rows.map(r => '<tr>' + r.map(c => '<td>' + esc(c) + '</td>').join('') + '</tr>').join('')
-  return '<div class="tbl' + (t.changed ? ' changed' : '') + '">' +
-    (t.title ? '<div class="tbl-title">' + inlineHtml(t.title) + '</div>' : '') +
-    '<table><thead><tr>' + th + '</tr></thead><tbody>' + tr + '</tbody></table></div>'
-}
-
-function sectionHtml(sec, idx) {
-  const itemsHtml = sec.items.map(it => {
-    if (it.type === 'sub') return '<div class="s-sub">' + inlineHtml(it.text) + '</div>'
-    if (it.type === 'h3') return '<div class="s-h3">' + inlineHtml(it.text) + '</div>'
-    if (it.type === 'table') return tableHtml(it)
-    return '<div class="row' + (it.changed ? ' changed' : '') + '"><span class="dot"></span><div class="row-text">' + inlineHtml(it.text) + '</div></div>'
-  }).join('')
-  return '<div class="section">' +
-    '<div class="s-head"><span class="s-num">' + String(idx + 1).padStart(2, '0') + '</span>' + inlineHtml(sec.title) +
-    (sec.isNew ? '<span class="tag-new">新增</span>' : '') +
-    '</div>' +
-    itemsHtml +
-    '</div>'
-}
-
-function buildNoticeHtml(parsed, config, changed) {
-  const width = config.width || 1300
-  const sourceName = config.sourceName || '官方'
-  const title = parsed.title || '更新公告'
-  const introLines = parsed.intro.split('\n').map(l => l.trim()).filter(Boolean)
-  const introHtml = introLines.length
-    ? '<div class="intro' + (changed ? ' update' : '') + '">' + introLines.map(l => inlineHtml(l)).join('<br>') + '</div>'
-    : ''
-  const sectionsHtml = changed
-    ? changed.sections.map(sectionHtml).join('')
-    : parsed.sections.map(sectionHtml).join('')
-  const endHtml = (changed ? changed.end && (parsed.endTitle || parsed.endBody) : parsed.endTitle || parsed.endBody)
-    ? '<div class="end-card"><div class="end-title">' + inlineHtml(parsed.endTitle || '公告') + '</div>' +
-      '<div class="end-body">' + inlineHtml(parsed.endBody) + '</div></div>'
-    : ''
-
-  return `<!DOCTYPE html>
-<html lang="zh-CN">
-<head>
-<meta charset="UTF-8">
-<style>
-* { margin:0; padding:0; box-sizing:border-box; }
-body { font-family:-apple-system,BlinkMacSystemFont,'Segoe UI','Microsoft YaHei',sans-serif; color:#e6edf3;
-  background:radial-gradient(1400px 700px at 50% -10%, #1b2a4a 0%, #10182b 45%, #0a0e17 100%); padding:26px 20px; }
-.page { max-width:${width}px; margin:0 auto; }
-.hero { text-align:center; padding:26px 24px 22px; border-radius:18px; margin-bottom:18px;
-  background:linear-gradient(135deg, #667eea 0%, #764ba2 55%, #a4508b 100%); box-shadow:0 8px 28px rgba(0,0,0,.4); position:relative; overflow:hidden; }
-.hero::after { content:''; position:absolute; inset:0; background:radial-gradient(600px 200px at 80% -20%, rgba(255,255,255,.18), transparent 60%); }
-.badge { display:inline-flex; align-items:center; gap:6px; font-size:14px; font-weight:700; color:#ffd76d;
-  background:rgba(0,0,0,.28); border:1px solid rgba(255,215,109,.4); border-radius:999px; padding:4px 14px; margin-bottom:12px; letter-spacing:1px; }
-.title { font-size:34px; font-weight:800; color:#fff; letter-spacing:2px; text-shadow:0 2px 10px rgba(0,0,0,.35); }
-.sub { font-size:14px; color:rgba(255,255,255,.8); margin-top:8px; letter-spacing:.5px; }
-.intro { background:rgba(22,27,34,.82); border:1px solid rgba(255,255,255,.1); border-left:4px solid #ffd76d;
-  border-radius:14px; padding:16px 20px; margin-bottom:16px; line-height:1.9; font-size:16px; color:#c9d1d9; }
-.section { background:rgba(22,27,34,.78); border:1px solid rgba(255,255,255,.09); border-radius:16px; padding:18px 20px; margin-bottom:16px; }
-.s-head { display:flex; align-items:center; gap:12px; font-size:22px; font-weight:800; color:#ffd76d; letter-spacing:1px;
-  padding-bottom:12px; margin-bottom:12px; border-bottom:1px solid rgba(255,255,255,.08); }
-.s-num { flex-shrink:0; width:34px; height:34px; border-radius:10px; display:flex; align-items:center; justify-content:center;
-  font-size:15px; font-weight:800; color:#fff; background:linear-gradient(135deg,#667eea,#764ba2); box-shadow:0 3px 10px rgba(102,126,234,.35); }
-.s-sub { font-size:16px; font-weight:700; color:#79c0ff; margin:2px 0 10px; padding-left:10px; border-left:3px solid #58a6ff; line-height:1.6; }
-.s-h3 { font-size:15.5px; font-weight:700; color:#56d4dd; margin:12px 0 8px; padding-left:10px; border-left:3px solid #56d4dd; line-height:1.6; }
-.row { display:flex; gap:10px; margin-bottom:10px; line-height:1.85; font-size:15.5px; color:#c9d1d9; }
-.row:last-child { margin-bottom:0; }
-.dot { flex-shrink:0; width:7px; height:7px; border-radius:50%; margin-top:10px; background:linear-gradient(135deg,#ffd76d,#ff8c00); box-shadow:0 0 6px rgba(255,180,60,.6); }
-.row-text { flex:1; }
-.row.changed { background:rgba(255,215,109,.08); border:1px solid rgba(255,215,109,.28); border-radius:8px; padding:6px 10px; margin-left:-6px; margin-right:-6px; }
-.row.changed .dot { background:#3fb950; box-shadow:0 0 6px rgba(63,185,80,.6); }
-.kw { color:#ffd76d; font-weight:700; }
-.tag-new { flex-shrink:0; font-size:12px; font-weight:700; color:#0d1117; background:linear-gradient(135deg,#3fb950,#2ea043); border-radius:999px; padding:2px 10px; letter-spacing:.5px; }
-.tbl { margin:10px 0 14px; }
-.tbl.changed { border:1px solid rgba(255,215,109,.35); border-radius:12px; padding:10px 12px; background:rgba(255,215,109,.05); }
-.intro.update { border-left-color:#3fb950; }
-.tbl-title { font-size:15px; font-weight:800; color:#fff; margin-bottom:8px; letter-spacing:.5px; }
-.tbl table { width:100%; border-collapse:collapse; border-radius:10px; overflow:hidden; }
-.tbl th { background:linear-gradient(135deg,#667eea,#764ba2); color:#fff; font-size:14.5px; font-weight:700; padding:8px 14px; text-align:center; }
-.tbl td { padding:8px 14px; font-size:15px; text-align:center; color:#e6edf3; border-top:1px solid rgba(255,255,255,.07); background:rgba(255,255,255,.02); }
-.end-card { background:rgba(248,81,73,.08); border:1px solid rgba(248,81,73,.35); border-radius:16px; padding:18px 20px; margin-top:4px; }
-.end-title { font-size:18px; font-weight:800; color:#ff7b72; margin-bottom:10px; letter-spacing:.5px; }
-.end-body { line-height:1.9; font-size:15px; color:#c9d1d9; }
-.foot { text-align:center; color:#8b949e; font-size:13px; margin-top:16px; opacity:.75; letter-spacing:.5px; }
-</style>
-</head>
-<body>
-<div class="page">
-  <div class="hero">
-    <div class="badge">${changed ? '✏️ 更新内容 · ' : '📢 '}${esc(sourceName)}公告</div>
-    <div class="title">${esc(title)}</div>
-    <div class="sub">第五人格 · ${changed ? '本次更新内容' : esc(sourceName) + '公告推送'}</div>
-  </div>
-  ${introHtml}
-  ${sectionsHtml}
-  ${endHtml}
-  <div class="foot">数据来源：网易官方公告 · BWIKI 机器人推送</div>
-</div>
-</body>
-</html>`
-}
-
-module.exports = { parseNotice, parseNoticeCached, diffNotice, buildNoticeHtml, inlineHtml }
+'use strict'
+
+// ===== 网易官方公告解析与图片渲染 =====
+// 公告文本格式（网易 h55_notice_version2.txt）：
+//   <t>标题</t> <c2>引言正文</c2>
+//   <t0>顶部大节（如线上问题修复）</t0> <t1>大节</t1> <t2>小节</t2> <t3>三级标题</t3>
+//   <c1><l2>/<l3>内容行</c1>（l2/l3 为单标签，标记行类型）
+//   <tt1>表格标题</tt1> <tt2>表头,列</tt2> <tc>行,列</tc>
+//   <te>结尾标题</te><c2>结尾正文</c2>
+//   #cRRGGBB 行内颜色（到 #n 结束） #n/#r 换行 【】高亮
+
+const CACHE = new Map()
+const CACHE_TTL = 6 * 60 * 60 * 1000
+
+function esc(s) {
+  return String(s == null ? '' : s)
+    .replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;')
+    .replace(/"/g, '&quot;').replace(/'/g, '&#39;')
+}
+
+// 行内格式：#cRRGGBB 颜色、#n/#r 换行、【】高亮
+function inlineHtml(raw) {
+  const parts = String(raw == null ? '' : raw).split(/(#c[0-9a-fA-F]{6}|#n|#r)/)
+  let out = ''
+  let color = ''
+  for (let i = 0; i < parts.length; i++) {
+    const p = parts[i]
+    if (/^#c[0-9a-fA-F]{6}$/.test(p)) { color = p.slice(2); continue }
+    if (p === '#n' || p === '#r') { out += '<br>'; color = ''; continue }
+    if (!p) continue
+    const seg = esc(p)
+      .split('\n').map(l => l.trim()).join('<br>')
+      .replace(/【([^】]+)】/g, '<span class="kw">$1</span>')
+    out += color ? '<span style="color:#' + color + '">' + seg + '</span>' : seg
+  }
+  return out
+}
+
+function splitCols(s) {
+  return String(s).split(',').map(x => x.trim()).filter(Boolean)
+}
+
+// 解析一个大节内部的内容（c1 内容行 / t2 / t3 / 表格）
+function parseItems(body) {
+  const items = []
+  const re = /<tt1>([^<]*)<\/tt1>|<tt2>([^<]*)<\/tt2>|<tc>([^<]*)<\/tc>|<t2>([^<]*)<\/t2>|<t3>([^<]*)<\/t3>|<c1>([\s\S]*?)<\/c1>/g
+  let m
+  let table = null
+  while ((m = re.exec(body)) !== null) {
+    if (m[1] !== undefined) { // tt1 表格标题
+      if (table && table.headers.length) { items.push(table); table = null }
+      table = { type: 'table', title: m[1].trim(), headers: [], rows: [] }
+    } else if (m[2] !== undefined) { // tt2 表头
+      if (!table) table = { type: 'table', title: '', headers: [], rows: [] }
+      table.headers = splitCols(m[2])
+    } else if (m[3] !== undefined) { // tc 表格行
+      if (!table) table = { type: 'table', title: '', headers: [], rows: [] }
+      table.rows.push(splitCols(m[3]))
+    } else if (m[4] !== undefined) { // t2 小节标题
+      if (table && table.headers.length) { items.push(table); table = null }
+      items.push({ type: 'sub', text: m[4].trim() })
+    } else if (m[5] !== undefined) { // t3 三级标题
+      if (table && table.headers.length) { items.push(table); table = null }
+      items.push({ type: 'h3', text: m[5].trim() })
+    } else { // c1 内容块
+      if (table && table.headers.length) { items.push(table); table = null }
+      const inner = m[6]
+      const lvMatch = inner.match(/^<l([23])>/)
+      const txt = inner.replace(/^<l[23]>/, '').trim()
+      if (txt) items.push({ type: 'item', lv: lvMatch ? Number(lvMatch[1]) : 2, text: txt })
+    }
+  }
+  if (table && table.headers.length) items.push(table)
+  return items
+}
+
+// 完整解析公告文本 → 结构化对象
+function parseNotice(text) {
+  const s = String(text || '')
+  const title = (s.match(/<t>([^<]*)<\/t>/) || [])[1] || ''
+
+  // 结尾公告（<te> 标题 + 之后的 <c2> 正文）
+  let endTitle = ''
+  let endBody = ''
+  let main = s
+  const teMatch = s.match(/<te>([^<]*)<\/te>([\s\S]*)$/)
+  if (teMatch) {
+    endTitle = teMatch[1].trim()
+    main = s.slice(0, teMatch.index)
+    const endBodyMatch = teMatch[2].match(/<c2>([\s\S]*?)<\/c2>/)
+    endBody = endBodyMatch ? endBodyMatch[1].trim() : teMatch[2].replace(/<[^>]+>/g, '').trim()
+  }
+
+  // 引言（首个 <c2>）
+  let intro = ''
+  const c2Match = main.match(/<c2>([\s\S]*?)<\/c2>/)
+  if (c2Match) {
+    intro = c2Match[1].trim()
+    main = main.replace(c2Match[0], '')
+  }
+
+  // 大节（按 <t0>/<t1> 切分；<t0> 为“线上问题修复”等顶部栏目，同样作为大节处理）
+  // 先去掉公告标题 <t>...</t>，否则它会和其后的 <t0> 混在首段里被丢弃
+  main = main.replace(/^<t>[^<]*<\/t>\s*/, '')
+  const sections = []
+  const parts = main.split(/(?=<t[01]>[^<]*<\/t[01]>)/)
+  for (const part of parts) {
+    const m = part.match(/^<t([01])>([^<]*)<\/t\1>([\s\S]*)$/)
+    if (m && m[2].trim()) {
+      sections.push({ title: m[2].trim(), level: Number(m[1]), items: parseItems(m[3]) })
+    }
+  }
+  return { title, intro, sections, endTitle, endBody }
+}
+
+// 带缓存的解析（避免重复解析同一公告）
+function parseNoticeCached(text) {
+  const key = require('crypto').createHash('sha256').update(String(text || '')).digest('hex')
+  const hit = CACHE.get(key)
+  if (hit && Date.now() - hit.ts < CACHE_TTL) return hit.data
+  const data = parseNotice(text)
+  CACHE.set(key, { data, ts: Date.now() })
+  return data
+}
+
+// ===== 增量 diff：对比新旧解析结果，找出变化的部分 =====
+
+function itemKey(it) {
+  if (it.type === 'table') {
+    return 'table|' + it.title + '|' + it.headers.join(',') + '|' + it.rows.map(r => r.join(',')).join(';')
+  }
+  return it.type + '|' + String(it.text || '').replace(/\s+/g, ' ').trim()
+}
+
+function normalizeSpace(s) {
+  return String(s || '').replace(/\s+/g, ' ').trim()
+}
+
+// 用 LCS 标记当前 items 中相对 prevItems 有变化（新增/修改）的项
+function diffItems(prevItems, currItems) {
+  const a = prevItems, b = currItems
+  const n = a.length, m = b.length
+  const dp = Array.from({ length: n + 1 }, () => new Array(m + 1).fill(0))
+  for (let i = n - 1; i >= 0; i--) {
+    for (let j = m - 1; j >= 0; j--) {
+      dp[i][j] = itemKey(a[i]) === itemKey(b[j])
+        ? dp[i + 1][j + 1] + 1
+        : Math.max(dp[i + 1][j], dp[i][j + 1])
+    }
+  }
+  const inLcs = new Array(m).fill(false)
+  let i = 0, j = 0
+  while (i < n && j < m) {
+    if (itemKey(a[i]) === itemKey(b[j])) { inLcs[j] = true; i++; j++ }
+    else if (dp[i + 1][j] >= dp[i][j + 1]) i++
+    else j++
+  }
+  return b.map((it, idx) => ({ ...it, changed: !inLcs[idx] }))
+}
+
+// 对比新旧解析结果，返回变化摘要（仅含发生变化的部分）
+function diffNotice(prev, curr) {
+  const prevByTitle = new Map()
+  prev.sections.forEach((s, i) => {
+    if (!prevByTitle.has(s.title)) prevByTitle.set(s.title, [])
+    prevByTitle.get(s.title).push(i)
+  })
+  const used = new Set()
+  const sections = []
+  curr.sections.forEach(sec => {
+    const idxs = prevByTitle.get(sec.title) || []
+    const pIdx = idxs.find(i => !used.has(i))
+    let items, isNew
+    if (pIdx === undefined) {
+      isNew = true
+      items = sec.items.map(it => ({ ...it, changed: true }))
+    } else {
+      used.add(pIdx)
+      isNew = false
+      items = diffItems(prev.sections[pIdx].items, sec.items)
+    }
+    const hasChanged = isNew || items.some(it => it.changed)
+    if (hasChanged) sections.push({ title: sec.title, items, isNew })
+  })
+  const intro = normalizeSpace(prev.intro) !== normalizeSpace(curr.intro)
+  const end = normalizeSpace(prev.endTitle + prev.endBody) !== normalizeSpace(curr.endTitle + curr.endBody)
+  return { intro, end, sections, hasChange: intro || end || sections.length > 0 }
+}
+
+// ===== 图片渲染 =====
+
+function tableHtml(t) {
+  const th = t.headers.map(h => '<th>' + esc(h) + '</th>').join('')
+  const tr = t.rows.map(r => '<tr>' + r.map(c => '<td>' + esc(c) + '</td>').join('') + '</tr>').join('')
+  return '<div class="tbl' + (t.changed ? ' changed' : '') + '">' +
+    (t.title ? '<div class="tbl-title">' + inlineHtml(t.title) + '</div>' : '') +
+    '<table><thead><tr>' + th + '</tr></thead><tbody>' + tr + '</tbody></table></div>'
+}
+
+function sectionHtml(sec, idx) {
+  const itemsHtml = sec.items.map(it => {
+    if (it.type === 'sub') return '<div class="s-sub">' + inlineHtml(it.text) + '</div>'
+    if (it.type === 'h3') return '<div class="s-h3">' + inlineHtml(it.text) + '</div>'
+    if (it.type === 'table') return tableHtml(it)
+    return '<div class="row' + (it.changed ? ' changed' : '') + '"><span class="dot"></span><div class="row-text">' + inlineHtml(it.text) + '</div></div>'
+  }).join('')
+  return '<div class="section">' +
+    '<div class="s-head"><span class="s-num">' + String(idx + 1).padStart(2, '0') + '</span>' + inlineHtml(sec.title) +
+    (sec.isNew ? '<span class="tag-new">新增</span>' : '') +
+    '</div>' +
+    itemsHtml +
+    '</div>'
+}
+
+function buildNoticeHtml(parsed, config, changed) {
+  const width = config.width || 1300
+  const sourceName = config.sourceName || '官方'
+  const title = parsed.title || '更新公告'
+  const introLines = parsed.intro.split('\n').map(l => l.trim()).filter(Boolean)
+  const introHtml = introLines.length
+    ? '<div class="intro' + (changed ? ' update' : '') + '">' + introLines.map(l => inlineHtml(l)).join('<br>') + '</div>'
+    : ''
+  const sectionsHtml = changed
+    ? changed.sections.map(sectionHtml).join('')
+    : parsed.sections.map(sectionHtml).join('')
+  const endHtml = (changed ? changed.end && (parsed.endTitle || parsed.endBody) : parsed.endTitle || parsed.endBody)
+    ? '<div class="end-card"><div class="end-title">' + inlineHtml(parsed.endTitle || '公告') + '</div>' +
+      '<div class="end-body">' + inlineHtml(parsed.endBody) + '</div></div>'
+    : ''
+
+  return `<!DOCTYPE html>
+<html lang="zh-CN">
+<head>
+<meta charset="UTF-8">
+<style>
+* { margin:0; padding:0; box-sizing:border-box; }
+body { font-family:-apple-system,BlinkMacSystemFont,'Segoe UI','Microsoft YaHei',sans-serif; color:#e6edf3;
+  background:radial-gradient(1400px 700px at 50% -10%, #1b2a4a 0%, #10182b 45%, #0a0e17 100%); padding:26px 20px; }
+.page { max-width:${width}px; margin:0 auto; }
+.hero { text-align:center; padding:26px 24px 22px; border-radius:18px; margin-bottom:18px;
+  background:linear-gradient(135deg, #667eea 0%, #764ba2 55%, #a4508b 100%); box-shadow:0 8px 28px rgba(0,0,0,.4); position:relative; overflow:hidden; }
+.hero::after { content:''; position:absolute; inset:0; background:radial-gradient(600px 200px at 80% -20%, rgba(255,255,255,.18), transparent 60%); }
+.badge { display:inline-flex; align-items:center; gap:6px; font-size:25px; font-weight:700; color:#ffd76d;
+  background:rgba(0,0,0,.28); border:1px solid rgba(255,215,109,.4); border-radius:999px; padding:4px 14px; margin-bottom:12px; letter-spacing:1px; }
+.title { font-size:35px; font-weight:800; color:#fff; letter-spacing:2px; text-shadow:0 2px 10px rgba(0,0,0,.35); }
+.sub { font-size:25px; color:rgba(255,255,255,.8); margin-top:8px; letter-spacing:.5px; }
+.intro { background:rgba(22,27,34,.82); border:1px solid rgba(255,255,255,.1); border-left:4px solid #ffd76d;
+  border-radius:14px; padding:16px 20px; margin-bottom:16px; line-height:1.9; font-size:25px; color:#c9d1d9; }
+.section { background:rgba(22,27,34,.78); border:1px solid rgba(255,255,255,.09); border-radius:16px; padding:18px 20px; margin-bottom:16px; }
+.s-head { display:flex; align-items:center; gap:12px; font-size:25px; font-weight:800; color:#ffd76d; letter-spacing:1px;
+  padding-bottom:12px; margin-bottom:12px; border-bottom:1px solid rgba(255,255,255,.08); }
+.s-num { flex-shrink:0; width:34px; height:34px; border-radius:10px; display:flex; align-items:center; justify-content:center;
+  font-size:25px; font-weight:800; color:#fff; background:linear-gradient(135deg,#667eea,#764ba2); box-shadow:0 3px 10px rgba(102,126,234,.35); }
+.s-sub { font-size:25px; font-weight:700; color:#79c0ff; margin:2px 0 10px; padding-left:10px; border-left:3px solid #58a6ff; line-height:1.6; }
+.s-h3 { font-size:25px; font-weight:700; color:#56d4dd; margin:12px 0 8px; padding-left:10px; border-left:3px solid #56d4dd; line-height:1.6; }
+.row { display:flex; gap:10px; margin-bottom:10px; line-height:1.85; font-size:25px; color:#c9d1d9; }
+.row:last-child { margin-bottom:0; }
+.dot { flex-shrink:0; width:7px; height:7px; border-radius:50%; margin-top:10px; background:linear-gradient(135deg,#ffd76d,#ff8c00); box-shadow:0 0 6px rgba(255,180,60,.6); }
+.row-text { flex:1; }
+.row.changed { background:rgba(255,215,109,.08); border:1px solid rgba(255,215,109,.28); border-radius:8px; padding:6px 10px; margin-left:-6px; margin-right:-6px; }
+.row.changed .dot { background:#3fb950; box-shadow:0 0 6px rgba(63,185,80,.6); }
+.kw { color:#ffd76d; font-weight:700; }
+.tag-new { flex-shrink:0; font-size:25px; font-weight:700; color:#0d1117; background:linear-gradient(135deg,#3fb950,#2ea043); border-radius:999px; padding:2px 10px; letter-spacing:.5px; }
+.tbl { margin:10px 0 14px; }
+.tbl.changed { border:1px solid rgba(255,215,109,.35); border-radius:12px; padding:10px 12px; background:rgba(255,215,109,.05); }
+.intro.update { border-left-color:#3fb950; }
+.tbl-title { font-size:25px; font-weight:800; color:#fff; margin-bottom:8px; letter-spacing:.5px; }
+.tbl table { width:100%; border-collapse:collapse; border-radius:10px; overflow:hidden; }
+.tbl th { background:linear-gradient(135deg,#667eea,#764ba2); color:#fff; font-size:25px; font-weight:700; padding:8px 14px; text-align:center; }
+.tbl td { padding:8px 14px; font-size:25px; text-align:center; color:#e6edf3; border-top:1px solid rgba(255,255,255,.07); background:rgba(255,255,255,.02); }
+.end-card { background:rgba(248,81,73,.08); border:1px solid rgba(248,81,73,.35); border-radius:16px; padding:18px 20px; margin-top:4px; }
+.end-title { font-size:25px; font-weight:800; color:#ff7b72; margin-bottom:10px; letter-spacing:.5px; }
+.end-body { line-height:1.9; font-size:25px; color:#c9d1d9; }
+.foot { text-align:center; color:#8b949e; font-size:25px; margin-top:16px; opacity:.75; letter-spacing:.5px; }
+</style>
+</head>
+<body>
+<div class="page">
+  <div class="hero">
+    <div class="badge">${changed ? '✏️ 更新内容 · ' : '📢 '}${esc(sourceName)}公告</div>
+    <div class="title">${esc(title)}</div>
+    <div class="sub">第五人格 · ${changed ? '本次更新内容' : esc(sourceName) + '公告推送'}</div>
+  </div>
+  ${introHtml}
+  ${sectionsHtml}
+  ${endHtml}
+  <div class="foot">数据来源：网易官方公告 · BWIKI 机器人推送</div>
+</div>
+</body>
+</html>`
+}
+
+module.exports = { parseNotice, parseNoticeCached, diffNotice, buildNoticeHtml, inlineHtml }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "koishi-plugin-dwrgbwiki",
-  "version": "2.1.1",
+  "version": "2.1.3",
   "description": "第五人格BWIKI编辑组开发，所有代码由DeepSeek V4 Flash 0731编写。支持胜率/地图/模仿者/勋章/基础数据查询、图鉴查询、wiki页面截图、藏头诗、抽卡模拟、加页手记探索、赛事数据（选手/对决）、公告变动推送、反馈系统等功能。",
   "main": "index.js",
   "files": [