fix: correct fix for androidTV crash

common/modules/subtitles.js

@@ -172,10 +172,12 @@ export default class Subtitles {
         workerUrl: new URL('jassub/dist/jassub-worker.js', import.meta.url).toString(),
         wasmUrl: new URL('jassub/dist/jassub-worker.wasm', import.meta.url).toString(),
         legacyWasmUrl: new URL('jassub/dist/jassub-worker.wasm.js', import.meta.url).toString(),
-        modernWasmUrl: settings.value.modernWasm ? new URL('jassub/dist/jassub-worker-modern.wasm', import.meta.url).toString() : undefined,
+        modernWasmUrl: new URL('jassub/dist/jassub-worker-modern.wasm', import.meta.url).toString(),
         useLocalFonts: settings.value.missingFont,
         dropAllBlur: settings.value.disableSubtitleBlur
       }
+      // @ts-expect-error yeah, patching the library
+      if (SUPPORTS.isAndroid) JASSUB._hasBitmapBug = true
       this.renderer = new JASSUB(options)
     }
   }

common/modules/util.js

@@ -151,7 +151,6 @@ export const defaults = {
   torrentPathNew: undefined,
   font: undefined,
   angle: 'default',
-  modernWasm: true,
   toshoURL: SUPPORTS.extensions ? decodeURIComponent(atob('aHR0cHM6Ly9mZWVkLmFuaW1ldG9zaG8ub3JnLw==')) : '',
   extensions: SUPPORTS.extensions ? ['anisearch'] : [],
   sources: {},

common/package.json

@@ -8,7 +8,7 @@
     "bottleneck": "^2.19.5",
     "browser-event-target-emitter": "^1.0.1",
     "comlink": "^4.4.1",
-    "jassub": "^1.7.17",
+    "jassub": "^1.7.18",
     "js-levenshtein": "^1.1.6",
     "lucide-svelte": "^0.429.0",
     "p2pt": "github:ThaUnknown/p2pt#modernise",
@@ -26,4 +26,4 @@
     "video-deband": "^1.0.5",
     "webpack-merge": "^5.10.0"
   }
-}
+}

common/views/Settings/PlayerSettings.svelte

@@ -66,12 +66,6 @@
     <option value='480'>480p</option>
   </select>
 </SettingCard>
-<SettingCard title='Modern WASM Support' description='Forcefully override device WASM support. This can fix potential crash issues on some devices that incorrectly report WASM support. Turning this off will reduce performance when rendering complex subtitles.'>
-  <div class='custom-switch'>
-    <input type='checkbox' id='player-modernWasm' bind:checked={settings.modernWasm} />
-    <label for='player-modernWasm'>{settings.modernWasm ? 'On' : 'Off'}</label>
-  </div>
-</SettingCard>
 
 <h4 class='mb-10 font-weight-bold'>Language Settings</h4>
 <SettingCard title='Preferred Subtitle Language' description="What subtitle language to automatically select when a video is loaded if it exists. This won't find torrents with this language automatically. If not found defaults to English.">

electron/package.json

