From aa17d5527dab23ec401ff2ed846085be580a193a Mon Sep 17 00:00:00 2001 From: Eric Date: Thu, 12 Dec 2024 11:14:34 +0800 Subject: [PATCH] perf: use guacamole rdp error message --- pkg/tunnel/conn.go | 4 ++++ ui/src/utils/status.js | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkg/tunnel/conn.go b/pkg/tunnel/conn.go index a4c8329..6577495 100644 --- a/pkg/tunnel/conn.go +++ b/pkg/tunnel/conn.go @@ -201,6 +201,10 @@ func (t *Connection) Run(ctx *gin.Context) (err error) { msg := fmt.Sprintf("required: %s", strings.Join(instruction.Args, ",")) logger.Infof("Session[%s] receive guacamole server required: %s", t, msg) requiredErr = guacd.NewInstruction(guacd.InstructionServerError, msg) + logger.Errorf("Session[%s] send guacamole server required err: %s", t, + requiredErr.String()) + _ = t.writeWsMessage([]byte(requiredErr.String())) + continue default: noNopTime = time.Now() } diff --git a/ui/src/utils/status.js b/ui/src/utils/status.js index 19d3d8d..49cf0f2 100644 --- a/ui/src/utils/status.js +++ b/ui/src/utils/status.js @@ -1,6 +1,5 @@ export const ErrorStatusCodes = { 256: 'GuaErrUnSupport', - 519: 'GuaErrUpstreamNotFound', 514: 'GuaErrUpStreamTimeout', 521: 'GuaErrSessionConflict', 769: 'GuaErrClientUnauthorized', @@ -65,5 +64,6 @@ export const GuacamoleErrMsg = { 'Manually disconnected.': 'GuacamoleErrManuallyDisconnected', 'Manually logged off.': 'GuacamoleErrManuallyLoggedOff', - 'Unsupported credential type requested.': 'GuacamoleErrUnsupportedCredentialTypeRequested' + 'Unsupported credential type requested.': 'GuacamoleErrUnsupportedCredentialTypeRequested', + 'Unable to connect to VNC server.': 'GuacamoleErrUnableToConnectToVNCServer' }