feat: reload go2rtc config

This commit is contained in:
ZhaiSoul
2025-08-29 09:05:55 +00:00
parent 78e431d5e3
commit 85741c02e4
8 changed files with 577 additions and 84 deletions
+2 -1
View File
@@ -192,6 +192,7 @@
"edit": "Edit Camera",
"description": "Configure camera settings including stream inputs and roles.",
"name": "Camera Name",
"nameOnlyChangeToFriendlyName": "This will only change the Friendly Name.",
"nameRequired": "Camera name is required",
"nameLength": "Camera name must be less than 24 characters.",
"namePlaceholder": "e.g., front_door",
@@ -200,7 +201,7 @@
"inputs": "Input Streams",
"go2rtc": {
"title": "Use go2rtc stream",
"description": "will use go2rtc",
"description": "It will utilize go2rtc, enabling a smoother live viewing experience and allowing you to hear the camera audio.",
"compatibility": {
"title": "Video codec compatibility (Advanced)",
"description": "Here you can configure common go2rtc FFmpeg encoding parameters. Some of these parameters may help resolve certain video or audio issues.",
+17 -52
View File
@@ -250,7 +250,7 @@ export default function CameraEditForm({
if (cameraName && config?.cameras[cameraName]) {
const camera = config.cameras[cameraName];
defaultValues.enabled = camera.enabled ?? true;
defaultValues.ffmpeg.inputs = camera.ffmpeg?.inputs?.length
defaultValues.ffmpeg.inputs = camera.ffmpeg?.inputs
? camera.ffmpeg.inputs.map((input) => {
const isGo2rtcPath = input.path.match(
/^rtsp:\/\/127\.0\.0\.1:8554\/(.+)$/,
@@ -263,10 +263,7 @@ export default function CameraEditForm({
if (go2rtcStreamName && config.go2rtc?.streams) {
Object.entries(config.go2rtc.streams).forEach(
([streamKey, streamConfig]) => {
if (
streamKey === go2rtcStreamName ||
streamKey.startsWith(`${cameraName}_`)
) {
if (streamKey === go2rtcStreamName) {
if (Array.isArray(streamConfig) && streamConfig.length >= 1) {
originalPath = streamConfig[0] || "";
ffmpegParams = streamConfig[1] || "";
@@ -319,7 +316,9 @@ export default function CameraEditForm({
let friendly_name: string | undefined = undefined;
const isValidName = /^[a-zA-Z0-9_-]+$/.test(values.cameraName);
if (!isValidName) {
finalCameraName = generateFixedHash(finalCameraName);
finalCameraName = cameraName
? cameraName
: generateFixedHash(finalCameraName);
friendly_name = values.cameraName;
}
@@ -366,6 +365,8 @@ export default function CameraEditForm({
// Add update_topic for new cameras
if (!cameraName) {
requestBody.update_topic = `config/cameras/${finalCameraName}/add`;
} else {
requestBody.update_topic = `config/cameras/${finalCameraName}/edit`;
}
axios
@@ -399,51 +400,7 @@ export default function CameraEditForm({
};
const onSubmit = (values: FormValues) => {
if (cameraName && values.cameraName !== cameraName) {
// If camera name changed, delete old camera config
const deleteRequestBody: ConfigSetBody = {
requires_restart: 1,
config_data: {
cameras: {
[cameraName]: "",
},
},
update_topic: `config/cameras/${cameraName}/remove`,
};
const camera = config?.cameras[cameraName];
if (values.ffmpeg.inputs.some((input) => input.go2rtc)) {
camera?.ffmpeg.inputs.map((input) => {
const isGo2rtcPath = input.path.match(
/^rtsp:\/\/127\.0\.0\.1:8554\/(.+)$/,
);
const go2rtcStreamName = isGo2rtcPath ? isGo2rtcPath[1] : "";
deleteRequestBody.config_data.go2rtc = {
streams: {
[go2rtcStreamName]: "",
},
};
});
}
axios
.put("config/set", deleteRequestBody)
.then(() => saveCameraConfig(values))
.catch((error) => {
const errorMessage =
error.response?.data?.message ||
error.response?.data?.detail ||
"Unknown error";
toast.error(
t("toast.save.error.title", { errorMessage, ns: "common" }),
{ position: "top-center" },
);
})
.finally(() => {
setIsLoading(false);
});
} else {
saveCameraConfig(values);
}
saveCameraConfig(values);
};
// Determine available roles for new streams
@@ -486,11 +443,19 @@ export default function CameraEditForm({
render={({ field }) => (
<FormItem>
<FormLabel>{t("camera.cameraConfig.name")}</FormLabel>
{cameraName ? (
<>
<div className="my-3 text-sm text-muted-foreground">
{t("camera.cameraConfig.nameOnlyChangeToFriendlyName")}
</div>
</>
) : (
""
)}
<FormControl>
<Input
placeholder={t("camera.cameraConfig.namePlaceholder")}
{...field}
disabled={!!cameraName} // Prevent editing name for existing cameras
/>
</FormControl>
<FormMessage />
+83
View File
@@ -0,0 +1,83 @@
import * as React from "react"
import { Input, InputProps } from "./input"
import {
Select,
SelectContent,
SelectGroup,
SelectItem,
SelectTrigger,
SelectValue
} from "./select"
export interface SelectInputProps extends InputProps {
options: { value: string; label: string }[]
onSelectChange?: (value: string) => void
selectPlaceholder?: string
selectClassName?: string
selectPosition?: "before" | "after"
}
const SelectInput = React.forwardRef<HTMLInputElement, SelectInputProps>(
({
className,
options,
onSelectChange,
selectPlaceholder = "Select...",
selectClassName = "w-[180px]",
selectPosition = "after",
...props
}, ref) => {
const [selectedValue, setSelectedValue] = React.useState<string>("")
const handleValueChange = (value: string) => {
setSelectedValue(value)
if (onSelectChange) {
onSelectChange(value)
}
}
return (
<div className="flex items-center gap-2">
{selectPosition === "before" && (
<Select value={selectedValue} onValueChange={handleValueChange}>
<SelectTrigger className={selectClassName}>
<SelectValue placeholder={selectPlaceholder} />
</SelectTrigger>
<SelectContent>
<SelectGroup>
{options.map((option) => (
<SelectItem key={option.value} value={option.value}>
{option.label}
</SelectItem>
))}
</SelectGroup>
</SelectContent>
</Select>
)}
<Input className={className} ref={ref} {...props} />
{selectPosition === "after" && (
<Select value={selectedValue} onValueChange={handleValueChange}>
<SelectTrigger className={selectClassName}>
<SelectValue placeholder={selectPlaceholder} />
</SelectTrigger>
<SelectContent>
<SelectGroup>
{options.map((option) => (
<SelectItem key={option.value} value={option.value}>
{option.label}
</SelectItem>
))}
</SelectGroup>
</SelectContent>
</Select>
)}
</div>
)
}
)
SelectInput.displayName = "SelectInput"
export { SelectInput }