@dan-uni/dan-any 0.7.8 → 0.8.1

package/dist/index.js

@@ -8,8 +8,6 @@ import { Expose, plainToInstance } from "class-transformer";
 import { IsDate, IsEmail, IsEnum, IsInt, IsNotEmpty, IsNumber, IsOptional, IsString, Max, Min, validateOrReject } from "class-validator";
 import hh_mm_ss from "hh-mm-ss";
 import jssha from "jssha";
-import { Canvas as external_fabric_Canvas } from "fabric";
-import { StaticCanvas } from "fabric/node";
 import { brotliCompressSync, brotliDecompressSync, gunzipSync, gzipSync } from "node:zlib";
 import { decode, encode as external_base16384_encode } from "base16384";
 var __webpack_require__ = {};
@@ -1134,14 +1132,14 @@ class UniPool {
                 return this.dans;
             case 'danuni.bin':
                 return this.toPb();
+            case 'bili.xml':
+                return this.toBiliXML();
             case 'dplayer.json':
                 return this.toDplayer();
             case 'artplayer.json':
                 return this.toArtplayer();
             case 'ddplay.json':
                 return this.toDDplay();
-            case 'common.ass':
-                return this.toASS();
             default:
                 {
                     const message = '(err) Unknown format or unsupported now!';
@@ -1315,7 +1313,7 @@ class UniPool {
     static fromASS(ass) {
         return parseAssRawField(ass);
     }
-    toASS(options = {
+    toASS(canvasCtx, options = {
         substyle: {}
     }) {
         const fn = this.shared.SOID;
@@ -1323,7 +1321,7 @@ class UniPool {
             filename: fn,
             title: fn,
             ...options
-        });
+        }, canvasCtx);
     }
 }
 const color_pad = (s)=>s.length < 2 ? `0${s}` : s;
@@ -1433,18 +1431,7 @@ const splitGrids = ({ fontSize, padding, playResY, bottomSpace })=>{
         2: arrayOfLength(linesCount, 0)
     };
 };
-const measureTextWidth = (()=>{
-    let isWeb;
-    try {
-        isWeb = !!window;
-    } catch  {
-        isWeb = false;
-    }
-    const Canvas = isWeb ? external_fabric_Canvas : StaticCanvas;
-    const canvasContext = new Canvas(void 0, {
-        width: 50,
-        height: 50
-    }).getContext();
+const measureTextWidthConstructor = (canvasContext)=>{
     const supportTextMeasure = !!canvasContext.measureText("\u4E2D");
     if (supportTextMeasure) return (fontName, fontSize, bold, text)=>{
         canvasContext.font = `${bold ? 'bold' : 'normal'} ${fontSize}px ${fontName}`;
@@ -1453,7 +1440,7 @@ const measureTextWidth = (()=>{
     };
     console.warn('[Warn] node-canvas is installed without text measure support, layout may not be correct');
     return (_fontName, fontSize, _bold, text)=>text.length * fontSize;
-})();
+};
 const resolveAvailableFixGrid = (grids, time)=>{
     for (const [i, grid] of grids.entries())if (grid <= time) return i;
     return -1;
@@ -1466,7 +1453,7 @@ const resolveAvailableScrollGrid = (grids, rectWidth, screenWidth, time, duratio
     }
     return -1;
 };
-const initializeLayout = (config)=>{
+const initializeLayout = (config, canvasCtx)=>{
     const { playResX, playResY, fontName, fontSize, bold, padding, scrollTime, fixTime, bottomSpace } = config;
     const [paddingTop, paddingRight, paddingBottom, paddingLeft] = padding;
     const defaultFontSize = fontSize[FontSize.NORMAL];
@@ -1475,7 +1462,7 @@ const initializeLayout = (config)=>{
     return (danmaku)=>{
         const targetGrids = grids[danmaku.type];
         const danmakuFontSize = fontSize[danmaku.fontSizeType];
-        const rectWidth = measureTextWidth(fontName, danmakuFontSize, bold, danmaku.content) + paddingLeft + paddingRight;
+        const rectWidth = measureTextWidthConstructor(canvasCtx)(fontName, danmakuFontSize, bold, danmaku.content) + paddingLeft + paddingRight;
         const verticalOffset = paddingTop + Math.round((defaultFontSize - danmakuFontSize) / 2);
         if (danmaku.type === DanmakuType.SCROLL) {
             const scrollGrids = targetGrids;
@@ -1520,11 +1507,11 @@ const initializeLayout = (config)=>{
         }
     };
 };
-const layoutDanmaku = (inputList, config)=>{
+const layoutDanmaku = (inputList, config, canvasCtx)=>{
     const list = [
         ...UniPool2DanmakuLists(inputList)
     ].sort((x, y)=>x.time - y.time);
-    const layout = initializeLayout(config);
+    const layout = initializeLayout(config, canvasCtx);
     return DanmakuList2UniPool(list.map(layout).filter((danmaku)=>!!danmaku));
 };
 const formatTime = (seconds)=>{
@@ -1759,10 +1746,10 @@ const ass_gen_config = (overrides = {})=>{
     config.backColor = config.backColor && formatColor(hexColorToRGB(config.backColor));
     return config;
 };
-function generateASS(danmaku, options) {
+function generateASS(danmaku, options, canvasCtx) {
     const config = ass_gen_config(options.substyle);
     const mergedList = danmaku.merge(config.mergeIn);
-    const layoutList = layoutDanmaku(mergedList, config);
+    const layoutList = layoutDanmaku(mergedList, config, canvasCtx);
     const content = ass_create(layoutList, danmaku, config, {
         filename: options?.filename || 'unknown',
         title: options?.title || 'unknown'
@@ -2072,14 +2059,14 @@ class src_UniPool {
                 return this.dans;
             case 'danuni.bin':
                 return this.toPb();
+            case 'bili.xml':
+                return this.toBiliXML();
             case 'dplayer.json':
                 return this.toDplayer();
             case 'artplayer.json':
                 return this.toArtplayer();
             case 'ddplay.json':
                 return this.toDDplay();
-            case 'common.ass':
-                return this.toASS();
             default:
                 {
                     const message = '(err) Unknown format or unsupported now!';
@@ -2253,7 +2240,7 @@ class src_UniPool {
     static fromASS(ass) {
         return parseAssRawField(ass);
     }
-    toASS(options = {
+    toASS(canvasCtx, options = {
         substyle: {}
     }) {
         const fn = this.shared.SOID;
@@ -2261,7 +2248,7 @@ class src_UniPool {
             filename: fn,
             title: fn,
             ...options
-        });
+        }, canvasCtx);
     }
 }
 export { UniDM, dm_gen_namespaceObject as UniDMTools, id_gen_namespaceObject as UniIDTools, src_UniPool as UniPool, platform_namespaceObject as platform };