fix toasts breaking sometimes

.github/workflows/build.yml

@@ -120,7 +120,7 @@ jobs:
         echo "VERS: $VERSION"
         OUT=$(semver bump prerel "$VERSION")
         echo "OUT: $OUT"
-        echo ::set-output name=tag_name::$OUT
+        echo ::set-output name=tag_name::v$OUT
 
     - name: Push tag 📤
       uses: rickstaa/action-create-tag@v1.3.2

backend/helpers.py

@@ -1,6 +1,7 @@
 import certifi
 import ssl
 import uuid
+import re
 
 from aiohttp.web import middleware, Response
 from subprocess import check_output
@@ -12,6 +13,8 @@ ssl_ctx = ssl.create_default_context(cafile=certifi.where())
 user = None
 group = None
 
+assets_regex = re.compile("^/plugins/.*/assets/.*")
+
 def get_ssl_context():
     return ssl_ctx
 
@@ -20,7 +23,7 @@ def get_csrf_token():
 
 @middleware
 async def csrf_middleware(request, handler):
-    if str(request.method) == "OPTIONS" or request.headers.get('Authentication') == csrf_token or str(request.rel_url) == "/auth/token" or str(request.rel_url).startswith("/plugins/load_main/") or str(request.rel_url).startswith("/static/") or str(request.rel_url).startswith("/legacy/") or str(request.rel_url).startswith("/steam_resource/"):
+    if str(request.method) == "OPTIONS" or request.headers.get('Authentication') == csrf_token or str(request.rel_url) == "/auth/token" or str(request.rel_url).startswith("/plugins/load_main/") or str(request.rel_url).startswith("/static/") or str(request.rel_url).startswith("/legacy/") or str(request.rel_url).startswith("/steam_resource/") or assets_regex.match(str(request.rel_url)):
         return await handler(request)
     return Response(text='Forbidden', status='403')
 

backend/main.py

@@ -62,7 +62,6 @@ class PluginManager:
         self.updater = Updater(self)
 
         jinja_setup(self.web_app)
-        self.web_app.on_startup.append(self.inject_javascript)
         if CONFIG["chown_plugin_path"] == True:
             self.web_app.on_startup.append(chown_plugin_dir)
         self.loop.create_task(self.loader_reinjector())
@@ -98,6 +97,8 @@ class PluginManager:
         #await inject_to_tab("SP", "window.syncDeckyPlugins();")
 
     async def loader_reinjector(self):
+        await sleep(2)
+        await self.inject_javascript()
         while True:
             await sleep(5)
             if not await tab_has_global_var("SP", "deckyHasLoaded"):

frontend/src/index.tsx

@@ -1,5 +1,3 @@
-import { sleep } from 'decky-frontend-lib';
-
 import PluginLoader from './plugin-loader';
 import { DeckyUpdater } from './updater';
 
@@ -14,7 +12,7 @@ declare global {
   }
 }
 (async () => {
-  await sleep(1000);
+  window.deckyHasLoaded = true;
   window.deckyAuthToken = await fetch('http://127.0.0.1:1337/auth/token').then((r) => r.text());
 
   window.DeckyPluginLoader?.dismountAll();
@@ -38,6 +36,4 @@ declare global {
   };
 
   setTimeout(() => window.syncDeckyPlugins(), 5000);
-
-  window.deckyHasLoaded = true;
 })();

frontend/src/router-hook.tsx

@@ -1,6 +1,6 @@
 import { afterPatch, findModuleChild, unpatch } from 'decky-frontend-lib';
-import React, { ReactElement, cloneElement, createElement, memo } from 'react';
-import type { Route, RouteProps } from 'react-router';
+import { ReactElement, ReactNode, cloneElement, createElement, memo } from 'react';
+import type { Route } from 'react-router';
 
 import {
   DeckyRouterState,
@@ -60,7 +60,6 @@ class RouterHook extends Logger {
         routeList[routerIndex] = newRouterArray;
       }
       routeList.forEach((route: Route, index: number) => {
-        console.log(route);
         const replaced = toReplace.get(route?.props?.path as string);
         if (replaced) {
           routeList[index].props.children = replaced;

frontend/src/tabs-hook.ts

@@ -103,7 +103,7 @@ class TabsHook extends Logger {
   }
 
   deinit() {
-    unpatch(this.cNode.stateNode, 'render');
+    if (this.cNode) unpatch(this.cNode.stateNode, 'render');
     if (this.qAPTree) this.qAPTree.type = this.quickAccess;
     if (this.rendererTree) this.rendererTree.type = this.tabRenderer;
     if (this.cNode) this.cNode.stateNode.forceUpdate();

frontend/src/toaster.tsx

@@ -35,7 +35,7 @@ class Toaster extends Logger {
     while (true) {
       instance = findInReactTree(
         (document.getElementById('root') as any)._reactRootContainer._internalRoot.current,
-        (x) => x?.memoizedProps?.className?.startsWith('toastmanager_ToastPlaceholder'),
+        (x) => x?.memoizedProps?.className?.startsWith?.('toastmanager_ToastPlaceholder'),
       );
       if (instance) break;
       this.debug('finding instance');
@@ -84,9 +84,9 @@ class Toaster extends Logger {
   }
 
   deinit() {
-    unpatch(this.instanceRet, 'type');
-    delete this.node.stateNode.render;
-    this.node.stateNode.forceUpdate();
+    this.instanceRet && unpatch(this.instanceRet, 'type');
+    this.node && delete this.node.stateNode.render;
+    this.node && this.node.stateNode.forceUpdate();
   }
 }