@zhin.js/html-renderer 3.0.14 → 3.0.16

package/lib/renderer.js

@@ -1,279 +1,159 @@
-import { htmlToSvg, getAllBuiltinFonts, h, e } from '@zhin.js/satori';
-import { Resvg } from '@resvg/resvg-js';
-const DEFAULT_CONFIG = {
-    defaultWidth: 800,
-    defaultFonts: [],
-    defaultBackgroundColor: '#ffffff',
-};
-/** 外部资源（twemoji CDN）拉取超时 */
-const EMOJI_FETCH_TIMEOUT_MS = 10_000;
-/** 渲染并发上限，防止渲染任务堆积拖垮进程 */
+import { resolveHtmlRendererConfig } from './config.js';
+import { createEngine } from './engine.js';
+import { buildFontFaces, isFullDocument, withDocumentFile, wrapDocument } from './html.js';
+import { readImageSize } from './image.js';
+import { serializeJsxToHtml } from './jsx.js';
 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 };
-}
-function uniqueFontsForRender(list) {
-    const m = new Map();
-    for (const f of list) {
-        const k = `${f.name}\0${f.weight ?? 400}\0${f.style ?? 'normal'}`;
-        m.set(k, f);
-    }
-    return [...m.values()];
-}
-function mergeFontLists(...lists) {
-    const flat = [];
-    for (const list of lists)
-        flat.push(...list);
-    return uniqueFontsForRender(flat);
-}
-function ensureBuiltinFontsCached(logger) {
-    if (defaultFontLoaded)
-        return;
-    try {
-        const builtinFonts = getAllBuiltinFonts();
-        if (builtinFonts.length > 0) {
-            for (const font of builtinFonts) {
-                const fc = toFontConfig(font);
-                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]));
-            defaultFontLoaded = true;
-            return;
-        }
-    }
-    catch (e) {
-        logger?.warn?.('html-renderer: builtin fonts failed', e);
-    }
-    defaultFontLoaded = true;
-    logger?.warn?.('html-renderer: no builtin fonts available');
-}
-function emojiToTwemojiUrl(emoji) {
-    const codePoints = [];
-    for (const char of emoji) {
-        const cp = char.codePointAt(0);
-        if (cp && cp !== 0xfe0f)
-            codePoints.push(cp.toString(16));
-    }
-    return `https://cdn.jsdelivr.net/gh/twitter/twemoji@14.0.2/assets/svg/${codePoints.join('-')}.svg`;
-}
-async function loadEmojiImage(emoji, logger) {
-    try {
-        const url = emojiToTwemojiUrl(emoji);
-        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;
-        }
-        const svg = await response.text();
-        return `data:image/svg+xml;base64,${Buffer.from(svg).toString('base64')}`;
-    }
-    catch (error) {
-        logger?.debug?.(`Failed to load emoji ${emoji}:`, error);
-        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') {
-        const cached = getCachedEmoji(segment);
-        if (cached.hit)
-            return cached.value;
-        const result = await loadEmojiImage(segment, logger);
-        // 失败也缓存（短 TTL 负缓存），防止同一 emoji 反复打爆 CDN
-        setCachedEmoji(segment, result);
-        return result;
-    }
-    return null;
-}
-function wrapHtmlFragment(html, backgroundColor) {
-    if (html.includes('<!DOCTYPE') || html.includes('<html'))
-        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, enableEmoji = true) {
-    ensureBuiltinFontsCached(logger);
-    const finalFonts = mergeFontLists(getAllBuiltinFonts().map(toFontConfig), fonts);
-    if (finalFonts.length === 0) {
-        logger?.warn?.('html-renderer: no fonts; non-ascii text may fail');
-    }
-    const svg = await htmlToSvg(wrapHtmlFragment(html, backgroundColor ?? '#ffffff'), {
-        width,
-        ...(height != null && { height }),
-        fonts: finalFonts.map((f) => ({
-            name: f.name,
-            data: f.data,
-            weight: f.weight,
-            style: f.style,
-        })),
-        loadAdditionalAsset: async (code, seg) => enableEmoji ? ((await loadAdditionalAsset(code, seg, logger)) ?? '') : '',
-    });
-    const wm = svg.match(/width="(\d+)"/);
-    const hm = svg.match(/height="(\d+)"/);
-    return {
-        svg,
-        width: wm ? parseInt(wm[1], 10) : width,
-        height: hm ? parseInt(hm[1], 10) : height || width,
-    };
-}
-function svgToPng(svg, scale = 1) {
-    const resvg = new Resvg(svg, {
-        fitTo: scale !== 1
-            ? {
-                mode: 'zoom',
-                value: scale,
-            }
-            : undefined,
-    });
-    const pngData = resvg.render();
-    return Buffer.from(pngData.asPng());
-}
-export function serializeJsxToHtml(element) {
-    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('');
-    }
-    if (typeof element === 'object' && element !== null && 'type' in element) {
-        const { type, props = {} } = element;
-        const { children, style, dangerouslySetInnerHTML, ...restProps } = props;
-        let styleStr = '';
-        if (style && typeof style === 'object') {
-            styleStr = Object.entries(style)
-                .map(([key, value]) => `${key.replace(/([A-Z])/g, '-$1').toLowerCase()}: ${value}`)
-                .join('; ');
-        }
-        const attrs = Object.entries(restProps)
-            .filter(([key, value]) => key !== 'dangerouslySetInnerHTML' && value != null && value !== false)
-            .map(([key, value]) => `${key}="${e(String(value))}"`)
-            .join(' ');
-        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 = serializeJsxToHtml(children);
-        const selfClosingTags = ['img', 'br', 'hr', 'input', 'meta', 'link'];
-        if (selfClosingTags.includes(type) && !childrenHtml) {
-            return `<${type}${attrStr}${styleAttr} />`;
-        }
-        return `<${type}${attrStr}${styleAttr}>${childrenHtml}</${type}>`;
-    }
-    return '';
+const MIME = {
+    png: 'image/png',
+    jpeg: 'image/jpeg',
+    webp: 'image/webp',
+};
+function fontKey(font) {
+    return `${font.name}\0${font.weight ?? 400}\0${font.style ?? 'normal'}`;
 }
 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);
