Skip to content
Open
Show file tree
Hide file tree
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
22 changes: 22 additions & 0 deletions app/ui.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ const UI = {
inhibitReconnect: true,
reconnectCallback: null,
reconnectPassword: null,
firstReconnectTime: 0,

async start(options={}) {
UI.customSettings = options.settings || {};
Expand Down Expand Up @@ -961,6 +962,9 @@ const UI = {
UI.closePowerPanel();
}
},
resetFirstReconnection(){
UI.firstReconnectTime = 0;
},

/* ------^-------
* /POWER
Expand Down Expand Up @@ -1121,6 +1125,22 @@ const UI = {

reconnect() {
UI.reconnectCallback = null;
const maxTime = UI.getSetting('reconnect_max_time') ?? 600000; // 20s - 20 * 1000 ms

// Initialize first reconnect time if it's the first attempt
if (UI.firstReconnectTime === null) {
UI.firstReconnectTime = Date.now();
}
const elapsedTime = Date.now() - UI.firstReconnectTime;

// Check if we've exceeded the max reconnect time
if ((Date.now() - UI.firstReconnectTime) >= maxTime) {
// hiding the previous status message
UI.hideStatus();
UI.showStatus(_("Maximum reconnect attempts reached. Failed to connect to the server."), 'error', 1000*60*240); // Show for 4 hours
UI.updateVisualState('disconnected');
return;
}

// if reconnect has been disabled in the meantime, do nothing.
if (UI.inhibitReconnect) {
Expand Down Expand Up @@ -1154,6 +1174,8 @@ const UI = {
}
UI.showStatus(msg);
UI.updateVisualState('connected');
// Here we can reset the retry count
UI.resetFirstReconnection();

UI.updateBeforeUnload();

Expand Down
4 changes: 3 additions & 1 deletion defaults.json
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
{}
{
"reconnect_max_time": 600000
}