fix ci part 2

Co-authored-by: V <vendicated@riseup.net>

.github/workflows/release.yml

@@ -12,17 +12,32 @@ jobs:
         strategy:
             matrix:
                 os: [macos-latest, ubuntu-latest, windows-latest]
+                include:
+                    - os: macos-latest
+                      platform: mac
+                    - os: ubuntu-latest
+                      platform: linux
+                    - os: windows-latest
+                      platform: windows
 
         steps:
-            - name: Check out Git repository
-              uses: actions/checkout@v3
+            - uses: actions/checkout@v3
+            - uses: pnpm/action-setup@v2 # Install pnpm using packageManager key in package.json
 
-            - uses: actions/setup-node@v3
+            - name: Use Node.js 18
+              uses: actions/setup-node@v3
               with:
                   node-version: 18
+                  cache: "pnpm"
+
+            - name: Install dependencies
+              run: pnpm install --frozen-lockfile
+
+            - name: Build
+              run: pnpm build
 
             - name: Run Electron Builder
-              uses: samuelmeuli/action-electron-builder@e4b12cd06ddf023422f1ac4e39632bd76f6e6928
-              with:
-                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-                  RELEASE: true
+              run: |
+                  pnpm electron-builder --${{ matrix.platform }} --publish always
+              env:
+                  GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

README.md

@@ -7,7 +7,9 @@ Vesktop is a cross platform desktop app aiming to give you a snappier Discord ex
 
 Bug reports, feature requests & contributions are highly appreciated!!
 
