* feat(mermaid): 新增 mermaid 懒加载 chunk(构建链四处同步 + mermaid 依赖) tsdown CHUNKS / bundle-route CHUNK_NAMES / chunk-loader ChunkName / package.json files 同步注册 mermaid chunk;mermaid ^11.16.1 进依赖与 lockfile;chunk 构建注入 uuid 浏览器入口别名,绕开 node:crypto 纯度门。 * feat(mermaid): Markdown 预览安全渲染 mermaid 图表 + 点击放大弹窗 - splitMermaidBlocks 纯函数按 fence 切块,无 mermaid 文件零行为变化; - mermaid.initialize 走 securityLevel strict + htmlLabels:false,不应用 bindFunctions(静态图);渲染 SVG 经 mermaid-sanitize 二次清洗: 删 foreignObject/script/外来 HTML 元素、剥 @*/on* 属性、移除全部 href/xlink:href,仅接受 SVG 根,解析失败返回空串; - 点击图表弹出放大弹窗(滚轮缩放/拖拽平移/快捷键,借鉴 PR #75 交互, 基于已清洗 SVG 克隆重写,不新增攻击面); - 深浅色跟随重渲、失败回退错误条 + 原码、CodeBlock 同款 chrome。 * test(mermaid): splitter/sanitize 单测 + chunk 清单同步 + 挂载冒烟 diagram.md - mermaid-blocks.spec 10 例 fence 切块语义; - mermaid-sanitize.spec 8 例 XSS(foreignObject/on*/@*/href/xlink:href/ script/外来元素/畸形 XML/非 SVG 根); - bundle-route / chunk-artifact / manifest-consistency 清单加入 mermaid (chunk-artifact 补 addEventListener stub); - 挂载冒烟新增 diagram.md:client-mermaid.js 往返、SVG 节点文字、 点击弹窗 Esc 关闭、preview 模式编辑器隐藏。 * docs(mermaid): 安全渲染设计文档 + lazy-chunks 表 + README 双语更新 设计文档记录基线决策(PR #99 架构 + PR #75 点击放大)、安全模型 (strict/htmlLabels/清洗/href 剥离/无 bindFunctions)、验证与取舍。 * fix(mermaid): sanitizer 属性名大小写归一,堵住混合大小写属性绕过(CR P1) XML 属性名保留大小写,而输出会经 HTML 解析归一化(dangerouslySetInnerHTML), oNload/HREF/xlink:HREF 这类混合大小写属性此前会漏过清洗。比较前先 toLowerCase(),按原名删除;新增混合大小写事件/链接属性回归用例。 * fix(mermaid): sanitizer 元素黑名单大小写归一,堵住混合大小写元素绕过(CR P1) XML 元素名保留大小写,querySelectorAll('script') 等选择器匹配不到 <sCrIpT>/<foreignobject>,而输出经 HTML 解析会被归一化为 SVG script/foreignObject(可执行/可注入 HTML)。改为遍历全部元素按 localName.toLowerCase() 命中小写黑名单后整节点删除;新增混合大小写 script/foreignObject/外来 HTML 元素回归用例(jsdom 实证:旧选择器 命中 0,新逻辑命中 2)。 * fix(mermaid): 单次 Markdown 解析 + 占位交换(CR P1)+ CommonMark fence 规则(CR P2) P1(跨 fence 语义):弃用逐块 MarkdownText 拆分,改为整篇文档单次 MarkdownText 渲染,布局后把 language-mermaid 代码块交换为 MermaidDiagram (React 管理的 .md-code-block 宿主保留在树中、display:contents 抑制盒子, 协调安全;块不再 mermaid 时还原原 children)。新增 tests/mermaid-markdown.spec.tsx 与 e2e 跨 fence 引用链接断言。 P2(fence 匹配):支持 3+ 反引号与波浪号开 fence;闭 fence 须同字符且 长度不小于开 fence;反引号 info string 含反引号不视为开 fence;修复 带缩进开 fence 的 info 提取。blocks 单测 +3 例。
130 lines
4.7 KiB
TypeScript
130 lines
4.7 KiB
TypeScript
/**
|
|
* Lazy chunk route: serves the client bundle's chunk scripts
|
|
* (/sidebar/bundle/<name>.js). The official /plugins/<id>/client.js route
|
|
* cannot serve arbitrary file names, so the plugin serves its own split
|
|
* bundles (lib/client-<name>.js) here; the client injects the script on
|
|
* first use of the feature that needs it (see src/client/chunk-loader.ts).
|
|
*
|
|
* Caching contract: every response carries `cache-control: no-cache` plus an
|
|
* ETag (content hash, memoized per file by mtime/size) and honors
|
|
* If-None-Match — the browser revalidates each fetch, but a 304 avoids
|
|
* re-downloading multi-MB chunks that did not change (page refresh, HMR
|
|
* re-activation). Same browser-trust fence as every other /sidebar route;
|
|
* only allowlisted chunk names are servable (no path traversal).
|
|
*/
|
|
import { createHash } from 'node:crypto'
|
|
import { stat, readFile } from 'node:fs/promises'
|
|
import { dirname, join } from 'node:path'
|
|
import { fileURLToPath } from 'node:url'
|
|
import type { Context, SidebarHttpRequest, SidebarHttpResponse } from './context-types.ts'
|
|
|
|
/** The chunk names the client may request (mirror of src/client/chunk-loader.ts). */
|
|
export const CHUNK_NAMES = ['terminal', 'editor', 'mermaid'] as const
|
|
export type ChunkName = (typeof CHUNK_NAMES)[number]
|
|
|
|
/** Directory of this host-half module (lib/ — the chunk scripts live next to it). */
|
|
const LIB_DIR = dirname(fileURLToPath(import.meta.url))
|
|
|
|
/** sha1 content hash shortened to 12 hex chars (same shape as the client-modules rev). */
|
|
function shortHash(input: string | Buffer): string {
|
|
return createHash('sha1').update(input).digest('hex').slice(0, 12)
|
|
}
|
|
|
|
interface ChunkEtag {
|
|
mtimeMs: number
|
|
size: number
|
|
etag: string
|
|
}
|
|
|
|
/** ETag memo: recompute the content hash only when the file's stat changed. */
|
|
const etags = new Map<string, ChunkEtag>()
|
|
|
|
/**
|
|
* The chunk file's ETag (quoted hash), or undefined when the file is
|
|
* missing. Hash is recomputed only when mtime/size changed (hashing a
|
|
* multi-MB chunk per request is wasteful).
|
|
*/
|
|
async function etagOf(name: ChunkName, chunkDir: string): Promise<string | undefined> {
|
|
const path = join(chunkDir, `client-${name}.js`)
|
|
const key = `${chunkDir}:${name}`
|
|
try {
|
|
const info = await stat(path)
|
|
const memo = etags.get(key)
|
|
if (memo !== undefined && memo.mtimeMs === info.mtimeMs && memo.size === info.size) {
|
|
return memo.etag
|
|
}
|
|
const etag = `"${shortHash(await readFile(path))}"`
|
|
etags.set(key, { mtimeMs: info.mtimeMs, size: info.size, etag })
|
|
return etag
|
|
} catch {
|
|
return undefined
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Build the /sidebar/bundle route handler. `fence` is the shared browser-
|
|
* trust check every /sidebar route applies; `chunkDir` is the directory the
|
|
* chunk scripts live in (overridable for tests).
|
|
*/
|
|
export function createBundleRouteHandler(
|
|
fence: (req: SidebarHttpRequest) => boolean,
|
|
chunkDir: string = LIB_DIR,
|
|
): (req: SidebarHttpRequest, res: SidebarHttpResponse) => Promise<void> {
|
|
return async (req, res): Promise<void> => {
|
|
if (!fence(req)) {
|
|
res.writeHead(403)
|
|
res.end('forbidden')
|
|
return
|
|
}
|
|
if (req.method !== 'GET' && req.method !== 'HEAD') {
|
|
res.writeHead(405)
|
|
res.end()
|
|
return
|
|
}
|
|
const pathname = new URL(req.url ?? '/', 'http://dsh.internal').pathname
|
|
const match = /^\/sidebar\/bundle\/([a-z0-9-]+)\.js$/.exec(pathname)
|
|
const name = match?.[1] as ChunkName | undefined
|
|
if (name === undefined || !(CHUNK_NAMES as readonly string[]).includes(name)) {
|
|
res.writeHead(404)
|
|
res.end('not found')
|
|
return
|
|
}
|
|
const etag = await etagOf(name, chunkDir)
|
|
if (etag === undefined) {
|
|
// Registered name but unreadable (bundle not built yet): loud 404.
|
|
res.writeHead(404)
|
|
res.end('not found')
|
|
return
|
|
}
|
|
if (req.headers['if-none-match'] === etag) {
|
|
// Revalidation hit: unchanged chunk, no body — avoids re-downloading
|
|
// multi-MB scripts on page refresh / HMR re-activation.
|
|
res.writeHead(304, { 'cache-control': 'no-cache', etag })
|
|
res.end()
|
|
return
|
|
}
|
|
try {
|
|
const body = await readFile(join(chunkDir, `client-${name}.js`))
|
|
res.writeHead(200, {
|
|
'content-type': 'text/javascript; charset=utf-8',
|
|
'cache-control': 'no-cache',
|
|
etag,
|
|
})
|
|
res.end(body)
|
|
} catch {
|
|
// Read raced a delete/rebuild between the stat and the read.
|
|
res.writeHead(404)
|
|
res.end('not found')
|
|
}
|
|
}
|
|
}
|
|
|
|
/** Register the /sidebar/bundle route (disposed with the fiber). */
|
|
export function registerBundleRoute(ctx: Context, fence: (req: SidebarHttpRequest) => boolean): () => void {
|
|
return ctx.webServer.register({
|
|
kind: 'prefix',
|
|
path: '/sidebar/bundle',
|
|
handler: createBundleRouteHandler(fence),
|
|
})
|
|
}
|