Merge pull request #5350 from fatedier/dev

Release v0.69.1

pkg/plugin/client/tls2raw.go

@@ -72,15 +72,6 @@ func (p *TLS2RawPlugin) Handle(ctx context.Context, connInfo *ConnectionInfo) {
 		return
 	}
 
-	if connInfo.ProxyProtocolHeader != nil {
-		if _, err := connInfo.ProxyProtocolHeader.WriteTo(rawConn); err != nil {
-			xl.Warnf("tls2raw write proxy protocol header to local conn error: %v", err)
-			rawConn.Close()
-			tlsConn.Close()
-			return
-		}
-	}
-
 	libio.Join(tlsConn, rawConn)
 }
 

pkg/util/http/handler.go

@@ -26,12 +26,6 @@ type GeneralResponse struct {
 	Msg  string
 }
 
-type V2Response struct {
-	Code int    `json:"code"`
-	Msg  string `json:"msg"`
-	Data any    `json:"data"`
-}
-
 // APIHandler is a handler function that returns a response object or an error.
 type APIHandler func(ctx *Context) (any, error)
 
@@ -70,27 +64,3 @@ func MakeHTTPHandlerFunc(handler APIHandler) http.HandlerFunc {
 		}
 	}
 }
-
-// MakeHTTPHandlerFuncV2 wraps a handler response in the dashboard API v2 envelope.
-func MakeHTTPHandlerFuncV2(handler APIHandler) http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
-		ctx := NewContext(w, r)
-		res, err := handler(ctx)
-		if err != nil {
-			log.Warnf("http response [%s]: error: %v", r.URL.Path, err)
-			code := http.StatusInternalServerError
-			if e, ok := err.(*Error); ok {
-				code = e.Code
-			}
-
-			w.Header().Set("Content-Type", "application/json")
-			w.WriteHeader(code)
-			_ = json.NewEncoder(w).Encode(V2Response{Code: code, Msg: err.Error(), Data: nil})
-			return
-		}
-
-		w.Header().Set("Content-Type", "application/json")
-		w.WriteHeader(http.StatusOK)
-		_ = json.NewEncoder(w).Encode(V2Response{Code: http.StatusOK, Msg: "success", Data: res})
-	}
-}

pkg/util/net/dial.go

@@ -45,11 +45,6 @@ func DialHookWebsocket(protocol string, host string) libnet.AfterHookFunc {
 		if err != nil {
 			return nil, nil, err
 		}
-		// The tunnel payload is a raw byte stream (yamux), not UTF-8 text.
-		// Send it as binary frames; otherwise RFC 6455-compliant intermediaries
-		// (e.g. API gateways/reverse proxies) UTF-8-validate the default text
-		// frames and close the connection on invalid bytes.
-		conn.PayloadType = websocket.BinaryFrame
 		return ctx, conn, nil
 	}
 }

pkg/util/net/websocket.go

