Merge pull request #250 from supabase/upgrade-latest-deno

Upgrade to deno core 0.243.0

Author: laktek

Cargo.lock

@@ -12,44 +12,45 @@ members = [
   "./crates/npm",
   "./crates/sb_graph",
   "./crates/sb_module_loader",
-  "./crates/sb_fs"
+  "./crates/sb_fs",
 ]
 resolver = "2"
 
 [workspace.dependencies]
-eszip = "0.53.0"
+url = { version = "2.3.1" }
+eszip = "0.56.0"
 log = "0.4.20"
 anyhow = { version = "1.0.57" }
 libc = { version = "0.2.144" }
-deno_ast = { version = "0.29.1", features = [ "cjs", "transpiling" ] }
-deno_broadcast_channel = { version = "0.115.0" }
-deno_core = { version = "0.222.0" }
-deno_console = { version = "0.121.0" }
-deno_crypto =  { version = "0.135.0" }
-deno_fetch = { version = "0.145.0" }
-deno_fs = { version = "0.31.0", features = ["sync_fs"] }
+deno_ast = { version = "0.31.6", features = ["transpiling"] }
+deno_broadcast_channel = { version = "0.124.0" }
+deno_core = { version = "0.243.0" }
+deno_console = { version = "0.130.0" }
+deno_crypto =  { version = "0.144.0" }
+deno_fetch = { version = "0.154.0" }
+deno_fs = { version = "0.40.0", features = ["sync_fs"] }
 deno_config = "=0.3.1"
-deno_io = "0.31.0"
-deno_graph = "=0.55.0"
-deno_http =  { version = "0.116.0" }
+deno_io = "0.40.0"
+deno_graph = "=0.62.2"
+deno_http =  { version = "0.127.0" }
 deno_media_type = { version = "0.1.1", features = ["module_specifier"] }
-deno_net = { version = "0.113.0" }
-deno_npm = "0.15.1"
-deno_url = { version = "0.121.0" }
-deno_semver = "0.5.0"
-deno_tls = { version = "0.108.0"}
-deno_webidl = { version = "0.121.0" }
-deno_web = { version = "0.152.0" }
-deno_websocket = { version = "0.126.0" }
-deno_webstorage = { version = "0.116.0" }
+deno_net = { version = "0.122.0" }
+deno_npm = "0.15.3"
+deno_url = { version = "0.130.0" }
+deno_semver = "0.5.1"
+deno_tls = { version = "0.117.0"}
+deno_webidl = { version = "0.130.0" }
+deno_web = { version = "0.161.0" }
+deno_websocket = { version = "0.135.0" }
+deno_webstorage = { version = "0.125.0" }
 enum-as-inner = "0.6.0"
 serde = { version = "1.0.149", features = ["derive"] }
 hyper = "0.14.26"
 tokio = { version = "1.28.1", features = ["full"] }
 bytes = { version = "1.4.0" }
 once_cell = "1.17.1"
 thiserror = "1.0.40"
-deno_lockfile = "0.17.1"
+deno_lockfile = "0.17.2"
 async-trait = "0.1.73"
 indexmap = { version = "2.0.0", features = ["serde"] }
 flate2 = "=1.0.26"
@@ -58,16 +59,22 @@ regex = "^1.7.0"
 fs3 = "0.5.0"
 tokio-util = "0.7.4"
 uuid = { version = "1.3.0", features = ["v4"] }
-rsa = { version = "0.7.0", default-features = false, features = ["std", "pem", "hazmat"] }
-monch = "=0.4.3"
+rsa = { version = "0.9.3", default-features = false, features = ["std", "pem", "hazmat"] } # hazmat needed for PrehashSigner in ext/node
+monch = "=0.5.0"
 reqwest = { version = "0.11.20", default-features = false, features = ["rustls-tls", "stream", "gzip", "brotli", "socks", "json"] }
-ring = "=0.16.20"
+ring = "^0.17.0"
 urlencoding = { version = "2.1.2" }
