@dan-uni/dan-any 0.7.7 → 0.7.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dan-uni/dan-any",
-  "version": "0.7.7",
+  "version": "0.7.8",
   "description": "A danmaku transformer lib, supporting danmaku from different platforms.",
   "keywords": [
     "bangumi",
@@ -17,7 +17,7 @@
   },
   "author": "rinne",
   "main": "dist/index.js",
-  "module": "src/index.ts",
+  "module": "dist/index.js",
   "types": "dist/src/index.d.ts",
   "browser": "dist/index.umd.min.js",
   "scripts": {
@@ -36,6 +36,7 @@
     "canvas": "^3.1.2",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.2",
+    "fabric": "^6.7.1",
     "fast-xml-parser": "^5.2.5",
     "fs-extra": "^11.3.0",
     "hh-mm-ss": "^1.2.0",

package/rslib.config.ts

@@ -18,6 +18,7 @@ export default defineConfig({
       output: {
         filename: { js: 'index.umd.min.js' },
         target: 'web',
+        externals: ['fabric/node'],
       },
       dts: true,
       umdName: pkg.name,

package/src/ass-gen/__tests__/canvas.test.ts

@@ -1,4 +1,4 @@
-import { assertType, it } from 'vitest'
+import { assert, assertType, it } from 'vitest'
 
 import { measureTextWidth } from '../util/layout'
 
@@ -7,5 +7,5 @@ it('canvas measureTextWidth', () => {
   const width = measureTextWidth('SimHei', 25, false, text)
   assertType<number>(width)
   console.info(width, text.length)
-  // assert(width >= 25 * text.length)
+  assert(width >= 25 * text.length)
 })

package/src/ass-gen/util/layout.ts

@@ -1,4 +1,5 @@
-import { createCanvas } from 'canvas'
+import { Canvas as WebCanvas } from 'fabric'
+import { StaticCanvas as NodeCanvas } from 'fabric/node'
 import type { UniPool } from '../..'
 import type { Danmaku, SubtitleStyle } from '../types'
 
@@ -78,7 +79,17 @@ const splitGrids = ({
 }
 
 export const measureTextWidth = (() => {
-  const canvasContext = createCanvas(50, 50).getContext('2d')
+  let isWeb
+  try {
+    isWeb = !!window
+  } catch {
+    isWeb = false
+  }
+  const Canvas = isWeb ? WebCanvas : NodeCanvas
+  const canvasContext = new Canvas(undefined, {
+    width: 50,
+    height: 50,
+  }).getContext()
   const supportTextMeasure = !!canvasContext.measureText('中')
 
   if (supportTextMeasure) {