mirror of
https://github.com/blakeblackshear/frigate.git
synced 2024-11-21 19:07:46 +01:00
Add status bar provider (#11066)
This commit is contained in:
parent
acadfb6959
commit
ba3930ab02
11
web/package-lock.json
generated
11
web/package-lock.json
generated
@ -39,6 +39,7 @@
|
|||||||
"idb-keyval": "^6.2.1",
|
"idb-keyval": "^6.2.1",
|
||||||
"immer": "^10.0.4",
|
"immer": "^10.0.4",
|
||||||
"konva": "^9.3.6",
|
"konva": "^9.3.6",
|
||||||
|
"lodash": "^4.17.21",
|
||||||
"lucide-react": "^0.372.0",
|
"lucide-react": "^0.372.0",
|
||||||
"monaco-yaml": "^5.1.1",
|
"monaco-yaml": "^5.1.1",
|
||||||
"next-themes": "^0.3.0",
|
"next-themes": "^0.3.0",
|
||||||
@ -71,6 +72,7 @@
|
|||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@tailwindcss/forms": "^0.5.7",
|
"@tailwindcss/forms": "^0.5.7",
|
||||||
"@testing-library/jest-dom": "^6.1.5",
|
"@testing-library/jest-dom": "^6.1.5",
|
||||||
|
"@types/lodash": "^4.17.0",
|
||||||
"@types/node": "^20.12.7",
|
"@types/node": "^20.12.7",
|
||||||
"@types/react": "^18.2.79",
|
"@types/react": "^18.2.79",
|
||||||
"@types/react-dom": "^18.2.25",
|
"@types/react-dom": "^18.2.25",
|
||||||
@ -2523,6 +2525,12 @@
|
|||||||
"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
|
"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
|
||||||
"integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA=="
|
"integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA=="
|
||||||
},
|
},
|
||||||
|
"node_modules/@types/lodash": {
|
||||||
|
"version": "4.17.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.0.tgz",
|
||||||
|
"integrity": "sha512-t7dhREVv6dbNj0q17X12j7yDG4bD/DHYX7o5/DbDxobP0HnGPgpRz2Ej77aL7TZT3DSw13fqUTj8J4mMnqa7WA==",
|
||||||
|
"dev": true
|
||||||
|
},
|
||||||
"node_modules/@types/mute-stream": {
|
"node_modules/@types/mute-stream": {
|
||||||
"version": "0.0.4",
|
"version": "0.0.4",
|
||||||
"resolved": "https://registry.npmjs.org/@types/mute-stream/-/mute-stream-0.0.4.tgz",
|
"resolved": "https://registry.npmjs.org/@types/mute-stream/-/mute-stream-0.0.4.tgz",
|
||||||
@ -5299,8 +5307,7 @@
|
|||||||
"node_modules/lodash": {
|
"node_modules/lodash": {
|
||||||
"version": "4.17.21",
|
"version": "4.17.21",
|
||||||
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
|
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
|
||||||
"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
|
"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
|
||||||
"dev": true
|
|
||||||
},
|
},
|
||||||
"node_modules/lodash.merge": {
|
"node_modules/lodash.merge": {
|
||||||
"version": "4.6.2",
|
"version": "4.6.2",
|
||||||
|
@ -44,6 +44,7 @@
|
|||||||
"idb-keyval": "^6.2.1",
|
"idb-keyval": "^6.2.1",
|
||||||
"immer": "^10.0.4",
|
"immer": "^10.0.4",
|
||||||
"konva": "^9.3.6",
|
"konva": "^9.3.6",
|
||||||
|
"lodash": "^4.17.21",
|
||||||
"lucide-react": "^0.372.0",
|
"lucide-react": "^0.372.0",
|
||||||
"monaco-yaml": "^5.1.1",
|
"monaco-yaml": "^5.1.1",
|
||||||
"next-themes": "^0.3.0",
|
"next-themes": "^0.3.0",
|
||||||
@ -76,6 +77,7 @@
|
|||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@tailwindcss/forms": "^0.5.7",
|
"@tailwindcss/forms": "^0.5.7",
|
||||||
"@testing-library/jest-dom": "^6.1.5",
|
"@testing-library/jest-dom": "^6.1.5",
|
||||||
|
"@types/lodash": "^4.17.0",
|
||||||
"@types/node": "^20.12.7",
|
"@types/node": "^20.12.7",
|
||||||
"@types/react": "^18.2.79",
|
"@types/react": "^18.2.79",
|
||||||
"@types/react-dom": "^18.2.25",
|
"@types/react-dom": "^18.2.25",
|
||||||
|
@ -1,7 +1,12 @@
|
|||||||
import { useFrigateStats } from "@/api/ws";
|
import { useFrigateStats } from "@/api/ws";
|
||||||
|
import {
|
||||||
|
StatusBarMessagesContext,
|
||||||
|
StatusMessage,
|
||||||
|
} from "@/context/statusbar-provider";
|
||||||
import useStats from "@/hooks/use-stats";
|
import useStats from "@/hooks/use-stats";
|
||||||
import { FrigateStats } from "@/types/stats";
|
import { FrigateStats } from "@/types/stats";
|
||||||
import { useMemo } from "react";
|
import { useContext, useEffect, useMemo } from "react";
|
||||||
|
import { FaCheck } from "react-icons/fa";
|
||||||
import { IoIosWarning } from "react-icons/io";
|
import { IoIosWarning } from "react-icons/io";
|
||||||
import { MdCircle } from "react-icons/md";
|
import { MdCircle } from "react-icons/md";
|
||||||
import useSWR from "swr";
|
import useSWR from "swr";
|
||||||
@ -11,6 +16,10 @@ export default function Statusbar() {
|
|||||||
revalidateOnFocus: false,
|
revalidateOnFocus: false,
|
||||||
});
|
});
|
||||||
const { payload: latestStats } = useFrigateStats();
|
const { payload: latestStats } = useFrigateStats();
|
||||||
|
const { messages, addMessage, clearMessages } = useContext(
|
||||||
|
StatusBarMessagesContext,
|
||||||
|
)!;
|
||||||
|
|
||||||
const stats = useMemo(() => {
|
const stats = useMemo(() => {
|
||||||
if (latestStats) {
|
if (latestStats) {
|
||||||
return latestStats;
|
return latestStats;
|
||||||
@ -31,6 +40,13 @@ export default function Statusbar() {
|
|||||||
|
|
||||||
const { potentialProblems } = useStats(stats);
|
const { potentialProblems } = useStats(stats);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
clearMessages("stats");
|
||||||
|
potentialProblems.forEach((problem) => {
|
||||||
|
addMessage("stats", problem.text, problem.color);
|
||||||
|
});
|
||||||
|
}, [potentialProblems, addMessage, clearMessages]);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="absolute left-0 bottom-0 right-0 w-full h-8 flex justify-between items-center px-4 bg-background_alt z-10 dark:text-secondary-foreground border-t border-secondary-highlight">
|
<div className="absolute left-0 bottom-0 right-0 w-full h-8 flex justify-between items-center px-4 bg-background_alt z-10 dark:text-secondary-foreground border-t border-secondary-highlight">
|
||||||
<div className="h-full flex items-center gap-2">
|
<div className="h-full flex items-center gap-2">
|
||||||
@ -86,16 +102,26 @@ export default function Statusbar() {
|
|||||||
})}
|
})}
|
||||||
</div>
|
</div>
|
||||||
<div className="h-full flex items-center gap-2">
|
<div className="h-full flex items-center gap-2">
|
||||||
{potentialProblems.map((prob) => (
|
{Object.entries(messages).length === 0 ? (
|
||||||
<div
|
<div className="flex items-center text-sm gap-2">
|
||||||
key={prob.text}
|
<FaCheck className="size-3 text-green-500" />
|
||||||
className="flex items-center text-sm gap-2 capitalize"
|
System is healthy
|
||||||
>
|
</div>
|
||||||
<IoIosWarning className={`size-5 ${prob.color}`} />
|
) : (
|
||||||
{prob.text}
|
Object.entries(messages).map(([key, messageArray]) => (
|
||||||
|
<div key={key} className="h-full flex items-center gap-2">
|
||||||
|
{messageArray.map(({ id, text, color }: StatusMessage) => (
|
||||||
|
<div key={id} className="flex items-center text-sm gap-2">
|
||||||
|
<IoIosWarning
|
||||||
|
className={`size-5 ${color || "text-danger"}`}
|
||||||
|
/>
|
||||||
|
{text}
|
||||||
</div>
|
</div>
|
||||||
))}
|
))}
|
||||||
</div>
|
</div>
|
||||||
|
))
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
@ -4,11 +4,15 @@ import { Drawer, DrawerContent, DrawerTrigger } from "../ui/drawer";
|
|||||||
import useSWR from "swr";
|
import useSWR from "swr";
|
||||||
import { FrigateStats } from "@/types/stats";
|
import { FrigateStats } from "@/types/stats";
|
||||||
import { useFrigateStats } from "@/api/ws";
|
import { useFrigateStats } from "@/api/ws";
|
||||||
import { useMemo } from "react";
|
import { useContext, useEffect, useMemo } from "react";
|
||||||
import useStats from "@/hooks/use-stats";
|
import useStats from "@/hooks/use-stats";
|
||||||
import GeneralSettings from "../menu/GeneralSettings";
|
import GeneralSettings from "../menu/GeneralSettings";
|
||||||
import AccountSettings from "../menu/AccountSettings";
|
import AccountSettings from "../menu/AccountSettings";
|
||||||
import useNavigation from "@/hooks/use-navigation";
|
import useNavigation from "@/hooks/use-navigation";
|
||||||
|
import {
|
||||||
|
StatusBarMessagesContext,
|
||||||
|
StatusMessage,
|
||||||
|
} from "@/context/statusbar-provider";
|
||||||
|
|
||||||
function Bottombar() {
|
function Bottombar() {
|
||||||
const navItems = useNavigation("secondary");
|
const navItems = useNavigation("secondary");
|
||||||
@ -30,6 +34,11 @@ function StatusAlertNav() {
|
|||||||
revalidateOnFocus: false,
|
revalidateOnFocus: false,
|
||||||
});
|
});
|
||||||
const { payload: latestStats } = useFrigateStats();
|
const { payload: latestStats } = useFrigateStats();
|
||||||
|
|
||||||
|
const { messages, addMessage, clearMessages } = useContext(
|
||||||
|
StatusBarMessagesContext,
|
||||||
|
)!;
|
||||||
|
|
||||||
const stats = useMemo(() => {
|
const stats = useMemo(() => {
|
||||||
if (latestStats) {
|
if (latestStats) {
|
||||||
return latestStats;
|
return latestStats;
|
||||||
@ -39,7 +48,14 @@ function StatusAlertNav() {
|
|||||||
}, [initialStats, latestStats]);
|
}, [initialStats, latestStats]);
|
||||||
const { potentialProblems } = useStats(stats);
|
const { potentialProblems } = useStats(stats);
|
||||||
|
|
||||||
if (!potentialProblems || potentialProblems.length == 0) {
|
useEffect(() => {
|
||||||
|
clearMessages("stats");
|
||||||
|
potentialProblems.forEach((problem) => {
|
||||||
|
addMessage("stats", problem.text, problem.color);
|
||||||
|
});
|
||||||
|
}, [potentialProblems, addMessage, clearMessages]);
|
||||||
|
|
||||||
|
if (!messages || Object.keys(messages).length === 0) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -50,13 +66,16 @@ function StatusAlertNav() {
|
|||||||
</DrawerTrigger>
|
</DrawerTrigger>
|
||||||
<DrawerContent className="max-h-[75dvh] px-2 mx-1 rounded-t-2xl overflow-hidden">
|
<DrawerContent className="max-h-[75dvh] px-2 mx-1 rounded-t-2xl overflow-hidden">
|
||||||
<div className="w-full h-auto py-4 overflow-y-auto overflow-x-hidden flex flex-col items-center gap-2">
|
<div className="w-full h-auto py-4 overflow-y-auto overflow-x-hidden flex flex-col items-center gap-2">
|
||||||
{potentialProblems.map((prob) => (
|
{Object.entries(messages).map(([key, messageArray]) => (
|
||||||
<div
|
<div key={key} className="w-full flex items-center gap-2">
|
||||||
key={prob.text}
|
{messageArray.map(({ id, text, color }: StatusMessage) => (
|
||||||
className="w-full flex items-center text-xs gap-2 capitalize"
|
<div key={id} className="flex items-center text-xs gap-2">
|
||||||
>
|
<IoIosWarning
|
||||||
<IoIosWarning className={`size-5 ${prob.color}`} />
|
className={`size-5 ${color || "text-danger"}`}
|
||||||
{prob.text}
|
/>
|
||||||
|
{text}
|
||||||
|
</div>
|
||||||
|
))}
|
||||||
</div>
|
</div>
|
||||||
))}
|
))}
|
||||||
</div>
|
</div>
|
||||||
|
@ -1,7 +1,14 @@
|
|||||||
import { FrigateConfig } from "@/types/frigateConfig";
|
import { FrigateConfig } from "@/types/frigateConfig";
|
||||||
import useSWR from "swr";
|
import useSWR from "swr";
|
||||||
import ActivityIndicator from "@/components/indicators/activity-indicator";
|
import ActivityIndicator from "@/components/indicators/activity-indicator";
|
||||||
import { useCallback, useEffect, useMemo, useRef, useState } from "react";
|
import {
|
||||||
|
useCallback,
|
||||||
|
useContext,
|
||||||
|
useEffect,
|
||||||
|
useMemo,
|
||||||
|
useRef,
|
||||||
|
useState,
|
||||||
|
} from "react";
|
||||||
import { PolygonCanvas } from "./PolygonCanvas";
|
import { PolygonCanvas } from "./PolygonCanvas";
|
||||||
import { Polygon, PolygonType } from "@/types/canvas";
|
import { Polygon, PolygonType } from "@/types/canvas";
|
||||||
import { interpolatePoints, parseCoordinates } from "@/utils/canvasUtil";
|
import { interpolatePoints, parseCoordinates } from "@/utils/canvasUtil";
|
||||||
@ -25,6 +32,7 @@ import ObjectMaskEditPane from "./ObjectMaskEditPane";
|
|||||||
import PolygonItem from "./PolygonItem";
|
import PolygonItem from "./PolygonItem";
|
||||||
import { Link } from "react-router-dom";
|
import { Link } from "react-router-dom";
|
||||||
import { isDesktop } from "react-device-detect";
|
import { isDesktop } from "react-device-detect";
|
||||||
|
import { StatusBarMessagesContext } from "@/context/statusbar-provider";
|
||||||
|
|
||||||
type MasksAndZoneProps = {
|
type MasksAndZoneProps = {
|
||||||
selectedCamera: string;
|
selectedCamera: string;
|
||||||
@ -50,6 +58,8 @@ export default function MasksAndZones({
|
|||||||
const containerRef = useRef<HTMLDivElement | null>(null);
|
const containerRef = useRef<HTMLDivElement | null>(null);
|
||||||
const [editPane, setEditPane] = useState<PolygonType | undefined>(undefined);
|
const [editPane, setEditPane] = useState<PolygonType | undefined>(undefined);
|
||||||
|
|
||||||
|
const { addMessage } = useContext(StatusBarMessagesContext)!;
|
||||||
|
|
||||||
const cameraConfig = useMemo(() => {
|
const cameraConfig = useMemo(() => {
|
||||||
if (config && selectedCamera) {
|
if (config && selectedCamera) {
|
||||||
return config.cameras[selectedCamera];
|
return config.cameras[selectedCamera];
|
||||||
@ -167,7 +177,8 @@ export default function MasksAndZones({
|
|||||||
setAllPolygons([...(editingPolygons ?? [])]);
|
setAllPolygons([...(editingPolygons ?? [])]);
|
||||||
setHoveredPolygonIndex(null);
|
setHoveredPolygonIndex(null);
|
||||||
setUnsavedChanges(false);
|
setUnsavedChanges(false);
|
||||||
}, [editingPolygons, setUnsavedChanges]);
|
addMessage("masks_zones", "Restart required (masks/zones changed)");
|
||||||
|
}, [editingPolygons, setUnsavedChanges, addMessage]);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (isLoading) {
|
if (isLoading) {
|
||||||
|
@ -4,7 +4,7 @@ import useSWR from "swr";
|
|||||||
import axios from "axios";
|
import axios from "axios";
|
||||||
import ActivityIndicator from "@/components/indicators/activity-indicator";
|
import ActivityIndicator from "@/components/indicators/activity-indicator";
|
||||||
import AutoUpdatingCameraImage from "@/components/camera/AutoUpdatingCameraImage";
|
import AutoUpdatingCameraImage from "@/components/camera/AutoUpdatingCameraImage";
|
||||||
import { useCallback, useEffect, useMemo, useState } from "react";
|
import { useCallback, useContext, useEffect, useMemo, useState } from "react";
|
||||||
import { Slider } from "@/components/ui/slider";
|
import { Slider } from "@/components/ui/slider";
|
||||||
import { Label } from "@/components/ui/label";
|
import { Label } from "@/components/ui/label";
|
||||||
import {
|
import {
|
||||||
@ -20,6 +20,7 @@ import { toast } from "sonner";
|
|||||||
import { Separator } from "../ui/separator";
|
import { Separator } from "../ui/separator";
|
||||||
import { Link } from "react-router-dom";
|
import { Link } from "react-router-dom";
|
||||||
import { LuExternalLink } from "react-icons/lu";
|
import { LuExternalLink } from "react-icons/lu";
|
||||||
|
import { StatusBarMessagesContext } from "@/context/statusbar-provider";
|
||||||
|
|
||||||
type MotionTunerProps = {
|
type MotionTunerProps = {
|
||||||
selectedCamera: string;
|
selectedCamera: string;
|
||||||
@ -41,6 +42,8 @@ export default function MotionTuner({
|
|||||||
const [changedValue, setChangedValue] = useState(false);
|
const [changedValue, setChangedValue] = useState(false);
|
||||||
const [isLoading, setIsLoading] = useState(false);
|
const [isLoading, setIsLoading] = useState(false);
|
||||||
|
|
||||||
|
const { addMessage, clearMessages } = useContext(StatusBarMessagesContext)!;
|
||||||
|
|
||||||
const { send: sendMotionThreshold } = useMotionThreshold(selectedCamera);
|
const { send: sendMotionThreshold } = useMotionThreshold(selectedCamera);
|
||||||
const { send: sendMotionContourArea } = useMotionContourArea(selectedCamera);
|
const { send: sendMotionContourArea } = useMotionContourArea(selectedCamera);
|
||||||
const { send: sendImproveContrast } = useImproveContrast(selectedCamera);
|
const { send: sendImproveContrast } = useImproveContrast(selectedCamera);
|
||||||
@ -145,7 +148,16 @@ export default function MotionTuner({
|
|||||||
const onCancel = useCallback(() => {
|
const onCancel = useCallback(() => {
|
||||||
setMotionSettings(origMotionSettings);
|
setMotionSettings(origMotionSettings);
|
||||||
setChangedValue(false);
|
setChangedValue(false);
|
||||||
}, [origMotionSettings]);
|
clearMessages("motion_tuner");
|
||||||
|
}, [origMotionSettings, clearMessages]);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (changedValue) {
|
||||||
|
addMessage("motion_tuner", "Unsaved motion tuner changes");
|
||||||
|
} else {
|
||||||
|
clearMessages("motion_tuner");
|
||||||
|
}
|
||||||
|
}, [changedValue, addMessage, clearMessages]);
|
||||||
|
|
||||||
if (!cameraConfig && !selectedCamera) {
|
if (!cameraConfig && !selectedCamera) {
|
||||||
return <ActivityIndicator />;
|
return <ActivityIndicator />;
|
||||||
|
@ -4,6 +4,7 @@ import { RecoilRoot } from "recoil";
|
|||||||
import { ApiProvider } from "@/api";
|
import { ApiProvider } from "@/api";
|
||||||
import { IconContext } from "react-icons";
|
import { IconContext } from "react-icons";
|
||||||
import { TooltipProvider } from "@/components/ui/tooltip";
|
import { TooltipProvider } from "@/components/ui/tooltip";
|
||||||
|
import { StatusBarMessagesProvider } from "@/context/statusbar-provider";
|
||||||
|
|
||||||
type TProvidersProps = {
|
type TProvidersProps = {
|
||||||
children: ReactNode;
|
children: ReactNode;
|
||||||
@ -16,7 +17,7 @@ function providers({ children }: TProvidersProps) {
|
|||||||
<ThemeProvider defaultTheme="system" storageKey="frigate-ui-theme">
|
<ThemeProvider defaultTheme="system" storageKey="frigate-ui-theme">
|
||||||
<TooltipProvider>
|
<TooltipProvider>
|
||||||
<IconContext.Provider value={{ size: "20" }}>
|
<IconContext.Provider value={{ size: "20" }}>
|
||||||
{children}
|
<StatusBarMessagesProvider>{children}</StatusBarMessagesProvider>
|
||||||
</IconContext.Provider>
|
</IconContext.Provider>
|
||||||
</TooltipProvider>
|
</TooltipProvider>
|
||||||
</ThemeProvider>
|
</ThemeProvider>
|
||||||
|
83
web/src/context/statusbar-provider.tsx
Normal file
83
web/src/context/statusbar-provider.tsx
Normal file
@ -0,0 +1,83 @@
|
|||||||
|
import {
|
||||||
|
createContext,
|
||||||
|
useState,
|
||||||
|
ReactNode,
|
||||||
|
useCallback,
|
||||||
|
useMemo,
|
||||||
|
} from "react";
|
||||||
|
|
||||||
|
export type StatusMessage = {
|
||||||
|
id: string;
|
||||||
|
text: string;
|
||||||
|
color?: string;
|
||||||
|
};
|
||||||
|
|
||||||
|
export type StatusMessagesState = {
|
||||||
|
[key: string]: StatusMessage[];
|
||||||
|
};
|
||||||
|
|
||||||
|
type StatusBarMessagesProviderProps = {
|
||||||
|
children: ReactNode;
|
||||||
|
};
|
||||||
|
|
||||||
|
type StatusBarMessagesContextValue = {
|
||||||
|
messages: StatusMessagesState;
|
||||||
|
addMessage: (
|
||||||
|
key: string,
|
||||||
|
message: string,
|
||||||
|
color?: string,
|
||||||
|
messageId?: string,
|
||||||
|
) => string;
|
||||||
|
removeMessage: (key: string, messageId: string) => void;
|
||||||
|
clearMessages: (key: string) => void;
|
||||||
|
};
|
||||||
|
|
||||||
|
export const StatusBarMessagesContext =
|
||||||
|
createContext<StatusBarMessagesContextValue | null>(null);
|
||||||
|
|
||||||
|
export function StatusBarMessagesProvider({
|
||||||
|
children,
|
||||||
|
}: StatusBarMessagesProviderProps) {
|
||||||
|
const [messagesState, setMessagesState] = useState<StatusMessagesState>({});
|
||||||
|
|
||||||
|
const messages = useMemo(() => messagesState, [messagesState]);
|
||||||
|
|
||||||
|
const addMessage = useCallback(
|
||||||
|
(key: string, message: string, color?: string, messageId?: string) => {
|
||||||
|
const id = messageId || Date.now().toString();
|
||||||
|
const msgColor = color || "text-danger";
|
||||||
|
setMessagesState((prevMessages) => ({
|
||||||
|
...prevMessages,
|
||||||
|
[key]: [
|
||||||
|
...(prevMessages[key] || []),
|
||||||
|
{ id, text: message, color: msgColor },
|
||||||
|
],
|
||||||
|
}));
|
||||||
|
return id;
|
||||||
|
},
|
||||||
|
[],
|
||||||
|
);
|
||||||
|
|
||||||
|
const removeMessage = useCallback((key: string, messageId: string) => {
|
||||||
|
setMessagesState((prevMessages) => ({
|
||||||
|
...prevMessages,
|
||||||
|
[key]: prevMessages[key].filter((msg) => msg.id !== messageId),
|
||||||
|
}));
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
const clearMessages = useCallback((key: string) => {
|
||||||
|
setMessagesState((prevMessages) => {
|
||||||
|
const updatedMessages = { ...prevMessages };
|
||||||
|
delete updatedMessages[key];
|
||||||
|
return updatedMessages;
|
||||||
|
});
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<StatusBarMessagesContext.Provider
|
||||||
|
value={{ messages, addMessage, removeMessage, clearMessages }}
|
||||||
|
>
|
||||||
|
{children}
|
||||||
|
</StatusBarMessagesContext.Provider>
|
||||||
|
);
|
||||||
|
}
|
12
web/src/hooks/use-deep-memo.ts
Normal file
12
web/src/hooks/use-deep-memo.ts
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
import { useRef } from "react";
|
||||||
|
import { isEqual } from "lodash";
|
||||||
|
|
||||||
|
export default function useDeepMemo<T>(value: T) {
|
||||||
|
const ref = useRef<T | undefined>(undefined);
|
||||||
|
|
||||||
|
if (!isEqual(ref.current, value)) {
|
||||||
|
ref.current = value;
|
||||||
|
}
|
||||||
|
|
||||||
|
return ref.current;
|
||||||
|
}
|
@ -7,78 +7,82 @@ import {
|
|||||||
import { FrigateStats, PotentialProblem } from "@/types/stats";
|
import { FrigateStats, PotentialProblem } from "@/types/stats";
|
||||||
import { useMemo } from "react";
|
import { useMemo } from "react";
|
||||||
import useSWR from "swr";
|
import useSWR from "swr";
|
||||||
|
import useDeepMemo from "./use-deep-memo";
|
||||||
|
import { capitalizeFirstLetter } from "@/utils/stringUtil";
|
||||||
|
|
||||||
export default function useStats(stats: FrigateStats | undefined) {
|
export default function useStats(stats: FrigateStats | undefined) {
|
||||||
const { data: config } = useSWR<FrigateConfig>("config");
|
const { data: config } = useSWR<FrigateConfig>("config");
|
||||||
|
|
||||||
|
const memoizedStats = useDeepMemo(stats);
|
||||||
|
|
||||||
const potentialProblems = useMemo<PotentialProblem[]>(() => {
|
const potentialProblems = useMemo<PotentialProblem[]>(() => {
|
||||||
const problems: PotentialProblem[] = [];
|
const problems: PotentialProblem[] = [];
|
||||||
|
|
||||||
if (!stats) {
|
if (!memoizedStats) {
|
||||||
return problems;
|
return problems;
|
||||||
}
|
}
|
||||||
|
|
||||||
// if frigate has just started
|
// if frigate has just started
|
||||||
// don't look for issues
|
// don't look for issues
|
||||||
if (stats.service.uptime < 120) {
|
if (memoizedStats.service.uptime < 120) {
|
||||||
return problems;
|
return problems;
|
||||||
}
|
}
|
||||||
|
|
||||||
// check detectors for high inference speeds
|
// check detectors for high inference speeds
|
||||||
Object.entries(stats["detectors"]).forEach(([key, det]) => {
|
Object.entries(memoizedStats["detectors"]).forEach(([key, det]) => {
|
||||||
if (det["inference_speed"] > InferenceThreshold.error) {
|
if (det["inference_speed"] > InferenceThreshold.error) {
|
||||||
problems.push({
|
problems.push({
|
||||||
text: `${key} is very slow (${det["inference_speed"]} ms)`,
|
text: `${capitalizeFirstLetter(key)} is very slow (${det["inference_speed"]} ms)`,
|
||||||
color: "text-danger",
|
color: "text-danger",
|
||||||
});
|
});
|
||||||
} else if (det["inference_speed"] > InferenceThreshold.warning) {
|
} else if (det["inference_speed"] > InferenceThreshold.warning) {
|
||||||
problems.push({
|
problems.push({
|
||||||
text: `${key} is slow (${det["inference_speed"]} ms)`,
|
text: `${capitalizeFirstLetter(key)} is slow (${det["inference_speed"]} ms)`,
|
||||||
color: "text-orange-400",
|
color: "text-orange-400",
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
// check for offline cameras
|
// check for offline cameras
|
||||||
Object.entries(stats["cameras"]).forEach(([name, cam]) => {
|
Object.entries(memoizedStats["cameras"]).forEach(([name, cam]) => {
|
||||||
if (!config) {
|
if (!config) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (config.cameras[name].enabled && cam["camera_fps"] == 0) {
|
if (config.cameras[name].enabled && cam["camera_fps"] == 0) {
|
||||||
problems.push({
|
problems.push({
|
||||||
text: `${name.replaceAll("_", " ")} is offline`,
|
text: `${capitalizeFirstLetter(name.replaceAll("_", " "))} is offline`,
|
||||||
color: "text-danger",
|
color: "text-danger",
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
// check camera cpu usages
|
// check camera cpu usages
|
||||||
Object.entries(stats["cameras"]).forEach(([name, cam]) => {
|
Object.entries(memoizedStats["cameras"]).forEach(([name, cam]) => {
|
||||||
const ffmpegAvg = parseFloat(
|
const ffmpegAvg = parseFloat(
|
||||||
stats["cpu_usages"][cam["ffmpeg_pid"]]?.cpu_average,
|
memoizedStats["cpu_usages"][cam["ffmpeg_pid"]]?.cpu_average,
|
||||||
);
|
);
|
||||||
const detectAvg = parseFloat(
|
const detectAvg = parseFloat(
|
||||||
stats["cpu_usages"][cam["pid"]]?.cpu_average,
|
memoizedStats["cpu_usages"][cam["pid"]]?.cpu_average,
|
||||||
);
|
);
|
||||||
|
|
||||||
if (!isNaN(ffmpegAvg) && ffmpegAvg >= CameraFfmpegThreshold.error) {
|
if (!isNaN(ffmpegAvg) && ffmpegAvg >= CameraFfmpegThreshold.error) {
|
||||||
problems.push({
|
problems.push({
|
||||||
text: `${name.replaceAll("_", " ")} has high FFMPEG CPU usage (${ffmpegAvg}%)`,
|
text: `${capitalizeFirstLetter(name.replaceAll("_", " "))} has high FFMPEG CPU usage (${ffmpegAvg}%)`,
|
||||||
color: "text-danger",
|
color: "text-danger",
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!isNaN(detectAvg) && detectAvg >= CameraDetectThreshold.error) {
|
if (!isNaN(detectAvg) && detectAvg >= CameraDetectThreshold.error) {
|
||||||
problems.push({
|
problems.push({
|
||||||
text: `${name.replaceAll("_", " ")} has high detect CPU usage (${detectAvg}%)`,
|
text: `${capitalizeFirstLetter(name.replaceAll("_", " "))} has high detect CPU usage (${detectAvg}%)`,
|
||||||
color: "text-danger",
|
color: "text-danger",
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
return problems;
|
return problems;
|
||||||
}, [config, stats]);
|
}, [config, memoizedStats]);
|
||||||
|
|
||||||
return { potentialProblems };
|
return { potentialProblems };
|
||||||
}
|
}
|
||||||
|
3
web/src/utils/stringUtil.ts
Normal file
3
web/src/utils/stringUtil.ts
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
export const capitalizeFirstLetter = (text: string): string => {
|
||||||
|
return text.charAt(0).toUpperCase() + text.slice(1);
|
||||||
|
};
|
Loading…
Reference in New Issue
Block a user