-import_map = { version = "0.15.0" }
-base64 = { version = "=0.13.1" }
+import_map = { version = "=0.18.0", features = ["ext"] }
+base64 = "0.21.4"
 futures = { version = "0.3.28" }
 futures-util = { version = "0.3.28" }
 ctor = { version = "0.2.6" }
+percent-encoding = "=2.3.0"
+scopeguard = { version = "1.2.0" }
+
+# DEBUG
+#[patch.crates-io]
+#deno_core = { path = "/your/path/to/deno_core/core" }
 
 [profile.release]
 lto = true

Cargo.toml

@@ -14,12 +14,12 @@ deno_semver.workspace = true
 deno_npm.workspace = true
 cpu_timer = { version = "0.1.0", path = "../cpu_timer" }
 anyhow = { workspace = true }
-bytes = { version = "1.2.1" }
+bytes = { workspace = true }
 cityhash = { version = "0.1.1" }
 deno_ast = { workspace = true }
 deno_fs.workspace = true
 deno_io = { workspace = true }
-deno_core = { workspace = true }
+deno_core.workspace = true
 deno_console = { workspace = true }
 deno_crypto =  { workspace = true }
 deno_fetch = { workspace = true }
@@ -31,16 +31,16 @@ deno_webidl = { workspace = true }
 deno_web = { workspace = true }
 deno_websocket = { workspace = true }
 httparse = { version = "1.8.0" }
-hyper = { version = "0.14.26", features = ["full"] }
+hyper = { workspace = true, features = ["full"] }
 http = { version = "0.2" }
 import_map.workspace = true
 log = { workspace = true }
 reqwest.workspace = true
-serde = { version = "1.0.149", features = ["derive"] }
+serde = { workspace = true, features = ["derive"] }
 tokio = { workspace = true }
 tokio-util = { workspace = true, features = ["rt"] }
 futures-util = { workspace = true }
-url = { version = "2.3.1" }
+url.workspace = true
 event_worker ={ version = "0.1.0", path = "../event_worker" }
 sb_workers = { version = "0.1.0", path = "../sb_workers" }
 sb_env = { version = "0.1.0", path = "../sb_env" }
