Add windows stub for restart_webhelper

linters are the light of my life

backend/src/loader.py

@@ -5,7 +5,7 @@ from logging import getLogger
 from os import listdir, path
 from pathlib import Path
 from traceback import print_exc
-from typing import Any, Tuple
+from typing import Any, Tuple, cast
 
 from aiohttp import web
 from os.path import exists
@@ -38,7 +38,7 @@ class FileChangeHandler(RegexMatchingEventHandler):
             self.queue.put_nowait((path.join(self.plugin_path, plugin_dir, "main.py"), plugin_dir, True))
 
     def on_created(self, event: DirCreatedEvent | FileCreatedEvent):
-        src_path = event.src_path
+        src_path = cast(str, event.src_path) #type: ignore # this is the correct type for this is in later versions of watchdog
         if "__pycache__" in src_path:
             return
 
@@ -52,7 +52,7 @@ class FileChangeHandler(RegexMatchingEventHandler):
         self.maybe_reload(src_path)
 
     def on_modified(self, event: DirModifiedEvent | FileModifiedEvent):
-        src_path = event.src_path
+        src_path = cast(str, event.src_path) # type: ignore
         if "__pycache__" in src_path:
             return
 
@@ -235,4 +235,4 @@ class Loader:
 
         await self.reload_queue.put((plugin.file, plugin.plugin_directory))
 
-        return web.Response(status=200)
+        return web.Response(status=200)

backend/src/localplatformlinux.py

@@ -156,6 +156,12 @@ async def service_start(service_name : str) -> bool:
     res = run(cmd, stdout=PIPE, stderr=STDOUT)
     return res.returncode == 0
 
+async def restart_webhelper() -> bool:
+    logger.info("Restarting steamwebhelper")
+    # TODO move to pkill
+    res = run(["killall", "-s", "SIGTERM", "steamwebhelper"], stdout=DEVNULL, stderr=DEVNULL)
+    return res.returncode == 0
+
 def get_privileged_path() -> str:
     path = os.getenv("PRIVILEGED_PATH")
 

backend/src/localplatformwin.py

@@ -51,3 +51,6 @@ def get_unprivileged_path() -> str:
 
 def get_unprivileged_user() -> str:
     return os.getenv("UNPRIVILEGED_USER", os.getlogin())
+
+async def restart_webhelper() -> bool:
+    return True # Stubbed

backend/src/main.py

@@ -2,9 +2,9 @@
 import sys
 from typing import Dict
 from .localplatform import (chmod, chown, service_stop, service_start,
-                            ON_WINDOWS, get_log_level, get_live_reload, 
+                            ON_WINDOWS, ON_LINUX, get_log_level, get_live_reload, 
                             get_server_port, get_server_host, get_chown_plugin_path,
-                            get_privileged_path)
+                            get_privileged_path, restart_webhelper)
 if hasattr(sys, '_MEIPASS'):
     chmod(sys._MEIPASS, 755) # type: ignore
 # Full imports
@@ -25,7 +25,7 @@ from .browser import PluginBrowser
 from .helpers import (REMOTE_DEBUGGER_UNIT, csrf_middleware, get_csrf_token,
                      mkdir_as_user, get_system_pythonpaths, get_effective_user_id)
                      
-from .injector import get_gamepadui_tab, Tab, close_old_tabs
+from .injector import get_gamepadui_tab, Tab
 from .loader import Loader
 from .settings import SettingsManager
 from .updater import Updater
@@ -158,10 +158,10 @@ class PluginManager:
     async def inject_javascript(self, tab: Tab, first: bool=False, request: Request|None=None):
         logger.info("Loading Decky frontend!")
         try:
-            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)
+            # if first:
+            if ON_LINUX and await tab.has_global_var("deckyHasLoaded", False):
+                await restart_webhelper()
+            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

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]:

frontend/src/index.ts

@@ -1,5 +1,16 @@
 // Sets up DFL, then loads start.ts which starts up the loader
+interface Window {
+  SP_REACTDOM: any;
+}
 (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');

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());
 }