From 8cef19f724ed0b8db069a7e7204f665a73743193 Mon Sep 17 00:00:00 2001
From: Claude Code <claude@daddelolymp.de>
Date: Thu, 5 Mar 2026 00:31:55 +0100
Subject: [PATCH] Fix: ensureConnectionReady raeumt kaputte Connection auf
 statt sie zurueckzugeben

---
 server/src/index.ts | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/server/src/index.ts b/server/src/index.ts
index 2366aa1..0b1aa02 100644
--- a/server/src/index.ts
+++ b/server/src/index.ts
@@ -518,26 +518,29 @@ async function handleCommand(message: Message, content: string) {
 }
 
 async function ensureConnectionReady(connection: VoiceConnection, channelId: string, guildId: string, guild: any): Promise<VoiceConnection> {
+  // Versuch 1: Warten ob bestehende Connection ready wird
   try {
     await entersState(connection, VoiceConnectionStatus.Ready, 15_000);
     console.log(`${new Date().toISOString()} | VoiceConnection ready`);
     return connection;
   } catch (e) {
-    console.warn(`${new Date().toISOString()} | VoiceConnection not ready, trying rejoin...`, e);
+    console.warn(`${new Date().toISOString()} | VoiceConnection not ready, trying rejoin...`);
   }
 
+  // Versuch 2: Rejoin
   try {
     connection.rejoin({ channelId, selfDeaf: false, selfMute: false });
     await entersState(connection, VoiceConnectionStatus.Ready, 15_000);
     console.log(`${new Date().toISOString()} | VoiceConnection ready after rejoin`);
     return connection;
   } catch (e2) {
-    console.error(`${new Date().toISOString()} | VoiceConnection still not ready after rejoin`, e2);
+    console.warn(`${new Date().toISOString()} | VoiceConnection still not ready after rejoin`);
   }
 
-  try {
-    connection.destroy();
-  } catch {}
+  // Versuch 3: Komplett neu verbinden
+  try { connection.destroy(); } catch {}
+  guildAudioState.delete(guildId);
+
   const newConn = joinVoiceChannel({
     channelId,
     guildId,
@@ -545,10 +548,16 @@ async function ensureConnectionReady(connection: VoiceConnection, channelId: str
     selfMute: false,
     selfDeaf: false
   });
-  await entersState(newConn, VoiceConnectionStatus.Ready, 15_000).catch((e3) => {
-    console.error(`${new Date().toISOString()} | VoiceConnection not ready after fresh join`, e3);
-  });
-  return newConn;
+  try {
+    await entersState(newConn, VoiceConnectionStatus.Ready, 15_000);
+    console.log(`${new Date().toISOString()} | VoiceConnection ready after fresh join`);
+    return newConn;
+  } catch (e3) {
+    console.error(`${new Date().toISOString()} | VoiceConnection failed after all attempts, cleaning up`);
+    try { newConn.destroy(); } catch {}
+    guildAudioState.delete(guildId);
+    throw new Error('Voice connection failed after 3 attempts');
+  }
 }
 
 function attachVoiceLifecycle(state: GuildAudioState, guild: any) {