@dan-uni/dan-any 0.7.6 → 0.7.8

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) {

package/src/utils/dm-gen.ts

@@ -469,6 +469,8 @@ export class UniDM {
     if (this.options.dmid === undefined || this.options.dmid === true)
       this.options.dmid = createDMID
 
+    this.content = String(this.content)
+
     if (!this.SOID) this.SOID = def.SOID
     if (!this.progress) this.progress = def.progress
     if (!this.mode) this.mode = def.mode