feat: introduce ContextTrait for general usage

Author: VendettaReborn

crates/shadowsocks-service/src/acl/mod.rs

@@ -19,7 +19,10 @@ use log::{trace, warn};
 use once_cell::sync::Lazy;
 use regex::bytes::{Regex, RegexBuilder, RegexSet, RegexSetBuilder};
 
-use shadowsocks::{context::Context, relay::socks5::Address};
+use shadowsocks::{
+    context::{Context, ContextTrait},
+    relay::socks5::Address,
+};
 
 use self::sub_domains_tree::SubDomainsTree;
 

crates/shadowsocks-service/src/config.rs

@@ -70,7 +70,14 @@ use serde::{Deserialize, Serialize};
 use shadowsocks::relay::socks5::Address;
 use shadowsocks::{
     config::{
-        ManagerAddr, Mode, ReplayAttackPolicy, ServerAddr, ServerConfig, ServerSource, ServerUser, ServerUserManager,
+        ManagerAddr,
+        Mode,
+        ReplayAttackPolicy,
+        ServerAddr,
+        ServerConfig,
+        ServerSource,
+        ServerUser,
+        ServerUserManager,
         ServerWeight,
     },
     crypto::CipherKind,

crates/shadowsocks-service/src/local/fake_dns/processor.rs

@@ -6,7 +6,10 @@ use hickory_resolver::proto::{
     op::{header::MessageType, response_code::ResponseCode, Header, Message, OpCode},
     rr::{
         rdata::{A, AAAA},
-        DNSClass, RData, Record, RecordType,
+        DNSClass,
+        RData,
+        Record,
+        RecordType,
     },
 };
 use log::{debug, trace, warn};

crates/shadowsocks-service/src/local/http/http_client.rs

@@ -18,7 +18,8 @@ use hyper::{
     client::conn::{http1, http2},
     http::uri::Scheme,
     rt::{Sleep, Timer},
-    Request, Response,
+    Request,
+    Response,
 };
 use log::{error, trace};
 use lru_time_cache::LruCache;

crates/shadowsocks-service/src/local/http/http_service.rs

@@ -8,7 +8,13 @@ use hyper::{
     body,
     header::{self, HeaderValue},
     http::uri::{Authority, Scheme},
-    HeaderMap, Method, Request, Response, StatusCode, Uri, Version,
+    HeaderMap,
+    Method,
+    Request,
+    Response,
+    StatusCode,
+    Uri,
+    Version,
 };
 use log::{debug, error, trace};
 use shadowsocks::relay::Address;

crates/shadowsocks-service/src/local/http/server.rs

@@ -13,7 +13,9 @@ use tokio::{
 };
 
 use crate::local::{
-    context::ServiceContext, loadbalancing::PingBalancer, net::tcp::listener::create_standard_tcp_listener,
+    context::ServiceContext,
+    loadbalancing::PingBalancer,
+    net::tcp::listener::create_standard_tcp_listener,
 };
 
 use super::{http_client::HttpClient, http_service::HttpService, tokio_rt::TokioIo};

crates/shadowsocks-service/src/local/http/utils.rs

@@ -9,7 +9,9 @@ use std::{
 use hyper::{
     header::{self, HeaderValue},
     http::uri::Authority,
-    HeaderMap, Uri, Version,
+    HeaderMap,
+    Uri,
+    Version,
 };
 use log::error;
 use shadowsocks::relay::socks5::Address;

crates/shadowsocks-service/src/local/net/udp/association.rs

@@ -28,7 +28,9 @@ use shadowsocks::{
 use crate::{
     local::{context::ServiceContext, loadbalancing::PingBalancer},
     net::{
-        packet_window::PacketWindowFilter, MonProxySocket, UDP_ASSOCIATION_KEEP_ALIVE_CHANNEL_SIZE,
+        packet_window::PacketWindowFilter,
+        MonProxySocket,
+        UDP_ASSOCIATION_KEEP_ALIVE_CHANNEL_SIZE,
         UDP_ASSOCIATION_SEND_CHANNEL_SIZE,
     },
 };

crates/shadowsocks-service/src/local/socks/client/socks5/tcp_client.rs

@@ -9,7 +9,15 @@ use std::{
 use log::trace;
 use pin_project::pin_project;
 use shadowsocks::relay::socks5::{
-    self, Address, Command, Error, HandshakeRequest, HandshakeResponse, Reply, TcpRequestHeader, TcpResponseHeader,
+    self,
+    Address,
+    Command,
+    Error,
+    HandshakeRequest,
+    HandshakeResponse,
+    Reply,
+    TcpRequestHeader,
+    TcpResponseHeader,
 };
 use tokio::{
     io::{AsyncRead, AsyncWrite, ReadBuf},

crates/shadowsocks-service/src/local/socks/server/server.rs

@@ -7,7 +7,9 @@ use tokio::{net::TcpStream, time};
 #[cfg(feature = "local-http")]
 use crate::local::http::HttpConnectionHandler;
 use crate::local::{
-    context::ServiceContext, loadbalancing::PingBalancer, net::tcp::listener::create_standard_tcp_listener,
+    context::ServiceContext,
+    loadbalancing::PingBalancer,
+    net::tcp::listener::create_standard_tcp_listener,
     socks::config::Socks5AuthConfig,
 };
 

crates/shadowsocks-service/src/local/socks/server/socks4/tcprelay.rs

@@ -21,7 +21,12 @@ use crate::local::{
 };
 
 use crate::local::socks::socks4::{
-    Address, Command, Error as Socks4Error, HandshakeRequest, HandshakeResponse, ResultCode,
+    Address,
+    Command,
+    Error as Socks4Error,
+    HandshakeRequest,
+    HandshakeResponse,
+    ResultCode,
 };
 
 pub struct Socks4TcpHandler {

crates/shadowsocks-service/src/local/socks/server/socks5/tcprelay.rs

@@ -11,8 +11,17 @@ use log::{debug, error, trace, warn};
 use shadowsocks::{
     config::Mode,
     relay::socks5::{
-        self, Address, Command, Error as Socks5Error, HandshakeRequest, HandshakeResponse, PasswdAuthRequest,
-        PasswdAuthResponse, Reply, TcpRequestHeader, TcpResponseHeader,
+        self,
+        Address,
+        Command,
+        Error as Socks5Error,
+        HandshakeRequest,
+        HandshakeResponse,
+        PasswdAuthRequest,
+        PasswdAuthResponse,
+        Reply,
+        TcpRequestHeader,
+        TcpResponseHeader,
     },
     ServerAddr,
 };

crates/shadowsocks-service/src/manager/server.rs

@@ -13,13 +13,23 @@ use shadowsocks::{
     manager::{
         datagram::ManagerSocketAddr,
         protocol::{
-            self, AddRequest, AddResponse, ErrorResponse, ListResponse, ManagerRequest, PingResponse, RemoveRequest,
-            RemoveResponse, ServerUserConfig, StatRequest,
+            self,
+            AddRequest,
+            AddResponse,
+            ErrorResponse,
+            ListResponse,
+            ManagerRequest,
+            PingResponse,
+            RemoveRequest,
+            RemoveResponse,
+            ServerUserConfig,
+            StatRequest,
         },
     },
     net::{AcceptOpts, ConnectOpts},
     plugin::PluginConfig,
-    ManagerListener, ServerAddr,
+    ManagerListener,
+    ServerAddr,
 };
 use tokio::{sync::Mutex, task::JoinHandle};
 

crates/shadowsocks-service/src/server/tcprelay.rs

@@ -13,7 +13,8 @@ use shadowsocks::{
     crypto::CipherKind,
     net::{AcceptOpts, TcpStream as OutboundTcpStream},
     relay::tcprelay::{utils::copy_encrypted_bidirectional, ProxyServerStream},
-    ProxyListener, ServerConfig,
+    ProxyListener,
+    ServerConfig,
 };
 use tokio::{
     io::{AsyncReadExt, AsyncWriteExt},

crates/shadowsocks-service/src/server/udprelay.rs

@@ -18,7 +18,10 @@ use shadowsocks::{
     crypto::CipherCategory,
     lookup_then,
     net::{
-        get_ip_stack_capabilities, AcceptOpts, AddrFamily, UdpSocket as OutboundUdpSocket,
+        get_ip_stack_capabilities,
+        AcceptOpts,
+        AddrFamily,
+        UdpSocket as OutboundUdpSocket,
         UdpSocket as InboundUdpSocket,
     },
     relay::{
@@ -30,7 +33,10 @@ use shadowsocks::{
 use tokio::{runtime::Handle, sync::mpsc, task::JoinHandle, time};
 
 use crate::net::{
-    packet_window::PacketWindowFilter, utils::to_ipv4_mapped, MonProxySocket, UDP_ASSOCIATION_KEEP_ALIVE_CHANNEL_SIZE,
+    packet_window::PacketWindowFilter,
+    utils::to_ipv4_mapped,
+    MonProxySocket,
+    UDP_ASSOCIATION_KEEP_ALIVE_CHANNEL_SIZE,
     UDP_ASSOCIATION_SEND_CHANNEL_SIZE,
 };
 

crates/shadowsocks/src/context.rs

@@ -28,6 +28,32 @@ pub struct Context {
     ipv6_first: bool,
 }
 
+#[allow(async_fn_in_trait)]
+pub trait ContextTrait {
+    fn ipv6_first(&self) -> bool;
+    async fn dns_resolve<'a>(&self, addr: &'a str, port: u16) -> io::Result<impl Iterator<Item = SocketAddr> + 'a>;
+}
+
+impl<T: ContextTrait> ContextTrait for Arc<T> {
+    fn ipv6_first(&self) -> bool {
+        (**self).ipv6_first()
+    }
+
+    async fn dns_resolve<'a>(&self, addr: &'a str, port: u16) -> io::Result<impl Iterator<Item = SocketAddr> + 'a> {
+        (**self).dns_resolve(addr, port).await
+    }
+}
+
+impl ContextTrait for Context {
+    fn ipv6_first(&self) -> bool {
+        self.ipv6_first
+    }
+
+    async fn dns_resolve<'a>(&self, addr: &'a str, port: u16) -> io::Result<impl Iterator<Item = SocketAddr> + 'a> {
+        self.dns_resolver.resolve(addr, port).await
+    }
+}
+
 /// `Context` for sharing between services
 pub type SharedContext = Arc<Context>;
 
@@ -132,21 +158,11 @@ impl Context {
         &self.dns_resolver
     }
 
-    /// Resolves DNS address to `SocketAddr`s
-    pub async fn dns_resolve<'a>(&self, addr: &'a str, port: u16) -> io::Result<impl Iterator<Item = SocketAddr> + 'a> {
-        self.dns_resolver.resolve(addr, port).await
-    }
-
     /// Try to connect IPv6 addresses first if hostname could be resolved to both IPv4 and IPv6
     pub fn set_ipv6_first(&mut self, ipv6_first: bool) {
         self.ipv6_first = ipv6_first;
     }
 
-    /// Try to connect IPv6 addresses first if hostname could be resolved to both IPv4 and IPv6
-    pub fn ipv6_first(&self) -> bool {
-        self.ipv6_first
-    }
-
     /// Set policy against replay attack
     pub fn set_replay_attack_policy(&mut self, replay_policy: ReplayAttackPolicy) {
         self.replay_policy = replay_policy;

crates/shadowsocks/src/dns_resolver/hickory_dns_resolver.rs

@@ -19,7 +19,8 @@ use hickory_resolver::{
         runtime::{iocompat::AsyncIoTokioAsStd, RuntimeProvider, TokioHandle, TokioTime},
         udp::DnsUdpSocket,
     },
-    ResolveError, Resolver,
+    ResolveError,
+    Resolver,
 };
 use log::trace;
 use tokio::{io::ReadBuf, net::UdpSocket};

crates/shadowsocks/src/dns_resolver/mod.rs

@@ -12,13 +12,14 @@ mod resolver;
 macro_rules! lookup_then {
     ($context:expr, $addr:expr, $port:expr, |$resolved_addr:ident| $body:block) => {{
         use std::net::SocketAddr;
+        use $crate::context::ContextTrait;
 
-        let ipv6_first = $context.ipv6_first();
+        let ipv6_first = ContextTrait::ipv6_first($context);
 
         let mut v4_addrs = Vec::new();
         let mut v6_addrs = Vec::new();
 
-        for addr in $context.dns_resolve($addr, $port).await? {
+        for addr in ContextTrait::dns_resolve($context, $addr, $port).await? {
             match addr {
                 SocketAddr::V4(..) => v4_addrs.push(addr),
                 SocketAddr::V6(..) => v6_addrs.push(addr),

crates/shadowsocks/src/manager/client.rs

@@ -8,8 +8,16 @@ use super::{
     datagram::ManagerDatagram,
     error::Error,
     protocol::{
-        AddRequest, AddResponse, ListRequest, ListResponse, ManagerProtocol, PingRequest, PingResponse, RemoveRequest,
-        RemoveResponse, StatRequest,
+        AddRequest,
+        AddResponse,
+        ListRequest,
+        ListResponse,
+        ManagerProtocol,
+        PingRequest,
+        PingResponse,
+        RemoveRequest,
+        RemoveResponse,
+        StatRequest,
     },
 };
 

crates/shadowsocks/src/net/sys/unix/bsd/freebsd.rs

@@ -1,5 +1,6 @@
 use std::{
-    io, mem,
+    io,
+    mem,
     net::{Ipv4Addr, Ipv6Addr, SocketAddr},
     os::unix::io::{AsRawFd, RawFd},
     pin::Pin,
@@ -20,7 +21,9 @@ use tokio_tfo::TfoStream;
 use crate::net::{
     sys::{set_common_sockopt_after_connect, set_common_sockopt_for_connect, socket_bind_dual_stack},
     udp::{BatchRecvMessage, BatchSendMessage},
-    AcceptOpts, AddrFamily, ConnectOpts,
+    AcceptOpts,
+    AddrFamily,
+    ConnectOpts,
 };
 
 /// A `TcpStream` that supports TFO (TCP Fast Open)

crates/shadowsocks/src/net/sys/unix/bsd/macos.rs

@@ -24,7 +24,9 @@ use tokio_tfo::TfoStream;
 use crate::net::{
     sys::{set_common_sockopt_after_connect, set_common_sockopt_for_connect, socket_bind_dual_stack},
     udp::{BatchRecvMessage, BatchSendMessage},
-    AcceptOpts, AddrFamily, ConnectOpts,
+    AcceptOpts,
+    AddrFamily,
+    ConnectOpts,
 };
 
 /// A `TcpStream` that supports TFO (TCP Fast Open)

crates/shadowsocks/src/net/sys/unix/linux/mod.rs

@@ -1,5 +1,6 @@
 use std::{
-    io, mem,
+    io,
+    mem,
     net::{Ipv4Addr, Ipv6Addr, SocketAddr},
     os::unix::io::{AsRawFd, FromRawFd, IntoRawFd, RawFd},
     pin::Pin,
@@ -21,7 +22,9 @@ use tokio_tfo::TfoStream;
 use crate::net::{
     sys::{set_common_sockopt_after_connect, set_common_sockopt_for_connect, socket_bind_dual_stack},
     udp::{BatchRecvMessage, BatchSendMessage},
-    AcceptOpts, AddrFamily, ConnectOpts,
+    AcceptOpts,
+    AddrFamily,
+    ConnectOpts,
 };
 
 /// A `TcpStream` that supports TFO (TCP Fast Open)

crates/shadowsocks/src/net/sys/unix/others.rs

@@ -15,7 +15,9 @@ use tokio::{
 
 use crate::net::{
     sys::{set_common_sockopt_after_connect, set_common_sockopt_for_connect, ErrorKind},
-    AcceptOpts, AddrFamily, ConnectOpts,
+    AcceptOpts,
+    AddrFamily,
+    ConnectOpts,
 };
 
 /// A wrapper of `TcpStream`