jassub 2.2.7 → 2.3.0

package/dist/worker/worker.d.ts

@@ -1,7 +1,7 @@
 import { finalizer } from 'abslink';
-import { WebGL2Renderer } from './webgl-renderer';
-import type { ASSEvent, ASSStyle } from '../jassub';
-import type { JASSUB } from '../wasm/types.js';
+import { type ASSEvent, type ASSStyle, type WeightValue } from './util.ts';
+import { WebGL2Renderer } from './webgl-renderer.ts';
+import type { JASSUB } from '../wasm/types.d.ts';
 interface opts {
     wasmUrl: string;
     width: number;
@@ -10,11 +10,11 @@ interface opts {
     subContent: string | null;
     fonts: Array<string | Uint8Array>;
     availableFonts: Record<string, Uint8Array | string>;
-    fallbackFont: string;
+    defaultFont: string;
     debug: boolean;
     libassMemoryLimit: number;
     libassGlyphLimit: number;
-    useLocalFonts: boolean;
+    queryFonts: 'local' | 'localandremote' | false;
 }
 export declare class ASSRenderer {
     _offCanvas?: OffscreenCanvas;
@@ -24,34 +24,39 @@ export declare class ASSRenderer {
     _malloc: (size: number) => number;
     _gpurender: WebGL2Renderer;
     debug: boolean;
-    useLocalFonts: boolean;
-    _availableFonts: Record<string, Uint8Array | string>;
-    _fontMap: Record<string, boolean>;
-    _fontId: number;
     _ready: Promise<void>;
-    _getFont: (font: string) => Promise<void>;
-    constructor(data: opts, getFont: (font: string) => Promise<void>);
+    constructor(data: opts, getFont: (font: string, weight: WeightValue) => Promise<Uint8Array<ArrayBuffer> | undefined>);
     ready(): Promise<void>;
-    addFont(fontOrURL: Uint8Array | string): void;
     createEvent(event: ASSEvent): void;
     getEvents(): Partial<ASSEvent>[];
     setEvent(event: ASSEvent, index: number): void;
     removeEvent(index: number): void;
-    createStyle(style: ASSStyle): import("../wasm/types.js").ASS_Style;
+    createStyle(style: ASSStyle): import("../wasm/types.d.ts").ASS_Style;
     getStyles(): ASSStyle[];
     setStyle(style: ASSStyle, index: number): void;
     removeStyle(index: number): void;
     styleOverride(style: ASSStyle): void;
     disableStyleOverride(): void;
-    setDefaultFont(fontName: string): void;
     setTrack(content: string): void;
     freeTrack(): void;
-    setTrackByUrl(url: string): void;
+    setTrackByUrl(url: string): Promise<void>;
     _checkColorSpace(): void;
-    _findAvailableFonts(font: string): void;
-    _asyncWrite(font: Uint8Array | string): void;
-    _allocFont(uint8: Uint8Array): void;
-    _processAvailableFonts(content: string): void;
+    _defaultFont: string;
+    setDefaultFont(fontName: string): void;
+    _log(log: string): void;
+    addFonts(fontOrURLs: Array<Uint8Array | string>): Promise<void>;
+    _loadedInitialFonts: boolean;
+    _loadInitialFonts(fontOrURLs: Array<Uint8Array | string>): Promise<void>;
+    _getFont: (font: string, weight: WeightValue) => Promise<Uint8Array<ArrayBuffer> | undefined>;
+    _availableFonts: Record<string, Uint8Array | string>;
+    _checkedFonts: Set<string>;
+    _findAvailableFont(fontName: string, weight?: WeightValue): Promise<void>;
+    queryFonts: false | "local" | "localandremote";
+    _queryLocalFont(fontName: string, weight: WeightValue): Promise<Uint8Array<ArrayBuffer> | undefined>;
+    _queryRemoteFont(fontName: string, postscriptName: string): Promise<Uint8Array<ArrayBuffer> | undefined>;
+    _asyncWrite(font: string): Promise<void>;
+    _fontId: number;
+    _allocFonts(uint8s: Uint8Array[]): void;
     _resizeCanvas(width: number, height: number, videoWidth: number, videoHeight: number): void;
     [finalizer](): Promise<void>;
     _draw(time: number, repaint?: boolean): void;

package/dist/worker/worker.js

@@ -1,10 +1,10 @@
 /* eslint-disable camelcase */
 import { finalizer } from 'abslink';
 import { expose } from 'abslink/w3c';
+import { queryRemoteFonts } from 'lfa-ponyfill';
 import WASM from '../wasm/jassub-worker.js';
-import { libassYCbCrMap, read_, readAsync, _applyKeys } from './util';
-import { WebGL2Renderer } from './webgl-renderer';
-const IS_FIREFOX = navigator.userAgent.toLowerCase().includes('firefox');
+import { _applyKeys, _fetch, fetchtext, IS_FIREFOX, LIBASS_YCBCR_MAP, WEIGHT_MAP } from "./util.js";
+import { WebGL2Renderer } from "./webgl-renderer.js";
 export class ASSRenderer {
     _offCanvas;
     _wasm;
@@ -13,17 +13,14 @@ export class ASSRenderer {
     _malloc;
     _gpurender = new WebGL2Renderer();
     debug = false;
-    useLocalFonts = false;
-    _availableFonts = {};
-    _fontMap = {};
-    _fontId = 0;
     _ready;
-    _getFont;
     constructor(data, getFont) {
-        this._availableFonts = data.availableFonts;
+        // remove case sensitivity
+        this._availableFonts = Object.fromEntries(Object.entries(data.availableFonts).map(([k, v]) => [k.trim().toLowerCase(), v]));
         this.debug = data.debug;
-        this.useLocalFonts = data.useLocalFonts;
+        this.queryFonts = data.queryFonts;
         this._getFont = getFont;
+        this._defaultFont = data.defaultFont.trim().toLowerCase();
         // hack, we want custom WASM URLs
         const _fetch = globalThis.fetch;
         globalThis.fetch = _ => _fetch(data.wasmUrl);
@@ -40,22 +37,16 @@ export class ASSRenderer {
         // const devicePromise = navigator.gpu?.requestAdapter({
         //   powerPreference: 'high-performance'
         // }).then(adapter => adapter?.requestDevice())
-        this._ready = WASM({ __url: data.wasmUrl }).then(async (Module) => {
-            // eslint-disable-next-line @typescript-eslint/unbound-method
-            this._malloc = Module._malloc;
-            const fallbackFont = data.fallbackFont.toLowerCase();
-            this._wasm = new Module.JASSUB(data.width, data.height, fallbackFont);
+        // eslint-disable-next-line @typescript-eslint/unbound-method
+        this._ready = WASM({ __url: data.wasmUrl, __out: (log) => this._log(log) }).then(async ({ _malloc, JASSUB }) => {
+            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 recive messages properly
+            // a worker inside a worker does not recieve messages properly
             this._wasm.setThreads(!IS_FIREFOX && self.crossOriginIsolated ? Math.min(Math.max(1, navigator.hardwareConcurrency - 2), 8) : 1);
-            if (fallbackFont)
-                this._findAvailableFonts(fallbackFont);
-            const subContent = data.subContent ?? read_(data.subUrl);
-            for (const font of data.fonts)
-                this._asyncWrite(font);
-            this._wasm.createTrackMem(subContent);
-            this._processAvailableFonts(subContent);
-            this._subtitleColorSpace = libassYCbCrMap[this._wasm.trackColorSpace];
+            this._loadInitialFonts(data.fonts);
+            this._wasm.createTrackMem(data.subContent ?? await fetchtext(data.subUrl));
+            this._subtitleColorSpace = LIBASS_YCBCR_MAP[this._wasm.trackColorSpace];
             if (data.libassMemoryLimit > 0 || data.libassGlyphLimit > 0) {
                 this._wasm.setMemoryLimits(data.libassGlyphLimit || 0, data.libassMemoryLimit || 0);
             }
@@ -68,9 +59,6 @@ export class ASSRenderer {
     ready() {
         return this._ready;
     }
-    addFont(fontOrURL) {
-        this._asyncWrite(fontOrURL);
-    }
     createEvent(event) {
         _applyKeys(event, this._wasm.getEvent(this._wasm.allocEvent()));
     }
@@ -114,68 +102,122 @@ export class ASSRenderer {
     disableStyleOverride() {
         this._wasm.disableStyleOverride();
     }
-    setDefaultFont(fontName) {
-        this._wasm.setDefaultFont(fontName);
-    }
     setTrack(content) {
         this._wasm.createTrackMem(content);
-        this._processAvailableFonts(content);
-        this._subtitleColorSpace = libassYCbCrMap[this._wasm.trackColorSpace];
+        this._subtitleColorSpace = LIBASS_YCBCR_MAP[this._wasm.trackColorSpace];
     }
     freeTrack() {
         this._wasm.removeTrack();
     }
-    setTrackByUrl(url) {
-        this.setTrack(read_(url));
+    async setTrackByUrl(url) {
+        this.setTrack(await fetchtext(url));
     }
     _checkColorSpace() {
         if (!this._subtitleColorSpace || !this._videoColorSpace)
             return;
         this._gpurender.setColorMatrix(this._subtitleColorSpace, this._videoColorSpace);
     }
-    _findAvailableFonts(font) {
-        font = font.trim().toLowerCase();
-        if (font[0] === '@')
-            font = font.substring(1);
-        if (this._fontMap[font])
-            return;
-        this._fontMap[font] = true;
-        if (!this._availableFonts[font]) {
-            if (this.useLocalFonts)
-                this._getFont(font);
+    _defaultFont;
+    setDefaultFont(fontName) {
+        this._defaultFont = fontName.trim().toLowerCase();
+        this._wasm.setDefaultFont(this._defaultFont);
+    }
+    _log(log) {
+        console.debug(log);
+        const match = log.match(/JASSUB: fontselect: Using default font family: \(([^,]+), (\d{1,4}), \d\)/);
+        if (match) {
+            this._findAvailableFont(match[1].trim().toLowerCase(), WEIGHT_MAP[parseInt(match[2], 10) / 100 - 1]);
         }
-        else {
-            this._asyncWrite(this._availableFonts[font]);
+        else if (log.startsWith('JASSUB: fontselect: failed to find any fallback with glyph 0x0 for font:')) {
+            this._findAvailableFont(this._defaultFont);
         }
     }
-    _asyncWrite(font) {
-        if (typeof font === 'string') {
-            readAsync(font, fontData => {
-                this._allocFont(new Uint8Array(fontData));
-            }, console.error);
-        }
-        else {
-            this._allocFont(font);
+    async addFonts(fontOrURLs) {
+        if (!fontOrURLs.length)
+            return;
+        const strings = [];
+        const uint8s = [];
+        for (const fontOrURL of fontOrURLs) {
+            if (typeof fontOrURL === 'string') {
+                strings.push(fontOrURL);
+            }
+            else {
+                uint8s.push(fontOrURL);
+            }
         }
+        if (uint8s.length)
+            this._allocFonts(uint8s);
+        // 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?
+        await Promise.allSettled(strings.map(url => this._asyncWrite(url)));
     }
-    // TODO: this should re-draw last frame!
-    _allocFont(uint8) {
-        const ptr = this._malloc(uint8.byteLength);
-        self.HEAPU8RAW.set(uint8, ptr);
-        this._wasm.addFont('font-' + (this._fontId++), ptr, uint8.byteLength);
-        this._wasm.reloadFonts();
+    // we don't want to run _findAvailableFont before initial fonts are loaded
+    // because it could duplicate fonts
+    _loadedInitialFonts = false;
+    async _loadInitialFonts(fontOrURLs) {
+        await this.addFonts(fontOrURLs);
+        this._loadedInitialFonts = true;
     }
-    _processAvailableFonts(content) {
-        if (!this._availableFonts)
+    _getFont;
+    _availableFonts = {};
+    _checkedFonts = new Set();
+    async _findAvailableFont(fontName, weight) {
+        if (!this._loadedInitialFonts)
+            return;
+        // Roboto Medium, null -> Roboto, Medium
+        // Roboto Medium, Medium -> Roboto, Medium
+        // Roboto, null -> Roboto, Regular
+        // italic is not handled I guess
+        for (const _weight of WEIGHT_MAP) {
+            // check if fontname has this weight name in it, if yes remove it
+            if (fontName.includes(_weight)) {
+                fontName = fontName.replace(_weight, '').trim();
+                weight ??= _weight;
+                break;
+            }
+        }
+        weight ??= 'regular';
+        const key = fontName + ' ' + weight;
+        if (this._checkedFonts.has(key))
             return;
-        for (const { FontName } of this.getStyles()) {
-            this._findAvailableFonts(FontName);
+        this._checkedFonts.add(key);
+        try {
+            const font = this._availableFonts[key] ?? this._availableFonts[fontName] ?? await this._queryLocalFont(fontName, weight) ?? await this._queryRemoteFont(fontName, key);
+            if (font)
+                return await this.addFonts([font]);
         }
-        const regex = /\\fn([^\\}]*?)[\\}]/g;
-        let matches;
-        while ((matches = regex.exec(content)) !== null) {
-            this._findAvailableFonts(matches[1]);
+        catch (e) {
+            console.warn('Error querying font', fontName, weight, e);
+        }
+    }
+    queryFonts;
+    async _queryLocalFont(fontName, weight) {
+        if (!this.queryFonts)
+            return;
+        return await this._getFont(fontName, weight);
+    }
+    async _queryRemoteFont(fontName, postscriptName) {
+        if (this.queryFonts !== 'localandremote')
+            return;
+        const fontData = await queryRemoteFonts({ postscriptNames: [postscriptName, fontName] });
+        if (!fontData.length)
+            return;
+        const blob = await fontData[0].blob();
+        return new Uint8Array(await blob.arrayBuffer());
+    }
+    async _asyncWrite(font) {
+        const res = await _fetch(font);
+        this._allocFonts([new Uint8Array(await res.arrayBuffer())]);
+    }
+    _fontId = 0;
+    _allocFonts(uint8s) {
+        // TODO: this should re-draw last frame!
+        for (const uint8 of uint8s) {
+            const ptr = this._malloc(uint8.byteLength);
+            self.HEAPU8RAW.set(uint8, ptr);
+            this._wasm.addFont('font-' + (this._fontId++), ptr, uint8.byteLength);
         }
+        this._wasm.reloadFonts();
     }
     _resizeCanvas(width, height, videoWidth, videoHeight) {
         this._wasm.resizeCanvas(width, height, videoWidth, videoHeight);

package/dist/worker/worker.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jassub",
-  "version": "2.2.7",
+  "version": "2.3.0",
   "description": "The Fastest JavaScript SSA/ASS Subtitle Renderer For Browsers",
   "main": "dist/jassub.js",
   "type": "module",
@@ -9,11 +9,13 @@
     "dist/worker/*",
     "dist/jassub.*",
     "dist/debug.*",
+    "dist/default.woff2",
     "!dist/wasm/jassub-worker-modern.js",
     "README.md",
     "LICENSE",
     "index.d.ts",
-    "src/**/*.ts"
+    "src/**/*.ts",
+    "!src/default.woff2"
   ],
   "repository": {
     "type": "git",
@@ -39,6 +41,7 @@
   "homepage": "https://github.com/ThaUnknown/jassub",
   "dependencies": {
     "abslink": "^1.1.6",
+    "lfa-ponyfill": "^1.1.0",
     "rvfc-polyfill": "^1.0.8",
     "throughput": "^1.0.2"
   },

package/src/jassub.ts

@@ -1,14 +1,18 @@
-/* eslint-disable camelcase */
 import 'rvfc-polyfill'
 
 import { proxy, releaseProxy } from 'abslink'
 import { wrap } from 'abslink/w3c'
 
-import { Debug } from './debug'
+import { Debug } from './debug.ts'
 
-import type { ASS_Event, ASS_Image, ASS_Style, ClassHandle } from './wasm/types'
+import type { WeightValue } from './worker/util.ts'
 import type { ASSRenderer } from './worker/worker'
 import type { Remote } from 'abslink'
+import type { queryRemoteFonts } from 'lfa-ponyfill'
+
+declare const self: typeof globalThis & {
+  queryLocalFonts: (opts?: { postscriptNames?: string[] }) => ReturnType<typeof queryRemoteFonts>
+}
 
 const webYCbCrMap = {
   rgb: 'RGB',
@@ -18,10 +22,6 @@ const webYCbCrMap = {
   smpte170m: 'BT601'// alias BT.601 NTSC... whats the difference?
 } as const
 
-export type ASSEvent = Omit<ASS_Event, keyof ClassHandle>
-export type ASSStyle = Omit<ASS_Style, keyof ClassHandle>
-export type ASSImage = Omit<ASS_Image, keyof ClassHandle>
-
 export type JASSUBOptions = {
   timeOffset?: number
   debug?: boolean
@@ -31,12 +31,10 @@ export type JASSUBOptions = {
   workerUrl?: string
   wasmUrl?: string
   modernWasmUrl?: string
-  subUrl?: string
-  subContent?: string
-  fonts?: string[] | Uint8Array[]
+  fonts?: Array<string | Uint8Array>
   availableFonts?: Record<string, Uint8Array | string>
-  fallbackFont?: string
-  useLocalFonts?: boolean
+  defaultFont?: string
+  queryFonts?: 'local' | 'localandremote' | false
   libassMemoryLimit?: number
   libassGlyphLimit?: number
 } & ({
@@ -45,6 +43,12 @@ export type JASSUBOptions = {
 } | {
   video?: HTMLVideoElement
   canvas: HTMLCanvasElement
+}) & ({
+  subUrl: string
+  subContent?: string
+} | {
+  subUrl?: string
+  subContent: string
 })
 
 export default class JASSUB {
@@ -111,23 +115,27 @@ export default class JASSUB {
     const Renderer = wrap<typeof ASSRenderer>(this._worker)
 
     const modern = opts.modernWasmUrl ?? new URL('./wasm/jassub-worker-modern.wasm', import.meta.url).href
-    const fallback = opts.wasmUrl ?? new URL('./wasm/jassub-worker.wasm', import.meta.url).href
+    const normal = opts.wasmUrl ?? new URL('./wasm/jassub-worker.wasm', import.meta.url).href
+
+    const availableFonts = opts.availableFonts ?? {}
+    if (!availableFonts['liberation sans'] && !opts.defaultFont) {
+      availableFonts['liberation sans'] = new URL('./default.woff2', import.meta.url).href
+    }
 
     this.ready = (async () => {
       this.renderer = await new Renderer({
-        wasmUrl: JASSUB._supportsSIMD ? modern : fallback,
+        wasmUrl: JASSUB._supportsSIMD ? modern : normal,
         width: ctrl.width,
         height: ctrl.height,
         subUrl: opts.subUrl,
         subContent: opts.subContent ?? null,
         fonts: opts.fonts ?? [],
-        availableFonts: opts.availableFonts ?? { 'liberation sans': './default.woff2' },
-        fallbackFont: opts.fallbackFont ?? 'liberation sans',
+        availableFonts,
+        defaultFont: opts.defaultFont ?? 'liberation sans',
         debug: !!opts.debug,
         libassMemoryLimit: opts.libassMemoryLimit ?? 0,
         libassGlyphLimit: opts.libassGlyphLimit ?? 0,
-        // @ts-expect-error TS doesn't know about queryLocalFonts
-        useLocalFonts: typeof queryLocalFonts !== 'undefined' && (opts.useLocalFonts ?? true)
+        queryFonts: opts.queryFonts ?? 'local'
       }, proxy(font => this._getLocalFont(font))) as unknown as Remote<ASSRenderer>
 
       await this.renderer.ready()
@@ -174,8 +182,10 @@ export default class JASSUB {
       this._canvas.style.height = videoSize.height + 'px'
     }
 
-    this._canvas.style.top = top + 'px'
-    this._canvas.style.left = left + 'px'
+    if (this._canvasParent) {
+      this._canvas.style.top = top + 'px'
+      this._canvas.style.left = left + 'px'
+    }
 
     await this.renderer._resizeCanvas(
       width,
@@ -248,36 +258,21 @@ export default class JASSUB {
     }
   }
 
-  async _sendLocalFont (name: string) {
-    try {
-      // @ts-expect-error ts doesnt know
-      const fontData = await queryLocalFonts()
-      // @ts-expect-error ts doesnt know
-      const fonts = fontData?.filter(({ fullName, family }) => fullName.toLowerCase() === name || family.toLowerCase() === name)
-      for (const font of fonts) {
-        const blob: Blob = await font.blob()
-        this.renderer.addFont(new Uint8Array(await blob.arrayBuffer()))
-      }
-    } catch (e) {
-      console.warn('Local fonts API:', e)
+  async _getLocalFont (font: string, weight: WeightValue = 'regular') {
+    // electron by default has all permissions enabled, and it doesn't have perm query
+    // if this happens, just send it
+    if (navigator.permissions?.query) {
+      const { state } = await navigator.permissions.query({ name: 'local-fonts' as PermissionName })
+      if (state !== 'granted') return
     }
-  }
 
-  async _getLocalFont (font: string) {
-    try {
-      // electron by default has all permissions enabled, and it doesn't have perm query
-      // if this happens, just send it
-      if (navigator?.permissions?.query) {
-        // @ts-expect-error TS doesn't know about local-fonts
-        const permission = await navigator.permissions.query({ name: 'local-fonts' })
-        if (permission.state === 'granted') {
-          await this._sendLocalFont(font)
-        }
-      } else {
-        await this._sendLocalFont(font)
+    for (const data of await self.queryLocalFonts()) {
+      const family = data.family.toLowerCase()
+      const style = data.style.toLowerCase()
+      if (family === font && style === weight) {
+        const blob = await data.blob()
+        return new Uint8Array(await blob.arrayBuffer())
       }
-    } catch (e) {
-      console.warn('Local fonts API:', e)
     }
   }
 

package/src/worker/util.ts

@@ -1,35 +1,43 @@
-import type { ASSEvent, ASSStyle } from '../jassub'
-
-export const read_ = (url: string, ab = false) => {
-  const xhr = new XMLHttpRequest()
-  xhr.open('GET', url, false)
-  xhr.responseType = ab ? 'arraybuffer' : 'text'
-  xhr.send(null)
-  return xhr.response
-}
+/* eslint-disable camelcase */
+import type { ASS_Event, ASS_Image, ASS_Style, ClassHandle } from '../wasm/types.d.ts'
 
-export const readAsync = (url: string, load: (response: ArrayBuffer) => void, err: (error: unknown) => void) => {
-  const xhr = new XMLHttpRequest()
-  xhr.open('GET', url, true)
-  xhr.responseType = 'arraybuffer'
-  xhr.onload = () => {
-    if ((xhr.status === 200 || xhr.status === 0) && xhr.response) {
-      return load(xhr.response)
-    }
-  }
-  xhr.onerror = err
-  xhr.send(null)
-}
+export type ASSEvent = Omit<ASS_Event, keyof ClassHandle>
+export type ASSStyle = Omit<ASS_Style, keyof ClassHandle>
+export type ASSImage = Omit<ASS_Image, keyof ClassHandle>
+
+// offset by 1, 0 = 1, to match CSS font-weight values, but dividing by 100 gives the correct index
+export const WEIGHT_MAP = [
+  'thin',
+  'extralight',
+  'light',
+  'regular', // Normal isn't used
+  'medium',
+  'semibold',
+  'bold',
+  'extrabold',
+  'black',
+  'ultrablack'
+] as const
+
+export type WeightValue = typeof WEIGHT_MAP[number]
+
+export const IS_FIREFOX = navigator.userAgent.toLowerCase().includes('firefox')
 
 const a = 'BT601'
 const b = 'BT709'
 const c = 'SMPTE240M'
 const d = 'FCC'
 
-export const libassYCbCrMap = [null, a, null, a, a, b, b, c, c, d, d] as const
+export const LIBASS_YCBCR_MAP = [null, a, null, a, a, b, b, c, c, d, d] as const
 
 export function _applyKeys<T extends (ASSEvent | ASSStyle)> (input: T, output: T) {
   for (const v of Object.keys(input) as Array<keyof T>) {
     output[v] = input[v]
   }
 }
+
+export const _fetch = globalThis.fetch
+export async function fetchtext (url: string) {
+  const res = await _fetch(url)
+  return await res.text()
+}

package/src/worker/webgl-renderer.ts

@@ -1,4 +1,4 @@
-import type { ASSImage } from '../jassub'
+import { IS_FIREFOX, type ASSImage } from './util.ts'
 
 declare const self: DedicatedWorkerGlobalScope &
   typeof globalThis & {
@@ -6,8 +6,6 @@ declare const self: DedicatedWorkerGlobalScope &
     WASMMEMORY: WebAssembly.Memory
   }
 
-const IS_FIREFOX = navigator.userAgent.toLowerCase().includes('firefox')
-
 const THREAD_COUNT = !IS_FIREFOX && self.crossOriginIsolated ? Math.min(Math.max(1, navigator.hardwareConcurrency - 2), 8) : 1
 
 // @ts-expect-error new experimental API