Stream song (#164)

* Added crates and dependency features

* Added endpoint to stream songs

* Changed name of function

* Song stream endpoint is now available

* Endpoint is now working

* Added test

* Warning fixes

* Code formatting

* Added TODO for later

* Test fix

* Version bump

Cargo.lock

@@ -630,6 +630,16 @@ dependencies = [
  "hashbrown",
 ]
 
+[[package]]
+name = "hdrhistogram"
+version = "7.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "765c9198f173dd59ce26ff9f95ef0aafd0a0fe01fb9d72841bc5066a4c06511d"
+dependencies = [
+ "byteorder",
+ "num-traits",
+]
+
 [[package]]
 name = "heck"
 version = "0.5.0"
@@ -752,7 +762,7 @@ dependencies = [
 
 [[package]]
 name = "icarus"
-version = "0.1.94"
+version = "0.1.96"
 dependencies = [
  "axum",
  "common-multipart-rfc7578",
@@ -760,6 +770,7 @@ dependencies = [
  "icarus_envy",
  "icarus_meta",
  "icarus_models",
+ "mime_guess",
  "serde",
  "serde_json",
  "sqlx",
@@ -793,8 +804,8 @@ dependencies = [
 
 [[package]]
 name = "icarus_models"
-version = "0.4.5"
-source = "git+ssh://git@git.kundeng.us/phoenix/icarus_models.git?tag=v0.4.5-devel-655d05dabb-111#655d05dabbdadb9b28940564a1eb82470aa4f166"
+version = "0.5.1"
+source = "git+ssh://git@git.kundeng.us/phoenix/icarus_models.git?tag=v0.5.1-devel-1c5de9dc26-111#1c5de9dc26099ac5f21e1dc7a1f7d0dbb892b34b"
 dependencies = [
  "rand 0.9.1",
  "serde",
@@ -2125,9 +2136,13 @@ checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9"
 dependencies = [
  "futures-core",
  "futures-util",
+ "hdrhistogram",
+ "indexmap",
  "pin-project-lite",
+ "slab",
  "sync_wrapper",
  "tokio",
+ "tokio-util",
  "tower-layer",
  "tower-service",
  "tracing",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "icarus"
-version = "0.1.94"
+version = "0.1.96"
 edition = "2024"
 rust-version = "1.88"
 
@@ -8,17 +8,18 @@ rust-version = "1.88"
 axum = { version = "0.8.4", features = ["multipart"] }
 serde = { version = "1.0.219", features = ["derive"] }
 serde_json = { version = "1.0.140" }
-tower = { version = "0.5.2" }
+tower = { version = "0.5.2", features = ["full"] }
 tokio = { version = "1.45.1", features = ["full"] }
-tokio-util = { version = "0.7.15" }
+tokio-util = { version = "0.7.15", features = ["io"] }
 tower-http = { version = "0.6.6", features = ["timeout"] }
 tracing-subscriber = "0.3.19"
 futures = { version = "0.3.31" }
+mime_guess = { version = "2.0.5" }
 uuid = { version = "1.17.0", features = ["v4", "serde"] }
 sqlx = { version = "0.8.6", features = ["postgres", "runtime-tokio-native-tls", "time", "uuid"] }
 time = { version = "0.3.41", features = ["formatting", "macros", "parsing", "serde"]  }
 icarus_meta = { git = "ssh://git@git.kundeng.us/phoenix/icarus_meta.git", tag = "v0.3.0-devel-f4b71de969-680" }
-icarus_models = { git = "ssh://git@git.kundeng.us/phoenix/icarus_models.git", tag = "v0.4.5-devel-655d05dabb-111" }
+icarus_models = { git = "ssh://git@git.kundeng.us/phoenix/icarus_models.git", tag = "v0.5.1-devel-1c5de9dc26-111" }
 icarus_envy = { git = "ssh://git@git.kundeng.us/phoenix/icarus_envy.git", tag = "v0.3.0-devel-d73fba9899-006" }
 
 [dev-dependencies]

src/callers/coverart.rs

@@ -45,6 +45,13 @@ pub mod request {
             pub coverart_queue_id: uuid::Uuid,
         }
     }
+
+    pub mod get_coverart {
+        #[derive(Debug, serde::Deserialize, serde::Serialize)]
+        pub struct Params {
+            pub id: Option<uuid::Uuid>,
+        }
+    }
 }
 
 pub mod response {
@@ -99,6 +106,14 @@ pub mod response {
             pub data: Vec<uuid::Uuid>,
         }
     }
+
+    pub mod get_coverart {
+        #[derive(Debug, Default, serde::Deserialize, serde::Serialize)]
+        pub struct Response {
+            pub message: String,
+            pub data: Vec<icarus_models::coverart::CoverArt>,
+        }
+    }
 }
 
 pub mod db {
@@ -321,6 +336,46 @@ pub mod cov_db {
             Err(_err) => Err(sqlx::Error::RowNotFound),
         }
     }
+
+    pub async fn get_coverart(
+        pool: &sqlx::PgPool,
+        id: &uuid::Uuid,
+    ) -> Result<icarus_models::coverart::CoverArt, sqlx::Error> {
+        let result = sqlx::query(
+            r#"
+            SELECT id, title, path, song_id FROM "coverart" WHERE id = $1;
+            "#,
+        )
+        .bind(id)
+        .fetch_one(pool)
+        .await
+        .map_err(|e| {
+            eprintln!("Error querying data: {e:?}");
+        });
+
+        match result {
+            Ok(row) => Ok(icarus_models::coverart::CoverArt {
+                id: row
+                    .try_get("id")
+                    .map_err(|_e| sqlx::Error::RowNotFound)
+                    .unwrap(),
+                title: row
+                    .try_get("title")
+                    .map_err(|_e| sqlx::Error::RowNotFound)
+                    .unwrap(),
+                path: row
+                    .try_get("path")
+                    .map_err(|_e| sqlx::Error::RowNotFound)
+                    .unwrap(),
+                data: Vec::new(),
+                song_id: row
+                    .try_get("song_id")
+                    .map_err(|_e| sqlx::Error::RowNotFound)
+                    .unwrap(),
+            }),
+            Err(_) => Err(sqlx::Error::RowNotFound),
+        }
+    }
 }
 
 pub mod endpoint {
@@ -507,7 +562,10 @@ pub mod endpoint {
 
                         match super::cov_db::create(&pool, &coverart, &song.id).await {
                             Ok(id) => {
+                                // TODO: Populate song_id
                                 coverart.id = id;
+                                println!("Cover Art created");
+
                                 response.message = String::from("Successful");
                                 response.data.push(coverart);
 
@@ -560,4 +618,32 @@ pub mod endpoint {
             }
         }
     }
+
+    pub async fn get_coverart(
+        axum::Extension(pool): axum::Extension<sqlx::PgPool>,
+        axum::extract::Query(params): axum::extract::Query<super::request::get_coverart::Params>,
+    ) -> (
+        axum::http::StatusCode,
+        axum::Json<super::response::get_coverart::Response>,
+    ) {
+        let mut response = super::response::get_coverart::Response::default();
+
+        match params.id {
+            Some(id) => match super::cov_db::get_coverart(&pool, &id).await {
+                Ok(coverart) => {
+                    response.data.push(coverart);
+                    response.message = String::from(super::super::response::SUCCESSFUL);
+                    (axum::http::StatusCode::OK, axum::Json(response))
+                }
+                Err(err) => {
+                    response.message = err.to_string();
+                    (axum::http::StatusCode::BAD_REQUEST, axum::Json(response))
+                }
+            },
+            None => {
+                response.message = String::from("Invalid parameters");
+                (axum::http::StatusCode::BAD_REQUEST, axum::Json(response))
+            }
+        }
+    }
 }

src/callers/mod.rs

@@ -17,7 +17,9 @@ pub mod endpoints {
 
     pub const CREATESONG: &str = "/api/v2/song";
     pub const GETSONGS: &str = "/api/v2/song";
+    pub const STREAMSONG: &str = "/api/v2/song/stream/{id}";
     pub const CREATECOVERART: &str = "/api/v2/coverart";
+    pub const GETCOVERART: &str = "/api/v2/coverart";
 }
 
 pub mod response {

src/callers/song.rs

@@ -745,6 +745,7 @@ pub mod endpoint {
         }
     }
 
+    // TODO: Rename
     pub async fn download_flac(
         axum::Extension(pool): axum::Extension<sqlx::PgPool>,
         axum::extract::Path(id): axum::extract::Path<uuid::Uuid>,
@@ -1011,4 +1012,51 @@ pub mod endpoint {
             }
         }
     }
+
+    pub async fn stream_song(
+        axum::Extension(pool): axum::Extension<sqlx::PgPool>,
+        axum::extract::Path(id): axum::extract::Path<uuid::Uuid>,
+    ) -> impl IntoResponse {
+        match super::song_db::get_song(&pool, &id).await {
+            Ok(song) => {
+                let song_path = song.song_path().unwrap();
+                let path = std::path::Path::new(&song_path);
+
+                if !path.starts_with(&song.directory) || !path.exists() {
+                    return Err((axum::http::StatusCode::NOT_FOUND, "File not found"));
+                }
+
+                let file = match tokio::fs::File::open(&path).await {
+                    Ok(file) => file,
+                    Err(_) => return Err((axum::http::StatusCode::NOT_FOUND, "File not found")),
+                };
+
+                let file_size = match file.metadata().await {
+                    Ok(meta) => meta.len(),
+                    Err(_) => {
+                        return Err((
+                            axum::http::StatusCode::INTERNAL_SERVER_ERROR,
+                            "Could not read file",
+                        ));
+                    }
+                };
+
+                let mime = mime_guess::from_path(path).first_or_octet_stream();
+                let stream = tokio_util::io::ReaderStream::new(file);
+
+                let rep = axum::response::Response::builder()
+                    .header("content-type", mime.to_string())
+                    .header("accept-ranges", "bytes")
+                    .header("content-length", file_size.to_string())
+                    .body(axum::body::Body::from_stream(stream))
+                    .unwrap();
+
+                Ok(rep)
+            }
+            Err(_err) => Err((
+                axum::http::StatusCode::INTERNAL_SERVER_ERROR,
+                "Could not find file",
+            )),
+        }
+    }
 }

src/main.rs

@@ -119,6 +119,14 @@ pub mod init {
                 crate::callers::endpoints::GETSONGS,
                 get(crate::callers::song::endpoint::get_songs),
             )
+            .route(
+                crate::callers::endpoints::GETCOVERART,
+                get(crate::callers::coverart::endpoint::get_coverart),
+            )
+            .route(
+                crate::callers::endpoints::STREAMSONG,
+                get(crate::callers::song::endpoint::stream_song),
+            )
     }
 
     pub async fn app() -> axum::Router {
@@ -1815,6 +1823,7 @@ mod tests {
     }
 
     pub mod after_song_queue {
+        use futures::StreamExt;
         use tower::ServiceExt;
 
         #[tokio::test]
@@ -1836,15 +1845,7 @@ mod tests {
 
             let app = super::init::app(pool).await;
 
-            let mut id = uuid::Uuid::nil();
-            match uuid::Uuid::parse_str("44cf7940-34ff-489f-9124-d0ec90a55af9") {
-                Ok(val) => {
-                    id = val;
-                }
-                Err(err) => {
-                    assert!(false, "Error: {err:?}");
-                }
-            };
+            let id = test_data::song_id().await.unwrap();
 
             let uri = format!("{}?id={id}", crate::callers::endpoints::GETSONGS);
 
@@ -1877,5 +1878,124 @@ mod tests {
 
             let _ = super::db_mgr::drop_database(&tm_pool, &db_name).await;
         }
+
+        #[tokio::test]
+        async fn test_get_coverart() {
+            let tm_pool = super::db_mgr::get_pool().await.unwrap();
+            let db_name = super::db_mgr::generate_db_name().await;
+
+            match super::db_mgr::create_database(&tm_pool, &db_name).await {
+                Ok(_) => {
+                    println!("Success");
+                }
+                Err(err) => {
+                    assert!(false, "Error: {:?}", err);
+                }
+            }
+
+            let pool = super::db_mgr::connect_to_db(&db_name).await.unwrap();
+            super::db_mgr::migrations(&pool).await;
+
+            let app = super::init::app(pool).await;
+
+            let id = test_data::coverart_id().await.unwrap();
+
+            let uri = format!("{}?id={id}", crate::callers::endpoints::GETCOVERART);
+
+            match app
+                .clone()
+                .oneshot(
+                    axum::http::Request::builder()
+                        .method(axum::http::Method::GET)
+                        .uri(uri)
+                        .header(axum::http::header::CONTENT_TYPE, "application/json")
+                        .body(axum::body::Body::empty())
+                        .unwrap(),
+                )
+                .await
+            {
+                Ok(response) => {
+                    let resp = super::get_resp_data::<
+                        crate::callers::coverart::response::get_coverart::Response,
+                    >(response)
+                    .await;
+                    assert_eq!(false, resp.data.is_empty(), "Should not be empty");
+
+                    let coverart = resp.data[0].clone();
+                    assert_eq!(id, coverart.id, "Id does not match {coverart:?}");
+                }
+                Err(err) => {
+                    assert!(false, "Error: {err:?}");
+                }
+            }
+
+            let _ = super::db_mgr::drop_database(&tm_pool, &db_name).await;
+        }
+
+        pub mod test_data {
+            pub async fn song_id() -> Result<uuid::Uuid, uuid::Error> {
+                uuid::Uuid::parse_str("44cf7940-34ff-489f-9124-d0ec90a55af9")
+            }
+
+            pub async fn coverart_id() -> Result<uuid::Uuid, uuid::Error> {
+                uuid::Uuid::parse_str("996122cd-5ae9-4013-9934-60768d3006ed")
+            }
+        }
+
+        #[tokio::test]
+        async fn test_stream_song() {
+            let tm_pool = super::db_mgr::get_pool().await.unwrap();
+            let db_name = super::db_mgr::generate_db_name().await;
+
+            match super::db_mgr::create_database(&tm_pool, &db_name).await {
+                Ok(_) => {
+                    println!("Success");
+                }
+                Err(err) => {
+                    assert!(false, "Error: {:?}", err);
+                }
+            }
+
+            let pool = super::db_mgr::connect_to_db(&db_name).await.unwrap();
+            super::db_mgr::migrations(&pool).await;
+
+            let app = super::init::app(pool).await;
+
+            let id = test_data::song_id().await.unwrap();
+
+            let my_url = crate::callers::endpoints::STREAMSONG;
+            let last = my_url.len() - 5;
+            let uri = format!("{}/{id}", &my_url[0..last]);
+
+            match app
+                .clone()
+                .oneshot(
+                    axum::http::Request::builder()
+                        .method(axum::http::Method::GET)
+                        .uri(&uri)
+                        .body(axum::body::Body::empty())
+                        .unwrap(),
+                )
+                .await
+            {
+                Ok(response) => {
+                    let e = response.into_body();
+                    let mut data = e.into_data_stream();
+                    while let Some(chunk) = data.next().await {
+                        match chunk {
+                            Ok(_data) => {}
+                            Err(err) => {
+                                assert!(false, "Error: {err:?}");
+                            }
+                        }
+                    }
+                }
+                Err(err) => {
+                    assert!(false, "Error: {err:?}");
+                }
+            }
+
+            let _ = super::db_mgr::drop_database(&tm_pool, &db_name).await;
+        }
     }
 }

test_migrations/20250725213944_init.sql

@@ -56,7 +56,3 @@ CREATE TABLE IF NOT EXISTS "coverart" (
     path TEXT NOT NULL,
     song_id UUID NOT NULL
 );
-
--- Might not to disable constraints on fields
--- INSERT INTO "song" (id, title, artist, album_artist, album, genre, year, track, disc, track_count, disc_count, duration, audio_type, date_created, filename, directory, user_id) VALUES('44cf7940-34ff-489f-9124-d0ec90a55af9', 'Hypocrite Like The Rest', 'Kuoth', 'Kuoth', 'I', 'Alternative Hip-Hop', 2020, 1, 1, 9, 1, 139, 'flac', '2020-01-01 13:00:00-05', 'track01.flac', 'tests/I', '47491f9b-725a-4ba4-b9a5-711e1be46670');
--- Re-enable the constraints on the fields