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

src/components/control-tray/ControlTray.tsx

@@ -5,15 +5,11 @@ Copyright 2024 Google LLC
 import cn from "classnames";
 import React, { memo, ReactNode, RefObject, useEffect, useRef, useState } from "react";
 import { useLiveAPIContext } from "../../contexts/LiveAPIContext";
-// import { UseMediaStreamResult } from "../../hooks/use-media-stream-mux"; // دیگر استفاده نمی‌شود؟
-// import { useScreenCapture } from "../../hooks/use-screen-capture"; // اگر نیاز به اشتراک صفحه نیست، حذف شود
-// import { useWebcam } from "../../hooks/use-webcam"; // منطق وب‌کم در همین فایل ادغام شده
 import { AudioRecorder } from "../../lib/audio-recorder";
 import { isIOS } from "../../lib/platform";
-// import AudioPulse from "../audio-pulse/AudioPulse"; // دیگر استفاده نمی‌شود
-import "./control-tray.scss"; // ممکن است خالی یا حاوی استایل‌های بسیار کمی باشد
+// import "./control-tray.scss"; // این فایل دیگر نباید استایلی داشته باشد یا باید حذف شود
 
-// 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>;
@@ -23,10 +19,9 @@ const SvgSwitchCameraIcon = () => <svg xmlns="http://www.w3.org/2000/svg" viewBo
 
 export type ControlTrayProps = {
   videoRef: RefObject<HTMLVideoElement>;
-  children?: ReactNode; // ممکن است دیگر استفاده نشود
+  children?: ReactNode;
   supportsVideo: boolean;
   onVideoStreamChange: (stream: MediaStream | null) => void;
-  // Props جدید از App.tsx
   isAppMicActive: boolean;
   onAppMicToggle: (active: boolean) => void;
   isAppCamActive: boolean;
@@ -44,18 +39,17 @@ function ControlTray({
   onAppCamToggle,
   createLogoFunction,
 }: ControlTrayProps) {
-  const { client, connected, connect, disconnect, volume } // volume ممکن است برای UI جدید استفاده نشود
+  const { client, connected, connect, disconnect, volume }
     = useLiveAPIContext();
   
   const [audioRecorder] = useState(() => new AudioRecorder());
-  const [muted, setMuted] = useState(true); // Initial state, will be synced with isAppMicActive
-  const [inVolume, setInVolume] = useState(0); // برای نمایش ولوم در آینده، اگر نیاز شد
+  const [muted, setMuted] = useState(true);
+  const [inVolume, setInVolume] = useState(0);
 
   const [activeLocalVideoStream, setActiveLocalVideoStream] = useState<MediaStream | null>(null);
   const [currentFacingMode, setCurrentFacingMode] = useState<'user' | 'environment'>('user');
   const [isSwitchingCamera, setIsSwitchingCamera] = useState(false);
 
-  // Sync with App's mic/cam state
   useEffect(() => {
     setMuted(!isAppMicActive);
   }, [isAppMicActive]);
@@ -69,8 +63,6 @@ function ControlTray({
   // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [isAppCamActive]);
 
-
-  // Audio recording logic (from your original ControlTray)
   useEffect(() => {
     const onData = (base64: string) => {
       if (client && connected) {
@@ -89,13 +81,12 @@ function ControlTray({
     };
   }, [connected, client, muted, audioRecorder]);
 
-  // Video frame sending logic (simplified from your original ControlTray)
   const renderCanvasRef = useRef<HTMLCanvasElement>(null);
   useEffect(() => {
     let timeoutId = -1;
     function sendVideoFrame() {
       if (connected && activeLocalVideoStream) {
-        timeoutId = window.setTimeout(sendVideoFrame, 1000 / 0.5); // ~2 FPS
+        timeoutId = window.setTimeout(sendVideoFrame, 1000 / 0.5); 
       }
       const video = videoRef.current;
       const canvas = renderCanvasRef.current;
@@ -104,12 +95,12 @@ function ControlTray({
       try {
         const ctx = canvas.getContext("2d");
         if (!ctx) return;
-        const scale = 0.25; // کاهش اندازه فریم برای ارسال
+        const scale = 0.25; 
         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.7); // کیفیت JPEG
+          const base64 = canvas.toDataURL("image/jpeg", 0.7); 
           const data = base64.slice(base64.indexOf(",") + 1);
           client.sendRealtimeInput([{ mimeType: "image/jpeg", data }]);
         }
@@ -119,12 +110,11 @@ function ControlTray({
     }
 
     if (connected && activeLocalVideoStream && videoRef.current) {
-      setTimeout(sendVideoFrame, 200); // Start sending frames after a short delay
+      setTimeout(sendVideoFrame, 200); 
     }
     return () => { clearTimeout(timeoutId); };
   }, [connected, activeLocalVideoStream, client, videoRef]);
 
-  // Assign stream to video element
   useEffect(() => {
     if (videoRef.current) {
       if (videoRef.current.srcObject !== activeLocalVideoStream) {
@@ -136,7 +126,6 @@ function ControlTray({
     }
   }, [activeLocalVideoStream, videoRef]);
 
-
   const ensureConnected = async () => {
     if (!connected) {
       try {
@@ -152,25 +141,24 @@ function ControlTray({
   const handleMicToggle = async () => {
     if (isSwitchingCamera) return;
     const newMicState = !isAppMicActive;
-    if (newMicState) { // Turning mic ON
+    if (newMicState) { 
       if(!await ensureConnected()) {
-        onAppMicToggle(false); // Failed to connect, revert UI
+        onAppMicToggle(false); 
         return;
       }
     }
     onAppMicToggle(newMicState);
-    // If mic is turned off and cam is also off, consider disconnecting
     if (!newMicState && !isAppCamActive && connected) {
-       // await disconnect(); // یا تصمیم بگیرید که اتصال را نگه دارید
+       // await disconnect(); 
     }
   };
 
   const startWebcam = async (facingModeToTry: 'user' | 'environment' = currentFacingMode) => {
     if (isSwitchingCamera) return;
-    setIsSwitchingCamera(true); // Prevent rapid clicks
+    setIsSwitchingCamera(true); 
 
     if(!await ensureConnected()) {
-        onAppCamToggle(false); // Failed to connect, revert UI
+        onAppCamToggle(false); 
         setIsSwitchingCamera(false);
         return;
     }
@@ -179,16 +167,15 @@ function ControlTray({
       console.log(`🚀 Starting webcam with facingMode: ${facingModeToTry}`);
       const mediaStream = await navigator.mediaDevices.getUserMedia({
         video: { facingMode: facingModeToTry },
-        audio: false, // Audio is handled by AudioRecorder
+        audio: false, 
       });
       setActiveLocalVideoStream(mediaStream);
-      onVideoStreamChange(mediaStream); // Update App.tsx's videoStream if needed for other components
+      onVideoStreamChange(mediaStream); 
       setCurrentFacingMode(facingModeToTry);
-      onAppCamToggle(true); // Update App's state
+      onAppCamToggle(true); 
     } catch (error) {
       console.error(`❌ Error starting webcam with ${facingModeToTry}:`, error);
-      // Try fallback if initial failed
-      if (facingModeToTry === 'user' && (error as Error).name !== 'NotFoundError') { // Avoid retry if no camera found
+      if (facingModeToTry === 'user' && (error as Error).name !== 'NotFoundError') { 
          try {
             const fallbackStream = await navigator.mediaDevices.getUserMedia({ video: { facingMode: 'environment' }, audio: false });
             setActiveLocalVideoStream(fallbackStream);
@@ -217,10 +204,9 @@ function ControlTray({
     }
     setActiveLocalVideoStream(null);
     onVideoStreamChange(null);
-    onAppCamToggle(false); // Update App's state
-    // If mic is also off, consider disconnecting
+    onAppCamToggle(false); 
     if (!isAppMicActive && connected) {
-        // await disconnect(); // یا تصمیم بگیرید که اتصال را نگه دارید
+        // await disconnect(); 
     }
   };
 
@@ -238,9 +224,8 @@ function ControlTray({
     setIsSwitchingCamera(true);
     const targetFacingMode = currentFacingMode === 'user' ? 'environment' : 'user';
     
-    // Stop current tracks before requesting new ones
     activeLocalVideoStream.getTracks().forEach(track => track.stop());
-    setActiveLocalVideoStream(null); // Clear stream temporarily
+    setActiveLocalVideoStream(null); 
     onVideoStreamChange(null);
 
     try {
@@ -252,30 +237,26 @@ function ControlTray({
       setActiveLocalVideoStream(newStream);
       onVideoStreamChange(newStream);
       setCurrentFacingMode(targetFacingMode);
-      // Ensure video element plays the new stream
       if (videoRef.current) {
         videoRef.current.srcObject = newStream;
         videoRef.current.play().catch(e => console.warn("Play failed on switch:", e));
       }
     } catch (error) {
       console.error(`❌ Error switching camera to ${targetFacingMode}:`, error);
-      // Try to restore previous stream or a default if switching failed
       console.log(`Attempting to restore camera to: ${currentFacingMode}`);
       try {
         const restoredStream = await navigator.mediaDevices.getUserMedia({
-            video: { facingMode: currentFacingMode }, // Try previous mode
+            video: { facingMode: currentFacingMode }, 
             audio: false,
         });
         setActiveLocalVideoStream(restoredStream);
         onVideoStreamChange(restoredStream);
-        // No need to change currentFacingMode as it's restored
          if (videoRef.current) {
             videoRef.current.srcObject = restoredStream;
             videoRef.current.play().catch(e => console.warn("Play failed on restore:", e));
         }
       } catch (restoreError) {
           console.error('❌ Error restoring camera:', restoreError);
-          // If all fails, turn off camera
           stopWebcam(); 
           onAppCamToggle(false);
       }
@@ -284,22 +265,24 @@ function ControlTray({
     }
   };
 
-  // Stop streams on disconnect
    useEffect(() => {
     if (!connected) {
       if (activeLocalVideoStream) {
         activeLocalVideoStream.getTracks().forEach(track => track.stop());
         setActiveLocalVideoStream(null);
         onVideoStreamChange(null);
-        onAppCamToggle(false); // Ensure UI consistency
+        onAppCamToggle(false); 
       }
-      if (audioRecorder.isRecording()) {
+      // --- START OF CORRECTION ---
+      if (audioRecorder.recording) { // Changed from isRecording()
          audioRecorder.stop();
-         onAppMicToggle(false); // Ensure UI consistency
+         onAppMicToggle(false); 
       }
+      // --- END OF CORRECTION ---
     }
   // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [connected]);
+  }, [connected, audioRecorder, activeLocalVideoStream, onAppCamToggle, onAppMicToggle, onVideoStreamChange]);
+  // Added dependencies to useEffect based on usage
 
 
   return (
@@ -308,7 +291,6 @@ function ControlTray({
         'layout-with-small-logo': isAppCamActive
     })}>
       <canvas style={{ display: "none" }} ref={renderCanvasRef} />
-      {/* Cam Button Wrapper (Now on the Left) */}
       <div id="cam-button-wrapper" className="relative flex justify-center">
         <button
           id="cam-button"
@@ -332,26 +314,22 @@ function ControlTray({
         </div>
       </div>
 
-      {/* Small Logo Container (middle when cam is active) */}
       {isAppCamActive && (
         <div id="small-logo-container" className="flex items-center justify-center">
             {createLogoFunction(true, isAppCamActive, 'human')}
         </div>
       )}
 
-      {/* Mic Button (Now on the Right) */}
       <button
         id="mic-button"
         className="control-button mic-button-color"
         onClick={handleMicToggle}
-        disabled={isSwitchingCamera} // Disable if camera is switching, or other conditions
+        disabled={isSwitchingCamera} 
         title={isAppMicActive ? "Mute Microphone" : "Unmute Microphone"}
       >
         {isAppMicActive ? <SvgPauseIcon /> : <SvgMicrophoneIcon />}
       </button>
 
-        {/* Original connect/disconnect button, hidden but logic can be reused or adapted */}
-        {/* This button's functionality is now implicitly handled by mic/cam toggles */}
        <button
           style={{ display: 'none'}}
           onClick={async () => {