fix cpu 100% bug

pkg/proxy/parser.go

@@ -34,9 +34,6 @@ func newParser() *Parser {
 
 // Parse 解析用户输入输出, 拦截过滤用户输入输出
 type Parser struct {
-	cmdBuf    *bytes.Buffer
-	outputBuf *bytes.Buffer
-
 	userInputChan  chan []byte
 	userOutputChan chan []byte
 	srvInputChan   chan []byte
@@ -61,9 +58,6 @@ type Parser struct {
 }
 
 func (p *Parser) initial() {
-	p.cmdBuf = new(bytes.Buffer)
-	p.outputBuf = new(bytes.Buffer)
-
 	p.once = new(sync.Once)
 	p.lock = new(sync.RWMutex)
 
@@ -84,6 +78,8 @@ func (p *Parser) ParseStream() {
 		close(p.userOutputChan)
 		close(p.srvOutputChan)
 		close(p.cmdRecordChan)
+		_ = p.cmdOutputParser.Close()
+		_ = p.cmdInputParser.Close()
 		logger.Debug("Parser parse stream routine done")
 	}()
 	for {
@@ -96,7 +92,6 @@ func (p *Parser) ParseStream() {
 			}
 			b = p.ParseUserInput(b)
 			p.userOutputChan <- b
-
 		case b, ok := <-p.srvInputChan:
 			if !ok {
 				return
@@ -121,7 +116,7 @@ func (p *Parser) parseInputState(b []byte) []byte {
 		p.parseCmdInput()
 		if cmd, ok := p.IsCommandForbidden(); !ok {
 			fbdMsg := utils.WrapperWarn(fmt.Sprintf(i18n.T("Command `%s` is forbidden"), cmd))
-			p.outputBuf.WriteString(fbdMsg)
+			p.cmdOutputParser.WriteData([]byte(fbdMsg))
 			p.srvOutputChan <- []byte("\r\n" + fbdMsg)
 			return []byte{utils.CharCleanLine, '\r'}
 		}
@@ -138,16 +133,12 @@ func (p *Parser) parseInputState(b []byte) []byte {
 
 // parseCmdInput 解析命令的输入
 func (p *Parser) parseCmdInput() {
-	data := p.cmdBuf.Bytes()
-	p.command = p.cmdInputParser.Parse(data)
-	p.cmdBuf.Reset()
+	p.command = p.cmdInputParser.Parse()
 }
 
 // parseCmdOutput 解析命令输出
 func (p *Parser) parseCmdOutput() {
-	data := p.outputBuf.Bytes()
-	p.output = p.cmdOutputParser.Parse(data)
-	p.outputBuf.Reset()
+	p.output = p.cmdOutputParser.Parse()
 }
 
 // ParseUserInput 解析用户的输入
@@ -206,14 +197,12 @@ func (p *Parser) splitCmdStream(b []byte) {
 		return
 	}
 	if p.inputState {
-		p.cmdBuf.Write(b)
+		p.cmdInputParser.WriteData(b)
 		return
 	}
 	// outputBuff 最大存储1024， 否则可能撑爆内存
 	// 如果最后一个字符不是ascii, 可以截断了某个中文字符的一部分，为了安全继续添加
-	if p.outputBuf.Len() < 1024 || p.outputBuf.Bytes()[p.outputBuf.Len()-1] > 128 {
-		p.outputBuf.Write(b)
-	}
+		p.cmdOutputParser.WriteData(b)
 }
 
 // ParseServerOutput 解析服务器输出

pkg/proxy/parsercmd.go

 package proxy
 
 import (
-	"bytes"
+	"io"
 	"regexp"
 	"strings"
+	"sync"
 
+	"github.com/jumpserver/koko/pkg/logger"
 	"github.com/jumpserver/koko/pkg/utils"
 )
 
@@ -18,17 +20,56 @@ func NewCmdParser() *CmdParser {
 
 type CmdParser struct {
 	term *utils.Terminal
-	buf  *bytes.Buffer
+	reader io.ReadCloser
+	writer io.WriteCloser
+	currentLines []string
+	lock *sync.Mutex
+	maxLength int
+	currentLength int
+
+}
+
+func (cp *CmdParser) WriteData(p []byte) (int,error){
+	return cp.writer.Write(p)
+}
+
+func (cp *CmdParser) Write (p []byte) (int,error){
+	return len(p),nil
+}
+
+func (cp *CmdParser) Read(p []byte)(int,error){
+	return cp.reader.Read(p)
 }
 
-func (cp *CmdParser) Reset() {
-	cp.buf.Reset()
+func (cp *CmdParser) Close() error{
+	return cp.writer.Close()
 }
 
 func (cp *CmdParser) initial() {
-	cp.buf = new(bytes.Buffer)
-	cp.term = utils.NewTerminal(cp.buf, "")
+	cp.reader,cp.writer = io.Pipe()
+	cp.currentLines = make([]string,0)
+	cp.lock = new(sync.Mutex)
+	cp.maxLength = 1024
+	cp.currentLength = 0
+
+	cp.term = utils.NewTerminal(cp, "")
 	cp.term.SetEcho(false)
+	go func() {
+		logger.Debug("command Parser start")
+		defer logger.Debug("command Parser close")
+		for {
+			line, err := cp.term.ReadLine()
+			if err != nil{
+				break
+			}
+			cp.lock.Lock()
+			cp.currentLength += len(line)
+			if cp.currentLength < cp.maxLength {
+				cp.currentLines = append(cp.currentLines,line)
+			}
+			cp.lock.Unlock()
+		}
+	}()
 }
 
 func (cp *CmdParser) parsePS1(s string) string {
@@ -36,12 +77,13 @@ func (cp *CmdParser) parsePS1(s string) string {
 }
 
 // Parse 解析命令或输出
-func (cp *CmdParser) Parse(b []byte) string {
-	cp.buf.Write(b)
-	cp.buf.WriteString("\r")
-	lines, _ := cp.term.ReadLines()
-	cp.Reset()
-	output := strings.TrimSpace(strings.Join(lines, "\r\n"))
+func (cp *CmdParser) Parse() string {
+	cp.writer.Write([]byte("\r"))
+	cp.lock.Lock()
+	defer cp.lock.Unlock()
+	output := strings.TrimSpace(strings.Join(cp.currentLines, "\r\n"))
 	output = cp.parsePS1(output)
+	cp.currentLines = make([]string,0)
+	cp.currentLength = 0
 	return output
 }

pkg/utils/terminal.go

@@ -9,7 +9,6 @@ import (
 	"io"
 	"strconv"
 	"sync"
-	"time"
 	"unicode/utf8"
 )
 
@@ -796,7 +795,6 @@ func (t *Terminal) readLine() (line string, err error) {
 		for !lineOk {
 			var key rune
 			key, rest = bytesToKey(rest, t.pasteActive)
-			time.Sleep(10 * time.Millisecond)
 			if key == utf8.RuneError {
 				break
 			}