drop DefaultJsRuntime

tailcallhq · May 24, 2024 · 8f69141 · 8f69141 · github-actions · May 24, 2024
1 parent 40a2bf5
commit 8f69141
Show file tree

Hide file tree

Showing 11 changed files with 46 additions and 65 deletions.
diff --git a/benches/data_loader_bench.rs b/benches/data_loader_bench.rs
@@ -12,7 +12,6 @@ use reqwest::Request;
 use tailcall::core::config::Batch;
 use tailcall::core::http::{DataLoaderRequest, HttpDataLoader, Response};
 use tailcall::core::runtime::TargetRuntime;
-use tailcall::core::worker::DefaultJsRuntime;
 use tailcall::core::{EnvIO, FileIO, HttpIO};
 
 #[derive(Clone)]
@@ -80,8 +79,8 @@ pub fn benchmark_data_loader(c: &mut Criterion) {
                     file: Arc::new(File {}),
                     cache: Arc::new(Cache {}),
                     extensions: Arc::new(vec![]),
-                    http_worker: Arc::new(DefaultJsRuntime {}),
-                    worker: Arc::new(DefaultJsRuntime {}),
+                    http_worker: None,
+                    worker: None,
                 };
                 let loader = HttpDataLoader::new(rt, None, false);
                 let loader = loader.to_data_loader(Batch::default().delay(1));

diff --git a/benches/impl_path_string_for_evaluation_context.rs b/benches/impl_path_string_for_evaluation_context.rs
@@ -21,7 +21,6 @@ use tailcall::core::http::{RequestContext, Response};
 use tailcall::core::lambda::{EvaluationContext, ResolverContextLike};
 use tailcall::core::path::PathString;
 use tailcall::core::runtime::TargetRuntime;
-use tailcall::core::worker::DefaultJsRuntime;
 use tailcall::core::{EnvIO, FileIO, HttpIO};
 use tailcall_http_cache::HttpCacheManager;
 
@@ -247,8 +246,8 @@ fn request_context() -> RequestContext {
         file: Arc::new(File {}),
         cache: Arc::new(InMemoryCache::new()),
         extensions: Arc::new(vec![]),
-        http_worker: Arc::new(DefaultJsRuntime {}),
-        worker: Arc::new(DefaultJsRuntime {}),
+        http_worker: None,
+        worker: None,
     };
     RequestContext::new(runtime)
         .server(server)

diff --git a/src/cli/runtime/mod.rs b/src/cli/runtime/mod.rs
@@ -34,24 +34,16 @@ fn init_hook_http(http: Arc<impl HttpIO>, script: Option<blueprint::Script>) ->
     http
 }
 
-fn init_http_worker_io(script: Option<blueprint::Script>) -> Arc<dyn WorkerIO<Event, Command>> {
-    #[cfg(feature = "js")]
-    if let Some(script) = script {
-        return super::javascript::init_worker_io(script);
-    };
-
-    Arc::new(crate::core::worker::DefaultJsRuntime {})
+fn init_http_worker_io(
+    script: Option<blueprint::Script>,
+) -> Option<Arc<dyn WorkerIO<Event, Command>>> {
+    Some(super::javascript::init_worker_io(script?))
 }
 
 fn init_resolver_worker_io(
     script: Option<blueprint::Script>,
-) -> Arc<dyn WorkerIO<async_graphql::Value, async_graphql::Value>> {
-    #[cfg(feature = "js")]
-    if let Some(script) = script {
-        return super::javascript::init_worker_io(script);
-    };
-
-    Arc::new(crate::core::worker::DefaultJsRuntime {})
+) -> Option<Arc<dyn WorkerIO<async_graphql::Value, async_graphql::Value>>> {
+    Some(super::javascript::init_worker_io(script?))
 }
 
 // Provides access to http in native rust environment

diff --git a/src/core/lambda/io.rs b/src/core/lambda/io.rs
@@ -140,17 +140,19 @@ impl IO {
 
                     Ok(res.body)
                 }
-                IO::Js { name: method } => {
-                    let value = ctx.value().cloned().unwrap_or(ConstValue::Null);
-                    let value = ctx
+                IO::Js { name } => {
+                    if let Some((worker, value)) = ctx
                         .request_ctx
                         .runtime
                         .worker
-                        .call(method, value)
-                        .await
-                        .map_err(EvaluationError::from)?;
-
-                    Ok(value.unwrap_or_default())
+                        .as_ref()
+                        .zip(ctx.value().cloned())
+                    {
+                        let val = worker.call(name, value).await?;
+                        Ok(val.unwrap_or_default())
+                    } else {
+                        Ok(ConstValue::Null)
+                    }
                 }
             }
         })

