Merge branch 'main' into b5/gateway_templates

n0-computer · Oct 13, 2022 · 5d7d67a · 5d7d67a
2 parents 1ba87b1 + ff4ef02
commit 5d7d67a
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,4 +2,3 @@
 /iroh_gateway/test_files/*
 .env
 Cargo.lock
-foo
diff --git a/iroh-gateway/src/client.rs b/iroh-gateway/src/client.rs
@@ -12,7 +12,8 @@ use iroh_metrics::{
     observe, record,
 };
 use iroh_resolver::resolver::{
-    CidOrDomain, ContentLoader, Metadata, Out, OutMetrics, OutPrettyReader, Resolver, Source,
+    CidOrDomain, ContentLoader, Metadata, Out, OutMetrics, OutPrettyReader, OutType, Resolver,
+    Source,
 };
 use tokio::io::{AsyncReadExt, AsyncWrite};
 use tokio_util::io::ReaderStream;
@@ -32,6 +33,7 @@ pub struct PrettyStreamBody<T: ContentLoader>(ReaderStream<OutPrettyReader<T>>,
 pub enum FileResult<T: ContentLoader> {
     File(PrettyStreamBody<T>),
     Directory(Out),
+    Raw(PrettyStreamBody<T>),
 }
 
 impl<T: ContentLoader + std::marker::Unpin> http_body::Body for PrettyStreamBody<T> {
@@ -100,6 +102,10 @@ impl<T: ContentLoader + std::marker::Unpin> Client<T> {
             let stream = ReaderStream::new(reader);
             let body = PrettyStreamBody(stream, metadata.size);
 
+            if metadata.typ == OutType::Raw {
+                return Ok((FileResult::Raw(body), metadata));
+            }
+
             Ok((FileResult::File(body), metadata))
         }
     }

diff --git a/iroh-gateway/src/handlers.rs b/iroh-gateway/src/handlers.rs
@@ -365,7 +365,7 @@ async fn serve_raw<T: ContentLoader + std::marker::Unpin>(
         .map_err(|e| error(StatusCode::INTERNAL_SERVER_ERROR, &e, &state))?;
 
     match body {
-        FileResult::File(body) => {
+        FileResult::File(body) | FileResult::Raw(body) => {
             set_content_disposition_headers(
                 &mut headers,
                 format!("{}.bin", req.cid).as_str(),
@@ -399,7 +399,7 @@ async fn serve_car<T: ContentLoader + std::marker::Unpin>(
         .map_err(|e| error(StatusCode::INTERNAL_SERVER_ERROR, &e, &state))?;
 
     match body {
-        FileResult::File(body) => {
+        FileResult::File(body) | FileResult::Raw(body) => {
             set_content_disposition_headers(
                 &mut headers,
                 format!("{}.car", req.cid).as_str(),
@@ -515,6 +515,21 @@ async fn serve_fs<T: ContentLoader + std::marker::Unpin>(
                 )),
             }
         }
+        FileResult::Raw(body) => {
+            // todo(arqu): error on no size
+            // todo(arqu): add lazy seeking
+            add_cache_control_headers(&mut headers, metadata.clone());
+            set_etag_headers(&mut headers, get_etag(&req.cid, Some(req.format.clone())));
+            add_ipfs_roots_headers(&mut headers, metadata);
+            let name = add_content_disposition_headers(
+                &mut headers,
+                &req.query_file_name,
+                &req.content_path,
+                req.download,
+            );
+            add_content_type_headers(&mut headers, &name);
+            response(StatusCode::OK, body, headers)
+        }
     }
 }
 

diff --git a/iroh-resolver/src/resolver.rs b/iroh-resolver/src/resolver.rs
@@ -400,7 +400,6 @@ pub enum OutType {
 
 #[derive(Debug, Copy, Clone, PartialEq, Eq)]
 pub enum UnixfsType {
-    Raw,
     Dir,
     File,
     Symlink,
@@ -963,7 +962,7 @@ impl<T: ContentLoader> Resolver<T> {
             path: root_path,
             size: Some(loaded_cid.data.len() as u64),
             typ: OutType::Raw,
-            unixfs_type: Some(UnixfsType::Raw),
+            unixfs_type: None,
             resolved_path: vec![cid],
             source: loaded_cid.source,
         };