mirror of
https://github.com/Corfirean/coa-server-manager.git
synced 2026-11-19 11:25:56 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ed7bf7262b | ||
|
|
7c866b116d | ||
|
|
cfea54e203 | ||
|
|
57aa97da8a | ||
|
|
b9f89a4ae4 | ||
|
|
6fd2130fc4 | ||
|
|
346d97ee89 | ||
|
|
10a6744192 | ||
|
|
7557b347c5 | ||
|
|
2abd64dfe2 | ||
|
|
9ae5fb471b | ||
|
|
59036867d7 | ||
|
|
949614f11a | ||
|
|
9ee0e9f6af | ||
|
|
3405c89fe8 | ||
|
|
4c4d39f1de | ||
|
|
b101c79e96 | ||
|
|
3b7f77d92e | ||
|
|
0589722e71 | ||
|
|
a3717c08bb | ||
|
|
dc2bffc57e | ||
|
|
e34ab45443 | ||
|
|
40f9feab84 | ||
|
|
5b16842720 | ||
|
|
02843bb6d1 | ||
|
|
a9ab7ced7e | ||
|
|
77318895ae | ||
|
|
115c57f54e | ||
|
|
94fd5fb5b9 | ||
|
|
94d4ade1c7 | ||
|
|
376f1dbb46 | ||
|
|
b0951dbee7 | ||
|
|
374a3f9c23 | ||
|
|
d20d5a6410 | ||
|
|
1228807eaf | ||
|
|
ee59708fbf | ||
|
|
3ed9c5dacd | ||
|
|
9099168927 | ||
|
|
a27e0eb6ab | ||
|
|
c46edd2feb | ||
|
|
f934bef303 | ||
|
|
c882a21334 | ||
|
|
a625b065cf | ||
|
|
5c3a9def0c | ||
|
|
25098b5a63 | ||
|
|
45a699d2ca | ||
|
|
be68eb4341 | ||
|
|
06ca748e80 | ||
|
|
58c1e1aee0 | ||
|
|
ad69fb0401 | ||
|
|
3f98ba3add | ||
|
|
7a3fefaafd |
No files matched your search
@@ -4,3 +4,5 @@ dist
|
|||||||
*.log
|
*.log
|
||||||
.env
|
.env
|
||||||
src-tauri/gen
|
src-tauri/gen
|
||||||
|
# Disposable database fixtures and private recovery data
|
||||||
|
.cache/
|
||||||
Generated
+3
-3
@@ -491,7 +491,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "coa-core"
|
name = "coa-core"
|
||||||
version = "0.6.7"
|
version = "0.6.13"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"base64 0.22.1",
|
"base64 0.22.1",
|
||||||
"chrono",
|
"chrono",
|
||||||
@@ -520,7 +520,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "coa-release"
|
name = "coa-release"
|
||||||
version = "0.6.7"
|
version = "0.6.13"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"chrono",
|
"chrono",
|
||||||
"coa-core",
|
"coa-core",
|
||||||
@@ -529,7 +529,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "coa-server-manager"
|
name = "coa-server-manager"
|
||||||
version = "0.6.7"
|
version = "0.6.13"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"coa-core",
|
"coa-core",
|
||||||
"serde",
|
"serde",
|
||||||
|
|||||||
+1
-1
@@ -3,7 +3,7 @@ resolver = "2"
|
|||||||
members = ["crates/coa-core", "crates/coa-release", "src-tauri"]
|
members = ["crates/coa-core", "crates/coa-release", "src-tauri"]
|
||||||
|
|
||||||
[workspace.package]
|
[workspace.package]
|
||||||
version = "0.6.7"
|
version = "0.6.13"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
license = "AGPL-3.0-only"
|
license = "AGPL-3.0-only"
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,29 @@
|
|||||||
|
# TODO
|
||||||
|
|
||||||
|
## UI / UX
|
||||||
|
- [x] **Предупреждение о несохранённых изменениях при переходе между вкладками (Unsaved Changes Guard / Modal)**:
|
||||||
|
- Если у пользователя есть несохранённые изменения в настройках (`ModulesPage`, `SettingsPage` — сервер, боты и др.) и он переходит на другую вкладку (в боковом меню `Shell.tsx` или кнопками навигации), показывать pop-up диалог подтверждения.
|
||||||
|
- Опции в диалоге:
|
||||||
|
- **Сохранить (Save)** — сохранить внесённые изменения и перейти на выбранную страницу.
|
||||||
|
- **Сбросить (Discard)** — отменить несохранённые изменения и перейти на выбранную страницу.
|
||||||
|
- **Отмена (Cancel)** — остаться на текущей странице с сохранением введённых данных.
|
||||||
|
- *Контекст:* Предотвратит случайную потерю настроек, когда пользователь меняет параметры модуля/сервера и сразу уходит на вкладку Overview для запуска сервера (см. [Issue #45](https://github.com/Corfirean/coa-server-manager/issues/45)).
|
||||||
|
|
||||||
|
## Сервер и стабильность
|
||||||
|
- [x] **Автоподнятие сервера при падении (Auto-restart on crash) со счётчиком и расшифровкой крашей**:
|
||||||
|
- **Настройка:** Чекбокс «Автоматически перезапускать сервер при падении» в настройках сервера / менеджера.
|
||||||
|
- **Поведение автоподнятия:**
|
||||||
|
- Перезапускать процесс сервера только если падение произошло внезапно (процесс завершился с ненулевым exit code, крашем или без команды от менеджера).
|
||||||
|
- Если пользователь нажал кнопку «Стоп» (Stop Server), сервер останавливается полностью, автоподнятие не срабатывает.
|
||||||
|
- Защита от бесконечного цикла крашей (Crash Loop Protection): если за короткий интервал (например, 2-3 минуты) сервер падает более 3-5 раз, автоподнятие временно прекращается, а в UI выводится критическое оповещение.
|
||||||
|
- **Счётчик падений в интерфейсе:**
|
||||||
|
- Рядом со статусом сервера (или в шапке/панели состояния) показывать бейдж со счётчиком крашей с момента старта (например: `Крашей: 2`).
|
||||||
|
- При клике на счётчик открывать окно / модалку со списком последних падений с точным временем.
|
||||||
|
- **Расшифровка причин краша (Crash Explanation Engine):**
|
||||||
|
- *Как парсить и определять причину:*
|
||||||
|
1. Читать свежий текстовый файл из `Core/Crashes/<hash>_worldserver.exe_[date].txt`.
|
||||||
|
2. Смотреть `Exception code` (например, `C0000005` — нарушение доступа к памяти/access violation, `C0000420` — сработавший assert ядра, `C00000FD` — переполнение стека, `E06D7363` — исключение C++ / std::bad_alloc).
|
||||||
|
3. При `C0000420` парсить блок `ASSERTION FAILED` (`Location`, `Function`, `Condition`).
|
||||||
|
4. Анализировать последние строки `Core/Logs/Server.log` и `Errors.log` на критические маркеры (потеря соединения с MySQL, нехватка RAM/OOM, ошибка бинда портов).
|
||||||
|
5. Проверять по встроенному словарю известных сигнатур (паттерны частых крашей с понятным описанием, например: «Сбой удаления объекта из сетки карты», «Ошибка запроса к базе данных», «Нехватка оперативной памяти»).
|
||||||
|
- *Fallback:* Если сигнатура не опознана в словаре известных проблем, показывать краткую техническую выжимку (код исключения + сработавший ассерт или вершина Call Stack) и кнопку разворота полного текста крашлога / копирования.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: added
|
||||||
|
audience: admins
|
||||||
|
title: Linux: install from the install screen, play with Wine or Proton (experimental)
|
||||||
|
---
|
||||||
|
Experimental. The install screen offers Docker installs on Linux, realm profiles and the Play button work on a Docker server, and updates are not offered for it.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: fixed
|
||||||
|
audience: admins
|
||||||
|
title: A failing database update is no longer reported as "database not running"
|
||||||
|
---
|
||||||
|
An SQL error whose message contained the number 2003, such as an out-of-range value, was shown as "The database is not running". The real error is now shown.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: changed
|
||||||
|
audience: admins
|
||||||
|
title: Failed server startup after an update automatically restores the previous version
|
||||||
|
---
|
||||||
|
The Manager restores server files and databases, then checks the recovered server. If recovery cannot be confirmed, it preserves the recovery point and blocks further startup until the problem is resolved.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: fixed
|
||||||
|
audience: admins
|
||||||
|
title: Windows update recovery preserves database procedures triggers and views
|
||||||
|
---
|
||||||
|
A verified copy of stopped MySQL restores all databases and accounts together. Interrupted restoration can be retried, and the replaced database directory is retained.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: fixed
|
||||||
|
audience: admins
|
||||||
|
title: Custom races bot setting synchronizes Playerbots excluded race lists
|
||||||
|
---
|
||||||
|
The "Bots can be custom races" setting now configures AiPlayerbot.ExcludedBotRaces in playerbots.conf. Off excludes all added races (recommended), while on allows stable added races (experimental).
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: changed
|
||||||
|
audience: admins
|
||||||
|
title: Custom race client patches update to the latest races and appearances
|
||||||
|
---
|
||||||
|
The module card offers an upgrade for older patches. Archive downloads are verified before installation.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: added
|
||||||
|
audience: admins
|
||||||
|
title: Custom races can be enabled and their client patches installed from Modules
|
||||||
|
---
|
||||||
|
Install the custom race client assets from the module card, then enable the module and restart the server.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: fixed
|
||||||
|
audience: admins
|
||||||
|
title: Blocked updates identify database objects that prevent automatic recovery
|
||||||
|
---
|
||||||
|
Diagnostics include the complete list of unsupported database objects across the recovery point, helping resolve update failures without removing user data.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: fixed
|
||||||
|
audience: admins
|
||||||
|
title: Background world servers no longer stop because the local console is closed
|
||||||
|
---
|
||||||
|
The Manager automatically disables the local interactive console before starting the world server. Its remote console remains available, and no manual configuration changes are needed.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: added
|
||||||
|
audience: admins
|
||||||
|
title: Updates can follow signed channels that select a complete server release
|
||||||
|
---
|
||||||
|
The Manager checks the channel signature and downloads every package part from the same release. Existing installations continue using the previous download source until the new channel is published.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: fixed
|
||||||
|
audience: admins
|
||||||
|
title: Server updates check startup privately before allowing players to connect
|
||||||
|
---
|
||||||
|
Startup checks use temporary local ports. Original settings are restored before opening the server, and interrupted checks retain a recovery journal.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: fixed
|
||||||
|
audience: admins
|
||||||
|
title: Updates repair missing database defaults from the verified release schema
|
||||||
|
---
|
||||||
|
Only missing literal defaults are restored when column properties match. Existing rows, custom defaults, types and nullability are preserved; unresolved incompatibilities still block the update.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: fixed
|
||||||
|
audience: admins
|
||||||
|
title: Server updates no longer replay module installation scripts on existing databases
|
||||||
|
---
|
||||||
|
Update packages contain incremental SQL only. Module table initialization and seed scripts remain available when preparing a clean installation, preventing existing content from being reset during updates.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: added
|
||||||
|
audience: admins
|
||||||
|
title: Windows server updates are tested on a private copy before changing your installation
|
||||||
|
---
|
||||||
|
The Manager tests migrations and server startup using your databases and configurations. A failed rehearsal leaves the installed server unchanged and preserves a diagnostic report.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: added
|
||||||
|
audience: admins
|
||||||
|
title: Server updates can require a tested combination of platform and installed version
|
||||||
|
---
|
||||||
|
Signed release metadata identifies core and module revisions, supported starting versions and database contracts. Incompatible packages are rejected before shutdown; changed schema contracts and incompatible databases block installation before migration.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: fixed
|
||||||
|
audience: admins
|
||||||
|
title: Failed database checks keep a complete report after rollback
|
||||||
|
---
|
||||||
|
Schema errors show readable default values and save every detected difference for troubleshooting, including after the server is restored.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: fixed
|
||||||
|
audience: admins
|
||||||
|
title: Server and Bots settings open without a blank window
|
||||||
|
---
|
||||||
|
Opening settings no longer crashes the interface after loading. Unsaved changes can still be saved or discarded before leaving the page.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: added
|
||||||
|
audience: admins
|
||||||
|
title: Unsaved settings are protected and crashed servers can restart automatically
|
||||||
|
---
|
||||||
|
The Manager asks before leaving unsaved settings. Optional automatic restart pauses after repeated crashes, and crash history explains common failures.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: added
|
||||||
|
audience: players
|
||||||
|
title: Players can install custom race patches when connecting to a friend
|
||||||
|
---
|
||||||
|
Install the custom race client patch directly from the Game client section without hosting a server.
|
||||||
@@ -27,6 +27,7 @@ fn exercise(root: &Path) -> Result<()> {
|
|||||||
MetaDir::create(root, &installed)?;
|
MetaDir::create(root, &installed)?;
|
||||||
backup::with_database(root, |db| {
|
backup::with_database(root, |db| {
|
||||||
db.query("CREATE TABLE acore_characters.manager_recovery_probe (id INT); INSERT INTO acore_characters.manager_recovery_probe VALUES (42); CREATE TABLE acore_world.manager_recovery_probe (id INT); INSERT INTO acore_world.manager_recovery_probe VALUES (43);")?;
|
db.query("CREATE TABLE acore_characters.manager_recovery_probe (id INT); INSERT INTO acore_characters.manager_recovery_probe VALUES (42); CREATE TABLE acore_world.manager_recovery_probe (id INT); INSERT INTO acore_world.manager_recovery_probe VALUES (43);")?;
|
||||||
|
db.query("CREATE VIEW acore_characters.manager_recovery_view AS SELECT id FROM acore_characters.manager_recovery_probe; CREATE TRIGGER acore_characters.manager_recovery_trigger BEFORE INSERT ON acore_characters.manager_recovery_probe FOR EACH ROW SET NEW.id=NEW.id+1; CREATE PROCEDURE acore_characters.manager_recovery_proc() SELECT id FROM acore_characters.manager_recovery_probe;")?;
|
||||||
Ok(())
|
Ok(())
|
||||||
})?;
|
})?;
|
||||||
let source = root.join("fixture-update-source");
|
let source = root.join("fixture-update-source");
|
||||||
@@ -54,13 +55,15 @@ fn exercise(root: &Path) -> Result<()> {
|
|||||||
cancel: Cancel::default(), resolutions: BTreeMap::new(), env: &env, fail_after_ops: None,
|
cancel: Cancel::default(), resolutions: BTreeMap::new(), env: &env, fail_after_ops: None,
|
||||||
}, &|step, pct| println!("{pct}% {step}" )).unwrap_err();
|
}, &|step, pct| println!("{pct}% {step}" )).unwrap_err();
|
||||||
assert!(error.to_string().contains("probe_world"), "{error}");
|
assert!(error.to_string().contains("probe_world"), "{error}");
|
||||||
assert!(error.to_string().contains("were restored"), "{error}");
|
assert!(error.to_string().contains("private update rehearsal failed"), "{error}");
|
||||||
assert!(!root.join("Core/recovery-probe.txt").exists());
|
assert!(!root.join("Core/recovery-probe.txt").exists());
|
||||||
assert!(update::unfinished(&meta).is_none());
|
assert!(update::unfinished(&meta).is_none());
|
||||||
assert_eq!(MetaDir::open(&meta)?.1.core.version.as_deref(), Some("1.0.0"));
|
assert_eq!(MetaDir::open(&meta)?.1.core.version.as_deref(), Some("1.0.0"));
|
||||||
backup::with_database(root, |db| {
|
backup::with_database(root, |db| {
|
||||||
assert_eq!(db.query("SELECT id FROM acore_characters.manager_recovery_probe;")?, "42");
|
assert_eq!(db.query("SELECT id FROM acore_characters.manager_recovery_probe;")?, "42");
|
||||||
assert_eq!(db.query("SELECT id FROM acore_world.manager_recovery_probe;")?, "43");
|
assert_eq!(db.query("SELECT id FROM acore_world.manager_recovery_probe;")?, "43");
|
||||||
|
assert_eq!(db.query("SELECT id FROM acore_characters.manager_recovery_view;")?, "42");
|
||||||
|
assert_eq!(db.recovery_objects("acore_characters")?.iter().filter(|object| object["name"].as_str().is_some_and(|name| name.starts_with("manager_recovery_"))).count(), 3);
|
||||||
assert!(!coa_core::migrations::status(db, &manifest.migrations)?.iter().any(|m| m.status == coa_core::migrations::Status::Applied));
|
assert!(!coa_core::migrations::status(db, &manifest.migrations)?.iter().any(|m| m.status == coa_core::migrations::Status::Applied));
|
||||||
Ok(())
|
Ok(())
|
||||||
})?;
|
})?;
|
||||||
@@ -68,6 +71,6 @@ fn exercise(root: &Path) -> Result<()> {
|
|||||||
let point = backup::list(&meta).into_iter().find(|p| p.trigger == backup::Trigger::BeforeUpdate).ok_or_else(|| Error::Invalid("missing backup".into()))?;
|
let point = backup::list(&meta).into_iter().find(|p| p.trigger == backup::Trigger::BeforeUpdate).ok_or_else(|| Error::Invalid("missing backup".into()))?;
|
||||||
env.restore_snapshot(&point.id)?;
|
env.restore_snapshot(&point.id)?;
|
||||||
assert_eq!(Db::from_repack(root, Account::Admin)?.realm(), coa_core::realms::Mode::Coa);
|
assert_eq!(Db::from_repack(root, Account::Admin)?.realm(), coa_core::realms::Mode::Coa);
|
||||||
println!("PASS: failed SQL restored world, characters, ledger, files and version; repeated recovery succeeded");
|
println!("PASS: private rehearsal caught failed SQL before changing the installed world, characters, ledger, objects, files or version; complete recovery succeeded");
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
@@ -31,6 +31,7 @@ fn hidden(key: &str) -> bool {
|
|||||||
k.contains("password")
|
k.contains("password")
|
||||||
|| k.contains("databaseinfo")
|
|| k.contains("databaseinfo")
|
||||||
|| k.ends_with("port")
|
|| k.ends_with("port")
|
||||||
|
|| k == "console.enable"
|
||||||
|| k.starts_with("ra.")
|
|| k.starts_with("ra.")
|
||||||
|| k.starts_with("logger.")
|
|| k.starts_with("logger.")
|
||||||
|| k.starts_with("appender.")
|
|| k.starts_with("appender.")
|
||||||
@@ -229,7 +230,7 @@ mod tests {
|
|||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn what_belongs_to_the_manager_is_hidden() {
|
fn what_belongs_to_the_manager_is_hidden() {
|
||||||
for k in ["LoginDatabaseInfo", "WorldServerPort", "BindIP", "Ra.Enable", "Ra.Password", "Logger.root", "Appender.Console", "DataDir", "Updates.EnableDatabases", "LoginDatabase.WorkerThreads", "InstanceServerPort"] {
|
for k in ["LoginDatabaseInfo", "WorldServerPort", "BindIP", "Ra.Enable", "Ra.Password", "Console.Enable", "console.enable", "Logger.root", "Appender.Console", "DataDir", "Updates.EnableDatabases", "LoginDatabase.WorkerThreads", "InstanceServerPort"] {
|
||||||
assert!(hidden(k), "{k}");
|
assert!(hidden(k), "{k}");
|
||||||
}
|
}
|
||||||
for k in ["Rate.XP.Kill", "PlayerLimit", "SupportEnabled", "Instance.ResetTimeHour", "Warden.Enabled", "CharacterCreating.Disabled"] {
|
for k in ["Rate.XP.Kill", "PlayerLimit", "SupportEnabled", "Instance.ResetTimeHour", "Warden.Enabled", "CharacterCreating.Disabled"] {
|
||||||
|
|||||||
@@ -67,6 +67,8 @@ pub struct RecoveryPoint {
|
|||||||
pub components: Vec<Component>,
|
pub components: Vec<Component>,
|
||||||
#[serde(default)]
|
#[serde(default)]
|
||||||
pub realm: crate::realms::Mode,
|
pub realm: crate::realms::Mode,
|
||||||
|
#[serde(default, skip_serializing_if = "Option::is_none")]
|
||||||
|
pub(crate) mysql_snapshot: Option<crate::mysql_snapshot::Snapshot>,
|
||||||
}
|
}
|
||||||
|
|
||||||
const LOCATION_FILE: &str = "backup-location.json";
|
const LOCATION_FILE: &str = "backup-location.json";
|
||||||
@@ -334,6 +336,16 @@ pub fn create(root: &Path, meta: &Path, kind: Kind, trigger: Trigger, label: Opt
|
|||||||
return Err(e);
|
return Err(e);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
let mysql_snapshot = if kind == Kind::Full && trigger == Trigger::BeforeUpdate && cfg!(windows) && !crate::docker::is_docker(root) {
|
||||||
|
progress("Saving a complete stopped MySQL recovery copy");
|
||||||
|
match crate::mysql_snapshot::capture(root, &partial) {
|
||||||
|
Ok(snapshot) => Some(snapshot),
|
||||||
|
Err(error) => {
|
||||||
|
if let Ok(owned) = fsx::ensure_within(&backups_dir(meta), &partial) { let _ = fs::remove_dir_all(owned); }
|
||||||
|
return Err(error);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else { None };
|
||||||
let point = RecoveryPoint {
|
let point = RecoveryPoint {
|
||||||
realm: crate::realms::state(root)?.active,
|
realm: crate::realms::state(root)?.active,
|
||||||
schema: 1,
|
schema: 1,
|
||||||
@@ -344,6 +356,7 @@ pub fn create(root: &Path, meta: &Path, kind: Kind, trigger: Trigger, label: Opt
|
|||||||
created_at: chrono::Utc::now().to_rfc3339(),
|
created_at: chrono::Utc::now().to_rfc3339(),
|
||||||
manager_version: crate::MANAGER_VERSION.into(),
|
manager_version: crate::MANAGER_VERSION.into(),
|
||||||
components,
|
components,
|
||||||
|
mysql_snapshot,
|
||||||
};
|
};
|
||||||
fsx::atomic_write_json(&partial.join("backup.json"), &point)?;
|
fsx::atomic_write_json(&partial.join("backup.json"), &point)?;
|
||||||
fs::rename(&partial, &final_dir)?;
|
fs::rename(&partial, &final_dir)?;
|
||||||
@@ -375,6 +388,9 @@ pub fn verify(meta: &Path, id: &str) -> Result<VerifyReport> {
|
|||||||
let point = get(meta, id)?;
|
let point = get(meta, id)?;
|
||||||
let dir = point_dir(meta, id)?;
|
let dir = point_dir(meta, id)?;
|
||||||
let mut problems = Vec::new();
|
let mut problems = Vec::new();
|
||||||
|
if let Some(snapshot) = &point.mysql_snapshot {
|
||||||
|
if let Err(error) = crate::mysql_snapshot::verify(&dir, snapshot) { problems.push(error.to_string()); }
|
||||||
|
}
|
||||||
let mut names = std::collections::BTreeSet::new();
|
let mut names = std::collections::BTreeSet::new();
|
||||||
let mut schemas = std::collections::BTreeSet::new();
|
let mut schemas = std::collections::BTreeSet::new();
|
||||||
for c in &point.components {
|
for c in &point.components {
|
||||||
|
|||||||
@@ -0,0 +1,86 @@
|
|||||||
|
//! Signed channel pointers select one immutable package for an entire transaction.
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
use crate::{Error, Result};
|
||||||
|
use crate::pkgsource::{fetch_small, Source};
|
||||||
|
|
||||||
|
#[derive(Debug, Serialize, Deserialize)]
|
||||||
|
#[serde(rename_all = "camelCase", deny_unknown_fields)]
|
||||||
|
pub struct Pointer {
|
||||||
|
pub schema: u32,
|
||||||
|
pub channel: String,
|
||||||
|
pub version: String,
|
||||||
|
pub release_tag: String,
|
||||||
|
pub snapshot: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Deserialize, Serialize)]
|
||||||
|
#[serde(deny_unknown_fields)]
|
||||||
|
pub struct Envelope {
|
||||||
|
pub payload: String,
|
||||||
|
pub signature: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn verify(bytes: &[u8], channel: &str, key: &str) -> Result<Pointer> {
|
||||||
|
let envelope: Envelope = serde_json::from_slice(bytes).map_err(|e| Error::InvalidManifest(e.to_string()))?;
|
||||||
|
crate::signing::verify(envelope.payload.as_bytes(), &envelope.signature, key)?;
|
||||||
|
let pointer: Pointer = serde_json::from_str(&envelope.payload).map_err(|e| Error::InvalidManifest(e.to_string()))?;
|
||||||
|
if pointer.schema != 1 || pointer.channel != channel
|
||||||
|
|| pointer.release_tag != format!("server-{}", pointer.version)
|
||||||
|
|| pointer.version.is_empty()
|
||||||
|
|| !pointer.version.bytes().all(|b| b.is_ascii_digit() || b == b'.')
|
||||||
|
|| pointer.snapshot.len() != 64
|
||||||
|
|| !pointer.snapshot.bytes().all(|b| b.is_ascii_hexdigit()) {
|
||||||
|
return Err(Error::InvalidManifest("Invalid channel pointer".into()));
|
||||||
|
}
|
||||||
|
Ok(pointer)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn resolve(channel: &str) -> Result<Source> {
|
||||||
|
if channel != "stable" && channel != "edge" {
|
||||||
|
return Err(Error::InvalidManifest("Unknown release channel".into()));
|
||||||
|
}
|
||||||
|
let source = Source::Url("https://raw.githubusercontent.com/Corfirean/coa-server-build/channels".into());
|
||||||
|
let bytes = fetch_small(&source, &format!("{channel}.json"))?;
|
||||||
|
let pointer = verify(&bytes, channel, crate::signing::EMBEDDED_PUBLIC_KEY)?;
|
||||||
|
Ok(Source::Url(format!("https://github.com/Corfirean/coa-server-build/releases/download/{}", pointer.release_tag)))
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn sign(pointer: &Pointer, seed: &str) -> Result<Vec<u8>> {
|
||||||
|
use base64::{engine::general_purpose::STANDARD, Engine};
|
||||||
|
use ed25519_dalek::{Signer, SigningKey};
|
||||||
|
let seed: [u8; 32] = STANDARD.decode(seed.trim()).map_err(|_| Error::Invalid("Invalid signing key".into()))?
|
||||||
|
.try_into().map_err(|_| Error::Invalid("Invalid signing key length".into()))?;
|
||||||
|
let payload = serde_json::to_string(pointer).map_err(|e| Error::Invalid(e.to_string()))?;
|
||||||
|
let signature = STANDARD.encode(SigningKey::from_bytes(&seed).sign(payload.as_bytes()).to_bytes());
|
||||||
|
let bytes = serde_json::to_vec(&Envelope { payload, signature }).map_err(|e| Error::Invalid(e.to_string()))?;
|
||||||
|
verify(&bytes, &pointer.channel, crate::signing::EMBEDDED_PUBLIC_KEY)?;
|
||||||
|
Ok(bytes)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
use base64::{engine::general_purpose::STANDARD, Engine};
|
||||||
|
use ed25519_dalek::{Signer, SigningKey};
|
||||||
|
|
||||||
|
fn signed(pointer: &Pointer) -> (Vec<u8>, String) {
|
||||||
|
let sk = SigningKey::from_bytes(&[17; 32]);
|
||||||
|
let payload = serde_json::to_string(pointer).unwrap();
|
||||||
|
let signature = STANDARD.encode(sk.sign(payload.as_bytes()).to_bytes());
|
||||||
|
(serde_json::to_vec(&Envelope { payload, signature }).unwrap(), STANDARD.encode(sk.verifying_key().to_bytes()))
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn verifies_identity_signature_and_immutable_tag() {
|
||||||
|
let mut p = Pointer { schema: 1, channel: "stable".into(), version: "0.261010.40".into(), release_tag: "server-0.261010.40".into(), snapshot: "a".repeat(64) };
|
||||||
|
let (bytes, key) = signed(&p);
|
||||||
|
assert_eq!(verify(&bytes, "stable", &key).unwrap().version, p.version);
|
||||||
|
assert!(verify(&bytes, "edge", &key).is_err());
|
||||||
|
let mut changed: Envelope = serde_json::from_slice(&bytes).unwrap();
|
||||||
|
changed.payload = changed.payload.replace("40", "41");
|
||||||
|
assert!(verify(&serde_json::to_vec(&changed).unwrap(), "stable", &key).is_err());
|
||||||
|
p.release_tag = "stable".into();
|
||||||
|
let (bytes, key) = signed(&p);
|
||||||
|
assert!(verify(&bytes, "stable", &key).is_err());
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -10,7 +10,7 @@ use crate::backup;
|
|||||||
use crate::error::{Error, Result};
|
use crate::error::{Error, Result};
|
||||||
use crate::fsx;
|
use crate::fsx;
|
||||||
use crate::migrations::{apply_pending, status, Status};
|
use crate::migrations::{apply_pending, status, Status};
|
||||||
use crate::release::{collect_bots_sql, collect_core_sql};
|
use crate::release::{collect_bots_sql, collect_core_install_sql};
|
||||||
|
|
||||||
pub struct Params<'a> {
|
pub struct Params<'a> {
|
||||||
pub repack: &'a Path,
|
pub repack: &'a Path,
|
||||||
@@ -177,7 +177,7 @@ pub fn build(p: &Params, say: &dyn Fn(&str)) -> Result<()> {
|
|||||||
}
|
}
|
||||||
fsx::atomic_write_json(&repack_json, &cfg)?;
|
fsx::atomic_write_json(&repack_json, &cfg)?;
|
||||||
|
|
||||||
let mut sql = collect_core_sql(p.core)?;
|
let mut sql = collect_core_install_sql(p.core)?;
|
||||||
if let Some(b) = p.bots {
|
if let Some(b) = p.bots {
|
||||||
sql.extend(collect_bots_sql(b)?);
|
sql.extend(collect_bots_sql(b)?);
|
||||||
}
|
}
|
||||||
@@ -294,7 +294,7 @@ mod tests {
|
|||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn scaffolding_keeps_the_launcher_and_drops_runtime_state_and_live_data() {
|
fn scaffolding_keeps_the_launcher_and_drops_runtime_state_and_live_data() {
|
||||||
for keep in ["Runtime/python/python.exe", "Scripts/manage.py", "Settings/worldserver.conf.template", "mysql/bin/mysqld.exe", "mysql/share/english/errmsg.sys", "BugReport/relay.py", "Core/libssl-3-x64.dll", "README.txt"] {
|
for keep in ["Runtime/python/python.exe", "Scripts/manage.py", "Settings/worldserver.conf.template", "mysql/bin/mysqld.exe", "mysql/share/english/errmsg.sys", "mysql/lib/private/icudt.dat", "BugReport/relay.py", "Core/libssl-3-x64.dll", "README.txt"] {
|
||||||
assert!(scaffolding(keep), "{keep}");
|
assert!(scaffolding(keep), "{keep}");
|
||||||
}
|
}
|
||||||
for drop in [".state/world.json", "mysql/data/acore_world/x.ibd", "mysql/logs/error.log", "Core/worldserver.exe", "Core/Logs/Server.log", "BugReport/reports/a.json", "Source/server-source.zip", "Scripts/__pycache__/x.pyc", "Testing/notes.md", "mysql/data.7z"] {
|
for drop in [".state/world.json", "mysql/data/acore_world/x.ibd", "mysql/logs/error.log", "Core/worldserver.exe", "Core/Logs/Server.log", "BugReport/reports/a.json", "Source/server-source.zip", "Scripts/__pycache__/x.pyc", "Testing/notes.md", "mysql/data.7z"] {
|
||||||
|
|||||||
@@ -17,6 +17,9 @@ pub const ADDON_NAME: &str = "CoABotUI";
|
|||||||
const EXECUTABLES: [&str; 3] = ["Ascension.exe", "Wow.exe", "WoW.exe"];
|
const EXECUTABLES: [&str; 3] = ["Ascension.exe", "Wow.exe", "WoW.exe"];
|
||||||
|
|
||||||
pub fn is_running(client: &Path) -> bool {
|
pub fn is_running(client: &Path) -> bool {
|
||||||
|
if crate::platform::flavor() == crate::platform::Flavor::Docker {
|
||||||
|
return crate::wine::is_running(client, &EXECUTABLES);
|
||||||
|
}
|
||||||
EXECUTABLES.iter().any(|exe| {
|
EXECUTABLES.iter().any(|exe| {
|
||||||
let path = client.join(exe);
|
let path = client.join(exe);
|
||||||
let path = dunce::canonicalize(&path).unwrap_or(path);
|
let path = dunce::canonicalize(&path).unwrap_or(path);
|
||||||
@@ -307,6 +310,9 @@ pub fn install_addon(client: &Path, meta: &Path, source: &Path) -> Result<()> {
|
|||||||
/// Start the game client. The caller is responsible for making sure the server is ready first.
|
/// Start the game client. The caller is responsible for making sure the server is ready first.
|
||||||
pub fn launch(client: &Path) -> Result<u32> {
|
pub fn launch(client: &Path) -> Result<u32> {
|
||||||
let exe = find_exe(client).ok_or_else(|| Error::Invalid("The game client was not found.".into()))?;
|
let exe = find_exe(client).ok_or_else(|| Error::Invalid("The game client was not found.".into()))?;
|
||||||
|
if crate::platform::flavor() == crate::platform::Flavor::Docker {
|
||||||
|
return crate::wine::launch(client, exe);
|
||||||
|
}
|
||||||
let child = Command::new(client.join(exe)).current_dir(client).spawn()?;
|
let child = Command::new(client.join(exe)).current_dir(client).spawn()?;
|
||||||
Ok(child.id())
|
Ok(child.id())
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,249 @@
|
|||||||
|
//! Crash log discovery and human-friendly explanation for worldserver crashes.
|
||||||
|
|
||||||
|
use std::fs;
|
||||||
|
use std::path::{Path, PathBuf};
|
||||||
|
use std::time::SystemTime;
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
use crate::error::Result;
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
|
||||||
|
pub struct CrashItem {
|
||||||
|
pub id: String,
|
||||||
|
pub timestamp_ms: u64,
|
||||||
|
pub date_str: String,
|
||||||
|
pub title: String,
|
||||||
|
pub explanation: String,
|
||||||
|
pub category: String,
|
||||||
|
pub exception_code: Option<String>,
|
||||||
|
pub location: Option<String>,
|
||||||
|
pub function: Option<String>,
|
||||||
|
pub condition: Option<String>,
|
||||||
|
pub preview: String,
|
||||||
|
pub full_log: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Lists recent crash reports from `Core/Crashes`, sorted newest first.
|
||||||
|
pub fn list(root: &Path, limit: usize) -> Result<Vec<CrashItem>> {
|
||||||
|
let dir = root.join("Core/Crashes");
|
||||||
|
let mut files: Vec<(PathBuf, SystemTime)> = Vec::new();
|
||||||
|
if let Ok(entries) = fs::read_dir(&dir) {
|
||||||
|
for entry in entries.flatten() {
|
||||||
|
let path = entry.path();
|
||||||
|
if path.is_file() && path.extension().and_then(|e| e.to_str()) == Some("txt") {
|
||||||
|
let mtime = entry.metadata().and_then(|m| m.modified()).unwrap_or(SystemTime::UNIX_EPOCH);
|
||||||
|
files.push((path, mtime));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
files.sort_by_key(|(_, t)| std::cmp::Reverse(*t));
|
||||||
|
files.truncate(limit.max(1));
|
||||||
|
|
||||||
|
let mut items = Vec::new();
|
||||||
|
for (path, mtime) in files {
|
||||||
|
if let Ok(content) = fs::read_to_string(&path) {
|
||||||
|
let item = parse_crash_content(&path, mtime, &content);
|
||||||
|
items.push(item);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(items)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Parses crash report content and generates human-friendly titles and explanations.
|
||||||
|
pub fn parse_crash_content(path: &Path, mtime: SystemTime, content: &str) -> CrashItem {
|
||||||
|
let filename = path.file_name().unwrap_or_default().to_string_lossy().into_owned();
|
||||||
|
let timestamp_ms = mtime.duration_since(SystemTime::UNIX_EPOCH).map(|d| d.as_millis() as u64).unwrap_or(0);
|
||||||
|
|
||||||
|
let mut date_str = String::new();
|
||||||
|
let mut exception_code = None;
|
||||||
|
let mut location = None;
|
||||||
|
let mut function = None;
|
||||||
|
let mut condition = None;
|
||||||
|
|
||||||
|
let lines: Vec<&str> = content.lines().collect();
|
||||||
|
|
||||||
|
let mut in_assertion = false;
|
||||||
|
for line in &lines {
|
||||||
|
let trimmed = line.trim();
|
||||||
|
if trimmed.starts_with("Date ") && date_str.is_empty() {
|
||||||
|
date_str = trimmed.to_string();
|
||||||
|
} else if trimmed.starts_with("Exception code:") {
|
||||||
|
let parts: Vec<&str> = trimmed.split_whitespace().collect();
|
||||||
|
if parts.len() >= 3 {
|
||||||
|
exception_code = Some(parts[2].to_string());
|
||||||
|
}
|
||||||
|
} else if trimmed.contains(">> ASSERTION FAILED") {
|
||||||
|
in_assertion = true;
|
||||||
|
} else if in_assertion {
|
||||||
|
if trimmed.starts_with("# Location:") {
|
||||||
|
let loc = trimmed.trim_start_matches("# Location:").trim();
|
||||||
|
let clean = loc.rsplit(['\\', '/']).take(2).collect::<Vec<_>>();
|
||||||
|
location = Some(if clean.len() == 2 { format!("{}/{}", clean[1], clean[0]) } else { loc.to_string() });
|
||||||
|
} else if trimmed.starts_with("# Function:") {
|
||||||
|
function = Some(trimmed.trim_start_matches("# Function:").trim().to_string());
|
||||||
|
} else if trimmed.starts_with("# Condition:") {
|
||||||
|
condition = Some(trimmed.trim_start_matches("# Condition:").trim().to_string());
|
||||||
|
} else if trimmed.starts_with("#---") && condition.is_some() {
|
||||||
|
in_assertion = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if date_str.is_empty() {
|
||||||
|
if let Some(pos) = filename.find("_[") {
|
||||||
|
if let Some(end) = filename[pos..].find(']') {
|
||||||
|
date_str = filename[pos + 2..pos + end].replace('_', " ");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
let (category, title, explanation) = explain(exception_code.as_deref(), function.as_deref(), condition.as_deref(), content);
|
||||||
|
|
||||||
|
let preview_lines: Vec<&str> = lines.iter().take(25).copied().collect();
|
||||||
|
let preview = preview_lines.join("\n");
|
||||||
|
|
||||||
|
CrashItem {
|
||||||
|
id: filename,
|
||||||
|
timestamp_ms,
|
||||||
|
date_str,
|
||||||
|
title,
|
||||||
|
explanation,
|
||||||
|
category,
|
||||||
|
exception_code,
|
||||||
|
location,
|
||||||
|
function,
|
||||||
|
condition,
|
||||||
|
preview,
|
||||||
|
full_log: content.to_string(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn explain(code: Option<&str>, func: Option<&str>, cond: Option<&str>, full: &str) -> (String, String, String) {
|
||||||
|
let lower_full = full.to_lowercase();
|
||||||
|
let lower_func = func.map(|f| f.to_lowercase()).unwrap_or_default();
|
||||||
|
let lower_cond = cond.map(|c| c.to_lowercase()).unwrap_or_default();
|
||||||
|
|
||||||
|
if let Some(c) = code {
|
||||||
|
if c.eq_ignore_ascii_case("C0000420") {
|
||||||
|
if lower_func.contains("removefromgrid") || lower_cond.contains("isingrid") {
|
||||||
|
return (
|
||||||
|
"assertion".into(),
|
||||||
|
"Сбой удаления сущности из сетки карты (Grid / Despawn)".into(),
|
||||||
|
"Сервер попытался выгрузить объект (игрока, NPC или бота), который уже не находился в сетке карты. Обычно происходит при резком разрыве соединения, телепортации или одновременном деспавне нескольких сущностей.".into(),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
if lower_func.contains("map::") || lower_func.contains("grid::") {
|
||||||
|
return (
|
||||||
|
"assertion".into(),
|
||||||
|
"Ошибка обновления сетки игрового мира (Map Grid)".into(),
|
||||||
|
"Сбой при загрузке или обновлении клеток локации (Grid/Cell). Может быть вызван перемещением сущностей через границы чанков.".into(),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
if lower_func.contains("playerbot") || lower_func.contains("aiplayerbot") {
|
||||||
|
return (
|
||||||
|
"assertion".into(),
|
||||||
|
"Ошибка в модуле ботов (Playerbots)".into(),
|
||||||
|
"Внутренний сбой в логике ИИ ботов (экипировка, заклинание или поиск пути).".into(),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
let cond_label = cond.unwrap_or("Assert condition failed");
|
||||||
|
return (
|
||||||
|
"assertion".into(),
|
||||||
|
format!("Сработала внутренняя проверка ядра ({cond_label})"),
|
||||||
|
format!("Сервер обнаружил нарушение целостности данных в функции {}. Выполнение было аварийно остановлено.", func.unwrap_or("неизвестно")),
|
||||||
|
);
|
||||||
|
} else if c.eq_ignore_ascii_case("C0000005") {
|
||||||
|
return (
|
||||||
|
"access_violation".into(),
|
||||||
|
"Нарушение доступа к памяти (Access Violation)".into(),
|
||||||
|
"Попытка чтения или записи по некорректному адресу памяти (разыменование null-указателя или освобождённого объекта).".into(),
|
||||||
|
);
|
||||||
|
} else if c.eq_ignore_ascii_case("C00000FD") {
|
||||||
|
return (
|
||||||
|
"stack_overflow".into(),
|
||||||
|
"Переполнение стека (Stack Overflow)".into(),
|
||||||
|
"Исчерпание стека вызовов, вызванное бесконечной рекурсией или слишком глубоким стеком вызовов функций.".into(),
|
||||||
|
);
|
||||||
|
} else if c.eq_ignore_ascii_case("E06D7363") {
|
||||||
|
if lower_full.contains("bad_alloc") {
|
||||||
|
return (
|
||||||
|
"out_of_memory".into(),
|
||||||
|
"Нехватка оперативной памяти (Out of Memory)".into(),
|
||||||
|
"Серверу не удалось выделить оперативную память (std::bad_alloc). Проверьте объем доступной RAM.".into(),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
return (
|
||||||
|
"exception".into(),
|
||||||
|
"Необработанное исключение C++ (C++ Exception)".into(),
|
||||||
|
"Произошло критическое исключение C++, которое не было перехвачено ядром сервера.".into(),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if lower_full.contains("mysql server has gone away") || lower_full.contains("connection lost") {
|
||||||
|
return (
|
||||||
|
"database".into(),
|
||||||
|
"Потеряна связь с базой данных (MySQL)".into(),
|
||||||
|
"Связь сервера с СУБД MySQL была прервана или служба базы данных упала.".into(),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
if lower_full.contains("address already in use") || lower_full.contains("bind failed") {
|
||||||
|
return (
|
||||||
|
"network".into(),
|
||||||
|
"Сетевой порт уже занят".into(),
|
||||||
|
"Порт мира, авторизации или базы данных уже занят другим приложением.".into(),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
(
|
||||||
|
"generic".into(),
|
||||||
|
"Непредвиденный сбой процесса сервера".into(),
|
||||||
|
"Процесс worldserver аварийно завершился. Детали и стек вызовов доступны в полном тексте отчёта.".into(),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn parses_assertion_report() {
|
||||||
|
let report = r#"Revision: AzerothCore rev. df5bcdf26092 2026-10-02 22:08:42 +0500 (coa-bots branch) (Win64, RelWithDebInfo, Static)
|
||||||
|
Date 3:10:2026. Time 20:20
|
||||||
|
//=====================================================
|
||||||
|
Exception code: C0000420 Ein Assertionsfehler ist aufgetreten.
|
||||||
|
|
||||||
|
Assertion message: #----------------------------------------------------------------------#
|
||||||
|
|
||||||
|
>> ASSERTION FAILED
|
||||||
|
|
||||||
|
# Location: D:\a\coa-server-build\src\server\game\Entities\Object\Object.h:376
|
||||||
|
# Function: GridObject<class Player>::RemoveFromGrid
|
||||||
|
# Condition: IsInGrid()
|
||||||
|
|
||||||
|
#----------------------------------------------------------------------#
|
||||||
|
|
||||||
|
Fault address: 00007FF7ECD3645E
|
||||||
|
"#;
|
||||||
|
let item = parse_crash_content(Path::new("dummy_worldserver.exe_[3-10_20-20-51].txt"), SystemTime::UNIX_EPOCH, report);
|
||||||
|
println!("ITEM: {item:#?}");
|
||||||
|
assert_eq!(item.exception_code.as_deref(), Some("C0000420"));
|
||||||
|
assert_eq!(item.category, "assertion");
|
||||||
|
assert_eq!(item.condition.as_deref(), Some("IsInGrid()"));
|
||||||
|
assert_eq!(item.function.as_deref(), Some("GridObject<class Player>::RemoveFromGrid"));
|
||||||
|
assert!(item.title.contains("Grid"));
|
||||||
|
assert!(item.explanation.contains("сетке карты"));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn parses_access_violation() {
|
||||||
|
let report = r#"Date 4:10:2026. Time 12:00
|
||||||
|
Exception code: C0000005 ACCESS_VIOLATION
|
||||||
|
Fault address: 00007FF7ECD3645E
|
||||||
|
"#;
|
||||||
|
let item = parse_crash_content(Path::new("crash.txt"), SystemTime::UNIX_EPOCH, report);
|
||||||
|
assert_eq!(item.exception_code.as_deref(), Some("C0000005"));
|
||||||
|
assert_eq!(item.category, "access_violation");
|
||||||
|
assert!(item.title.contains("Access Violation"));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,620 @@
|
|||||||
|
//! Management of client-side patches and assets for Custom Races.
|
||||||
|
//!
|
||||||
|
//! Handles detecting, enabling/disabling (via `.disabled` extension renaming),
|
||||||
|
//! and downloading/extracting client patches (Esteria and additional races)
|
||||||
|
//! into the player's WoW client directory.
|
||||||
|
|
||||||
|
use std::fs::{self, File};
|
||||||
|
use std::io::{self, Read, Write};
|
||||||
|
use std::path::{Path, PathBuf};
|
||||||
|
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
use crate::download::Cancel;
|
||||||
|
use crate::error::{Error, Result};
|
||||||
|
use crate::fsx;
|
||||||
|
|
||||||
|
pub const CLIENT_VERSION: &str = "1.5";
|
||||||
|
pub const MANIFEST_FILENAME: &str = "custom_races_patch_manifest.txt";
|
||||||
|
pub const ARCHIVES: &[(&str, &str)] = &[
|
||||||
|
(
|
||||||
|
"CoA-Custom-1.5-main-20261009-cb2a0ca4.zip",
|
||||||
|
"https://github.com/ilusixn/azerothcore-wotlk-coa/releases/download/coa-custom-1.5/CoA-Custom-1.5-main-20261009-cb2a0ca4.zip",
|
||||||
|
),
|
||||||
|
(
|
||||||
|
"CoA-Custom-1.5-client-part1.zip",
|
||||||
|
"https://github.com/ilusixn/azerothcore-wotlk-coa/releases/download/coa-custom-1.5/CoA-Custom-1.5-client-part1.zip",
|
||||||
|
),
|
||||||
|
(
|
||||||
|
"CoA-Custom-1.5-client-part2.zip",
|
||||||
|
"https://github.com/ilusixn/azerothcore-wotlk-coa/releases/download/coa-custom-1.5/CoA-Custom-1.5-client-part2.zip",
|
||||||
|
),
|
||||||
|
];
|
||||||
|
|
||||||
|
pub const RACE_MPQS: &[&str] = &[
|
||||||
|
"patch-T.MPQ",
|
||||||
|
"patch-ZE1.MPQ",
|
||||||
|
"patch-ZE2.MPQ",
|
||||||
|
"patch-ZE3.MPQ",
|
||||||
|
"patch-ZE5.MPQ",
|
||||||
|
"patch-ZE6.MPQ",
|
||||||
|
"patch-ZE7.MPQ",
|
||||||
|
"patch-ZE8.MPQ",
|
||||||
|
"patch-ZE9.MPQ",
|
||||||
|
"patch-ZEA.MPQ",
|
||||||
|
"patch-ZG.MPQ",
|
||||||
|
"patch-ZH.MPQ",
|
||||||
|
"patch-ZHA.MPQ",
|
||||||
|
"patch-ZHM.MPQ",
|
||||||
|
"patch-ZM.MPQ",
|
||||||
|
"patch-ZVU.MPQ",
|
||||||
|
"patch-ZES.MPQ",
|
||||||
|
"patch-ZJ.MPQ",
|
||||||
|
"patch-ZZE.MPQ",
|
||||||
|
"patch-ZZR.MPQ",
|
||||||
|
];
|
||||||
|
|
||||||
|
pub const EXCLUDED_BOT_RACES_RECOMMENDED: &str =
|
||||||
|
"19,27,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128";
|
||||||
|
|
||||||
|
pub const EXCLUDED_BOT_RACES_EXPERIMENTAL: &str =
|
||||||
|
"16,19,27,32,50,52,53,65,66,67,68,69,70,71,72,74,77,80,81";
|
||||||
|
|
||||||
|
/// Finds all active playerbots.conf files on this server (root, coa-bots folder, and secondary realm).
|
||||||
|
pub fn playerbots_conf_paths(root: &Path) -> Vec<PathBuf> {
|
||||||
|
let mut paths = Vec::new();
|
||||||
|
let candidates = [
|
||||||
|
root.join("Core/configs/modules/playerbots.conf"),
|
||||||
|
root.join("coa-bots/Core/configs/modules/playerbots.conf"),
|
||||||
|
root.join("coa-bots/core/configs/modules/playerbots.conf"),
|
||||||
|
crate::multiworld::root(root).join("Core/configs/modules/playerbots.conf"),
|
||||||
|
];
|
||||||
|
for path in candidates {
|
||||||
|
if path.is_file() {
|
||||||
|
paths.push(path);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if paths.is_empty() {
|
||||||
|
for dist in [
|
||||||
|
root.join("Core/configs/modules/playerbots.conf.dist"),
|
||||||
|
root.join("coa-bots/Core/configs/modules/playerbots.conf.dist"),
|
||||||
|
] {
|
||||||
|
if dist.is_file() {
|
||||||
|
let target = dist.with_extension("");
|
||||||
|
if fs::copy(&dist, &target).is_ok() {
|
||||||
|
paths.push(target);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
paths
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Checks whether playerbots are configured to allow custom races.
|
||||||
|
/// Returns true if AiPlayerbot.ExcludedBotRaces exists and does not exclude general custom races.
|
||||||
|
pub fn is_bot_custom_races_allowed(root: &Path) -> Option<bool> {
|
||||||
|
for path in playerbots_conf_paths(root) {
|
||||||
|
if let Ok(bytes) = fs::read(&path) {
|
||||||
|
if let Ok(conf) = crate::config::parser::ConfFile::parse_bytes(&bytes) {
|
||||||
|
if let Some(val) = conf.get("AiPlayerbot.ExcludedBotRaces") {
|
||||||
|
let clean = val.trim().trim_matches(['"', '\'']);
|
||||||
|
return Some(!clean.contains("33") && !clean.contains("128"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
None
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Sets AiPlayerbot.ExcludedBotRaces in all discovered playerbots.conf files.
|
||||||
|
pub fn sync_bot_races_config(root: &Path, allow_custom_races: bool) -> Result<()> {
|
||||||
|
let excluded = if allow_custom_races {
|
||||||
|
EXCLUDED_BOT_RACES_EXPERIMENTAL
|
||||||
|
} else {
|
||||||
|
EXCLUDED_BOT_RACES_RECOMMENDED
|
||||||
|
};
|
||||||
|
for path in playerbots_conf_paths(root) {
|
||||||
|
if let Ok(bytes) = fs::read(&path) {
|
||||||
|
if let Ok(mut conf) = crate::config::parser::ConfFile::parse_bytes(&bytes) {
|
||||||
|
conf.set(
|
||||||
|
"AiPlayerbot.ExcludedBotRaces",
|
||||||
|
&format!("\"{excluded}\""),
|
||||||
|
&[
|
||||||
|
"CoA Custom: races new random bots never get",
|
||||||
|
"Off (recommended): excludes all added races",
|
||||||
|
"On (experimental): allows stable added races",
|
||||||
|
],
|
||||||
|
);
|
||||||
|
fsx::atomic_write(&path, conf.to_text().as_bytes())?;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
|
#[serde(rename_all = "kebab-case")]
|
||||||
|
pub enum ClientPatchState {
|
||||||
|
NotInstalled,
|
||||||
|
Enabled,
|
||||||
|
Disabled,
|
||||||
|
PartiallyInstalled,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct ClientPatchStatus {
|
||||||
|
pub state: ClientPatchState,
|
||||||
|
pub installed_mpqs: usize,
|
||||||
|
pub total_mpqs: usize,
|
||||||
|
pub has_root_files: bool,
|
||||||
|
pub client_path: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Inspect the client folder and determine the state of custom races patches.
|
||||||
|
pub fn client_patch_status(client_path: &Path) -> ClientPatchStatus {
|
||||||
|
let data_dir = client_path.join("Data");
|
||||||
|
let mut enabled_count = 0;
|
||||||
|
let mut disabled_count = 0;
|
||||||
|
|
||||||
|
for mpq in RACE_MPQS {
|
||||||
|
if data_dir.join(format!("{mpq}.disabled")).is_file() {
|
||||||
|
disabled_count += 1;
|
||||||
|
} else if data_dir.join(mpq).is_file() {
|
||||||
|
enabled_count += 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
let has_root = client_path.join("EsteriaAppearance.dll").is_file()
|
||||||
|
|| client_path.join("dinput8.dll").is_file()
|
||||||
|
|| client_path.join("dinput8.dll.disabled").is_file();
|
||||||
|
|
||||||
|
let total = RACE_MPQS.len();
|
||||||
|
let current_version = fs::read_to_string(client_path.join(MANIFEST_FILENAME)).ok()
|
||||||
|
.is_some_and(|manifest| manifest.lines().any(|line| line == format!("# CoA Custom {CLIENT_VERSION}")));
|
||||||
|
let state = if enabled_count == total && current_version && client_path.join("dinput8.dll").is_file() {
|
||||||
|
ClientPatchState::Enabled
|
||||||
|
} else if disabled_count == total && current_version && client_path.join("dinput8.dll.disabled").is_file() {
|
||||||
|
ClientPatchState::Disabled
|
||||||
|
} else if (enabled_count + disabled_count) > 0 {
|
||||||
|
ClientPatchState::PartiallyInstalled
|
||||||
|
} else {
|
||||||
|
ClientPatchState::NotInstalled
|
||||||
|
};
|
||||||
|
|
||||||
|
ClientPatchStatus {
|
||||||
|
state,
|
||||||
|
installed_mpqs: enabled_count + disabled_count,
|
||||||
|
total_mpqs: total,
|
||||||
|
has_root_files: has_root,
|
||||||
|
client_path: Some(client_path.to_string_lossy().into_owned()),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Enable or disable client patches by renaming MPQs and `dinput8.dll` with `.disabled`.
|
||||||
|
pub fn set_client_patch_enabled(client_path: &Path, enabled: bool) -> Result<()> {
|
||||||
|
if !client_path.is_dir() {
|
||||||
|
return Err(Error::Invalid("Game client directory not found.".into()));
|
||||||
|
}
|
||||||
|
|
||||||
|
if crate::client::is_running(client_path) {
|
||||||
|
return Err(Error::Invalid("Close the game before changing custom races patches.".into()));
|
||||||
|
}
|
||||||
|
if !client_path.join(MANIFEST_FILENAME).is_file()
|
||||||
|
&& !RACE_MPQS.iter().skip(1).any(|name| client_path.join("Data").join(name).is_file()
|
||||||
|
|| client_path.join("Data").join(format!("{name}.disabled")).is_file()) {
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
let mut paths: Vec<PathBuf> = RACE_MPQS.iter().map(|name| client_path.join("Data").join(name)).collect();
|
||||||
|
if let Ok(manifest) = fs::read_to_string(client_path.join(MANIFEST_FILENAME)) {
|
||||||
|
for line in manifest.lines() {
|
||||||
|
if let Some(name) = line.strip_prefix("MPQ:") {
|
||||||
|
if name.contains(['/', '\\']) || !name.to_ascii_lowercase().ends_with(".mpq") {
|
||||||
|
return Err(Error::Invalid("Invalid custom races patch manifest.".into()));
|
||||||
|
}
|
||||||
|
paths.push(fsx::safe_join(&client_path.join("Data"), name)?);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
paths.sort();
|
||||||
|
paths.dedup();
|
||||||
|
paths.push(client_path.join("dinput8.dll"));
|
||||||
|
paths.push(client_path.join("Ascension.exe"));
|
||||||
|
for active in paths {
|
||||||
|
let disabled = active.with_extension(format!("{}.disabled", active.extension().unwrap_or_default().to_string_lossy()));
|
||||||
|
let original = active.with_extension(format!("{}.original", active.extension().unwrap_or_default().to_string_lossy()));
|
||||||
|
if enabled && disabled.is_file() {
|
||||||
|
if active.is_file() {
|
||||||
|
if !original.is_file() {
|
||||||
|
return Err(Error::Invalid(format!("Cannot replace existing {} without an original backup.", active.display())));
|
||||||
|
}
|
||||||
|
fs::remove_file(&active)?;
|
||||||
|
}
|
||||||
|
fs::rename(&disabled, &active)?;
|
||||||
|
} else if !enabled && active.is_file() && !disabled.is_file() {
|
||||||
|
if active.file_name().is_some_and(|name| name == "Ascension.exe") && !original.is_file() {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
fs::rename(&active, &disabled)?;
|
||||||
|
if original.is_file() {
|
||||||
|
fs::copy(&original, &active)?;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
tracing::info!(enabled, "custom races client patches toggled");
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn verify_archive(path: &Path, filename: &str) -> Result<()> {
|
||||||
|
let expected = match filename {
|
||||||
|
"CoA-Custom-1.5-main-20261009-cb2a0ca4.zip" => "117f5d99add18191676be6648fb0f2e99019a06c18705c71454e371e7df2afd2",
|
||||||
|
"CoA-Custom-1.5-client-part1.zip" => "19eb372805b3268653914da03377d67f056e5b50d818a8a06a5f260aad03211e",
|
||||||
|
"CoA-Custom-1.5-client-part2.zip" => "122f2882da255913e01610e33c6446ded897fecbe60b6d5ee026149becf8f278",
|
||||||
|
_ => return Err(Error::Invalid("Unknown custom races archive.".into())),
|
||||||
|
};
|
||||||
|
if fsx::sha256_file(path)? != expected {
|
||||||
|
return Err(Error::Invalid(format!("Custom races archive {filename} failed verification. Remove it and try again.")));
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Locate an archive locally in Downloads or cache, or download it from GitHub.
|
||||||
|
fn resolve_or_download_archive(
|
||||||
|
filename: &str,
|
||||||
|
url: &str,
|
||||||
|
client: &reqwest::blocking::Client,
|
||||||
|
cancel: &Cancel,
|
||||||
|
report: &dyn Fn(&str, f32),
|
||||||
|
base_percent: f32,
|
||||||
|
percent_slice: f32,
|
||||||
|
) -> Result<PathBuf> {
|
||||||
|
// 1. Check user Downloads folder
|
||||||
|
if let Some(userprofile) = std::env::var_os("USERPROFILE") {
|
||||||
|
let downloads = PathBuf::from(userprofile).join("Downloads");
|
||||||
|
let candidate = downloads.join(filename);
|
||||||
|
if candidate.is_file() {
|
||||||
|
if let Ok(meta) = candidate.metadata() {
|
||||||
|
if meta.len() > 1000 {
|
||||||
|
tracing::info!(path = %candidate.display(), "using existing archive in Downloads");
|
||||||
|
verify_archive(&candidate, filename)?;
|
||||||
|
return Ok(candidate);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 2. Check temp / cache directory
|
||||||
|
let cache_dir = std::env::temp_dir().join("coa-client-races");
|
||||||
|
fs::create_dir_all(&cache_dir)?;
|
||||||
|
let target = cache_dir.join(filename);
|
||||||
|
if target.is_file() {
|
||||||
|
if let Ok(meta) = target.metadata() {
|
||||||
|
if meta.len() > 1000 {
|
||||||
|
verify_archive(&target, filename)?;
|
||||||
|
return Ok(target);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 3. Download from GitHub Releases
|
||||||
|
report(&format!("Downloading {filename}..."), base_percent);
|
||||||
|
let part_path = cache_dir.join(format!("{filename}.part"));
|
||||||
|
|
||||||
|
let resp = client
|
||||||
|
.get(url)
|
||||||
|
.send()
|
||||||
|
.map_err(|e| Error::NetworkUnreachable(format!("Could not reach download server: {e}")))?;
|
||||||
|
|
||||||
|
if !resp.status().is_success() {
|
||||||
|
return Err(Error::NetworkUnreachable(format!(
|
||||||
|
"Download failed with status {} for {url}",
|
||||||
|
resp.status()
|
||||||
|
)));
|
||||||
|
}
|
||||||
|
|
||||||
|
let total_bytes = resp.content_length().unwrap_or(0);
|
||||||
|
let mut downloaded = 0u64;
|
||||||
|
let mut src = resp;
|
||||||
|
let mut dst = File::create(&part_path)?;
|
||||||
|
|
||||||
|
let mut buf = [0u8; 64 * 1024];
|
||||||
|
let mut last_report = std::time::Instant::now();
|
||||||
|
|
||||||
|
loop {
|
||||||
|
if cancel.is_set() {
|
||||||
|
let _ = fs::remove_file(&part_path);
|
||||||
|
return Err(Error::Invalid("Operation cancelled.".into()));
|
||||||
|
}
|
||||||
|
|
||||||
|
let n = src
|
||||||
|
.read(&mut buf)
|
||||||
|
.map_err(|e| Error::NetworkUnreachable(format!("Download interrupted: {e}")))?;
|
||||||
|
if n == 0 {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
dst.write_all(&buf[..n])?;
|
||||||
|
downloaded += n as u64;
|
||||||
|
|
||||||
|
if last_report.elapsed() > std::time::Duration::from_millis(200) {
|
||||||
|
let ratio = if total_bytes > 0 {
|
||||||
|
(downloaded as f32 / total_bytes as f32).clamp(0.0, 1.0)
|
||||||
|
} else {
|
||||||
|
0.5
|
||||||
|
};
|
||||||
|
report(
|
||||||
|
&format!(
|
||||||
|
"Downloading {filename} ({:.1} MB)...",
|
||||||
|
downloaded as f64 / 1_048_576.0
|
||||||
|
),
|
||||||
|
base_percent + ratio * percent_slice,
|
||||||
|
);
|
||||||
|
last_report = std::time::Instant::now();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
dst.flush()?;
|
||||||
|
drop(dst);
|
||||||
|
|
||||||
|
verify_archive(&part_path, filename)?;
|
||||||
|
fs::rename(&part_path, &target)?;
|
||||||
|
Ok(target)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Download (if needed) and extract custom races client assets into the target WoW client.
|
||||||
|
pub fn install_client_patches(
|
||||||
|
client_path: &Path,
|
||||||
|
cancel: &Cancel,
|
||||||
|
report: &dyn Fn(&str, f32),
|
||||||
|
) -> Result<()> {
|
||||||
|
if !client_path.is_dir() {
|
||||||
|
return Err(Error::Invalid("Game client directory does not exist.".into()));
|
||||||
|
}
|
||||||
|
|
||||||
|
if crate::client::is_running(client_path) {
|
||||||
|
return Err(Error::Invalid("Close the game before installing custom races patches.".into()));
|
||||||
|
}
|
||||||
|
let data_dir = client_path.join("Data");
|
||||||
|
fs::create_dir_all(&data_dir)?;
|
||||||
|
|
||||||
|
// 1. Back up original Ascension.exe and patch-T.MPQ if they exist and haven't been backed up yet
|
||||||
|
let exe = client_path.join("Ascension.exe");
|
||||||
|
let exe_bak = client_path.join("Ascension.exe.original");
|
||||||
|
if exe.is_file() && !exe_bak.is_file() {
|
||||||
|
report("Backing up original Ascension.exe...", 0.02);
|
||||||
|
fs::copy(&exe, &exe_bak)?;
|
||||||
|
}
|
||||||
|
|
||||||
|
let t_mpq = data_dir.join("patch-T.MPQ");
|
||||||
|
let t_mpq_bak = data_dir.join("patch-T.MPQ.original");
|
||||||
|
if t_mpq.is_file() && !t_mpq_bak.is_file() {
|
||||||
|
report("Backing up original patch-T.MPQ...", 0.04);
|
||||||
|
fs::copy(&t_mpq, &t_mpq_bak)?;
|
||||||
|
}
|
||||||
|
|
||||||
|
let dll = client_path.join("dinput8.dll");
|
||||||
|
let dll_backup = client_path.join("dinput8.dll.original");
|
||||||
|
if dll.is_file() && !dll_backup.is_file() {
|
||||||
|
fs::copy(&dll, &dll_backup)?;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 2. Resolve/download archives (0.05 .. 0.50)
|
||||||
|
let http = reqwest::blocking::Client::builder()
|
||||||
|
.user_agent(concat!("CoA-Server-Manager/", env!("CARGO_PKG_VERSION")))
|
||||||
|
.timeout(std::time::Duration::from_secs(600))
|
||||||
|
.build()
|
||||||
|
.map_err(|e| Error::Invalid(format!("Cannot prepare downloader: {e}")))?;
|
||||||
|
|
||||||
|
let mut resolved_archives = Vec::new();
|
||||||
|
let n_archives = ARCHIVES.len() as f32;
|
||||||
|
for (i, (fname, url)) in ARCHIVES.iter().enumerate() {
|
||||||
|
let base_pct = 0.05 + (i as f32 / n_archives) * 0.45;
|
||||||
|
let slice = 0.45 / n_archives;
|
||||||
|
let archive_path =
|
||||||
|
resolve_or_download_archive(fname, url, &http, cancel, report, base_pct, slice)?;
|
||||||
|
resolved_archives.push(archive_path);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 3. Extract archives (0.50 .. 0.95)
|
||||||
|
let mut installed_mpqs = Vec::new();
|
||||||
|
let mut installed_roots = Vec::new();
|
||||||
|
|
||||||
|
for (i, arch_path) in resolved_archives.iter().enumerate() {
|
||||||
|
if cancel.is_set() {
|
||||||
|
return Err(Error::Invalid("Operation cancelled.".into()));
|
||||||
|
}
|
||||||
|
|
||||||
|
let arch_name = arch_path
|
||||||
|
.file_name()
|
||||||
|
.map(|n| n.to_string_lossy().into_owned())
|
||||||
|
.unwrap_or_default();
|
||||||
|
report(
|
||||||
|
&format!("Unpacking {arch_name}..."),
|
||||||
|
0.50 + (i as f32 / n_archives) * 0.45,
|
||||||
|
);
|
||||||
|
|
||||||
|
let file = File::open(arch_path)?;
|
||||||
|
let mut zip = zip::ZipArchive::new(file)
|
||||||
|
.map_err(|e| Error::Invalid(format!("Failed to open zip {arch_name}: {e}")))?;
|
||||||
|
|
||||||
|
let num_files = zip.len();
|
||||||
|
for file_idx in 0..num_files {
|
||||||
|
if cancel.is_set() {
|
||||||
|
return Err(Error::Invalid("Operation cancelled.".into()));
|
||||||
|
}
|
||||||
|
|
||||||
|
let mut zfile = zip
|
||||||
|
.by_index(file_idx)
|
||||||
|
.map_err(|e| Error::Invalid(format!("Zip entry error in {arch_name}: {e}")))?;
|
||||||
|
|
||||||
|
if zfile.is_dir() {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
let zname = zfile.name().to_string();
|
||||||
|
let zname_norm = zname.replace('\\', "/");
|
||||||
|
|
||||||
|
if zname_norm.contains("files/client/") {
|
||||||
|
let base = Path::new(&zname_norm)
|
||||||
|
.file_name()
|
||||||
|
.map(|n| n.to_string_lossy().into_owned())
|
||||||
|
.unwrap_or_default();
|
||||||
|
|
||||||
|
if base.to_ascii_lowercase().ends_with(".mpq") {
|
||||||
|
let dest = data_dir.join(&base);
|
||||||
|
let mut out = File::create(&dest)?;
|
||||||
|
io::copy(&mut zfile, &mut out)?;
|
||||||
|
let disabled = data_dir.join(format!("{base}.disabled"));
|
||||||
|
if disabled.is_file() { fs::remove_file(disabled)?; }
|
||||||
|
installed_mpqs.push(base);
|
||||||
|
} else if base.eq_ignore_ascii_case("dinput8.dll") {
|
||||||
|
let dest = client_path.join(&base);
|
||||||
|
let mut out = File::create(&dest)?;
|
||||||
|
io::copy(&mut zfile, &mut out)?;
|
||||||
|
let disabled = client_path.join(format!("{base}.disabled"));
|
||||||
|
if disabled.is_file() { fs::remove_file(disabled)?; }
|
||||||
|
installed_roots.push(base);
|
||||||
|
}
|
||||||
|
} else if zname_norm.contains("files/client_root/") {
|
||||||
|
let base = Path::new(&zname_norm)
|
||||||
|
.file_name()
|
||||||
|
.map(|n| n.to_string_lossy().into_owned())
|
||||||
|
.unwrap_or_default();
|
||||||
|
|
||||||
|
if !base.is_empty() {
|
||||||
|
let dest = client_path.join(&base);
|
||||||
|
let mut out = File::create(&dest)?;
|
||||||
|
io::copy(&mut zfile, &mut out)?;
|
||||||
|
let disabled = client_path.join(format!("{base}.disabled"));
|
||||||
|
if disabled.is_file() { fs::remove_file(disabled)?; }
|
||||||
|
installed_roots.push(base);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if !RACE_MPQS.iter().all(|name| installed_mpqs.iter().any(|installed| installed == name)) {
|
||||||
|
return Err(Error::Invalid("Custom races archives are missing required client patches.".into()));
|
||||||
|
}
|
||||||
|
|
||||||
|
// 4. Record manifest
|
||||||
|
report("Finalizing manifest...", 0.98);
|
||||||
|
let manifest_path = client_path.join(MANIFEST_FILENAME);
|
||||||
|
installed_mpqs.sort();
|
||||||
|
installed_mpqs.dedup();
|
||||||
|
installed_roots.sort();
|
||||||
|
installed_roots.dedup();
|
||||||
|
|
||||||
|
let mut manifest_body = format!("# CoA Custom {CLIENT_VERSION}\n# Custom Race MPQ files\n");
|
||||||
|
for m in &installed_mpqs {
|
||||||
|
manifest_body.push_str(&format!("MPQ:{m}\n"));
|
||||||
|
}
|
||||||
|
manifest_body.push_str("# Custom Race root files\n");
|
||||||
|
for r in &installed_roots {
|
||||||
|
manifest_body.push_str(&format!("ROOT:{r}\n"));
|
||||||
|
}
|
||||||
|
|
||||||
|
fsx::atomic_write(&manifest_path, manifest_body.as_bytes())?;
|
||||||
|
report("Custom races client patches installed successfully!", 1.0);
|
||||||
|
tracing::info!(
|
||||||
|
mpqs = installed_mpqs.len(),
|
||||||
|
roots = installed_roots.len(),
|
||||||
|
"custom races client patch installation complete"
|
||||||
|
);
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn disabling_restores_original_client_files_and_enabling_restores_custom_files() {
|
||||||
|
let temp = tempfile::tempdir().unwrap();
|
||||||
|
let data = temp.path().join("Data");
|
||||||
|
fs::create_dir_all(&data).unwrap();
|
||||||
|
for path in [data.join("patch-T.MPQ"), temp.path().join("Ascension.exe"), temp.path().join("dinput8.dll")] {
|
||||||
|
fs::write(&path, b"custom").unwrap();
|
||||||
|
let backup = path.with_extension(format!("{}.original", path.extension().unwrap().to_string_lossy()));
|
||||||
|
fs::write(&backup, b"original").unwrap();
|
||||||
|
}
|
||||||
|
fs::write(temp.path().join(MANIFEST_FILENAME), "MPQ:patch-T.MPQ\n").unwrap();
|
||||||
|
set_client_patch_enabled(temp.path(), false).unwrap();
|
||||||
|
assert_eq!(fs::read(data.join("patch-T.MPQ")).unwrap(), b"original");
|
||||||
|
assert_eq!(fs::read(temp.path().join("Ascension.exe")).unwrap(), b"original");
|
||||||
|
set_client_patch_enabled(temp.path(), true).unwrap();
|
||||||
|
assert_eq!(fs::read(data.join("patch-T.MPQ")).unwrap(), b"custom");
|
||||||
|
assert_eq!(fs::read(temp.path().join("Ascension.exe")).unwrap(), b"custom");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn an_old_complete_installation_requires_an_update() {
|
||||||
|
let temp = tempfile::tempdir().unwrap();
|
||||||
|
fs::create_dir_all(temp.path().join("Data")).unwrap();
|
||||||
|
for name in RACE_MPQS { fs::write(temp.path().join("Data").join(name), b"old patch").unwrap(); }
|
||||||
|
fs::write(temp.path().join("dinput8.dll"), b"old runtime").unwrap();
|
||||||
|
fs::write(temp.path().join(MANIFEST_FILENAME), "# CoA Custom 1.4\n").unwrap();
|
||||||
|
assert_eq!(client_patch_status(temp.path()).state, ClientPatchState::PartiallyInstalled);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn an_unpatched_client_is_left_untouched() {
|
||||||
|
let temp = tempfile::tempdir().unwrap();
|
||||||
|
fs::create_dir_all(temp.path().join("Data")).unwrap();
|
||||||
|
fs::write(temp.path().join("Data/patch-T.MPQ"), b"original").unwrap();
|
||||||
|
set_client_patch_enabled(temp.path(), false).unwrap();
|
||||||
|
assert_eq!(fs::read(temp.path().join("Data/patch-T.MPQ")).unwrap(), b"original");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn corrupt_downloads_are_rejected() {
|
||||||
|
let temp = tempfile::NamedTempFile::new().unwrap();
|
||||||
|
fs::write(temp.path(), b"corrupt archive").unwrap();
|
||||||
|
assert!(verify_archive(temp.path(), ARCHIVES[0].0).is_err());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_patch_status_and_toggle() {
|
||||||
|
let temp = tempfile::tempdir().unwrap();
|
||||||
|
let client_path = temp.path();
|
||||||
|
let data_dir = client_path.join("Data");
|
||||||
|
fs::create_dir_all(&data_dir).unwrap();
|
||||||
|
|
||||||
|
// 1. Initial state: Not installed
|
||||||
|
let st = client_patch_status(client_path);
|
||||||
|
assert_eq!(st.state, ClientPatchState::NotInstalled);
|
||||||
|
|
||||||
|
fs::write(client_path.join(MANIFEST_FILENAME), format!("# CoA Custom {CLIENT_VERSION}\n")).unwrap();
|
||||||
|
// 2. Create MPQs and root files
|
||||||
|
for mpq in RACE_MPQS {
|
||||||
|
fs::write(data_dir.join(mpq), b"test mpq content").unwrap();
|
||||||
|
}
|
||||||
|
fs::write(client_path.join("dinput8.dll"), b"test dll").unwrap();
|
||||||
|
fs::write(client_path.join("EsteriaAppearance.dll"), b"test dll").unwrap();
|
||||||
|
|
||||||
|
let st = client_patch_status(client_path);
|
||||||
|
assert_eq!(st.state, ClientPatchState::Enabled);
|
||||||
|
assert_eq!(st.installed_mpqs, RACE_MPQS.len());
|
||||||
|
|
||||||
|
// 3. Disable patches
|
||||||
|
set_client_patch_enabled(client_path, false).unwrap();
|
||||||
|
let st = client_patch_status(client_path);
|
||||||
|
assert_eq!(st.state, ClientPatchState::Disabled);
|
||||||
|
assert!(data_dir.join("patch-T.MPQ.disabled").is_file());
|
||||||
|
assert!(!data_dir.join("patch-T.MPQ").is_file());
|
||||||
|
assert!(client_path.join("dinput8.dll.disabled").is_file());
|
||||||
|
assert!(!client_path.join("dinput8.dll").is_file());
|
||||||
|
|
||||||
|
// 4. Re-enable patches
|
||||||
|
set_client_patch_enabled(client_path, true).unwrap();
|
||||||
|
let st = client_patch_status(client_path);
|
||||||
|
assert_eq!(st.state, ClientPatchState::Enabled);
|
||||||
|
assert!(data_dir.join("patch-T.MPQ").is_file());
|
||||||
|
assert!(!data_dir.join("patch-T.MPQ.disabled").is_file());
|
||||||
|
assert!(client_path.join("dinput8.dll").is_file());
|
||||||
|
assert!(!client_path.join("dinput8.dll.disabled").is_file());
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -176,10 +176,13 @@ impl Db {
|
|||||||
|
|
||||||
fn fail(&self, stderr: &[u8]) -> Error {
|
fn fail(&self, stderr: &[u8]) -> Error {
|
||||||
let text = String::from_utf8_lossy(stderr);
|
let text = String::from_utf8_lossy(stderr);
|
||||||
let down = text.contains("2003") || text.contains("Can't connect") || text.contains("is not running") || text.contains("No such container");
|
// Only the client's own connection errors mean "not running": the number 2003 or the words can also appear inside
|
||||||
|
// the message of an ordinary SQL error (a duplicate entry, a row number) and must not hide it.
|
||||||
|
let down = text.contains("ERROR 2003") || text.contains("ERROR 2002") || text.contains("Can't connect to MySQL server")
|
||||||
|
|| text.contains("No such container") || text.contains("is not running");
|
||||||
let code = if down { ErrorCode::DatabaseNotRunning } else { ErrorCode::Unknown };
|
let code = if down { ErrorCode::DatabaseNotRunning } else { ErrorCode::Unknown };
|
||||||
match code {
|
match code {
|
||||||
ErrorCode::DatabaseNotRunning => Error::Invalid("The database is not running. Start the server first.".into()),
|
ErrorCode::DatabaseNotRunning => Error::Invalid(format!("The database is not running. Start the server first. ({})", text.trim().lines().last().unwrap_or("").chars().take(300).collect::<String>())),
|
||||||
_ => Error::Invalid(format!("database command failed: {}", text.trim().lines().last().unwrap_or(""))),
|
_ => Error::Invalid(format!("database command failed: {}", text.trim().lines().last().unwrap_or(""))),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -244,6 +247,13 @@ impl Db {
|
|||||||
self.query(&sql)?.trim().parse().map_err(|_| Error::Invalid("unexpected reply".into()))
|
self.query(&sql)?.trim().parse().map_err(|_| Error::Invalid("unexpected reply".into()))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn recovery_objects(&self, schema: &str) -> Result<Vec<serde_json::Value>> {
|
||||||
|
let schema = self.realm_schema(schema);
|
||||||
|
if !ident_ok(schema) { return Err(Error::Invalid("bad schema name".into())); }
|
||||||
|
let sql = format!("SELECT routine_type,HEX(routine_name) FROM information_schema.routines WHERE routine_schema='{schema}' UNION ALL SELECT 'TRIGGER',HEX(trigger_name) FROM information_schema.triggers WHERE trigger_schema='{schema}' UNION ALL SELECT 'VIEW',HEX(table_name) FROM information_schema.views WHERE table_schema='{schema}' ORDER BY 1,2;");
|
||||||
|
parse_recovery_objects(&schema, &self.query(&sql)?)
|
||||||
|
}
|
||||||
|
|
||||||
/// Consistent dump of one schema, zstd-compressed to `out`. Returns (compressed bytes, sha256 of the file).
|
/// Consistent dump of one schema, zstd-compressed to `out`. Returns (compressed bytes, sha256 of the file).
|
||||||
pub fn dump_to(&self, schema: &str, out: &Path) -> Result<(u64, String)> {
|
pub fn dump_to(&self, schema: &str, out: &Path) -> Result<(u64, String)> {
|
||||||
let schema = self.realm_schema(schema);
|
let schema = self.realm_schema(schema);
|
||||||
@@ -331,6 +341,18 @@ impl Db {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn parse_recovery_objects(schema: &str, text: &str) -> Result<Vec<serde_json::Value>> {
|
||||||
|
text.lines().filter(|line| !line.is_empty()).map(|line| {
|
||||||
|
let (kind, name) = line.split_once('\t').ok_or_else(|| Error::Invalid("unexpected database object reply".into()))?;
|
||||||
|
if !matches!(kind, "PROCEDURE" | "FUNCTION" | "TRIGGER" | "VIEW") {
|
||||||
|
return Err(Error::Invalid("unexpected database object type".into()));
|
||||||
|
}
|
||||||
|
let name = hex::decode(name).ok().and_then(|bytes| String::from_utf8(bytes).ok())
|
||||||
|
.filter(|name| !name.is_empty()).ok_or_else(|| Error::Invalid("unexpected database object name".into()))?;
|
||||||
|
Ok(serde_json::json!({ "database": schema, "kind": kind, "name": name }))
|
||||||
|
}).collect()
|
||||||
|
}
|
||||||
|
|
||||||
/// Name of the service account the Manager uses for the server console (RA). Accounts are stored upper-case.
|
/// Name of the service account the Manager uses for the server console (RA). Accounts are stored upper-case.
|
||||||
pub const SERVICE_ACCOUNT: &str = "COAMANAGER";
|
pub const SERVICE_ACCOUNT: &str = "COAMANAGER";
|
||||||
|
|
||||||
@@ -418,6 +440,19 @@ mod tests {
|
|||||||
const ROOT_PW: &str = "rootpw-ZZ1";
|
const ROOT_PW: &str = "rootpw-ZZ1";
|
||||||
const APP_PW: &str = "apppw-QQ2";
|
const APP_PW: &str = "apppw-QQ2";
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn recovery_object_names_preserve_unicode_and_delimiters() {
|
||||||
|
let name = "view\tперсонажи\n";
|
||||||
|
let text = format!("VIEW\t{}\nTRIGGER\t74726967676572\n", hex::encode(name));
|
||||||
|
let objects = parse_recovery_objects("acore_characters", &text).unwrap();
|
||||||
|
assert_eq!(objects.len(), 2);
|
||||||
|
assert_eq!(objects[0]["name"], name);
|
||||||
|
assert_eq!(objects[1]["kind"], "TRIGGER");
|
||||||
|
assert!(parse_recovery_objects("test", "VIEW\tzz").is_err());
|
||||||
|
assert!(parse_recovery_objects("test", "UNKNOWN\t61").is_err());
|
||||||
|
assert!(parse_recovery_objects("test", "VIEW").is_err());
|
||||||
|
}
|
||||||
|
|
||||||
fn folder(docker: bool) -> (tempfile::TempDir, PathBuf) {
|
fn folder(docker: bool) -> (tempfile::TempDir, PathBuf) {
|
||||||
let d = tempfile::tempdir().unwrap();
|
let d = tempfile::tempdir().unwrap();
|
||||||
let root = d.path().join("srv");
|
let root = d.path().join("srv");
|
||||||
|
|||||||
@@ -401,6 +401,19 @@ pub fn export_package(root: &Path, meta_dir: &Path, manager_log: &Path, meta: &I
|
|||||||
add("processes.txt", processes_report(root, &ports).as_bytes())?;
|
add("processes.txt", processes_report(root, &ports).as_bytes())?;
|
||||||
|
|
||||||
// The newest update journals: the state of each update and the reason it failed.
|
// The newest update journals: the state of each update and the reason it failed.
|
||||||
|
for (path, size, _) in newest_files(&meta_dir.join("diagnostics"), "json", usize::MAX)
|
||||||
|
.into_iter().filter(|(path, _, _)| path.file_name().is_some_and(|name| {
|
||||||
|
let name = name.to_string_lossy();
|
||||||
|
name.starts_with("schema-validation-") || name.starts_with("database-recovery-")
|
||||||
|
|| name.starts_with("database-rehearsal-") || name.starts_with("database-restore-")
|
||||||
|
|| name.starts_with("database-repair-")
|
||||||
|
})).take(10) {
|
||||||
|
if size <= 4 * 1024 * 1024 {
|
||||||
|
if let Ok(text) = fs::read_to_string(&path) {
|
||||||
|
add(&format!("schema/{}", path.file_name().unwrap().to_string_lossy()), redact_json(&text).as_bytes())?;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
let mut journals: Vec<_> = fs::read_dir(meta_dir.join("updates")).into_iter().flatten().flatten()
|
let mut journals: Vec<_> = fs::read_dir(meta_dir.join("updates")).into_iter().flatten().flatten()
|
||||||
.filter(|e| e.file_type().is_ok_and(|t| t.is_dir()) && e.file_name().to_string_lossy().chars().all(|c| c.is_ascii_alphanumeric() || matches!(c, '-' | '_')))
|
.filter(|e| e.file_type().is_ok_and(|t| t.is_dir()) && e.file_name().to_string_lossy().chars().all(|c| c.is_ascii_alphanumeric() || matches!(c, '-' | '_')))
|
||||||
.collect();
|
.collect();
|
||||||
@@ -586,6 +599,9 @@ real error
|
|||||||
fs::write(root.join("Core/configs/worldserver.conf"), "LoginDatabaseInfo = \"127.0.0.1;3307;acore;SECRETPW;auth\"\nRate.XP.Kill = 1\n").unwrap();
|
fs::write(root.join("Core/configs/worldserver.conf"), "LoginDatabaseInfo = \"127.0.0.1;3307;acore;SECRETPW;auth\"\nRate.XP.Kill = 1\n").unwrap();
|
||||||
let meta_dir = d.path().join("srv.manager");
|
let meta_dir = d.path().join("srv.manager");
|
||||||
fs::create_dir_all(&meta_dir).unwrap();
|
fs::create_dir_all(&meta_dir).unwrap();
|
||||||
|
fs::create_dir_all(meta_dir.join("diagnostics")).unwrap();
|
||||||
|
fs::write(meta_dir.join("diagnostics/schema-validation-CoA-test.json"), r#"{"problems":[{"table":"creature_display_preset","column":"display_id","detail":"default mismatch"}],"password":"schema-secret"}"#).unwrap();
|
||||||
|
fs::write(meta_dir.join("diagnostics/database-recovery-test.json"), r#"{"objects":[{"database":"acore_characters","kind":"TRIGGER","name":"user_character_trigger"}],"password":"recovery-secret"}"#).unwrap();
|
||||||
let meta = InstallMeta::new(InstallKind::Imported, &root);
|
let meta = InstallMeta::new(InstallKind::Imported, &root);
|
||||||
let report = run(&root, &meta);
|
let report = run(&root, &meta);
|
||||||
let zip_path = d.path().join("diag.zip");
|
let zip_path = d.path().join("diag.zip");
|
||||||
@@ -600,6 +616,10 @@ real error
|
|||||||
}
|
}
|
||||||
assert!(all.contains("boom") && all.contains("Rate.XP.Kill"), "keys and ordinary log lines are included");
|
assert!(all.contains("boom") && all.contains("Rate.XP.Kill"), "keys and ordinary log lines are included");
|
||||||
assert!(all.contains("v1.8") && all.contains("48c4786a"));
|
assert!(all.contains("v1.8") && all.contains("48c4786a"));
|
||||||
|
assert!(all.contains("creature_display_preset") && all.contains("default mismatch"));
|
||||||
|
assert!(!all.contains("schema-secret"));
|
||||||
|
assert!(all.contains("user_character_trigger") && all.contains("acore_characters"));
|
||||||
|
assert!(!all.contains("recovery-secret"));
|
||||||
assert!(!all.contains("hunter2") && !all.contains("SECRETPW") && !all.contains("upstream-secret"));
|
assert!(!all.contains("hunter2") && !all.contains("SECRETPW") && !all.contains("upstream-secret"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,69 @@
|
|||||||
|
//! The disposable database a release is validated against, on a Linux computer.
|
||||||
|
//!
|
||||||
|
//! A release is checked by applying its database changes to the database of the signed base package. The base carries the
|
||||||
|
//! MySQL data directory of a Windows repack, and a MySQL 8.4 server in Docker opens it as it is (with the repack's table
|
||||||
|
//! name setting). So the fixture is a Docker server folder whose database container uses that directory in place of a
|
||||||
|
//! volume; everything else (start, SQL, schema capture, dumps) is the code of a Docker installation.
|
||||||
|
|
||||||
|
use std::fs;
|
||||||
|
use std::path::Path;
|
||||||
|
|
||||||
|
use super::{Config, Docker, MARKER, MYSQL_IMAGE};
|
||||||
|
use crate::driver::{self, Verb};
|
||||||
|
use crate::error::{Error, Result};
|
||||||
|
use crate::{fsx, install, package};
|
||||||
|
|
||||||
|
/// Turn an extracted base package (`mysql/data`, `Settings/`) into a Docker server folder and start its database.
|
||||||
|
pub fn prepare(root: &Path) -> Result<()> {
|
||||||
|
prepare_with(&super::SystemDocker, root)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(crate) fn prepare_with(d: &dyn Docker, root: &Path) -> Result<()> {
|
||||||
|
let boot = root.join(package::BOOTSTRAP_CREDENTIALS);
|
||||||
|
if !boot.is_file() {
|
||||||
|
return Err(Error::Invalid("The package has no database bootstrap information.".into()));
|
||||||
|
}
|
||||||
|
let secrets: serde_json::Value = fsx::read_json(&boot)?;
|
||||||
|
let root_pw = secrets["rootPassword"].as_str().filter(|p| p.chars().all(|c| c.is_ascii_hexdigit()) && !p.is_empty())
|
||||||
|
.ok_or_else(|| Error::Invalid("The database bootstrap information is not usable.".into()))?.to_string();
|
||||||
|
fs::copy(&boot, root.join("Settings/database.json"))?;
|
||||||
|
let data = fs::canonicalize(root.join("mysql/data"))
|
||||||
|
.map_err(|_| Error::Invalid("The package has no database data directory.".into()))?;
|
||||||
|
let cfg = Config {
|
||||||
|
project: format!("schema-{}", install::random_hex(8)),
|
||||||
|
bind_address: "127.0.0.1".into(),
|
||||||
|
mysql_image: MYSQL_IMAGE.into(),
|
||||||
|
data_dir: None,
|
||||||
|
mysql_data: Some(data.to_string_lossy().into_owned()),
|
||||||
|
};
|
||||||
|
fsx::atomic_write_json(&root.join(MARKER), &cfg)?;
|
||||||
|
|
||||||
|
let started = driver::run(root, Verb::StartMysql)?;
|
||||||
|
if !started.ok {
|
||||||
|
return Err(Error::Invalid(started.human.map(|h| h.message.to_string()).unwrap_or_else(|| "The database could not be started.".into())));
|
||||||
|
}
|
||||||
|
// The repack's administrator account only exists for connections from the server itself (the socket); the Manager
|
||||||
|
// connects over TCP. The fixture is thrown away, so the account is simply added.
|
||||||
|
let sql = format!("CREATE USER IF NOT EXISTS 'root'@'127.0.0.1' IDENTIFIED BY '{root_pw}'; GRANT ALL ON *.* TO 'root'@'127.0.0.1' WITH GRANT OPTION;");
|
||||||
|
let mut call = super::Call::new(&["exec", "-i", "-e", "MYSQL_PWD", &cfg.names().db, "mysql", "--user=root"], std::time::Duration::from_secs(60));
|
||||||
|
call.env = vec![("MYSQL_PWD".into(), root_pw)];
|
||||||
|
call.stdin = Some(sql.as_bytes());
|
||||||
|
let o = d.run(&call)?;
|
||||||
|
if !o.ok() {
|
||||||
|
return Err(Error::Invalid(format!("The fixture database could not be opened to the Manager: {}", o.text())));
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn a_package_without_bootstrap_information_is_refused_before_anything_starts() {
|
||||||
|
let dir = tempfile::tempdir().unwrap();
|
||||||
|
let err = prepare(dir.path()).unwrap_err();
|
||||||
|
assert!(err.to_string().contains("bootstrap"), "{err}");
|
||||||
|
assert!(!dir.path().join(MARKER).exists());
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -146,7 +146,7 @@ fn write_settings(root: &Path, data_dir: &Path) -> Result<Settings> {
|
|||||||
let (auth, world, ra) = (pick_port(DEFAULT_PORTS.0)?, pick_port(DEFAULT_PORTS.1)?, pick_port(DEFAULT_PORTS.2)?);
|
let (auth, world, ra) = (pick_port(DEFAULT_PORTS.0)?, pick_port(DEFAULT_PORTS.1)?, pick_port(DEFAULT_PORTS.2)?);
|
||||||
let (root_password, app_password) = (random_hex(48), random_hex(48));
|
let (root_password, app_password) = (random_hex(48), random_hex(48));
|
||||||
fs::create_dir_all(root.join("Settings"))?;
|
fs::create_dir_all(root.join("Settings"))?;
|
||||||
let docker = Config { project, bind_address: "127.0.0.1".into(), mysql_image: super::MYSQL_IMAGE.into(), data_dir: Some(data_dir.to_string_lossy().into_owned()) };
|
let docker = Config { project, bind_address: "127.0.0.1".into(), mysql_image: super::MYSQL_IMAGE.into(), data_dir: Some(data_dir.to_string_lossy().into_owned()), mysql_data: None };
|
||||||
fsx::atomic_write_json(&root.join(MARKER), &docker)?;
|
fsx::atomic_write_json(&root.join(MARKER), &docker)?;
|
||||||
// Same file and keys as a repack, so the console, the ports and the settings screens work unchanged. The database is
|
// Same file and keys as a repack, so the console, the ports and the settings screens work unchanged. The database is
|
||||||
// not published on the host; its port is only there to fill the key.
|
// not published on the host; its port is only there to fill the key.
|
||||||
|
|||||||
@@ -210,7 +210,7 @@ fn start(d: &dyn Docker, root: &Path, cfg: &Config, with_game: bool, log: &mut L
|
|||||||
if !state.get(&n.db).is_some_and(Container::running) {
|
if !state.get(&n.db).is_some_and(Container::running) {
|
||||||
remove(d, &n.db);
|
remove(d, &n.db);
|
||||||
let mut call = Call::new(&[], Duration::from_secs(120));
|
let mut call = Call::new(&[], Duration::from_secs(120));
|
||||||
call.args = db_args(cfg, &n);
|
call.args = db_args(cfg, &n, owner_of(root).as_deref());
|
||||||
call.env = vec![("MYSQL_ROOT_PASSWORD".into(), secrets.root.clone())];
|
call.env = vec![("MYSQL_ROOT_PASSWORD".into(), secrets.root.clone())];
|
||||||
let o = d.run(&call).or_else(|e| fail(ErrorCode::DockerUnavailable, e.to_string()))?;
|
let o = d.run(&call).or_else(|e| fail(ErrorCode::DockerUnavailable, e.to_string()))?;
|
||||||
if !o.ok() {
|
if !o.ok() {
|
||||||
@@ -223,6 +223,10 @@ fn start(d: &dyn Docker, root: &Path, cfg: &Config, with_game: bool, log: &mut L
|
|||||||
return Ok(());
|
return Ok(());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Realm profiles (CoA / Wildcard): the database is running and healthy here (started and waited for above), which the
|
||||||
|
// realm list update below needs. Finish an interrupted switch, then make the realm list say what is selected. The repack's
|
||||||
|
// launcher did this when it started; here nothing else would.
|
||||||
|
let realm = prepare_realm(root, log)?;
|
||||||
ensure_image(d, log)?;
|
ensure_image(d, log)?;
|
||||||
super::ensure_main_configs(root).map_err(|e| Failure { code: ErrorCode::ServerFilesIncomplete, output: e.to_string() })?;
|
super::ensure_main_configs(root).map_err(|e| Failure { code: ErrorCode::ServerFilesIncomplete, output: e.to_string() })?;
|
||||||
std::fs::create_dir_all(root.join("Core/Logs")).map_err(|e| Failure { code: ErrorCode::ServerFilesIncomplete, output: e.to_string() })?;
|
std::fs::create_dir_all(root.join("Core/Logs")).map_err(|e| Failure { code: ErrorCode::ServerFilesIncomplete, output: e.to_string() })?;
|
||||||
@@ -234,7 +238,7 @@ fn start(d: &dyn Docker, root: &Path, cfg: &Config, with_game: bool, log: &mut L
|
|||||||
remove(d, &n.world);
|
remove(d, &n.world);
|
||||||
let mut call = Call::new(&[], Duration::from_secs(60));
|
let mut call = Call::new(&[], Duration::from_secs(60));
|
||||||
call.args = game_args(cfg, &n, GameKind::World, &host, &cfg.data_path(&host), ports.world, ports.ra, owner.as_deref());
|
call.args = game_args(cfg, &n, GameKind::World, &host, &cfg.data_path(&host), ports.world, ports.ra, owner.as_deref());
|
||||||
call.env = database_env(&secrets, true);
|
call.env = database_env(&secrets, true, realm);
|
||||||
run_container(d, &call, &n.world, log)?;
|
run_container(d, &call, &n.world, log)?;
|
||||||
}
|
}
|
||||||
wait_listening(d, cfg, &n.world, ports.world, WORLD_WAIT, log)?;
|
wait_listening(d, cfg, &n.world, ports.world, WORLD_WAIT, log)?;
|
||||||
@@ -243,7 +247,7 @@ fn start(d: &dyn Docker, root: &Path, cfg: &Config, with_game: bool, log: &mut L
|
|||||||
remove(d, &n.auth);
|
remove(d, &n.auth);
|
||||||
let mut call = Call::new(&[], Duration::from_secs(60));
|
let mut call = Call::new(&[], Duration::from_secs(60));
|
||||||
call.args = game_args(cfg, &n, GameKind::Auth, &host, &cfg.data_path(&host), ports.auth, 0, owner.as_deref());
|
call.args = game_args(cfg, &n, GameKind::Auth, &host, &cfg.data_path(&host), ports.auth, 0, owner.as_deref());
|
||||||
call.env = database_env(&secrets, false);
|
call.env = database_env(&secrets, false, realm);
|
||||||
run_container(d, &call, &n.auth, log)?;
|
run_container(d, &call, &n.auth, log)?;
|
||||||
}
|
}
|
||||||
wait_listening(d, cfg, &n.auth, ports.auth, AUTH_WAIT, log)?;
|
wait_listening(d, cfg, &n.auth, ports.auth, AUTH_WAIT, log)?;
|
||||||
@@ -333,12 +337,22 @@ fn connect_ip(cfg: &Config) -> IpAddr {
|
|||||||
|
|
||||||
// ------------------------------------------------------------------------------------------------- argument lists
|
// ------------------------------------------------------------------------------------------------- argument lists
|
||||||
|
|
||||||
fn db_args(cfg: &Config, n: &Names) -> Vec<String> {
|
fn db_args(cfg: &Config, n: &Names, owner: Option<&str>) -> Vec<String> {
|
||||||
let mut a: Vec<String> = ["run", "--detach", "--name"].iter().map(|s| s.to_string()).collect();
|
let mut a: Vec<String> = ["run", "--detach", "--name"].iter().map(|s| s.to_string()).collect();
|
||||||
a.push(n.db.clone());
|
a.push(n.db.clone());
|
||||||
a.extend(["--network".into(), n.network.clone(), "--network-alias".into(), "db".into()]);
|
a.extend(["--network".into(), n.network.clone(), "--network-alias".into(), "db".into()]);
|
||||||
a.extend(["--label".into(), format!("coa.project={}", cfg.project)]);
|
a.extend(["--label".into(), format!("coa.project={}", cfg.project)]);
|
||||||
a.extend(["--volume".into(), format!("{}:/var/lib/mysql", n.volume)]);
|
match &cfg.mysql_data {
|
||||||
|
Some(dir) => {
|
||||||
|
// A data directory from a Windows repack: it is written by the person who owns the folder, and its table names
|
||||||
|
// were folded to lower case (the repack's setting), which the server must be told because a Linux one does not.
|
||||||
|
a.extend(["--volume".into(), format!("{dir}:/var/lib/mysql")]);
|
||||||
|
if let Some(o) = owner {
|
||||||
|
a.extend(["--user".into(), o.into()]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
None => a.extend(["--volume".into(), format!("{}:/var/lib/mysql", n.volume)]),
|
||||||
|
}
|
||||||
// The password comes from the environment of the docker client, not from this command line.
|
// The password comes from the environment of the docker client, not from this command line.
|
||||||
a.extend(["--env".into(), "MYSQL_ROOT_PASSWORD".into()]);
|
a.extend(["--env".into(), "MYSQL_ROOT_PASSWORD".into()]);
|
||||||
// "mysqladmin ping" succeeds as soon as the server answers, with or without a login. It must go over TCP, like
|
// "mysqladmin ping" succeeds as soon as the server answers, with or without a login. It must go over TCP, like
|
||||||
@@ -349,6 +363,9 @@ fn db_args(cfg: &Config, n: &Names) -> Vec<String> {
|
|||||||
a.extend(["--health-interval".into(), "5s".into(), "--health-timeout".into(), "5s".into(), "--health-retries".into(), "40".into()]);
|
a.extend(["--health-interval".into(), "5s".into(), "--health-timeout".into(), "5s".into(), "--health-retries".into(), "40".into()]);
|
||||||
a.extend(["--stop-timeout".into(), "60".into()]);
|
a.extend(["--stop-timeout".into(), "60".into()]);
|
||||||
a.push(cfg.mysql_image.clone());
|
a.push(cfg.mysql_image.clone());
|
||||||
|
if cfg.mysql_data.is_some() {
|
||||||
|
a.push("--lower-case-table-names=1".into());
|
||||||
|
}
|
||||||
a
|
a
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -359,16 +376,32 @@ enum GameKind {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// Connection strings: host;port;user;password;database. They hold the password, so they travel by environment.
|
/// Connection strings: host;port;user;password;database. They hold the password, so they travel by environment.
|
||||||
fn database_env(s: &Secrets, world: bool) -> Vec<(String, String)> {
|
fn database_env(s: &Secrets, world: bool, realm: crate::realms::Mode) -> Vec<(String, String)> {
|
||||||
let info = |db: &str| format!("db;3306;acore;{};{db}", s.app);
|
let info = |db: &str| format!("db;3306;acore;{};{db}", s.app);
|
||||||
let mut env = vec![("AC_LOGIN_DATABASE_INFO".to_string(), info("acore_auth"))];
|
let mut env = vec![("AC_LOGIN_DATABASE_INFO".to_string(), info("acore_auth"))];
|
||||||
if world {
|
if world {
|
||||||
env.push(("AC_WORLD_DATABASE_INFO".into(), info("acore_world")));
|
// The databases of the selected realm (the Wildcard realm has its own world and characters databases).
|
||||||
env.push(("AC_CHARACTER_DATABASE_INFO".into(), info("acore_characters")));
|
let schema = |kind: &str| realm.schema(kind).unwrap_or("acore_world");
|
||||||
|
env.push(("AC_WORLD_DATABASE_INFO".into(), info(schema("world"))));
|
||||||
|
env.push(("AC_CHARACTER_DATABASE_INFO".into(), info(schema("characters"))));
|
||||||
}
|
}
|
||||||
env
|
env
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Realm profiles are only in play once a profile has been chosen on this server (`Settings/realm-profile.json`).
|
||||||
|
fn prepare_realm(root: &Path, log: &mut Log) -> Step<crate::realms::Mode> {
|
||||||
|
let fail_with = |e: crate::error::Error| Failure { code: ErrorCode::StartupFailed, output: e.to_string() };
|
||||||
|
crate::realms::before_start(root).map_err(fail_with)?;
|
||||||
|
let active = crate::realms::state(root).map_err(fail_with)?.active;
|
||||||
|
if root.join("Settings/realm-profile.json").exists() {
|
||||||
|
crate::realms::setup_realmlist(root).map_err(fail_with)?;
|
||||||
|
let db = crate::db::Db::from_repack(root, crate::db::Account::Admin).map_err(fail_with)?;
|
||||||
|
db.query("UPDATE acore_auth.realmlist SET name='Conquest of Azeroth' WHERE id=1; UPDATE acore_auth.realmlist SET name='Wildcard' WHERE id=2;").map_err(fail_with)?;
|
||||||
|
log.say(format!("realm {}", active.name()));
|
||||||
|
}
|
||||||
|
Ok(active)
|
||||||
|
}
|
||||||
|
|
||||||
fn game_args(cfg: &Config, n: &Names, kind: GameKind, host: &Path, data: &Path, port: u16, ra_port: u16, owner: Option<&str>) -> Vec<String> {
|
fn game_args(cfg: &Config, n: &Names, kind: GameKind, host: &Path, data: &Path, port: u16, ra_port: u16, owner: Option<&str>) -> Vec<String> {
|
||||||
let (name, alias, binary, conf, inner_port) = match kind {
|
let (name, alias, binary, conf, inner_port) = match kind {
|
||||||
GameKind::World => (&n.world, "world", "./worldserver", "configs/worldserver.conf", WORLD_PORT),
|
GameKind::World => (&n.world, "world", "./worldserver", "configs/worldserver.conf", WORLD_PORT),
|
||||||
@@ -395,6 +428,10 @@ fn game_args(cfg: &Config, n: &Names, kind: GameKind, host: &Path, data: &Path,
|
|||||||
a.extend(env("AC_UPDATES_ENABLE_DATABASES", "0"));
|
a.extend(env("AC_UPDATES_ENABLE_DATABASES", "0"));
|
||||||
if kind == GameKind::World {
|
if kind == GameKind::World {
|
||||||
a.extend(["--volume".into(), format!("{}:{DATA}:ro", data.display())]);
|
a.extend(["--volume".into(), format!("{}:{DATA}:ro", data.display())]);
|
||||||
|
let races = host.join("Data/dbc_races");
|
||||||
|
if races.is_dir() && races != data.join("dbc_races") {
|
||||||
|
a.extend(["--volume".into(), format!("{}:{DATA}/dbc_races:ro", races.display())]);
|
||||||
|
}
|
||||||
a.extend(env("AC_DATA_DIR", DATA));
|
a.extend(env("AC_DATA_DIR", DATA));
|
||||||
// The remote console is only ever reachable from this computer.
|
// The remote console is only ever reachable from this computer.
|
||||||
a.extend(["--publish".into(), format!("127.0.0.1:{ra_port}:{RA_PORT}")]);
|
a.extend(["--publish".into(), format!("127.0.0.1:{ra_port}:{RA_PORT}")]);
|
||||||
@@ -698,6 +735,44 @@ mod tests {
|
|||||||
assert!(runs[1].args.windows(2).any(|w| w == ["--env", "AC_WORLD_DATABASE_INFO"]), "name only, the value is in the environment");
|
assert!(runs[1].args.windows(2).any(|w| w == ["--env", "AC_WORLD_DATABASE_INFO"]), "name only, the value is in the environment");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Unix only: the folder is a Linux path (a Windows path has a colon, which a Docker folder may not).
|
||||||
|
#[cfg(unix)]
|
||||||
|
#[test]
|
||||||
|
fn a_release_fixture_runs_its_database_on_the_package_data_directory_not_on_a_volume() {
|
||||||
|
let (_d, root) = server("t1");
|
||||||
|
fs::write(root.join("Settings/docker.json"), r#"{"project":"t1","mysqlData":"/work/fixture/mysql/data"}"#).unwrap();
|
||||||
|
let sim = Sim::new();
|
||||||
|
assert!(run_with(&sim, &root, Verb::StartMysql).unwrap().ok);
|
||||||
|
let db = &sim.calls_of("run")[0].args;
|
||||||
|
assert!(db.windows(2).any(|w| w == ["--volume", "/work/fixture/mysql/data:/var/lib/mysql"]), "{db:?}");
|
||||||
|
assert!(!db.iter().any(|a| a.starts_with("coa-t1-db:")), "no named volume: {db:?}");
|
||||||
|
assert!(db.iter().any(|a| a == "--user"), "the folder is written by its owner");
|
||||||
|
assert_eq!(db.last().map(String::as_str), Some("--lower-case-table-names=1"), "a server option, so after the image name");
|
||||||
|
// An installation never gets any of it.
|
||||||
|
let (_d2, root2) = server("t2");
|
||||||
|
let sim2 = Sim::new();
|
||||||
|
assert!(run_with(&sim2, &root2, Verb::StartMysql).unwrap().ok);
|
||||||
|
let plain = &sim2.calls_of("run")[0].args;
|
||||||
|
assert!(plain.windows(2).any(|w| w == ["--volume", "coa-t2-db:/var/lib/mysql"]), "{plain:?}");
|
||||||
|
assert!(!plain.iter().any(|a| a == "--lower-case-table-names=1" || a == "--user"));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn the_containers_use_the_databases_of_the_selected_realm() {
|
||||||
|
let s = Secrets { root: "r".into(), app: "apppw".into() };
|
||||||
|
let get = |env: &[(String, String)], k: &str| env.iter().find(|(n, _)| n == k).map(|(_, v)| v.clone());
|
||||||
|
let coa = database_env(&s, true, crate::realms::Mode::Coa);
|
||||||
|
assert_eq!(get(&coa, "AC_WORLD_DATABASE_INFO").unwrap(), "db;3306;acore;apppw;acore_world");
|
||||||
|
assert_eq!(get(&coa, "AC_CHARACTER_DATABASE_INFO").unwrap(), "db;3306;acore;apppw;acore_characters");
|
||||||
|
let wild = database_env(&s, true, crate::realms::Mode::Wildcard);
|
||||||
|
assert_eq!(get(&wild, "AC_WORLD_DATABASE_INFO").unwrap(), "db;3306;acore;apppw;acore_world_wildcard");
|
||||||
|
assert_eq!(get(&wild, "AC_CHARACTER_DATABASE_INFO").unwrap(), "db;3306;acore;apppw;acore_characters_wildcard");
|
||||||
|
// Accounts are shared by both realms; the auth server never sees the others.
|
||||||
|
assert_eq!(get(&wild, "AC_LOGIN_DATABASE_INFO").unwrap(), "db;3306;acore;apppw;acore_auth");
|
||||||
|
let auth = database_env(&s, false, crate::realms::Mode::Wildcard);
|
||||||
|
assert_eq!(auth.len(), 1);
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn the_database_is_only_healthy_once_it_takes_tcp_connections() {
|
fn the_database_is_only_healthy_once_it_takes_tcp_connections() {
|
||||||
let (_d, root) = server("t1");
|
let (_d, root) = server("t1");
|
||||||
|
|||||||
@@ -15,6 +15,7 @@
|
|||||||
//! ```
|
//! ```
|
||||||
|
|
||||||
mod cli;
|
mod cli;
|
||||||
|
pub mod fixture;
|
||||||
pub mod install;
|
pub mod install;
|
||||||
mod lifecycle;
|
mod lifecycle;
|
||||||
|
|
||||||
@@ -63,6 +64,10 @@ pub struct Config {
|
|||||||
/// mounted read-only, so one copy can serve several servers.
|
/// mounted read-only, so one copy can serve several servers.
|
||||||
#[serde(default, skip_serializing_if = "Option::is_none")]
|
#[serde(default, skip_serializing_if = "Option::is_none")]
|
||||||
pub data_dir: Option<String>,
|
pub data_dir: Option<String>,
|
||||||
|
/// A MySQL data directory the database container uses in place of its volume. Only for the disposable fixture that
|
||||||
|
/// validates a release (the data directory of the signed base package); an installation never sets it.
|
||||||
|
#[serde(default, skip_serializing_if = "Option::is_none")]
|
||||||
|
pub mysql_data: Option<String>,
|
||||||
}
|
}
|
||||||
|
|
||||||
pub(crate) struct Names {
|
pub(crate) struct Names {
|
||||||
@@ -96,10 +101,10 @@ impl Config {
|
|||||||
if self.bind_address.parse::<IpAddr>().is_err() {
|
if self.bind_address.parse::<IpAddr>().is_err() {
|
||||||
return Err(Error::Invalid(format!("{} is not an IP address.", self.bind_address)));
|
return Err(Error::Invalid(format!("{} is not an IP address.", self.bind_address)));
|
||||||
}
|
}
|
||||||
if let Some(d) = &self.data_dir {
|
for d in [&self.data_dir, &self.mysql_data].into_iter().flatten() {
|
||||||
// The folder goes into a `--volume host:container:ro` option, where a colon would be read as a separator.
|
// The folder goes into a `--volume host:container` option, where a colon would be read as a separator.
|
||||||
if !Path::new(d).is_absolute() || d.contains(':') {
|
if !Path::new(d).is_absolute() || d.contains(':') {
|
||||||
return Err(Error::Invalid("The game data folder must be a full path without a colon.".into()));
|
return Err(Error::Invalid("A Docker folder must be a full path without a colon.".into()));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
let image_ok = !self.mysql_image.is_empty() && self.mysql_image.chars().all(|c| c.is_ascii_alphanumeric() || "._/:@-".contains(c));
|
let image_ok = !self.mysql_image.is_empty() && self.mysql_image.chars().all(|c| c.is_ascii_alphanumeric() || "._/:@-".contains(c));
|
||||||
|
|||||||
@@ -107,6 +107,7 @@ fn run_inner(root: &Path, verb: Verb, validating_update: bool) -> Result<DriverO
|
|||||||
}
|
}
|
||||||
if matches!(verb, Verb::StartAll | Verb::StartWorld) { crate::modules::ensure_bot_exclusivity(&root)?; }
|
if matches!(verb, Verb::StartAll | Verb::StartWorld) { crate::modules::ensure_bot_exclusivity(&root)?; }
|
||||||
if crate::docker::is_docker(&root) {
|
if crate::docker::is_docker(&root) {
|
||||||
|
prepare_headless_world(&root, verb)?;
|
||||||
return crate::docker::run(&root, verb);
|
return crate::docker::run(&root, verb);
|
||||||
}
|
}
|
||||||
if verb == Verb::StopAll { crate::multiworld::stop(&root)?; }
|
if verb == Verb::StopAll { crate::multiworld::stop(&root)?; }
|
||||||
@@ -123,6 +124,7 @@ fn run_inner(root: &Path, verb: Verb, validating_update: bool) -> Result<DriverO
|
|||||||
}
|
}
|
||||||
if matches!(verb, Verb::StartAll | Verb::StartWorld) { crate::modules::ensure_bot_exclusivity(&root)?; }
|
if matches!(verb, Verb::StartAll | Verb::StartWorld) { crate::modules::ensure_bot_exclusivity(&root)?; }
|
||||||
let (python, script) = launcher(&root)?;
|
let (python, script) = launcher(&root)?;
|
||||||
|
prepare_headless_world(&root, verb)?;
|
||||||
let original = std::fs::read_to_string(&script)?;
|
let original = std::fs::read_to_string(&script)?;
|
||||||
let patched = patch_launcher_imports(&original)?;
|
let patched = patch_launcher_imports(&original)?;
|
||||||
if original != patched {
|
if original != patched {
|
||||||
@@ -198,6 +200,27 @@ fn run_inner(root: &Path, verb: Verb, validating_update: bool) -> Result<DriverO
|
|||||||
Ok(DriverOutcome { ok, exit_code, code, human: code.map(ErrorCode::human), output })
|
Ok(DriverOutcome { ok, exit_code, code, human: code.map(ErrorCode::human), output })
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Background servers receive no interactive stdin. Keep CLI EOF from stopping the world server;
|
||||||
|
/// the Manager's console uses remote access instead. The template survives launcher regeneration.
|
||||||
|
fn prepare_headless_world(root: &Path, verb: Verb) -> Result<()> {
|
||||||
|
if !matches!(verb, Verb::StartAll | Verb::StartWorld) { return Ok(()); }
|
||||||
|
for relative in ["Settings/worldserver.conf.template", "Core/configs/worldserver.conf"] {
|
||||||
|
let path = root.join(relative);
|
||||||
|
let bytes = match std::fs::read(&path) {
|
||||||
|
Ok(bytes) => bytes,
|
||||||
|
Err(e) if e.kind() == std::io::ErrorKind::NotFound => continue,
|
||||||
|
Err(e) => return Err(e.into()),
|
||||||
|
};
|
||||||
|
let mut config = crate::config::parser::ConfFile::parse_bytes(&bytes)?;
|
||||||
|
config.set("Console.Enable", "0", &["Local console is disabled for background startup; the Manager uses remote access."]);
|
||||||
|
let text = config.to_text();
|
||||||
|
if text.as_bytes() != bytes {
|
||||||
|
fsx::atomic_write(&path, text.as_bytes())?;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
/// The launcher keeps one JSON record per service in `.state`. A crash or power loss while it writes one can leave
|
/// The launcher keeps one JSON record per service in `.state`. A crash or power loss while it writes one can leave
|
||||||
/// a file of the right length that holds only zero bytes (NTFS keeps the length but not the data), and the launcher
|
/// a file of the right length that holds only zero bytes (NTFS keeps the length but not the data), and the launcher
|
||||||
/// then dies on every start with an unreadable record. Such a file carries no information, so remove it: the
|
/// then dies on every start with an unreadable record. Such a file carries no information, so remove it: the
|
||||||
@@ -264,6 +287,55 @@ pub(crate) fn startup_failure(root: &Path, started: &DriverOutcome) -> String {
|
|||||||
mod tests {
|
mod tests {
|
||||||
use super::*;
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn background_start_disables_cli_in_template_and_rendered_config() {
|
||||||
|
let folder = tempfile::tempdir().unwrap();
|
||||||
|
let root = folder.path();
|
||||||
|
std::fs::create_dir_all(root.join("Settings")).unwrap();
|
||||||
|
std::fs::create_dir_all(root.join("Core/configs")).unwrap();
|
||||||
|
let template = root.join("Settings/worldserver.conf.template");
|
||||||
|
let rendered = root.join("Core/configs/worldserver.conf");
|
||||||
|
let original = "\u{feff}# Custom settings\r\nConsole.Enable = 1\r\nRa.Enable = 1\r\nPlayerLimit = 42\r\n";
|
||||||
|
std::fs::write(&template, original).unwrap();
|
||||||
|
std::fs::write(&rendered, original).unwrap();
|
||||||
|
let auth = root.join("Core/configs/authserver.conf");
|
||||||
|
std::fs::write(&auth, "custom auth config").unwrap();
|
||||||
|
for verb in [Verb::StartMysql, Verb::StopAll] {
|
||||||
|
prepare_headless_world(root, verb).unwrap();
|
||||||
|
assert_eq!(std::fs::read_to_string(&template).unwrap(), original);
|
||||||
|
assert_eq!(std::fs::read_to_string(&rendered).unwrap(), original);
|
||||||
|
}
|
||||||
|
for verb in [Verb::StartAll, Verb::StartWorld] {
|
||||||
|
std::fs::write(&template, original).unwrap();
|
||||||
|
std::fs::write(&rendered, original).unwrap();
|
||||||
|
prepare_headless_world(root, verb).unwrap();
|
||||||
|
let expected = original.replace("Console.Enable = 1", "Console.Enable = 0");
|
||||||
|
assert_eq!(std::fs::read_to_string(&template).unwrap(), expected);
|
||||||
|
assert_eq!(std::fs::read_to_string(&rendered).unwrap(), expected);
|
||||||
|
prepare_headless_world(root, verb).unwrap();
|
||||||
|
assert_eq!(std::fs::read_to_string(&template).unwrap(), expected);
|
||||||
|
}
|
||||||
|
assert_eq!(std::fs::read_to_string(auth).unwrap(), "custom auth config");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn background_start_overrides_an_absent_or_duplicate_console_setting() {
|
||||||
|
let folder = tempfile::tempdir().unwrap();
|
||||||
|
let root = folder.path();
|
||||||
|
prepare_headless_world(root, Verb::StartAll).unwrap();
|
||||||
|
std::fs::create_dir_all(root.join("Core/configs")).unwrap();
|
||||||
|
let path = root.join("Core/configs/worldserver.conf");
|
||||||
|
for original in ["Ra.Enable = 1\n", "Console.Enable = 0\nConsole.Enable = 1\n"] {
|
||||||
|
std::fs::write(&path, original).unwrap();
|
||||||
|
prepare_headless_world(root, Verb::StartAll).unwrap();
|
||||||
|
let bytes = std::fs::read(&path).unwrap();
|
||||||
|
let config = crate::config::parser::ConfFile::parse_bytes(&bytes).unwrap();
|
||||||
|
assert_eq!(config.get("Console.Enable"), Some("0"));
|
||||||
|
prepare_headless_world(root, Verb::StartAll).unwrap();
|
||||||
|
assert_eq!(std::fs::read(&path).unwrap(), bytes);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn large_squid_provisioning_has_time_to_finish_without_extending_shutdown() {
|
fn large_squid_provisioning_has_time_to_finish_without_extending_shutdown() {
|
||||||
let folder = tempfile::tempdir().unwrap();
|
let folder = tempfile::tempdir().unwrap();
|
||||||
|
|||||||
@@ -2,11 +2,13 @@ pub mod accounts;
|
|||||||
pub mod backup;
|
pub mod backup;
|
||||||
pub mod cleanbase;
|
pub mod cleanbase;
|
||||||
pub mod companions;
|
pub mod companions;
|
||||||
|
pub mod custom_races;
|
||||||
pub mod client;
|
pub mod client;
|
||||||
pub mod remote_client;
|
pub mod remote_client;
|
||||||
pub mod clientdl;
|
pub mod clientdl;
|
||||||
pub mod config;
|
pub mod config;
|
||||||
pub mod console;
|
pub mod console;
|
||||||
|
pub mod crashes;
|
||||||
pub mod dashboard;
|
pub mod dashboard;
|
||||||
pub mod db;
|
pub mod db;
|
||||||
pub mod diag;
|
pub mod diag;
|
||||||
@@ -31,6 +33,7 @@ pub mod repair;
|
|||||||
pub mod schema_check;
|
pub mod schema_check;
|
||||||
pub mod net;
|
pub mod net;
|
||||||
pub mod package;
|
pub mod package;
|
||||||
|
pub mod platform;
|
||||||
pub mod ra;
|
pub mod ra;
|
||||||
pub mod allsettings;
|
pub mod allsettings;
|
||||||
pub mod modules;
|
pub mod modules;
|
||||||
@@ -41,8 +44,12 @@ pub mod release;
|
|||||||
pub mod report;
|
pub mod report;
|
||||||
pub mod release_schema;
|
pub mod release_schema;
|
||||||
pub mod update;
|
pub mod update;
|
||||||
|
mod update_isolation;
|
||||||
|
mod mysql_snapshot;
|
||||||
|
pub mod wine;
|
||||||
pub mod upnp;
|
pub mod upnp;
|
||||||
pub mod signing;
|
pub mod signing;
|
||||||
|
pub mod channels;
|
||||||
pub mod srp6;
|
pub mod srp6;
|
||||||
|
|
||||||
pub use error::{Error, ErrorCode, Result};
|
pub use error::{Error, ErrorCode, Result};
|
||||||
|
|||||||
@@ -78,9 +78,31 @@ pub struct Revision {
|
|||||||
pub commit: Option<String>,
|
pub commit: Option<String>,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||||
|
#[serde(rename_all = "camelCase", deny_unknown_fields)]
|
||||||
|
pub struct SourceDatabase {
|
||||||
|
pub manifest_sha256: String,
|
||||||
|
pub schema_sha256: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||||
|
#[serde(rename_all = "camelCase", deny_unknown_fields)]
|
||||||
|
pub struct Compatibility {
|
||||||
|
pub schema: u32,
|
||||||
|
pub platform: String,
|
||||||
|
pub core_commit: String,
|
||||||
|
pub module_commits: std::collections::BTreeMap<String, String>,
|
||||||
|
pub client_patch_version: String,
|
||||||
|
pub source_versions: Vec<String>,
|
||||||
|
#[serde(default, skip_serializing_if = "std::collections::BTreeMap::is_empty")]
|
||||||
|
pub source_databases: std::collections::BTreeMap<String, SourceDatabase>,
|
||||||
|
}
|
||||||
|
|
||||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||||
#[serde(rename_all = "camelCase")]
|
#[serde(rename_all = "camelCase")]
|
||||||
pub struct Manifest {
|
pub struct Manifest {
|
||||||
|
#[serde(default, skip_serializing_if = "Option::is_none")]
|
||||||
|
pub compatibility: Option<Compatibility>,
|
||||||
pub schema: u32,
|
pub schema: u32,
|
||||||
pub kind: Kind,
|
pub kind: Kind,
|
||||||
pub version: String,
|
pub version: String,
|
||||||
@@ -136,6 +158,26 @@ impl Manifest {
|
|||||||
if parse_version(&self.min_manager_version).is_none() {
|
if parse_version(&self.min_manager_version).is_none() {
|
||||||
return bad(format!("bad minManagerVersion {:?}", self.min_manager_version));
|
return bad(format!("bad minManagerVersion {:?}", self.min_manager_version));
|
||||||
}
|
}
|
||||||
|
if let Some(c) = &self.compatibility {
|
||||||
|
if parse_version(&self.min_manager_version).is_none_or(|v| v < (0, 6, 13)) {
|
||||||
|
return bad("Release compatibility matrices require Manager 0.6.13 or newer".into());
|
||||||
|
}
|
||||||
|
if c.schema != 1 || !matches!(c.platform.as_str(), "windows-x86_64" | "linux-x86_64")
|
||||||
|
|| !is_commit(&c.core_commit) || self.core.commit.as_deref() != Some(&c.core_commit)
|
||||||
|
|| c.module_commits.is_empty() || c.module_commits.values().any(|sha| !is_commit(sha))
|
||||||
|
|| self.bots.as_ref().and_then(|r| r.commit.as_ref()).is_some_and(|sha| c.module_commits.get("bots") != Some(sha))
|
||||||
|
|| parse_version(&c.client_patch_version).is_none()
|
||||||
|
|| c.source_versions.is_empty() || c.source_versions.iter().any(|v| parse_version(v).is_none())
|
||||||
|
|| c.source_versions.iter().collect::<HashSet<_>>().len() != c.source_versions.len() {
|
||||||
|
return bad("Invalid release compatibility matrix".into());
|
||||||
|
}
|
||||||
|
if !c.source_databases.is_empty() && (c.source_databases.len() != c.source_versions.len()
|
||||||
|
|| c.source_versions.iter().any(|v| !c.source_databases.contains_key(v))
|
||||||
|
|| c.source_databases.values().any(|s| !is_sha256(&s.manifest_sha256)
|
||||||
|
|| s.schema_sha256.as_ref().is_some_and(|sha| !is_sha256(sha)))) {
|
||||||
|
return bad("Invalid source database compatibility".into());
|
||||||
|
}
|
||||||
|
}
|
||||||
for migration in &self.migrations {
|
for migration in &self.migrations {
|
||||||
if !is_sha256(&migration.sha256) || migration.compatible_sha256.iter().any(|h| !is_sha256(h) || h == &"0".repeat(64)) {
|
if !is_sha256(&migration.sha256) || migration.compatible_sha256.iter().any(|h| !is_sha256(h) || h == &"0".repeat(64)) {
|
||||||
return bad(format!("{}: invalid migration checksum compatibility", migration.id));
|
return bad(format!("{}: invalid migration checksum compatibility", migration.id));
|
||||||
@@ -232,6 +274,53 @@ mod tests {
|
|||||||
assert!(!m.compatible_with_manager("0.0.9"));
|
assert!(!m.compatible_with_manager("0.0.9"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn compatibility_matrix_binds_core_and_requires_tested_sources() {
|
||||||
|
let mut m = Manifest::parse(sample("").as_bytes()).unwrap();
|
||||||
|
m.min_manager_version = "0.6.13".into();
|
||||||
|
m.compatibility = Some(Compatibility { schema: 1, platform: "windows-x86_64".into(),
|
||||||
|
core_commit: "a".repeat(40), module_commits: [("squid".into(), "b".repeat(40))].into(),
|
||||||
|
source_databases: Default::default(), client_patch_version: "1.5.1".into(), source_versions: vec!["0.261010.32".into()] });
|
||||||
|
m.validate().unwrap();
|
||||||
|
m.compatibility.as_mut().unwrap().core_commit = "c".repeat(40);
|
||||||
|
assert!(m.validate().is_err());
|
||||||
|
m.compatibility.as_mut().unwrap().core_commit = "a".repeat(40);
|
||||||
|
m.compatibility.as_mut().unwrap().source_versions.clear();
|
||||||
|
assert!(m.validate().is_err());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn compatibility_cannot_claim_a_different_packaged_bot_revision() {
|
||||||
|
let mut m = Manifest::parse(sample("").as_bytes()).unwrap();
|
||||||
|
m.min_manager_version = "0.6.13".into();
|
||||||
|
m.bots = Some(Revision { commit: Some("b".repeat(40)) });
|
||||||
|
m.compatibility = Some(Compatibility { schema: 1, platform: "windows-x86_64".into(),
|
||||||
|
core_commit: "a".repeat(40), module_commits: [("bots".into(), "c".repeat(40))].into(),
|
||||||
|
source_databases: Default::default(), client_patch_version: "1.5.1".into(), source_versions: vec!["0.2.0".into()] });
|
||||||
|
assert!(m.validate().is_err());
|
||||||
|
m.compatibility.as_mut().unwrap().module_commits.insert("bots".into(), "b".repeat(40));
|
||||||
|
m.validate().unwrap();
|
||||||
|
m.compatibility.as_mut().unwrap().source_versions.push("0.2.0".into());
|
||||||
|
assert!(m.validate().is_err());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn source_database_contracts_must_cover_the_exact_upgrade_versions() {
|
||||||
|
let mut m = Manifest::parse(sample("").as_bytes()).unwrap();
|
||||||
|
m.min_manager_version = "0.6.13".into();
|
||||||
|
m.compatibility = Some(Compatibility { schema: 1, platform: "windows-x86_64".into(),
|
||||||
|
core_commit: "a".repeat(40), module_commits: [("squid".into(), "b".repeat(40))].into(),
|
||||||
|
client_patch_version: "1.5.1".into(), source_versions: vec!["0.2.0".into()],
|
||||||
|
source_databases: [("0.2.0".into(), SourceDatabase { manifest_sha256: "a".repeat(64), schema_sha256: None })].into() });
|
||||||
|
m.validate().unwrap();
|
||||||
|
m.compatibility.as_mut().unwrap().source_databases.get_mut("0.2.0").unwrap().schema_sha256 = Some("bad".into());
|
||||||
|
assert!(m.validate().is_err());
|
||||||
|
let c = m.compatibility.as_mut().unwrap();
|
||||||
|
c.source_databases.get_mut("0.2.0").unwrap().schema_sha256 = None;
|
||||||
|
c.source_versions = vec!["0.2.1".into()];
|
||||||
|
assert!(m.validate().is_err());
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn rejects_traversal_bad_hash_duplicates_and_short_commit() {
|
fn rejects_traversal_bad_hash_duplicates_and_short_commit() {
|
||||||
let ok = "b".repeat(64);
|
let ok = "b".repeat(64);
|
||||||
|
|||||||
@@ -203,6 +203,28 @@ pub fn set_enabled(root: &Path, meta: &Path, id: &str, on: bool) -> Result<()> {
|
|||||||
Some(lock)
|
Some(lock)
|
||||||
} else { None };
|
} else { None };
|
||||||
if on { crate::realms::guard_module(root, id)?; }
|
if on { crate::realms::guard_module(root, id)?; }
|
||||||
|
if id == "custom-races" {
|
||||||
|
if let Ok(meta_content) = fs::read_to_string(meta.join("install.json")) {
|
||||||
|
if let Ok(install_meta) = serde_json::from_str::<crate::registry::InstallMeta>(&meta_content) {
|
||||||
|
if let Some(cp) = install_meta.client_path {
|
||||||
|
let client_path = PathBuf::from(cp);
|
||||||
|
if client_path.is_dir() {
|
||||||
|
crate::custom_races::set_client_patch_enabled(&client_path, on)?;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if !on {
|
||||||
|
let _ = crate::custom_races::sync_bot_races_config(root, false);
|
||||||
|
} else {
|
||||||
|
let allow = crate::custom_races::is_bot_custom_races_allowed(root).unwrap_or_else(|| {
|
||||||
|
read(&dir(root).join("coa_custom_races.conf"))
|
||||||
|
.and_then(|c| c.get("CoACustomRaces.BotsEnable").map(truthy))
|
||||||
|
.unwrap_or(false)
|
||||||
|
});
|
||||||
|
let _ = crate::custom_races::sync_bot_races_config(root, allow);
|
||||||
|
}
|
||||||
|
}
|
||||||
set_enabled_in(&catalog(), root, meta, id, on)
|
set_enabled_in(&catalog(), root, meta, id, on)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -278,14 +300,27 @@ fn settings_in(cat: &[Entry], root: &Path, id: &str) -> Result<Vec<Setting>> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
let bot_custom_races_allowed = if id == "custom-races" {
|
||||||
|
crate::custom_races::is_bot_custom_races_allowed(root)
|
||||||
|
} else {
|
||||||
|
None
|
||||||
|
};
|
||||||
Ok(effective
|
Ok(effective
|
||||||
.entries()
|
.entries()
|
||||||
.map(|(k, v)| Setting {
|
.map(|(k, v)| {
|
||||||
key: k.to_string(),
|
let mut val = fields.get(k).and_then(|field| field.default_if_missing.as_ref()).filter(|_| active.get(k).is_none()).and_then(crate::squid::scalar).unwrap_or_else(|| v.to_string());
|
||||||
value: fields.get(k).and_then(|field| field.default_if_missing.as_ref()).filter(|_| active.get(k).is_none()).and_then(crate::squid::scalar).unwrap_or_else(|| v.to_string()),
|
if k == "CoACustomRaces.BotsEnable" {
|
||||||
default: fields.get(k).and_then(|field| crate::squid::scalar(&field.default)).or_else(|| dist.as_ref().and_then(|d| d.get(k)).map(str::to_string)),
|
if let Some(allowed) = bot_custom_races_allowed {
|
||||||
field: fields.get(k).cloned(),
|
val = if allowed { "1".into() } else { "0".into() };
|
||||||
doc: dist.as_ref().map(|d| d.doc_for(k)).filter(|d| !d.is_empty()).unwrap_or_else(|| active.doc_for(k)).join(" "),
|
}
|
||||||
|
}
|
||||||
|
Setting {
|
||||||
|
key: k.to_string(),
|
||||||
|
value: val,
|
||||||
|
default: fields.get(k).and_then(|field| crate::squid::scalar(&field.default)).or_else(|| dist.as_ref().and_then(|d| d.get(k)).map(str::to_string)),
|
||||||
|
field: fields.get(k).cloned(),
|
||||||
|
doc: dist.as_ref().map(|d| d.doc_for(k)).filter(|d| !d.is_empty()).unwrap_or_else(|| active.doc_for(k)).join(" "),
|
||||||
|
}
|
||||||
})
|
})
|
||||||
.collect())
|
.collect())
|
||||||
}
|
}
|
||||||
@@ -341,6 +376,12 @@ fn save_settings_in(cat: &[Entry], root: &Path, meta: &Path, id: &str, changes:
|
|||||||
changed.push((key.clone(), value.to_string()));
|
changed.push((key.clone(), value.to_string()));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if id == "custom-races" {
|
||||||
|
if let Some(bots_enable) = changes.get("CoACustomRaces.BotsEnable") {
|
||||||
|
let allow = truthy(bots_enable);
|
||||||
|
crate::custom_races::sync_bot_races_config(root, allow)?;
|
||||||
|
}
|
||||||
|
}
|
||||||
if changed.is_empty() {
|
if changed.is_empty() {
|
||||||
return Ok(Vec::new());
|
return Ok(Vec::new());
|
||||||
}
|
}
|
||||||
@@ -660,4 +701,39 @@ mod tests {
|
|||||||
assert!(fs::read_to_string(dir(&root).join("war_games.conf")).unwrap().contains("WarGames.Enable = 0"));
|
assert!(fs::read_to_string(dir(&root).join("war_games.conf")).unwrap().contains("WarGames.Enable = 0"));
|
||||||
assert!(!list_in(&cat, &root).into_iter().find(|m| m.id == "war-games").unwrap().enabled);
|
assert!(!list_in(&cat, &root).into_iter().find(|m| m.id == "war-games").unwrap().enabled);
|
||||||
}
|
}
|
||||||
|
#[test]
|
||||||
|
fn custom_races_bot_settings_synchronize_playerbots_conf() {
|
||||||
|
let d = tempfile::tempdir().unwrap();
|
||||||
|
let (root, meta) = server(d.path());
|
||||||
|
let cat = catalog();
|
||||||
|
fs::write(dir(&root).join("coa_custom_races.conf.dist"), "CoACustomRaces.Enable = 1\nCoACustomRaces.BotsEnable = 0\n").unwrap();
|
||||||
|
fs::write(dir(&root).join("coa_custom_races.conf"), "CoACustomRaces.Enable = 1\nCoACustomRaces.BotsEnable = 0\n").unwrap();
|
||||||
|
fs::write(dir(&root).join("playerbots.conf"), "AiPlayerbot.Enabled = 1\n").unwrap();
|
||||||
|
|
||||||
|
// 1. Initially CoACustomRaces.BotsEnable is 0
|
||||||
|
let s = settings_in(&cat, &root, "custom-races").unwrap();
|
||||||
|
assert_eq!(s.iter().find(|s| s.key == "CoACustomRaces.BotsEnable").unwrap().value, "0");
|
||||||
|
|
||||||
|
// 2. Enable bots for custom races: should write experimental exclusions to playerbots.conf
|
||||||
|
let change_on = BTreeMap::from([("CoACustomRaces.BotsEnable".into(), "1".into())]);
|
||||||
|
assert_eq!(save_settings_in(&cat, &root, &meta, "custom-races", &change_on).unwrap(), ["CoACustomRaces.BotsEnable"]);
|
||||||
|
let pb = fs::read_to_string(dir(&root).join("playerbots.conf")).unwrap();
|
||||||
|
assert!(pb.contains("AiPlayerbot.ExcludedBotRaces"));
|
||||||
|
assert!(pb.contains(crate::custom_races::EXCLUDED_BOT_RACES_EXPERIMENTAL));
|
||||||
|
|
||||||
|
// Settings view now sees "1"
|
||||||
|
let s = settings_in(&cat, &root, "custom-races").unwrap();
|
||||||
|
assert_eq!(s.iter().find(|s| s.key == "CoACustomRaces.BotsEnable").unwrap().value, "1");
|
||||||
|
|
||||||
|
// 3. Disable bots for custom races: should write recommended exclusions to playerbots.conf
|
||||||
|
let change_off = BTreeMap::from([("CoACustomRaces.BotsEnable".into(), "0".into())]);
|
||||||
|
assert_eq!(save_settings_in(&cat, &root, &meta, "custom-races", &change_off).unwrap(), ["CoACustomRaces.BotsEnable"]);
|
||||||
|
let pb = fs::read_to_string(dir(&root).join("playerbots.conf")).unwrap();
|
||||||
|
assert!(pb.contains(crate::custom_races::EXCLUDED_BOT_RACES_RECOMMENDED));
|
||||||
|
|
||||||
|
// Settings view now sees "0"
|
||||||
|
let s = settings_in(&cat, &root, "custom-races").unwrap();
|
||||||
|
assert_eq!(s.iter().find(|s| s.key == "CoACustomRaces.BotsEnable").unwrap().value, "0");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -0,0 +1,478 @@
|
|||||||
|
use std::{collections::{BTreeMap, BTreeSet}, fs, path::{Path, PathBuf}};
|
||||||
|
use std::io::{BufReader, BufWriter, Write};
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
use crate::{fsx, Error, Result};
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||||
|
#[serde(deny_unknown_fields)]
|
||||||
|
pub(crate) struct Snapshot {
|
||||||
|
pub path: String,
|
||||||
|
pub files: BTreeMap<String, String>,
|
||||||
|
pub directories: BTreeSet<String>,
|
||||||
|
pub server_sha256: String,
|
||||||
|
#[serde(default)]
|
||||||
|
pub bytes: u64,
|
||||||
|
#[serde(default, skip_serializing_if = "Option::is_none")]
|
||||||
|
pub archive_sha256: Option<String>,
|
||||||
|
#[serde(default)]
|
||||||
|
pub expanded_bytes: u64,
|
||||||
|
}
|
||||||
|
|
||||||
|
fn reject_link(metadata: &fs::Metadata) -> Result<()> {
|
||||||
|
let linked = metadata.file_type().is_symlink();
|
||||||
|
#[cfg(windows)] let linked = { use std::os::windows::fs::MetadataExt; linked || metadata.file_attributes() & 0x400 != 0 };
|
||||||
|
if linked { return Err(Error::Invalid("Recovery copies cannot follow symbolic links or junctions.".into())); }
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn directories(root: &Path) -> Result<BTreeSet<String>> {
|
||||||
|
let canonical = fsx::canonicalize_lenient(root)?;
|
||||||
|
let root = canonical.as_path();
|
||||||
|
let mut result = BTreeSet::new();
|
||||||
|
let mut pending = vec![root.to_path_buf()];
|
||||||
|
while let Some(directory) = pending.pop() {
|
||||||
|
for entry in fs::read_dir(directory)? {
|
||||||
|
let entry = entry?;
|
||||||
|
reject_link(&fs::symlink_metadata(entry.path())?)?;
|
||||||
|
let path = fsx::ensure_within(root, &entry.path())?;
|
||||||
|
if entry.file_type()?.is_dir() {
|
||||||
|
let relative = path.strip_prefix(root).map_err(|e| Error::Invalid(e.to_string()))?.to_string_lossy().replace('\\', "/");
|
||||||
|
result.insert(relative);
|
||||||
|
pending.push(path);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(result)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn copy_snapshot(point: &Path, snapshot: &Snapshot, target: &Path) -> Result<()> {
|
||||||
|
if snapshot.archive_sha256.is_some() {
|
||||||
|
verify(point, snapshot)?;
|
||||||
|
if target.exists() { return Err(Error::Invalid("The recovery destination already exists.".into())); }
|
||||||
|
let parent = target.parent().ok_or_else(|| Error::Invalid("Invalid recovery destination.".into()))?;
|
||||||
|
fs::create_dir_all(parent)?;
|
||||||
|
fsx::require_space(parent, snapshot.expanded_bytes)?;
|
||||||
|
fs::create_dir(target)?;
|
||||||
|
let input = fsx::ensure_within(point, &fsx::safe_join(point, &snapshot.path)?)?;
|
||||||
|
let decoder = zstd::Decoder::new(BufReader::new(fs::File::open(input)?))?;
|
||||||
|
let mut archive = tar::Archive::new(decoder);
|
||||||
|
let mut seen = BTreeSet::new();
|
||||||
|
let mut expanded = 0u64;
|
||||||
|
for entry in archive.entries()? {
|
||||||
|
let mut entry = entry?;
|
||||||
|
let name = entry.path()?.to_string_lossy().trim_end_matches('/').to_string();
|
||||||
|
if !seen.insert(name.clone()) { return Err(Error::Invalid("Duplicate entry in MySQL recovery archive.".into())); }
|
||||||
|
let output = fsx::ensure_within(target, &fsx::safe_join(target, &name)?)?;
|
||||||
|
if entry.header().entry_type().is_dir() && snapshot.directories.contains(&name) {
|
||||||
|
fs::create_dir_all(output)?;
|
||||||
|
} else if entry.header().entry_type().is_file() && snapshot.files.contains_key(&name) {
|
||||||
|
expanded = expanded.checked_add(entry.size()).filter(|bytes| *bytes <= snapshot.expanded_bytes)
|
||||||
|
.ok_or_else(|| Error::Invalid("MySQL recovery archive exceeds its declared size.".into()))?;
|
||||||
|
fs::create_dir_all(output.parent().unwrap())?;
|
||||||
|
let mut file = fs::OpenOptions::new().write(true).create_new(true).open(output)?;
|
||||||
|
if std::io::copy(&mut entry, &mut file)? != entry.size() { return Err(Error::Invalid("Truncated MySQL recovery file.".into())); }
|
||||||
|
file.flush()?;
|
||||||
|
} else { return Err(Error::Invalid("Unexpected entry in MySQL recovery archive.".into())); }
|
||||||
|
}
|
||||||
|
if expanded != snapshot.expanded_bytes || inventory(target)? != snapshot.files {
|
||||||
|
return Err(Error::Invalid("MySQL recovery files failed verification.".into()));
|
||||||
|
}
|
||||||
|
} else { copy_verified(&point.join(&snapshot.path), target, &snapshot.files)?; }
|
||||||
|
for directory in &snapshot.directories {
|
||||||
|
fs::create_dir_all(fsx::ensure_within(target, &fsx::safe_join(target, directory)?)?)?;
|
||||||
|
}
|
||||||
|
if directories(target)? != snapshot.directories { return Err(Error::Invalid("The recovery directory inventory differs.".into())); }
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn compress(source: &Path, point: &Path, snapshot: &mut Snapshot) -> Result<()> {
|
||||||
|
snapshot.path = "mysql-data.tar.zst".into();
|
||||||
|
let path = fsx::safe_join(point, &snapshot.path)?;
|
||||||
|
fs::create_dir_all(point)?;
|
||||||
|
fsx::require_space(point, snapshot.expanded_bytes)?;
|
||||||
|
let file = fs::OpenOptions::new().write(true).create_new(true).open(&path)?;
|
||||||
|
let encoder = zstd::Encoder::new(BufWriter::new(file), 3)?;
|
||||||
|
let mut archive = tar::Builder::new(encoder);
|
||||||
|
for directory in &snapshot.directories {
|
||||||
|
archive.append_dir(directory, fsx::ensure_within(source, &fsx::safe_join(source, directory)?)?)?;
|
||||||
|
}
|
||||||
|
for name in snapshot.files.keys() {
|
||||||
|
let input = fsx::ensure_within(source, &fsx::safe_join(source, name)?)?;
|
||||||
|
archive.append_file(name, &mut fs::File::open(input)?)?;
|
||||||
|
}
|
||||||
|
archive.into_inner()?.finish()?.flush()?;
|
||||||
|
snapshot.archive_sha256 = Some(fsx::sha256_file(&path)?);
|
||||||
|
snapshot.bytes = fs::metadata(path)?.len();
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(crate) fn inventory(root: &Path) -> Result<BTreeMap<String, String>> {
|
||||||
|
let canonical = fsx::canonicalize_lenient(root)?;
|
||||||
|
let root = canonical.as_path();
|
||||||
|
let mut files = BTreeMap::new();
|
||||||
|
let mut directories = vec![root.to_path_buf()];
|
||||||
|
while let Some(directory) = directories.pop() {
|
||||||
|
for entry in fs::read_dir(directory)? {
|
||||||
|
let entry = entry?;
|
||||||
|
let metadata = fs::symlink_metadata(entry.path())?;
|
||||||
|
let path = fsx::ensure_within(root, &entry.path())?;
|
||||||
|
reject_link(&metadata)?;
|
||||||
|
if metadata.is_dir() { directories.push(path); continue; }
|
||||||
|
if !metadata.is_file() { return Err(Error::Invalid("Unsupported database snapshot file.".into())); }
|
||||||
|
let relative = path.strip_prefix(root).map_err(|e| Error::Invalid(e.to_string()))?.to_string_lossy().replace('\\', "/");
|
||||||
|
fsx::safe_join(root, &relative)?;
|
||||||
|
if relative.ends_with(".isl") { return Err(Error::Invalid("External MySQL tablespaces require a separate recovery method.".into())); }
|
||||||
|
files.insert(relative, fsx::sha256_file(&path)?);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(files)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(crate) fn copy_verified(source: &Path, target: &Path, files: &BTreeMap<String, String>) -> Result<()> {
|
||||||
|
if target.exists() { return Err(Error::Invalid("Database snapshot destination already exists.".into())); }
|
||||||
|
let bytes = files.keys().try_fold(0u64, |total, name| -> Result<u64> {
|
||||||
|
let path = fsx::ensure_within(source, &fsx::safe_join(source, name)?)?;
|
||||||
|
total.checked_add(fs::metadata(path)?.len()).ok_or_else(|| Error::Invalid("Snapshot size overflow.".into()))
|
||||||
|
})?;
|
||||||
|
let parent = target.parent().ok_or_else(|| Error::Invalid("Invalid snapshot destination.".into()))?;
|
||||||
|
fs::create_dir_all(parent)?;
|
||||||
|
fsx::require_space(parent, bytes)?;
|
||||||
|
fs::create_dir(target)?;
|
||||||
|
for (relative, expected) in files {
|
||||||
|
let source_file = fsx::ensure_within(source, &fsx::safe_join(source, relative)?)?;
|
||||||
|
let target_file = fsx::ensure_within(target, &fsx::safe_join(target, relative)?)?;
|
||||||
|
fs::create_dir_all(target_file.parent().unwrap())?;
|
||||||
|
fs::copy(&source_file, &target_file)?;
|
||||||
|
if fsx::sha256_file(&target_file)? != *expected { return Err(Error::Invalid(format!("Database snapshot file {relative} failed verification."))); }
|
||||||
|
}
|
||||||
|
if inventory(target)? != *files { return Err(Error::Invalid("Database snapshot inventory differs.".into())); }
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(crate) fn stop(root: &Path) -> Result<()> {
|
||||||
|
let observed = crate::process::observe(root, &crate::layout::read_ports(root));
|
||||||
|
if [observed.mysql.state, observed.auth.state, observed.world.state].iter().all(|state| *state == crate::process::ServiceState::Stopped)
|
||||||
|
&& !crate::multiworld::is_running(root) { return Ok(()); }
|
||||||
|
let outcome = crate::driver::run(root, crate::driver::Verb::StopAll)?;
|
||||||
|
let status = crate::process::observe(root, &crate::layout::read_ports(root));
|
||||||
|
if !outcome.ok || [status.mysql.state, status.auth.state, status.world.state].iter().any(|state| *state != crate::process::ServiceState::Stopped)
|
||||||
|
|| crate::multiworld::is_running(root) {
|
||||||
|
return Err(Error::Invalid("The complete server must be stopped before copying or restoring MySQL.".into()));
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(crate) fn stop_previous_rehearsals(meta: &Path) -> Result<()> {
|
||||||
|
let location = meta.join("rehearsals");
|
||||||
|
if !location.exists() { return Ok(()); }
|
||||||
|
for entry in fs::read_dir(&location)? {
|
||||||
|
let entry = entry?;
|
||||||
|
let name = entry.file_name().to_string_lossy().into_owned();
|
||||||
|
if name.len() != 32 || !name.bytes().all(|byte| byte.is_ascii_hexdigit()) { continue; }
|
||||||
|
let fixture = fsx::ensure_within(&location, &entry.path().join("server"))?;
|
||||||
|
let metadata = crate::registry::metadata_dir_for(&fixture)?;
|
||||||
|
if !metadata.join("install.json").is_file() { continue; }
|
||||||
|
let (_, installed) = crate::registry::MetaDir::open(&metadata)?;
|
||||||
|
if fsx::canonicalize_lenient(Path::new(&installed.server_path))? != fsx::canonicalize_lenient(&fixture)? {
|
||||||
|
return Err(Error::Invalid("The interrupted rehearsal metadata does not match its private server.".into()));
|
||||||
|
}
|
||||||
|
stop(&fixture)?;
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(crate) fn capture(root: &Path, partial: &Path) -> Result<Snapshot> {
|
||||||
|
if crate::docker::is_docker(root) || !cfg!(windows) { return Err(Error::Invalid("Cold MySQL snapshots require a Windows repack.".into())); }
|
||||||
|
crate::backup::with_database(root, |db| {
|
||||||
|
if db.query("SELECT COUNT(*) FROM performance_schema.replication_connection_configuration;")?.trim() != "0" {
|
||||||
|
return Err(Error::Invalid("A replicated MySQL instance requires a separate isolated recovery method.".into()));
|
||||||
|
}
|
||||||
|
let data = fsx::ensure_within(root, &root.join("mysql/data"))?;
|
||||||
|
for path in db.query("SELECT PATH FROM information_schema.INNODB_DATAFILES;")?.lines() {
|
||||||
|
fsx::ensure_within(&data, &data.join(path))?;
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
})?;
|
||||||
|
stop(root)?;
|
||||||
|
let data = fsx::ensure_within(root, &root.join("mysql/data"))?;
|
||||||
|
if !data.join("mysql").is_dir() || !data.join("ibdata1").is_file() {
|
||||||
|
return Err(Error::Invalid("The bundled MySQL data directory is incomplete.".into()));
|
||||||
|
}
|
||||||
|
let files = inventory(&data)?;
|
||||||
|
let bytes = files.keys().try_fold(0u64, |total, file| -> Result<u64> {
|
||||||
|
total.checked_add(fs::metadata(fsx::safe_join(&data, file)?)?.len()).ok_or_else(|| Error::Invalid("Snapshot size overflow.".into()))
|
||||||
|
})?;
|
||||||
|
let mut snapshot = Snapshot { path: "mysql-data".into(), files, directories:directories(&data)?, server_sha256: fsx::sha256_file(&root.join("mysql/bin/mysqld.exe"))?, bytes, expanded_bytes:bytes, archive_sha256:None };
|
||||||
|
compress(&data, partial, &mut snapshot)?;
|
||||||
|
verify(partial, &snapshot)?;
|
||||||
|
Ok(snapshot)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(crate) fn verify(point: &Path, snapshot: &Snapshot) -> Result<()> {
|
||||||
|
if snapshot.files.is_empty() || snapshot.server_sha256.len() != 64 {
|
||||||
|
return Err(Error::Invalid("Invalid cold MySQL recovery inventory.".into()));
|
||||||
|
}
|
||||||
|
let data = fsx::ensure_within(point, &fsx::safe_join(point, &snapshot.path)?)?;
|
||||||
|
if let Some(hash) = &snapshot.archive_sha256 {
|
||||||
|
if snapshot.path != "mysql-data.tar.zst" || snapshot.expanded_bytes == 0 || fsx::sha256_file(&data)? != *hash {
|
||||||
|
return Err(Error::Invalid("The compressed MySQL recovery copy is damaged.".into()));
|
||||||
|
}
|
||||||
|
for name in snapshot.files.keys().chain(snapshot.directories.iter()) { fsx::safe_join(point, name)?; }
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
if snapshot.path != "mysql-data" { return Err(Error::Invalid("Unsupported MySQL recovery format.".into())); }
|
||||||
|
if inventory(&data)? != snapshot.files { return Err(Error::Invalid("The cold MySQL recovery copy is damaged or incomplete.".into())); }
|
||||||
|
if directories(&data)? != snapshot.directories { return Err(Error::Invalid("The cold MySQL recovery directories are incomplete.".into())); }
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(crate) fn rehearsal_copy(root: &Path, meta: &Path, point: &Path, snapshot: &Snapshot) -> Result<PathBuf> {
|
||||||
|
verify(point, snapshot)?;
|
||||||
|
let destination = meta.join("rehearsals").join(uuid::Uuid::new_v4().simple().to_string()).join("server");
|
||||||
|
let mut files = BTreeMap::new();
|
||||||
|
let mut directories = vec![root.to_path_buf()];
|
||||||
|
while let Some(directory) = directories.pop() {
|
||||||
|
for entry in fs::read_dir(directory)? {
|
||||||
|
let entry = entry?;
|
||||||
|
let raw = entry.path();
|
||||||
|
let relative = raw.strip_prefix(root).map_err(|e| Error::Invalid(e.to_string()))?.to_string_lossy().replace('\\', "/");
|
||||||
|
let lower = relative.to_ascii_lowercase();
|
||||||
|
let first = lower.split('/').next().unwrap();
|
||||||
|
if entry.file_type()?.is_dir() && !relative.contains('/')
|
||||||
|
&& !["core", "data", "scripts", "settings", "runtime", "mysql", ".realms", "bugreport", "extras", "licenses"].contains(&first) { continue; }
|
||||||
|
if lower == "mysql/data" || lower.starts_with("mysql/data-")
|
||||||
|
|| lower.split('/').any(|part| part == ".state")
|
||||||
|
|| lower == "bugreport/reports" || lower == "core/logs" || lower == "mysql/logs" { continue; }
|
||||||
|
let metadata = fs::symlink_metadata(&raw)?;
|
||||||
|
reject_link(&metadata)?;
|
||||||
|
let path = fsx::ensure_within(root, &raw)?;
|
||||||
|
if metadata.is_dir() { directories.push(path); }
|
||||||
|
else if metadata.is_file() { files.insert(relative, fsx::sha256_file(&path)?); }
|
||||||
|
else { return Err(Error::Invalid("Unsupported rehearsal file.".into())); }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
copy_verified(root, &destination, &files)?;
|
||||||
|
copy_snapshot(point, snapshot, &destination.join("mysql/data"))?;
|
||||||
|
let (_, mut installed) = crate::registry::MetaDir::open(meta)?;
|
||||||
|
installed.id = uuid::Uuid::new_v4().to_string();
|
||||||
|
installed.server_path = destination.to_string_lossy().into_owned();
|
||||||
|
installed.client_path = None;
|
||||||
|
crate::registry::MetaDir::create(&destination, &installed)?;
|
||||||
|
Ok(destination)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(crate) fn isolate_connections(root: &Path) -> Result<()> {
|
||||||
|
for relative in ["Settings/worldserver.conf.template", "Settings/authserver.conf.template", "Core/configs/worldserver.conf", "Core/configs/authserver.conf"] {
|
||||||
|
let path = fsx::ensure_within(root, &root.join(relative))?;
|
||||||
|
if !path.is_file() {
|
||||||
|
if relative.ends_with(".template") { return Err(Error::Invalid("The private update copy lacks connection templates.".into())); }
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
let mut config = crate::config::parser::ConfFile::parse_bytes(&fs::read(&path)?)?;
|
||||||
|
for key in ["LoginDatabaseInfo", "WorldDatabaseInfo", "CharacterDatabaseInfo"] {
|
||||||
|
if relative.contains("worldserver") || key == "LoginDatabaseInfo" {
|
||||||
|
config.set(key, &format!("\"@{key}@\""), &[]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
config.set("BindIP", "\"127.0.0.1\"", &[]);
|
||||||
|
if relative.contains("worldserver") {
|
||||||
|
config.set("Ra.IP", "\"127.0.0.1\"", &[]);
|
||||||
|
config.set("DataDir", "\"@DATA@\"", &[]);
|
||||||
|
}
|
||||||
|
fsx::atomic_write(&path, config.to_text().as_bytes())?;
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(crate) fn unchanged(root: &Path, snapshot: &Snapshot) -> Result<()> {
|
||||||
|
let data = fsx::ensure_within(root, &root.join("mysql/data"))?;
|
||||||
|
if inventory(&data)? != snapshot.files || directories(&data)? != snapshot.directories {
|
||||||
|
return Err(Error::Invalid("The installed database changed during the private rehearsal. Retry after stopping other database access.".into()));
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(crate) fn validate_connections(templates: &Path, installation: &Path) -> Result<()> {
|
||||||
|
let port = crate::layout::read_ports(installation).mysql.to_string();
|
||||||
|
let (_, password) = crate::db::credentials(installation)?;
|
||||||
|
let realm = crate::realms::state(installation)?.active;
|
||||||
|
for relative in ["Settings/worldserver.conf.template", "Settings/authserver.conf.template"] {
|
||||||
|
let path = fsx::ensure_within(templates, &templates.join(relative))?;
|
||||||
|
let config = crate::config::parser::ConfFile::parse_bytes(&fs::read(path)?)?;
|
||||||
|
for (key, kind) in [("LoginDatabaseInfo", "auth"), ("WorldDatabaseInfo", "world"), ("CharacterDatabaseInfo", "characters")] {
|
||||||
|
if relative.contains("authserver") && kind != "auth" { continue; }
|
||||||
|
let value = config.get(key).ok_or_else(|| Error::Invalid(format!("The update cannot isolate the missing {key} connection.")))?.trim().trim_matches('"');
|
||||||
|
if value == format!("@{key}@") { continue; }
|
||||||
|
let fields: Vec<_> = value.split(';').collect();
|
||||||
|
if fields.len() != 5 || !matches!(fields[0], "127.0.0.1" | "localhost") || fields[1] != port || fields[2] != "acore" || fields[3] != password || fields[4] != realm.schema(kind)? {
|
||||||
|
return Err(Error::Invalid(format!("The {key} connection does not use this repack's bundled database. A private update cannot safely qualify an external database.")));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
// Keep the replaced data directory. If interrupted between renames, a retry can install a new verified copy.
|
||||||
|
pub(crate) fn swap(root: &Path, meta: &Path, point: &Path, snapshot: &Snapshot, fail_after_move: bool) -> Result<PathBuf> {
|
||||||
|
verify(point, snapshot)?;
|
||||||
|
if fsx::sha256_file(&root.join("mysql/bin/mysqld.exe"))? != snapshot.server_sha256 {
|
||||||
|
return Err(Error::Invalid("The MySQL executable differs from the recovery point.".into()));
|
||||||
|
}
|
||||||
|
let mysql = fsx::ensure_within(root, &root.join("mysql"))?;
|
||||||
|
let token = uuid::Uuid::new_v4().simple().to_string();
|
||||||
|
let staging = fsx::ensure_within(&mysql, &mysql.join(format!("data-restore-{token}")))?;
|
||||||
|
let previous = fsx::ensure_within(&mysql, &mysql.join(format!("data-before-restore-{token}")))?;
|
||||||
|
let live = fsx::ensure_within(&mysql, &mysql.join("data"))?;
|
||||||
|
copy_snapshot(point, snapshot, &staging)?;
|
||||||
|
let journal = meta.join("diagnostics").join(format!("database-restore-{token}.json"));
|
||||||
|
fsx::atomic_write_json(&journal, &serde_json::json!({"schema":1,"state":"prepared","previous":previous,"staging":staging}))?;
|
||||||
|
if live.exists() { fs::rename(&live, &previous)?; }
|
||||||
|
if fail_after_move { return Err(Error::Invalid("Simulated interruption after saving the previous MySQL directory.".into())); }
|
||||||
|
fs::rename(&staging, &live)?;
|
||||||
|
fsx::atomic_write_json(&journal, &serde_json::json!({"schema":1,"state":"restored","previous":previous}))?;
|
||||||
|
Ok(previous)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
#[cfg(windows)]
|
||||||
|
#[test]
|
||||||
|
#[ignore = "requires COA_MYSQL_TEST_BIN pointing to the bundled MySQL tools"]
|
||||||
|
fn real_mysql_restores_objects_users_rows_and_missing_defaults() {
|
||||||
|
use std::process::{Child, Command, Stdio};
|
||||||
|
use std::os::windows::process::CommandExt;
|
||||||
|
struct Server(Child);
|
||||||
|
impl Drop for Server { fn drop(&mut self) { let _ = self.0.kill(); let _ = self.0.wait(); } }
|
||||||
|
let bin = PathBuf::from(std::env::var("COA_MYSQL_TEST_BIN").unwrap());
|
||||||
|
let temp = tempfile::tempdir().unwrap();
|
||||||
|
let root = temp.path().join("server");
|
||||||
|
let meta = temp.path().join("metadata");
|
||||||
|
let point = temp.path().join("point");
|
||||||
|
copy_verified(&bin, &root.join("mysql/bin"), &inventory(&bin).unwrap()).unwrap();
|
||||||
|
let data = root.join("mysql/data");
|
||||||
|
let executable = root.join("mysql/bin/mysqld.exe");
|
||||||
|
let initialized = Command::new(&executable).args(["--no-defaults", "--initialize-insecure"])
|
||||||
|
.arg(format!("--datadir={}", data.display())).creation_flags(0x0800_0000).output().unwrap();
|
||||||
|
assert!(initialized.status.success(), "{}", String::from_utf8_lossy(&initialized.stderr));
|
||||||
|
let port = crate::install::free_port().unwrap();
|
||||||
|
fsx::atomic_write_json(&root.join("Settings/repack.json"), &serde_json::json!({"mysqlPort":port})).unwrap();
|
||||||
|
fsx::atomic_write_json(&root.join("Settings/database.json"), &serde_json::json!({"rootPassword":"","appPassword":""})).unwrap();
|
||||||
|
let db = crate::db::Db::from_repack(&root, crate::db::Account::Admin).unwrap();
|
||||||
|
let start = || {
|
||||||
|
let server = Server(Command::new(&executable).args(["--no-defaults", "--bind-address=127.0.0.1", "--mysqlx=0", "--skip-log-bin"])
|
||||||
|
.arg(format!("--datadir={}", data.display())).arg(format!("--port={port}"))
|
||||||
|
.arg(format!("--log-error={}", root.join("mysql-test.log").display()))
|
||||||
|
.stdout(Stdio::null()).stderr(Stdio::null()).creation_flags(0x0800_0000).spawn().unwrap());
|
||||||
|
let deadline = std::time::Instant::now() + std::time::Duration::from_secs(60);
|
||||||
|
while !db.ping() { assert!(std::time::Instant::now() < deadline, "{}", fs::read_to_string(root.join("mysql-test.log")).unwrap_or_default()); std::thread::sleep(std::time::Duration::from_millis(200)); }
|
||||||
|
server
|
||||||
|
};
|
||||||
|
let mut server = start();
|
||||||
|
db.query("CREATE DATABASE acore_characters; CREATE DATABASE acore_world; CREATE DATABASE acore_auth; CREATE TABLE acore_characters.probe(id INT PRIMARY KEY, note VARCHAR(40)); CREATE TABLE acore_world.probe(id INT NOT NULL DEFAULT 0); INSERT INTO acore_world.probe VALUES(43); CREATE TABLE acore_auth.probe(id INT); INSERT INTO acore_auth.probe VALUES(44); CREATE USER 'fixture_user'@'localhost' IDENTIFIED BY 'fixture'; CREATE TRIGGER acore_characters.probe_insert BEFORE INSERT ON acore_characters.probe FOR EACH ROW SET NEW.note='triggered'; INSERT INTO acore_characters.probe VALUES(42,'original'); CREATE VIEW acore_characters.probe_view AS SELECT c.id,w.id AS world_id FROM acore_characters.probe c CROSS JOIN acore_world.probe w; CREATE PROCEDURE acore_characters.probe_proc() SELECT id FROM acore_characters.probe; CREATE FUNCTION acore_characters.probe_func() RETURNS INT DETERMINISTIC RETURN 73;").unwrap();
|
||||||
|
assert_eq!(db.recovery_objects("acore_characters").unwrap().len(), 4);
|
||||||
|
crate::schema_check::capture(&db, &root).unwrap();
|
||||||
|
let hash = fsx::sha256_file(&root.join(crate::schema_check::CONTRACT)).unwrap();
|
||||||
|
db.query("ALTER TABLE acore_world.probe ALTER COLUMN id DROP DEFAULT;").unwrap();
|
||||||
|
crate::schema_check::repair_missing_defaults(&db, &root, Some(&hash)).unwrap();
|
||||||
|
assert_eq!(db.query("SELECT COLUMN_DEFAULT FROM information_schema.COLUMNS WHERE TABLE_SCHEMA='acore_world' AND TABLE_NAME='probe' AND COLUMN_NAME='id';").unwrap(), "0");
|
||||||
|
assert_eq!(db.query("SELECT id FROM acore_world.probe;").unwrap(), "43");
|
||||||
|
db.query("ALTER TABLE acore_world.probe ALTER COLUMN id SET DEFAULT 99;").unwrap();
|
||||||
|
crate::schema_check::repair_missing_defaults(&db, &root, Some(&hash)).unwrap();
|
||||||
|
assert_eq!(db.query("SELECT COLUMN_DEFAULT FROM information_schema.COLUMNS WHERE TABLE_SCHEMA='acore_world' AND TABLE_NAME='probe' AND COLUMN_NAME='id';").unwrap(), "99");
|
||||||
|
db.query("SHUTDOWN;").unwrap(); server.0.wait().unwrap();
|
||||||
|
let files = inventory(&data).unwrap();
|
||||||
|
copy_verified(&data, &point.join("mysql-data"), &files).unwrap();
|
||||||
|
let expanded_bytes = files.keys().map(|name| fs::metadata(data.join(name)).unwrap().len()).sum();
|
||||||
|
let mut snapshot = Snapshot {path:"mysql-data".into(), files, directories:directories(&data).unwrap(), server_sha256:fsx::sha256_file(&executable).unwrap(), bytes:0, expanded_bytes, archive_sha256:None};
|
||||||
|
for directory in &snapshot.directories { fs::create_dir_all(point.join("mysql-data").join(directory)).unwrap(); }
|
||||||
|
compress(&data, &point, &mut snapshot).unwrap();
|
||||||
|
let mut changed = start();
|
||||||
|
db.query("DROP VIEW acore_characters.probe_view; DROP TRIGGER acore_characters.probe_insert; DROP PROCEDURE acore_characters.probe_proc; DROP FUNCTION acore_characters.probe_func; DELETE FROM acore_characters.probe; DROP USER 'fixture_user'@'localhost';").unwrap();
|
||||||
|
db.query("SHUTDOWN;").unwrap(); changed.0.wait().unwrap();
|
||||||
|
swap(&root, &meta, &point, &snapshot, false).unwrap();
|
||||||
|
let mut restored = start();
|
||||||
|
assert_eq!(db.recovery_objects("acore_characters").unwrap().len(), 4);
|
||||||
|
assert_eq!(db.query("SELECT * FROM acore_characters.probe_view; CALL acore_characters.probe_proc(); SELECT acore_characters.probe_func(); SELECT COUNT(*) FROM mysql.user WHERE user='fixture_user';").unwrap().replace("\r\n", "\n"), "42\t43\n42\n73\n1");
|
||||||
|
db.query("INSERT INTO acore_characters.probe VALUES(45,'check');").unwrap();
|
||||||
|
assert_eq!(db.query("SELECT note FROM acore_characters.probe WHERE id=45;").unwrap(), "triggered");
|
||||||
|
db.query("SHUTDOWN;").unwrap(); restored.0.wait().unwrap();
|
||||||
|
}
|
||||||
|
fn fixture() -> (tempfile::TempDir, PathBuf, PathBuf, PathBuf, Snapshot) {
|
||||||
|
let temp = tempfile::tempdir().unwrap();
|
||||||
|
let root = temp.path().join("server");
|
||||||
|
let meta = temp.path().join("metadata");
|
||||||
|
let point = temp.path().join("point");
|
||||||
|
fsx::atomic_write(&root.join("mysql/bin/mysqld.exe"), b"same-engine").unwrap();
|
||||||
|
fsx::atomic_write(&root.join("mysql/data/characters.ibd"), b"live").unwrap();
|
||||||
|
fsx::atomic_write(&point.join("mysql-data/characters.ibd"), b"saved").unwrap();
|
||||||
|
fs::create_dir_all(point.join("mysql-data/empty_schema")).unwrap();
|
||||||
|
let snapshot = Snapshot { path:"mysql-data".into(), files:inventory(&point.join("mysql-data")).unwrap(), directories:directories(&point.join("mysql-data")).unwrap(), server_sha256:fsx::sha256_file(&root.join("mysql/bin/mysqld.exe")).unwrap(), bytes:5, expanded_bytes:5, archive_sha256:None };
|
||||||
|
(temp, root, meta, point, snapshot)
|
||||||
|
}
|
||||||
|
#[test]
|
||||||
|
fn interrupted_directory_swap_is_recoverable_and_keeps_previous_bytes() {
|
||||||
|
let (_temp, root, meta, point, snapshot) = fixture();
|
||||||
|
assert!(swap(&root, &meta, &point, &snapshot, true).is_err());
|
||||||
|
assert!(!root.join("mysql/data").exists());
|
||||||
|
let old = fs::read_dir(root.join("mysql")).unwrap().flatten().find(|e| e.file_name().to_string_lossy().starts_with("data-before-")).unwrap().path();
|
||||||
|
assert_eq!(fs::read(old.join("characters.ibd")).unwrap(), b"live");
|
||||||
|
swap(&root, &meta, &point, &snapshot, false).unwrap();
|
||||||
|
assert_eq!(fs::read(root.join("mysql/data/characters.ibd")).unwrap(), b"saved");
|
||||||
|
assert!(root.join("mysql/data/empty_schema").is_dir());
|
||||||
|
}
|
||||||
|
#[test]
|
||||||
|
fn corrupt_or_different_engine_snapshots_do_not_move_live_data() {
|
||||||
|
let (_temp, root, meta, point, snapshot) = fixture();
|
||||||
|
fsx::atomic_write(&point.join("mysql-data/characters.ibd"), b"corrupt").unwrap();
|
||||||
|
assert!(swap(&root, &meta, &point, &snapshot, false).is_err());
|
||||||
|
assert_eq!(fs::read(root.join("mysql/data/characters.ibd")).unwrap(), b"live");
|
||||||
|
fsx::atomic_write(&point.join("mysql-data/characters.ibd"), b"saved").unwrap();
|
||||||
|
fsx::atomic_write(&root.join("mysql/bin/mysqld.exe"), b"new-engine").unwrap();
|
||||||
|
assert!(swap(&root, &meta, &point, &snapshot, false).is_err());
|
||||||
|
assert_eq!(fs::read(root.join("mysql/data/characters.ibd")).unwrap(), b"live");
|
||||||
|
}
|
||||||
|
#[test]
|
||||||
|
fn compressed_snapshots_verify_every_file_and_reject_unlisted_entries() {
|
||||||
|
let (_temp, root, meta, point, mut snapshot) = fixture();
|
||||||
|
let source = point.join("mysql-data");
|
||||||
|
compress(&source, &point, &mut snapshot).unwrap();
|
||||||
|
assert!(snapshot.archive_sha256.is_some());
|
||||||
|
swap(&root, &meta, &point, &snapshot, false).unwrap();
|
||||||
|
assert_eq!(fs::read(root.join("mysql/data/characters.ibd")).unwrap(), b"saved");
|
||||||
|
fsx::atomic_write(&root.join("mysql/data/characters.ibd"), b"preserve").unwrap();
|
||||||
|
let archive_path = point.join(&snapshot.path);
|
||||||
|
let encoder = zstd::Encoder::new(fs::File::create(&archive_path).unwrap(), 3).unwrap();
|
||||||
|
let mut archive = tar::Builder::new(encoder);
|
||||||
|
archive.append_file("unlisted.ibd", &mut fs::File::open(source.join("characters.ibd")).unwrap()).unwrap();
|
||||||
|
archive.into_inner().unwrap().finish().unwrap();
|
||||||
|
snapshot.archive_sha256 = Some(fsx::sha256_file(&archive_path).unwrap());
|
||||||
|
assert!(swap(&root, &meta, &point, &snapshot, false).is_err());
|
||||||
|
assert_eq!(fs::read(root.join("mysql/data/characters.ibd")).unwrap(), b"preserve");
|
||||||
|
fsx::atomic_write(&archive_path, b"damaged").unwrap();
|
||||||
|
assert!(verify(&point, &snapshot).is_err());
|
||||||
|
}
|
||||||
|
#[test]
|
||||||
|
fn private_rehearsals_reject_external_database_connections() {
|
||||||
|
let (_temp, root, _meta, _point, _snapshot) = fixture();
|
||||||
|
fsx::atomic_write_json(&root.join("Settings/repack.json"), &serde_json::json!({"mysqlPort":3307})).unwrap();
|
||||||
|
fsx::atomic_write_json(&root.join("Settings/database.json"), &serde_json::json!({"rootPassword":"test-root","appPassword":"test-app"})).unwrap();
|
||||||
|
fsx::atomic_write(&root.join("Settings/worldserver.conf.template"), b"LoginDatabaseInfo = \"@LoginDatabaseInfo@\"\nWorldDatabaseInfo = \"@WorldDatabaseInfo@\"\nCharacterDatabaseInfo = \"@CharacterDatabaseInfo@\"\n").unwrap();
|
||||||
|
fsx::atomic_write(&root.join("Settings/authserver.conf.template"), b"LoginDatabaseInfo = \"127.0.0.1;3307;acore;test-app;acore_auth\"\n").unwrap();
|
||||||
|
validate_connections(&root, &root).unwrap();
|
||||||
|
fsx::atomic_write(&root.join("Settings/authserver.conf.template"), b"LoginDatabaseInfo = \"192.0.2.1;3307;acore;test-app;acore_auth\"\n").unwrap();
|
||||||
|
let error = validate_connections(&root, &root).unwrap_err().to_string();
|
||||||
|
assert!(error.contains("external database"));
|
||||||
|
assert!(!error.contains("test-app"));
|
||||||
|
}
|
||||||
|
#[test]
|
||||||
|
fn a_changed_live_database_invalidates_the_rehearsal() {
|
||||||
|
let (_temp, root, _meta, _point, snapshot) = fixture();
|
||||||
|
assert!(unchanged(&root, &snapshot).is_err());
|
||||||
|
fsx::atomic_write(&root.join("mysql/data/characters.ibd"), b"saved").unwrap();
|
||||||
|
fs::create_dir_all(root.join("mysql/data/empty_schema")).unwrap();
|
||||||
|
unchanged(&root, &snapshot).unwrap();
|
||||||
|
fsx::atomic_write(&root.join("mysql/data/extra.ibd"), b"new data").unwrap();
|
||||||
|
assert!(unchanged(&root, &snapshot).is_err());
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -217,6 +217,7 @@ pub fn build(src: &Path, out: &Path, opts: &BuildOptions, progress: &dyn Fn(&str
|
|||||||
split.close_current()?;
|
split.close_current()?;
|
||||||
|
|
||||||
let manifest = Manifest {
|
let manifest = Manifest {
|
||||||
|
compatibility: None,
|
||||||
schema: crate::manifest::SCHEMA,
|
schema: crate::manifest::SCHEMA,
|
||||||
kind: opts.kind,
|
kind: opts.kind,
|
||||||
version: opts.version.clone(),
|
version: opts.version.clone(),
|
||||||
@@ -503,6 +504,7 @@ mod tests {
|
|||||||
fs::write(d.path().join(name), &bytes).unwrap();
|
fs::write(d.path().join(name), &bytes).unwrap();
|
||||||
let ok_sha = fsx::sha256_bytes(b"data");
|
let ok_sha = fsx::sha256_bytes(b"data");
|
||||||
let m = Manifest {
|
let m = Manifest {
|
||||||
|
compatibility: None,
|
||||||
schema: 1,
|
schema: 1,
|
||||||
kind: Kind::Base,
|
kind: Kind::Base,
|
||||||
version: "0.1.0".into(),
|
version: "0.1.0".into(),
|
||||||
|
|||||||
@@ -0,0 +1,41 @@
|
|||||||
|
//! Which kind of server a new installation is on this computer. This is the one place where the host decides: a Windows
|
||||||
|
//! computer installs a repack, anything else installs a Docker server. The screens and the commands ask here and then
|
||||||
|
//! call the code of that kind, so no platform check is scattered through shared code.
|
||||||
|
|
||||||
|
use serde::Serialize;
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize)]
|
||||||
|
#[serde(rename_all = "kebab-case")]
|
||||||
|
pub enum Flavor {
|
||||||
|
/// The CoA Repack: Windows executables supervised by the repack's launcher.
|
||||||
|
Repack,
|
||||||
|
/// MySQL, the auth server and the world server in Docker containers.
|
||||||
|
Docker,
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn flavor() -> Flavor {
|
||||||
|
if cfg!(windows) {
|
||||||
|
Flavor::Repack
|
||||||
|
} else {
|
||||||
|
Flavor::Docker
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn the_host_decides_once() {
|
||||||
|
#[cfg(windows)]
|
||||||
|
assert_eq!(flavor(), Flavor::Repack);
|
||||||
|
#[cfg(not(windows))]
|
||||||
|
assert_eq!(flavor(), Flavor::Docker);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn the_screens_read_the_flavor_as_a_plain_word() {
|
||||||
|
assert_eq!(serde_json::to_string(&Flavor::Repack).unwrap(), "\"repack\"");
|
||||||
|
assert_eq!(serde_json::to_string(&Flavor::Docker).unwrap(), "\"docker\"");
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -65,10 +65,16 @@ pub fn state(root: &Path) -> Result<RealmState> {
|
|||||||
fsx::read_json(&root.join(STATE))
|
fsx::read_json(&root.join(STATE))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// The world server executable of this folder: `worldserver.exe` in a repack, `worldserver` in a Docker server.
|
||||||
|
fn world_binary(root: &Path) -> std::path::PathBuf {
|
||||||
|
let exe = root.join("Core/worldserver.exe");
|
||||||
|
if exe.exists() { exe } else { root.join("Core/worldserver") }
|
||||||
|
}
|
||||||
|
|
||||||
pub fn view(root: &Path) -> Result<View> {
|
pub fn view(root: &Path) -> Result<View> {
|
||||||
let s = state(root)?;
|
let s = state(root)?;
|
||||||
// Inspect the binary itself; templates or an old log cannot prove installed support.
|
// Inspect the binary itself; templates or an old log cannot prove installed support.
|
||||||
let supported = fs::read(root.join("Core/worldserver.exe"))?
|
let supported = fs::read(world_binary(root))?
|
||||||
.windows(b"Wildcard synergy settings".len()).any(|w| w == b"Wildcard synergy settings");
|
.windows(b"Wildcard synergy settings".len()).any(|w| w == b"Wildcard synergy settings");
|
||||||
Ok(View { active: s.active, wildcard_created: s.wildcard_created, supported, recovery_pending: root.join(JOURNAL).exists(), simultaneous: s.simultaneous, secondary_world_port: s.secondary_world_port, secondary_running: crate::multiworld::is_running(root) })
|
Ok(View { active: s.active, wildcard_created: s.wildcard_created, supported, recovery_pending: root.join(JOURNAL).exists(), simultaneous: s.simultaneous, secondary_world_port: s.secondary_world_port, secondary_running: crate::multiworld::is_running(root) })
|
||||||
}
|
}
|
||||||
@@ -269,6 +275,8 @@ pub fn select(root: &Path, mode: Mode) -> Result<View> {
|
|||||||
|
|
||||||
/// Adapt the bundled launcher's canonical schema and realm choices without changing its supervision logic.
|
/// Adapt the bundled launcher's canonical schema and realm choices without changing its supervision logic.
|
||||||
pub fn prepare_launcher(root: &Path) -> Result<()> {
|
pub fn prepare_launcher(root: &Path) -> Result<()> {
|
||||||
|
// A Docker server has no launcher to adapt: the Docker backend reads the active realm itself.
|
||||||
|
if crate::docker::is_docker(root) { return Ok(()); }
|
||||||
let path = root.join("Scripts/manage.py");
|
let path = root.join("Scripts/manage.py");
|
||||||
let source = fs::read_to_string(&path)?;
|
let source = fs::read_to_string(&path)?;
|
||||||
let patched = patch_launcher(&source)?;
|
let patched = patch_launcher(&source)?;
|
||||||
@@ -353,6 +361,31 @@ pub fn setup_realmlist(root: &Path) -> Result<()> {
|
|||||||
mod tests {
|
mod tests {
|
||||||
use super::*;
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn a_docker_server_is_checked_for_wildcard_support_in_its_own_binary() {
|
||||||
|
let d = tempfile::tempdir().unwrap();
|
||||||
|
fs::create_dir_all(d.path().join("Core")).unwrap();
|
||||||
|
fs::create_dir_all(d.path().join("Settings")).unwrap();
|
||||||
|
fs::write(d.path().join("Settings/docker.json"), br#"{"project":"t1"}"#).unwrap();
|
||||||
|
fs::write(d.path().join("Core/worldserver"), b"ELF...Wildcard synergy settings...").unwrap();
|
||||||
|
assert!(view(d.path()).unwrap().supported, "worldserver without .exe is read too");
|
||||||
|
fs::write(d.path().join("Core/worldserver"), b"ELF...an older build").unwrap();
|
||||||
|
assert!(!view(d.path()).unwrap().supported);
|
||||||
|
// The repack's executable still wins when both exist, so a repack is read as before.
|
||||||
|
fs::write(d.path().join("Core/worldserver.exe"), b"MZ...Wildcard synergy settings").unwrap();
|
||||||
|
assert!(view(d.path()).unwrap().supported);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn a_docker_server_has_no_launcher_to_adapt() {
|
||||||
|
let d = tempfile::tempdir().unwrap();
|
||||||
|
fs::create_dir_all(d.path().join("Settings")).unwrap();
|
||||||
|
// No Scripts/manage.py anywhere: on a repack this fails, on a Docker server there is nothing to do.
|
||||||
|
assert!(prepare_launcher(d.path()).is_err());
|
||||||
|
fs::write(d.path().join("Settings/docker.json"), br#"{"project":"t1"}"#).unwrap();
|
||||||
|
prepare_launcher(d.path()).unwrap();
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn fresh_wildcard_disables_bots_and_preserves_scaling() {
|
fn fresh_wildcard_disables_bots_and_preserves_scaling() {
|
||||||
let mut f = Files::new();
|
let mut f = Files::new();
|
||||||
|
|||||||
@@ -44,8 +44,17 @@ fn introduction_rank(repo: &Path, pathspecs: &[&str]) -> std::collections::HashM
|
|||||||
rank
|
rank
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Every SQL script of a core checkout (released + pending updates, module base and update scripts), in application order.
|
/// Incremental SQL of a core checkout. Installation-only module bases must never be replayed on a live database.
|
||||||
pub fn collect_core_sql(core: &Path) -> Result<Vec<SqlFile>> {
|
pub fn collect_core_sql(core: &Path) -> Result<Vec<SqlFile>> {
|
||||||
|
collect_core_sql_mode(core, false)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// A clean installation also needs the module tables and initial seed data.
|
||||||
|
pub fn collect_core_install_sql(core: &Path) -> Result<Vec<SqlFile>> {
|
||||||
|
collect_core_sql_mode(core, true)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn collect_core_sql_mode(core: &Path, include_base: bool) -> Result<Vec<SqlFile>> {
|
||||||
let mut out = Vec::new();
|
let mut out = Vec::new();
|
||||||
let mut push = |db: &str, id: String, abs: PathBuf, origin: String| -> Result<()> {
|
let mut push = |db: &str, id: String, abs: PathBuf, origin: String| -> Result<()> {
|
||||||
let sha256 = fsx::sha256_file(&abs)?;
|
let sha256 = fsx::sha256_file(&abs)?;
|
||||||
@@ -69,7 +78,7 @@ pub fn collect_core_sql(core: &Path) -> Result<Vec<SqlFile>> {
|
|||||||
let mname = name.replace('-', "_");
|
let mname = name.replace('-', "_");
|
||||||
for kind in ["auth", "characters", "world"] {
|
for kind in ["auth", "characters", "world"] {
|
||||||
let base = m.path().join(format!("data/sql/db-{kind}"));
|
let base = m.path().join(format!("data/sql/db-{kind}"));
|
||||||
for f in sql_in(&base.join("base")) {
|
for f in if include_base { sql_in(&base.join("base")) } else { vec![] } {
|
||||||
let stem = f.file_stem().unwrap().to_string_lossy().into_owned();
|
let stem = f.file_stem().unwrap().to_string_lossy().into_owned();
|
||||||
let rel = format!("modules/{name}/data/sql/db-{kind}/base/{}", f.file_name().unwrap().to_string_lossy());
|
let rel = format!("modules/{name}/data/sql/db-{kind}/base/{}", f.file_name().unwrap().to_string_lossy());
|
||||||
push(kind, format!("mod_{mname}__base__{stem}"), f, rel)?;
|
push(kind, format!("mod_{mname}__base__{stem}"), f, rel)?;
|
||||||
@@ -144,6 +153,9 @@ fn walk(root: &Path, dir: &Path, out: &mut Vec<String>) -> Result<()> {
|
|||||||
|
|
||||||
/// Build a cumulative update: every file of `tree` that differs from the base, plus every SQL script. Unsigned.
|
/// Build a cumulative update: every file of `tree` that differs from the base, plus every SQL script. Unsigned.
|
||||||
pub fn pack_update(p: &UpdateParams, progress: &dyn Fn(&str)) -> Result<Manifest> {
|
pub fn pack_update(p: &UpdateParams, progress: &dyn Fn(&str)) -> Result<Manifest> {
|
||||||
|
if let Some(file) = p.sql.iter().find(|file| file.id.starts_with("mod_") && file.id.contains("__base__")) {
|
||||||
|
return Err(Error::Invalid(format!("Module installation SQL {} cannot be included in an update package.", file.id)));
|
||||||
|
}
|
||||||
let base: BTreeMap<String, &str> = p.base_manifest.files.iter().map(|f| (f.path.to_lowercase(), f.sha256.as_str())).collect();
|
let base: BTreeMap<String, &str> = p.base_manifest.files.iter().map(|f| (f.path.to_lowercase(), f.sha256.as_str())).collect();
|
||||||
let work = p.out.with_file_name(format!("{}-staging", p.out.file_name().unwrap().to_string_lossy()));
|
let work = p.out.with_file_name(format!("{}-staging", p.out.file_name().unwrap().to_string_lossy()));
|
||||||
let _ = fs::remove_dir_all(&work);
|
let _ = fs::remove_dir_all(&work);
|
||||||
@@ -218,7 +230,7 @@ mod tests {
|
|||||||
write(c, "data/sql/updates/db_characters/2026_01_02_00.sql", "SELECT 3;");
|
write(c, "data/sql/updates/db_characters/2026_01_02_00.sql", "SELECT 3;");
|
||||||
write(c, "modules/mod-x/data/sql/db-world/base/01_a.sql", "SELECT 4;");
|
write(c, "modules/mod-x/data/sql/db-world/base/01_a.sql", "SELECT 4;");
|
||||||
write(c, "modules/mod-x/data/sql/db-world/2026_02_02_00_b.sql", "SELECT 5;");
|
write(c, "modules/mod-x/data/sql/db-world/2026_02_02_00_b.sql", "SELECT 5;");
|
||||||
let v = collect_core_sql(c).unwrap();
|
let v = collect_core_install_sql(c).unwrap();
|
||||||
let ids: Vec<(&str, &str)> = v.iter().map(|f| (f.db.as_str(), f.id.as_str())).collect();
|
let ids: Vec<(&str, &str)> = v.iter().map(|f| (f.db.as_str(), f.id.as_str())).collect();
|
||||||
assert!(ids.contains(&("world", "2026_01_01_00")) && ids.contains(&("world", "rev_1")) && ids.contains(&("characters", "2026_01_02_00")));
|
assert!(ids.contains(&("world", "2026_01_01_00")) && ids.contains(&("world", "rev_1")) && ids.contains(&("characters", "2026_01_02_00")));
|
||||||
assert!(ids.contains(&("world", "mod_mod_x__base__01_a")) && ids.contains(&("world", "mod_mod_x__2026_02_02_00_b")));
|
assert!(ids.contains(&("world", "mod_mod_x__base__01_a")) && ids.contains(&("world", "mod_mod_x__2026_02_02_00_b")));
|
||||||
@@ -226,6 +238,27 @@ mod tests {
|
|||||||
let base_pos = ids.iter().position(|x| x.1 == "mod_mod_x__base__01_a").unwrap();
|
let base_pos = ids.iter().position(|x| x.1 == "mod_mod_x__base__01_a").unwrap();
|
||||||
let upd_pos = ids.iter().position(|x| x.1 == "mod_mod_x__2026_02_02_00_b").unwrap();
|
let upd_pos = ids.iter().position(|x| x.1 == "mod_mod_x__2026_02_02_00_b").unwrap();
|
||||||
assert!(base_pos < upd_pos, "a module's base script precedes its updates");
|
assert!(base_pos < upd_pos, "a module's base script precedes its updates");
|
||||||
|
let updates = collect_core_sql(c).unwrap();
|
||||||
|
assert!(!updates.iter().any(|f| f.id.contains("__base__")));
|
||||||
|
assert!(updates.iter().any(|f| f.id == "mod_mod_x__2026_02_02_00_b"));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn update_packaging_rejects_module_seed_sql_before_creating_output() {
|
||||||
|
let d = tempfile::tempdir().unwrap();
|
||||||
|
let base: Manifest = serde_json::from_value(serde_json::json!({
|
||||||
|
"schema": 1, "kind": "base", "version": "1.0.0", "core": {"commit": null},
|
||||||
|
"builtAt": "test", "minManagerVersion": "0.1.0", "files": []
|
||||||
|
})).unwrap();
|
||||||
|
let out = d.path().join("out");
|
||||||
|
let sql = vec![SqlFile { db: "world".into(), id: "mod_mod_raid__base__03_boss_schedule".into(),
|
||||||
|
origin: "modules/mod-raid/data/sql/db-world/base/03_boss_schedule.sql".into(),
|
||||||
|
abs: d.path().join("seed.sql"), sha256: "a".repeat(64) }];
|
||||||
|
let result = pack_update(&UpdateParams { tree: d.path(), base_manifest: &base, sql: &sql,
|
||||||
|
out: &out, version: "1.1.0".into(), core_commit: None, bots_commit: None, part_size: 1024 }, &|_| {});
|
||||||
|
assert!(result.unwrap_err().to_string().contains("installation SQL"));
|
||||||
|
assert!(!out.exists());
|
||||||
|
assert!(!d.path().join("out-staging").exists());
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
|
|||||||
@@ -5,6 +5,82 @@ use crate::{backup, fsx, install, manifest::{Kind, Migration}, migrations, packa
|
|||||||
|
|
||||||
const MARKER: &str = ".release-schema-fixture";
|
const MARKER: &str = ".release-schema-fixture";
|
||||||
|
|
||||||
|
struct QualificationEnv<'a>(crate::update::RepackEnv<'a>);
|
||||||
|
|
||||||
|
impl crate::update::Env for QualificationEnv<'_> {
|
||||||
|
fn activate(&self) -> Result<()> { Ok(()) }
|
||||||
|
fn ensure_stopped(&self) -> Result<()> { self.0.ensure_stopped() }
|
||||||
|
fn preflight(&self, manifest: &crate::manifest::Manifest) -> Result<()> { self.0.preflight(manifest) }
|
||||||
|
fn snapshot(&self) -> Result<String> { self.0.snapshot() }
|
||||||
|
fn verify_snapshot(&self, id: &str) -> Result<()> { self.0.verify_snapshot(id) }
|
||||||
|
fn rehearse(&self, manifest: &crate::manifest::Manifest, tree: &Path, items: &[crate::update::PlanItem], point: &str) -> Result<()> { self.0.rehearse(manifest, tree, items, point) }
|
||||||
|
fn restore_snapshot(&self, id: &str) -> Result<()> { self.0.restore_snapshot(id) }
|
||||||
|
fn migrate(&self, manifest: &crate::manifest::Manifest, staged: &Path) -> Result<crate::migrations::ApplyReport> { self.0.migrate(manifest, staged) }
|
||||||
|
fn validate(&self) -> Result<()> { self.0.validate() }
|
||||||
|
fn validate_recovery(&self) -> Result<()> { self.0.validate_recovery() }
|
||||||
|
fn recover_validation(&self) -> Result<()> { self.0.recover_validation() }
|
||||||
|
fn automatic_rollback(&self) -> bool { true }
|
||||||
|
// Health checks use the normal private validation; qualification never opens game ports after commit.
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn qualify_upgrade(base: &Path, source: &Path, candidate: &Path, fixture: &Path, trusted_key: &str) -> Result<serde_json::Value> {
|
||||||
|
use crate::update::Env;
|
||||||
|
if !cfg!(windows) { return Err(Error::Invalid("Manager upgrade qualification requires a Windows fixture.".into())); }
|
||||||
|
if fixture.exists() || !fixture.file_name().is_some_and(|name| name.to_string_lossy().starts_with("coa-schema-fixture-")) {
|
||||||
|
return Err(Error::Invalid("Upgrade qualification requires a new disposable coa-schema-fixture-* directory.".into()));
|
||||||
|
}
|
||||||
|
let metadata = crate::registry::metadata_dir_for(fixture)?;
|
||||||
|
if metadata.exists() { return Err(Error::Invalid("Upgrade fixture metadata already exists.".into())); }
|
||||||
|
let (base_manifest, base_bytes) = pkgsource::fetch_manifest(&pkgsource::Source::Dir(base.into()), trusted_key)?;
|
||||||
|
let (source_manifest, source_bytes) = pkgsource::fetch_manifest(&pkgsource::Source::Dir(source.into()), trusted_key)?;
|
||||||
|
let (candidate_manifest, _) = pkgsource::fetch_manifest(&pkgsource::Source::Dir(candidate.into()), trusted_key)?;
|
||||||
|
if candidate_manifest.kind != Kind::Update || !matches!(source_manifest.kind, Kind::Base | Kind::Update)
|
||||||
|
|| (source_manifest.kind == Kind::Base && fsx::sha256_bytes(&base_bytes) != fsx::sha256_bytes(&source_bytes)) {
|
||||||
|
return Err(Error::Invalid("Invalid source or candidate package for upgrade qualification.".into()));
|
||||||
|
}
|
||||||
|
extract_base(base, fixture, trusted_key)?;
|
||||||
|
package::extract_selected(base, &base_manifest, fixture, &|path| path.starts_with("Data/"), &|_, _| {})?;
|
||||||
|
let mut meta = crate::registry::InstallMeta::new(crate::registry::InstallKind::New, fixture);
|
||||||
|
meta.core.version = Some(base_manifest.version.clone());
|
||||||
|
meta.core.commit = base_manifest.core.commit.clone();
|
||||||
|
meta.original_hashes = base_manifest.files.iter().map(|file| (file.path.clone(), file.sha256.clone())).collect();
|
||||||
|
crate::registry::MetaDir::create(fixture, &meta)?;
|
||||||
|
let env = QualificationEnv(crate::update::RepackEnv { root: fixture, meta_dir: &metadata });
|
||||||
|
let apply = |package: &Path| -> Result<()> {
|
||||||
|
let outcome = crate::update::apply(&crate::update::Params {
|
||||||
|
root: fixture, meta_dir: &metadata, source: pkgsource::Source::Dir(package.into()),
|
||||||
|
trusted_key, cancel: crate::download::Cancel::default(), resolutions: Default::default(),
|
||||||
|
env: &env, fail_after_ops: None,
|
||||||
|
}, &|_, _| {})?;
|
||||||
|
if outcome.txn.state != crate::update::State::Committed {
|
||||||
|
return Err(Error::Invalid("Upgrade qualification did not commit.".into()));
|
||||||
|
}
|
||||||
|
env.ensure_stopped()
|
||||||
|
};
|
||||||
|
install::with_scratch_ports(fixture, || {
|
||||||
|
if source_manifest.kind == Kind::Update { apply(source)?; }
|
||||||
|
let user_file = fixture.join("Core/configs/coa-qualification-user.conf");
|
||||||
|
let user_bytes = b"Qualification.UserSetting = 7391\r\n";
|
||||||
|
fsx::atomic_write(&user_file, user_bytes)?;
|
||||||
|
apply(candidate)?;
|
||||||
|
if std::fs::read(&user_file)?.as_slice() != user_bytes {
|
||||||
|
return Err(Error::Invalid("The update changed a user configuration file.".into()));
|
||||||
|
}
|
||||||
|
let (_, installed) = crate::registry::MetaDir::open(&metadata)?;
|
||||||
|
if installed.core.version.as_deref() != Some(candidate_manifest.version.as_str())
|
||||||
|
|| crate::update_isolation::pending(&metadata) || crate::update::pending_checked(&metadata)?.is_some() {
|
||||||
|
return Err(Error::Invalid("The update left inconsistent metadata or an unfinished transaction.".into()));
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
})?;
|
||||||
|
Ok(serde_json::json!({
|
||||||
|
"schema": 1, "result": "passed", "fromVersion": source_manifest.version,
|
||||||
|
"toVersion": candidate_manifest.version, "fromManifestSha256": fsx::sha256_bytes(&source_bytes),
|
||||||
|
"fromSchemaSha256": source_manifest.files.iter().find(|file| file.path == schema_check::CONTRACT).map(|file| &file.sha256),
|
||||||
|
"checks": ["manager-transaction", "private-user-database-rehearsal", "database-schema", "private-auth-world-startup", "existing-identities", "user-file-preservation"],
|
||||||
|
}))
|
||||||
|
}
|
||||||
|
|
||||||
pub fn collect(core: &Path, bots: Option<&Path>, repairs: Option<&Path>) -> Result<Vec<SqlFile>> {
|
pub fn collect(core: &Path, bots: Option<&Path>, repairs: Option<&Path>) -> Result<Vec<SqlFile>> {
|
||||||
let mut files = release::collect_core_sql(core)?;
|
let mut files = release::collect_core_sql(core)?;
|
||||||
if let Some(bots) = bots { files.extend(release::collect_bots_sql(bots)?); }
|
if let Some(bots) = bots { files.extend(release::collect_bots_sql(bots)?); }
|
||||||
@@ -38,7 +114,12 @@ pub fn extract_base(source: &Path, fixture: &Path, trusted_key: &str) -> Result<
|
|||||||
["mysql/", "settings/", "runtime/", "scripts/", "core/", "bugreport/"].iter().any(|prefix| path.starts_with(prefix))
|
["mysql/", "settings/", "runtime/", "scripts/", "core/", "bugreport/"].iter().any(|prefix| path.starts_with(prefix))
|
||||||
}, &|_, _| {})?;
|
}, &|_, _| {})?;
|
||||||
fsx::atomic_write(&fixture.join(MARKER), b"disposable release-schema fixture")?;
|
fsx::atomic_write(&fixture.join(MARKER), b"disposable release-schema fixture")?;
|
||||||
install::bootstrap_database(fixture)
|
// A Linux computer has no Windows database program: the fixture is a Docker server over the package's data directory.
|
||||||
|
if cfg!(windows) {
|
||||||
|
install::bootstrap_database(fixture)
|
||||||
|
} else {
|
||||||
|
crate::docker::fixture::prepare(fixture)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn capture_release(fixture: &Path, tree: &Path, sql: &[SqlFile]) -> Result<()> {
|
pub fn capture_release(fixture: &Path, tree: &Path, sql: &[SqlFile]) -> Result<()> {
|
||||||
@@ -67,6 +148,61 @@ pub fn capture_release(fixture: &Path, tree: &Path, sql: &[SqlFile]) -> Result<(
|
|||||||
}))
|
}))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn validate_startup(fixture: &Path, tree: &Path, base: &Path, trusted_key: &str) -> Result<()> {
|
||||||
|
use crate::update::Env;
|
||||||
|
if !cfg!(windows) {
|
||||||
|
return Err(Error::Invalid("Repack startup qualification requires a Windows runner.".into()));
|
||||||
|
}
|
||||||
|
if !fixture.file_name().is_some_and(|n| n.to_string_lossy().starts_with("coa-schema-fixture-"))
|
||||||
|
|| std::fs::read(fixture.join(MARKER)).ok().as_deref() != Some(b"disposable release-schema fixture") {
|
||||||
|
return Err(Error::Invalid("Startup qualification requires a disposable release-schema fixture.".into()));
|
||||||
|
}
|
||||||
|
let metadata = crate::registry::metadata_dir_for(fixture)?;
|
||||||
|
if metadata.exists() { return Err(Error::Invalid("Startup fixture already has Manager metadata; use a fresh fixture.".into())); }
|
||||||
|
schema_check::require_release_contract(tree)?;
|
||||||
|
for name in ["worldserver.exe", "authserver.exe"] {
|
||||||
|
if !tree.join("Core").join(name).is_file() {
|
||||||
|
return Err(Error::Invalid(format!("Startup candidate is missing {name}.")));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let (manifest, _) = pkgsource::fetch_manifest(&pkgsource::Source::Dir(base.into()), trusted_key)?;
|
||||||
|
if manifest.kind != Kind::Base { return Err(Error::Invalid("Startup qualification requires a signed base package.".into())); }
|
||||||
|
let mut directories = vec![tree.to_path_buf()];
|
||||||
|
let mut files = Vec::new();
|
||||||
|
while let Some(directory) = directories.pop() {
|
||||||
|
for entry in std::fs::read_dir(directory)? {
|
||||||
|
let entry = entry?;
|
||||||
|
let kind = entry.file_type()?;
|
||||||
|
if kind.is_symlink() { return Err(Error::Invalid("Startup release tree must not contain symbolic links.".into())); }
|
||||||
|
let path = entry.path();
|
||||||
|
fsx::ensure_within(tree, &path)?;
|
||||||
|
if kind.is_dir() { directories.push(path); continue; }
|
||||||
|
if !kind.is_file() { return Err(Error::Invalid("Startup release tree contains an unsupported file type.".into())); }
|
||||||
|
let relative = path.strip_prefix(tree).map_err(|e| Error::Invalid(e.to_string()))?.to_path_buf();
|
||||||
|
let first = relative.components().next().unwrap().as_os_str().to_string_lossy();
|
||||||
|
if !matches!(first.as_ref(), "Core" | "Scripts" | "Data" | "Extras" | "Licenses") {
|
||||||
|
return Err(Error::Invalid("Startup release tree contains installation-specific files.".into()));
|
||||||
|
}
|
||||||
|
fsx::ensure_within(fixture, &fixture.join(&relative))?;
|
||||||
|
files.push(relative);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
package::extract_selected(base, &manifest, fixture, &|path| path.starts_with("Data/"), &|_, _| {})?;
|
||||||
|
for relative in files {
|
||||||
|
let target = fsx::ensure_within(fixture, &fixture.join(&relative))?;
|
||||||
|
fsx::atomic_write(&target, &std::fs::read(tree.join(relative))?)?;
|
||||||
|
}
|
||||||
|
let meta = crate::registry::InstallMeta::new(crate::registry::InstallKind::New, fixture);
|
||||||
|
crate::registry::MetaDir::create(fixture, &meta)?;
|
||||||
|
let env = crate::update::RepackEnv { root: fixture, meta_dir: &metadata };
|
||||||
|
env.validate()?;
|
||||||
|
env.ensure_stopped()?;
|
||||||
|
if crate::update_isolation::pending(&metadata) {
|
||||||
|
return Err(Error::Invalid("Startup qualification left unfinished isolated validation.".into()));
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
pub fn verify_package(dir: &Path, trusted_key: &str) -> Result<()> {
|
pub fn verify_package(dir: &Path, trusted_key: &str) -> Result<()> {
|
||||||
let (manifest, _) = pkgsource::fetch_manifest(&pkgsource::Source::Dir(dir.into()), trusted_key)?;
|
let (manifest, _) = pkgsource::fetch_manifest(&pkgsource::Source::Dir(dir.into()), trusted_key)?;
|
||||||
if !manifest.files.iter().any(|f| f.path == schema_check::CONTRACT && f.size > 0) {
|
if !manifest.files.iter().any(|f| f.path == schema_check::CONTRACT && f.size > 0) {
|
||||||
@@ -78,12 +214,36 @@ pub fn verify_package(dir: &Path, trusted_key: &str) -> Result<()> {
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn verify_upgrade_fixture(dir: &Path, trusted_key: &str) -> Result<()> {
|
||||||
|
let (manifest, _) = pkgsource::fetch_manifest(&pkgsource::Source::Dir(dir.into()), trusted_key)?;
|
||||||
|
if !matches!(manifest.kind, Kind::Base | Kind::Update) {
|
||||||
|
return Err(Error::Invalid("Upgrade fixtures must be base or server update packages.".into()));
|
||||||
|
}
|
||||||
|
let scratch = tempfile::tempdir()?;
|
||||||
|
package::extract_selected(dir, &manifest, scratch.path(), &|path| path == schema_check::CONTRACT, &|_, _| {})?;
|
||||||
|
if manifest.kind == Kind::Update || manifest.files.iter().any(|file| file.path == schema_check::CONTRACT) {
|
||||||
|
schema_check::require_release_contract(scratch.path())?;
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
use super::*;
|
use super::*;
|
||||||
use base64::{engine::general_purpose::STANDARD, Engine};
|
use base64::{engine::general_purpose::STANDARD, Engine};
|
||||||
use ed25519_dalek::{Signer, SigningKey};
|
use ed25519_dalek::{Signer, SigningKey};
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn startup_qualification_refuses_real_server_folders_before_writes() {
|
||||||
|
let directory = tempfile::tempdir().unwrap();
|
||||||
|
let server = directory.path().join("live-server");
|
||||||
|
std::fs::create_dir(&server).unwrap();
|
||||||
|
fsx::atomic_write(&server.join("owner-data"), b"untouched").unwrap();
|
||||||
|
assert!(validate_startup(&server, directory.path(), directory.path(), "unused").is_err());
|
||||||
|
assert_eq!(std::fs::read(server.join("owner-data")).unwrap(), b"untouched");
|
||||||
|
assert!(!crate::registry::metadata_dir_for(&server).unwrap().exists());
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn signed_packages_must_carry_a_real_complete_schema_contract() {
|
fn signed_packages_must_carry_a_real_complete_schema_contract() {
|
||||||
let dir = tempfile::tempdir().unwrap();
|
let dir = tempfile::tempdir().unwrap();
|
||||||
@@ -122,6 +282,31 @@ mod tests {
|
|||||||
let dir = tempfile::tempdir().unwrap();
|
let dir = tempfile::tempdir().unwrap();
|
||||||
assert!(extract_base(dir.path(), dir.path(), "irrelevant").is_err());
|
assert!(extract_base(dir.path(), dir.path(), "irrelevant").is_err());
|
||||||
assert!(capture_release(dir.path(), dir.path(), &[]).is_err());
|
assert!(capture_release(dir.path(), dir.path(), &[]).is_err());
|
||||||
|
assert!(qualify_upgrade(dir.path(), dir.path(), dir.path(), dir.path(), "irrelevant").is_err());
|
||||||
assert!(!dir.path().join(schema_check::CONTRACT).exists());
|
assert!(!dir.path().join(schema_check::CONTRACT).exists());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn only_legacy_base_fixtures_may_omit_the_schema_contract() {
|
||||||
|
let dir = tempfile::tempdir().unwrap();
|
||||||
|
let tree = dir.path().join("tree");
|
||||||
|
let out = dir.path().join("package");
|
||||||
|
fsx::atomic_write(&tree.join("Core/example.txt"), b"fixture").unwrap();
|
||||||
|
let key = SigningKey::from_bytes(&[29; 32]);
|
||||||
|
let public = STANDARD.encode(key.verifying_key().as_bytes());
|
||||||
|
let options = package::BuildOptions { kind: Kind::Base, version: "0.2.0".into(), core_commit: None, bots_commit: None, built_at: "test".into(), part_size: 1024 * 1024, migrations: vec![] };
|
||||||
|
package::build(&tree, &out, &options, &|_| {}).unwrap();
|
||||||
|
let sign = || {
|
||||||
|
let bytes = std::fs::read(out.join("manifest.json")).unwrap();
|
||||||
|
fsx::atomic_write(&out.join("manifest.json.sig"), STANDARD.encode(key.sign(&bytes).to_bytes()).as_bytes()).unwrap();
|
||||||
|
};
|
||||||
|
sign();
|
||||||
|
verify_upgrade_fixture(&out, &public).unwrap();
|
||||||
|
assert!(verify_package(&out, &public).is_err());
|
||||||
|
let mut manifest: serde_json::Value = fsx::read_json(&out.join("manifest.json")).unwrap();
|
||||||
|
manifest["kind"] = "update".into();
|
||||||
|
fsx::atomic_write_json(&out.join("manifest.json"), &manifest).unwrap();
|
||||||
|
sign();
|
||||||
|
assert!(verify_upgrade_fixture(&out, &public).is_err());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -39,6 +39,35 @@ pub fn require_release_contract(root: &Path) -> Result<Contract> {
|
|||||||
#[derive(Debug, Serialize)]
|
#[derive(Debug, Serialize)]
|
||||||
pub struct Problem { pub database: String, pub table: String, pub column: String, pub detail: String }
|
pub struct Problem { pub database: String, pub table: String, pub column: String, pub detail: String }
|
||||||
|
|
||||||
|
/// Keep all differences for support; never change a database to match a contract automatically.
|
||||||
|
pub fn check_with_report(db: &Db, root: &Path) -> Result<Vec<Problem>> {
|
||||||
|
let problems = check(db, root)?;
|
||||||
|
if problems.is_empty() { return Ok(problems); }
|
||||||
|
let report = serde_json::json!({
|
||||||
|
"schema": 1, "checkedAt": chrono::Utc::now().to_rfc3339(),
|
||||||
|
"realm": db.realm().name(), "problems": problems,
|
||||||
|
});
|
||||||
|
let path = crate::registry::metadata_dir_for(root)?.join("diagnostics")
|
||||||
|
.join(format!("schema-validation-{}-{}.json", db.realm().name(), uuid::Uuid::new_v4()));
|
||||||
|
// A log write failure must neither hide the original mismatch nor accept an invalid schema.
|
||||||
|
if let Err(error) = fsx::atomic_write_json(&path, &report) {
|
||||||
|
tracing::warn!(%error, path = %path.display(), "Could not save database schema report");
|
||||||
|
}
|
||||||
|
Ok(problems)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn describe_signature(signature: &str) -> String {
|
||||||
|
let fields: Vec<_> = signature.split('|').collect();
|
||||||
|
if fields.len() != 4 { return signature.into(); }
|
||||||
|
let decode = |value: &str| -> String {
|
||||||
|
if value == "<NULL>" { return "no default".into(); }
|
||||||
|
if value == "<NONE>" { return "none".into(); }
|
||||||
|
hex::decode(value).ok().and_then(|bytes| String::from_utf8(bytes).ok())
|
||||||
|
.map(|text| format!("{text:?}")).unwrap_or_else(|| value.into())
|
||||||
|
};
|
||||||
|
format!("type={}, nullable={}, default={}, extra={}", fields[0], fields[1], decode(fields[2]), decode(fields[3]))
|
||||||
|
}
|
||||||
|
|
||||||
fn read_columns(db: &Db, kind: &str) -> Result<BTreeMap<String, BTreeMap<String, String>>> {
|
fn read_columns(db: &Db, kind: &str) -> Result<BTreeMap<String, BTreeMap<String, String>>> {
|
||||||
let schema = db.realm_schema(crate::db::schema_of(kind)?);
|
let schema = db.realm_schema(crate::db::schema_of(kind)?);
|
||||||
let text = db.query(&format!("SELECT TABLE_NAME,COLUMN_NAME,CONCAT(COLUMN_TYPE,'|',IS_NULLABLE,'|',IF(COLUMN_DEFAULT IS NULL,'<NULL>',HEX(COLUMN_DEFAULT)),'|',IF(EXTRA='','<NONE>',HEX(EXTRA))) FROM information_schema.COLUMNS WHERE TABLE_SCHEMA='{schema}' ORDER BY TABLE_NAME,ORDINAL_POSITION;"))?;
|
let text = db.query(&format!("SELECT TABLE_NAME,COLUMN_NAME,CONCAT(COLUMN_TYPE,'|',IS_NULLABLE,'|',IF(COLUMN_DEFAULT IS NULL,'<NULL>',HEX(COLUMN_DEFAULT)),'|',IF(EXTRA='','<NONE>',HEX(EXTRA))) FROM information_schema.COLUMNS WHERE TABLE_SCHEMA='{schema}' ORDER BY TABLE_NAME,ORDINAL_POSITION;"))?;
|
||||||
@@ -56,6 +85,46 @@ pub fn capture(db: &Db, root: &Path) -> Result<()> {
|
|||||||
fsx::atomic_write_json(&root.join(CONTRACT), &Contract { schema: 1, columns })
|
fsx::atomic_write_json(&root.join(CONTRACT), &Contract { schema: 1, columns })
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn missing_default(expected: &str, actual: &str) -> Option<String> {
|
||||||
|
let expected: Vec<_> = expected.split('|').collect();
|
||||||
|
let actual: Vec<_> = actual.split('|').collect();
|
||||||
|
if expected.len() != 4 || actual.len() != 4 || expected[0] != actual[0]
|
||||||
|
|| expected[1] != "NO" || actual[1] != "NO" || expected[3] != "<NONE>" || actual[3] != "<NONE>"
|
||||||
|
|| actual[2] != "<NULL>" || matches!(expected[2], "<NULL>" | "<NONE>") { return None; }
|
||||||
|
String::from_utf8(hex::decode(expected[2]).ok()?).ok()
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Only restore a missing literal default from the exact signed target contract. Never alter data or custom defaults.
|
||||||
|
pub(crate) fn repair_missing_defaults(db: &Db, root: &Path, signed_hash: Option<&str>) -> Result<()> {
|
||||||
|
let Some(signed_hash) = signed_hash else { return Ok(()); };
|
||||||
|
if fsx::sha256_file(&root.join(CONTRACT))? != signed_hash {
|
||||||
|
return Err(crate::Error::Invalid("The target schema contract differs from the signed update.".into()));
|
||||||
|
}
|
||||||
|
let contract = require_release_contract(root)?;
|
||||||
|
let mut repaired = Vec::new();
|
||||||
|
let quote = |identifier: &str| format!("`{}`", identifier.replace('`', "``"));
|
||||||
|
for (kind, tables) in &contract.columns {
|
||||||
|
let schema = db.realm_schema(crate::db::schema_of(kind)?);
|
||||||
|
let actual = read_columns(db, kind)?;
|
||||||
|
let base_tables: BTreeSet<_> = db.tables(crate::db::schema_of(kind)?)?.into_iter().collect();
|
||||||
|
for (table, columns) in tables {
|
||||||
|
if !base_tables.contains(table) { continue; }
|
||||||
|
if matches!(table.as_str(), "updates" | "updates_include" | "coa_manager_migrations") { continue; }
|
||||||
|
for (column, expected) in columns {
|
||||||
|
let Some(found) = actual.get(table).and_then(|columns| columns.get(column)) else { continue; };
|
||||||
|
let Some(value) = missing_default(expected, found) else { continue; };
|
||||||
|
db.query(&format!("SET SESSION sql_mode=CONCAT_WS(',',@@SESSION.sql_mode,'NO_BACKSLASH_ESCAPES'); ALTER TABLE {}.{} ALTER COLUMN {} SET DEFAULT '{}';", quote(schema), quote(table), quote(column), value.replace('\'', "''")))?;
|
||||||
|
repaired.push(serde_json::json!({"database":schema,"table":table,"column":column,"action":"restore-missing-default"}));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if !repaired.is_empty() {
|
||||||
|
let path = crate::registry::metadata_dir_for(root)?.join("diagnostics").join(format!("database-repair-{}.json", uuid::Uuid::new_v4()));
|
||||||
|
fsx::atomic_write_json(&path, &serde_json::json!({"schema":1,"checkedAt":chrono::Utc::now().to_rfc3339(),"contractSha256":signed_hash,"repairs":repaired}))?;
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
pub fn check(db: &Db, root: &Path) -> Result<Vec<Problem>> {
|
pub fn check(db: &Db, root: &Path) -> Result<Vec<Problem>> {
|
||||||
let contract = if root.join(CONTRACT).is_file() {
|
let contract = if root.join(CONTRACT).is_file() {
|
||||||
let contract: Contract = fsx::read_json(&root.join(CONTRACT))?;
|
let contract: Contract = fsx::read_json(&root.join(CONTRACT))?;
|
||||||
@@ -98,7 +167,7 @@ pub fn check(db: &Db, root: &Path) -> Result<Vec<Problem>> {
|
|||||||
for (column, want) in cols {
|
for (column, want) in cols {
|
||||||
let found = actual[table].get(column);
|
let found = actual[table].get(column);
|
||||||
if found.is_none() || (!want.is_empty() && found != Some(want)) {
|
if found.is_none() || (!want.is_empty() && found != Some(want)) {
|
||||||
problems.push(Problem { database: kind.clone(), table: table.clone(), column: column.clone(), detail: found.map(|s| format!("Expected {want}, found {s}")).unwrap_or_else(|| "Missing column".into()) });
|
problems.push(Problem { database: kind.clone(), table: table.clone(), column: column.clone(), detail: found.map(|s| format!("Expected {}, found {}", describe_signature(want), describe_signature(s))).unwrap_or_else(|| "Missing column".into()) });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -146,6 +215,23 @@ fn missing_coa_starts(rows: &str) -> Vec<Problem> {
|
|||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
use super::*;
|
use super::*;
|
||||||
|
#[test]
|
||||||
|
fn default_repair_only_accepts_missing_literal_defaults_without_other_schema_changes() {
|
||||||
|
assert_eq!(missing_default("int unsigned|NO|30|<NONE>", "int unsigned|NO|<NULL>|<NONE>"), Some("0".into()));
|
||||||
|
for actual in ["int unsigned|NO|3939|<NONE>", "int|NO|<NULL>|<NONE>", "int unsigned|YES|<NULL>|<NONE>", "int unsigned|NO|<NULL>|6175746f5f696e6372656d656e74"] {
|
||||||
|
assert!(missing_default("int unsigned|NO|30|<NONE>", actual).is_none());
|
||||||
|
}
|
||||||
|
assert!(missing_default("timestamp|NO|43555252454e545f54494d455354414d50|44454641554c545f47454e455241544544", "timestamp|NO|<NULL>|<NONE>").is_none());
|
||||||
|
assert!(missing_default("int|NO|zz|<NONE>", "int|NO|<NULL>|<NONE>").is_none());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn schema_defaults_are_readable_and_not_conflated() {
|
||||||
|
assert_eq!(describe_signature("int unsigned|NO|30|<NONE>"), "type=int unsigned, nullable=NO, default=\"0\", extra=none");
|
||||||
|
assert!(describe_signature("int unsigned|NO|<NULL>|<NONE>").contains("default=no default"));
|
||||||
|
assert!(describe_signature("varchar(8)|YES||<NONE>").contains("default=\"\""));
|
||||||
|
assert_eq!(describe_signature("legacy"), "legacy");
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn a_release_cannot_use_a_partial_or_empty_schema_contract() {
|
fn a_release_cannot_use_a_partial_or_empty_schema_contract() {
|
||||||
|
|||||||
+456
-62
@@ -85,9 +85,14 @@ fn legacy_databases_started() -> bool { true }
|
|||||||
|
|
||||||
/// Everything the transaction needs from the outside world; tests provide a fake.
|
/// Everything the transaction needs from the outside world; tests provide a fake.
|
||||||
pub trait Env {
|
pub trait Env {
|
||||||
|
fn activate(&self) -> Result<()> { Ok(()) }
|
||||||
|
fn recover_validation(&self) -> Result<()> { Ok(()) }
|
||||||
|
fn automatic_rollback(&self) -> bool { false }
|
||||||
|
fn validate_recovery(&self) -> Result<()> { self.validate() }
|
||||||
fn ensure_stopped(&self) -> Result<()>;
|
fn ensure_stopped(&self) -> Result<()>;
|
||||||
fn preflight(&self, _manifest: &Manifest) -> Result<()> { Ok(()) }
|
fn preflight(&self, _manifest: &Manifest) -> Result<()> { Ok(()) }
|
||||||
fn verify_snapshot(&self, _id: &str) -> Result<()> { Ok(()) }
|
fn verify_snapshot(&self, _id: &str) -> Result<()> { Ok(()) }
|
||||||
|
fn rehearse(&self, _manifest: &Manifest, _tree: &Path, _items: &[PlanItem], _point: &str) -> Result<()> { Ok(()) }
|
||||||
/// Create a recovery point for the databases and configuration; returns its id.
|
/// Create a recovery point for the databases and configuration; returns its id.
|
||||||
fn snapshot(&self) -> Result<String>;
|
fn snapshot(&self) -> Result<String>;
|
||||||
fn restore_snapshot(&self, id: &str) -> Result<()>;
|
fn restore_snapshot(&self, id: &str) -> Result<()>;
|
||||||
@@ -177,6 +182,9 @@ pub fn unfinished(meta: &Path) -> Option<Txn> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub fn ensure_recovered(meta: &Path) -> Result<()> {
|
pub fn ensure_recovered(meta: &Path) -> Result<()> {
|
||||||
|
if crate::update_isolation::pending(meta) {
|
||||||
|
return Err(Error::Invalid("Interrupted startup validation must be recovered before starting the server.".into()));
|
||||||
|
}
|
||||||
if let Some(t) = pending_checked(meta)? {
|
if let Some(t) = pending_checked(meta)? {
|
||||||
return Err(Error::Invalid(format!("Resolve unfinished update {} before changing or starting the server.", t.id)));
|
return Err(Error::Invalid(format!("Resolve unfinished update {} before changing or starting the server.", t.id)));
|
||||||
}
|
}
|
||||||
@@ -283,12 +291,22 @@ pub enum DatabaseAccess {
|
|||||||
OnlyIfRunning,
|
OnlyIfRunning,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// The update packages are those of the Windows repack (executables, a bundled MySQL, a launcher): applying one to a Docker
|
||||||
|
/// server would put Windows files in a Linux server folder. Updating a Docker server is separate work.
|
||||||
|
fn refuse_for_docker(root: &Path) -> Result<()> {
|
||||||
|
if crate::docker::is_docker(root) {
|
||||||
|
return Err(Error::Invalid("Updates are not available for Docker servers yet.".into()));
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
/// Describe the update; a managed launcher may need a one-time authenticated payload check.
|
/// Describe the update; a managed launcher may need a one-time authenticated payload check.
|
||||||
pub fn preview(root: &Path, meta: &InstallMeta, source: &Source, trusted_key: &str, resolutions: &BTreeMap<String, Resolution>) -> Result<Preview> {
|
pub fn preview(root: &Path, meta: &InstallMeta, source: &Source, trusted_key: &str, resolutions: &BTreeMap<String, Resolution>) -> Result<Preview> {
|
||||||
preview_with(root, meta, source, trusted_key, resolutions, DatabaseAccess::Start)
|
preview_with(root, meta, source, trusted_key, resolutions, DatabaseAccess::Start)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn preview_with(root: &Path, meta: &InstallMeta, source: &Source, trusted_key: &str, resolutions: &BTreeMap<String, Resolution>, access: DatabaseAccess) -> Result<Preview> {
|
pub fn preview_with(root: &Path, meta: &InstallMeta, source: &Source, trusted_key: &str, resolutions: &BTreeMap<String, Resolution>, access: DatabaseAccess) -> Result<Preview> {
|
||||||
|
refuse_for_docker(root)?;
|
||||||
let meta_dir = crate::registry::metadata_dir_for(root)?;
|
let meta_dir = crate::registry::metadata_dir_for(root)?;
|
||||||
let _lock = operation_lock(&meta_dir)?;
|
let _lock = operation_lock(&meta_dir)?;
|
||||||
ensure_recovered(&meta_dir)?;
|
ensure_recovered(&meta_dir)?;
|
||||||
@@ -350,6 +368,15 @@ fn launcher_already_integrated(root: &Path, meta_dir: &Path, meta: &InstallMeta,
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn reject_downgrade(meta: &InstallMeta, manifest: &Manifest) -> Result<()> {
|
fn reject_downgrade(meta: &InstallMeta, manifest: &Manifest) -> Result<()> {
|
||||||
|
if let Some(c) = &manifest.compatibility {
|
||||||
|
let platform = if cfg!(windows) { "windows-x86_64" } else { "linux-x86_64" };
|
||||||
|
if c.platform != platform {
|
||||||
|
return Err(Error::Invalid(format!("This package targets {} rather than {platform}.", c.platform)));
|
||||||
|
}
|
||||||
|
if meta.core.version.as_ref().is_none_or(|version| !c.source_versions.contains(version)) {
|
||||||
|
return Err(Error::Invalid("This server version is outside the release's tested compatibility matrix.".into()));
|
||||||
|
}
|
||||||
|
}
|
||||||
if let Some(installed) = meta.core.version.as_deref() {
|
if let Some(installed) = meta.core.version.as_deref() {
|
||||||
if let (Some(have), Some(candidate)) = (crate::manifest::parse_version(installed), crate::manifest::parse_version(&manifest.version)) {
|
if let (Some(have), Some(candidate)) = (crate::manifest::parse_version(installed), crate::manifest::parse_version(&manifest.version)) {
|
||||||
if candidate < have {
|
if candidate < have {
|
||||||
@@ -370,6 +397,11 @@ fn check_manifest(m: &Manifest) -> Result<()> {
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn validate_candidate(meta: &InstallMeta, manifest: &Manifest) -> Result<()> {
|
||||||
|
check_manifest(manifest)?;
|
||||||
|
reject_downgrade(meta, manifest)
|
||||||
|
}
|
||||||
|
|
||||||
pub struct Params<'a> {
|
pub struct Params<'a> {
|
||||||
pub root: &'a Path,
|
pub root: &'a Path,
|
||||||
pub meta_dir: &'a Path,
|
pub meta_dir: &'a Path,
|
||||||
@@ -396,6 +428,7 @@ fn step(report: &dyn Fn(&str, u8), name: &str, pct: u8) {
|
|||||||
/// Run the whole update. On failure before the new build is validated the files are rolled back automatically;
|
/// Run the whole update. On failure before the new build is validated the files are rolled back automatically;
|
||||||
/// a build that is applied but unhealthy is left in `NeedsDecision` so the owner chooses.
|
/// a build that is applied but unhealthy is left in `NeedsDecision` so the owner chooses.
|
||||||
pub fn apply(p: &Params, report: &dyn Fn(&str, u8)) -> Result<Outcome> {
|
pub fn apply(p: &Params, report: &dyn Fn(&str, u8)) -> Result<Outcome> {
|
||||||
|
refuse_for_docker(p.root)?;
|
||||||
let (root, meta_dir) = (p.root, p.meta_dir);
|
let (root, meta_dir) = (p.root, p.meta_dir);
|
||||||
let _lock = operation_lock(meta_dir)?;
|
let _lock = operation_lock(meta_dir)?;
|
||||||
ensure_recovered(meta_dir)?;
|
ensure_recovered(meta_dir)?;
|
||||||
@@ -461,6 +494,14 @@ pub fn apply(p: &Params, report: &dyn Fn(&str, u8)) -> Result<Outcome> {
|
|||||||
txn.recovery_point = Some(p.env.snapshot().map_err(|e| Error::Invalid(format!("The update was not applied because the safety backup failed: {e}")))?);
|
txn.recovery_point = Some(p.env.snapshot().map_err(|e| Error::Invalid(format!("The update was not applied because the safety backup failed: {e}")))?);
|
||||||
let point_meta = crate::backup::point_json(meta_dir, txn.recovery_point.as_deref().unwrap())?;
|
let point_meta = crate::backup::point_json(meta_dir, txn.recovery_point.as_deref().unwrap())?;
|
||||||
if point_meta.is_file() { txn.recovery_hashes.insert("@point".into(), fsx::sha256_file(&point_meta)?); }
|
if point_meta.is_file() { txn.recovery_hashes.insert("@point".into(), fsx::sha256_file(&point_meta)?); }
|
||||||
|
save(meta_dir, &txn)?;
|
||||||
|
step(report, "Testing the update on a private copy of your server", 54);
|
||||||
|
if let Err(error) = p.env.rehearse(&m, &tree, &items, txn.recovery_point.as_deref().unwrap()) {
|
||||||
|
txn.state = State::Failed;
|
||||||
|
txn.message = Some(format!("The private update rehearsal failed: {error}. The installed server was not updated."));
|
||||||
|
save(meta_dir, &txn)?;
|
||||||
|
return Err(Error::Invalid(txn.message.unwrap()));
|
||||||
|
}
|
||||||
|
|
||||||
txn.ops = items
|
txn.ops = items
|
||||||
.iter()
|
.iter()
|
||||||
@@ -484,7 +525,7 @@ pub fn apply(p: &Params, report: &dyn Fn(&str, u8)) -> Result<Outcome> {
|
|||||||
|
|
||||||
// MySQL DDL can commit before a later statement fails. Restore the full recovery point on failure.
|
// MySQL DDL can commit before a later statement fails. Restore the full recovery point on failure.
|
||||||
let mut migrated = None;
|
let mut migrated = None;
|
||||||
if !m.migrations.is_empty() {
|
if !m.migrations.is_empty() || m.files.iter().any(|file| file.path == crate::schema_check::CONTRACT) {
|
||||||
step(report, "Updating the database", 75);
|
step(report, "Updating the database", 75);
|
||||||
txn.databases_started = true;
|
txn.databases_started = true;
|
||||||
save(meta_dir, &txn)?;
|
save(meta_dir, &txn)?;
|
||||||
@@ -503,7 +544,14 @@ pub fn apply(p: &Params, report: &dyn Fn(&str, u8)) -> Result<Outcome> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
step(report, "Starting the updated server", 85);
|
step(report, "Starting the updated server", 85);
|
||||||
|
// Core startup can apply SQL and write character data even when the package has no explicit migrations.
|
||||||
|
txn.databases_started = true;
|
||||||
|
save(meta_dir, &txn)?;
|
||||||
if let Err(e) = p.env.validate() {
|
if let Err(e) = p.env.validate() {
|
||||||
|
if p.env.automatic_rollback() {
|
||||||
|
return fail_after_apply(p, &mut txn, &before, &tree,
|
||||||
|
format!("The updated server did not start correctly: {e}"), migrated);
|
||||||
|
}
|
||||||
txn.state = State::NeedsDecision;
|
txn.state = State::NeedsDecision;
|
||||||
txn.message = Some(format!("The updated server did not start correctly: {e}"));
|
txn.message = Some(format!("The updated server did not start correctly: {e}"));
|
||||||
save(meta_dir, &txn)?;
|
save(meta_dir, &txn)?;
|
||||||
@@ -511,6 +559,7 @@ pub fn apply(p: &Params, report: &dyn Fn(&str, u8)) -> Result<Outcome> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
finish(root, meta_dir, &mut meta, &m, &tree, &mut txn)?;
|
finish(root, meta_dir, &mut meta, &m, &tree, &mut txn)?;
|
||||||
|
p.env.activate()?;
|
||||||
step(report, "Done", 100);
|
step(report, "Done", 100);
|
||||||
let _ = archive;
|
let _ = archive;
|
||||||
Ok(Outcome { txn, migrations: migrated })
|
Ok(Outcome { txn, migrations: migrated })
|
||||||
@@ -583,17 +632,24 @@ pub fn retry_validation(root: &Path, meta_dir: &Path, id: &str, fallback: &Sourc
|
|||||||
}
|
}
|
||||||
let (_, mut meta) = MetaDir::open(meta_dir)?;
|
let (_, mut meta) = MetaDir::open(meta_dir)?;
|
||||||
finish(root, meta_dir, &mut meta, &manifest, &dir.join("tree"), &mut txn)?;
|
finish(root, meta_dir, &mut meta, &manifest, &dir.join("tree"), &mut txn)?;
|
||||||
|
env.activate()?;
|
||||||
Ok(txn)
|
Ok(txn)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn fail_after_apply(p: &Params, txn: &mut Txn, before: &Path, tree: &Path, why: String, report: Option<ApplyReport>) -> Result<Outcome> {
|
fn fail_after_apply(p: &Params, txn: &mut Txn, before: &Path, tree: &Path, why: String, report: Option<ApplyReport>) -> Result<Outcome> {
|
||||||
tracing::error!(transaction = %txn.id, databases_started = txn.databases_started, "server update failed; restoring recovery point");
|
tracing::error!(transaction = %txn.id, databases_started = txn.databases_started, "server update failed; restoring recovery point");
|
||||||
let restored = restore_transaction(p.root, p.meta_dir, before, txn, p.env);
|
let restored = restore_transaction(p.root, p.meta_dir, before, txn, p.env).and_then(|()| {
|
||||||
|
if p.env.automatic_rollback() { p.env.validate_recovery() } else { Ok(()) }
|
||||||
|
});
|
||||||
|
if restored.is_err() { let _ = p.env.ensure_stopped(); }
|
||||||
tracing::info!(transaction = %txn.id, recovered = restored.is_ok(), "server update recovery finished");
|
tracing::info!(transaction = %txn.id, recovered = restored.is_ok(), "server update recovery finished");
|
||||||
txn.state = if restored.is_ok() { State::RolledBack } else { State::Failed };
|
txn.state = if restored.is_ok() { State::RolledBack } else { State::Failed };
|
||||||
txn.message = Some(match &restored { Ok(()) => why.clone(), Err(e) => format!("{why} Recovery failed: {e}") });
|
txn.message = Some(match &restored { Ok(()) => why.clone(), Err(e) => format!("{why} Recovery failed: {e}") });
|
||||||
save(p.meta_dir, txn)?;
|
save(p.meta_dir, txn)?;
|
||||||
if restored.is_ok() { let _ = fs::remove_dir_all(tree); }
|
if restored.is_ok() {
|
||||||
|
let _ = fs::remove_dir_all(tree);
|
||||||
|
if p.env.automatic_rollback() { p.env.activate()?; }
|
||||||
|
}
|
||||||
let _ = report;
|
let _ = report;
|
||||||
Err(Error::Invalid(match restored {
|
Err(Error::Invalid(match restored {
|
||||||
Ok(()) if txn.databases_started => format!("{why} The server files and databases were restored to the recovery point."),
|
Ok(()) if txn.databases_started => format!("{why} The server files and databases were restored to the recovery point."),
|
||||||
@@ -617,6 +673,7 @@ fn restore_transaction(root: &Path, meta: &Path, before: &Path, txn: &mut Txn, e
|
|||||||
}
|
}
|
||||||
if !before.join("manager-install.json").is_file() { return Err(Error::Invalid("The saved installation metadata is missing; no restoration was started.".into())); }
|
if !before.join("manager-install.json").is_file() { return Err(Error::Invalid("The saved installation metadata is missing; no restoration was started.".into())); }
|
||||||
env.ensure_stopped()?;
|
env.ensure_stopped()?;
|
||||||
|
env.recover_validation()?;
|
||||||
if txn.databases_started {
|
if txn.databases_started {
|
||||||
let id = txn.recovery_point.as_deref().ok_or_else(|| Error::Invalid("The database recovery point is missing.".into()))?;
|
let id = txn.recovery_point.as_deref().ok_or_else(|| Error::Invalid("The database recovery point is missing.".into()))?;
|
||||||
env.restore_snapshot(id)?;
|
env.restore_snapshot(id)?;
|
||||||
@@ -700,6 +757,7 @@ fn restore_files(root: &Path, before: &Path, txn: &mut Txn) -> Result<()> {
|
|||||||
|
|
||||||
/// Restore the database recovery point first, then restore binaries and configuration.
|
/// Restore the database recovery point first, then restore binaries and configuration.
|
||||||
pub fn rollback(root: &Path, meta_dir: &Path, id: &str, env: &dyn Env) -> Result<Txn> {
|
pub fn rollback(root: &Path, meta_dir: &Path, id: &str, env: &dyn Env) -> Result<Txn> {
|
||||||
|
refuse_for_docker(root)?;
|
||||||
let _lock = operation_lock(meta_dir)?;
|
let _lock = operation_lock(meta_dir)?;
|
||||||
let mut txn = load(meta_dir, id)?;
|
let mut txn = load(meta_dir, id)?;
|
||||||
if matches!(txn.state, State::Committed | State::RolledBack) {
|
if matches!(txn.state, State::Committed | State::RolledBack) {
|
||||||
@@ -803,13 +861,27 @@ impl RepackEnv<'_> {
|
|||||||
return Err(Error::Invalid("The update recovery point does not contain every required database and configuration.".into()));
|
return Err(Error::Invalid("The update recovery point does not contain every required database and configuration.".into()));
|
||||||
}
|
}
|
||||||
if !crate::backup::verify(self.meta_dir, &point.id)?.ok { return Err(Error::Invalid("The recovery point failed verification.".into())); }
|
if !crate::backup::verify(self.meta_dir, &point.id)?.ok { return Err(Error::Invalid("The recovery point failed verification.".into())); }
|
||||||
|
if let Some(snapshot) = &point.mysql_snapshot {
|
||||||
|
if fsx::sha256_file(&self.root.join("mysql/bin/mysqld.exe"))? != snapshot.server_sha256 {
|
||||||
|
return Err(Error::Invalid("The MySQL executable differs from the recovery point.".into()));
|
||||||
|
}
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
crate::backup::with_database(self.root, |db| {
|
crate::backup::with_database(self.root, |db| {
|
||||||
let db = db.clone().for_realm(crate::realms::Mode::Coa);
|
let db = db.clone().for_realm(crate::realms::Mode::Coa);
|
||||||
|
let mut objects = Vec::new();
|
||||||
for component in point.components.iter().filter(|c| c.sha256.is_some()) {
|
for component in point.components.iter().filter(|c| c.sha256.is_some()) {
|
||||||
let schema = if component.name.contains('-') || component.name == "playerbots" { crate::db::schema_of(&component.name)? } else { point.realm.schema(&component.name)? };
|
let schema = if component.name.contains('-') || component.name == "playerbots" { crate::db::schema_of(&component.name)? } else { point.realm.schema(&component.name)? };
|
||||||
if db.extra_objects(schema)? != 0 {
|
objects.extend(db.recovery_objects(schema)?);
|
||||||
return Err(Error::Invalid(format!("Database {schema} has routines, triggers or views that automatic recovery cannot restore. The update was not started.")));
|
}
|
||||||
|
if !objects.is_empty() {
|
||||||
|
let path = self.meta_dir.join("diagnostics").join(format!("database-recovery-{}.json", uuid::Uuid::new_v4()));
|
||||||
|
let report = serde_json::json!({ "schema": 1, "checkedAt": chrono::Utc::now().to_rfc3339(), "recoveryPoint": point.id, "objects": objects });
|
||||||
|
if let Err(error) = fsx::atomic_write_json(&path, &report) {
|
||||||
|
tracing::warn!(%error, "Could not save database recovery compatibility report");
|
||||||
}
|
}
|
||||||
|
let sample = objects.iter().take(3).map(|object| format!("{}.{} ({})", object["database"].as_str().unwrap_or("?"), object["name"].as_str().unwrap_or("?"), object["kind"].as_str().unwrap_or("?"))).collect::<Vec<_>>().join(", ");
|
||||||
|
return Err(Error::Invalid(format!("Automatic recovery does not support {} database objects: {sample}. Export diagnostics for the complete list. The update was not started.", objects.len())));
|
||||||
}
|
}
|
||||||
Ok(())
|
Ok(())
|
||||||
})
|
})
|
||||||
@@ -827,7 +899,116 @@ impl RepackEnv<'_> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl Env for RepackEnv<'_> {
|
impl Env for RepackEnv<'_> {
|
||||||
|
fn recover_validation(&self) -> Result<()> {
|
||||||
|
crate::update_isolation::restore(self.root, self.meta_dir)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn activate(&self) -> Result<()> {
|
||||||
|
ensure_recovered(self.meta_dir)?;
|
||||||
|
let outcome = crate::driver::validate_update(self.root)?;
|
||||||
|
if outcome.ok { Ok(()) } else {
|
||||||
|
Err(Error::Invalid(format!("The update transaction finished, but the server could not start: {}", crate::driver::startup_failure(self.root, &outcome))))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn automatic_rollback(&self) -> bool { true }
|
||||||
|
fn rehearse(&self, manifest: &Manifest, tree: &Path, items: &[PlanItem], id: &str) -> Result<()> {
|
||||||
|
if items.iter().any(|item| item.action != Action::Skip && item.path.to_ascii_lowercase().starts_with("mysql/")) {
|
||||||
|
return Err(Error::Invalid("A server update cannot replace MySQL while using a cold recovery copy; a separate database engine upgrade is required.".into()));
|
||||||
|
}
|
||||||
|
let point = crate::backup::get(self.meta_dir, id)?;
|
||||||
|
let Some(snapshot) = &point.mysql_snapshot else {
|
||||||
|
// Docker uses its separate experimental release channel until its clone runner is qualified.
|
||||||
|
if crate::docker::is_docker(self.root) { return Ok(()); }
|
||||||
|
return Err(Error::Invalid("This installation has no complete MySQL recovery copy for an update rehearsal.".into()));
|
||||||
|
};
|
||||||
|
crate::mysql_snapshot::validate_connections(self.root, self.root)?;
|
||||||
|
crate::mysql_snapshot::stop(self.root)?;
|
||||||
|
let point_dir = crate::backup::point_json(self.meta_dir, id)?.parent().unwrap().to_path_buf();
|
||||||
|
let fixture = crate::mysql_snapshot::rehearsal_copy(self.root, self.meta_dir, &point_dir, snapshot)?;
|
||||||
|
let metadata = crate::registry::metadata_dir_for(&fixture)?;
|
||||||
|
let env = RepackEnv { root: &fixture, meta_dir: &metadata };
|
||||||
|
let result = crate::install::with_scratch_ports(&fixture, || {
|
||||||
|
let mut txn = Txn { id: "rehearsal".into(), state: State::Applying, from_version: None,
|
||||||
|
to_version: manifest.version.clone(), recovery_point: None, databases_started: false,
|
||||||
|
ops: items.iter().filter(|item| item.action != Action::Skip).map(|item| Op {
|
||||||
|
path: item.path.clone(), action: item.action, reason: item.reason.clone(),
|
||||||
|
new_sha256: manifest.files.iter().find(|file| file.path == item.path).unwrap().sha256.clone(),
|
||||||
|
had_previous: fsx::safe_join(&fixture, &item.path).is_ok_and(|path| path.is_file()), started:false, done:false,
|
||||||
|
}).collect(), message:None, recovery_hashes:BTreeMap::new() };
|
||||||
|
let before = txn_dir(&metadata, &txn.id)?.join("before");
|
||||||
|
fs::create_dir_all(&before)?;
|
||||||
|
apply_ops(&fixture, tree, &before, &manifest.files, &mut txn, &metadata, None)?;
|
||||||
|
crate::mysql_snapshot::validate_connections(&fixture, self.root)?;
|
||||||
|
crate::mysql_snapshot::isolate_connections(&fixture)?;
|
||||||
|
let identities = crate::backup::with_database(&fixture, |db| {
|
||||||
|
let identities = database_identities(db)?;
|
||||||
|
let realms = crate::realms::state(&fixture)?;
|
||||||
|
let mut modes = vec![realms.active];
|
||||||
|
if realms.wildcard_created { modes.push(if realms.active == crate::realms::Mode::Coa { crate::realms::Mode::Wildcard } else { crate::realms::Mode::Coa }); }
|
||||||
|
for (index, mode) in modes.into_iter().enumerate() {
|
||||||
|
let db = db.clone().for_realm(mode);
|
||||||
|
crate::schema_check::repair_missing_defaults(&db, &fixture, manifest.files.iter().find(|file| file.path == crate::schema_check::CONTRACT).map(|file| file.sha256.as_str()))?;
|
||||||
|
let list: Vec<_> = manifest.migrations.iter().filter(|migration| index == 0 || migration.db != "auth").cloned().collect();
|
||||||
|
let report = crate::migrations::apply_pending(&db, &list, &tree.join("_migrations"), &|| Ok("private rehearsal".into()))?;
|
||||||
|
if let Some((migration, error)) = report.failed { return Err(Error::Invalid(format!("Rehearsal migration {migration} failed: {error}"))); }
|
||||||
|
crate::schema_check::repair_missing_defaults(&db, &fixture, manifest.files.iter().find(|file| file.path == crate::schema_check::CONTRACT).map(|file| file.sha256.as_str()))?;
|
||||||
|
}
|
||||||
|
verify_database_identities(db, &identities)?;
|
||||||
|
Ok(identities)
|
||||||
|
})?;
|
||||||
|
env.validate()?;
|
||||||
|
crate::backup::with_database(&fixture, |db| verify_database_identities(db, &identities))?;
|
||||||
|
env.ensure_stopped()
|
||||||
|
});
|
||||||
|
let stopped = crate::mysql_snapshot::stop(&fixture);
|
||||||
|
let live_state = if result.is_ok() { crate::mysql_snapshot::stop(self.root).and_then(|()| crate::mysql_snapshot::unchanged(self.root, snapshot)) } else { Ok(()) };
|
||||||
|
let logs: BTreeMap<_, _> = ["Core/Logs/auth-console.log", "Core/Logs/world-console.log", "Core/Logs/supervisor.log", "mysql/logs/mysql-error.log"].into_iter()
|
||||||
|
.map(|path| (path, crate::diag::redact(&crate::health::tail(&fixture.join(path), 32768)))).collect();
|
||||||
|
let mut schema_reports = Vec::<serde_json::Value>::new();
|
||||||
|
if let Ok(entries) = fs::read_dir(metadata.join("diagnostics")) {
|
||||||
|
for entry in entries.flatten().filter(|entry| entry.file_name().to_string_lossy().starts_with("schema-validation-")) {
|
||||||
|
let path = fsx::ensure_within(&metadata, &entry.path())?;
|
||||||
|
if fs::metadata(&path)?.len() <= 4 * 1024 * 1024 { schema_reports.push(fsx::read_json(&path)?); }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let report = serde_json::json!({"schema":1,"checkedAt":chrono::Utc::now().to_rfc3339(),"toVersion":manifest.version,"recoveryPoint":id,
|
||||||
|
"result":if result.is_ok() && stopped.is_ok() && live_state.is_ok() {"passed"} else {"failed"}, "error":result.as_ref().err().map(ToString::to_string), "stopError":stopped.as_ref().err().map(ToString::to_string), "liveStateError":live_state.as_ref().err().map(ToString::to_string), "logs":logs,"schemaReports":schema_reports,"fixture":fixture});
|
||||||
|
let report_path = self.meta_dir.join("diagnostics").join(format!("database-rehearsal-{}.json", uuid::Uuid::new_v4()));
|
||||||
|
fsx::atomic_write_json(&report_path, &report)?;
|
||||||
|
stopped?;
|
||||||
|
let parent = fixture.parent().unwrap();
|
||||||
|
let owned = fsx::ensure_within(&self.meta_dir.join("rehearsals"), parent)?;
|
||||||
|
fs::remove_dir_all(owned)?;
|
||||||
|
live_state?;
|
||||||
|
result
|
||||||
|
}
|
||||||
fn preflight(&self, manifest: &Manifest) -> Result<()> {
|
fn preflight(&self, manifest: &Manifest) -> Result<()> {
|
||||||
|
crate::mysql_snapshot::stop_previous_rehearsals(self.meta_dir)?;
|
||||||
|
if let Some(compatibility) = &manifest.compatibility {
|
||||||
|
let (_, meta) = MetaDir::open(self.meta_dir)?;
|
||||||
|
if let Some(source) = meta.core.version.as_ref().and_then(|v| compatibility.source_databases.get(v)) {
|
||||||
|
if let Some(expected) = &source.schema_sha256 {
|
||||||
|
let contract = self.root.join("Scripts/database-schema.json");
|
||||||
|
if fsx::sha256_file(&contract)? != *expected {
|
||||||
|
return Err(Error::Invalid("The installed database schema contract differs from the qualified upgrade source; repair the installation first.".into()));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
crate::backup::with_database(self.root, |db| {
|
||||||
|
let mut modes = vec![crate::realms::Mode::Coa];
|
||||||
|
if crate::realms::state(self.root)?.wildcard_created { modes.push(crate::realms::Mode::Wildcard); }
|
||||||
|
for mode in modes {
|
||||||
|
if let Some(problem) = crate::schema_check::check_with_report(&db.clone().for_realm(mode), self.root)?.first() {
|
||||||
|
if crate::docker::is_docker(self.root) {
|
||||||
|
return Err(Error::Invalid(format!("The installed {} database does not match its upgrade source: {}.{}: {}", mode.name(), problem.database, problem.table, problem.detail)));
|
||||||
|
}
|
||||||
|
tracing::warn!(realm = mode.name(), table = %problem.table, "Installed schema differs; the private candidate rehearsal must qualify this database");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
})?;
|
||||||
|
}
|
||||||
|
}
|
||||||
self.pending_migrations(manifest).map(|_| ())
|
self.pending_migrations(manifest).map(|_| ())
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -861,6 +1042,13 @@ impl Env for RepackEnv<'_> {
|
|||||||
if !["characters", "auth", "world", "configs"].iter().all(|name| point.components.iter().any(|c| c.name == *name)) || !crate::backup::verify(self.meta_dir, id)?.ok {
|
if !["characters", "auth", "world", "configs"].iter().all(|name| point.components.iter().any(|c| c.name == *name)) || !crate::backup::verify(self.meta_dir, id)?.ok {
|
||||||
return Err(Error::Invalid("The full database recovery point is incomplete or damaged.".into()));
|
return Err(Error::Invalid("The full database recovery point is incomplete or damaged.".into()));
|
||||||
}
|
}
|
||||||
|
if let Some(snapshot) = &point.mysql_snapshot {
|
||||||
|
crate::mysql_snapshot::stop(self.root)?;
|
||||||
|
let point_dir = crate::backup::point_json(self.meta_dir, id)?.parent().unwrap().to_path_buf();
|
||||||
|
crate::mysql_snapshot::swap(self.root, self.meta_dir, &point_dir, snapshot, false)?;
|
||||||
|
crate::backup::restore_configs(self.root, self.meta_dir, id)?;
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
for component in point.components.iter().filter(|c| c.sha256.is_some()) {
|
for component in point.components.iter().filter(|c| c.sha256.is_some()) {
|
||||||
crate::backup::restore_database(self.root, self.meta_dir, id, &component.name)?;
|
crate::backup::restore_database(self.root, self.meta_dir, id, &component.name)?;
|
||||||
}
|
}
|
||||||
@@ -872,12 +1060,17 @@ impl Env for RepackEnv<'_> {
|
|||||||
let root = self.root;
|
let root = self.root;
|
||||||
crate::backup::with_database(root, |db| {
|
crate::backup::with_database(root, |db| {
|
||||||
let realms = crate::realms::state(root)?;
|
let realms = crate::realms::state(root)?;
|
||||||
|
if let Some(contract) = manifest.files.iter().find(|file| file.path == crate::schema_check::CONTRACT) {
|
||||||
|
self.migration_snapshot()?;
|
||||||
|
crate::schema_check::repair_missing_defaults(db, root, Some(&contract.sha256))?;
|
||||||
|
}
|
||||||
let mut result = crate::migrations::apply_pending(db, &manifest.migrations, staged, &|| {
|
let mut result = crate::migrations::apply_pending(db, &manifest.migrations, staged, &|| {
|
||||||
self.migration_snapshot()
|
self.migration_snapshot()
|
||||||
})?;
|
})?;
|
||||||
if realms.wildcard_created && result.failed.is_none() {
|
if realms.wildcard_created && result.failed.is_none() {
|
||||||
let other = if realms.active == crate::realms::Mode::Coa { crate::realms::Mode::Wildcard } else { crate::realms::Mode::Coa };
|
let other = if realms.active == crate::realms::Mode::Coa { crate::realms::Mode::Wildcard } else { crate::realms::Mode::Coa };
|
||||||
let other_db = db.clone().for_realm(other);
|
let other_db = db.clone().for_realm(other);
|
||||||
|
crate::schema_check::repair_missing_defaults(&other_db, root, manifest.files.iter().find(|file| file.path == crate::schema_check::CONTRACT).map(|file| file.sha256.as_str()))?;
|
||||||
let shared_snapshot = result.snapshot.clone();
|
let shared_snapshot = result.snapshot.clone();
|
||||||
let migrations: Vec<_> = manifest.migrations.iter().filter(|m| m.db != "auth").cloned().collect();
|
let migrations: Vec<_> = manifest.migrations.iter().filter(|m| m.db != "auth").cloned().collect();
|
||||||
let extra = crate::migrations::apply_pending(&other_db, &migrations, staged, &|| {
|
let extra = crate::migrations::apply_pending(&other_db, &migrations, staged, &|| {
|
||||||
@@ -888,13 +1081,15 @@ impl Env for RepackEnv<'_> {
|
|||||||
result.failed = extra.failed;
|
result.failed = extra.failed;
|
||||||
if result.snapshot.is_none() { result.snapshot = extra.snapshot; }
|
if result.snapshot.is_none() { result.snapshot = extra.snapshot; }
|
||||||
if result.failed.is_none() {
|
if result.failed.is_none() {
|
||||||
if let Some(p) = crate::schema_check::check(&other_db, root)?.first() {
|
crate::schema_check::repair_missing_defaults(&other_db, root, manifest.files.iter().find(|file| file.path == crate::schema_check::CONTRACT).map(|file| file.sha256.as_str()))?;
|
||||||
|
if let Some(p) = crate::schema_check::check_with_report(&other_db, root)?.first() {
|
||||||
return Err(Error::Invalid(format!("Database validation failed on {}: {}.{}: {}", other.name(), p.table, p.column, p.detail)));
|
return Err(Error::Invalid(format!("Database validation failed on {}: {}.{}: {}", other.name(), p.table, p.column, p.detail)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if result.failed.is_none() {
|
if result.failed.is_none() {
|
||||||
let problems = crate::schema_check::check(db, root)?;
|
crate::schema_check::repair_missing_defaults(db, root, manifest.files.iter().find(|file| file.path == crate::schema_check::CONTRACT).map(|file| file.sha256.as_str()))?;
|
||||||
|
let problems = crate::schema_check::check_with_report(db, root)?;
|
||||||
if let Some(p) = problems.first() {
|
if let Some(p) = problems.first() {
|
||||||
return Err(Error::Invalid(format!("Database validation failed: {}.{}.{}: {} ({} problems).", p.database, p.table, p.column, p.detail, problems.len())));
|
return Err(Error::Invalid(format!("Database validation failed: {}.{}.{}: {} ({} problems).", p.database, p.table, p.column, p.detail, problems.len())));
|
||||||
}
|
}
|
||||||
@@ -904,61 +1099,111 @@ impl Env for RepackEnv<'_> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn validate(&self) -> Result<()> {
|
fn validate(&self) -> Result<()> {
|
||||||
use crate::process::{observe, ServiceState};
|
self.validate_server(true)
|
||||||
crate::backup::with_database(self.root, |db| {
|
|
||||||
let mut modes = vec![crate::realms::Mode::Coa];
|
|
||||||
if crate::realms::state(self.root)?.wildcard_created { modes.push(crate::realms::Mode::Wildcard); }
|
|
||||||
for mode in modes {
|
|
||||||
if let Some(p) = crate::schema_check::check(&db.clone().for_realm(mode), self.root)?.first() {
|
|
||||||
return Err(Error::Invalid(format!("Database validation failed on {}: {}.{}: {}", mode.name(), p.database, p.table, p.detail)));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Ok(())
|
|
||||||
})?;
|
|
||||||
// The check start is the first start of the new build: give the module configs the settings the update added
|
|
||||||
// (as a normal start does), or the server logs a "missing property" line for every one of them.
|
|
||||||
match crate::registry::MetaDir::open(self.meta_dir) {
|
|
||||||
Ok((_, meta)) if meta.kind == crate::registry::InstallKind::New => {
|
|
||||||
let _ = crate::config::materialize_module_configs(self.root);
|
|
||||||
}
|
|
||||||
// An imported server gets the files it lacks (nothing it has is changed).
|
|
||||||
_ => {
|
|
||||||
let _ = crate::config::create_missing_module_configs(self.root);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
let started = match crate::driver::validate_update(self.root) {
|
|
||||||
Ok(out) => out,
|
|
||||||
Err(e) => {
|
|
||||||
let _ = crate::driver::run(self.root, crate::driver::Verb::StopAll);
|
|
||||||
return Err(e);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
let ports = crate::layout::read_ports(self.root);
|
|
||||||
let healthy = started.ok && {
|
|
||||||
let deadline = std::time::Instant::now() + std::time::Duration::from_secs(180);
|
|
||||||
let mut ready_since = None;
|
|
||||||
loop {
|
|
||||||
let o = observe(self.root, &ports);
|
|
||||||
if o.mysql.state == ServiceState::Running && o.auth.state == ServiceState::Running && o.world.state == ServiceState::Running && o.secondary_world.as_ref().is_none_or(|s| s.state == ServiceState::Running) {
|
|
||||||
let since = ready_since.get_or_insert_with(std::time::Instant::now);
|
|
||||||
if since.elapsed() >= std::time::Duration::from_secs(10) { break true; }
|
|
||||||
} else {
|
|
||||||
ready_since = None;
|
|
||||||
}
|
|
||||||
if std::time::Instant::now() > deadline {
|
|
||||||
break false;
|
|
||||||
}
|
|
||||||
std::thread::sleep(std::time::Duration::from_secs(2));
|
|
||||||
}
|
|
||||||
};
|
|
||||||
if healthy {
|
|
||||||
return Ok(());
|
|
||||||
}
|
|
||||||
let cause = crate::driver::startup_failure(self.root, &started);
|
|
||||||
// Leave the files unlocked so that a rollback can replace them.
|
|
||||||
let _ = crate::driver::run(self.root, crate::driver::Verb::StopAll);
|
|
||||||
Err(Error::Invalid(cause))
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn validate_recovery(&self) -> Result<()> {
|
||||||
|
self.validate_server(false)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl RepackEnv<'_> {
|
||||||
|
fn validate_server(&self, check_schema: bool) -> Result<()> {
|
||||||
|
let stopped = crate::driver::run(self.root, crate::driver::Verb::StopAll)?;
|
||||||
|
if !stopped.ok { return Err(Error::Invalid("Could not stop the server before isolated validation.".into())); }
|
||||||
|
self.ensure_stopped()?;
|
||||||
|
self.recover_validation()?;
|
||||||
|
let result = (|| -> Result<()> {
|
||||||
|
crate::update_isolation::begin(self.root, self.meta_dir)?;
|
||||||
|
use crate::process::{observe, ServiceState};
|
||||||
|
if check_schema { crate::backup::with_database(self.root, |db| {
|
||||||
|
let mut modes = vec![crate::realms::Mode::Coa];
|
||||||
|
if crate::realms::state(self.root)?.wildcard_created { modes.push(crate::realms::Mode::Wildcard); }
|
||||||
|
for mode in modes {
|
||||||
|
if let Some(p) = crate::schema_check::check_with_report(&db.clone().for_realm(mode), self.root)?.first() {
|
||||||
|
return Err(Error::Invalid(format!("Database validation failed on {}: {}.{}: {}", mode.name(), p.database, p.table, p.detail)));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
})?; }
|
||||||
|
// The check start is the first start of the new build: give the module configs the settings the update added
|
||||||
|
// (as a normal start does), or the server logs a "missing property" line for every one of them.
|
||||||
|
match crate::registry::MetaDir::open(self.meta_dir) {
|
||||||
|
Ok((_, meta)) if meta.kind == crate::registry::InstallKind::New => {
|
||||||
|
let _ = crate::config::materialize_module_configs(self.root);
|
||||||
|
}
|
||||||
|
// An imported server gets the files it lacks (nothing it has is changed).
|
||||||
|
_ => {
|
||||||
|
let _ = crate::config::create_missing_module_configs(self.root);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let started = match crate::driver::validate_update(self.root) {
|
||||||
|
Ok(out) => out,
|
||||||
|
Err(e) => {
|
||||||
|
let _ = crate::driver::run(self.root, crate::driver::Verb::StopAll);
|
||||||
|
return Err(e);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
let ports = crate::layout::read_ports(self.root);
|
||||||
|
let healthy = started.ok && {
|
||||||
|
let deadline = std::time::Instant::now() + std::time::Duration::from_secs(180);
|
||||||
|
let mut ready_since = None;
|
||||||
|
loop {
|
||||||
|
let o = observe(self.root, &ports);
|
||||||
|
if o.mysql.state == ServiceState::Running && o.auth.state == ServiceState::Running && o.world.state == ServiceState::Running && o.secondary_world.as_ref().is_none_or(|s| s.state == ServiceState::Running) {
|
||||||
|
let since = ready_since.get_or_insert_with(std::time::Instant::now);
|
||||||
|
if since.elapsed() >= std::time::Duration::from_secs(10) { break true; }
|
||||||
|
} else {
|
||||||
|
ready_since = None;
|
||||||
|
}
|
||||||
|
if std::time::Instant::now() > deadline {
|
||||||
|
break false;
|
||||||
|
}
|
||||||
|
std::thread::sleep(std::time::Duration::from_secs(2));
|
||||||
|
}
|
||||||
|
};
|
||||||
|
if healthy {
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
let cause = crate::driver::startup_failure(self.root, &started);
|
||||||
|
// Leave the files unlocked so that a rollback can replace them.
|
||||||
|
let _ = crate::driver::run(self.root, crate::driver::Verb::StopAll);
|
||||||
|
Err(Error::Invalid(cause))
|
||||||
|
})();
|
||||||
|
let stopped = crate::driver::run(self.root, crate::driver::Verb::StopAll)?;
|
||||||
|
if !stopped.ok {
|
||||||
|
return Err(Error::Invalid("Isolated validation could not stop the server; recovery configurations were preserved.".into()));
|
||||||
|
}
|
||||||
|
self.ensure_stopped()?;
|
||||||
|
self.recover_validation()?;
|
||||||
|
result
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
fn database_identities(db: &crate::db::Db) -> Result<BTreeMap<String, std::collections::BTreeSet<String>>> {
|
||||||
|
let db = db.clone().for_realm(crate::realms::Mode::Coa);
|
||||||
|
let mut identities = BTreeMap::new();
|
||||||
|
for (schema, table, columns) in [
|
||||||
|
("acore_characters", "characters", "guid,account,HEX(name)"),
|
||||||
|
("acore_characters_wildcard", "characters", "guid,account,HEX(name)"),
|
||||||
|
("acore_auth", "account", "id,HEX(username)"),
|
||||||
|
] {
|
||||||
|
if !db.schema_exists(schema)? || !db.tables(schema)?.iter().any(|name| name == table) { continue; }
|
||||||
|
let rows = db.query(&format!("SELECT {columns} FROM `{schema}`.`{table}`;"))?;
|
||||||
|
identities.insert(schema.into(), rows.lines().map(str::to_string).collect());
|
||||||
|
}
|
||||||
|
Ok(identities)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn verify_database_identities(db: &crate::db::Db, before: &BTreeMap<String, std::collections::BTreeSet<String>>) -> Result<()> {
|
||||||
|
let after = database_identities(db)?;
|
||||||
|
for (schema, expected) in before {
|
||||||
|
if after.get(schema).is_none_or(|actual| !expected.is_subset(actual)) {
|
||||||
|
return Err(Error::Invalid(format!("The private update changed or removed existing character or account identities in {schema}.")));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
@@ -971,6 +1216,11 @@ mod tests {
|
|||||||
use std::cell::{Cell, RefCell};
|
use std::cell::{Cell, RefCell};
|
||||||
|
|
||||||
struct Fake {
|
struct Fake {
|
||||||
|
activation_expected: RefCell<Option<(PathBuf, String)>>,
|
||||||
|
activation_failed: Cell<bool>,
|
||||||
|
activated: Cell<bool>,
|
||||||
|
automatic_rollback: Cell<bool>,
|
||||||
|
recovery_healthy: Cell<bool>,
|
||||||
stopped: Cell<bool>,
|
stopped: Cell<bool>,
|
||||||
healthy: Cell<bool>,
|
healthy: Cell<bool>,
|
||||||
snapshot_ok: Cell<bool>,
|
snapshot_ok: Cell<bool>,
|
||||||
@@ -978,15 +1228,32 @@ mod tests {
|
|||||||
migrate_fail: Cell<bool>,
|
migrate_fail: Cell<bool>,
|
||||||
preflight_fail: Cell<bool>,
|
preflight_fail: Cell<bool>,
|
||||||
restore_fail: Cell<bool>,
|
restore_fail: Cell<bool>,
|
||||||
|
rehearsal_fail: Cell<bool>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Fake {
|
impl Fake {
|
||||||
fn ok() -> Fake {
|
fn ok() -> Fake {
|
||||||
Fake { stopped: Cell::new(true), healthy: Cell::new(true), snapshot_ok: Cell::new(true), calls: Default::default(), migrate_fail: Cell::new(false), preflight_fail: Cell::new(false), restore_fail: Cell::new(false) }
|
Fake { activation_expected: RefCell::new(None), activation_failed: Cell::new(false), activated: Cell::new(false), automatic_rollback: Cell::new(false), recovery_healthy: Cell::new(true), stopped: Cell::new(true), healthy: Cell::new(true), snapshot_ok: Cell::new(true), calls: Default::default(), migrate_fail: Cell::new(false), preflight_fail: Cell::new(false), restore_fail: Cell::new(false), rehearsal_fail: Cell::new(false) }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Env for Fake {
|
impl Env for Fake {
|
||||||
|
fn rehearse(&self, _: &Manifest, _: &Path, _: &[PlanItem], _: &str) -> Result<()> {
|
||||||
|
if self.rehearsal_fail.get() { Err(Error::Invalid("SQL failed in the private copy".into())) } else { Ok(()) }
|
||||||
|
}
|
||||||
|
fn activate(&self) -> Result<()> {
|
||||||
|
if let Some((meta, version)) = self.activation_expected.borrow().as_ref() {
|
||||||
|
ensure_recovered(meta)?;
|
||||||
|
assert_eq!(MetaDir::open(meta)?.1.core.version.as_ref(), Some(version));
|
||||||
|
}
|
||||||
|
self.activated.set(true);
|
||||||
|
if self.activation_failed.get() { Err(Error::Invalid("Public startup failed".into())) } else { Ok(()) }
|
||||||
|
}
|
||||||
|
fn automatic_rollback(&self) -> bool { self.automatic_rollback.get() }
|
||||||
|
fn validate_recovery(&self) -> Result<()> {
|
||||||
|
self.calls.borrow_mut().push("validate-recovery");
|
||||||
|
if self.recovery_healthy.get() { Ok(()) } else { Err(Error::Invalid("Restored server is unhealthy".into())) }
|
||||||
|
}
|
||||||
fn preflight(&self, _: &Manifest) -> Result<()> {
|
fn preflight(&self, _: &Manifest) -> Result<()> {
|
||||||
if self.preflight_fail.get() { Err(Error::Invalid("Conflicting migration history".into())) } else { Ok(()) }
|
if self.preflight_fail.get() { Err(Error::Invalid("Conflicting migration history".into())) } else { Ok(()) }
|
||||||
}
|
}
|
||||||
@@ -1142,6 +1409,27 @@ mod tests {
|
|||||||
assert_eq!(read(&w, "Core/worldserver.exe"), b"world-v1");
|
assert_eq!(read(&w, "Core/worldserver.exe"), b"world-v1");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn a_docker_server_is_never_given_the_repack_files() {
|
||||||
|
// Found by trying the installer: the update check of a Docker server read the Windows channel and offered its files.
|
||||||
|
let w = world(&[], false);
|
||||||
|
write(&w.root, "Settings/docker.json", br#"{"project":"t1"}"#);
|
||||||
|
let before = read(&w, "Core/worldserver.exe");
|
||||||
|
let meta = InstallMeta::new(InstallKind::New, &w.root);
|
||||||
|
|
||||||
|
let err = preview(&w.root, &meta, &Source::Dir(w.pkg.clone()), &w.key, &BTreeMap::new()).unwrap_err();
|
||||||
|
assert!(err.to_string().contains("Docker"), "{err}");
|
||||||
|
let err = run(&w, &Fake::ok(), BTreeMap::new(), None).unwrap_err();
|
||||||
|
assert!(err.to_string().contains("Docker"), "{err}");
|
||||||
|
assert!(rollback(&w.root, &w.meta, "any", &Fake::ok()).is_err());
|
||||||
|
assert_eq!(read(&w, "Core/worldserver.exe"), before, "nothing was touched");
|
||||||
|
assert!(!w.root.join("Core/newfile.dll").exists());
|
||||||
|
|
||||||
|
// The same package is applied to the same folder once it is not a Docker server.
|
||||||
|
fs::remove_file(w.root.join("Settings/docker.json")).unwrap();
|
||||||
|
assert_eq!(run(&w, &Fake::ok(), BTreeMap::new(), None).unwrap().txn.state, State::Committed);
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn happy_path_replaces_creates_merges_and_records_ownership() {
|
fn happy_path_replaces_creates_merges_and_records_ownership() {
|
||||||
let w = world(&[], false);
|
let w = world(&[], false);
|
||||||
@@ -1162,6 +1450,26 @@ mod tests {
|
|||||||
assert!(!w.root.join("Core/worldserver.exe.coa-new").exists());
|
assert!(!w.root.join("Core/worldserver.exe.coa-new").exists());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn public_startup_requires_a_completed_transaction_and_saved_version() {
|
||||||
|
let w = world(&[], false);
|
||||||
|
let env = Fake::ok();
|
||||||
|
*env.activation_expected.borrow_mut() = Some((w.meta.clone(), "2.0.0".into()));
|
||||||
|
run(&w, &env, BTreeMap::new(), None).unwrap();
|
||||||
|
assert!(env.activated.get());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn startup_failure_after_commit_does_not_restore_a_live_database() {
|
||||||
|
let w = world(&[], true);
|
||||||
|
let env = Fake::ok();
|
||||||
|
env.activation_failed.set(true);
|
||||||
|
assert!(run(&w, &env, BTreeMap::new(), None).is_err());
|
||||||
|
assert!(ensure_recovered(&w.meta).is_ok());
|
||||||
|
assert_eq!(MetaDir::open(&w.meta).unwrap().1.core.version.as_deref(), Some("2.0.0"));
|
||||||
|
assert!(!env.calls.borrow().contains(&"restore-databases"));
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn an_integrated_launcher_is_current_but_user_edits_and_new_package_bytes_are_not() {
|
fn an_integrated_launcher_is_current_but_user_edits_and_new_package_bytes_are_not() {
|
||||||
let source = b"import sys\nfrom pathlib import Path\nfrom squid_playerbots import configure\nROOT = Path(__file__).resolve().parents[1]\n";
|
let source = b"import sys\nfrom pathlib import Path\nfrom squid_playerbots import configure\nROOT = Path(__file__).resolve().parents[1]\n";
|
||||||
@@ -1271,6 +1579,75 @@ mod tests {
|
|||||||
assert!(rollback(&w.root, &w.meta, &out.txn.id, &env).is_err(), "already rolled back");
|
assert!(rollback(&w.root, &w.meta, &out.txn.id, &env).is_err(), "already rolled back");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn automatic_health_failure_restores_databases_files_and_checks_recovery() {
|
||||||
|
let w = world(&[], true);
|
||||||
|
let env = Fake::ok();
|
||||||
|
env.automatic_rollback.set(true);
|
||||||
|
env.healthy.set(false);
|
||||||
|
assert!(run(&w, &env, BTreeMap::new(), None).unwrap_err().to_string().contains("restored"));
|
||||||
|
assert_eq!(read(&w, "Core/worldserver.exe"), b"world-v1");
|
||||||
|
assert!(!w.root.join("Core/newfile.dll").exists());
|
||||||
|
assert!(env.calls.borrow().contains(&"restore-databases"));
|
||||||
|
assert!(env.calls.borrow().contains(&"validate-recovery"));
|
||||||
|
assert!(unfinished(&w.meta).is_none());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn incompatible_source_or_platform_is_rejected_without_touching_installation() {
|
||||||
|
let w = world(&[], false);
|
||||||
|
let (_, meta) = MetaDir::open(&w.meta).unwrap();
|
||||||
|
let mut manifest = Manifest::parse(&fs::read(w.pkg.join("manifest.json")).unwrap()).unwrap();
|
||||||
|
manifest.min_manager_version = "0.6.13".into();
|
||||||
|
manifest.core.commit = Some("a".repeat(40));
|
||||||
|
manifest.compatibility = Some(crate::manifest::Compatibility { schema: 1,
|
||||||
|
platform: if cfg!(windows) { "windows-x86_64" } else { "linux-x86_64" }.into(),
|
||||||
|
core_commit: "a".repeat(40), module_commits: [("squid".into(), "b".repeat(40))].into(),
|
||||||
|
source_databases: Default::default(), client_patch_version: "1.5.1".into(), source_versions: vec!["1.0.0".into()] });
|
||||||
|
manifest.validate().unwrap();
|
||||||
|
validate_candidate(&meta, &manifest).unwrap();
|
||||||
|
manifest.compatibility.as_mut().unwrap().source_versions = vec!["0.9.0".into()];
|
||||||
|
assert!(validate_candidate(&meta, &manifest).unwrap_err().to_string().contains("compatibility matrix"));
|
||||||
|
manifest.compatibility.as_mut().unwrap().source_versions = vec!["1.0.0".into()];
|
||||||
|
manifest.compatibility.as_mut().unwrap().platform = if cfg!(windows) { "linux-x86_64" } else { "windows-x86_64" }.into();
|
||||||
|
assert!(validate_candidate(&meta, &manifest).unwrap_err().to_string().contains("targets"));
|
||||||
|
assert_eq!(read(&w, "Core/worldserver.exe"), b"world-v1");
|
||||||
|
assert!(unfinished(&w.meta).is_none());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn changed_installed_schema_contract_blocks_before_database_access() {
|
||||||
|
let w = world(&[], false);
|
||||||
|
write(&w.root, "Scripts/database-schema.json", b"modified schema contract");
|
||||||
|
let mut manifest = Manifest::parse(&fs::read(w.pkg.join("manifest.json")).unwrap()).unwrap();
|
||||||
|
manifest.compatibility = Some(crate::manifest::Compatibility { schema: 1,
|
||||||
|
platform: "windows-x86_64".into(), core_commit: "a".repeat(40),
|
||||||
|
module_commits: [("squid".into(), "b".repeat(40))].into(), client_patch_version: "1.5.1".into(),
|
||||||
|
source_versions: vec!["1.0.0".into()],
|
||||||
|
source_databases: [("1.0.0".into(), crate::manifest::SourceDatabase {
|
||||||
|
manifest_sha256: "a".repeat(64), schema_sha256: Some("b".repeat(64)) })].into() });
|
||||||
|
let env = RepackEnv { root: &w.root, meta_dir: &w.meta };
|
||||||
|
let error = env.preflight(&manifest).unwrap_err().to_string();
|
||||||
|
assert!(error.contains("schema contract differs"), "{error}");
|
||||||
|
assert!(!w.root.join("Runtime/python/python.exe").exists());
|
||||||
|
assert_eq!(read(&w, "Core/worldserver.exe"), b"world-v1");
|
||||||
|
assert!(unfinished(&w.meta).is_none());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn unhealthy_restoration_preserves_recovery_and_blocks_startup() {
|
||||||
|
let w = world(&[], true);
|
||||||
|
let env = Fake::ok();
|
||||||
|
env.automatic_rollback.set(true);
|
||||||
|
env.healthy.set(false);
|
||||||
|
env.recovery_healthy.set(false);
|
||||||
|
assert!(run(&w, &env, BTreeMap::new(), None).unwrap_err().to_string().contains("Recovery failed"));
|
||||||
|
let pending = unfinished(&w.meta).unwrap();
|
||||||
|
assert_eq!(pending.state, State::Failed);
|
||||||
|
assert!(txn_dir(&w.meta, &pending.id).unwrap().join("before").exists());
|
||||||
|
assert!(ensure_recovered(&w.meta).is_err());
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn retrying_startup_commits_without_reapplying_sql_or_restoring_databases() {
|
fn retrying_startup_commits_without_reapplying_sql_or_restoring_databases() {
|
||||||
let w = world(&[], true);
|
let w = world(&[], true);
|
||||||
@@ -1464,6 +1841,23 @@ mod tests {
|
|||||||
assert!(fs::read_dir(w.meta.join("updates")).unwrap().next().is_none());
|
assert!(fs::read_dir(w.meta.join("updates")).unwrap().next().is_none());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn failed_rehearsal_preserves_installed_files_version_and_recovery_point() {
|
||||||
|
let w = world(&[], true);
|
||||||
|
let env = Fake::ok();
|
||||||
|
env.rehearsal_fail.set(true);
|
||||||
|
let original = fsx::sha256_file(&w.meta.join("install.json")).unwrap();
|
||||||
|
let error = run(&w, &env, BTreeMap::new(), None).unwrap_err();
|
||||||
|
assert!(error.to_string().contains("installed server was not updated"));
|
||||||
|
assert_eq!(read(&w, "Core/worldserver.exe"), b"world-v1");
|
||||||
|
assert_eq!(fsx::sha256_file(&w.meta.join("install.json")).unwrap(), original);
|
||||||
|
assert_eq!(&*env.calls.borrow(), &["stop", "snapshot"]);
|
||||||
|
assert!(pending_checked(&w.meta).unwrap().is_none());
|
||||||
|
let journal = journals(&w.meta).unwrap().remove(0);
|
||||||
|
assert_eq!(journal.recovery_point.as_deref(), Some("rp-1"));
|
||||||
|
assert!(!journal.databases_started && journal.ops.is_empty());
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn missing_and_semantically_corrupt_journals_block_operations() {
|
fn missing_and_semantically_corrupt_journals_block_operations() {
|
||||||
let w = world(&[], false);
|
let w = world(&[], false);
|
||||||
|
|||||||
@@ -0,0 +1,163 @@
|
|||||||
|
use std::{collections::BTreeMap, fs, path::Path};
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
use crate::{config::parser::ConfFile, fsx, Error, Result};
|
||||||
|
|
||||||
|
const FILES: &[&str] = &[
|
||||||
|
"Settings/repack.json", "Settings/realm-profile.json",
|
||||||
|
"Settings/worldserver.conf.template", "Settings/authserver.conf.template",
|
||||||
|
"Core/configs/worldserver.conf", "Core/configs/authserver.conf",
|
||||||
|
"Settings/realm-profiles/coa.json", "Settings/realm-profiles/wildcard.json",
|
||||||
|
".realms/secondary/Settings/repack.json", ".realms/secondary/Settings/realm-profile.json",
|
||||||
|
".realms/secondary/Settings/worldserver.conf.template", ".realms/secondary/Settings/authserver.conf.template",
|
||||||
|
".realms/secondary/Core/configs/worldserver.conf", ".realms/secondary/Core/configs/authserver.conf",
|
||||||
|
];
|
||||||
|
|
||||||
|
#[derive(Serialize, Deserialize)]
|
||||||
|
#[serde(deny_unknown_fields)]
|
||||||
|
struct Saved { bytes: Option<Vec<u8>>, sha256: Option<String> }
|
||||||
|
|
||||||
|
pub(crate) fn pending(meta: &Path) -> bool { meta.join("validation-configs.json").exists() }
|
||||||
|
|
||||||
|
pub(crate) fn begin(root: &Path, meta: &Path) -> Result<()> {
|
||||||
|
if pending(meta) { return Err(Error::Invalid("Interrupted isolated validation must be recovered first.".into())); }
|
||||||
|
let mut saved = BTreeMap::new();
|
||||||
|
for rel in FILES {
|
||||||
|
let path = fsx::ensure_within(root, &fsx::safe_join(root, rel)?)?;
|
||||||
|
let bytes = if path.exists() { Some(fs::read(path)?) } else { None };
|
||||||
|
let sha256 = bytes.as_ref().map(|b| fsx::sha256_bytes(b));
|
||||||
|
saved.insert(*rel, Saved { bytes, sha256 });
|
||||||
|
}
|
||||||
|
let mut settings: serde_json::Value = fsx::read_json(&root.join("Settings/repack.json"))?;
|
||||||
|
let mut realm: Option<serde_json::Value> = if root.join("Settings/realm-profile.json").exists() {
|
||||||
|
Some(fsx::read_json(&root.join("Settings/realm-profile.json"))?)
|
||||||
|
} else { None };
|
||||||
|
let mut excluded: std::collections::BTreeSet<u64> = ["mysqlPort", "authPort", "worldPort", "raPort"].iter()
|
||||||
|
.filter_map(|key| settings[*key].as_u64()).collect();
|
||||||
|
if let Some(state) = &realm {
|
||||||
|
excluded.extend(["secondary_world_port", "secondary_ra_port"].iter().filter_map(|key| state[*key].as_u64()));
|
||||||
|
}
|
||||||
|
let mut sockets = Vec::new();
|
||||||
|
let mut reserve = || -> Result<u16> {
|
||||||
|
loop {
|
||||||
|
let socket = std::net::TcpListener::bind("127.0.0.1:0")?;
|
||||||
|
let port = socket.local_addr()?.port();
|
||||||
|
if excluded.insert(u64::from(port)) {
|
||||||
|
sockets.push(socket);
|
||||||
|
return Ok(port);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
for key in ["authPort", "worldPort", "raPort"] { settings[key] = reserve()?.into(); }
|
||||||
|
if let Some(state) = &mut realm {
|
||||||
|
for key in ["secondary_world_port", "secondary_ra_port"] {
|
||||||
|
state[key] = reserve()?.into();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let mut configs = Vec::new();
|
||||||
|
for rel in ["Settings/worldserver.conf.template", "Settings/authserver.conf.template", "Core/configs/worldserver.conf", "Core/configs/authserver.conf"] {
|
||||||
|
let path = root.join(rel);
|
||||||
|
if !path.exists() && rel.ends_with(".template") {
|
||||||
|
return Err(Error::Invalid(format!("Cannot isolate validation without {rel}.")));
|
||||||
|
}
|
||||||
|
if path.exists() {
|
||||||
|
let mut conf = ConfFile::parse_bytes(&fs::read(&path)?)?;
|
||||||
|
conf.set("BindIP", "\"127.0.0.1\"", &[]);
|
||||||
|
if rel.contains("worldserver") { conf.set("Ra.IP", "\"127.0.0.1\"", &[]); }
|
||||||
|
configs.push((path, conf.to_text()));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
fsx::atomic_write_json(&meta.join("validation-configs.json"), &saved)?;
|
||||||
|
fsx::atomic_write_json(&root.join("Settings/repack.json"), &settings)?;
|
||||||
|
if let Some(state) = realm { fsx::atomic_write_json(&root.join("Settings/realm-profile.json"), &state)?; }
|
||||||
|
for (path, text) in configs { fsx::atomic_write(&path, text.as_bytes())?; }
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
fn fixture() -> (tempfile::TempDir, std::path::PathBuf, std::path::PathBuf) {
|
||||||
|
let dir = tempfile::tempdir().unwrap();
|
||||||
|
let root = dir.path().join("server");
|
||||||
|
let meta = dir.path().join("metadata");
|
||||||
|
fs::create_dir_all(root.join("Settings")).unwrap();
|
||||||
|
fs::create_dir_all(&meta).unwrap();
|
||||||
|
fsx::atomic_write_json(&root.join(FILES[0]), &serde_json::json!({"mysqlPort":3306,"authPort":3724,"worldPort":8085,"raPort":3443})).unwrap();
|
||||||
|
fsx::atomic_write_json(&root.join(FILES[1]), &serde_json::json!({"simultaneous":true,"secondary_world_port":8086,"secondary_ra_port":3444})).unwrap();
|
||||||
|
for rel in [FILES[2], FILES[3]] {
|
||||||
|
fsx::atomic_write(&root.join(rel), b"BindIP = \"0.0.0.0\"\r\nRa.IP = \"0.0.0.0\"\r\n").unwrap();
|
||||||
|
}
|
||||||
|
(dir, root, meta)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn interrupted_validation_restores_original_bytes_and_absent_files() {
|
||||||
|
let (_dir, root, meta) = fixture();
|
||||||
|
let original: Vec<_> = FILES.iter().map(|p| fs::read(root.join(p)).ok()).collect();
|
||||||
|
begin(&root, &meta).unwrap();
|
||||||
|
assert!(crate::update::ensure_recovered(&meta).is_err());
|
||||||
|
assert!(begin(&root, &meta).is_err());
|
||||||
|
let settings: serde_json::Value = fsx::read_json(&root.join(FILES[0])).unwrap();
|
||||||
|
assert_eq!(settings["mysqlPort"], 3306);
|
||||||
|
let realm: serde_json::Value = fsx::read_json(&root.join(FILES[1])).unwrap();
|
||||||
|
let ports: std::collections::BTreeSet<_> = [settings["authPort"].as_u64(), settings["worldPort"].as_u64(), settings["raPort"].as_u64(), realm["secondary_world_port"].as_u64(), realm["secondary_ra_port"].as_u64()].into_iter().collect();
|
||||||
|
assert_eq!(ports.len(), 5);
|
||||||
|
let config = ConfFile::parse_bytes(&fs::read(root.join(FILES[2])).unwrap()).unwrap();
|
||||||
|
assert_eq!(config.get("BindIP"), Some("\"127.0.0.1\""));
|
||||||
|
fsx::atomic_write(&root.join(FILES[4]), b"rendered temporary configuration").unwrap();
|
||||||
|
restore(&root, &meta).unwrap();
|
||||||
|
for (rel, bytes) in FILES.iter().zip(original) { assert_eq!(fs::read(root.join(rel)).ok(), bytes); }
|
||||||
|
assert!(!pending(&meta));
|
||||||
|
restore(&root, &meta).unwrap();
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn damaged_recovery_copy_blocks_all_restoration() {
|
||||||
|
let (_dir, root, meta) = fixture();
|
||||||
|
begin(&root, &meta).unwrap();
|
||||||
|
let journal = meta.join("validation-configs.json");
|
||||||
|
let mut saved: BTreeMap<String, Saved> = fsx::read_json(&journal).unwrap();
|
||||||
|
saved.get_mut(FILES[0]).unwrap().bytes = Some(b"damaged".to_vec());
|
||||||
|
fsx::atomic_write_json(&journal, &saved).unwrap();
|
||||||
|
let before = fs::read(root.join(FILES[2])).unwrap();
|
||||||
|
assert!(restore(&root, &meta).is_err());
|
||||||
|
assert_eq!(fs::read(root.join(FILES[2])).unwrap(), before);
|
||||||
|
assert!(pending(&meta));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn missing_template_fails_before_any_configuration_changes() {
|
||||||
|
let (_dir, root, meta) = fixture();
|
||||||
|
fs::remove_file(root.join(FILES[3])).unwrap();
|
||||||
|
let before = fs::read(root.join(FILES[0])).unwrap();
|
||||||
|
assert!(begin(&root, &meta).is_err());
|
||||||
|
assert!(!pending(&meta));
|
||||||
|
assert_eq!(fs::read(root.join(FILES[0])).unwrap(), before);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(crate) fn restore(root: &Path, meta: &Path) -> Result<()> {
|
||||||
|
if !pending(meta) { return Ok(()); }
|
||||||
|
let journal = meta.join("validation-configs.json");
|
||||||
|
let saved: BTreeMap<String, Saved> = fsx::read_json(&journal)?;
|
||||||
|
if saved.len() != FILES.len() || FILES.iter().any(|rel| !saved.contains_key(*rel)) {
|
||||||
|
return Err(Error::Invalid("Isolated validation configuration journal is incomplete.".into()));
|
||||||
|
}
|
||||||
|
for (rel, file) in &saved {
|
||||||
|
fsx::ensure_within(root, &fsx::safe_join(root, rel)?)?;
|
||||||
|
if file.bytes.as_ref().map(|b| fsx::sha256_bytes(b)) != file.sha256 {
|
||||||
|
return Err(Error::Invalid(format!("Isolated validation recovery copy {rel} is damaged.")));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for (rel, file) in saved {
|
||||||
|
let path = fsx::ensure_within(root, &fsx::safe_join(root, &rel)?)?;
|
||||||
|
match file.bytes {
|
||||||
|
Some(bytes) => fsx::atomic_write(&path, &bytes)?,
|
||||||
|
None if path.exists() => fs::remove_file(path)?,
|
||||||
|
None => {},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
fs::remove_file(journal)?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
@@ -0,0 +1,393 @@
|
|||||||
|
//! Starting the game client on Linux. The client is a Windows program, so it runs under umu-launcher with a Proton build
|
||||||
|
//! (what the project's own guide uses), or under plain Wine when umu is not installed. This is the Linux counterpart of
|
||||||
|
//! starting `Ascension.exe` directly; `client::launch` hands over to it on a Linux host and Windows never comes here.
|
||||||
|
//!
|
||||||
|
//! The settings are found on their own and can all be overridden, from strongest to weakest: the environment
|
||||||
|
//! (`COA_PROTONPATH`, `COA_WINEPREFIX`), then `client-launch.json` in the Manager's folder, then what is installed.
|
||||||
|
|
||||||
|
use std::fs::{self, OpenOptions};
|
||||||
|
use std::io::Write;
|
||||||
|
use std::path::{Path, PathBuf};
|
||||||
|
use std::process::{Command, Stdio};
|
||||||
|
|
||||||
|
use serde::Deserialize;
|
||||||
|
|
||||||
|
use crate::error::{Error, Result};
|
||||||
|
|
||||||
|
/// Prefix used when nothing else is said: the folder umu-launcher itself suggests for a game.
|
||||||
|
const DEFAULT_PREFIX: &str = "Games/umu/coa-client";
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||||
|
pub enum Runner {
|
||||||
|
/// umu-launcher runs the game with a Proton build. `proton` is `None` when umu should pick and download one itself.
|
||||||
|
Umu { program: PathBuf, proton: Option<PathBuf> },
|
||||||
|
Wine { program: PathBuf },
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||||
|
pub struct Launcher {
|
||||||
|
pub runner: Runner,
|
||||||
|
pub prefix: PathBuf,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// What to run, in a form that can be checked without running anything.
|
||||||
|
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||||
|
pub struct Plan {
|
||||||
|
pub program: PathBuf,
|
||||||
|
pub args: Vec<String>,
|
||||||
|
pub env: Vec<(String, String)>,
|
||||||
|
pub cwd: PathBuf,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// `client-launch.json`: every key is optional.
|
||||||
|
#[derive(Debug, Default, Deserialize)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct Overrides {
|
||||||
|
pub proton_path: Option<String>,
|
||||||
|
pub prefix: Option<String>,
|
||||||
|
/// "umu" or "wine": use this one even if the other is installed.
|
||||||
|
pub runner: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Everything detection looks at, so it can be tested without a real computer.
|
||||||
|
pub struct Host<'a> {
|
||||||
|
pub var: &'a dyn Fn(&str) -> Option<String>,
|
||||||
|
pub which: &'a dyn Fn(&str) -> Option<PathBuf>,
|
||||||
|
/// Names of the entries of a folder (empty when it does not exist).
|
||||||
|
pub list: &'a dyn Fn(&Path) -> Vec<String>,
|
||||||
|
pub is_file: &'a dyn Fn(&Path) -> bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
fn proton_folders(home: &Path) -> Vec<PathBuf> {
|
||||||
|
vec![
|
||||||
|
home.join(".local/share/Steam/compatibilitytools.d"),
|
||||||
|
home.join(".steam/root/compatibilitytools.d"),
|
||||||
|
home.join(".steam/steam/compatibilitytools.d"),
|
||||||
|
home.join(".var/app/com.valvesoftware.Steam/.local/share/Steam/compatibilitytools.d"),
|
||||||
|
PathBuf::from("/usr/share/steam/compatibilitytools.d"),
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Numbers of a name in order, so that GE-Proton10-9 sorts before GE-Proton10-34.
|
||||||
|
fn version_key(name: &str) -> Vec<u64> {
|
||||||
|
let mut out = Vec::new();
|
||||||
|
let mut cur = String::new();
|
||||||
|
for c in name.chars().chain(std::iter::once(' ')) {
|
||||||
|
if c.is_ascii_digit() {
|
||||||
|
cur.push(c);
|
||||||
|
} else if !cur.is_empty() {
|
||||||
|
out.push(cur.parse().unwrap_or(0));
|
||||||
|
cur.clear();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
out
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The newest GE-Proton build installed for Steam, if any. A folder only counts when it holds the `proton` script.
|
||||||
|
fn newest_proton(host: &Host, home: &Path) -> Option<PathBuf> {
|
||||||
|
proton_folders(home)
|
||||||
|
.into_iter()
|
||||||
|
.flat_map(|dir| (host.list)(&dir).into_iter().filter(|n| n.starts_with("GE-Proton")).map(move |n| (n.clone(), dir.join(n))))
|
||||||
|
.filter(|(_, path)| (host.is_file)(&path.join("proton")))
|
||||||
|
.max_by_key(|(name, _)| version_key(name))
|
||||||
|
.map(|(_, path)| path)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn detect_with(host: &Host, overrides: &Overrides) -> Result<Launcher> {
|
||||||
|
let home = (host.var)("HOME").map(PathBuf::from).ok_or_else(|| Error::Invalid("The home folder of this user is not known.".into()))?;
|
||||||
|
let prefix = (host.var)("COA_WINEPREFIX").or_else(|| overrides.prefix.clone()).map(PathBuf::from).unwrap_or_else(|| home.join(DEFAULT_PREFIX));
|
||||||
|
let proton = (host.var)("COA_PROTONPATH").or_else(|| overrides.proton_path.clone()).map(PathBuf::from).or_else(|| newest_proton(host, &home));
|
||||||
|
let (umu, wine) = ((host.which)("umu-run"), (host.which)("wine"));
|
||||||
|
let runner = match (overrides.runner.as_deref(), umu, wine) {
|
||||||
|
(Some("wine"), _, Some(program)) => Runner::Wine { program },
|
||||||
|
(Some("umu"), Some(program), _) | (None, Some(program), _) => Runner::Umu { program, proton },
|
||||||
|
(_, None, Some(program)) => Runner::Wine { program },
|
||||||
|
_ => {
|
||||||
|
return Err(Error::Invalid(
|
||||||
|
"To play on Linux the game client needs umu-launcher (with a Proton build such as GE-Proton) or Wine. Install one of them and press Play again.".into(),
|
||||||
|
))
|
||||||
|
}
|
||||||
|
};
|
||||||
|
Ok(Launcher { runner, prefix })
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The command line that starts `exe` from the client folder.
|
||||||
|
pub fn plan(launcher: &Launcher, client: &Path, exe: &str) -> Plan {
|
||||||
|
let mut env = vec![("WINEPREFIX".to_string(), launcher.prefix.to_string_lossy().into_owned())];
|
||||||
|
// DivxTac.dll is a mixed-mode .NET assembly: loaded through wine-mono it deadlocks the client on the world loading screen
|
||||||
|
// (100%). Disabling it has the same effect as removing the file.
|
||||||
|
env.push(("WINEDLLOVERRIDES".into(), "divxtac=d".into()));
|
||||||
|
let program = match &launcher.runner {
|
||||||
|
Runner::Umu { program, proton } => {
|
||||||
|
env.push(("GAMEID".into(), "0".into()));
|
||||||
|
if let Some(p) = proton {
|
||||||
|
env.push(("PROTONPATH".into(), p.to_string_lossy().into_owned()));
|
||||||
|
}
|
||||||
|
program.clone()
|
||||||
|
}
|
||||||
|
Runner::Wine { program } => program.clone(),
|
||||||
|
};
|
||||||
|
// The client reads Data/ relative to the working directory.
|
||||||
|
Plan { program, args: vec![exe.to_string()], env, cwd: client.to_path_buf() }
|
||||||
|
}
|
||||||
|
|
||||||
|
fn system_var(k: &str) -> Option<String> {
|
||||||
|
std::env::var(k).ok().filter(|v| !v.trim().is_empty())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn find_on_path(program: &str) -> Option<PathBuf> {
|
||||||
|
std::env::split_paths(&std::env::var_os("PATH")?).map(|d| d.join(program)).find(|p| p.is_file())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn list_names(dir: &Path) -> Vec<String> {
|
||||||
|
fs::read_dir(dir).map(|rd| rd.filter_map(|e| e.ok()).filter_map(|e| e.file_name().into_string().ok()).collect()).unwrap_or_default()
|
||||||
|
}
|
||||||
|
|
||||||
|
fn data_home() -> Option<PathBuf> {
|
||||||
|
system_var("XDG_DATA_HOME").map(PathBuf::from).filter(|p| p.is_absolute()).or_else(|| system_var("HOME").map(|h| PathBuf::from(h).join(".local/share")))
|
||||||
|
}
|
||||||
|
|
||||||
|
fn overrides_file() -> Option<PathBuf> {
|
||||||
|
data_home().map(|d| d.join("CoAServerManager/client-launch.json"))
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn detect() -> Result<Launcher> {
|
||||||
|
let overrides: Overrides = overrides_file().and_then(|p| crate::fsx::read_json(&p).ok()).unwrap_or_default();
|
||||||
|
detect_with(&Host { var: &system_var, which: &find_on_path, list: &list_names, is_file: &|p| p.is_file() }, &overrides)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Where what the client prints goes: the Manager's own log folder.
|
||||||
|
pub fn log_path() -> Option<PathBuf> {
|
||||||
|
data_home().map(|d| d.join("CoAServerManager/logs/client.log"))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Start the client and return at once; it keeps running when the Manager closes. Returns the process id.
|
||||||
|
pub fn launch(client: &Path, exe: &str) -> Result<u32> {
|
||||||
|
let launcher = detect()?;
|
||||||
|
let plan = plan(&launcher, client, exe);
|
||||||
|
let log = match log_path() {
|
||||||
|
Some(p) => {
|
||||||
|
if let Some(dir) = p.parent() {
|
||||||
|
fs::create_dir_all(dir)?;
|
||||||
|
}
|
||||||
|
let mut f = OpenOptions::new().create(true).append(true).open(&p)?;
|
||||||
|
writeln!(f, "=== {} {:?} in {}", plan.program.display(), plan.args, plan.cwd.display())?;
|
||||||
|
for (k, v) in &plan.env {
|
||||||
|
writeln!(f, " {k}={v}")?;
|
||||||
|
}
|
||||||
|
Some(f)
|
||||||
|
}
|
||||||
|
None => None,
|
||||||
|
};
|
||||||
|
let mut cmd = Command::new(&plan.program);
|
||||||
|
cmd.args(&plan.args).current_dir(&plan.cwd).envs(plan.env.iter().map(|(k, v)| (k, v))).stdin(Stdio::null());
|
||||||
|
match log {
|
||||||
|
Some(f) => {
|
||||||
|
cmd.stderr(f.try_clone()?).stdout(f);
|
||||||
|
}
|
||||||
|
None => {
|
||||||
|
cmd.stdout(Stdio::null()).stderr(Stdio::null());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#[cfg(unix)]
|
||||||
|
{
|
||||||
|
use std::os::unix::process::CommandExt;
|
||||||
|
cmd.process_group(0); // its own group: closing the Manager does not take the game with it
|
||||||
|
}
|
||||||
|
let mut child = cmd.spawn().map_err(|e| Error::Invalid(format!("The game client could not be started ({}): {e}", plan.program.display())))?;
|
||||||
|
let pid = child.id();
|
||||||
|
std::thread::spawn(move || {
|
||||||
|
let _ = child.wait(); // reap it when the game closes
|
||||||
|
});
|
||||||
|
Ok(pid)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Is a process running this client? Under Wine its command line carries the Windows form of the path
|
||||||
|
/// (`Z:\home\you\client\Ascension.exe`), which is the only trace of it that names the folder.
|
||||||
|
pub fn command_line_runs(cmdline: &str, client: &Path, exe: &str) -> bool {
|
||||||
|
let wanted = format!("{}/{}", client.to_string_lossy().trim_end_matches('/'), exe).to_lowercase();
|
||||||
|
cmdline.replace('\0', " ").replace('\\', "/").to_lowercase().contains(&wanted)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The folder as it was given and as the system resolves it. On an immutable distribution (SteamOS, Bazzite) `/home` is a
|
||||||
|
/// link to `/var/home`: Wine writes the path it was given, the resolved one differs, and either may be what the command
|
||||||
|
/// line of the running client holds.
|
||||||
|
fn spellings(client: &Path) -> Vec<PathBuf> {
|
||||||
|
let mut all = vec![client.to_path_buf()];
|
||||||
|
if let Ok(real) = fs::canonicalize(client) {
|
||||||
|
if real != client {
|
||||||
|
all.push(real);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
all
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn is_running(client: &Path, exes: &[&str]) -> bool {
|
||||||
|
let folders = spellings(client);
|
||||||
|
let Ok(rd) = fs::read_dir("/proc") else { return false };
|
||||||
|
rd.filter_map(|e| e.ok())
|
||||||
|
.filter(|e| e.file_name().to_string_lossy().bytes().all(|b| b.is_ascii_digit()))
|
||||||
|
.filter_map(|e| fs::read(e.path().join("cmdline")).ok())
|
||||||
|
.any(|raw| {
|
||||||
|
let line = String::from_utf8_lossy(&raw);
|
||||||
|
folders.iter().any(|folder| exes.iter().any(|exe| command_line_runs(&line, folder, exe)))
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// Linux only: the folders are written as Linux path strings.
|
||||||
|
#[cfg(all(test, unix))]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
use std::collections::{BTreeMap, BTreeSet};
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn a_client_folder_behind_a_link_is_looked_for_under_both_names() {
|
||||||
|
// SteamOS and Bazzite: /home is a link to /var/home.
|
||||||
|
let dir = tempfile::tempdir().unwrap();
|
||||||
|
fs::create_dir_all(dir.path().join("var/home/u/client")).unwrap();
|
||||||
|
std::os::unix::fs::symlink("var/home", dir.path().join("home")).unwrap();
|
||||||
|
let given = dir.path().join("home/u/client");
|
||||||
|
let both = spellings(&given);
|
||||||
|
assert_eq!(both.len(), 2);
|
||||||
|
assert_eq!(both[0], given);
|
||||||
|
assert!(both[1].starts_with(dir.path().canonicalize().unwrap().join("var/home")));
|
||||||
|
// Wine kept the name it was given, so the line holds the first one and not the resolved one.
|
||||||
|
let line = format!("Z:\\{}\\Ascension.exe", given.to_string_lossy().replace('/', "\\"));
|
||||||
|
assert!(!command_line_runs(&line, &both[1], "Ascension.exe"));
|
||||||
|
assert!(both.iter().any(|f| command_line_runs(&line, f, "Ascension.exe")));
|
||||||
|
}
|
||||||
|
|
||||||
|
/// A computer described in a few lines: variables, programs on the path, folders with their entries, and `proton` scripts.
|
||||||
|
struct Fake {
|
||||||
|
vars: BTreeMap<&'static str, &'static str>,
|
||||||
|
programs: BTreeSet<&'static str>,
|
||||||
|
folders: BTreeMap<&'static str, Vec<&'static str>>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Fake {
|
||||||
|
fn new() -> Fake {
|
||||||
|
Fake { vars: BTreeMap::from([("HOME", "/home/ana")]), programs: BTreeSet::new(), folders: BTreeMap::new() }
|
||||||
|
}
|
||||||
|
|
||||||
|
fn detect(&self, overrides: &Overrides) -> Result<Launcher> {
|
||||||
|
let var = |k: &str| self.vars.get(k).map(|v| v.to_string());
|
||||||
|
let which = |p: &str| self.programs.contains(p).then(|| PathBuf::from(format!("/usr/bin/{p}")));
|
||||||
|
let list = |d: &Path| self.folders.get(d.to_str().unwrap()).map(|v| v.iter().map(|s| s.to_string()).collect()).unwrap_or_default();
|
||||||
|
// every listed build has its `proton` script
|
||||||
|
let is_file = |p: &Path| p.file_name().is_some_and(|n| n == "proton");
|
||||||
|
detect_with(&Host { var: &var, which: &which, list: &list, is_file: &is_file }, overrides)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const STEAM: &str = "/home/ana/.local/share/Steam/compatibilitytools.d";
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn umu_with_the_newest_ge_proton_is_the_default() {
|
||||||
|
let mut c = Fake::new();
|
||||||
|
c.programs.extend(["umu-run", "wine"]);
|
||||||
|
c.folders.insert(STEAM, vec!["GE-Proton9-27", "GE-Proton10-9", "GE-Proton10-34", "Proton-Experimental", "notes.txt"]);
|
||||||
|
let l = c.detect(&Overrides::default()).unwrap();
|
||||||
|
assert_eq!(l.prefix, PathBuf::from("/home/ana/Games/umu/coa-client"));
|
||||||
|
match l.runner {
|
||||||
|
Runner::Umu { proton, program } => {
|
||||||
|
assert_eq!(program, PathBuf::from("/usr/bin/umu-run"));
|
||||||
|
assert_eq!(proton, Some(PathBuf::from(format!("{STEAM}/GE-Proton10-34"))), "10-34 is newer than 10-9");
|
||||||
|
}
|
||||||
|
other => panic!("{other:?}"),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn without_a_proton_build_umu_is_left_to_choose_one() {
|
||||||
|
let mut c = Fake::new();
|
||||||
|
c.programs.insert("umu-run");
|
||||||
|
let Runner::Umu { proton, .. } = c.detect(&Overrides::default()).unwrap().runner else { panic!() };
|
||||||
|
assert_eq!(proton, None);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn plain_wine_is_used_when_umu_is_not_installed() {
|
||||||
|
let mut c = Fake::new();
|
||||||
|
c.programs.insert("wine");
|
||||||
|
assert!(matches!(c.detect(&Overrides::default()).unwrap().runner, Runner::Wine { .. }));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn without_umu_or_wine_the_person_is_told_what_to_install() {
|
||||||
|
let err = Fake::new().detect(&Overrides::default()).unwrap_err().to_string();
|
||||||
|
assert!(err.contains("umu-launcher") && err.contains("Wine"), "{err}");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn settings_override_what_is_installed_and_the_environment_overrides_the_file() {
|
||||||
|
let mut c = Fake::new();
|
||||||
|
c.programs.extend(["umu-run", "wine"]);
|
||||||
|
c.folders.insert(STEAM, vec!["GE-Proton10-34"]);
|
||||||
|
let file = Overrides { proton_path: Some("/opt/proton-a".into()), prefix: Some("/data/prefix-a".into()), runner: None };
|
||||||
|
let l = c.detect(&file).unwrap();
|
||||||
|
assert_eq!(l.prefix, PathBuf::from("/data/prefix-a"));
|
||||||
|
assert!(matches!(&l.runner, Runner::Umu { proton: Some(p), .. } if p == Path::new("/opt/proton-a")));
|
||||||
|
c.vars.insert("COA_PROTONPATH", "/opt/proton-b");
|
||||||
|
c.vars.insert("COA_WINEPREFIX", "/data/prefix-b");
|
||||||
|
let l = c.detect(&file).unwrap();
|
||||||
|
assert_eq!(l.prefix, PathBuf::from("/data/prefix-b"));
|
||||||
|
assert!(matches!(&l.runner, Runner::Umu { proton: Some(p), .. } if p == Path::new("/opt/proton-b")));
|
||||||
|
// Forcing Wine works when it is installed, and falls back to umu when it is not.
|
||||||
|
let wine = Overrides { runner: Some("wine".into()), ..Default::default() };
|
||||||
|
assert!(matches!(c.detect(&wine).unwrap().runner, Runner::Wine { .. }));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn the_command_is_the_one_of_the_projects_own_launcher_script() {
|
||||||
|
let l = Launcher { runner: Runner::Umu { program: "/usr/bin/umu-run".into(), proton: Some("/p/GE-Proton11-6".into()) }, prefix: "/home/ana/Games/umu/coa-client".into() };
|
||||||
|
let p = plan(&l, Path::new("/home/ana/CoaServer/client/ascension-live"), "Ascension.exe");
|
||||||
|
assert_eq!(p.program, PathBuf::from("/usr/bin/umu-run"));
|
||||||
|
assert_eq!(p.args, ["Ascension.exe"]);
|
||||||
|
assert_eq!(p.cwd, PathBuf::from("/home/ana/CoaServer/client/ascension-live"), "the client reads Data/ from its working directory");
|
||||||
|
let env: BTreeMap<_, _> = p.env.iter().cloned().collect();
|
||||||
|
assert_eq!(env["GAMEID"], "0");
|
||||||
|
assert_eq!(env["PROTONPATH"], "/p/GE-Proton11-6");
|
||||||
|
assert_eq!(env["WINEPREFIX"], "/home/ana/Games/umu/coa-client");
|
||||||
|
assert_eq!(env["WINEDLLOVERRIDES"], "divxtac=d", "DivxTac.dll deadlocks the world loading screen under wine-mono");
|
||||||
|
// Wine has no GAMEID / PROTONPATH.
|
||||||
|
let w = plan(&Launcher { runner: Runner::Wine { program: "/usr/bin/wine".into() }, prefix: "/pre".into() }, Path::new("/c"), "Wow.exe");
|
||||||
|
assert!(w.env.iter().all(|(k, _)| k != "GAMEID" && k != "PROTONPATH") && w.args == ["Wow.exe"]);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn a_wine_command_line_names_the_client_folder_in_windows_form() {
|
||||||
|
let client = Path::new("/home/ana/CoaServer/client/ascension-live");
|
||||||
|
assert!(command_line_runs("Z:\\home\\ana\\CoaServer\\client\\ascension-live\\Ascension.exe\0", client, "Ascension.exe"));
|
||||||
|
assert!(command_line_runs("C:\\windows\\system32\\start.exe /exec Z:\\HOME\\ANA\\coaserver\\client\\ascension-live\\ascension.exe", client, "Ascension.exe"), "case does not matter");
|
||||||
|
assert!(!command_line_runs("Z:\\home\\ana\\CoaServer\\client\\ascension-lab\\Ascension.exe", client, "Ascension.exe"), "another client folder");
|
||||||
|
assert!(!command_line_runs("umu-run Ascension.exe", client, "Ascension.exe"), "the launcher alone does not name the folder");
|
||||||
|
assert!(!command_line_runs("Z:\\home\\ana\\CoaServer\\client\\ascension-live\\Ascension.exe.ORIGINAL", Path::new("/other"), "Ascension.exe"));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn newer_versions_sort_after_older_ones() {
|
||||||
|
assert!(version_key("GE-Proton10-9") < version_key("GE-Proton10-34"));
|
||||||
|
assert!(version_key("GE-Proton9-27") < version_key("GE-Proton10-1"));
|
||||||
|
assert!(version_key("GE-Proton11-6-x86_64") < version_key("GE-Proton11-7-x86_64"));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(unix)]
|
||||||
|
#[test]
|
||||||
|
fn a_real_launch_runs_the_program_in_the_client_folder_with_the_right_environment() {
|
||||||
|
use std::os::unix::fs::PermissionsExt;
|
||||||
|
let d = tempfile::tempdir().unwrap();
|
||||||
|
let client = d.path().join("client");
|
||||||
|
fs::create_dir_all(&client).unwrap();
|
||||||
|
let out = d.path().join("seen.txt");
|
||||||
|
let script = d.path().join("umu-run");
|
||||||
|
fs::write(&script, format!("#!/bin/sh\n{{ echo \"cwd=$(pwd)\"; echo \"arg=$1\"; echo \"prefix=$WINEPREFIX\"; echo \"gameid=$GAMEID\"; echo \"dll=$WINEDLLOVERRIDES\"; }} > '{}'\n", out.display())).unwrap();
|
||||||
|
fs::set_permissions(&script, fs::Permissions::from_mode(0o755)).unwrap();
|
||||||
|
let launcher = Launcher { runner: Runner::Umu { program: script, proton: None }, prefix: d.path().join("prefix") };
|
||||||
|
let p = plan(&launcher, &client, "Ascension.exe");
|
||||||
|
let mut child = Command::new(&p.program).args(&p.args).current_dir(&p.cwd).envs(p.env.iter().map(|(k, v)| (k, v))).spawn().unwrap();
|
||||||
|
assert!(child.wait().unwrap().success());
|
||||||
|
let seen = fs::read_to_string(&out).unwrap();
|
||||||
|
assert!(seen.contains(&format!("cwd={}", fs::canonicalize(&client).unwrap().display())), "{seen}");
|
||||||
|
assert!(seen.contains("arg=Ascension.exe") && seen.contains("gameid=0") && seen.contains("dll=divxtac=d") && seen.contains("prefix="), "{seen}");
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -47,6 +47,36 @@ fn run() -> Result<(), String> {
|
|||||||
let e = |x: coa_core::Error| x.to_string();
|
let e = |x: coa_core::Error| x.to_string();
|
||||||
let part = a.get("part-size").and_then(|v| v.parse().ok()).unwrap_or(DEFAULT_PART_SIZE);
|
let part = a.get("part-size").and_then(|v| v.parse().ok()).unwrap_or(DEFAULT_PART_SIZE);
|
||||||
match cmd.as_str() {
|
match cmd.as_str() {
|
||||||
|
"qualify-upgrade" => {
|
||||||
|
let report = coa_core::release_schema::qualify_upgrade(
|
||||||
|
&PathBuf::from(need(&a, "base")?), &PathBuf::from(need(&a, "source")?),
|
||||||
|
&PathBuf::from(need(&a, "candidate")?), &PathBuf::from(need(&a, "fixture")?),
|
||||||
|
coa_core::signing::EMBEDDED_PUBLIC_KEY,
|
||||||
|
).map_err(e)?;
|
||||||
|
coa_core::fsx::atomic_write_json(&PathBuf::from(need(&a, "report")?), &report).map_err(e)?;
|
||||||
|
println!("Manager upgrade transaction passed isolated qualification");
|
||||||
|
}
|
||||||
|
"qualify-startup" => {
|
||||||
|
coa_core::release_schema::validate_startup(
|
||||||
|
&PathBuf::from(need(&a, "fixture")?), &PathBuf::from(need(&a, "tree")?),
|
||||||
|
&PathBuf::from(need(&a, "base")?), coa_core::signing::EMBEDDED_PUBLIC_KEY,
|
||||||
|
).map_err(e)?;
|
||||||
|
println!("authserver and worldserver passed isolated startup qualification");
|
||||||
|
}
|
||||||
|
"verify-channel" => {
|
||||||
|
let bytes = std::fs::read(need(&a, "file")?).map_err(|x| x.to_string())?;
|
||||||
|
let pointer = coa_core::channels::verify(&bytes, need(&a, "channel")?, coa_core::signing::EMBEDDED_PUBLIC_KEY).map_err(e)?;
|
||||||
|
println!("{}", serde_json::to_string(&pointer).map_err(|x| x.to_string())?);
|
||||||
|
}
|
||||||
|
"verify-manifest" => {
|
||||||
|
let source = coa_core::pkgsource::Source::Dir(PathBuf::from(need(&a, "dir")?));
|
||||||
|
let (manifest, _) = coa_core::pkgsource::fetch_manifest(&source, coa_core::signing::EMBEDDED_PUBLIC_KEY).map_err(e)?;
|
||||||
|
println!("verified signed manifest {}", manifest.version);
|
||||||
|
}
|
||||||
|
"verify-upgrade-fixture" => {
|
||||||
|
coa_core::release_schema::verify_upgrade_fixture(&PathBuf::from(need(&a, "dir")?), coa_core::signing::EMBEDDED_PUBLIC_KEY).map_err(e)?;
|
||||||
|
println!("verified signed upgrade fixture and every archive file");
|
||||||
|
}
|
||||||
"extract-schema-base" => {
|
"extract-schema-base" => {
|
||||||
coa_core::release_schema::extract_base(
|
coa_core::release_schema::extract_base(
|
||||||
&PathBuf::from(need(&a, "package")?), &PathBuf::from(need(&a, "fixture")?),
|
&PathBuf::from(need(&a, "package")?), &PathBuf::from(need(&a, "fixture")?),
|
||||||
@@ -112,6 +142,16 @@ fn run() -> Result<(), String> {
|
|||||||
coa_core::release_schema::verify_package(&dir, coa_core::signing::EMBEDDED_PUBLIC_KEY).map_err(e)?;
|
coa_core::release_schema::verify_package(&dir, coa_core::signing::EMBEDDED_PUBLIC_KEY).map_err(e)?;
|
||||||
println!("signature, archive contents and database schema contract OK");
|
println!("signature, archive contents and database schema contract OK");
|
||||||
}
|
}
|
||||||
|
"sign-channel" => {
|
||||||
|
let pointer = coa_core::channels::Pointer {
|
||||||
|
schema: 1, channel: need(&a, "channel")?.clone(),
|
||||||
|
version: need(&a, "version")?.clone(),
|
||||||
|
release_tag: format!("server-{}", need(&a, "version")?),
|
||||||
|
snapshot: need(&a, "snapshot")?.clone(),
|
||||||
|
};
|
||||||
|
let bytes = coa_core::channels::sign(&pointer, &signing_key()?).map_err(e)?;
|
||||||
|
coa_core::fsx::atomic_write(&PathBuf::from(need(&a, "out")?), &bytes).map_err(e)?;
|
||||||
|
}
|
||||||
other => return Err(format!("unknown command {other}")),
|
other => return Err(format!("unknown command {other}")),
|
||||||
}
|
}
|
||||||
Ok(())
|
Ok(())
|
||||||
|
|||||||
+32
-2
@@ -392,8 +392,38 @@ hand over to `coa_core::docker`; nothing else needed to change for start, stop,
|
|||||||
so replaying the SQL files from the base scripts fails, in any order. `coa-release export-baseline --server DIR --out DIR`
|
so replaying the SQL files from the base scripts fails, in any order. `coa-release export-baseline --server DIR --out DIR`
|
||||||
produces the dumps from a prepared server (repack or Docker). The game data stays where the person has it
|
produces the dumps from a prepared server (repack or Docker). The game data stays where the person has it
|
||||||
(`dataDir` in `docker.json`, mounted read-only). A failure removes the containers, the volume and the staging folder.
|
(`dataDir` in `docker.json`, mounted read-only). A failure removes the containers, the volume and the staging folder.
|
||||||
* **Not done yet**: wiring the installer into the screens, downloading the game data, updates, port conflict detection,
|
* **Validating a release on Linux** (`docker/fixture.rs`, used by `coa-release extract-schema-base` and `schema-contract` where
|
||||||
the firewall and exposure checks, the Wildcard realm profiles, and the client under Wine/Proton.
|
there is no Windows database program): the signed base package carries the MySQL data directory of a Windows repack, and a
|
||||||
|
MySQL 8.4 container opens it as it is (`--lower-case-table-names=1`, the repack's setting). The fixture is a Docker server
|
||||||
|
folder (`docker.json` with `mysqlData`: the database container uses that directory in place of a volume; an installation
|
||||||
|
never sets it), plus a `root` account for TCP, which the repack only has for its socket. The release SQL is then applied and the
|
||||||
|
schema contract captured by the same code as on Windows, and `export-baseline` dumps the result: that is how a Linux build
|
||||||
|
produces `Database/baseline` without anyone's live database. The migration checksums recorded in the base are those of
|
||||||
|
files checked out on Windows (CRLF line endings, `core.autocrlf`): the SQL of the core, the modules and SQUID must be
|
||||||
|
checked out the same way for the checksums to match, or every applied migration looks edited.
|
||||||
|
* **In the screens** the host is asked once per command (`coa_core::platform::flavor()`: repack on Windows, Docker
|
||||||
|
elsewhere) and the Docker half lives in `src-tauri/src/docker_install.rs`; the repack arm of each install command is the
|
||||||
|
code that was there. `install_environment` tells the install screen the kind of server, the suggested folder
|
||||||
|
(`~/CoaServer`) and why Docker cannot be used, if it cannot. On Docker the screen also asks for the game data folder and
|
||||||
|
the package, and there is no default package address until a signed Linux package is published. Packages are checked with
|
||||||
|
the embedded key; only a debug build (`tauri dev`) accepts another one, named in `COA_DEV_TRUSTED_KEY`, to try the
|
||||||
|
installer on a package signed with a throwaway key.
|
||||||
|
* **Updates are refused for a Docker server, never half done.** `update::preview`, `apply` and `rollback` refuse it: the
|
||||||
|
update packages are the repack's (executables, a bundled MySQL, a launcher) and applying one would put Windows files in a
|
||||||
|
Linux folder. Found by installing a server with the screen: the update check had read the Windows channel and offered one.
|
||||||
|
* **Realm profiles (CoA / Wildcard) work on a Docker server.** What the repack's patched launcher did at each start is done
|
||||||
|
by the Docker backend: finish an interrupted switch (`realms::before_start`), name the realms in the realm list, and give
|
||||||
|
the containers the databases of the selected realm (`acore_world_wildcard` ...). The switch itself (configuration swap,
|
||||||
|
database copy, journal) is the shared code; `prepare_launcher` has nothing to patch, and Wildcard support is read from
|
||||||
|
`Core/worldserver` as it is from `Core/worldserver.exe`.
|
||||||
|
* **The game client starts under Wine on a Linux host** (`wine.rs`; `client::launch` and `client::is_running` hand over):
|
||||||
|
umu-launcher with a Proton build when `umu-run` is installed (the newest GE-Proton found for Steam, or umu's own choice),
|
||||||
|
else plain Wine; `WINEPREFIX` defaults to `~/Games/umu/coa-client`; `WINEDLLOVERRIDES=divxtac=d` is always set, because
|
||||||
|
DivxTac.dll deadlocks the world loading screen under wine-mono. `COA_PROTONPATH`, `COA_WINEPREFIX` or
|
||||||
|
`client-launch.json` in the Manager's folder (`proton_path`, `prefix`, `runner`) override the detection. Whether the client
|
||||||
|
runs is read from `/proc` (under Wine the command line holds the Windows form of the path). Output goes to `client.log`.
|
||||||
|
* **Not done yet**: downloading the game data, updates, port conflict detection, the firewall and exposure checks, the
|
||||||
|
Wildcard realm profiles, and the client under Wine/Proton.
|
||||||
|
|
||||||
### D14. Keeping Windows and Linux apart
|
### D14. Keeping Windows and Linux apart
|
||||||
|
|
||||||
|
|||||||
@@ -121,6 +121,24 @@
|
|||||||
"default_on": false,
|
"default_on": false,
|
||||||
"page": "bots"
|
"page": "bots"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"id": "custom-races",
|
||||||
|
"name": "Custom Races",
|
||||||
|
"description": {
|
||||||
|
"en": "Playable custom races (Esteria and additional races) with extended appearances.",
|
||||||
|
"ru": "Пользовательские расы (Esteria и дополнительные расы) с расширенной внешностью.",
|
||||||
|
"de": "Spielbare benutzerdefinierte Völker (Esteria und weitere Völker) mit erweitertem Aussehen.",
|
||||||
|
"fr": "Races personnalisées jouables (Esteria et autres) avec apparences étendues.",
|
||||||
|
"es": "Razas personalizadas jugables (Esteria y razas adicionales) con apariencias ampliadas."
|
||||||
|
},
|
||||||
|
"repo": "https://github.com/Corfirean/azerothcore-wotlk-coa",
|
||||||
|
"conf": "coa_custom_races.conf",
|
||||||
|
"switchable": true,
|
||||||
|
"status": "beta",
|
||||||
|
"icon": "races",
|
||||||
|
"enable_key": "CoACustomRaces.Enable",
|
||||||
|
"default_on": false
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"id": "client-compat",
|
"id": "client-compat",
|
||||||
"name": "Client compatibility",
|
"name": "Client compatibility",
|
||||||
|
|||||||
Generated
+2
-2
@@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "coa-server-manager",
|
"name": "coa-server-manager",
|
||||||
"version": "0.6.7",
|
"version": "0.6.13",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "coa-server-manager",
|
"name": "coa-server-manager",
|
||||||
"version": "0.6.7",
|
"version": "0.6.13",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@tauri-apps/api": "^2.12.0",
|
"@tauri-apps/api": "^2.12.0",
|
||||||
"@tauri-apps/plugin-dialog": "^2.8.0",
|
"@tauri-apps/plugin-dialog": "^2.8.0",
|
||||||
|
|||||||
+1
-1
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "coa-server-manager",
|
"name": "coa-server-manager",
|
||||||
"private": true,
|
"private": true,
|
||||||
"version": "0.6.7",
|
"version": "0.6.13",
|
||||||
"license": "AGPL-3.0-only",
|
"license": "AGPL-3.0-only",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|||||||
@@ -0,0 +1,125 @@
|
|||||||
|
//! The Linux (Docker) side of the install commands. `lib.rs` asks `coa_core::platform::flavor()` once per command and
|
||||||
|
//! calls this module for a Docker install; the code for a repack install stays where it was and is not changed by what
|
||||||
|
//! happens here.
|
||||||
|
|
||||||
|
use std::path::{Path, PathBuf};
|
||||||
|
|
||||||
|
use coa_core::docker::{self, install as core_install, SystemDocker};
|
||||||
|
use coa_core::download::Cancel;
|
||||||
|
use coa_core::install::{Preflight, Source};
|
||||||
|
use coa_core::registry::Registry;
|
||||||
|
use coa_core::{Error, Result};
|
||||||
|
use serde::Serialize;
|
||||||
|
use tauri::{AppHandle, Emitter, State};
|
||||||
|
|
||||||
|
use super::{blocking, data_dir, summary, AppState, InstallRequirements, ServerSummary, UiError};
|
||||||
|
|
||||||
|
/// What the install screen needs to know about this computer before it asks anything.
|
||||||
|
#[derive(Serialize)]
|
||||||
|
pub struct Environment {
|
||||||
|
pub flavor: coa_core::platform::Flavor,
|
||||||
|
pub default_dir: String,
|
||||||
|
/// Why Docker cannot be used (not installed, not running, no permission), in Docker's own words; none when it works.
|
||||||
|
pub docker_problem: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn default_dir() -> String {
|
||||||
|
default_dir_in(std::env::var("HOME").ok().as_deref())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn default_dir_in(home: Option<&str>) -> String {
|
||||||
|
match home.map(|h| h.trim_end_matches('/')).filter(|h| !h.is_empty()) {
|
||||||
|
Some(h) => format!("{h}/CoaServer"),
|
||||||
|
None => "/srv/coa".into(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn docker_problem() -> Option<String> {
|
||||||
|
docker::check_docker(&SystemDocker).err().map(|e| e.to_string())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn environment() -> Environment {
|
||||||
|
Environment { flavor: coa_core::platform::flavor(), default_dir: default_dir(), docker_problem: docker_problem() }
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn preflight(dest: &str, data: Option<String>, needed: Option<u64>, registry: &Registry) -> Preflight {
|
||||||
|
// The size comes from the signed package list when the screen already has it; it is checked again at install time.
|
||||||
|
core_install::preflight(Path::new(dest), Path::new(data.as_deref().unwrap_or("")), needed.unwrap_or(1024 * 1024 * 1024), registry)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The Linux package has no default address yet: it is published only after the maintainer has signed it.
|
||||||
|
pub fn package_source(custom: Option<String>) -> Result<Source> {
|
||||||
|
let pick = custom.filter(|s| !s.trim().is_empty()).or_else(|| std::env::var("COA_PACKAGE_SOURCE").ok().filter(|s| !s.trim().is_empty()));
|
||||||
|
match pick {
|
||||||
|
Some(p) if p.to_ascii_lowercase().starts_with("http") => Ok(Source::Url(p)),
|
||||||
|
Some(p) => Ok(Source::Dir(PathBuf::from(p))),
|
||||||
|
None => Err(Error::Invalid("Choose the Linux server package (a folder or an address): none is published yet.".into())),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The key a Linux package must be signed with. A debug build (`tauri dev`) may name another one in `COA_DEV_TRUSTED_KEY`,
|
||||||
|
/// to try the installer on a package signed with a throwaway key; a release build always uses the embedded key.
|
||||||
|
pub fn trusted_key() -> String {
|
||||||
|
#[cfg(debug_assertions)]
|
||||||
|
if let Ok(k) = std::env::var("COA_DEV_TRUSTED_KEY") {
|
||||||
|
if !k.trim().is_empty() {
|
||||||
|
return k.trim().to_string();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
coa_core::signing::EMBEDDED_PUBLIC_KEY.to_string()
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn requirements(package: Option<String>) -> std::result::Result<InstallRequirements, UiError> {
|
||||||
|
blocking(move || {
|
||||||
|
let (m, _) = coa_core::pkgsource::fetch_manifest(&package_source(package)?, &trusted_key())?;
|
||||||
|
let archive = m.archive.ok_or_else(|| Error::InvalidManifest("no archive".into()))?;
|
||||||
|
Ok(InstallRequirements { download_bytes: archive.parts.iter().map(|p| p.size).sum(), unpacked_bytes: archive.unpacked_size, version: m.version })
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn install(app: AppHandle, state: State<'_, AppState>, dest: String, package: Option<String>, data: Option<String>) -> std::result::Result<ServerSummary, UiError> {
|
||||||
|
let source = package_source(package)?;
|
||||||
|
let data_dir_path = PathBuf::from(data.filter(|d| !d.trim().is_empty()).ok_or_else(|| Error::Invalid("Choose the folder that holds the game data.".into()))?);
|
||||||
|
let cancel = Cancel::default();
|
||||||
|
*state.install_cancel.lock().map_err(|_| Error::Invalid("state poisoned".into()))? = Some(cancel.clone());
|
||||||
|
let registry = Registry::at(data_dir().join("installs.json"));
|
||||||
|
let dest_path = PathBuf::from(dest);
|
||||||
|
let key = trusted_key();
|
||||||
|
let result = tauri::async_runtime::spawn_blocking(move || {
|
||||||
|
core_install::install(
|
||||||
|
&core_install::Params { source, dest: dest_path, data_dir: data_dir_path, trusted_key: &key, registry: ®istry, cancel },
|
||||||
|
&|step| {
|
||||||
|
let _ = app.emit("install-progress", step);
|
||||||
|
},
|
||||||
|
)
|
||||||
|
})
|
||||||
|
.await;
|
||||||
|
if let Ok(mut c) = state.install_cancel.lock() {
|
||||||
|
*c = None;
|
||||||
|
}
|
||||||
|
let done = result.map_err(|e| Error::Invalid(e.to_string()))??;
|
||||||
|
Ok(summary(done.id, PathBuf::from(done.path)))
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn the_default_folder_is_in_the_home_folder() {
|
||||||
|
assert_eq!(default_dir_in(Some("/home/ana")), "/home/ana/CoaServer");
|
||||||
|
assert_eq!(default_dir_in(Some("/home/ana/")), "/home/ana/CoaServer");
|
||||||
|
assert_eq!(default_dir_in(None), "/srv/coa");
|
||||||
|
assert_eq!(default_dir_in(Some("")), "/srv/coa");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn a_linux_package_must_be_named_there_is_no_default() {
|
||||||
|
std::env::remove_var("COA_PACKAGE_SOURCE");
|
||||||
|
assert!(package_source(None).is_err());
|
||||||
|
assert!(package_source(Some(" ".into())).is_err());
|
||||||
|
assert!(matches!(package_source(Some("/tmp/pkg".into())).unwrap(), Source::Dir(_)));
|
||||||
|
assert!(matches!(package_source(Some("https://example.org/pkg".into())).unwrap(), Source::Url(_)));
|
||||||
|
}
|
||||||
|
}
|
||||||
+96
-11
@@ -5,11 +5,14 @@ use std::collections::HashSet;
|
|||||||
use std::path::PathBuf;
|
use std::path::PathBuf;
|
||||||
use std::sync::Mutex;
|
use std::sync::Mutex;
|
||||||
|
|
||||||
|
mod docker_install;
|
||||||
|
|
||||||
use coa_core::backup::{self, Kind, RecoveryPoint, Trigger, VerifyReport};
|
use coa_core::backup::{self, Kind, RecoveryPoint, Trigger, VerifyReport};
|
||||||
use coa_core::config::{self, Scope, SettingsView};
|
use coa_core::config::{self, Scope, SettingsView};
|
||||||
use coa_core::download::Cancel;
|
use coa_core::download::Cancel;
|
||||||
use coa_core::driver::{self, DriverOutcome, Verb};
|
use coa_core::driver::{self, DriverOutcome, Verb};
|
||||||
use coa_core::install::{self, Preflight, Source};
|
use coa_core::install::{self, Preflight, Source};
|
||||||
|
use coa_core::platform::{self, Flavor};
|
||||||
use coa_core::ra::Ra;
|
use coa_core::ra::Ra;
|
||||||
use coa_core::update::{self, Resolution};
|
use coa_core::update::{self, Resolution};
|
||||||
use coa_core::error::UiError;
|
use coa_core::error::UiError;
|
||||||
@@ -36,12 +39,16 @@ struct AppState {
|
|||||||
/// Where signed update packages are published; override with COA_UPDATE_SOURCE (URL or local package folder).
|
/// Where signed update packages are published; override with COA_UPDATE_SOURCE (URL or local package folder).
|
||||||
const DEFAULT_UPDATE_URL: &str = "https://github.com/Corfirean/coa-server-build/releases/download/stable";
|
const DEFAULT_UPDATE_URL: &str = "https://github.com/Corfirean/coa-server-build/releases/download/stable";
|
||||||
|
|
||||||
fn update_source(custom: Option<String>) -> Source {
|
fn update_source(custom: Option<String>) -> Result<Source> {
|
||||||
let pick = custom.filter(|s| !s.trim().is_empty()).or_else(|| std::env::var("COA_UPDATE_SOURCE").ok());
|
let pick = custom.filter(|s| !s.trim().is_empty()).or_else(|| std::env::var("COA_UPDATE_SOURCE").ok());
|
||||||
match pick {
|
match pick {
|
||||||
Some(p) if p.to_ascii_lowercase().starts_with("http") => Source::Url(p),
|
Some(p) if p.to_ascii_lowercase().starts_with("http") => Ok(Source::Url(p)),
|
||||||
Some(p) => Source::Dir(PathBuf::from(p)),
|
Some(p) => Ok(Source::Dir(PathBuf::from(p))),
|
||||||
None => Source::Url(DEFAULT_UPDATE_URL.into()),
|
None => match coa_core::channels::resolve("stable") {
|
||||||
|
Ok(source) => Ok(source),
|
||||||
|
Err(Error::PackageNotPublished(_)) => Ok(Source::Url(DEFAULT_UPDATE_URL.into())),
|
||||||
|
Err(error) => Err(error),
|
||||||
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -105,9 +112,19 @@ fn summary(id: String, path: PathBuf) -> ServerSummary {
|
|||||||
|
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
fn default_install_dir() -> String {
|
fn default_install_dir() -> String {
|
||||||
|
if platform::flavor() == Flavor::Docker {
|
||||||
|
return docker_install::default_dir();
|
||||||
|
}
|
||||||
"C:\\Games\\CoA Server".into()
|
"C:\\Games\\CoA Server".into()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// What the install screen needs to know about this computer: the kind of server it installs, the suggested folder, and
|
||||||
|
/// whether Docker can be used.
|
||||||
|
#[tauri::command]
|
||||||
|
async fn install_environment() -> docker_install::Environment {
|
||||||
|
tauri::async_runtime::spawn_blocking(docker_install::environment).await.unwrap_or_else(|_| docker_install::Environment { flavor: platform::flavor(), default_dir: default_install_dir(), docker_problem: None })
|
||||||
|
}
|
||||||
|
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
async fn scan_server(path: String) -> std::result::Result<ScanReport, UiError> {
|
async fn scan_server(path: String) -> std::result::Result<ScanReport, UiError> {
|
||||||
tauri::async_runtime::spawn_blocking(move || layout::scan(std::path::Path::new(&path)))
|
tauri::async_runtime::spawn_blocking(move || layout::scan(std::path::Path::new(&path)))
|
||||||
@@ -450,7 +467,10 @@ async fn restore_backup_database(state: State<'_, AppState>, id: String, backup_
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
fn install_preflight(state: State<'_, AppState>, dest: String, needed: Option<u64>) -> Preflight {
|
fn install_preflight(state: State<'_, AppState>, dest: String, needed: Option<u64>, game_data: Option<String>) -> Preflight {
|
||||||
|
if platform::flavor() == Flavor::Docker {
|
||||||
|
return docker_install::preflight(&dest, game_data, needed, &state.registry);
|
||||||
|
}
|
||||||
// `needed` is the real size from the signed package list when the screen already has it; the real size is checked
|
// `needed` is the real size from the signed package list when the screen already has it; the real size is checked
|
||||||
// again at install time either way.
|
// again at install time either way.
|
||||||
install::preflight(std::path::Path::new(&dest), needed.unwrap_or(6 * 1024 * 1024 * 1024), &state.registry)
|
install::preflight(std::path::Path::new(&dest), needed.unwrap_or(6 * 1024 * 1024 * 1024), &state.registry)
|
||||||
@@ -468,6 +488,9 @@ struct InstallRequirements {
|
|||||||
/// How big the server is, read from the package's signed list before anything is downloaded.
|
/// How big the server is, read from the package's signed list before anything is downloaded.
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
async fn install_requirements(package: Option<String>) -> std::result::Result<InstallRequirements, UiError> {
|
async fn install_requirements(package: Option<String>) -> std::result::Result<InstallRequirements, UiError> {
|
||||||
|
if platform::flavor() == Flavor::Docker {
|
||||||
|
return docker_install::requirements(package).await;
|
||||||
|
}
|
||||||
blocking(move || {
|
blocking(move || {
|
||||||
let (m, _) = coa_core::pkgsource::fetch_manifest(&package_source(package), coa_core::signing::EMBEDDED_PUBLIC_KEY)?;
|
let (m, _) = coa_core::pkgsource::fetch_manifest(&package_source(package), coa_core::signing::EMBEDDED_PUBLIC_KEY)?;
|
||||||
let archive = m.archive.ok_or_else(|| Error::InvalidManifest("no archive".into()))?;
|
let archive = m.archive.ok_or_else(|| Error::InvalidManifest("no archive".into()))?;
|
||||||
@@ -477,7 +500,10 @@ async fn install_requirements(package: Option<String>) -> std::result::Result<In
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
async fn install_new(app: AppHandle, state: State<'_, AppState>, dest: String, package: Option<String>) -> std::result::Result<ServerSummary, UiError> {
|
async fn install_new(app: AppHandle, state: State<'_, AppState>, dest: String, package: Option<String>, game_data: Option<String>) -> std::result::Result<ServerSummary, UiError> {
|
||||||
|
if platform::flavor() == Flavor::Docker {
|
||||||
|
return docker_install::install(app, state, dest, package, game_data).await;
|
||||||
|
}
|
||||||
let cancel = Cancel::default();
|
let cancel = Cancel::default();
|
||||||
*state.install_cancel.lock().map_err(|_| Error::Invalid("state poisoned".into()))? = Some(cancel.clone());
|
*state.install_cancel.lock().map_err(|_| Error::Invalid("state poisoned".into()))? = Some(cancel.clone());
|
||||||
let source = package_source(package);
|
let source = package_source(package);
|
||||||
@@ -623,7 +649,7 @@ async fn repair_server(app: AppHandle, state: State<'_, AppState>, id: String) -
|
|||||||
let _guard = BusyGuard::acquire(&state, &id)?;
|
let _guard = BusyGuard::acquire(&state, &id)?;
|
||||||
blocking(move || {
|
blocking(move || {
|
||||||
let dir = meta_dir(&root)?;
|
let dir = meta_dir(&root)?;
|
||||||
coa_core::repair::run(&root, &dir, &package_source(None), &update_source(None), coa_core::signing::EMBEDDED_PUBLIC_KEY, &|step,percent| {
|
coa_core::repair::run(&root, &dir, &package_source(None), &update_source(None)?, coa_core::signing::EMBEDDED_PUBLIC_KEY, &|step,percent| {
|
||||||
let _ = app.emit("repair-progress", serde_json::json!({ "id": id, "step": step, "percent": percent }));
|
let _ = app.emit("repair-progress", serde_json::json!({ "id": id, "step": step, "percent": percent }));
|
||||||
})
|
})
|
||||||
}).await
|
}).await
|
||||||
@@ -639,6 +665,50 @@ async fn module_set_enabled(state: State<'_, AppState>, id: String, module: Stri
|
|||||||
})
|
})
|
||||||
.await
|
.await
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[tauri::command]
|
||||||
|
async fn custom_races_status(state: State<'_, AppState>, id: String) -> std::result::Result<Option<coa_core::custom_races::ClientPatchStatus>, UiError> {
|
||||||
|
let ctx = client_context(&state, &id)?;
|
||||||
|
blocking(move || {
|
||||||
|
let client = ctx.linked();
|
||||||
|
Ok(client.as_deref().map(coa_core::custom_races::client_patch_status))
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tauri::command]
|
||||||
|
async fn custom_races_install(app: AppHandle, state: State<'_, AppState>, id: String) -> std::result::Result<(), UiError> {
|
||||||
|
let ctx = client_context(&state, &id)?;
|
||||||
|
let _guard = BusyGuard::acquire(&state, &id)?;
|
||||||
|
let cancel = begin_client_job(&state)?;
|
||||||
|
let sid = id.clone();
|
||||||
|
let result = blocking(move || {
|
||||||
|
let client = ctx.require()?;
|
||||||
|
coa_core::custom_races::install_client_patches(&client, &cancel, &|step, percent| {
|
||||||
|
let _ = app.emit("custom-races-progress", serde_json::json!({
|
||||||
|
"id": sid,
|
||||||
|
"step": step,
|
||||||
|
"percent": percent,
|
||||||
|
}));
|
||||||
|
})?;
|
||||||
|
let enabled = ctx.root.as_ref().map_or(true, |root| coa_core::modules::list(root).iter().any(|module| module.id == "custom-races" && module.enabled));
|
||||||
|
coa_core::custom_races::set_client_patch_enabled(&client, enabled)
|
||||||
|
})
|
||||||
|
.await;
|
||||||
|
end_client_job(&state);
|
||||||
|
result
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tauri::command]
|
||||||
|
async fn custom_races_toggle_client(state: State<'_, AppState>, id: String, enabled: bool) -> std::result::Result<(), UiError> {
|
||||||
|
let root = path_of(&state, &id)?;
|
||||||
|
let _guard = BusyGuard::acquire(&state, &id)?;
|
||||||
|
blocking(move || {
|
||||||
|
let client = linked_client(&root)?.ok_or_else(|| Error::Invalid("No game client is linked to this server.".into()))?;
|
||||||
|
coa_core::custom_races::set_client_patch_enabled(&client, enabled)
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
}
|
||||||
|
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
async fn module_settings(state: State<'_, AppState>, id: String, module: String) -> std::result::Result<Vec<coa_core::modules::Setting>, UiError> {
|
async fn module_settings(state: State<'_, AppState>, id: String, module: String) -> std::result::Result<Vec<coa_core::modules::Setting>, UiError> {
|
||||||
@@ -731,11 +801,12 @@ fn install_meta(root: &std::path::Path) -> Result<(PathBuf, InstallMeta)> {
|
|||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
async fn check_update(state: State<'_, AppState>, id: String, source: Option<String>, background: Option<bool>) -> std::result::Result<update::Preview, UiError> {
|
async fn check_update(state: State<'_, AppState>, id: String, source: Option<String>, background: Option<bool>) -> std::result::Result<update::Preview, UiError> {
|
||||||
let root = path_of(&state, &id)?;
|
let root = path_of(&state, &id)?;
|
||||||
let src = update_source(source);
|
|
||||||
// The check that repeats every few minutes must not start and stop the database of a stopped server.
|
// The check that repeats every few minutes must not start and stop the database of a stopped server.
|
||||||
let access = if background.unwrap_or(false) { update::DatabaseAccess::OnlyIfRunning } else { update::DatabaseAccess::Start };
|
let access = if background.unwrap_or(false) { update::DatabaseAccess::OnlyIfRunning } else { update::DatabaseAccess::Start };
|
||||||
blocking(move || {
|
blocking(move || {
|
||||||
let (_, meta) = install_meta(&root)?;
|
let (_, meta) = install_meta(&root)?;
|
||||||
|
let src = update_source(source)?;
|
||||||
update::preview_with(&root, &meta, &src, coa_core::signing::EMBEDDED_PUBLIC_KEY, &Default::default(), access)
|
update::preview_with(&root, &meta, &src, coa_core::signing::EMBEDDED_PUBLIC_KEY, &Default::default(), access)
|
||||||
})
|
})
|
||||||
.await
|
.await
|
||||||
@@ -756,10 +827,13 @@ async fn apply_update(
|
|||||||
resolutions: BTreeMap<String, Resolution>,
|
resolutions: BTreeMap<String, Resolution>,
|
||||||
) -> std::result::Result<update::Outcome, UiError> {
|
) -> std::result::Result<update::Outcome, UiError> {
|
||||||
let root = path_of(&state, &id)?;
|
let root = path_of(&state, &id)?;
|
||||||
let src = update_source(source);
|
|
||||||
let _guard = BusyGuard::acquire(&state, &id)?;
|
let _guard = BusyGuard::acquire(&state, &id)?;
|
||||||
blocking(move || {
|
blocking(move || {
|
||||||
let (dir, _) = install_meta(&root)?;
|
let src = update_source(source)?;
|
||||||
|
let (dir, meta) = install_meta(&root)?;
|
||||||
|
let (manifest, _) = coa_core::pkgsource::fetch_manifest(&src, coa_core::signing::EMBEDDED_PUBLIC_KEY)?;
|
||||||
|
update::validate_candidate(&meta, &manifest)?;
|
||||||
// Files cannot be replaced while the server runs: stop it first (gracefully), like the Stop button.
|
// Files cannot be replaced while the server runs: stop it first (gracefully), like the Stop button.
|
||||||
let observed = coa_core::process::observe(&root, &layout::read_ports(&root));
|
let observed = coa_core::process::observe(&root, &layout::read_ports(&root));
|
||||||
if observed.world.state != coa_core::process::ServiceState::Stopped || observed.auth.state != coa_core::process::ServiceState::Stopped || coa_core::multiworld::is_running(&root) {
|
if observed.world.state != coa_core::process::ServiceState::Stopped || observed.auth.state != coa_core::process::ServiceState::Stopped || coa_core::multiworld::is_running(&root) {
|
||||||
@@ -1543,6 +1617,12 @@ async fn export_diagnostics(state: State<'_, AppState>, id: String) -> std::resu
|
|||||||
.await
|
.await
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[tauri::command]
|
||||||
|
async fn list_crashes(state: State<'_, AppState>, id: String, limit: Option<usize>) -> std::result::Result<Vec<coa_core::crashes::CrashItem>, UiError> {
|
||||||
|
let root = path_of(&state, &id)?;
|
||||||
|
blocking(move || coa_core::crashes::list(&root, limit.unwrap_or(10))).await
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
async fn console_tail(
|
async fn console_tail(
|
||||||
@@ -1590,6 +1670,7 @@ pub fn run() {
|
|||||||
.manage(AppState { registry: Registry::at(dir.join("installs.json")), busy: Mutex::new(HashSet::new()), install_cancel: Mutex::new(None), client_cancel: Mutex::new(None) })
|
.manage(AppState { registry: Registry::at(dir.join("installs.json")), busy: Mutex::new(HashSet::new()), install_cancel: Mutex::new(None), client_cancel: Mutex::new(None) })
|
||||||
.invoke_handler(tauri::generate_handler![
|
.invoke_handler(tauri::generate_handler![
|
||||||
default_install_dir,
|
default_install_dir,
|
||||||
|
install_environment,
|
||||||
scan_server,
|
scan_server,
|
||||||
add_server,
|
add_server,
|
||||||
list_servers,
|
list_servers,
|
||||||
@@ -1677,9 +1758,13 @@ pub fn run() {
|
|||||||
run_diagnostics,
|
run_diagnostics,
|
||||||
verify_files,
|
verify_files,
|
||||||
export_diagnostics,
|
export_diagnostics,
|
||||||
|
list_crashes,
|
||||||
console_tail,
|
console_tail,
|
||||||
console_risk,
|
console_risk,
|
||||||
console_command
|
console_command,
|
||||||
|
custom_races_status,
|
||||||
|
custom_races_install,
|
||||||
|
custom_races_toggle_client
|
||||||
])
|
])
|
||||||
.run(tauri::generate_context!())
|
.run(tauri::generate_context!())
|
||||||
.expect("error while running CoA Server Manager");
|
.expect("error while running CoA Server Manager");
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"$schema": "https://schema.tauri.app/config/2",
|
"$schema": "https://schema.tauri.app/config/2",
|
||||||
"productName": "CoA Server Manager",
|
"productName": "CoA Server Manager",
|
||||||
"version": "0.6.7",
|
"version": "0.6.13",
|
||||||
"identifier": "com.coa.servermanager",
|
"identifier": "com.coa.servermanager",
|
||||||
"build": {
|
"build": {
|
||||||
"beforeDevCommand": "npm run dev",
|
"beforeDevCommand": "npm run dev",
|
||||||
|
|||||||
@@ -91,6 +91,8 @@ export {};
|
|||||||
if(cmd==="report_targets") return [{id:"manager",repo:"Corfirean/coa-server-manager",ours:true},{id:"companions",repo:"Corfirean/mod-coa-playerbots",ours:true},{id:"squid",repo:"Zyth45/mod-playerbots",ours:false}];
|
if(cmd==="report_targets") return [{id:"manager",repo:"Corfirean/coa-server-manager",ours:true},{id:"companions",repo:"Corfirean/mod-coa-playerbots",ours:true},{id:"squid",repo:"Zyth45/mod-playerbots",ours:false}];
|
||||||
if(cmd==="open_link"){(window as any).__lastLink=args.url;return null;}
|
if(cmd==="open_link"){(window as any).__lastLink=args.url;return null;}
|
||||||
if(cmd==="export_diagnostics") return "C:\\Users\\you\\Desktop\\CoA-Diagnostics-20261001-140000.zip";
|
if(cmd==="export_diagnostics") return "C:\\Users\\you\\Desktop\\CoA-Diagnostics-20261001-140000.zip";
|
||||||
|
if(cmd==="list_crashes") return [];
|
||||||
|
if(cmd==="install_environment"){const docker=new URLSearchParams(location.search).get("flavor")==="docker";return docker?{flavor:"docker",default_dir:"/home/you/CoaServer",docker_problem:new URLSearchParams(location.search).has("nodocker")?"permission denied while trying to connect to the Docker daemon socket":null}:{flavor:"repack",default_dir:"C:\\Games\\CoA Server",docker_problem:null};}
|
||||||
if(cmd==="install_preflight") return {ok:true,problems:[],free_bytes:210*2**30};
|
if(cmd==="install_preflight") return {ok:true,problems:[],free_bytes:210*2**30};
|
||||||
if(cmd==="install_requirements") return {download_bytes:Math.round(5.9*2**30),unpacked_bytes:Math.round(11.4*2**30),version:"0.2.0"};
|
if(cmd==="install_requirements") return {download_bytes:Math.round(5.9*2**30),unpacked_bytes:Math.round(11.4*2**30),version:"0.2.0"};
|
||||||
if(cmd==="list_accounts"){const w=window as any;w.__acc=w.__acc??[{id:2,name:"ALICE",access:3,online:true,last_login:"2026-10-01 12:04:11",characters:4},{id:5,name:"BOB",access:0,online:false,last_login:null,characters:0},{id:6,name:"CAROL",access:2,online:false,last_login:"2026-09-30 21:40:02",characters:2}];return w.__acc;}
|
if(cmd==="list_accounts"){const w=window as any;w.__acc=w.__acc??[{id:2,name:"ALICE",access:3,online:true,last_login:"2026-10-01 12:04:11",characters:4},{id:5,name:"BOB",access:0,online:false,last_login:null,characters:0},{id:6,name:"CAROL",access:2,online:false,last_login:"2026-09-30 21:40:02",characters:2}];return w.__acc;}
|
||||||
|
|||||||
@@ -195,6 +195,7 @@ const de: Partial<Record<keyof typeof en, string>> = {
|
|||||||
"comp.saved": "Gespeichert. {n} Begleiter werden beim Serverstart erstellt.",
|
"comp.saved": "Gespeichert. {n} Begleiter werden beim Serverstart erstellt.",
|
||||||
|
|
||||||
// Client
|
// Client
|
||||||
|
"client.races.install": "Patch für benutzerdefinierte Völker installieren",
|
||||||
"client.title": "Spielclient",
|
"client.title": "Spielclient",
|
||||||
"client.looking": "Suche …",
|
"client.looking": "Suche …",
|
||||||
"client.intro": "Sag dem Manager, wo dein Spiel installiert ist, um einen SPIELEN-Button zu erhalten. Deine Spieldateien werden nie geändert, außer der Serveradresse und dem Begleiter-Addon.",
|
"client.intro": "Sag dem Manager, wo dein Spiel installiert ist, um einen SPIELEN-Button zu erhalten. Deine Spieldateien werden nie geändert, außer der Serveradresse und dem Begleiter-Addon.",
|
||||||
@@ -867,6 +868,21 @@ const de: Partial<Record<keyof typeof en, string>> = {
|
|||||||
"fr.lan.unavailable": "Ausgewählte Adresse nicht verfügbar",
|
"fr.lan.unavailable": "Ausgewählte Adresse nicht verfügbar",
|
||||||
"fr.lan.unavailableText": "Die ausgewählte Adresse ist derzeit keinem erkannten lokalen Netzwerkadapter zugewiesen. Wählen Sie eine andere Adresse oder Automatisch, oder behalten Sie diese Adresse bewusst bei.",
|
"fr.lan.unavailableText": "Die ausgewählte Adresse ist derzeit keinem erkannten lokalen Netzwerkadapter zugewiesen. Wählen Sie eine andere Adresse oder Automatisch, oder behalten Sie diese Adresse bewusst bei.",
|
||||||
"fr.lan.invalid": "Ungültige IPv4-Adresse",
|
"fr.lan.invalid": "Ungültige IPv4-Adresse",
|
||||||
|
"unsaved.title": "Nicht gespeicherte Änderungen",
|
||||||
|
"unsaved.message": "Sie haben nicht gespeicherte Änderungen. Möchten Sie diese vor dem Verlassen der Seite speichern?",
|
||||||
|
"unsaved.saveFailed": "Änderungen konnten nicht gespeichert werden. Bitte Eingaben überprüfen.",
|
||||||
|
"crash.autoRestart": "Automatischer Neustart bei Absturz",
|
||||||
|
"crash.autoRestartDesc": "Startet den Server automatisch neu, falls er unerwartet abstürzt.",
|
||||||
|
"crash.badge": "Abstürze: {n}",
|
||||||
|
"crash.historyTitle": "Absturzverlauf des Servers",
|
||||||
|
"crash.noCrashes": "Keine Absturzberichte gefunden.",
|
||||||
|
"crash.restartNotice": "Der Server ist abgestürzt und wurde automatisch neu gestartet (Absturz #{n}).",
|
||||||
|
"crash.loopPaused": "Automatischer Neustart pausiert: Der Server ist mehrfach kurz hintereinander abgestürzt.",
|
||||||
|
"crash.details": "Absturzdetails",
|
||||||
|
"crash.viewRaw": "Vollständigen Bericht anzeigen",
|
||||||
|
"crash.hideRaw": "Vollständigen Bericht verbergen",
|
||||||
|
"crash.copyReport": "Bericht kopieren",
|
||||||
|
"crash.copied": "Kopiert!",
|
||||||
};
|
};
|
||||||
|
|
||||||
export default de;
|
export default de;
|
||||||
@@ -190,6 +190,14 @@ const en = {
|
|||||||
"install.localPkg": "Install from a local package folder instead of downloading",
|
"install.localPkg": "Install from a local package folder instead of downloading",
|
||||||
"install.localPkgHint": "(leave empty to download)",
|
"install.localPkgHint": "(leave empty to download)",
|
||||||
"install.button": "Install",
|
"install.button": "Install",
|
||||||
|
"install.docker.title": "Docker is needed",
|
||||||
|
"install.docker.text": "On Linux the server runs in Docker. Install Docker and start it, or allow your user to use it, then check again.",
|
||||||
|
"install.docker.retry": "Check again",
|
||||||
|
"install.data.label": "Game data folder",
|
||||||
|
"install.data.hint": "The folder with the game's dbc, maps, vmaps and mmaps. It is used where it is and never changed.",
|
||||||
|
"install.data.dialogTitle": "Choose the game data folder",
|
||||||
|
"install.linuxPkg.label": "Server package",
|
||||||
|
"install.linuxPkg.hint": "A folder or an address of the Linux server package",
|
||||||
"install.progressTitle": "Preparing your server",
|
"install.progressTitle": "Preparing your server",
|
||||||
"install.progressText": "This can take a few minutes. You can leave this window open.",
|
"install.progressText": "This can take a few minutes. You can leave this window open.",
|
||||||
"install.step.checking": "Checking your computer",
|
"install.step.checking": "Checking your computer",
|
||||||
@@ -230,6 +238,7 @@ const en = {
|
|||||||
"comp.saved": "Saved. {n} companions will be created when the server starts.",
|
"comp.saved": "Saved. {n} companions will be created when the server starts.",
|
||||||
|
|
||||||
// Client
|
// Client
|
||||||
|
"client.races.install": "Install custom race patch",
|
||||||
"client.title": "Game client",
|
"client.title": "Game client",
|
||||||
"client.looking": "Looking…",
|
"client.looking": "Looking…",
|
||||||
"client.intro": "Tell Manager where your game is installed to get a PLAY button. Your game files are never changed except the server address and the companion addon.",
|
"client.intro": "Tell Manager where your game is installed to get a PLAY button. Your game files are never changed except the server address and the companion addon.",
|
||||||
@@ -890,6 +899,21 @@ const en = {
|
|||||||
"fr.lan.unavailable": "Selected address unavailable",
|
"fr.lan.unavailable": "Selected address unavailable",
|
||||||
"fr.lan.unavailableText": "The selected address is not currently assigned to a detected local interface. Choose another address or switch to Automatic, or keep this address intentionally.",
|
"fr.lan.unavailableText": "The selected address is not currently assigned to a detected local interface. Choose another address or switch to Automatic, or keep this address intentionally.",
|
||||||
"fr.lan.invalid": "Invalid IPv4 address",
|
"fr.lan.invalid": "Invalid IPv4 address",
|
||||||
|
"unsaved.title": "Unsaved changes",
|
||||||
|
"unsaved.message": "You have unsaved changes. Do you want to save them before leaving this page?",
|
||||||
|
"unsaved.saveFailed": "Failed to save changes. Please check fields for errors.",
|
||||||
|
"crash.autoRestart": "Auto-restart on crash",
|
||||||
|
"crash.autoRestartDesc": "Automatically restart the world server if it crashes or stops unexpectedly.",
|
||||||
|
"crash.badge": "Crashes: {n}",
|
||||||
|
"crash.historyTitle": "Server Crash History",
|
||||||
|
"crash.noCrashes": "No crash reports found.",
|
||||||
|
"crash.restartNotice": "Server crashed and was automatically restarted (Crash #{n}).",
|
||||||
|
"crash.loopPaused": "Auto-restart paused: the server crashed repeatedly in a short period.",
|
||||||
|
"crash.details": "Crash Details",
|
||||||
|
"crash.viewRaw": "View full crash report",
|
||||||
|
"crash.hideRaw": "Hide full report",
|
||||||
|
"crash.copyReport": "Copy crash report",
|
||||||
|
"crash.copied": "Copied!",
|
||||||
} as const;
|
} as const;
|
||||||
|
|
||||||
export default en;
|
export default en;
|
||||||
@@ -195,6 +195,7 @@ const es: Partial<Record<keyof typeof en, string>> = {
|
|||||||
"comp.saved": "Guardado. Se crearán {n} compañeros cuando se inicie el servidor.",
|
"comp.saved": "Guardado. Se crearán {n} compañeros cuando se inicie el servidor.",
|
||||||
|
|
||||||
// Client
|
// Client
|
||||||
|
"client.races.install": "Instalar parche de razas personalizadas",
|
||||||
"client.title": "Cliente del juego",
|
"client.title": "Cliente del juego",
|
||||||
"client.looking": "Buscando…",
|
"client.looking": "Buscando…",
|
||||||
"client.intro": "Indica al Manager dónde está instalado el juego para obtener un botón JUGAR. Tus archivos del juego nunca se modifican, salvo la dirección del servidor y el addon de compañeros.",
|
"client.intro": "Indica al Manager dónde está instalado el juego para obtener un botón JUGAR. Tus archivos del juego nunca se modifican, salvo la dirección del servidor y el addon de compañeros.",
|
||||||
@@ -867,6 +868,21 @@ const es: Partial<Record<keyof typeof en, string>> = {
|
|||||||
"fr.lan.unavailable": "Dirección seleccionada no disponible",
|
"fr.lan.unavailable": "Dirección seleccionada no disponible",
|
||||||
"fr.lan.unavailableText": "La dirección seleccionada no está asignada actualmente a ninguna interfaz local detectada. Elige otra dirección o Automática, o conserva esta dirección si así lo deseas.",
|
"fr.lan.unavailableText": "La dirección seleccionada no está asignada actualmente a ninguna interfaz local detectada. Elige otra dirección o Automática, o conserva esta dirección si así lo deseas.",
|
||||||
"fr.lan.invalid": "Dirección IPv4 no válida",
|
"fr.lan.invalid": "Dirección IPv4 no válida",
|
||||||
|
"unsaved.title": "Cambios sin guardar",
|
||||||
|
"unsaved.message": "¿Tienes cambios sin guardar. ¿Quieres guardarlos antes de salir de esta página?",
|
||||||
|
"unsaved.saveFailed": "Error al guardar los cambios. Revisa los campos.",
|
||||||
|
"crash.autoRestart": "Reinicio automático tras caída",
|
||||||
|
"crash.autoRestartDesc": "Reinicia automáticamente el servidor si se detiene de forma inesperada.",
|
||||||
|
"crash.badge": "Caídas: {n}",
|
||||||
|
"crash.historyTitle": "Historial de caídas del servidor",
|
||||||
|
"crash.noCrashes": "No se encontraron informes de caídas.",
|
||||||
|
"crash.restartNotice": "El servidor se cayó y se reinició automáticamente (Caída #{n}).",
|
||||||
|
"crash.loopPaused": "Reinicio automático pausado: el servidor se ha caído varias veces en poco tiempo.",
|
||||||
|
"crash.details": "Detalles de la caída",
|
||||||
|
"crash.viewRaw": "Ver informe completo",
|
||||||
|
"crash.hideRaw": "Ocultar informe completo",
|
||||||
|
"crash.copyReport": "Copiar informe",
|
||||||
|
"crash.copied": "¡Copiado!",
|
||||||
};
|
};
|
||||||
|
|
||||||
export default es;
|
export default es;
|
||||||
@@ -195,6 +195,7 @@ const fr: Partial<Record<keyof typeof en, string>> = {
|
|||||||
"comp.saved": "Enregistré. {n} compagnons seront créés au démarrage du serveur.",
|
"comp.saved": "Enregistré. {n} compagnons seront créés au démarrage du serveur.",
|
||||||
|
|
||||||
// Client
|
// Client
|
||||||
|
"client.races.install": "Installer le patch des races personnalisées",
|
||||||
"client.title": "Client du jeu",
|
"client.title": "Client du jeu",
|
||||||
"client.looking": "Recherche…",
|
"client.looking": "Recherche…",
|
||||||
"client.intro": "Indiquez au Manager où le jeu est installé pour obtenir un bouton JOUER. Vos fichiers de jeu ne sont jamais modifiés, sauf l’adresse du serveur et l’addon des compagnons.",
|
"client.intro": "Indiquez au Manager où le jeu est installé pour obtenir un bouton JOUER. Vos fichiers de jeu ne sont jamais modifiés, sauf l’adresse du serveur et l’addon des compagnons.",
|
||||||
@@ -867,6 +868,21 @@ const fr: Partial<Record<keyof typeof en, string>> = {
|
|||||||
"fr.lan.unavailable": "Adresse sélectionnée indisponible",
|
"fr.lan.unavailable": "Adresse sélectionnée indisponible",
|
||||||
"fr.lan.unavailableText": "Cette adresse n’est actuellement attribuée à aucune interface locale détectée. Choisissez une autre adresse ou le mode Automatique, ou conservez volontairement cette adresse.",
|
"fr.lan.unavailableText": "Cette adresse n’est actuellement attribuée à aucune interface locale détectée. Choisissez une autre adresse ou le mode Automatique, ou conservez volontairement cette adresse.",
|
||||||
"fr.lan.invalid": "Adresse IPv4 non valide",
|
"fr.lan.invalid": "Adresse IPv4 non valide",
|
||||||
|
"unsaved.title": "Modifications non enregistrées",
|
||||||
|
"unsaved.message": "Vous avez des modifications non enregistrées. Voulez-vous les enregistrer avant de quitter cette page ?",
|
||||||
|
"unsaved.saveFailed": "Échec de l’enregistrement. Veuillez vérifier les champs.",
|
||||||
|
"crash.autoRestart": "Redémarrage automatique en cas de plantage",
|
||||||
|
"crash.autoRestartDesc": "Redémarre automatiquement le serveur s’il plante ou s’arrête de manière inattendue.",
|
||||||
|
"crash.badge": "Plantages : {n}",
|
||||||
|
"crash.historyTitle": "Historique des plantages du serveur",
|
||||||
|
"crash.noCrashes": "Aucun rapport de plantage trouvé.",
|
||||||
|
"crash.restartNotice": "Le serveur a planté et a été redémarré automatiquement (Plantage #{n}).",
|
||||||
|
"crash.loopPaused": "Redémarrage automatique suspendu : le serveur a planté plusieurs fois successivement.",
|
||||||
|
"crash.details": "Détails du plantage",
|
||||||
|
"crash.viewRaw": "Afficher le rapport complet",
|
||||||
|
"crash.hideRaw": "Masquer le rapport complet",
|
||||||
|
"crash.copyReport": "Copier le rapport",
|
||||||
|
"crash.copied": "Copié !",
|
||||||
};
|
};
|
||||||
|
|
||||||
export default fr;
|
export default fr;
|
||||||
@@ -228,6 +228,7 @@ const ru: Partial<Record<keyof typeof en, string>> = {
|
|||||||
"comp.saved": "Сохранено. Компаньоны ({n}) будут созданы при запуске сервера.",
|
"comp.saved": "Сохранено. Компаньоны ({n}) будут созданы при запуске сервера.",
|
||||||
|
|
||||||
// Client
|
// Client
|
||||||
|
"client.races.install": "Установить патч кастомных рас",
|
||||||
"client.title": "Клиент игры",
|
"client.title": "Клиент игры",
|
||||||
"client.looking": "Ищу…",
|
"client.looking": "Ищу…",
|
||||||
"client.intro": "Укажите, где установлена игра, чтобы появилась кнопка «Играть». Файлы игры не изменяются, кроме адреса сервера и аддона компаньонов.",
|
"client.intro": "Укажите, где установлена игра, чтобы появилась кнопка «Играть». Файлы игры не изменяются, кроме адреса сервера и аддона компаньонов.",
|
||||||
@@ -888,6 +889,21 @@ const ru: Partial<Record<keyof typeof en, string>> = {
|
|||||||
"fr.lan.unavailable": "Выбранный адрес недоступен",
|
"fr.lan.unavailable": "Выбранный адрес недоступен",
|
||||||
"fr.lan.unavailableText": "Выбранный адрес сейчас не назначен обнаруженному сетевому интерфейсу. Выберите другой адрес, переключитесь на автоматический выбор или намеренно сохраните этот адрес.",
|
"fr.lan.unavailableText": "Выбранный адрес сейчас не назначен обнаруженному сетевому интерфейсу. Выберите другой адрес, переключитесь на автоматический выбор или намеренно сохраните этот адрес.",
|
||||||
"fr.lan.invalid": "Некорректный IPv4-адрес",
|
"fr.lan.invalid": "Некорректный IPv4-адрес",
|
||||||
|
"unsaved.title": "Несохранённые изменения",
|
||||||
|
"unsaved.message": "У вас есть несохранённые изменения. Сохранить их перед переходом на другую страницу?",
|
||||||
|
"unsaved.saveFailed": "Не удалось сохранить настройки. Проверьте правильность значений.",
|
||||||
|
"crash.autoRestart": "Автоподнятие при падении",
|
||||||
|
"crash.autoRestartDesc": "Автоматически перезапускать сервер при внезапном падении или сбое.",
|
||||||
|
"crash.badge": "Крашей: {n}",
|
||||||
|
"crash.historyTitle": "История падений сервера",
|
||||||
|
"crash.noCrashes": "Отчётов о падениях не найдено.",
|
||||||
|
"crash.restartNotice": "Сервер упал и был автоматически перезапущен (Сбой #{n}).",
|
||||||
|
"crash.loopPaused": "Автоподнятие приостановлено: сервер упал несколько раз подряд за короткое время.",
|
||||||
|
"crash.details": "Подробности сбоя",
|
||||||
|
"crash.viewRaw": "Показать полный отчёт",
|
||||||
|
"crash.hideRaw": "Скрыть полный отчёт",
|
||||||
|
"crash.copyReport": "Скопировать отчёт",
|
||||||
|
"crash.copied": "Скопировано!",
|
||||||
};
|
};
|
||||||
|
|
||||||
export default ru;
|
export default ru;
|
||||||
@@ -207,6 +207,7 @@ const zh = {
|
|||||||
"comp.saved": "已保存。{n} 名随从将在服务器启动时创建。",
|
"comp.saved": "已保存。{n} 名随从将在服务器启动时创建。",
|
||||||
|
|
||||||
// Client
|
// Client
|
||||||
|
"client.races.install": "安装自定义种族补丁",
|
||||||
"client.title": "游戏客户端",
|
"client.title": "游戏客户端",
|
||||||
"client.looking": "正在寻找…",
|
"client.looking": "正在寻找…",
|
||||||
"client.intro": "指定游戏客户端安装路径即可启用“开始游戏”按钮。除服务器地址和随从插件外,你的游戏文件绝不会被修改。",
|
"client.intro": "指定游戏客户端安装路径即可启用“开始游戏”按钮。除服务器地址和随从插件外,你的游戏文件绝不会被修改。",
|
||||||
@@ -869,6 +870,21 @@ const zh = {
|
|||||||
"fr.lan.unavailable": "所选地址不可用",
|
"fr.lan.unavailable": "所选地址不可用",
|
||||||
"fr.lan.unavailableText": "所选地址目前未分配给检测到的本地网络接口。请选择其他地址、切换到自动,或有意保留此地址。",
|
"fr.lan.unavailableText": "所选地址目前未分配给检测到的本地网络接口。请选择其他地址、切换到自动,或有意保留此地址。",
|
||||||
"fr.lan.invalid": "无效的 IPv4 地址",
|
"fr.lan.invalid": "无效的 IPv4 地址",
|
||||||
|
"unsaved.title": "未保存的修改",
|
||||||
|
"unsaved.message": "您有未保存的修改。是否在离开前保存?",
|
||||||
|
"unsaved.saveFailed": "保存失败,请检查填写内容。",
|
||||||
|
"crash.autoRestart": "崩溃后自动重启",
|
||||||
|
"crash.autoRestartDesc": "如果服务器意外崩溃或停止,自动重新拉起。",
|
||||||
|
"crash.badge": "崩溃次数: {n}",
|
||||||
|
"crash.historyTitle": "服务器崩溃记录",
|
||||||
|
"crash.noCrashes": "未找到崩溃日志。",
|
||||||
|
"crash.restartNotice": "服务器崩溃并已自动重新拉起(崩溃 #{n})。",
|
||||||
|
"crash.loopPaused": "自动重启已暂停:服务器在短时间内连续崩溃。",
|
||||||
|
"crash.details": "崩溃详情",
|
||||||
|
"crash.viewRaw": "查看完整日志",
|
||||||
|
"crash.hideRaw": "隐藏完整日志",
|
||||||
|
"crash.copyReport": "复制崩溃报告",
|
||||||
|
"crash.copied": "已复制!",
|
||||||
} as const;
|
} as const;
|
||||||
|
|
||||||
export default zh;
|
export default zh;
|
||||||
+49
-2
@@ -186,6 +186,7 @@ export interface RecoveryPoint {
|
|||||||
label: string | null;
|
label: string | null;
|
||||||
created_at: string;
|
created_at: string;
|
||||||
components: { name: string; path: string; bytes: number; tables: number | null; files: string[] | null }[];
|
components: { name: string; path: string; bytes: number; tables: number | null; files: string[] | null }[];
|
||||||
|
mysql_snapshot?: { bytes: number } | null;
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface DbRestore {
|
export interface DbRestore {
|
||||||
@@ -265,6 +266,16 @@ export interface ReportTarget {
|
|||||||
ours: boolean;
|
ours: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** The kind of server this computer installs: a repack (Windows) or Docker containers (Linux). */
|
||||||
|
export type Flavor = "repack" | "docker";
|
||||||
|
|
||||||
|
export interface InstallEnvironment {
|
||||||
|
flavor: Flavor;
|
||||||
|
default_dir: string;
|
||||||
|
/** Why Docker cannot be used, in its own words; null when it works. */
|
||||||
|
docker_problem: string | null;
|
||||||
|
}
|
||||||
|
|
||||||
export interface InstallRequirements {
|
export interface InstallRequirements {
|
||||||
download_bytes: number;
|
download_bytes: number;
|
||||||
unpacked_bytes: number;
|
unpacked_bytes: number;
|
||||||
@@ -379,6 +390,22 @@ export interface ClientDownloadCheck {
|
|||||||
dest: string;
|
dest: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export type ClientPatchState = "not-installed" | "enabled" | "disabled" | "partially-installed";
|
||||||
|
|
||||||
|
export interface CustomRacesClientStatus {
|
||||||
|
state: ClientPatchState;
|
||||||
|
installedMpqs: number;
|
||||||
|
totalMpqs: number;
|
||||||
|
hasRootFiles: boolean;
|
||||||
|
clientPath: string | null;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface CustomRacesProgress {
|
||||||
|
id: string;
|
||||||
|
step: string;
|
||||||
|
percent: number;
|
||||||
|
}
|
||||||
|
|
||||||
export type FriendsMode = "local" | "lan" | "direct" | "private";
|
export type FriendsMode = "local" | "lan" | "direct" | "private";
|
||||||
|
|
||||||
export interface LanAddress {
|
export interface LanAddress {
|
||||||
@@ -421,6 +448,21 @@ export interface ConsoleLine {
|
|||||||
level: "info" | "warn" | "error";
|
level: "info" | "warn" | "error";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export interface CrashItem {
|
||||||
|
id: string;
|
||||||
|
timestamp_ms: number;
|
||||||
|
date_str: string;
|
||||||
|
title: string;
|
||||||
|
explanation: string;
|
||||||
|
category: "assertion" | "access_violation" | "stack_overflow" | "out_of_memory" | "database" | "network" | "exception" | "generic";
|
||||||
|
exception_code?: string | null;
|
||||||
|
location?: string | null;
|
||||||
|
function?: string | null;
|
||||||
|
condition?: string | null;
|
||||||
|
preview: string;
|
||||||
|
full_log: string;
|
||||||
|
}
|
||||||
|
|
||||||
export const api = {
|
export const api = {
|
||||||
remoteConnection: () => invoke<RemoteConnection>("remote_connection"),
|
remoteConnection: () => invoke<RemoteConnection>("remote_connection"),
|
||||||
remoteConnect: (host: string) => invoke<RemoteConnection>("remote_connect", { host }),
|
remoteConnect: (host: string) => invoke<RemoteConnection>("remote_connect", { host }),
|
||||||
@@ -454,7 +496,8 @@ export const api = {
|
|||||||
deleteBackup: (id: string, backupId: string) => invoke<void>("delete_backup", { id, backupId }),
|
deleteBackup: (id: string, backupId: string) => invoke<void>("delete_backup", { id, backupId }),
|
||||||
restoreConfigs: (id: string, backupId: string) => invoke<RecoveryPoint>("restore_backup_configs", { id, backupId }),
|
restoreConfigs: (id: string, backupId: string) => invoke<RecoveryPoint>("restore_backup_configs", { id, backupId }),
|
||||||
restoreDatabase: (id: string, backupId: string, database: string) => invoke<DbRestore>("restore_backup_database", { id, backupId, database }),
|
restoreDatabase: (id: string, backupId: string, database: string) => invoke<DbRestore>("restore_backup_database", { id, backupId, database }),
|
||||||
installPreflight: (dest: string, needed?: number) => invoke<Preflight>("install_preflight", { dest, needed: needed ?? null }),
|
installEnvironment: () => invoke<InstallEnvironment>("install_environment"),
|
||||||
|
installPreflight: (dest: string, needed?: number, gameData?: string) => invoke<Preflight>("install_preflight", { dest, needed: needed ?? null, gameData: gameData ?? null }),
|
||||||
installRequirements: (pkg?: string) => invoke<InstallRequirements>("install_requirements", { package: pkg ?? null }),
|
installRequirements: (pkg?: string) => invoke<InstallRequirements>("install_requirements", { package: pkg ?? null }),
|
||||||
realmlistProfiles: (id: string) => invoke<{ profiles: RealmProfile[]; active: string | null }>("realmlist_profiles", { id }),
|
realmlistProfiles: (id: string) => invoke<{ profiles: RealmProfile[]; active: string | null }>("realmlist_profiles", { id }),
|
||||||
realmlistSave: (id: string, profileId: string | null, name: string, data: string) => invoke<RealmProfile>("realmlist_save", { id, profileId, name, data }),
|
realmlistSave: (id: string, profileId: string | null, name: string, data: string) => invoke<RealmProfile>("realmlist_save", { id, profileId, name, data }),
|
||||||
@@ -473,7 +516,7 @@ export const api = {
|
|||||||
accountSetAccess: (id: string, name: string, level: number) => invoke<void>("account_set_access", { id, name, level }),
|
accountSetAccess: (id: string, name: string, level: number) => invoke<void>("account_set_access", { id, name, level }),
|
||||||
accountRename: (id: string, name: string, newName: string, password: string) => invoke<void>("account_rename", { id, name, newName, password }),
|
accountRename: (id: string, name: string, newName: string, password: string) => invoke<void>("account_rename", { id, name, newName, password }),
|
||||||
accountDelete: (id: string, name: string) => invoke<void>("account_delete", { id, name }),
|
accountDelete: (id: string, name: string) => invoke<void>("account_delete", { id, name }),
|
||||||
installNew: (dest: string, pkg?: string) => invoke<ServerSummary>("install_new", { dest, package: pkg ?? null }),
|
installNew: (dest: string, pkg?: string, gameData?: string) => invoke<ServerSummary>("install_new", { dest, package: pkg ?? null, gameData: gameData ?? null }),
|
||||||
cancelInstall: () => invoke<void>("cancel_install"),
|
cancelInstall: () => invoke<void>("cancel_install"),
|
||||||
createAccount: (id: string, username: string, password: string, administrator: boolean) =>
|
createAccount: (id: string, username: string, password: string, administrator: boolean) =>
|
||||||
invoke<void>("create_account", { id, username, password, administrator }),
|
invoke<void>("create_account", { id, username, password, administrator }),
|
||||||
@@ -503,6 +546,9 @@ export const api = {
|
|||||||
clientSync: (id: string, keepModified: boolean) => invoke<void>("client_sync", { id, keepModified }),
|
clientSync: (id: string, keepModified: boolean) => invoke<void>("client_sync", { id, keepModified }),
|
||||||
clientDownload: (id: string, parent: string) => invoke<ClientInfo>("client_download", { id, parent }),
|
clientDownload: (id: string, parent: string) => invoke<ClientInfo>("client_download", { id, parent }),
|
||||||
clientCancel: () => invoke<void>("client_cancel"),
|
clientCancel: () => invoke<void>("client_cancel"),
|
||||||
|
customRacesStatus: (id: string) => invoke<CustomRacesClientStatus | null>("custom_races_status", { id }),
|
||||||
|
customRacesInstall: (id: string) => invoke<void>("custom_races_install", { id }),
|
||||||
|
customRacesToggleClient: (id: string, enabled: boolean) => invoke<void>("custom_races_toggle_client", { id, enabled }),
|
||||||
play: (id: string) => invoke<DriverOutcome>("play", { id }),
|
play: (id: string) => invoke<DriverOutcome>("play", { id }),
|
||||||
friendsStatus: (id: string) => invoke<FriendsStatus>("friends_status", { id }),
|
friendsStatus: (id: string) => invoke<FriendsStatus>("friends_status", { id }),
|
||||||
friendsCheckInternet: () => invoke<InternetCheck>("friends_check_internet"),
|
friendsCheckInternet: () => invoke<InternetCheck>("friends_check_internet"),
|
||||||
@@ -512,6 +558,7 @@ export const api = {
|
|||||||
runDiagnostics: (id: string) => invoke<{ checks: DiagCheck[]; problems: number }>("run_diagnostics", { id }),
|
runDiagnostics: (id: string) => invoke<{ checks: DiagCheck[]; problems: number }>("run_diagnostics", { id }),
|
||||||
verifyFiles: (id: string) => invoke<{ path: string; kind: "missing" | "changed" }[]>("verify_files", { id }),
|
verifyFiles: (id: string) => invoke<{ path: string; kind: "missing" | "changed" }[]>("verify_files", { id }),
|
||||||
exportDiagnostics: (id: string) => invoke<string>("export_diagnostics", { id }),
|
exportDiagnostics: (id: string) => invoke<string>("export_diagnostics", { id }),
|
||||||
|
listCrashes: (id: string, limit?: number) => invoke<CrashItem[]>("list_crashes", { id, limit: limit ?? null }),
|
||||||
consoleTail: (id: string, source: ConsoleSource, filter?: string, lines = 300) =>
|
consoleTail: (id: string, source: ConsoleSource, filter?: string, lines = 300) =>
|
||||||
invoke<ConsoleLine[]>("console_tail", { id, source, filter: filter ?? null, lines }),
|
invoke<ConsoleLine[]>("console_tail", { id, source, filter: filter ?? null, lines }),
|
||||||
consoleRisk: (command: string) => invoke<"normal" | "dangerous">("console_risk", { command }),
|
consoleRisk: (command: string) => invoke<"normal" | "dangerous">("console_risk", { command }),
|
||||||
|
|||||||
@@ -0,0 +1,32 @@
|
|||||||
|
import { useState } from "react";
|
||||||
|
|
||||||
|
const key = (id: string) => `coa-auto-restart-on-crash:${id}`;
|
||||||
|
const fallback = () => false;
|
||||||
|
|
||||||
|
export function autoRestartOnCrash(id: string): boolean {
|
||||||
|
try {
|
||||||
|
const value = localStorage.getItem(key(id));
|
||||||
|
return value === null ? fallback() : value === "1";
|
||||||
|
} catch {
|
||||||
|
return fallback();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export function setAutoRestartOnCrash(id: string, on: boolean) {
|
||||||
|
try {
|
||||||
|
localStorage.setItem(key(id), on ? "1" : "0");
|
||||||
|
} catch {
|
||||||
|
/* storage unavailable */
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export function useAutoRestart(id: string): [boolean, (on: boolean) => void] {
|
||||||
|
const [on, setOn] = useState(() => autoRestartOnCrash(id));
|
||||||
|
return [
|
||||||
|
on,
|
||||||
|
(next) => {
|
||||||
|
setAutoRestartOnCrash(id, next);
|
||||||
|
setOn(next);
|
||||||
|
},
|
||||||
|
];
|
||||||
|
}
|
||||||
@@ -85,6 +85,18 @@ for (const [key, title, desc] of [
|
|||||||
] as [string, string[], string[]][]) add(`Enchanter.${key}`, "int", title, desc, { min: 0, advanced: true });
|
] as [string, string[], string[]][]) add(`Enchanter.${key}`, "int", title, desc, { min: 0, advanced: true });
|
||||||
for (let n = 1; n <= 3; n++) add(`EC.P${n}`, "string", [`NPC phrase ${n}`, `Реплика НПС ${n}`, `NPC-Satz ${n}`, `Phrase du PNJ ${n}`, `Frase del PNJ ${n}`, `NPC台词 ${n}`], ["Text spoken by the NPC. Keep the enclosing quotes.", "Текст реплики НПС. Сохраните кавычки вокруг текста.", "Gesprochener Text. Anführungszeichen beibehalten.", "Texte prononcé. Conservez les guillemets.", "Texto hablado. Conserva las comillas.", "NPC发言内容,请保留外层引号。"], { advanced: true });
|
for (let n = 1; n <= 3; n++) add(`EC.P${n}`, "string", [`NPC phrase ${n}`, `Реплика НПС ${n}`, `NPC-Satz ${n}`, `Phrase du PNJ ${n}`, `Frase del PNJ ${n}`, `NPC台词 ${n}`], ["Text spoken by the NPC. Keep the enclosing quotes.", "Текст реплики НПС. Сохраните кавычки вокруг текста.", "Gesprochener Text. Anführungszeichen beibehalten.", "Texte prononcé. Conservez les guillemets.", "Texto hablado. Conserva las comillas.", "NPC发言内容,请保留外层引号。"], { advanced: true });
|
||||||
|
|
||||||
|
add("CoACustomRaces.BotsEnable", "bool",
|
||||||
|
["Bots can be custom races", "Боты кастомных рас", "Bots benutzerdefinierter Völker", "Bots de races personnalisées", "Bots de razas personalizadas", "允许机器人为自定义种族"],
|
||||||
|
[
|
||||||
|
"Allow Playerbots to spawn as custom races (experimental). Off excludes all custom races; on allows stable custom races.",
|
||||||
|
"Разрешает ботам-игрокам появляться кастомными расами (экспериментально). Выключено — исключает все кастомные расы, включено — разрешает стабильные.",
|
||||||
|
"Erlaubt Spieler-Bots, benutzerdefinierte Völker zu nutzen (experimentell). Aus schließt alle benutzerdefinierten Völker aus; An erlaubt stabile.",
|
||||||
|
"Autorise les bots joueurs à s’incarner avec des races personnalisées (expérimental). Désactivé exclut toutes les races personnalisées ; activé autorise les stables.",
|
||||||
|
"Permite a los bots jugadores crearse con razas personalizadas (experimental). Desactivado excluye todas las razas personalizadas; activado permite las estables.",
|
||||||
|
"允许玩家机器人扮演自定义种族(实验性)。关闭将排除所有自定义种族,开启允许稳定的自定义种族。"
|
||||||
|
]
|
||||||
|
);
|
||||||
|
|
||||||
const ah = "AuctionHouseBot.";
|
const ah = "AuctionHouseBot.";
|
||||||
add(ah + "GUIDs", "string", ["Auction characters", "Персонажи аукциона", "Auktionscharaktere", "Personnages d’enchères", "Personajes de subasta", "拍卖角色"], ["Leave 0 and the server creates and uses its own auction character. To use your own, enter GUIDs separated by commas, without spaces; use dedicated offline characters, not companion bots.", "Оставьте 0, и сервер сам создаст и будет использовать своего персонажа аукциона. Чтобы использовать своих, укажите GUID через запятую без пробелов; нужны отдельные офлайн-персонажи, не боты-компаньоны.", "Bei 0 legt der Server selbst einen Auktionscharakter an und nutzt ihn. Eigene Charaktere: GUIDs durch Kommas, ohne Leerzeichen; separate Offline-Charaktere verwenden, keine Begleiter-Bots.", "Laissez 0 : le serveur crée et utilise son propre personnage d’enchères. Pour les vôtres, indiquez des GUID séparés par des virgules sans espaces ; personnages dédiés hors ligne, pas des bots compagnons.", "Deja 0 y el servidor crea y usa su propio personaje de subastas. Para usar los tuyos, indica GUID separados por comas sin espacios; personajes dedicados desconectados, no bots acompañantes.", "保持0时由服务器自动创建并使用拍卖角色。要使用自己的角色,请以逗号分隔填写GUID,不加空格;使用专用离线角色,勿用伙伴机器人。"], { advanced: true });
|
add(ah + "GUIDs", "string", ["Auction characters", "Персонажи аукциона", "Auktionscharaktere", "Personnages d’enchères", "Personajes de subasta", "拍卖角色"], ["Leave 0 and the server creates and uses its own auction character. To use your own, enter GUIDs separated by commas, without spaces; use dedicated offline characters, not companion bots.", "Оставьте 0, и сервер сам создаст и будет использовать своего персонажа аукциона. Чтобы использовать своих, укажите GUID через запятую без пробелов; нужны отдельные офлайн-персонажи, не боты-компаньоны.", "Bei 0 legt der Server selbst einen Auktionscharakter an und nutzt ihn. Eigene Charaktere: GUIDs durch Kommas, ohne Leerzeichen; separate Offline-Charaktere verwenden, keine Begleiter-Bots.", "Laissez 0 : le serveur crée et utilise son propre personnage d’enchères. Pour les vôtres, indiquez des GUID séparés par des virgules sans espaces ; personnages dédiés hors ligne, pas des bots compagnons.", "Deja 0 y el servidor crea y usa su propio personaje de subastas. Para usar los tuyos, indica GUID separados por comas sin espacios; personajes dedicados desconectados, no bots acompañantes.", "保持0时由服务器自动创建并使用拍卖角色。要使用自己的角色,请以逗号分隔填写GUID,不加空格;使用专用离线角色,勿用伙伴机器人。"], { advanced: true });
|
||||||
add(ah + "EnableSeller", "bool", ["Post auctions", "Выставлять лоты", "Auktionen einstellen", "Publier des enchères", "Publicar subastas", "发布拍卖"], ["Let the auction characters sell items. The module switch is also required.", "Разрешает персонажам продавать предметы. Нужен включённый модуль.", "Erlaubt Verkäufe. Der Modulschalter muss ebenfalls aktiv sein.", "Autorise les ventes. Le module doit aussi être activé.", "Permite vender. También requiere el módulo activado.", "允许拍卖角色出售物品,还需启用模块。"]);
|
add(ah + "EnableSeller", "bool", ["Post auctions", "Выставлять лоты", "Auktionen einstellen", "Publier des enchères", "Publicar subastas", "发布拍卖"], ["Let the auction characters sell items. The module switch is also required.", "Разрешает персонажам продавать предметы. Нужен включённый модуль.", "Erlaubt Verkäufe. Der Modulschalter muss ebenfalls aktiv sein.", "Autorise les ventes. Le module doit aussi être activé.", "Permite vender. También requiere el módulo activado.", "允许拍卖角色出售物品,还需启用模块。"]);
|
||||||
|
|||||||
@@ -0,0 +1,5 @@
|
|||||||
|
export interface UnsavedChangesGuard {
|
||||||
|
isDirty: () => boolean;
|
||||||
|
save: () => Promise<boolean>;
|
||||||
|
discard: () => void;
|
||||||
|
}
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
import { Card } from "@/components/ui/card";
|
||||||
|
import { useT } from "@/i18n";
|
||||||
|
import { useAutoRestart } from "@/lib/autoRestartPrefs";
|
||||||
|
|
||||||
|
export function AutoRestartSettings({ serverId }: { serverId: string }) {
|
||||||
|
const t = useT();
|
||||||
|
const [autoRestart, setAutoRestart] = useAutoRestart(serverId);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Card className="mt-6 p-6">
|
||||||
|
<h2 className="font-semibold">{t("crash.autoRestart")}</h2>
|
||||||
|
<label className="mt-3 flex cursor-pointer items-center gap-3">
|
||||||
|
<input
|
||||||
|
type="checkbox"
|
||||||
|
checked={autoRestart}
|
||||||
|
onChange={(e) => setAutoRestart(e.target.checked)}
|
||||||
|
className="h-4 w-4 accent-[#c9a24a]"
|
||||||
|
/>
|
||||||
|
<span className="text-sm font-medium">{t("crash.autoRestart")}</span>
|
||||||
|
</label>
|
||||||
|
<p className="mt-2 text-sm text-muted">{t("crash.autoRestartDesc")}</p>
|
||||||
|
</Card>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -198,7 +198,7 @@ export function BackupsPage({ serverId }: { serverId: string }) {
|
|||||||
<div>
|
<div>
|
||||||
<p className="font-medium">{p.label && p.trigger === "manual" && p.label !== "e2e" ? p.label : trigger(p.trigger)}</p>
|
<p className="font-medium">{p.label && p.trigger === "manual" && p.label !== "e2e" ? p.label : trigger(p.trigger)}</p>
|
||||||
<p className="text-sm text-muted">
|
<p className="text-sm text-muted">
|
||||||
{w(p.created_at)} · {p.realm === "wildcard" ? "Wildcard" : "CoA"} · {t(`bk.kind.${p.kind}` as Key)} · {size(p.components.reduce((a, c) => a + c.bytes, 0))}
|
{w(p.created_at)} · {p.realm === "wildcard" ? "Wildcard" : "CoA"} · {t(`bk.kind.${p.kind}` as Key)} · {size(p.components.reduce((a, c) => a + c.bytes, p.mysql_snapshot?.bytes ?? 0))}
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
<div className="flex shrink-0 gap-1">
|
<div className="flex shrink-0 gap-1">
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import { useEffect, useState } from "react";
|
import { useEffect, useState } from "react";
|
||||||
|
import { listen } from "@tauri-apps/api/event";
|
||||||
import { open } from "@tauri-apps/plugin-dialog";
|
import { open } from "@tauri-apps/plugin-dialog";
|
||||||
import { api, asUiError, type ClientInfo, type ClientStatus, type UiError } from "@/lib/api";
|
import { api, asUiError, type ClientInfo, type ClientStatus, type UiError } from "@/lib/api";
|
||||||
import { checkClient } from "@/lib/clientUpdate";
|
import { checkClient } from "@/lib/clientUpdate";
|
||||||
@@ -16,6 +17,7 @@ export function ClientCard({ serverId, remote = false }: { serverId: string; rem
|
|||||||
const [note, setNote] = useState<string | null>(null);
|
const [note, setNote] = useState<string | null>(null);
|
||||||
const [busy, setBusy] = useState(false);
|
const [busy, setBusy] = useState(false);
|
||||||
const [status, setStatus] = useState<ClientStatus | null>(null);
|
const [status, setStatus] = useState<ClientStatus | null>(null);
|
||||||
|
const [patchProgress, setPatchProgress] = useState<string | null>(null);
|
||||||
const [dialog, setDialog] = useState<ClientDialogMode | null>(null);
|
const [dialog, setDialog] = useState<ClientDialogMode | null>(null);
|
||||||
const [playAfter, setPlayAfter] = useStartAfterUpdate("client", serverId);
|
const [playAfter, setPlayAfter] = useStartAfterUpdate("client", serverId);
|
||||||
|
|
||||||
@@ -25,6 +27,10 @@ export function ClientCard({ serverId, remote = false }: { serverId: string; rem
|
|||||||
};
|
};
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
void refresh();
|
void refresh();
|
||||||
|
const unlisten = listen<{ id: string; step: string; percent: number }>("custom-races-progress", e => {
|
||||||
|
if (e.payload.id === serverId) setPatchProgress(`${e.payload.step} (${Math.round(e.payload.percent * 100)}%)`);
|
||||||
|
});
|
||||||
|
return () => { void unlisten.then(f => f()); };
|
||||||
}, [serverId]); // eslint-disable-line react-hooks/exhaustive-deps
|
}, [serverId]); // eslint-disable-line react-hooks/exhaustive-deps
|
||||||
|
|
||||||
async function run(fn: () => Promise<string | void>) {
|
async function run(fn: () => Promise<string | void>) {
|
||||||
@@ -40,6 +46,7 @@ export function ClientCard({ serverId, remote = false }: { serverId: string; rem
|
|||||||
setError(asUiError(e));
|
setError(asUiError(e));
|
||||||
} finally {
|
} finally {
|
||||||
setBusy(false);
|
setBusy(false);
|
||||||
|
setPatchProgress(null);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -111,11 +118,13 @@ export function ClientCard({ serverId, remote = false }: { serverId: string; rem
|
|||||||
{status && !status.managed && (
|
{status && !status.managed && (
|
||||||
<Button size="sm" disabled={busy} onClick={() => setDialog("track")}>{t("client.track.button")}</Button>
|
<Button size="sm" disabled={busy} onClick={() => setDialog("track")}>{t("client.track.button")}</Button>
|
||||||
)}
|
)}
|
||||||
|
{remote && <Button size="sm" disabled={busy} onClick={() => void run(() => api.customRacesInstall(serverId))}>{t("client.races.install")}</Button>}
|
||||||
<Button size="sm" variant="ghost" disabled={busy} onClick={() => void choose()}>{t("client.changeFolder")}</Button>
|
<Button size="sm" variant="ghost" disabled={busy} onClick={() => void choose()}>{t("client.changeFolder")}</Button>
|
||||||
<Button size="sm" variant="ghost" disabled={busy} onClick={() => setDialog("setup")}>{t("client.downloadInstead")}</Button>
|
<Button size="sm" variant="ghost" disabled={busy} onClick={() => setDialog("setup")}>{t("client.downloadInstead")}</Button>
|
||||||
</div>
|
</div>
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
|
{patchProgress && <p className="mt-3 text-sm text-muted" role="status">{patchProgress}</p>}
|
||||||
{note && <p className="mt-3 text-sm text-ok" role="status">{note}</p>}
|
{note && <p className="mt-3 text-sm text-ok" role="status">{note}</p>}
|
||||||
{error && <p className="mt-3 text-sm text-bad" role="alert">{error.human.code === "unknown" ? error.technical : human(error.human).message}</p>}
|
{error && <p className="mt-3 text-sm text-bad" role="alert">{error.human.code === "unknown" ? error.technical : human(error.human).message}</p>}
|
||||||
{dialog && (
|
{dialog && (
|
||||||
|
|||||||
@@ -0,0 +1,198 @@
|
|||||||
|
import { useEffect, useState } from "react";
|
||||||
|
import { AlertTriangle, Check, ChevronDown, ChevronUp, Copy, Loader2, X } from "lucide-react";
|
||||||
|
import { api, type CrashItem } from "@/lib/api";
|
||||||
|
import { Button } from "@/components/ui/button";
|
||||||
|
import { Card } from "@/components/ui/card";
|
||||||
|
import { useT } from "@/i18n";
|
||||||
|
|
||||||
|
export function CrashHistoryModal({
|
||||||
|
serverId,
|
||||||
|
onClose,
|
||||||
|
}: {
|
||||||
|
serverId: string;
|
||||||
|
onClose: () => void;
|
||||||
|
}) {
|
||||||
|
const t = useT();
|
||||||
|
const [loading, setLoading] = useState(true);
|
||||||
|
const [crashes, setCrashes] = useState<CrashItem[]>([]);
|
||||||
|
const [expandedId, setExpandedId] = useState<string | null>(null);
|
||||||
|
const [copiedId, setCopiedId] = useState<string | null>(null);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
let alive = true;
|
||||||
|
void api
|
||||||
|
.listCrashes(serverId, 30)
|
||||||
|
.then((items) => {
|
||||||
|
if (alive) {
|
||||||
|
setCrashes(items);
|
||||||
|
setLoading(false);
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.catch(() => {
|
||||||
|
if (alive) setLoading(false);
|
||||||
|
});
|
||||||
|
return () => {
|
||||||
|
alive = false;
|
||||||
|
};
|
||||||
|
}, [serverId]);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
const onKey = (e: KeyboardEvent) => {
|
||||||
|
if (e.key === "Escape") onClose();
|
||||||
|
};
|
||||||
|
window.addEventListener("keydown", onKey);
|
||||||
|
return () => window.removeEventListener("keydown", onKey);
|
||||||
|
}, [onClose]);
|
||||||
|
|
||||||
|
const copyReport = async (item: CrashItem) => {
|
||||||
|
try {
|
||||||
|
await navigator.clipboard.writeText(item.full_log);
|
||||||
|
setCopiedId(item.id);
|
||||||
|
setTimeout(() => setCopiedId(null), 2500);
|
||||||
|
} catch {
|
||||||
|
/* clipboard write failed */
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const getCategoryColor = (category: CrashItem["category"]) => {
|
||||||
|
switch (category) {
|
||||||
|
case "assertion":
|
||||||
|
return "bg-amber-500/15 text-amber-400 border-amber-500/30";
|
||||||
|
case "access_violation":
|
||||||
|
case "stack_overflow":
|
||||||
|
case "out_of_memory":
|
||||||
|
return "bg-bad/15 text-bad border-bad/30";
|
||||||
|
case "network":
|
||||||
|
case "database":
|
||||||
|
return "bg-blue-500/15 text-blue-400 border-blue-500/30";
|
||||||
|
default:
|
||||||
|
return "bg-muted/15 text-muted border-line";
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div
|
||||||
|
className="fixed inset-0 z-50 flex items-center justify-center bg-black/60 p-4 md:p-6"
|
||||||
|
role="presentation"
|
||||||
|
onClick={(e) => {
|
||||||
|
if (e.target === e.currentTarget) onClose();
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<Card
|
||||||
|
className="flex max-h-[85vh] w-full max-w-2xl flex-col p-6 shadow-2xl"
|
||||||
|
role="dialog"
|
||||||
|
aria-modal="true"
|
||||||
|
aria-label={t("crash.historyTitle")}
|
||||||
|
>
|
||||||
|
<div className="flex items-center justify-between border-b border-line pb-4">
|
||||||
|
<div className="flex items-center gap-2.5">
|
||||||
|
<AlertTriangle className="h-5 w-5 text-warn" aria-hidden />
|
||||||
|
<h2 className="text-lg font-semibold">{t("crash.historyTitle")}</h2>
|
||||||
|
</div>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
onClick={onClose}
|
||||||
|
className="cursor-pointer text-muted transition-colors hover:text-ink"
|
||||||
|
aria-label={t("btn.close")}
|
||||||
|
>
|
||||||
|
<X className="h-5 w-5" aria-hidden />
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="flex-1 overflow-y-auto py-4">
|
||||||
|
{loading ? (
|
||||||
|
<div className="flex items-center justify-center py-12 text-muted">
|
||||||
|
<Loader2 className="h-6 w-6 animate-spin" aria-hidden />
|
||||||
|
</div>
|
||||||
|
) : crashes.length === 0 ? (
|
||||||
|
<div className="py-12 text-center text-muted">
|
||||||
|
<p>{t("crash.noCrashes")}</p>
|
||||||
|
</div>
|
||||||
|
) : (
|
||||||
|
<div className="space-y-4">
|
||||||
|
{crashes.map((item) => {
|
||||||
|
const isExpanded = expandedId === item.id;
|
||||||
|
const isCopied = copiedId === item.id;
|
||||||
|
return (
|
||||||
|
<div
|
||||||
|
key={item.id}
|
||||||
|
className="rounded-lg border border-line bg-card-2 p-4 text-sm transition-all"
|
||||||
|
>
|
||||||
|
<div className="flex flex-wrap items-start justify-between gap-2">
|
||||||
|
<div>
|
||||||
|
<span
|
||||||
|
className={`inline-block rounded border px-2 py-0.5 text-xs font-medium uppercase tracking-wide ${getCategoryColor(
|
||||||
|
item.category,
|
||||||
|
)}`}
|
||||||
|
>
|
||||||
|
{item.exception_code ? `${item.category} (${item.exception_code})` : item.category}
|
||||||
|
</span>
|
||||||
|
<h3 className="mt-1.5 font-semibold text-ink">{item.title}</h3>
|
||||||
|
</div>
|
||||||
|
<span className="text-xs text-muted tabular-nums">{item.date_str}</span>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<p className="mt-2 text-xs leading-relaxed text-muted">{item.explanation}</p>
|
||||||
|
|
||||||
|
<div className="mt-3 flex items-center justify-between border-t border-line/50 pt-2.5">
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
onClick={() => setExpandedId(isExpanded ? null : item.id)}
|
||||||
|
className="inline-flex cursor-pointer items-center gap-1.5 text-xs font-medium text-gold transition-colors hover:underline"
|
||||||
|
>
|
||||||
|
{isExpanded ? (
|
||||||
|
<>
|
||||||
|
<ChevronUp className="h-3.5 w-3.5" aria-hidden />
|
||||||
|
{t("crash.hideRaw")}
|
||||||
|
</>
|
||||||
|
) : (
|
||||||
|
<>
|
||||||
|
<ChevronDown className="h-3.5 w-3.5" aria-hidden />
|
||||||
|
{t("crash.viewRaw")}
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
</button>
|
||||||
|
|
||||||
|
<Button
|
||||||
|
variant="ghost"
|
||||||
|
size="sm"
|
||||||
|
onClick={() => void copyReport(item)}
|
||||||
|
className="h-7 gap-1.5 px-2 text-xs text-muted hover:text-ink"
|
||||||
|
>
|
||||||
|
{isCopied ? (
|
||||||
|
<>
|
||||||
|
<Check className="h-3.5 w-3.5 text-ok" aria-hidden />
|
||||||
|
<span className="text-ok">{t("crash.copied")}</span>
|
||||||
|
</>
|
||||||
|
) : (
|
||||||
|
<>
|
||||||
|
<Copy className="h-3.5 w-3.5" aria-hidden />
|
||||||
|
<span>{t("crash.copyReport")}</span>
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{isExpanded && (
|
||||||
|
<div className="mt-3">
|
||||||
|
<pre className="selectable max-h-56 overflow-x-auto overflow-y-auto rounded border border-line bg-black/40 p-3 font-mono text-[11px] leading-relaxed text-muted">
|
||||||
|
{item.full_log}
|
||||||
|
</pre>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="flex justify-end border-t border-line pt-4">
|
||||||
|
<Button variant="secondary" onClick={onClose}>
|
||||||
|
{t("btn.close")}
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
</Card>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -2,7 +2,7 @@ import { useEffect, useState } from "react";
|
|||||||
import { listen } from "@tauri-apps/api/event";
|
import { listen } from "@tauri-apps/api/event";
|
||||||
import { open } from "@tauri-apps/plugin-dialog";
|
import { open } from "@tauri-apps/plugin-dialog";
|
||||||
import { Check, ChevronDown, ChevronRight, Loader2 } from "lucide-react";
|
import { Check, ChevronDown, ChevronRight, Loader2 } from "lucide-react";
|
||||||
import { api, asUiError, type InstallRequirements, type InstallStep, type Preflight, type ServerSummary, type UiError } from "@/lib/api";
|
import { api, asUiError, type InstallEnvironment, type InstallRequirements, type InstallStep, type Preflight, type ServerSummary, type UiError } from "@/lib/api";
|
||||||
import { formatBytes } from "@/lib/utils";
|
import { formatBytes } from "@/lib/utils";
|
||||||
import { Button } from "@/components/ui/button";
|
import { Button } from "@/components/ui/button";
|
||||||
import { Card } from "@/components/ui/card";
|
import { Card } from "@/components/ui/card";
|
||||||
@@ -33,6 +33,19 @@ export function InstallServer(props: { canCancel: boolean; onCancel: () => void;
|
|||||||
const [pkg, setPkg] = useState("");
|
const [pkg, setPkg] = useState("");
|
||||||
const [installed, setInstalled] = useState<ServerSummary | null>(null);
|
const [installed, setInstalled] = useState<ServerSummary | null>(null);
|
||||||
const [showDetails, setShowDetails] = useState(false);
|
const [showDetails, setShowDetails] = useState(false);
|
||||||
|
// What this computer installs. A repack (Windows) needs nothing more than a folder; Docker (Linux) also needs the game data
|
||||||
|
// folder and a package, and Docker itself.
|
||||||
|
const [env, setEnv] = useState<InstallEnvironment | null>(null);
|
||||||
|
const [gameData, setGameData] = useState("");
|
||||||
|
const docker = env?.flavor === "docker";
|
||||||
|
|
||||||
|
function loadEnvironment(first: boolean) {
|
||||||
|
void api.installEnvironment().then((e) => {
|
||||||
|
setEnv(e);
|
||||||
|
if (first && e.flavor === "docker") setDest(e.default_dir);
|
||||||
|
}).catch(() => setEnv(null));
|
||||||
|
}
|
||||||
|
useEffect(() => loadEnvironment(true), []);
|
||||||
|
|
||||||
// how big the server is, from the package's signed list (re-read when another package source is entered)
|
// how big the server is, from the package's signed list (re-read when another package source is entered)
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
@@ -43,9 +56,9 @@ export function InstallServer(props: { canCancel: boolean; onCancel: () => void;
|
|||||||
// room for the unpacked server plus the download that is removed afterwards
|
// room for the unpacked server plus the download that is removed afterwards
|
||||||
const needed = req ? req.unpacked_bytes + req.download_bytes : undefined;
|
const needed = req ? req.unpacked_bytes + req.download_bytes : undefined;
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const timer = setTimeout(() => void api.installPreflight(dest, needed).then(setPre).catch(() => setPre(null)), 250);
|
const timer = setTimeout(() => void api.installPreflight(dest, needed, docker ? gameData.trim() : undefined).then(setPre).catch(() => setPre(null)), 250);
|
||||||
return () => clearTimeout(timer);
|
return () => clearTimeout(timer);
|
||||||
}, [dest, needed]);
|
}, [dest, needed, docker, gameData]);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const un = listen<InstallStep>("install-progress", (e) => setStep(e.payload));
|
const un = listen<InstallStep>("install-progress", (e) => setStep(e.payload));
|
||||||
@@ -56,7 +69,12 @@ export function InstallServer(props: { canCancel: boolean; onCancel: () => void;
|
|||||||
|
|
||||||
async function browse() {
|
async function browse() {
|
||||||
const picked = await open({ directory: true, multiple: false, title: t("install.dialogTitle") });
|
const picked = await open({ directory: true, multiple: false, title: t("install.dialogTitle") });
|
||||||
if (typeof picked === "string") setDest(picked.replace(/[\\/]+$/, "") + (picked.toLowerCase().includes("coa") ? "" : "\\CoA Server"));
|
if (typeof picked === "string") setDest(picked.replace(/[\\/]+$/, "") + (picked.toLowerCase().includes("coa") ? "" : docker ? "/CoaServer" : "\\CoA Server"));
|
||||||
|
}
|
||||||
|
|
||||||
|
async function browseGameData() {
|
||||||
|
const picked = await open({ directory: true, multiple: false, title: t("install.data.dialogTitle") });
|
||||||
|
if (typeof picked === "string") setGameData(picked);
|
||||||
}
|
}
|
||||||
|
|
||||||
async function browsePackage() {
|
async function browsePackage() {
|
||||||
@@ -69,7 +87,7 @@ export function InstallServer(props: { canCancel: boolean; onCancel: () => void;
|
|||||||
setPhase("installing");
|
setPhase("installing");
|
||||||
setStep({ step: "Preparing your server", percent: 0, detail: null });
|
setStep({ step: "Preparing your server", percent: 0, detail: null });
|
||||||
try {
|
try {
|
||||||
const s = await api.installNew(dest, pkg.trim() || undefined);
|
const s = await api.installNew(dest, pkg.trim() || undefined, docker ? gameData.trim() : undefined);
|
||||||
setInstalled(s);
|
setInstalled(s);
|
||||||
setPhase("done");
|
setPhase("done");
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
@@ -139,9 +157,34 @@ export function InstallServer(props: { canCancel: boolean; onCancel: () => void;
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{pre && pre.problems.length > 0 && (
|
{docker && (
|
||||||
|
<div>
|
||||||
|
<label htmlFor="gamedata" className="text-sm text-muted">{t("install.data.label")}</label>
|
||||||
|
<div className="mt-1 flex gap-2">
|
||||||
|
<input id="gamedata" value={gameData} onChange={(e) => setGameData(e.target.value)} className="selectable flex-1 rounded-md border border-line bg-card px-3 py-2.5 text-[15px] outline-none focus:border-gold" />
|
||||||
|
<Button onClick={browseGameData}>{t("install.browse")}</Button>
|
||||||
|
</div>
|
||||||
|
<p className="mt-1 text-xs text-muted">{t("install.data.hint")}</p>
|
||||||
|
<label htmlFor="linuxpkg" className="mt-4 block text-sm text-muted">{t("install.linuxPkg.label")}</label>
|
||||||
|
<div className="mt-1 flex gap-2">
|
||||||
|
<input id="linuxpkg" value={pkg} onChange={(e) => setPkg(e.target.value)} placeholder={t("install.linuxPkg.hint")} className="selectable flex-1 rounded-md border border-line bg-card px-3 py-2.5 text-[15px] outline-none focus:border-gold" />
|
||||||
|
<Button onClick={browsePackage}>{t("install.browse")}</Button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{docker && env?.docker_problem && (
|
||||||
<Card className="border-warn/40 p-4" role="alert">
|
<Card className="border-warn/40 p-4" role="alert">
|
||||||
{pre.problems.map((p) => (
|
<p className="font-medium text-warn">{t("install.docker.title")}</p>
|
||||||
|
<p className="mt-1 text-sm text-muted">{t("install.docker.text")}</p>
|
||||||
|
<pre className="mt-2 max-h-24 overflow-auto whitespace-pre-wrap rounded bg-black/40 p-2 text-xs">{env.docker_problem}</pre>
|
||||||
|
<Button className="mt-3" size="sm" onClick={() => loadEnvironment(false)}>{t("install.docker.retry")}</Button>
|
||||||
|
</Card>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{pre && pre.problems.some((p) => !(docker && !gameData.trim() && p.code.startsWith("data"))) && (
|
||||||
|
<Card className="border-warn/40 p-4" role="alert">
|
||||||
|
{pre.problems.filter((p) => !(docker && !gameData.trim() && p.code.startsWith("data"))).map((p) => (
|
||||||
<p key={p.code} className="text-sm text-warn">{p.message}</p>
|
<p key={p.code} className="text-sm text-warn">{p.message}</p>
|
||||||
))}
|
))}
|
||||||
</Card>
|
</Card>
|
||||||
@@ -170,7 +213,7 @@ export function InstallServer(props: { canCancel: boolean; onCancel: () => void;
|
|||||||
</Card>
|
</Card>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
<div>
|
{!docker && <div>
|
||||||
<button onClick={() => setShowAdvanced((v) => !v)} aria-expanded={showAdvanced} className="flex cursor-pointer items-center gap-1 text-sm text-muted hover:text-ink">
|
<button onClick={() => setShowAdvanced((v) => !v)} aria-expanded={showAdvanced} className="flex cursor-pointer items-center gap-1 text-sm text-muted hover:text-ink">
|
||||||
{showAdvanced ? <ChevronDown className="h-4 w-4" aria-hidden /> : <ChevronRight className="h-4 w-4" aria-hidden />}
|
{showAdvanced ? <ChevronDown className="h-4 w-4" aria-hidden /> : <ChevronRight className="h-4 w-4" aria-hidden />}
|
||||||
{t("install.advanced")}
|
{t("install.advanced")}
|
||||||
@@ -184,10 +227,10 @@ export function InstallServer(props: { canCancel: boolean; onCancel: () => void;
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>}
|
||||||
|
|
||||||
<div className="flex items-center gap-3">
|
<div className="flex items-center gap-3">
|
||||||
<Button variant="primary" size="md" disabled={!pre?.ok} onClick={() => void install()}>
|
<Button variant="primary" size="md" disabled={!pre?.ok || (docker && (!!env?.docker_problem || !gameData.trim() || !pkg.trim()))} onClick={() => void install()}>
|
||||||
{t("install.button")}
|
{t("install.button")}
|
||||||
</Button>
|
</Button>
|
||||||
{props.canCancel && (
|
{props.canCancel && (
|
||||||
|
|||||||
+158
-11
@@ -1,12 +1,14 @@
|
|||||||
import { Fragment, useCallback, useEffect, useRef, useState, type ComponentType, type ReactNode } from "react";
|
import { Fragment, useCallback, useEffect, useRef, useState, type ComponentType, type ReactNode } from "react";
|
||||||
import { Bot, Flame, Gavel, Loader2, Plug, Puzzle, Scaling, Settings2, Snowflake, Sparkles, Swords, type LucideProps } from "lucide-react";
|
import { listen } from "@tauri-apps/api/event";
|
||||||
import { api, asUiError, type ModuleSetting, type ModuleView, type UiError } from "@/lib/api";
|
import { Bot, Flame, Gavel, Loader2, Plug, Puzzle, Scaling, Settings2, Snowflake, Sparkles, Swords, Users, type LucideProps } from "lucide-react";
|
||||||
|
import { api, asUiError, type CustomRacesClientStatus, type CustomRacesProgress, type ModuleSetting, type ModuleView, type UiError } from "@/lib/api";
|
||||||
import { cn } from "@/lib/utils";
|
import { cn } from "@/lib/utils";
|
||||||
import { Button } from "@/components/ui/button";
|
import { Button } from "@/components/ui/button";
|
||||||
import { Card } from "@/components/ui/card";
|
import { Card } from "@/components/ui/card";
|
||||||
import { useHuman, useI18n, useSchemaText, type Key } from "@/i18n";
|
import { useHuman, useI18n, useSchemaText, type Key } from "@/i18n";
|
||||||
import { auctionWeightKey, canonicalModuleValue, moduleEnableKey, moduleField } from "@/lib/moduleSettings";
|
import { auctionWeightKey, canonicalModuleValue, moduleEnableKey, moduleField } from "@/lib/moduleSettings";
|
||||||
import { AuctionTypes } from "@/screens/AuctionTypes";
|
import { AuctionTypes } from "@/screens/AuctionTypes";
|
||||||
|
import type { UnsavedChangesGuard } from "@/lib/unsavedGuard";
|
||||||
|
|
||||||
/** The GitHub mark (lucide dropped its brand icons). */
|
/** The GitHub mark (lucide dropped its brand icons). */
|
||||||
function GithubMark(props: { className?: string }) {
|
function GithubMark(props: { className?: string }) {
|
||||||
@@ -27,6 +29,7 @@ const TILES: Record<string, { icon: ComponentType<LucideProps>; from: string; to
|
|||||||
gavel: { icon: Gavel, from: "from-yellow-500", to: "to-amber-700" },
|
gavel: { icon: Gavel, from: "from-yellow-500", to: "to-amber-700" },
|
||||||
sparkles: { icon: Sparkles, from: "from-fuchsia-500", to: "to-purple-700" },
|
sparkles: { icon: Sparkles, from: "from-fuchsia-500", to: "to-purple-700" },
|
||||||
swords: { icon: Swords, from: "from-rose-500", to: "to-red-800" },
|
swords: { icon: Swords, from: "from-rose-500", to: "to-red-800" },
|
||||||
|
races: { icon: Users, from: "from-cyan-500", to: "to-blue-800" },
|
||||||
};
|
};
|
||||||
const DEFAULT_TILE = { icon: Puzzle, from: "from-slate-500", to: "to-slate-700" };
|
const DEFAULT_TILE = { icon: Puzzle, from: "from-slate-500", to: "to-slate-700" };
|
||||||
|
|
||||||
@@ -78,25 +81,68 @@ function Tile({ icon, off }: { icon: string; off: boolean }) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/** The server's optional modules: square cards with a switch, the module's status, a link to GitHub and its settings. */
|
/** The server's optional modules: square cards with a switch, the module's status, a link to GitHub and its settings. */
|
||||||
export function ModulesPage({ serverId, onChanged }: { serverId: string; onChanged?: () => void }) {
|
export function ModulesPage({ serverId, onChanged, onRegisterGuard }: { serverId: string; onChanged?: () => void; onRegisterGuard?: (guard: UnsavedChangesGuard | null) => void }) {
|
||||||
const { t, locale } = useI18n();
|
const { t, locale } = useI18n();
|
||||||
const human = useHuman();
|
const human = useHuman();
|
||||||
const [modules, setModules] = useState<ModuleView[] | null>(null);
|
const [modules, setModules] = useState<ModuleView[] | null>(null);
|
||||||
const [open, setOpen] = useState<string | null>(null);
|
const [open, setOpen] = useState<string | null>(null);
|
||||||
const [error, setError] = useState<UiError | null>(null);
|
const [error, setError] = useState<UiError | null>(null);
|
||||||
const [changed, setChanged] = useState(false);
|
const [changed, setChanged] = useState(false);
|
||||||
|
const [racesPatchStatus, setRacesPatchStatus] = useState<CustomRacesClientStatus | null>(null);
|
||||||
|
const [racesInstalling, setRacesInstalling] = useState(false);
|
||||||
|
const [racesProgress, setRacesProgress] = useState<CustomRacesProgress | null>(null);
|
||||||
|
|
||||||
|
const loadRacesStatus = useCallback(async () => {
|
||||||
|
try {
|
||||||
|
const st = await api.customRacesStatus(serverId);
|
||||||
|
setRacesPatchStatus(st);
|
||||||
|
} catch {
|
||||||
|
// ignore
|
||||||
|
}
|
||||||
|
}, [serverId]);
|
||||||
|
const [guard, setGuard] = useState<UnsavedChangesGuard | null>(null);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
onRegisterGuard?.(guard);
|
||||||
|
return () => onRegisterGuard?.(null);
|
||||||
|
}, [guard, onRegisterGuard]);
|
||||||
|
|
||||||
const load = useCallback(async () => {
|
const load = useCallback(async () => {
|
||||||
try {
|
try {
|
||||||
setModules((await api.modulesList(serverId)).filter((m) => !m.hidden));
|
setModules((await api.modulesList(serverId)).filter((m) => !m.hidden));
|
||||||
|
await loadRacesStatus();
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
setError(asUiError(e));
|
setError(asUiError(e));
|
||||||
}
|
}
|
||||||
}, [serverId]);
|
}, [serverId, loadRacesStatus]);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
void load();
|
void load();
|
||||||
}, [load]);
|
const un = listen<CustomRacesProgress>("custom-races-progress", (e) => {
|
||||||
|
if (e.payload.id === serverId) {
|
||||||
|
setRacesProgress(e.payload);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
return () => {
|
||||||
|
void un.then((f) => f());
|
||||||
|
};
|
||||||
|
}, [load, serverId]);
|
||||||
|
|
||||||
|
async function installClientPatch() {
|
||||||
|
setRacesInstalling(true);
|
||||||
|
setError(null);
|
||||||
|
try {
|
||||||
|
await api.customRacesInstall(serverId);
|
||||||
|
await loadRacesStatus();
|
||||||
|
await load();
|
||||||
|
onChanged?.();
|
||||||
|
} catch (e) {
|
||||||
|
setError(asUiError(e));
|
||||||
|
} finally {
|
||||||
|
setRacesInstalling(false);
|
||||||
|
setRacesProgress(null);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
async function toggle(m: ModuleView) {
|
async function toggle(m: ModuleView) {
|
||||||
setError(null);
|
setError(null);
|
||||||
@@ -104,6 +150,9 @@ export function ModulesPage({ serverId, onChanged }: { serverId: string; onChang
|
|||||||
await api.moduleSetEnabled(serverId, m.id, !m.enabled);
|
await api.moduleSetEnabled(serverId, m.id, !m.enabled);
|
||||||
setChanged(true);
|
setChanged(true);
|
||||||
await load();
|
await load();
|
||||||
|
if (m.id === "custom-races") {
|
||||||
|
await loadRacesStatus();
|
||||||
|
}
|
||||||
onChanged?.();
|
onChanged?.();
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
setError(asUiError(e));
|
setError(asUiError(e));
|
||||||
@@ -145,8 +194,9 @@ export function ModulesPage({ serverId, onChanged }: { serverId: string; onChang
|
|||||||
role="switch"
|
role="switch"
|
||||||
aria-checked={m.enabled}
|
aria-checked={m.enabled}
|
||||||
aria-label={t("mod.switch", { name: m.name })}
|
aria-label={t("mod.switch", { name: m.name })}
|
||||||
|
disabled={m.id === "custom-races" && racesInstalling}
|
||||||
onClick={() => void toggle(m)}
|
onClick={() => void toggle(m)}
|
||||||
className={cn("relative mt-1 h-6 w-11 shrink-0 cursor-pointer rounded-full transition-colors", m.enabled ? "bg-gold" : "bg-white/15")}
|
className={cn("relative mt-1 h-6 w-11 shrink-0 cursor-pointer rounded-full transition-colors", m.enabled ? "bg-gold" : "bg-white/15", (m.id === "custom-races" && racesInstalling) && "opacity-50 cursor-not-allowed")}
|
||||||
>
|
>
|
||||||
<span className={cn("absolute top-0.5 h-5 w-5 rounded-full bg-white transition-all", m.enabled ? "left-[22px]" : "left-0.5")} />
|
<span className={cn("absolute top-0.5 h-5 w-5 rounded-full bg-white transition-all", m.enabled ? "left-[22px]" : "left-0.5")} />
|
||||||
</button>
|
</button>
|
||||||
@@ -154,6 +204,70 @@ export function ModulesPage({ serverId, onChanged }: { serverId: string; onChang
|
|||||||
{m.installed && !m.switchable && m.status !== "soon" && m.compatibility !== "unsupported" && <span className="mt-1.5 shrink-0 text-xs text-muted">{t("mod.alwaysOn")}</span>}
|
{m.installed && !m.switchable && m.status !== "soon" && m.compatibility !== "unsupported" && <span className="mt-1.5 shrink-0 text-xs text-muted">{t("mod.alwaysOn")}</span>}
|
||||||
{!m.installed && m.status !== "soon" && <span className="mt-1.5 shrink-0 text-xs text-muted">{t("mod.notHere")}</span>}
|
{!m.installed && m.status !== "soon" && <span className="mt-1.5 shrink-0 text-xs text-muted">{t("mod.notHere")}</span>}
|
||||||
</div>
|
</div>
|
||||||
|
{m.id === "custom-races" && (
|
||||||
|
<div className="w-full">
|
||||||
|
{racesInstalling && racesProgress ? (
|
||||||
|
<div className="rounded-lg border border-gold/30 bg-gold/5 p-3">
|
||||||
|
<div className="flex items-center justify-between gap-3 text-xs">
|
||||||
|
<span className="flex min-w-0 items-center gap-2 font-medium text-ink">
|
||||||
|
<Loader2 className="h-3.5 w-3.5 shrink-0 animate-spin text-gold" />
|
||||||
|
<span className="truncate">{racesProgress.step}</span>
|
||||||
|
</span>
|
||||||
|
<span className="shrink-0 font-mono text-xs font-semibold text-gold">
|
||||||
|
{Math.round(racesProgress.percent * 100)}%
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
<div className="mt-2.5 h-2 w-full overflow-hidden rounded-full bg-white/10" role="progressbar" aria-valuenow={Math.round(racesProgress.percent * 100)} aria-valuemin={0} aria-valuemax={100}>
|
||||||
|
<div
|
||||||
|
className="h-full rounded-full bg-gold transition-all duration-300"
|
||||||
|
style={{ width: `${Math.round(racesProgress.percent * 100)}%` }}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
) : (
|
||||||
|
<div className="flex flex-wrap items-center justify-between gap-2 border-t border-line/40 pt-3 text-xs">
|
||||||
|
<div className="flex items-center gap-2">
|
||||||
|
{racesPatchStatus?.state === "enabled" && (
|
||||||
|
<span className="inline-flex items-center gap-1.5 rounded-full bg-ok/10 px-2.5 py-1 text-xs text-ok border border-ok/30">
|
||||||
|
<span className="h-1.5 w-1.5 rounded-full bg-ok" />
|
||||||
|
{locale === "ru" ? "Патч клиента: Включен" : "Client Patch: Active"}
|
||||||
|
</span>
|
||||||
|
)}
|
||||||
|
{racesPatchStatus?.state === "disabled" && (
|
||||||
|
<span className="inline-flex items-center gap-1.5 rounded-full bg-white/5 px-2.5 py-1 text-xs text-muted border border-white/15" title="MPQ files disabled with .disabled suffix">
|
||||||
|
<span className="h-1.5 w-1.5 rounded-full bg-muted" />
|
||||||
|
{locale === "ru" ? "Патч клиента: Отключен (.disabled)" : "Client Patch: Disabled (.disabled)"}
|
||||||
|
</span>
|
||||||
|
)}
|
||||||
|
{racesPatchStatus?.state === "not-installed" && (
|
||||||
|
<span className="inline-flex items-center gap-1.5 rounded-full bg-warn/10 px-2.5 py-1 text-xs text-warn border border-warn/30">
|
||||||
|
<span className="h-1.5 w-1.5 rounded-full bg-warn" />
|
||||||
|
{locale === "ru" ? "Патч клиента: Не установлен" : "Client Patch: Not Installed"}
|
||||||
|
</span>
|
||||||
|
)}
|
||||||
|
{racesPatchStatus?.state === "partially-installed" && (
|
||||||
|
<span className="inline-flex items-center gap-1.5 rounded-full bg-warn/10 px-2.5 py-1 text-xs text-warn border border-warn/30">
|
||||||
|
<span className="h-1.5 w-1.5 rounded-full bg-warn" />
|
||||||
|
{locale === "ru" ? `Патч клиента: ${racesPatchStatus.installedMpqs}/${racesPatchStatus.totalMpqs} MPQ` : `Client Patch: ${racesPatchStatus.installedMpqs}/${racesPatchStatus.totalMpqs} MPQ`}
|
||||||
|
</span>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
{(!racesPatchStatus || racesPatchStatus.state === "not-installed" || racesPatchStatus.state === "partially-installed") && (
|
||||||
|
<Button
|
||||||
|
size="sm"
|
||||||
|
variant="secondary"
|
||||||
|
className="h-7 px-3 text-xs border border-gold/40 hover:border-gold"
|
||||||
|
disabled={racesInstalling || !racesPatchStatus?.clientPath}
|
||||||
|
onClick={() => void installClientPatch()}
|
||||||
|
>
|
||||||
|
{racesInstalling && <Loader2 className="mr-1.5 h-3.5 w-3.5 animate-spin" />}
|
||||||
|
{locale === "ru" ? "Установить патч клиента" : "Install Client Patch 1.5"}
|
||||||
|
</Button>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
<div className="mt-auto flex items-center gap-2">
|
<div className="mt-auto flex items-center gap-2">
|
||||||
<button
|
<button
|
||||||
onClick={() => void api.openLink(m.repo)}
|
onClick={() => void api.openLink(m.repo)}
|
||||||
@@ -174,7 +288,7 @@ export function ModulesPage({ serverId, onChanged }: { serverId: string; onChang
|
|||||||
{selected?.has_settings && !selected.page && selectedAt >= 0 && Math.floor(selectedAt / 2) === Math.floor(i / 2) && (i % 2 === 1 || i === modules.length - 1) && (
|
{selected?.has_settings && !selected.page && selectedAt >= 0 && Math.floor(selectedAt / 2) === Math.floor(i / 2) && (i % 2 === 1 || i === modules.length - 1) && (
|
||||||
<SettingsPanel key={selected.id} className="sm:col-span-2">
|
<SettingsPanel key={selected.id} className="sm:col-span-2">
|
||||||
<h2 className="font-semibold">{t("mod.settingsOf", { name: selected.name })}</h2>
|
<h2 className="font-semibold">{t("mod.settingsOf", { name: selected.name })}</h2>
|
||||||
<ModuleSettings serverId={serverId} module={selected} onSaved={() => setChanged(true)} />
|
<ModuleSettings serverId={serverId} module={selected} onSaved={() => setChanged(true)} onRegisterGuard={setGuard} />
|
||||||
</SettingsPanel>
|
</SettingsPanel>
|
||||||
)}
|
)}
|
||||||
</Fragment>
|
</Fragment>
|
||||||
@@ -184,8 +298,8 @@ export function ModulesPage({ serverId, onChanged }: { serverId: string; onChang
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
function ModuleSettings({ serverId, module, onSaved }: { serverId: string; module: ModuleView; onSaved: () => void }) {
|
function ModuleSettings({ serverId, module, onSaved, onRegisterGuard }: { serverId: string; module: ModuleView; onSaved: () => void; onRegisterGuard?: (guard: UnsavedChangesGuard | null) => void }) {
|
||||||
const { t, locale } = useI18n();
|
const { t, tn, locale } = useI18n();
|
||||||
const sx = useSchemaText();
|
const sx = useSchemaText();
|
||||||
const human = useHuman();
|
const human = useHuman();
|
||||||
const [advanced, setAdvanced] = useState(false);
|
const [advanced, setAdvanced] = useState(false);
|
||||||
@@ -208,7 +322,7 @@ function ModuleSettings({ serverId, module, onSaved }: { serverId: string; modul
|
|||||||
return () => { cancelled = true; };
|
return () => { cancelled = true; };
|
||||||
}, [serverId, module.id]);
|
}, [serverId, module.id]);
|
||||||
|
|
||||||
async function save() {
|
async function save(): Promise<boolean> {
|
||||||
const errors: Record<string, string> = {};
|
const errors: Record<string, string> = {};
|
||||||
for (const [key, value] of Object.entries(edits)) {
|
for (const [key, value] of Object.entries(edits)) {
|
||||||
const field = moduleField(key, locale, items?.find(item => item.key === key)?.field);
|
const field = moduleField(key, locale, items?.find(item => item.key === key)?.field);
|
||||||
@@ -222,7 +336,7 @@ function ModuleSettings({ serverId, module, onSaved }: { serverId: string; modul
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
setFieldErrors(errors);
|
setFieldErrors(errors);
|
||||||
if (Object.keys(errors).length) return;
|
if (Object.keys(errors).length) return false;
|
||||||
setBusy(true);
|
setBusy(true);
|
||||||
setError(null);
|
setError(null);
|
||||||
setNote(null);
|
setNote(null);
|
||||||
@@ -234,14 +348,33 @@ function ModuleSettings({ serverId, module, onSaved }: { serverId: string; modul
|
|||||||
onSaved();
|
onSaved();
|
||||||
setNote(t("mod.saved", { n: done.length }));
|
setNote(t("mod.saved", { n: done.length }));
|
||||||
}
|
}
|
||||||
|
return true;
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
setError(asUiError(e));
|
setError(asUiError(e));
|
||||||
|
return false;
|
||||||
} finally {
|
} finally {
|
||||||
setBusy(false);
|
setBusy(false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const dirty = Object.keys(edits).length > 0;
|
const dirty = Object.keys(edits).length > 0;
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (dirty) {
|
||||||
|
onRegisterGuard?.({
|
||||||
|
isDirty: () => Object.keys(edits).length > 0,
|
||||||
|
save: () => save(),
|
||||||
|
discard: () => {
|
||||||
|
setEdits({});
|
||||||
|
setFieldErrors({});
|
||||||
|
setNote(null);
|
||||||
|
},
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
onRegisterGuard?.(null);
|
||||||
|
}
|
||||||
|
return () => onRegisterGuard?.(null);
|
||||||
|
}, [dirty, edits, onRegisterGuard]);
|
||||||
const edit = (key: string, value: string) => setEdits(previous => {
|
const edit = (key: string, value: string) => setEdits(previous => {
|
||||||
const next = { ...previous };
|
const next = { ...previous };
|
||||||
if (value === items?.find(item => item.key === key)?.value) delete next[key];
|
if (value === items?.find(item => item.key === key)?.value) delete next[key];
|
||||||
@@ -324,6 +457,20 @@ function ModuleSettings({ serverId, module, onSaved }: { serverId: string; modul
|
|||||||
{note && <span className="text-sm text-ok" role="status">{note}</span>}
|
{note && <span className="text-sm text-ok" role="status">{note}</span>}
|
||||||
</div>}
|
</div>}
|
||||||
{error && <p className="mt-2 text-sm text-bad" role="alert">{error.human.code === "unknown" ? error.technical : human(error.human).message}</p>}
|
{error && <p className="mt-2 text-sm text-bad" role="alert">{error.human.code === "unknown" ? error.technical : human(error.human).message}</p>}
|
||||||
|
{dirty && (
|
||||||
|
<div className="fixed bottom-0 left-60 right-0 z-40 flex items-center justify-between border-t border-line bg-[#0b0c0e]/95 px-10 py-3 shadow-lg">
|
||||||
|
<span className="text-sm text-muted">{tn("set.unsaved", Object.keys(edits).length)}</span>
|
||||||
|
<div className="flex gap-2">
|
||||||
|
<Button variant="ghost" size="sm" disabled={busy} onClick={() => { setEdits({}); setFieldErrors({}); setNote(null); }}>
|
||||||
|
{t("set.discard")}
|
||||||
|
</Button>
|
||||||
|
<Button variant="primary" size="sm" disabled={busy} onClick={() => void save()}>
|
||||||
|
{busy && <Loader2 className="mr-1.5 h-3.5 w-3.5 animate-spin" aria-hidden />}
|
||||||
|
{t("acc.save")}
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
+181
-33
@@ -1,6 +1,6 @@
|
|||||||
import { dismissClientJob, startClientUpdate, stopClientJob, syncClient, useClientJob } from "@/lib/clientJob";
|
import { dismissClientJob, startClientUpdate, stopClientJob, syncClient, useClientJob } from "@/lib/clientJob";
|
||||||
import { useCallback, useEffect, useRef, useState } from "react";
|
import { useCallback, useEffect, useRef, useState } from "react";
|
||||||
import { Loader2, X } from "lucide-react";
|
import { AlertTriangle, Loader2, X } from "lucide-react";
|
||||||
import { api, asUiError, type ClientInfo, type Human, type Performance, type Population, type ServerSummary, type ServiceStatus, type StatusView } from "@/lib/api";
|
import { api, asUiError, type ClientInfo, type Human, type Performance, type Population, type ServerSummary, type ServiceStatus, type StatusView } from "@/lib/api";
|
||||||
import { cn, formatBytes, formatUptime } from "@/lib/utils";
|
import { cn, formatBytes, formatUptime } from "@/lib/utils";
|
||||||
import { useHuman, useT } from "@/i18n";
|
import { useHuman, useT } from "@/i18n";
|
||||||
@@ -9,6 +9,8 @@ import { checkClient, useClientStatus } from "@/lib/clientUpdate";
|
|||||||
import { ClientDialog, type ClientDialogMode } from "@/screens/ClientDialog";
|
import { ClientDialog, type ClientDialogMode } from "@/screens/ClientDialog";
|
||||||
import { RealmlistMenu } from "@/screens/RealmlistMenu";
|
import { RealmlistMenu } from "@/screens/RealmlistMenu";
|
||||||
import { RealmPicker } from "@/screens/RealmPicker";
|
import { RealmPicker } from "@/screens/RealmPicker";
|
||||||
|
import { CrashHistoryModal } from "@/screens/CrashHistoryModal";
|
||||||
|
import { useAutoRestart } from "@/lib/autoRestartPrefs";
|
||||||
import { Button } from "@/components/ui/button";
|
import { Button } from "@/components/ui/button";
|
||||||
import { Card } from "@/components/ui/card";
|
import { Card } from "@/components/ui/card";
|
||||||
|
|
||||||
@@ -98,6 +100,35 @@ export function Overview({ server, companions = true, onForget, onOpenUpdates, o
|
|||||||
const upd = useServerUpdate(server.id);
|
const upd = useServerUpdate(server.id);
|
||||||
const needsDecision = (upd.preview?.conflicts.length ?? 0) > 0;
|
const needsDecision = (upd.preview?.conflicts.length ?? 0) > 0;
|
||||||
const [startBots, setStartBots] = useState<number | null | undefined>(undefined);
|
const [startBots, setStartBots] = useState<number | null | undefined>(undefined);
|
||||||
|
const [autoRestart, setAutoRestart] = useAutoRestart(server.id);
|
||||||
|
const autoRestartRef = useRef(autoRestart);
|
||||||
|
autoRestartRef.current = autoRestart;
|
||||||
|
|
||||||
|
const [crashCount, setCrashCount] = useState(0);
|
||||||
|
const crashCountRef = useRef(0);
|
||||||
|
const [showCrashModal, setShowCrashModal] = useState(false);
|
||||||
|
const [hasCrashHistory, setHasCrashHistory] = useState(false);
|
||||||
|
const [crashLoopPaused, setCrashLoopPaused] = useState(false);
|
||||||
|
const [crashRestartNotice, setCrashRestartNotice] = useState<string | null>(null);
|
||||||
|
|
||||||
|
const userStoppedRef = useRef(false);
|
||||||
|
const wasWorldRunningRef = useRef(false);
|
||||||
|
const actionRef = useRef<Action>(null);
|
||||||
|
const crashTimestampsRef = useRef<number[]>([]);
|
||||||
|
const pollRef = useRef<() => Promise<void>>(undefined);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
let active = true;
|
||||||
|
void api
|
||||||
|
.listCrashes(server.id, 1)
|
||||||
|
.then((items) => {
|
||||||
|
if (active && items.length > 0) setHasCrashHistory(true);
|
||||||
|
})
|
||||||
|
.catch(() => {});
|
||||||
|
return () => {
|
||||||
|
active = false;
|
||||||
|
};
|
||||||
|
}, [server.id]);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
void api
|
void api
|
||||||
@@ -115,18 +146,87 @@ export function Overview({ server, companions = true, onForget, onOpenUpdates, o
|
|||||||
if (job.phase === "done" || job.phase === "current") void api.clientInfo(server.id).then(setClient).catch(() => undefined);
|
if (job.phase === "done" || job.phase === "current") void api.clientInfo(server.id).then(setClient).catch(() => undefined);
|
||||||
}, [job.phase, server.id]);
|
}, [job.phase, server.id]);
|
||||||
|
|
||||||
|
const run = useCallback(
|
||||||
|
async (kind: Exclude<Action, null>) => {
|
||||||
|
if (kind === "stopping") {
|
||||||
|
userStoppedRef.current = true;
|
||||||
|
} else {
|
||||||
|
userStoppedRef.current = false;
|
||||||
|
setCrashLoopPaused(false);
|
||||||
|
setCrashRestartNotice(null);
|
||||||
|
}
|
||||||
|
setFailure(null);
|
||||||
|
setShowDetails(false);
|
||||||
|
setAction(kind);
|
||||||
|
actionRef.current = kind;
|
||||||
|
try {
|
||||||
|
if (kind !== "starting") {
|
||||||
|
const out = await api.stop(server.id);
|
||||||
|
if (!out.ok) throw { human: out.human, technical: out.output };
|
||||||
|
}
|
||||||
|
if (kind !== "stopping") {
|
||||||
|
setAction("starting");
|
||||||
|
actionRef.current = "starting";
|
||||||
|
const out = await api.start(server.id);
|
||||||
|
if (!out.ok) throw { human: out.human, technical: out.output };
|
||||||
|
}
|
||||||
|
} catch (e) {
|
||||||
|
const ui = asUiError(e);
|
||||||
|
setFailure({ human: ui.human ?? asUiError(String(e)).human, technical: ui.technical });
|
||||||
|
} finally {
|
||||||
|
setAction(null);
|
||||||
|
actionRef.current = null;
|
||||||
|
void pollRef.current?.();
|
||||||
|
}
|
||||||
|
},
|
||||||
|
[server.id],
|
||||||
|
);
|
||||||
|
|
||||||
const poll = useCallback(async () => {
|
const poll = useCallback(async () => {
|
||||||
try {
|
try {
|
||||||
const s = await api.status(server.id);
|
const s = await api.status(server.id);
|
||||||
if (alive.current) setStatus(s);
|
if (alive.current) setStatus(s);
|
||||||
if (s.observed.world.state === "running") {
|
const isWorldRunning = s.observed.world.state === "running";
|
||||||
|
if (isWorldRunning) {
|
||||||
|
wasWorldRunningRef.current = true;
|
||||||
|
userStoppedRef.current = false;
|
||||||
const p = await api.population(server.id).catch(() => null);
|
const p = await api.population(server.id).catch(() => null);
|
||||||
if (alive.current) setPop(p);
|
if (alive.current) setPop(p);
|
||||||
} else if (alive.current) setPop(null);
|
} else {
|
||||||
|
if (alive.current) setPop(null);
|
||||||
|
if (
|
||||||
|
wasWorldRunningRef.current &&
|
||||||
|
!userStoppedRef.current &&
|
||||||
|
actionRef.current === null
|
||||||
|
) {
|
||||||
|
wasWorldRunningRef.current = false;
|
||||||
|
setHasCrashHistory(true);
|
||||||
|
const now = Date.now();
|
||||||
|
const recent = crashTimestampsRef.current.filter((ts) => now - ts < 180000);
|
||||||
|
recent.push(now);
|
||||||
|
crashTimestampsRef.current = recent;
|
||||||
|
|
||||||
|
crashCountRef.current += 1;
|
||||||
|
const currentCrashCount = crashCountRef.current;
|
||||||
|
setCrashCount(currentCrashCount);
|
||||||
|
|
||||||
|
if (recent.length >= 3) {
|
||||||
|
setCrashLoopPaused(true);
|
||||||
|
setCrashRestartNotice(null);
|
||||||
|
} else if (autoRestartRef.current) {
|
||||||
|
setCrashRestartNotice(t("crash.restartNotice", { n: currentCrashCount }));
|
||||||
|
void run("starting");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
} catch {
|
} catch {
|
||||||
/* transient; next poll retries */
|
/* transient; next poll retries */
|
||||||
}
|
}
|
||||||
}, [server.id]);
|
}, [server.id, t, run]);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
pollRef.current = poll;
|
||||||
|
}, [poll]);
|
||||||
|
|
||||||
// The tick rate comes from the server console (one short connection per reading), so it is read less often.
|
// The tick rate comes from the server console (one short connection per reading), so it is read less often.
|
||||||
const worldUp = status?.observed.world.state === "running";
|
const worldUp = status?.observed.world.state === "running";
|
||||||
@@ -156,29 +256,6 @@ export function Overview({ server, companions = true, onForget, onOpenUpdates, o
|
|||||||
};
|
};
|
||||||
}, [poll]);
|
}, [poll]);
|
||||||
|
|
||||||
async function run(kind: Exclude<Action, null>) {
|
|
||||||
setFailure(null);
|
|
||||||
setShowDetails(false);
|
|
||||||
setAction(kind);
|
|
||||||
try {
|
|
||||||
if (kind !== "starting") {
|
|
||||||
const out = await api.stop(server.id);
|
|
||||||
if (!out.ok) throw { human: out.human, technical: out.output };
|
|
||||||
}
|
|
||||||
if (kind !== "stopping") {
|
|
||||||
setAction("starting");
|
|
||||||
const out = await api.start(server.id);
|
|
||||||
if (!out.ok) throw { human: out.human, technical: out.output };
|
|
||||||
}
|
|
||||||
} catch (e) {
|
|
||||||
const ui = asUiError(e);
|
|
||||||
setFailure({ human: ui.human ?? asUiError(String(e)).human, technical: ui.technical });
|
|
||||||
} finally {
|
|
||||||
setAction(null);
|
|
||||||
void poll();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async function play() {
|
async function play() {
|
||||||
setFailure(null);
|
setFailure(null);
|
||||||
setShowDetails(false);
|
setShowDetails(false);
|
||||||
@@ -234,13 +311,56 @@ export function Overview({ server, companions = true, onForget, onOpenUpdates, o
|
|||||||
|
|
||||||
<Card className="mt-6 p-7">
|
<Card className="mt-6 p-7">
|
||||||
<div className="mb-1 text-xs font-medium uppercase tracking-[0.14em] text-muted">{realms ? `${realms.first} · ${t("overview.server")}` : t("overview.server")}</div>
|
<div className="mb-1 text-xs font-medium uppercase tracking-[0.14em] text-muted">{realms ? `${realms.first} · ${t("overview.server")}` : t("overview.server")}</div>
|
||||||
<div className={cn("flex items-center gap-3 text-3xl font-semibold", tone)} role="status" aria-live="polite">
|
<div className="flex flex-wrap items-center justify-between gap-3">
|
||||||
<span
|
<div className={cn("flex items-center gap-3 text-3xl font-semibold", tone)} role="status" aria-live="polite">
|
||||||
aria-hidden
|
<span
|
||||||
className={cn("h-3 w-3 rounded-full", running && !transitioning ? "bg-ok" : transitioning || anyUp ? "bg-warn" : "bg-muted/50")}
|
aria-hidden
|
||||||
/>
|
className={cn("h-3 w-3 rounded-full", running && !transitioning ? "bg-ok" : transitioning || anyUp ? "bg-warn" : "bg-muted/50")}
|
||||||
{headline}
|
/>
|
||||||
|
{headline}
|
||||||
|
</div>
|
||||||
|
{(crashCount > 0 || hasCrashHistory) && (
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
onClick={() => setShowCrashModal(true)}
|
||||||
|
className={cn(
|
||||||
|
"inline-flex cursor-pointer items-center gap-1.5 rounded-full px-3 py-1 text-xs font-medium transition-colors",
|
||||||
|
crashCount > 0
|
||||||
|
? "border border-bad/40 bg-bad/15 text-bad hover:bg-bad/25"
|
||||||
|
: "border border-line bg-card-2 text-muted hover:text-ink hover:border-gold/40",
|
||||||
|
)}
|
||||||
|
title={t("crash.historyTitle")}
|
||||||
|
>
|
||||||
|
<AlertTriangle className="h-3.5 w-3.5" aria-hidden />
|
||||||
|
<span>{crashCount > 0 ? t("crash.badge", { n: crashCount }) : t("crash.historyTitle")}</span>
|
||||||
|
</button>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
{crashRestartNotice && !crashLoopPaused && (
|
||||||
|
<div className="mt-3 flex items-center justify-between rounded-md border border-amber-500/30 bg-amber-500/10 p-3 text-xs text-amber-300">
|
||||||
|
<span>{crashRestartNotice}</span>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
onClick={() => setCrashRestartNotice(null)}
|
||||||
|
className="cursor-pointer text-amber-300/70 hover:text-amber-300"
|
||||||
|
aria-label={t("btn.close")}
|
||||||
|
>
|
||||||
|
<X className="h-4 w-4" />
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
{crashLoopPaused && (
|
||||||
|
<div className="mt-3 flex items-center justify-between rounded-md border border-bad/40 bg-bad/15 p-3 text-xs text-bad">
|
||||||
|
<span>{t("crash.loopPaused")}</span>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
onClick={() => setShowCrashModal(true)}
|
||||||
|
className="cursor-pointer font-medium underline"
|
||||||
|
>
|
||||||
|
{t("crash.historyTitle")}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
{!transitioning && !running && anyUp && (
|
{!transitioning && !running && anyUp && (
|
||||||
<p className="mt-2 text-sm text-muted">
|
<p className="mt-2 text-sm text-muted">
|
||||||
{t("overview.reportHint")}{" "}
|
{t("overview.reportHint")}{" "}
|
||||||
@@ -363,6 +483,27 @@ export function Overview({ server, companions = true, onForget, onOpenUpdates, o
|
|||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div className="mt-6 flex flex-wrap items-center justify-between gap-3 border-t border-line/60 pt-4 text-xs text-muted">
|
||||||
|
<label className="flex cursor-pointer items-center gap-2">
|
||||||
|
<input
|
||||||
|
type="checkbox"
|
||||||
|
checked={autoRestart}
|
||||||
|
onChange={(e) => setAutoRestart(e.target.checked)}
|
||||||
|
className="h-3.5 w-3.5 accent-[#c9a24a]"
|
||||||
|
/>
|
||||||
|
<span className="font-medium text-ink/80">{t("crash.autoRestart")}</span>
|
||||||
|
<span className="hidden sm:inline text-muted">— {t("crash.autoRestartDesc")}</span>
|
||||||
|
</label>
|
||||||
|
{(crashCount > 0 || hasCrashHistory) && (
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
onClick={() => setShowCrashModal(true)}
|
||||||
|
className="cursor-pointer text-gold hover:underline"
|
||||||
|
>
|
||||||
|
{t("crash.historyTitle")}
|
||||||
|
</button>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
{anyUp && !running && !transitioning && (
|
{anyUp && !running && !transitioning && (
|
||||||
<p className="mt-3 text-sm text-muted">{t("overview.partial")}</p>
|
<p className="mt-3 text-sm text-muted">{t("overview.partial")}</p>
|
||||||
)}
|
)}
|
||||||
@@ -477,6 +618,13 @@ export function Overview({ server, companions = true, onForget, onOpenUpdates, o
|
|||||||
onPlayAnyway={() => void play()}
|
onPlayAnyway={() => void play()}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
|
{showCrashModal && (
|
||||||
|
<CrashHistoryModal
|
||||||
|
serverId={server.id}
|
||||||
|
onClose={() => setShowCrashModal(false)}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -15,6 +15,7 @@ import { hasKey, useHuman, useI18n, type Key } from "@/i18n";
|
|||||||
import { LanguagePicker } from "@/components/LanguagePicker";
|
import { LanguagePicker } from "@/components/LanguagePicker";
|
||||||
import { RealmStartupSettings } from "@/screens/RealmStartupSettings";
|
import { RealmStartupSettings } from "@/screens/RealmStartupSettings";
|
||||||
import { RepairCard } from "@/screens/RepairCard";
|
import { RepairCard } from "@/screens/RepairCard";
|
||||||
|
import { AutoRestartSettings } from "@/screens/AutoRestartSettings";
|
||||||
|
|
||||||
function mb(bytes: number) {
|
function mb(bytes: number) {
|
||||||
return bytes >= 1 << 20 ? `${(bytes / (1 << 20)).toFixed(1)} MB` : `${Math.max(1, Math.round(bytes / 1024))} KB`;
|
return bytes >= 1 << 20 ? `${(bytes / (1 << 20)).toFixed(1)} MB` : `${Math.max(1, Math.round(bytes / 1024))} KB`;
|
||||||
@@ -171,6 +172,7 @@ export function SettingsHome({ serverId, path, onForget }: { serverId: string; p
|
|||||||
|
|
||||||
<ClientCard serverId={serverId} />
|
<ClientCard serverId={serverId} />
|
||||||
<RealmStartupSettings serverId={serverId} />
|
<RealmStartupSettings serverId={serverId} />
|
||||||
|
<AutoRestartSettings serverId={serverId} />
|
||||||
|
|
||||||
<DiagnosticsCard serverId={serverId} />
|
<DiagnosticsCard serverId={serverId} />
|
||||||
<RepairCard key={serverId} serverId={serverId} />
|
<RepairCard key={serverId} serverId={serverId} />
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ import { Card } from "@/components/ui/card";
|
|||||||
import { CollectionRows, RawRows, collectionsOf } from "@/screens/ExtraRows";
|
import { CollectionRows, RawRows, collectionsOf } from "@/screens/ExtraRows";
|
||||||
import { CompanionsCard } from "@/screens/CompanionsCard";
|
import { CompanionsCard } from "@/screens/CompanionsCard";
|
||||||
import { useHuman, useI18n, useSchemaText, useT, type Key } from "@/i18n";
|
import { useHuman, useI18n, useSchemaText, useT, type Key } from "@/i18n";
|
||||||
|
import type { UnsavedChangesGuard } from "@/lib/unsavedGuard";
|
||||||
|
|
||||||
type T = (k: Key, v?: Record<string, string | number>) => string;
|
type T = (k: Key, v?: Record<string, string | number>) => string;
|
||||||
|
|
||||||
@@ -154,7 +155,14 @@ function Row(props: { s: SettingView; value: JsonValue; error: string | null; on
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
export function SettingsPage(props: { serverId: string; scope: Scope; botModule?: "companions" | "playerbots"; title: string; question: string }) {
|
export function SettingsPage(props: {
|
||||||
|
serverId: string;
|
||||||
|
scope: Scope;
|
||||||
|
botModule?: "companions" | "playerbots";
|
||||||
|
title: string;
|
||||||
|
question: string;
|
||||||
|
onRegisterGuard?: (guard: UnsavedChangesGuard | null) => void;
|
||||||
|
}) {
|
||||||
const { serverId, scope } = props;
|
const { serverId, scope } = props;
|
||||||
const { t, tn, locale } = useI18n();
|
const { t, tn, locale } = useI18n();
|
||||||
const squid = scope === "bots" && props.botModule === "playerbots";
|
const squid = scope === "bots" && props.botModule === "playerbots";
|
||||||
@@ -235,6 +243,24 @@ export function SettingsPage(props: { serverId: string; scope: Scope; botModule?
|
|||||||
});
|
});
|
||||||
const pending = dirtyKeys.length + Object.keys(rawEdits).length + Object.keys(colEdits).length;
|
const pending = dirtyKeys.length + Object.keys(rawEdits).length + Object.keys(colEdits).length;
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (pending > 0) {
|
||||||
|
props.onRegisterGuard?.({
|
||||||
|
isDirty: () => pending > 0,
|
||||||
|
save: () => saveEverything(),
|
||||||
|
discard: () => {
|
||||||
|
setDraft({});
|
||||||
|
setErrors({});
|
||||||
|
setRawEdits({});
|
||||||
|
setColEdits({});
|
||||||
|
},
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
props.onRegisterGuard?.(null);
|
||||||
|
}
|
||||||
|
return () => props.onRegisterGuard?.(null);
|
||||||
|
}, [pending, props.onRegisterGuard]);
|
||||||
|
|
||||||
if (fatal) {
|
if (fatal) {
|
||||||
return (
|
return (
|
||||||
<div className="max-w-xl">
|
<div className="max-w-xl">
|
||||||
@@ -317,10 +343,10 @@ export function SettingsPage(props: { serverId: string; scope: Scope; botModule?
|
|||||||
}
|
}
|
||||||
|
|
||||||
/** The save bar saves all three kinds of edits: the curated settings, the collection switches and the other documented ones. */
|
/** The save bar saves all three kinds of edits: the curated settings, the collection switches and the other documented ones. */
|
||||||
async function saveEverything() {
|
async function saveEverything(): Promise<boolean> {
|
||||||
if (dirtyKeys.length && !(await save(Object.fromEntries(dirtyKeys.map((k) => [k, draft[k]]))))) return;
|
if (dirtyKeys.length && !(await save(Object.fromEntries(dirtyKeys.map((k) => [k, draft[k]]))))) return false;
|
||||||
const extra = [...Object.keys(rawEdits), ...Object.keys(colEdits)];
|
const extra = [...Object.keys(rawEdits), ...Object.keys(colEdits)];
|
||||||
if (!extra.length) return;
|
if (!extra.length) return true;
|
||||||
setBusy(true);
|
setBusy(true);
|
||||||
setSaveErr(null);
|
setSaveErr(null);
|
||||||
try {
|
try {
|
||||||
@@ -337,8 +363,10 @@ export function SettingsPage(props: { serverId: string; scope: Scope; botModule?
|
|||||||
const more = extra.map((key) => ({ key, title: key, restart: "world" as const, dangerous: false }));
|
const more = extra.map((key) => ({ key, title: key, restart: "world" as const, dangerous: false }));
|
||||||
setSaved((prev) => ({ changed: [...(prev?.changed ?? []), ...more], restart: prev?.restart ?? "world", snapshot: prev?.snapshot ?? null }));
|
setSaved((prev) => ({ changed: [...(prev?.changed ?? []), ...more], restart: prev?.restart ?? "world", snapshot: prev?.snapshot ?? null }));
|
||||||
void api.status(serverId).then((st) => setRunning(st.observed.world.state === "running"));
|
void api.status(serverId).then((st) => setRunning(st.observed.world.state === "running"));
|
||||||
|
return true;
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
setSaveErr(asUiError(e));
|
setSaveErr(asUiError(e));
|
||||||
|
return false;
|
||||||
} finally {
|
} finally {
|
||||||
setBusy(false);
|
setBusy(false);
|
||||||
}
|
}
|
||||||
|
|||||||
+72
-8
@@ -1,5 +1,5 @@
|
|||||||
import { useCallback, useEffect, useState } from "react";
|
import { useCallback, useEffect, useRef, useState } from "react";
|
||||||
import { Archive, BarChart3, Bot, Bug, Gauge, Globe, Puzzle, Server, Settings, Terminal, Users, type LucideIcon } from "lucide-react";
|
import { Archive, BarChart3, Bot, Bug, Gauge, Globe, Loader2, Puzzle, Server, Settings, Terminal, Users, type LucideIcon } from "lucide-react";
|
||||||
import { api, type ServerSummary } from "@/lib/api";
|
import { api, type ServerSummary } from "@/lib/api";
|
||||||
import { useT, type Key } from "@/i18n";
|
import { useT, type Key } from "@/i18n";
|
||||||
import logo from "@/assets/logo.png";
|
import logo from "@/assets/logo.png";
|
||||||
@@ -16,8 +16,10 @@ import { ModulesPage } from "@/screens/ModulesPage";
|
|||||||
import { ConsolePage } from "@/screens/ConsolePage";
|
import { ConsolePage } from "@/screens/ConsolePage";
|
||||||
import { DashboardPage } from "@/screens/DashboardPage";
|
import { DashboardPage } from "@/screens/DashboardPage";
|
||||||
import { Button } from "@/components/ui/button";
|
import { Button } from "@/components/ui/button";
|
||||||
|
import { Card } from "@/components/ui/card";
|
||||||
import { startServerUpdatePolling, useServerUpdate } from "@/lib/serverUpdate";
|
import { startServerUpdatePolling, useServerUpdate } from "@/lib/serverUpdate";
|
||||||
import { startClientPolling } from "@/lib/clientUpdate";
|
import { startClientPolling } from "@/lib/clientUpdate";
|
||||||
|
import type { UnsavedChangesGuard } from "@/lib/unsavedGuard";
|
||||||
|
|
||||||
type Page = "overview" | "bots" | "dashboard" | "server" | "modules" | "players" | "friends" | "backups" | "console" | "report" | "settings";
|
type Page = "overview" | "bots" | "dashboard" | "server" | "modules" | "players" | "friends" | "backups" | "console" | "report" | "settings";
|
||||||
|
|
||||||
@@ -51,6 +53,22 @@ export function Shell(props: {
|
|||||||
// A module that is switched off takes its page away (the companions' "Bots" page, for one).
|
// A module that is switched off takes its page away (the companions' "Bots" page, for one).
|
||||||
const [botModule, setBotModule] = useState<"companions" | "playerbots">("companions");
|
const [botModule, setBotModule] = useState<"companions" | "playerbots">("companions");
|
||||||
const [hiddenPages, setHiddenPages] = useState<string[]>([]);
|
const [hiddenPages, setHiddenPages] = useState<string[]>([]);
|
||||||
|
const guardRef = useRef<UnsavedChangesGuard | null>(null);
|
||||||
|
const registerGuard = useCallback((g: UnsavedChangesGuard | null) => {
|
||||||
|
guardRef.current = g;
|
||||||
|
}, []);
|
||||||
|
const [pendingNav, setPendingNav] = useState<(() => void) | null>(null);
|
||||||
|
const [modalSaving, setModalSaving] = useState(false);
|
||||||
|
const [modalError, setModalError] = useState<string | null>(null);
|
||||||
|
|
||||||
|
const requestNavigation = (action: () => void) => {
|
||||||
|
if (guardRef.current && guardRef.current.isDirty()) {
|
||||||
|
setPendingNav(() => action);
|
||||||
|
} else {
|
||||||
|
action();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
const reloadModules = useCallback(() => {
|
const reloadModules = useCallback(() => {
|
||||||
void api
|
void api
|
||||||
.modulesList(props.activeId)
|
.modulesList(props.activeId)
|
||||||
@@ -89,7 +107,7 @@ export function Shell(props: {
|
|||||||
{NAV.filter((n) => !hiddenPages.includes(n.id) && (n.id !== "dashboard" || botModule === "playerbots")).map(({ id, label, icon: Icon }) => (
|
{NAV.filter((n) => !hiddenPages.includes(n.id) && (n.id !== "dashboard" || botModule === "playerbots")).map(({ id, label, icon: Icon }) => (
|
||||||
<li key={id}>
|
<li key={id}>
|
||||||
<button
|
<button
|
||||||
onClick={() => setPage(id)}
|
onClick={() => requestNavigation(() => setPage(id))}
|
||||||
aria-current={page === id ? "page" : undefined}
|
aria-current={page === id ? "page" : undefined}
|
||||||
className={cn(
|
className={cn(
|
||||||
"flex h-10 w-full cursor-pointer items-center gap-3 rounded-md px-3 text-left text-[15px] transition-colors",
|
"flex h-10 w-full cursor-pointer items-center gap-3 rounded-md px-3 text-left text-[15px] transition-colors",
|
||||||
@@ -111,7 +129,7 @@ export function Shell(props: {
|
|||||||
<select
|
<select
|
||||||
className="mb-2 w-full rounded-md border border-line bg-card px-2 py-2 text-sm"
|
className="mb-2 w-full rounded-md border border-line bg-card px-2 py-2 text-sm"
|
||||||
value={props.activeId}
|
value={props.activeId}
|
||||||
onChange={(e) => props.onSelect(e.target.value)}
|
onChange={(e) => requestNavigation(() => props.onSelect(e.target.value))}
|
||||||
aria-label={t("nav.serverPicker")}
|
aria-label={t("nav.serverPicker")}
|
||||||
>
|
>
|
||||||
{props.servers.map((s) => (
|
{props.servers.map((s) => (
|
||||||
@@ -121,7 +139,7 @@ export function Shell(props: {
|
|||||||
))}
|
))}
|
||||||
</select>
|
</select>
|
||||||
)}
|
)}
|
||||||
<Button variant="ghost" size="sm" className="w-full justify-start" onClick={props.onAddAnother}>
|
<Button variant="ghost" size="sm" className="w-full justify-start" onClick={() => requestNavigation(props.onAddAnother)}>
|
||||||
{t("nav.addAnother")}
|
{t("nav.addAnother")}
|
||||||
</Button>
|
</Button>
|
||||||
</div>
|
</div>
|
||||||
@@ -129,15 +147,15 @@ export function Shell(props: {
|
|||||||
|
|
||||||
<main className="relative h-full flex-1 overflow-y-auto px-10 py-8">
|
<main className="relative h-full flex-1 overflow-y-auto px-10 py-8">
|
||||||
{page === "overview" ? (
|
{page === "overview" ? (
|
||||||
<Overview key={server.id} server={server} companions={botModule === "companions" && !hiddenPages.includes("bots")} onForget={() => props.onForget(server.id)} onOpenUpdates={() => setPage("settings")} onRealmChanged={reloadModules} onReport={() => setPage("report")} />
|
<Overview key={server.id} server={server} companions={botModule === "companions" && !hiddenPages.includes("bots")} onForget={() => props.onForget(server.id)} onOpenUpdates={() => requestNavigation(() => setPage("settings"))} onRealmChanged={reloadModules} onReport={() => requestNavigation(() => setPage("report"))} />
|
||||||
) : page === "bots" || page === "server" ? (
|
) : page === "bots" || page === "server" ? (
|
||||||
<SettingsPage key={`${server.id}-${page}-${botModule}`} serverId={server.id} scope={page} botModule={botModule} title={t(current.label)} question={t(current.question)} />
|
<SettingsPage key={`${server.id}-${page}-${botModule}`} serverId={server.id} scope={page} botModule={botModule} title={t(current.label)} question={t(current.question)} onRegisterGuard={registerGuard} />
|
||||||
) : page === "dashboard" ? (
|
) : page === "dashboard" ? (
|
||||||
<DashboardPage key={server.id} serverId={server.id} />
|
<DashboardPage key={server.id} serverId={server.id} />
|
||||||
) : page === "console" ? (
|
) : page === "console" ? (
|
||||||
<ConsolePage key={server.id} serverId={server.id} />
|
<ConsolePage key={server.id} serverId={server.id} />
|
||||||
) : page === "modules" ? (
|
) : page === "modules" ? (
|
||||||
<ModulesPage key={server.id} serverId={server.id} onChanged={reloadModules} />
|
<ModulesPage key={server.id} serverId={server.id} onChanged={reloadModules} onRegisterGuard={registerGuard} />
|
||||||
) : page === "report" ? (
|
) : page === "report" ? (
|
||||||
<ReportPage key={server.id} serverId={server.id} />
|
<ReportPage key={server.id} serverId={server.id} />
|
||||||
) : page === "friends" ? (
|
) : page === "friends" ? (
|
||||||
@@ -152,6 +170,52 @@ export function Shell(props: {
|
|||||||
<Placeholder title={t(current.label)} question={t(current.question)} />
|
<Placeholder title={t(current.label)} question={t(current.question)} />
|
||||||
)}
|
)}
|
||||||
</main>
|
</main>
|
||||||
|
|
||||||
|
{pendingNav && (
|
||||||
|
<div className="fixed inset-0 z-50 flex items-center justify-center bg-black/60 p-6" role="presentation">
|
||||||
|
<Card className="w-full max-w-md p-6 shadow-2xl" role="dialog" aria-modal="true" aria-label={t("unsaved.title")}>
|
||||||
|
<h2 className="text-lg font-semibold">{t("unsaved.title")}</h2>
|
||||||
|
<p className="mt-2 text-sm text-muted">{t("unsaved.message")}</p>
|
||||||
|
{modalError && <p className="mt-3 text-sm text-bad" role="alert">{modalError}</p>}
|
||||||
|
<div className="mt-6 flex flex-wrap justify-end gap-2">
|
||||||
|
<Button variant="ghost" disabled={modalSaving} onClick={() => { setPendingNav(null); setModalError(null); }}>
|
||||||
|
{t("common.cancel")}
|
||||||
|
</Button>
|
||||||
|
<Button variant="ghost" disabled={modalSaving} onClick={() => {
|
||||||
|
guardRef.current?.discard();
|
||||||
|
const act = pendingNav;
|
||||||
|
setPendingNav(null);
|
||||||
|
setModalError(null);
|
||||||
|
act?.();
|
||||||
|
}}>
|
||||||
|
{t("set.discard")}
|
||||||
|
</Button>
|
||||||
|
<Button variant="primary" disabled={modalSaving} onClick={async () => {
|
||||||
|
if (!guardRef.current) return;
|
||||||
|
setModalSaving(true);
|
||||||
|
setModalError(null);
|
||||||
|
try {
|
||||||
|
const ok = await guardRef.current.save();
|
||||||
|
if (ok) {
|
||||||
|
const act = pendingNav;
|
||||||
|
setPendingNav(null);
|
||||||
|
act?.();
|
||||||
|
} else {
|
||||||
|
setModalError(t("unsaved.saveFailed"));
|
||||||
|
}
|
||||||
|
} catch (e) {
|
||||||
|
setModalError(String(e));
|
||||||
|
} finally {
|
||||||
|
setModalSaving(false);
|
||||||
|
}
|
||||||
|
}}>
|
||||||
|
{modalSaving && <Loader2 className="mr-1.5 h-3.5 w-3.5 animate-spin" aria-hidden />}
|
||||||
|
{t("acc.save")}
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
</Card>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -4,7 +4,8 @@ param(
|
|||||||
[string]$Source = 'C:\games\CoA-Repack',
|
[string]$Source = 'C:\games\CoA-Repack',
|
||||||
[string]$Target = 'C:\games\coa-fixture',
|
[string]$Target = 'C:\games\coa-fixture',
|
||||||
[int]$PortBase = 13000,
|
[int]$PortBase = 13000,
|
||||||
[string]$DatabaseArchive = ''
|
[string]$DatabaseArchive = '',
|
||||||
|
[switch]$CopyData
|
||||||
)
|
)
|
||||||
$ErrorActionPreference = 'Stop'
|
$ErrorActionPreference = 'Stop'
|
||||||
if ((Resolve-Path $Source).Path -eq $Target) { throw 'source and target are the same' }
|
if ((Resolve-Path $Source).Path -eq $Target) { throw 'source and target are the same' }
|
||||||
@@ -32,7 +33,8 @@ if (-not $DatabaseArchive) { $DatabaseArchive = "$Source\mysql\data.7z" }
|
|||||||
& 'C:\Program Files\7-Zip\7z.exe' x $DatabaseArchive "-o$Target\mysql" -y | Out-Null
|
& 'C:\Program Files\7-Zip\7z.exe' x $DatabaseArchive "-o$Target\mysql" -y | Out-Null
|
||||||
if (-not (Test-Path "$Target\mysql\data\acore_characters")) { throw 'database extraction failed' }
|
if (-not (Test-Path "$Target\mysql\data\acore_characters")) { throw 'database extraction failed' }
|
||||||
|
|
||||||
New-Item -ItemType Junction -Path "$Target\Data" -Target "$Source\Data" | Out-Null
|
if ($CopyData) { Copy-Tree 'Data' }
|
||||||
|
else { New-Item -ItemType Junction -Path "$Target\Data" -Target "$Source\Data" | Out-Null }
|
||||||
|
|
||||||
$ports = @{ mysqlPort = $PortBase + 307; authPort = $PortBase + 724; worldPort = $PortBase + 85; raPort = $PortBase + 443 }
|
$ports = @{ mysqlPort = $PortBase + 307; authPort = $PortBase + 724; worldPort = $PortBase + 85; raPort = $PortBase + 443 }
|
||||||
$cfg = Get-Content "$Target\Settings\repack.json" -Raw | ConvertFrom-Json
|
$cfg = Get-Content "$Target\Settings\repack.json" -Raw | ConvertFrom-Json
|
||||||
|
|||||||
@@ -0,0 +1,98 @@
|
|||||||
|
"""Exercise raid module initialization against disposable MySQL data only."""
|
||||||
|
import argparse
|
||||||
|
import socket
|
||||||
|
import subprocess
|
||||||
|
import tempfile
|
||||||
|
import time
|
||||||
|
from pathlib import Path
|
||||||
|
|
||||||
|
|
||||||
|
def main():
|
||||||
|
parser = argparse.ArgumentParser()
|
||||||
|
parser.add_argument('--mysql-bin', required=True, type=Path)
|
||||||
|
parser.add_argument('--core', required=True, type=Path)
|
||||||
|
parser.add_argument('--before', required=True)
|
||||||
|
parser.add_argument('--display-repair', type=Path)
|
||||||
|
args = parser.parse_args()
|
||||||
|
suffix = '.exe' if (args.mysql_bin / 'mysqld.exe').exists() else ''
|
||||||
|
server = args.mysql_bin / ('mysqld' + suffix)
|
||||||
|
client = args.mysql_bin / ('mysql' + suffix)
|
||||||
|
admin = args.mysql_bin / ('mysqladmin' + suffix)
|
||||||
|
relative = 'modules/mod-coa-raid-difficulty/data/sql/db-world/base/03_boss_schedule.sql'
|
||||||
|
original = subprocess.check_output(['git', '-C', str(args.core), 'show', args.before + ':' + relative], text=True)
|
||||||
|
current = (args.core / relative).read_text()
|
||||||
|
split = (args.core / 'data/sql/updates/pending_db_world/rev_20261001_g1_molten_core_shazzrah_nova_area.sql').read_text()
|
||||||
|
with tempfile.TemporaryDirectory(prefix='coa-module-sql-fixture-') as temp:
|
||||||
|
data = Path(temp) / 'data'
|
||||||
|
flags = subprocess.CREATE_NO_WINDOW if hasattr(subprocess, 'CREATE_NO_WINDOW') else 0
|
||||||
|
subprocess.run([str(server), '--no-defaults', '--initialize-insecure', '--datadir=' + str(data)],
|
||||||
|
check=True, capture_output=True, creationflags=flags)
|
||||||
|
with socket.socket() as sock:
|
||||||
|
sock.bind(('127.0.0.1', 0))
|
||||||
|
port = sock.getsockname()[1]
|
||||||
|
process = subprocess.Popen([str(server), '--no-defaults', '--datadir=' + str(data),
|
||||||
|
'--bind-address=127.0.0.1', '--port=' + str(port), '--mysqlx=0',
|
||||||
|
'--skip-log-bin', '--log-error=' + str(Path(temp) / 'mysql.log')],
|
||||||
|
creationflags=flags, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
|
||||||
|
connection = ['--no-defaults', '--protocol=TCP', '--host=127.0.0.1', '--port=' + str(port), '--user=root']
|
||||||
|
|
||||||
|
def sql(statement, schema=None, check=True):
|
||||||
|
result = subprocess.run([str(client), *connection, '--batch', '--skip-column-names', *([schema] if schema else [])],
|
||||||
|
input=statement, text=True, capture_output=True, creationflags=flags)
|
||||||
|
if check and result.returncode:
|
||||||
|
raise RuntimeError(result.stderr)
|
||||||
|
return result
|
||||||
|
|
||||||
|
try:
|
||||||
|
deadline = time.monotonic() + 60
|
||||||
|
while sql('SELECT 1;', check=False).returncode:
|
||||||
|
if process.poll() is not None or time.monotonic() > deadline:
|
||||||
|
raise RuntimeError('Disposable MySQL did not start: ' + (Path(temp) / 'mysql.log').read_text())
|
||||||
|
time.sleep(0.5)
|
||||||
|
regex = sql("SELECT REGEXP_LIKE(CONVERT(0xD0AF USING utf8mb4), '^[[:alpha:]]$'), REGEXP_REPLACE('abc123', '[0-9]+', '');").stdout.strip()
|
||||||
|
assert regex == '1\tabc', regex
|
||||||
|
print('PASS: packaged MySQL starts on fresh data and supports Unicode regular expressions')
|
||||||
|
for schema in ('fresh', 'old', 'upgraded'):
|
||||||
|
sql('CREATE DATABASE `' + schema + '`;')
|
||||||
|
sql('CREATE TABLE creature_template (entry INT PRIMARY KEY, ScriptName VARCHAR(128));', schema)
|
||||||
|
sql(original, 'old')
|
||||||
|
sql('CREATE TABLE coa_spell_damage_info (spell_id INT); CREATE TABLE spell_script_names (spell_id INT, ScriptName VARCHAR(128));', 'old')
|
||||||
|
sql(split, 'old')
|
||||||
|
broken = sql(original, 'old', check=False)
|
||||||
|
assert broken.returncode and '1136' in broken.stderr, broken.stderr
|
||||||
|
sql(current, 'fresh')
|
||||||
|
sql(current, 'fresh')
|
||||||
|
sql(original, 'upgraded')
|
||||||
|
sql(current, 'upgraded')
|
||||||
|
for schema in ('fresh', 'upgraded'):
|
||||||
|
count = sql("SELECT COUNT(*) FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='coa_boss_schedule';", schema).stdout.strip()
|
||||||
|
assert count == '15', count
|
||||||
|
effects = sql('SELECT effect_d0,effect_d1,effect_d2,effect_d3 FROM coa_boss_schedule WHERE entry=12264 AND idx=6;', schema).stdout.strip()
|
||||||
|
assert effects == '2105613\t2105614\t2105615\t2105616', effects
|
||||||
|
print('PASS: original SQL reproduces ERROR 1136 after migration; fixed SQL supports fresh, repeated and old-layout initialization')
|
||||||
|
if args.display_repair:
|
||||||
|
repair = args.display_repair.read_text()
|
||||||
|
sql('CREATE DATABASE display_fixture;')
|
||||||
|
sql(repair, 'display_fixture') # An absent table is not created by a default repair.
|
||||||
|
sql('CREATE TABLE creature_display_preset (entry INT UNSIGNED NOT NULL, display_id INT UNSIGNED NOT NULL, PRIMARY KEY(entry,display_id)); INSERT INTO creature_display_preset VALUES(42,123);', 'display_fixture')
|
||||||
|
before_rows = sql('SELECT * FROM creature_display_preset;', 'display_fixture').stdout
|
||||||
|
sql(repair, 'display_fixture')
|
||||||
|
sql(repair, 'display_fixture')
|
||||||
|
default = sql("SELECT COLUMN_DEFAULT FROM information_schema.COLUMNS WHERE TABLE_SCHEMA=DATABASE() AND TABLE_NAME='creature_display_preset' AND COLUMN_NAME='display_id';", 'display_fixture').stdout.strip()
|
||||||
|
assert default == '0', default
|
||||||
|
assert sql('SELECT * FROM creature_display_preset;', 'display_fixture').stdout == before_rows
|
||||||
|
sql('ALTER TABLE creature_display_preset ALTER COLUMN display_id SET DEFAULT 99;', 'display_fixture')
|
||||||
|
sql(repair, 'display_fixture')
|
||||||
|
assert sql("SELECT COLUMN_DEFAULT FROM information_schema.COLUMNS WHERE TABLE_SCHEMA=DATABASE() AND TABLE_NAME='creature_display_preset' AND COLUMN_NAME='display_id';", 'display_fixture').stdout.strip() == '99'
|
||||||
|
print('PASS: display default repair is repeatable, keeps rows and custom defaults, and tolerates absent tables')
|
||||||
|
finally:
|
||||||
|
subprocess.run([str(admin), *connection, 'shutdown'], capture_output=True, creationflags=flags)
|
||||||
|
try:
|
||||||
|
process.wait(timeout=15)
|
||||||
|
except subprocess.TimeoutExpired:
|
||||||
|
process.kill()
|
||||||
|
process.wait()
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == '__main__':
|
||||||
|
main()
|
||||||
Reference in new issue
Block a user