Spaces:
Running
Running
feat(dil): 图标占位符后端内联 lucide SVG(用户决策B,2026-10-12)——客户端只输出 data-dil-icon 占位符不带图标集(lucide整包480KB/gzip130KB,官方图标在按需chunk无法提取子集);后端按需读取,单次PDF只付实际用到的图标(真机15次/10个);server.js 注入点放在所有HTML变换之后、setContent之前(pdf-test实测放Shiki之前会被后续改写链路破坏成不可见);缺失图标降级保留占位符不中断PDF;新增依赖 lucide-static@1.55.0(与官方bundle版本一致);API契约零改动
Browse files- lib/dil-icons.js +92 -0
- package-lock.json +9 -2
- package.json +5 -4
- server.js +23 -0
lib/dil-icons.js
ADDED
|
@@ -0,0 +1,92 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
/**
|
| 2 |
+
* DIL 图标占位符 → 内联 SVG(用户决策 B,2026-10-12)
|
| 3 |
+
*
|
| 4 |
+
* ─────────────────────────────────────────────────────────────────
|
| 5 |
+
* 为什么在后端做
|
| 6 |
+
* 客户端只输出 `<span data-dil-icon="名称">` 占位符,不带图标集:
|
| 7 |
+
* · lucide 官方 ~2141 个图标,单个 SVG ≈ 408B,整包 ≈ 480KB(raw)/130KB(gzip)。
|
| 8 |
+
* 塞进 content script 等于给所有平台、所有会话无条件加这份体积。
|
| 9 |
+
* · 官方图标本身在**按需加载的 code-split chunk** 里(2026-10-12 抓取的
|
| 10 |
+
* 133 个 main bundle 中不存在图标定义),无法从主包提取子集。
|
| 11 |
+
* · 后端按需读取,单次 PDF 只付实际用到的那几个图标的代价(真机 15 次/10 个)。
|
| 12 |
+
*
|
| 13 |
+
* 渲染时机:`/api/generate_pdf` 在 setContent 之前替换 —— DIL 的 HTML 是随
|
| 14 |
+
* 主文档一起来的(不走 widget 截图管线),所以就地替换即可,不影响图表出图。
|
| 15 |
+
*
|
| 16 |
+
* 图标来源:lucide-static v1.55.0(与官方 bundle 内 `lucide-static` 版本号一致)。
|
| 17 |
+
*/
|
| 18 |
+
const fs = require('fs');
|
| 19 |
+
const path = require('path');
|
| 20 |
+
|
| 21 |
+
const ICON_DIR = path.join(__dirname, '..', 'node_modules', 'lucide-static', 'icons');
|
| 22 |
+
|
| 23 |
+
/** 名称白名单:lucide 文件名形如 `arrow-down.svg`,杜绝 `..` 与路径穿越 */
|
| 24 |
+
const SAFE_NAME = /^[a-z0-9]+(?:-[a-z0-9]+)*$/;
|
| 25 |
+
|
| 26 |
+
const cache = new Map();
|
| 27 |
+
const stats = { hits: 0, misses: 0, injected: 0, unknown: 0 };
|
| 28 |
+
|
| 29 |
+
/** 读取并清洗单个 SVG(去掉许可证注释、固定尺寸交由 CSS 控制) */
|
| 30 |
+
function loadSvg(name) {
|
| 31 |
+
if (!SAFE_NAME.test(name)) return null;
|
| 32 |
+
if (cache.has(name)) { stats.hits++; return cache.get(name); }
|
| 33 |
+
stats.misses++;
|
| 34 |
+
let svg = null;
|
| 35 |
+
try {
|
| 36 |
+
svg = fs.readFileSync(path.join(ICON_DIR, `${name}.svg`), 'utf8');
|
| 37 |
+
} catch {
|
| 38 |
+
svg = null;
|
| 39 |
+
}
|
| 40 |
+
if (svg) {
|
| 41 |
+
svg = svg.replace(/<!--[\s\S]*?-->/g, '').trim();
|
| 42 |
+
// lucide 原生带 `width="24" height="24"`。**不能直接删**——删掉后 SVG
|
| 43 |
+
// 只剩 viewBox,尺寸完全依赖调用方 CSS 给 `> svg{width;height}`;
|
| 44 |
+
// 一旦该规则缺失或被覆盖,SVG 就是 0×0,PDF 里图标位置**彻底空白**
|
| 45 |
+
// (2026-10-12 pdf-test 实测:后端日志报"注入 4 个",页面却一个图标都没有)。
|
| 46 |
+
// 改成 `1em`:既能随 `.xwx-dil-icon-*` 的字号缩放,又自带兜底尺寸。
|
| 47 |
+
svg = svg.replace(/\s(width|height)="24"/g, '');
|
| 48 |
+
svg = svg.replace(
|
| 49 |
+
'<svg',
|
| 50 |
+
'<svg width="1em" height="1em" preserveAspectRatio="xMidYMid meet"',
|
| 51 |
+
);
|
| 52 |
+
}
|
| 53 |
+
cache.set(name, svg);
|
| 54 |
+
return svg;
|
| 55 |
+
}
|
| 56 |
+
|
| 57 |
+
/**
|
| 58 |
+
* 把 HTML 里的 `data-dil-icon` 占位符替换成内联 SVG。
|
| 59 |
+
*
|
| 60 |
+
* 只认 `<span … data-dil-icon="name" …></span>` 这一种形态(客户端唯一产出)。
|
| 61 |
+
* 找不到对应图标时**原样保留占位符**并计数 —— 宁可少一个图标,
|
| 62 |
+
* 也不能让整块内容消失或抛错中断整份 PDF。
|
| 63 |
+
*
|
| 64 |
+
* @param {string} html
|
| 65 |
+
* @returns {string}
|
| 66 |
+
*/
|
| 67 |
+
function resolveDilIcons(html) {
|
| 68 |
+
if (typeof html !== 'string' || !html.includes('data-dil-icon')) return html;
|
| 69 |
+
return html.replace(
|
| 70 |
+
/<span\b([^>]*?)\bdata-dil-icon="([a-z0-9-]+)"([^>]*)><\/span>/g,
|
| 71 |
+
(whole, pre, name, post) => {
|
| 72 |
+
const svg = loadSvg(name);
|
| 73 |
+
if (!svg) { stats.unknown++; return whole; }
|
| 74 |
+
stats.injected++;
|
| 75 |
+
// 占位符上的 class 保留(字号/对齐仍由 CSS 控制),SVG 继承 currentColor
|
| 76 |
+
return `<span${pre}data-dil-icon="${name}"${post}>${svg}</span>`;
|
| 77 |
+
},
|
| 78 |
+
);
|
| 79 |
+
}
|
| 80 |
+
|
| 81 |
+
/** 供排障使用 */
|
| 82 |
+
function dilIconStats() {
|
| 83 |
+
return { ...stats, cached: cache.size, iconDir: fs.existsSync(ICON_DIR) };
|
| 84 |
+
}
|
| 85 |
+
|
| 86 |
+
/** 清空缓存(长驻进程按需调用) */
|
| 87 |
+
function clearDilIconCache() {
|
| 88 |
+
cache.clear();
|
| 89 |
+
stats.hits = stats.misses = stats.injected = stats.unknown = 0;
|
| 90 |
+
}
|
| 91 |
+
|
| 92 |
+
module.exports = { resolveDilIcons, dilIconStats, clearDilIconCache };
|
package-lock.json
CHANGED
|
@@ -1,18 +1,19 @@
|
|
| 1 |
{
|
| 2 |
"name": "pdf-server",
|
| 3 |
-
"version": "
|
| 4 |
"lockfileVersion": 3,
|
| 5 |
"requires": true,
|
| 6 |
"packages": {
|
| 7 |
"": {
|
| 8 |
"name": "pdf-server",
|
| 9 |
-
"version": "
|
| 10 |
"dependencies": {
|
| 11 |
"@mermaid-js/mermaid-cli": "^11.0.0",
|
| 12 |
"chart.js": "^4.4.8",
|
| 13 |
"chartjs-node-canvas": "^5.0.0",
|
| 14 |
"cors": "^2.8.5",
|
| 15 |
"express": "^4.18.2",
|
|
|
|
| 16 |
"puppeteer": "^24.0.0",
|
| 17 |
"shiki": "^1.24.0"
|
| 18 |
}
|
|
@@ -3761,6 +3762,12 @@
|
|
| 3761 |
"node": ">=12"
|
| 3762 |
}
|
| 3763 |
},
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 3764 |
"node_modules/marked": {
|
| 3765 |
"version": "4.3.0",
|
| 3766 |
"resolved": "https://registry.npmjs.org/marked/-/marked-4.3.0.tgz",
|
|
|
|
| 1 |
{
|
| 2 |
"name": "pdf-server",
|
| 3 |
+
"version": "3.1.2",
|
| 4 |
"lockfileVersion": 3,
|
| 5 |
"requires": true,
|
| 6 |
"packages": {
|
| 7 |
"": {
|
| 8 |
"name": "pdf-server",
|
| 9 |
+
"version": "3.1.2",
|
| 10 |
"dependencies": {
|
| 11 |
"@mermaid-js/mermaid-cli": "^11.0.0",
|
| 12 |
"chart.js": "^4.4.8",
|
| 13 |
"chartjs-node-canvas": "^5.0.0",
|
| 14 |
"cors": "^2.8.5",
|
| 15 |
"express": "^4.18.2",
|
| 16 |
+
"lucide-static": "^1.55.0",
|
| 17 |
"puppeteer": "^24.0.0",
|
| 18 |
"shiki": "^1.24.0"
|
| 19 |
}
|
|
|
|
| 3762 |
"node": ">=12"
|
| 3763 |
}
|
| 3764 |
},
|
| 3765 |
+
"node_modules/lucide-static": {
|
| 3766 |
+
"version": "1.55.0",
|
| 3767 |
+
"resolved": "https://registry.npmjs.org/lucide-static/-/lucide-static-1.55.0.tgz",
|
| 3768 |
+
"integrity": "sha512-h18lunTFsIJWnY0FMRPjXeO9KcAtNi7fDqtqgWHOFbssfgUWsctn/pA7bpiyrd4g1DuBOJ24CsRnPfkYblwm/A==",
|
| 3769 |
+
"license": "ISC"
|
| 3770 |
+
},
|
| 3771 |
"node_modules/marked": {
|
| 3772 |
"version": "4.3.0",
|
| 3773 |
"resolved": "https://registry.npmjs.org/marked/-/marked-4.3.0.tgz",
|
package.json
CHANGED
|
@@ -4,13 +4,14 @@
|
|
| 4 |
"description": "Puppeteer PDF + Widget Renderer for XWX AI Chat Exporter",
|
| 5 |
"main": "server.js",
|
| 6 |
"dependencies": {
|
|
|
|
|
|
|
|
|
|
| 7 |
"cors": "^2.8.5",
|
| 8 |
"express": "^4.18.2",
|
|
|
|
| 9 |
"puppeteer": "^24.0.0",
|
| 10 |
-
"shiki": "^1.24.0"
|
| 11 |
-
"chart.js": "^4.4.8",
|
| 12 |
-
"chartjs-node-canvas": "^5.0.0",
|
| 13 |
-
"@mermaid-js/mermaid-cli": "^11.0.0"
|
| 14 |
},
|
| 15 |
"scripts": {
|
| 16 |
"start": "node server.js"
|
|
|
|
| 4 |
"description": "Puppeteer PDF + Widget Renderer for XWX AI Chat Exporter",
|
| 5 |
"main": "server.js",
|
| 6 |
"dependencies": {
|
| 7 |
+
"@mermaid-js/mermaid-cli": "^11.0.0",
|
| 8 |
+
"chart.js": "^4.4.8",
|
| 9 |
+
"chartjs-node-canvas": "^5.0.0",
|
| 10 |
"cors": "^2.8.5",
|
| 11 |
"express": "^4.18.2",
|
| 12 |
+
"lucide-static": "^1.55.0",
|
| 13 |
"puppeteer": "^24.0.0",
|
| 14 |
+
"shiki": "^1.24.0"
|
|
|
|
|
|
|
|
|
|
| 15 |
},
|
| 16 |
"scripts": {
|
| 17 |
"start": "node server.js"
|
server.js
CHANGED
|
@@ -32,6 +32,8 @@ const os = require('os');
|
|
| 32 |
const { BrowserPool } = require('./browser-pool');
|
| 33 |
// ChatGPT chart HTML 构建器已提取为共享模块(桌面 APP 同步使用,单一事实源)
|
| 34 |
const { buildChatGPTChartHtml } = require('./lib/chatgpt-chart-html');
|
|
|
|
|
|
|
| 35 |
|
| 36 |
let ChartJSNodeCanvas = null;
|
| 37 |
try {
|
|
@@ -324,6 +326,27 @@ app.post('/api/generate_pdf', async (req, res) => {
|
|
| 324 |
htmlToProcess = htmlToProcess.replace(/loading=["']lazy["']/gi, '');
|
| 325 |
console.log(`[PDF-GEN] [${getElapsed()}] 已移除 loading="lazy" 属性`);
|
| 326 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 327 |
// 使用处理后的 HTML
|
| 328 |
let htmlToUse = htmlToProcess;
|
| 329 |
|
|
|
|
| 32 |
const { BrowserPool } = require('./browser-pool');
|
| 33 |
// ChatGPT chart HTML 构建器已提取为共享模块(桌面 APP 同步使用,单一事实源)
|
| 34 |
const { buildChatGPTChartHtml } = require('./lib/chatgpt-chart-html');
|
| 35 |
+
// GPT-6 DIL 图标占位符 → 内联 SVG(客户端不带图标集,见 lib/dil-icons.js 顶部说明)
|
| 36 |
+
const { resolveDilIcons, dilIconStats } = require('./lib/dil-icons');
|
| 37 |
|
| 38 |
let ChartJSNodeCanvas = null;
|
| 39 |
try {
|
|
|
|
| 326 |
htmlToProcess = htmlToProcess.replace(/loading=["']lazy["']/gi, '');
|
| 327 |
console.log(`[PDF-GEN] [${getElapsed()}] 已移除 loading="lazy" 属性`);
|
| 328 |
|
| 329 |
+
// DIL 图标占位符 → 内联 SVG。
|
| 330 |
+
//
|
| 331 |
+
// ⚠️ 必须放在**所有 HTML 变换之后、setContent 之前**(2026-10-12 pdf-test 实测):
|
| 332 |
+
// 放在 Shiki 之前时,图标明明"注入成功"(日志可查)却在 PDF 里完全不可见。
|
| 333 |
+
// 注入的是多行 `<svg>…<path d="…"/></svg>`,与代码块高度相似,
|
| 334 |
+
// 经过后续 HTML 改写链路(Shiki / script 剔除 / lazy 剔除)会被破坏。
|
| 335 |
+
// 放最后一步可确保任何分支、任何变换顺序下都拿到完整 SVG。
|
| 336 |
+
// 缺失图标只降级为保留占位符,不会中断整份 PDF(见 lib/dil-icons.js)。
|
| 337 |
+
if (htmlToProcess.includes('data-dil-icon')) {
|
| 338 |
+
// 取增量而非累计值:stats 是长驻进程累计的,直接读会把历史请求的
|
| 339 |
+
// 未命中数算到本次头上(日志出现莫名其妙的"未命中 1 个")。
|
| 340 |
+
const before = dilIconStats();
|
| 341 |
+
htmlToProcess = resolveDilIcons(htmlToProcess);
|
| 342 |
+
const after = dilIconStats();
|
| 343 |
+
const injected = after.injected - before.injected;
|
| 344 |
+
const unknown = after.unknown - before.unknown;
|
| 345 |
+
if (injected || unknown) {
|
| 346 |
+
console.log(`[PDF-GEN] ${envText} DIL 图标: 注入 ${injected} 个, 未命中 ${unknown} 个 (${getElapsed()})`);
|
| 347 |
+
}
|
| 348 |
+
}
|
| 349 |
+
|
| 350 |
// 使用处理后的 HTML
|
| 351 |
let htmlToUse = htmlToProcess;
|
| 352 |
|