github-mirrors/librespot
1
0
Fork 0
mirror of https://github.com/librespot-org/librespot.git synced 2024-12-18 17:11:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1291 from GeorgeHahn/hyper-update

Browse source 
Update hyper to 1.x
This commit is contained in:
Roderick van Domburg 2024-06-09 10:06:54 +02:00 committed by GitHub
commit 15044302a8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
12 changed files with 285 additions and 338 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

399
Cargo.lock generated
View file

@ -138,9 +138,15 @@ checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.50", "syn 2.0.66",
] ]
[[package]]
name = "atomic-waker"
version = "1.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
[[package]] [[package]]
name = "atomic_refcell" name = "atomic_refcell"
version = "0.1.13" version = "0.1.13"
@ -168,12 +174,6 @@ dependencies = [
"rustc-demangle", "rustc-demangle",
] ]
[[package]]
name = "base64"
version = "0.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
[[package]] [[package]]
name = "base64" name = "base64"
version = "0.21.7" version = "0.21.7"
@ -203,7 +203,7 @@ dependencies = [
"regex", "regex",
"rustc-hash", "rustc-hash",
"shlex", "shlex",
"syn 2.0.50", "syn 2.0.66",
] ]
[[package]] [[package]]
@ -415,15 +415,6 @@ dependencies = [
"typenum", "typenum",
] ]
[[package]]
name = "ct-logs"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c1a816186fa68d9e426e3cb4ae4dff1fcd8e4a2c34b781bf7a822574a0d0aac8"
dependencies = [
"sct 0.6.1",
]
[[package]] [[package]]
name = "ctr" name = "ctr"
version = "0.9.2" version = "0.9.2"
@ -624,7 +615,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.50", "syn 2.0.66",
] ]
[[package]] [[package]]
@ -744,7 +735,7 @@ dependencies = [
"proc-macro-crate 3.1.0", "proc-macro-crate 3.1.0",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.50", "syn 2.0.66",
] ]
[[package]] [[package]]
@ -916,16 +907,16 @@ dependencies = [
[[package]] [[package]]
name = "h2" name = "h2"
version = "0.3.26" version = "0.4.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab"
dependencies = [ dependencies = [
"atomic-waker",
"bytes", "bytes",
"fnv", "fnv",
"futures-core", "futures-core",
"futures-sink", "futures-sink",
"futures-util", "http",
"http 0.2.11",
"indexmap 2.2.3", "indexmap 2.2.3",
"slab", "slab",
"tokio", "tokio",
@ -947,14 +938,14 @@ checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
[[package]] [[package]]
name = "headers" name = "headers"
version = "0.3.9" version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270" checksum = "322106e6bd0cba2d5ead589ddb8150a13d7c4217cf80d7c4f682ca994ccc6aa9"
dependencies = [ dependencies = [
"base64 0.21.7", "base64",
"bytes", "bytes",
"headers-core", "headers-core",
"http 0.2.11", "http",
"httpdate", "httpdate",
"mime", "mime",
"sha1", "sha1",
@ -962,11 +953,11 @@ dependencies = [
[[package]] [[package]]
name = "headers-core" name = "headers-core"
version = "0.2.0" version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" checksum = "54b4a22553d4242c49fddb9ba998a99962b5cc6f22cb5a3482bec22522403ce4"
dependencies = [ dependencies = [
"http 0.2.11", "http",
] ]
[[package]] [[package]]
@ -1016,17 +1007,6 @@ dependencies = [
"winapi", "winapi",
] ]
[[package]]
name = "http"
version = "0.2.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb"
dependencies = [
"bytes",
"fnv",
"itoa",
]
[[package]] [[package]]
name = "http" name = "http"
version = "1.0.0" version = "1.0.0"
@ -1040,12 +1020,24 @@ dependencies = [
[[package]] [[package]]
name = "http-body" name = "http-body"
version = "0.4.6" version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643"
dependencies = [ dependencies = [
"bytes", "bytes",
"http 0.2.11", "http",
]
[[package]]
name = "http-body-util"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d"
dependencies = [
"bytes",
"futures-core",
"http",
"http-body",
"pin-project-lite", "pin-project-lite",
] ]
@ -1069,78 +1061,83 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
[[package]] [[package]]
name = "hyper" name = "hyper"
version = "0.14.28" version = "1.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d"
dependencies = [ dependencies = [
"bytes", "bytes",
"futures-channel", "futures-channel",
"futures-core",
"futures-util", "futures-util",
"h2", "h2",
"http 0.2.11", "http",
"http-body", "http-body",
"httparse", "httparse",
"httpdate", "httpdate",
"itoa", "itoa",
"pin-project-lite", "pin-project-lite",
"socket2", "smallvec",
"tokio", "tokio",
"tower-service",
"tracing",
"want", "want",
] ]
[[package]] [[package]]
name = "hyper-proxy" name = "hyper-proxy2"
version = "0.9.1" version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ca815a891b24fdfb243fa3239c86154392b0953ee584aa1a2a1f66d20cbe75cc" checksum = "9043b7b23fb0bc4a1c7014c27b50a4fc42cc76206f71d34fc0dfe5b28ddc3faf"
dependencies = [ dependencies = [
"bytes", "bytes",
"futures", "futures-util",
"headers", "headers",
"http 0.2.11", "http",
"hyper", "hyper",
"hyper-rustls 0.22.1", "hyper-rustls",
"rustls-native-certs 0.5.0", "hyper-util",
"pin-project-lite",
"rustls-native-certs",
"tokio", "tokio",
"tokio-rustls 0.22.0", "tokio-rustls",
"tower-service", "tower-service",
"webpki 0.21.4", "webpki",
] ]
[[package]] [[package]]
name = "hyper-rustls" name = "hyper-rustls"
version = "0.22.1" version = "0.26.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5f9f7a97316d44c0af9b0301e65010573a853a9fc97046d7331d7f6bc0fd5a64" checksum = "a0bea761b46ae2b24eb4aef630d8d1c398157b6fc29e6350ecf090a0b70c952c"
dependencies = [ dependencies = [
"ct-logs",
"futures-util", "futures-util",
"http",
"hyper", "hyper",
"hyper-util",
"log", "log",
"rustls 0.19.1", "rustls",
"rustls-native-certs 0.5.0", "rustls-native-certs",
"rustls-pki-types",
"tokio", "tokio",
"tokio-rustls 0.22.0", "tokio-rustls",
"webpki 0.21.4", "tower-service",
] ]
[[package]] [[package]]
name = "hyper-rustls" name = "hyper-util"
version = "0.24.2" version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" checksum = "7b875924a60b96e5d7b9ae7b066540b1dd1cbd90d1828f54c92e02a283351c56"
dependencies = [ dependencies = [
"bytes",
"futures-channel",
"futures-util", "futures-util",
"http 0.2.11", "http",
"http-body",
"hyper", "hyper",
"log", "pin-project-lite",
"rustls 0.21.10", "socket2",
"rustls-native-certs 0.6.3",
"tokio", "tokio",
"tokio-rustls 0.24.1", "tower",
"tower-service",
"tracing",
] ]
[[package]] [[package]]
@ -1414,7 +1411,7 @@ dependencies = [
"thiserror", "thiserror",
"tokio", "tokio",
"url", "url",
"webpki 0.22.4", "webpki",
] ]
[[package]] [[package]]
@ -1427,7 +1424,9 @@ dependencies = [
"ctr", "ctr",
"futures-core", "futures-core",
"futures-util", "futures-util",
"http-body-util",
"hyper", "hyper",
"hyper-util",
"librespot-core", "librespot-core",
"log", "log",
"parking_lot", "parking_lot",
@ -1460,7 +1459,7 @@ name = "librespot-core"
version = "0.5.0-dev" version = "0.5.0-dev"
dependencies = [ dependencies = [
"aes", "aes",
"base64 0.21.7", "base64",
"byteorder", "byteorder",
"bytes", "bytes",
"data-encoding", "data-encoding",
@ -1471,11 +1470,13 @@ dependencies = [
"futures-util", "futures-util",
"governor", "governor",
"hmac", "hmac",
"http 0.2.11", "http",
"http-body-util",
"httparse", "httparse",
"hyper", "hyper",
"hyper-proxy", "hyper-proxy2",
"hyper-rustls 0.24.2", "hyper-rustls",
"hyper-util",
"librespot-protocol", "librespot-protocol",
"log", "log",
"nonzero_ext", "nonzero_ext",
@ -1512,7 +1513,8 @@ name = "librespot-discovery"
version = "0.5.0-dev" version = "0.5.0-dev"
dependencies = [ dependencies = [
"aes", "aes",
"base64 0.21.7", "base64",
"bytes",
"cfg-if", "cfg-if",
"ctr", "ctr",
"dns-sd", "dns-sd",
@ -1522,7 +1524,9 @@ dependencies = [
"futures-util", "futures-util",
"hex", "hex",
"hmac", "hmac",
"http-body-util",
"hyper", "hyper",
"hyper-util",
"libmdns", "libmdns",
"librespot-core", "librespot-core",
"log", "log",
@ -1827,7 +1831,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.50", "syn 2.0.66",
] ]
[[package]] [[package]]
@ -2040,6 +2044,26 @@ dependencies = [
"indexmap 2.2.3", "indexmap 2.2.3",
] ]
[[package]]
name = "pin-project"
version = "1.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422"
dependencies = [
"pin-project-internal",
]
[[package]]
name = "pin-project-internal"
version = "1.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.66",
]
[[package]] [[package]]
name = "pin-project-lite" name = "pin-project-lite"
version = "0.2.13" version = "0.2.13"
@ -2149,9 +2173,9 @@ dependencies = [
[[package]] [[package]]
name = "proc-macro2" name = "proc-macro2"
version = "1.0.78" version = "1.0.85"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23"
dependencies = [ dependencies = [
"unicode-ident", "unicode-ident",
] ]
@ -2310,21 +2334,6 @@ version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
[[package]]
name = "ring"
version = "0.16.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
dependencies = [
"cc",
"libc",
"once_cell",
"spin 0.5.2",
"untrusted 0.7.1",
"web-sys",
"winapi",
]
[[package]] [[package]]
name = "ring" name = "ring"
version = "0.17.8" version = "0.17.8"
@ -2336,7 +2345,7 @@ dependencies = [
"getrandom", "getrandom",
"libc", "libc",
"spin 0.9.8", "spin 0.9.8",
"untrusted 0.9.0", "untrusted",
"windows-sys 0.52.0", "windows-sys 0.52.0",
] ]
@ -2415,31 +2424,6 @@ dependencies = [
"windows-sys 0.52.0", "windows-sys 0.52.0",
] ]
[[package]]
name = "rustls"
version = "0.19.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7"
dependencies = [
"base64 0.13.1",
"log",
"ring 0.16.20",
"sct 0.6.1",
"webpki 0.21.4",
]
[[package]]
name = "rustls"
version = "0.21.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba"
dependencies = [
"log",
"ring 0.17.8",
"rustls-webpki 0.101.7",
"sct 0.7.1",
]
[[package]] [[package]]
name = "rustls" name = "rustls"
version = "0.22.2" version = "0.22.2"
@ -2447,37 +2431,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e87c9956bd9807afa1f77e0f7594af32566e830e088a5576d27c5b6f30f49d41" checksum = "e87c9956bd9807afa1f77e0f7594af32566e830e088a5576d27c5b6f30f49d41"
dependencies = [ dependencies = [
"log", "log",
"ring 0.17.8", "ring",
"rustls-pki-types", "rustls-pki-types",
"rustls-webpki 0.102.2", "rustls-webpki",
"subtle", "subtle",
"zeroize", "zeroize",
] ]
[[package]]
name = "rustls-native-certs"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a07b7c1885bd8ed3831c289b7870b13ef46fe0e856d288c30d9cc17d75a2092"
dependencies = [
"openssl-probe",
"rustls 0.19.1",
"schannel",
"security-framework",
]
[[package]]
name = "rustls-native-certs"
version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00"
dependencies = [
"openssl-probe",
"rustls-pemfile 1.0.4",
"schannel",
"security-framework",
]
[[package]] [[package]]
name = "rustls-native-certs" name = "rustls-native-certs"
version = "0.7.0" version = "0.7.0"
@ -2485,28 +2445,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8f1fb85efa936c42c6d5fc28d2629bb51e4b2f4b8a5211e297d599cc5a093792" checksum = "8f1fb85efa936c42c6d5fc28d2629bb51e4b2f4b8a5211e297d599cc5a093792"
dependencies = [ dependencies = [
"openssl-probe", "openssl-probe",
"rustls-pemfile 2.1.0", "rustls-pemfile",
"rustls-pki-types", "rustls-pki-types",
"schannel", "schannel",
"security-framework", "security-framework",
] ]
[[package]]
name = "rustls-pemfile"
version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c"
dependencies = [
"base64 0.21.7",
]
[[package]] [[package]]
name = "rustls-pemfile" name = "rustls-pemfile"
version = "2.1.0" version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3c333bb734fcdedcea57de1602543590f545f127dc8b533324318fd492c5c70b" checksum = "3c333bb734fcdedcea57de1602543590f545f127dc8b533324318fd492c5c70b"
dependencies = [ dependencies = [
"base64 0.21.7", "base64",
"rustls-pki-types", "rustls-pki-types",
] ]
@ -2516,25 +2467,15 @@ version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "048a63e5b3ac996d78d402940b5fa47973d2d080c6c6fffa1d0f19c4445310b7" checksum = "048a63e5b3ac996d78d402940b5fa47973d2d080c6c6fffa1d0f19c4445310b7"
[[package]]
name = "rustls-webpki"
version = "0.101.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765"
dependencies = [
"ring 0.17.8",
"untrusted 0.9.0",
]
[[package]] [[package]]
name = "rustls-webpki" name = "rustls-webpki"
version = "0.102.2" version = "0.102.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "faaa0a62740bedb9b2ef5afa303da42764c012f743917351dc9a237ea1663610" checksum = "faaa0a62740bedb9b2ef5afa303da42764c012f743917351dc9a237ea1663610"
dependencies = [ dependencies = [
"ring 0.17.8", "ring",
"rustls-pki-types", "rustls-pki-types",
"untrusted 0.9.0", "untrusted",
] ]
[[package]] [[package]]
@ -2573,26 +2514,6 @@ version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
[[package]]
name = "sct"
version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce"
dependencies = [
"ring 0.16.20",
"untrusted 0.7.1",
]
[[package]]
name = "sct"
version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414"
dependencies = [
"ring 0.17.8",
"untrusted 0.9.0",
]
[[package]] [[package]]
name = "sdl2" name = "sdl2"
version = "0.36.0" version = "0.36.0"
@ -2656,7 +2577,7 @@ checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.50", "syn 2.0.66",
] ]
[[package]] [[package]]
@ -2890,9 +2811,9 @@ dependencies = [
[[package]] [[package]]
name = "syn" name = "syn"
version = "2.0.50" version = "2.0.66"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "74f1bdc9872430ce9b75da68329d1c1746faf50ffac5f19e02b71e37ff881ffb" checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -2961,7 +2882,7 @@ checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.50", "syn 2.0.66",
] ]
[[package]] [[package]]
@ -3049,28 +2970,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.50", "syn 2.0.66",
]
[[package]]
name = "tokio-rustls"
version = "0.22.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6"
dependencies = [
"rustls 0.19.1",
"tokio",
"webpki 0.21.4",
]
[[package]]
name = "tokio-rustls"
version = "0.24.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081"
dependencies = [
"rustls 0.21.10",
"tokio",
] ]
[[package]] [[package]]
@ -3079,7 +2979,7 @@ version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f"
dependencies = [ dependencies = [
"rustls 0.22.2", "rustls",
"rustls-pki-types", "rustls-pki-types",
"tokio", "tokio",
] ]
@ -3103,11 +3003,11 @@ checksum = "c83b561d025642014097b66e6c1bb422783339e0909e4429cde4749d1990bc38"
dependencies = [ dependencies = [
"futures-util", "futures-util",
"log", "log",
"rustls 0.22.2", "rustls",
"rustls-native-certs 0.7.0", "rustls-native-certs",
"rustls-pki-types", "rustls-pki-types",
"tokio", "tokio",
"tokio-rustls 0.25.0", "tokio-rustls",
"tungstenite", "tungstenite",
] ]
@ -3181,6 +3081,27 @@ dependencies = [
"winnow 0.6.2", "winnow 0.6.2",
] ]
[[package]]
name = "tower"
version = "0.4.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
dependencies = [
"futures-core",
"futures-util",
"pin-project",
"pin-project-lite",
"tokio",
"tower-layer",
"tower-service",
]
[[package]]
name = "tower-layer"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0"
[[package]] [[package]]
name = "tower-service" name = "tower-service"
version = "0.3.2" version = "0.3.2"
@ -3221,11 +3142,11 @@ dependencies = [
"byteorder", "byteorder",
"bytes", "bytes",
"data-encoding", "data-encoding",
"http 1.0.0", "http",
"httparse", "httparse",
"log", "log",
"rand", "rand",
"rustls 0.22.2", "rustls",
"rustls-pki-types", "rustls-pki-types",
"sha1", "sha1",
"thiserror", "thiserror",
@ -3266,12 +3187,6 @@ version = "0.1.11"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
[[package]]
name = "untrusted"
version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
[[package]] [[package]]
name = "untrusted" name = "untrusted"
version = "0.9.0" version = "0.9.0"
@ -3381,7 +3296,7 @@ dependencies = [
"once_cell", "once_cell",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.50", "syn 2.0.66",
"wasm-bindgen-shared", "wasm-bindgen-shared",
] ]
@ -3415,7 +3330,7 @@ checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.50", "syn 2.0.66",
"wasm-bindgen-backend", "wasm-bindgen-backend",
"wasm-bindgen-shared", "wasm-bindgen-shared",
] ]
@ -3436,24 +3351,14 @@ dependencies = [
"wasm-bindgen", "wasm-bindgen",
] ]
[[package]]
name = "webpki"
version = "0.21.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea"
dependencies = [
"ring 0.16.20",
"untrusted 0.7.1",
]
[[package]] [[package]]
name = "webpki" name = "webpki"
version = "0.22.4" version = "0.22.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53" checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53"
dependencies = [ dependencies = [
"ring 0.17.8", "ring",
"untrusted 0.9.0", "untrusted",
] ]
[[package]] [[package]]
@ -3752,7 +3657,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.50", "syn 2.0.66",
] ]
[[package]] [[package]]

