Compare commits

...

18 Commits

Author SHA1 Message Date
AAGaming 670ae7d8a7 OOPS 2025-07-13 02:42:16 -04:00
AAGaming 01ec1663bc Merge branch 'main' of github.com:SteamDeckHomebrew/decky-loader 2025-07-13 02:37:34 -04:00
AAGaming b840d75cb8 certified pnpm moment 2025-07-13 02:37:03 -04:00
AAGaming e22ba20d13 Fix ModalRoot component on beta (#792) 2025-07-13 02:33:22 -04:00
AAGaming bff410d98b chore(readme): update to reflect dumb new pnpm change 2025-07-13 02:26:51 -04:00
AAGaming 7188db9877 feat(dev): make deckdebug.sh configurable
so i can use it on windows :3
2025-07-13 02:20:42 -04:00
AAGaming 02e8640ad4 bump @decky/ui to fix ConfirmModal component (#789)
Co-Authored-By: shadow <81448108+shdwmtr@users.noreply.github.com>
2025-07-08 23:30:47 -04:00
AAGaming e63983dba9 Fix updater reload freezing (#786) 2025-07-01 15:24:52 -04:00
ynhhoJ cbea1518ed Removed FocusRing from Decky Changelog Modal and use Focusable instead which fixes: #685 (#779)
* fix(Updater): Remove `FocusRing` component and use `Focusable` instead

* feat(Markdown): Add Link `class` to a tag for a mentain a Steam UI colors palette
2025-06-29 11:37:47 -07:00
marios 414493eed2 Add Decky branch switcher and updater to error boundary (#775)
* Add Decky branch switcher and updater to error boundary

* Linting fixup

* Update DeckyErrorBoundary.tsx

Allow for plugins to trigger new behavior.

* Lint fixup
2025-06-29 11:36:48 -07:00
dependabot[bot] 078a9cf33d Bump setuptools from 70.1.1 to 78.1.1 in /backend (#772)
Bumps [setuptools](https://github.com/pypa/setuptools) from 70.1.1 to 78.1.1.
- [Release notes](https://github.com/pypa/setuptools/releases)
- [Changelog](https://github.com/pypa/setuptools/blob/main/NEWS.rst)
- [Commits](https://github.com/pypa/setuptools/compare/v70.1.1...v78.1.1)

---
updated-dependencies:
- dependency-name: setuptools
  dependency-version: 78.1.1
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-06-28 12:46:22 -07:00
shadow 6e357ceecc fix(deps): update @decky/ui to version 4.10.2 (#782)
* fix(deps): update @decky/ui to version 4.10.1

* chore(deps): bump @decky/ui 4.8.3 -> 4.10.1

* fix(types): UIMode -> EUIMode

* fix(types): bypass missing type in library.ts

* fix: lint

---------

Co-authored-by: AAGaming <aagaming@riseup.net>
2025-06-28 12:45:33 -07:00
ynhhoJ e4f7546f99 Add support of files from data/<plugin>/ to be fetched from Front-End (#761)
* Add support of files from `data/<plugin>/assets/` to be fetched from Front-End

* Add `data` regex folder into `csrf_middleware`
2025-05-29 17:30:48 -07:00
WerWolvTranslationBot 4e5468a353 Translations update from Weblate (#771)
* Translated using Weblate (French)

Currently translated at 100.0% (176 of 176 strings)

Translation: Decky/Decky
Translate-URL: https://weblate.werwolv.net/projects/decky/decky/fr/

* Translated using Weblate (French)

Currently translated at 100.0% (176 of 176 strings)

Translation: Decky/Decky
Translate-URL: https://weblate.werwolv.net/projects/decky/decky/fr/

---------

Co-authored-by: Anaëlle <contact@anaelle.dev>
2025-05-19 07:01:39 -07:00
Alexander Maslov 0b73882012 Simplify the typing of the plugin URL for users (#769)
* Simplify the typing of the plugin URL for the user. Make the http/https prefix optional.

* Fixed the formatting using prettier --write
2025-04-23 10:21:49 -04:00
Yassine Gherbi b15392b5f2 feat: VSCode Tasks Runner and deckdebug.sh Enhancements (#763)
* feat: add dependency checks in deckdebug.sh

* feat: add argument validation to deckdebug.sh

* feat: remove unnecessary (testing) dependency from deckdebug.sh

* .

* feat: add script to run VSCode tasks with dependency handling

* fix: update script usage instructions in tasks.sh

* fix: dependency check after checking for nix

* feat: add nix shell support in tasks.sh

* fix: match the dependencies

Resolve: https://github.com/SteamDeckHomebrew/decky-loader/pull/763/files/d22612c207b1f0996f2a1dbc4bd7ad392b12e49c#r2039722788

* fix incorrect path in usage

---------

Co-authored-by: AAGaming <aagaming00@protonmail.com>
2025-04-23 08:10:28 -04:00
WerWolvTranslationBot e646168e31 Translations update from Weblate (#764)
* Translated using Weblate (Russian)

Currently translated at 94.8% (167 of 176 strings)

Translation: Decky/Decky
Translate-URL: https://weblate.werwolv.net/projects/decky/decky/ru/

* Translated using Weblate (Japanese)

Currently translated at 100.0% (176 of 176 strings)

Translation: Decky/Decky
Translate-URL: https://weblate.werwolv.net/projects/decky/decky/ja/

---------

Co-authored-by: Andrew <www.andru90@gmail.com>
Co-authored-by: Tak-attack <tak.bts@gmail.com>
2025-04-05 08:37:19 -07:00
dependabot[bot] 5ec4a4645d Bump jinja2 from 3.1.5 to 3.1.6 in /backend (#762)
Bumps [jinja2](https://github.com/pallets/jinja) from 3.1.5 to 3.1.6.
- [Release notes](https://github.com/pallets/jinja/releases)
- [Changelog](https://github.com/pallets/jinja/blob/main/CHANGES.rst)
- [Commits](https://github.com/pallets/jinja/compare/3.1.5...3.1.6)

---
updated-dependencies:
- dependency-name: jinja2
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-04-05 08:32:23 -07:00
26 changed files with 457 additions and 86 deletions
+1 -1
View File
@@ -41,7 +41,7 @@ jobs:
working-directory: ./frontend
run: |
npm i -g pnpm
pnpm i --frozen-lockfile
pnpm i --frozen-lockfile --dangerously-allow-all-builds
- name: Build JS Frontend 🛠️
working-directory: ./frontend
+1 -1
View File
@@ -43,7 +43,7 @@ jobs:
working-directory: ./frontend
run: |
npm i -g pnpm
pnpm i --frozen-lockfile
pnpm i --frozen-lockfile --dangerously-allow-all-builds
- name: Build JS Frontend 🛠️
working-directory: ./frontend
+1 -1
View File
@@ -16,7 +16,7 @@ jobs:
working-directory: frontend
run: |
npm i -g pnpm
pnpm i --frozen-lockfile
pnpm i --frozen-lockfile --dangerously-allow-all-builds
- name: Run prettier (TypeScript)
working-directory: frontend
+1 -1
View File
@@ -35,7 +35,7 @@ jobs:
working-directory: frontend
run: |
npm i -g pnpm
pnpm i --frozen-lockfile
pnpm i --frozen-lockfile --dangerously-allow-all-builds
- name: Run pyright (Python)
uses: jakebailey/pyright-action@v1
+1 -1
View File
@@ -95,7 +95,7 @@ Please consult [the wiki page regarding development](https://wiki.deckbrew.xyz/e
1. In your clone of the repository, run these commands.
```bash
cd frontend
pnpm i
pnpm i # NOTE: you may need to approve esbuild's build script with pnpm approve-builds
pnpm run build
```
1. If you are modifying the UI, these commands will need to be run before deploying the changes to your Steam Deck.
+2
View File
@@ -23,6 +23,7 @@ csrf_token = str(uuid.uuid4())
ssl_ctx = ssl.create_default_context(cafile=certifi.where())
assets_regex = re.compile("^/plugins/.*/assets/.*")
data_regex = re.compile("^/plugins/.*/data/.*")
dist_regex = re.compile("^/plugins/.*/dist/.*")
frontend_regex = re.compile("^/frontend/.*")
logger = getLogger("Main")
@@ -45,6 +46,7 @@ async def csrf_middleware(request: Request, handler: Handler):
str(request.rel_url.path) == "/fetch" or \
str(request.rel_url.path) == "/ws" or \
assets_regex.match(str(request.rel_url)) or \
data_regex.match(str(request.rel_url)) or \
dist_regex.match(str(request.rel_url)) or \
frontend_regex.match(str(request.rel_url)):
+10 -1
View File
@@ -8,6 +8,7 @@ from typing import Any, Tuple, Dict, cast
from aiohttp import web
from os.path import exists
from decky_loader.helpers import get_homebrew_path
from watchdog.events import RegexMatchingEventHandler, FileSystemEvent
from watchdog.observers import Observer
@@ -91,6 +92,7 @@ class Loader:
web.get("/plugins/{plugin_name}/frontend_bundle", self.handle_frontend_bundle),
web.get("/plugins/{plugin_name}/dist/{path:.*}", self.handle_plugin_dist),
web.get("/plugins/{plugin_name}/assets/{path:.*}", self.handle_plugin_frontend_assets),
web.get("/plugins/{plugin_name}/data/{path:.*}", self.handle_plugin_frontend_assets_from_data),
])
server_instance.ws.add_route("loader/get_plugins", self.get_plugins)
@@ -142,6 +144,13 @@ class Loader:
return web.FileResponse(file, headers={"Cache-Control": "no-cache"})
async def handle_plugin_frontend_assets_from_data(self, request: web.Request):
plugin = self.plugins[request.match_info["plugin_name"]]
home = get_homebrew_path()
file = path.join(home, "data", plugin.plugin_directory, request.match_info["path"])
return web.FileResponse(file, headers={"Cache-Control": "no-cache"})
async def handle_frontend_bundle(self, request: web.Request):
plugin = self.plugins[request.match_info["plugin_name"]]
@@ -216,4 +225,4 @@ class Loader:
async def handle_plugin_backend_reload(self, plugin_name: str):
plugin = self.plugins[plugin_name]
await self.reload_queue.put((plugin.file, plugin.plugin_directory))
await self.reload_queue.put((plugin.file, plugin.plugin_directory))
+54 -15
View File
@@ -2,7 +2,7 @@
"BranchSelect": {
"update_channel": {
"label": "Canal de mise à jour",
"prerelease": "Avant-première",
"prerelease": "Préliminaire",
"stable": "Stable",
"testing": "Test"
}
@@ -52,21 +52,29 @@
"MultiplePluginsInstallModal": {
"confirm": "Êtes-vous sûr de vouloir apporter les modifications suivantes ?",
"description": {
"downgrade": "Rétrograder {{name}} en {{version}}",
"install": "Installer {{name}} {{version}}",
"overwrite": "Écraser {{name}} avec {{version}}",
"reinstall": "Réinstaller {{name}} {{version}}",
"update": "Mettre à jour {{name}} à {{version}}"
"update": "Mettre à jour {{name}} en {{version}}"
},
"ok_button": {
"idle": "Confirmer",
"loading": "En cours"
},
"title": {
"downgrade_many": "Rétrograder {{count}} plugins",
"downgrade_one": "Rétrograder 1 plugin",
"downgrade_other": "Rétrograder {{count}} plugins",
"install_many": "Installer {{count}} plugins",
"install_one": "Installer 1 plugin",
"install_other": "Installer {{count}} plugins",
"mixed_many": "Modifier {{count}} plugins",
"mixed_one": "Modifier {{count}} plugin",
"mixed_other": "Modifier {{count}} plugins",
"overwrite_many": "Écraser {{count}} plugins",
"overwrite_one": "Écraser 1 plugin",
"overwrite_other": "Écraser {{count}} plugins",
"reinstall_many": "Réinstaller {{count}} plugins",
"reinstall_one": "Réinstaller 1 plugin",
"reinstall_other": "Réinstaller {{count}} plugins",
@@ -76,12 +84,22 @@
}
},
"PluginCard": {
"plugin_downgrade": "Rétrograder",
"plugin_full_access": "Ce plugin a un accès complet à votre Steam Deck.",
"plugin_install": "Installer",
"plugin_no_desc": "Aucune description fournie.",
"plugin_overwrite": "Écraser",
"plugin_reinstall": "Réinstaller",
"plugin_update": "Mettre à jour",
"plugin_version_label": "Version du plugin"
},
"PluginInstallModal": {
"downgrade": {
"button_idle": "Rétrograder",
"button_processing": "Rétrogradation",
"desc": "Êtes-vous sûr de vouloir rétrograder {{artifact}} vers la version {{version}} ?",
"title": "Rétrograder {{artifact}}"
},
"install": {
"button_idle": "Installer",
"button_processing": "Installation en cours",
@@ -89,6 +107,13 @@
"title": "Installer {{artifact}}"
},
"no_hash": "Ce plugin n'a pas de somme de contrôle, vous l'installez à vos risques et périls.",
"not_installed": "(non installé)",
"overwrite": {
"button_idle": "Écraser",
"button_processing": "Écrasement",
"desc": "Êtes-vous sûr de vouloir remplacer {{artifact}} par la version {{version}} ?",
"title": "Écraser {{artifact}}"
},
"reinstall": {
"button_idle": "Réinstaller",
"button_processing": "Réinstallation en cours",
@@ -97,8 +122,8 @@
},
"update": {
"button_idle": "Mettre à jour",
"button_processing": "Mise à jour",
"desc": "Êtes-vous sûr de vouloir mettre à jour {{artifact}} {{version}}?",
"button_processing": "Mise à jour en cours",
"desc": "Êtes-vous sûr de vouloir mettre à jour {{artifact}} vers la version {{version}}?",
"title": "Mettre à jour {{artifact}}"
}
},
@@ -124,7 +149,7 @@
"decky_title": "Decky",
"decky_update_available": "Mise à jour vers {{tag_name}} disponible !",
"error": "Erreur",
"plugin_error_uninstall": "Allez sur {{name}} dans le menu de Decky si vous voulez désinstaller ce plugin.",
"plugin_error_uninstall": "Le chargement de {{name}} a provoqué une exception comme indiqué ci-dessus. Cela signifie généralement que le plugin nécessite une mise à jour pour la nouvelle version de SteamUI. Vérifiez si une mise à jour est présente ou évaluez sa suppression dans les paramètres de Decky, dans la section Plugins.",
"plugin_load_error": {
"message": "Erreur lors du chargement du plugin {{name}}",
"toast": "Erreur lors du chargement de {{name}}"
@@ -153,7 +178,7 @@
"cef_console": {
"button": "Ouvrir la console",
"desc": "Ouvre la console CEF. Utile uniquement à des fins de débogage. Les éléments présentés ici sont potentiellement dangereux et ne doivent être utilisés que si vous êtes un développeur de plugins ou si vous êtes dirigé ici par un de ces développeurs.",
"label": "CEF Console"
"label": "Console CEF"
},
"header": "Autre",
"react_devtools": {
@@ -171,7 +196,7 @@
},
"valve_internal": {
"desc1": "Active le menu développeur interne de Valve.",
"desc2": "Ne touchez à rien dans ce menu à moins que vous ne sachiez ce qu'il fait.",
"desc2": "Ne touchez à rien dans ce menu à moins que vous ne sachiez ce que ça fait.",
"label": "Activer Valve Internal"
}
},
@@ -187,9 +212,9 @@
"label": "Mode développeur"
},
"notifications": {
"decky_updates_label": "Mise à jour Decky disponible",
"decky_updates_label": "Mise à jour de Decky disponible",
"header": "Notifications",
"plugin_updates_label": "Mises à jour du plugin disponibles"
"plugin_updates_label": "Mises à jour des plugins disponibles"
},
"other": {
"header": "Autre"
@@ -202,9 +227,19 @@
"developer_title": "Développeur",
"general_title": "Général",
"plugins_title": "Plugins",
"testing_title": "Essai"
"testing_title": "Expérimentations"
},
"Store": {
"download_progress_info": {
"download_remote": "Téléchargement des binaires externes",
"download_zip": "Téléchargement du plugin",
"increment_count": "Incrémentation du nombre de téléchargements",
"installing_plugin": "Installation du plugin",
"open_zip": "Ouverture du fichier zip",
"parse_zip": "Analyse du fichier zip",
"start": "Initialisation",
"uninstalling_previous": "Désinstallation de la copie précédente"
},
"store_contrib": {
"desc": "Si vous souhaitez contribuer au Decky Plugin Store, consultez le dépôt SteamDeckHomebrew/decky-plugin-template sur GitHub. Des informations sur le développement et la distribution sont disponibles dans le fichier README.",
"label": "Contributions"
@@ -237,23 +272,27 @@
"store_testing_cta": "Pensez à tester de nouveaux plugins pour aider l'équipe Decky Loader !",
"store_testing_warning": {
"desc": "Vous pouvez utiliser cette chaîne de magasin pour tester des versions de plugins. Assurez-vous de laisser des commentaires sur GitHub afin que le plugin puisse être mis à jour pour tous les utilisateurs.",
"label": "Bienvenue sur la chaîne du magasin de tests"
"label": "Bienvenue sur le canal test de la boutique"
}
},
"StoreSelect": {
"custom_store": {
"label": "Plugin Store personnalisé",
"label": "Magasin personnalisé",
"url_label": "URL"
},
"store_channel": {
"custom": "Personnalisé",
"default": "Par défaut",
"label": "Canal du Plugin Store",
"label": "Canal magasin",
"testing": "Test"
}
},
"Testing": {
"download": "Télécharger"
"download": "Télécharger",
"error": "Erreur d'installation de la PR",
"header": "Les versions suivantes de Decky Loader sont construites à partir de Pull Requests ouvertes par des tiers. L'équipe de Decky Loader n'a pas vérifié leur fonctionnalité ou leur sécurité, et elles peuvent être obsolètes.",
"loading": "Chargement des Pull Requests ouvertes...",
"start_download_toast": "Téléchargement de la PR #{{id}}"
},
"TitleView": {
"decky_store_desc": "Ouvrir le magasin Decky",
@@ -264,7 +303,7 @@
"no_patch_notes_desc": "pas de notes de mise à jour pour cette version",
"patch_notes_desc": "Notes de mise à jour",
"updates": {
"check_button": "Chercher les mises à jour",
"check_button": "Vérifier les mises à jour",
"checking": "Recherche",
"cur_version": "Version actuelle: {{ver}}",
"install_button": "Installer la mise à jour",
+23 -1
View File
@@ -52,7 +52,9 @@
"MultiplePluginsInstallModal": {
"confirm": "以下の変更を加えてもよろしいですか?",
"description": {
"downgrade": "ダウングレード {{name}} {{version}}",
"install": "インストール {{name}} {{version}}",
"overwrite": "上書き {{name}} {{version}}",
"reinstall": "再インストール {{name}} {{version}}",
"update": "アップデート {{name}} {{version}}"
},
@@ -61,19 +63,31 @@
"loading": "作業中"
},
"title": {
"downgrade_other": "{{count}} 個のプラグインをダウングレード",
"install_other": "{{count}} 個のプラグインをインストール",
"mixed_other": "{{count}} 個のプラグインを修正",
"overwrite_other": "{{count}} 個のプラグインを上書き",
"reinstall_other": "{{count}} 個のプラグインを再インストール",
"update_other": "{{count}} 個のプラグインをアップデート"
}
},
"PluginCard": {
"plugin_downgrade": "ダウングレード",
"plugin_full_access": "このプラグインはSteam Deckの全てのアクセス権を持ちます。",
"plugin_install": "インストール",
"plugin_no_desc": "説明はありません。",
"plugin_overwrite": "上書き",
"plugin_reinstall": "再インストール",
"plugin_update": "アップデート",
"plugin_version_label": "プラグインバージョン"
},
"PluginInstallModal": {
"downgrade": {
"button_idle": "ダウングレード",
"button_processing": "ダウングレード中",
"desc": "{{artifact}}をVer {{version}} にダウングレードしてもよろしいですか?",
"title": "{{artifact}}をダウングレード"
},
"install": {
"button_idle": "インストール",
"button_processing": "インストール中",
@@ -81,6 +95,13 @@
"title": "{{artifact}} をインストール"
},
"no_hash": "このプラグインにはハッシュがありません。ご自身の責任でインストールしてください。",
"not_installed": "(インストールされていません)",
"overwrite": {
"button_idle": "上書き",
"button_processing": "上書き中",
"desc": "{{artifact}}をVer {{version}} に上書きしてもよろしいですか?",
"title": "{{artifact}}を上書き"
},
"reinstall": {
"button_idle": "再インストール",
"button_processing": "再インストール中",
@@ -90,7 +111,7 @@
"update": {
"button_idle": "アップデート",
"button_processing": "アップデート中",
"desc": "{{artifact}} {{version}} アップデートしてもよろしいですか?",
"desc": "{{artifact}}をVer {{version}} アップデートしてもよろしいですか?",
"title": "{{artifact}} をアップデート"
}
},
@@ -192,6 +213,7 @@
},
"Store": {
"download_progress_info": {
"download_remote": "外部バイナリのダウンロード",
"download_zip": "プラグインのダウンロード中",
"increment_count": "ダウンロード数の増加",
"installing_plugin": "プラグインのインストール中",
+15 -1
View File
@@ -52,7 +52,9 @@
"MultiplePluginsInstallModal": {
"confirm": "Вы уверены, что хотите внести следующие изменения?",
"description": {
"downgrade": "Откатить {{name}} до {{version}}",
"install": "Установить {{name}} {{version}}",
"overwrite": "Заменить {{name}} на {{version}}",
"reinstall": "Переустановить {{name}} {{version}}",
"update": "Обновить с {{name}} на {{version}}"
},
@@ -61,6 +63,9 @@
"loading": "В процессе"
},
"title": {
"downgrade_few": "Откатить {{count}} плагинов",
"downgrade_many": "Откатить {{count}} плагинов",
"downgrade_one": "Откатить 1 плагин",
"install_few": "Установить {{count}} плагинов",
"install_many": "Установить {{count}} плагинов",
"install_one": "Установить {{count}} плагин",
@@ -76,12 +81,21 @@
}
},
"PluginCard": {
"plugin_downgrade": "Откат",
"plugin_full_access": "Этот плагин имеет полный доступ к вашему Steam Deck.",
"plugin_install": "Установить",
"plugin_no_desc": "Нет описания.",
"plugin_overwrite": "Замена",
"plugin_reinstall": "Переустановка",
"plugin_update": "Обновление",
"plugin_version_label": "Версия плагина"
},
"PluginInstallModal": {
"downgrade": {
"button_idle": "Откат",
"desc": "Вы уверенны, что хотите откатить {{artifact}} до версии {{version}}?",
"title": "Откатить {{artifact}}"
},
"install": {
"button_idle": "Установить",
"button_processing": "Установка",
@@ -98,7 +112,7 @@
"update": {
"button_idle": "Обновить",
"button_processing": "Обновление",
"desc": "Вы уверены, что хотите обновить {{artifact}} {{version}}?",
"desc": "Вы уверены, что хотите обновить {{artifact}} до версии {{version}}?",
"title": "Обновить {{artifact}}"
}
},
@@ -11,7 +11,7 @@ logger = logging.getLogger("localplatform")
# subprocess._ENV
ENV = Mapping[str, str]
ProcessIO = int | IO[Any] | None
async def run(args: list[str], stdin: ProcessIO = DEVNULL, stdout: ProcessIO = PIPE, stderr: ProcessIO = PIPE, env: ENV | None = None) -> tuple[Process, bytes | None, bytes | None]:
async def run(args: list[str], stdin: ProcessIO = DEVNULL, stdout: ProcessIO = PIPE, stderr: ProcessIO = PIPE, env: ENV | None = {"LD_LIBRARY_PATH": ""}) -> tuple[Process, bytes | None, bytes | None]:
proc = await create_subprocess_exec(args[0], *(args[1:]), stdin=stdin, stdout=stdout, stderr=stderr, env=env)
proc_stdout, proc_stderr = await proc.communicate()
return (proc, proc_stdout, proc_stderr)
@@ -146,6 +146,7 @@ async def service_active(service_name : str) -> bool:
async def service_restart(service_name : str, block : bool = True) -> bool:
await run(["systemctl", "daemon-reload"])
logger.info("Systemd reload done.")
cmd = ["systemctl", "restart", service_name]
if not block:
@@ -272,7 +273,7 @@ async def close_cef_socket():
logger.info(f"Closing CEF socket with PID {pid} and FD {fd}")
# Use gdb to inject a close() call for the socket fd into steamwebhelper
gdb_ret, _, _ = await run(["gdb", "--nx", "-p", pid, "--batch", "--eval-command", f"call (int)close({fd})"], env={"LD_LIBRARY_PATH": ""})
gdb_ret, _, _ = await run(["gdb", "--nx", "-p", pid, "--batch", "--eval-command", f"call (int)close({fd})"])
if gdb_ret.returncode != 0:
logger.error(f"Failed to close CEF socket with gdb! return code: {str(gdb_ret.returncode)}", exc_info=True)
+1 -4
View File
@@ -14,7 +14,6 @@ import zipfile
from aiohttp import ClientSession
from . import helpers
from .injector import get_gamepadui_tab
from .settings import SettingsManager
if TYPE_CHECKING:
from .main import PluginManager
@@ -142,8 +141,6 @@ class Updater:
async def download_decky_binary(self, download_url: str, version: str, is_zip: bool = False, size_in_bytes: int | None = None):
download_filename = "PluginLoader" if ON_LINUX else "PluginLoader.exe"
download_temp_filename = download_filename + ".new"
tab = await get_gamepadui_tab()
await tab.open_websocket()
if size_in_bytes == None:
size_in_bytes = 26214400 # 25MiB, a reasonable overestimate (19.6MiB as of 2024/02/25)
@@ -186,7 +183,6 @@ class Updater:
logger.info("Updated loader installation.")
await self.context.ws.emit("updater/finish_download")
await tab.close_websocket()
await self.do_restart()
async def do_update(self):
@@ -244,6 +240,7 @@ class Updater:
await self.download_decky_binary(download_url, version, size_in_bytes=size_in_bytes)
async def do_restart(self):
logger.info("Restarting loader for update.")
await service_restart("plugin_loader", block=False)
async def do_shutdown(self):
+50 -14
View File
@@ -1,4 +1,4 @@
# This file is automatically @generated by Poetry 1.8.5 and should not be changed by hand.
# This file is automatically @generated by Poetry 2.1.1 and should not be changed by hand.
[[package]]
name = "aiohappyeyeballs"
@@ -6,6 +6,7 @@ version = "2.4.3"
description = "Happy Eyeballs for asyncio"
optional = false
python-versions = ">=3.8"
groups = ["main"]
files = [
{file = "aiohappyeyeballs-2.4.3-py3-none-any.whl", hash = "sha256:8a7a83727b2756f394ab2895ea0765a0a8c475e3c71e98d43d76f22b4b435572"},
{file = "aiohappyeyeballs-2.4.3.tar.gz", hash = "sha256:75cf88a15106a5002a8eb1dab212525c00d1f4c0fa96e551c9fbe6f09a621586"},
@@ -17,6 +18,7 @@ version = "3.10.11"
description = "Async http client/server framework (asyncio)"
optional = false
python-versions = ">=3.8"
groups = ["main"]
files = [
{file = "aiohttp-3.10.11-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:5077b1a5f40ffa3ba1f40d537d3bec4383988ee51fbba6b74aa8fb1bc466599e"},
{file = "aiohttp-3.10.11-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:8d6a14a4d93b5b3c2891fca94fa9d41b2322a68194422bef0dd5ec1e57d7d298"},
@@ -121,7 +123,7 @@ multidict = ">=4.5,<7.0"
yarl = ">=1.12.0,<2.0"
[package.extras]
speedups = ["Brotli", "aiodns (>=3.2.0)", "brotlicffi"]
speedups = ["Brotli ; platform_python_implementation == \"CPython\"", "aiodns (>=3.2.0) ; sys_platform == \"linux\" or sys_platform == \"darwin\"", "brotlicffi ; platform_python_implementation != \"CPython\""]
[[package]]
name = "aiohttp-cors"
@@ -129,6 +131,7 @@ version = "0.7.0"
description = "CORS support for aiohttp"
optional = false
python-versions = "*"
groups = ["main"]
files = [
{file = "aiohttp-cors-0.7.0.tar.gz", hash = "sha256:4d39c6d7100fd9764ed1caf8cebf0eb01bf5e3f24e2e073fda6234bc48b19f5d"},
{file = "aiohttp_cors-0.7.0-py3-none-any.whl", hash = "sha256:0451ba59fdf6909d0e2cd21e4c0a43752bc0703d33fc78ae94d9d9321710193e"},
@@ -143,6 +146,7 @@ version = "1.6"
description = "jinja2 template renderer for aiohttp.web (http server for asyncio)"
optional = false
python-versions = ">=3.8"
groups = ["main"]
files = [
{file = "aiohttp-jinja2-1.6.tar.gz", hash = "sha256:a3a7ff5264e5bca52e8ae547bbfd0761b72495230d438d05b6c0915be619b0e2"},
{file = "aiohttp_jinja2-1.6-py3-none-any.whl", hash = "sha256:0df405ee6ad1b58e5a068a105407dc7dcc1704544c559f1938babde954f945c7"},
@@ -158,6 +162,7 @@ version = "1.3.1"
description = "aiosignal: a list of registered asynchronous callbacks"
optional = false
python-versions = ">=3.7"
groups = ["main"]
files = [
{file = "aiosignal-1.3.1-py3-none-any.whl", hash = "sha256:f8376fb07dd1e86a584e4fcdec80b36b7f81aac666ebc724e2c090300dd83b17"},
{file = "aiosignal-1.3.1.tar.gz", hash = "sha256:54cd96e15e1649b75d6c87526a6ff0b6c1b0dd3459f43d9ca11d48c339b68cfc"},
@@ -172,6 +177,7 @@ version = "0.17.4"
description = "Python graph (network) package"
optional = false
python-versions = "*"
groups = ["dev"]
files = [
{file = "altgraph-0.17.4-py2.py3-none-any.whl", hash = "sha256:642743b4750de17e655e6711601b077bc6598dbfa3ba5fa2b2a35ce12b508dff"},
{file = "altgraph-0.17.4.tar.gz", hash = "sha256:1b5afbb98f6c4dcadb2e2ae6ab9fa994bbb8c1d75f4fa96d340f9437ae454406"},
@@ -183,6 +189,8 @@ version = "4.0.3"
description = "Timeout context manager for asyncio programs"
optional = false
python-versions = ">=3.7"
groups = ["main"]
markers = "python_version < \"3.11\""
files = [
{file = "async-timeout-4.0.3.tar.gz", hash = "sha256:4640d96be84d82d02ed59ea2b7105a0f7b33abe8703703cd0ab0bf87c427522f"},
{file = "async_timeout-4.0.3-py3-none-any.whl", hash = "sha256:7405140ff1230c310e51dc27b3145b9092d659ce68ff733fb0cefe3ee42be028"},
@@ -194,6 +202,7 @@ version = "23.2.0"
description = "Classes Without Boilerplate"
optional = false
python-versions = ">=3.7"
groups = ["main"]
files = [
{file = "attrs-23.2.0-py3-none-any.whl", hash = "sha256:99b87a485a5820b23b879f04c2305b44b951b502fd64be915879d77a7e8fc6f1"},
{file = "attrs-23.2.0.tar.gz", hash = "sha256:935dc3b529c262f6cf76e50877d35a4bd3c1de194fd41f47a2b7ae8f19971f30"},
@@ -204,8 +213,8 @@ cov = ["attrs[tests]", "coverage[toml] (>=5.3)"]
dev = ["attrs[tests]", "pre-commit"]
docs = ["furo", "myst-parser", "sphinx", "sphinx-notfound-page", "sphinxcontrib-towncrier", "towncrier", "zope-interface"]
tests = ["attrs[tests-no-zope]", "zope-interface"]
tests-mypy = ["mypy (>=1.6)", "pytest-mypy-plugins"]
tests-no-zope = ["attrs[tests-mypy]", "cloudpickle", "hypothesis", "pympler", "pytest (>=4.3.0)", "pytest-xdist[psutil]"]
tests-mypy = ["mypy (>=1.6) ; platform_python_implementation == \"CPython\" and python_version >= \"3.8\"", "pytest-mypy-plugins ; platform_python_implementation == \"CPython\" and python_version >= \"3.8\""]
tests-no-zope = ["attrs[tests-mypy]", "cloudpickle ; platform_python_implementation == \"CPython\"", "hypothesis", "pympler", "pytest (>=4.3.0)", "pytest-xdist[psutil]"]
[[package]]
name = "certifi"
@@ -213,6 +222,7 @@ version = "2024.7.4"
description = "Python package for providing Mozilla's CA Bundle."
optional = false
python-versions = ">=3.6"
groups = ["main"]
files = [
{file = "certifi-2024.7.4-py3-none-any.whl", hash = "sha256:c198e21b1289c2ab85ee4e67bb4b4ef3ead0892059901a8d5b622f24a1101e90"},
{file = "certifi-2024.7.4.tar.gz", hash = "sha256:5a1e7645bc0ec61a09e26c36f6106dd4cf40c6db3a1fb6352b0244e7fb057c7b"},
@@ -224,6 +234,7 @@ version = "1.4.1"
description = "A list-like structure which implements collections.abc.MutableSequence"
optional = false
python-versions = ">=3.8"
groups = ["main"]
files = [
{file = "frozenlist-1.4.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:f9aa1878d1083b276b0196f2dfbe00c9b7e752475ed3b682025ff20c1c1f51ac"},
{file = "frozenlist-1.4.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:29acab3f66f0f24674b7dc4736477bcd4bc3ad4b896f5f45379a67bce8b96868"},
@@ -310,6 +321,7 @@ version = "3.7"
description = "Internationalized Domain Names in Applications (IDNA)"
optional = false
python-versions = ">=3.5"
groups = ["main"]
files = [
{file = "idna-3.7-py3-none-any.whl", hash = "sha256:82fee1fc78add43492d3a1898bfa6d8a904cc97d8427f683ed8e798d07761aa0"},
{file = "idna-3.7.tar.gz", hash = "sha256:028ff3aadf0609c1fd278d8ea3089299412a7a8b9bd005dd08b9f8285bcb5cfc"},
@@ -317,13 +329,14 @@ files = [
[[package]]
name = "jinja2"
version = "3.1.5"
version = "3.1.6"
description = "A very fast and expressive template engine."
optional = false
python-versions = ">=3.7"
groups = ["main"]
files = [
{file = "jinja2-3.1.5-py3-none-any.whl", hash = "sha256:aba0f4dc9ed8013c424088f68a5c226f7d6097ed89b246d7749c2ec4175c6adb"},
{file = "jinja2-3.1.5.tar.gz", hash = "sha256:8fefff8dc3034e27bb80d67c671eb8a9bc424c0ef4c0826edbff304cceff43bb"},
{file = "jinja2-3.1.6-py3-none-any.whl", hash = "sha256:85ece4451f492d0c13c5dd7c13a64681a86afae63a5f347908daf103ce6d2f67"},
{file = "jinja2-3.1.6.tar.gz", hash = "sha256:0137fb05990d35f1275a587e9aee6d56da821fc83491a0fb838183be43f66d6d"},
]
[package.dependencies]
@@ -338,6 +351,8 @@ version = "1.16.3"
description = "Mach-O header analysis and editing"
optional = false
python-versions = "*"
groups = ["dev"]
markers = "sys_platform == \"darwin\""
files = [
{file = "macholib-1.16.3-py2.py3-none-any.whl", hash = "sha256:0e315d7583d38b8c77e815b1ecbdbf504a8258d8b3e17b61165c6feb60d18f2c"},
{file = "macholib-1.16.3.tar.gz", hash = "sha256:07ae9e15e8e4cd9a788013d81f5908b3609aa76f9b1421bae9c4d7606ec86a30"},
@@ -352,6 +367,7 @@ version = "2.1.5"
description = "Safely add untrusted strings to HTML/XML markup."
optional = false
python-versions = ">=3.7"
groups = ["main"]
files = [
{file = "MarkupSafe-2.1.5-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:a17a92de5231666cfbe003f0e4b9b3a7ae3afb1ec2845aadc2bacc93ff85febc"},
{file = "MarkupSafe-2.1.5-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:72b6be590cc35924b02c78ef34b467da4ba07e4e0f0454a2c5907f473fc50ce5"},
@@ -421,6 +437,7 @@ version = "6.0.5"
description = "multidict implementation"
optional = false
python-versions = ">=3.7"
groups = ["main"]
files = [
{file = "multidict-6.0.5-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:228b644ae063c10e7f324ab1ab6b548bdf6f8b47f3ec234fef1093bc2735e5f9"},
{file = "multidict-6.0.5-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:896ebdcf62683551312c30e20614305f53125750803b614e9e6ce74a96232604"},
@@ -520,6 +537,7 @@ version = "1.9.1"
description = "Node.js virtual environment builder"
optional = false
python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*,>=2.7"
groups = ["dev"]
files = [
{file = "nodeenv-1.9.1-py2.py3-none-any.whl", hash = "sha256:ba11c9782d29c27c70ffbdda2d7415098754709be8a7056d79a737cd901155c9"},
{file = "nodeenv-1.9.1.tar.gz", hash = "sha256:6ec12890a2dab7946721edbfbcd91f3319c6ccc9aec47be7c7e6b7011ee6645f"},
@@ -531,6 +549,7 @@ version = "24.1"
description = "Core utilities for Python packages"
optional = false
python-versions = ">=3.8"
groups = ["main", "dev"]
files = [
{file = "packaging-24.1-py3-none-any.whl", hash = "sha256:5b8f2217dbdbd2f7f384c41c628544e6d52f2d0f53c6d0c3ea61aa5d1d7ff124"},
{file = "packaging-24.1.tar.gz", hash = "sha256:026ed72c8ed3fcce5bf8950572258698927fd1dbda10a5e981cdf0ac37f4f002"},
@@ -542,6 +561,8 @@ version = "2023.2.7"
description = "Python PE parsing module"
optional = false
python-versions = ">=3.6.0"
groups = ["dev"]
markers = "sys_platform == \"win32\""
files = [
{file = "pefile-2023.2.7-py3-none-any.whl", hash = "sha256:da185cd2af68c08a6cd4481f7325ed600a88f6a813bad9dea07ab3ef73d8d8d6"},
{file = "pefile-2023.2.7.tar.gz", hash = "sha256:82e6114004b3d6911c77c3953e3838654b04511b8b66e8583db70c65998017dc"},
@@ -553,6 +574,7 @@ version = "0.2.0"
description = "Accelerated property cache"
optional = false
python-versions = ">=3.8"
groups = ["main"]
files = [
{file = "propcache-0.2.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:c5869b8fd70b81835a6f187c5fdbe67917a04d7e52b6e7cc4e5fe39d55c39d58"},
{file = "propcache-0.2.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:952e0d9d07609d9c5be361f33b0d6d650cd2bae393aabb11d9b719364521984b"},
@@ -660,6 +682,7 @@ version = "6.8.0"
description = "PyInstaller bundles a Python application and all its dependencies into a single package."
optional = false
python-versions = "<3.13,>=3.8"
groups = ["dev"]
files = [
{file = "pyinstaller-6.8.0-py3-none-macosx_10_13_universal2.whl", hash = "sha256:5ff6bc2784c1026f8e2f04aa3760cbed41408e108a9d4cf1dd52ee8351a3f6e1"},
{file = "pyinstaller-6.8.0-py3-none-manylinux2014_aarch64.whl", hash = "sha256:39ac424d2ee2457d2ab11a5091436e75a0cccae207d460d180aa1fcbbafdd528"},
@@ -694,6 +717,7 @@ version = "2024.7"
description = "Community maintained hooks for PyInstaller"
optional = false
python-versions = ">=3.7"
groups = ["dev"]
files = [
{file = "pyinstaller_hooks_contrib-2024.7-py2.py3-none-any.whl", hash = "sha256:8bf0775771fbaf96bcd2f4dfd6f7ae6c1dd1b1efe254c7e50477b3c08e7841d8"},
{file = "pyinstaller_hooks_contrib-2024.7.tar.gz", hash = "sha256:fd5f37dcf99bece184e40642af88be16a9b89613ecb958a8bd1136634fc9fac5"},
@@ -709,6 +733,7 @@ version = "1.1.369"
description = "Command line wrapper for pyright"
optional = false
python-versions = ">=3.7"
groups = ["dev"]
files = [
{file = "pyright-1.1.369-py3-none-any.whl", hash = "sha256:06d5167a8d7be62523ced0265c5d2f1e022e110caf57a25d92f50fb2d07bcda0"},
{file = "pyright-1.1.369.tar.gz", hash = "sha256:ad290710072d021e213b98cc7a2f90ae3a48609ef5b978f749346d1a47eb9af8"},
@@ -727,6 +752,8 @@ version = "0.2.2"
description = "A (partial) reimplementation of pywin32 using ctypes/cffi"
optional = false
python-versions = ">=3.6"
groups = ["dev"]
markers = "sys_platform == \"win32\""
files = [
{file = "pywin32-ctypes-0.2.2.tar.gz", hash = "sha256:3426e063bdd5fd4df74a14fa3cf80a0b42845a87e1d1e81f6549f9daec593a60"},
{file = "pywin32_ctypes-0.2.2-py3-none-any.whl", hash = "sha256:bf490a1a709baf35d688fe0ecf980ed4de11d2b3e37b51e5442587a75d9957e7"},
@@ -738,6 +765,7 @@ version = "1.3.3"
description = "A Python module to customize the process title"
optional = false
python-versions = ">=3.7"
groups = ["main"]
files = [
{file = "setproctitle-1.3.3-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:897a73208da48db41e687225f355ce993167079eda1260ba5e13c4e53be7f754"},
{file = "setproctitle-1.3.3-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:8c331e91a14ba4076f88c29c777ad6b58639530ed5b24b5564b5ed2fd7a95452"},
@@ -834,18 +862,24 @@ test = ["pytest"]
[[package]]
name = "setuptools"
version = "70.1.1"
version = "78.1.1"
description = "Easily download, build, install, upgrade, and uninstall Python packages"
optional = false
python-versions = ">=3.8"
python-versions = ">=3.9"
groups = ["dev"]
files = [
{file = "setuptools-70.1.1-py3-none-any.whl", hash = "sha256:a58a8fde0541dab0419750bcc521fbdf8585f6e5cb41909df3a472ef7b81ca95"},
{file = "setuptools-70.1.1.tar.gz", hash = "sha256:937a48c7cdb7a21eb53cd7f9b59e525503aa8abaf3584c730dc5f7a5bec3a650"},
{file = "setuptools-78.1.1-py3-none-any.whl", hash = "sha256:c3a9c4211ff4c309edb8b8c4f1cbfa7ae324c4ba9f91ff254e3d305b9fd54561"},
{file = "setuptools-78.1.1.tar.gz", hash = "sha256:fcc17fd9cd898242f6b4adfaca46137a9edef687f43e6f78469692a5e70d851d"},
]
[package.extras]
docs = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "pygments-github-lexers (==0.0.5)", "pyproject-hooks (!=1.1)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-favicon", "sphinx-inline-tabs", "sphinx-lint", "sphinx-notfound-page (>=1,<2)", "sphinx-reredirects", "sphinxcontrib-towncrier"]
testing = ["build[virtualenv] (>=1.0.3)", "filelock (>=3.4.0)", "importlib-metadata", "ini2toml[lite] (>=0.14)", "jaraco.develop (>=7.21)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "jaraco.test", "mypy (==1.10.0)", "packaging (>=23.2)", "pip (>=19.1)", "pyproject-hooks (!=1.1)", "pytest (>=6,!=8.1.1)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-home (>=0.5)", "pytest-mypy", "pytest-perf", "pytest-ruff (>=0.3.2)", "pytest-subprocess", "pytest-timeout", "pytest-xdist (>=3)", "tomli", "tomli-w (>=1.0.0)", "virtualenv (>=13.0.0)", "wheel"]
check = ["pytest-checkdocs (>=2.4)", "pytest-ruff (>=0.2.1) ; sys_platform != \"cygwin\"", "ruff (>=0.8.0) ; sys_platform != \"cygwin\""]
core = ["importlib_metadata (>=6) ; python_version < \"3.10\"", "jaraco.functools (>=4)", "jaraco.text (>=3.7)", "more_itertools", "more_itertools (>=8.8)", "packaging (>=24.2)", "platformdirs (>=4.2.2)", "tomli (>=2.0.1) ; python_version < \"3.11\"", "wheel (>=0.43.0)"]
cover = ["pytest-cov"]
doc = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "pygments-github-lexers (==0.0.5)", "pyproject-hooks (!=1.1)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-favicon", "sphinx-inline-tabs", "sphinx-lint", "sphinx-notfound-page (>=1,<2)", "sphinx-reredirects", "sphinxcontrib-towncrier", "towncrier (<24.7)"]
enabler = ["pytest-enabler (>=2.2)"]
test = ["build[virtualenv] (>=1.0.3)", "filelock (>=3.4.0)", "ini2toml[lite] (>=0.14)", "jaraco.develop (>=7.21) ; python_version >= \"3.9\" and sys_platform != \"cygwin\"", "jaraco.envs (>=2.2)", "jaraco.path (>=3.7.2)", "jaraco.test (>=5.5)", "packaging (>=24.2)", "pip (>=19.1)", "pyproject-hooks (!=1.1)", "pytest (>=6,!=8.1.*)", "pytest-home (>=0.5)", "pytest-perf ; sys_platform != \"cygwin\"", "pytest-subprocess", "pytest-timeout", "pytest-xdist (>=3)", "tomli-w (>=1.0.0)", "virtualenv (>=13.0.0)", "wheel (>=0.44.0)"]
type = ["importlib_metadata (>=7.0.2) ; python_version < \"3.10\"", "jaraco.develop (>=7.21) ; sys_platform != \"cygwin\"", "mypy (==1.14.*)", "pytest-mypy"]
[[package]]
name = "watchdog"
@@ -853,6 +887,7 @@ version = "4.0.1"
description = "Filesystem events monitoring"
optional = false
python-versions = ">=3.8"
groups = ["main"]
files = [
{file = "watchdog-4.0.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:da2dfdaa8006eb6a71051795856bedd97e5b03e57da96f98e375682c48850645"},
{file = "watchdog-4.0.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:e93f451f2dfa433d97765ca2634628b789b49ba8b504fdde5837cdcf25fdb53b"},
@@ -897,6 +932,7 @@ version = "1.15.2"
description = "Yet another URL library"
optional = false
python-versions = ">=3.8"
groups = ["main"]
files = [
{file = "yarl-1.15.2-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:e4ee8b8639070ff246ad3649294336b06db37a94bdea0d09ea491603e0be73b8"},
{file = "yarl-1.15.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:a7cf963a357c5f00cb55b1955df8bbe68d2f2f65de065160a1c26b85a1e44172"},
@@ -1004,6 +1040,6 @@ multidict = ">=4.0"
propcache = ">=0.2.0"
[metadata]
lock-version = "2.0"
lock-version = "2.1"
python-versions = ">=3.10,<3.13"
content-hash = "3c9488709e61f3aa21ab47ceb9c677927ce770d8e1e327602a1a6afb09164475"
+1 -1
View File
@@ -7,4 +7,4 @@ export default {
tabWidth: 2,
endOfLine: 'auto',
plugins: [importSort],
}
};
+1 -1
View File
@@ -47,7 +47,7 @@
}
},
"dependencies": {
"@decky/ui": "^4.8.3",
"@decky/ui": "^4.10.4",
"compare-versions": "^6.1.1",
"filesize": "^10.1.2",
"i18next": "^23.11.5",
+5 -5
View File
@@ -9,8 +9,8 @@ importers:
.:
dependencies:
'@decky/ui':
specifier: ^4.8.3
version: 4.8.3
specifier: ^4.10.4
version: 4.10.4
compare-versions:
specifier: ^6.1.1
version: 6.1.1
@@ -218,8 +218,8 @@ packages:
'@decky/api@1.1.1':
resolution: {integrity: sha512-R5fkBRHBt5QIQY7Q0AlbVIhlIZ/nTzwBOoi8Rt4Go2fjFnoMKPInCJl6cPjXzimGwl2pyqKJgY6VnH6ar0XrHQ==}
'@decky/ui@4.8.3':
resolution: {integrity: sha512-Y1KciazgvKqMEVBGrWFCTGOqgVi5sHbcQNoCZRMbPpcI0U3j7udl6mkfe/NBa16oRDZ03ljS41SmrAgKAAt/pA==}
'@decky/ui@4.10.4':
resolution: {integrity: sha512-swgC4IVtQzZVw8dtP/iztpNYUl1eR0dxWfiMpswY8YglDsBn4ntspbL91Ic4WgxvkOEMSpsIs+zkVtjHE9zi3A==}
'@esbuild/aix-ppc64@0.20.2':
resolution: {integrity: sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g==}
@@ -2295,7 +2295,7 @@ snapshots:
'@decky/api@1.1.1': {}
'@decky/ui@4.8.3': {}
'@decky/ui@4.10.4': {}
'@esbuild/aix-ppc64@0.20.2':
optional: true
@@ -4,6 +4,8 @@ import { FunctionComponent, useEffect, useReducer, useState } from 'react';
import { 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;
@@ -37,6 +39,27 @@ const DeckyErrorBoundary: FunctionComponent<DeckyErrorBoundaryProps> = ({ error,
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>
@@ -149,6 +172,65 @@ const DeckyErrorBoundary: FunctionComponent<DeckyErrorBoundaryProps> = ({ error,
</button>
</div>
)}
{
<div style={{ display: 'block', marginBottom: '5px' }}>
{updateProgress > -1
? 'Update in progress... ' + updateProgress + '%'
: updateProgress == -2
? 'Update complete. Restarting...'
: 'Changing your Decky Loader branch and/or \n checking for updates might help!\n'}
{updateProgress == -1 && (
<div style={{ height: '30px' }}>
<select
style={{ height: '100%' }}
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
style={{ height: '100%' }}
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>
}
{wasCausedByPlugin && (
<div style={{ display: 'block', marginBottom: '5px' }}>
{'\n'}
+7 -2
View File
@@ -1,4 +1,4 @@
import { Focusable, Navigation } from '@decky/ui';
import { Focusable, Navigation, findClass, findClassByName } from '@decky/ui';
import { FunctionComponent, useRef } from 'react';
import ReactMarkdown, { Options as ReactMarkdownOptions } from 'react-markdown';
import remarkGfm from 'remark-gfm';
@@ -8,6 +8,9 @@ interface MarkdownProps extends ReactMarkdownOptions {
}
const Markdown: FunctionComponent<MarkdownProps> = (props) => {
const eventDetailsBodyClassName = findClassByName('EventDetailsBody') || undefined;
const eventLinkClassName = findClass('43088', 'Link');
return (
<Focusable>
<ReactMarkdown
@@ -25,8 +28,10 @@ const Markdown: FunctionComponent<MarkdownProps> = (props) => {
Navigation.NavigateToExternalWeb(aRef.current!.href);
}}
style={{ display: 'inline' }}
focusClassName="steam-focus"
className={eventDetailsBodyClassName}
>
<a ref={aRef} {...nodeProps.node.properties}>
<a ref={aRef} {...nodeProps.node.properties} className={eventLinkClassName}>
{nodeProps.children}
</a>
</Focusable>
@@ -47,7 +47,7 @@ export default async function libraryPatch() {
}
const unlisten = History.listen(() => {
if (window.SteamClient.Apps.PromptToChangeShortcut !== patch.patchedFunction) {
if ((window.SteamClient.Apps as any).PromptToChangeShortcut !== patch.patchedFunction) {
rePatch();
}
});
@@ -72,7 +72,16 @@ export default function DeveloperSettings() {
}
icon={<FaLink style={{ display: 'block' }} />}
>
<DialogButton disabled={pluginURL.length == 0} onClick={() => installFromURL(pluginURL)}>
<DialogButton
disabled={pluginURL.length == 0}
onClick={() => {
if (/^https?:\/\//.test(pluginURL)) {
installFromURL(pluginURL);
} else {
installFromURL('https://' + pluginURL);
}
}}
>
{t('SettingsDeveloperIndex.third_party_plugins.button_install')}
</DialogButton>
</Field>
@@ -1,14 +1,4 @@
import {
Carousel,
DialogButton,
Field,
FocusRing,
Focusable,
ProgressBarWithInfo,
Spinner,
findSP,
showModal,
} from '@decky/ui';
import { Carousel, DialogButton, Field, Focusable, ProgressBarWithInfo, Spinner, findSP, showModal } from '@decky/ui';
import { Suspense, lazy, useCallback, useEffect, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { FaExclamation } from 'react-icons/fa';
@@ -23,9 +13,31 @@ const MarkdownRenderer = lazy(() => import('../../../Markdown'));
function PatchNotesModal({ versionInfo, closeModal }: { versionInfo: VerInfo | null; closeModal?: () => {} }) {
const SP = findSP();
const { t } = useTranslation();
return (
<Focusable onCancelButton={closeModal}>
<FocusRing>
<>
<style>
{`
.steam-focus {
outline-offset: 3px;
outline: 2px solid rgba(255, 255, 255, 0.6);
animation: pulseOutline 1.2s infinite ease-in-out;
}
@keyframes pulseOutline {
0% {
outline: 2px solid rgba(255, 255, 255, 0.6);
}
50% {
outline: 2px solid rgba(255, 255, 255, 1);
}
100% {
outline: 2px solid rgba(255, 255, 255, 0.6);
}
}`}
</style>
<Focusable onCancelButton={closeModal}>
<Carousel
fnItemRenderer={(id: number) => (
<Focusable
@@ -35,7 +47,9 @@ function PatchNotesModal({ versionInfo, closeModal }: { versionInfo: VerInfo | n
overflowY: 'scroll',
display: 'flex',
justifyContent: 'center',
margin: '40px',
margin: '30px',
padding: '0 15px',
backgroundColor: 'rgba(37, 40, 46, 0.5)',
}}
>
<div>
@@ -57,11 +71,11 @@ function PatchNotesModal({ versionInfo, closeModal }: { versionInfo: VerInfo | n
nItemMarginX={0}
initialColumn={0}
autoFocus={true}
fnGetColumnWidth={() => SP.innerWidth}
fnGetColumnWidth={() => SP.innerWidth - SP.innerWidth * (10 / 100)}
name={t('Updater.decky_updates') as string}
/>
</FocusRing>
</Focusable>
</Focusable>
</>
);
}
+4 -3
View File
@@ -1,5 +1,6 @@
import { ToastNotification } from '@decky/api';
import {
EUIMode,
ModalRoot,
Navigation,
PanelSection,
@@ -30,7 +31,7 @@ import { HiddenPluginsService } from './hidden-plugins-service';
import Logger from './logger';
import { NotificationService } from './notification-service';
import { InstallType, Plugin, PluginLoadType } from './plugin';
import RouterHook, { UIMode } from './router-hook';
import RouterHook from './router-hook';
import { deinitSteamFixes, initSteamFixes } from './steamfixes';
import { checkForPluginUpdates } from './store';
import TabsHook from './tabs-hook';
@@ -205,12 +206,12 @@ class PluginLoader extends Logger {
let registration: any;
const uiMode = await new Promise(
(r) =>
(registration = SteamClient.UI.RegisterForUIModeChanged((mode: UIMode) => {
(registration = SteamClient.UI.RegisterForUIModeChanged((mode: EUIMode) => {
r(mode);
registration.unregister();
})),
);
if (uiMode == UIMode.BigPicture) {
if (uiMode == EUIMode.GamePad) {
// wait for SP window to exist before loading plugins
while (!findSP()) {
await sleep(100);
+3 -7
View File
@@ -1,4 +1,5 @@
import {
EUIMode,
ErrorBoundary,
Patch,
afterPatch,
@@ -31,11 +32,6 @@ declare global {
}
}
export enum UIMode {
BigPicture = 4,
Desktop = 7,
}
const isPatched = Symbol('is patched');
class RouterHook extends Logger {
@@ -76,13 +72,13 @@ class RouterHook extends Logger {
this.error('Failed to find router stack module');
}
this.modeChangeRegistration = SteamClient.UI.RegisterForUIModeChanged((mode: UIMode) => {
this.modeChangeRegistration = SteamClient.UI.RegisterForUIModeChanged((mode: EUIMode) => {
this.debug(`UI mode changed to ${mode}`);
if (this.patchedModes.has(mode)) return;
this.patchedModes.add(mode);
this.debug(`Patching router for UI mode ${mode}`);
switch (mode) {
case UIMode.BigPicture:
case EUIMode.GamePad:
this.debug('Patching gamepad router');
this.patchGamepadRouter();
break;
Regular → Executable
+29 -5
View File
@@ -2,6 +2,13 @@
# Usage: deckdebug.sh DECKIP:8081
# Dependencies: websocat jq curl chromium
if [ "$#" -ne 1 ]; then
echo "Error: Missing or incorrect argument." >&2
echo "Usage: deckdebug.sh DECKIP:8081" >&2
exit 1
fi
# https://jackson.dev/post/a-portable-nix-shell-shebang/
if [ -z "$INSIDE_NIX_RANDOMSTRING" ] && command -v nix &> /dev/null; then
# If the user has nix, relaunch in nix shell with dependencies added
@@ -13,7 +20,20 @@ if [ -z "$INSIDE_NIX_RANDOMSTRING" ] && command -v nix &> /dev/null; then
exit $?
fi
chromium --remote-debugging-port=9222 &
[[ -f "$HOME/.config/deckdebug/config.sh" ]] && source "$HOME/.config/deckdebug/config.sh"
CHROMIUM="${CHROMIUM:-chromium}"
required_dependencies=(websocat jq curl $CHROMIUM)
# Check if the dependencies are installed
for cmd in "${required_dependencies[@]}"; do
if ! command -v "$cmd" &> /dev/null; then
echo "Error: '$cmd' is not installed. Please install it and try again." >&2
exit 1
fi
done
$CHROMIUM --remote-debugging-port=9222 &
sleep 2
ADDR=$1
@@ -32,13 +52,17 @@ while :; do
TARGET=$NEWTARGET
TARGETURL="http://$ADDR/devtools/inspector.html?ws=$ADDR/devtools/page/$TARGET"
LOCALTARGET=$(echo '{"id": 1, "method": "Target.createTarget", "params": {"background": true, "url": "'$TARGETURL'"}}
echo '{"id": 1, "method": "Target.createTarget", "params": {"background": true, "url": "'$TARGETURL'"}}
{"id": 2, "method": "Target.closeTarget", "params": {"targetId": "'$LOCALTARGET'"}}' \
| websocat ws://$LOCAL/devtools/page/$LOCALTARGET \
| jq -r '.result.targetId')
| websocat -t ws://$LOCAL/devtools/page/$LOCALTARGET
sleep 2
LOCALTARGETS=$(curl -s http://$LOCAL/json/list)
LOCALTARGET=$(jq -r '.[] | select(.title | startswith("DevTools")) | .id' <<< "$LOCALTARGETS")
echo started devtools at $LOCALTARGET
fi
sleep 5
done
done
Regular → Executable
View File
+120
View File
@@ -0,0 +1,120 @@
#!/usr/bin/env bash
# ./script/task.sh: Run a VSCode task from tasks.json including its dependencies.
#
# Usage: ./scripts/task.sh TASK_LABEL
#
# This script looks for .vscode/tasks.json in your workspace folder (or current directory)
# and executes the command associated with the given task label.
#
# It also handles the "dependsOn" field recursively.
#
# Requirements: jq sed
# https://jackson.dev/post/a-portable-nix-shell-shebang/
if [ -z "$INSIDE_NIX_RANDOMSTRING" ] && command -v nix &> /dev/null; then
# If the user has nix, relaunch in nix shell with dependencies added
INSIDE_NIX_RANDOMSTRING=1 nix shell \
nixpkgs#jq \
nixpkgs#gnused \
--command "$0" "$@"
exit $?
fi
required_dependencies=(jq sed)
# Check if the dependencies are installed
for cmd in "${required_dependencies[@]}"; do
if ! command -v "$cmd" &> /dev/null; then
echo "Error: '$cmd' is not installed. Please install it and try again." >&2
exit 1
fi
done
set -euo pipefail
# Use WORKSPACE_FOLDER if set; otherwise, assume current directory.
WORKSPACE_FOLDER="${WORKSPACE_FOLDER:-$(pwd)}"
TASKS_FILE="$WORKSPACE_FOLDER/.vscode/tasks.json"
if [ ! -f "$TASKS_FILE" ]; then
echo "Error: tasks.json not found at $TASKS_FILE" >&2
exit 1
fi
if [ $# -lt 1 ]; then
echo "Usage: $0 TASK_LABEL" >&2
exit 1
fi
# Remove comment lines (lines starting with //) from the tasks file to be compliant with the JSON format.
TASKS_JSON=$(sed '/^[[:space:]]*\/\//d' "$TASKS_FILE")
TASK_LABEL="$1"
shift
# run_task recursively looks up the task by label,
# runs any dependencies first, then executes its command.
run_task() {
local label="$1"
echo "Looking up task: $label"
# Get the task object from the cleaned JSON.
local task
task=$(echo "$TASKS_JSON" | jq --arg label "$label" -r '.tasks[] | select(.label == $label)')
if [ -z "$task" ]; then
echo "Error: Task with label '$label' not found in $TASKS_FILE" >&2
exit 1
fi
# If the task has dependencies, run them first.
local depends
depends=$(echo "$task" | jq -r '.dependsOn? // empty')
if [ -n "$depends" ] && [ "$depends" != "null" ]; then
# "dependsOn" can be an array or a string.
if echo "$depends" | jq -e 'if type=="array" then . else empty end' >/dev/null; then
for dep in $(echo "$depends" | jq -r '.[]'); do
run_task "$dep"
done
else
run_task "$depends"
fi
fi
# Check if the task has either a command or script.
local has_command has_script
has_command=$(echo "$task" | jq -r 'has("command")')
has_script=$(echo "$task" | jq -r 'has("script")')
if [[ "$has_command" != "true" && "$has_script" != "true" ]]; then
echo "Task '$label' has no command or script; skipping execution."
return
fi
# Determine the command to run:
local cmd=""
if echo "$task" | jq 'has("command")' | grep -q "true"; then
cmd=$(echo "$task" | jq -r '.command')
elif echo "$task" | jq 'has("script")' | grep -q "true"; then
local script
script=$(echo "$task" | jq -r '.script')
local path
path=$(echo "$task" | jq -r '.path // empty')
if [ -n "$path" ]; then
cmd="cd $path && npm run $script"
else
cmd="npm run $script"
fi
else
echo "Error: Task '$label' does not have a command or script." >&2
exit 1
fi
# Substitute ${workspaceFolder} with the actual folder path.
cmd="${cmd//\$\{workspaceFolder\}/$WORKSPACE_FOLDER}"
echo "Running task '$label': $cmd"
# Run the task in a subshell so that directory changes don't persist.
( eval "$cmd" )
}
run_task "$TASK_LABEL"