Feature: add inbounds for flexible binding inbound (#2818)

hub/route/configs.go

@@ -6,14 +6,15 @@ import (
 
 	"github.com/Dreamacro/clash/component/resolver"
 	"github.com/Dreamacro/clash/config"
-	"github.com/Dreamacro/clash/constant"
+	C "github.com/Dreamacro/clash/constant"
 	"github.com/Dreamacro/clash/hub/executor"
-	P "github.com/Dreamacro/clash/listener"
+	"github.com/Dreamacro/clash/listener"
 	"github.com/Dreamacro/clash/log"
 	"github.com/Dreamacro/clash/tunnel"
 
 	"github.com/go-chi/chi/v5"
 	"github.com/go-chi/render"
+	"github.com/samber/lo"
 )
 
 func configRouter() http.Handler {
@@ -29,14 +30,6 @@ func getConfigs(w http.ResponseWriter, r *http.Request) {
 	render.JSON(w, r, general)
 }
 
-func pointerOrDefault(p *int, def int) int {
-	if p != nil {
-		return *p
-	}
-
-	return def
-}
-
 func patchConfigs(w http.ResponseWriter, r *http.Request) {
 	general := struct {
 		Port        *int               `json:"port"`
@@ -56,25 +49,6 @@ func patchConfigs(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	if general.AllowLan != nil {
-		P.SetAllowLan(*general.AllowLan)
-	}
-
-	if general.BindAddress != nil {
-		P.SetBindAddress(*general.BindAddress)
-	}
-
-	ports := P.GetPorts()
-
-	tcpIn := tunnel.TCPIn()
-	udpIn := tunnel.UDPIn()
-
-	P.ReCreateHTTP(pointerOrDefault(general.Port, ports.Port), tcpIn)
-	P.ReCreateSocks(pointerOrDefault(general.SocksPort, ports.SocksPort), tcpIn, udpIn)
-	P.ReCreateRedir(pointerOrDefault(general.RedirPort, ports.RedirPort), tcpIn, udpIn)
-	P.ReCreateTProxy(pointerOrDefault(general.TProxyPort, ports.TProxyPort), tcpIn, udpIn)
-	P.ReCreateMixed(pointerOrDefault(general.MixedPort, ports.MixedPort), tcpIn, udpIn)
-
 	if general.Mode != nil {
 		tunnel.SetMode(*general.Mode)
 	}
@@ -87,6 +61,23 @@ func patchConfigs(w http.ResponseWriter, r *http.Request) {
 		resolver.DisableIPv6 = !*general.IPv6
 	}
 
+	if general.AllowLan != nil {
+		listener.SetAllowLan(*general.AllowLan)
+	}
+
+	if general.BindAddress != nil {
+		listener.SetBindAddress(*general.BindAddress)
+	}
+
+	ports := listener.GetPorts()
+	ports.Port = lo.FromPtrOr(general.Port, ports.Port)
+	ports.SocksPort = lo.FromPtrOr(general.SocksPort, ports.SocksPort)
+	ports.RedirPort = lo.FromPtrOr(general.RedirPort, ports.RedirPort)
+	ports.TProxyPort = lo.FromPtrOr(general.TProxyPort, ports.TProxyPort)
+	ports.MixedPort = lo.FromPtrOr(general.MixedPort, ports.MixedPort)
+
+	listener.ReCreatePortsListeners(*ports, tunnel.TCPIn(), tunnel.UDPIn())
+
 	render.NoContent(w, r)
 }
 
@@ -114,7 +105,7 @@ func updateConfigs(w http.ResponseWriter, r *http.Request) {
 		}
 	} else {
 		if req.Path == "" {
-			req.Path = constant.Path.Config()
+			req.Path = C.Path.Config()
 		}
 		if !filepath.IsAbs(req.Path) {
 			render.Status(r, http.StatusBadRequest)

hub/route/inbounds.go

@@ -0,0 +1,39 @@
+package route
+
+import (
+	"net/http"
+
+	C "github.com/Dreamacro/clash/constant"
+	"github.com/Dreamacro/clash/listener"
+	"github.com/Dreamacro/clash/tunnel"
+
+	"github.com/go-chi/chi/v5"
+	"github.com/go-chi/render"
+)
+
+func inboundRouter() http.Handler {
+	r := chi.NewRouter()
+	r.Get("/", getInbounds)
+	r.Put("/", updateInbounds)
+	return r
+}
+
+func getInbounds(w http.ResponseWriter, r *http.Request) {
+	inbounds := listener.GetInbounds()
+	render.JSON(w, r, render.M{
+		"inbounds": inbounds,
+	})
+}
+
+func updateInbounds(w http.ResponseWriter, r *http.Request) {
+	var req []C.Inbound
+	if err := render.DecodeJSON(r.Body, &req); err != nil {
+		render.Status(r, http.StatusBadRequest)
+		render.JSON(w, r, ErrBadRequest)
+		return
+	}
+	tcpIn := tunnel.TCPIn()
+	udpIn := tunnel.UDPIn()
+	listener.ReCreateListeners(req, tcpIn, udpIn)
+	render.NoContent(w, r)
+}

hub/route/server.go

@@ -69,6 +69,7 @@ func Start(addr string, secret string) {
 		r.Get("/traffic", traffic)
 		r.Get("/version", version)
 		r.Mount("/configs", configRouter())
+		r.Mount("/inbounds", inboundRouter())
 		r.Mount("/proxies", proxyRouter())
 		r.Mount("/rules", ruleRouter())
 		r.Mount("/connections", connectionRouter())