hesoyam/sing-box-extended-mirror
1
0
Fork 0
mirror of https://github.com/shtorm-7/sing-box-extended.git synced 2026-09-30 19:45:42 +00:00
Code Issues Packages Projects Releases 2 Wiki Activity

Merge pull request #159 from mihail-jdanov/extended

Browse Source 
provider: Fix startup failure when restoring an empty subscription cache
This commit is contained in:
Shtorm
2026-09-30 18:49:13 +02:00
committed by GitHub
parent 55faa763f9 d75ac4ea21
commit 5956780ba3
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
provider/remote/provider.go
+8 -2
View File
@@ -115,9 +115,11 @@ func (s *ProviderRemote) Start() error {
s.subscriptionInfo = info
content, _ = boxCommon.DecodeBase64URLSafe(others)
}
if err := s.updateProviderFromContent(content); err != nil {
cachedOptions, err := json.UnmarshalExtendedContext[option.Options](s.ctx, []byte(content))
if err != nil {
return E.Cause(err, "restore cached outbound provider")
}
s.updateProviderFromOptions(cachedOptions.Outbounds)
s.UpdateGroups()
s.lastUpdated, s.lastEtag = saveSub.LastUpdated, saveSub.LastEtag
}
@@ -300,12 +302,16 @@ func (s *ProviderRemote) updateProviderFromContent(content string) error {
if err != nil {
return err
}
s.updateProviderFromOptions(outboundOpts)
return nil
}
func (s *ProviderRemote) updateProviderFromOptions(outboundOpts []option.Outbound) {
outboundOpts = common.Filter(outboundOpts, func(it option.Outbound) bool {
return (s.exclude == nil || !s.exclude.MatchString(it.Tag)) && (s.include == nil || s.include.MatchString(it.Tag))
})
s.UpdateOutbounds(s.lastOutOpts, outboundOpts)
s.lastOutOpts = outboundOpts
return nil
}
func getFirstLine(content string) (string, string) {