b0f83cfa34
Request-path thumbnail generation (REST get_thumbnail and NC preview) read the full source blob into RAM and decoded it with no concurrency bound — a first-view gallery of K images stacked K full-size buffers and K parallel decodes on the blocking pool. The background hook had the inverse ordering problem: it read the blob eagerly and only then queued on the decode semaphore, so N concurrent uploads held N originals in memory while waiting. All three paths now acquire the decode semaphore first and read the blob under the permit, capping peak RAM at permits x image size: - new ThumbnailService::get_thumbnail_from_blob defers the blob read into the moka init closure (cache and disk hits never touch the blob); both handlers use it and no longer pre-read. - get_thumbnail_from_bytes (direct-bytes variant) now also takes a permit before decoding; shared generate_and_persist core keeps the two entrypoints duplicate-free. - generate_all_sizes_background_from_blob (renamed from _from_bytes) checks blob existence and disk-dedup state, then acquires the permit, then reads; the redundant pre-read spawn wrapper in ThumbnailRefreshHook is gone. https://claude.ai/code/session_01QxwJDHqQhbMkHK333QtMme
194 lines
6.0 KiB
Rust
194 lines
6.0 KiB
Rust
//! Nextcloud-compatible preview/thumbnail endpoint.
|
|
//!
|
|
//! Maps Nextcloud preview requests to OxiCloud's thumbnail service.
|
|
|
|
use axum::{
|
|
body::Body,
|
|
extract::{Query, State},
|
|
http::{StatusCode, header},
|
|
response::{IntoResponse, Response},
|
|
};
|
|
use serde::Deserialize;
|
|
use std::sync::Arc;
|
|
|
|
use crate::application::ports::file_ports::FileRetrievalUseCase;
|
|
use crate::application::ports::storage_ports::FileReadPort;
|
|
use crate::application::ports::thumbnail_ports::{ThumbnailPort, ThumbnailSize};
|
|
use crate::common::di::AppState;
|
|
use crate::interfaces::middleware::auth::AuthUser;
|
|
|
|
#[derive(Debug, Deserialize)]
|
|
pub struct PreviewParams {
|
|
#[serde(rename = "fileId")]
|
|
file_id: String,
|
|
x: Option<u32>,
|
|
y: Option<u32>,
|
|
#[serde(rename = "forceIcon")]
|
|
force_icon: Option<u8>,
|
|
}
|
|
|
|
/// Handle Nextcloud preview requests.
|
|
///
|
|
/// Maps:
|
|
/// - `/index.php/core/preview?fileId=X` to thumbnail generation
|
|
/// - Size selection based on request dimensions and forceIcon param
|
|
pub async fn handle_preview(
|
|
State(state): State<Arc<AppState>>,
|
|
user: AuthUser,
|
|
Query(params): Query<PreviewParams>,
|
|
) -> impl IntoResponse {
|
|
// Parse the Nextcloud file ID — the NC app may append an instance suffix
|
|
// (e.g. "00000326ocnca"), so strip non-digit characters first.
|
|
let numeric_part: String = params
|
|
.file_id
|
|
.chars()
|
|
.take_while(|c| c.is_ascii_digit())
|
|
.collect();
|
|
let nc_file_id: i64 = match numeric_part.parse() {
|
|
Ok(id) => id,
|
|
Err(_) => {
|
|
return Response::builder()
|
|
.status(StatusCode::BAD_REQUEST)
|
|
.body(Body::from("Invalid file ID"))
|
|
.unwrap();
|
|
}
|
|
};
|
|
|
|
// Look up the OxiCloud file UUID from the Nextcloud ID
|
|
let object_id = match state.nextcloud.as_ref() {
|
|
Some(nc) => match nc.file_ids.get_oxicloud_id(nc_file_id).await {
|
|
Ok(id) => id,
|
|
Err(_) => {
|
|
return Response::builder()
|
|
.status(StatusCode::NOT_FOUND)
|
|
.body(Body::from("File not found"))
|
|
.unwrap();
|
|
}
|
|
},
|
|
None => {
|
|
return Response::builder()
|
|
.status(StatusCode::INTERNAL_SERVER_ERROR)
|
|
.body(Body::from("Nextcloud integration not configured"))
|
|
.unwrap();
|
|
}
|
|
};
|
|
|
|
// Get file details
|
|
let file = match state
|
|
.applications
|
|
.file_retrieval_service
|
|
.get_file(&object_id)
|
|
.await
|
|
{
|
|
Ok(file) => file,
|
|
Err(_) => {
|
|
return Response::builder()
|
|
.status(StatusCode::NOT_FOUND)
|
|
.body(Body::from("File not found"))
|
|
.unwrap();
|
|
}
|
|
};
|
|
|
|
// Verify the authenticated user owns this file
|
|
let user_id_str = user.id.to_string();
|
|
if file.owner_id.as_deref() != Some(user_id_str.as_str()) {
|
|
return Response::builder()
|
|
.status(StatusCode::NOT_FOUND)
|
|
.body(Body::from("File not found"))
|
|
.unwrap();
|
|
}
|
|
|
|
// Determine thumbnail size based on request params
|
|
let thumb_size = if params.force_icon == Some(1) {
|
|
ThumbnailSize::Icon
|
|
} else {
|
|
// Map requested dimensions to our thumbnail sizes
|
|
let max_dim = params.x.unwrap_or(400).max(params.y.unwrap_or(400));
|
|
if max_dim <= 150 {
|
|
ThumbnailSize::Icon
|
|
} else if max_dim <= 400 {
|
|
ThumbnailSize::Preview
|
|
} else {
|
|
ThumbnailSize::Large
|
|
}
|
|
};
|
|
|
|
// Check if file is an image
|
|
if !state
|
|
.core
|
|
.thumbnail_service
|
|
.is_supported_image(&file.mime_type)
|
|
{
|
|
return Response::builder()
|
|
.status(StatusCode::NOT_FOUND)
|
|
.body(Body::from("Preview not available for this file type"))
|
|
.unwrap();
|
|
}
|
|
|
|
// Resolve the blob hash (content-addressable storage)
|
|
let blob_hash = match state
|
|
.repositories
|
|
.file_read_repository
|
|
.get_blob_hash(&object_id)
|
|
.await
|
|
{
|
|
Ok(hash) => hash,
|
|
Err(_) => {
|
|
return Response::builder()
|
|
.status(StatusCode::NOT_FOUND)
|
|
.body(Body::from("File blob not found"))
|
|
.unwrap();
|
|
}
|
|
};
|
|
if let Some(data) = state
|
|
.core
|
|
.thumbnail_service
|
|
.get_cached_thumbnail(&object_id, Some(&blob_hash), thumb_size.into())
|
|
.await
|
|
{
|
|
let etag = format!("\"thumb-{}-{:?}\"", object_id, thumb_size);
|
|
return Response::builder()
|
|
.status(StatusCode::OK)
|
|
.header(header::CONTENT_TYPE, "image/jpeg")
|
|
.header(header::CONTENT_LENGTH, data.len())
|
|
.header(header::CACHE_CONTROL, "public, max-age=31536000, immutable")
|
|
.header(header::ETAG, etag)
|
|
.body(Body::from(data))
|
|
.unwrap();
|
|
}
|
|
|
|
// Generate/get thumbnail — the blob is read inside the service once a
|
|
// decode permit is held, so preview stampedes cannot stack source
|
|
// images in RAM.
|
|
match state
|
|
.core
|
|
.thumbnail_service
|
|
.get_thumbnail_from_blob(
|
|
&object_id,
|
|
&blob_hash,
|
|
thumb_size.into(),
|
|
state.core.dedup_service.clone(),
|
|
)
|
|
.await
|
|
{
|
|
Ok(data) => {
|
|
let etag = format!("\"thumb-{}-{:?}\"", object_id, thumb_size);
|
|
Response::builder()
|
|
.status(StatusCode::OK)
|
|
.header(header::CONTENT_TYPE, "image/jpeg")
|
|
.header(header::CONTENT_LENGTH, data.len())
|
|
.header(header::CACHE_CONTROL, "public, max-age=31536000, immutable")
|
|
.header(header::ETAG, etag)
|
|
.body(Body::from(data))
|
|
.unwrap()
|
|
}
|
|
Err(err) => {
|
|
tracing::error!("Thumbnail generation failed for {}: {}", object_id, err);
|
|
Response::builder()
|
|
.status(StatusCode::INTERNAL_SERVER_ERROR)
|
|
.body(Body::from("Failed to generate thumbnail"))
|
|
.unwrap()
|
|
}
|
|
}
|
|
}
|