mirror of
https://github.com/Corfirean/coa-server-manager.git
synced 2026-11-18 19:25:56 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
94d4ade1c7 | ||
|
|
376f1dbb46 | ||
|
|
b0951dbee7 |
No files matched your search
Generated
+3
-3
@@ -491,7 +491,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "coa-core"
|
||||
version = "0.6.9"
|
||||
version = "0.6.12"
|
||||
dependencies = [
|
||||
"base64 0.22.1",
|
||||
"chrono",
|
||||
@@ -520,7 +520,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "coa-release"
|
||||
version = "0.6.9"
|
||||
version = "0.6.12"
|
||||
dependencies = [
|
||||
"chrono",
|
||||
"coa-core",
|
||||
@@ -529,7 +529,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "coa-server-manager"
|
||||
version = "0.6.9"
|
||||
version = "0.6.12"
|
||||
dependencies = [
|
||||
"coa-core",
|
||||
"serde",
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@ resolver = "2"
|
||||
members = ["crates/coa-core", "crates/coa-release", "src-tauri"]
|
||||
|
||||
[workspace.package]
|
||||
version = "0.6.9"
|
||||
version = "0.6.12"
|
||||
edition = "2021"
|
||||
license = "AGPL-3.0-only"
|
||||
|
||||
|
||||
@@ -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: 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: 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.
|
||||
@@ -31,6 +31,7 @@ fn hidden(key: &str) -> bool {
|
||||
k.contains("password")
|
||||
|| k.contains("databaseinfo")
|
||||
|| k.ends_with("port")
|
||||
|| k == "console.enable"
|
||||
|| k.starts_with("ra.")
|
||||
|| k.starts_with("logger.")
|
||||
|| k.starts_with("appender.")
|
||||
@@ -229,7 +230,7 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
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}");
|
||||
}
|
||||
for k in ["Rate.XP.Kill", "PlayerLimit", "SupportEnabled", "Instance.ResetTimeHour", "Warden.Enabled", "CharacterCreating.Disabled"] {
|
||||
|
||||
@@ -14,19 +14,20 @@ 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.4-main-20261007-b46a130e.zip",
|
||||
"https://github.com/ilusixn/azerothcore-wotlk-coa/releases/download/coa-custom-1.4/CoA-Custom-1.4-main-20261007-b46a130e.zip",
|
||||
"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.4-client-part1.zip",
|
||||
"https://github.com/ilusixn/azerothcore-wotlk-coa/releases/download/coa-custom-1.4/CoA-Custom-1.4-client-part1.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.4-client-part2.zip",
|
||||
"https://github.com/ilusixn/azerothcore-wotlk-coa/releases/download/coa-custom-1.4/CoA-Custom-1.4-client-part2.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",
|
||||
),
|
||||
];
|
||||
|
||||
@@ -47,6 +48,10 @@ pub const RACE_MPQS: &[&str] = &[
|
||||
"patch-ZHM.MPQ",
|
||||
"patch-ZM.MPQ",
|
||||
"patch-ZVU.MPQ",
|
||||
"patch-ZES.MPQ",
|
||||
"patch-ZJ.MPQ",
|
||||
"patch-ZZE.MPQ",
|
||||
"patch-ZZR.MPQ",
|
||||
];
|
||||
|
||||
#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
|
||||
@@ -87,9 +92,11 @@ pub fn client_patch_status(client_path: &Path) -> ClientPatchStatus {
|
||||
|| client_path.join("dinput8.dll.disabled").is_file();
|
||||
|
||||
let total = RACE_MPQS.len();
|
||||
let state = if enabled_count == total && client_path.join("dinput8.dll").is_file() {
|
||||
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 && client_path.join("dinput8.dll.disabled").is_file() {
|
||||
} 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
|
||||
@@ -121,6 +128,18 @@ pub fn set_client_patch_enabled(client_path: &Path, enabled: bool) -> Result<()>
|
||||
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 {
|
||||
@@ -151,9 +170,9 @@ pub fn set_client_patch_enabled(client_path: &Path, enabled: bool) -> Result<()>
|
||||
|
||||
fn verify_archive(path: &Path, filename: &str) -> Result<()> {
|
||||
let expected = match filename {
|
||||
"CoA-Custom-1.4-main-20261007-b46a130e.zip" => "eaf934b5283476aa7b5d6eca7200ceae016e866ddbdab726bd47f39739c9c802",
|
||||
"CoA-Custom-1.4-client-part1.zip" => "669f8396e82f396125e0be2070b2bad782f0104c695939a88924ec97f4fc4d21",
|
||||
"CoA-Custom-1.4-client-part2.zip" => "088b3ddcf292abccbc84453c0ccf4cd74ff6b20c848d5902dc83854553aecc8b",
|
||||
"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 {
|
||||
@@ -368,11 +387,15 @@ pub fn install_client_patches(
|
||||
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/") {
|
||||
@@ -385,12 +408,18 @@ pub fn install_client_patches(
|
||||
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);
|
||||
@@ -399,7 +428,7 @@ pub fn install_client_patches(
|
||||
installed_roots.sort();
|
||||
installed_roots.dedup();
|
||||
|
||||
let mut manifest_body = String::from("# Custom Race MPQ files\n");
|
||||
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"));
|
||||
}
|
||||
@@ -442,6 +471,16 @@ mod tests {
|
||||
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();
|
||||
@@ -469,6 +508,7 @@ mod tests {
|
||||
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();
|
||||
|
||||
@@ -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 crate::docker::is_docker(&root) {
|
||||
prepare_headless_world(&root, verb)?;
|
||||
return crate::docker::run(&root, verb);
|
||||
}
|
||||
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)?; }
|
||||
let (python, script) = launcher(&root)?;
|
||||
prepare_headless_world(&root, verb)?;
|
||||
let original = std::fs::read_to_string(&script)?;
|
||||
let patched = patch_launcher_imports(&original)?;
|
||||
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 })
|
||||
}
|
||||
|
||||
/// 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
|
||||
/// 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
|
||||
@@ -264,6 +287,55 @@ pub(crate) fn startup_failure(root: &Path, started: &DriverOutcome) -> String {
|
||||
mod tests {
|
||||
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]
|
||||
fn large_squid_provisioning_has_time_to_finish_without_extending_shutdown() {
|
||||
let folder = tempfile::tempdir().unwrap();
|
||||
|
||||
Generated
+2
-2
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "coa-server-manager",
|
||||
"version": "0.6.9",
|
||||
"version": "0.6.12",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "coa-server-manager",
|
||||
"version": "0.6.9",
|
||||
"version": "0.6.12",
|
||||
"dependencies": {
|
||||
"@tauri-apps/api": "^2.12.0",
|
||||
"@tauri-apps/plugin-dialog": "^2.8.0",
|
||||
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "coa-server-manager",
|
||||
"private": true,
|
||||
"version": "0.6.9",
|
||||
"version": "0.6.12",
|
||||
"license": "AGPL-3.0-only",
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"$schema": "https://schema.tauri.app/config/2",
|
||||
"productName": "CoA Server Manager",
|
||||
"version": "0.6.9",
|
||||
"version": "0.6.12",
|
||||
"identifier": "com.coa.servermanager",
|
||||
"build": {
|
||||
"beforeDevCommand": "npm run dev",
|
||||
|
||||
@@ -261,7 +261,7 @@ export function ModulesPage({ serverId, onChanged, onRegisterGuard }: { serverId
|
||||
onClick={() => void installClientPatch()}
|
||||
>
|
||||
{racesInstalling && <Loader2 className="mr-1.5 h-3.5 w-3.5 animate-spin" />}
|
||||
{locale === "ru" ? "Установить патч клиента" : "Install Client Patch"}
|
||||
{locale === "ru" ? "Установить патч клиента" : "Install Client Patch 1.5"}
|
||||
</Button>
|
||||
)}
|
||||
</div>
|
||||
|
||||
@@ -243,6 +243,24 @@ export function SettingsPage(props: {
|
||||
});
|
||||
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) {
|
||||
return (
|
||||
<div className="max-w-xl">
|
||||
@@ -354,24 +372,6 @@ export function SettingsPage(props: {
|
||||
}
|
||||
}
|
||||
|
||||
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]);
|
||||
|
||||
async function openPreset(id: string) {
|
||||
setSaved(null);
|
||||
if (squid) {
|
||||
|
||||
Reference in new issue
Block a user