Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Toggle voice status using fifo pipe #609

Open
wants to merge 14 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/main/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -74,3 +74,6 @@ export const enum MessageBoxChoice {
Default,
Cancel
}

export const isWayland =
process.platform === "linux" && (process.env.XDG_SESSION_TYPE === "wayland" || !!process.env.WAYLAND_DISPLAY);
80 changes: 80 additions & 0 deletions src/main/keybinds.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
/*
* 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 { spawnSync } from "node:child_process";
import { constants, existsSync, open, unlinkSync } from "node:fs";
import { join } from "node:path";

import { Socket } from "net";
import { IpcEvents } from "shared/IpcEvents";

import { mainWin } from "./mainWindow";

const xdgRuntimeDir = process.env.XDG_RUNTIME_DIR || process.env.TMP || "/tmp";
const socketFile = join(xdgRuntimeDir, "vesktop-ipc");

const Actions = new Set([IpcEvents.TOGGLE_SELF_DEAF, IpcEvents.TOGGLE_SELF_MUTE]);

function createFIFO() {
if (existsSync(socketFile)) {
try {
unlinkSync(socketFile);
} catch (err) {
console.error("Failed to remove existing mkfifo file:", err);
return false;
}
}

try {
spawnSync("mkfifo", [socketFile]);
} catch (err) {
console.error("Failed to create mkfifo while initializing keybinds:", err);
return false;
}
return true;
}

function openFIFO() {
try {
open(socketFile, constants.O_RDONLY | constants.O_NONBLOCK, (err, fd) => {
if (err) {
console.error("Error opening pipe while initializing keybinds:", err);
return;
}

const pipe = new Socket({ fd });
pipe.on("data", data => {
const action = data.toString().trim();
if (Actions.has(action as IpcEvents)) {
mainWin.webContents.send(action);
}
});

pipe.on("end", () => {
pipe.destroy();
openFIFO();
});
});
} catch (err) {
console.error("Can't open socket file.", err);
}
}

function cleanup() {
try {
unlinkSync(socketFile);
} catch (err) {
console.error("Failed to remove mkfifo file:", err);
}
}

process.on("exit", cleanup);

export function initKeybinds() {
if (createFIFO()) {
openFIFO();
}
}
3 changes: 3 additions & 0 deletions src/main/mainWindow.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,13 @@ import {
DATA_DIR,
DEFAULT_HEIGHT,
DEFAULT_WIDTH,
isWayland,
MessageBoxChoice,
MIN_HEIGHT,
MIN_WIDTH,
VENCORD_FILES_DIR
} from "./constants";
import { initKeybinds } from "./keybinds";
import { Settings, State, VencordSettings } from "./settings";
import { createSplashWindow } from "./splash";
import { makeLinksOpenExternally } from "./utils/makeLinksOpenExternally";
Expand Down Expand Up @@ -512,4 +514,5 @@ export async function createWindows() {
});

initArRPC();
if (isWayland) initKeybinds();
}
4 changes: 1 addition & 3 deletions src/main/screenShare.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,9 @@ import { desktopCapturer, session, Streams } from "electron";
import type { StreamPick } from "renderer/components/ScreenSharePicker";
import { IpcEvents } from "shared/IpcEvents";

import { isWayland } from "./constants";
import { handle } from "./utils/ipcWrappers";

const isWayland =
process.platform === "linux" && (process.env.XDG_SESSION_TYPE === "wayland" || !!process.env.WAYLAND_DISPLAY);

export function registerScreenShareHandler() {
handle(IpcEvents.CAPTURER_GET_LARGE_THUMBNAIL, async (_, id: string) => {
const sources = await desktopCapturer.getSources({
Expand Down
8 changes: 8 additions & 0 deletions src/preload/VesktopNative.ts
Original file line number Diff line number Diff line change
Expand Up @@ -78,5 +78,13 @@ export const VesktopNative = {
clipboard: {
copyImage: (imageBuffer: Uint8Array, imageSrc: string) =>
invoke<void>(IpcEvents.CLIPBOARD_COPY_IMAGE, imageBuffer, imageSrc)
},
voice: {
onToggleSelfMute: (listener: (...args: any[]) => void) => {
ipcRenderer.on(IpcEvents.TOGGLE_SELF_MUTE, listener);
},
onToggleSelfDeaf: (listener: (...args: any[]) => void) => {
ipcRenderer.on(IpcEvents.TOGGLE_SELF_DEAF, listener);
}
}
};
6 changes: 6 additions & 0 deletions src/renderer/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,12 @@ VesktopNative.arrpc.onActivity(async data => {
arRPC.handleEvent(new MessageEvent("message", { data }));
});

const VoiceActions = findByPropsLazy("toggleSelfMute");

VesktopNative.voice.onToggleSelfMute(() => VoiceActions.toggleSelfMute());

VesktopNative.voice.onToggleSelfDeaf(() => VoiceActions.toggleSelfDeaf());

// TODO: remove soon
const vencordDir = "vencordDir" as keyof typeof Settings.store;
if (Settings.store[vencordDir]) {
Expand Down
4 changes: 3 additions & 1 deletion src/shared/IpcEvents.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,5 +50,7 @@ export const enum IpcEvents {

ARRPC_ACTIVITY = "VCD_ARRPC_ACTIVITY",

CLIPBOARD_COPY_IMAGE = "VCD_CLIPBOARD_COPY_IMAGE"
CLIPBOARD_COPY_IMAGE = "VCD_CLIPBOARD_COPY_IMAGE",
TOGGLE_SELF_MUTE = "VCD_TOGGLE_SELF_MUTE",
TOGGLE_SELF_DEAF = "VCD_TOGGLE_SELF_DEAF"
}