mirror of
https://github.com/denoland/deno.git
synced 2024-12-23 15:49:44 -05:00
parent
d050b491b1
commit
4e70ff80c2
13 changed files with 357 additions and 372 deletions
622
Cargo.lock
generated
622
Cargo.lock
generated
File diff suppressed because it is too large
Load diff
|
@ -27,7 +27,7 @@ path = "./bench/main.rs"
|
|||
deno_core = { path = "../core", version = "0.83.0" }
|
||||
deno_runtime = { path = "../runtime", version = "0.10.1" }
|
||||
regex = "1.4.3"
|
||||
serde = { version = "1.0.123", features = ["derive"] }
|
||||
serde = { version = "1.0.125", features = ["derive"] }
|
||||
|
||||
[target.'cfg(windows)'.build-dependencies]
|
||||
winapi = "0.3.9"
|
||||
|
@ -36,40 +36,40 @@ winres = "0.1.11"
|
|||
[dependencies]
|
||||
deno_core = { path = "../core", version = "0.83.0" }
|
||||
deno_doc = "0.1.23"
|
||||
deno_lint = "0.2.19"
|
||||
deno_lint = "0.2.20"
|
||||
deno_runtime = { path = "../runtime", version = "0.10.1" }
|
||||
|
||||
atty = "0.2.14"
|
||||
base64 = "0.13.0"
|
||||
byteorder = "1.4.2"
|
||||
byteorder = "1.4.3"
|
||||
clap = "2.33.3"
|
||||
dissimilar = "1.0.2"
|
||||
dprint-plugin-json = "0.10.1"
|
||||
dprint-plugin-markdown = "0.6.2"
|
||||
dprint-plugin-typescript = "0.41.0"
|
||||
encoding_rs = "0.8.28"
|
||||
env_logger = "0.8.2"
|
||||
env_logger = "0.8.3"
|
||||
filetime = "0.2.14"
|
||||
http = "0.2.3"
|
||||
indexmap = { version = "1.6.1", features = ["serde"] }
|
||||
indexmap = { version = "1.6.2", features = ["serde"] }
|
||||
jsonc-parser = { version = "0.17.0", features = ["serde"] }
|
||||
lazy_static = "1.4.0"
|
||||
libc = "0.2.86"
|
||||
libc = "0.2.93"
|
||||
log = { version = "0.4.14", features = ["serde"] }
|
||||
lspower = "0.8.4"
|
||||
notify = "5.0.0-pre.4"
|
||||
lspower = "1.0.0"
|
||||
notify = "5.0.0-pre.6"
|
||||
percent-encoding = "2.1.0"
|
||||
pin-project = "1.0.5"
|
||||
pin-project = "1.0.6"
|
||||
regex = "1.4.3"
|
||||
ring = "0.16.20"
|
||||
rustyline = { version = "8.0.0", default-features = false }
|
||||
rustyline-derive = "0.4.0"
|
||||
semver-parser = "0.10.2"
|
||||
serde = { version = "1.0.123", features = ["derive"] }
|
||||
serde = { version = "1.0.125", features = ["derive"] }
|
||||
shell-escape = "0.1.5"
|
||||
sourcemap = "6.0.1"
|
||||
swc_bundler = "0.25.1"
|
||||
swc_common = { version = "0.10.12", features = ["sourcemap"] }
|
||||
swc_common = { version = "0.10.14", features = ["sourcemap"] }
|
||||
swc_ecmascript = { version = "0.24.1", features = ["codegen", "dep_graph", "parser", "proposal", "react", "transforms", "typescript", "visit"] }
|
||||
tempfile = "3.2.0"
|
||||
termcolor = "1.1.2"
|
||||
|
@ -77,7 +77,7 @@ text-size = "1.1.0"
|
|||
tokio = { version = "1.4.0", features = ["full"] }
|
||||
tokio-rustls = "0.22.0"
|
||||
uuid = { version = "0.8.2", features = ["v4"] }
|
||||
walkdir = "2.3.1"
|
||||
walkdir = "2.3.2"
|
||||
|
||||
[target.'cfg(windows)'.dependencies]
|
||||
fwdansi = "1.1.0"
|
||||
|
@ -89,8 +89,8 @@ chrono = "0.4.19"
|
|||
os_pipe = "0.9.2"
|
||||
test_util = { path = "../test_util" }
|
||||
tower-test = "0.4.0"
|
||||
trust-dns-server = "0.20.0"
|
||||
trust-dns-client = "0.20.0"
|
||||
trust-dns-server = "0.20.1"
|
||||
trust-dns-client = "0.20.1"
|
||||
|
||||
[target.'cfg(unix)'.dev-dependencies]
|
||||
exec = "0.3.1" # Used in test_raw_tty
|
||||
|
|
|
@ -4717,7 +4717,9 @@ console.log("finish");
|
|||
/// Returns the next websocket message as a string ignoring
|
||||
/// Debugger.scriptParsed messages.
|
||||
async fn ws_read_msg(
|
||||
socket: &mut tokio_tungstenite::WebSocketStream<tokio::net::TcpStream>,
|
||||
socket: &mut tokio_tungstenite::WebSocketStream<
|
||||
tokio_tungstenite::MaybeTlsStream<tokio::net::TcpStream>,
|
||||
>,
|
||||
) -> String {
|
||||
use deno_core::futures::stream::StreamExt;
|
||||
while let Some(msg) = socket.next().await {
|
||||
|
|
|
@ -13,18 +13,18 @@ repository = "https://github.com/denoland/deno"
|
|||
path = "lib.rs"
|
||||
|
||||
[dependencies]
|
||||
anyhow = "1.0.38"
|
||||
futures = "0.3.12"
|
||||
indexmap = "1.6.1"
|
||||
anyhow = "1.0.40"
|
||||
futures = "0.3.13"
|
||||
indexmap = "1.6.2"
|
||||
lazy_static = "1.4.0"
|
||||
libc = "0.2.86"
|
||||
libc = "0.2.93"
|
||||
log = "0.4.14"
|
||||
pin-project = "1.0.5"
|
||||
pin-project = "1.0.6"
|
||||
rusty_v8 = "0.21.0"
|
||||
serde = { version = "1.0.123", features = ["derive"] }
|
||||
serde_json = { version = "1.0.62", features = ["preserve_order"] }
|
||||
serde = { version = "1.0.125", features = ["derive"] }
|
||||
serde_json = { version = "1.0.64", features = ["preserve_order"] }
|
||||
serde_v8 = { version = "0.1.0", path = "../serde_v8" }
|
||||
url = { version = "2.2.0", features = ["serde"] }
|
||||
url = { version = "2.2.1", features = ["serde"] }
|
||||
|
||||
[[example]]
|
||||
name = "http_bench_bin_ops"
|
||||
|
|
|
@ -16,8 +16,8 @@ path = "lib.rs"
|
|||
[dependencies]
|
||||
bytes = "1.0.1"
|
||||
deno_core = { version = "0.83.0", path = "../../core" }
|
||||
reqwest = { version = "0.11.0", default-features = false, features = ["rustls-tls", "stream", "gzip", "brotli"] }
|
||||
serde = { version = "1.0.123", features = ["derive"] }
|
||||
reqwest = { version = "0.11.2", default-features = false, features = ["rustls-tls", "stream", "gzip", "brotli"] }
|
||||
serde = { version = "1.0.125", features = ["derive"] }
|
||||
tokio = { version = "1.4.0", features = ["full"] }
|
||||
tokio-stream = "0.1.5"
|
||||
tokio-util = "0.6.5"
|
||||
|
|
|
@ -15,5 +15,5 @@ path = "lib.rs"
|
|||
|
||||
[dependencies]
|
||||
deno_core = { version = "0.83.0", path = "../../core" }
|
||||
idna = "0.2.1"
|
||||
serde = { version = "1.0.123", features = ["derive"] }
|
||||
idna = "0.2.2"
|
||||
serde = { version = "1.0.125", features = ["derive"] }
|
||||
|
|
|
@ -17,4 +17,4 @@ path = "lib.rs"
|
|||
deno_core = { version = "0.83.0", path = "../../core" }
|
||||
|
||||
[dev-dependencies]
|
||||
futures = "0.3.12"
|
||||
futures = "0.3.13"
|
||||
|
|
|
@ -16,6 +16,6 @@ path = "lib.rs"
|
|||
[dependencies]
|
||||
deno_core = { version = "0.83.0", path = "../../core" }
|
||||
tokio = { version = "1.4.0", features = ["full"] }
|
||||
serde = { version = "1.0.123", features = ["derive"] }
|
||||
serde = { version = "1.0.125", features = ["derive"] }
|
||||
wgpu-core = { version = "0.7.0", features = ["trace"] }
|
||||
wgpu-types = "0.7.0"
|
||||
|
|
|
@ -16,9 +16,9 @@ path = "lib.rs"
|
|||
[dependencies]
|
||||
deno_core = { version = "0.83.0", path = "../../core" }
|
||||
http = "0.2.3"
|
||||
serde = { version = "1.0.123", features = ["derive"] }
|
||||
serde = { version = "1.0.125", features = ["derive"] }
|
||||
tokio = { version = "1.4.0", features = ["full"] }
|
||||
tokio-rustls = "0.22.0"
|
||||
tokio-tungstenite = "0.13.0"
|
||||
tokio-tungstenite = { version = "0.14.0", features = ["rustls-tls"] }
|
||||
webpki = "0.21.4"
|
||||
webpki-roots = "0.21.0"
|
||||
webpki-roots = "0.21.1"
|
||||
|
|
|
@ -32,12 +32,12 @@ use std::rc::Rc;
|
|||
use std::sync::Arc;
|
||||
use tokio::net::TcpStream;
|
||||
use tokio_rustls::{rustls::ClientConfig, TlsConnector};
|
||||
use tokio_tungstenite::stream::Stream as StreamSwitcher;
|
||||
use tokio_tungstenite::tungstenite::Error as TungsteniteError;
|
||||
use tokio_tungstenite::tungstenite::{
|
||||
handshake::client::Response, protocol::frame::coding::CloseCode,
|
||||
protocol::CloseFrame, Message,
|
||||
};
|
||||
use tokio_tungstenite::MaybeTlsStream;
|
||||
use tokio_tungstenite::{client_async, WebSocketStream};
|
||||
use webpki::DNSNameRef;
|
||||
|
||||
|
@ -61,10 +61,7 @@ impl WebSocketPermissions for NoWebSocketPermissions {
|
|||
}
|
||||
}
|
||||
|
||||
type MaybeTlsStream =
|
||||
StreamSwitcher<TcpStream, tokio_rustls::client::TlsStream<TcpStream>>;
|
||||
|
||||
type WsStream = WebSocketStream<MaybeTlsStream>;
|
||||
type WsStream = WebSocketStream<MaybeTlsStream<TcpStream>>;
|
||||
struct WsStreamResource {
|
||||
tx: AsyncRefCell<SplitSink<WsStream, Message>>,
|
||||
rx: AsyncRefCell<SplitStream<WsStream>>,
|
||||
|
@ -149,8 +146,8 @@ where
|
|||
Err(_) => return Ok(json!({ "success": false })),
|
||||
};
|
||||
|
||||
let socket: MaybeTlsStream = match uri.scheme_str() {
|
||||
Some("ws") => StreamSwitcher::Plain(tcp_socket),
|
||||
let socket: MaybeTlsStream<TcpStream> = match uri.scheme_str() {
|
||||
Some("ws") => MaybeTlsStream::Plain(tcp_socket),
|
||||
Some("wss") => {
|
||||
let mut config = ClientConfig::new();
|
||||
config
|
||||
|
@ -166,7 +163,7 @@ where
|
|||
let dnsname =
|
||||
DNSNameRef::try_from_ascii_str(&domain).expect("Invalid DNS lookup");
|
||||
let tls_socket = tls_connector.connect(dnsname, tcp_socket).await?;
|
||||
StreamSwitcher::Tls(tls_socket)
|
||||
MaybeTlsStream::Rustls(tls_socket)
|
||||
}
|
||||
_ => unreachable!(),
|
||||
};
|
||||
|
|
|
@ -50,25 +50,25 @@ dlopen = "0.1.8"
|
|||
encoding_rs = "0.8.28"
|
||||
filetime = "0.2.14"
|
||||
http = "0.2.3"
|
||||
hyper = { version = "0.14.4", features = ["server"] }
|
||||
indexmap = "1.6.1"
|
||||
hyper = { version = "0.14.5", features = ["server"] }
|
||||
indexmap = "1.6.2"
|
||||
lazy_static = "1.4.0"
|
||||
libc = "0.2.86"
|
||||
libc = "0.2.93"
|
||||
log = "0.4.14"
|
||||
notify = "5.0.0-pre.4"
|
||||
notify = "5.0.0-pre.6"
|
||||
percent-encoding = "2.1.0"
|
||||
regex = "1.4.3"
|
||||
ring = "0.16.20"
|
||||
serde = { version = "1.0.123", features = ["derive"] }
|
||||
serde = { version = "1.0.125", features = ["derive"] }
|
||||
sys-info = "0.8.0"
|
||||
termcolor = "1.1.2"
|
||||
tokio = { version = "1.4.0", features = ["full"] }
|
||||
tokio-rustls = "0.22.0"
|
||||
uuid = { version = "0.8.2", features = ["v4"] }
|
||||
webpki = "0.21.4"
|
||||
webpki-roots = "0.21.0"
|
||||
trust-dns-proto = "0.20.0"
|
||||
trust-dns-resolver = { version = "0.20.0", features = ["tokio-runtime", "serde-config"] }
|
||||
webpki-roots = "0.21.1"
|
||||
trust-dns-proto = "0.20.1"
|
||||
trust-dns-resolver = { version = "0.20.1", features = ["tokio-runtime", "serde-config"] }
|
||||
|
||||
[target.'cfg(windows)'.dependencies]
|
||||
fwdansi = "1.1.0"
|
||||
|
|
|
@ -9,11 +9,11 @@ readme = "README.md"
|
|||
repository = "https://github.com/denoland/deno"
|
||||
|
||||
[dependencies]
|
||||
serde = { version = "1.0.123", features = ["derive"] }
|
||||
serde = { version = "1.0.125", features = ["derive"] }
|
||||
rusty_v8 = "0.21.0"
|
||||
|
||||
[dev-dependencies]
|
||||
serde_json = "1.0.62"
|
||||
serde_json = "1.0.64"
|
||||
bencher = "0.1"
|
||||
|
||||
[[example]]
|
||||
|
|
|
@ -14,16 +14,16 @@ path = "src/test_server.rs"
|
|||
[dependencies]
|
||||
async-stream = "0.3.0"
|
||||
bytes = "1.0.1"
|
||||
futures = "0.3.12"
|
||||
hyper = { version = "0.14.4", features = ["server", "http1", "runtime"] }
|
||||
futures = "0.3.13"
|
||||
hyper = { version = "0.14.5", features = ["server", "http1", "runtime"] }
|
||||
lazy_static = "1.4.0"
|
||||
os_pipe = "0.9.2"
|
||||
regex = "1.4.3"
|
||||
serde = { version = "1.0.123", features = ["derive"] }
|
||||
serde = { version = "1.0.125", features = ["derive"] }
|
||||
tempfile = "3.2.0"
|
||||
tokio = { version = "1.4.0", features = ["full"] }
|
||||
tokio-rustls = "0.22.0"
|
||||
tokio-tungstenite = "0.13.0"
|
||||
tokio-tungstenite = "0.14.0"
|
||||
|
||||
[target.'cfg(unix)'.dependencies]
|
||||
pty = "0.2.2"
|
||||
|
|
Loading…
Reference in a new issue