diff --git a/adapter/provider/provider.go b/adapter/provider/provider.go index 3103b50828..4381c24d9d 100644 --- a/adapter/provider/provider.go +++ b/adapter/provider/provider.go @@ -128,7 +128,7 @@ func (pp *proxySetProvider) getSubscriptionInfo() { go func() { ctx, cancel := context.WithTimeout(context.Background(), time.Second*90) defer cancel() - resp, err := mihomoHttp.HttpRequestWithProxy(ctx, pp.Vehicle().(*resource.HTTPVehicle).Url(), + resp, err := mihomoHttp.HttpRequestWithProxy(ctx, pp.Vehicle().Url(), http.MethodGet, nil, nil, pp.Vehicle().Proxy()) if err != nil { return @@ -137,7 +137,7 @@ func (pp *proxySetProvider) getSubscriptionInfo() { userInfoStr := strings.TrimSpace(resp.Header.Get("subscription-userinfo")) if userInfoStr == "" { - resp2, err := mihomoHttp.HttpRequestWithProxy(ctx, pp.Vehicle().(*resource.HTTPVehicle).Url(), + resp2, err := mihomoHttp.HttpRequestWithProxy(ctx, pp.Vehicle().Url(), http.MethodGet, http.Header{"User-Agent": {"Quantumultx"}}, nil, pp.Vehicle().Proxy()) if err != nil { return diff --git a/component/resource/fetcher.go b/component/resource/fetcher.go index 9a4f5a7591..fec9fe7714 100644 --- a/component/resource/fetcher.go +++ b/component/resource/fetcher.go @@ -65,8 +65,7 @@ func (f *Fetcher[V]) Initial() (V, error) { modTime := stat.ModTime() f.updatedAt = modTime isLocal = true - if f.interval != 0 && modTime.Add(f.interval).Before(time.Now()) { - log.Warnln("[Provider] %s not updated for a long time, force refresh", f.Name()) + if time.Since(modTime) > f.interval { forceUpdate = true } } else { @@ -78,21 +77,7 @@ func (f *Fetcher[V]) Initial() (V, error) { return lo.Empty[V](), err } - var contents V - if forceUpdate { - var forceBuf []byte - if forceBuf, err = f.vehicle.Read(f.ctx); err == nil { - if contents, err = f.parser(forceBuf); err == nil { - isLocal = false - buf = forceBuf - } - } - } - - if err != nil || !forceUpdate { - contents, err = f.parser(buf) - } - + contents, err := f.parser(buf) if err != nil { if !isLocal { return lo.Empty[V](), err @@ -135,7 +120,7 @@ func (f *Fetcher[V]) Initial() (V, error) { return lo.Empty[V](), err } } else if f.interval > 0 { - go f.pullLoop() + go f.pullLoop(forceUpdate) } return contents, nil @@ -164,7 +149,7 @@ func (f *Fetcher[V]) SideUpdate(buf []byte) (V, bool, error) { } if f.vehicle.Type() != types.File { - if err := safeWrite(f.vehicle.Path(), buf); err != nil { + if err = safeWrite(f.vehicle.Path(), buf); err != nil { return lo.Empty[V](), false, err } } @@ -183,12 +168,17 @@ func (f *Fetcher[V]) Close() error { return nil } -func (f *Fetcher[V]) pullLoop() { +func (f *Fetcher[V]) pullLoop(forceUpdate bool) { initialInterval := f.interval - time.Since(f.updatedAt) if initialInterval > f.interval { initialInterval = f.interval } + if forceUpdate { + log.Warnln("[Provider] %s not updated for a long time, force refresh", f.Name()) + f.update(f.vehicle.Path()) + } + timer := time.NewTimer(initialInterval) defer timer.Stop() for { diff --git a/component/resource/vehicle.go b/component/resource/vehicle.go index 4618ef52f2..74324e6d3b 100644 --- a/component/resource/vehicle.go +++ b/component/resource/vehicle.go @@ -24,6 +24,10 @@ func (f *FileVehicle) Path() string { return f.path } +func (f *FileVehicle) Url() string { + return "file://" + f.path +} + func (f *FileVehicle) Read(ctx context.Context) ([]byte, error) { return os.ReadFile(f.path) } diff --git a/constant/provider/interface.go b/constant/provider/interface.go index 880bdadff6..9d24f6917d 100644 --- a/constant/provider/interface.go +++ b/constant/provider/interface.go @@ -34,6 +34,7 @@ func (v VehicleType) String() string { type Vehicle interface { Read(ctx context.Context) ([]byte, error) Path() string + Url() string Proxy() string Type() VehicleType }