mercuryworkshop-mirror/epoxy-tls
1
0
Fork 0
mirror of https://github.com/MercuryWorkshop/epoxy-tls.git synced 2025-05-12 14:00:01 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

update fastwebsockets

Browse source
This commit is contained in:
Toshit Chawda 2024-03-20 18:23:49 -07:00
parent bec2616a5c
commit 7583a9c3fd
No known key found for this signature in database
GPG key ID: 91480ED99E2B3D9D
5 changed files with 34 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

44
Cargo.lock generated
View file

@ -19,9 +19,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
[[package]] [[package]]
name = "aho-corasick" name = "aho-corasick"
version = "1.1.2" version = "1.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
dependencies = [ dependencies = [
"memchr", "memchr",
] ]
@ -233,9 +233,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
[[package]] [[package]]
name = "bitflags" name = "bitflags"
version = "2.4.2" version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
[[package]] [[package]]
name = "block-buffer" name = "block-buffer"
@ -513,7 +513,7 @@ dependencies = [
"bytes", "bytes",
"console_error_panic_hook", "console_error_panic_hook",
"event-listener", "event-listener",
"fastwebsockets", "fastwebsockets 0.6.0",
"futures-util", "futures-util",
"getrandom", "getrandom",
"http 1.1.0", "http 1.1.0",
@ -546,7 +546,7 @@ dependencies = [
"clio", "clio",
"console-subscriber", "console-subscriber",
"dashmap", "dashmap",
"fastwebsockets", "fastwebsockets 0.7.1",
"futures-util", "futures-util",
"http-body-util", "http-body-util",
"hyper 1.2.0", "hyper 1.2.0",
@ -594,8 +594,22 @@ name = "fastwebsockets"
version = "0.6.0" version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f63dd7b57f9b33b1741fa631c9522eb35d43e96dcca4a6a91d5e4ca7c93acdc1" 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 = [ dependencies = [
"base64", "base64",
"bytes",
"http-body-util", "http-body-util",
"hyper 1.2.0", "hyper 1.2.0",
"hyper-util", "hyper-util",
@ -1209,7 +1223,7 @@ version = "0.10.64"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f"
dependencies = [ dependencies = [
"bitflags 2.4.2", "bitflags 2.5.0",
"cfg-if", "cfg-if",
"foreign-types", "foreign-types",
"libc", "libc",
@ -1491,11 +1505,11 @@ dependencies = [
[[package]] [[package]]
name = "rustix" name = "rustix"
version = "0.38.31" version = "0.38.32"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89"
dependencies = [ dependencies = [
"bitflags 2.4.2", "bitflags 2.5.0",
"errno", "errno",
"libc", "libc",
"linux-raw-sys", "linux-raw-sys",
@ -1678,7 +1692,7 @@ version = "1.0.0"
dependencies = [ dependencies = [
"bytes", "bytes",
"console-subscriber", "console-subscriber",
"fastwebsockets", "fastwebsockets 0.7.1",
"futures", "futures",
"http-body-util", "http-body-util",
"hyper 1.2.0", "hyper 1.2.0",
@ -1699,9 +1713,9 @@ dependencies = [
[[package]] [[package]]
name = "smallvec" name = "smallvec"
version = "1.13.1" version = "1.13.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
[[package]] [[package]]
name = "socket2" name = "socket2"
@ -2407,12 +2421,12 @@ checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8"
[[package]] [[package]]
name = "wisp-mux" name = "wisp-mux"
version = "2.0.0" version = "2.0.1"
dependencies = [ dependencies = [
"async_io_stream", "async_io_stream",
"bytes", "bytes",
"event-listener", "event-listener",
"fastwebsockets", "fastwebsockets 0.7.1",
"futures", "futures",
"futures-util", "futures-util",
"pin-project-lite", "pin-project-lite",

2
server/Cargo.toml
View file

@ -9,7 +9,7 @@ clap = { version = "4.4.18", features = ["derive", "help", "usage", "color", "wr
clio = { version = "0.3.5", features = ["clap-parse"] } clio = { version = "0.3.5", features = ["clap-parse"] }
console-subscriber = { version = "0.2.0", optional = true } console-subscriber = { version = "0.2.0", optional = true }
dashmap = "5.5.3" 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"] } futures-util = { version = "0.3.30", features = ["sink"] }
http-body-util = "0.1.0" http-body-util = "0.1.0"
hyper = { version = "1.1.0", features = ["server", "http1"] } hyper = { version = "1.1.0", features = ["server", "http1"] }

2
simple-wisp-client/Cargo.toml
View file

@ -6,7 +6,7 @@ edition = "2021"
[dependencies] [dependencies]
bytes = "1.5.0" bytes = "1.5.0"
console-subscriber = { version = "0.2.0", optional = true } 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" futures = "0.3.30"
http-body-util = "0.1.0" http-body-util = "0.1.0"
hyper = { version = "1.1.0", features = ["http1", "client"] } hyper = { version = "1.1.0", features = ["http1", "client"] }

4
wisp/Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "wisp-mux" name = "wisp-mux"
version = "2.0.0" version = "2.0.1"
license = "LGPL-3.0-only" license = "LGPL-3.0-only"
description = "A library for easily creating Wisp servers and clients." description = "A library for easily creating Wisp servers and clients."
homepage = "https://github.com/MercuryWorkshop/epoxy-tls/tree/multiplexed/wisp" homepage = "https://github.com/MercuryWorkshop/epoxy-tls/tree/multiplexed/wisp"
@ -12,7 +12,7 @@ edition = "2021"
async_io_stream = "0.3.3" async_io_stream = "0.3.3"
bytes = "1.5.0" bytes = "1.5.0"
event-listener = "5.0.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 = "0.3.30"
futures-util = "0.3.30" futures-util = "0.3.30"
pin-project-lite = "0.2.13" pin-project-lite = "0.2.13"

1
wisp/src/ws.rs
View file

@ -24,6 +24,7 @@ pub enum OpCode {
} }
/// WebSocket frame. /// WebSocket frame.
#[derive(Debug, Clone)]
pub struct Frame { pub struct Frame {
/// Whether the frame is finished or not. /// Whether the frame is finished or not.
pub finished: bool, pub finished: bool,