fix: empty proxy provider subscription info not omitted (#1759)

MuXia-0326 · web-flow · commit 56c128880c89 · 2025-01-07T13:26:56.000+08:00
diff --git a/adapter/provider/provider.go b/adapter/provider/provider.go
@@ -137,7 +137,7 @@ func (pp *proxySetProvider) Initial() error {
 		return err
 	}
 	if subscriptionInfo := cachefile.Cache().GetSubscriptionInfo(pp.Name()); subscriptionInfo != "" {
-		pp.subscriptionInfo.Update(subscriptionInfo)
+		pp.subscriptionInfo = NewSubscriptionInfo(subscriptionInfo)
 	}
 	pp.closeAllConnections()
 	return nil
@@ -165,14 +165,12 @@ func NewProxySetProvider(name string, interval time.Duration, parser resource.Pa
 		go hc.process()
 	}
 
-	si := new(SubscriptionInfo)
 	pd := &proxySetProvider{
 		baseProvider: baseProvider{
 			name:        name,
 			proxies:     []C.Proxy{},
 			healthCheck: hc,
 		},
-		subscriptionInfo: si,
 	}
 
 	fetcher := resource.NewFetcher[[]C.Proxy](name, interval, vehicle, parser, proxiesOnUpdate(pd))
@@ -181,7 +179,7 @@ func NewProxySetProvider(name string, interval time.Duration, parser resource.Pa
 		httpVehicle.SetInRead(func(resp *http.Response) {
 			if subscriptionInfo := resp.Header.Get("subscription-userinfo"); subscriptionInfo != "" {
 				cachefile.Cache().SetSubscriptionInfo(name, subscriptionInfo)
-				si.Update(subscriptionInfo)
+				pd.subscriptionInfo = NewSubscriptionInfo(subscriptionInfo)
 			}
 		})
 	}
diff --git a/adapter/provider/subscription_info.go b/adapter/provider/subscription_info.go
@@ -15,8 +15,9 @@ type SubscriptionInfo struct {
 	Expire   int64
 }
 
-func (info *SubscriptionInfo) Update(userinfo string) {
+func NewSubscriptionInfo(userinfo string) (si *SubscriptionInfo) {
 	userinfo = strings.ReplaceAll(strings.ToLower(userinfo), " ", "")
+	si = new(SubscriptionInfo)
 
 	for _, field := range strings.Split(userinfo, ";") {
 		name, value, ok := strings.Cut(field, "=")
@@ -32,15 +33,16 @@ func (info *SubscriptionInfo) Update(userinfo string) {
 
 		switch name {
 		case "upload":
-			info.Upload = intValue
+			si.Upload = intValue
 		case "download":
-			info.Download = intValue
+			si.Download = intValue
 		case "total":
-			info.Total = intValue
+			si.Total = intValue
 		case "expire":
-			info.Expire = intValue
+			si.Expire = intValue
 		}
 	}
+	return si
 }
 
 func parseValue(value string) (int64, error) {

Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ func (pp *proxySetProvider) Initial() error {`
`137`	`137`	`return err`
`138`	`138`	`}`
`139`	`139`	`if subscriptionInfo := cachefile.Cache().GetSubscriptionInfo(pp.Name()); subscriptionInfo != "" {`
`140`		`- pp.subscriptionInfo.Update(subscriptionInfo)`
	`140`	`+ pp.subscriptionInfo = NewSubscriptionInfo(subscriptionInfo)`
`141`	`141`	`}`
`142`	`142`	`pp.closeAllConnections()`
`143`	`143`	`return nil`
`@@ -165,14 +165,12 @@ func NewProxySetProvider(name string, interval time.Duration, parser resource.Pa`
`165`	`165`	`go hc.process()`
`166`	`166`	`}`
`167`	`167`
`168`		`- si := new(SubscriptionInfo)`
`169`	`168`	`pd := &proxySetProvider{`
`170`	`169`	`baseProvider: baseProvider{`
`171`	`170`	`name: name,`
`172`	`171`	`proxies: []C.Proxy{},`
`173`	`172`	`healthCheck: hc,`
`174`	`173`	`},`
`175`		`- subscriptionInfo: si,`
`176`	`174`	`}`
`177`	`175`
`178`	`176`	`fetcher := resource.NewFetcher[[]C.Proxy](name, interval, vehicle, parser, proxiesOnUpdate(pd))`
`@@ -181,7 +179,7 @@ func NewProxySetProvider(name string, interval time.Duration, parser resource.Pa`
`181`	`179`	`httpVehicle.SetInRead(func(resp *http.Response) {`
`182`	`180`	`if subscriptionInfo := resp.Header.Get("subscription-userinfo"); subscriptionInfo != "" {`
`183`	`181`	`cachefile.Cache().SetSubscriptionInfo(name, subscriptionInfo)`
`184`		`- si.Update(subscriptionInfo)`
	`182`	`+ pd.subscriptionInfo = NewSubscriptionInfo(subscriptionInfo)`
`185`	`183`	`}`
`186`	`184`	`})`
`187`	`185`	`}`