-    cacheDefaultFonts();
-    // 渲染并发闸：最多 MAX_CONCURRENT_RENDERS 个并发，其余排队
+    const mergedConfig = resolveHtmlRendererConfig(config);
+    const engine = createEngine(mergedConfig.shotium, logger);
+    const registeredFonts = new Map();
+    const warned = new Set();
     let activeRenders = 0;
     const renderQueue = [];
-    async function acquireRenderSlot() {
+    const warnOnce = (key, ...message) => {
+        if (warned.has(key))
+            return;
+        warned.add(key);
+        logger?.warn?.(...message);
+    };
+    const getFonts = (extraFonts = []) => {
+        const fonts = new Map();
+        for (const font of mergedConfig.defaultFonts)
+            fonts.set(fontKey(font), font);
+        for (const font of registeredFonts.values())
+            fonts.set(fontKey(font), font);
+        for (const font of extraFonts)
+            fonts.set(fontKey(font), font);
+        return [...fonts.values()];
+    };
+    const acquireRenderSlot = async () => {
         if (activeRenders >= MAX_CONCURRENT_RENDERS) {
             await new Promise((resolve) => renderQueue.push(resolve));
         }
         activeRenders++;
-    }
-    function releaseRenderSlot() {
+    };
+    const releaseRenderSlot = () => {
         activeRenders--;
-        const next = renderQueue.shift();
-        if (next)
-            next();
-    }
+        renderQueue.shift()?.();
+    };
+    const capture = async (file, options, defaults) => {
+        const type = options.type ?? defaults.type;
+        const shot = {
+            file,
+            type,
+            viewport: {
+                width: Math.round(options.width ?? mergedConfig.shotium.viewport.width),
+                height: Math.round(options.height ?? mergedConfig.shotium.viewport.height),
+            },
+            allowFileAccess: options.allowFileAccess ?? mergedConfig.shotium.allowFileAccess,
+            pageGotoParams: {
+                waitUntil: options.waitUntil ?? mergedConfig.shotium.waitUntil,
+                timeout: options.timeout ?? mergedConfig.shotium.timeout,
+            },
+        };
+        if (type !== 'png')
+            shot.quality = options.quality ?? mergedConfig.shotium.quality;
+        const selector = options.selector ?? defaults.selector;
+        if (options.fullPage ?? defaults.fullPage)
+            shot.fullPage = true;
+        else if (selector)
+            shot.selector = selector;
+        if (options.omitBackground && type !== 'jpeg')
+            shot.omitBackground = true;
+        if (options.clip && !shot.fullPage && !shot.selector)
+            shot.clip = options.clip;
+        const scale = options.scale ?? mergedConfig.shotium.scale;
+        if (scale !== 1)
+            shot.scale = scale;
+        if (options.headers && Object.keys(options.headers).length > 0)
+            shot.headers = options.headers;
+        if (options.cache)
+            shot.cache = options.cache;
+        const result = await engine.screenshot(shot);
+        const image = result.image;
+        if (!image)
+            throw new Error('[shotium] engine returned no image');
+        const size = readImageSize(image);
+        if (mergedConfig.shotium.logStats) {
+            logger?.info?.(`[shotium] render ${size ? `${size.width}x${size.height}` : '?'} ${(image.length / 1024).toFixed(1)}KB `
+                + `(engine ${result.stats.timing.total.toFixed(1)}ms, requests ${result.stats.requests}, cache ${result.stats.fromCache})`);
+        }
+        return {
+            data: image,
+            width: size?.width ?? 0,
+            height: size?.height ?? 0,
+            mimeType: MIME[type],
+            stats: result.stats,
+        };
+    };
+    const renderWithShotium = async (html, options = {}) => {
+        const fonts = getFonts(options.fonts ?? []);
+        const wrapped = !isFullDocument(html);
+        const document = wrapDocument(html, {
+            width: options.width ?? mergedConfig.shotium.viewport.width,
+            ...(options.height != null ? { height: options.height } : {}),
+            backgroundColor: options.backgroundColor ?? mergedConfig.shotium.backgroundColor,
+            fontFamily: mergedConfig.shotium.fontFamily,
+            fontFaces: buildFontFaces(fonts),
+        });
+        const defaults = wrapped
+            ? { type: 'png', fullPage: false, selector: 'body' }
+            : { type: 'png', fullPage: true };
+        const result = await withDocumentFile(document, (file) => capture(file, {
+            width: options.width,
+            height: options.height,
+            backgroundColor: options.backgroundColor,
+            scale: options.scale,
+        }, defaults));
+        return {
+            data: result.data,
+            format: 'png',
+            width: result.width,
+            height: result.height,
+            mimeType: result.mimeType,
+        };
+    };
     return {
         async render(html, options = {}) {
-            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',
-                    };
+                if ((options.format ?? 'png') === 'svg') {
+                    warnOnce('svg', 'html-renderer: shotium does not support svg output; returning png instead');
                 }
-                const png = svgToPng(svg, scale);
-                return {
-                    data: png,
-                    format: 'png',
-                    width: Math.round(actualWidth * scale),
-                    height: Math.round(actualHeight * scale),
-                    mimeType: 'image/png',
-                };
+                return await renderWithShotium(html, options);
             }
             finally {
                 releaseRenderSlot();
+                engine.release();
             }
         },
         async renderJsx(element, options = {}) {
             return this.render(serializeJsxToHtml(element), options);
         },
         async renderComponent(component, props, options = {}) {
-            return this.render(h(component, props), options);
+            return this.render(serializeJsxToHtml(component(props)), options);
         },
         registerFont(font) {
-            fontCache.set(fontCacheKey(font.name, font.weight, font.style), font);
+            registeredFonts.set(fontKey(font), font);
             logger?.debug?.(`Font registered: ${font.name}`);
         },
         getFonts() {
-            return Array.from(fontCache.values());
+            return getFonts();
         },
         clearFonts() {
-            fontCache.clear();
-            defaultFontLoaded = false;
-            // clear 后重新合并 defaultFonts，避免用户配置的默认字体永久丢失
-            cacheDefaultFonts();
+            registeredFonts.clear();
             logger?.debug?.('Font cache cleared');
         },
     };
 }
