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 = '

Server shutdown in progress...

'; if (initial) await delay(10000); try { - const res = await authFetch(`${window.api}/progress?skip_current_image=true`) + const res = await authFetch(`${window.api}/progress?skip_current_image=true`); console.log('restartReload', res); if (res?.ok) { document.body.innerHTML = '

Server restart in progress...

'; diff --git a/package.json b/package.json index 5839bdfbf..0bfe694d5 100644 --- a/package.json +++ b/package.json @@ -23,6 +23,7 @@ "format-win": "venv\\scripts\\activate && pre-commit run --all-files", "eslint": "eslint javascript/", "eslint-ui": "cd extensions-builtin/sdnext-modernui && eslint . javascript/", + "eslint-kanvas": "cd extensions-builtin/sdnext-kanvas && eslint . src/", "ruff": ". venv/bin/activate && ruff check", "ruff-win": "venv\\scripts\\activate && ruff check", "pylint": ". venv/bin/activate && pylint *.py modules/ pipelines/ scripts/ extensions-builtin/ | grep -v '^*'", @@ -31,8 +32,8 @@ "pyright-win": "venv\\scripts\\activate && pyright --threads 4", "ty": ". venv/bin/activate && ty check", "ty-win": "venv\\scripts\\activate && ty check", - "lint": "npm run format && npm run eslint && npm run eslint-ui && npm run ruff && npm run pylint", - "lint-win": "npm run format-win && npm run eslint && npm run eslint-ui && npm run ruff-win && npm run pylint-win", + "lint": "npm run format && npm run eslint && npm run eslint-ui && npm run eslint-kanvas && npm run ruff && npm run pylint", + "lint-win": "npm run format-win && npm run eslint && npm run eslint-ui && npm run eslint-kanvas && npm run ruff-win && npm run pylint-win", "test": ". venv/bin/activate; python launch.py --debug --test", "todo": "grep -oIPR 'TODO.*' *.py modules/ pipelines/ | sort -u", "debug": "grep -ohIPR 'SD_.*?_DEBUG' *.py modules/ pipelines/ | sort -u" @@ -43,17 +44,16 @@ "@eslint/js": "^9.39.2", "@eslint/json": "^0.14.0", "@eslint/markdown": "^7.5.1", + "@google/genai": "^1.41.0", "@html-eslint/eslint-plugin": "^0.52.1", + "argparse": "^2.0.1", + "debug": "^4.4.3", "esbuild": "^0.27.2", "eslint": "^9.39.2", "eslint-config-airbnb-extended": "^3.0.0", "eslint-plugin-promise": "^7.2.1", - "@google/genai": "^1.41.0", "globals": "^17.0.0" }, - "dependencies": { - "argparse": "^2.0.1" - }, "//": { "disabled": { "typescript": "^5.9.3",