jassub 2.5.0 → 2.5.2

package/src/worker/worker.ts

@@ -8,7 +8,7 @@ import WASM from '../wasm/jassub-worker.js'
 import { Canvas2DRenderer } from './renderers/2d-renderer.ts'
 import { WebGL1Renderer } from './renderers/webgl1-renderer.ts'
 import { WebGL2Renderer } from './renderers/webgl2-renderer.ts'
-import { _applyKeys, _fetch, fetchtext, LIBASS_YCBCR_MAP, THREAD_COUNT, WEIGHT_MAP, type ASSEvent, type ASSImage, type ASSStyle, type WeightValue } from './util.ts'
+import { _fetch, fetchtext, LIBASS_YCBCR_MAP, THREAD_COUNT, WEIGHT_MAP, type ASSEvent, type ASSImage, type ASSStyle, type WeightValue } from './util.ts'
 
 import type { JASSUB, MainModule } from '../wasm/types.d.ts'
 // import { WebGPURenderer } from './webgpu-renderer'
@@ -34,19 +34,22 @@ interface opts {
   queryFonts: 'local' | 'localandremote' | false
 }
 
+const constructor = Symbol.for('constructor')
+
 export class ASSRenderer {
-  _offCanvas?: OffscreenCanvas
   _wasm!: JASSUB
   _subtitleColorSpace?: 'BT601' | 'BT709' | 'SMPTE240M' | 'FCC' | null
   _videoColorSpace?: 'BT709' | 'BT601'
   _malloc!: (size: number) => number
-  _gpurender: WebGL2Renderer | WebGL1Renderer | Canvas2DRenderer
+  _gpurender!: WebGL2Renderer | WebGL1Renderer | Canvas2DRenderer
 
   debug = false
 
-  _ready
+  constructor (...args: [data: opts, getFont: (font: string, weight: WeightValue) => Promise<Uint8Array<ArrayBuffer> | undefined>, ctrl: OffscreenCanvas]) {
+    return this[constructor](...args) as unknown as this
+  }
 
-  constructor (data: opts, getFont: (font: string, weight: WeightValue) => Promise<Uint8Array<ArrayBuffer> | undefined>) {
+  async [constructor] (data: opts, getFont: (font: string, weight: WeightValue) => Promise<Uint8Array<ArrayBuffer> | undefined>, ctrl: OffscreenCanvas) {
     // remove case sensitivity
     this._availableFonts = Object.fromEntries(Object.entries(data.availableFonts).map(([k, v]) => [k.trim().toLowerCase(), v]))
     this.debug = data.debug
@@ -58,17 +61,6 @@ export class ASSRenderer {
     const _fetch = globalThis.fetch
     globalThis.fetch = _ => _fetch(data.wasmUrl)
 
-    // TODO: abslink doesnt support transferables yet
-    const handleMessage = ({ data }: MessageEvent) => {
-      if (data.name === 'offscreenCanvas') {
-        // await this._ready // needed for webGPU
-        this._offCanvas = data.ctrl
-        this._gpurender.setCanvas(this._offCanvas!)
-        removeEventListener('message', handleMessage)
-      }
-    }
-    addEventListener('message', handleMessage)
-
     // const devicePromise = navigator.gpu?.requestAdapter({
     //   powerPreference: 'high-performance'
     // }).then(adapter => adapter?.requestDevice())
@@ -83,33 +75,30 @@ export class ASSRenderer {
       this._gpurender = new Canvas2DRenderer()
     }
 
+    this._gpurender.setCanvas(ctrl)
+
+    this._loadedInitialFonts = !data.fonts.length
     // eslint-disable-next-line @typescript-eslint/unbound-method
-    this._ready = (WASM({ __url: data.wasmUrl, __out: (log: string) => this._log(log) }) as Promise<MainModule>).then(async ({ _malloc, JASSUB }) => {
-      this._malloc = _malloc
+    const { _malloc, JASSUB } = await (WASM({ __url: data.wasmUrl, __out: (log: string) => this._log(log) }) as Promise<MainModule>)
+    this._malloc = _malloc
 
-      this._wasm = new JASSUB(data.width, data.height, this._defaultFont)
-      // Firefox seems to have issues with multithreading in workers
-      // a worker inside a worker does not recieve messages properly
-      this._wasm.setThreads(THREAD_COUNT)
+    this._wasm = new JASSUB(data.width, data.height, this._defaultFont)
+    // Firefox seems to have issues with multithreading in workers
+    // a worker inside a worker does not recieve messages properly
+    this._wasm.setThreads(THREAD_COUNT)
 
-      this._loadInitialFonts(data.fonts)
+    if (!this._loadedInitialFonts) await this._loadInitialFonts(data.fonts)
 
-      this._wasm.createTrackMem(data.subContent ?? await fetchtext(data.subUrl!))
+    this._wasm.createTrackMem(data.subContent ?? await fetchtext(data.subUrl!))
 
-      this._subtitleColorSpace = LIBASS_YCBCR_MAP[this._wasm.trackColorSpace]
+    this._subtitleColorSpace = LIBASS_YCBCR_MAP[this._wasm.trackColorSpace]
 
-      if (data.libassMemoryLimit > 0 || data.libassGlyphLimit > 0) {
-        this._wasm.setMemoryLimits(data.libassGlyphLimit || 0, data.libassMemoryLimit || 0)
-      }
-      // const device = await devicePromise
-      // this._gpurender = device ? new WebGPURenderer(device) : new WebGL2Renderer()
-      // if (this._offCanvas) this._gpurender.setCanvas(this._offCanvas, this._offCanvas.width, this._offCanvas.height)
-      this._checkColorSpace()
-    })
-  }
+    if (data.libassMemoryLimit > 0 || data.libassGlyphLimit > 0) {
+      this._wasm.setMemoryLimits(data.libassGlyphLimit || 0, data.libassMemoryLimit || 0)
+    }
+    this._checkColorSpace()
 
-  ready () {
-    return this._ready
+    return this
   }
 
   // this passes a string of track data to libass, be it styles, events etc, which it then processes and adds to the track
@@ -119,20 +108,15 @@ export class ASSRenderer {
   }
 
   createEvent (event: ASSEvent) {
-    _applyKeys(event, this._wasm.getEvent(this._wasm.allocEvent())!)
+    this._wasm.createEvent(event)
   }
 
-  getEvents () {
-    const events: Array<Partial<ASSEvent>> = []
-    for (let i = 0; i < this._wasm.getEventCount(); i++) {
-      const { Start, Duration, ReadOrder, Layer, Style, MarginL, MarginR, MarginV, Name, Text, Effect } = this._wasm.getEvent(i)!
-      events.push({ Start, Duration, ReadOrder, Layer, Style, MarginL, MarginR, MarginV, Name, Text, Effect })
-    }
-    return events
+  getEvents (): Array<Partial<ASSEvent>> {
+    return this._wasm.getEvents()
   }
 
   setEvent (event: ASSEvent, index: number) {
-    _applyKeys(event, this._wasm.getEvent(index)!)
+    this._wasm.setEvent(index, event)
   }
 
   removeEvent (index: number) {
@@ -140,24 +124,15 @@ export class ASSRenderer {
   }
 
   createStyle (style: ASSStyle) {
-    const alloc = this._wasm.getStyle(this._wasm.allocStyle())!
-    _applyKeys(style, alloc)
-    return alloc
+    this._wasm.createStyle(style)
   }
 
-  getStyles () {
-    const styles: ASSStyle[] = []
-    for (let i = 0; i < this._wasm.getStyleCount(); i++) {
-    // eslint-disable-next-line @typescript-eslint/naming-convention
-      const { Name, FontName, FontSize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding, treat_fontname_as_pattern, Blur, Justify } = this._wasm.getStyle(i)!
-
-      styles.push({ Name, FontName, FontSize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding, treat_fontname_as_pattern, Blur, Justify })
-    }
-    return styles
+  getStyles (): ASSStyle[] {
+    return this._wasm.getStyles()
   }
 
   setStyle (style: ASSStyle, index: number) {
-    _applyKeys(style, this._wasm.getStyle(index)!)
+    this._wasm.setStyle(index, style)
   }
 
   removeStyle (index: number) {
@@ -165,7 +140,7 @@ export class ASSRenderer {
   }
 
   styleOverride (style: ASSStyle) {
-    this._wasm.styleOverride(this.createStyle(style))
+    this._wasm.styleOverride(style)
   }
 
   disableStyleOverride () {
@@ -191,7 +166,7 @@ export class ASSRenderer {
     this._gpurender.setColorMatrix(this._subtitleColorSpace, this._videoColorSpace)
   }
 
-  _defaultFont
+  _defaultFont!: string
   setDefaultFont (fontName: string) {
     this._defaultFont = fontName.trim().toLowerCase()
     this._wasm.setDefaultFont(this._defaultFont)
@@ -206,7 +181,7 @@ export class ASSRenderer {
   }
 
   async addFonts (fontOrURLs: Array<Uint8Array | string>) {
-    if (!fontOrURLs.length) return
+    if (!fontOrURLs.length) return false
     const strings: string[] = []
     const uint8s: Uint8Array[] = []
 
@@ -221,7 +196,7 @@ export class ASSRenderer {
 
     // this isn't batched like uint8s because software like jellyfin exists, which loads 50+ fonts over the network which takes time...
     // is connection exhaustion a concern here?
-    return await Promise.allSettled(strings.map(url => this._asyncWrite(url)))
+    return !!await Promise.allSettled(strings.map(url => this._asyncWrite(url)))
   }
 
   // we don't want to run _findAvailableFont before initial fonts are loaded
@@ -230,9 +205,10 @@ export class ASSRenderer {
   async _loadInitialFonts (fontOrURLs: Array<Uint8Array | string>) {
     await this.addFonts(fontOrURLs)
     this._loadedInitialFonts = true
+    this._wasm.reloadFonts()
   }
 
-  _getFont
+  _getFont!: (font: string, weight: WeightValue) => Promise<Uint8Array<ArrayBuffer> | undefined>
   _availableFonts: Record<string, Uint8Array | string> = {}
   _checkedFonts = new Set<string>()
   async _findAvailableFont (fontName: string, weight?: WeightValue) {
@@ -265,7 +241,7 @@ export class ASSRenderer {
     }
   }
 
-  queryFonts
+  queryFonts!: 'local' | 'localandremote' | false
   async _queryLocalFont (fontName: string, weight: WeightValue) {
     if (!this.queryFonts) return
     return await this._getFont(fontName, weight)
@@ -302,7 +278,6 @@ export class ASSRenderer {
   }
 
   async [finalizer] () {
-    await this._ready
     this._wasm.quitLibrary()
     this._gpurender.destroy()
     // @ts-expect-error force GC
@@ -313,26 +288,10 @@ export class ASSRenderer {
   }
 
   _draw (time: number, repaint = false) {
-    if (!this._offCanvas || !this._gpurender) return
-
-    const result = this._wasm.rawRender(time, Number(repaint))!
-    if (this._wasm.changed === 0 && !repaint) return
-
-    const bitmaps: ASSImage[] = []
-
-    for (let image = result, i = 0; i < this._wasm.count; image = image.next!, ++i) {
-      // @ts-expect-error internal emsc types
-      bitmaps.push({
-        bitmap: image.bitmap,
-        color: image.color,
-        dst_x: image.dst_x,
-        dst_y: image.dst_y,
-        h: image.h,
-        stride: image.stride,
-        w: image.w
-      })
-    }
-    this._gpurender.render(bitmaps, self.HEAPU8RAW)
+    const images = this._wasm.rawRender(time, Number(repaint)) as ASSImage[] | null
+    if (!images) return
+
+    this._gpurender.render(images, self.HEAPU8RAW)
   }
 
   _setColorSpace (videoColorSpace: 'RGB' | 'BT709' | 'BT601') {