[dev] connect to edge websocket

src/commands/dev/edge/mod.rs

@@ -2,9 +2,9 @@ mod server;
 mod setup;
 
 use server::serve;
-use setup::Session;
+use setup::{upload, Session};
 
-use crate::commands::dev::ServerConfig;
+use crate::commands::dev::{socket, ServerConfig};
 use crate::settings::global_user::GlobalUser;
 use crate::settings::toml::{DeployConfig, Target};
 
@@ -20,15 +20,23 @@ pub fn dev(
     let session = Session::new(&target, &user, &deploy_config)?;
     let mut target = target;
 
-    let preview_token = setup::upload(
+    let preview_token = upload(
         &mut target,
         &deploy_config,
         &user,
-        session.preview_token,
+        session.preview_token.clone(),
         verbose,
     )?;
 
-    let server = serve(server_config, preview_token, session.host);
     let mut runtime = TokioRuntime::new()?;
-    runtime.block_on(server)
+    runtime.block_on(async {
+        let devtools_listener = tokio::spawn(socket::listen(session.websocket_url));
+        let server = tokio::spawn(serve(server_config, preview_token, session.host));
+        let res = tokio::try_join!(async { devtools_listener.await? }, async { server.await? });
+
+        match res {
+            Ok(_) => Ok(()),
+            Err(e) => Err(e),
+        }
+    })
 }

src/commands/dev/edge/setup.rs

@@ -65,6 +65,7 @@ pub(super) fn upload(
     Ok(response.result.preview_token)
 }
 
+#[derive(Debug, Clone)]
 pub struct Session {
     pub host: String,
     pub websocket_url: Url,
@@ -98,7 +99,11 @@ impl Session {
         let response = client.get(exchange_url).send()?.error_for_status()?;
         let text = &response.text()?;
         let response: InspectorV4ApiResponse = serde_json::from_str(text)?;
-        let websocket_url = Url::parse(&response.inspector_websocket)?;
+        let full_url = format!(
+            "{}?{}={}",
+            &response.inspector_websocket, "cf_workers_preview_token", &response.token
+        );
+        let websocket_url = Url::parse(&full_url)?;
         let preview_token = response.token;
 
         Ok(Session {