fix(cli): random segfault with lagon dev (#406)

lagonapp · Dec 24, 2022 · 7e0738a · 7e0738a
1 parent 4b59eff
commit 7e0738a
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 6 deletions.
diff --git a/.changeset/light-tomatoes-bake.md b/.changeset/light-tomatoes-bake.md
@@ -0,0 +1,5 @@
+---
+'@lagon/cli': patch
+---
+
+Fix random segfault with `lagon dev`
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/packages/cli/Cargo.toml b/packages/cli/Cargo.toml
@@ -12,6 +12,7 @@ colored = "2.0.0"
 dirs = "4.0.0"
 webbrowser = "0.8.2"
 tokio = { version = "1", features = ["full"] }
+tokio-util = { version = "0.7.4", features = ["rt"] }
 hyper = { version = "0.14", features = ["client", "server", "http1", "http2", "runtime", "stream"] }
 mime = "0.3.16"
 serde = { version = "1.0", features = ["derive"] }

diff --git a/packages/cli/src/commands/dev.rs b/packages/cli/src/commands/dev.rs
@@ -19,6 +19,7 @@ use std::path::PathBuf;
 use std::sync::Arc;
 use std::time::Duration;
 use tokio::sync::Mutex;
+use tokio_util::task::LocalPoolHandle;
 
 use crate::utils::{
     bundle_function, info, input, success, validate_code_file, validate_public_dir, warn, Assets,
@@ -77,6 +78,7 @@ async fn handle_request(
     ip: String,
     content: Arc<Mutex<(Vec<u8>, Assets)>>,
     environment_variables: HashMap<String, String>,
+    pool: LocalPoolHandle,
 ) -> Result<HyperResponse<Body>> {
     let mut url = req.uri().to_string();
 
@@ -129,13 +131,20 @@ async fn handle_request(
             Ok(mut request) => {
                 request.add_header("X-Forwarded-For".into(), ip);
 
-                let mut isolate = Isolate::new(
-                    IsolateOptions::new(String::from_utf8(index)?)
-                        .with_metadata(Some((String::from(""), String::from(""))))
-                        .with_environment_variables(environment_variables),
+                pool.spawn_pinned_by_idx(
+                    move || async move {
+                        let mut isolate = Isolate::new(
+                            IsolateOptions::new(
+                                String::from_utf8(index).expect("Code is not UTF-8"),
+                            )
+                            .with_metadata(Some((String::from(""), String::from(""))))
+                            .with_environment_variables(environment_variables),
+                        );
+
+                        isolate.run(request, tx).await;
+                    },
+                    0,
                 );
-
-                isolate.run(request, tx).await;
             }
             Err(error) => {
                 println!("Error while parsing request: {}", error);
@@ -236,10 +245,12 @@ pub async fn dev(
 
     let server_content = content.clone();
     let environment_variables = parse_environment_variables(env)?;
+    let pool = LocalPoolHandle::new(1);
 
     let server = Server::bind(&addr).serve(make_service_fn(move |conn: &AddrStream| {
         let content = server_content.clone();
         let environment_variables = environment_variables.clone();
+        let pool = pool.clone();
 
         let addr = conn.remote_addr();
         let ip = addr.ip().to_string();
@@ -251,6 +262,7 @@ pub async fn dev(
                     ip.clone(),
                     content.clone(),
                     environment_variables.clone(),
+                    pool.clone(),
                 )
             }))
         }