7626dc95c1
Benchmark-gated (equivalence + BEFORE/AFTER; results + reproduce commands in
benches/ROUND7.md):
- Photos timeline re-grouped + re-laid-out the whole accumulated library on
every 60-item page (both `groups` and `photoRows` were $derived over the
full list), Σ ≈ O(N²/60) main-thread work during a scroll. Pages arrive
newest-first so grouping is append-only: the new PhotoTimeline
(lib/utils/photoTimeline.ts) re-buckets only the fresh page and re-lays-out
only changed groups, reusing untouched groups' cached rows, falling back to
a full rebuild on any config/deletion/non-append change. The pure
buildPhotoRows is the verbatim reference the gate holds it equal to at every
page. 50×60 drain: 76 500 → 3 000 grouping ops (25.5x), 23.0 → 2.2 ms
(10.6x).
- Range downloads paid authz + access-notify twice: download_file_impl
resolves the file via get_file_with_perms, then the Range branch re-ran
require_file + notify_file_accessed per request. Media/PDF viewers fetch
exclusively via Range (one request per seek), so every seek in a scrub
re-authorized an already-cleared file. Now routed through the non-perms
get_file_range_preloaded (matching the share-landing + WebDAV range paths);
the unused _with_perms range method is removed. The request-level gate still
denies before the branch runs (bench asserts member granted, outsider
denied). Per seek removed: WARM 0.67 µs, COLD 1362.66 µs — a grant-cascade
drive-resolve query per seek for a shared-drive recipient on a cold cache.
- /api/folders/{id}/resources row→DTO mapping cloned row.name into the DTO
though the row is owned; folders move it (fixed icons), files compute the
name-derived icon/category classes first then move it. 500-row page:
10.004 → 9.004 allocs/row (500 clones removed), output identical.
Deferred with rationale in ROUND7.md: thumbnail ACL-before-304 (security
posture — needs a security review, not a perf tweak), batch_operations
Arc<str>→String widening, list-view O(N²) on smaller lists, and the serial→
join! pairs (decide-by-bench with injected latency, per the round-6 rejection).
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_017aJu9ghvuT8WqC31ZEGTBA
539 lines
22 KiB
Rust
539 lines
22 KiB
Rust
use bytes::{Bytes, BytesMut};
|
||
use futures::{Stream, StreamExt};
|
||
use std::pin::Pin;
|
||
use std::sync::Arc;
|
||
|
||
use crate::application::dtos::file_dto::FileDto;
|
||
use crate::application::ports::authorization_ports::AuthorizationEngine;
|
||
use crate::application::ports::file_ports::{
|
||
FileRetrievalUseCase, OptimizedFileContent, RangeContent,
|
||
};
|
||
use crate::application::ports::resource_access_hook::ResourceAccessHook;
|
||
use crate::application::ports::storage_ports::FileReadPort;
|
||
use crate::common::errors::DomainError;
|
||
use crate::domain::services::authorization::{Permission, Resource, Subject};
|
||
use crate::infrastructure::repositories::pg::file_blob_read_repository::FileBlobReadRepository;
|
||
use crate::infrastructure::services::file_content_cache::FileContentCache;
|
||
use crate::infrastructure::services::image_transcode_service::{
|
||
ImageTranscodeService, OutputFormat,
|
||
};
|
||
use crate::infrastructure::services::pg_acl_engine::PgAclEngine;
|
||
use tracing::{debug, info};
|
||
use uuid::Uuid;
|
||
|
||
/// Threshold below which files are served from RAM cache (10 MB).
|
||
const CACHE_THRESHOLD: u64 = 10 * 1024 * 1024;
|
||
|
||
/// Service for file retrieval operations
|
||
///
|
||
/// Implements a multi-tier download strategy:
|
||
/// - Tier 0: Write-behind cache (just-uploaded files still in RAM)
|
||
/// - Tier 1: Hot cache + optional WebP transcoding (<10 MB)
|
||
/// - Tier 2: Streaming for everything ≥10 MB — CDC chunk reassembly with the
|
||
/// backend's read-ahead (`read_prefetch`); no whole-file buffering.
|
||
pub struct FileRetrievalService {
|
||
file_read: Arc<FileBlobReadRepository>,
|
||
content_cache: Option<Arc<FileContentCache>>,
|
||
transcode: Option<Arc<ImageTranscodeService>>,
|
||
authz: Option<Arc<PgAclEngine>>,
|
||
/// Optional read-event observer. Currently fans out to the Recent-list
|
||
/// recorder; future observers (audit trail, "last seen by", …) attach
|
||
/// to the same hook so service code only knows the trait, not the impl.
|
||
/// `None` for the test/stub path that constructs via [`Self::new`].
|
||
resource_access_hook: Option<Arc<dyn ResourceAccessHook>>,
|
||
}
|
||
|
||
impl FileRetrievalService {
|
||
/// Backward-compatible constructor (simple pass-through). Without the
|
||
/// authorization engine, the `*_owned`/`*_with_perms` methods fail closed.
|
||
/// Use `new_with_cache` in production.
|
||
pub fn new(file_repository: Arc<FileBlobReadRepository>) -> Self {
|
||
Self {
|
||
file_read: file_repository,
|
||
content_cache: None,
|
||
transcode: None,
|
||
authz: None,
|
||
resource_access_hook: None,
|
||
}
|
||
}
|
||
|
||
/// Constructor for blob-storage model: read + content cache + transcode +
|
||
/// ReBAC authorization.
|
||
pub fn new_with_cache(
|
||
file_read: Arc<FileBlobReadRepository>,
|
||
content_cache: Arc<FileContentCache>,
|
||
transcode: Arc<ImageTranscodeService>,
|
||
authz: Arc<PgAclEngine>,
|
||
) -> Self {
|
||
Self {
|
||
file_read,
|
||
content_cache: Some(content_cache),
|
||
transcode: Some(transcode),
|
||
authz: Some(authz),
|
||
resource_access_hook: None,
|
||
}
|
||
}
|
||
|
||
/// Builder: attach a [`ResourceAccessHook`] that fires after every
|
||
/// authorised `_with_perms` read. Without it the service is silent —
|
||
/// existing behaviour for stub / test paths.
|
||
pub fn with_resource_access_hook(mut self, hook: Arc<dyn ResourceAccessHook>) -> Self {
|
||
self.resource_access_hook = Some(hook);
|
||
self
|
||
}
|
||
|
||
/// Fire the access hook if registered. Called from every `_with_perms`
|
||
/// read after the authZ + lookup has succeeded (never on failure
|
||
/// paths — denied reads must not surface in Recent).
|
||
///
|
||
/// `pub` because the WebDAV / NextCloud DAV handlers resolve files
|
||
/// by path and authorise via that resolver, not via the
|
||
/// `*_with_perms` service methods — they then serve content through
|
||
/// the no-perms `get_file_stream` / `get_file_range_stream`. Those
|
||
/// handlers must call this directly after their own authZ has
|
||
/// passed so cross-protocol downloads (NC desktop, davx5, native
|
||
/// `/webdav/`) also surface in Recent.
|
||
pub fn notify_file_accessed(&self, caller_id: Uuid, file_id: &str) {
|
||
if let Some(hook) = &self.resource_access_hook {
|
||
hook.on_file_accessed(caller_id, file_id);
|
||
}
|
||
}
|
||
|
||
// ── private helpers ──────────────────────────────────────────
|
||
|
||
/// Read a file's full content through the streaming API into a single
|
||
/// `Bytes` buffer. Working memory stays at one chunk while reading; the
|
||
/// returned buffer holds the whole (sub-threshold) file.
|
||
async fn read_full(
|
||
file_read: &FileBlobReadRepository,
|
||
id: &str,
|
||
capacity: usize,
|
||
) -> Result<Bytes, DomainError> {
|
||
let stream = file_read.get_file_stream(id).await?;
|
||
let mut stream = Pin::from(stream);
|
||
let mut buf = BytesMut::with_capacity(capacity);
|
||
while let Some(chunk) = stream.next().await {
|
||
buf.extend_from_slice(&chunk.map_err(|e| {
|
||
DomainError::internal_error("File", format!("Stream read error: {}", e))
|
||
})?);
|
||
}
|
||
Ok(buf.freeze())
|
||
}
|
||
|
||
/// Helper: require the caller has `perm` on the given file id.
|
||
/// Fail-closed if no engine was injected (stub/test path).
|
||
async fn require_file(
|
||
&self,
|
||
file_id: &str,
|
||
perm: Permission,
|
||
caller_id: Uuid,
|
||
) -> Result<(), DomainError> {
|
||
let authz = self.authz.as_ref().ok_or_else(|| {
|
||
DomainError::internal_error("FileRetrieval", "Authorization engine unavailable")
|
||
})?;
|
||
let uuid = Uuid::parse_str(file_id).map_err(|_| DomainError::not_found("File", file_id))?;
|
||
authz
|
||
.require(Subject::User(caller_id), perm, Resource::File(uuid))
|
||
.await
|
||
}
|
||
|
||
/// Engine check for a target folder. `None` is allowed (root namespace,
|
||
/// implicitly owned by the caller).
|
||
async fn require_target_folder_perm(
|
||
&self,
|
||
folder_id: Option<&str>,
|
||
perm: Permission,
|
||
caller_id: Uuid,
|
||
) -> Result<(), DomainError> {
|
||
let Some(target) = folder_id else {
|
||
return Ok(());
|
||
};
|
||
let authz = self.authz.as_ref().ok_or_else(|| {
|
||
DomainError::internal_error("FileRetrieval", "Authorization engine unavailable")
|
||
})?;
|
||
let uuid = Uuid::parse_str(target).map_err(|_| DomainError::not_found("Folder", target))?;
|
||
authz
|
||
.require(Subject::User(caller_id), perm, Resource::Folder(uuid))
|
||
.await
|
||
}
|
||
|
||
/// Try to transcode image content to WebP and return transcoded variant.
|
||
async fn try_transcode(
|
||
&self,
|
||
id: &str,
|
||
content: &Bytes,
|
||
mime: &str,
|
||
file_size: u64,
|
||
accept_webp: bool,
|
||
) -> Option<(Bytes, Arc<str>)> {
|
||
if !accept_webp {
|
||
return None;
|
||
}
|
||
let transcode = self.transcode.as_ref()?;
|
||
if !ImageTranscodeService::should_transcode(mime, file_size) {
|
||
return None;
|
||
}
|
||
let format = OutputFormat::WebP;
|
||
match transcode
|
||
.get_transcoded(id, content.clone(), mime, format)
|
||
.await
|
||
{
|
||
Ok((transcoded, webp_mime, true)) => {
|
||
debug!(
|
||
"🖼️ WebP transcode: {} -> {} bytes ({:.0}% smaller)",
|
||
content.len(),
|
||
transcoded.len(),
|
||
(1.0 - transcoded.len() as f64 / content.len().max(1) as f64) * 100.0
|
||
);
|
||
Some((transcoded, Arc::from(&*webp_mime)))
|
||
}
|
||
_ => None,
|
||
}
|
||
}
|
||
|
||
/// Core multi-tier download logic shared by `get_file_optimized` and
|
||
/// `get_file_optimized_preloaded`.
|
||
async fn optimized_inner(
|
||
&self,
|
||
id: &str,
|
||
dto: FileDto,
|
||
accept_webp: bool,
|
||
prefer_original: bool,
|
||
) -> Result<(FileDto, OptimizedFileContent), DomainError> {
|
||
let mime_type = dto.mime_type.clone();
|
||
let file_size = dto.size;
|
||
let file_name = dto.name.clone();
|
||
// The content cache is content-addressed: keyed by the blob hash, not
|
||
// the file id. Identical content deduplicated to one blob on disk is
|
||
// then cached ONCE in RAM and shared by every file/user that references
|
||
// it — the cache benefits from dedup, not just the disk. Immutable by
|
||
// construction, so entries never go stale (no invalidation needed). A
|
||
// stub DTO without a hash disables caching for that request rather than
|
||
// colliding every hash-less file on the key "".
|
||
let cache_key = dto.content_hash.clone();
|
||
let cacheable = !cache_key.is_empty();
|
||
let do_transcode = accept_webp && !prefer_original;
|
||
|
||
// ── Tier 1: Hot cache + transcode (<10 MB) ──────────
|
||
if file_size < CACHE_THRESHOLD {
|
||
// Fetch the raw blob bytes. When cacheable, `get_or_load` serves
|
||
// from the content cache on a hit and, on a miss, coalesces every
|
||
// concurrent request for the same blob hash into a SINGLE disk read
|
||
// (single-flight) — no thundering herd under load. Hash-less stub
|
||
// DTOs are uncacheable and stream straight from disk.
|
||
let content_bytes = if cacheable && let Some(cache) = &self.content_cache {
|
||
let etag: Arc<str> = format!("\"{}\"", cache_key).into();
|
||
let ct: Arc<str> = mime_type.clone();
|
||
let file_read = Arc::clone(&self.file_read);
|
||
let id_owned = id.to_string();
|
||
let cap = file_size as usize;
|
||
let (bytes, _etag, _ct) = cache
|
||
.get_or_load(cache_key.clone(), etag, ct, async move {
|
||
debug!("💾 TIER 1 Cache MISS: {} – loading from disk", id_owned);
|
||
Self::read_full(&file_read, &id_owned, cap).await
|
||
})
|
||
.await?;
|
||
bytes
|
||
} else {
|
||
debug!(
|
||
"💾 TIER 1 (uncacheable): {} – streaming from disk",
|
||
file_name
|
||
);
|
||
Self::read_full(&self.file_read, id, file_size as usize).await?
|
||
};
|
||
|
||
if do_transcode
|
||
&& let Some((t, m)) = self
|
||
.try_transcode(id, &content_bytes, &mime_type, file_size, true)
|
||
.await
|
||
{
|
||
return Ok((
|
||
dto,
|
||
OptimizedFileContent::Bytes {
|
||
data: t,
|
||
mime_type: m,
|
||
was_transcoded: true,
|
||
},
|
||
));
|
||
}
|
||
return Ok((
|
||
dto,
|
||
OptimizedFileContent::Bytes {
|
||
data: content_bytes,
|
||
mime_type: mime_type.clone(),
|
||
was_transcoded: false,
|
||
},
|
||
));
|
||
}
|
||
|
||
// ── Tier 2 + 3: Streaming (≥10 MB) ──────────────────
|
||
info!(
|
||
"📡 TIER 2 STREAMING: {} ({} MB)",
|
||
file_name,
|
||
file_size / (1024 * 1024)
|
||
);
|
||
let stream = self.file_read.get_file_stream(id).await?;
|
||
Ok((dto, OptimizedFileContent::Stream(Box::into_pin(stream))))
|
||
}
|
||
|
||
/// Batch counterpart of [`FileRetrievalUseCase::get_file`]: resolve many
|
||
/// file ids in ONE query instead of one per id. Like `get_file` it
|
||
/// performs no per-file authorization — both current callers (ACL grant
|
||
/// listing, NextCloud favorites REPORT) resolve ids already vetted by the
|
||
/// authorization engine or the favorites table. Missing or trashed ids are
|
||
/// absent from the result; callers re-associate by `id`.
|
||
pub async fn get_files_by_ids(&self, ids: &[String]) -> Result<Vec<FileDto>, DomainError> {
|
||
let files = self.file_read.get_files_by_ids(ids).await?;
|
||
Ok(files.into_iter().map(FileDto::from).collect())
|
||
}
|
||
|
||
/// Range read for HTTP Range Requests, cache-aware.
|
||
///
|
||
/// Media players and PDF viewers fetch these files *exclusively* through
|
||
/// Range requests (a `bytes=0-` probe, then seeks) — the plain streaming
|
||
/// path paid 1 PG round-trip (blob-hash resolve) + a chunk open/seek for
|
||
/// EVERY seek, even when the whole blob was already sitting in the moka
|
||
/// content cache as one contiguous `Bytes`. For sub-`CACHE_THRESHOLD`
|
||
/// files this now answers from the cache: `Bytes::slice` is a refcount
|
||
/// bump — zero copy, zero I/O, zero PG (benches/RANGE-CACHE.md). A miss
|
||
/// populates the cache via the same single-flight `get_or_load` Tier 1
|
||
/// uses, so one probe warms every subsequent seek. `end` is exclusive
|
||
/// (callers pass `Some(last_byte + 1)`), matching the streaming variant.
|
||
pub async fn get_file_range_preloaded(
|
||
&self,
|
||
dto: &FileDto,
|
||
start: u64,
|
||
end: Option<u64>,
|
||
) -> Result<RangeContent, DomainError> {
|
||
let cacheable = dto.size < CACHE_THRESHOLD && !dto.content_hash.is_empty();
|
||
if cacheable && let Some(cache) = &self.content_cache {
|
||
let etag: Arc<str> = format!("\"{}\"", dto.content_hash).into();
|
||
let ct: Arc<str> = dto.mime_type.clone();
|
||
let file_read = Arc::clone(&self.file_read);
|
||
let id_owned = dto.id.clone();
|
||
let cap = dto.size as usize;
|
||
let (bytes, _etag, _ct) = cache
|
||
.get_or_load(dto.content_hash.to_string(), etag, ct, async move {
|
||
debug!("💾 Range cache MISS: {} – loading from disk", id_owned);
|
||
Self::read_full(&file_read, &id_owned, cap).await
|
||
})
|
||
.await?;
|
||
let len = bytes.len() as u64;
|
||
let s = start.min(len) as usize;
|
||
let e = end.unwrap_or(len).min(len) as usize;
|
||
if s <= e {
|
||
return Ok(RangeContent::Bytes(bytes.slice(s..e)));
|
||
}
|
||
// Degenerate range the validator should have rejected — fall
|
||
// through to the streaming path rather than panic on slice.
|
||
}
|
||
let stream = self
|
||
.file_read
|
||
.get_file_range_stream(&dto.id, start, end)
|
||
.await?;
|
||
Ok(RangeContent::Stream(stream))
|
||
}
|
||
}
|
||
|
||
impl FileRetrievalUseCase for FileRetrievalService {
|
||
async fn get_file(&self, id: &str) -> Result<FileDto, DomainError> {
|
||
let file = self.file_read.get_file(id).await?;
|
||
Ok(FileDto::from(file))
|
||
}
|
||
|
||
async fn get_file_with_perms(&self, id: &str, caller_id: Uuid) -> Result<FileDto, DomainError> {
|
||
self.require_file(id, Permission::Read, caller_id).await?;
|
||
let file = self.file_read.get_file(id).await?;
|
||
// After authZ + lookup succeed: this caller has just inspected the
|
||
// file. Recent listing observes via the hook. The throttle in the
|
||
// recording impl coalesces repeat metadata fetches against the same
|
||
// file (file viewer poll, browse-then-download pattern).
|
||
self.notify_file_accessed(caller_id, id);
|
||
Ok(FileDto::from(file))
|
||
}
|
||
|
||
async fn get_file_or_trashed_with_perms(
|
||
&self,
|
||
id: &str,
|
||
caller_id: Uuid,
|
||
) -> Result<FileDto, DomainError> {
|
||
self.require_file(id, Permission::Read, caller_id).await?;
|
||
let file = self.file_read.get_file_or_trashed(id).await?;
|
||
Ok(FileDto::from(file))
|
||
}
|
||
|
||
// FIXME no authorisation at all
|
||
async fn get_file_by_path(&self, path: &str, drive_id: Uuid) -> Result<FileDto, DomainError> {
|
||
// Direct SQL lookup — O(folder_depth) queries instead of O(total_files)
|
||
// NOTE: This method does NOT perform any authorization check. Callers
|
||
// that surface its result to a user-driven request MUST resolve the
|
||
// file via get_file_owned afterwards, or call authz.require directly.
|
||
// (Tracked in the audit punch-list under "path-based lookups".)
|
||
// `drive_id` scope axis prevents cross-drive resolution — without
|
||
// it, `find_file_by_path` would return a non-deterministic row
|
||
// when the same path exists in multiple drives.
|
||
if let Some(file) = self.file_read.find_file_by_path(path, drive_id).await? {
|
||
return Ok(FileDto::from(file));
|
||
}
|
||
|
||
Err(DomainError::not_found(
|
||
"File",
|
||
format!("not found at path: {}", path),
|
||
))
|
||
}
|
||
|
||
async fn list_files(&self, folder_id: Option<&str>) -> Result<Vec<FileDto>, DomainError> {
|
||
let files = self.file_read.list_files(folder_id).await?;
|
||
Ok(files.into_iter().map(FileDto::from).collect())
|
||
}
|
||
|
||
async fn list_files_with_perms(
|
||
&self,
|
||
folder_id: Option<&str>,
|
||
owner_id: Uuid,
|
||
) -> Result<Vec<FileDto>, DomainError> {
|
||
// Files always have a `folder_id` in the D0+ model — there is no
|
||
// longer any concept of "root-level files". A `None` from the
|
||
// caller means the query string was missing `folder_id`; reject
|
||
// with a clear error rather than returning an empty set from a
|
||
// meaningless root-level query.
|
||
if folder_id.is_none() {
|
||
return Err(DomainError::validation_error("folder_id is required"));
|
||
}
|
||
self.require_target_folder_perm(folder_id, Permission::Read, owner_id)
|
||
.await?;
|
||
self.list_files(folder_id).await
|
||
}
|
||
|
||
async fn get_file_stream(
|
||
&self,
|
||
id: &str,
|
||
) -> Result<Box<dyn Stream<Item = Result<Bytes, std::io::Error>> + Send>, DomainError> {
|
||
self.file_read.get_file_stream(id).await
|
||
}
|
||
|
||
async fn get_file_stream_with_perms(
|
||
&self,
|
||
id: &str,
|
||
caller_id: Uuid,
|
||
) -> Result<Box<dyn Stream<Item = Result<Bytes, std::io::Error>> + Send>, DomainError> {
|
||
self.require_file(id, Permission::Read, caller_id).await?;
|
||
self.notify_file_accessed(caller_id, id);
|
||
self.file_read.get_file_stream(id).await
|
||
}
|
||
|
||
/// Multi-tier optimized download.
|
||
async fn get_file_optimized(
|
||
&self,
|
||
id: &str,
|
||
accept_webp: bool,
|
||
prefer_original: bool,
|
||
) -> Result<(FileDto, OptimizedFileContent), DomainError> {
|
||
let file = self.file_read.get_file(id).await?;
|
||
let dto = FileDto::from(file);
|
||
self.optimized_inner(id, dto, accept_webp, prefer_original)
|
||
.await
|
||
}
|
||
|
||
async fn get_file_optimized_with_perms(
|
||
&self,
|
||
id: &str,
|
||
caller_id: Uuid,
|
||
accept_webp: bool,
|
||
prefer_original: bool,
|
||
) -> Result<(FileDto, OptimizedFileContent), DomainError> {
|
||
self.require_file(id, Permission::Read, caller_id).await?;
|
||
let file = self.file_read.get_file(id).await?;
|
||
let dto = FileDto::from(file);
|
||
self.notify_file_accessed(caller_id, id);
|
||
self.optimized_inner(id, dto, accept_webp, prefer_original)
|
||
.await
|
||
}
|
||
|
||
/// Like `get_file_optimized` but skips the metadata re-fetch.
|
||
async fn get_file_optimized_preloaded(
|
||
&self,
|
||
id: &str,
|
||
file_dto: FileDto,
|
||
accept_webp: bool,
|
||
prefer_original: bool,
|
||
) -> Result<(FileDto, OptimizedFileContent), DomainError> {
|
||
self.optimized_inner(id, file_dto, accept_webp, prefer_original)
|
||
.await
|
||
}
|
||
|
||
/// Range-based streaming for HTTP Range Requests.
|
||
async fn get_file_range_stream(
|
||
&self,
|
||
id: &str,
|
||
start: u64,
|
||
end: Option<u64>,
|
||
) -> Result<Box<dyn Stream<Item = Result<Bytes, std::io::Error>> + Send>, DomainError> {
|
||
self.file_read.get_file_range_stream(id, start, end).await
|
||
}
|
||
|
||
async fn get_file_range_stream_with_perms(
|
||
&self,
|
||
id: &str,
|
||
caller_id: Uuid,
|
||
start: u64,
|
||
end: Option<u64>,
|
||
) -> Result<Box<dyn Stream<Item = Result<Bytes, std::io::Error>> + Send>, DomainError> {
|
||
self.require_file(id, Permission::Read, caller_id).await?;
|
||
// Range requests are bursty (video seeks, NC chunked downloads) —
|
||
// the recording hook's per-(caller, file) throttle absorbs the
|
||
// storm so one watched video lands as one Recent row, not 1000.
|
||
self.notify_file_accessed(caller_id, id);
|
||
self.file_read.get_file_range_stream(id, start, end).await
|
||
}
|
||
|
||
// TODO: check: no permission check
|
||
async fn stream_files_in_subtree(
|
||
&self,
|
||
folder_id: &str,
|
||
) -> Result<Pin<Box<dyn Stream<Item = Result<FileDto, DomainError>> + Send>>, DomainError> {
|
||
let inner = self.file_read.stream_files_in_subtree(folder_id).await?;
|
||
let mapped = inner.map(|r| r.map(FileDto::from));
|
||
Ok(Box::pin(mapped))
|
||
}
|
||
|
||
async fn list_files_batch(
|
||
&self,
|
||
folder_id: Option<&str>,
|
||
after_name: Option<&str>,
|
||
limit: i64,
|
||
) -> Result<Vec<FileDto>, DomainError> {
|
||
let files = self
|
||
.file_read
|
||
.list_files_batch(folder_id, after_name, limit)
|
||
.await?;
|
||
Ok(files.into_iter().map(FileDto::from).collect())
|
||
}
|
||
|
||
async fn list_files_batch_with_perms(
|
||
&self,
|
||
folder_id: Option<&str>,
|
||
owner_id: Uuid,
|
||
after_name: Option<&str>,
|
||
limit: i64,
|
||
) -> Result<Vec<FileDto>, DomainError> {
|
||
// Post-D0: every file lives in a folder — `storage.files.folder_id`
|
||
// is NOT NULL. `folder_id = None` means the caller is asking for
|
||
// "root-level files", which by design return an empty set: the
|
||
// WebDAV synthetic root only lists drive-root folders as
|
||
// children. Skip the DB round-trip and the pre-D7 owner-fallback
|
||
// query (which used to hit `_for_owner` and would have driven
|
||
// the `files.user_id` filter this refactor is retiring).
|
||
let Some(_) = folder_id else {
|
||
return Ok(Vec::new());
|
||
};
|
||
self.require_target_folder_perm(folder_id, Permission::Read, owner_id)
|
||
.await?;
|
||
let files = self
|
||
.file_read
|
||
.list_files_batch(folder_id, after_name, limit)
|
||
.await?;
|
||
Ok(files.into_iter().map(FileDto::from).collect())
|
||
}
|
||
}
|