Feat: add switch config file API

This commit is contained in:
Dreamacro 2018-11-30 17:42:40 +08:00
parent dc24dd4d89
commit 9cfd26d440
4 changed files with 38 additions and 4 deletions

View File

@ -19,10 +19,12 @@ func ParseWithPath(path string) (*config.Config, error) {
}
// ApplyConfig dispatch configure to all parts
func ApplyConfig(cfg *config.Config) {
func ApplyConfig(cfg *config.Config, force bool) {
if force {
updateGeneral(cfg.General)
}
updateProxies(cfg.Proxies)
updateRules(cfg.Rules)
updateGeneral(cfg.General)
}
func GetGeneral() *config.General {

View File

@ -16,6 +16,6 @@ func Parse() error {
go route.Start(cfg.General.ExternalController, cfg.General.Secret)
}
executor.ApplyConfig(cfg)
executor.ApplyConfig(cfg, true)
return nil
}

View File

@ -2,6 +2,7 @@ package route
import (
"net/http"
"path/filepath"
"github.com/Dreamacro/clash/hub/executor"
"github.com/Dreamacro/clash/log"
@ -15,6 +16,7 @@ import (
func configRouter() http.Handler {
r := chi.NewRouter()
r.Get("/", getConfigs)
r.Put("/", updateConfigs)
r.Patch("/", patchConfigs)
return r
}
@ -68,3 +70,33 @@ func patchConfigs(w http.ResponseWriter, r *http.Request) {
w.WriteHeader(http.StatusNoContent)
}
type updateConfigRequest struct {
Path string `json:"path"`
}
func updateConfigs(w http.ResponseWriter, r *http.Request) {
req := updateConfigRequest{}
if err := render.DecodeJSON(r.Body, &req); err != nil {
w.WriteHeader(http.StatusBadRequest)
render.Respond(w, r, ErrBadRequest)
return
}
if !filepath.IsAbs(req.Path) {
w.WriteHeader(http.StatusBadRequest)
render.Respond(w, r, newError("path is not a absoluted path"))
return
}
force := r.URL.Query().Get("force") == "true"
cfg, err := executor.ParseWithPath(req.Path)
if err != nil {
w.WriteHeader(http.StatusBadRequest)
render.Respond(w, r, newError(err.Error()))
return
}
executor.ApplyConfig(cfg, force)
w.WriteHeader(http.StatusNoContent)
}

View File

@ -47,7 +47,7 @@ func Start(addr string, secret string) {
r.With(jsonContentType).Get("/logs", getLogs)
r.Mount("/configs", configRouter())
r.Mount("/proxies", proxyRouter())
// r.Mount("/rules", ruleRouter())
r.Mount("/rules", ruleRouter())
log.Infoln("RESTful API listening at: %s", addr)
err := http.ListenAndServe(addr, r)