Add selector outbound

experimental/clashapi/configs.go

@@ -18,24 +18,31 @@ func configRouter(logFactory log.Factory) http.Handler {
 }
 
 type configSchema struct {
-	Port        *int    `json:"port"`
-	SocksPort   *int    `json:"socks-port"`
-	RedirPort   *int    `json:"redir-port"`
-	TProxyPort  *int    `json:"tproxy-port"`
-	MixedPort   *int    `json:"mixed-port"`
-	AllowLan    *bool   `json:"allow-lan"`
-	BindAddress *string `json:"bind-address"`
-	Mode        string  `json:"mode"`
-	LogLevel    string  `json:"log-level"`
-	IPv6        *bool   `json:"ipv6"`
-	Tun         any     `json:"tun"`
+	Port        int            `json:"port"`
+	SocksPort   int            `json:"socks-port"`
+	RedirPort   int            `json:"redir-port"`
+	TProxyPort  int            `json:"tproxy-port"`
+	MixedPort   int            `json:"mixed-port"`
+	AllowLan    bool           `json:"allow-lan"`
+	BindAddress string         `json:"bind-address"`
+	Mode        string         `json:"mode"`
+	LogLevel    string         `json:"log-level"`
+	IPv6        bool           `json:"ipv6"`
+	Tun         map[string]any `json:"tun"`
 }
 
 func getConfigs(logFactory log.Factory) func(w http.ResponseWriter, r *http.Request) {
 	return func(w http.ResponseWriter, r *http.Request) {
+		logLevel := logFactory.Level()
+		if logLevel == log.LevelTrace {
+			logLevel = log.LevelDebug
+		} else if logLevel > log.LevelError {
+			logLevel = log.LevelError
+		}
 		render.JSON(w, r, &configSchema{
-			Mode:     "Rule",
-			LogLevel: log.FormatLevel(logFactory.Level()),
+			Mode:        "rule",
+			BindAddress: "*",
+			LogLevel:    log.FormatLevel(logLevel),
 		})
 	}
 }

experimental/clashapi/provider.go

@@ -4,13 +4,15 @@ import (
 	"context"
 	"net/http"
 
+	"github.com/sagernet/sing-box/adapter"
+
 	"github.com/go-chi/chi/v5"
 	"github.com/go-chi/render"
 )
 
