diff --git a/Cargo.lock b/Cargo.lock index 90b49d12..82dff977 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -536,6 +536,17 @@ dependencies = [ "itoa", ] +[[package]] +name = "http" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + [[package]] name = "http-body" version = "0.4.5" @@ -543,7 +554,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ "bytes", - "http", + "http 0.2.11", + "pin-project-lite", +] + +[[package]] +name = "http-body" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" +dependencies = [ + "bytes", + "http 1.1.0", +] + +[[package]] +name = "http-body-util" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" +dependencies = [ + "bytes", + "futures-util", + "http 1.1.0", + "http-body 1.0.1", "pin-project-lite", ] @@ -575,8 +609,8 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "http", - "http-body", + "http 0.2.11", + "http-body 0.4.5", "httparse", "httpdate", "itoa", @@ -588,17 +622,46 @@ dependencies = [ "want", ] +[[package]] +name = "hyper" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbbff0a806a4728c99295b254c8838933b5b082d75e3cb70c8dab21fdfbcfa9a" +dependencies = [ + "bytes", + "http 1.1.0", + "http-body 1.0.1", + "tokio", +] + [[package]] name = "hyper-tungstenite" -version = "0.11.1" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "426356dc8c52c5a18c5a6c12226c03362f98e4723716074f8010051934cb451c" +dependencies = [ + "http-body-util", + "hyper 1.5.0", + "hyper-util", + "pin-project-lite", + "tokio", + "tokio-tungstenite 0.24.0", + "tungstenite 0.24.0", +] + +[[package]] +name = "hyper-util" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cc7dcb1ab67cd336f468a12491765672e61a3b6b148634dbfe2fe8acd3fe7d9" +checksum = "41296eb09f183ac68eec06e03cdbea2e759633d4067b2f6552fc2e009bcad08b" dependencies = [ - "hyper", + "bytes", + "futures-util", + "http 1.1.0", + "http-body 1.0.1", + "hyper 1.5.0", "pin-project-lite", "tokio", - "tokio-tungstenite", - "tungstenite", ] [[package]] @@ -609,7 +672,7 @@ checksum = "0fafdf7b2b2de7c9784f76e02c0935e65a8117ec3b768644379983ab333ac98c" dependencies = [ "futures-util", "hex", - "hyper", + "hyper 0.14.31", "pin-project", "tokio", ] @@ -696,7 +759,7 @@ dependencies = [ "hex-literal", "hexplay", "hidapi", - "hyper", + "hyper 0.14.31", "hyperlocal", "lazy_static", "log", @@ -712,7 +775,7 @@ dependencies = [ "thiserror", "tokio", "tokio-stream", - "tokio-tungstenite", + "tokio-tungstenite 0.20.1", "tokio-util", "tower", "url2", @@ -732,7 +795,7 @@ dependencies = [ "futures", "futures-sink", "futures-util", - "hyper", + "hyper 0.14.31", "hyper-tungstenite", "hyperlocal", "lazy_static", @@ -995,8 +1058,8 @@ version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "496c1d3718081c45ba9c31fbfc07417900aa96f4070ff90dc29961836b7a9945" dependencies = [ - "http", - "hyper", + "http 0.2.11", + "hyper 0.14.31", "lazy_static", "percent-encoding", "regex", @@ -1008,7 +1071,7 @@ version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fe0ff8f64c3f61d9c0192e03191371d41ad6558ba58f347a598ac475b3ee1304" dependencies = [ - "hyper", + "hyper 0.14.31", "routerify", "url", ] @@ -1019,7 +1082,7 @@ version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "594688a9598d2feed4f50b219eedce4c9aaf419c7c0bc484cf350eeedbb05c41" dependencies = [ - "hyper", + "hyper 0.14.31", "hyperlocal", "routerify", "tokio", @@ -1323,7 +1386,19 @@ dependencies = [ "futures-util", "log", "tokio", - "tungstenite", + "tungstenite 0.20.1", +] + +[[package]] +name = "tokio-tungstenite" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edc5f74e248dc973e0dbb7b74c7e0d6fcc301c694ff50049504004ef4d0cdcd9" +dependencies = [ + "futures-util", + "log", + "tokio", + "tungstenite 0.24.0", ] [[package]] @@ -1411,7 +1486,7 @@ dependencies = [ "byteorder", "bytes", "data-encoding", - "http", + "http 0.2.11", "httparse", "log", "rand", @@ -1421,6 +1496,24 @@ dependencies = [ "utf-8", ] +[[package]] +name = "tungstenite" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18e5b8366ee7a95b16d32197d0b2604b43a0be89dc5fac9f8e96ccafbaedda8a" +dependencies = [ + "byteorder", + "bytes", + "data-encoding", + "http 1.1.0", + "httparse", + "log", + "rand", + "sha1", + "thiserror", + "utf-8", +] + [[package]] name = "typenum" version = "1.17.0" diff --git a/daemon/Cargo.toml b/daemon/Cargo.toml index e5526e33..26c59bfe 100644 --- a/daemon/Cargo.toml +++ b/daemon/Cargo.toml @@ -24,7 +24,7 @@ futures = "0.3.31" futures-sink = "0.3.31" futures-util = "0.3.31" hyper = "0.14.31" -hyper-tungstenite = "0.11.1" +hyper-tungstenite = "0.15.0" lazy_static = "1.5.0" log = "0.4.22" minidsp = { version = "0.1.12", path="../minidsp" }