refactor: clean up code structure and improve error handling in media controllers

src/media/mediaController.ts

@@ -52,9 +52,21 @@ export class MediaController {
   ): Promise<MediaState> {
     const mode = options.mode ?? "music";
     if (mode === "screen") {
+      // Stop current music if any
+      this.playbackToken++;
+      this.playback?.stop();
+      this.playback = null;
       return this.startScreen(source);
     }
 
+    // mode === "music"
+    // Stop screen if active
+    if (this.screenPlayback || this.dependencies.screenController?.isActive()) {
+      this.screenPlayback?.stop();
+      this.screenPlayback = null;
+      this.activeMode = null;
+    }
+
     this.assertCanStartMusic();
     const resolved = await (
       this.dependencies.resolveMediaSource ?? resolveMediaSource
@@ -108,10 +120,6 @@ export class MediaController {
       );
     }
 
-    if (this.screenPlayback || this.dependencies.screenController?.isActive()) {
-      throw new AppError("Another media mode is active", "MEDIA_BUSY", 409);
-    }
-
     if (this.dependencies.isBrowserStreaming?.()) {
       throw new AppError(
         "Stop browser microphone streaming before playing media",
@@ -122,14 +130,6 @@ export class MediaController {
   }
 
   private async startScreen(source: string): Promise<MediaState> {
-    if (
-      this.screenPlayback ||
-      this.dependencies.screenController?.isActive() ||
-      this.playback ||
-      this.queueStore.snapshot().current
-    ) {
-      throw new AppError("Another media mode is active", "MEDIA_BUSY", 409);
-    }
     const screenController = this.dependencies.screenController;
     if (!screenController) {
       throw new AppError(

src/media/screenShareController.ts

@@ -6,7 +6,10 @@ import {
   Utils,
 } from "@dank074/discord-video-stream";
 import { AppError } from "../errors";
+import { createChildLogger } from "../logger";
 import { discordPlayer } from "../player";
+
+const logger = createChildLogger("screen-share");
 import type { DiscordPlayerOwner, ScreenSharePlayback } from "./mediaTypes";
 import { createYtDlp } from "./ytdlp";
 
@@ -77,8 +80,8 @@ export function createScreenShareController(
         );
       }
 
-      if (active || getPlayerOwner() !== "none") {
-        throw new AppError("Another media mode is active", "MEDIA_BUSY", 409);
+      if (active) {
+        active.stop();
       }
 
       try {
@@ -93,6 +96,15 @@ export function createScreenShareController(
           videoCodec: Utils.normalizeVideoCodec("H264"),
         });
 
+        // Add FFmpeg error logging
+        if (command && "stderr" in command && (command as any).stderr) {
+          (command as any).stderr.on("data", (data: Buffer) => {
+            if (data.toString().includes("Error")) {
+              logger.error({ error: data.toString() }, "FFmpeg Screen Error");
+            }
+          });
+        }
+
         let stopped = false;
         const done = playStream(output, dependencies.streamer, {
           type: "go-live",