-func proxyProviderRouter() http.Handler {
+func proxyProviderRouter(server *Server, router adapter.Router) http.Handler {
 	r := chi.NewRouter()
-	r.Get("/", getProviders)
+	r.Get("/", getProviders(server, router))
 
 	r.Route("/{name}", func(r chi.Router) {
 		r.Use(parseProviderName, findProviderByName)
@@ -21,10 +23,35 @@ func proxyProviderRouter() http.Handler {
 	return r
 }
 
-func getProviders(w http.ResponseWriter, r *http.Request) {
-	render.JSON(w, r, render.M{
-		"providers": []string{},
-	})
+func getProviders(server *Server, router adapter.Router) func(w http.ResponseWriter, r *http.Request) {
+	return func(w http.ResponseWriter, r *http.Request) {
+		var proxies []any
+		proxies = append(proxies, render.M{
+			"history": []*DelayHistory{},
+			"name":    "DIRECT",
+			"type":    "Direct",
+			"udp":     true,
+		})
+		proxies = append(proxies, render.M{
+			"history": []*DelayHistory{},
+			"name":    "REJECT",
+			"type":    "Reject",
+			"udp":     true,
+		})
+		for _, detour := range router.Outbounds() {
+			proxies = append(proxies, proxyInfo(server, detour))
+		}
+		render.JSON(w, r, render.M{
+			"providers": render.M{
+				"default": render.M{
+					"name":        "default",
+					"type":        "Proxy",
+					"proxies":     proxies,
+					"vehicleType": "Compatible",
+				},
+			},
+		})
+	}
 }
 
 func getProvider(w http.ResponseWriter, r *http.Request) {

experimental/clashapi/proxies.go

@@ -2,20 +2,33 @@ package clashapi
 
 import (
 	"context"
+	"fmt"
+	"net"
 	"net/http"
+	"net/url"
+	"strconv"
+	"time"
+
+	"github.com/sagernet/sing-box/adapter"
+	"github.com/sagernet/sing-box/common/badjson"
+	C "github.com/sagernet/sing-box/constant"
+	"github.com/sagernet/sing-box/outbound"
+	"github.com/sagernet/sing/common"
+	F "github.com/sagernet/sing/common/format"
+	M "github.com/sagernet/sing/common/metadata"
 
 	"github.com/go-chi/chi/v5"
 	"github.com/go-chi/render"
 )
 
-func proxyRouter() http.Handler {
+func proxyRouter(server *Server, router adapter.Router) http.Handler {
 	r := chi.NewRouter()
-	r.Get("/", getProxies)
+	r.Get("/", getProxies(server, router))
 
 	r.Route("/{name}", func(r chi.Router) {
-		r.Use(parseProxyName, findProxyByName)
-		r.Get("/", getProxy)
-		r.Get("/delay", getProxyDelay)
+		r.Use(parseProxyName, findProxyByName(router))
+		r.Get("/", getProxy(server))
+		r.Get("/delay", getProxyDelay(server))
 		r.Put("/", updateProxy)
 	})
 	return r
@@ -29,33 +42,123 @@ func parseProxyName(next http.Handler) http.Handler {
 	})
 }
 
-func findProxyByName(next http.Handler) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		/*name := r.Context().Value(CtxKeyProxyName).(string)
-		proxies := tunnel.Proxies()
-		proxy, exist := proxies[name]
-		if !exist {*/
-		render.Status(r, http.StatusNotFound)
-		render.JSON(w, r, ErrNotFound)
-		return
-		//}
-
-		// ctx := context.WithValue(r.Context(), CtxKeyProxy, proxy)
-		// next.ServeHTTP(w, r.WithContext(ctx))
-	})
+func findProxyByName(router adapter.Router) func(next http.Handler) http.Handler {
+	return func(next http.Handler) http.Handler {
+		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+			name := r.Context().Value(CtxKeyProxyName).(string)
+			proxy, exist := router.Outbound(name)
+			if !exist {
+				render.Status(r, http.StatusNotFound)
+				render.JSON(w, r, ErrNotFound)
+				return
+			}
+			ctx := context.WithValue(r.Context(), CtxKeyProxy, proxy)
+			next.ServeHTTP(w, r.WithContext(ctx))
+		})
+	}
 }
 
-func getProxies(w http.ResponseWriter, r *http.Request) {
-	// proxies := tunnel.Proxies()
-	render.JSON(w, r, render.M{
-		"proxies": []string{},
-	})
+func proxyInfo(server *Server, detour adapter.Outbound) *badjson.JSONObject {
+	var info badjson.JSONObject
+	var clashType string
+	var isSelector bool
+	switch detour.Type() {
+	case C.TypeDirect:
+		clashType = "Direct"
+	case C.TypeBlock:
+		clashType = "Reject"
+	case C.TypeSocks:
+		clashType = "Socks"
+	case C.TypeHTTP:
+		clashType = "Http"
+	case C.TypeShadowsocks:
+		clashType = "Shadowsocks"
+	case C.TypeVMess:
+		clashType = "Vmess"
+	case C.TypeSelector:
+		clashType = "Selector"
+		isSelector = true
+	default:
+		clashType = "Unknown"
+	}
+	info.Put("type", clashType)
+	info.Put("name", detour.Tag())
+	info.Put("udp", common.Contains(detour.Network(), C.NetworkUDP))
+
+	delayHistory, loaded := server.delayHistory[detour.Tag()]
+	if loaded {
+		info.Put("history", []*DelayHistory{delayHistory, delayHistory})
+	} else {
+		info.Put("history", []*DelayHistory{{Time: time.Now()}, {Time: time.Now()}})
+	}
+
+	if isSelector {
+		selector := detour.(*outbound.Selector)
+		info.Put("now", selector.Now())
+		info.Put("all", selector.All())
+	}
+	return &info
 }
 
-func getProxy(w http.ResponseWriter, r *http.Request) {
-	/*	proxy := r.Context().Value(CtxKeyProxy).(C.Proxy)
-		render.JSON(w, r, proxy)*/
-	render.Status(r, http.StatusServiceUnavailable)
+func getProxies(server *Server, router adapter.Router) func(w http.ResponseWriter, r *http.Request) {
+	return func(w http.ResponseWriter, r *http.Request) {
+		var proxyMap badjson.JSONObject
+
+		// fix clash dashboard
+		proxyMap.Put("DIRECT", map[string]any{
+			"type":    "Direct",
+			"name":    "DIRECT",
+			"udp":     true,
+			"history": []*DelayHistory{},
+		})
+		proxyMap.Put("GLOBAL", map[string]any{
+			"type":    "Selector",
+			"name":    "GLOBAL",
+			"udp":     true,
+			"history": []*DelayHistory{},
+			"all":     []string{},
+			"now":     "",
+		})
+		proxyMap.Put("REJECT", map[string]any{
+			"type":    "Reject",
+			"name":    "REJECT",
+			"udp":     true,
+			"history": []*DelayHistory{},
+		})
+
+		outbounds := router.Outbounds()
+		for i, detour := range outbounds {
+			var tag string
+			if detour.Tag() == "" {
+				tag = F.ToString(i)
+			} else {
+				tag = detour.Tag()
+			}
+			proxyMap.Put(tag, proxyInfo(server, detour))
+		}
+		var responseMap badjson.JSONObject
+		responseMap.Put("proxies", &proxyMap)
+		response, err := responseMap.MarshalJSON()
+		if err != nil {
+			render.Status(r, http.StatusInternalServerError)
+			render.JSON(w, r, newError(err.Error()))
+			return
+		}
+		w.Write(response)
+	}
+}
+
+func getProxy(server *Server) func(w http.ResponseWriter, r *http.Request) {
+	return func(w http.ResponseWriter, r *http.Request) {
+		proxy := r.Context().Value(CtxKeyProxy).(adapter.Outbound)
+		response, err := proxyInfo(server, proxy).MarshalJSON()
+		if err != nil {
+			render.Status(r, http.StatusInternalServerError)
+			render.JSON(w, r, newError(err.Error()))
+			return
+		}
+		w.Write(response)
+	}
 }
 
 type UpdateProxyRequest struct {
@@ -63,33 +166,33 @@ type UpdateProxyRequest struct {
 }
 
 func updateProxy(w http.ResponseWriter, r *http.Request) {
-	/*	req := UpdateProxyRequest{}
-		if err := render.DecodeJSON(r.Body, &req); err != nil {
-			render.Status(r, http.StatusBadRequest)
-			render.JSON(w, r, ErrBadRequest)
-			return
-		}
+	req := UpdateProxyRequest{}
+	if err := render.DecodeJSON(r.Body, &req); err != nil {
+		render.Status(r, http.StatusBadRequest)
+		render.JSON(w, r, ErrBadRequest)
+		return
+	}
 
-		proxy := r.Context().Value(CtxKeyProxy).(*adapter.Proxy)
-		selector, ok := proxy.ProxyAdapter.(*outboundgroup.Selector)
-		if !ok {
-			render.Status(r, http.StatusBadRequest)
-			render.JSON(w, r, newError("Must be a Selector"))
-			return
-		}
+	proxy := r.Context().Value(CtxKeyProxy).(adapter.Outbound)
+	selector, ok := proxy.(*outbound.Selector)
+	if !ok {
+		render.Status(r, http.StatusBadRequest)
+		render.JSON(w, r, newError("Must be a Selector"))
+		return
+	}
 
-		if err := selector.Set(req.Name); err != nil {
-			render.Status(r, http.StatusBadRequest)
-			render.JSON(w, r, newError(fmt.Sprintf("Selector update error: %s", err.Error())))
-			return
-		}
+	if !selector.SelectOutbound(req.Name) {
+		render.Status(r, http.StatusBadRequest)
+		render.JSON(w, r, newError(fmt.Sprintf("Selector update error: not found")))
+		return
+	}
 
-		cachefile.Cache().SetSelected(proxy.Name(), req.Name)*/
 	render.NoContent(w, r)
 }
 
-func getProxyDelay(w http.ResponseWriter, r *http.Request) {
-	/*	query := r.URL.Query()
+func getProxyDelay(server *Server) func(w http.ResponseWriter, r *http.Request) {
+	return func(w http.ResponseWriter, r *http.Request) {
+		query := r.URL.Query()
 		url := query.Get("url")
 		timeout, err := strconv.ParseInt(query.Get("timeout"), 10, 16)
 		if err != nil {
@@ -98,12 +201,11 @@ func getProxyDelay(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 
-		proxy := r.Context().Value(CtxKeyProxy).(C.Proxy)
-
+		proxy := r.Context().Value(CtxKeyProxy).(adapter.Outbound)
 		ctx, cancel := context.WithTimeout(context.Background(), time.Millisecond*time.Duration(timeout))
 		defer cancel()
 
-		delay, err := proxy.URLTest(ctx, url)
+		delay, err := URLTest(ctx, url, proxy)
 		if ctx.Err() != nil {
 			render.Status(r, http.StatusGatewayTimeout)
 			render.JSON(w, r, ErrRequestTimeout)
@@ -115,8 +217,71 @@ func getProxyDelay(w http.ResponseWriter, r *http.Request) {
 			render.JSON(w, r, newError("An error occurred in the delay test"))
 			return
 		}
-	*/
-	render.JSON(w, r, render.M{
-		"delay": 114514,
-	})
+
+		server.delayHistory[proxy.Tag()] = &DelayHistory{
+			Time:  time.Now(),
+			Delay: delay,
+		}
+
+		render.JSON(w, r, render.M{
+			"delay": delay,
+		})
+	}
+}
+
+func URLTest(ctx context.Context, link string, detour adapter.Outbound) (t uint16, err error) {
+	linkURL, err := url.Parse(link)
+	if err != nil {
+		return
+	}
+	hostname := linkURL.Hostname()
+	port := linkURL.Port()
+	if port == "" {
+		switch linkURL.Scheme {
+		case "http":
+			port = "80"
+		case "https":
+			port = "443"
+		}
+	}
+
+	start := time.Now()
+	instance, err := detour.DialContext(ctx, "tcp", M.ParseSocksaddrHostPortStr(hostname, port))
+	if err != nil {
+		return
+	}
+	defer instance.Close()
+
+	req, err := http.NewRequest(http.MethodHead, link, nil)
+	if err != nil {
+		return
+	}
+	req = req.WithContext(ctx)
+
+	transport := &http.Transport{
+		Dial: func(string, string) (net.Conn, error) {
+			return instance, nil
+		},
+		// from http.DefaultTransport
+		MaxIdleConns:          100,
+		IdleConnTimeout:       90 * time.Second,
+		TLSHandshakeTimeout:   10 * time.Second,
+		ExpectContinueTimeout: 1 * time.Second,
+	}
+
+	client := http.Client{
+		Transport: transport,
+		CheckRedirect: func(req *http.Request, via []*http.Request) error {
+			return http.ErrUseLastResponse
+		},
+	}
+	defer client.CloseIdleConnections()
+
+	resp, err := client.Do(req)
+	if err != nil {
+		return
+	}
+	resp.Body.Close()
+	t = uint16(time.Since(start) / time.Millisecond)
+	return
 }

experimental/clashapi/server.go

@@ -31,11 +31,26 @@ type Server struct {
 	logger         log.Logger
 	httpServer     *http.Server
 	trafficManager *trafficontroll.Manager
+	delayHistory   map[string]*DelayHistory
+}
+
+type DelayHistory struct {
+	Time  time.Time `json:"time"`
+	Delay uint16    `json:"delay"`
 }
 
 func NewServer(router adapter.Router, logFactory log.ObservableFactory, options option.ClashAPIOptions) *Server {
 	trafficManager := trafficontroll.NewManager()
 	chiRouter := chi.NewRouter()
+	server := &Server{
+		logFactory.NewLogger("clash-api"),
+		&http.Server{
+			Addr:    options.ExternalController,
+			Handler: chiRouter,
+		},
+		trafficManager,
+		make(map[string]*DelayHistory),
+	}
 	cors := cors.New(cors.Options{
 		AllowedOrigins: []string{"*"},
 		AllowedMethods: []string{"GET", "POST", "PUT", "PATCH", "DELETE"},
@@ -50,10 +65,10 @@ func NewServer(router adapter.Router, logFactory log.ObservableFactory, options
 		r.Get("/traffic", traffic(trafficManager))
 		r.Get("/version", version)
 		r.Mount("/configs", configRouter(logFactory))
-		r.Mount("/proxies", proxyRouter())
+		r.Mount("/proxies", proxyRouter(server, router))
 		r.Mount("/rules", ruleRouter(router))
 		r.Mount("/connections", connectionRouter(trafficManager))
-		r.Mount("/providers/proxies", proxyProviderRouter())
+		r.Mount("/providers/proxies", proxyProviderRouter(server, router))
 		r.Mount("/providers/rules", ruleProviderRouter())
 		r.Mount("/script", scriptRouter())
 		r.Mount("/profile", profileRouter())
@@ -68,14 +83,7 @@ func NewServer(router adapter.Router, logFactory log.ObservableFactory, options
 			})
 		})
 	}
-	return &Server{
-		logFactory.NewLogger("clash-api"),
-		&http.Server{
-			Addr:    options.ExternalController,
-			Handler: chiRouter,
-		},
-		trafficManager,
-	}
+	return server
 }
 
 func (s *Server) Start() error {