multipart: process_boundary: Rename, and better docs

[hippotat.git] / src / bin / server.rs

diff --git a/src/bin/server.rs b/src/bin/server.rs
index e38b1176aa8cfd11e864a04a780a30b61e55aade..1fd6695127ae2a2d3531856f0555632a8332bc47 100644 (file)
--- a/src/bin/server.rs
+++ b/src/bin/server.rs
@@ -30,7 +30,9 @@ struct WebRequest {
   // end delimiter for the metadata not yet located, but in here somewhere
   initial: Box<[u8]>,
   initial_remaining: usize,
+  length_hint: usize,
   body: hyper::body::Body,
+  boundary_finder: multipart::BoundaryFinder,
   reply_to: tokio::sync::oneshot::Sender<WebResponse>,
   warnings: Warnings,
 }
@@ -61,12 +63,17 @@ async fn handle(
 
   match async {
 
+    let get_header = |hn: &str| {
+      let mut values = req.headers().get_all(hn).iter();
+      let v = values.next().ok_or_else(|| anyhow!("missing {}", hn))?;
+      if values.next().is_some() { throw!(anyhow!("multiple {}!", hn)); }
+      let v = v.to_str().context(anyhow!("interpret {} as UTF-8", hn))?;
+      Ok::<_,AE>(v)
+    };
+
     let mkboundary = |b: &'_ _| format!("\n--{}", b).into_bytes();
     let boundary = match (||{
-      let mut ctypes = req.headers().get_all("Content-Type").iter();
-      let t = ctypes.next().ok_or_else(|| anyhow!("missing Content-Type"))?;
-      if ctypes.next().is_some() { throw!(anyhow!("several Content-Type")) }
-      let t = t.to_str().context("interpret Content-Type as utf-8")?;
+      let t = get_header("Content-Type")?;
       let t: mime::Mime = t.parse().context("parse Content-Type")?;
       if t.type_() != "multipart" { throw!(anyhow!("not multipart/")) }
       let b = mime::BOUNDARY;
@@ -84,21 +91,31 @@ async fn handle(
       },
     };
 
+    let length_hint: usize = (||{
+      let clength = get_header("Content-Length")?;
+      let clength = clength.parse().context("parse Content-Length")?;
+      Ok::<_,AE>(clength)
+    })().unwrap_or_else(
+      |e| { let _ = warnings.add(&e.wrap_err("parsing Content-Length")); 0 }
+    );
+
     let mut body = req.into_body();
-    let initial = match read_limited_bytes(METADATA_MAX_LEN, &mut body).await {
+    let initial = match read_limited_bytes(
+      METADATA_MAX_LEN, default(), length_hint, &mut body
+    ).await {
       Ok(all) => all,
       Err(ReadLimitedError::Truncated { sofar,.. }) => sofar,
       Err(ReadLimitedError::Hyper(e)) => throw!(e),
     };
 
-    let finder = memmem::Finder::new(&boundary);
-    let mut find_iter = finder.find_iter(&initial);
+    let boundary_finder = memmem::Finder::new(&boundary);
+    let mut boundary_iter = boundary_finder.find_iter(&initial);
 
     let start = if initial.starts_with(&boundary[1..]) { boundary.len()-1 }
-    else if let Some(start) = find_iter.next() { start + boundary.len() }
+    else if let Some(start) = boundary_iter.next() { start + boundary.len() }
     else { throw!(anyhow!("initial boundary not found")) };
 
-    let comp = multipart::process_component
+    let comp = multipart::process_boundary
       (&mut warnings, &initial[start..], PartName::m)?
       .ok_or_else(|| anyhow!(r#"no "m" component"#))?;
 
@@ -106,7 +123,7 @@ async fn handle(
       r#"first multipart component must be name="m""#
     )) }
 
-    let mut meta = MetadataFieldIterator::new(comp.payload_start);
+    let mut meta = MetadataFieldIterator::new(comp.payload);
 
     let client: ClientName = meta.need_parse().context("client addr")?;
 
@@ -169,6 +186,8 @@ async fn handle(
     let wreq = WebRequest {
       initial,
       initial_remaining,
+      length_hint,
+      boundary_finder: boundary_finder.into_owned(),
       body,
       warnings: mem::take(&mut warnings),
       reply_to
@@ -196,7 +215,7 @@ async fn handle(
 }
 
 #[allow(unused_variables)] // xxx
-async fn run_client(_ic: Arc<InstanceConfig>,
+async fn run_client(ic: Arc<InstanceConfig>,
                     mut web: mpsc::Receiver<WebRequest>)
                     -> Result<Void, AE>
 {
@@ -239,13 +258,30 @@ async fn run_client(_ic: Arc<InstanceConfig>,
       req = web.recv() =>
       {
         let WebRequest {
-          initial, initial_remaining, body,
+          initial, initial_remaining, length_hint, mut body,
+          boundary_finder,
           reply_to, warnings,
         } = req.ok_or_else(|| anyhow!("webservers all shut down!"))?;
 
-        match (||{
+        match async {
+
+          let whole_request = read_limited_bytes(
+            ic.max_batch_up.sat(),
+            initial,
+            length_hint,
+            &mut body
+          ).await.context("read request body")?;
+
+          dbg!(whole_request.len());
+
+/*          
+
+          multipart::ComponentIterator::resume_mid_component(
+            &initial[initial_remaining..],
+  */          
+
           Ok::<_,AE>(())
-        })() {
+        }.await {
           Ok(()) => outstanding.push_back(Outstanding {
             reply_to: reply_to,
             max_requests_outstanding: 42, // xxx