diff --git a/Cargo.lock b/Cargo.lock index dca40f85d..486ba8db5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -942,9 +942,9 @@ dependencies = [ [[package]] name = "deno_broadcast_channel" -version = "0.114.0" +version = "0.115.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd3b2940ff536e31fd7ad5f73916a7bbb6467a5d109c4dcff8cf53e8a69cf92" +checksum = "0925a49d5044bac69707fc188dea6600428a3f7f5d15e0d050c10edff508bba6" dependencies = [ "async-trait", "deno_core", @@ -991,18 +991,18 @@ dependencies = [ [[package]] name = "deno_console" -version = "0.120.0" +version = "0.121.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9717cd47758a9ed7551e50eba37dae3e6237e4fdc63133578d5cb66758e1b342" +checksum = "b72cbce2b28d1ede2669f4ddfbb2e68e8e360c4cfe9494686bec4ffd60aeee4b" dependencies = [ "deno_core", ] [[package]] name = "deno_core" -version = "0.218.0" +version = "0.222.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525a5a8af1def85c6c3f0ead2300c18fce14868f94b66ee7f4fec466a4c7c938" +checksum = "b13c81b9ea8462680e7b77088a44fc36390bab3dbfa5a205a285e11b64e0919c" dependencies = [ "anyhow", "bytes", @@ -1027,9 +1027,9 @@ dependencies = [ [[package]] name = "deno_crypto" -version = "0.134.0" +version = "0.135.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32dc0679f71cb9f60fe618bf8182e81f491548e298da9b3f4fffdcdd043d5174" +checksum = "e424549a4d7a590288a99b7da36cc0c9b4b6f252aca0acbd21f9adf096b6ac21" dependencies = [ "aes", "aes-gcm", @@ -1063,9 +1063,9 @@ dependencies = [ [[package]] name = "deno_fetch" -version = "0.144.0" +version = "0.145.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0781ec6f70fab23144078c79e4359860cd85bde2759d14fd477e7586176a9ec5" +checksum = "4b361ef11c46e35de395ac0348f129094086ad913c9fb377085eef36eb653ed8" dependencies = [ "bytes", "data-url", @@ -1081,9 +1081,9 @@ dependencies = [ [[package]] name = "deno_fs" -version = "0.30.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51fa26124bf30b134633eff27446a33edf6f9739576b95e006eaa7e6cd03e15d" +checksum = "59043690e9b9ae5c51001ef3716a37c8d783dc926417174a2f2da2dff243e783" dependencies = [ "async-trait", "deno_core", @@ -1124,9 +1124,9 @@ dependencies = [ [[package]] name = "deno_http" -version = "0.115.0" +version = "0.116.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e286bf5e627adfcd895cd89c417b82a7b628dfbd5eab04d5135e61ad1bb3663a" +checksum = "59571ba7bea3c528784041c45e0cf2a07646de57017189eb2465f5c591842a7c" dependencies = [ "async-compression", "async-trait", @@ -1161,9 +1161,9 @@ dependencies = [ [[package]] name = "deno_io" -version = "0.30.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9a3d355a1487498025662a959c705573964c0f1c55b4d1a8fc6546caea657d9" +checksum = "b3e98905198ac3370fadd03c24ec9a7abc37d60a8ef8c091bbd9d8db83798e2c" dependencies = [ "async-trait", "deno_core", @@ -1199,9 +1199,9 @@ dependencies = [ [[package]] name = "deno_net" -version = "0.112.0" +version = "0.113.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eab9b1f26d9595fc7ebc2d45ac96369262c7977ab4b5548ba8481527404763ec" +checksum = "d8e93ca934bac8b4058e91010330397dd5d761b98a88d48660c7ee56782b4190" dependencies = [ "deno_core", "deno_tls", @@ -1234,9 +1234,9 @@ dependencies = [ [[package]] name = "deno_ops" -version = "0.94.0" +version = "0.98.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e77ea556bab98499a1a482fe02345c35251f8050e00aebd85a4e5eab34bc15a8" +checksum = "bf89da1a3e50ff7c89956495b53d9bcad29e1f1b3f3d2bc54cad7155f55419c4" dependencies = [ "deno-proc-macro-rules", "lazy-regex", @@ -1280,9 +1280,9 @@ dependencies = [ [[package]] name = "deno_tls" -version = "0.107.0" +version = "0.108.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c1439c26abd5a282ebdf16d974c0c6349d48f680f24563f07db7f6c1b5a03de" +checksum = "127aa913635496873135691c34e54e058c0d3d8565a601c0422e5b1ab3c8447c" dependencies = [ "deno_core", "once_cell", @@ -1305,9 +1305,9 @@ dependencies = [ [[package]] name = "deno_url" -version = "0.120.0" +version = "0.121.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47dcced032b60c40920e2c4586565838a52f53e423610196d0e42404d1cd4c10" +checksum = "d1511f888bd2a7c458c31536f5a13403202b5443ed01eeab8b6eb5b5eaff29e2" dependencies = [ "deno_core", "serde", @@ -1316,9 +1316,9 @@ dependencies = [ [[package]] name = "deno_web" -version = "0.151.0" +version = "0.152.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "250af5b87fb58b4582fcbb851cce0da4e677f526438c2d96bf0b36caedfbd0ef" +checksum = "5176dfde7c04c999cf83afea82ed13434d56d7330733eaf31ef7953e7da081f5" dependencies = [ "async-trait", "base64-simd", @@ -1335,18 +1335,18 @@ dependencies = [ [[package]] name = "deno_webidl" -version = "0.120.0" +version = "0.121.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51ead87def72804607526d4068f67ba74954d8f851732fa2290cb4279430f3c9" +checksum = "d1358d0bd1ebe7286e7beb0f81848ff1478a08ead6191d6b2ad16bf9b6d712b3" dependencies = [ "deno_core", ] [[package]] name = "deno_websocket" -version = "0.125.0" +version = "0.126.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4390e67affc872484f2894645c5003524cea6cfd0ada312aa9bf08d365775c1d" +checksum = "0fabfc7174995cd9bfe115a3047cdcc2dca272cf15fd98885f23579638fc5567" dependencies = [ "bytes", "deno_core", @@ -1363,9 +1363,9 @@ dependencies = [ [[package]] name = "deno_webstorage" -version = "0.115.0" +version = "0.116.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8487d8bb2aa022bd39003efb083eb13ca44856be55eee180db0c4b674ec2328" +checksum = "50a8fc80eb4b84971a7716827baa4f3c64f1adb0973b0a12ed5019af316666ec" dependencies = [ "deno_core", "deno_web", @@ -4004,9 +4004,9 @@ dependencies = [ [[package]] name = "serde_v8" -version = "0.127.0" +version = "0.131.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb569e75e34db7e307901dbed94a3cb5dfb2b601a90f9cb1f2ede5f779f274ca" +checksum = "38cafa16d0a4288d75925351bb54d06d2e830118ad3fad393947bb11f91b18f3" dependencies = [ "bytes", "derive_more", @@ -5266,9 +5266,9 @@ dependencies = [ [[package]] name = "v8" -version = "0.78.0" +version = "0.79.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6c96f70e8fc6c009af99d4e8ac4f5e84655a0fc3ec6e58147933b9c99f8b43c" +checksum = "b15561535230812a1db89a696f1f16a12ae6c2c370c6b2241c68d4cb33963faf" dependencies = [ "bitflags 1.3.2", "fslock", diff --git a/Cargo.toml b/Cargo.toml index 24f5dafe3..1c36b49a2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,23 +21,26 @@ log = "0.4.20" anyhow = { version = "1.0.57" } libc = { version = "0.2.144" } deno_ast = { version = "0.29.1", features = [ "cjs", "transpiling" ] } -deno_core = { version = "0.218.0" } -deno_console = { version = "0.120.0" } -deno_crypto = { version = "0.134.0" } -deno_fetch = { version = "0.144.0" } -deno_broadcast_channel = { version = "0.114.0" } -deno_fs = "0.30.0" +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 = "0.31.0" deno_config = "=0.3.1" -deno_io = "0.30.0" +deno_io = "0.31.0" deno_graph = "=0.55.0" -deno_http = { version = "0.115.0" } -deno_net = { version = "0.112.0" } -deno_url = { version = "0.120.0" } -deno_tls = { version = "0.107.0"} -deno_webidl = { version = "0.120.0" } -deno_web = { version = "0.151.0" } -deno_websocket = { version = "0.125.0" } -deno_webstorage = { version = "0.115.0" } +deno_http = { version = "0.116.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" } serde = { version = "1.0.149", features = ["derive"] } hyper = "0.14.26" tokio = { version = "1.28.1", features = ["full"] } @@ -53,9 +56,7 @@ 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"] } -deno_media_type = { version = "0.1.1", features = ["module_specifier"] } -deno_npm = "0.15.1" -deno_semver = "0.5.0" + reqwest = { version = "0.11.20", default-features = false, features = ["rustls-tls", "stream", "gzip", "brotli", "socks", "json"] } ring = "=0.16.20" diff --git a/crates/base/build.rs b/crates/base/build.rs index bc1256cb0..5a15c1b71 100644 --- a/crates/base/build.rs +++ b/crates/base/build.rs @@ -114,10 +114,6 @@ mod supabase_startup_snapshot { fn allow_hrtime(&mut self) -> bool { unreachable!("snapshotting!") } - - fn check_unstable(&self, _state: &deno_core::OpState, _api_name: &'static str) { - unreachable!("snapshotting!") - } } impl deno_websocket::WebSocketPermissions for Permissions { @@ -215,13 +211,12 @@ mod supabase_startup_snapshot { deno_crypto::deno_crypto::init_ops_and_esm(None), deno_broadcast_channel::deno_broadcast_channel::init_ops_and_esm( deno_broadcast_channel::InMemoryBroadcastChannel::default(), - false, ), - deno_net::deno_net::init_ops_and_esm::(None, false, None), + deno_net::deno_net::init_ops_and_esm::(None, None), deno_tls::deno_tls::init_ops_and_esm(), deno_http::deno_http::init_ops_and_esm::(), deno_io::deno_io::init_ops_and_esm(Some(Default::default())), - deno_fs::deno_fs::init_ops_and_esm::(false, fs.clone()), + deno_fs::deno_fs::init_ops_and_esm::(fs.clone()), sb_env::init_ops_and_esm(), sb_os::sb_os::init_ops_and_esm(), sb_user_workers::init_ops_and_esm(), diff --git a/crates/base/src/deno_runtime.rs b/crates/base/src/deno_runtime.rs index 3d6b5fef6..934e8aebe 100644 --- a/crates/base/src/deno_runtime.rs +++ b/crates/base/src/deno_runtime.rs @@ -226,17 +226,12 @@ impl DenoRuntime { deno_crypto::deno_crypto::init_ops(None), deno_broadcast_channel::deno_broadcast_channel::init_ops( deno_broadcast_channel::InMemoryBroadcastChannel::default(), - false, - ), - deno_net::deno_net::init_ops::( - Some(root_cert_store_provider), - false, - None, ), + deno_net::deno_net::init_ops::(Some(root_cert_store_provider), None), deno_tls::deno_tls::init_ops(), deno_http::deno_http::init_ops::(), deno_io::deno_io::init_ops(stdio), - deno_fs::deno_fs::init_ops::(false, fs.clone()), + deno_fs::deno_fs::init_ops::(fs.clone()), sb_env_op::init_ops(), sb_os::sb_os::init_ops(), sb_user_workers::init_ops(), diff --git a/crates/base/test_cases/main_with_abort/index.ts b/crates/base/test_cases/main_with_abort/index.ts index e291dbaa7..c7d2735d1 100644 --- a/crates/base/test_cases/main_with_abort/index.ts +++ b/crates/base/test_cases/main_with_abort/index.ts @@ -42,7 +42,7 @@ serve(async (req: Request) => { const worker = await createWorker(); const controller = new AbortController(); const signal = controller.signal; - controller.abort(new Error('Test abort')); + controller.abort(); return await worker.fetch(req, { signal }); } catch (e) { console.error(e); diff --git a/crates/base/tests/main_worker_tests.rs b/crates/base/tests/main_worker_tests.rs index 94b8c13b8..cb2ec9ce4 100644 --- a/crates/base/tests/main_worker_tests.rs +++ b/crates/base/tests/main_worker_tests.rs @@ -160,7 +160,10 @@ async fn test_main_worker_abort_request() { let body_bytes = hyper::body::to_bytes(res.into_body()).await.unwrap(); - assert_eq!(body_bytes, "{\"msg\":\"Error: Test abort\"}"); + assert_eq!( + body_bytes, + "{\"msg\":\"AbortError: The signal has been aborted\"}" + ); } //#[tokio::test] diff --git a/crates/node/Cargo.toml b/crates/node/Cargo.toml index 5bf280684..756631a38 100644 --- a/crates/node/Cargo.toml +++ b/crates/node/Cargo.toml @@ -69,4 +69,4 @@ whoami = "1.4.0" winapi = "=0.3.9" # https://github.com/dalek-cryptography/x25519-dalek/pull/89 x25519-dalek = "2.0.0-pre.1" -x509-parser = "0.15.0" \ No newline at end of file +x509-parser = "0.15.0" diff --git a/crates/sb_core/permissions.rs b/crates/sb_core/permissions.rs index 152a468b8..00caf1754 100644 --- a/crates/sb_core/permissions.rs +++ b/crates/sb_core/permissions.rs @@ -50,8 +50,6 @@ impl deno_web::TimersPermission for Permissions { fn allow_hrtime(&mut self) -> bool { false } - - fn check_unstable(&self, _state: &deno_core::OpState, _api_name: &'static str) {} } impl deno_fetch::FetchPermissions for Permissions {