Merge pull request #4 from sz6084/main

Fixing merge conflict

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -24,6 +24,7 @@ body:
               - Issues with Input Methods[^4]
               - Issues with File Drag and Drop[^5] 
               - Network Errors[^6]
+              - Anything about Screenshare Performance[^7]
 
               Linux users: Please only report issues with supported packages (flatpak and any builds from the README / releases).
               We do not support other packages, like the AUR or Nix packages, so please first make sure your issue is reproducible with official releases,
@@ -36,6 +37,8 @@ body:
               [^4]: These things are handled by Chromium / Electron, not us. If they don't work, it's either an issue with your system or a bug with Chromium.
               [^5]: You are likely using the Vesktop flatpak and trying to drop a file the flatpak can't access. You can fix this by installing Flatseal and using it to grant Vesktop full access to your files
               [^6]: Issue on your end, you have to fix it. Try changing your DNS to [1.1.1.1 (Cloudflare DNS)](https://developers.cloudflare.com/1.1.1.1/setup/)
+              [^7]: Screensharing is managed entirely by Chromium and your System. For optimal performance, make sure you [enable Hardware Acceleration](https://wiki.archlinux.org/title/Chromium#Hardware_video_acceleration).
+                    Depending on GPU driver, it might not be supported. We are actively working on making this work out of the box everywhere.
               
     - type: input
       id: discord

README.md

@@ -53,6 +53,7 @@ Below you can find unofficial packages created by the community. They are not of
 
 - Arch Linux: [Vesktop on the Arch user repository](https://aur.archlinux.org/packages?K=vesktop)
 - NixOS: https://wiki.nixos.org/wiki/Discord#Vesktop
+- Slackware: [Vesktop on the SlackBuilds](https://slackbuilds.org/result/?search=vesktop)
 - Windows - Scoop: https://scoop.sh/#/apps?q=Vesktop
 
 ## Building from Source

package.json

@@ -21,10 +21,12 @@
         "test": "pnpm lint && pnpm testTypes",
         "testTypes": "tsc --noEmit",
         "watch": "pnpm build --watch",
-        "updateMeta": "tsx scripts/utils/updateMeta.mts"
+        "updateMeta": "tsx scripts/utils/updateMeta.mts",
+        "updateArrpcDB": "node ./node_modules/arrpc/update_db.js",
+        "postinstall": "pnpm updateArrpcDB"
     },
     "dependencies": {
-        "arrpc": "github:OpenAsar/arrpc#5aadc307cb9bf4479f0a12364a253b07a77ace22",
+        "arrpc": "github:OpenAsar/arrpc#2234e9c9111f4c42ebcc3aa6a2215bfd979eef77",
         "electron-updater": "^6.3.9"
     },
     "optionalDependencies": {
@@ -32,28 +34,28 @@
     },
     "devDependencies": {
         "@fal-works/esbuild-plugin-global-externals": "^2.1.2",
-        "@stylistic/eslint-plugin": "^2.11.0",
+        "@stylistic/eslint-plugin": "^2.13.0",
-        "@types/node": "^22.10.1",
+        "@types/node": "^22.13.0",
-        "@types/react": "^18.3.12",
+        "@types/react": "^18.3.18",
         "@vencord/types": "^1.8.4",
-        "dotenv": "^16.4.6",
+        "dotenv": "^16.4.7",
-        "electron": "^33.2.1",
+        "electron": "^34.0.2",
         "electron-builder": "^25.1.8",
-        "esbuild": "^0.24.0",
+        "esbuild": "^0.24.2",
-        "eslint": "^9.16.0",
+        "eslint": "^9.19.0",
         "eslint-import-resolver-alias": "^1.1.2",
         "eslint-plugin-path-alias": "^2.1.0",
-        "eslint-plugin-prettier": "^5.2.1",
+        "eslint-plugin-prettier": "^5.2.3",
         "eslint-plugin-simple-header": "^1.2.1",
         "eslint-plugin-simple-import-sort": "^12.1.1",
         "eslint-plugin-unused-imports": "^4.1.4",
-        "prettier": "^3.4.1",
+        "prettier": "^3.4.2",
         "source-map-support": "^0.5.21",
         "tsx": "^4.19.2",
-        "type-fest": "^4.30.0",
+        "type-fest": "^4.33.0",
-        "typescript": "^5.7.2",
+        "typescript": "^5.7.3",
-        "typescript-eslint": "^8.17.0",
+        "typescript-eslint": "^8.22.0",
-        "xml-formatter": "^3.6.3"
+        "xml-formatter": "^3.6.4"
     },
     "packageManager": "pnpm@9.1.0",
     "engines": {

src/main/index.ts

@@ -6,9 +6,9 @@
 
 import "./ipc";
 
-import { join } from "path";
 import { app, BrowserWindow, nativeTheme, net, protocol, session } from "electron";
 import { autoUpdater } from "electron-updater";
+import { join } from "path";
 
 import { DATA_DIR, VESKTOP_SPLASH_DIR } from "./constants";
 import { createFirstLaunchTour } from "./firstLaunch";
@@ -105,15 +105,14 @@ function init() {
             }
             if (otherHandler) {
                 otherHandler({ responseHeaders, resourceType }, callback);
-            }
+            } else {
-            else {
                 callback({ cancel: false, responseHeaders });
             }
         });
         // we need to overwrite onHeadersReceived because normally electron only allows one handler to be active at a time
-        session.defaultSession.webRequest.onHeadersReceived = (handler) => {
+        session.defaultSession.webRequest.onHeadersReceived = handler => {
             otherHandler = handler;
-        }
+        };
 
         bootstrap();
 

src/main/ipc.ts

@@ -7,12 +7,12 @@
 if (process.platform === "linux") import("./venmic");
 
 import { execFile } from "child_process";
-import { app, BrowserWindow, clipboard, dialog, nativeImage, RelaunchOptions, session, shell } from "electron";
-import { mkdirSync, readFileSync, watch, existsSync } from "fs";
-import { open, readFile, copyFile, mkdir, rmdir } from "fs/promises";
-import { release } from "os";
 import { randomBytes } from "crypto";
-import { join, extname } from "path";
+import { app, BrowserWindow, clipboard, dialog, nativeImage, RelaunchOptions, session, shell } from "electron";
+import { existsSync, mkdirSync, readFileSync, watch } from "fs";
+import { copyFile, mkdir, open, readFile, rmdir } from "fs/promises";
+import { release } from "os";
+import { extname, join } from "path";
 import { debounce } from "shared/utils/debounce";
 
 import { IpcEvents } from "../shared/IpcEvents";
@@ -130,9 +130,7 @@ handle(IpcEvents.SELECT_VENCORD_DIR, async (_e, value?: null) => {
 handle(IpcEvents.SELECT_IMAGE_PATH, async () => {
     const res = await dialog.showOpenDialog(mainWin!, {
         properties: ["openFile"],
-        filters: [
+        filters: [{ name: "Images", extensions: ["apng", "avif", "gif", "jpeg", "png", "svg", "webp"] }]
-            {name: "Images", extensions: ["apng", "avif", "gif", "jpeg", "png", "svg", "webp"]}
-        ]
     });
     if (!res.filePaths.length) return "cancelled";
 
@@ -159,6 +157,17 @@ handle(IpcEvents.CLIPBOARD_COPY_IMAGE, async (_, buf: ArrayBuffer, src: string)
     });
 });
 
+function openDebugPage(page: string) {
+    const win = new BrowserWindow({
+        autoHideMenuBar: true
+    });
+
+    win.loadURL(page);
+}
+
+handle(IpcEvents.DEBUG_LAUNCH_GPU, () => openDebugPage("chrome://gpu"));
+handle(IpcEvents.DEBUG_LAUNCH_WEBRTC_INTERNALS, () => openDebugPage("chrome://webrtc-internals"));
+
 function readCss() {
     return readFile(VENCORD_QUICKCSS_FILE, "utf-8").catch(() => "");
 }

src/main/splash.ts

@@ -39,9 +39,8 @@ export function createSplashWindow(startMinimized = false) {
         splash.webContents.executeJavaScript(`
             document.getElementById("animation").src = "splash-animation://img";
         `);
-    }
+    } else {
-    else {
+        splash.webContents.insertCSS(`img {image-rendering: pixelated}`);
-        splash.webContents.insertCSS(`img {image-rendering: pixelated}`)
         splash.webContents.executeJavaScript(`
             document.getElementById("animation").src = "../shiggy.gif";
         `);

src/preload/VesktopNative.ts

@@ -79,5 +79,9 @@ export const VesktopNative = {
     clipboard: {
         copyImage: (imageBuffer: Uint8Array, imageSrc: string) =>
             invoke<void>(IpcEvents.CLIPBOARD_COPY_IMAGE, imageBuffer, imageSrc)
+    },
+    debug: {
+        launchGpu: () => invoke<void>(IpcEvents.DEBUG_LAUNCH_GPU),
+        launchWebrtcInternals: () => invoke<void>(IpcEvents.DEBUG_LAUNCH_WEBRTC_INTERNALS)
     }
 };

src/renderer/components/ScreenSharePicker.tsx

@@ -25,7 +25,7 @@ import { addPatch } from "renderer/patches/shared";
 import { useSettings } from "renderer/settings";
 import { isLinux, isWindows } from "renderer/utils";
 
-const StreamResolutions = ["480", "720", "1080", "1440"] as const;
+const StreamResolutions = ["480", "720", "1080", "1440", "2160"] as const;
 const StreamFps = ["15", "30", "60"] as const;
 
 const MediaEngineStore = findStoreLazy("MediaEngineStore");

src/renderer/components/settings/CustomSplashAnimation.tsx

@@ -11,14 +11,15 @@ import { SettingsComponent } from "./Settings";
 export const CustomSplashAnimation: SettingsComponent = ({ settings }) => {
     return (
         <>
-        
             <Forms.FormText>
                 {settings.splashAnimationPath ? (
-                <div style={{
+                    <div
+                        style={{
                             display: "flex",
                             alignItems: "center",
                             gap: "16px"
-                }}>
+                        }}
+                    >
                         {/* adding the Math.random() here ensures that a new image is fetched when the user changes the path */}
                         <img src={"splash-animation:///" + Math.random()} width="64px" height="64px"></img>
                         <p>The custom splash animation is enabled.</p>
@@ -27,7 +28,7 @@ export const CustomSplashAnimation: SettingsComponent = ({ settings }) => {
                     "A custom splash animation is not set."
                 )}
             </Forms.FormText>
-        <div className="vcd-location-btns" style={{marginBottom: 20}}>
+            <div className="vcd-settings-button-grid" style={{ marginBottom: 20 }}>
                 <Button
                     size={Button.Sizes.SMALL}
                     onClick={async () => {
@@ -43,13 +44,12 @@ export const CustomSplashAnimation: SettingsComponent = ({ settings }) => {
                     color={Button.Colors.RED}
                     onClick={() => {
                         // todo: delete the image after resetting the path?
-                    settings.splashAnimationPath = undefined
+                        settings.splashAnimationPath = undefined;
                     }}
                 >
                     Reset
                 </Button>
             </div>
-            
         </>
     );
 };

src/renderer/components/settings/DeveloperOptions.tsx

@@ -4,12 +4,56 @@
  * Copyright (c) 2023 Vendicated and Vencord contributors
  */
 
-import { useForceUpdater } from "@vencord/types/utils";
+import {
-import { Button, Forms, Toasts } from "@vencord/types/webpack/common";
+    Margins,
+    ModalCloseButton,
+    ModalContent,
+    ModalHeader,
+    ModalRoot,
+    ModalSize,
+    openModal,
+    useForceUpdater
+} from "@vencord/types/utils";
+import { Button, Forms, Text, Toasts } from "@vencord/types/webpack/common";
+import { Settings } from "shared/settings";
 
 import { SettingsComponent } from "./Settings";
 
-export const VencordLocationPicker: SettingsComponent = ({ settings }) => {
+export const DeveloperOptionsButton: SettingsComponent = ({ settings }) => {
+    return <Button onClick={() => openDeveloperOptionsModal(settings)}>Open Developer Settings</Button>;
+};
+
+function openDeveloperOptionsModal(settings: Settings) {
+    openModal(props => (
+        <ModalRoot {...props} size={ModalSize.MEDIUM}>
+            <ModalHeader>
+                <Text variant="heading-lg/semibold" style={{ flexGrow: 1 }}>
+                    Vesktop Developer Options
+                </Text>
+                <ModalCloseButton onClick={props.onClose} />
+            </ModalHeader>
+
+            <ModalContent>
+                <div style={{ padding: "1em 0" }}>
+                    <Forms.FormTitle tag="h5">Vencord Location</Forms.FormTitle>
+                    <VencordLocationPicker settings={settings} />
+
+                    <Forms.FormTitle tag="h5" className={Margins.top16}>
+                        Debugging
+                    </Forms.FormTitle>
+                    <div className="vcd-settings-button-grid">
+                        <Button onClick={() => VesktopNative.debug.launchGpu()}>Open chrome://gpu</Button>
+                        <Button onClick={() => VesktopNative.debug.launchWebrtcInternals()}>
+                            Open chrome://webrtc-internals
+                        </Button>
+                    </div>
+                </div>
+            </ModalContent>
+        </ModalRoot>
+    ));
+}
+
+const VencordLocationPicker: SettingsComponent = ({ settings }) => {
     const forceUpdate = useForceUpdater();
     const vencordDir = VesktopNative.fileManager.getVencordDir();
 
@@ -31,7 +75,7 @@ export const VencordLocationPicker: SettingsComponent = ({ settings }) => {
                     "the default location"
                 )}
             </Forms.FormText>
-            <div className="vcd-location-btns">
+            <div className="vcd-settings-button-grid">
                 <Button
                     size={Button.Sizes.SMALL}
                     onClick={async () => {

src/renderer/components/settings/Settings.tsx

@@ -12,11 +12,11 @@ import { Settings, useSettings } from "renderer/settings";
 import { isMac, isWindows } from "renderer/utils";
 
 import { AutoStartToggle } from "./AutoStartToggle";
+import { CustomSplashAnimation } from "./CustomSplashAnimation";
+import { DeveloperOptionsButton } from "./DeveloperOptions";
 import { DiscordBranchPicker } from "./DiscordBranchPicker";
 import { NotificationBadgeToggle } from "./NotificationBadgeToggle";
-import { VencordLocationPicker } from "./VencordLocationPicker";
 import { WindowsTransparencyControls } from "./WindowsTransparencyControls";
-import { CustomSplashAnimation } from "./CustomSplashAnimation";
 
 interface BooleanSetting {
     key: keyof typeof Settings.store;
@@ -120,7 +120,7 @@ const SettingsOptions: Record<string, Array<BooleanSetting | SettingsComponent>>
         }
     ],
     "Custom Splash Animation": [CustomSplashAnimation],
-    "Vencord Location": [VencordLocationPicker]
+    "Developer Options": [DeveloperOptionsButton]
 };
 
 function SettingsSections() {

src/renderer/components/settings/settings.css

@@ -1,4 +1,4 @@
-.vcd-location-btns {
+.vcd-settings-button-grid {
     display: grid;
     grid-template-columns: 1fr 1fr;
     gap: 0.5em;

src/shared/IpcEvents.ts

@@ -51,5 +51,8 @@ export const enum IpcEvents {
 
     ARRPC_ACTIVITY = "VCD_ARRPC_ACTIVITY",
 
-    CLIPBOARD_COPY_IMAGE = "VCD_CLIPBOARD_COPY_IMAGE"
+    CLIPBOARD_COPY_IMAGE = "VCD_CLIPBOARD_COPY_IMAGE",
+
+    DEBUG_LAUNCH_GPU = "VCD_DEBUG_LAUNCH_GPU",
+    DEBUG_LAUNCH_WEBRTC_INTERNALS = "VCD_DEBUG_LAUNCH_WEBRTC"
 }