diff --git a/src/core/runtime.rs b/src/core/runtime.rs
@@ -28,9 +28,9 @@ pub struct TargetRuntime {
     /// functionality or integrate additional features.
     pub extensions: Arc<Vec<SchemaExtension>>,
     /// Worker middleware for handling HTTP requests.
-    pub http_worker: Arc<dyn WorkerIO<Event, Command>>,
+    pub http_worker: Option<Arc<dyn WorkerIO<Event, Command>>>,
     /// Worker middleware for resolving data.
-    pub worker: Arc<dyn WorkerIO<ConstValue, ConstValue>>,
+    pub worker: Option<Arc<dyn WorkerIO<ConstValue, ConstValue>>>,
 }
 
 impl TargetRuntime {
@@ -59,7 +59,6 @@ pub mod test {
     use crate::core::cache::InMemoryCache;
     use crate::core::http::Response;
     use crate::core::runtime::TargetRuntime;
-    use crate::core::worker::DefaultJsRuntime;
     use crate::core::{blueprint, EnvIO, FileIO, HttpIO};
 
     #[derive(Clone)]
@@ -197,8 +196,8 @@ pub mod test {
             file: Arc::new(file),
             cache: Arc::new(InMemoryCache::new()),
             extensions: Arc::new(vec![]),
-            http_worker: Arc::new(DefaultJsRuntime {}),
-            worker: Arc::new(DefaultJsRuntime {}),
+            http_worker: None,
+            worker: None,
         }
     }
 }
diff --git a/src/core/worker.rs b/src/core/worker.rs
@@ -1,13 +1,4 @@
-use crate::core::{Response, WorkerIO};
-
-pub struct DefaultJsRuntime;
-
-#[async_trait::async_trait]
-impl<A: Send + Sync + 'static, B> WorkerIO<A, B> for DefaultJsRuntime {
-    async fn call(&self, _: &'async_trait str, _: A) -> anyhow::Result<Option<B>> {
-        anyhow::bail!("JavaScript runtime is not supported in this build")
-    }
-}
+use crate::core::Response;
 
 #[derive(Debug)]
 pub struct WorkerResponse(pub Response<String>);

diff --git a/tailcall-aws-lambda/src/runtime.rs b/tailcall-aws-lambda/src/runtime.rs
@@ -4,7 +4,6 @@ use std::sync::Arc;
 use anyhow::anyhow;
 use tailcall::core::cache::InMemoryCache;
 use tailcall::core::runtime::TargetRuntime;
-use tailcall::core::worker::DefaultJsRuntime;
 use tailcall::core::{EntityCache, EnvIO, FileIO};
 use tokio::io::AsyncReadExt;
 
@@ -61,7 +60,7 @@ pub fn init_runtime() -> TargetRuntime {
         env: init_env(),
         cache: init_cache(),
         extensions: Arc::new(vec![]),
-        http_worker: Arc::new(DefaultJsRuntime {}),
-        worker: Arc::new(DefaultJsRuntime {}),
+        http_worker: None,
+        worker: None,
     }
 }
diff --git a/tailcall-cloudflare/src/runtime.rs b/tailcall-cloudflare/src/runtime.rs
@@ -4,7 +4,6 @@ use std::sync::Arc;
 use anyhow::anyhow;
 use async_graphql_value::ConstValue;
 use tailcall::core::runtime::TargetRuntime;
-use tailcall::core::worker::DefaultJsRuntime;
 use tailcall::core::{EnvIO, FileIO, HttpIO};
 
 use crate::{cache, env, file, http};
