client/visitor: deduplicate visitor connection handshake and wrapping

Extract two shared helpers to eliminate duplicated code across STCP, SUDP, and XTCP visitors: - dialRawVisitorConn: handles ConnectServer + NewVisitorConn handshake (auth, sign key, 10s read deadline, error check) - wrapVisitorConn: handles encryption + pooled compression wrapping, returning a recycleFn for pool resource cleanup SUDP is upgraded from WithCompression to WithCompressionFromPool, aligning with the pooled compression used by STCP and XTCP.
2026-04-14 04:59:11 +08:00 · 2026-03-08 00:58:30 +08:00
173 changed files with 13856 additions and 9938 deletions
--- a/.github/workflows/build-and-push-image.yml
+++ b/.github/workflows/build-and-push-image.yml
@@ -19,15 +19,15 @@ jobs:
    steps:
      # environment
      - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
        with:
          fetch-depth: '0'

      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v4
+        uses: docker/setup-qemu-action@v3

      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v4
+        uses: docker/setup-buildx-action@v3

      # get image tag name
      - name: Get Image Tag Name
@@ -38,13 +38,13 @@ jobs:
            echo "TAG_NAME=${{ github.event.inputs.tag }}" >> $GITHUB_ENV
          fi
      - name: Login to DockerHub
-        uses: docker/login-action@v4
+        uses: docker/login-action@v3
        with:
          username: ${{ secrets.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_PASSWORD }}

      - name: Login to the GPR
-        uses: docker/login-action@v4
+        uses: docker/login-action@v3
        with:
          registry: ghcr.io
          username: ${{ github.repository_owner }}
@@ -61,7 +61,7 @@ jobs:
          echo "TAG_FRPS_GPR=ghcr.io/fatedier/frps:${{ env.TAG_NAME }}" >> $GITHUB_ENV

      - name: Build and push frpc
-        uses: docker/build-push-action@v7
+        uses: docker/build-push-action@v5
        with:
          context: .
          file: ./dockerfiles/Dockerfile-for-frpc
@@ -72,7 +72,7 @@ jobs:
            ${{ env.TAG_FRPC_GPR }}

      - name: Build and push frps
-        uses: docker/build-push-action@v7
+        uses: docker/build-push-action@v5
        with:
          context: .
          file: ./dockerfiles/Dockerfile-for-frps
--- a/.github/workflows/golangci-lint.yml
+++ b/.github/workflows/golangci-lint.yml
@@ -14,12 +14,12 @@ jobs:
    name: lint
    runs-on: ubuntu-latest
    steps:
-    - uses: actions/checkout@v6
-    - uses: actions/setup-go@v6
+    - uses: actions/checkout@v4
+    - uses: actions/setup-go@v5
      with:
        go-version: '1.25'
        cache: false
-    - uses: actions/setup-node@v6
+    - uses: actions/setup-node@v4
      with:
        node-version: '22'
    - name: Build web assets (frps)
--- a/.github/workflows/goreleaser.yml
+++ b/.github/workflows/goreleaser.yml
@@ -8,15 +8,15 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
        with:
          fetch-depth: 0

      - name: Set up Go
-        uses: actions/setup-go@v6
+        uses: actions/setup-go@v5
        with:
          go-version: '1.25'
-      - uses: actions/setup-node@v6
+      - uses: actions/setup-node@v4
        with:
          node-version: '22'
      - name: Build web assets (frps)
@@ -30,7 +30,7 @@ jobs:
          ./package.sh

      - name: Run GoReleaser
-        uses: goreleaser/goreleaser-action@v7
+        uses: goreleaser/goreleaser-action@v6
        with:
          version: latest
          args: release --clean --release-notes=./Release.md
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -19,7 +19,7 @@ jobs:
      actions: write
    runs-on: ubuntu-latest
    steps:
-    - uses: actions/stale@v10
+    - uses: actions/stale@v9
      with:
        stale-issue-message: 'Issues go stale after 14d of inactivity. Stale issues rot after an additional 3d of inactivity and eventually close.'
        stale-pr-message: "PRs go stale after 14d of inactivity. Stale PRs rot after an additional 3d of inactivity and eventually close."
--- a/.gitignore
+++ b/.gitignore
@@ -25,12 +25,10 @@ dist/
 client.crt
 client.key

-node_modules/
-
 # Cache
 *.swp

 # AI
-.claude/
+CLAUDE.md
+AGENTS.md
 .sisyphus/
-.superpowers/
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -90,7 +90,6 @@ linters:
    - third_party$
    - builtin$
    - examples$
-    - node_modules
 formatters:
  enable:
  - gci
@@ -113,7 +112,6 @@ formatters:
    - third_party$
    - builtin$
    - examples$
-    - node_modules
 issues:
  max-issues-per-linter: 0
  max-same-issues: 0
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -1,39 +0,0 @@
-# AGENTS.md
-
-## Development Commands
-
-### Build
- `make build` - Build both frps and frpc binaries
- `make frps` - Build server binary only
- `make frpc` - Build client binary only
- `make all` - Build everything with formatting
-
-### Testing
- `make test` - Run unit tests
- `make e2e` - Run end-to-end tests
- `make e2e-trace` - Run e2e tests with trace logging
- `make alltest` - Run all tests including vet, unit tests, and e2e
-
-### Code Quality
- `make fmt` - Run go fmt
- `make fmt-more` - Run gofumpt for more strict formatting
- `make gci` - Run gci import organizer
- `make vet` - Run go vet
- `golangci-lint run` - Run comprehensive linting (configured in .golangci.yml)
-
-### Assets
- `make web` - Build web dashboards (frps and frpc)
-
-### Cleanup
- `make clean` - Remove built binaries and temporary files
-
-## Testing
-
- E2E tests using Ginkgo/Gomega framework
- Mock servers in `/test/e2e/mock/`
- Run: `make e2e` or `make alltest`
-
-## Agent Runbooks
-
-Operational procedures for agents are in `doc/agents/`:
- `doc/agents/release.md` - Release process
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -1 +0,0 @@
-AGENTS.md
--- a/README.md
+++ b/README.md
@@ -13,16 +13,6 @@ frp is an open source project with its ongoing development made possible entirel

 <h3 align="center">Gold Sponsors</h3>
 <!--gold sponsors start-->
-<p align="center">
-  <a href="https://github.com/beclab/Olares" target="_blank">
-    <img width="420px" src="https://raw.githubusercontent.com/fatedier/frp/dev/doc/pic/sponsor_olares.jpeg">
-	<br>
-	<b>The sovereign cloud that puts you in control</b>
-	<br>
-	<sub>An open source, self-hosted alternative to public clouds, built for data ownership and privacy</sub>
-  </a>
-</p>
-
 <div align="center">

 ## Recall.ai - API for meeting recordings
@@ -50,6 +40,16 @@ an API that records Zoom, Google Meet, Microsoft Teams, in-person meetings, and
 	<b>The complete IDE crafted for professional Go developers</b>
  </a>
 </p>
+
+<p align="center">
+  <a href="https://github.com/beclab/Olares" target="_blank">
+    <img width="420px" src="https://raw.githubusercontent.com/fatedier/frp/dev/doc/pic/sponsor_olares.jpeg">
+	<br>
+	<b>The sovereign cloud that puts you in control</b>
+	<br>
+	<sub>An open source, self-hosted alternative to public clouds, built for data ownership and privacy</sub>
+  </a>
+</p>
 <!--gold sponsors end-->

 ## What is frp?
