summaryrefslogtreecommitdiff
path: root/frontend
diff options
context:
space:
mode:
authorAAGaming <aagaming@riseup.net>2026-11-21 21:14:41 -0500
committerAAGaming <aagaming@riseup.net>2026-11-21 21:14:41 -0500
commit02db20f846857374b9b5f1e7dbd475befdf47b71 (patch)
tree55c7553d32ffb55e3f490d153543fb96ed9bb71a /frontend
parentffd103b9c1a4ce5bf305e7c0998eda6e05457dad (diff)
downloaddecky-loader-02db20f846857374b9b5f1e7dbd475befdf47b71.tar.gz
decky-loader-02db20f846857374b9b5f1e7dbd475befdf47b71.zip
esmodule support base
Diffstat (limited to 'frontend')
-rw-r--r--frontend/DeckyErrorBoundary.tsx444
-rw-r--r--frontend/ErrorBoundary.ts6
-rw-r--r--frontend/genClassMap.js70
-rw-r--r--frontend/global.d.ts10
-rw-r--r--frontend/pnpm-lock.yaml176
-rw-r--r--frontend/pnpm-workspace.yaml2
-rw-r--r--frontend/src/components/Toast.tsx47
-rw-r--r--frontend/src/components/store/Store.tsx8
-rw-r--r--frontend/src/errorboundary-hook.tsx2
-rw-r--r--frontend/src/index.ts82
-rw-r--r--frontend/src/plugin-loader.tsx2
-rw-r--r--frontend/src/router-hook.tsx19
-rw-r--r--frontend/src/tabs-hook.tsx4
-rw-r--r--frontend/src/toaster.tsx5
14 files changed, 723 insertions, 154 deletions
diff --git a/frontend/DeckyErrorBoundary.tsx b/frontend/DeckyErrorBoundary.tsx
new file mode 100644
index 00000000..f9032a2b
--- /dev/null
+++ b/frontend/DeckyErrorBoundary.tsx
@@ -0,0 +1,444 @@
+import { joinClassNames, sleep } from '@decky/ui';
+import { FunctionComponent, useEffect, useReducer, useState } from 'react';
+
+import { disablePlugin, uninstallPlugin } from '../plugin';
+import { VerInfo, doRestart, doShutdown } from '../updater';
+import { ValveReactErrorInfo, getLikelyErrorSourceFromValveReactError } from '../utils/errors';
+import { useSetting } from '../utils/hooks/useSetting';
+import { UpdateBranch } from './settings/pages/general/BranchSelect';
+
+interface DeckyErrorBoundaryProps {
+ error: ValveReactErrorInfo;
+ errorKey: string;
+ identifier: string;
+ reset: () => void;
+}
+
+declare global {
+ interface Window {
+ SystemNetworkStore?: any;
+ }
+}
+
+const classes = {
+ root: 'deckyErrorBoundary',
+ likelyOccurred: 'likely-occured-msg',
+ panel: 'panel-section',
+ panelHeader: 'panel-header',
+ trace: 'trace',
+ rowList: 'row-list',
+ rowItem: 'row-item',
+ buttonDescRow: 'button-description-row',
+ flexRowWGap: 'flex-row',
+ marginBottom: 'margin-bottom',
+ swipePrompt: 'swipe-prompt',
+};
+
+const vars = {
+ scrollBarwidth: '18px',
+ rootMarginLeft: '15px',
+ panelXPadding: '20px',
+};
+
+export const startSSH = DeckyBackend.callable('utilities/start_ssh');
+export const starrCEFForwarding = DeckyBackend.callable('utilities/allow_remote_debugging');
+
+function ipToString(ip: number) {
+ return [(ip >>> 24) & 255, (ip >>> 16) & 255, (ip >>> 8) & 255, (ip >>> 0) & 255].join('.');
+}
+
+// Intentionally not localized since we can't really trust React here
+const DeckyErrorBoundary: FunctionComponent<DeckyErrorBoundaryProps> = ({ error, identifier, reset }) => {
+ const [actionLog, addLogLine] = useReducer((log: string, line: string) => (log += '\n' + line), '');
+ const [actionsEnabled, setActionsEnabled] = useState<boolean>(true);
+ const [debugAllowed, setDebugAllowed] = useState<boolean>(true);
+ // Intentionally doesn't use DeckyState.
+ const [versionInfo, setVersionInfo] = useState<VerInfo>();
+ const [errorSource, wasCausedByPlugin, shouldReportToValve] = getLikelyErrorSourceFromValveReactError(error);
+ useEffect(() => {
+ if (!shouldReportToValve) DeckyPluginLoader.errorBoundaryHook.temporarilyDisableReporting();
+ DeckyPluginLoader.updateVersion().then(setVersionInfo);
+ }, []);
+
+ const [selectedBranch, setSelectedBranch] = useSetting<UpdateBranch>('branch', UpdateBranch.Stable);
+ const [isChecking, setIsChecking] = useState<boolean>(false);
+ const [updateProgress, setUpdateProgress] = useState<number>(-1);
+ const [versionToUpdateTo, setSetVersionToUpdateTo] = useState<string>('');
+
+ useEffect(() => {
+ const a = DeckyBackend.addEventListener('updater/update_download_percentage', (percentage) => {
+ setUpdateProgress(percentage);
+ });
+
+ const b = DeckyBackend.addEventListener('updater/finish_download', () => {
+ setUpdateProgress(-2);
+ });
+
+ return () => {
+ DeckyBackend.removeEventListener('updater/update_download_percentage', a);
+ DeckyBackend.removeEventListener('updater/finish_download', b);
+ };
+ }, []);
+
+ return (
+ <>
+ <style>
+ {`
+ *:has(> .${classes.root}) {
+ margin-top: var(--basicui-header-height);
+ overflow: scroll !important;
+ background: #000;
+ }
+ *:has(> .${classes.root})::-webkit-scrollbar {
+ display: initial !important;
+ width: ${vars.scrollBarwidth};
+ height: 0px;
+ }
+ *:has(> .${classes.root})::-webkit-scrollbar-thumb {
+ background: #4349535e;
+ }
+ .${classes.root} {
+ color: #93929e;
+ font-size: 15px;
+ margin: 10px 0px 40px ${vars.rootMarginLeft};
+ overflow: visible;
+ }
+ .${classes.root} button,
+ .${classes.root} select {
+ border: none;
+ padding: 4px 16px !important;
+ background: #333;
+ color: #ddd;
+ font-size: 12px;
+ border-radius: 3px;
+ outline: none;
+ height: 28px;
+ }
+ .${classes.panel} {
+ background: #080808;
+ padding: 8px ${vars.panelXPadding};
+ border-radius: 3px;
+ /* box-shadow: 9px 9px 20px -5px rgb(0 0 0 / 89%); */
+ }
+ .${classes.panelHeader} {
+ font-size: 18px;
+ font-weight: bolder;
+ text-transform: uppercase;
+ }
+ .${classes.likelyOccurred} {
+ font-size: 22px;
+ font-weight: bold;
+ color: #588fb4;
+ }
+ .${classes.rowItem} {
+ position: relative;
+ }
+ .${classes.rowItem}:not(:last-child)::after {
+ content: '';
+ position: absolute;
+ bottom: -4.5px;
+ left: 5px;
+ right: 15px;
+ height: 0.5px;
+ background: #3c3c3c47;
+ }
+ .${classes.flexRowWGap},
+ .${classes.buttonDescRow},
+ .${classes.rowList},
+ .${classes.panel} {
+ display: flex;
+ }
+
+ .${classes.rowList},
+ .${classes.panel} {
+ flex-direction: column;
+ }
+ .${classes.flexRowWGap},
+ .${classes.rowList} {
+ gap: 8px;
+ }
+ .${classes.marginBottom} {
+ margin-bottom: 10px;
+ }
+ .${classes.buttonDescRow} {
+ justify-content: space-between;
+ align-items: center;
+ }
+
+ .${classes.swipePrompt} {
+ display: flex;
+ align-items: center;
+ text-align: center;
+ position: relative;
+ font-style: italic;
+ font-size: small;
+ margin: 16px 0;
+ }
+ .${classes.swipePrompt} span {
+ padding: 0 8px;
+ background-color: #000;
+ position: relative;
+ z-index: 1;
+ }
+ .${classes.swipePrompt}::before,
+ .${classes.swipePrompt}::after {
+ content: "";
+ flex-grow: 1;
+ border-bottom: 1px solid #474752;
+ top: 50%;
+ }
+ .${classes.swipePrompt}::before {
+ right: 50%;
+ margin-right: 8px;
+ }
+ .${classes.swipePrompt}::after {
+ left: 50%;
+ margin-left: 8px;
+ }
+ `}
+ </style>
+ <div className={classes.root}>
+ <div className={classes.marginBottom}>An error occurred while rendering this content.</div>
+ <pre className={joinClassNames(classes.marginBottom)} style={{ marginTop: '0px' }}>
+ <code>
+ {identifier && `Error Reference: ${identifier}`}
+ {versionInfo?.current && `\nDecky Version: ${versionInfo.current}${versionInfo.supported ? '' : '[U]'}`}
+ </code>
+ </pre>
+ <div className={joinClassNames(classes.likelyOccurred, classes.marginBottom)}>
+ This error likely occurred in {errorSource}.
+ </div>
+ {actionLog?.length > 0 && (
+ <pre>
+ <code>
+ Running actions...
+ {actionLog}
+ </code>
+ </pre>
+ )}
+ {actionsEnabled && (
+ <div className={classes.panel}>
+ <div className={classes.flexRowWGap} style={{ alignItems: 'center', marginBottom: '8px' }}>
+ <div className={classes.panelHeader}>Actions</div>
+ <div style={{ fontSize: 'small', fontStyle: 'italic' }}>
+ Use the touch screen. Solutions are listed in the recommended order. If you are still experiencing
+ issues, please post in the #loader-support channel at decky.xyz/discord.
+ </div>
+ </div>
+ <div className={classes.rowList}>
+ <div className={joinClassNames(classes.rowItem, classes.buttonDescRow)}>
+ Retry the action or restart
+ <div className={classes.flexRowWGap}>
+ <button onClick={reset}>Retry</button>
+ <button
+ onClick={() => {
+ addLogLine('Restarting Steam...');
+ SteamClient.User.StartRestart(false);
+ }}
+ >
+ Restart Steam
+ </button>
+ <button
+ onClick={async () => {
+ setActionsEnabled(false);
+ addLogLine('Restarting Decky...');
+ doRestart();
+ await sleep(2000);
+ addLogLine('Reloading UI...');
+ }}
+ >
+ Restart Decky
+ </button>
+ </div>
+ </div>
+ {wasCausedByPlugin && (
+ <div className={joinClassNames(classes.rowItem, classes.buttonDescRow)}>
+ Disable or uninstall the suspected plugin
+ <div className={classes.flexRowWGap}>
+ <button
+ onClick={async () => {
+ setActionsEnabled(false);
+ addLogLine(`Disabling ${errorSource}...`);
+ await disablePlugin(errorSource);
+ await sleep(1000);
+ addLogLine('Restarting Decky...');
+ doRestart();
+ await sleep(2000);
+ addLogLine('Restarting Steam...');
+ await sleep(500);
+ SteamClient.User.StartRestart(false);
+ }}
+ >
+ Disable {errorSource}
+ </button>
+ <button
+ onClick={async () => {
+ setActionsEnabled(false);
+ addLogLine(`Uninstalling ${errorSource}...`);
+ await uninstallPlugin(errorSource);
+ await DeckyPluginLoader.frozenPluginsService.invalidate();
+ await DeckyPluginLoader.hiddenPluginsService.invalidate();
+ await sleep(1000);
+ addLogLine('Restarting Decky...');
+ doRestart();
+ await sleep(2000);
+ addLogLine('Restarting Steam...');
+ await sleep(500);
+ SteamClient.User.StartRestart(false);
+ }}
+ >
+ Uninstall {errorSource}
+ </button>
+ </div>
+ </div>
+ )}
+ <div className={joinClassNames(classes.rowItem, classes.buttonDescRow)}>
+ Disable all plugins
+ <button
+ onClick={async () => {
+ setActionsEnabled(false);
+ addLogLine(`Disabling plugins...`);
+ await DeckyBackend.call('utilities/set_all_plugins_disabled');
+ await sleep(1000);
+ addLogLine('Restarting Decky...');
+ doRestart();
+ await sleep(2000);
+ addLogLine('Restarting Steam...');
+ await sleep(500);
+ SteamClient.User.StartRestart(false);
+ }}
+ >
+ Disable All Plugins
+ </button>
+ </div>
+ {
+ <div className={joinClassNames(classes.rowItem, classes.buttonDescRow)}>
+ {updateProgress > -1
+ ? 'Update in progress... ' + updateProgress + '%'
+ : updateProgress == -2
+ ? 'Update complete. Restarting...'
+ : 'Check for Decky updates'}
+ {
+ <div className={classes.flexRowWGap}>
+ {updateProgress == -1 && (
+ <>
+ <select
+ onChange={async (e) => {
+ const branch = parseInt(e.target.value);
+ setSelectedBranch(branch);
+ setSetVersionToUpdateTo('');
+ }}
+ >
+ <option value="0" selected={selectedBranch == UpdateBranch.Stable}>
+ Stable
+ </option>
+ <option value="1" selected={selectedBranch == UpdateBranch.Prerelease}>
+ Pre-Release
+ </option>
+ <option value="2" selected={selectedBranch == UpdateBranch.Testing}>
+ Testing
+ </option>
+ </select>
+ <button
+ disabled={updateProgress != -1 || isChecking}
+ onClick={async () => {
+ if (versionToUpdateTo == '') {
+ setIsChecking(true);
+ const versionInfo = (await DeckyBackend.callable(
+ 'updater/check_for_updates',
+ )()) as unknown as VerInfo;
+ setIsChecking(false);
+ if (versionInfo?.remote && versionInfo?.remote?.tag_name != versionInfo?.current) {
+ setSetVersionToUpdateTo(versionInfo.remote.tag_name);
+ } else {
+ setSetVersionToUpdateTo('');
+ }
+ } else {
+ DeckyBackend.callable('updater/do_update')();
+ setUpdateProgress(0);
+ }
+ }}
+ >
+ {' '}
+ {isChecking
+ ? 'Checking for updates...'
+ : versionToUpdateTo != ''
+ ? 'Update to ' + versionToUpdateTo
+ : 'Check for updates'}
+ </button>
+ </>
+ )}
+ </div>
+ }
+ </div>
+ }
+ <div className={joinClassNames(classes.rowItem, classes.buttonDescRow)}>
+ Disable Decky until next boot
+ <button
+ onClick={async () => {
+ setActionsEnabled(false);
+ addLogLine('Stopping Decky...');
+ doShutdown();
+ await sleep(5000);
+ addLogLine('Restarting Steam...');
+ SteamClient.User.StartRestart(false);
+ }}
+ >
+ Disable Decky
+ </button>
+ </div>
+ {debugAllowed && (
+ <div className={joinClassNames(classes.rowItem, classes.buttonDescRow)}>
+ Enable remote debugging and SSH until next boot (for developers)
+ <button
+ onClick={async () => {
+ setDebugAllowed(false);
+ addLogLine('Enabling CEF debugger forwarding...');
+ await starrCEFForwarding();
+ addLogLine('Enabling SSH...');
+ await startSSH();
+ addLogLine('Ready for debugging!');
+ if (window?.SystemNetworkStore?.wirelessNetworkDevice?.ip4?.addresses?.[0]?.ip) {
+ const ip = ipToString(window.SystemNetworkStore.wirelessNetworkDevice.ip4.addresses[0].ip);
+ addLogLine(`CEF Debugger: http://${ip}:8081`);
+ addLogLine(`SSH: deck@${ip}`);
+ }
+ }}
+ >
+ Enable
+ </button>
+ </div>
+ )}
+ </div>
+ </div>
+ )}
+ {actionsEnabled && (
+ <div className={classes.swipePrompt}>
+ <span>Swipe to scroll</span>
+ </div>
+ )}
+ <div className={classes.panel}>
+ <div className={classes.panelHeader}>Trace</div>
+ <pre
+ style={{
+ margin: `8px calc(-1 * ${vars.panelXPadding})`,
+ userSelect: 'auto',
+ overflowX: 'scroll',
+ padding: `0px ${vars.panelXPadding}`,
+ maskImage: `linear-gradient(to right, transparent, black ${vars.panelXPadding}, black calc(100% - ${vars.panelXPadding}), transparent)`,
+ }}
+ >
+ <code>
+ {error.error.stack}
+ {'\n\n'}
+ Component Stack:
+ {error.info.componentStack}
+ </code>
+ </pre>
+ </div>
+ </div>
+ </>
+ );
+};
+
+export default DeckyErrorBoundary;
diff --git a/frontend/ErrorBoundary.ts b/frontend/ErrorBoundary.ts
new file mode 100644
index 00000000..a19ad788
--- /dev/null
+++ b/frontend/ErrorBoundary.ts
@@ -0,0 +1,6 @@
+import { FC, PropsWithChildren } from "react";
+import { findModuleExport } from "../module-system";
+
+export const ErrorBoundary = findModuleExport(
+ (e) => e?.prototype?.Reset && e?.prototype?.componentDidCatch && e.prototype?.render?.toString().includes("lastErrorKey"),
+) as FC<PropsWithChildren>; // Actually a class but @types/react is broken lol \ No newline at end of file
diff --git a/frontend/genClassMap.js b/frontend/genClassMap.js
new file mode 100644
index 00000000..704a22cc
--- /dev/null
+++ b/frontend/genClassMap.js
@@ -0,0 +1,70 @@
+import { writeFile, readdir } from 'fs/promises';
+
+import oldClasses from './data/oldClasses.json' with { type: 'json' };
+
+const data = (
+ await import(`./data/mappings/${process.argv[2]}.json`, {
+ with: { type: 'json' },
+ })
+).default;
+
+const { map } = data;
+
+let classes = {};
+let classesStub = {};
+
+let skip = ['appDetailsHeaderClasses', 'gamepadUIClasses', 'gamepadTabbedPageClasses', 'gamepadContextMenuClasses'];
+
+for (let classModName in oldClasses) {
+ if (skip.includes(classModName)) continue;
+ const classMod = oldClasses[classModName];
+ classes[classModName] = {};
+ classesStub[classModName] = {};
+ for (let className in classMod) {
+ const oldClass = classMod[className];
+ const newClass = map[oldClass];
+ if (newClass) {
+ console.log(`${className} -> ${newClass}`);
+ classes[classModName][className] = newClass;
+ classesStub[classModName][className] = '';
+ } else {
+ console.log(`${className}: not found`);
+ }
+ }
+}
+
+const classString = JSON.stringify(classes, null, 2);
+await writeFile('./generated.json', classString);
+
+let fileStr = '// GENERATED FILE DO NOT EDIT\n';
+for (let classModName in classes) {
+ fileStr += `export const ${classModName} = ${JSON.stringify(classes[classModName], null, 2)};\n\n`;
+}
+
+await writeFile(`../src/utils/classData/${process.argv[2]}.ts`, fileStr);
+
+const dir = await readdir("../src/utils/classData");
+const versions = dir.filter(f => f != "index.ts").map(f => parseInt(f.replace(".ts", "")));
+console.log("Supported:", versions)
+
+let importerStr = `// GENERATED FILE DO NOT EDIT
+declare global {
+ interface Window {
+ CLSTAMP: string;
+ }
+}
+`;
+
+for (let classModName in classesStub) {
+ importerStr += `export let ${classModName} = ${JSON.stringify(classesStub[classModName], null, 2)};\n\n`;
+}
+
+importerStr += `
+const data = await import(\`./\${window.CLSTAMP}.ts\`);
+`;
+
+for (let classModName in classesStub) {
+ importerStr += `${classModName} = data["${classModName}"];\n`;
+}
+
+await writeFile(`../src/utils/classData/index.ts`, importerStr); \ No newline at end of file
diff --git a/frontend/global.d.ts b/frontend/global.d.ts
new file mode 100644
index 00000000..bc193a94
--- /dev/null
+++ b/frontend/global.d.ts
@@ -0,0 +1,10 @@
+import type * as React from 'react';
+import type * as ReactDOM from 'react-dom';
+import type * as JSXRuntime from 'react/jsx-runtime';
+declare global {
+ interface Window {
+ SP_REACT: typeof React;
+ SP_REACTDOM: typeof ReactDOM;
+ SP_JSX: typeof JSXRuntime;
+ }
+}
diff --git a/frontend/pnpm-lock.yaml b/frontend/pnpm-lock.yaml
index 4aef2541..6087e265 100644
--- a/frontend/pnpm-lock.yaml
+++ b/frontend/pnpm-lock.yaml
@@ -4,13 +4,16 @@ settings:
autoInstallPeers: true
excludeLinksFromLockfile: false
+overrides:
+ '@decky/ui': link:../../lib
+
importers:
.:
dependencies:
'@decky/ui':
- specifier: ^4.16.4
- version: 4.16.4
+ specifier: link:../../lib
+ version: link:../../lib
compare-versions:
specifier: ^6.1.1
version: 6.1.1
@@ -34,10 +37,10 @@ importers:
version: 5.2.1(react@19.1.1)
react-markdown:
specifier: ^9.0.1
- version: 9.0.1(@types/react@19.1.1)(react@19.1.1)
+ version: 9.0.1(@types/react@19.1.1)(react@19.1.1)(supports-color@7.2.0)
remark-gfm:
specifier: ^4.0.0
- version: 4.0.0
+ version: 4.0.0(supports-color@7.2.0)
devDependencies:
'@decky/api':
specifier: ^1.1.3
@@ -77,7 +80,7 @@ importers:
version: 9.0.11
i18next-parser:
specifier: ^9.0.0
- version: 9.0.0
+ version: 9.0.0(supports-color@7.2.0)
import-sort-style-module:
specifier: ^6.0.0
version: 6.0.0
@@ -89,7 +92,7 @@ importers:
version: 3.3.2
prettier-plugin-import-sort:
specifier: ^0.0.7
- version: 0.0.7(prettier@3.3.2)
+ version: 0.0.7(prettier@3.3.2)(supports-color@7.2.0)
react:
specifier: 19.1.1
version: 19.1.1
@@ -222,9 +225,6 @@ packages:
'@decky/api@1.1.3':
resolution: {integrity: sha512-XsPCZxfxk5I1UtylIUN3qaWQI31siQbKfbLIskkI5innEatY1m4NQqBv/6hwPaO9mKMbdqYpnh5PSJDeMEOOBA==}
- '@decky/ui@4.16.4':
- resolution: {integrity: sha512-XvnLXa0RcffsIMkl82s2puWQjgSYMnZj9C6N/xoL+9SmJ53V/65HPXU6Yw840hky6784Llc1sVRb5z/jByhB+A==}
-
'@esbuild/aix-ppc64@0.20.2':
resolution: {integrity: sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g==}
engines: {node: '>=12'}
@@ -513,46 +513,55 @@ packages:
resolution: {integrity: sha512-j63YtCIRAzbO+gC2L9dWXRh5BFetsv0j0va0Wi9epXDgU/XUi5dJKo4USTttVyK7fGw2nPWK0PbAvyliz50SCQ==}
cpu: [arm]
os: [linux]
+ libc: [glibc]
'@rollup/rollup-linux-arm-musleabihf@4.22.4':
resolution: {integrity: sha512-dJnWUgwWBX1YBRsuKKMOlXCzh2Wu1mlHzv20TpqEsfdZLb3WoJW2kIEsGwLkroYf24IrPAvOT/ZQ2OYMV6vlrg==}
cpu: [arm]
os: [linux]
+ libc: [musl]
'@rollup/rollup-linux-arm64-gnu@4.22.4':
resolution: {integrity: sha512-AdPRoNi3NKVLolCN/Sp4F4N1d98c4SBnHMKoLuiG6RXgoZ4sllseuGioszumnPGmPM2O7qaAX/IJdeDU8f26Aw==}
cpu: [arm64]
os: [linux]
+ libc: [glibc]
'@rollup/rollup-linux-arm64-musl@4.22.4':
resolution: {integrity: sha512-Gl0AxBtDg8uoAn5CCqQDMqAx22Wx22pjDOjBdmG0VIWX3qUBHzYmOKh8KXHL4UpogfJ14G4wk16EQogF+v8hmA==}
cpu: [arm64]
os: [linux]
+ libc: [musl]
'@rollup/rollup-linux-powerpc64le-gnu@4.22.4':
resolution: {integrity: sha512-3aVCK9xfWW1oGQpTsYJJPF6bfpWfhbRnhdlyhak2ZiyFLDaayz0EP5j9V1RVLAAxlmWKTDfS9wyRyY3hvhPoOg==}
cpu: [ppc64]
os: [linux]
+ libc: [glibc]
'@rollup/rollup-linux-riscv64-gnu@4.22.4':
resolution: {integrity: sha512-ePYIir6VYnhgv2C5Xe9u+ico4t8sZWXschR6fMgoPUK31yQu7hTEJb7bCqivHECwIClJfKgE7zYsh1qTP3WHUA==}
cpu: [riscv64]
os: [linux]
+ libc: [glibc]
'@rollup/rollup-linux-s390x-gnu@4.22.4':
resolution: {integrity: sha512-GqFJ9wLlbB9daxhVlrTe61vJtEY99/xB3C8e4ULVsVfflcpmR6c8UZXjtkMA6FhNONhj2eA5Tk9uAVw5orEs4Q==}
cpu: [s390x]
os: [linux]
+ libc: [glibc]
'@rollup/rollup-linux-x64-gnu@4.22.4':
resolution: {integrity: sha512-87v0ol2sH9GE3cLQLNEy0K/R0pz1nvg76o8M5nhMR0+Q+BBGLnb35P0fVz4CQxHYXaAOhE8HhlkaZfsdUOlHwg==}
cpu: [x64]
os: [linux]
+ libc: [glibc]
'@rollup/rollup-linux-x64-musl@4.22.4':
resolution: {integrity: sha512-UV6FZMUgePDZrFjrNGIWzDo/vABebuXBhJEqrHxrGiU6HikPy0Z3LfdtciIttEUQfuDdCn8fqh7wiFJjCNwO+g==}
cpu: [x64]
os: [linux]
+ libc: [musl]
'@rollup/rollup-win32-arm64-msvc@4.22.4':
resolution: {integrity: sha512-BjI+NVVEGAXjGWYHz/vv0pBqfGoUH0IGZ0cICTn7kB9PyjrATSkX+8WkguNjWoj2qSr1im/+tTGRaY+4/PdcQw==}
@@ -630,6 +639,7 @@ packages:
'@ungap/structured-clone@1.2.0':
resolution: {integrity: sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==}
+ deprecated: Potential CWE-502 - Update to 1.3.1 or higher
aggregate-error@3.1.0:
resolution: {integrity: sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==}
@@ -1110,6 +1120,7 @@ packages:
glob@10.4.1:
resolution: {integrity: sha512-2jelhlq3E4ho74ZyVLN03oKdAZVUa6UDZzFLVH1H7dnoax+y9qyaq8zBkfDIggjniU19z0wU18y16jMB2eyVIw==}
engines: {node: '>=16 || 14 >=14.18'}
+ deprecated: Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me
hasBin: true
glob@7.2.3:
@@ -1188,6 +1199,7 @@ packages:
i18next-parser@9.0.0:
resolution: {integrity: sha512-ZguWdu91Qthd001ilX8LdkYrlyYJM8pefnmgTXKTQwd8M2RJAlTCd2ww5uEyAUQe2jxzqSxfTh6XTOJbw5qP5A==}
engines: {node: '>=18.0.0 || >=20.0.0 || >=22.0.0', npm: '>=6', yarn: '>=1'}
+ deprecated: Project is deprecated, use i18next-cli instead
hasBin: true
i18next@23.16.8:
@@ -2177,20 +2189,20 @@ snapshots:
'@babel/compat-data@7.24.7': {}
- '@babel/core@7.24.7':
+ '@babel/core@7.24.7(supports-color@7.2.0)':
dependencies:
'@ampproject/remapping': 2.3.0
'@babel/code-frame': 7.24.7
'@babel/generator': 7.24.7
'@babel/helper-compilation-targets': 7.24.7
- '@babel/helper-module-transforms': 7.24.7(@babel/core@7.24.7)
+ '@babel/helper-module-transforms': 7.24.7(@babel/core@7.24.7(supports-color@7.2.0))(supports-color@7.2.0)
'@babel/helpers': 7.24.7
'@babel/parser': 7.24.7
'@babel/template': 7.24.7
- '@babel/traverse': 7.24.7
+ '@babel/traverse': 7.24.7(supports-color@7.2.0)
'@babel/types': 7.24.7
convert-source-map: 2.0.0
- debug: 4.3.5
+ debug: 4.3.5(supports-color@7.2.0)
gensync: 1.0.0-beta.2
json5: 2.2.3
semver: 6.3.1
@@ -2225,27 +2237,27 @@ snapshots:
dependencies:
'@babel/types': 7.24.7
- '@babel/helper-module-imports@7.24.7':
+ '@babel/helper-module-imports@7.24.7(supports-color@7.2.0)':
dependencies:
- '@babel/traverse': 7.24.7
+ '@babel/traverse': 7.24.7(supports-color@7.2.0)
'@babel/types': 7.24.7
transitivePeerDependencies:
- supports-color
- '@babel/helper-module-transforms@7.24.7(@babel/core@7.24.7)':
+ '@babel/helper-module-transforms@7.24.7(@babel/core@7.24.7(supports-color@7.2.0))(supports-color@7.2.0)':
dependencies:
- '@babel/core': 7.24.7
+ '@babel/core': 7.24.7(supports-color@7.2.0)
'@babel/helper-environment-visitor': 7.24.7
- '@babel/helper-module-imports': 7.24.7
- '@babel/helper-simple-access': 7.24.7
+ '@babel/helper-module-imports': 7.24.7(supports-color@7.2.0)
+ '@babel/helper-simple-access': 7.24.7(supports-color@7.2.0)
'@babel/helper-split-export-declaration': 7.24.7
'@babel/helper-validator-identifier': 7.24.7
transitivePeerDependencies:
- supports-color
- '@babel/helper-simple-access@7.24.7':
+ '@babel/helper-simple-access@7.24.7(supports-color@7.2.0)':
dependencies:
- '@babel/traverse': 7.24.7
+ '@babel/traverse': 7.24.7(supports-color@7.2.0)
'@babel/types': 7.24.7
transitivePeerDependencies:
- supports-color
@@ -2288,7 +2300,7 @@ snapshots:
'@babel/parser': 7.24.7
'@babel/types': 7.24.7
- '@babel/traverse@7.24.7':
+ '@babel/traverse@7.24.7(supports-color@7.2.0)':
dependencies:
'@babel/code-frame': 7.24.7
'@babel/generator': 7.24.7
@@ -2298,7 +2310,7 @@ snapshots:
'@babel/helper-split-export-declaration': 7.24.7
'@babel/parser': 7.24.7
'@babel/types': 7.24.7
- debug: 4.3.5
+ debug: 4.3.5(supports-color@7.2.0)
globals: 11.12.0
transitivePeerDependencies:
- supports-color
@@ -2311,8 +2323,6 @@ snapshots:
'@decky/api@1.1.3': {}
- '@decky/ui@4.16.4': {}
-
'@esbuild/aix-ppc64@0.20.2':
optional: true
@@ -2688,19 +2698,19 @@ snapshots:
broccoli-node-info@2.2.0: {}
- broccoli-output-wrapper@3.2.5:
+ broccoli-output-wrapper@3.2.5(supports-color@7.2.0):
dependencies:
fs-extra: 8.1.0
- heimdalljs-logger: 0.1.10
+ heimdalljs-logger: 0.1.10(supports-color@7.2.0)
symlink-or-copy: 1.3.1
transitivePeerDependencies:
- supports-color
- broccoli-plugin@4.0.7:
+ broccoli-plugin@4.0.7(supports-color@7.2.0):
dependencies:
broccoli-node-api: 1.7.0
- broccoli-output-wrapper: 3.2.5
- fs-merger: 3.2.1
+ broccoli-output-wrapper: 3.2.5(supports-color@7.2.0)
+ fs-merger: 3.2.1(supports-color@7.2.0)
promise-map-series: 0.3.0
quick-temp: 0.1.8
rimraf: 3.0.2
@@ -2874,13 +2884,17 @@ snapshots:
csstype@3.1.3: {}
- debug@2.6.9:
+ debug@2.6.9(supports-color@7.2.0):
dependencies:
ms: 2.0.0
+ optionalDependencies:
+ supports-color: 7.2.0
- debug@4.3.5:
+ debug@4.3.5(supports-color@7.2.0):
dependencies:
ms: 2.1.2
+ optionalDependencies:
+ supports-color: 7.2.0
decode-named-character-reference@1.0.2:
dependencies:
@@ -3056,12 +3070,12 @@ snapshots:
jsonfile: 4.0.0
universalify: 0.1.2
- fs-merger@3.2.1:
+ fs-merger@3.2.1(supports-color@7.2.0):
dependencies:
broccoli-node-api: 1.7.0
broccoli-node-info: 2.2.0
fs-extra: 8.1.0
- fs-tree-diff: 2.0.1
+ fs-tree-diff: 2.0.1(supports-color@7.2.0)
walk-sync: 2.2.0
transitivePeerDependencies:
- supports-color
@@ -3071,10 +3085,10 @@ snapshots:
graceful-fs: 4.2.11
streamx: 2.18.0
- fs-tree-diff@2.0.1:
+ fs-tree-diff@2.0.1(supports-color@7.2.0):
dependencies:
'@types/symlink-or-copy': 1.2.2
- heimdalljs-logger: 0.1.10
+ heimdalljs-logger: 0.1.10(supports-color@7.2.0)
object-assign: 4.1.1
path-posix: 1.0.0
symlink-or-copy: 1.3.1
@@ -3175,7 +3189,7 @@ snapshots:
dependencies:
function-bind: 1.1.2
- hast-util-to-jsx-runtime@2.3.0:
+ hast-util-to-jsx-runtime@2.3.0(supports-color@7.2.0):
dependencies:
'@types/estree': 1.0.5
'@types/hast': 3.0.4
@@ -3184,9 +3198,9 @@ snapshots:
devlop: 1.1.0
estree-util-is-identifier-name: 3.0.0
hast-util-whitespace: 3.0.0
- mdast-util-mdx-expression: 2.0.0
- mdast-util-mdx-jsx: 3.1.2
- mdast-util-mdxjs-esm: 2.0.1
+ mdast-util-mdx-expression: 2.0.0(supports-color@7.2.0)
+ mdast-util-mdx-jsx: 3.1.2(supports-color@7.2.0)
+ mdast-util-mdxjs-esm: 2.0.1(supports-color@7.2.0)
property-information: 6.5.0
space-separated-tokens: 2.0.2
style-to-object: 1.0.6
@@ -3199,9 +3213,9 @@ snapshots:
dependencies:
'@types/hast': 3.0.4
- heimdalljs-logger@0.1.10:
+ heimdalljs-logger@0.1.10(supports-color@7.2.0):
dependencies:
- debug: 2.6.9
+ debug: 2.6.9(supports-color@7.2.0)
heimdalljs: 0.2.6
transitivePeerDependencies:
- supports-color
@@ -3231,10 +3245,10 @@ snapshots:
transitivePeerDependencies:
- encoding
- i18next-parser@9.0.0:
+ i18next-parser@9.0.0(supports-color@7.2.0):
dependencies:
'@babel/runtime': 7.24.7
- broccoli-plugin: 4.0.7
+ broccoli-plugin: 4.0.7(supports-color@7.2.0)
cheerio: 1.0.0-rc.12
colors: 1.4.0
commander: 12.1.0
@@ -3287,11 +3301,11 @@ snapshots:
minimatch: 3.1.2
resolve-from: 4.0.0
- import-sort-parser-babylon@6.0.0:
+ import-sort-parser-babylon@6.0.0(supports-color@7.2.0):
dependencies:
- '@babel/core': 7.24.7
+ '@babel/core': 7.24.7(supports-color@7.2.0)
'@babel/parser': 7.24.7
- '@babel/traverse': 7.24.7
+ '@babel/traverse': 7.24.7(supports-color@7.2.0)
'@babel/types': 7.24.7
find-line-column: 0.5.2
transitivePeerDependencies:
@@ -3485,14 +3499,14 @@ snapshots:
unist-util-is: 6.0.0
unist-util-visit-parents: 6.0.1
- mdast-util-from-markdown@2.0.1:
+ mdast-util-from-markdown@2.0.1(supports-color@7.2.0):
dependencies:
'@types/mdast': 4.0.4
'@types/unist': 3.0.2
decode-named-character-reference: 1.0.2
devlop: 1.1.0
mdast-util-to-string: 4.0.0
- micromark: 4.0.0
+ micromark: 4.0.0(supports-color@7.2.0)
micromark-util-decode-numeric-character-reference: 2.0.1
micromark-util-decode-string: 2.0.0
micromark-util-normalize-identifier: 2.0.0
@@ -3510,67 +3524,67 @@ snapshots:
mdast-util-find-and-replace: 3.0.1
micromark-util-character: 2.1.0
- mdast-util-gfm-footnote@2.0.0:
+ mdast-util-gfm-footnote@2.0.0(supports-color@7.2.0):
dependencies:
'@types/mdast': 4.0.4
devlop: 1.1.0
- mdast-util-from-markdown: 2.0.1
+ mdast-util-from-markdown: 2.0.1(supports-color@7.2.0)
mdast-util-to-markdown: 2.1.0
micromark-util-normalize-identifier: 2.0.0
transitivePeerDependencies:
- supports-color
- mdast-util-gfm-strikethrough@2.0.0:
+ mdast-util-gfm-strikethrough@2.0.0(supports-color@7.2.0):
dependencies:
'@types/mdast': 4.0.4
- mdast-util-from-markdown: 2.0.1
+ mdast-util-from-markdown: 2.0.1(supports-color@7.2.0)
mdast-util-to-markdown: 2.1.0
transitivePeerDependencies:
- supports-color
- mdast-util-gfm-table@2.0.0:
+ mdast-util-gfm-table@2.0.0(supports-color@7.2.0):
dependencies:
'@types/mdast': 4.0.4
devlop: 1.1.0
markdown-table: 3.0.3
- mdast-util-from-markdown: 2.0.1
+ mdast-util-from-markdown: 2.0.1(supports-color@7.2.0)
mdast-util-to-markdown: 2.1.0
transitivePeerDependencies:
- supports-color
- mdast-util-gfm-task-list-item@2.0.0:
+ mdast-util-gfm-task-list-item@2.0.0(supports-color@7.2.0):
dependencies:
'@types/mdast': 4.0.4
devlop: 1.1.0
- mdast-util-from-markdown: 2.0.1
+ mdast-util-from-markdown: 2.0.1(supports-color@7.2.0)
mdast-util-to-markdown: 2.1.0
transitivePeerDependencies:
- supports-color
- mdast-util-gfm@3.0.0:
+ mdast-util-gfm@3.0.0(supports-color@7.2.0):
dependencies:
- mdast-util-from-markdown: 2.0.1
+ mdast-util-from-markdown: 2.0.1(supports-color@7.2.0)
mdast-util-gfm-autolink-literal: 2.0.0
- mdast-util-gfm-footnote: 2.0.0
- mdast-util-gfm-strikethrough: 2.0.0
- mdast-util-gfm-table: 2.0.0
- mdast-util-gfm-task-list-item: 2.0.0
+ mdast-util-gfm-footnote: 2.0.0(supports-color@7.2.0)
+ mdast-util-gfm-strikethrough: 2.0.0(supports-color@7.2.0)
+ mdast-util-gfm-table: 2.0.0(supports-color@7.2.0)
+ mdast-util-gfm-task-list-item: 2.0.0(supports-color@7.2.0)
mdast-util-to-markdown: 2.1.0
transitivePeerDependencies:
- supports-color
- mdast-util-mdx-expression@2.0.0:
+ mdast-util-mdx-expression@2.0.0(supports-color@7.2.0):
dependencies:
'@types/estree-jsx': 1.0.5
'@types/hast': 3.0.4
'@types/mdast': 4.0.4
devlop: 1.1.0
- mdast-util-from-markdown: 2.0.1
+ mdast-util-from-markdown: 2.0.1(supports-color@7.2.0)
mdast-util-to-markdown: 2.1.0
transitivePeerDependencies:
- supports-color
- mdast-util-mdx-jsx@3.1.2:
+ mdast-util-mdx-jsx@3.1.2(supports-color@7.2.0):
dependencies:
'@types/estree-jsx': 1.0.5
'@types/hast': 3.0.4
@@ -3578,7 +3592,7 @@ snapshots:
'@types/unist': 3.0.2
ccount: 2.0.1
devlop: 1.1.0
- mdast-util-from-markdown: 2.0.1
+ mdast-util-from-markdown: 2.0.1(supports-color@7.2.0)
mdast-util-to-markdown: 2.1.0
parse-entities: 4.0.1
stringify-entities: 4.0.4
@@ -3588,13 +3602,13 @@ snapshots:
transitivePeerDependencies:
- supports-color
- mdast-util-mdxjs-esm@2.0.1:
+ mdast-util-mdxjs-esm@2.0.1(supports-color@7.2.0):
dependencies:
'@types/estree-jsx': 1.0.5
'@types/hast': 3.0.4
'@types/mdast': 4.0.4
devlop: 1.1.0
- mdast-util-from-markdown: 2.0.1
+ mdast-util-from-markdown: 2.0.1(supports-color@7.2.0)
mdast-util-to-markdown: 2.1.0
transitivePeerDependencies:
- supports-color
@@ -3802,10 +3816,10 @@ snapshots:
micromark-util-types@2.0.0: {}
- micromark@4.0.0:
+ micromark@4.0.0(supports-color@7.2.0):
dependencies:
'@types/debug': 4.1.12
- debug: 4.3.5
+ debug: 4.3.5(supports-color@7.2.0)
decode-named-character-reference: 1.0.2
devlop: 1.1.0
micromark-core-commonmark: 2.0.1
@@ -3945,11 +3959,11 @@ snapshots:
picomatch@2.3.1: {}
- prettier-plugin-import-sort@0.0.7(prettier@3.3.2):
+ prettier-plugin-import-sort@0.0.7(prettier@3.3.2)(supports-color@7.2.0):
dependencies:
import-sort: 6.0.0
import-sort-config: 6.0.0
- import-sort-parser-babylon: 6.0.0
+ import-sort-parser-babylon: 6.0.0(supports-color@7.2.0)
import-sort-parser-typescript: 6.0.0
prettier: 3.3.2
transitivePeerDependencies:
@@ -4007,16 +4021,16 @@ snapshots:
react-is@16.13.1: {}
- react-markdown@9.0.1(@types/react@19.1.1)(react@19.1.1):
+ react-markdown@9.0.1(@types/react@19.1.1)(react@19.1.1)(supports-color@7.2.0):
dependencies:
'@types/hast': 3.0.4
'@types/react': 19.1.1
devlop: 1.1.0
- hast-util-to-jsx-runtime: 2.3.0
+ hast-util-to-jsx-runtime: 2.3.0(supports-color@7.2.0)
html-url-attributes: 3.0.0
mdast-util-to-hast: 13.2.0
react: 19.1.1
- remark-parse: 11.0.0
+ remark-parse: 11.0.0(supports-color@7.2.0)
remark-rehype: 11.1.0
unified: 11.0.4
unist-util-visit: 5.0.0
@@ -4044,21 +4058,21 @@ snapshots:
regenerator-runtime@0.14.1: {}
- remark-gfm@4.0.0:
+ remark-gfm@4.0.0(supports-color@7.2.0):
dependencies:
'@types/mdast': 4.0.4
- mdast-util-gfm: 3.0.0
+ mdast-util-gfm: 3.0.0(supports-color@7.2.0)
micromark-extension-gfm: 3.0.0
- remark-parse: 11.0.0
+ remark-parse: 11.0.0(supports-color@7.2.0)
remark-stringify: 11.0.0
unified: 11.0.4
transitivePeerDependencies:
- supports-color
- remark-parse@11.0.0:
+ remark-parse@11.0.0(supports-color@7.2.0):
dependencies:
'@types/mdast': 4.0.4
- mdast-util-from-markdown: 2.0.1
+ mdast-util-from-markdown: 2.0.1(supports-color@7.2.0)
micromark-util-types: 2.0.0
unified: 11.0.4
transitivePeerDependencies:
diff --git a/frontend/pnpm-workspace.yaml b/frontend/pnpm-workspace.yaml
index a6e847b3..4edbf9e6 100644
--- a/frontend/pnpm-workspace.yaml
+++ b/frontend/pnpm-workspace.yaml
@@ -3,3 +3,5 @@ minimumReleaseAgeExclude:
- "@decky/ui"
allowBuilds:
esbuild: true
+overrides:
+ '@decky/ui': link:../../lib
diff --git a/frontend/src/components/Toast.tsx b/frontend/src/components/Toast.tsx
index e86e9337..aa2e665f 100644
--- a/frontend/src/components/Toast.tsx
+++ b/frontend/src/components/Toast.tsx
@@ -1,5 +1,5 @@
import type { ToastData } from '@decky/api';
-import { Focusable, Navigation, findClassModule, joinClassNames } from '@decky/ui';
+import { Focusable, Navigation, joinClassNames, toastClasses } from '@decky/ui';
import { FC, memo } from 'react';
import Logger from '../logger';
@@ -23,7 +23,14 @@ interface ToastRendererProps extends ToastProps {
location: ToastLocation;
}
-const templateClasses = findClassModule((m) => m.ShortTemplate) || {};
+const popupClasses = {
+ "ShortTemplate": "kg8VJS07NZk-",
+ "Content": "vjeKRorxqWY-",
+ "Header": "UWjdKshdhD8-",
+ "Icon": "q9vQBNOskjU-",
+ "Title": "RZ1644uUH-k-",
+ "Body": "_5LTIC-a3DVw-"
+}
// These are memoized as they like to randomly rerender
@@ -32,15 +39,15 @@ const GamepadUIPopupToast: FC<Omit<ToastProps, 'newIndicator'>> = memo(({ toast
<div
style={{ '--toast-duration': `${toast.duration}ms` } as React.CSSProperties}
onClick={toast.onClick}
- className={joinClassNames(templateClasses.ShortTemplate, toast.className || '', 'DeckyGamepadUIPopupToast')}
+ className={joinClassNames(popupClasses.ShortTemplate, toast.className || '', 'DeckyGamepadUIPopupToast')}
>
- {toast.logo && <div className={templateClasses.StandardLogoDimensions}>{toast.logo}</div>}
- <div className={joinClassNames(templateClasses.Content, toast.contentClassName || '')}>
- <div className={templateClasses.Header}>
- {toast.icon && <div className={templateClasses.Icon}>{toast.icon}</div>}
- <div className={templateClasses.Title}>{toast.title}</div>
+ {toast.logo && <div className={toastClasses.StandardLogoDimensions}>{toast.logo}</div>}
+ <div className={joinClassNames(popupClasses.Content, toast.contentClassName || '')}>
+ <div className={popupClasses.Header}>
+ {toast.icon && <div className={popupClasses.Icon}>{toast.icon}</div>}
+ <div className={popupClasses.Title}>{toast.title}</div>
</div>
- <div className={templateClasses.Body}>{toast.body}</div>
+ <div className={popupClasses.Body}>{toast.body}</div>
</div>
</div>
);
@@ -55,30 +62,30 @@ const GamepadUIQAMToast: FC<ToastProps> = memo(({ toast, newIndicator }) => {
Navigation.CloseSideMenus();
}}
className={joinClassNames(
- templateClasses.StandardTemplateContainer,
+ toastClasses.StandardTemplateContainer,
toast.className || '',
'DeckyGamepadUIQAMToast',
)}
>
- <div className={templateClasses.StandardTemplate}>
- {toast.logo && <div className={templateClasses.StandardLogoDimensions}>{toast.logo}</div>}
- <div className={joinClassNames(templateClasses.Content, toast.contentClassName || '')}>
- <div className={templateClasses.Header}>
- {toast.icon && <div className={templateClasses.Icon}>{toast.icon}</div>}
- {toast.title && <div className={templateClasses.Title}>{toast.title}</div>}
+ <div className={toastClasses.StandardTemplate}>
+ {toast.logo && <div className={toastClasses.StandardLogoDimensions}>{toast.logo}</div>}
+ <div className={joinClassNames(toastClasses.Content, toast.contentClassName || '')}>
+ <div className={toastClasses.Header}>
+ {toast.icon && <div className={toastClasses.Icon}>{toast.icon}</div>}
+ {toast.title && <div className={toastClasses.Title}>{toast.title}</div>}
{/* timestamp should always be defined by toaster */}
{/* TODO check how valve does this */}
{toast.timestamp && (
- <div className={templateClasses.Timestamp}>
+ <div className={toastClasses.Timestamp}>
{toast.timestamp.toLocaleTimeString(undefined, { timeStyle: 'short' })}
</div>
)}
</div>
- {toast.body && <div className={templateClasses.StandardNotificationDescription}>{toast.body}</div>}
- {toast.subtext && <div className={templateClasses.StandardNotificationSubText}>{toast.subtext}</div>}
+ {toast.body && <div className={toastClasses.StandardNotificationDescription}>{toast.body}</div>}
+ {toast.subtext && <div className={toastClasses.StandardNotificationSubText}>{toast.subtext}</div>}
</div>
{newIndicator && (
- <div className={templateClasses.NewIndicator}>
+ <div className={toastClasses.NewIndicator}>
<svg xmlns="http://www.w3.org/2000/svg" width="50" height="50" viewBox="0 0 50 50" fill="none">
<circle fill="currentColor" cx="25" cy="25" r="25"></circle>
</svg>
diff --git a/frontend/src/components/store/Store.tsx b/frontend/src/components/store/Store.tsx
index cfa83aff..da909fd7 100644
--- a/frontend/src/components/store/Store.tsx
+++ b/frontend/src/components/store/Store.tsx
@@ -7,7 +7,7 @@ import {
SteamSpinner,
Tabs,
TextField,
- findModule,
+ tabsClasses
} from '@decky/ui';
import { Dispatch, FC, SetStateAction, useEffect, useMemo, useState } from 'react';
import { useTranslation } from 'react-i18next';
@@ -32,10 +32,6 @@ const logger = new Logger('Store');
const StorePage: FC<{}> = () => {
const [currentTabRoute, setCurrentTabRoute] = useState<string>('browse');
const [pluginCount, setPluginCount] = useState<number | null>(null);
- const { TabCount } = findModule((m) => {
- if (m?.TabCount && m?.TabTitle) return true;
- return false;
- });
const { t } = useTranslation();
@@ -58,7 +54,7 @@ const StorePage: FC<{}> = () => {
title: t('Store.store_tabs.title'),
content: <BrowseTab setPluginCount={setPluginCount} />,
id: 'browse',
- renderTabAddon: () => <span className={TabCount}>{pluginCount}</span>,
+ renderTabAddon: () => <span className={tabsClasses.TabCount}>{pluginCount}</span>,
},
{
title: t('Store.store_tabs.about'),
diff --git a/frontend/src/errorboundary-hook.tsx b/frontend/src/errorboundary-hook.tsx
index 9dbe9dcd..2bbecc58 100644
--- a/frontend/src/errorboundary-hook.tsx
+++ b/frontend/src/errorboundary-hook.tsx
@@ -26,7 +26,7 @@ class ErrorBoundaryHook extends Logger {
// valve writes only the sanest of code
const exp = /^\(\)=>\([\w$]+\|\|(?:[\w$]+\(|\([\w$]+=)new [\w$]+\),[\w$]+\)$/;
const initErrorReportingStore = findModuleExport(
- (e) => typeof e == 'function' && e?.toString && exp.test(e.toString()),
+ (e) => typeof e == 'function' && e?.toString && (exp.test(e.toString()) || e.toString() == "()=>(store||=new CErrorReportingStore,store)"),
);
if (!initErrorReportingStore) {
diff --git a/frontend/src/index.ts b/frontend/src/index.ts
index 67b30d15..162e8f36 100644
--- a/frontend/src/index.ts
+++ b/frontend/src/index.ts
@@ -1,5 +1,12 @@
// Sets up DFL, then loads start.ts which starts up the loader
+interface Window {
+ _deckyModuleResolverInternals: {
+ scopes: Map<string, Record<string, any>>,
+ scopedObjects: Map<number, any>
+ }
+}
+
interface SteamAppInitialization {
BFinishedInitBeforeLogin?: () => boolean;
BFinishedInitStageOne?: () => boolean;
@@ -13,42 +20,65 @@ const isSteamAppInitialized = () => {
(async () => {
console.debug('[Decky:Boot] Frontend init');
+ console.debug('[Decky:Boot] Authenticating with Decky backend...');
+ window.deckyAuthToken = await fetch('http://127.0.0.1:1337/auth/token').then((r) => r.text());
+ console.debug('[Decky:Boot] Connecting to Decky backend...');
+ const ws = window.DeckyBackend = new (await import('./wsrouter')).WSRouter();
+ await ws.connect();
+
console.time('[Decky:Boot] Waiting for SteamApp init stage 1 to finish...');
while (!isSteamAppInitialized()) {
await new Promise((r) => setTimeout(r, 0)); // Can't use DFL sleep here.
}
- console.timeEnd('[Decky:Boot] Waiting for SteamApp init stage 1 to finish...');
-
- if (!window.SP_REACT) {
- console.debug('[Decky:Boot] Setting up Webpack & React globals...');
- // deliberate partial import
- const DFLWebpack = await import('@decky/ui/dist/webpack');
- window.SP_REACT = DFLWebpack.findModule((m) => m.Component && m.PureComponent && m.useLayoutEffect);
- window.SP_REACTDOM =
- DFLWebpack.findModule((m) => m.createPortal && m.createRoot) ||
- DFLWebpack.findModule((m) => m.createPortal && m.__DOM_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE);
-
- console.debug('[Decky:Boot] Setting up JSX internals...');
- const jsxModule = DFLWebpack.findModule((m) => (m.jsx && m.jsxs) || (m.jsx && Object.keys(m).length == 1));
- if (jsxModule.jsxs) {
- window.SP_JSX = jsxModule;
- } else {
- window.SP_JSX = {
- jsx: jsxModule.jsx,
- jsxs: jsxModule.jsx,
- Fragment: window.SP_REACT.Fragment,
- };
+ console.debug('[Decky:Boot] Setting up Module System & React globals...');
+
+ let moduleId = 0;
+ const int = window._deckyModuleResolverInternals = {
+ scopes: new Map(),
+ scopedObjects: new Map()
+ };
+ const resolveThroughBackend = ws.callable<[objectKey: number]>("instrumentation/resolve_scope");
+ async function resolveModuleScope(objectFromScope: any, moduleForDebug?: string) {
+ let ret;
+ const id = ++moduleId;
+ try {
+ int.scopedObjects.set(id, objectFromScope)
+ await resolveThroughBackend(id);
+ ret = int.scopes.get(id);
+ } catch(e) {
+ console.debug(`[Decky:Instrumentation] Scope resolution failed for module ${moduleForDebug}`, e);
+ } finally {
+ int.scopes.delete(id);
+ int.scopedObjects.delete(id);
}
+ return ret;
+ }
+
+ // deliberate partial import
+ const DFLModules = await import('@decky/ui/dist/module-system');
+ await DFLModules.initModules(resolveModuleScope);
+ // @ts-ignore
+ window.DFLModules = DFLModules;
+ window.SP_REACT = DFLModules.findModule((m) => m.Component && m.PureComponent && m.useLayoutEffect);
+ window.SP_REACTDOM =
+ DFLModules.findModule((m) => m.createPortal && m.createRoot) ||
+ DFLModules.findModule((m) => m.createPortal && m.__DOM_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE);
+
+ console.debug('[Decky:Boot] Setting up JSX internals...');
+ const jsxModule = DFLModules.findModule((m) => (m.jsx && m.jsxs) || (m.jsx && Object.keys(m).length == 1));
+ if (jsxModule?.jsxs) {
+ window.SP_JSX = jsxModule;
+ } else {
+ window.SP_JSX = {
+ jsx: jsxModule.jsx,
+ jsxs: jsxModule.jsx,
+ Fragment: window.SP_REACT.Fragment,
+ };
}
console.debug('[Decky:Boot] Setting up @decky/ui...');
window.DFL = await import('@decky/ui');
- console.debug('[Decky:Boot] Authenticating with Decky backend...');
- window.deckyAuthToken = await fetch('http://127.0.0.1:1337/auth/token').then((r) => r.text());
- console.debug('[Decky:Boot] Connecting to Decky backend...');
- window.DeckyBackend = new (await import('./wsrouter')).WSRouter();
- await DeckyBackend.connect();
console.debug('[Decky:Boot] Starting Decky!');
await import('./start');
})();
diff --git a/frontend/src/plugin-loader.tsx b/frontend/src/plugin-loader.tsx
index 81b96dcc..49f5734b 100644
--- a/frontend/src/plugin-loader.tsx
+++ b/frontend/src/plugin-loader.tsx
@@ -554,7 +554,7 @@ class PluginLoader extends Logger {
</pre>
</PanelSectionRow>
<PanelSectionRow>
- <div className={quickAccessMenuClasses.Text}>
+ <div>
<TranslationHelper
transClass={TranslationClass.PLUGIN_LOADER}
transText="plugin_error_uninstall"
diff --git a/frontend/src/router-hook.tsx b/frontend/src/router-hook.tsx
index a7b6ec92..bf1198fc 100644
--- a/frontend/src/router-hook.tsx
+++ b/frontend/src/router-hook.tsx
@@ -5,7 +5,7 @@ import {
afterPatch,
findInReactTree,
findInTree,
- findModuleByExport,
+ findVar,
getReactRoot,
sleep,
} from '@decky/ui';
@@ -56,20 +56,9 @@ class RouterHook extends Logger {
window.__ROUTER_HOOK_INSTANCE?.deinit?.();
window.__ROUTER_HOOK_INSTANCE = this;
- const reactRouterStackModule = findModuleByExport((e) => typeof e == 'string' && e == 'router-backstack', 20);
- if (reactRouterStackModule) {
- this.Route =
- Object.values(reactRouterStackModule).find(
- (e) => typeof e == 'function' && /routePath:[\w$]+\.match\?\.path./.test(e.toString()),
- ) ||
- Object.values(reactRouterStackModule).find(
- (e) => typeof e == 'function' && /routePath:null===\(.=.\.match\)/.test(e.toString()),
- );
- if (!this.Route) {
- this.error('Failed to find Route component');
- }
- } else {
- this.error('Failed to find router stack module');
+ this.Route = findVar((e) => /routePath:[\w$]+\.match\?\.path./.test(e.toString()))
+ if (!this.Route) {
+ this.error('Failed to find Route component');
}
this.modeChangeRegistration = SteamClient.UI.RegisterForUIModeChanged((mode: EUIMode) => {
diff --git a/frontend/src/tabs-hook.tsx b/frontend/src/tabs-hook.tsx
index ecb60f30..5098834c 100644
--- a/frontend/src/tabs-hook.tsx
+++ b/frontend/src/tabs-hook.tsx
@@ -6,7 +6,7 @@ import {
afterPatch,
createReactTreePatcher,
findInReactTree,
- findModuleByExport,
+ findModuleScopeByVar,
getReactRoot,
} from '@decky/ui';
@@ -41,7 +41,7 @@ class TabsHook extends Logger {
}
init() {
- const qamModule = findModuleByExport((e) => e?.type?.toString?.()?.includes('QuickAccessMenuBrowserView'));
+ const qamModule = findModuleScopeByVar((e) => e?.type?.toString?.()?.includes('QuickAccessMenuBrowserView'));
const qamBrowserViewRenderer = Object.values(qamModule).find((e: any) =>
e?.type?.toString?.()?.includes('QuickAccessMenuBrowserView'),
);
diff --git a/frontend/src/toaster.tsx b/frontend/src/toaster.tsx
index e5b2d986..572a1bba 100644
--- a/frontend/src/toaster.tsx
+++ b/frontend/src/toaster.tsx
@@ -4,7 +4,7 @@ import {
ErrorBoundary,
Patch,
callOriginal,
- findModuleExport,
+ findVar,
injectFCTrampoline,
replacePatch,
} from '@decky/ui';
@@ -27,7 +27,8 @@ class Toaster extends Logger {
window.__TOASTER_INSTANCE?.deinit?.();
window.__TOASTER_INSTANCE = this;
- const ValveToastRenderer = findModuleExport((e) => e?.toString?.()?.includes(`controller:"notification",method:`));
+ // TODO regex?
+ const ValveToastRenderer = findVar((e) => e?.toString?.()?.includes(`controller:\`notification\`,method:`));
// TODO find a way to undo this if possible?
const patchedRenderer = injectFCTrampoline(ValveToastRenderer);
this.toastPatch = replacePatch(patchedRenderer, 'component', (args: any[]) => {