Use one runtime

Cargo.toml

@@ -52,7 +52,7 @@ hyper-tls = "0.4.0"
 chrono = "0.4.9"
 tokio = {version = "0.2", default-features = false, features = ["io-std", "time"]}
 # chrome-devtools-rs = { path = "../chrome-devtools-rs" }
-chrome-devtools-rs = { git = "https://github.com/everlastingbugstopper/chrome-devtools-rs", rev = "b7a0e9f" }
+chrome-devtools-rs = { git = "https://github.com/everlastingbugstopper/chrome-devtools-rs", rev = "80e1ca6" }
 ws = "0.9.0"
 futures = "0.3"
 futures-util = "0.3"

src/commands/dev/mod.rs

@@ -4,8 +4,6 @@ use server_config::ServerConfig;
 mod headers;
 use headers::{destructure_response, structure_request};
 
-use std::thread;
-
 use chrono::prelude::*;
 
 use hyper::client::{HttpConnector, ResponseFuture};
@@ -43,15 +41,16 @@ pub fn dev(
     let session_id = get_session_id()?;
     let preview_id = get_preview_id(target, user, &server_config, &session_id)?;
 
-    // create a new thread to listen for devtools messages
-    thread::spawn(move || {
-        let mut runtime = TokioRuntime::new().unwrap();
-        runtime.block_on(socket::listen(session_id)).unwrap();
-    });
-
-    // spawn tokio runtime on the main thread to handle incoming HTTP requests
     let mut runtime = TokioRuntime::new()?;
-    runtime.block_on(serve(server_config, preview_id))?;
+
+    let devtools_listener = socket::listen(session_id);
+    let server = serve(server_config, preview_id);
+
+    let runners = futures::future::join(devtools_listener, server);
+
+    runtime.block_on(async {
+        let (_, _) = runners.await;
+    });
 
     Ok(())
 }