|
@@ -2,6 +2,7 @@ package clashapi
|
|
|
|
|
|
import (
|
|
import (
|
|
"net/http"
|
|
"net/http"
|
|
|
|
+ "strings"
|
|
|
|
|
|
"github.com/sagernet/sing-box/log"
|
|
"github.com/sagernet/sing-box/log"
|
|
|
|
|
|
@@ -9,11 +10,11 @@ import (
|
|
"github.com/go-chi/render"
|
|
"github.com/go-chi/render"
|
|
)
|
|
)
|
|
|
|
|
|
-func configRouter(logFactory log.Factory) http.Handler {
|
|
|
|
|
|
+func configRouter(server *Server, logFactory log.Factory, logger log.Logger) http.Handler {
|
|
r := chi.NewRouter()
|
|
r := chi.NewRouter()
|
|
- r.Get("/", getConfigs(logFactory))
|
|
|
|
|
|
+ r.Get("/", getConfigs(server, logFactory))
|
|
r.Put("/", updateConfigs)
|
|
r.Put("/", updateConfigs)
|
|
- r.Patch("/", patchConfigs)
|
|
|
|
|
|
+ r.Patch("/", patchConfigs(server, logger))
|
|
return r
|
|
return r
|
|
}
|
|
}
|
|
|
|
|
|
@@ -31,7 +32,7 @@ type configSchema struct {
|
|
Tun map[string]any `json:"tun"`
|
|
Tun map[string]any `json:"tun"`
|
|
}
|
|
}
|
|
|
|
|
|
-func getConfigs(logFactory log.Factory) func(w http.ResponseWriter, r *http.Request) {
|
|
|
|
|
|
+func getConfigs(server *Server, logFactory log.Factory) func(w http.ResponseWriter, r *http.Request) {
|
|
return func(w http.ResponseWriter, r *http.Request) {
|
|
return func(w http.ResponseWriter, r *http.Request) {
|
|
logLevel := logFactory.Level()
|
|
logLevel := logFactory.Level()
|
|
if logLevel == log.LevelTrace {
|
|
if logLevel == log.LevelTrace {
|
|
@@ -40,15 +41,31 @@ func getConfigs(logFactory log.Factory) func(w http.ResponseWriter, r *http.Requ
|
|
logLevel = log.LevelError
|
|
logLevel = log.LevelError
|
|
}
|
|
}
|
|
render.JSON(w, r, &configSchema{
|
|
render.JSON(w, r, &configSchema{
|
|
- Mode: "rule",
|
|
|
|
|
|
+ Mode: server.mode,
|
|
BindAddress: "*",
|
|
BindAddress: "*",
|
|
LogLevel: log.FormatLevel(logLevel),
|
|
LogLevel: log.FormatLevel(logLevel),
|
|
})
|
|
})
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
-func patchConfigs(w http.ResponseWriter, r *http.Request) {
|
|
|
|
- render.NoContent(w, r)
|
|
|
|
|
|
+func patchConfigs(server *Server, logger log.Logger) func(w http.ResponseWriter, r *http.Request) {
|
|
|
|
+ return func(w http.ResponseWriter, r *http.Request) {
|
|
|
|
+ var newConfig configSchema
|
|
|
|
+ err := render.DecodeJSON(r.Body, &newConfig)
|
|
|
|
+ if err != nil {
|
|
|
|
+ render.Status(r, http.StatusBadRequest)
|
|
|
|
+ render.JSON(w, r, ErrBadRequest)
|
|
|
|
+ return
|
|
|
|
+ }
|
|
|
|
+ if newConfig.Mode != "" {
|
|
|
|
+ mode := strings.ToLower(newConfig.Mode)
|
|
|
|
+ if server.mode != mode {
|
|
|
|
+ server.mode = mode
|
|
|
|
+ logger.Info("updated mode: ", mode)
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ render.NoContent(w, r)
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|
|
func updateConfigs(w http.ResponseWriter, r *http.Request) {
|
|
func updateConfigs(w http.ResponseWriter, r *http.Request) {
|