Skip to content

Commit 3e2c9ce

Browse files
wwqgtxxwwqgtxx
committed
chore: cleanup patch code
1 parent 6e04e1e commit 3e2c9ce

File tree

9 files changed

+83
-74
lines changed

9 files changed

+83
-74
lines changed

‎adapter/provider/healthcheck.go

+9-6
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ type extraOption struct {
2727
}
2828

2929
type HealthCheck struct {
30+
ctx context.Context
31+
ctxCancel context.CancelFunc
3032
url string
3133
extra map[string]*extraOption
3234
mu sync.Mutex
@@ -36,7 +38,6 @@ type HealthCheck struct {
3638
lazy bool
3739
expectedStatus utils.IntRanges[uint16]
3840
lastTouch atomic.TypedValue[time.Time]
39-
done chan struct{}
4041
singleDo *singledo.Single[struct{}]
4142
timeout time.Duration
4243
}
@@ -59,7 +60,7 @@ func (hc *HealthCheck) process() {
5960
} else {
6061
log.Debugln("Skip once health check because we are lazy")
6162
}
62-
case <-hc.done:
63+
case <-hc.ctx.Done():
6364
ticker.Stop()
6465
hc.stop()
6566
return
@@ -146,7 +147,7 @@ func (hc *HealthCheck) check() {
146147
_, _, _ = hc.singleDo.Do(func() (struct{}, error) {
147148
id := utils.NewUUIDV4().String()
148149
log.Debugln("Start New Health Checking {%s}", id)
149-
b, _ := batch.New[bool](context.Background(), batch.WithConcurrencyNum[bool](10))
150+
b, _ := batch.New[bool](hc.ctx, batch.WithConcurrencyNum[bool](10))
150151

151152
// execute default health check
152153
option := &extraOption{filters: nil, expectedStatus: hc.expectedStatus}
@@ -195,7 +196,7 @@ func (hc *HealthCheck) execute(b *batch.Batch[bool], url, uid string, option *ex
195196

196197
p := proxy
197198
b.Go(p.Name(), func() (bool, error) {
198-
ctx, cancel := context.WithTimeout(context.Background(), hc.timeout)
199+
ctx, cancel := context.WithTimeout(hc.ctx, hc.timeout)
199200
defer cancel()
200201
log.Debugln("Health Checking, proxy: %s, url: %s, id: {%s}", p.Name(), url, uid)
201202
_, _ = p.URLTest(ctx, url, expectedStatus)
@@ -206,7 +207,7 @@ func (hc *HealthCheck) execute(b *batch.Batch[bool], url, uid string, option *ex
206207
}
207208

208209
func (hc *HealthCheck) close() {
209-
hc.done <- struct{}{}
210+
hc.ctxCancel()
210211
}
211212

212213
func NewHealthCheck(proxies []C.Proxy, url string, timeout uint, interval uint, lazy bool, expectedStatus utils.IntRanges[uint16]) *HealthCheck {
@@ -217,16 +218,18 @@ func NewHealthCheck(proxies []C.Proxy, url string, timeout uint, interval uint,
217218
if timeout == 0 {
218219
timeout = 5000
219220
}
221+
ctx, cancel := context.WithCancel(context.Background())
220222

221223
return &HealthCheck{
224+
ctx: ctx,
225+
ctxCancel: cancel,
222226
proxies: proxies,
223227
url: url,
224228
timeout: time.Duration(timeout) * time.Millisecond,
225229
extra: map[string]*extraOption{},
226230
interval: time.Duration(interval) * time.Second,
227231
lazy: lazy,
228232
expectedStatus: expectedStatus,
229-
done: make(chan struct{}, 1),
230233
singleDo: singledo.NewSingle[struct{}](time.Second),
231234
}
232235
}

‎adapter/provider/patch_android.go

-17
Original file line numberDiff line numberDiff line change
@@ -14,23 +14,6 @@ type UpdatableProvider interface {
1414
UpdatedAt() time.Time
1515
}
1616

17-
func (pp *proxySetProvider) UpdatedAt() time.Time {
18-
return pp.Fetcher.UpdatedAt
19-
}
20-
21-
func (pp *proxySetProvider) Close() error {
22-
pp.healthCheck.close()
23-
pp.Fetcher.Destroy()
24-
25-
return nil
26-
}
27-
28-
func (cp *compatibleProvider) Close() error {
29-
cp.healthCheck.close()
30-
31-
return nil
32-
}
33-
3417
func Suspend(s bool) {
3518
suspended = s
3619
}

‎adapter/provider/provider.go

+19-8
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ func (pp *proxySetProvider) MarshalJSON() ([]byte, error) {
5454
"proxies": pp.Proxies(),
5555
"testUrl": pp.healthCheck.url,
5656
"expectedStatus": pp.healthCheck.expectedStatus.String(),
57-
"updatedAt": pp.UpdatedAt,
57+
"updatedAt": pp.UpdatedAt(),
5858
"subscriptionInfo": pp.subscriptionInfo,
5959
})
6060
}
@@ -164,9 +164,9 @@ func (pp *proxySetProvider) closeAllConnections() {
164164
})
165165
}
166166

167-
func stopProxyProvider(pd *ProxySetProvider) {
168-
pd.healthCheck.close()
169-
_ = pd.Fetcher.Destroy()
167+
func (pp *proxySetProvider) Close() error {
168+
pp.healthCheck.close()
169+
return pp.Fetcher.Close()
170170
}
171171

172172
func NewProxySetProvider(name string, interval time.Duration, filter string, excludeFilter string, excludeType string, dialerProxy string, override OverrideSchema, vehicle types.Vehicle, hc *HealthCheck) (*ProxySetProvider, error) {
@@ -200,10 +200,15 @@ func NewProxySetProvider(name string, interval time.Duration, filter string, exc
200200
fetcher := resource.NewFetcher[[]C.Proxy](name, interval, vehicle, proxiesParseAndFilter(filter, excludeFilter, excludeTypeArray, filterRegs, excludeFilterReg, dialerProxy, override), proxiesOnUpdate(pd))
201201
pd.Fetcher = fetcher
202202
wrapper := &ProxySetProvider{pd}
203-
runtime.SetFinalizer(wrapper, stopProxyProvider)
203+
runtime.SetFinalizer(wrapper, (*ProxySetProvider).Close)
204204
return wrapper, nil
205205
}
206206

207+
func (pp *ProxySetProvider) Close() error {
208+
runtime.SetFinalizer(pp, nil)
209+
return pp.proxySetProvider.Close()
210+
}
211+
207212
// CompatibleProvider for auto gc
208213
type CompatibleProvider struct {
209214
*compatibleProvider
@@ -274,8 +279,9 @@ func (cp *compatibleProvider) RegisterHealthCheckTask(url string, expectedStatus
274279
cp.healthCheck.registerHealthCheckTask(url, expectedStatus, filter, interval)
275280
}
276281

277-
func stopCompatibleProvider(pd *CompatibleProvider) {
278-
pd.healthCheck.close()
282+
func (cp *compatibleProvider) Close() error {
283+
cp.healthCheck.close()
284+
return nil
279285
}
280286

281287
func NewCompatibleProvider(name string, proxies []C.Proxy, hc *HealthCheck) (*CompatibleProvider, error) {
@@ -294,10 +300,15 @@ func NewCompatibleProvider(name string, proxies []C.Proxy, hc *HealthCheck) (*Co
294300
}
295301

296302
wrapper := &CompatibleProvider{pd}
297-
runtime.SetFinalizer(wrapper, stopCompatibleProvider)
303+
runtime.SetFinalizer(wrapper, (*CompatibleProvider).Close)
298304
return wrapper, nil
299305
}
300306

307+
func (cp *CompatibleProvider) Close() error {
308+
runtime.SetFinalizer(cp, nil)
309+
return cp.compatibleProvider.Close()
310+
}
311+
301312
func proxiesOnUpdate(pd *proxySetProvider) func([]C.Proxy) {
302313
return func(elm []C.Proxy) {
303314
pd.setProxies(elm)

‎component/resource/fetcher.go

+31-23
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package resource
22

33
import (
44
"bytes"
5+
"context"
56
"crypto/md5"
67
"os"
78
"path/filepath"
@@ -22,11 +23,12 @@ var (
2223
type Parser[V any] func([]byte) (V, error)
2324

2425
type Fetcher[V any] struct {
26+
ctx context.Context
27+
ctxCancel context.CancelFunc
2528
resourceType string
2629
name string
2730
vehicle types.Vehicle
28-
UpdatedAt time.Time
29-
done chan struct{}
31+
updatedAt time.Time
3032
hash [16]byte
3133
parser Parser[V]
3234
interval time.Duration
@@ -46,6 +48,10 @@ func (f *Fetcher[V]) VehicleType() types.VehicleType {
4648
return f.vehicle.Type()
4749
}
4850

51+
func (f *Fetcher[V]) UpdatedAt() time.Time {
52+
return f.updatedAt
53+
}
54+
4955
func (f *Fetcher[V]) Initial() (V, error) {
5056
var (
5157
buf []byte
@@ -57,15 +63,15 @@ func (f *Fetcher[V]) Initial() (V, error) {
5763
if stat, fErr := os.Stat(f.vehicle.Path()); fErr == nil {
5864
buf, err = os.ReadFile(f.vehicle.Path())
5965
modTime := stat.ModTime()
60-
f.UpdatedAt = modTime
66+
f.updatedAt = modTime
6167
isLocal = true
6268
if f.interval != 0 && modTime.Add(f.interval).Before(time.Now()) {
6369
log.Warnln("[Provider] %s not updated for a long time, force refresh", f.Name())
6470
forceUpdate = true
6571
}
6672
} else {
67-
buf, err = f.vehicle.Read()
68-
f.UpdatedAt = time.Now()
73+
buf, err = f.vehicle.Read(f.ctx)
74+
f.updatedAt = time.Now()
6975
}
7076

7177
if err != nil {
@@ -75,7 +81,7 @@ func (f *Fetcher[V]) Initial() (V, error) {
7581
var contents V
7682
if forceUpdate {
7783
var forceBuf []byte
78-
if forceBuf, err = f.vehicle.Read(); err == nil {
84+
if forceBuf, err = f.vehicle.Read(f.ctx); err == nil {
7985
if contents, err = f.parser(forceBuf); err == nil {
8086
isLocal = false
8187
buf = forceBuf
@@ -93,7 +99,7 @@ func (f *Fetcher[V]) Initial() (V, error) {
9399
}
94100

95101
// parse local file error, fallback to remote
96-
buf, err = f.vehicle.Read()
102+
buf, err = f.vehicle.Read(f.ctx)
97103
if err != nil {
98104
return lo.Empty[V](), err
99105
}
@@ -136,15 +142,18 @@ func (f *Fetcher[V]) Initial() (V, error) {
136142
}
137143

138144
func (f *Fetcher[V]) Update() (V, bool, error) {
139-
buf, err := f.vehicle.Read()
145+
buf, err := f.vehicle.Read(f.ctx)
140146
if err != nil {
141147
return lo.Empty[V](), false, err
142148
}
149+
return f.SideUpdate(buf)
150+
}
143151

152+
func (f *Fetcher[V]) SideUpdate(buf []byte) (V, bool, error) {
144153
now := time.Now()
145154
hash := md5.Sum(buf)
146155
if bytes.Equal(f.hash[:], hash[:]) {
147-
f.UpdatedAt = now
156+
f.updatedAt = now
148157
_ = os.Chtimes(f.vehicle.Path(), now, now)
149158
return lo.Empty[V](), true, nil
150159
}
@@ -160,24 +169,22 @@ func (f *Fetcher[V]) Update() (V, bool, error) {
160169
}
161170
}
162171

163-
f.UpdatedAt = now
172+
f.updatedAt = now
164173
f.hash = hash
165174

166175
return contents, false, nil
167176
}
168177

169-
func (f *Fetcher[V]) Destroy() error {
170-
if f.interval > 0 {
171-
f.done <- struct{}{}
172-
}
178+
func (f *Fetcher[V]) Close() error {
179+
f.ctxCancel()
173180
if f.watcher != nil {
174181
_ = f.watcher.Close()
175182
}
176183
return nil
177184
}
178185

179186
func (f *Fetcher[V]) pullLoop() {
180-
initialInterval := f.interval - time.Since(f.UpdatedAt)
187+
initialInterval := f.interval - time.Since(f.updatedAt)
181188
if initialInterval > f.interval {
182189
initialInterval = f.interval
183190
}
@@ -189,7 +196,7 @@ func (f *Fetcher[V]) pullLoop() {
189196
case <-timer.C:
190197
timer.Reset(f.interval)
191198
f.update(f.vehicle.Path())
192-
case <-f.done:
199+
case <-f.ctx.Done():
193200
return
194201
}
195202
}
@@ -226,13 +233,14 @@ func safeWrite(path string, buf []byte) error {
226233
}
227234

228235
func NewFetcher[V any](name string, interval time.Duration, vehicle types.Vehicle, parser Parser[V], onUpdate func(V)) *Fetcher[V] {
229-
236+
ctx, cancel := context.WithCancel(context.Background())
230237
return &Fetcher[V]{
231-
name: name,
232-
vehicle: vehicle,
233-
parser: parser,
234-
done: make(chan struct{}, 8),
235-
OnUpdate: onUpdate,
236-
interval: interval,
238+
ctx: ctx,
239+
ctxCancel: cancel,
240+
name: name,
241+
vehicle: vehicle,
242+
parser: parser,
243+
OnUpdate: onUpdate,
244+
interval: interval,
237245
}
238246
}

‎component/resource/vehicle.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ func (f *FileVehicle) Path() string {
2424
return f.path
2525
}
2626

27-
func (f *FileVehicle) Read() ([]byte, error) {
27+
func (f *FileVehicle) Read(ctx context.Context) ([]byte, error) {
2828
return os.ReadFile(f.path)
2929
}
3030

@@ -59,8 +59,8 @@ func (h *HTTPVehicle) Proxy() string {
5959
return h.proxy
6060
}
6161

62-
func (h *HTTPVehicle) Read() ([]byte, error) {
63-
ctx, cancel := context.WithTimeout(context.Background(), time.Second*20)
62+
func (h *HTTPVehicle) Read(ctx context.Context) ([]byte, error) {
63+
ctx, cancel := context.WithTimeout(ctx, time.Second*20)
6464
defer cancel()
6565
resp, err := mihomoHttp.HttpRequestWithProxy(ctx, h.url, http.MethodGet, h.header, nil, h.proxy)
6666
if err != nil {

‎config/config.go

+7-3
Original file line numberDiff line numberDiff line change
@@ -431,9 +431,8 @@ func Parse(buf []byte) (*Config, error) {
431431
return ParseRawConfig(rawCfg)
432432
}
433433

434-
func UnmarshalRawConfig(buf []byte) (*RawConfig, error) {
435-
// config with default value
436-
rawCfg := &RawConfig{
434+
func DefaultRawConfig() *RawConfig {
435+
return &RawConfig{
437436
AllowLan: false,
438437
BindAddress: "*",
439438
LanAllowedIPs: []netip.Prefix{netip.MustParsePrefix("0.0.0.0/0"), netip.MustParsePrefix("::/0")},
@@ -544,6 +543,11 @@ func UnmarshalRawConfig(buf []byte) (*RawConfig, error) {
544543
},
545544
ExternalUIURL: "https://github.com/MetaCubeX/metacubexd/archive/refs/heads/gh-pages.zip",
546545
}
546+
}
547+
548+
func UnmarshalRawConfig(buf []byte) (*RawConfig, error) {
549+
// config with default value
550+
rawCfg := DefaultRawConfig()
547551

548552
if err := yaml.Unmarshal(buf, rawCfg); err != nil {
549553
return nil, err

‎constant/provider/interface.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package provider
22

33
import (
4+
"context"
45
"fmt"
56

67
"github.com/metacubex/mihomo/common/utils"
@@ -31,7 +32,7 @@ func (v VehicleType) String() string {
3132
}
3233

3334
type Vehicle interface {
34-
Read() ([]byte, error)
35+
Read(ctx context.Context) ([]byte, error)
3536
Path() string
3637
Proxy() string
3738
Type() VehicleType
@@ -83,6 +84,7 @@ type ProxyProvider interface {
8384
type RuleProvider interface {
8485
Provider
8586
Behavior() RuleBehavior
87+
Count() int
8688
Match(*constant.Metadata) bool
8789
ShouldResolveIP() bool
8890
ShouldFindProcess() bool

0 commit comments

Comments
 (0)