@@ -41,7 +40,7 @@ pub fn init(env: Rc<worker::Env>) -> anyhow::Result<TargetRuntime> {
         file: init_file(env.clone(), &bucket_id)?,
         cache: init_cache(env),
         extensions: Arc::new(vec![]),
-        http_worker: Arc::new(DefaultJsRuntime {}),
-        worker: Arc::new(DefaultJsRuntime {}),
+        http_worker: None,
+        worker: None,
     })
 }
diff --git a/tests/core/parse.rs b/tests/core/parse.rs
@@ -8,6 +8,7 @@ use std::str::FromStr;
 use std::sync::Arc;
 
 use anyhow::anyhow;
+use async_graphql_value::ConstValue;
 use markdown::mdast::Node;
 use markdown::ParseOptions;
 use tailcall::cli::javascript;
@@ -16,8 +17,8 @@ use tailcall::core::cache::InMemoryCache;
 use tailcall::core::config::{ConfigModule, Source};
 use tailcall::core::http::AppContext;
 use tailcall::core::runtime::TargetRuntime;
-use tailcall::core::worker::DefaultJsRuntime;
-use tailcall::core::EnvIO;
+use tailcall::core::worker::{Command, Event};
+use tailcall::core::{EnvIO, WorkerIO};
 
 use super::file::File;
 use super::http::Http;
@@ -281,16 +282,18 @@ impl ExecutionSpec {
 
         let http2_only = http.clone();
 
-        let http_worker = if let Some(script) = script.clone() {
-            javascript::init_worker_io(script)
-        } else {
-            Arc::new(DefaultJsRuntime {})
-        };
+        let http_worker: Option<Arc<dyn WorkerIO<Event, Command>>> =
+            if let Some(script) = script.clone() {
+                Some(javascript::init_worker_io(script))
+            } else {
+                None
+            };
 
-        let worker = if let Some(script) = script {
-            javascript::init_worker_io(script)
+        let worker: Option<Arc<dyn WorkerIO<ConstValue, ConstValue>>> = if let Some(script) = script
+        {
+            Some(javascript::init_worker_io(script))
         } else {
-            Arc::new(DefaultJsRuntime {})
+            None
         };
 
         let runtime = TargetRuntime {

diff --git a/tests/core/runtime.rs b/tests/core/runtime.rs
@@ -11,7 +11,6 @@ use tailcall::core::blueprint::Script;
 use tailcall::core::cache::InMemoryCache;
 use tailcall::core::config::Source;
 use tailcall::core::runtime::TargetRuntime;
-use tailcall::core::worker::DefaultJsRuntime;
 
 use super::env::Env;
 use super::file::TestFileIO;
@@ -88,7 +87,7 @@ pub fn create_runtime(
         file: Arc::new(file),
         cache: Arc::new(InMemoryCache::new()),
         extensions: Arc::new(vec![]),
-        http_worker: Arc::new(DefaultJsRuntime {}),
-        worker: Arc::new(DefaultJsRuntime {}),
+        http_worker: None,
+        worker: None,
     }
 }
diff --git a/tests/server_spec.rs b/tests/server_spec.rs
@@ -15,7 +15,6 @@ pub mod test {
     use tailcall::core::cache::InMemoryCache;
     use tailcall::core::http::Response;
     use tailcall::core::runtime::TargetRuntime;
-    use tailcall::core::worker::DefaultJsRuntime;
     use tailcall::core::{EnvIO, FileIO, HttpIO};
     use tailcall_http_cache::HttpCacheManager;
     use tokio::io::{AsyncReadExt, AsyncWriteExt};
@@ -155,8 +154,8 @@ pub mod test {
             file: Arc::new(file),
             cache: Arc::new(InMemoryCache::new()),
             extensions: Arc::new(vec![]),
-            http_worker: Arc::new(DefaultJsRuntime {}),
-            worker: Arc::new(DefaultJsRuntime {}),
+            http_worker: None,
+            worker: None,
         }
     }
 }
Thread Stats	Avg	Stdev	Max	+/- Stdev
Latency	6.71ms	2.97ms	76.33ms	72.63%
Req/Sec	3.77k	203.07	4.51k	93.08%