Skip to content

Commit a67c379

Browse files
wwqgtxxwwqgtxx
committed
chore: code cleanup
1 parent af5ad32 commit a67c379

File tree

6 files changed

+25
-39
lines changed

6 files changed

+25
-39
lines changed

‎adapter/adapter.go

+5
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,11 @@ type Proxy struct {
3939
extra *xsync.MapOf[string, *internalProxyState]
4040
}
4141

42+
// Adapter implements C.Proxy
43+
func (p *Proxy) Adapter() C.ProxyAdapter {
44+
return p.ProxyAdapter
45+
}
46+
4247
// AliveForTestUrl implements C.Proxy
4348
func (p *Proxy) AliveForTestUrl(url string) bool {
4449
if state, ok := p.extra.Load(url); ok {

‎adapter/outboundgroup/util.go

+4
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,7 @@ type SelectAble interface {
44
Set(string) error
55
ForceSet(name string)
66
}
7+
8+
var _ SelectAble = (*Fallback)(nil)
9+
var _ SelectAble = (*URLTest)(nil)
10+
var _ SelectAble = (*Selector)(nil)

‎constant/adapters.go

+1
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@ type DelayHistoryStoreType int
158158

159159
type Proxy interface {
160160
ProxyAdapter
161+
Adapter() ProxyAdapter
161162
AliveForTestUrl(url string) bool
162163
DelayHistory() []DelayHistory
163164
ExtraDelayHistories() map[string]ProxyState

‎hub/executor/executor.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -445,12 +445,12 @@ func patchSelectGroup(proxies map[string]C.Proxy) {
445445
}
446446

447447
for name, proxy := range proxies {
448-
outbound, ok := proxy.(*adapter.Proxy)
448+
outbound, ok := proxy.(C.Proxy)
449449
if !ok {
450450
continue
451451
}
452452

453-
selector, ok := outbound.ProxyAdapter.(outboundgroup.SelectAble)
453+
selector, ok := outbound.Adapter().(outboundgroup.SelectAble)
454454
if !ok {
455455
continue
456456
}

‎hub/route/groups.go

+5-16
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
"github.com/go-chi/chi/v5"
1010
"github.com/go-chi/render"
1111

12-
"github.com/metacubex/mihomo/adapter"
1312
"github.com/metacubex/mihomo/adapter/outboundgroup"
1413
"github.com/metacubex/mihomo/common/utils"
1514
"github.com/metacubex/mihomo/component/profile/cachefile"
@@ -32,7 +31,7 @@ func GroupRouter() http.Handler {
3231
func getGroups(w http.ResponseWriter, r *http.Request) {
3332
var gs []C.Proxy
3433
for _, p := range tunnel.Proxies() {
35-
if _, ok := p.(*adapter.Proxy).ProxyAdapter.(C.Group); ok {
34+
if _, ok := p.Adapter().(C.Group); ok {
3635
gs = append(gs, p)
3736
}
3837
}
@@ -43,7 +42,7 @@ func getGroups(w http.ResponseWriter, r *http.Request) {
4342

4443
func getGroup(w http.ResponseWriter, r *http.Request) {
4544
proxy := r.Context().Value(CtxKeyProxy).(C.Proxy)
46-
if _, ok := proxy.(*adapter.Proxy).ProxyAdapter.(C.Group); ok {
45+
if _, ok := proxy.Adapter().(C.Group); ok {
4746
render.JSON(w, r, proxy)
4847
return
4948
}
@@ -53,25 +52,15 @@ func getGroup(w http.ResponseWriter, r *http.Request) {
5352

5453
func getGroupDelay(w http.ResponseWriter, r *http.Request) {
5554
proxy := r.Context().Value(CtxKeyProxy).(C.Proxy)
56-
group, ok := proxy.(*adapter.Proxy).ProxyAdapter.(C.Group)
55+
group, ok := proxy.Adapter().(C.Group)
5756
if !ok {
5857
render.Status(r, http.StatusNotFound)
5958
render.JSON(w, r, ErrNotFound)
6059
return
6160
}
6261

63-
switch proxy.(*adapter.Proxy).Type() {
64-
case C.URLTest:
65-
if urlTestGroup, ok := proxy.(*adapter.Proxy).ProxyAdapter.(*outboundgroup.URLTest); ok {
66-
urlTestGroup.ForceSet("")
67-
}
68-
case C.Fallback:
69-
if fallbackGroup, ok := proxy.(*adapter.Proxy).ProxyAdapter.(*outboundgroup.Fallback); ok {
70-
fallbackGroup.ForceSet("")
71-
}
72-
}
73-
74-
if proxy.(*adapter.Proxy).Type() != C.Selector {
62+
if selectAble, ok := proxy.Adapter().(outboundgroup.SelectAble); ok && proxy.Type() != C.Selector {
63+
selectAble.ForceSet("")
7564
cachefile.Cache().SetSelected(proxy.Name(), "")
7665
}
7766

‎hub/route/proxies.go

+8-21
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import (
77
"strconv"
88
"time"
99

10-
"github.com/metacubex/mihomo/adapter"
1110
"github.com/metacubex/mihomo/adapter/outboundgroup"
1211
"github.com/metacubex/mihomo/common/utils"
1312
"github.com/metacubex/mihomo/component/profile/cachefile"
@@ -82,8 +81,8 @@ func updateProxy(w http.ResponseWriter, r *http.Request) {
8281
return
8382
}
8483

85-
proxy := r.Context().Value(CtxKeyProxy).(*adapter.Proxy)
86-
selector, ok := proxy.ProxyAdapter.(outboundgroup.SelectAble)
84+
proxy := r.Context().Value(CtxKeyProxy).(C.Proxy)
85+
selector, ok := proxy.Adapter().(outboundgroup.SelectAble)
8786
if !ok {
8887
render.Status(r, http.StatusBadRequest)
8988
render.JSON(w, r, newError("Must be a Selector"))
@@ -150,24 +149,12 @@ func getProxyDelay(w http.ResponseWriter, r *http.Request) {
150149

151150
func unfixedProxy(w http.ResponseWriter, r *http.Request) {
152151
proxy := r.Context().Value(CtxKeyProxy).(C.Proxy)
153-
switch proxy.(*adapter.Proxy).Type() {
154-
case C.URLTest:
155-
if urlTestGroup, ok := proxy.(*adapter.Proxy).ProxyAdapter.(*outboundgroup.URLTest); ok {
156-
urlTestGroup.ForceSet("")
157-
}
158-
case C.Fallback:
159-
if fallbackGroup, ok := proxy.(*adapter.Proxy).ProxyAdapter.(*outboundgroup.Fallback); ok {
160-
fallbackGroup.ForceSet("")
161-
}
162-
default:
163-
render.Status(r, http.StatusBadRequest)
164-
render.JSON(w, r, ErrBadRequest)
165-
return
166-
}
167-
168-
if proxy.(*adapter.Proxy).Type() != C.Selector {
152+
if selectAble, ok := proxy.Adapter().(outboundgroup.SelectAble); ok && proxy.Type() != C.Selector {
153+
selectAble.ForceSet("")
169154
cachefile.Cache().SetSelected(proxy.Name(), "")
155+
render.NoContent(w, r)
156+
return
170157
}
171-
172-
render.NoContent(w, r)
158+
render.Status(r, http.StatusBadRequest)
159+
render.JSON(w, r, ErrBadRequest)
173160
}

0 commit comments

Comments
 (0)