Merge remote-tracking branch 'upstream/main' into integrated-tray-icon

README.md

@@ -68,7 +68,3 @@ pnpm package:dir
 ## Motivation
 
 The official Discord Desktop app is very resource heavy compared to Discord in your Browser. There are multiple alternative Electron apps (ArmCord, WebCord, probably more) that prove how much of a performance gain you can gain by using a custom app. ArmCord already supports Vencord but makes it pretty limited for us. Making our own standalone app gives us much more control.
-
-This is just a random idea I (V) got, and might not actually ever be finished heh
-
-Gluon also seems very attractive for this because of how lightweight it can be and because unlike electron, streaming just works out of the box like in any chromium browser. However, at the time of writing this, it still lacks some features necessary to make it work (synchronous ipc or a way to get node process variables into the onLoad function for instance, plus onLoad seems to load a little too late sometimes)

src/main/ipc.ts

@@ -22,6 +22,7 @@ import { globals } from "./mainWindow";
 import { setBadgeCount } from "./appBadge";
 import { Settings } from "./settings";
 import { handle, handleSync } from "./utils/ipcWrappers";
+import { isDeckGameMode, showGamePage } from "./utils/steamOS";
 import { isValidVencordInstall } from "./utils/vencordLoader";
 
 handleSync(IpcEvents.GET_VENCORD_PRELOAD_FILE, () => join(VENCORD_FILES_DIR, "vencordDesktopPreload.js"));
@@ -48,11 +49,14 @@ handle(IpcEvents.SET_SETTINGS, (_, settings: typeof Settings.store, path?: strin
     Settings.setData(settings, path);
 });
 
-handle(IpcEvents.RELAUNCH, () => {
+handle(IpcEvents.RELAUNCH, async () => {
     const options: RelaunchOptions = {
         args: process.argv.slice(1).concat(["--relaunch"])
     };
-    if (app.isPackaged && process.env.APPIMAGE) {
+    if (isDeckGameMode) {
+        // We can't properly relaunch when running under gamescope, but we can at least navigate to our page in Steam.
+        await showGamePage();
+    } else if (app.isPackaged && process.env.APPIMAGE) {
         execFile(process.env.APPIMAGE, options.args);
     } else {
         app.relaunch(options);

src/main/utils/makeLinksOpenExternally.ts

@@ -7,6 +7,7 @@
 import { BrowserWindow, shell } from "electron";
 
 import { Settings } from "../settings";
+import { execSteamURL, isDeckGameMode, steamOpenURL } from "./steamOS";
 
 export function makeLinksOpenExternally(win: BrowserWindow) {
     win.webContents.setWindowOpenHandler(({ url }) => {
@@ -30,9 +31,20 @@ export function makeLinksOpenExternally(win: BrowserWindow) {
                 }
             // eslint-disable-next-line no-fallthrough
             case "mailto:":
-            case "steam:":
             case "spotify:":
-                shell.openExternal(url);
+                if (isDeckGameMode) {
+                    steamOpenURL(url);
+                } else {
+                    shell.openExternal(url);
+                }
+                break;
+            case "steam:":
+                if (isDeckGameMode) {
+                    execSteamURL(url);
+                } else {
+                    shell.openExternal(url);
+                }
+                break;
         }
 
         return { action: "deny" };

src/main/utils/steamOS.ts

@@ -4,22 +4,21 @@
  * Copyright (c) 2023 Vendicated and Vencord contributors
  */
 
-import { exec as callbackExec } from "child_process";
 import { BrowserWindow, dialog } from "electron";
-import { sleep } from "shared/utils/sleep";
-import { promisify } from "util";
+import { writeFile } from "fs/promises";
+import { join } from "path";
 
 import { MessageBoxChoice } from "../constants";
 import { Settings } from "../settings";
 
-const exec = promisify(callbackExec);
-
 // Bump this to re-show the prompt
 const layoutVersion = 2;
 // Get this from "show details" on the profile after exporting as a shared personal layout or using share with community
 const layoutId = "3080264545"; // Vesktop Layout v2
 const numberRegex = /^[0-9]*$/;
 
+let steamPipeQueue = Promise.resolve();
+
 export const isDeckGameMode = process.env.SteamOS === "1" && process.env.SteamGamepadUI === "1";
 
 export function applyDeckKeyboardFix() {
@@ -42,16 +41,30 @@ function getAppId(): string | null {
     return null;
 }
 
-async function execSteamURL(url: string): Promise<void> {
-    await exec(`steam -ifrunning ${url}`);
+export function execSteamURL(url: string) {
+    // This doesn't allow arbitrary execution despite the weird syntax.
+    steamPipeQueue = steamPipeQueue.then(() =>
+        writeFile(
+            join(process.env.HOME || "/home/deck", ".steam", "steam.pipe"),
+            // replace ' to prevent argument injection
+            `'${process.env.HOME}/.local/share/Steam/ubuntu12_32/steam' '-ifrunning' '${url.replaceAll("'", "%27")}'\n`,
+            "utf-8"
+        )
+    );
+}
+
+export function steamOpenURL(url: string) {
+    execSteamURL(`steam://openurl/${url}`);
+}
+
+export async function showGamePage() {
+    const appId = getAppId();
+    if (!appId) return;
+    await execSteamURL(`steam://nav/games/details/${appId}`);
 }
 
 async function showLayout(appId: string) {
-    await execSteamURL(`steam://controllerconfig/${appId}/${layoutId}`);
-    // because the UI doesn't consistently reload after the data for the config has loaded...
-    // HOW HAS NOBODY AT VALVE RUN INTO THIS YET
-    await sleep(100);
-    await execSteamURL(`steam://controllerconfig/${appId}/${layoutId}`);
+    execSteamURL(`steam://controllerconfig/${appId}/${layoutId}`);
 }
 
 export async function askToApplySteamLayout(win: BrowserWindow) {