Skip to content
This repository was archived by the owner on Feb 13, 2025. It is now read-only.

Commit eb985b0

Browse files
xishang0128xishang0128
committed
chore: restful api displays more information
1 parent 4623435 commit eb985b0

16 files changed

+100
-1
lines changed

‎adapter/adapter.go

+4
Original file line numberDiff line numberDiff line change
@@ -163,10 +163,14 @@ func (p *Proxy) MarshalJSON() ([]byte, error) {
163163
mapping["alive"] = p.alive.Load()
164164
mapping["name"] = p.Name()
165165
mapping["udp"] = p.SupportUDP()
166+
mapping["uot"] = p.SupportUOT()
166167
mapping["xudp"] = p.SupportXUDP()
167168
mapping["tfo"] = p.SupportTFO()
168169
mapping["mptcp"] = p.SupportMPTCP()
169170
mapping["smux"] = p.SupportSMUX()
171+
mapping["interface"] = p.SupportInterface()
172+
mapping["dialer-proxy"] = p.SupportDialerProxy()
173+
mapping["routing-mark"] = p.SupportRoutingMark()
170174
return json.Marshal(mapping)
171175
}
172176

‎adapter/outbound/base.go

+12
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,18 @@ func (b *Base) SupportSMUX() bool {
105105
return false
106106
}
107107

108+
func (b *Base) SupportDialerProxy() string {
109+
return ""
110+
}
111+
112+
func (b *Base) SupportInterface() string {
113+
return b.iface
114+
}
115+
116+
func (b *Base) SupportRoutingMark() int {
117+
return b.rmark
118+
}
119+
108120
// IsL3Protocol implements C.ProxyAdapter
109121
func (b *Base) IsL3Protocol(metadata *C.Metadata) bool {
110122
return false

‎adapter/outbound/http.go

+5
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,11 @@ func (h *Http) SupportWithDialer() C.NetWork {
9292
return C.TCP
9393
}
9494

95+
// SupportDialerProxy implements C.ProxyAdapter
96+
func (h *Http) SupportDialerProxy() string {
97+
return h.option.DialerProxy
98+
}
99+
95100
func (h *Http) shakeHand(metadata *C.Metadata, rw io.ReadWriter) error {
96101
addr := metadata.RemoteAddress()
97102
HeaderString := "CONNECT " + addr + " HTTP/1.1\r\n"

‎adapter/outbound/hysteria.go

+5
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,11 @@ func (h *Hysteria) genHdc(ctx context.Context, opts ...dialer.Option) utils.Pack
8787
}
8888
}
8989

90+
// SupportDialerProxy implements C.ProxyAdapter
91+
func (h *Hysteria) SupportDialerProxy() string {
92+
return h.option.DialerProxy
93+
}
94+
9095
type HysteriaOption struct {
9196
BasicOption
9297
Name string `proxy:"name"`

‎adapter/outbound/hysteria2.go

+5
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,11 @@ func closeHysteria2(h *Hysteria2) {
9696
}
9797
}
9898

