Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 18 additions & 7 deletions app/ui.js
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,7 @@ const UI = {
UI.connect();
} else {
autoconnect = false;
UI.updateVisualState('disconnected');
}

window.parent.postMessage({
Expand Down Expand Up @@ -509,6 +510,7 @@ const UI = {

addConnectionControlHandlers() {
UI.addClickHandle('noVNC_disconnect_button', UI.disconnect);
UI.addClickHandle('noVNC_cancel_reconnect_button', UI.cancelReconnect);

var connect_btn_el = document.getElementById("noVNC_connect_button_2");
if (typeof(connect_btn_el) != 'undefined' && connect_btn_el != null)
Expand Down Expand Up @@ -1956,6 +1958,9 @@ const UI = {
}

if (timeSinceLastActivityInS > idleDisconnectInS) {
UI.inhibitReconnect = true;
clearInterval(UI._sessionTimeoutInterval);
UI._sessionTimeoutInterval = null;
Log.Warn("Idle Disconnect reached, disconnecting rfb session...");
parent.postMessage({ action: 'idle_session_timeout', value: 'Idle session timeout exceeded'}, '*' );

Expand Down Expand Up @@ -2060,20 +2065,26 @@ const UI = {
UI.monitors = [];
UI.sortedMonitors = [];

if (!e.detail.clean) {
const gracefulServerDisconnect = e.detail.serverNotice?.graceful === true;
const shouldReconnect = wasConnected &&
UI.getSetting('reconnect', false) === true &&
!UI.inhibitReconnect &&
!gracefulServerDisconnect;

if (shouldReconnect) {
UI.updateVisualState('reconnecting');

const delay = parseInt(UI.getSetting('reconnect_delay'));
UI.reconnectCallback = setTimeout(UI.reconnect, delay);
return;
} else if (!e.detail.clean) {
UI.updateVisualState('disconnected');
if (wasConnected) {
UI.showStatus(_("Something went wrong, connection is closed"),
'error');
} else {
UI.showStatus(_("Failed to connect to server"), 'error');
}
} else if (UI.getSetting('reconnect', false) === true && !UI.inhibitReconnect) {
UI.updateVisualState('reconnecting');

const delay = parseInt(UI.getSetting('reconnect_delay'));
UI.reconnectCallback = setTimeout(UI.reconnect, delay);
return;
} else {
UI.updateVisualState('disconnected');
UI.showStatus(_("Disconnected"), 'normal');
Expand Down