fix(mystrixsim): harden firmware package loading

Author: 203Null

Devices/MystrixSim/CMakeLists.txt

@@ -76,7 +76,7 @@ if(EMSCRIPTEN)
     target_compile_options(MatrixOSHost PRIVATE -pthread)
 
     target_link_options(MatrixOSHost PRIVATE
-        "SHELL:-sEXPORTED_RUNTIME_METHODS=HEAPU8,UTF8ToString"
+        "SHELL:-sEXPORTED_RUNTIME_METHODS=HEAPU8,UTF8ToString,PThread"
         "SHELL:-sEXPORTED_FUNCTIONS=[_main,_MatrixOS_Wasm_GetFrameBuffer,_MatrixOS_Wasm_GetFrameBufferByteLength,_MatrixOS_Wasm_GetWidth,_MatrixOS_Wasm_GetHeight,_MatrixOS_Wasm_KeyEvent,_MatrixOS_Wasm_FnEvent,_MatrixOS_Wasm_KeypadTick,_MatrixOS_Wasm_GetVersionString,_MatrixOS_Wasm_GetBuildIdentityString,_MatrixOS_Wasm_GetBuildTimeString,_MatrixOS_Wasm_GetBuildMetadataJson,_MatrixOS_Wasm_Reboot,_MatrixOS_Wasm_Bootloader,_MatrixOS_Wasm_GetRotation,_MatrixOS_Wasm_GetUptimeMs,_MatrixOS_Wasm_GetKeypadState,_MatrixOS_Wasm_GetKeypadStateLength,_MatrixOS_Wasm_GetFnState,_MatrixOS_Wasm_MidiInject,_MatrixOS_Wasm_RawHidInject,_MatrixOS_Wasm_SerialWrite,_MatrixOS_Wasm_NvsGetCount,_MatrixOS_Wasm_NvsGetHashes,_MatrixOS_Wasm_NvsGetSize,_MatrixOS_Wasm_NvsGetData,_MatrixOS_Wasm_NvsWrite,_MatrixOS_Wasm_NvsDelete,_MatrixOS_Wasm_NvsClear,_MatrixOS_Wasm_NvsExport,_MatrixOS_Wasm_NvsExportSize,_MatrixOS_Wasm_NvsImport,_MatrixOS_Wasm_SetUsbAvailable,_MatrixOS_Wasm_GetUsbAvailable,_MatrixOS_Wasm_TouchBarEvent]"
         "SHELL:-sUSE_PTHREADS=1"
         "SHELL:-sPTHREAD_POOL_SIZE=16"

Devices/MystrixSim/WebUI/src/stores/wasm.js

@@ -83,6 +83,31 @@ function revokeRetiredRuntimeAssetBlobUrls() {
   _retiredRuntimeAssetBlobUrls = []
 }
 
+async function validateRuntimeWasmBytes(wasmBytes, label) {
+  if (!WebAssembly.validate(wasmBytes)) {
+    throw new Error(`Package ${label} contains an invalid MatrixOSHost.wasm.`)
+  }
+
+  try {
+    await WebAssembly.compile(wasmBytes)
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error)
+    throw new Error(`Package ${label} failed WebAssembly validation: ${message}`)
+  }
+}
+
+function getOptionalModuleValue(mod, key) {
+  if (!mod) return null
+
+  const descriptor = Object.getOwnPropertyDescriptor(mod, key)
+  if (!descriptor) return null
+  if ('value' in descriptor) return descriptor.value ?? null
+
+  // Old Emscripten bundles install throwing getters for unexported runtime
+  // methods. Treat accessor-only symbols as unavailable instead of touching them.
+  return null
+}
+
 export async function loadRuntimeAssetPair({ jsText, wasmBytes, label = 'MatrixOS.msfw' }) {
   const normalizedJsText = typeof jsText === 'string' ? jsText : ''
   const normalizedWasmBytes = wasmBytes instanceof Uint8Array ? wasmBytes : new Uint8Array(wasmBytes || [])
@@ -94,6 +119,8 @@ export async function loadRuntimeAssetPair({ jsText, wasmBytes, label = 'MatrixO
     throw new Error(`Package ${label} is missing MatrixOSHost.wasm`)
   }
 
+  await validateRuntimeWasmBytes(normalizedWasmBytes, label)
+
   const nextSource = {
     kind: 'package',
     label,
@@ -193,12 +220,13 @@ function terminateWasmRuntime() {
   if (!mod) return
 
   try {
-    if (mod.PThread) {
-      if (typeof mod.PThread.terminateAllThreads === 'function') {
-        mod.PThread.terminateAllThreads()
+    const pthreadRuntime = getOptionalModuleValue(mod, 'PThread')
+    if (pthreadRuntime) {
+      if (typeof pthreadRuntime.terminateAllThreads === 'function') {
+        pthreadRuntime.terminateAllThreads()
       } else {
-        ;(mod.PThread.runningWorkers || []).forEach(w => { try { w.terminate() } catch {} })
-        ;(mod.PThread.unusedWorkers || []).forEach(w => { try { w.terminate() } catch {} })
+        ;(pthreadRuntime.runningWorkers || []).forEach(w => { try { w.terminate() } catch {} })
+        ;(pthreadRuntime.unusedWorkers || []).forEach(w => { try { w.terminate() } catch {} })
       }
     }
   } catch (e) {