@@ -81,7 +81,6 @@ frp also offers a P2P connect mode.
    * [Split Configures Into Different Files](#split-configures-into-different-files)
    * [Server Dashboard](#server-dashboard)
    * [Client Admin UI](#client-admin-ui)
-        * [Dynamic Proxy Management (Store)](#dynamic-proxy-management-store)
    * [Monitor](#monitor)
        * [Prometheus](#prometheus)
    * [Authenticating the Client](#authenticating-the-client)
@@ -150,9 +149,7 @@ We sincerely appreciate your support for frp.

 ## Architecture

-<p align="center">
-  <img src="/doc/pic/architecture.jpg" alt="architecture" width="760">
-</p>
+![architecture](/doc/pic/architecture.png)

 ## Example Usage

@@ -596,7 +593,7 @@ Then visit `https://[serverAddr]:7500` to see the dashboard in secure HTTPS conn

 ### Client Admin UI

-The Client Admin UI helps you check and manage frpc's configuration and proxies.
+The Client Admin UI helps you check and manage frpc's configuration.

 Configure an address for admin UI to enable this feature:

@@ -609,19 +606,6 @@ webServer.password = "admin"

 Then visit `http://127.0.0.1:7400` to see admin UI, with username and password both being `admin`.

-#### Dynamic Proxy Management (Store)
-
-You can dynamically create, update, and delete proxies and visitors at runtime through the Web UI or API, without restarting frpc.
-
-To enable this feature, configure `store.path` to specify a file for persisting the configurations:
-
-```toml
-[store]
-path = "./db.json"
-```
-
-Proxies and visitors managed through the Store are saved to disk and automatically restored on frpc restart. They work alongside proxies defined in the configuration file — Store entries take precedence when names conflict.
-
 ### Monitor

 When web server is enabled, frps will save monitor data in cache for 7 days. It will be cleared after process restart.
--- a/README_zh.md
+++ b/README_zh.md
@@ -15,16 +15,6 @@ frp 是一个完全开源的项目，我们的开发工作完全依靠赞助者

 <h3 align="center">Gold Sponsors</h3>
 <!--gold sponsors start-->
-<p align="center">
-  <a href="https://github.com/beclab/Olares" target="_blank">
-    <img width="420px" src="https://raw.githubusercontent.com/fatedier/frp/dev/doc/pic/sponsor_olares.jpeg">
-	<br>
-	<b>The sovereign cloud that puts you in control</b>
-	<br>
-	<sub>An open source, self-hosted alternative to public clouds, built for data ownership and privacy</sub>
-  </a>
-</p>
-
 <div align="center">

 ## Recall.ai - API for meeting recordings
@@ -52,6 +42,16 @@ an API that records Zoom, Google Meet, Microsoft Teams, in-person meetings, and
 	<b>The complete IDE crafted for professional Go developers</b>
  </a>
 </p>
+
+<p align="center">
+  <a href="https://github.com/beclab/Olares" target="_blank">
+    <img width="420px" src="https://raw.githubusercontent.com/fatedier/frp/dev/doc/pic/sponsor_olares.jpeg">
+	<br>
+	<b>The sovereign cloud that puts you in control</b>
+	<br>
+	<sub>An open source, self-hosted alternative to public clouds, built for data ownership and privacy</sub>
+  </a>
+</p>
 <!--gold sponsors end-->

 ## 为什么使用 frp ？
--- a/Release.md
+++ b/Release.md
@@ -1,3 +1,9 @@
-## Fixes
+## Features

-* Fixed a configuration-dependent authentication bypass in `type = "http"` proxies when `routeByHTTPUser` is used together with `httpUser` / `httpPassword`. This affected proxy-style requests. Proxy-style authentication failures now return `407 Proxy Authentication Required`.
+* Added a built-in `store` capability for frpc, including persisted store source (`[store] path = "..."`), Store CRUD admin APIs (`/api/store/proxies*`, `/api/store/visitors*`) with runtime reload, and Store management pages in the frpc web dashboard.
+
+## Improvements
+
+* Kept proxy/visitor names as raw config names during completion; moved user-prefix handling to explicit wire-level naming logic.
+* Added `noweb` build tag to allow compiling without frontend assets. `make build` now auto-detects missing `web/*/dist` directories and skips embedding, so a fresh clone can build without running `make web` first. The dashboard gracefully returns 404 when assets are not embedded.
+* Improved config parsing errors: for `.toml` files, syntax errors now return immediately with parser position details (line/column when available) instead of falling through to YAML/JSON parsing, and TOML type mismatches report field-level errors without misleading line numbers.
--- a/client/api_router.go
+++ b/client/api_router.go
@@ -38,8 +38,6 @@ func (svr *Service) registerRouteHandlers(helper *httppkg.RouterRegisterHelper)
 	subRouter.HandleFunc("/api/status", httppkg.MakeHTTPHandlerFunc(apiController.Status)).Methods(http.MethodGet)
 	subRouter.HandleFunc("/api/config", httppkg.MakeHTTPHandlerFunc(apiController.GetConfig)).Methods(http.MethodGet)
 	subRouter.HandleFunc("/api/config", httppkg.MakeHTTPHandlerFunc(apiController.PutConfig)).Methods(http.MethodPut)
-	subRouter.HandleFunc("/api/proxy/{name}/config", httppkg.MakeHTTPHandlerFunc(apiController.GetProxyConfig)).Methods(http.MethodGet)
-	subRouter.HandleFunc("/api/visitor/{name}/config", httppkg.MakeHTTPHandlerFunc(apiController.GetVisitorConfig)).Methods(http.MethodGet)

 	if svr.storeSource != nil {
 		subRouter.HandleFunc("/api/store/proxies", httppkg.MakeHTTPHandlerFunc(apiController.ListStoreProxies)).Methods(http.MethodGet)
--- a/client/config_manager.go
+++ b/client/config_manager.go
@@ -80,48 +80,6 @@ func (m *serviceConfigManager) GetProxyStatus() []*proxy.WorkingStatus {
 	return m.svr.getAllProxyStatus()
 }

-func (m *serviceConfigManager) GetProxyConfig(name string) (v1.ProxyConfigurer, bool) {
-	// Try running proxy manager first
-	ws, ok := m.svr.getProxyStatus(name)
-	if ok {
-		return ws.Cfg, true
-	}
-
-	// Fallback to store
-	m.svr.reloadMu.Lock()
-	storeSource := m.svr.storeSource
-	m.svr.reloadMu.Unlock()
-
-	if storeSource != nil {
-		cfg := storeSource.GetProxy(name)
-		if cfg != nil {
-			return cfg, true
-		}
-	}
-	return nil, false
-}
-
-func (m *serviceConfigManager) GetVisitorConfig(name string) (v1.VisitorConfigurer, bool) {
-	// Try running visitor manager first
-	cfg, ok := m.svr.getVisitorCfg(name)
-	if ok {
-		return cfg, true
-	}
-
-	// Fallback to store
-	m.svr.reloadMu.Lock()
-	storeSource := m.svr.storeSource
-	m.svr.reloadMu.Unlock()
-
-	if storeSource != nil {
-		vcfg := storeSource.GetVisitor(name)
-		if vcfg != nil {
-			return vcfg, true
-		}
-	}
-	return nil, false
-}
-
 func (m *serviceConfigManager) IsStoreProxyEnabled(name string) bool {
 	if name == "" {
 		return false
--- a/client/configmgmt/types.go
+++ b/client/configmgmt/types.go
@@ -26,9 +26,6 @@ type ConfigManager interface {
 	IsStoreProxyEnabled(name string) bool
 	StoreEnabled() bool

-	GetProxyConfig(name string) (v1.ProxyConfigurer, bool)
-	GetVisitorConfig(name string) (v1.VisitorConfigurer, bool)
-
 	ListStoreProxies() ([]v1.ProxyConfigurer, error)
 	GetStoreProxy(name string) (v1.ProxyConfigurer, error)
 	CreateStoreProxy(cfg v1.ProxyConfigurer) (v1.ProxyConfigurer, error)
--- a/client/connector.go
+++ b/client/connector.go
@@ -119,7 +119,6 @@ func (c *defaultConnectorImpl) Open() error {
 	fmuxCfg.MaxStreamWindowSize = 6 * 1024 * 1024
 	session, err := fmux.Client(conn, fmuxCfg)
 	if err != nil {
-		conn.Close()
 		return err
 	}
 	c.muxSession = session
--- a/client/http/controller.go
+++ b/client/http/controller.go
@@ -162,44 +162,6 @@ func (c *Controller) buildProxyStatusResp(status *proxy.WorkingStatus) model.Pro
 	return psr
 }

-// GetProxyConfig handles GET /api/proxy/{name}/config
-func (c *Controller) GetProxyConfig(ctx *httppkg.Context) (any, error) {
-	name := ctx.Param("name")
-	if name == "" {
-		return nil, httppkg.NewError(http.StatusBadRequest, "proxy name is required")
-	}
-
-	cfg, ok := c.manager.GetProxyConfig(name)
-	if !ok {
-		return nil, httppkg.NewError(http.StatusNotFound, fmt.Sprintf("proxy %q not found", name))
-	}
-
-	payload, err := model.ProxyDefinitionFromConfigurer(cfg)
-	if err != nil {
-		return nil, httppkg.NewError(http.StatusInternalServerError, err.Error())
-	}
-	return payload, nil
-}
-
-// GetVisitorConfig handles GET /api/visitor/{name}/config
-func (c *Controller) GetVisitorConfig(ctx *httppkg.Context) (any, error) {
-	name := ctx.Param("name")
-	if name == "" {
-		return nil, httppkg.NewError(http.StatusBadRequest, "visitor name is required")
-	}
-
-	cfg, ok := c.manager.GetVisitorConfig(name)
-	if !ok {
-		return nil, httppkg.NewError(http.StatusNotFound, fmt.Sprintf("visitor %q not found", name))
-	}
-
-	payload, err := model.VisitorDefinitionFromConfigurer(cfg)
-	if err != nil {
-		return nil, httppkg.NewError(http.StatusInternalServerError, err.Error())
-	}
-	return payload, nil
-}
-
 func (c *Controller) ListStoreProxies(ctx *httppkg.Context) (any, error) {
 	proxies, err := c.manager.ListStoreProxies()
 	if err != nil {
--- a/client/http/controller_test.go
+++ b/client/http/controller_test.go
@@ -26,8 +26,6 @@ type fakeConfigManager struct {
 	getProxyStatusFn      func() []*proxy.WorkingStatus
 	isStoreProxyEnabledFn func(name string) bool
 	storeEnabledFn        func() bool
-	getProxyConfigFn      func(name string) (v1.ProxyConfigurer, bool)
-	getVisitorConfigFn    func(name string) (v1.VisitorConfigurer, bool)

 	listStoreProxiesFn  func() ([]v1.ProxyConfigurer, error)
 	getStoreProxyFn     func(name string) (v1.ProxyConfigurer, error)
@@ -84,20 +82,6 @@ func (m *fakeConfigManager) StoreEnabled() bool {
 	return false
 }

-func (m *fakeConfigManager) GetProxyConfig(name string) (v1.ProxyConfigurer, bool) {
-	if m.getProxyConfigFn != nil {
-		return m.getProxyConfigFn(name)
-	}
-	return nil, false
-}
-
-func (m *fakeConfigManager) GetVisitorConfig(name string) (v1.VisitorConfigurer, bool) {
-	if m.getVisitorConfigFn != nil {
-		return m.getVisitorConfigFn(name)
-	}
-	return nil, false
-}
-
 func (m *fakeConfigManager) ListStoreProxies() ([]v1.ProxyConfigurer, error) {
 	if m.listStoreProxiesFn != nil {
 		return m.listStoreProxiesFn()
@@ -545,118 +529,3 @@ func TestUpdateStoreProxyReturnsTypedPayload(t *testing.T) {
 		t.Fatalf("unexpected response payload: %#v", payload)
 	}
 }
-
-func TestGetProxyConfigFromManager(t *testing.T) {
-	controller := &Controller{
-		manager: &fakeConfigManager{
-			getProxyConfigFn: func(name string) (v1.ProxyConfigurer, bool) {
-				if name == "ssh" {
-					cfg := &v1.TCPProxyConfig{
-						ProxyBaseConfig: v1.ProxyBaseConfig{
-							Name: "ssh",
-							Type: "tcp",
-							ProxyBackend: v1.ProxyBackend{
-								LocalPort: 22,
-							},
-						},
-					}
-					return cfg, true
-				}
-				return nil, false
-			},
-		},
-	}
-
-	req := httptest.NewRequest(http.MethodGet, "/api/proxy/ssh/config", nil)
-	req = mux.SetURLVars(req, map[string]string{"name": "ssh"})
-	ctx := httppkg.NewContext(httptest.NewRecorder(), req)
-
-	resp, err := controller.GetProxyConfig(ctx)
-	if err != nil {
-		t.Fatalf("get proxy config: %v", err)
-	}
-	payload, ok := resp.(model.ProxyDefinition)
-	if !ok {
-		t.Fatalf("unexpected response type: %T", resp)
-	}
-	if payload.Name != "ssh" || payload.Type != "tcp" || payload.TCP == nil {
-		t.Fatalf("unexpected payload: %#v", payload)
-	}
-}
-
-func TestGetProxyConfigNotFound(t *testing.T) {
-	controller := &Controller{
-		manager: &fakeConfigManager{
-			getProxyConfigFn: func(name string) (v1.ProxyConfigurer, bool) {
-				return nil, false
-			},
-		},
-	}
-
-	req := httptest.NewRequest(http.MethodGet, "/api/proxy/missing/config", nil)
-	req = mux.SetURLVars(req, map[string]string{"name": "missing"})
-	ctx := httppkg.NewContext(httptest.NewRecorder(), req)
-
-	_, err := controller.GetProxyConfig(ctx)
-	if err == nil {
-		t.Fatal("expected error")
-	}
-	assertHTTPCode(t, err, http.StatusNotFound)
-}
-
-func TestGetVisitorConfigFromManager(t *testing.T) {
-	controller := &Controller{
-		manager: &fakeConfigManager{
-			getVisitorConfigFn: func(name string) (v1.VisitorConfigurer, bool) {
-				if name == "my-stcp" {
-					cfg := &v1.STCPVisitorConfig{
-						VisitorBaseConfig: v1.VisitorBaseConfig{
-							Name:       "my-stcp",
-							Type:       "stcp",
-							ServerName: "server1",
-							BindPort:   9000,
-						},
-					}
-					return cfg, true
-				}
-				return nil, false
-			},
-		},
-	}
-
-	req := httptest.NewRequest(http.MethodGet, "/api/visitor/my-stcp/config", nil)
-	req = mux.SetURLVars(req, map[string]string{"name": "my-stcp"})
-	ctx := httppkg.NewContext(httptest.NewRecorder(), req)
-
-	resp, err := controller.GetVisitorConfig(ctx)
-	if err != nil {
-		t.Fatalf("get visitor config: %v", err)
-	}
-	payload, ok := resp.(model.VisitorDefinition)
-	if !ok {
-		t.Fatalf("unexpected response type: %T", resp)
-	}
-	if payload.Name != "my-stcp" || payload.Type != "stcp" || payload.STCP == nil {
-		t.Fatalf("unexpected payload: %#v", payload)
-	}
-}
-
-func TestGetVisitorConfigNotFound(t *testing.T) {
-	controller := &Controller{
-		manager: &fakeConfigManager{
-			getVisitorConfigFn: func(name string) (v1.VisitorConfigurer, bool) {
-				return nil, false
-			},
-		},
-	}
-
-	req := httptest.NewRequest(http.MethodGet, "/api/visitor/missing/config", nil)
-	req = mux.SetURLVars(req, map[string]string{"name": "missing"})
-	ctx := httppkg.NewContext(httptest.NewRecorder(), req)
-
-	_, err := controller.GetVisitorConfig(ctx)
-	if err == nil {
-		t.Fatal("expected error")
-	}
-	assertHTTPCode(t, err, http.StatusNotFound)
-}
--- a/client/service.go
+++ b/client/service.go
@@ -19,7 +19,6 @@ import (
 	"errors"
 	"fmt"
 	"net"
-	"net/http"
 	"os"
 	"runtime"
 	"sync"
@@ -163,6 +162,15 @@ func NewService(options ServiceOptions) (*Service, error) {
 		return nil, err
 	}

+	var webServer *httppkg.Server
+	if options.Common.WebServer.Port > 0 {
+		ws, err := httppkg.NewServer(options.Common.WebServer)
+		if err != nil {
+			return nil, err
+		}
+		webServer = ws
+	}
+
 	authRuntime, err := auth.BuildClientAuth(&options.Common.Auth)
 	if err != nil {
 		return nil, err
@@ -183,17 +191,6 @@ func NewService(options ServiceOptions) (*Service, error) {
 	proxyCfgs = config.CompleteProxyConfigurers(proxyCfgs)
 	visitorCfgs = config.CompleteVisitorConfigurers(visitorCfgs)

-	// Create the web server after all fallible steps so its listener is not
-	// leaked when an earlier error causes NewService to return.
-	var webServer *httppkg.Server
-	if options.Common.WebServer.Port > 0 {
-		ws, err := httppkg.NewServer(options.Common.WebServer)
-		if err != nil {
-			return nil, err
-		}
-		webServer = ws
-	}
-
 	s := &Service{
 		ctx:              context.Background(),
 		auth:             authRuntime,
@@ -232,25 +229,22 @@ func (svr *Service) Run(ctx context.Context) error {
 	}

 	if svr.vnetController != nil {
-		vnetController := svr.vnetController
 		if err := svr.vnetController.Init(); err != nil {
 			log.Errorf("init virtual network controller error: %v", err)
-			svr.stop()
 			return err
 		}
 		go func() {
 			log.Infof("virtual network controller start...")
-			if err := vnetController.Run(); err != nil && !errors.Is(err, net.ErrClosed) {
+			if err := svr.vnetController.Run(); err != nil {
 				log.Warnf("virtual network controller exit with error: %v", err)
 			}
 		}()
 	}

 	if svr.webServer != nil {
-		webServer := svr.webServer
 		go func() {
-			log.Infof("admin server listen on %s", webServer.Address())
-			if err := webServer.Run(); err != nil && !errors.Is(err, http.ErrServerClosed) {
+			log.Infof("admin server listen on %s", svr.webServer.Address())
+			if err := svr.webServer.Run(); err != nil {
 				log.Warnf("admin server exit with error: %v", err)
 			}
 		}()
@@ -261,7 +255,6 @@ func (svr *Service) Run(ctx context.Context) error {
 	if svr.ctl == nil {
 		cancelCause := cancelErr{}
 		_ = errors.As(context.Cause(svr.ctx), &cancelCause)
-		svr.stop()
 		return fmt.Errorf("login to the server failed: %v. With loginFailExit enabled, no additional retries will be attempted", cancelCause.Err)
 	}

@@ -504,10 +497,6 @@ func (svr *Service) stop() {
 		svr.webServer.Close()
 		svr.webServer = nil
 	}
-	if svr.vnetController != nil {
-		_ = svr.vnetController.Stop()
-		svr.vnetController = nil
-	}
 }

 func (svr *Service) getProxyStatus(name string) (*proxy.WorkingStatus, bool) {
@@ -521,17 +510,6 @@ func (svr *Service) getProxyStatus(name string) (*proxy.WorkingStatus, bool) {
 	return ctl.pm.GetProxyStatus(name)
 }

-func (svr *Service) getVisitorCfg(name string) (v1.VisitorConfigurer, bool) {
-	svr.ctlMu.RLock()
-	ctl := svr.ctl
-	svr.ctlMu.RUnlock()
-
-	if ctl == nil {
-		return nil, false
-	}
-	return ctl.vm.GetVisitorCfg(name)
-}
-
 func (svr *Service) StatusExporter() StatusExporter {
 	return &statusExporterImpl{
 		getProxyStatusFunc: svr.getProxyStatus,
--- a/client/service_test.go
+++ b/client/service_test.go
@@ -1,120 +1,14 @@
 package client

 import (
-	"context"
-	"errors"
-	"net"
 	"path/filepath"
-	"strconv"
 	"strings"
 	"testing"

-	"github.com/samber/lo"
-
 	"github.com/fatedier/frp/pkg/config/source"
 	v1 "github.com/fatedier/frp/pkg/config/v1"
 )

-type failingConnector struct {
-	err error
-}
-
-func (c *failingConnector) Open() error {
-	return c.err
-}
-
-func (c *failingConnector) Connect() (net.Conn, error) {
-	return nil, c.err
-}
-
-func (c *failingConnector) Close() error {
-	return nil
-}
-
-func getFreeTCPPort(t *testing.T) int {
-	t.Helper()
-
-	ln, err := net.Listen("tcp", "127.0.0.1:0")
-	if err != nil {
-		t.Fatalf("listen on ephemeral port: %v", err)
-	}
-	defer ln.Close()
-
-	return ln.Addr().(*net.TCPAddr).Port
-}
-
-func TestRunStopsStartedComponentsOnInitialLoginFailure(t *testing.T) {
-	port := getFreeTCPPort(t)
-	agg := source.NewAggregator(source.NewConfigSource())
-
-	svr, err := NewService(ServiceOptions{
-		Common: &v1.ClientCommonConfig{
-			LoginFailExit: lo.ToPtr(true),
-			WebServer: v1.WebServerConfig{
-				Addr: "127.0.0.1",
-				Port: port,
-			},
-		},
-		ConfigSourceAggregator: agg,
-		ConnectorCreator: func(context.Context, *v1.ClientCommonConfig) Connector {
-			return &failingConnector{err: errors.New("login boom")}
-		},
-	})
-	if err != nil {
-		t.Fatalf("new service: %v", err)
-	}
-
-	err = svr.Run(context.Background())
-	if err == nil {
-		t.Fatal("expected run error, got nil")
-	}
-	if !strings.Contains(err.Error(), "login boom") {
-		t.Fatalf("unexpected error: %v", err)
-	}
-	if svr.webServer != nil {
-		t.Fatal("expected web server to be cleaned up after initial login failure")
-	}
-
-	ln, err := net.Listen("tcp", net.JoinHostPort("127.0.0.1", strconv.Itoa(port)))
-	if err != nil {
-		t.Fatalf("expected admin port to be released: %v", err)
-	}
-	_ = ln.Close()
-}
-
-func TestNewServiceDoesNotLeakAdminListenerOnAuthBuildFailure(t *testing.T) {
-	port := getFreeTCPPort(t)
-	agg := source.NewAggregator(source.NewConfigSource())
-
-	_, err := NewService(ServiceOptions{
-		Common: &v1.ClientCommonConfig{
-			Auth: v1.AuthClientConfig{
-				Method: v1.AuthMethodOIDC,
-				OIDC: v1.AuthOIDCClientConfig{
-					TokenEndpointURL: "://bad",
-				},
-			},
-			WebServer: v1.WebServerConfig{
-				Addr: "127.0.0.1",
-				Port: port,
-			},
-		},
-		ConfigSourceAggregator: agg,
-	})
-	if err == nil {
-		t.Fatal("expected new service error, got nil")
-	}
-	if !strings.Contains(err.Error(), "auth.oidc.tokenEndpointURL") {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	ln, err := net.Listen("tcp", net.JoinHostPort("127.0.0.1", strconv.Itoa(port)))
-	if err != nil {
-		t.Fatalf("expected admin port to remain free: %v", err)
-	}
-	_ = ln.Close()
-}
-
 func TestUpdateConfigSourceRollsBackReloadCommonOnReplaceAllFailure(t *testing.T) {
 	prevCommon := &v1.ClientCommonConfig{User: "old-user"}
 	newCommon := &v1.ClientCommonConfig{User: "new-user"}
--- a/client/visitor/visitor_manager.go
+++ b/client/visitor/visitor_manager.go
@@ -191,13 +191,6 @@ func (vm *Manager) TransferConn(name string, conn net.Conn) error {
 	return v.AcceptConn(conn)
 }

-func (vm *Manager) GetVisitorCfg(name string) (v1.VisitorConfigurer, bool) {
-	vm.mu.RLock()
-	defer vm.mu.RUnlock()
-	cfg, ok := vm.cfgs[name]
-	return cfg, ok
-}
-
 type visitorHelperImpl struct {
 	connectServerFn func() (net.Conn, error)
 	msgTransporter  transport.MessageTransporter
--- a/doc/agents/release.md
+++ b/doc/agents/release.md
@@ -1,80 +0,0 @@
-# Release Process
-
-## 1. Update Release Notes
-
-Edit `Release.md` in the project root with the changes for this version:
-
-```markdown
-## Features
-* ...
-
-## Improvements
-* ...
-
-## Fixes
-* ...
-```
-
-This file is used by GoReleaser as the GitHub Release body.
-
-## 2. Bump Version
-
-Update the version string in `pkg/util/version/version.go`:
-
-```go
-var version = "0.X.0"
-```
-
-Commit and push to `dev`:
-
-```bash
-git add pkg/util/version/version.go Release.md
-git commit -m "bump version to vX.Y.Z"
-git push origin dev
-```
-
-## 3. Merge dev → master
-
-Create a PR from `dev` to `master`:
-
-```bash
-gh pr create --base master --head dev --title "bump version"
-```
-
-Wait for CI to pass, then merge using **merge commit** (not squash).
-
-## 4. Tag the Release
-
-```bash
-git checkout master
-git pull origin master
-git tag -a vX.Y.Z -m "bump version"
-git push origin vX.Y.Z
-```
-
-## 5. Trigger GoReleaser
-
-Manually trigger the `goreleaser` workflow in GitHub Actions:
-
-```bash
-gh workflow run goreleaser --ref master
-```
-
-GoReleaser will:
-1. Run `package.sh` to cross-compile all platforms and create archives
-2. Create a GitHub Release with all packages, using `Release.md` as release notes
-
-## Key Files
-
-| File | Purpose |
-|------|---------|
-| `pkg/util/version/version.go` | Version string |
-| `Release.md` | Release notes (read by GoReleaser) |
-| `.goreleaser.yml` | GoReleaser config |
-| `package.sh` | Cross-compile and packaging script |
-| `.github/workflows/goreleaser.yml` | GitHub Actions workflow (manual trigger) |
-
-## Versioning
-
- Minor release: `v0.X.0`
- Patch release: `v0.X.Y` (e.g., `v0.62.1`)
--- a/doc/pic/architecture.jpg
+++ b/doc/pic/architecture.jpg
--- a/doc/pic/architecture.png
+++ b/doc/pic/architecture.png
--- a/dockerfiles/Dockerfile-for-frpc
+++ b/dockerfiles/Dockerfile-for-frpc
@@ -1,11 +1,8 @@
 FROM node:22 AS web-builder

-COPY web/package.json /web/package.json
-COPY web/shared/ /web/shared/
-COPY web/frpc/ /web/frpc/
-WORKDIR /web
-RUN npm install
 WORKDIR /web/frpc
+COPY web/frpc/ ./
+RUN npm install
 RUN npm run build

 FROM golang:1.25 AS building
--- a/dockerfiles/Dockerfile-for-frps
+++ b/dockerfiles/Dockerfile-for-frps
@@ -1,11 +1,8 @@
 FROM node:22 AS web-builder

-COPY web/package.json /web/package.json
-COPY web/shared/ /web/shared/
-COPY web/frps/ /web/frps/
-WORKDIR /web
-RUN npm install
 WORKDIR /web/frps
+COPY web/frps/ ./
+RUN npm install
 RUN npm run build

 FROM golang:1.25 AS building
--- a/go.mod
+++ b/go.mod
@@ -5,7 +5,7 @@ go 1.25.0
 require (
 	github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5
 	github.com/coreos/go-oidc/v3 v3.14.1
-	github.com/fatedier/golib v0.6.0
+	github.com/fatedier/golib v0.5.1
 	github.com/google/uuid v1.6.0
 	github.com/gorilla/mux v1.8.1
 	github.com/gorilla/websocket v1.5.0
@@ -13,7 +13,7 @@ require (
 	github.com/onsi/ginkgo/v2 v2.23.4
 	github.com/onsi/gomega v1.36.3
 	github.com/pelletier/go-toml/v2 v2.2.0
-	github.com/pion/stun/v3 v3.1.1
+	github.com/pion/stun/v2 v2.0.0
 	github.com/pires/go-proxyproto v0.7.0
 	github.com/prometheus/client_golang v1.19.1
 	github.com/quic-go/quic-go v0.55.0
@@ -22,15 +22,15 @@ require (
 	github.com/songgao/water v0.0.0-20200317203138-2b4b6d7c09d8
 	github.com/spf13/cobra v1.8.0
 	github.com/spf13/pflag v1.0.5
-	github.com/stretchr/testify v1.11.1
+	github.com/stretchr/testify v1.10.0
 	github.com/tidwall/gjson v1.17.1
 	github.com/vishvananda/netlink v1.3.0
 	github.com/xtaci/kcp-go/v5 v5.6.13
-	golang.org/x/crypto v0.49.0
-	golang.org/x/net v0.52.0
+	golang.org/x/crypto v0.41.0
+	golang.org/x/net v0.43.0
 	golang.org/x/oauth2 v0.28.0
-	golang.org/x/sync v0.20.0
-	golang.org/x/time v0.10.0
+	golang.org/x/sync v0.16.0
+	golang.org/x/time v0.5.0
 	golang.zx2c4.com/wireguard v0.0.0-20231211153847-12269c276173
 	gopkg.in/ini.v1 v1.67.0
 	k8s.io/apimachinery v0.28.8
@@ -38,7 +38,7 @@ require (
 )

 require (
-	github.com/Azure/go-ntlmssp v0.1.0 // indirect
+	github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
@@ -51,9 +51,10 @@ require (
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.6 // indirect
 	github.com/klauspost/reedsolomon v1.12.0 // indirect
-	github.com/pion/dtls/v3 v3.0.10 // indirect
-	github.com/pion/logging v0.2.4 // indirect
-	github.com/pion/transport/v4 v4.0.1 // indirect
+	github.com/pion/dtls/v2 v2.2.7 // indirect
+	github.com/pion/logging v0.2.2 // indirect
+	github.com/pion/transport/v2 v2.2.1 // indirect
+	github.com/pion/transport/v3 v3.0.1 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/prometheus/client_model v0.5.0 // indirect
@@ -65,12 +66,11 @@ require (
 	github.com/tidwall/pretty v1.2.0 // indirect
 	github.com/tjfoc/gmsm v1.4.1 // indirect
 	github.com/vishvananda/netns v0.0.4 // indirect
-	github.com/wlynxg/anet v0.0.5 // indirect
 	go.uber.org/automaxprocs v1.6.0 // indirect
-	golang.org/x/mod v0.33.0 // indirect
-	golang.org/x/sys v0.42.0 // indirect
-	golang.org/x/text v0.35.0 // indirect
-	golang.org/x/tools v0.42.0 // indirect
+	golang.org/x/mod v0.27.0 // indirect
+	golang.org/x/sys v0.35.0 // indirect
+	golang.org/x/text v0.28.0 // indirect
+	golang.org/x/tools v0.36.0 // indirect
 	golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 // indirect
 	google.golang.org/protobuf v1.36.5 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
--- a/go.sum
+++ b/go.sum
@@ -1,6 +1,6 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-github.com/Azure/go-ntlmssp v0.1.0 h1:DjFo6YtWzNqNvQdrwEyr/e4nhU3vRiwenz5QX7sFz+A=
-github.com/Azure/go-ntlmssp v0.1.0/go.mod h1:NYqdhxd/8aAct/s4qSYZEerdPuH1liG2/X9DiVTbhpk=
+github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 h1:mFRzDkZVAjdal+s7s0MwaRv9igoPqLRdzOLzw/8Xvq8=
+github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358/go.mod h1:chxPXzSsl7ZWRAuOIE23GDNzjWuZquvFlgA8xmpunjU=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
@@ -20,8 +20,8 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/fatedier/golib v0.6.0 h1:/mgBZZbkbMhIEZoXf7nV8knpUDzas/b+2ruYKxx1lww=
-github.com/fatedier/golib v0.6.0/go.mod h1:ArUGvPg2cOw/py2RAuBt46nNZH2VQ5Z70p109MAZpJw=
+github.com/fatedier/golib v0.5.1 h1:hcKAnaw5mdI/1KWRGejxR+i1Hn/NvbY5UsMKDr7o13M=
+github.com/fatedier/golib v0.5.1/go.mod h1:W6kIYkIFxHsTzbgqg5piCxIiDo4LzwgTY6R5W8l9NFQ=
 github.com/fatedier/yamux v0.0.0-20250825093530-d0154be01cd6 h1:u92UUy6FURPmNsMBUuongRWC0rBqN6gd01Dzu+D21NE=
 github.com/fatedier/yamux v0.0.0-20250825093530-d0154be01cd6/go.mod h1:c5/tk6G0dSpXGzJN7Wk1OEie8grdSJAmeawId9Zvd34=
 github.com/go-jose/go-jose/v4 v4.0.5 h1:M6T8+mKZl/+fNNuFHvGIzDz7BTLQPIounk/b9dw3AaE=
@@ -78,14 +78,16 @@ github.com/onsi/gomega v1.36.3 h1:hID7cr8t3Wp26+cYnfcjR6HpJ00fdogN6dqZ1t6IylU=
 github.com/onsi/gomega v1.36.3/go.mod h1:8D9+Txp43QWKhM24yyOBEdpkzN8FvJyAwecBgsU4KU0=
 github.com/pelletier/go-toml/v2 v2.2.0 h1:QLgLl2yMN7N+ruc31VynXs1vhMZa7CeHHejIeBAsoHo=
 github.com/pelletier/go-toml/v2 v2.2.0/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs=
-github.com/pion/dtls/v3 v3.0.10 h1:k9ekkq1kaZoxnNEbyLKI8DI37j/Nbk1HWmMuywpQJgg=
-github.com/pion/dtls/v3 v3.0.10/go.mod h1:YEmmBYIoBsY3jmG56dsziTv/Lca9y4Om83370CXfqJ8=
-github.com/pion/logging v0.2.4 h1:tTew+7cmQ+Mc1pTBLKH2puKsOvhm32dROumOZ655zB8=
-github.com/pion/logging v0.2.4/go.mod h1:DffhXTKYdNZU+KtJ5pyQDjvOAh/GsNSyv1lbkFbe3so=
-github.com/pion/stun/v3 v3.1.1 h1:CkQxveJ4xGQjulGSROXbXq94TAWu8gIX2dT+ePhUkqw=
-github.com/pion/stun/v3 v3.1.1/go.mod h1:qC1DfmcCTQjl9PBaMa5wSn3x9IPmKxSdcCsxBcDBndM=
-github.com/pion/transport/v4 v4.0.1 h1:sdROELU6BZ63Ab7FrOLn13M6YdJLY20wldXW2Cu2k8o=
-github.com/pion/transport/v4 v4.0.1/go.mod h1:nEuEA4AD5lPdcIegQDpVLgNoDGreqM/YqmEx3ovP4jM=
+github.com/pion/dtls/v2 v2.2.7 h1:cSUBsETxepsCSFSxC3mc/aDo14qQLMSL+O6IjG28yV8=
+github.com/pion/dtls/v2 v2.2.7/go.mod h1:8WiMkebSHFD0T+dIU+UeBaoV7kDhOW5oDCzZ7WZ/F9s=
+github.com/pion/logging v0.2.2 h1:M9+AIj/+pxNsDfAT64+MAVgJO0rsyLnoJKCqf//DoeY=
+github.com/pion/logging v0.2.2/go.mod h1:k0/tDVsRCX2Mb2ZEmTqNa7CWsQPc+YYCB7Q+5pahoms=
+github.com/pion/stun/v2 v2.0.0 h1:A5+wXKLAypxQri59+tmQKVs7+l6mMM+3d+eER9ifRU0=
+github.com/pion/stun/v2 v2.0.0/go.mod h1:22qRSh08fSEttYUmJZGlriq9+03jtVmXNODgLccj8GQ=
+github.com/pion/transport/v2 v2.2.1 h1:7qYnCBlpgSJNYMbLCKuSY9KbQdBFoETvPNETv0y4N7c=
+github.com/pion/transport/v2 v2.2.1/go.mod h1:cXXWavvCnFF6McHTft3DWS9iic2Mftcz1Aq29pGcU5g=
+github.com/pion/transport/v3 v3.0.1 h1:gDTlPJwROfSfz6QfSi0ZmeCSkFcnWWiiR9ES0ouANiM=
+github.com/pion/transport/v3 v3.0.1/go.mod h1:UY7kiITrlMv7/IKgd5eTUcaahZx5oUN3l9SzK5f5xE0=
 github.com/pires/go-proxyproto v0.7.0 h1:IukmRewDQFWC7kfnb66CSomk2q/seBuilHBYFwyq0Hs=
 github.com/pires/go-proxyproto v0.7.0/go.mod h1:Vz/1JPY/OACxWGQNIRY2BeyDmpoaWmEP40O9LbuiFR4=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
@@ -126,10 +128,11 @@ github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpE
 github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
-github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
+github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
+github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/templexxx/cpu v0.1.1 h1:isxHaxBXpYFWnk2DReuKkigaZyrjs2+9ypIdGP4h+HI=
 github.com/templexxx/cpu v0.1.1/go.mod h1:w7Tb+7qgcAlIyX4NhLuDKt78AHA5SzPmq0Wj6HiEnnk=
 github.com/templexxx/xorsimd v0.4.3 h1:9AQTFHd7Bhk3dIT7Al2XeBX5DWOvsUPZCuhyAtNbHjU=
@@ -146,12 +149,11 @@ github.com/vishvananda/netlink v1.3.0 h1:X7l42GfcV4S6E4vHTsw48qbrV+9PVojNfIhZcwQ
 github.com/vishvananda/netlink v1.3.0/go.mod h1:i6NetklAujEcC6fK0JPjT8qSwWyO0HLn4UKG+hGqeJs=
 github.com/vishvananda/netns v0.0.4 h1:Oeaw1EM2JMxD51g9uhtC0D7erkIjgmj8+JZc26m1YX8=
 github.com/vishvananda/netns v0.0.4/go.mod h1:SpkAiCQRtJ6TvvxPnOSyH3BMl6unz3xZlaprSwhNNJM=
-github.com/wlynxg/anet v0.0.5 h1:J3VJGi1gvo0JwZ/P1/Yc/8p63SoW98B5dHkYDmpgvvU=
-github.com/wlynxg/anet v0.0.5/go.mod h1:eay5PRQr7fIVAMbTbchTnO9gG65Hg/uYGdc7mguHxoA=
 github.com/xtaci/kcp-go/v5 v5.6.13 h1:FEjtz9+D4p8t2x4WjciGt/jsIuhlWjjgPCCWjrVR4Hk=
 github.com/xtaci/kcp-go/v5 v5.6.13/go.mod h1:75S1AKYYzNUSXIv30h+jPKJYZUwqpfvLshu63nCNSOM=
 github.com/xtaci/lossyconn v0.0.0-20200209145036-adba10fffc37 h1:EWU6Pktpas0n8lLQwDsRyZfmkPeRbdgPtW609es+/9E=
 github.com/xtaci/lossyconn v0.0.0-20200209145036-adba10fffc37/go.mod h1:HpMP7DB2CyokmAh4lp0EQnnWhmycP/TvwBGzvuie+H0=
+github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 go.uber.org/automaxprocs v1.6.0 h1:O3y2/QNTOdbF+e/dpXNNW7Rx2hZ4sTIPyybbxyNqTUs=
 go.uber.org/automaxprocs v1.6.0/go.mod h1:ifeIMSnPZuznNm6jmdzmU3/bfk01Fe2fotchwEFJ8r8=
 go.uber.org/mock v0.5.2 h1:LbtPTcP8A5k9WPXj54PPPbjcI4Y6lhyOZXn+VS7wNko=
@@ -159,54 +161,89 @@ go.uber.org/mock v0.5.2/go.mod h1:wLlUxC2vVTPTaE3UD51E0BGOAElKrILxhVSDYQLld5o=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20201012173705-84dcc777aaee/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.49.0 h1:+Ng2ULVvLHnJ/ZFEq4KdcDd/cfjrrjjNSXNzxg0Y4U4=
-golang.org/x/crypto v0.49.0/go.mod h1:ErX4dUh2UM+CFYiXZRTcMpEcN8b/1gxEuv3nODoYtCA=
+golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.8.0/go.mod h1:mRqEX+O9/h5TFCrQhkgjo2yKi0yYA+9ecGkdQoHrywE=
+golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw=
+golang.org/x/crypto v0.41.0 h1:WKYxWedPGCTVVl5+WHSSrOBT0O8lx32+zxmHxijgXp4=
+golang.org/x/crypto v0.41.0/go.mod h1:pO5AFd7FA68rFak7rOAGVuygIISepHftHnr8dr6+sUc=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/mod v0.33.0 h1:tHFzIWbBifEmbwtGz65eaWyGiGZatSrT9prnU8DbVL8=
-golang.org/x/mod v0.33.0/go.mod h1:swjeQEj+6r7fODbD2cqrnje9PnziFuw4bmLbBZFrQ5w=
+golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
+golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.27.0 h1:kb+q2PyFnEADO2IEF935ehFUXlWiNjJWtRNgBLSfbxQ=
+golang.org/x/mod v0.27.0/go.mod h1:rWI627Fq0DEoudcK+MBkNkCe0EetEaDSwJJkCcjpazc=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20201010224723-4f7140c49acb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.52.0 h1:He/TN1l0e4mmR3QqHMT2Xab3Aj3L9qjbhRm78/6jrW0=
-golang.org/x/net v0.52.0/go.mod h1:R1MAz7uMZxVMualyPXb+VaqGSa3LIaUqk0eEt3w36Sw=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
+golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns=
+golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
+golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI=
+golang.org/x/net v0.43.0 h1:lat02VYK2j4aLzMzecihNvTlJNQUq316m2Mr9rnM6YE=
+golang.org/x/net v0.43.0/go.mod h1:vhO1fvI4dGsIjh73sWfUVjj3N7CA9WkKJNQm2svM6Jg=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.28.0 h1:CrgCKl8PPAVtLnU3c+EDw6x11699EWlsDeWNWKdIOkc=
 golang.org/x/oauth2 v0.28.0/go.mod h1:onh5ek6nERTohokkhCD/y2cV4Do3fxFHFuAejCkRWT8=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4=
-golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
+golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw=
+golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.42.0 h1:omrd2nAlyT5ESRdCLYdm3+fMfNFE/+Rf4bDIQImRJeo=
-golang.org/x/sys v0.42.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
-golang.org/x/term v0.41.0 h1:QCgPso/Q3RTJx2Th4bDLqML4W6iJiaXFq2/ftQF13YU=
-golang.org/x/term v0.41.0/go.mod h1:3pfBgksrReYfZ5lvYM0kSO0LIkAl4Yl2bXOkKP7Ec2A=
+golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI=
+golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
+golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY=
+golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
+golang.org/x/term v0.11.0/go.mod h1:zC9APTIj3jG3FdV/Ons+XE1riIZXG4aZ4GTHiPZJPIU=
+golang.org/x/term v0.34.0 h1:O/2T7POpk0ZZ7MAzMeWFSg6S5IpWd/RXDlM9hgM3DR4=
+golang.org/x/term v0.34.0/go.mod h1:5jC53AEywhIVebHgPVeg0mj8OD3VO9OzclacVrqpaAw=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.35.0 h1:JOVx6vVDFokkpaq1AEptVzLTpDe9KGpj5tR4/X+ybL8=
-golang.org/x/text v0.35.0/go.mod h1:khi/HExzZJ2pGnjenulevKNX1W67CUy0AsXcNubPGCA=
-golang.org/x/time v0.10.0 h1:3usCWA8tQn0L8+hFJQNgzpWbd89begxN66o1Ojdn5L4=
-golang.org/x/time v0.10.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
+golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
+golang.org/x/text v0.28.0 h1:rhazDwis8INMIwQ4tpjLDzUhx6RlXqZNPEM0huQojng=
+golang.org/x/text v0.28.0/go.mod h1:U8nCwOR8jO/marOQ0QbDiOngZVEBB7MAiitBuMjXiNU=
+golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
+golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.42.0 h1:uNgphsn75Tdz5Ji2q36v/nsFSfR/9BRFvqhGBaJGd5k=
-golang.org/x/tools v0.42.0/go.mod h1:Ma6lCIwGZvHK6XtgbswSoWroEkhugApmsXyrUmBhfr0=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
+golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
+golang.org/x/tools v0.36.0 h1:kWS0uv/zsvHEle1LbV5LE8QujrxB3wfQyxHfhOk0Qkg=
+golang.org/x/tools v0.36.0/go.mod h1:WBDiHKJK8YgLHlcQPYQzNCkUxUypCaa5ZegCVutKm+s=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 h1:B82qJJgjvYKsXS9jeunTOisW56dUokqW/FOteYJJ/yg=
 golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2/go.mod h1:deeaetjYA+DHMHg+sMSMI58GrEteJUUzzw7en6TJQcI=
--- a/pkg/auth/oidc.go
+++ b/pkg/auth/oidc.go
@@ -30,7 +30,6 @@ import (
 	"golang.org/x/oauth2/clientcredentials"

 	v1 "github.com/fatedier/frp/pkg/config/v1"
-	"github.com/fatedier/frp/pkg/config/v1/validation"
 	"github.com/fatedier/frp/pkg/msg"
 )

@@ -76,64 +75,14 @@ func createOIDCHTTPClient(trustedCAFile string, insecureSkipVerify bool, proxyUR
 	return &http.Client{Transport: transport}, nil
 }

-// nonCachingTokenSource wraps a clientcredentials.Config to fetch a fresh
-// token on every call. This is used as a fallback when the OIDC provider
-// does not return expires_in, which would cause a caching TokenSource to
-// hold onto a stale token forever.
-type nonCachingTokenSource struct {
-	cfg *clientcredentials.Config
-	ctx context.Context
-}
-
-func (s *nonCachingTokenSource) Token() (*oauth2.Token, error) {
-	return s.cfg.Token(s.ctx)
-}
-
-// oidcTokenSource wraps a caching oauth2.TokenSource and, on the first
-// successful Token() call, checks whether the provider returns an expiry.
-// If not, it permanently switches to nonCachingTokenSource so that a fresh
-// token is fetched every time.  This avoids an eager network call at
-// construction time, letting the login retry loop handle transient IdP
-// outages.
-type oidcTokenSource struct {
-	mu          sync.Mutex
-	initialized bool
-	source      oauth2.TokenSource
-	fallbackCfg *clientcredentials.Config
-	fallbackCtx context.Context
-}
-
-func (s *oidcTokenSource) Token() (*oauth2.Token, error) {
-	s.mu.Lock()
-	if !s.initialized {
-		token, err := s.source.Token()
-		if err != nil {
-			s.mu.Unlock()
-			return nil, err
-		}
-		if token.Expiry.IsZero() {
-			s.source = &nonCachingTokenSource{cfg: s.fallbackCfg, ctx: s.fallbackCtx}
-		}
-		s.initialized = true
-		s.mu.Unlock()
-		return token, nil
-	}
-	source := s.source
-	s.mu.Unlock()
-	return source.Token()
-}
-
 type OidcAuthProvider struct {
 	additionalAuthScopes []v1.AuthScope

-	tokenSource oauth2.TokenSource
+	tokenGenerator *clientcredentials.Config
+	httpClient     *http.Client
 }

 func NewOidcAuthSetter(additionalAuthScopes []v1.AuthScope, cfg v1.AuthOIDCClientConfig) (*OidcAuthProvider, error) {
-	if err := validation.ValidateOIDCClientCredentialsConfig(&cfg); err != nil {
-		return nil, err
-	}
-
 	eps := make(map[string][]string)
 	for k, v := range cfg.AdditionalEndpointParams {
 		eps[k] = []string{v}
@@ -151,42 +100,30 @@ func NewOidcAuthSetter(additionalAuthScopes []v1.AuthScope, cfg v1.AuthOIDCClien
 		EndpointParams: eps,
 	}

-	// Build the context that TokenSource will use for all future HTTP requests.
-	// context.Background() is appropriate here because the token source is
-	// long-lived and outlives any single request.
-	ctx := context.Background()
+	// Create custom HTTP client if needed
+	var httpClient *http.Client
 	if cfg.TrustedCaFile != "" || cfg.InsecureSkipVerify || cfg.ProxyURL != "" {
-		httpClient, err := createOIDCHTTPClient(cfg.TrustedCaFile, cfg.InsecureSkipVerify, cfg.ProxyURL)
+		var err error
+		httpClient, err = createOIDCHTTPClient(cfg.TrustedCaFile, cfg.InsecureSkipVerify, cfg.ProxyURL)
 		if err != nil {
 			return nil, fmt.Errorf("failed to create OIDC HTTP client: %w", err)
 		}
-		ctx = context.WithValue(ctx, oauth2.HTTPClient, httpClient)
 	}

-	// Create a persistent TokenSource that caches the token and refreshes
-	// it before expiry. This avoids making a new HTTP request to the OIDC
-	// provider on every heartbeat/ping.
-	//
-	// We wrap it in an oidcTokenSource so that the first Token() call
-	// (deferred to SetLogin inside the login retry loop) probes whether the
-	// provider returns expires_in.  If not, it switches to a non-caching
-	// source.  This avoids an eager network call at construction time, which
-	// would prevent loopLoginUntilSuccess from retrying on transient IdP
-	// outages.
-	cachingSource := tokenGenerator.TokenSource(ctx)
-
 	return &OidcAuthProvider{
 		additionalAuthScopes: additionalAuthScopes,
-		tokenSource: &oidcTokenSource{
-			source:      cachingSource,
-			fallbackCfg: tokenGenerator,
-			fallbackCtx: ctx,
-		},
+		tokenGenerator:       tokenGenerator,
+		httpClient:           httpClient,
 	}, nil
 }

 func (auth *OidcAuthProvider) generateAccessToken() (accessToken string, err error) {
-	tokenObj, err := auth.tokenSource.Token()
+	ctx := context.Background()
+	if auth.httpClient != nil {
+		ctx = context.WithValue(ctx, oauth2.HTTPClient, auth.httpClient)
+	}
+
+	tokenObj, err := auth.tokenGenerator.Token(ctx)
 	if err != nil {
 		return "", fmt.Errorf("couldn't generate OIDC token for login: %v", err)
 	}
--- a/pkg/auth/oidc_test.go
+++ b/pkg/auth/oidc_test.go
@@ -2,10 +2,6 @@ package auth_test

 import (
 	"context"
-	"encoding/json"
-	"net/http"
-	"net/http/httptest"
-	"sync/atomic"
 	"testing"
 	"time"

@@ -66,188 +62,3 @@ func TestPingAfterLoginWithDifferentSubjectFails(t *testing.T) {
 	r.Error(err)
 	r.Contains(err.Error(), "received different OIDC subject in login and ping")
 }
-
-func TestOidcAuthProviderFallsBackWhenNoExpiry(t *testing.T) {
-	r := require.New(t)
-
-	var requestCount atomic.Int32
-	tokenServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
-		requestCount.Add(1)
-		w.Header().Set("Content-Type", "application/json")
-		_ = json.NewEncoder(w).Encode(map[string]any{ //nolint:gosec // test-only dummy token response
-			"access_token": "fresh-test-token",
-			"token_type":   "Bearer",
-		})
-	}))
-	defer tokenServer.Close()
-
-	provider, err := auth.NewOidcAuthSetter(
-		[]v1.AuthScope{v1.AuthScopeHeartBeats},
-		v1.AuthOIDCClientConfig{
-			ClientID:         "test-client",
-			ClientSecret:     "test-secret",
-			TokenEndpointURL: tokenServer.URL,
-		},
-	)
-	r.NoError(err)
-
-	// Constructor no longer fetches a token eagerly.
-	// The first SetLogin triggers the adaptive probe.
-	r.Equal(int32(0), requestCount.Load())
-
-	loginMsg := &msg.Login{}
-	err = provider.SetLogin(loginMsg)
-	r.NoError(err)
-	r.Equal("fresh-test-token", loginMsg.PrivilegeKey)
-
-	for range 3 {
-		pingMsg := &msg.Ping{}
-		err = provider.SetPing(pingMsg)
-		r.NoError(err)
-		r.Equal("fresh-test-token", pingMsg.PrivilegeKey)
-	}
-
-	// 1 probe (login) + 3 pings = 4 requests (probe doubles as the login token fetch)
-	r.Equal(int32(4), requestCount.Load(), "each call should fetch a fresh token when expires_in is missing")
-}
-
-func TestOidcAuthProviderCachesToken(t *testing.T) {
-	r := require.New(t)
-
-	var requestCount atomic.Int32
-	tokenServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
-		requestCount.Add(1)
-		w.Header().Set("Content-Type", "application/json")
-		_ = json.NewEncoder(w).Encode(map[string]any{ //nolint:gosec // test-only dummy token response
-			"access_token": "cached-test-token",
-			"token_type":   "Bearer",
-			"expires_in":   3600,
-		})
-	}))
-	defer tokenServer.Close()
-
-	provider, err := auth.NewOidcAuthSetter(
-		[]v1.AuthScope{v1.AuthScopeHeartBeats},
-		v1.AuthOIDCClientConfig{
-			ClientID:         "test-client",
-			ClientSecret:     "test-secret",
-			TokenEndpointURL: tokenServer.URL,
-		},
-	)
-	r.NoError(err)
-
-	// Constructor no longer fetches eagerly; first SetLogin triggers the probe.
-	r.Equal(int32(0), requestCount.Load())
-
-	// SetLogin triggers the adaptive probe and caches the token.
-	loginMsg := &msg.Login{}
-	err = provider.SetLogin(loginMsg)
-	r.NoError(err)
-	r.Equal("cached-test-token", loginMsg.PrivilegeKey)
-	r.Equal(int32(1), requestCount.Load())
-
-	// Subsequent calls should also reuse the cached token
-	for range 5 {
-		pingMsg := &msg.Ping{}
-		err = provider.SetPing(pingMsg)
-		r.NoError(err)
-		r.Equal("cached-test-token", pingMsg.PrivilegeKey)
-	}
-	r.Equal(int32(1), requestCount.Load(), "token endpoint should only be called once; cached token should be reused")
-}
-
-func TestOidcAuthProviderRetriesOnInitialFailure(t *testing.T) {
-	r := require.New(t)
-
-	var requestCount atomic.Int32
-	tokenServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
-		n := requestCount.Add(1)
-		// The oauth2 library retries once internally, so we need two
-		// consecutive failures to surface an error to the caller.
-		if n <= 2 {
-			w.Header().Set("Content-Type", "application/json")
-			w.WriteHeader(http.StatusBadRequest)
-			_ = json.NewEncoder(w).Encode(map[string]any{
-				"error":             "temporarily_unavailable",
-				"error_description": "service is starting up",
-			})
-			return
-		}
-		w.Header().Set("Content-Type", "application/json")
-		_ = json.NewEncoder(w).Encode(map[string]any{ //nolint:gosec // test-only dummy token response
-			"access_token": "retry-test-token",
-			"token_type":   "Bearer",
-			"expires_in":   3600,
-		})
-	}))
-	defer tokenServer.Close()
-
-	// Constructor succeeds even though the IdP is "down".
-	provider, err := auth.NewOidcAuthSetter(
-		[]v1.AuthScope{v1.AuthScopeHeartBeats},
-		v1.AuthOIDCClientConfig{
-			ClientID:         "test-client",
-			ClientSecret:     "test-secret",
-			TokenEndpointURL: tokenServer.URL,
-		},
-	)
-	r.NoError(err)
-	r.Equal(int32(0), requestCount.Load())
-
-	// First SetLogin hits the IdP, which returns an error (after internal retry).
-	loginMsg := &msg.Login{}
-	err = provider.SetLogin(loginMsg)
-	r.Error(err)
-	r.Equal(int32(2), requestCount.Load())
-
-	// Second SetLogin retries and succeeds.
-	err = provider.SetLogin(loginMsg)
-	r.NoError(err)
-	r.Equal("retry-test-token", loginMsg.PrivilegeKey)
-	r.Equal(int32(3), requestCount.Load())
-
-	// Subsequent calls use cached token.
-	pingMsg := &msg.Ping{}
-	err = provider.SetPing(pingMsg)
-	r.NoError(err)
-	r.Equal("retry-test-token", pingMsg.PrivilegeKey)
-	r.Equal(int32(3), requestCount.Load())
-}
-
-func TestNewOidcAuthSetterRejectsInvalidStaticConfig(t *testing.T) {
-	r := require.New(t)
-	tokenServer := httptest.NewServer(http.NotFoundHandler())
-	defer tokenServer.Close()
-
-	_, err := auth.NewOidcAuthSetter(nil, v1.AuthOIDCClientConfig{
-		ClientID:         "test-client",
-		TokenEndpointURL: "://bad",
-	})
-	r.Error(err)
-	r.Contains(err.Error(), "auth.oidc.tokenEndpointURL")
-
-	_, err = auth.NewOidcAuthSetter(nil, v1.AuthOIDCClientConfig{
-		TokenEndpointURL: tokenServer.URL,
-	})
-	r.Error(err)
-	r.Contains(err.Error(), "auth.oidc.clientID is required")
-
-	_, err = auth.NewOidcAuthSetter(nil, v1.AuthOIDCClientConfig{
-		ClientID:         "test-client",
-		TokenEndpointURL: tokenServer.URL,
-		AdditionalEndpointParams: map[string]string{
-			"scope": "profile",
-		},
-	})
-	r.Error(err)
-	r.Contains(err.Error(), "auth.oidc.additionalEndpointParams.scope is not allowed; use auth.oidc.scope instead")
-
-	_, err = auth.NewOidcAuthSetter(nil, v1.AuthOIDCClientConfig{
-		ClientID:                 "test-client",
-		TokenEndpointURL:         tokenServer.URL,
-		Audience:                 "api",
-		AdditionalEndpointParams: map[string]string{"audience": "override"},
-	})
-	r.Error(err)
-	r.Contains(err.Error(), "cannot specify both auth.oidc.audience and auth.oidc.additionalEndpointParams.audience")
-}
--- a/pkg/config/v1/validation/client.go
+++ b/pkg/config/v1/validation/client.go
@@ -88,11 +88,6 @@ func (v *ConfigValidator) validateAuthConfig(c *v1.AuthClientConfig) (Warning, e
 	if err := v.validateOIDCConfig(&c.OIDC); err != nil {
 		errs = AppendError(errs, err)
 	}
-	if c.Method == v1.AuthMethodOIDC && c.OIDC.TokenSource == nil {
-		if err := ValidateOIDCClientCredentialsConfig(&c.OIDC); err != nil {
-			errs = AppendError(errs, err)
-		}
-	}
 	return nil, errs
 }

--- a/pkg/config/v1/validation/oidc.go
+++ b/pkg/config/v1/validation/oidc.go
@@ -1,57 +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 validation
-
-import (
-	"errors"
-	"net/url"
-	"strings"
-
-	v1 "github.com/fatedier/frp/pkg/config/v1"
-)
-
-func ValidateOIDCClientCredentialsConfig(c *v1.AuthOIDCClientConfig) error {
-	var errs []string
-
-	if c.ClientID == "" {
-		errs = append(errs, "auth.oidc.clientID is required")
-	}
-
-	if c.TokenEndpointURL == "" {
-		errs = append(errs, "auth.oidc.tokenEndpointURL is required")
-	} else {
-		tokenURL, err := url.Parse(c.TokenEndpointURL)
-		if err != nil || !tokenURL.IsAbs() || tokenURL.Host == "" {
-			errs = append(errs, "auth.oidc.tokenEndpointURL must be an absolute http or https URL")
-		} else if tokenURL.Scheme != "http" && tokenURL.Scheme != "https" {
-			errs = append(errs, "auth.oidc.tokenEndpointURL must use http or https")
-		}
-	}
-
-	if _, ok := c.AdditionalEndpointParams["scope"]; ok {
-		errs = append(errs, "auth.oidc.additionalEndpointParams.scope is not allowed; use auth.oidc.scope instead")
-	}
-
-	if c.Audience != "" {
-		if _, ok := c.AdditionalEndpointParams["audience"]; ok {
-			errs = append(errs, "cannot specify both auth.oidc.audience and auth.oidc.additionalEndpointParams.audience")
-		}
-	}
-
-	if len(errs) == 0 {
-		return nil
-	}
-	return errors.New(strings.Join(errs, "; "))
-}
--- a/pkg/config/v1/validation/oidc_test.go
+++ b/pkg/config/v1/validation/oidc_test.go
@@ -1,78 +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 validation
-
-import (
-	"net/http"
-	"net/http/httptest"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	v1 "github.com/fatedier/frp/pkg/config/v1"
-)
-
-func TestValidateOIDCClientCredentialsConfig(t *testing.T) {
-	tokenServer := httptest.NewServer(http.NotFoundHandler())
-	defer tokenServer.Close()
-
-	t.Run("valid", func(t *testing.T) {
-		require.NoError(t, ValidateOIDCClientCredentialsConfig(&v1.AuthOIDCClientConfig{
-			ClientID:         "test-client",
-			TokenEndpointURL: tokenServer.URL,
-			AdditionalEndpointParams: map[string]string{
-				"resource": "api",
-			},
-		}))
-	})
-
-	t.Run("invalid token endpoint url", func(t *testing.T) {
-		err := ValidateOIDCClientCredentialsConfig(&v1.AuthOIDCClientConfig{
-			ClientID:         "test-client",
-			TokenEndpointURL: "://bad",
-		})
-		require.ErrorContains(t, err, "auth.oidc.tokenEndpointURL")
-	})
-
-	t.Run("missing client id", func(t *testing.T) {
-		err := ValidateOIDCClientCredentialsConfig(&v1.AuthOIDCClientConfig{
-			TokenEndpointURL: tokenServer.URL,
-		})
-		require.ErrorContains(t, err, "auth.oidc.clientID is required")
-	})
-
-	t.Run("scope endpoint param is not allowed", func(t *testing.T) {
-		err := ValidateOIDCClientCredentialsConfig(&v1.AuthOIDCClientConfig{
-			ClientID:         "test-client",
-			TokenEndpointURL: tokenServer.URL,
-			AdditionalEndpointParams: map[string]string{
-				"scope": "email",
-			},
-		})
-		require.ErrorContains(t, err, "auth.oidc.additionalEndpointParams.scope is not allowed; use auth.oidc.scope instead")
-	})
-
-	t.Run("audience conflict", func(t *testing.T) {
-		err := ValidateOIDCClientCredentialsConfig(&v1.AuthOIDCClientConfig{
-			ClientID:         "test-client",
-			TokenEndpointURL: tokenServer.URL,
-			Audience:         "api",
-			AdditionalEndpointParams: map[string]string{
-				"audience": "override",
-			},
-		})
-		require.ErrorContains(t, err, "cannot specify both auth.oidc.audience and auth.oidc.additionalEndpointParams.audience")
-	})
-}
--- a/pkg/metrics/mem/server.go
+++ b/pkg/metrics/mem/server.go
@@ -143,6 +143,7 @@ func (m *serverMetrics) OpenConnection(name string, _ string) {
 	proxyStats, ok := m.info.ProxyStatistics[name]
 	if ok {
 		proxyStats.CurConns.Inc(1)
+		m.info.ProxyStatistics[name] = proxyStats
 	}
 }

@@ -154,6 +155,7 @@ func (m *serverMetrics) CloseConnection(name string, _ string) {
 	proxyStats, ok := m.info.ProxyStatistics[name]
 	if ok {
 		proxyStats.CurConns.Dec(1)
+		m.info.ProxyStatistics[name] = proxyStats
 	}
 }

@@ -166,6 +168,7 @@ func (m *serverMetrics) AddTrafficIn(name string, _ string, trafficBytes int64)
 	proxyStats, ok := m.info.ProxyStatistics[name]
 	if ok {
 		proxyStats.TrafficIn.Inc(trafficBytes)
+		m.info.ProxyStatistics[name] = proxyStats
 	}
 }

@@ -178,6 +181,7 @@ func (m *serverMetrics) AddTrafficOut(name string, _ string, trafficBytes int64)
 	proxyStats, ok := m.info.ProxyStatistics[name]
 	if ok {
 		proxyStats.TrafficOut.Inc(trafficBytes)
+		m.info.ProxyStatistics[name] = proxyStats
 	}
 }

@@ -236,9 +240,15 @@ func (m *serverMetrics) GetProxiesByTypeAndName(proxyType string, proxyName stri
 	m.mu.Lock()
 	defer m.mu.Unlock()

-	proxyStats, ok := m.info.ProxyStatistics[proxyName]
-	if ok && proxyStats.ProxyType == proxyType {
-		res = toProxyStats(proxyName, proxyStats)
+	for name, proxyStats := range m.info.ProxyStatistics {
+		if proxyStats.ProxyType != proxyType {
+			continue
+		}
+		if name != proxyName {
+			continue
+		}
+		res = toProxyStats(name, proxyStats)
+		break
 	}
 	return
 }
--- a/pkg/nathole/discovery.go
+++ b/pkg/nathole/discovery.go
@@ -19,7 +19,7 @@ import (
 	"net"
 	"time"

-	"github.com/pion/stun/v3"
+	"github.com/pion/stun/v2"
 )

 var responseTimeout = 3 * time.Second
--- a/pkg/nathole/utils.go
+++ b/pkg/nathole/utils.go
@@ -21,7 +21,7 @@ import (
 	"strconv"

 	"github.com/fatedier/golib/crypto"
-	"github.com/pion/stun/v3"
+	"github.com/pion/stun/v2"

 	"github.com/fatedier/frp/pkg/msg"
 )
--- a/pkg/policy/featuregate/feature_gate.go
+++ b/pkg/policy/featuregate/feature_gate.go
@@ -93,7 +93,8 @@ type featureGate struct {

 // NewFeatureGate creates a new feature gate with the default features
 func NewFeatureGate() MutableFeatureGate {
-	known := maps.Clone(defaultFeatures)
+	known := map[Feature]FeatureSpec{}
+	maps.Copy(known, defaultFeatures)

 	f := &featureGate{}
 	f.known.Store(known)
@@ -107,8 +108,10 @@ func (f *featureGate) SetFromMap(m map[string]bool) error {
 	defer f.lock.Unlock()

 	// Copy existing state
-	known := maps.Clone(f.known.Load().(map[Feature]FeatureSpec))
-	enabled := maps.Clone(f.enabled.Load().(map[Feature]bool))
+	known := map[Feature]FeatureSpec{}
+	maps.Copy(known, f.known.Load().(map[Feature]FeatureSpec))
+	enabled := map[Feature]bool{}
+	maps.Copy(enabled, f.enabled.Load().(map[Feature]bool))

 	// Apply the new settings
 	for k, v := range m {
@@ -139,7 +142,8 @@ func (f *featureGate) Add(features map[Feature]FeatureSpec) error {
 	}

 	// Copy existing state
-	known := maps.Clone(f.known.Load().(map[Feature]FeatureSpec))
+	known := map[Feature]FeatureSpec{}
+	maps.Copy(known, f.known.Load().(map[Feature]FeatureSpec))

 	// Add new features
 	for name, spec := range features {
--- a/pkg/util/http/server.go
+++ b/pkg/util/http/server.go
@@ -100,11 +100,7 @@ func (s *Server) Run() error {
 }

 func (s *Server) Close() error {
-	err := s.hs.Close()
-	if s.ln != nil {
-		_ = s.ln.Close()
-	}
-	return err
+	return s.hs.Close()
 }

 type RouterRegisterHelper struct {
--- a/pkg/util/version/version.go
+++ b/pkg/util/version/version.go
@@ -14,7 +14,7 @@

 package version

-var version = "0.68.1"
+var version = "0.68.0"

 func Full() string {
 	return version
--- a/pkg/util/vhost/http.go
+++ b/pkg/util/vhost/http.go
@@ -187,25 +187,16 @@ func (rp *HTTPReverseProxy) CreateConnection(reqRouteInfo *RequestRouteInfo, byE
 	return nil, fmt.Errorf("%v: %s %s %s", ErrNoRouteFound, host, reqRouteInfo.URL, reqRouteInfo.HTTPUser)
 }

-func checkRouteAuthByRequest(req *http.Request, rc *RouteConfig) bool {
-	if rc == nil {
-		return true
-	}
-	if rc.Username == "" && rc.Password == "" {
-		return true
-	}
-
-	if req.URL.Host != "" {
-		proxyAuth := req.Header.Get("Proxy-Authorization")
-		if proxyAuth == "" {
+func (rp *HTTPReverseProxy) CheckAuth(domain, location, routeByHTTPUser, user, passwd string) bool {
+	vr, ok := rp.getVhost(domain, location, routeByHTTPUser)
+	if ok {
+		checkUser := vr.payload.(*RouteConfig).Username
+		checkPasswd := vr.payload.(*RouteConfig).Password
+		if (checkUser != "" || checkPasswd != "") && (checkUser != user || checkPasswd != passwd) {
 			return false
 		}
-		user, passwd, ok := httppkg.ParseBasicAuth(proxyAuth)
-		return ok && user == rc.Username && passwd == rc.Password
 	}
-
-	user, passwd, ok := req.BasicAuth()
-	return ok && user == rc.Username && passwd == rc.Password
+	return true
 }

 // getVhost tries to get vhost router by route policy.
@@ -275,25 +266,18 @@ func (rp *HTTPReverseProxy) connectHandler(rw http.ResponseWriter, req *http.Req
 	go libio.Join(remote, client)
 }

-func getRequestRouteUser(req *http.Request) string {
+func (rp *HTTPReverseProxy) injectRequestInfoToCtx(req *http.Request) *http.Request {
+	user := ""
+	// If url host isn't empty, it's a proxy request. Get http user from Proxy-Authorization header.
 	if req.URL.Host != "" {
 		proxyAuth := req.Header.Get("Proxy-Authorization")
-		if proxyAuth == "" {
-			// Preserve legacy proxy-mode routing when clients send only Authorization,
-			// so requests still hit the matched route and return 407 instead of 404.
-			// Auth validation intentionally does not share this fallback.
-			user, _, _ := req.BasicAuth()
-			return user
+		if proxyAuth != "" {
+			user, _, _ = httppkg.ParseBasicAuth(proxyAuth)
 		}
-		user, _, _ := httppkg.ParseBasicAuth(proxyAuth)
-		return user
 	}
-	user, _, _ := req.BasicAuth()
-	return user
-}
-
-func (rp *HTTPReverseProxy) injectRequestInfoToCtx(req *http.Request) *http.Request {
-	user := getRequestRouteUser(req)
+	if user == "" {
+		user, _, _ = req.BasicAuth()
+	}

 	reqRouteInfo := &RequestRouteInfo{
 		URL:        req.URL.Path,
@@ -313,19 +297,16 @@ func (rp *HTTPReverseProxy) injectRequestInfoToCtx(req *http.Request) *http.Requ
 }

 func (rp *HTTPReverseProxy) ServeHTTP(rw http.ResponseWriter, req *http.Request) {
-	newreq := rp.injectRequestInfoToCtx(req)
-	rc := newreq.Context().Value(RouteConfigKey).(*RouteConfig)
-	if !checkRouteAuthByRequest(req, rc) {
-		if req.URL.Host != "" {
-			rw.Header().Set("Proxy-Authenticate", `Basic realm="Restricted"`)
-			http.Error(rw, http.StatusText(http.StatusProxyAuthRequired), http.StatusProxyAuthRequired)
-		} else {
-			rw.Header().Set("WWW-Authenticate", `Basic realm="Restricted"`)
-			http.Error(rw, http.StatusText(http.StatusUnauthorized), http.StatusUnauthorized)
-		}
+	domain, _ := httppkg.CanonicalHost(req.Host)
+	location := req.URL.Path
+	user, passwd, _ := req.BasicAuth()
+	if !rp.CheckAuth(domain, location, user, user, passwd) {
+		rw.Header().Set("WWW-Authenticate", `Basic realm="Restricted"`)
+		http.Error(rw, http.StatusText(http.StatusUnauthorized), http.StatusUnauthorized)
 		return
 	}

+	newreq := rp.injectRequestInfoToCtx(req)
 	if req.Method == http.MethodConnect {
 		rp.connectHandler(rw, newreq)
 	} else {
--- a/pkg/util/vhost/http_test.go
+++ b/pkg/util/vhost/http_test.go
@@ -1,102 +0,0 @@
-package vhost
-
-import (
-	"net/http/httptest"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	httppkg "github.com/fatedier/frp/pkg/util/http"
-)
-
-func TestCheckRouteAuthByRequest(t *testing.T) {
-	rc := &RouteConfig{
-		Username: "alice",
-		Password: "secret",
-	}
-
-	t.Run("accepts nil route config", func(t *testing.T) {
-		req := httptest.NewRequest("GET", "/", nil)
-		require.True(t, checkRouteAuthByRequest(req, nil))
-	})
-
-	t.Run("accepts route without credentials", func(t *testing.T) {
-		req := httptest.NewRequest("GET", "/", nil)
-		require.True(t, checkRouteAuthByRequest(req, &RouteConfig{}))
-	})
-
-	t.Run("accepts authorization header", func(t *testing.T) {
-		req := httptest.NewRequest("GET", "/", nil)
-		req.SetBasicAuth("alice", "secret")
-		require.True(t, checkRouteAuthByRequest(req, rc))
-	})
-
-	t.Run("accepts proxy authorization header", func(t *testing.T) {
-		req := httptest.NewRequest("GET", "http://target.example.com/", nil)
-		req.Header.Set("Proxy-Authorization", httppkg.BasicAuth("alice", "secret"))
-		require.True(t, checkRouteAuthByRequest(req, rc))
-	})
-
-	t.Run("rejects authorization fallback for proxy request", func(t *testing.T) {
-		req := httptest.NewRequest("GET", "http://target.example.com/", nil)
-		req.SetBasicAuth("alice", "secret")
-		require.False(t, checkRouteAuthByRequest(req, rc))
-	})
-
-	t.Run("rejects wrong proxy authorization even when authorization matches", func(t *testing.T) {
-		req := httptest.NewRequest("GET", "http://target.example.com/", nil)
-		req.SetBasicAuth("alice", "secret")
-		req.Header.Set("Proxy-Authorization", httppkg.BasicAuth("alice", "wrong"))
-		require.False(t, checkRouteAuthByRequest(req, rc))
-	})
-
-	t.Run("rejects when neither header matches", func(t *testing.T) {
-		req := httptest.NewRequest("GET", "http://target.example.com/", nil)
-		req.SetBasicAuth("alice", "wrong")
-		req.Header.Set("Proxy-Authorization", httppkg.BasicAuth("alice", "wrong"))
-		require.False(t, checkRouteAuthByRequest(req, rc))
-	})
-
-	t.Run("rejects proxy authorization on direct request", func(t *testing.T) {
-		req := httptest.NewRequest("GET", "/", nil)
-		req.Header.Set("Proxy-Authorization", httppkg.BasicAuth("alice", "secret"))
-		require.False(t, checkRouteAuthByRequest(req, rc))
-	})
-}
-
-func TestGetRequestRouteUser(t *testing.T) {
-	t.Run("proxy request uses proxy authorization username", func(t *testing.T) {
-		req := httptest.NewRequest("GET", "http://target.example.com/", nil)
-		req.Host = "target.example.com"
-		req.Header.Set("Proxy-Authorization", httppkg.BasicAuth("proxy-user", "proxy-pass"))
-		req.SetBasicAuth("direct-user", "direct-pass")
-
-		require.Equal(t, "proxy-user", getRequestRouteUser(req))
-	})
-
-	t.Run("connect request keeps proxy authorization routing", func(t *testing.T) {
-		req := httptest.NewRequest("CONNECT", "http://target.example.com:443", nil)
-		req.Host = "target.example.com:443"
-		req.Header.Set("Proxy-Authorization", httppkg.BasicAuth("proxy-user", "proxy-pass"))
-		req.SetBasicAuth("direct-user", "direct-pass")
-
-		require.Equal(t, "proxy-user", getRequestRouteUser(req))
-	})
-
-	t.Run("direct request uses authorization username", func(t *testing.T) {
-		req := httptest.NewRequest("GET", "/", nil)
-		req.Host = "example.com"
-		req.SetBasicAuth("direct-user", "direct-pass")
-
-		require.Equal(t, "direct-user", getRequestRouteUser(req))
-	})
-
-	t.Run("proxy request does not fall back when proxy authorization is invalid", func(t *testing.T) {
-		req := httptest.NewRequest("GET", "http://target.example.com/", nil)
-		req.Host = "target.example.com"
-		req.Header.Set("Proxy-Authorization", "Basic !!!")
-		req.SetBasicAuth("direct-user", "direct-pass")
-
-		require.Empty(t, getRequestRouteUser(req))
-	})
-}
--- a/pkg/vnet/controller.go
+++ b/pkg/vnet/controller.go
@@ -131,9 +131,6 @@ func (c *Controller) handlePacket(buf []byte) {
 }

 func (c *Controller) Stop() error {
-	if c.tun == nil {
-		return nil
-	}
 	return c.tun.Close()
 }

--- a/server/group/base.go
+++ b/server/group/base.go
@@ -1,77 +0,0 @@
-package group
-
-import (
-	"net"
-	"sync"
-
-	gerr "github.com/fatedier/golib/errors"
-)
-
-// baseGroup contains the shared plumbing for listener-based groups
-// (TCP, HTTPS, TCPMux). Each concrete group embeds this and provides
-// its own Listen method with protocol-specific validation.
-type baseGroup struct {
-	group    string
-	groupKey string
-
-	acceptCh  chan net.Conn
-	realLn    net.Listener
-	lns       []*Listener
-	mu        sync.Mutex
-	cleanupFn func()
-}
-
-// initBase resets the baseGroup for a fresh listen cycle.
-// Must be called under mu when len(lns) == 0.
-func (bg *baseGroup) initBase(group, groupKey string, realLn net.Listener, cleanupFn func()) {
-	bg.group = group
-	bg.groupKey = groupKey
-	bg.realLn = realLn
-	bg.acceptCh = make(chan net.Conn)
-	bg.cleanupFn = cleanupFn
-}
-
-// worker reads from the real listener and fans out to acceptCh.
-// The parameters are captured at creation time so that the worker is
-// bound to a specific listen cycle and cannot observe a later initBase.
-func (bg *baseGroup) worker(realLn net.Listener, acceptCh chan<- net.Conn) {
-	for {
-		c, err := realLn.Accept()
-		if err != nil {
-			return
-		}
-		err = gerr.PanicToError(func() {
-			acceptCh <- c
-		})
-		if err != nil {
-			c.Close()
-			return
-		}
-	}
-}
-
-// newListener creates a new Listener wired to this baseGroup.
-// Must be called under mu.
-func (bg *baseGroup) newListener(addr net.Addr) *Listener {
-	ln := newListener(bg.acceptCh, addr, bg.closeListener)
-	bg.lns = append(bg.lns, ln)
-	return ln
-}
-
-// closeListener removes ln from the list. When the last listener is removed,
-// it closes acceptCh, closes the real listener, and calls cleanupFn.
-func (bg *baseGroup) closeListener(ln *Listener) {
-	bg.mu.Lock()
-	defer bg.mu.Unlock()
-	for i, l := range bg.lns {
-		if l == ln {
-			bg.lns = append(bg.lns[:i], bg.lns[i+1:]...)
-			break
-		}
-	}
-	if len(bg.lns) == 0 {
-		close(bg.acceptCh)
-		bg.realLn.Close()
-		bg.cleanupFn()
-	}
-}
--- a/server/group/base_test.go
+++ b/server/group/base_test.go
@@ -1,169 +0,0 @@
-package group
-
-import (
-	"net"
-	"sync"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-// fakeLn is a controllable net.Listener for tests.
-type fakeLn struct {
-	connCh chan net.Conn
-	closed chan struct{}
-	once   sync.Once
-}
-
-func newFakeLn() *fakeLn {
-	return &fakeLn{
-		connCh: make(chan net.Conn, 8),
-		closed: make(chan struct{}),
-	}
-}
-
-func (f *fakeLn) Accept() (net.Conn, error) {
-	select {
-	case c := <-f.connCh:
-		return c, nil
-	case <-f.closed:
-		return nil, net.ErrClosed
-	}
-}
-
-func (f *fakeLn) Close() error {
-	f.once.Do(func() { close(f.closed) })
-	return nil
-}
-
-func (f *fakeLn) Addr() net.Addr { return fakeAddr("127.0.0.1:9999") }
-
-func (f *fakeLn) inject(c net.Conn) {
-	select {
-	case f.connCh <- c:
-	case <-f.closed:
-	}
-}
-
-func TestBaseGroup_WorkerFanOut(t *testing.T) {
-	fl := newFakeLn()
-	var bg baseGroup
-	bg.initBase("g", "key", fl, func() {})
-
-	go bg.worker(fl, bg.acceptCh)
-
-	c1, c2 := net.Pipe()
-	defer c2.Close()
-	fl.inject(c1)
-
-	select {
-	case got := <-bg.acceptCh:
-		assert.Equal(t, c1, got)
-		got.Close()
-	case <-time.After(time.Second):
-		t.Fatal("timed out waiting for connection on acceptCh")
-	}
-
-	fl.Close()
-}
-
-func TestBaseGroup_WorkerStopsOnListenerClose(t *testing.T) {
-	fl := newFakeLn()
-	var bg baseGroup
-	bg.initBase("g", "key", fl, func() {})
-
-	done := make(chan struct{})
-	go func() {
-		bg.worker(fl, bg.acceptCh)
-		close(done)
-	}()
-
-	fl.Close()
-	select {
-	case <-done:
-	case <-time.After(time.Second):
-		t.Fatal("worker did not stop after listener close")
-	}
-}
-
-func TestBaseGroup_WorkerClosesConnOnClosedChannel(t *testing.T) {
-	fl := newFakeLn()
-	var bg baseGroup
-	bg.initBase("g", "key", fl, func() {})
-
-	// Close acceptCh before worker sends.
-	close(bg.acceptCh)
-
-	done := make(chan struct{})
-	go func() {
-		bg.worker(fl, bg.acceptCh)
-		close(done)
-	}()
-
-	c1, c2 := net.Pipe()
-	defer c2.Close()
-	fl.inject(c1)
-
-	select {
-	case <-done:
-	case <-time.After(time.Second):
-		t.Fatal("worker did not stop after panic recovery")
-	}
-
-	// c1 should have been closed by worker's panic recovery path.
-	buf := make([]byte, 1)
-	_, err := c1.Read(buf)
-	assert.Error(t, err, "connection should be closed by worker")
-}
-
-func TestBaseGroup_CloseLastListenerTriggersCleanup(t *testing.T) {
-	fl := newFakeLn()
-	var bg baseGroup
-	cleanupCalled := 0
-	bg.initBase("g", "key", fl, func() { cleanupCalled++ })
-
-	bg.mu.Lock()
-	ln1 := bg.newListener(fl.Addr())
-	ln2 := bg.newListener(fl.Addr())
-	bg.mu.Unlock()
-
-	go bg.worker(fl, bg.acceptCh)
-
-	ln1.Close()
-	assert.Equal(t, 0, cleanupCalled, "cleanup should not run while listeners remain")
-
-	ln2.Close()
-	assert.Equal(t, 1, cleanupCalled, "cleanup should run after last listener closed")
-}
-
-func TestBaseGroup_CloseOneOfTwoListeners(t *testing.T) {
-	fl := newFakeLn()
-	var bg baseGroup
-	cleanupCalled := 0
-	bg.initBase("g", "key", fl, func() { cleanupCalled++ })
-
-	bg.mu.Lock()
-	ln1 := bg.newListener(fl.Addr())
-	ln2 := bg.newListener(fl.Addr())
-	bg.mu.Unlock()
-
-	go bg.worker(fl, bg.acceptCh)
-
-	ln1.Close()
-	assert.Equal(t, 0, cleanupCalled)
-
-	// ln2 should still receive connections.
-	c1, c2 := net.Pipe()
-	defer c2.Close()
-	fl.inject(c1)
-
-	got, err := ln2.Accept()
-	require.NoError(t, err)
-	assert.Equal(t, c1, got)
-	got.Close()
-
-	ln2.Close()
-	assert.Equal(t, 1, cleanupCalled)
-}
--- a/server/group/group.go
+++ b/server/group/group.go
@@ -24,6 +24,4 @@ var (
 	ErrListenerClosed     = errors.New("group listener closed")
 	ErrGroupDifferentPort = errors.New("group should have same remote port")
 	ErrProxyRepeated      = errors.New("group proxy repeated")
-
-	errGroupStale = errors.New("stale group reference")
 )
--- a/server/group/http.go
+++ b/server/group/http.go
@@ -9,42 +9,53 @@ import (
 	"github.com/fatedier/frp/pkg/util/vhost"
 )

-// HTTPGroupController manages HTTP groups that use round-robin
-// callback routing (fundamentally different from listener-based groups).
 type HTTPGroupController struct {
-	groupRegistry[*HTTPGroup]
+	// groups indexed by group name
+	groups map[string]*HTTPGroup
+
+	// register createConn for each group to vhostRouter.
+	// createConn will get a connection from one proxy of the group
 	vhostRouter *vhost.Routers
+
+	mu sync.Mutex
 }

 func NewHTTPGroupController(vhostRouter *vhost.Routers) *HTTPGroupController {
 	return &HTTPGroupController{
-		groupRegistry: newGroupRegistry[*HTTPGroup](),
-		vhostRouter:   vhostRouter,
+		groups:      make(map[string]*HTTPGroup),
+		vhostRouter: vhostRouter,
 	}
 }

 func (ctl *HTTPGroupController) Register(
 	proxyName, group, groupKey string,
 	routeConfig vhost.RouteConfig,
-) error {
-	for {
-		g := ctl.getOrCreate(group, func() *HTTPGroup {
-			return NewHTTPGroup(ctl)
-		})
-		err := g.Register(proxyName, group, groupKey, routeConfig)
-		if err == errGroupStale {
-			continue
-		}
-		return err
+) (err error) {
+	indexKey := group
+	ctl.mu.Lock()
+	g, ok := ctl.groups[indexKey]
+	if !ok {
+		g = NewHTTPGroup(ctl)
+		ctl.groups[indexKey] = g
 	}
+	ctl.mu.Unlock()
+
+	return g.Register(proxyName, group, groupKey, routeConfig)
 }

 func (ctl *HTTPGroupController) UnRegister(proxyName, group string, _ vhost.RouteConfig) {
-	g, ok := ctl.get(group)
+	indexKey := group
+	ctl.mu.Lock()
+	defer ctl.mu.Unlock()
+	g, ok := ctl.groups[indexKey]
 	if !ok {
 		return
 	}
-	g.UnRegister(proxyName)
+
+	isEmpty := g.UnRegister(proxyName)
+	if isEmpty {
+		delete(ctl.groups, indexKey)
+	}
 }

 type HTTPGroup struct {
@@ -76,9 +87,6 @@ func (g *HTTPGroup) Register(
 ) (err error) {
 	g.mu.Lock()
 	defer g.mu.Unlock()
-	if !g.ctl.isCurrent(group, func(cur *HTTPGroup) bool { return cur == g }) {
-		return errGroupStale
-	}
 	if len(g.createFuncs) == 0 {
 		// the first proxy in this group
 		tmp := routeConfig // copy object
@@ -115,7 +123,7 @@ func (g *HTTPGroup) Register(
 	return nil
 }

-func (g *HTTPGroup) UnRegister(proxyName string) {
+func (g *HTTPGroup) UnRegister(proxyName string) (isEmpty bool) {
 	g.mu.Lock()
 	defer g.mu.Unlock()
 	delete(g.createFuncs, proxyName)
@@ -127,11 +135,10 @@ func (g *HTTPGroup) UnRegister(proxyName string) {
 	}

 	if len(g.createFuncs) == 0 {
+		isEmpty = true
 		g.ctl.vhostRouter.Del(g.domain, g.location, g.routeByHTTPUser)
-		g.ctl.removeIf(g.group, func(cur *HTTPGroup) bool {
-			return cur == g
-		})
 	}
+	return
 }

 func (g *HTTPGroup) createConn(remoteAddr string) (net.Conn, error) {
@@ -144,7 +151,7 @@ func (g *HTTPGroup) createConn(remoteAddr string) (net.Conn, error) {
 	location := g.location
 	routeByHTTPUser := g.routeByHTTPUser
 	if len(g.pxyNames) > 0 {
-		name := g.pxyNames[newIndex%uint64(len(g.pxyNames))]
+		name := g.pxyNames[int(newIndex)%len(g.pxyNames)]
 		f = g.createFuncs[name]
 	}
 	g.mu.RUnlock()
@@ -167,7 +174,7 @@ func (g *HTTPGroup) chooseEndpoint() (string, error) {
 	location := g.location
 	routeByHTTPUser := g.routeByHTTPUser
 	if len(g.pxyNames) > 0 {
-		name = g.pxyNames[newIndex%uint64(len(g.pxyNames))]
+		name = g.pxyNames[int(newIndex)%len(g.pxyNames)]
 	}
 	g.mu.RUnlock()

--- a/server/group/https.go
+++ b/server/group/https.go
@@ -17,19 +17,25 @@ package group
 import (
 	"context"
 	"net"
+	"sync"
+
+	gerr "github.com/fatedier/golib/errors"

 	"github.com/fatedier/frp/pkg/util/vhost"
 )

 type HTTPSGroupController struct {
-	groupRegistry[*HTTPSGroup]
+	groups map[string]*HTTPSGroup
+
 	httpsMuxer *vhost.HTTPSMuxer
+
+	mu sync.Mutex
 }

 func NewHTTPSGroupController(httpsMuxer *vhost.HTTPSMuxer) *HTTPSGroupController {
 	return &HTTPSGroupController{
-		groupRegistry: newGroupRegistry[*HTTPSGroup](),
-		httpsMuxer:    httpsMuxer,
+		groups:     make(map[string]*HTTPSGroup),
+		httpsMuxer: httpsMuxer,
 	}
 }

@@ -38,28 +44,41 @@ func (ctl *HTTPSGroupController) Listen(
 	group, groupKey string,
 	routeConfig vhost.RouteConfig,
 ) (l net.Listener, err error) {
-	for {
-		g := ctl.getOrCreate(group, func() *HTTPSGroup {
-			return NewHTTPSGroup(ctl)
-		})
-		l, err = g.Listen(ctx, group, groupKey, routeConfig)
-		if err == errGroupStale {
-			continue
-		}
-		return
+	indexKey := group
+	ctl.mu.Lock()
+	g, ok := ctl.groups[indexKey]
+	if !ok {
+		g = NewHTTPSGroup(ctl)
+		ctl.groups[indexKey] = g
 	}
+	ctl.mu.Unlock()
+
+	return g.Listen(ctx, group, groupKey, routeConfig)
+}
+
+func (ctl *HTTPSGroupController) RemoveGroup(group string) {
+	ctl.mu.Lock()
+	defer ctl.mu.Unlock()
+	delete(ctl.groups, group)
 }

 type HTTPSGroup struct {
-	baseGroup
+	group    string
+	groupKey string
+	domain   string

-	domain string
-	ctl    *HTTPSGroupController
+	acceptCh chan net.Conn
+	httpsLn  *vhost.Listener
+	lns      []*HTTPSGroupListener
+	ctl      *HTTPSGroupController
+	mu       sync.Mutex
 }

 func NewHTTPSGroup(ctl *HTTPSGroupController) *HTTPSGroup {
 	return &HTTPSGroup{
-		ctl: ctl,
+		lns:      make([]*HTTPSGroupListener, 0),
+		ctl:      ctl,
+		acceptCh: make(chan net.Conn),
 	}
 }

@@ -67,27 +86,23 @@ func (g *HTTPSGroup) Listen(
 	ctx context.Context,
 	group, groupKey string,
 	routeConfig vhost.RouteConfig,
-) (ln *Listener, err error) {
+) (ln *HTTPSGroupListener, err error) {
 	g.mu.Lock()
 	defer g.mu.Unlock()
-	if !g.ctl.isCurrent(group, func(cur *HTTPSGroup) bool { return cur == g }) {
-		return nil, errGroupStale
-	}
 	if len(g.lns) == 0 {
 		// the first listener, listen on the real address
 		httpsLn, errRet := g.ctl.httpsMuxer.Listen(ctx, &routeConfig)
 		if errRet != nil {
 			return nil, errRet
 		}
+		ln = newHTTPSGroupListener(group, g, httpsLn.Addr())

+		g.group = group
+		g.groupKey = groupKey
 		g.domain = routeConfig.Domain
-		g.initBase(group, groupKey, httpsLn, func() {
-			g.ctl.removeIf(g.group, func(cur *HTTPSGroup) bool {
-				return cur == g
-			})
-		})
-		ln = g.newListener(httpsLn.Addr())
-		go g.worker(httpsLn, g.acceptCh)
+		g.httpsLn = httpsLn
+		g.lns = append(g.lns, ln)
+		go g.worker()
 	} else {
 		// route config in the same group must be equal
 		if g.group != group || g.domain != routeConfig.Domain {
@@ -96,7 +111,87 @@ func (g *HTTPSGroup) Listen(
 		if g.groupKey != groupKey {
 			return nil, ErrGroupAuthFailed
 		}
-		ln = g.newListener(g.lns[0].Addr())
+		ln = newHTTPSGroupListener(group, g, g.lns[0].Addr())
+		g.lns = append(g.lns, ln)
 	}
 	return
 }
+
+func (g *HTTPSGroup) worker() {
+	for {
+		c, err := g.httpsLn.Accept()
+		if err != nil {
+			return
+		}
+		err = gerr.PanicToError(func() {
+			g.acceptCh <- c
+		})
+		if err != nil {
+			return
+		}
+	}
+}
+
+func (g *HTTPSGroup) Accept() <-chan net.Conn {
+	return g.acceptCh
+}
+
+func (g *HTTPSGroup) CloseListener(ln *HTTPSGroupListener) {
+	g.mu.Lock()
+	defer g.mu.Unlock()
+	for i, tmpLn := range g.lns {
+		if tmpLn == ln {
+			g.lns = append(g.lns[:i], g.lns[i+1:]...)
+			break
+		}
+	}
+	if len(g.lns) == 0 {
+		close(g.acceptCh)
+		if g.httpsLn != nil {
+			g.httpsLn.Close()
+		}
+		g.ctl.RemoveGroup(g.group)
+	}
+}
+
+type HTTPSGroupListener struct {
+	groupName string
+	group     *HTTPSGroup
+
+	addr    net.Addr
+	closeCh chan struct{}
+}
+
+func newHTTPSGroupListener(name string, group *HTTPSGroup, addr net.Addr) *HTTPSGroupListener {
+	return &HTTPSGroupListener{
+		groupName: name,
+		group:     group,
+		addr:      addr,
+		closeCh:   make(chan struct{}),
+	}
+}
+
+func (ln *HTTPSGroupListener) Accept() (c net.Conn, err error) {
+	var ok bool
+	select {
+	case <-ln.closeCh:
+		return nil, ErrListenerClosed
+	case c, ok = <-ln.group.Accept():
+		if !ok {
+			return nil, ErrListenerClosed
+		}
+		return c, nil
+	}
+}
+
+func (ln *HTTPSGroupListener) Addr() net.Addr {
+	return ln.addr
+}
+
+func (ln *HTTPSGroupListener) Close() (err error) {
+	close(ln.closeCh)
+
+	// remove self from HTTPSGroup
+	ln.group.CloseListener(ln)
+	return
+}
--- a/server/group/listener.go
+++ b/server/group/listener.go
@@ -1,49 +0,0 @@
-package group
-
-import (
-	"net"
-	"sync"
-)
-
-// Listener is a per-proxy virtual listener that receives connections
-// from a shared group. It implements net.Listener.
-type Listener struct {
-	acceptCh <-chan net.Conn
-	addr     net.Addr
-	closeCh  chan struct{}
-	onClose  func(*Listener)
-	once     sync.Once
-}
-
-func newListener(acceptCh <-chan net.Conn, addr net.Addr, onClose func(*Listener)) *Listener {
-	return &Listener{
-		acceptCh: acceptCh,
-		addr:     addr,
-		closeCh:  make(chan struct{}),
-		onClose:  onClose,
-	}
-}
-
-func (ln *Listener) Accept() (net.Conn, error) {
-	select {
-	case <-ln.closeCh:
-		return nil, ErrListenerClosed
-	case c, ok := <-ln.acceptCh:
-		if !ok {
-			return nil, ErrListenerClosed
-		}
-		return c, nil
-	}
-}
-
-func (ln *Listener) Addr() net.Addr {
-	return ln.addr
-}
-
-func (ln *Listener) Close() error {
-	ln.once.Do(func() {
-		close(ln.closeCh)
-		ln.onClose(ln)
-	})
-	return nil
-}
--- a/server/group/listener_test.go
+++ b/server/group/listener_test.go
@@ -1,68 +0,0 @@
-package group
-
-import (
-	"net"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-func TestListener_Accept(t *testing.T) {
-	acceptCh := make(chan net.Conn, 1)
-	ln := newListener(acceptCh, fakeAddr("127.0.0.1:1234"), func(*Listener) {})
-
-	c1, c2 := net.Pipe()
-	defer c1.Close()
-	defer c2.Close()
-
-	acceptCh <- c1
-	got, err := ln.Accept()
-	require.NoError(t, err)
-	assert.Equal(t, c1, got)
-}
-
-func TestListener_AcceptAfterChannelClose(t *testing.T) {
-	acceptCh := make(chan net.Conn)
-	ln := newListener(acceptCh, fakeAddr("127.0.0.1:1234"), func(*Listener) {})
-
-	close(acceptCh)
-	_, err := ln.Accept()
-	assert.ErrorIs(t, err, ErrListenerClosed)
-}
-
-func TestListener_AcceptAfterListenerClose(t *testing.T) {
-	acceptCh := make(chan net.Conn) // open, not closed
-	ln := newListener(acceptCh, fakeAddr("127.0.0.1:1234"), func(*Listener) {})
-
-	ln.Close()
-	_, err := ln.Accept()
-	assert.ErrorIs(t, err, ErrListenerClosed)
-}
-
-func TestListener_DoubleClose(t *testing.T) {
-	closeCalls := 0
-	ln := newListener(
-		make(chan net.Conn),
-		fakeAddr("127.0.0.1:1234"),
-		func(*Listener) { closeCalls++ },
-	)
-
-	assert.NotPanics(t, func() {
-		ln.Close()
-		ln.Close()
-	})
-	assert.Equal(t, 1, closeCalls, "onClose should be called exactly once")
-}
-
-func TestListener_Addr(t *testing.T) {
-	addr := fakeAddr("10.0.0.1:5555")
-	ln := newListener(make(chan net.Conn), addr, func(*Listener) {})
-	assert.Equal(t, addr, ln.Addr())
-}
-
-// fakeAddr implements net.Addr for testing.
-type fakeAddr string
-
-func (a fakeAddr) Network() string { return "tcp" }
-func (a fakeAddr) String() string  { return string(a) }
--- a/server/group/registry.go
+++ b/server/group/registry.go
@@ -1,59 +0,0 @@
-package group
-
-import (
-	"sync"
-)
-
-// groupRegistry is a concurrent map of named groups with
-// automatic creation on first access.
-type groupRegistry[G any] struct {
-	groups map[string]G
-	mu     sync.Mutex
-}
-
-func newGroupRegistry[G any]() groupRegistry[G] {
-	return groupRegistry[G]{
-		groups: make(map[string]G),
-	}
-}
-
-func (r *groupRegistry[G]) getOrCreate(key string, newFn func() G) G {
-	r.mu.Lock()
-	defer r.mu.Unlock()
-	g, ok := r.groups[key]
-	if !ok {
-		g = newFn()
-		r.groups[key] = g
-	}
-	return g
-}
-
-func (r *groupRegistry[G]) get(key string) (G, bool) {
-	r.mu.Lock()
-	defer r.mu.Unlock()
-	g, ok := r.groups[key]
-	return g, ok
-}
-
-// isCurrent returns true if key exists in the registry and matchFn
-// returns true for the stored value.
-func (r *groupRegistry[G]) isCurrent(key string, matchFn func(G) bool) bool {
-	r.mu.Lock()
-	defer r.mu.Unlock()
-	g, ok := r.groups[key]
-	return ok && matchFn(g)
-}
-
-// removeIf atomically looks up the group for key, calls fn on it,
-// and removes the entry if fn returns true.
-func (r *groupRegistry[G]) removeIf(key string, fn func(G) bool) {
-	r.mu.Lock()
-	defer r.mu.Unlock()
-	g, ok := r.groups[key]
-	if !ok {
-		return
-	}
-	if fn(g) {
-		delete(r.groups, key)
-	}
-}
--- a/server/group/registry_test.go
+++ b/server/group/registry_test.go
@@ -1,102 +0,0 @@
-package group
-
-import (
-	"sync"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-func TestGetOrCreate_New(t *testing.T) {
-	r := newGroupRegistry[*int]()
-	called := 0
-	v := 42
-	got := r.getOrCreate("k", func() *int { called++; return &v })
-	assert.Equal(t, 1, called)
-	assert.Equal(t, &v, got)
-}
-
-func TestGetOrCreate_Existing(t *testing.T) {
-	r := newGroupRegistry[*int]()
-	v := 42
-	r.getOrCreate("k", func() *int { return &v })
-
-	called := 0
-	got := r.getOrCreate("k", func() *int { called++; return nil })
-	assert.Equal(t, 0, called)
-	assert.Equal(t, &v, got)
-}
-
-func TestGet_ExistingAndMissing(t *testing.T) {
-	r := newGroupRegistry[*int]()
-	v := 1
-	r.getOrCreate("k", func() *int { return &v })
-
-	got, ok := r.get("k")
-	assert.True(t, ok)
-	assert.Equal(t, &v, got)
-
-	_, ok = r.get("missing")
-	assert.False(t, ok)
-}
-
-func TestIsCurrent(t *testing.T) {
-	r := newGroupRegistry[*int]()
-	v1 := 1
-	v2 := 2
-	r.getOrCreate("k", func() *int { return &v1 })
-
-	assert.True(t, r.isCurrent("k", func(g *int) bool { return g == &v1 }))
-	assert.False(t, r.isCurrent("k", func(g *int) bool { return g == &v2 }))
-	assert.False(t, r.isCurrent("missing", func(g *int) bool { return true }))
-}
-
-func TestRemoveIf(t *testing.T) {
-	t.Run("removes when fn returns true", func(t *testing.T) {
-		r := newGroupRegistry[*int]()
-		v := 1
-		r.getOrCreate("k", func() *int { return &v })
-		r.removeIf("k", func(g *int) bool { return g == &v })
-		_, ok := r.get("k")
-		assert.False(t, ok)
-	})
-
-	t.Run("keeps when fn returns false", func(t *testing.T) {
-		r := newGroupRegistry[*int]()
-		v := 1
-		r.getOrCreate("k", func() *int { return &v })
-		r.removeIf("k", func(g *int) bool { return false })
-		_, ok := r.get("k")
-		assert.True(t, ok)
-	})
-
-	t.Run("noop on missing key", func(t *testing.T) {
-		r := newGroupRegistry[*int]()
-		r.removeIf("missing", func(g *int) bool { return true }) // should not panic
-	})
-}
-
-func TestConcurrentGetOrCreateAndRemoveIf(t *testing.T) {
-	r := newGroupRegistry[*int]()
-	const n = 100
-	var wg sync.WaitGroup
-	wg.Add(n * 2)
-	for i := range n {
-		v := i
-		go func() {
-			defer wg.Done()
-			r.getOrCreate("k", func() *int { return &v })
-		}()
-		go func() {
-			defer wg.Done()
-			r.removeIf("k", func(*int) bool { return true })
-		}()
-	}
-	wg.Wait()
-
-	// After all goroutines finish, accessing the key must not panic.
-	require.NotPanics(t, func() {
-		_, _ = r.get("k")
-	})
-}
--- a/server/group/tcp.go
+++ b/server/group/tcp.go
@@ -17,67 +17,83 @@ package group
 import (
 	"net"
 	"strconv"
+	"sync"
+
+	gerr "github.com/fatedier/golib/errors"

 	"github.com/fatedier/frp/server/ports"
 )

-// TCPGroupCtl manages all TCPGroups.
+// TCPGroupCtl manage all TCPGroups
 type TCPGroupCtl struct {
-	groupRegistry[*TCPGroup]
+	groups map[string]*TCPGroup
+
+	// portManager is used to manage port
 	portManager *ports.Manager
+	mu          sync.Mutex
 }

-// NewTCPGroupCtl returns a new TCPGroupCtl.
+// NewTCPGroupCtl return a new TcpGroupCtl
 func NewTCPGroupCtl(portManager *ports.Manager) *TCPGroupCtl {
 	return &TCPGroupCtl{
-		groupRegistry: newGroupRegistry[*TCPGroup](),
-		portManager:   portManager,
+		groups:      make(map[string]*TCPGroup),
+		portManager: portManager,
 	}
 }

-// Listen is the wrapper for TCPGroup's Listen.
-// If there is no group, one will be created.
+// Listen is the wrapper for TCPGroup's Listen
+// If there are no group, we will create one here
 func (tgc *TCPGroupCtl) Listen(proxyName string, group string, groupKey string,
 	addr string, port int,
 ) (l net.Listener, realPort int, err error) {
-	for {
-		tcpGroup := tgc.getOrCreate(group, func() *TCPGroup {
-			return NewTCPGroup(tgc)
-		})
-		l, realPort, err = tcpGroup.Listen(proxyName, group, groupKey, addr, port)
-		if err == errGroupStale {
-			continue
-		}
-		return
+	tgc.mu.Lock()
+	tcpGroup, ok := tgc.groups[group]
+	if !ok {
+		tcpGroup = NewTCPGroup(tgc)
+		tgc.groups[group] = tcpGroup
 	}
+	tgc.mu.Unlock()
+
+	return tcpGroup.Listen(proxyName, group, groupKey, addr, port)
 }

-// TCPGroup routes connections to different proxies.
-type TCPGroup struct {
-	baseGroup
+// RemoveGroup remove TCPGroup from controller
+func (tgc *TCPGroupCtl) RemoveGroup(group string) {
+	tgc.mu.Lock()
+	defer tgc.mu.Unlock()
+	delete(tgc.groups, group)
+}

+// TCPGroup route connections to different proxies
+type TCPGroup struct {
+	group    string
+	groupKey string
 	addr     string
 	port     int
 	realPort int
+
+	acceptCh chan net.Conn
+	tcpLn    net.Listener
+	lns      []*TCPGroupListener
 	ctl      *TCPGroupCtl
+	mu       sync.Mutex
 }

-// NewTCPGroup returns a new TCPGroup.
+// NewTCPGroup return a new TCPGroup
 func NewTCPGroup(ctl *TCPGroupCtl) *TCPGroup {
 	return &TCPGroup{
-		ctl: ctl,
+		lns:      make([]*TCPGroupListener, 0),
+		ctl:      ctl,
+		acceptCh: make(chan net.Conn),
 	}
 }

-// Listen will return a new Listener.
-// If TCPGroup already has a listener, just add a new Listener to the queues,
-// otherwise listen on the real address.
-func (tg *TCPGroup) Listen(proxyName string, group string, groupKey string, addr string, port int) (ln *Listener, realPort int, err error) {
+// Listen will return a new TCPGroupListener
+// if TCPGroup already has a listener, just add a new TCPGroupListener to the queues
+// otherwise, listen on the real address
+func (tg *TCPGroup) Listen(proxyName string, group string, groupKey string, addr string, port int) (ln *TCPGroupListener, realPort int, err error) {
 	tg.mu.Lock()
 	defer tg.mu.Unlock()
-	if !tg.ctl.isCurrent(group, func(cur *TCPGroup) bool { return cur == tg }) {
-		return nil, 0, errGroupStale
-	}
 	if len(tg.lns) == 0 {
 		// the first listener, listen on the real address
 		realPort, err = tg.ctl.portManager.Acquire(proxyName, port)
@@ -90,18 +106,19 @@ func (tg *TCPGroup) Listen(proxyName string, group string, groupKey string, addr
 			err = errRet
 			return
 		}
+		ln = newTCPGroupListener(group, tg, tcpLn.Addr())

+		tg.group = group
+		tg.groupKey = groupKey
 		tg.addr = addr
 		tg.port = port
 		tg.realPort = realPort
-		tg.initBase(group, groupKey, tcpLn, func() {
-			tg.ctl.portManager.Release(tg.realPort)
-			tg.ctl.removeIf(tg.group, func(cur *TCPGroup) bool {
-				return cur == tg
-			})
-		})
-		ln = tg.newListener(tcpLn.Addr())
-		go tg.worker(tcpLn, tg.acceptCh)
+		tg.tcpLn = tcpLn
+		tg.lns = append(tg.lns, ln)
+		if tg.acceptCh == nil {
+			tg.acceptCh = make(chan net.Conn)
+		}
+		go tg.worker()
 	} else {
 		// address and port in the same group must be equal
 		if tg.group != group || tg.addr != addr {
@@ -116,8 +133,92 @@ func (tg *TCPGroup) Listen(proxyName string, group string, groupKey string, addr
 			err = ErrGroupAuthFailed
 			return
 		}
-		ln = tg.newListener(tg.lns[0].Addr())
+		ln = newTCPGroupListener(group, tg, tg.lns[0].Addr())
 		realPort = tg.realPort
+		tg.lns = append(tg.lns, ln)
 	}
 	return
 }
+
+// worker is called when the real tcp listener has been created
+func (tg *TCPGroup) worker() {
+	for {
+		c, err := tg.tcpLn.Accept()
+		if err != nil {
+			return
+		}
+		err = gerr.PanicToError(func() {
+			tg.acceptCh <- c
+		})
+		if err != nil {
+			return
+		}
+	}
+}
+
+func (tg *TCPGroup) Accept() <-chan net.Conn {
+	return tg.acceptCh
+}
+
+// CloseListener remove the TCPGroupListener from the TCPGroup
+func (tg *TCPGroup) CloseListener(ln *TCPGroupListener) {
+	tg.mu.Lock()
+	defer tg.mu.Unlock()
+	for i, tmpLn := range tg.lns {
+		if tmpLn == ln {
+			tg.lns = append(tg.lns[:i], tg.lns[i+1:]...)
+			break
+		}
+	}
+	if len(tg.lns) == 0 {
+		close(tg.acceptCh)
+		tg.tcpLn.Close()
+		tg.ctl.portManager.Release(tg.realPort)
+		tg.ctl.RemoveGroup(tg.group)
+	}
+}
+
+// TCPGroupListener
+type TCPGroupListener struct {
+	groupName string
+	group     *TCPGroup
+
+	addr    net.Addr
+	closeCh chan struct{}
+}
+
+func newTCPGroupListener(name string, group *TCPGroup, addr net.Addr) *TCPGroupListener {
+	return &TCPGroupListener{
+		groupName: name,
+		group:     group,
+		addr:      addr,
+		closeCh:   make(chan struct{}),
+	}
+}
+
+// Accept will accept connections from TCPGroup
+func (ln *TCPGroupListener) Accept() (c net.Conn, err error) {
+	var ok bool
+	select {
+	case <-ln.closeCh:
+		return nil, ErrListenerClosed
+	case c, ok = <-ln.group.Accept():
+		if !ok {
+			return nil, ErrListenerClosed
+		}
+		return c, nil
+	}
+}
+
+func (ln *TCPGroupListener) Addr() net.Addr {
+	return ln.addr
+}
+
+// Close close the listener
+func (ln *TCPGroupListener) Close() (err error) {
+	close(ln.closeCh)
+
+	// remove self from TcpGroup
+	ln.group.CloseListener(ln)
+	return
+}
--- a/server/group/tcpmux.go
+++ b/server/group/tcpmux.go
@@ -18,100 +18,118 @@ import (
 	"context"
 	"fmt"
 	"net"
+	"sync"
+
+	gerr "github.com/fatedier/golib/errors"

 	v1 "github.com/fatedier/frp/pkg/config/v1"
 	"github.com/fatedier/frp/pkg/util/tcpmux"
 	"github.com/fatedier/frp/pkg/util/vhost"
 )

-// TCPMuxGroupCtl manages all TCPMuxGroups.
+// TCPMuxGroupCtl manage all TCPMuxGroups
 type TCPMuxGroupCtl struct {
-	groupRegistry[*TCPMuxGroup]
+	groups map[string]*TCPMuxGroup
+
+	// portManager is used to manage port
 	tcpMuxHTTPConnectMuxer *tcpmux.HTTPConnectTCPMuxer
+	mu                     sync.Mutex
 }

-// NewTCPMuxGroupCtl returns a new TCPMuxGroupCtl.
+// NewTCPMuxGroupCtl return a new TCPMuxGroupCtl
 func NewTCPMuxGroupCtl(tcpMuxHTTPConnectMuxer *tcpmux.HTTPConnectTCPMuxer) *TCPMuxGroupCtl {
 	return &TCPMuxGroupCtl{
-		groupRegistry:          newGroupRegistry[*TCPMuxGroup](),
+		groups:                 make(map[string]*TCPMuxGroup),
 		tcpMuxHTTPConnectMuxer: tcpMuxHTTPConnectMuxer,
 	}
 }

-// Listen is the wrapper for TCPMuxGroup's Listen.
-// If there is no group, one will be created.
+// Listen is the wrapper for TCPMuxGroup's Listen
+// If there are no group, we will create one here
 func (tmgc *TCPMuxGroupCtl) Listen(
 	ctx context.Context,
 	multiplexer, group, groupKey string,
 	routeConfig vhost.RouteConfig,
 ) (l net.Listener, err error) {
-	for {
-		tcpMuxGroup := tmgc.getOrCreate(group, func() *TCPMuxGroup {
-			return NewTCPMuxGroup(tmgc)
-		})
+	tmgc.mu.Lock()
+	tcpMuxGroup, ok := tmgc.groups[group]
+	if !ok {
+		tcpMuxGroup = NewTCPMuxGroup(tmgc)
+		tmgc.groups[group] = tcpMuxGroup
+	}
+	tmgc.mu.Unlock()

-		switch v1.TCPMultiplexerType(multiplexer) {
-		case v1.TCPMultiplexerHTTPConnect:
-			l, err = tcpMuxGroup.HTTPConnectListen(ctx, group, groupKey, routeConfig)
-			if err == errGroupStale {
-				continue
-			}
-			return
-		default:
-			return nil, fmt.Errorf("unknown multiplexer [%s]", multiplexer)
-		}
+	switch v1.TCPMultiplexerType(multiplexer) {
+	case v1.TCPMultiplexerHTTPConnect:
+		return tcpMuxGroup.HTTPConnectListen(ctx, group, groupKey, routeConfig)
+	default:
+		err = fmt.Errorf("unknown multiplexer [%s]", multiplexer)
+		return
 	}
 }

-// TCPMuxGroup routes connections to different proxies.
-type TCPMuxGroup struct {
-	baseGroup
+// RemoveGroup remove TCPMuxGroup from controller
+func (tmgc *TCPMuxGroupCtl) RemoveGroup(group string) {
+	tmgc.mu.Lock()
+	defer tmgc.mu.Unlock()
+	delete(tmgc.groups, group)
+}

+// TCPMuxGroup route connections to different proxies
+type TCPMuxGroup struct {
+	group           string
+	groupKey        string
 	domain          string
 	routeByHTTPUser string
 	username        string
 	password        string
-	ctl             *TCPMuxGroupCtl
+
+	acceptCh chan net.Conn
+	tcpMuxLn net.Listener
+	lns      []*TCPMuxGroupListener
+	ctl      *TCPMuxGroupCtl
+	mu       sync.Mutex
 }

-// NewTCPMuxGroup returns a new TCPMuxGroup.
+// NewTCPMuxGroup return a new TCPMuxGroup
 func NewTCPMuxGroup(ctl *TCPMuxGroupCtl) *TCPMuxGroup {
 	return &TCPMuxGroup{
-		ctl: ctl,
+		lns:      make([]*TCPMuxGroupListener, 0),
+		ctl:      ctl,
+		acceptCh: make(chan net.Conn),
 	}
 }

-// HTTPConnectListen will return a new Listener.
-// If TCPMuxGroup already has a listener, just add a new Listener to the queues,
-// otherwise listen on the real address.
+// Listen will return a new TCPMuxGroupListener
+// if TCPMuxGroup already has a listener, just add a new TCPMuxGroupListener to the queues
+// otherwise, listen on the real address
 func (tmg *TCPMuxGroup) HTTPConnectListen(
 	ctx context.Context,
 	group, groupKey string,
 	routeConfig vhost.RouteConfig,
-) (ln *Listener, err error) {
+) (ln *TCPMuxGroupListener, err error) {
 	tmg.mu.Lock()
 	defer tmg.mu.Unlock()
-	if !tmg.ctl.isCurrent(group, func(cur *TCPMuxGroup) bool { return cur == tmg }) {
-		return nil, errGroupStale
-	}
 	if len(tmg.lns) == 0 {
 		// the first listener, listen on the real address
 		tcpMuxLn, errRet := tmg.ctl.tcpMuxHTTPConnectMuxer.Listen(ctx, &routeConfig)
 		if errRet != nil {
 			return nil, errRet
 		}
+		ln = newTCPMuxGroupListener(group, tmg, tcpMuxLn.Addr())

+		tmg.group = group
+		tmg.groupKey = groupKey
 		tmg.domain = routeConfig.Domain
 		tmg.routeByHTTPUser = routeConfig.RouteByHTTPUser
 		tmg.username = routeConfig.Username
 		tmg.password = routeConfig.Password
-		tmg.initBase(group, groupKey, tcpMuxLn, func() {
-			tmg.ctl.removeIf(tmg.group, func(cur *TCPMuxGroup) bool {
-				return cur == tmg
-			})
-		})
-		ln = tmg.newListener(tcpMuxLn.Addr())
-		go tmg.worker(tcpMuxLn, tmg.acceptCh)
+		tmg.tcpMuxLn = tcpMuxLn
+		tmg.lns = append(tmg.lns, ln)
+		if tmg.acceptCh == nil {
+			tmg.acceptCh = make(chan net.Conn)
+		}
+		go tmg.worker()
 	} else {
 		// route config in the same group must be equal
 		if tmg.group != group || tmg.domain != routeConfig.Domain ||
@@ -123,7 +141,90 @@ func (tmg *TCPMuxGroup) HTTPConnectListen(
 		if tmg.groupKey != groupKey {
 			return nil, ErrGroupAuthFailed
 		}
-		ln = tmg.newListener(tmg.lns[0].Addr())
+		ln = newTCPMuxGroupListener(group, tmg, tmg.lns[0].Addr())
+		tmg.lns = append(tmg.lns, ln)
 	}
 	return
 }
+
+// worker is called when the real TCP listener has been created
+func (tmg *TCPMuxGroup) worker() {
+	for {
+		c, err := tmg.tcpMuxLn.Accept()
+		if err != nil {
+			return
+		}
+		err = gerr.PanicToError(func() {
+			tmg.acceptCh <- c
+		})
+		if err != nil {
+			return
+		}
+	}
+}
+
+func (tmg *TCPMuxGroup) Accept() <-chan net.Conn {
+	return tmg.acceptCh
+}
+
+// CloseListener remove the TCPMuxGroupListener from the TCPMuxGroup
+func (tmg *TCPMuxGroup) CloseListener(ln *TCPMuxGroupListener) {
+	tmg.mu.Lock()
+	defer tmg.mu.Unlock()
+	for i, tmpLn := range tmg.lns {
+		if tmpLn == ln {
+			tmg.lns = append(tmg.lns[:i], tmg.lns[i+1:]...)
+			break
+		}
+	}
+	if len(tmg.lns) == 0 {
+		close(tmg.acceptCh)
+		tmg.tcpMuxLn.Close()
+		tmg.ctl.RemoveGroup(tmg.group)
+	}
+}
+
+// TCPMuxGroupListener
+type TCPMuxGroupListener struct {
+	groupName string
+	group     *TCPMuxGroup
+
+	addr    net.Addr
+	closeCh chan struct{}
+}
+
+func newTCPMuxGroupListener(name string, group *TCPMuxGroup, addr net.Addr) *TCPMuxGroupListener {
+	return &TCPMuxGroupListener{
+		groupName: name,
+		group:     group,
+		addr:      addr,
+		closeCh:   make(chan struct{}),
+	}
+}
+
+// Accept will accept connections from TCPMuxGroup
+func (ln *TCPMuxGroupListener) Accept() (c net.Conn, err error) {
+	var ok bool
+	select {
+	case <-ln.closeCh:
+		return nil, ErrListenerClosed
+	case c, ok = <-ln.group.Accept():
+		if !ok {
+			return nil, ErrListenerClosed
+		}
+		return c, nil
+	}
+}
+
+func (ln *TCPMuxGroupListener) Addr() net.Addr {
+	return ln.addr
+}
+
+// Close close the listener
+func (ln *TCPMuxGroupListener) Close() (err error) {
+	close(ln.closeCh)
+
+	// remove self from TcpMuxGroup
+	ln.group.CloseListener(ln)
+	return
+}
--- a/test/e2e/examples.go
+++ b/test/e2e/examples.go
@@ -26,7 +26,7 @@ var _ = ginkgo.Describe("[Feature: Example]", func() {
 			remotePort = %d
 			`, framework.TCPEchoServerPort, remotePort)

-			f.RunProcesses(serverConf, []string{clientConf})
+			f.RunProcesses([]string{serverConf}, []string{clientConf})

 			framework.NewRequestExpect(f).Port(remotePort).Ensure()
 		})
--- a/test/e2e/framework/framework.go
+++ b/test/e2e/framework/framework.go
@@ -241,31 +241,6 @@ func (f *Framework) AllocPort() int {
 	return port
 }

-func (f *Framework) AllocPortExcludingRanges(ranges ...[2]int) int {
-	for range 1000 {
-		port := f.portAllocator.Get()
-		ExpectTrue(port > 0, "alloc port failed")
-
-		inExcludedRange := false
-		for _, portRange := range ranges {
-			if port >= portRange[0] && port <= portRange[1] {
-				inExcludedRange = true
-				break
-			}
-		}
-		if inExcludedRange {
-			f.portAllocator.Release(port)
-			continue
-		}
-
-		f.allocatedPorts = append(f.allocatedPorts, port)
-		return port
-	}
-
-	Failf("alloc port outside excluded ranges failed")
-	return 0
-}
-
 func (f *Framework) ReleasePort(port int) {
 	f.portAllocator.Release(port)
 }
--- a/test/e2e/framework/process.go
+++ b/test/e2e/framework/process.go
@@ -3,84 +3,68 @@ package framework
 import (
 	"fmt"
 	"maps"
-	"net"
 	"os"
 	"path/filepath"
-	"strconv"
 	"time"

-	"github.com/fatedier/frp/pkg/config"
 	flog "github.com/fatedier/frp/pkg/util/log"
-	"github.com/fatedier/frp/test/e2e/framework/consts"
 	"github.com/fatedier/frp/test/e2e/pkg/process"
 )

-// RunProcesses starts one frps and zero or more frpc processes from templates.
-func (f *Framework) RunProcesses(serverTemplate string, clientTemplates []string) (*process.Process, []*process.Process) {
-	templates := append([]string{serverTemplate}, clientTemplates...)
+// RunProcesses run multiple processes from templates.
+// The first template should always be frps.
+func (f *Framework) RunProcesses(serverTemplates []string, clientTemplates []string) ([]*process.Process, []*process.Process) {
+	templates := make([]string, 0, len(serverTemplates)+len(clientTemplates))
+	templates = append(templates, serverTemplates...)
+	templates = append(templates, clientTemplates...)
 	outs, ports, err := f.RenderTemplates(templates)
 	ExpectNoError(err)
+	ExpectTrue(len(templates) > 0)

 	maps.Copy(f.usedPorts, ports)

-	// Start frps.
-	serverPath := filepath.Join(f.TempDirectory, "frp-e2e-server-0")
-	err = os.WriteFile(serverPath, []byte(outs[0]), 0o600)
-	ExpectNoError(err)
-
-	if TestContext.Debug {
-		flog.Debugf("[%s] %s", serverPath, outs[0])
-	}
-
-	serverProcess := process.NewWithEnvs(TestContext.FRPServerPath, []string{"-c", serverPath}, f.osEnvs)
-	f.serverConfPaths = append(f.serverConfPaths, serverPath)
-	f.serverProcesses = append(f.serverProcesses, serverProcess)
-	err = serverProcess.Start()
-	ExpectNoError(err)
-
-	if port, ok := ports[consts.PortServerName]; ok {
-		ExpectNoError(WaitForTCPReady(net.JoinHostPort("127.0.0.1", strconv.Itoa(port)), 5*time.Second))
-	} else {
-		time.Sleep(2 * time.Second)
-	}
-
-	// Start frpc(s).
-	clientProcesses := make([]*process.Process, 0, len(clientTemplates))
-	for i := range clientTemplates {
-		path := filepath.Join(f.TempDirectory, fmt.Sprintf("frp-e2e-client-%d", i))
-		err = os.WriteFile(path, []byte(outs[1+i]), 0o600)
+	currentServerProcesses := make([]*process.Process, 0, len(serverTemplates))
+	for i := range serverTemplates {
+		path := filepath.Join(f.TempDirectory, fmt.Sprintf("frp-e2e-server-%d", i))
+		err = os.WriteFile(path, []byte(outs[i]), 0o600)
 		ExpectNoError(err)

 		if TestContext.Debug {
-			flog.Debugf("[%s] %s", path, outs[1+i])
+			flog.Debugf("[%s] %s", path, outs[i])
+		}
+
+		p := process.NewWithEnvs(TestContext.FRPServerPath, []string{"-c", path}, f.osEnvs)
+		f.serverConfPaths = append(f.serverConfPaths, path)
+		f.serverProcesses = append(f.serverProcesses, p)
+		currentServerProcesses = append(currentServerProcesses, p)
+		err = p.Start()
+		ExpectNoError(err)
+		time.Sleep(500 * time.Millisecond)
+	}
+	time.Sleep(2 * time.Second)
+
+	currentClientProcesses := make([]*process.Process, 0, len(clientTemplates))
+	for i := range clientTemplates {
+		index := i + len(serverTemplates)
+		path := filepath.Join(f.TempDirectory, fmt.Sprintf("frp-e2e-client-%d", i))
+		err = os.WriteFile(path, []byte(outs[index]), 0o600)
+		ExpectNoError(err)
+
+		if TestContext.Debug {
+			flog.Debugf("[%s] %s", path, outs[index])
 		}

 		p := process.NewWithEnvs(TestContext.FRPClientPath, []string{"-c", path}, f.osEnvs)
 		f.clientConfPaths = append(f.clientConfPaths, path)
 		f.clientProcesses = append(f.clientProcesses, p)
-		clientProcesses = append(clientProcesses, p)
+		currentClientProcesses = append(currentClientProcesses, p)
 		err = p.Start()
 		ExpectNoError(err)
+		time.Sleep(500 * time.Millisecond)
 	}
-	// Wait for each client's proxies to register with frps.
-	// If any client has no proxies (e.g. visitor-only), fall back to sleep
-	// for the remaining time since visitors have no deterministic readiness signal.
-	allConfirmed := len(clientProcesses) > 0
-	start := time.Now()
-	for i, p := range clientProcesses {
-		configPath := f.clientConfPaths[len(f.clientConfPaths)-len(clientProcesses)+i]
-		if !waitForClientProxyReady(configPath, p, 5*time.Second) {
-			allConfirmed = false
-		}
-	}
-	if len(clientProcesses) > 0 && !allConfirmed {
-		remaining := 1500*time.Millisecond - time.Since(start)
-		if remaining > 0 {
-			time.Sleep(remaining)
-		}
-	}
+	time.Sleep(3 * time.Second)

-	return serverProcess, clientProcesses
+	return currentServerProcesses, currentClientProcesses
 }

 func (f *Framework) RunFrps(args ...string) (*process.Process, string, error) {
@@ -88,13 +72,11 @@ func (f *Framework) RunFrps(args ...string) (*process.Process, string, error) {
 	f.serverProcesses = append(f.serverProcesses, p)
 	err := p.Start()
 	if err != nil {
-		return p, p.Output(), err
+		return p, p.StdOutput(), err
 	}
-	select {
-	case <-p.Done():
-	case <-time.After(2 * time.Second):
-	}
-	return p, p.Output(), nil
+	// Give frps extra time to finish binding ports before proceeding.
+	time.Sleep(4 * time.Second)
+	return p, p.StdOutput(), nil
 }

 func (f *Framework) RunFrpc(args ...string) (*process.Process, string, error) {
@@ -102,13 +84,10 @@ func (f *Framework) RunFrpc(args ...string) (*process.Process, string, error) {
 	f.clientProcesses = append(f.clientProcesses, p)
 	err := p.Start()
 	if err != nil {
-		return p, p.Output(), err
+		return p, p.StdOutput(), err
 	}
-	select {
-	case <-p.Done():
-	case <-time.After(1500 * time.Millisecond):
-	}
-	return p, p.Output(), nil
+	time.Sleep(2 * time.Second)
+	return p, p.StdOutput(), nil
 }

 func (f *Framework) GenerateConfigFile(content string) string {
@@ -118,74 +97,3 @@ func (f *Framework) GenerateConfigFile(content string) string {
 	ExpectNoError(err)
 	return path
 }
-
-// waitForClientProxyReady parses the client config to extract proxy names,
-// then waits for each proxy's "start proxy success" log in the process output.
-// Returns true only if proxies were expected and all registered successfully.
-func waitForClientProxyReady(configPath string, p *process.Process, timeout time.Duration) bool {
-	_, proxyCfgs, _, _, err := config.LoadClientConfig(configPath, false)
-	if err != nil || len(proxyCfgs) == 0 {
-		return false
-	}
-
-	// Use a single deadline so the total wait across all proxies does not exceed timeout.
-	deadline := time.Now().Add(timeout)
-	for _, cfg := range proxyCfgs {
-		remaining := time.Until(deadline)
-		if remaining <= 0 {
-			return false
-		}
-		name := cfg.GetBaseConfig().Name
-		pattern := fmt.Sprintf("[%s] start proxy success", name)
-		if err := p.WaitForOutput(pattern, 1, remaining); err != nil {
-			return false
-		}
-	}
-	return true
-}
-
-// WaitForTCPUnreachable polls a TCP address until a connection fails or timeout.
-func WaitForTCPUnreachable(addr string, interval, timeout time.Duration) error {
-	if interval <= 0 {
-		return fmt.Errorf("invalid interval for TCP unreachable on %s: interval must be positive", addr)
-	}
-	if timeout <= 0 {
-		return fmt.Errorf("invalid timeout for TCP unreachable on %s: timeout must be positive", addr)
-	}
-	deadline := time.Now().Add(timeout)
-	for {
-		remaining := time.Until(deadline)
-		if remaining <= 0 {
-			return fmt.Errorf("timeout waiting for TCP unreachable on %s", addr)
-		}
-		dialTimeout := min(interval, remaining)
-		conn, err := net.DialTimeout("tcp", addr, dialTimeout)
-		if err != nil {
-			return nil
-		}
-		conn.Close()
-		time.Sleep(min(interval, time.Until(deadline)))
-	}
-}
-
-// WaitForTCPReady polls a TCP address until a connection succeeds or timeout.
-func WaitForTCPReady(addr string, timeout time.Duration) error {
-	if timeout <= 0 {
-		return fmt.Errorf("invalid timeout for TCP readiness on %s: timeout must be positive", addr)
-	}
-	deadline := time.Now().Add(timeout)
-	var lastErr error
-	for time.Now().Before(deadline) {
-		conn, err := net.DialTimeout("tcp", addr, 100*time.Millisecond)
-		if err == nil {
-			conn.Close()
-			return nil
-		}
-		lastErr = err
-		time.Sleep(50 * time.Millisecond)
-	}
-	if lastErr == nil {
-		return fmt.Errorf("timeout waiting for TCP readiness on %s before any dial attempt", addr)
-	}
-	return fmt.Errorf("timeout waiting for TCP readiness on %s: %w", addr, lastErr)
-}
--- a/test/e2e/legacy/basic/basic.go
+++ b/test/e2e/legacy/basic/basic.go
@@ -82,7 +82,7 @@ var _ = ginkgo.Describe("[Feature: Basic]", func() {
 					clientConf.WriteString(getProxyConf(test.proxyName, test.portName, test.extraConfig) + "\n")
 				}
 				// run frps and frpc
-				f.RunProcesses(serverConf, []string{clientConf.String()})
+				f.RunProcesses([]string{serverConf}, []string{clientConf.String()})

 				for _, test := range tests {
 					framework.NewRequestExpect(f).
@@ -152,7 +152,7 @@ var _ = ginkgo.Describe("[Feature: Basic]", func() {
 				clientConf.WriteString(getProxyConf(test.proxyName, tests[i].customDomains, test.extraConfig) + "\n")
 			}
 			// run frps and frpc
-			f.RunProcesses(serverConf, []string{clientConf.String()})
+			f.RunProcesses([]string{serverConf}, []string{clientConf.String()})

 			for _, test := range tests {
 				for domain := range strings.SplitSeq(test.customDomains, ",") {
@@ -235,7 +235,7 @@ var _ = ginkgo.Describe("[Feature: Basic]", func() {
 				clientConf.WriteString(getProxyConf(test.proxyName, tests[i].customDomains, test.extraConfig) + "\n")
 			}
 			// run frps and frpc
-			f.RunProcesses(serverConf, []string{clientConf.String()})
+			f.RunProcesses([]string{serverConf}, []string{clientConf.String()})

 			tlsConfig, err := transport.NewServerTLSConfig("", "", "")
 			framework.ExpectNoError(err)
@@ -419,7 +419,7 @@ var _ = ginkgo.Describe("[Feature: Basic]", func() {
 					}
 				}
 				// run frps and frpc
-				f.RunProcesses(serverConf, []string{clientServerConf.String(), clientVisitorConf.String(), clientUser2VisitorConf.String()})
+				f.RunProcesses([]string{serverConf}, []string{clientServerConf.String(), clientVisitorConf.String(), clientUser2VisitorConf.String()})

 				for _, test := range tests {
 					timeout := time.Second
@@ -497,7 +497,7 @@ var _ = ginkgo.Describe("[Feature: Basic]", func() {
 			}

 			// run frps and frpc
-			f.RunProcesses(serverConf, []string{clientConf.String()})
+			f.RunProcesses([]string{serverConf}, []string{clientConf.String()})

 			// Request without HTTP connect should get error
 			framework.NewRequestExpect(f).
--- a/test/e2e/legacy/basic/client.go
+++ b/test/e2e/legacy/basic/client.go
@@ -48,7 +48,7 @@ var _ = ginkgo.Describe("[Feature: ClientManage]", func() {
 			framework.TCPEchoServerPort, p2Port,
 			framework.TCPEchoServerPort, p3Port)

-		f.RunProcesses(serverConf, []string{clientConf})
+		f.RunProcesses([]string{serverConf}, []string{clientConf})

 		framework.NewRequestExpect(f).Port(p1Port).Ensure()
 		framework.NewRequestExpect(f).Port(p2Port).Ensure()
@@ -90,7 +90,7 @@ var _ = ginkgo.Describe("[Feature: ClientManage]", func() {
 		admin_pwd = admin
 		`, dashboardPort)

-		f.RunProcesses(serverConf, []string{clientConf})
+		f.RunProcesses([]string{serverConf}, []string{clientConf})

 		framework.NewRequestExpect(f).RequestModify(func(r *request.Request) {
 			r.HTTP().HTTPPath("/healthz")
@@ -116,7 +116,7 @@ var _ = ginkgo.Describe("[Feature: ClientManage]", func() {
 		remote_port = %d
 		`, adminPort, framework.TCPEchoServerPort, testPort)

-		f.RunProcesses(serverConf, []string{clientConf})
+		f.RunProcesses([]string{serverConf}, []string{clientConf})

 		framework.NewRequestExpect(f).Port(testPort).Ensure()

--- a/test/e2e/legacy/basic/client_server.go
+++ b/test/e2e/legacy/basic/client_server.go
@@ -76,7 +76,7 @@ func runClientServerTest(f *framework.Framework, configures *generalTestConfigur
 		clientConfs = append(clientConfs, client2Conf)
 	}

-	f.RunProcesses(serverConf, clientConfs)
+	f.RunProcesses([]string{serverConf}, clientConfs)

 	if configures.testDelay > 0 {
 		time.Sleep(configures.testDelay)
--- a/test/e2e/legacy/basic/config.go
+++ b/test/e2e/legacy/basic/config.go
@@ -33,7 +33,7 @@ var _ = ginkgo.Describe("[Feature: Config]", func() {
 			`, "`", "`", framework.TCPEchoServerPort, portName)

 			f.SetEnvs([]string{"FRP_TOKEN=123"})
-			f.RunProcesses(serverConf, []string{clientConf})
+			f.RunProcesses([]string{serverConf}, []string{clientConf})

 			framework.NewRequestExpect(f).PortName(portName).Ensure()
 		})
--- a/test/e2e/legacy/basic/http.go
+++ b/test/e2e/legacy/basic/http.go
@@ -56,7 +56,7 @@ var _ = ginkgo.Describe("[Feature: HTTP]", func() {
 			locations = /bar
 			`, fooPort, barPort)

-		f.RunProcesses(serverConf, []string{clientConf})
+		f.RunProcesses([]string{serverConf}, []string{clientConf})

 		tests := []struct {
 			path       string
@@ -111,7 +111,7 @@ var _ = ginkgo.Describe("[Feature: HTTP]", func() {
 			custom_domains = normal.example.com
 			`, fooPort, barPort, otherPort)

-		f.RunProcesses(serverConf, []string{clientConf})
+		f.RunProcesses([]string{serverConf}, []string{clientConf})

 		// user1
 		framework.NewRequestExpect(f).Explain("user1").Port(vhostHTTPPort).
@@ -152,7 +152,7 @@ var _ = ginkgo.Describe("[Feature: HTTP]", func() {
 			http_pwd = test
 			`, framework.HTTPSimpleServerPort)

-		f.RunProcesses(serverConf, []string{clientConf})
+		f.RunProcesses([]string{serverConf}, []string{clientConf})

 		// not set auth header
 		framework.NewRequestExpect(f).Port(vhostHTTPPort).
@@ -188,7 +188,7 @@ var _ = ginkgo.Describe("[Feature: HTTP]", func() {
 			custom_domains = *.example.com
 			`, framework.HTTPSimpleServerPort)

-		f.RunProcesses(serverConf, []string{clientConf})
+		f.RunProcesses([]string{serverConf}, []string{clientConf})

 		// not match host
 		framework.NewRequestExpect(f).Port(vhostHTTPPort).
@@ -238,7 +238,7 @@ var _ = ginkgo.Describe("[Feature: HTTP]", func() {
 			subdomain = bar
 			`, fooPort, barPort)

-		f.RunProcesses(serverConf, []string{clientConf})
+		f.RunProcesses([]string{serverConf}, []string{clientConf})

 		// foo
 		framework.NewRequestExpect(f).Explain("foo subdomain").Port(vhostHTTPPort).
@@ -279,7 +279,7 @@ var _ = ginkgo.Describe("[Feature: HTTP]", func() {
 			header_X-From-Where = frp
 			`, localPort)

-		f.RunProcesses(serverConf, []string{clientConf})
+		f.RunProcesses([]string{serverConf}, []string{clientConf})

 		// not set auth header
 		framework.NewRequestExpect(f).Port(vhostHTTPPort).
@@ -312,7 +312,7 @@ var _ = ginkgo.Describe("[Feature: HTTP]", func() {
 			host_header_rewrite = rewrite.example.com
 			`, localPort)

-		f.RunProcesses(serverConf, []string{clientConf})
+		f.RunProcesses([]string{serverConf}, []string{clientConf})

 		framework.NewRequestExpect(f).Port(vhostHTTPPort).
 			RequestModify(func(r *request.Request) {
@@ -360,7 +360,7 @@ var _ = ginkgo.Describe("[Feature: HTTP]", func() {
 			custom_domains = 127.0.0.1
 			`, localPort)

-		f.RunProcesses(serverConf, []string{clientConf})
+		f.RunProcesses([]string{serverConf}, []string{clientConf})

 		u := url.URL{Scheme: "ws", Host: "127.0.0.1:" + strconv.Itoa(vhostHTTPPort)}
 		c, _, err := websocket.DefaultDialer.Dial(u.String(), nil)
--- a/test/e2e/legacy/basic/server.go
+++ b/test/e2e/legacy/basic/server.go
@@ -20,8 +20,6 @@ var _ = ginkgo.Describe("[Feature: Server Manager]", func() {
 	ginkgo.It("Ports Whitelist", func() {
 		serverConf := consts.LegacyDefaultServerConfig
 		clientConf := consts.LegacyDefaultClientConfig
-		tcpPortNotAllowed := f.AllocPortExcludingRanges([2]int{10000, 11000}, [2]int{11002, 11002}, [2]int{12000, 13000})
-		udpPortNotAllowed := f.AllocPortExcludingRanges([2]int{10000, 11000}, [2]int{11002, 11002}, [2]int{12000, 13000})

 		serverConf += `
 			allow_ports = 10000-11000,11002,12000-13000
@@ -39,8 +37,8 @@ var _ = ginkgo.Describe("[Feature: Server Manager]", func() {
 			[tcp-port-not-allowed]
 			type = tcp
 			local_port = {{ .%s }}
-			remote_port = %d
-			`, framework.TCPEchoServerPort, tcpPortNotAllowed)
+			remote_port = 11001
+			`, framework.TCPEchoServerPort)
 		clientConf += fmt.Sprintf(`
 			[tcp-port-unavailable]
 			type = tcp
@@ -57,17 +55,17 @@ var _ = ginkgo.Describe("[Feature: Server Manager]", func() {
 			[udp-port-not-allowed]
 			type = udp
 			local_port = {{ .%s }}
-			remote_port = %d
-			`, framework.UDPEchoServerPort, udpPortNotAllowed)
+			remote_port = 11003
+			`, framework.UDPEchoServerPort)

-		f.RunProcesses(serverConf, []string{clientConf})
+		f.RunProcesses([]string{serverConf}, []string{clientConf})

 		// TCP
 		// Allowed in range
 		framework.NewRequestExpect(f).PortName(tcpPortName).Ensure()

 		// Not Allowed
-		framework.NewRequestExpect(f).Port(tcpPortNotAllowed).ExpectError(true).Ensure()
+		framework.NewRequestExpect(f).Port(11001).ExpectError(true).Ensure()

 		// Unavailable, already bind by frps
 		framework.NewRequestExpect(f).PortName(consts.PortServerName).ExpectError(true).Ensure()
@@ -78,7 +76,7 @@ var _ = ginkgo.Describe("[Feature: Server Manager]", func() {

 		// Not Allowed
 		framework.NewRequestExpect(f).RequestModify(func(r *request.Request) {
-			r.UDP().Port(udpPortNotAllowed)
+			r.UDP().Port(11003)
 		}).ExpectError(true).Ensure()
 	})

@@ -99,7 +97,7 @@ var _ = ginkgo.Describe("[Feature: Server Manager]", func() {
 		local_port = {{ .%s }}
 		`, adminPort, framework.TCPEchoServerPort, framework.UDPEchoServerPort)

-		f.RunProcesses(serverConf, []string{clientConf})
+		f.RunProcesses([]string{serverConf}, []string{clientConf})

 		client := f.APIClientForFrpc(adminPort)

@@ -140,7 +138,7 @@ var _ = ginkgo.Describe("[Feature: Server Manager]", func() {
 		custom_domains = example.com
 		`, framework.HTTPSimpleServerPort)

-		f.RunProcesses(serverConf, []string{clientConf})
+		f.RunProcesses([]string{serverConf}, []string{clientConf})

 		framework.NewRequestExpect(f).RequestModify(func(r *request.Request) {
 			r.HTTP().HTTPHost("example.com")
@@ -167,7 +165,7 @@ var _ = ginkgo.Describe("[Feature: Server Manager]", func() {
 		custom_domains = example.com
 		`, framework.HTTPSimpleServerPort)

-		f.RunProcesses(serverConf, []string{clientConf})
+		f.RunProcesses([]string{serverConf}, []string{clientConf})

 		framework.NewRequestExpect(f).RequestModify(func(r *request.Request) {
 			r.HTTP().HTTPPath("/healthz")
--- a/test/e2e/legacy/basic/tcpmux.go
+++ b/test/e2e/legacy/basic/tcpmux.go
@@ -76,7 +76,7 @@ var _ = ginkgo.Describe("[Feature: TCPMUX httpconnect]", func() {
 			custom_domains = normal.example.com
 			`, fooPort, barPort, otherPort)

-		f.RunProcesses(serverConf, []string{clientConf})
+		f.RunProcesses([]string{serverConf}, []string{clientConf})

 		// user1
 		framework.NewRequestExpect(f).Explain("user1").
@@ -121,7 +121,7 @@ var _ = ginkgo.Describe("[Feature: TCPMUX httpconnect]", func() {
 			http_pwd = test
 		`, fooPort)

-		f.RunProcesses(serverConf, []string{clientConf})
+		f.RunProcesses([]string{serverConf}, []string{clientConf})

 		// not set auth header
 		framework.NewRequestExpect(f).Explain("no auth").
@@ -204,7 +204,7 @@ var _ = ginkgo.Describe("[Feature: TCPMUX httpconnect]", func() {
 			custom_domains = normal.example.com
 			`, localPort)

-		f.RunProcesses(serverConf, []string{clientConf})
+		f.RunProcesses([]string{serverConf}, []string{clientConf})

 		framework.NewRequestExpect(f).
 			RequestModify(func(r *request.Request) {
--- a/test/e2e/legacy/basic/xtcp.go
+++ b/test/e2e/legacy/basic/xtcp.go
@@ -41,7 +41,7 @@ var _ = ginkgo.Describe("[Feature: XTCP]", func() {
 			fallback_timeout_ms = 200
 			`, framework.TCPEchoServerPort, bindPortName)

-		f.RunProcesses(serverConf, []string{clientConf})
+		f.RunProcesses([]string{serverConf}, []string{clientConf})
 		framework.NewRequestExpect(f).
 			RequestModify(func(r *request.Request) {
 				r.Timeout(time.Second)
--- a/test/e2e/legacy/features/bandwidth_limit.go
+++ b/test/e2e/legacy/features/bandwidth_limit.go
@@ -35,7 +35,7 @@ var _ = ginkgo.Describe("[Feature: Bandwidth Limit]", func() {
 			bandwidth_limit = 10KB
 			`, localPort, remotePort)

-		f.RunProcesses(serverConf, []string{clientConf})
+		f.RunProcesses([]string{serverConf}, []string{clientConf})

 		content := strings.Repeat("a", 50*1024) // 5KB
 		start := time.Now()
@@ -89,7 +89,7 @@ var _ = ginkgo.Describe("[Feature: Bandwidth Limit]", func() {
 			remote_port = %d
 			`, localPort, remotePort)

-		f.RunProcesses(serverConf, []string{clientConf})
+		f.RunProcesses([]string{serverConf}, []string{clientConf})

 		content := strings.Repeat("a", 50*1024) // 5KB
 		start := time.Now()
--- a/test/e2e/legacy/features/group.go
+++ b/test/e2e/legacy/features/group.go
@@ -88,7 +88,7 @@ var _ = ginkgo.Describe("[Feature: Group]", func() {
 			group_key = 123
 			`, fooPort, remotePort, barPort, remotePort)

-			f.RunProcesses(serverConf, []string{clientConf})
+			f.RunProcesses([]string{serverConf}, []string{clientConf})

 			fooCount := 0
 			barCount := 0
@@ -144,7 +144,7 @@ var _ = ginkgo.Describe("[Feature: Group]", func() {
 			health_check_interval_s = 1
 			`, fooPort, remotePort, barPort, remotePort)

-			f.RunProcesses(serverConf, []string{clientConf})
+			f.RunProcesses([]string{serverConf}, []string{clientConf})

 			// check foo and bar is ok
 			results := []string{}
@@ -213,7 +213,7 @@ var _ = ginkgo.Describe("[Feature: Group]", func() {
 			health_check_url = /healthz
 			`, fooPort, barPort)

-			f.RunProcesses(serverConf, []string{clientConf})
+			f.RunProcesses([]string{serverConf}, []string{clientConf})

 			// send first HTTP request
 			var contents []string
--- a/test/e2e/legacy/features/heartbeat.go
+++ b/test/e2e/legacy/features/heartbeat.go
@@ -38,7 +38,7 @@ var _ = ginkgo.Describe("[Feature: Heartbeat]", func() {
 		`, serverPort, f.PortByName(framework.TCPEchoServerPort), remotePort)

 		// run frps and frpc
-		f.RunProcesses(serverConf, []string{clientConf})
+		f.RunProcesses([]string{serverConf}, []string{clientConf})

 		framework.NewRequestExpect(f).Protocol("tcp").Port(remotePort).Ensure()

--- a/test/e2e/legacy/features/monitor.go
+++ b/test/e2e/legacy/features/monitor.go
@@ -33,7 +33,7 @@ var _ = ginkgo.Describe("[Feature: Monitor]", func() {
 		remote_port = %d
 		`, framework.TCPEchoServerPort, remotePort)

-		f.RunProcesses(serverConf, []string{clientConf})
+		f.RunProcesses([]string{serverConf}, []string{clientConf})

 		framework.NewRequestExpect(f).Port(remotePort).Ensure()
 		time.Sleep(500 * time.Millisecond)
--- a/test/e2e/legacy/features/real_ip.go
+++ b/test/e2e/legacy/features/real_ip.go
@@ -44,7 +44,7 @@ var _ = ginkgo.Describe("[Feature: Real IP]", func() {
 		custom_domains = normal.example.com
 		`, localPort)

-		f.RunProcesses(serverConf, []string{clientConf})
+		f.RunProcesses([]string{serverConf}, []string{clientConf})

 		framework.NewRequestExpect(f).Port(vhostHTTPPort).
 			RequestModify(func(r *request.Request) {
@@ -90,7 +90,7 @@ var _ = ginkgo.Describe("[Feature: Real IP]", func() {
 			proxy_protocol_version = v2
 			`, localPort, remotePort)

-			f.RunProcesses(serverConf, []string{clientConf})
+			f.RunProcesses([]string{serverConf}, []string{clientConf})

 			framework.NewRequestExpect(f).Port(remotePort).Ensure(func(resp *request.Response) bool {
 				log.Tracef("proxy protocol get SourceAddr: %s", string(resp.Content))
@@ -136,7 +136,7 @@ var _ = ginkgo.Describe("[Feature: Real IP]", func() {
 			proxy_protocol_version = v2
 			`, localPort)

-			f.RunProcesses(serverConf, []string{clientConf})
+			f.RunProcesses([]string{serverConf}, []string{clientConf})

 			framework.NewRequestExpect(f).Port(vhostHTTPPort).RequestModify(func(r *request.Request) {
 				r.HTTP().HTTPHost("normal.example.com")
--- a/test/e2e/legacy/plugin/client.go
+++ b/test/e2e/legacy/plugin/client.go
@@ -70,7 +70,7 @@ var _ = ginkgo.Describe("[Feature: Client-Plugins]", func() {
 				clientConf.WriteString(getProxyConf(test.proxyName, test.portName, test.extraConfig) + "\n")
 			}
 			// run frps and frpc
-			f.RunProcesses(serverConf, []string{clientConf.String()})
+			f.RunProcesses([]string{serverConf}, []string{clientConf.String()})

 			for _, test := range tests {
 				framework.NewRequestExpect(f).Port(f.PortByName(test.portName)).Ensure()
@@ -92,7 +92,7 @@ var _ = ginkgo.Describe("[Feature: Client-Plugins]", func() {
 		plugin_http_passwd = 123
 		`, remotePort)

-		f.RunProcesses(serverConf, []string{clientConf})
+		f.RunProcesses([]string{serverConf}, []string{clientConf})

 		// http proxy, no auth info
 		framework.NewRequestExpect(f).PortName(framework.HTTPSimpleServerPort).RequestModify(func(r *request.Request) {
@@ -124,7 +124,7 @@ var _ = ginkgo.Describe("[Feature: Client-Plugins]", func() {
 		plugin_passwd = 123
 		`, remotePort)

-		f.RunProcesses(serverConf, []string{clientConf})
+		f.RunProcesses([]string{serverConf}, []string{clientConf})

 		// http proxy, no auth info
 		framework.NewRequestExpect(f).PortName(framework.TCPEchoServerPort).RequestModify(func(r *request.Request) {
@@ -168,7 +168,7 @@ var _ = ginkgo.Describe("[Feature: Client-Plugins]", func() {
 		plugin_http_passwd = 123
 		`, remotePort, f.TempDirectory, f.TempDirectory, f.TempDirectory)

-		f.RunProcesses(serverConf, []string{clientConf})
+		f.RunProcesses([]string{serverConf}, []string{clientConf})

 		// from tcp proxy
 		framework.NewRequestExpect(f).Request(
@@ -202,7 +202,7 @@ var _ = ginkgo.Describe("[Feature: Client-Plugins]", func() {
 		plugin_local_addr = 127.0.0.1:%d
 		`, localPort)

-		f.RunProcesses(serverConf, []string{clientConf})
+		f.RunProcesses([]string{serverConf}, []string{clientConf})

 		tlsConfig, err := transport.NewServerTLSConfig("", "", "")
 		framework.ExpectNoError(err)
@@ -246,7 +246,7 @@ var _ = ginkgo.Describe("[Feature: Client-Plugins]", func() {
 		plugin_key_path = %s
 		`, localPort, crtPath, keyPath)

-		f.RunProcesses(serverConf, []string{clientConf})
+		f.RunProcesses([]string{serverConf}, []string{clientConf})

 		localServer := httpserver.New(
 			httpserver.WithBindPort(localPort),
@@ -290,7 +290,7 @@ var _ = ginkgo.Describe("[Feature: Client-Plugins]", func() {
 		plugin_key_path = %s
 		`, localPort, crtPath, keyPath)

-		f.RunProcesses(serverConf, []string{clientConf})
+		f.RunProcesses([]string{serverConf}, []string{clientConf})

 		tlsConfig, err := transport.NewServerTLSConfig("", "", "")
 		framework.ExpectNoError(err)
--- a/test/e2e/legacy/plugin/server.go
+++ b/test/e2e/legacy/plugin/server.go
@@ -71,7 +71,7 @@ var _ = ginkgo.Describe("[Feature: Server-Plugins]", func() {
 			remote_port = %d
 			`, framework.TCPEchoServerPort, remotePort2)

-			f.RunProcesses(serverConf, []string{clientConf, invalidTokenClientConf})
+			f.RunProcesses([]string{serverConf}, []string{clientConf, invalidTokenClientConf})

 			framework.NewRequestExpect(f).Port(remotePort).Ensure()
 			framework.NewRequestExpect(f).Port(remotePort2).ExpectError(true).Ensure()
@@ -119,7 +119,7 @@ var _ = ginkgo.Describe("[Feature: Server-Plugins]", func() {
 			remote_port = %d
 			`, framework.TCPEchoServerPort, remotePort)

-			f.RunProcesses(serverConf, []string{clientConf})
+			f.RunProcesses([]string{serverConf}, []string{clientConf})

 			framework.NewRequestExpect(f).Port(remotePort).Ensure()
 		})
@@ -153,7 +153,7 @@ var _ = ginkgo.Describe("[Feature: Server-Plugins]", func() {
 			remote_port = 0
 			`, framework.TCPEchoServerPort)

-			f.RunProcesses(serverConf, []string{clientConf})
+			f.RunProcesses([]string{serverConf}, []string{clientConf})

 			framework.NewRequestExpect(f).Port(remotePort).Ensure()
 		})
@@ -195,7 +195,7 @@ var _ = ginkgo.Describe("[Feature: Server-Plugins]", func() {
 			remote_port = %d
 			`, framework.TCPEchoServerPort, remotePort)

-			_, clients := f.RunProcesses(serverConf, []string{clientConf})
+			_, clients := f.RunProcesses([]string{serverConf}, []string{clientConf})

 			framework.NewRequestExpect(f).Port(remotePort).Ensure()

@@ -250,7 +250,7 @@ var _ = ginkgo.Describe("[Feature: Server-Plugins]", func() {
 			remote_port = %d
 			`, framework.TCPEchoServerPort, remotePort)

-			f.RunProcesses(serverConf, []string{clientConf})
+			f.RunProcesses([]string{serverConf}, []string{clientConf})

 			framework.NewRequestExpect(f).Port(remotePort).Ensure()

@@ -297,7 +297,7 @@ var _ = ginkgo.Describe("[Feature: Server-Plugins]", func() {
 			remote_port = %d
 			`, framework.TCPEchoServerPort, remotePort)

-			f.RunProcesses(serverConf, []string{clientConf})
+			f.RunProcesses([]string{serverConf}, []string{clientConf})

 			framework.NewRequestExpect(f).Port(remotePort).Ensure()

@@ -342,7 +342,7 @@ var _ = ginkgo.Describe("[Feature: Server-Plugins]", func() {
 			remote_port = %d
 			`, framework.TCPEchoServerPort, remotePort)

-			f.RunProcesses(serverConf, []string{clientConf})
+			f.RunProcesses([]string{serverConf}, []string{clientConf})

 			framework.NewRequestExpect(f).Port(remotePort).Ensure()

@@ -389,7 +389,7 @@ var _ = ginkgo.Describe("[Feature: Server-Plugins]", func() {
 			remote_port = %d
 			`, framework.TCPEchoServerPort, remotePort)

-			f.RunProcesses(serverConf, []string{clientConf})
+			f.RunProcesses([]string{serverConf}, []string{clientConf})

 			framework.NewRequestExpect(f).Port(remotePort).Ensure()

--- a/test/e2e/mock/server/oidcserver/oidcserver.go
+++ b/test/e2e/mock/server/oidcserver/oidcserver.go
@@ -1,258 +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 oidcserver provides a minimal mock OIDC server for e2e testing.
-// It implements three endpoints:
-//   - /.well-known/openid-configuration (discovery)
-//   - /jwks (JSON Web Key Set)
-//   - /token (client_credentials grant)
-package oidcserver
-
-import (
-	"crypto"
-	"crypto/rand"
-	"crypto/rsa"
-	"crypto/sha256"
-	"encoding/base64"
-	"encoding/json"
-	"fmt"
-	"math/big"
-	"net"
-	"net/http"
-	"strconv"
-	"sync/atomic"
-	"time"
-)
-
-type Server struct {
-	bindAddr string
-	bindPort int
-	l        net.Listener
-	hs       *http.Server
-
-	privateKey *rsa.PrivateKey
-	kid        string
-
-	clientID     string
-	clientSecret string
-	audience     string
-	subject      string
-	expiresIn    int // seconds; 0 means omit expires_in from token response
-
-	tokenRequestCount atomic.Int64
-}
-
-type Option func(*Server)
-
-func WithBindPort(port int) Option {
-	return func(s *Server) { s.bindPort = port }
-}
-
-func WithClientCredentials(id, secret string) Option {
-	return func(s *Server) {
-		s.clientID = id
-		s.clientSecret = secret
-	}
-}
-
-func WithAudience(aud string) Option {
-	return func(s *Server) { s.audience = aud }
-}
-
-func WithSubject(sub string) Option {
-	return func(s *Server) { s.subject = sub }
-}
-
-func WithExpiresIn(seconds int) Option {
-	return func(s *Server) { s.expiresIn = seconds }
-}
-
-func New(options ...Option) *Server {
-	s := &Server{
-		bindAddr:     "127.0.0.1",
-		kid:          "test-key-1",
-		clientID:     "test-client",
-		clientSecret: "test-secret",
-		audience:     "frps",
-		subject:      "test-service",
-		expiresIn:    3600,
-	}
-	for _, opt := range options {
-		opt(s)
-	}
-	return s
-}
-
-func (s *Server) Run() error {
-	key, err := rsa.GenerateKey(rand.Reader, 2048)
-	if err != nil {
-		return fmt.Errorf("generate RSA key: %w", err)
-	}
-	s.privateKey = key
-
-	s.l, err = net.Listen("tcp", net.JoinHostPort(s.bindAddr, strconv.Itoa(s.bindPort)))
-	if err != nil {
-		return err
-	}
-	s.bindPort = s.l.Addr().(*net.TCPAddr).Port
-
-	mux := http.NewServeMux()
-	mux.HandleFunc("/.well-known/openid-configuration", s.handleDiscovery)
-	mux.HandleFunc("/jwks", s.handleJWKS)
-	mux.HandleFunc("/token", s.handleToken)
-
-	s.hs = &http.Server{
-		Handler:           mux,
-		ReadHeaderTimeout: time.Minute,
-	}
-	go func() { _ = s.hs.Serve(s.l) }()
-	return nil
-}
-
-func (s *Server) Close() error {
-	if s.hs != nil {
-		return s.hs.Close()
-	}
-	return nil
-}
-
-func (s *Server) BindAddr() string { return s.bindAddr }
-func (s *Server) BindPort() int    { return s.bindPort }
-
-func (s *Server) Issuer() string {
-	return fmt.Sprintf("http://%s:%d", s.bindAddr, s.bindPort)
-}
-
-func (s *Server) TokenEndpoint() string {
-	return s.Issuer() + "/token"
-}
-
-// TokenRequestCount returns the number of successful token requests served.
-func (s *Server) TokenRequestCount() int64 {
-	return s.tokenRequestCount.Load()
-}
-
-func (s *Server) handleDiscovery(w http.ResponseWriter, _ *http.Request) {
-	issuer := s.Issuer()
-	w.Header().Set("Content-Type", "application/json")
-	_ = json.NewEncoder(w).Encode(map[string]any{
-		"issuer":                                issuer,
-		"token_endpoint":                        issuer + "/token",
-		"jwks_uri":                              issuer + "/jwks",
-		"response_types_supported":              []string{"code"},
-		"subject_types_supported":               []string{"public"},
-		"id_token_signing_alg_values_supported": []string{"RS256"},
-	})
-}
-
-func (s *Server) handleJWKS(w http.ResponseWriter, _ *http.Request) {
-	pub := &s.privateKey.PublicKey
-	w.Header().Set("Content-Type", "application/json")
-	_ = json.NewEncoder(w).Encode(map[string]any{
-		"keys": []map[string]any{
-			{
-				"kty": "RSA",
-				"alg": "RS256",
-				"use": "sig",
-				"kid": s.kid,
-				"n":   base64.RawURLEncoding.EncodeToString(pub.N.Bytes()),
-				"e":   base64.RawURLEncoding.EncodeToString(big.NewInt(int64(pub.E)).Bytes()),
-			},
-		},
-	})
-}
-
-func (s *Server) handleToken(w http.ResponseWriter, r *http.Request) {
-	if r.Method != http.MethodPost {
-		http.Error(w, "method not allowed", http.StatusMethodNotAllowed)
-		return
-	}
-	if err := r.ParseForm(); err != nil {
-		w.Header().Set("Content-Type", "application/json")
-		w.WriteHeader(http.StatusBadRequest)
-		_ = json.NewEncoder(w).Encode(map[string]any{
-			"error": "invalid_request",
-		})
-		return
-	}
-
-	if r.FormValue("grant_type") != "client_credentials" {
-		w.Header().Set("Content-Type", "application/json")
-		w.WriteHeader(http.StatusBadRequest)
-		_ = json.NewEncoder(w).Encode(map[string]any{
-			"error": "unsupported_grant_type",
-		})
-		return
-	}
-
-	// Accept credentials from Basic Auth or form body.
-	clientID, clientSecret, ok := r.BasicAuth()
-	if !ok {
-		clientID = r.FormValue("client_id")
-		clientSecret = r.FormValue("client_secret")
-	}
-	if clientID != s.clientID || clientSecret != s.clientSecret {
-		w.Header().Set("Content-Type", "application/json")
-		w.WriteHeader(http.StatusUnauthorized)
-		_ = json.NewEncoder(w).Encode(map[string]any{
-			"error": "invalid_client",
-		})
-		return
-	}
-
-	token, err := s.signJWT()
-	if err != nil {
-		http.Error(w, err.Error(), http.StatusInternalServerError)
-		return
-	}
-
-	resp := map[string]any{
-		"access_token": token,
-		"token_type":   "Bearer",
-	}
-	if s.expiresIn > 0 {
-		resp["expires_in"] = s.expiresIn
-	}
-
-	s.tokenRequestCount.Add(1)
-	w.Header().Set("Content-Type", "application/json")
-	_ = json.NewEncoder(w).Encode(resp)
-}
-
-func (s *Server) signJWT() (string, error) {
-	now := time.Now()
-	header, _ := json.Marshal(map[string]string{
-		"alg": "RS256",
-		"kid": s.kid,
-		"typ": "JWT",
-	})
-	claims, _ := json.Marshal(map[string]any{
-		"iss": s.Issuer(),
-		"sub": s.subject,
-		"aud": s.audience,
-		"iat": now.Unix(),
-		"exp": now.Add(1 * time.Hour).Unix(),
-	})
-
-	headerB64 := base64.RawURLEncoding.EncodeToString(header)
-	claimsB64 := base64.RawURLEncoding.EncodeToString(claims)
-	signingInput := headerB64 + "." + claimsB64
-
-	h := sha256.Sum256([]byte(signingInput))
-	sig, err := rsa.SignPKCS1v15(rand.Reader, s.privateKey, crypto.SHA256, h[:])
-	if err != nil {
-		return "", err
-	}
-	return signingInput + "." + base64.RawURLEncoding.EncodeToString(sig), nil
-}
--- a/test/e2e/pkg/process/process.go
+++ b/test/e2e/pkg/process/process.go
@@ -3,44 +3,15 @@ package process
 import (
 	"bytes"
 	"context"
-	"errors"
-	"fmt"
 	"os/exec"
-	"strings"
-	"sync"
-	"time"
 )

-// SafeBuffer is a thread-safe wrapper around bytes.Buffer.
-// It is safe to call Write and String concurrently.
-type SafeBuffer struct {
-	mu  sync.Mutex
-	buf bytes.Buffer
-}
-
-func (b *SafeBuffer) Write(p []byte) (int, error) {
-	b.mu.Lock()
-	defer b.mu.Unlock()
-	return b.buf.Write(p)
-}
-
-func (b *SafeBuffer) String() string {
-	b.mu.Lock()
-	defer b.mu.Unlock()
-	return b.buf.String()
-}
-
 type Process struct {
 	cmd         *exec.Cmd
 	cancel      context.CancelFunc
-	errorOutput *SafeBuffer
-	stdOutput   *SafeBuffer
+	errorOutput *bytes.Buffer
+	stdOutput   *bytes.Buffer

-	done     chan struct{}
-	closeOne sync.Once
-	waitErr  error
-
-	started           bool
 	beforeStopHandler func()
 	stopped           bool
 }
@@ -56,45 +27,20 @@ func NewWithEnvs(path string, params []string, envs []string) *Process {
 	p := &Process{
 		cmd:    cmd,
 		cancel: cancel,
-		done:   make(chan struct{}),
 	}
-	p.errorOutput = &SafeBuffer{}
-	p.stdOutput = &SafeBuffer{}
+	p.errorOutput = bytes.NewBufferString("")
+	p.stdOutput = bytes.NewBufferString("")
 	cmd.Stderr = p.errorOutput
 	cmd.Stdout = p.stdOutput
 	return p
 }

 func (p *Process) Start() error {
-	if p.started {
-		return errors.New("process already started")
-	}
-	p.started = true
-
-	err := p.cmd.Start()
-	if err != nil {
-		p.waitErr = err
-		p.closeDone()
-		return err
-	}
-	go func() {
-		p.waitErr = p.cmd.Wait()
-		p.closeDone()
-	}()
-	return nil
-}
-
-func (p *Process) closeDone() {
-	p.closeOne.Do(func() { close(p.done) })
-}
-
-// Done returns a channel that is closed when the process exits.
-func (p *Process) Done() <-chan struct{} {
-	return p.done
+	return p.cmd.Start()
 }

 func (p *Process) Stop() error {
-	if p.stopped || !p.started {
+	if p.stopped {
 		return nil
 	}
 	defer func() {
@@ -104,8 +50,7 @@ func (p *Process) Stop() error {
 		p.beforeStopHandler()
 	}
 	p.cancel()
-	<-p.done
-	return p.waitErr
+	return p.cmd.Wait()
 }

 func (p *Process) ErrorOutput() string {
@@ -116,38 +61,6 @@ func (p *Process) StdOutput() string {
 	return p.stdOutput.String()
 }

-func (p *Process) Output() string {
-	return p.stdOutput.String() + p.errorOutput.String()
-}
-
-// CountOutput returns how many times pattern appears in the current accumulated output.
-func (p *Process) CountOutput(pattern string) int {
-	return strings.Count(p.Output(), pattern)
-}
-
 func (p *Process) SetBeforeStopHandler(fn func()) {
 	p.beforeStopHandler = fn
 }
-
-// WaitForOutput polls the combined process output until the pattern is found
-// count time(s) or the timeout is reached. It also returns early if the process exits.
-func (p *Process) WaitForOutput(pattern string, count int, timeout time.Duration) error {
-	deadline := time.Now().Add(timeout)
-	for time.Now().Before(deadline) {
-		output := p.Output()
-		if strings.Count(output, pattern) >= count {
-			return nil
-		}
-		select {
-		case <-p.Done():
-			// Process exited, check one last time.
-			output = p.Output()
-			if strings.Count(output, pattern) >= count {
-				return nil
-			}
-			return fmt.Errorf("process exited before %d occurrence(s) of %q found", count, pattern)
-		case <-time.After(25 * time.Millisecond):
-		}
-	}
-	return fmt.Errorf("timeout waiting for %d occurrence(s) of %q", count, pattern)
-}
--- a/test/e2e/v1/basic/annotations.go
+++ b/test/e2e/v1/basic/annotations.go
@@ -35,7 +35,7 @@ var _ = ginkgo.Describe("[Feature: Annotations]", func() {
 		"frp.e2e.test/bar" = "value2"
 		`, framework.TCPEchoServerPort, p1Port)

-		f.RunProcesses(serverConf, []string{clientConf})
+		f.RunProcesses([]string{serverConf}, []string{clientConf})

 		framework.NewRequestExpect(f).Port(p1Port).Ensure()

--- a/test/e2e/v1/basic/basic.go
+++ b/test/e2e/v1/basic/basic.go
@@ -83,7 +83,7 @@ var _ = ginkgo.Describe("[Feature: Basic]", func() {
 					clientConf.WriteString(getProxyConf(test.proxyName, test.portName, test.extraConfig) + "\n")
 				}
 				// run frps and frpc
-				f.RunProcesses(serverConf, []string{clientConf.String()})
+				f.RunProcesses([]string{serverConf}, []string{clientConf.String()})

 				for _, test := range tests {
 					framework.NewRequestExpect(f).
@@ -154,7 +154,7 @@ var _ = ginkgo.Describe("[Feature: Basic]", func() {
 				clientConf.WriteString(getProxyConf(test.proxyName, tests[i].customDomains, test.extraConfig) + "\n")
 			}
 			// run frps and frpc
-			f.RunProcesses(serverConf, []string{clientConf.String()})
+			f.RunProcesses([]string{serverConf}, []string{clientConf.String()})

 			for _, test := range tests {
 				for domain := range strings.SplitSeq(test.customDomains, ",") {
@@ -240,7 +240,7 @@ var _ = ginkgo.Describe("[Feature: Basic]", func() {
 				clientConf.WriteString(getProxyConf(test.proxyName, tests[i].customDomains, test.extraConfig) + "\n")
 			}
 			// run frps and frpc
-			f.RunProcesses(serverConf, []string{clientConf.String()})
+			f.RunProcesses([]string{serverConf}, []string{clientConf.String()})

 			tlsConfig, err := transport.NewServerTLSConfig("", "", "")
 			framework.ExpectNoError(err)
@@ -426,7 +426,7 @@ var _ = ginkgo.Describe("[Feature: Basic]", func() {
 					}
 				}
 				// run frps and frpc
-				f.RunProcesses(serverConf, []string{clientServerConf.String(), clientVisitorConf.String(), clientUser2VisitorConf.String()})
+				f.RunProcesses([]string{serverConf}, []string{clientServerConf.String(), clientVisitorConf.String(), clientUser2VisitorConf.String()})

 				for _, test := range tests {
 					timeout := time.Second
@@ -505,7 +505,7 @@ var _ = ginkgo.Describe("[Feature: Basic]", func() {
 			}

 			// run frps and frpc
-			f.RunProcesses(serverConf, []string{clientConf.String()})
+			f.RunProcesses([]string{serverConf}, []string{clientConf.String()})

 			// Request without HTTP connect should get error
 			framework.NewRequestExpect(f).
--- a/test/e2e/v1/basic/client.go
+++ b/test/e2e/v1/basic/client.go
@@ -51,7 +51,7 @@ var _ = ginkgo.Describe("[Feature: ClientManage]", func() {
 			framework.TCPEchoServerPort, p2Port,
 			framework.TCPEchoServerPort, p3Port)

-		f.RunProcesses(serverConf, []string{clientConf})
+		f.RunProcesses([]string{serverConf}, []string{clientConf})

 		framework.NewRequestExpect(f).Port(p1Port).Ensure()
 		framework.NewRequestExpect(f).Port(p2Port).Ensure()
@@ -93,7 +93,7 @@ var _ = ginkgo.Describe("[Feature: ClientManage]", func() {
 		webServer.password = "admin"
 		`, dashboardPort)

-		f.RunProcesses(serverConf, []string{clientConf})
+		f.RunProcesses([]string{serverConf}, []string{clientConf})

 		framework.NewRequestExpect(f).RequestModify(func(r *request.Request) {
 			r.HTTP().HTTPPath("/healthz")
@@ -120,7 +120,7 @@ var _ = ginkgo.Describe("[Feature: ClientManage]", func() {
 		remotePort = %d
 		`, adminPort, framework.TCPEchoServerPort, testPort)

-		f.RunProcesses(serverConf, []string{clientConf})
+		f.RunProcesses([]string{serverConf}, []string{clientConf})

 		framework.NewRequestExpect(f).Port(testPort).Ensure()

--- a/test/e2e/v1/basic/client_server.go
+++ b/test/e2e/v1/basic/client_server.go
@@ -78,7 +78,7 @@ func runClientServerTest(f *framework.Framework, configures *generalTestConfigur
 		clientConfs = append(clientConfs, client2Conf)
 	}

-	f.RunProcesses(serverConf, clientConfs)
+	f.RunProcesses([]string{serverConf}, clientConfs)

 	if configures.testDelay > 0 {
 		time.Sleep(configures.testDelay)
--- a/test/e2e/v1/basic/config.go
+++ b/test/e2e/v1/basic/config.go
@@ -35,7 +35,7 @@ var _ = ginkgo.Describe("[Feature: Config]", func() {
 			`, "`", "`", framework.TCPEchoServerPort, portName)

 			f.SetEnvs([]string{"FRP_TOKEN=123"})
-			f.RunProcesses(serverConf, []string{clientConf})
+			f.RunProcesses([]string{serverConf}, []string{clientConf})

 			framework.NewRequestExpect(f).PortName(portName).Ensure()
 		})
@@ -69,7 +69,7 @@ var _ = ginkgo.Describe("[Feature: Config]", func() {
 				escapeTemplate("{{- end }}"),
 			)

-			f.RunProcesses(serverConf, []string{clientConf})
+			f.RunProcesses([]string{serverConf}, []string{clientConf})

 			client := f.APIClientForFrpc(adminPort)
 			checkProxyFn := func(name string, localPort, remotePort int) {
@@ -149,7 +149,7 @@ proxies:
  remotePort: %d
 `, port.GenName("Server"), framework.TCPEchoServerPort, remotePort)

-			f.RunProcesses(serverConf, []string{clientConf})
+			f.RunProcesses([]string{serverConf}, []string{clientConf})
 			framework.NewRequestExpect(f).Port(remotePort).Ensure()
 		})

@@ -161,7 +161,7 @@ proxies:
 "proxies": [{"name": "tcp", "type": "tcp", "localPort": {{ .%s }}, "remotePort": %d}]}`,
 				port.GenName("Server"), framework.TCPEchoServerPort, remotePort)

-			f.RunProcesses(serverConf, []string{clientConf})
+			f.RunProcesses([]string{serverConf}, []string{clientConf})
 			framework.NewRequestExpect(f).Port(remotePort).Ensure()
 		})
 	})
--- a/test/e2e/v1/basic/http.go
+++ b/test/e2e/v1/basic/http.go
@@ -59,7 +59,7 @@ var _ = ginkgo.Describe("[Feature: HTTP]", func() {
 			locations = ["/bar"]
 			`, fooPort, barPort)

-		f.RunProcesses(serverConf, []string{clientConf})
+		f.RunProcesses([]string{serverConf}, []string{clientConf})

 		tests := []struct {
 			path       string
@@ -117,7 +117,7 @@ var _ = ginkgo.Describe("[Feature: HTTP]", func() {
 			customDomains = ["normal.example.com"]
 			`, fooPort, barPort, otherPort)

-		f.RunProcesses(serverConf, []string{clientConf})
+		f.RunProcesses([]string{serverConf}, []string{clientConf})

 		// user1
 		framework.NewRequestExpect(f).Explain("user1").Port(vhostHTTPPort).
@@ -144,79 +144,6 @@ var _ = ginkgo.Describe("[Feature: HTTP]", func() {
 			Ensure()
 	})

-	ginkgo.It("HTTP proxy mode uses proxy auth consistently", func() {
-		vhostHTTPPort := f.AllocPort()
-		serverConf := getDefaultServerConf(vhostHTTPPort)
-
-		backendPort := f.AllocPort()
-		f.RunServer("", newHTTPServer(backendPort, "PRIVATE"))
-
-		clientConf := consts.DefaultClientConfig
-		clientConf += fmt.Sprintf(`
-			[[proxies]]
-			name = "protected"
-			type = "http"
-			localPort = %d
-			customDomains = ["normal.example.com"]
-			routeByHTTPUser = "alice"
-			httpUser = "alice"
-			httpPassword = "secret"
-			`, backendPort)
-
-		f.RunProcesses(serverConf, []string{clientConf})
-
-		proxyURLWithAuth := func(username, password string) string {
-			if username == "" {
-				return fmt.Sprintf("http://127.0.0.1:%d", vhostHTTPPort)
-			}
-			return fmt.Sprintf("http://%s:%s@127.0.0.1:%d", username, password, vhostHTTPPort)
-		}
-
-		framework.NewRequestExpect(f).Explain("direct no auth").Port(vhostHTTPPort).
-			RequestModify(func(r *request.Request) {
-				r.HTTP().HTTPHost("normal.example.com")
-			}).
-			Ensure(framework.ExpectResponseCode(http.StatusNotFound))
-
-		framework.NewRequestExpect(f).Explain("direct correct auth").Port(vhostHTTPPort).
-			RequestModify(func(r *request.Request) {
-				r.HTTP().HTTPHost("normal.example.com").HTTPAuth("alice", "secret")
-			}).
-			ExpectResp([]byte("PRIVATE")).
-			Ensure()
-
-		framework.NewRequestExpect(f).Explain("direct wrong auth").Port(vhostHTTPPort).
-			RequestModify(func(r *request.Request) {
-				r.HTTP().HTTPHost("normal.example.com").HTTPAuth("alice", "wrong")
-			}).
-			Ensure(framework.ExpectResponseCode(http.StatusUnauthorized))
-
-		framework.NewRequestExpect(f).Explain("proxy correct proxy auth").
-			RequestModify(func(r *request.Request) {
-				r.HTTP().Addr("normal.example.com").Proxy(proxyURLWithAuth("alice", "secret"))
-			}).
-			ExpectResp([]byte("PRIVATE")).
-			Ensure()
-
-		framework.NewRequestExpect(f).Explain("proxy wrong proxy auth").
-			RequestModify(func(r *request.Request) {
-				r.HTTP().Addr("normal.example.com").Proxy(proxyURLWithAuth("alice", "wrong"))
-			}).
-			Ensure(framework.ExpectResponseCode(http.StatusProxyAuthRequired))
-
-		framework.NewRequestExpect(f).Explain("proxy request ignores authorization header").
-			RequestModify(func(r *request.Request) {
-				r.HTTP().Addr("normal.example.com").Proxy(proxyURLWithAuth("", "")).HTTPAuth("alice", "secret")
-			}).
-			Ensure(framework.ExpectResponseCode(http.StatusProxyAuthRequired))
-
-		framework.NewRequestExpect(f).Explain("proxy wrong proxy auth with correct authorization").
-			RequestModify(func(r *request.Request) {
-				r.HTTP().Addr("normal.example.com").Proxy(proxyURLWithAuth("alice", "wrong")).HTTPAuth("alice", "secret")
-			}).
-			Ensure(framework.ExpectResponseCode(http.StatusProxyAuthRequired))
-	})
-
 	ginkgo.It("HTTP Basic Auth", func() {
 		vhostHTTPPort := f.AllocPort()
 		serverConf := getDefaultServerConf(vhostHTTPPort)
@@ -232,7 +159,7 @@ var _ = ginkgo.Describe("[Feature: HTTP]", func() {
 			httpPassword = "test"
 			`, framework.HTTPSimpleServerPort)

-		f.RunProcesses(serverConf, []string{clientConf})
+		f.RunProcesses([]string{serverConf}, []string{clientConf})

 		// not set auth header
 		framework.NewRequestExpect(f).Port(vhostHTTPPort).
@@ -269,7 +196,7 @@ var _ = ginkgo.Describe("[Feature: HTTP]", func() {
 			customDomains = ["*.example.com"]
 			`, framework.HTTPSimpleServerPort)

-		f.RunProcesses(serverConf, []string{clientConf})
+		f.RunProcesses([]string{serverConf}, []string{clientConf})

 		// not match host
 		framework.NewRequestExpect(f).Port(vhostHTTPPort).
@@ -321,7 +248,7 @@ var _ = ginkgo.Describe("[Feature: HTTP]", func() {
 			subdomain = "bar"
 			`, fooPort, barPort)

-		f.RunProcesses(serverConf, []string{clientConf})
+		f.RunProcesses([]string{serverConf}, []string{clientConf})

 		// foo
 		framework.NewRequestExpect(f).Explain("foo subdomain").Port(vhostHTTPPort).
@@ -363,7 +290,7 @@ var _ = ginkgo.Describe("[Feature: HTTP]", func() {
 			requestHeaders.set.x-from-where = "frp"
 			`, localPort)

-		f.RunProcesses(serverConf, []string{clientConf})
+		f.RunProcesses([]string{serverConf}, []string{clientConf})

 		framework.NewRequestExpect(f).Port(vhostHTTPPort).
 			RequestModify(func(r *request.Request) {
@@ -396,7 +323,7 @@ var _ = ginkgo.Describe("[Feature: HTTP]", func() {
 			responseHeaders.set.x-from-where = "frp"
 			`, localPort)

-		f.RunProcesses(serverConf, []string{clientConf})
+		f.RunProcesses([]string{serverConf}, []string{clientConf})

 		framework.NewRequestExpect(f).Port(vhostHTTPPort).
 			RequestModify(func(r *request.Request) {
@@ -430,7 +357,7 @@ var _ = ginkgo.Describe("[Feature: HTTP]", func() {
 			hostHeaderRewrite = "rewrite.example.com"
 			`, localPort)

-		f.RunProcesses(serverConf, []string{clientConf})
+		f.RunProcesses([]string{serverConf}, []string{clientConf})

 		framework.NewRequestExpect(f).Port(vhostHTTPPort).
 			RequestModify(func(r *request.Request) {
@@ -479,7 +406,7 @@ var _ = ginkgo.Describe("[Feature: HTTP]", func() {
 			customDomains = ["127.0.0.1"]
 			`, localPort)

-		f.RunProcesses(serverConf, []string{clientConf})
+		f.RunProcesses([]string{serverConf}, []string{clientConf})

 		u := url.URL{Scheme: "ws", Host: "127.0.0.1:" + strconv.Itoa(vhostHTTPPort)}
 		c, _, err := websocket.DefaultDialer.Dial(u.String(), nil)
@@ -520,7 +447,7 @@ var _ = ginkgo.Describe("[Feature: HTTP]", func() {
 			customDomains = ["normal.example.com"]
 			`, localPort)

-		f.RunProcesses(serverConf, []string{clientConf})
+		f.RunProcesses([]string{serverConf}, []string{clientConf})

 		framework.NewRequestExpect(f).Port(vhostHTTPPort).
 			RequestModify(func(r *request.Request) {
--- a/test/e2e/v1/basic/oidc.go
+++ b/test/e2e/v1/basic/oidc.go
@@ -1,192 +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 basic
-
-import (
-	"fmt"
-	"time"
-
-	"github.com/onsi/ginkgo/v2"
-
-	"github.com/fatedier/frp/test/e2e/framework"
-	"github.com/fatedier/frp/test/e2e/framework/consts"
-	"github.com/fatedier/frp/test/e2e/mock/server/oidcserver"
-	"github.com/fatedier/frp/test/e2e/pkg/port"
-)
-
-var _ = ginkgo.Describe("[Feature: OIDC]", func() {
-	f := framework.NewDefaultFramework()
-
-	ginkgo.It("should work with OIDC authentication", func() {
-		oidcSrv := oidcserver.New(oidcserver.WithBindPort(f.AllocPort()))
-		f.RunServer("", oidcSrv)
-
-		portName := port.GenName("TCP")
-
-		serverConf := consts.DefaultServerConfig + fmt.Sprintf(`
-auth.method = "oidc"
-auth.oidc.issuer = "%s"
-auth.oidc.audience = "frps"
-`, oidcSrv.Issuer())
-
-		clientConf := consts.DefaultClientConfig + fmt.Sprintf(`
-auth.method = "oidc"
-auth.oidc.clientID = "test-client"
-auth.oidc.clientSecret = "test-secret"
-auth.oidc.tokenEndpointURL = "%s"
-
-[[proxies]]
-name = "tcp"
-type = "tcp"
-localPort = {{ .%s }}
-remotePort = {{ .%s }}
-`, oidcSrv.TokenEndpoint(), framework.TCPEchoServerPort, portName)
-
-		f.RunProcesses(serverConf, []string{clientConf})
-		framework.NewRequestExpect(f).PortName(portName).Ensure()
-	})
-
-	ginkgo.It("should authenticate heartbeats with OIDC", func() {
-		oidcSrv := oidcserver.New(oidcserver.WithBindPort(f.AllocPort()))
-		f.RunServer("", oidcSrv)
-
-		serverPort := f.AllocPort()
-		remotePort := f.AllocPort()
-
-		serverConf := fmt.Sprintf(`
-bindAddr = "0.0.0.0"
-bindPort = %d
-log.level = "trace"
-auth.method = "oidc"
-auth.additionalScopes = ["HeartBeats"]
-auth.oidc.issuer = "%s"
-auth.oidc.audience = "frps"
-`, serverPort, oidcSrv.Issuer())
-
-		clientConf := fmt.Sprintf(`
-serverAddr = "127.0.0.1"
-serverPort = %d
-loginFailExit = false
-log.level = "trace"
-auth.method = "oidc"
-auth.additionalScopes = ["HeartBeats"]
-auth.oidc.clientID = "test-client"
-auth.oidc.clientSecret = "test-secret"
-auth.oidc.tokenEndpointURL = "%s"
-transport.heartbeatInterval = 1
-
-[[proxies]]
-name = "tcp"
-type = "tcp"
-localPort = %d
-remotePort = %d
-`, serverPort, oidcSrv.TokenEndpoint(), f.PortByName(framework.TCPEchoServerPort), remotePort)
-
-		serverConfigPath := f.GenerateConfigFile(serverConf)
-		clientConfigPath := f.GenerateConfigFile(clientConf)
-
-		_, _, err := f.RunFrps("-c", serverConfigPath)
-		framework.ExpectNoError(err)
-		clientProcess, _, err := f.RunFrpc("-c", clientConfigPath)
-		framework.ExpectNoError(err)
-
-		// Wait for several authenticated heartbeat cycles instead of a fixed sleep.
-		err = clientProcess.WaitForOutput("send heartbeat to server", 3, 10*time.Second)
-		framework.ExpectNoError(err)
-
-		// Proxy should still work: heartbeat auth has not failed.
-		framework.NewRequestExpect(f).Port(remotePort).Ensure()
-	})
-
-	ginkgo.It("should work when token has no expires_in", func() {
-		oidcSrv := oidcserver.New(
-			oidcserver.WithBindPort(f.AllocPort()),
-			oidcserver.WithExpiresIn(0),
-		)
-		f.RunServer("", oidcSrv)
-
-		portName := port.GenName("TCP")
-
-		serverConf := consts.DefaultServerConfig + fmt.Sprintf(`
-auth.method = "oidc"
-auth.oidc.issuer = "%s"
-auth.oidc.audience = "frps"
-`, oidcSrv.Issuer())
-
-		clientConf := consts.DefaultClientConfig + fmt.Sprintf(`
-auth.method = "oidc"
-auth.additionalScopes = ["HeartBeats"]
-auth.oidc.clientID = "test-client"
-auth.oidc.clientSecret = "test-secret"
-auth.oidc.tokenEndpointURL = "%s"
-transport.heartbeatInterval = 1
-
-[[proxies]]
-name = "tcp"
-type = "tcp"
-localPort = {{ .%s }}
-remotePort = {{ .%s }}
-`, oidcSrv.TokenEndpoint(), framework.TCPEchoServerPort, portName)
-
-		_, clientProcesses := f.RunProcesses(serverConf, []string{clientConf})
-		framework.NewRequestExpect(f).PortName(portName).Ensure()
-
-		countAfterLogin := oidcSrv.TokenRequestCount()
-
-		// Wait for several heartbeat cycles instead of a fixed sleep.
-		// Each heartbeat fetches a fresh token in non-caching mode.
-		err := clientProcesses[0].WaitForOutput("send heartbeat to server", 3, 10*time.Second)
-		framework.ExpectNoError(err)
-
-		framework.NewRequestExpect(f).PortName(portName).Ensure()
-
-		// Each heartbeat should have fetched a new token (non-caching mode).
-		countAfterHeartbeats := oidcSrv.TokenRequestCount()
-		framework.ExpectTrue(
-			countAfterHeartbeats > countAfterLogin,
-			"expected additional token requests for heartbeats, got %d before and %d after",
-			countAfterLogin, countAfterHeartbeats,
-		)
-	})
-
-	ginkgo.It("should reject invalid OIDC credentials", func() {
-		oidcSrv := oidcserver.New(oidcserver.WithBindPort(f.AllocPort()))
-		f.RunServer("", oidcSrv)
-
-		portName := port.GenName("TCP")
-
-		serverConf := consts.DefaultServerConfig + fmt.Sprintf(`
-auth.method = "oidc"
-auth.oidc.issuer = "%s"
-auth.oidc.audience = "frps"
-`, oidcSrv.Issuer())
-
-		clientConf := consts.DefaultClientConfig + fmt.Sprintf(`
-auth.method = "oidc"
-auth.oidc.clientID = "test-client"
-auth.oidc.clientSecret = "wrong-secret"
-auth.oidc.tokenEndpointURL = "%s"
-
-[[proxies]]
-name = "tcp"
-type = "tcp"
-localPort = {{ .%s }}
-remotePort = {{ .%s }}
-`, oidcSrv.TokenEndpoint(), framework.TCPEchoServerPort, portName)
-
-		f.RunProcesses(serverConf, []string{clientConf})
-		framework.NewRequestExpect(f).PortName(portName).ExpectError(true).Ensure()
-	})
-})
--- a/test/e2e/v1/basic/server.go
+++ b/test/e2e/v1/basic/server.go
@@ -20,8 +20,6 @@ var _ = ginkgo.Describe("[Feature: Server Manager]", func() {
 	ginkgo.It("Ports Whitelist", func() {
 		serverConf := consts.DefaultServerConfig
 		clientConf := consts.DefaultClientConfig
-		tcpPortNotAllowed := f.AllocPortExcludingRanges([2]int{10000, 11000}, [2]int{11002, 11002}, [2]int{12000, 13000})
-		udpPortNotAllowed := f.AllocPortExcludingRanges([2]int{10000, 11000}, [2]int{11002, 11002}, [2]int{12000, 13000})

 		serverConf += `
 		allowPorts = [
@@ -45,8 +43,8 @@ var _ = ginkgo.Describe("[Feature: Server Manager]", func() {
 			name = "tcp-port-not-allowed"
 			type = "tcp"
 			localPort = {{ .%s }}
-			remotePort = %d
-			`, framework.TCPEchoServerPort, tcpPortNotAllowed)
+			remotePort = 11001
+			`, framework.TCPEchoServerPort)
 		clientConf += fmt.Sprintf(`
 			[[proxies]]
 			name = "tcp-port-unavailable"
@@ -66,17 +64,17 @@ var _ = ginkgo.Describe("[Feature: Server Manager]", func() {
 			name = "udp-port-not-allowed"
 			type = "udp"
 			localPort = {{ .%s }}
-			remotePort = %d
-			`, framework.UDPEchoServerPort, udpPortNotAllowed)
+			remotePort = 11003
+			`, framework.UDPEchoServerPort)

-		f.RunProcesses(serverConf, []string{clientConf})
+		f.RunProcesses([]string{serverConf}, []string{clientConf})

 		// TCP
 		// Allowed in range
 		framework.NewRequestExpect(f).PortName(tcpPortName).Ensure()

 		// Not Allowed
-		framework.NewRequestExpect(f).Port(tcpPortNotAllowed).ExpectError(true).Ensure()
+		framework.NewRequestExpect(f).Port(11001).ExpectError(true).Ensure()

 		// Unavailable, already bind by frps
 		framework.NewRequestExpect(f).PortName(consts.PortServerName).ExpectError(true).Ensure()
@@ -87,7 +85,7 @@ var _ = ginkgo.Describe("[Feature: Server Manager]", func() {

 		// Not Allowed
 		framework.NewRequestExpect(f).RequestModify(func(r *request.Request) {
-			r.UDP().Port(udpPortNotAllowed)
+			r.UDP().Port(11003)
 		}).ExpectError(true).Ensure()
 	})

@@ -110,7 +108,7 @@ var _ = ginkgo.Describe("[Feature: Server Manager]", func() {
 		localPort = {{ .%s }}
 		`, adminPort, framework.TCPEchoServerPort, framework.UDPEchoServerPort)

-		f.RunProcesses(serverConf, []string{clientConf})
+		f.RunProcesses([]string{serverConf}, []string{clientConf})

 		client := f.APIClientForFrpc(adminPort)

@@ -152,7 +150,7 @@ var _ = ginkgo.Describe("[Feature: Server Manager]", func() {
 		customDomains = ["example.com"]
 		`, framework.HTTPSimpleServerPort)

-		f.RunProcesses(serverConf, []string{clientConf})
+		f.RunProcesses([]string{serverConf}, []string{clientConf})

 		framework.NewRequestExpect(f).RequestModify(func(r *request.Request) {
 			r.HTTP().HTTPHost("example.com")
@@ -180,7 +178,7 @@ var _ = ginkgo.Describe("[Feature: Server Manager]", func() {
 		customDomains = ["example.com"]
 		`, framework.HTTPSimpleServerPort)

-		f.RunProcesses(serverConf, []string{clientConf})
+		f.RunProcesses([]string{serverConf}, []string{clientConf})

 		framework.NewRequestExpect(f).RequestModify(func(r *request.Request) {
 			r.HTTP().HTTPPath("/healthz")
--- a/test/e2e/v1/basic/tcpmux.go
+++ b/test/e2e/v1/basic/tcpmux.go
@@ -79,7 +79,7 @@ var _ = ginkgo.Describe("[Feature: TCPMUX httpconnect]", func() {
 			customDomains = ["normal.example.com"]
 			`, fooPort, barPort, otherPort)

-		f.RunProcesses(serverConf, []string{clientConf})
+		f.RunProcesses([]string{serverConf}, []string{clientConf})

 		// user1
 		framework.NewRequestExpect(f).Explain("user1").
@@ -125,7 +125,7 @@ var _ = ginkgo.Describe("[Feature: TCPMUX httpconnect]", func() {
 			httpPassword = "test"
 		`, fooPort)

-		f.RunProcesses(serverConf, []string{clientConf})
+		f.RunProcesses([]string{serverConf}, []string{clientConf})

 		// not set auth header
 		framework.NewRequestExpect(f).Explain("no auth").
@@ -209,7 +209,7 @@ var _ = ginkgo.Describe("[Feature: TCPMUX httpconnect]", func() {
 			customDomains = ["normal.example.com"]
 			`, localPort)

-		f.RunProcesses(serverConf, []string{clientConf})
+		f.RunProcesses([]string{serverConf}, []string{clientConf})

 		framework.NewRequestExpect(f).
 			RequestModify(func(r *request.Request) {
--- a/test/e2e/v1/basic/token_source.go
+++ b/test/e2e/v1/basic/token_source.go
@@ -16,11 +16,8 @@ package basic

 import (
 	"fmt"
-	"net"
 	"os"
 	"path/filepath"
-	"strconv"
-	"time"

 	"github.com/onsi/ginkgo/v2"

@@ -76,7 +73,7 @@ localPort = {{ .%s }}
 remotePort = {{ .%s }}
 `, tokenContent, framework.TCPEchoServerPort, portName)

-			f.RunProcesses(serverConf, []string{clientConf})
+			f.RunProcesses([]string{serverConf}, []string{clientConf})

 			framework.NewRequestExpect(f).PortName(portName).Ensure()
 		})
@@ -112,7 +109,7 @@ localPort = {{ .%s }}
 remotePort = {{ .%s }}
 `, tokenFile, framework.TCPEchoServerPort, portName)

-			f.RunProcesses(serverConf, []string{clientConf})
+			f.RunProcesses([]string{serverConf}, []string{clientConf})

 			framework.NewRequestExpect(f).PortName(portName).Ensure()
 		})
@@ -153,7 +150,7 @@ localPort = {{ .%s }}
 remotePort = {{ .%s }}
 `, clientTokenFile, framework.TCPEchoServerPort, portName)

-			f.RunProcesses(serverConf, []string{clientConf})
+			f.RunProcesses([]string{serverConf}, []string{clientConf})

 			framework.NewRequestExpect(f).PortName(portName).Ensure()
 		})
@@ -193,7 +190,7 @@ localPort = {{ .%s }}
 remotePort = {{ .%s }}
 `, clientTokenFile, framework.TCPEchoServerPort, portName)

-			f.RunProcesses(serverConf, []string{clientConf})
+			f.RunProcesses([]string{serverConf}, []string{clientConf})

 			// This should fail due to token mismatch - the client should not be able to connect
 			// We expect the request to fail because the proxy tunnel is not established
@@ -201,27 +198,32 @@ remotePort = {{ .%s }}
 		})

 		ginkgo.It("should fail with non-existent token file", func() {
+			// This test verifies that server fails to start when tokenSource points to non-existent file
+			// We'll verify this by checking that the configuration loading itself fails
+
+			// Create a config that references a non-existent file
 			tmpDir := f.TempDirectory
 			nonExistentFile := filepath.Join(tmpDir, "non_existent_token")

-			serverPort := f.AllocPort()
-			serverConf := fmt.Sprintf(`
-bindAddr = "0.0.0.0"
-bindPort = %d
+			serverConf := consts.DefaultServerConfig
+
+			// Server config with non-existent tokenSource file
+			serverConf += fmt.Sprintf(`
 auth.tokenSource.type = "file"
 auth.tokenSource.file.path = "%s"
-`, serverPort, nonExistentFile)
+`, nonExistentFile)

-			serverConfigPath := f.GenerateConfigFile(serverConf)
+			// The test expectation is that this will fail during the RunProcesses call
+			// because the server cannot load the configuration due to missing token file
+			defer func() {
+				if r := recover(); r != nil {
+					// Expected: server should fail to start due to missing file
+					ginkgo.By(fmt.Sprintf("Server correctly failed to start: %v", r))
+				}
+			}()

-			_, _, _ = f.RunFrps("-c", serverConfigPath)
-
-			// Server should have failed to start, so the port should not be listening.
-			conn, err := net.DialTimeout("tcp", net.JoinHostPort("127.0.0.1", strconv.Itoa(serverPort)), 1*time.Second)
-			if err == nil {
-				conn.Close()
-			}
-			framework.ExpectTrue(err != nil, "server should not be listening on port %d", serverPort)
+			// This should cause a panic or error during server startup
+			f.RunProcesses([]string{serverConf}, []string{})
 		})
 	})

--- a/test/e2e/v1/basic/xtcp.go
+++ b/test/e2e/v1/basic/xtcp.go
@@ -42,7 +42,7 @@ var _ = ginkgo.Describe("[Feature: XTCP]", func() {
 			fallbackTimeoutMs = 200
 			`, framework.TCPEchoServerPort, bindPortName)

-		f.RunProcesses(serverConf, []string{clientConf})
+		f.RunProcesses([]string{serverConf}, []string{clientConf})
 		framework.NewRequestExpect(f).
 			RequestModify(func(r *request.Request) {
 				r.Timeout(time.Second)
--- a/test/e2e/v1/features/bandwidth_limit.go
+++ b/test/e2e/v1/features/bandwidth_limit.go
@@ -36,7 +36,7 @@ var _ = ginkgo.Describe("[Feature: Bandwidth Limit]", func() {
 			transport.bandwidthLimit = "10KB"
 			`, localPort, remotePort)

-		f.RunProcesses(serverConf, []string{clientConf})
+		f.RunProcesses([]string{serverConf}, []string{clientConf})

 		content := strings.Repeat("a", 50*1024) // 5KB
 		start := time.Now()
@@ -92,7 +92,7 @@ var _ = ginkgo.Describe("[Feature: Bandwidth Limit]", func() {
 			remotePort = %d
 			`, localPort, remotePort)

-		f.RunProcesses(serverConf, []string{clientConf})
+		f.RunProcesses([]string{serverConf}, []string{clientConf})

 		content := strings.Repeat("a", 50*1024) // 5KB
 		start := time.Now()
--- a/test/e2e/v1/features/chaos.go
+++ b/test/e2e/v1/features/chaos.go
@@ -41,24 +41,24 @@ var _ = ginkgo.Describe("[Feature: Chaos]", func() {

 		// 2. stop frps, expect request failed
 		_ = ps.Stop()
+		time.Sleep(200 * time.Millisecond)
 		framework.NewRequestExpect(f).Port(remotePort).ExpectError(true).Ensure()

 		// 3. restart frps, expect request success
-		successCount := pc.CountOutput("[tcp] start proxy success")
 		_, _, err = f.RunFrps("-c", serverConfigPath)
 		framework.ExpectNoError(err)
-		framework.ExpectNoError(pc.WaitForOutput("[tcp] start proxy success", successCount+1, 5*time.Second))
+		time.Sleep(2 * time.Second)
 		framework.NewRequestExpect(f).Port(remotePort).Ensure()

 		// 4. stop frpc, expect request failed
 		_ = pc.Stop()
-		framework.ExpectNoError(framework.WaitForTCPUnreachable(fmt.Sprintf("127.0.0.1:%d", remotePort), 100*time.Millisecond, 5*time.Second))
+		time.Sleep(200 * time.Millisecond)
 		framework.NewRequestExpect(f).Port(remotePort).ExpectError(true).Ensure()

 		// 5. restart frpc, expect request success
-		newPc, _, err := f.RunFrpc("-c", clientConfigPath)
+		_, _, err = f.RunFrpc("-c", clientConfigPath)
 		framework.ExpectNoError(err)
-		framework.ExpectNoError(newPc.WaitForOutput("[tcp] start proxy success", 1, 5*time.Second))
+		time.Sleep(time.Second)
 		framework.NewRequestExpect(f).Port(remotePort).Ensure()
 	})
 })
--- a/test/e2e/v1/features/group.go
+++ b/test/e2e/v1/features/group.go
@@ -92,7 +92,7 @@ var _ = ginkgo.Describe("[Feature: Group]", func() {
 			loadBalancer.groupKey = "123"
 			`, fooPort, remotePort, barPort, remotePort)

-			f.RunProcesses(serverConf, []string{clientConf})
+			f.RunProcesses([]string{serverConf}, []string{clientConf})

 			fooCount := 0
 			barCount := 0
@@ -157,7 +157,7 @@ var _ = ginkgo.Describe("[Feature: Group]", func() {
 			loadBalancer.groupKey = "123"
 			`, fooPort, barPort)

-			f.RunProcesses(serverConf, []string{clientConf})
+			f.RunProcesses([]string{serverConf}, []string{clientConf})

 			fooCount := 0
 			barCount := 0
@@ -186,68 +186,6 @@ var _ = ginkgo.Describe("[Feature: Group]", func() {

 			framework.ExpectTrue(fooCount > 1 && barCount > 1, "fooCount: %d, barCount: %d", fooCount, barCount)
 		})
-
-		ginkgo.It("TCPMux httpconnect", func() {
-			vhostPort := f.AllocPort()
-			serverConf := consts.DefaultServerConfig + fmt.Sprintf(`
-			tcpmuxHTTPConnectPort = %d
-			`, vhostPort)
-			clientConf := consts.DefaultClientConfig
-
-			fooPort := f.AllocPort()
-			fooServer := streamserver.New(streamserver.TCP, streamserver.WithBindPort(fooPort), streamserver.WithRespContent([]byte("foo")))
-			f.RunServer("", fooServer)
-
-			barPort := f.AllocPort()
-			barServer := streamserver.New(streamserver.TCP, streamserver.WithBindPort(barPort), streamserver.WithRespContent([]byte("bar")))
-			f.RunServer("", barServer)
-
-			clientConf += fmt.Sprintf(`
-			[[proxies]]
-			name = "foo"
-			type = "tcpmux"
-			multiplexer = "httpconnect"
-			localPort = %d
-			customDomains = ["tcpmux-group.example.com"]
-			loadBalancer.group = "test"
-			loadBalancer.groupKey = "123"
-
-			[[proxies]]
-			name = "bar"
-			type = "tcpmux"
-			multiplexer = "httpconnect"
-			localPort = %d
-			customDomains = ["tcpmux-group.example.com"]
-			loadBalancer.group = "test"
-			loadBalancer.groupKey = "123"
-			`, fooPort, barPort)
-
-			f.RunProcesses(serverConf, []string{clientConf})
-
-			proxyURL := fmt.Sprintf("http://127.0.0.1:%d", vhostPort)
-			fooCount := 0
-			barCount := 0
-			for i := range 10 {
-				framework.NewRequestExpect(f).
-					Explain("times " + strconv.Itoa(i)).
-					RequestModify(func(r *request.Request) {
-						r.Addr("tcpmux-group.example.com").Proxy(proxyURL)
-					}).
-					Ensure(func(resp *request.Response) bool {
-						switch string(resp.Content) {
-						case "foo":
-							fooCount++
-						case "bar":
-							barCount++
-						default:
-							return false
-						}
-						return true
-					})
-			}
-
-			framework.ExpectTrue(fooCount > 1 && barCount > 1, "fooCount: %d, barCount: %d", fooCount, barCount)
-		})
 	})

 	ginkgo.Describe("Health Check", func() {
@@ -286,7 +224,7 @@ var _ = ginkgo.Describe("[Feature: Group]", func() {
 			healthCheck.intervalSeconds = 1
 			`, fooPort, remotePort, barPort, remotePort)

-			_, clientProcesses := f.RunProcesses(serverConf, []string{clientConf})
+			f.RunProcesses([]string{serverConf}, []string{clientConf})

 			// check foo and bar is ok
 			results := []string{}
@@ -299,17 +237,15 @@ var _ = ginkgo.Describe("[Feature: Group]", func() {
 			framework.ExpectContainElements(results, []string{"foo", "bar"})

 			// close bar server, check foo is ok
-			failedCount := clientProcesses[0].CountOutput("[bar] health check failed")
 			barServer.Close()
-			framework.ExpectNoError(clientProcesses[0].WaitForOutput("[bar] health check failed", failedCount+1, 5*time.Second))
+			time.Sleep(2 * time.Second)
 			for range 10 {
 				framework.NewRequestExpect(f).Port(remotePort).ExpectResp([]byte("foo")).Ensure()
 			}

 			// resume bar server, check foo and bar is ok
-			successCount := clientProcesses[0].CountOutput("[bar] health check success")
 			f.RunServer("", barServer)
-			framework.ExpectNoError(clientProcesses[0].WaitForOutput("[bar] health check success", successCount+1, 5*time.Second))
+			time.Sleep(2 * time.Second)
 			results = []string{}
 			for range 10 {
 				framework.NewRequestExpect(f).Port(remotePort).Ensure(validateFooBarResponse, func(resp *request.Response) bool {
@@ -359,7 +295,7 @@ var _ = ginkgo.Describe("[Feature: Group]", func() {
 			healthCheck.path = "/healthz"
 			`, fooPort, barPort)

-			_, clientProcesses := f.RunProcesses(serverConf, []string{clientConf})
+			f.RunProcesses([]string{serverConf}, []string{clientConf})

 			// send first HTTP request
 			var contents []string
@@ -389,17 +325,15 @@ var _ = ginkgo.Describe("[Feature: Group]", func() {
 			framework.ExpectContainElements(results, []string{"foo", "bar"})

 			// close bar server, check foo is ok
-			failedCount := clientProcesses[0].CountOutput("[bar] health check failed")
 			barServer.Close()
-			framework.ExpectNoError(clientProcesses[0].WaitForOutput("[bar] health check failed", failedCount+1, 5*time.Second))
+			time.Sleep(2 * time.Second)
 			results = doFooBarHTTPRequest(vhostPort, "example.com")
 			framework.ExpectContainElements(results, []string{"foo"})
 			framework.ExpectNotContainElements(results, []string{"bar"})

 			// resume bar server, check foo and bar is ok
-			successCount := clientProcesses[0].CountOutput("[bar] health check success")
 			f.RunServer("", barServer)
-			framework.ExpectNoError(clientProcesses[0].WaitForOutput("[bar] health check success", successCount+1, 5*time.Second))
+			time.Sleep(2 * time.Second)
 			results = doFooBarHTTPRequest(vhostPort, "example.com")
 			framework.ExpectContainElements(results, []string{"foo", "bar"})
 		})
--- a/test/e2e/v1/features/heartbeat.go
+++ b/test/e2e/v1/features/heartbeat.go
@@ -37,7 +37,7 @@ var _ = ginkgo.Describe("[Feature: Heartbeat]", func() {
 		`, serverPort, f.PortByName(framework.TCPEchoServerPort), remotePort)

 		// run frps and frpc
-		f.RunProcesses(serverConf, []string{clientConf})
+		f.RunProcesses([]string{serverConf}, []string{clientConf})

 		framework.NewRequestExpect(f).Protocol("tcp").Port(remotePort).Ensure()

--- a/test/e2e/v1/features/monitor.go
+++ b/test/e2e/v1/features/monitor.go
@@ -34,7 +34,7 @@ var _ = ginkgo.Describe("[Feature: Monitor]", func() {
 		remotePort = %d
 		`, framework.TCPEchoServerPort, remotePort)

-		f.RunProcesses(serverConf, []string{clientConf})
+		f.RunProcesses([]string{serverConf}, []string{clientConf})

 		framework.NewRequestExpect(f).Port(remotePort).Ensure()
 		time.Sleep(500 * time.Millisecond)
--- a/test/e2e/v1/features/real_ip.go
+++ b/test/e2e/v1/features/real_ip.go
@@ -48,7 +48,7 @@ var _ = ginkgo.Describe("[Feature: Real IP]", func() {
 		customDomains = ["normal.example.com"]
 		`, localPort)

-			f.RunProcesses(serverConf, []string{clientConf})
+			f.RunProcesses([]string{serverConf}, []string{clientConf})

 			framework.NewRequestExpect(f).Port(vhostHTTPPort).
 				RequestModify(func(r *request.Request) {
@@ -82,7 +82,7 @@ var _ = ginkgo.Describe("[Feature: Real IP]", func() {
 		customDomains = ["normal.example.com"]
 		`, localPort)

-			f.RunProcesses(serverConf, []string{clientConf})
+			f.RunProcesses([]string{serverConf}, []string{clientConf})

 			framework.NewRequestExpect(f).Port(vhostHTTPPort).
 				RequestModify(func(r *request.Request) {
@@ -112,7 +112,7 @@ var _ = ginkgo.Describe("[Feature: Real IP]", func() {
 		localAddr = "127.0.0.1:%d"
 		`, localPort)

-			f.RunProcesses(serverConf, []string{clientConf})
+			f.RunProcesses([]string{serverConf}, []string{clientConf})

 			tlsConfig, err := transport.NewServerTLSConfig("", "", "")
 			framework.ExpectNoError(err)
@@ -154,7 +154,7 @@ var _ = ginkgo.Describe("[Feature: Real IP]", func() {
 		localAddr = "127.0.0.1:%d"
 		`, localPort)

-			f.RunProcesses(serverConf, []string{clientConf})
+			f.RunProcesses([]string{serverConf}, []string{clientConf})

 			localServer := httpserver.New(
 				httpserver.WithBindPort(localPort),
@@ -212,7 +212,7 @@ var _ = ginkgo.Describe("[Feature: Real IP]", func() {
 			transport.proxyProtocolVersion = "v2"
 			`, localPort, remotePort)

-			f.RunProcesses(serverConf, []string{clientConf})
+			f.RunProcesses([]string{serverConf}, []string{clientConf})

 			framework.NewRequestExpect(f).Port(remotePort).Ensure(func(resp *request.Response) bool {
 				log.Tracef("proxy protocol get SourceAddr: %s", string(resp.Content))
@@ -262,7 +262,7 @@ var _ = ginkgo.Describe("[Feature: Real IP]", func() {
 			transport.proxyProtocolVersion = "v2"
 			`, localPort, remotePort)

-			f.RunProcesses(serverConf, []string{clientConf})
+			f.RunProcesses([]string{serverConf}, []string{clientConf})

 			framework.NewRequestExpect(f).Protocol("udp").Port(remotePort).Ensure(func(resp *request.Response) bool {
 				log.Tracef("udp proxy protocol get SourceAddr: %s", string(resp.Content))
@@ -309,7 +309,7 @@ var _ = ginkgo.Describe("[Feature: Real IP]", func() {
 			transport.proxyProtocolVersion = "v2"
 			`, localPort)

-			f.RunProcesses(serverConf, []string{clientConf})
+			f.RunProcesses([]string{serverConf}, []string{clientConf})

 			framework.NewRequestExpect(f).Port(vhostHTTPPort).RequestModify(func(r *request.Request) {
 				r.HTTP().HTTPHost("normal.example.com")
--- a/test/e2e/v1/features/ssh_tunnel.go
+++ b/test/e2e/v1/features/ssh_tunnel.go
@@ -3,8 +3,6 @@ package features
 import (
 	"crypto/tls"
 	"fmt"
-	"net"
-	"strconv"
 	"time"

 	"github.com/onsi/ginkgo/v2"
@@ -27,8 +25,7 @@ var _ = ginkgo.Describe("[Feature: SSH Tunnel]", func() {
 		sshTunnelGateway.bindPort = %d
 		`, sshPort)

-		f.RunProcesses(serverConf, nil)
-		framework.ExpectNoError(framework.WaitForTCPReady(net.JoinHostPort("127.0.0.1", strconv.Itoa(sshPort)), 5*time.Second))
+		f.RunProcesses([]string{serverConf}, nil)

 		localPort := f.PortByName(framework.TCPEchoServerPort)
 		remotePort := f.AllocPort()
@@ -52,8 +49,7 @@ var _ = ginkgo.Describe("[Feature: SSH Tunnel]", func() {
 		sshTunnelGateway.bindPort = %d
 		`, vhostPort, sshPort)

-		f.RunProcesses(serverConf, nil)
-		framework.ExpectNoError(framework.WaitForTCPReady(net.JoinHostPort("127.0.0.1", strconv.Itoa(sshPort)), 5*time.Second))
+		f.RunProcesses([]string{serverConf}, nil)

 		localPort := f.PortByName(framework.HTTPSimpleServerPort)
 		tc := ssh.NewTunnelClient(
@@ -80,8 +76,7 @@ var _ = ginkgo.Describe("[Feature: SSH Tunnel]", func() {
 		sshTunnelGateway.bindPort = %d
 		`, vhostPort, sshPort)

-		f.RunProcesses(serverConf, nil)
-		framework.ExpectNoError(framework.WaitForTCPReady(net.JoinHostPort("127.0.0.1", strconv.Itoa(sshPort)), 5*time.Second))
+		f.RunProcesses([]string{serverConf}, nil)

 		localPort := f.AllocPort()
 		testDomain := "test.example.com"
@@ -123,8 +118,7 @@ var _ = ginkgo.Describe("[Feature: SSH Tunnel]", func() {
 		sshTunnelGateway.bindPort = %d
 		`, tcpmuxPort, sshPort)

-		f.RunProcesses(serverConf, nil)
-		framework.ExpectNoError(framework.WaitForTCPReady(net.JoinHostPort("127.0.0.1", strconv.Itoa(sshPort)), 5*time.Second))
+		f.RunProcesses([]string{serverConf}, nil)

 		localPort := f.AllocPort()
 		testDomain := "test.example.com"
@@ -179,8 +173,7 @@ var _ = ginkgo.Describe("[Feature: SSH Tunnel]", func() {
 		bindPort = %d
 		`, bindPort)

-		f.RunProcesses(serverConf, []string{visitorConf})
-		framework.ExpectNoError(framework.WaitForTCPReady(net.JoinHostPort("127.0.0.1", strconv.Itoa(sshPort)), 5*time.Second))
+		f.RunProcesses([]string{serverConf}, []string{visitorConf})

 		localPort := f.PortByName(framework.TCPEchoServerPort)
 		tc := ssh.NewTunnelClient(
--- a/test/e2e/v1/features/store.go
+++ b/test/e2e/v1/features/store.go
@@ -30,8 +30,8 @@ var _ = ginkgo.Describe("[Feature: Store]", func() {
 			path = "%s/store.json"
 			`, adminPort, f.TempDirectory)

-			f.RunProcesses(serverConf, []string{clientConf})
-			framework.ExpectNoError(framework.WaitForTCPReady(fmt.Sprintf("127.0.0.1:%d", adminPort), 5*time.Second))
+			f.RunProcesses([]string{serverConf}, []string{clientConf})
+			time.Sleep(500 * time.Millisecond)

 			proxyConfig := map[string]any{
 				"name": "test-tcp",
@@ -52,7 +52,7 @@ var _ = ginkgo.Describe("[Feature: Store]", func() {
 				return resp.Code == 200
 			})

-			framework.ExpectNoError(framework.WaitForTCPReady(fmt.Sprintf("127.0.0.1:%d", remotePort), 5*time.Second))
+			time.Sleep(time.Second)

 			framework.NewRequestExpect(f).Port(remotePort).Ensure()
 		})
@@ -71,8 +71,8 @@ var _ = ginkgo.Describe("[Feature: Store]", func() {
 			path = "%s/store.json"
 			`, adminPort, f.TempDirectory)

-			f.RunProcesses(serverConf, []string{clientConf})
-			framework.ExpectNoError(framework.WaitForTCPReady(fmt.Sprintf("127.0.0.1:%d", adminPort), 5*time.Second))
+			f.RunProcesses([]string{serverConf}, []string{clientConf})
+			time.Sleep(500 * time.Millisecond)

 			proxyConfig := map[string]any{
 				"name": "test-tcp",
@@ -93,7 +93,7 @@ var _ = ginkgo.Describe("[Feature: Store]", func() {
 				return resp.Code == 200
 			})

-			framework.ExpectNoError(framework.WaitForTCPReady(fmt.Sprintf("127.0.0.1:%d", remotePort1), 5*time.Second))
+			time.Sleep(time.Second)
 			framework.NewRequestExpect(f).Port(remotePort1).Ensure()

 			proxyConfig["tcp"].(map[string]any)["remotePort"] = remotePort2
@@ -107,8 +107,7 @@ var _ = ginkgo.Describe("[Feature: Store]", func() {
 				return resp.Code == 200
 			})

-			framework.ExpectNoError(framework.WaitForTCPReady(fmt.Sprintf("127.0.0.1:%d", remotePort2), 5*time.Second))
-			framework.ExpectNoError(framework.WaitForTCPUnreachable(fmt.Sprintf("127.0.0.1:%d", remotePort1), 100*time.Millisecond, 5*time.Second))
+			time.Sleep(time.Second)
 			framework.NewRequestExpect(f).Port(remotePort2).Ensure()
 			framework.NewRequestExpect(f).Port(remotePort1).ExpectError(true).Ensure()
 		})
@@ -126,8 +125,8 @@ var _ = ginkgo.Describe("[Feature: Store]", func() {
 			path = "%s/store.json"
 			`, adminPort, f.TempDirectory)

-			f.RunProcesses(serverConf, []string{clientConf})
-			framework.ExpectNoError(framework.WaitForTCPReady(fmt.Sprintf("127.0.0.1:%d", adminPort), 5*time.Second))
+			f.RunProcesses([]string{serverConf}, []string{clientConf})
+			time.Sleep(500 * time.Millisecond)

 			proxyConfig := map[string]any{
 				"name": "test-tcp",
@@ -148,7 +147,7 @@ var _ = ginkgo.Describe("[Feature: Store]", func() {
 				return resp.Code == 200
 			})

-			framework.ExpectNoError(framework.WaitForTCPReady(fmt.Sprintf("127.0.0.1:%d", remotePort), 5*time.Second))
+			time.Sleep(time.Second)
 			framework.NewRequestExpect(f).Port(remotePort).Ensure()

 			framework.NewRequestExpect(f).RequestModify(func(r *request.Request) {
@@ -157,7 +156,7 @@ var _ = ginkgo.Describe("[Feature: Store]", func() {
 				return resp.Code == 200
 			})

-			framework.ExpectNoError(framework.WaitForTCPUnreachable(fmt.Sprintf("127.0.0.1:%d", remotePort), 100*time.Millisecond, 5*time.Second))
+			time.Sleep(time.Second)
 			framework.NewRequestExpect(f).Port(remotePort).ExpectError(true).Ensure()
 		})

@@ -174,8 +173,8 @@ var _ = ginkgo.Describe("[Feature: Store]", func() {
 			path = "%s/store.json"
 			`, adminPort, f.TempDirectory)

-			f.RunProcesses(serverConf, []string{clientConf})
-			framework.ExpectNoError(framework.WaitForTCPReady(fmt.Sprintf("127.0.0.1:%d", adminPort), 5*time.Second))
+			f.RunProcesses([]string{serverConf}, []string{clientConf})
+			time.Sleep(500 * time.Millisecond)

 			proxyConfig := map[string]any{
 				"name": "test-tcp",
@@ -196,6 +195,8 @@ var _ = ginkgo.Describe("[Feature: Store]", func() {
 				return resp.Code == 200
 			})

+			time.Sleep(500 * time.Millisecond)
+
 			framework.NewRequestExpect(f).RequestModify(func(r *request.Request) {
 				r.HTTP().Port(adminPort).HTTPPath("/api/store/proxies")
 			}).Ensure(func(resp *request.Response) bool {
@@ -224,8 +225,8 @@ var _ = ginkgo.Describe("[Feature: Store]", func() {
 			webServer.port = %d
 			`, adminPort)

-			f.RunProcesses(serverConf, []string{clientConf})
-			framework.ExpectNoError(framework.WaitForTCPReady(fmt.Sprintf("127.0.0.1:%d", adminPort), 5*time.Second))
+			f.RunProcesses([]string{serverConf}, []string{clientConf})
+			time.Sleep(500 * time.Millisecond)

 			framework.NewRequestExpect(f).RequestModify(func(r *request.Request) {
 				r.HTTP().Port(adminPort).HTTPPath("/api/store/proxies")
@@ -246,8 +247,8 @@ var _ = ginkgo.Describe("[Feature: Store]", func() {
 			path = "%s/store.json"
 			`, adminPort, f.TempDirectory)

-			f.RunProcesses(serverConf, []string{clientConf})
-			framework.ExpectNoError(framework.WaitForTCPReady(fmt.Sprintf("127.0.0.1:%d", adminPort), 5*time.Second))
+			f.RunProcesses([]string{serverConf}, []string{clientConf})
+			time.Sleep(500 * time.Millisecond)

 			invalidBody, _ := json.Marshal(map[string]any{
 				"name": "bad-proxy",
@@ -279,8 +280,8 @@ var _ = ginkgo.Describe("[Feature: Store]", func() {
 			path = "%s/store.json"
 			`, adminPort, f.TempDirectory)

-			f.RunProcesses(serverConf, []string{clientConf})
-			framework.ExpectNoError(framework.WaitForTCPReady(fmt.Sprintf("127.0.0.1:%d", adminPort), 5*time.Second))
+			f.RunProcesses([]string{serverConf}, []string{clientConf})
+			time.Sleep(500 * time.Millisecond)

 			createBody, _ := json.Marshal(map[string]any{
 				"name": "proxy-a",
--- a/test/e2e/v1/plugin/client.go
+++ b/test/e2e/v1/plugin/client.go
@@ -74,7 +74,7 @@ var _ = ginkgo.Describe("[Feature: Client-Plugins]", func() {
 				clientConf.WriteString(getProxyConf(test.proxyName, test.portName, test.extraConfig) + "\n")
 			}
 			// run frps and frpc
-			f.RunProcesses(serverConf, []string{clientConf.String()})
+			f.RunProcesses([]string{serverConf}, []string{clientConf.String()})

 			for _, test := range tests {
 				framework.NewRequestExpect(f).Port(f.PortByName(test.portName)).Ensure()
@@ -98,7 +98,7 @@ var _ = ginkgo.Describe("[Feature: Client-Plugins]", func() {
 		httpPassword = "123"
 		`, remotePort)

-		f.RunProcesses(serverConf, []string{clientConf})
+		f.RunProcesses([]string{serverConf}, []string{clientConf})

 		// http proxy, no auth info
 		framework.NewRequestExpect(f).PortName(framework.HTTPSimpleServerPort).RequestModify(func(r *request.Request) {
@@ -132,7 +132,7 @@ var _ = ginkgo.Describe("[Feature: Client-Plugins]", func() {
 		password = "123"
 		`, remotePort)

-		f.RunProcesses(serverConf, []string{clientConf})
+		f.RunProcesses([]string{serverConf}, []string{clientConf})

 		// http proxy, no auth info
 		framework.NewRequestExpect(f).PortName(framework.TCPEchoServerPort).RequestModify(func(r *request.Request) {
@@ -182,7 +182,7 @@ var _ = ginkgo.Describe("[Feature: Client-Plugins]", func() {
 		httpPassword = "123"
 		`, remotePort, f.TempDirectory, f.TempDirectory, f.TempDirectory)

-		f.RunProcesses(serverConf, []string{clientConf})
+		f.RunProcesses([]string{serverConf}, []string{clientConf})

 		// from tcp proxy
 		framework.NewRequestExpect(f).Request(
@@ -218,7 +218,7 @@ var _ = ginkgo.Describe("[Feature: Client-Plugins]", func() {
 		localAddr = "127.0.0.1:%d"
 		`, localPort)

-		f.RunProcesses(serverConf, []string{clientConf})
+		f.RunProcesses([]string{serverConf}, []string{clientConf})

 		tlsConfig, err := transport.NewServerTLSConfig("", "", "")
 		framework.ExpectNoError(err)
@@ -264,7 +264,7 @@ var _ = ginkgo.Describe("[Feature: Client-Plugins]", func() {
 		keyPath = "%s"
 		`, localPort, crtPath, keyPath)

-		f.RunProcesses(serverConf, []string{clientConf})
+		f.RunProcesses([]string{serverConf}, []string{clientConf})

 		localServer := httpserver.New(
 			httpserver.WithBindPort(localPort),
@@ -310,7 +310,7 @@ var _ = ginkgo.Describe("[Feature: Client-Plugins]", func() {
 		keyPath = "%s"
 		`, localPort, crtPath, keyPath)

-		f.RunProcesses(serverConf, []string{clientConf})
+		f.RunProcesses([]string{serverConf}, []string{clientConf})

 		tlsConfig, err := transport.NewServerTLSConfig("", "", "")
 		framework.ExpectNoError(err)
@@ -350,7 +350,7 @@ var _ = ginkgo.Describe("[Feature: Client-Plugins]", func() {
 			hostHeaderRewrite = "rewrite.test.com"
 			`, remotePort, localPort)

-			f.RunProcesses(serverConf, []string{clientConf})
+			f.RunProcesses([]string{serverConf}, []string{clientConf})

 			localServer := httpserver.New(
 				httpserver.WithBindPort(localPort),
@@ -385,7 +385,7 @@ var _ = ginkgo.Describe("[Feature: Client-Plugins]", func() {
 			requestHeaders.set.x-from-where = "frp"
 			`, remotePort, localPort)

-			f.RunProcesses(serverConf, []string{clientConf})
+			f.RunProcesses([]string{serverConf}, []string{clientConf})

 			localServer := httpserver.New(
 				httpserver.WithBindPort(localPort),
@@ -431,7 +431,7 @@ var _ = ginkgo.Describe("[Feature: Client-Plugins]", func() {
 		keyPath = "%s"
 		`, localPort, crtPath, keyPath)

-		f.RunProcesses(serverConf, []string{clientConf})
+		f.RunProcesses([]string{serverConf}, []string{clientConf})

 		localServer := httpserver.New(
 			httpserver.WithBindPort(localPort),
--- a/test/e2e/v1/plugin/server.go
+++ b/test/e2e/v1/plugin/server.go
@@ -74,7 +74,7 @@ var _ = ginkgo.Describe("[Feature: Server-Plugins]", func() {
 			remotePort = %d
 			`, framework.TCPEchoServerPort, remotePort2)

-			f.RunProcesses(serverConf, []string{clientConf, invalidTokenClientConf})
+			f.RunProcesses([]string{serverConf}, []string{clientConf, invalidTokenClientConf})

 			framework.NewRequestExpect(f).Port(remotePort).Ensure()
 			framework.NewRequestExpect(f).Port(remotePort2).ExpectError(true).Ensure()
@@ -124,7 +124,7 @@ var _ = ginkgo.Describe("[Feature: Server-Plugins]", func() {
 			remotePort = %d
 			`, framework.TCPEchoServerPort, remotePort)

-			f.RunProcesses(serverConf, []string{clientConf})
+			f.RunProcesses([]string{serverConf}, []string{clientConf})

 			framework.NewRequestExpect(f).Port(remotePort).Ensure()
 		})
@@ -160,7 +160,7 @@ var _ = ginkgo.Describe("[Feature: Server-Plugins]", func() {
 			remotePort = 0
 			`, framework.TCPEchoServerPort)

-			f.RunProcesses(serverConf, []string{clientConf})
+			f.RunProcesses([]string{serverConf}, []string{clientConf})

 			framework.NewRequestExpect(f).Port(remotePort).Ensure()
 		})
@@ -204,7 +204,7 @@ var _ = ginkgo.Describe("[Feature: Server-Plugins]", func() {
 			remotePort = %d
 			`, framework.TCPEchoServerPort, remotePort)

-			_, clients := f.RunProcesses(serverConf, []string{clientConf})
+			_, clients := f.RunProcesses([]string{serverConf}, []string{clientConf})

 			framework.NewRequestExpect(f).Port(remotePort).Ensure()

@@ -261,7 +261,7 @@ var _ = ginkgo.Describe("[Feature: Server-Plugins]", func() {
 			remotePort = %d
 			`, framework.TCPEchoServerPort, remotePort)

-			f.RunProcesses(serverConf, []string{clientConf})
+			f.RunProcesses([]string{serverConf}, []string{clientConf})

 			framework.NewRequestExpect(f).Port(remotePort).Ensure()

@@ -310,7 +310,7 @@ var _ = ginkgo.Describe("[Feature: Server-Plugins]", func() {
 			remotePort = %d
 			`, framework.TCPEchoServerPort, remotePort)

-			f.RunProcesses(serverConf, []string{clientConf})
+			f.RunProcesses([]string{serverConf}, []string{clientConf})

 			framework.NewRequestExpect(f).Port(remotePort).Ensure()

@@ -357,7 +357,7 @@ var _ = ginkgo.Describe("[Feature: Server-Plugins]", func() {
 			remotePort = %d
 			`, framework.TCPEchoServerPort, remotePort)

-			f.RunProcesses(serverConf, []string{clientConf})
+			f.RunProcesses([]string{serverConf}, []string{clientConf})

 			framework.NewRequestExpect(f).Port(remotePort).Ensure()

@@ -406,7 +406,7 @@ var _ = ginkgo.Describe("[Feature: Server-Plugins]", func() {
 			remotePort = %d
 			`, framework.TCPEchoServerPort, remotePort)

-			f.RunProcesses(serverConf, []string{clientConf})
+			f.RunProcesses([]string{serverConf}, []string{clientConf})

 			framework.NewRequestExpect(f).Port(remotePort).Ensure()

--- a/web/frpc/Makefile
+++ b/web/frpc/Makefile
@@ -1,7 +1,7 @@
 .PHONY: dist install build preview lint

 install:
-	@cd .. && npm install
+	@npm install

 build: install
 	@npm run build
--- a/web/frpc/components.d.ts
+++ b/web/frpc/components.d.ts
@@ -7,39 +7,28 @@ export {}

 declare module 'vue' {
  export interface GlobalComponents {
-    ConfigField: typeof import('./src/components/ConfigField.vue')['default']
-    ConfigSection: typeof import('./src/components/ConfigSection.vue')['default']
-    ElDialog: typeof import('element-plus/es')['ElDialog']
+    ElButton: typeof import('element-plus/es')['ElButton']
+    ElCard: typeof import('element-plus/es')['ElCard']
+    ElCol: typeof import('element-plus/es')['ElCol']
+    ElCollapseTransition: typeof import('element-plus/es')['ElCollapseTransition']
    ElForm: typeof import('element-plus/es')['ElForm']
    ElFormItem: typeof import('element-plus/es')['ElFormItem']
    ElIcon: typeof import('element-plus/es')['ElIcon']
    ElInput: typeof import('element-plus/es')['ElInput']
-    ElPopover: typeof import('element-plus/es')['ElPopover']
+    ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
+    ElOption: typeof import('element-plus/es')['ElOption']
    ElRadio: typeof import('element-plus/es')['ElRadio']
    ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
+    ElRow: typeof import('element-plus/es')['ElRow']
+    ElSelect: typeof import('element-plus/es')['ElSelect']
    ElSwitch: typeof import('element-plus/es')['ElSwitch']
+    ElTag: typeof import('element-plus/es')['ElTag']
+    ElTooltip: typeof import('element-plus/es')['ElTooltip']
    KeyValueEditor: typeof import('./src/components/KeyValueEditor.vue')['default']
-    ProxyAuthSection: typeof import('./src/components/proxy-form/ProxyAuthSection.vue')['default']
-    ProxyBackendSection: typeof import('./src/components/proxy-form/ProxyBackendSection.vue')['default']
-    ProxyBaseSection: typeof import('./src/components/proxy-form/ProxyBaseSection.vue')['default']
    ProxyCard: typeof import('./src/components/ProxyCard.vue')['default']
-    ProxyFormLayout: typeof import('./src/components/proxy-form/ProxyFormLayout.vue')['default']
-    ProxyHealthSection: typeof import('./src/components/proxy-form/ProxyHealthSection.vue')['default']
-    ProxyHttpSection: typeof import('./src/components/proxy-form/ProxyHttpSection.vue')['default']
-    ProxyLoadBalanceSection: typeof import('./src/components/proxy-form/ProxyLoadBalanceSection.vue')['default']
-    ProxyMetadataSection: typeof import('./src/components/proxy-form/ProxyMetadataSection.vue')['default']
-    ProxyNatSection: typeof import('./src/components/proxy-form/ProxyNatSection.vue')['default']
-    ProxyRemoteSection: typeof import('./src/components/proxy-form/ProxyRemoteSection.vue')['default']
-    ProxyTransportSection: typeof import('./src/components/proxy-form/ProxyTransportSection.vue')['default']
    RouterLink: typeof import('vue-router')['RouterLink']
    RouterView: typeof import('vue-router')['RouterView']
-    StatusPills: typeof import('./src/components/StatusPills.vue')['default']
-    StringListEditor: typeof import('./src/components/StringListEditor.vue')['default']
-    VisitorBaseSection: typeof import('./src/components/visitor-form/VisitorBaseSection.vue')['default']
-    VisitorConnectionSection: typeof import('./src/components/visitor-form/VisitorConnectionSection.vue')['default']
-    VisitorFormLayout: typeof import('./src/components/visitor-form/VisitorFormLayout.vue')['default']
-    VisitorTransportSection: typeof import('./src/components/visitor-form/VisitorTransportSection.vue')['default']
-    VisitorXtcpSection: typeof import('./src/components/visitor-form/VisitorXtcpSection.vue')['default']
+    StatCard: typeof import('./src/components/StatCard.vue')['default']
  }
  export interface ComponentCustomProperties {
    vLoading: typeof import('element-plus/es')['ElLoadingDirective']
--- a/web/frpc/index.html
+++ b/web/frpc/index.html
@@ -3,7 +3,6 @@

 <head>
    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>frp client</title>
 </head>

--- a/web/frpc/package-lock.json
+++ b/web/frpc/package-lock.json
--- a/web/frpc/package.json
+++ b/web/frpc/package.json
@@ -13,7 +13,6 @@
  },
  "dependencies": {
    "element-plus": "^2.13.0",
-    "pinia": "^3.0.4",
    "vue": "^3.5.26",
    "vue-router": "^4.6.4"
  },
--- a/web/frpc/src/App.vue
+++ b/web/frpc/src/App.vue
@@ -2,160 +2,140 @@
  <div id="app">
    <header class="header">
      <div class="header-content">
-        <div class="brand-section">
-          <button v-if="isMobile" class="hamburger-btn" @click="toggleSidebar" aria-label="Toggle menu">
-            <span class="hamburger-icon">&#9776;</span>
-          </button>
-          <div class="logo-wrapper">
-            <LogoIcon class="logo-icon" />
+        <div class="header-top">
+          <div class="brand-section">
+            <div class="logo-wrapper">
+              <LogoIcon class="logo-icon" />
+            </div>
+            <span class="divider">/</span>
+            <span class="brand-name">frp</span>
+            <span class="badge client-badge">Client</span>
+            <span class="badge" v-if="currentRouteName">{{
+              currentRouteName
+            }}</span>
+          </div>
+
+          <div class="header-controls">
+            <a
+              class="github-link"
+              href="https://github.com/fatedier/frp"
+              target="_blank"
+              aria-label="GitHub"
+            >
+              <GitHubIcon class="github-icon" />
+            </a>
+            <el-switch
+              v-model="isDark"
+              inline-prompt
+              :active-icon="Moon"
+              :inactive-icon="Sunny"
+              class="theme-switch"
+            />
          </div>
-          <span class="divider">/</span>
-          <span class="brand-name">frp</span>
-          <span class="badge">Client</span>
        </div>

-        <div class="header-controls">
-          <a
-            class="github-link"
-            href="https://github.com/fatedier/frp"
-            target="_blank"
-            aria-label="GitHub"
+        <nav class="nav-bar">
+          <router-link to="/" class="nav-link" active-class="active"
+            >Overview</router-link
          >
-            <GitHubIcon class="github-icon" />
-          </a>
-          <el-switch
-            v-model="isDark"
-            inline-prompt
-            :active-icon="Moon"
-            :inactive-icon="Sunny"
-            class="theme-switch"
-          />
-        </div>
+          <router-link to="/configure" class="nav-link" active-class="active"
+            >Configure</router-link
+          >
+        </nav>
      </div>
    </header>

-    <div class="layout">
-      <!-- Mobile overlay -->
-      <div
-        v-if="isMobile && sidebarOpen"
-        class="sidebar-overlay"
-        @click="closeSidebar"
-      />
-
-      <aside class="sidebar" :class="{ 'mobile-open': isMobile && sidebarOpen }">
-        <nav class="sidebar-nav">
-          <router-link
-            to="/proxies"
-            class="sidebar-link"
-            :class="{ active: route.path.startsWith('/proxies') }"
-            @click="closeSidebar"
-          >
-            Proxies
-          </router-link>
-          <router-link
-            to="/visitors"
-            class="sidebar-link"
-            :class="{ active: route.path.startsWith('/visitors') }"
-            @click="closeSidebar"
-          >
-            Visitors
-          </router-link>
-          <router-link
-            to="/config"
-            class="sidebar-link"
-            :class="{ active: route.path === '/config' }"
-            @click="closeSidebar"
-          >
-            Config
-          </router-link>
-        </nav>
-      </aside>
-
-      <main id="content">
-        <router-view></router-view>
-      </main>
-    </div>
+    <main id="content">
+      <router-view></router-view>
+    </main>
  </div>
 </template>

 <script setup lang="ts">
-import { ref, watch } from 'vue'
+import { computed } from 'vue'
 import { useRoute } from 'vue-router'
 import { useDark } from '@vueuse/core'
 import { Moon, Sunny } from '@element-plus/icons-vue'
 import GitHubIcon from './assets/icons/github.svg?component'
 import LogoIcon from './assets/icons/logo.svg?component'
-import { useResponsive } from './composables/useResponsive'

 const route = useRoute()
 const isDark = useDark()
-const { isMobile } = useResponsive()

-const sidebarOpen = ref(false)
-
-const toggleSidebar = () => {
-  sidebarOpen.value = !sidebarOpen.value
-}
-
-const closeSidebar = () => {
-  sidebarOpen.value = false
-}
-
-// Auto-close sidebar on route change
-watch(() => route.path, () => {
-  if (isMobile.value) {
-    closeSidebar()
-  }
+const currentRouteName = computed(() => {
+  if (route.path === '/') return 'Overview'
+  if (route.path === '/configure') return 'Configure'
+  if (route.path === '/proxies/create') return 'Create Proxy'
+  if (route.path.startsWith('/proxies/') && route.path.endsWith('/edit'))
+    return 'Edit Proxy'
+  if (route.path === '/visitors/create') return 'Create Visitor'
+  if (route.path.startsWith('/visitors/') && route.path.endsWith('/edit'))
+    return 'Edit Visitor'
+  return ''
 })
 </script>

-<style lang="scss">
+<style>
+:root {
+  --header-height: 112px;
+  --header-bg: rgba(255, 255, 255, 0.8);
+  --header-border: #eaeaea;
+  --text-primary: #000;
+  --text-secondary: #666;
+  --hover-bg: #f5f5f5;
+  --active-link: #000;
+}
+
+html.dark {
+  --header-bg: rgba(0, 0, 0, 0.8);
+  --header-border: #333;
+  --text-primary: #fff;
+  --text-secondary: #888;
+  --hover-bg: #1a1a1a;
+  --active-link: #fff;
+}
+
 body {
  margin: 0;
-  font-family: ui-sans-serif, -apple-system, system-ui, Segoe UI, Helvetica,
+  font-family:
+    -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue',
    Arial, sans-serif;
 }

-*,
-:after,
-:before {
-  box-sizing: border-box;
-  -webkit-tap-highlight-color: transparent;
-}
-
-html, body {
-  height: 100%;
-  overflow: hidden;
-}
-
 #app {
-  height: 100vh;
-  height: 100dvh;
+  min-height: 100vh;
  display: flex;
  flex-direction: column;
-  background-color: $color-bg-secondary;
+  background-color: var(--el-bg-color-page);
 }

-// Header
 .header {
-  flex-shrink: 0;
-  background: $color-bg-primary;
-  border-bottom: 1px solid $color-border-light;
-  height: $header-height;
+  position: sticky;
+  top: 0;
+  z-index: 100;
+  background: var(--header-bg);
+  backdrop-filter: blur(12px);
+  -webkit-backdrop-filter: blur(12px);
+  border-bottom: 1px solid var(--header-border);
 }

 .header-content {
+  max-width: 1200px;
+  margin: 0 auto;
+  padding: 0 40px;
+}
+
+.header-top {
+  height: 64px;
  display: flex;
  align-items: center;
  justify-content: space-between;
-  height: 100%;
-  padding: 0 $spacing-xl;
 }

 .brand-section {
  display: flex;
  align-items: center;
-  gap: $spacing-md;
+  gap: 12px;
 }

 .logo-wrapper {
@@ -164,30 +144,41 @@ html, body {
 }

 .logo-icon {
-  width: 28px;
-  height: 28px;
+  width: 32px;
+  height: 32px;
 }

 .divider {
-  color: $color-border;
-  font-size: 22px;
+  color: var(--header-border);
+  font-size: 24px;
  font-weight: 200;
 }

 .brand-name {
-  font-weight: $font-weight-semibold;
-  font-size: $font-size-xl;
-  color: $color-text-primary;
+  font-weight: 600;
+  font-size: 18px;
+  color: var(--text-primary);
  letter-spacing: -0.5px;
 }

 .badge {
-  font-size: $font-size-xs;
-  font-weight: $font-weight-medium;
-  color: $color-text-muted;
-  background: $color-bg-muted;
+  font-size: 12px;
+  color: var(--text-secondary);
+  background: var(--hover-bg);
  padding: 2px 8px;
-  border-radius: 4px;
+  border-radius: 99px;
+  border: 1px solid var(--header-border);
+}
+
+.badge.client-badge {
+  background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+  color: white;
+  border: none;
+  font-weight: 500;
+}
+
+html.dark .badge.client-badge {
+  background: linear-gradient(135deg, #818cf8 0%, #a78bfa 100%);
 }

 .header-controls {
@@ -197,17 +188,17 @@ html, body {
 }

 .github-link {
-  @include flex-center;
-  width: 28px;
-  height: 28px;
-  border-radius: $radius-sm;
-  color: $color-text-secondary;
-  transition: all $transition-fast;
-
-  &:hover {
-    background: $color-bg-hover;
-    color: $color-text-primary;
-  }
+  width: 26px;
+  height: 26px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  border-radius: 50%;
+  color: var(--text-primary);
+  transition: background 0.2s;
+  background: transparent;
+  border: 1px solid transparent;
+  cursor: pointer;
 }

 .github-icon {
@@ -215,10 +206,15 @@ html, body {
  height: 18px;
 }

+.github-link:hover {
+  background: var(--hover-bg);
+  border-color: var(--header-border);
+}
+
 .theme-switch {
  --el-switch-on-color: #2c2c3a;
  --el-switch-off-color: #f2f2f2;
-  --el-switch-border-color: var(--color-border-light);
+  --el-switch-border-color: var(--header-border);
 }

 html.dark .theme-switch {
@@ -229,300 +225,47 @@ html.dark .theme-switch {
  color: #909399 !important;
 }

-// Layout
-.layout {
-  flex: 1;
+.nav-bar {
+  height: 48px;
  display: flex;
-  overflow: hidden;
+  align-items: center;
+  gap: 24px;
 }

-.sidebar {
-  width: $sidebar-width;
-  flex-shrink: 0;
-  border-right: 1px solid $color-border-light;
-  padding: $spacing-lg $spacing-md;
-  overflow-y: auto;
-  display: flex;
-  flex-direction: column;
-}
-
-.sidebar-nav {
-  @include flex-column;
-  gap: 2px;
-}
-
-.sidebar-link {
-  display: block;
+.nav-link {
  text-decoration: none;
-  font-size: $font-size-lg;
-  color: $color-text-secondary;
-  padding: 10px $spacing-md;
-  border-radius: $radius-sm;
-  transition: all $transition-fast;
-
-  &:hover {
-    color: $color-text-primary;
-    background: $color-bg-hover;
-  }
-
-  &.active {
-    color: $color-text-primary;
-    background: $color-bg-hover;
-    font-weight: $font-weight-medium;
-  }
+  font-size: 14px;
+  color: var(--text-secondary);
+  padding: 8px 0;
+  border-bottom: 2px solid transparent;
+  transition: all 0.2s;
 }

-// Hamburger button (mobile only)
-.hamburger-btn {
-  @include flex-center;
-  width: 36px;
-  height: 36px;
-  border: none;
-  border-radius: $radius-sm;
-  background: transparent;
-  cursor: pointer;
-  padding: 0;
-  transition: background $transition-fast;
-
-  &:hover {
-    background: $color-bg-hover;
-  }
+.nav-link:hover {
+  color: var(--text-primary);
 }

-.hamburger-icon {
-  font-size: 20px;
-  line-height: 1;
-  color: $color-text-primary;
-}
-
-// Mobile overlay
-.sidebar-overlay {
-  position: fixed;
-  inset: 0;
-  background: rgba(0, 0, 0, 0.5);
-  z-index: 99;
+.nav-link.active {
+  color: var(--active-link);
+  border-bottom-color: var(--active-link);
 }

 #content {
  flex: 1;
-  min-width: 0;
-  overflow: hidden;
-  background: $color-bg-primary;
+  width: 100%;
+  padding: 40px;
+  max-width: 1200px;
+  margin: 0 auto;
+  box-sizing: border-box;
 }

-// Common page styles
-.page-title {
-  font-size: $font-size-xl + 2px;
-  font-weight: $font-weight-semibold;
-  color: $color-text-primary;
-  margin: 0;
-}
-
-.page-subtitle {
-  font-size: $font-size-md;
-  color: $color-text-muted;
-  margin: $spacing-sm 0 0;
-}
-
-.icon-btn {
-  @include flex-center;
-  width: 32px;
-  height: 32px;
-  border: none;
-  border-radius: $radius-sm;
-  background: transparent;
-  color: $color-text-muted;
-  cursor: pointer;
-  transition: all $transition-fast;
-
-  &:hover {
-    background: $color-bg-hover;
-    color: $color-text-primary;
-  }
-}
-
-.search-input {
-  width: 200px;
-
-  .el-input__wrapper {
-    border-radius: 10px;
-    background: $color-bg-tertiary;
-    box-shadow: 0 0 0 1px $color-border inset;
-
-    &.is-focus {
-      box-shadow: 0 0 0 1px $color-text-light inset;
-    }
-  }
-
-  .el-input__inner {
-    color: $color-text-primary;
-  }
-
-  .el-input__prefix {
-    color: $color-text-muted;
-  }
-
-  @include mobile {
-    flex: 1;
-    width: auto;
-  }
-}
-
-// Element Plus global overrides
-.el-button {
-  font-weight: $font-weight-medium;
-}
-
-.el-tag {
-  font-weight: $font-weight-medium;
-}
-
-.el-switch {
-  --el-switch-on-color: #606266;
-  --el-switch-off-color: #dcdfe6;
-}
-
-html.dark .el-switch {
-  --el-switch-on-color: #b0b0b0;
-  --el-switch-off-color: #404040;
-}
-
-.el-radio {
-  --el-radio-text-color: var(--color-text-primary) !important;
-  --el-radio-input-border-color-hover: #606266 !important;
-  --el-color-primary: #606266 !important;
-}
-
-.el-form-item {
-  margin-bottom: 16px;
-}
-
-.el-loading-mask {
-  border-radius: $radius-md;
-}
-
-// Select overrides
-.el-select__wrapper {
-  border-radius: $radius-md !important;
-  box-shadow: 0 0 0 1px $color-border-light inset !important;
-  transition: all $transition-fast;
-
-  &:hover {
-    box-shadow: 0 0 0 1px $color-border inset !important;
-  }
-
-  &.is-focused {
-    box-shadow: 0 0 0 1px $color-border inset !important;
-  }
-}
-
-.el-select-dropdown {
-  border-radius: 12px !important;
-  border: 1px solid $color-border-light !important;
-  box-shadow: 0 10px 25px -5px rgba(0, 0, 0, 0.1),
-              0 8px 10px -6px rgba(0, 0, 0, 0.1) !important;
-  padding: 4px !important;
-}
-
-.el-select-dropdown__item {
-  border-radius: $radius-sm;
-  margin: 2px 0;
-  transition: background $transition-fast;
-
-  &.is-selected {
-    color: $color-text-primary;
-    font-weight: $font-weight-medium;
-  }
-}
-
-// Input overrides
-.el-input__wrapper {
-  border-radius: $radius-md !important;
-  box-shadow: 0 0 0 1px $color-border-light inset !important;
-  transition: all $transition-fast;
-
-  &:hover {
-    box-shadow: 0 0 0 1px $color-border inset !important;
-  }
-
-  &.is-focus {
-    box-shadow: 0 0 0 1px $color-border inset !important;
-  }
-}
-
-// Status pill (shared)
-.status-pill {
-  display: inline-flex;
-  align-items: center;
-  gap: 5px;
-  font-size: $font-size-sm;
-  font-weight: $font-weight-medium;
-  padding: 3px 10px;
-  border-radius: 10px;
-  text-transform: capitalize;
-
-  &.running {
-    background: rgba(103, 194, 58, 0.1);
-    color: #67c23a;
-  }
-
-  &.error {
-    background: rgba(245, 108, 108, 0.1);
-    color: #f56c6c;
-  }
-
-  &.waiting {
-    background: rgba(230, 162, 60, 0.1);
-    color: #e6a23c;
-  }
-
-  &.disabled {
-    background: $color-bg-muted;
-    color: $color-text-light;
-  }
-
-  .status-dot {
-    width: 6px;
-    height: 6px;
-    border-radius: 50%;
-    background: currentColor;
-  }
-}
-
-// Mobile
-@include mobile {
+@media (max-width: 768px) {
  .header-content {
-    padding: 0 $spacing-lg;
-  }
-
-  .sidebar {
-    position: fixed;
-    top: $header-height;
-    left: 0;
-    bottom: 0;
-    z-index: 100;
-    background: $color-bg-primary;
-    transform: translateX(-100%);
-    transition: transform 0.25s cubic-bezier(0.4, 0, 0.2, 1);
-    border-right: 1px solid $color-border-light;
-
-    &.mobile-open {
-      transform: translateX(0);
-    }
-  }
-
-  .sidebar-nav {
-    flex-direction: column;
-    gap: 2px;
+    padding: 0 20px;
  }

  #content {
-    width: 100%;
-  }
-
-  // Select dropdown overflow prevention
-  .el-select-dropdown {
-    max-width: calc(100vw - 32px);
+    padding: 20px;
  }
 }
 </style>
--- a/web/frpc/src/api/frpc.ts
+++ b/web/frpc/src/api/frpc.ts
@@ -5,7 +5,7 @@ import type {
  ProxyDefinition,
  VisitorListResp,
  VisitorDefinition,
-} from '../types'
+} from '../types/proxy'

 export const getStatus = () => {
  return http.get<StatusResponse>('/api/status')
@@ -23,19 +23,6 @@ export const reloadConfig = () => {
  return http.get<void>('/api/reload')
 }

-// Config lookup API (any source)
-export const getProxyConfig = (name: string) => {
-  return http.get<ProxyDefinition>(
-    `/api/proxy/${encodeURIComponent(name)}/config`,
-  )
-}
-
-export const getVisitorConfig = (name: string) => {
-  return http.get<VisitorDefinition>(
-    `/api/visitor/${encodeURIComponent(name)}/config`,
-  )
-}
-
 // Store API - Proxies
 export const listStoreProxies = () => {
  return http.get<ProxyListResp>('/api/store/proxies')
--- a/Show More
+++ b/Show More