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

src/components/control-tray/ControlTray.tsx

@@ -1,8 +1,8 @@
-// src/components/control-tray/ControlTray.tsx
+// src/components/control-tray/ControlTray.tsx (نسخه نهایی با اصلاح جایگاه دکمه تعویض دوربین)
 
 import cn from "classnames";
 import React, { memo, RefObject, useEffect, useState, useCallback, useRef } from "react";
-import { useAppContext } from "../../contexts/AppContext"; // <-- تغییر اصلی اینجاست
+import { useAppContext } from "../../contexts/AppContext";
 import { AudioRecorder } from "../../lib/audio-recorder";
 import Logo from '../logo/Logo';
 import { PauseIconWithSurroundPulse, microphoneIcon, cameraIcon, stopCamIcon } from '../icons';
@@ -21,7 +21,7 @@ export type ControlTrayProps = {
 };
 
 const ControlTray: React.FC<ControlTrayProps> = ({ videoRef, onUserSpeakingChange, isAppMicActive, onAppMicToggle, isAppCamActive, onAppCamToggle, currentFacingMode, onFacingModeChange }) => {
-  const { client, connected, connect, volume } = useAppContext(); // <-- تغییر اصلی اینجاست
+  const { client, connected, connect, volume } = useAppContext();
   const audioRecorderRef = useRef<AudioRecorder | null>(null);
   const [activeLocalVideoStream, setActiveLocalVideoStream] = useState<MediaStream | null>(null);
   const [isSwitchingCamera, setIsSwitchingCamera] = useState(false);
@@ -33,55 +33,34 @@ const ControlTray: React.FC<ControlTrayProps> = ({ videoRef, onUserSpeakingChang
         audioRecorderRef.current = new AudioRecorder();
     }
     const audioRecorder = audioRecorderRef.current;
-    
     const handleAudioData = (base64: string, vol: number) => {
       if (client && connected && isAppMicActive) {
-        if (base64) {
-          client.sendRealtimeInput([{ mimeType: "audio/pcm;rate=16000", data: base64 }]);
-        }
+        if (base64) client.sendRealtimeInput([{ mimeType: "audio/pcm;rate=16000", data: base64 }]);
         setUserVolume(vol);
         onUserSpeakingChange(vol > 0.01);
       }
     };
-    
-    const onStop = () => {
-        setUserVolume(0);
-        onUserSpeakingChange(false);
-    }
-
+    const onStop = () => { setUserVolume(0); onUserSpeakingChange(false); };
     if (isAppMicActive && connected) {
-      audioRecorder.on("data", handleAudioData);
-      audioRecorder.on("stop", onStop);
-      if (!audioRecorder.recording) {
-        audioRecorder.start();
-      }
+      audioRecorder.on("data", handleAudioData).on("stop", onStop);
+      if (!audioRecorder.recording) audioRecorder.start();
     } else {
-      if (audioRecorder?.recording) {
-        audioRecorder.stop();
-      }
+      if (audioRecorder?.recording) audioRecorder.stop();
     }
-    
-    return () => {
-        if (audioRecorder) {
-          audioRecorder.off("data", handleAudioData);
-          audioRecorder.off("stop", onStop);
-        }
-    };
+    return () => { audioRecorder?.off("data", handleAudioData).off("stop", onStop); };
   }, [isAppMicActive, connected, onUserSpeakingChange, client]);
   
   useEffect(() => {
-    if (videoRef.current) {
-      if (videoRef.current.srcObject !== activeLocalVideoStream) {
-        videoRef.current.srcObject = activeLocalVideoStream;
-        if (activeLocalVideoStream) videoRef.current.play().catch(e => console.warn("Video play failed:", e));
-      }
+    if (videoRef.current && videoRef.current.srcObject !== activeLocalVideoStream) {
+      videoRef.current.srcObject = activeLocalVideoStream;
+      if (activeLocalVideoStream) videoRef.current.play().catch(e => console.warn("Video play failed:", e));
     }
   }, [activeLocalVideoStream, videoRef]);
 
   const startWebcam = useCallback(async (facingModeToTry: 'user' | 'environment') => {
     if (isSwitchingCamera) return;
     setIsSwitchingCamera(true);
-    if (activeLocalVideoStream) activeLocalVideoStream.getTracks().forEach(track => track.stop());
+    activeLocalVideoStream?.getTracks().forEach(track => track.stop());
     try {
       const mediaStream = await navigator.mediaDevices.getUserMedia({ video: { facingMode: facingModeToTry }, audio: false });
       setActiveLocalVideoStream(mediaStream);
@@ -105,39 +84,37 @@ const ControlTray: React.FC<ControlTrayProps> = ({ videoRef, onUserSpeakingChang
   }, [isAppCamActive, activeLocalVideoStream, isSwitchingCamera, startWebcam, currentFacingMode]);
 
   useEffect(() => {
-    let timeoutId = -1;
+    let timeoutId: number;
     function sendVideoFrame() {
-      if (connected && activeLocalVideoStream && client && videoRef.current) {
+      if (connected && activeLocalVideoStream) {
         const video = videoRef.current;
         const canvas = renderCanvasRef.current;
-        if (!canvas || video.readyState < video.HAVE_METADATA || video.paused || video.ended) {
-          if (activeLocalVideoStream) timeoutId = window.setTimeout(sendVideoFrame, 1000 / 4);
-          return;
+        if (video && canvas && video.readyState >= video.HAVE_METADATA && !video.paused) {
+          try {
+            const ctx = canvas.getContext("2d");
+            if (ctx) {
+              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);
+                const data = base64.slice(base64.indexOf(",") + 1);
+                if (data && client) client.sendRealtimeInput([{ mimeType: "image/jpeg", data }]);
+              }
+            }
+          } catch (error) { console.error("❌ Error frame:", error); }
         }
-        try {
-          const ctx = canvas.getContext("2d");
-          if (!ctx) return;
-          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);
-            const data = base64.slice(base64.indexOf(",") + 1);
-            if (data) client.sendRealtimeInput([{ mimeType: "image/jpeg", data }]);
-          }
-        } catch (error) { console.error("❌ Error frame:", error); }
+        timeoutId = window.setTimeout(sendVideoFrame, 1000 / 4);
       }
-      if (connected && activeLocalVideoStream) timeoutId = window.setTimeout(sendVideoFrame, 1000 / 4);
     }
-    if (connected && activeLocalVideoStream && videoRef.current) timeoutId = window.setTimeout(sendVideoFrame, 200);
+    if (connected && activeLocalVideoStream) timeoutId = window.setTimeout(sendVideoFrame, 200);
     return () => clearTimeout(timeoutId);
   }, [connected, activeLocalVideoStream, client, videoRef, renderCanvasRef]);
 
   const ensureConnectedAndReady = async (): Promise<boolean> => {
     if (!connected) {
-      try { await connect(); return true; }
-      catch (err) { console.error('❌ CT Connect err:', err); return false; }
+      try { await connect(); return true; } catch (err) { console.error('❌ CT Connect err:', err); return false; }
     }
     return true;
   };
@@ -145,9 +122,7 @@ const ControlTray: React.FC<ControlTrayProps> = ({ videoRef, onUserSpeakingChang
   const handleMicToggle = async () => {
     if (isSwitchingCamera) return;
     const newMicState = !isAppMicActive;
-    if (newMicState && !(await ensureConnectedAndReady())) {
-      onAppMicToggle(false); return;
-    }
+    if (newMicState && !(await ensureConnectedAndReady())) { onAppMicToggle(false); return; }
     onAppMicToggle(newMicState);
   };
 
@@ -176,7 +151,7 @@ const ControlTray: React.FC<ControlTrayProps> = ({ videoRef, onUserSpeakingChang
     } catch (error) {
       console.error(`❌ Switch Cam err to ${targetFacingMode}:`, error);
       try {
-        const restoredStream = await navigator.mediaDevices.getUserMedia({ video: { facingMode: {exact: currentFacingMode } }, audio: false });
+        const restoredStream = await navigator.mediaDevices.getUserMedia({ video: { facingMode: { exact: currentFacingMode } }, audio: false });
         setActiveLocalVideoStream(restoredStream);
       } catch (restoreError) {
         console.error(`❌ Restore Cam err to ${currentFacingMode}:`, restoreError);
@@ -191,12 +166,16 @@ const ControlTray: React.FC<ControlTrayProps> = ({ videoRef, onUserSpeakingChang
   const isSpeaking = userVolume > 0.01;
 
   return (
+    // ✅ ساختار JSX به حالت صحیح اولیه برگردانده شد
     <footer id="footer-controls" className="footer-controls-html-like">
       <canvas style={{ display: "none" }} ref={renderCanvasRef} />
+      
+      {/* دکمه میکروفون در سمت چپ */}
       <div id="mic-button" className="control-button mic-button-color" onClick={handleMicToggle}>
         {isAppMicActive ? <PauseIconWithSurroundPulse userVolume={userVolume} /> : microphoneIcon}
       </div>
       
+      {/* لوگو در وسط (فقط وقتی دوربین فعال است) */}
       {isAppCamActive && (
         <div id="small-logo-footer-container" className="small-logo-footer-html-like">
             <Logo 
@@ -209,7 +188,8 @@ const ControlTray: React.FC<ControlTrayProps> = ({ videoRef, onUserSpeakingChang
         </div>
       )}
 
-      <div id="cam-button-wrapper" className="control-button-wrapper">
+      {/* نگهدارنده دکمه دوربین و تعویض دوربین در سمت راست */}
+      <div className="control-button-wrapper">
         <div id="cam-button" className="control-button cam-button-color" onClick={handleCamToggle}>
           {isAppCamActive ? stopCamIcon : cameraIcon}
         </div>