chunyu/sing-box
1
0
Fork 0
mirror of https://github.com/SagerNet/sing-box.git synced 2025-06-13 21:54:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Improve configuration merge

Browse Source
This commit is contained in:
世界 2023-12-10 22:57:28 +08:00
parent cdd1a884e1
commit 28ee04beab
No known key found for this signature in database
GPG Key ID: CD109927C34A63C4
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmd/sing-box/cmd_run.go
View File

@ -17,6 +17,7 @@ import (
"github.com/sagernet/sing-box/log" "github.com/sagernet/sing-box/log"
"github.com/sagernet/sing-box/option" "github.com/sagernet/sing-box/option"
E "github.com/sagernet/sing/common/exceptions" E "github.com/sagernet/sing/common/exceptions"
"github.com/sagernet/sing/common/json"
"github.com/sagernet/sing/common/json/badjson" "github.com/sagernet/sing/common/json/badjson"
"github.com/spf13/cobra" "github.com/spf13/cobra"
@ -107,13 +108,18 @@ func readConfigAndMerge() (option.Options, error) {
if len(optionsList) == 1 { if len(optionsList) == 1 {
return optionsList[0].options, nil return optionsList[0].options, nil
} }
var mergedOptions option.Options var mergedMessage json.RawMessage
for _, options := range optionsList { for _, options := range optionsList {
mergedOptions, err = badjson.Merge(options.options, mergedOptions) mergedMessage, err = badjson.MergeJSON(options.options.RawMessage, mergedMessage)
if err != nil { if err != nil {
return option.Options{}, E.Cause(err, "merge config at ", options.path) return option.Options{}, E.Cause(err, "merge config at ", options.path)
} }
} }
var mergedOptions option.Options
err = mergedOptions.UnmarshalJSON(mergedMessage)
if err != nil {
return option.Options{}, E.Cause(err, "unmarshal merged config")
}
return mergedOptions, nil return mergedOptions, nil
} }

2
option/config.go
View File

@ -9,6 +9,7 @@ import (
) )
type _Options struct { type _Options struct {
RawMessage json.RawMessage `json:"-"`
Schema string `json:"$schema,omitempty"` Schema string `json:"$schema,omitempty"`
Log *LogOptions `json:"log,omitempty"` Log *LogOptions `json:"log,omitempty"`
DNS *DNSOptions `json:"dns,omitempty"` DNS *DNSOptions `json:"dns,omitempty"`
@ -26,6 +27,7 @@ func (o *Options) UnmarshalJSON(content []byte) error {
decoder.DisallowUnknownFields() decoder.DisallowUnknownFields()
err := decoder.Decode((*_Options)(o)) err := decoder.Decode((*_Options)(o))
if err == nil { if err == nil {
o.RawMessage = content
return nil return nil
} }
if syntaxError, isSyntaxError := err.(*json.SyntaxError); isSyntaxError { if syntaxError, isSyntaxError := err.(*json.SyntaxError); isSyntaxError {