diff --git a/Cargo.lock b/Cargo.lock index 624407e..0073810 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -146,15 +146,6 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" -[[package]] -name = "bitflags" -version = "2.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dbe3c979c178231552ecba20214a8272df4e09f232a87aef4320cf06539aded" -dependencies = [ - "serde", -] - [[package]] name = "blake2" version = "0.10.6" @@ -246,7 +237,7 @@ checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" dependencies = [ "ansi_term", "atty", - "bitflags 1.3.2", + "bitflags", "strsim 0.8.0", "textwrap", "unicode-width", @@ -626,7 +617,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3e372db8e5c0d213e0cd0b9be18be2aca3d44cf2fe30a9d46a65581cd454584" dependencies = [ "base64 0.13.1", - "bitflags 1.3.2", + "bitflags", "bytes", "headers-core", "http", @@ -992,7 +983,7 @@ dependencies = [ "either", "futures-util", "log", - "obws 0.11.1", + "obws 0.10.0", "obws 0.9.1", "once_cell", "openssl", @@ -1053,7 +1044,7 @@ checksum = "7fdad32555e0ab646943c2465caa81f6d9ba5f9a0553bf5a50a2ea4a46779aee" dependencies = [ "async-stream", "base64 0.13.1", - "bitflags 1.3.2", + "bitflags", "either", "futures-util", "log", @@ -1072,25 +1063,25 @@ dependencies = [ [[package]] name = "obws" -version = "0.11.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f598f6008482d3ccf0a3617319266a577e99c0c31a96731c36cacc631f67269" +checksum = "96eeac4bd8bbe8849c9c61796a1513a6e2a3e9d6ab5d46ba24989d7c4e18ef1e" dependencies = [ "async-stream", - "base64 0.21.2", - "bitflags 2.3.2", + "base64 0.13.1", + "bitflags", "futures-util", "rgb", "semver", "serde", "serde_json", "serde_repr", - "serde_with 3.0.0", + "serde_with 2.3.3", "sha2", "thiserror", "time 0.3.22", "tokio", - "tokio-tungstenite 0.19.0", + "tokio-tungstenite 0.17.2", "tracing", ] @@ -1112,7 +1103,7 @@ version = "0.10.55" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d" dependencies = [ - "bitflags 1.3.2", + "bitflags", "cfg-if", "foreign-types", "libc", @@ -1291,7 +1282,7 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ - "bitflags 1.3.2", + "bitflags", ] [[package]] @@ -1444,7 +1435,7 @@ version = "0.37.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b96e891d04aa506a6d1f318d2771bcb1c7dfda84e126660ace067c9b474bb2c0" dependencies = [ - "bitflags 1.3.2", + "bitflags", "errno", "io-lifetimes", "libc", @@ -1497,7 +1488,7 @@ version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8" dependencies = [ - "bitflags 1.3.2", + "bitflags", "core-foundation", "core-foundation-sys", "libc", @@ -1589,17 +1580,17 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.0.0" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f02d8aa6e3c385bf084924f660ce2a3a6bd333ba55b35e8590b321f35d88513" +checksum = "07ff71d2c147a7b57362cead5e22f772cd52f6ab31cfcd9edcd7f6aeb2a0afbe" dependencies = [ - "base64 0.21.2", + "base64 0.13.1", "chrono", "hex", "indexmap", "serde", "serde_json", - "serde_with_macros 3.0.0", + "serde_with_macros 2.3.3", "time 0.3.22", ] @@ -1617,9 +1608,9 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.0.0" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edc7d5d3932fb12ce722ee5e64dd38c504efba37567f0c402f6ca728c3b8b070" +checksum = "881b6f881b17d13214e5d494c939ebab463d01264ce1811e9d4ac3a882e7695f" dependencies = [ "darling 0.20.1", "proc-macro2", @@ -1652,6 +1643,17 @@ dependencies = [ "opaque-debug", ] +[[package]] +name = "sha-1" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest 0.10.7", +] + [[package]] name = "sha1" version = "0.10.5" @@ -1931,6 +1933,18 @@ dependencies = [ "tungstenite 0.16.0", ] +[[package]] +name = "tokio-tungstenite" +version = "0.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f714dd15bead90401d77e04243611caec13726c2408afd5b31901dfcdcb3b181" +dependencies = [ + "futures-util", + "log", + "tokio", + "tungstenite 0.17.3", +] + [[package]] name = "tokio-tungstenite" version = "0.18.0" @@ -2078,7 +2092,26 @@ dependencies = [ "httparse", "log", "rand", - "sha-1", + "sha-1 0.9.8", + "thiserror", + "url", + "utf-8", +] + +[[package]] +name = "tungstenite" +version = "0.17.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e27992fd6a8c29ee7eef28fc78349aa244134e10ad447ce3b9f0ac0ed0fa4ce0" +dependencies = [ + "base64 0.13.1", + "byteorder", + "bytes", + "http", + "httparse", + "log", + "rand", + "sha-1 0.10.1", "thiserror", "url", "utf-8", diff --git a/Cargo.toml b/Cargo.toml index 059d162..dbe27e6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,7 +16,7 @@ dotenv = "0.15" either = { version = "1.6.1", features = ["serde"] } futures-util = "0.3" obws = { version = "0.9", features = ["events"] } -obwsv5 = { version = "0.11", package = "obws", features = ["events"]} +obwsv5 = { version = "0.10", package = "obws", features = ["events"]} quick-xml = { version = "0.26", features = ["serialize"] } rand = "0.8" rand_core = { version = "0.6", features = ["std"] }