4
audio/Cargo.toml
View file

@ -19,7 +19,9 @@ bytes = "1"
ctr = "0.9" ctr = "0.9"
futures-core = "0.3" futures-core = "0.3"
futures-util = "0.3" futures-util = "0.3"
hyper = { version = "0.14", features = ["client"] } hyper = { version = "1.3", features = [] }
hyper-util = { version = "0.1", features = ["client"] }
http-body-util = "0.1.1"
log = "0.4" log = "0.4"
parking_lot = { version = "0.12", features = ["deadlock_detection"] } parking_lot = { version = "0.12", features = ["deadlock_detection"] }
tempfile = "3" tempfile = "3"

5
audio/src/fetch/mod.rs
View file

@ -12,7 +12,8 @@ use std::{
}; };
use futures_util::{future::IntoStream, StreamExt, TryFutureExt}; use futures_util::{future::IntoStream, StreamExt, TryFutureExt};
use hyper::{client::ResponseFuture, header::CONTENT_RANGE, Body, Response, StatusCode}; use hyper::{body::Incoming, header::CONTENT_RANGE, Response, StatusCode};
use hyper_util::client::legacy::ResponseFuture;
use parking_lot::{Condvar, Mutex}; use parking_lot::{Condvar, Mutex};
use tempfile::NamedTempFile; use tempfile::NamedTempFile;
use thiserror::Error; use thiserror::Error;
@ -133,7 +134,7 @@ pub enum AudioFile {
#[derive(Debug)] #[derive(Debug)]
pub struct StreamingRequest { pub struct StreamingRequest {
streamer: IntoStream<ResponseFuture>, streamer: IntoStream<ResponseFuture>,
initial_response: Option<Response<Body>>, initial_response: Option<Response<Incoming>>,
offset: usize, offset: usize,
length: usize, length: usize,
} }

3
audio/src/fetch/receive.rs
View file

@ -7,6 +7,7 @@ use std::{
use bytes::Bytes; use bytes::Bytes;
use futures_util::StreamExt; use futures_util::StreamExt;
use http_body_util::BodyExt;
use hyper::StatusCode; use hyper::StatusCode;
use tempfile::NamedTempFile; use tempfile::NamedTempFile;
use tokio::sync::{mpsc, oneshot}; use tokio::sync::{mpsc, oneshot};
@ -97,7 +98,7 @@ async fn receive_data(
} }
let body = response.into_body(); let body = response.into_body();
let data = match hyper::body::to_bytes(body).await { let data = match body.collect().await.map(|b| b.to_bytes()) {
Ok(bytes) => bytes, Ok(bytes) => bytes,
Err(e) => break Err(e.into()), Err(e) => break Err(e.into()),
}; };

10
core/Cargo.toml
View file

@ -25,10 +25,12 @@ futures-util = { version = "0.3", features = ["alloc", "bilock", "sink", "unstab
governor = { version = "0.6", default-features = false, features = ["std", "jitter"] } governor = { version = "0.6", default-features = false, features = ["std", "jitter"] }
hmac = "0.12" hmac = "0.12"
httparse = "1.7" httparse = "1.7"
http = "0.2" http = "1.0"
hyper = { version = "0.14", features = ["client", "http1", "http2", "tcp"] } hyper = { version = "1.3", features = ["http1", "http2"] }
hyper-proxy = { version = "0.9", default-features = false, features = ["rustls"] } hyper-util = { version = "0.1", features = ["client"] }
hyper-rustls = { version = "0.24", features = ["http2"] } http-body-util = "0.1.1"
hyper-proxy2 = { version = "0.1", default-features = false, features = ["rustls"] }
hyper-rustls = { version = "0.26", features = ["http2"] }
log = "0.4" log = "0.4"
nonzero_ext = "0.3" nonzero_ext = "0.3"
num-bigint = { version = "0.4", features = ["rand"] } num-bigint = { version = "0.4", features = ["rand"] }

5
core/src/apresolve.rs
View file

@ -1,6 +1,7 @@
use std::collections::VecDeque; use std::collections::VecDeque;
use hyper::{Body, Method, Request}; use bytes::Bytes;
use hyper::{Method, Request};
use serde::Deserialize; use serde::Deserialize;
use crate::Error; use crate::Error;
@ -85,7 +86,7 @@ impl ApResolver {
let req = Request::builder() let req = Request::builder()
.method(Method::GET) .method(Method::GET)
.uri("https://apresolve.spotify.com/?type=accesspoint&type=dealer&type=spclient") .uri("https://apresolve.spotify.com/?type=accesspoint&type=dealer&type=spclient")
.body(Body::empty())?; .body(Bytes::new())?;
let body = self.session().http_client().request_body(req).await?; let body = self.session().http_client().request_body(req).await?;
let data: ApResolveData = serde_json::from_slice(body.as_ref())?; let data: ApResolveData = serde_json::from_slice(body.as_ref())?;

16
core/src/error.rs
View file

@ -321,7 +321,7 @@ impl From<http::Error> for Error {
impl From<hyper::Error> for Error { impl From<hyper::Error> for Error {
fn from(err: hyper::Error) -> Self { fn from(err: hyper::Error) -> Self {
if err.is_parse() || err.is_parse_too_large() || err.is_parse_status() || err.is_user() { if err.is_parse() || err.is_parse_status() || err.is_user() {
return Self::new(ErrorKind::Internal, err); return Self::new(ErrorKind::Internal, err);
} }
@ -329,10 +329,6 @@ impl From<hyper::Error> for Error {
return Self::new(ErrorKind::Cancelled, err); return Self::new(ErrorKind::Cancelled, err);
} }
if err.is_connect() {
return Self::new(ErrorKind::Unavailable, err);
}
if err.is_incomplete_message() { if err.is_incomplete_message() {
return Self::new(ErrorKind::DataLoss, err); return Self::new(ErrorKind::DataLoss, err);
} }
@ -349,6 +345,16 @@ impl From<hyper::Error> for Error {
} }
} }
impl From<hyper_util::client::legacy::Error> for Error {
fn from(err: hyper_util::client::legacy::Error) -> Self {
if err.is_connect() {
return Self::new(ErrorKind::Unavailable, err);
}
Self::new(ErrorKind::Unknown, err)
}
}
impl From<time::error::Parse> for Error { impl From<time::error::Parse> for Error {
fn from(err: time::error::Parse) -> Self { fn from(err: time::error::Parse) -> Self {
Self::new(ErrorKind::FailedPrecondition, err) Self::new(ErrorKind::FailedPrecondition, err)

41
core/src/http_client.rs
View file

@ -10,13 +10,14 @@ use governor::{
clock::MonotonicClock, middleware::NoOpMiddleware, state::InMemoryState, Quota, RateLimiter, clock::MonotonicClock, middleware::NoOpMiddleware, state::InMemoryState, Quota, RateLimiter,
}; };
use http::{header::HeaderValue, Uri}; use http::{header::HeaderValue, Uri};
use hyper::{ use http_body_util::{BodyExt, Full};
client::{HttpConnector, ResponseFuture}, use hyper::{body::Incoming, header::USER_AGENT, HeaderMap, Request, Response, StatusCode};
header::USER_AGENT, use hyper_proxy2::{Intercept, Proxy, ProxyConnector};
Body, Client, HeaderMap, Request, Response, StatusCode,
};
use hyper_proxy::{Intercept, Proxy, ProxyConnector};
use hyper_rustls::{HttpsConnector, HttpsConnectorBuilder}; use hyper_rustls::{HttpsConnector, HttpsConnectorBuilder};
use hyper_util::{
client::legacy::{connect::HttpConnector, Client, ResponseFuture},
rt::TokioExecutor,
};
use nonzero_ext::nonzero; use nonzero_ext::nonzero;
use once_cell::sync::OnceCell; use once_cell::sync::OnceCell;
use parking_lot::Mutex; use parking_lot::Mutex;
@ -89,7 +90,7 @@ impl From<HttpClientError> for Error {
} }
} }
type HyperClient = Client<ProxyConnector<HttpsConnector<HttpConnector>>, Body>; type HyperClient = Client<ProxyConnector<HttpsConnector<HttpConnector>>, Full<bytes::Bytes>>;
pub struct HttpClient { pub struct HttpClient {
user_agent: HeaderValue, user_agent: HeaderValue,
@ -146,7 +147,7 @@ impl HttpClient {
fn try_create_hyper_client(proxy_url: Option<&Url>) -> Result<HyperClient, Error> { fn try_create_hyper_client(proxy_url: Option<&Url>) -> Result<HyperClient, Error> {
// configuring TLS is expensive and should be done once per process // configuring TLS is expensive and should be done once per process
let https_connector = HttpsConnectorBuilder::new() let https_connector = HttpsConnectorBuilder::new()
.with_native_roots() .with_native_roots()?
.https_or_http() .https_or_http()
.enable_http1() .enable_http1()
.enable_http2() .enable_http2()
@ -160,7 +161,7 @@ impl HttpClient {
}; };
let proxy_connector = ProxyConnector::from_proxy(https_connector, proxy)?; let proxy_connector = ProxyConnector::from_proxy(https_connector, proxy)?;
let client = Client::builder() let client = Client::builder(TokioExecutor::new())
.http2_adaptive_window(true) .http2_adaptive_window(true)
.build(proxy_connector); .build(proxy_connector);
Ok(client) Ok(client)
@ -171,23 +172,20 @@ impl HttpClient {
.get_or_try_init(|| Self::try_create_hyper_client(self.proxy_url.as_ref())) .get_or_try_init(|| Self::try_create_hyper_client(self.proxy_url.as_ref()))
} }
pub async fn request(&self, req: Request<Body>) -> Result<Response<Body>, Error> { pub async fn request(&self, req: Request<Bytes>) -> Result<Response<Incoming>, Error> {
debug!("Requesting {}", req.uri().to_string()); debug!("Requesting {}", req.uri().to_string());
// `Request` does not implement `Clone` because its `Body` may be a single-shot stream. // `Request` does not implement `Clone` because its `Body` may be a single-shot stream.
// As correct as that may be technically, we now need all this boilerplate to clone it // As correct as that may be technically, we now need all this boilerplate to clone it
// ourselves, as any `Request` is moved in the loop. // ourselves, as any `Request` is moved in the loop.
let (parts, body) = req.into_parts(); let (parts, body_as_bytes) = req.into_parts();
let body_as_bytes = hyper::body::to_bytes(body)
.await
.unwrap_or_else(|_| Bytes::new());
loop { loop {
let mut req = Request::builder() let mut req = Request::builder()
.method(parts.method.clone()) .method(parts.method.clone())
.uri(parts.uri.clone()) .uri(parts.uri.clone())
.version(parts.version) .version(parts.version)
.body(Body::from(body_as_bytes.clone()))?; .body(body_as_bytes.clone())?;
*req.headers_mut() = parts.headers.clone(); *req.headers_mut() = parts.headers.clone();
let request = self.request_fut(req)?; let request = self.request_fut(req)?;
@ -212,20 +210,21 @@ impl HttpClient {
} }
} }
return Ok(response?); let response = response?;
return Ok(response);
} }
} }
pub async fn request_body(&self, req: Request<Body>) -> Result<Bytes, Error> { pub async fn request_body(&self, req: Request<Bytes>) -> Result<Bytes, Error> {
let response = self.request(req).await?; let response = self.request(req).await?;
Ok(hyper::body::to_bytes(response.into_body()).await?) Ok(response.into_body().collect().await?.to_bytes())
} }
pub fn request_stream(&self, req: Request<Body>) -> Result<IntoStream<ResponseFuture>, Error> { pub fn request_stream(&self, req: Request<Bytes>) -> Result<IntoStream<ResponseFuture>, Error> {
Ok(self.request_fut(req)?.into_stream()) Ok(self.request_fut(req)?.into_stream())
} }
pub fn request_fut(&self, mut req: Request<Body>) -> Result<ResponseFuture, Error> { pub fn request_fut(&self, mut req: Request<Bytes>) -> Result<ResponseFuture, Error> {
let headers_mut = req.headers_mut(); let headers_mut = req.headers_mut();
headers_mut.insert(USER_AGENT, self.user_agent.clone()); headers_mut.insert(USER_AGENT, self.user_agent.clone());
@ -251,7 +250,7 @@ impl HttpClient {
)) ))
})?; })?;
Ok(self.hyper_client()?.request(req)) Ok(self.hyper_client()?.request(req.map(Full::new)))
} }
pub fn get_retry_after(headers: &HeaderMap<HeaderValue>) -> Option<Duration> { pub fn get_retry_after(headers: &HeaderMap<HeaderValue>) -> Option<Duration> {

12
core/src/spclient.rs
View file

@ -10,10 +10,10 @@ use data_encoding::HEXUPPER_PERMISSIVE;
use futures_util::future::IntoStream; use futures_util::future::IntoStream;
use http::header::HeaderValue; use http::header::HeaderValue;
use hyper::{ use hyper::{
client::ResponseFuture,
header::{HeaderName, ACCEPT, AUTHORIZATION, CONTENT_TYPE, RANGE}, header::{HeaderName, ACCEPT, AUTHORIZATION, CONTENT_TYPE, RANGE},
Body, HeaderMap, Method, Request, HeaderMap, Method, Request,
}; };
use hyper_util::client::legacy::ResponseFuture;
use protobuf::{Enum, Message, MessageFull}; use protobuf::{Enum, Message, MessageFull};
use rand::RngCore; use rand::RngCore;
use sha1::{Digest, Sha1}; use sha1::{Digest, Sha1};
@ -156,7 +156,7 @@ impl SpClient {
.method(&Method::POST) .method(&Method::POST)
.uri("https://clienttoken.spotify.com/v1/clienttoken") .uri("https://clienttoken.spotify.com/v1/clienttoken")
.header(ACCEPT, HeaderValue::from_static("application/x-protobuf")) .header(ACCEPT, HeaderValue::from_static("application/x-protobuf"))
.body(Body::from(body))?; .body(body.into())?;
self.session().http_client().request_body(request).await self.session().http_client().request_body(request).await
} }
@ -465,7 +465,7 @@ impl SpClient {
let mut request = Request::builder() let mut request = Request::builder()
.method(method) .method(method)
.uri(url) .uri(url)
.body(Body::from(body.to_owned()))?; .body(body.to_owned().into())?;
// Reconnection logic: keep getting (cached) tokens because they might have expired. // Reconnection logic: keep getting (cached) tokens because they might have expired.
let token = self let token = self
@ -727,7 +727,7 @@ impl SpClient {
RANGE, RANGE,
HeaderValue::from_str(&format!("bytes={}-{}", offset, offset + length - 1))?, HeaderValue::from_str(&format!("bytes={}-{}", offset, offset + length - 1))?,
) )
.body(Body::empty())?; .body(Bytes::new())?;
let stream = self.session().http_client().request_stream(req)?; let stream = self.session().http_client().request_stream(req)?;
@ -738,7 +738,7 @@ impl SpClient {
let request = Request::builder() let request = Request::builder()
.method(&Method::GET) .method(&Method::GET)
.uri(url) .uri(url)
.body(Body::empty())?; .body(Bytes::new())?;
self.session().http_client().request_body(request).await self.session().http_client().request_body(request).await
} }

