fix get_tabs oopsie

* ci: automatically make releases, ...

- option to run manually (for full-fledged releases)
- cron schedule for pre-releases (every day at 1 pm UTC)
- semantic versioning
- Automatically generated release description

* formatting

* more formatting .-.

* Tweak according to latest release

.github/workflows/build.yml

@@ -2,52 +2,154 @@ name: Builder
 
 on:
   push:
-    branches: [ "*" ]
   pull_request:
-    branches: [ "*" ]
+  schedule:
+    - cron: '0 13 * * *' # run at 1 PM UTC
+  workflow_dispatch:
+    inputs:
+      release:
+        type: choice
+        description: Release the asset
+        default: 'none'
+        options:
+          - none
+          - prerelease
+          - release
 
 permissions:
-  contents: read
+  contents: write
 
 jobs:
   build:
-
-    name: Packager
+    name: Build PluginLoader
     runs-on: ubuntu-latest
 
     steps:
-    - name: 🧰 Checkout
+    - name: Checkout 🧰
       uses: actions/checkout@v3
 
-    - name: 💎 Set up NodeJS 17
+    - name: Set up NodeJS 17 💎
       uses: actions/setup-node@v3
       with:
         node-version: 17
       
-    - name: 🐍 Set up Python 3.10
+    - name: Set up Python 3.10 🐍
       uses: actions/setup-python@v3
       with:
         python-version: "3.10"
         
-    - name: ⬇️ Install Python dependencies
+    - name: Install Python dependencies ⬇️
       run: |
         python -m pip install --upgrade pip
         pip install pyinstaller
-        if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
+        [ -f requirements.txt ] && pip install -r requirements.txt
 
-    - name: ⬇️ Install NodeJS dependencies
+    - name: Install NodeJS dependencies ⬇️
       run: |
         cd frontend
         npm i
         npm run build
 
