diff --git a/Cargo.lock b/Cargo.lock index 2434d76..0c28555 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -19,9 +19,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aho-corasick" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] @@ -233,9 +233,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" [[package]] name = "block-buffer" @@ -513,7 +513,7 @@ dependencies = [ "bytes", "console_error_panic_hook", "event-listener", - "fastwebsockets", + "fastwebsockets 0.6.0", "futures-util", "getrandom", "http 1.1.0", @@ -546,7 +546,7 @@ dependencies = [ "clio", "console-subscriber", "dashmap", - "fastwebsockets", + "fastwebsockets 0.7.1", "futures-util", "http-body-util", "hyper 1.2.0", @@ -594,8 +594,22 @@ name = "fastwebsockets" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f63dd7b57f9b33b1741fa631c9522eb35d43e96dcca4a6a91d5e4ca7c93acdc1" +dependencies = [ + "rand", + "simdutf8", + "thiserror", + "tokio", + "utf-8", +] + +[[package]] +name = "fastwebsockets" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ac14c1f19ff7eab47c9ee7263a088296bec2abd1f9345964c863b5134da40a1" dependencies = [ "base64", + "bytes", "http-body-util", "hyper 1.2.0", "hyper-util", @@ -1209,7 +1223,7 @@ version = "0.10.64" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "cfg-if", "foreign-types", "libc", @@ -1491,11 +1505,11 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.31" +version = "0.38.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" +checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "errno", "libc", "linux-raw-sys", @@ -1678,7 +1692,7 @@ version = "1.0.0" dependencies = [ "bytes", "console-subscriber", - "fastwebsockets", + "fastwebsockets 0.7.1", "futures", "http-body-util", "hyper 1.2.0", @@ -1699,9 +1713,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.13.1" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "socket2" @@ -2407,12 +2421,12 @@ checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" [[package]] name = "wisp-mux" -version = "2.0.0" +version = "2.0.1" dependencies = [ "async_io_stream", "bytes", "event-listener", - "fastwebsockets", + "fastwebsockets 0.7.1", "futures", "futures-util", "pin-project-lite", diff --git a/server/Cargo.toml b/server/Cargo.toml index 7d3d46e..1cecd66 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -9,7 +9,7 @@ clap = { version = "4.4.18", features = ["derive", "help", "usage", "color", "wr clio = { version = "0.3.5", features = ["clap-parse"] } console-subscriber = { version = "0.2.0", optional = true } dashmap = "5.5.3" -fastwebsockets = { version = "0.6.0", features = ["upgrade", "simdutf8", "unstable-split"] } +fastwebsockets = { version = "0.7.1", features = ["upgrade", "simdutf8", "unstable-split"] } futures-util = { version = "0.3.30", features = ["sink"] } http-body-util = "0.1.0" hyper = { version = "1.1.0", features = ["server", "http1"] } diff --git a/simple-wisp-client/Cargo.toml b/simple-wisp-client/Cargo.toml index 6d02aab..a6df806 100644 --- a/simple-wisp-client/Cargo.toml +++ b/simple-wisp-client/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" [dependencies] bytes = "1.5.0" console-subscriber = { version = "0.2.0", optional = true } -fastwebsockets = { version = "0.6.0", features = ["unstable-split", "upgrade"] } +fastwebsockets = { version = "0.7.1", features = ["unstable-split", "upgrade"] } futures = "0.3.30" http-body-util = "0.1.0" hyper = { version = "1.1.0", features = ["http1", "client"] } diff --git a/wisp/Cargo.toml b/wisp/Cargo.toml index 1c38574..996c655 100644 --- a/wisp/Cargo.toml +++ b/wisp/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wisp-mux" -version = "2.0.0" +version = "2.0.1" license = "LGPL-3.0-only" description = "A library for easily creating Wisp servers and clients." homepage = "https://github.com/MercuryWorkshop/epoxy-tls/tree/multiplexed/wisp" @@ -12,7 +12,7 @@ edition = "2021" async_io_stream = "0.3.3" bytes = "1.5.0" event-listener = "5.0.0" -fastwebsockets = { version = "0.6.0", features = ["unstable-split"], optional = true } +fastwebsockets = { version = "0.7.1", features = ["unstable-split"], optional = true } futures = "0.3.30" futures-util = "0.3.30" pin-project-lite = "0.2.13" diff --git a/wisp/src/ws.rs b/wisp/src/ws.rs index c65cfd9..af57572 100644 --- a/wisp/src/ws.rs +++ b/wisp/src/ws.rs @@ -24,6 +24,7 @@ pub enum OpCode { } /// WebSocket frame. +#[derive(Debug, Clone)] pub struct Frame { /// Whether the frame is finished or not. pub finished: bool,