fix monothreadinfo bug and sj + relax typeload

Fixes #20
Fixes #15

Author: r58Playz

.gitignore

@@ -1,7 +1,6 @@
 bin
 obj
 /statics
-/nuget
 /emsdk
 
 /FNA

Makefile

@@ -1,4 +1,4 @@
-STATICS_RELEASE=87d20f43-0820-47e0-8cf1-b4e0cd1a50aa
+STATICS_RELEASE=cfcd2c33-e3c3-4d49-a05f-c6d6ec247eb4
 DOTNETFLAGS=--nodereuse:false -v n
 
 statics:
@@ -36,7 +36,7 @@ emsdk:
 	rm -rvf emsdk/upstream/emscripten/cache/*
 
 dotnetclean:
-	rm -rvf {loader,patcher,corefier,Steamworks}/{bin,obj} frontend/public/_framework nuget || true
+	rm -rvf {loader,patcher,corefier,Steamworks}/{bin,obj} frontend/public/_framework || true
 clean: dotnetclean
 	rm -rvf statics MonoMod NLua FNA SteamKit2.WASM emsdk || true
 

frontend/src/game/dotnet.ts

@@ -11,14 +11,20 @@ export const gameState: Stateful<{
 	initting: boolean;
 	playing: boolean;
 	hasEverest: boolean;
+	memory: number;
 }> = $state({
 	ready: false,
 	initting: false,
 	playing: false,
 	hasEverest: false,
+	memory: -1,
 });
+(globalThis as any).gameState = gameState;
 export const loglisteners: ((log: Log) => void)[] = [];
 
+let logs: string[] = [];
+(globalThis as any).logs = logs;
+
 function proxyConsole(name: string, color: string) {
 	// @ts-expect-error ts sucks
 	const old = console[name].bind(console);
@@ -34,6 +40,7 @@ function proxyConsole(name: string, color: string) {
 		for (const logger of loglisteners) {
 			logger({ color, log: str });
 		}
+		logs.push(str);
 	};
 	return old;
 }
@@ -42,6 +49,7 @@ export const bypassWarn = proxyConsole("warn", "var(--warning)");
 export const bypassLog = proxyConsole("log", "var(--fg)");
 export const bypassInfo = proxyConsole("info", "var(--info)");
 export const bypassDebug = proxyConsole("debug", "var(--fg4)");
+(globalThis as any).bypassLog = bypassLog;
 
 function hookfmod() {
 	let contexts: AudioContext[] = [];
@@ -200,6 +208,7 @@ export async function preInit() {
 	console.debug("initializing dotnet");
 	const runtime = await dotnet
 		.withConfig({
+			pthreadPoolInitialSize: 16
 		})
 		.withRuntimeOptions([
 			// jit functions quickly and jit more functions
@@ -391,14 +400,25 @@ export async function UploadSteamCloud() {
 
 const SEAMLESSCOUNT = 5;
 
+function monitorMem(): () => void {
+	let stop = false;
+	exports.CelesteLoader.WatchMemoryUsage((mem: number) => {
+		gameState.memory = mem;
+		return stop;
+	})
+	return () => stop = true;
+}
+
 export async function play() {
 	gameState.playing = true;
 	gameState.initting = true;
 
+	let stopMonitoring = monitorMem();
+
 	console.debug("Init...");
 	const before = performance.now();
 
-	await exports.CelesteLoader.Init();
+	await exports.CelesteLoader.Init(false);
 
 	// run some frames for seamless transition
 	for (let i = 0; i < SEAMLESSCOUNT; i++) {
@@ -413,8 +433,9 @@ export async function play() {
 
 	await exports.CelesteLoader.MainLoop();
 
-	console.debug("Cleanup...");
+	stopMonitoring();
 
+	console.debug("Cleanup...");
 	await exports.CelesteLoader.Cleanup();
 	gameState.ready = false;
 	gameState.playing = false;

frontend/src/splash.tsx

@@ -388,6 +388,7 @@ const Copy: Component<
 		try {
 			let orig = await directory.getDirectoryHandle("orig", { create: false });
 			celesteExe = await orig.getFileHandle("Celeste.exe", { create: false });
+			console.debug("found everest install");
 		} catch {
 			celesteExe = await directory.getFileHandle("Celeste.exe", {
 				create: false,
@@ -447,6 +448,7 @@ const Copy: Component<
 						(e) => e.name === "Celeste.exe"
 					) as FileSystemFileEntry;
 				});
+				console.debug("found everest install");
 			} catch {
 				celesteExe = entries.find(
 					(e) => e.name === "Celeste.exe"

loader/Celeste.cs

@@ -52,7 +52,7 @@ internal static Task PreInit()
     static FieldInfo RunApplication;
 
     [JSExport]
-    internal static Task Init()
+    internal static Task Init(bool tailcalls)
     {
         try
         {
@@ -69,7 +69,7 @@ internal static Task Init()
 
             celeste = Assembly.LoadFrom("/libsdl/CustomCeleste.dll");
 
-			MonoMod.Core.Platforms.WasmDetourFactory.EnableTailCallDetours = true;
+            MonoMod.Core.Platforms.WasmDetourFactory.EnableTailCallDetours = tailcalls;
 
             AssemblyLoadContext.Default.ResolvingUnmanagedDll += (assembly, name) =>
             {
@@ -115,7 +115,7 @@ internal static Task Init()
                 ParseArgs.Invoke(null, [new string[] { }]);
             }
 
-			Console.WriteLine($"CelesteWasm on {RuntimeInformation.FrameworkDescription}");
+            Console.WriteLine($"CelesteWasm on {RuntimeInformation.FrameworkDescription}");
             game = (Game)GameConstructor.Invoke([]);
             RunApplication = Celeste.GetField("RunApplication", BindingFlags.NonPublic | BindingFlags.Instance);
         }
@@ -175,6 +175,20 @@ internal static Task MainLoop()
             Console.Error.WriteLine(e);
             return Task.FromException(e);
         }
-		return Task.Delay(0);
+        return Task.Delay(0);
+    }
+
+    [JSExport]
+    internal static Task WatchMemoryUsage([JSMarshalAs<JSType.Function<JSType.Number, JSType.Boolean>>] Func<double, bool> callback)
+    {
+        return Task.Run(async () =>
+        {
+            while (true)
+            {
+                bool stop = callback((double)GC.GetTotalMemory(false) / (1024 * 1024));
+				if (stop) break;
+                await Task.Delay(1000 * 30);
+            }
+        });
     }
 }

loader/CelesteLoader.csproj

@@ -58,7 +58,7 @@
 	</Target>
 
 	<ItemGroup>
-		<WasmOptConfigurationFlags Include="-O4 -O4 -O4"></WasmOptConfigurationFlags>
+		<WasmOptConfigurationFlags Include="-O4 -O4 -O4 -g"></WasmOptConfigurationFlags>
 	</ItemGroup>
 
 	<ItemGroup>

loader/Emscripten.c

@@ -37,3 +37,8 @@ uint32_t SDL__GetWindowFlags(void *window) {
 }
 
 void wasm_func_viil(int x, int y, uint64_t l) {}
+
+void mono_threads_request_thread_dump (void);
+EMSCRIPTEN_KEEPALIVE void perform_thread_dump() {
+	mono_threads_request_thread_dump();
+}

patcher/FMOD.cs

@@ -181,9 +181,7 @@ static partial class MonoModRules
         public static void PatchFMODVersion(ILContext context, CustomAttribute attrib)
         {
             ILCursor cursor = new(context);
-            cursor.GotoNext(i => i.MatchLdcI4(out var num) && num == 69652);
-
-            if (!context.Instrs[cursor.Index].MatchLdcI4(out var _))
+            if (!cursor.TryGotoNext(i => i.MatchLdcI4(out var num) && num == 69652))
                 throw new Exception("[FMODPatcher] Unable to find FMOD version in FMOD.Studio.System.create");
 
             context.Instrs[cursor.Index].Operand = (int)0x00020307;

patcher/MonoModRules.cs

@@ -25,13 +25,14 @@ static MonoModRules()
             Console.WriteLine($"[Celeste.Wasm] Loaded into module {MonoModRule.Modder.Module}");
             MonoModRule.Modder.Log($"[Celeste.Wasm] Loaded into module {MonoModRule.Modder.Module}");
             MonoModRule.Modder.PostProcessors += FMODPostProcessor;
+            MonoModRule.Modder.PostProcessors += GCPostProcessor;
 
             HackRelinkType("System.Net.Sockets.Socket", typeof(Celeste.Wasm.WasmSocket));
             HackRelinkType("System.Net.Sockets.NetworkStream", typeof(Celeste.Wasm.WasmNetworkStream));
         }
 
         // hacky relink without copying the type
-        public static void HackRelinkType(string source, Type dest)
+        internal static void HackRelinkType(string source, Type dest)
         {
             MonoModRule.RelinkType(source, dest.FullName);
             foreach (var member in dest.GetMembers())
@@ -40,13 +41,13 @@ public static void HackRelinkType(string source, Type dest)
             }
         }
 
-        public static void FMODPostProcessor(MonoModder modder)
+        internal static void FMODPostProcessor(MonoModder modder)
         {
             foreach (TypeDefinition type in modder.Module.Types)
                 foreach (MethodDefinition method in type.Methods)
                     FMODPostProcessMethod(modder, method);
         }
-        public static void FMODPostProcessMethod(MonoModder modder, MethodDefinition method)
+        internal static void FMODPostProcessMethod(MonoModder modder, MethodDefinition method)
         {
             if (!method.HasBody && method.HasPInvokeInfo && method.PInvokeInfo.Module.Name.StartsWith("fmod"))
             {
@@ -57,5 +58,12 @@ public static void FMODPostProcessMethod(MonoModder modder, MethodDefinition met
                 }
             }
         }
+
+        internal static void GCPostProcessor(MonoModder modder)
+        {
+            GC.Collect();
+            Console.WriteLine("[Celeste.Wasm] Forced GC after patch");
+            MonoModRule.Modder.Log($"[Celeste.Wasm] Forced GC after patch");
+        }
     }
 }