优化连接失败时的提示

pkg/api/routes.go

@@ -91,6 +91,7 @@ func SetupRoutes() *echo.Echo {
 		sessions.DELETE("/:id/rm", SessionRmEndpoint)
 		sessions.DELETE("/:id", SessionDeleteEndpoint)
 		sessions.GET("/:id/recording", SessionRecordingEndpoint)
+		sessions.GET("/:id", SessionGetEndpoint)
 	}
 
 	e.GET("/properties", PropertyGetEndpoint)

pkg/api/session.go

@@ -91,7 +91,7 @@ func SessionDiscontentEndpoint(c echo.Context) error {
 
 	split := strings.Split(sessionIds, ",")
 	for i := range split {
-		CloseSessionById(split[i], 2001, "管理员强制关闭了此次接入。")
+		CloseSessionById(split[i], ForcedDisconnect, "管理员强制关闭了此次接入。")
 	}
 	return Success(c, nil)
 }
@@ -105,10 +105,15 @@ func CloseSessionById(sessionId string, code int, reason string) {
 
 	global.Store.Del(sessionId)
 
+	if code == Normal {
+		return
+	}
 	session := model.Session{}
 	session.ID = sessionId
 	session.Status = model.Disconnected
 	session.DisconnectedTime = utils.NowJsonTime()
+	session.Code = code
+	session.Message = reason
 
 	model.UpdateSessionById(&session, sessionId)
 }
@@ -318,6 +323,15 @@ func SessionLsEndpoint(c echo.Context) error {
 			return errors.New("获取sftp客户端失败")
 		}
 
+		if tun.SftpClient == nil {
+			sftpClient, err := CreateSftpClient(session.AssetId)
+			if err != nil {
+				logrus.Errorf("创建sftp客户端失败：%v", err.Error())
+				return err
+			}
+			tun.SftpClient = sftpClient
+		}
+
 		fileInfos, err := tun.SftpClient.ReadDir(remoteDir)
 		if err != nil {
 			return err
@@ -479,3 +493,12 @@ func SessionRecordingEndpoint(c echo.Context) error {
 	logrus.Debugf("读取录屏文件：%s", recording)
 	return c.File(recording)
 }
+
+func SessionGetEndpoint(c echo.Context) error {
+	sessionId := c.Param("id")
+	session, err := model.FindSessionById(sessionId)
+	if err != nil {
+		return err
+	}
+	return Success(c, session)
+}

pkg/api/tunnel.go

@@ -11,6 +11,14 @@ import (
 	"strconv"
 )
 
+const (
+	Normal             int = 0
+	NotFoundSession    int = 2000
+	NewTunnelError     int = 2001
+	NewSftpClientError int = 2002
+	ForcedDisconnect   int = 2003
+)
+
 func TunEndpoint(c echo.Context) error {
 
 	ws, err := UpGrader.Upgrade(c.Response().Writer, c.Request(), nil)
@@ -38,12 +46,14 @@ func TunEndpoint(c echo.Context) error {
 	if len(connectionId) > 0 {
 		session, err = model.FindSessionByConnectionId(connectionId)
 		if err != nil {
+			CloseSessionById(sessionId, NotFoundSession, "会话不存在")
 			return err
 		}
 		configuration.ConnectionID = connectionId
 	} else {
 		session, err = model.FindSessionById(sessionId)
 		if err != nil {
+			CloseSessionById(sessionId, NotFoundSession, "会话不存在")
 			return err
 		}
 
@@ -95,13 +105,12 @@ func TunEndpoint(c echo.Context) error {
 			configuration.SetParameter(guacd.ColorScheme, propertyMap[guacd.ColorScheme])
 			break
 		case "vnc":
+			configuration.SetParameter("username", session.Username)
 			configuration.SetParameter("password", session.Password)
-			configuration.SetParameter("enable-sftp", "")
 			break
 		case "telnet":
 			configuration.SetParameter("username", session.Username)
 			configuration.SetParameter("password", session.Password)
-			configuration.SetParameter("enable-sftp", "")
 			break
 		}
 
@@ -115,6 +124,8 @@ func TunEndpoint(c echo.Context) error {
 
 	tunnel, err := guacd.NewTunnel(addr, configuration)
 	if err != nil {
+		CloseSessionById(sessionId, NewTunnelError, err.Error())
+		logrus.Printf("建立连接失败: %v", err.Error())
 		return err
 	}
 
@@ -129,35 +140,22 @@ func TunEndpoint(c echo.Context) error {
 		session.ConnectionId = tunnel.UUID
 		session.Width = intWidth
 		session.Height = intHeight
+		session.Status = model.Connecting
 		session.Recording = configuration.GetParameter(guacd.RecordingPath)
 
 		model.UpdateSessionById(&session, sessionId)
 	}
 
-	go func() {
-		sftpClient, err := CreateSftpClient(session.AssetId)
-		if err != nil {
-			CloseSessionById(sessionId, 2002, err.Error())
-			logrus.Errorf("创建sftp客户端失败：%v", err.Error())
-		}
-		item, ok := global.Store.Get(sessionId)
-		if ok {
-			item.SftpClient = sftpClient
-		}
-	}()
-
 	go func() {
 		for true {
 			instruction, err := tunnel.Read()
 			if err != nil {
-				CloseSessionById(sessionId, 523, err.Error())
-				logrus.Printf("WebSocket读取错误: %v", err)
+				CloseSessionById(sessionId, Normal, "")
 				break
 			}
 			err = ws.WriteMessage(websocket.TextMessage, instruction)
 			if err != nil {
-				CloseSessionById(sessionId, 523, err.Error())
-				logrus.Printf("WebSocket写入错误: %v", err)
+				CloseSessionById(sessionId, Normal, "")
 				break
 			}
 		}
@@ -166,14 +164,12 @@ func TunEndpoint(c echo.Context) error {
 	for true {
 		_, message, err := ws.ReadMessage()
 		if err != nil {
-			CloseSessionById(sessionId, 523, err.Error())
-			logrus.Printf("隧道读取错误: %v", err)
+			CloseSessionById(sessionId, Normal, "")
 			break
 		}
 		_, err = tunnel.WriteAndFlush(message)
 		if err != nil {
-			CloseSessionById(sessionId, 523, err.Error())
-			logrus.Printf("隧道写入错误: %v", err)
+			CloseSessionById(sessionId, Normal, "")
 			break
 		}
 	}