2 files changed, 116 insertions, 0 deletions
diff --git a/src/http_body.rs b/src/http_body.rs
new file mode 100644
index 000000000..4931ee4bd
--- /dev/null
+++ b/src/http_body.rs
@@ -0,0 +1,115 @@
+// Copyright 2018 the Deno authors. All rights reserved. MIT license.
+
+use futures::Async;
+use futures::Poll;
+use hyper::body::Payload;
+use hyper::Body;
+use hyper::Chunk;
+use std::cmp::min;
+use std::io;
+use std::io::Read;
+use tokio::io::AsyncRead;
+
+/// Wraps hyper::Body so that it can be exposed as an AsyncRead and integrated
+/// into resources more easily.
+pub struct HttpBody {
+  body: Body,
+  chunk: Option<Chunk>,
+  pos: usize,
+}
+
+impl HttpBody {
+  pub fn from(body: Body) -> HttpBody {
+    HttpBody {
+      body,
+      chunk: None,
+      pos: 0,
+    }
+  }
+}
+
+impl Read for HttpBody {
+  fn read(&mut self, _buf: &mut [u8]) -> io::Result<usize> {
+    unimplemented!();
+  }
+}
+
+impl AsyncRead for HttpBody {
+  fn poll_read(&mut self, buf: &mut [u8]) -> Poll<usize, io::Error> {
+    match self.chunk.take() {
+      Some(chunk) => {
+        debug!(
+          "HttpBody Fake Read buf {} chunk {} pos {}",
+          buf.len(),
+          chunk.len(),
+          self.pos
+        );
+        let n = min(buf.len(), chunk.len() - self.pos);
+        {
+          let rest = &chunk[self.pos..];
+          buf[..n].clone_from_slice(&rest[..n]);
+        }
+        self.pos += n;
+        if self.pos == chunk.len() {
+          self.pos = 0;
+        } else {
+          self.chunk = Some(chunk);
+        }
+        return Ok(Async::Ready(n));
+      }
+      None => {
+        assert_eq!(self.pos, 0);
+      }
+    }
+
+    let p = self.body.poll_data();
+    match p {
+      Err(e) => Err(
+        // TODO Need to map hyper::Error into std::io::Error.
+        io::Error::new(io::ErrorKind::Other, e),
+      ),
+      Ok(Async::NotReady) => Ok(Async::NotReady),
+      Ok(Async::Ready(maybe_chunk)) => match maybe_chunk {
+        None => Ok(Async::Ready(0)),
+        Some(chunk) => {
+          debug!(
+            "HttpBody Real Read buf {} chunk {} pos {}",
+            buf.len(),
+            chunk.len(),
+            self.pos
+          );
+          let n = min(buf.len(), chunk.len());
+          buf[..n].clone_from_slice(&chunk[..n]);
+          if buf.len() < chunk.len() {
+            self.pos = n;
+            self.chunk = Some(chunk);
+          }
+          Ok(Async::Ready(n))
+        }
+      },
+    }
+  }
+}
+
+#[test]
+fn test_body_async_read() {
+  use std::str::from_utf8;
+  let body = Body::from("hello world");
+  let mut body = HttpBody::from(body);
+
+  let buf = &mut [0, 0, 0, 0, 0];
+  let r = body.poll_read(buf);
+  assert!(r.is_ok());
+  assert_eq!(r.unwrap(), Async::Ready(5));
+  assert_eq!(from_utf8(buf).unwrap(), "hello");
+
+  let r = body.poll_read(buf);
+  assert!(r.is_ok());
+  assert_eq!(r.unwrap(), Async::Ready(5));
+  assert_eq!(from_utf8(buf).unwrap(), " worl");
+
+  let r = body.poll_read(buf);
+  assert!(r.is_ok());
+  assert_eq!(r.unwrap(), Async::Ready(1));
+  assert_eq!(from_utf8(&buf[0..1]).unwrap(), "d");
+}
diff --git a/src/main.rs b/src/main.rs
index c080da24c..2c33583d0 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -29,6 +29,7 @@ pub mod deno_dir;
 pub mod errors;
 pub mod flags;
 mod fs;
+mod http_body;
 mod http_util;
 pub mod isolate;
 pub mod libdeno;