+export { serializeJsxToHtml } from './jsx.js';
 //# sourceMappingURL=renderer.js.map

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

@@ -1,5 +1,7 @@
-import type { HtmlComponent } from '@zhin.js/satori';
 export type OutputFormat = 'svg' | 'png';
+export type RasterFormat = 'png' | 'jpeg' | 'webp';
+export type WaitUntil = 'load' | 'networkidle';
+export type HtmlComponent<P> = (props: P) => unknown;
 export interface FontConfig {
     name: string;
     data: ArrayBuffer | Buffer;
@@ -37,11 +39,34 @@ export interface HtmlRendererAiTextAsImageConfig {
     scale?: number;
     fileName?: string;
 }
+export interface HtmlRendererViewport {
+    width?: number;
+    height?: number;
+}
 export interface HtmlRendererConfig {
     defaultWidth?: number;
+    width?: number;
     defaultFonts?: FontConfig[];
     defaultBackgroundColor?: string;
+    backgroundColor?: string;
     aiTextAsImage?: boolean | HtmlRendererAiTextAsImageConfig;
+    viewport?: HtmlRendererViewport;
+    scale?: number;
+    type?: RasterFormat;
+    quality?: number;
+    timeout?: number;
+    waitUntil?: WaitUntil;
+    fontFamily?: string;
+    maxImageHeight?: number;
+    sliceCompression?: number;
+    allowFileAccess?: boolean;
+    takeOverHtmlSegments?: boolean;
+    cacheDir?: string;
+    cacheMaxBytes?: number;
+    userAgent?: string;
+    idleTimeoutMs?: number;
+    logStats?: boolean;
+    htmlRenderer?: HtmlRendererConfig | Record<string, unknown>;
 }
 export interface HtmlRendererService {
     render(html: string, options?: RenderOptions): Promise<RenderResult>;

package/lib/types.d.ts.map

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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@zhin.js/html-renderer",
-  "version": "3.0.14",
-  "description": "HTML to PNG/SVG for Zhin.js (satori + resvg); optional peer of zhin.js",
+  "version": "3.0.16",
+  "description": "HTML rendering for Zhin.js with Shotium; optional peer of zhin.js",
   "type": "module",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
@@ -23,7 +23,7 @@
     "zhin.js",
     "html",
     "image",
-    "satori",
+    "shotium",
     "png"
   ],
   "author": {
@@ -33,11 +33,10 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@resvg/resvg-js": "^2.6.2",
-    "@zhin.js/satori": "1.0.19"
+    "@shotkit/shotium": "^0.3.3"
   },
   "peerDependencies": {
-    "@zhin.js/core": "1.5.14"
+    "@zhin.js/core": "1.5.16"
   },
   "peerDependenciesMeta": {
     "@zhin.js/core": {
@@ -46,7 +45,7 @@
   },
   "devDependencies": {
     "typescript": "^6.0.3",
-    "@zhin.js/core": "1.5.14"
+    "@zhin.js/core": "1.5.16"
   },
   "repository": {
     "type": "git",