fix latest betav2.12.1-pre1

VALVEEEEE

4 files changed, 12 insertions, 4 deletions

diff --git a/backend/src/main.py b/backend/src/main.py
index ca6eef58..d83bc542 100644
--- a/backend/src/main.py
+++ b/backend/src/main.py
@@ -161,7 +161,7 @@ class PluginManager:
             if first:
                 if await tab.has_global_var("deckyHasLoaded", False):
                     await close_old_tabs()
-            await tab.evaluate_js("try{if (window.deckyHasLoaded){setTimeout(() => location.reload(), 100)}else{window.deckyHasLoaded = true;(async()=>{try{while(!window.SP_REACT){await new Promise(r => setTimeout(r, 10))};await import('http://localhost:1337/frontend/index.js')}catch(e){console.error(e)};})();}}catch(e){console.error(e)}", False, False, False)
+            await tab.evaluate_js("try{if (window.deckyHasLoaded){setTimeout(() => SteamClient.Browser.RestartJSContext(), 100)}else{window.deckyHasLoaded = true;(async()=>{try{while(!window.webpackChunksteamui){await new Promise(r => setTimeout(r, 10))};await import('http://localhost:1337/frontend/index.js')}catch(e){console.error(e)};})();}}catch(e){console.error(e)}", False, False, False)
         except:
             logger.info("Failed to inject JavaScript into tab\n" + format_exc())
             pass
diff --git a/backend/src/utilities.py b/backend/src/utilities.py
index edde682d..c11df0bf 100644
--- a/backend/src/utilities.py
+++ b/backend/src/utilities.py
@@ -360,7 +360,7 @@ class Utilities:
         tab = await get_gamepadui_tab()
         self.rdt_script_id = None
         await close_old_tabs()
-        await tab.evaluate_js("location.reload();", False, True, False)
+        await tab.evaluate_js("SteamClient.Browser.RestartJSContext();", False, True, False)
         self.logger.info("React DevTools disabled")
 
     async def get_user_info(self) -> Dict[str, str]:
diff --git a/frontend/src/index.ts b/frontend/src/index.ts
index 6588cb5c..0faea32c 100644
--- a/frontend/src/index.ts
+++ b/frontend/src/index.ts
@@ -1,5 +1,13 @@
 // Sets up DFL, then loads start.ts which starts up the loader
 (async () => {
+  if (!window.SP_REACT) {
+    console.debug('Setting up React globals...');
+    // deliberate partial import
+    const DFLWebpack = await import('decky-frontend-lib/dist/webpack');
+    // TODO move these finds to dfl in v4
+    window.SP_REACT = DFLWebpack.findModule((m) => m.Component && m.PureComponent && m.useLayoutEffect);
+    window.SP_REACTDOM = DFLWebpack.findModule((m) => m.createPortal && m.createRoot);
+  }
   console.debug('Setting up decky-frontend-lib...');
   window.DFL = await import('decky-frontend-lib');
   await import('./start');
diff --git a/frontend/src/steamfixes/index.ts b/frontend/src/steamfixes/index.ts
index fe0e3e05..e3f2b284 100644
--- a/frontend/src/steamfixes/index.ts
+++ b/frontend/src/steamfixes/index.ts
@@ -1,4 +1,4 @@
-import reloadFix from './reload';
+// import reloadFix from './reload';
 import restartFix from './restart';
 let fixes: Function[] = [];
 
@@ -7,6 +7,6 @@ export function deinitSteamFixes() {
 }
 
 export async function initSteamFixes() {
-  fixes.push(await reloadFix());
+  // fixes.push(await reloadFix());
   fixes.push(await restartFix());
 }