vodorod/umbrix-libcore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

fix: parse config issues

Browse Source
This commit is contained in:
Hiddify
2024-08-06 22:45:01 -04:00
parent b389963aa8
commit f31899c269
6 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/option.go
View File

@@ -146,5 +146,6 @@ func DefaultConfigOptions() *ConfigOptions {
EnablePadding: false, EnablePadding: false,
PaddingSize: "1200-1500", PaddingSize: "1200-1500",
}, },
UseXrayCoreWhenPossible: false,
} }
} }

2
config/warp.go
View File

@@ -159,7 +159,7 @@ func patchWarp(base *option.Outbound, configOpt *ConfigOptions, final bool, stat
var warpConfig *T.Outbound var warpConfig *T.Outbound
var err error var err error
if configOpt == nil && (key == "p1" || key == "p2") { if (configOpt == nil || !final) && (key == "p1" || key == "p2") {
warpConfig = base warpConfig = base
return nil return nil
} else if key == "p1" { } else if key == "p1" {

2
go.mod
View File

@@ -20,6 +20,8 @@ require (
gopkg.in/yaml.v3 v3.0.1 gopkg.in/yaml.v3 v3.0.1
) )
require github.com/akavel/rsrc v0.10.2 // indirect
require ( require (
berty.tech/go-libtor v1.0.385 // indirect berty.tech/go-libtor v1.0.385 // indirect
github.com/ajg/form v1.5.1 // indirect github.com/ajg/form v1.5.1 // indirect

2
go.sum
View File

@@ -14,6 +14,8 @@ github.com/OmarTariq612/goech v0.0.0-20240405204721-8e2e1dafd3a0 h1:Wo41lDOevRJS
github.com/OmarTariq612/goech v0.0.0-20240405204721-8e2e1dafd3a0/go.mod h1:FVGavL/QEBQDcBpr3fAojoK17xX5k9bicBphrOpP7uM= github.com/OmarTariq612/goech v0.0.0-20240405204721-8e2e1dafd3a0/go.mod h1:FVGavL/QEBQDcBpr3fAojoK17xX5k9bicBphrOpP7uM=
github.com/ajg/form v1.5.1 h1:t9c7v8JUKu/XxOGBU0yjNpaMloxGEJhUkqFRq0ibGeU= github.com/ajg/form v1.5.1 h1:t9c7v8JUKu/XxOGBU0yjNpaMloxGEJhUkqFRq0ibGeU=
github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY= github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY=
github.com/akavel/rsrc v0.10.2 h1:Zxm8V5eI1hW4gGaYsJQUhxpjkENuG91ki8B4zCrvEsw=
github.com/akavel/rsrc v0.10.2/go.mod h1:uLoCtb9J+EyAqh+26kdrTgmzRBFPGOolLWKpdxkKq+c=
github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M= github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M=
github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY= github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY=
github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c= github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=

4
v2/custom.go
View File

@@ -87,7 +87,7 @@ func StartService(in *pb.StartRequest) (*pb.CoreInfoResponse, error) {
} }
Log(pb.LogLevel_DEBUG, pb.LogType_CORE, "Parsing Config") Log(pb.LogLevel_DEBUG, pb.LogType_CORE, "Parsing Config")
parsedContent, err := parseConfig(content) parsedContent, err := readOptions(content)
Log(pb.LogLevel_DEBUG, pb.LogType_CORE, "Parsed") Log(pb.LogLevel_DEBUG, pb.LogType_CORE, "Parsed")
if err != nil { if err != nil {
@@ -247,7 +247,7 @@ func generateConfigFromFile(path string, configOpt config.ConfigOptions) (string
if err != nil { if err != nil {
return "", err return "", err
} }
options, err := parseConfig(string(content)) options, err := readOptions(string(content))
if err != nil { if err != nil {
return "", err return "", err
} }

2
v2/service.go
View File

@@ -81,7 +81,7 @@ func NewService(options option.Options) (*libbox.BoxService, error) {
return &service, nil return &service, nil
} }
func parseConfig(configContent string) (option.Options, error) { func readOptions(configContent string) (option.Options, error) {
var options option.Options var options option.Options
err := options.UnmarshalJSON([]byte(configContent)) err := options.UnmarshalJSON([]byte(configContent))
if err != nil { if err != nil {