fix: tus.rs

CITATION.cff

@@ -22,5 +22,5 @@ keywords:
   - self-hosted
   - portabase
 license: Apache-2.0
-version: 1.1.3
-date-released: "2026-02-16"
+version: 1.1.4-rc.1
+date-released: "2026-02-18"

Cargo.lock

@@ -2851,7 +2851,7 @@ dependencies = [
 
 [[package]]
 name = "portabase-agent"
-version = "1.1.3-rc.1"
+version = "1.1.4-rc.1"
 dependencies = [
  "aes",
  "aes-gcm",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "portabase-agent"
-version = "1.1.3"
+version = "1.1.4-rc.1"
 edition = "2024"
 
 [dependencies]

docker-compose.yml

@@ -16,7 +16,7 @@ services:
       APP_ENV: development
       LOG: debug
       TZ: "Europe/Paris"
-      EDGE_KEY: "eyJzZXJ2ZXJVcmwiOiJodHRwOi8vbG9jYWxob3N0Ojg4ODciLCJhZ2VudElkIjoiOWZjYjhmNjUtNTcyMC00N2M3LThkNWItYWFlMmVjOTc2OWU1IiwibWFzdGVyS2V5QjY0IjoiQlhWM1hvbEM2NTZTVjdkTmdjV1BHUWxrKytycExJNmxHRGk3Q1BCNWllbz0ifQ=="
+      EDGE_KEY: "eyJzZXJ2ZXJVcmwiOiJodHRwOi8vbG9jYWxob3N0Ojg4ODciLCJhZ2VudElkIjoiNTVkODRlYjctMmJjMC00YTYzLThhNmMtZDM0YTkzNWRiMWVkIiwibWFzdGVyS2V5QjY0IjoiQlhWM1hvbEM2NTZTVjdkTmdjV1BHUWxrKytycExJNmxHRGk3Q1BCNWllbz0ifQ=="
       #POOLING: 1
       #DATABASES_CONFIG_FILE: "config.toml"
     extra_hosts:

src/utils/tus.rs

@@ -1,8 +1,8 @@
-use anyhow::Result;
+use anyhow::{Context, Result};
 use bytes::Bytes;
 use futures::{Stream, StreamExt};
-use log::info;
-use reqwest::header::{CONTENT_TYPE, HeaderMap, HeaderValue};
+use log::{error, info};
+use reqwest::header::{HeaderMap, HeaderValue, CONTENT_TYPE};
 
 const PATCH_CHUNK_SIZE: usize = 1 * 1024 * 1024;
 
@@ -19,38 +19,58 @@ where
 
     info!("File size: {}", total_size);
 
-    let mut headers = HeaderMap::new();
-    headers.insert("Tus-Resumable", HeaderValue::from_static("1.0.0"));
-    headers.insert("Upload-Defer-Length", HeaderValue::from_static("1"));
+    let mut create_headers = HeaderMap::new();
+    create_headers.insert("Tus-Resumable", HeaderValue::from_static("1.0.0"));
+    create_headers.insert("Upload-Defer-Length", HeaderValue::from_static("1"));
 
     let resp = client
         .post(tus_endpoint)
-        .headers(headers.clone())
+        .headers(create_headers.clone())
         .send()
-        .await?;
+        .await
+        .context("Failed to send POST to create TUS upload")?;
+
     if !resp.status().is_success() {
-        anyhow::bail!("Failed to create upload: {}", resp.status());
+        let status = resp.status();
+        let headers = resp.headers().clone();
+        let body = resp.text().await.unwrap_or_else(|_| "<failed to read body>".into());
+
+        error!(
+            "TUS creation failed | status={} | headers={:?} | body={}",
+            status, headers, body
+        );
+
+        anyhow::bail!(
+            "Failed to create upload.\nStatus: {}\nHeaders: {:?}\nBody: {}",
+            status,
+            headers,
+            body
+        );
     }
 
     let upload_url = resp
         .headers()
         .get("Location")
-        .ok_or_else(|| anyhow::anyhow!("Missing Location header"))?
-        .to_str()?
+        .context("TUS creation response missing Location header")?
+        .to_str()
+        .context("Invalid Location header value")?
         .to_string();
 
-    let mut stream = Box::pin(
-        encrypted_stream.map(|r| r.map_err(|e| std::io::Error::new(std::io::ErrorKind::Other, e))),
-    );
 
+    let mut stream = Box::pin(encrypted_stream);
     let mut offset: u64 = 0;
 
     while let Some(chunk) = stream.next().await {
-        let chunk = chunk?;
+        let chunk = chunk.context("Stream produced IO error")?;
+
         for sub_chunk in chunk.chunks(PATCH_CHUNK_SIZE) {
             let mut patch_headers = extra_headers.clone();
             patch_headers.insert("Tus-Resumable", HeaderValue::from_static("1.0.0"));
-            patch_headers.insert("Upload-Offset", HeaderValue::from_str(&offset.to_string())?);
+            patch_headers.insert(
+                "Upload-Offset",
+                HeaderValue::from_str(&offset.to_string())
+                    .context("Invalid offset header value")?,
+            );
             patch_headers.insert(
                 CONTENT_TYPE,
                 HeaderValue::from_static("application/offset+octet-stream"),
@@ -61,24 +81,70 @@ where
                 .headers(patch_headers)
                 .body(sub_chunk.to_vec())
                 .send()
-                .await?;
+                .await
+                .with_context(|| format!("PATCH request failed at offset {}", offset))?;
 
             if !patch_resp.status().is_success() {
+                let status = patch_resp.status();
+                let headers = patch_resp.headers().clone();
+                let body =
+                    patch_resp.text().await.unwrap_or_else(|_| "<failed to read body>".into());
+
+                error!(
+                    "TUS PATCH failure | offset={} | status={} | body={}",
+                    offset, status, body
+                );
+
                 anyhow::bail!(
-                    "Chunk upload failed at offset {}: {}",
+                    "Chunk upload failed.\n\
+                     URL: {}\n\
+                     Offset: {}\n\
+                     Status: {}\n\
+                     Headers: {:?}\n\
+                     Body: {}",
+                    upload_url,
                     offset,
-                    patch_resp.status()
+                    status,
+                    headers,
+                    body
                 );
             }
+
+            if let Some(server_offset) = patch_resp.headers().get("Upload-Offset") {
+                let server_offset = server_offset
+                    .to_str()
+                    .context("Invalid Upload-Offset header")?
+                    .parse::<u64>()
+                    .context("Failed to parse Upload-Offset header")?;
+
+                let expected = offset + sub_chunk.len() as u64;
+
+                if server_offset != expected {
+                    anyhow::bail!(
+                        "Offset mismatch detected.\nLocal expected: {}\nServer returned: {}",
+                        expected,
+                        server_offset
+                    );
+                }
+            }
+
             offset += sub_chunk.len() as u64;
-            // info!("Progress: {}/{}", offset, total_size);
         }
     }
 
+
     let mut finalize_headers = extra_headers.clone();
     finalize_headers.insert("Tus-Resumable", HeaderValue::from_static("1.0.0"));
-    finalize_headers.insert("Upload-Offset", HeaderValue::from_str(&offset.to_string())?);
-    finalize_headers.insert("Upload-Length", HeaderValue::from_str(&offset.to_string())?);
+    finalize_headers.insert(
+        "Upload-Offset",
+        HeaderValue::from_str(&offset.to_string())
+            .context("Invalid finalize offset header")?,
+    );
+    finalize_headers.insert(
+        "Upload-Length",
+        HeaderValue::from_str(&offset.to_string())
+            .context("Invalid finalize length header")?,
+    );
     finalize_headers.insert(
         CONTENT_TYPE,
         HeaderValue::from_static("application/offset+octet-stream"),
@@ -88,11 +154,33 @@ where
         .patch(&upload_url)
         .headers(finalize_headers)
         .send()
-        .await?;
+        .await
+        .context("Finalize PATCH request failed")?;
 
     if !finalize_resp.status().is_success() {
-        anyhow::bail!("Failed to finalize upload");
+        let status = finalize_resp.status();
+        let body =
+            finalize_resp.text().await.unwrap_or_else(|_| "<failed to read body>".into());
+
+        error!(
+            "TUS finalize failure | offset={} | status={} | body={}",
+            offset, status, body
+        );
+
+        anyhow::bail!(
+            "Finalize upload failed.\n\
+             URL: {}\n\
+             Final offset: {}\n\
+             Status: {}\n\
+             Body: {}",
+            upload_url,
+            offset,
+            status,
+            body
+        );
     }
 
+    info!("Upload completed successfully. Final size: {}", offset);
+
     Ok(())
 }