@@ -57,7 +57,7 @@ notify = { version = "6.1.1", default-features = false, features = ["macos_kqueu
 flume = { version = "0.11.0" }
 enum-as-inner.workspace = true
 urlencoding.workspace = true
-scopeguard = { version = "1.2.0" }
+scopeguard.workspace = true
 pin-project = { version = "1.1.3" }
 ctor = { workspace = true }
 
@@ -74,11 +74,10 @@ sb_env = { version = "0.1.0", path = "../sb_env" }
 sb_os = { version = "0.1.0", path = "../sb_os" }
 sb_node = { version = "0.1.0", path = "../node" }
 anyhow = { workspace = true }
-bytes = { version = "1.2.1" }
+bytes = { workspace = true }
 deno_ast = { workspace = true }
 deno_fs.workspace = true
 deno_io = { workspace = true }
-deno_core = { workspace = true }
 deno_console = { workspace = true }
 deno_crypto =  { workspace = true }
 deno_fetch = { workspace = true }
@@ -90,12 +89,13 @@ deno_webidl = { workspace = true }
 deno_web = { workspace = true }
 deno_websocket = { workspace = true }
 httparse = { version = "1.8.0" }
-hyper = { version = "0.14.26", features = ["full"] }
+hyper = { workspace = true, features = ["full"] }
 http = { version = "0.2" }
 log = { workspace = true }
 reqwest.workspace = true
-serde = { version = "1.0.149", features = ["derive"] }
+serde = { workspace = true, features = ["derive"] }
 tokio.workspace = true
-url = { version = "2.3.1" }
+url.workspace = true
 event_worker ={ version = "0.1.0", path = "../event_worker" }
 deno_broadcast_channel.workspace = true
+deno_core.workspace = true

crates/base/Cargo.toml

@@ -145,6 +145,14 @@ mod supabase_startup_snapshot {
             unreachable!("snapshotting!")
         }
 
+        fn check_read_with_api_name(
+            &self,
+            _path: &Path,
+            _api_name: Option<&str>,
+        ) -> Result<(), AnyError> {
+            unreachable!("snapshotting!")
+        }
+
         fn check_sys(&self, _kind: &str, _api_name: &str) -> Result<(), AnyError> {
             unreachable!("snapshotting!")
         }
@@ -203,6 +211,7 @@ mod supabase_startup_snapshot {
             cargo_manifest_dir: env!("CARGO_MANIFEST_DIR"),
             snapshot_path,
             startup_snapshot: None,
+            skip_op_registration: false,
             extensions,
             compression_cb: None,
             with_runtime_cb: None,

crates/base/build.rs

@@ -6,15 +6,19 @@ use cpu_timer::get_thread_time;
 use ctor::ctor;
 use deno_core::error::AnyError;
 use deno_core::url::Url;
-use deno_core::{located_script_name, serde_v8, JsRuntime, ModuleCode, ModuleId, RuntimeOptions};
+use deno_core::{
+    located_script_name, serde_v8, JsRuntime, ModuleCode, ModuleId, PollEventLoopOptions,
+    RuntimeOptions,
+};
 use deno_http::DefaultHttpPropertyExtractor;
+use deno_tls::deno_native_certs::load_native_certs;
 use deno_tls::rustls;
 use deno_tls::rustls::RootCertStore;
-use deno_tls::rustls_native_certs::load_native_certs;
 use deno_tls::RootCertStoreProvider;
 use futures_util::future::poll_fn;
 use log::{error, trace};
 use sb_core::conn_sync::ConnSync;
+use sb_core::util::sync::AtomicFlag;
 use serde::de::DeserializeOwned;
 use std::collections::HashMap;
 use std::fmt;
@@ -77,8 +81,11 @@ fn get_error_class_name(e: &AnyError) -> &'static str {
 pub struct DenoRuntime {
     pub js_runtime: JsRuntime,
     pub env_vars: HashMap<String, String>, // TODO: does this need to be pub?
-    main_module_id: ModuleId,
     pub conf: WorkerRuntimeOpts,
+    pub is_termination_requested: Arc<AtomicFlag>,
+    pub is_terminated: Arc<AtomicFlag>,
+
+    main_module_id: ModuleId,
 }
 
 impl DenoRuntime {
@@ -358,6 +365,8 @@ impl DenoRuntime {
             main_module_id,
             env_vars,
             conf,
+            is_termination_requested: Arc::default(),
+            is_terminated: Arc::default(),
         })
     }
 
@@ -393,6 +402,7 @@ impl DenoRuntime {
             js_runtime.mod_evaluate(self.main_module_id)
         };
 
+        let is_termination_requested = self.is_termination_requested.clone();
         let is_user_worker = self.conf.is_user_worker();
 
         #[cfg(debug_assertions)]
@@ -433,7 +443,13 @@ impl DenoRuntime {
                 Err(err) => return Poll::Ready(Err(err)),
             };
 
-            let poll_result = js_runtime.poll_event_loop(cx, false);
+            let poll_result = js_runtime.poll_event_loop(
+                cx,
+                PollEventLoopOptions {
+                    wait_for_inspector: false,
+                    pump_v8_message_loop: true,
+                },
+            );
 
             let cpu_time_after_poll_ns = match get_current_cpu_time_ns_fn() {
                 Ok(value) => value,
@@ -458,21 +474,26 @@ impl DenoRuntime {
                 );
             }
 
+            if poll_result.is_pending() && is_termination_requested.is_raised() {
+                return Poll::Ready(Ok(()));
+            }
+
             poll_result
         })
         .await
         {
             Err(err) => Err(anyhow!("event loop error: {}", err)),
             Ok(_) => match mod_result_rx.await {
-                Err(_) => Err(anyhow!("mod result sender dropped")),
-                Ok(Err(err)) => {
-                    error!("{}", err.to_string());
-                    Err(err)
+                Err(e) => {
+                    error!("{}", e.to_string());
+                    Err(e)
                 }
-                Ok(Ok(_)) => Ok(()),
+                Ok(_) => Ok(()),
             },
         };
 
+        self.is_terminated.raise();
+
         (result, accumulated_cpu_time_ns)
     }
 
