Update src/components/control-tray/ControlTray.tsx

src/components/control-tray/ControlTray.tsx

@@ -7,7 +7,7 @@ import React, { memo, ReactNode, RefObject, useEffect, useRef, useState } from "
 import { useLiveAPIContext } from "../../contexts/LiveAPIContext";
 import { AudioRecorder } from "../../lib/audio-recorder";
 
-// SVG Icons for Controls
+// SVG Icons for Controls (مثل قبل)
 const SvgPauseIcon = () => <svg width="37" height="37" viewBox="0 0 37 37" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M15.9872 29.6198V8.28342C15.9872 6.25781 15.132 5.44757 12.9713 5.44757H7.52469C5.36404 5.44757 4.50879 6.25781 4.50879 8.28342V29.6198C4.50879 31.6454 5.36404 32.4556 7.52469 32.4556H12.9713C15.132 32.4556 15.9872 31.6454 15.9872 29.6198Z" fill="#BE123C"/><path opacity="0.4" d="M31.5175 29.6198V8.28342C31.5175 6.25781 30.6622 5.44757 28.5016 5.44757H23.055C20.9093 5.44757 20.0391 6.25781 20.0391 8.28342V29.6198C20.0391 31.6454 20.8943 32.4556 23.055 32.4556H28.5016C30.6622 32.4556 31.5175 31.6454 31.5175 29.6198Z" fill="#BE123C"/></svg>;
 const SvgMicrophoneIcon = () => <svg width="38" height="38" viewBox="0 0 69 68" fill="none" xmlns="http://www.w3.org/2000/svg" transform="scale(0.55)"><path opacity="0.4" d="M49.9479 27.1824C49.0803 27.1824 48.3907 27.872 48.3907 28.7396V32.2544C48.3907 40.1293 41.984 46.5361 34.109 46.5361C26.234 46.5361 19.8273 40.1293 19.8273 32.2544V28.7173C19.8273 27.8497 19.1377 27.1601 18.2701 27.1601C17.4025 27.1601 16.7129 27.8497 16.7129 28.7173V32.2321C16.7129 41.2861 23.6758 48.7384 32.5518 49.5393V54.2776C32.5518 55.1452 33.2414 55.8348 34.109 55.8348C34.9766 55.8348 35.6662 55.1452 35.6662 54.2776V49.5393C44.52 48.7607 51.5051 41.2861 51.5051 32.2321V28.7173C51.4829 27.872 50.7933 27.1824 49.9479 27.1824Z" fill="#BE123C"/><path d="M34.1099 11.3434C28.682 11.3434 24.2773 15.7481 24.2773 21.176V32.5658C24.2773 37.9938 28.682 42.3984 34.1099 42.3984C39.5379 42.3984 43.9425 37.9938 43.9425 32.5658V21.176C43.9425 15.7481 39.5379 11.3434 34.1099 11.3434ZM37.0241 26.8042C36.8684 27.3826 36.3567 27.7608 35.7784 27.7608C35.6671 27.7608 35.5559 27.7385 35.4447 27.7163C34.5771 27.4716 33.665 27.4716 32.7974 27.7163C32.0856 27.9165 31.396 27.4938 31.218 26.8042C31.0178 26.1146 31.4404 25.4027 32.1301 25.2247C33.4426 24.8688 34.8218 24.8688 36.1343 25.2247C36.8017 25.4027 37.2021 26.1146 37.0241 26.8042ZM38.2031 22.4885C38.0029 23.0224 37.5135 23.3339 36.9796 23.3339C36.8239 23.3339 36.6904 23.3116 36.5347 23.2671C34.9775 22.6887 33.2423 22.6887 31.6852 23.2671C31.0178 23.5118 30.2614 23.1559 30.0167 22.4885C29.772 21.8212 30.128 21.0648 30.7953 20.8423C32.9309 20.0637 35.289 20.0637 37.4245 20.8423C38.0919 21.087 38.4478 21.8212 38.2031 22.4885Z" fill="#BE123C"/></svg>;
 const SvgCameraIcon = () => <svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg"><path opacity="0.4" d="M21.8118 5.52235H11.9265C6.29183 5.52235 4.10059 7.7136 4.10059 13.3482V26.5286C4.10059 30.318 6.16002 34.3545 11.9265 34.3545H21.8118C27.4464 34.3545 29.6376 32.1633 29.6376 26.5286V13.3482C29.6376 7.7136 27.4464 5.52235 21.8118 5.52235Z" fill="#2252A0"/><path d="M19.3406 18.9169C21.0512 18.9169 22.438 17.5302 22.438 15.8195C22.438 14.1089 21.0512 12.7222 19.3406 12.7222C17.6299 12.7222 16.2432 14.1089 16.2432 15.8195C16.2432 17.5302 17.6299 18.9169 19.3406 18.9169Z" fill="#2252A0"/><path d="M36.0629 10.3332C35.3874 9.98721 33.9705 9.5918 32.0429 10.9428L29.6045 12.6562C29.621 12.8869 29.6374 13.1011 29.6374 13.3482V26.5286C29.6374 26.7758 29.6045 26.9899 29.6045 27.2206L32.0429 28.934C33.0643 29.659 33.954 29.8896 34.6625 29.8896C35.2721 29.8896 35.7499 29.7249 36.0629 29.5601C36.7384 29.2141 37.8752 28.275 37.8752 25.919V13.9743C37.8752 11.6183 36.7384 10.6792 36.0629 10.3332Z" fill="#2252A0"/></svg>;
