fix: special term char

VaalaCat · VaalaCat · commit 2d7938a6a080 · 2024-12-05T04:45:44.000Z
diff --git a/biz/client/stream_log.go b/biz/client/stream_log.go
@@ -31,7 +31,7 @@ func initStreamLog(h *common.HookMgr) {
 
 	h.AddStream(func(msg string) {
 		handler.Send(&pb.PushClientStreamLogReq{
-			Log: utils.EncodeBase64(msg),
+			Log: []byte(utils.EncodeBase64(msg)),
 			Base: &pb.ClientBase{
 				ClientId:     clientID,
 				ClientSecret: clientSecret,
diff --git a/biz/common/pty.go b/biz/common/pty.go
@@ -9,7 +9,6 @@ import (
 	"github.com/VaalaCat/frp-panel/services/rpcclient"
 	"github.com/VaalaCat/frp-panel/utils/pty"
 	"github.com/google/uuid"
-	"github.com/samber/lo"
 	"github.com/sourcegraph/conc"
 )
 
@@ -34,7 +33,7 @@ func StartPTYConnect(c context.Context, req *pb.CommonRequest, initMsg *pb.PTYCl
 		return nil, err
 	}
 
-	if ack.GetData() != "ok" {
+	if string(ack.GetData()) != "ok" {
 		logger.Logger(c).Infof("ack error")
 		return nil, fmt.Errorf("ack error")
 	}
@@ -54,7 +53,7 @@ func HandlePTY(c context.Context, conn pb.Master_PTYConnectClient, sessionID str
 	if err != nil {
 		msg := fmt.Sprintf("failed to start tty: %s", err)
 		logger.Logger(c).WithError(err).Warn(msg)
-		conn.Send(&pb.PTYClientMessage{Data: &msg, SessionId: sessionID})
+		conn.Send(&pb.PTYClientMessage{Data: []byte(msg), SessionId: sessionID})
 		return
 	}
 
@@ -82,16 +81,16 @@ func HandlePTY(c context.Context, conn pb.Master_PTYConnectClient, sessionID str
 			readLength, err := ptyInstace.Read(buffer)
 			if err != nil {
 				logger.Logger(c).Warnf("failed to read from tty: %s", err)
-				if err := conn.Send(&pb.PTYClientMessage{Data: lo.ToPtr("bye!"), SessionId: sessionID}); err != nil {
+				if err := conn.Send(&pb.PTYClientMessage{Data: []byte("bye!"), SessionId: sessionID}); err != nil {
 					logger.Logger(c).Warnf("failed to send termination message from tty to master: %s", err)
 				}
 				if err := conn.CloseSend(); err != nil {
 					logger.Logger(c).Warnf("failed to close grpc stream connection: %s", err)
 				}
 				return
 			}
-			str := string(buffer[:readLength])
-			if err := conn.Send(&pb.PTYClientMessage{Data: lo.ToPtr(str), SessionId: sessionID}); err != nil {
+			str := buffer[:readLength]
+			if err := conn.Send(&pb.PTYClientMessage{Data: str, SessionId: sessionID}); err != nil {
 				logger.Logger(c).Warnf("failed to send %v bytes from tty to master", readLength)
 				errorCounter++
 				continue
diff --git a/biz/master/shell/handler.go b/biz/master/shell/handler.go
@@ -93,7 +93,7 @@ func PTYHandler(c *gin.Context) {
 
 	defer func() {
 		logger.Logger(c).Info("gracefully stopping spawned tty...")
-		if err := cliConn.Send(&pb.PTYServerMessage{Data: lo.ToPtr("bye!"), Done: true}); err != nil {
+		if err := cliConn.Send(&pb.PTYServerMessage{Data: []byte("bye!"), Done: true}); err != nil {
 			logger.Logger(c).Warnf("failed to send close message: %s", err)
 		}
 
@@ -115,7 +115,7 @@ func PTYHandler(c *gin.Context) {
 
 	wg.Go(func() {
 		defer func() {
-			if err := cliConn.Send(&pb.PTYServerMessage{Data: lo.ToPtr("bye!"), Done: true}); err != nil {
+			if err := cliConn.Send(&pb.PTYServerMessage{Data: []byte("bye!"), Done: true}); err != nil {
 				logger.Logger(c).Warnf("failed to send close message: %s", err)
 			}
 
@@ -130,7 +130,7 @@ func PTYHandler(c *gin.Context) {
 				return
 			}
 			time.Sleep(keepalivePingTimeout / 2)
-			if time.Now().Sub(lastPongTime) > keepalivePingTimeout {
+			if time.Since(lastPongTime) > keepalivePingTimeout {
 				logger.Logger(c).Warn("failed to get response from ping, triggering disconnect now...")
 				return
 			}
@@ -151,10 +151,10 @@ func PTYHandler(c *gin.Context) {
 			cliMsg, err := cliConn.Recv()
 			if err != nil {
 				logger.Logger(c).Warnf("failed to read from client sender: %s", err)
-				if err := webConn.WriteMessage(websocket.TextMessage, []byte("bye!")); err != nil {
+				if err := webConn.WriteMessage(websocket.BinaryMessage, []byte("bye!")); err != nil {
 					logger.Logger(c).Warnf("failed to send termination message from client sender to xterm.js: %s", err)
 				}
-				if err := cliConn.Send(&pb.PTYServerMessage{Data: lo.ToPtr("bye!"), Done: true}); err != nil {
+				if err := cliConn.Send(&pb.PTYServerMessage{Data: []byte("bye!"), Done: true}); err != nil {
 					logger.Logger(c).Warnf("failed to send termination message from client sender to client: %s", err)
 				}
 				if err := webConn.Close(); err != nil {
@@ -184,7 +184,7 @@ func PTYHandler(c *gin.Context) {
 				if !connectionClosed {
 					logger.Logger(c).Warnf("failed to get next reader: %s", err)
 				}
-				if err := cliConn.Send(&pb.PTYServerMessage{Data: lo.ToPtr("bye!"), Done: true}); err != nil {
+				if err := cliConn.Send(&pb.PTYServerMessage{Data: []byte("bye!"), Done: true}); err != nil {
 					logger.Logger(c).Warnf("failed to send termination message from xterm.js to client: %s", err)
 				}
 				if err := webConn.Close(); err != nil {
@@ -201,7 +201,7 @@ func PTYHandler(c *gin.Context) {
 
 			msg := &pb.PTYServerMessage{}
 			if payload.Data != nil {
-				msg.Data = lo.ToPtr(*payload.Data)
+				msg.Data = []byte(*payload.Data)
 			}
 			if payload.Height != nil {
 				msg.Height = lo.ToPtr(int32(*payload.Height))
@@ -212,10 +212,10 @@ func PTYHandler(c *gin.Context) {
 
 			err = cliConn.Send(msg)
 			if err != nil {
-				logger.Logger(c).Warn(fmt.Sprintf("failed to write bytes to tty: %s", err))
+				logger.Logger(c).Warn(fmt.Sprintf("failed to write bytes to client: %s", err))
 				continue
 			}
-			logger.Logger(c).Tracef("messageType [%v] bytes written to tty...", messageType)
+			logger.Logger(c).Tracef("messageType [%v] bytes written to client...", messageType)
 		}
 	})
 
diff --git a/biz/master/shell/recv_mgr.go b/biz/master/shell/recv_mgr.go
@@ -8,7 +8,6 @@ import (
 	"github.com/VaalaCat/frp-panel/biz/master/server"
 	"github.com/VaalaCat/frp-panel/logger"
 	"github.com/VaalaCat/frp-panel/pb"
-	"github.com/samber/lo"
 )
 
 func PTYConnect(sender pb.Master_PTYConnectServer) error {
@@ -42,7 +41,7 @@ func PTYConnect(sender pb.Master_PTYConnectServer) error {
 
 	Mgr().Add(msg.GetSessionId(), sender)
 
-	if err := sender.Send(&pb.PTYServerMessage{Data: lo.ToPtr("ok")}); err != nil {
+	if err := sender.Send(&pb.PTYServerMessage{Data: []byte("ok")}); err != nil {
 		return err
 	}
 
diff --git a/biz/master/streamlog/collect_log.go b/biz/master/streamlog/collect_log.go
@@ -67,7 +67,7 @@ func PushClientStreamLog(sender pb.Master_PushClientStreamLogServer) error {
 			return fmt.Errorf("push client stream log cannot find client, id: [%s]", req.GetBase().GetClientId())
 		}
 
-		ch <- req.GetLog()
+		ch <- string(req.GetLog())
 	}
 	return nil
 }
@@ -93,7 +93,7 @@ func PushServerStreamLog(sender pb.Master_PushServerStreamLogServer) error {
 		if !ok {
 			return fmt.Errorf("push server stream log cannot find server, id: [%s]", req.GetBase().GetServerId())
 		}
-		ch <- req.GetLog()
+		ch <- string(req.GetLog())
 	}
 	return nil
 }
diff --git a/biz/server/stream_log.go b/biz/server/stream_log.go
@@ -31,7 +31,7 @@ func initStreamLog(h *common.HookMgr) {
 
 	h.AddStream(func(msg string) {
 		handler.Send(&pb.PushServerStreamLogReq{
-			Log: utils.EncodeBase64(msg),
+			Log: []byte(utils.EncodeBase64(msg)),
 			Base: &pb.ServerBase{
 				ServerId:     clientID,
 				ServerSecret: clientSecret,
diff --git a/idl/rpc_master.proto b/idl/rpc_master.proto
@@ -90,12 +90,12 @@ message PushProxyInfoResp {
 }
 
 message PushServerStreamLogReq {
-  string log = 1;
+  bytes log = 1;
   ServerBase base = 255;
 }
 
 message PushClientStreamLogReq {
-  string log = 1;
+  bytes log = 1;
   ClientBase base = 255;
 }
 
@@ -105,7 +105,7 @@ message PushStreamLogResp {
 }
 
 message PTYClientMessage {
-  optional string data = 1;
+  optional bytes data = 1;
   string session_id = 2;
   bool done = 3;
   oneof Base {
@@ -115,7 +115,7 @@ message PTYClientMessage {
 }
 
 message PTYServerMessage {
-  optional string data = 1;
+  optional bytes data = 1;
   optional int32 height = 2;
   optional int32 width = 3;
   bool done = 4;
diff --git a/pb/rpc_master.pb.go b/pb/rpc_master.pb.go

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ func PTYHandler(c *gin.Context) {`
`93`	`93`
`94`	`94`	`defer func() {`
`95`	`95`	`logger.Logger(c).Info("gracefully stopping spawned tty...")`
`96`		`- if err := cliConn.Send(&pb.PTYServerMessage{Data: lo.ToPtr("bye!"), Done: true}); err != nil {`
	`96`	`+ if err := cliConn.Send(&pb.PTYServerMessage{Data: []byte("bye!"), Done: true}); err != nil {`
`97`	`97`	`logger.Logger(c).Warnf("failed to send close message: %s", err)`
`98`	`98`	`}`
`99`	`99`
`@@ -115,7 +115,7 @@ func PTYHandler(c *gin.Context) {`
`115`	`115`
`116`	`116`	`wg.Go(func() {`
`117`	`117`	`defer func() {`
`118`		`- if err := cliConn.Send(&pb.PTYServerMessage{Data: lo.ToPtr("bye!"), Done: true}); err != nil {`
	`118`	`+ if err := cliConn.Send(&pb.PTYServerMessage{Data: []byte("bye!"), Done: true}); err != nil {`
`119`	`119`	`logger.Logger(c).Warnf("failed to send close message: %s", err)`
`120`	`120`	`}`
`121`	`121`
`@@ -130,7 +130,7 @@ func PTYHandler(c *gin.Context) {`
`130`	`130`	`return`
`131`	`131`	`}`
`132`	`132`	`time.Sleep(keepalivePingTimeout / 2)`
`133`		`- if time.Now().Sub(lastPongTime) > keepalivePingTimeout {`
	`133`	`+ if time.Since(lastPongTime) > keepalivePingTimeout {`
`134`	`134`	`logger.Logger(c).Warn("failed to get response from ping, triggering disconnect now...")`
`135`	`135`	`return`
`136`	`136`	`}`
`@@ -151,10 +151,10 @@ func PTYHandler(c *gin.Context) {`
`151`	`151`	`cliMsg, err := cliConn.Recv()`
`152`	`152`	`if err != nil {`
`153`	`153`	`logger.Logger(c).Warnf("failed to read from client sender: %s", err)`
`154`		`- if err := webConn.WriteMessage(websocket.TextMessage, []byte("bye!")); err != nil {`
	`154`	`+ if err := webConn.WriteMessage(websocket.BinaryMessage, []byte("bye!")); err != nil {`
`155`	`155`	`logger.Logger(c).Warnf("failed to send termination message from client sender to xterm.js: %s", err)`
`156`	`156`	`}`
`157`		`- if err := cliConn.Send(&pb.PTYServerMessage{Data: lo.ToPtr("bye!"), Done: true}); err != nil {`
	`157`	`+ if err := cliConn.Send(&pb.PTYServerMessage{Data: []byte("bye!"), Done: true}); err != nil {`
`158`	`158`	`logger.Logger(c).Warnf("failed to send termination message from client sender to client: %s", err)`
`159`	`159`	`}`
`160`	`160`	`if err := webConn.Close(); err != nil {`
`@@ -184,7 +184,7 @@ func PTYHandler(c *gin.Context) {`
`184`	`184`	`if !connectionClosed {`
`185`	`185`	`logger.Logger(c).Warnf("failed to get next reader: %s", err)`
`186`	`186`	`}`
`187`		`- if err := cliConn.Send(&pb.PTYServerMessage{Data: lo.ToPtr("bye!"), Done: true}); err != nil {`
	`187`	`+ if err := cliConn.Send(&pb.PTYServerMessage{Data: []byte("bye!"), Done: true}); err != nil {`
`188`	`188`	`logger.Logger(c).Warnf("failed to send termination message from xterm.js to client: %s", err)`
`189`	`189`	`}`
`190`	`190`	`if err := webConn.Close(); err != nil {`
`@@ -201,7 +201,7 @@ func PTYHandler(c *gin.Context) {`
`201`	`201`
`202`	`202`	`msg := &pb.PTYServerMessage{}`
`203`	`203`	`if payload.Data != nil {`
`204`		`- msg.Data = lo.ToPtr(*payload.Data)`
	`204`	`+ msg.Data = []byte(*payload.Data)`
`205`	`205`	`}`
`206`	`206`	`if payload.Height != nil {`
`207`	`207`	`msg.Height = lo.ToPtr(int32(*payload.Height))`
`@@ -212,10 +212,10 @@ func PTYHandler(c *gin.Context) {`
`212`	`212`
`213`	`213`	`err = cliConn.Send(msg)`
`214`	`214`	`if err != nil {`
`215`		`- logger.Logger(c).Warn(fmt.Sprintf("failed to write bytes to tty: %s", err))`
	`215`	`+ logger.Logger(c).Warn(fmt.Sprintf("failed to write bytes to client: %s", err))`
`216`	`216`	`continue`
`217`	`217`	`}`
`218`		`- logger.Logger(c).Tracef("messageType [%v] bytes written to tty...", messageType)`
	`218`	`+ logger.Logger(c).Tracef("messageType [%v] bytes written to client...", messageType)`
`219`	`219`	`}`
`220`	`220`	`})`
`221`	`221`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@ import (`
`8`	`8`	`"github.com/VaalaCat/frp-panel/biz/master/server"`
`9`	`9`	`"github.com/VaalaCat/frp-panel/logger"`
`10`	`10`	`"github.com/VaalaCat/frp-panel/pb"`
`11`		`- "github.com/samber/lo"`
`12`	`11`	`)`
`13`	`12`
`14`	`13`	`func PTYConnect(sender pb.Master_PTYConnectServer) error {`
`@@ -42,7 +41,7 @@ func PTYConnect(sender pb.Master_PTYConnectServer) error {`
`42`	`41`
`43`	`42`	`Mgr().Add(msg.GetSessionId(), sender)`
`44`	`43`
`45`		`- if err := sender.Send(&pb.PTYServerMessage{Data: lo.ToPtr("ok")}); err != nil {`
	`44`	`+ if err := sender.Send(&pb.PTYServerMessage{Data: []byte("ok")}); err != nil {`
`46`	`45`	`return err`
`47`	`46`	`}`
`48`	`47`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ func PushClientStreamLog(sender pb.Master_PushClientStreamLogServer) error {`
`67`	`67`	`return fmt.Errorf("push client stream log cannot find client, id: [%s]", req.GetBase().GetClientId())`
`68`	`68`	`}`
`69`	`69`
`70`		`- ch <- req.GetLog()`
	`70`	`+ ch <- string(req.GetLog())`
`71`	`71`	`}`
`72`	`72`	`return nil`
`73`	`73`	`}`
`@@ -93,7 +93,7 @@ func PushServerStreamLog(sender pb.Master_PushServerStreamLogServer) error {`
`93`	`93`	`if !ok {`
`94`	`94`	`return fmt.Errorf("push server stream log cannot find server, id: [%s]", req.GetBase().GetServerId())`
`95`	`95`	`}`
`96`		`- ch <- req.GetLog()`
	`96`	`+ ch <- string(req.GetLog())`
`97`	`97`	`}`
`98`	`98`	`return nil`
`99`	`99`	`}`
Original file line number	Diff line number	Diff line change
`@@ -90,12 +90,12 @@ message PushProxyInfoResp {`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`message PushServerStreamLogReq {`
`93`		`- string log = 1;`
	`93`	`+ bytes log = 1;`
`94`	`94`	`ServerBase base = 255;`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`message PushClientStreamLogReq {`
`98`		`- string log = 1;`
	`98`	`+ bytes log = 1;`
`99`	`99`	`ClientBase base = 255;`
`100`	`100`	`}`
`101`	`101`
`@@ -105,7 +105,7 @@ message PushStreamLogResp {`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`message PTYClientMessage {`
`108`		`- optional string data = 1;`
	`108`	`+ optional bytes data = 1;`
`109`	`109`	`string session_id = 2;`
`110`	`110`	`bool done = 3;`
`111`	`111`	`oneof Base {`
`@@ -115,7 +115,7 @@ message PTYClientMessage {`
`115`	`115`	`}`
`116`	`116`
`117`	`117`	`message PTYServerMessage {`
`118`		`- optional string data = 1;`
	`118`	`+ optional bytes data = 1;`
`119`	`119`	`optional int32 height = 2;`
`120`	`120`	`optional int32 width = 3;`
`121`	`121`	`bool done = 4;`