fix MT

Author: pavelsavara

src/mono/browser/runtime/loader/run.ts

@@ -466,9 +466,10 @@ async function createEmscriptenWorker (): Promise<EmscriptenModuleInternal> {
 
     await mono_download_assets();
 
+    const CMD_LOAD = 1; // emscripten/src/lib/libpthread.js CMD_LOAD
     self.dispatchEvent(new MessageEvent("message", {
         data: {
-            cmd: "load",
+            cmd: CMD_LOAD,
             handlers: emscriptenModule.handlers,
             wasmMemory: emscriptenModule.wasmMemory,
             wasmModule: emscriptenModule.wasmModule

src/mono/browser/runtime/pthreads/ui-thread.ts

@@ -274,7 +274,7 @@ function getNewWorker (modulePThread: PThreadLibrary): PThreadWorker {
     if (!WasmEnableThreads) return null as any;
 
     if (modulePThread.unusedWorkers.length == 0) {
-        mono_log_debug(() => `Failed to find unused WebWorker, this may deadlock. Please increase the pthreadPoolInitialSize. Running threads ${modulePThread.runningWorkers.length}. Loading workers: ${modulePThread.unusedWorkers.length}`);
+        mono_log_debug(() => `Failed to find unused WebWorker, this may deadlock. Please increase the pthreadPoolInitialSize. Running threads ${Object.keys(modulePThread.pthreads).length}. Loading workers: ${modulePThread.unusedWorkers.length}`);
         const worker = allocateUnusedWorker();
         modulePThread.loadWasmModuleToWorker(worker);
         return worker;
@@ -293,7 +293,7 @@ function getNewWorker (modulePThread: PThreadLibrary): PThreadWorker {
             return worker;
         }
     }
-    mono_log_debug(() => `Failed to find loaded WebWorker, this may deadlock. Please increase the pthreadPoolInitialSize. Running threads ${modulePThread.runningWorkers.length}. Loading workers: ${modulePThread.unusedWorkers.length}`);
+    mono_log_debug(() => `Failed to find loaded WebWorker, this may deadlock. Please increase the pthreadPoolInitialSize. Running threads ${Object.keys(modulePThread.pthreads).length}. Loading workers: ${modulePThread.unusedWorkers.length}`);
     return modulePThread.unusedWorkers.pop()!;
 }
 
@@ -333,7 +333,7 @@ export function getUnusedWorkerPool (): PThreadWorker[] {
 }
 
 export function getRunningWorkers (): PThreadWorker[] {
-    return getModulePThread().runningWorkers;
+    return Object.values(getModulePThread().pthreads);
 }
 
 export function terminateAllThreads (): void {

src/mono/browser/runtime/startup.ts

@@ -85,7 +85,6 @@ export function configureEmscriptenStartup (module: DotnetModuleInternal): void
     if (runtimeHelpers.emscriptenBuildOptions.wasmEnableEH) {
         mono_assert(runtimeHelpers.featureWasmFinalEh, "This browser/engine doesn't support WASM exception handling. Please use a modern version. See also https://learn.microsoft.com/aspnet/core/blazor/supported-platforms");
     }
-    module.mainScriptUrlOrBlob = loaderHelpers.scriptUrl;// this is needed by worker threads
 
     // these all could be overridden on DotnetModuleConfig, we are chaining them to async below, as opposed to emscripten
     // when the user sets config, we are running our default startup sequence.

src/mono/browser/runtime/types/internal.ts

@@ -433,7 +433,6 @@ export declare interface EmscriptenModuleInternal {
 
     __locateFile?: (path: string, prefix?: string) => string;
     locateFile?: (path: string, prefix?: string) => string;
-    mainScriptUrlOrBlob?: string;
     ENVIRONMENT_IS_PTHREAD?: boolean;
     FS: any;
     wasmModule: WebAssembly.Module | null;
@@ -572,7 +571,6 @@ export interface PThreadInfo {
 
 export interface PThreadLibrary {
     unusedWorkers: PThreadWorker[];
-    runningWorkers: PThreadWorker[];
     pthreads: PThreadInfoMap;
     allocateUnusedWorker: () => void;
     loadWasmModuleToWorker: (worker: PThreadWorker) => Promise<PThreadWorker>;