Merge pull request #7 from Sherlock-Holo/protocol-lib

Protocol lib

Cargo.toml

@@ -1,3 +1,33 @@
 [workspace]
-members = ["server", "bpf", "client", "share"]
+members = ["server", "bpf", "client", "share", "protocol"]
 resolver = "2"
+
+[workspace.dependencies]
+anyhow = "1"
+bytes = "1"
+cidr = "0.2"
+clap = { version = "4", features = ["derive", "color", "suggestions"] }
+event-listener = "5"
+futures-channel = "0.3"
+futures-rustls = "0.26"
+futures-util = "0.3"
+hickory-resolver = { version = "0.24", default-features = false }
+http = "1"
+http-body-util = "0.1"
+hyper = "1"
+hyper-util = "0.1"
+pin-project = "1"
+rustls-native-certs = "0.7"
+rustls-pemfile = "2"
+serde = "1"
+serde_yaml = "0.9"
+tap = "1"
+tokio = "1"
+tokio-stream = "0.1"
+tokio-util = "0.7"
+totp-rs = "5"
+thiserror = "1"
+tower-service = "0.3"
+tracing = "0.1"
+tracing-subscriber = "0.3"
+trait-make = "0.1"

client/Cargo.toml

@@ -1,59 +1,44 @@
 [package]
 name = "lycoris-client"
-version = "0.3.0"
+version = "0.3.1"
 edition = "2021"
 license = "MIT"
 rust-version = "1.75"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-anyhow = "1"
-bytes = "1"
-tokio = { version = "1", features = ["macros", "rt-multi-thread", "net", "io-util", "fs", "sync", "time"] }
-tap = "1"
-
-# async
-tokio-stream = { version = "0.1", features = ["time", "io-util", "net"] }
-tokio-util = { version = "0.7", features = ["io"] }
-futures-util = { version = "0.3", features = ["io"] }
-futures-channel = { version = "0.3", features = ["sink"] }
-trait-variant = "0.1"
-
-# log
-tracing = "0.1"
+anyhow = { workspace = true }
+bytes = { workspace = true }
+cidr = { workspace = true }
+clap = { workspace = true, features = ["derive", "color", "suggestions"] }
+hickory-resolver = { workspace = true, features = ["default", "system-config"] }
+http = { workspace = true }
+hyper = { workspace = true, features = ["http2", "client"] }
+hyper-util = { workspace = true, features = ["client-legacy", "http2", "tokio"] }
+http-body-util = { workspace = true }
+futures-channel = { workspace = true, features = ["sink"] }
+futures-rustls = { workspace = true }
+futures-util = { workspace = true, features = ["io"] }
+rustls-native-certs = { workspace = true }
+rustls-pemfile = { workspace = true }
+serde = { workspace = true, features = ["derive"] }
+serde_yaml = { workspace = true }
+tap = { workspace = true }
+tokio = { workspace = true, features = ["macros", "rt-multi-thread", "net", "io-util", "fs", "sync", "time"] }
+tokio-stream = { workspace = true, features = ["time", "io-util", "net"] }
+tokio-util = { workspace = true, features = ["compat", "io"] }
+tracing = { workspace = true }
+trait-make = { workspace = true }
+
+protocol = { path = "../protocol" }
+share = { path = "../share" }
 
 # bpf
 aya = { git = "https://github.com/aya-rs/aya", rev = "80736c5", features = ["async_tokio"] }
 aya-log = { git = "https://github.com/aya-rs/aya", rev = "80736c5" }
 tracing-log = "0.2"
 
-# auth
-totp-rs = { version = "5", features = ["otpauth"] }
-
-# http/2
-http = "1"
-hyper = { version = "1", features = ["http2", "client"] }
-hyper-rustls = { version = "0.26", features = ["http2", "logging"] }
-hyper-util = { version = "0.1", features = ["client-legacy", "http2", "tokio"] }
-http-body-util = "0.1"
-
-# tls
-tokio-rustls = "0.25"
-rustls-pemfile = "2"
-rustls-native-certs = "0.7"
-
-# config and args
-serde = { version = "1", features = ["derive"] }
-serde_yaml = "0.9"
-clap = { version = "4", features = ["derive", "color", "suggestions"] }
-
-# ip addr
-cidr = "0.2"
-hickory-resolver = "0.24"
-
-share = { path = "../share" }
-
 [dev-dependencies]
 rustix = { version = "0.38", features = ["process"] }
 h2 = { version = "0.4", features = ["stream"] }