Skip to content

Commit

Permalink
feat: Allow passing in configuration strings
Browse files Browse the repository at this point in the history
  • Loading branch information
xishang0128 committed Sep 3, 2024
1 parent 771c007 commit 543330a
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 20 deletions.
5 changes: 4 additions & 1 deletion hub/executor/executor.go
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,10 @@ func readConfig(path string) ([]byte, error) {
}

// Parse config with default config path
func Parse() (*config.Config, error) {
func Parse(config string) (*config.Config, error) {
if config != "" {
return ParseWithBytes([]byte(config))
}
return ParseWithPath(C.Path.Config())
}

Expand Down
4 changes: 2 additions & 2 deletions hub/hub.go
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ func applyRoute(cfg *config.Config) {
}

// Parse call at the beginning of mihomo
func Parse(options ...Option) error {
cfg, err := executor.Parse()
func Parse(config string, options ...Option) error {
cfg, err := executor.Parse(config)
if err != nil {
return err
}
Expand Down
54 changes: 37 additions & 17 deletions main.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package main

import (
"encoding/base64"
"flag"
"fmt"
"os"
Expand Down Expand Up @@ -28,6 +29,7 @@ var (
geodataMode bool
homeDir string
configFile string
configString string
externalUI string
externalController string
externalControllerUnix string
Expand All @@ -37,6 +39,7 @@ var (
func init() {
flag.StringVar(&homeDir, "d", os.Getenv("CLASH_HOME_DIR"), "set configuration directory")
flag.StringVar(&configFile, "f", os.Getenv("CLASH_CONFIG_FILE"), "specify configuration file")
flag.StringVar(&configString, "c", os.Getenv("CLASH_CONFIG_STRING"), "specify configuration base64 string")
flag.StringVar(&externalUI, "ext-ui", os.Getenv("CLASH_OVERRIDE_EXTERNAL_UI_DIR"), "override external ui directory")
flag.StringVar(&externalController, "ext-ctl", os.Getenv("CLASH_OVERRIDE_EXTERNAL_CONTROLLER"), "override external controller address")
flag.StringVar(&externalControllerUnix, "ext-ctl-unix", os.Getenv("CLASH_OVERRIDE_EXTERNAL_CONTROLLER_UNIX"), "override external controller unix address")
Expand Down Expand Up @@ -73,26 +76,35 @@ func main() {
C.SetHomeDir(homeDir)
}

if configFile != "" {
if !filepath.IsAbs(configFile) {
currentDir, _ := os.Getwd()
configFile = filepath.Join(currentDir, configFile)
if configString != "" {
decodedBytes, err := base64.StdEncoding.DecodeString(configString)
if err != nil {
log.Fatalln("Initial configuration error: %s", err.Error())
return
}
configString = string(decodedBytes)
} else {
configFile = filepath.Join(C.Path.HomeDir(), C.Path.Config())
}
C.SetConfig(configFile)
if configFile != "" {
if !filepath.IsAbs(configFile) {
currentDir, _ := os.Getwd()
configFile = filepath.Join(currentDir, configFile)
}
} else {
configFile = filepath.Join(C.Path.HomeDir(), C.Path.Config())
}
C.SetConfig(configFile)

if geodataMode {
C.GeodataMode = true
}
if geodataMode {
C.GeodataMode = true
}

if err := config.Init(C.Path.HomeDir()); err != nil {
log.Fatalln("Initial configuration directory error: %s", err.Error())
if err := config.Init(C.Path.HomeDir()); err != nil {
log.Fatalln("Initial configuration directory error: %s", err.Error())
}
}

if testConfig {
if _, err := executor.Parse(); err != nil {
if _, err := executor.Parse(configString); err != nil {
log.Errorln(err.Error())
fmt.Printf("configuration file %s test failed\n", C.Path.Config())
os.Exit(1)
Expand All @@ -115,7 +127,7 @@ func main() {
options = append(options, hub.WithSecret(secret))
}

if err := hub.Parse(options...); err != nil {
if err := hub.Parse(configString, options...); err != nil {
log.Fatalln("Parse config error: %s", err.Error())
}

Expand All @@ -134,10 +146,18 @@ func main() {
case <-termSign:
return
case <-hupSign:
if cfg, err := executor.ParseWithPath(C.Path.Config()); err == nil {
hub.ApplyConfig(cfg)
if configString != "" {
if cfg, err := executor.Parse(configString); err == nil {
hub.ApplyConfig(cfg)
} else {
log.Errorln("Parse config error: %s", err.Error())
}
} else {
log.Errorln("Parse config error: %s", err.Error())
if cfg, err := executor.ParseWithPath(C.Path.Config()); err == nil {
hub.ApplyConfig(cfg)
} else {
log.Errorln("Parse config error: %s", err.Error())
}
}
}
}
Expand Down

0 comments on commit 543330a

Please sign in to comment.