From f9e1ad253f8aeab8666af992875999cc590c7670 Mon Sep 17 00:00:00 2001
From: Josh Hawkins <32435876+hawkeye217@users.noreply.github.com>
Date: Sun, 30 Jun 2024 07:04:45 -0500
Subject: [PATCH] Check websocket readyState for disconnect and fix firefox pip
 (#12216)

---
 web/src/components/player/MsePlayer.tsx  |  6 ++--
 web/src/views/live/LiveCameraView.tsx    | 43 ++++++++++++++----------
 web/src/views/live/LiveDashboardView.tsx | 29 +++++++++-------
 3 files changed, 46 insertions(+), 32 deletions(-)

diff --git a/web/src/components/player/MsePlayer.tsx b/web/src/components/player/MsePlayer.tsx
index 8a371fed7..c2769cd94 100644
--- a/web/src/components/player/MsePlayer.tsx
+++ b/web/src/components/player/MsePlayer.tsx
@@ -128,12 +128,12 @@ function MSEPlayer({
       setSafariPlaying(false);
     }
 
-    if (wsRef.current && wsState != WebSocket.CLOSED) {
+    if (wsRef.current) {
       setWsState(WebSocket.CLOSED);
       wsRef.current.close();
       wsRef.current = null;
     }
-  }, [wsState, bufferTimeout, safariPlaying]);
+  }, [bufferTimeout, safariPlaying]);
 
   const onOpen = () => {
     setWsState(WebSocket.OPEN);
@@ -359,7 +359,7 @@ function MSEPlayer({
   // ensure we disconnect for slower connections
 
   useEffect(() => {
-    if (wsState === WebSocket.OPEN && !playbackEnabled) {
+    if (wsRef.current?.readyState === WebSocket.OPEN && !playbackEnabled) {
       if (bufferTimeout) {
         clearTimeout(bufferTimeout);
         setBufferTimeout(undefined);
diff --git a/web/src/views/live/LiveCameraView.tsx b/web/src/views/live/LiveCameraView.tsx
index f75a7186a..fdb2446e9 100644
--- a/web/src/views/live/LiveCameraView.tsx
+++ b/web/src/views/live/LiveCameraView.tsx
@@ -21,7 +21,11 @@ import { TooltipProvider } from "@/components/ui/tooltip";
 import { useResizeObserver } from "@/hooks/resize-observer";
 import useKeyboardListener from "@/hooks/use-keyboard-listener";
 import { CameraConfig, FrigateConfig } from "@/types/frigateConfig";
-import { LiveStreamMetadata, VideoResolutionType } from "@/types/live";
+import {
+  LivePlayerError,
+  LiveStreamMetadata,
+  VideoResolutionType,
+} from "@/types/live";
 import { CameraPtzInfo } from "@/types/ptz";
 import { RecordingStartingPoint } from "@/types/record";
 import React, {
@@ -33,6 +37,7 @@ import React, {
 } from "react";
 import {
   isDesktop,
+  isFirefox,
   isIOS,
   isMobile,
   isTablet,
@@ -275,6 +280,15 @@ export default function LiveCameraView({
     }
   }, [fullscreen, isPortrait, cameraAspectRatio, containerAspectRatio]);
 
+  const handleError = useCallback((e: LivePlayerError) => {
+    if (e == "mse-decode") {
+      setWebRTC(true);
+    } else {
+      setWebRTC(false);
+      setLowBandwidth(true);
+    }
+  }, []);
+
   return (
     <TransformWrapper minScale={1.0}>
       <div
@@ -353,7 +367,7 @@ export default function LiveCameraView({
                   onClick={toggleFullscreen}
                 />
               )}
-              {!isIOS && (
+              {!isIOS && !isFirefox && (
                 <CameraFeatureToggle
                   className="p-2 md:p-0"
                   variant={fullscreen ? "overlay" : "primary"}
@@ -435,26 +449,21 @@ export default function LiveCameraView({
                 pip={pip}
                 setFullResolution={setFullResolution}
                 containerRef={containerRef}
-                onError={(e) => {
-                  if (e == "mse-decode") {
-                    setWebRTC(true);
-                  } else {
-                    setWebRTC(false);
-                    setLowBandwidth(true);
-                  }
-                }}
+                onError={handleError}
               />
             </div>
-            {camera.onvif.host != "" && (
-              <PtzControlPanel
-                camera={camera.name}
-                clickOverlay={clickOverlay}
-                setClickOverlay={setClickOverlay}
-              />
-            )}
           </TransformComponent>
         </div>
       </div>
+      {camera.onvif.host != "" && (
+        <div className="flex flex-col items-center justify-center">
+          <PtzControlPanel
+            camera={camera.name}
+            clickOverlay={clickOverlay}
+            setClickOverlay={setClickOverlay}
+          />
+        </div>
+      )}
     </TransformWrapper>
   );
 }
diff --git a/web/src/views/live/LiveDashboardView.tsx b/web/src/views/live/LiveDashboardView.tsx
index ded0cff91..9cf8d7198 100644
--- a/web/src/views/live/LiveDashboardView.tsx
+++ b/web/src/views/live/LiveDashboardView.tsx
@@ -23,7 +23,7 @@ import DraggableGridLayout from "./DraggableGridLayout";
 import { IoClose } from "react-icons/io5";
 import { LuLayoutDashboard } from "react-icons/lu";
 import { cn } from "@/lib/utils";
-import { LivePlayerMode } from "@/types/live";
+import { LivePlayerError, LivePlayerMode } from "@/types/live";
 
 type LiveDashboardViewProps = {
   cameras: CameraConfig[];
@@ -184,6 +184,21 @@ export default function LiveDashboardView({
 
   const birdseyeConfig = useMemo(() => config?.birdseye, [config]);
 
+  const handleError = useCallback(
+    (cameraName: string, error: LivePlayerError) => {
+      setPreferredLiveModes((prevModes) => {
+        const newModes = { ...prevModes };
+        if (error === "mse-decode") {
+          newModes[cameraName] = "webrtc";
+        } else {
+          newModes[cameraName] = "jsmpeg";
+        }
+        return newModes;
+      });
+    },
+    [setPreferredLiveModes],
+  );
+
   return (
     <div
       className="scrollbar-container size-full overflow-y-auto px-1 pt-2 md:p-2"
@@ -315,17 +330,7 @@ export default function LiveDashboardView({
                 preferredLiveMode={preferredLiveModes[camera.name] ?? "mse"}
                 autoLive={autoLiveView}
                 onClick={() => onSelectCamera(camera.name)}
-                onError={(e) => {
-                  setPreferredLiveModes((prevModes) => {
-                    const newModes = { ...prevModes };
-                    if (e === "mse-decode") {
-                      newModes[camera.name] = "webrtc";
-                    } else {
-                      newModes[camera.name] = "jsmpeg";
-                    }
-                    return newModes;
-                  });
-                }}
+                onError={(e) => handleError(camera.name, e)}
               />
             );
           })}