feat(rendered): Support rendered resources

Cargo.toml

@@ -4,7 +4,11 @@ version = "0.3.0-beta.1"
 description = "A robust DICOMweb server with swappable backend"
 edition = "2021"
 rust-version = "1.74.0"
-categories = ["multimedia", "network-programming", "web-programming::http-server"]
+categories = [
+  "multimedia",
+  "network-programming",
+  "web-programming::http-server",
+]
 keywords = ["dicom", "dicomweb", "healthcare", "medical"]
 repository = "https://github.com/UMEssen/DICOM-RST"
 license = "MIT"
@@ -20,6 +24,7 @@ s3 = []
 # DICOM processing
 dicom = "0.8.0"
 dicom-json = "0.8.0"
+dicom-pixeldata = { version = "0.8.0", features = ["image"] }
 sentry = { version = "0.35.0", features = ["tracing"] }
 
 # Serialization

src/api/wado/routes.rs

@@ -1,4 +1,4 @@
-use crate::api::wado::RetrieveInstanceRequest;
+use crate::api::wado::{RenderedRequest, RetrieveInstanceRequest};
 use crate::backend::dimse::wado::DicomMultipartStream;
 use crate::backend::ServiceProvider;
 use crate::types::UI;
@@ -9,6 +9,7 @@ use axum::http::{Response, StatusCode};
 use axum::response::IntoResponse;
 use axum::routing::get;
 use axum::Router;
+use dicom_pixeldata::image::ImageFormat;
 use futures::{StreamExt, TryStreamExt};
 use std::pin::Pin;
 use tracing::{error, instrument};
@@ -96,6 +97,45 @@ async fn instance_resource(
 	}
 }
 
+async fn rendered_resource(
+	provider: ServiceProvider,
+	request: RenderedRequest,
+) -> impl IntoResponse {
+	if let Some(wado) = provider.wado {
+		let response = wado.render(request).await;
+
+		match response {
+			Ok(response) => {
+				let image = response.image;
+
+				// Write the image to a buffer (JPEG)
+				let mut img_buf = Vec::new();
+				if let Err(err) =
+					image.write_to(&mut std::io::Cursor::new(&mut img_buf), ImageFormat::Jpeg)
+				{
+					error!("{err:?}");
+					return (StatusCode::INTERNAL_SERVER_ERROR, err.to_string()).into_response();
+				}
+
+				Response::builder()
+					.header(CONTENT_TYPE, "image/jpeg")
+					.body(Body::from(img_buf))
+					.unwrap()
+			}
+			Err(err) => {
+				error!("{err:?}");
+				(StatusCode::INTERNAL_SERVER_ERROR, err.to_string()).into_response()
+			}
+		}
+	} else {
+		(
+			StatusCode::SERVICE_UNAVAILABLE,
+			"WADO-RS endpoint is disabled",
+		)
+			.into_response()
+	}
+}
+
 #[instrument(skip_all)]
 async fn study_instances(
 	provider: ServiceProvider,
@@ -132,20 +172,27 @@ async fn instance_metadata() -> impl IntoResponse {
 	StatusCode::NOT_IMPLEMENTED
 }
 
-async fn rendered_study() -> impl IntoResponse {
-	StatusCode::NOT_IMPLEMENTED
+#[instrument(skip_all)]
+async fn rendered_study(provider: ServiceProvider, request: RenderedRequest) -> impl IntoResponse {
+	rendered_resource(provider, request).await
 }
 
-async fn rendered_series() -> impl IntoResponse {
-	StatusCode::NOT_IMPLEMENTED
+#[instrument(skip_all)]
+async fn rendered_series(provider: ServiceProvider, request: RenderedRequest) -> impl IntoResponse {
+	rendered_resource(provider, request).await
 }
 
-async fn rendered_instance() -> impl IntoResponse {
-	StatusCode::NOT_IMPLEMENTED
+#[instrument(skip_all)]
+async fn rendered_instance(
+	provider: ServiceProvider,
+	request: RenderedRequest,
+) -> impl IntoResponse {
+	rendered_resource(provider, request).await
 }
 
-async fn rendered_frames() -> impl IntoResponse {
-	StatusCode::NOT_IMPLEMENTED
+#[instrument(skip_all)]
+async fn rendered_frames(provider: ServiceProvider, request: RenderedRequest) -> impl IntoResponse {
+	rendered_resource(provider, request).await
 }
 
 async fn study_thumbnail() -> impl IntoResponse {