ulysia/Vencord
1
0
Fork 0
Code Pull requests Activity

Fix DiscordNative.desktopCapture.getDesktopCaptureSources() in electron17+

Browse source
This commit is contained in:
Vendicated 2022-10-01 17:05:18 +02:00
parent be94dbbc6c
commit cac77dce40
No known key found for this signature in database
GPG key ID: EC781ADFB93EFFA3
3 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/ipcMain.ts
View file

@ -2,7 +2,7 @@
import { execFile as cpExecFile } from 'child_process'; import { execFile as cpExecFile } from 'child_process';
import { createHash } from "crypto"; import { createHash } from "crypto";
import { app, BrowserWindow, ipcMain, shell } from "electron"; import { app, BrowserWindow, desktopCapturer, ipcMain, shell } from "electron";
import { createReadStream, mkdirSync, readFileSync, watch } from "fs"; import { createReadStream, mkdirSync, readFileSync, watch } from "fs";
import { open, readFile, writeFile } from "fs/promises"; import { open, readFile, writeFile } from "fs/promises";
import { join } from 'path'; import { join } from 'path';
@ -76,6 +76,7 @@ function serializeErrors(func: (...args: any[]) => any) {
}; };
} }
ipcMain.handle(IpcEvents.GET_DESKTOP_CAPTURE_SOURCES, (_, opts) => desktopCapturer.getSources(opts));
ipcMain.handle(IpcEvents.GET_SETTINGS_DIR, () => SETTINGS_DIR); ipcMain.handle(IpcEvents.GET_SETTINGS_DIR, () => SETTINGS_DIR);
ipcMain.handle(IpcEvents.GET_QUICK_CSS, () => readCss()); ipcMain.handle(IpcEvents.GET_QUICK_CSS, () => readCss());
ipcMain.handle(IpcEvents.OPEN_PATH, (_, ...pathElements) => shell.openPath(join(...pathElements))); ipcMain.handle(IpcEvents.OPEN_PATH, (_, ...pathElements) => shell.openPath(join(...pathElements)));

19
src/preload.ts
View file

@ -1,7 +1,24 @@
import { contextBridge, webFrame } from "electron"; import electron, { contextBridge, webFrame } from "electron";
import { readFileSync } from "fs"; import { readFileSync } from "fs";
import { join } from "path"; import { join } from "path";
import VencordNative from "./VencordNative"; import VencordNative from "./VencordNative";
import { ipcRenderer } from 'electron';
import IpcEvents from "./utils/IpcEvents";
if (electron.desktopCapturer === void 0) {
// Fix for desktopCapturer being main only in Electron 17+
// Discord accesses this in discord_desktop_core (DiscordNative.desktopCapture.getDesktopCaptureSources)
// and errors with cannot "read property getSources() of undefined"
// see discord_desktop_core/app/discord_native/renderer/desktopCapture.js
const electronPath = require.resolve("electron");
delete require.cache[electronPath]!.exports;
require.cache[electronPath]!.exports = {
...electron,
desktopCapturer: {
getSources: (opts) => ipcRenderer.invoke(IpcEvents.GET_DESKTOP_CAPTURE_SOURCES, opts)
}
};
}
contextBridge.exposeInMainWorld("VencordNative", VencordNative); contextBridge.exposeInMainWorld("VencordNative", VencordNative);

3
src/utils/IpcEvents.ts
View file

@ -23,5 +23,6 @@ export default strEnum({
GET_REPO: "VencordGetRepo", GET_REPO: "VencordGetRepo",
GET_HASHES: "VencordGetHashes", GET_HASHES: "VencordGetHashes",
UPDATE: "VencordUpdate", UPDATE: "VencordUpdate",
BUILD: "VencordBuild" BUILD: "VencordBuild",
GET_DESKTOP_CAPTURE_SOURCES: "VencordGetDesktopCaptureSources"
} as const); } as const);