Merge 46a5eb4647 into 088e1ad7ef

docs/docs/frigate/installation.md

@@ -5,7 +5,8 @@ title: Installation
 
 import ShmCalculator from '@site/src/components/ShmCalculator'
 import DockerComposeGenerator from '@site/src/components/DockerComposeGenerator'
-
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
 
 Frigate is a Docker container that can be run on any Docker host including as a [Home Assistant App](https://www.home-assistant.io/apps/). Note that the Home Assistant App is **not** the same thing as the integration. The [integration](/integrations/home-assistant) is required to integrate Frigate into Home Assistant, whether you are running Frigate as a standalone Docker container or as a Home Assistant App.
 
@@ -73,13 +74,6 @@ Users of the Snapcraft build of Docker cannot use storage locations outside your
 
 :::
 
-### Docker Compose Generator
-
-Generate a Frigate Docker Compose configuration based on your hardware and requirements.
-
-<DockerComposeGenerator/>
-
-
 ### Calculating required shm-size
 
 Frigate utilizes shared memory to store frames during processing. The default `shm-size` provided by Docker is **64MB**.
@@ -477,6 +471,16 @@ Finally, configure [hardware object detection](/configuration/object_detectors#a
 
 Running through Docker with Docker Compose is the recommended install method.
 
+<Tabs>
+  <TabItem value="domestic" label="Docker Compose Generator" default>
+
+Generate a Frigate Docker Compose configuration based on your hardware and requirements.
+
+<DockerComposeGenerator/>
+
+
+  </TabItem>
+  <TabItem value="original" label="Example Docker Compose File">
 ```yaml
 services:
   frigate:
@@ -510,6 +514,10 @@ services:
     environment:
       FRIGATE_RTSP_PASSWORD: "password"
 ```
+  </TabItem>
+</Tabs>
+
+**Docker CLI**
 
 If you can't use Docker Compose, you can run the container with something similar to this:
 

docs/src/components/DockerComposeGenerator/DockerComposeGenerator.tsx

@@ -32,12 +32,12 @@ function renderHelpText(text: string): React.ReactNode {
 export default function DockerComposeGenerator() {
   const {
     deviceId, device, hardwareEnabled,
-    portEnabled, port5000Confirmed,
+    portEnabled,
     nvidiaGpuCount, nvidiaGpuDeviceId,
     configPath, mediaPath, rtspPassword, timezone, shmSize,
     shmSizeError, gpuDeviceIdError, configPathError, mediaPathError,
     hasAnyHardware, generatedYaml,
-    selectDevice, toggleHardware, togglePort, setPort5000Confirmed,
+    selectDevice, toggleHardware, togglePort,
     handleShmSizeChange, handleConfigPathChange, handleMediaPathChange,
     handleNvidiaGpuCountChange, handleNvidiaGpuDeviceIdChange,
     setRtspPassword, setTimezone, isHardwareDisabled,
@@ -82,9 +82,7 @@ export default function DockerComposeGenerator() {
 
         <PortConfigSection
           portEnabled={portEnabled}
-          port5000Confirmed={port5000Confirmed}
           onTogglePort={togglePort}
-          onConfirm5000={setPort5000Confirmed}
         />
 
         <OtherOptions

docs/src/components/DockerComposeGenerator/components/NvidiaGpuConfig.tsx

@@ -16,6 +16,8 @@ export default function NvidiaGpuConfig({
   onGpuCountChange,
   onGpuDeviceIdChange,
 }: Props) {
+  const showDeviceId = gpuCount !== "";
+
   return (
     <div className={styles.nvidiaConfig}>
       <div className={styles.formGroup}>
@@ -25,16 +27,15 @@ export default function NvidiaGpuConfig({
         <input
           id="dcg-gpu-count"
           type="text"
+          inputMode="numeric"
+          pattern="[0-9]*"
           className={styles.input}
           value={gpuCount}
-          placeholder="1 or all"
-          onChange={(e) => onGpuCountChange(e.target.value)}
+          placeholder="all"
+          onChange={(e) => onGpuCountChange(e.target.value.replace(/\D/g, ""))}
         />
-        <p className={styles.helpText}>
-          Enter a number (e.g. 1, 2, 3) or &quot;all&quot; to use all GPUs
-        </p>
       </div>
-      {gpuCount !== "all" && (
+      {showDeviceId && (
         <div className={styles.formGroup}>
           <label htmlFor="dcg-gpu-device-id" className={styles.label}>
             GPU device IDs (required, comma-separated):

docs/src/components/DockerComposeGenerator/components/PortConfig.tsx

@@ -1,125 +1,71 @@
 import React from "react";
 import Admonition from "@theme/Admonition";
 import { ports } from "../config";
-import { useCooldown } from "../hooks/useCooldown";
 import styles from "../styles.module.css";
 
 interface Props {
   portEnabled: Record<string, boolean>;
-  port5000Confirmed: boolean;
   onTogglePort: (portId: string) => void;
-  onConfirm5000: (confirmed: boolean) => void;
 }
 
-function Port5000Confirmation({
-  portEnabled,
-  confirmed,
+function PortItem({
+  port,
+  enabled,
   onToggle,
-  onConfirm,
 }: {
-  portEnabled: boolean;
-  confirmed: boolean;
+  port: typeof ports[number];
+  enabled: boolean;
   onToggle: () => void;
-  onConfirm: (confirmed: boolean) => void;
 }) {
-  const { remaining, start, stop } = useCooldown(10);
-
-  React.useEffect(() => {
-    if (portEnabled) {
-      start();
-    } else {
-      stop();
-      onConfirm(false);
-    }
-    return stop;
-  }, [portEnabled]);
+  const showWarning = port.warningContent && (
+    port.warningWhen === "checked" ? enabled :
+    port.warningWhen === "unchecked" ? !enabled : enabled
+  );
 
   return (
-    <div className={styles.portSection}>
-      {portEnabled && (
-        <Admonition type="danger">
-          <p>
-            Exposing port 5000 allows <strong>unauthenticated access</strong> to
-            your Frigate instance. Anyone on your network (or the internet if you
-            have a public IP) could access it without credentials.
-          </p>
-          <p>
-            This may lead to <strong>unauthorized access</strong>,{" "}
-            <strong>privacy leaks</strong>, or further attacks. Ensure you have
-            proper firewall rules or VPN in place.
-          </p>
-          <label
-            className={`${styles.checkboxLabel} ${remaining > 0 ? styles.checkboxDisabled : ""}`}
-          >
-            <input
-              type="checkbox"
-              checked={confirmed}
-              onChange={(e) => onConfirm(e.target.checked)}
-              disabled={remaining > 0}
-            />
-            <span>
-              I understand the risk and confirm enabling port 5000
-              {remaining > 0 && ` (${remaining}s)`}
-            </span>
-          </label>
-        </Admonition>
-      )}
-      <label className={styles.checkboxLabel}>
+    <div className={styles.hardwareItem}>
+      <label className={`${styles.checkboxLabel} ${port.locked ? styles.checkboxDisabled : ""}`}>
         <input
           type="checkbox"
-          checked={portEnabled}
+          checked={enabled}
           onChange={onToggle}
+          disabled={port.locked}
         />
-        <span>Port 5000 (unauthenticated access)</span>
-        <span className={styles.warningBadge}>⚠️ Expose carefully</span>
+        <span>
+          {port.locked && "🔒 "}
+          Port {port.host}
+          {port.protocol !== "tcp" && `/${port.protocol}`}
+        </span>
       </label>
+      {port.description && (
+        <div className={styles.hardwareDescription}>{port.description}</div>
+      )}
+      {showWarning && (
+        <Admonition type={port.warningType || "warning"}>
+          {port.warningContent}
+        </Admonition>
+      )}
     </div>
   );
 }
 
 export default function PortConfigSection({
   portEnabled,
-  port5000Confirmed,
   onTogglePort,
-  onConfirm5000,
 }: Props) {
   return (
     <div className={styles.formSection}>
       <h4>Port Configuration</h4>
-
-      {/* All ports except 5000 */}
       <div className={styles.checkboxGrid}>
-        {ports
-          .filter((p) => p.id !== "5000")
-          .map((port) => (
-            <div key={port.id} className={styles.hardwareItem}>
-              <label className={`${styles.checkboxLabel} ${port.locked ? styles.checkboxDisabled : ""}`}>
-                <input
-                  type="checkbox"
-                  checked={!!portEnabled[port.id]}
-                  onChange={() => onTogglePort(port.id)}
-                  disabled={port.locked}
-                />
-                <span>
-                  {port.locked && "🔒 "}
-                  Port {port.host}
-                  {port.protocol !== "tcp" && `/${port.protocol}`}
-                </span>
-              </label>
-              {port.description && (
-                <div className={styles.hardwareDescription}>{port.description}</div>
-              )}
-            </div>
-          ))}
+        {ports.map((port) => (
+          <PortItem
+            key={port.id}
+            port={port}
+            enabled={!!portEnabled[port.id]}
+            onToggle={() => onTogglePort(port.id)}
+          />
+        ))}
       </div>
-
-      {/* Port 5000 with special warning — placed last */}
-      <Port5000Confirmation
-        portEnabled={!!portEnabled["5000"]}
-        confirmed={port5000Confirmed}
-        onToggle={() => onTogglePort("5000")}
-        onConfirm={onConfirm5000}
-      />
     </div>
   );
 }

docs/src/components/DockerComposeGenerator/config/config.yaml

@@ -265,7 +265,8 @@ ports:
     protocol: "tcp"
     description: "Authenticated UI and API access (default HTTPS)"
     defaultEnabled: true
-    locked: true
+    warningContent: "This is the access port for Frigate. Closing it means you will no longer be able to access the instance."
+    warningWhen: "unchecked"
 
   - id: "8554"
     host: 8554

docs/src/components/DockerComposeGenerator/config/types.ts

@@ -145,14 +145,10 @@ export interface PortConfig {
   defaultEnabled: boolean;
   /** Whether this port is locked (always enabled, cannot be toggled off) */
   locked?: boolean;
-  /** Whether this port requires a confirmation step before enabling */
-  requiresConfirmation?: boolean;
   /** Admonition type for the warning */
   warningType?: "warning" | "danger";
   /** Warning content (markdown) */
   warningContent?: string;
-  /** Confirmation checkbox label */
-  confirmationLabel?: string;
-  /** Cooldown in seconds before the confirmation checkbox becomes available */
-  cooldownSeconds?: number;
+  /** When to show the warning: when the port is checked or unchecked */
+  warningWhen?: "checked" | "unchecked";
 }

docs/src/components/DockerComposeGenerator/generator/index.ts

@@ -123,7 +123,7 @@ function buildEnvironment(
 function buildDeploy(device: DeviceConfig, input: GeneratorInput): string[] {
   if (device.id === "stable-tensorrt") {
     const count = input.nvidiaGpuCount || "all";
-    const isAll = count.toLowerCase() === "all";
+    const isAll = count === "all";
     const deviceId = input.nvidiaGpuDeviceId?.trim();
 
     if (isAll) {

docs/src/components/DockerComposeGenerator/hooks/useConfigGenerator.ts

@@ -29,8 +29,7 @@ export function useConfigGenerator() {
     return initial;
   });
 
-  const [port5000Confirmed, setPort5000Confirmed] = useState(false);
-  const [nvidiaGpuCount, setNvidiaGpuCount] = useState("all");
+  const [nvidiaGpuCount, setNvidiaGpuCount] = useState("");
   const [nvidiaGpuDeviceId, setNvidiaGpuDeviceId] = useState("");
   const [configPath, setConfigPath] = useState("");
   const [mediaPath, setMediaPath] = useState("");
@@ -57,7 +56,7 @@ export function useConfigGenerator() {
       }
       return next;
     });
-    setNvidiaGpuCount("all");
+    setNvidiaGpuCount("");
     setNvidiaGpuDeviceId("");
     setGpuDeviceIdError(false);
   }, []);
@@ -69,13 +68,7 @@ export function useConfigGenerator() {
   const togglePort = useCallback((portId: string) => {
     const port = portMap.get(portId);
     if (port?.locked) return;
-    setPortEnabled((prev) => {
-      const next = { ...prev, [portId]: !prev[portId] };
-      if (portId === "5000" && !next[portId]) {
-        setPort5000Confirmed(false);
-      }
-      return next;
-    });
+    setPortEnabled((prev) => ({ ...prev, [portId]: !prev[portId] }));
   }, []);
 
   const isHardwareDisabled = useCallback(
@@ -128,15 +121,13 @@ export function useConfigGenerator() {
   );
 
   const handleNvidiaGpuCountChange = useCallback((value: string) => {
-    const lower = value.trim().toLowerCase();
-    if (lower === "all" || lower === "" || /^[0-9]+$/.test(lower)) {
-      setNvidiaGpuCount(lower || "all");
-      if (lower === "all") {
-        setNvidiaGpuDeviceId("");
-        setGpuDeviceIdError(false);
-      } else if (/^[0-9]+$/.test(lower)) {
-        setGpuDeviceIdError(false);
-      }
+    // Only allow digits
+    setNvidiaGpuCount(value);
+    if (value === "") {
+      setNvidiaGpuDeviceId("");
+      setGpuDeviceIdError(false);
+    } else {
+      setGpuDeviceIdError(false);
     }
   }, []);
 
@@ -149,7 +140,6 @@ export function useConfigGenerator() {
     const lines: string[] = [];
     for (const [id, enabled] of Object.entries(portEnabled)) {
       if (!enabled) continue;
-      if (id === "5000" && !port5000Confirmed) continue;
       const p = portMap.get(id);
       if (!p) continue;
       const proto = p.protocol && p.protocol !== "tcp" ? `/${p.protocol}` : "";
@@ -157,7 +147,7 @@ export function useConfigGenerator() {
       lines.push(`      - "${p.host}:${p.container}${proto}"${comment}`);
     }
     return lines;
-  }, [portEnabled, port5000Confirmed]);
+  }, [portEnabled]);
 
   const selectedHardwareIds = useMemo(() => {
     return Object.entries(hardwareEnabled)
@@ -195,11 +185,11 @@ export function useConfigGenerator() {
 
   return {
     deviceId, device, hardwareEnabled, portEnabled,
-    port5000Confirmed, nvidiaGpuCount, nvidiaGpuDeviceId,
+    nvidiaGpuCount, nvidiaGpuDeviceId,
     configPath, mediaPath, rtspPassword, timezone, shmSize,
     shmSizeError, gpuDeviceIdError, configPathError, mediaPathError,
     hasAnyHardware, generatedYaml,
-    selectDevice, toggleHardware, togglePort, setPort5000Confirmed,
+    selectDevice, toggleHardware, togglePort,
     handleShmSizeChange, handleConfigPathChange, handleMediaPathChange,
     handleNvidiaGpuCountChange, handleNvidiaGpuDeviceIdChange,
     setRtspPassword, setTimezone, isHardwareDisabled,

docs/src/components/DockerComposeGenerator/hooks/useCooldown.ts

@@ -1,42 +0,0 @@
-import { useState, useEffect, useCallback, useRef } from "react";
-
-/**
- * Hook for a countdown timer (e.g. cooldown before confirming port 5000).
- */
-export function useCooldown(initialSeconds: number) {
-  const [remaining, setRemaining] = useState(0);
-  const timerRef = useRef<ReturnType<typeof setInterval> | null>(null);
-
-  const start = useCallback(() => {
-    // Clear any existing timer
-    if (timerRef.current) clearInterval(timerRef.current);
-    setRemaining(initialSeconds);
-    timerRef.current = setInterval(() => {
-      setRemaining((prev) => {
-        if (prev <= 1) {
-          if (timerRef.current) clearInterval(timerRef.current);
-          timerRef.current = null;
-          return 0;
-        }
-        return prev - 1;
-      });
-    }, 1000);
-  }, [initialSeconds]);
-
-  const stop = useCallback(() => {
-    if (timerRef.current) {
-      clearInterval(timerRef.current);
-      timerRef.current = null;
-    }
-    setRemaining(0);
-  }, []);
-
-  // Cleanup on unmount
-  useEffect(() => {
-    return () => {
-      if (timerRef.current) clearInterval(timerRef.current);
-    };
-  }, []);
-
-  return { remaining, start, stop };
-}

frigate/api/export.py

@@ -5,13 +5,15 @@ import logging
 import random
 import string
 import time
+import zipfile
+from collections import deque
 from pathlib import Path
-from typing import List, Optional
+from typing import Iterator, List, Optional
 
 import psutil
 from fastapi import APIRouter, Depends, Query, Request
-from fastapi.responses import JSONResponse
-from pathvalidate import sanitize_filepath
+from fastapi.responses import JSONResponse, StreamingResponse
+from pathvalidate import sanitize_filename, sanitize_filepath
 from peewee import DoesNotExist
 from playhouse.shortcuts import model_to_dict
 
@@ -361,6 +363,136 @@ def get_export_case(case_id: str):
         )
 
 
+_ZIP_STREAM_CHUNK_SIZE = 1024 * 1024  # 1 MiB
+
+
+class _StreamingZipBuffer:
+    """File-like sink for ZipFile that exposes written bytes via drain().
+
+    ZipFile writes synchronously into this buffer; the generator drains the
+    queue between writes so StreamingResponse can yield bytes without
+    materializing the whole archive in memory.
+    """
+
+    def __init__(self) -> None:
+        self._queue: deque[bytes] = deque()
+        self._offset = 0
+
+    def write(self, data: bytes) -> int:
+        if data:
+            self._queue.append(bytes(data))
+            self._offset += len(data)
+        return len(data)
+
+    def tell(self) -> int:
+        return self._offset
+
+    def flush(self) -> None:
+        pass
+
+    def drain(self) -> Iterator[bytes]:
+        while self._queue:
+            yield self._queue.popleft()
+
+
+def _unique_archive_name(export: Export, used: set[str]) -> str:
+    base = sanitize_filename(export.name) if export.name else None
+    if not base:
+        base = f"{export.camera}_{int(datetime.datetime.timestamp(export.date))}"
+
+    candidate = f"{base}.mp4"
+    counter = 1
+    while candidate in used:
+        candidate = f"{base}_{counter}.mp4"
+        counter += 1
+
+    used.add(candidate)
+    return candidate
+
+
+def _stream_case_archive(exports: List[Export]) -> Iterator[bytes]:
+    """Yield bytes of a zip archive built from the given exports' mp4 files."""
+    buffer = _StreamingZipBuffer()
+    used_names: set[str] = set()
+
+    # ZIP_STORED: mp4 is already compressed, recompressing wastes CPU for ~0% size win.
+    with zipfile.ZipFile(
+        buffer,
+        mode="w",
+        compression=zipfile.ZIP_STORED,
+        allowZip64=True,
+    ) as archive:
+        for export in exports:
+            source = Path(export.video_path)
+            if not source.exists():
+                continue
+
+            arcname = _unique_archive_name(export, used_names)
+
+            with (
+                archive.open(arcname, mode="w", force_zip64=True) as entry,
+                source.open("rb") as src,
+            ):
+                while True:
+                    chunk = src.read(_ZIP_STREAM_CHUNK_SIZE)
+                    if not chunk:
+                        break
+
+                    entry.write(chunk)
+                    yield from buffer.drain()
+
+            yield from buffer.drain()
+
+    yield from buffer.drain()
+
+
+@router.get(
+    "/cases/{case_id}/download",
+    dependencies=[Depends(allow_any_authenticated())],
+    summary="Download export case as zip",
+    description="Streams a zip archive containing every completed export's mp4 for the given case.",
+)
+def download_export_case(
+    case_id: str,
+    allowed_cameras: List[str] = Depends(get_allowed_cameras_for_filter),
+):
+    try:
+        case = ExportCase.get(ExportCase.id == case_id)
+    except DoesNotExist:
+        return JSONResponse(
+            content={"success": False, "message": "Export case not found"},
+            status_code=404,
+        )
+
+    exports = list(
+        Export.select()
+        .where(
+            Export.export_case == case_id,
+            ~Export.in_progress,
+            Export.camera << allowed_cameras,
+        )
+        .order_by(Export.date.asc())
+    )
+
+    if not exports:
+        return JSONResponse(
+            content={"success": False, "message": "No exports available to download."},
+            status_code=404,
+        )
+
+    archive_base = sanitize_filename(case.name) if case.name else ""
+    if not archive_base:
+        archive_base = case_id
+
+    return StreamingResponse(
+        _stream_case_archive(exports),
+        media_type="application/zip",
+        headers={
+            "Content-Disposition": f'attachment; filename="{archive_base}.zip"',
+        },
+    )
+
+
 @router.patch(
     "/cases/{case_id}",
     response_model=GenericResponse,

web/src/pages/Exports.tsx

@@ -57,6 +57,7 @@ import { useTranslation } from "react-i18next";
 
 import { IoMdArrowRoundBack } from "react-icons/io";
 import {
+  LuDownload,
   LuFolderPlus,
   LuFolderX,
   LuPencil,
@@ -777,54 +778,76 @@ function Exports() {
                   filters={["cameras"]}
                   onUpdateFilter={setExportFilter}
                 />
-                {isAdmin && (
-                  <div className="flex items-center gap-1 md:gap-2">
+                <div className="flex items-center gap-1 md:gap-2">
+                  {(exportsByCase[selectedCase.id]?.length ?? 0) > 0 && (
                     <Button
+                      asChild
                       className="flex items-center gap-2 p-2"
                       size="sm"
-                      aria-label={t("toolbar.addExport")}
-                      onClick={() => setCaseForAddExport(selectedCase)}
+                      aria-label={t("button.download", { ns: "common" })}
                     >
-                      <LuPlus className="text-secondary-foreground" />
-                      {!isMobile && (
-                        <div className="text-primary">
-                          {t("toolbar.addExport")}
-                        </div>
-                      )}
+                      <a
+                        download
+                        href={`${baseUrl}api/cases/${selectedCase.id}/download`}
+                      >
+                        <LuDownload className="text-secondary-foreground" />
+                        {!isMobile && (
+                          <div className="text-primary">
+                            {t("button.download", { ns: "common" })}
+                          </div>
+                        )}
+                      </a>
                     </Button>
-                    <Button
-                      className="flex items-center gap-2 p-2"
-                      size="sm"
-                      aria-label={t("toolbar.editCase")}
-                      onClick={() =>
-                        setCaseDialog({
-                          mode: "edit",
-                          exportCase: selectedCase,
-                        })
-                      }
-                    >
-                      <LuPencil className="text-secondary-foreground" />
-                      {!isMobile && (
-                        <div className="text-primary">
-                          {t("toolbar.editCase")}
-                        </div>
-                      )}
-                    </Button>
-                    <Button
-                      className="flex items-center gap-2 p-2"
-                      size="sm"
-                      aria-label={t("toolbar.deleteCase")}
-                      onClick={() => setCaseToDelete(selectedCase)}
-                    >
-                      <LuTrash2 className="text-secondary-foreground" />
-                      {!isMobile && (
-                        <div className="text-primary">
-                          {t("toolbar.deleteCase")}
-                        </div>
-                      )}
-                    </Button>
-                  </div>
-                )}
+                  )}
+                  {isAdmin && (
+                    <>
+                      <Button
+                        className="flex items-center gap-2 p-2"
+                        size="sm"
+                        aria-label={t("toolbar.addExport")}
+                        onClick={() => setCaseForAddExport(selectedCase)}
+                      >
+                        <LuPlus className="text-secondary-foreground" />
+                        {!isMobile && (
+                          <div className="text-primary">
+                            {t("toolbar.addExport")}
+                          </div>
+                        )}
+                      </Button>
+                      <Button
+                        className="flex items-center gap-2 p-2"
+                        size="sm"
+                        aria-label={t("toolbar.editCase")}
+                        onClick={() =>
+                          setCaseDialog({
+                            mode: "edit",
+                            exportCase: selectedCase,
+                          })
+                        }
+                      >
+                        <LuPencil className="text-secondary-foreground" />
+                        {!isMobile && (
+                          <div className="text-primary">
+                            {t("toolbar.editCase")}
+                          </div>
+                        )}
+                      </Button>
+                      <Button
+                        className="flex items-center gap-2 p-2"
+                        size="sm"
+                        aria-label={t("toolbar.deleteCase")}
+                        onClick={() => setCaseToDelete(selectedCase)}
+                      >
+                        <LuTrash2 className="text-secondary-foreground" />
+                        {!isMobile && (
+                          <div className="text-primary">
+                            {t("toolbar.deleteCase")}
+                          </div>
+                        )}
+                      </Button>
+                    </>
+                  )}
+                </div>
               </div>
             )}
           </>