@vdfor/confluence-sync 0.4.0 → 0.4.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vdfor/confluence-sync",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "author": "vdfor",
   "license": "MIT",
   "private": false,

package/src/confluence.mjs

@@ -1,12 +1,19 @@
 import axios from 'axios';
 import { marked } from 'marked';
-import { extname } from 'node:path';
+import { extname, dirname, join } from 'node:path';
 import { tmpdir } from 'node:os';
 import { writeFile, unlink } from 'node:fs/promises';
+import { fileURLToPath } from 'node:url';
 
 // ── Mermaid 处理 ─────────────────────────────────────────────────────────────
 
 let sebastianRenderer = null;
+let cjkFontRegistry = null;
+
+/** 项目内置 CJK 字体（思源黑体可变） */
+const PROJECT_FONT_DIR = join(dirname(fileURLToPath(import.meta.url)), 'fonts');
+const CJK_FONT_FILE = join(PROJECT_FONT_DIR, 'SourceHanSansSC-VF.ttf');
+
 async function getSebastianRenderer() {
   if (!sebastianRenderer) {
     const sebastian = await import('sebastianjs');
@@ -15,6 +22,32 @@ async function getSebastianRenderer() {
   return sebastianRenderer;
 }
 
+/**
+ * 创建注册了项目内置 CJK 字体的 FontRegistry
+ * mermaid 节点标题默认用 bold，所以需要同时覆盖 regular + bold + italic
+ */
+async function getCjkFontRegistry() {
+  if (cjkFontRegistry) return cjkFontRegistry;
+
+  const { FontRegistry } = await import('sebastianjs/src/geometry/fonts.js');
+  const registry = new FontRegistry();
+
+  // 注册思源黑体 SC 可变字体，覆盖所有字重（variable font 可以自己插值不同 weight）
+  // 家族名用常见别名，CSS font-family 匹配时能命中
+  registry.registerFont(CJK_FONT_FILE, { family: 'Source Han Sans SC', weight: 400 });
+  registry.registerFont(CJK_FONT_FILE, { family: 'Source Han Sans SC', weight: 700 });
+  registry.registerFont(CJK_FONT_FILE, { family: 'Source Han Sans SC', weight: 400, italic: true });
+  registry.registerFont(CJK_FONT_FILE, { family: 'Source Han Sans SC', weight: 700, italic: true });
+
+  // 也注册成 generic 别名（mermaid 默认字体栈里有 sans-serif）
+  registry.registerFont(CJK_FONT_FILE, { family: 'sans-serif', weight: 400 });
+  registry.registerFont(CJK_FONT_FILE, { family: 'sans-serif', weight: 700 });
+
+  registry.setDefaultFamily('Source Han Sans SC');
+  cjkFontRegistry = registry;
+  return registry;
+}
+
 /**
  * 检测并替换 markdown 中的 ```mermaid 代码块为图片占位符
  * 使用 sebastianjs（本地、零浏览器、零外网依赖）渲染为 PNG
@@ -28,6 +61,7 @@ export async function preprocessMermaid(md) {
   if (!matches.length) return { md, images: [], hasMermaid: false };
 
   const { renderPng } = await getSebastianRenderer();
+  const fontRegistry = await getCjkFontRegistry();
   const images = [];
   let result = md;
   let offset = 0;
@@ -40,7 +74,11 @@ export async function preprocessMermaid(md) {
 
     try {
       const t0 = Date.now();
-      const { data: pngBuffer } = await renderPng(code, { background: 'white' });
+      const { data: pngBuffer } = await renderPng(code, {
+        background: 'white',
+        fontFamily: 'Source Han Sans SC',
+        fontRegistry,
+      });
       const t1 = Date.now();
       await writeFile(file, pngBuffer);
       images.push({ file, name });
@@ -201,6 +239,16 @@ export async function updatePage(id, title, bodyHtml, currentVersion, minorEdit
   }
 }
 
+// ── HTML 转义 ────────────────────────────────────────────────────────────────
+function escapeHtml(str) {
+  return String(str)
+    .replace(/&/g, '&')
+    .replace(/</g, '&lt;')
+    .replace(/>/g, '&gt;')
+    .replace(/"/g, '&quot;')
+    .replace(/'/g, '&apos;');
+}
+
 // ── Markdown → Confluence Storage Format ───────────────────────────────────────
 
 /**
@@ -261,7 +309,7 @@ export function mdToConfluence(md) {
           break;
         default:
           if (tok.tokens) out += renderTokens(tok.tokens, listDepth);
-          else if (tok.text) out += tok.text;
+          else if (tok.text) out += escapeHtml(tok.text);
       }
     }
     return out;
@@ -273,7 +321,7 @@ export function mdToConfluence(md) {
     for (const tok of toks) {
       switch (tok.type) {
         case 'text':
-          out += tok.tokens ? renderInline(tok.tokens) : tok.text;
+          out += tok.tokens ? renderInline(tok.tokens) : escapeHtml(tok.text);
           break;
         case 'strong':
           out += `<strong>${renderInline(tok.tokens)}</strong>`;
@@ -282,16 +330,16 @@ export function mdToConfluence(md) {
           out += `<em>${renderInline(tok.tokens)}</em>`;
           break;
         case 'codespan':
-          out += `<code>${tok.text}</code>`;
+          out += `<code>${escapeHtml(tok.text)}</code>`;
           break;
         case 'del':
           out += `<s>${renderInline(tok.tokens)}</s>`;
           break;
         case 'link':
-          out += `<a href="${tok.href}">${renderInline(tok.tokens)}</a>`;
+          out += `<a href="${escapeHtml(tok.href)}">${renderInline(tok.tokens)}</a>`;
           break;
         case 'image':
-          out += `<ac:image><ri:attachment ri:filename="${tok.href}" /></ac:image>`;
+          out += `<ac:image><ri:attachment ri:filename="${escapeHtml(tok.href)}" /></ac:image>`;
           break;
         case 'br':
           out += '<br/>';
@@ -299,6 +347,11 @@ export function mdToConfluence(md) {
         case 'escape':
           out += tok.text;
           break;
+        case 'html':
+          // marked 识别的 inline HTML（如 <div>foo</div>、<即实际未使用>）
+          // 我们不支持用户写原生 HTML → 一律转义
+          out += escapeHtml(tok.text);
+          break;
         default:
           out += tok.text || '';
       }