@@ -38,18 +38,11 @@ function ControlTray({
 }: ControlTrayProps) {
   const { client, connected, connect, disconnect } = useLiveAPIContext();
   const [audioRecorder] = useState(() => new AudioRecorder());
-  const [muted, setMuted] = useState(true); // Internal state for AudioRecorder
-  const [inVolume, setInVolume] = useState(0); // For visual feedback if needed
   const [activeLocalVideoStream, setActiveLocalVideoStream] = useState<MediaStream | null>(null);
   const [currentFacingMode, setCurrentFacingMode] = useState<'user' | 'environment'>('user');
   const [isSwitchingCamera, setIsSwitchingCamera] = useState(false);
   const renderCanvasRef = useRef<HTMLCanvasElement>(null);
 
-  // Sync internal muted state with app-level mic active state
-  useEffect(() => {
-    setMuted(!isAppMicActive);
-  }, [isAppMicActive]);
-
   // Manage webcam based on app-level camera active state
   useEffect(() => {
     if (isAppCamActive && !activeLocalVideoStream && !isSwitchingCamera) {
@@ -58,51 +51,52 @@ function ControlTray({
       stopWebcam();
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [isAppCamActive]); // Removed activeLocalVideoStream to prevent loops on start failure
+  }, [isAppCamActive]);
 
   // Audio Recorder Logic
   useEffect(() => {
     const onData = (base64: string) => {
-      if (client && connected && isAppMicActive) { // Send audio if mic is on at app level
+      if (client && connected && isAppMicActive) {
         client.sendRealtimeInput([{ mimeType: "audio/pcm;rate=16000", data: base64 }]);
       }
     };
-    if (connected && isAppMicActive && audioRecorder) { // Use isAppMicActive here
-      audioRecorder.on("data", onData).on("volume", setInVolume).start();
+    if (connected && isAppMicActive && audioRecorder) {
+      audioRecorder.on("data", onData).start(); // Removed .on("volume", setInVolume) if not used
     } else if (audioRecorder && audioRecorder.recording) {
       audioRecorder.stop();
     }
     return () => {
       if (audioRecorder) {
-        audioRecorder.off("data", onData).off("volume", setInVolume);
+        audioRecorder.off("data", onData);
         if (audioRecorder.recording) audioRecorder.stop();
       }
     };
-  }, [connected, client, isAppMicActive, audioRecorder]); // Depend on isAppMicActive
+  }, [connected, client, isAppMicActive, audioRecorder]);
 
-  // Send Video Frame Logic (with increased frequency and quality)
+  // Send Video Frame Logic
   useEffect(() => {
     let timeoutId = -1;
     function sendVideoFrame() {
+      // ... (مثل قبل، با فرکانس 4FPS و scale 0.5) ...
       if (connected && activeLocalVideoStream && client && videoRef.current) {
         const video = videoRef.current;
-        const canvas = renderCanvasRef.current; // Use the ref for canvas
+        const canvas = renderCanvasRef.current;
         if (!canvas || video.readyState < video.HAVE_METADATA || video.paused || video.ended) {
-          if (activeLocalVideoStream) timeoutId = window.setTimeout(sendVideoFrame, 1000 / 4); // Retry if stream active
+          if (activeLocalVideoStream) timeoutId = window.setTimeout(sendVideoFrame, 1000 / 4);
           return;
         }
         try {
           const ctx = canvas.getContext("2d");
           if (!ctx) return;
-          const scale = 0.5; // Increased scale for better quality
+          const scale = 0.5;
           canvas.width = video.videoWidth * scale;
           canvas.height = video.videoHeight * scale;
           if (canvas.width > 0 && canvas.height > 0) {
             ctx.drawImage(video, 0, 0, canvas.width, canvas.height);
-            const base64 = canvas.toDataURL("image/jpeg", 0.8); // Good quality
+            const base64 = canvas.toDataURL("image/jpeg", 0.8);
             const data = base64.slice(base64.indexOf(",") + 1);
             if (data) {
-              // console.log(`🖼️ Sending video frame (length: ${data.length}) at ${new Date().toLocaleTimeString()}`);
+              // console.log(`🖼️ Sending video frame`);
               client.sendRealtimeInput([{ mimeType: "image/jpeg", data }]);
             }
           }
@@ -110,21 +104,14 @@ function ControlTray({
           console.error("❌ Error processing video frame:", error);
         }
       }
-      // Schedule next frame if conditions still met
       if (connected && activeLocalVideoStream) {
-         timeoutId = window.setTimeout(sendVideoFrame, 1000 / 4); // Send ~4 FPS
+         timeoutId = window.setTimeout(sendVideoFrame, 1000 / 4);
       }
     }
-
     if (connected && activeLocalVideoStream && videoRef.current) {
-      console.log("🚀 Initializing video frame sending...");
-      timeoutId = window.setTimeout(sendVideoFrame, 200); // Initial delay
+      timeoutId = window.setTimeout(sendVideoFrame, 200);
     }
-    
-    return () => { 
-      clearTimeout(timeoutId);
-      console.log("🛑 Video frame sending stopped.");
-    };
+    return () => clearTimeout(timeoutId);
   }, [connected, activeLocalVideoStream, client, videoRef, renderCanvasRef]);
 
 
@@ -140,13 +127,15 @@ function ControlTray({
     }
   }, [activeLocalVideoStream, videoRef]);
 
-  const ensureConnected = async () => {
+  const ensureConnectedAndReady = async (): Promise<boolean> => {
     if (!connected) {
       try {
+        console.log("ControlTray: Not connected. Attempting to connect...");
         await connect();
+        console.log("ControlTray: Connection successful.");
         return true;
       } catch (err) {
-        console.error('❌ Connection error in ensureConnected:', err);
+        console.error('❌ ControlTray: Connection error:', err);
         return false;
       }
     }
@@ -156,29 +145,22 @@ function ControlTray({
   const handleMicToggle = async () => {
     if (isSwitchingCamera) return;
     const newMicState = !isAppMicActive;
+
     if (newMicState) { // Turning mic ON
-      if(!await ensureConnected()) {
-        onAppMicToggle(false); // Keep it off if connection fails
+      if (!(await ensureConnectedAndReady())) {
+        onAppMicToggle(false); // Keep mic state off if connection fails
         return;
       }
     }
     onAppMicToggle(newMicState);
-    // If turning off and cam is also off, consider disconnecting
-    // if (!newMicState && !isAppCamActive && connected) {
-    //   disconnect();
-    // }
+    console.log(`ControlTray: Mic toggled to ${newMicState}`);
   };
 
   const startWebcam = async (facingModeToTry: 'user' | 'environment' = currentFacingMode) => {
     if (isSwitchingCamera) return;
     setIsSwitchingCamera(true);
 
-    if(!await ensureConnected()) {
-        onAppCamToggle(false);
-        setIsSwitchingCamera(false);
-        return;
-    }
-
+    // ensureConnectedAndReady is now called by handleCamToggle before this
     try {
       const mediaStream = await navigator.mediaDevices.getUserMedia({
         video: { facingMode: facingModeToTry },
@@ -187,13 +169,12 @@ function ControlTray({
       setActiveLocalVideoStream(mediaStream);
       onVideoStreamChange(mediaStream); 
       setCurrentFacingMode(facingModeToTry);
-      // onAppCamToggle(true); // This will be set by the useEffect in App.tsx if isAppCamActive changes
+      console.log(`ControlTray: Webcam started with ${facingModeToTry}`);
     } catch (error) {
-      console.error(`❌ Error starting webcam with ${facingModeToTry}:`, error);
-      // Fallback or error handling logic...
+      console.error(`❌ ControlTray: Error starting webcam with ${facingModeToTry}:`, error);
       setActiveLocalVideoStream(null);
       onVideoStreamChange(null);
-      onAppCamToggle(false); // Explicitly turn off if start fails
+      onAppCamToggle(false); // Signal App to turn off cam state if start fails
     } finally {
       setIsSwitchingCamera(false);
     }
@@ -205,66 +186,71 @@ function ControlTray({
     }
     setActiveLocalVideoStream(null);
     onVideoStreamChange(null);
-    // onAppCamToggle(false); // This will be set by the useEffect in App.tsx
+    console.log("ControlTray: Webcam stopped.");
   };
 
-  const handleCamToggle = () => {
+  const handleCamToggle = async () => {
     if (isSwitchingCamera) return;
-    onAppCamToggle(!isAppCamActive); // Let App.tsx manage the state and trigger start/stopWebcam
+    const newCamState = !isAppCamActive;
+
+    if (newCamState) { // Turning camera ON
+      if (!(await ensureConnectedAndReady())) {
+        onAppCamToggle(false); // Keep cam state off if connection fails
+        return;
+      }
+      // If mic is not already active, activate it as well
+      if (!isAppMicActive) {
+        onAppMicToggle(true); // This will trigger AudioRecorder via useEffect
+        console.log("ControlTray: Mic also activated with camera.");
+      }
+      onAppCamToggle(true); // This will trigger startWebcam via useEffect
+    } else { // Turning camera OFF
+      onAppCamToggle(false); // This will trigger stopWebcam via useEffect
+      // The disconnect logic if both are off is now in App.tsx's AppLogic
+    }
+    console.log(`ControlTray: Camera toggled to ${newCamState}`);
   };
 
   const handleSwitchCamera = async () => {
+    // ... (منطق تعویض دوربین مثل قبل، اما مطمئن شوید که isAppCamActive را به درستی مدیریت می‌کند) ...
     if (!isAppCamActive || !activeLocalVideoStream || isSwitchingCamera) return;
     
     setIsSwitchingCamera(true);
     const targetFacingMode = currentFacingMode === 'user' ? 'environment' : 'user';
     
-    // Stop current stream first
     activeLocalVideoStream.getTracks().forEach(track => track.stop());
-    // setActiveLocalVideoStream(null); // Let new stream assignment handle this
-    // onVideoStreamChange(null);
 
     try {
       const newStream = await navigator.mediaDevices.getUserMedia({
         video: { facingMode: { exact: targetFacingMode } },
         audio: false,
       });
-      setActiveLocalVideoStream(newStream); // This will trigger videoRef update
+      setActiveLocalVideoStream(newStream);
       onVideoStreamChange(newStream);
       setCurrentFacingMode(targetFacingMode);
     } catch (error) {
       console.error(`❌ Error switching camera to ${targetFacingMode}:`, error);
-      // Attempt to restore previous stream or stop
       try {
         const restoredStream = await navigator.mediaDevices.getUserMedia({ video: { facingMode: currentFacingMode }, audio: false });
         setActiveLocalVideoStream(restoredStream);
         onVideoStreamChange(restoredStream);
       } catch (restoreError) {
           console.error('❌ Error restoring camera:', restoreError);
-          setActiveLocalVideoStream(null); // Ensure stream is cleared
+          setActiveLocalVideoStream(null);
           onVideoStreamChange(null);
-          onAppCamToggle(false); // Turn off cam at app level if all fails
+          onAppCamToggle(false);
       }
     } finally {
       setIsSwitchingCamera(false);
     }
   };
 
-   // Disconnect logic (optional: if both mic and cam are off)
-   useEffect(() => {
-    if (!isAppMicActive && !isAppCamActive && connected) {
-      console.log("🎤❌ 📸❌ Both Mic and Cam are off. Disconnecting stream.");
-      // disconnect(); // Uncomment if you want to auto-disconnect
-    }
-   }, [isAppMicActive, isAppCamActive, connected, disconnect]);
-
-
   return (
-    <footer id="footer-controls" className={cn("footer-controls fixed bottom-0 left-1/2 transform -translate-x-1/2 z-50", { // Added positioning classes
+    <footer id="footer-controls" className={cn("footer-controls fixed bottom-0 left-1/2 transform -translate-x-1/2 z-50", {
         'layout-default': !isAppCamActive,
         'layout-with-small-logo': isAppCamActive
     })}>
-      <canvas style={{ display: "none" }} ref={renderCanvasRef} /> {/* Canvas for video frame processing */}
+      <canvas style={{ display: "none" }} ref={renderCanvasRef} />
       
       <div id="cam-button-wrapper" className="relative flex justify-center">
         <button
@@ -272,7 +258,7 @@ function ControlTray({
           className="control-button cam-button-color"
           onClick={handleCamToggle}
           disabled={isSwitchingCamera || !supportsVideo}
-          title={isAppCamActive ? "Stop Camera" : "Start Camera"}
+          title={isAppCamActive ? "Stop Camera & Mic (if not used)" : "Start Camera & Mic"}
         >
           {isAppCamActive ? <SvgStopCamIcon /> : <SvgCameraIcon />}
         </button>
@@ -280,7 +266,7 @@ function ControlTray({
           <button
             id="switch-camera-button"
             aria-label="Switch Camera"
-            className="switch-camera-button-content group" // Added group for icon hover effects
+            className="switch-camera-button-content group"
             onClick={handleSwitchCamera}
             disabled={!isAppCamActive || isSwitchingCamera}
           >
@@ -304,18 +290,6 @@ function ControlTray({
       >
         {isAppMicActive ? <SvgPauseIcon /> : <SvgMicrophoneIcon />}
       </button>
-
-       {/* Hidden button for manual connect/disconnect for debugging if needed */}
-       <button
-          style={{ display: 'none'}}
-          onClick={async () => {
-            if (connected) await disconnect();
-            else await connect();
-          }}
-          title={connected ? "Disconnect Stream (Debug)" : "Connect Stream (Debug)"}
-        >
-          {connected ? "D" : "C"}
-       </button>
     </footer>
   );
 }