[WIP] CLeanup: Remove unused or redundant code or comments

audio_handlers.go

@@ -5,7 +5,6 @@ import (
 
 	"github.com/coder/websocket"
 	"github.com/jetkvm/kvm/internal/audio"
-	"github.com/pion/webrtc/v4"
 	"github.com/rs/zerolog"
 )
 
@@ -16,19 +15,6 @@ func ensureAudioControlService() *audio.AudioControlService {
 		sessionProvider := &SessionProviderImpl{}
 		audioControlService = audio.NewAudioControlService(sessionProvider, logger)
 
-		// Set up callback for audio relay to get current session's audio track
-		audio.SetCurrentSessionCallback(func() audio.AudioTrackWriter {
-			return GetCurrentSessionAudioTrack()
-		})
-
-		// Set up callback for audio relay to replace WebRTC audio track
-		audio.SetTrackReplacementCallback(func(newTrack audio.AudioTrackWriter) error {
-			if track, ok := newTrack.(*webrtc.TrackLocalStaticSample); ok {
-				return ReplaceCurrentSessionAudioTrack(track)
-			}
-			return nil
-		})
-
 		// Set up RPC callback functions for the audio package
 		audio.SetRPCCallbacks(
 			func() *audio.AudioControlService { return audioControlService },
@@ -42,101 +28,6 @@ func ensureAudioControlService() *audio.AudioControlService {
 	return audioControlService
 }
 
-// --- Global Convenience Functions for Audio Control ---
-
-// MuteAudioOutput is a global helper to mute audio output
-func MuteAudioOutput() error {
-	return ensureAudioControlService().MuteAudio(true)
-}
-
-// UnmuteAudioOutput is a global helper to unmute audio output
-func UnmuteAudioOutput() error {
-	return ensureAudioControlService().MuteAudio(false)
-}
-
-// StopMicrophone is a global helper to stop microphone subprocess
-func StopMicrophone() error {
-	return ensureAudioControlService().StopMicrophone()
-}
-
-// StartMicrophone is a global helper to start microphone subprocess
-func StartMicrophone() error {
-	return ensureAudioControlService().StartMicrophone()
-}
-
-// IsAudioOutputActive is a global helper to check if audio output subprocess is running
-func IsAudioOutputActive() bool {
-	return ensureAudioControlService().IsAudioOutputActive()
-}
-
-// IsMicrophoneActive is a global helper to check if microphone subprocess is running
-func IsMicrophoneActive() bool {
-	return ensureAudioControlService().IsMicrophoneActive()
-}
-
-// ResetMicrophone is a global helper to reset the microphone
-func ResetMicrophone() error {
-	return ensureAudioControlService().ResetMicrophone()
-}
-
-// GetCurrentSessionAudioTrack returns the current session's audio track for audio relay
-func GetCurrentSessionAudioTrack() *webrtc.TrackLocalStaticSample {
-	if currentSession != nil {
-		return currentSession.AudioTrack
-	}
-	return nil
-}
-
-// ConnectRelayToCurrentSession connects the audio relay to the current WebRTC session
-func ConnectRelayToCurrentSession() error {
-	if currentTrack := GetCurrentSessionAudioTrack(); currentTrack != nil {
-		err := audio.UpdateAudioRelayTrack(currentTrack)
-		if err != nil {
-			logger.Error().Err(err).Msg("failed to connect current session's audio track to relay")
-			return err
-		}
-		logger.Info().Msg("connected current session's audio track to relay")
-		return nil
-	}
-	logger.Warn().Msg("no current session audio track found")
-	return nil
-}
-
-// ReplaceCurrentSessionAudioTrack replaces the audio track in the current WebRTC session
-func ReplaceCurrentSessionAudioTrack(newTrack *webrtc.TrackLocalStaticSample) error {
-	if currentSession == nil {
-		return nil // No session to update
-	}
-
-	err := currentSession.ReplaceAudioTrack(newTrack)
-	if err != nil {
-		logger.Error().Err(err).Msg("failed to replace audio track in current session")
-		return err
-	}
-
-	logger.Info().Msg("successfully replaced audio track in current session")
-	return nil
-}
-
-// SetAudioQuality is a global helper to set audio output quality
-func SetAudioQuality(quality audio.AudioQuality) error {
-	ensureAudioControlService()
-	audioControlService.SetAudioQuality(quality)
-	return nil
-}
-
-// GetAudioQualityPresets is a global helper to get available audio quality presets
-func GetAudioQualityPresets() map[audio.AudioQuality]audio.AudioConfig {
-	ensureAudioControlService()
-	return audioControlService.GetAudioQualityPresets()
-}
-
-// GetCurrentAudioQuality is a global helper to get current audio quality configuration
-func GetCurrentAudioQuality() audio.AudioConfig {
-	ensureAudioControlService()
-	return audioControlService.GetCurrentAudioQuality()
-}
-
 // handleSubscribeAudioEvents handles WebSocket audio event subscription
 func handleSubscribeAudioEvents(connectionID string, wsCon *websocket.Conn, runCtx context.Context, l *zerolog.Logger) {
 	ensureAudioControlService()

ui/src/components/popovers/AudioControlPopover.tsx

@@ -39,9 +39,6 @@ interface AudioConfig {
   FrameSize: string;
 }
 
-// Quality labels will be managed by the audio quality service
-const getQualityLabels = () => audioQualityService.getQualityLabels();
-
 interface AudioControlPopoverProps {
   microphone: MicrophoneHookReturn;
 }
@@ -94,9 +91,6 @@ export default function AudioControlPopover({ microphone }: AudioControlPopoverP
   const isMuted = audioMuted ?? false;
   const isConnected = wsConnected;
   
-  // Note: We now use hook state instead of WebSocket state for microphone Enable/Disable
-  // const isMicrophoneActiveFromWS = microphoneState?.running ?? false;
-  
 
   
   // Audio devices
@@ -463,7 +457,7 @@ export default function AudioControlPopover({ microphone }: AudioControlPopoverP
           </div>
           
           <div className="grid grid-cols-2 gap-2">
-            {Object.entries(getQualityLabels()).map(([quality, label]) => (
+            {Object.entries(audioQualityService.getQualityLabels()).map(([quality, label]) => (
               <button
                 key={quality}
                 onClick={() => handleQualityChange(parseInt(quality))}

ui/src/hooks/useMicrophone.ts

@@ -206,23 +206,9 @@ export function useMicrophone() {
       microphoneStreamRef.current = stream;
       setMicrophoneStream(stream);
 
-      // Verify the stream was stored correctly
-      devLog("Stream storage verification:", {
-        refSet: !!microphoneStreamRef.current,
-        refId: microphoneStreamRef.current?.id,
-        storeWillBeSet: true // Store update is async
-      });
-
       // Add audio track to peer connection if available
-      devLog("Peer connection state:", peerConnection ? {
-        connectionState: peerConnection.connectionState,
-        iceConnectionState: peerConnection.iceConnectionState,
-        signalingState: peerConnection.signalingState
-      } : "No peer connection");
-      
       if (peerConnection && stream.getAudioTracks().length > 0) {
         const audioTrack = stream.getAudioTracks()[0];
-        devLog("Starting microphone with audio track:", audioTrack.id, "kind:", audioTrack.kind);
         
         // Find the audio transceiver (should already exist with sendrecv direction)
         const transceivers = peerConnection.getTransceivers();
@@ -246,64 +232,28 @@ export function useMicrophone() {
           return false;
         });
 
-        devLog("Found audio transceiver:", audioTransceiver ? {
-          direction: audioTransceiver.direction,
-          mid: audioTransceiver.mid,
-          senderTrack: audioTransceiver.sender.track?.kind,
-          receiverTrack: audioTransceiver.receiver.track?.kind
-        } : null);
-
         let sender: RTCRtpSender;
         if (audioTransceiver && audioTransceiver.sender) {
           // Use the existing audio transceiver's sender
           await audioTransceiver.sender.replaceTrack(audioTrack);
           sender = audioTransceiver.sender;
-          devLog("Replaced audio track on existing transceiver");
-          
-          // Verify the track was set correctly
-          devLog("Transceiver after track replacement:", {
-            direction: audioTransceiver.direction,
-            senderTrack: audioTransceiver.sender.track?.id,
-            senderTrackKind: audioTransceiver.sender.track?.kind,
-            senderTrackEnabled: audioTransceiver.sender.track?.enabled,
-            senderTrackReadyState: audioTransceiver.sender.track?.readyState
-          });
         } else {
           // Fallback: add new track if no transceiver found
           sender = peerConnection.addTrack(audioTrack, stream);
-          devLog("Added new audio track to peer connection");
-          
-          // Find the transceiver that was created for this track
-          const newTransceiver = peerConnection.getTransceivers().find(t => t.sender === sender);
-          devLog("New transceiver created:", newTransceiver ? {
-            direction: newTransceiver.direction,
-            senderTrack: newTransceiver.sender.track?.id,
-            senderTrackKind: newTransceiver.sender.track?.kind
-          } : "Not found");
         }
         
         setMicrophoneSender(sender);
-        devLog("Microphone sender set:", {
-          senderId: sender,
-          track: sender.track?.id,
-          trackKind: sender.track?.kind,
-          trackEnabled: sender.track?.enabled,
-          trackReadyState: sender.track?.readyState
-        });
         
         // Check sender stats to verify audio is being transmitted
         devOnly(() => {
           setTimeout(async () => {
             try {
               const stats = await sender.getStats();
-              devLog("Sender stats after 2 seconds:");
+              stats.forEach((report) => {
-              stats.forEach((report, id) => {
                 if (report.type === 'outbound-rtp' && report.kind === 'audio') {
-                  devLog("Outbound audio RTP stats:", {
+                  devLog("Audio RTP stats:", {
-                    id,
                     packetsSent: report.packetsSent,
-                    bytesSent: report.bytesSent,
+                    bytesSent: report.bytesSent
-                    timestamp: report.timestamp
                   });
                 }
               });
@@ -357,7 +307,6 @@ export function useMicrophone() {
         
         try {
           await rpcMicrophoneStart();
-          devLog(`Backend RPC microphone start successful (attempt ${attempt})`);
           backendSuccess = true;
           break; // Exit the retry loop on success
         } catch (rpcError) {
@@ -395,27 +344,6 @@ export function useMicrophone() {
       // Save microphone enabled state for auto-restore on page reload
       setMicrophoneWasEnabled(true);
 
-      devLog("Microphone state set to active. Verifying state:", {
-        streamInRef: !!microphoneStreamRef.current,
-        streamInStore: !!microphoneStream,
-        isActive: true,
-        isMuted: false
-      });
-
-      // Don't sync immediately after starting - it causes race conditions
-      // The sync will happen naturally through other triggers
-      devOnly(() => {
-        setTimeout(() => {
-          // Just verify state after a delay for debugging
-          devLog("State check after delay:", {
-            streamInRef: !!microphoneStreamRef.current,
-            streamInStore: !!microphoneStream,
-            isActive: isMicrophoneActive,
-            isMuted: isMicrophoneMuted
-          });
-        }, AUDIO_CONFIG.AUDIO_TEST_TIMEOUT);
-      });
-
       // Clear the starting flag
       isStartingRef.current = false;
       setIsStarting(false);
@@ -451,7 +379,7 @@ export function useMicrophone() {
       setIsStarting(false);
       return { success: false, error: micError };
     }
-  }, [peerConnection, setMicrophoneStream, setMicrophoneSender, setMicrophoneActive, setMicrophoneMuted, setMicrophoneWasEnabled, stopMicrophoneStream, isMicrophoneActive, isMicrophoneMuted, microphoneStream, isStarting, isStopping, isToggling, rpcMicrophoneStart, rpcDataChannel?.readyState, send]);
+  }, [peerConnection, setMicrophoneStream, setMicrophoneSender, setMicrophoneActive, setMicrophoneMuted, setMicrophoneWasEnabled, stopMicrophoneStream, isStarting, isStopping, isToggling, rpcMicrophoneStart, rpcDataChannel?.readyState, send]);
 
 
 
@@ -475,8 +403,6 @@ export function useMicrophone() {
             send("microphoneStop", {}, (resp: JsonRpcResponse) => {
               if ("error" in resp) {
                 devWarn("RPC microphone stop failed:", resp.error);
-              } else {
-                devLog("Backend notified about microphone stop via RPC");
               }
               resolve(); // Continue regardless of result
             });
@@ -526,21 +452,10 @@ export function useMicrophone() {
       // Use the ref instead of store value to avoid race conditions
       const currentStream = microphoneStreamRef.current || microphoneStream;
       
-      devLog("Toggle microphone mute - current state:", {
-        hasRefStream: !!microphoneStreamRef.current,
-        hasStoreStream: !!microphoneStream,
-        isActive: isMicrophoneActive,
-        isMuted: isMicrophoneMuted,
-        streamId: currentStream?.id,
-        audioTracks: currentStream?.getAudioTracks().length || 0
-      });
-      
       if (!currentStream || !isMicrophoneActive) {
         const errorDetails = {
           hasStream: !!currentStream,
           isActive: isMicrophoneActive,
-          storeStream: !!microphoneStream,
-          refStream: !!microphoneStreamRef.current,
           streamId: currentStream?.id,
           audioTracks: currentStream?.getAudioTracks().length || 0
         };
@@ -581,7 +496,6 @@ export function useMicrophone() {
       // Mute/unmute the audio track
       audioTracks.forEach((track: MediaStreamTrack) => {
         track.enabled = !newMutedState;
-        devLog(`Audio track ${track.id} enabled: ${track.enabled}`);
       });
 
       setMicrophoneMuted(newMutedState);
@@ -593,8 +507,6 @@ export function useMicrophone() {
             send("microphoneMute", { muted: newMutedState }, (resp: JsonRpcResponse) => {
               if ("error" in resp) {
                 devWarn("RPC microphone mute failed:", resp.error);
-              } else {
-                devLog("Backend notified about microphone mute via RPC");
               }
               resolve(); // Continue regardless of result
             });
@@ -678,10 +590,8 @@ export function useMicrophone() {
       // Clean up stream directly without depending on the callback
       const stream = microphoneStreamRef.current;
       if (stream) {
-        devLog("Cleanup: stopping microphone stream on unmount");
         stream.getAudioTracks().forEach((track: MediaStreamTrack) => {
           track.stop();
-          devLog(`Cleanup: stopped audio track ${track.id}`);
         });
         microphoneStreamRef.current = null;
       }