migrate executeJavaScript calls to new command system

src/main/autoStart.ts

@@ -7,6 +7,7 @@
 import { app } from "electron";
 import { existsSync, mkdirSync, renameSync, rmSync, writeFileSync } from "fs";
 import { join } from "path";
+import { stripIndent } from "shared/utils/text";
 
 interface AutoStart {
     isEnabled(): boolean;
@@ -31,15 +32,15 @@ function makeAutoStartLinux(): AutoStart {
     return {
         isEnabled: () => existsSync(file),
         enable() {
-            const desktopFile = `
+            const desktopFile = stripIndent`
-[Desktop Entry]
+                [Desktop Entry]
-Type=Application
+                Type=Application
-Name=Vesktop
+                Name=Vesktop
-Comment=Vesktop autostart script
+                Comment=Vesktop autostart script
-Exec=${commandLine}
+                Exec=${commandLine}
-StartupNotify=false
+                StartupNotify=false
-Terminal=false
+                Terminal=false
-`.trim();
+            `;
 
             mkdirSync(dir, { recursive: true });
             writeFileSync(file, desktopFile);

src/main/screenShare.ts

@@ -6,8 +6,9 @@
 
 import { desktopCapturer, session, Streams } from "electron";
 import type { StreamPick } from "renderer/components/ScreenSharePicker";
-import { IpcEvents } from "shared/IpcEvents";
+import { IpcCommands, IpcEvents } from "shared/IpcEvents";
 
+import { sendRendererCommand } from "./ipcCommands";
 import { handle } from "./utils/ipcWrappers";
 
 const isWayland =
@@ -49,11 +50,11 @@ export function registerScreenShareHandler() {
         if (isWayland) {
             const video = data[0];
             if (video) {
-                const stream = await request
+                const stream = await sendRendererCommand<StreamPick>(IpcCommands.SCREEN_SHARE_PICKER, {
-                    .frame!.executeJavaScript(
+                    screens: [video],
-                        `Vesktop.Components.ScreenShare.openScreenSharePicker(${JSON.stringify([video])},true)`
+                    skipPicker: true
-                    )
+                }).catch(() => null);
-                    .catch(() => null);
+
                 if (stream === null) return callback({});
             }
 
@@ -61,10 +62,10 @@ export function registerScreenShareHandler() {
             return;
         }
 
-        const choice = await request
+        const choice = await sendRendererCommand<StreamPick>(IpcCommands.SCREEN_SHARE_PICKER, {
-            .frame!.executeJavaScript(`Vesktop.Components.ScreenShare.openScreenSharePicker(${JSON.stringify(data)})`)
+            screens: data,
-            .then(e => e as StreamPick)
+            skipPicker: false
-            .catch(e => {
+        }).catch(e => {
             console.error("Error during screenshare picker", e);
             return null;
         });

src/renderer/ipcCommands.ts

@@ -7,6 +7,8 @@
 import { SettingsRouter } from "@vencord/types/webpack/common";
 import { IpcCommands } from "shared/IpcEvents";
 
+import { openScreenSharePicker } from "./components/ScreenSharePicker";
+
 type IpcCommandHandler = (data: any) => any;
 
 const handlers = new Map<string, IpcCommandHandler>();
@@ -46,4 +48,9 @@ export function offIpcCommand(channel: string) {
 onIpcCommand(IpcCommands.NAVIGATE_SETTINGS, () => {
     SettingsRouter.open("My Account");
 });
+
 onIpcCommand(IpcCommands.GET_LANGUAGES, () => navigator.languages);
+
+onIpcCommand(IpcCommands.SCREEN_SHARE_PICKER, data => {
+    openScreenSharePicker(data.screens, data.skipPicker);
+});

src/shared/IpcEvents.ts

@@ -62,6 +62,10 @@ export const enum IpcCommands {
     RPC_ACTIVITY = "rpc:activity",
     RPC_INVITE = "rpc:invite",
     RPC_DEEP_LINK = "rpc:link",
+
     NAVIGATE_SETTINGS = "navigate:settings",
-    GET_LANGUAGES = "navigator.languages"
+
+    GET_LANGUAGES = "navigator.languages",
+
+    SCREEN_SHARE_PICKER = "screenshare:picker"
 }

src/shared/utils/text.ts

@@ -0,0 +1,15 @@
+/*
+ * Vesktop, a desktop app aiming to give you a snappier Discord Experience
+ * Copyright (c) 2025 Vendicated and Vesktop contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+export function stripIndent(strings: TemplateStringsArray, ...values: any[]) {
+    const string = String.raw({ raw: strings }, ...values);
+
+    const match = string.match(/^[ \t]*(?=\S)/gm);
+    if (!match) return string.trim();
+
+    const minIndent = match.reduce((r, a) => Math.min(r, a.length), Infinity);
+    return string.replace(new RegExp(`^[ \\t]{${minIndent}}`, "gm"), "").trim();
+}