@@ -32,11 +32,6 @@ func NewWebsocketListener(ln net.Listener) (wl *WebsocketListener) {
 
 	muxer := http.NewServeMux()
 	muxer.Handle(FrpWebsocketPath, websocket.Handler(func(c *websocket.Conn) {
-		// The tunnel payload is a raw byte stream (yamux), not UTF-8 text.
-		// Send it as binary frames; otherwise RFC 6455-compliant intermediaries
-		// (e.g. API gateways/reverse proxies) UTF-8-validate the default text
-		// frames and close the connection on invalid bytes.
-		c.PayloadType = websocket.BinaryFrame
 		notifyCh := make(chan struct{})
 		conn := WrapCloseNotifyConn(c, func(_ error) {
 			close(notifyCh)

server/api_router.go

@@ -48,12 +48,6 @@ func (svr *Service) registerRouteHandlers(helper *httppkg.RouterRegisterHelper)
 	subRouter.HandleFunc("/api/clients/{key}", httppkg.MakeHTTPHandlerFunc(apiController.APIClientDetail)).Methods("GET")
 	subRouter.HandleFunc("/api/proxies", httppkg.MakeHTTPHandlerFunc(apiController.DeleteProxies)).Methods("DELETE")
 
-	subRouter.HandleFunc("/api/v2/users", httppkg.MakeHTTPHandlerFuncV2(apiController.APIV2UserList)).Methods("GET")
-	subRouter.HandleFunc("/api/v2/clients", httppkg.MakeHTTPHandlerFuncV2(apiController.APIV2ClientList)).Methods("GET")
-	subRouter.HandleFunc("/api/v2/clients/{key}", httppkg.MakeHTTPHandlerFuncV2(apiController.APIV2ClientDetail)).Methods("GET")
-	subRouter.HandleFunc("/api/v2/proxies", httppkg.MakeHTTPHandlerFuncV2(apiController.APIV2ProxyList)).Methods("GET")
-	subRouter.HandleFunc("/api/v2/proxies/{name}", httppkg.MakeHTTPHandlerFuncV2(apiController.APIV2ProxyDetail)).Methods("GET")
-
 	// view
 	subRouter.Handle("/favicon.ico", http.FileServer(helper.AssetsFS)).Methods("GET")
 	subRouter.PathPrefix("/static/").Handler(

server/http/controller_v2.go

@@ -1,394 +0,0 @@
-// Copyright 2026 The frp Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package http
-
-import (
-	"cmp"
-	"fmt"
-	"math"
-	"net/http"
-	"slices"
-	"strconv"
-	"strings"
-
-	v1 "github.com/fatedier/frp/pkg/config/v1"
-	"github.com/fatedier/frp/pkg/metrics/mem"
-	httppkg "github.com/fatedier/frp/pkg/util/http"
-	"github.com/fatedier/frp/server/http/model"
-)
-
-const (
-	defaultV2Page     = 1
-	defaultV2PageSize = 50
-	maxV2PageSize     = 200
-)
-
-var apiV2ProxyTypes = []string{
-	string(v1.ProxyTypeTCP),
-	string(v1.ProxyTypeUDP),
-	string(v1.ProxyTypeHTTP),
-	string(v1.ProxyTypeHTTPS),
-	string(v1.ProxyTypeTCPMUX),
-	string(v1.ProxyTypeSTCP),
-	string(v1.ProxyTypeXTCP),
-	string(v1.ProxyTypeSUDP),
-}
-
-// /api/v2/users
-func (c *Controller) APIV2UserList(ctx *httppkg.Context) (any, error) {
-	page, pageSize, err := parseV2PageParams(ctx)
-	if err != nil {
-		return nil, err
-	}
-	if c.clientRegistry == nil {
-		return nil, fmt.Errorf("client registry unavailable")
-	}
-
-	userStats := make(map[string]*model.V2UserResp)
-	for _, info := range c.clientRegistry.List() {
-		item := getOrCreateV2User(userStats, info.User)
-		item.ClientCount++
-	}
-	for _, proxyInfo := range c.listV2ProxyStats("") {
-		item := getOrCreateV2User(userStats, proxyInfo.User)
-		item.ProxyCount++
-	}
-
-	q := strings.ToLower(ctx.Query("q"))
-	items := make([]model.V2UserResp, 0, len(userStats))
-	for _, item := range userStats {
-		if q != "" && !strings.Contains(strings.ToLower(item.User), q) {
-			continue
-		}
-		items = append(items, *item)
-	}
-	slices.SortFunc(items, func(a, b model.V2UserResp) int {
-		return cmp.Compare(a.User, b.User)
-	})
-
-	return buildV2PageResp(items, page, pageSize), nil
-}
-
-// /api/v2/clients
-func (c *Controller) APIV2ClientList(ctx *httppkg.Context) (any, error) {
-	page, pageSize, err := parseV2PageParams(ctx)
-	if err != nil {
-		return nil, err
-	}
-	if c.clientRegistry == nil {
-		return nil, fmt.Errorf("client registry unavailable")
-	}
-	statusFilter, err := parseV2StatusFilter(ctx.Query("status"))
-	if err != nil {
-		return nil, err
-	}
-
-	userFilter, filterByUser := queryValue(ctx, "user")
-	clientIDFilter := ctx.Query("clientID")
-	runIDFilter := ctx.Query("runID")
-	q := strings.ToLower(ctx.Query("q"))
-
-	records := c.clientRegistry.List()
-	items := make([]model.ClientInfoResp, 0, len(records))
-	for _, info := range records {
-		if filterByUser && info.User != userFilter {
-			continue
-		}
-		if clientIDFilter != "" && info.ClientID() != clientIDFilter {
-			continue
-		}
-		if runIDFilter != "" && info.RunID != runIDFilter {
-			continue
-		}
-		if !matchV2StatusFilter(info.Online, statusFilter) {
-			continue
-		}
-		resp := buildClientInfoResp(info)
-		if q != "" && !matchV2ClientQuery(resp, q) {
-			continue
-		}
-		items = append(items, resp)
-	}
-
-	slices.SortFunc(items, func(a, b model.ClientInfoResp) int {
-		if v := cmp.Compare(a.User, b.User); v != 0 {
-			return v
-		}
-		if v := cmp.Compare(a.ClientID, b.ClientID); v != 0 {
-			return v
-		}
-		return cmp.Compare(a.Key, b.Key)
-	})
-
-	return buildV2PageResp(items, page, pageSize), nil
-}
-
-// /api/v2/clients/{key}
-func (c *Controller) APIV2ClientDetail(ctx *httppkg.Context) (any, error) {
-	return c.APIClientDetail(ctx)
-}
-
-// /api/v2/proxies
-func (c *Controller) APIV2ProxyList(ctx *httppkg.Context) (any, error) {
-	page, pageSize, err := parseV2PageParams(ctx)
-	if err != nil {
-		return nil, err
-	}
-	statusFilter, err := parseV2StatusFilter(ctx.Query("status"))
-	if err != nil {
-		return nil, err
-	}
-
-	proxyType, err := parseV2ProxyTypeFilter(ctx.Query("type"))
-	if err != nil {
-		return nil, err
-	}
-	userFilter, filterByUser := queryValue(ctx, "user")
-	clientIDFilter := ctx.Query("clientID")
-	q := strings.ToLower(ctx.Query("q"))
-
-	stats := c.listV2ProxyStats(proxyType)
-	items := make([]model.V2ProxyResp, 0, len(stats))
-	for _, ps := range stats {
-		resp := c.buildV2ProxyResp(ps)
-		if filterByUser && resp.User != userFilter {
-			continue
-		}
-		if clientIDFilter != "" && resp.ClientID != clientIDFilter {
-			continue
-		}
-		if !matchV2StatusFilter(resp.Status.State == "online", statusFilter) {
-			continue
-		}
-		if q != "" && !matchV2ProxyQuery(resp, q) {
-			continue
-		}
-		items = append(items, resp)
-	}
-
-	slices.SortFunc(items, func(a, b model.V2ProxyResp) int {
-		if v := cmp.Compare(a.Type, b.Type); v != 0 {
-			return v
-		}
-		return cmp.Compare(a.Name, b.Name)
-	})
-
-	return buildV2PageResp(items, page, pageSize), nil
-}
-
-// /api/v2/proxies/{name}
-func (c *Controller) APIV2ProxyDetail(ctx *httppkg.Context) (any, error) {
-	name := ctx.Param("name")
-	if name == "" {
-		return nil, fmt.Errorf("missing proxy name")
-	}
-
-	ps := mem.StatsCollector.GetProxyByName(name)
-	if ps == nil {
-		return nil, httppkg.NewError(http.StatusNotFound, "no proxy info found")
-	}
-	return c.buildV2ProxyResp(ps), nil
-}
-
-func getOrCreateV2User(items map[string]*model.V2UserResp, user string) *model.V2UserResp {
-	item, ok := items[user]
-	if !ok {
-		item = &model.V2UserResp{User: user}
-		items[user] = item
-	}
-	return item
-}
-
-func parseV2PageParams(ctx *httppkg.Context) (int, int, error) {
-	page, err := parseV2PositiveInt(ctx.Query("page"), defaultV2Page, "page")
-	if err != nil {
-		return 0, 0, err
-	}
-	pageSize, err := parseV2PositiveInt(ctx.Query("pageSize"), defaultV2PageSize, "pageSize")
-	if err != nil {
-		return 0, 0, err
-	}
-	if pageSize > maxV2PageSize {
-		return 0, 0, httppkg.NewError(http.StatusBadRequest, fmt.Sprintf("pageSize must be between 1 and %d", maxV2PageSize))
-	}
-	if page > math.MaxInt/pageSize {
-		return 0, 0, httppkg.NewError(http.StatusBadRequest, "page is too large")
-	}
-	return page, pageSize, nil
-}
-
-func parseV2PositiveInt(raw string, defaultValue int, name string) (int, error) {
-	if raw == "" {
-		return defaultValue, nil
-	}
-	value, err := strconv.Atoi(raw)
-	if err != nil || value < 1 {
-		return 0, httppkg.NewError(http.StatusBadRequest, fmt.Sprintf("%s must be a positive integer", name))
-	}
-	return value, nil
-}
-
-func parseV2StatusFilter(raw string) (string, error) {
-	status := strings.ToLower(raw)
-	switch status {
-	case "", "all", "online", "offline":
-		return status, nil
-	default:
-		return "", httppkg.NewError(http.StatusBadRequest, "status must be one of all, online, offline")
-	}
-}
-
-func parseV2ProxyTypeFilter(raw string) (string, error) {
-	proxyType := strings.ToLower(raw)
-	if proxyType == "" {
-		return "", nil
-	}
-	if slices.Contains(apiV2ProxyTypes, proxyType) {
-		return proxyType, nil
-	}
-	return "", httppkg.NewError(http.StatusBadRequest, "type must be one of tcp, udp, http, https, tcpmux, stcp, xtcp, sudp")
-}
-
-func matchV2StatusFilter(online bool, filter string) bool {
-	switch filter {
-	case "", "all":
-		return true
-	case "online":
-		return online
-	case "offline":
-		return !online
-	default:
-		return true
-	}
-}
-
-func buildV2PageResp[T any](items []T, page, pageSize int) model.V2PageResp[T] {
-	total := len(items)
-	return model.V2PageResp[T]{
-		Total:    total,
-		Page:     page,
-		PageSize: pageSize,
-		Items:    paginateV2Items(items, page, pageSize),
-	}
-}
-
-func paginateV2Items[T any](items []T, page, pageSize int) []T {
-	start := (page - 1) * pageSize
-	if start >= len(items) {
-		return []T{}
-	}
-	end := min(start+pageSize, len(items))
-	return items[start:end]
-}
-
-func queryValue(ctx *httppkg.Context, key string) (string, bool) {
-	values, ok := ctx.Req.URL.Query()[key]
-	if !ok {
-		return "", false
-	}
-	if len(values) == 0 {
-		return "", true
-	}
-	return values[0], true
-}
-
-func matchV2ClientQuery(item model.ClientInfoResp, q string) bool {
-	return containsV2Query(q,
-		item.Key,
-		item.User,
-		item.ClientID,
-		item.RunID,
-		item.Version,
-		item.WireProtocol,
-		item.Hostname,
-		item.ClientIP,
-	)
-}
-
-func matchV2ProxyQuery(item model.V2ProxyResp, q string) bool {
-	values := []string{
-		item.Name,
-		item.Type,
-		item.User,
-		item.ClientID,
-		item.Status.State,
-	}
-
-	switch spec := item.Spec.(type) {
-	case *model.TCPOutConf:
-		values = append(values, strconv.Itoa(spec.RemotePort))
-	case *model.UDPOutConf:
-		values = append(values, strconv.Itoa(spec.RemotePort))
-	case *model.HTTPOutConf:
-		values = append(values, spec.CustomDomains...)
-		values = append(values, spec.SubDomain)
-	case *model.HTTPSOutConf:
-		values = append(values, spec.CustomDomains...)
-		values = append(values, spec.SubDomain)
-	case *model.TCPMuxOutConf:
-		values = append(values, spec.CustomDomains...)
-		values = append(values, spec.SubDomain)
-	}
-
-	return containsV2Query(q, values...)
-}
-
-func containsV2Query(q string, values ...string) bool {
-	for _, value := range values {
-		if strings.Contains(strings.ToLower(value), q) {
-			return true
-		}
-	}
-	return false
-}
-
-func (c *Controller) listV2ProxyStats(proxyType string) []*mem.ProxyStats {
-	if proxyType != "" {
-		return mem.StatsCollector.GetProxiesByType(proxyType)
-	}
-
-	items := make([]*mem.ProxyStats, 0)
-	for _, t := range apiV2ProxyTypes {
-		items = append(items, mem.StatsCollector.GetProxiesByType(t)...)
-	}
-	return items
-}
-
-func (c *Controller) buildV2ProxyResp(ps *mem.ProxyStats) model.V2ProxyResp {
-	state := "offline"
-	var spec any
-	if c.pxyManager != nil {
-		if pxy, ok := c.pxyManager.GetByName(ps.Name); ok {
-			state = "online"
-			spec = getConfFromConfigurer(pxy.GetConfigurer())
-		}
-	}
-
-	return model.V2ProxyResp{
-		Name:     ps.Name,
-		Type:     ps.Type,
-		User:     ps.User,
-		ClientID: ps.ClientID,
-		Spec:     spec,
-		Status: model.V2ProxyStatusResp{
-			State:           state,
-			TodayTrafficIn:  ps.TodayTrafficIn,
-			TodayTrafficOut: ps.TodayTrafficOut,
-			CurConns:        ps.CurConns,
-			LastStartTime:   ps.LastStartTime,
-			LastCloseTime:   ps.LastCloseTime,
-		},
-	}
-}

server/http/controller_v2_test.go

@@ -1,374 +0,0 @@
-// Copyright 2026 The frp Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package http
-
-import (
-	"encoding/json"
-	"fmt"
-	"math"
-	"net/http"
-	"net/http/httptest"
-	"testing"
-
-	"github.com/gorilla/mux"
-
-	v1 "github.com/fatedier/frp/pkg/config/v1"
-	"github.com/fatedier/frp/pkg/metrics/mem"
-	httppkg "github.com/fatedier/frp/pkg/util/http"
-	"github.com/fatedier/frp/server/http/model"
-	serverproxy "github.com/fatedier/frp/server/proxy"
-	"github.com/fatedier/frp/server/registry"
-)
-
-type v2EnvelopeForTest[T any] struct {
-	Code int    `json:"code"`
-	Msg  string `json:"msg"`
-	Data T      `json:"data"`
-}
-
-type fakeStatsCollector struct {
-	proxies map[string]*mem.ProxyStats
-}
-
-func (f *fakeStatsCollector) GetServer() *mem.ServerStats {
-	return &mem.ServerStats{ProxyTypeCounts: map[string]int64{}}
-}
-
-func (f *fakeStatsCollector) GetProxiesByType(proxyType string) []*mem.ProxyStats {
-	items := make([]*mem.ProxyStats, 0)
-	for _, ps := range f.proxies {
-		if ps.Type == proxyType {
-			items = append(items, ps)
-		}
-	}
-	return items
-}
-
-func (f *fakeStatsCollector) GetProxiesByTypeAndName(proxyType string, proxyName string) *mem.ProxyStats {
-	ps := f.proxies[proxyName]
-	if ps != nil && ps.Type == proxyType {
-		return ps
-	}
-	return nil
-}
-
-func (f *fakeStatsCollector) GetProxyByName(proxyName string) *mem.ProxyStats {
-	return f.proxies[proxyName]
-}
-
-func (f *fakeStatsCollector) GetProxyTraffic(name string) *mem.ProxyTrafficInfo {
-	return nil
-}
-
-func (f *fakeStatsCollector) ClearOfflineProxies() (int, int) {
-	return 0, len(f.proxies)
-}
-
-func TestAPIV2ClientListEnvelopePaginationAndFilters(t *testing.T) {
-	controller := newV2TestController(t)
-	router := newV2TestRouter(controller)
-
-	resp := performRequest(router, "/api/v2/clients?page=1&pageSize=1")
-	if resp.Code != http.StatusOK {
-		t.Fatalf("status mismatch, want %d got %d", http.StatusOK, resp.Code)
-	}
-	pageResp := decodeResponse[v2EnvelopeForTest[model.V2PageResp[model.ClientInfoResp]]](t, resp)
-	if pageResp.Code != http.StatusOK || pageResp.Msg != "success" {
-		t.Fatalf("envelope mismatch: %#v", pageResp)
-	}
-	if pageResp.Data.Total != 3 || pageResp.Data.Page != 1 || pageResp.Data.PageSize != 1 || len(pageResp.Data.Items) != 1 {
-		t.Fatalf("page data mismatch: %#v", pageResp.Data)
-	}
-	if got := pageResp.Data.Items[0].User; got != "" {
-		t.Fatalf("first sorted user mismatch, want empty got %q", got)
-	}
-
-	resp = performRequest(router, "/api/v2/clients?user=&page=1&pageSize=50")
-	emptyUserResp := decodeResponse[v2EnvelopeForTest[model.V2PageResp[model.ClientInfoResp]]](t, resp)
-	if emptyUserResp.Data.Total != 1 || emptyUserResp.Data.Items[0].User != "" {
-		t.Fatalf("empty user filter mismatch: %#v", emptyUserResp.Data)
-	}
-
-	resp = performRequest(router, "/api/v2/clients?user=alice&status=online&q=alice-host")
-	aliceResp := decodeResponse[v2EnvelopeForTest[model.V2PageResp[model.ClientInfoResp]]](t, resp)
-	if aliceResp.Data.Total != 1 || aliceResp.Data.Items[0].User != "alice" {
-		t.Fatalf("alice filter mismatch: %#v", aliceResp.Data)
-	}
-
-	resp = performRequest(router, "/api/v2/clients?status=offline")
-	offlineResp := decodeResponse[v2EnvelopeForTest[model.V2PageResp[model.ClientInfoResp]]](t, resp)
-	if offlineResp.Data.Total != 1 || offlineResp.Data.Items[0].User != "bob" {
-		t.Fatalf("offline filter mismatch: %#v", offlineResp.Data)
-	}
-}
-
-func TestAPIV2PageParamErrorsUseEnvelope(t *testing.T) {
-	controller := newV2TestController(t)
-	router := newV2TestRouter(controller)
-
-	resp := performRequest(router, "/api/v2/clients?page=0")
-	if resp.Code != http.StatusBadRequest {
-		t.Fatalf("status mismatch, want %d got %d", http.StatusBadRequest, resp.Code)
-	}
-	errResp := decodeResponse[httppkg.V2Response](t, resp)
-	if errResp.Code != http.StatusBadRequest || errResp.Data != nil {
-		t.Fatalf("error envelope mismatch: %#v", errResp)
-	}
-
-	resp = performRequest(router, "/api/v2/clients?pageSize=201")
-	if resp.Code != http.StatusBadRequest {
-		t.Fatalf("status mismatch, want %d got %d", http.StatusBadRequest, resp.Code)
-	}
-
-	resp = performRequest(router, fmt.Sprintf("/api/v2/clients?page=%d&pageSize=2", math.MaxInt))
-	if resp.Code != http.StatusBadRequest {
-		t.Fatalf("status mismatch for overflowing page offset, want %d got %d", http.StatusBadRequest, resp.Code)
-	}
-}
-
-func TestAPIV2ClientDetailEnvelope(t *testing.T) {
-	controller := newV2TestController(t)
-	router := newV2TestRouter(controller)
-
-	resp := performRequest(router, "/api/v2/clients/alice.client-a")
-	if resp.Code != http.StatusOK {
-		t.Fatalf("status mismatch, want %d got %d", http.StatusOK, resp.Code)
-	}
-	detailResp := decodeResponse[v2EnvelopeForTest[model.ClientInfoResp]](t, resp)
-	if detailResp.Data.User != "alice" || detailResp.Data.ClientID != "client-a" {
-		t.Fatalf("client detail mismatch: %#v", detailResp.Data)
-	}
-}
-
-func TestAPIV2ProxyListDetailAndUsers(t *testing.T) {
-	controller := newV2TestController(t)
-	router := newV2TestRouter(controller)
-
-	resp := performRequest(router, "/api/v2/proxies?type=invalid")
-	if resp.Code != http.StatusBadRequest {
-		t.Fatalf("invalid proxy type status mismatch, want %d got %d", http.StatusBadRequest, resp.Code)
-	}
-	errResp := decodeResponse[httppkg.V2Response](t, resp)
-	if errResp.Code != http.StatusBadRequest || errResp.Data != nil {
-		t.Fatalf("invalid proxy type error envelope mismatch: %#v", errResp)
-	}
-
-	resp = performRequest(router, "/api/v2/proxies?type=tcp&user=&page=1&pageSize=50")
-	proxyResp := decodeResponse[v2EnvelopeForTest[model.V2PageResp[model.V2ProxyResp]]](t, resp)
-	if proxyResp.Data.Total != 1 {
-		t.Fatalf("proxy filter total mismatch: %#v", proxyResp.Data)
-	}
-	proxyItem := proxyResp.Data.Items[0]
-	if proxyItem.Name != "tcp-empty" || proxyItem.Type != "tcp" || proxyItem.User != "" || proxyItem.Status.State != "offline" {
-		t.Fatalf("proxy item mismatch: %#v", proxyItem)
-	}
-
-	resp = performRequest(router, "/api/v2/proxies/tcp-alice")
-	proxyDetailResp := decodeResponse[v2EnvelopeForTest[model.V2ProxyResp]](t, resp)
-	if proxyDetailResp.Data.Name != "tcp-alice" || proxyDetailResp.Data.User != "alice" {
-		t.Fatalf("proxy detail mismatch: %#v", proxyDetailResp.Data)
-	}
-
-	resp = performRequest(router, "/api/v2/users?page=1&pageSize=50")
-	userResp := decodeResponse[v2EnvelopeForTest[model.V2PageResp[model.V2UserResp]]](t, resp)
-	if userResp.Data.Total != 3 {
-		t.Fatalf("user total mismatch: %#v", userResp.Data)
-	}
-	for _, item := range userResp.Data.Items {
-		if item.ClientCount != 1 || item.ProxyCount != 1 {
-			t.Fatalf("user counts mismatch: %#v", item)
-		}
-	}
-}
-
-func TestMatchV2ProxyQueryMatchesSpecFields(t *testing.T) {
-	tests := []struct {
-		name string
-		item model.V2ProxyResp
-		q    string
-		want bool
-	}{
-		{
-			name: "tcp remote port",
-			item: model.V2ProxyResp{Name: "tcp-proxy", Type: "tcp", Spec: &model.TCPOutConf{
-				RemotePort: 6000,
-			}},
-			q:    "6000",
-			want: true,
-		},
-		{
-			name: "udp remote port",
-			item: model.V2ProxyResp{Name: "udp-proxy", Type: "udp", Spec: &model.UDPOutConf{
-				RemotePort: 7000,
-			}},
-			q:    "7000",
-			want: true,
-		},
-		{
-			name: "remote port does not match colon form",
-			item: model.V2ProxyResp{Name: "tcp-proxy", Type: "tcp", Spec: &model.TCPOutConf{
-				RemotePort: 6000,
-			}},
-			q:    ":6000",
-			want: false,
-		},
-		{
-			name: "http custom domain",
-			item: model.V2ProxyResp{Name: "http-proxy", Type: "http", Spec: &model.HTTPOutConf{
-				DomainConfig: v1.DomainConfig{CustomDomains: []string{"app.example.com"}},
-			}},
-			q:    "app.example.com",
-			want: true,
-		},
-		{
-			name: "https subdomain",
-			item: model.V2ProxyResp{Name: "https-proxy", Type: "https", Spec: &model.HTTPSOutConf{
-				DomainConfig: v1.DomainConfig{SubDomain: "portal"},
-			}},
-			q:    "portal",
-			want: true,
-		},
-		{
-			name: "subdomain does not match expanded host",
-			item: model.V2ProxyResp{Name: "https-proxy", Type: "https", Spec: &model.HTTPSOutConf{
-				DomainConfig: v1.DomainConfig{SubDomain: "portal"},
-			}},
-			q:    "portal.example.com",
-			want: false,
-		},
-		{
-			name: "tcpmux custom domain",
-			item: model.V2ProxyResp{Name: "tcpmux-proxy", Type: "tcpmux", Spec: &model.TCPMuxOutConf{
-				DomainConfig: v1.DomainConfig{CustomDomains: []string{"mux.example.com"}},
-			}},
-			q:    "mux.example.com",
-			want: true,
-		},
-		{
-			name: "nil spec does not match spec fields",
-			item: model.V2ProxyResp{Name: "offline-proxy", Type: "tcp", Spec: nil},
-			q:    "6000",
-			want: false,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			if got := matchV2ProxyQuery(tt.item, tt.q); got != tt.want {
-				t.Fatalf("matchV2ProxyQuery() = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}
-
-func TestLegacyAPIResponsesRemainBare(t *testing.T) {
-	controller := newV2TestController(t)
-	router := newV2TestRouter(controller)
-
-	resp := performRequest(router, "/api/clients")
-	var clients []model.ClientInfoResp
-	if err := json.Unmarshal(resp.Body.Bytes(), &clients); err != nil {
-		t.Fatalf("legacy clients should be a bare array: %v, body: %s", err, resp.Body.String())
-	}
-	if len(clients) != 3 {
-		t.Fatalf("legacy clients total mismatch, want 3 got %d", len(clients))
-	}
-
-	resp = performRequest(router, "/api/proxy/tcp")
-	var proxies model.GetProxyInfoResp
-	if err := json.Unmarshal(resp.Body.Bytes(), &proxies); err != nil {
-		t.Fatalf("legacy proxy response should be {proxies}: %v, body: %s", err, resp.Body.String())
-	}
-	if len(proxies.Proxies) != 2 {
-		t.Fatalf("legacy tcp proxy total mismatch, want 2 got %d", len(proxies.Proxies))
-	}
-	var envelope httppkg.V2Response
-	if err := json.Unmarshal(resp.Body.Bytes(), &envelope); err == nil && envelope.Code != 0 {
-		t.Fatalf("legacy proxy response should not use v2 envelope: %#v", envelope)
-	}
-}
-
-func newV2TestController(t *testing.T) *Controller {
-	t.Helper()
-
-	oldStatsCollector := mem.StatsCollector
-	mem.StatsCollector = &fakeStatsCollector{
-		proxies: map[string]*mem.ProxyStats{
-			"tcp-empty": {
-				Name:            "tcp-empty",
-				Type:            "tcp",
-				User:            "",
-				ClientID:        "legacy-client",
-				TodayTrafficIn:  10,
-				TodayTrafficOut: 20,
-				CurConns:        1,
-			},
-			"tcp-alice": {
-				Name:            "tcp-alice",
-				Type:            "tcp",
-				User:            "alice",
-				ClientID:        "client-a",
-				TodayTrafficIn:  30,
-				TodayTrafficOut: 40,
-			},
-			"udp-bob": {
-				Name:     "udp-bob",
-				Type:     "udp",
-				User:     "bob",
-				ClientID: "client-b",
-			},
-		},
-	}
-	t.Cleanup(func() {
-		mem.StatsCollector = oldStatsCollector
-	})
-
-	clientRegistry := registry.NewClientRegistry()
-	clientRegistry.Register("", "legacy-client", "run-empty", "empty-host", "1.0.0", "127.0.0.1", "v1")
-	clientRegistry.Register("alice", "client-a", "run-a", "alice-host", "1.0.0", "127.0.0.2", "v2")
-	clientRegistry.Register("bob", "client-b", "run-b", "bob-host", "1.0.0", "127.0.0.3", "v1")
-	clientRegistry.MarkOfflineByRunID("run-b")
-
-	return NewController(&v1.ServerConfig{}, clientRegistry, serverproxy.NewManager())
-}
-
-func newV2TestRouter(controller *Controller) *mux.Router {
-	router := mux.NewRouter()
-	router.HandleFunc("/api/v2/users", httppkg.MakeHTTPHandlerFuncV2(controller.APIV2UserList)).Methods(http.MethodGet)
-	router.HandleFunc("/api/v2/clients", httppkg.MakeHTTPHandlerFuncV2(controller.APIV2ClientList)).Methods(http.MethodGet)
-	router.HandleFunc("/api/v2/clients/{key}", httppkg.MakeHTTPHandlerFuncV2(controller.APIV2ClientDetail)).Methods(http.MethodGet)
-	router.HandleFunc("/api/v2/proxies", httppkg.MakeHTTPHandlerFuncV2(controller.APIV2ProxyList)).Methods(http.MethodGet)
-	router.HandleFunc("/api/v2/proxies/{name}", httppkg.MakeHTTPHandlerFuncV2(controller.APIV2ProxyDetail)).Methods(http.MethodGet)
-	router.HandleFunc("/api/clients", httppkg.MakeHTTPHandlerFunc(controller.APIClientList)).Methods(http.MethodGet)
-	router.HandleFunc("/api/proxy/{type}", httppkg.MakeHTTPHandlerFunc(controller.APIProxyByType)).Methods(http.MethodGet)
-	return router
-}
-
-func performRequest(handler http.Handler, target string) *httptest.ResponseRecorder {
-	req := httptest.NewRequest(http.MethodGet, target, nil)
-	resp := httptest.NewRecorder()
-	handler.ServeHTTP(resp, req)
-	return resp
-}
-
-func decodeResponse[T any](t *testing.T, resp *httptest.ResponseRecorder) T {
-	t.Helper()
-
-	var out T
-	if err := json.Unmarshal(resp.Body.Bytes(), &out); err != nil {
-		t.Fatalf("unmarshal response failed: %v, body: %s", err, resp.Body.String())
-	}
-	return out
-}

server/http/model/v2.go

@@ -1,46 +0,0 @@
-// Copyright 2026 The frp Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package model
-
-type V2PageResp[T any] struct {
-	Total    int `json:"total"`
-	Page     int `json:"page"`
-	PageSize int `json:"pageSize"`
-	Items    []T `json:"items"`
-}
-
-type V2UserResp struct {
-	User        string `json:"user"`
-	ClientCount int    `json:"clientCount"`
-	ProxyCount  int    `json:"proxyCount"`
-}
-
-type V2ProxyResp struct {
-	Name     string            `json:"name"`
-	Type     string            `json:"type"`
-	User     string            `json:"user"`
-	ClientID string            `json:"clientID"`
-	Spec     any               `json:"spec"`
-	Status   V2ProxyStatusResp `json:"status"`
-}
-
-type V2ProxyStatusResp struct {
-	State           string `json:"phase"`
-	TodayTrafficIn  int64  `json:"todayTrafficIn"`
-	TodayTrafficOut int64  `json:"todayTrafficOut"`
-	CurConns        int64  `json:"curConns"`
-	LastStartTime   string `json:"lastStartTime"`
-	LastCloseTime   string `json:"lastCloseTime"`
-}

test/e2e/v1/plugin/client.go

@@ -1,24 +1,18 @@
 package plugin
 
 import (
-	"bufio"
 	"crypto/tls"
 	"fmt"
-	"io"
-	"net"
 	"net/http"
 	"strconv"
 	"strings"
 
 	"github.com/onsi/ginkgo/v2"
-	pp "github.com/pires/go-proxyproto"
 
 	"github.com/fatedier/frp/pkg/transport"
-	"github.com/fatedier/frp/pkg/util/log"
 	"github.com/fatedier/frp/test/e2e/framework"
 	"github.com/fatedier/frp/test/e2e/framework/consts"
 	"github.com/fatedier/frp/test/e2e/mock/server/httpserver"
-	"github.com/fatedier/frp/test/e2e/mock/server/streamserver"
 	"github.com/fatedier/frp/test/e2e/pkg/cert"
 	"github.com/fatedier/frp/test/e2e/pkg/port"
 	"github.com/fatedier/frp/test/e2e/pkg/request"
@@ -456,85 +450,4 @@ var _ = ginkgo.Describe("[Feature: Client-Plugins]", func() {
 			ExpectResp([]byte("test")).
 			Ensure()
 	})
-
-	ginkgo.It("tls2raw with proxy protocol v2", func() {
-		generator := &cert.SelfSignedCertGenerator{}
-		artifacts, err := generator.Generate("example.com")
-		framework.ExpectNoError(err)
-		crtPath := f.WriteTempFile("tls2raw_proxy_protocol_server.crt", string(artifacts.Cert))
-		keyPath := f.WriteTempFile("tls2raw_proxy_protocol_server.key", string(artifacts.Key))
-
-		serverConf := consts.DefaultServerConfig
-		vhostHTTPSPort := f.AllocPort()
-		serverConf += fmt.Sprintf(`
-		vhostHTTPSPort = %d
-		`, vhostHTTPSPort)
-
-		localPort := f.AllocPort()
-		clientConf := consts.DefaultClientConfig + fmt.Sprintf(`
-		[[proxies]]
-		name = "tls2raw-proxy-protocol-test"
-		type = "https"
-		customDomains = ["example.com"]
-		transport.proxyProtocolVersion = "v2"
-		[proxies.plugin]
-		type = "tls2raw"
-		localAddr = "127.0.0.1:%d"
-		crtPath = "%s"
-		keyPath = "%s"
-		`, localPort, crtPath, keyPath)
-
-		f.RunProcesses(serverConf, []string{clientConf})
-
-		localServer := streamserver.New(streamserver.TCP, streamserver.WithBindPort(localPort),
-			streamserver.WithCustomHandler(func(c net.Conn) {
-				defer c.Close()
-
-				writeResp := func(body string) {
-					_, _ = fmt.Fprintf(c, "HTTP/1.1 200 OK\r\nContent-Length: %d\r\nConnection: close\r\n\r\n%s", len(body), body)
-				}
-
-				rd := bufio.NewReader(c)
-				ppHeader, err := pp.Read(rd)
-				if err != nil {
-					log.Errorf("read proxy protocol error: %v", err)
-					writeResp("missing proxy protocol")
-					return
-				}
-				if ppHeader.Version != 2 {
-					log.Errorf("unexpected proxy protocol version: %d", ppHeader.Version)
-					writeResp("unexpected proxy protocol version")
-					return
-				}
-				srcAddr, ok := ppHeader.SourceAddr.(*net.TCPAddr)
-				if !ok || srcAddr.IP.String() != "127.0.0.1" {
-					log.Errorf("unexpected proxy protocol source address: %v", ppHeader.SourceAddr)
-					writeResp("unexpected proxy protocol source address")
-					return
-				}
-
-				req, err := http.ReadRequest(rd)
-				if err != nil {
-					log.Errorf("read http request after proxy protocol error: %v", err)
-					writeResp("missing http request")
-					return
-				}
-				_, _ = io.Copy(io.Discard, req.Body)
-				_ = req.Body.Close()
-
-				writeResp("test")
-			}))
-		f.RunServer("", localServer)
-
-		framework.NewRequestExpect(f).
-			Port(vhostHTTPSPort).
-			RequestModify(func(r *request.Request) {
-				r.HTTPS().HTTPHost("example.com").TLSConfig(&tls.Config{
-					ServerName:         "example.com",
-					InsecureSkipVerify: true,
-				})
-			}).
-			ExpectResp([]byte("test")).
-			Ensure()
-	})
 })

web/frps/src/api/client.ts

@@ -1,26 +1,10 @@
-import { buildQueryString, http } from './http'
-import type { V2Page } from './http'
-import type { ClientInfoData, ClientListV2Params } from '../types/client'
+import { http } from './http'
+import type { ClientInfoData } from '../types/client'
 
 export const getClients = () => {
   return http.get<ClientInfoData[]>('../api/clients')
 }
 
-export const getClientsV2 = (params: ClientListV2Params = {}) => {
-  return http.getV2<V2Page<ClientInfoData>>(
-    `../api/v2/clients${buildQueryString({
-      page: params.page,
-      pageSize: params.pageSize,
-      status:
-        params.status && params.status !== 'all' ? params.status : undefined,
-      q: params.q || undefined,
-      user: params.user,
-      clientID: params.clientID || undefined,
-      runID: params.runID || undefined,
-    })}`,
-  )
-}
-
 export const getClient = (key: string) => {
   return http.get<ClientInfoData>(`../api/clients/${key}`)
 }

web/frps/src/api/http.ts

@@ -11,21 +11,6 @@ class HTTPError extends Error {
   }
 }
 
-export interface V2Envelope<T> {
-  code: number
-  msg: string
-  data: T
-}
-
-export interface V2Page<T> {
-  total: number
-  page: number
-  pageSize: number
-  items: T[]
-}
-
-type QueryParamValue = string | number | boolean | null | undefined
-
 async function request<T>(url: string, options: RequestInit = {}): Promise<T> {
   const defaultOptions: RequestInit = {
     credentials: 'include',
@@ -49,55 +34,9 @@ async function request<T>(url: string, options: RequestInit = {}): Promise<T> {
   return response.json()
 }
 
-async function requestV2<T>(
-  url: string,
-  options: RequestInit = {},
-): Promise<T> {
-  const defaultOptions: RequestInit = {
-    credentials: 'include',
-  }
-
-  const response = await fetch(url, { ...defaultOptions, ...options })
-  const envelope = (await response.json().catch(() => null)) as
-    | V2Envelope<T>
-    | null
-
-  if (!response.ok) {
-    throw new HTTPError(
-      response.status,
-      response.statusText,
-      envelope?.msg || `HTTP ${response.status}`,
-    )
-  }
-
-  if (!envelope || typeof envelope.code !== 'number') {
-    throw new Error('Invalid API v2 response')
-  }
-
-  if (envelope.code >= 400) {
-    throw new HTTPError(envelope.code, envelope.msg, envelope.msg)
-  }
-
-  return envelope.data
-}
-
-export const buildQueryString = (
-  params: Record<string, QueryParamValue>,
-): string => {
-  const query = new URLSearchParams()
-  for (const [key, value] of Object.entries(params)) {
-    if (value === null || value === undefined) continue
-    query.append(key, String(value))
-  }
-  const text = query.toString()
-  return text ? `?${text}` : ''
-}
-
 export const http = {
   get: <T>(url: string, options?: RequestInit) =>
     request<T>(url, { ...options, method: 'GET' }),
-  getV2: <T>(url: string, options?: RequestInit) =>
-    requestV2<T>(url, { ...options, method: 'GET' }),
   post: <T>(url: string, body?: any, options?: RequestInit) =>
     request<T>(url, {
       ...options,

web/frps/src/api/proxy.ts

@@ -1,10 +1,7 @@
-import { buildQueryString, http } from './http'
-import type { V2Page } from './http'
+import { http } from './http'
 import type {
   GetProxyResponse,
-  ProxyListV2Params,
   ProxyStatsInfo,
-  ProxyV2Info,
   TrafficResponse,
 } from '../types/proxy'
 
@@ -12,40 +9,6 @@ export const getProxiesByType = (type: string) => {
   return http.get<GetProxyResponse>(`../api/proxy/${type}`)
 }
 
-export const getProxiesV2 = async (params: ProxyListV2Params = {}) => {
-  const page = await http.getV2<V2Page<ProxyV2Info>>(
-    `../api/v2/proxies${buildQueryString({
-      page: params.page,
-      pageSize: params.pageSize,
-      status:
-        params.status && params.status !== 'all' ? params.status : undefined,
-      q: params.q || undefined,
-      type: params.type || undefined,
-      user: params.user,
-      clientID: params.clientID || undefined,
-    })}`,
-  )
-
-  return {
-    ...page,
-    items: page.items.map(toLegacyProxyStats),
-  }
-}
-
-const toLegacyProxyStats = (proxy: ProxyV2Info): ProxyStatsInfo => ({
-  name: proxy.name,
-  type: proxy.type,
-  conf: proxy.spec,
-  user: proxy.user,
-  clientID: proxy.clientID,
-  todayTrafficIn: proxy.status.todayTrafficIn,
-  todayTrafficOut: proxy.status.todayTrafficOut,
-  curConns: proxy.status.curConns,
-  lastStartTime: proxy.status.lastStartTime,
-  lastCloseTime: proxy.status.lastCloseTime,
-  status: proxy.status.phase,
-})
-
 export const getProxy = (type: string, name: string) => {
   return http.get<ProxyStatsInfo>(`../api/proxy/${type}/${name}`)
 }

web/frps/src/types/client.ts

@@ -13,13 +13,3 @@ export interface ClientInfoData {
   disconnectedAt?: number
   online: boolean
 }
-
-export interface ClientListV2Params {
-  page?: number
-  pageSize?: number
-  status?: 'all' | 'online' | 'offline'
-  q?: string
-  user?: string
-  clientID?: string
-  runID?: string
-}

web/frps/src/types/proxy.ts

@@ -1,6 +1,5 @@
 export interface ProxyStatsInfo {
   name: string
-  type?: string
   conf: any
   user: string
   clientID: string
@@ -16,34 +15,6 @@ export interface GetProxyResponse {
   proxies: ProxyStatsInfo[]
 }
 
-export interface ProxyListV2Params {
-  page?: number
-  pageSize?: number
-  status?: 'all' | 'online' | 'offline'
-  q?: string
-  type?: string
-  user?: string
-  clientID?: string
-}
-
-export interface ProxyV2Info {
-  name: string
-  type: string
-  user: string
-  clientID: string
-  spec: any
-  status: ProxyV2Status
-}
-
-export interface ProxyV2Status {
-  phase: string
-  todayTrafficIn: number
-  todayTrafficOut: number
-  curConns: number
-  lastStartTime: string
-  lastCloseTime: string
-}
-
 export interface TrafficResponse {
   name: string
   trafficIn: number[]

web/frps/src/views/Clients.vue

@@ -16,9 +16,7 @@
           >
             <span class="status-dot" :class="tab.value"></span>
             <span class="tab-label">{{ tab.label }}</span>
-            <span v-if="tab.count !== null" class="tab-count">{{
-              tab.count
-            }}</span>
+            <span class="tab-count">{{ tab.count }}</span>
           </button>
         </div>
       </div>
@@ -35,9 +33,9 @@
     </div>
 
     <div v-loading="loading" class="clients-content">
-      <div v-if="clients.length > 0" class="clients-list">
+      <div v-if="filteredClients.length > 0" class="clients-list">
         <ClientCard
-          v-for="client in clients"
+          v-for="client in filteredClients"
           :key="client.key"
           :client="client"
         />
@@ -46,123 +44,82 @@
         <el-empty description="No clients found" />
       </div>
     </div>
-
-    <div v-if="total > 0" class="pagination-section">
-      <ElPagination
-        :current-page="page"
-        :page-size="pageSize"
-        :page-sizes="[10, 20, 50, 100]"
-        :total="total"
-        layout="total, sizes, prev, pager, next"
-        @current-change="onPageChange"
-        @size-change="onPageSizeChange"
-      />
-    </div>
   </div>
 </template>
 
 <script setup lang="ts">
-import { ref, computed, onMounted, onUnmounted, watch } from 'vue'
-import { ElMessage, ElPagination } from 'element-plus'
+import { ref, computed, onMounted, onUnmounted } from 'vue'
+import { ElMessage } from 'element-plus'
 import { Search } from '@element-plus/icons-vue'
 import { Client } from '../utils/client'
 import ClientCard from '../components/ClientCard.vue'
-import { getClientsV2 } from '../api/client'
+import { getClients } from '../api/client'
 
 const clients = ref<Client[]>([])
 const loading = ref(false)
 const searchText = ref('')
 const statusFilter = ref<'all' | 'online' | 'offline'>('all')
-const page = ref(1)
-const pageSize = ref(10)
-const total = ref(0)
 
 let refreshTimer: number | null = null
-let searchDebounceTimer: number | null = null
-let requestSeq = 0
+
+const stats = computed(() => {
+  const total = clients.value.length
+  const online = clients.value.filter((c) => c.online).length
+  const offline = total - online
+  return { total, online, offline }
+})
 
 const statusTabs = computed(() => [
-  {
-    value: 'all' as const,
-    label: 'All',
-    count: statusFilter.value === 'all' ? total.value : null,
-  },
-  {
-    value: 'online' as const,
-    label: 'Online',
-    count: statusFilter.value === 'online' ? total.value : null,
-  },
-  {
-    value: 'offline' as const,
-    label: 'Offline',
-    count: statusFilter.value === 'offline' ? total.value : null,
-  },
+  { value: 'all' as const, label: 'All', count: stats.value.total },
+  { value: 'online' as const, label: 'Online', count: stats.value.online },
+  { value: 'offline' as const, label: 'Offline', count: stats.value.offline },
 ])
 
-const fetchData = async (silent = false) => {
-  const seq = ++requestSeq
-  if (!silent) loading.value = true
-  try {
-    const data = await getClientsV2({
-      page: page.value,
-      pageSize: pageSize.value,
-      status: statusFilter.value,
-      q: searchText.value.trim(),
-    })
-    if (seq !== requestSeq) return
+const filteredClients = computed(() => {
+  let result = clients.value
 
-    const maxPage = Math.max(1, Math.ceil(data.total / data.pageSize))
-    if (data.items.length === 0 && data.total > 0 && data.page > maxPage) {
-      page.value = maxPage
-      await fetchData(silent)
-      return
+  // Filter by status
+  if (statusFilter.value === 'online') {
+    result = result.filter((c) => c.online)
+  } else if (statusFilter.value === 'offline') {
+    result = result.filter((c) => !c.online)
+  }
+
+  // Filter by search text
+  if (searchText.value) {
+    result = result.filter((c) => c.matchesFilter(searchText.value))
+  }
+
+  // Sort: online first, then by display name
+  result.sort((a, b) => {
+    if (a.online !== b.online) {
+      return a.online ? -1 : 1
     }
+    return a.displayName.localeCompare(b.displayName)
+  })
 
-    clients.value = data.items.map((item) => new Client(item))
-    total.value = data.total
-    page.value = data.page
-    pageSize.value = data.pageSize
+  return result
+})
+
+const fetchData = async () => {
+  loading.value = true
+  try {
+    const json = await getClients()
+    clients.value = json.map((data) => new Client(data))
   } catch (error: any) {
-    if (seq !== requestSeq) return
     ElMessage({
       showClose: true,
       message: 'Failed to fetch clients: ' + error.message,
       type: 'error',
     })
   } finally {
-    if (seq === requestSeq) {
-      loading.value = false
-    }
+    loading.value = false
   }
 }
 
-const clearSearchDebounce = () => {
-  if (searchDebounceTimer !== null) {
-    window.clearTimeout(searchDebounceTimer)
-    searchDebounceTimer = null
-  }
-}
-
-const resetPageAndFetch = () => {
-  clearSearchDebounce()
-  page.value = 1
-  fetchData()
-}
-
-const onPageChange = (value: number) => {
-  clearSearchDebounce()
-  page.value = value
-  fetchData()
-}
-
-const onPageSizeChange = (value: number) => {
-  pageSize.value = value
-  resetPageAndFetch()
-}
-
 const startAutoRefresh = () => {
   refreshTimer = window.setInterval(() => {
-    fetchData(true)
+    fetchData()
   }, 5000)
 }
 
@@ -173,19 +130,6 @@ const stopAutoRefresh = () => {
   }
 }
 
-watch(statusFilter, () => {
-  resetPageAndFetch()
-})
-
-watch(searchText, () => {
-  clearSearchDebounce()
-  page.value = 1
-  searchDebounceTimer = window.setTimeout(() => {
-    searchDebounceTimer = null
-    fetchData()
-  }, 300)
-})
-
 onMounted(() => {
   fetchData()
   startAutoRefresh()
@@ -193,7 +137,6 @@ onMounted(() => {
 
 onUnmounted(() => {
   stopAutoRefresh()
-  clearSearchDebounce()
 })
 </script>
 
@@ -331,11 +274,6 @@ onUnmounted(() => {
   padding: 60px 0;
 }
 
-.pagination-section {
-  display: flex;
-  justify-content: flex-end;
-}
-
 /* Dark mode adjustments */
 html.dark .status-tab {
   background: var(--el-bg-color-overlay);
@@ -360,9 +298,5 @@ html.dark .status-tab.active {
   .status-tab {
     flex-shrink: 0;
   }
-
-  .pagination-section {
-    justify-content: center;
-  }
 }
 </style>

web/frps/src/views/Proxies.vue

@@ -8,7 +8,7 @@
         </div>
 
         <div class="actions-section">
-          <ActionButton variant="outline" size="small" @click="refreshData">
+          <ActionButton variant="outline" size="small" @click="fetchData">
             Refresh
           </ActionButton>
 
@@ -27,6 +27,36 @@
             clearable
             class="main-search"
           />
+
+          <PopoverMenu
+            :model-value="selectedClientKey"
+            :width="220"
+            placement="bottom-end"
+            selectable
+            filterable
+            filter-placeholder="Search clients..."
+            :display-value="selectedClientLabel"
+            clearable
+            class="client-filter"
+            @update:model-value="onClientFilterChange($event as string)"
+          >
+            <template #default="{ filterText }">
+              <PopoverMenuItem value="">All Clients</PopoverMenuItem>
+              <PopoverMenuItem
+                v-if="clientIDFilter && !selectedClientInList"
+                :value="selectedClientKey"
+              >
+                {{ userFilter ? userFilter + '.' : '' }}{{ clientIDFilter }} (not found)
+              </PopoverMenuItem>
+              <PopoverMenuItem
+                v-for="client in filteredClientOptions(filterText)"
+                :key="client.key"
+                :value="client.key"
+              >
+                {{ client.label }}
+              </PopoverMenuItem>
+            </template>
+          </PopoverMenu>
         </div>
 
         <div class="type-tabs">
@@ -44,9 +74,9 @@
     </div>
 
     <div v-loading="loading" class="proxies-content">
-      <div v-if="proxies.length > 0" class="proxies-list">
+      <div v-if="filteredProxies.length > 0" class="proxies-list">
         <ProxyCard
-          v-for="proxy in proxies"
+          v-for="proxy in filteredProxies"
           :key="`${proxy.type}:${proxy.name}`"
           :proxy="proxy"
           :show-type="activeType === 'all'"
@@ -57,18 +87,6 @@
       </div>
     </div>
 
-    <div v-if="total > 0" class="pagination-section">
-      <ElPagination
-        :current-page="page"
-        :page-size="pageSize"
-        :page-sizes="[10, 20, 50, 100]"
-        :total="total"
-        layout="total, sizes, prev, pager, next"
-        @current-change="onPageChange"
-        @size-change="onPageSizeChange"
-      />
-    </div>
-
     <ConfirmDialog
       v-model="showClearDialog"
       title="Clear Offline"
@@ -81,9 +99,9 @@
 </template>
 
 <script setup lang="ts">
-import { ref, watch, onUnmounted } from 'vue'
+import { ref, computed, watch } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
-import { ElMessage, ElPagination } from 'element-plus'
+import { ElMessage } from 'element-plus'
 import { Search } from '@element-plus/icons-vue'
 import ActionButton from '@shared/components/ActionButton.vue'
 import ConfirmDialog from '@shared/components/ConfirmDialog.vue'
@@ -98,12 +116,15 @@ import {
   SUDPProxy,
 } from '../utils/proxy'
 import ProxyCard from '../components/ProxyCard.vue'
+import PopoverMenu from '@shared/components/PopoverMenu.vue'
+import PopoverMenuItem from '@shared/components/PopoverMenuItem.vue'
 import {
-  getProxiesV2,
+  getProxiesByType,
   clearOfflineProxies as apiClearOfflineProxies,
 } from '../api/proxy'
 import { getServerInfo } from '../api/server'
-import type { ProxyStatsInfo } from '../types/proxy'
+import { getClients } from '../api/client'
+import { Client } from '../utils/client'
 
 const route = useRoute()
 const router = useRouter()
@@ -122,159 +143,242 @@ const proxyTypes = [
 
 const activeType = ref((route.params.type as string) || 'tcp')
 const proxies = ref<BaseProxy[]>([])
+const clients = ref<Client[]>([])
 const loading = ref(false)
 const searchText = ref('')
 const showClearDialog = ref(false)
-const page = ref(1)
-const pageSize = ref(10)
-const total = ref(0)
-let requestSeq = 0
-let searchDebounceTimer: number | null = null
+const clientIDFilter = ref((route.query.clientID as string) || '')
+const userFilter = ref((route.query.user as string) || '')
 
-// Server info cache - cache the Promise itself so concurrent first calls
-// from Promise.all (convertProxies) don't kick off multiple HTTP requests.
-type ServerInfoLite = {
+const clientOptions = computed(() => {
+  return clients.value
+    .map((c) => ({
+      key: c.key,
+      clientID: c.clientID,
+      user: c.user,
+      label: c.user ? `${c.user}.${c.clientID}` : c.clientID,
+    }))
+    .sort((a, b) => a.label.localeCompare(b.label))
+})
+
+// Compute selected client key for el-select v-model
+const selectedClientKey = computed(() => {
+  if (!clientIDFilter.value) return ''
+  const client = clientOptions.value.find(
+    (c) => c.clientID === clientIDFilter.value && c.user === userFilter.value,
+  )
+  // Return a synthetic key even if not found, so the select shows the filter is active
+  return client?.key || `${userFilter.value}:${clientIDFilter.value}`
+})
+
+const selectedClientLabel = computed(() => {
+  if (!clientIDFilter.value) return 'All Clients'
+  const client = clientOptions.value.find(
+    (c) => c.clientID === clientIDFilter.value && c.user === userFilter.value,
+  )
+  return client?.label || `${userFilter.value ? userFilter.value + '.' : ''}${clientIDFilter.value}`
+})
+
+const filteredClientOptions = (filterText: string) => {
+  if (!filterText) return clientOptions.value
+  const search = filterText.toLowerCase()
+  return clientOptions.value.filter((c) => c.label.toLowerCase().includes(search))
+}
+
+// Check if the filtered client exists in the client list
+const selectedClientInList = computed(() => {
+  if (!clientIDFilter.value) return true
+  return clientOptions.value.some(
+    (c) => c.clientID === clientIDFilter.value && c.user === userFilter.value,
+  )
+})
+
+const filteredProxies = computed(() => {
+  let result = proxies.value
+
+  // Filter by clientID and user if specified
+  if (clientIDFilter.value) {
+    result = result.filter(
+      (p) => p.clientID === clientIDFilter.value && p.user === userFilter.value,
+    )
+  }
+
+  // Filter by search text across multiple fields
+  if (searchText.value) {
+    const search = searchText.value.toLowerCase()
+    result = result.filter((p) => {
+      const fields: unknown[] = [
+        p.name,
+        p.type,
+        p.clientID,
+        p.user,
+        p.addr,
+        p.port,
+        p.customDomains,
+        p.subdomain,
+      ]
+      return fields.some((v) => matchesSearch(v, search))
+    })
+  }
+
+  return result
+})
+
+// Normalize a field of unknown shape (string / number / array / null) to a
+// lowercase string for case-insensitive substring matching. Arrays are joined
+// so e.g. customDomains: ["A.com","B.com"] is searchable as one blob.
+const matchesSearch = (value: unknown, needle: string): boolean => {
+  if (value === null || value === undefined) return false
+  let str: string
+  if (Array.isArray(value)) {
+    str = value
+      .filter((v) => v !== null && v !== undefined)
+      .map((v) => String(v))
+      .join(' ')
+  } else if (typeof value === 'number') {
+    if (value === 0) return false
+    str = String(value)
+  } else {
+    str = String(value)
+  }
+  if (!str) return false
+  return str.toLowerCase().includes(needle)
+}
+
+const onClientFilterChange = (key: string) => {
+  if (key) {
+    const client = clientOptions.value.find((c) => c.key === key)
+    if (client) {
+      router.replace({
+        query: { ...route.query, clientID: client.clientID, user: client.user },
+      })
+    }
+  } else {
+    const query = { ...route.query }
+    delete query.clientID
+    delete query.user
+    router.replace({ query })
+  }
+}
+
+const fetchClients = async () => {
+  try {
+    const json = await getClients()
+    clients.value = json.map((data) => new Client(data))
+  } catch {
+    // Ignore errors when fetching clients
+  }
+}
+
+// Server info cache
+let serverInfo: {
   vhostHTTPPort: number
   vhostHTTPSPort: number
   tcpmuxHTTPConnectPort: number
   subdomainHost: string
-}
-let serverInfoPromise: Promise<ServerInfoLite> | null = null
+} | null = null
 
-const fetchServerInfo = (): Promise<ServerInfoLite> => {
-  if (!serverInfoPromise) {
-    serverInfoPromise = getServerInfo().catch((err) => {
-      // Allow retry after failure
-      serverInfoPromise = null
-      throw err
-    })
-  }
-  return serverInfoPromise
+const fetchServerInfo = async () => {
+  if (serverInfo) return serverInfo
+  const res = await getServerInfo()
+  serverInfo = res
+  return serverInfo
 }
 
-const convertProxy = async (
-  proxy: ProxyStatsInfo,
-): Promise<BaseProxy | null> => {
-  const type = proxy.type || activeType.value
+const convertProxies = async (
+  type: string,
+  json: any,
+): Promise<BaseProxy[]> => {
   if (type === 'tcp') {
-    return new TCPProxy(proxy)
+    return json.proxies.map((p: any) => new TCPProxy(p))
   }
   if (type === 'udp') {
-    return new UDPProxy(proxy)
+    return json.proxies.map((p: any) => new UDPProxy(p))
   }
   if (type === 'http') {
     const info = await fetchServerInfo()
     if (info && info.vhostHTTPPort) {
-      return new HTTPProxy(proxy, info.vhostHTTPPort, info.subdomainHost)
+      return json.proxies.map(
+        (p: any) => new HTTPProxy(p, info.vhostHTTPPort, info.subdomainHost),
+      )
     }
-    return null
+    return []
   }
   if (type === 'https') {
     const info = await fetchServerInfo()
     if (info && info.vhostHTTPSPort) {
-      return new HTTPSProxy(proxy, info.vhostHTTPSPort, info.subdomainHost)
+      return json.proxies.map(
+        (p: any) => new HTTPSProxy(p, info.vhostHTTPSPort, info.subdomainHost),
+      )
     }
-    return null
+    return []
   }
   if (type === 'tcpmux') {
     const info = await fetchServerInfo()
     if (info && info.tcpmuxHTTPConnectPort) {
-      return new TCPMuxProxy(
-        proxy,
-        info.tcpmuxHTTPConnectPort,
-        info.subdomainHost,
+      return json.proxies.map(
+        (p: any) =>
+          new TCPMuxProxy(p, info.tcpmuxHTTPConnectPort, info.subdomainHost),
       )
     }
-    return null
+    return []
   }
   if (type === 'stcp') {
-    return new STCPProxy(proxy)
+    return json.proxies.map((p: any) => new STCPProxy(p))
   }
   if (type === 'sudp') {
-    return new SUDPProxy(proxy)
+    return json.proxies.map((p: any) => new SUDPProxy(p))
   }
   // Fallback for types without a dedicated class (e.g. xtcp). Matches the
   // pattern in ProxyDetail.vue so the type tag and meta render correctly.
-  const bp = new BaseProxy(proxy)
-  bp.type = type
-  return bp
+  return json.proxies.map((p: any) => {
+    const bp = new BaseProxy(p)
+    bp.type = type
+    return bp
+  })
 }
 
-const convertProxies = async (items: ProxyStatsInfo[]): Promise<BaseProxy[]> => {
-  const converted = await Promise.all(items.map((item) => convertProxy(item)))
-  return converted.filter((item): item is BaseProxy => item !== null)
-}
+const allProxyTypes = [
+  'tcp',
+  'udp',
+  'http',
+  'https',
+  'tcpmux',
+  'stcp',
+  'xtcp',
+  'sudp',
+]
 
-const fetchData = async (silent = false) => {
-  const seq = ++requestSeq
-  if (!silent) loading.value = true
+const fetchData = async () => {
+  loading.value = true
+  proxies.value = []
 
   try {
-    const q = searchText.value.trim()
-    const data = await getProxiesV2({
-      page: page.value,
-      pageSize: pageSize.value,
-      type: activeType.value === 'all' ? undefined : activeType.value,
-      q: q || undefined,
-    })
-    if (seq !== requestSeq) return
+    const type = activeType.value
 
-    const maxPage = Math.max(1, Math.ceil(data.total / data.pageSize))
-    if (data.items.length === 0 && data.total > 0 && data.page > maxPage) {
-      page.value = maxPage
-      await fetchData(silent)
-      return
+    if (type === 'all') {
+      const results = await Promise.all(
+        allProxyTypes.map(async (t) => {
+          const json = await getProxiesByType(t)
+          return convertProxies(t, json)
+        }),
+      )
+      proxies.value = results.flat()
+    } else {
+      const json = await getProxiesByType(type)
+      proxies.value = await convertProxies(type, json)
     }
-
-    const converted = await convertProxies(data.items)
-    if (seq !== requestSeq) return
-
-    proxies.value = converted
-    total.value = data.total
-    page.value = data.page
-    pageSize.value = data.pageSize
   } catch (error: any) {
-    if (seq !== requestSeq) return
     ElMessage({
       showClose: true,
       message: 'Failed to fetch proxies: ' + error.message,
       type: 'error',
     })
   } finally {
-    if (seq === requestSeq) {
-      loading.value = false
-    }
+    loading.value = false
   }
 }
 
-const clearSearchDebounce = () => {
-  if (searchDebounceTimer !== null) {
-    window.clearTimeout(searchDebounceTimer)
-    searchDebounceTimer = null
-  }
-}
-
-const resetPageAndFetch = () => {
-  clearSearchDebounce()
-  page.value = 1
-  fetchData()
-}
-
-const refreshData = () => {
-  fetchData()
-}
-
-const onPageChange = (value: number) => {
-  clearSearchDebounce()
-  page.value = value
-  fetchData()
-}
-
-const onPageSizeChange = (value: number) => {
-  pageSize.value = value
-  resetPageAndFetch()
-}
-
 const handleClearConfirm = async () => {
   showClearDialog.value = false
   await clearOfflineProxies()
@@ -296,45 +400,25 @@ const clearOfflineProxies = async () => {
   }
 }
 
-const sanitizeClientQuery = () => {
-  const hasClientQuery =
-    Object.prototype.hasOwnProperty.call(route.query, 'clientID') ||
-    Object.prototype.hasOwnProperty.call(route.query, 'user')
-  if (!hasClientQuery) return
-
-  const query = { ...route.query }
-  delete query.clientID
-  delete query.user
-  router.replace({ query })
-}
-
 // Watch for type changes
 watch(activeType, (newType) => {
-  clearSearchDebounce()
-  page.value = 1
   // Update route but preserve query params
   router.replace({ params: { type: newType }, query: route.query })
   fetchData()
 })
 
-watch(searchText, () => {
-  clearSearchDebounce()
-  page.value = 1
-  searchDebounceTimer = window.setTimeout(() => {
-    searchDebounceTimer = null
-    fetchData()
-  }, 300)
-})
-
-watch(() => route.query, sanitizeClientQuery)
-
-onUnmounted(() => {
-  clearSearchDebounce()
-})
+// Watch for route query changes (client filter)
+watch(
+  () => [route.query.clientID, route.query.user],
+  ([newClientID, newUser]) => {
+    clientIDFilter.value = (newClientID as string) || ''
+    userFilter.value = (newUser as string) || ''
+  },
+)
 
 // Initial fetch
-sanitizeClientQuery()
 fetchData()
+fetchClients()
 </script>
 
 <style scoped>
@@ -401,11 +485,16 @@ fetchData()
   flex: 1;
 }
 
-.main-search :deep(.el-input__wrapper) {
+.main-search :deep(.el-input__wrapper),
+.client-filter :deep(.el-input__wrapper) {
   height: 32px;
   border-radius: 8px;
 }
 
+.client-filter {
+  width: 240px;
+}
+
 .type-tabs {
   display: flex;
   gap: 8px;
@@ -450,18 +539,13 @@ fetchData()
   padding: 60px 0;
 }
 
-.pagination-section {
-  display: flex;
-  justify-content: flex-end;
-}
-
 @media (max-width: 768px) {
   .search-row {
     flex-direction: column;
   }
 
-  .pagination-section {
-    justify-content: center;
+  .client-filter {
+    width: 100%;
   }
 }
 </style>

web/package-lock.json

@@ -954,6 +954,76 @@
         "node": ">= 8"
       }
     },
+    "node_modules/@nuxt/kit": {
+      "version": "3.21.2",
+      "resolved": "https://registry.npmjs.org/@nuxt/kit/-/kit-3.21.2.tgz",
+      "integrity": "sha512-Bd6m6mrDrqpBEbX+g0rc66/ALd1sxlgdx5nfK9MAYO0yKLTOSK7McSYz1KcOYn3LQFCXOWfvXwaqih/b+REI1g==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "c12": "^3.3.3",
+        "consola": "^3.4.2",
+        "defu": "^6.1.4",
+        "destr": "^2.0.5",
+        "errx": "^0.1.0",
+        "exsolve": "^1.0.8",
+        "ignore": "^7.0.5",
+        "jiti": "^2.6.1",
+        "klona": "^2.0.6",
+        "knitwork": "^1.3.0",
+        "mlly": "^1.8.1",
+        "ohash": "^2.0.11",
+        "pathe": "^2.0.3",
+        "pkg-types": "^2.3.0",
+        "rc9": "^3.0.0",
+        "scule": "^1.3.0",
+        "semver": "^7.7.4",
+        "tinyglobby": "^0.2.15",
+        "ufo": "^1.6.3",
+        "unctx": "^2.5.0",
+        "untyped": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=18.12.0"
+      }
+    },
+    "node_modules/@nuxt/kit/node_modules/confbox": {
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/confbox/-/confbox-0.2.4.tgz",
+      "integrity": "sha512-ysOGlgTFbN2/Y6Cg3Iye8YKulHw+R2fNXHrgSmXISQdMnomY6eNDprVdW9R5xBguEqI954+S6709UyiO7B+6OQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true
+    },
+    "node_modules/@nuxt/kit/node_modules/ignore": {
+      "version": "7.0.5",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.5.tgz",
+      "integrity": "sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/@nuxt/kit/node_modules/pkg-types": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-2.3.0.tgz",
+      "integrity": "sha512-SIqCzDRg0s9npO5XQ3tNZioRY1uK06lA41ynBC1YmFTmnY6FjUjVt6s4LoADmwoig1qqD0oK8h1p/8mlMx8Oig==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "confbox": "^0.2.2",
+        "exsolve": "^1.0.7",
+        "pathe": "^2.0.3"
+      }
+    },
     "node_modules/@parcel/watcher": {
       "version": "2.5.6",
       "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.6.tgz",