mirror of
https://github.com/Corfirean/coa-server-manager.git
synced 2026-11-20 03:25:56 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
376f1dbb46 | ||
|
|
b0951dbee7 |
No files matched your search
Generated
+3
-3
@@ -491,7 +491,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "coa-core"
|
name = "coa-core"
|
||||||
version = "0.6.9"
|
version = "0.6.11"
|
||||||
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.9"
|
version = "0.6.11"
|
||||||
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.9"
|
version = "0.6.11"
|
||||||
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.9"
|
version = "0.6.11"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
license = "AGPL-3.0-only"
|
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: 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.
|
||||||
@@ -14,19 +14,20 @@ use crate::download::Cancel;
|
|||||||
use crate::error::{Error, Result};
|
use crate::error::{Error, Result};
|
||||||
use crate::fsx;
|
use crate::fsx;
|
||||||
|
|
||||||
|
pub const CLIENT_VERSION: &str = "1.5";
|
||||||
pub const MANIFEST_FILENAME: &str = "custom_races_patch_manifest.txt";
|
pub const MANIFEST_FILENAME: &str = "custom_races_patch_manifest.txt";
|
||||||
pub const ARCHIVES: &[(&str, &str)] = &[
|
pub const ARCHIVES: &[(&str, &str)] = &[
|
||||||
(
|
(
|
||||||
"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.4/CoA-Custom-1.4-main-20261007-b46a130e.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",
|
"CoA-Custom-1.5-client-part1.zip",
|
||||||
"https://github.com/ilusixn/azerothcore-wotlk-coa/releases/download/coa-custom-1.4/CoA-Custom-1.4-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",
|
"CoA-Custom-1.5-client-part2.zip",
|
||||||
"https://github.com/ilusixn/azerothcore-wotlk-coa/releases/download/coa-custom-1.4/CoA-Custom-1.4-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-ZHM.MPQ",
|
||||||
"patch-ZM.MPQ",
|
"patch-ZM.MPQ",
|
||||||
"patch-ZVU.MPQ",
|
"patch-ZVU.MPQ",
|
||||||
|
"patch-ZES.MPQ",
|
||||||
|
"patch-ZJ.MPQ",
|
||||||
|
"patch-ZZE.MPQ",
|
||||||
|
"patch-ZZR.MPQ",
|
||||||
];
|
];
|
||||||
|
|
||||||
#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
|
#[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();
|
|| client_path.join("dinput8.dll.disabled").is_file();
|
||||||
|
|
||||||
let total = RACE_MPQS.len();
|
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
|
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
|
ClientPatchState::Disabled
|
||||||
} else if (enabled_count + disabled_count) > 0 {
|
} else if (enabled_count + disabled_count) > 0 {
|
||||||
ClientPatchState::PartiallyInstalled
|
ClientPatchState::PartiallyInstalled
|
||||||
@@ -121,6 +128,18 @@ pub fn set_client_patch_enabled(client_path: &Path, enabled: bool) -> Result<()>
|
|||||||
return Ok(());
|
return Ok(());
|
||||||
}
|
}
|
||||||
let mut paths: Vec<PathBuf> = RACE_MPQS.iter().map(|name| client_path.join("Data").join(name)).collect();
|
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("dinput8.dll"));
|
||||||
paths.push(client_path.join("Ascension.exe"));
|
paths.push(client_path.join("Ascension.exe"));
|
||||||
for active in paths {
|
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<()> {
|
fn verify_archive(path: &Path, filename: &str) -> Result<()> {
|
||||||
let expected = match filename {
|
let expected = match filename {
|
||||||
"CoA-Custom-1.4-main-20261007-b46a130e.zip" => "eaf934b5283476aa7b5d6eca7200ceae016e866ddbdab726bd47f39739c9c802",
|
"CoA-Custom-1.5-main-20261009-cb2a0ca4.zip" => "117f5d99add18191676be6648fb0f2e99019a06c18705c71454e371e7df2afd2",
|
||||||
"CoA-Custom-1.4-client-part1.zip" => "669f8396e82f396125e0be2070b2bad782f0104c695939a88924ec97f4fc4d21",
|
"CoA-Custom-1.5-client-part1.zip" => "19eb372805b3268653914da03377d67f056e5b50d818a8a06a5f260aad03211e",
|
||||||
"CoA-Custom-1.4-client-part2.zip" => "088b3ddcf292abccbc84453c0ccf4cd74ff6b20c848d5902dc83854553aecc8b",
|
"CoA-Custom-1.5-client-part2.zip" => "122f2882da255913e01610e33c6446ded897fecbe60b6d5ee026149becf8f278",
|
||||||
_ => return Err(Error::Invalid("Unknown custom races archive.".into())),
|
_ => return Err(Error::Invalid("Unknown custom races archive.".into())),
|
||||||
};
|
};
|
||||||
if fsx::sha256_file(path)? != expected {
|
if fsx::sha256_file(path)? != expected {
|
||||||
@@ -368,11 +387,15 @@ pub fn install_client_patches(
|
|||||||
let dest = data_dir.join(&base);
|
let dest = data_dir.join(&base);
|
||||||
let mut out = File::create(&dest)?;
|
let mut out = File::create(&dest)?;
|
||||||
io::copy(&mut zfile, &mut out)?;
|
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);
|
installed_mpqs.push(base);
|
||||||
} else if base.eq_ignore_ascii_case("dinput8.dll") {
|
} else if base.eq_ignore_ascii_case("dinput8.dll") {
|
||||||
let dest = client_path.join(&base);
|
let dest = client_path.join(&base);
|
||||||
let mut out = File::create(&dest)?;
|
let mut out = File::create(&dest)?;
|
||||||
io::copy(&mut zfile, &mut out)?;
|
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);
|
installed_roots.push(base);
|
||||||
}
|
}
|
||||||
} else if zname_norm.contains("files/client_root/") {
|
} else if zname_norm.contains("files/client_root/") {
|
||||||
@@ -385,12 +408,18 @@ pub fn install_client_patches(
|
|||||||
let dest = client_path.join(&base);
|
let dest = client_path.join(&base);
|
||||||
let mut out = File::create(&dest)?;
|
let mut out = File::create(&dest)?;
|
||||||
io::copy(&mut zfile, &mut out)?;
|
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);
|
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
|
// 4. Record manifest
|
||||||
report("Finalizing manifest...", 0.98);
|
report("Finalizing manifest...", 0.98);
|
||||||
let manifest_path = client_path.join(MANIFEST_FILENAME);
|
let manifest_path = client_path.join(MANIFEST_FILENAME);
|
||||||
@@ -399,7 +428,7 @@ pub fn install_client_patches(
|
|||||||
installed_roots.sort();
|
installed_roots.sort();
|
||||||
installed_roots.dedup();
|
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 {
|
for m in &installed_mpqs {
|
||||||
manifest_body.push_str(&format!("MPQ:{m}\n"));
|
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");
|
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]
|
#[test]
|
||||||
fn an_unpatched_client_is_left_untouched() {
|
fn an_unpatched_client_is_left_untouched() {
|
||||||
let temp = tempfile::tempdir().unwrap();
|
let temp = tempfile::tempdir().unwrap();
|
||||||
@@ -469,6 +508,7 @@ mod tests {
|
|||||||
let st = client_patch_status(client_path);
|
let st = client_patch_status(client_path);
|
||||||
assert_eq!(st.state, ClientPatchState::NotInstalled);
|
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
|
// 2. Create MPQs and root files
|
||||||
for mpq in RACE_MPQS {
|
for mpq in RACE_MPQS {
|
||||||
fs::write(data_dir.join(mpq), b"test mpq content").unwrap();
|
fs::write(data_dir.join(mpq), b"test mpq content").unwrap();
|
||||||
|
|||||||
Generated
+2
-2
@@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "coa-server-manager",
|
"name": "coa-server-manager",
|
||||||
"version": "0.6.9",
|
"version": "0.6.11",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "coa-server-manager",
|
"name": "coa-server-manager",
|
||||||
"version": "0.6.9",
|
"version": "0.6.11",
|
||||||
"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.9",
|
"version": "0.6.11",
|
||||||
"license": "AGPL-3.0-only",
|
"license": "AGPL-3.0-only",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|||||||
@@ -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.9",
|
"version": "0.6.11",
|
||||||
"identifier": "com.coa.servermanager",
|
"identifier": "com.coa.servermanager",
|
||||||
"build": {
|
"build": {
|
||||||
"beforeDevCommand": "npm run dev",
|
"beforeDevCommand": "npm run dev",
|
||||||
|
|||||||
@@ -261,7 +261,7 @@ export function ModulesPage({ serverId, onChanged, onRegisterGuard }: { serverId
|
|||||||
onClick={() => void installClientPatch()}
|
onClick={() => void installClientPatch()}
|
||||||
>
|
>
|
||||||
{racesInstalling && <Loader2 className="mr-1.5 h-3.5 w-3.5 animate-spin" />}
|
{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>
|
</Button>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -243,6 +243,24 @@ export function SettingsPage(props: {
|
|||||||
});
|
});
|
||||||
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">
|
||||||
@@ -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) {
|
async function openPreset(id: string) {
|
||||||
setSaved(null);
|
setSaved(null);
|
||||||
if (squid) {
|
if (squid) {
|
||||||
|
|||||||
Reference in new issue
Block a user