diff --git a/.github/workflows/ci.generate.ts b/.github/workflows/ci.generate.ts
index d18ec6e1a8..98272abe4e 100755
--- a/.github/workflows/ci.generate.ts
+++ b/.github/workflows/ci.generate.ts
@@ -5,7 +5,7 @@ import { stringify } from "jsr:@std/yaml@^0.221/stringify";
// Bump this number when you want to purge the cache.
// Note: the tools/release/01_bump_crate_versions.ts script will update this version
// automatically via regex, so ensure that this line maintains this format.
-const cacheVersion = 20;
+const cacheVersion = 21;
const ubuntuX86Runner = "ubuntu-22.04";
const ubuntuX86XlRunner = "ubuntu-22.04-xl";
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1353bf4a6f..161b8719c8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -361,8 +361,8 @@ jobs:
path: |-
~/.cargo/registry/index
~/.cargo/registry/cache
- key: '20-cargo-home-${{ matrix.os }}-${{ matrix.arch }}-${{ hashFiles(''Cargo.lock'') }}'
- restore-keys: '20-cargo-home-${{ matrix.os }}-${{ matrix.arch }}'
+ key: '21-cargo-home-${{ matrix.os }}-${{ matrix.arch }}-${{ hashFiles(''Cargo.lock'') }}'
+ restore-keys: '21-cargo-home-${{ matrix.os }}-${{ matrix.arch }}'
if: '!(matrix.skip)'
- name: Restore cache build output (PR)
uses: actions/cache/restore@v4
@@ -375,7 +375,7 @@ jobs:
!./target/*/*.zip
!./target/*/*.tar.gz
key: never_saved
- restore-keys: '20-cargo-target-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.profile }}-${{ matrix.job }}-'
+ restore-keys: '21-cargo-target-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.profile }}-${{ matrix.job }}-'
- name: Apply and update mtime cache
if: '!(matrix.skip) && (!startsWith(github.ref, ''refs/tags/''))'
uses: ./.github/mtime_cache
@@ -685,7 +685,7 @@ jobs:
!./target/*/*.zip
!./target/*/*.sha256sum
!./target/*/*.tar.gz
- key: '20-cargo-target-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.profile }}-${{ matrix.job }}-${{ github.sha }}'
+ key: '21-cargo-target-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.profile }}-${{ matrix.job }}-${{ github.sha }}'
publish-canary:
name: publish canary
runs-on: ubuntu-22.04
diff --git a/Cargo.lock b/Cargo.lock
index c8807b65d5..bcbbaaae03 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1154,7 +1154,7 @@ dependencies = [
[[package]]
name = "deno"
-version = "2.0.1"
+version = "2.0.2"
dependencies = [
"anstream",
"async-trait",
@@ -1328,7 +1328,7 @@ dependencies = [
[[package]]
name = "deno_bench_util"
-version = "0.166.0"
+version = "0.167.0"
dependencies = [
"bencher",
"deno_core",
@@ -1337,7 +1337,7 @@ dependencies = [
[[package]]
name = "deno_broadcast_channel"
-version = "0.166.0"
+version = "0.167.0"
dependencies = [
"async-trait",
"deno_core",
@@ -1348,7 +1348,7 @@ dependencies = [
[[package]]
name = "deno_cache"
-version = "0.104.0"
+version = "0.105.0"
dependencies = [
"async-trait",
"deno_core",
@@ -1381,7 +1381,7 @@ dependencies = [
[[package]]
name = "deno_canvas"
-version = "0.41.0"
+version = "0.42.0"
dependencies = [
"deno_core",
"deno_webgpu",
@@ -1416,16 +1416,16 @@ dependencies = [
[[package]]
name = "deno_console"
-version = "0.172.0"
+version = "0.173.0"
dependencies = [
"deno_core",
]
[[package]]
name = "deno_core"
-version = "0.313.0"
+version = "0.314.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29f36be738d78e39b6603a6b07f1cf91e28baf3681f87205f07482999e0d0bc2"
+checksum = "1fcd11ab87426c611b7170138a768dad7170c8fb66d8095b773d25e58fd254ea"
dependencies = [
"anyhow",
"bincode",
@@ -1461,7 +1461,7 @@ checksum = "a13951ea98c0a4c372f162d669193b4c9d991512de9f2381dd161027f34b26b1"
[[package]]
name = "deno_cron"
-version = "0.52.0"
+version = "0.53.0"
dependencies = [
"anyhow",
"async-trait",
@@ -1474,7 +1474,7 @@ dependencies = [
[[package]]
name = "deno_crypto"
-version = "0.186.0"
+version = "0.187.0"
dependencies = [
"aes",
"aes-gcm",
@@ -1534,7 +1534,7 @@ dependencies = [
[[package]]
name = "deno_fetch"
-version = "0.196.0"
+version = "0.197.0"
dependencies = [
"base64 0.21.7",
"bytes",
@@ -1566,7 +1566,7 @@ dependencies = [
[[package]]
name = "deno_ffi"
-version = "0.159.0"
+version = "0.160.0"
dependencies = [
"deno_core",
"deno_permissions",
@@ -1585,7 +1585,7 @@ dependencies = [
[[package]]
name = "deno_fs"
-version = "0.82.0"
+version = "0.83.0"
dependencies = [
"async-trait",
"base32",
@@ -1635,7 +1635,7 @@ dependencies = [
[[package]]
name = "deno_http"
-version = "0.170.0"
+version = "0.171.0"
dependencies = [
"async-compression",
"async-trait",
@@ -1674,7 +1674,7 @@ dependencies = [
[[package]]
name = "deno_io"
-version = "0.82.0"
+version = "0.83.0"
dependencies = [
"async-trait",
"deno_core",
@@ -1695,7 +1695,7 @@ dependencies = [
[[package]]
name = "deno_kv"
-version = "0.80.0"
+version = "0.81.0"
dependencies = [
"anyhow",
"async-trait",
@@ -1720,6 +1720,7 @@ dependencies = [
"rand",
"rusqlite",
"serde",
+ "thiserror",
"url",
]
@@ -1766,11 +1767,12 @@ dependencies = [
[[package]]
name = "deno_napi"
-version = "0.103.0"
+version = "0.104.0"
dependencies = [
"deno_core",
"deno_permissions",
"libloading 0.7.4",
+ "thiserror",
]
[[package]]
@@ -1788,7 +1790,7 @@ dependencies = [
[[package]]
name = "deno_net"
-version = "0.164.0"
+version = "0.165.0"
dependencies = [
"deno_core",
"deno_permissions",
@@ -1797,6 +1799,7 @@ dependencies = [
"rustls-tokio-stream",
"serde",
"socket2",
+ "thiserror",
"tokio",
"trust-dns-proto",
"trust-dns-resolver",
@@ -1804,7 +1807,7 @@ dependencies = [
[[package]]
name = "deno_node"
-version = "0.109.0"
+version = "0.110.0"
dependencies = [
"aead-gcm-stream",
"aes",
@@ -1913,9 +1916,9 @@ dependencies = [
[[package]]
name = "deno_ops"
-version = "0.189.0"
+version = "0.190.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8f998ad1d5b36064109367ffe67b1088385eb3d8025efc95e445bc013a147a2"
+checksum = "a48a3e06cace18a2c49e148da067678c6af80e70757a8c3991301397cf6b9919"
dependencies = [
"proc-macro-rules",
"proc-macro2",
@@ -1953,7 +1956,7 @@ dependencies = [
[[package]]
name = "deno_permissions"
-version = "0.32.0"
+version = "0.33.0"
dependencies = [
"deno_core",
"deno_path_util",
@@ -1970,7 +1973,7 @@ dependencies = [
[[package]]
name = "deno_resolver"
-version = "0.4.0"
+version = "0.5.0"
dependencies = [
"anyhow",
"base32",
@@ -1986,7 +1989,7 @@ dependencies = [
[[package]]
name = "deno_runtime"
-version = "0.181.0"
+version = "0.182.0"
dependencies = [
"color-print",
"deno_ast",
@@ -2102,7 +2105,7 @@ dependencies = [
[[package]]
name = "deno_tls"
-version = "0.159.0"
+version = "0.160.0"
dependencies = [
"deno_core",
"deno_native_certs",
@@ -2151,7 +2154,7 @@ dependencies = [
[[package]]
name = "deno_url"
-version = "0.172.0"
+version = "0.173.0"
dependencies = [
"deno_bench_util",
"deno_console",
@@ -2163,7 +2166,7 @@ dependencies = [
[[package]]
name = "deno_web"
-version = "0.203.0"
+version = "0.204.0"
dependencies = [
"async-trait",
"base64-simd 0.8.0",
@@ -2178,13 +2181,14 @@ dependencies = [
"flate2",
"futures",
"serde",
+ "thiserror",
"tokio",
"uuid",
]
[[package]]
name = "deno_webgpu"
-version = "0.139.0"
+version = "0.140.0"
dependencies = [
"deno_core",
"raw-window-handle",
@@ -2196,7 +2200,7 @@ dependencies = [
[[package]]
name = "deno_webidl"
-version = "0.172.0"
+version = "0.173.0"
dependencies = [
"deno_bench_util",
"deno_core",
@@ -2204,7 +2208,7 @@ dependencies = [
[[package]]
name = "deno_websocket"
-version = "0.177.0"
+version = "0.178.0"
dependencies = [
"bytes",
"deno_core",
@@ -2225,7 +2229,7 @@ dependencies = [
[[package]]
name = "deno_webstorage"
-version = "0.167.0"
+version = "0.168.0"
dependencies = [
"deno_core",
"deno_web",
@@ -4511,7 +4515,7 @@ dependencies = [
[[package]]
name = "napi_sym"
-version = "0.102.0"
+version = "0.103.0"
dependencies = [
"quote",
"serde",
@@ -4580,7 +4584,7 @@ dependencies = [
[[package]]
name = "node_resolver"
-version = "0.11.0"
+version = "0.12.0"
dependencies = [
"anyhow",
"async-trait",
@@ -6211,9 +6215,9 @@ dependencies = [
[[package]]
name = "serde_v8"
-version = "0.222.0"
+version = "0.223.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27130b5cd87f6f06228940a1f3a7ecc988ea13d1bede1398a48d74cb59dabc9a"
+checksum = "c127bb9f2024433d06789b242477c808fd7f7dc4c3278576dd5bc99c4e5c75ff"
dependencies = [
"num-bigint",
"serde",
diff --git a/Cargo.toml b/Cargo.toml
index e8919eade7..3bf5342b8e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -46,18 +46,18 @@ repository = "https://github.com/denoland/deno"
[workspace.dependencies]
deno_ast = { version = "=0.42.2", features = ["transpiling"] }
-deno_core = { version = "0.313.0" }
+deno_core = { version = "0.314.1" }
-deno_bench_util = { version = "0.166.0", path = "./bench_util" }
+deno_bench_util = { version = "0.167.0", path = "./bench_util" }
deno_lockfile = "=0.23.1"
deno_media_type = { version = "0.1.4", features = ["module_specifier"] }
deno_npm = "=0.25.4"
deno_path_util = "=0.2.1"
-deno_permissions = { version = "0.32.0", path = "./runtime/permissions" }
-deno_runtime = { version = "0.181.0", path = "./runtime" }
+deno_permissions = { version = "0.33.0", path = "./runtime/permissions" }
+deno_runtime = { version = "0.182.0", path = "./runtime" }
deno_semver = "=0.5.14"
deno_terminal = "0.2.0"
-napi_sym = { version = "0.102.0", path = "./cli/napi/sym" }
+napi_sym = { version = "0.103.0", path = "./cli/napi/sym" }
test_util = { package = "test_server", path = "./tests/util/server" }
denokv_proto = "0.8.1"
@@ -66,32 +66,32 @@ denokv_remote = "0.8.1"
denokv_sqlite = { default-features = false, version = "0.8.2" }
# exts
-deno_broadcast_channel = { version = "0.166.0", path = "./ext/broadcast_channel" }
-deno_cache = { version = "0.104.0", path = "./ext/cache" }
-deno_canvas = { version = "0.41.0", path = "./ext/canvas" }
-deno_console = { version = "0.172.0", path = "./ext/console" }
-deno_cron = { version = "0.52.0", path = "./ext/cron" }
-deno_crypto = { version = "0.186.0", path = "./ext/crypto" }
-deno_fetch = { version = "0.196.0", path = "./ext/fetch" }
-deno_ffi = { version = "0.159.0", path = "./ext/ffi" }
-deno_fs = { version = "0.82.0", path = "./ext/fs" }
-deno_http = { version = "0.170.0", path = "./ext/http" }
-deno_io = { version = "0.82.0", path = "./ext/io" }
-deno_kv = { version = "0.80.0", path = "./ext/kv" }
-deno_napi = { version = "0.103.0", path = "./ext/napi" }
-deno_net = { version = "0.164.0", path = "./ext/net" }
-deno_node = { version = "0.109.0", path = "./ext/node" }
-deno_tls = { version = "0.159.0", path = "./ext/tls" }
-deno_url = { version = "0.172.0", path = "./ext/url" }
-deno_web = { version = "0.203.0", path = "./ext/web" }
-deno_webgpu = { version = "0.139.0", path = "./ext/webgpu" }
-deno_webidl = { version = "0.172.0", path = "./ext/webidl" }
-deno_websocket = { version = "0.177.0", path = "./ext/websocket" }
-deno_webstorage = { version = "0.167.0", path = "./ext/webstorage" }
+deno_broadcast_channel = { version = "0.167.0", path = "./ext/broadcast_channel" }
+deno_cache = { version = "0.105.0", path = "./ext/cache" }
+deno_canvas = { version = "0.42.0", path = "./ext/canvas" }
+deno_console = { version = "0.173.0", path = "./ext/console" }
+deno_cron = { version = "0.53.0", path = "./ext/cron" }
+deno_crypto = { version = "0.187.0", path = "./ext/crypto" }
+deno_fetch = { version = "0.197.0", path = "./ext/fetch" }
+deno_ffi = { version = "0.160.0", path = "./ext/ffi" }
+deno_fs = { version = "0.83.0", path = "./ext/fs" }
+deno_http = { version = "0.171.0", path = "./ext/http" }
+deno_io = { version = "0.83.0", path = "./ext/io" }
+deno_kv = { version = "0.81.0", path = "./ext/kv" }
+deno_napi = { version = "0.104.0", path = "./ext/napi" }
+deno_net = { version = "0.165.0", path = "./ext/net" }
+deno_node = { version = "0.110.0", path = "./ext/node" }
+deno_tls = { version = "0.160.0", path = "./ext/tls" }
+deno_url = { version = "0.173.0", path = "./ext/url" }
+deno_web = { version = "0.204.0", path = "./ext/web" }
+deno_webgpu = { version = "0.140.0", path = "./ext/webgpu" }
+deno_webidl = { version = "0.173.0", path = "./ext/webidl" }
+deno_websocket = { version = "0.178.0", path = "./ext/websocket" }
+deno_webstorage = { version = "0.168.0", path = "./ext/webstorage" }
# resolvers
-deno_resolver = { version = "0.4.0", path = "./resolvers/deno" }
-node_resolver = { version = "0.11.0", path = "./resolvers/node" }
+deno_resolver = { version = "0.5.0", path = "./resolvers/deno" }
+node_resolver = { version = "0.12.0", path = "./resolvers/node" }
aes = "=0.8.3"
anyhow = "1.0.57"
diff --git a/Releases.md b/Releases.md
index 207e18e26d..08562134a1 100644
--- a/Releases.md
+++ b/Releases.md
@@ -6,6 +6,21 @@ https://github.com/denoland/deno/releases
We also have one-line install commands at:
https://github.com/denoland/deno_install
+### 2.0.2 / 2024.10.17
+
+- fix(cli): set napi object property properly (#26344)
+- fix(ext/node): add null check for kStreamBaseField (#26368)
+- fix(install): don't attempt to cache specifiers that point to directories
+ (#26369)
+- fix(jupyter): fix panics for overslow subtraction (#26371)
+- fix(jupyter): update to the new logo (#26353)
+- fix(net): don't try to set nodelay on upgrade streams (#26342)
+- fix(node/fs): copyFile with `COPYFILE_EXCL` should not throw if the
+ destination doesn't exist (#26360)
+- fix(node/http): normalize header names in `ServerResponse` (#26339)
+- fix(runtime): send ws ping frames from inspector server (#26352)
+- fix: don't warn on ignored signals on windows (#26332)
+
### 2.0.1 / 2024.10.16
- feat(lsp): "deno/didRefreshDenoConfigurationTree" notifications (#26215)
diff --git a/bench_util/Cargo.toml b/bench_util/Cargo.toml
index a233e42118..fbf30b9fcf 100644
--- a/bench_util/Cargo.toml
+++ b/bench_util/Cargo.toml
@@ -2,7 +2,7 @@
[package]
name = "deno_bench_util"
-version = "0.166.0"
+version = "0.167.0"
authors.workspace = true
edition.workspace = true
license.workspace = true
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index 04546cc9f1..7d6fc71622 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -2,7 +2,7 @@
[package]
name = "deno"
-version = "2.0.1"
+version = "2.0.2"
authors.workspace = true
default-run = "deno"
edition.workspace = true
diff --git a/cli/file_fetcher.rs b/cli/file_fetcher.rs
index 69daf14954..e92aca5420 100644
--- a/cli/file_fetcher.rs
+++ b/cli/file_fetcher.rs
@@ -333,7 +333,7 @@ impl FileFetcher {
)
})?;
- let bytes = blob.read_all().await?;
+ let bytes = blob.read_all().await;
let headers =
HashMap::from([("content-type".to_string(), blob.media_type.clone())]);
diff --git a/cli/napi/sym/Cargo.toml b/cli/napi/sym/Cargo.toml
index 287688e44f..7c9bf208c7 100644
--- a/cli/napi/sym/Cargo.toml
+++ b/cli/napi/sym/Cargo.toml
@@ -2,7 +2,7 @@
[package]
name = "napi_sym"
-version = "0.102.0"
+version = "0.103.0"
authors.workspace = true
edition.workspace = true
license.workspace = true
diff --git a/cli/tools/jupyter/resources/deno-logo-32x32.png b/cli/tools/jupyter/resources/deno-logo-32x32.png
index 97871a02ee..d59f251a24 100644
Binary files a/cli/tools/jupyter/resources/deno-logo-32x32.png and b/cli/tools/jupyter/resources/deno-logo-32x32.png differ
diff --git a/cli/tools/jupyter/resources/deno-logo-64x64.png b/cli/tools/jupyter/resources/deno-logo-64x64.png
index 1b9444ef63..37e98abafd 100644
Binary files a/cli/tools/jupyter/resources/deno-logo-64x64.png and b/cli/tools/jupyter/resources/deno-logo-64x64.png differ
diff --git a/cli/tools/jupyter/resources/deno-logo-svg.svg b/cli/tools/jupyter/resources/deno-logo-svg.svg
index d7bb9ef804..fbc22cd910 100644
--- a/cli/tools/jupyter/resources/deno-logo-svg.svg
+++ b/cli/tools/jupyter/resources/deno-logo-svg.svg
@@ -1 +1,17 @@
-
+
diff --git a/cli/tools/jupyter/server.rs b/cli/tools/jupyter/server.rs
index 0cd80f7ddd..5680ed4c13 100644
--- a/cli/tools/jupyter/server.rs
+++ b/cli/tools/jupyter/server.rs
@@ -329,7 +329,12 @@ impl JupyterServer {
})
.collect();
- (candidates, cursor_pos - prop_name.len())
+ if prop_name.len() > cursor_pos {
+ // TODO(bartlomieju): most likely not correct, but better than panicking because of sub with overflow
+ (candidates, cursor_pos)
+ } else {
+ (candidates, cursor_pos - prop_name.len())
+ }
} else {
// combine results of declarations and globalThis properties
let mut candidates = get_expression_property_names(
@@ -349,7 +354,12 @@ impl JupyterServer {
candidates.sort();
candidates.dedup(); // make sure to sort first
- (candidates, cursor_pos - expr.len())
+ if expr.len() > cursor_pos {
+ // TODO(bartlomieju): most likely not correct, but better than panicking because of sub with overflow
+ (candidates, cursor_pos)
+ } else {
+ (candidates, cursor_pos - expr.len())
+ }
};
connection
diff --git a/cli/tools/registry/pm/cache_deps.rs b/cli/tools/registry/pm/cache_deps.rs
index c8258e6009..b4cd1c2532 100644
--- a/cli/tools/registry/pm/cache_deps.rs
+++ b/cli/tools/registry/pm/cache_deps.rs
@@ -75,6 +75,13 @@ pub async fn cache_top_level_deps(
if entry.key.ends_with('/') && specifier.as_str().ends_with('/') {
continue;
}
+ if specifier.scheme() == "file" {
+ if let Ok(path) = specifier.to_file_path() {
+ if !path.is_file() {
+ continue;
+ }
+ }
+ }
roots.push(specifier.clone());
}
}
diff --git a/ext/broadcast_channel/Cargo.toml b/ext/broadcast_channel/Cargo.toml
index 95d480d248..7ca058a44a 100644
--- a/ext/broadcast_channel/Cargo.toml
+++ b/ext/broadcast_channel/Cargo.toml
@@ -2,7 +2,7 @@
[package]
name = "deno_broadcast_channel"
-version = "0.166.0"
+version = "0.167.0"
authors.workspace = true
edition.workspace = true
license.workspace = true
diff --git a/ext/cache/Cargo.toml b/ext/cache/Cargo.toml
index d0f260d9c3..dee4d7274d 100644
--- a/ext/cache/Cargo.toml
+++ b/ext/cache/Cargo.toml
@@ -2,7 +2,7 @@
[package]
name = "deno_cache"
-version = "0.104.0"
+version = "0.105.0"
authors.workspace = true
edition.workspace = true
license.workspace = true
diff --git a/ext/cache/lib.rs b/ext/cache/lib.rs
index 08661c3493..b9cc5427c2 100644
--- a/ext/cache/lib.rs
+++ b/ext/cache/lib.rs
@@ -28,7 +28,7 @@ pub enum CacheError {
Resource(deno_core::error::AnyError),
#[error(transparent)]
Other(deno_core::error::AnyError),
- #[error(transparent)]
+ #[error("{0}")]
Io(#[from] std::io::Error),
}
diff --git a/ext/canvas/Cargo.toml b/ext/canvas/Cargo.toml
index e88567ef13..6ca3d76c05 100644
--- a/ext/canvas/Cargo.toml
+++ b/ext/canvas/Cargo.toml
@@ -2,7 +2,7 @@
[package]
name = "deno_canvas"
-version = "0.41.0"
+version = "0.42.0"
authors.workspace = true
edition.workspace = true
license.workspace = true
diff --git a/ext/console/Cargo.toml b/ext/console/Cargo.toml
index d83afb1786..f83f7138d8 100644
--- a/ext/console/Cargo.toml
+++ b/ext/console/Cargo.toml
@@ -2,7 +2,7 @@
[package]
name = "deno_console"
-version = "0.172.0"
+version = "0.173.0"
authors.workspace = true
edition.workspace = true
license.workspace = true
diff --git a/ext/cron/Cargo.toml b/ext/cron/Cargo.toml
index 9aafa0b48c..ccd81de0cc 100644
--- a/ext/cron/Cargo.toml
+++ b/ext/cron/Cargo.toml
@@ -2,7 +2,7 @@
[package]
name = "deno_cron"
-version = "0.52.0"
+version = "0.53.0"
authors.workspace = true
edition.workspace = true
license.workspace = true
diff --git a/ext/crypto/Cargo.toml b/ext/crypto/Cargo.toml
index 143f4b0098..e3b59ed469 100644
--- a/ext/crypto/Cargo.toml
+++ b/ext/crypto/Cargo.toml
@@ -2,7 +2,7 @@
[package]
name = "deno_crypto"
-version = "0.186.0"
+version = "0.187.0"
authors.workspace = true
edition.workspace = true
license.workspace = true
diff --git a/ext/crypto/lib.rs b/ext/crypto/lib.rs
index c96029bf4a..b5bafc580b 100644
--- a/ext/crypto/lib.rs
+++ b/ext/crypto/lib.rs
@@ -149,10 +149,7 @@ pub fn op_crypto_get_random_values(
#[buffer] out: &mut [u8],
) -> Result<(), AnyError> {
if out.len() > 65536 {
- return Err(
- deno_web::DomExceptionQuotaExceededError::new(&format!("The ArrayBufferView's byte length ({}) exceeds the number of bytes of entropy available via this API (65536)", out.len()))
- .into(),
- );
+ return Err(custom_error("DOMExceptionQuotaExceededError", format!("The ArrayBufferView's byte length ({}) exceeds the number of bytes of entropy available via this API (65536)", out.len())));
}
let maybe_seeded_rng = state.try_borrow_mut::();
diff --git a/ext/fetch/Cargo.toml b/ext/fetch/Cargo.toml
index c8e2c858b6..ddb58a3f3f 100644
--- a/ext/fetch/Cargo.toml
+++ b/ext/fetch/Cargo.toml
@@ -2,7 +2,7 @@
[package]
name = "deno_fetch"
-version = "0.196.0"
+version = "0.197.0"
authors.workspace = true
edition.workspace = true
license.workspace = true
diff --git a/ext/ffi/Cargo.toml b/ext/ffi/Cargo.toml
index 9bca9d98f2..80b0180d0b 100644
--- a/ext/ffi/Cargo.toml
+++ b/ext/ffi/Cargo.toml
@@ -2,7 +2,7 @@
[package]
name = "deno_ffi"
-version = "0.159.0"
+version = "0.160.0"
authors.workspace = true
edition.workspace = true
license.workspace = true
diff --git a/ext/fs/Cargo.toml b/ext/fs/Cargo.toml
index 904483c798..a33347f9c7 100644
--- a/ext/fs/Cargo.toml
+++ b/ext/fs/Cargo.toml
@@ -2,7 +2,7 @@
[package]
name = "deno_fs"
-version = "0.82.0"
+version = "0.83.0"
authors.workspace = true
edition.workspace = true
license.workspace = true
diff --git a/ext/http/Cargo.toml b/ext/http/Cargo.toml
index f8e3bb38a2..6fa7598cb5 100644
--- a/ext/http/Cargo.toml
+++ b/ext/http/Cargo.toml
@@ -2,7 +2,7 @@
[package]
name = "deno_http"
-version = "0.170.0"
+version = "0.171.0"
authors.workspace = true
edition.workspace = true
license.workspace = true
diff --git a/ext/io/Cargo.toml b/ext/io/Cargo.toml
index 5a87977e05..8f407c820c 100644
--- a/ext/io/Cargo.toml
+++ b/ext/io/Cargo.toml
@@ -2,7 +2,7 @@
[package]
name = "deno_io"
-version = "0.82.0"
+version = "0.83.0"
authors.workspace = true
edition.workspace = true
license.workspace = true
diff --git a/ext/kv/Cargo.toml b/ext/kv/Cargo.toml
index 8aee80c575..f7b28af675 100644
--- a/ext/kv/Cargo.toml
+++ b/ext/kv/Cargo.toml
@@ -2,7 +2,7 @@
[package]
name = "deno_kv"
-version = "0.80.0"
+version = "0.81.0"
authors.workspace = true
edition.workspace = true
license.workspace = true
@@ -36,6 +36,7 @@ prost.workspace = true
rand.workspace = true
rusqlite.workspace = true
serde.workspace = true
+thiserror.workspace = true
url.workspace = true
[build-dependencies]
diff --git a/ext/kv/lib.rs b/ext/kv/lib.rs
index 13e4f1662f..a4ccfe3d63 100644
--- a/ext/kv/lib.rs
+++ b/ext/kv/lib.rs
@@ -12,15 +12,11 @@ use std::num::NonZeroU32;
use std::rc::Rc;
use std::time::Duration;
-use anyhow::bail;
use base64::prelude::BASE64_URL_SAFE;
use base64::Engine;
use chrono::DateTime;
use chrono::Utc;
-use deno_core::anyhow::Context;
use deno_core::error::get_custom_error_class;
-use deno_core::error::type_error;
-use deno_core::error::AnyError;
use deno_core::futures::StreamExt;
use deno_core::op2;
use deno_core::serde_v8::AnyValue;
@@ -118,12 +114,72 @@ impl Resource for DatabaseWatcherResource {
}
}
+#[derive(Debug, thiserror::Error)]
+pub enum KvError {
+ #[error(transparent)]
+ DatabaseHandler(deno_core::error::AnyError),
+ #[error(transparent)]
+ Resource(deno_core::error::AnyError),
+ #[error("Too many ranges (max {0})")]
+ TooManyRanges(usize),
+ #[error("Too many entries (max {0})")]
+ TooManyEntries(usize),
+ #[error("Too many checks (max {0})")]
+ TooManyChecks(usize),
+ #[error("Too many mutations (max {0})")]
+ TooManyMutations(usize),
+ #[error("Too many keys (max {0})")]
+ TooManyKeys(usize),
+ #[error("limit must be greater than 0")]
+ InvalidLimit,
+ #[error("Invalid boundary key")]
+ InvalidBoundaryKey,
+ #[error("Key too large for read (max {0} bytes)")]
+ KeyTooLargeToRead(usize),
+ #[error("Key too large for write (max {0} bytes)")]
+ KeyTooLargeToWrite(usize),
+ #[error("Total mutation size too large (max {0} bytes)")]
+ TotalMutationTooLarge(usize),
+ #[error("Total key size too large (max {0} bytes)")]
+ TotalKeyTooLarge(usize),
+ #[error(transparent)]
+ Kv(deno_core::error::AnyError),
+ #[error(transparent)]
+ Io(#[from] std::io::Error),
+ #[error("Queue message not found")]
+ QueueMessageNotFound,
+ #[error("Start key is not in the keyspace defined by prefix")]
+ StartKeyNotInKeyspace,
+ #[error("End key is not in the keyspace defined by prefix")]
+ EndKeyNotInKeyspace,
+ #[error("Start key is greater than end key")]
+ StartKeyGreaterThanEndKey,
+ #[error("Invalid check")]
+ InvalidCheck(#[source] KvCheckError),
+ #[error("Invalid mutation")]
+ InvalidMutation(#[source] KvMutationError),
+ #[error("Invalid enqueue")]
+ InvalidEnqueue(#[source] std::io::Error),
+ #[error("key cannot be empty")]
+ EmptyKey, // TypeError
+ #[error("Value too large (max {0} bytes)")]
+ ValueTooLarge(usize), // TypeError
+ #[error("enqueue payload too large (max {0} bytes)")]
+ EnqueuePayloadTooLarge(usize), // TypeError
+ #[error("invalid cursor")]
+ InvalidCursor,
+ #[error("cursor out of bounds")]
+ CursorOutOfBounds,
+ #[error("Invalid range")]
+ InvalidRange,
+}
+
#[op2(async)]
#[smi]
async fn op_kv_database_open(
state: Rc>,
#[string] path: Option,
-) -> Result
+) -> Result
where
DBH: DatabaseHandler + 'static,
{
@@ -134,7 +190,10 @@ where
.check_or_exit(UNSTABLE_FEATURE_NAME, "Deno.openKv");
state.borrow::>().clone()
};
- let db = handler.open(state.clone(), path).await?;
+ let db = handler
+ .open(state.clone(), path)
+ .await
+ .map_err(KvError::DatabaseHandler)?;
let rid = state.borrow_mut().resource_table.add(DatabaseResource {
db,
cancel_handle: CancelHandle::new_rc(),
@@ -184,8 +243,8 @@ enum ToV8Value {
}
impl TryFrom for KvValue {
- type Error = AnyError;
- fn try_from(value: FromV8Value) -> Result {
+ type Error = num_bigint::TryFromBigIntError;
+ fn try_from(value: FromV8Value) -> Result {
Ok(match value {
FromV8Value::V8(buf) => KvValue::V8(buf.to_vec()),
FromV8Value::Bytes(buf) => KvValue::Bytes(buf.to_vec()),
@@ -214,8 +273,8 @@ struct ToV8KvEntry {
}
impl TryFrom for ToV8KvEntry {
- type Error = AnyError;
- fn try_from(entry: KvEntry) -> Result {
+ type Error = std::io::Error;
+ fn try_from(entry: KvEntry) -> Result {
Ok(ToV8KvEntry {
key: decode_key(&entry.key)?
.0
@@ -261,14 +320,16 @@ async fn op_kv_snapshot_read(
#[smi] rid: ResourceId,
#[serde] ranges: Vec,
#[serde] consistency: V8Consistency,
-) -> Result>, AnyError>
+) -> Result>, KvError>
where
DBH: DatabaseHandler + 'static,
{
let db = {
let state = state.borrow();
- let resource =
- state.resource_table.get::>(rid)?;
+ let resource = state
+ .resource_table
+ .get::>(rid)
+ .map_err(KvError::Resource)?;
resource.db.clone()
};
@@ -278,10 +339,7 @@ where
};
if ranges.len() > config.max_read_ranges {
- return Err(type_error(format!(
- "Too many ranges (max {})",
- config.max_read_ranges
- )));
+ return Err(KvError::TooManyRanges(config.max_read_ranges));
}
let mut total_entries = 0usize;
@@ -300,33 +358,32 @@ where
Ok(ReadRange {
start,
end,
- limit: NonZeroU32::new(limit)
- .with_context(|| "limit must be greater than 0")?,
+ limit: NonZeroU32::new(limit).ok_or(KvError::InvalidLimit)?,
reverse,
})
})
- .collect::, AnyError>>()?;
+ .collect::, KvError>>()?;
if total_entries > config.max_read_entries {
- return Err(type_error(format!(
- "Too many entries (max {})",
- config.max_read_entries
- )));
+ return Err(KvError::TooManyEntries(config.max_read_entries));
}
let opts = SnapshotReadOptions {
consistency: consistency.into(),
};
- let output_ranges = db.snapshot_read(read_ranges, opts).await?;
+ let output_ranges = db
+ .snapshot_read(read_ranges, opts)
+ .await
+ .map_err(KvError::Kv)?;
let output_ranges = output_ranges
.into_iter()
.map(|x| {
x.entries
.into_iter()
.map(TryInto::try_into)
- .collect::, AnyError>>()
+ .collect::, std::io::Error>>()
})
- .collect::, AnyError>>()?;
+ .collect::, std::io::Error>>()?;
Ok(output_ranges)
}
@@ -345,7 +402,7 @@ impl Resource for QueueMessageResource {
async fn op_kv_dequeue_next_message(
state: Rc>,
#[smi] rid: ResourceId,
-) -> Result, AnyError>
+) -> Result, KvError>
where
DBH: DatabaseHandler + 'static,
{
@@ -358,17 +415,19 @@ where
if get_custom_error_class(&err) == Some("BadResource") {
return Ok(None);
} else {
- return Err(err);
+ return Err(KvError::Resource(err));
}
}
};
resource.db.clone()
};
- let Some(mut handle) = db.dequeue_next_message().await? else {
+ let Some(mut handle) =
+ db.dequeue_next_message().await.map_err(KvError::Kv)?
+ else {
return Ok(None);
};
- let payload = handle.take_payload().await?.into();
+ let payload = handle.take_payload().await.map_err(KvError::Kv)?.into();
let handle_rid = {
let mut state = state.borrow_mut();
state.resource_table.add(QueueMessageResource { handle })
@@ -382,18 +441,18 @@ fn op_kv_watch(
state: &mut OpState,
#[smi] rid: ResourceId,
#[serde] keys: Vec,
-) -> Result
+) -> Result
where
DBH: DatabaseHandler + 'static,
{
- let resource = state.resource_table.get::>(rid)?;
+ let resource = state
+ .resource_table
+ .get::>(rid)
+ .map_err(KvError::Resource)?;
let config = state.borrow::>().clone();
if keys.len() > config.max_watched_keys {
- return Err(type_error(format!(
- "Too many keys (max {})",
- config.max_watched_keys
- )));
+ return Err(KvError::TooManyKeys(config.max_watched_keys));
}
let keys: Vec> = keys
@@ -428,10 +487,13 @@ enum WatchEntry {
async fn op_kv_watch_next(
state: Rc>,
#[smi] rid: ResourceId,
-) -> Result>, AnyError> {
+) -> Result>, KvError> {
let resource = {
let state = state.borrow();
- let resource = state.resource_table.get::(rid)?;
+ let resource = state
+ .resource_table
+ .get::(rid)
+ .map_err(KvError::Resource)?;
resource.clone()
};
@@ -457,7 +519,7 @@ async fn op_kv_watch_next(
return Ok(None);
};
- let entries = res?;
+ let entries = res.map_err(KvError::Kv)?;
let entries = entries
.into_iter()
.map(|entry| {
@@ -468,7 +530,7 @@ async fn op_kv_watch_next(
WatchKeyOutput::Unchanged => WatchEntry::Unchanged,
})
})
- .collect::>()?;
+ .collect::>()?;
Ok(Some(entries))
}
@@ -478,7 +540,7 @@ async fn op_kv_finish_dequeued_message(
state: Rc>,
#[smi] handle_rid: ResourceId,
success: bool,
-) -> Result<(), AnyError>
+) -> Result<(), KvError>
where
DBH: DatabaseHandler + 'static,
{
@@ -487,9 +549,9 @@ where
let handle = state
.resource_table
.take::::DB as Database>::QMH>>(handle_rid)
- .map_err(|_| type_error("Queue message not found"))?;
+ .map_err(|_| KvError::QueueMessageNotFound)?;
Rc::try_unwrap(handle)
- .map_err(|_| type_error("Queue message not found"))?
+ .map_err(|_| KvError::QueueMessageNotFound)?
.handle
};
// if we fail to finish the message, there is not much we can do and the
@@ -500,32 +562,52 @@ where
Ok(())
}
+#[derive(Debug, thiserror::Error)]
+pub enum KvCheckError {
+ #[error("invalid versionstamp")]
+ InvalidVersionstamp,
+ #[error(transparent)]
+ Io(std::io::Error),
+}
+
type V8KvCheck = (KvKey, Option);
-fn check_from_v8(value: V8KvCheck) -> Result {
+fn check_from_v8(value: V8KvCheck) -> Result {
let versionstamp = match value.1 {
Some(data) => {
let mut out = [0u8; 10];
if data.len() != out.len() * 2 {
- bail!(type_error("invalid versionstamp"));
+ return Err(KvCheckError::InvalidVersionstamp);
}
faster_hex::hex_decode(&data, &mut out)
- .map_err(|_| type_error("invalid versionstamp"))?;
+ .map_err(|_| KvCheckError::InvalidVersionstamp)?;
Some(out)
}
None => None,
};
Ok(Check {
- key: encode_v8_key(value.0)?,
+ key: encode_v8_key(value.0).map_err(KvCheckError::Io)?,
versionstamp,
})
}
+#[derive(Debug, thiserror::Error)]
+pub enum KvMutationError {
+ #[error(transparent)]
+ BigInt(#[from] num_bigint::TryFromBigIntError),
+ #[error(transparent)]
+ Io(#[from] std::io::Error),
+ #[error("Invalid mutation '{0}' with value")]
+ InvalidMutationWithValue(String),
+ #[error("Invalid mutation '{0}' without value")]
+ InvalidMutationWithoutValue(String),
+}
+
type V8KvMutation = (KvKey, String, Option, Option);
fn mutation_from_v8(
(value, current_timstamp): (V8KvMutation, DateTime),
-) -> Result {
+) -> Result {
let key = encode_v8_key(value.0)?;
let kind = match (value.1.as_str(), value.2) {
("set", Some(value)) => MutationKind::Set(value.try_into()?),
@@ -542,10 +624,10 @@ fn mutation_from_v8(
MutationKind::SetSuffixVersionstampedKey(value.try_into()?)
}
(op, Some(_)) => {
- return Err(type_error(format!("Invalid mutation '{op}' with value")))
+ return Err(KvMutationError::InvalidMutationWithValue(op.to_string()))
}
(op, None) => {
- return Err(type_error(format!("Invalid mutation '{op}' without value")))
+ return Err(KvMutationError::InvalidMutationWithoutValue(op.to_string()))
}
};
Ok(Mutation {
@@ -562,7 +644,7 @@ type V8Enqueue = (JsBuffer, u64, Vec, Option>);
fn enqueue_from_v8(
value: V8Enqueue,
current_timestamp: DateTime,
-) -> Result {
+) -> Result {
Ok(Enqueue {
payload: value.0.to_vec(),
deadline: current_timestamp
@@ -597,7 +679,7 @@ impl RawSelector {
prefix: Option,
start: Option,
end: Option,
- ) -> Result {
+ ) -> Result {
let prefix = prefix.map(encode_v8_key).transpose()?;
let start = start.map(encode_v8_key).transpose()?;
let end = end.map(encode_v8_key).transpose()?;
@@ -610,9 +692,7 @@ impl RawSelector {
}),
(Some(prefix), Some(start), None) => {
if !start.starts_with(&prefix) || start.len() == prefix.len() {
- return Err(type_error(
- "Start key is not in the keyspace defined by prefix",
- ));
+ return Err(KvError::StartKeyNotInKeyspace);
}
Ok(Self::Prefixed {
prefix,
@@ -622,9 +702,7 @@ impl RawSelector {
}
(Some(prefix), None, Some(end)) => {
if !end.starts_with(&prefix) || end.len() == prefix.len() {
- return Err(type_error(
- "End key is not in the keyspace defined by prefix",
- ));
+ return Err(KvError::EndKeyNotInKeyspace);
}
Ok(Self::Prefixed {
prefix,
@@ -634,7 +712,7 @@ impl RawSelector {
}
(None, Some(start), Some(end)) => {
if start > end {
- return Err(type_error("Start key is greater than end key"));
+ return Err(KvError::StartKeyGreaterThanEndKey);
}
Ok(Self::Range { start, end })
}
@@ -642,7 +720,7 @@ impl RawSelector {
let end = start.iter().copied().chain(Some(0)).collect();
Ok(Self::Range { start, end })
}
- _ => Err(type_error("Invalid range")),
+ _ => Err(KvError::InvalidRange),
}
}
@@ -701,10 +779,10 @@ fn common_prefix_for_bytes<'a>(a: &'a [u8], b: &'a [u8]) -> &'a [u8] {
fn encode_cursor(
selector: &RawSelector,
boundary_key: &[u8],
-) -> Result {
+) -> Result {
let common_prefix = selector.common_prefix();
if !boundary_key.starts_with(common_prefix) {
- return Err(type_error("Invalid boundary key"));
+ return Err(KvError::InvalidBoundaryKey);
}
Ok(BASE64_URL_SAFE.encode(&boundary_key[common_prefix.len()..]))
}
@@ -713,7 +791,7 @@ fn decode_selector_and_cursor(
selector: &RawSelector,
reverse: bool,
cursor: Option<&ByteString>,
-) -> Result<(Vec, Vec), AnyError> {
+) -> Result<(Vec, Vec), KvError> {
let Some(cursor) = cursor else {
return Ok((selector.range_start_key(), selector.range_end_key()));
};
@@ -721,7 +799,7 @@ fn decode_selector_and_cursor(
let common_prefix = selector.common_prefix();
let cursor = BASE64_URL_SAFE
.decode(cursor)
- .map_err(|_| type_error("invalid cursor"))?;
+ .map_err(|_| KvError::InvalidCursor)?;
let first_key: Vec;
let last_key: Vec;
@@ -746,13 +824,13 @@ fn decode_selector_and_cursor(
// Defend against out-of-bounds reading
if let Some(start) = selector.start() {
if &first_key[..] < start {
- return Err(type_error("cursor out of bounds"));
+ return Err(KvError::CursorOutOfBounds);
}
}
if let Some(end) = selector.end() {
if &last_key[..] > end {
- return Err(type_error("cursor out of bounds"));
+ return Err(KvError::CursorOutOfBounds);
}
}
@@ -767,15 +845,17 @@ async fn op_kv_atomic_write(
#[serde] checks: Vec,
#[serde] mutations: Vec,
#[serde] enqueues: Vec,
-) -> Result, AnyError>
+) -> Result, KvError>
where
DBH: DatabaseHandler + 'static,
{
let current_timestamp = chrono::Utc::now();
let db = {
let state = state.borrow();
- let resource =
- state.resource_table.get::>(rid)?;
+ let resource = state
+ .resource_table
+ .get::>(rid)
+ .map_err(KvError::Resource)?;
resource.db.clone()
};
@@ -785,34 +865,28 @@ where
};
if checks.len() > config.max_checks {
- return Err(type_error(format!(
- "Too many checks (max {})",
- config.max_checks
- )));
+ return Err(KvError::TooManyChecks(config.max_checks));
}
if mutations.len() + enqueues.len() > config.max_mutations {
- return Err(type_error(format!(
- "Too many mutations (max {})",
- config.max_mutations
- )));
+ return Err(KvError::TooManyMutations(config.max_mutations));
}
let checks = checks
.into_iter()
.map(check_from_v8)
- .collect::, AnyError>>()
- .with_context(|| "invalid check")?;
+ .collect::, KvCheckError>>()
+ .map_err(KvError::InvalidCheck)?;
let mutations = mutations
.into_iter()
.map(|mutation| mutation_from_v8((mutation, current_timestamp)))
- .collect::, AnyError>>()
- .with_context(|| "Invalid mutation")?;
+ .collect::, KvMutationError>>()
+ .map_err(KvError::InvalidMutation)?;
let enqueues = enqueues
.into_iter()
.map(|e| enqueue_from_v8(e, current_timestamp))
- .collect::, AnyError>>()
- .with_context(|| "invalid enqueue")?;
+ .collect::, std::io::Error>>()
+ .map_err(KvError::InvalidEnqueue)?;
let mut total_payload_size = 0usize;
let mut total_key_size = 0usize;
@@ -823,7 +897,7 @@ where
.chain(mutations.iter().map(|m| &m.key))
{
if key.is_empty() {
- return Err(type_error("key cannot be empty"));
+ return Err(KvError::EmptyKey);
}
total_payload_size += check_write_key_size(key, &config)?;
@@ -847,17 +921,13 @@ where
}
if total_payload_size > config.max_total_mutation_size_bytes {
- return Err(type_error(format!(
- "Total mutation size too large (max {} bytes)",
- config.max_total_mutation_size_bytes
- )));
+ return Err(KvError::TotalMutationTooLarge(
+ config.max_total_mutation_size_bytes,
+ ));
}
if total_key_size > config.max_total_key_size_bytes {
- return Err(type_error(format!(
- "Total key size too large (max {} bytes)",
- config.max_total_key_size_bytes
- )));
+ return Err(KvError::TotalKeyTooLarge(config.max_total_key_size_bytes));
}
let atomic_write = AtomicWrite {
@@ -866,7 +936,7 @@ where
enqueues,
};
- let result = db.atomic_write(atomic_write).await?;
+ let result = db.atomic_write(atomic_write).await.map_err(KvError::Kv)?;
Ok(result.map(|res| faster_hex::hex_string(&res.versionstamp)))
}
@@ -879,19 +949,16 @@ type EncodeCursorRangeSelector = (Option, Option, Option);
fn op_kv_encode_cursor(
#[serde] (prefix, start, end): EncodeCursorRangeSelector,
#[serde] boundary_key: KvKey,
-) -> Result {
+) -> Result {
let selector = RawSelector::from_tuple(prefix, start, end)?;
let boundary_key = encode_v8_key(boundary_key)?;
let cursor = encode_cursor(&selector, &boundary_key)?;
Ok(cursor)
}
-fn check_read_key_size(key: &[u8], config: &KvConfig) -> Result<(), AnyError> {
+fn check_read_key_size(key: &[u8], config: &KvConfig) -> Result<(), KvError> {
if key.len() > config.max_read_key_size_bytes {
- Err(type_error(format!(
- "Key too large for read (max {} bytes)",
- config.max_read_key_size_bytes
- )))
+ Err(KvError::KeyTooLargeToRead(config.max_read_key_size_bytes))
} else {
Ok(())
}
@@ -900,12 +967,9 @@ fn check_read_key_size(key: &[u8], config: &KvConfig) -> Result<(), AnyError> {
fn check_write_key_size(
key: &[u8],
config: &KvConfig,
-) -> Result {
+) -> Result {
if key.len() > config.max_write_key_size_bytes {
- Err(type_error(format!(
- "Key too large for write (max {} bytes)",
- config.max_write_key_size_bytes
- )))
+ Err(KvError::KeyTooLargeToWrite(config.max_write_key_size_bytes))
} else {
Ok(key.len())
}
@@ -914,7 +978,7 @@ fn check_write_key_size(
fn check_value_size(
value: &KvValue,
config: &KvConfig,
-) -> Result {
+) -> Result {
let payload = match value {
KvValue::Bytes(x) => x,
KvValue::V8(x) => x,
@@ -922,10 +986,7 @@ fn check_value_size(
};
if payload.len() > config.max_value_size_bytes {
- Err(type_error(format!(
- "Value too large (max {} bytes)",
- config.max_value_size_bytes
- )))
+ Err(KvError::ValueTooLarge(config.max_value_size_bytes))
} else {
Ok(payload.len())
}
@@ -934,12 +995,9 @@ fn check_value_size(
fn check_enqueue_payload_size(
payload: &[u8],
config: &KvConfig,
-) -> Result {
+) -> Result {
if payload.len() > config.max_value_size_bytes {
- Err(type_error(format!(
- "enqueue payload too large (max {} bytes)",
- config.max_value_size_bytes
- )))
+ Err(KvError::EnqueuePayloadTooLarge(config.max_value_size_bytes))
} else {
Ok(payload.len())
}
diff --git a/ext/napi/Cargo.toml b/ext/napi/Cargo.toml
index 5405d6280c..ef2e41d57e 100644
--- a/ext/napi/Cargo.toml
+++ b/ext/napi/Cargo.toml
@@ -2,7 +2,7 @@
[package]
name = "deno_napi"
-version = "0.103.0"
+version = "0.104.0"
authors.workspace = true
edition.workspace = true
license.workspace = true
@@ -17,3 +17,4 @@ path = "lib.rs"
deno_core.workspace = true
deno_permissions.workspace = true
libloading = { version = "0.7" }
+thiserror.workspace = true
diff --git a/ext/napi/lib.rs b/ext/napi/lib.rs
index 4500c66fd4..0b2b3eb5e7 100644
--- a/ext/napi/lib.rs
+++ b/ext/napi/lib.rs
@@ -6,8 +6,6 @@
#![deny(clippy::missing_safety_doc)]
use core::ptr::NonNull;
-use deno_core::error::type_error;
-use deno_core::error::AnyError;
use deno_core::op2;
use deno_core::parking_lot::RwLock;
use deno_core::url::Url;
@@ -20,6 +18,18 @@ use std::path::PathBuf;
use std::rc::Rc;
use std::thread_local;
+#[derive(Debug, thiserror::Error)]
+pub enum NApiError {
+ #[error("Invalid path")]
+ InvalidPath,
+ #[error(transparent)]
+ LibLoading(#[from] libloading::Error),
+ #[error("Unable to find register Node-API module at {}", .0.display())]
+ ModuleNotFound(PathBuf),
+ #[error(transparent)]
+ Permission(deno_core::error::AnyError),
+}
+
#[cfg(unix)]
use libloading::os::unix::*;
@@ -482,14 +492,20 @@ deno_core::extension!(deno_napi,
pub trait NapiPermissions {
#[must_use = "the resolved return value to mitigate time-of-check to time-of-use issues"]
- fn check(&mut self, path: &str) -> std::result::Result;
+ fn check(
+ &mut self,
+ path: &str,
+ ) -> Result;
}
// NOTE(bartlomieju): for now, NAPI uses `--allow-ffi` flag, but that might
// change in the future.
impl NapiPermissions for deno_permissions::PermissionsContainer {
#[inline(always)]
- fn check(&mut self, path: &str) -> Result {
+ fn check(
+ &mut self,
+ path: &str,
+ ) -> Result {
deno_permissions::PermissionsContainer::check_ffi(self, path)
}
}
@@ -512,7 +528,7 @@ fn op_napi_open(
global: v8::Local<'scope, v8::Object>,
buffer_constructor: v8::Local<'scope, v8::Function>,
report_error: v8::Local<'scope, v8::Function>,
-) -> std::result::Result, AnyError>
+) -> Result, NApiError>
where
NP: NapiPermissions + 'static,
{
@@ -521,7 +537,7 @@ where
let (async_work_sender, cleanup_hooks, external_ops_tracker, path) = {
let mut op_state = op_state.borrow_mut();
let permissions = op_state.borrow_mut::();
- let path = permissions.check(&path)?;
+ let path = permissions.check(&path).map_err(NApiError::Permission)?;
let napi_state = op_state.borrow::();
(
op_state.borrow::().clone(),
@@ -540,7 +556,7 @@ where
let type_tag = v8::Global::new(scope, type_tag);
let url_filename =
- Url::from_file_path(&path).map_err(|_| type_error("Invalid path"))?;
+ Url::from_file_path(&path).map_err(|_| NApiError::InvalidPath)?;
let env_shared =
EnvShared::new(napi_wrap, type_tag, format!("{url_filename}\0"));
@@ -565,17 +581,11 @@ where
// SAFETY: opening a DLL calls dlopen
#[cfg(unix)]
- let library = match unsafe { Library::open(Some(&path), flags) } {
- Ok(lib) => lib,
- Err(e) => return Err(type_error(e.to_string())),
- };
+ let library = unsafe { Library::open(Some(&path), flags) }?;
// SAFETY: opening a DLL calls dlopen
#[cfg(not(unix))]
- let library = match unsafe { Library::load_with_flags(&path, flags) } {
- Ok(lib) => lib,
- Err(e) => return Err(type_error(e.to_string())),
- };
+ let library = unsafe { Library::load_with_flags(&path, flags) }?;
let maybe_module = MODULE_TO_REGISTER.with(|cell| {
let mut slot = cell.borrow_mut();
@@ -610,10 +620,7 @@ where
// SAFETY: we are going blind, calling the register function on the other side.
unsafe { init(env_ptr, exports.into()) }
} else {
- return Err(type_error(format!(
- "Unable to find register Node-API module at {}",
- path.display()
- )));
+ return Err(NApiError::ModuleNotFound(path));
};
let exports = maybe_exports.unwrap_or(exports.into());
diff --git a/ext/net/Cargo.toml b/ext/net/Cargo.toml
index 4ba4fb315e..634dd7dda4 100644
--- a/ext/net/Cargo.toml
+++ b/ext/net/Cargo.toml
@@ -2,7 +2,7 @@
[package]
name = "deno_net"
-version = "0.164.0"
+version = "0.165.0"
authors.workspace = true
edition.workspace = true
license.workspace = true
@@ -21,6 +21,7 @@ pin-project.workspace = true
rustls-tokio-stream.workspace = true
serde.workspace = true
socket2.workspace = true
+thiserror.workspace = true
tokio.workspace = true
trust-dns-proto = "0.23"
trust-dns-resolver = { version = "0.23", features = ["tokio-runtime", "serde-config"] }
diff --git a/ext/net/io.rs b/ext/net/io.rs
index f3aed3fcbd..2907fa398b 100644
--- a/ext/net/io.rs
+++ b/ext/net/io.rs
@@ -1,7 +1,6 @@
// Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
-use deno_core::error::generic_error;
-use deno_core::error::AnyError;
+use deno_core::futures::TryFutureExt;
use deno_core::AsyncMutFuture;
use deno_core::AsyncRefCell;
use deno_core::AsyncResult;
@@ -69,25 +68,36 @@ where
pub async fn read(
self: Rc,
data: &mut [u8],
- ) -> Result {
+ ) -> Result {
let mut rd = self.rd_borrow_mut().await;
let nread = rd.read(data).try_or_cancel(self.cancel_handle()).await?;
Ok(nread)
}
- pub async fn write(self: Rc, data: &[u8]) -> Result {
+ pub async fn write(
+ self: Rc,
+ data: &[u8],
+ ) -> Result {
let mut wr = self.wr_borrow_mut().await;
let nwritten = wr.write(data).await?;
Ok(nwritten)
}
- pub async fn shutdown(self: Rc) -> Result<(), AnyError> {
+ pub async fn shutdown(self: Rc) -> Result<(), std::io::Error> {
let mut wr = self.wr_borrow_mut().await;
wr.shutdown().await?;
Ok(())
}
}
+#[derive(Debug, thiserror::Error)]
+pub enum MapError {
+ #[error("{0}")]
+ Io(std::io::Error),
+ #[error("Unable to get resources")]
+ NoResources,
+}
+
pub type TcpStreamResource =
FullDuplexResource;
@@ -100,7 +110,7 @@ impl Resource for TcpStreamResource {
}
fn shutdown(self: Rc) -> AsyncResult<()> {
- Box::pin(self.shutdown())
+ Box::pin(self.shutdown().map_err(Into::into))
}
fn close(self: Rc) {
@@ -109,31 +119,30 @@ impl Resource for TcpStreamResource {
}
impl TcpStreamResource {
- pub fn set_nodelay(self: Rc, nodelay: bool) -> Result<(), AnyError> {
- self.map_socket(Box::new(move |socket| Ok(socket.set_nodelay(nodelay)?)))
+ pub fn set_nodelay(self: Rc, nodelay: bool) -> Result<(), MapError> {
+ self.map_socket(Box::new(move |socket| socket.set_nodelay(nodelay)))
}
pub fn set_keepalive(
self: Rc,
keepalive: bool,
- ) -> Result<(), AnyError> {
- self
- .map_socket(Box::new(move |socket| Ok(socket.set_keepalive(keepalive)?)))
+ ) -> Result<(), MapError> {
+ self.map_socket(Box::new(move |socket| socket.set_keepalive(keepalive)))
}
#[allow(clippy::type_complexity)]
fn map_socket(
self: Rc,
- map: Box Result<(), AnyError>>,
- ) -> Result<(), AnyError> {
+ map: Box Result<(), std::io::Error>>,
+ ) -> Result<(), MapError> {
if let Some(wr) = RcRef::map(self, |r| &r.wr).try_borrow() {
let stream = wr.as_ref().as_ref();
let socket = socket2::SockRef::from(stream);
- return map(socket);
+ return map(socket).map_err(MapError::Io);
}
- Err(generic_error("Unable to get resources"))
+ Err(MapError::NoResources)
}
}
@@ -153,7 +162,9 @@ impl UnixStreamResource {
unreachable!()
}
#[allow(clippy::unused_async)]
- pub async fn shutdown(self: Rc) -> Result<(), AnyError> {
+ pub async fn shutdown(
+ self: Rc,
+ ) -> Result<(), deno_core::error::AnyError> {
unreachable!()
}
pub fn cancel_read_ops(&self) {
@@ -170,7 +181,7 @@ impl Resource for UnixStreamResource {
}
fn shutdown(self: Rc) -> AsyncResult<()> {
- Box::pin(self.shutdown())
+ Box::pin(self.shutdown().map_err(Into::into))
}
fn close(self: Rc) {
diff --git a/ext/net/ops.rs b/ext/net/ops.rs
index 5248493f41..0f92dead0c 100644
--- a/ext/net/ops.rs
+++ b/ext/net/ops.rs
@@ -6,10 +6,6 @@ use crate::resolve_addr::resolve_addr;
use crate::resolve_addr::resolve_addr_sync;
use crate::tcp::TcpListener;
use crate::NetPermissions;
-use deno_core::error::bad_resource;
-use deno_core::error::custom_error;
-use deno_core::error::generic_error;
-use deno_core::error::AnyError;
use deno_core::op2;
use deno_core::CancelFuture;
@@ -43,6 +39,7 @@ use trust_dns_proto::rr::record_type::RecordType;
use trust_dns_resolver::config::NameServerConfigGroup;
use trust_dns_resolver::config::ResolverConfig;
use trust_dns_resolver::config::ResolverOpts;
+use trust_dns_resolver::error::ResolveError;
use trust_dns_resolver::error::ResolveErrorKind;
use trust_dns_resolver::system_conf;
use trust_dns_resolver::AsyncResolver;
@@ -68,11 +65,69 @@ impl From for IpAddr {
}
}
-pub(crate) fn accept_err(e: std::io::Error) -> AnyError {
+#[derive(Debug, thiserror::Error)]
+pub enum NetError {
+ #[error("Listener has been closed")]
+ ListenerClosed,
+ #[error("Listener already in use")]
+ ListenerBusy,
+ #[error("Socket has been closed")]
+ SocketClosed,
+ #[error("Socket has been closed")]
+ SocketClosedNotConnected,
+ #[error("Socket already in use")]
+ SocketBusy,
+ #[error("{0}")]
+ Io(#[from] std::io::Error),
+ #[error("Another accept task is ongoing")]
+ AcceptTaskOngoing,
+ #[error("{0}")]
+ Permission(deno_core::error::AnyError),
+ #[error("{0}")]
+ Resource(deno_core::error::AnyError),
+ #[error("No resolved address found")]
+ NoResolvedAddress,
+ #[error("{0}")]
+ AddrParse(#[from] std::net::AddrParseError),
+ #[error("{0}")]
+ Map(crate::io::MapError),
+ #[error("{0}")]
+ Canceled(#[from] deno_core::Canceled),
+ #[error("{0}")]
+ DnsNotFound(ResolveError),
+ #[error("{0}")]
+ DnsNotConnected(ResolveError),
+ #[error("{0}")]
+ DnsTimedOut(ResolveError),
+ #[error("{0}")]
+ Dns(#[from] ResolveError),
+ #[error("Provided record type is not supported")]
+ UnsupportedRecordType,
+ #[error("File name or path {0:?} is not valid UTF-8")]
+ InvalidUtf8(std::ffi::OsString),
+ #[error("unexpected key type")]
+ UnexpectedKeyType,
+ #[error("Invalid hostname: '{0}'")]
+ InvalidHostname(String), // TypeError
+ #[error("TCP stream is currently in use")]
+ TcpStreamBusy,
+ #[error("{0}")]
+ Rustls(#[from] deno_tls::rustls::Error),
+ #[error("{0}")]
+ Tls(#[from] deno_tls::TlsError),
+ #[error("Error creating TLS certificate: Deno.listenTls requires a key")]
+ ListenTlsRequiresKey, // InvalidData
+ #[error("{0}")]
+ RootCertStore(deno_core::anyhow::Error),
+ #[error("{0}")]
+ Reunite(tokio::net::tcp::ReuniteError),
+}
+
+pub(crate) fn accept_err(e: std::io::Error) -> NetError {
if let std::io::ErrorKind::Interrupted = e.kind() {
- bad_resource("Listener has been closed")
+ NetError::ListenerClosed
} else {
- e.into()
+ NetError::Io(e)
}
}
@@ -81,15 +136,15 @@ pub(crate) fn accept_err(e: std::io::Error) -> AnyError {
pub async fn op_net_accept_tcp(
state: Rc>,
#[smi] rid: ResourceId,
-) -> Result<(ResourceId, IpAddr, IpAddr), AnyError> {
+) -> Result<(ResourceId, IpAddr, IpAddr), NetError> {
let resource = state
.borrow()
.resource_table
.get::>(rid)
- .map_err(|_| bad_resource("Listener has been closed"))?;
+ .map_err(|_| NetError::ListenerClosed)?;
let listener = RcRef::map(&resource, |r| &r.listener)
.try_borrow_mut()
- .ok_or_else(|| custom_error("Busy", "Another accept task is ongoing"))?;
+ .ok_or_else(|| NetError::AcceptTaskOngoing)?;
let cancel = RcRef::map(resource, |r| &r.cancel);
let (tcp_stream, _socket_addr) = listener
.accept()
@@ -112,12 +167,12 @@ pub async fn op_net_recv_udp(
state: Rc>,
#[smi] rid: ResourceId,
#[buffer] mut buf: JsBuffer,
-) -> Result<(usize, IpAddr), AnyError> {
+) -> Result<(usize, IpAddr), NetError> {
let resource = state
.borrow_mut()
.resource_table
.get::(rid)
- .map_err(|_| bad_resource("Socket has been closed"))?;
+ .map_err(|_| NetError::SocketClosed)?;
let socket = RcRef::map(&resource, |r| &r.socket).borrow().await;
let cancel_handle = RcRef::map(&resource, |r| &r.cancel);
let (nread, remote_addr) = socket
@@ -134,27 +189,29 @@ pub async fn op_net_send_udp(
#[smi] rid: ResourceId,
#[serde] addr: IpAddr,
#[buffer] zero_copy: JsBuffer,
-) -> Result
+) -> Result
where
NP: NetPermissions + 'static,
{
{
let mut s = state.borrow_mut();
- s.borrow_mut::().check_net(
- &(&addr.hostname, Some(addr.port)),
- "Deno.DatagramConn.send()",
- )?;
+ s.borrow_mut::()
+ .check_net(
+ &(&addr.hostname, Some(addr.port)),
+ "Deno.DatagramConn.send()",
+ )
+ .map_err(NetError::Permission)?;
}
let addr = resolve_addr(&addr.hostname, addr.port)
.await?
.next()
- .ok_or_else(|| generic_error("No resolved address found"))?;
+ .ok_or(NetError::NoResolvedAddress)?;
let resource = state
.borrow_mut()
.resource_table
.get::(rid)
- .map_err(|_| bad_resource("Socket has been closed"))?;
+ .map_err(|_| NetError::SocketClosed)?;
let socket = RcRef::map(&resource, |r| &r.socket).borrow().await;
let nwritten = socket.send_to(&zero_copy, &addr).await?;
@@ -167,12 +224,12 @@ pub async fn op_net_join_multi_v4_udp(
#[smi] rid: ResourceId,
#[string] address: String,
#[string] multi_interface: String,
-) -> Result<(), AnyError> {
+) -> Result<(), NetError> {
let resource = state
.borrow_mut()
.resource_table
.get::(rid)
- .map_err(|_| bad_resource("Socket has been closed"))?;
+ .map_err(|_| NetError::SocketClosed)?;
let socket = RcRef::map(&resource, |r| &r.socket).borrow().await;
let addr = Ipv4Addr::from_str(address.as_str())?;
@@ -189,12 +246,12 @@ pub async fn op_net_join_multi_v6_udp(
#[smi] rid: ResourceId,
#[string] address: String,
#[smi] multi_interface: u32,
-) -> Result<(), AnyError> {
+) -> Result<(), NetError> {
let resource = state
.borrow_mut()
.resource_table
.get::(rid)
- .map_err(|_| bad_resource("Socket has been closed"))?;
+ .map_err(|_| NetError::SocketClosed)?;
let socket = RcRef::map(&resource, |r| &r.socket).borrow().await;
let addr = Ipv6Addr::from_str(address.as_str())?;
@@ -210,12 +267,12 @@ pub async fn op_net_leave_multi_v4_udp(
#[smi] rid: ResourceId,
#[string] address: String,
#[string] multi_interface: String,
-) -> Result<(), AnyError> {
+) -> Result<(), NetError> {
let resource = state
.borrow_mut()
.resource_table
.get::(rid)
- .map_err(|_| bad_resource("Socket has been closed"))?;
+ .map_err(|_| NetError::SocketClosed)?;
let socket = RcRef::map(&resource, |r| &r.socket).borrow().await;
let addr = Ipv4Addr::from_str(address.as_str())?;
@@ -232,12 +289,12 @@ pub async fn op_net_leave_multi_v6_udp(
#[smi] rid: ResourceId,
#[string] address: String,
#[smi] multi_interface: u32,
-) -> Result<(), AnyError> {
+) -> Result<(), NetError> {
let resource = state
.borrow_mut()
.resource_table
.get::(rid)
- .map_err(|_| bad_resource("Socket has been closed"))?;
+ .map_err(|_| NetError::SocketClosed)?;
let socket = RcRef::map(&resource, |r| &r.socket).borrow().await;
let addr = Ipv6Addr::from_str(address.as_str())?;
@@ -253,16 +310,16 @@ pub async fn op_net_set_multi_loopback_udp(
#[smi] rid: ResourceId,
is_v4_membership: bool,
loopback: bool,
-) -> Result<(), AnyError> {
+) -> Result<(), NetError> {
let resource = state
.borrow_mut()
.resource_table
.get::(rid)
- .map_err(|_| bad_resource("Socket has been closed"))?;
+ .map_err(|_| NetError::SocketClosed)?;
let socket = RcRef::map(&resource, |r| &r.socket).borrow().await;
if is_v4_membership {
- socket.set_multicast_loop_v4(loopback)?
+ socket.set_multicast_loop_v4(loopback)?;
} else {
socket.set_multicast_loop_v6(loopback)?;
}
@@ -275,12 +332,12 @@ pub async fn op_net_set_multi_ttl_udp(
state: Rc>,
#[smi] rid: ResourceId,
#[smi] ttl: u32,
-) -> Result<(), AnyError> {
+) -> Result<(), NetError> {
let resource = state
.borrow_mut()
.resource_table
.get::(rid)
- .map_err(|_| bad_resource("Socket has been closed"))?;
+ .map_err(|_| NetError::SocketClosed)?;
let socket = RcRef::map(&resource, |r| &r.socket).borrow().await;
socket.set_multicast_ttl_v4(ttl)?;
@@ -293,7 +350,7 @@ pub async fn op_net_set_multi_ttl_udp(
pub async fn op_net_connect_tcp(
state: Rc>,
#[serde] addr: IpAddr,
-) -> Result<(ResourceId, IpAddr, IpAddr), AnyError>
+) -> Result<(ResourceId, IpAddr, IpAddr), NetError>
where
NP: NetPermissions + 'static,
{
@@ -304,7 +361,7 @@ where
pub async fn op_net_connect_tcp_inner(
state: Rc>,
addr: IpAddr,
-) -> Result<(ResourceId, IpAddr, IpAddr), AnyError>
+) -> Result<(ResourceId, IpAddr, IpAddr), NetError>
where
NP: NetPermissions + 'static,
{
@@ -312,13 +369,14 @@ where
let mut state_ = state.borrow_mut();
state_
.borrow_mut::()
- .check_net(&(&addr.hostname, Some(addr.port)), "Deno.connect()")?;
+ .check_net(&(&addr.hostname, Some(addr.port)), "Deno.connect()")
+ .map_err(NetError::Permission)?;
}
let addr = resolve_addr(&addr.hostname, addr.port)
.await?
.next()
- .ok_or_else(|| generic_error("No resolved address found"))?;
+ .ok_or_else(|| NetError::NoResolvedAddress)?;
let tcp_stream = TcpStream::connect(&addr).await?;
let local_addr = tcp_stream.local_addr()?;
let remote_addr = tcp_stream.peer_addr()?;
@@ -353,7 +411,7 @@ pub fn op_net_listen_tcp(
#[serde] addr: IpAddr,
reuse_port: bool,
load_balanced: bool,
-) -> Result<(ResourceId, IpAddr), AnyError>
+) -> Result<(ResourceId, IpAddr), NetError>
where
NP: NetPermissions + 'static,
{
@@ -362,10 +420,11 @@ where
}
state
.borrow_mut::()
- .check_net(&(&addr.hostname, Some(addr.port)), "Deno.listen()")?;
+ .check_net(&(&addr.hostname, Some(addr.port)), "Deno.listen()")
+ .map_err(NetError::Permission)?;
let addr = resolve_addr_sync(&addr.hostname, addr.port)?
.next()
- .ok_or_else(|| generic_error("No resolved address found"))?;
+ .ok_or_else(|| NetError::NoResolvedAddress)?;
let listener = if load_balanced {
TcpListener::bind_load_balanced(addr)
@@ -384,16 +443,17 @@ fn net_listen_udp(
addr: IpAddr,
reuse_address: bool,
loopback: bool,
-) -> Result<(ResourceId, IpAddr), AnyError>
+) -> Result<(ResourceId, IpAddr), NetError>
where
NP: NetPermissions + 'static,
{
state
.borrow_mut::()
- .check_net(&(&addr.hostname, Some(addr.port)), "Deno.listenDatagram()")?;
+ .check_net(&(&addr.hostname, Some(addr.port)), "Deno.listenDatagram()")
+ .map_err(NetError::Permission)?;
let addr = resolve_addr_sync(&addr.hostname, addr.port)?
.next()
- .ok_or_else(|| generic_error("No resolved address found"))?;
+ .ok_or_else(|| NetError::NoResolvedAddress)?;
let domain = if addr.is_ipv4() {
Domain::IPV4
@@ -453,7 +513,7 @@ pub fn op_net_listen_udp(
#[serde] addr: IpAddr,
reuse_address: bool,
loopback: bool,
-) -> Result<(ResourceId, IpAddr), AnyError>
+) -> Result<(ResourceId, IpAddr), NetError>
where
NP: NetPermissions + 'static,
{
@@ -468,7 +528,7 @@ pub fn op_node_unstable_net_listen_udp(
#[serde] addr: IpAddr,
reuse_address: bool,
loopback: bool,
-) -> Result<(ResourceId, IpAddr), AnyError>
+) -> Result<(ResourceId, IpAddr), NetError>
where
NP: NetPermissions + 'static,
{
@@ -551,7 +611,7 @@ pub struct NameServer {
pub async fn op_dns_resolve(
state: Rc>,
#[serde] args: ResolveAddrArgs,
-) -> Result, AnyError>
+) -> Result, NetError>
where
NP: NetPermissions + 'static,
{
@@ -587,7 +647,9 @@ where
let socker_addr = &ns.socket_addr;
let ip = socker_addr.ip().to_string();
let port = socker_addr.port();
- perm.check_net(&(ip, Some(port)), "Deno.resolveDns()")?;
+ perm
+ .check_net(&(ip, Some(port)), "Deno.resolveDns()")
+ .map_err(NetError::Permission)?;
}
}
@@ -618,22 +680,17 @@ where
};
lookup
- .map_err(|e| {
- let message = format!("{e}");
- match e.kind() {
- ResolveErrorKind::NoRecordsFound { .. } => {
- custom_error("NotFound", message)
- }
- ResolveErrorKind::Message("No connections available") => {
- custom_error("NotConnected", message)
- }
- ResolveErrorKind::Timeout => custom_error("TimedOut", message),
- _ => generic_error(message),
+ .map_err(|e| match e.kind() {
+ ResolveErrorKind::NoRecordsFound { .. } => NetError::DnsNotFound(e),
+ ResolveErrorKind::Message("No connections available") => {
+ NetError::DnsNotConnected(e)
}
+ ResolveErrorKind::Timeout => NetError::DnsTimedOut(e),
+ _ => NetError::Dns(e),
})?
.iter()
.filter_map(|rdata| rdata_to_return_record(record_type)(rdata).transpose())
- .collect::, AnyError>>()
+ .collect::, NetError>>()
}
#[op2(fast)]
@@ -641,7 +698,7 @@ pub fn op_set_nodelay(
state: &mut OpState,
#[smi] rid: ResourceId,
nodelay: bool,
-) -> Result<(), AnyError> {
+) -> Result<(), NetError> {
op_set_nodelay_inner(state, rid, nodelay)
}
@@ -650,10 +707,12 @@ pub fn op_set_nodelay_inner(
state: &mut OpState,
rid: ResourceId,
nodelay: bool,
-) -> Result<(), AnyError> {
- let resource: Rc =
- state.resource_table.get::(rid)?;
- resource.set_nodelay(nodelay)
+) -> Result<(), NetError> {
+ let resource: Rc = state
+ .resource_table
+ .get::(rid)
+ .map_err(NetError::Resource)?;
+ resource.set_nodelay(nodelay).map_err(NetError::Map)
}
#[op2(fast)]
@@ -661,7 +720,7 @@ pub fn op_set_keepalive(
state: &mut OpState,
#[smi] rid: ResourceId,
keepalive: bool,
-) -> Result<(), AnyError> {
+) -> Result<(), NetError> {
op_set_keepalive_inner(state, rid, keepalive)
}
@@ -670,17 +729,19 @@ pub fn op_set_keepalive_inner(
state: &mut OpState,
rid: ResourceId,
keepalive: bool,
-) -> Result<(), AnyError> {
- let resource: Rc =
- state.resource_table.get::(rid)?;
- resource.set_keepalive(keepalive)
+) -> Result<(), NetError> {
+ let resource: Rc = state
+ .resource_table
+ .get::(rid)
+ .map_err(NetError::Resource)?;
+ resource.set_keepalive(keepalive).map_err(NetError::Map)
}
fn rdata_to_return_record(
ty: RecordType,
-) -> impl Fn(&RData) -> Result, AnyError> {
+) -> impl Fn(&RData) -> Result, NetError> {
use RecordType::*;
- move |r: &RData| -> Result, AnyError> {
+ move |r: &RData| -> Result, NetError> {
let record = match ty {
A => r.as_a().map(ToString::to_string).map(DnsReturnRecord::A),
AAAA => r
@@ -761,12 +822,7 @@ fn rdata_to_return_record(
.collect();
DnsReturnRecord::Txt(texts)
}),
- _ => {
- return Err(custom_error(
- "NotSupported",
- "Provided record type is not supported",
- ))
- }
+ _ => return Err(NetError::UnsupportedRecordType),
};
Ok(record)
}
@@ -985,7 +1041,7 @@ mod tests {
&mut self,
_host: &(T, Option),
_api_name: &str,
- ) -> Result<(), AnyError> {
+ ) -> Result<(), deno_core::error::AnyError> {
Ok(())
}
@@ -993,7 +1049,7 @@ mod tests {
&mut self,
p: &str,
_api_name: &str,
- ) -> Result {
+ ) -> Result {
Ok(PathBuf::from(p))
}
@@ -1001,7 +1057,7 @@ mod tests {
&mut self,
p: &str,
_api_name: &str,
- ) -> Result {
+ ) -> Result {
Ok(PathBuf::from(p))
}
@@ -1009,7 +1065,7 @@ mod tests {
&mut self,
p: &'a Path,
_api_name: &str,
- ) -> Result, AnyError> {
+ ) -> Result, deno_core::error::AnyError> {
Ok(Cow::Borrowed(p))
}
}
@@ -1091,7 +1147,7 @@ mod tests {
let vals = result.unwrap();
rid = rid.or(Some(vals.0));
}
- };
+ }
let rid = rid.unwrap();
let state = runtime.op_state();
diff --git a/ext/net/ops_tls.rs b/ext/net/ops_tls.rs
index a68d144b57..c7d65dd85e 100644
--- a/ext/net/ops_tls.rs
+++ b/ext/net/ops_tls.rs
@@ -2,6 +2,7 @@
use crate::io::TcpStreamResource;
use crate::ops::IpAddr;
+use crate::ops::NetError;
use crate::ops::TlsHandshakeInfo;
use crate::raw::NetworkListenerResource;
use crate::resolve_addr::resolve_addr;
@@ -10,13 +11,7 @@ use crate::tcp::TcpListener;
use crate::DefaultTlsOptions;
use crate::NetPermissions;
use crate::UnsafelyIgnoreCertificateErrors;
-use deno_core::anyhow::anyhow;
-use deno_core::anyhow::bail;
-use deno_core::error::bad_resource;
-use deno_core::error::custom_error;
-use deno_core::error::generic_error;
-use deno_core::error::invalid_hostname;
-use deno_core::error::AnyError;
+use deno_core::futures::TryFutureExt;
use deno_core::op2;
use deno_core::v8;
use deno_core::AsyncRefCell;
@@ -118,20 +113,23 @@ impl TlsStreamResource {
pub async fn read(
self: Rc,
data: &mut [u8],
- ) -> Result {
+ ) -> Result {
let mut rd = RcRef::map(&self, |r| &r.rd).borrow_mut().await;
let cancel_handle = RcRef::map(&self, |r| &r.cancel_handle);
- Ok(rd.read(data).try_or_cancel(cancel_handle).await?)
+ rd.read(data).try_or_cancel(cancel_handle).await
}
- pub async fn write(self: Rc, data: &[u8]) -> Result {
+ pub async fn write(
+ self: Rc,
+ data: &[u8],
+ ) -> Result {
let mut wr = RcRef::map(self, |r| &r.wr).borrow_mut().await;
let nwritten = wr.write(data).await?;
wr.flush().await?;
Ok(nwritten)
}
- pub async fn shutdown(self: Rc) -> Result<(), AnyError> {
+ pub async fn shutdown(self: Rc) -> Result<(), std::io::Error> {
let mut wr = RcRef::map(self, |r| &r.wr).borrow_mut().await;
wr.shutdown().await?;
Ok(())
@@ -139,7 +137,7 @@ impl TlsStreamResource {
pub async fn handshake(
self: &Rc,
- ) -> Result {
+ ) -> Result {
if let Some(tls_info) = &*self.handshake_info.borrow() {
return Ok(tls_info.clone());
}
@@ -164,7 +162,7 @@ impl Resource for TlsStreamResource {
}
fn shutdown(self: Rc) -> AsyncResult<()> {
- Box::pin(self.shutdown())
+ Box::pin(self.shutdown().map_err(Into::into))
}
fn close(self: Rc) {
@@ -201,7 +199,7 @@ pub fn op_tls_key_null() -> TlsKeysHolder {
pub fn op_tls_key_static(
#[string] cert: &str,
#[string] key: &str,
-) -> Result {
+) -> Result {
let cert = load_certs(&mut BufReader::new(cert.as_bytes()))?;
let key = load_private_keys(key.as_bytes())?
.into_iter()
@@ -236,9 +234,9 @@ pub fn op_tls_cert_resolver_resolve(
#[cppgc] lookup: &TlsKeyLookup,
#[string] sni: String,
#[cppgc] key: &TlsKeysHolder,
-) -> Result<(), AnyError> {
+) -> Result<(), NetError> {
let TlsKeys::Static(key) = key.take() else {
- bail!("unexpected key type");
+ return Err(NetError::UnexpectedKeyType);
};
lookup.resolve(sni, Ok(key));
Ok(())
@@ -258,7 +256,7 @@ pub fn op_tls_cert_resolver_resolve_error(
pub fn op_tls_start(
state: Rc>,
#[serde] args: StartTlsArgs,
-) -> Result<(ResourceId, IpAddr, IpAddr), AnyError>
+) -> Result<(ResourceId, IpAddr, IpAddr), NetError>
where
NP: NetPermissions + 'static,
{
@@ -271,7 +269,9 @@ where
{
let mut s = state.borrow_mut();
let permissions = s.borrow_mut::();
- permissions.check_net(&(&hostname, Some(0)), "Deno.startTls()")?;
+ permissions
+ .check_net(&(&hostname, Some(0)), "Deno.startTls()")
+ .map_err(NetError::Permission)?;
}
let ca_certs = args
@@ -281,7 +281,7 @@ where
.collect::>();
let hostname_dns = ServerName::try_from(hostname.to_string())
- .map_err(|_| invalid_hostname(&hostname))?;
+ .map_err(|_| NetError::InvalidHostname(hostname))?;
let unsafely_ignore_certificate_errors = state
.borrow()
@@ -291,19 +291,21 @@ where
let root_cert_store = state
.borrow()
.borrow::()
- .root_cert_store()?;
+ .root_cert_store()
+ .map_err(NetError::RootCertStore)?;
let resource_rc = state
.borrow_mut()
.resource_table
- .take::(rid)?;
+ .take::(rid)
+ .map_err(NetError::Resource)?;
// This TCP connection might be used somewhere else. If it's the case, we cannot proceed with the
// process of starting a TLS connection on top of this TCP connection, so we just return a Busy error.
// See also: https://github.com/denoland/deno/pull/16242
- let resource = Rc::try_unwrap(resource_rc)
- .map_err(|_| custom_error("Busy", "TCP stream is currently in use"))?;
+ let resource =
+ Rc::try_unwrap(resource_rc).map_err(|_| NetError::TcpStreamBusy)?;
let (read_half, write_half) = resource.into_inner();
- let tcp_stream = read_half.reunite(write_half)?;
+ let tcp_stream = read_half.reunite(write_half).map_err(NetError::Reunite)?;
let local_addr = tcp_stream.local_addr()?;
let remote_addr = tcp_stream.peer_addr()?;
@@ -345,7 +347,7 @@ pub async fn op_net_connect_tls(
#[serde] addr: IpAddr,
#[serde] args: ConnectTlsArgs,
#[cppgc] key_pair: &TlsKeysHolder,
-) -> Result<(ResourceId, IpAddr, IpAddr), AnyError>
+) -> Result<(ResourceId, IpAddr, IpAddr), NetError>
where
NP: NetPermissions + 'static,
{
@@ -359,9 +361,14 @@ where
let mut s = state.borrow_mut();
let permissions = s.borrow_mut::();
permissions
- .check_net(&(&addr.hostname, Some(addr.port)), "Deno.connectTls()")?;
+ .check_net(&(&addr.hostname, Some(addr.port)), "Deno.connectTls()")
+ .map_err(NetError::Permission)?;
if let Some(path) = cert_file {
- Some(permissions.check_read(path, "Deno.connectTls()")?)
+ Some(
+ permissions
+ .check_read(path, "Deno.connectTls()")
+ .map_err(NetError::Permission)?,
+ )
} else {
None
}
@@ -382,17 +389,18 @@ where
let root_cert_store = state
.borrow()
.borrow::()
- .root_cert_store()?;
+ .root_cert_store()
+ .map_err(NetError::RootCertStore)?;
let hostname_dns = if let Some(server_name) = args.server_name {
ServerName::try_from(server_name)
} else {
ServerName::try_from(addr.hostname.clone())
}
- .map_err(|_| invalid_hostname(&addr.hostname))?;
+ .map_err(|_| NetError::InvalidHostname(addr.hostname.clone()))?;
let connect_addr = resolve_addr(&addr.hostname, addr.port)
.await?
.next()
- .ok_or_else(|| generic_error("No resolved address found"))?;
+ .ok_or_else(|| NetError::NoResolvedAddress)?;
let tcp_stream = TcpStream::connect(connect_addr).await?;
let local_addr = tcp_stream.local_addr()?;
let remote_addr = tcp_stream.peer_addr()?;
@@ -444,7 +452,7 @@ pub fn op_net_listen_tls(
#[serde] addr: IpAddr,
#[serde] args: ListenTlsArgs,
#[cppgc] keys: &TlsKeysHolder,
-) -> Result<(ResourceId, IpAddr), AnyError>
+) -> Result<(ResourceId, IpAddr), NetError>
where
NP: NetPermissions + 'static,
{
@@ -455,12 +463,13 @@ where
{
let permissions = state.borrow_mut::();
permissions
- .check_net(&(&addr.hostname, Some(addr.port)), "Deno.listenTls()")?;
+ .check_net(&(&addr.hostname, Some(addr.port)), "Deno.listenTls()")
+ .map_err(NetError::Permission)?;
}
let bind_addr = resolve_addr_sync(&addr.hostname, addr.port)?
.next()
- .ok_or_else(|| generic_error("No resolved address found"))?;
+ .ok_or(NetError::NoResolvedAddress)?;
let tcp_listener = if args.load_balanced {
TcpListener::bind_load_balanced(bind_addr)
@@ -475,28 +484,24 @@ where
.map(|s| s.into_bytes())
.collect();
let listener = match keys.take() {
- TlsKeys::Null => Err(anyhow!("Deno.listenTls requires a key")),
+ TlsKeys::Null => return Err(NetError::ListenTlsRequiresKey),
TlsKeys::Static(TlsKey(cert, key)) => {
let mut tls_config = ServerConfig::builder()
.with_no_client_auth()
- .with_single_cert(cert, key)
- .map_err(|e| anyhow!(e))?;
+ .with_single_cert(cert, key)?;
tls_config.alpn_protocols = alpn;
- Ok(TlsListener {
+ TlsListener {
tcp_listener,
tls_config: Some(tls_config.into()),
server_config_provider: None,
- })
+ }
}
- TlsKeys::Resolver(resolver) => Ok(TlsListener {
+ TlsKeys::Resolver(resolver) => TlsListener {
tcp_listener,
tls_config: None,
server_config_provider: Some(resolver.into_server_config_provider(alpn)),
- }),
- }
- .map_err(|e| {
- custom_error("InvalidData", "Error creating TLS certificate").context(e)
- })?;
+ },
+ };
let tls_listener_resource = NetworkListenerResource::new(listener);
@@ -510,23 +515,23 @@ where
pub async fn op_net_accept_tls(
state: Rc>,
#[smi] rid: ResourceId,
-) -> Result<(ResourceId, IpAddr, IpAddr), AnyError> {
+) -> Result<(ResourceId, IpAddr, IpAddr), NetError> {
let resource = state
.borrow()
.resource_table
.get::>(rid)
- .map_err(|_| bad_resource("Listener has been closed"))?;
+ .map_err(|_| NetError::ListenerClosed)?;
let cancel_handle = RcRef::map(&resource, |r| &r.cancel);
let listener = RcRef::map(&resource, |r| &r.listener)
.try_borrow_mut()
- .ok_or_else(|| custom_error("Busy", "Another accept task is ongoing"))?;
+ .ok_or_else(|| NetError::AcceptTaskOngoing)?;
let (tls_stream, remote_addr) =
match listener.accept().try_or_cancel(&cancel_handle).await {
Ok(tuple) => tuple,
Err(err) if err.kind() == ErrorKind::Interrupted => {
- return Err(bad_resource("Listener has been closed"));
+ return Err(NetError::ListenerClosed);
}
Err(err) => return Err(err.into()),
};
@@ -547,11 +552,11 @@ pub async fn op_net_accept_tls(
pub async fn op_tls_handshake(
state: Rc>,
#[smi] rid: ResourceId,
-) -> Result {
+) -> Result {
let resource = state
.borrow()
.resource_table
.get::(rid)
- .map_err(|_| bad_resource("Listener has been closed"))?;
- resource.handshake().await
+ .map_err(|_| NetError::ListenerClosed)?;
+ resource.handshake().await.map_err(Into::into)
}
diff --git a/ext/net/ops_unix.rs b/ext/net/ops_unix.rs
index 95293284f0..04ae84906f 100644
--- a/ext/net/ops_unix.rs
+++ b/ext/net/ops_unix.rs
@@ -1,11 +1,9 @@
// Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
use crate::io::UnixStreamResource;
+use crate::ops::NetError;
use crate::raw::NetworkListenerResource;
use crate::NetPermissions;
-use deno_core::error::bad_resource;
-use deno_core::error::custom_error;
-use deno_core::error::AnyError;
use deno_core::op2;
use deno_core::AsyncRefCell;
use deno_core::CancelHandle;
@@ -26,11 +24,8 @@ use tokio::net::UnixListener;
pub use tokio::net::UnixStream;
/// A utility function to map OsStrings to Strings
-pub fn into_string(s: std::ffi::OsString) -> Result {
- s.into_string().map_err(|s| {
- let message = format!("File name or path {s:?} is not valid UTF-8");
- custom_error("InvalidData", message)
- })
+pub fn into_string(s: std::ffi::OsString) -> Result {
+ s.into_string().map_err(NetError::InvalidUtf8)
}
pub struct UnixDatagramResource {
@@ -63,15 +58,15 @@ pub struct UnixListenArgs {
pub async fn op_net_accept_unix(
state: Rc>,
#[smi] rid: ResourceId,
-) -> Result<(ResourceId, Option, Option), AnyError> {
+) -> Result<(ResourceId, Option, Option), NetError> {
let resource = state
.borrow()
.resource_table
.get::>(rid)
- .map_err(|_| bad_resource("Listener has been closed"))?;
+ .map_err(|_| NetError::ListenerClosed)?;
let listener = RcRef::map(&resource, |r| &r.listener)
.try_borrow_mut()
- .ok_or_else(|| custom_error("Busy", "Listener already in use"))?;
+ .ok_or(NetError::ListenerBusy)?;
let cancel = RcRef::map(resource, |r| &r.cancel);
let (unix_stream, _socket_addr) = listener
.accept()
@@ -95,7 +90,7 @@ pub async fn op_net_accept_unix(
pub async fn op_net_connect_unix(
state: Rc>,
#[string] address_path: String,
-) -> Result<(ResourceId, Option, Option), AnyError>
+) -> Result<(ResourceId, Option, Option), NetError>
where
NP: NetPermissions + 'static,
{
@@ -103,10 +98,12 @@ where
let mut state_ = state.borrow_mut();
let address_path = state_
.borrow_mut::()
- .check_read(&address_path, "Deno.connect()")?;
+ .check_read(&address_path, "Deno.connect()")
+ .map_err(NetError::Permission)?;
_ = state_
.borrow_mut::()
- .check_write_path(&address_path, "Deno.connect()")?;
+ .check_write_path(&address_path, "Deno.connect()")
+ .map_err(NetError::Permission)?;
address_path
};
let unix_stream = UnixStream::connect(&address_path).await?;
@@ -127,15 +124,15 @@ pub async fn op_net_recv_unixpacket(
state: Rc>,
#[smi] rid: ResourceId,
#[buffer] mut buf: JsBuffer,
-) -> Result<(usize, Option), AnyError> {
+) -> Result<(usize, Option), NetError> {
let resource = state
.borrow()
.resource_table
.get::(rid)
- .map_err(|_| bad_resource("Socket has been closed"))?;
+ .map_err(|_| NetError::SocketClosed)?;
let socket = RcRef::map(&resource, |r| &r.socket)
.try_borrow_mut()
- .ok_or_else(|| custom_error("Busy", "Socket already in use"))?;
+ .ok_or(NetError::SocketBusy)?;
let cancel = RcRef::map(resource, |r| &r.cancel);
let (nread, remote_addr) =
socket.recv_from(&mut buf).try_or_cancel(cancel).await?;
@@ -150,24 +147,25 @@ pub async fn op_net_send_unixpacket(
#[smi] rid: ResourceId,
#[string] address_path: String,
#[buffer] zero_copy: JsBuffer,
-) -> Result
+) -> Result
where
NP: NetPermissions + 'static,
{
let address_path = {
let mut s = state.borrow_mut();
s.borrow_mut::()
- .check_write(&address_path, "Deno.DatagramConn.send()")?
+ .check_write(&address_path, "Deno.DatagramConn.send()")
+ .map_err(NetError::Permission)?
};
let resource = state
.borrow()
.resource_table
.get::(rid)
- .map_err(|_| custom_error("NotConnected", "Socket has been closed"))?;
+ .map_err(|_| NetError::SocketClosedNotConnected)?;
let socket = RcRef::map(&resource, |r| &r.socket)
.try_borrow_mut()
- .ok_or_else(|| custom_error("Busy", "Socket already in use"))?;
+ .ok_or(NetError::SocketBusy)?;
let nwritten = socket.send_to(&zero_copy, address_path).await?;
Ok(nwritten)
@@ -179,14 +177,18 @@ pub fn op_net_listen_unix(
state: &mut OpState,
#[string] address_path: String,
#[string] api_name: String,
-) -> Result<(ResourceId, Option), AnyError>
+) -> Result<(ResourceId, Option), NetError>
where
NP: NetPermissions + 'static,
{
let permissions = state.borrow_mut::();
let api_call_expr = format!("{}()", api_name);
- let address_path = permissions.check_read(&address_path, &api_call_expr)?;
- _ = permissions.check_write_path(&address_path, &api_call_expr)?;
+ let address_path = permissions
+ .check_read(&address_path, &api_call_expr)
+ .map_err(NetError::Permission)?;
+ _ = permissions
+ .check_write_path(&address_path, &api_call_expr)
+ .map_err(NetError::Permission)?;
let listener = UnixListener::bind(address_path)?;
let local_addr = listener.local_addr()?;
let pathname = local_addr.as_pathname().map(pathstring).transpose()?;
@@ -198,14 +200,17 @@ where
pub fn net_listen_unixpacket(
state: &mut OpState,
address_path: String,
-) -> Result<(ResourceId, Option), AnyError>
+) -> Result<(ResourceId, Option