Add v118 dashboard update confirmation and responsive spacing
This commit is contained in:
1 parent
dfa16f3772
commit
2a8b646b5c
70 files changed
+2246
-211
No files matched your search
@@ -505,7 +505,7 @@ render_page() {
|
||||
<meta charset="utf-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<meta name="owrt-remote-ui-version" content="$OWRT_REMOTE_UI_VERSION">
|
||||
<title>OpenWrt Remote Hub v117</title>
|
||||
<title>OpenWrt Remote Hub v118</title>
|
||||
<style>
|
||||
:root{color-scheme:dark;--bg:#07040f;--panel:rgba(19,14,32,.88);--text:#f7f2ff;--muted:#b9adc9;--line:rgba(169,126,255,.24);--blue:#7c3aed;--green:#22c55e;--red:#fb7185;--amber:#f59e0b;--teal:#a855f7;--grid:rgba(168,85,247,.16)}
|
||||
*{box-sizing:border-box}body{position:relative;min-height:100vh;margin:0;overflow-x:hidden;background-color:var(--bg);background-image:radial-gradient(circle at 12% 8%,rgba(168,85,247,.46),transparent 31%),radial-gradient(circle at 82% 12%,rgba(79,70,229,.38),transparent 30%),radial-gradient(circle at 50% 105%,rgba(236,72,153,.26),transparent 35%),linear-gradient(145deg,#07040f,#120a24 48%,#05030a),repeating-linear-gradient(0deg,transparent 0 30px,var(--grid) 31px),repeating-linear-gradient(90deg,transparent 0 30px,var(--grid) 31px);background-size:130% 130%,140% 140%,135% 135%,100% 100%,31px 31px,31px 31px;background-attachment:fixed;color:var(--text);font:14px/1.45 system-ui,-apple-system,BlinkMacSystemFont,"Segoe UI",sans-serif;animation:bgFlow 22s ease-in-out infinite alternate}
|
||||
@@ -540,7 +540,7 @@ form{margin:0}.formgrid{display:grid;grid-template-columns:repeat(2,minmax(0,1fr
|
||||
<div class="brand">
|
||||
<div class="brandPanel">
|
||||
<div class="titleRow">
|
||||
<h1 class="appBanner"><span>OpenWrt Remote Hub <span class="appBannerVersion">v117</span></span></h1>
|
||||
<h1 class="appBanner"><span>OpenWrt Remote Hub <span class="appBannerVersion">v118</span></span></h1>
|
||||
</div>
|
||||
<div class="links">
|
||||
<a class="uiPill" href="https://t.me/kzolotarev95" target="_blank" rel="noopener noreferrer">Telegram</a>
|
||||
|
||||
@@ -14,7 +14,7 @@ return view.extend({
|
||||
|
||||
if (!key) {
|
||||
return E('div', { 'class': 'cbi-map' }, [
|
||||
E('h2', {}, _('OpenWrt Remote Hub v117')),
|
||||
E('h2', {}, _('OpenWrt Remote Hub v118')),
|
||||
E('div', { 'class': 'alert-message warning' }, [
|
||||
_('Web key not found. Reinstall the module or create /etc/owrt-remote/web.key.')
|
||||
])
|
||||
@@ -34,7 +34,7 @@ return view.extend({
|
||||
}, 100);
|
||||
|
||||
return E('div', { 'class': 'cbi-map' }, [
|
||||
E('h2', {}, _('OpenWrt Remote Hub v117')),
|
||||
E('h2', {}, _('OpenWrt Remote Hub v118')),
|
||||
E('p', {}, _('Opening remote access panel...')),
|
||||
E('p', {}, [
|
||||
E('a', { 'class': 'btn cbi-button cbi-button-apply', 'href': url }, _('Open panel'))
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# Heartbeat: HTTPS, авторизация и диагностика (v117)
|
||||
# Heartbeat: HTTPS, авторизация и диагностика (v118)
|
||||
|
||||
## Разбор сбоя 15.10.2026
|
||||
|
||||
@@ -82,7 +82,7 @@ powershell.exe -NoProfile -ExecutionPolicy Bypass -File "C:\Users\k.zolotarev95\
|
||||
Обновляются агент и WAN helper. Перезапускается только экземпляр Heartbeat
|
||||
под procd; Xray и удалённый туннель скрипт не перезапускает. Остановленный
|
||||
экземпляр остаётся остановленным. Резервная копия первых файлов сохраняется
|
||||
в `/root/owrt-remote-backup-before-heartbeat-transport-v117`.
|
||||
в `/root/owrt-remote-backup-before-heartbeat-transport-v118`.
|
||||
Маркер `HEARTBEAT_TRANSPORT_ROUTER_Install_OK` подтверждает установку кода,
|
||||
а доступность Hub проверяется отдельно:
|
||||
|
||||
|
||||
+12
-12
@@ -1,4 +1,4 @@
|
||||
# Фиксация VPS host и независимое соединение Remote через WAN (v117)
|
||||
# Фиксация VPS host и независимое соединение Remote через WAN (v118)
|
||||
|
||||
`vps_host_mode=manual` сохраняет заданный на роутере адрес. Это значение
|
||||
используется и когда опция отсутствует у старой установки. Только явно
|
||||
@@ -42,8 +42,8 @@ powershell.exe -NoProfile -ExecutionPolicy Bypass -File "vps\deploy-hub-url-fix.
|
||||
```
|
||||
|
||||
Откат: те же команды с `-Action Rollback`, без `-HubUrl`. Резервные копии:
|
||||
`/root/owrt-remote-backup-before-hub-url-v117` на роутере и
|
||||
`/opt/owrt-remote/owrt-remote-hub.py.bak-before-hub-url-v117` на VPS.
|
||||
`/root/owrt-remote-backup-before-hub-url-v118` на роутере и
|
||||
`/opt/owrt-remote/owrt-remote-hub.py.bak-before-hub-url-v118` на VPS.
|
||||
`HEARTBEAT_OK` подтверждает ответ Hub. Если файлы установлены, но Hub недоступен,
|
||||
скрипт отдельно сообщает `HEARTBEAT_FAILED`; это не подтверждение связи.
|
||||
|
||||
@@ -125,21 +125,21 @@ powershell.exe -NoProfile -ExecutionPolicy Bypass -File "vps\deploy-host-policy.
|
||||
|
||||
Установка загружает локальные файлы, без Git. До остановки службы проверяются
|
||||
доступность WAN и поддержка таблицы реальной командой ip на роутере.
|
||||
На роутер загружается и файл LuCI: версия v117 появляется и в основной
|
||||
На роутер загружается и файл LuCI: версия v118 появляется и в основной
|
||||
CGI-панели, и в странице входа в неё через LuCI.
|
||||
Сначала сохраняются файлы
|
||||
и конфигурация; после замены проверяется heartbeat/health. При ошибке
|
||||
автоматически восстанавливается состояние перед текущей попыткой.
|
||||
Сохранённая резервная копия для ручного отката не перезаписывается.
|
||||
|
||||
* Роутер: `/root/owrt-remote-backup-before-host-policy-v117` — агент,
|
||||
* Роутер: `/root/owrt-remote-backup-before-host-policy-v118` — агент,
|
||||
helper, init, CGI, UCI-конфигурация и Xray-конфиг (в закрытом каталоге).
|
||||
* VPS: `/opt/owrt-remote/owrt-remote-hub.py.bak-before-host-policy-v117`.
|
||||
* VPS: `/opt/owrt-remote/owrt-remote-hub.py.bak-before-host-policy-v118`.
|
||||
База роутеров и настройки авторизации не заменяются.
|
||||
|
||||
Успешная установка заканчивается `HOST_POLICY_ROUTER_V117_OK` на роутере
|
||||
и `HOST_POLICY_VPS_V117_Install_OK` на VPS. Старые резервные копии предыдущей
|
||||
версии сохраняются; новые команды отката используют отдельные копии для v117.
|
||||
Успешная установка заканчивается `HOST_POLICY_ROUTER_V118_OK` на роутере
|
||||
и `HOST_POLICY_VPS_V118_Install_OK` на VPS. Старые резервные копии предыдущей
|
||||
версии сохраняются; новые команды отката используют отдельные копии для v118.
|
||||
|
||||
### Переход с nftables-маркировки на адресную маршрутизацию
|
||||
|
||||
@@ -148,11 +148,11 @@ CGI-панели, и в странице входа в неё через LuCI.
|
||||
Обновление VPS для этого изменения не требуется.
|
||||
|
||||
```powershell
|
||||
powershell.exe -NoProfile -ExecutionPolicy Bypass -File "vps\deploy-host-policy.ps1" -Target Router -Machine "root@192.168.2.1" -PreserveConnectionSettings -BackupName "podkop-compat-v117" -Action Install
|
||||
powershell.exe -NoProfile -ExecutionPolicy Bypass -File "vps\deploy-host-policy.ps1" -Target Router -Machine "root@192.168.2.1" -BackupName "podkop-compat-v117" -Action Rollback
|
||||
powershell.exe -NoProfile -ExecutionPolicy Bypass -File "vps\deploy-host-policy.ps1" -Target Router -Machine "root@192.168.2.1" -PreserveConnectionSettings -BackupName "podkop-compat-v118" -Action Install
|
||||
powershell.exe -NoProfile -ExecutionPolicy Bypass -File "vps\deploy-host-policy.ps1" -Target Router -Machine "root@192.168.2.1" -BackupName "podkop-compat-v118" -Action Rollback
|
||||
```
|
||||
|
||||
Копия: `/root/owrt-remote-backup-before-podkop-compat-v117`.
|
||||
Копия: `/root/owrt-remote-backup-before-podkop-compat-v118`.
|
||||
После установки повторите диагностику Podkop. Предупреждение от прежних правил
|
||||
Remote должно исчезнуть. Настоящие дополнительные правила других приложений
|
||||
по-прежнему обнаруживаются штатной диагностикой.
|
||||
|
||||
@@ -0,0 +1,170 @@
|
||||
# Обновление панели из Hub (v118)
|
||||
|
||||
Перед «Поиск роутеров» владелец видит кнопку «Обновление панели».
|
||||
Обе кнопки оформлены как остальные элементы шапки и стоят рядом на ПК.
|
||||
На мобильных устройствах каждая занимает отдельную строку.
|
||||
Подтверждённая актуальная сборка обозначается зелёным, доступное обновление —
|
||||
жёлтым. Проверка и ошибка проверки остаются нейтральными. Сообщение проверки
|
||||
размещено первым блоком панели над шапкой, выровнено по центру и отделено
|
||||
от элементов управления отступом. Во всех состояниях текст блока белый,
|
||||
рамка полупрозрачная, как у «Открыть группы роутеров», фон прозрачный. Ширина ограничена
|
||||
680 пикселями, на ПК сверху добавлен отступ 12 пикселей. На мобильном длинный
|
||||
текст переносится без обрезки. Элементы шапки идут последовательно:
|
||||
ЦП / ОЗУ / ДИСК, обновление панели, эффекты, поиск роутеров. Кнопки занимают
|
||||
отдельные строки одинаковой ширины, включая горизонтальную ориентацию.
|
||||
Мобильная кнопка «Поиск роутеров» имеет такую же фиолетовую заливку и белый
|
||||
текст, как «Эффекты», в том числе при открытом поиске.
|
||||
Между мобильными кнопками обновления, эффектов, поиска, меню Hub, добавления,
|
||||
групп и статистики используется единый интервал 8 пикселей. Раскрытые блоки
|
||||
отделены тем же интервалом; скрытые элементы не оставляют пустых промежутков.
|
||||
|
||||
При открытии панели запускается общая фоновая проверка исходного файла Hub.
|
||||
Проверки кешируются на 5 минут; открытые видимые вкладки опрашивают результат
|
||||
раз в минуту. Нажатие кнопки позволяет запросить проверку раньше, с ограничением
|
||||
не чаще одного сетевого запроса за 15 секунд. Во время установки статус
|
||||
запрашивается раз в 2 секунды. Скрытые вкладки приостанавливают опрос.
|
||||
|
||||
Сравнивается SHA-256 файла, поэтому изменения обнаруживаются и при неизменной
|
||||
версии v118. «Доступно обновление» означает, что опубликованный файл отличается
|
||||
от запущенного. Установка требует подтверждения конкретной проверенной сборки.
|
||||
Ветка GitHub использует свой `RAW_REPO_BASE`; при переносе в GitVerse необходимо
|
||||
сохранить его собственный `RAW_REPO_BASE`. Адрес не принимается от браузера.
|
||||
|
||||
Обновляется только файл VPS-панели. Процесс запускается отдельной transient-службой
|
||||
systemd, сохраняет резервную копию, проверяет размер, UTF-8, синтаксис Python
|
||||
и совместимость обновления, затем атомарно заменяет файл. Проверка `/health`
|
||||
подтверждает именно SHA-256 новой запущенной сборки. При ошибке после замены
|
||||
возвращается предыдущий файл и повторно запускается Hub. Результат сохраняется
|
||||
в `STATE_DIR/panel-update/job.json`; предыдущий файл — `previous.py` рядом.
|
||||
После успеха страница автоматически перезагружается один раз.
|
||||
После перезагрузки сообщение завершённой задачи больше не обещает повторную
|
||||
перезагрузку: при подтверждённой актуальности выводится «У вас последняя версия
|
||||
панели, обновление не требуется». Следующие проверки и доступные новые сборки
|
||||
показывают текущее состояние, даже если сохранена предыдущая успешная задача.
|
||||
|
||||
Очередь, состояние и резервная копия ограничены одним обновлением. Блокировка
|
||||
flock не позволяет запустить две установки; при аварии её освобождает ядро.
|
||||
Зависшая или прерванная задача получает явный неподтверждённый результат.
|
||||
API доступен только владельцу, POST требует CSRF-токен и проверку Origin.
|
||||
|
||||
Подтверждение установки открывается встроенным адаптивным баннером панели с
|
||||
версией, контрольной суммой, источником и кнопками «Отмена» и «Обновить».
|
||||
На мобильном он занимает ширину экрана с безопасными полями, не вызывает
|
||||
системное белое окно браузера и не допускает горизонтального переполнения.
|
||||
|
||||
До публикации этой функции публичный старый Hub может не поддерживать проверку
|
||||
сборки после перезапуска. Такая сборка отклоняется до замены файла.
|
||||
Сообщение «Сборка в источнике ещё не поддерживает проверяемое обновление из
|
||||
панели» означает отсутствие механизма обновления в загруженном файле, а не
|
||||
отсутствие новых изменений. При такой ошибке кнопка остаётся нейтральной:
|
||||
актуальность установленной сборки не подтверждена.
|
||||
|
||||
## Проверка через кнопку без публикации
|
||||
|
||||
Скрипт ниже подготавливает на VPS две временные сборки из текущего локального
|
||||
исходника v118. Различается только тестовая отметка, поэтому их SHA-256 разные.
|
||||
Первая сборка устанавливается скриптом, вторая предлагается кнопкой обновления.
|
||||
Только эти временные сборки читают файл-кандидат на самой VPS вместо GitHub.
|
||||
Ссылки установки и `RAW_REPO_BASE` остаются прежними. Данные обычной очереди
|
||||
обновления и её резервная копия сохраняются: тест использует отдельный каталог.
|
||||
|
||||
Подготовить тест из Windows 11 PowerShell:
|
||||
|
||||
```powershell
|
||||
powershell.exe -NoProfile -ExecutionPolicy Bypass -File "C:\Users\k.zolotarev95\Documents\openwrt overlay\vps\test-hub-self-update.ps1" -Vps "root@193.233.82.38" -Action Prepare
|
||||
```
|
||||
|
||||
Для повторного теста вместо двух отдельных команд `Restore` и `Prepare`
|
||||
используется одна команда. Она возвращает прежний файл, если тест уже был
|
||||
подготовлен, затем устанавливает новые тестовые сборки. При ошибке возврата
|
||||
второй шаг не выполняется; исходная резервная копия не перезаписывается.
|
||||
|
||||
```powershell
|
||||
powershell.exe -NoProfile -ExecutionPolicy Bypass -File "C:\Users\k.zolotarev95\Documents\openwrt overlay\vps\test-hub-self-update.ps1" -Vps "root@193.233.82.38" -Action Retest
|
||||
```
|
||||
|
||||
После `SELF_UPDATE_LOCAL_TEST_READY`:
|
||||
|
||||
1. Открыть панель владельцем, нажать Ctrl+F5 и дождаться жёлтой кнопки
|
||||
«Обновление панели».
|
||||
2. Нажать кнопку и подтвердить установку. Источник в подтверждении —
|
||||
«Локальный тест на VPS (без GitHub)».
|
||||
3. Дождаться результата и автоматической перезагрузки страницы. При успехе
|
||||
кнопка станет зелёной.
|
||||
|
||||
Это настоящая замена файла Hub и перезапуск `owrt-remote` через systemd.
|
||||
Сервис кратковременно перезапускается; скачивание с GitHub этим тестом
|
||||
не проверяется. Подготовка также перезапускает Hub. При неудаче подготовки
|
||||
скрипт возвращает исходный файл и проверяет работоспособность.
|
||||
|
||||
Проверить установленный файл, результат задачи, активность службы и SHA-256
|
||||
запущенной через `/health` сборки:
|
||||
|
||||
```powershell
|
||||
powershell.exe -NoProfile -ExecutionPolicy Bypass -File "C:\Users\k.zolotarev95\Documents\openwrt overlay\vps\test-hub-self-update.ps1" -Vps "root@193.233.82.38" -Action Status
|
||||
```
|
||||
|
||||
Успешный итог — `SELF_UPDATE_LOCAL_TEST_PASSED`.
|
||||
`SELF_UPDATE_LOCAL_TEST_WAITING` означает, что успех ещё не подтверждён;
|
||||
следом выводятся статус задачи и результаты проверки.
|
||||
`SELF_UPDATE_LOCAL_TEST_NOT_PREPARED` означает, что каталог теста отсутствует.
|
||||
Диагностика показывает `installed_build` (`baseline`, `candidate` или `other`),
|
||||
контрольные суммы установленного и реально запущенного файла, а также
|
||||
`running_installed_file`. Она не меняет VPS и не показывает ключи. Если сборка
|
||||
теста реально запущена, но браузер сообщает об ошибке проверки GitHub, нужно
|
||||
сверить VPS, на которую указывает открытый домен, и полный результат подготовки.
|
||||
|
||||
После проверки вернуть файл, который работал до подготовки теста:
|
||||
|
||||
```powershell
|
||||
powershell.exe -NoProfile -ExecutionPolicy Bypass -File "C:\Users\k.zolotarev95\Documents\openwrt overlay\vps\test-hub-self-update.ps1" -Vps "root@193.233.82.38" -Action Restore
|
||||
```
|
||||
|
||||
Ожидается `SELF_UPDATE_LOCAL_TEST_RESTORED`. Скрипт проверяет резервную копию
|
||||
`/opt/owrt-remote/self-update-local-test/before.py`, возвращает её, перезапускает
|
||||
Hub, проверяет `/health`, затем удаляет только созданные файлы теста.
|
||||
Повторная подготовка не перезаписывает существующую резервную копию: сначала
|
||||
нужно завершить тест и выполнить `Restore` либо использовать `Retest`.
|
||||
После восстановления обычная
|
||||
проверка снова использует GitHub; до публикации совместимой сборки исходное
|
||||
сообщение о неподдерживаемом обновлении ожидаемо появится снова.
|
||||
|
||||
## Локальная установка с Windows 11
|
||||
|
||||
```powershell
|
||||
powershell.exe -NoProfile -ExecutionPolicy Bypass -File "C:\Users\k.zolotarev95\Documents\openwrt overlay\vps\deploy-hub-self-update.ps1" -Vps "root@193.233.82.38" -Action Install
|
||||
```
|
||||
|
||||
После `HUB_SELF_UPDATE_V118_Install_OK` обновить страницу через Ctrl+F5.
|
||||
|
||||
Откат локальной установки:
|
||||
|
||||
```powershell
|
||||
powershell.exe -NoProfile -ExecutionPolicy Bypass -File "C:\Users\k.zolotarev95\Documents\openwrt overlay\vps\deploy-hub-self-update.ps1" -Vps "root@193.233.82.38" -Action Rollback
|
||||
```
|
||||
|
||||
Используется резервная копия
|
||||
`/opt/owrt-remote/owrt-remote-hub.py.bak-before-hub-self-update-v118`.
|
||||
|
||||
## Проверки
|
||||
|
||||
```powershell
|
||||
python tests/test_hub_update.py -v
|
||||
python tests/test_hub_self_update_local.py -v
|
||||
node tests/test_hub_update_ui.cjs
|
||||
```
|
||||
|
||||
Python проверяет загрузку из правильного источника, ошибки сети и синтаксиса,
|
||||
неизменную версию, проверку контрольной суммы, сохранение рабочего файла,
|
||||
установку и откат, восстановление состояния после перезапуска и права API.
|
||||
Перезапуск systemd и ответы health в этих тестах моделируются.
|
||||
Отдельный тест локального сценария проверяет реальные файлы и HTTP `/health`
|
||||
до и после повторного запуска сервера с новым исходником, успешное обновление,
|
||||
возврат исходного файла, сохранение обычного состояния обновления и подготовку
|
||||
UTF-8 файлов из Windows PowerShell. Команды systemd в автоматическом тесте
|
||||
моделируются; их выполнение на VPS проверяется ручным сценарием выше.
|
||||
Браузер проверяет размеры 1280, 980, 320, 390, 430, 844 и 932 пикселя,
|
||||
положение статуса над шапкой, перенос текста, размеры мобильных кнопок,
|
||||
подтверждение/отмену,
|
||||
разрыв связи при перезапуске, результат и отсутствие повторной установки
|
||||
или цикла перезагрузок страницы. Сам VPS этими тестами не изменяется.
|
||||
@@ -1,4 +1,4 @@
|
||||
# Journal collector liveness fix (local v117)
|
||||
# Journal collector liveness fix (local v118)
|
||||
|
||||
## What the reported evidence does and does not prove
|
||||
|
||||
@@ -68,7 +68,7 @@ WAN/DNS or policy routing. VPS files and hosting URLs are untouched.
|
||||
powershell.exe -NoProfile -ExecutionPolicy Bypass -File "C:\Users\k.zolotarev95\Documents\openwrt overlay\vps\deploy-log-collector-fix.ps1" -Router "root@192.168.2.1" -Action Install
|
||||
```
|
||||
|
||||
Retained backup: `/root/owrt-remote-backup-before-log-collector-v117`.
|
||||
Retained backup: `/root/owrt-remote-backup-before-log-collector-v118`.
|
||||
Rollback leaves journal data intact:
|
||||
|
||||
```powershell
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# Persistent client journal (v117 local fix)
|
||||
# Persistent client journal (v118 local fix)
|
||||
|
||||
The helper is `/usr/lib/owrt-remote/logs.sh`. It changes only Remote's private
|
||||
journal, not logd, network configuration, policy routing or Xray configuration.
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# reCAPTCHA v3 в OpenWrt Remote Hub v117
|
||||
# reCAPTCHA v3 в OpenWrt Remote Hub v118
|
||||
|
||||
В меню владельца, в блоке «Капча на экране входа», доступны цифры,
|
||||
Google reCAPTCHA v2 Checkbox и Google reCAPTCHA v3. Установка обновления
|
||||
@@ -74,8 +74,8 @@ powershell.exe -NoProfile -ExecutionPolicy Bypass -File "vps\deploy-recaptcha-v3
|
||||
непосредственно перед попыткой. Резервные копии при повторном запуске
|
||||
не перезаписываются:
|
||||
|
||||
* `/opt/owrt-remote/owrt-remote-hub.py.bak-before-recaptcha-v3-v117`
|
||||
* `/opt/owrt-remote/captcha-before-recaptcha-v3-v117.json` (режим 0600).
|
||||
* `/opt/owrt-remote/owrt-remote-hub.py.bak-before-recaptcha-v3-v118`
|
||||
* `/opt/owrt-remote/captcha-before-recaptcha-v3-v118.json` (режим 0600).
|
||||
|
||||
Скрипт рассчитан на стандартные пути установленного Hub:
|
||||
`/opt/owrt-remote/owrt-remote-hub.py`, `/var/lib/owrt-remote/hub-auth.json`
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# Аудит ресурсов OpenWrt Remote Hub v117
|
||||
# Аудит ресурсов OpenWrt Remote Hub v118
|
||||
|
||||
Исправления внесены поверх `7f809fd`. Версия панели остаётся v117.
|
||||
Исправления внесены поверх `7f809fd`. Версия панели остаётся v118.
|
||||
|
||||
## SQLite
|
||||
|
||||
@@ -115,7 +115,7 @@ powershell.exe -NoProfile -ExecutionPolicy Bypass -File "vps\deploy-resource-fix
|
||||
|
||||
Установщик загружает локальный файл без Git, запускает изолированные тесты,
|
||||
сохраняет исходный серверный файл:
|
||||
`/opt/owrt-remote/owrt-remote-hub.py.bak-before-resource-fix-v117`,
|
||||
`/opt/owrt-remote/owrt-remote-hub.py.bak-before-resource-fix-v118`,
|
||||
атомарно заменяет Python файл, перезапускает `owrt-remote` и проверяет health.
|
||||
Существующая резервная копия не перезаписывается. При ошибке установки
|
||||
восстанавливается файл, работавший непосредственно перед текущей попыткой.
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# Обновление всех роутеров из Hub, v117
|
||||
# Обновление всех роутеров из Hub, v118
|
||||
|
||||
В меню владельца «Доступ к Hub» добавлен блок «Обновить все роутеры разом».
|
||||
Ссылка «Открыть терминал обновления» открывает отдельную вкладку. В ней задаются
|
||||
@@ -128,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
|
||||
```
|
||||
|
||||
Резервная копия: `/opt/owrt-remote/owrt-remote-hub.py.bak-before-router-reboot-all-v117`.
|
||||
Резервная копия: `/opt/owrt-remote/owrt-remote-hub.py.bak-before-router-reboot-all-v118`.
|
||||
Не устанавливай/не откатывай Hub, пока его очередь работает.
|
||||
|
||||
## Проверки
|
||||
|
||||
@@ -0,0 +1,39 @@
|
||||
# Версия v118
|
||||
|
||||
Версия v118 указана в панели VPS, на экране входа, в мобильной шапке,
|
||||
CGI и представлении LuCI роутера. Скрипты локальной установки, их проверки
|
||||
и документация используют тот же номер. Ссылки источников не менялись.
|
||||
|
||||
Установить локальную сборку на VPS:
|
||||
|
||||
```powershell
|
||||
powershell.exe -NoProfile -ExecutionPolicy Bypass -File "C:\Users\k.zolotarev95\Documents\openwrt overlay\vps\deploy-version-v118.ps1" -Vps "root@193.233.82.38" -Action Install
|
||||
```
|
||||
|
||||
В ходе текущего тестирования обновления через кнопку вместо обычной установки
|
||||
нужно использовать тестовые сборки из [HUB_UPDATE.md](HUB_UPDATE.md):
|
||||
|
||||
```powershell
|
||||
powershell.exe -NoProfile -ExecutionPolicy Bypass -File "C:\Users\k.zolotarev95\Documents\openwrt overlay\vps\test-hub-self-update.ps1" -Vps "root@193.233.82.38" -Action Retest
|
||||
```
|
||||
|
||||
Установить версию интерфейса роутера (CGI и LuCI):
|
||||
|
||||
```powershell
|
||||
powershell.exe -NoProfile -ExecutionPolicy Bypass -File "C:\Users\k.zolotarev95\Documents\openwrt overlay\vps\deploy-version-v118.ps1" -Router "root@192.168.2.1" -Action Install
|
||||
```
|
||||
|
||||
Скрипт сохраняет первую резервную копию и проверяет файлы до установки.
|
||||
При ошибке после замены возвращает файлы предыдущей попытки.
|
||||
Установщики не выполняют миграцию настроек роутера; после установки
|
||||
интерфейса нужно обновить страницу через Ctrl+F5.
|
||||
|
||||
Для отката обычной установки VPS либо роутера повторить соответствующую
|
||||
команду с `-Action Rollback`. Копии:
|
||||
|
||||
- VPS: `/opt/owrt-remote/owrt-remote-hub.py.bak-before-v118`.
|
||||
- Роутер: `/root/owrt-remote-backup-before-v118` (CGI и LuCI).
|
||||
|
||||
Для возврата из тестового режима обновления VPS повторить команду
|
||||
`test-hub-self-update.ps1` с `-Action Restore`: его копия хранится отдельно,
|
||||
в `/opt/owrt-remote/self-update-local-test/before.py`.
|
||||
+13
-11
@@ -1,17 +1,18 @@
|
||||
# Виджеты ресурсов VPS (v117)
|
||||
# Виджеты ресурсов VPS (v118)
|
||||
|
||||
Три карточки ЦП, ОЗУ и ДИСК находятся над кнопками «Рестарт Xray VPS»,
|
||||
профилем и выходом. На ПК ширина и высота совпадают с кнопками под ними.
|
||||
На мобильном карточки видны над кнопкой открытия меню хаба.
|
||||
|
||||
Панель запрашивает `/api/vps/resources` сразу и каждые 3 секунды.
|
||||
Начальные показания приходят вместе с HTML панели, до первого запроса браузера.
|
||||
Панель запрашивает `/api/vps/resources` сразу и каждую секунду.
|
||||
ЦП — общая загрузка процессоров по разнице счётчиков `/proc/stat`.
|
||||
ОЗУ — занятая память, рассчитанная как `MemTotal - MemAvailable`.
|
||||
ДИСК — занятое место файловой системы `/`. В подсказках указаны число
|
||||
vCPU и объёмы занятой/общей памяти и диска.
|
||||
|
||||
Доступ требует входа в Hub. Показания общие для всех вкладок и кешируются
|
||||
на 3 секунды. Сбор не открывает SQLite и не запускает внешние команды.
|
||||
на 1 секунду. Сбор не открывает SQLite и не запускает внешние команды.
|
||||
Опрос приостанавливается в скрытой вкладке; после возвращения возобновляется.
|
||||
При ошибке связи вместо устаревших чисел показывается «—».
|
||||
|
||||
@@ -20,21 +21,21 @@ vCPU и объёмы занятой/общей памяти и диска.
|
||||
В PowerShell, из любого каталога:
|
||||
|
||||
```powershell
|
||||
powershell.exe -NoProfile -ExecutionPolicy Bypass -File "C:\Users\k.zolotarev95\Documents\openwrt overlay\vps\deploy-vps-widgets.ps1" -Vps "root@193.233.82.38" -Action Install
|
||||
powershell.exe -NoProfile -ExecutionPolicy Bypass -File "C:\Users\k.zolotarev95\Documents\openwrt overlay\vps\deploy-vps-resources-fix.ps1" -Vps "root@193.233.82.38" -Action Install
|
||||
```
|
||||
|
||||
После `VPS_WIDGETS_V117_Install_OK` обновите страницу через Ctrl+F5.
|
||||
После `VPS_RESOURCES_LIVE_V118_Install_OK` обновите страницу через Ctrl+F5.
|
||||
Скрипт загружает локальный файл, проверяет его до замены, перезапускает
|
||||
службу и проверяет health. При ошибке после замены восстанавливает файл
|
||||
перед текущей попыткой. База данных и настройки не заменяются.
|
||||
|
||||
```powershell
|
||||
powershell.exe -NoProfile -ExecutionPolicy Bypass -File "C:\Users\k.zolotarev95\Documents\openwrt overlay\vps\deploy-vps-widgets.ps1" -Vps "root@193.233.82.38" -Action Rollback
|
||||
powershell.exe -NoProfile -ExecutionPolicy Bypass -File "C:\Users\k.zolotarev95\Documents\openwrt overlay\vps\deploy-vps-resources-fix.ps1" -Vps "root@193.233.82.38" -Action Rollback
|
||||
```
|
||||
|
||||
Откат использует неизменяемую копию первого состояния до установки:
|
||||
`/opt/owrt-remote/owrt-remote-hub.py.bak-before-vps-widgets-v117`.
|
||||
Успешное завершение: `VPS_WIDGETS_V117_Rollback_OK`.
|
||||
`/opt/owrt-remote/owrt-remote-hub.py.bak-before-vps-resources-live-v118`.
|
||||
Успешное завершение: `VPS_RESOURCES_LIVE_V118_Rollback_OK`.
|
||||
|
||||
## Локальные проверки
|
||||
|
||||
@@ -45,7 +46,8 @@ node --check .test-output/vps-widgets/dashboard.js
|
||||
node tests/test_vps_resources_ui.cjs .test-output/vps-widgets/dashboard.js
|
||||
```
|
||||
|
||||
Проверяются вычисления, совместный кеш при одновременных запросах,
|
||||
ошибки чтения, авторизация HTTP и отсутствие доступа к SQLite.
|
||||
JS-проверки охватывают обновление обеих версий панели, отсутствие
|
||||
Проверяются вычисления, начальные показания в HTML, совместный кеш при
|
||||
одновременных запросах, ошибки чтения, авторизация HTTP и отсутствие доступа к SQLite.
|
||||
JS-проверки охватывают сохранение показаний при первом pageshow,
|
||||
обновление обеих версий панели каждую секунду, отсутствие
|
||||
параллельных запросов, таймауты, восстановление связи и скрытие вкладки.
|
||||
+2
-2
@@ -1,4 +1,4 @@
|
||||
# WAN IPv4 DNS fallback (local v117 fix)
|
||||
# WAN IPv4 DNS fallback (local v118 fix)
|
||||
|
||||
`files/usr/lib/owrt-remote/wan.sh` now explicitly queries
|
||||
`nslookup -type=A -timeout=3 -retry=1 "$host" "$dns"`.
|
||||
@@ -58,7 +58,7 @@ powershell.exe -NoProfile -ExecutionPolicy Bypass -File "C:\Users\k.zolotarev95\
|
||||
```
|
||||
|
||||
The installer saves the first backup at
|
||||
`/root/owrt-remote-backup-before-wan-dns-v117/wan.sh`, checks shell syntax and
|
||||
`/root/owrt-remote-backup-before-wan-dns-v118/wan.sh`, checks shell syntax and
|
||||
reloads only the supervised heartbeat instance so it reads the new helper.
|
||||
It does not restart Xray or regenerate configuration/routing. Installation
|
||||
verification/reload failures restore the file from that attempt.
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# Несколько WAN интерфейсов и резервирование (v117)
|
||||
# Несколько WAN интерфейсов и резервирование (v118)
|
||||
|
||||
Кнопка **Выбрать интерфейсы** раскрывает список с галочками. Можно отметить
|
||||
один, два, три и больше интерфейсов. Список содержит имена
|
||||
@@ -46,7 +46,7 @@ powershell.exe -NoProfile -ExecutionPolicy Bypass -File "C:\Users\k.zolotarev95\
|
||||
|
||||
Скрипт устанавливает CGI, LuCI, агент, WAN helper и hotplug вместе. До замены
|
||||
сохраняются прежние файлы, UCI-настройки и Xray config в
|
||||
`/root/owrt-remote-backup-before-wan-multi-v117`.
|
||||
`/root/owrt-remote-backup-before-wan-multi-v118`.
|
||||
Успех подтверждает `WAN_MULTI_ROUTER_Install_OK`. После установки обновить
|
||||
панель роутера через Ctrl+F5, отметить интерфейсы и сохранить выбор.
|
||||
VPS обновлять не требуется. Старый `deploy-wan-interface-picker.ps1`
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# Восстановление Xray после пропажи выбранного WAN (v117)
|
||||
# Восстановление Xray после пропажи выбранного WAN (v118)
|
||||
|
||||
Сообщения `No selected WAN has a physical IPv4 default route`, ошибки
|
||||
генерации конфигурации и `crash loop 6 crashes` описывают последовательность:
|
||||
@@ -50,7 +50,7 @@ powershell.exe -NoProfile -ExecutionPolicy Bypass -File "C:\Users\k.zolotarev95\
|
||||
```
|
||||
|
||||
Скрипт обновляет агент и WAN helper парой, сохраняет первую копию в
|
||||
`/root/owrt-remote-backup-before-wan-recovery-v117`, проверяет shell-синтаксис
|
||||
`/root/owrt-remote-backup-before-wan-recovery-v118`, проверяет shell-синтаксис
|
||||
и побайтовое совпадение. Затем перезагружает только работающий Heartbeat,
|
||||
чтобы в RAM не остался прежний shell с уже загруженными функциями.
|
||||
Туннель при исправном Xray не перезапускается. Остановленный Heartbeat
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# Исправление запуска прямого WAN в v117
|
||||
# Исправление запуска прямого WAN в v118
|
||||
|
||||
На проблемном роутере обычный `wan` был поднят, имел IPv4-адрес,
|
||||
маршрут и рабочий DNS. Проверка `ip -4 route show table 210` возвращала
|
||||
@@ -16,7 +16,7 @@ instance после шести падений. Из-за остановленн
|
||||
конфигурации останавливают агент до запуска Xray.
|
||||
|
||||
Изменены только `files/usr/lib/owrt-remote/wan.sh` и
|
||||
`files/usr/sbin/owrt-remote`. Версия остаётся v117. Настройки Podkop,
|
||||
`files/usr/sbin/owrt-remote`. Версия остаётся v118. Настройки Podkop,
|
||||
LAN и источники установки GitHub/GitLab не меняются. Обновление VPS
|
||||
для этого исправления не требуется.
|
||||
|
||||
@@ -28,7 +28,7 @@ powershell.exe -NoProfile -ExecutionPolicy Bypass -File "C:\Users\k.zolotarev95\
|
||||
|
||||
Скрипт перед заменой проверяет синтаксис и подготовку WAN новым helper,
|
||||
сохраняет агент, helper, UCI и Xray-конфигурацию в
|
||||
`/root/owrt-remote-backup-before-wan-stability-v117`. Сохранённая копия
|
||||
`/root/owrt-remote-backup-before-wan-stability-v118`. Сохранённая копия
|
||||
не перезаписывается при повторной установке. После замены выполняются
|
||||
перезапуск, проверка процесса Xray и настоящий heartbeat до Hub.
|
||||
При ошибке восстанавливается состояние до текущей попытки.
|
||||
|
||||
+6
-6
@@ -1,4 +1,4 @@
|
||||
# Применение OpenWrt config через панель роутера (v117)
|
||||
# Применение OpenWrt config через панель роутера (v118)
|
||||
|
||||
При отправке textarea браузер кодирует переносы строк как CRLF. CGI
|
||||
декодировал их без нормализации и записывал CR в исполняемый shell-скрипт.
|
||||
@@ -22,7 +22,7 @@ CRLF и LF, heredoc, пустые строки, кодированные сим
|
||||
|
||||
Скрипт обновляет только CGI на роутере. VPS обновлять для этого фикса
|
||||
не требуется. До замены сохраняется первая резервная копия CGI:
|
||||
`/root/owrt-remote-backup-before-xray-apply-v117/owrt-remote`.
|
||||
`/root/owrt-remote-backup-before-xray-apply-v118/owrt-remote`.
|
||||
|
||||
Из PowerShell Windows 11; замените IP, если адрес роутера отличается:
|
||||
|
||||
@@ -53,7 +53,7 @@ python tests/test_xray_apply.py -v
|
||||
|
||||
Переносы строк в формах описаны в [стандарте HTML](https://html.spec.whatwg.org/multipage/form-control-infrastructure.html).
|
||||
|
||||
## Мобильная вставка команд (локальный фикс v117)
|
||||
## Мобильная вставка команд (локальный фикс v118)
|
||||
|
||||
Воспроизведён отдельный случай `rc=255`: в строке
|
||||
`uci set owrtremote.main.router_name=‘Дом у моря’` типографские кавычки
|
||||
@@ -77,7 +77,7 @@ python tests/test_xray_apply.py -v
|
||||
|
||||
Обновляется только `/www/cgi-bin/owrt-remote` на роутере, без перезапуска
|
||||
служб и изменений настроек при установке. Резервная копия отдельная:
|
||||
`/root/owrt-remote-backup-before-xray-mobile-v117/owrt-remote`.
|
||||
`/root/owrt-remote-backup-before-xray-mobile-v118/owrt-remote`.
|
||||
|
||||
Установка из PowerShell Windows 11:
|
||||
|
||||
@@ -101,7 +101,7 @@ python tests/test_xray_mobile_deploy.py -v
|
||||
```
|
||||
|
||||
|
||||
## Проверка Xray и ошибка Heartbeat после применения (локальный фикс v117)
|
||||
## Проверка Xray и ошибка Heartbeat после применения (локальный фикс v118)
|
||||
|
||||
В предоставленном журнале Xray 26.3.27 запускается успешно, а завершающая
|
||||
команда `owrt-remote heartbeat` возвращает `rc=1` с `Failed to allocate
|
||||
@@ -153,7 +153,7 @@ CGI получает этап выполнения от агента. Ошибк
|
||||
Новый скрипт `vps/deploy-xray-validation-fix.ps1` обновляет CGI и агент,
|
||||
не пересобирает настройки и не перезапускает службы при установке/откате.
|
||||
Первая резервная копия обоих файлов:
|
||||
`/root/owrt-remote-backup-before-xray-validation-v117`. Если установка
|
||||
`/root/owrt-remote-backup-before-xray-validation-v118`. Если установка
|
||||
оборвалась или проверка файлов не прошла, возвращаются файлы до этой попытки.
|
||||
На роутере друга нужно указать его доступный SSH-адрес вместо локального IP.
|
||||
|
||||
|
||||
+2
-2
@@ -1,4 +1,4 @@
|
||||
# Восстановление Xray после перезагрузки (локальный фикс v117)
|
||||
# Восстановление Xray после перезагрузки (локальный фикс v118)
|
||||
|
||||
В предоставленном журнале node-3 после перезагрузки отсутствовал
|
||||
`/tmp/owrt-xray/xray`. Повторная загрузка завершилась
|
||||
@@ -56,7 +56,7 @@ powershell.exe -NoProfile -ExecutionPolicy Bypass -File "C:\Users\k.zolotarev95\
|
||||
```
|
||||
|
||||
Скрипт заменяет только `/usr/sbin/owrt-remote`, сохраняет первую резервную
|
||||
копию в `/root/owrt-remote-backup-before-xray-boot-v117`, подготавливает кэш,
|
||||
копию в `/root/owrt-remote-backup-before-xray-boot-v118`, подготавливает кэш,
|
||||
перезагружает отдельный Heartbeat instance и запрашивает запуск Xray, если
|
||||
тот остановлен при работающем Heartbeat. Здоровый туннель не перезапускается.
|
||||
`XRAY_BOOT_ROUTER_Install_OK` подтверждает установку кода, а не установление
|
||||
|
||||
@@ -43,7 +43,7 @@ class GlobalLogsDeploymentTests(unittest.TestCase):
|
||||
mappings['/etc/init.d/rpcd'] = (self.root / 'etc/init.d/rpcd').as_posix()
|
||||
mappings['/etc/init.d/uhttpd'] = (self.root / 'etc/init.d/uhttpd').as_posix()
|
||||
mappings['/tmp/owrt-remote-logs'] = (self.root / 'journal').as_posix()
|
||||
mappings['/root/owrt-remote-backup-before-global-logs-stop-v117'] = self.backup.as_posix()
|
||||
mappings['/root/owrt-remote-backup-before-global-logs-stop-v118'] = self.backup.as_posix()
|
||||
pattern = '|'.join(re.escape(target) for target in sorted(mappings, key=len, reverse=True))
|
||||
self.script = re.sub(pattern, lambda match: mappings[match.group()], self.script)
|
||||
# Existing sandbox service scripts only print markers. Mock readiness.
|
||||
@@ -104,7 +104,7 @@ logger() { printf '%s\\n' "$3" | sh "$TEST_LOG_HELPER" append; }
|
||||
self.assertIn('GLOBAL_LOGS_ROUTER_Install_OK', result.stdout)
|
||||
for item in ('cgi', 'luci'):
|
||||
installed = self.root / self.targets[item].lstrip('/')
|
||||
self.assertIn('v117', installed.read_text(encoding='utf-8'))
|
||||
self.assertIn('v118', installed.read_text(encoding='utf-8'))
|
||||
for item, data in self.initial.items():
|
||||
self.assertEqual(self.backup.joinpath(item).read_bytes(), data)
|
||||
result = self.deploy('Rollback')
|
||||
@@ -131,7 +131,7 @@ logger() { printf '%s\\n' "$3" | sh "$TEST_LOG_HELPER" append; }
|
||||
self.assert_initial()
|
||||
|
||||
def test_rollback_restores_existing_log_service_and_helper(self):
|
||||
# This fix is normally applied on top of v117's already installed journal.
|
||||
# This fix is normally applied on top of v118's already installed journal.
|
||||
for item in ('logs.sh', 'logs-init'):
|
||||
target = self.root / self.targets[item].lstrip('/')
|
||||
target.parent.mkdir(parents=True, exist_ok=True)
|
||||
|
||||
@@ -20,7 +20,7 @@ class VpsLogDeployTests(unittest.TestCase):
|
||||
self.target = self.root / 'hub.py'
|
||||
self.previous = b'print("previous Hub")\n'
|
||||
self.target.write_bytes(self.previous)
|
||||
self.backup = self.root / 'hub.py.bak-before-global-logs-ui-v117'
|
||||
self.backup = self.root / 'hub.py.bak-before-global-logs-ui-v118'
|
||||
source = (ROOT / 'vps/deploy-global-logs-vps.ps1').read_text(encoding='utf-8')
|
||||
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())
|
||||
@@ -55,7 +55,7 @@ sleep() { return 0; }
|
||||
for _ in range(2):
|
||||
result = self.deploy('Install')
|
||||
self.assertEqual(result.returncode, 0, result.stderr)
|
||||
self.assertIn('GLOBAL_LOGS_VPS_V117_Install_OK', result.stdout)
|
||||
self.assertIn('GLOBAL_LOGS_VPS_V118_Install_OK', result.stdout)
|
||||
self.assertIn(b'def receive_router_logs(', self.target.read_bytes())
|
||||
self.assertEqual(self.backup.read_bytes(), self.previous)
|
||||
result = self.deploy('Rollback')
|
||||
|
||||
@@ -25,7 +25,7 @@ class HeartbeatTransportDeploymentTests(unittest.TestCase):
|
||||
self.env["PATH"] = str(GIT_BIN) + os.pathsep + self.env["PATH"]
|
||||
source = (ROOT / "vps/deploy-heartbeat-transport-fix.ps1").read_text(encoding="utf-8")
|
||||
self.script = source.split("$RemoteScript = @'\n", 1)[1].split("\n'@", 1)[0]
|
||||
self.script = self.script.replace("backup_dir=/root/owrt-remote-backup-before-heartbeat-transport-v117",
|
||||
self.script = self.script.replace("backup_dir=/root/owrt-remote-backup-before-heartbeat-transport-v118",
|
||||
"backup_dir=" + shlex.quote(self.backup.as_posix()))
|
||||
self.script = self.script.replace("printf /usr/lib/owrt-remote/wan.sh", "printf %s " + shlex.quote(self.targets["wan.sh"].as_posix()))
|
||||
self.script = self.script.replace("printf /usr/sbin/owrt-remote", "printf %s " + shlex.quote(self.targets["agent"].as_posix()))
|
||||
|
||||
@@ -0,0 +1,178 @@
|
||||
"""Unpublished build fixture: real files and HTTP health across a simulated service restart."""
|
||||
from contextlib import nullcontext
|
||||
import importlib.util
|
||||
import json
|
||||
import os
|
||||
from pathlib import Path
|
||||
import subprocess
|
||||
import sys
|
||||
import tempfile
|
||||
import threading
|
||||
from types import SimpleNamespace
|
||||
import unittest
|
||||
from unittest import mock
|
||||
|
||||
ROOT = Path(__file__).resolve().parents[1]
|
||||
SOURCE = (ROOT / 'vps/owrt-remote-hub.py').read_bytes().replace(b'\r\n', b'\n')
|
||||
DEPLOY = ROOT / 'vps/test-hub-self-update.ps1'
|
||||
|
||||
|
||||
class LocalTestTests(unittest.TestCase):
|
||||
def setUp(self):
|
||||
self.temp = tempfile.TemporaryDirectory(prefix='hub-local-test-')
|
||||
self.addCleanup(self.temp.cleanup)
|
||||
self.root = Path(self.temp.name)
|
||||
self.target = self.root / 'hub.py'
|
||||
self.target.write_bytes(SOURCE)
|
||||
self.stage = self.root / 'stage'
|
||||
self.stage.mkdir()
|
||||
(self.stage / 'hub.py').write_bytes(SOURCE)
|
||||
script = DEPLOY.read_text(encoding='ascii').split("$RemoteTool = @'\n", 1)[1].split("\n'@", 1)[0]
|
||||
self.ns = {'__name__': 'local_test_helper', '__file__': str(self.stage / 'run.py')}
|
||||
exec(compile(script, 'local-test-tool.py', 'exec'), self.ns)
|
||||
self.fixture = self.root / 'self-update-local-test'
|
||||
self.ns.update(TARGET=self.target, ROOT=self.fixture, STAGE=self.stage)
|
||||
self.modules = []
|
||||
self.server = None
|
||||
self.thread = None
|
||||
self.port = 0
|
||||
self.addCleanup(self.close_server)
|
||||
|
||||
def load_hub(self):
|
||||
name = 'local_test_hub_' + str(len(self.modules))
|
||||
spec = importlib.util.spec_from_file_location(name, self.target)
|
||||
hub = importlib.util.module_from_spec(spec)
|
||||
sys.modules[name] = hub
|
||||
self.modules.append(name)
|
||||
self.addCleanup(lambda: sys.modules.pop(name, None))
|
||||
# Avoid timestamp/size based bytecode reuse for rapid same-version builds.
|
||||
with mock.patch.dict(os.environ, {'OWRT_REMOTE_STATE_DIR': str(self.root / 'state')}):
|
||||
exec(compile(self.target.read_bytes(), str(self.target), 'exec'), hub.__dict__)
|
||||
return hub
|
||||
|
||||
def close_server(self):
|
||||
if self.server:
|
||||
self.server.shutdown()
|
||||
self.server.server_close()
|
||||
self.thread.join(timeout=5)
|
||||
self.server = None
|
||||
|
||||
def start_server(self):
|
||||
self.close_server()
|
||||
hub = self.load_hub()
|
||||
class QuietHandler(hub.Handler):
|
||||
def log_message(self, *args): pass
|
||||
app = hub.App(self.root / 'unused.db', 'session', 'agent', '')
|
||||
self.server = hub.HubHTTPServer(('127.0.0.1', self.port), QuietHandler)
|
||||
self.server.app, self.server.is_tls = app, False
|
||||
self.port = self.server.server_port
|
||||
self.thread = threading.Thread(target=self.server.serve_forever, daemon=True)
|
||||
self.thread.start()
|
||||
self.ns['HEALTH'] = 'http://127.0.0.1:' + str(self.port) + '/health?panel-update=1'
|
||||
app.hub_update.health_url = self.ns['HEALTH'].split('?', 1)[0]
|
||||
return hub, app
|
||||
|
||||
def test_full_local_fixture_update_changes_file_health_revision_and_then_restores(self):
|
||||
production_state = self.root / 'state/panel-update'
|
||||
production_state.mkdir(parents=True)
|
||||
original_state = {'job.json': b'{"status":"succeeded","id":"previous-real-update"}',
|
||||
'previous.py': b'previous real update backup'}
|
||||
for name, data in original_state.items():
|
||||
(production_state / name).write_bytes(data)
|
||||
with mock.patch.dict(self.ns, {'idle': lambda: None, 'restart': lambda: None, 'healthy': lambda *a: True}):
|
||||
self.ns['prepare']()
|
||||
hub, app = self.start_server()
|
||||
manager = app.hub_update
|
||||
self.assertEqual(manager.directory, self.fixture / 'job')
|
||||
manager._check()
|
||||
self.assertTrue(manager.snapshot()['available'])
|
||||
self.assertIn('Локальный тест', manager.source)
|
||||
self.assertEqual(hub.RAW_REPO_BASE, 'https://raw.githubusercontent.com/kzolotarev95/luci-app-owrt-remote/main')
|
||||
revision = manager.remote_revision
|
||||
# The real Linux flock creates this directory before the space check.
|
||||
manager.directory.mkdir(parents=True, exist_ok=True)
|
||||
with mock.patch.object(hub, 'hub_update_lock', side_effect=lambda *a, **k: nullcontext()), \
|
||||
mock.patch.object(hub.subprocess, 'run'):
|
||||
job = manager.start(revision)
|
||||
def restart(argv, **kwargs):
|
||||
self.assertEqual(argv, ['systemctl', 'restart', 'owrt-remote'])
|
||||
self.start_server()
|
||||
return SimpleNamespace(returncode=0)
|
||||
with mock.patch.object(hub, 'hub_update_lock', side_effect=lambda *a, **k: nullcontext()), \
|
||||
mock.patch.object(hub.subprocess, 'run', side_effect=restart), mock.patch.object(hub.time, 'sleep'):
|
||||
self.assertEqual(hub.run_hub_update_worker(job['id']), 0)
|
||||
self.assertEqual(self.target.read_bytes(), (self.fixture / 'candidate.py').read_bytes())
|
||||
new_manager = self.server.app.hub_update
|
||||
new_manager._check()
|
||||
data = new_manager.snapshot()
|
||||
self.assertFalse(data['available'], 'updated local candidate is current')
|
||||
self.assertFalse(data['error'])
|
||||
self.assertEqual(data['current_revision'], revision)
|
||||
self.assertEqual(data['job']['status'], 'succeeded')
|
||||
with mock.patch.object(subprocess, 'run', return_value=SimpleNamespace(returncode=0)), \
|
||||
mock.patch('builtins.print') as output:
|
||||
self.ns['status']()
|
||||
self.assertIn(mock.call('SELF_UPDATE_LOCAL_TEST_PASSED'), output.call_args_list)
|
||||
with mock.patch.dict(self.ns, {'idle': lambda: None, 'restart': self.start_server}):
|
||||
self.ns['restore']()
|
||||
self.assertEqual(self.target.read_bytes(), SOURCE)
|
||||
self.assertFalse(self.fixture.exists())
|
||||
self.assertNotIn('LOCAL SELF-UPDATE TEST:', self.target.read_text(encoding='utf-8'))
|
||||
for name, data in original_state.items():
|
||||
self.assertEqual((production_state / name).read_bytes(), data)
|
||||
|
||||
def test_prepare_does_not_overwrite_an_existing_test_or_backup(self):
|
||||
with mock.patch.dict(self.ns, {'idle': lambda: None, 'restart': lambda: None, 'healthy': lambda *a: True}):
|
||||
self.ns['prepare']()
|
||||
with self.assertRaisesRegex(RuntimeError, 'already exists'):
|
||||
self.ns['prepare']()
|
||||
self.assertEqual((self.fixture / 'before.py').read_bytes(), SOURCE)
|
||||
|
||||
def test_failed_baseline_health_restores_original(self):
|
||||
with mock.patch.dict(self.ns, {'idle': lambda: None, 'restart': lambda: None,
|
||||
'healthy': mock.Mock(side_effect=[False, True])}):
|
||||
with self.assertRaisesRegex(RuntimeError, 'did not become healthy'):
|
||||
self.ns['prepare']()
|
||||
self.assertEqual(self.target.read_bytes(), SOURCE)
|
||||
self.assertFalse(self.fixture.exists())
|
||||
|
||||
def test_retest_replaces_old_fixture_and_preserves_original_backup(self):
|
||||
with mock.patch.dict(self.ns, {'idle': lambda: None, 'restart': lambda: None, 'healthy': lambda *a: True}):
|
||||
self.ns['retest']()
|
||||
first = self.target.read_bytes()
|
||||
self.ns['retest']()
|
||||
self.assertNotEqual(first, self.target.read_bytes())
|
||||
self.assertEqual((self.fixture / 'before.py').read_bytes(), SOURCE)
|
||||
|
||||
def test_status_distinguishes_missing_test_and_wrong_running_build(self):
|
||||
with mock.patch.object(subprocess, 'run', return_value=SimpleNamespace(returncode=0)), \
|
||||
mock.patch.dict(self.ns, {'read_health': lambda: {'ok': True, 'revision': 'other-build'}}), \
|
||||
mock.patch('builtins.print') as output:
|
||||
self.ns['status']()
|
||||
self.assertIn(mock.call('SELF_UPDATE_LOCAL_TEST_NOT_PREPARED'), output.call_args_list)
|
||||
self.assertIn('"test_prepared": false', output.call_args_list[1].args[0])
|
||||
with mock.patch.dict(self.ns, {'idle': lambda: None, 'restart': lambda: None, 'healthy': lambda *a: True}):
|
||||
self.ns['prepare']()
|
||||
with mock.patch.object(subprocess, 'run', return_value=SimpleNamespace(returncode=0)), \
|
||||
mock.patch.dict(self.ns, {'read_health': lambda: {'ok': True, 'revision': 'other-build'}}), \
|
||||
mock.patch('builtins.print') as output:
|
||||
self.ns['status']()
|
||||
self.assertIn('"installed_build": "baseline"', output.call_args_list[1].args[0])
|
||||
self.assertIn('"running_installed_file": false', output.call_args_list[1].args[0])
|
||||
|
||||
@unittest.skipUnless(os.name == 'nt', 'Windows PowerShell staging')
|
||||
def test_powershell_prepares_utf8_and_valid_python_without_connecting(self):
|
||||
self.assertTrue(DEPLOY.read_bytes().isascii())
|
||||
result = subprocess.run(['powershell.exe', '-NoProfile', '-ExecutionPolicy', 'Bypass',
|
||||
'-File', str(DEPLOY), '-Vps', 'unused-local-test', '-PrepareOnly'],
|
||||
capture_output=True, text=True, timeout=20,
|
||||
env={**os.environ, 'TEMP': str(self.root), 'TMP': str(self.root)})
|
||||
self.assertEqual(result.returncode, 0, result.stderr)
|
||||
stage = Path(next(line.split(': ', 1)[1] for line in result.stdout.splitlines() if line.startswith('Prepared only: ')))
|
||||
self.assertEqual(stage.parent, self.root)
|
||||
compile((stage / 'run.py').read_bytes(), 'prepared-tool.py', 'exec')
|
||||
self.assertEqual((stage / 'hub.py').read_bytes(), SOURCE)
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
@@ -0,0 +1,212 @@
|
||||
"""Panel self-update: source isolation, validation, restart recovery and owner-only API."""
|
||||
from contextlib import nullcontext
|
||||
import hashlib
|
||||
import importlib.util
|
||||
import io
|
||||
import json
|
||||
import os
|
||||
from pathlib import Path
|
||||
import subprocess
|
||||
import sys
|
||||
import tempfile
|
||||
import threading
|
||||
import unittest
|
||||
import urllib.error
|
||||
import urllib.request
|
||||
from unittest import mock
|
||||
|
||||
ROOT = Path(__file__).resolve().parents[1]
|
||||
STATE = tempfile.TemporaryDirectory(prefix='hub-update-tests-')
|
||||
spec = importlib.util.spec_from_file_location('self_update_hub', ROOT / 'vps/owrt-remote-hub.py')
|
||||
hub = importlib.util.module_from_spec(spec)
|
||||
sys.modules[spec.name] = hub
|
||||
with mock.patch.dict(os.environ, {'OWRT_REMOTE_STATE_DIR': STATE.name}):
|
||||
spec.loader.exec_module(hub)
|
||||
SOURCE = (ROOT / 'vps/owrt-remote-hub.py').read_bytes()
|
||||
NEW = SOURCE + b'\n# update test build\n'
|
||||
|
||||
|
||||
class UpdateTests(unittest.TestCase):
|
||||
def setUp(self):
|
||||
self.temp = tempfile.TemporaryDirectory(dir=STATE.name)
|
||||
self.addCleanup(self.temp.cleanup)
|
||||
self.root = Path(self.temp.name)
|
||||
self.target = self.root / 'hub.py'
|
||||
self.target.write_bytes(SOURCE)
|
||||
self.directory = self.root / 'update'
|
||||
self.directory.mkdir()
|
||||
self.manager = hub.HubUpdateManager(self.target, self.directory)
|
||||
self.addCleanup(mock.patch.stopall)
|
||||
mock.patch.object(hub, 'hub_update_lock', side_effect=lambda *a, **k: nullcontext()).start()
|
||||
|
||||
def response(self, data=NEW, url=None):
|
||||
response = io.BytesIO(data)
|
||||
response.geturl = lambda: url or self.manager.source + '/vps/owrt-remote-hub.py'
|
||||
return response
|
||||
|
||||
def prepare(self):
|
||||
with mock.patch.object(hub.urllib.request, 'urlopen', return_value=self.response()):
|
||||
self.manager._check()
|
||||
with mock.patch.object(hub.subprocess, 'run'):
|
||||
return self.manager.start(hashlib.sha256(NEW).hexdigest())
|
||||
|
||||
def test_check_uses_own_repository_even_when_version_is_unchanged(self):
|
||||
for source in ('https://raw.githubusercontent.com/kzolotarev95/luci-app-owrt-remote/main',
|
||||
'https://gitverse.ru/api/repos/kzolotarev95/luci-app-owrt-remote/raw/branch/main'):
|
||||
self.manager.source = source
|
||||
with mock.patch.object(hub.urllib.request, 'urlopen', return_value=self.response()) as fetch:
|
||||
self.manager._check()
|
||||
self.assertEqual(fetch.call_args.args[0].full_url, source + '/vps/owrt-remote-hub.py')
|
||||
data = self.manager.snapshot()
|
||||
self.assertTrue(data['available'])
|
||||
self.assertEqual(data['remote_version'], 'v118')
|
||||
self.assertEqual(data['remote_revision'], hashlib.sha256(NEW).hexdigest())
|
||||
self.assertEqual(self.target.read_bytes(), SOURCE)
|
||||
|
||||
def test_unchanged_source_is_current_and_errors_do_not_offer_update(self):
|
||||
with mock.patch.object(hub.urllib.request, 'urlopen', return_value=self.response(SOURCE)):
|
||||
self.manager._check()
|
||||
self.assertFalse(self.manager.snapshot()['available'])
|
||||
for response in (b'<html>502 Bad Gateway</html>', b'X' * (hub.HUB_UPDATE_LIMIT + 1), SOURCE + b'\nif broken\n'):
|
||||
with mock.patch.object(hub.urllib.request, 'urlopen', return_value=self.response(response)):
|
||||
self.manager._check()
|
||||
data = self.manager.snapshot()
|
||||
self.assertTrue(data['error'])
|
||||
self.assertFalse(data['available'])
|
||||
self.assertEqual(self.target.read_bytes(), SOURCE)
|
||||
|
||||
def test_timeout_and_https_downgrade_never_modify_target(self):
|
||||
with mock.patch.object(hub.urllib.request, 'urlopen', side_effect=TimeoutError('DNS/TLS timeout')):
|
||||
self.manager._check()
|
||||
self.assertIn('timeout', self.manager.snapshot()['error'])
|
||||
with mock.patch.object(hub.urllib.request, 'urlopen', return_value=self.response(url='http://unsafe.example/hub.py')):
|
||||
self.manager._check()
|
||||
self.assertIn('HTTPS', self.manager.snapshot()['error'])
|
||||
self.assertEqual(self.target.read_bytes(), SOURCE)
|
||||
|
||||
def test_checks_are_shared_and_throttled(self):
|
||||
self.manager.checked_at = hub.time.monotonic()
|
||||
with mock.patch.object(hub.threading, 'Thread') as thread:
|
||||
for _ in range(5): self.manager.check()
|
||||
self.assertFalse(thread.called)
|
||||
self.manager.checked_at -= 30
|
||||
self.manager.check(force=True)
|
||||
self.assertEqual(thread.call_count, 1)
|
||||
self.manager.check(force=True)
|
||||
self.assertEqual(thread.call_count, 1)
|
||||
|
||||
def test_launch_survives_hub_restart_and_duplicate_request_is_rejected(self):
|
||||
job = self.prepare()
|
||||
manager_after_restart = hub.HubUpdateManager(self.target, self.directory)
|
||||
self.assertEqual(manager_after_restart.snapshot()['job']['id'], job['id'])
|
||||
with self.assertRaisesRegex(RuntimeError, 'уже выполняется'):
|
||||
self.manager.start(job['revision'])
|
||||
with mock.patch.object(hub.time, 'sleep'), mock.patch.object(hub.subprocess, 'run') as run, \
|
||||
mock.patch.object(hub, 'hub_update_health', return_value=True):
|
||||
self.assertEqual(hub.run_hub_update_worker(job['id'], self.directory, self.target), 0)
|
||||
self.assertEqual(self.target.read_bytes(), NEW)
|
||||
self.assertEqual((self.directory / 'previous.py').read_bytes(), SOURCE)
|
||||
self.assertEqual(manager_after_restart.snapshot()['job']['status'], 'succeeded')
|
||||
self.assertFalse((self.directory / 'candidate.py').exists())
|
||||
self.assertEqual(run.call_args.args[0], ['systemctl', 'restart', 'owrt-remote'])
|
||||
|
||||
def test_failed_health_restores_previous_bytes_and_restarts(self):
|
||||
job = self.prepare()
|
||||
with mock.patch.object(hub.time, 'sleep'), mock.patch.object(hub.subprocess, 'run') as run, \
|
||||
mock.patch.object(hub, 'hub_update_health', side_effect=[False, True]):
|
||||
self.assertEqual(hub.run_hub_update_worker(job['id'], self.directory, self.target), 1)
|
||||
self.assertEqual(self.target.read_bytes(), SOURCE)
|
||||
self.assertEqual(run.call_count, 2)
|
||||
self.assertIn('Предыдущий файл восстановлен', hub.hub_update_state(self.directory)['message'])
|
||||
|
||||
def test_failure_to_write_rollback_progress_does_not_prevent_restoration(self):
|
||||
job = self.prepare()
|
||||
state_write = hub.hub_update_state
|
||||
def write(directory, value=None):
|
||||
if value and value.get('status') == 'rollback': raise OSError('state disk full')
|
||||
return state_write(directory, value)
|
||||
with mock.patch.object(hub.time, 'sleep'), mock.patch.object(hub.subprocess, 'run'), \
|
||||
mock.patch.object(hub, 'hub_update_state', side_effect=write), \
|
||||
mock.patch.object(hub, 'hub_update_health', side_effect=[False, True]):
|
||||
self.assertEqual(hub.run_hub_update_worker(job['id'], self.directory, self.target), 1)
|
||||
self.assertEqual(self.target.read_bytes(), SOURCE)
|
||||
self.assertEqual(hub.hub_update_state(self.directory)['status'], 'failed')
|
||||
|
||||
def test_changed_candidate_or_target_never_restarts_service(self):
|
||||
job = self.prepare()
|
||||
(self.directory / 'candidate.py').write_bytes(SOURCE)
|
||||
with mock.patch.object(hub.time, 'sleep'), mock.patch.object(hub.subprocess, 'run') as run:
|
||||
self.assertEqual(hub.run_hub_update_worker(job['id'], self.directory, self.target), 1)
|
||||
self.assertFalse(run.called)
|
||||
self.assertEqual(self.target.read_bytes(), SOURCE)
|
||||
job = self.prepare()
|
||||
self.target.write_bytes(SOURCE + b'\n# manual change\n')
|
||||
with mock.patch.object(hub.time, 'sleep'), mock.patch.object(hub.subprocess, 'run') as run:
|
||||
self.assertEqual(hub.run_hub_update_worker(job['id'], self.directory, self.target), 1)
|
||||
self.assertFalse(run.called)
|
||||
self.assertTrue(self.target.read_bytes().endswith(b'# manual change\n'))
|
||||
|
||||
def test_launch_failure_and_stale_confirmation_preserve_working_file(self):
|
||||
with mock.patch.object(hub.urllib.request, 'urlopen', return_value=self.response()):
|
||||
self.manager._check()
|
||||
with self.assertRaises(ValueError): self.manager.start('wrong-revision')
|
||||
with mock.patch.object(hub.subprocess, 'run', side_effect=OSError('systemd unavailable')):
|
||||
with self.assertRaisesRegex(RuntimeError, 'systemd'):
|
||||
self.manager.start(self.manager.remote_revision)
|
||||
self.assertEqual(self.manager.snapshot()['job']['status'], 'failed')
|
||||
self.assertEqual(self.target.read_bytes(), SOURCE)
|
||||
self.assertFalse((self.directory / 'candidate.py').exists())
|
||||
|
||||
def test_dead_worker_is_not_reported_as_infinite_update(self):
|
||||
hub.hub_update_state(self.directory, {'id': 'dead', 'status': 'starting', 'started_at': hub.time.time() - 421})
|
||||
self.assertEqual(self.manager.snapshot()['job']['status'], 'failed')
|
||||
|
||||
def test_atomic_failure_does_not_truncate_target(self):
|
||||
with mock.patch.object(hub.os, 'replace', side_effect=OSError('disk full')):
|
||||
with self.assertRaises(OSError): hub.hub_update_write(self.target, NEW)
|
||||
self.assertEqual(self.target.read_bytes(), SOURCE)
|
||||
self.assertFalse(list(self.root.glob('.hub.py-*')))
|
||||
|
||||
|
||||
class HttpTests(unittest.TestCase):
|
||||
def test_owner_csrf_origin_validation_and_revision_health(self):
|
||||
class TestHandler(hub.Handler):
|
||||
def owner_ok(self): return self.headers.get('Cookie') == 'owner'
|
||||
def admin_ok(self): return self.headers.get('Cookie') in {'owner', 'delegated'}
|
||||
def log_message(self, *args): pass
|
||||
app = hub.App(Path(STATE.name) / 'unused.db', 'legacy', 'agent', '')
|
||||
server = hub.HubHTTPServer(('127.0.0.1', 0), TestHandler)
|
||||
server.app, server.is_tls = app, False
|
||||
thread = threading.Thread(target=server.serve_forever, daemon=True)
|
||||
thread.start()
|
||||
origin = 'http://127.0.0.1:' + str(server.server_port)
|
||||
def request(path, cookie='', payload=None, csrf='', source=''):
|
||||
headers = {'Cookie': cookie, 'X-Hub-Update-CSRF': csrf, 'Content-Type': 'application/json'}
|
||||
if source: headers['Origin'] = source
|
||||
req = urllib.request.Request(origin + path, headers=headers,
|
||||
data=json.dumps(payload).encode() if payload is not None else None)
|
||||
try: response = urllib.request.urlopen(req, timeout=5)
|
||||
except urllib.error.HTTPError as error: response = error
|
||||
with response: return response.status, json.load(response)
|
||||
try:
|
||||
with mock.patch.object(app.hub_update, 'check'), mock.patch.object(app.hub_update, 'start') as start:
|
||||
self.assertEqual(request('/api/hub-update')[0], 401)
|
||||
self.assertEqual(request('/api/hub-update', 'delegated')[0], 403)
|
||||
status, data = request('/api/hub-update', 'owner')
|
||||
self.assertEqual(status, 200)
|
||||
csrf = data['csrf']
|
||||
self.assertEqual(request('/api/hub-update/start', 'owner', {'revision': 'abc'})[0], 403)
|
||||
self.assertEqual(request('/api/hub-update/start', 'owner', {'revision': 'abc'}, csrf, 'https://foreign.example')[0], 403)
|
||||
self.assertFalse(start.called)
|
||||
self.assertEqual(request('/api/hub-update/start', 'owner', {'revision': 'abc'}, csrf, origin)[0], 200)
|
||||
start.assert_called_once_with('abc')
|
||||
self.assertEqual(request('/health')[1], {'ok': True})
|
||||
self.assertEqual(request('/health?panel-update=1')[1]['revision'], hub.HUB_LOADED_REVISION)
|
||||
finally:
|
||||
server.shutdown()
|
||||
server.server_close()
|
||||
thread.join(timeout=5)
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
@@ -0,0 +1,150 @@
|
||||
const assert = require('node:assert/strict');
|
||||
const fs = require('node:fs');
|
||||
const path = require('node:path');
|
||||
const {execFileSync} = require('node:child_process');
|
||||
const {chromium} = require('playwright');
|
||||
const output = path.resolve('.test-output/hub-update');
|
||||
fs.mkdirSync(output, {recursive:true});
|
||||
execFileSync(process.env.TEST_PYTHON || 'python', ['tests/test_vps_resources.py', '--export-preview', output],
|
||||
{env:{...process.env,PYTHONIOENCODING:'utf-8'}});
|
||||
const pageHtml = fs.readFileSync(path.join(output, 'dashboard.html'), 'utf8');
|
||||
function state() {
|
||||
return {ok:true,checked:true,checking:false,error:'',source:'https://raw.githubusercontent.com/kzolotarev95/luci-app-owrt-remote/main',
|
||||
current_revision:'a'.repeat(64),remote_revision:'b'.repeat(64),remote_version:'v118',available:true,job:{},csrf:'test-csrf'};
|
||||
}
|
||||
async function createFixture(browser,width,height,mobile) {
|
||||
const page = await browser.newPage({viewport:{width,height},isMobile:mobile,hasTouch:mobile});
|
||||
const fixture = {data:state(),starts:0,checks:0,views:0,failures:0};
|
||||
await page.route('**/*',async route => {
|
||||
const req=route.request(),url=new URL(req.url());
|
||||
if(url.pathname==='/api/hub-update/start') {
|
||||
fixture.starts++;
|
||||
assert.equal(req.headers()['x-hub-update-csrf'],'test-csrf');
|
||||
assert.equal(req.postDataJSON().revision,'b'.repeat(64));
|
||||
fixture.data.job={id:'job-one',status:'starting',message:'Запускается обновление панели…'};
|
||||
return route.fulfill({json:fixture.data});
|
||||
}
|
||||
if(url.pathname==='/api/hub-update/check') {fixture.checks++;return route.fulfill({json:fixture.data});}
|
||||
if(url.pathname==='/api/hub-update') {
|
||||
if(fixture.failures>0) {fixture.failures--;return route.abort();}
|
||||
return route.fulfill({json:fixture.data});
|
||||
}
|
||||
if(url.pathname==='/api/vps/resources')return route.fulfill({json:{ok:true,cpu:{percent:10},memory:{percent:40},disk:{percent:60}}});
|
||||
if(url.pathname==='/api/routers')return route.fulfill({json:{routers:[]}});
|
||||
if(url.pathname.startsWith('/api/'))return route.fulfill({json:{}});
|
||||
if(url.origin==='http://127.0.0.1:9999'&&url.pathname==='/') {fixture.views++;return route.fulfill({contentType:'text/html',body:pageHtml});}
|
||||
return route.abort();
|
||||
});
|
||||
await page.goto('http://127.0.0.1:9999/',{waitUntil:'domcontentloaded'});
|
||||
const button=page.locator(mobile?'#mobileHubUpdateDock [data-hub-update]':'.desktopHeader [data-hub-update]');
|
||||
await button.waitFor({state:'visible'});
|
||||
await page.waitForFunction(()=>document.querySelector('[data-hub-update]').textContent==='Доступно обновление');
|
||||
return {...fixture, fixture,page,button};
|
||||
}
|
||||
(async()=>{
|
||||
const browser=await chromium.launch({headless:true,channel:'chrome'});
|
||||
try {
|
||||
for(const [width,height,mobile] of [[1280,900,false],[980,900,false],[320,740,true],[390,844,true],[430,932,true],[844,390,true],[932,430,true]]) {
|
||||
const {page,button,fixture}=await fixturePage(width,height,mobile);
|
||||
const search=page.locator(mobile?'#mobileRouterSearchToggle':'#routerSearchToggle');
|
||||
const a=await search.boundingBox(),b=await button.boundingBox();
|
||||
if(!mobile) {
|
||||
assert(Math.abs(a.y-b.y)<=1,'desktop search/update stay on the same row');
|
||||
assert(Math.abs(a.height-b.height)<=1,'matching desktop button heights: '+JSON.stringify({width,a,b}));
|
||||
assert(a.x>=b.x+b.width,'desktop update sits before search');
|
||||
}
|
||||
assert.equal(await button.evaluate(el=>getComputedStyle(el).color),'rgb(253, 230, 138)','available update is yellow');
|
||||
assert(await button.evaluate(el=>el.scrollWidth<=el.clientWidth+1),'button text fits');
|
||||
const notice=page.locator('#hubUpdateNotice');
|
||||
assert(await notice.evaluate(el=>el===el.parentElement.firstElementChild),'update notice is the first panel block');
|
||||
assert((await notice.boundingBox()).y<(await button.boundingBox()).y,'status sits above header controls');
|
||||
assert.equal(await notice.evaluate(el=>getComputedStyle(el).backgroundColor),'rgba(0, 0, 0, 0)','status background is transparent on every screen');
|
||||
const noticeBounds=await notice.boundingBox();
|
||||
assert(noticeBounds.width<=680,'status is narrower than the desktop panel');
|
||||
assert(Math.abs(noticeBounds.x+noticeBounds.width/2-width/2)<=1,'status is horizontally centered');
|
||||
if(!mobile) assert(noticeBounds.y>=34,'desktop status is slightly lower');
|
||||
if(mobile) {
|
||||
const effects=await page.locator('#mobileSeasonToggle').boundingBox();
|
||||
const dock=await page.locator('#mobileRouterSearchDock').boundingBox();
|
||||
const resources=await page.locator('.vpsResources-mobile').boundingBox();
|
||||
assert(resources.y+resources.height<=b.y,'mobile resources are before panel update');
|
||||
assert(b.y+b.height<=effects.y,'mobile panel update is before effects');
|
||||
assert(effects.y+effects.height<=a.y,'mobile effects are before router search');
|
||||
assert(Math.abs(effects.width-dock.width)<=1&&Math.abs(a.width-b.width)<=1,'mobile controls have matching full widths');
|
||||
assert(a.height>=44&&b.height>=44,'mobile controls have room for touch');
|
||||
for(const selector of ['#mobileSeasonToggle','#hubMenuToggle','[data-hub-update]']) {
|
||||
assert(await page.locator(selector).evaluateAll(elements=>elements.every(el=>!el.getClientRects().length||el.scrollHeight<=el.clientHeight+1)),'control text is not vertically clipped: '+selector);
|
||||
}
|
||||
}
|
||||
await page.screenshot({path:path.join(output,'header-'+width+'.png'),fullPage:false});
|
||||
assert(await page.evaluate(()=>document.documentElement.scrollWidth<=innerWidth+1),'no horizontal overflow: '+JSON.stringify(await page.evaluate(()=>Array.from(document.querySelectorAll('main,.top,.desktopHeader,.desktopHeaderTop,.desktopHeaderBottom,.links,.headerActions,.toolbar')).map(el=>({class:el.className,width:el.getBoundingClientRect().width,right:el.getBoundingClientRect().right,scroll:el.scrollWidth})))));
|
||||
fixture.data.available=false;
|
||||
fixture.data.remote_revision=fixture.data.current_revision;
|
||||
await page.evaluate(()=>window.dispatchEvent(new Event('pageshow')));
|
||||
await page.waitForFunction(()=>document.querySelector('[data-hub-update]').dataset.updateState==='current');
|
||||
assert.equal(await button.evaluate(el=>getComputedStyle(el).color),'rgb(187, 247, 208)','current build is green');
|
||||
await page.screenshot({path:path.join(output,'current-'+width+'.png'),fullPage:false});
|
||||
fixture.data.error='Не удалось проверить обновление: Сборка в источнике ещё не поддерживает проверяемое обновление из панели.';
|
||||
await page.evaluate(()=>window.dispatchEvent(new Event('pageshow')));
|
||||
await page.waitForFunction(()=>document.querySelector('[data-hub-update]').dataset.updateState==='error');
|
||||
const gap=await notice.evaluate(el=>{
|
||||
const bounds=el.getBoundingClientRect();
|
||||
let next=el.nextElementSibling;
|
||||
while(next&&!next.getClientRects().length)next=next.nextElementSibling;
|
||||
return {below:next.getBoundingClientRect().top-bounds.bottom,top:bounds.top,left:bounds.left,right:bounds.right,
|
||||
align:getComputedStyle(el).textAlign,wrapped:el.scrollWidth<=el.clientWidth+1,clipped:el.scrollHeight>el.clientHeight+1};
|
||||
});
|
||||
assert(gap.below>=12,'notice has space before the header: '+JSON.stringify(gap));
|
||||
assert(gap.top>=0&&gap.left>=0&&gap.right<=width,'top notice stays inside the screen');
|
||||
assert.equal(gap.align,'center');assert(gap.wrapped&&!gap.clipped,'long error wraps without clipping');
|
||||
await page.screenshot({path:path.join(output,'notice-'+width+'.png'),fullPage:false});
|
||||
fixture.data.error='';fixture.data.available=true;fixture.data.remote_revision='b'.repeat(64);
|
||||
await page.evaluate(()=>window.dispatchEvent(new Event('pageshow')));
|
||||
await page.waitForFunction(()=>document.querySelector('[data-hub-update]').dataset.updateState==='available');
|
||||
await button.click();
|
||||
const confirmPanel=page.locator('#hubUpdateConfirm');
|
||||
await confirmPanel.waitFor({state:'visible'});
|
||||
assert((await page.locator('#hubUpdateConfirmLead').textContent()).includes('Действительно обновить'));
|
||||
assert((await page.locator('#hubUpdateConfirmSource').textContent()).includes('https://raw.githubusercontent.com'));
|
||||
assert(await confirmPanel.evaluate(el=>el.scrollWidth<=innerWidth+1),'confirmation has no horizontal overflow');
|
||||
await page.locator('#hubUpdateConfirmCancel').click();
|
||||
assert.equal(fixture.starts,0,'cancel must not start update');
|
||||
await button.click();
|
||||
await confirmPanel.waitFor({state:'visible'});
|
||||
await page.locator('#hubUpdateConfirmAccept').click();
|
||||
assert.equal(fixture.starts,1);
|
||||
await page.waitForFunction(() => document.querySelector('[data-hub-update]').disabled);
|
||||
assert(await button.isDisabled(),'cannot start another update');
|
||||
fixture.failures=1;
|
||||
fixture.data.current_revision=fixture.data.remote_revision;fixture.data.available=false;
|
||||
fixture.data.job={id:'job-one',status:'succeeded',revision:fixture.data.current_revision,message:'Панель успешно обновлена. Страница будет перезагружена.'};
|
||||
await page.waitForFunction(()=>document.getElementById('hubUpdateNotice').textContent.includes('Ожидается результат'),null,{timeout:6000});
|
||||
await page.waitForFunction(()=>document.getElementById('hubUpdateNotice').dataset.result==='succeeded',null,{timeout:6000});
|
||||
await page.waitForTimeout(1700);
|
||||
assert.equal(fixture.views,2,'exactly one automatic page reload');
|
||||
await page.waitForFunction(()=>document.getElementById('hubUpdateNotice').textContent==='У вас последняя версия панели, обновление не требуется.');
|
||||
assert.equal(await button.getAttribute('data-update-state'),'current','updated build is current after reload');
|
||||
await page.waitForTimeout(1700);assert.equal(fixture.views,2,'successful old job must not cause reload loop');
|
||||
assert.equal(fixture.starts,1,'reconnect never resends install');
|
||||
fixture.data.checking=true;
|
||||
await page.evaluate(()=>window.dispatchEvent(new Event('pageshow')));
|
||||
await page.waitForFunction(()=>document.getElementById('hubUpdateNotice').textContent==='Проверяется наличие обновлений панели…');
|
||||
fixture.data.checking=false;fixture.data.remote_revision='c'.repeat(64);fixture.data.available=true;
|
||||
await page.evaluate(()=>window.dispatchEvent(new Event('pageshow')));
|
||||
await page.waitForFunction(()=>document.getElementById('hubUpdateNotice').textContent.startsWith('Доступно обновление панели:'));
|
||||
assert.equal(await button.getAttribute('data-update-state'),'available','old success does not hide another update');
|
||||
assert.equal(fixture.views,2,'rechecking an old success never reloads the page');
|
||||
console.log('HUB_UPDATE_UI_OK',width,'layout, confirmation, restart reconnect, one reload and current/new-update notices');
|
||||
await page.close();
|
||||
}
|
||||
const {page,button,fixture}=await fixturePage(1280,900,false);
|
||||
await button.click();
|
||||
await page.locator('#hubUpdateConfirmAccept').click();
|
||||
fixture.data.job={id:'job-one',status:'failed',message:'Обновление не выполнено. Предыдущий файл восстановлен.'};
|
||||
await page.waitForFunction(()=>document.getElementById('hubUpdateNotice').dataset.result==='failed',null,{timeout:6000});
|
||||
assert((await page.locator('#hubUpdateNotice').textContent()).includes('восстановлен'));
|
||||
assert.equal(fixture.views,1,'failed update stays visible');
|
||||
console.log('HUB_UPDATE_UI_OK rollback error remains visible');await page.close();
|
||||
async function fixturePage(width,height,mobile) {return createFixture(browser,width,height,mobile);}
|
||||
} finally {await browser.close();}
|
||||
})().catch(error=>{console.error(error);process.exitCode=1;});
|
||||
@@ -29,7 +29,7 @@ class CollectorDeploymentTests(unittest.TestCase):
|
||||
text = (ROOT / 'vps/deploy-log-collector-fix.ps1').read_text(encoding='utf-8')
|
||||
self.script = text.split("$RemoteScript = @'\n", 1)[1].split("\n'@", 1)[0]
|
||||
mapping = {target: (self.root / target.lstrip('/')).as_posix() for target in self.targets.values()}
|
||||
mapping['/root/owrt-remote-backup-before-log-collector-v117'] = self.backup.as_posix()
|
||||
mapping['/root/owrt-remote-backup-before-log-collector-v118'] = self.backup.as_posix()
|
||||
pattern = '|'.join(re.escape(path) for path in sorted(mapping, key=len, reverse=True))
|
||||
self.script = re.sub(pattern, lambda m: mapping[m.group()], self.script)
|
||||
mocks = r'''
|
||||
|
||||
@@ -42,7 +42,7 @@ class PersistentLogsDeploymentTests(unittest.TestCase):
|
||||
mappings['/etc/init.d/rpcd'] = (self.root / 'etc/init.d/rpcd').as_posix()
|
||||
mappings['/etc/init.d/uhttpd'] = (self.root / 'etc/init.d/uhttpd').as_posix()
|
||||
mappings['/tmp/owrt-remote-logs'] = (self.root / 'journal').as_posix()
|
||||
mappings['/root/owrt-remote-backup-before-persistent-logs-v117'] = self.backup.as_posix()
|
||||
mappings['/root/owrt-remote-backup-before-persistent-logs-v118'] = self.backup.as_posix()
|
||||
pattern = '|'.join(re.escape(target) for target in sorted(mappings, key=len, reverse=True))
|
||||
self.script = re.sub(pattern, lambda match: mappings[match.group()], self.script)
|
||||
# Existing sandbox service scripts only print markers. Mock readiness.
|
||||
@@ -102,7 +102,7 @@ logger() { printf '%s\\n' "$3" | sh "$TEST_LOG_HELPER" append; }
|
||||
self.assertIn('PERSISTENT_LOGS_ROUTER_Install_OK', result.stdout)
|
||||
for item in ('cgi', 'luci'):
|
||||
installed = self.root / self.targets[item].lstrip('/')
|
||||
self.assertIn('v117', installed.read_text(encoding='utf-8'))
|
||||
self.assertIn('v118', installed.read_text(encoding='utf-8'))
|
||||
for item, data in self.initial.items():
|
||||
self.assertEqual(self.backup.joinpath(item).read_bytes(), data)
|
||||
result = self.deploy('Rollback')
|
||||
@@ -129,7 +129,7 @@ logger() { printf '%s\\n' "$3" | sh "$TEST_LOG_HELPER" append; }
|
||||
self.assert_initial()
|
||||
|
||||
def test_rollback_restores_existing_log_service_and_helper(self):
|
||||
# This fix is normally applied on top of v117's already installed journal.
|
||||
# This fix is normally applied on top of v118's already installed journal.
|
||||
for item in ('logs.sh', 'logs-init'):
|
||||
target = self.root / self.targets[item].lstrip('/')
|
||||
target.parent.mkdir(parents=True, exist_ok=True)
|
||||
|
||||
@@ -20,7 +20,7 @@ class VpsLogDeployTests(unittest.TestCase):
|
||||
self.target = self.root / 'hub.py'
|
||||
self.previous = b'print("previous Hub")\n'
|
||||
self.target.write_bytes(self.previous)
|
||||
self.backup = self.root / 'hub.py.bak-before-persistent-logs-sync-v117'
|
||||
self.backup = self.root / 'hub.py.bak-before-persistent-logs-sync-v118'
|
||||
source = (ROOT / 'vps/deploy-persistent-logs-vps.ps1').read_text(encoding='utf-8')
|
||||
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())
|
||||
@@ -73,7 +73,7 @@ sleep() { return 0; }
|
||||
for _ in range(2):
|
||||
result = self.deploy('Install')
|
||||
self.assertEqual(result.returncode, 0, result.stderr)
|
||||
self.assertIn('PERSISTENT_LOGS_VPS_V117_Install_OK', result.stdout)
|
||||
self.assertIn('PERSISTENT_LOGS_VPS_V118_Install_OK', result.stdout)
|
||||
self.assertIn(b'def receive_router_logs(', self.target.read_bytes())
|
||||
self.assertEqual(self.backup.read_bytes(), self.previous)
|
||||
result = self.deploy('Rollback')
|
||||
|
||||
@@ -131,7 +131,7 @@ class HubFixture:
|
||||
assert "groups" in json.loads(self.request("/api/router-groups"))
|
||||
assert "notifications" in json.loads(self.request("/api/notifications"))
|
||||
assert self.request("/access/test-router/") == b"router proxy fixture"
|
||||
assert b"v117" in self.request("/")
|
||||
assert b"v118" in self.request("/")
|
||||
self.app.snapshot_router_states()
|
||||
|
||||
def __exit__(self, *args):
|
||||
|
||||
@@ -21,7 +21,7 @@ class RouterUpdatesDeployTests(unittest.TestCase):
|
||||
self.target = self.root / 'hub.py'
|
||||
self.previous = b'print("previous Hub")\n'
|
||||
self.target.write_bytes(self.previous)
|
||||
self.backup = self.root / 'hub.py.bak-before-router-reboot-all-v117'
|
||||
self.backup = self.root / 'hub.py.bak-before-router-reboot-all-v118'
|
||||
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 = self.script.replace('/opt/owrt-remote/owrt-remote-hub.py', self.target.as_posix())
|
||||
@@ -56,7 +56,7 @@ sleep() { return 0; }
|
||||
for _ in range(2):
|
||||
result = self.deploy('Install')
|
||||
self.assertEqual(result.returncode, 0, result.stderr)
|
||||
self.assertIn('ROUTER_UPDATES_V117_Install_OK', result.stdout)
|
||||
self.assertIn('ROUTER_UPDATES_V118_Install_OK', result.stdout)
|
||||
self.assertIn(b'class RouterUpdateManager:', self.target.read_bytes())
|
||||
self.assertEqual(self.backup.read_bytes(), self.previous)
|
||||
result = self.deploy('Rollback')
|
||||
|
||||
@@ -65,10 +65,10 @@ class ResourceSampleTests(unittest.TestCase):
|
||||
for thread in threads: thread.join(timeout=5)
|
||||
self.assertEqual(len(results), 8)
|
||||
self.assertEqual(cpu.call_count, 1)
|
||||
clock.return_value = 12.99
|
||||
clock.return_value = 10.99
|
||||
self.monitor.snapshot()
|
||||
self.assertEqual(cpu.call_count, 1)
|
||||
clock.return_value = 13
|
||||
clock.return_value = 11
|
||||
self.monitor.snapshot()
|
||||
self.assertEqual(cpu.call_count, 2)
|
||||
|
||||
@@ -90,6 +90,40 @@ class QuietHandler(hub.Handler):
|
||||
|
||||
|
||||
class ResourceHttpTests(unittest.TestCase):
|
||||
def test_dashboard_contains_metrics_before_browser_fetch(self):
|
||||
app = hub.App(Path(STATE.name) / "dashboard.db", "test-session", "test-agent", "")
|
||||
server = hub.HubHTTPServer(("127.0.0.1", 0), QuietHandler)
|
||||
server.app = app
|
||||
server.is_tls = False
|
||||
thread = threading.Thread(target=server.serve_forever, daemon=True)
|
||||
thread.start()
|
||||
sample = {"cpu": {"percent": 12.5}, "memory": {"percent": 40},
|
||||
"disk": {"percent": 60}, "sampled_at": 123}
|
||||
try:
|
||||
with mock.patch.object(app.vps_resources, "snapshot", return_value=sample) as snapshot, \
|
||||
mock.patch.object(hub.Handler, "legacy_admin_ok", return_value=False), \
|
||||
mock.patch.object(hub.Handler, "current_hub_session", return_value={"username": "root"}), \
|
||||
mock.patch.object(hub.Handler, "current_account_profile", return_value={"username": "root", "is_owner": True}), \
|
||||
mock.patch.object(hub, "web_push_backend_status", return_value={"ready": False}):
|
||||
request = urllib.request.Request(f"http://127.0.0.1:{server.server_port}/",
|
||||
headers={"Cookie": "owrt_remote_session=test-session"})
|
||||
with urllib.request.urlopen(request, timeout=5) as response:
|
||||
page = response.read().decode("utf-8")
|
||||
snapshot.assert_called_once_with()
|
||||
values = re.findall(r'<strong data-vps-resource-value>([^<]+)</strong>', page)
|
||||
self.assertEqual(values, ["12,5%", "40%", "60%"] * 2, "desktop and mobile have values in HTML")
|
||||
self.assertIn('aria-label="ЦП: 12,5%"', page)
|
||||
finally:
|
||||
server.shutdown()
|
||||
server.server_close()
|
||||
thread.join(timeout=5)
|
||||
|
||||
def test_unavailable_readings_are_not_invented(self):
|
||||
page = hub.vps_resource_widgets_html(resources={"cpu": {"percent": None},
|
||||
"memory": {"percent": float("nan")},
|
||||
"disk": {"percent": 0}})
|
||||
self.assertEqual(re.findall(r'<strong data-vps-resource-value>([^<]+)</strong>', page), ["—", "—", "0%"])
|
||||
|
||||
def test_metrics_require_hub_login_and_never_open_router_database(self):
|
||||
app = hub.App(Path(STATE.name) / "unused.db", "test-session", "test-agent", "")
|
||||
server = hub.HubHTTPServer(("127.0.0.1", 0), QuietHandler)
|
||||
|
||||
@@ -4,16 +4,16 @@ const fs = require('node:fs');
|
||||
const vm = require('node:vm');
|
||||
const source = fs.readFileSync(process.argv[2], 'utf8').replace(/\r\n/g, '\n');
|
||||
const begin = source.indexOf('function initVpsResourceWidgets() {');
|
||||
const end = source.indexOf('\nsetInterval(loadRouters, 5000);', begin);
|
||||
const end = source.indexOf('\ninitVpsResourceWidgets();', begin);
|
||||
assert(begin >= 0 && end > begin);
|
||||
const flush = async () => { for (let i = 0; i < 8; i++) await Promise.resolve(); };
|
||||
|
||||
function fixture() {
|
||||
function fixture(initialPending = false) {
|
||||
const timers = new Map(), documentEvents = {}, windowEvents = {}, calls = [];
|
||||
let nextId = 1;
|
||||
const widgets = ['cpu', 'memory', 'disk', 'cpu', 'memory', 'disk'].map(key => ({
|
||||
dataset: {vpsResource: key}, label: {textContent: {cpu: 'ЦП', memory: 'ОЗУ', disk: 'ДИСК'}[key]},
|
||||
value: {textContent: '—'}, title: '',
|
||||
value: {textContent: '12,5%'}, title: '',
|
||||
querySelector(selector) { return selector === 'span' ? this.label : this.value; },
|
||||
setAttribute(key, value) { this[key] = value; },
|
||||
}));
|
||||
@@ -26,10 +26,10 @@ function fixture() {
|
||||
setTimeout(fn, ms) { const id = nextId++; timers.set(id, {fn, ms}); return id; },
|
||||
clearInterval(id) { timers.delete(id); }, clearTimeout(id) { timers.delete(id); },
|
||||
fetch(url, options) { calls.push({url, options}); return context.respond(url, options); },
|
||||
respond: async () => ({ok: true, status: 200, json: async () => metrics}),
|
||||
respond: initialPending ? () => new Promise(() => {}) : async () => ({ok: true, status: 200, json: async () => metrics}),
|
||||
};
|
||||
vm.createContext(context);
|
||||
vm.runInContext(source.slice(begin, end), context);
|
||||
vm.runInContext(source.slice(begin, end) + '\ninitVpsResourceWidgets();', context);
|
||||
return {context, timers, calls, widgets, documentEvents, windowEvents,
|
||||
tick() { const timer = [...timers.values()].find(t => t.interval); assert(timer); return timer.fn(); },
|
||||
intervals() { return [...timers.values()].filter(t => t.interval); },
|
||||
@@ -37,11 +37,18 @@ function fixture() {
|
||||
}
|
||||
|
||||
(async () => {
|
||||
const initial = fixture(true);
|
||||
assert.equal(initial.calls.length, 1);
|
||||
initial.windowEvents.pageshow();
|
||||
assert.equal(initial.calls.length, 1, 'initial pageshow reuses the pending fetch');
|
||||
assert.equal(initial.calls[0].options.signal.aborted, false, 'opening page must not cancel initial fetch');
|
||||
assert(initial.widgets.every(widget => widget.value.textContent === '12,5%'), 'keep server-rendered values while first fetch is pending');
|
||||
initial.windowEvents.pagehide();
|
||||
const f = fixture();
|
||||
await flush();
|
||||
assert.equal(f.calls.length, 1, 'first update starts immediately');
|
||||
assert.equal(f.intervals().length, 1);
|
||||
assert.equal(f.intervals()[0].ms, 3000);
|
||||
assert.equal(f.intervals()[0].ms, 1000);
|
||||
assert.equal(f.calls[0].url, '/api/vps/resources');
|
||||
assert.equal(f.calls[0].options.cache, 'no-store');
|
||||
assert.equal(f.widgets[0].value.textContent, '25%');
|
||||
@@ -94,5 +101,5 @@ function fixture() {
|
||||
assert(g.calls.at(-1).options.signal.aborted);
|
||||
assert.equal(g.widgets[0].dataset.stale, 'true');
|
||||
g.windowEvents.pagehide();
|
||||
console.log('VPS_WIDGETS_UI_OK: immediate/3s updates, no overlaps, desktop/mobile, errors, timeout, pause/resume and session expiry');
|
||||
console.log('VPS_WIDGETS_UI_OK: immediate/1s updates, no overlaps, desktop/mobile, errors, timeout, pause/resume and session expiry');
|
||||
})().catch(error => { console.error(error); process.exitCode = 1; });
|
||||
@@ -35,7 +35,7 @@ class WanDnsDeploymentTests(unittest.TestCase):
|
||||
source = (ROOT / "vps/deploy-wan-dns-fix.ps1").read_text(encoding="utf-8")
|
||||
self.script = source.split("$RemoteScript = @'\n", 1)[1].split("\n'@", 1)[0]
|
||||
self.script = self.script.replace("target=/usr/lib/owrt-remote/wan.sh", "target=" + shlex.quote(self.target.as_posix()))
|
||||
self.script = self.script.replace("backup_dir=/root/owrt-remote-backup-before-wan-dns-v117",
|
||||
self.script = self.script.replace("backup_dir=/root/owrt-remote-backup-before-wan-dns-v118",
|
||||
"backup_dir=" + shlex.quote(self.backup.as_posix()))
|
||||
|
||||
def deploy(self, action="Install", bad=False, fail_verify=False, fail_signal=False):
|
||||
|
||||
@@ -25,7 +25,7 @@ class WanRecoveryDeploymentTests(unittest.TestCase):
|
||||
self.env["PATH"] = str(GIT_BIN) + os.pathsep + self.env["PATH"]
|
||||
source = (ROOT / "vps/deploy-wan-recovery-fix.ps1").read_text(encoding="utf-8")
|
||||
self.script = source.split("$RemoteScript = @'\n", 1)[1].split("\n'@", 1)[0]
|
||||
self.script = self.script.replace("backup_dir=/root/owrt-remote-backup-before-wan-recovery-v117",
|
||||
self.script = self.script.replace("backup_dir=/root/owrt-remote-backup-before-wan-recovery-v118",
|
||||
"backup_dir=" + shlex.quote(self.backup.as_posix()))
|
||||
self.script = self.script.replace("printf /usr/lib/owrt-remote/wan.sh", "printf %s " + shlex.quote(self.targets["wan.sh"].as_posix()))
|
||||
self.script = self.script.replace("printf /usr/sbin/owrt-remote", "printf %s " + shlex.quote(self.targets["agent"].as_posix()))
|
||||
|
||||
@@ -31,7 +31,7 @@ class WanStabilityRollbackTests(unittest.TestCase):
|
||||
source = (ROOT / "vps/deploy-wan-stability-fix.ps1").read_text(encoding="utf-8")
|
||||
script = source.split("$RemoteScript = @'\n", 1)[1].split("\n'@", 1)[0]
|
||||
script = script.replace('stage=/tmp/__UPLOAD_NAME__', 'stage=' + shlex.quote(self.stage.as_posix()))
|
||||
script = script.replace('backup=/root/owrt-remote-backup-before-wan-stability-v117', 'backup=' + shlex.quote(self.backup.as_posix()))
|
||||
script = script.replace('backup=/root/owrt-remote-backup-before-wan-stability-v118', 'backup=' + shlex.quote(self.backup.as_posix()))
|
||||
script = script.replace('config=/etc/config/owrtremote', 'config=' + shlex.quote(self.files["config"].as_posix()))
|
||||
for name, original in (("agent", "/usr/sbin/owrt-remote"), ("wan.sh", "/usr/lib/owrt-remote/wan.sh")):
|
||||
script = script.replace('printf ' + original + ' ;;', "printf '%s' " + shlex.quote(self.files[name].as_posix()) + ' ;;')
|
||||
|
||||
@@ -28,7 +28,7 @@ class XrayBootDeploymentTests(unittest.TestCase):
|
||||
source = (ROOT / 'vps/deploy-xray-boot-fix.ps1').read_text(encoding='utf-8')
|
||||
self.script = source.split("$RemoteScript = @'\n", 1)[1].split("\n'@", 1)[0]
|
||||
self.script = self.script.replace('target=/usr/sbin/owrt-remote', 'target=' + shlex.quote(self.target.as_posix()))
|
||||
self.script = self.script.replace('backup_dir=/root/owrt-remote-backup-before-xray-boot-v117',
|
||||
self.script = self.script.replace('backup_dir=/root/owrt-remote-backup-before-xray-boot-v118',
|
||||
'backup_dir=' + shlex.quote(self.backup.as_posix()))
|
||||
|
||||
def deploy(self, action='Install', bad=False, fail_verify=False, fail_prepare=False,
|
||||
|
||||
@@ -29,7 +29,7 @@ class XrayMobileDeploymentTests(unittest.TestCase):
|
||||
source = (ROOT / "vps/deploy-xray-mobile-fix.ps1").read_text(encoding="utf-8")
|
||||
self.script = source.split("$RemoteScript = @'\n", 1)[1].split("\n'@", 1)[0]
|
||||
self.script = self.script.replace("target=/www/cgi-bin/owrt-remote", "target=" + shlex.quote(self.target.as_posix()))
|
||||
self.script = self.script.replace("backup_dir=/root/owrt-remote-backup-before-xray-mobile-v117",
|
||||
self.script = self.script.replace("backup_dir=/root/owrt-remote-backup-before-xray-mobile-v118",
|
||||
"backup_dir=" + shlex.quote(self.backup_dir.as_posix()))
|
||||
|
||||
def deploy(self, action, content=None, fail_verify=False):
|
||||
|
||||
@@ -25,7 +25,7 @@ class XrayValidationDeploymentTests(unittest.TestCase):
|
||||
self.env["PATH"] = str(GIT_BIN) + os.pathsep + self.env["PATH"]
|
||||
source = (ROOT / "vps/deploy-xray-validation-fix.ps1").read_text(encoding="utf-8")
|
||||
self.script = source.split("$RemoteScript = @'\n", 1)[1].split("\n'@", 1)[0]
|
||||
self.script = self.script.replace("backup_dir=/root/owrt-remote-backup-before-xray-validation-v117",
|
||||
self.script = self.script.replace("backup_dir=/root/owrt-remote-backup-before-xray-validation-v118",
|
||||
"backup_dir=" + shlex.quote(self.backup.as_posix()))
|
||||
self.script = self.script.replace("printf /www/cgi-bin/owrt-remote", "printf %s " + shlex.quote(self.targets["cgi"].as_posix()))
|
||||
self.script = self.script.replace("printf /usr/sbin/owrt-remote", "printf %s " + shlex.quote(self.targets["agent"].as_posix()))
|
||||
|
||||
@@ -15,7 +15,7 @@ $RemoteScript = @'
|
||||
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
|
||||
backup=/opt/owrt-remote/owrt-remote-hub.py.bak-before-dashboard-layout-v118
|
||||
candidate=$target.new-__UPLOAD_NAME__
|
||||
changed=0
|
||||
|
||||
@@ -106,7 +106,7 @@ if [ "$healthy" -ne 1 ]; then
|
||||
exit 1
|
||||
fi
|
||||
cmp "$source_file" "$target"
|
||||
printf '\nBackup: %s\nDASHBOARD_LAYOUT_V117_%s_OK\n' "$backup" '__ACTION__'
|
||||
printf '\nBackup: %s\nDASHBOARD_LAYOUT_V118_%s_OK\n' "$backup" '__ACTION__'
|
||||
'@
|
||||
|
||||
$RemoteScript = $RemoteScript.Replace('__UPLOAD_NAME__', $UploadName).Replace('__ACTION__', $Action)
|
||||
|
||||
@@ -0,0 +1,151 @@
|
||||
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-menu-' + [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-menu-v118
|
||||
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(",
|
||||
"#routerUpdatesGroup .routerUpdatesLaunch{{display:flex;",
|
||||
'class="sessionBtn btn routerUpdatesLaunch"',
|
||||
"const SEASON_EFFECT_MODES = new Set(['off', 'snow', 'rain', 'cosmos', 'embers', 'orbit', 'prism', 'pulse', 'laser']);",
|
||||
)
|
||||
for mode in ('aurora', 'matrix', 'nebula', 'fireworks', 'vortex', 'comet'):
|
||||
if 'data-season-mode="' + mode + '"' in source:
|
||||
raise SystemExit('Removed effect is still offered: ' + mode)
|
||||
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_MENU_V118_%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 menu 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
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -15,7 +15,7 @@ $RemoteScript = @'
|
||||
set -eu
|
||||
stage=/tmp/__UPLOAD_NAME__
|
||||
target=/opt/owrt-remote/owrt-remote-hub.py
|
||||
backup=/opt/owrt-remote/owrt-remote-hub.py.bak-before-global-logs-ui-v117
|
||||
backup=/opt/owrt-remote/owrt-remote-hub.py.bak-before-global-logs-ui-v118
|
||||
candidate=$target.new-__UPLOAD_NAME__
|
||||
changed=0
|
||||
|
||||
@@ -107,7 +107,7 @@ if [ "$healthy" -ne 1 ]; then
|
||||
exit 1
|
||||
fi
|
||||
cmp "$source_file" "$target"
|
||||
printf '\nBackup: %s\nGLOBAL_LOGS_VPS_V117_%s_OK\n' "$backup" '__ACTION__'
|
||||
printf '\nBackup: %s\nGLOBAL_LOGS_VPS_V118_%s_OK\n' "$backup" '__ACTION__'
|
||||
'@
|
||||
|
||||
$RemoteScript = $RemoteScript.Replace('__UPLOAD_NAME__', $UploadName).Replace('__ACTION__', $Action)
|
||||
|
||||
@@ -13,7 +13,7 @@ $RemoteScript = @'
|
||||
#!/bin/sh
|
||||
set -eu
|
||||
stage=/tmp/__UPLOAD_NAME__
|
||||
backup=/root/owrt-remote-backup-before-global-logs-stop-v117
|
||||
backup=/root/owrt-remote-backup-before-global-logs-stop-v118
|
||||
items='cgi agent init logs.sh logs-init luci'
|
||||
changed=0
|
||||
phase=preflight
|
||||
@@ -104,7 +104,7 @@ if [ '__ACTION__' = Install ]; then
|
||||
command -v base64 >/dev/null
|
||||
command -v jsonfilter >/dev/null
|
||||
grep -F -q 'globalLogsToggle' "$stage/cgi"
|
||||
for item in cgi luci; do grep -F -q 'v117' "$stage/$item"; done
|
||||
for item in cgi luci; do grep -F -q 'v118' "$stage/$item"; done
|
||||
grep -F -q 'LOG_KEEP_SECONDS=86400' "$stage/logs.sh"
|
||||
grep -F -q 'log_sync_loop' "$stage/logs.sh"
|
||||
grep -F -q 'sync_global_logs' "$stage/agent"
|
||||
|
||||
@@ -6,7 +6,7 @@ param(
|
||||
|
||||
$ErrorActionPreference = 'Stop'
|
||||
$RepoRoot = Split-Path -Parent $PSScriptRoot
|
||||
$UploadName = 'owrt-group-colors-v117-' + [guid]::NewGuid().ToString('N')
|
||||
$UploadName = 'owrt-group-colors-v118-' + [guid]::NewGuid().ToString('N')
|
||||
$StageRoot = Join-Path ([System.IO.Path]::GetTempPath()) $UploadName
|
||||
$Utf8 = [System.Text.UTF8Encoding]::new($false)
|
||||
|
||||
@@ -15,7 +15,7 @@ $RemoteScript = @'
|
||||
set -eu
|
||||
stage=/tmp/__UPLOAD_NAME__
|
||||
target=/opt/owrt-remote/owrt-remote-hub.py
|
||||
backup=/opt/owrt-remote/owrt-remote-hub.py.bak-before-group-colors-v117
|
||||
backup=/opt/owrt-remote/owrt-remote-hub.py.bak-before-group-colors-v118
|
||||
candidate=$target.new-__UPLOAD_NAME__
|
||||
changed=0
|
||||
|
||||
@@ -57,7 +57,7 @@ if [ '__ACTION__' = Install ]; then
|
||||
from pathlib import Path
|
||||
import sys
|
||||
source = Path(sys.argv[1]).read_text(encoding='utf-8')
|
||||
required = ('v117', '#routerForm select option,#routerGroupFilter option', 'background-color:#221a34', 'id="backupDownload"', 'id="backupRestore"')
|
||||
required = ('v118', '#routerForm select option,#routerGroupFilter option', 'background-color:#221a34', 'id="backupDownload"', 'id="backupRestore"')
|
||||
if 'class="backupCmds"' in source:
|
||||
print('Old backup command instructions remain in candidate', file=sys.stderr)
|
||||
raise SystemExit(1)
|
||||
@@ -106,7 +106,7 @@ if [ "$healthy" -ne 1 ]; then
|
||||
exit 1
|
||||
fi
|
||||
cmp "$source_file" "$target"
|
||||
printf '\nBackup: %s\nGROUP_COLORS_V117_%s_OK\n' "$backup" '__ACTION__'
|
||||
printf '\nBackup: %s\nGROUP_COLORS_V118_%s_OK\n' "$backup" '__ACTION__'
|
||||
'@
|
||||
|
||||
$RemoteScript = $RemoteScript.Replace('__UPLOAD_NAME__', $UploadName).Replace('__ACTION__', $Action)
|
||||
|
||||
@@ -13,7 +13,7 @@ $RemoteScript = @'
|
||||
#!/bin/sh
|
||||
set -eu
|
||||
stage=/tmp/__UPLOAD_NAME__
|
||||
backup=/root/owrt-remote-backup-before-heartbeat-redirect-v117
|
||||
backup=/root/owrt-remote-backup-before-heartbeat-redirect-v118
|
||||
agent=/usr/sbin/owrt-remote
|
||||
wan=/usr/lib/owrt-remote/wan.sh
|
||||
changed=0
|
||||
|
||||
@@ -17,7 +17,7 @@ $RemoteScript = @'
|
||||
#!/bin/sh
|
||||
set -eu
|
||||
stage=/tmp/__UPLOAD_NAME__
|
||||
backup_dir=/root/owrt-remote-backup-before-heartbeat-transport-v117
|
||||
backup_dir=/root/owrt-remote-backup-before-heartbeat-transport-v118
|
||||
changed=0
|
||||
phase=preflight
|
||||
item_path() {
|
||||
|
||||
@@ -5,7 +5,7 @@ param(
|
||||
[string]$PinnedVpsHost = '193.233.82.38',
|
||||
[ValidatePattern('^[a-zA-Z0-9_-]+$')][string]$WanInterface = 'wan',
|
||||
[switch]$PreserveConnectionSettings,
|
||||
[ValidatePattern('^[a-zA-Z0-9_-]+$')][string]$BackupName = 'host-policy-v117',
|
||||
[ValidatePattern('^[a-zA-Z0-9_-]+$')][string]$BackupName = 'host-policy-v118',
|
||||
[switch]$PrepareOnly
|
||||
)
|
||||
|
||||
@@ -90,7 +90,7 @@ test -s "$config"
|
||||
if [ '__ACTION__' = Install ]; then
|
||||
for item in agent wan.sh cgi init; do test -s "$stage/$item"; sh -n "$stage/$item"; done
|
||||
test -s "$stage/luci"
|
||||
for item in cgi luci; do grep -F -q 'v117' "$stage/$item"; done
|
||||
for item in cgi luci; do grep -F -q 'v118' "$stage/$item"; done
|
||||
# curl is needed to preserve HTTPS SNI and bypass the local DNS/proxy.
|
||||
if ! command -v curl >/dev/null 2>&1; then
|
||||
if command -v opkg >/dev/null 2>&1; then opkg update && opkg install curl ca-bundle
|
||||
@@ -156,16 +156,16 @@ if [ '__ACTION__' = Install ]; then
|
||||
exit 1
|
||||
fi
|
||||
/usr/sbin/owrt-remote status
|
||||
grep -F -q 'v117' /www/cgi-bin/owrt-remote
|
||||
grep -F -q 'v117' /www/luci-static/resources/view/owrt_remote.js
|
||||
echo HOST_POLICY_ROUTER_V117_OK
|
||||
grep -F -q 'v118' /www/cgi-bin/owrt-remote
|
||||
grep -F -q 'v118' /www/luci-static/resources/view/owrt_remote.js
|
||||
echo HOST_POLICY_ROUTER_V118_OK
|
||||
else
|
||||
test -f "$backup/complete"
|
||||
save_files "$stage/previous"
|
||||
changed=1
|
||||
restore_files "$backup"
|
||||
/usr/sbin/owrt-remote status
|
||||
echo HOST_POLICY_ROUTER_V117_ROLLBACK_OK
|
||||
echo HOST_POLICY_ROUTER_V118_ROLLBACK_OK
|
||||
fi
|
||||
'@
|
||||
} else {
|
||||
@@ -180,7 +180,7 @@ fi
|
||||
set -eu
|
||||
stage=/tmp/__UPLOAD_NAME__
|
||||
target=/opt/owrt-remote/owrt-remote-hub.py
|
||||
backup=/opt/owrt-remote/owrt-remote-hub.py.bak-before-host-policy-v117
|
||||
backup=/opt/owrt-remote/owrt-remote-hub.py.bak-before-host-policy-v118
|
||||
changed=0
|
||||
cleanup() {
|
||||
code=$?
|
||||
@@ -200,7 +200,7 @@ test -s "$target"
|
||||
python_bin=/opt/owrt-remote/venv/bin/python
|
||||
[ -x "$python_bin" ] || python_bin=python3
|
||||
if [ '__ACTION__' = Install ]; then
|
||||
grep -F -q 'v117' "$stage/hub.py"
|
||||
grep -F -q 'v118' "$stage/hub.py"
|
||||
"$python_bin" -m py_compile "$stage/hub.py"
|
||||
OWRT_HOST_POLICY_HUB_SOURCE="$stage/hub.py" "$python_bin" "$stage/test_host_policy.py" HostPolicyTests -v
|
||||
OWRT_RESOURCE_HUB_SOURCE="$stage/hub.py" "$python_bin" "$stage/resources.py" -v
|
||||
@@ -226,7 +226,7 @@ for attempt in 1 2 3 4 5 6 7 8 9 10; do
|
||||
done
|
||||
test "$healthy" = 1
|
||||
cmp "$candidate" "$target"
|
||||
printf '\nHOST_POLICY_VPS_V117_%s_OK\n' '__ACTION__'
|
||||
printf '\nHOST_POLICY_VPS_V118_%s_OK\n' '__ACTION__'
|
||||
'@
|
||||
}
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@ param(
|
||||
|
||||
$ErrorActionPreference = 'Stop'
|
||||
$RepoRoot = Split-Path -Parent $PSScriptRoot
|
||||
$UploadName = 'owrt-version-v117-' + [guid]::NewGuid().ToString('N')
|
||||
$UploadName = 'owrt-hub-self-update-' + [guid]::NewGuid().ToString('N')
|
||||
$StageRoot = Join-Path ([System.IO.Path]::GetTempPath()) $UploadName
|
||||
$Utf8 = [System.Text.UTF8Encoding]::new($false)
|
||||
|
||||
@@ -15,7 +15,7 @@ $RemoteScript = @'
|
||||
set -eu
|
||||
stage=/tmp/__UPLOAD_NAME__
|
||||
target=/opt/owrt-remote/owrt-remote-hub.py
|
||||
backup=/opt/owrt-remote/owrt-remote-hub.py.bak-before-v117
|
||||
backup=/opt/owrt-remote/owrt-remote-hub.py.bak-before-hub-self-update-v118
|
||||
candidate=$target.new-__UPLOAD_NAME__
|
||||
changed=0
|
||||
|
||||
@@ -57,10 +57,14 @@ if [ '__ACTION__' = Install ]; then
|
||||
from pathlib import Path
|
||||
import sys
|
||||
source = Path(sys.argv[1]).read_text(encoding='utf-8')
|
||||
required = ('v117',)
|
||||
if 'v' + '116' in source:
|
||||
print('Old UI version remains in candidate', file=sys.stderr)
|
||||
raise SystemExit(1)
|
||||
required = (
|
||||
"class HubUpdateManager:",
|
||||
"def run_hub_update_worker(",
|
||||
"function initHubUpdate()",
|
||||
"panel-update-worker",
|
||||
"hub_update_api",
|
||||
"X-Hub-Update-CSRF",
|
||||
)
|
||||
missing = [marker for marker in required if marker not in source]
|
||||
if missing:
|
||||
for marker in missing:
|
||||
@@ -103,7 +107,7 @@ if [ "$healthy" -ne 1 ]; then
|
||||
exit 1
|
||||
fi
|
||||
cmp "$source_file" "$target"
|
||||
printf '\nBackup: %s\nHUB_V117_%s_OK\n' "$backup" '__ACTION__'
|
||||
printf '\nBackup: %s\nHUB_SELF_UPDATE_V118_%s_OK\n' "$backup" '__ACTION__'
|
||||
'@
|
||||
|
||||
$RemoteScript = $RemoteScript.Replace('__UPLOAD_NAME__', $UploadName).Replace('__ACTION__', $Action)
|
||||
@@ -130,7 +134,7 @@ try {
|
||||
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 "Hub v117 $Action finished successfully. Refresh the Hub panel."
|
||||
Write-Host "Hub self-update feature $Action finished successfully."
|
||||
}
|
||||
finally {
|
||||
if (-not $PrepareOnly) {
|
||||
@@ -34,7 +34,7 @@ if ($Target -eq 'Router') {
|
||||
#!/bin/sh
|
||||
set -eu
|
||||
stage=/tmp/__UPLOAD_NAME__
|
||||
backup=/root/owrt-remote-backup-before-hub-url-v117
|
||||
backup=/root/owrt-remote-backup-before-hub-url-v118
|
||||
chmod 700 "$stage"
|
||||
config=/etc/config/owrtremote
|
||||
changed=0
|
||||
@@ -99,7 +99,7 @@ if [ '__ACTION__' = Install ]; then
|
||||
grep -F -q 'heartbeat_set_url_if_changed()' "$stage/agent"
|
||||
grep -F -q 'reason=https-downgrade' "$stage/agent"
|
||||
for item in agent wan.sh; do grep -F -q -- '--post301' "$stage/$item"; done
|
||||
for item in cgi luci; do grep -F -q 'v117' "$stage/$item"; done
|
||||
for item in cgi luci; do grep -F -q 'v118' "$stage/$item"; done
|
||||
if [ ! -e "$backup" ]; then
|
||||
save_files "$stage/retained-backup"
|
||||
mv "$stage/retained-backup" "$backup"
|
||||
@@ -138,7 +138,7 @@ else
|
||||
changed=1
|
||||
restore_files "$backup"
|
||||
fi
|
||||
printf '\nBackup: %s\nHUB_URL_ROUTER_V117_%s_OK\n' "$backup" '__ACTION__'
|
||||
printf '\nBackup: %s\nHUB_URL_ROUTER_V118_%s_OK\n' "$backup" '__ACTION__'
|
||||
'@
|
||||
} else {
|
||||
$Payloads = @{
|
||||
@@ -152,7 +152,7 @@ set -eu
|
||||
stage=/tmp/__UPLOAD_NAME__
|
||||
target=/opt/owrt-remote/owrt-remote-hub.py
|
||||
chmod 700 "$stage"
|
||||
backup=/opt/owrt-remote/owrt-remote-hub.py.bak-before-hub-url-v117
|
||||
backup=/opt/owrt-remote/owrt-remote-hub.py.bak-before-hub-url-v118
|
||||
candidate=$target.new-__UPLOAD_NAME__
|
||||
changed=0
|
||||
cleanup() {
|
||||
@@ -174,7 +174,7 @@ python_bin=/opt/owrt-remote/venv/bin/python
|
||||
[ -x "$python_bin" ] || python_bin=python3
|
||||
if [ '__ACTION__' = Install ]; then
|
||||
grep -F -q 'def router_hub_origins(' "$stage/hub.py"
|
||||
grep -F -q 'v117' "$stage/hub.py"
|
||||
grep -F -q 'v118' "$stage/hub.py"
|
||||
"$python_bin" -m py_compile "$stage/hub.py"
|
||||
OWRT_HOST_POLICY_HUB_SOURCE="$stage/hub.py" "$python_bin" "$stage/host_policy.py" HostPolicyTests -v
|
||||
OWRT_RESOURCE_HUB_SOURCE="$stage/hub.py" "$python_bin" "$stage/resources.py" IntegrationTests -v
|
||||
@@ -198,7 +198,7 @@ for attempt in 1 2 3 4 5 6 7 8 9 10; do
|
||||
done
|
||||
test "$healthy" = 1
|
||||
cmp "$source_file" "$target"
|
||||
printf '\nBackup: %s\nHUB_URL_VPS_V117_%s_OK\n' "$backup" '__ACTION__'
|
||||
printf '\nBackup: %s\nHUB_URL_VPS_V118_%s_OK\n' "$backup" '__ACTION__'
|
||||
'@
|
||||
}
|
||||
$RemoteScript = $RemoteScript.Replace('__UPLOAD_NAME__', $UploadName).Replace('__ACTION__', $Action).Replace('__HUB_URL__', $HubUrl)
|
||||
|
||||
@@ -17,7 +17,7 @@ $RemoteScript = @'
|
||||
#!/bin/sh
|
||||
set -eu
|
||||
stage=/tmp/__UPLOAD_NAME__
|
||||
backup_dir=/root/owrt-remote-backup-before-log-collector-v117
|
||||
backup_dir=/root/owrt-remote-backup-before-log-collector-v118
|
||||
changed=0
|
||||
phase=preflight
|
||||
items='logs.sh logs-init'
|
||||
|
||||
@@ -14,7 +14,7 @@ $RemoteScript = @'
|
||||
set -eu
|
||||
stage=/tmp/__UPLOAD_NAME__
|
||||
target=/opt/owrt-remote/owrt-remote-hub.py
|
||||
backup=/opt/owrt-remote/owrt-remote-hub.py.bak-before-online-status-v117
|
||||
backup=/opt/owrt-remote/owrt-remote-hub.py.bak-before-online-status-v118
|
||||
candidate=$target.new-__UPLOAD_NAME__
|
||||
changed=0
|
||||
cleanup() {
|
||||
@@ -59,7 +59,7 @@ for attempt in 1 2 3 4 5 6 7 8 9 10; do
|
||||
done
|
||||
test "$healthy" = 1
|
||||
cmp "$source_file" "$target"
|
||||
printf '\nBackup: %s\nONLINE_STATUS_V117_%s_OK\n' "$backup" '__ACTION__'
|
||||
printf '\nBackup: %s\nONLINE_STATUS_V118_%s_OK\n' "$backup" '__ACTION__'
|
||||
'@
|
||||
$RemoteScript = $RemoteScript.Replace('__UPLOAD_NAME__', $UploadName).Replace('__ACTION__', $Action)
|
||||
try {
|
||||
|
||||
@@ -15,7 +15,7 @@ $RemoteScript = @'
|
||||
set -eu
|
||||
stage=/tmp/__UPLOAD_NAME__
|
||||
target=/opt/owrt-remote/owrt-remote-hub.py
|
||||
backup=/opt/owrt-remote/owrt-remote-hub.py.bak-before-password-logout-v117
|
||||
backup=/opt/owrt-remote/owrt-remote-hub.py.bak-before-password-logout-v118
|
||||
candidate=$target.new-__UPLOAD_NAME__
|
||||
changed=0
|
||||
|
||||
@@ -105,7 +105,7 @@ if [ "$healthy" -ne 1 ]; then
|
||||
exit 1
|
||||
fi
|
||||
cmp "$source_file" "$target"
|
||||
printf '\nBackup: %s\nPASSWORD_LOGOUT_V117_%s_OK\n' "$backup" '__ACTION__'
|
||||
printf '\nBackup: %s\nPASSWORD_LOGOUT_V118_%s_OK\n' "$backup" '__ACTION__'
|
||||
'@
|
||||
|
||||
$RemoteScript = $RemoteScript.Replace('__UPLOAD_NAME__', $UploadName).Replace('__ACTION__', $Action)
|
||||
|
||||
@@ -15,7 +15,7 @@ $RemoteScript = @'
|
||||
set -eu
|
||||
stage=/tmp/__UPLOAD_NAME__
|
||||
target=/opt/owrt-remote/owrt-remote-hub.py
|
||||
backup=/opt/owrt-remote/owrt-remote-hub.py.bak-before-persistent-logs-sync-v117
|
||||
backup=/opt/owrt-remote/owrt-remote-hub.py.bak-before-persistent-logs-sync-v118
|
||||
candidate=$target.new-__UPLOAD_NAME__
|
||||
changed=0
|
||||
|
||||
@@ -144,7 +144,7 @@ if [ "$healthy" -ne 1 ]; then
|
||||
exit 1
|
||||
fi
|
||||
cmp "$source_file" "$target"
|
||||
printf '\nBackup: %s\nPERSISTENT_LOGS_VPS_V117_%s_OK\n' "$backup" '__ACTION__'
|
||||
printf '\nBackup: %s\nPERSISTENT_LOGS_VPS_V118_%s_OK\n' "$backup" '__ACTION__'
|
||||
'@
|
||||
|
||||
$RemoteScript = $RemoteScript.Replace('__UPLOAD_NAME__', $UploadName).Replace('__ACTION__', $Action)
|
||||
|
||||
@@ -13,7 +13,7 @@ $RemoteScript = @'
|
||||
#!/bin/sh
|
||||
set -eu
|
||||
stage=/tmp/__UPLOAD_NAME__
|
||||
backup=/root/owrt-remote-backup-before-persistent-logs-v117
|
||||
backup=/root/owrt-remote-backup-before-persistent-logs-v118
|
||||
items='cgi agent logs.sh logs-init luci'
|
||||
changed=0
|
||||
phase=preflight
|
||||
@@ -106,7 +106,7 @@ if [ '__ACTION__' = Install ]; then
|
||||
exit 1
|
||||
fi
|
||||
grep -F -q 'globalLogsToggle' "$stage/cgi"
|
||||
for item in cgi luci; do grep -F -q 'v117' "$stage/$item"; done
|
||||
for item in cgi luci; do grep -F -q 'v118' "$stage/$item"; done
|
||||
grep -F -q 'LOG_BUFFER_LIMIT=16384' "$stage/logs.sh"
|
||||
grep -F -q 'LOG_KEEP_SECONDS=86400' "$stage/logs.sh"
|
||||
grep -F -q 'log_sync_loop' "$stage/logs.sh"
|
||||
|
||||
@@ -17,8 +17,8 @@ if ($Action -eq 'Install') {
|
||||
set -Eeuo pipefail
|
||||
stage=/tmp/__UPLOAD_NAME__
|
||||
target=/opt/owrt-remote/owrt-remote-hub.py
|
||||
backup=/opt/owrt-remote/owrt-remote-hub.py.bak-before-recaptcha-v3-v117
|
||||
captcha_backup=/opt/owrt-remote/captcha-before-recaptcha-v3-v117.json
|
||||
backup=/opt/owrt-remote/owrt-remote-hub.py.bak-before-recaptcha-v3-v118
|
||||
captcha_backup=/opt/owrt-remote/captcha-before-recaptcha-v3-v118.json
|
||||
candidate=$target.new-__UPLOAD_NAME__
|
||||
changed=0
|
||||
cleanup() {
|
||||
@@ -45,7 +45,7 @@ if [ ! -x "$python_bin" ]; then python_bin=python3; fi
|
||||
import ast, pathlib, sys
|
||||
source = pathlib.Path(sys.argv[1]).read_text(encoding='utf-8')
|
||||
tree = ast.parse(source)
|
||||
assert 'v117' in source
|
||||
assert 'v118' in source
|
||||
assert 'v108' not in source
|
||||
assert 'CAPTCHA_MODE_RECAPTCHA_V3' in source
|
||||
assert 'prepareLoginRecaptcha' in source
|
||||
@@ -88,7 +88,7 @@ pid=$(systemctl show owrt-remote -p MainPID --value)
|
||||
test "$pid" -gt 0
|
||||
printf 'PID=%s FD=%s\n' "$pid" "$(find /proc/$pid/fd -maxdepth 1 -type l | wc -l)"
|
||||
systemctl --no-pager --full status owrt-remote | sed -n '1,16p'
|
||||
echo RECAPTCHA_V3_V117_OK
|
||||
echo RECAPTCHA_V3_V118_OK
|
||||
'@
|
||||
} elseif ($Action -eq 'Rollback') {
|
||||
$RemoteScript = @'
|
||||
@@ -96,8 +96,8 @@ echo RECAPTCHA_V3_V117_OK
|
||||
set -Eeuo pipefail
|
||||
stage=/tmp/__UPLOAD_NAME__
|
||||
target=/opt/owrt-remote/owrt-remote-hub.py
|
||||
backup=/opt/owrt-remote/owrt-remote-hub.py.bak-before-recaptcha-v3-v117
|
||||
captcha_backup=/opt/owrt-remote/captcha-before-recaptcha-v3-v117.json
|
||||
backup=/opt/owrt-remote/owrt-remote-hub.py.bak-before-recaptcha-v3-v118
|
||||
captcha_backup=/opt/owrt-remote/captcha-before-recaptcha-v3-v118.json
|
||||
candidate=$target.rollback-__UPLOAD_NAME__
|
||||
changed=0
|
||||
restore_captcha() {
|
||||
|
||||
@@ -18,7 +18,7 @@ if ($Action -eq 'Install') {
|
||||
set -Eeuo pipefail
|
||||
stage=/tmp/__UPLOAD_NAME__
|
||||
target=/opt/owrt-remote/owrt-remote-hub.py
|
||||
backup=/opt/owrt-remote/owrt-remote-hub.py.bak-before-resource-fix-v117
|
||||
backup=/opt/owrt-remote/owrt-remote-hub.py.bak-before-resource-fix-v118
|
||||
candidate=$target.new-__UPLOAD_NAME__
|
||||
changed=0
|
||||
cleanup() {
|
||||
@@ -45,7 +45,7 @@ if [ ! -x "$python_bin" ]; then python_bin=python3; fi
|
||||
import ast, pathlib, sys
|
||||
source = pathlib.Path(sys.argv[1]).read_text(encoding='utf-8')
|
||||
tree = ast.parse(source)
|
||||
assert 'v117' in source
|
||||
assert 'v118' in source
|
||||
assert 'v108' not in source
|
||||
factory = next(node for node in tree.body if isinstance(node, ast.FunctionDef) and node.name == 'connect')
|
||||
assert any(isinstance(item, ast.Name) and item.id == 'contextmanager' for item in factory.decorator_list)
|
||||
@@ -78,7 +78,7 @@ pid=$(systemctl show owrt-remote -p MainPID --value)
|
||||
test "$pid" -gt 0
|
||||
printf 'PID=%s FD=%s\n' "$pid" "$(find /proc/$pid/fd -maxdepth 1 -type l | wc -l)"
|
||||
systemctl --no-pager --full status owrt-remote | sed -n '1,16p'
|
||||
echo RESOURCE_FIX_V117_OK
|
||||
echo RESOURCE_FIX_V118_OK
|
||||
'@
|
||||
} elseif ($Action -eq 'Rollback') {
|
||||
$RemoteScript = @'
|
||||
@@ -86,7 +86,7 @@ echo RESOURCE_FIX_V117_OK
|
||||
set -Eeuo pipefail
|
||||
stage=/tmp/__UPLOAD_NAME__
|
||||
target=/opt/owrt-remote/owrt-remote-hub.py
|
||||
backup=/opt/owrt-remote/owrt-remote-hub.py.bak-before-resource-fix-v117
|
||||
backup=/opt/owrt-remote/owrt-remote-hub.py.bak-before-resource-fix-v118
|
||||
candidate=$target.rollback-__UPLOAD_NAME__
|
||||
changed=0
|
||||
cleanup() {
|
||||
|
||||
@@ -15,7 +15,7 @@ $RemoteScript = @'
|
||||
set -eu
|
||||
stage=/tmp/__UPLOAD_NAME__
|
||||
target=/opt/owrt-remote/owrt-remote-hub.py
|
||||
backup=/opt/owrt-remote/owrt-remote-hub.py.bak-before-router-card-ui-v117
|
||||
backup=/opt/owrt-remote/owrt-remote-hub.py.bak-before-router-card-ui-v118
|
||||
candidate=$target.new-__UPLOAD_NAME__
|
||||
changed=0
|
||||
|
||||
@@ -106,7 +106,7 @@ if [ "$healthy" -ne 1 ]; then
|
||||
exit 1
|
||||
fi
|
||||
cmp "$source_file" "$target"
|
||||
printf '\nBackup: %s\nROUTER_CARD_UI_V117_%s_OK\n' "$backup" '__ACTION__'
|
||||
printf '\nBackup: %s\nROUTER_CARD_UI_V118_%s_OK\n' "$backup" '__ACTION__'
|
||||
'@
|
||||
|
||||
$RemoteScript = $RemoteScript.Replace('__UPLOAD_NAME__', $UploadName).Replace('__ACTION__', $Action)
|
||||
|
||||
@@ -15,7 +15,7 @@ $RemoteScript = @'
|
||||
set -eu
|
||||
stage=/tmp/__UPLOAD_NAME__
|
||||
target=/opt/owrt-remote/owrt-remote-hub.py
|
||||
backup=/opt/owrt-remote/owrt-remote-hub.py.bak-before-router-reboot-all-v117
|
||||
backup=/opt/owrt-remote/owrt-remote-hub.py.bak-before-router-reboot-all-v118
|
||||
candidate=$target.new-__UPLOAD_NAME__
|
||||
changed=0
|
||||
|
||||
@@ -125,7 +125,7 @@ if [ "$healthy" -ne 1 ]; then
|
||||
exit 1
|
||||
fi
|
||||
cmp "$source_file" "$target"
|
||||
printf '\nBackup: %s\nROUTER_UPDATES_V117_%s_OK\n' "$backup" '__ACTION__'
|
||||
printf '\nBackup: %s\nROUTER_UPDATES_V118_%s_OK\n' "$backup" '__ACTION__'
|
||||
'@
|
||||
|
||||
$RemoteScript = $RemoteScript.Replace('__UPLOAD_NAME__', $UploadName).Replace('__ACTION__', $Action)
|
||||
|
||||
@@ -0,0 +1,227 @@
|
||||
param(
|
||||
[Parameter(Mandatory = $true, ParameterSetName = 'Vps')][ValidateNotNullOrEmpty()][string]$Vps,
|
||||
[Parameter(Mandatory = $true, ParameterSetName = 'Router')][ValidateNotNullOrEmpty()][string]$Router,
|
||||
[ValidateSet('Install', 'Rollback')][string]$Action = 'Install',
|
||||
[switch]$PrepareOnly
|
||||
)
|
||||
|
||||
$ErrorActionPreference = 'Stop'
|
||||
$RepoRoot = Split-Path -Parent $PSScriptRoot
|
||||
$UploadName = 'owrt-version-v118-' + [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-v118
|
||||
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 = ('v118',)
|
||||
if 'v' + '117' in source:
|
||||
print('Old UI version remains in candidate', file=sys.stderr)
|
||||
raise SystemExit(1)
|
||||
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\nHUB_V118_%s_OK\n' "$backup" '__ACTION__'
|
||||
'@
|
||||
|
||||
$RouterScript = @'
|
||||
#!/bin/sh
|
||||
set -eu
|
||||
stage=/tmp/__UPLOAD_NAME__
|
||||
backup=/root/owrt-remote-backup-before-v118
|
||||
cgi=/www/cgi-bin/owrt-remote
|
||||
luci=/www/luci-static/resources/view/owrt_remote.js
|
||||
changed=0
|
||||
cleanup() {
|
||||
code=$?
|
||||
trap - EXIT
|
||||
if [ "$code" -ne 0 ]; then
|
||||
echo "Router version __ACTION__ failed (rc=$code)." >&2
|
||||
if [ "$changed" = 1 ]; then
|
||||
echo 'Restoring the previous router UI files...' >&2
|
||||
cp -p "$stage/previous-cgi" "$cgi.new-__UPLOAD_NAME__" && mv -f "$cgi.new-__UPLOAD_NAME__" "$cgi" || true
|
||||
cp -p "$stage/previous-luci" "$luci.new-__UPLOAD_NAME__" && mv -f "$luci.new-__UPLOAD_NAME__" "$luci" || true
|
||||
fi
|
||||
fi
|
||||
rm -f "$cgi.new-__UPLOAD_NAME__" "$luci.new-__UPLOAD_NAME__"
|
||||
rm -rf "$stage"
|
||||
exit "$code"
|
||||
}
|
||||
trap cleanup EXIT
|
||||
test -s "$cgi"
|
||||
test -s "$luci"
|
||||
if [ '__ACTION__' = Install ]; then
|
||||
sh -n "$stage/cgi"
|
||||
grep -F -q 'v118' "$stage/cgi"
|
||||
grep -F -q 'v118' "$stage/luci"
|
||||
if grep -F -q 'v''117' "$stage/cgi" "$stage/luci"; then
|
||||
echo 'Old UI version remains in candidate.' >&2
|
||||
exit 1
|
||||
fi
|
||||
if [ ! -e "$backup" ]; then
|
||||
mkdir -m 700 "$stage/retained"
|
||||
cp -p "$cgi" "$stage/retained/cgi"
|
||||
cp -p "$luci" "$stage/retained/luci"
|
||||
: >"$stage/retained/complete"
|
||||
mv "$stage/retained" "$backup"
|
||||
fi
|
||||
source_dir=$stage
|
||||
else
|
||||
source_dir=$backup
|
||||
fi
|
||||
if [ ! -f "$backup/complete" ] || [ ! -s "$backup/cgi" ] || [ ! -s "$backup/luci" ]; then
|
||||
echo "No complete backup: $backup. Nothing changed." >&2
|
||||
exit 1
|
||||
fi
|
||||
sh -n "$source_dir/cgi"
|
||||
cp -p "$cgi" "$stage/previous-cgi"
|
||||
cp -p "$luci" "$stage/previous-luci"
|
||||
cp "$source_dir/cgi" "$cgi.new-__UPLOAD_NAME__"
|
||||
chmod 0755 "$cgi.new-__UPLOAD_NAME__"
|
||||
cp "$source_dir/luci" "$luci.new-__UPLOAD_NAME__"
|
||||
chmod 0644 "$luci.new-__UPLOAD_NAME__"
|
||||
changed=1
|
||||
mv -f "$cgi.new-__UPLOAD_NAME__" "$cgi"
|
||||
mv -f "$luci.new-__UPLOAD_NAME__" "$luci"
|
||||
cmp "$source_dir/cgi" "$cgi"
|
||||
cmp "$source_dir/luci" "$luci"
|
||||
[ ! -x /etc/init.d/rpcd ] || /etc/init.d/rpcd restart || true
|
||||
[ ! -x /etc/init.d/uhttpd ] || /etc/init.d/uhttpd reload || true
|
||||
printf '\nBackup: %s\nROUTER_V118_%s_OK\n' "$backup" '__ACTION__'
|
||||
'@
|
||||
|
||||
if ($PSCmdlet.ParameterSetName -eq 'Router') {
|
||||
$RemoteScript = $RouterScript
|
||||
$TargetMachine = $Router
|
||||
}
|
||||
else {
|
||||
$TargetMachine = $Vps
|
||||
}
|
||||
$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') {
|
||||
$Files = if ($PSCmdlet.ParameterSetName -eq 'Router') {
|
||||
@{ 'cgi' = 'files\www\cgi-bin\owrt-remote'; 'luci' = 'files\www\luci-static\resources\view\owrt_remote.js' }
|
||||
} else {
|
||||
@{ 'hub.py' = 'vps\owrt-remote-hub.py' }
|
||||
}
|
||||
foreach ($Name in $Files.Keys) {
|
||||
$Content = [System.IO.File]::ReadAllText((Join-Path $RepoRoot $Files[$Name])).Replace("`r`n", "`n")
|
||||
[System.IO.File]::WriteAllText((Join-Path $StageRoot $Name), $Content, $Utf8)
|
||||
}
|
||||
}
|
||||
|
||||
if ($PrepareOnly) {
|
||||
Write-Host "Prepared only: $StageRoot"
|
||||
return
|
||||
}
|
||||
|
||||
& scp -O -r -- $StageRoot "${TargetMachine}:/tmp/"
|
||||
if ($LASTEXITCODE -ne 0) { throw 'Upload failed. Target was not changed.' }
|
||||
& ssh -T -o ConnectTimeout=10 $TargetMachine "sh /tmp/$UploadName/run.sh"
|
||||
if ($LASTEXITCODE -ne 0) { throw "$Action failed. See the output above; success was not confirmed." }
|
||||
Write-Host "Version v118 $Action finished successfully. Refresh the panel."
|
||||
}
|
||||
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
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,150 @@
|
||||
param(
|
||||
[Parameter(Mandatory = $true)][ValidateNotNullOrEmpty()][string]$Vps,
|
||||
[ValidateSet('Install', 'Rollback')][string]$Action = 'Install',
|
||||
[switch]$PrepareOnly
|
||||
)
|
||||
|
||||
$ErrorActionPreference = 'Stop'
|
||||
$RepoRoot = Split-Path -Parent $PSScriptRoot
|
||||
$UploadName = 'owrt-vps-resources-live-' + [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-vps-resources-live-v118
|
||||
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 vps_resource_widgets_html(mobile=False, resources=None):",
|
||||
"vps_resources=self.app.vps_resources.snapshot(),",
|
||||
"vps_resource_widgets_html(resources=vps_resources)",
|
||||
"vps_resource_widgets_html(mobile=True, resources=vps_resources)",
|
||||
"interval = 1.0",
|
||||
"timer = setInterval(load, 1000);",
|
||||
)
|
||||
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\nVPS_RESOURCES_LIVE_V118_%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 "VPS resources 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
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -14,7 +14,7 @@ $RemoteScript = @'
|
||||
set -eu
|
||||
stage=/tmp/__UPLOAD_NAME__
|
||||
target=/opt/owrt-remote/owrt-remote-hub.py
|
||||
backup=/opt/owrt-remote/owrt-remote-hub.py.bak-before-vps-widgets-v117
|
||||
backup=/opt/owrt-remote/owrt-remote-hub.py.bak-before-vps-widgets-v118
|
||||
candidate=$target.new-__UPLOAD_NAME__
|
||||
changed=0
|
||||
cleanup() {
|
||||
@@ -37,7 +37,7 @@ python_bin=/opt/owrt-remote/venv/bin/python
|
||||
[ -x "$python_bin" ] || python_bin=python3
|
||||
if [ '__ACTION__' = Install ]; then
|
||||
test -s "$stage/hub.py"
|
||||
grep -F -q 'v117' "$stage/hub.py"
|
||||
grep -F -q 'v118' "$stage/hub.py"
|
||||
"$python_bin" -m py_compile "$stage/hub.py"
|
||||
OWRT_VPS_WIDGETS_HUB_SOURCE="$stage/hub.py" "$python_bin" "$stage/tests.py" -v
|
||||
if [ ! -e "$backup" ]; then cp -p "$target" "$backup"; fi
|
||||
@@ -67,7 +67,7 @@ if [ '__ACTION__' = Install ]; then
|
||||
code=$(curl -sS --max-time 5 -o "$stage/response.json" -w '%{http_code}' http://127.0.0.1:8088/api/vps/resources)
|
||||
test "$code" = 401
|
||||
fi
|
||||
printf '\nVPS_WIDGETS_V117_%s_OK\n' '__ACTION__'
|
||||
printf '\nVPS_WIDGETS_V118_%s_OK\n' '__ACTION__'
|
||||
'@
|
||||
$RemoteScript = $RemoteScript.Replace('__UPLOAD_NAME__', $UploadName).Replace('__ACTION__', $Action)
|
||||
try {
|
||||
|
||||
@@ -14,7 +14,7 @@ $RemoteScript = @'
|
||||
set -eu
|
||||
stage=/tmp/__UPLOAD_NAME__
|
||||
target=/usr/lib/owrt-remote/wan.sh
|
||||
backup_dir=/root/owrt-remote-backup-before-wan-dns-v117
|
||||
backup_dir=/root/owrt-remote-backup-before-wan-dns-v118
|
||||
changed=0
|
||||
phase=preflight
|
||||
heartbeat_pid() {
|
||||
|
||||
@@ -20,7 +20,7 @@ $RemoteScript = @'
|
||||
#!/bin/sh
|
||||
set -eu
|
||||
stage=/tmp/__UPLOAD_NAME__
|
||||
backup=/root/owrt-remote-backup-before-wan-multi-v117
|
||||
backup=/root/owrt-remote-backup-before-wan-multi-v118
|
||||
config=/etc/config/owrtremote
|
||||
changed=0
|
||||
item_path() {
|
||||
@@ -81,7 +81,7 @@ test -s "$config"
|
||||
if [ '__ACTION__' = Install ]; then
|
||||
for item in agent wan.sh cgi hotplug; do test -s "$stage/$item"; sh -n "$stage/$item"; done
|
||||
test -s "$stage/luci"
|
||||
for item in cgi luci; do grep -F -q 'v117' "$stage/$item"; done
|
||||
for item in cgi luci; do grep -F -q 'v118' "$stage/$item"; done
|
||||
grep -F -q 'wan_interface_picker' "$stage/cgi"
|
||||
grep -F -q 'wan_select_interface()' "$stage/wan.sh"
|
||||
grep -F -q 'wan_reconcile_xray()' "$stage/agent"
|
||||
|
||||
@@ -17,7 +17,7 @@ $RemoteScript = @'
|
||||
#!/bin/sh
|
||||
set -eu
|
||||
stage=/tmp/__UPLOAD_NAME__
|
||||
backup_dir=/root/owrt-remote-backup-before-wan-recovery-v117
|
||||
backup_dir=/root/owrt-remote-backup-before-wan-recovery-v118
|
||||
changed=0
|
||||
phase=preflight
|
||||
item_path() {
|
||||
|
||||
@@ -17,7 +17,7 @@ $RemoteScript = @'
|
||||
#!/bin/sh
|
||||
set -eu
|
||||
stage=/tmp/__UPLOAD_NAME__
|
||||
backup=/root/owrt-remote-backup-before-wan-stability-v117
|
||||
backup=/root/owrt-remote-backup-before-wan-stability-v118
|
||||
config=/etc/config/owrtremote
|
||||
changed=0
|
||||
fail() {
|
||||
|
||||
@@ -15,7 +15,7 @@ $RemoteScript = @'
|
||||
set -eu
|
||||
stage=/tmp/__UPLOAD_NAME__
|
||||
target=/opt/owrt-remote/owrt-remote-hub.py
|
||||
backup=/opt/owrt-remote/owrt-remote-hub.py.bak-before-web-push-v117
|
||||
backup=/opt/owrt-remote/owrt-remote-hub.py.bak-before-web-push-v118
|
||||
candidate=$target.new-__UPLOAD_NAME__
|
||||
changed=0
|
||||
|
||||
@@ -72,7 +72,7 @@ for attempt in 1 2 3 4 5 6 7 8 9 10; do
|
||||
done
|
||||
test "$healthy" = 1
|
||||
cmp "$source_file" "$target"
|
||||
printf '\nBackup: %s\nWEB_PUSH_V117_%s_OK\n' "$backup" '__ACTION__'
|
||||
printf '\nBackup: %s\nWEB_PUSH_V118_%s_OK\n' "$backup" '__ACTION__'
|
||||
'@
|
||||
|
||||
$RemoteScript = $RemoteScript.Replace('__UPLOAD_NAME__', $UploadName).Replace('__ACTION__', $Action)
|
||||
|
||||
@@ -14,7 +14,7 @@ $RemoteScript = @'
|
||||
set -eu
|
||||
stage=/tmp/__UPLOAD_NAME__
|
||||
target=/www/cgi-bin/owrt-remote
|
||||
backup_dir=/root/owrt-remote-backup-before-xray-apply-v117
|
||||
backup_dir=/root/owrt-remote-backup-before-xray-apply-v118
|
||||
backup=$backup_dir/owrt-remote
|
||||
candidate=$target.new-__UPLOAD_NAME__
|
||||
changed=0
|
||||
|
||||
@@ -14,7 +14,7 @@ $RemoteScript = @'
|
||||
set -eu
|
||||
stage=/tmp/__UPLOAD_NAME__
|
||||
target=/usr/sbin/owrt-remote
|
||||
backup_dir=/root/owrt-remote-backup-before-xray-boot-v117
|
||||
backup_dir=/root/owrt-remote-backup-before-xray-boot-v118
|
||||
changed=0
|
||||
phase=preflight
|
||||
heartbeat_pid() {
|
||||
|
||||
@@ -14,7 +14,7 @@ $RemoteScript = @'
|
||||
set -eu
|
||||
stage=/tmp/__UPLOAD_NAME__
|
||||
target=/www/cgi-bin/owrt-remote
|
||||
backup_dir=/root/owrt-remote-backup-before-xray-mobile-v117
|
||||
backup_dir=/root/owrt-remote-backup-before-xray-mobile-v118
|
||||
backup=$backup_dir/owrt-remote
|
||||
candidate=$target.new-__UPLOAD_NAME__
|
||||
changed=0
|
||||
|
||||
@@ -17,7 +17,7 @@ $RemoteScript = @'
|
||||
#!/bin/sh
|
||||
set -eu
|
||||
stage=/tmp/__UPLOAD_NAME__
|
||||
backup_dir=/root/owrt-remote-backup-before-xray-validation-v117
|
||||
backup_dir=/root/owrt-remote-backup-before-xray-validation-v118
|
||||
changed=0
|
||||
phase=preflight
|
||||
item_path() {
|
||||
|
||||
+523
-52
@@ -36,6 +36,7 @@ import urllib.error
|
||||
import urllib.parse
|
||||
import urllib.request
|
||||
import uuid
|
||||
import warnings
|
||||
from http.server import BaseHTTPRequestHandler, ThreadingHTTPServer
|
||||
from pathlib import Path
|
||||
|
||||
@@ -72,6 +73,7 @@ except Exception:
|
||||
APP_NAME = "OpenWrt Remote Hub"
|
||||
RAW_REPO_BASE = os.environ.get("RAW_REPO_BASE", "https://raw.githubusercontent.com/kzolotarev95/luci-app-owrt-remote/main").rstrip("/")
|
||||
APP_DIR = Path(__file__).resolve().parent
|
||||
HUB_LOADED_REVISION = hashlib.sha256(Path(__file__).read_bytes()).hexdigest()
|
||||
STATIC_DIR = APP_DIR / "static"
|
||||
BRAND_THEME_COLOR = "#24192f"
|
||||
FAVICON_ICO_FILE = STATIC_DIR / "favicon.ico"
|
||||
@@ -4964,17 +4966,24 @@ def parse_resize_payload(payload):
|
||||
return message.get("rows"), message.get("cols")
|
||||
|
||||
|
||||
def vps_resource_widgets_html(mobile=False):
|
||||
def vps_resource_widgets_html(mobile=False, resources=None):
|
||||
kind = "mobile" if mobile else "desktop"
|
||||
widgets = "".join(
|
||||
f'<div class="vpsResource badge" data-vps-resource="{key}" title="{label}: ожидаем данные VPS">'
|
||||
f'<span>{label}</span><strong data-vps-resource-value>—</strong></div>'
|
||||
for key, label in (("cpu", "ЦП"), ("memory", "ОЗУ"), ("disk", "ДИСК"))
|
||||
widgets = []
|
||||
for key, label in (("cpu", "ЦП"), ("memory", "ОЗУ"), ("disk", "ДИСК")):
|
||||
metric = (resources or {}).get(key) or {}
|
||||
percent = metric.get("percent")
|
||||
valid = isinstance(percent, (int, float)) and not isinstance(percent, bool) and math.isfinite(percent)
|
||||
value = (f"{percent:.1f}".rstrip("0").rstrip(".").replace(".", ",") + "%") if valid else "—"
|
||||
title = html.escape(label + ": " + (value if valid else "данные пока недоступны"), quote=True)
|
||||
widgets.append(
|
||||
f'<div class="vpsResource badge" data-vps-resource="{key}" title="{title}" aria-label="{title}">'
|
||||
f'<span>{label}</span><strong data-vps-resource-value>{value}</strong></div>'
|
||||
)
|
||||
return f'<div class="vpsResources vpsResources-{kind}" role="group" aria-label="Ресурсы VPS">{widgets}</div>'
|
||||
return f'<div class="vpsResources vpsResources-{kind}" role="group" aria-label="Ресурсы VPS">{"".join(widgets)}</div>'
|
||||
|
||||
|
||||
def dashboard_html(routers, username, sessions=None, notifications=None, auth_bootstrap=None):
|
||||
|
||||
def dashboard_html(routers, username, sessions=None, notifications=None, auth_bootstrap=None, vps_resources=None):
|
||||
routers_json = json.dumps(routers, ensure_ascii=False)
|
||||
sessions_json = json.dumps(sessions or [], ensure_ascii=False)
|
||||
notifications_json = json.dumps(notifications or [], ensure_ascii=False)
|
||||
@@ -5058,16 +5067,78 @@ input,select{{min-width:0;border:1px solid var(--line);border-radius:8px;padding
|
||||
@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),(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))}}}}
|
||||
#routerUpdatesGroup .routerUpdatesLaunch{{display:flex;flex:0 1 auto;width:fit-content;min-width:0;max-width:100%;min-height:38px;margin:12px auto 0;padding:8px 14px;font-size:12px;line-height:1.3;white-space:normal;text-align:center;overflow-wrap:anywhere}}
|
||||
.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,1.25fr);--hdr-col-5:minmax(0,1fr);--hdr-col-6:minmax(0,1fr);--hdr-col-7:minmax(0,1fr);--hdr-col-8:minmax(0,1fr);width:100%;margin-left:0;grid-template-columns:minmax(0,1fr)}}
|
||||
.desktopHeaderTop,.desktopHeaderBottom{{min-width:0;max-width:100%}}
|
||||
.desktopHeaderTop>.routerSearchDock{{grid-column:4}}
|
||||
.desktopHeaderTop>.hubUpdateButton{{grid-column:3;grid-row:1}}
|
||||
#routerSearchToggle,.hubUpdateButton,#mobileRouterSearchToggle{{display:inline-flex;align-items:center;justify-content:center;gap:5px;width:100%;min-width:0;min-height:36px;margin:0;padding:8px 10px;border:1px solid var(--line);border-radius:999px;background:rgba(255,255,255,.08);box-shadow:inset 0 1px 0 rgba(255,255,255,.06);color:#f3e8ff;font-size:12px;font-weight:800;line-height:1.25;white-space:normal;overflow-wrap:anywhere;cursor:pointer}}
|
||||
#routerSearchToggle[data-active="true"],#mobileRouterSearchToggle[data-active="true"]{{border-color:var(--cyan)}}
|
||||
.hubUpdateButton[data-update-state="current"]{{border-color:rgba(34,197,94,.65);background:rgba(34,197,94,.16);color:#bbf7d0}}
|
||||
.hubUpdateButton[data-update-state="available"]{{border-color:rgba(245,158,11,.7);background:rgba(245,158,11,.18);color:#fde68a}}
|
||||
.hubUpdateButton:disabled{{cursor:wait;opacity:.75}}
|
||||
.hubUpdateButton[hidden]{{display:none!important}}
|
||||
@media(min-width:681px) and (max-width:1100px){{.desktopHeaderTop{{grid-template-columns:repeat(4,minmax(0,1fr))}}.desktopHeaderTop>#seasonDock{{grid-column:1;grid-row:2}}.desktopHeaderTop>.vpsResources-desktop{{grid-column:2/span 3;grid-row:2}}}}
|
||||
.hubUpdateNotice{{box-sizing:border-box;width:min(100%,680px);max-width:100%;min-width:0;margin:12px auto 16px;padding:10px 14px;border:1px solid rgba(255,255,255,.10);border-radius:10px;background:transparent;color:#fff;font-size:12px;line-height:1.55;text-align:center;white-space:normal;overflow-wrap:anywhere}}
|
||||
.hubUpdateConfirm[hidden]{{display:none!important}}
|
||||
.hubUpdateConfirmOpen{{overflow:hidden}}
|
||||
.hubUpdateConfirm{{position:fixed;inset:0;z-index:120;display:grid;place-items:center;padding:18px;background:rgba(7,4,15,.72);backdrop-filter:blur(8px)}}
|
||||
.hubUpdateConfirmCard{{box-sizing:border-box;width:min(100%,560px);max-height:min(88svh,620px);overflow:auto;padding:20px;border:1px solid rgba(245,158,11,.46);border-radius:18px;background:linear-gradient(180deg,rgba(255,255,255,.12),rgba(255,255,255,.055)),rgba(19,14,32,.97);box-shadow:0 24px 70px rgba(0,0,0,.48),0 0 0 1px rgba(245,158,11,.10);color:var(--text);text-align:left}}
|
||||
.hubUpdateConfirmTitle{{margin:0;color:#fde68a;font-size:18px;font-weight:900;line-height:1.25}}
|
||||
.hubUpdateConfirmLead{{margin:10px 0 0;color:#f7f2ff;font-size:14px;font-weight:750;line-height:1.45}}
|
||||
.hubUpdateConfirmMeta{{display:grid;gap:6px;margin:14px 0 0;padding:11px 12px;border:1px solid var(--line);border-radius:11px;background:rgba(0,0,0,.14);color:var(--muted);font-size:12px;line-height:1.4;overflow-wrap:anywhere}}
|
||||
.hubUpdateConfirmMeta strong{{color:#f3e8ff;font-weight:850}}
|
||||
.hubUpdateConfirmActions{{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));gap:10px;margin-top:16px}}
|
||||
.hubUpdateConfirmActions button{{width:100%;min-width:0;min-height:42px}}
|
||||
.hubUpdateConfirmCancel{{background:rgba(255,255,255,.08);color:#f3e8ff}}
|
||||
.hubUpdateConfirmAccept{{background:var(--blue);color:#fff;box-shadow:0 10px 22px rgba(124,58,237,.24)}}
|
||||
@media(max-width:680px),(max-width:1024px) and (orientation:landscape) and (pointer:coarse){{#mobileHubUpdateDock,#mobileRouterSearchDock{{display:grid;grid-template-columns:minmax(0,1fr);gap:6px;min-width:0}}#mobileHubUpdateDock>.mobileSearchVersion{{margin:0 auto;align-self:center}}#mobileRouterSearchToggle,.hubUpdateButton{{min-height:44px;padding:8px;font-size:11px}}#mobileRouterSearchToggle{{margin-top:8px;background:var(--blue);color:#fff;box-shadow:0 10px 22px rgba(124,58,237,.22)}}#mobileSeasonDock{{display:block;width:100%;min-width:0}}#mobileSeasonToggle{{min-height:44px;margin:8px 0 0}}.vpsResources-mobile{{margin:0 0 10px}}.hubUpdateNotice{{margin:0 auto 12px;padding:10px 12px;line-height:1.5}}}}
|
||||
@media(max-width:680px),(max-width:1024px) and (orientation:landscape) and (pointer:coarse){{
|
||||
.wrap{{--mobile-control-gap:8px;display:flex;flex-direction:column;gap:var(--mobile-control-gap)}}
|
||||
.top{{grid-template-columns:minmax(0,1fr);gap:var(--mobile-control-gap);padding:6px 0 0;border-bottom:0}}
|
||||
#mobileHubUpdateDock,#mobileSeasonDock,#mobileRouterSearchDock{{display:grid;grid-template-columns:minmax(0,1fr);gap:var(--mobile-control-gap);margin:0}}
|
||||
#mobileRouterSearchToggle,#mobileSeasonToggle,#hubMenuToggle,.vpsResources-mobile{{margin:0}}
|
||||
#mobileRouterSearchPanel,#mobileSeasonPanel{{margin:0}}
|
||||
#hubMenuPanelHost{{display:contents}}
|
||||
#hubMenuPanelHost>.headerActions,#mobileOwnerTools{{grid-column:1/-1;margin:0}}
|
||||
#routerFormToggle,#routerGroupsToggle,#routerStatsToggle,#routerFormWrap,#routerGroupsPanel,#routerStats,#routerForm{{margin:0}}
|
||||
#routerFormWrap>.formMsg,#routerGroupsPanel>.formMsg{{margin:var(--mobile-control-gap) 0 0}}
|
||||
.hubUpdateNotice{{margin:0 auto 4px}}
|
||||
.hubUpdateConfirm{{padding:12px;place-items:center}}
|
||||
.hubUpdateConfirmCard{{width:100%;max-height:calc(100svh - 24px);padding:16px;border-radius:18px}}
|
||||
.hubUpdateConfirmTitle{{font-size:17px}}
|
||||
.hubUpdateConfirmLead{{font-size:14px}}
|
||||
.hubUpdateConfirmMeta{{margin-top:12px;padding:10px;font-size:11px}}
|
||||
.hubUpdateConfirmActions{{gap:8px;margin-top:14px}}
|
||||
.hubUpdateConfirmActions button{{min-height:44px;padding:9px 8px;font-size:12px}}
|
||||
}}
|
||||
</style>
|
||||
</head>
|
||||
<body class="preload-mobile-panels">
|
||||
<canvas class="seasonalFx" id="seasonalFx" aria-hidden="true" hidden></canvas>
|
||||
<main class="wrap">
|
||||
<div class="hubUpdateNotice" id="hubUpdateNotice" role="status" aria-live="polite" hidden></div>
|
||||
<div class="hubUpdateConfirm" id="hubUpdateConfirm" hidden>
|
||||
<section class="hubUpdateConfirmCard" role="dialog" aria-modal="true" aria-labelledby="hubUpdateConfirmTitle" aria-describedby="hubUpdateConfirmLead">
|
||||
<h2 class="hubUpdateConfirmTitle" id="hubUpdateConfirmTitle">Обновление панели VPS</h2>
|
||||
<p class="hubUpdateConfirmLead" id="hubUpdateConfirmLead">Действительно обновить панель до последней доступной сборки?</p>
|
||||
<div class="hubUpdateConfirmMeta">
|
||||
<div>Сборка: <strong id="hubUpdateConfirmVersion">—</strong></div>
|
||||
<div>Источник: <strong id="hubUpdateConfirmSource">—</strong></div>
|
||||
<div>После запуска Hub будет перезапущен, затем страница обновится автоматически.</div>
|
||||
</div>
|
||||
<div class="hubUpdateConfirmActions">
|
||||
<button class="hubUpdateConfirmCancel" id="hubUpdateConfirmCancel" type="button">Отмена</button>
|
||||
<button class="hubUpdateConfirmAccept primary" id="hubUpdateConfirmAccept" type="button">Обновить</button>
|
||||
</div>
|
||||
</section>
|
||||
</div>
|
||||
<section class="top">
|
||||
<div class="brand">
|
||||
<div class="desktopHeader">
|
||||
<div class="desktopHeaderTop">
|
||||
<h1 class="appBanner"><span>OpenWrt Remote Hub <span class="appBannerVersion">v117</span></span></h1>
|
||||
<h1 class="appBanner"><span>OpenWrt Remote Hub <span class="appBannerVersion">v118</span></span></h1>
|
||||
<button class="badge hubUpdateButton" data-hub-update type="button" {'hidden' if not is_owner else ''}>Обновление панели</button>
|
||||
<div class="routerSearchDock" id="routerSearchDock">
|
||||
<button class="routerSearchToggle" id="routerSearchToggle" type="button" aria-expanded="false" aria-controls="routerSearchPanel" data-active="false">
|
||||
<span>Поиск роутеров</span>
|
||||
@@ -5103,17 +5174,11 @@ input,select{{min-width:0;border:1px solid var(--line);border-radius:8px;padding
|
||||
<button class="seasonBtn" type="button" data-season-mode="prism" data-active="false" aria-pressed="false">Призма</button>
|
||||
<button class="seasonBtn" type="button" data-season-mode="pulse" data-active="false" aria-pressed="false">Пульс</button>
|
||||
<button class="seasonBtn" type="button" data-season-mode="laser" data-active="false" aria-pressed="false">Лучи</button>
|
||||
<button class="seasonBtn" type="button" data-season-mode="aurora" data-active="false" aria-pressed="false">Аврора</button>
|
||||
<button class="seasonBtn" type="button" data-season-mode="matrix" data-active="false" aria-pressed="false">Матрица</button>
|
||||
<button class="seasonBtn" type="button" data-season-mode="nebula" data-active="false" aria-pressed="false">Туманность</button>
|
||||
<button class="seasonBtn" type="button" data-season-mode="fireworks" data-active="false" aria-pressed="false">Фейерверк</button>
|
||||
<button class="seasonBtn" type="button" data-season-mode="vortex" data-active="false" aria-pressed="false">Вихрь</button>
|
||||
<button class="seasonBtn" type="button" data-season-mode="comet" data-active="false" aria-pressed="false">Кометы</button>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
</div>
|
||||
{vps_resource_widgets_html()}
|
||||
{vps_resource_widgets_html(resources=vps_resources)}
|
||||
</div>
|
||||
<div class="desktopHeaderBottom">
|
||||
<div class="links">
|
||||
@@ -5373,7 +5438,7 @@ input,select{{min-width:0;border:1px solid var(--line);border-radius:8px;padding
|
||||
<span class="authGroupChevron" aria-hidden="true">⌄</span>
|
||||
</summary>
|
||||
<div class="authGroupBody">
|
||||
<a class="sessionBtn btn" href="/router-updates/" target="_blank" rel="noopener noreferrer">Открыть терминал обновления</a>
|
||||
<a class="sessionBtn btn routerUpdatesLaunch" href="/router-updates/" target="_blank" rel="noopener noreferrer" title="Открыть терминал обновления">Терминал обновления</a>
|
||||
</div>
|
||||
</details>
|
||||
<details class="authGroup" id="backupGroup">
|
||||
@@ -5408,24 +5473,10 @@ input,select{{min-width:0;border:1px solid var(--line);border-radius:8px;padding
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="mobileSearchDock" id="mobileRouterSearchDock">
|
||||
<span class="mobileSearchVersion">v117</span>
|
||||
<button class="routerSearchToggle mobilePanelToggle primary" id="mobileRouterSearchToggle" type="button" aria-expanded="false" aria-controls="mobileRouterSearchPanel" data-active="false">
|
||||
<span>Поиск роутеров</span>
|
||||
</button>
|
||||
<section class="routerSearchPanel" id="mobileRouterSearchPanel" aria-label="Поиск роутеров" hidden>
|
||||
<div class="routerSearchCard">
|
||||
<div class="routerSearchHead">
|
||||
<strong class="routerSearchTitle">Поиск по роутерам</strong>
|
||||
<button class="routerSearchClear" id="mobileRouterSearchClear" type="button" disabled>Очистить</button>
|
||||
</div>
|
||||
<label class="routerSearchField" for="mobileRouterSearchInput">
|
||||
<span class="routerSearchIcon" aria-hidden="true">⌕</span>
|
||||
<input id="mobileRouterSearchInput" type="search" placeholder="Имя или router id" autocomplete="off" spellcheck="false">
|
||||
</label>
|
||||
<div class="routerSearchMeta" id="mobileRouterSearchMeta">Всего роутеров: 0</div>
|
||||
</div>
|
||||
</section>
|
||||
{vps_resource_widgets_html(mobile=True, resources=vps_resources)}
|
||||
<div class="mobileSearchDock" id="mobileHubUpdateDock">
|
||||
<span class="mobileSearchVersion">v118</span>
|
||||
<button class="badge hubUpdateButton" data-hub-update type="button" {'hidden' if not is_owner else ''}>Обновление панели</button>
|
||||
</div>
|
||||
<div class="mobileSearchDock" id="mobileSeasonDock" aria-label="Зимние эффекты">
|
||||
<button class="routerSearchToggle seasonToggle mobilePanelToggle primary" id="mobileSeasonToggle" type="button" aria-expanded="false" aria-controls="mobileSeasonPanel" data-open="false">
|
||||
@@ -5444,17 +5495,28 @@ input,select{{min-width:0;border:1px solid var(--line);border-radius:8px;padding
|
||||
<button class="seasonBtn" type="button" data-season-mode="prism" data-active="false" aria-pressed="false">Призма</button>
|
||||
<button class="seasonBtn" type="button" data-season-mode="pulse" data-active="false" aria-pressed="false">Пульс</button>
|
||||
<button class="seasonBtn" type="button" data-season-mode="laser" data-active="false" aria-pressed="false">Лучи</button>
|
||||
<button class="seasonBtn" type="button" data-season-mode="aurora" data-active="false" aria-pressed="false">Аврора</button>
|
||||
<button class="seasonBtn" type="button" data-season-mode="matrix" data-active="false" aria-pressed="false">Матрица</button>
|
||||
<button class="seasonBtn" type="button" data-season-mode="nebula" data-active="false" aria-pressed="false">Туманность</button>
|
||||
<button class="seasonBtn" type="button" data-season-mode="fireworks" data-active="false" aria-pressed="false">Фейерверк</button>
|
||||
<button class="seasonBtn" type="button" data-season-mode="vortex" data-active="false" aria-pressed="false">Вихрь</button>
|
||||
<button class="seasonBtn" type="button" data-season-mode="comet" data-active="false" aria-pressed="false">Кометы</button>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
</div>
|
||||
{vps_resource_widgets_html(mobile=True)}
|
||||
<div class="mobileSearchDock" id="mobileRouterSearchDock">
|
||||
<button class="routerSearchToggle mobilePanelToggle primary" id="mobileRouterSearchToggle" type="button" aria-expanded="false" aria-controls="mobileRouterSearchPanel" data-active="false">
|
||||
<span>Поиск роутеров</span>
|
||||
</button>
|
||||
<section class="routerSearchPanel" id="mobileRouterSearchPanel" aria-label="Поиск роутеров" hidden>
|
||||
<div class="routerSearchCard">
|
||||
<div class="routerSearchHead">
|
||||
<strong class="routerSearchTitle">Поиск по роутерам</strong>
|
||||
<button class="routerSearchClear" id="mobileRouterSearchClear" type="button" disabled>Очистить</button>
|
||||
</div>
|
||||
<label class="routerSearchField" for="mobileRouterSearchInput">
|
||||
<span class="routerSearchIcon" aria-hidden="true">⌕</span>
|
||||
<input id="mobileRouterSearchInput" type="search" placeholder="Имя или router id" autocomplete="off" spellcheck="false">
|
||||
</label>
|
||||
<div class="routerSearchMeta" id="mobileRouterSearchMeta">Всего роутеров: 0</div>
|
||||
</div>
|
||||
</section>
|
||||
</div>
|
||||
<button class="mobilePanelToggle primary" id="hubMenuToggle" type="button" hidden>Открыть меню хаба</button>
|
||||
<div id="hubMenuPanelHost"></div>
|
||||
<div class="mobileOwnerTools" id="mobileOwnerTools" hidden>
|
||||
@@ -5601,7 +5663,7 @@ const openRouterGroups = new Set(['__ungrouped__']);
|
||||
let routerGroupsPanelOpen = false;
|
||||
let lastRouterSearchTrigger = null;
|
||||
const SEASON_EFFECT_KEY = 'owrtRemote:seasonEffectMode';
|
||||
const SEASON_EFFECT_MODES = new Set(['off', 'snow', 'rain', 'cosmos', 'embers', 'orbit', 'prism', 'pulse', 'laser', 'aurora', 'matrix', 'nebula', 'fireworks', 'vortex', 'comet']);
|
||||
const SEASON_EFFECT_MODES = new Set(['off', 'snow', 'rain', 'cosmos', 'embers', 'orbit', 'prism', 'pulse', 'laser']);
|
||||
let seasonEffectMode = 'off';
|
||||
let seasonalFxCtx = null;
|
||||
let seasonalFxFrame = 0;
|
||||
@@ -11667,6 +11729,125 @@ syncRouterSearchToggleState();
|
||||
requestRouterRender();
|
||||
fillRouterForm(true);
|
||||
waitNotificationsLoop();
|
||||
function initHubUpdate() {{
|
||||
const buttons = Array.from(document.querySelectorAll('[data-hub-update]')).filter(button => !button.hidden);
|
||||
const notice = document.getElementById('hubUpdateNotice');
|
||||
if (!buttons.length || !notice) return;
|
||||
const confirmPanel = document.getElementById('hubUpdateConfirm');
|
||||
const confirmLead = document.getElementById('hubUpdateConfirmLead');
|
||||
const confirmVersion = document.getElementById('hubUpdateConfirmVersion');
|
||||
const confirmSource = document.getElementById('hubUpdateConfirmSource');
|
||||
const confirmCancel = document.getElementById('hubUpdateConfirmCancel');
|
||||
const confirmAccept = document.getElementById('hubUpdateConfirmAccept');
|
||||
let state = null, timer = null, loading = false, stopped = false, csrf = '', pending = '', deadline = 0;
|
||||
let confirmResolve = null;
|
||||
const active = job => job && ['starting', 'installing', 'restarting', 'rollback'].includes(job.status);
|
||||
try {{ pending = sessionStorage.getItem('hub-update-pending') || ''; }} catch (_) {{}}
|
||||
if (pending) deadline = Date.now() + 300000;
|
||||
const message = (text, result = '') => {{
|
||||
notice.hidden = !text; notice.textContent = text; notice.dataset.result = result;
|
||||
}};
|
||||
const closeConfirmation = (answer) => {{
|
||||
if (!confirmPanel || !confirmResolve) return;
|
||||
const resolve = confirmResolve;
|
||||
confirmResolve = null;
|
||||
confirmPanel.hidden = true;
|
||||
document.body.classList.remove('hubUpdateConfirmOpen');
|
||||
resolve(Boolean(answer));
|
||||
}};
|
||||
const askConfirmation = (candidate) => new Promise((resolve) => {{
|
||||
if (!confirmPanel || !confirmLead || !confirmVersion || !confirmSource || !confirmCancel || !confirmAccept) {{
|
||||
resolve(window.confirm('Действительно обновить панель VPS до ' + candidate.remote_version + '?'));
|
||||
return;
|
||||
}}
|
||||
closeConfirmation(false);
|
||||
confirmResolve = resolve;
|
||||
confirmLead.textContent = 'Действительно обновить панель VPS до последней доступной сборки ' + candidate.remote_version + ' (' + candidate.remote_revision.slice(0, 8) + ')?';
|
||||
confirmVersion.textContent = candidate.remote_version + ' · ' + candidate.remote_revision.slice(0, 8);
|
||||
confirmSource.textContent = candidate.source || 'источник обновления';
|
||||
confirmPanel.hidden = false;
|
||||
document.body.classList.add('hubUpdateConfirmOpen');
|
||||
confirmAccept.focus();
|
||||
}});
|
||||
if (confirmCancel) confirmCancel.addEventListener('click', () => closeConfirmation(false));
|
||||
if (confirmAccept) confirmAccept.addEventListener('click', () => closeConfirmation(true));
|
||||
if (confirmPanel) confirmPanel.addEventListener('click', (event) => {{ if (event.target === confirmPanel) closeConfirmation(false); }});
|
||||
document.addEventListener('keydown', (event) => {{ if (event.key === 'Escape') closeConfirmation(false); }});
|
||||
const remember = value => {{
|
||||
pending = value;
|
||||
try {{ if (value) sessionStorage.setItem('hub-update-pending', value); else sessionStorage.removeItem('hub-update-pending'); }} catch (_) {{}}
|
||||
}};
|
||||
const render = () => {{
|
||||
if (!state) return;
|
||||
const job = state.job || {{}}, busy = active(job);
|
||||
buttons.forEach(button => {{
|
||||
button.disabled = busy || state.checking;
|
||||
button.dataset.available = state.available ? 'true' : 'false';
|
||||
button.dataset.updateState = busy ? 'busy' : state.checking ? 'checking' : state.error ? 'error' : state.available ? 'available' : state.checked ? 'current' : 'checking';
|
||||
button.textContent = busy ? 'Обновляется…' : state.checking ? 'Проверка…' : state.available ? 'Доступно обновление' : 'Обновление панели';
|
||||
button.title = state.available ? 'Доступна сборка ' + state.remote_version + ' · ' + state.remote_revision.slice(0, 8) : state.error || 'Проверить обновление панели';
|
||||
}});
|
||||
if (busy) {{
|
||||
if (!pending) {{ remember(job.id); deadline = Date.now() + 300000; }}
|
||||
message(job.message);
|
||||
}} else if (job.id === pending && ['succeeded', 'failed'].includes(job.status)) {{
|
||||
remember('');
|
||||
message(job.message, job.status);
|
||||
if (job.status === 'succeeded') {{ stopped = true; setTimeout(() => window.location.reload(), 1500); }}
|
||||
}} else if (state.error) message(state.error, 'failed');
|
||||
else if (job.status === 'failed') message(job.message, 'failed');
|
||||
else if (state.available) message('Доступно обновление панели: ' + state.remote_version + ' · сборка ' + state.remote_revision.slice(0, 8) + '.');
|
||||
else if (state.checked && !state.checking) message('У вас последняя версия панели, обновление не требуется.', 'succeeded');
|
||||
else if (state.checking) message('Проверяется наличие обновлений панели…');
|
||||
else message('');
|
||||
}};
|
||||
const request = async (action = '', payload = {{}}) => {{
|
||||
const controller = new AbortController(), timeout = setTimeout(() => controller.abort(), 10000);
|
||||
try {{
|
||||
const options = {{cache: 'no-store', credentials: 'same-origin', signal: controller.signal}};
|
||||
if (action) Object.assign(options, {{method: 'POST', headers: {{'Content-Type': 'application/json', 'X-Hub-Update-CSRF': csrf}}, body: JSON.stringify(payload)}});
|
||||
const response = await fetch('/api/hub-update' + (action ? '/' + action : ''), options);
|
||||
if (response.status === 401 || response.status === 403) stopped = true;
|
||||
const data = await response.json();
|
||||
if (!response.ok || !data.ok) throw new Error(data.error || 'Не удалось связаться с панелью.');
|
||||
state = data; csrf = data.csrf; render();
|
||||
}} finally {{ clearTimeout(timeout); }}
|
||||
}};
|
||||
const schedule = () => {{
|
||||
clearTimeout(timer);
|
||||
if (!stopped && !document.hidden) timer = setTimeout(load, pending || state?.checking || active(state?.job) ? 2000 : 60000);
|
||||
}};
|
||||
const failure = error => {{
|
||||
if (pending && Date.now() < deadline) message('Панель перезапускается. Ожидается результат обновления…');
|
||||
else message(pending ? 'Связь с панелью не восстановилась. Результат обновления не подтверждён; проверь сервис owrt-remote на VPS.' : error.message, 'failed');
|
||||
}};
|
||||
const load = async () => {{
|
||||
if (loading || stopped || document.hidden) return;
|
||||
loading = true;
|
||||
try {{ await request(); }} catch (error) {{ failure(error); }}
|
||||
finally {{ loading = false; schedule(); }}
|
||||
}};
|
||||
buttons.forEach(button => button.addEventListener('click', async () => {{
|
||||
if (loading || active(state?.job)) return;
|
||||
loading = true;
|
||||
try {{
|
||||
if (!state) await request();
|
||||
if (state.available) {{
|
||||
if (await askConfirmation(state)) {{
|
||||
deadline = Date.now() + 300000;
|
||||
await request('start', {{revision: state.remote_revision}});
|
||||
}}
|
||||
}} else {{
|
||||
await request('check');
|
||||
}}
|
||||
}} catch (error) {{ failure(error); }}
|
||||
finally {{ loading = false; schedule(); }}
|
||||
}}));
|
||||
document.addEventListener('visibilitychange', () => {{ clearTimeout(timer); if (!document.hidden) load(); }});
|
||||
window.addEventListener('pagehide', () => clearTimeout(timer));
|
||||
window.addEventListener('pageshow', load);
|
||||
load();
|
||||
}}
|
||||
function initVpsResourceWidgets() {{
|
||||
const widgets = Array.from(document.querySelectorAll('[data-vps-resource]'));
|
||||
if (!widgets.length) return;
|
||||
@@ -11701,7 +11882,8 @@ function initVpsResourceWidgets() {{
|
||||
if (stopped || document.hidden || request) return;
|
||||
const controller = new AbortController();
|
||||
request = controller;
|
||||
const timeout = setTimeout(() => controller.abort(), 2500);
|
||||
let timedOut = false;
|
||||
const timeout = setTimeout(() => {{ timedOut = true; controller.abort(); }}, 2500);
|
||||
try {{
|
||||
const response = await fetch('/api/vps/resources', {{cache: 'no-store', signal: controller.signal}});
|
||||
if (response.status === 401 || response.status === 403) {{ stopped = true; clearInterval(timer); }}
|
||||
@@ -11710,10 +11892,10 @@ function initVpsResourceWidgets() {{
|
||||
if (!data.ok) throw new Error('Invalid VPS resources');
|
||||
if (!document.hidden && !stopped) show(data);
|
||||
}} catch (error) {{
|
||||
if (!document.hidden) show(null, true);
|
||||
if (!document.hidden && (!controller.signal.aborted || timedOut)) show(null, true);
|
||||
}} finally {{
|
||||
clearTimeout(timeout);
|
||||
request = null;
|
||||
if (request === controller) request = null;
|
||||
}}
|
||||
}};
|
||||
const pause = () => {{
|
||||
@@ -11721,10 +11903,10 @@ function initVpsResourceWidgets() {{
|
||||
if (request) request.abort();
|
||||
}};
|
||||
const resume = () => {{
|
||||
pause();
|
||||
if (stopped || document.hidden) return;
|
||||
clearInterval(timer); timer = null;
|
||||
if (stopped || document.hidden) {{ pause(); return; }}
|
||||
load();
|
||||
timer = setInterval(load, 3000);
|
||||
timer = setInterval(load, 1000);
|
||||
}};
|
||||
document.addEventListener('visibilitychange', resume);
|
||||
window.addEventListener('pagehide', pause);
|
||||
@@ -11732,6 +11914,7 @@ function initVpsResourceWidgets() {{
|
||||
resume();
|
||||
}}
|
||||
initVpsResourceWidgets();
|
||||
initHubUpdate();
|
||||
setInterval(() => {{
|
||||
loadRouters({{automatic: true}}).catch(() => {{}});
|
||||
}}, 5000);
|
||||
@@ -12944,7 +13127,7 @@ button:hover{{filter:brightness(1.06)}}
|
||||
<form class="login" method="post" action="/login">
|
||||
{error_html}
|
||||
<span class="brand">
|
||||
<h1 class="appBanner"><span>OpenWrt Remote Hub <span class="appBannerVersion">v117</span></span></h1>
|
||||
<h1 class="appBanner"><span>OpenWrt Remote Hub <span class="appBannerVersion">v118</span></span></h1>
|
||||
</span>
|
||||
<label for="hubUsername">Логин</label>
|
||||
<input id="hubUsername" name="username" autocomplete="off" autofocus required>
|
||||
@@ -13416,7 +13599,7 @@ body::after{{content:"";position:fixed;inset:0;pointer-events:none;background:li
|
||||
<circle cx="65" cy="59" r="3" fill="#E5F2FF"/>
|
||||
</svg>
|
||||
</div>
|
||||
<h2 class="brandTitle">OpenWrt Remote Hub <span class="brandVersion">v117</span></h2>
|
||||
<h2 class="brandTitle">OpenWrt Remote Hub <span class="brandVersion">v118</span></h2>
|
||||
</div>
|
||||
</div>
|
||||
<div class="brandBottom">
|
||||
@@ -14357,7 +14540,7 @@ def login_html(error=""):
|
||||
class VpsResourceMonitor:
|
||||
"""Shared, nonblocking Linux samples; never spawn commands per browser poll."""
|
||||
|
||||
interval = 3.0
|
||||
interval = 1.0
|
||||
|
||||
def __init__(self, proc_dir="/proc", disk_path="/"):
|
||||
self.proc_dir = Path(proc_dir)
|
||||
@@ -15169,6 +15352,243 @@ class RouterUpdateManager:
|
||||
thread.join(timeout=25)
|
||||
|
||||
|
||||
HUB_UPDATE_LIMIT = 4 * 1024 * 1024
|
||||
HUB_UPDATE_ACTIVE = {'starting', 'installing', 'restarting', 'rollback'}
|
||||
|
||||
|
||||
def hub_update_write(path, data, mode=0o600):
|
||||
"""One durable atomic replacement; never truncate a running Hub or its state."""
|
||||
path = Path(path)
|
||||
path.parent.mkdir(mode=0o700, parents=True, exist_ok=True)
|
||||
fd, name = tempfile.mkstemp(prefix='.' + path.name + '-', dir=path.parent)
|
||||
try:
|
||||
with os.fdopen(fd, 'wb') as stream:
|
||||
stream.write(data)
|
||||
stream.flush()
|
||||
os.fsync(stream.fileno())
|
||||
os.chmod(name, mode)
|
||||
os.replace(name, path)
|
||||
finally:
|
||||
Path(name).unlink(missing_ok=True)
|
||||
|
||||
|
||||
def hub_update_state(directory, value=None):
|
||||
path = Path(directory) / 'job.json'
|
||||
if value is not None:
|
||||
hub_update_write(path, json.dumps(value, ensure_ascii=False).encode('utf-8'))
|
||||
return value
|
||||
try:
|
||||
with path.open('rb') as stream:
|
||||
raw = stream.read(16385)
|
||||
data = json.loads(raw) if len(raw) <= 16384 else {}
|
||||
return data if isinstance(data, dict) else {}
|
||||
except (OSError, ValueError):
|
||||
return {}
|
||||
|
||||
|
||||
@contextmanager
|
||||
def hub_update_lock(directory, blocking=False):
|
||||
# The worker survives Hub restarts; the kernel releases this lock on a crash.
|
||||
import fcntl
|
||||
Path(directory).mkdir(mode=0o700, parents=True, exist_ok=True)
|
||||
with (Path(directory) / 'worker.lock').open('a') as stream:
|
||||
try:
|
||||
fcntl.flock(stream, fcntl.LOCK_EX | (0 if blocking else fcntl.LOCK_NB))
|
||||
except BlockingIOError:
|
||||
raise RuntimeError('Обновление панели уже выполняется.')
|
||||
try:
|
||||
yield
|
||||
finally:
|
||||
fcntl.flock(stream, fcntl.LOCK_UN)
|
||||
|
||||
|
||||
def hub_update_validate(data):
|
||||
if not 50000 <= len(data) <= HUB_UPDATE_LIMIT:
|
||||
raise ValueError('Некорректный размер файла обновления панели.')
|
||||
source = data.decode('utf-8')
|
||||
if not all(marker in source for marker in ('class App:', 'class Handler(', 'def dashboard_html(', 'def main():')):
|
||||
raise ValueError('Источник вернул файл, не похожий на панель Hub.')
|
||||
if not all(marker in source for marker in ('class HubUpdateManager:', 'panel-update-worker', 'HUB_LOADED_REVISION')):
|
||||
raise ValueError('Сборка в источнике ещё не поддерживает проверяемое обновление из панели.')
|
||||
with warnings.catch_warnings():
|
||||
warnings.simplefilter('ignore', SyntaxWarning)
|
||||
compile(source, 'owrt-remote-hub.py', 'exec', dont_inherit=True)
|
||||
return data
|
||||
|
||||
|
||||
def hub_update_version(data):
|
||||
match = re.search(rb'appBannerVersion[^>]*>(v[0-9]+)', data)
|
||||
return match[1].decode('ascii') if match else 'последняя сборка'
|
||||
|
||||
|
||||
def hub_update_health(url, revision, attempts=30):
|
||||
for _ in range(attempts):
|
||||
try:
|
||||
with urllib.request.urlopen(url + '?panel-update=1', timeout=2) as response:
|
||||
data = json.loads(response.read(4096))
|
||||
if data.get('ok') and data.get('revision') == revision:
|
||||
return True
|
||||
except (OSError, ValueError):
|
||||
pass
|
||||
time.sleep(2)
|
||||
return False
|
||||
|
||||
|
||||
def run_hub_update_worker(job_id, directory=None, target=None):
|
||||
directory = Path(directory or STATE_DIR / 'panel-update')
|
||||
target = Path(target or Path(__file__).resolve())
|
||||
with hub_update_lock(directory, blocking=True):
|
||||
job = hub_update_state(directory)
|
||||
if job.get('id') != job_id or job.get('status') != 'starting':
|
||||
raise RuntimeError('Задача обновления устарела или уже запущена.')
|
||||
changed = False
|
||||
previous = None
|
||||
candidate = directory / 'candidate.py'
|
||||
def report(status, message):
|
||||
job.update(status=status, message=message, updated_at=time.time())
|
||||
hub_update_state(directory, job)
|
||||
try:
|
||||
time.sleep(2) # Give the initiating HTTP request time to return its job id.
|
||||
data = hub_update_validate(candidate.read_bytes())
|
||||
if hashlib.sha256(data).hexdigest() != job.get('revision'):
|
||||
raise RuntimeError('Контрольная сумма обновления не совпала; файл не заменён.')
|
||||
previous = target.read_bytes()
|
||||
if hashlib.sha256(previous).hexdigest() != job.get('previous_revision'):
|
||||
raise RuntimeError('Файл Hub изменился после подтверждения; обнови страницу.')
|
||||
hub_update_write(directory / 'previous.py', previous, 0o700)
|
||||
report('installing', 'Устанавливается новая сборка панели…')
|
||||
hub_update_write(target, data, 0o755)
|
||||
changed = True
|
||||
report('restarting', 'Панель перезапускается; ожидается проверка новой сборки…')
|
||||
subprocess.run(['systemctl', 'restart', 'owrt-remote'], check=True, capture_output=True, timeout=35)
|
||||
if not hub_update_health(job['health_url'], job['revision']):
|
||||
raise RuntimeError('Новая сборка не прошла проверку работоспособности.')
|
||||
report('succeeded', 'Панель успешно обновлена. Страница будет перезагружена.')
|
||||
return 0
|
||||
except Exception as exc:
|
||||
reason = str(exc)[:500]
|
||||
if changed and previous is not None:
|
||||
try:
|
||||
report('rollback', 'Ошибка обновления; восстанавливается предыдущая сборка…')
|
||||
except OSError:
|
||||
pass # A full state disk must not prevent recovery of the Hub file.
|
||||
try:
|
||||
hub_update_write(target, previous, 0o755)
|
||||
subprocess.run(['systemctl', 'restart', 'owrt-remote'], check=True, capture_output=True, timeout=35)
|
||||
restored = hub_update_health(job['health_url'], job['previous_revision'], attempts=15)
|
||||
reason += ' Предыдущий файл восстановлен.' + ('' if restored else ' Работоспособность сервиса не подтверждена; проверь журнал owrt-remote на VPS.')
|
||||
except Exception as rollback_exc:
|
||||
reason += ' Не удалось завершить откат: ' + str(rollback_exc)[:300]
|
||||
report('failed', 'Обновление не выполнено: ' + reason)
|
||||
return 1
|
||||
finally:
|
||||
candidate.unlink(missing_ok=True)
|
||||
|
||||
|
||||
class HubUpdateManager:
|
||||
check_interval = 300
|
||||
|
||||
def __init__(self, target=None, directory=None, source=None):
|
||||
self.target = Path(target or Path(__file__).resolve())
|
||||
self.directory = Path(directory or STATE_DIR / 'panel-update')
|
||||
self.source = (source or RAW_REPO_BASE).rstrip('/')
|
||||
self.csrf = secrets.token_urlsafe(32)
|
||||
self.lock = threading.Lock()
|
||||
self.checked_at = 0
|
||||
self.checking = False
|
||||
self.error = ''
|
||||
self.candidate = None
|
||||
self.remote_revision = ''
|
||||
self.remote_version = ''
|
||||
self.health_url = 'http://127.0.0.1:8088/health'
|
||||
|
||||
def check(self, force=False):
|
||||
with self.lock:
|
||||
job = hub_update_state(self.directory)
|
||||
if self.checking or job.get('status') in HUB_UPDATE_ACTIVE:
|
||||
return
|
||||
if self.checked_at and time.monotonic() - self.checked_at < (15 if force else self.check_interval):
|
||||
return
|
||||
self.checking = True
|
||||
try:
|
||||
threading.Thread(target=self._check, name='owrt-panel-update-check', daemon=True).start()
|
||||
except Exception:
|
||||
with self.lock:
|
||||
self.checking = False
|
||||
raise
|
||||
|
||||
def fetch_candidate(self):
|
||||
if urllib.parse.urlsplit(self.source).scheme != 'https':
|
||||
raise ValueError('Источник обновления должен использовать HTTPS.')
|
||||
request = urllib.request.Request(self.source + '/vps/owrt-remote-hub.py', headers={
|
||||
'User-Agent': 'OpenWrt-Remote-Hub-Updater', 'Cache-Control': 'no-cache'})
|
||||
with urllib.request.urlopen(request, timeout=15) as response:
|
||||
if urllib.parse.urlsplit(response.geturl()).scheme != 'https':
|
||||
raise ValueError('Источник обновления должен использовать HTTPS.')
|
||||
return response.read(HUB_UPDATE_LIMIT + 1)
|
||||
|
||||
def _check(self):
|
||||
data, error = None, ''
|
||||
try:
|
||||
data = self.fetch_candidate()
|
||||
hub_update_validate(data)
|
||||
except Exception as exc:
|
||||
error = 'Не удалось проверить обновление: ' + str(exc)[:300]
|
||||
with self.lock:
|
||||
self.checked_at = time.monotonic()
|
||||
self.error = error
|
||||
self.candidate = data if not error else None
|
||||
self.remote_revision = hashlib.sha256(data).hexdigest() if not error else ''
|
||||
self.remote_version = hub_update_version(data) if not error else ''
|
||||
self.checking = False
|
||||
|
||||
def snapshot(self):
|
||||
with self.lock:
|
||||
job = hub_update_state(self.directory)
|
||||
if job.get('status') in HUB_UPDATE_ACTIVE and time.time() - job.get('started_at', 0) > 420:
|
||||
job.update(status='failed', message='Процесс обновления прерван. Итог не подтверждён; проверь сервис owrt-remote на VPS.')
|
||||
hub_update_state(self.directory, job)
|
||||
revision = HUB_LOADED_REVISION
|
||||
return {'checking': self.checking, 'error': self.error, 'source': self.source,
|
||||
'current_revision': revision, 'remote_revision': self.remote_revision,
|
||||
'remote_version': self.remote_version, 'checked': bool(self.checked_at),
|
||||
'available': bool(self.remote_revision and self.remote_revision != revision),
|
||||
'job': job, 'csrf': self.csrf}
|
||||
|
||||
def start(self, revision):
|
||||
with self.lock:
|
||||
with hub_update_lock(self.directory):
|
||||
job = hub_update_state(self.directory)
|
||||
if job.get('status') in HUB_UPDATE_ACTIVE:
|
||||
raise RuntimeError('Обновление панели уже выполняется.')
|
||||
if not revision or revision != self.remote_revision or not self.candidate or self.error or self.checking:
|
||||
raise ValueError('Результат проверки устарел. Проверь обновление ещё раз.')
|
||||
if revision == HUB_LOADED_REVISION:
|
||||
raise ValueError('Эта сборка панели уже установлена.')
|
||||
hub_update_validate(self.candidate)
|
||||
if shutil.disk_usage(self.target.parent).free < HUB_UPDATE_LIMIT * 3:
|
||||
raise RuntimeError('Недостаточно свободного места для обновления и резервной копии.')
|
||||
if shutil.disk_usage(self.directory).free < HUB_UPDATE_LIMIT * 3:
|
||||
raise RuntimeError('Недостаточно свободного места для резервной копии панели.')
|
||||
job = {'id': secrets.token_hex(16), 'status': 'starting', 'started_at': time.time(),
|
||||
'message': 'Запускается обновление панели…', 'revision': revision,
|
||||
'version': self.remote_version, 'previous_revision': HUB_LOADED_REVISION,
|
||||
'health_url': self.health_url}
|
||||
hub_update_write(self.directory / 'candidate.py', self.candidate)
|
||||
hub_update_state(self.directory, job)
|
||||
try:
|
||||
subprocess.run(['systemd-run', '--unit=owrt-remote-panel-update-' + job['id'], '--collect',
|
||||
'--property=RuntimeMaxSec=360', '--setenv=OWRT_REMOTE_STATE_DIR=' + str(STATE_DIR),
|
||||
sys.executable, str(self.target), 'panel-update-worker', '--job-id', job['id']],
|
||||
check=True, capture_output=True, timeout=15)
|
||||
except Exception as exc:
|
||||
job.update(status='failed', message='Не удалось запустить обновление через systemd: ' + str(exc)[:300])
|
||||
hub_update_state(self.directory, job)
|
||||
(self.directory / 'candidate.py').unlink(missing_ok=True)
|
||||
raise RuntimeError(job['message'])
|
||||
return job
|
||||
|
||||
|
||||
class App:
|
||||
def __init__(self, db_path, session, agent, public_url):
|
||||
self.db_path = Path(db_path)
|
||||
@@ -15181,6 +15601,7 @@ class App:
|
||||
self.router_monitor_thread = None
|
||||
self.vps_resources = VpsResourceMonitor()
|
||||
self.router_updates = RouterUpdateManager(self)
|
||||
self.hub_update = HubUpdateManager()
|
||||
|
||||
@contextmanager
|
||||
def conn(self):
|
||||
@@ -16869,6 +17290,40 @@ a{{display:inline-flex;margin-top:18px;color:#93c5fd}}
|
||||
return
|
||||
self.send_bytes(200, router_updates_html(self.app.router_updates.csrf).encode('utf-8'), 'text/html; charset=utf-8')
|
||||
|
||||
def hub_update_api(self, action=''):
|
||||
if not self.require_owner(json_mode=True):
|
||||
return
|
||||
manager = self.app.hub_update
|
||||
if action:
|
||||
if not secrets.compare_digest(self.headers.get('X-Hub-Update-CSRF', ''), manager.csrf):
|
||||
self.send_json(403, {'ok': False, 'error': 'Обнови страницу панели и повтори.'})
|
||||
return
|
||||
if self.headers.get('Origin') and self.headers['Origin'] != self.request_origin():
|
||||
self.send_json(403, {'ok': False, 'error': 'Недопустимый источник запроса.'})
|
||||
return
|
||||
length = self.headers.get('Content-Length', '')
|
||||
if (self.headers.get('Transfer-Encoding') or not length.isdigit() or int(length) > 2048
|
||||
or 'application/json' not in self.headers.get('Content-Type', '')):
|
||||
self.send_json(400, {'ok': False, 'error': 'Ожидается небольшой запрос JSON.'})
|
||||
return
|
||||
try:
|
||||
payload = self.read_payload()
|
||||
if not isinstance(payload, dict):
|
||||
raise ValueError('Ожидается объект JSON.')
|
||||
if action == 'start':
|
||||
manager.start(payload.get('revision'))
|
||||
else:
|
||||
manager.check(force=True)
|
||||
except ValueError as exc:
|
||||
self.send_json(400, {'ok': False, 'error': str(exc)})
|
||||
return
|
||||
except (RuntimeError, OSError) as exc:
|
||||
self.send_json(409, {'ok': False, 'error': str(exc)})
|
||||
return
|
||||
else:
|
||||
manager.check()
|
||||
self.send_json(200, {'ok': True, **manager.snapshot()})
|
||||
|
||||
def router_updates_api(self, action=''):
|
||||
if not self.require_owner(json_mode=True):
|
||||
return
|
||||
@@ -18251,7 +18706,13 @@ exit 127
|
||||
def do_GET(self):
|
||||
path = self.parsed().path
|
||||
if path == "/health":
|
||||
self.send_json(200, {"ok": True})
|
||||
result = {"ok": True}
|
||||
if self.query().get('panel-update') == ['1']:
|
||||
result['revision'] = HUB_LOADED_REVISION
|
||||
self.send_json(200, result)
|
||||
return
|
||||
if path == '/api/hub-update':
|
||||
self.hub_update_api()
|
||||
return
|
||||
if path == "/api/vps/resources":
|
||||
if not self.admin_ok():
|
||||
@@ -18382,6 +18843,7 @@ exit 127
|
||||
"is_owner": bool(profile and profile.get("is_owner")),
|
||||
"can_add_router": bool(profile and account_can_add_router(profile)),
|
||||
},
|
||||
vps_resources=self.app.vps_resources.snapshot(),
|
||||
).encode("utf-8"),
|
||||
"text/html; charset=utf-8",
|
||||
extra_headers,
|
||||
@@ -18502,6 +18964,9 @@ exit 127
|
||||
|
||||
def do_POST(self):
|
||||
path = self.parsed().path
|
||||
if path in {'/api/hub-update/check', '/api/hub-update/start'}:
|
||||
self.hub_update_api(path.rsplit('/', 1)[-1])
|
||||
return
|
||||
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])
|
||||
return
|
||||
@@ -19840,6 +20305,8 @@ def make_http_server(app, host, port, tls_cert="", tls_key=""):
|
||||
|
||||
def cmd_serve(args):
|
||||
app = App(args.db, session_token(), agent_token(), args.public_url)
|
||||
health_host = args.host if args.host not in {'', '0.0.0.0', '::'} else ('::1' if args.host == '::' else '127.0.0.1')
|
||||
app.hub_update.health_url = 'http://' + ('[' + health_host + ']' if ':' in health_host else health_host) + ':' + str(args.port) + '/health'
|
||||
with app.conn():
|
||||
pass
|
||||
record_hub_start_event()
|
||||
@@ -19974,6 +20441,10 @@ def parser():
|
||||
)
|
||||
rewrite.set_defaults(func=cmd_rewrite_endpoints)
|
||||
|
||||
update_worker = sub.add_parser('panel-update-worker', help=argparse.SUPPRESS)
|
||||
update_worker.add_argument('--job-id', required=True)
|
||||
update_worker.set_defaults(func=lambda args: sys.exit(run_hub_update_worker(args.job_id)))
|
||||
|
||||
serve = sub.add_parser("serve", help="run web dashboard")
|
||||
serve.add_argument("--host", default=os.environ.get("OWRT_REMOTE_BIND", "0.0.0.0"))
|
||||
serve.add_argument("--port", type=int, default=int(os.environ.get("OWRT_REMOTE_PORT", "8088")))
|
||||
|
||||
@@ -0,0 +1,240 @@
|
||||
param(
|
||||
[Parameter(Mandatory = $true)][ValidateNotNullOrEmpty()][string]$Vps,
|
||||
[ValidateSet('Prepare', 'Retest', 'Status', 'Restore')][string]$Action = 'Prepare',
|
||||
[switch]$PrepareOnly
|
||||
)
|
||||
|
||||
$ErrorActionPreference = 'Stop'
|
||||
$RepoRoot = Split-Path -Parent $PSScriptRoot
|
||||
$UploadName = 'owrt-hub-update-test-' + [guid]::NewGuid().ToString('N')
|
||||
$StageRoot = Join-Path ([System.IO.Path]::GetTempPath()) $UploadName
|
||||
$Utf8 = [System.Text.UTF8Encoding]::new($false)
|
||||
$RemoteTool = @'
|
||||
import hashlib
|
||||
import json
|
||||
import os
|
||||
from pathlib import Path
|
||||
import re
|
||||
import shutil
|
||||
import subprocess
|
||||
import sys
|
||||
import tempfile
|
||||
import time
|
||||
import urllib.request
|
||||
import uuid
|
||||
import warnings
|
||||
|
||||
STAGE = Path(__file__).resolve().parent
|
||||
TARGET = Path('/opt/owrt-remote/owrt-remote-hub.py')
|
||||
ROOT = TARGET.parent / 'self-update-local-test'
|
||||
HEALTH = 'http://127.0.0.1:8088/health?panel-update=1'
|
||||
|
||||
def digest(data):
|
||||
return hashlib.sha256(data).hexdigest()
|
||||
|
||||
def atomic(path, data, mode=0o600):
|
||||
fd, name = tempfile.mkstemp(prefix='.' + path.name + '-', dir=path.parent)
|
||||
try:
|
||||
with os.fdopen(fd, 'wb') as stream:
|
||||
stream.write(data)
|
||||
stream.flush()
|
||||
os.fsync(stream.fileno())
|
||||
os.chmod(name, mode)
|
||||
os.replace(name, path)
|
||||
finally:
|
||||
Path(name).unlink(missing_ok=True)
|
||||
|
||||
def read_json(path):
|
||||
try:
|
||||
with path.open('rb') as stream:
|
||||
data = stream.read(16385)
|
||||
return json.loads(data) if len(data) <= 16384 else {}
|
||||
except (OSError, ValueError):
|
||||
return {}
|
||||
|
||||
def read_health():
|
||||
try:
|
||||
with urllib.request.urlopen(HEALTH, timeout=3) as response:
|
||||
data = json.loads(response.read(4096))
|
||||
return data if isinstance(data, dict) else {}
|
||||
except (OSError, ValueError):
|
||||
return {}
|
||||
|
||||
def healthy(revision='', attempts=20):
|
||||
for _ in range(attempts):
|
||||
data = read_health()
|
||||
if data.get('ok') and (not revision or data.get('revision') == revision):
|
||||
return True
|
||||
time.sleep(2)
|
||||
return False
|
||||
|
||||
def idle():
|
||||
result = subprocess.run(['systemctl', 'list-units', '--state=active', '--no-legend',
|
||||
'--plain', 'owrt-remote-panel-update-*'],
|
||||
capture_output=True, text=True, check=True, timeout=15)
|
||||
if result.stdout.strip():
|
||||
raise RuntimeError('A panel update is running. Wait for its result before preparing or restoring the test.')
|
||||
|
||||
def restart():
|
||||
subprocess.run(['systemctl', 'restart', 'owrt-remote'], check=True, timeout=45)
|
||||
|
||||
def cleanup_test():
|
||||
if ROOT.resolve() != TARGET.resolve().parent / 'self-update-local-test':
|
||||
raise RuntimeError('Unsafe test cleanup path.')
|
||||
job_directory = ROOT / 'job'
|
||||
if job_directory.exists():
|
||||
for name in ('candidate.py', 'previous.py', 'job.json', 'worker.lock'):
|
||||
(job_directory / name).unlink(missing_ok=True)
|
||||
job_directory.rmdir()
|
||||
for name in ('candidate.py', 'before.py', 'test.json'):
|
||||
(ROOT / name).unlink(missing_ok=True)
|
||||
ROOT.rmdir()
|
||||
|
||||
def builds(source, candidate_path, token):
|
||||
anchor = '\nif __name__ == "__main__":\n main()'
|
||||
if source.count(anchor) != 1 or ' def fetch_candidate(self):' not in source:
|
||||
raise RuntimeError('Local source does not contain the testable self-update feature.')
|
||||
# Only these disposable builds read a local file. The repository source,
|
||||
# RAW_REPO_BASE, router installers and regular HTTPS checks are unchanged.
|
||||
patch = '''
|
||||
# LOCAL SELF-UPDATE TEST: remove with test-hub-self-update.ps1 -Action Restore.
|
||||
def _owrt_local_test_fetch(self):
|
||||
self.source = "\\u041b\\u043e\\u043a\\u0430\\u043b\\u044c\\u043d\\u044b\\u0439 \\u0442\\u0435\\u0441\\u0442 \\u043d\\u0430 VPS (\\u0431\\u0435\\u0437 GitHub)"
|
||||
with Path(__CANDIDATE__).open('rb') as stream:
|
||||
return stream.read(HUB_UPDATE_LIMIT + 1)
|
||||
HubUpdateManager.fetch_candidate = _owrt_local_test_fetch
|
||||
|
||||
_owrt_local_original_init = HubUpdateManager.__init__
|
||||
def _owrt_local_test_init(self, *args, **kwargs):
|
||||
_owrt_local_original_init(self, *args, **kwargs)
|
||||
self.directory = Path(__JOB_DIRECTORY__)
|
||||
HubUpdateManager.__init__ = _owrt_local_test_init
|
||||
|
||||
_owrt_local_original_worker = run_hub_update_worker
|
||||
def run_hub_update_worker(job_id, directory=None, target=None):
|
||||
return _owrt_local_original_worker(job_id, directory or Path(__JOB_DIRECTORY__), target)
|
||||
'''.replace('__CANDIDATE__', repr(str(candidate_path))).replace(
|
||||
'__JOB_DIRECTORY__', repr(str(candidate_path.parent / 'job')))
|
||||
source = source.replace(anchor, '\n' + patch + anchor)
|
||||
baseline = (source + '\n# LOCAL TEST BASELINE ' + token + '\n').encode('utf-8')
|
||||
candidate = (source + '\n# LOCAL TEST UPDATED ' + token + '\n').encode('utf-8')
|
||||
with warnings.catch_warnings():
|
||||
warnings.simplefilter('ignore', SyntaxWarning)
|
||||
compile(baseline, 'local-test-baseline.py', 'exec')
|
||||
compile(candidate, 'local-test-candidate.py', 'exec')
|
||||
return baseline, candidate
|
||||
|
||||
def prepare():
|
||||
idle()
|
||||
if ROOT.exists():
|
||||
raise RuntimeError('A local test already exists. Use -Action Status or -Action Restore first.')
|
||||
original = TARGET.read_bytes()
|
||||
source = (STAGE / 'hub.py').read_text(encoding='utf-8')
|
||||
baseline, candidate = builds(source, ROOT / 'candidate.py', uuid.uuid4().hex)
|
||||
ROOT.mkdir(mode=0o700)
|
||||
changed = False
|
||||
try:
|
||||
atomic(ROOT / 'before.py', original, 0o700)
|
||||
atomic(ROOT / 'candidate.py', candidate, 0o700)
|
||||
metadata = {'baseline': digest(baseline), 'candidate': digest(candidate),
|
||||
'before': digest(original), 'created_at': time.time()}
|
||||
atomic(ROOT / 'test.json', json.dumps(metadata).encode('ascii'))
|
||||
atomic(TARGET, baseline, 0o755)
|
||||
changed = True
|
||||
restart()
|
||||
if not healthy(metadata['baseline']):
|
||||
raise RuntimeError('Test baseline did not become healthy.')
|
||||
except Exception:
|
||||
if changed:
|
||||
atomic(TARGET, original, 0o755)
|
||||
restart()
|
||||
revision = digest(original) if b'HUB_LOADED_REVISION =' in original else ''
|
||||
if not healthy(revision):
|
||||
raise RuntimeError('Previous file restored but service health is not confirmed. Backup: ' + str(ROOT / 'before.py'))
|
||||
cleanup_test()
|
||||
raise
|
||||
print('SELF_UPDATE_LOCAL_TEST_READY')
|
||||
print('Open the Hub, press Ctrl+F5, wait for the YELLOW update button, then confirm the update.')
|
||||
print('After success and the automatic reload, the update button must turn GREEN.')
|
||||
print('No GitHub/GitVerse push or installation link changes were made.')
|
||||
print('Backup: ' + str(ROOT / 'before.py'))
|
||||
|
||||
def status():
|
||||
metadata = read_json(ROOT / 'test.json')
|
||||
current = digest(TARGET.read_bytes())
|
||||
job = read_json(ROOT / 'job/job.json')
|
||||
service = subprocess.run(['systemctl', 'is-active', '--quiet', 'owrt-remote'], timeout=10).returncode == 0
|
||||
health = read_health()
|
||||
loaded = health.get('revision', '')
|
||||
build = ('baseline' if current == metadata.get('baseline') else
|
||||
'candidate' if current == metadata.get('candidate') else 'other')
|
||||
passed = (bool(metadata) and build == 'candidate' and service and health.get('ok')
|
||||
and loaded == metadata['candidate'] and job.get('status') == 'succeeded'
|
||||
and job.get('revision') == metadata['candidate'])
|
||||
print('SELF_UPDATE_LOCAL_TEST_NOT_PREPARED' if not metadata else
|
||||
'SELF_UPDATE_LOCAL_TEST_PASSED' if passed else 'SELF_UPDATE_LOCAL_TEST_WAITING')
|
||||
print(json.dumps({'service_active': service, 'job_status': job.get('status', 'not started'),
|
||||
'test_prepared': bool(metadata), 'installed_build': build,
|
||||
'running_installed_file': bool(health.get('ok') and loaded == current),
|
||||
'installed_test_candidate': build == 'candidate',
|
||||
'candidate_revision': metadata.get('candidate', ''),
|
||||
'installed_revision': current, 'loaded_revision': loaded}, indent=2))
|
||||
if not metadata or build == 'other':
|
||||
print('The disposable local test build is not installed. Its local source is not active.')
|
||||
elif loaded != current:
|
||||
print('The running Hub does not match the installed test file. Check the owrt-remote service.')
|
||||
else:
|
||||
print('The local test build is running on this VPS. If the browser reports a GitHub error, verify that its domain points to this VPS.')
|
||||
|
||||
def restore():
|
||||
idle()
|
||||
metadata = read_json(ROOT / 'test.json')
|
||||
original = (ROOT / 'before.py').read_bytes()
|
||||
if not metadata or digest(original) != metadata.get('before'):
|
||||
raise RuntimeError('Test backup validation failed. Nothing changed.')
|
||||
atomic(TARGET, original, 0o755)
|
||||
restart()
|
||||
revision = digest(original) if b'HUB_LOADED_REVISION =' in original else ''
|
||||
if not healthy(revision):
|
||||
raise RuntimeError('Previous file restored but service health is not confirmed. Backup was kept.')
|
||||
cleanup_test()
|
||||
print('SELF_UPDATE_LOCAL_TEST_RESTORED')
|
||||
print('The previous Hub file and its usual update source are restored. Press Ctrl+F5.')
|
||||
|
||||
def retest():
|
||||
if ROOT.exists():
|
||||
restore()
|
||||
prepare()
|
||||
|
||||
if __name__ == '__main__':
|
||||
try:
|
||||
{'Prepare': prepare, 'Retest': retest, 'Status': status, 'Restore': restore}[sys.argv[1]]()
|
||||
finally:
|
||||
if STAGE.parent == Path('/tmp') and re.fullmatch(r'owrt-hub-update-test-[0-9a-f]{32}', STAGE.name):
|
||||
shutil.rmtree(STAGE)
|
||||
'@
|
||||
|
||||
try {
|
||||
[System.IO.Directory]::CreateDirectory($StageRoot) | Out-Null
|
||||
[System.IO.File]::WriteAllText((Join-Path $StageRoot 'run.py'), $RemoteTool.Replace("`r`n", "`n") + "`n", $Utf8)
|
||||
if ($Action -in @('Prepare', 'Retest')) {
|
||||
$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 "if [ -x /opt/owrt-remote/venv/bin/python ]; then /opt/owrt-remote/venv/bin/python /tmp/$UploadName/run.py $Action; else python3 /tmp/$UploadName/run.py $Action; fi"
|
||||
if ($LASTEXITCODE -ne 0) { throw "$Action failed. See the output above; success was not confirmed." }
|
||||
}
|
||||
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 }
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user