devproje/project-client
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

arrpc: migrate from websocket + plugin to electron ipc

Browse source
This commit is contained in:
Vendicated 2023-10-13 04:00:28 +02:00
parent bf47918de0
commit 44aa861359
No known key found for this signature in database
GPG key ID: D66986BAF75ECF18
4 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/arrpc.ts
View file

@ -5,6 +5,7 @@
*/ */
import Server from "arrpc"; import Server from "arrpc";
import { IpcEvents } from "shared/IpcEvents";
import { mainWin } from "./mainWindow"; import { mainWin } from "./mainWindow";
import { Settings } from "./settings"; import { Settings } from "./settings";
@ -17,11 +18,8 @@ export async function initArRPC() {
if (server || !Settings.store.arRPC) return; if (server || !Settings.store.arRPC) return;
try { try {
// This module starts a server as a side effect, so it needs to be lazy imported
const { send: sendToBridge } = await import("arrpc/src/bridge");
server = await new Server(); server = await new Server();
server.on("activity", sendToBridge); server.on("activity", (data: any) => mainWin.webContents.send(IpcEvents.ARRPC_ACTIVITY, JSON.stringify(data)));
server.on("invite", (invite: string, callback: (valid: boolean) => void) => { server.on("invite", (invite: string, callback: (valid: boolean) => void) => {
invite = String(invite); invite = String(invite);
if (!inviteCodeRegex.test(invite)) return callback(false); if (!inviteCodeRegex.test(invite)) return callback(false);

5
src/preload/VesktopNative.ts
View file

@ -65,5 +65,10 @@ export const VesktopNative = {
list: () => invoke<string[] | null>(IpcEvents.VIRT_MIC_LIST), list: () => invoke<string[] | null>(IpcEvents.VIRT_MIC_LIST),
start: (target: string) => invoke<void>(IpcEvents.VIRT_MIC_START, target), start: (target: string) => invoke<void>(IpcEvents.VIRT_MIC_START, target),
kill: () => invoke<void>(IpcEvents.VIRT_MIC_KILL) kill: () => invoke<void>(IpcEvents.VIRT_MIC_KILL)
},
arrpc: {
onActivity(cb: (data: string) => void) {
ipcRenderer.on(IpcEvents.ARRPC_ACTIVITY, (_, data: string) => cb(data));
}
} }
}; };

14
src/renderer/index.ts
View file

@ -47,14 +47,12 @@ customSettingsSections.push(() => ({
className: "vc-vesktop-settings" className: "vc-vesktop-settings"
})); }));
const arRPC = Vencord.Plugins.plugins["WebRichPresence (arRPC)"]; const arRPC = Vencord.Plugins.plugins["WebRichPresence (arRPC)"] as any as {
handleEvent(e: MessageEvent): void;
};
arRPC.required = !!Settings.store.arRPC; VesktopNative.arrpc.onActivity(data => {
if (!Settings.store.arRPC) return;
Settings.addChangeListener("arRPC", v => { arRPC.handleEvent(new MessageEvent("message", { data }));
arRPC.required = !!v;
if (v && !arRPC.started) Vencord.Plugins.startPlugin(arRPC);
else if (arRPC.started) {
Vencord.Plugins.stopPlugin(arRPC);
}
}); });

4
src/shared/IpcEvents.ts
View file

@ -44,5 +44,7 @@ export const enum IpcEvents {
VIRT_MIC_LIST = "VCD_VIRT_MIC_LIST", VIRT_MIC_LIST = "VCD_VIRT_MIC_LIST",
VIRT_MIC_START = "VCD_VIRT_MIC_START", VIRT_MIC_START = "VCD_VIRT_MIC_START",
VIRT_MIC_KILL = "VCD_VIRT_MIC_STOP" VIRT_MIC_KILL = "VCD_VIRT_MIC_STOP",
ARRPC_ACTIVITY = "VCD_ARRPC_ACTIVITY"
} }