include ids in api responses for debugging

design/api.md

@@ -87,6 +87,9 @@ The `application/json` response will have a dict as follows:
     to divide recordings into days as described further below.
 *   `cameras`: a list of cameras. Each is a dict as follows:
     *   `uuid`: in text format
+    *   `id`: an integer. The client doesn't ever need to send the id
+        back in API requests, but camera ids are helpful to know when debugging
+        by reading logs or directly examining the filesystem/database.
     *   `shortName`: a short name (typically one or two words)
     *   `description`: a longer description (typically a phrase or paragraph)
     *   `config`: (only included if request parameter `cameraConfigs` is true)
@@ -96,6 +99,10 @@ The `application/json` response will have a dict as follows:
         *   `onvif_host`
     *   `streams`: a dict of stream type ("main" or "sub") to a dictionary
         describing the stream:
+        *   `id`: an integer. The client doesn't ever need to send the id
+            back in API requests, but stream ids are helpful to know when
+            debugging by reading logs or directly examining the
+            filesystem/database.
         *   `retainBytes`: the configured total number of bytes of completed
             recordings to retain.
         *   `minStartTime90k`: the start time of the earliest recording for

server/src/json.rs

@@ -56,6 +56,7 @@ impl Session {
 #[serde(rename_all = "camelCase")]
 pub struct Camera<'a> {
     pub uuid: Uuid,
+    pub id: i32,
     pub short_name: &'a str,
     pub description: &'a str,
 
@@ -77,6 +78,7 @@ pub struct CameraConfig<'a> {
 #[derive(Debug, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct Stream<'a> {
+    pub id: i32,
     pub retain_bytes: i64,
     pub min_start_time_90k: Option<Time>,
     pub max_end_time_90k: Option<Time>,
@@ -186,6 +188,7 @@ impl<'a> Camera<'a> {
     ) -> Result<Self, Error> {
         Ok(Camera {
             uuid: c.uuid,
+            id: c.id,
             short_name: &c.short_name,
             description: &c.description,
             config: match include_config {
@@ -238,6 +241,7 @@ impl<'a> Stream<'a> {
             .get(&id)
             .ok_or_else(|| format_err!("missing stream {}", id))?;
         Ok(Some(Stream {
+            id: s.id,
             retain_bytes: s.retain_bytes,
             min_start_time_90k: s.range.as_ref().map(|r| r.start),
             max_end_time_90k: s.range.as_ref().map(|r| r.end),