Add fleet reboot queue and fix dashboard landscape and Legend layout

This commit is contained in:
kzolotarev95 committed 2026-10-16 17:10:22 +04:00
1 parent 14025bcbe5
commit dfa16f3772
7 files changed
+554 -43

No files matched your search

+24 -1
View File
@@ -86,6 +86,22 @@ storage. Из вывода удаляются пароль и строки с и
«Подробнее», выровнены по центру на ПК и мобильном экране. «Подробнее», выровнены по центру на ПК и мобильном экране.
Пояснения к команде, паролю и остановке отделены от полей и кнопок одинаковыми Пояснения к команде, паролю и остановке отделены от полей и кнопок одинаковыми
отступами. Кнопка «Обновить все по очереди» зелёная. отступами. Кнопка «Обновить все по очереди» зелёная.
Рядом добавлена красная кнопка «Перезапустить все роутера». Она использует
тот же общий SSH-пароль, запускает отдельную последовательную очередь reboot
и не выполняет команду из поля обновления. Две очереди одновременно не работают.
Имя уточняется из `owrtremote.main.router_name` перед перезапуском каждого роутера.
Команда отправляется один раз в отдельном процессе с небольшой задержкой,
чтобы SSH успел передать подтверждение. Разрыв SSH сам по себе не считается успехом.
«Успешно» появляется после восстановления SSH и изменения Linux `boot_id`:
роутер действительно прошёл новую загрузку. Ожидание ограничено тремя минутами
на роутер. Ошибка пароля/команды, отсутствие туннеля или неподтверждённая загрузка
отображаются отдельно, затем очередь переходит к следующему роутеру.
«Остановить всё» прекращает очередь, но уже отправленный reboot не отменяется;
его неподтверждённый результат помечается явно. Временный каталог reboot в `/tmp`
исчезает при перезагрузке; повторный запрос не запускает эту задачу второй раз.
Пароль остаётся только в памяти worker, очищается в поле после отправки и не
попадает в результаты, БД или browser storage. API перезапуска требует владельца
и тот же CSRF/Origin-контроль, что обновление.
Рядом с «Вернуться в Hub» есть «Обновить информацию о роутерах»: после завершения Рядом с «Вернуться в Hub» есть «Обновить информацию о роутерах»: после завершения
очереди кнопка убирает её результаты и получает текущий список, имена и статусы. очереди кнопка убирает её результаты и получает текущий список, имена и статусы.
Во время работающей очереди она только обновляет статусы, не удаляя задачу. Во время работающей очереди она только обновляет статусы, не удаляя задачу.
@@ -112,7 +128,7 @@ powershell.exe -NoProfile -ExecutionPolicy Bypass -File "C:\Users\k.zolotarev95\
powershell.exe -NoProfile -ExecutionPolicy Bypass -File "C:\Users\k.zolotarev95\Documents\openwrt overlay\vps\deploy-router-updates.ps1" -Vps "root@193.233.82.38" -Action Rollback powershell.exe -NoProfile -ExecutionPolicy Bypass -File "C:\Users\k.zolotarev95\Documents\openwrt overlay\vps\deploy-router-updates.ps1" -Vps "root@193.233.82.38" -Action Rollback
``` ```
Резервная копия: `/opt/owrt-remote/owrt-remote-hub.py.bak-before-router-updates-form-style-v117`. Резервная копия: `/opt/owrt-remote/owrt-remote-hub.py.bak-before-router-reboot-all-v117`.
Не устанавливай/не откатывай Hub, пока его очередь работает. Не устанавливай/не откатывай Hub, пока его очередь работает.
## Проверки ## Проверки
@@ -136,3 +152,10 @@ Dropbear и обновление физического OpenWrt требуют
при длинном тексте, размеры полей/кнопок и отсутствие горизонтального выезда. при длинном тексте, размеры полей/кнопок и отсутствие горизонтального выезда.
Для ПК проверяется центрирование и ограничение ширины 1100 px на экранах Для ПК проверяется центрирование и ограничение ширины 1100 px на экранах
1280/1440/1920 px, а также прежнее расположение кнопок и полей. 1280/1440/1920 px, а также прежнее расположение кнопок и полей.
Проверки перезапуска используют подставной SSH и безопасный stub `reboot`:
ни тестовая Windows, ни реальные роутеры не перезагружаются. Проверяются новая
загрузка, обрыв SSH без повторной команды, rc ошибки, общий пароль, тайм-аут,
остановка и исключение двух одновременных очередей. Shell проходит BusyBox ash -n.
На экранах 320/390/1280 px проверяются красная кнопка, отдельный POST, очистка
пароля, восстановление просмотра очереди и счётчики. Реальную перезагрузку
OpenWrt и возврат обратного SSH-туннеля нужно проверить на устройстве.
+141
View File
@@ -39,6 +39,7 @@ class UpdatesTests(unittest.TestCase):
self.manager.LAUNCH_TIMEOUT = .01 self.manager.LAUNCH_TIMEOUT = .01
self.manager.SILENCE_TIMEOUT = .015 self.manager.SILENCE_TIMEOUT = .015
self.manager.STOP_TIMEOUT = .01 self.manager.STOP_TIMEOUT = .01
self.manager.REBOOT_TIMEOUT = .025
hub.save_auth_state({'username': 'owner', 'password': hub.password_digest('hub-password')}) hub.save_auth_state({'username': 'owner', 'password': hub.password_digest('hub-password')})
hub.save_sessions([]) hub.save_sessions([])
with self.app.conn() as conn: with self.app.conn() as conn:
@@ -54,6 +55,101 @@ class UpdatesTests(unittest.TestCase):
self.assertFalse(self.manager.thread.is_alive()) self.assertFalse(self.manager.thread.is_alive())
return self.manager.snapshot() return self.manager.snapshot()
def test_reboot_requires_new_boot_and_runs_sequentially_without_installer(self):
calls, polls = [], {}
old_boot, new_boot = 'a' * 8 + '-1111-1111-1111-' + 'a' * 12, 'b' * 8 + '-2222-2222-2222-' + 'b' * 12
def ssh(row, script, password):
calls.append((row['id'], script, password))
if 'OWRT_UPDATE_READY=1' in script:
return 'OWRT_UPDATE_READY=1\nOWRT_UPDATE_BOOT_ID=' + old_boot + '\nOWRT_UPDATE_NAME_TEXT=АНТОН ВПН\n'
if 'OWRT_REBOOT_RUNNER' in script:
return 'OWRT_UPDATE_STARTED=1\n'
polls[row['id']] = polls.get(row['id'], 0) + 1
# Neither rc=0 nor the same working SSH session proves a reboot.
return 'OWRT_UPDATE_BOOT_ID=' + (old_boot if polls[row['id']] == 1 else new_boot) + '\nOWRT_UPDATE_RC=0\n'
with mock.patch.object(self.manager, '_ssh', side_effect=ssh):
self.manager.start_reboot('shared-secret', 'request-reboot-success')
job = self.finish()
self.assertEqual(job['operation'], 'reboot')
self.assertEqual([item['state'] for item in job['items']], ['success', 'success'])
self.assertTrue(all(item['name'] == 'АНТОН ВПН' for item in job['items']))
self.assertEqual([row for row, _, _ in calls], ['main'] * 4 + ['node-2'] * 4)
self.assertTrue(all(password == 'shared-secret' for _, _, password in calls))
self.assertNotIn('shared-secret', json.dumps(job))
self.assertTrue(all('command.sh' not in script for _, script, _ in calls))
def test_reboot_disconnect_never_resends_and_only_new_boot_confirms_success(self):
launches, probes = [], 0
def ssh(row, script, password):
nonlocal probes
if 'OWRT_UPDATE_READY=1' in script:
return 'OWRT_UPDATE_READY=1\nOWRT_UPDATE_BOOT_ID=aaaaaaaa-1111-1111-1111-aaaaaaaaaaaa\n'
if 'OWRT_REBOOT_RUNNER' in script:
launches.append(row['id'])
raise RuntimeError('Connection closed by remote host')
probes += 1
if probes == 1:
raise RuntimeError('SSH: нет ответа за 10 секунд')
return 'OWRT_UPDATE_BOOT_ID=bbbbbbbb-2222-2222-2222-bbbbbbbbbbbb\n'
with mock.patch.object(self.manager, '_ssh', side_effect=ssh):
self.manager.start_reboot('', 'request-reboot-disconnect')
job = self.finish()
self.assertEqual(launches, ['main', 'node-2'])
self.assertTrue(all(item['state'] == 'success' for item in job['items']))
def test_reboot_unknown_or_rejected_continues_and_does_not_claim_success(self):
for failure in ['unchanged_boot', 'reboot_rc', 'wrong_password', 'missing_tool']:
with self.subTest(failure=failure):
launches = []
def ssh(row, script, password):
if 'OWRT_UPDATE_READY=1' in script:
if row['id'] == 'main' and failure == 'wrong_password':
raise RuntimeError('root@127.0.0.1: Permission denied (publickey,password).')
if row['id'] == 'main' and failure == 'missing_tool':
return 'OWRT_UPDATE_STATE=not_started\nOWRT_UPDATE_ERROR=Нет reboot; перезагрузка не запускалась\n'
return 'OWRT_UPDATE_READY=1\nOWRT_UPDATE_BOOT_ID=aaaaaaaa-1111-1111-1111-aaaaaaaaaaaa\n'
if 'OWRT_REBOOT_RUNNER' in script:
launches.append(row['id'])
return 'OWRT_UPDATE_STARTED=1\n'
if row['id'] == 'main':
return 'OWRT_UPDATE_BOOT_ID=aaaaaaaa-1111-1111-1111-aaaaaaaaaaaa\nOWRT_UPDATE_RC=' + ('1' if failure == 'reboot_rc' else '0') + '\nOWRT_UPDATE_OUTPUT_TEXT=\nreboot denied'
return 'OWRT_UPDATE_BOOT_ID=bbbbbbbb-2222-2222-2222-bbbbbbbbbbbb\n'
with mock.patch.object(self.manager, '_ssh', side_effect=ssh):
self.manager.start_reboot('shared-secret', 'request-reboot-' + failure)
job = self.finish()
self.assertEqual(job['items'][0]['state'], 'unknown' if failure == 'unchanged_boot' else 'error')
self.assertEqual(job['items'][1]['state'], 'success')
self.assertEqual(launches, ['node-2'] if failure in {'wrong_password', 'missing_tool'} else ['main', 'node-2'])
if failure == 'wrong_password':
self.assertIn('Общий SSH-пароль не принят', job['items'][0]['message'])
if failure == 'reboot_rc':
self.assertIn('rc=1', job['items'][0]['message'])
def test_reboot_cancel_duplicate_and_conflicting_queue(self):
entered, release = threading.Event(), threading.Event()
launches = []
def ssh(row, script, password):
if 'OWRT_UPDATE_READY=1' in script:
return 'OWRT_UPDATE_READY=1\nOWRT_UPDATE_BOOT_ID=aaaaaaaa-1111-1111-1111-aaaaaaaaaaaa\n'
if 'OWRT_REBOOT_RUNNER' in script:
launches.append(row['id']); entered.set(); release.wait(2)
return 'OWRT_UPDATE_STARTED=1\n'
return 'OWRT_UPDATE_BOOT_ID=aaaaaaaa-1111-1111-1111-aaaaaaaaaaaa\n'
with mock.patch.object(self.manager, '_ssh', side_effect=ssh):
task = self.manager.start_reboot('', 'request-reboot-cancel')
self.assertTrue(entered.wait(2))
self.assertEqual(task, self.manager.start_reboot('', 'request-reboot-cancel'))
with self.assertRaises(RuntimeError):
self.manager.start('echo installer', '', 'request-update-conflict')
with self.assertRaises(ValueError):
self.manager.start('echo installer', '', 'request-reboot-cancel')
self.manager.cancel(task)
release.set()
job = self.finish()
self.assertEqual(launches, ['main'])
self.assertEqual([item['state'] for item in job['items']], ['unknown', 'skipped'])
self.assertIn('reboot не отменяется', job['items'][0]['message'])
def test_sequential_names_failures_and_no_password_in_snapshot(self): def test_sequential_names_failures_and_no_password_in_snapshot(self):
calls = [] calls = []
def ssh(row, script, password): def ssh(row, script, password):
@@ -407,6 +503,12 @@ class UpdatesTests(unittest.TestCase):
payload = {'command': 'echo install', 'ssh_password': '', 'request_id': 'request-1234567897'} payload = {'command': 'echo install', 'ssh_password': '', 'request_id': 'request-1234567897'}
self.assertEqual(request('/api/router-updates/start', payload)[0], 403) self.assertEqual(request('/api/router-updates/start', payload)[0], 403)
self.assertEqual(request('/api/router-updates/refresh', {'id': ''})[0], 403) self.assertEqual(request('/api/router-updates/refresh', {'id': ''})[0], 403)
reboot_payload = {'ssh_password': '', 'request_id': 'request-api-reboot'}
self.assertEqual(request('/api/router-updates/reboot', reboot_payload, cookie='')[0], 401)
self.assertEqual(request('/api/router-updates/reboot', reboot_payload)[0], 403)
with mock.patch.object(hub.Handler, 'current_account_profile', return_value={'is_owner': False}):
self.assertEqual(request('/api/router-updates/reboot', reboot_payload, csrf=self.manager.csrf)[0], 403)
self.assertEqual(request('/api/router-updates/reboot', reboot_payload, csrf=self.manager.csrf, origin='https://attacker.example')[0], 403)
status, body = request('/api/router-updates') status, body = request('/api/router-updates')
self.assertEqual(status, 200) self.assertEqual(status, 200)
self.assertIn('online', json.loads(body)['routers'][0]) self.assertIn('online', json.loads(body)['routers'][0])
@@ -434,11 +536,50 @@ class UpdatesTests(unittest.TestCase):
self.assertIsNone(data['job']) self.assertIsNone(data['job'])
self.assertFalse(data['routers'][0]['online']) self.assertFalse(data['routers'][0]['online'])
self.assertEqual(data['routers'][0]['name'], 'АНТОН ВПН') self.assertEqual(data['routers'][0]['name'], 'АНТОН ВПН')
def reboot_ssh(row, script, password):
if 'OWRT_UPDATE_READY=1' in script:
return 'OWRT_UPDATE_READY=1\nOWRT_UPDATE_BOOT_ID=aaaaaaaa-1111-1111-1111-aaaaaaaaaaaa\n'
if 'OWRT_REBOOT_RUNNER' in script:
return 'OWRT_UPDATE_STARTED=1\n'
return 'OWRT_UPDATE_BOOT_ID=bbbbbbbb-2222-2222-2222-bbbbbbbbbbbb\n'
with mock.patch.object(self.manager, '_ssh', side_effect=reboot_ssh):
status, body = request('/api/router-updates/reboot', reboot_payload, csrf=self.manager.csrf)
self.assertEqual(status, 200)
self.assertTrue(all(item['state'] == 'success' for item in self.finish()['items']))
self.assertEqual(json.loads(request('/api/router-updates')[1])['job']['operation'], 'reboot')
finally: finally:
server.shutdown(); server.server_close(); thread.join(3) server.shutdown(); server.server_close(); thread.join(3)
class RouterTaskTests(unittest.TestCase): class RouterTaskTests(unittest.TestCase):
@unittest.skipUnless(os.name == 'nt', 'fixture uses bundled Windows POSIX shell')
def test_detached_reboot_receipt_single_execution_and_busybox_syntax(self):
# Fake reboot only: this test never reboots any host or contacts routers.
shell = r'C:\Program Files\Git\usr\bin\sh.exe'
busybox = ROOT / '.test-output/busybox/busybox64.exe'
with tempfile.TemporaryDirectory(prefix='owrt-reboot-shell-') as folder:
root = Path(folder)
task = root / 'task'
env = {**os.environ, 'PATH': folder + os.pathsep + str(Path(shell).parent) + os.pathsep + os.environ['PATH']}
root.joinpath('setsid').write_text('#!/usr/bin/perl\nuse POSIX (); POSIX::setsid() >= 0 or die; exec @ARGV; die;\n', encoding='ascii', newline='\n')
root.joinpath('reboot').write_text('#!/bin/sh\necho run >>"' + root.as_posix() + '/runs"\necho fake-reboot-error\nexit 7\n', encoding='ascii', newline='\n')
script = hub.router_reboot_launch_script('fixture', delay=0).replace('/tmp/owrt-remote-reboot-fixture', task.as_posix())
for _ in range(2):
result = subprocess.run([shell], input=script, capture_output=True, encoding='utf-8', env=env, timeout=10)
self.assertEqual(result.returncode, 0, result.stderr)
self.assertIn('OWRT_UPDATE_STARTED=1', result.stdout)
deadline = time.monotonic() + 5
while not (task / 'result').exists() and time.monotonic() < deadline:
time.sleep(.05)
self.assertEqual((task / 'result').read_text().strip(), '7')
self.assertEqual((task / 'output').read_text().strip(), 'fake-reboot-error')
self.assertEqual(root.joinpath('runs').read_text().splitlines(), ['run'])
runner = hub.router_reboot_launch_script('fixture').split("<<'OWRT_REBOOT_RUNNER'\n", 1)[1].split('\nOWRT_REBOOT_RUNNER', 1)[0]
for source in [hub.router_reboot_probe_script(), hub.router_reboot_probe_script('fixture'), script, runner]:
root.joinpath('syntax.sh').write_text(source, encoding='utf-8', newline='\n')
result = subprocess.run([str(busybox), 'ash', '-n', str(root / 'syntax.sh')], capture_output=True)
self.assertEqual(result.returncode, 0, result.stderr)
@unittest.skipUnless(os.name == 'nt', 'fixture uses bundled Windows POSIX shell') @unittest.skipUnless(os.name == 'nt', 'fixture uses bundled Windows POSIX shell')
def test_real_detached_task_failure_pipefail_bounded_output_and_cleanup(self): def test_real_detached_task_failure_pipefail_bounded_output_and_cleanup(self):
shell = r'C:\Program Files\Git\usr\bin\sh.exe' shell = r'C:\Program Files\Git\usr\bin\sh.exe'
+1 -1
View File
@@ -21,7 +21,7 @@ class RouterUpdatesDeployTests(unittest.TestCase):
self.target = self.root / 'hub.py' self.target = self.root / 'hub.py'
self.previous = b'print("previous Hub")\n' self.previous = b'print("previous Hub")\n'
self.target.write_bytes(self.previous) self.target.write_bytes(self.previous)
self.backup = self.root / 'hub.py.bak-before-router-updates-form-style-v117' self.backup = self.root / 'hub.py.bak-before-router-reboot-all-v117'
source = (ROOT / 'vps/deploy-router-updates.ps1').read_text(encoding='utf-8') source = (ROOT / 'vps/deploy-router-updates.ps1').read_text(encoding='utf-8')
self.script = source.split("$RemoteScript = @'\n", 1)[1].split("\n'@", 1)[0] self.script = source.split("$RemoteScript = @'\n", 1)[1].split("\n'@", 1)[0]
self.script = self.script.replace('/opt/owrt-remote/owrt-remote-hub.py', self.target.as_posix()) self.script = self.script.replace('/opt/owrt-remote/owrt-remote-hub.py', self.target.as_posix())
+44 -1
View File
@@ -18,7 +18,7 @@ with tempfile.TemporaryDirectory() as state:
out.joinpath('dashboard.html').write_text(hub.dashboard_html([],'owner',auth_bootstrap={'username':'owner','is_owner':True}),encoding='utf-8') out.joinpath('dashboard.html').write_text(hub.dashboard_html([],'owner',auth_bootstrap={'username':'owner','is_owner':True}),encoding='utf-8')
print(hub.RAW_REPO_BASE) print(hub.RAW_REPO_BASE)
`], {env:{...process.env,PYTHONIOENCODING:'utf-8'},encoding:'utf-8'}).trim(); `], {env:{...process.env,PYTHONIOENCODING:'utf-8'},encoding:'utf-8'}).trim();
let job = null, routers = [], starts = [], polls = 0; let job = null, routers = [], starts = [], reboots = [], polls = 0;
function data() {return {ok:true,job,routers};} function data() {return {ok:true,job,routers};}
function send(res, data) {res.setHeader('Content-Type','application/json');res.end(JSON.stringify(data));} function send(res, data) {res.setHeader('Content-Type','application/json');res.end(JSON.stringify(data));}
const server = http.createServer((req,res)=>{ const server = http.createServer((req,res)=>{
@@ -40,6 +40,14 @@ const server = http.createServer((req,res)=>{
send(res,data()); send(res,data());
});return; });return;
} }
if(url.pathname==='/api/router-updates/reboot') {
assert.equal(req.headers['x-router-update-csrf'],'test-csrf');
let body='';req.on('data',chunk=>body+=chunk);req.on('end',()=>{
const payload=JSON.parse(body);reboots.push(payload);
job={id:'test-reboot',request_id:payload.request_id,operation:'reboot',state:'running',cancel_requested:false,items:[{id:'node-5',name:'АНТОН ВПН',state:'running',message:'Ожидаю новую загрузку и SSH',output:''}]};
send(res,data());
});return;
}
if(url.pathname==='/api/router-updates/cancel') { if(url.pathname==='/api/router-updates/cancel') {
job.cancel_requested=true;job.state='finished';job.items[0].state='cancelled'; job.cancel_requested=true;job.state='finished';job.items[0].state='cancelled';
job.items[0].message='Остановка на роутере подтверждена';return send(res,data()); job.items[0].message='Остановка на роутере подтверждена';return send(res,data());
@@ -231,6 +239,41 @@ const server = http.createServer((req,res)=>{
await page.screenshot({path:path.join(root,'desktop-layout-'+width+'.png'),fullPage:true}); await page.screenshot({path:path.join(root,'desktop-layout-'+width+'.png'),fullPage:true});
await page.close(); await page.close();
} }
for(const width of [320,390,1280]) {
job=null;routers=[{id:'node-5',name:'АНТОН ВПН',online:true,last_seen:0,xray:'running'}];
const page=await browser.newPage({viewport:{width,height:900},isMobile:width<680,hasTouch:width<680});
await page.goto(`http://127.0.0.1:${server.address().port}/router-updates/`);
await page.waitForFunction(()=>!document.querySelector('#rebootAll').disabled);
assert.equal(await page.locator('#rebootAll').textContent(),'Перезапустить все роутера');
assert.equal(await page.locator('#rebootAll').evaluate(node=>getComputedStyle(node).backgroundColor),'rgb(185, 28, 28)');
// Reboot uses only the password, never the update command or its validation.
await page.locator('#command').fill('');
await page.locator('#sshPassword').fill('reboot-secret');
const updateCount=starts.length;
await page.locator('#rebootAll').click();
await page.waitForFunction(()=>document.getElementById('status').textContent==='Перезапуск выполняется');
assert.equal(reboots.at(-1).ssh_password,'reboot-secret');
assert.equal(Object.hasOwn(reboots.at(-1),'command'),false);
assert.equal(starts.length,updateCount);
assert.equal(await page.locator('#sshPassword').inputValue(),'');
assert.equal(await page.locator('#rebootAll').isDisabled(),true);
assert.equal(await page.locator('#start').isDisabled(),true);
assert.equal(await page.locator('#activeLabel').textContent(),'Перезапускаются');
await page.reload();
await page.waitForFunction(()=>document.getElementById('status').textContent==='Перезапуск выполняется');
assert.equal(await page.locator('#rebootAll').isDisabled(),true);
const rebootCount=reboots.length;
await page.locator('#cancel').click();
await page.waitForFunction(()=>document.getElementById('status').textContent==='Очередь перезапуска завершена');
assert.equal(reboots.length,rebootCount);
job.items[0].state='success';job.items[0].message='Роутер успешно перезагружен: новая загрузка и SSH подтверждены';
await page.waitForFunction(()=>document.querySelector('.router strong').textContent==='Успешно — АНТОН ВПН');
assert.equal(await page.locator('#countSuccess').textContent(),'1');
assert.equal(await page.evaluate(()=>JSON.stringify({...localStorage,...sessionStorage}).includes('reboot-secret')),false);
assert.equal(await page.evaluate(()=>document.documentElement.scrollWidth<=innerWidth),true);
await page.screenshot({path:path.join(root,'reboot-'+width+'.png'),fullPage:true});
await page.close();
}
job=null;routers=[]; job=null;routers=[];
const dashboard=await browser.newPage(); const dashboard=await browser.newPage();
await dashboard.goto(`http://127.0.0.1:${server.address().port}/`); await dashboard.goto(`http://127.0.0.1:${server.address().port}/`);
+149
View File
@@ -0,0 +1,149 @@
param(
[Parameter(Mandatory = $true)][ValidateNotNullOrEmpty()][string]$Vps,
[ValidateSet('Install', 'Rollback')][string]$Action = 'Install',
[switch]$PrepareOnly
)
$ErrorActionPreference = 'Stop'
$RepoRoot = Split-Path -Parent $PSScriptRoot
$UploadName = 'owrt-dashboard-layout-' + [guid]::NewGuid().ToString('N')
$StageRoot = Join-Path ([System.IO.Path]::GetTempPath()) $UploadName
$Utf8 = [System.Text.UTF8Encoding]::new($false)
$RemoteScript = @'
#!/bin/sh
set -eu
stage=/tmp/__UPLOAD_NAME__
target=/opt/owrt-remote/owrt-remote-hub.py
backup=/opt/owrt-remote/owrt-remote-hub.py.bak-before-dashboard-layout-v117
candidate=$target.new-__UPLOAD_NAME__
changed=0
show_failure() {
echo '--- owrt-remote status ---' >&2
systemctl --no-pager -l status owrt-remote >&2 || true
echo '--- owrt-remote journal ---' >&2
journalctl -u owrt-remote -n 80 --no-pager -l >&2 || true
}
cleanup() {
code=$?
trap - EXIT
if [ "$code" -ne 0 ]; then
echo "Remote step failed with rc=$code" >&2
show_failure
fi
if [ "$code" -ne 0 ] && [ "$changed" = 1 ] && [ -s "$stage/previous.py" ]; then
echo 'Restoring the previous Hub file...' >&2
cp -p "$stage/previous.py" "$candidate"
mv -f "$candidate" "$target"
systemctl restart owrt-remote || true
fi
rm -f "$candidate"
rm -rf "$stage"
exit "$code"
}
trap cleanup EXIT
test -s "$target"
python_bin=/opt/owrt-remote/venv/bin/python
[ -x "$python_bin" ] || python_bin=python3
if [ '__ACTION__' = Install ]; then
test -s "$stage/hub.py"
echo 'Validating candidate...'
"$python_bin" -m py_compile "$stage/hub.py"
"$python_bin" - "$stage/hub.py" <<'PY'
from pathlib import Path
import sys
source = Path(sys.argv[1]).read_text(encoding='utf-8')
required = (
"def dashboard_html(",
"(max-width:1024px) and (orientation:landscape) and (pointer:coarse)",
".modelMetricValue{{display:grid;grid-template-columns:minmax(0,1fr) auto;",
".modelMetricName{{display:block;max-width:100%;min-width:0;",
".modelLegendBadge{{position:relative;",
)
missing = [marker for marker in required if marker not in source]
if missing:
for marker in missing:
print('Missing marker:', repr(marker), file=sys.stderr)
raise SystemExit(1)
print('Candidate validation OK')
PY
if [ ! -e "$backup" ]; then
cp -p "$target" "$backup"
fi
source_file="$stage/hub.py"
else
test -s "$backup"
"$python_bin" -m py_compile "$backup"
source_file="$backup"
fi
cp -p "$target" "$stage/previous.py"
cp "$source_file" "$candidate"
chmod 0755 "$candidate"
changed=1
mv -f "$candidate" "$target"
echo 'Restarting owrt-remote...'
if ! systemctl restart owrt-remote; then
show_failure
exit 1
fi
healthy=0
for attempt in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15; do
if systemctl is-active --quiet owrt-remote && curl -fsS --max-time 5 http://127.0.0.1:8088/health; then
healthy=1
break
fi
sleep 2
done
if [ "$healthy" -ne 1 ]; then
echo 'Health check did not become ready.' >&2
show_failure
exit 1
fi
cmp "$source_file" "$target"
printf '\nBackup: %s\nDASHBOARD_LAYOUT_V117_%s_OK\n' "$backup" '__ACTION__'
'@
$RemoteScript = $RemoteScript.Replace('__UPLOAD_NAME__', $UploadName).Replace('__ACTION__', $Action)
try {
[System.IO.Directory]::CreateDirectory($StageRoot) | Out-Null
[System.IO.File]::WriteAllText(
(Join-Path $StageRoot 'run.sh'),
$RemoteScript.Replace("`r`n", "`n") + "`n",
$Utf8
)
if ($Action -eq 'Install') {
$Content = [System.IO.File]::ReadAllText((Join-Path $RepoRoot 'vps\owrt-remote-hub.py')).Replace("`r`n", "`n")
[System.IO.File]::WriteAllText((Join-Path $StageRoot 'hub.py'), $Content, $Utf8)
}
if ($PrepareOnly) {
Write-Host "Prepared only: $StageRoot"
return
}
& scp -O -r -- $StageRoot "${Vps}:/tmp/"
if ($LASTEXITCODE -ne 0) { throw 'Upload failed. VPS was not changed.' }
& ssh -T -o ConnectTimeout=10 $Vps "sh /tmp/$UploadName/run.sh"
if ($LASTEXITCODE -ne 0) { throw "$Action failed. See the output above; success was not confirmed." }
Write-Host "Dashboard layout fix $Action finished successfully."
}
finally {
if (-not $PrepareOnly) {
$Resolved = [System.IO.Path]::GetFullPath($StageRoot)
$Expected = [System.IO.Path]::GetFullPath((Join-Path ([System.IO.Path]::GetTempPath()) $UploadName))
if ($Resolved -ne $Expected -or (Split-Path -Leaf $Resolved) -ne $UploadName) {
throw 'Unsafe staging cleanup path.'
}
if (Test-Path -LiteralPath $Resolved) {
Remove-Item -LiteralPath $Resolved -Recurse -Force
}
}
}
+4 -1
View File
@@ -15,7 +15,7 @@ $RemoteScript = @'
set -eu set -eu
stage=/tmp/__UPLOAD_NAME__ stage=/tmp/__UPLOAD_NAME__
target=/opt/owrt-remote/owrt-remote-hub.py target=/opt/owrt-remote/owrt-remote-hub.py
backup=/opt/owrt-remote/owrt-remote-hub.py.bak-before-router-updates-form-style-v117 backup=/opt/owrt-remote/owrt-remote-hub.py.bak-before-router-reboot-all-v117
candidate=$target.new-__UPLOAD_NAME__ candidate=$target.new-__UPLOAD_NAME__
changed=0 changed=0
@@ -66,6 +66,9 @@ required = (
"def normalize_router_update_command(command):", "def normalize_router_update_command(command):",
"def router_update_cancel_script(task_id):", "def router_update_cancel_script(task_id):",
"def router_update_preflight_script():", "def router_update_preflight_script():",
"def router_reboot_launch_script(task_id, delay=3):",
"def start_reboot(self, password, request_id):",
"rebootAll",
"OWRT_UPDATE_NAME_TEXT=", "OWRT_UPDATE_NAME_TEXT=",
"OWRT_UPDATE_OUTPUT_TEXT=", "OWRT_UPDATE_OUTPUT_TEXT=",
"refreshRouters", "refreshRouters",
+191 -39
View File
@@ -5025,22 +5025,22 @@ input,select{{min-width:0;border:1px solid var(--line);border-radius:8px;padding
@keyframes bannerShine{{0%,45%{{transform:translateX(-120%)}}72%,100%{{transform:translateX(120%)}}}} @keyframes bannerShine{{0%,45%{{transform:translateX(-120%)}}72%,100%{{transform:translateX(120%)}}}}
.cardTop{{display:flex;align-items:flex-start;justify-content:space-between;gap:12px}} .cardTop{{display:flex;align-items:flex-start;justify-content:space-between;gap:12px}}
.status{{display:inline-flex;align-items:center;gap:7px;border-radius:999px;border:1px solid rgba(34,197,94,.36);background:rgba(34,197,94,.14);padding:7px 10px;font-weight:900;font-size:12px;color:#bbf7d0}}.status i{{width:8px;height:8px;border-radius:50%;background:var(--green);box-shadow:0 0 13px var(--green);animation:statusPulse 1.6s ease-in-out infinite}}.status.off{{border-color:rgba(251,113,133,.36);background:rgba(251,113,133,.12);color:#fecdd3}}.status.off i{{background:var(--red);box-shadow:0 0 13px var(--red);animation:offlinePulse 1.9s ease-in-out infinite}}.status.warn i{{background:var(--amber);box-shadow:0 0 13px var(--amber)}}@keyframes statusPulse{{0%,100%{{transform:scale(1);opacity:.75}}50%{{transform:scale(1.45);opacity:1}}}}@keyframes offlinePulse{{0%,100%{{transform:scale(1);opacity:.5}}50%{{transform:scale(1.42);opacity:1}}}}.nameRow{{display:inline-flex;align-items:center;justify-content:center;gap:8px;max-width:100%;margin-top:12px;vertical-align:top}}.nameRow::before{{content:"";display:block;flex:0 0 28px;width:28px;height:28px}}.name{{margin:0;font-size:19px;font-weight:900;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;max-width:220px}}.nameEditBtn{{position:static;display:inline-flex;align-items:center;justify-content:center;flex:0 0 28px;width:28px;height:28px;padding:0;border:1px solid rgba(251,191,36,.38);border-radius:999px;background:rgba(251,191,36,.12);color:#fde68a;box-shadow:inset 0 1px 0 rgba(255,255,255,.08);cursor:pointer;opacity:.5;transition:background .15s ease,border-color .15s ease,color .15s ease,transform .15s ease,opacity .15s ease}}.nameEditBtn:hover,.nameEditBtn:focus-visible{{opacity:1;border-color:rgba(34,211,238,.55);background:rgba(34,211,238,.14);color:#cffafe}}.nameEditBtn:active{{transform:scale(.96)}}.nameEditBtn svg{{width:13px;height:13px;display:block}}.nameEditBtn.disabled{{cursor:default;pointer-events:none;opacity:.22;border-color:rgba(255,255,255,.10);background:rgba(255,255,255,.05);color:rgba(255,255,255,.32)}}.mobilePanelToggle,.routerFormToggle{{display:none;width:100%;margin:14px 0 10px;border-radius:999px}}.routerFormWrap{{display:block}}[hidden],.headerActions[hidden],.routerStats[hidden],.routerFormWrap[hidden]{{display:none!important}}.metaLine{{margin-top:3px;color:var(--muted)}}.tagRow{{display:flex;gap:8px;flex-wrap:wrap;margin-top:12px}}.tag{{border:1px solid var(--line);border-radius:999px;padding:5px 9px;background:rgba(255,255,255,.06);color:#ddd6fe;font-size:12px;font-weight:750}} .status{{display:inline-flex;align-items:center;gap:7px;border-radius:999px;border:1px solid rgba(34,197,94,.36);background:rgba(34,197,94,.14);padding:7px 10px;font-weight:900;font-size:12px;color:#bbf7d0}}.status i{{width:8px;height:8px;border-radius:50%;background:var(--green);box-shadow:0 0 13px var(--green);animation:statusPulse 1.6s ease-in-out infinite}}.status.off{{border-color:rgba(251,113,133,.36);background:rgba(251,113,133,.12);color:#fecdd3}}.status.off i{{background:var(--red);box-shadow:0 0 13px var(--red);animation:offlinePulse 1.9s ease-in-out infinite}}.status.warn i{{background:var(--amber);box-shadow:0 0 13px var(--amber)}}@keyframes statusPulse{{0%,100%{{transform:scale(1);opacity:.75}}50%{{transform:scale(1.45);opacity:1}}}}@keyframes offlinePulse{{0%,100%{{transform:scale(1);opacity:.5}}50%{{transform:scale(1.42);opacity:1}}}}.nameRow{{display:inline-flex;align-items:center;justify-content:center;gap:8px;max-width:100%;margin-top:12px;vertical-align:top}}.nameRow::before{{content:"";display:block;flex:0 0 28px;width:28px;height:28px}}.name{{margin:0;font-size:19px;font-weight:900;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;max-width:220px}}.nameEditBtn{{position:static;display:inline-flex;align-items:center;justify-content:center;flex:0 0 28px;width:28px;height:28px;padding:0;border:1px solid rgba(251,191,36,.38);border-radius:999px;background:rgba(251,191,36,.12);color:#fde68a;box-shadow:inset 0 1px 0 rgba(255,255,255,.08);cursor:pointer;opacity:.5;transition:background .15s ease,border-color .15s ease,color .15s ease,transform .15s ease,opacity .15s ease}}.nameEditBtn:hover,.nameEditBtn:focus-visible{{opacity:1;border-color:rgba(34,211,238,.55);background:rgba(34,211,238,.14);color:#cffafe}}.nameEditBtn:active{{transform:scale(.96)}}.nameEditBtn svg{{width:13px;height:13px;display:block}}.nameEditBtn.disabled{{cursor:default;pointer-events:none;opacity:.22;border-color:rgba(255,255,255,.10);background:rgba(255,255,255,.05);color:rgba(255,255,255,.32)}}.mobilePanelToggle,.routerFormToggle{{display:none;width:100%;margin:14px 0 10px;border-radius:999px}}.routerFormWrap{{display:block}}[hidden],.headerActions[hidden],.routerStats[hidden],.routerFormWrap[hidden]{{display:none!important}}.metaLine{{margin-top:3px;color:var(--muted)}}.tagRow{{display:flex;gap:8px;flex-wrap:wrap;margin-top:12px}}.tag{{border:1px solid var(--line);border-radius:999px;padding:5px 9px;background:rgba(255,255,255,.06);color:#ddd6fe;font-size:12px;font-weight:750}}
.metrics{{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));gap:8px;margin-top:14px}}.metric{{display:flex;flex-direction:column;align-items:center;justify-content:center;text-align:center;border:1px solid var(--line);border-radius:8px;background:rgba(255,255,255,.055);padding:9px}}.metric.span2{{grid-column:span 2}}.metric.temp-ok strong,.metric.flash-ok strong,.metric.memory-ok strong{{color:#bbf7d0}}.metric.temp-warn strong,.metric.flash-warn strong,.metric.memory-warn strong{{color:#fde68a}}.metric.temp-bad strong,.metric.flash-bad strong,.metric.memory-bad strong{{color:#fecdd3}}.metric>span{{display:block;width:100%;color:var(--muted);font-size:11px;text-align:center}}.metric strong{{display:block;width:100%;margin-top:2px;font-size:14px;word-break:break-word;text-align:center}}.metric.metric-compact strong{{font-size:14px;line-height:1.3;white-space:pre-line;word-break:normal}}.metric.temp-unavailable strong{{font-size:14px;line-height:1.3;white-space:pre-line;word-break:normal;color:#f3e8ff}}.metric.model-metric strong{{margin-top:5px}}.modelMetricValue{{position:relative;display:flex;align-items:center;justify-content:center;width:100%;max-width:100%}}.modelLegendSpacer{{display:none}}.modelMetricName{{display:block;max-width:calc(100% - 72px);min-width:0;color:#ffffff;font-size:14px;line-height:1.2;text-align:center;white-space:nowrap}}.modelLegendBadge{{position:absolute;right:0;top:50%;transform:translateY(-50%);display:inline-flex;align-items:center;justify-content:center;min-height:20px;min-width:62px;padding:0 8px;border:1px solid rgba(34,211,238,.38);border-radius:999px;background:linear-gradient(120deg,rgba(34,211,238,.24),rgba(59,130,246,.16),rgba(168,85,247,.14));color:#e0f7ff;font-size:8px;font-weight:900;line-height:1;letter-spacing:.10em;text-transform:uppercase;box-shadow:0 8px 18px rgba(34,211,238,.14),inset 0 1px 0 rgba(255,255,255,.12);overflow:hidden;white-space:nowrap}}.modelLegendBadge::before{{content:"";position:absolute;inset:0;background:linear-gradient(90deg,transparent,rgba(255,255,255,.22),transparent);transform:translateX(-120%);animation:bannerShine 6.2s ease-in-out infinite}}.modelLegendBadge span{{position:relative;display:block}}.actionToggle{{display:none}}.actions{{display:flex;gap:8px;flex-wrap:wrap;margin-top:14px}}.notesPreview{{margin-top:10px;padding:10px 12px;border:1px solid rgba(34,211,238,.16);border-radius:10px;background:linear-gradient(180deg,rgba(255,255,255,.06),rgba(255,255,255,.03)),rgba(18,14,30,.62);color:#ddd6fe;font-size:12px;line-height:1.45}}.notesPreview strong{{color:#f5f3ff}}.notesPreview span{{color:#c4b5fd}}.wolPanel,.trafficPanel{{display:grid;gap:10px;margin-top:12px;padding:12px;border:1px solid rgba(34,211,238,.20);border-radius:12px;background:linear-gradient(180deg,rgba(255,255,255,.08),rgba(255,255,255,.045)),rgba(18,14,30,.82);text-align:left}}.notesPanel{{gap:12px}}.notesEditor{{display:grid;gap:8px}}.notesArea{{width:100%;min-height:128px;padding:12px 13px;border:1px solid rgba(34,211,238,.24);border-radius:10px;background:linear-gradient(180deg,rgba(52,38,74,.96),rgba(34,26,52,.96));color:#f5f3ff;outline:none;box-shadow:inset 0 1px 0 rgba(255,255,255,.04);resize:vertical;font:13px/1.45 ui-monospace,SFMono-Regular,Consolas,monospace}}.notesArea:focus{{border-color:rgba(34,211,238,.60);box-shadow:0 0 0 3px rgba(34,211,238,.12),inset 0 1px 0 rgba(255,255,255,.05)}}.notesArea[readonly]{{opacity:.88;cursor:default}}.notesMeta{{display:flex;align-items:center;justify-content:space-between;gap:10px;color:#c4b5fd;font-size:12px;line-height:1.35}}.notesMeta.bad{{color:#fecdd3}}.notesMeta.ok{{color:#bbf7d0}}.notesMeta span:last-child{{white-space:nowrap}}.notesActions{{display:flex;gap:8px;flex-wrap:wrap}}.trafficPanel{{gap:12px}}.wolPanel[hidden],.trafficPanel[hidden]{{display:none!important}}.wolHeader{{display:flex;align-items:center;justify-content:space-between;gap:8px}}.wolTitle{{margin:0;color:#f3e8ff;font-size:13px;font-weight:900}}.wolMeta{{min-height:16px;color:#c4b5fd;font-size:12px;line-height:1.35}}.wolMeta.bad{{color:#fecdd3}}.wolControls,.trafficControls{{display:grid;grid-template-columns:minmax(0,1.15fr) minmax(0,.95fr) auto;gap:8px;align-items:end}}.wolField{{display:grid;gap:6px;min-width:0;color:#ddd6fe;font-size:11px;font-weight:850}}.wolField select,.wolField input{{width:100%;min-width:0;min-height:38px;padding:0 12px;border:1px solid rgba(34,211,238,.24);border-radius:10px;background:linear-gradient(180deg,rgba(52,38,74,.96),rgba(34,26,52,.96));color:#f5f3ff;outline:none;box-shadow:inset 0 1px 0 rgba(255,255,255,.04)}}.wolField select option{{background:#221a34;color:#f5f3ff}}.wolField select option:checked{{background:#3b82f6;color:#ffffff}}.wolField select:focus,.wolField input:focus{{border-color:rgba(34,211,238,.60);box-shadow:0 0 0 3px rgba(34,211,238,.12),inset 0 1px 0 rgba(255,255,255,.05)}}.wolField input::placeholder{{color:rgba(221,214,254,.52)}}.wolControls .btn,.wolControls button,.trafficConLine truncated .metrics{{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));gap:8px;margin-top:14px}}.metric{{display:flex;flex-direction:column;align-items:center;justify-content:center;text-align:center;border:1px solid var(--line);border-radius:8px;background:rgba(255,255,255,.055);padding:9px}}.metric.span2{{grid-column:span 2}}.metric.temp-ok strong,.metric.flash-ok strong,.metric.memory-ok strong{{color:#bbf7d0}}.metric.temp-warn strong,.metric.flash-warn strong,.metric.memory-warn strong{{color:#fde68a}}.metric.temp-bad strong,.metric.flash-bad strong,.metric.memory-bad strong{{color:#fecdd3}}.metric>span{{display:block;width:100%;color:var(--muted);font-size:11px;text-align:center}}.metric strong{{display:block;width:100%;margin-top:2px;font-size:14px;word-break:break-word;text-align:center}}.metric.metric-compact strong{{font-size:14px;line-height:1.3;white-space:pre-line;word-break:normal}}.metric.temp-unavailable strong{{font-size:14px;line-height:1.3;white-space:pre-line;word-break:normal;color:#f3e8ff}}.metric.model-metric strong{{margin-top:5px}}.modelMetricValue{{display:grid;grid-template-columns:minmax(0,1fr) auto;align-items:center;gap:8px;width:100%;max-width:100%}}.modelLegendSpacer{{display:none}}.modelMetricName{{display:block;max-width:100%;min-width:0;color:#ffffff;font-size:14px;line-height:1.3;text-align:center;white-space:normal;word-break:normal;overflow-wrap:anywhere}}.modelLegendBadge{{position:relative;display:inline-flex;align-items:center;justify-content:center;min-height:20px;min-width:62px;padding:0 8px;border:1px solid rgba(34,211,238,.38);border-radius:999px;background:linear-gradient(120deg,rgba(34,211,238,.24),rgba(59,130,246,.16),rgba(168,85,247,.14));color:#e0f7ff;font-size:8px;font-weight:900;line-height:1;letter-spacing:.10em;text-transform:uppercase;box-shadow:0 8px 18px rgba(34,211,238,.14),inset 0 1px 0 rgba(255,255,255,.12);overflow:hidden;white-space:nowrap}}.modelLegendBadge::before{{content:"";position:absolute;inset:0;background:linear-gradient(90deg,transparent,rgba(255,255,255,.22),transparent);transform:translateX(-120%);animation:bannerShine 6.2s ease-in-out infinite}}.modelLegendBadge span{{position:relative;display:block}}.actionToggle{{display:none}}.actions{{display:flex;gap:8px;flex-wrap:wrap;margin-top:14px}}.notesPreview{{margin-top:10px;padding:10px 12px;border:1px solid rgba(34,211,238,.16);border-radius:10px;background:linear-gradient(180deg,rgba(255,255,255,.06),rgba(255,255,255,.03)),rgba(18,14,30,.62);color:#ddd6fe;font-size:12px;line-height:1.45}}.notesPreview strong{{color:#f5f3ff}}.notesPreview span{{color:#c4b5fd}}.wolPanel,.trafficPanel{{display:grid;gap:10px;margin-top:12px;padding:12px;border:1px solid rgba(34,211,238,.20);border-radius:12px;background:linear-gradient(180deg,rgba(255,255,255,.08),rgba(255,255,255,.045)),rgba(18,14,30,.82);text-align:left}}.notesPanel{{gap:12px}}.notesEditor{{display:grid;gap:8px}}.notesArea{{width:100%;min-height:128px;padding:12px 13px;border:1px solid rgba(34,211,238,.24);border-radius:10px;background:linear-gradient(180deg,rgba(52,38,74,.96),rgba(34,26,52,.96));color:#f5f3ff;outline:none;box-shadow:inset 0 1px 0 rgba(255,255,255,.04);resize:vertical;font:13px/1.45 ui-monospace,SFMono-Regular,Consolas,monospace}}.notesArea:focus{{border-color:rgba(34,211,238,.60);box-shadow:0 0 0 3px rgba(34,211,238,.12),inset 0 1px 0 rgba(255,255,255,.05)}}.notesArea[readonly]{{opacity:.88;cursor:default}}.notesMeta{{display:flex;align-items:center;justify-content:space-between;gap:10px;color:#c4b5fd;font-size:12px;line-height:1.35}}.notesMeta.bad{{color:#fecdd3}}.notesMeta.ok{{color:#bbf7d0}}.notesMeta span:last-child{{white-space:nowrap}}.notesActions{{display:flex;gap:8px;flex-wrap:wrap}}.trafficPanel{{gap:12px}}.wolPanel[hidden],.trafficPanel[hidden]{{display:none!important}}.wolHeader{{display:flex;align-items:center;justify-content:space-between;gap:8px}}.wolTitle{{margin:0;color:#f3e8ff;font-size:13px;font-weight:900}}.wolMeta{{min-height:16px;color:#c4b5fd;font-size:12px;line-height:1.35}}.wolMeta.bad{{color:#fecdd3}}.wolControls,.trafficControls{{display:grid;grid-template-columns:minmax(0,1.15fr) minmax(0,.95fr) auto;gap:8px;align-items:end}}.wolField{{display:grid;gap:6px;min-width:0;color:#ddd6fe;font-size:11px;font-weight:850}}.wolField select,.wolField input{{width:100%;min-width:0;min-height:38px;padding:0 12px;border:1px solid rgba(34,211,238,.24);border-radius:10px;background:linear-gradient(180deg,rgba(52,38,74,.96),rgba(34,26,52,.96));color:#f5f3ff;outline:none;box-shadow:inset 0 1px 0 rgba(255,255,255,.04)}}.wolField select option{{background:#221a34;color:#f5f3ff}}.wolField select option:checked{{background:#3b82f6;color:#ffffff}}.wolField select:focus,.wolField input:focus{{border-color:rgba(34,211,238,.60);box-shadow:0 0 0 3px rgba(34,211,238,.12),inset 0 1px 0 rgba(255,255,255,.05)}}.wolField input::placeholder{{color:rgba(221,214,254,.52)}}.wolControls .btn,.wolControls button,.trafficControls .Line truncated
.wolControls .btn[disabled],.wolControls button[disabled]{{opacity:.48;cursor:not-allowed;filter:saturate(.62)}} .wolControls .btn[disabled],.wolControls button[disabled]{{opacity:.48;cursor:not-allowed;filter:saturate(.62)}}
.trafficControls{{grid-template-columns:repeat(2,minmax(0,1fr))}}.trafficPasswordField{{grid-column:1}}.trafficStatusField{{grid-column:2}}.trafficActionBtn{{width:100%;min-width:0;padding:8px 8px;font-size:10px;letter-spacing:.01em;white-space:nowrap}}.trafficStatusField .wolMeta{{font-size:10px;line-height:1.22}}.trafficDangerBtn{{border-color:rgba(251,113,133,.34)!important;background:linear-gradient(180deg,rgba(251,113,133,.18),rgba(251,113,133,.08))!important;color:#ffe4e6!important}}.trafficDangerBtn:hover{{border-color:rgba(251,113,133,.54)!important;background:linear-gradient(180deg,rgba(251,113,133,.24),rgba(251,113,133,.12))!important}} .trafficControls{{grid-template-columns:repeat(2,minmax(0,1fr))}}.trafficPasswordField{{grid-column:1}}.trafficStatusField{{grid-column:2}}.trafficActionBtn{{width:100%;min-width:0;padding:8px 8px;font-size:10px;letter-spacing:.01em;white-space:nowrap}}.trafficStatusField .wolMeta{{font-size:10px;line-height:1.22}}.trafficDangerBtn{{border-color:rgba(251,113,133,.34)!important;background:linear-gradient(180deg,rgba(251,113,133,.18),rgba(251,113,133,.08))!important;color:#ffe4e6!important}}.trafficDangerBtn:hover{{border-color:rgba(251,113,133,.54)!important;background:linear-gradient(180deg,rgba(251,113,133,.24),rgba(251,113,133,.12))!important}}
.wolField input,.wolPickerToggle{{width:100%;min-width:0;min-height:38px;padding:0 12px;border:1px solid rgba(34,211,238,.24);border-radius:10px;background:linear-gradient(180deg,rgba(52,38,74,.96),rgba(34,26,52,.96));color:#f5f3ff;outline:none;box-shadow:inset 0 1px 0 rgba(255,255,255,.04)}}.wolField input:focus,.wolPickerToggle:focus,.wolPickerToggle:focus-visible{{border-color:rgba(34,211,238,.60);box-shadow:0 0 0 3px rgba(34,211,238,.12),inset 0 1px 0 rgba(255,255,255,.05)}}.wolDeviceField{{grid-column:1/-1;width:100%}}.wolPickerToggle{{display:flex;align-items:center;justify-content:space-between;gap:10px;text-align:left;cursor:pointer;touch-action:manipulation}}.wolPickerToggle[disabled]{{opacity:.55;cursor:not-allowed}}.wolPickerValue{{display:grid;gap:2px;min-width:0;flex:1}}.wolPickerValue strong{{display:block;min-width:0;color:#f5f3ff;font-size:13px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}}.wolPickerValue small{{display:block;min-width:0;color:#c4b5fd;font-size:11px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}}.wolPickerChevron{{flex:0 0 auto;color:#c4b5fd;font-size:15px;line-height:1}}.wolPickerList{{display:grid;grid-template-columns:minmax(0,1fr);grid-auto-rows:max-content;align-items:stretch;gap:8px;width:100%;max-height:min(44svh,360px);overflow-y:auto;overflow-x:hidden;padding:8px;border:1px solid rgba(34,211,238,.24);border-radius:12px;background:rgba(17,12,29,.88);box-shadow:inset 0 1px 0 rgba(255,255,255,.04);scrollbar-width:thin;scrollbar-gutter:stable both-edges;overscroll-behavior:contain}}.wolPickerList::-webkit-scrollbar{{width:8px}}.wolPickerList::-webkit-scrollbar-thumb{{background:rgba(167,139,250,.32);border-radius:999px}}.wolPickerList::-webkit-scrollbar-track{{background:transparent}}.wolDeviceBtn{{display:grid;grid-template-columns:minmax(0,1fr);align-content:start;gap:3px;width:100%;max-width:100%;min-width:0;min-height:58px;height:auto;padding:10px 12px;border:1px solid rgba(167,139,250,.18);border-radius:10px;background:rgba(255,255,255,.04);color:#f5f3ff;text-align:left;cursor:pointer;touch-action:manipulation;transition:border-color .15s ease,background .15s ease,transform .15s ease}}.wolDeviceBtn:hover,.wolDeviceBtn:focus-visible{{border-color:rgba(34,211,238,.48);background:rgba(34,211,238,.12)}}.wolDeviceBtn:active{{transform:scale(.99)}}.wolDeviceBtn.active{{border-color:rgba(59,130,246,.62);background:rgba(59,130,246,.18);box-shadow:0 0 0 1px rgba(59,130,246,.16)}}.wolDeviceName{{display:block;min-width:0;max-width:100%;color:#f5f3ff;font-size:13px;font-weight:800;line-height:1.3;white-space:normal;overflow-wrap:anywhere;word-break:break-word}}.wolDeviceMeta{{display:block;min-width:0;max-width:100%;color:#c4b5fd;font-size:11px;line-height:1.35;white-space:normal;overflow-wrap:anywhere;word-break:break-word}}.wolDeviceMeta:empty{{display:none}}.wolPickerEmpty{{padding:14px 12px;border:1px dashed rgba(167,139,250,.20);border-radius:10px;background:rgba(255,255,255,.03);color:#c4b5fd;text-align:center}}.metric.memory-ok strong,.metric.flash-ok strong,.metric.memory-warn strong,.metric.flash-warn strong,.metric.memory-bad strong,.metric.flash-bad strong{{color:#f3e8ff}}.metric.memory-ok .metric-accent,.metric.flash-ok .metric-accent{{color:#bbf7d0}}.metric.memory-warn .metric-accent,.metric.flash-warn .metric-accent{{color:#fde68a}}.metric.memory-bad .metric-accent,.metric.flash-bad .metric-accent{{color:#fecdd3}}.metric-line{{display:block}}.metric-accent{{font-weight:inherit}} .wolField input,.wolPickerToggle{{width:100%;min-width:0;min-height:38px;padding:0 12px;border:1px solid rgba(34,211,238,.24);border-radius:10px;background:linear-gradient(180deg,rgba(52,38,74,.96),rgba(34,26,52,.96));color:#f5f3ff;outline:none;box-shadow:inset 0 1px 0 rgba(255,255,255,.04)}}.wolField input:focus,.wolPickerToggle:focus,.wolPickerToggle:focus-visible{{border-color:rgba(34,211,238,.60);box-shadow:0 0 0 3px rgba(34,211,238,.12),inset 0 1px 0 rgba(255,255,255,.05)}}.wolDeviceField{{grid-column:1/-1;width:100%}}.wolPickerToggle{{display:flex;align-items:center;justify-content:space-between;gap:10px;text-align:left;cursor:pointer;touch-action:manipulation}}.wolPickerToggle[disabled]{{opacity:.55;cursor:not-allowed}}.wolPickerValue{{display:grid;gap:2px;min-width:0;flex:1}}.wolPickerValue strong{{display:block;min-width:0;color:#f5f3ff;font-size:13px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}}.wolPickerValue small{{display:block;min-width:0;color:#c4b5fd;font-size:11px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}}.wolPickerChevron{{flex:0 0 auto;color:#c4b5fd;font-size:15px;line-height:1}}.wolPickerList{{display:grid;grid-template-columns:minmax(0,1fr);grid-auto-rows:max-content;align-items:stretch;gap:8px;width:100%;max-height:min(44svh,360px);overflow-y:auto;overflow-x:hidden;padding:8px;border:1px solid rgba(34,211,238,.24);border-radius:12px;background:rgba(17,12,29,.88);box-shadow:inset 0 1px 0 rgba(255,255,255,.04);scrollbar-width:thin;scrollbar-gutter:stable both-edges;overscroll-behavior:contain}}.wolPickerList::-webkit-scrollbar{{width:8px}}.wolPickerList::-webkit-scrollbar-thumb{{background:rgba(167,139,250,.32);border-radius:999px}}.wolPickerList::-webkit-scrollbar-track{{background:transparent}}.wolDeviceBtn{{display:grid;grid-template-columns:minmax(0,1fr);align-content:start;gap:3px;width:100%;max-width:100%;min-width:0;min-height:58px;height:auto;padding:10px 12px;border:1px solid rgba(167,139,250,.18);border-radius:10px;background:rgba(255,255,255,.04);color:#f5f3ff;text-align:left;cursor:pointer;touch-action:manipulation;transition:border-color .15s ease,background .15s ease,transform .15s ease}}.wolDeviceBtn:hover,.wolDeviceBtn:focus-visible{{border-color:rgba(34,211,238,.48);background:rgba(34,211,238,.12)}}.wolDeviceBtn:active{{transform:scale(.99)}}.wolDeviceBtn.active{{border-color:rgba(59,130,246,.62);background:rgba(59,130,246,.18);box-shadow:0 0 0 1px rgba(59,130,246,.16)}}.wolDeviceName{{display:block;min-width:0;max-width:100%;color:#f5f3ff;font-size:13px;font-weight:800;line-height:1.3;white-space:normal;overflow-wrap:anywhere;word-break:break-word}}.wolDeviceMeta{{display:block;min-width:0;max-width:100%;color:#c4b5fd;font-size:11px;line-height:1.35;white-space:normal;overflow-wrap:anywhere;word-break:break-word}}.wolDeviceMeta:empty{{display:none}}.wolPickerEmpty{{padding:14px 12px;border:1px dashed rgba(167,139,250,.20);border-radius:10px;background:rgba(255,255,255,.03);color:#c4b5fd;text-align:center}}.metric.memory-ok strong,.metric.flash-ok strong,.metric.memory-warn strong,.metric.flash-warn strong,.metric.memory-bad strong,.metric.flash-bad strong{{color:#f3e8ff}}.metric.memory-ok .metric-accent,.metric.flash-ok .metric-accent{{color:#bbf7d0}}.metric.memory-warn .metric-accent,.metric.flash-warn .metric-accent{{color:#fde68a}}.metric.memory-bad .metric-accent,.metric.flash-bad .metric-accent{{color:#fecdd3}}.metric-line{{display:block}}.metric-accent{{font-weight:inherit}}
.seasonalFx{{position:fixed;inset:0;display:block;width:100vw;height:100vh;z-index:0;pointer-events:none;opacity:.9;mix-blend-mode:screen}}.desktopHeader{{--hdr-col-1:124px;--hdr-col-2:124px;--hdr-col-3:156px;--hdr-col-4:124px;--hdr-col-5:144px;--hdr-col-6:144px;--hdr-col-7:144px;--hdr-col-8:144px;--top-col-1:256px;--top-col-2:288px;--top-col-3:144px;display:grid;gap:8px;width:max-content;max-width:100%;margin-left:15px}}.desktopHeaderTop{{display:grid;grid-template-columns:var(--top-col-1) var(--top-col-2) var(--top-col-3);align-items:flex-start;gap:8px;width:max-content;max-width:100%;justify-self:start}}.desktopHeaderTop>.appBanner{{width:var(--top-col-1);min-width:var(--top-col-1);max-width:var(--top-col-1)}}.desktopHeaderTop>.routerSearchDock{{width:var(--top-col-2);min-width:var(--top-col-2);max-width:var(--top-col-2)}}.desktopHeaderTop>#seasonDock{{width:var(--top-col-3);min-width:var(--top-col-3);max-width:var(--top-col-3)}}.desktopHeaderBottom{{display:grid;grid-template-columns:var(--hdr-col-1) var(--hdr-col-2) var(--hdr-col-3) var(--hdr-col-4) var(--hdr-col-5) var(--hdr-col-6) var(--hdr-col-7) var(--hdr-col-8);gap:8px;width:max-content;max-width:100%;align-items:start;justify-self:start}}.desktopHeader .appBanner{{grid-column:auto;width:100%;min-width:0}}.desktopHeader .links{{display:grid;grid-column:1/span 3;grid-template-columns:var(--hdr-col-1) var(--hdr-col-2) var(--hdr-col-3);gap:8px;margin-top:0}}.desktopHeader .links a{{width:100%;min-width:0}}.routerSearchDock{{position:relative;display:block;grid-column:auto;width:100%;min-width:0;max-width:100%}}.mobileSearchDock{{display:none;width:100%;position:relative}}.routerSearchToggle{{position:relative;display:inline-flex;align-items:center;justify-content:center;gap:8px;min-height:36px;width:100%;padding:8px 14px;border:1px solid rgba(34,211,238,.30);border-radius:999px;background:linear-gradient(110deg,rgba(34,211,238,.12),rgba(124,58,237,.22),rgba(236,72,153,.12));color:#f3e8ff;font-size:13px;font-weight:800;line-height:1;box-shadow:0 10px 24px rgba(124,58,237,.16),inset 0 1px 0 rgba(255,255,255,.10)}}.routerSearchToggle[data-active="true"],.routerSearchToggle[aria-expanded="true"]{{border-color:rgba(34,211,238,.52);box-shadow:0 14px 30px rgba(34,211,238,.14),inset 0 1px 0 rgba(255,255,255,.12)}}.routerSearchToggleIcon{{flex:0 0 auto;color:#c4b5fd;font-size:14px;line-height:1}}.mobileSearchVersion{{display:inline-flex;align-items:center;justify-content:center;min-height:20px;padding:0 7px;border:1px solid rgba(251,113,133,.34);border-radius:999px;background:rgba(251,113,133,.14);color:#fecdd3;font-size:10px;font-weight:900;line-height:1;letter-spacing:.04em;box-shadow:0 0 14px rgba(251,113,133,.14)}}.mobileSearchDock>.mobileSearchVersion{{display:flex;width:fit-content;margin:0 auto 6px}}#routerSearchToggle,#seasonToggle{{border:1px solid var(--line);background:rgba(255,255,255,.08);box-shadow:inset 0 1px 0 rgba(255,255,255,.06);color:#f3e8ff}}#routerSearchToggle[data-active="true"],#routerSearchToggle[aria-expanded="true"],#seasonToggle[data-open="true"],#seasonToggle[aria-expanded="true"]{{border-color:var(--line);background:rgba(255,255,255,.11);box-shadow:inset 0 1px 0 rgba(255,255,255,.08)}}#routerSearchToggle .routerSearchToggleIcon,#seasonToggle .routerSearchToggleIcon{{color:#ddd6fe}}.routerSearchPanel{{position:absolute;top:calc(100% + 10px);left:0;z-index:55;width:min(296px,calc(100vw - 24px))}}.routerSearchPanel[hidden]{{display:none!important}}.routerSearchCard{{display:grid;grid-template-rows:auto auto auto;align-content:start;gap:8px;width:100%;min-height:82px;padding:12px;border:1px solid rgba(34,211,238,.26);border-radius:18px;background:linear-gradient(180deg,rgba(255,255,255,.09),rgba(255,255,255,.045)),rgba(19,14,32,.96);box-shadow:0 18px 42px rgba(0,0,0,.22),inset 0 1px 0 rgba(255,255,255,.06);backdrop-filter:blur(10px)}}.routerSearchHead{{display:flex;align-items:center;justify-content:space-between;gap:8px}}.routerSearchTitle{{display:block;color:#f3e8ff;font-size:12px;font-weight:900;line-height:1.1}}.routerSearchClear{{min-height:24px;padding:0 9px;border:1px solid rgba(167,139,250,.24);border-radius:999px;background:rgba(255,255,255,.06);color:#ddd6fe;font-size:11px;font-weight:850;cursor:pointer}}.routerSearchClear[disabled]{{opacity:.42;cursor:not-allowed}}.routerSearchField{{display:flex;align-items:center;gap:8px;min-height:38px;padding:0 12px;border:1px solid rgba(34,211,238,.26);border-radius:999px;background:linear-gradient(110deg,rgba(34,211,238,.08),rgba(124,58,237,.14),rgba(236,72,153,.08));box-shadow:inset 0 1px 0 rgba(255,255,255,.06)}}.routerSearchField:focus-within{{border-color:rgba(34,211,238,.54);box-shadow:0 0 0 3px rgba(34,211,238,.10),inset 0 1px 0 rgba(255,255,255,.08)}}.routerSearchField input{{width:100%;padding:0;border:0;background:transparent;color:#f7f2ff;box-shadow:none;outline:none;font-size:13px;font-weight:700}}.routerSearchField input::placeholder{{color:#b9adc9}}.routerSearchIcon{{fLine truncated .seasonalFx{{position:fixed;inset:0;display:block;width:100vw;height:100vh;z-index:0;pointer-events:none;opacity:.9;mix-blend-mode:screen}}.desktopHeader{{--hdr-col-1:124px;--hdr-col-2:124px;--hdr-col-3:156px;--hdr-col-4:124px;--hdr-col-5:144px;--hdr-col-6:144px;--hdr-col-7:144px;--hdr-col-8:144px;--top-col-1:256px;--top-col-2:288px;--top-col-3:144px;display:grid;gap:8px;width:max-content;max-width:100%;margin-left:15px}}.desktopHeaderTop{{display:grid;grid-template-columns:var(--top-col-1) var(--top-col-2) var(--top-col-3);align-items:flex-start;gap:8px;width:max-content;max-width:100%;justify-self:start}}.desktopHeaderTop>.appBanner{{width:var(--top-col-1);min-width:var(--top-col-1);max-width:var(--top-col-1)}}.desktopHeaderTop>.routerSearchDock{{width:var(--top-col-2);min-width:var(--top-col-2);max-width:var(--top-col-2)}}.desktopHeaderTop>#seasonDock{{width:var(--top-col-3);min-width:var(--top-col-3);max-width:var(--top-col-3)}}.desktopHeaderBottom{{display:grid;grid-template-columns:var(--hdr-col-1) var(--hdr-col-2) var(--hdr-col-3) var(--hdr-col-4) var(--hdr-col-5) var(--hdr-col-6) var(--hdr-col-7) var(--hdr-col-8);gap:8px;width:max-content;max-width:100%;align-items:start;justify-self:start}}.desktopHeader .appBanner{{grid-column:auto;width:100%;min-width:0}}.desktopHeader .links{{display:grid;grid-column:1/span 3;grid-template-columns:var(--hdr-col-1) var(--hdr-col-2) var(--hdr-col-3);gap:8px;margin-top:0}}.desktopHeader .links a{{width:100%;min-width:0}}.routerSearchDock{{position:relative;display:block;grid-column:auto;width:100%;min-width:0;max-width:100%}}.mobileSearchDock{{display:none;width:100%;position:relative}}.routerSearchToggle{{position:relative;display:inline-flex;align-items:center;justify-content:center;gap:8px;min-height:36px;width:100%;padding:8px 14px;border:1px solid rgba(34,211,238,.30);border-radius:999px;background:linear-gradient(110deg,rgba(34,211,238,.12),rgba(124,58,237,.22),rgba(236,72,153,.12));color:#f3e8ff;font-size:13px;font-weight:800;line-height:1;box-shadow:0 10px 24px rgba(124,58,237,.16),inset 0 1px 0 rgba(255,255,255,.10)}}.routerSearchToggle[data-active="true"],.routerSearchToggle[aria-expanded="true"]{{border-color:rgba(34,211,238,.52);box-shadow:0 14px 30px rgba(34,211,238,.14),inset 0 1px 0 rgba(255,255,255,.12)}}.routerSearchToggleIcon{{flex:0 0 auto;color:#c4b5fd;font-size:14px;line-height:1}}.mobileSearchVersion{{display:inline-flex;align-items:center;justify-content:center;min-height:20px;padding:0 7px;border:1px solid rgba(251,113,133,.34);border-radius:999px;background:rgba(251,113,133,.14);color:#fecdd3;font-size:10px;font-weight:900;line-height:1;letter-spacing:.04em;box-shadow:0 0 14px rgba(251,113,133,.14)}}.mobileSearchDock>.mobileSearchVersion{{display:flex;width:fit-content;margin:0 auto 6px}}#routerSearchToggle,#seasonToggle{{border:1px solid var(--line);background:rgba(255,255,255,.08);box-shadow:inset 0 1px 0 rgba(255,255,255,.06);color:#f3e8ff}}#routerSearchToggle[data-active="true"],#routerSearchToggle[aria-expanded="true"],#seasonToggle[data-open="true"],#seasonToggle[aria-expanded="true"]{{border-color:var(--line);background:rgba(255,255,255,.11);box-shadow:inset 0 1px 0 rgba(255,255,255,.08)}}#routerSearchToggle .routerSearchToggleIcon,#seasonToggle .routerSearchToggleIcon{{color:#ddd6fe}}.routerSearchPanel{{position:absolute;top:calc(100% + 10px);left:0;z-index:55;width:min(296px,calc(100vw - 24px))}}.routerSearchPanel[hidden]{{display:none!important}}.routerSearchCard{{display:grid;grid-template-rows:auto auto auto;align-content:start;gap:8px;width:100%;min-height:82px;padding:12px;border:1px solid rgba(34,211,238,.26);border-radius:18px;background:linear-gradient(180deg,rgba(255,255,255,.09),rgba(255,255,255,.045)),rgba(19,14,32,.96);box-shadow:0 18px 42px rgba(0,0,0,.22),inset 0 1px 0 rgba(255,255,255,.06);backdrop-filter:blur(10px)}}.routerSearchHead{{display:flex;align-items:center;justify-content:space-between;gap:8px}}.routerSearchTitle{{display:block;color:#f3e8ff;font-size:12px;font-weight:900;line-height:1.1}}.routerSearchClear{{min-height:24px;padding:0 9px;border:1px solid rgba(167,139,250,.24);border-radius:999px;background:rgba(255,255,255,.06);color:#ddd6fe;font-size:11px;font-weight:850;cursor:pointer}}.routerSearchClear[disabled]{{opacity:.42;cursor:not-allowed}}.routerSearchField{{display:flex;align-items:center;gap:8px;min-height:38px;padding:0 12px;border:1px solid rgba(34,211,238,.26);border-radius:999px;background:linear-gradient(110deg,rgba(34,211,238,.08),rgba(124,58,237,.14),rgba(236,72,153,.08));box-shadow:inset 0 1px 0 rgba(255,255,255,.06)}}.routerSearchField:focus-within{{border-color:rgba(34,211,238,.54);box-shadow:0 0 0 3px rgba(34,211,238,.10),inset 0 1px 0 rgba(255,255,255,.08)}}.routerSearchField input{{width:100%;padding:0;border:0;background:transparent;color:#f7f2ff;box-shadow:none;outline:none;font-size:13px;font-weight:700}}.routerSearchField input::placeholder{{color:#b9adc9}}.routerSearchIcon{{fLine truncated
@media(max-width:980px){{.cards,.routerGroupCards{{grid-template-columns:repeat(2,minmax(0,1fr))}}.toolbar{{grid-template-columns:1fr 1fr}}.card.main{{grid-column:span 1}}.top{{justify-items:stretch}}.desktopHeader,.desktopHeaderTop,.desktopHeaderBottom{{width:100%;max-width:none}}.desktopHeader{{--hdr-col-1:minmax(0,1fr);--hdr-col-2:minmax(0,1fr);--hdr-col-3:minmax(0,1.35fr);--hdr-col-4:minmax(0,1fr);--hdr-col-5:minmax(0,1fr);--hdr-col-6:minmax(0,1fr);--hdr-col-7:minmax(0,1fr);--hdr-col-8:minmax(0,1fr)}}.headerActions{{width:100%}}}} @media(max-width:980px){{.cards,.routerGroupCards{{grid-template-columns:repeat(2,minmax(0,1fr))}}.toolbar{{grid-template-columns:1fr 1fr}}.card.main{{grid-column:span 1}}.top{{justify-items:stretch}}.desktopHeader,.desktopHeaderTop,.desktopHeaderBottom{{width:100%;max-width:none}}.desktopHeader{{--hdr-col-1:minmax(0,1fr);--hdr-col-2:minmax(0,1fr);--hdr-col-3:minmax(0,1.35fr);--hdr-col-4:minmax(0,1fr);--hdr-col-5:minmax(0,1fr);--hdr-col-6:minmax(0,1fr);--hdr-col-7:minmax(0,1fr);--hdr-col-8:minmax(0,1fr)}}.headerActions{{width:100%}}}}
@media(max-width:680px){{body{{font-size:13px;background-attachment:scroll}}.wrap{{padding:10px}}.top{{gap:12px;padding:14px 0;align-items:flex-start}}.brand,.brand>div{{width:100%}}h1{{font-size:22px;line-height:1.18}}.appBanner{{width:auto;max-width:100%;justify-content:center;min-height:36px;padding:8px 12px}}.links,.headerActions,.summary,.mobileOwnerTools{{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));width:100%;gap:8px;max-width:none}}.links{{margin-top:10px}}.links a,.badge,.headerActions .btn,.mobileOwnerTools .btn,.mobileOwnerTools .badge,.miniStat{{width:100%;min-width:0;padding:9px 10px;font-size:12px}}.headerStack{{margin-top:0;width:100%;min-width:0}}.headerStack .badge{{width:100%;min-width:0}}.authMenu{{position:fixed;left:10px;right:10px;top:74px;width:auto;max-height:calc(100svh - 90px);overflow:auto}}.authMenuHead{{min-height:40px;padding:0 104px 8px 0}}.authMenu h2{{margin:2px 104px 0 0;line-height:1.2}}.authMenuClose{{display:inline-flex;top:0;right:0;min-height:32px;padding:6px 12px}}.cards,.routerGroupCards,.toolbar,.authGrid{{grid-template-columns:1fr}}.authRow{{grid-template-columns:1fr;gap:7px;padding:8px}}.authRowTitle{{font-size:13px}}.authRowMeta{{font-size:11px;line-height:1.3}}.authRouterFlags{{justify-content:flex-start;gap:6px}}.authFlagPill{{min-height:25px;padding:3px 7px;gap:5px}}.authFlagPill input{{width:12px;height:12px;flex-basis:12px}}.authFlagPill span{{font-size:10px}}.routerStats{{grid-template-columns:repeat(3,minmax(0,1fr));gap:5px;margin-bottom:7px}}.statCard{{min-height:52px;padding:7px 6px}}.statCard span{{font-size:8px;letter-spacing:.015em}}.statCard strong{{font-size:20px}}.statCard em{{display:none}}.statCardHead{{min-height:16px}}.statValueRow,.offlineStatRow{{min-height:20px;margin-top:4px}}.offlineMoreBtn{{right:2px;min-height:16px;padding:0 5px;font-size:7px}}.offlinePopover{{right:3px;width:min(230px,calc(100vw - 20px));padding:8px}}.offlineItem{{padding:6px 7px}}.offlineName{{font-size:10px}}.toolbar{{padding:10px;margin:12px 0}}.card.main{{grid-column:span 1}}.card{{padding:12px;min-height:0}}.card>.metaLine,.card>.tagRow{{display:none}}.nameRow{{gap:6px;margin-top:10px}}.nameRow::before{{flex-basis:26px;width:26px;height:26px}}.name{{font-size:12px;max-width:190px}}.nameEditBtn{{flex-basis:26px;width:26px;height:26px}}.mobilePanelToggle,.routerFormToggle{{display:inline-flex}}.routerSearchDock{{width:100%}}.seasonDock{{width:100%}}#mobileSeasonDock{{width:100%;min-width:0;max-width:none;padding:0;border:0;background:none;box-shadow:none;backdrop-filter:none}}.routerSearchToggle,.seasonToggle{{width:100%}}.routerSearchPanel,.seasonPanel{{position:static;width:100%;margin-top:8px}}.routerSearchCard,.seasonCard{{width:100%;min-height:0;padding:10px 11px;border-radius:16px}}.routerSearchTitle{{font-size:11px}}.routerSearchField{{min-height:36px}}.routerSearchMeta{{text-align:center}}.metrics{{grid-template-columns:repeat(2,minmax(0,1fr));gap:7px}}.metric{{padding:8px}}.diagnosticPanel{{padding:12px}}.diagnosticTop{{gap:8px}}.diagnosticTop h2{{font-size:17px}}.diagnosticLead{{font-size:11px}}.diagnosticGrid{{grid-template-columns:1fr;gap:10px}}.diagnosticGrid label{{font-size:13px}}.diagnosticGrid textarea{{min-height:118px;padding:12px 13px;font-size:15px;line-height:1.35}}.diagBlock{{padding:11px}}.actions{{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));gap:8px}}.actions .btn,.actions button{{width:100%;min-width:0;padding:9px 8px;font-size:12px}}.wolControls,.trafficControls{{grid-template-columns:1fr}}.wolField span,.wolMeta{{text-align:center}}.wolControls .btn,.wolControls button,.trafficControls .btn,.trafficControls button{{width:100%}}.trafficSummary{{justify-content:center}}.trafficViewport{{max-height:360px;padding-right:0}}.trafficRowTop{{grid-template-columns:1fr}}.trafficTotalBadge{{min-width:0;text-align:left}}}} @media(max-width:680px),(max-width:1024px) and (orientation:landscape) and (pointer:coarse){{body{{font-size:13px;background-attachment:scroll}}.wrap{{padding:10px}}.top{{gap:12px;padding:14px 0;align-items:flex-start}}.brand,.brand>div{{width:100%}}h1{{font-size:22px;line-height:1.18}}.appBanner{{width:auto;max-width:100%;justify-content:center;min-height:36px;padding:8px 12px}}.links,.headerActions,.summary,.mobileOwnerTools{{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));width:100%;gap:8px;max-width:none}}.links{{margin-top:10px}}.links a,.badge,.headerActions .btn,.mobileOwnerTools .btn,.mobileOwnerTools .badge,.miniStat{{width:100%;min-width:0;padding:9px 10px;font-size:12px}}.headerStack{{margin-top:0;width:100%;min-width:0}}.headerStack .badge{{width:100%;min-width:0}}.authMenu{{position:fixed;left:10px;right:10px;top:74px;width:auto;max-height:calc(100svh - 90px);overflow:auto}}.authMenuHead{{min-height:40px;padding:0 104px 8px 0}}.authMenu h2{{margin:2px 104px 0 0;line-height:1.2}}.authMenuClose{{display:inline-flex;top:0;right:0;min-height:32px;padding:6px 12px}}.cards,.routerGroupCards,.toolbar,.authGrid{{grid-template-columns:1fr}}.authRow{{grid-template-columns:1fr;gap:7px;padding:8px}}.authRowTitle{{font-size:13px}}.authRowMeta{{font-size:11px;line-height:1.3}}.authRouterFlags{{justify-content:flex-start;gap:6px}}.authFlagPill{{min-height:25px;padding:3px 7px;gap:5px}}.authFlagPill input{{width:12px;height:12px;flex-basis:12px}}.authFlagPill span{{font-size:10px}}.routerStats{{grid-template-columns:repeat(3,minmax(0,1fr));gap:5px;margin-bottom:7px}}.statCard{{min-height:52px;padding:7px 6px}}.statCard span{{font-size:8px;letter-spacing:.015em}}.statCard strong{{font-size:20px}}.statCard em{{display:none}}.statCardHead{{min-height:16px}}.statValueRow,.offlineStatRow{{min-height:20px;margin-top:4px}}.offlineMoreBtn{{right:2px;min-height:16px;padding:0 5px;font-size:7px}}.offlinePopover{{right:3px;width:min(230px,calc(100vw - 20px));padding:8px}}.offlineItem{{padding:6px 7px}}.offlineName{{font-size:10px}}.toolbar{{padding:10px;margin:12px 0}}.card.main{{grid-column:span 1}}.card{{padding:12px;min-height:0}}.card>.metaLine,.card>.tagRow{{display:none}}.nameRow{{gap:6px;margin-top:10px}}.nameRow::before{{flex-basis:26px;width:26px;height:26px}}.name{{font-size:12px;max-width:190px}}.nameEditBtn{{flex-basis:26px;width:26px;height:26px}}.mobilePanelToggle,.routerFormToggle{{display:inline-flex}}.routerSearchDock{{width:100%}}.seasonDock{{width:100%}}#mobileSeasonDock{{width:100%;min-width:0;max-width:none;padding:0;border:0;background:none;box-shadow:none;backdrop-filter:none}}.routerSearchToggle,.seasonToggle{{width:100%}}.routerSearchPanel,.seasonPanel{{position:static;width:100%;margin-top:8px}}.routerSearchCard,.seasonCard{{width:100%;min-height:0;padding:10px 11px;border-radius:16px}}.routerSearchTitle{{font-size:11px}}.routerSearchField{{min-height:36px}}.routerSearchMeta{{text-align:center}}.metrics{{grid-template-columns:repeat(2,minmax(0,1fr));gap:7px}}.metric{{padding:8px}}.diagnosticPanel{{padding:12px}}.diagnosticTop{{gap:8px}}.diagnosticTop h2{{font-size:17px}}.diagnosticLead{{font-size:11px}}.diagnosticGrid{{grid-template-columns:1fr;gap:10px}}.diagnosticGrid label{{font-size:13px}}.diagnosticGrid textarea{{min-height:118px;padding:12px 13px;font-size:15px;line-height:1.35}}.diagBlock{{padding:11px}}.actions{{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));gap:8px}}.actions .btn,.actions button{{width:100%;min-width:0;padding:9px 8px;font-size:12px}}.wolControls,.trafficControls{{grid-template-columns:1fr}}.wolField span,.wolMeta{{text-align:center}}.wolControls .btn,.wolControls button,.trafficControls .btn,.trafficControls button{{width:100%}}.trafficSummary{{justify-content:center}}.trafficViewport{{max-height:360px;padding-right:0}}.trafficRowTop{{grid-template-columns:1fr}}.trafficTotalBadge{{min-width:0;text-align:left}}}}
@media(max-width:680px){{.desktopHeader{{display:none}}#hubMenuPanelHost{{display:block;width:100%}}#hubMenuPanelHost:empty{{display:none}}.mobileOwnerTools{{display:grid;margin:0 0 8px}}.mobileOwnerTools[hidden]{{display:none!important}}.top{{padding:6px 0 0;gap:0}}.mobileSearchDock{{display:block;margin:0}}.mobilePanelToggle,.routerFormToggle,.actionToggle{{width:100%;min-height:38px;margin:7px 0;padding:9px 12px;border-radius:999px;font-size:12px;line-height:1}}.actionToggle{{display:inline-flex}}body.preload-mobile-panels .headerActions,body.preload-mobile-panels .routerFormWrap,body.preload-mobile-panels .mobileOwnerTools{{display:none!important}}.card .actions.mobileCollapsed:not(.open){{display:none}}.cardTop{{gap:0}}}} @media(max-width:680px),(max-width:1024px) and (orientation:landscape) and (pointer:coarse){{.desktopHeader{{display:none}}#hubMenuPanelHost{{display:block;width:100%}}#hubMenuPanelHost:empty{{display:none}}.mobileOwnerTools{{display:grid;margin:0 0 8px}}.mobileOwnerTools[hidden]{{display:none!important}}.top{{padding:6px 0 0;gap:0}}.mobileSearchDock{{display:block;margin:0}}.mobilePanelToggle,.routerFormToggle,.actionToggle{{width:100%;min-height:38px;margin:7px 0;padding:9px 12px;border-radius:999px;font-size:12px;line-height:1}}.actionToggle{{display:inline-flex}}body.preload-mobile-panels .headerActions,body.preload-mobile-panels .routerFormWrap,body.preload-mobile-panels .mobileOwnerTools{{display:none!important}}.card .actions.mobileCollapsed:not(.open){{display:none}}.cardTop{{gap:0}}}}
@media(max-width:680px){{.headerActions .badge,.headerActions .btn,.mobileOwnerTools .badge,.mobileOwnerTools .btn{{width:100%;min-width:0;max-width:none}}}} @media(max-width:680px),(max-width:1024px) and (orientation:landscape) and (pointer:coarse){{.headerActions .badge,.headerActions .btn,.mobileOwnerTools .badge,.mobileOwnerTools .btn{{width:100%;min-width:0;max-width:none}}}}
@media(max-width:420px){{.links,.headerActions,.summary,.actions,.mobileOwnerTools{{grid-template-columns:1fr}}.metrics{{grid-template-columns:1fr}}.metric.span2{{grid-column:span 1}}}} @media(max-width:420px){{.links,.headerActions,.summary,.actions,.mobileOwnerTools{{grid-template-columns:1fr}}.metrics{{grid-template-columns:1fr}}.metric.span2{{grid-column:span 1}}}}
@media(max-width:680px){{.desktopHeader{{width:100%}}.summary{{justify-content:center}}}} @media(max-width:680px),(max-width:1024px) and (orientation:landscape) and (pointer:coarse){{.desktopHeader{{width:100%}}.summary{{justify-content:center}}}}
@media(min-width:681px){{.trafficPanel{{width:min(100%,332px);justify-self:center;padding:9px 9px 8px;border-radius:10px;gap:9px}}.trafficControls{{grid-template-columns:repeat(2,minmax(0,1fr))!important;gap:6px}}.trafficPanel .wolField{{gap:4px;font-size:11px}}.trafficPanel .wolField span{{text-align:center}}.trafficPanel .wolField input{{min-height:32px;padding:0 9px;font-size:13px}}.trafficStatusField .wolMeta{{min-height:32px;font-size:11px;line-height:1.18;text-align:center}}.trafficPanel .btn{{min-height:32px;padding:6px 7px;font-size:11px}}.trafficSummary{{justify-content:center}}.trafficSummaryChip{{min-height:20px;padding:0 7px;font-size:9.5px}}.trafficViewport{{max-height:min(42svh,350px)}}.trafficList{{gap:6px}}.trafficRow{{gap:6px;padding:8px}}.trafficRowTop{{grid-template-columns:1fr;gap:7px}}.trafficIdentity{{text-align:center!important}}.trafficName{{display:block;width:100%;font-size:13px;text-align:center!important}}.trafficMetaLine{{font-size:10px;line-height:1.32;text-align:center!important}}.trafficTotalBadge{{display:grid;width:fit-content;min-width:136px;max-width:186px;justify-self:center!important;margin:0 auto;place-self:center;padding:6px 10px;text-align:center!important}}.trafficTotalBadge span{{font-size:9px}}.trafficTotalBadge strong{{font-size:12px}}.trafficStat{{padding:6px 5px}}.trafficStat span{{font-size:9px}}.trafficStat strong{{font-size:11px}}}} @media(min-width:681px){{.trafficPanel{{width:min(100%,332px);justify-self:center;padding:9px 9px 8px;border-radius:10px;gap:9px}}.trafficControls{{grid-template-columns:repeat(2,minmax(0,1fr))!important;gap:6px}}.trafficPanel .wolField{{gap:4px;font-size:11px}}.trafficPanel .wolField span{{text-align:center}}.trafficPanel .wolField input{{min-height:32px;padding:0 9px;font-size:13px}}.trafficStatusField .wolMeta{{min-height:32px;font-size:11px;line-height:1.18;text-align:center}}.trafficPanel .btn{{min-height:32px;padding:6px 7px;font-size:11px}}.trafficSummary{{justify-content:center}}.trafficSummaryChip{{min-height:20px;padding:0 7px;font-size:9.5px}}.trafficViewport{{max-height:min(42svh,350px)}}.trafficList{{gap:6px}}.trafficRow{{gap:6px;padding:8px}}.trafficRowTop{{grid-template-columns:1fr;gap:7px}}.trafficIdentity{{text-align:center!important}}.trafficName{{display:block;width:100%;font-size:13px;text-align:center!important}}.trafficMetaLine{{font-size:10px;line-height:1.32;text-align:center!important}}.trafficTotalBadge{{display:grid;width:fit-content;min-width:136px;max-width:186px;justify-self:center!important;margin:0 auto;place-self:center;padding:6px 10px;text-align:center!important}}.trafficTotalBadge span{{font-size:9px}}.trafficTotalBadge strong{{font-size:12px}}.trafficStat{{padding:6px 5px}}.trafficStat span{{font-size:9px}}.trafficStat strong{{font-size:11px}}}}
@media(max-width:900px),(pointer:coarse){{.trafficPanel{{width:min(100%,340px);justify-self:center;padding:10px 10px 9px;gap:9px}}.trafficControls{{grid-template-columns:repeat(2,minmax(0,1fr))!important;gap:6px;align-items:start}}.trafficPanel .wolField{{gap:4px;font-size:11px}}.trafficPanel .wolField span{{text-align:center}}.trafficPanel .wolField input{{min-height:34px;padding:0 10px;font-size:13px}}.trafficStatusField .wolMeta{{display:flex;align-items:center;justify-content:center;min-height:34px;padding:0 4px;font-size:11px;line-height:1.18;text-align:center}}.trafficPanel .btn{{min-height:34px;padding:7px 8px;font-size:11px}}.trafficSummary{{justify-content:center}}.trafficSummaryChip{{min-height:22px;padding:0 8px;font-size:9.5px}}.trafficViewport{{max-height:min(44svh,390px);padding-top:4px}}.trafficList{{gap:6px}}.trafficRow{{gap:6px;padding:8px}}.trafficRowTop{{grid-template-columns:1fr;gap:7px}}.trafficIdentity{{text-align:center!important}}.trafficName{{display:block;width:100%;font-size:13px;text-align:center!important}}.trafficMetaLine{{font-size:10px;line-height:1.33;text-align:center!important}}.trafficTotalBadge{{display:grid;width:fit-content;min-width:140px;max-width:198px;justify-self:center!important;margin:0 auto;place-self:center;padding:6px 12px;text-align:center!important}}.trafficTotalBadge span{{font-size:9px}}.trafficTotalBadge strong{{font-size:12px}}.trafficStats{{gap:5px}}.trafficStat{{padding:6px 6px}}.trafficStat span{{font-size:9px}}.trafficStat strong{{font-size:11px}}}} @media(max-width:900px),(pointer:coarse){{.trafficPanel{{width:min(100%,340px);justify-self:center;padding:10px 10px 9px;gap:9px}}.trafficControls{{grid-template-columns:repeat(2,minmax(0,1fr))!important;gap:6px;align-items:start}}.trafficPanel .wolField{{gap:4px;font-size:11px}}.trafficPanel .wolField span{{text-align:center}}.trafficPanel .wolField input{{min-height:34px;padding:0 10px;font-size:13px}}.trafficStatusField .wolMeta{{display:flex;align-items:center;justify-content:center;min-height:34px;padding:0 4px;font-size:11px;line-height:1.18;text-align:center}}.trafficPanel .btn{{min-height:34px;padding:7px 8px;font-size:11px}}.trafficSummary{{justify-content:center}}.trafficSummaryChip{{min-height:22px;padding:0 8px;font-size:9.5px}}.trafficViewport{{max-height:min(44svh,390px);padding-top:4px}}.trafficList{{gap:6px}}.trafficRow{{gap:6px;padding:8px}}.trafficRowTop{{grid-template-columns:1fr;gap:7px}}.trafficIdentity{{text-align:center!important}}.trafficName{{display:block;width:100%;font-size:13px;text-align:center!important}}.trafficMetaLine{{font-size:10px;line-height:1.33;text-align:center!important}}.trafficTotalBadge{{display:grid;width:fit-content;min-width:140px;max-width:198px;justify-self:center!important;margin:0 auto;place-self:center;padding:6px 12px;text-align:center!important}}.trafficTotalBadge span{{font-size:9px}}.trafficTotalBadge strong{{font-size:12px}}.trafficStats{{gap:5px}}.trafficStat{{padding:6px 6px}}.trafficStat span{{font-size:9px}}.trafficStat strong{{font-size:11px}}}}
@media(max-width:680px){{.trafficPanel{{width:min(100%,332px);padding:9px 9px 8px;border-radius:10px}}.trafficControls{{grid-template-columns:repeat(2,minmax(0,1fr))!important;gap:6px}}.trafficPanel .wolField{{gap:4px;font-size:11px}}.trafficPanel .wolField input{{min-height:32px;padding:0 9px;font-size:12.5px}}.trafficStatusField .wolMeta{{min-height:32px;font-size:11px;line-height:1.18}}.trafficPanel .btn{{min-height:32px;padding:6px 7px;font-size:11px}}.trafficSummaryChip{{min-height:20px;padding:0 7px;font-size:9px}}.trafficViewport{{max-height:min(42svh,350px)}}.trafficIdentity{{text-align:center!important}}.trafficName{{font-size:12px;text-align:center!important}}.trafficMetaLine{{font-size:10px;line-height:1.28;text-align:center!important}}.trafficTotalBadge{{display:grid;width:fit-content;min-width:130px;max-width:180px;justify-self:center!important;margin:0 auto;place-self:center;padding:6px 10px;text-align:center!important}}.trafficTotalBadge strong{{font-size:11px}}.trafficStat{{padding:6px 5px}}.trafficStat strong{{font-size:11px}}}} @media(max-width:680px),(max-width:1024px) and (orientation:landscape) and (pointer:coarse){{.trafficPanel{{width:min(100%,332px);padding:9px 9px 8px;border-radius:10px}}.trafficControls{{grid-template-columns:repeat(2,minmax(0,1fr))!important;gap:6px}}.trafficPanel .wolField{{gap:4px;font-size:11px}}.trafficPanel .wolField input{{min-height:32px;padding:0 9px;font-size:12.5px}}.trafficStatusField .wolMeta{{min-height:32px;font-size:11px;line-height:1.18}}.trafficPanel .btn{{min-height:32px;padding:6px 7px;font-size:11px}}.trafficSummaryChip{{min-height:20px;padding:0 7px;font-size:9px}}.trafficViewport{{max-height:min(42svh,350px)}}.trafficIdentity{{text-align:center!important}}.trafficName{{font-size:12px;text-align:center!important}}.trafficMetaLine{{font-size:10px;line-height:1.28;text-align:center!important}}.trafficTotalBadge{{display:grid;width:fit-content;min-width:130px;max-width:180px;justify-self:center!important;margin:0 auto;place-self:center;padding:6px 10px;text-align:center!important}}.trafficTotalBadge strong{{font-size:11px}}.trafficStat{{padding:6px 5px}}.trafficStat strong{{font-size:11px}}}}
@media(max-width:420px){{.trafficPanel{{width:100%}}.trafficControls{{grid-template-columns:repeat(2,minmax(0,1fr))!important;gap:5px}}.trafficStatusField,.trafficPasswordField{{grid-column:auto}}.trafficStatusField .wolMeta{{padding:6px 8px}}.trafficTotalBadge{{min-width:118px;max-width:168px}}}} @media(max-width:420px){{.trafficPanel{{width:100%}}.trafficControls{{grid-template-columns:repeat(2,minmax(0,1fr))!important;gap:5px}}.trafficStatusField,.trafficPasswordField{{grid-column:auto}}.trafficStatusField .wolMeta{{padding:6px 8px}}.trafficTotalBadge{{min-width:118px;max-width:168px}}}}
@media(max-width:680px){{.routerCardGroup{{margin-top:10px;padding:5px 0;gap:6px}}.routerGroupPickerHead{{min-height:30px}}.routerGroupPickerToggle{{min-height:30px;padding:6px 14px;font-size:11px}}.routerGroupPickerOptions{{width:100%;box-sizing:border-box;grid-template-columns:1fr;gap:6px;padding:6px}}.routerGroupChoice{{min-height:32px;padding:7px 8px;font-size:11px}}}}#diagnosticBuild,.btn[data-diagnose]{{display:none!important}} @media(max-width:680px),(max-width:1024px) and (orientation:landscape) and (pointer:coarse){{.routerCardGroup{{margin-top:10px;padding:5px 0;gap:6px}}.routerGroupPickerHead{{min-height:30px}}.routerGroupPickerToggle{{min-height:30px;padding:6px 14px;font-size:11px}}.routerGroupPickerOptions{{width:100%;box-sizing:border-box;grid-template-columns:1fr;gap:6px;padding:6px}}.routerGroupChoice{{min-height:32px;padding:7px 8px;font-size:11px}}}}#diagnosticBuild,.btn[data-diagnose]{{display:none!important}}
.desktopHeaderTop{{grid-template-columns:var(--hdr-col-1) var(--hdr-col-2) var(--hdr-col-3) var(--hdr-col-4) var(--hdr-col-5) var(--hdr-col-6) var(--hdr-col-7) var(--hdr-col-8);width:100%}} .desktopHeaderTop{{grid-template-columns:var(--hdr-col-1) var(--hdr-col-2) var(--hdr-col-3) var(--hdr-col-4) var(--hdr-col-5) var(--hdr-col-6) var(--hdr-col-7) var(--hdr-col-8);width:100%}}
.desktopHeaderTop>.appBanner{{grid-column:1/span 2;width:100%;min-width:0;max-width:none}} .desktopHeaderTop>.appBanner{{grid-column:1/span 2;width:100%;min-width:0;max-width:none}}
.desktopHeaderTop>.routerSearchDock{{grid-column:3/span 2;width:100%;min-width:0;max-width:none}} .desktopHeaderTop>.routerSearchDock{{grid-column:3/span 2;width:100%;min-width:0;max-width:none}}
@@ -5056,7 +5056,8 @@ input,select{{min-width:0;border:1px solid var(--line);border-radius:8px;padding
.vpsResource[data-stale="true"] strong{{color:var(--muted)}} .vpsResource[data-stale="true"] strong{{color:var(--muted)}}
@media(min-width:681px) and (max-width:980px){{.vpsResource.badge{{padding:8px 4px;font-size:11px;gap:4px}}.vpsResource strong{{font-size:11px}}}} @media(min-width:681px) and (max-width:980px){{.vpsResource.badge{{padding:8px 4px;font-size:11px;gap:4px}}.vpsResource strong{{font-size:11px}}}}
@media(min-width:681px) and (max-width:800px){{.vpsResource.badge{{padding:8px 2px;gap:2px}}.vpsResource.badge,.vpsResource strong{{font-size:10px}}}} @media(min-width:681px) and (max-width:800px){{.vpsResource.badge{{padding:8px 2px;gap:2px}}.vpsResource.badge,.vpsResource strong{{font-size:10px}}}}
@media(max-width:680px){{.vpsResources-mobile{{display:grid;margin:8px 0 3px}}.vpsResource.badge{{padding:8px 6px;font-size:11px}}.vpsResource strong{{font-size:11px}}}} @media(max-width:680px),(max-width:1024px) and (orientation:landscape) and (pointer:coarse){{.vpsResources-mobile{{display:grid;margin:8px 0 3px}}.vpsResource.badge{{padding:8px 6px;font-size:11px}}.vpsResource strong{{font-size:11px}}}}
@media(min-width:681px) and (max-width:1024px) and (orientation:landscape) and (pointer:coarse){{.wrap{{padding-left:max(10px,env(safe-area-inset-left,0px));padding-right:max(10px,env(safe-area-inset-right,0px))}}.cards,.routerGroupCards,.toolbar{{grid-template-columns:repeat(2,minmax(0,1fr))}}}}
</style> </style>
</head> </head>
<body class="preload-mobile-panels"> <body class="preload-mobile-panels">
@@ -5519,7 +5520,8 @@ window.HUB_SESSIONS = {sessions_json};
window.HUB_NOTIFICATIONS = {notifications_json}; window.HUB_NOTIFICATIONS = {notifications_json};
window.HUB_PUSH_BOOTSTRAP = {push_bootstrap_json}; window.HUB_PUSH_BOOTSTRAP = {push_bootstrap_json};
const APP_CLIENT_VERSION = {json.dumps(SERVICE_WORKER_VERSION)}; const APP_CLIENT_VERSION = {json.dumps(SERVICE_WORKER_VERSION)};
const mobileLayoutMq = window.matchMedia('(max-width: 680px)'); // Keep touch phones in the mobile layout after rotation, without changing desktop widths.
const mobileLayoutMq = window.matchMedia('(max-width:680px),(max-width:1024px) and (orientation:landscape) and (pointer:coarse)');
const mobileCardsMq = mobileLayoutMq; const mobileCardsMq = mobileLayoutMq;
const cards = document.getElementById('cards'); const cards = document.getElementById('cards');
const routerStats = document.getElementById('routerStats'); const routerStats = document.getElementById('routerStats');
@@ -12224,39 +12226,41 @@ def router_updates_html(csrf):
:root{color-scheme:dark;--line:rgba(169,126,255,.3);--muted:#b9adc9} :root{color-scheme:dark;--line:rgba(169,126,255,.3);--muted:#b9adc9}
*{box-sizing:border-box}body{min-height:100vh;margin:0;background:#07040f;background-image:radial-gradient(circle at 16% 10%,#a855f740,transparent 35%),linear-gradient(145deg,#07040f,#120a24 54%,#05030a);background-attachment:fixed;color:#f7f2ff;font:14px/1.5 system-ui,sans-serif} *{box-sizing:border-box}body{min-height:100vh;margin:0;background:#07040f;background-image:radial-gradient(circle at 16% 10%,#a855f740,transparent 35%),linear-gradient(145deg,#07040f,#120a24 54%,#05030a);background-attachment:fixed;color:#f7f2ff;font:14px/1.5 system-ui,sans-serif}
.wrap{max-width:1100px;margin:auto;padding:20px}.panel{margin-bottom:14px;padding:18px;border:1px solid var(--line);border-radius:12px;background:#191226e8}.head,.actions{display:flex;align-items:center;justify-content:space-between;gap:10px;flex-wrap:wrap}h1{font-size:22px;margin:0}h2{font-size:16px;margin:0 0 10px}.hint{color:var(--muted);font-size:13px}.form-hint{margin:10px 0 20px;line-height:1.65}.action-hint{margin-top:12px}.note{margin:14px 0;padding:10px 12px;border:1px solid #f59e0b70;border-left:3px solid #f59e0b;border-radius:8px;background:#f59e0b12;color:#fde68a} .wrap{max-width:1100px;margin:auto;padding:20px}.panel{margin-bottom:14px;padding:18px;border:1px solid var(--line);border-radius:12px;background:#191226e8}.head,.actions{display:flex;align-items:center;justify-content:space-between;gap:10px;flex-wrap:wrap}h1{font-size:22px;margin:0}h2{font-size:16px;margin:0 0 10px}.hint{color:var(--muted);font-size:13px}.form-hint{margin:10px 0 20px;line-height:1.65}.action-hint{margin-top:12px}.note{margin:14px 0;padding:10px 12px;border:1px solid #f59e0b70;border-left:3px solid #f59e0b;border-radius:8px;background:#f59e0b12;color:#fde68a}
label{display:block;margin:14px 0 6px;font-weight:700}textarea,input{display:block;width:100%;min-width:0;border:1px solid var(--line);border-radius:8px;background:#0d0917;color:#f7f2ff;padding:11px;font:14px/1.5 ui-monospace,Consolas,monospace}textarea{min-height:110px;resize:vertical}input{max-width:480px}button,.btn{display:inline-flex;align-items:center;justify-content:center;min-height:42px;border:1px solid var(--line);border-radius:8px;padding:9px 14px;background:#393044;color:#f7f2ff;font:700 13px system-ui;cursor:pointer;text-decoration:none}.primary{background:#15803d;border-color:#22c55e;color:#fff}.primary:hover:not(:disabled){background:#166534}button:disabled{opacity:.5;cursor:default}.actions{justify-content:flex-start;margin-top:16px}.ok{color:#86efac}.error{color:#fda4af}.warn{color:#fde68a}#status{margin:12px 0;overflow-wrap:anywhere}.router{border-top:1px solid var(--line);padding:13px 0}.router:first-child{border-top:0}.router strong{display:block;overflow-wrap:anywhere}.router p{margin:5px 0;overflow-wrap:anywhere}.router small{color:var(--muted)}pre{max-height:260px;overflow:auto;white-space:pre-wrap;overflow-wrap:anywhere;background:#0d0917;border:1px solid var(--line);border-radius:8px;padding:10px;font:12px/1.5 ui-monospace,Consolas,monospace}summary{cursor:pointer;color:var(--muted)} label{display:block;margin:14px 0 6px;font-weight:700}textarea,input{display:block;width:100%;min-width:0;border:1px solid var(--line);border-radius:8px;background:#0d0917;color:#f7f2ff;padding:11px;font:14px/1.5 ui-monospace,Consolas,monospace}textarea{min-height:110px;resize:vertical}input{max-width:480px}button,.btn{display:inline-flex;align-items:center;justify-content:center;min-height:42px;border:1px solid var(--line);border-radius:8px;padding:9px 14px;background:#393044;color:#f7f2ff;font:700 13px system-ui;cursor:pointer;text-decoration:none}.primary{background:#15803d;border-color:#22c55e;color:#fff}.primary:hover:not(:disabled){background:#166534}.reboot{background:#b91c1c;border-color:#ef4444;color:#fff}.reboot:hover:not(:disabled){background:#991b1b}button:disabled{opacity:.5;cursor:default}.actions{justify-content:flex-start;margin-top:16px}.ok{color:#86efac}.error{color:#fda4af}.warn{color:#fde68a}#status{margin:12px 0;overflow-wrap:anywhere}.router{border-top:1px solid var(--line);padding:13px 0}.router:first-child{border-top:0}.router strong{display:block;overflow-wrap:anywhere}.router p{margin:5px 0;overflow-wrap:anywhere}.router small{color:var(--muted)}pre{max-height:260px;overflow:auto;white-space:pre-wrap;overflow-wrap:anywhere;background:#0d0917;border:1px solid var(--line);border-radius:8px;padding:10px;font:12px/1.5 ui-monospace,Consolas,monospace}summary{cursor:pointer;color:var(--muted)}
.head-actions{display:flex;gap:8px;flex-wrap:wrap}.queue-dashboard{margin:18px 0 14px;padding:18px;border:1px solid var(--line);border-radius:12px;background:linear-gradient(120deg,#30203e90,#141521b0)}.queue-heading{display:flex;align-items:center;justify-content:space-between;gap:12px;margin-bottom:12px}.queue-heading h2{margin:0;font-size:17px}.queue-badge{padding:4px 10px;border:1px solid #a78bfa50;border-radius:20px;background:#a78bfa12;color:#d8c8ff;font-size:12px;font-weight:700}.progress-label{display:flex;justify-content:space-between;gap:12px;margin-bottom:7px;color:var(--muted);font-size:12px}.progress-track{height:7px;overflow:hidden;border-radius:8px;background:#ffffff0b}.progress-fill{height:100%;width:0;background:linear-gradient(90deg,#8b5cf6,#38bdf8);border-radius:8px;transition:width .25s}.metrics{display:grid;grid-template-columns:repeat(4,minmax(0,1fr));gap:10px;margin-top:16px}.metric{--accent:#c4b5fd;min-width:0;text-align:center;padding:13px 12px;border:1px solid #ffffff12;border-top:2px solid var(--accent);border-radius:9px;background:#100b1b90}.metric[data-state=success]{--accent:#86efac}.metric[data-state=error]{--accent:#fda4af}.metric[data-state=unknown]{--accent:#fcd34d}.metric[data-state=cancelled]{--accent:#fdba74}.metric[data-state=skipped]{--accent:#b9adc9}.metric[data-state=active]{--accent:#7dd3fc}.metric span{display:block;color:var(--muted);font-size:12px;overflow-wrap:anywhere}.metric strong{display:block;margin-top:5px;color:var(--accent);font-size:27px;line-height:1.1;font-variant-numeric:tabular-nums}.router-live{display:flex;align-items:center;gap:7px;flex-wrap:wrap;margin:7px 0;color:var(--muted);font-size:12px}.live-badge{padding:2px 8px;border-radius:20px;background:#ffffff08;border:1px solid #ffffff16}.live-badge.online{color:#86efac;border-color:#86efac40;background:#86efac0a}.live-badge.offline{color:#fda4af;border-color:#fda4af40;background:#fda4af0a} .head-actions{display:flex;gap:8px;flex-wrap:wrap}.queue-dashboard{margin:18px 0 14px;padding:18px;border:1px solid var(--line);border-radius:12px;background:linear-gradient(120deg,#30203e90,#141521b0)}.queue-heading{display:flex;align-items:center;justify-content:space-between;gap:12px;margin-bottom:12px}.queue-heading h2{margin:0;font-size:17px}.queue-badge{padding:4px 10px;border:1px solid #a78bfa50;border-radius:20px;background:#a78bfa12;color:#d8c8ff;font-size:12px;font-weight:700}.progress-label{display:flex;justify-content:space-between;gap:12px;margin-bottom:7px;color:var(--muted);font-size:12px}.progress-track{height:7px;overflow:hidden;border-radius:8px;background:#ffffff0b}.progress-fill{height:100%;width:0;background:linear-gradient(90deg,#8b5cf6,#38bdf8);border-radius:8px;transition:width .25s}.metrics{display:grid;grid-template-columns:repeat(4,minmax(0,1fr));gap:10px;margin-top:16px}.metric{--accent:#c4b5fd;min-width:0;text-align:center;padding:13px 12px;border:1px solid #ffffff12;border-top:2px solid var(--accent);border-radius:9px;background:#100b1b90}.metric[data-state=success]{--accent:#86efac}.metric[data-state=error]{--accent:#fda4af}.metric[data-state=unknown]{--accent:#fcd34d}.metric[data-state=cancelled]{--accent:#fdba74}.metric[data-state=skipped]{--accent:#b9adc9}.metric[data-state=active]{--accent:#7dd3fc}.metric span{display:block;color:var(--muted);font-size:12px;overflow-wrap:anywhere}.metric strong{display:block;margin-top:5px;color:var(--accent);font-size:27px;line-height:1.1;font-variant-numeric:tabular-nums}.router-live{display:flex;align-items:center;gap:7px;flex-wrap:wrap;margin:7px 0;color:var(--muted);font-size:12px}.live-badge{padding:2px 8px;border-radius:20px;background:#ffffff08;border:1px solid #ffffff16}.live-badge.online{color:#86efac;border-color:#86efac40;background:#86efac0a}.live-badge.offline{color:#fda4af;border-color:#fda4af40;background:#fda4af0a}
.metrics{grid-auto-rows:1fr}.metric.outcome-toggle{display:block;width:100%;text-align:center;font:inherit}.outcome-toggle::after{content:'Подробнее ›';display:block;margin-top:7px;color:var(--muted);font-size:11px}.outcome-toggle:hover,.outcome-toggle[aria-pressed=true]{background:#ffffff0c;border-color:var(--accent)}.outcome-toggle:focus-visible{outline:2px solid var(--accent);outline-offset:3px}.queue-outcomes{margin-top:16px;padding-top:16px;border-top:1px solid var(--line)}.outcome-heading{display:flex;align-items:center;justify-content:space-between;gap:10px;flex-wrap:wrap}.outcome-heading h3{margin:0;font-size:15px}.outcome-list{max-height:440px;overflow:auto;scrollbar-gutter:stable;margin-top:10px}.outcome-router{padding:12px;border:1px solid var(--line);border-radius:8px;background:#100b1b70}.outcome-router+.outcome-router{margin-top:8px}.outcome-title{display:flex;align-items:center;gap:8px;justify-content:space-between;flex-wrap:wrap}.outcome-title strong{min-width:0;overflow-wrap:anywhere}.outcome-badge{flex-shrink:0;font-size:12px}.outcome-router small{display:block;color:var(--muted);overflow-wrap:anywhere}.outcome-reason{margin:7px 0 0;white-space:pre-wrap;overflow-wrap:anywhere}.outcome-router details{margin-top:7px}.outcome-empty{margin:8px 0;color:var(--muted)}[hidden]{display:none!important} .metrics{grid-auto-rows:1fr}.metric.outcome-toggle{display:block;width:100%;text-align:center;font:inherit}.outcome-toggle::after{content:'Подробнее ›';display:block;margin-top:7px;color:var(--muted);font-size:11px}.outcome-toggle:hover,.outcome-toggle[aria-pressed=true]{background:#ffffff0c;border-color:var(--accent)}.outcome-toggle:focus-visible{outline:2px solid var(--accent);outline-offset:3px}.queue-outcomes{margin-top:16px;padding-top:16px;border-top:1px solid var(--line)}.outcome-heading{display:flex;align-items:center;justify-content:space-between;gap:10px;flex-wrap:wrap}.outcome-heading h3{margin:0;font-size:15px}.outcome-list{max-height:440px;overflow:auto;scrollbar-gutter:stable;margin-top:10px}.outcome-router{padding:12px;border:1px solid var(--line);border-radius:8px;background:#100b1b70}.outcome-router+.outcome-router{margin-top:8px}.outcome-title{display:flex;align-items:center;gap:8px;justify-content:space-between;flex-wrap:wrap}.outcome-title strong{min-width:0;overflow-wrap:anywhere}.outcome-badge{flex-shrink:0;font-size:12px}.outcome-router small{display:block;color:var(--muted);overflow-wrap:anywhere}.outcome-reason{margin:7px 0 0;white-space:pre-wrap;overflow-wrap:anywhere}.outcome-router details{margin-top:7px}.outcome-empty{margin:8px 0;color:var(--muted)}[hidden]{display:none!important}
.wrap{min-width:0}.panel,form,.head,.head-actions,.actions,.queue-dashboard,.queue-heading,.queue-outcomes,.outcome-heading,.outcome-list,.router,.outcome-router{min-width:0;max-width:100%}.head>*{min-width:0}h1,h2,h3,.hint,.note,.router small,.router-live span,.outcome-badge{overflow-wrap:anywhere}button,.btn{white-space:normal;overflow-wrap:anywhere}textarea{white-space:pre-wrap;overflow-wrap:anywhere}pre{max-width:100%;min-width:0}.outcome-title strong{flex:1 1 160px}.outcome-badge{max-width:100%} .wrap{min-width:0}.panel,form,.head,.head-actions,.actions,.queue-dashboard,.queue-heading,.queue-outcomes,.outcome-heading,.outcome-list,.router,.outcome-router{min-width:0;max-width:100%}.head>*{min-width:0}h1,h2,h3,.hint,.note,.router small,.router-live span,.outcome-badge{overflow-wrap:anywhere}button,.btn{white-space:normal;overflow-wrap:anywhere}textarea{white-space:pre-wrap;overflow-wrap:anywhere}pre{max-width:100%;min-width:0}.outcome-title strong{flex:1 1 160px}.outcome-badge{max-width:100%}
@media(max-width:680px){body{background-attachment:scroll;-webkit-text-size-adjust:100%;text-size-adjust:100%}.wrap{width:100%;padding:10px;padding-top:max(10px,env(safe-area-inset-top,0px));padding-right:max(10px,env(safe-area-inset-right,0px));padding-bottom:max(10px,env(safe-area-inset-bottom,0px));padding-left:max(10px,env(safe-area-inset-left,0px))}.panel{padding:12px}.head{align-items:stretch;flex-direction:column;gap:12px}h1{font-size:19px;line-height:1.35}.actions,.head-actions{display:grid;grid-template-columns:minmax(0,1fr);width:100%;gap:8px}.btn,button{width:100%;min-height:44px;padding:11px 12px}.head-actions .btn,.head-actions button,.actions button{font-size:14px}textarea,input{max-width:100%;font-size:16px;line-height:1.5}textarea{min-height:150px}input{max-width:none;min-height:46px}.note{margin:14px 0;padding:10px 12px;font-size:12px}.hint{font-size:12px}label{line-height:1.4}.queue-dashboard{padding:12px}.queue-heading{align-items:flex-start;flex-wrap:wrap;gap:8px}.queue-heading h2{font-size:16px;flex:1 1 160px}.queue-badge{max-width:100%;overflow-wrap:anywhere}.progress-label{font-size:11px}.progress-label>:first-child{min-width:0;overflow-wrap:anywhere}#progressPercent{flex-shrink:0}.metrics{grid-template-columns:repeat(2,minmax(0,1fr));gap:8px}.metric{padding:12px 10px}.metric span{font-size:12px;line-height:1.4}.metric strong{font-size:26px}.outcome-heading{align-items:stretch}.outcome-heading h3{width:100%;line-height:1.4}.outcome-list{max-height:min(440px,60vh);-webkit-overflow-scrolling:touch}.outcome-router{padding:10px}.outcome-title{align-items:flex-start}.outcome-badge{flex-shrink:1;text-align:left}summary{min-height:44px;padding:10px 0;line-height:1.5}.router{padding:14px 0}.router-live{align-items:flex-start;gap:6px}.router-live span{max-width:100%}pre{max-height:240px;padding:9px;font-size:12px}.outcome-reason{font-size:13px}} @media(max-width:680px){body{background-attachment:scroll;-webkit-text-size-adjust:100%;text-size-adjust:100%}.wrap{width:100%;padding:10px;padding-top:max(10px,env(safe-area-inset-top,0px));padding-right:max(10px,env(safe-area-inset-right,0px));padding-bottom:max(10px,env(safe-area-inset-bottom,0px));padding-left:max(10px,env(safe-area-inset-left,0px))}.panel{padding:12px}.head{align-items:stretch;flex-direction:column;gap:12px}h1{font-size:19px;line-height:1.35}.actions,.head-actions{display:grid;grid-template-columns:minmax(0,1fr);width:100%;gap:8px}.btn,button{width:100%;min-height:44px;padding:11px 12px}.head-actions .btn,.head-actions button,.actions button{font-size:14px}textarea,input{max-width:100%;font-size:16px;line-height:1.5}textarea{min-height:150px}input{max-width:none;min-height:46px}.note{margin:14px 0;padding:10px 12px;font-size:12px}.hint{font-size:12px}label{line-height:1.4}.queue-dashboard{padding:12px}.queue-heading{align-items:flex-start;flex-wrap:wrap;gap:8px}.queue-heading h2{font-size:16px;flex:1 1 160px}.queue-badge{max-width:100%;overflow-wrap:anywhere}.progress-label{font-size:11px}.progress-label>:first-child{min-width:0;overflow-wrap:anywhere}#progressPercent{flex-shrink:0}.metrics{grid-template-columns:repeat(2,minmax(0,1fr));gap:8px}.metric{padding:12px 10px}.metric span{font-size:12px;line-height:1.4}.metric strong{font-size:26px}.outcome-heading{align-items:stretch}.outcome-heading h3{width:100%;line-height:1.4}.outcome-list{max-height:min(440px,60vh);-webkit-overflow-scrolling:touch}.outcome-router{padding:10px}.outcome-title{align-items:flex-start}.outcome-badge{flex-shrink:1;text-align:left}summary{min-height:44px;padding:10px 0;line-height:1.5}.router{padding:14px 0}.router-live{align-items:flex-start;gap:6px}.router-live span{max-width:100%}pre{max-height:240px;padding:9px;font-size:12px}.outcome-reason{font-size:13px}}
</style></head><body><main class="wrap"> </style></head><body><main class="wrap">
<section class="panel"><div class="head"><h1>Обновить все роутеры разом</h1><div class="head-actions"><button id="refreshRouters" type="button" disabled>Обновить информацию о роутерах</button><a class="btn" href="/">Вернуться в Hub</a></div></div> <section class="panel"><div class="head"><h1>Обновить все роутеры разом</h1><div class="head-actions"><button id="refreshRouters" type="button" disabled>Обновить информацию о роутерах</button><a class="btn" href="/">Вернуться в Hub</a></div></div>
<blockquote class="note">Команда выполняется на роутерах по очереди через SSH. Укажи один общий SSH-пароль root. Для каждого роутера будет отдельный итог. Если туннель не работает, обновить этот роутер через VPS не получится.</blockquote> <blockquote class="note">Команда выполняется на роутерах по очереди через SSH. Укажи один общий SSH-пароль root. Для каждого роутера будет отдельный итог. Если SSH-туннель не работает, отправить команду этому роутеру через VPS не получится.</blockquote>
<form id="updateForm"><label for="command">Ссылка или команда обновления</label><textarea id="command" name="command" required maxlength="8192" autocapitalize="off" autocorrect="off" spellcheck="false">__COMMAND__</textarea> <form id="updateForm"><label for="command">Ссылка или команда обновления</label><textarea id="command" name="command" required maxlength="8192" autocapitalize="off" autocorrect="off" spellcheck="false">__COMMAND__</textarea>
<div class="hint form-hint">Вставь прямую ссылку HTTP/HTTPS на установочный shell-скрипт с любого своего источника или полную команду. Для ссылки загрузка и запуск выполняются автоматически.</div> <div class="hint form-hint">Вставь прямую ссылку HTTP/HTTPS на установочный shell-скрипт с любого своего источника или полную команду. Для ссылки загрузка и запуск выполняются автоматически.</div>
<label for="sshPassword">Общий SSH-пароль root на роутерах</label><input id="sshPassword" name="ssh_password" type="password" autocomplete="off" autocapitalize="off" autocorrect="off" spellcheck="false" placeholder="Оставь пустым, если настроен SSH-ключ"> <label for="sshPassword">Общий SSH-пароль root на роутерах</label><input id="sshPassword" name="ssh_password" type="password" autocomplete="off" autocapitalize="off" autocorrect="off" spellcheck="false" placeholder="Оставь пустым, если настроен SSH-ключ">
<div class="hint form-hint">Пароль используется только текущей очередью и не сохраняется на диске или в браузере. Закрытие вкладки не останавливает обновления. Перезапуск Hub прерывает очередь; начатая установка на роутере продолжает работать.</div> <div class="hint form-hint">Пароль используется только текущей очередью и не сохраняется на диске или в браузере. Закрытие вкладки не останавливает обновления. Перезапуск Hub прерывает очередь; начатая установка на роутере продолжает работать.</div>
<div class="actions"><button class="primary" id="start" type="submit" disabled>Обновить все по очереди</button><button id="cancel" type="button" disabled>Остановить всё</button></div></form> <div class="actions"><button class="primary" id="start" type="submit" disabled>Обновить все по очереди</button><button class="reboot" id="rebootAll" type="button" disabled>Перезапустить все роутера</button><button id="cancel" type="button" disabled>Остановить всё</button></div></form>
<div class="hint form-hint action-hint">«Остановить всё» сразу прекращает очередь и отправляет остановку текущей задачи. Уже внесённые установщиком изменения не откатываются. Если SSH недоступен, панель покажет, что остановка на роутере не подтверждена.</div> <div class="hint form-hint action-hint">«Остановить всё» сразу прекращает очередь и отправляет остановку текущей задачи. Уже внесённые установщиком изменения не откатываются. Если SSH недоступен, панель покажет, что остановка на роутере не подтверждена. При перезапуске очередь останавливается сразу, но уже отправленный reboot отменить нельзя.</div><div class="hint form-hint">Перезапуск идёт по очереди. «Успешно» означает, что роутер загрузился заново и SSH восстановился. Ожидание — до 3 минут на роутер; при ошибке или отсутствии подтверждения очередь продолжится.</div>
<section class="queue-dashboard" aria-label="Статистика очереди"><div class="queue-heading"><h2 id="queueTitle">Список роутеров</h2><span class="queue-badge" id="queueBadge">Загрузка</span></div> <section class="queue-dashboard" aria-label="Статистика очереди"><div class="queue-heading"><h2 id="queueTitle">Список роутеров</h2><span class="queue-badge" id="queueBadge">Загрузка</span></div>
<div class="progress-label"><span id="progressText">Получаю данные…</span><span id="progressPercent">0%</span></div><div class="progress-track" id="queueProgress" role="progressbar" aria-label="Ход очереди" aria-valuemin="0" aria-valuemax="100" aria-valuenow="0"><div class="progress-fill" id="progressFill"></div></div> <div class="progress-label"><span id="progressText">Получаю данные…</span><span id="progressPercent">0%</span></div><div class="progress-track" id="queueProgress" role="progressbar" aria-label="Ход очереди" aria-valuemin="0" aria-valuemax="100" aria-valuenow="0"><div class="progress-fill" id="progressFill"></div></div>
<div class="metrics"><div class="metric" data-state="total"><span>Всего роутеров</span><strong id="countTotal">0</strong></div><div class="metric" data-state="active"><span>Обновляются</span><strong id="countActive">0</strong></div><div class="metric" data-state="queued"><span>Ожидают</span><strong id="countQueued">0</strong></div><div class="metric" data-state="success"><span>Успешно</span><strong id="countSuccess">0</strong></div><button type="button" class="metric outcome-toggle" data-state="error" aria-controls="queueOutcomePanel" aria-pressed="false"><span>Ошибок</span><strong id="countError">0</strong></button><button type="button" class="metric outcome-toggle" data-state="unknown" aria-controls="queueOutcomePanel" aria-pressed="false"><span>Не подтверждено</span><strong id="countUnknown">0</strong></button><button type="button" class="metric outcome-toggle" data-state="cancelled" aria-controls="queueOutcomePanel" aria-pressed="false"><span>Остановлено</span><strong id="countCancelled">0</strong></button><button type="button" class="metric outcome-toggle" data-state="skipped" aria-controls="queueOutcomePanel" aria-pressed="false"><span>Пропущено</span><strong id="countSkipped">0</strong></button></div> <div class="metrics"><div class="metric" data-state="total"><span>Всего роутеров</span><strong id="countTotal">0</strong></div><div class="metric" data-state="active"><span id="activeLabel">Обновляются</span><strong id="countActive">0</strong></div><div class="metric" data-state="queued"><span>Ожидают</span><strong id="countQueued">0</strong></div><div class="metric" data-state="success"><span>Успешно</span><strong id="countSuccess">0</strong></div><button type="button" class="metric outcome-toggle" data-state="error" aria-controls="queueOutcomePanel" aria-pressed="false"><span>Ошибок</span><strong id="countError">0</strong></button><button type="button" class="metric outcome-toggle" data-state="unknown" aria-controls="queueOutcomePanel" aria-pressed="false"><span>Не подтверждено</span><strong id="countUnknown">0</strong></button><button type="button" class="metric outcome-toggle" data-state="cancelled" aria-controls="queueOutcomePanel" aria-pressed="false"><span>Остановлено</span><strong id="countCancelled">0</strong></button><button type="button" class="metric outcome-toggle" data-state="skipped" aria-controls="queueOutcomePanel" aria-pressed="false"><span>Пропущено</span><strong id="countSkipped">0</strong></button></div>
<section class="queue-outcomes" id="queueOutcomePanel" aria-labelledby="outcomeTitle" hidden><div class="outcome-heading"><h3 id="outcomeTitle">Проблемы обновления</h3><button type="button" id="showAllOutcomes" hidden>Показать все категории</button></div><p class="hint" id="outcomeHint">Здесь перечислены роутеры без подтверждённого успешного обновления и причины результата.</p><div class="outcome-list" id="outcomeList"></div></section></section> <section class="queue-outcomes" id="queueOutcomePanel" aria-labelledby="outcomeTitle" hidden><div class="outcome-heading"><h3 id="outcomeTitle">Проблемы обновления</h3><button type="button" id="showAllOutcomes" hidden>Показать все категории</button></div><p class="hint" id="outcomeHint">Здесь перечислены роутеры без подтверждённого успеха и причины результата.</p><div class="outcome-list" id="outcomeList"></div></section></section>
<div id="status" role="status" aria-live="polite">Получаю список роутеров…</div></section> <div id="status" role="status" aria-live="polite">Получаю список роутеров…</div></section>
<section class="panel"><h2>Роутеры</h2><div class="hint">Текущая связь определяется по Heartbeat. Итог установки показан отдельно и не означает, что роутер сейчас онлайн.</div><div id="results"></div></section> <section class="panel"><h2>Роутеры</h2><div class="hint">Текущая связь определяется по Heartbeat. Итог команды показан отдельно и не означает, что роутер сейчас онлайн.</div><div id="results"></div></section>
</main><script> </main><script>
(()=>{ (()=>{
const csrf=__CSRF__, endpoint='/api/router-updates', form=document.getElementById('updateForm'), command=document.getElementById('command'), password=document.getElementById('sshPassword'), start=document.getElementById('start'), cancel=document.getElementById('cancel'), status=document.getElementById('status'), results=document.getElementById('results'); const csrf=__CSRF__, endpoint='/api/router-updates', form=document.getElementById('updateForm'), command=document.getElementById('command'), password=document.getElementById('sshPassword'), start=document.getElementById('start'), rebootAll=document.getElementById('rebootAll'), cancel=document.getElementById('cancel'), status=document.getElementById('status'), results=document.getElementById('results');
const refreshRouters=document.getElementById('refreshRouters'),outcomePanel=document.getElementById('queueOutcomePanel'),outcomeList=document.getElementById('outcomeList'),showAllOutcomes=document.getElementById('showAllOutcomes'); const refreshRouters=document.getElementById('refreshRouters'),outcomePanel=document.getElementById('queueOutcomePanel'),outcomeList=document.getElementById('outcomeList'),showAllOutcomes=document.getElementById('showAllOutcomes');
const outcomeLabels={error:'Ошибка',unknown:'Не подтверждено',cancelled:'Остановлено',skipped:'Пропущено'},outcomeTitles={error:'Ошибки',unknown:'Не подтверждено',cancelled:'Остановлено',skipped:'Пропущено'}; const outcomeLabels={error:'Ошибка',unknown:'Не подтверждено',cancelled:'Остановлено',skipped:'Пропущено'},outcomeTitles={error:'Ошибки',unknown:'Не подтверждено',cancelled:'Остановлено',skipped:'Пропущено'};
let timer=null, pending=false, refreshing=false, job=null, routers=[], lastRender='', stopped=false, generation=0,outcomeFilter='all',lastOutcomeRender='',outcomeJobId=null; let timer=null, pending=false, refreshing=false, job=null, routers=[], lastRender='', stopped=false, generation=0,outcomeFilter='all',lastOutcomeRender='',outcomeJobId=null;
let requestId=''; let requestId='',requestAction='update';
const requestKey='owrt-router-update-request'; const requestKey='owrt-router-update-request';
try{requestId=sessionStorage.getItem(requestKey)||'';}catch(error){} try{requestId=sessionStorage.getItem(requestKey)||'';requestAction=sessionStorage.getItem(requestKey+'-action')||'update';}catch(error){}
function requestToken(){if(!requestId){const bytes=crypto.getRandomValues(new Uint8Array(16));requestId=Array.from(bytes,n=>n.toString(16).padStart(2,'0')).join('');try{sessionStorage.setItem(requestKey,requestId);}catch(error){}}return requestId;} function requestToken(action){if(requestId&&requestAction!==action)forgetRequest();if(!requestId){requestAction=action;const bytes=crypto.getRandomValues(new Uint8Array(16));requestId=Array.from(bytes,n=>n.toString(16).padStart(2,'0')).join('');try{sessionStorage.setItem(requestKey,requestId);sessionStorage.setItem(requestKey+'-action',action);}catch(error){}}return requestId;}
function forgetRequest(){requestId='';try{sessionStorage.removeItem(requestKey);}catch(error){}} function forgetRequest(){requestId='';try{sessionStorage.removeItem(requestKey);sessionStorage.removeItem(requestKey+'-action');}catch(error){}}
function controls(){const active=job&&job.state==='running';start.disabled=pending||active;command.disabled=pending||active;password.disabled=pending||active;cancel.disabled=pending||!active||job.cancel_requested;refreshRouters.disabled=pending;refreshRouters.textContent=refreshing?'Обновляю информацию…':'Обновить информацию о роутерах';} function rebooting(){return job&&job.operation==='reboot';}
function controls(){const active=job&&job.state==='running';start.disabled=pending||active;rebootAll.disabled=pending||active;command.disabled=pending||active;password.disabled=pending||active;cancel.disabled=pending||!active||job.cancel_requested;refreshRouters.disabled=pending;refreshRouters.textContent=refreshing?'Обновляю информацию…':'Обновить информацию о роутерах';}
function dashboard(){ function dashboard(){
document.getElementById('activeLabel').textContent=rebooting()?'Перезапускаются':'Обновляются';
const items=job?job.items:[],count=state=>items.filter(x=>x.state===state).length,counts={Total:job?items.length:routers.length,Active:items.filter(x=>['connecting','running','cancelling'].includes(x.state)).length,Queued:count('queued'),Success:count('success'),Error:count('error'),Unknown:count('unknown'),Cancelled:count('cancelled'),Skipped:count('skipped')}; const items=job?job.items:[],count=state=>items.filter(x=>x.state===state).length,counts={Total:job?items.length:routers.length,Active:items.filter(x=>['connecting','running','cancelling'].includes(x.state)).length,Queued:count('queued'),Success:count('success'),Error:count('error'),Unknown:count('unknown'),Cancelled:count('cancelled'),Skipped:count('skipped')};
Object.entries(counts).forEach(([key,value])=>{document.getElementById('count'+key).textContent=value;}); Object.entries(counts).forEach(([key,value])=>{document.getElementById('count'+key).textContent=value;});
const done=counts.Success+counts.Error+counts.Unknown+counts.Cancelled+counts.Skipped,percent=counts.Total&&job?Math.round(done*100/counts.Total):0; const done=counts.Success+counts.Error+counts.Unknown+counts.Cancelled+counts.Skipped,percent=counts.Total&&job?Math.round(done*100/counts.Total):0;
@@ -12270,13 +12274,13 @@ label{display:block;margin:14px 0 6px;font-weight:700}textarea,input{display:blo
outcomePanel.hidden=!job&&outcomeFilter==='all';showAllOutcomes.hidden=outcomeFilter==='all'; outcomePanel.hidden=!job&&outcomeFilter==='all';showAllOutcomes.hidden=outcomeFilter==='all';
document.querySelectorAll('.outcome-toggle').forEach(button=>button.setAttribute('aria-pressed',String(button.dataset.state===outcomeFilter))); document.querySelectorAll('.outcome-toggle').forEach(button=>button.setAttribute('aria-pressed',String(button.dataset.state===outcomeFilter)));
const items=(job?job.items:[]).filter(item=>Object.hasOwn(outcomeLabels,item.state)&&(outcomeFilter==='all'||item.state===outcomeFilter)); const items=(job?job.items:[]).filter(item=>Object.hasOwn(outcomeLabels,item.state)&&(outcomeFilter==='all'||item.state===outcomeFilter));
document.getElementById('outcomeTitle').textContent=(outcomeFilter==='all'?'Проблемы обновления':outcomeTitles[outcomeFilter])+' · '+items.length; document.getElementById('outcomeTitle').textContent=(outcomeFilter==='all'?(rebooting()?'Проблемы перезапуска':'Проблемы обновления'):outcomeTitles[outcomeFilter])+' · '+items.length;
const signature=JSON.stringify([jobId,outcomeFilter,items]);if(signature===lastOutcomeRender)return;lastOutcomeRender=signature; const signature=JSON.stringify([jobId,outcomeFilter,items]);if(signature===lastOutcomeRender)return;lastOutcomeRender=signature;
const scrollTop=outcomeList.scrollTop,open=new Map(Array.from(outcomeList.querySelectorAll('article')).map(row=>[row.dataset.router,{open:!!row.querySelector('details[open]'),top:row.querySelector('pre')?.scrollTop||0}])),fragment=document.createDocumentFragment(); const scrollTop=outcomeList.scrollTop,open=new Map(Array.from(outcomeList.querySelectorAll('article')).map(row=>[row.dataset.router,{open:!!row.querySelector('details[open]'),top:row.querySelector('pre')?.scrollTop||0}])),fragment=document.createDocumentFragment();
if(!items.length){const empty=document.createElement('p');empty.className='outcome-empty';empty.textContent=!job?'Сначала запусти очередь обновления.':outcomeFilter==='all'?'Роутеров с ошибками, без подтверждения, остановленных или пропущенных пока нет.':'Роутеров в этой категории нет.';fragment.append(empty);} if(!items.length){const empty=document.createElement('p');empty.className='outcome-empty';empty.textContent=!job?'Сначала запусти очередь.':outcomeFilter==='all'?'Роутеров с ошибками, без подтверждения, остановленных или пропущенных пока нет.':'Роутеров в этой категории нет.';fragment.append(empty);}
items.forEach(item=>{ items.forEach(item=>{
const row=document.createElement('article'),header=document.createElement('div'),name=document.createElement('strong'),badge=document.createElement('span'),id=document.createElement('small'),reason=document.createElement('p'); const row=document.createElement('article'),header=document.createElement('div'),name=document.createElement('strong'),badge=document.createElement('span'),id=document.createElement('small'),reason=document.createElement('p');
row.className='outcome-router';row.dataset.router=item.id;header.className='outcome-title';name.textContent=item.name||'Имя роутера не получено';badge.className='outcome-badge '+(item.state==='error'?'error':'warn');badge.textContent=outcomeLabels[item.state];header.append(name,badge);id.textContent='ID: '+item.id;reason.className='outcome-reason';reason.textContent=item.message||'Причина не получена от задачи обновления.';row.append(header,id,reason); row.className='outcome-router';row.dataset.router=item.id;header.className='outcome-title';name.textContent=item.name||'Имя роутера не получено';badge.className='outcome-badge '+(item.state==='error'?'error':'warn');badge.textContent=outcomeLabels[item.state];header.append(name,badge);id.textContent='ID: '+item.id;reason.className='outcome-reason';reason.textContent=item.message||'Причина не получена от задачи.';row.append(header,id,reason);
if(item.output){const details=document.createElement('details'),summary=document.createElement('summary'),output=document.createElement('pre');summary.textContent='Вывод команды';output.textContent=item.output;details.open=!!open.get(item.id)?.open;details.append(summary,output);row.append(details);}fragment.append(row); if(item.output){const details=document.createElement('details'),summary=document.createElement('summary'),output=document.createElement('pre');summary.textContent='Вывод команды';output.textContent=item.output;details.open=!!open.get(item.id)?.open;details.append(summary,output);row.append(details);}fragment.append(row);
}); });
outcomeList.replaceChildren(fragment);outcomeList.scrollTop=scrollTop;outcomeList.querySelectorAll('article').forEach(row=>{const output=row.querySelector('pre');if(output)output.scrollTop=open.get(row.dataset.router)?.top||0;}); outcomeList.replaceChildren(fragment);outcomeList.scrollTop=scrollTop;outcomeList.querySelectorAll('article').forEach(row=>{const output=row.querySelector('pre');if(output)output.scrollTop=open.get(row.dataset.router)?.top||0;});
@@ -12290,10 +12294,12 @@ label{display:block;margin:14px 0 6px;font-weight:700}textarea,input{display:blo
if(item.output){const details=document.createElement('details'), summary=document.createElement('summary'), output=document.createElement('pre');summary.textContent='Вывод команды';output.textContent=item.output;details.open=!!open.get(item.id)?.open;details.append(summary,output);row.append(details);}fragment.append(row); if(item.output){const details=document.createElement('details'), summary=document.createElement('summary'), output=document.createElement('pre');summary.textContent='Вывод команды';output.textContent=item.output;details.open=!!open.get(item.id)?.open;details.append(summary,output);row.append(details);}fragment.append(row);
});results.replaceChildren(fragment);results.querySelectorAll('article').forEach(row=>{const output=row.querySelector('pre');if(output)output.scrollTop=open.get(row.dataset.router)?.top||0;}); });results.replaceChildren(fragment);results.querySelectorAll('article').forEach(row=>{const output=row.querySelector('pre');if(output)output.scrollTop=open.get(row.dataset.router)?.top||0;});
} }
function summary(){return !job?'Список роутеров обновлён':job.state==='running'?(job.cancel_requested?'Останавливаю обновление':'Обновление выполняется'):'Очередь завершена';} function summary(){return !job?'Список роутеров обновлён':job.state==='running'?(job.cancel_requested?'Останавливаю очередь':rebooting()?'Перезапуск выполняется':'Обновление выполняется'):rebooting()?'Очередь перезапуска завершена':'Очередь завершена';}
async function api(path,body){const controller=new AbortController(), timeout=setTimeout(()=>controller.abort(),15000);try{const response=await fetch(endpoint+path,{method:body?'POST':'GET',cache:'no-store',headers:body?{'Content-Type':'application/json','X-Router-Update-CSRF':csrf}:{},body:body?JSON.stringify(body):undefined,signal:controller.signal});if(response.status===401){window.location.replace('/login');throw new Error('Нужен вход в Hub');}const data=await response.json();if(!response.ok)throw new Error(data.error||'HTTP '+response.status);return data;}finally{clearTimeout(timeout);}} async function api(path,body){const controller=new AbortController(), timeout=setTimeout(()=>controller.abort(),15000);try{const response=await fetch(endpoint+path,{method:body?'POST':'GET',cache:'no-store',headers:body?{'Content-Type':'application/json','X-Router-Update-CSRF':csrf}:{},body:body?JSON.stringify(body):undefined,signal:controller.signal});if(response.status===401){window.location.replace('/login');throw new Error('Нужен вход в Hub');}const data=await response.json();if(!response.ok)throw new Error(data.error||'HTTP '+response.status);return data;}finally{clearTimeout(timeout);}}
async function refresh(){if(stopped||pending)return;const current=++generation;if(timer!==null)clearTimeout(timer);timer=null;try{const data=await api('');if(current!==generation||pending)return;render(data);status.className='';status.textContent=summary();if(job&&job.state!=='running'&&job.request_id===requestId)forgetRequest();}catch(error){if(current===generation){status.className='error';status.textContent='Не удалось получить состояние: '+error.message;}}finally{if(!stopped&&!pending&&current===generation)timer=setTimeout(refresh,3000);}} async function refresh(){if(stopped||pending)return;const current=++generation;if(timer!==null)clearTimeout(timer);timer=null;try{const data=await api('');if(current!==generation||pending)return;render(data);status.className='';status.textContent=summary();if(job&&job.state!=='running'&&job.request_id===requestId)forgetRequest();}catch(error){if(current===generation){status.className='error';status.textContent='Не удалось получить состояние: '+error.message;}}finally{if(!stopped&&!pending&&current===generation)timer=setTimeout(refresh,3000);}}
form.addEventListener('submit',async event=>{event.preventDefault();if(pending||(job&&job.state==='running'))return;generation++;pending=true;controls();if(timer!==null)clearTimeout(timer);try{const body={command:command.value,ssh_password:password.value,request_id:requestToken()};const data=await api('/start',body);password.value='';render(data);status.className='';status.textContent=summary();}catch(error){password.value='';status.className='error';status.textContent='Запуск не подтверждён: '+error.message+'. Проверяю состояние очереди.';}finally{pending=false;controls();if(!stopped)timer=setTimeout(refresh,1000);}}); async function startQueue(action){if(pending||(job&&job.state==='running'))return;generation++;pending=true;controls();if(timer!==null)clearTimeout(timer);try{const body={ssh_password:password.value,request_id:requestToken(action)};if(action==='update')body.command=command.value;const data=await api(action==='reboot'?'/reboot':'/start',body);password.value='';render(data);status.className='';status.textContent=summary();}catch(error){password.value='';status.className='error';status.textContent='Запуск не подтверждён: '+error.message+'. Проверяю состояние очереди.';}finally{pending=false;controls();if(!stopped)timer=setTimeout(refresh,1000);}}
form.addEventListener('submit',event=>{event.preventDefault();startQueue('update');});
rebootAll.addEventListener('click',()=>startQueue('reboot'));
cancel.addEventListener('click',async()=>{if(!job||pending)return;generation++;if(timer!==null)clearTimeout(timer);pending=true;controls();status.textContent='Останавливаю текущую задачу и очередь…';try{const data=await api('/cancel',{id:job.id});render(data);status.textContent=summary();}catch(error){status.textContent='Остановка не подтверждена: '+error.message;}finally{pending=false;controls();if(!stopped)timer=setTimeout(refresh,1000);}}); cancel.addEventListener('click',async()=>{if(!job||pending)return;generation++;if(timer!==null)clearTimeout(timer);pending=true;controls();status.textContent='Останавливаю текущую задачу и очередь…';try{const data=await api('/cancel',{id:job.id});render(data);status.textContent=summary();}catch(error){status.textContent='Остановка не подтверждена: '+error.message;}finally{pending=false;controls();if(!stopped)timer=setTimeout(refresh,1000);}});
document.querySelectorAll('.outcome-toggle').forEach(button=>button.addEventListener('click',()=>{outcomeFilter=button.dataset.state;outcomeList.scrollTop=0;renderOutcomes();})); document.querySelectorAll('.outcome-toggle').forEach(button=>button.addEventListener('click',()=>{outcomeFilter=button.dataset.state;outcomeList.scrollTop=0;renderOutcomes();}));
showAllOutcomes.addEventListener('click',()=>{outcomeFilter='all';outcomeList.scrollTop=0;renderOutcomes();}); showAllOutcomes.addEventListener('click',()=>{outcomeFilter='all';outcomeList.scrollTop=0;renderOutcomes();});
@@ -14660,6 +14666,66 @@ def router_update_fields(output):
return fields return fields
def router_reboot_probe_script(task_id=''):
script = r'''set -eu
printf 'OWRT_UPDATE_NAME_TEXT='
(uci -q get owrtremote.main.router_name || true) | head -c 512 | tr '\r\n' ' '
printf '\nOWRT_UPDATE_BOOT_ID='
cat /proc/sys/kernel/random/boot_id
'''
if task_id:
script += ('job=/tmp/owrt-remote-reboot-' + task_id + '\n' + r'''if [ -s "$job/result" ]; then
printf 'OWRT_UPDATE_RC='; cat "$job/result"
fi
printf 'OWRT_UPDATE_OUTPUT_TEXT=\n'
tail -c 2048 "$job/output" 2>/dev/null || true
''')
else:
script += r'''for tool in uci setsid reboot sleep mkdir cat head tail tr mv; do
if ! command -v "$tool" >/dev/null 2>&1; then
printf 'OWRT_UPDATE_STATE=not_started\nOWRT_UPDATE_ERROR=На роутере отсутствует утилита %s. Перезагрузка не запускалась.\n' "$tool"
exit 0
fi
done
printf 'OWRT_UPDATE_READY=1\n'
'''
return script
def router_reboot_launch_script(task_id, delay=3):
# Give SSH time to deliver the receipt; a new boot_id confirms the reboot.
return r'''set -eu
umask 077
job=/tmp/owrt-remote-reboot-__TASK__
started=0
launch_exit() {
rc=$?
trap - EXIT
if [ "$rc" -ne 0 ] && [ "$started" = 0 ]; then
printf 'OWRT_UPDATE_STATE=not_started\nOWRT_UPDATE_ERROR=Не удалось подготовить перезагрузку, rc=%s. Команда reboot не запускалась.\n' "$rc"
exit 0
fi
exit "$rc"
}
trap launch_exit EXIT
if [ ! -d "$job" ]; then
mkdir "$job"
cat >"$job/reboot.sh" <<'OWRT_REBOOT_RUNNER'
#!/bin/sh
job=$1
sleep __DELAY__
reboot >"$job/output" 2>&1
rc=$?
printf '%s\n' "$rc" >"$job/result.new"
mv "$job/result.new" "$job/result"
OWRT_REBOOT_RUNNER
(trap '' HUP; exec setsid /bin/sh "$job/reboot.sh" "$job") </dev/null >/dev/null 2>&1 &
fi
started=1
printf 'OWRT_UPDATE_STARTED=1\n'
'''.replace('__TASK__', task_id).replace('__DELAY__', str(max(0, int(delay))))
class RouterUpdateManager: class RouterUpdateManager:
"""One sequential owner-controlled queue per Hub, independent of the browser.""" """One sequential owner-controlled queue per Hub, independent of the browser."""
POLL_SECONDS = 3 POLL_SECONDS = 3
@@ -14669,6 +14735,7 @@ class RouterUpdateManager:
SILENCE_TIMEOUT = 90 SILENCE_TIMEOUT = 90
STOP_TIMEOUT = 10 STOP_TIMEOUT = 10
RESULT_TTL = 7200 RESULT_TTL = 7200
REBOOT_TIMEOUT = 180
def __init__(self, app): def __init__(self, app):
self.app = app self.app = app
@@ -14742,19 +14809,26 @@ class RouterUpdateManager:
if self.job and self.job['id'] == job_id and self.job['state'] != 'running': if self.job and self.job['id'] == job_id and self.job['state'] != 'running':
self.job = None self.job = None
def start(self, command, password, request_id): def start_reboot(self, password, request_id):
if not isinstance(command, str) or not command.strip() or len(command.encode('utf-8')) > 8192 or '\x00' in command: return self.start('', password, request_id, operation='reboot')
def start(self, command, password, request_id, operation='update'):
if operation not in {'update', 'reboot'}:
raise ValueError('Неизвестное действие очереди.')
if operation == 'update' and (not isinstance(command, str) or not command.strip() or len(command.encode('utf-8')) > 8192 or '\x00' in command):
raise ValueError('Укажи команду обновления размером до 8 КиБ без нулевых символов.') raise ValueError('Укажи команду обновления размером до 8 КиБ без нулевых символов.')
if not isinstance(password, str) or len(password.encode('utf-8')) > 1024 or '\x00' in password: if not isinstance(password, str) or len(password.encode('utf-8')) > 1024 or '\x00' in password:
raise ValueError('Некорректный SSH-пароль.') raise ValueError('Некорректный SSH-пароль.')
if not isinstance(request_id, str) or not re.fullmatch(r'[a-zA-Z0-9_-]{16,80}', request_id): if not isinstance(request_id, str) or not re.fullmatch(r'[a-zA-Z0-9_-]{16,80}', request_id):
raise ValueError('Некорректный идентификатор запроса. Обнови страницу.') raise ValueError('Некорректный идентификатор запроса. Обнови страницу.')
command = normalize_router_update_command(command) command = normalize_router_update_command(command) if operation == 'update' else ''
with self.lock: with self.lock:
if self.job and self.job['request_id'] == request_id: if self.job and self.job['request_id'] == request_id:
if self.job['operation'] != operation:
raise ValueError('Этот запрос уже использован для другого действия. Обнови страницу.')
return self.job['id'] return self.job['id']
if self.job and self.job['state'] == 'running': if self.job and self.job['state'] == 'running':
raise RuntimeError('Очередь уже запущена. Дождись её завершения или останови оставшиеся обновления.') raise RuntimeError('Очередь уже запущена. Дождись её завершения или останови очередь.')
if self.stopping.is_set(): if self.stopping.is_set():
raise RuntimeError('Hub завершает работу. Повтори после запуска.') raise RuntimeError('Hub завершает работу. Повтори после запуска.')
self.cancel_event.clear() self.cancel_event.clear()
@@ -14762,7 +14836,7 @@ class RouterUpdateManager:
with self.app.conn() as conn: with self.app.conn() as conn:
rows = [dict(row) for row in list_router_rows(conn)] rows = [dict(row) for row in list_router_rows(conn)]
if not rows: if not rows:
raise ValueError('Нет роутеров для обновления.') raise ValueError('Нет роутеров для запуска очереди.')
if len(rows) > 512: if len(rows) > 512:
raise ValueError('В одной очереди поддерживается до 512 роутеров.') raise ValueError('В одной очереди поддерживается до 512 роутеров.')
items = [] items = []
@@ -14770,9 +14844,9 @@ class RouterUpdateManager:
items.append({'id': row['id'], 'name': router_update_name(row), items.append({'id': row['id'], 'name': router_update_name(row),
'state': 'queued', 'message': 'Ожидает очереди', 'output': '', 'elapsed_seconds': 0}) 'state': 'queued', 'message': 'Ожидает очереди', 'output': '', 'elapsed_seconds': 0})
job_id = secrets.token_hex(16) job_id = secrets.token_hex(16)
self.job = {'id': job_id, 'request_id': request_id, 'state': 'running', 'started_at': time.time(), self.job = {'id': job_id, 'request_id': request_id, 'operation': operation, 'state': 'running', 'started_at': time.time(),
'finished_at': 0, 'cancel_requested': False, 'items': items} 'finished_at': 0, 'cancel_requested': False, 'items': items}
self.thread = threading.Thread(target=self._run, args=(rows, command, password, job_id), daemon=True, self.thread = threading.Thread(target=self._run, args=(rows, command, password, job_id, operation), daemon=True,
name='owrt-router-updates') name='owrt-router-updates')
try: try:
self.thread.start() self.thread.start()
@@ -14792,7 +14866,8 @@ class RouterUpdateManager:
item.update(state='skipped', message='Пропущен: очередь остановлена пользователем') item.update(state='skipped', message='Пропущен: очередь остановлена пользователем')
elif item['state'] in {'connecting', 'running', 'cancelling'}: elif item['state'] in {'connecting', 'running', 'cancelling'}:
item['state'] = 'cancelling' item['state'] = 'cancelling'
item['message'] = 'Останавливаю текущую задачу…' item['message'] = ('Останавливаю очередь; уже отправленный reboot не отменяется'
if self.job['operation'] == 'reboot' else 'Останавливаю текущую задачу…')
self.cancel_event.set() self.cancel_event.set()
self.wake.set() self.wake.set()
self._interrupt_transport() self._interrupt_transport()
@@ -14837,7 +14912,7 @@ class RouterUpdateManager:
'Технический ответ: ' + safe) 'Технический ответ: ' + safe)
return cls._safe(text, password)[:1200] or 'Ошибка подключения по SSH' return cls._safe(text, password)[:1200] or 'Ошибка подключения по SSH'
def _run(self, rows, command, password, job_id): def _run(self, rows, command, password, job_id, operation):
try: try:
for index, row in enumerate(rows): for index, row in enumerate(rows):
if self._cancelled(): if self._cancelled():
@@ -14852,11 +14927,15 @@ class RouterUpdateManager:
if not current: if not current:
self._set(index, state='skipped', message='Роутер удалён из Hub') self._set(index, state='skipped', message='Роутер удалён из Hub')
continue continue
self._update_one(index, current, command, password, job_id) if operation == 'reboot':
self._reboot_one(index, current, password, job_id)
else:
self._update_one(index, current, command, password, job_id)
except Exception as exc: except Exception as exc:
cancelled = self.cancel_event.is_set() cancelled = self.cancel_event.is_set()
self._set(index, state='cancelled' if cancelled else 'error', self._set(index, state='cancelled' if cancelled else 'error',
message='Остановлено до отправки команды установки' if cancelled else self._ssh_error(exc, password)) message=('Остановлено до отправки команды ' + ('reboot' if operation == 'reboot' else 'установки'))
if cancelled else self._ssh_error(exc, password))
finally: finally:
password = '' password = ''
command = '' command = ''
@@ -14864,6 +14943,77 @@ class RouterUpdateManager:
self.job['state'] = 'finished' self.job['state'] = 'finished'
self.job['finished_at'] = time.time() self.job['finished_at'] = time.time()
def _reboot_one(self, index, row, password, job_id):
if not int(row.get('ssh_entry_port') or 0):
self._set(index, state='skipped', message='SSH-туннель не настроен; команда reboot не отправлена')
return
if self._cancelled():
self._set(index, state='skipped', message='Пропущен: очередь остановлена')
return
self._set(index, state='connecting', message='Проверяю SSH перед перезагрузкой')
try:
fields = router_update_fields(self._ssh(row, router_reboot_probe_script(), password))
except Exception as exc:
cancelled = self._cancelled()
self._set(index, state='cancelled' if cancelled else 'error',
message=('Остановлено до отправки reboot' if cancelled else
self._ssh_error(exc, password) + '. Команда reboot не отправлена.'))
return
self._set(index, name=router_update_name(row, fields.get('NAME', '')))
if fields.get('STATE') == 'not_started':
self._set(index, state='error', message=self._safe(fields.get('ERROR'), password)
or 'Проверка роутера не пройдена; команда reboot не отправлена')
return
boot_id = fields.get('BOOT_ID', '')
if fields.get('READY') != '1' or not re.fullmatch(r'[a-fA-F0-9-]{36}', boot_id):
self._set(index, state='error', message='Не получен идентификатор загрузки роутера; команда reboot не отправлена')
return
if self._cancelled():
self._set(index, state='cancelled', message='Остановлено до отправки reboot')
return
task_id = job_id + '-' + str(index)
started = time.monotonic()
last_error = ''
accepted = False
try:
fields = router_update_fields(self._ssh(row, router_reboot_launch_script(task_id), password))
if fields.get('STATE') == 'not_started':
self._set(index, state='error', message=self._safe(fields.get('ERROR'), password)
or 'Не удалось подготовить перезагрузку; команда reboot не запускалась')
return
accepted = fields.get('STARTED') == '1'
except Exception as exc:
# A disconnect may be the reboot itself. Never resend this task.
last_error = self._ssh_error(exc, password)
self._set(index, state='running', message='Команда reboot отправлена; ожидаю новую загрузку и восстановление SSH')
while not self._cancelled() and time.monotonic() - started < self.REBOOT_TIMEOUT:
elapsed = int(time.monotonic() - started)
try:
fields = router_update_fields(self._ssh(row, router_reboot_probe_script(task_id), password))
current_boot = fields.get('BOOT_ID', '')
if re.fullmatch(r'[a-fA-F0-9-]{36}', current_boot) and current_boot != boot_id:
self._set(index, state='success', elapsed_seconds=elapsed,
message='Роутер успешно перезагружен: новая загрузка и SSH подтверждены')
return
rc = fields.get('RC', '')
if re.fullmatch(r'\d{1,3}', rc) and rc != '0':
self._set(index, state='error', elapsed_seconds=elapsed,
message='Команда reboot завершилась ошибкой, rc=' + rc,
output=self._safe(fields.get('OUTPUT', ''), password))
return
except Exception as exc:
last_error = self._ssh_error(exc, password)
self._set(index, elapsed_seconds=elapsed,
message=('Команда reboot принята; ' if accepted else 'Отправка reboot не подтверждена; ')
+ 'ожидаю новую загрузку и SSH: ' + str(elapsed) + ' с из ' + str(self.REBOOT_TIMEOUT) + ' с')
self.wake.wait(self.POLL_SECONDS)
self.wake.clear()
message = ('Очередь остановлена; уже отправленный reboot не отменяется. '
if self._cancelled() else 'Новая загрузка и SSH не подтверждены за ' + str(self.REBOOT_TIMEOUT) + ' с. ')
self._set(index, state='unknown', elapsed_seconds=int(time.monotonic() - started),
message=message + 'Повторная команда не отправлялась. Проверь связь с роутером.'
+ (' Последний ответ SSH: ' + last_error if last_error else ''))
def _update_one(self, index, row, command, password, job_id): def _update_one(self, index, row, command, password, job_id):
if not int(row.get('ssh_entry_port') or 0): if not int(row.get('ssh_entry_port') or 0):
self._set(index, state='skipped', message='SSH-туннель не настроен') self._set(index, state='skipped', message='SSH-туннель не настроен')
@@ -16744,6 +16894,8 @@ a{{display:inline-flex;margin-top:18px;color:#93c5fd}}
raise ValueError('Ожидается объект JSON.') raise ValueError('Ожидается объект JSON.')
if action == 'start': if action == 'start':
manager.start(payload.get('command'), payload.get('ssh_password', ''), payload.get('request_id')) manager.start(payload.get('command'), payload.get('ssh_password', ''), payload.get('request_id'))
elif action == 'reboot':
manager.start_reboot(payload.get('ssh_password', ''), payload.get('request_id'))
elif action == 'cancel': elif action == 'cancel':
manager.cancel(payload.get('id')) manager.cancel(payload.get('id'))
elif action == 'refresh': elif action == 'refresh':
@@ -18350,7 +18502,7 @@ exit 127
def do_POST(self): def do_POST(self):
path = self.parsed().path path = self.parsed().path
if path in {'/api/router-updates/start', '/api/router-updates/cancel', '/api/router-updates/refresh'}: if path in {'/api/router-updates/start', '/api/router-updates/reboot', '/api/router-updates/cancel', '/api/router-updates/refresh'}:
self.router_updates_api(path.rsplit('/', 1)[-1]) self.router_updates_api(path.rsplit('/', 1)[-1])
return return
if path == "/login": if path == "/login":