fix(linux): add X11 audio picker support and fix null track handling

- Show audio picker for Linux X11 path (Wayland already handled in electron-main.ts)
- Fix potential crash when audioTrack is undefined before addTrack()
- Extract shared AudioSelection and VenmicListResult types to @types/audio-sharing.d.ts
- Reduce logging verbosity by using console.debug for operational messages

Author: JoaoCostaIFG

src/@types/audio-sharing.d.ts

@@ -0,0 +1,19 @@
+/*
+Copyright 2025 New Vector Ltd.
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import type { Node } from "@vencord/venmic";
+
+/** User's audio source selection from the audio picker. */
+export interface AudioSelection {
+    type: "none" | "system" | "app";
+    node?: Node;
+}
+
+/** Result of listing available venmic audio nodes. */
+export type VenmicListResult =
+    | { ok: true; targets: Node[]; hasPipewirePulse: boolean }
+    | { ok: false; isGlibcOutdated: boolean };

src/audio-picker-preload.cts

@@ -10,18 +10,7 @@ Please see LICENSE files in the repository root for full details.
 
 import { contextBridge, ipcRenderer } from "electron";
 
-import type { Node } from "@vencord/venmic";
-
-export interface AudioSelection {
-    type: "none" | "system" | "app";
-    node?: Node;
-}
-
-export interface VenmicListResult {
-    ok: true;
-    targets: Node[];
-    hasPipewirePulse: boolean;
-}
+import type { AudioSelection, VenmicListResult } from "./@types/audio-sharing.js" with { "resolution-mode": "import" };
 
 contextBridge.exposeInMainWorld("audioPickerAPI", {
     /**

src/audio-picker.ts

@@ -10,14 +10,10 @@ import { existsSync } from "node:fs";
 import { dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
 
-import type { Node } from "@vencord/venmic";
-import {
-    type VenmicListResult,
-    listVenmicNodes,
-    startVenmicDirect,
-    startVenmicSystemDirect,
-    stopVenmicDirect,
-} from "./venmic.js";
+import type { AudioSelection, VenmicListResult } from "./@types/audio-sharing.js";
+import { listVenmicNodes, startVenmicDirect, startVenmicSystemDirect, stopVenmicDirect } from "./venmic.js";
+
+export type { AudioSelection };
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 
@@ -46,11 +42,6 @@ function getAudioPickerHtmlPath(): string {
     return candidates[0];
 }
 
-export interface AudioSelection {
-    type: "none" | "system" | "app";
-    node?: Node;
-}
-
 /**
  * Shows a native dialog for selecting audio sources to share.
  * Returns the user's selection or "none" if cancelled.

src/ipc.ts

@@ -148,11 +148,19 @@ ipcMain.on("ipcCall", async function (_ev: IpcMainEvent, payload) {
             }));
             break;
         case "callDisplayMediaCallback": {
-            const shouldIncludeAudio = getAudioRequested() && process.platform === "win32";
+            const audioRequested = getAudioRequested();
             const callback = getDisplayMediaCallback();
             setDisplayMediaCallback(null);
             setAudioRequested(false);
-            if (shouldIncludeAudio) {
+
+            // Show audio picker for Linux (X11 path - Wayland is handled in electron-main.ts)
+            if (audioRequested && process.platform === "linux" && global.mainWindow) {
+                const { showAudioPickerAndStart } = await import("./audio-picker.js");
+                await showAudioPickerAndStart(global.mainWindow);
+            }
+
+            // Include loopback audio for Windows
+            if (audioRequested && process.platform === "win32") {
                 await callback?.({ video: args[0], audio: "loopback" });
             } else {
                 await callback?.({ video: args[0] });

src/preload.cts

@@ -118,10 +118,10 @@ if (process.platform === "linux") {
     navigator.mediaDevices.getDisplayMedia = async function (
         options?: DisplayMediaStreamOptions,
     ): Promise<MediaStream> {
-        console.log("venmic: getDisplayMedia called with options:", options);
+        console.debug("venmic: getDisplayMedia called with options:", options);
 
         const stream = await originalGetDisplayMedia(options);
-        console.log(
+        console.debug(
             "venmic: original getDisplayMedia returned stream with tracks:",
             stream.getTracks().map((t) => `${t.kind}:${t.label}`),
         );
@@ -130,15 +130,15 @@ if (process.platform === "linux") {
         try {
             const devices = await navigator.mediaDevices.enumerateDevices();
             const audioInputs = devices.filter((d) => d.kind === "audioinput");
-            console.log(
+            console.debug(
                 "venmic: available audio input devices:",
                 audioInputs.map((d) => `${d.label} (${d.deviceId.slice(0, 8)}...)`),
             );
 
             const venmicDevice = devices.find((d) => d.label === "vencord-screen-share");
 
             if (venmicDevice) {
-                console.log("venmic: found vencord-screen-share device:", venmicDevice.deviceId);
+                console.debug("venmic: found vencord-screen-share device:", venmicDevice.deviceId);
 
                 // Capture audio from the venmic virtual microphone
                 const audioStream = await navigator.mediaDevices.getUserMedia({
@@ -153,40 +153,44 @@ if (process.platform === "linux") {
                     },
                 });
 
-                console.log("venmic: captured audio stream from virtual mic");
+                console.debug("venmic: captured audio stream from virtual mic");
 
                 // Remove any existing audio tracks and add the venmic audio
-                stream.getAudioTracks().forEach((track) => {
-                    console.log("venmic: removing existing audio track:", track.label);
-                    stream.removeTrack(track);
-                });
                 const audioTrack = audioStream.getAudioTracks()[0];
-                stream.addTrack(audioTrack);
-
-                // Clean up venmic when the audio track ends
-                audioTrack.addEventListener("ended", () => {
-                    console.log("venmic: audio track ended, stopping venmic");
-                    void ipcRenderer.invoke("stopVenmic");
-                });
+                if (audioTrack) {
+                    stream.getAudioTracks().forEach((track) => {
+                        console.debug("venmic: removing existing audio track:", track.label);
+                        stream.removeTrack(track);
+                    });
+                    stream.addTrack(audioTrack);
 
-                // Also clean up when the video track ends (screen share stopped)
-                const videoTrack = stream.getVideoTracks()[0];
-                if (videoTrack) {
-                    videoTrack.addEventListener("ended", () => {
-                        console.log("venmic: video track ended, stopping venmic");
+                    // Clean up venmic when the audio track ends
+                    audioTrack.addEventListener("ended", () => {
+                        console.debug("venmic: audio track ended, stopping venmic");
                         void ipcRenderer.invoke("stopVenmic");
                     });
-                }
 
-                console.log("venmic: audio track added to screen share stream successfully");
+                    // Also clean up when the video track ends (screen share stopped)
+                    const videoTrack = stream.getVideoTracks()[0];
+                    if (videoTrack) {
+                        videoTrack.addEventListener("ended", () => {
+                            console.debug("venmic: video track ended, stopping venmic");
+                            void ipcRenderer.invoke("stopVenmic");
+                        });
+                    }
+
+                    console.log("venmic: audio track added to screen share stream");
+                } else {
+                    console.warn("venmic: no audio track returned from virtual microphone");
+                }
             } else {
-                console.log("venmic: vencord-screen-share device NOT found");
+                console.debug("venmic: vencord-screen-share device not found, audio not captured");
             }
         } catch (err) {
             console.error("venmic: failed to capture audio from virtual microphone:", err);
         }
 
-        console.log(
+        console.debug(
             "venmic: returning stream with tracks:",
             stream.getTracks().map((t) => `${t.kind}:${t.label}`),
         );

src/venmic-inject.ts

@@ -25,23 +25,23 @@ const VENMIC_PATCH_SCRIPT = `
     const originalGetDisplayMedia = navigator.mediaDevices.getDisplayMedia.bind(navigator.mediaDevices);
 
     navigator.mediaDevices.getDisplayMedia = async function(options) {
-        console.log('[venmic-inject] getDisplayMedia called in frame:', window.location.href);
+        console.debug('[venmic-inject] getDisplayMedia called in frame:', window.location.href);
         
         const stream = await originalGetDisplayMedia(options);
-        console.log('[venmic-inject] original getDisplayMedia returned, tracks:', 
+        console.debug('[venmic-inject] original getDisplayMedia returned, tracks:', 
             stream.getTracks().map(t => t.kind + ':' + t.label).join(', '));
 
         // Try to find and capture from venmic virtual microphone
         try {
             const devices = await navigator.mediaDevices.enumerateDevices();
             const audioInputs = devices.filter(d => d.kind === 'audioinput');
-            console.log('[venmic-inject] available audio inputs:', 
+            console.debug('[venmic-inject] available audio inputs:', 
                 audioInputs.map(d => d.label || d.deviceId.slice(0, 8)).join(', '));
 
             const venmicDevice = devices.find(d => d.label === 'vencord-screen-share');
 
             if (venmicDevice) {
-                console.log('[venmic-inject] found vencord-screen-share device!');
+                console.debug('[venmic-inject] found vencord-screen-share device');
 
                 const audioStream = await navigator.mediaDevices.getUserMedia({
                     audio: {
@@ -55,32 +55,33 @@ const VENMIC_PATCH_SCRIPT = `
                     }
                 });
 
-                console.log('[venmic-inject] captured audio from venmic virtual mic');
-
-                // Remove any existing audio tracks
-                stream.getAudioTracks().forEach(track => {
-                    console.log('[venmic-inject] removing existing audio track:', track.label);
-                    stream.removeTrack(track);
-                });
-
-                // Add the venmic audio track
                 const audioTrack = audioStream.getAudioTracks()[0];
-                stream.addTrack(audioTrack);
-
-                console.log('[venmic-inject] venmic audio track added to stream successfully');
+                if (audioTrack) {
+                    // Remove any existing audio tracks
+                    stream.getAudioTracks().forEach(track => {
+                        console.debug('[venmic-inject] removing existing audio track:', track.label);
+                        stream.removeTrack(track);
+                    });
+
+                    // Add the venmic audio track
+                    stream.addTrack(audioTrack);
+                    console.log('[venmic-inject] venmic audio track added to stream');
+                } else {
+                    console.warn('[venmic-inject] no audio track returned from virtual microphone');
+                }
             } else {
-                console.log('[venmic-inject] vencord-screen-share device not found');
+                console.debug('[venmic-inject] vencord-screen-share device not found');
             }
         } catch (err) {
             console.error('[venmic-inject] failed to capture venmic audio:', err);
         }
 
-        console.log('[venmic-inject] returning stream with tracks:', 
+        console.debug('[venmic-inject] returning stream with tracks:', 
             stream.getTracks().map(t => t.kind + ':' + t.label).join(', '));
         return stream;
     };
 
-    console.log('[venmic-inject] getDisplayMedia patch installed in frame:', window.location.href);
+    console.debug('[venmic-inject] getDisplayMedia patch installed in frame:', window.location.href);
 })();
 `;
 
@@ -96,7 +97,7 @@ export function setupVenmicInjection(webContents: WebContents): void {
             if (isMainFrame) {
                 // Main frame - inject directly
                 await webContents.executeJavaScript(VENMIC_PATCH_SCRIPT, true);
-                console.log("venmic: patch injected into main frame");
+                console.debug("venmic: patch injected into main frame");
             } else {
                 // Subframe - need to find and inject into all frames
                 // Get all frames including subframes
@@ -128,7 +129,7 @@ async function injectIntoAllFrames(frame: Electron.WebFrameMain): Promise<void>
 
         // Inject into this frame
         await frame.executeJavaScript(VENMIC_PATCH_SCRIPT, true);
-        console.log("venmic: patch injected into frame:", frame.url);
+        console.debug("venmic: patch injected into frame:", frame.url);
     } catch (err) {
         // Frame might have been destroyed or navigated
         console.debug("venmic: failed to inject into frame:", err);

src/venmic.ts

@@ -1,5 +1,5 @@
 /*
-Copyright 2026 New Vector Ltd.
+Copyright 2025 New Vector Ltd.
 
 SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
 Please see LICENSE files in the repository root for full details.
@@ -12,6 +12,10 @@ import { fileURLToPath } from "node:url";
 
 import type { LinkData, Node, PatchBay as PatchBayType } from "@vencord/venmic";
 
+import type { VenmicListResult } from "./@types/audio-sharing.js";
+
+export type { VenmicListResult };
+
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const nativeRequire = createRequire(import.meta.url);
 
@@ -24,10 +28,6 @@ let initialized = false;
 let hasPipewirePulse = false;
 let isGlibcOutdated = false;
 
-export type VenmicListResult =
-    | { ok: true; targets: Node[]; hasPipewirePulse: boolean }
-    | { ok: false; isGlibcOutdated: boolean };
-
 function importVenmic(): void {
     if (imported) {
         return;