-![image](https://user-images.githubusercontent.com/45497981/235024615-94565eaf-f412-4384-a3f5-d8cde7458f6d.png)
+![](https://github.com/Vencord/Vesktop/assets/45497981/8608a899-96a9-4027-9725-2cb02ba189fd)
+![grafik](https://github.com/Vencord/Vesktop/assets/45497981/8701e5de-52c4-4346-a990-719cb971642e)
+
 
 ## Installing
 

package.json

@@ -1,6 +1,6 @@
 {
     "name": "VencordDesktop",
-    "version": "0.4.2",
+    "version": "0.4.4",
     "private": true,
     "description": "",
     "keywords": [],
@@ -23,23 +23,23 @@
         "watch": "pnpm build --watch"
     },
     "dependencies": {
-        "arrpc": "github:OpenAsar/arrpc#89f4da610ccfac93f461826a446a17cd3b23953d"
+        "arrpc": "github:OpenAsar/arrpc#3e22fd776273afaa4a80c51deb86077ffdd4d2ae"
     },
     "optionalDependencies": {
-        "@vencord/venmic": "^1.6.0"
+        "@vencord/venmic": "^2.1.3"
     },
     "devDependencies": {
         "@fal-works/esbuild-plugin-global-externals": "^2.1.2",
-        "@types/node": "^20.8.4",
-        "@types/react": "^18.2.28",
-        "@typescript-eslint/eslint-plugin": "^6.7.5",
-        "@typescript-eslint/parser": "^6.7.5",
+        "@types/node": "^20.10.0",
+        "@types/react": "^18.2.39",
+        "@typescript-eslint/eslint-plugin": "^6.13.1",
+        "@typescript-eslint/parser": "^6.13.1",
         "@vencord/types": "^0.1.2",
         "dotenv": "^16.3.1",
-        "electron": "^27.0.0",
-        "electron-builder": "^24.6.4",
-        "esbuild": "^0.19.4",
-        "eslint": "^8.51.0",
+        "electron": "^27.1.2",
+        "electron-builder": "^24.9.1",
+        "esbuild": "^0.19.8",
+        "eslint": "^8.54.0",
         "eslint-config-prettier": "^9.0.0",
         "eslint-import-resolver-alias": "^1.1.2",
         "eslint-plugin-license-header": "^0.6.0",
@@ -47,13 +47,13 @@
         "eslint-plugin-prettier": "^5.0.1",
         "eslint-plugin-simple-import-sort": "^10.0.0",
         "eslint-plugin-unused-imports": "^3.0.0",
-        "prettier": "^3.0.3",
+        "prettier": "^3.1.0",
         "source-map-support": "^0.5.21",
-        "tsx": "^3.13.0",
-        "type-fest": "^4.4.0",
-        "typescript": "^5.2.2"
+        "tsx": "^4.6.0",
+        "type-fest": "^4.8.2",
+        "typescript": "^5.3.2"
     },
-    "packageManager": "pnpm@8.6.11",
+    "packageManager": "pnpm@8.11.0",
     "engines": {
         "node": ">=18",
         "pnpm": ">=8"
@@ -68,6 +68,7 @@
             "package.json",
             "LICENSE"
         ],
+        "beforePack": "scripts/build/sandboxFix.js",
         "linux": {
             "icon": "build/icon.icns",
             "category": "Network",
@@ -108,7 +109,6 @@
                 "Type": "Application",
                 "Categories": "Network;InstantMessaging;Chat;",
                 "Keywords": "discord;vencord;electron;chat;",
-                "WMClass": "VencordDesktop",
                 "StartupWMClass": "VencordDesktop"
             }
         },

scripts/build/build.mts

@@ -78,8 +78,6 @@ await Promise.all([
         inject: ["./scripts/build/injectReact.mjs"],
         jsxFactory: "VencordCreateElement",
         jsxFragment: "VencordFragment",
-        // Work around https://github.com/evanw/esbuild/issues/2460
-        tsconfig: "./scripts/build/tsconfig.esbuild.json",
         external: ["@vencord/types/*"],
         plugins: [vencordDep],
         footer: { js: "//# sourceURL=VCDRenderer" }

scripts/build/sandboxFix.js

@@ -0,0 +1,74 @@
+/*
+ * SPDX-License-Identifier: GPL-3.0
+ * Vesktop, a desktop app aiming to give you a snappier Discord Experience
+ * Copyright (c) 2023 Vendicated and Vencord contributors
+ */
+
+// Based on https://github.com/gergof/electron-builder-sandbox-fix/blob/master/lib/index.js
+
+const fs = require("fs/promises");
+const path = require("path");
+let isApplied = false;
+
+const hook = async () => {
+    if (isApplied) return;
+    isApplied = true;
+    if (process.platform !== "linux") {
+        // this fix is only required on linux
+        return;
+    }
+    const AppImageTarget = require("app-builder-lib/out/targets/AppImageTarget");
+    const oldBuildMethod = AppImageTarget.default.prototype.build;
+    AppImageTarget.default.prototype.build = async function (...args) {
+        console.log("Running AppImage builder hook", args);
+        const oldPath = args[0];
+        const newPath = oldPath + "-appimage-sandbox-fix";
+        // just in case
+        try {
+            await fs.rm(newPath, {
+                recursive: true
+            });
+        } catch {}
+
+        console.log("Copying to apply appimage fix", oldPath, newPath);
+        await fs.cp(oldPath, newPath, {
+            recursive: true
+        });
+        args[0] = newPath;
+
+        const executable = path.join(newPath, this.packager.executableName);
+
+        const loaderScript = `
+#!/usr/bin/env bash
+
+SCRIPT_DIR="$( cd "$( dirname "\${BASH_SOURCE[0]}" )" && pwd )"
+IS_STEAMOS=0
+
+if [[ "$SteamOS" == "1" && "$SteamGamepadUI" == "1" ]]; then
+    echo "Running Vesktop on SteamOS, disabling sandbox"
+    IS_STEAMOS=1
+fi
+
+exec "$SCRIPT_DIR/${this.packager.executableName}.bin" "$([ "$IS_STEAMOS" == 1 ] && echo '--no-sandbox')" "$@"
+                `.trim();
+
+        try {
+            await fs.rename(executable, executable + ".bin");
+            await fs.writeFile(executable, loaderScript);
+            await fs.chmod(executable, 0o755);
+        } catch (e) {
+            console.error("failed to create loder for sandbox fix: " + e.message);
+            throw new Error("Failed to create loader for sandbox fix");
+        }
+
+        const ret = await oldBuildMethod.apply(this, args);
+
+        await fs.rm(newPath, {
+            recursive: true
+        });
+
+        return ret;
+    };
+};
+
+module.exports = hook;

scripts/build/tsconfig.esbuild.json

@@ -1,7 +0,0 @@
-// Work around https://github.com/evanw/esbuild/issues/2460
-{
-    "extends": "../../tsconfig.json",
-    "compilerOptions": {
-        "jsx": "react"
-    }
-}

src/main/constants.ts

@@ -34,3 +34,8 @@ const UserAgents = {
 };
 
 export const UserAgent = UserAgents[process.platform] || UserAgents.windows;
+
+export const enum MessageBoxChoice {
+    Default,
+    Cancel
+}

src/main/index.ts

@@ -24,6 +24,12 @@ if (IS_DEV) {
 process.env.VENCORD_USER_DATA_DIR = DATA_DIR;
 
 function init() {
+    const { disableSmoothScroll } = Settings.store;
+
+    if (disableSmoothScroll) {
+        app.commandLine.appendSwitch("disable-smooth-scrolling");
+    }
+
     // work around chrome 66 disabling autoplay by default
     app.commandLine.appendSwitch("autoplay-policy", "no-user-gesture-required");
 

src/main/mainWindow.ts

@@ -28,6 +28,7 @@ import {
     DATA_DIR,
     DEFAULT_HEIGHT,
     DEFAULT_WIDTH,
+    MessageBoxChoice,
     MIN_HEIGHT,
     MIN_WIDTH,
     UserAgent,
@@ -36,11 +37,14 @@ import {
 import { Settings, VencordSettings } from "./settings";
 import { createSplashWindow } from "./splash";
 import { makeLinksOpenExternally } from "./utils/makeLinksOpenExternally";
+import { applyDeckKeyboardFix, askToApplySteamLayout, isDeckGameMode } from "./utils/steamOS";
 import { downloadVencordFiles, ensureVencordFiles } from "./utils/vencordLoader";
 
 let isQuitting = false;
 let tray: Tray;
 
+applyDeckKeyboardFix();
+
 app.on("before-quit", () => {
     isQuitting = true;
 });
@@ -128,11 +132,6 @@ function initTray(win: BrowserWindow) {
     });
 }
 
-const enum MessageBoxChoice {
-    Default,
-    Cancel
-}
-
 async function clearData(win: BrowserWindow) {
     const { response } = await dialog.showMessageBox(win, {
         message: "Are you sure you want to reset Vesktop?",
@@ -266,6 +265,9 @@ function initMenuBar(win: BrowserWindow) {
 }
 
 function getWindowBoundsOptions(): BrowserWindowConstructorOptions {
+    // We want the default window behaivour to apply in game mode since it expects everything to be fullscreen and maximized.
+    if (isDeckGameMode) return {};
+
     const { x, y, width, height } = Settings.store.windowBounds ?? {};
 
     const options = {
@@ -288,7 +290,8 @@ function getWindowBoundsOptions(): BrowserWindowConstructorOptions {
 
 function getDarwinOptions(): BrowserWindowConstructorOptions {
     const options = {
-        titleBarStyle: "hiddenInset"
+        titleBarStyle: "hidden",
+        trafficLightPosition: { x: 10, y: 10 }
     } as BrowserWindowConstructorOptions;
 
     const { splashTheming, splashBackground } = Settings.store;
@@ -404,7 +407,7 @@ function createMainWindow() {
     win.setMenuBarVisibility(false);
 
     win.on("close", e => {
-        const useTray = Settings.store.minimizeToTray !== false && Settings.store.tray !== false;
+        const useTray = !isDeckGameMode && Settings.store.minimizeToTray !== false && Settings.store.tray !== false;
         if (isQuitting || (process.platform !== "darwin" && !useTray)) return;
 
         e.preventDefault();
@@ -418,7 +421,7 @@ function createMainWindow() {
     if (Settings.store.staticTitle) win.on("page-title-updated", e => e.preventDefault());
 
     initWindowBoundsListeners(win);
-    if ((Settings.store.tray ?? true) && process.platform !== "darwin") initTray(win);
+    if (!isDeckGameMode && (Settings.store.tray ?? true) && process.platform !== "darwin") initTray(win);
     initMenuBar(win);
     makeLinksOpenExternally(win);
     initSettingsListeners(win);
@@ -440,19 +443,27 @@ const runVencordMain = once(() => require(join(VENCORD_FILES_DIR, "vencordDeskto
 
 export async function createWindows() {
     const splash = createSplashWindow();
-
+    // SteamOS letterboxes and scales it terribly, so just full screen it
+    if (isDeckGameMode) splash.setFullScreen(true);
     await ensureVencordFiles();
     runVencordMain();
 
     mainWin = createMainWindow();
 
-    mainWin.once("ready-to-show", () => {
+    mainWin.webContents.on("did-finish-load", () => {
         splash.destroy();
         mainWin!.show();
 
-        if (Settings.store.maximized) {
+        if (Settings.store.maximized && !isDeckGameMode) {
             mainWin!.maximize();
         }
+
+        if (isDeckGameMode) {
+            // always use entire display
+            mainWin!.setFullScreen(true);
+
+            askToApplySteamLayout(mainWin);
+        }
     });
 
     initArRPC();

src/main/utils/steamOS.ts

@@ -0,0 +1,84 @@
+/*
+ * SPDX-License-Identifier: GPL-3.0
+ * Vesktop, a desktop app aiming to give you a snappier Discord Experience
+ * 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 { 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]*$/;
+
+export const isDeckGameMode = process.env.SteamOS === "1" && process.env.SteamGamepadUI === "1";
+
+export function applyDeckKeyboardFix() {
+    if (!isDeckGameMode) return;
+    // Prevent constant virtual keyboard spam that eventually crashes Steam.
+    process.env.GTK_IM_MODULE = "None";
+}
+
+// For some reason SteamAppId is always 0 for non-steam apps so we do this insanity instead.
+function getAppId(): string | null {
+    // /home/deck/.local/share/Steam/steamapps/shadercache/APPID/fozmediav1
+    const path = process.env.STEAM_COMPAT_MEDIA_PATH;
+    if (!path) return null;
+    const pathElems = path?.split("/");
+    const appId = pathElems[pathElems.length - 2];
+    if (appId.match(numberRegex)) {
+        console.log(`Got Steam App ID ${appId}`);
+        return appId;
+    }
+    return null;
+}
+
+async function execSteamURL(url: string): Promise<void> {
+    await exec(`steam -ifrunning ${url}`);
+}
+
+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}`);
+}
+
+export async function askToApplySteamLayout(win: BrowserWindow) {
+    const appId = getAppId();
+    if (!appId) return;
+    if (Settings.store.steamOSLayoutVersion === layoutVersion) return;
+    const update = Boolean(Settings.store.steamOSLayoutVersion);
+
+    // Touch screen breaks in some menus when native touch mode is enabled on latest SteamOS beta, remove most of the update specific text once that's fixed.
+    const { response } = await dialog.showMessageBox(win, {
+        message: `${update ? "Update" : "Apply"} Vesktop Steam Input Layout?`,
+        detail: `Would you like to ${update ? "Update" : "Apply"} Vesktop's recommended Steam Deck controller settings?
+${update ? "Click yes using the touchpad" : "Tap yes"}, then press the X button or tap Apply Layout to confirm.${
+            update ? " Doing so will undo any customizations you have made." : ""
+        }
+${update ? "Click" : "Tap"} no to keep your current layout.`,
+        buttons: ["Yes", "No"],
+        cancelId: MessageBoxChoice.Cancel,
+        defaultId: MessageBoxChoice.Default,
+        type: "question"
+    });
+
+    if (Settings.store.steamOSLayoutVersion !== layoutVersion) {
+        Settings.store.steamOSLayoutVersion = layoutVersion;
+    }
+
+    if (response === MessageBoxChoice.Cancel) return;
+
+    await showLayout(appId);
+}

src/main/virtmic.ts

@@ -53,10 +53,9 @@ ipcMain.handle(IpcEvents.VIRT_MIC_LIST, () => {
 
 ipcMain.handle(
     IpcEvents.VIRT_MIC_START,
-    (_, target: string) =>
+    (_, targets: string[]) =>
         obtainVenmic()?.link({
-            key: "application.name",
-            value: target,
+            props: targets.map(target => ({ key: "application.name", value: target })),
             mode: "include"
         })
 );
@@ -65,8 +64,12 @@ ipcMain.handle(
     IpcEvents.VIRT_MIC_START_SYSTEM,
     () =>
         obtainVenmic()?.link({
-            key: "application.process.id",
-            value: getRendererAudioServicePid(),
+            props: [
+                {
+                    key: "application.process.id",
+                    value: getRendererAudioServicePid()
+                }
+            ],
             mode: "exclude"
         })
 );

src/preload/VesktopNative.ts

@@ -63,7 +63,7 @@ export const VesktopNative = {
     virtmic: {
         list: () =>
             invoke<{ ok: false; isGlibcxxToOld: boolean } | { ok: true; targets: string[] }>(IpcEvents.VIRT_MIC_LIST),
-        start: (target: string) => invoke<void>(IpcEvents.VIRT_MIC_START, target),
+        start: (targets: string[]) => invoke<void>(IpcEvents.VIRT_MIC_START, targets),
         startSystem: () => invoke<void>(IpcEvents.VIRT_MIC_START_SYSTEM),
         stop: () => invoke<void>(IpcEvents.VIRT_MIC_STOP)
     },

src/renderer/components/ScreenSharePicker.tsx

@@ -106,7 +106,7 @@ export function openScreenSharePicker(screens: Source[], skipPicker: boolean) {
                             if (v.audioSource === "Entire System") {
                                 await VesktopNative.virtmic.startSystem();
                             } else {
-                                await VesktopNative.virtmic.start(v.audioSource);
+                                await VesktopNative.virtmic.start([v.audioSource]);
                             }
                         }
                         resolve(v);

src/renderer/components/Settings.tsx

@@ -42,6 +42,7 @@ export default function SettingsUi() {
         ],
         ["staticTitle", "Static Title", 'Makes the window title "Vesktop" instead of changing to the current page'],
         ["enableMenu", "Enable Menu Bar", "Enables the application menu bar. Press ALT to toggle visibility."],
+        ["disableSmoothScroll", "Disable smooth scrolling", "Disables smooth scrolling in Vesktop", false],
         ["splashTheming", "Splash theming", "Adapt the splash window colors to your custom theme", false],
         [
             "openLinksWithElectron",

src/shared/settings.d.ts

@@ -15,6 +15,7 @@ export interface Settings {
     openLinksWithElectron?: boolean;
     staticTitle?: boolean;
     enableMenu?: boolean;
+    disableSmoothScroll?: boolean;
     arRPC?: boolean;
     appBadge?: boolean;
     discordWindowsTitleBar?: boolean;
@@ -31,4 +32,6 @@ export interface Settings {
     splashTheming?: boolean;
     splashColor?: string;
     splashBackground?: string;
+
+    steamOSLayoutVersion?: number;
 }

src/shared/utils/SettingsStore.ts

@@ -12,8 +12,8 @@ type ResolvePropDeep<T, P> = P extends `${infer Pre}.${infer Suf}`
         ? ResolvePropDeep<T[Pre], Suf>
         : any
     : P extends keyof T
-    ? T[P]
-    : any;
+      ? T[P]
+      : any;
 
 /**
  * The SettingsStore allows you to easily create a mutable store that

src/shared/utils/sleep.ts

@@ -0,0 +1,9 @@
+/*
+ * SPDX-License-Identifier: GPL-3.0
+ * Vesktop, a desktop app aiming to give you a snappier Discord Experience
+ * Copyright (c) 2023 Vendicated and Vencord contributors
+ */
+
+export function sleep(ms: number): Promise<void> {
+    return new Promise(r => setTimeout(r, ms));
+}

static/views/splash.html

@@ -24,6 +24,7 @@
         img {
             width: 6em;
             height: 6em;
+            image-rendering: pixelated;
         }
     </style>
 </head>