修复rdp协议无法监控的bug

pkg/api/routes.go

@@ -115,7 +115,7 @@ func SetupRoutes() *echo.Echo {
 		sessions.DELETE("/:id/rm", SessionRmEndpoint)
 		sessions.DELETE("/:id", SessionDeleteEndpoint)
 		sessions.GET("/:id/recording", SessionRecordingEndpoint)
-		sessions.GET("/:id", SessionGetEndpoint)
+		sessions.GET("/:id/status", SessionGetStatusEndpoint)
 	}
 
 	resourceSharers := e.Group("/resource-sharers")

pkg/api/session.go

@@ -17,6 +17,7 @@ import (
 	"path"
 	"strconv"
 	"strings"
+	"sync"
 	"time"
 )
 
@@ -98,13 +99,19 @@ func SessionDiscontentEndpoint(c echo.Context) error {
 	return Success(c, nil)
 }
 
+var mutex sync.Mutex
+
 func CloseSessionById(sessionId string, code int, reason string) {
+	mutex.Lock()
+	defer mutex.Unlock()
 	observable, _ := global.Store.Get(sessionId)
 	if observable != nil {
+		logrus.Debugf("会话%v创建者退出", observable.Subject.Tunnel.UUID)
 		_ = observable.Subject.Tunnel.Close()
 		for i := 0; i < len(observable.Observers); i++ {
 			_ = observable.Observers[i].Tunnel.Close()
 			CloseWebSocket(observable.Observers[i].WebSocket, code, reason)
+			logrus.Debugf("强制踢出会话%v的观察者", observable.Observers[i].Tunnel.UUID)
 		}
 		CloseWebSocket(observable.Subject.WebSocket, code, reason)
 	}
@@ -515,11 +522,13 @@ func SessionRecordingEndpoint(c echo.Context) error {
 	return c.File(recording)
 }
 
-func SessionGetEndpoint(c echo.Context) error {
+func SessionGetStatusEndpoint(c echo.Context) error {
 	sessionId := c.Param("id")
 	session, err := model.FindSessionById(sessionId)
 	if err != nil {
 		return err
 	}
-	return Success(c, session)
+	return Success(c, H{
+		"status": session.Status,
+	})
 }

pkg/api/tunnel.go

@@ -2,7 +2,6 @@ package api
 
 import (
 	"errors"
-	"fmt"
 	"github.com/gorilla/websocket"
 	"github.com/labstack/echo/v4"
 	"github.com/sirupsen/logrus"
@@ -40,9 +39,6 @@ func TunEndpoint(c echo.Context) error {
 	intHeight, _ := strconv.Atoi(height)
 
 	configuration := guacd.NewConfiguration()
-	configuration.SetParameter("width", width)
-	configuration.SetParameter("height", height)
-	configuration.SetParameter("dpi", dpi)
 
 	propertyMap := model.FindAllPropertiesMap()
 
@@ -59,7 +55,14 @@ func TunEndpoint(c echo.Context) error {
 			return errors.New("会话未在线")
 		}
 		configuration.ConnectionID = connectionId
+		sessionId = session.ID
+		configuration.SetParameter("width", strconv.Itoa(session.Width))
+		configuration.SetParameter("height", strconv.Itoa(session.Height))
+		configuration.SetParameter("dpi", "96")
 	} else {
+		configuration.SetParameter("width", width)
+		configuration.SetParameter("height", height)
+		configuration.SetParameter("dpi", dpi)
 		session, err = model.FindSessionById(sessionId)
 		if err != nil {
 			CloseSessionById(sessionId, NotFoundSession, "会话不存在")
@@ -95,7 +98,6 @@ func TunEndpoint(c echo.Context) error {
 			configuration.SetParameter(guacd.DisableBitmapCaching, propertyMap[guacd.DisableBitmapCaching])
 			configuration.SetParameter(guacd.DisableOffscreenCaching, propertyMap[guacd.DisableOffscreenCaching])
 			configuration.SetParameter(guacd.DisableGlyphCaching, propertyMap[guacd.DisableGlyphCaching])
-			configuration.SetParameter("server-layout", "en-us-qwerty")
 			break
 		case "ssh":
 			if len(session.PrivateKey) > 0 && session.PrivateKey != "-" {
@@ -133,8 +135,6 @@ func TunEndpoint(c echo.Context) error {
 
 	addr := propertyMap[guacd.Host] + ":" + propertyMap[guacd.Port]
 
-	logrus.Infof("connect to %v with global: %+v", addr, configuration)
-
 	tunnel, err := guacd.NewTunnel(addr, configuration)
 	if err != nil {
 		if connectionId == "" {
@@ -150,6 +150,7 @@ func TunEndpoint(c echo.Context) error {
 	}
 
 	if len(session.ConnectionId) == 0 {
+
 		var observers []global.Tun
 		observable := global.Observable{
 			Subject:   &tun,
@@ -157,31 +158,33 @@ func TunEndpoint(c echo.Context) error {
 		}
 
 		global.Store.Set(sessionId, &observable)
-		// 创建新会话
-		session.ConnectionId = tunnel.UUID
-		session.Width = intWidth
-		session.Height = intHeight
-		session.Status = model.Connecting
-		session.Recording = configuration.GetParameter(guacd.RecordingPath)
 
-		if err := model.UpdateSessionById(&session, sessionId); err != nil {
+		sess := model.Session{
+			ConnectionId: tunnel.UUID,
+			Width:        intWidth,
+			Height:       intHeight,
+			Status:       model.Connecting,
+			Recording:    configuration.GetParameter(guacd.RecordingPath),
+		}
+		// 创建新会话
+		logrus.Debugf("创建新会话 %v", sess.ConnectionId)
+		if err := model.UpdateSessionById(&sess, sessionId); err != nil {
 			return err
 		}
 	} else {
-		// TODO 处理监控会话的退出
 		// 监控会话
 		observable, ok := global.Store.Get(sessionId)
 		if ok {
 			observers := append(observable.Observers, tun)
 			observable.Observers = observers
 			global.Store.Set(sessionId, observable)
+			logrus.Debugf("加入会话%v,当前观察者数量为：%v", session.ConnectionId, len(observers))
 		}
 	}
 
 	go func() {
 		for true {
 			instruction, err := tunnel.Read()
-			fmt.Printf("<- %v \n", string(instruction))
 			if err != nil {
 				if connectionId == "" {
 					CloseSessionById(sessionId, TunnelClosed, "远程连接关闭")