@@ -512,7 +533,7 @@ fn set_v8_flags() {
 #[cfg(test)]
 mod test {
     use crate::deno_runtime::DenoRuntime;
-    use deno_core::{FastString, ModuleCode};
+    use deno_core::{FastString, ModuleCode, PollEventLoopOptions};
     use sb_core::conn_sync::ConnSync;
     use sb_graph::emitter::EmitterFactory;
     use sb_graph::{generate_binary_eszip, EszipPayloadKind};
@@ -597,7 +618,13 @@ mod test {
         }
 
         let main_mod_ev = rt.js_runtime.mod_evaluate(rt.main_module_id);
-        let _ = rt.js_runtime.run_event_loop(false).await;
+        let _ = rt
+            .js_runtime
+            .run_event_loop(PollEventLoopOptions {
+                wait_for_inspector: false,
+                pump_v8_message_loop: true,
+            })
+            .await;
 
         let read_is_even_global = rt
             .js_runtime
@@ -652,7 +679,13 @@ mod test {
         }
 
         let main_mod_ev = rt.js_runtime.mod_evaluate(rt.main_module_id);
-        let _ = rt.js_runtime.run_event_loop(false).await;
+        let _ = rt
+            .js_runtime
+            .run_event_loop(PollEventLoopOptions {
+                wait_for_inspector: false,
+                pump_v8_message_loop: true,
+            })
+            .await;
 
         let read_is_even_global = rt
             .js_runtime

crates/base/src/deno_runtime.rs

@@ -1,11 +1,11 @@
 #[macro_export]
 macro_rules! integration_test {
-    ($main_file:expr, $port:expr, $url:expr, ($($function:tt)+) $(, $termination_token: expr)?) => {
+    ($main_file:expr, $port:expr, $url:expr, $shot_policy:expr, $import_map:expr, $req_builder:expr, ($($function:tt)+) $(, $termination_token: expr)?) => {
         let (tx, mut rx) = tokio::sync::mpsc::channel::<base::server::ServerHealth>(1);
 
         let signal = tokio::spawn(async move {
             while let Some(base::server::ServerHealth::Listening(event_rx)) = rx.recv().await {
-                integration_test!(@req event_rx, $port, $url, ($($function)+));
+                integration_test!(@req event_rx, $port, $url, $req_builder, ($($function)+));
             }
             None
         });
@@ -24,8 +24,8 @@ macro_rules! integration_test {
                 $port,
                 String::from($main_file),
                 None,
-                None,
-                None,
+                $shot_policy,
+                $import_map,
                 false,
                 Some(tx.clone()),
                 $crate::server::WorkerEntrypoints {
@@ -47,13 +47,17 @@ macro_rules! integration_test {
         None
     };
 
-    (@req $event_rx:ident, $port:expr, $url:expr, ($req:expr, $_:expr)) => {
-        return $req($port, $url, $event_rx).await;
+    (@req $event_rx:ident, $port:expr, $url:expr, $req_builder:expr, ($req:expr, $_:expr)) => {
+        return $req($port, $url, $req_builder, $event_rx).await;
     };
 
-    (@req $_:ident, $port:expr, $url:expr, $__:expr) => {
-        let req = reqwest::get(format!("http://localhost:{}/{}", $port, $url)).await;
-        return Some(req);
+    (@req $_:ident, $port:expr, $url:expr, $req_builder:expr, $__:expr) => {
+        if let Some(req_factory) = $req_builder {
+            return Some(req_factory.send().await);
+        } else {
+            let req = reqwest::get(format!("http://localhost:{}/{}", $port, $url)).await;
+            return Some(req);
+        }
     };
 
     (@resp $var:ident, ($_:expr, $resp:expr)) => {