@zhin.js/html-renderer 1.0.4 → 2.0.1

package/lib/index.d.ts

@@ -1,4 +1,4 @@
-export { createHtmlRenderer } from './renderer.js';
+export { createHtmlRenderer, serializeJsxToHtml } from './renderer.js';
 export { registerAiTextAsImageOutput, extractPlainTextForImage } from './ai-text-as-image.js';
 export type { FontConfig, HtmlRendererAiTextAsImageConfig, HtmlRendererConfig, HtmlRendererLogger, HtmlRendererService, OutputFormat, RenderOptions, RenderResult, } from './types.js';
 /** 动态 import 时使用的包名（与 package.json name 一致） */

package/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AACnD,OAAO,EAAE,2BAA2B,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AAC9F,YAAY,EACV,UAAU,EACV,+BAA+B,EAC/B,kBAAkB,EAClB,kBAAkB,EAClB,mBAAmB,EACnB,YAAY,EACZ,aAAa,EACb,YAAY,GACb,MAAM,YAAY,CAAC;AAEpB,+CAA+C;AAC/C,eAAO,MAAM,qBAAqB,2BAA2B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AACvE,OAAO,EAAE,2BAA2B,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AAC9F,YAAY,EACV,UAAU,EACV,+BAA+B,EAC/B,kBAAkB,EAClB,kBAAkB,EAClB,mBAAmB,EACnB,YAAY,EACZ,aAAa,EACb,YAAY,GACb,MAAM,YAAY,CAAC;AAEpB,+CAA+C;AAC/C,eAAO,MAAM,qBAAqB,2BAA2B,CAAC"}

package/lib/index.js

@@ -1,4 +1,4 @@
-export { createHtmlRenderer } from './renderer.js';
+export { createHtmlRenderer, serializeJsxToHtml } from './renderer.js';
 export { registerAiTextAsImageOutput, extractPlainTextForImage } from './ai-text-as-image.js';
 /** 动态 import 时使用的包名（与 package.json name 一致） */
 export const HTML_RENDERER_PACKAGE = '@zhin.js/html-renderer';

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AACnD,OAAO,EAAE,2BAA2B,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AAY9F,+CAA+C;AAC/C,MAAM,CAAC,MAAM,qBAAqB,GAAG,wBAAwB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AACvE,OAAO,EAAE,2BAA2B,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AAY9F,+CAA+C;AAC/C,MAAM,CAAC,MAAM,qBAAqB,GAAG,wBAAwB,CAAC"}

package/lib/renderer.d.ts

@@ -1,3 +1,4 @@
 import type { HtmlRendererConfig, HtmlRendererLogger, HtmlRendererService } from './types.js';
+export declare function serializeJsxToHtml(element: unknown): string;
 export declare function createHtmlRenderer(config?: HtmlRendererConfig, logger?: HtmlRendererLogger): HtmlRendererService;
 //# sourceMappingURL=renderer.d.ts.map