-    - name: 🛠️ Build
-      run: |
-        pyinstaller --noconfirm --onefile --name "PluginLoader" --add-data ./backend/static:/static --add-data ./backend/legacy:/legacy ./backend/*.py
+    - name: Build 🛠️
+      run: pyinstaller --noconfirm --onefile --name "PluginLoader" --add-data ./backend/static:/static --add-data ./backend/legacy:/legacy ./backend/*.py
         
-    - name: ⬆️ Upload package
-      uses: actions/upload-artifact@v2
+    - name: Upload package artifact ⬆️
+      uses: actions/upload-artifact@v3
       with:
-        name: Plugin Loader
-        path: |
-          ./dist/PluginLoader
+        name: PluginLoader
+        path: ./dist/PluginLoader
+
+  release:
+    name: Release the package
+    if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.release == 'release' }}
+    needs: build
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout 🧰
+      uses: actions/checkout@v3
+
+    - name: Fetch package artifact ⬇️
+      uses: actions/download-artifact@v3
+      with:
+        name: PluginLoader
+        path: dist
+
+    - name: Bump version and push tag ⏫
+      id: tag_version
+      uses: mathieudutour/github-tag-action@v6.0
+      with:
+        github_token: ${{ secrets.GITHUB_TOKEN }}
+
+    - name: Release 📦
+      uses: softprops/action-gh-release@v1
+      with:
+        name: Release ${{ steps.tag_version.outputs.new_tag }}
+        tag_name: ${{ steps.tag_version.outputs.new_tag }}
+        files: ./dist/PluginLoader
+        generate_release_notes: true
+
+  nightly:
+    name: Release the nightly version of the package
+    if: ${{ github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && github.event.inputs.release == 'prerelease') }}
+    needs: build
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout 🧰
+      uses: actions/checkout@v3
+
+    - name: Fetch package artifact ⬇️
+      uses: actions/download-artifact@v3
+      with:
+        name: PluginLoader
+        path: dist
+
+    - name: Bump version ⏫
+      id: tag_version
+      uses: mathieudutour/github-tag-action@v6.0
+      if: ${{ github.event_name == 'workflow_dispatch' }}
+      with:
+        github_token: ${{ secrets.GITHUB_TOKEN }}
+        dry_run: true
+
+    - name: Push tag ⏫
+      uses: rickstaa/action-create-tag@v1.3.2
+      if: ${{ steps.tag_version.outputs.new_tag && github.event_name == 'workflow_dispatch' }}
+      with:
+        tag: ${{ steps.tag_version.outputs.new_tag }}-pre
+        message: Nightly ${{ steps.tag_version.outputs.new_tag }}
+
+    - name: Release 📦
+      uses: softprops/action-gh-release@v1
+      if: ${{ github.event_name == 'workflow_dispatch' }}
+      with:
+        name: Nightly ${{ steps.tag_version.outputs.new_tag }}
+        tag_name: ${{ steps.tag_version.outputs.new_tag }}-pre
+        files: ./dist/PluginLoader
+        prerelease: true
+        generate_release_notes: true
+
+    - name: Bump prerelease
+      id: bump
+      if: ${{ github.event_name == 'schedule' }}
+      run: |
+        git_hash=$(git rev-parse --short "$GITHUB_SHA")
+        echo ::set-output new_tag="nightly-$git_hash"
+
+    - name: Push tag ⏫
+      uses: rickstaa/action-create-tag@v1.3.2
+      if: ${{ github.event_name == 'schedule' }}
+      with:
+        tag: ${{ steps.bump.outputs.new_tag }}
+        message: Nightly ${{ steps.bump.outputs.new_tag }}
+
+    - name: Release 📦
+      uses: softprops/action-gh-release@v1
+      if: ${{ github.event_name == 'schedule' }}
+      with:
+        name: Nightly ${{ steps.bump.outputs.new_tag }}
+        tag_name: ${{ steps.bump.outputs.new_tag }}
+        files: ./dist/PluginLoader
+        prerelease: true
+        generate_release_notes: true

backend/injector.py

@@ -33,8 +33,10 @@ class Tab:
             return (await self.websocket.receive_json()) if receive else None
         raise RuntimeError("Websocket not opened")
 
-    async def evaluate_js(self, js, run_async=False):
-        await self.open_websocket()
+    async def evaluate_js(self, js, run_async=False, manage_socket=True):
+        if manage_socket:
+            await self.open_websocket()
+
         res = await self._send_devtools_cmd({
             "id": 1,
             "method": "Runtime.evaluate",
@@ -45,7 +47,8 @@ class Tab:
             }
         })
 
-        await self.client.close()
+        if manage_socket:
+            await self.client.close()
         return res
 
     async def get_steam_resource(self, url):
@@ -72,7 +75,7 @@ async def get_tabs():
             r = await res.json()
             return [Tab(i) for i in r]
         else:
-            raise Exception(f"/json did not return 200. {await r.text()}")
+            raise Exception(f"/json did not return 200. {await res.text()}")
 
 async def get_tab(tab_name):
     tabs = await get_tabs()

backend/main.py

@@ -17,7 +17,7 @@ basicConfig(level=CONFIG["log_level"], format="[%(module)s][%(levelname)s]: %(me
 from asyncio import get_event_loop, sleep
 from json import dumps, loads
 from os import path
-from subprocess import Popen
+from subprocess import call
 
 import aiohttp_cors
 from aiohttp.web import Application, run_app, static
@@ -31,8 +31,10 @@ from utilities import Utilities
 logger = getLogger("Main")
 
 async def chown_plugin_dir(_):
-    Popen(["chown", "-R", "deck:deck", CONFIG["plugin_path"]])
-    Popen(["chmod", "-R", "555", CONFIG["plugin_path"]])
+    code_chown = call(["chown", "-R", "deck:deck", CONFIG["plugin_path"]])
+    code_chmod = call(["chmod", "-R", "555", CONFIG["plugin_path"]])
+    if code_chown != 0 or code_chmod != 0:
+        logger.error(f"chown/chmod exited with a non-zero exit code (chown: {code_chown}, chmod: {code_chmod})")
 
 class PluginManager:
     def __init__(self) -> None:

dist/install_prerelease.sh

@@ -2,7 +2,7 @@
 
 [ "$UID" -eq 0 ] || exec sudo "$0" "$@"
 
-echo "Installing Steam Deck Plugin Loader release..."
+echo "Installing Steam Deck Plugin Loader pre-release..."
 
 HOMEBREW_FOLDER=/home/deck/homebrew
 
@@ -12,7 +12,7 @@ sudo -u deck mkdir -p ${HOMEBREW_FOLDER}/services
 sudo -u deck mkdir -p ${HOMEBREW_FOLDER}/plugins
 
 # Download latest release and install it
-DOWNLOADURL="$(curl -s 'https://api.github.com/repos/SteamDeckHomebrew/PluginLoader/releases' | jq -r "first(.[] | select(.prerelease == "true"))" | jq -r ".assets[].browser_download_url")"
+DOWNLOADURL="$(curl -s 'https://api.github.com/repos/SteamDeckHomebrew/decky-loader/releases' | jq -r "first(.[] | select(.prerelease == "true"))" | jq -r ".assets[].browser_download_url")"
 # printf "DOWNLOADURL=$DOWNLOADURL\n"
 curl -L $DOWNLOADURL --output ${HOMEBREW_FOLDER}/services/PluginLoader
 chmod +x ${HOMEBREW_FOLDER}/services/PluginLoader

frontend/package.json

@@ -37,7 +37,7 @@
     }
   },
   "dependencies": {
-    "decky-frontend-lib": "^1.0.1",
+    "decky-frontend-lib": "^1.0.2",
     "react-icons": "^4.4.0"
   }
 }

frontend/pnpm-lock.yaml

@@ -9,7 +9,7 @@ specifiers:
   '@types/react': 16.14.0
   '@types/react-router': 5.1.18
   '@types/webpack': ^5.28.0
-  decky-frontend-lib: ^1.0.1
+  decky-frontend-lib: ^1.0.2
   husky: ^8.0.1
   import-sort-style-module: ^6.0.0
   inquirer: ^8.2.4
@@ -23,7 +23,7 @@ specifiers:
   typescript: ^4.7.4
 
 dependencies:
-  decky-frontend-lib: 1.0.1
+  decky-frontend-lib: 1.0.2
   react-icons: 4.4.0_react@16.14.0
 
 devDependencies:
@@ -806,8 +806,8 @@ packages:
       ms: 2.1.2
     dev: true
 
-  /decky-frontend-lib/1.0.1:
-    resolution: {integrity: sha512-SgIPoB3IcWbzVRlXvs8JfhwrMphHYa7O/Ek2mh+rC0WTVT3TI2qGJ5+OoV16mw5kGY0DMu1ikcZC6ib1lh2zKQ==}
+  /decky-frontend-lib/1.0.2:
+    resolution: {integrity: sha512-l2Fq1oKkZdi2W4Qq+EXWgwOynWgANLTSFHcHrbJwCimTJ75uPlvrtsulnh5PlIovydM6iC+NyjAbW/qsVXWeLg==}
     dev: false
 
   /deepmerge/4.2.2:

frontend/src/components/PluginView.tsx

@@ -12,16 +12,18 @@ const PluginView: VFC = () => {
 
   return (
     <PanelSection>
-      {plugins.map(({ name, icon }) => (
-        <PanelSectionRow key={name}>
-          <ButtonItem layout="below" onClick={() => setActivePlugin(name)}>
-            <div style={{ display: 'flex', justifyContent: 'space-between' }}>
-              <div>{icon}</div>
-              <div>{name}</div>
-            </div>
-          </ButtonItem>
-        </PanelSectionRow>
-      ))}
+      {plugins
+        .filter((p) => p.content)
+        .map(({ name, icon }) => (
+          <PanelSectionRow key={name}>
+            <ButtonItem layout="below" onClick={() => setActivePlugin(name)}>
+              <div style={{ display: 'flex', justifyContent: 'space-between' }}>
+                <div>{icon}</div>
+                <div>{name}</div>
+              </div>
+            </ButtonItem>
+          </PanelSectionRow>
+        ))}
     </PanelSection>
   );
 };

frontend/src/plugin.ts

@@ -1,6 +1,6 @@
 export interface Plugin {
-  name: any;
-  content: any;
-  icon: any;
+  name: string;
+  icon: JSX.Element;
+  content?: JSX.Element;
   onDismount?(): void;
 }