99+
// SupportDialerProxy implements C.ProxyAdapter
100+
func (h *Hysteria2) SupportDialerProxy() string {
101+
return h.option.DialerProxy
102+
}
103+
99104
func NewHysteria2(option Hysteria2Option) (*Hysteria2, error) {
100105
addr := net.JoinHostPort(option.Server, strconv.Itoa(option.Port))
101106
var salamanderPassword string

‎adapter/outbound/shadowsocks.go

+5
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,11 @@ func (ss *ShadowSocks) SupportWithDialer() C.NetWork {
196196
return C.ALLNet
197197
}
198198

199+
// SupportDialerProxy implements C.ProxyAdapter
200+
func (ss *ShadowSocks) SupportDialerProxy() string {
201+
return ss.option.DialerProxy
202+
}
203+
199204
// ListenPacketOnStreamConn implements C.ProxyAdapter
200205
func (ss *ShadowSocks) ListenPacketOnStreamConn(ctx context.Context, c net.Conn, metadata *C.Metadata) (_ C.PacketConn, err error) {
201206
if ss.option.UDPOverTCP {

‎adapter/outbound/shadowsocksr.go

+5
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,11 @@ func (ssr *ShadowSocksR) SupportWithDialer() C.NetWork {
122122
return C.ALLNet
123123
}
124124

125+
// SupportDialerProxy implements C.ProxyAdapter
126+
func (ssr *ShadowSocksR) SupportDialerProxy() string {
127+
return ssr.option.DialerProxy
128+
}
129+
125130
func NewShadowSocksR(option ShadowSocksROption) (*ShadowSocksR, error) {
126131
// SSR protocol compatibility
127132
// https://github.com/metacubex/mihomo/pull/2056

‎adapter/outbound/snell.go

+6-1
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,11 @@ func (s *Snell) SupportUOT() bool {
141141
return true
142142
}
143143

144+
// SupportDialerProxy implements C.ProxyAdapter
145+
func (s *Snell) SupportDialerProxy() string {
146+
return s.option.DialerProxy
147+
}
148+
144149
func NewSnell(option SnellOption) (*Snell, error) {
145150
addr := net.JoinHostPort(option.Server, strconv.Itoa(option.Port))
146151
psk := []byte(option.Psk)
@@ -204,7 +209,7 @@ func NewSnell(option SnellOption) (*Snell, error) {
204209
if err != nil {
205210
return nil, err
206211
}
207-
212+
208213
return streamConn(c, streamOption{psk, option.Version, addr, obfsOption}), nil
209214
})
210215
}

‎adapter/outbound/socks5.go

+5
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,11 @@ func (ss *Socks5) ListenPacketContext(ctx context.Context, metadata *C.Metadata,
171171
return newPacketConn(&socksPacketConn{PacketConn: pc, rAddr: bindUDPAddr, tcpConn: c}, ss), nil
172172
}
173173

174+
// SupportDialerProxy implements C.ProxyAdapter
175+
func (ss *Socks5) SupportDialerProxy() string {
176+
return ss.option.DialerProxy
177+
}
178+
174179
func NewSocks5(option Socks5Option) (*Socks5, error) {
175180
var tlsConfig *tls.Config
176181
if option.TLS {

‎adapter/outbound/ssh.go

+5
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,11 @@ func closeSsh(s *Ssh) {
121121
_ = s.client.Close()
122122
}
123123

124+
// SupportWithDialer implements C.ProxyAdapter
125+
func (s *Ssh) SupportDialerProxy() string {
126+
return s.option.DialerProxy
127+
}
128+
124129
func NewSsh(option SshOption) (*Ssh, error) {
125130
addr := net.JoinHostPort(option.Server, strconv.Itoa(option.Port))
126131

‎adapter/outbound/trojan.go

+5
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,11 @@ func (t *Trojan) SupportUOT() bool {
244244
return true
245245
}
246246

247+
// SupportDialerProxy implements C.ProxyAdapter
248+
func (t *Trojan) SupportDialerProxy() string {
249+
return t.option.DialerProxy
250+
}
251+
247252
func NewTrojan(option TrojanOption) (*Trojan, error) {
248253
addr := net.JoinHostPort(option.Server, strconv.Itoa(option.Port))
249254

‎adapter/outbound/tuic.go

+5
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,11 @@ func (t *Tuic) dialWithDialer(ctx context.Context, dialer C.Dialer) (transport *
146146
return
147147
}
148148

149+
// SupportDialerProxy implements C.ProxyAdapter
150+
func (t *Tuic) SupportDialerProxy() string {
151+
return t.option.DialerProxy
152+
}
153+
149154
func NewTuic(option TuicOption) (*Tuic, error) {
150155
addr := net.JoinHostPort(option.Server, strconv.Itoa(option.Port))
151156
serverName := option.Server

‎adapter/outbound/vless.go

+5
Original file line numberDiff line numberDiff line change
@@ -379,6 +379,11 @@ func (v *Vless) SupportUOT() bool {
379379
return true
380380
}
381381

382+
// SupportDialerProxy implements C.ProxyAdapter
383+
func (v *Vless) SupportDialerProxy() string {
384+
return v.option.DialerProxy
385+
}
386+
382387
func parseVlessAddr(metadata *C.Metadata, xudp bool) *vless.DstAddr {
383388
var addrType byte
384389
var addr []byte

‎adapter/outbound/vmess.go

+4
Original file line numberDiff line numberDiff line change
@@ -388,6 +388,10 @@ func (v *Vmess) SupportWithDialer() C.NetWork {
388388
return C.ALLNet
389389
}
390390

391+
func (v *Vmess) SupportDialerProxy() string {
392+
return v.option.DialerProxy
393+
}
394+
391395
// ListenPacketOnStreamConn implements C.ProxyAdapter
392396
func (v *Vmess) ListenPacketOnStreamConn(ctx context.Context, c net.Conn, metadata *C.Metadata) (_ C.PacketConn, err error) {
393397
// vmess use stream-oriented udp with a special address, so we need a net.UDPAddr

‎adapter/outbound/wireguard.go

+21
Original file line numberDiff line numberDiff line change
@@ -674,6 +674,27 @@ func (r *refProxyAdapter) SupportUOT() bool {
674674
return false
675675
}
676676

677+
func (r *refProxyAdapter) SupportDialerProxy() string {
678+
if r.proxyAdapter != nil {
679+
return r.proxyAdapter.SupportDialerProxy()
680+
}
681+
return ""
682+
}
683+
684+
func (r *refProxyAdapter) SupportInterface() string {
685+
if r.proxyAdapter != nil {
686+
return r.proxyAdapter.SupportInterface()
687+
}
688+
return ""
689+
}
690+
691+
func (r *refProxyAdapter) SupportRoutingMark() int {
692+
if r.proxyAdapter != nil {
693+
return r.proxyAdapter.SupportRoutingMark()
694+
}
695+
return 0
696+
}
697+
677698
func (r *refProxyAdapter) SupportWithDialer() C.NetWork {
678699
if r.proxyAdapter != nil {
679700
return r.proxyAdapter.SupportWithDialer()

‎constant/adapters.go

+3
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,9 @@ type ProxyAdapter interface {
108108
SupportTFO() bool
109109
SupportMPTCP() bool
110110
SupportSMUX() bool
111+
SupportInterface() string
112+
SupportRoutingMark() int
113+
SupportDialerProxy() string
111114
MarshalJSON() ([]byte, error)
112115

113116
// Deprecated: use DialContextWithDialer and ListenPacketWithDialer instead.

0 commit comments

Comments
 (0)