summaryrefslogtreecommitdiff
path: root/cli
diff options
context:
space:
mode:
Diffstat (limited to 'cli')
-rw-r--r--cli/Cargo.toml7
-rw-r--r--cli/tests/integration/inspector_tests.rs36
-rw-r--r--cli/tests/integration/run_tests.rs46
-rw-r--r--cli/tools/registry/mod.rs6
4 files changed, 44 insertions, 51 deletions
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index 9ac1220ef..30e1fcbcc 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -100,7 +100,6 @@ flate2.workspace = true
fs3.workspace = true
glob = "0.3.1"
hex.workspace = true
-http.workspace = true
import_map = { version = "=0.18.0", features = ["ext"] }
indexmap.workspace = true
jsonc-parser = { version = "=0.23.0", features = ["serde"] }
@@ -150,12 +149,12 @@ nix.workspace = true
[dev-dependencies]
deno_bench_util.workspace = true
-fastwebsockets_06 = { package = "fastwebsockets", version = "0.6", features = ["upgrade", "unstable-split"] }
+fastwebsockets = { workspace = true, features = ["upgrade", "unstable-split"] }
flaky_test = "=0.1.0"
+http.workspace = true
http-body-util.workspace = true
-http_1 = { package = "http", version = "1.0" }
+hyper.workspace = true
hyper-util.workspace = true
-hyper1.workspace = true
once_cell.workspace = true
os_pipe.workspace = true
pretty_assertions.workspace = true
diff --git a/cli/tests/integration/inspector_tests.rs b/cli/tests/integration/inspector_tests.rs
index c06cb6a0d..3f9706847 100644
--- a/cli/tests/integration/inspector_tests.rs
+++ b/cli/tests/integration/inspector_tests.rs
@@ -7,13 +7,13 @@ use deno_core::serde_json;
use deno_core::serde_json::json;
use deno_core::url;
use deno_runtime::deno_fetch::reqwest;
-use fastwebsockets_06::FragmentCollector;
-use fastwebsockets_06::Frame;
-use fastwebsockets_06::WebSocket;
-use hyper1::body::Incoming;
-use hyper1::upgrade::Upgraded;
-use hyper1::Request;
-use hyper1::Response;
+use fastwebsockets::FragmentCollector;
+use fastwebsockets::Frame;
+use fastwebsockets::WebSocket;
+use hyper::body::Incoming;
+use hyper::upgrade::Upgraded;
+use hyper::Request;
+use hyper::Response;
use hyper_util::rt::TokioIo;
use std::io::BufRead;
use std::time::Duration;
@@ -25,14 +25,9 @@ use util::assert_starts_with;
use util::DenoChild;
use util::TestContextBuilder;
-// TODO(bartlomieju): remove `http::header` once we update to `reqwest`
-// to version that uses Hyper 1.0
-use http::header::HeaderValue;
-use http::header::HOST;
-
struct SpawnExecutor;
-impl<Fut> hyper1::rt::Executor<Fut> for SpawnExecutor
+impl<Fut> hyper::rt::Executor<Fut> for SpawnExecutor
where
Fut: std::future::Future + Send + 'static,
Fut::Output: Send + 'static,
@@ -60,17 +55,17 @@ async fn connect_to_ws(
.method("GET")
.uri(uri.path())
.header("Host", host)
- .header(hyper1::header::UPGRADE, "websocket")
- .header(hyper1::header::CONNECTION, "Upgrade")
+ .header(hyper::header::UPGRADE, "websocket")
+ .header(hyper::header::CONNECTION, "Upgrade")
.header(
"Sec-WebSocket-Key",
- fastwebsockets_06::handshake::generate_key(),
+ fastwebsockets::handshake::generate_key(),
)
.header("Sec-WebSocket-Version", "13")
.body(http_body_util::Empty::<Bytes>::new())
.unwrap();
- fastwebsockets_06::handshake::client(&SpawnExecutor, req, stream)
+ fastwebsockets::handshake::client(&SpawnExecutor, req, stream)
.await
.unwrap()
}
@@ -730,9 +725,10 @@ async fn inspector_json() {
] {
let mut req = reqwest::Request::new(reqwest::Method::GET, url.clone());
if let Some(host) = host {
- req
- .headers_mut()
- .insert(HOST, HeaderValue::from_static(host));
+ req.headers_mut().insert(
+ reqwest::header::HOST,
+ reqwest::header::HeaderValue::from_static(host),
+ );
}
let resp = client.execute(req).await.unwrap();
assert_eq!(resp.status(), reqwest::StatusCode::OK);
diff --git a/cli/tests/integration/run_tests.rs b/cli/tests/integration/run_tests.rs
index db18d1812..a2b49b749 100644
--- a/cli/tests/integration/run_tests.rs
+++ b/cli/tests/integration/run_tests.rs
@@ -4379,32 +4379,32 @@ async fn websocketstream_ping() {
let script = util::testdata_path().join("run/websocketstream_ping_test.ts");
let root_ca = util::testdata_path().join("tls/RootCA.pem");
- let srv_fn = hyper1::service::service_fn(|mut req| async move {
+ let srv_fn = hyper::service::service_fn(|mut req| async move {
let (response, upgrade_fut) =
- fastwebsockets_06::upgrade::upgrade(&mut req).unwrap();
+ fastwebsockets::upgrade::upgrade(&mut req).unwrap();
tokio::spawn(async move {
let mut ws = upgrade_fut.await.unwrap();
- ws.write_frame(fastwebsockets_06::Frame::text(b"A"[..].into()))
+ ws.write_frame(fastwebsockets::Frame::text(b"A"[..].into()))
.await
.unwrap();
- ws.write_frame(fastwebsockets_06::Frame::new(
+ ws.write_frame(fastwebsockets::Frame::new(
true,
- fastwebsockets_06::OpCode::Ping,
+ fastwebsockets::OpCode::Ping,
None,
vec![].into(),
))
.await
.unwrap();
- ws.write_frame(fastwebsockets_06::Frame::text(b"B"[..].into()))
+ ws.write_frame(fastwebsockets::Frame::text(b"B"[..].into()))
.await
.unwrap();
let message = ws.read_frame().await.unwrap();
- assert_eq!(message.opcode, fastwebsockets_06::OpCode::Pong);
- ws.write_frame(fastwebsockets_06::Frame::text(b"C"[..].into()))
+ assert_eq!(message.opcode, fastwebsockets::OpCode::Pong);
+ ws.write_frame(fastwebsockets::Frame::text(b"C"[..].into()))
.await
.unwrap();
- ws.write_frame(fastwebsockets_06::Frame::close_raw(vec![].into()))
+ ws.write_frame(fastwebsockets::Frame::close_raw(vec![].into()))
.await
.unwrap();
});
@@ -4427,7 +4427,7 @@ async fn websocketstream_ping() {
tokio::spawn(async move {
let (stream, _) = server.accept().await.unwrap();
let io = hyper_util::rt::TokioIo::new(stream);
- let conn_fut = hyper1::server::conn::http1::Builder::new()
+ let conn_fut = hyper::server::conn::http1::Builder::new()
.serve_connection(io, srv_fn)
.with_upgrades();
@@ -4442,7 +4442,7 @@ async fn websocketstream_ping() {
struct SpawnExecutor;
-impl<Fut> hyper1::rt::Executor<Fut> for SpawnExecutor
+impl<Fut> hyper::rt::Executor<Fut> for SpawnExecutor
where
Fut: std::future::Future + Send + 'static,
Fut::Output: Send + 'static,
@@ -4478,12 +4478,12 @@ async fn websocket_server_multi_field_connection_header() {
let stream = tokio::net::TcpStream::connect("localhost:4319")
.await
.unwrap();
- let req = http_1::Request::builder()
- .header(http_1::header::UPGRADE, "websocket")
- .header(http_1::header::CONNECTION, "keep-alive, Upgrade")
+ let req = http::Request::builder()
+ .header(http::header::UPGRADE, "websocket")
+ .header(http::header::CONNECTION, "keep-alive, Upgrade")
.header(
"Sec-WebSocket-Key",
- fastwebsockets_06::handshake::generate_key(),
+ fastwebsockets::handshake::generate_key(),
)
.header("Sec-WebSocket-Version", "13")
.uri("ws://localhost:4319")
@@ -4491,15 +4491,15 @@ async fn websocket_server_multi_field_connection_header() {
.unwrap();
let (mut socket, _) =
- fastwebsockets_06::handshake::client(&SpawnExecutor, req, stream)
+ fastwebsockets::handshake::client(&SpawnExecutor, req, stream)
.await
.unwrap();
let message = socket.read_frame().await.unwrap();
- assert_eq!(message.opcode, fastwebsockets_06::OpCode::Close);
+ assert_eq!(message.opcode, fastwebsockets::OpCode::Close);
assert!(message.payload.is_empty());
socket
- .write_frame(fastwebsockets_06::Frame::close_raw(vec![].into()))
+ .write_frame(fastwebsockets::Frame::close_raw(vec![].into()))
.await
.unwrap();
assert!(child.wait().unwrap().success());
@@ -4533,12 +4533,12 @@ async fn websocket_server_idletimeout() {
let stream = tokio::net::TcpStream::connect("localhost:4509")
.await
.unwrap();
- let req = http_1::Request::builder()
- .header(http_1::header::UPGRADE, "websocket")
- .header(http_1::header::CONNECTION, "keep-alive, Upgrade")
+ let req = http::Request::builder()
+ .header(http::header::UPGRADE, "websocket")
+ .header(http::header::CONNECTION, "keep-alive, Upgrade")
.header(
"Sec-WebSocket-Key",
- fastwebsockets_06::handshake::generate_key(),
+ fastwebsockets::handshake::generate_key(),
)
.header("Sec-WebSocket-Version", "13")
.uri("ws://localhost:4509")
@@ -4546,7 +4546,7 @@ async fn websocket_server_idletimeout() {
.unwrap();
let (_socket, _) =
- fastwebsockets_06::handshake::client(&SpawnExecutor, req, stream)
+ fastwebsockets::handshake::client(&SpawnExecutor, req, stream)
.await
.unwrap();
diff --git a/cli/tools/registry/mod.rs b/cli/tools/registry/mod.rs
index 42623039d..968a0dd65 100644
--- a/cli/tools/registry/mod.rs
+++ b/cli/tools/registry/mod.rs
@@ -19,8 +19,6 @@ use deno_core::unsync::JoinHandle;
use deno_core::unsync::JoinSet;
use deno_runtime::colors;
use deno_runtime::deno_fetch::reqwest;
-use http::header::AUTHORIZATION;
-use http::header::CONTENT_ENCODING;
use import_map::ImportMap;
use lsp_types::Url;
use serde::Serialize;
@@ -548,8 +546,8 @@ async fn publish_package(
let response = client
.post(url)
- .header(AUTHORIZATION, authorization)
- .header(CONTENT_ENCODING, "gzip")
+ .header(reqwest::header::AUTHORIZATION, authorization)
+ .header(reqwest::header::CONTENT_ENCODING, "gzip")
.body(package.tarball.clone())
.send()
.await?;
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-27 08:06:47 +0000