5
discovery/Cargo.toml
View file

@ -11,6 +11,7 @@ edition = "2021"
[dependencies] [dependencies]
aes = "0.8" aes = "0.8"
base64 = "0.21" base64 = "0.21"
bytes = "1"
cfg-if = "1.0" cfg-if = "1.0"
ctr = "0.9" ctr = "0.9"
dns-sd = { version = "0.1.3", optional = true } dns-sd = { version = "0.1.3", optional = true }
@ -18,7 +19,9 @@ form_urlencoded = "1.0"
futures-core = "0.3" futures-core = "0.3"
futures-util = "0.3" futures-util = "0.3"
hmac = "0.12" hmac = "0.12"
hyper = { version = "0.14", features = ["http1", "server", "tcp"] } hyper = { version = "1.3", features = ["http1"] }
hyper-util = { version = "0.1", features = ["server-auto", "server-graceful", "service"] }
http-body-util = "0.1.1"
libmdns = "0.8" libmdns = "0.8"
log = "0.4" log = "0.4"
rand = "0.8" rand = "0.8"

2
discovery/src/lib.rs
View file

@ -124,7 +124,7 @@ impl Builder {
pub fn launch(self) -> Result<Discovery, Error> { pub fn launch(self) -> Result<Discovery, Error> {
let mut port = self.port; let mut port = self.port;
let name = self.server_config.name.clone().into_owned(); let name = self.server_config.name.clone().into_owned();
let server = DiscoveryServer::new(self.server_config, &mut port)??; let server = DiscoveryServer::new(self.server_config, &mut port)?;
let _zeroconf_ip = self.zeroconf_ip; let _zeroconf_ip = self.zeroconf_ip;
let svc; let svc;

121
discovery/src/server.rs
View file

@ -2,7 +2,7 @@ use std::{
borrow::Cow, borrow::Cow,
collections::BTreeMap, collections::BTreeMap,
convert::Infallible, convert::Infallible,
net::{Ipv4Addr, SocketAddr}, net::{Ipv4Addr, SocketAddr, TcpListener},
pin::Pin, pin::Pin,
sync::Arc, sync::Arc,
task::{Context, Poll}, task::{Context, Poll},
@ -11,14 +11,14 @@ use std::{
use aes::cipher::{KeyIvInit, StreamCipher}; use aes::cipher::{KeyIvInit, StreamCipher};
use base64::engine::general_purpose::STANDARD as BASE64; use base64::engine::general_purpose::STANDARD as BASE64;
use base64::engine::Engine as _; use base64::engine::Engine as _;
use bytes::Bytes;
use futures_core::Stream; use futures_core::Stream;
use futures_util::{FutureExt, TryFutureExt}; use futures_util::{FutureExt, TryFutureExt};
use hmac::{Hmac, Mac}; use hmac::{Hmac, Mac};
use hyper::{ use http_body_util::{BodyExt, Full};
service::{make_service_fn, service_fn}, use hyper::{body::Incoming, Method, Request, Response, StatusCode};
Body, Method, Request, Response, StatusCode,
};
use hyper_util::{rt::TokioIo, server::graceful::GracefulShutdown};
use log::{debug, error, warn}; use log::{debug, error, warn};
use serde_json::json; use serde_json::json;
use sha1::{Digest, Sha1}; use sha1::{Digest, Sha1};
@ -63,7 +63,7 @@ impl RequestHandler {
(discovery, rx) (discovery, rx)
} }
fn handle_get_info(&self) -> Response<hyper::Body> { fn handle_get_info(&self) -> Response<Full<Bytes>> {
let public_key = BASE64.encode(self.keys.public_key()); let public_key = BASE64.encode(self.keys.public_key());
let device_type: &str = self.config.device_type.into(); let device_type: &str = self.config.device_type.into();
let mut active_user = String::new(); let mut active_user = String::new();
@ -107,11 +107,11 @@ impl RequestHandler {
// - "deviceAPI_isGroup": False // - "deviceAPI_isGroup": False
}) })
.to_string(); .to_string();
let body = Bytes::from(body);
Response::new(Body::from(body)) Response::new(Full::new(body))
} }
fn handle_add_user(&self, params: &Params<'_>) -> Result<Response<hyper::Body>, Error> { fn handle_add_user(&self, params: &Params<'_>) -> Result<Response<Full<Bytes>>, Error> {
let username_key = "userName"; let username_key = "userName";
let username = params let username = params
.get(username_key) .get(username_key)
@ -171,7 +171,8 @@ impl RequestHandler {
}); });
let body = result.to_string(); let body = result.to_string();
return Ok(Response::new(Body::from(body))); let body = Bytes::from(body);
return Ok(Response::new(Full::new(body)));
} }
let decrypted = { let decrypted = {
@ -193,10 +194,11 @@ impl RequestHandler {
}); });
let body = result.to_string(); let body = result.to_string();
Ok(Response::new(Body::from(body))) let body = Bytes::from(body);
Ok(Response::new(Full::new(body)))
} }
fn not_found(&self) -> Response<hyper::Body> { fn not_found(&self) -> Response<Full<Bytes>> {
let mut res = Response::default(); let mut res = Response::default();
*res.status_mut() = StatusCode::NOT_FOUND; *res.status_mut() = StatusCode::NOT_FOUND;
res res
@ -204,8 +206,8 @@ impl RequestHandler {
async fn handle( async fn handle(
self: Arc<Self>, self: Arc<Self>,
request: Request<Body>, request: Request<Incoming>,
) -> Result<hyper::Result<Response<Body>>, Error> { ) -> Result<hyper::Result<Response<Full<Bytes>>>, Error> {
let mut params = Params::new(); let mut params = Params::new();
let (parts, body) = request.into_parts(); let (parts, body) = request.into_parts();
@ -219,7 +221,7 @@ impl RequestHandler {
debug!("{:?} {:?} {:?}", parts.method, parts.uri.path(), params); debug!("{:?} {:?} {:?}", parts.method, parts.uri.path(), params);
} }
let body = hyper::body::to_bytes(body).await?; let body = body.collect().await?.to_bytes();
params.extend(form_urlencoded::parse(&body)); params.extend(form_urlencoded::parse(&body));
@ -239,52 +241,77 @@ pub struct DiscoveryServer {
} }
impl DiscoveryServer { impl DiscoveryServer {
pub fn new(config: Config, port: &mut u16) -> Result<hyper::Result<Self>, Error> { pub fn new(config: Config, port: &mut u16) -> Result<Self, Error> {
let (discovery, cred_rx) = RequestHandler::new(config); let (discovery, cred_rx) = RequestHandler::new(config);
let discovery = Arc::new(discovery); let address = SocketAddr::new(Ipv4Addr::UNSPECIFIED.into(), *port);
let (close_tx, close_rx) = oneshot::channel(); let (close_tx, close_rx) = oneshot::channel();
let address = SocketAddr::new(Ipv4Addr::UNSPECIFIED.into(), *port); let listener = match TcpListener::bind(address) {
Ok(listener) => listener,
let make_service = make_service_fn(move |_| { Err(e) => {
let discovery = discovery.clone(); warn!("Discovery server failed to start: {e}");
async move { return Err(e.into());
Ok::<_, hyper::Error>(service_fn(move |request| {
discovery
.clone()
.handle(request)
.inspect_err(|e| error!("could not handle discovery request: {}", e))
.and_then(|x| async move { Ok(x) })
.map(Result::unwrap) // guaranteed by `and_then` above
}))
} }
}); };
let server = hyper::Server::try_bind(&address)?.serve(make_service); listener.set_nonblocking(true)?;
let listener = tokio::net::TcpListener::from_std(listener)?;
*port = server.local_addr().port(); match listener.local_addr() {
debug!("Zeroconf server listening on 0.0.0.0:{}", *port); Ok(addr) => {
*port = addr.port();
debug!("Zeroconf server listening on 0.0.0.0:{}", *port);
}
Err(e) => {
warn!("Discovery server failed to start: {e}");
return Err(e.into());
}
}
tokio::spawn(async { tokio::spawn(async move {
let result = server let discovery = Arc::new(discovery);
.with_graceful_shutdown(async {
if let Err(e) = close_rx.await { let server = hyper::server::conn::http1::Builder::new();
debug!("unable to close discovery Rx channel completely: {e}"); let graceful = GracefulShutdown::new();
let mut close_rx = std::pin::pin!(close_rx);
loop {
tokio::select! {
Ok((stream, _)) = listener.accept() => {
let io = TokioIo::new(stream);
let discovery = discovery.clone();
let svc = hyper::service::service_fn(move |request| {
discovery
.clone()
.handle(request)
.inspect_err(|e| error!("could not handle discovery request: {}", e))
.and_then(|x| async move { Ok(x) })
.map(Result::unwrap) // guaranteed by `and_then` above
});
let conn = server.serve_connection(io, svc);
let fut = graceful.watch(conn);
tokio::spawn(async move {
// Errors are logged in the service_fn
let _ = fut.await;
});
} }
debug!("Shutting down discovery server"); _ = &mut close_rx => {
}) debug!("Shutting down discovery server");
.await; break;
}
if let Err(e) = result { }
warn!("Discovery server failed: {}", e);
} }
graceful.shutdown().await;
debug!("Discovery server stopped");
}); });
Ok(Ok(Self { Ok(Self {
cred_rx, cred_rx,
_close_tx: close_tx, _close_tx: close_tx,
})) })
} }
} }