Bump to latest hyper, tokio, and futures pre-releases

Author: jtgeibel

Cargo.lock

@@ -81,17 +81,17 @@ conduit-hyper = { git = "https://github.com/jtgeibel/conduit-hyper", branch="asy
 futures-preview = { version = "0.3.0-alpha.19", features = ["compat", "async-await"] }
 tokio = { version = "0.2.0-alpha.2", default-features = false, features = ["tcp", "fs"]}
 tokio-net = { version = "0.2.0-alpha.2", default-features=false, features = ["signal"] }
-hyper = { git = "https://github.com/hyperium/hyper" }
+hyper = "0.13.0-alpha.4"
 ctrlc = { version = "3.0", features = ["termination"] }
 indexmap = "1.0.2"
 handlebars = "2.0.1"
 
 [dev-dependencies]
 conduit-test = "0.8"
-hyper-tls = { git = "https://github.com/hyperium/hyper-tls" }
+hyper-tls = "0.4.0-alpha.4"
 lazy_static = "1.0"
 diesel_migrations = { version = "1.3.0", features = ["postgres"] }
-tower-service = "0.3.0-alpha.1"
+tower-service = "0.3.0-alpha.2"
 
 [build-dependencies]
 dotenv = "0.11"

Cargo.toml

@@ -59,7 +59,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
 
     let server = if dotenv::var("USE_HYPER").is_ok() {
         use tokio::io::AsyncWriteExt;
-        use tokio_net::signal::unix::{Signal, SignalKind};
+        use tokio_net::signal::unix::{signal, SignalKind};
 
         println!("Booting with a hyper based server");
 
@@ -74,8 +74,8 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         let addr = ([127, 0, 0, 1], port).into();
         let server = hyper::Server::bind(&addr).serve(make_service);
 
-        let mut sig_int = Signal::new(SignalKind::interrupt())?.into_future();
-        let mut sig_term = Signal::new(SignalKind::terminate())?.into_future();
+        let mut sig_int = signal(SignalKind::interrupt())?.into_future();
+        let mut sig_term = signal(SignalKind::terminate())?.into_future();
 
         let server = server.with_graceful_shutdown(async move {
             // Wait for either signal

src/bin/server.rs

@@ -8,7 +8,7 @@ use std::{
     path::PathBuf,
     pin::Pin,
     str,
-    sync::{Arc, Mutex, Once},
+    sync::{mpsc, Arc, Mutex, Once},
     task::{Context, Poll},
     thread,
 };
@@ -86,9 +86,7 @@ pub fn proxy() -> (String, Bomb) {
     let me = thread::current().name().unwrap().to_string();
     let record = dotenv::var("RECORD").is_ok();
 
-    let addr = "127.0.0.1:0".parse().unwrap();
-    let listener = t!(TcpListener::bind(&addr));
-    let ret = format!("http://{}", t!(listener.local_addr()));
+    let (url_tx, url_rx) = mpsc::channel();
 
     let data = cache_file(&me.replace("::", "_"));
     let record = if record && !data.exists() {
@@ -108,14 +106,20 @@ pub fn proxy() -> (String, Bomb) {
 
     let thread = thread::spawn(move || {
         let mut rt = t!(Runtime::new());
+
         let client = if let Record::Capture(_, _) = record {
-            Some(hyper::Client::builder().build(hyper_tls::HttpsConnector::new(4).unwrap()))
+            Some(hyper::Client::builder().build(hyper_tls::HttpsConnector::new().unwrap()))
         } else {
             None
         };
 
+        let listener = t!(rt.block_on(TcpListener::bind("127.0.0.1:0")));
+        url_tx
+            .send(format!("http://{}", t!(listener.local_addr())))
+            .unwrap();
+
         let record = Arc::new(Mutex::new(record));
-        let srv = Server::builder(listener.incoming())
+        let srv = Server::builder(hyper::server::accept::from_stream(listener.incoming()))
             .serve(Proxy {
                 sink: sink2,
                 record: Arc::clone(&record),
@@ -138,7 +142,7 @@ pub fn proxy() -> (String, Bomb) {
     });
 
     (
-        ret,
+        url_rx.recv().unwrap(),
         Bomb {
             iorx: Sink(sink),
             quittx: Some(quittx),