package/lib/renderer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"renderer.d.ts","sourceRoot":"","sources":["../src/renderer.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAEV,kBAAkB,EAClB,kBAAkB,EAClB,mBAAmB,EAGpB,MAAM,YAAY,CAAC;AA0MpB,wBAAgB,kBAAkB,CAChC,MAAM,GAAE,kBAAuB,EAC/B,MAAM,CAAC,EAAE,kBAAkB,GAC1B,mBAAmB,CA6ErB"}
+{"version":3,"file":"renderer.d.ts","sourceRoot":"","sources":["../src/renderer.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAEV,kBAAkB,EAClB,kBAAkB,EAClB,mBAAmB,EAGpB,MAAM,YAAY,CAAC;AA4MpB,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,CA8C3D;AAED,wBAAgB,kBAAkB,CAChC,MAAM,GAAE,kBAAuB,EAC/B,MAAM,CAAC,EAAE,kBAAkB,GAC1B,mBAAmB,CA4GrB"}

package/lib/renderer.js

@@ -1,14 +1,20 @@
-import { htmlToSvg, getAllBuiltinFonts, h } from '@zhin.js/satori';
+import { htmlToSvg, getAllBuiltinFonts, h, e } from '@zhin.js/satori';
 import { Resvg } from '@resvg/resvg-js';
 const DEFAULT_CONFIG = {
     defaultWidth: 800,
     defaultFonts: [],
     defaultBackgroundColor: '#ffffff',
-    cacheFonts: true,
-    fontUrls: [],
 };
+/** 外部资源（twemoji CDN）拉取超时 */
+const EMOJI_FETCH_TIMEOUT_MS = 10_000;
+/** 渲染并发上限，防止渲染任务堆积拖垮进程 */
+const MAX_CONCURRENT_RENDERS = 2;
 const fontCache = new Map();
 let defaultFontLoaded = false;
+/** fontCache 键：name + weight + style（缺 style 会让 italic 覆盖 normal） */
+function fontCacheKey(name, weight, style) {
+    return `${name}-${weight ?? 400}-${style ?? 'normal'}`;
+}
 function toFontConfig(f) {
     return { name: f.name, data: f.data, weight: f.weight, style: f.style };
 }
@@ -34,7 +40,7 @@ function ensureBuiltinFontsCached(logger) {
         if (builtinFonts.length > 0) {
             for (const font of builtinFonts) {
                 const fc = toFontConfig(font);
-                fontCache.set(`${font.name}-${font.weight}`, fc);
+                fontCache.set(fontCacheKey(font.name, font.weight, font.style), fc);
                 logger?.debug?.(`Builtin font: ${font.name} (${Math.round(font.data.byteLength / 1024)}KB)`);
             }
             fontCache.set('default', toFontConfig(builtinFonts[0]));
@@ -60,7 +66,7 @@ function emojiToTwemojiUrl(emoji) {
 async function loadEmojiImage(emoji, logger) {
     try {
         const url = emojiToTwemojiUrl(emoji);
-        const response = await fetch(url);
+        const response = await fetch(url, { signal: AbortSignal.timeout(EMOJI_FETCH_TIMEOUT_MS) });
         if (!response.ok) {
             logger?.debug?.(`Failed to load emoji ${emoji}: ${response.status}`);
             return null;
@@ -73,14 +79,42 @@ async function loadEmojiImage(emoji, logger) {
         return null;
     }
 }
+const EMOJI_CACHE_MAX = 200;
+/** 失败（null）结果的负缓存 TTL，避免每次渲染都重试失败的 emoji */
+const EMOJI_NEGATIVE_TTL_MS = 60_000;
+/** LRU：Map 迭代顺序即插入顺序，命中时移到末尾，超容量时淘汰最旧项 */
 const emojiCache = new Map();
+function getCachedEmoji(segment) {
+    const entry = emojiCache.get(segment);
+    if (!entry)
+        return { hit: false, value: null };
+    if (entry.value === null && Date.now() - entry.ts > EMOJI_NEGATIVE_TTL_MS) {
+        emojiCache.delete(segment);
+        return { hit: false, value: null };
+    }
+    // LRU touch：重新插入到末尾
+    emojiCache.delete(segment);
+    emojiCache.set(segment, entry);
+    return { hit: true, value: entry.value };
+}
+function setCachedEmoji(segment, value) {
+    emojiCache.delete(segment);
+    emojiCache.set(segment, { value, ts: Date.now() });
+    while (emojiCache.size > EMOJI_CACHE_MAX) {
+        const oldest = emojiCache.keys().next().value;
+        if (oldest === undefined)
+            break;
+        emojiCache.delete(oldest);
+    }
+}
 async function loadAdditionalAsset(languageCode, segment, logger) {
     if (languageCode === 'emoji') {
-        if (emojiCache.has(segment))
-            return emojiCache.get(segment);
+        const cached = getCachedEmoji(segment);
+        if (cached.hit)
+            return cached.value;
         const result = await loadEmojiImage(segment, logger);
-        if (result)
-            emojiCache.set(segment, result);
+        // 失败也缓存（短 TTL 负缓存），防止同一 emoji 反复打爆 CDN
+        setCachedEmoji(segment, result);
         return result;
     }
     return null;
@@ -90,7 +124,7 @@ function wrapHtmlFragment(html, backgroundColor) {
         return html;
     return `<div style="display:flex;flex-direction:column;width:100%;height:100%;margin:0;padding:0;box-sizing:border-box;background-color:${backgroundColor};font-family:Noto Sans SC,sans-serif">${html}</div>`;
 }
-async function renderHtmlToSvg(html, width, height, fonts, backgroundColor, logger) {
+async function renderHtmlToSvg(html, width, height, fonts, backgroundColor, logger, enableEmoji = true) {
     ensureBuiltinFontsCached(logger);
     const finalFonts = mergeFontLists(getAllBuiltinFonts().map(toFontConfig), fonts);
     if (finalFonts.length === 0) {
@@ -105,7 +139,7 @@ async function renderHtmlToSvg(html, width, height, fonts, backgroundColor, logg
             weight: f.weight,
             style: f.style,
         })),
-        loadAdditionalAsset: async (code, seg) => (await loadAdditionalAsset(code, seg, logger)) ?? '',
+        loadAdditionalAsset: async (code, seg) => enableEmoji ? ((await loadAdditionalAsset(code, seg, logger)) ?? '') : '',
     });
     const wm = svg.match(/width="(\d+)"/);
     const hm = svg.match(/height="(\d+)"/);
@@ -127,11 +161,13 @@ function svgToPng(svg, scale = 1) {
     const pngData = resvg.render();
     return Buffer.from(pngData.asPng());
 }
-function serializeJsxToHtml(element) {
-    if (typeof element === 'string' || typeof element === 'number') {
+export function serializeJsxToHtml(element) {
+    if (typeof element === 'string')
+        return e(element);
+    if (typeof element === 'number')
         return String(element);
-    }
-    if (element == null)
+    // boolean / null / undefined 一律渲染为空串
+    if (element == null || typeof element === 'boolean')
         return '';
     if (Array.isArray(element)) {
         return element.map(serializeJsxToHtml).join('');
@@ -146,15 +182,16 @@ function serializeJsxToHtml(element) {
                 .join('; ');
         }
         const attrs = Object.entries(restProps)
-            .filter(([key]) => key !== 'dangerouslySetInnerHTML')
-            .map(([key, value]) => `${key}="${value}"`)
+            .filter(([key, value]) => key !== 'dangerouslySetInnerHTML' && value != null && value !== false)
+            .map(([key, value]) => `${key}="${e(String(value))}"`)
             .join(' ');
-        const styleAttr = styleStr ? ` style="${styleStr}"` : '';
+        const styleAttr = styleStr ? ` style="${e(styleStr)}"` : '';
         const attrStr = attrs ? ` ${attrs}` : '';
+        // Raw HTML 只走显式通道 dangerouslySetInnerHTML
         if (dangerouslySetInnerHTML?.__html) {
             return `<${type}${attrStr}${styleAttr}>${dangerouslySetInnerHTML.__html}</${type}>`;
         }
-        const childrenHtml = children ? serializeJsxToHtml(children) : '';
+        const childrenHtml = serializeJsxToHtml(children);
         const selfClosingTags = ['img', 'br', 'hr', 'input', 'meta', 'link'];
         if (selfClosingTags.includes(type) && !childrenHtml) {
             return `<${type}${attrStr}${styleAttr} />`;
@@ -165,33 +202,57 @@ function serializeJsxToHtml(element) {
 }
 export function createHtmlRenderer(config = {}, logger) {
     const mergedConfig = { ...DEFAULT_CONFIG, ...config };
+    function cacheDefaultFonts() {
+        for (const font of mergedConfig.defaultFonts) {
+            fontCache.set(fontCacheKey(font.name, font.weight, font.style), font);
+        }
+    }
     ensureBuiltinFontsCached(logger);
-    for (const font of mergedConfig.defaultFonts) {
-        fontCache.set(`${font.name}-${font.weight || 400}`, font);
+    cacheDefaultFonts();
+    // 渲染并发闸：最多 MAX_CONCURRENT_RENDERS 个并发，其余排队
+    let activeRenders = 0;
+    const renderQueue = [];
+    async function acquireRenderSlot() {
+        if (activeRenders >= MAX_CONCURRENT_RENDERS) {
+            await new Promise((resolve) => renderQueue.push(resolve));
+        }
+        activeRenders++;
+    }
+    function releaseRenderSlot() {
+        activeRenders--;
+        const next = renderQueue.shift();
+        if (next)
+            next();
     }
     return {
         async render(html, options = {}) {
-            const { width = mergedConfig.defaultWidth, height, format = 'png', backgroundColor = mergedConfig.defaultBackgroundColor, fonts = [], scale = 1, } = options;
-            ensureBuiltinFontsCached(logger);
-            const allFonts = uniqueFontsForRender([...fontCache.values(), ...fonts]);
-            const { svg, width: actualWidth, height: actualHeight } = await renderHtmlToSvg(html, width, height, allFonts, backgroundColor, logger);
-            if (format === 'svg') {
+            const { width = mergedConfig.defaultWidth, height, format = 'png', backgroundColor = mergedConfig.defaultBackgroundColor, fonts = [], enableEmoji = true, scale = 1, } = options;
+            await acquireRenderSlot();
+            try {
+                ensureBuiltinFontsCached(logger);
+                const allFonts = uniqueFontsForRender([...fontCache.values(), ...fonts]);
+                const { svg, width: actualWidth, height: actualHeight } = await renderHtmlToSvg(html, width, height, allFonts, backgroundColor, logger, enableEmoji);
+                if (format === 'svg') {
+                    return {
+                        data: svg,
+                        format: 'svg',
+                        width: actualWidth,
+                        height: actualHeight,
+                        mimeType: 'image/svg+xml',
+                    };
+                }
+                const png = svgToPng(svg, scale);
                 return {
-                    data: svg,
-                    format: 'svg',
-                    width: actualWidth,
-                    height: actualHeight,
-                    mimeType: 'image/svg+xml',
+                    data: png,
+                    format: 'png',
+                    width: Math.round(actualWidth * scale),
+                    height: Math.round(actualHeight * scale),
+                    mimeType: 'image/png',
                 };
             }
-            const png = svgToPng(svg, scale);
-            return {
-                data: png,
-                format: 'png',
-                width: Math.round(actualWidth * scale),
-                height: Math.round(actualHeight * scale),
-                mimeType: 'image/png',
-            };
+            finally {
+                releaseRenderSlot();
+            }
         },
         async renderJsx(element, options = {}) {
             return this.render(serializeJsxToHtml(element), options);
@@ -200,7 +261,7 @@ export function createHtmlRenderer(config = {}, logger) {
             return this.render(h(component, props), options);
         },
         registerFont(font) {
-            fontCache.set(`${font.name}-${font.weight || 400}`, font);
+            fontCache.set(fontCacheKey(font.name, font.weight, font.style), font);
             logger?.debug?.(`Font registered: ${font.name}`);
         },
         getFonts() {
@@ -209,6 +270,8 @@ export function createHtmlRenderer(config = {}, logger) {
         clearFonts() {
             fontCache.clear();
             defaultFontLoaded = false;
+            // clear 后重新合并 defaultFonts，避免用户配置的默认字体永久丢失
+            cacheDefaultFonts();
             logger?.debug?.('Font cache cleared');
         },
     };

package/lib/renderer.js.map

@@ -1 +1 @@
-{"version":3,"file":"renderer.js","sourceRoot":"","sources":["../src/renderer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"renderer.js","sourceRoot":"","sources":["../src/renderer.ts"],"names":[],"mappings":"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"}

package/lib/types.d.ts

@@ -41,8 +41,6 @@ export interface HtmlRendererConfig {
     defaultWidth?: number;
     defaultFonts?: FontConfig[];
     defaultBackgroundColor?: string;
-    cacheFonts?: boolean;
-    fontUrls?: string[];
     aiTextAsImage?: boolean | HtmlRendererAiTextAsImageConfig;
 }
 export interface HtmlRendererService {

package/lib/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAErD,MAAM,MAAM,YAAY,GAAG,KAAK,GAAG,KAAK,CAAC;AAEzC,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,WAAW,GAAG,MAAM,CAAC;IAC3B,MAAM,CAAC,EAAE,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,CAAC;IAC7D,KAAK,CAAC,EAAE,QAAQ,GAAG,QAAQ,CAAC;CAC7B;AAED,MAAM,WAAW,aAAa;IAC5B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,YAAY,CAAC;IACtB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,KAAK,CAAC,EAAE,UAAU,EAAE,CAAC;IACrB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;IACtB,MAAM,EAAE,YAAY,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,+BAA+B;IAC9C,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,kBAAkB;IACjC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,UAAU,EAAE,CAAC;IAC5B,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,aAAa,CAAC,EAAE,OAAO,GAAG,+BAA+B,CAAC;CAC3D;AAED,MAAM,WAAW,mBAAmB;IAClC,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;IACrE,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;IAC5E,eAAe,CAAC,CAAC,EACf,SAAS,EAAE,aAAa,CAAC,CAAC,CAAC,EAC3B,KAAK,EAAE,CAAC,EACR,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,YAAY,CAAC,CAAC;IACzB,YAAY,CAAC,IAAI,EAAE,UAAU,GAAG,IAAI,CAAC;IACrC,QAAQ,IAAI,UAAU,EAAE,CAAC;IACzB,UAAU,IAAI,IAAI,CAAC;CACpB;AAED,MAAM,WAAW,kBAAkB;IACjC,KAAK,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI,CAAC;IACrC,IAAI,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI,CAAC;IACpC,IAAI,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI,CAAC;CACrC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhin.js/html-renderer",
-  "version": "1.0.4",
+  "version": "2.0.1",
   "description": "HTML to PNG/SVG for Zhin.js (satori + resvg); optional peer of zhin.js",
   "type": "module",
   "main": "./lib/index.js",
@@ -34,10 +34,10 @@
   "license": "MIT",
   "dependencies": {
     "@resvg/resvg-js": "^2.6.2",
-    "@zhin.js/satori": "1.0.16"
+    "@zhin.js/satori": "1.0.17"
   },
   "peerDependencies": {
-    "@zhin.js/core": "1.3.5"
+    "@zhin.js/core": "1.4.1"
   },
   "peerDependenciesMeta": {
     "@zhin.js/core": {
@@ -46,7 +46,7 @@
   },
   "devDependencies": {
     "typescript": "^6.0.3",
-    "@zhin.js/core": "1.3.5"
+    "@zhin.js/core": "1.4.1"
   },
   "repository": {
     "type": "git",

package/src/index.ts

@@ -1,4 +1,4 @@
-export { createHtmlRenderer } from './renderer.js';
+export { createHtmlRenderer, serializeJsxToHtml } from './renderer.js';
 export { registerAiTextAsImageOutput, extractPlainTextForImage } from './ai-text-as-image.js';
 export type {
   FontConfig,

package/src/renderer.ts

@@ -1,4 +1,4 @@
-import { htmlToSvg, getAllBuiltinFonts, h, type HtmlComponent } from '@zhin.js/satori';
+import { htmlToSvg, getAllBuiltinFonts, h, e, type HtmlComponent } from '@zhin.js/satori';
 
 import { Resvg } from '@resvg/resvg-js';
 import type {
@@ -14,13 +14,26 @@ const DEFAULT_CONFIG: Required<Omit<HtmlRendererConfig, 'aiTextAsImage'>> = {
   defaultWidth: 800,
   defaultFonts: [],
   defaultBackgroundColor: '#ffffff',
-  cacheFonts: true,
-  fontUrls: [],
 };
 
+/** 外部资源（twemoji CDN）拉取超时 */
+const EMOJI_FETCH_TIMEOUT_MS = 10_000;
+
+/** 渲染并发上限，防止渲染任务堆积拖垮进程 */
+const MAX_CONCURRENT_RENDERS = 2;
+
 const fontCache: Map<string, FontConfig> = new Map();
 let defaultFontLoaded = false;
 
+/** fontCache 键：name + weight + style（缺 style 会让 italic 覆盖 normal） */
+function fontCacheKey(
+  name: string,
+  weight?: FontConfig['weight'],
+  style?: FontConfig['style'],
+): string {
+  return `${name}-${weight ?? 400}-${style ?? 'normal'}`;
+}
+
 function toFontConfig(f: {
   name: string;
   data: ArrayBuffer | Buffer;
@@ -53,7 +66,7 @@ function ensureBuiltinFontsCached(logger?: HtmlRendererLogger): void {
     if (builtinFonts.length > 0) {
       for (const font of builtinFonts) {
         const fc = toFontConfig(font);
-        fontCache.set(`${font.name}-${font.weight}`, fc);
+        fontCache.set(fontCacheKey(font.name, font.weight, font.style), fc);
         logger?.debug?.(`Builtin font: ${font.name} (${Math.round(font.data.byteLength / 1024)}KB)`);
       }
       fontCache.set('default', toFontConfig(builtinFonts[0]));
@@ -79,7 +92,7 @@ function emojiToTwemojiUrl(emoji: string): string {
 async function loadEmojiImage(emoji: string, logger?: HtmlRendererLogger): Promise<string | null> {
   try {
     const url = emojiToTwemojiUrl(emoji);
-    const response = await fetch(url);
+    const response = await fetch(url, { signal: AbortSignal.timeout(EMOJI_FETCH_TIMEOUT_MS) });
     if (!response.ok) {
       logger?.debug?.(`Failed to load emoji ${emoji}: ${response.status}`);
       return null;
@@ -92,7 +105,40 @@ async function loadEmojiImage(emoji: string, logger?: HtmlRendererLogger): Promi
   }
 }
 
-const emojiCache: Map<string, string> = new Map();
+const EMOJI_CACHE_MAX = 200;
+/** 失败（null）结果的负缓存 TTL，避免每次渲染都重试失败的 emoji */
+const EMOJI_NEGATIVE_TTL_MS = 60_000;
+
+interface EmojiCacheEntry {
+  value: string | null;
+  ts: number;
+}
+
+/** LRU：Map 迭代顺序即插入顺序，命中时移到末尾，超容量时淘汰最旧项 */
+const emojiCache: Map<string, EmojiCacheEntry> = new Map();
+
+function getCachedEmoji(segment: string): { hit: boolean; value: string | null } {
+  const entry = emojiCache.get(segment);
+  if (!entry) return { hit: false, value: null };
+  if (entry.value === null && Date.now() - entry.ts > EMOJI_NEGATIVE_TTL_MS) {
+    emojiCache.delete(segment);
+    return { hit: false, value: null };
+  }
+  // LRU touch：重新插入到末尾
+  emojiCache.delete(segment);
+  emojiCache.set(segment, entry);
+  return { hit: true, value: entry.value };
+}
+
+function setCachedEmoji(segment: string, value: string | null): void {
+  emojiCache.delete(segment);
+  emojiCache.set(segment, { value, ts: Date.now() });
+  while (emojiCache.size > EMOJI_CACHE_MAX) {
+    const oldest = emojiCache.keys().next().value;
+    if (oldest === undefined) break;
+    emojiCache.delete(oldest);
+  }
+}
 
 async function loadAdditionalAsset(
   languageCode: string,
@@ -100,9 +146,11 @@ async function loadAdditionalAsset(
   logger?: HtmlRendererLogger,
 ): Promise<string | null> {
   if (languageCode === 'emoji') {
-    if (emojiCache.has(segment)) return emojiCache.get(segment)!;
+    const cached = getCachedEmoji(segment);
+    if (cached.hit) return cached.value;
     const result = await loadEmojiImage(segment, logger);
-    if (result) emojiCache.set(segment, result);
+    // 失败也缓存（短 TTL 负缓存），防止同一 emoji 反复打爆 CDN
+    setCachedEmoji(segment, result);
     return result;
   }
   return null;
@@ -120,6 +168,7 @@ async function renderHtmlToSvg(
   fonts: FontConfig[],
   backgroundColor: string | undefined,
   logger?: HtmlRendererLogger,
+  enableEmoji: boolean = true,
 ): Promise<{ svg: string; width: number; height: number }> {
   ensureBuiltinFontsCached(logger);
   const finalFonts = mergeFontLists(getAllBuiltinFonts().map(toFontConfig), fonts);
@@ -137,7 +186,7 @@ async function renderHtmlToSvg(
       style: f.style,
     })),
     loadAdditionalAsset: async (code, seg) =>
-      (await loadAdditionalAsset(code, seg, logger)) ?? '',
+      enableEmoji ? ((await loadAdditionalAsset(code, seg, logger)) ?? '') : '',
   });
 
   const wm = svg.match(/width="(\d+)"/);
@@ -163,11 +212,11 @@ function svgToPng(svg: string, scale: number = 1): Buffer {
   return Buffer.from(pngData.asPng());
 }
 
-function serializeJsxToHtml(element: unknown): string {
-  if (typeof element === 'string' || typeof element === 'number') {
-    return String(element);
-  }
-  if (element == null) return '';
+export function serializeJsxToHtml(element: unknown): string {
+  if (typeof element === 'string') return e(element);
+  if (typeof element === 'number') return String(element);
+  // boolean / null / undefined 一律渲染为空串
+  if (element == null || typeof element === 'boolean') return '';
   if (Array.isArray(element)) {
     return element.map(serializeJsxToHtml).join('');
   }
@@ -187,18 +236,19 @@ function serializeJsxToHtml(element: unknown): string {
     }
 
     const attrs = Object.entries(restProps)
-      .filter(([key]) => key !== 'dangerouslySetInnerHTML')
-      .map(([key, value]) => `${key}="${value}"`)
+      .filter(([key, value]) => key !== 'dangerouslySetInnerHTML' && value != null && value !== false)
+      .map(([key, value]) => `${key}="${e(String(value))}"`)
       .join(' ');
 
-    const styleAttr = styleStr ? ` style="${styleStr}"` : '';
+    const styleAttr = styleStr ? ` style="${e(styleStr)}"` : '';
     const attrStr = attrs ? ` ${attrs}` : '';
 
+    // Raw HTML 只走显式通道 dangerouslySetInnerHTML
     if (dangerouslySetInnerHTML?.__html) {
       return `<${type}${attrStr}${styleAttr}>${dangerouslySetInnerHTML.__html}</${type}>`;
     }
 
-    const childrenHtml = children ? serializeJsxToHtml(children) : '';
+    const childrenHtml = serializeJsxToHtml(children);
     const selfClosingTags = ['img', 'br', 'hr', 'input', 'meta', 'link'];
     if (selfClosingTags.includes(type) && !childrenHtml) {
       return `<${type}${attrStr}${styleAttr} />`;
@@ -215,9 +265,31 @@ export function createHtmlRenderer(
   logger?: HtmlRendererLogger,
 ): HtmlRendererService {
   const mergedConfig = { ...DEFAULT_CONFIG, ...config };
+
+  function cacheDefaultFonts(): void {
+    for (const font of mergedConfig.defaultFonts) {
+      fontCache.set(fontCacheKey(font.name, font.weight, font.style), font);
+    }
+  }
+
   ensureBuiltinFontsCached(logger);
-  for (const font of mergedConfig.defaultFonts) {
-    fontCache.set(`${font.name}-${font.weight || 400}`, font);
+  cacheDefaultFonts();
+
+  // 渲染并发闸：最多 MAX_CONCURRENT_RENDERS 个并发，其余排队
+  let activeRenders = 0;
+  const renderQueue: Array<() => void> = [];
+
+  async function acquireRenderSlot(): Promise<void> {
+    if (activeRenders >= MAX_CONCURRENT_RENDERS) {
+      await new Promise<void>((resolve) => renderQueue.push(resolve));
+    }
+    activeRenders++;
+  }
+
+  function releaseRenderSlot(): void {
+    activeRenders--;
+    const next = renderQueue.shift();
+    if (next) next();
   }
 
   return {
@@ -228,39 +300,46 @@ export function createHtmlRenderer(
         format = 'png',
         backgroundColor = mergedConfig.defaultBackgroundColor,
         fonts = [],
+        enableEmoji = true,
         scale = 1,
       } = options;
 
-      ensureBuiltinFontsCached(logger);
-      const allFonts = uniqueFontsForRender([...fontCache.values(), ...fonts]);
-
-      const { svg, width: actualWidth, height: actualHeight } = await renderHtmlToSvg(
-        html,
-        width,
-        height,
-        allFonts,
-        backgroundColor,
-        logger,
-      );
-
-      if (format === 'svg') {
+      await acquireRenderSlot();
+      try {
+        ensureBuiltinFontsCached(logger);
+        const allFonts = uniqueFontsForRender([...fontCache.values(), ...fonts]);
+
+        const { svg, width: actualWidth, height: actualHeight } = await renderHtmlToSvg(
+          html,
+          width,
+          height,
+          allFonts,
+          backgroundColor,
+          logger,
+          enableEmoji,
+        );
+
+        if (format === 'svg') {
+          return {
+            data: svg,
+            format: 'svg',
+            width: actualWidth,
+            height: actualHeight,
+            mimeType: 'image/svg+xml',
+          };
+        }
+
+        const png = svgToPng(svg, scale);
         return {
-          data: svg,
-          format: 'svg',
-          width: actualWidth,
-          height: actualHeight,
-          mimeType: 'image/svg+xml',
+          data: png,
+          format: 'png',
+          width: Math.round(actualWidth * scale),
+          height: Math.round(actualHeight * scale),
+          mimeType: 'image/png',
         };
+      } finally {
+        releaseRenderSlot();
       }
-
-      const png = svgToPng(svg, scale);
-      return {
-        data: png,
-        format: 'png',
-        width: Math.round(actualWidth * scale),
-        height: Math.round(actualHeight * scale),
-        mimeType: 'image/png',
-      };
     },
 
     async renderJsx(element: unknown, options: RenderOptions = {}): Promise<RenderResult> {
@@ -276,7 +355,7 @@ export function createHtmlRenderer(
     },
 
     registerFont(font: FontConfig): void {
-      fontCache.set(`${font.name}-${font.weight || 400}`, font);
+      fontCache.set(fontCacheKey(font.name, font.weight, font.style), font);
       logger?.debug?.(`Font registered: ${font.name}`);
     },
 
@@ -287,6 +366,8 @@ export function createHtmlRenderer(
     clearFonts(): void {
       fontCache.clear();
       defaultFontLoaded = false;
+      // clear 后重新合并 defaultFonts，避免用户配置的默认字体永久丢失
+      cacheDefaultFonts();
       logger?.debug?.('Font cache cleared');
     },
   };

package/src/types.ts

@@ -47,8 +47,6 @@ export interface HtmlRendererConfig {
   defaultWidth?: number;
   defaultFonts?: FontConfig[];
   defaultBackgroundColor?: string;
-  cacheFonts?: boolean;
-  fontUrls?: string[];
   aiTextAsImage?: boolean | HtmlRendererAiTextAsImageConfig;
 }