Merge branch 'master' into new-schema

2024-12-24 06:05:55 -05:00 · 2021-10-21 12:26:31 -07:00 · 2021-10-21 12:26:31 -07:00 · 4a7f22723c
commit 4a7f22723c
parent f7aa71d2af 7b0099fb4e
55 changed files with 1345 additions and 701 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@ -40,6 +40,7 @@ jobs:
          components: ${{ matrix.extra_components }}
      - name: Test
        run: cd server && cargo test ${{ matrix.extra_args }} --all
+        continue-on-error: ${{ matrix.rust == 'nightly' }}
      - name: Check formatting
        if: matrix.rust == 'stable'
        run: cd server && cargo fmt --all -- --check
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -6,7 +6,19 @@ changes, see Git history.
 Each release is tagged in Git and on the Docker repository
 [`scottlamb/moonfire-nvr`](https://hub.docker.com/r/scottlamb/moonfire-nvr).

-## unreleased
+## `v0.6.7` (2021-10-20)
+
+*   trim whitespace when detecting time zone by reading `/etc/timezone`.
+*   (Retina 0.3.2) better `TEARDOWN` handling with the default
+    `--rtsp-library=retina` (see
+    [scottlamb/retina#34](https://github.com/scottlamb/retina/34)).
+    This means faster recovery after an error when using UDP or when the
+    camera's firmware is based on an old live555 release.
+*   (Retina 0.3.3) better authentication support with the default
+    `--rtsp-library=retina` (see
+    [scottlamb/retina#25](https://github.com/scottlamb/retina/25)).
+
+## `v0.6.6` (2021-09-23)

 *   fix [#146](https://github.com/scottlamb/moonfire-nvr/issues/146): "init
    segment fetch error" when browsers have cached data from `v0.6.4` and
@ -16,8 +28,20 @@ Each release is tagged in Git and on the Docker repository
 *   fix [#157](https://github.com/scottlamb/moonfire-nvr/issues/157): broken
    live view when using multi-view and selecting the first listed camera
    then selecting another camera for the upper left grid square.
-*   support `--rtsp-transport=udp`, which improves compatibility with Reolink
-    cameras.
+*   support `--rtsp-transport=udp`, which may work better with cameras that
+    use old versions of the live555 library, including many Reolink models.
+*   send RTSP `TEARDOWN` requests on UDP or with old live555 versions; wait out
+    stale sessions before reconnecting to the same camera. This may improve
+    reliability with old live555 versions when using TCP also.
+*   improve compatibility with cameras that send non-compliant SDP, including
+    models from Geovision and Anpviz.
+*   fix [#117](https://github.com/scottlamb/moonfire-nvr/issues/117): honor
+    shutdown requests when out of disk space, instead of retrying forever.
+*   shut down immediately on a second `SIGINT` or `SIGTERM`. The normal
+    "graceful" shutdown will still be slow in some cases, eg when waiting for a
+    RTSP UDP session to time out after a `TEARDOWN` failure. This allows the
+    impatient to get fast results with ctrl-C when running interactively, rather
+    than having to use `SIGKILL` from another terminal.

 ## `v0.6.5` (2021-08-13)

--- a/README.md
+++ b/README.md
@ -35,7 +35,7 @@ There's no support yet for motion detection, no https/TLS support (you'll
 need a proxy server, as described [here](guide/secure.md)), and only a
 console-based (rather than web-based) configuration UI.

-Moonfire NVR is currently at version 0.6.5. Until version 1.0, there will be no
+Moonfire NVR is currently at version 0.6.7. Until version 1.0, there will be no
 compatibility guarantees: configuration and storage formats may change from
 version to version. There is an [upgrade procedure](guide/schema.md) but it is
 not for the faint of heart.
--- a/design/api.md
+++ b/design/api.md
@ -142,6 +142,7 @@ The `application/json` response will have a JSON object as follows:
 *   `signals`: a list of all *signals* known to the server. Each is a JSON
    object with the following properties:
    *   `id`: an integer identifier.
+    *   `source`: a UUID representing the signal source (could be a camera UUID)
    *   `shortName`: a unique, human-readable description of the signal
    *   `cameras`: a map of associated cameras' UUIDs to the type of association:
        `direct` or `indirect`. See `db/schema.sql` for more description.
@ -340,6 +341,13 @@ arbitrary order. Each recording object has the following properties:
 *   `videoSamples`: the number of samples (aka frames) of video in this
    recording.
 *   `sampleFileBytes`: the number of bytes of video in this recording.
+*   `hasTrailingZero`: the final frame of the final recording id described by
+    this row (`endId` if present, otherwise `startId`) has a duration of 0.
+    A frame's duration is calculated by subtracting its timestamp from the
+    following frame's timestamp. When a run ends, there's no following frame
+    and Moonfire NVR fills in a duration of 0. When using `/view.mp4`, it's
+    not possible to append additional segments after such frames, as noted
+    below.

 Under the property `videoSampleEntries`, an object mapping ids to objects with
 the following properties:
@ -438,7 +446,7 @@ Example request URI to retrieve recording id 1, skipping its first 26
 90,000ths of a second:

 ```
-    /api/cameras/fd20f7a2-9d69-4cb3-94ed-d51a20c3edfe/main/view.mp4?s=1.26
+    /api/cameras/fd20f7a2-9d69-4cb3-94ed-d51a20c3edfe/main/view.mp4?s=1.26-
 ```

 Note carefully the distinction between *wall duration* and *media duration*.
@ -446,8 +454,27 @@ It's normal for `/view.mp4` to return a media presentation with a length
 slightly different from the *wall duration* of the backing recording or
 portion that was requested.

-TODO: error behavior on missing segment. It should be a 404, likely with an
-`application/json` body describing what portion if any (still) exists.
+Bugs and limitations:
+
+*   If the `s=` parameter references a recording id that doesn't exist when the
+    server starts processing the `/view.mp4` request, the server will return a
+    `404` with a text error message. This commonly happens when the oldest
+    recording was deleted between the `/recordings` request and the `/view.mp4`
+    request. The server probably should return a structured JSON document
+    describing exactly which recordings have been deleted. For now, the client
+    will have to retry from `/recordings` and again race against deletion.
+*   If a recording is deleted after the server starts processing `/view.mp4`
+    but before the request advances to the recording's byte position, the server
+    will abruptly drop the HTTP connection. The client must then retry to see
+    a proper 404 error. It'd be better if the server would prevent recordings
+    from being deleted while there are `/view.mp4` requests in progress which
+    reference them.
+*   The final recording in every "run" ends with a frame that has duration 0.
+    It's not possible to append additional segments after such a frame;
+    the server will return a 400 error like `Invalid argument: unable to append
+    recording 2/16672 after recording 2/16671 with trailing zero`. See also
+    `hasTrailingZero` above, and
+    [#178](https://github.com/scottlamb/moonfire-nvr/issues/178).

 ### `GET /api/cameras/<uuid>/<stream>/view.mp4.txt`

@ -485,11 +512,11 @@ Expected query parameters:
 *   `s` (one or more): as with the `.mp4` URL.

 It's recommended that each `.m4s` retrieval be for at most one Moonfire NVR
-recording segment. The fundamental reason is that the Media Source Extension
-API appears structured for adding a complete segment at a time. Large media
-segments thus impose significant latency on seeking. Additionally, because of
-this fundamental reason Moonfire NVR makes no effort to make multiple-segment
-`.m4s` requests practical:
+recording. The fundamental reason is that the Media Source Extension API appears
+structured for adding a complete segment at a time. Large media segments thus
+impose significant latency on seeking. Additionally, because of this fundamental
+reason Moonfire NVR makes no effort to make multiple-segment `.m4s` requests
+practical:

 *   There is currently a hard limit of 4 GiB of data because the `.m4s` uses a
    single `moof` followed by a single `mdat`; the former references the
@ -520,6 +547,7 @@ to one or more frames of video. The first message is guaranteed to start with a
 "key" (IDR) frame; others may not. The message will contain HTTP headers
 followed by by a `.mp4` media segment. The following headers will be included:

+*   `X-Video-Sample-Entry-Id`: An id to use when fetching an initialization segment.
 *   `X-Recording-Id`: the open id, a period, and the recording id of the
    recording these frames belong to.
 *   `X-Recording-Start`: the timestamp (in Moonfire NVR's usual 90,000ths
@ -603,7 +631,8 @@ streams simultaneously as well as making other simultaneous HTTP requests.

 Returns a `.mp4` suitable for use as a [HTML5 Media Source Extensions
 initialization segment][init-segment]. The MIME type will be `video/mp4`, with
-a `codecs` parameter as specified in [RFC 6381][rfc-6381].
+a `codecs` parameter as specified in [RFC 6381][rfc-6381]. The `<id>` should be a value
+previously extracted from the `X-Video-Sample-Entry-Id` header returned in a `.../live.m4s` response.

 An `X-Aspect` HTTP header will include the aspect ratio as width:height,
 eg `16:9` (most cameras) or `9:16` (rotated 90 degrees).
--- a/design/glossary.md
+++ b/design/glossary.md
@ -1,5 +1,14 @@
 # Moonfire NVR Glossary

+*GOP:* Group of Pictures, as
+[described](https://en.wikipedia.org/wiki/Group_of_pictures) on wikipedia.
+Each GOP starts with an "IDR" or "key" frame which can be decoded by itself.
+Commonly all other frames in the GOP are encoded in terms of the frames before,
+so decoding frame 5 requires decoding frame 1, 2, 3, and 4. Many security
+cameras produce a new IDR frame (thus start a new GOP) at a fixed interval of
+1 or 2 seconds. Some cameras that use "smart encoding" or "H.264+" may produce
+GOPs that vary in length, up to several seconds.
+
 *media duration:* the total duration of the actual samples in a recording. These
 durations are based on the camera's clock. Camera clocks can be quite
 inaccurate, so this may not match the *wall duration*. See [time.md](time.md)
@ -13,6 +22,14 @@ successfully, a following *open* may assign the same id to a new recording.
 The open id disambiguates this and should be used whenever referring to a
 recording that may be unflushed.

+*ppm:* Part Per Million.  Crystal Clock accuracy is defined in terms of ppm or 
+parts per million and it gives a convenient way of comparing accuracies 
+of different crystal specifications. "A typical crystal has an error of 
+100ppm (ish) this translates as 100/1e6 or (1e-4)...So the total error on a day 
+is 86400 x 1e-4= 8.64 seconds per day. In a month you would loose 
+30x8.64 = 259 seconds or 4.32 minutes per month." 
+Source: https://www.best-microcontroller-projects.com/ppm.html
+
 *recording:* the video from a (typically 1-minute) portion of an RTSP session.
 RTSP sessions are divided into recordings as a detail of the
 storage schema. See [schema.md](schema.md) for details. This concept is exposed
--- a/design/time.md
+++ b/design/time.md
@ -111,7 +111,7 @@ information:
    use SNTP clients which simply step time periodically and provide no
    interface to determine if the clock is currently synchronized. This
    document's author owns several cameras with clocks that run roughly 20
-    ppm fast (2 seconds per day) and are adjusted via steps.
+    *ppm* fast (2 seconds per day) and are adjusted via steps.
 *   the RTP timestamps from each of a camera's streams. As described in
    [RFC 3550 section 5.1](https://tools.ietf.org/html/rfc3550#section-5.1),
    these are monotonically increasing with an unspecified reference point.
@ -158,7 +158,7 @@ relying on the camera's clock for the *media duration* of frames and
 recordings. In the first recording in a *run*, it will use these durations
 and the NVR's wall clock time to establish the start time of the run. In
 subsequent recordings of the run, it will calculate a *wall duration* which
-is up to 500 ppm different from the media duration to gently correct the
+is up to 500 *ppm* different from the media duration to gently correct the
 camera's clock toward the NVR's clock, trusting the latter to be more
 accurate.

@ -207,17 +207,17 @@ a *wall duration* of recordings which more closely matches the NVR's clock.
 It is calculated as follows:

 *   For the first recording in a run: the wall duration is the media duration.
-    At the design limit of 500 ppm camera frequency error and an upper
+    At the design limit of 500 *ppm* camera frequency error and an upper
    bound of two minutes duration for the initial recording, this causes
    a maximum of 60 milliseconds of error.
 *   For subsequent recordings, the wall duration is the media duration
-    adjusted by up to 500 ppm to reduce differences between the "local start
+    adjusted by up to 500 *ppm* to reduce differences between the "local start
    time" and the start time, as follows:
    ```
    limit = media_duration / 2000
    wall_duration = media_duration + clamp(local_start - start, -limit, +limit)
    ```
-    Note that for a 1-minute recording, 500 ppm is 0.3 ms, or 27 90kHz units.
+    Note that for a 1-minute recording, 500 *ppm* is 0.3 ms, or 27 90kHz units.

 Each recording's local start time is also stored in the database as a delta to
 the recording's start time. These stored values aren't used for normal system
@ -342,7 +342,7 @@ second would still be ambiguous.

 Moonfire NVR could make no code changes and ask the system administrator to
 use smeared time. This is the simplest option. On a leap smear system, there
-are no time jumps. The ~11.6 ppm frequency error and the maximum introduced
+are no time jumps. The ~11.6 *ppm* frequency error and the maximum introduced
 absolute error of 0.5 sec can be considered acceptable.

 Alternatively, Moonfire NVR could assume a specific leap smear policy (such as
--- a/guide/build.md
+++ b/guide/build.md
@ -229,6 +229,7 @@ $ cd server
 $ cargo test
 $ cargo build --release
 $ sudo install -m 755 target/release/moonfire-nvr /usr/local/bin
+$ cd ..
 ```

 You can build the UI via `npm` and find it in the `ui/build` directory:
@ -238,6 +239,7 @@ $ cd ui
 $ npm install
 $ npm run build
 $ sudo mkdir /usr/local/lib/moonfire-nvr
+$ cd ..
 $ sudo rsync --recursive --delete --chmod=D755,F644 ui/build/ /usr/local/lib/moonfire-nvr/ui
 ```

--- a/guide/install.md
+++ b/guide/install.md
@ -66,7 +66,7 @@ $ sudo chmod a+rx /usr/local/bin/nvr
 # Set your timezone here.
 tz="America/Los_Angeles"

-# or eg "scottlamb/moonfire-nvr:v0.6.5" to specify a particular version.
+# or eg "scottlamb/moonfire-nvr:v0.6.7" to specify a particular version.
 image_name="scottlamb/moonfire-nvr:latest"
 container_name="moonfire-nvr"
 common_docker_run_args=(
--- a/guide/troubleshooting.md
+++ b/guide/troubleshooting.md
@ -272,13 +272,10 @@ clean up the excess files. Moonfire NVR will start working again immediately.

 If Moonfire NVR's own files are too large, follow this procedure:

-1.  Shut it down via `SIGKILL`:
+1.  Shut it down.
    ```console
-    $ sudo killall -KILL moonfire-nvr
+    $ sudo killall moonfire-nvr
    ```
-    (Be sure to use `-KILL`. It won't shut down properly on `SIGTERM` or `SIGINT`
-    when out of disk space due to [issue
-    #117](https://github.com/scottlamb/moonfire-nvr/issues/117).)
 2.  Reconfigure it use less disk space. See [Completing configuration through
    the UI](install.md#completing-configuration-through-the-ui) in the
    installation guide. Pay attention to the note about slack space.
--- a/server/Cargo.lock
+++ b/server/Cargo.lock
@ -30,9 +30,9 @@ dependencies = [

 [[package]]
 name = "ahash"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43bb833f0bf979d8475d38fbf09ed3b8a55e1885fe93ad3f93239fc6a4f17b98"
+checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
 dependencies = [
 "getrandom 0.2.3",
 "once_cell",
@ -110,9 +110,9 @@ checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"

 [[package]]
 name = "backtrace"
-version = "0.3.61"
+version = "0.3.62"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7a905d892734eea339e896738c14b9afce22b5318f64b951e70bf3844419b01"
+checksum = "091bcdf2da9950f96aa522681ce805e6857f6ca8df73833d35736ab2dc78e152"
 dependencies = [
 "addr2line",
 "cc",
@ -131,9 +131,9 @@ checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"

 [[package]]
 name = "base64ct"
-version = "1.0.1"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a32fd6af2b5827bce66c29053ba0e7c42b9dcab01835835058558c10851a46b"
+checksum = "e6b4d9b1225d28d360ec6a231d65af1fd99a2a095154c8040689617290569c5c"

 [[package]]
 name = "bcrypt"
@ -148,9 +148,9 @@ dependencies = [

 [[package]]
 name = "bitflags"
-version = "1.2.1"
+version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"

 [[package]]
 name = "bitreader"
@ -230,9 +230,9 @@ dependencies = [

 [[package]]
 name = "bstr"
-version = "0.2.16"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90682c8d613ad3373e66de8c6411e0ae2ab2571e879d2efbf73558cc66f21279"
+checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223"
 dependencies = [
 "lazy_static",
 "memchr",
@ -242,9 +242,9 @@ dependencies = [

 [[package]]
 name = "bumpalo"
-version = "3.7.0"
+version = "3.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c59e7af012c713f529e7a3ee57ce9b31ddd858d4b512923602f74608b009631"
+checksum = "8f1e260c3a9040a7c19a12468758f4c16f31a81a1fe087482be9570ec864bb6c"

 [[package]]
 name = "byteorder"
@ -260,9 +260,9 @@ checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8"

 [[package]]
 name = "cc"
-version = "1.0.70"
+version = "1.0.71"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d26a6ce4b6a484fa3edb70f7efa6fc430fd2b87285fe8b84304fd0936faa0dc0"
+checksum = "79c2681d6594606957bbb8631c4b90a7fcaaa72cdb714743a437b156d6a7eedd"

 [[package]]
 name = "cfg-if"
@ -377,9 +377,9 @@ dependencies = [

 [[package]]
 name = "cstr"
-version = "0.2.8"
+version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c11a39d776a3b35896711da8a04dc1835169dcd36f710878187637314e47941b"
+checksum = "f2846d3636dcaff720d311ea8983f5fa7a8288632b2f95145dd4b5819c397fd8"
 dependencies = [
 "proc-macro2",
 "quote",
@ -501,19 +501,6 @@ dependencies = [
 "generic-array",
 ]

-[[package]]
-name = "digest_auth"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa30657988b2ced88f68fe490889e739bf98d342916c33ed3100af1d6f1cbc9c"
-dependencies = [
- "digest",
- "hex",
- "md-5",
- "rand",
- "sha2",
-]
-
 [[package]]
 name = "dirs"
 version = "1.0.5"
@ -545,9 +532,9 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"

 [[package]]
 name = "encoding_rs"
-version = "0.8.28"
+version = "0.8.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80df024fbc5ac80f87dfef0d9f5209a252f2a497f7f42944cff24d8253cac065"
+checksum = "a74ea89a0a1b98f6332de42c95baff457ada66d1cb4030f9ff151b2041a1c746"
 dependencies = [
 "cfg-if",
 ]
@ -628,9 +615,9 @@ checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a"

 [[package]]
 name = "flate2"
-version = "1.0.21"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80edafed416a46fb378521624fab1cfa2eb514784fd8921adbe8a8d8321da811"
+checksum = "1e6988e897c1c9c485f43b47a529cef42fde0547f9d8d41a7062518f1d8fc53f"
 dependencies = [
 "cfg-if",
 "crc32fast",
@ -800,9 +787,9 @@ checksum = "f0a01e0497841a3b2db4f8afa483cce65f7e96a3498bd6c541734792aeac8fe7"

 [[package]]
 name = "h2"
-version = "0.3.4"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7f3675cfef6a30c8031cf9e6493ebdc3bb3272a3fea3923c4210d1830e6a472"
+checksum = "6c06815895acec637cd6ed6e9662c935b866d20a106f8361892893a7d9234964"
 dependencies = [
 "bytes",
 "fnv",
@ -835,7 +822,7 @@ version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
 dependencies = [
- "ahash 0.7.4",
+ "ahash 0.7.6",
 ]

 [[package]]
@ -883,15 +870,30 @@ dependencies = [

 [[package]]
 name = "http"
-version = "0.2.4"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "527e8c9ac747e28542699a951517aa9a6945af506cd1f2e1b53a576c17b6cc11"
+checksum = "1323096b05d41827dadeaee54c9981958c0f94e670bc94ed80037d1a7b8b186b"
 dependencies = [
 "bytes",
 "fnv",
 "itoa",
 ]

+[[package]]
+name = "http-auth"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "805afa6c41edf02ff4643e6672810974a83c2d866be06e0c377e1789084f6a7e"
+dependencies = [
+ "base64",
+ "digest",
+ "hex",
+ "md-5",
+ "memchr",
+ "rand",
+ "sha2",
+]
+
 [[package]]
 name = "http-body"
 version = "0.4.3"
@ -940,9 +942,9 @@ checksum = "6456b8a6c8f33fee7d958fcd1b60d55b11940a79e63ae87013e6d22e26034440"

 [[package]]
 name = "hyper"
-version = "0.14.12"
+version = "0.14.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13f67199e765030fa08fe0bd581af683f0d5bc04ea09c2b1102012c5fb90e7fd"
+checksum = "15d1cfb9e4f68655fa04c01f59edb405b6074a0f7118ea881e5026e4a1cd8593"
 dependencies = [
 "bytes",
 "futures-channel",
@ -991,9 +993,9 @@ dependencies = [

 [[package]]
 name = "instant"
-version = "0.1.10"
+version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bee0328b1209d157ef001c94dd85b4f8f64139adb0eac2659f4b08382b2f474d"
+checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
 dependencies = [
 "cfg-if",
 ]
@ -1021,9 +1023,9 @@ checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"

 [[package]]
 name = "js-sys"
-version = "0.3.53"
+version = "0.3.55"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4bf49d50e2961077d9c99f4b7997d770a1114f087c3c2e0069b36c13fc2979d"
+checksum = "7cc9ffccd38c451a86bf13657df244e9c3f37493cce8e5e21e940963777acc84"
 dependencies = [
 "wasm-bindgen",
 ]
@ -1049,9 +1051,9 @@ dependencies = [

 [[package]]
 name = "libc"
-version = "0.2.101"
+version = "0.2.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3cb00336871be5ed2c8ed44b60ae9959dc5b9f08539422ed43f09e34ecaeba21"
+checksum = "7b2f96d100e1cf1929e7719b7edb3b90ab5298072638fccd77be9ce942ecdfce"

 [[package]]
 name = "libpasta"
@ -1076,9 +1078,9 @@ dependencies = [

 [[package]]
 name = "libsqlite3-sys"
-version = "0.22.2"
+version = "0.23.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "290b64917f8b0cb885d9de0f9959fe1f775d7fa12f1da2db9001c1c8ab60f89d"
+checksum = "abd5850c449b40bacb498b2bbdfaff648b1b055630073ba8db499caf2d0ea9f2"
 dependencies = [
 "cc",
 "pkg-config",
@ -1155,9 +1157,9 @@ checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d"

 [[package]]
 name = "minimal-lexical"
-version = "0.1.2"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6595bb28ed34f43c3fe088e48f6cfb2e033cab45f25a5384d5fdf564fbc8c4b2"
+checksum = "9c64630dcdd71f1a64c435f54885086a0de5d6a12d104d69b165fb7d5286d677"

 [[package]]
 name = "miniz_oxide"
@ -1171,9 +1173,9 @@ dependencies = [

 [[package]]
 name = "mio"
-version = "0.7.13"
+version = "0.7.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c2bdb6314ec10835cd3293dd268473a835c02b7b352e788be788b3c6ca6bb16"
+checksum = "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc"
 dependencies = [
 "libc",
 "log",
@ -1196,6 +1198,7 @@ name = "moonfire-base"
 version = "0.0.1"
 dependencies = [
 "failure",
+ "futures",
 "lazy_static",
 "libc",
 "log",
@ -1203,12 +1206,13 @@ dependencies = [
 "parking_lot",
 "serde",
 "serde_json",
+ "slab",
 "time",
 ]

 [[package]]
 name = "moonfire-db"
-version = "0.6.5"
+version = "0.6.7"
 dependencies = [
 "base64",
 "blake3",
@ -1261,7 +1265,7 @@ dependencies = [

 [[package]]
 name = "moonfire-nvr"
-version = "0.6.5"
+version = "0.6.7"
 dependencies = [
 "base64",
 "blake3",
@ -1349,9 +1353,9 @@ dependencies = [

 [[package]]
 name = "nix"
-version = "0.22.1"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7555d6c7164cc913be1ce7f95cbecdabda61eb2ccd89008524af306fb7f5031"
+checksum = "f305c2c2e4c39a82f7bf0bf65fb557f9070ce06781d4f2454295cc34b1c43188"
 dependencies = [
 "bitflags",
 "cc",
@ -1485,9 +1489,9 @@ dependencies = [

 [[package]]
 name = "object"
-version = "0.26.2"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39f37e50073ccad23b6d09bcb5b263f4e76d3bb6038e4a3c08e52162ffa8abc2"
+checksum = "c821014c18301591b89b843809ef953af9e3df0496c232d5c0611b0a52aac363"
 dependencies = [
 "memchr",
 ]
@ -1609,15 +1613,15 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"

 [[package]]
 name = "pkg-config"
-version = "0.3.19"
+version = "0.3.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c"
+checksum = "7c9b1041b4387893b91ee6746cddfc28516aff326a3519fb2adf820932c5e6cb"

 [[package]]
 name = "ppv-lite86"
-version = "0.2.10"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
+checksum = "c3ca011bd0129ff4ae15cd04c4eef202cadf6c51c21e47aba319b4e0501db741"

 [[package]]
 name = "pretty-hex"
@ -1687,9 +1691,9 @@ checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086"

 [[package]]
 name = "proc-macro2"
-version = "1.0.29"
+version = "1.0.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9f5105d4fdaab20335ca9565e106a5d9b82b6219b5ba735731124ac6711d23d"
+checksum = "edc3358ebc67bc8b7fa0c007f945b0b18226f78437d61bec735a9eb96b61ee70"
 dependencies = [
 "unicode-xid",
 ]
@ -1718,9 +1722,9 @@ dependencies = [

 [[package]]
 name = "quote"
-version = "1.0.9"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
+checksum = "38bc8cc6a5f2e3655e0899c1b848643b2562f853f114bfec7be120678e3ace05"
 dependencies = [
 "proc-macro2",
 ]
@ -1838,9 +1842,9 @@ dependencies = [

 [[package]]
 name = "reqwest"
-version = "0.11.4"
+version = "0.11.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "246e9f61b9bb77df069a947682be06e31ac43ea37862e244a69f177694ea6d22"
+checksum = "66d2927ca2f685faf0fc620ac4834690d29e7abb153add10f5812eef20b5e280"
 dependencies = [
 "base64",
 "bytes",
@ -1870,17 +1874,17 @@ dependencies = [

 [[package]]
 name = "retina"
-version = "0.3.0"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "446070f3caf291e982d240c7f921837f6da0cbffbc26f1d785b0a8d214f2cadd"
+checksum = "99806071cb433bda0abe688798940f64ea8412482c4049e27b924e4d78675c9a"
 dependencies = [
 "base64",
 "bitreader",
 "bytes",
- "digest_auth",
 "futures",
 "h264-reader",
 "hex",
+ "http-auth",
 "log",
 "once_cell",
 "pin-project",
@ -1888,7 +1892,7 @@ dependencies = [
 "rand",
 "rtp-rs",
 "rtsp-types",
- "sdp",
+ "sdp-types",
 "smallvec",
 "thiserror",
 "time",
@ -1953,9 +1957,9 @@ dependencies = [

 [[package]]
 name = "rusqlite"
-version = "0.25.3"
+version = "0.26.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57adcf67c8faaf96f3248c2a7b419a0dbc52ebe36ba83dd57fe83827c1ea4eb3"
+checksum = "8a82b0b91fad72160c56bf8da7a549b25d7c31109f52cc1437eac4c0ad2550a7"
 dependencies = [
 "bitflags",
 "fallible-iterator",
@ -2026,14 +2030,13 @@ dependencies = [
 ]

 [[package]]
-name = "sdp"
-version = "0.1.5"
+name = "sdp-types"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db73ce8329b973830407fb1ba0e51bc32716392281f7757a92f372a1420bb8ec"
+checksum = "ae499f6886cff026ebd8355c8f67a1881cd15f23ce89de4aab13588cf52142dd"
 dependencies = [
- "rand",
- "thiserror",
- "url",
+ "bstr",
+ "fallible-iterator",
 ]

 [[package]]
@ -2067,9 +2070,9 @@ dependencies = [

 [[package]]
 name = "serde_json"
-version = "1.0.67"
+version = "1.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7f9e390c27c3c0ce8bc5d725f6e4d30a29d26659494aa4b17535f7522c5c950"
+checksum = "0f690853975602e1bfe1ccbf50504d67174e3bcf340f23b5ea9992e0587a52d8"
 dependencies = [
 "indexmap",
 "itoa",
@ -2107,9 +2110,9 @@ dependencies = [

 [[package]]
 name = "serde_yaml"
-version = "0.8.20"
+version = "0.8.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad104641f3c958dab30eb3010e834c2622d1f3f4c530fef1dee20ad9485f3c09"
+checksum = "d8c608a35705a5d3cdc9fbe403147647ff34b921f8e833e49306df898f9b20af"
 dependencies = [
 "dtoa",
 "indexmap",
@ -2132,9 +2135,9 @@ dependencies = [

 [[package]]
 name = "sha2"
-version = "0.9.6"
+version = "0.9.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9204c41a1597a8c5af23c82d1c921cb01ec0a4c59e07a9c7306062829a3903f3"
+checksum = "b69f9a4c9740d74c5baa3fd2e547f9525fa8088a8a958e0ca2409a514e33f5fa"
 dependencies = [
 "block-buffer",
 "cfg-if",
@ -2164,21 +2167,21 @@ dependencies = [

 [[package]]
 name = "slab"
-version = "0.4.4"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c307a32c1c5c437f38c7fd45d753050587732ba8628319fbdf12a7e289ccc590"
+checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5"

 [[package]]
 name = "smallvec"
-version = "1.6.1"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e"
+checksum = "1ecab6c735a6bb4139c0caafd0cc3635748bbb3acf4550e8138122099251f309"

 [[package]]
 name = "socket2"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "765f090f0e423d2b55843402a07915add955e7d60657db13707a159727326cad"
+checksum = "5dc90fe6c7be1a323296982db1836d1ea9e47b6839496dde9a541bc496df3516"
 dependencies = [
 "libc",
 "winapi",
@ -2210,9 +2213,9 @@ checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c"

 [[package]]
 name = "structopt"
-version = "0.3.23"
+version = "0.3.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf9d950ef167e25e0bdb073cf1d68e9ad2795ac826f2f3f59647817cf23c0bfa"
+checksum = "40b9788f4202aa75c240ecc9c15c65185e6a39ccdeb0fd5d008b98825464c87c"
 dependencies = [
 "clap",
 "lazy_static",
@ -2221,9 +2224,9 @@ dependencies = [

 [[package]]
 name = "structopt-derive"
-version = "0.4.16"
+version = "0.4.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134d838a2c9943ac3125cf6df165eda53493451b719f3255b2a26b85f772d0ba"
+checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0"
 dependencies = [
 "heck",
 "proc-macro-error",
@ -2240,9 +2243,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"

 [[package]]
 name = "syn"
-version = "1.0.75"
+version = "1.0.80"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7f58f7e8eaa0009c5fec437aabf511bd9933e4b2d7407bd05273c01a8906ea7"
+checksum = "d010a1623fbd906d51d650a9916aaefc05ffa0e4053ff7fe601167f3e715d194"
 dependencies = [
 "proc-macro2",
 "quote",
@ -2257,9 +2260,9 @@ checksum = "20518fe4a4c9acf048008599e464deb21beeae3d3578418951a189c235a7a9a8"

 [[package]]
 name = "synstructure"
-version = "0.12.5"
+version = "0.12.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "474aaa926faa1603c40b7885a9eaea29b444d1cb2850cb7c0e37bb1a4182f4fa"
+checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f"
 dependencies = [
 "proc-macro2",
 "quote",
@ -2320,18 +2323,18 @@ dependencies = [

 [[package]]
 name = "thiserror"
-version = "1.0.28"
+version = "1.0.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "283d5230e63df9608ac7d9691adc1dfb6e701225436eb64d0b9a7f0a5a04f6ec"
+checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417"
 dependencies = [
 "thiserror-impl",
 ]

 [[package]]
 name = "thiserror-impl"
-version = "1.0.28"
+version = "1.0.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa3884228611f5cd3608e2d409bf7dce832e4eb3135e3f11addbd7e41bd68e71"
+checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b"
 dependencies = [
 "proc-macro2",
 "quote",
@ -2351,9 +2354,9 @@ dependencies = [

 [[package]]
 name = "tinyvec"
-version = "1.3.1"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "848a1e1181b9f6753b5e96a092749e29b11d19ede67dfbbd6c7dc7e0f49b5338"
+checksum = "f83b2a3d4d9091d0abd7eba4dc2710b1718583bd4d8992e2190720ea38f391f7"
 dependencies = [
 "tinyvec_macros",
 ]
@ -2366,9 +2369,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"

 [[package]]
 name = "tokio"
-version = "1.10.1"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92036be488bb6594459f2e03b60e42df6f937fe6ca5c5ffdcb539c6b84dc40f5"
+checksum = "c2c2416fdedca8443ae44b4527de1ea633af61d8f7169ffa6e72c5b53d24efcc"
 dependencies = [
 "autocfg",
 "bytes",
@ -2386,9 +2389,9 @@ dependencies = [

 [[package]]
 name = "tokio-macros"
-version = "1.3.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54473be61f4ebe4efd09cec9bd5d16fa51d70ea0192213d754d2d500457db110"
+checksum = "b2dd85aeaba7b68df939bd357c6afb36c87951be9e80bf9c859f2fc3e9fca0fd"
 dependencies = [
 "proc-macro2",
 "quote",
@ -2421,9 +2424,9 @@ dependencies = [

 [[package]]
 name = "tokio-util"
-version = "0.6.7"
+version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1caa0b0c8d94a049db56b5acf8cba99dc0623aab1b26d5b5f5e2d945846b3592"
+checksum = "08d3725d3efa29485e87311c5b699de63cde14b00ed4d256b8318aa30ca452cd"
 dependencies = [
 "bytes",
 "futures-core",
@ -2450,9 +2453,9 @@ checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6"

 [[package]]
 name = "tracing"
-version = "0.1.26"
+version = "0.1.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09adeb8c97449311ccd28a427f96fb563e7fd31aabf994189879d9da2394b89d"
+checksum = "375a639232caf30edfc78e8d89b2d4c375515393e7af7e16f01cd96917fb2105"
 dependencies = [
 "cfg-if",
 "log",
@ -2463,9 +2466,9 @@ dependencies = [

 [[package]]
 name = "tracing-attributes"
-version = "0.1.15"
+version = "0.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c42e6fa53307c8a17e4ccd4dc81cf5ec38db9209f59b222210375b54ee40d1e2"
+checksum = "f4f480b8f81512e825f337ad51e94c1eb5d3bbdf2b363dcd01e2b19a9ffe3f8e"
 dependencies = [
 "proc-macro2",
 "quote",
@ -2474,9 +2477,9 @@ dependencies = [

 [[package]]
 name = "tracing-core"
-version = "0.1.19"
+version = "0.1.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ca517f43f0fb96e0c3072ed5c275fe5eece87e8cb52f4a77b69226d3b1c9df8"
+checksum = "1f4ed65637b8390770814083d20756f87bfa2c21bf2f110babdc5438351746e4"
 dependencies = [
 "lazy_static",
 ]
@ -2508,9 +2511,9 @@ dependencies = [

 [[package]]
 name = "typenum"
-version = "1.13.0"
+version = "1.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "879f6906492a7cd215bfa4cf595b600146ccfac0c79bcbd1f3000162af5e8b06"
+checksum = "b63708a265f51345575b27fe43f9500ad611579e764c79edbc2037b1121959ec"

 [[package]]
 name = "unchecked-index"
@ -2520,9 +2523,9 @@ checksum = "eeba86d422ce181a719445e51872fa30f1f7413b62becb52e95ec91aa262d85c"

 [[package]]
 name = "unicode-bidi"
-version = "0.3.6"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "246f4c42e67e7a4e3c6106ff716a5d067d4132a642840b242e357e468a2a0085"
+checksum = "1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f"

 [[package]]
 name = "unicode-normalization"
@ -2541,9 +2544,9 @@ checksum = "8895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b"

 [[package]]
 name = "unicode-width"
-version = "0.1.8"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3"
+checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973"

 [[package]]
 name = "unicode-xid"
@ -2622,21 +2625,19 @@ checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"

 [[package]]
 name = "wasm-bindgen"
-version = "0.2.76"
+version = "0.2.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ce9b1b516211d33767048e5d47fa2a381ed8b76fc48d2ce4aa39877f9f183e0"
+checksum = "632f73e236b219150ea279196e54e610f5dbafa5d61786303d4da54f84e47fce"
 dependencies = [
 "cfg-if",
- "serde",
- "serde_json",
 "wasm-bindgen-macro",
 ]

 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.76"
+version = "0.2.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfe8dc78e2326ba5f845f4b5bf548401604fa20b1dd1d365fb73b6c1d6364041"
+checksum = "a317bf8f9fba2476b4b2c85ef4c4af8ff39c3c7f0cdfeed4f82c34a880aa837b"
 dependencies = [
 "bumpalo",
 "lazy_static",
@ -2649,9 +2650,9 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.26"
+version = "0.4.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95fded345a6559c2cfee778d562300c581f7d4ff3edb9b0d230d69800d213972"
+checksum = "8e8d7523cb1f2a4c96c1317ca690031b714a51cc14e05f712446691f413f5d39"
 dependencies = [
 "cfg-if",
 "js-sys",
@ -2661,9 +2662,9 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.76"
+version = "0.2.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44468aa53335841d9d6b6c023eaab07c0cd4bddbcfdee3e2bb1e8d2cb8069fef"
+checksum = "d56146e7c495528bf6587663bea13a8eb588d39b36b679d83972e1a2dbbdacf9"
 dependencies = [
 "quote",
 "wasm-bindgen-macro-support",
@ -2671,9 +2672,9 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.76"
+version = "0.2.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0195807922713af1e67dc66132c7328206ed9766af3858164fb583eedc25fbad"
+checksum = "7803e0eea25835f8abdc585cd3021b3deb11543c6fe226dcd30b228857c5c5ab"
 dependencies = [
 "proc-macro2",
 "quote",
@ -2684,9 +2685,9 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.76"
+version = "0.2.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acdb075a845574a1fa5f09fd77e43f7747599301ea3417a9fbffdeedfc1f4a29"
+checksum = "0237232789cf037d5480773fe568aac745bfe2afbc11a863e97901780a6b47cc"

 [[package]]
 name = "wasmer_enumset"
@ -2712,9 +2713,9 @@ dependencies = [

 [[package]]
 name = "web-sys"
-version = "0.3.53"
+version = "0.3.55"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "224b2f6b67919060055ef1a67807367c2066ed520c3862cc013d26cf893a783c"
+checksum = "38eb105f1c59d9eaa6b5cdc92b859d85b926e82cb2e0945cd0c9259faa6fe9fb"
 dependencies = [
 "js-sys",
 "wasm-bindgen",
--- a/server/Cargo.toml
+++ b/server/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "moonfire-nvr"
-version = "0.6.5"
+version = "0.6.7"
 authors = ["Scott Lamb <slamb@slamb.org>"]
 edition = "2018"
 license-file = "../LICENSE.txt"
@ -41,21 +41,21 @@ libc = "0.2"
 log = { version = "0.4" }
 memchr = "2.0.2"
 mylog = { git = "https://github.com/scottlamb/mylog" }
-nix = "0.22.0"
+nix = "0.23.0"
 nom = "7.0.0"
 parking_lot = { version = "0.11.1", features = [] }
 protobuf = { git = "https://github.com/stepancheg/rust-protobuf" }
 reffers = "0.6.0"
-retina = "0.3.0"
+retina = "0.3.3"
 ring = "0.16.2"
-rusqlite = "0.25.3"
+rusqlite = "0.26.1"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 smallvec = "1.0"
 structopt = { version = "0.3.13", default-features = false }
 sync_wrapper = "0.1.0"
 time = "0.1"
-tokio = { version = "1.0", features = ["macros", "parking_lot", "rt-multi-thread", "signal", "time"] }
+tokio = { version = "1.0", features = ["macros", "parking_lot", "rt-multi-thread", "signal", "sync", "time"] }
 tokio-stream = "0.1.5"
 tokio-tungstenite = "0.15.0"
 tracing = { version = "0.1", features = ["log"] }
--- a/server/base/Cargo.toml
+++ b/server/base/Cargo.toml
@ -14,6 +14,7 @@ path = "lib.rs"

 [dependencies]
 failure = "0.1.1"
+futures = "0.3"
 lazy_static = "1.0"
 libc = "0.2"
 log = "0.4"
@ -21,4 +22,5 @@ parking_lot = { version = "0.11.1", features = [] }
 nom = "7.0.0"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
+slab = "0.4"
 time = "0.1"
--- a/server/base/clock.rs
+++ b/server/base/clock.rs
@ -13,12 +13,17 @@ use std::thread;
 use std::time::Duration as StdDuration;
 use time::{Duration, Timespec};

+use crate::shutdown::ShutdownError;
+
 /// Abstract interface to the system clocks. This is for testability.
 pub trait Clocks: Send + Sync + 'static {
    /// Gets the current time from `CLOCK_REALTIME`.
    fn realtime(&self) -> Timespec;

-    /// Gets the current time from `CLOCK_MONOTONIC`.
+    /// Gets the current time from a monotonic clock.
+    ///
+    /// On Linux, this uses `CLOCK_BOOTTIME`, which includes suspended time.
+    /// On other systems, it uses `CLOCK_MONOTONIC`.
    fn monotonic(&self) -> Timespec;

    /// Causes the current thread to sleep for the specified time.
@ -32,16 +37,21 @@ pub trait Clocks: Send + Sync + 'static {
    ) -> Result<T, mpsc::RecvTimeoutError>;
 }

-pub fn retry_forever<C, T, E>(clocks: &C, f: &mut dyn FnMut() -> Result<T, E>) -> T
+pub fn retry<C, T, E>(
+    clocks: &C,
+    shutdown_rx: &crate::shutdown::Receiver,
+    f: &mut dyn FnMut() -> Result<T, E>,
+) -> Result<T, ShutdownError>
 where
    C: Clocks,
    E: Into<Error>,
 {
    loop {
        let e = match f() {
-            Ok(t) => return t,
+            Ok(t) => return Ok(t),
            Err(e) => e.into(),
        };
+        shutdown_rx.check()?;
        let sleep_time = Duration::seconds(1);
        warn!(
            "sleeping for {} after error: {}",
@ -70,6 +80,13 @@ impl Clocks for RealClocks {
    fn realtime(&self) -> Timespec {
        self.get(libc::CLOCK_REALTIME)
    }
+
+    #[cfg(target_os = "linux")]
+    fn monotonic(&self) -> Timespec {
+        self.get(libc::CLOCK_BOOTTIME)
+    }
+
+    #[cfg(not(target_os = "linux"))]
    fn monotonic(&self) -> Timespec {
        self.get(libc::CLOCK_MONOTONIC)
    }
--- a/server/base/lib.rs
+++ b/server/base/lib.rs
@ -1,9 +1,10 @@
 // This file is part of Moonfire NVR, a security camera network video recorder.
-// Copyright (C) 2018 The Moonfire NVR Authors; see AUTHORS and LICENSE.txt.
+// Copyright (C) 2021 The Moonfire NVR Authors; see AUTHORS and LICENSE.txt.
 // SPDX-License-Identifier: GPL-v3.0-or-later WITH GPL-3.0-linking-exception.

 pub mod clock;
 mod error;
+pub mod shutdown;
 pub mod strutil;
 pub mod time;

--- a/server/base/shutdown.rs
+++ b/server/base/shutdown.rs
@ -0,0 +1,211 @@
+// This file is part of Moonfire NVR, a security camera network video recorder.
+// Copyright (C) 2021 The Moonfire NVR Authors; see AUTHORS and LICENSE.txt.
+// SPDX-License-Identifier: GPL-v3.0-or-later WITH GPL-3.0-linking-exception.
+
+//! Tools for propagating a graceful shutdown signal through the program.
+//!
+//! The receiver can be cloned, checked and used as a future in async code.
+//! Also, for convenience, blocked in synchronous code without going through the
+//! runtime.
+//!
+//! Surprisingly, I couldn't find any simple existing mechanism for anything
+//! close to this in `futures::channels` or `tokio::sync`.
+
+use std::pin::Pin;
+use std::sync::Arc;
+use std::task::{Context, Poll, Waker};
+
+use futures::Future;
+use parking_lot::{Condvar, Mutex};
+use slab::Slab;
+
+#[derive(Debug)]
+pub struct ShutdownError;
+
+impl std::fmt::Display for ShutdownError {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.write_str("shutdown requested")
+    }
+}
+
+impl std::error::Error for ShutdownError {}
+
+struct Inner {
+    /// `None` iff shutdown has already happened.
+    wakers: Mutex<Option<Slab<Waker>>>,
+
+    condvar: Condvar,
+}
+
+pub struct Sender(Arc<Inner>);
+
+impl Drop for Sender {
+    fn drop(&mut self) {
+        // Note sequencing: modify the lock state, then notify async/sync waiters.
+        // The opposite order would create a race in which something might never wake.
+        let mut wakers = self
+            .0
+            .wakers
+            .lock()
+            .take()
+            .expect("only the single Sender takes the slab");
+        for w in wakers.drain() {
+            w.wake();
+        }
+        self.0.condvar.notify_all();
+    }
+}
+
+#[derive(Clone)]
+pub struct Receiver(Arc<Inner>);
+
+pub struct ReceiverRefFuture<'receiver> {
+    receiver: &'receiver Receiver,
+    waker_i: usize,
+}
+
+pub struct ReceiverFuture {
+    receiver: Arc<Inner>,
+    waker_i: usize,
+}
+
+/// `waker_i` value to indicate no slot has been assigned.
+///
+/// There can't be `usize::MAX` items in the slab because there are other things
+/// in the address space (and because `Waker` uses more than one byte anyway).
+const NO_WAKER: usize = usize::MAX;
+
+impl Receiver {
+    pub fn check(&self) -> Result<(), ShutdownError> {
+        if self.0.wakers.lock().is_none() {
+            Err(ShutdownError)
+        } else {
+            Ok(())
+        }
+    }
+
+    pub fn as_future(&self) -> ReceiverRefFuture {
+        ReceiverRefFuture {
+            receiver: self,
+            waker_i: NO_WAKER,
+        }
+    }
+
+    pub fn future(&self) -> ReceiverFuture {
+        ReceiverFuture {
+            receiver: self.0.clone(),
+            waker_i: NO_WAKER,
+        }
+    }
+
+    pub fn into_future(self) -> ReceiverFuture {
+        ReceiverFuture {
+            receiver: self.0,
+            waker_i: NO_WAKER,
+        }
+    }
+
+    pub fn wait_for(&self, timeout: std::time::Duration) -> Result<(), ShutdownError> {
+        let mut l = self.0.wakers.lock();
+        if l.is_none() {
+            return Err(ShutdownError);
+        }
+        if self.0.condvar.wait_for(&mut l, timeout).timed_out() {
+            Ok(())
+        } else {
+            // parking_lot guarantees no spurious wakeups.
+            debug_assert!(l.is_none());
+            Err(ShutdownError)
+        }
+    }
+}
+
+fn poll_impl(inner: &Inner, waker_i: &mut usize, cx: &mut Context<'_>) -> Poll<()> {
+    let mut l = inner.wakers.lock();
+    let wakers = match &mut *l {
+        None => return Poll::Ready(()),
+        Some(w) => w,
+    };
+    let new_waker = cx.waker();
+    if *waker_i == NO_WAKER {
+        *waker_i = wakers.insert(new_waker.clone());
+    } else {
+        let existing_waker = &mut wakers[*waker_i];
+        if !new_waker.will_wake(existing_waker) {
+            *existing_waker = new_waker.clone();
+        }
+    }
+    Poll::Pending
+}
+
+impl<'receiver> Future for ReceiverRefFuture<'receiver> {
+    type Output = ();
+
+    fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
+        poll_impl(&self.receiver.0, &mut self.waker_i, cx)
+    }
+}
+
+impl Future for ReceiverFuture {
+    type Output = ();
+
+    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
+        let this = Pin::into_inner(self);
+        poll_impl(&this.receiver, &mut this.waker_i, cx)
+    }
+}
+
+/// Returns a sender and receiver for graceful shutdown.
+///
+/// Dropping the sender will request shutdown.
+///
+/// The receiver can be used as a future or just polled when convenient.
+pub fn channel() -> (Sender, Receiver) {
+    let inner = Arc::new(Inner {
+        wakers: Mutex::new(Some(Slab::new())),
+        condvar: Condvar::new(),
+    });
+    (Sender(inner.clone()), Receiver(inner))
+}
+
+#[cfg(test)]
+mod tests {
+    use futures::Future;
+    use std::task::{Context, Poll};
+
+    #[test]
+    fn simple_check() {
+        let (tx, rx) = super::channel();
+        rx.check().unwrap();
+        drop(tx);
+        rx.check().unwrap_err();
+    }
+
+    #[test]
+    fn blocking() {
+        let (tx, rx) = super::channel();
+        rx.wait_for(std::time::Duration::from_secs(0)).unwrap();
+        let h = std::thread::spawn(move || {
+            rx.wait_for(std::time::Duration::from_secs(1000))
+                .unwrap_err()
+        });
+
+        // Make it likely that rx has done its initial check and is waiting on the Condvar.
+        std::thread::sleep(std::time::Duration::from_millis(10));
+
+        drop(tx);
+        h.join().unwrap();
+    }
+
+    #[test]
+    fn future() {
+        let (tx, rx) = super::channel();
+        let waker = futures::task::noop_waker_ref();
+        let mut cx = Context::from_waker(waker);
+        let mut f = rx.as_future();
+        assert_eq!(std::pin::Pin::new(&mut f).poll(&mut cx), Poll::Pending);
+        drop(tx);
+        assert_eq!(std::pin::Pin::new(&mut f).poll(&mut cx), Poll::Ready(()));
+        // TODO: this doesn't actually check that waker is even used.
+    }
+}
--- a/server/db/Cargo.toml
+++ b/server/db/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "moonfire-db"
-version = "0.6.5"
+version = "0.6.7"
 authors = ["Scott Lamb <slamb@slamb.org>"]
 readme = "../README.md"
 edition = "2018"
@ -28,7 +28,7 @@ libc = "0.2"
 libpasta = "0.1.2"
 log = "0.4"
 mylog = { git = "https://github.com/scottlamb/mylog" }
-nix = "0.22.0"
+nix = "0.23.0"
 num-rational = { version = "0.4.0", default-features = false, features = ["std"] }
 odds = { version = "0.4.0", features = ["std-vec"] }
 parking_lot = { version = "0.11.1", features = [] }
@ -36,7 +36,7 @@ pretty-hex = "0.2.1"
 prettydiff = { git = "https://github.com/scottlamb/prettydiff", branch = "pr-update-deps" }
 protobuf = { git = "https://github.com/stepancheg/rust-protobuf" }
 ring = "0.16.2"
-rusqlite = "0.25.3"
+rusqlite = "0.26.1"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 smallvec = "1.0"
--- a/server/db/db.rs
+++ b/server/db/db.rs
@ -33,6 +33,7 @@ use crate::raw;
 use crate::recording;
 use crate::schema;
 use crate::signal;
+use base::bail_t;
 use base::clock::{self, Clocks};
 use base::strutil::encode_size;
 use failure::{bail, format_err, Error, ResultExt};
@ -214,6 +215,7 @@ pub struct ListAggregatedRecordingsRow {
    pub open_id: u32,
    pub first_uncommitted: Option<i32>,
    pub growing: bool,
+    pub has_trailing_zero: bool,
 }

 impl ListAggregatedRecordingsRow {
@ -237,6 +239,7 @@ impl ListAggregatedRecordingsRow {
                None
            },
            growing,
+            has_trailing_zero: (row.flags & RecordingFlags::TrailingZero as i32) != 0,
        }
    }
 }
@ -341,7 +344,7 @@ impl SampleFileDir {
    }

    /// Returns expected existing metadata when opening this directory.
-    fn meta(&self, db_uuid: &Uuid) -> schema::DirMeta {
+    fn expected_meta(&self, db_uuid: &Uuid) -> schema::DirMeta {
        let mut meta = schema::DirMeta::default();
        meta.db_uuid.extend_from_slice(&db_uuid.as_bytes()[..]);
        meta.dir_uuid.extend_from_slice(&self.uuid.as_bytes()[..]);
@ -1172,20 +1175,20 @@ impl LockedDatabase {
            if dir.dir.is_some() {
                continue;
            }
-            let mut meta = dir.meta(&self.uuid);
+            let mut expected_meta = dir.expected_meta(&self.uuid);
            if let Some(o) = self.open.as_ref() {
-                let open = meta.in_progress_open.set_default();
+                let open = expected_meta.in_progress_open.set_default();
                open.id = o.id;
                open.uuid.extend_from_slice(&o.uuid.as_bytes()[..]);
            }
-            let d = dir::SampleFileDir::open(&dir.path, &meta)
+            let d = dir::SampleFileDir::open(&dir.path, &expected_meta)
                .map_err(|e| e.context(format!("Failed to open dir {}", dir.path)))?;
            if self.open.is_none() {
                // read-only mode; it's already fully opened.
                dir.dir = Some(d);
            } else {
                // read-write mode; there are more steps to do.
-                e.insert((meta, d));
+                e.insert((expected_meta, d));
            }
        }

@ -1211,8 +1214,7 @@ impl LockedDatabase {

        for (id, (mut meta, d)) in in_progress.drain() {
            let dir = self.sample_file_dirs_by_id.get_mut(&id).unwrap();
-            meta.last_complete_open.clear();
-            mem::swap(&mut meta.last_complete_open, &mut meta.in_progress_open);
+            meta.last_complete_open = meta.in_progress_open.take().into();
            d.write_meta(&meta)?;
            dir.dir = Some(d);
        }
@ -1247,10 +1249,10 @@ impl LockedDatabase {
        &self,
        stream_id: i32,
        desired_time: Range<recording::Time>,
-        f: &mut dyn FnMut(ListRecordingsRow) -> Result<(), Error>,
-    ) -> Result<(), Error> {
+        f: &mut dyn FnMut(ListRecordingsRow) -> Result<(), base::Error>,
+    ) -> Result<(), base::Error> {
        let s = match self.streams_by_id.get(&stream_id) {
-            None => bail!("no such stream {}", stream_id),
+            None => bail_t!(NotFound, "no such stream {}", stream_id),
            Some(s) => s,
        };
        raw::list_recordings_by_time(&self.conn, stream_id, desired_time.clone(), f)?;
@ -1280,10 +1282,10 @@ impl LockedDatabase {
        &self,
        stream_id: i32,
        desired_ids: Range<i32>,
-        f: &mut dyn FnMut(ListRecordingsRow) -> Result<(), Error>,
-    ) -> Result<(), Error> {
+        f: &mut dyn FnMut(ListRecordingsRow) -> Result<(), base::Error>,
+    ) -> Result<(), base::Error> {
        let s = match self.streams_by_id.get(&stream_id) {
-            None => bail!("no such stream {}", stream_id),
+            None => bail_t!(NotFound, "no such stream {}", stream_id),
            Some(s) => s,
        };
        if desired_ids.start < s.cum_recordings {
@ -1321,8 +1323,8 @@ impl LockedDatabase {
        stream_id: i32,
        desired_time: Range<recording::Time>,
        forced_split: recording::Duration,
-        f: &mut dyn FnMut(&ListAggregatedRecordingsRow) -> Result<(), Error>,
-    ) -> Result<(), Error> {
+        f: &mut dyn FnMut(&ListAggregatedRecordingsRow) -> Result<(), base::Error>,
+    ) -> Result<(), base::Error> {
        // Iterate, maintaining a map from a recording_id to the aggregated row for the latest
        // batch of recordings from the run starting at that id. Runs can be split into multiple
        // batches for a few reasons:
@ -1343,6 +1345,7 @@ impl LockedDatabase {
            let run_start_id = recording_id - row.run_offset;
            let uncommitted = (row.flags & RecordingFlags::Uncommitted as i32) != 0;
            let growing = (row.flags & RecordingFlags::Growing as i32) != 0;
+            let has_trailing_zero = (row.flags & RecordingFlags::TrailingZero as i32) != 0;
            use std::collections::btree_map::Entry;
            match aggs.entry(run_start_id) {
                Entry::Occupied(mut e) => {
@ -1359,7 +1362,8 @@ impl LockedDatabase {
                    } else {
                        // append.
                        if a.time.end != row.start {
-                            bail!(
+                            bail_t!(
+                                Internal,
                                "stream {} recording {} ends at {} but {} starts at {}",
                                stream_id,
                                a.ids.end - 1,
@ -1369,7 +1373,8 @@ impl LockedDatabase {
                            );
                        }
                        if a.open_id != row.open_id {
-                            bail!(
+                            bail_t!(
+                                Internal,
                                "stream {} recording {} has open id {} but {} has {}",
                                stream_id,
                                a.ids.end - 1,
@ -1387,6 +1392,7 @@ impl LockedDatabase {
                            a.first_uncommitted = a.first_uncommitted.or(Some(recording_id));
                        }
                        a.growing = growing;
+                        a.has_trailing_zero = has_trailing_zero;
                    }
                }
                Entry::Vacant(e) => {
@ -1763,14 +1769,13 @@ impl LockedDatabase {
                path,
                uuid,
                dir: Some(dir),
-                last_complete_open: None,
+                last_complete_open: Some(*o),
                garbage_needs_unlink: FnvHashSet::default(),
                garbage_unlinked: Vec::new(),
            }),
            Entry::Occupied(_) => bail!("duplicate sample file dir id {}", id),
        };
-        d.last_complete_open = Some(*o);
-        mem::swap(&mut meta.last_complete_open, &mut meta.in_progress_open);
+        meta.last_complete_open = meta.in_progress_open.take().into();
        d.dir.as_ref().unwrap().write_meta(&meta)?;
        Ok(id)
    }
@ -1792,7 +1797,7 @@ impl LockedDatabase {
            );
        }
        let dir = match d.get_mut().dir.take() {
-            None => dir::SampleFileDir::open(&d.get().path, &d.get().meta(&self.uuid))?,
+            None => dir::SampleFileDir::open(&d.get().path, &d.get().expected_meta(&self.uuid))?,
            Some(arc) => match Arc::strong_count(&arc) {
                1 => {
                    d.get_mut().dir = Some(arc); // put it back.
@ -1807,7 +1812,7 @@ impl LockedDatabase {
                &d.get().path
            );
        }
-        let mut meta = d.get().meta(&self.uuid);
+        let mut meta = d.get().expected_meta(&self.uuid);
        meta.in_progress_open = meta.last_complete_open.take().into();
        dir.write_meta(&meta)?;
        if self
--- a/server/db/dir/mod.rs
+++ b/server/db/dir/mod.rs
@ -212,8 +212,8 @@ impl SampleFileDir {
    ///
    /// `db_meta.in_progress_open` should be filled if the directory should be opened in read/write
    /// mode; absent in read-only mode.
-    pub fn open(path: &str, db_meta: &schema::DirMeta) -> Result<Arc<SampleFileDir>, Error> {
-        let read_write = db_meta.in_progress_open.is_some();
+    pub fn open(path: &str, expected_meta: &schema::DirMeta) -> Result<Arc<SampleFileDir>, Error> {
+        let read_write = expected_meta.in_progress_open.is_some();
        let s = SampleFileDir::open_self(path, false)?;
        s.fd.lock(if read_write {
            FlockArg::LockExclusiveNonblock
@ -222,45 +222,50 @@ impl SampleFileDir {
        })
        .map_err(|e| e.context(format!("unable to lock dir {}", path)))?;
        let dir_meta = read_meta(&s.fd).map_err(|e| e.context("unable to read meta file"))?;
-        if !SampleFileDir::consistent(db_meta, &dir_meta) {
-            let serialized = db_meta
-                .write_length_delimited_to_bytes()
-                .expect("proto3->vec is infallible");
+        if let Err(e) = SampleFileDir::check_consistent(expected_meta, &dir_meta) {
            bail!(
-                "metadata mismatch.\ndb: {:#?}\ndir: {:#?}\nserialized db: {:#?}",
-                db_meta,
-                &dir_meta,
-                &serialized
+                "metadata mismatch: {}.\nexpected:\n{:#?}\n\nactual:\n{:#?}",
+                e,
+                expected_meta,
+                &dir_meta
            );
        }
-        if db_meta.in_progress_open.is_some() {
-            s.write_meta(db_meta)?;
+        if expected_meta.in_progress_open.is_some() {
+            s.write_meta(expected_meta)?;
        }
        Ok(s)
    }

-    /// Returns true if the existing directory and database metadata are consistent; the directory
+    /// Checks that the existing directory and database metadata are consistent; the directory
    /// is then openable.
-    pub(crate) fn consistent(db_meta: &schema::DirMeta, dir_meta: &schema::DirMeta) -> bool {
-        if dir_meta.db_uuid != db_meta.db_uuid {
-            return false;
+    pub(crate) fn check_consistent(
+        expected_meta: &schema::DirMeta,
+        actual_meta: &schema::DirMeta,
+    ) -> Result<(), String> {
+        if actual_meta.db_uuid != expected_meta.db_uuid {
+            return Err("db uuid mismatch".into());
        }
-        if dir_meta.dir_uuid != db_meta.dir_uuid {
-            return false;
+        if actual_meta.dir_uuid != expected_meta.dir_uuid {
+            return Err("dir uuid mismatch".into());
        }

-        if db_meta.last_complete_open.is_some()
-            && (db_meta.last_complete_open != dir_meta.last_complete_open
-                && db_meta.last_complete_open != dir_meta.in_progress_open)
+        if expected_meta.last_complete_open.is_some()
+            && (expected_meta.last_complete_open != actual_meta.last_complete_open
+                && expected_meta.last_complete_open != actual_meta.in_progress_open)
        {
-            return false;
+            return Err(format!(
+                "expected open {:?}; but got {:?} (complete) or {:?} (in progress)",
+                &expected_meta.last_complete_open,
+                &actual_meta.last_complete_open,
+                &actual_meta.in_progress_open,
+            ));
        }

-        if db_meta.last_complete_open.is_none() && dir_meta.last_complete_open.is_some() {
-            return false;
+        if expected_meta.last_complete_open.is_none() && actual_meta.last_complete_open.is_some() {
+            return Err("expected never opened".into());
        }

-        true
+        Ok(())
    }

    pub(crate) fn create(
--- a/server/db/raw.rs
+++ b/server/db/raw.rs
@ -6,7 +6,8 @@

 use crate::db::{self, CompositeId, FromSqlUuid};
 use crate::recording;
-use failure::{bail, Error, ResultExt};
+use base::{ErrorKind, ResultExt as _};
+use failure::{bail, Error, ResultExt as _};
 use fnv::FnvHashSet;
 use rusqlite::{named_params, params};
 use std::ops::Range;
@ -103,14 +104,18 @@ pub(crate) fn list_recordings_by_time(
    conn: &rusqlite::Connection,
    stream_id: i32,
    desired_time: Range<recording::Time>,
-    f: &mut dyn FnMut(db::ListRecordingsRow) -> Result<(), Error>,
-) -> Result<(), Error> {
-    let mut stmt = conn.prepare_cached(LIST_RECORDINGS_BY_TIME_SQL)?;
-    let rows = stmt.query(named_params! {
-        ":stream_id": stream_id,
-        ":start_time_90k": desired_time.start.0,
-        ":end_time_90k": desired_time.end.0,
-    })?;
+    f: &mut dyn FnMut(db::ListRecordingsRow) -> Result<(), base::Error>,
+) -> Result<(), base::Error> {
+    let mut stmt = conn
+        .prepare_cached(LIST_RECORDINGS_BY_TIME_SQL)
+        .err_kind(ErrorKind::Internal)?;
+    let rows = stmt
+        .query(named_params! {
+            ":stream_id": stream_id,
+            ":start_time_90k": desired_time.start.0,
+            ":end_time_90k": desired_time.end.0,
+        })
+        .err_kind(ErrorKind::Internal)?;
    list_recordings_inner(rows, false, f)
 }

@ -119,39 +124,46 @@ pub(crate) fn list_recordings_by_id(
    conn: &rusqlite::Connection,
    stream_id: i32,
    desired_ids: Range<i32>,
-    f: &mut dyn FnMut(db::ListRecordingsRow) -> Result<(), Error>,
-) -> Result<(), Error> {
-    let mut stmt = conn.prepare_cached(LIST_RECORDINGS_BY_ID_SQL)?;
-    let rows = stmt.query(named_params! {
-        ":start": CompositeId::new(stream_id, desired_ids.start).0,
-        ":end": CompositeId::new(stream_id, desired_ids.end).0,
-    })?;
+    f: &mut dyn FnMut(db::ListRecordingsRow) -> Result<(), base::Error>,
+) -> Result<(), base::Error> {
+    let mut stmt = conn
+        .prepare_cached(LIST_RECORDINGS_BY_ID_SQL)
+        .err_kind(ErrorKind::Internal)?;
+    let rows = stmt
+        .query(named_params! {
+            ":start": CompositeId::new(stream_id, desired_ids.start).0,
+            ":end": CompositeId::new(stream_id, desired_ids.end).0,
+        })
+        .err_kind(ErrorKind::Internal)?;
    list_recordings_inner(rows, true, f)
 }

 fn list_recordings_inner(
    mut rows: rusqlite::Rows,
    include_prev: bool,
-    f: &mut dyn FnMut(db::ListRecordingsRow) -> Result<(), Error>,
-) -> Result<(), Error> {
-    while let Some(row) = rows.next()? {
-        let wall_duration_90k = row.get(4)?;
-        let media_duration_delta_90k: i32 = row.get(5)?;
+    f: &mut dyn FnMut(db::ListRecordingsRow) -> Result<(), base::Error>,
+) -> Result<(), base::Error> {
+    while let Some(row) = rows.next().err_kind(ErrorKind::Internal)? {
+        let wall_duration_90k = row.get(4).err_kind(ErrorKind::Internal)?;
+        let media_duration_delta_90k: i32 = row.get(5).err_kind(ErrorKind::Internal)?;
        f(db::ListRecordingsRow {
-            id: CompositeId(row.get(0)?),
-            run_offset: row.get(1)?,
-            flags: row.get(2)?,
-            start: recording::Time(row.get(3)?),
+            id: CompositeId(row.get(0).err_kind(ErrorKind::Internal)?),
+            run_offset: row.get(1).err_kind(ErrorKind::Internal)?,
+            flags: row.get(2).err_kind(ErrorKind::Internal)?,
+            start: recording::Time(row.get(3).err_kind(ErrorKind::Internal)?),
            wall_duration_90k,
            media_duration_90k: wall_duration_90k + media_duration_delta_90k,
-            sample_file_bytes: row.get(6)?,
-            video_samples: row.get(7)?,
-            video_sync_samples: row.get(8)?,
-            video_sample_entry_id: row.get(9)?,
-            open_id: row.get(10)?,
+            sample_file_bytes: row.get(6).err_kind(ErrorKind::Internal)?,
+            video_samples: row.get(7).err_kind(ErrorKind::Internal)?,
+            video_sync_samples: row.get(8).err_kind(ErrorKind::Internal)?,
+            video_sample_entry_id: row.get(9).err_kind(ErrorKind::Internal)?,
+            open_id: row.get(10).err_kind(ErrorKind::Internal)?,
            prev_media_duration_and_runs: match include_prev {
                false => None,
-                true => Some((recording::Duration(row.get(11)?), row.get(12)?)),
+                true => Some((
+                    recording::Duration(row.get(11).err_kind(ErrorKind::Internal)?),
+                    row.get(12).err_kind(ErrorKind::Internal)?,
+                )),
            },
        })?;
    }
--- a/server/db/testutil.rs
+++ b/server/db/testutil.rs
@ -51,6 +51,8 @@ pub fn init() {
 pub struct TestDb<C: Clocks + Clone> {
    pub db: Arc<db::Database<C>>,
    pub dirs_by_stream_id: Arc<FnvHashMap<i32, Arc<dir::SampleFileDir>>>,
+    pub shutdown_tx: base::shutdown::Sender,
+    pub shutdown_rx: base::shutdown::Receiver,
    pub syncer_channel: writer::SyncerChannel<::std::fs::File>,
    pub syncer_join: thread::JoinHandle<()>,
    pub tmpdir: TempDir,
@ -119,11 +121,14 @@ impl<C: Clocks + Clone> TestDb<C> {
        }
        let mut dirs_by_stream_id = FnvHashMap::default();
        dirs_by_stream_id.insert(TEST_STREAM_ID, dir);
+        let (shutdown_tx, shutdown_rx) = base::shutdown::channel();
        let (syncer_channel, syncer_join) =
-            writer::start_syncer(db.clone(), sample_file_dir_id).unwrap();
+            writer::start_syncer(db.clone(), shutdown_rx.clone(), sample_file_dir_id).unwrap();
        TestDb {
            db,
            dirs_by_stream_id: Arc::new(dirs_by_stream_id),
+            shutdown_tx,
+            shutdown_rx,
            syncer_channel,
            syncer_join,
            tmpdir,
--- a/server/db/upgrade/v4_to_v5.rs
+++ b/server/db/upgrade/v4_to_v5.rs
@ -37,11 +37,12 @@ fn maybe_upgrade_meta(dir: &dir::Fd, db_meta: &schema::DirMeta) -> Result<bool,
    dir_meta
        .merge_from(&mut s)
        .map_err(|e| e.context("Unable to parse metadata proto: {}"))?;
-    if !dir::SampleFileDir::consistent(&db_meta, &dir_meta) {
+    if let Err(e) = dir::SampleFileDir::check_consistent(&db_meta, &dir_meta) {
        bail!(
-            "Inconsistent db_meta={:?} dir_meta={:?}",
+            "Inconsistent db_meta={:?} dir_meta={:?}: {}",
            &db_meta,
-            &dir_meta
+            &dir_meta,
+            e
        );
    }
    let mut f = crate::fs::openat(
--- a/server/db/writer.rs
+++ b/server/db/writer.rs
@ -8,6 +8,7 @@ use crate::db::{self, CompositeId};
 use crate::dir;
 use crate::recording::{self, MAX_RECORDING_WALL_DURATION};
 use base::clock::{self, Clocks};
+use base::shutdown::ShutdownError;
 use failure::{bail, format_err, Error};
 use fnv::FnvHashMap;
 use log::{debug, trace, warn};
@ -95,6 +96,7 @@ struct Syncer<C: Clocks + Clone, D: DirWriter> {
    dir: D,
    db: Arc<db::Database<C>>,
    planned_flushes: std::collections::BinaryHeap<PlannedFlush>,
+    shutdown_rx: base::shutdown::Receiver,
 }

 /// A plan to flush at a given instant due to a recently-saved recording's `flush_if_sec` parameter.
@ -155,13 +157,14 @@ impl Eq for PlannedFlush {}
 /// TODO: add a join wrapper which arranges for the on flush hook to be removed automatically.
 pub fn start_syncer<C>(
    db: Arc<db::Database<C>>,
+    shutdown_rx: base::shutdown::Receiver,
    dir_id: i32,
 ) -> Result<(SyncerChannel<::std::fs::File>, thread::JoinHandle<()>), Error>
 where
    C: Clocks + Clone,
 {
    let db2 = db.clone();
-    let (mut syncer, path) = Syncer::new(&db.lock(), db2, dir_id)?;
+    let (mut syncer, path) = Syncer::new(&db.lock(), shutdown_rx, db2, dir_id)?;
    syncer.initial_rotation()?;
    let (snd, rcv) = mpsc::channel();
    db.lock().on_flush(Box::new({
@ -199,7 +202,8 @@ pub fn lower_retention(
    limits: &[NewLimit],
 ) -> Result<(), Error> {
    let db2 = db.clone();
-    let (mut syncer, _) = Syncer::new(&db.lock(), db2, dir_id)?;
+    let (_tx, rx) = base::shutdown::channel();
+    let (mut syncer, _) = Syncer::new(&db.lock(), rx, db2, dir_id)?;
    syncer.do_rotation(|db| {
        for l in limits {
            let (fs_bytes_before, extra);
@ -305,6 +309,7 @@ fn list_files_to_abandon(
 impl<C: Clocks + Clone> Syncer<C, Arc<dir::SampleFileDir>> {
    fn new(
        l: &db::LockedDatabase,
+        shutdown_rx: base::shutdown::Receiver,
        db: Arc<db::Database<C>>,
        dir_id: i32,
    ) -> Result<(Self, String), Error> {
@ -346,6 +351,7 @@ impl<C: Clocks + Clone> Syncer<C, Arc<dir::SampleFileDir>> {
        Ok((
            Syncer {
                dir_id,
+                shutdown_rx,
                dir,
                db,
                planned_flushes: std::collections::BinaryHeap::new(),
@ -438,8 +444,16 @@ impl<C: Clocks + Clone, D: DirWriter> Syncer<C, D> {

        // Have a command; handle it.
        match cmd {
-            SyncerCommand::AsyncSaveRecording(id, wall_dur, f) => self.save(id, wall_dur, f),
-            SyncerCommand::DatabaseFlushed => self.collect_garbage(),
+            SyncerCommand::AsyncSaveRecording(id, wall_dur, f) => {
+                if self.save(id, wall_dur, f).is_err() {
+                    return false;
+                }
+            }
+            SyncerCommand::DatabaseFlushed => {
+                if self.collect_garbage().is_err() {
+                    return false;
+                }
+            }
            SyncerCommand::Flush(flush) => {
                // The sender is waiting for the supplied writer to be dropped. If there's no
                // timeout, do so immediately; otherwise wait for that timeout then drop it.
@ -453,7 +467,7 @@ impl<C: Clocks + Clone, D: DirWriter> Syncer<C, D> {
    }

    /// Collects garbage (without forcing a sync). Called from worker thread.
-    fn collect_garbage(&mut self) {
+    fn collect_garbage(&mut self) -> Result<(), ShutdownError> {
        trace!("Collecting garbage");
        let mut garbage: Vec<_> = {
            let l = self.db.lock();
@ -461,11 +475,11 @@ impl<C: Clocks + Clone, D: DirWriter> Syncer<C, D> {
            d.garbage_needs_unlink.iter().copied().collect()
        };
        if garbage.is_empty() {
-            return;
+            return Ok(());
        }
        let c = &self.db.clocks();
        for &id in &garbage {
-            clock::retry_forever(c, &mut || {
+            clock::retry(c, &self.shutdown_rx, &mut || {
                if let Err(e) = self.dir.unlink_file(id) {
                    if e == nix::Error::ENOENT {
                        warn!("dir: recording {} already deleted!", id);
@ -474,25 +488,33 @@ impl<C: Clocks + Clone, D: DirWriter> Syncer<C, D> {
                    return Err(e);
                }
                Ok(())
-            });
+            })?;
        }
-        clock::retry_forever(c, &mut || self.dir.sync());
-        clock::retry_forever(c, &mut || {
+        clock::retry(c, &self.shutdown_rx, &mut || self.dir.sync())?;
+        clock::retry(c, &self.shutdown_rx, &mut || {
            self.db.lock().delete_garbage(self.dir_id, &mut garbage)
-        });
+        })?;
+        Ok(())
    }

    /// Saves the given recording and prompts rotation. Called from worker thread.
    /// Note that this doesn't flush immediately; SQLite transactions are batched to lower SSD
    /// wear. On the next flush, the old recordings will actually be marked as garbage in the
    /// database, and shortly afterward actually deleted from disk.
-    fn save(&mut self, id: CompositeId, wall_duration: recording::Duration, f: D::File) {
+    fn save(
+        &mut self,
+        id: CompositeId,
+        wall_duration: recording::Duration,
+        f: D::File,
+    ) -> Result<(), ShutdownError> {
        trace!("Processing save for {}", id);
        let stream_id = id.stream();

        // Free up a like number of bytes.
-        clock::retry_forever(&self.db.clocks(), &mut || f.sync_all());
-        clock::retry_forever(&self.db.clocks(), &mut || self.dir.sync());
+        clock::retry(&self.db.clocks(), &self.shutdown_rx, &mut || f.sync_all())?;
+        clock::retry(&self.db.clocks(), &self.shutdown_rx, &mut || {
+            self.dir.sync()
+        })?;
        let mut db = self.db.lock();
        db.mark_synced(id).unwrap();
        delete_recordings(&mut db, stream_id, 0).unwrap();
@ -519,6 +541,7 @@ impl<C: Clocks + Clone, D: DirWriter> Syncer<C, D> {
            recording: id,
            senders: Vec::new(),
        });
+        Ok(())
    }

    /// Flushes the database if necessary to honor `flush_if_sec` for some recording.
@ -613,8 +636,8 @@ struct InnerWriter<F: FileWriter> {

    hasher: blake3::Hasher,

-    /// The start time of this segment, based solely on examining the local clock after frames in
-    /// this segment were received. Frames can suffer from various kinds of delay (initial
+    /// The start time of this recording, based solely on examining the local clock after frames in
+    /// this recording were received. Frames can suffer from various kinds of delay (initial
    /// buffering, encoding, and network transmission), so this time is set to far in the future on
    /// construction, given a real value on the first packet, and decreased as less-delayed packets
    /// are discovered. See design/time.md for details.
@ -626,7 +649,8 @@ struct InnerWriter<F: FileWriter> {
    /// the writer is closed cleanly (the caller supplies the next pts), or when the writer is
    /// closed uncleanly (with a zero duration, which the `.mp4` format allows only at the end).
    ///
-    /// Invariant: this should always be `Some` (briefly violated during `write` call only).
+    /// `unindexed_sample` should always be `Some`, except when a `write` call has aborted on
+    /// shutdown. In that case, the close will be unable to write the full segment.
    unindexed_sample: Option<UnindexedSample>,
 }

@ -671,7 +695,7 @@ impl<'a, C: Clocks + Clone, D: DirWriter> Writer<'a, C, D> {
    /// On successful return, `self.state` will be `WriterState::Open(w)` with `w` violating the
    /// invariant that `unindexed_sample` is `Some`. The caller (`write`) is responsible for
    /// correcting this.
-    fn open(&mut self) -> Result<(), Error> {
+    fn open(&mut self, shutdown_rx: &mut base::shutdown::Receiver) -> Result<(), Error> {
        let prev = match self.state {
            WriterState::Unopened => None,
            WriterState::Open(_) => return Ok(()),
@ -689,7 +713,9 @@ impl<'a, C: Clocks + Clone, D: DirWriter> Writer<'a, C, D> {
                ..Default::default()
            },
        )?;
-        let f = clock::retry_forever(&self.db.clocks(), &mut || self.dir.create_file(id));
+        let f = clock::retry(&self.db.clocks(), shutdown_rx, &mut || {
+            self.dir.create_file(id)
+        })?;

        self.state = WriterState::Open(InnerWriter {
            f,
@ -711,16 +737,17 @@ impl<'a, C: Clocks + Clone, D: DirWriter> Writer<'a, C, D> {
        })
    }

-    /// Writes a new frame to this segment.
+    /// Writes a new frame to this recording.
    /// `local_time` should be the local clock's time as of when this packet was received.
    pub fn write(
        &mut self,
+        shutdown_rx: &mut base::shutdown::Receiver,
        pkt: &[u8],
        local_time: recording::Time,
        pts_90k: i64,
        is_key: bool,
    ) -> Result<(), Error> {
-        self.open()?;
+        self.open(shutdown_rx)?;
        let w = match self.state {
            WriterState::Open(ref mut w) => w,
            _ => unreachable!(),
@ -764,7 +791,18 @@ impl<'a, C: Clocks + Clone, D: DirWriter> Writer<'a, C, D> {
        }
        let mut remaining = pkt;
        while !remaining.is_empty() {
-            let written = clock::retry_forever(&self.db.clocks(), &mut || w.f.write(remaining));
+            let written =
+                match clock::retry(&self.db.clocks(), shutdown_rx, &mut || w.f.write(remaining)) {
+                    Ok(w) => w,
+                    Err(e) => {
+                        // close() will do nothing because unindexed_sample will be None.
+                        log::warn!(
+                            "Abandoning incompletely written recording {} on shutdown",
+                            w.id
+                        );
+                        return Err(e.into());
+                    }
+                };
            remaining = &remaining[written..];
        }
        w.unindexed_sample = Some(UnindexedSample {
@ -857,10 +895,12 @@ impl<F: FileWriter> InnerWriter<F> {
        stream_id: i32,
        reason: Option<String>,
    ) -> Result<PreviousWriter, Error> {
-        let unindexed = self
-            .unindexed_sample
-            .take()
-            .expect("should always be an unindexed sample");
+        let unindexed = self.unindexed_sample.take().ok_or_else(|| {
+            format_err!(
+                "Unable to add recording {} to database due to aborted write",
+                self.id
+            )
+        })?;
        let (last_sample_duration, flags) = match next_pts {
            None => (0, db::RecordingFlags::TrailingZero as i32),
            Some(p) => (i32::try_from(p - unindexed.pts_90k)?, 0),
@ -1059,8 +1099,10 @@ mod tests {
        _tmpdir: ::tempfile::TempDir,
        dir: MockDir,
        channel: super::SyncerChannel<MockFile>,
+        _shutdown_tx: base::shutdown::Sender,
+        shutdown_rx: base::shutdown::Receiver,
        syncer: super::Syncer<SimulatedClocks, MockDir>,
-        syncer_rcv: mpsc::Receiver<super::SyncerCommand<MockFile>>,
+        syncer_rx: mpsc::Receiver<super::SyncerCommand<MockFile>>,
    }

    fn new_harness(flush_if_sec: u32) -> Harness {
@ -1081,6 +1123,7 @@ mod tests {

        // Start a mock syncer.
        let dir = MockDir::new();
+        let (shutdown_tx, shutdown_rx) = base::shutdown::channel();
        let syncer = super::Syncer {
            dir_id: *tdb
                .db
@ -1092,10 +1135,11 @@ mod tests {
            dir: dir.clone(),
            db: tdb.db.clone(),
            planned_flushes: std::collections::BinaryHeap::new(),
+            shutdown_rx: shutdown_rx.clone(),
        };
-        let (syncer_snd, syncer_rcv) = mpsc::channel();
+        let (syncer_tx, syncer_rx) = mpsc::channel();
        tdb.db.lock().on_flush(Box::new({
-            let snd = syncer_snd.clone();
+            let snd = syncer_tx.clone();
            move || {
                if let Err(e) = snd.send(super::SyncerCommand::DatabaseFlushed) {
                    warn!("Unable to notify syncer for dir {} of flush: {}", dir_id, e);
@ -1107,9 +1151,11 @@ mod tests {
            dir,
            db: tdb.db,
            _tmpdir: tdb.tmpdir,
-            channel: super::SyncerChannel(syncer_snd),
+            channel: super::SyncerChannel(syncer_tx),
+            _shutdown_tx: shutdown_tx,
+            shutdown_rx,
            syncer,
-            syncer_rcv,
+            syncer_rx,
        }
    }

@ -1153,19 +1199,26 @@ mod tests {
        ));
        f.expect(MockFileAction::Write(Box::new(|_| Ok(1))));
        f.expect(MockFileAction::SyncAll(Box::new(|| Ok(()))));
-        w.write(b"1", recording::Time(1), 0, true).unwrap();
+        w.write(&mut h.shutdown_rx, b"1", recording::Time(1), 0, true)
+            .unwrap();

        let e = w
-            .write(b"2", recording::Time(2), i32::max_value() as i64 + 1, true)
+            .write(
+                &mut h.shutdown_rx,
+                b"2",
+                recording::Time(2),
+                i32::max_value() as i64 + 1,
+                true,
+            )
            .unwrap_err();
        assert!(e.to_string().contains("excessive pts jump"));
        h.dir.expect(MockDirAction::Sync(Box::new(|| Ok(()))));
        drop(w);
-        assert!(h.syncer.iter(&h.syncer_rcv)); // AsyncSave
+        assert!(h.syncer.iter(&h.syncer_rx)); // AsyncSave
        assert_eq!(h.syncer.planned_flushes.len(), 1);
-        assert!(h.syncer.iter(&h.syncer_rcv)); // planned flush
+        assert!(h.syncer.iter(&h.syncer_rx)); // planned flush
        assert_eq!(h.syncer.planned_flushes.len(), 0);
-        assert!(h.syncer.iter(&h.syncer_rcv)); // DatabaseFlushed
+        assert!(h.syncer.iter(&h.syncer_rx)); // DatabaseFlushed
        f.ensure_done();
        h.dir.ensure_done();
    }
@ -1215,14 +1268,15 @@ mod tests {
            Ok(3)
        })));
        f.expect(MockFileAction::SyncAll(Box::new(|| Ok(()))));
-        w.write(b"123", recording::Time(2), 0, true).unwrap();
+        w.write(&mut h.shutdown_rx, b"123", recording::Time(2), 0, true)
+            .unwrap();
        h.dir.expect(MockDirAction::Sync(Box::new(|| Ok(()))));
        w.close(Some(1), None).unwrap();
-        assert!(h.syncer.iter(&h.syncer_rcv)); // AsyncSave
+        assert!(h.syncer.iter(&h.syncer_rx)); // AsyncSave
        assert_eq!(h.syncer.planned_flushes.len(), 1);
-        assert!(h.syncer.iter(&h.syncer_rcv)); // planned flush
+        assert!(h.syncer.iter(&h.syncer_rx)); // planned flush
        assert_eq!(h.syncer.planned_flushes.len(), 0);
-        assert!(h.syncer.iter(&h.syncer_rcv)); // DatabaseFlushed
+        assert!(h.syncer.iter(&h.syncer_rx)); // DatabaseFlushed
        f.ensure_done();
        h.dir.ensure_done();

@ -1240,7 +1294,8 @@ mod tests {
            Ok(1)
        })));
        f.expect(MockFileAction::SyncAll(Box::new(|| Ok(()))));
-        w.write(b"4", recording::Time(3), 1, true).unwrap();
+        w.write(&mut h.shutdown_rx, b"4", recording::Time(3), 1, true)
+            .unwrap();
        h.dir.expect(MockDirAction::Sync(Box::new(|| Ok(()))));
        h.dir.expect(MockDirAction::Unlink(
            CompositeId::new(1, 0),
@ -1261,15 +1316,15 @@ mod tests {
        drop(w);

        trace!("expecting AsyncSave");
-        assert!(h.syncer.iter(&h.syncer_rcv)); // AsyncSave
+        assert!(h.syncer.iter(&h.syncer_rx)); // AsyncSave
        assert_eq!(h.syncer.planned_flushes.len(), 1);
        trace!("expecting planned flush");
-        assert!(h.syncer.iter(&h.syncer_rcv)); // planned flush
+        assert!(h.syncer.iter(&h.syncer_rx)); // planned flush
        assert_eq!(h.syncer.planned_flushes.len(), 0);
        trace!("expecting DatabaseFlushed");
-        assert!(h.syncer.iter(&h.syncer_rcv)); // DatabaseFlushed
+        assert!(h.syncer.iter(&h.syncer_rx)); // DatabaseFlushed
        trace!("expecting DatabaseFlushed again");
-        assert!(h.syncer.iter(&h.syncer_rcv)); // DatabaseFlushed again
+        assert!(h.syncer.iter(&h.syncer_rx)); // DatabaseFlushed again
        f.ensure_done();
        h.dir.ensure_done();

@ -1286,13 +1341,13 @@ mod tests {
        }

        assert_eq!(h.syncer.planned_flushes.len(), 0);
-        assert!(h.syncer.iter(&h.syncer_rcv)); // DatabaseFlushed
+        assert!(h.syncer.iter(&h.syncer_rx)); // DatabaseFlushed

        // The syncer should shut down cleanly.
        drop(h.channel);
        h.db.lock().clear_on_flush();
        assert_eq!(
-            h.syncer_rcv.try_recv().err(),
+            h.syncer_rx.try_recv().err(),
            Some(std::sync::mpsc::TryRecvError::Disconnected)
        );
        assert!(h.syncer.planned_flushes.is_empty());
@ -1350,16 +1405,17 @@ mod tests {
        })));
        f.expect(MockFileAction::SyncAll(Box::new(|| Err(eio()))));
        f.expect(MockFileAction::SyncAll(Box::new(|| Ok(()))));
-        w.write(b"1234", recording::Time(1), 0, true).unwrap();
+        w.write(&mut h.shutdown_rx, b"1234", recording::Time(1), 0, true)
+            .unwrap();
        h.dir
            .expect(MockDirAction::Sync(Box::new(|| Err(nix::Error::EIO))));
        h.dir.expect(MockDirAction::Sync(Box::new(|| Ok(()))));
        drop(w);
-        assert!(h.syncer.iter(&h.syncer_rcv)); // AsyncSave
+        assert!(h.syncer.iter(&h.syncer_rx)); // AsyncSave
        assert_eq!(h.syncer.planned_flushes.len(), 1);
-        assert!(h.syncer.iter(&h.syncer_rcv)); // planned flush
+        assert!(h.syncer.iter(&h.syncer_rx)); // planned flush
        assert_eq!(h.syncer.planned_flushes.len(), 0);
-        assert!(h.syncer.iter(&h.syncer_rcv)); // DatabaseFlushed
+        assert!(h.syncer.iter(&h.syncer_rx)); // DatabaseFlushed
        f.ensure_done();
        h.dir.ensure_done();

@ -1374,7 +1430,7 @@ mod tests {
        drop(h.channel);
        h.db.lock().clear_on_flush();
        assert_eq!(
-            h.syncer_rcv.try_recv().err(),
+            h.syncer_rx.try_recv().err(),
            Some(std::sync::mpsc::TryRecvError::Disconnected)
        );
        assert!(h.syncer.planned_flushes.is_empty());
@ -1424,15 +1480,16 @@ mod tests {
            Ok(3)
        })));
        f.expect(MockFileAction::SyncAll(Box::new(|| Ok(()))));
-        w.write(b"123", recording::Time(2), 0, true).unwrap();
+        w.write(&mut h.shutdown_rx, b"123", recording::Time(2), 0, true)
+            .unwrap();
        h.dir.expect(MockDirAction::Sync(Box::new(|| Ok(()))));
        w.close(Some(1), None).unwrap();

-        assert!(h.syncer.iter(&h.syncer_rcv)); // AsyncSave
+        assert!(h.syncer.iter(&h.syncer_rx)); // AsyncSave
        assert_eq!(h.syncer.planned_flushes.len(), 1);
-        assert!(h.syncer.iter(&h.syncer_rcv)); // planned flush
+        assert!(h.syncer.iter(&h.syncer_rx)); // planned flush
        assert_eq!(h.syncer.planned_flushes.len(), 0);
-        assert!(h.syncer.iter(&h.syncer_rcv)); // DatabaseFlushed
+        assert!(h.syncer.iter(&h.syncer_rx)); // DatabaseFlushed
        f.ensure_done();
        h.dir.ensure_done();

@ -1450,7 +1507,8 @@ mod tests {
            Ok(1)
        })));
        f.expect(MockFileAction::SyncAll(Box::new(|| Ok(()))));
-        w.write(b"4", recording::Time(3), 1, true).unwrap();
+        w.write(&mut h.shutdown_rx, b"4", recording::Time(3), 1, true)
+            .unwrap();
        h.dir.expect(MockDirAction::Sync(Box::new(|| Ok(()))));
        h.dir.expect(MockDirAction::Unlink(
            CompositeId::new(1, 0),
@ -1482,11 +1540,11 @@ mod tests {

        drop(w);

-        assert!(h.syncer.iter(&h.syncer_rcv)); // AsyncSave
+        assert!(h.syncer.iter(&h.syncer_rx)); // AsyncSave
        assert_eq!(h.syncer.planned_flushes.len(), 1);
-        assert!(h.syncer.iter(&h.syncer_rcv)); // planned flush
+        assert!(h.syncer.iter(&h.syncer_rx)); // planned flush
        assert_eq!(h.syncer.planned_flushes.len(), 0);
-        assert!(h.syncer.iter(&h.syncer_rcv)); // DatabaseFlushed
+        assert!(h.syncer.iter(&h.syncer_rx)); // DatabaseFlushed
        f.ensure_done();
        h.dir.ensure_done();

@ -1502,13 +1560,13 @@ mod tests {
            assert!(dir.garbage_unlinked.is_empty());
        }

-        assert!(h.syncer.iter(&h.syncer_rcv)); // DatabaseFlushed
+        assert!(h.syncer.iter(&h.syncer_rx)); // DatabaseFlushed

        // The syncer should shut down cleanly.
        drop(h.channel);
        h.db.lock().clear_on_flush();
        assert_eq!(
-            h.syncer_rcv.try_recv().err(),
+            h.syncer_rx.try_recv().err(),
            Some(std::sync::mpsc::TryRecvError::Disconnected)
        );
        assert!(h.syncer.planned_flushes.is_empty());
@ -1555,6 +1613,7 @@ mod tests {
        })));
        f1.expect(MockFileAction::SyncAll(Box::new(|| Ok(()))));
        w.write(
+            &mut h.shutdown_rx,
            b"123",
            recording::Time(recording::TIME_UNITS_PER_SEC),
            0,
@ -1564,12 +1623,12 @@ mod tests {
        h.dir.expect(MockDirAction::Sync(Box::new(|| Ok(()))));
        drop(w);

-        assert!(h.syncer.iter(&h.syncer_rcv)); // AsyncSave
+        assert!(h.syncer.iter(&h.syncer_rx)); // AsyncSave
        assert_eq!(h.syncer.planned_flushes.len(), 1);

        // Flush and let 30 seconds go by.
        h.db.lock().flush("forced").unwrap();
-        assert!(h.syncer.iter(&h.syncer_rcv)); // DatabaseFlushed
+        assert!(h.syncer.iter(&h.syncer_rx)); // DatabaseFlushed
        assert_eq!(h.syncer.planned_flushes.len(), 1);
        h.db.clocks().sleep(time::Duration::seconds(30));

@ -1595,6 +1654,7 @@ mod tests {
        })));
        f2.expect(MockFileAction::SyncAll(Box::new(|| Ok(()))));
        w.write(
+            &mut h.shutdown_rx,
            b"4",
            recording::Time(31 * recording::TIME_UNITS_PER_SEC),
            1,
@ -1605,21 +1665,21 @@ mod tests {

        drop(w);

-        assert!(h.syncer.iter(&h.syncer_rcv)); // AsyncSave
+        assert!(h.syncer.iter(&h.syncer_rx)); // AsyncSave
        assert_eq!(h.syncer.planned_flushes.len(), 2);

        assert_eq!(h.syncer.planned_flushes.len(), 2);
        let db_flush_count_before = h.db.lock().flushes();
        assert_eq!(h.db.clocks().monotonic(), time::Timespec::new(31, 0));
-        assert!(h.syncer.iter(&h.syncer_rcv)); // planned flush (no-op)
+        assert!(h.syncer.iter(&h.syncer_rx)); // planned flush (no-op)
        assert_eq!(h.db.clocks().monotonic(), time::Timespec::new(61, 0));
        assert_eq!(h.db.lock().flushes(), db_flush_count_before);
        assert_eq!(h.syncer.planned_flushes.len(), 1);
-        assert!(h.syncer.iter(&h.syncer_rcv)); // planned flush
+        assert!(h.syncer.iter(&h.syncer_rx)); // planned flush
        assert_eq!(h.db.clocks().monotonic(), time::Timespec::new(91, 0));
        assert_eq!(h.db.lock().flushes(), db_flush_count_before + 1);
        assert_eq!(h.syncer.planned_flushes.len(), 0);
-        assert!(h.syncer.iter(&h.syncer_rcv)); // DatabaseFlushed
+        assert!(h.syncer.iter(&h.syncer_rx)); // DatabaseFlushed

        f1.ensure_done();
        f2.ensure_done();
@ -1629,7 +1689,7 @@ mod tests {
        drop(h.channel);
        h.db.lock().clear_on_flush();
        assert_eq!(
-            h.syncer_rcv.try_recv().err(),
+            h.syncer_rx.try_recv().err(),
            Some(std::sync::mpsc::TryRecvError::Disconnected)
        );
        assert!(h.syncer.planned_flushes.is_empty());
--- a/server/src/cmds/check.rs
+++ b/server/src/cmds/check.rs
@ -46,7 +46,7 @@ pub struct Args {
    trash_corrupt_rows: bool,
 }

-pub fn run(args: &Args) -> Result<i32, Error> {
+pub fn run(args: Args) -> Result<i32, Error> {
    let (_db_dir, mut conn) = super::open_conn(&args.db_dir, super::OpenMode::ReadWrite)?;
    check::run(
        &mut conn,
--- a/server/src/cmds/config/cameras.rs
+++ b/server/src/cmds/config/cameras.rs
@ -197,6 +197,7 @@ fn press_test_inner(url: Url, username: String, password: String) -> Result<Stri
            username: if pass_creds { Some(username) } else { None },
            password: if pass_creds { Some(password) } else { None },
            transport: retina::client::Transport::Tcp,
+            session_group: Default::default(),
        },
    )?;
    Ok(format!(
--- a/server/src/cmds/config/mod.rs
+++ b/server/src/cmds/config/mod.rs
@ -31,7 +31,7 @@ pub struct Args {
    db_dir: PathBuf,
 }

-pub fn run(args: &Args) -> Result<i32, Error> {
+pub fn run(args: Args) -> Result<i32, Error> {
    let (_db_dir, conn) = super::open_conn(&args.db_dir, super::OpenMode::ReadWrite)?;
    let clocks = clock::RealClocks {};
    let db = Arc::new(db::Database::new(clocks, conn, true)?);
--- a/server/src/cmds/init.rs
+++ b/server/src/cmds/init.rs
@ -19,7 +19,7 @@ pub struct Args {
    db_dir: PathBuf,
 }

-pub fn run(args: &Args) -> Result<i32, Error> {
+pub fn run(args: Args) -> Result<i32, Error> {
    let (_db_dir, mut conn) = super::open_conn(&args.db_dir, super::OpenMode::Create)?;

    // Check if the database has already been initialized.
--- a/server/src/cmds/login.rs
+++ b/server/src/cmds/login.rs
@ -53,7 +53,7 @@ pub struct Args {
    username: String,
 }

-pub fn run(args: &Args) -> Result<i32, Error> {
+pub fn run(args: Args) -> Result<i32, Error> {
    let clocks = clock::RealClocks {};
    let (_db_dir, conn) = super::open_conn(&args.db_dir, super::OpenMode::ReadWrite)?;
    let db = std::sync::Arc::new(db::Database::new(clocks, conn, true).unwrap());
--- a/server/src/cmds/mod.rs
+++ b/server/src/cmds/mod.rs
@ -28,7 +28,9 @@ enum OpenMode {
 /// The returned `dir::Fd` holds the lock and should be kept open as long as the `Connection` is.
 fn open_dir(db_dir: &Path, mode: OpenMode) -> Result<dir::Fd, Error> {
    let dir = dir::Fd::open(db_dir, mode == OpenMode::Create).map_err(|e| {
-        e.context(if e == nix::Error::ENOENT {
+        e.context(if mode == OpenMode::Create {
+            format!("unable to create db dir {}", db_dir.display())
+        } else if e == nix::Error::ENOENT {
            format!(
                "db dir {} not found; try running moonfire-nvr init",
                db_dir.display()
@ -79,3 +81,43 @@ fn open_conn(db_dir: &Path, mode: OpenMode) -> Result<(dir::Fd, rusqlite::Connec
    )?;
    Ok((dir, conn))
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn open_dir_error_msg() {
+        let tmpdir = tempfile::Builder::new()
+            .prefix("moonfire-nvr-test")
+            .tempdir()
+            .unwrap();
+        let mut nonexistent_dir = tmpdir.path().to_path_buf();
+        nonexistent_dir.push("nonexistent");
+        let nonexistent_open = open_dir(&nonexistent_dir, OpenMode::ReadOnly).unwrap_err();
+        assert!(
+            nonexistent_open
+                .to_string()
+                .contains("try running moonfire-nvr init"),
+            "unexpected error {}",
+            &nonexistent_open
+        );
+    }
+
+    #[test]
+    fn create_dir_error_msg() {
+        let tmpdir = tempfile::Builder::new()
+            .prefix("moonfire-nvr-test")
+            .tempdir()
+            .unwrap();
+        let mut nonexistent_dir = tmpdir.path().to_path_buf();
+        nonexistent_dir.push("nonexistent");
+        nonexistent_dir.push("db");
+        let nonexistent_create = open_dir(&nonexistent_dir, OpenMode::Create).unwrap_err();
+        assert!(
+            nonexistent_create.to_string().contains("unable to create"),
+            "unexpected error {}",
+            &nonexistent_create
+        );
+    }
+}
--- a/server/src/cmds/run.rs
+++ b/server/src/cmds/run.rs
@ -8,11 +8,10 @@ use base::clock;
 use db::{dir, writer};
 use failure::{bail, Error, ResultExt};
 use fnv::FnvHashMap;
-use futures::future::FutureExt;
 use hyper::service::{make_service_fn, service_fn};
+use log::error;
 use log::{info, warn};
 use std::path::PathBuf;
-use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::Arc;
 use std::thread;
 use structopt::StructOpt;
@ -150,9 +149,9 @@ fn resolve_zone() -> Result<String, Error> {
        }
    };

-    // If `TIMEZONE_PATH` is a file, use its contents as the zone name.
+    // If `TIMEZONE_PATH` is a file, use its contents as the zone name, trimming whitespace.
    match ::std::fs::read_to_string(TIMEZONE_PATH) {
-        Ok(z) => Ok(z),
+        Ok(z) => Ok(z.trim().to_owned()),
        Err(e) => {
            bail!(
                "Unable to resolve timezone from TZ env, {}, or {}. Last error: {}",
@ -170,16 +169,55 @@ struct Syncer {
    join: thread::JoinHandle<()>,
 }

-pub fn run(args: &Args) -> Result<i32, Error> {
+pub fn run(args: Args) -> Result<i32, Error> {
    let mut builder = tokio::runtime::Builder::new_multi_thread();
    builder.enable_all();
    if let Some(worker_threads) = args.worker_threads {
        builder.worker_threads(worker_threads);
    }
-    builder.build().unwrap().block_on(async_run(args))
+    let rt = builder.build()?;
+    let r = rt.block_on(async_run(args));
+
+    // tokio normally waits for all spawned tasks to complete, but:
+    // * in the graceful shutdown path, we wait for specific tasks with logging.
+    // * in the immediate shutdown path, we don't want to wait.
+    rt.shutdown_background();
+
+    r
 }

-async fn async_run(args: &Args) -> Result<i32, Error> {
+async fn async_run(args: Args) -> Result<i32, Error> {
+    let (shutdown_tx, shutdown_rx) = base::shutdown::channel();
+    let mut shutdown_tx = Some(shutdown_tx);
+
+    tokio::pin! {
+        let int = signal(SignalKind::interrupt())?;
+        let term = signal(SignalKind::terminate())?;
+        let inner = inner(args, shutdown_rx);
+    }
+
+    tokio::select! {
+        _ = int.recv() => {
+            info!("Received SIGINT; shutting down gracefully. \
+                   Send another SIGINT or SIGTERM to shut down immediately.");
+            shutdown_tx.take();
+        },
+        _ = term.recv() => {
+            info!("Received SIGTERM; shutting down gracefully. \
+                   Send another SIGINT or SIGTERM to shut down immediately.");
+            shutdown_tx.take();
+        },
+        result = &mut inner => return result,
+    }
+
+    tokio::select! {
+        _ = int.recv() => bail!("immediate shutdown due to second signal (SIGINT)"),
+        _ = term.recv() => bail!("immediate shutdown due to second singal (SIGTERM)"),
+        result = &mut inner => result,
+    }
+}
+
+async fn inner(args: Args, shutdown_rx: base::shutdown::Receiver) -> Result<i32, Error> {
    let clocks = clock::RealClocks {};
    let (_db_dir, conn) = super::open_conn(
        &args.db_dir,
@ -214,8 +252,9 @@ async fn async_run(args: &Args) -> Result<i32, Error> {
    })?);

    // Start a streamer for each stream.
-    let shutdown_streamers = Arc::new(AtomicBool::new(false));
    let mut streamers = Vec::new();
+    let mut session_groups_by_camera: FnvHashMap<i32, Arc<retina::client::SessionGroup>> =
+        FnvHashMap::default();
    let syncers = if !args.read_only {
        let l = db.lock();
        let mut dirs = FnvHashMap::with_capacity_and_hasher(
@ -227,7 +266,7 @@ async fn async_run(args: &Args) -> Result<i32, Error> {
            db: &db,
            opener: args.rtsp_library.opener(),
            transport: args.rtsp_transport,
-            shutdown: &shutdown_streamers,
+            shutdown_rx: &shutdown_rx,
        };

        // Get the directories that need syncers.
@ -253,7 +292,7 @@ async fn async_run(args: &Args) -> Result<i32, Error> {
        drop(l);
        let mut syncers = FnvHashMap::with_capacity_and_hasher(dirs.len(), Default::default());
        for (id, dir) in dirs.drain() {
-            let (channel, join) = writer::start_syncer(db.clone(), id)?;
+            let (channel, join) = writer::start_syncer(db.clone(), shutdown_rx.clone(), id)?;
            syncers.insert(id, Syncer { dir, channel, join });
        }

@ -279,6 +318,10 @@ async fn async_run(args: &Args) -> Result<i32, Error> {
            };
            let rotate_offset_sec = streamer::ROTATE_INTERVAL_SEC * i as i64 / streams as i64;
            let syncer = syncers.get(&sample_file_dir_id).unwrap();
+            let session_group = session_groups_by_camera
+                .entry(camera.id)
+                .or_default()
+                .clone();
            let mut streamer = streamer::Streamer::new(
                &env,
                syncer.dir.clone(),
@ -286,6 +329,7 @@ async fn async_run(args: &Args) -> Result<i32, Error> {
                *id,
                camera,
                stream,
+                session_group,
                rotate_offset_sec,
                streamer::ROTATE_INTERVAL_SEC,
            )?;
@ -319,39 +363,44 @@ async fn async_run(args: &Args) -> Result<i32, Error> {
        .with_context(|_| format!("unable to bind --http-addr={}", &args.http_addr))?
        .tcp_nodelay(true)
        .serve(make_svc);
-
-    let mut int = signal(SignalKind::interrupt())?;
-    let mut term = signal(SignalKind::terminate())?;
-    let shutdown = futures::future::select(Box::pin(int.recv()), Box::pin(term.recv()));
-
-    let (shutdown_tx, shutdown_rx) = futures::channel::oneshot::channel();
-    let server = server.with_graceful_shutdown(shutdown_rx.map(|_| ()));
+    let server = server.with_graceful_shutdown(shutdown_rx.future());
    let server_handle = tokio::spawn(server);

    info!("Ready to serve HTTP requests");
-    shutdown.await;
-    shutdown_tx.send(()).unwrap();
+    let _ = shutdown_rx.as_future().await;

-    info!("Shutting down streamers.");
-    shutdown_streamers.store(true, Ordering::SeqCst);
-    for streamer in streamers.drain(..) {
-        streamer.join().unwrap();
-    }
-
-    if let Some(mut ss) = syncers {
-        // The syncers shut down when all channels to them have been dropped.
-        // The database maintains one; and `ss` holds one. Drop both.
-        db.lock().clear_on_flush();
-        for (_, s) in ss.drain() {
-            drop(s.channel);
-            s.join.join().unwrap();
+    info!("Shutting down streamers and syncers.");
+    tokio::task::spawn_blocking({
+        let db = db.clone();
+        move || {
+            for streamer in streamers.drain(..) {
+                streamer.join().unwrap();
+            }
+            if let Some(mut ss) = syncers {
+                // The syncers shut down when all channels to them have been dropped.
+                // The database maintains one; and `ss` holds one. Drop both.
+                db.lock().clear_on_flush();
+                for (_, s) in ss.drain() {
+                    drop(s.channel);
+                    s.join.join().unwrap();
+                }
+            }
        }
-    }
+    })
+    .await?;

    db.lock().clear_watches();

    info!("Waiting for HTTP requests to finish.");
    server_handle.await??;
+
+    info!("Waiting for TEARDOWN requests to complete.");
+    for g in session_groups_by_camera.values() {
+        if let Err(e) = g.await_teardown().await {
+            error!("{}", e);
+        }
+    }
+
    info!("Exiting.");
    Ok(0)
 }
--- a/server/src/cmds/sql.rs
+++ b/server/src/cmds/sql.rs
@ -37,7 +37,7 @@ pub struct Args {
    arg: Vec<OsString>,
 }

-pub fn run(args: &Args) -> Result<i32, Error> {
+pub fn run(args: Args) -> Result<i32, Error> {
    let mode = if args.read_only {
        OpenMode::ReadOnly
    } else {
--- a/server/src/cmds/ts.rs
+++ b/server/src/cmds/ts.rs
@ -17,7 +17,7 @@ pub struct Args {
    timestamps: Vec<String>,
 }

-pub fn run(args: &Args) -> Result<i32, Error> {
+pub fn run(args: Args) -> Result<i32, Error> {
    for timestamp in &args.timestamps {
        let t = db::recording::Time::parse(timestamp)?;
        println!("{} == {}", t, t.0);
--- a/server/src/cmds/upgrade/mod.rs
+++ b/server/src/cmds/upgrade/mod.rs
@ -40,7 +40,7 @@ pub struct Args {
    no_vacuum: bool,
 }

-pub fn run(args: &Args) -> Result<i32, Error> {
+pub fn run(args: Args) -> Result<i32, Error> {
    let (_db_dir, mut conn) = super::open_conn(&args.db_dir, super::OpenMode::ReadWrite)?;

    db::upgrade::run(
--- a/server/src/json.rs
+++ b/server/src/json.rs
@ -477,6 +477,9 @@ pub struct Recording {

    #[serde(skip_serializing_if = "Not::not")]
    pub growing: bool,
+
+    #[serde(skip_serializing_if = "Not::not")]
+    pub has_trailing_zero: bool,
 }

 #[derive(Debug, Serialize)]
--- a/server/src/main.rs
+++ b/server/src/main.rs
@ -59,16 +59,16 @@ enum Args {
 }

 impl Args {
-    fn run(&self) -> Result<i32, failure::Error> {
+    fn run(self) -> Result<i32, failure::Error> {
        match self {
-            Args::Check(ref a) => cmds::check::run(a),
-            Args::Config(ref a) => cmds::config::run(a),
-            Args::Init(ref a) => cmds::init::run(a),
-            Args::Login(ref a) => cmds::login::run(a),
-            Args::Run(ref a) => cmds::run::run(a),
-            Args::Sql(ref a) => cmds::sql::run(a),
-            Args::Ts(ref a) => cmds::ts::run(a),
-            Args::Upgrade(ref a) => cmds::upgrade::run(a),
+            Args::Check(a) => cmds::check::run(a),
+            Args::Config(a) => cmds::config::run(a),
+            Args::Init(a) => cmds::init::run(a),
+            Args::Login(a) => cmds::login::run(a),
+            Args::Run(a) => cmds::run::run(a),
+            Args::Sql(a) => cmds::sql::run(a),
+            Args::Ts(a) => cmds::ts::run(a),
+            Args::Upgrade(a) => cmds::upgrade::run(a),
        }
    }
 }
--- a/server/src/mp4.rs
+++ b/server/src/mp4.rs
@ -2277,7 +2277,7 @@ mod tests {
        }
    }

-    fn copy_mp4_to_db(db: &TestDb<RealClocks>) {
+    fn copy_mp4_to_db(db: &mut TestDb<RealClocks>) {
        let (extra_data, mut input) = stream::FFMPEG
            .open(
                "test".to_owned(),
@ -2322,7 +2322,13 @@ mod tests {
            };
            frame_time += recording::Duration(i64::from(pkt.duration));
            output
-                .write(pkt.data, frame_time, pkt.pts, pkt.is_key)
+                .write(
+                    &mut db.shutdown_rx,
+                    pkt.data,
+                    frame_time,
+                    pkt.pts,
+                    pkt.is_key,
+                )
                .unwrap();
            end_pts = Some(pkt.pts + i64::from(pkt.duration));
        }
@ -2811,8 +2817,8 @@ mod tests {
    #[tokio::test]
    async fn test_round_trip() {
        testutil::init();
-        let db = TestDb::new(RealClocks {});
-        copy_mp4_to_db(&db);
+        let mut db = TestDb::new(RealClocks {});
+        copy_mp4_to_db(&mut db);
        let mp4 = create_mp4_from_db(&db, 0, 0, false);
        traverse(mp4.clone()).await;
        let new_filename = write_mp4(&mp4, db.tmpdir.path()).await;
@ -2840,8 +2846,8 @@ mod tests {
    #[tokio::test]
    async fn test_round_trip_with_subtitles() {
        testutil::init();
-        let db = TestDb::new(RealClocks {});
-        copy_mp4_to_db(&db);
+        let mut db = TestDb::new(RealClocks {});
+        copy_mp4_to_db(&mut db);
        let mp4 = create_mp4_from_db(&db, 0, 0, true);
        traverse(mp4.clone()).await;
        let new_filename = write_mp4(&mp4, db.tmpdir.path()).await;
@ -2869,8 +2875,8 @@ mod tests {
    #[tokio::test]
    async fn test_round_trip_with_edit_list() {
        testutil::init();
-        let db = TestDb::new(RealClocks {});
-        copy_mp4_to_db(&db);
+        let mut db = TestDb::new(RealClocks {});
+        copy_mp4_to_db(&mut db);
        let mp4 = create_mp4_from_db(&db, 1, 0, false);
        traverse(mp4.clone()).await;
        let new_filename = write_mp4(&mp4, db.tmpdir.path()).await;
@ -2898,8 +2904,8 @@ mod tests {
    #[tokio::test]
    async fn test_round_trip_with_edit_list_and_subtitles() {
        testutil::init();
-        let db = TestDb::new(RealClocks {});
-        copy_mp4_to_db(&db);
+        let mut db = TestDb::new(RealClocks {});
+        copy_mp4_to_db(&mut db);
        let off = 2 * TIME_UNITS_PER_SEC;
        let mp4 = create_mp4_from_db(&db, i32::try_from(off).unwrap(), 0, true);
        traverse(mp4.clone()).await;
@ -2928,8 +2934,8 @@ mod tests {
    #[tokio::test]
    async fn test_round_trip_with_shorten() {
        testutil::init();
-        let db = TestDb::new(RealClocks {});
-        copy_mp4_to_db(&db);
+        let mut db = TestDb::new(RealClocks {});
+        copy_mp4_to_db(&mut db);
        let mp4 = create_mp4_from_db(&db, 0, 1, false);
        traverse(mp4.clone()).await;
        let new_filename = write_mp4(&mp4, db.tmpdir.path()).await;
--- a/server/src/stream.rs
+++ b/server/src/stream.rs
@ -15,6 +15,7 @@ use std::convert::TryFrom;
 use std::ffi::CString;
 use std::pin::Pin;
 use std::result::Result;
+use std::sync::Arc;
 use url::Url;

 static START_FFMPEG: parking_lot::Once = parking_lot::Once::new();
@ -62,6 +63,7 @@ pub enum Source<'a> {
        username: Option<String>,
        password: Option<String>,
        transport: Transport,
+        session_group: Arc<retina::client::SessionGroup>,
    },
 }

@ -73,6 +75,7 @@ pub enum Source {
        username: Option<String>,
        password: Option<String>,
        transport: Transport,
+        session_group: Arc<retina::client::SessionGroup>,
    },
 }

@ -141,6 +144,7 @@ impl Opener for Ffmpeg {
                username,
                password,
                transport,
+                ..
            } => {
                let mut open_options = ffmpeg::avutil::Dictionary::new();
                open_options
@ -301,6 +305,7 @@ impl Opener for RetinaOpener {
                username,
                password,
                transport,
+                session_group,
            } => (
                url,
                retina::client::SessionOptions::default()
@ -313,6 +318,7 @@ impl Opener for RetinaOpener {
                        _ => bail!("must supply username when supplying password"),
                    })
                    .transport(transport)
+                    .session_group(session_group)
                    .user_agent(format!("Moonfire NVR {}", env!("CARGO_PKG_VERSION"))),
            ),
        };
--- a/server/src/streamer.rs
+++ b/server/src/streamer.rs
@ -8,7 +8,6 @@ use db::{dir, recording, writer, Camera, Database, Stream};
 use failure::{bail, format_err, Error};
 use log::{debug, info, trace, warn};
 use std::result::Result;
-use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::Arc;
 use url::Url;

@ -22,7 +21,7 @@ where
    pub opener: &'a dyn stream::Opener,
    pub transport: retina::client::Transport,
    pub db: &'tmp Arc<Database<C>>,
-    pub shutdown: &'tmp Arc<AtomicBool>,
+    pub shutdown_rx: &'tmp base::shutdown::Receiver,
 }

 /// Connects to a given RTSP stream and writes recordings to the database via [`writer::Writer`].
@ -31,7 +30,7 @@ pub struct Streamer<'a, C>
 where
    C: Clocks + Clone,
 {
-    shutdown: Arc<AtomicBool>,
+    shutdown_rx: base::shutdown::Receiver,

    // State below is only used by the thread in Run.
    rotate_offset_sec: i64,
@ -42,6 +41,7 @@ where
    opener: &'a dyn stream::Opener,
    transport: retina::client::Transport,
    stream_id: i32,
+    session_group: Arc<retina::client::SessionGroup>,
    short_name: String,
    url: Url,
    username: String,
@ -59,6 +59,7 @@ where
        stream_id: i32,
        c: &Camera,
        s: &Stream,
+        session_group: Arc<retina::client::SessionGroup>,
        rotate_offset_sec: i64,
        rotate_interval_sec: i64,
    ) -> Result<Self, Error> {
@ -71,7 +72,7 @@ where
            bail!("RTSP URL shouldn't include credentials");
        }
        Ok(Streamer {
-            shutdown: env.shutdown.clone(),
+            shutdown_rx: env.shutdown_rx.clone(),
            rotate_offset_sec,
            rotate_interval_sec,
            db: env.db.clone(),
@ -80,6 +81,7 @@ where
            opener: env.opener,
            transport: env.transport,
            stream_id,
+            session_group,
            short_name: format!("{}-{}", c.short_name, s.type_.as_str()),
            url: url.clone(),
            username: c.config.username.clone(),
@ -95,7 +97,7 @@ where
    /// Note that when using Retina as the RTSP library, this must be called
    /// within a tokio runtime context; see [tokio::runtime::Handle].
    pub fn run(&mut self) {
-        while !self.shutdown.load(Ordering::SeqCst) {
+        while self.shutdown_rx.check().is_ok() {
            if let Err(e) = self.run_once() {
                let sleep_time = time::Duration::seconds(1);
                warn!(
@ -114,6 +116,31 @@ where
        info!("{}: Opening input: {}", self.short_name, self.url.as_str());
        let clocks = self.db.clocks();

+        let mut waited = false;
+        loop {
+            let status = self.session_group.stale_sessions();
+            if let Some(max_expires) = status.max_expires {
+                log::info!(
+                    "{}: waiting up to {:?} for TEARDOWN or expiration of {} stale sessions",
+                    &self.short_name,
+                    max_expires.saturating_duration_since(tokio::time::Instant::now()),
+                    status.num_sessions
+                );
+                tokio::runtime::Handle::current().block_on(async {
+                    tokio::select! {
+                        _ = self.session_group.await_stale_sessions(&status) => Ok(()),
+                        _ = self.shutdown_rx.as_future() => Err(base::shutdown::ShutdownError),
+                    }
+                })?;
+                waited = true;
+            } else {
+                if waited {
+                    log::info!("{}: done waiting; no more stale sessions", &self.short_name);
+                }
+                break;
+            }
+        }
+
        let (extra_data, mut stream) = {
            let _t = TimerGuard::new(&clocks, || format!("opening {}", self.url.as_str()));
            self.opener.open(
@ -131,6 +158,7 @@ where
                        Some(self.password.clone())
                    },
                    transport: self.transport,
+                    session_group: self.session_group.clone(),
                },
            )?
        };
@ -150,7 +178,7 @@ where
            self.stream_id,
            video_sample_entry_id,
        );
-        while !self.shutdown.load(Ordering::SeqCst) {
+        while self.shutdown_rx.check().is_ok() {
            let pkt = {
                let _t = TimerGuard::new(&clocks, || "getting next packet");
                stream.next()
@ -207,7 +235,13 @@ where
                }
            };
            let _t = TimerGuard::new(&clocks, || format!("writing {} bytes", pkt.data.len()));
-            w.write(pkt.data, local_time, pkt.pts, pkt.is_key)?;
+            w.write(
+                &mut self.shutdown_rx,
+                pkt.data,
+                local_time,
+                pkt.pts,
+                pkt.is_key,
+            )?;
            rotate = Some(r);
        }
        if rotate.is_some() {
@ -229,7 +263,6 @@ mod tests {
    use parking_lot::Mutex;
    use std::cmp;
    use std::convert::TryFrom;
-    use std::sync::atomic::{AtomicBool, Ordering};
    use std::sync::Arc;
    use time;

@ -305,7 +338,7 @@ mod tests {
    struct MockOpener {
        expected_url: url::Url,
        streams: Mutex<Vec<(h264::ExtraData, Box<dyn stream::Stream>)>>,
-        shutdown: Arc<AtomicBool>,
+        shutdown_tx: Mutex<Option<base::shutdown::Sender>>,
    }

    impl stream::Opener for MockOpener {
@ -326,7 +359,7 @@ mod tests {
                }
                None => {
                    trace!("MockOpener shutting down");
-                    self.shutdown.store(true, Ordering::SeqCst);
+                    self.shutdown_tx.lock().take();
                    bail!("done")
                }
            }
@ -373,16 +406,17 @@ mod tests {
        stream.ts_offset = 123456; // starting pts of the input should be irrelevant
        stream.ts_offset_pkts_left = u32::max_value();
        stream.pkts_left = u32::max_value();
+        let (shutdown_tx, shutdown_rx) = base::shutdown::channel();
        let opener = MockOpener {
            expected_url: url::Url::parse("rtsp://test-camera/main").unwrap(),
            streams: Mutex::new(vec![(extra_data, Box::new(stream))]),
-            shutdown: Arc::new(AtomicBool::new(false)),
+            shutdown_tx: Mutex::new(Some(shutdown_tx)),
        };
        let db = testutil::TestDb::new(clocks.clone());
        let env = super::Environment {
            opener: &opener,
            db: &db.db,
-            shutdown: &opener.shutdown,
+            shutdown_rx: &shutdown_rx,
            transport: retina::client::Transport::Tcp,
        };
        let mut stream;
@ -402,6 +436,7 @@ mod tests {
                testutil::TEST_STREAM_ID,
                camera,
                s,
+                Arc::new(retina::client::SessionGroup::default()),
                0,
                3,
            )
--- a/server/src/web.rs
+++ b/server/src/web.rs
@ -11,7 +11,7 @@ use core::borrow::Borrow;
 use core::str::FromStr;
 use db::dir::SampleFileDir;
 use db::{auth, recording};
-use failure::{bail, format_err, Error};
+use failure::{format_err, Error};
 use fnv::FnvHashMap;
 use futures::stream::StreamExt;
 use futures::{future::Either, sink::SinkExt};
@ -762,6 +762,7 @@ impl Service {
                video_samples: row.video_samples,
                video_sample_entry_id: row.video_sample_entry_id,
                growing: row.growing,
+                has_trailing_zero: row.has_trailing_zero,
            });
            if !out
                .video_sample_entries
@ -856,7 +857,8 @@ impl Service {

                            if let Some(o) = s.open_id {
                                if r.open_id != o {
-                                    bail!(
+                                    bail_t!(
+                                        NotFound,
                                        "recording {} has open id {}, requested {}",
                                        r.id,
                                        r.open_id,
@ -868,9 +870,14 @@ impl Service {
                            // Check for missing recordings.
                            match prev {
                                None if recording_id == s.ids.start => {}
-                                None => bail!("no such recording {}/{}", stream_id, s.ids.start),
+                                None => bail_t!(
+                                    NotFound,
+                                    "no such recording {}/{}",
+                                    stream_id,
+                                    s.ids.start
+                                ),
                                Some(id) if r.id.recording() != id + 1 => {
-                                    bail!("no such recording {}/{}", stream_id, id + 1);
+                                    bail_t!(NotFound, "no such recording {}/{}", stream_id, id + 1);
                                }
                                _ => {}
                            };
@ -909,8 +916,7 @@ impl Service {
                            }
                            cur_off += wd;
                            Ok(())
-                        })
-                        .map_err(internal_server_err)?;
+                        })?;

                        // Check for missing recordings.
                        match prev {
@ -1368,15 +1374,16 @@ impl<'a> StaticFileRequest<'a> {
        };
        let ext = &path[last_dot + 1..];
        let mime = match ext {
+            "css" => "text/css",
            "html" => "text/html",
            "ico" => "image/x-icon",
            "js" | "map" => "text/javascript",
            "json" => "application/json",
            "png" => "image/png",
-            "webmanifest" => "application/manifest+json",
+            "svg" => "image/svg+xml",
            "txt" => "text/plain",
+            "webmanifest" => "application/manifest+json",
            "woff2" => "font/woff2",
-            "css" => "text/css",
            _ => return None,
        };

--- a/ui/package-lock.json
+++ b/ui/package-lock.json
@ -2303,141 +2303,332 @@
      "resolved": "https://registry.npmjs.org/@juggle/resize-observer/-/resize-observer-3.3.1.tgz",
      "integrity": "sha512-zMM9Ds+SawiUkakS7y94Ymqx+S0ORzpG3frZirN3l+UlXUmSUR7hF4wxCVqW+ei94JzV5kt0uXBcoOEAuiydrw=="
    },
-    "@material-ui/core": {
-      "version": "5.0.0-beta.3",
-      "resolved": "https://registry.npmjs.org/@material-ui/core/-/core-5.0.0-beta.3.tgz",
-      "integrity": "sha512-yIa6aQcjO+R+iRbCveYhis4uEsl0YQqOxKcJDsb1q9NxdOPSrS26UvxSVfSxO6nYhs8HknL5rlplwSyyPZkwRw==",
+    "@mui/core": {
+      "version": "5.0.0-alpha.48",
+      "resolved": "https://registry.npmjs.org/@mui/core/-/core-5.0.0-alpha.48.tgz",
+      "integrity": "sha512-H/QQwKsr2EqPAnP35DGDpWihk5BOFYGhO52rIHb3XKOfoUjDCrCHBy2kvr3dLWJDmJXr/QzYj3AX10n5XzlaMg==",
      "requires": {
-        "@babel/runtime": "^7.4.4",
-        "@material-ui/system": "5.0.0-beta.3",
-        "@material-ui/types": "6.0.2",
-        "@material-ui/unstyled": "5.0.0-alpha.42",
-        "@material-ui/utils": "5.0.0-beta.1",
-        "@popperjs/core": "^2.4.4",
-        "@types/react-transition-group": "^4.2.0",
-        "clsx": "^1.0.4",
-        "csstype": "^3.0.2",
-        "hoist-non-react-statics": "^3.3.2",
+        "@babel/runtime": "^7.15.4",
+        "@emotion/is-prop-valid": "^1.1.0",
+        "@mui/utils": "^5.0.1",
+        "clsx": "^1.1.1",
        "prop-types": "^15.7.2",
-        "react-is": "^17.0.0",
-        "react-transition-group": "^4.4.0"
+        "react-is": "^17.0.2"
+      },
+      "dependencies": {
+        "@babel/runtime": {
+          "version": "7.15.4",
+          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.4.tgz",
+          "integrity": "sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw==",
+          "requires": {
+            "regenerator-runtime": "^0.13.4"
+          }
+        }
      }
    },
-    "@material-ui/icons": {
-      "version": "5.0.0-beta.1",
-      "resolved": "https://registry.npmjs.org/@material-ui/icons/-/icons-5.0.0-beta.1.tgz",
-      "integrity": "sha512-HMxEXok46a5xAr+26LpJUX+bX7WfaPi5Yi3Bbh1Agskw0nD5SHUbZizNxxuB8QbHhRNOZF9y9viEDNbSf+r+yg==",
+    "@mui/icons-material": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-5.0.1.tgz",
+      "integrity": "sha512-AZehR/Uvi9VodsNPk9ae1lENKrf1evqx9suiP6VIqu7NxjZOlw/m/yA2gRAMmLEmIGr7EChfi/wcXuq6BpM9vw==",
      "requires": {
-        "@babel/runtime": "^7.4.4"
+        "@babel/runtime": "^7.15.4"
+      },
+      "dependencies": {
+        "@babel/runtime": {
+          "version": "7.15.4",
+          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.4.tgz",
+          "integrity": "sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw==",
+          "requires": {
+            "regenerator-runtime": "^0.13.4"
+          }
+        }
      }
    },
-    "@material-ui/lab": {
-      "version": "5.0.0-alpha.42",
-      "resolved": "https://registry.npmjs.org/@material-ui/lab/-/lab-5.0.0-alpha.42.tgz",
-      "integrity": "sha512-DzYUHmAus1RblQXdDcOxPpvFC20QCgBFtdGT9o+9CXxj8FA7/XiVMmkkvNDi8lfma1y4HPdUvmNSqEiVaZtBtw==",
+    "@mui/lab": {
+      "version": "5.0.0-alpha.48",
+      "resolved": "https://registry.npmjs.org/@mui/lab/-/lab-5.0.0-alpha.48.tgz",
+      "integrity": "sha512-ukYcx1ReSy4taQBMIPTkOaSz+CwgxYih3XwTCGTv84atRWMFhfqJO3Ofe8rQ5/innMDbBlSPkjaiMSag8d3QeQ==",
      "requires": {
-        "@babel/runtime": "^7.4.4",
+        "@babel/runtime": "^7.15.4",
        "@date-io/date-fns": "^2.10.6",
        "@date-io/dayjs": "^2.10.6",
        "@date-io/luxon": "^2.10.6",
        "@date-io/moment": "^2.10.6",
-        "@material-ui/system": "5.0.0-beta.3",
-        "@material-ui/unstyled": "5.0.0-alpha.42",
-        "@material-ui/utils": "5.0.0-beta.1",
-        "clsx": "^1.0.4",
+        "@mui/core": "5.0.0-alpha.48",
+        "@mui/system": "^5.0.1",
+        "@mui/utils": "^5.0.1",
+        "clsx": "^1.1.1",
        "prop-types": "^15.7.2",
-        "react-is": "^17.0.0",
-        "react-transition-group": "^4.4.1",
+        "react-is": "^17.0.2",
+        "react-transition-group": "^4.4.2",
        "rifm": "^0.12.0"
+      },
+      "dependencies": {
+        "@babel/runtime": {
+          "version": "7.15.4",
+          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.4.tgz",
+          "integrity": "sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw==",
+          "requires": {
+            "regenerator-runtime": "^0.13.4"
+          }
+        }
      }
    },
-    "@material-ui/private-theming": {
-      "version": "5.0.0-beta.2",
-      "resolved": "https://registry.npmjs.org/@material-ui/private-theming/-/private-theming-5.0.0-beta.2.tgz",
-      "integrity": "sha512-qLlUeRdiLCT57sgVWprtPPENU4ZSVlUK6C/aERzlgu+oN7VdKzkz9r07K7bcUau/wHXusP+u1UKNp6TpPr2XVg==",
+    "@mui/material": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/@mui/material/-/material-5.0.1.tgz",
+      "integrity": "sha512-+/JJzRcORUf5MiZnzuqsPFRgxm3/0CUi1wE97ZQ2y7r+EnDVsjJLcjAH9Q9GY3k9zkPIpYb9Hig/+HT6AGZRnQ==",
      "requires": {
-        "@babel/runtime": "^7.4.4",
-        "@material-ui/utils": "5.0.0-beta.1",
-        "prop-types": "^15.7.2"
-      }
-    },
-    "@material-ui/styled-engine": {
-      "version": "5.0.0-beta.1",
-      "resolved": "https://registry.npmjs.org/@material-ui/styled-engine/-/styled-engine-5.0.0-beta.1.tgz",
-      "integrity": "sha512-BSVsgVQ1cv+Eaf2FFhVahaEw7UeBaLBn0yAM8uWbLxi+LhuNN+HVv/Echv70MDMLW4fna3L2S6u1NXUoGd+7Hw==",
-      "requires": {
-        "@babel/runtime": "^7.4.4",
-        "@emotion/cache": "^11.0.0",
-        "prop-types": "^15.7.2"
-      }
-    },
-    "@material-ui/styles": {
-      "version": "5.0.0-beta.3",
-      "resolved": "https://registry.npmjs.org/@material-ui/styles/-/styles-5.0.0-beta.3.tgz",
-      "integrity": "sha512-m0SBTmZiDN9uNUthSMZCx6my2ejdOJNjPMvk27o7leiweubZgLVxLTgs/WaRsJJxmUEo6lnOZT0WzjAyp1ZESg==",
-      "requires": {
-        "@babel/runtime": "^7.4.4",
-        "@emotion/hash": "^0.8.0",
-        "@material-ui/private-theming": "5.0.0-beta.2",
-        "@material-ui/types": "6.0.2",
-        "@material-ui/utils": "5.0.0-beta.1",
-        "clsx": "^1.0.4",
-        "csstype": "^3.0.2",
+        "@babel/runtime": "^7.15.4",
+        "@mui/core": "5.0.0-alpha.48",
+        "@mui/system": "^5.0.1",
+        "@mui/types": "^7.0.0",
+        "@mui/utils": "^5.0.1",
+        "@popperjs/core": "^2.4.4",
+        "@types/react-transition-group": "^4.4.3",
+        "clsx": "^1.1.1",
+        "csstype": "^3.0.9",
        "hoist-non-react-statics": "^3.3.2",
-        "jss": "^10.0.3",
-        "jss-plugin-camel-case": "^10.0.3",
-        "jss-plugin-default-unit": "^10.0.3",
-        "jss-plugin-global": "^10.0.3",
-        "jss-plugin-nested": "^10.0.3",
-        "jss-plugin-props-sort": "^10.0.3",
-        "jss-plugin-rule-value-function": "^10.0.3",
-        "jss-plugin-vendor-prefixer": "^10.0.3",
-        "prop-types": "^15.7.2"
-      }
-    },
-    "@material-ui/system": {
-      "version": "5.0.0-beta.3",
-      "resolved": "https://registry.npmjs.org/@material-ui/system/-/system-5.0.0-beta.3.tgz",
-      "integrity": "sha512-gch4yt38XUe+WO2+4uomIMRTCK6bfmnTjCrGkYgkb4FuH0Ubk07ZHCSXdY+bmmCaHzwceCfEm9wa7BkM+tNbZQ==",
-      "requires": {
-        "@babel/runtime": "^7.4.4",
-        "@material-ui/private-theming": "5.0.0-beta.2",
-        "@material-ui/styled-engine": "5.0.0-beta.1",
-        "@material-ui/types": "6.0.2",
-        "@material-ui/utils": "5.0.0-beta.1",
-        "clsx": "^1.0.4",
-        "csstype": "^3.0.2",
-        "prop-types": "^15.7.2"
-      }
-    },
-    "@material-ui/types": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/@material-ui/types/-/types-6.0.2.tgz",
-      "integrity": "sha512-/XUca4wUb9pWimLLdM1PE8KS8rTbDEGohSGkGtk3WST7lm23m+8RYv9uOmrvOg/VSsl4bMiOv4t2/LCb+RLbTg=="
-    },
-    "@material-ui/unstyled": {
-      "version": "5.0.0-alpha.42",
-      "resolved": "https://registry.npmjs.org/@material-ui/unstyled/-/unstyled-5.0.0-alpha.42.tgz",
-      "integrity": "sha512-vwzb4kQbkpntBGE4EQcbnk6eitjPIDM3176WY/Ea7l4o/b95NTVsPlDvIntyRr+lcxkGtJCD7X5rUCZug6aoHw==",
-      "requires": {
-        "@babel/runtime": "^7.4.4",
-        "@emotion/is-prop-valid": "^1.1.0",
-        "@material-ui/utils": "5.0.0-beta.1",
-        "clsx": "^1.0.4",
        "prop-types": "^15.7.2",
-        "react-is": "^17.0.0"
+        "react-is": "^17.0.2",
+        "react-transition-group": "^4.4.2"
+      },
+      "dependencies": {
+        "@babel/runtime": {
+          "version": "7.15.4",
+          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.4.tgz",
+          "integrity": "sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw==",
+          "requires": {
+            "regenerator-runtime": "^0.13.4"
+          }
+        },
+        "@types/react-transition-group": {
+          "version": "4.4.3",
+          "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.3.tgz",
+          "integrity": "sha512-fUx5muOWSYP8Bw2BUQ9M9RK9+W1XBK/7FLJ8PTQpnpTEkn0ccyMffyEQvan4C3h53gHdx7KE5Qrxi/LnUGQtdg==",
+          "requires": {
+            "@types/react": "*"
+          }
+        },
+        "csstype": {
+          "version": "3.0.9",
+          "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.9.tgz",
+          "integrity": "sha512-rpw6JPxK6Rfg1zLOYCSwle2GFOOsnjmDYDaBwEcwoOg4qlsIVCN789VkBZDJAGi4T07gI4YSutR43t9Zz4Lzuw=="
+        }
      }
    },
-    "@material-ui/utils": {
-      "version": "5.0.0-beta.1",
-      "resolved": "https://registry.npmjs.org/@material-ui/utils/-/utils-5.0.0-beta.1.tgz",
-      "integrity": "sha512-63E5b1iW79T6dga7Ao1turX4s5P8jipCMVw1tDjKHMiauILb8C6TmUPde+NoM+fQ6OTppC9JxdOXzuotxNRWNA==",
+    "@mui/private-theming": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/@mui/private-theming/-/private-theming-5.0.1.tgz",
+      "integrity": "sha512-R8Cf2+32cG1OXFAqTighA5Mx9R5BQ57cN1ZVaNgfgdbI87Yig2fVMdFSPrw3txcjKlnwsvFJF8AdwQMqq1tJ3Q==",
      "requires": {
-        "@babel/runtime": "^7.4.4",
-        "@types/prop-types": "^15.7.3",
+        "@babel/runtime": "^7.15.4",
+        "@mui/utils": "^5.0.1",
+        "prop-types": "^15.7.2"
+      },
+      "dependencies": {
+        "@babel/runtime": {
+          "version": "7.15.4",
+          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.4.tgz",
+          "integrity": "sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw==",
+          "requires": {
+            "regenerator-runtime": "^0.13.4"
+          }
+        }
+      }
+    },
+    "@mui/styled-engine": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-5.0.1.tgz",
+      "integrity": "sha512-j40nCbaKr1HAZYqpX61XvZYsadYskjo3u6+pRFFaewSViAkkD1rjjbubpnh15nqVfYmijtHMZJ9/l1x1hamvfQ==",
+      "requires": {
+        "@babel/runtime": "^7.15.4",
+        "@emotion/cache": "^11.4.0",
+        "prop-types": "^15.7.2"
+      },
+      "dependencies": {
+        "@babel/runtime": {
+          "version": "7.15.4",
+          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.4.tgz",
+          "integrity": "sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw==",
+          "requires": {
+            "regenerator-runtime": "^0.13.4"
+          }
+        }
+      }
+    },
+    "@mui/styles": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/@mui/styles/-/styles-5.0.1.tgz",
+      "integrity": "sha512-hCtR2ZVOkoIhpTan02I4UEShnZxe59WwhKRJqauMs/addXByhAHHCNheTdiV++Irl/fyyFObmzPM0CUD3q6FIA==",
+      "requires": {
+        "@babel/runtime": "^7.15.4",
+        "@emotion/hash": "^0.8.0",
+        "@mui/private-theming": "^5.0.1",
+        "@mui/types": "^7.0.0",
+        "@mui/utils": "^5.0.1",
+        "clsx": "^1.1.1",
+        "csstype": "^3.0.9",
+        "hoist-non-react-statics": "^3.3.2",
+        "jss": "^10.8.0",
+        "jss-plugin-camel-case": "^10.8.0",
+        "jss-plugin-default-unit": "^10.8.0",
+        "jss-plugin-global": "^10.8.0",
+        "jss-plugin-nested": "^10.8.0",
+        "jss-plugin-props-sort": "^10.8.0",
+        "jss-plugin-rule-value-function": "^10.8.0",
+        "jss-plugin-vendor-prefixer": "^10.8.0",
+        "prop-types": "^15.7.2"
+      },
+      "dependencies": {
+        "@babel/runtime": {
+          "version": "7.15.4",
+          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.4.tgz",
+          "integrity": "sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw==",
+          "requires": {
+            "regenerator-runtime": "^0.13.4"
+          }
+        },
+        "csstype": {
+          "version": "3.0.9",
+          "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.9.tgz",
+          "integrity": "sha512-rpw6JPxK6Rfg1zLOYCSwle2GFOOsnjmDYDaBwEcwoOg4qlsIVCN789VkBZDJAGi4T07gI4YSutR43t9Zz4Lzuw=="
+        },
+        "jss": {
+          "version": "10.8.0",
+          "resolved": "https://registry.npmjs.org/jss/-/jss-10.8.0.tgz",
+          "integrity": "sha512-6fAMLJrVQ8epM5ghghxWqCwRR0ZamP2cKbOAtzPudcCMSNdAqtvmzQvljUZYR8OXJIeb/IpZeOXA1sDXms4R1w==",
+          "requires": {
+            "@babel/runtime": "^7.3.1",
+            "csstype": "^3.0.2",
+            "is-in-browser": "^1.1.3",
+            "tiny-warning": "^1.0.2"
+          }
+        },
+        "jss-plugin-camel-case": {
+          "version": "10.8.0",
+          "resolved": "https://registry.npmjs.org/jss-plugin-camel-case/-/jss-plugin-camel-case-10.8.0.tgz",
+          "integrity": "sha512-yxlXrXwcCdGw+H4BC187dEu/RFyW8joMcWfj8Rk9UPgWTKu2Xh7Sib4iW3xXjHe/t5phOHF1rBsHleHykWix7g==",
+          "requires": {
+            "@babel/runtime": "^7.3.1",
+            "hyphenate-style-name": "^1.0.3",
+            "jss": "10.8.0"
+          }
+        },
+        "jss-plugin-default-unit": {
+          "version": "10.8.0",
+          "resolved": "https://registry.npmjs.org/jss-plugin-default-unit/-/jss-plugin-default-unit-10.8.0.tgz",
+          "integrity": "sha512-9XJV546cY9zV9OvIE/v/dOaxSi4062VfYQQfwbplRExcsU2a79Yn+qDz/4ciw6P4LV1Naq90U+OffAGRHfNq/Q==",
+          "requires": {
+            "@babel/runtime": "^7.3.1",
+            "jss": "10.8.0"
+          }
+        },
+        "jss-plugin-global": {
+          "version": "10.8.0",
+          "resolved": "https://registry.npmjs.org/jss-plugin-global/-/jss-plugin-global-10.8.0.tgz",
+          "integrity": "sha512-H/8h/bHd4e7P0MpZ9zaUG8NQSB2ie9rWo/vcCP6bHVerbKLGzj+dsY22IY3+/FNRS8zDmUyqdZx3rD8k4nmH4w==",
+          "requires": {
+            "@babel/runtime": "^7.3.1",
+            "jss": "10.8.0"
+          }
+        },
+        "jss-plugin-nested": {
+          "version": "10.8.0",
+          "resolved": "https://registry.npmjs.org/jss-plugin-nested/-/jss-plugin-nested-10.8.0.tgz",
+          "integrity": "sha512-MhmINZkSxyFILcFBuDoZmP1+wj9fik/b9SsjoaggkGjdvMQCES21mj4K5ZnRGVm448gIXyi9j/eZjtDzhaHUYQ==",
+          "requires": {
+            "@babel/runtime": "^7.3.1",
+            "jss": "10.8.0",
+            "tiny-warning": "^1.0.2"
+          }
+        },
+        "jss-plugin-props-sort": {
+          "version": "10.8.0",
+          "resolved": "https://registry.npmjs.org/jss-plugin-props-sort/-/jss-plugin-props-sort-10.8.0.tgz",
+          "integrity": "sha512-VY+Wt5WX5GMsXDmd+Ts8+O16fpiCM81svbox++U3LDbJSM/g9FoMx3HPhwUiDfmgHL9jWdqEuvSl/JAk+mh6mQ==",
+          "requires": {
+            "@babel/runtime": "^7.3.1",
+            "jss": "10.8.0"
+          }
+        },
+        "jss-plugin-rule-value-function": {
+          "version": "10.8.0",
+          "resolved": "https://registry.npmjs.org/jss-plugin-rule-value-function/-/jss-plugin-rule-value-function-10.8.0.tgz",
+          "integrity": "sha512-R8N8Ma6Oye1F9HroiUuHhVjpPsVq97uAh+rMI6XwKLqirIu2KFb5x33hPj+vNBMxSHc9jakhf5wG0BbQ7fSDOg==",
+          "requires": {
+            "@babel/runtime": "^7.3.1",
+            "jss": "10.8.0",
+            "tiny-warning": "^1.0.2"
+          }
+        },
+        "jss-plugin-vendor-prefixer": {
+          "version": "10.8.0",
+          "resolved": "https://registry.npmjs.org/jss-plugin-vendor-prefixer/-/jss-plugin-vendor-prefixer-10.8.0.tgz",
+          "integrity": "sha512-G1zD0J8dFwKZQ+GaZaay7A/Tg7lhDw0iEkJ/iFFA5UPuvZFpMprCMQttXcTBhLlhhWnyZ8YPn4yqp+amrhQekw==",
+          "requires": {
+            "@babel/runtime": "^7.3.1",
+            "css-vendor": "^2.0.8",
+            "jss": "10.8.0"
+          }
+        }
+      }
+    },
+    "@mui/system": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/@mui/system/-/system-5.0.1.tgz",
+      "integrity": "sha512-pGNKUpjK5hm4apZAUZu7LugemBPoZnNvNNCI2miI/BXxqyx41mL9+iT9p6Qe9uDOh8Z6GUbLIzvOjSTP+ECRZw==",
+      "requires": {
+        "@babel/runtime": "^7.15.4",
+        "@mui/private-theming": "^5.0.1",
+        "@mui/styled-engine": "^5.0.1",
+        "@mui/types": "^7.0.0",
+        "@mui/utils": "^5.0.1",
+        "clsx": "^1.1.1",
+        "csstype": "^3.0.9",
+        "prop-types": "^15.7.2"
+      },
+      "dependencies": {
+        "@babel/runtime": {
+          "version": "7.15.4",
+          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.4.tgz",
+          "integrity": "sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw==",
+          "requires": {
+            "regenerator-runtime": "^0.13.4"
+          }
+        },
+        "csstype": {
+          "version": "3.0.9",
+          "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.9.tgz",
+          "integrity": "sha512-rpw6JPxK6Rfg1zLOYCSwle2GFOOsnjmDYDaBwEcwoOg4qlsIVCN789VkBZDJAGi4T07gI4YSutR43t9Zz4Lzuw=="
+        }
+      }
+    },
+    "@mui/types": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/@mui/types/-/types-7.0.0.tgz",
+      "integrity": "sha512-M/tkF2pZ4uoPhZ8pnNhlVnOFtz6F3dnYKIsnj8MuXKT6d26IE2u0UjA8B0275ggN74dR9rlHG5xJt5jgDx/Ung=="
+    },
+    "@mui/utils": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-5.0.1.tgz",
+      "integrity": "sha512-GWO104N+o9KG5fKiTEYnAg7kONKEg3vLN+VROAU0f3it6lFGLCVPcQYex/1gJ4QAy96u6Ez8/Hmmhi1+3cX0tQ==",
+      "requires": {
+        "@babel/runtime": "^7.15.4",
+        "@types/prop-types": "^15.7.4",
        "@types/react-is": "^16.7.1 || ^17.0.0",
        "prop-types": "^15.7.2",
-        "react-is": "^17.0.0"
+        "react-is": "^17.0.2"
+      },
+      "dependencies": {
+        "@babel/runtime": {
+          "version": "7.15.4",
+          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.4.tgz",
+          "integrity": "sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw==",
+          "requires": {
+            "regenerator-runtime": "^0.13.4"
+          }
+        }
      }
    },
    "@nodelib/fs.scandir": {
@ -3249,14 +3440,6 @@
        "@types/react": "*"
      }
    },
-    "@types/react-transition-group": {
-      "version": "4.4.2",
-      "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.2.tgz",
-      "integrity": "sha512-KibDWL6nshuOJ0fu8ll7QnV/LVTo3PzQ9aCPnRUYPfX7eZohHwLIdNHj7pftanREzHNP4/nJa8oeM73uSiavMQ==",
-      "requires": {
-        "@types/react": "*"
-      }
-    },
    "@types/resolve": {
      "version": "0.0.8",
      "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-0.0.8.tgz",
@ -11661,84 +11844,6 @@
        "universalify": "^2.0.0"
      }
    },
-    "jss": {
-      "version": "10.7.1",
-      "resolved": "https://registry.npmjs.org/jss/-/jss-10.7.1.tgz",
-      "integrity": "sha512-5QN8JSVZR6cxpZNeGfzIjqPEP+ZJwJJfZbXmeABNdxiExyO+eJJDy6WDtqTf8SDKnbL5kZllEpAP71E/Lt7PXg==",
-      "requires": {
-        "@babel/runtime": "^7.3.1",
-        "csstype": "^3.0.2",
-        "is-in-browser": "^1.1.3",
-        "tiny-warning": "^1.0.2"
-      }
-    },
-    "jss-plugin-camel-case": {
-      "version": "10.7.1",
-      "resolved": "https://registry.npmjs.org/jss-plugin-camel-case/-/jss-plugin-camel-case-10.7.1.tgz",
-      "integrity": "sha512-+ioIyWvmAfgDCWXsQcW1NMnLBvRinOVFkSYJUgewQ6TynOcSj5F1bSU23B7z0p1iqK0PPHIU62xY1iNJD33WGA==",
-      "requires": {
-        "@babel/runtime": "^7.3.1",
-        "hyphenate-style-name": "^1.0.3",
-        "jss": "10.7.1"
-      }
-    },
-    "jss-plugin-default-unit": {
-      "version": "10.7.1",
-      "resolved": "https://registry.npmjs.org/jss-plugin-default-unit/-/jss-plugin-default-unit-10.7.1.tgz",
-      "integrity": "sha512-tW+dfYVNARBQb/ONzBwd8uyImigyzMiAEDai+AbH5rcHg5h3TtqhAkxx06iuZiT/dZUiFdSKlbe3q9jZGAPIwA==",
-      "requires": {
-        "@babel/runtime": "^7.3.1",
-        "jss": "10.7.1"
-      }
-    },
-    "jss-plugin-global": {
-      "version": "10.7.1",
-      "resolved": "https://registry.npmjs.org/jss-plugin-global/-/jss-plugin-global-10.7.1.tgz",
-      "integrity": "sha512-FbxCnu44IkK/bw8X3CwZKmcAnJqjAb9LujlAc/aP0bMSdVa3/MugKQRyeQSu00uGL44feJJDoeXXiHOakBr/Zw==",
-      "requires": {
-        "@babel/runtime": "^7.3.1",
-        "jss": "10.7.1"
-      }
-    },
-    "jss-plugin-nested": {
-      "version": "10.7.1",
-      "resolved": "https://registry.npmjs.org/jss-plugin-nested/-/jss-plugin-nested-10.7.1.tgz",
-      "integrity": "sha512-RNbICk7FlYKaJyv9tkMl7s6FFfeLA3ubNIFKvPqaWtADK0KUaPsPXVYBkAu4x1ItgsWx67xvReMrkcKA0jSXfA==",
-      "requires": {
-        "@babel/runtime": "^7.3.1",
-        "jss": "10.7.1",
-        "tiny-warning": "^1.0.2"
-      }
-    },
-    "jss-plugin-props-sort": {
-      "version": "10.7.1",
-      "resolved": "https://registry.npmjs.org/jss-plugin-props-sort/-/jss-plugin-props-sort-10.7.1.tgz",
-      "integrity": "sha512-eyd5FhA+J0QrpqXxO7YNF/HMSXXl4pB0EmUdY4vSJI4QG22F59vQ6AHtP6fSwhmBdQ98Qd9gjfO+RMxcE39P1A==",
-      "requires": {
-        "@babel/runtime": "^7.3.1",
-        "jss": "10.7.1"
-      }
-    },
-    "jss-plugin-rule-value-function": {
-      "version": "10.7.1",
-      "resolved": "https://registry.npmjs.org/jss-plugin-rule-value-function/-/jss-plugin-rule-value-function-10.7.1.tgz",
-      "integrity": "sha512-fGAAImlbaHD3fXAHI3ooX6aRESOl5iBt3LjpVjxs9II5u9tzam7pqFUmgTcrip9VpRqYHn8J3gA7kCtm8xKwHg==",
-      "requires": {
-        "@babel/runtime": "^7.3.1",
-        "jss": "10.7.1",
-        "tiny-warning": "^1.0.2"
-      }
-    },
-    "jss-plugin-vendor-prefixer": {
-      "version": "10.7.1",
-      "resolved": "https://registry.npmjs.org/jss-plugin-vendor-prefixer/-/jss-plugin-vendor-prefixer-10.7.1.tgz",
-      "integrity": "sha512-1UHFmBn7hZNsHXTkLLOL8abRl8vi+D1EVzWD4WmLFj55vawHZfnH1oEz6TUf5Y61XHv0smdHabdXds6BgOXe3A==",
-      "requires": {
-        "@babel/runtime": "^7.3.1",
-        "css-vendor": "^2.0.8",
-        "jss": "10.7.1"
-      }
-    },
    "jsx-ast-utils": {
      "version": "3.2.0",
      "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.2.0.tgz",
--- a/ui/package.json
+++ b/ui/package.json
@ -6,10 +6,10 @@
    "@emotion/react": "^11.1.5",
    "@emotion/styled": "^11.1.5",
    "@fontsource/roboto": "^4.2.1",
-    "@material-ui/core": "^5.0.0-beta.3",
-    "@material-ui/icons": "^5.0.0-beta.1",
-    "@material-ui/lab": "^5.0.0-alpha.42",
-    "@material-ui/styles": "^5.0.0-beta.3",
+    "@mui/material": "^5.0.1",
+    "@mui/icons-material": "^5.0.1",
+    "@mui/lab": "^5.0.0-alpha.48",
+    "@mui/styles": "^5.0.1",
    "@react-hook/resize-observer": "^1.2.0",
    "@types/jest": "^26.0.20",
    "@types/node": "^16.3.1",
@ -41,11 +41,11 @@
      "no-restricted-imports": [
        "error",
        {
-          "name": "@material-ui/core",
+          "name": "@mui/material",
          "message": "Please use the 'import Button from \"material-ui/core/Button\";' style instead; see https://material-ui.com/guides/minimizing-bundle-size/#option-1"
        },
        {
-          "name": "@material-ui/icons",
+          "name": "@mui/icons-material",
          "message": "Please use the 'import MenuIcon from \"material-ui/icons/Menu\";' style instead; see https://material-ui.com/guides/minimizing-bundle-size/#option-1"
        }
      ]
--- a/ui/src/App.tsx
+++ b/ui/src/App.tsx
@ -2,7 +2,7 @@
 // Copyright (C) 2021 The Moonfire NVR Authors; see AUTHORS and LICENSE.txt.
 // SPDX-License-Identifier: GPL-v3.0-or-later WITH GPL-3.0-linking-exception

-import Container from "@material-ui/core/Container";
+import Container from "@mui/material/Container";
 import React, { useEffect, useReducer, useState } from "react";
 import * as api from "./api";
 import MoonfireMenu from "./AppMenu";
@ -10,17 +10,17 @@ import Login from "./Login";
 import { useSnackbars } from "./snackbars";
 import { Camera, Session } from "./types";
 import ListActivity from "./List";
-import AppBar from "@material-ui/core/AppBar";
+import AppBar from "@mui/material/AppBar";
 import LiveActivity, { MultiviewChooser } from "./Live";
-import Drawer from "@material-ui/core/Drawer";
-import List from "@material-ui/core/List";
-import ListItem from "@material-ui/core/ListItem";
-import ListItemText from "@material-ui/core/ListItemText";
-import ListIcon from "@material-ui/icons/List";
-import Videocam from "@material-ui/icons/Videocam";
-import ListItemIcon from "@material-ui/core/ListItemIcon";
-import FilterList from "@material-ui/icons/FilterList";
-import IconButton from "@material-ui/core/IconButton";
+import Drawer from "@mui/material/Drawer";
+import List from "@mui/material/List";
+import ListItem from "@mui/material/ListItem";
+import ListItemText from "@mui/material/ListItemText";
+import ListIcon from "@mui/icons-material/List";
+import Videocam from "@mui/icons-material/Videocam";
+import ListItemIcon from "@mui/material/ListItemIcon";
+import FilterList from "@mui/icons-material/FilterList";
+import IconButton from "@mui/material/IconButton";

 export type LoginState =
  | "unknown"
--- a/ui/src/AppMenu.tsx
+++ b/ui/src/AppMenu.tsx
@ -2,16 +2,16 @@
 // Copyright (C) 2021 The Moonfire NVR Authors; see AUTHORS and LICENSE.txt.
 // SPDX-License-Identifier: GPL-v3.0-or-later WITH GPL-3.0-linking-exception

-import Button from "@material-ui/core/Button";
-import IconButton from "@material-ui/core/IconButton";
-import Menu from "@material-ui/core/Menu";
-import MenuItem from "@material-ui/core/MenuItem";
-import { Theme } from "@material-ui/core/styles";
-import { createStyles, makeStyles } from "@material-ui/styles";
-import Toolbar from "@material-ui/core/Toolbar";
-import Typography from "@material-ui/core/Typography";
-import AccountCircle from "@material-ui/icons/AccountCircle";
-import MenuIcon from "@material-ui/icons/Menu";
+import Button from "@mui/material/Button";
+import IconButton from "@mui/material/IconButton";
+import Menu from "@mui/material/Menu";
+import MenuItem from "@mui/material/MenuItem";
+import { Theme } from "@mui/material/styles";
+import { createStyles, makeStyles } from "@mui/styles";
+import Toolbar from "@mui/material/Toolbar";
+import Typography from "@mui/material/Typography";
+import AccountCircle from "@mui/icons-material/AccountCircle";
+import MenuIcon from "@mui/icons-material/Menu";
 import React from "react";
 import { LoginState } from "./App";
 import { Session } from "./types";
--- a/ui/src/ErrorBoundary.tsx
+++ b/ui/src/ErrorBoundary.tsx
@ -2,9 +2,9 @@
 // Copyright (C) 2021 The Moonfire NVR Authors; see AUTHORS and LICENSE.txt.
 // SPDX-License-Identifier: GPL-v3.0-or-later WITH GPL-3.0-linking-exception

-import Avatar from "@material-ui/core/Avatar";
-import Container from "@material-ui/core/Container";
-import BugReportIcon from "@material-ui/icons/BugReport";
+import Avatar from "@mui/material/Avatar";
+import Container from "@mui/material/Container";
+import BugReportIcon from "@mui/icons-material/BugReport";
 import React from "react";

 interface State {
--- a/ui/src/List/DisplaySelector.tsx
+++ b/ui/src/List/DisplaySelector.tsx
@ -2,15 +2,15 @@
 // Copyright (C) 2021 The Moonfire NVR Authors; see AUTHORS and LICENSE.txt.
 // SPDX-License-Identifier: GPL-v3.0-or-later WITH GPL-3.0-linking-exception

-import Card from "@material-ui/core/Card";
-import Checkbox from "@material-ui/core/Checkbox";
-import InputLabel from "@material-ui/core/InputLabel";
-import FormControl from "@material-ui/core/FormControl";
-import MenuItem from "@material-ui/core/MenuItem";
-import Select from "@material-ui/core/Select";
+import Card from "@mui/material/Card";
+import Checkbox from "@mui/material/Checkbox";
+import InputLabel from "@mui/material/InputLabel";
+import FormControl from "@mui/material/FormControl";
+import MenuItem from "@mui/material/MenuItem";
+import Select from "@mui/material/Select";
 import React from "react";
-import { useTheme } from "@material-ui/core/styles";
-import FormControlLabel from "@material-ui/core/FormControlLabel";
+import { useTheme } from "@mui/material/styles";
+import FormControlLabel from "@mui/material/FormControlLabel";

 interface Props {
  split90k?: number;
--- a/ui/src/List/StreamMultiSelector.tsx
+++ b/ui/src/List/StreamMultiSelector.tsx
@ -2,11 +2,11 @@
 // Copyright (C) 2021 The Moonfire NVR Authors; see AUTHORS and LICENSE.txt.
 // SPDX-License-Identifier: GPL-v3.0-or-later WITH GPL-3.0-linking-exception

-import Card from "@material-ui/core/Card";
+import Card from "@mui/material/Card";
 import { Camera, Stream, StreamType } from "../types";
-import Checkbox from "@material-ui/core/Checkbox";
-import { useTheme } from "@material-ui/core/styles";
-import { makeStyles } from "@material-ui/styles";
+import Checkbox from "@mui/material/Checkbox";
+import { useTheme } from "@mui/material/styles";
+import { makeStyles } from "@mui/styles";

 interface Props {
  cameras: Camera[];
--- a/ui/src/List/TimerangeSelector.tsx
+++ b/ui/src/List/TimerangeSelector.tsx
@ -5,21 +5,21 @@
 import { Stream } from "../types";
 import StaticDatePicker, {
  StaticDatePickerProps,
-} from "@material-ui/lab/StaticDatePicker";
+} from "@mui/lab/StaticDatePicker";
 import React, { useEffect } from "react";
 import { zonedTimeToUtc } from "date-fns-tz";
 import { addDays, addMilliseconds, differenceInMilliseconds } from "date-fns";
 import startOfDay from "date-fns/startOfDay";
-import Card from "@material-ui/core/Card";
-import { useTheme } from "@material-ui/core/styles";
-import TextField from "@material-ui/core/TextField";
-import FormControlLabel from "@material-ui/core/FormControlLabel";
-import FormLabel from "@material-ui/core/FormLabel";
-import Radio from "@material-ui/core/Radio";
-import RadioGroup from "@material-ui/core/RadioGroup";
-import TimePicker, { TimePickerProps } from "@material-ui/lab/TimePicker";
-import Collapse from "@material-ui/core/Collapse";
-import Box from "@material-ui/core/Box";
+import Card from "@mui/material/Card";
+import { useTheme } from "@mui/material/styles";
+import TextField from "@mui/material/TextField";
+import FormControlLabel from "@mui/material/FormControlLabel";
+import FormLabel from "@mui/material/FormLabel";
+import Radio from "@mui/material/Radio";
+import RadioGroup from "@mui/material/RadioGroup";
+import TimePicker, { TimePickerProps } from "@mui/lab/TimePicker";
+import Collapse from "@mui/material/Collapse";
+import Box from "@mui/material/Box";

 interface Props {
  selectedStreams: Set<Stream>;
--- a/ui/src/List/VideoList.tsx
+++ b/ui/src/List/VideoList.tsx
@ -6,11 +6,11 @@ import React from "react";
 import * as api from "../api";
 import { useSnackbars } from "../snackbars";
 import { Stream } from "../types";
-import TableBody from "@material-ui/core/TableBody";
-import TableCell from "@material-ui/core/TableCell";
-import TableRow, { TableRowProps } from "@material-ui/core/TableRow";
-import Skeleton from "@material-ui/core/Skeleton";
-import Alert from "@material-ui/core/Alert";
+import TableBody from "@mui/material/TableBody";
+import TableCell from "@mui/material/TableCell";
+import TableRow, { TableRowProps } from "@mui/material/TableRow";
+import Skeleton from "@mui/material/Skeleton";
+import Alert from "@mui/material/Alert";

 interface Props {
  stream: Stream;
--- a/ui/src/List/index.tsx
+++ b/ui/src/List/index.tsx
@ -2,13 +2,13 @@
 // Copyright (C) 2021 The Moonfire NVR Authors; see AUTHORS and LICENSE.txt.
 // SPDX-License-Identifier: GPL-v3.0-or-later WITH GPL-3.0-linking-exception

-import Box from "@material-ui/core/Box";
-import Modal from "@material-ui/core/Modal";
-import Paper from "@material-ui/core/Paper";
-import { Theme } from "@material-ui/core/styles";
-import { makeStyles } from "@material-ui/styles";
-import Table from "@material-ui/core/Table";
-import TableContainer from "@material-ui/core/TableContainer";
+import Box from "@mui/material/Box";
+import Modal from "@mui/material/Modal";
+import Paper from "@mui/material/Paper";
+import { Theme } from "@mui/material/styles";
+import { makeStyles } from "@mui/styles";
+import Table from "@mui/material/Table";
+import TableContainer from "@mui/material/TableContainer";
 import utcToZonedTime from "date-fns-tz/utcToZonedTime";
 import format from "date-fns/format";
 import React, { useMemo, useState } from "react";
--- a/ui/src/Live/LiveCamera.tsx
+++ b/ui/src/Live/LiveCamera.tsx
@ -6,9 +6,9 @@ import React, { SyntheticEvent } from "react";
 import { Camera } from "../types";
 import { Part, parsePart } from "./parser";
 import * as api from "../api";
-import Box from "@material-ui/core/Box";
-import CircularProgress from "@material-ui/core/CircularProgress";
-import Alert from "@material-ui/core/Alert";
+import Box from "@mui/material/Box";
+import CircularProgress from "@mui/material/CircularProgress";
+import Alert from "@mui/material/Alert";
 import useResizeObserver from "@react-hook/resize-observer";
 import { fillAspect } from "../aspect";

--- a/ui/src/Live/Multiview.tsx
+++ b/ui/src/Live/Multiview.tsx
@ -2,12 +2,12 @@
 // Copyright (C) 2021 The Moonfire NVR Authors; see AUTHORS and LICENSE.txt.
 // SPDX-License-Identifier: GPL-v3.0-or-later WITH GPL-3.0-linking-exception

-import Select, { SelectChangeEvent } from "@material-ui/core/Select";
-import MenuItem from "@material-ui/core/MenuItem";
+import Select, { SelectChangeEvent } from "@mui/material/Select";
+import MenuItem from "@mui/material/MenuItem";
 import React, { useReducer } from "react";
 import { Camera } from "../types";
-import { makeStyles } from "@material-ui/styles";
-import { Theme } from "@material-ui/core/styles";
+import { makeStyles } from "@mui/styles";
+import { Theme } from "@mui/material/styles";

 export interface Layout {
  className: string;
--- a/ui/src/Live/index.tsx
+++ b/ui/src/Live/index.tsx
@ -2,8 +2,8 @@
 // Copyright (C) 2021 The Moonfire NVR Authors; see AUTHORS and LICENSE.txt.
 // SPDX-License-Identifier: GPL-v3.0-or-later WITH GPL-3.0-linking-exception

-import Container from "@material-ui/core/Container";
-import ErrorIcon from "@material-ui/icons/Error";
+import Container from "@mui/material/Container";
+import ErrorIcon from "@mui/icons-material/Error";
 import { Camera } from "../types";
 import LiveCamera from "./LiveCamera";
 import Multiview from "./Multiview";
--- a/ui/src/Login.tsx
+++ b/ui/src/Login.tsx
@ -2,17 +2,17 @@
 // Copyright (C) 2021 The Moonfire NVR Authors; see AUTHORS and LICENSE.txt.
 // SPDX-License-Identifier: GPL-v3.0-or-later WITH GPL-3.0-linking-exception

-import Avatar from "@material-ui/core/Avatar";
-import Dialog from "@material-ui/core/Dialog";
-import DialogActions from "@material-ui/core/DialogActions";
-import DialogTitle from "@material-ui/core/DialogTitle";
-import FormControl from "@material-ui/core/FormControl";
-import FormHelperText from "@material-ui/core/FormHelperText";
-import { Theme } from "@material-ui/core/styles";
-import { makeStyles } from "@material-ui/styles";
-import TextField from "@material-ui/core/TextField";
-import LockOutlinedIcon from "@material-ui/icons/LockOutlined";
-import LoadingButton from "@material-ui/lab/LoadingButton";
+import Avatar from "@mui/material/Avatar";
+import Dialog from "@mui/material/Dialog";
+import DialogActions from "@mui/material/DialogActions";
+import DialogTitle from "@mui/material/DialogTitle";
+import FormControl from "@mui/material/FormControl";
+import FormHelperText from "@mui/material/FormHelperText";
+import { Theme } from "@mui/material/styles";
+import { makeStyles } from "@mui/styles";
+import TextField from "@mui/material/TextField";
+import LockOutlinedIcon from "@mui/icons-material/LockOutlined";
+import LoadingButton from "@mui/lab/LoadingButton";
 import React, { useEffect } from "react";
 import * as api from "./api";
 import { useSnackbars } from "./snackbars";
--- a/ui/src/index.tsx
+++ b/ui/src/index.tsx
@ -2,17 +2,17 @@
 // Copyright (C) 2021 The Moonfire NVR Authors; see AUTHORS and LICENSE.txt.
 // SPDX-License-Identifier: GPL-v3.0-or-later WITH GPL-3.0-linking-exception

-import CssBaseline from "@material-ui/core/CssBaseline";
-import { ThemeProvider, createTheme } from "@material-ui/core/styles";
-import StyledEngineProvider from "@material-ui/core/StyledEngineProvider";
-import LocalizationProvider from "@material-ui/lab/LocalizationProvider";
+import CssBaseline from "@mui/material/CssBaseline";
+import { ThemeProvider, createTheme } from "@mui/material/styles";
+import StyledEngineProvider from "@mui/material/StyledEngineProvider";
+import LocalizationProvider from "@mui/lab/LocalizationProvider";
 import "@fontsource/roboto";
 import React from "react";
 import ReactDOM from "react-dom";
 import App from "./App";
 import ErrorBoundary from "./ErrorBoundary";
 import { SnackbarProvider } from "./snackbars";
-import AdapterDateFns from "@material-ui/lab/AdapterDateFns";
+import AdapterDateFns from "@mui/lab/AdapterDateFns";
 import "./index.css";

 const theme = createTheme({
--- a/ui/src/snackbars.tsx
+++ b/ui/src/snackbars.tsx
@ -16,12 +16,12 @@
 * flexibility (yet).
 */

-import IconButton from "@material-ui/core/IconButton";
+import IconButton from "@mui/material/IconButton";
 import Snackbar, {
  SnackbarCloseReason,
  SnackbarProps,
-} from "@material-ui/core/Snackbar";
-import CloseIcon from "@material-ui/icons/Close";
+} from "@mui/material/Snackbar";
+import CloseIcon from "@mui/icons-material/Close";
 import React, { useContext } from "react";

 interface SnackbarProviderProps {
--- a/ui/src/testutil.tsx
+++ b/ui/src/testutil.tsx
@ -2,7 +2,7 @@
 // Copyright (C) 2021 The Moonfire NVR Authors; see AUTHORS and LICENSE.txt.
 // SPDX-License-Identifier: GPL-v3.0-or-later WITH GPL-3.0-linking-exception

-import { createTheme, ThemeProvider } from "@material-ui/core/styles";
+import { createTheme, ThemeProvider } from "@mui/material/styles";
 import { render } from "@testing-library/react";
 import { SnackbarProvider } from "./snackbars";