@@ -1,6 +1,6 @@
 {
   "name": "Miru",
-  "version": "5.5.10",
+  "version": "5.5.11",
   "private": true,
   "author": "ThaUnknown_ <ThaUnknown@users.noreply.github.com>",
   "description": "Stream anime torrents, real-time with no waiting for downloads.",

pnpm-lock.yaml

@@ -135,7 +135,7 @@ importers:
         version: 4.1.5
       webpack-cli:
         specifier: ^5.1.4
-        version: 5.1.4(webpack-dev-server@5.0.2(bufferutil@4.0.8)(utf-8-validate@6.0.5)(webpack-cli@5.1.4)(webpack@5.91.0))(webpack@5.96.1)
+        version: 5.1.4(webpack-dev-server@5.0.2)(webpack@5.96.1)
       webpack-merge:
         specifier: ^6.0.1
         version: 6.0.1
@@ -161,8 +161,8 @@ importers:
         specifier: ^4.4.1
         version: 4.4.1
       jassub:
-        specifier: ^1.7.17
+        specifier: ^1.7.18
-        version: 1.7.17
+        version: 1.7.18
       js-levenshtein:
         specifier: ^1.1.6
         version: 1.1.6
@@ -3543,8 +3543,8 @@ packages:
     engines: {node: '>=10'}
     hasBin: true
 
-  jassub@1.7.17:
+  jassub@1.7.18:
-    resolution: {integrity: sha512-573efPTIYLh9YaauuSX2mgPrrYedqdeu6KYNNjsJXbLbBsxPijcUHrMK4zpXCeBv955VTUlMX6l0Afa8AXf33A==}
+    resolution: {integrity: sha512-8cYnJlWuUP7xsdvoYyLVIcvXVa+0NvP1H1//yPck/LOHdnzY4KRwELNVx0khEd5BLN3bfWnMrcqFiHyTINObhA==}
 
   jest-worker@27.5.1:
     resolution: {integrity: sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==}
@@ -7118,7 +7118,7 @@ snapshots:
   '@webpack-cli/configtest@2.1.1(webpack-cli@5.1.4)(webpack@5.96.1)':
     dependencies:
       webpack: 5.96.1(webpack-cli@5.1.4)
-      webpack-cli: 5.1.4(webpack-dev-server@5.0.2(bufferutil@4.0.8)(utf-8-validate@6.0.5)(webpack-cli@5.1.4)(webpack@5.91.0))(webpack@5.96.1)
+      webpack-cli: 5.1.4(webpack-dev-server@5.0.2)(webpack@5.96.1)
 
   '@webpack-cli/info@2.0.2(webpack-cli@5.1.4)(webpack@5.91.0)':
     dependencies:
@@ -7128,14 +7128,7 @@ snapshots:
   '@webpack-cli/info@2.0.2(webpack-cli@5.1.4)(webpack@5.96.1)':
     dependencies:
       webpack: 5.96.1(webpack-cli@5.1.4)
-      webpack-cli: 5.1.4(webpack-dev-server@5.0.2(bufferutil@4.0.8)(utf-8-validate@6.0.5)(webpack-cli@5.1.4)(webpack@5.91.0))(webpack@5.96.1)
+      webpack-cli: 5.1.4(webpack-dev-server@5.0.2)(webpack@5.96.1)
-
-  '@webpack-cli/serve@2.0.5(webpack-cli@5.1.4)(webpack-dev-server@5.0.2(bufferutil@4.0.8)(utf-8-validate@6.0.5)(webpack-cli@5.1.4)(webpack@5.91.0))(webpack@5.96.1)':
-    dependencies:
-      webpack: 5.96.1(webpack-cli@5.1.4)
-      webpack-cli: 5.1.4(webpack-dev-server@5.0.2(bufferutil@4.0.8)(utf-8-validate@6.0.5)(webpack-cli@5.1.4)(webpack@5.91.0))(webpack@5.96.1)
-    optionalDependencies:
-      webpack-dev-server: 5.0.2(bufferutil@4.0.8)(utf-8-validate@6.0.5)(webpack-cli@5.1.4)(webpack@5.91.0)
 
   '@webpack-cli/serve@2.0.5(webpack-cli@5.1.4)(webpack-dev-server@5.0.2)(webpack@5.91.0)':
     dependencies:
@@ -7144,6 +7137,13 @@ snapshots:
     optionalDependencies:
       webpack-dev-server: 5.0.2(bufferutil@4.0.8)(utf-8-validate@6.0.5)(webpack-cli@5.1.4)(webpack@5.91.0)
 
+  '@webpack-cli/serve@2.0.5(webpack-cli@5.1.4)(webpack-dev-server@5.0.2)(webpack@5.96.1)':
+    dependencies:
+      webpack: 5.96.1(webpack-cli@5.1.4)
+      webpack-cli: 5.1.4(webpack-dev-server@5.0.2)(webpack@5.96.1)
+    optionalDependencies:
+      webpack-dev-server: 5.0.2(bufferutil@4.0.8)(utf-8-validate@6.0.5)(webpack-cli@5.1.4)(webpack@5.91.0)
+
   '@webtorrent/http-node@1.3.0':
     dependencies:
       freelist: 1.0.3
@@ -10005,7 +10005,7 @@ snapshots:
       filelist: 1.0.4
       minimatch: 3.1.2
 
-  jassub@1.7.17:
+  jassub@1.7.18:
     dependencies:
       rvfc-polyfill: 1.0.7
 
@@ -12296,25 +12296,6 @@ snapshots:
   webidl-conversions@4.0.2:
     optional: true
 
-  webpack-cli@5.1.4(webpack-dev-server@5.0.2(bufferutil@4.0.8)(utf-8-validate@6.0.5)(webpack-cli@5.1.4)(webpack@5.91.0))(webpack@5.96.1):
-    dependencies:
-      '@discoveryjs/json-ext': 0.5.7
-      '@webpack-cli/configtest': 2.1.1(webpack-cli@5.1.4)(webpack@5.96.1)
-      '@webpack-cli/info': 2.0.2(webpack-cli@5.1.4)(webpack@5.96.1)
-      '@webpack-cli/serve': 2.0.5(webpack-cli@5.1.4)(webpack-dev-server@5.0.2(bufferutil@4.0.8)(utf-8-validate@6.0.5)(webpack-cli@5.1.4)(webpack@5.91.0))(webpack@5.96.1)
-      colorette: 2.0.20
-      commander: 10.0.1
-      cross-spawn: 7.0.3
-      envinfo: 7.13.0
-      fastest-levenshtein: 1.0.16
-      import-local: 3.2.0
-      interpret: 3.1.1
-      rechoir: 0.8.0
-      webpack: 5.96.1(webpack-cli@5.1.4)
-      webpack-merge: 5.10.0
-    optionalDependencies:
-      webpack-dev-server: 5.0.2(bufferutil@4.0.8)(utf-8-validate@6.0.5)(webpack-cli@5.1.4)(webpack@5.91.0)
-
   webpack-cli@5.1.4(webpack-dev-server@5.0.2)(webpack@5.91.0):
     dependencies:
       '@discoveryjs/json-ext': 0.5.7
@@ -12334,6 +12315,25 @@ snapshots:
     optionalDependencies:
       webpack-dev-server: 5.0.2(bufferutil@4.0.8)(utf-8-validate@6.0.5)(webpack-cli@5.1.4)(webpack@5.91.0)
 
+  webpack-cli@5.1.4(webpack-dev-server@5.0.2)(webpack@5.96.1):
+    dependencies:
+      '@discoveryjs/json-ext': 0.5.7
+      '@webpack-cli/configtest': 2.1.1(webpack-cli@5.1.4)(webpack@5.96.1)
+      '@webpack-cli/info': 2.0.2(webpack-cli@5.1.4)(webpack@5.96.1)
+      '@webpack-cli/serve': 2.0.5(webpack-cli@5.1.4)(webpack-dev-server@5.0.2)(webpack@5.96.1)
+      colorette: 2.0.20
+      commander: 10.0.1
+      cross-spawn: 7.0.3
+      envinfo: 7.13.0
+      fastest-levenshtein: 1.0.16
+      import-local: 3.2.0
+      interpret: 3.1.1
+      rechoir: 0.8.0
+      webpack: 5.96.1(webpack-cli@5.1.4)
+      webpack-merge: 5.10.0
+    optionalDependencies:
+      webpack-dev-server: 5.0.2(bufferutil@4.0.8)(utf-8-validate@6.0.5)(webpack-cli@5.1.4)(webpack@5.91.0)
+
   webpack-dev-middleware@7.2.1(webpack@5.91.0):
     dependencies:
       colorette: 2.0.20
@@ -12459,7 +12459,7 @@ snapshots:
       watchpack: 2.4.2
       webpack-sources: 3.2.3
     optionalDependencies:
-      webpack-cli: 5.1.4(webpack-dev-server@5.0.2(bufferutil@4.0.8)(utf-8-validate@6.0.5)(webpack-cli@5.1.4)(webpack@5.91.0))(webpack@5.96.1)
+      webpack-cli: 5.1.4(webpack-dev-server@5.0.2)(webpack@5.96.1)
     transitivePeerDependencies:
       - '@swc/core'
       - esbuild