diff --git a/eslint.config.mjs b/eslint.config.mjs index 8efc252d1..1b6120ae1 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -109,6 +109,7 @@ const jsConfig = defineConfig([ initChangelog: 'readonly', sendNotification: 'readonly', monitorConnection: 'readonly', + ConnectionMonitorState: 'readonly', }, }, }, diff --git a/extensions-builtin/sdnext-kanvas b/extensions-builtin/sdnext-kanvas index 60e104343..9a76f2093 160000 --- a/extensions-builtin/sdnext-kanvas +++ b/extensions-builtin/sdnext-kanvas @@ -1 +1 @@ -Subproject commit 60e104343cdf7386fa4e838b8e6c104ee2cf437f +Subproject commit 9a76f209312dc88b267af126c60fc8b368678131 diff --git a/extensions-builtin/sdnext-modernui b/extensions-builtin/sdnext-modernui index 67f28a22b..0e6285443 160000 --- a/extensions-builtin/sdnext-modernui +++ b/extensions-builtin/sdnext-modernui @@ -1 +1 @@ -Subproject commit 67f28a22b9d052ee814d6878d18731f6015fe77b +Subproject commit 0e62854437546f4a99820d301e1ad91a34ff1638 diff --git a/javascript/monitor.js b/javascript/monitor.js index df0a94618..fdd6fc551 100644 --- a/javascript/monitor.js +++ b/javascript/monitor.js @@ -25,8 +25,8 @@ class ConnectionMonitorState { static setData({ online, data }) { if (online !== this.online) { this.online = online; - this.ts = new Date() - debug('monitorState', { online: ConnectionMonitorState.online, ts: ConnectionMonitorState.ts }) + this.ts = new Date(); + debug('monitorState', { online: ConnectionMonitorState.online, ts: ConnectionMonitorState.ts }); } if (data?.updated) this.version = data.updated; if (data?.commit) this.commit = data.commit; @@ -98,7 +98,7 @@ async function monitorConnection() { ConnectionMonitorState.startup = new Date(); ConnectionMonitorState.url = res.url.split('/sdapi')[0].replace('https:', 'wss:').replace('http:', 'ws:'); // update global url as ws need fqdn updateIndicator(true, data); - wsMonitorLoop(url); + wsMonitorLoop(); } catch { updateIndicator(false, data); setTimeout(monitorConnection, ConnectionMonitorState.delay); diff --git a/javascript/ui.js b/javascript/ui.js index b28dd84e9..0c973cc10 100644 --- a/javascript/ui.js +++ b/javascript/ui.js @@ -601,14 +601,14 @@ function monitorServerStatus() { document.close(); } -const delay = ms => new Promise((resolve) => setTimeout(resolve, ms)); +const delay = (ms) => new Promise((resolve) => setTimeout(resolve, ms)); // eslint-disable-line no-promise-executor-return -async function restartReload(initial=true) { +async function restartReload(initial = true) { document.body.style = 'background: #222222; font-size: 1rem; font-family:monospace; margin-top:20%; color:lightgray; text-align:center'; document.body.innerHTML = '