optimize the code of the command line (#3614)

test/e2e/pkg/plugin/plugin.go

@@ -0,0 +1,41 @@
+package plugin
+
+import (
+	"crypto/tls"
+	"encoding/json"
+	"io"
+	"net/http"
+
+	plugin "github.com/fatedier/frp/pkg/plugin/server"
+	"github.com/fatedier/frp/pkg/util/log"
+	"github.com/fatedier/frp/test/e2e/mock/server/httpserver"
+)
+
+type Handler func(req *plugin.Request) *plugin.Response
+
+type NewPluginRequest func() *plugin.Request
+
+func NewHTTPPluginServer(port int, newFunc NewPluginRequest, handler Handler, tlsConfig *tls.Config) *httpserver.Server {
+	return httpserver.New(
+		httpserver.WithBindPort(port),
+		httpserver.WithTLSConfig(tlsConfig),
+		httpserver.WithHandler(http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
+			r := newFunc()
+			buf, err := io.ReadAll(req.Body)
+			if err != nil {
+				w.WriteHeader(500)
+				return
+			}
+			log.Trace("plugin request: %s", string(buf))
+			err = json.Unmarshal(buf, &r)
+			if err != nil {
+				w.WriteHeader(500)
+				return
+			}
+			resp := handler(r)
+			buf, _ = json.Marshal(resp)
+			log.Trace("plugin response: %s", string(buf))
+			_, _ = w.Write(buf)
+		})),
+	)
+}

test/e2e/pkg/request/request.go

@@ -14,8 +14,8 @@ import (
 
 	libdial "github.com/fatedier/golib/net/dial"
 
+	"github.com/fatedier/frp/pkg/util/util"
 	"github.com/fatedier/frp/test/e2e/pkg/rpc"
-	"github.com/fatedier/frp/test/e2e/pkg/utils"
 )
 
 type Request struct {
@@ -115,7 +115,7 @@ func (r *Request) HTTPHeaders(headers map[string]string) *Request {
 }
 
 func (r *Request) HTTPAuth(user, password string) *Request {
-	r.authValue = utils.BasicAuth(user, password)
+	r.authValue = util.BasicAuth(user, password)
 	return r
 }
 

test/e2e/pkg/sdk/client/client.go

@@ -1,114 +0,0 @@
-package client
-
-import (
-	"encoding/json"
-	"fmt"
-	"io"
-	"net"
-	"net/http"
-	"strconv"
-	"strings"
-
-	"github.com/fatedier/frp/client"
-	"github.com/fatedier/frp/test/e2e/pkg/utils"
-)
-
-type Client struct {
-	address  string
-	authUser string
-	authPwd  string
-}
-
-func New(host string, port int) *Client {
-	return &Client{
-		address: net.JoinHostPort(host, strconv.Itoa(port)),
-	}
-}
-
-func (c *Client) SetAuth(user, pwd string) {
-	c.authUser = user
-	c.authPwd = pwd
-}
-
-func (c *Client) GetProxyStatus(name string) (*client.ProxyStatusResp, error) {
-	req, err := http.NewRequest("GET", "http://"+c.address+"/api/status", nil)
-	if err != nil {
-		return nil, err
-	}
-	content, err := c.do(req)
-	if err != nil {
-		return nil, err
-	}
-	allStatus := make(client.StatusResp)
-	if err = json.Unmarshal([]byte(content), &allStatus); err != nil {
-		return nil, fmt.Errorf("unmarshal http response error: %s", strings.TrimSpace(content))
-	}
-	for _, pss := range allStatus {
-		for _, ps := range pss {
-			if ps.Name == name {
-				return &ps, nil
-			}
-		}
-	}
-	return nil, fmt.Errorf("no proxy status found")
-}
-
-func (c *Client) Reload() error {
-	req, err := http.NewRequest("GET", "http://"+c.address+"/api/reload", nil)
-	if err != nil {
-		return err
-	}
-	_, err = c.do(req)
-	return err
-}
-
-func (c *Client) Stop() error {
-	req, err := http.NewRequest("POST", "http://"+c.address+"/api/stop", nil)
-	if err != nil {
-		return err
-	}
-	_, err = c.do(req)
-	return err
-}
-
-func (c *Client) GetConfig() (string, error) {
-	req, err := http.NewRequest("GET", "http://"+c.address+"/api/config", nil)
-	if err != nil {
-		return "", err
-	}
-	return c.do(req)
-}
-
-func (c *Client) UpdateConfig(content string) error {
-	req, err := http.NewRequest("PUT", "http://"+c.address+"/api/config", strings.NewReader(content))
-	if err != nil {
-		return err
-	}
-	_, err = c.do(req)
-	return err
-}
-
-func (c *Client) setAuthHeader(req *http.Request) {
-	if c.authUser != "" || c.authPwd != "" {
-		req.Header.Set("Authorization", utils.BasicAuth(c.authUser, c.authPwd))
-	}
-}
-
-func (c *Client) do(req *http.Request) (string, error) {
-	c.setAuthHeader(req)
-
-	resp, err := http.DefaultClient.Do(req)
-	if err != nil {
-		return "", err
-	}
-	defer resp.Body.Close()
-
-	if resp.StatusCode != 200 {
-		return "", fmt.Errorf("api status code [%d]", resp.StatusCode)
-	}
-	buf, err := io.ReadAll(resp.Body)
-	if err != nil {
-		return "", err
-	}
-	return string(buf), nil
-}

test/e2e/pkg/utils/utils.go

@@ -1,10 +0,0 @@
-package utils
-
-import (
-	"encoding/base64"
-)
-
-func BasicAuth(username, passwd string) string {
-	auth := username + ":" + passwd
-	return "Basic " + base64.StdEncoding.EncodeToString([]byte(auth))
-}