refactor: move access server to protocol

Author: Banyc

Cargo.lock

@@ -1,7 +1,6 @@
 [workspace]
 resolver = "2"
 members = [
-    "access_server",
     "common",
     "protocol",
     "server",

Cargo.toml

@@ -25,5 +25,16 @@ tokio_kcp = { workspace = true }
 tracing = { workspace = true }
 udp_listener = { workspace = true }
 
+bytes = { workspace = true }
+futures = { workspace = true }
+http-body-util = { workspace = true }
+hyper = { workspace = true, features = ["full"] }
+hyper-util = { workspace = true, features = ["tokio"] }
+monitor_table = { workspace = true }
+pin-project-lite = { workspace = true }
+regex = { workspace = true }
+tokio-util = { workspace = true }
+tracing-subscriber = { workspace = true }
+
 [dev-dependencies]
 serde_json = { workspace = true }

access_server/Cargo.toml

@@ -1,5 +1,16 @@
 use std::{collections::HashMap, sync::Arc};
 
+use crate::{
+    socks5::server::{
+        tcp::{Socks5ServerTcpAccessConnHandler, Socks5ServerTcpAccessServerConfig},
+        udp::{Socks5ServerUdpAccessConnHandler, Socks5ServerUdpAccessServerConfig},
+    },
+    stream::streams::{
+        http_tunnel::{HttpAccessConnHandler, HttpAccessServerConfig},
+        tcp::access_server::{TcpAccessConnHandler, TcpAccessServerConfig},
+    },
+    udp::access_server::{UdpAccessConnHandler, UdpAccessServerConfig},
+};
 use common::{
     config::{Merge, merge_map},
     error::{AnyError, AnyResult},
@@ -16,21 +27,9 @@ use common::{
         },
     },
 };
-use protocol::{
-    stream::streams::tcp::access_server::{TcpAccessConnHandler, TcpAccessServerConfig},
-    udp::access_server::{UdpAccessConnHandler, UdpAccessServerConfig},
-};
 use serde::{Deserialize, Serialize};
-use socks5::server::{
-    tcp::{Socks5ServerTcpAccessConnHandler, Socks5ServerTcpAccessServerConfig},
-    udp::{Socks5ServerUdpAccessConnHandler, Socks5ServerUdpAccessServerConfig},
-};
-use stream::streams::http_tunnel::{HttpAccessConnHandler, HttpAccessServerConfig};
 use tokio_util::sync::CancellationToken;
 
-pub mod socks5;
-pub mod stream;
-
 #[derive(Debug, Clone, Serialize, Deserialize, Default)]
 #[serde(deny_unknown_fields)]
 pub struct AccessServerStream {

access_server/src/stream/mod.rs

@@ -1,3 +1,5 @@
+pub mod access_server;
 pub mod proxy_server;
+pub mod socks5;
 pub mod stream;
 pub mod udp;