mirror of
https://github.com/Corfirean/coa-server-manager.git
synced 2026-11-19 11:25:56 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6c771fae20 | ||
|
|
cfe0889a4f | ||
|
|
07ec22798f | ||
|
|
5d865fcaea | ||
|
|
a67d51804b | ||
|
|
7c096a4844 | ||
|
|
b90b377fc3 | ||
|
|
a02130f587 | ||
|
|
f4e36f21eb | ||
|
|
65c9945626 | ||
|
|
f13398bbd7 | ||
|
|
f05f94ba01 | ||
|
|
c39a7a0ac7 | ||
|
|
e8367354ef | ||
|
|
461fa035d0 | ||
|
|
3edc600f97 | ||
|
|
c3d87e1ff2 | ||
|
|
d2496603e7 | ||
|
|
2eea0e117c | ||
|
|
58b5ddeb07 |
No files matched your search
Generated
+3
-3
@@ -491,7 +491,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "coa-core"
|
name = "coa-core"
|
||||||
version = "0.6.1"
|
version = "0.6.4"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"base64 0.22.1",
|
"base64 0.22.1",
|
||||||
"chrono",
|
"chrono",
|
||||||
@@ -519,7 +519,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "coa-release"
|
name = "coa-release"
|
||||||
version = "0.6.1"
|
version = "0.6.4"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"chrono",
|
"chrono",
|
||||||
"coa-core",
|
"coa-core",
|
||||||
@@ -528,7 +528,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "coa-server-manager"
|
name = "coa-server-manager"
|
||||||
version = "0.6.1"
|
version = "0.6.4"
|
||||||
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.1"
|
version = "0.6.4"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
license = "AGPL-3.0-only"
|
license = "AGPL-3.0-only"
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: added
|
||||||
|
audience: admins
|
||||||
|
title: Choose which item types the auction bot sells
|
||||||
|
---
|
||||||
|
Switch 15 item categories on or off and adjust listing frequency by quality. Labels and descriptions are translated into all six languages. Changes affect new listings; existing auctions remain.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: changed
|
||||||
|
audience: admins
|
||||||
|
title: Module settings now offer translated controls and an enemy damage slider
|
||||||
|
---
|
||||||
|
Configure scaling, auctions and enchantments with translated controls. Module switches no longer appear twice. Modules without settings hide their settings button; short lists need no search. New server builds support dungeon and raid damage from 25% to 200%.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: fixed
|
||||||
|
audience: admins
|
||||||
|
title: Failed server updates restore databases and files together
|
||||||
|
---
|
||||||
|
Updates save a full backup and recover databases and files together. Interrupted SQL is not replayed. Checks cover Wildcard tables and every supported race/class pair, including existing characters. Unfinished updates block startup until recovered.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: added
|
||||||
|
audience: admins
|
||||||
|
title: Configure partial dungeon parties and open-world life steal in module settings
|
||||||
|
---
|
||||||
|
Choose whether Dungeon Finder enters with the current party and enable open-world life steal with a healing percentage from 0 to 100. Available on server builds that support these options.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: added
|
||||||
|
audience: admins
|
||||||
|
title: Configure SQUID Playerbots and prevent conflicting bot systems
|
||||||
|
---
|
||||||
|
The Bots tab shows translated settings for the active bot system. Bot module cards keep enable switches without duplicate settings. Enable one bot system at a time; the Manager checks manual config changes before starting the server. Recovery points also include the SQUID database when installed.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: added
|
||||||
|
audience: players
|
||||||
|
title: Download and update the game client without installing a server
|
||||||
|
---
|
||||||
|
Choose to host a server or connect to someone else's. Players joining a friend can download, update and launch the client, save the host's address and use the Manager without installing a local server.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: added
|
||||||
|
audience: players
|
||||||
|
title: Start your installed server or client without downloading an available update
|
||||||
|
---
|
||||||
|
Choose to update later and keep playing with your installed version. Interrupted server updates still require recovery before startup.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: fixed
|
||||||
|
audience: admins
|
||||||
|
title: Finish a server update that was blocked by a startup failure
|
||||||
|
---
|
||||||
|
The Manager repairs the launcher import path and lets you retry startup for an already applied update. Successful validation finishes the update without replaying SQL or restoring old databases. Failure details are preserved and rollback remains available.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: fixed
|
||||||
|
audience: admins
|
||||||
|
title: Server packages must include a complete database schema check
|
||||||
|
---
|
||||||
|
Release tools generate the expected database structure on an isolated copy of the signed base, verify all archive files and refuse packages without the schema check. Corrective SQL can restore missing Wildcard tables without replaying old updates.
|
||||||
@@ -24,9 +24,9 @@ num-bigint = "0.4"
|
|||||||
zip = { version = "2", default-features = false, features = ["deflate"] }
|
zip = { version = "2", default-features = false, features = ["deflate"] }
|
||||||
sha1 = "0.10"
|
sha1 = "0.10"
|
||||||
tracing-subscriber = { version = "0.3", default-features = false, features = ["fmt", "std"] }
|
tracing-subscriber = { version = "0.3", default-features = false, features = ["fmt", "std"] }
|
||||||
|
tempfile = "3"
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
tempfile = "3"
|
|
||||||
rand_core = { version = "0.6", features = ["getrandom"] }
|
rand_core = { version = "0.6", features = ["getrandom"] }
|
||||||
ed25519-dalek = { version = "2", features = ["rand_core"] }
|
ed25519-dalek = { version = "2", features = ["rand_core"] }
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,73 @@
|
|||||||
|
//! Failure injection on a NEW disposable fixture created by tools/make-fixture.ps1.
|
||||||
|
//! Uses real MySQL dumps, SQL execution, signed packages and update rollback.
|
||||||
|
use std::{collections::BTreeMap, path::{Path, PathBuf}};
|
||||||
|
use coa_core::{backup, db::{Account, Db}, download::Cancel, driver::{self, Verb}, fsx,
|
||||||
|
manifest::{Kind, Migration}, package::{self, BuildOptions}, pkgsource::Source,
|
||||||
|
registry::{InstallKind, InstallMeta, MetaDir},
|
||||||
|
update::{self, Env, RepackEnv}, Error, Result};
|
||||||
|
use base64::Engine;
|
||||||
|
use ed25519_dalek::{Signer, SigningKey};
|
||||||
|
|
||||||
|
fn main() -> Result<()> {
|
||||||
|
let arg = std::env::args().nth(1).expect("usage: update_recovery_e2e <new fixture>");
|
||||||
|
let root = PathBuf::from(arg);
|
||||||
|
assert!(root.file_name().unwrap().to_string_lossy().starts_with("coa-update-recovery-fixture-"));
|
||||||
|
assert!(!root.join("recovery-e2e-started").exists(), "Use a new fixture; never reuse an owned server");
|
||||||
|
fsx::atomic_write(&root.join("recovery-e2e-started"), b"disposable fixture")?;
|
||||||
|
let result = exercise(&root);
|
||||||
|
let stopped = driver::run(&root, Verb::StopAll)?;
|
||||||
|
assert!(stopped.ok);
|
||||||
|
result
|
||||||
|
}
|
||||||
|
|
||||||
|
fn exercise(root: &Path) -> Result<()> {
|
||||||
|
let meta = coa_core::registry::metadata_dir_for(root)?;
|
||||||
|
let mut installed = InstallMeta::new(InstallKind::New, root);
|
||||||
|
installed.core.version = Some("1.0.0".into());
|
||||||
|
MetaDir::create(root, &installed)?;
|
||||||
|
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);")?;
|
||||||
|
Ok(())
|
||||||
|
})?;
|
||||||
|
let source = root.join("fixture-update-source");
|
||||||
|
fsx::atomic_write(&source.join("Core/recovery-probe.txt"), b"updated")?;
|
||||||
|
let mut migrations = Vec::new();
|
||||||
|
for (db, id, sql) in [
|
||||||
|
("characters", "probe_chars", "UPDATE manager_recovery_probe SET id=999;"),
|
||||||
|
("world", "probe_world", "DROP TABLE manager_recovery_probe; THIS IS INTENTIONALLY INVALID SQL;"),
|
||||||
|
] {
|
||||||
|
fsx::atomic_write(&source.join(format!("_migrations/{db}/{id}.sql")), sql.as_bytes())?;
|
||||||
|
migrations.push(Migration { db: db.into(), id: id.into(), sha256: fsx::sha256_bytes(sql.as_bytes()), destructive: false });
|
||||||
|
}
|
||||||
|
let pkg = root.join("fixture-package");
|
||||||
|
let manifest = package::build(&source, &pkg, &BuildOptions {
|
||||||
|
kind: Kind::Update, version: "2.0.0".into(), core_commit: None, bots_commit: None,
|
||||||
|
built_at: "fixture".into(), part_size: 1 << 20, migrations,
|
||||||
|
}, &|_| {})?;
|
||||||
|
let key = SigningKey::generate(&mut rand_core::OsRng);
|
||||||
|
let signature = base64::engine::general_purpose::STANDARD.encode(key.sign(&std::fs::read(pkg.join("manifest.json"))?).to_bytes());
|
||||||
|
fsx::atomic_write(&pkg.join("manifest.json.sig"), signature.as_bytes())?;
|
||||||
|
let trusted = base64::engine::general_purpose::STANDARD.encode(key.verifying_key().to_bytes());
|
||||||
|
let env = RepackEnv { root, meta_dir: &meta };
|
||||||
|
let error = update::apply(&update::Params {
|
||||||
|
root, meta_dir: &meta, source: Source::Dir(pkg), trusted_key: &trusted,
|
||||||
|
cancel: Cancel::default(), resolutions: BTreeMap::new(), env: &env, fail_after_ops: None,
|
||||||
|
}, &|step, pct| println!("{pct}% {step}" )).unwrap_err();
|
||||||
|
assert!(error.to_string().contains("probe_world"), "{error}");
|
||||||
|
assert!(error.to_string().contains("were restored"), "{error}");
|
||||||
|
assert!(!root.join("Core/recovery-probe.txt").exists());
|
||||||
|
assert!(update::unfinished(&meta).is_none());
|
||||||
|
assert_eq!(MetaDir::open(&meta)?.1.core.version.as_deref(), Some("1.0.0"));
|
||||||
|
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_world.manager_recovery_probe;")?, "43");
|
||||||
|
assert!(!coa_core::migrations::status(db, &manifest.migrations)?.iter().any(|m| m.status == coa_core::migrations::Status::Applied));
|
||||||
|
Ok(())
|
||||||
|
})?;
|
||||||
|
// A recovery point can be reused if the process died midway through restoring multiple schemas.
|
||||||
|
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)?;
|
||||||
|
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");
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
use coa_core::update::{Env, RepackEnv};
|
||||||
|
use std::path::PathBuf;
|
||||||
|
|
||||||
|
fn main() {
|
||||||
|
let root = PathBuf::from(std::env::args().nth(1).expect("disposable fixture path"));
|
||||||
|
assert_eq!(std::fs::read(root.join(".release-schema-fixture")).unwrap(), b"disposable release-schema fixture");
|
||||||
|
let meta = coa_core::registry::metadata_dir_for(&root).unwrap();
|
||||||
|
let env = RepackEnv { root: &root, meta_dir: &meta };
|
||||||
|
let result = env.validate();
|
||||||
|
let _ = coa_core::driver::run(&root, coa_core::driver::Verb::StopAll);
|
||||||
|
if let Err(error) = result {
|
||||||
|
eprintln!("{}", error);
|
||||||
|
for log in ["Core/Logs/auth-console.log", "Core/Logs/world-console.log", "Core/Logs/supervisor.log"] {
|
||||||
|
eprintln!("{log}:\n{}", coa_core::diag::redact(&coa_core::health::tail(&root.join(log), 8192)));
|
||||||
|
}
|
||||||
|
std::process::exit(1);
|
||||||
|
}
|
||||||
|
println!("Published server startup validation passed on the disposable fixture");
|
||||||
|
}
|
||||||
@@ -0,0 +1,58 @@
|
|||||||
|
//! Reproduce applied migration history with five missing tables on a disposable MySQL fixture.
|
||||||
|
use std::path::PathBuf;
|
||||||
|
use coa_core::{backup, fsx, manifest::Migration, migrations::{self, LedgerRow, Status, Store}, release_schema, schema_check, Error, Result};
|
||||||
|
|
||||||
|
fn main() -> Result<()> {
|
||||||
|
let mut args = std::env::args().skip(1);
|
||||||
|
let root = PathBuf::from(args.next().ok_or_else(|| Error::Invalid("fixture path required".into()))?);
|
||||||
|
let old_sql = PathBuf::from(args.next().ok_or_else(|| Error::Invalid("core SQL directory required".into()))?);
|
||||||
|
let repairs = PathBuf::from(args.next().ok_or_else(|| Error::Invalid("repair SQL directory required".into()))?);
|
||||||
|
if !root.file_name().is_some_and(|n| n.to_string_lossy().starts_with("coa-update-recovery-fixture-"))
|
||||||
|
|| !root.join("recovery-e2e-started").exists() {
|
||||||
|
return Err(Error::Invalid("Refusing a non-disposable recovery fixture.".into()));
|
||||||
|
}
|
||||||
|
let tree = tempfile::tempdir()?;
|
||||||
|
backup::with_database(&root, |db| {
|
||||||
|
let db = db.clone().for_realm(coa_core::realms::Mode::Coa);
|
||||||
|
let characters = db.query("SELECT COUNT(*) FROM acore_characters.characters;")?;
|
||||||
|
db.load()?;
|
||||||
|
// Record exactly the old file hashes, as in the user's all-applied report.
|
||||||
|
let mut migrations = Vec::new();
|
||||||
|
for name in ["rev_20260929_92_coa_wildcard_skill_cards", "rev_20260929_93_coa_wildcard_skill_card_duplicates", "rev_20260929_94_coa_wildcard_specialization_cache"] {
|
||||||
|
let path = old_sql.join(format!("{name}.sql"));
|
||||||
|
let hash = fsx::sha256_file(&path)?;
|
||||||
|
db.put(&LedgerRow { db: "characters".into(), id: name.into(), sha256: hash.clone(), status: Status::Applied, error: None, baseline: false })?;
|
||||||
|
migrations.push(Migration { db: "characters".into(), id: name.into(), sha256: hash, destructive: false });
|
||||||
|
}
|
||||||
|
for (_, tables) in schema_check::WILDCARD_TABLES.iter().filter(|(kind,_)| *kind == "characters") {
|
||||||
|
for table in *tables { db.query(&format!("DROP TABLE IF EXISTS acore_characters.`{table}`;"))?; }
|
||||||
|
}
|
||||||
|
assert!(migrations::status(&db, &migrations)?.iter().all(|m| m.status == Status::Applied));
|
||||||
|
assert!(!db.tables("acore_characters")?.iter().any(|t| t == "coa_wildcard_skill_card"));
|
||||||
|
let empty_core = tempfile::tempdir()?;
|
||||||
|
let files = release_schema::collect(empty_core.path(), None, Some(&repairs))?;
|
||||||
|
assert_eq!(files.len(), 1);
|
||||||
|
let repair = &files[0];
|
||||||
|
migrations.push(Migration { db: repair.db.clone(), id: repair.id.clone(), sha256: repair.sha256.clone(), destructive: false });
|
||||||
|
let staged = tree.path().join("sql/characters");
|
||||||
|
fsx::atomic_write(&staged.join(format!("{}.sql", repair.id)), &std::fs::read(&repair.abs)?)?;
|
||||||
|
let report = migrations::apply_pending(&db, &migrations, &tree.path().join("sql"), &|| Ok("disposable fixture".into()))?;
|
||||||
|
assert!(report.failed.is_none());
|
||||||
|
assert_eq!(report.applied, [repair.id.clone()]);
|
||||||
|
assert_eq!(db.query("SELECT COUNT(*) FROM acore_characters.characters;")?, characters);
|
||||||
|
db.query("INSERT INTO acore_characters.coa_wildcard_skill_card VALUES (77,123,456);")?;
|
||||||
|
db.run_sql_file("acore_characters", &repair.abs)?;
|
||||||
|
assert_eq!(db.query("SELECT progress FROM acore_characters.coa_wildcard_skill_card WHERE account=77 AND card=123;")?, "456");
|
||||||
|
assert!(migrations::apply_pending(&db, &migrations, &tree.path().join("sql"), &|| Ok("disposable fixture".into()))?.applied.is_empty());
|
||||||
|
schema_check::capture(&db, tree.path())?;
|
||||||
|
db.query("DROP TABLE acore_characters.coa_wildcard_skill_card_purchase;")?;
|
||||||
|
assert!(schema_check::check(&db, tree.path())?.iter().any(|p| p.table == "coa_wildcard_skill_card_purchase" && p.detail == "Missing table"));
|
||||||
|
db.run_sql_file("acore_characters", &repair.abs)?;
|
||||||
|
db.query("ALTER TABLE acore_characters.coa_wildcard_skill_card DROP COLUMN progress;")?;
|
||||||
|
assert!(schema_check::check(&db, tree.path())?.iter().any(|p| p.table == "coa_wildcard_skill_card" && p.column == "progress"));
|
||||||
|
db.query("ALTER TABLE acore_characters.coa_wildcard_skill_card ADD COLUMN progress INT UNSIGNED NOT NULL DEFAULT 0;")?;
|
||||||
|
Ok(())
|
||||||
|
})?;
|
||||||
|
println!("Applied history with all five tables missing repaired; characters and existing card rows preserved; full contract detects missing tables and columns.");
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
@@ -179,7 +179,7 @@ fn wanted_databases(kind: Kind) -> &'static [&'static str] {
|
|||||||
|
|
||||||
/// Create a recovery point. The server may be running: dumps are consistent snapshots (`--single-transaction`).
|
/// Create a recovery point. The server may be running: dumps are consistent snapshots (`--single-transaction`).
|
||||||
pub fn create(root: &Path, meta: &Path, kind: Kind, trigger: Trigger, label: Option<String>, progress: &dyn Fn(&str)) -> Result<RecoveryPoint> {
|
pub fn create(root: &Path, meta: &Path, kind: Kind, trigger: Trigger, label: Option<String>, progress: &dyn Fn(&str)) -> Result<RecoveryPoint> {
|
||||||
let id = format!("{}-{}", chrono::Utc::now().format("%Y%m%d-%H%M%S"), match trigger {
|
let id = format!("{}-{}-{}", chrono::Utc::now().format("%Y%m%d-%H%M%S"), match trigger {
|
||||||
Trigger::Manual => "manual",
|
Trigger::Manual => "manual",
|
||||||
Trigger::Automatic => "auto",
|
Trigger::Automatic => "auto",
|
||||||
Trigger::BeforeUpdate => "before-update",
|
Trigger::BeforeUpdate => "before-update",
|
||||||
@@ -188,7 +188,7 @@ pub fn create(root: &Path, meta: &Path, kind: Kind, trigger: Trigger, label: Opt
|
|||||||
Trigger::BeforeBots => "before-bots",
|
Trigger::BeforeBots => "before-bots",
|
||||||
Trigger::BeforeRepair => "before-repair",
|
Trigger::BeforeRepair => "before-repair",
|
||||||
Trigger::BeforeDangerousChange => "before-change",
|
Trigger::BeforeDangerousChange => "before-change",
|
||||||
});
|
}, uuid::Uuid::new_v4().simple());
|
||||||
let final_dir = point_dir(meta, &id)?;
|
let final_dir = point_dir(meta, &id)?;
|
||||||
let partial = backups_dir(meta).join(format!("{id}.partial"));
|
let partial = backups_dir(meta).join(format!("{id}.partial"));
|
||||||
fs::create_dir_all(&partial)?;
|
fs::create_dir_all(&partial)?;
|
||||||
@@ -203,6 +203,9 @@ pub fn create(root: &Path, meta: &Path, kind: Kind, trigger: Trigger, label: Opt
|
|||||||
databases.push((format!("{}-characters", other.name()), other.schema("characters")?));
|
databases.push((format!("{}-characters", other.name()), other.schema("characters")?));
|
||||||
if kind == Kind::Full { databases.push((format!("{}-world", other.name()), other.schema("world")?)); }
|
if kind == Kind::Full { databases.push((format!("{}-world", other.name()), other.schema("world")?)); }
|
||||||
}
|
}
|
||||||
|
if kind != Kind::Config && with_database(root, |db| db.schema_exists("acore_playerbots"))? {
|
||||||
|
databases.push(("playerbots".into(), "acore_playerbots"));
|
||||||
|
}
|
||||||
for (name, schema) in databases {
|
for (name, schema) in databases {
|
||||||
progress(&format!("Backing up {name} database"));
|
progress(&format!("Backing up {name} database"));
|
||||||
let component = with_database(root, |db| {
|
let component = with_database(root, |db| {
|
||||||
@@ -293,6 +296,9 @@ pub fn verify(meta: &Path, id: &str) -> Result<VerifyReport> {
|
|||||||
|
|
||||||
/// Delete one recovery point (its own folder only).
|
/// Delete one recovery point (its own folder only).
|
||||||
pub fn delete(meta: &Path, id: &str) -> Result<()> {
|
pub fn delete(meta: &Path, id: &str) -> Result<()> {
|
||||||
|
if crate::update::unfinished(meta).is_some_and(|t| t.recovery_point.as_deref() == Some(id)) {
|
||||||
|
return Err(Error::Invalid("This recovery point is required by an unfinished update and cannot be deleted.".into()));
|
||||||
|
}
|
||||||
let dir = point_dir(meta, id)?;
|
let dir = point_dir(meta, id)?;
|
||||||
get(meta, id)?; // must be a real recovery point
|
get(meta, id)?; // must be a real recovery point
|
||||||
fs::remove_dir_all(dir)?;
|
fs::remove_dir_all(dir)?;
|
||||||
@@ -341,10 +347,10 @@ pub fn restore_database(root: &Path, meta: &Path, id: &str, name: &str) -> Resul
|
|||||||
if now.world.state != ServiceState::Stopped || now.auth.state != ServiceState::Stopped || crate::multiworld::is_running(root) {
|
if now.world.state != ServiceState::Stopped || now.auth.state != ServiceState::Stopped || crate::multiworld::is_running(root) {
|
||||||
return Err(Error::Invalid("Stop the server before restoring a database.".into()));
|
return Err(Error::Invalid("Stop the server before restoring a database.".into()));
|
||||||
}
|
}
|
||||||
let live = if name.contains('-') { db::schema_of(name)? } else { point.realm.schema(name)? };
|
let live = if name.contains('-') || name == "playerbots" { db::schema_of(name)? } else { point.realm.schema(name)? };
|
||||||
let expected_tables = comp.tables.unwrap_or(0);
|
let expected_tables = comp.tables.unwrap_or(0);
|
||||||
let dump = point_dir(meta, id)?.join(&comp.path);
|
let dump = point_dir(meta, id)?.join(&comp.path);
|
||||||
let stamp = chrono::Utc::now().format("%Y%m%d%H%M%S").to_string();
|
let stamp = uuid::Uuid::new_v4().simple().to_string()[..16].to_string();
|
||||||
|
|
||||||
// 1. Safety copy of the current state, so even a wrong restore is reversible.
|
// 1. Safety copy of the current state, so even a wrong restore is reversible.
|
||||||
let safety = create(root, meta, Kind::Database, Trigger::BeforeRestore, Some(format!("before restoring {name} from {id}")), &|_| {})?;
|
let safety = create(root, meta, Kind::Database, Trigger::BeforeRestore, Some(format!("before restoring {name} from {id}")), &|_| {})?;
|
||||||
@@ -361,7 +367,7 @@ pub fn restore_database(root: &Path, meta: &Path, id: &str, name: &str) -> Resul
|
|||||||
db.import_from(&staging, &dump)?;
|
db.import_from(&staging, &dump)?;
|
||||||
// 3. Sanity checks.
|
// 3. Sanity checks.
|
||||||
let staged = db.tables(&staging)?;
|
let staged = db.tables(&staging)?;
|
||||||
if staged.is_empty() || (expected_tables > 0 && staged.len() != expected_tables) {
|
if comp.tables.is_some_and(|expected| staged.len() != expected) || (comp.tables.is_none() && staged.is_empty()) {
|
||||||
return Err(Error::Invalid(format!("The restored copy looks incomplete ({} of {expected_tables} tables); nothing was changed.", staged.len())));
|
return Err(Error::Invalid(format!("The restored copy looks incomplete ({} of {expected_tables} tables); nothing was changed.", staged.len())));
|
||||||
}
|
}
|
||||||
if db.extra_objects(&staging)? > 0 || db.extra_objects(live)? > 0 {
|
if db.extra_objects(&staging)? > 0 || db.extra_objects(live)? > 0 {
|
||||||
@@ -377,7 +383,7 @@ pub fn restore_database(root: &Path, meta: &Path, id: &str, name: &str) -> Resul
|
|||||||
for t in &staged {
|
for t in &staged {
|
||||||
renames.push(format!("`{staging}`.`{t}` TO `{live}`.`{t}`"));
|
renames.push(format!("`{staging}`.`{t}` TO `{live}`.`{t}`"));
|
||||||
}
|
}
|
||||||
db.query(&format!("RENAME TABLE {};", renames.join(", ")))?;
|
if !renames.is_empty() { db.query(&format!("RENAME TABLE {};", renames.join(", ")))?; }
|
||||||
Ok(DbRestore { previous_schema: old, safety_backup: safety.id.clone(), tables_restored: staged.len() })
|
Ok(DbRestore { previous_schema: old, safety_backup: safety.id.clone(), tables_restored: staged.len() })
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -256,6 +256,9 @@ pub fn build(p: &Params, say: &dyn Fn(&str)) -> Result<()> {
|
|||||||
if accounts != "0" || chars != "0" || templates != 21 {
|
if accounts != "0" || chars != "0" || templates != 21 {
|
||||||
return Err(Error::Invalid(format!("The database is not clean ({accounts} accounts, {chars} player characters, {templates} templates).")));
|
return Err(Error::Invalid(format!("The database is not clean ({accounts} accounts, {chars} player characters, {templates} templates).")));
|
||||||
}
|
}
|
||||||
|
if let Some(p) = crate::schema_check::check(db, p.tree)?.first() {
|
||||||
|
return Err(Error::Invalid(format!("The rebuilt base database is incomplete: {}.{}.{}: {}", p.database, p.table, p.column, p.detail)));
|
||||||
|
}
|
||||||
crate::schema_check::capture(db, out)?;
|
crate::schema_check::capture(db, out)?;
|
||||||
Ok(())
|
Ok(())
|
||||||
})?;
|
})?;
|
||||||
@@ -276,7 +279,7 @@ pub fn build(p: &Params, say: &dyn Fn(&str)) -> Result<()> {
|
|||||||
fsx::atomic_write_json(&repack_json, &shipped)?;
|
fsx::atomic_write_json(&repack_json, &shipped)?;
|
||||||
|
|
||||||
say("Adding the release files");
|
say("Adding the release files");
|
||||||
copy_dir(p.tree, p.out, &|_| false, p.tree)?;
|
copy_dir(p.tree, p.out, &|rel| rel == crate::schema_check::CONTRACT, p.tree)?;
|
||||||
if let Some(data) = p.data {
|
if let Some(data) = p.data {
|
||||||
say("Copying game data");
|
say("Copying game data");
|
||||||
fs::create_dir_all(p.out.join("Data"))?;
|
fs::create_dir_all(p.out.join("Data"))?;
|
||||||
|
|||||||
@@ -180,7 +180,7 @@ fn backup_dir(meta: &Path) -> PathBuf {
|
|||||||
meta.join("backups").join("client")
|
meta.join("backups").join("client")
|
||||||
}
|
}
|
||||||
|
|
||||||
fn host_ok(h: &str) -> bool {
|
pub fn host_ok(h: &str) -> bool {
|
||||||
!h.is_empty() && h.len() <= 253 && h.chars().all(|c| c.is_ascii_alphanumeric() || matches!(c, '.' | '-' | ':')) && !h.starts_with('-')
|
!h.is_empty() && h.len() <= 253 && h.chars().all(|c| c.is_ascii_alphanumeric() || matches!(c, '.' | '-' | ':')) && !h.starts_with('-')
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+116
-4
@@ -1,4 +1,5 @@
|
|||||||
//! Database access through the MySQL client tools bundled with the repack (`mysql`, `mysqldump`, `mysqladmin`).
|
//! Database access through the MySQL client tools bundled with the repack (`mysql`, `mysqldump`, `mysqladmin`), or,
|
||||||
|
//! for a Docker installation, the same tools run inside the database container with `docker exec`.
|
||||||
//!
|
//!
|
||||||
//! Passwords travel only in the child's environment (`MYSQL_PWD`), never on a command line or in a log.
|
//! Passwords travel only in the child's environment (`MYSQL_PWD`), never on a command line or in a log.
|
||||||
|
|
||||||
@@ -45,6 +46,8 @@ pub struct Db {
|
|||||||
user: &'static str,
|
user: &'static str,
|
||||||
password: Secret,
|
password: Secret,
|
||||||
realm: crate::realms::Mode,
|
realm: crate::realms::Mode,
|
||||||
|
/// Name of the database container of a Docker installation; the client tools then run inside it.
|
||||||
|
container: Option<String>,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Deserialize)]
|
#[derive(Deserialize)]
|
||||||
@@ -68,6 +71,7 @@ fn no_window(cmd: &mut Command) {
|
|||||||
pub const SCHEMAS: [(&str, &str); 3] = [("characters", "acore_characters"), ("auth", "acore_auth"), ("world", "acore_world")];
|
pub const SCHEMAS: [(&str, &str); 3] = [("characters", "acore_characters"), ("auth", "acore_auth"), ("world", "acore_world")];
|
||||||
|
|
||||||
pub fn schema_of(kind: &str) -> Result<&'static str> {
|
pub fn schema_of(kind: &str) -> Result<&'static str> {
|
||||||
|
if kind == "playerbots" { return Ok("acore_playerbots"); }
|
||||||
if let Some(kind) = kind.strip_prefix("wildcard-") { return crate::realms::Mode::Wildcard.schema(kind); }
|
if let Some(kind) = kind.strip_prefix("wildcard-") { return crate::realms::Mode::Wildcard.schema(kind); }
|
||||||
if let Some(kind) = kind.strip_prefix("coa-") { return crate::realms::Mode::Coa.schema(kind); }
|
if let Some(kind) = kind.strip_prefix("coa-") { return crate::realms::Mode::Coa.schema(kind); }
|
||||||
SCHEMAS.iter().find(|(k, _)| *k == kind).map(|(_, s)| *s).ok_or_else(|| Error::Invalid(format!("unknown database {kind}")))
|
SCHEMAS.iter().find(|(k, _)| *k == kind).map(|(_, s)| *s).ok_or_else(|| Error::Invalid(format!("unknown database {kind}")))
|
||||||
@@ -89,6 +93,9 @@ impl Db {
|
|||||||
let creds: Credentials = fsx::read_json(&root.join("Settings/database.json"))
|
let creds: Credentials = fsx::read_json(&root.join("Settings/database.json"))
|
||||||
.map_err(|_| Error::Invalid("The database settings of this server could not be read.".into()))?;
|
.map_err(|_| Error::Invalid("The database settings of this server could not be read.".into()))?;
|
||||||
let ports: Ports = read_ports(root);
|
let ports: Ports = read_ports(root);
|
||||||
|
if crate::docker::is_docker(root) {
|
||||||
|
return Db::in_container(root, creds, account);
|
||||||
|
}
|
||||||
let bin = root.join("mysql/bin");
|
let bin = root.join("mysql/bin");
|
||||||
if !bin.join("mysqldump.exe").is_file() || !bin.join("mysql.exe").is_file() {
|
if !bin.join("mysqldump.exe").is_file() || !bin.join("mysql.exe").is_file() {
|
||||||
return Err(Error::Invalid("The bundled database tools are missing.".into()));
|
return Err(Error::Invalid("The bundled database tools are missing.".into()));
|
||||||
@@ -97,7 +104,20 @@ impl Db {
|
|||||||
Account::Admin => ("root", creds.root_password),
|
Account::Admin => ("root", creds.root_password),
|
||||||
Account::App => ("acore", creds.app_password),
|
Account::App => ("acore", creds.app_password),
|
||||||
};
|
};
|
||||||
Ok(Db { bin, port: ports.mysql, user, password: Secret(password), realm: crate::realms::state(root)?.active })
|
Ok(Db { bin, port: ports.mysql, user, password: Secret(password), realm: crate::realms::state(root)?.active, container: None })
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The database of a Docker installation: the client tools of the database image, run with `docker exec`. The
|
||||||
|
/// database is not published on the host, so nothing about this depends on a port or on tools installed here.
|
||||||
|
fn in_container(root: &Path, creds: Credentials, account: Account) -> Result<Db> {
|
||||||
|
let container = crate::docker::Config::load(root)?.database_container();
|
||||||
|
let (user, password) = match account {
|
||||||
|
Account::Admin => ("root", creds.root_password),
|
||||||
|
Account::App => ("acore", creds.app_password),
|
||||||
|
};
|
||||||
|
// Inside the container the server listens on its standard port; the commands below connect to it over TCP on
|
||||||
|
// the container's own loopback, exactly like the commands of a repack do on the host.
|
||||||
|
Ok(Db { bin: PathBuf::new(), port: 3306, user, password: Secret(password), realm: crate::realms::state(root)?.active, container: Some(container) })
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn for_realm(mut self, realm: crate::realms::Mode) -> Self { self.realm = realm; self }
|
pub fn for_realm(mut self, realm: crate::realms::Mode) -> Self { self.realm = realm; self }
|
||||||
@@ -133,7 +153,15 @@ impl Db {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn command(&self, tool: &str) -> Command {
|
fn command(&self, tool: &str) -> Command {
|
||||||
let mut c = Command::new(self.bin.join(tool));
|
let mut c = match &self.container {
|
||||||
|
None => Command::new(self.bin.join(tool)),
|
||||||
|
Some(name) => {
|
||||||
|
// `-e MYSQL_PWD` without a value takes it from this process's environment: never on a command line.
|
||||||
|
let mut c = Command::new("docker");
|
||||||
|
c.args(["exec", "-i", "-e", "MYSQL_PWD", name, tool.trim_end_matches(".exe")]);
|
||||||
|
c
|
||||||
|
}
|
||||||
|
};
|
||||||
c.env("MYSQL_PWD", self.password.expose())
|
c.env("MYSQL_PWD", self.password.expose())
|
||||||
.arg("--protocol=tcp")
|
.arg("--protocol=tcp")
|
||||||
.arg("--host=127.0.0.1")
|
.arg("--host=127.0.0.1")
|
||||||
@@ -148,7 +176,8 @@ 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 code = if text.contains("2003") || text.contains("Can't connect") { ErrorCode::DatabaseNotRunning } else { ErrorCode::Unknown };
|
let down = text.contains("2003") || text.contains("Can't connect") || text.contains("is not running") || text.contains("No such container");
|
||||||
|
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("The database is not running. Start the server first.".into()),
|
||||||
_ => Error::Invalid(format!("database command failed: {}", text.trim().lines().last().unwrap_or(""))),
|
_ => Error::Invalid(format!("database command failed: {}", text.trim().lines().last().unwrap_or(""))),
|
||||||
@@ -380,3 +409,86 @@ mod realm_tests {
|
|||||||
assert_eq!(route_sql(sql, crate::realms::Mode::Wildcard), "SELECT * FROM `acore_characters_wildcard`.characters WHERE name='acore_world' AND x=\"acore_characters\"; -- acore_world\nSELECT * FROM acore_world_wildcard.items;");
|
assert_eq!(route_sql(sql, crate::realms::Mode::Wildcard), "SELECT * FROM `acore_characters_wildcard`.characters WHERE name='acore_world' AND x=\"acore_characters\"; -- acore_world\nSELECT * FROM acore_world_wildcard.items;");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
use std::ffi::OsStr;
|
||||||
|
|
||||||
|
const ROOT_PW: &str = "rootpw-ZZ1";
|
||||||
|
const APP_PW: &str = "apppw-QQ2";
|
||||||
|
|
||||||
|
fn folder(docker: bool) -> (tempfile::TempDir, PathBuf) {
|
||||||
|
let d = tempfile::tempdir().unwrap();
|
||||||
|
let root = d.path().join("srv");
|
||||||
|
std::fs::create_dir_all(root.join("Settings")).unwrap();
|
||||||
|
std::fs::write(root.join("Settings/database.json"), format!(r#"{{"rootPassword":"{ROOT_PW}","appPassword":"{APP_PW}"}}"#)).unwrap();
|
||||||
|
if docker {
|
||||||
|
std::fs::write(root.join("Settings/docker.json"), r#"{"project":"t1"}"#).unwrap();
|
||||||
|
}
|
||||||
|
(d, root)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn args(c: &Command) -> Vec<String> {
|
||||||
|
c.get_args().map(|a| a.to_string_lossy().into_owned()).collect()
|
||||||
|
}
|
||||||
|
|
||||||
|
fn env_of(c: &Command, key: &str) -> Option<String> {
|
||||||
|
c.get_envs().find(|(k, _)| *k == OsStr::new(key)).and_then(|(_, v)| v.map(|v| v.to_string_lossy().into_owned()))
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn a_docker_installation_runs_the_client_tools_inside_the_database_container() {
|
||||||
|
let (_d, root) = folder(true);
|
||||||
|
let db = Db::from_repack(&root, Account::Admin).unwrap();
|
||||||
|
for (tool, program) in [("mysql.exe", "mysql"), ("mysqldump.exe", "mysqldump"), ("mysqladmin.exe", "mysqladmin")] {
|
||||||
|
let c = db.command(tool);
|
||||||
|
assert_eq!(c.get_program(), "docker");
|
||||||
|
let a = args(&c);
|
||||||
|
assert_eq!(&a[..6], ["exec", "-i", "-e", "MYSQL_PWD", "coa-t1-db", program]);
|
||||||
|
assert!(a.contains(&"--protocol=tcp".to_string()) && a.contains(&"--host=127.0.0.1".to_string()) && a.contains(&"--port=3306".to_string()));
|
||||||
|
assert!(a.contains(&"--user=root".to_string()));
|
||||||
|
assert!(a.iter().all(|x| !x.contains(ROOT_PW)), "the password must not be on the command line");
|
||||||
|
assert_eq!(env_of(&c, "MYSQL_PWD").as_deref(), Some(ROOT_PW));
|
||||||
|
}
|
||||||
|
let app = Db::from_repack(&root, Account::App).unwrap().command("mysql.exe");
|
||||||
|
assert!(args(&app).contains(&"--user=acore".to_string()));
|
||||||
|
assert_eq!(env_of(&app, "MYSQL_PWD").as_deref(), Some(APP_PW));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn a_repack_still_uses_its_bundled_tools_on_the_host() {
|
||||||
|
let (_d, root) = folder(false);
|
||||||
|
std::fs::create_dir_all(root.join("mysql/bin")).unwrap();
|
||||||
|
for f in ["mysql.exe", "mysqldump.exe"] {
|
||||||
|
std::fs::write(root.join("mysql/bin").join(f), b"x").unwrap();
|
||||||
|
}
|
||||||
|
std::fs::write(root.join("Settings/repack.json"), r#"{"mysqlPort":3999}"#).unwrap();
|
||||||
|
let c = Db::from_repack(&root, Account::Admin).unwrap().command("mysql.exe");
|
||||||
|
assert_eq!(c.get_program(), root.join("mysql/bin").join("mysql.exe").as_os_str());
|
||||||
|
let a = args(&c);
|
||||||
|
assert!(!a.contains(&"exec".to_string()));
|
||||||
|
assert!(a.contains(&"--port=3999".to_string()) && a.contains(&"--host=127.0.0.1".to_string()));
|
||||||
|
assert_eq!(env_of(&c, "MYSQL_PWD").as_deref(), Some(ROOT_PW));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn a_docker_installation_does_not_need_tools_in_the_server_folder() {
|
||||||
|
let (_d, root) = folder(true);
|
||||||
|
assert!(!root.join("mysql").exists());
|
||||||
|
assert!(Db::from_repack(&root, Account::Admin).is_ok());
|
||||||
|
// ...but a broken Docker settings file is reported, not ignored.
|
||||||
|
std::fs::write(root.join("Settings/docker.json"), r#"{"project":"Bad Name"}"#).unwrap();
|
||||||
|
assert!(Db::from_repack(&root, Account::Admin).is_err());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn a_stopped_database_container_is_reported_as_a_database_that_is_not_running() {
|
||||||
|
let (_d, root) = folder(true);
|
||||||
|
let db = Db::from_repack(&root, Account::Admin).unwrap();
|
||||||
|
for text in ["Error response from daemon: container abc is not running", "Error response from daemon: No such container: coa-t1-db", "ERROR 2003 (HY000): Can't connect to MySQL server"] {
|
||||||
|
assert!(db.fail(text.as_bytes()).to_string().contains("not running"), "{text}");
|
||||||
|
}
|
||||||
|
assert!(db.fail(b"ERROR 1045 (28000): Access denied for user 'root'").to_string().contains("Access denied"));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -92,6 +92,11 @@ impl Config {
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Name of the database container (the one `docker exec` talks to).
|
||||||
|
pub(crate) fn database_container(&self) -> String {
|
||||||
|
self.names().db
|
||||||
|
}
|
||||||
|
|
||||||
pub(crate) fn names(&self) -> Names {
|
pub(crate) fn names(&self) -> Names {
|
||||||
let p = &self.project;
|
let p = &self.project;
|
||||||
Names { network: format!("coa-{p}"), volume: format!("coa-{p}-db"), db: format!("coa-{p}-db"), world: format!("coa-{p}-world"), auth: format!("coa-{p}-auth") }
|
Names { network: format!("coa-{p}"), volume: format!("coa-{p}-db"), db: format!("coa-{p}-db"), world: format!("coa-{p}-world"), auth: format!("coa-{p}-auth") }
|
||||||
|
|||||||
@@ -81,7 +81,22 @@ fn launcher(root: &Path) -> Result<(PathBuf, PathBuf)> {
|
|||||||
|
|
||||||
/// Run a launcher verb to completion (blocking; call from a worker thread).
|
/// Run a launcher verb to completion (blocking; call from a worker thread).
|
||||||
pub fn run(root: &Path, verb: Verb) -> Result<DriverOutcome> {
|
pub fn run(root: &Path, verb: Verb) -> Result<DriverOutcome> {
|
||||||
|
run_inner(root, verb, false)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(crate) fn validate_update(root: &Path) -> Result<DriverOutcome> {
|
||||||
|
run_inner(root, Verb::StartAll, true)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn run_inner(root: &Path, verb: Verb, validating_update: bool) -> Result<DriverOutcome> {
|
||||||
let root = fsx::canonicalize_lenient(root)?;
|
let root = fsx::canonicalize_lenient(root)?;
|
||||||
|
let _update_lock = if !validating_update && matches!(verb, Verb::StartAll | Verb::StartWorld) {
|
||||||
|
Some(crate::update::operation_lock(&crate::registry::metadata_dir_for(&root)?)?)
|
||||||
|
} else { None };
|
||||||
|
if !validating_update && matches!(verb, Verb::StartAll | Verb::StartWorld) {
|
||||||
|
crate::update::ensure_recovered(&crate::registry::metadata_dir_for(&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) {
|
||||||
return crate::docker::run(&root, verb);
|
return crate::docker::run(&root, verb);
|
||||||
}
|
}
|
||||||
@@ -97,9 +112,24 @@ pub fn run(root: &Path, verb: Verb) -> Result<DriverOutcome> {
|
|||||||
crate::realms::setup_realmlist(&root)?;
|
crate::realms::setup_realmlist(&root)?;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if matches!(verb, Verb::StartAll | Verb::StartWorld) { crate::modules::ensure_bot_exclusivity(&root)?; }
|
||||||
let (python, script) = launcher(&root)?;
|
let (python, script) = launcher(&root)?;
|
||||||
|
let original = std::fs::read_to_string(&script)?;
|
||||||
|
let patched = patch_launcher_imports(&original)?;
|
||||||
|
if original != patched {
|
||||||
|
fsx::atomic_write(&script, patched.as_bytes())?;
|
||||||
|
if let Ok(dir) = crate::registry::metadata_dir_for(&root) {
|
||||||
|
if let Ok((_, mut meta)) = crate::registry::MetaDir::open(&dir) {
|
||||||
|
if meta.original_hashes.get("Scripts/manage.py") == Some(&fsx::sha256_bytes(original.as_bytes())) {
|
||||||
|
meta.original_hashes.insert("Scripts/manage.py".into(), fsx::sha256_bytes(patched.as_bytes()));
|
||||||
|
fsx::atomic_write_json(&dir.join("install.json"), &meta)?;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
let mut cmd = Command::new(&python);
|
let mut cmd = Command::new(&python);
|
||||||
cmd.arg("-B").arg(&script).arg(verb.arg()).current_dir(&root).stdin(Stdio::null()).stdout(Stdio::piped()).stderr(Stdio::piped());
|
cmd.arg("-B").arg("-c").arg(LAUNCH_SCRIPT).arg(&script).arg(verb.arg())
|
||||||
|
.current_dir(&root).stdin(Stdio::null()).stdout(Stdio::piped()).stderr(Stdio::piped());
|
||||||
#[cfg(windows)]
|
#[cfg(windows)]
|
||||||
{
|
{
|
||||||
use std::os::windows::process::CommandExt;
|
use std::os::windows::process::CommandExt;
|
||||||
@@ -153,6 +183,35 @@ pub fn run(root: &Path, verb: Verb) -> Result<DriverOutcome> {
|
|||||||
Ok(DriverOutcome { ok, exit_code, code, human: code.map(ErrorCode::human), output })
|
Ok(DriverOutcome { ok, exit_code, code, human: code.map(ErrorCode::human), output })
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const LAUNCH_SCRIPT: &str = "import runpy,sys;from pathlib import Path;script=sys.argv[1];sys.path.insert(0,str(Path(script).resolve().parent));sys.argv=sys.argv[1:];runpy.run_path(script,run_name='__main__')";
|
||||||
|
|
||||||
|
pub(crate) fn patch_launcher_imports(text: &str) -> Result<String> {
|
||||||
|
let line = "sys.path.insert(0, str(Path(__file__).resolve().parent))";
|
||||||
|
if !text.contains("from squid_playerbots import") || text.contains(line) { return Ok(text.into()); }
|
||||||
|
let root = "ROOT = Path(__file__).resolve().parents[1]";
|
||||||
|
if !text.contains(root) || !text.lines().any(|line| line.trim() == "import sys") {
|
||||||
|
return Err(Error::Invalid("The server launcher cannot load its integration scripts. Repair its program files.".into()));
|
||||||
|
}
|
||||||
|
Ok(text.replacen(root, &format!("{root}\n{line}"), 1))
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(crate) fn launcher_matches(signed: &str, actual: &[u8]) -> bool {
|
||||||
|
if signed.as_bytes() == actual { return true; }
|
||||||
|
if patch_launcher_imports(signed).is_ok_and(|s| s.as_bytes() == actual) { return true; }
|
||||||
|
crate::realms::patch_launcher(signed).is_ok_and(|s| s.as_bytes() == actual
|
||||||
|
|| patch_launcher_imports(&s).is_ok_and(|p| p.as_bytes() == actual))
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(crate) fn startup_failure(root: &Path, started: &DriverOutcome) -> String {
|
||||||
|
let code = started.code.filter(|c| *c != ErrorCode::Unknown)
|
||||||
|
.or_else(|| crate::health::diagnose_installation(root));
|
||||||
|
let title = code.map(|c| c.human().title).unwrap_or("The server did not become ready");
|
||||||
|
let output = crate::diag::redact(&started.output);
|
||||||
|
let lines: Vec<_> = output.lines().rev().take(12).collect();
|
||||||
|
if lines.is_empty() { title.into() }
|
||||||
|
else { format!("{title}\n{}", lines.into_iter().rev().collect::<Vec<_>>().join("\n")) }
|
||||||
|
}
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
use super::*;
|
use super::*;
|
||||||
@@ -171,4 +230,25 @@ mod tests {
|
|||||||
let dir = tempfile::tempdir().unwrap();
|
let dir = tempfile::tempdir().unwrap();
|
||||||
assert!(run(dir.path(), Verb::StartAll).is_err());
|
assert!(run(dir.path(), Verb::StartAll).is_err());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn startup_failure_keeps_the_launcher_reason_without_secrets() {
|
||||||
|
let dir = tempfile::tempdir().unwrap();
|
||||||
|
let started = DriverOutcome { ok: false, exit_code: Some(1), code: Some(ErrorCode::Unknown),
|
||||||
|
human: Some(ErrorCode::Unknown.human()),
|
||||||
|
output: "appPassword=private\nModuleNotFoundError: No module named 'squid_playerbots'".into() };
|
||||||
|
let reason = startup_failure(dir.path(), &started);
|
||||||
|
assert!(reason.contains("ModuleNotFoundError"));
|
||||||
|
assert!(!reason.contains("private"));
|
||||||
|
assert!(!reason.contains("Something went wrong"));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn launcher_import_fix_is_idempotent_and_retains_other_code() {
|
||||||
|
let text = "import sys\nROOT = Path(__file__).resolve().parents[1]\nfrom squid_playerbots import validate_bots\ncustom = 42\n";
|
||||||
|
let fixed = patch_launcher_imports(text).unwrap();
|
||||||
|
assert!(fixed.contains("sys.path.insert(0, str(Path(__file__).resolve().parent))"));
|
||||||
|
assert!(fixed.ends_with("custom = 42\n"));
|
||||||
|
assert_eq!(patch_launcher_imports(&fixed).unwrap(), fixed);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -26,6 +26,8 @@ pub enum Error {
|
|||||||
NetworkUnreachable(String),
|
NetworkUnreachable(String),
|
||||||
#[error("the bot module found no level 80 template characters")]
|
#[error("the bot module found no level 80 template characters")]
|
||||||
CompanionTemplatesMissing,
|
CompanionTemplatesMissing,
|
||||||
|
#[error("CoA Companions and SQUID Playerbots cannot both be enabled. Disable one bot module.")]
|
||||||
|
BotModulesConflict,
|
||||||
#[error("this server's bot module does not have that command yet")]
|
#[error("this server's bot module does not have that command yet")]
|
||||||
CompanionCommandUnsupported,
|
CompanionCommandUnsupported,
|
||||||
#[error("invalid values: {}", .0.iter().map(|f| format!("{}: {}", f.key, f.message)).collect::<Vec<_>>().join("; "))]
|
#[error("invalid values: {}", .0.iter().map(|f| format!("{}: {}", f.key, f.message)).collect::<Vec<_>>().join("; "))]
|
||||||
@@ -58,6 +60,7 @@ pub enum ErrorCode {
|
|||||||
PackageNotPublished,
|
PackageNotPublished,
|
||||||
NetworkUnreachable,
|
NetworkUnreachable,
|
||||||
CompanionTemplatesMissing,
|
CompanionTemplatesMissing,
|
||||||
|
BotModulesConflict,
|
||||||
CompanionCommandUnsupported,
|
CompanionCommandUnsupported,
|
||||||
Unknown,
|
Unknown,
|
||||||
}
|
}
|
||||||
@@ -84,6 +87,7 @@ impl ErrorCode {
|
|||||||
pub fn human(self) -> Human {
|
pub fn human(self) -> Human {
|
||||||
use FixAction::*;
|
use FixAction::*;
|
||||||
let (title, message, actions): (&str, &str, &'static [FixAction]) = match self {
|
let (title, message, actions): (&str, &str, &'static [FixAction]) = match self {
|
||||||
|
ErrorCode::BotModulesConflict => ("Two bot modules are enabled", "Disable CoA Companions or SQUID Playerbots in Modules before starting the server.", &[ShowDetails]),
|
||||||
ErrorCode::DatabaseNotRunning => (
|
ErrorCode::DatabaseNotRunning => (
|
||||||
"Database isn't running",
|
"Database isn't running",
|
||||||
"The server needs its database to start. Start the database first.",
|
"The server needs its database to start. Start the database first.",
|
||||||
@@ -179,6 +183,7 @@ impl Error {
|
|||||||
Error::Validation(_) => ErrorCode::InvalidConfigValue,
|
Error::Validation(_) => ErrorCode::InvalidConfigValue,
|
||||||
Error::PackageNotPublished(_) => ErrorCode::PackageNotPublished,
|
Error::PackageNotPublished(_) => ErrorCode::PackageNotPublished,
|
||||||
Error::NetworkUnreachable(_) => ErrorCode::NetworkUnreachable,
|
Error::NetworkUnreachable(_) => ErrorCode::NetworkUnreachable,
|
||||||
|
Error::BotModulesConflict => ErrorCode::BotModulesConflict,
|
||||||
Error::CompanionTemplatesMissing => ErrorCode::CompanionTemplatesMissing,
|
Error::CompanionTemplatesMissing => ErrorCode::CompanionTemplatesMissing,
|
||||||
Error::CompanionCommandUnsupported => ErrorCode::CompanionCommandUnsupported,
|
Error::CompanionCommandUnsupported => ErrorCode::CompanionCommandUnsupported,
|
||||||
_ => ErrorCode::Unknown,
|
_ => ErrorCode::Unknown,
|
||||||
|
|||||||
@@ -174,7 +174,8 @@ pub fn sha256_bytes(bytes: &[u8]) -> String {
|
|||||||
|
|
||||||
/// Free bytes on the volume that holds `path` (or its nearest existing ancestor).
|
/// Free bytes on the volume that holds `path` (or its nearest existing ancestor).
|
||||||
pub fn free_space(path: &Path) -> Result<u64> {
|
pub fn free_space(path: &Path) -> Result<u64> {
|
||||||
let mut cursor = Some(path);
|
let path = std::path::absolute(path)?;
|
||||||
|
let mut cursor = Some(path.as_path());
|
||||||
while let Some(p) = cursor {
|
while let Some(p) = cursor {
|
||||||
if p.exists() {
|
if p.exists() {
|
||||||
return Ok(fs4::available_space(p)?);
|
return Ok(fs4::available_space(p)?);
|
||||||
@@ -281,4 +282,11 @@ mod tests {
|
|||||||
let dir = tempfile::tempdir().unwrap();
|
let dir = tempfile::tempdir().unwrap();
|
||||||
assert!(matches!(require_space(dir.path(), u64::MAX / 2), Err(Error::InsufficientSpace { .. })));
|
assert!(matches!(require_space(dir.path(), u64::MAX / 2), Err(Error::InsufficientSpace { .. })));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn free_space_resolves_a_new_relative_directory() {
|
||||||
|
let path = Path::new("coa-schema-fixture-not-created").join("nested");
|
||||||
|
assert!(!path.exists());
|
||||||
|
assert!(free_space(&path).unwrap() > 0);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -144,7 +144,7 @@ fn random_hex(n: usize) -> String {
|
|||||||
|
|
||||||
/// Rotate the database users' passwords away from the packaged bootstrap values and write the launcher's
|
/// Rotate the database users' passwords away from the packaged bootstrap values and write the launcher's
|
||||||
/// `Settings/database.json`. MySQL is started from `root` and stopped again before returning.
|
/// `Settings/database.json`. MySQL is started from `root` and stopped again before returning.
|
||||||
fn bootstrap_database(root: &Path) -> Result<()> {
|
pub(crate) fn bootstrap_database(root: &Path) -> Result<()> {
|
||||||
with_scratch_ports(root, || bootstrap_database_inner(root))
|
with_scratch_ports(root, || bootstrap_database_inner(root))
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -154,7 +154,7 @@ fn free_port() -> Result<u16> {
|
|||||||
|
|
||||||
/// Run `f` with the staging copy listening on unused ports, so an installation never collides with a server (or any
|
/// Run `f` with the staging copy listening on unused ports, so an installation never collides with a server (or any
|
||||||
/// other program) already using the shipped ports. The shipped ports are put back afterwards.
|
/// other program) already using the shipped ports. The shipped ports are put back afterwards.
|
||||||
fn with_scratch_ports<T>(root: &Path, f: impl FnOnce() -> Result<T>) -> Result<T> {
|
pub(crate) fn with_scratch_ports<T>(root: &Path, f: impl FnOnce() -> Result<T>) -> Result<T> {
|
||||||
const KEYS: [&str; 4] = ["mysqlPort", "authPort", "worldPort", "raPort"];
|
const KEYS: [&str; 4] = ["mysqlPort", "authPort", "worldPort", "raPort"];
|
||||||
let path = root.join("Settings/repack.json");
|
let path = root.join("Settings/repack.json");
|
||||||
let original: serde_json::Value = fsx::read_json(&path)?;
|
let original: serde_json::Value = fsx::read_json(&path)?;
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ pub mod backup;
|
|||||||
pub mod cleanbase;
|
pub mod cleanbase;
|
||||||
pub mod companions;
|
pub mod companions;
|
||||||
pub mod client;
|
pub mod client;
|
||||||
|
pub mod remote_client;
|
||||||
pub mod clientdl;
|
pub mod clientdl;
|
||||||
pub mod config;
|
pub mod config;
|
||||||
pub mod console;
|
pub mod console;
|
||||||
@@ -36,6 +37,7 @@ pub mod realmlist;
|
|||||||
pub mod realms;
|
pub mod realms;
|
||||||
pub mod registry;
|
pub mod registry;
|
||||||
pub mod release;
|
pub mod release;
|
||||||
|
pub mod release_schema;
|
||||||
pub mod update;
|
pub mod update;
|
||||||
pub mod upnp;
|
pub mod upnp;
|
||||||
pub mod signing;
|
pub mod signing;
|
||||||
|
|||||||
@@ -19,6 +19,7 @@ pub enum Status {
|
|||||||
Applied,
|
Applied,
|
||||||
Pending,
|
Pending,
|
||||||
Failed,
|
Failed,
|
||||||
|
Running,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Clone)]
|
#[derive(Debug, Clone)]
|
||||||
@@ -55,7 +56,8 @@ impl Store for Db {
|
|||||||
let mut rows = Vec::new();
|
let mut rows = Vec::new();
|
||||||
// Files the core's own updater (or whoever prepared this database) already recorded count as applied.
|
// Files the core's own updater (or whoever prepared this database) already recorded count as applied.
|
||||||
for (kind, schema) in db::SCHEMAS {
|
for (kind, schema) in db::SCHEMAS {
|
||||||
if let Ok(names) = self.query(&format!("SELECT name FROM `{schema}`.`updates`;")) {
|
if self.tables(schema)?.iter().any(|name| name == "updates") {
|
||||||
|
let names = self.query(&format!("SELECT name FROM `{schema}`.`updates`;"))?;
|
||||||
for name in names.lines().filter(|n| n.ends_with(".sql")) {
|
for name in names.lines().filter(|n| n.ends_with(".sql")) {
|
||||||
rows.push(LedgerRow { db: kind.into(), id: name.trim_end_matches(".sql").into(), sha256: "0".repeat(64), status: Status::Applied, error: None, baseline: true });
|
rows.push(LedgerRow { db: kind.into(), id: name.trim_end_matches(".sql").into(), sha256: "0".repeat(64), status: Status::Applied, error: None, baseline: true });
|
||||||
}
|
}
|
||||||
@@ -64,14 +66,17 @@ impl Store for Db {
|
|||||||
for line in out.lines().filter(|l| !l.is_empty()) {
|
for line in out.lines().filter(|l| !l.is_empty()) {
|
||||||
let f: Vec<&str> = line.split('\t').collect();
|
let f: Vec<&str> = line.split('\t').collect();
|
||||||
if f.len() < 5 {
|
if f.len() < 5 {
|
||||||
continue;
|
return Err(Error::Invalid("The database migration history is malformed; no SQL was replayed.".into()));
|
||||||
|
}
|
||||||
|
if !matches!(f[3], "applied" | "failed" | "running") || !ident_ok(f[1]) || f[2].len() != 64 || !f[2].chars().all(|c| c.is_ascii_hexdigit()) {
|
||||||
|
return Err(Error::Invalid("The database migration history is invalid; no SQL was replayed.".into()));
|
||||||
}
|
}
|
||||||
let err = f.get(5).filter(|h| !h.is_empty()).and_then(|h| hex::decode(h).ok()).map(|b| String::from_utf8_lossy(&b).into_owned());
|
let err = f.get(5).filter(|h| !h.is_empty()).and_then(|h| hex::decode(h).ok()).map(|b| String::from_utf8_lossy(&b).into_owned());
|
||||||
rows.push(LedgerRow {
|
rows.push(LedgerRow {
|
||||||
db: f[0].into(),
|
db: f[0].into(),
|
||||||
id: f[1].into(),
|
id: f[1].into(),
|
||||||
sha256: f[2].into(),
|
sha256: f[2].into(),
|
||||||
status: if f[3] == "applied" { Status::Applied } else { Status::Failed },
|
status: match f[3] { "applied" => Status::Applied, "running" => Status::Running, _ => Status::Failed },
|
||||||
baseline: f[4] == "1",
|
baseline: f[4] == "1",
|
||||||
error: err,
|
error: err,
|
||||||
});
|
});
|
||||||
@@ -83,7 +88,7 @@ impl Store for Db {
|
|||||||
if !ident_ok(&r.id) || !ident_ok(&r.db) || r.sha256.len() != 64 || !r.sha256.chars().all(|c| c.is_ascii_hexdigit()) {
|
if !ident_ok(&r.id) || !ident_ok(&r.db) || r.sha256.len() != 64 || !r.sha256.chars().all(|c| c.is_ascii_hexdigit()) {
|
||||||
return Err(Error::Invalid("migration record has an invalid identifier".into()));
|
return Err(Error::Invalid("migration record has an invalid identifier".into()));
|
||||||
}
|
}
|
||||||
let status = if r.status == Status::Applied { "applied" } else { "failed" };
|
let status = match r.status { Status::Applied => "applied", Status::Running => "running", _ => "failed" };
|
||||||
let err = r.error.as_deref().map(|e| format!("UNHEX('{}')", hex_of(e))).unwrap_or_else(|| "NULL".into());
|
let err = r.error.as_deref().map(|e| format!("UNHEX('{}')", hex_of(e))).unwrap_or_else(|| "NULL".into());
|
||||||
self.query(&format!(
|
self.query(&format!(
|
||||||
"REPLACE INTO `{LEDGER_SCHEMA}`.`{LEDGER_TABLE}` (`db`,`id`,`sha256`,`status`,`applied_at`,`error`,`baseline`) VALUES ('{}','{}','{}','{status}',NOW(),{err},{});",
|
"REPLACE INTO `{LEDGER_SCHEMA}`.`{LEDGER_TABLE}` (`db`,`id`,`sha256`,`status`,`applied_at`,`error`,`baseline`) VALUES ('{}','{}','{}','{status}',NOW(),{err},{});",
|
||||||
@@ -129,7 +134,7 @@ pub fn status(store: &dyn Store, list: &[Migration]) -> Result<Vec<Item>> {
|
|||||||
Item {
|
Item {
|
||||||
id: m.id.clone(),
|
id: m.id.clone(),
|
||||||
db: m.db.clone(),
|
db: m.db.clone(),
|
||||||
status: if changed { Status::Failed } else { row.map(|r| r.status).unwrap_or(Status::Pending) },
|
status: if changed || row.is_some_and(|r| r.status == Status::Running) { Status::Failed } else { row.map(|r| r.status).unwrap_or(Status::Pending) },
|
||||||
destructive: m.destructive,
|
destructive: m.destructive,
|
||||||
baseline: row.map(|r| r.baseline).unwrap_or(false),
|
baseline: row.map(|r| r.baseline).unwrap_or(false),
|
||||||
error: if changed { Some("An already applied SQL file changed. Publish a new migration instead of replaying it.".into()) } else { row.and_then(|r| r.error.clone()) },
|
error: if changed { Some("An already applied SQL file changed. Publish a new migration instead of replaying it.".into()) } else { row.and_then(|r| r.error.clone()) },
|
||||||
@@ -174,11 +179,15 @@ pub fn apply_pending(store: &dyn Store, list: &[Migration], dir: &Path, snapshot
|
|||||||
let rows = store.load()?;
|
let rows = store.load()?;
|
||||||
// The list order is the release's order of application (released updates, then pending, then modules).
|
// The list order is the release's order of application (released updates, then pending, then modules).
|
||||||
for m in list {
|
for m in list {
|
||||||
|
if recorded(&rows, m).is_some_and(|r| matches!(r.status, Status::Running | Status::Failed)) {
|
||||||
|
return Err(Error::Invalid(format!("Database update {} ({}) failed or was interrupted and may be partially applied. Restore its recovery point before retrying.", m.id, m.db)));
|
||||||
|
}
|
||||||
if recorded(&rows, m).is_some_and(|r| hash_changed(r, m)) {
|
if recorded(&rows, m).is_some_and(|r| hash_changed(r, m)) {
|
||||||
return Err(Error::Invalid(format!("Applied database update {} ({}) has a different checksum. A new migration is required; it was not replayed.", m.id, m.db)));
|
return Err(Error::Invalid(format!("Applied database update {} ({}) has a different checksum. A new migration is required; it was not replayed.", m.id, m.db)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
let todo: Vec<&Migration> = list.iter().filter(|m| recorded(&rows, m).is_none_or(|r| r.status != Status::Applied)).collect();
|
let todo: Vec<&Migration> = list.iter().filter(|m| recorded(&rows, m).is_none_or(|r| r.status != Status::Applied)).collect();
|
||||||
|
tracing::info!(total = list.len(), pending = todo.len(), skipped = list.len() - todo.len(), "database migration plan");
|
||||||
|
|
||||||
// Resolve and verify every file before running anything.
|
// Resolve and verify every file before running anything.
|
||||||
let mut files = Vec::new();
|
let mut files = Vec::new();
|
||||||
@@ -206,12 +215,16 @@ pub fn apply_pending(store: &dyn Store, list: &[Migration], dir: &Path, snapshot
|
|||||||
report.snapshot = Some(snapshot().map_err(|e| Error::Invalid(format!("No database update was applied because the safety backup failed: {e}")))?);
|
report.snapshot = Some(snapshot().map_err(|e| Error::Invalid(format!("No database update was applied because the safety backup failed: {e}")))?);
|
||||||
}
|
}
|
||||||
for (m, schema, path) in files {
|
for (m, schema, path) in files {
|
||||||
|
tracing::info!(migration = %m.id, database = %m.db, "database migration starting");
|
||||||
|
store.put(&LedgerRow { db: m.db.clone(), id: m.id.clone(), sha256: m.sha256.clone(), status: Status::Running, error: Some("Interrupted SQL must be recovered before replay.".into()), baseline: false })?;
|
||||||
match store.run_file(schema, &path) {
|
match store.run_file(schema, &path) {
|
||||||
Ok(()) => {
|
Ok(()) => {
|
||||||
store.put(&LedgerRow { db: m.db.clone(), id: m.id.clone(), sha256: m.sha256.clone(), status: Status::Applied, error: None, baseline: false })?;
|
store.put(&LedgerRow { db: m.db.clone(), id: m.id.clone(), sha256: m.sha256.clone(), status: Status::Applied, error: None, baseline: false })?;
|
||||||
report.applied.push(m.id.clone());
|
report.applied.push(m.id.clone());
|
||||||
|
tracing::info!(migration = %m.id, database = %m.db, "database migration applied");
|
||||||
}
|
}
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
|
tracing::error!(migration = %m.id, database = %m.db, "database migration failed; details saved in migration history");
|
||||||
let msg = e.to_string();
|
let msg = e.to_string();
|
||||||
let _ = store.put(&LedgerRow { db: m.db.clone(), id: m.id.clone(), sha256: m.sha256.clone(), status: Status::Failed, error: Some(msg.clone()), baseline: false });
|
let _ = store.put(&LedgerRow { db: m.db.clone(), id: m.id.clone(), sha256: m.sha256.clone(), status: Status::Failed, error: Some(msg.clone()), baseline: false });
|
||||||
report.failed = Some((m.id.clone(), msg));
|
report.failed = Some((m.id.clone(), msg));
|
||||||
@@ -277,7 +290,8 @@ mod tests {
|
|||||||
let failed = LedgerRow { sha256: list[0].sha256.clone(), status: Status::Failed, error: Some("previous failure".into()), baseline: false, ..old.clone() };
|
let failed = LedgerRow { sha256: list[0].sha256.clone(), status: Status::Failed, error: Some("previous failure".into()), baseline: false, ..old.clone() };
|
||||||
store.rows.borrow_mut().extend([old, failed]);
|
store.rows.borrow_mut().extend([old, failed]);
|
||||||
assert_eq!(status(&store, &list).unwrap()[0].status, Status::Failed);
|
assert_eq!(status(&store, &list).unwrap()[0].status, Status::Failed);
|
||||||
assert_eq!(apply_pending(&store, &list, d.path(), &no_snapshot).unwrap().applied, ["same_id"]);
|
assert!(apply_pending(&store, &list, d.path(), &no_snapshot).unwrap_err().to_string().contains("partially applied"));
|
||||||
|
assert!(store.ran.borrow().is_empty());
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
@@ -340,6 +354,16 @@ mod tests {
|
|||||||
assert!(apply_pending(&store, &list[..1], d.path(), &no_snapshot).is_err());
|
assert!(apply_pending(&store, &list[..1], d.path(), &no_snapshot).is_err());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn interrupted_sql_is_reported_and_never_automatically_replayed() {
|
||||||
|
let (d, list) = setup(&[("world", "partial", "DROP TABLE valuable;")]);
|
||||||
|
let store = Mem::default();
|
||||||
|
store.rows.borrow_mut().push(LedgerRow { db: "world".into(), id: "partial".into(), sha256: list[0].sha256.clone(), status: Status::Running, error: Some("interrupted".into()), baseline: false });
|
||||||
|
assert_eq!(status(&store, &list).unwrap()[0].status, Status::Failed);
|
||||||
|
assert!(apply_pending(&store, &list, d.path(), &no_snapshot).unwrap_err().to_string().contains("interrupted"));
|
||||||
|
assert!(store.ran.borrow().is_empty());
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn baseline_marks_without_running_and_hostile_ids_are_rejected() {
|
fn baseline_marks_without_running_and_hostile_ids_are_rejected() {
|
||||||
let (d, list) = setup(&[("world", "b1", "SELECT 1;")]);
|
let (d, list) = setup(&[("world", "b1", "SELECT 1;")]);
|
||||||
|
|||||||
+246
-25
@@ -91,6 +91,8 @@ pub struct ModuleView {
|
|||||||
pub repo: String,
|
pub repo: String,
|
||||||
/// The module's configuration is present on this server (otherwise it is not part of this server build).
|
/// The module's configuration is present on this server (otherwise it is not part of this server build).
|
||||||
pub installed: bool,
|
pub installed: bool,
|
||||||
|
/// At least one editable setting besides the master switch exists in this server build.
|
||||||
|
pub has_settings: bool,
|
||||||
pub enabled: bool,
|
pub enabled: bool,
|
||||||
pub switchable: bool,
|
pub switchable: bool,
|
||||||
pub status: String,
|
pub status: String,
|
||||||
@@ -125,9 +127,15 @@ fn list_in(cat: &[Entry], root: &Path) -> Vec<ModuleView> {
|
|||||||
let conf = dir(root).join(&name);
|
let conf = dir(root).join(&name);
|
||||||
let dist = dir(root).join(format!("{name}.dist"));
|
let dist = dir(root).join(format!("{name}.dist"));
|
||||||
let installed = conf.is_file() || dist.is_file();
|
let installed = conf.is_file() || dist.is_file();
|
||||||
|
let has_settings = installed && settings_in(cat, root, &e.id)
|
||||||
|
.map(|settings| settings.iter().any(|s| s.key != e.enable_key))
|
||||||
|
.unwrap_or(false);
|
||||||
// the active file decides; without one the documented default is what the server will use
|
// the active file decides; without one the documented default is what the server will use
|
||||||
let enabled = !e.switchable
|
let enabled = if matches!(e.id.as_str(), "companions" | "playerbots") {
|
||||||
|| read(&conf).or_else(|| read(&dist)).and_then(|c| c.get(&e.enable_key).map(truthy)).unwrap_or(e.default_on);
|
bot_enabled(root, &e).unwrap_or(true)
|
||||||
|
} else {
|
||||||
|
!e.switchable || read(&conf).or_else(|| read(&dist)).and_then(|c| c.get(&e.enable_key).map(truthy)).unwrap_or(e.default_on)
|
||||||
|
};
|
||||||
let blocked = wildcard && matches!(e.id.as_str(), "companions" | "playerbots");
|
let blocked = wildcard && matches!(e.id.as_str(), "companions" | "playerbots");
|
||||||
ModuleView {
|
ModuleView {
|
||||||
compatibility: if blocked { "unsupported" } else if wildcard && e.id != "client-compat" { "experimental" } else { "compatible" }.into(),
|
compatibility: if blocked { "unsupported" } else if wildcard && e.id != "client-compat" { "experimental" } else { "compatible" }.into(),
|
||||||
@@ -136,6 +144,7 @@ fn list_in(cat: &[Entry], root: &Path) -> Vec<ModuleView> {
|
|||||||
description: e.description,
|
description: e.description,
|
||||||
repo: e.repo,
|
repo: e.repo,
|
||||||
installed,
|
installed,
|
||||||
|
has_settings,
|
||||||
enabled: enabled && !blocked,
|
enabled: enabled && !blocked,
|
||||||
switchable: e.switchable && !blocked,
|
switchable: e.switchable && !blocked,
|
||||||
status: e.status,
|
status: e.status,
|
||||||
@@ -167,16 +176,61 @@ fn backup(meta: &Path, conf: &Path) -> Result<()> {
|
|||||||
fsx::atomic_write(&to, &fs::read(conf)?)
|
fsx::atomic_write(&to, &fs::read(conf)?)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn require_bot_server_stopped(root: &Path) -> Result<()> {
|
||||||
|
let observed = crate::process::observe(root, &crate::layout::read_ports(root));
|
||||||
|
if observed.world.state != crate::process::ServiceState::Stopped || crate::multiworld::is_running(root) {
|
||||||
|
return Err(Error::Invalid("Stop the server before changing the bot system.".into()));
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
pub fn set_enabled(root: &Path, meta: &Path, id: &str, on: bool) -> Result<()> {
|
pub fn set_enabled(root: &Path, meta: &Path, id: &str, on: bool) -> Result<()> {
|
||||||
|
let _update_lock = crate::update::operation_lock(meta)?;
|
||||||
|
crate::update::ensure_recovered(meta)?;
|
||||||
|
let _lock = if matches!(id, "companions" | "playerbots") {
|
||||||
|
require_bot_server_stopped(root)?;
|
||||||
|
fs::create_dir_all(root.join(".state"))?;
|
||||||
|
let lock = fs::OpenOptions::new().read(true).write(true).create(true).truncate(false).open(root.join(".state/control.lock"))?;
|
||||||
|
if !fs4::fs_std::FileExt::try_lock_exclusive(&lock)? {
|
||||||
|
return Err(Error::Invalid("Another start/stop action is in progress.".into()));
|
||||||
|
}
|
||||||
|
require_bot_server_stopped(root)?;
|
||||||
|
Some(lock)
|
||||||
|
} else { None };
|
||||||
if on { crate::realms::guard_module(root, id)?; }
|
if on { crate::realms::guard_module(root, id)?; }
|
||||||
set_enabled_in(&catalog(), root, meta, id, on)
|
set_enabled_in(&catalog(), root, meta, id, on)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn bot_enabled(root: &Path, e: &Entry) -> Result<bool> {
|
||||||
|
let name = conf_name(root, e);
|
||||||
|
let conf = dir(root).join(&name);
|
||||||
|
let dist = dir(root).join(format!("{name}.dist"));
|
||||||
|
let path = if conf.exists() { conf } else { dist };
|
||||||
|
if !path.exists() { return Ok(false); }
|
||||||
|
let file = ConfFile::parse_bytes(&fs::read(path)?)?;
|
||||||
|
// Invalid booleans use the modules' enabled compiled default: fail closed.
|
||||||
|
Ok(file.get(&e.enable_key).map(|v| !matches!(v.trim().trim_matches('"').to_ascii_lowercase().as_str(), "0" | "false" | "no" | "off")).unwrap_or(true))
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn ensure_bot_exclusivity(root: &Path) -> Result<()> {
|
||||||
|
let cat = catalog();
|
||||||
|
if bot_enabled(root, &entry_in(&cat, "companions")?)? && bot_enabled(root, &entry_in(&cat, "playerbots")?)? {
|
||||||
|
return Err(Error::BotModulesConflict);
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
fn set_enabled_in(cat: &[Entry], root: &Path, meta: &Path, id: &str, on: bool) -> Result<()> {
|
fn set_enabled_in(cat: &[Entry], root: &Path, meta: &Path, id: &str, on: bool) -> Result<()> {
|
||||||
let e = entry_in(cat, id)?;
|
let e = entry_in(cat, id)?;
|
||||||
if !e.switchable || e.enable_key.is_empty() {
|
if !e.switchable || e.enable_key.is_empty() {
|
||||||
return Err(Error::Invalid("This part cannot be switched off.".into()));
|
return Err(Error::Invalid("This part cannot be switched off.".into()));
|
||||||
}
|
}
|
||||||
|
if on && matches!(id, "companions" | "playerbots") {
|
||||||
|
let other = if id == "companions" { "playerbots" } else { "companions" };
|
||||||
|
if let Some(other) = cat.iter().find(|e| e.id == other) {
|
||||||
|
if bot_enabled(root, other)? { return Err(Error::BotModulesConflict); }
|
||||||
|
}
|
||||||
|
}
|
||||||
let conf = active_file(root, &e)?;
|
let conf = active_file(root, &e)?;
|
||||||
let mut file = ConfFile::parse_bytes(&fs::read(&conf)?)?;
|
let mut file = ConfFile::parse_bytes(&fs::read(&conf)?)?;
|
||||||
if file.get(&e.enable_key).map(truthy).unwrap_or(e.default_on) == on && file.get(&e.enable_key).is_some() {
|
if file.get(&e.enable_key).map(truthy).unwrap_or(e.default_on) == on && file.get(&e.enable_key).is_some() {
|
||||||
@@ -209,7 +263,15 @@ fn settings_in(cat: &[Entry], root: &Path, id: &str) -> Result<Vec<Setting>> {
|
|||||||
let conf = dir(root).join(&name);
|
let conf = dir(root).join(&name);
|
||||||
let dist = read(&dir(root).join(format!("{name}.dist")));
|
let dist = read(&dir(root).join(format!("{name}.dist")));
|
||||||
let active = read(&conf).or_else(|| dist.clone()).ok_or_else(|| Error::Invalid("This module is not part of this server.".into()))?;
|
let active = read(&conf).or_else(|| dist.clone()).ok_or_else(|| Error::Invalid("This module is not part of this server.".into()))?;
|
||||||
Ok(active
|
let mut effective = active.clone();
|
||||||
|
if let Some(defaults) = &dist {
|
||||||
|
for (key, value) in defaults.entries() {
|
||||||
|
if effective.get(key).is_none() {
|
||||||
|
effective.set(key, value, &[]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(effective
|
||||||
.entries()
|
.entries()
|
||||||
.map(|(k, v)| Setting {
|
.map(|(k, v)| Setting {
|
||||||
key: k.to_string(),
|
key: k.to_string(),
|
||||||
@@ -230,13 +292,39 @@ fn save_settings_in(cat: &[Entry], root: &Path, meta: &Path, id: &str, changes:
|
|||||||
let e = entry_in(cat, id)?;
|
let e = entry_in(cat, id)?;
|
||||||
let conf = active_file(root, &e)?;
|
let conf = active_file(root, &e)?;
|
||||||
let mut file = ConfFile::parse_bytes(&fs::read(&conf)?)?;
|
let mut file = ConfFile::parse_bytes(&fs::read(&conf)?)?;
|
||||||
|
let dist = read(&dir(root).join(format!("{}.dist", conf_name(root, &e))));
|
||||||
let mut changed = Vec::new();
|
let mut changed = Vec::new();
|
||||||
for (key, value) in changes {
|
for (key, value) in changes {
|
||||||
let value = value.trim();
|
let value = value.trim();
|
||||||
if file.get(key).is_none() {
|
if e.switchable && key == &e.enable_key {
|
||||||
|
return Err(Error::Invalid("Use the module switch to turn this module on or off.".into()));
|
||||||
|
}
|
||||||
|
if id == "content-scaling" && key == "CoAContentScaling.Difficulty.DamageMultiplier" {
|
||||||
|
let multiplier = value.parse::<f32>().map_err(|_| Error::Invalid("Enemy damage must be a number from 0.25 to 2.0.".into()))?;
|
||||||
|
if !multiplier.is_finite() || !(0.25..=2.0).contains(&multiplier) {
|
||||||
|
return Err(Error::Invalid("Enemy damage must be a number from 0.25 to 2.0.".into()));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if id == "content-scaling" && key == "CoAContentScaling.World.Leech.Percent" {
|
||||||
|
let percent = value.parse::<f32>().map_err(|_| Error::Invalid("Life steal must be a number from 0 to 100 percent.".into()))?;
|
||||||
|
if !percent.is_finite() || !(0.0..=100.0).contains(&percent) {
|
||||||
|
return Err(Error::Invalid("Life steal must be a number from 0 to 100 percent.".into()));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if id == "content-scaling" && matches!(key.as_str(), "CoAContentScaling.LFG.AllowPartialGroups" | "CoAContentScaling.World.Leech.Enable") && !matches!(value, "0" | "1") {
|
||||||
|
return Err(Error::Invalid(format!("{key} must be 0 or 1.")));
|
||||||
|
}
|
||||||
|
if id == "ah-bot" && key.starts_with("AuctionHouseBot.ListProportion.Category") && key.contains(".Quality") {
|
||||||
|
let weight = value.parse::<u32>().map_err(|_| Error::Invalid("Auction listing weights must be whole numbers from 0 to 1000.".into()))?;
|
||||||
|
if weight > 1000 {
|
||||||
|
return Err(Error::Invalid("Auction listing weights must be whole numbers from 0 to 1000.".into()));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if file.get(key).is_none() && dist.as_ref().and_then(|d| d.get(key)).is_none() {
|
||||||
return Err(Error::Invalid(format!("{key} is not a setting of this module.")));
|
return Err(Error::Invalid(format!("{key} is not a setting of this module.")));
|
||||||
}
|
}
|
||||||
if value.is_empty() || value.len() > 500 || value.chars().any(char::is_control) {
|
let documented_empty = dist.as_ref().and_then(|d| d.get(key)).map(str::trim) == Some("");
|
||||||
|
if (value.is_empty() && !documented_empty) || value.len() > 500 || value.chars().any(char::is_control) {
|
||||||
return Err(Error::Invalid(format!("The value of {key} must be one line of text.")));
|
return Err(Error::Invalid(format!("The value of {key} must be one line of text.")));
|
||||||
}
|
}
|
||||||
if file.get(key).map(str::trim) != Some(value) {
|
if file.get(key).map(str::trim) != Some(value) {
|
||||||
@@ -286,6 +374,40 @@ mod tests {
|
|||||||
(root, meta)
|
(root, meta)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn bot_systems_are_mutually_exclusive_in_both_directions_and_manual_configs() {
|
||||||
|
let d = tempfile::tempdir().unwrap();
|
||||||
|
let root = d.path();
|
||||||
|
fs::create_dir_all(dir(root)).unwrap();
|
||||||
|
let a = dir(root).join("mod_coa_playerbots.conf");
|
||||||
|
let b = dir(root).join("playerbots.conf");
|
||||||
|
fs::write(&a, "CoaBots.Enable = 1\n").unwrap();
|
||||||
|
fs::write(&b, "AiPlayerbot.Enabled = 0\n").unwrap();
|
||||||
|
assert!(ensure_bot_exclusivity(root).is_ok());
|
||||||
|
assert!(matches!(set_enabled_in(&catalog(), root, root, "playerbots", true), Err(Error::BotModulesConflict)));
|
||||||
|
assert_eq!(fs::read_to_string(&b).unwrap(), "AiPlayerbot.Enabled = 0\n");
|
||||||
|
fs::write(&a, "CoaBots.Enable = 0\n").unwrap();
|
||||||
|
set_enabled_in(&catalog(), root, root, "playerbots", true).unwrap();
|
||||||
|
assert!(matches!(set_enabled_in(&catalog(), root, root, "companions", true), Err(Error::BotModulesConflict)));
|
||||||
|
fs::write(&a, "CoaBots.Enable = true\n").unwrap();
|
||||||
|
assert!(matches!(ensure_bot_exclusivity(root), Err(Error::BotModulesConflict)));
|
||||||
|
fs::write(&b, "# missing key uses the compiled enabled default\n").unwrap();
|
||||||
|
assert!(matches!(ensure_bot_exclusivity(root), Err(Error::BotModulesConflict)));
|
||||||
|
set_enabled_in(&catalog(), root, root, "companions", false).unwrap();
|
||||||
|
assert!(ensure_bot_exclusivity(root).is_ok());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn startup_rejects_conflicting_bots_before_launching_any_service() {
|
||||||
|
let d = tempfile::tempdir().unwrap();
|
||||||
|
fs::create_dir_all(dir(d.path())).unwrap();
|
||||||
|
fs::write(dir(d.path()).join("mod_coa_playerbots.conf"), "CoaBots.Enable = 1").unwrap();
|
||||||
|
fs::write(dir(d.path()).join("playerbots.conf"), "AiPlayerbot.Enabled = 1").unwrap();
|
||||||
|
for verb in [crate::driver::Verb::StartAll, crate::driver::Verb::StartWorld] {
|
||||||
|
assert!(matches!(crate::driver::run(d.path(), verb), Err(Error::BotModulesConflict)));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn the_bundled_catalog_is_valid() {
|
fn the_bundled_catalog_is_valid() {
|
||||||
let c = catalog();
|
let c = catalog();
|
||||||
@@ -293,7 +415,7 @@ mod tests {
|
|||||||
for e in &c {
|
for e in &c {
|
||||||
assert!(e.description.contains_key("en") && e.description.len() == 5, "{} has all five descriptions", e.id);
|
assert!(e.description.contains_key("en") && e.description.len() == 5, "{} has all five descriptions", e.id);
|
||||||
assert!(e.repo.starts_with("https://github.com/") && e.conf.ends_with(".conf"), "{}", e.id);
|
assert!(e.repo.starts_with("https://github.com/") && e.conf.ends_with(".conf"), "{}", e.id);
|
||||||
assert!(!e.switchable || e.enable_key.ends_with(".Enable"), "{} needs the setting that switches it", e.id);
|
assert!(!e.switchable || (e.enable_key.ends_with(".Enable") || e.enable_key.ends_with(".Enabled")), "{} needs the setting that switches it", e.id);
|
||||||
assert!(["soon", "early", "beta", "release"].contains(&e.status.as_str()), "{} has an unknown status", e.id);
|
assert!(["soon", "early", "beta", "release"].contains(&e.status.as_str()), "{} has an unknown status", e.id);
|
||||||
assert!(e.status != "soon" || !e.switchable, "{} is only announced, so it cannot be switched", e.id);
|
assert!(e.status != "soon" || !e.switchable, "{} is only announced, so it cannot be switched", e.id);
|
||||||
}
|
}
|
||||||
@@ -312,25 +434,6 @@ mod tests {
|
|||||||
assert!(!list_in(&test_catalog(), &root).into_iter().find(|m| m.id == "spellbook").unwrap().installed, "no configuration of that module on this server");
|
assert!(!list_in(&test_catalog(), &root).into_iter().find(|m| m.id == "spellbook").unwrap().installed, "no configuration of that module on this server");
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn the_content_scaling_switch_persists_the_master_flag_and_preserves_other_settings() {
|
|
||||||
let d = tempfile::tempdir().unwrap();
|
|
||||||
let (root, meta) = server(d.path());
|
|
||||||
let e = entry_in(&catalog(), "content-scaling").unwrap();
|
|
||||||
assert_eq!(e.enable_key, "CoAContentScaling.Enable");
|
|
||||||
let defaults = "CoAContentScaling.Enable = 1\nCoAContentScaling.ScaleItems = 1\nCoAContentScaling.GroupScaling.Enable = 1\n";
|
|
||||||
fs::write(dir(&root).join(format!("{}.dist", e.conf)), defaults).unwrap();
|
|
||||||
set_enabled(&root, &meta, &e.id, false).unwrap();
|
|
||||||
let active = read(&dir(&root).join(&e.conf)).unwrap();
|
|
||||||
assert_eq!(active.get("CoAContentScaling.Enable"), Some("0"));
|
|
||||||
assert_eq!(active.get("CoAContentScaling.ScaleItems"), Some("1"));
|
|
||||||
assert_eq!(active.get("CoAContentScaling.GroupScaling.Enable"), Some("1"));
|
|
||||||
assert!(!list(&root).into_iter().find(|m| m.id == e.id).unwrap().enabled);
|
|
||||||
set_enabled(&root, &meta, &e.id, true).unwrap();
|
|
||||||
assert_eq!(read(&dir(&root).join(&e.conf)).unwrap().get("CoAContentScaling.Enable"), Some("1"));
|
|
||||||
assert!(list(&root).into_iter().find(|m| m.id == e.id).unwrap().enabled);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn switching_a_module_creates_its_file_saves_the_old_one_and_changes_only_that_line() {
|
fn switching_a_module_creates_its_file_saves_the_old_one_and_changes_only_that_line() {
|
||||||
let d = tempfile::tempdir().unwrap();
|
let d = tempfile::tempdir().unwrap();
|
||||||
@@ -367,6 +470,124 @@ mod tests {
|
|||||||
assert!(!fs::read_to_string(dir(&root).join("war_games.conf")).unwrap().contains("Injected"));
|
assert!(!fs::read_to_string(dir(&root).join("war_games.conf")).unwrap().contains("Injected"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn updated_module_defaults_are_visible_and_can_be_saved_in_an_existing_config() {
|
||||||
|
let d = tempfile::tempdir().unwrap();
|
||||||
|
let (root, meta) = server(d.path());
|
||||||
|
fs::write(dir(&root).join("war_games.conf"), "WarGames.Enable = 0\n").unwrap();
|
||||||
|
let cat = test_catalog();
|
||||||
|
let values = settings_in(&cat, &root, "war-games").unwrap();
|
||||||
|
assert_eq!(values.iter().find(|s| s.key == "WarGames.Enable").unwrap().value, "0");
|
||||||
|
assert_eq!(values.iter().find(|s| s.key == "WarGames.ChallengeSeconds").unwrap().value, "60");
|
||||||
|
let changes = BTreeMap::from([("WarGames.ChallengeSeconds".to_string(), "90".to_string())]);
|
||||||
|
save_settings_in(&cat, &root, &meta, "war-games", &changes).unwrap();
|
||||||
|
let text = fs::read_to_string(dir(&root).join("war_games.conf")).unwrap();
|
||||||
|
assert!(text.contains("WarGames.Enable = 0") && text.contains("WarGames.ChallengeSeconds = 90"));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn module_enable_cannot_be_changed_through_the_settings_editor() {
|
||||||
|
let d = tempfile::tempdir().unwrap();
|
||||||
|
let (root, meta) = server(d.path());
|
||||||
|
let changes = BTreeMap::from([("WarGames.Enable".into(), "0".into())]);
|
||||||
|
assert!(save_settings_in(&test_catalog(), &root, &meta, "war-games", &changes).is_err());
|
||||||
|
assert_eq!(settings_in(&test_catalog(), &root, "war-games").unwrap()[0].value, "1");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn settings_button_requires_more_than_the_master_switch() {
|
||||||
|
let d = tempfile::tempdir().unwrap();
|
||||||
|
let (root, _) = server(d.path());
|
||||||
|
let cat = test_catalog();
|
||||||
|
assert!(list_in(&cat, &root).iter().find(|m| m.id == "war-games").unwrap().has_settings);
|
||||||
|
fs::write(dir(&root).join("war_games.conf.dist"), "WarGames.Enable = 1\n").unwrap();
|
||||||
|
assert!(!list_in(&cat, &root).iter().find(|m| m.id == "war-games").unwrap().has_settings);
|
||||||
|
fs::write(dir(&root).join("war_games.conf"), "WarGames.Enable = 0\nWarGames.ChallengeSeconds = 90\n").unwrap();
|
||||||
|
assert!(list_in(&cat, &root).iter().find(|m| m.id == "war-games").unwrap().has_settings, "custom active settings remain editable");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn documented_empty_lists_can_be_restored() {
|
||||||
|
let d = tempfile::tempdir().unwrap();
|
||||||
|
let (root, meta) = server(d.path());
|
||||||
|
fs::write(dir(&root).join("war_games.conf.dist"), "WarGames.Enable = 1\nWarGames.ExcludedItems = \n").unwrap();
|
||||||
|
fs::write(dir(&root).join("war_games.conf"), "WarGames.Enable = 1\nWarGames.ExcludedItems = 42\n").unwrap();
|
||||||
|
let changes = BTreeMap::from([("WarGames.ExcludedItems".into(), "".into())]);
|
||||||
|
save_settings_in(&test_catalog(), &root, &meta, "war-games", &changes).unwrap();
|
||||||
|
assert_eq!(settings_in(&test_catalog(), &root, "war-games").unwrap().iter().find(|s| s.key == "WarGames.ExcludedItems").unwrap().value, "");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn auction_type_weights_are_validated_before_any_setting_is_written() {
|
||||||
|
let d = tempfile::tempdir().unwrap();
|
||||||
|
let (root, meta) = server(d.path());
|
||||||
|
let cat = catalog();
|
||||||
|
let key = "AuctionHouseBot.ListProportion.CategoryWeapon.QualityNormal";
|
||||||
|
let conf = dir(&root).join("mod_ahbot.conf");
|
||||||
|
fs::write(&conf, format!("AuctionHouseBot.Enable = true\nAuctionHouseBot.ItemsPerCycle = 150\n{key} = 20\n")).unwrap();
|
||||||
|
let original = fs::read(&conf).unwrap();
|
||||||
|
for bad in ["-1", "1.5", "NaN", "1001", "", "4294967296"] {
|
||||||
|
let changes = BTreeMap::from([("AuctionHouseBot.ItemsPerCycle".into(), "25".into()), (key.into(), bad.into())]);
|
||||||
|
assert!(save_settings_in(&cat, &root, &meta, "ah-bot", &changes).is_err(), "{bad}");
|
||||||
|
assert_eq!(fs::read(&conf).unwrap(), original, "no partial save for {bad}");
|
||||||
|
}
|
||||||
|
let off = BTreeMap::from([(key.into(), "0".into())]);
|
||||||
|
save_settings_in(&cat, &root, &meta, "ah-bot", &off).unwrap();
|
||||||
|
assert_eq!(settings_in(&cat, &root, "ah-bot").unwrap().iter().find(|s| s.key == key).unwrap().value, "0");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn partial_lfg_and_world_leech_settings_round_trip_and_reject_invalid_values() {
|
||||||
|
let d = tempfile::tempdir().unwrap();
|
||||||
|
let (root, meta) = server(d.path());
|
||||||
|
let cat = catalog();
|
||||||
|
let conf = dir(&root).join("mod-coa-content-scaling.conf.dist");
|
||||||
|
let partial = "CoAContentScaling.LFG.AllowPartialGroups";
|
||||||
|
let enable = "CoAContentScaling.World.Leech.Enable";
|
||||||
|
let percent = "CoAContentScaling.World.Leech.Percent";
|
||||||
|
let change = |k: &str, v: &str| BTreeMap::from([(k.into(), v.into())]);
|
||||||
|
fs::write(&conf, "CoAContentScaling.Enable = 1\n").unwrap();
|
||||||
|
for key in [partial, enable, percent] {
|
||||||
|
assert!(save_settings_in(&cat, &root, &meta, "content-scaling", &change(key, "1")).is_err());
|
||||||
|
}
|
||||||
|
fs::write(&conf, format!("CoAContentScaling.Enable = 1\n{partial} = 1\n{enable} = 0\n{percent} = 5.0\n")).unwrap();
|
||||||
|
for bad in ["NaN", "inf", "-0.1", "100.1", "abc"] {
|
||||||
|
assert!(save_settings_in(&cat, &root, &meta, "content-scaling", &change(percent, bad)).is_err());
|
||||||
|
}
|
||||||
|
for key in [partial, enable] {
|
||||||
|
for bad in ["2", "-1", "true", "abc"] {
|
||||||
|
assert!(save_settings_in(&cat, &root, &meta, "content-scaling", &change(key, bad)).is_err());
|
||||||
|
}
|
||||||
|
for good in ["0", "1"] {
|
||||||
|
save_settings_in(&cat, &root, &meta, "content-scaling", &change(key, good)).unwrap();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for good in ["0", "10.5", "100"] {
|
||||||
|
save_settings_in(&cat, &root, &meta, "content-scaling", &change(percent, good)).unwrap();
|
||||||
|
let settings = settings_in(&cat, &root, "content-scaling").unwrap();
|
||||||
|
assert_eq!(settings.iter().find(|s| s.key == percent).unwrap().value, good);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn damage_difficulty_is_validated_and_older_server_builds_do_not_accept_it() {
|
||||||
|
let d = tempfile::tempdir().unwrap();
|
||||||
|
let (root, meta) = server(d.path());
|
||||||
|
let cat = catalog();
|
||||||
|
let conf = dir(&root).join("mod-coa-content-scaling.conf.dist");
|
||||||
|
fs::write(&conf, "CoAContentScaling.Enable = 1\n").unwrap();
|
||||||
|
let key = "CoAContentScaling.Difficulty.DamageMultiplier";
|
||||||
|
let changes = |v: &str| BTreeMap::from([(key.into(), v.into())]);
|
||||||
|
assert!(save_settings_in(&cat, &root, &meta, "content-scaling", &changes("0.5")).is_err());
|
||||||
|
fs::write(&conf, format!("CoAContentScaling.Enable = 1\n{key} = 1.0\n")).unwrap();
|
||||||
|
for bad in ["NaN", "inf", "0", "0.24", "2.01", "abc"] {
|
||||||
|
assert!(save_settings_in(&cat, &root, &meta, "content-scaling", &changes(bad)).is_err(), "{bad}");
|
||||||
|
}
|
||||||
|
assert_eq!(save_settings_in(&cat, &root, &meta, "content-scaling", &changes("0.25")).unwrap(), [key]);
|
||||||
|
assert_eq!(save_settings_in(&cat, &root, &meta, "content-scaling", &changes("2")).unwrap(), [key]);
|
||||||
|
assert_eq!(settings_in(&cat, &root, "content-scaling").unwrap().iter().find(|s| s.key == key).unwrap().value, "2");
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn an_older_file_name_is_used_when_the_current_one_is_missing_and_a_part_that_cannot_be_switched_stays_on() {
|
fn an_older_file_name_is_used_when_the_current_one_is_missing_and_a_part_that_cannot_be_switched_stays_on() {
|
||||||
let d = tempfile::tempdir().unwrap();
|
let d = tempfile::tempdir().unwrap();
|
||||||
|
|||||||
@@ -64,6 +64,10 @@ fn prepare(main: &Path) -> Result<PathBuf> {
|
|||||||
let mode = if s.active == Mode::Coa { Mode::Wildcard } else { Mode::Coa };
|
let mode = if s.active == Mode::Coa { Mode::Wildcard } else { Mode::Coa };
|
||||||
let second = fsx::ensure_within(main, &root(main))?;
|
let second = fsx::ensure_within(main, &root(main))?;
|
||||||
for folder in ["Runtime", "BugReport", "mysql/bin"] { copy_tree(&main.join(folder), &fsx::ensure_within(&second, &second.join(folder))?)?; }
|
for folder in ["Runtime", "BugReport", "mysql/bin"] { copy_tree(&main.join(folder), &fsx::ensure_within(&second, &second.join(folder))?)?; }
|
||||||
|
if main.join("Scripts/squid_playerbots.py").is_file() {
|
||||||
|
fs::create_dir_all(second.join("Scripts"))?;
|
||||||
|
fs::copy(main.join("Scripts/squid_playerbots.py"), second.join("Scripts/squid_playerbots.py"))?;
|
||||||
|
}
|
||||||
if main.join("Core/reference").is_dir() { copy_tree(&main.join("Core/reference"), &fsx::ensure_within(&second, &second.join("Core/reference"))?)?; }
|
if main.join("Core/reference").is_dir() { copy_tree(&main.join("Core/reference"), &fsx::ensure_within(&second, &second.join("Core/reference"))?)?; }
|
||||||
for entry in fs::read_dir(main.join("Core"))? {
|
for entry in fs::read_dir(main.join("Core"))? {
|
||||||
let entry = entry?;
|
let entry = entry?;
|
||||||
|
|||||||
@@ -257,6 +257,11 @@ impl Read for PartsReader {
|
|||||||
/// Unpack verified `parts_dir` into `dest` (an empty or new staging folder). Every file must be listed in the
|
/// Unpack verified `parts_dir` into `dest` (an empty or new staging folder). Every file must be listed in the
|
||||||
/// manifest with the recorded size and hash; anything else aborts the extraction.
|
/// manifest with the recorded size and hash; anything else aborts the extraction.
|
||||||
pub fn extract(parts_dir: &Path, manifest: &Manifest, dest: &Path, progress: &dyn Fn(u64, u64)) -> Result<()> {
|
pub fn extract(parts_dir: &Path, manifest: &Manifest, dest: &Path, progress: &dyn Fn(u64, u64)) -> Result<()> {
|
||||||
|
extract_selected(parts_dir, manifest, dest, &|_| true, progress)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Verify the entire archive, writing only selected files for a disposable release-schema fixture.
|
||||||
|
pub fn extract_selected(parts_dir: &Path, manifest: &Manifest, dest: &Path, select: &dyn Fn(&str) -> bool, progress: &dyn Fn(u64, u64)) -> Result<()> {
|
||||||
let archive = manifest.archive.as_ref().ok_or_else(|| Error::InvalidManifest("manifest has no archive".into()))?;
|
let archive = manifest.archive.as_ref().ok_or_else(|| Error::InvalidManifest("manifest has no archive".into()))?;
|
||||||
let mut paths = Vec::new();
|
let mut paths = Vec::new();
|
||||||
for part in &archive.parts {
|
for part in &archive.parts {
|
||||||
@@ -271,7 +276,8 @@ pub fn extract(parts_dir: &Path, manifest: &Manifest, dest: &Path, progress: &dy
|
|||||||
}
|
}
|
||||||
paths.push(p);
|
paths.push(p);
|
||||||
}
|
}
|
||||||
fsx::require_space(dest, archive.unpacked_size)?;
|
let selected_size = manifest.files.iter().filter(|f| select(&f.path)).map(|f| f.size).sum();
|
||||||
|
fsx::require_space(dest, selected_size)?;
|
||||||
fs::create_dir_all(dest)?;
|
fs::create_dir_all(dest)?;
|
||||||
|
|
||||||
let expected: HashMap<String, &FileEntry> = manifest.files.iter().map(|f| (f.path.replace('\\', "/").to_lowercase(), f)).collect();
|
let expected: HashMap<String, &FileEntry> = manifest.files.iter().map(|f| (f.path.replace('\\', "/").to_lowercase(), f)).collect();
|
||||||
@@ -294,8 +300,11 @@ pub fn extract(parts_dir: &Path, manifest: &Manifest, dest: &Path, progress: &dy
|
|||||||
return Err(Error::PathRejected(format!("{rel}: appears twice in the archive")));
|
return Err(Error::PathRejected(format!("{rel}: appears twice in the archive")));
|
||||||
}
|
}
|
||||||
let target = fsx::safe_join(dest, &want.path)?;
|
let target = fsx::safe_join(dest, &want.path)?;
|
||||||
fs::create_dir_all(target.parent().unwrap())?;
|
let selected = select(&want.path);
|
||||||
let mut out = BufWriter::new(File::create(&target)?);
|
let mut out = if selected {
|
||||||
|
fs::create_dir_all(target.parent().unwrap())?;
|
||||||
|
Some(BufWriter::new(File::create(&target)?))
|
||||||
|
} else { None };
|
||||||
let mut hasher = Sha256::new();
|
let mut hasher = Sha256::new();
|
||||||
let mut buf = vec![0u8; 1 << 20];
|
let mut buf = vec![0u8; 1 << 20];
|
||||||
let mut size = 0u64;
|
let mut size = 0u64;
|
||||||
@@ -313,9 +322,9 @@ pub fn extract(parts_dir: &Path, manifest: &Manifest, dest: &Path, progress: &dy
|
|||||||
return Err(Error::HashMismatch { path: rel, expected: format!("{} bytes", want.size), actual: "more".into() });
|
return Err(Error::HashMismatch { path: rel, expected: format!("{} bytes", want.size), actual: "more".into() });
|
||||||
}
|
}
|
||||||
hasher.update(&buf[..n]);
|
hasher.update(&buf[..n]);
|
||||||
out.write_all(&buf[..n])?;
|
if let Some(out) = out.as_mut() { out.write_all(&buf[..n])?; }
|
||||||
}
|
}
|
||||||
out.flush()?;
|
if let Some(out) = out.as_mut() { out.flush()?; }
|
||||||
let actual = hex::encode(hasher.finalize());
|
let actual = hex::encode(hasher.finalize());
|
||||||
if size != want.size || !actual.eq_ignore_ascii_case(&want.sha256) {
|
if size != want.size || !actual.eq_ignore_ascii_case(&want.sha256) {
|
||||||
return Err(Error::HashMismatch { path: rel, expected: want.sha256.clone(), actual });
|
return Err(Error::HashMismatch { path: rel, expected: want.sha256.clone(), actual });
|
||||||
@@ -323,7 +332,7 @@ pub fn extract(parts_dir: &Path, manifest: &Manifest, dest: &Path, progress: &dy
|
|||||||
// The archive does not carry per-file modes, so a Linux binary or script would be extracted unusable.
|
// The archive does not carry per-file modes, so a Linux binary or script would be extracted unusable.
|
||||||
// Recognise them by content (ELF header or `#!`); Windows has no execute bit and ignores this.
|
// Recognise them by content (ELF header or `#!`); Windows has no execute bit and ignores this.
|
||||||
#[cfg(unix)]
|
#[cfg(unix)]
|
||||||
if head.starts_with(b"\x7fELF") || head.starts_with(b"#!") {
|
if selected && (head.starts_with(b"\x7fELF") || head.starts_with(b"#!")) {
|
||||||
use std::os::unix::fs::PermissionsExt;
|
use std::os::unix::fs::PermissionsExt;
|
||||||
fs::set_permissions(&target, fs::Permissions::from_mode(0o755))?;
|
fs::set_permissions(&target, fs::Permissions::from_mode(0o755))?;
|
||||||
}
|
}
|
||||||
@@ -410,6 +419,19 @@ mod tests {
|
|||||||
assert_eq!(mode("Core/configs/worldserver.conf.dist"), 0, "plain files stay non-executable");
|
assert_eq!(mode("Core/configs/worldserver.conf.dist"), 0, "plain files stay non-executable");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn selective_extraction_still_validates_unselected_files() {
|
||||||
|
let (d, src) = source();
|
||||||
|
let out = d.path().join("out");
|
||||||
|
let mut manifest = build(&src, &out, &opts(64 * 1024), &|_| {}).unwrap();
|
||||||
|
let dest = d.path().join("selected");
|
||||||
|
extract_selected(&out, &manifest, &dest, &|p| p.starts_with("Core/"), &|_, _| {}).unwrap();
|
||||||
|
assert!(dest.join("Core/worldserver.exe").exists());
|
||||||
|
assert!(!dest.join("Data").exists());
|
||||||
|
manifest.files.iter_mut().find(|f| f.path.starts_with("Data/")).unwrap().sha256 = "f".repeat(64);
|
||||||
|
assert!(matches!(extract_selected(&out, &manifest, &d.path().join("bad"), &|_| false, &|_, _| {}), Err(Error::HashMismatch { .. })));
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn build_split_extract_roundtrip_excludes_noise_and_secrets() {
|
fn build_split_extract_roundtrip_excludes_noise_and_secrets() {
|
||||||
let (d, src) = source();
|
let (d, src) = source();
|
||||||
|
|||||||
@@ -179,13 +179,13 @@ fn create_databases(root: &Path) -> Result<()> {
|
|||||||
return Err(Error::Invalid("Realm creation does not support databases with routines, triggers or views.".into()));
|
return Err(Error::Invalid("Realm creation does not support databases with routines, triggers or views.".into()));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
for (schema, tables) in [
|
for (kind, tables) in crate::schema_check::WILDCARD_TABLES {
|
||||||
("acore_world", &["ascension_wildcard_boss_marks", "ascension_wildcard_tooltip_links"][..]),
|
let schema = crate::db::schema_of(kind)?;
|
||||||
("acore_characters", &["coa_wildcard_skill_card", "coa_wildcard_skill_card_pending", "coa_wildcard_skill_card_account", "coa_wildcard_skill_card_purchase", "coa_wildcard_specialization_cache"][..]),
|
|
||||||
] {
|
|
||||||
let present = db.tables(schema)?;
|
let present = db.tables(schema)?;
|
||||||
if tables.iter().any(|table| !present.iter().any(|p| p == table)) {
|
let missing: Vec<_> = tables.iter().filter(|table| !present.iter().any(|p| p == **table)).copied().collect();
|
||||||
return Err(Error::Invalid("Wildcard database migrations are missing. Update the server database before creating this realm.".into()));
|
if !missing.is_empty() {
|
||||||
|
tracing::error!(root = %root.display(), database = schema, missing_tables = ?missing, "Wildcard realm creation blocked by missing database tables");
|
||||||
|
return Err(Error::Invalid(format!("Cannot create Wildcard: {schema} is missing tables: {}. Run Check files and database and include its report when requesting support.", missing.join(", "))));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
let cache = root.join("Settings/realm-profiles/staging");
|
let cache = root.join("Settings/realm-profiles/staging");
|
||||||
@@ -226,6 +226,9 @@ fn create_databases(root: &Path) -> Result<()> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub fn select(root: &Path, mode: Mode) -> Result<View> {
|
pub fn select(root: &Path, mode: Mode) -> Result<View> {
|
||||||
|
let meta = crate::registry::metadata_dir_for(root)?;
|
||||||
|
let _update_lock = crate::update::operation_lock(&meta)?;
|
||||||
|
crate::update::ensure_recovered(&meta)?;
|
||||||
require_world_stopped(root)?;
|
require_world_stopped(root)?;
|
||||||
recover(root)?;
|
recover(root)?;
|
||||||
let mut s = state(root)?;
|
let mut s = state(root)?;
|
||||||
@@ -247,7 +250,9 @@ pub fn select(root: &Path, mode: Mode) -> Result<View> {
|
|||||||
// The launcher and batch files share this lock; recheck after the potentially long database copy.
|
// The launcher and batch files share this lock; recheck after the potentially long database copy.
|
||||||
fs::create_dir_all(root.join(".state"))?;
|
fs::create_dir_all(root.join(".state"))?;
|
||||||
let lock = fs::OpenOptions::new().read(true).write(true).create(true).truncate(false).open(root.join(".state/control.lock"))?;
|
let lock = fs::OpenOptions::new().read(true).write(true).create(true).truncate(false).open(root.join(".state/control.lock"))?;
|
||||||
fs4::fs_std::FileExt::try_lock_exclusive(&lock).map_err(|_| Error::Invalid("Another start/stop action is in progress.".into()))?;
|
if !fs4::fs_std::FileExt::try_lock_exclusive(&lock)? {
|
||||||
|
return Err(Error::Invalid("Another start/stop action is in progress.".into()));
|
||||||
|
}
|
||||||
require_world_stopped(root)?;
|
require_world_stopped(root)?;
|
||||||
let original = state(root)?;
|
let original = state(root)?;
|
||||||
fsx::atomic_write_json(&root.join(JOURNAL), &Journal { before: original, files: before })?;
|
fsx::atomic_write_json(&root.join(JOURNAL), &Journal { before: original, files: before })?;
|
||||||
|
|||||||
@@ -139,7 +139,7 @@ pub fn pack_update(p: &UpdateParams, progress: &dyn Fn(&str)) -> Result<Manifest
|
|||||||
let mut changed = 0;
|
let mut changed = 0;
|
||||||
for rel in &rels {
|
for rel in &rels {
|
||||||
let src = fsx::safe_join(p.tree, rel)?;
|
let src = fsx::safe_join(p.tree, rel)?;
|
||||||
if base.get(&rel.to_lowercase()).map(|h| h.eq_ignore_ascii_case(&fsx::sha256_file(&src).unwrap_or_default())).unwrap_or(false) {
|
if rel != crate::schema_check::CONTRACT && base.get(&rel.to_lowercase()).map(|h| h.eq_ignore_ascii_case(&fsx::sha256_file(&src).unwrap_or_default())).unwrap_or(false) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
let dst = fsx::safe_join(&work, rel)?;
|
let dst = fsx::safe_join(&work, rel)?;
|
||||||
@@ -219,10 +219,12 @@ mod tests {
|
|||||||
let (base_src, base_out, tree, upd_out, sqldir) = (d.path().join("bs"), d.path().join("bo"), d.path().join("tree"), d.path().join("uo"), d.path().join("sql"));
|
let (base_src, base_out, tree, upd_out, sqldir) = (d.path().join("bs"), d.path().join("bo"), d.path().join("tree"), d.path().join("uo"), d.path().join("sql"));
|
||||||
write(&base_src, "Core/worldserver.exe", "v1");
|
write(&base_src, "Core/worldserver.exe", "v1");
|
||||||
write(&base_src, "Core/authserver.exe", "same");
|
write(&base_src, "Core/authserver.exe", "same");
|
||||||
|
write(&base_src, crate::schema_check::CONTRACT, "same contract");
|
||||||
let base = package::build(&base_src, &base_out, &BuildOptions { kind: Kind::Base, version: "1.0.0".into(), core_commit: None, built_at: "x".into(), part_size: 1 << 20, bots_commit: None, migrations: vec![] }, &|_| {}).unwrap();
|
let base = package::build(&base_src, &base_out, &BuildOptions { kind: Kind::Base, version: "1.0.0".into(), core_commit: None, built_at: "x".into(), part_size: 1 << 20, bots_commit: None, migrations: vec![] }, &|_| {}).unwrap();
|
||||||
write(&tree, "Core/worldserver.exe", "v2");
|
write(&tree, "Core/worldserver.exe", "v2");
|
||||||
write(&tree, "Core/authserver.exe", "same");
|
write(&tree, "Core/authserver.exe", "same");
|
||||||
write(&tree, "Core/newlib.dll", "n");
|
write(&tree, "Core/newlib.dll", "n");
|
||||||
|
write(&tree, crate::schema_check::CONTRACT, "same contract");
|
||||||
write(&sqldir, "world.sql", "SELECT 1;");
|
write(&sqldir, "world.sql", "SELECT 1;");
|
||||||
let sql = vec![SqlFile { db: "world".into(), id: "m1".into(), origin: "x".into(), abs: sqldir.join("world.sql"), sha256: fsx::sha256_file(&sqldir.join("world.sql")).unwrap() }];
|
let sql = vec![SqlFile { db: "world".into(), id: "m1".into(), origin: "x".into(), abs: sqldir.join("world.sql"), sha256: fsx::sha256_file(&sqldir.join("world.sql")).unwrap() }];
|
||||||
let m = pack_update(&UpdateParams { tree: &tree, base_manifest: &base, sql: &sql, out: &upd_out, version: "1.1.0".into(), core_commit: Some("a".repeat(40)), bots_commit: Some("b".repeat(40)), part_size: 1 << 20 }, &|_| {}).unwrap();
|
let m = pack_update(&UpdateParams { tree: &tree, base_manifest: &base, sql: &sql, out: &upd_out, version: "1.1.0".into(), core_commit: Some("a".repeat(40)), bots_commit: Some("b".repeat(40)), part_size: 1 << 20 }, &|_| {}).unwrap();
|
||||||
@@ -230,6 +232,7 @@ mod tests {
|
|||||||
assert!(paths.contains(&"Core/worldserver.exe") && paths.contains(&"Core/newlib.dll"));
|
assert!(paths.contains(&"Core/worldserver.exe") && paths.contains(&"Core/newlib.dll"));
|
||||||
assert!(!paths.contains(&"Core/authserver.exe"), "identical to the base: not shipped");
|
assert!(!paths.contains(&"Core/authserver.exe"), "identical to the base: not shipped");
|
||||||
assert!(paths.contains(&"_migrations/world/m1.sql"));
|
assert!(paths.contains(&"_migrations/world/m1.sql"));
|
||||||
|
assert!(paths.contains(&crate::schema_check::CONTRACT), "the contract ships even when identical to the base");
|
||||||
assert_eq!(m.kind, Kind::Update);
|
assert_eq!(m.kind, Kind::Update);
|
||||||
assert_eq!(m.migrations.len(), 1);
|
assert_eq!(m.migrations.len(), 1);
|
||||||
assert_eq!(m.bots.as_ref().and_then(|b| b.commit.clone()), Some("b".repeat(40)));
|
assert_eq!(m.bots.as_ref().and_then(|b| b.commit.clone()), Some("b".repeat(40)));
|
||||||
|
|||||||
@@ -0,0 +1,127 @@
|
|||||||
|
//! Database acceptance for release packages, using a freshly extracted signed base fixture.
|
||||||
|
use std::collections::HashSet;
|
||||||
|
use std::path::Path;
|
||||||
|
use crate::{backup, fsx, install, manifest::{Kind, Migration}, migrations, package, pkgsource, release::{self, SqlFile}, schema_check, Error, Result};
|
||||||
|
|
||||||
|
const MARKER: &str = ".release-schema-fixture";
|
||||||
|
|
||||||
|
pub fn collect(core: &Path, bots: Option<&Path>, repairs: Option<&Path>) -> Result<Vec<SqlFile>> {
|
||||||
|
let mut files = release::collect_core_sql(core)?;
|
||||||
|
if let Some(bots) = bots { files.extend(release::collect_bots_sql(bots)?); }
|
||||||
|
if let Some(repairs) = repairs {
|
||||||
|
for kind in ["auth", "characters", "world"] {
|
||||||
|
let dir = repairs.join(kind);
|
||||||
|
if !dir.exists() { continue; }
|
||||||
|
let mut paths: Vec<_> = std::fs::read_dir(&dir)?.map(|e| e.map(|e| e.path())).collect::<std::io::Result<_>>()?;
|
||||||
|
paths.sort();
|
||||||
|
for path in paths.into_iter().filter(|p| p.extension().is_some_and(|e| e == "sql")) {
|
||||||
|
let stem = path.file_stem().unwrap().to_string_lossy();
|
||||||
|
files.push(SqlFile { db: kind.into(), id: format!("manager_repair__{stem}"), origin: format!("{kind}/{stem}.sql"), sha256: fsx::sha256_file(&path)?, abs: path });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let mut seen = HashSet::new();
|
||||||
|
for file in &files {
|
||||||
|
if !seen.insert((&file.db, &file.id)) { return Err(Error::Invalid(format!("Duplicate release migration: {} / {}", file.db, file.id))); }
|
||||||
|
}
|
||||||
|
Ok(files)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn extract_base(source: &Path, fixture: &Path, trusted_key: &str) -> Result<()> {
|
||||||
|
if fixture.exists() || !fixture.file_name().is_some_and(|n| n.to_string_lossy().starts_with("coa-schema-fixture-")) {
|
||||||
|
return Err(Error::Invalid("Use a new coa-schema-fixture-* directory for release validation.".into()));
|
||||||
|
}
|
||||||
|
let (manifest, _) = pkgsource::fetch_manifest(&pkgsource::Source::Dir(source.into()), trusted_key)?;
|
||||||
|
if manifest.kind != Kind::Base { return Err(Error::Invalid("Release schema validation needs a signed base package.".into())); }
|
||||||
|
package::extract_selected(source, &manifest, fixture, &|path| {
|
||||||
|
let path = path.to_ascii_lowercase();
|
||||||
|
["mysql/", "settings/", "runtime/", "scripts/", "core/", "bugreport/"].iter().any(|prefix| path.starts_with(prefix))
|
||||||
|
}, &|_, _| {})?;
|
||||||
|
fsx::atomic_write(&fixture.join(MARKER), b"disposable release-schema fixture")?;
|
||||||
|
install::bootstrap_database(fixture)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn capture_release(fixture: &Path, tree: &Path, sql: &[SqlFile]) -> Result<()> {
|
||||||
|
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("Refusing to apply release SQL to a non-fixture server.".into()));
|
||||||
|
}
|
||||||
|
let staging = tempfile::tempdir()?;
|
||||||
|
let migrations: Vec<_> = sql.iter().map(|f| Migration { db: f.db.clone(), id: f.id.clone(), sha256: f.sha256.clone(), destructive: false }).collect();
|
||||||
|
for file in sql {
|
||||||
|
let path = fsx::safe_join(staging.path(), &format!("{}/{}.sql", file.db, file.id))?;
|
||||||
|
fsx::atomic_write(&path, &std::fs::read(&file.abs)?)?;
|
||||||
|
}
|
||||||
|
install::with_scratch_ports(fixture, || backup::with_database(fixture, |db| {
|
||||||
|
let db = db.clone().for_realm(crate::realms::Mode::Coa);
|
||||||
|
let report = migrations::apply_pending(&db, &migrations, staging.path(), &|| Ok("disposable release fixture".into()))?;
|
||||||
|
if let Some((id, why)) = report.failed { return Err(Error::Invalid(format!("Release migration {id} failed: {why}"))); }
|
||||||
|
// Validate known critical feature effects before capturing; history may be stale in the base.
|
||||||
|
let previous = tree.join(schema_check::CONTRACT);
|
||||||
|
if previous.exists() { return Err(Error::Invalid("Release tree already contains a schema contract; generate it from a fresh tree.".into())); }
|
||||||
|
let problems = schema_check::check(&db, tree)?;
|
||||||
|
if let Some(p) = problems.first() { return Err(Error::Invalid(format!("Release database failed validation: {}.{}.{}: {}", p.database, p.table, p.column, p.detail))); }
|
||||||
|
schema_check::capture(&db, tree)?;
|
||||||
|
schema_check::require_release_contract(tree)?;
|
||||||
|
Ok(())
|
||||||
|
}))
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn verify_package(dir: &Path, trusted_key: &str) -> Result<()> {
|
||||||
|
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) {
|
||||||
|
return Err(Error::Invalid("The release is missing its database schema contract.".into()));
|
||||||
|
}
|
||||||
|
let scratch = tempfile::tempdir()?;
|
||||||
|
package::extract_selected(dir, &manifest, scratch.path(), &|p| p == schema_check::CONTRACT, &|_, _| {})?;
|
||||||
|
schema_check::require_release_contract(scratch.path())?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
use base64::{engine::general_purpose::STANDARD, Engine};
|
||||||
|
use ed25519_dalek::{Signer, SigningKey};
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn signed_packages_must_carry_a_real_complete_schema_contract() {
|
||||||
|
let dir = tempfile::tempdir().unwrap();
|
||||||
|
let tree = dir.path().join("tree");
|
||||||
|
let out = dir.path().join("out");
|
||||||
|
fsx::atomic_write(&tree.join("Core/worldserver.exe"), b"fixture").unwrap();
|
||||||
|
let key = SigningKey::from_bytes(&[7; 32]);
|
||||||
|
let public = STANDARD.encode(key.verifying_key().as_bytes());
|
||||||
|
let opts = package::BuildOptions { kind: Kind::Update, version: "1.0.0".into(), core_commit: None, bots_commit: None, built_at: "test".into(), part_size: 1024 * 1024, migrations: vec![] };
|
||||||
|
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();
|
||||||
|
};
|
||||||
|
package::build(&tree, &out, &opts, &|_| {}).unwrap(); sign();
|
||||||
|
assert!(verify_package(&out, &public).is_err());
|
||||||
|
fsx::atomic_write(&tree.join(schema_check::CONTRACT), br#"{"schema":1,"columns":{}}"#).unwrap();
|
||||||
|
package::build(&tree, &out, &opts, &|_| {}).unwrap(); sign();
|
||||||
|
assert!(verify_package(&out, &public).is_err());
|
||||||
|
fsx::atomic_write(&tree.join(schema_check::CONTRACT), br#"{"schema":1,"columns":{"auth":{"account":{"id":"int"}},"characters":{"characters":{"guid":"int"}},"world":{"creature":{"id":"int"}}}}"#).unwrap();
|
||||||
|
package::build(&tree, &out, &opts, &|_| {}).unwrap(); sign();
|
||||||
|
verify_package(&out, &public).unwrap();
|
||||||
|
}
|
||||||
|
#[test]
|
||||||
|
fn repair_sql_has_new_ids_and_runs_after_original_sql() {
|
||||||
|
let dir = tempfile::tempdir().unwrap();
|
||||||
|
let core = dir.path().join("core");
|
||||||
|
let repairs = dir.path().join("repairs");
|
||||||
|
fsx::atomic_write(&core.join("data/sql/updates/pending_db_characters/old.sql"), b"SELECT 1;").unwrap();
|
||||||
|
fsx::atomic_write(&repairs.join("characters/20261005_wildcard.sql"), b"SELECT 2;").unwrap();
|
||||||
|
let files = collect(&core, None, Some(&repairs)).unwrap();
|
||||||
|
assert_eq!(files.iter().map(|f| f.id.as_str()).collect::<Vec<_>>(), ["old", "manager_repair__20261005_wildcard"]);
|
||||||
|
assert_eq!(files[1].db, "characters");
|
||||||
|
}
|
||||||
|
#[test]
|
||||||
|
fn existing_server_cannot_be_used_for_schema_generation() {
|
||||||
|
let dir = tempfile::tempdir().unwrap();
|
||||||
|
assert!(extract_base(dir.path(), dir.path(), "irrelevant").is_err());
|
||||||
|
assert!(capture_release(dir.path(), dir.path(), &[]).is_err());
|
||||||
|
assert!(!dir.path().join(schema_check::CONTRACT).exists());
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,64 @@
|
|||||||
|
//! A player's client connection, independent of any local server installation.
|
||||||
|
use std::path::{Path, PathBuf};
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
use crate::{client, fsx, Error, Result};
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Default, Serialize, Deserialize)]
|
||||||
|
pub struct Profile {
|
||||||
|
pub host: String,
|
||||||
|
pub client_path: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn load(dir: &Path) -> Result<Profile> {
|
||||||
|
match std::fs::read(dir.join("connection.json")) {
|
||||||
|
Ok(bytes) => Ok(serde_json::from_slice(&bytes)?),
|
||||||
|
Err(e) if e.kind() == std::io::ErrorKind::NotFound => Ok(Profile::default()),
|
||||||
|
Err(e) => Err(e.into()),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn save(dir: &Path, profile: &Profile) -> Result<()> {
|
||||||
|
if !profile.host.is_empty() && !client::host_ok(&profile.host) {
|
||||||
|
return Err(Error::Invalid("Enter a server IP address or hostname, without a URL or port.".into()));
|
||||||
|
}
|
||||||
|
if let Some(path) = &profile.client_path {
|
||||||
|
let client = PathBuf::from(path);
|
||||||
|
if client::detect(&client, None).is_none() {
|
||||||
|
return Err(Error::Invalid("This folder does not look like a game client (it needs Data and the game executable).".into()));
|
||||||
|
}
|
||||||
|
if client::is_running(&client) {
|
||||||
|
return Err(Error::Invalid("Close the game before changing its connection.".into()));
|
||||||
|
}
|
||||||
|
if !profile.host.is_empty() { client::set_realmlist(&client, dir, &profile.host)?; }
|
||||||
|
}
|
||||||
|
fsx::atomic_write_json(&dir.join("connection.json"), profile)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
#[test]
|
||||||
|
fn connection_needs_no_server_and_survives_restart() {
|
||||||
|
let dir = tempfile::tempdir().unwrap();
|
||||||
|
let profile = Profile { host: "192.168.1.10".into(), client_path: None };
|
||||||
|
save(dir.path(), &profile).unwrap();
|
||||||
|
assert_eq!(load(dir.path()).unwrap().host, profile.host);
|
||||||
|
assert!(!dir.path().join("install.json").exists());
|
||||||
|
}
|
||||||
|
#[test]
|
||||||
|
fn linking_client_sets_host_without_touching_other_game_settings() {
|
||||||
|
let dir = tempfile::tempdir().unwrap();
|
||||||
|
let game = dir.path().join("game");
|
||||||
|
std::fs::create_dir_all(game.join("Data/enUS")).unwrap();
|
||||||
|
std::fs::write(game.join("Wow.exe"), b"fixture").unwrap();
|
||||||
|
std::fs::write(game.join("Data/enUS/realmlist.wtf"), "set realmlist 127.0.0.1\n").unwrap();
|
||||||
|
std::fs::create_dir_all(game.join("WTF")).unwrap();
|
||||||
|
std::fs::write(game.join("WTF/Config.wtf"), "SET realmName \"My realm\"\n").unwrap();
|
||||||
|
let profile = Profile { host: "192.168.1.10".into(), client_path: Some(game.to_string_lossy().into()) };
|
||||||
|
save(dir.path(), &profile).unwrap();
|
||||||
|
assert!(std::fs::read_to_string(game.join("Data/enUS/realmlist.wtf")).unwrap().contains(&profile.host));
|
||||||
|
assert_eq!(std::fs::read_to_string(game.join("WTF/Config.wtf")).unwrap(), "SET realmName \"My realm\"\n");
|
||||||
|
assert!(save(dir.path(), &Profile { host: "bad\nset realmlist other".into(), ..profile }).is_err());
|
||||||
|
assert_eq!(load(dir.path()).unwrap().host, "192.168.1.10");
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -90,9 +90,10 @@ fn restore_files(root: &Path, work: &Path, before: &Path, broken: &[(&FileEntry,
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub fn run(root: &Path, dir: &Path, base_source: &Source, update_source: &Source, key: &str, progress: &dyn Fn(&str, u8)) -> Result<Report> {
|
pub fn run(root: &Path, dir: &Path, base_source: &Source, update_source: &Source, key: &str, progress: &dyn Fn(&str, u8)) -> Result<Report> {
|
||||||
|
let _lock = crate::update::operation_lock(dir)?;
|
||||||
let env = RepackEnv { root, meta_dir: dir };
|
let env = RepackEnv { root, meta_dir: dir };
|
||||||
env.ensure_stopped()?;
|
env.ensure_stopped()?;
|
||||||
if crate::update::unfinished(dir).is_some() { return Err(Error::Invalid("Resolve the unfinished update before repairing the server.".into())); }
|
crate::update::ensure_recovered(dir)?;
|
||||||
let (_, mut meta) = MetaDir::open(dir)?;
|
let (_, mut meta) = MetaDir::open(dir)?;
|
||||||
progress("Checking signed packages", 2);
|
progress("Checking signed packages", 2);
|
||||||
let (update, _) = pkgsource::fetch_manifest(update_source, key)?;
|
let (update, _) = pkgsource::fetch_manifest(update_source, key)?;
|
||||||
@@ -128,6 +129,9 @@ pub fn run(root: &Path, dir: &Path, base_source: &Source, update_source: &Source
|
|||||||
}
|
}
|
||||||
progress("Backing up before repair", 65);
|
progress("Backing up before repair", 65);
|
||||||
let backup = crate::backup::create(root, dir, crate::backup::Kind::Full, crate::backup::Trigger::Manual, Some("before repair".into()), &|_| {})?.id;
|
let backup = crate::backup::create(root, dir, crate::backup::Kind::Full, crate::backup::Trigger::Manual, Some("before repair".into()), &|_| {})?.id;
|
||||||
|
env.verify_recovery_point(&crate::backup::get(dir, &backup)?)?;
|
||||||
|
let repair_files: Vec<_> = broken.iter().map(|(file, _)| (*file).clone()).collect();
|
||||||
|
let mut txn = crate::update::begin_repair(root, dir, &update.version, &backup, &repair_files)?;
|
||||||
let before = dir.join("repairs").join(&backup);
|
let before = dir.join("repairs").join(&backup);
|
||||||
fs::create_dir_all(&before)?;
|
fs::create_dir_all(&before)?;
|
||||||
fsx::require_space(root, broken.iter().map(|(e,_)| e.size.saturating_mul(2)).sum())?;
|
fsx::require_space(root, broken.iter().map(|(e,_)| e.size.saturating_mul(2)).sum())?;
|
||||||
@@ -137,15 +141,23 @@ pub fn run(root: &Path, dir: &Path, base_source: &Source, update_source: &Source
|
|||||||
}
|
}
|
||||||
fsx::atomic_write_json(&dir.join("install.json"), &meta)?;
|
fsx::atomic_write_json(&dir.join("install.json"), &meta)?;
|
||||||
progress("Repairing pending database updates", 80);
|
progress("Repairing pending database updates", 80);
|
||||||
|
crate::update::repair_migrating(dir, &mut txn)?;
|
||||||
let (applied, error) = match env.migrate(&update, &work.join("update/_migrations")) {
|
let (applied, error) = match env.migrate(&update, &work.join("update/_migrations")) {
|
||||||
Ok(r) => (r.applied, r.failed.map(|(id,why)| format!("{id}: {why}"))),
|
Ok(r) => (r.applied, r.failed.map(|(id,why)| format!("{id}: {why}"))),
|
||||||
Err(e) => (Vec::new(), Some(e.to_string())),
|
Err(e) => (Vec::new(), Some(e.to_string())),
|
||||||
};
|
};
|
||||||
|
if error.is_some() {
|
||||||
|
crate::update::finish_repair(root, dir, &mut txn, false, &env)?;
|
||||||
|
let report = Report { restored: Vec::new(), applied: Vec::new(), backup, database: check(root, dir)?, error };
|
||||||
|
fsx::atomic_write_json(&before.join("report.json"), &report)?;
|
||||||
|
return Ok(report);
|
||||||
|
}
|
||||||
crate::config::create_missing_module_configs(root)?;
|
crate::config::create_missing_module_configs(root)?;
|
||||||
progress("Checking database after repair", 95);
|
progress("Checking database after repair", 95);
|
||||||
let database = check(root, dir)?;
|
let database = check(root, dir)?;
|
||||||
let report = Report { restored, applied, backup, database, error };
|
let report = Report { restored, applied, backup, database, error };
|
||||||
fsx::atomic_write_json(&before.join("report.json"), &report)?;
|
fsx::atomic_write_json(&before.join("report.json"), &report)?;
|
||||||
|
crate::update::finish_repair(root, dir, &mut txn, true, &env)?;
|
||||||
progress("Done", 100);
|
progress("Done", 100);
|
||||||
Ok(report)
|
Ok(report)
|
||||||
})();
|
})();
|
||||||
|
|||||||
@@ -5,6 +5,19 @@ use serde::{Deserialize, Serialize};
|
|||||||
use crate::{db::Db, error::Result, fsx};
|
use crate::{db::Db, error::Result, fsx};
|
||||||
|
|
||||||
pub const CONTRACT: &str = "Scripts/database-schema.json";
|
pub const CONTRACT: &str = "Scripts/database-schema.json";
|
||||||
|
pub const WILDCARD_TABLES: &[(&str, &[&str])] = &[
|
||||||
|
("world", &["ascension_wildcard_boss_marks", "ascension_wildcard_tooltip_links"]),
|
||||||
|
("characters", &["coa_wildcard_skill_card", "coa_wildcard_skill_card_pending", "coa_wildcard_skill_card_account", "coa_wildcard_skill_card_purchase", "coa_wildcard_specialization_cache"]),
|
||||||
|
];
|
||||||
|
const WILDCARD_COLUMNS: &[(&str, &str, &[&str])] = &[
|
||||||
|
("world", "ascension_wildcard_boss_marks", &["CreatureEntry", "Amount"]),
|
||||||
|
("world", "ascension_wildcard_tooltip_links", &["Talent", "Ability"]),
|
||||||
|
("characters", "coa_wildcard_skill_card", &["account", "card", "progress"]),
|
||||||
|
("characters", "coa_wildcard_skill_card_pending", &["account", "id", "card"]),
|
||||||
|
("characters", "coa_wildcard_skill_card_account", &["account", "bonus_progress"]),
|
||||||
|
("characters", "coa_wildcard_skill_card_purchase", &["account", "type", "count"]),
|
||||||
|
("characters", "coa_wildcard_specialization_cache", &["account", "claimed_at"]),
|
||||||
|
];
|
||||||
type Columns = BTreeMap<String, BTreeMap<String, BTreeMap<String, String>>>;
|
type Columns = BTreeMap<String, BTreeMap<String, BTreeMap<String, String>>>;
|
||||||
|
|
||||||
#[derive(Debug, Serialize, Deserialize)]
|
#[derive(Debug, Serialize, Deserialize)]
|
||||||
@@ -13,6 +26,16 @@ pub struct Contract {
|
|||||||
pub columns: Columns,
|
pub columns: Columns,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn require_release_contract(root: &Path) -> Result<Contract> {
|
||||||
|
let contract: Contract = fsx::read_json(&root.join(CONTRACT))?;
|
||||||
|
if contract.schema != 1 || ["auth", "characters", "world"].iter().any(|kind| {
|
||||||
|
contract.columns.get(*kind).is_none_or(|tables| tables.is_empty() || tables.values().any(|columns| columns.is_empty()))
|
||||||
|
}) {
|
||||||
|
return Err(crate::Error::Invalid("The release must include a complete supported database schema contract.".into()));
|
||||||
|
}
|
||||||
|
Ok(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 }
|
||||||
|
|
||||||
@@ -44,6 +67,26 @@ pub fn check(db: &Db, root: &Path) -> Result<Vec<Problem>> {
|
|||||||
Contract { schema: 1, columns: BTreeMap::from([("characters".into(), tables.into_iter().map(|(t, cols)| (t, cols.into_iter().map(|c| (c, String::new())).collect())).collect())]) }
|
Contract { schema: 1, columns: BTreeMap::from([("characters".into(), tables.into_iter().map(|(t, cols)| (t, cols.into_iter().map(|c| (c, String::new())).collect())).collect())]) }
|
||||||
};
|
};
|
||||||
let mut problems = Vec::new();
|
let mut problems = Vec::new();
|
||||||
|
// Older releases omit a schema contract. Still verify the feature's actual tables,
|
||||||
|
// independently of its migration history, before declaring an update healthy.
|
||||||
|
if std::fs::read(root.join("Core/worldserver.exe")).is_ok_and(|bytes| bytes.windows(b"Wildcard synergy settings".len()).any(|w| w == b"Wildcard synergy settings")) {
|
||||||
|
for (kind, tables) in WILDCARD_TABLES {
|
||||||
|
let actual = read_columns(db, kind)?;
|
||||||
|
for table in *tables {
|
||||||
|
if !actual.contains_key(*table) {
|
||||||
|
problems.push(Problem { database: (*kind).into(), table: (*table).into(), column: String::new(), detail: "Missing required Wildcard table; migration history is not proof of its presence".into() });
|
||||||
|
} else {
|
||||||
|
for (_, _, columns) in WILDCARD_COLUMNS.iter().filter(|(k, t, _)| k == kind && t == table) {
|
||||||
|
for column in *columns {
|
||||||
|
if !actual[*table].contains_key(*column) {
|
||||||
|
problems.push(Problem { database: (*kind).into(), table: (*table).into(), column: (*column).into(), detail: "Missing required Wildcard column".into() });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
for (kind, expected) in &contract.columns {
|
for (kind, expected) in &contract.columns {
|
||||||
let actual = read_columns(db, kind)?;
|
let actual = read_columns(db, kind)?;
|
||||||
for (table, cols) in expected {
|
for (table, cols) in expected {
|
||||||
@@ -69,15 +112,65 @@ pub fn check(db: &Db, root: &Path) -> Result<Vec<Problem>> {
|
|||||||
problems.push(Problem { database: "characters".into(), table: table.into(), column: column.into(), detail: "Required column has no default and is not supplied by character creation".into() });
|
problems.push(Problem { database: "characters".into(), table: table.into(), column: column.into(), detail: "Required column has no default and is not supplied by character creation".into() });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Check every CoA class represented in the starting data, rather than one arbitrary pair.
|
// The any-race/class migration supports every standard playable race for all CoA classes.
|
||||||
|
// A class existing for just one race does not protect character creation or enumeration.
|
||||||
if db.realm() == crate::realms::Mode::Coa {
|
if db.realm() == crate::realms::Mode::Coa {
|
||||||
let rows = db.query("SELECT race,class FROM acore_world.playercreateinfo;")?;
|
let rows = db.query("SELECT race,class FROM acore_world.playercreateinfo;")?;
|
||||||
let pairs: BTreeSet<_> = rows.lines().filter_map(|l| l.split_once('\t')).map(|(a,b)| (a.to_owned(),b.to_owned())).collect();
|
problems.extend(missing_coa_starts(&rows));
|
||||||
for class in 12..=32 {
|
}
|
||||||
if !pairs.iter().any(|(_, c)| c == &class.to_string()) {
|
// Check owned characters too, including legacy classes and Wildcard characters. Their rows
|
||||||
problems.push(Problem { database: "world".into(), table: "playercreateinfo".into(), column: String::new(), detail: format!("No starting data for CoA class {class}") });
|
// must not silently disappear from character selection after an otherwise healthy update.
|
||||||
}
|
let missing = db.query("SELECT c.race,c.class,COUNT(*) FROM acore_characters.characters c LEFT JOIN acore_world.playercreateinfo p ON p.race=c.race AND p.class=c.class WHERE p.race IS NULL GROUP BY c.race,c.class;")?;
|
||||||
|
for row in missing.lines() {
|
||||||
|
let fields: Vec<_> = row.split('\t').collect();
|
||||||
|
if fields.len() == 3 {
|
||||||
|
problems.push(Problem { database: "world".into(), table: "playercreateinfo".into(), column: String::new(), detail: format!("{} existing characters have no starting data for race {} / class {} and would be hidden from character selection", fields[2], fields[0], fields[1]) });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Ok(problems)
|
Ok(problems)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn missing_coa_starts(rows: &str) -> Vec<Problem> {
|
||||||
|
let pairs: BTreeSet<_> = rows.lines().filter_map(|l| l.split_once('\t')).map(|(a,b)| (a.to_owned(),b.to_owned())).collect();
|
||||||
|
let mut problems = Vec::new();
|
||||||
|
for race in [1, 2, 3, 4, 5, 6, 7, 8, 10, 11] {
|
||||||
|
for class in 12..=32 {
|
||||||
|
if !pairs.contains(&(race.to_string(), class.to_string())) {
|
||||||
|
problems.push(Problem { database: "world".into(), table: "playercreateinfo".into(), column: String::new(), detail: format!("No starting data for CoA race {race} / class {class}") });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
problems
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn a_release_cannot_use_a_partial_or_empty_schema_contract() {
|
||||||
|
let dir = tempfile::tempdir().unwrap();
|
||||||
|
assert!(require_release_contract(dir.path()).is_err());
|
||||||
|
fsx::atomic_write_json(&dir.path().join(CONTRACT), &Contract { schema: 1, columns: Columns::new() }).unwrap();
|
||||||
|
assert!(require_release_contract(dir.path()).is_err());
|
||||||
|
let mut columns = Columns::new();
|
||||||
|
for kind in ["auth", "characters", "world"] {
|
||||||
|
columns.insert(kind.into(), BTreeMap::from([("table".into(), BTreeMap::from([("id".into(), "int|NO|<NULL>|<NONE>".into())]))]));
|
||||||
|
}
|
||||||
|
fsx::atomic_write_json(&dir.path().join(CONTRACT), &Contract { schema: 1, columns }).unwrap();
|
||||||
|
assert!(require_release_contract(dir.path()).is_ok());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn detects_a_missing_orc_class_pair_even_when_the_class_exists_for_other_races() {
|
||||||
|
let mut rows = String::new();
|
||||||
|
for race in [1, 2, 3, 4, 5, 6, 7, 8, 10, 11] {
|
||||||
|
for class in 12..=32 { rows.push_str(&format!("{race}\t{class}\n")); }
|
||||||
|
}
|
||||||
|
assert!(missing_coa_starts(&rows).is_empty());
|
||||||
|
let incomplete = rows.lines().filter(|line| *line != "2\t30").collect::<Vec<_>>().join("\n");
|
||||||
|
let problems = missing_coa_starts(&incomplete);
|
||||||
|
assert_eq!(problems.len(), 1);
|
||||||
|
assert!(problems[0].detail.contains("race 2 / class 30"));
|
||||||
|
}
|
||||||
|
}
|
||||||
+399
-62
@@ -3,7 +3,7 @@
|
|||||||
//! Nothing is changed until the signed package is downloaded, verified and extracted into staging. Every file that is
|
//! Nothing is changed until the signed package is downloaded, verified and extracted into staging. Every file that is
|
||||||
//! about to change is first copied into the transaction's `before/` folder, each operation is journaled, and a crash or
|
//! about to change is first copied into the transaction's `before/` folder, each operation is journaled, and a crash or
|
||||||
//! failure at any point leaves the installation recoverable: `rollback` restores binaries and configuration exactly.
|
//! failure at any point leaves the installation recoverable: `rollback` restores binaries and configuration exactly.
|
||||||
//! Databases are never rolled back automatically (players may have progressed); restoring one is a separate action.
|
//! Full recovery points protect database changes as well as files. Interrupted updates must be resolved first.
|
||||||
|
|
||||||
use std::collections::BTreeMap;
|
use std::collections::BTreeMap;
|
||||||
use std::fs;
|
use std::fs;
|
||||||
@@ -73,15 +73,20 @@ pub struct Txn {
|
|||||||
pub from_version: Option<String>,
|
pub from_version: Option<String>,
|
||||||
pub to_version: String,
|
pub to_version: String,
|
||||||
pub recovery_point: Option<String>,
|
pub recovery_point: Option<String>,
|
||||||
|
#[serde(default = "legacy_databases_started")]
|
||||||
|
pub databases_started: bool,
|
||||||
pub ops: Vec<Op>,
|
pub ops: Vec<Op>,
|
||||||
pub message: Option<String>,
|
pub message: Option<String>,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
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 ensure_stopped(&self) -> Result<()>;
|
fn ensure_stopped(&self) -> Result<()>;
|
||||||
/// 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 migrate(&self, manifest: &Manifest, staged_migrations: &Path) -> Result<ApplyReport>;
|
fn migrate(&self, manifest: &Manifest, staged_migrations: &Path) -> Result<ApplyReport>;
|
||||||
/// Start the server and confirm it becomes healthy.
|
/// Start the server and confirm it becomes healthy.
|
||||||
fn validate(&self) -> Result<()>;
|
fn validate(&self) -> Result<()>;
|
||||||
@@ -111,7 +116,27 @@ pub fn unfinished(meta: &Path) -> Option<Txn> {
|
|||||||
let rd = fs::read_dir(updates_dir(meta)).ok()?;
|
let rd = fs::read_dir(updates_dir(meta)).ok()?;
|
||||||
let mut all: Vec<Txn> = rd.flatten().filter_map(|e| fsx::read_json::<Txn>(&e.path().join("txn.json")).ok()).collect();
|
let mut all: Vec<Txn> = rd.flatten().filter_map(|e| fsx::read_json::<Txn>(&e.path().join("txn.json")).ok()).collect();
|
||||||
all.sort_by(|a, b| b.id.cmp(&a.id));
|
all.sort_by(|a, b| b.id.cmp(&a.id));
|
||||||
all.into_iter().find(|t| !matches!(t.state, State::Committed | State::RolledBack | State::Failed | State::Prepared))
|
all.into_iter().find(|t| !matches!(t.state, State::Committed | State::RolledBack | State::Prepared) && (t.state != State::Failed || t.databases_started || t.ops.iter().any(|o| o.started)))
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn ensure_recovered(meta: &Path) -> Result<()> {
|
||||||
|
match fs::read_dir(updates_dir(meta)) {
|
||||||
|
Ok(entries) => {
|
||||||
|
for entry in entries {
|
||||||
|
let entry = entry?;
|
||||||
|
let journal = entry.path().join("txn.json");
|
||||||
|
if journal.exists() {
|
||||||
|
fsx::read_json::<Txn>(&journal).map_err(|e| Error::Invalid(format!("Update journal {} cannot be read: {e}. Recover it before changing or starting the server.", journal.display())))?;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Err(e) if e.kind() == std::io::ErrorKind::NotFound => {}
|
||||||
|
Err(e) => return Err(e.into()),
|
||||||
|
}
|
||||||
|
if let Some(t) = unfinished(meta) {
|
||||||
|
return Err(Error::Invalid(format!("Resolve unfinished update {} before changing or starting the server.", t.id)));
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
fn sha_if_exists(p: &Path) -> Option<String> {
|
fn sha_if_exists(p: &Path) -> Option<String> {
|
||||||
@@ -220,6 +245,7 @@ pub struct Outcome {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn step(report: &dyn Fn(&str, u8), name: &str, pct: u8) {
|
fn step(report: &dyn Fn(&str, u8), name: &str, pct: u8) {
|
||||||
|
tracing::info!(step = name, percent = pct, "server update progress");
|
||||||
report(name, pct);
|
report(name, pct);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -227,19 +253,27 @@ fn step(report: &dyn Fn(&str, u8), name: &str, pct: u8) {
|
|||||||
/// 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> {
|
||||||
let (root, meta_dir) = (p.root, p.meta_dir);
|
let (root, meta_dir) = (p.root, p.meta_dir);
|
||||||
|
let _lock = operation_lock(meta_dir)?;
|
||||||
|
ensure_recovered(meta_dir)?;
|
||||||
let (md, mut meta) = MetaDir::open(meta_dir)?;
|
let (md, mut meta) = MetaDir::open(meta_dir)?;
|
||||||
let _ = md;
|
let _ = md;
|
||||||
|
|
||||||
step(report, "Checking the update", 2);
|
step(report, "Checking the update", 2);
|
||||||
let (m, _) = fetch_manifest(&p.source, p.trusted_key)?;
|
let (m, manifest_bytes) = fetch_manifest(&p.source, p.trusted_key)?;
|
||||||
|
tracing::info!(root = %root.display(), from_version = ?meta.core.version, to_version = %m.version, migrations = m.migrations.len(), "server update selected");
|
||||||
check_manifest(&m)?;
|
check_manifest(&m)?;
|
||||||
let archive = m.archive.clone().ok_or_else(|| Error::InvalidManifest("no archive".into()))?;
|
let archive = m.archive.clone().ok_or_else(|| Error::InvalidManifest("no archive".into()))?;
|
||||||
let id = format!("{}-{}", chrono::Utc::now().format("%Y%m%d-%H%M%S"), m.version.replace('.', "_"));
|
let id = format!("{}-{}-{}", chrono::Utc::now().format("%Y%m%d-%H%M%S"), m.version.replace('.', "_"), uuid::Uuid::new_v4().simple());
|
||||||
let tdir = txn_dir(meta_dir, &id)?;
|
let tdir = txn_dir(meta_dir, &id)?;
|
||||||
let (tree, before) = (tdir.join("tree"), tdir.join("before"));
|
let (tree, before) = (tdir.join("tree"), tdir.join("before"));
|
||||||
fs::create_dir_all(&before)?;
|
fs::create_dir_all(&before)?;
|
||||||
|
let signature = crate::pkgsource::fetch_small(&p.source, "manifest.json.sig")?;
|
||||||
|
crate::signing::verify(&manifest_bytes, &String::from_utf8_lossy(&signature), p.trusted_key)?;
|
||||||
|
fsx::atomic_write(&tdir.join("manifest.json"), &manifest_bytes)?;
|
||||||
|
fsx::atomic_write(&tdir.join("manifest.json.sig"), &signature)?;
|
||||||
|
fsx::atomic_write(&before.join("manager-install.json"), &fs::read(meta_dir.join("install.json"))?)?;
|
||||||
|
|
||||||
let mut txn = Txn { id: id.clone(), state: State::Prepared, from_version: meta.core.version.clone(), to_version: m.version.clone(), recovery_point: None, ops: Vec::new(), message: None };
|
let mut txn = Txn { id: id.clone(), state: State::Prepared, from_version: meta.core.version.clone(), to_version: m.version.clone(), recovery_point: None, databases_started: false, ops: Vec::new(), message: None };
|
||||||
save(meta_dir, &txn)?;
|
save(meta_dir, &txn)?;
|
||||||
|
|
||||||
// Nothing has touched the installation yet; failures up to here just discard the staging area.
|
// Nothing has touched the installation yet; failures up to here just discard the staging area.
|
||||||
@@ -293,20 +327,17 @@ pub fn apply(p: &Params, report: &dyn Fn(&str, u8)) -> Result<Outcome> {
|
|||||||
let applied = apply_ops(root, &tree, &before, &m.files, &mut txn, meta_dir, p.fail_after_ops);
|
let applied = apply_ops(root, &tree, &before, &m.files, &mut txn, meta_dir, p.fail_after_ops);
|
||||||
if let Err(e) = applied {
|
if let Err(e) = applied {
|
||||||
step(report, "Undoing the update", 70);
|
step(report, "Undoing the update", 70);
|
||||||
let restore = restore_files(root, &before, &mut txn);
|
return fail_after_apply(p, &mut txn, &before, &tree, e.to_string(), None);
|
||||||
txn.state = if restore.is_ok() { State::RolledBack } else { State::Failed };
|
|
||||||
txn.message = Some(e.to_string());
|
|
||||||
save(meta_dir, &txn)?;
|
|
||||||
let _ = fs::remove_dir_all(&tree);
|
|
||||||
return Err(e);
|
|
||||||
}
|
}
|
||||||
txn.state = State::Applied;
|
txn.state = State::Applied;
|
||||||
save(meta_dir, &txn)?;
|
save(meta_dir, &txn)?;
|
||||||
|
|
||||||
// Database migrations: a failure here undoes the file changes; the databases are left as they are.
|
// 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() {
|
||||||
step(report, "Updating the database", 75);
|
step(report, "Updating the database", 75);
|
||||||
|
txn.databases_started = true;
|
||||||
|
save(meta_dir, &txn)?;
|
||||||
match p.env.migrate(&m, &tree.join("_migrations")) {
|
match p.env.migrate(&m, &tree.join("_migrations")) {
|
||||||
Ok(r) if r.failed.is_none() => migrated = Some(r),
|
Ok(r) if r.failed.is_none() => migrated = Some(r),
|
||||||
Ok(r) => {
|
Ok(r) => {
|
||||||
@@ -325,47 +356,110 @@ pub fn apply(p: &Params, report: &dyn Fn(&str, u8)) -> Result<Outcome> {
|
|||||||
return Ok(Outcome { txn, migrations: migrated });
|
return Ok(Outcome { txn, migrations: migrated });
|
||||||
}
|
}
|
||||||
|
|
||||||
// Commit
|
finish(root, meta_dir, &mut meta, &m, &tree, &mut txn)?;
|
||||||
step(report, "Finishing", 96);
|
|
||||||
meta.core.version = Some(m.version.clone());
|
|
||||||
meta.core.commit = m.core.commit.clone().or(meta.core.commit);
|
|
||||||
for op in &txn.ops {
|
|
||||||
let hash = if op.path == "Scripts/manage.py" {
|
|
||||||
let staged = fs::read_to_string(tree.join(&op.path)).ok().and_then(|s| crate::realms::patch_launcher(&s).ok());
|
|
||||||
match (staged, fs::read(root.join(&op.path))) {
|
|
||||||
(Some(expected), Ok(actual)) if expected.as_bytes() == actual => fsx::sha256_bytes(&actual),
|
|
||||||
_ => op.new_sha256.clone(),
|
|
||||||
}
|
|
||||||
} else { op.new_sha256.clone() };
|
|
||||||
meta.original_hashes.insert(op.path.clone(), hash);
|
|
||||||
if !meta.managed_files.contains(&op.path) {
|
|
||||||
meta.managed_files.push(op.path.clone());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
for i in items.iter().filter(|i| i.action == Action::Skip && i.reason.as_deref() == Some("already up to date")) {
|
|
||||||
if let Some(f) = m.files.iter().find(|f| f.path == i.path) {
|
|
||||||
meta.original_hashes.insert(f.path.clone(), f.sha256.clone());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
fsx::atomic_write_json(&meta_dir.join("install.json"), &meta)?;
|
|
||||||
fsx::atomic_write(&meta_dir.join("manifests").join(format!("update-{}.json", m.version)), &serde_json::to_vec_pretty(&m)?)?;
|
|
||||||
txn.state = State::Committed;
|
|
||||||
save(meta_dir, &txn)?;
|
|
||||||
let _ = fs::remove_dir_all(&tree);
|
|
||||||
prune(meta_dir, 3);
|
|
||||||
step(report, "Done", 100);
|
step(report, "Done", 100);
|
||||||
let _ = archive;
|
let _ = archive;
|
||||||
Ok(Outcome { txn, migrations: migrated })
|
Ok(Outcome { txn, migrations: migrated })
|
||||||
}
|
}
|
||||||
|
|
||||||
fn fail_after_apply(p: &Params, txn: &mut Txn, before: &Path, tree: &Path, why: String, report: Option<ApplyReport>) -> Result<Outcome> {
|
fn finish(root: &Path, meta_dir: &Path, meta: &mut InstallMeta, m: &Manifest, tree: &Path, txn: &mut Txn) -> Result<()> {
|
||||||
let restored = restore_files(p.root, before, txn);
|
meta.core.version = Some(m.version.clone());
|
||||||
txn.state = if restored.is_ok() { State::RolledBack } else { State::Failed };
|
meta.core.commit = m.core.commit.clone().or(meta.core.commit.clone());
|
||||||
txn.message = Some(why.clone());
|
for op in &txn.ops {
|
||||||
save(p.meta_dir, txn)?;
|
let hash = if op.path == "Scripts/manage.py" {
|
||||||
|
match (fs::read_to_string(tree.join(&op.path)), fs::read(root.join(&op.path))) {
|
||||||
|
(Ok(signed), Ok(actual)) if crate::driver::launcher_matches(&signed, &actual) => fsx::sha256_bytes(&actual),
|
||||||
|
_ => op.new_sha256.clone(),
|
||||||
|
}
|
||||||
|
} else { op.new_sha256.clone() };
|
||||||
|
meta.original_hashes.insert(op.path.clone(), hash);
|
||||||
|
if !meta.managed_files.contains(&op.path) { meta.managed_files.push(op.path.clone()); }
|
||||||
|
}
|
||||||
|
for file in &m.files {
|
||||||
|
if !txn.ops.iter().any(|op| op.path == file.path) {
|
||||||
|
let path = fsx::safe_join(root, &file.path)?;
|
||||||
|
if path.is_file() && fsx::sha256_file(&path)? == file.sha256 {
|
||||||
|
meta.original_hashes.insert(file.path.clone(), file.sha256.clone());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
fsx::atomic_write_json(&meta_dir.join("install.json"), meta)?;
|
||||||
|
fsx::atomic_write(&meta_dir.join("manifests").join(format!("update-{}.json", m.version)), &serde_json::to_vec_pretty(m)?)?;
|
||||||
|
txn.state = State::Committed;
|
||||||
|
txn.message = None;
|
||||||
|
save(meta_dir, txn)?;
|
||||||
let _ = fs::remove_dir_all(tree);
|
let _ = fs::remove_dir_all(tree);
|
||||||
|
prune(meta_dir, 3);
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn retry_validation(root: &Path, meta_dir: &Path, id: &str, fallback: &Source, trusted_key: &str, env: &dyn Env) -> Result<Txn> {
|
||||||
|
let _lock = operation_lock(meta_dir)?;
|
||||||
|
let mut txn = load(meta_dir, id)?;
|
||||||
|
if txn.state != State::NeedsDecision || unfinished(meta_dir).is_none_or(|t| t.id != id) {
|
||||||
|
return Err(Error::Invalid("Only an applied update awaiting startup validation can be retried.".into()));
|
||||||
|
}
|
||||||
|
let dir = txn_dir(meta_dir, id)?;
|
||||||
|
let source = if dir.join("manifest.json").is_file() { Source::Dir(dir.clone()) } else { fallback.clone() };
|
||||||
|
let (manifest, _) = fetch_manifest(&source, trusted_key)?;
|
||||||
|
check_manifest(&manifest)?;
|
||||||
|
if manifest.version != txn.to_version || txn.ops.iter().any(|op| !op.done) {
|
||||||
|
return Err(Error::Invalid("The saved update does not match the applied transaction.".into()));
|
||||||
|
}
|
||||||
|
for op in txn.ops.iter().filter(|op| matches!(op.action, Action::Create | Action::Replace)) {
|
||||||
|
let path = fsx::safe_join(root, &op.path)?;
|
||||||
|
let file = manifest.files.iter().find(|f| f.path == op.path)
|
||||||
|
.ok_or_else(|| Error::Invalid("The update journal contains a file absent from the signed package.".into()))?;
|
||||||
|
if matches!(file.policy, ReplacePolicy::CreateIfMissing | ReplacePolicy::MergeConfig | ReplacePolicy::NeverTouch) { continue; }
|
||||||
|
let bytes = fs::read(&path)?;
|
||||||
|
let actual = fsx::sha256_bytes(&bytes);
|
||||||
|
let launcher = op.path == "Scripts/manage.py"
|
||||||
|
&& fs::read_to_string(dir.join("tree").join(&op.path)).ok()
|
||||||
|
.filter(|s| fsx::sha256_bytes(s.as_bytes()) == file.sha256)
|
||||||
|
.is_some_and(|s| crate::driver::launcher_matches(&s, &bytes));
|
||||||
|
if actual != file.sha256 && !launcher {
|
||||||
|
return Err(Error::Invalid(format!("{} changed since the update was applied; use repair or rollback.", op.path)));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
env.ensure_stopped()?;
|
||||||
|
if let Err(error) = env.validate() {
|
||||||
|
txn.message = Some(format!("The updated server did not start correctly: {error}"));
|
||||||
|
save(meta_dir, &txn)?;
|
||||||
|
return Ok(txn);
|
||||||
|
}
|
||||||
|
let (_, mut meta) = MetaDir::open(meta_dir)?;
|
||||||
|
finish(root, meta_dir, &mut meta, &manifest, &dir.join("tree"), &mut txn)?;
|
||||||
|
Ok(txn)
|
||||||
|
}
|
||||||
|
|
||||||
|
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");
|
||||||
|
let restored = restore_transaction(p.root, p.meta_dir, before, txn, p.env);
|
||||||
|
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.message = Some(match &restored { Ok(()) => why.clone(), Err(e) => format!("{why} Recovery failed: {e}") });
|
||||||
|
save(p.meta_dir, txn)?;
|
||||||
|
if restored.is_ok() { let _ = fs::remove_dir_all(tree); }
|
||||||
let _ = report;
|
let _ = report;
|
||||||
Err(Error::Invalid(format!("{why} Your files were restored and your databases were not touched by the restore.")))
|
Err(Error::Invalid(match restored {
|
||||||
|
Ok(()) if txn.databases_started => format!("{why} The server files and databases were restored to the recovery point."),
|
||||||
|
Ok(()) => format!("{why} The server files were restored."),
|
||||||
|
Err(e) => format!("{why} Recovery failed: {e}. Resolve the unfinished update before starting the server."),
|
||||||
|
}))
|
||||||
|
}
|
||||||
|
|
||||||
|
fn restore_transaction(root: &Path, meta: &Path, before: &Path, txn: &mut Txn, env: &dyn Env) -> Result<()> {
|
||||||
|
env.ensure_stopped()?;
|
||||||
|
if txn.databases_started {
|
||||||
|
let id = txn.recovery_point.as_deref().ok_or_else(|| Error::Invalid("The database recovery point is missing.".into()))?;
|
||||||
|
env.restore_snapshot(id)?;
|
||||||
|
}
|
||||||
|
restore_files(root, before, txn)?;
|
||||||
|
let saved_meta = before.join("manager-install.json");
|
||||||
|
if saved_meta.exists() {
|
||||||
|
fsx::atomic_write(&meta.join("install.json"), &fs::read(saved_meta)?)?;
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
fn apply_ops(root: &Path, tree: &Path, before: &Path, files: &[FileEntry], txn: &mut Txn, meta_dir: &Path, fail_after: Option<usize>) -> Result<()> {
|
fn apply_ops(root: &Path, tree: &Path, before: &Path, files: &[FileEntry], txn: &mut Txn, meta_dir: &Path, fail_after: Option<usize>) -> Result<()> {
|
||||||
@@ -378,14 +472,15 @@ fn apply_ops(root: &Path, tree: &Path, before: &Path, files: &[FileEntry], txn:
|
|||||||
let target = fsx::ensure_within(root, &fsx::safe_join(root, &path)?)?;
|
let target = fsx::ensure_within(root, &fsx::safe_join(root, &path)?)?;
|
||||||
let staged = fsx::safe_join(tree, &path)?;
|
let staged = fsx::safe_join(tree, &path)?;
|
||||||
let entry = files.iter().find(|f| f.path == path).expect("listed");
|
let entry = files.iter().find(|f| f.path == path).expect("listed");
|
||||||
txn.ops[i].started = true;
|
|
||||||
save(meta_dir, txn)?;
|
|
||||||
|
|
||||||
if target.is_file() {
|
if target.is_file() {
|
||||||
let keep = fsx::safe_join(before, &path)?;
|
let keep = fsx::safe_join(before, &path)?;
|
||||||
fs::create_dir_all(keep.parent().unwrap())?;
|
fs::create_dir_all(keep.parent().unwrap())?;
|
||||||
fs::copy(&target, &keep)?;
|
fsx::atomic_write(&keep, &fs::read(&target)?)?;
|
||||||
}
|
}
|
||||||
|
// Journal only after the old bytes are safely saved; a crash during backup must not
|
||||||
|
// turn an untouched file into a rollback operation with a missing saved copy.
|
||||||
|
txn.ops[i].started = true;
|
||||||
|
save(meta_dir, txn)?;
|
||||||
fs::create_dir_all(target.parent().unwrap())?;
|
fs::create_dir_all(target.parent().unwrap())?;
|
||||||
match action {
|
match action {
|
||||||
Action::Create | Action::Replace => {
|
Action::Create | Action::Replace => {
|
||||||
@@ -435,14 +530,14 @@ fn restore_files(root: &Path, before: &Path, txn: &mut Txn) -> Result<()> {
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Roll a transaction back (binaries and configuration only; databases are never touched).
|
/// 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> {
|
||||||
|
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) {
|
||||||
return Err(Error::Invalid("This update cannot be rolled back.".into()));
|
return Err(Error::Invalid("This update cannot be rolled back.".into()));
|
||||||
}
|
}
|
||||||
env.ensure_stopped()?;
|
restore_transaction(root, meta_dir, &txn_dir(meta_dir, id)?.join("before"), &mut txn, env)?;
|
||||||
restore_files(root, &txn_dir(meta_dir, id)?.join("before"), &mut txn)?;
|
|
||||||
txn.state = State::RolledBack;
|
txn.state = State::RolledBack;
|
||||||
txn.message = Some("rolled back".into());
|
txn.message = Some("rolled back".into());
|
||||||
save(meta_dir, &txn)?;
|
save(meta_dir, &txn)?;
|
||||||
@@ -450,9 +545,47 @@ pub fn rollback(root: &Path, meta_dir: &Path, id: &str, env: &dyn Env) -> Result
|
|||||||
Ok(txn)
|
Ok(txn)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub(crate) fn operation_lock(meta_dir: &Path) -> Result<fs::File> {
|
||||||
|
fs::create_dir_all(meta_dir)?;
|
||||||
|
let lock = fs::OpenOptions::new().read(true).write(true).create(true).truncate(false).open(meta_dir.join("update.lock"))?;
|
||||||
|
if !fs4::fs_std::FileExt::try_lock_exclusive(&lock)? {
|
||||||
|
return Err(Error::Invalid("Another update, repair or recovery is in progress.".into()));
|
||||||
|
}
|
||||||
|
Ok(lock)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Repair uses the same durable recovery journal as an update. Its caller holds operation_lock.
|
||||||
|
pub(crate) fn begin_repair(root: &Path, meta_dir: &Path, version: &str, backup: &str, files: &[FileEntry]) -> Result<Txn> {
|
||||||
|
let id = format!("{}-repair-{}", chrono::Utc::now().format("%Y%m%d-%H%M%S"), uuid::Uuid::new_v4().simple());
|
||||||
|
let before = txn_dir(meta_dir, &id)?.join("before");
|
||||||
|
fsx::atomic_write(&before.join("manager-install.json"), &fs::read(meta_dir.join("install.json"))?)?;
|
||||||
|
let mut ops = Vec::new();
|
||||||
|
for file in files {
|
||||||
|
let target = fsx::ensure_within(root, &fsx::safe_join(root, &file.path)?)?;
|
||||||
|
let had_previous = target.is_file();
|
||||||
|
if had_previous { fsx::atomic_write(&fsx::safe_join(&before, &file.path)?, &fs::read(&target)?)?; }
|
||||||
|
ops.push(Op { path: file.path.clone(), action: if had_previous { Action::Replace } else { Action::Create }, reason: None, new_sha256: file.sha256.clone(), had_previous, started: true, done: false });
|
||||||
|
}
|
||||||
|
let txn = Txn { id, state: State::Applying, from_version: Some(version.into()), to_version: version.into(), recovery_point: Some(backup.into()), databases_started: false, ops, message: Some("Repair is in progress.".into()) };
|
||||||
|
save(meta_dir, &txn)?;
|
||||||
|
Ok(txn)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(crate) fn repair_migrating(meta_dir: &Path, txn: &mut Txn) -> Result<()> {
|
||||||
|
txn.state = State::Applied;
|
||||||
|
txn.databases_started = true;
|
||||||
|
save(meta_dir, txn)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(crate) fn finish_repair(root: &Path, meta_dir: &Path, txn: &mut Txn, success: bool, env: &dyn Env) -> Result<()> {
|
||||||
|
if !success { restore_transaction(root, meta_dir, &txn_dir(meta_dir, &txn.id)?.join("before"), txn, env)?; }
|
||||||
|
txn.state = if success { State::Committed } else { State::RolledBack };
|
||||||
|
save(meta_dir, txn)
|
||||||
|
}
|
||||||
|
|
||||||
fn prune(meta_dir: &Path, keep: usize) {
|
fn prune(meta_dir: &Path, keep: usize) {
|
||||||
let Ok(rd) = fs::read_dir(updates_dir(meta_dir)) else { return };
|
let Ok(rd) = fs::read_dir(updates_dir(meta_dir)) else { return };
|
||||||
let mut dirs: Vec<_> = rd.flatten().filter(|e| e.path().join("txn.json").is_file()).map(|e| e.path()).collect();
|
let mut dirs: Vec<_> = rd.flatten().filter(|e| fsx::read_json::<Txn>(&e.path().join("txn.json")).is_ok_and(|t| matches!(t.state, State::Committed | State::RolledBack))).map(|e| e.path()).collect();
|
||||||
dirs.sort();
|
dirs.sort();
|
||||||
while dirs.len() > keep {
|
while dirs.len() > keep {
|
||||||
let _ = fs::remove_dir_all(dirs.remove(0));
|
let _ = fs::remove_dir_all(dirs.remove(0));
|
||||||
@@ -465,6 +598,35 @@ pub struct RepackEnv<'a> {
|
|||||||
pub meta_dir: &'a Path,
|
pub meta_dir: &'a Path,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl RepackEnv<'_> {
|
||||||
|
pub(crate) fn verify_recovery_point(&self, point: &crate::backup::RecoveryPoint) -> Result<()> {
|
||||||
|
if point.kind != crate::backup::Kind::Full || !["characters", "auth", "world", "configs"].iter().all(|name| point.components.iter().any(|c| c.name == *name)) {
|
||||||
|
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())); }
|
||||||
|
crate::backup::with_database(self.root, |db| {
|
||||||
|
let db = db.clone().for_realm(crate::realms::Mode::Coa);
|
||||||
|
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)? };
|
||||||
|
if db.extra_objects(schema)? != 0 {
|
||||||
|
return Err(Error::Invalid(format!("Database {schema} has routines, triggers or views that automatic recovery cannot restore. The update was not started.")));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
fn migration_snapshot(&self) -> Result<String> {
|
||||||
|
if let Some(id) = unfinished(self.meta_dir).and_then(|t| t.recovery_point) {
|
||||||
|
if crate::backup::get(self.meta_dir, &id)?.kind == crate::backup::Kind::Full && crate::backup::verify(self.meta_dir, &id)?.ok {
|
||||||
|
return Ok(id);
|
||||||
|
}
|
||||||
|
return Err(Error::Invalid("The update recovery point is incomplete or damaged.".into()));
|
||||||
|
}
|
||||||
|
Ok(crate::backup::create(self.root, self.meta_dir, crate::backup::Kind::Full, crate::backup::Trigger::BeforeMigration, None, &|_| {})?.id)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
impl Env for RepackEnv<'_> {
|
impl Env for RepackEnv<'_> {
|
||||||
fn ensure_stopped(&self) -> Result<()> {
|
fn ensure_stopped(&self) -> Result<()> {
|
||||||
use crate::process::{observe, ServiceState};
|
use crate::process::{observe, ServiceState};
|
||||||
@@ -477,15 +639,30 @@ impl Env for RepackEnv<'_> {
|
|||||||
|
|
||||||
fn snapshot(&self) -> Result<String> {
|
fn snapshot(&self) -> Result<String> {
|
||||||
let label = Some("before update".to_string());
|
let label = Some("before update".to_string());
|
||||||
Ok(crate::backup::create(self.root, self.meta_dir, crate::backup::Kind::Quick, crate::backup::Trigger::BeforeUpdate, label, &|_| {})?.id)
|
let point = crate::backup::create(self.root, self.meta_dir, crate::backup::Kind::Full, crate::backup::Trigger::BeforeUpdate, label, &|_| {})?;
|
||||||
|
self.verify_recovery_point(&point)?;
|
||||||
|
Ok(point.id)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn restore_snapshot(&self, id: &str) -> Result<()> {
|
||||||
|
let point = crate::backup::get(self.meta_dir, id)?;
|
||||||
|
if point.kind != crate::backup::Kind::Full { return Err(Error::Invalid("Database rollback requires a full recovery point.".into())); }
|
||||||
|
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()));
|
||||||
|
}
|
||||||
|
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_configs(self.root, self.meta_dir, id)?;
|
||||||
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
fn migrate(&self, manifest: &Manifest, staged: &Path) -> Result<ApplyReport> {
|
fn migrate(&self, manifest: &Manifest, staged: &Path) -> Result<ApplyReport> {
|
||||||
let (root, meta) = (self.root, self.meta_dir);
|
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)?;
|
||||||
let mut result = crate::migrations::apply_pending(db, &manifest.migrations, staged, &|| {
|
let mut result = crate::migrations::apply_pending(db, &manifest.migrations, staged, &|| {
|
||||||
Ok(crate::backup::create(root, meta, crate::backup::Kind::Full, crate::backup::Trigger::BeforeMigration, None, &|_| {})?.id)
|
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 };
|
||||||
@@ -494,7 +671,7 @@ impl Env for RepackEnv<'_> {
|
|||||||
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, &|| {
|
||||||
if let Some(id) = &shared_snapshot { return Ok(id.clone()); }
|
if let Some(id) = &shared_snapshot { return Ok(id.clone()); }
|
||||||
Ok(crate::backup::create(root, meta, crate::backup::Kind::Full, crate::backup::Trigger::BeforeMigration, None, &|_| {})?.id)
|
self.migration_snapshot()
|
||||||
})?;
|
})?;
|
||||||
result.applied.extend(extra.applied);
|
result.applied.extend(extra.applied);
|
||||||
result.failed = extra.failed;
|
result.failed = extra.failed;
|
||||||
@@ -517,6 +694,16 @@ impl Env for RepackEnv<'_> {
|
|||||||
|
|
||||||
fn validate(&self) -> Result<()> {
|
fn validate(&self) -> Result<()> {
|
||||||
use crate::process::{observe, ServiceState};
|
use crate::process::{observe, ServiceState};
|
||||||
|
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
|
// 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.
|
// (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) {
|
match crate::registry::MetaDir::open(self.meta_dir) {
|
||||||
@@ -528,14 +715,24 @@ impl Env for RepackEnv<'_> {
|
|||||||
let _ = crate::config::create_missing_module_configs(self.root);
|
let _ = crate::config::create_missing_module_configs(self.root);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
let started = crate::driver::run(self.root, crate::driver::Verb::StartAll)?;
|
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 ports = crate::layout::read_ports(self.root);
|
||||||
let healthy = started.ok && {
|
let healthy = started.ok && {
|
||||||
let deadline = std::time::Instant::now() + std::time::Duration::from_secs(180);
|
let deadline = std::time::Instant::now() + std::time::Duration::from_secs(180);
|
||||||
|
let mut ready_since = None;
|
||||||
loop {
|
loop {
|
||||||
let o = observe(self.root, &ports);
|
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) {
|
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) {
|
||||||
break true;
|
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 {
|
if std::time::Instant::now() > deadline {
|
||||||
break false;
|
break false;
|
||||||
@@ -546,7 +743,7 @@ impl Env for RepackEnv<'_> {
|
|||||||
if healthy {
|
if healthy {
|
||||||
return Ok(());
|
return Ok(());
|
||||||
}
|
}
|
||||||
let cause = started.human.map(|h| h.title.to_string()).or_else(|| crate::health::diagnose_installation(self.root).map(|c| c.human().title.to_string())).unwrap_or_else(|| "the server did not become ready".into());
|
let cause = crate::driver::startup_failure(self.root, &started);
|
||||||
// Leave the files unlocked so that a rollback can replace them.
|
// Leave the files unlocked so that a rollback can replace them.
|
||||||
let _ = crate::driver::run(self.root, crate::driver::Verb::StopAll);
|
let _ = crate::driver::run(self.root, crate::driver::Verb::StopAll);
|
||||||
Err(Error::Invalid(cause))
|
Err(Error::Invalid(cause))
|
||||||
@@ -568,11 +765,12 @@ mod tests {
|
|||||||
snapshot_ok: Cell<bool>,
|
snapshot_ok: Cell<bool>,
|
||||||
calls: RefCell<Vec<&'static str>>,
|
calls: RefCell<Vec<&'static str>>,
|
||||||
migrate_fail: Cell<bool>,
|
migrate_fail: Cell<bool>,
|
||||||
|
restore_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) }
|
Fake { stopped: Cell::new(true), healthy: Cell::new(true), snapshot_ok: Cell::new(true), calls: Default::default(), migrate_fail: Cell::new(false), restore_fail: Cell::new(false) }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -589,6 +787,10 @@ mod tests {
|
|||||||
self.calls.borrow_mut().push("migrate");
|
self.calls.borrow_mut().push("migrate");
|
||||||
Ok(ApplyReport { applied: vec![], failed: self.migrate_fail.get().then(|| ("m1".to_string(), "syntax".to_string())), snapshot: None })
|
Ok(ApplyReport { applied: vec![], failed: self.migrate_fail.get().then(|| ("m1".to_string(), "syntax".to_string())), snapshot: None })
|
||||||
}
|
}
|
||||||
|
fn restore_snapshot(&self, _id: &str) -> Result<()> {
|
||||||
|
self.calls.borrow_mut().push("restore-databases");
|
||||||
|
if self.restore_fail.get() { Err(Error::Invalid("recovery disk unavailable".into())) } else { Ok(()) }
|
||||||
|
}
|
||||||
fn validate(&self) -> Result<()> {
|
fn validate(&self) -> Result<()> {
|
||||||
self.calls.borrow_mut().push("validate");
|
self.calls.borrow_mut().push("validate");
|
||||||
if self.healthy.get() { Ok(()) } else { Err(Error::Invalid("worldserver exited".into())) }
|
if self.healthy.get() { Ok(()) } else { Err(Error::Invalid("worldserver exited".into())) }
|
||||||
@@ -746,6 +948,53 @@ 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 retrying_startup_commits_without_reapplying_sql_or_restoring_databases() {
|
||||||
|
let w = world(&[], true);
|
||||||
|
let env = Fake::ok();
|
||||||
|
env.healthy.set(false);
|
||||||
|
let out = run(&w, &env, BTreeMap::new(), None).unwrap();
|
||||||
|
let calls = env.calls.borrow().len();
|
||||||
|
env.healthy.set(true);
|
||||||
|
let done = retry_validation(&w.root, &w.meta, &out.txn.id, &Source::Dir(w.pkg.clone()), &w.key, &env).unwrap();
|
||||||
|
assert_eq!(done.state, State::Committed);
|
||||||
|
assert_eq!(done.recovery_point, out.txn.recovery_point);
|
||||||
|
assert_eq!(&env.calls.borrow()[calls..], &["stop", "validate"]);
|
||||||
|
assert!(unfinished(&w.meta).is_none());
|
||||||
|
assert_eq!(MetaDir::open(&w.meta).unwrap().1.core.version.as_deref(), Some("2.0.0"));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn legacy_retry_uses_the_exact_signed_release_and_preserves_failure() {
|
||||||
|
let w = world(&[], false);
|
||||||
|
let env = Fake::ok();
|
||||||
|
env.healthy.set(false);
|
||||||
|
let out = run(&w, &env, BTreeMap::new(), None).unwrap();
|
||||||
|
let dir = txn_dir(&w.meta, &out.txn.id).unwrap();
|
||||||
|
fs::remove_file(dir.join("manifest.json")).unwrap();
|
||||||
|
fs::remove_file(dir.join("manifest.json.sig")).unwrap();
|
||||||
|
let pending = retry_validation(&w.root, &w.meta, &out.txn.id, &Source::Dir(w.pkg.clone()), &w.key, &env).unwrap();
|
||||||
|
assert_eq!(pending.state, State::NeedsDecision);
|
||||||
|
assert_eq!(pending.recovery_point, out.txn.recovery_point);
|
||||||
|
assert!(pending.message.unwrap().contains("worldserver exited"));
|
||||||
|
rollback(&w.root, &w.meta, &out.txn.id, &env).unwrap();
|
||||||
|
assert!(retry_validation(&w.root, &w.meta, &out.txn.id, &Source::Dir(w.pkg.clone()), &w.key, &env).is_err());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn retry_rejects_modified_binaries_and_unsigned_manifests() {
|
||||||
|
let w = world(&[], false);
|
||||||
|
let env = Fake::ok();
|
||||||
|
env.healthy.set(false);
|
||||||
|
let out = run(&w, &env, BTreeMap::new(), None).unwrap();
|
||||||
|
write(&w.root, "Core/worldserver.exe", b"unexpected binary");
|
||||||
|
assert!(retry_validation(&w.root, &w.meta, &out.txn.id, &Source::Dir(w.pkg.clone()), &w.key, &env).is_err());
|
||||||
|
write(&w.root, "Core/worldserver.exe", b"world-v2");
|
||||||
|
fs::write(txn_dir(&w.meta, &out.txn.id).unwrap().join("manifest.json.sig"), "invalid").unwrap();
|
||||||
|
assert!(retry_validation(&w.root, &w.meta, &out.txn.id, &Source::Dir(w.pkg.clone()), &w.key, &env).is_err());
|
||||||
|
assert_eq!(unfinished(&w.meta).unwrap().state, State::NeedsDecision);
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn crash_recovery_uses_the_journal() {
|
fn crash_recovery_uses_the_journal() {
|
||||||
let w = world(&[], false);
|
let w = world(&[], false);
|
||||||
@@ -787,6 +1036,7 @@ mod tests {
|
|||||||
let e = run(&w, &env, BTreeMap::new(), None).unwrap_err();
|
let e = run(&w, &env, BTreeMap::new(), None).unwrap_err();
|
||||||
assert!(e.to_string().contains("Database update m1 failed"));
|
assert!(e.to_string().contains("Database update m1 failed"));
|
||||||
assert_eq!(read(&w, "Core/worldserver.exe"), b"world-v1");
|
assert_eq!(read(&w, "Core/worldserver.exe"), b"world-v1");
|
||||||
|
assert!(env.calls.borrow().contains(&"restore-databases"));
|
||||||
assert!(!env.calls.borrow().contains(&"validate"), "the new build is never started after a failed migration");
|
assert!(!env.calls.borrow().contains(&"validate"), "the new build is never started after a failed migration");
|
||||||
let ok = Fake::ok();
|
let ok = Fake::ok();
|
||||||
let out = run(&w, &ok, BTreeMap::new(), None).unwrap();
|
let out = run(&w, &ok, BTreeMap::new(), None).unwrap();
|
||||||
@@ -794,6 +1044,93 @@ mod tests {
|
|||||||
assert_eq!(*ok.calls.borrow(), ["stop", "snapshot", "migrate", "validate"]);
|
assert_eq!(*ok.calls.borrow(), ["stop", "snapshot", "migrate", "validate"]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn failed_database_recovery_keeps_new_files_and_blocks_retry_until_recovered() {
|
||||||
|
let w = world(&[], true);
|
||||||
|
let env = Fake::ok();
|
||||||
|
env.migrate_fail.set(true);
|
||||||
|
env.restore_fail.set(true);
|
||||||
|
let error = run(&w, &env, BTreeMap::new(), None).unwrap_err();
|
||||||
|
assert!(error.to_string().contains("Recovery failed"));
|
||||||
|
assert_eq!(read(&w, "Core/worldserver.exe"), b"world-v2");
|
||||||
|
let pending = unfinished(&w.meta).unwrap();
|
||||||
|
assert_eq!(pending.state, State::Failed);
|
||||||
|
assert!(pending.databases_started);
|
||||||
|
assert!(txn_dir(&w.meta, &pending.id).unwrap().join("tree").exists());
|
||||||
|
assert!(run(&w, &Fake::ok(), BTreeMap::new(), None).unwrap_err().to_string().contains("unfinished"));
|
||||||
|
rollback(&w.root, &w.meta, &pending.id, &Fake::ok()).unwrap();
|
||||||
|
assert_eq!(read(&w, "Core/worldserver.exe"), b"world-v1");
|
||||||
|
assert!(unfinished(&w.meta).is_none());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn interrupted_migration_is_restored_before_files_and_never_replayed() {
|
||||||
|
let w = world(&[], true);
|
||||||
|
let env = Fake::ok();
|
||||||
|
env.healthy.set(false);
|
||||||
|
let out = run(&w, &env, BTreeMap::new(), None).unwrap();
|
||||||
|
let recovery = Fake::ok();
|
||||||
|
rollback(&w.root, &w.meta, &out.txn.id, &recovery).unwrap();
|
||||||
|
assert_eq!(*recovery.calls.borrow(), ["stop", "restore-databases"]);
|
||||||
|
assert_eq!(read(&w, "Core/worldserver.exe"), b"world-v1");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn concurrent_updates_are_rejected_without_changes() {
|
||||||
|
let w = world(&[], false);
|
||||||
|
let _lock = operation_lock(&w.meta).unwrap();
|
||||||
|
assert!(run(&w, &Fake::ok(), BTreeMap::new(), None).unwrap_err().to_string().contains("in progress"));
|
||||||
|
assert!(crate::driver::run(&w.root, crate::driver::Verb::StartAll).unwrap_err().to_string().contains("in progress"));
|
||||||
|
assert!(crate::modules::set_enabled(&w.root, &w.meta, "companions", true).unwrap_err().to_string().contains("in progress"));
|
||||||
|
assert!(crate::realms::select(&w.root, crate::realms::Mode::Wildcard).unwrap_err().to_string().contains("in progress"));
|
||||||
|
assert_eq!(read(&w, "Core/worldserver.exe"), b"world-v1");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn interrupted_repair_restores_files_databases_and_ownership_metadata() {
|
||||||
|
let w = world(&[], false);
|
||||||
|
let files = vec![
|
||||||
|
FileEntry { path: "Core/worldserver.exe".into(), sha256: fsx::sha256_bytes(b"repaired"), size: 8, owner: crate::manifest::Owner::Core, policy: ReplacePolicy::Replace },
|
||||||
|
FileEntry { path: "Core/repair-created.dll".into(), sha256: fsx::sha256_bytes(b"created"), size: 7, owner: crate::manifest::Owner::Core, policy: ReplacePolicy::Replace },
|
||||||
|
];
|
||||||
|
let mut txn = begin_repair(&w.root, &w.meta, "1.0.0", "full-backup", &files).unwrap();
|
||||||
|
write(&w.root, "Core/worldserver.exe", b"repaired");
|
||||||
|
write(&w.root, "Core/repair-created.dll", b"created");
|
||||||
|
repair_migrating(&w.meta, &mut txn).unwrap();
|
||||||
|
assert_eq!(unfinished(&w.meta).unwrap().id, txn.id);
|
||||||
|
let env = Fake::ok();
|
||||||
|
rollback(&w.root, &w.meta, &txn.id, &env).unwrap();
|
||||||
|
assert_eq!(read(&w, "Core/worldserver.exe"), b"world-v1");
|
||||||
|
assert!(!w.root.join("Core/repair-created.dll").exists());
|
||||||
|
assert_eq!(*env.calls.borrow(), ["stop", "restore-databases"]);
|
||||||
|
assert!(unfinished(&w.meta).is_none());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn unreadable_update_journal_blocks_changes_and_startup() {
|
||||||
|
let w = world(&[], false);
|
||||||
|
write(&w.meta, "updates/broken/txn.json", b"{truncated");
|
||||||
|
assert!(run(&w, &Fake::ok(), BTreeMap::new(), None).unwrap_err().to_string().contains("cannot be read"));
|
||||||
|
assert!(crate::driver::run(&w.root, crate::driver::Verb::StartAll).unwrap_err().to_string().contains("cannot be read"));
|
||||||
|
assert_eq!(read(&w, "Core/worldserver.exe"), b"world-v1");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn crash_during_commit_restores_the_original_installation_metadata() {
|
||||||
|
let w = world(&[], false);
|
||||||
|
let env = Fake::ok();
|
||||||
|
env.healthy.set(false);
|
||||||
|
let out = run(&w, &env, BTreeMap::new(), None).unwrap();
|
||||||
|
let (_, mut meta) = MetaDir::open(&w.meta).unwrap();
|
||||||
|
meta.core.version = Some("2.0.0".into());
|
||||||
|
meta.core.commit = Some("a".repeat(40));
|
||||||
|
fsx::atomic_write_json(&w.meta.join("install.json"), &meta).unwrap();
|
||||||
|
rollback(&w.root, &w.meta, &out.txn.id, &Fake::ok()).unwrap();
|
||||||
|
let (_, restored) = MetaDir::open(&w.meta).unwrap();
|
||||||
|
assert_eq!(restored.core.version.as_deref(), Some("1.0.0"));
|
||||||
|
assert_eq!(restored.core.commit, None);
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn bad_signature_and_wrong_package_kind_change_nothing() {
|
fn bad_signature_and_wrong_package_kind_change_nothing() {
|
||||||
let w = world(&[], false);
|
let w = world(&[], false);
|
||||||
|
|||||||
@@ -2,7 +2,9 @@
|
|||||||
//!
|
//!
|
||||||
//! coa-release pack-base --tree DIR --out DIR --version X [--core-commit SHA] [--part-size BYTES]
|
//! coa-release pack-base --tree DIR --out DIR --version X [--core-commit SHA] [--part-size BYTES]
|
||||||
//! coa-release pack-update --tree DIR --base-manifest FILE --core DIR --out DIR --version X
|
//! coa-release pack-update --tree DIR --base-manifest FILE --core DIR --out DIR --version X
|
||||||
//! [--bots DIR] [--core-commit SHA] [--bots-commit SHA] [--part-size BYTES]
|
//! [--bots DIR] [--repairs DIR] [--core-commit SHA] [--bots-commit SHA] [--part-size BYTES]
|
||||||
|
//! coa-release extract-schema-base --package DIR --fixture NEW-coa-schema-fixture-DIR
|
||||||
|
//! coa-release schema-contract --repack FIXTURE --tree DIR --core DIR [--bots DIR] [--repairs DIR]
|
||||||
//! coa-release clean-base --repack DIR --core DIR --tree DIR --out DIR [--bots DIR] [--data DIR]
|
//! coa-release clean-base --repack DIR --core DIR --tree DIR --out DIR [--bots DIR] [--data DIR]
|
||||||
//! coa-release sign --dir DIR (key: env COA_SIGNING_KEY, or ~/.coa-manager/signing/manifest-signing.key)
|
//! coa-release sign --dir DIR (key: env COA_SIGNING_KEY, or ~/.coa-manager/signing/manifest-signing.key)
|
||||||
//! coa-release verify --dir DIR (against the public key built into this tool)
|
//! coa-release verify --dir DIR (against the public key built into this tool)
|
||||||
@@ -12,7 +14,7 @@ use std::path::PathBuf;
|
|||||||
|
|
||||||
use coa_core::manifest::{Kind, Manifest};
|
use coa_core::manifest::{Kind, Manifest};
|
||||||
use coa_core::package::{build, BuildOptions, DEFAULT_PART_SIZE};
|
use coa_core::package::{build, BuildOptions, DEFAULT_PART_SIZE};
|
||||||
use coa_core::release::{collect_bots_sql, collect_core_sql, pack_update, sign_manifest, UpdateParams};
|
use coa_core::release::{pack_update, sign_manifest, UpdateParams};
|
||||||
|
|
||||||
fn args(rest: &[String]) -> HashMap<String, String> {
|
fn args(rest: &[String]) -> HashMap<String, String> {
|
||||||
let mut m = HashMap::new();
|
let mut m = HashMap::new();
|
||||||
@@ -44,23 +46,38 @@ 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() {
|
||||||
|
"extract-schema-base" => {
|
||||||
|
coa_core::release_schema::extract_base(
|
||||||
|
&PathBuf::from(need(&a, "package")?), &PathBuf::from(need(&a, "fixture")?),
|
||||||
|
coa_core::signing::EMBEDDED_PUBLIC_KEY,
|
||||||
|
).map_err(e)?;
|
||||||
|
println!("signed base extracted into a disposable database fixture");
|
||||||
|
}
|
||||||
"schema-contract" => {
|
"schema-contract" => {
|
||||||
let repack = PathBuf::from(need(&a, "repack")?);
|
let repack = PathBuf::from(need(&a, "repack")?);
|
||||||
let tree = PathBuf::from(need(&a, "tree")?);
|
let tree = PathBuf::from(need(&a, "tree")?);
|
||||||
coa_core::backup::with_database(&repack, |db| coa_core::schema_check::capture(db, &tree)).map_err(e)?;
|
if let Some(core) = a.get("core") {
|
||||||
|
let bots = a.get("bots").map(PathBuf::from);
|
||||||
|
let repairs = a.get("repairs").map(PathBuf::from);
|
||||||
|
let sql = coa_core::release_schema::collect(&PathBuf::from(core), bots.as_deref(), repairs.as_deref()).map_err(e)?;
|
||||||
|
coa_core::release_schema::capture_release(&repack, &tree, &sql).map_err(e)?;
|
||||||
|
} else {
|
||||||
|
coa_core::backup::with_database(&repack, |db| coa_core::schema_check::capture(db, &tree)).map_err(e)?;
|
||||||
|
}
|
||||||
println!("database schema contract captured");
|
println!("database schema contract captured");
|
||||||
}
|
}
|
||||||
"pack-base" => {
|
"pack-base" => {
|
||||||
|
coa_core::schema_check::require_release_contract(&PathBuf::from(need(&a, "tree")?)).map_err(e)?;
|
||||||
let opts = BuildOptions { kind: Kind::Base, version: need(&a, "version")?.clone(), core_commit: a.get("core-commit").cloned(), built_at: chrono_now(), part_size: part, bots_commit: a.get("bots-commit").cloned(), migrations: vec![] };
|
let opts = BuildOptions { kind: Kind::Base, version: need(&a, "version")?.clone(), core_commit: a.get("core-commit").cloned(), built_at: chrono_now(), part_size: part, bots_commit: a.get("bots-commit").cloned(), migrations: vec![] };
|
||||||
let m = build(&PathBuf::from(need(&a, "tree")?), &PathBuf::from(need(&a, "out")?), &opts, &|s| eprintln!("{s}")).map_err(e)?;
|
let m = build(&PathBuf::from(need(&a, "tree")?), &PathBuf::from(need(&a, "out")?), &opts, &|s| eprintln!("{s}")).map_err(e)?;
|
||||||
println!("base {}: {} files, {} parts", m.version, m.files.len(), m.archive.as_ref().map(|x| x.parts.len()).unwrap_or(0));
|
println!("base {}: {} files, {} parts", m.version, m.files.len(), m.archive.as_ref().map(|x| x.parts.len()).unwrap_or(0));
|
||||||
}
|
}
|
||||||
"pack-update" => {
|
"pack-update" => {
|
||||||
let base: Manifest = Manifest::parse(&std::fs::read(need(&a, "base-manifest")?).map_err(|x| x.to_string())?).map_err(e)?;
|
let base: Manifest = Manifest::parse(&std::fs::read(need(&a, "base-manifest")?).map_err(|x| x.to_string())?).map_err(e)?;
|
||||||
let mut sql = collect_core_sql(&PathBuf::from(need(&a, "core")?)).map_err(e)?;
|
coa_core::schema_check::require_release_contract(&PathBuf::from(need(&a, "tree")?)).map_err(e)?;
|
||||||
if let Some(b) = a.get("bots") {
|
let bots = a.get("bots").map(PathBuf::from);
|
||||||
sql.extend(collect_bots_sql(&PathBuf::from(b)).map_err(e)?);
|
let repairs = a.get("repairs").map(PathBuf::from);
|
||||||
}
|
let sql = coa_core::release_schema::collect(&PathBuf::from(need(&a, "core")?), bots.as_deref(), repairs.as_deref()).map_err(e)?;
|
||||||
let out = PathBuf::from(need(&a, "out")?);
|
let out = PathBuf::from(need(&a, "out")?);
|
||||||
let m = pack_update(
|
let m = pack_update(
|
||||||
&UpdateParams { tree: &PathBuf::from(need(&a, "tree")?), base_manifest: &base, sql: &sql, out: &out, version: need(&a, "version")?.clone(), core_commit: a.get("core-commit").cloned(), bots_commit: a.get("bots-commit").cloned(), part_size: part },
|
&UpdateParams { tree: &PathBuf::from(need(&a, "tree")?), base_manifest: &base, sql: &sql, out: &out, version: need(&a, "version")?.clone(), core_commit: a.get("core-commit").cloned(), bots_commit: a.get("bots-commit").cloned(), part_size: part },
|
||||||
@@ -78,22 +95,29 @@ fn run() -> Result<(), String> {
|
|||||||
}
|
}
|
||||||
"sign" => {
|
"sign" => {
|
||||||
let dir = PathBuf::from(need(&a, "dir")?);
|
let dir = PathBuf::from(need(&a, "dir")?);
|
||||||
|
require_contract_entry(&dir)?;
|
||||||
sign_manifest(&dir, &signing_key()?).map_err(e)?;
|
sign_manifest(&dir, &signing_key()?).map_err(e)?;
|
||||||
|
coa_core::release_schema::verify_package(&dir, coa_core::signing::EMBEDDED_PUBLIC_KEY).map_err(e)?;
|
||||||
println!("signed {}", dir.join("manifest.json").display());
|
println!("signed {}", dir.join("manifest.json").display());
|
||||||
}
|
}
|
||||||
"verify" => {
|
"verify" => {
|
||||||
let dir = PathBuf::from(need(&a, "dir")?);
|
let dir = PathBuf::from(need(&a, "dir")?);
|
||||||
let bytes = std::fs::read(dir.join("manifest.json")).map_err(|x| x.to_string())?;
|
coa_core::release_schema::verify_package(&dir, coa_core::signing::EMBEDDED_PUBLIC_KEY).map_err(e)?;
|
||||||
let sig = std::fs::read_to_string(dir.join("manifest.json.sig")).map_err(|x| x.to_string())?;
|
println!("signature, archive contents and database schema contract OK");
|
||||||
coa_core::signing::verify_embedded(&bytes, &sig).map_err(e)?;
|
|
||||||
Manifest::parse(&bytes).map_err(e)?;
|
|
||||||
println!("signature and manifest OK");
|
|
||||||
}
|
}
|
||||||
other => return Err(format!("unknown command {other}")),
|
other => return Err(format!("unknown command {other}")),
|
||||||
}
|
}
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn require_contract_entry(dir: &std::path::Path) -> Result<(), String> {
|
||||||
|
let manifest = Manifest::parse(&std::fs::read(dir.join("manifest.json")).map_err(|e| e.to_string())?).map_err(|e| e.to_string())?;
|
||||||
|
if !manifest.files.iter().any(|f| f.path == coa_core::schema_check::CONTRACT && f.size > 0) {
|
||||||
|
return Err("The release is missing its database schema contract; refusing to sign or publish it.".into());
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
fn chrono_now() -> String {
|
fn chrono_now() -> String {
|
||||||
chrono::Utc::now().to_rfc3339()
|
chrono::Utc::now().to_rfc3339()
|
||||||
}
|
}
|
||||||
|
|||||||
+29
-12
@@ -233,18 +233,21 @@ hash**: current == recorded → safe to replace; current ≠ recorded → *modif
|
|||||||
2. **Download** to `staging\<txid>\dl\` with `.part` files, HTTP Range resume, retry/backoff, cancel, progress.
|
2. **Download** to `staging\<txid>\dl\` with `.part` files, HTTP Range resume, retry/backoff, cancel, progress.
|
||||||
3. **Verify** — SHA-256 of every artefact; nothing is executed or extracted into the live tree before this.
|
3. **Verify** — SHA-256 of every artefact; nothing is executed or extracted into the live tree before this.
|
||||||
4. **Snapshot** — server must be stopped (never copy over a running worldserver); create recovery point:
|
4. **Snapshot** — server must be stopped (never copy over a running worldserver); create recovery point:
|
||||||
replaced binaries, changed managed configs, module state, `characters`+`auth` dump (world optional);
|
replaced binaries, changed managed configs, module state, full dumps of every managed realm database;
|
||||||
write `txn.json {state: Snapshotted}`.
|
write `txn.json {state: Snapshotted}`.
|
||||||
5. **Apply** into `staging\<txid>\tree\`, resolve ownership conflicts, merge configs, then swap file-by-file with
|
5. **Apply** into `staging\<txid>\tree\`, resolve ownership conflicts, merge configs, then swap file-by-file with
|
||||||
same-volume atomic renames, journaling each step (`txn.json` lists done/undone operations).
|
same-volume atomic renames, journaling each step (`txn.json` lists done/undone operations).
|
||||||
6. **Migrate** — run pending SQL through the tracked runner (D7); failure ⇒ stop, keep DB backup, offer restore.
|
6. **Migrate** — durably mark SQL as running before execution. Failure restores the full database recovery point
|
||||||
7. **Validate** — start server, health check (D3) with timeout.
|
before restoring files. Interrupted SQL is never automatically replayed.
|
||||||
|
7. **Validate** — check database structure, start server, require ten seconds of continuous readiness with timeout.
|
||||||
8. **Commit** — ownership table + `install.json` version bump, mark txn `Committed`, prune staging.
|
8. **Commit** — ownership table + `install.json` version bump, mark txn `Committed`, prune staging.
|
||||||
Any crash before Commit leaves `txn.json` in a non-terminal state; on next launch the Manager detects it and
|
Any crash before Commit leaves `txn.json` in a non-terminal state; on next launch the Manager detects it and
|
||||||
offers *Roll forward* or *Roll back* — the install is "recoverable" by construction.
|
offers *Roll forward* or *Roll back* — the install is "recoverable" by construction.
|
||||||
|
|
||||||
Rollback = binaries + managed config state + module state only. Database restore is a **separate explicit
|
Rollback restores files, configuration and installation metadata. Once migrations started, it also restores all
|
||||||
action** (spec §19–20).
|
databases from the full pre-update recovery point. Failed recovery remains unfinished and blocks startup and another
|
||||||
|
update. The same journal protects Repair. Old transactions without a full recovery point cannot roll back database
|
||||||
|
changes automatically. Independent database restore remains available for other recovery points.
|
||||||
|
|
||||||
### D7. Database strategy (`db` module)
|
### D7. Database strategy (`db` module)
|
||||||
|
|
||||||
@@ -253,14 +256,15 @@ action** (spec §19–20).
|
|||||||
native Rust client (`mysql_async`) is used for health pings and migration ledger reads.
|
native Rust client (`mysql_async`) is used for health pings and migration ledger reads.
|
||||||
* Ledger: table `acore_world.coa_manager_migrations(id, db, sha256, applied_at, status, error)` (created by the
|
* Ledger: table `acore_world.coa_manager_migrations(id, db, sha256, applied_at, status, error)` (created by the
|
||||||
Manager, in a dedicated table — no core schema is changed) mirrored to `.manager\migrations\`.
|
Manager, in a dedicated table — no core schema is changed) mirrored to `.manager\migrations\`.
|
||||||
Statuses `Applied | Pending | Failed`. Each file runs in a single connection; DDL is not transactional, so
|
Statuses `Applied | Pending | Failed | Running`. Each file runs in a single connection; DDL is not transactional, so
|
||||||
"destructive" migrations (flag in manifest, or heuristic scan for `DROP|TRUNCATE|DELETE|ALTER ... DROP`) force
|
"destructive" migrations (flag in manifest, or heuristic scan for `DROP|TRUNCATE|DELETE|ALTER ... DROP`) force
|
||||||
a fresh DB backup first and require explicit confirmation.
|
a fresh DB backup first and require explicit confirmation.
|
||||||
* Backups: `mysqldump --single-transaction --routines --quick` per DB. Quick = characters + auth + configs +
|
* Backups: `mysqldump --single-transaction --routines --quick` per DB. Quick = characters + auth + configs +
|
||||||
metadata; Full adds world (large); Config-only; DB-only. Compressed with zstd. Restore is always to a
|
metadata; Full adds world (large); Config-only; DB-only. Compressed with zstd. Restore is always to a
|
||||||
staging schema first (`…_restore`), swapped only after a row-count sanity check, with the current DB dumped
|
staging schema first (`…_restore`), swapped only after a row-count sanity check, with the current DB dumped
|
||||||
beforehand.
|
beforehand.
|
||||||
* Never: `DROP DATABASE`, resetting characters, overwriting DBs, or restoring DB on a binary rollback. Delete/
|
* Never: `DROP DATABASE` or resetting characters. Update recovery restores databases into staging schemas and
|
||||||
|
keeps the replaced tables in separate schemas. Delete/
|
||||||
reset lives only in **Settings → Advanced → Danger Zone**, deletes tracked files only, and refuses to remove a
|
reset lives only in **Settings → Advanced → Danger Zone**, deletes tracked files only, and refuses to remove a
|
||||||
directory that still contains untracked files.
|
directory that still contains untracked files.
|
||||||
* Clean install: extract `mysql\data.7z` (packaged data dir), then **rotate** root/app passwords to fresh random
|
* Clean install: extract `mysql\data.7z` (packaged data dir), then **rotate** root/app passwords to fresh random
|
||||||
@@ -365,8 +369,13 @@ hand over to `coa_core::docker`; nothing else needed to change for start, stop,
|
|||||||
inside listens, so a plain connect proves nothing.
|
inside listens, so a plain connect proves nothing.
|
||||||
* **Configuration path in the binaries**: Linux builds must use `-DCONF_DIR=configs` (see `coa-server-build`),
|
* **Configuration path in the binaries**: Linux builds must use `-DCONF_DIR=configs` (see `coa-server-build`),
|
||||||
otherwise the core looks for module configs in a path baked in at build time.
|
otherwise the core looks for module configs in a path baked in at build time.
|
||||||
* **Not done yet**: installation and the database setup (schemas, `acore` user), backups and database access through the
|
* **Database access** (`db.rs`): for a Docker installation `Db` runs `mysql`, `mysqldump` and `mysqladmin` inside the
|
||||||
container, updates, port conflict detection, the firewall and exposure checks, and the client under Wine/Proton.
|
database container with `docker exec -i`, connecting over TCP on the container's loopback exactly as the repack's
|
||||||
|
commands do on the host (password through `MYSQL_PWD`, never on a command line). Nothing else changes: accounts,
|
||||||
|
backups, the population query, migrations and the RA service account all go through `Db`, and the host needs no
|
||||||
|
MySQL client. A repack keeps using its bundled tools.
|
||||||
|
* **Not done yet**: installation and the database setup (schemas, `acore` user), updates, port conflict detection,
|
||||||
|
the firewall and exposure checks, the Wildcard realm profiles, and the client under Wine/Proton.
|
||||||
|
|
||||||
---------------------------------------------------------------------------------------------------------
|
---------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
@@ -392,8 +401,11 @@ files the running server itself changes, diffed before/after.
|
|||||||
disk-full at write n, network cut at byte n, migration returns error, new worldserver exits non-zero, port
|
disk-full at write n, network cut at byte n, migration returns error, new worldserver exits non-zero, port
|
||||||
taken, exe quarantined (file vanishes), folder moved, user-modified managed file, unknown config keys.
|
taken, exe quarantined (file vanishes), folder moved, user-modified managed file, unknown config keys.
|
||||||
|
|
||||||
### 3.4 Rollback — restore recovery point's binaries/configs/module state; database untouched unless the user
|
### 3.4 Rollback — restore the pre-update databases when migrations started, followed by files and metadata
|
||||||
picks "Restore database" separately (shows dump timestamp and warns that progress since then is lost).
|
|
||||||
|
The UI explains that progress after the recovery point is lost. SQL failures before startup recover automatically;
|
||||||
|
failed health checks keep the installation blocked until the owner chooses recovery. Every recovery point and staging
|
||||||
|
schema has a unique identifier, and corrupt update journals fail closed.
|
||||||
|
|
||||||
---------------------------------------------------------------------------------------------------------
|
---------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
@@ -566,6 +578,11 @@ The reference install classifies as **Healthy (customised)**: repack shape, bina
|
|||||||
* **UI:** PLAY becomes **UPDATE CLIENT** when a tracked client is outdated (with "Play without updating"); with no client linked it
|
* **UI:** PLAY becomes **UPDATE CLIENT** when a tracked client is outdated (with "Play without updating"); with no client linked it
|
||||||
becomes **Set up game client** (choose an existing folder, or download into `<chosen folder>/CoA Client` with a free-space check).
|
becomes **Set up game client** (choose an existing folder, or download into `<chosen folder>/CoA Client` with a free-space check).
|
||||||
An existing client that is not tracked can be adopted from Settings > Game client ("Keep this client up to date").
|
An existing client that is not tracked can be adopted from Settings > Game client ("Keep this client up to date").
|
||||||
A fresh download gets `realmlist.wtf` for each installed locale (the manifest has none) and the companion addon.
|
A fresh download gets `realmlist.wtf` for each installed locale (the manifest has none) and, for local hosts, the companion addon.
|
||||||
|
* **Joining another server:** the welcome screen offers hosting or joining. Joining uses a separate player profile in
|
||||||
|
the Manager's `remote-client/connection.json`, storing the host address and client folder without a server registry entry,
|
||||||
|
installation metadata, database or server processes. Only Overview and application Settings appear in the sidebar.
|
||||||
|
Downloading, adopting and updating clients use the same verified downloader; Play applies the saved realmlist without
|
||||||
|
forcing a local realm selection. The player can return to hosting without removing their saved connection.
|
||||||
* **Open points:** ask the launcher maintainers before putting heavy load on their API; DBCs live inside the MPQ patch archives
|
* **Open points:** ask the launcher maintainers before putting heavy load on their API; DBCs live inside the MPQ patch archives
|
||||||
(extracting them would need an MPQ reader), so the server's `Data\dbc` still comes from our `base` package for now.
|
(extracting them would need an MPQ reader), so the server's `Data\dbc` still comes from our `base` package for now.
|
||||||
@@ -15,10 +15,15 @@ Repair reports unresolved schema damage. It does not guess ALTER statements or r
|
|||||||
For each update, capture a fresh contract **from a disposable database already migrated to the exact packaged core**, into the release tree before `pack-update`:
|
For each update, capture a fresh contract **from a disposable database already migrated to the exact packaged core**, into the release tree before `pack-update`:
|
||||||
|
|
||||||
```powershell
|
```powershell
|
||||||
cargo run -p coa-release -- schema-contract --repack C:\games\release-fixture --tree C:\games\release-tree
|
cargo run -p coa-release -- extract-schema-base --package C:\games\signed-base --fixture C:\games\coa-schema-fixture-build
|
||||||
|
cargo run -p coa-release -- schema-contract --repack C:\games\coa-schema-fixture-build --tree C:\games\release-tree --core C:\games\release-core --bots C:\games\release-bots --repairs C:\games\release-repairs
|
||||||
```
|
```
|
||||||
|
|
||||||
The regular packager includes the contract and its hash in the signed manifest. Never capture it from a user's server or from the previous release database.
|
The first command verifies every entry in the signed base archive and extracts only the runtime needed for a disposable database. The second applies the release SQL with temporary ports, checks critical feature tables independently of migration history, and captures the resulting schema. It requires the disposable fixture marker and never starts a world server.
|
||||||
|
|
||||||
|
Base and update packaging require a complete contract for all three databases. Cumulative updates always carry it, even when unchanged. Signing and verification check the archive contents and contract before publication. Never capture it from a user's server or from an unmigrated previous release database.
|
||||||
|
|
||||||
|
Corrective SQL under `repairs/{auth,characters,world}` receives new `manager_repair__` migration IDs and runs after historical SQL. Missing Wildcard tables can therefore be restored without replaying historical data deletion. Existing malformed tables still fail schema checks; creating a missing table does not recover its lost rows.
|
||||||
|
|
||||||
## Simultaneous worlds
|
## Simultaneous worlds
|
||||||
|
|
||||||
|
|||||||
+11
-6
@@ -76,10 +76,12 @@
|
|||||||
"fr": "Remplit l'hôtel des ventes d'annonces réalistes et réglables.",
|
"fr": "Remplit l'hôtel des ventes d'annonces réalistes et réglables.",
|
||||||
"es": "Llena la casa de subastas con ofertas realistas y ajustables."
|
"es": "Llena la casa de subastas con ofertas realistas y ajustables."
|
||||||
},
|
},
|
||||||
"repo": "https://github.com/NathanHandley/mod-ah-bot-plus",
|
"repo": "https://github.com/Corfirean/azerothcore-wotlk-coa/tree/coa-bots/modules/mod-ah-bot-plus",
|
||||||
"conf": "mod_ahbot.conf",
|
"conf": "mod_ahbot.conf",
|
||||||
"switchable": false,
|
"enable_key": "AuctionHouseBot.Enable",
|
||||||
"status": "soon",
|
"default_on": false,
|
||||||
|
"switchable": true,
|
||||||
|
"status": "early",
|
||||||
"icon": "gavel"
|
"icon": "gavel"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -112,9 +114,12 @@
|
|||||||
},
|
},
|
||||||
"repo": "https://github.com/Zyth45/mod-playerbots",
|
"repo": "https://github.com/Zyth45/mod-playerbots",
|
||||||
"conf": "playerbots.conf",
|
"conf": "playerbots.conf",
|
||||||
"switchable": false,
|
"switchable": true,
|
||||||
"status": "soon",
|
"status": "early",
|
||||||
"icon": "swords"
|
"icon": "swords",
|
||||||
|
"enable_key": "AiPlayerbot.Enabled",
|
||||||
|
"default_on": false,
|
||||||
|
"page": "bots"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "client-compat",
|
"id": "client-compat",
|
||||||
|
|||||||
Generated
+2
-2
@@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "coa-server-manager",
|
"name": "coa-server-manager",
|
||||||
"version": "0.6.1",
|
"version": "0.6.4",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "coa-server-manager",
|
"name": "coa-server-manager",
|
||||||
"version": "0.6.1",
|
"version": "0.6.4",
|
||||||
"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.1",
|
"version": "0.6.4",
|
||||||
"license": "AGPL-3.0-only",
|
"license": "AGPL-3.0-only",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|||||||
+113
-31
@@ -744,6 +744,19 @@ async fn rollback_update(state: State<'_, AppState>, id: String, txn: String) ->
|
|||||||
.await
|
.await
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[tauri::command]
|
||||||
|
async fn retry_update_validation(state: State<'_, AppState>, id: String, txn: String) -> std::result::Result<update::Txn, UiError> {
|
||||||
|
let root = path_of(&state, &id)?;
|
||||||
|
let _guard = BusyGuard::acquire(&state, &id)?;
|
||||||
|
blocking(move || {
|
||||||
|
let dir = meta_dir(&root)?;
|
||||||
|
let pending = update::load(&dir, &txn)?;
|
||||||
|
let source = coa_core::pkgsource::Source::Url(format!("https://github.com/Corfirean/coa-server-build/releases/download/server-{}/", pending.to_version));
|
||||||
|
let env = update::RepackEnv { root: &root, meta_dir: &dir };
|
||||||
|
update::retry_validation(&root, &dir, &txn, &source, coa_core::signing::EMBEDDED_PUBLIC_KEY, &env)
|
||||||
|
}).await
|
||||||
|
}
|
||||||
|
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
async fn get_population(state: State<'_, AppState>, id: String) -> std::result::Result<Option<coa_core::population::Population>, UiError> {
|
async fn get_population(state: State<'_, AppState>, id: String) -> std::result::Result<Option<coa_core::population::Population>, UiError> {
|
||||||
let root = path_of(&state, &id)?;
|
let root = path_of(&state, &id)?;
|
||||||
@@ -929,6 +942,68 @@ async fn add_companions(state: State<'_, AppState>, id: String, count: u32) -> s
|
|||||||
.await
|
.await
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const REMOTE_CLIENT_ID: &str = "@remote-client";
|
||||||
|
|
||||||
|
fn remote_dir() -> PathBuf { data_dir().join("remote-client") }
|
||||||
|
|
||||||
|
#[tauri::command]
|
||||||
|
fn remote_connection() -> std::result::Result<coa_core::remote_client::Profile, UiError> {
|
||||||
|
Ok(coa_core::remote_client::load(&remote_dir())?)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tauri::command]
|
||||||
|
fn remote_connect(state: State<'_, AppState>, host: String) -> std::result::Result<coa_core::remote_client::Profile, UiError> {
|
||||||
|
let job = state.client_cancel.lock().unwrap();
|
||||||
|
if job.is_some() { return Err(Error::Invalid("Wait for the client operation to finish.".into()).into()); }
|
||||||
|
let dir = remote_dir();
|
||||||
|
let mut profile = coa_core::remote_client::load(&dir)?;
|
||||||
|
let host = host.trim();
|
||||||
|
if host.is_empty() { return Err(Error::Invalid("Enter the host's IP address or hostname.".into()).into()); }
|
||||||
|
profile.host = host.into();
|
||||||
|
coa_core::remote_client::save(&dir, &profile)?;
|
||||||
|
Ok(profile)
|
||||||
|
}
|
||||||
|
|
||||||
|
struct ClientContext {
|
||||||
|
dir: PathBuf,
|
||||||
|
path: Option<PathBuf>,
|
||||||
|
source: Option<PathBuf>,
|
||||||
|
host: String,
|
||||||
|
root: Option<PathBuf>,
|
||||||
|
}
|
||||||
|
|
||||||
|
fn client_context(state: &AppState, id: &str) -> Result<ClientContext> {
|
||||||
|
if id == REMOTE_CLIENT_ID {
|
||||||
|
let dir = remote_dir();
|
||||||
|
let profile = coa_core::remote_client::load(&dir)?;
|
||||||
|
return Ok(ClientContext { dir, path: profile.client_path.map(PathBuf::from), source: None, host: profile.host, root: None });
|
||||||
|
}
|
||||||
|
let root = path_of(state, id)?;
|
||||||
|
let (dir, meta) = install_meta(&root)?;
|
||||||
|
let source = coa_core::client::addon_source(&root);
|
||||||
|
Ok(ClientContext { dir, path: meta.client_path.map(PathBuf::from), source, host: "127.0.0.1".into(), root: Some(root) })
|
||||||
|
}
|
||||||
|
|
||||||
|
impl ClientContext {
|
||||||
|
fn linked(&self) -> Option<PathBuf> {
|
||||||
|
self.path.clone().filter(|p| coa_core::client::detect(p, None).is_some())
|
||||||
|
}
|
||||||
|
fn require(&self) -> Result<PathBuf> {
|
||||||
|
self.linked().ok_or_else(|| Error::Invalid("Set up a game client first.".into()))
|
||||||
|
}
|
||||||
|
fn link(&self, path: &str) -> Result<()> {
|
||||||
|
if let Some(root) = &self.root {
|
||||||
|
let (_, mut meta) = install_meta(root)?;
|
||||||
|
meta.client_path = Some(path.into());
|
||||||
|
coa_core::fsx::atomic_write_json(&self.dir.join("install.json"), &meta)
|
||||||
|
} else {
|
||||||
|
let mut profile = coa_core::remote_client::load(&self.dir)?;
|
||||||
|
profile.client_path = Some(path.into());
|
||||||
|
coa_core::remote_client::save(&self.dir, &profile)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
fn client_of(root: &std::path::Path) -> Result<(PathBuf, InstallMeta, Option<PathBuf>)> {
|
fn client_of(root: &std::path::Path) -> Result<(PathBuf, InstallMeta, Option<PathBuf>)> {
|
||||||
let (dir, meta) = install_meta(root)?;
|
let (dir, meta) = install_meta(root)?;
|
||||||
let client = meta.client_path.clone().map(PathBuf::from).ok_or_else(|| Error::Invalid("No game client is set up for this server yet.".into()))?;
|
let client = meta.client_path.clone().map(PathBuf::from).ok_or_else(|| Error::Invalid("No game client is set up for this server yet.".into()))?;
|
||||||
@@ -937,22 +1012,19 @@ fn client_of(root: &std::path::Path) -> Result<(PathBuf, InstallMeta, Option<Pat
|
|||||||
|
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
fn client_info(state: State<'_, AppState>, id: String) -> std::result::Result<Option<coa_core::client::ClientInfo>, UiError> {
|
fn client_info(state: State<'_, AppState>, id: String) -> std::result::Result<Option<coa_core::client::ClientInfo>, UiError> {
|
||||||
let root = path_of(&state, &id)?;
|
let ctx = client_context(&state, &id)?;
|
||||||
let (_, meta) = install_meta(&root)?;
|
Ok(ctx.path.and_then(|p| coa_core::client::detect(&p, ctx.source.as_deref())))
|
||||||
let source = coa_core::client::addon_source(&root);
|
|
||||||
Ok(meta.client_path.and_then(|p| coa_core::client::detect(std::path::Path::new(&p), source.as_deref())))
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
fn set_client(state: State<'_, AppState>, id: String, path: String) -> std::result::Result<coa_core::client::ClientInfo, UiError> {
|
fn set_client(state: State<'_, AppState>, id: String, path: String) -> std::result::Result<coa_core::client::ClientInfo, UiError> {
|
||||||
let root = path_of(&state, &id)?;
|
let job = state.client_cancel.lock().unwrap();
|
||||||
let (dir, mut meta) = install_meta(&root)?;
|
if job.is_some() { return Err(Error::Invalid("Wait for the client operation to finish.".into()).into()); }
|
||||||
let source = coa_core::client::addon_source(&root);
|
let ctx = client_context(&state, &id)?;
|
||||||
let info = coa_core::client::detect(std::path::Path::new(&path), source.as_deref())
|
let info = coa_core::client::detect(std::path::Path::new(&path), ctx.source.as_deref())
|
||||||
.ok_or_else(|| Error::Invalid("This folder does not look like a game client (it needs Data and the game executable).".into()))?;
|
.ok_or_else(|| Error::Invalid("This folder does not look like a game client (it needs Data and the game executable).".into()))?;
|
||||||
meta.client_path = Some(info.path.clone());
|
ctx.link(&info.path)?;
|
||||||
coa_core::fsx::atomic_write_json(&dir.join("install.json"), &meta).map_err(UiError::from)?;
|
Ok(coa_core::client::detect(std::path::Path::new(&info.path), ctx.source.as_deref()).unwrap_or(info))
|
||||||
Ok(info)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
@@ -991,9 +1063,9 @@ fn linked_client(root: &std::path::Path) -> Result<Option<PathBuf>> {
|
|||||||
/// Cheap: one small manifest request and the local state file; no game file is read.
|
/// Cheap: one small manifest request and the local state file; no game file is read.
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
async fn client_status(state: State<'_, AppState>, id: String) -> std::result::Result<ClientStatus, UiError> {
|
async fn client_status(state: State<'_, AppState>, id: String) -> std::result::Result<ClientStatus, UiError> {
|
||||||
let root = path_of(&state, &id)?;
|
let ctx = client_context(&state, &id)?;
|
||||||
blocking(move || {
|
blocking(move || {
|
||||||
let client = linked_client(&root)?;
|
let client = ctx.linked();
|
||||||
let latest = coa_core::clientdl::fetch_latest().ok();
|
let latest = coa_core::clientdl::fetch_latest().ok();
|
||||||
let local = client.as_deref().map(coa_core::clientdl::local);
|
let local = client.as_deref().map(coa_core::clientdl::local);
|
||||||
let managed = local.as_ref().map(|l| l.managed).unwrap_or(false);
|
let managed = local.as_ref().map(|l| l.managed).unwrap_or(false);
|
||||||
@@ -1040,10 +1112,10 @@ async fn client_download_check(parent: String) -> std::result::Result<ClientDown
|
|||||||
/// Compare the linked client with the published one. Hashes files only where the recorded state cannot vouch for them.
|
/// Compare the linked client with the published one. Hashes files only where the recorded state cannot vouch for them.
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
async fn client_plan(app: AppHandle, state: State<'_, AppState>, id: String) -> std::result::Result<coa_core::clientdl::Plan, UiError> {
|
async fn client_plan(app: AppHandle, state: State<'_, AppState>, id: String) -> std::result::Result<coa_core::clientdl::Plan, UiError> {
|
||||||
let root = path_of(&state, &id)?;
|
let ctx = client_context(&state, &id)?;
|
||||||
let cancel = begin_client_job(&state)?;
|
let cancel = begin_client_job(&state)?;
|
||||||
let result = blocking(move || {
|
let result = blocking(move || {
|
||||||
let client = linked_client(&root)?.ok_or_else(|| Error::Invalid("No game client is set up for this server yet.".into()))?;
|
let client = ctx.require()?;
|
||||||
let manifest = coa_core::clientdl::fetch_latest()?;
|
let manifest = coa_core::clientdl::fetch_latest()?;
|
||||||
let current = coa_core::clientdl::load_state(&client).unwrap_or_default();
|
let current = coa_core::clientdl::load_state(&client).unwrap_or_default();
|
||||||
coa_core::clientdl::plan(&client, &manifest, ¤t, &cancel, &|s| {
|
coa_core::clientdl::plan(&client, &manifest, ¤t, &cancel, &|s| {
|
||||||
@@ -1058,11 +1130,13 @@ async fn client_plan(app: AppHandle, state: State<'_, AppState>, id: String) ->
|
|||||||
/// Bring the linked client to the published version. `keep_modified` leaves files the player changed alone.
|
/// Bring the linked client to the published version. `keep_modified` leaves files the player changed alone.
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
async fn client_sync(app: AppHandle, state: State<'_, AppState>, id: String, keep_modified: bool) -> std::result::Result<(), UiError> {
|
async fn client_sync(app: AppHandle, state: State<'_, AppState>, id: String, keep_modified: bool) -> std::result::Result<(), UiError> {
|
||||||
let root = path_of(&state, &id)?;
|
let ctx = client_context(&state, &id)?;
|
||||||
let cancel = begin_client_job(&state)?;
|
let cancel = begin_client_job(&state)?;
|
||||||
let result = blocking(move || {
|
let result = blocking(move || {
|
||||||
let client = linked_client(&root)?.ok_or_else(|| Error::Invalid("No game client is set up for this server yet.".into()))?;
|
let client = ctx.require()?;
|
||||||
run_client_sync(&app, &client, keep_modified, &cancel)
|
run_client_sync(&app, &client, keep_modified, &cancel)?;
|
||||||
|
if ctx.root.is_none() && !ctx.host.is_empty() { coa_core::client::set_realmlist(&client, &ctx.dir, &ctx.host)?; }
|
||||||
|
Ok(())
|
||||||
})
|
})
|
||||||
.await;
|
.await;
|
||||||
end_client_job(&state);
|
end_client_job(&state);
|
||||||
@@ -1086,13 +1160,12 @@ fn run_client_sync(app: &AppHandle, client: &std::path::Path, keep_modified: boo
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Download the whole client into `<parent>/CoA Client`, then link it to this server.
|
/// Download the client into `<parent>/CoA Client`, then link it to a host or player profile.
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
async fn client_download(app: AppHandle, state: State<'_, AppState>, id: String, parent: String) -> std::result::Result<coa_core::client::ClientInfo, UiError> {
|
async fn client_download(app: AppHandle, state: State<'_, AppState>, id: String, parent: String) -> std::result::Result<coa_core::client::ClientInfo, UiError> {
|
||||||
let root = path_of(&state, &id)?;
|
let ctx = client_context(&state, &id)?;
|
||||||
let cancel = begin_client_job(&state)?;
|
let cancel = begin_client_job(&state)?;
|
||||||
let result = blocking(move || {
|
let result = blocking(move || {
|
||||||
let (dir, mut meta) = install_meta(&root)?;
|
|
||||||
let parent = PathBuf::from(&parent);
|
let parent = PathBuf::from(&parent);
|
||||||
if !parent.is_dir() {
|
if !parent.is_dir() {
|
||||||
return Err(Error::Invalid("Choose an existing folder to put the game client in.".into()));
|
return Err(Error::Invalid("Choose an existing folder to put the game client in.".into()));
|
||||||
@@ -1105,16 +1178,11 @@ async fn client_download(app: AppHandle, state: State<'_, AppState>, id: String,
|
|||||||
}
|
}
|
||||||
std::fs::create_dir_all(&dest)?;
|
std::fs::create_dir_all(&dest)?;
|
||||||
run_client_sync(&app, &dest, false, &cancel)?;
|
run_client_sync(&app, &dest, false, &cancel)?;
|
||||||
let source = coa_core::client::addon_source(&root);
|
let info = coa_core::client::detect(&dest, ctx.source.as_deref()).ok_or_else(|| Error::Invalid("The downloaded client looks incomplete.".into()))?;
|
||||||
let info = coa_core::client::detect(&dest, source.as_deref()).ok_or_else(|| Error::Invalid("The downloaded client looks incomplete.".into()))?;
|
ctx.link(&info.path)?;
|
||||||
meta.client_path = Some(info.path.clone());
|
if !ctx.host.is_empty() { coa_core::client::set_realmlist(&dest, &ctx.dir, &ctx.host)?; }
|
||||||
coa_core::fsx::atomic_write_json(&dir.join("install.json"), &meta)?;
|
if let Some(src) = &ctx.source { coa_core::client::install_addon(&dest, &ctx.dir, src)?; }
|
||||||
// a fresh client has no realmlist; this server is on this computer
|
Ok(coa_core::client::detect(&dest, ctx.source.as_deref()).unwrap_or(info))
|
||||||
coa_core::client::set_realmlist(&dest, &dir, "127.0.0.1")?;
|
|
||||||
if let Some(src) = source {
|
|
||||||
coa_core::client::install_addon(&dest, &dir, &src)?;
|
|
||||||
}
|
|
||||||
Ok(coa_core::client::detect(&dest, coa_core::client::addon_source(&root).as_deref()).unwrap_or(info))
|
|
||||||
})
|
})
|
||||||
.await;
|
.await;
|
||||||
end_client_job(&state);
|
end_client_job(&state);
|
||||||
@@ -1149,6 +1217,17 @@ fn end_client_job(state: &AppState) {
|
|||||||
/// Launch the game client independently of the local server.
|
/// Launch the game client independently of the local server.
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
async fn play(state: State<'_, AppState>, id: String) -> std::result::Result<DriverOutcome, UiError> {
|
async fn play(state: State<'_, AppState>, id: String) -> std::result::Result<DriverOutcome, UiError> {
|
||||||
|
if id == REMOTE_CLIENT_ID {
|
||||||
|
let ctx = client_context(&state, &id)?;
|
||||||
|
let client = ctx.require()?;
|
||||||
|
return blocking(move || {
|
||||||
|
if ctx.host.is_empty() { return Err(Error::Invalid("Enter the host's IP address or hostname first.".into())); }
|
||||||
|
if coa_core::client::is_running(&client) { return Err(Error::Invalid("The game is already running.".into())); }
|
||||||
|
coa_core::client::set_realmlist(&client, &ctx.dir, &ctx.host)?;
|
||||||
|
coa_core::client::launch(&client)?;
|
||||||
|
Ok(DriverOutcome { ok: true, exit_code: None, code: None, human: None, output: String::new() })
|
||||||
|
}).await;
|
||||||
|
}
|
||||||
let root = path_of(&state, &id)?;
|
let root = path_of(&state, &id)?;
|
||||||
let (dir, _, client) = client_of(&root)?;
|
let (dir, _, client) = client_of(&root)?;
|
||||||
let client = client.unwrap();
|
let client = client.unwrap();
|
||||||
@@ -1492,6 +1571,7 @@ pub fn run() {
|
|||||||
pending_update,
|
pending_update,
|
||||||
apply_update,
|
apply_update,
|
||||||
rollback_update,
|
rollback_update,
|
||||||
|
retry_update_validation,
|
||||||
get_population,
|
get_population,
|
||||||
get_performance,
|
get_performance,
|
||||||
companions_stop_spawning,
|
companions_stop_spawning,
|
||||||
@@ -1501,6 +1581,8 @@ pub fn run() {
|
|||||||
open_link,
|
open_link,
|
||||||
companion_sizes,
|
companion_sizes,
|
||||||
add_companions,
|
add_companions,
|
||||||
|
remote_connection,
|
||||||
|
remote_connect,
|
||||||
client_info,
|
client_info,
|
||||||
set_client,
|
set_client,
|
||||||
client_realmlist,
|
client_realmlist,
|
||||||
|
|||||||
@@ -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.1",
|
"version": "0.6.4",
|
||||||
"identifier": "com.coa.servermanager",
|
"identifier": "com.coa.servermanager",
|
||||||
"build": {
|
"build": {
|
||||||
"beforeDevCommand": "npm run dev",
|
"beforeDevCommand": "npm run dev",
|
||||||
|
|||||||
+17
-2
@@ -4,14 +4,20 @@ import { Welcome } from "@/screens/Welcome";
|
|||||||
import { ImportServer } from "@/screens/ImportServer";
|
import { ImportServer } from "@/screens/ImportServer";
|
||||||
import { Shell } from "@/screens/Shell";
|
import { Shell } from "@/screens/Shell";
|
||||||
import { InstallServer } from "@/screens/InstallServer";
|
import { InstallServer } from "@/screens/InstallServer";
|
||||||
|
import { RemoteClient } from "@/screens/RemoteClient";
|
||||||
import { UpdateBanner } from "@/components/UpdateBanner";
|
import { UpdateBanner } from "@/components/UpdateBanner";
|
||||||
import { autoUpdateEnabled, installOnClose, lookForUpdate } from "@/lib/selfUpdate";
|
import { autoUpdateEnabled, installOnClose, lookForUpdate } from "@/lib/selfUpdate";
|
||||||
|
|
||||||
type View = "welcome" | "add" | "import" | "install";
|
type View = "welcome" | "add" | "import" | "install" | "remote";
|
||||||
|
|
||||||
|
function initialView(): View {
|
||||||
|
try { return localStorage.getItem("coa-play-mode") === "remote" ? "remote" : "welcome"; }
|
||||||
|
catch { return "welcome"; }
|
||||||
|
}
|
||||||
|
|
||||||
function Main() {
|
function Main() {
|
||||||
const [servers, setServers] = useState<ServerSummary[] | null>(null);
|
const [servers, setServers] = useState<ServerSummary[] | null>(null);
|
||||||
const [view, setView] = useState<View>("welcome");
|
const [view, setView] = useState<View>(initialView);
|
||||||
const [activeId, setActiveId] = useState<string | null>(null);
|
const [activeId, setActiveId] = useState<string | null>(null);
|
||||||
|
|
||||||
const refresh = useCallback(async () => {
|
const refresh = useCallback(async () => {
|
||||||
@@ -26,6 +32,11 @@ function Main() {
|
|||||||
|
|
||||||
if (servers === null) return null;
|
if (servers === null) return null;
|
||||||
|
|
||||||
|
if (view === "remote") return <RemoteClient onHost={() => {
|
||||||
|
try { localStorage.setItem("coa-play-mode", "host"); } catch { /* storage unavailable */ }
|
||||||
|
setView(servers.length ? "welcome" : "add");
|
||||||
|
}} />;
|
||||||
|
|
||||||
if (servers.length > 0 && view === "welcome" && activeId) {
|
if (servers.length > 0 && view === "welcome" && activeId) {
|
||||||
return (
|
return (
|
||||||
<Shell
|
<Shell
|
||||||
@@ -71,6 +82,10 @@ function Main() {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<Welcome
|
<Welcome
|
||||||
|
onConnect={() => {
|
||||||
|
try { localStorage.setItem("coa-play-mode", "remote"); } catch { /* storage unavailable */ }
|
||||||
|
setView("remote");
|
||||||
|
}}
|
||||||
onImport={() => setView("import")}
|
onImport={() => setView("import")}
|
||||||
onInstall={() => setView("install")}
|
onInstall={() => setView("install")}
|
||||||
onBack={servers.length > 0 ? () => setView("welcome") : undefined}
|
onBack={servers.length > 0 ? () => setView("welcome") : undefined}
|
||||||
|
|||||||
+15
-7
@@ -1,4 +1,5 @@
|
|||||||
// Dev-only: lets the UI run in a plain browser for visual review. Never bundled in production builds.
|
// Dev-only: lets the UI run in a plain browser for visual review. Never bundled in production builds.
|
||||||
|
import { auctionCategories, auctionQualities } from "../lib/moduleSettings";
|
||||||
import botsSchema from "../../schemas/bots.json";
|
import botsSchema from "../../schemas/bots.json";
|
||||||
import serverSchema from "../../schemas/server.json";
|
import serverSchema from "../../schemas/server.json";
|
||||||
import botsPresets from "../../schemas/presets/bots.json";
|
import botsPresets from "../../schemas/presets/bots.json";
|
||||||
@@ -9,6 +10,8 @@ export {};
|
|||||||
let added = new URLSearchParams(location.search).has("demo"), running = false;
|
let added = new URLSearchParams(location.search).has("demo"), running = false;
|
||||||
let realm: "coa" | "wildcard" = "coa", wildcardCreated = false;
|
let realm: "coa" | "wildcard" = "coa", wildcardCreated = false;
|
||||||
let simultaneous = false;
|
let simultaneous = false;
|
||||||
|
let remoteHost = localStorage.getItem("demo-remote-host") ?? "";
|
||||||
|
const moduleEdits: Record<string, Record<string, string>> = {};
|
||||||
const modState: Record<string, boolean> = { "companions": true, "content-scaling": true, "client-compat": true, "tbc-content": true, "wotlk-content": true, "npc-enchanter": true };
|
const modState: Record<string, boolean> = { "companions": true, "content-scaling": true, "client-compat": true, "tbc-content": true, "wotlk-content": true, "npc-enchanter": true };
|
||||||
const report = {path:"C:\\games\\CoA-Repack",classification:"healthy",items:[
|
const report = {path:"C:\\games\\CoA-Repack",classification:"healthy",items:[
|
||||||
{key:"worldserver",label:"World server",status:"found",detail:null},
|
{key:"worldserver",label:"World server",status:"found",detail:null},
|
||||||
@@ -28,6 +31,9 @@ export {};
|
|||||||
if(cmd==="check_database") return [{realm, migrations:[],problems:[],full_schema:false}];
|
if(cmd==="check_database") return [{realm, migrations:[],problems:[],full_schema:false}];
|
||||||
if(cmd==="repair_server") { if(running) throw new Error("Stop the server before repairing it."); return {restored:[],applied:[],backup:"demo-before-repair",database:[{realm,migrations:[],problems:[],full_schema:false}],error:null}; }
|
if(cmd==="repair_server") { if(running) throw new Error("Stop the server before repairing it."); return {restored:[],applied:[],backup:"demo-before-repair",database:[{realm,migrations:[],problems:[],full_schema:false}],error:null}; }
|
||||||
if(cmd==="realm_select"){await new Promise(r=>setTimeout(r,600));realm=args.mode;wildcardCreated ||= realm==="wildcard";modState.companions=realm==="coa";return {active:realm,wildcard_created:wildcardCreated,supported:true,recovery_pending:false,simultaneous,secondary_world_port:simultaneous?8086:null,secondary_running:simultaneous&&running};}
|
if(cmd==="realm_select"){await new Promise(r=>setTimeout(r,600));realm=args.mode;wildcardCreated ||= realm==="wildcard";modState.companions=realm==="coa";return {active:realm,wildcard_created:wildcardCreated,supported:true,recovery_pending:false,simultaneous,secondary_world_port:simultaneous?8086:null,secondary_running:simultaneous&&running};}
|
||||||
|
if(cmd==="remote_connection") return {host:remoteHost,client_path:null};
|
||||||
|
if(cmd==="remote_connect") { remoteHost=args.host.trim(); localStorage.setItem("demo-remote-host",remoteHost); return {host:remoteHost,client_path:null}; }
|
||||||
|
if(cmd==="play") return {ok:true,exit_code:null,code:null,human:null,output:""};
|
||||||
if(cmd==="list_servers") return added?[{id:"1",name:"CoA-Repack",path:report.path}]:[];
|
if(cmd==="list_servers") return added?[{id:"1",name:"CoA-Repack",path:report.path}]:[];
|
||||||
if(cmd==="scan_server") return report;
|
if(cmd==="scan_server") return report;
|
||||||
if(cmd==="add_server"){added=true;return {id:"1",name:"CoA-Repack",path:report.path};}
|
if(cmd==="add_server"){added=true;return {id:"1",name:"CoA-Repack",path:report.path};}
|
||||||
@@ -63,22 +69,24 @@ export {};
|
|||||||
if(cmd==="realmlist_save"){const w=window as any;const rl=w.__rl;if(args.profileId){const p=rl.profiles.find((x: any)=>x.id===args.profileId);p.name=args.name;p.data=args.data;return p;}if(rl.profiles.some((x: any)=>x.name.toLowerCase()===String(args.name).toLowerCase()))throw {human:{code:"unknown",title:"",message:"",actions:[]},technical:"A realmlist with that name already exists."};const p={id:String(args.name).toLowerCase().replace(/[^a-z0-9]+/g,"-"),name:args.name,data:(/\s/.test(args.data.trim())?args.data.trim():"set realmlist "+args.data.trim())+"\r\n"};rl.profiles.push(p);return p;}
|
if(cmd==="realmlist_save"){const w=window as any;const rl=w.__rl;if(args.profileId){const p=rl.profiles.find((x: any)=>x.id===args.profileId);p.name=args.name;p.data=args.data;return p;}if(rl.profiles.some((x: any)=>x.name.toLowerCase()===String(args.name).toLowerCase()))throw {human:{code:"unknown",title:"",message:"",actions:[]},technical:"A realmlist with that name already exists."};const p={id:String(args.name).toLowerCase().replace(/[^a-z0-9]+/g,"-"),name:args.name,data:(/\s/.test(args.data.trim())?args.data.trim():"set realmlist "+args.data.trim())+"\r\n"};rl.profiles.push(p);return p;}
|
||||||
if(cmd==="realmlist_delete"){const rl=(window as any).__rl;rl.profiles=rl.profiles.filter((x: any)=>x.id!==args.profileId);return null;}
|
if(cmd==="realmlist_delete"){const rl=(window as any).__rl;rl.profiles=rl.profiles.filter((x: any)=>x.id!==args.profileId);return null;}
|
||||||
if(cmd==="account_delete") return null;
|
if(cmd==="account_delete") return null;
|
||||||
if(cmd==="modules_list") return [{id:"companions",name:"CoA Companions",description:{en:"Companion bots for groups, dungeons and your guild.",ru:"Боты-компаньоны для групп, подземелий и гильдии."},repo:"https://github.com/Corfirean/mod-coa-playerbots",installed:true,enabled:modState["companions"],switchable:true,status:"beta",icon:"bot",page:"bots"},{id:"content-scaling",name:"Content Scaling",description:{en:"Scales dungeons and raids to your group, with solo modes.",ru:"Подстраивает подземелья и рейды под вашу группу, есть соло-режимы."},repo:"https://github.com/Corfirean/mod-coa-content-scaling",installed:true,enabled:modState["content-scaling"],switchable:true,status:"early",icon:"scaling",page:null},{id:"tbc-content",name:"TBC Content",description:{en:"Outland dungeons and raids, scaled to your level range.",ru:"Подземелья и рейды Запределья, подогнанные под ваши уровни."},repo:"https://github.com/Corfirean/mod-coa-content-scaling/tree/main/content-packs/mod-coa-tbc-content",installed:true,enabled:modState["tbc-content"],switchable:true,status:"early",icon:"tbc",page:null},{id:"wotlk-content",name:"WotLK Content",description:{en:"Northrend dungeons and raids, scaled to your level range.",ru:"Подземелья и рейды Нордскола, подогнанные под ваши уровни."},repo:"https://github.com/Corfirean/mod-coa-content-scaling/tree/main/content-packs/mod-coa-wotlk-content",installed:true,enabled:modState["wotlk-content"],switchable:true,status:"early",icon:"wotlk",page:null},{id:"ah-bot",name:"Auction House Bot",description:{en:"Fills the auction house with realistic, adjustable listings.",ru:"Наполняет аукцион реалистичными настраиваемыми лотами."},repo:"https://github.com/NathanHandley/mod-ah-bot-plus",installed:false,enabled:false,switchable:false,status:"soon",icon:"gavel",page:null,hidden:false},{id:"npc-enchanter",name:"NPC Enchanter",description:{en:"An NPC that enchants your gear for you.",ru:"НПС, который зачаровывает ваше снаряжение."},repo:"https://github.com/azerothcore/mod-npc-enchanter",installed:true,enabled:modState["npc-enchanter"],switchable:true,status:"early",icon:"sparkles",page:null,hidden:false},{id:"playerbots",name:"SQUID's Playerbots",description:{en:"An alternative bot system with random bots and full AI.",ru:"Альтернативная система ботов со случайными ботами и полным ИИ."},repo:"https://github.com/Zyth45/mod-playerbots",installed:false,enabled:false,switchable:false,status:"soon",icon:"swords",page:null,hidden:false},{id:"client-compat",name:"Client compatibility",description:{en:"Client-server link and appearance unlocks.",ru:"Связь клиента с сервером и разблокировка внешних видов."},repo:"https://github.com/Corfirean/azerothcore-wotlk-coa",installed:true,enabled:modState["client-compat"],switchable:false,status:"release",icon:"plug",page:null,hidden:true}].map(m => ({...m, compatibility: realm === "wildcard" ? (["companions", "playerbots"].includes(m.id) ? "unsupported" : m.id === "client-compat" ? "compatible" : "experimental") : "compatible", switchable: realm === "wildcard" && ["companions", "playerbots"].includes(m.id) ? false : m.switchable}));
|
if(cmd==="modules_list") return [{id:"companions",name:"CoA Companions",description:{en:"Companion bots for groups, dungeons and your guild.",ru:"Боты-компаньоны для групп, подземелий и гильдии."},repo:"https://github.com/Corfirean/mod-coa-playerbots",installed:true,enabled:modState["companions"],switchable:true,status:"beta",icon:"bot",page:"bots"},{id:"content-scaling",name:"Content Scaling",description:{en:"Scales dungeons and raids to your group, with solo modes.",ru:"Подстраивает подземелья и рейды под вашу группу, есть соло-режимы."},repo:"https://github.com/Corfirean/mod-coa-content-scaling",installed:true,enabled:modState["content-scaling"],switchable:true,status:"early",icon:"scaling",page:null},{id:"tbc-content",name:"TBC Content",description:{en:"Outland dungeons and raids, scaled to your level range.",ru:"Подземелья и рейды Запределья, подогнанные под ваши уровни."},repo:"https://github.com/Corfirean/mod-coa-content-scaling/tree/main/content-packs/mod-coa-tbc-content",installed:true,enabled:modState["tbc-content"],switchable:true,status:"early",icon:"tbc",page:null},{id:"wotlk-content",name:"WotLK Content",description:{en:"Northrend dungeons and raids, scaled to your level range.",ru:"Подземелья и рейды Нордскола, подогнанные под ваши уровни."},repo:"https://github.com/Corfirean/mod-coa-content-scaling/tree/main/content-packs/mod-coa-wotlk-content",installed:true,enabled:modState["wotlk-content"],switchable:true,status:"early",icon:"wotlk",page:null},{id:"ah-bot",name:"Auction House Bot",description:{en:"Fills the auction house with realistic, adjustable listings.",ru:"Наполняет аукцион реалистичными настраиваемыми лотами."},repo:"https://github.com/Corfirean/azerothcore-wotlk-coa",installed:true,enabled:modState["ah-bot"] ?? false,switchable:true,status:"early",icon:"gavel",page:null,hidden:false},{id:"npc-enchanter",name:"NPC Enchanter",description:{en:"An NPC that enchants your gear for you.",ru:"НПС, который зачаровывает ваше снаряжение."},repo:"https://github.com/azerothcore/mod-npc-enchanter",installed:true,enabled:modState["npc-enchanter"],switchable:true,status:"early",icon:"sparkles",page:null,hidden:false},{id:"playerbots",name:"SQUID's Playerbots",description:{en:"An alternative bot system with random bots and full AI.",ru:"Альтернативная система ботов со случайными ботами и полным ИИ."},repo:"https://github.com/Zyth45/mod-playerbots",installed:true,enabled:modState["playerbots"] ?? false,switchable:true,status:"early",icon:"swords",page:"bots",hidden:false},{id:"client-compat",name:"Client compatibility",description:{en:"Client-server link and appearance unlocks.",ru:"Связь клиента с сервером и разблокировка внешних видов."},repo:"https://github.com/Corfirean/azerothcore-wotlk-coa",installed:true,enabled:modState["client-compat"],switchable:false,status:"release",icon:"plug",page:null,hidden:true}].map(m => ({...m, has_settings: !["tbc-content", "wotlk-content"].includes(m.id), compatibility: realm === "wildcard" ? (["companions", "playerbots"].includes(m.id) ? "unsupported" : m.id === "client-compat" ? "compatible" : "experimental") : "compatible", switchable: realm === "wildcard" && ["companions", "playerbots"].includes(m.id) ? false : m.switchable}));
|
||||||
if(cmd==="module_set_enabled"){ modState[args.module]=args.enabled; return null; }
|
if(cmd==="module_set_enabled"){ if(args.enabled && ["companions","playerbots"].includes(args.module) && modState[args.module === "companions" ? "playerbots" : "companions"]) throw {human:{code:"bot_modules_conflict",title:"",message:"",actions:[]},technical:"Only one bot system may be enabled."}; modState[args.module]=args.enabled; return null; }
|
||||||
if(cmd==="all_settings") return [{key:"Visibility.Distance.Continents",value:"100",default:"90",doc:"Description: Visibility distance on continents. Range: 45-250 Default: 90",changed:true},{key:"Death.SicknessLevel",value:"11",default:"11",doc:"Description: Character level up to which characters get resurrection sickness. Default: 11",changed:false},{key:"Rate.Drop.Item.Epic",value:"3",default:"1",doc:"Description: Drop rates for money and items based on quality. Default: 1",changed:true},{key:"Instance.ResetTimeHour",value:"4",default:"4",doc:"Description: Hour of the day when the global instance reset occurs. Range: 0-23 Default: 4 - (04:00 AM)",changed:false},{key:"PlayerLimit",value:"1000",default:"1000",doc:"Description: Maximum number of players in the world.",changed:false}];
|
if(cmd==="all_settings") return [{key:"Visibility.Distance.Continents",value:"100",default:"90",doc:"Description: Visibility distance on continents. Range: 45-250 Default: 90",changed:true},{key:"Death.SicknessLevel",value:"11",default:"11",doc:"Description: Character level up to which characters get resurrection sickness. Default: 11",changed:false},{key:"Rate.Drop.Item.Epic",value:"3",default:"1",doc:"Description: Drop rates for money and items based on quality. Default: 1",changed:true},{key:"Instance.ResetTimeHour",value:"4",default:"4",doc:"Description: Hour of the day when the global instance reset occurs. Range: 0-23 Default: 4 - (04:00 AM)",changed:false},{key:"PlayerLimit",value:"1000",default:"1000",doc:"Description: Maximum number of players in the world.",changed:false}];
|
||||||
if(cmd==="all_settings_save") return Object.keys(args&&args.changes||{});
|
if(cmd==="all_settings_save") return Object.keys(args&&args.changes||{});
|
||||||
if(cmd==="module_settings" && args.module==="client-compat") return [{key:"CoA.UnlockLocalAppearanceCatalog",value:"1",default:"1",doc:""},{key:"CoA.UnlockAllVanity",value:"1",default:"1",doc:""},{key:"CoA.AutoCollectAppearances",value:"0",default:"1",doc:""},{key:"CoA.LearnOwnedCompanions",value:"1",default:"1",doc:""},{key:"CoA.MaxRidingFromStart",value:"1",default:"1",doc:""}];
|
if(cmd==="module_settings" && args.module==="client-compat") return [{key:"CoA.UnlockLocalAppearanceCatalog",value:"1",default:"1",doc:""},{key:"CoA.UnlockAllVanity",value:"1",default:"1",doc:""},{key:"CoA.AutoCollectAppearances",value:"0",default:"1",doc:""},{key:"CoA.LearnOwnedCompanions",value:"1",default:"1",doc:""},{key:"CoA.MaxRidingFromStart",value:"1",default:"1",doc:""}];
|
||||||
if(cmd==="module_settings"){
|
if(cmd==="module_settings"){
|
||||||
const S:Record<string,{key:string;value:string;default:string;doc:string}[]>={
|
const S:Record<string,{key:string;value:string;default:string;doc:string}[]>={
|
||||||
"npc-enchanter":[{key:"Enchanter.Enable",value:"1",default:"1",doc:"Enable the module."},{key:"Enchanter.Announce",value:"0",default:"0",doc:"Announce the module when the player logs in."},{key:"Enchanter.CostCopper",value:"0",default:"0",doc:"What one enchantment costs, in copper (10000 = 1 gold). 0 = free."},{key:"Enchanter.MessageTimer",value:"60000",default:"60000",doc:"How often the NPC emotes, in milliseconds."}],
|
"npc-enchanter":[{key:"Enchanter.Enable",value:"1",default:"1",doc:"Enable the module."},{key:"Enchanter.Announce",value:"0",default:"0",doc:"Announce the module when the player logs in."},{key:"Enchanter.CostCopper",value:"0",default:"0",doc:"What one enchantment costs, in copper (10000 = 1 gold). 0 = free."},{key:"Enchanter.MessageTimer",value:"60000",default:"60000",doc:"How often the NPC emotes, in milliseconds."}],
|
||||||
"companions":[{key:"CoaBots.Enable",value:"1",default:"1",doc:"Master switch of the companion bots."},{key:"CoaBots.MaxPerPlayer",value:"4",default:"4",doc:"How many bots one player can have at a time."}],
|
"playerbots":[{"key": "AiPlayerbot.RandomBotAutologin", "value": "1", "default": "1", "doc": ""}, {"key": "AiPlayerbot.MinRandomBots", "value": "500", "default": "500", "doc": ""}, {"key": "AiPlayerbot.MaxRandomBots", "value": "500", "default": "500", "doc": ""}, {"key": "AiPlayerbot.RandomBotAccountCount", "value": "0", "default": "0", "doc": ""}, {"key": "AiPlayerbot.RandomBotMinLevel", "value": "1", "default": "1", "doc": ""}, {"key": "AiPlayerbot.RandomBotMaxLevel", "value": "60", "default": "60", "doc": ""}, {"key": "AiPlayerbot.SyncLevelWithPlayers", "value": "0", "default": "0", "doc": ""}, {"key": "AiPlayerbot.RandomBotInvitePlayer", "value": "0", "default": "0", "doc": ""}, {"key": "AiPlayerbot.RandomBotJoinLfg", "value": "1", "default": "1", "doc": ""}, {"key": "AiPlayerbot.RandomBotJoinBG", "value": "1", "default": "1", "doc": ""}, {"key": "AiPlayerbot.RandomBotAutoJoinBG", "value": "0", "default": "0", "doc": ""}, {"key": "AiPlayerbot.RandomBotTalk", "value": "1", "default": "1", "doc": ""}, {"key": "AiPlayerbot.RandomBotEmote", "value": "0", "default": "0", "doc": ""}, {"key": "AiPlayerbot.RandomBotSuggestDungeons", "value": "1", "default": "1", "doc": ""}, {"key": "AiPlayerbot.CoaClassesOnly", "value": "1", "default": "1", "doc": ""}, {"key": "AiPlayerbot.CoaSmartHeal", "value": "1", "default": "1", "doc": ""}, {"key": "AiPlayerbot.CoaSmartTank", "value": "1", "default": "1", "doc": ""}, {"key": "AiPlayerbot.CoaSpecRotations", "value": "1", "default": "1", "doc": ""}, {"key": "AiPlayerbot.CoaInterruptCoordination", "value": "1", "default": "1", "doc": ""}, {"key": "AiPlayerbot.MaxAddedBots", "value": "40", "default": "40", "doc": ""}, {"key": "AiPlayerbot.BotAutologin", "value": "0", "default": "0", "doc": ""}, {"key": "AiPlayerbot.DisabledWithoutRealPlayer", "value": "0", "default": "0", "doc": ""}, {"key": "AiPlayerbot.AddClassCommand", "value": "1", "default": "1", "doc": ""}, {"key": "AiPlayerbot.KeepAltsInGroup", "value": "0", "default": "0", "doc": ""}, {"key": "AiPlayerbot.CoaRecruitSameFaction", "value": "1", "default": "1", "doc": ""}, {"key": "AiPlayerbot.CoaLfgBots", "value": "1", "default": "1", "doc": ""}, {"key": "AiPlayerbot.RandomBotXPRate", "value": "1.0", "default": "1.0", "doc": ""}, {"key": "AiPlayerbot.FollowDistance", "value": "1.5", "default": "1.5", "doc": ""}, {"key": "AiPlayerbot.Enabled", "value": "0", "default": "0", "doc": ""}, {"key": "AiPlayerbot.RandomBotAccountPrefix", "value": "\"rndbot\"", "default": "\"rndbot\"", "doc": ""}, {"key": "AiPlayerbot.RandomBotUpdateInterval", "value": "20", "default": "20", "doc": ""}],
|
||||||
"content-scaling":[{key:"CoAContentScaling.Enable",value:"1",default:"1",doc:"Scale dungeons and raids to the group."}],
|
"companions":[{key:"CoaBots.Enable",value:"1",default:"1",doc:"Master switch of the companion bots."},{key:"CoaBots.RandomSpawn.DefaultCount",value:"10",default:"10",doc:""}],
|
||||||
|
"content-scaling":[{key:"CoAContentScaling.Enable",value:"1",default:"1",doc:"Scale dungeons and raids to the group."}, ...[{key:"CoAContentScaling.LFG.AllowPartialGroups",value:"1"},{key:"CoAContentScaling.World.Leech.Enable",value:"0"},{key:"CoAContentScaling.World.Leech.Percent",value:"5.0"},{key:"CoAContentScaling.Difficulty.DamageMultiplier",value:"1.0"},{key:"CoAContentScaling.SoloAssist.Mode",value:"1"},{key:"CoAContentScaling.GroupScaling.Enable",value:"1"},{key:"CoAContentScaling.LFG.DefaultMode",value:"CurrentParty"},{key:"CoAContentScaling.LFG.DefaultChallengeSize",value:"0"},{key:"CoAContentScaling.Debug",value:"0"}].map(s=>({...s,default:s.value,doc:""}))],
|
||||||
|
"ah-bot":[...Object.keys(auctionCategories).flatMap(category => Object.keys(auctionQualities).map(quality => ({key:`AuctionHouseBot.ListProportion.Category${category}.Quality${quality}`,value:String(quality === "Normal" && !["Quest","Key","Generic","Reagent"].includes(category) ? 50 : quality === "Rare" && ["Armor","Weapon"].includes(category) ? 5 : 0),default:String(quality === "Normal" && !["Quest","Key","Generic","Reagent"].includes(category) ? 50 : quality === "Rare" && ["Armor","Weapon"].includes(category) ? 5 : 0),doc:""}))), {key:"AuctionHouseBot.Enable",value:"false",default:"false",doc:""}, ...[{key:"AuctionHouseBot.GUIDs",value:"0"},{key:"AuctionHouseBot.EnableSeller",value:"true"},{key:"AuctionHouseBot.CoA.ObtainableItemsOnly",value:"true"},{key:"AuctionHouseBot.ItemsPerCycle",value:"150"},{key:"AuctionHouseBot.MinutesBetweenSellCycle",value:"1"},{key:"AuctionHouseBot.Alliance.MinItems",value:"15000"},{key:"AuctionHouseBot.Alliance.MaxItems",value:"15000"}].map(s=>({...s,default:s.value,doc:""}))],
|
||||||
"tbc-content":[{key:"CoATBC.Enable",value:"1",default:"1",doc:"Outland dungeons and raids."}],
|
"tbc-content":[{key:"CoATBC.Enable",value:"1",default:"1",doc:"Outland dungeons and raids."}],
|
||||||
"wotlk-content":[{key:"CoAWotLK.Enable",value:"1",default:"1",doc:"Northrend dungeons and raids."}],
|
"wotlk-content":[{key:"CoAWotLK.Enable",value:"1",default:"1",doc:"Northrend dungeons and raids."}],
|
||||||
};
|
};
|
||||||
return S[args.module]??[];
|
return (S[args.module]??[]).map(s => ({...s, value: moduleEdits[args.module]?.[s.key] ?? s.value}));
|
||||||
}
|
}
|
||||||
if(cmd==="module_save_settings") return Object.keys(args.changes);
|
if(cmd==="module_save_settings") { moduleEdits[args.module] = {...moduleEdits[args.module], ...args.changes}; return Object.keys(args.changes); }
|
||||||
if(cmd==="report_context") return {manager_version:"0.3.1",windows:"Windows 11 (build 26200)",install_kind:"new",server_version:"0.261001.10"};
|
if(cmd==="report_context") return {manager_version:"0.3.1",windows:"Windows 11 (build 26200)",install_kind:"new",server_version:"0.261001.10"};
|
||||||
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";
|
||||||
@@ -88,7 +96,7 @@ export {};
|
|||||||
if(cmd==="account_set_access"){const a=(window as any).__acc.find((x: any)=>x.name===args.name);if(a)a.access=args.level;return null;}
|
if(cmd==="account_set_access"){const a=(window as any).__acc.find((x: any)=>x.name===args.name);if(a)a.access=args.level;return null;}
|
||||||
if(cmd==="account_set_password") return null;
|
if(cmd==="account_set_password") return null;
|
||||||
if(cmd==="account_rename"){const a=(window as any).__acc.find((x: any)=>x.name===args.name);if(a)a.name=String(args.newName).toUpperCase();return null;}
|
if(cmd==="account_rename"){const a=(window as any).__acc.find((x: any)=>x.name===args.name);if(a)a.name=String(args.newName).toUpperCase();return null;}
|
||||||
if(cmd==="client_info"){const c=(window as any).__client??"none";return c==="none"?null:{path:"C:\\games\\CoA Client",executable:"Ascension.exe",realmlists:[{path:"x",host:"127.0.0.1"}],addon:{installed:true,version:"1",up_to_date:true},other_addons:2};}
|
if(cmd==="client_info"){const c=(window as any).__client??"none";return c==="none"?null:{path:"C:\\games\\CoA Client",executable:"Ascension.exe",realmlists:[{path:"x",host:args.id==="@remote-client"?remoteHost:"127.0.0.1"}],addon:{installed:true,version:"1",up_to_date:true},other_addons:2};}
|
||||||
if(cmd==="set_client"){(window as any).__client="foreign";return {path:args.path,executable:"Ascension.exe",realmlists:[],addon:{installed:false,version:null,up_to_date:null},other_addons:0};}
|
if(cmd==="set_client"){(window as any).__client="foreign";return {path:args.path,executable:"Ascension.exe",realmlists:[],addon:{installed:false,version:null,up_to_date:null},other_addons:0};}
|
||||||
if(cmd==="plugin:event|listen"){const w=window as any;(w.__handlers??={})[args.event]=[...(w.__handlers[args.event]??[]),args.handler];return 1;}
|
if(cmd==="plugin:event|listen"){const w=window as any;(w.__handlers??={})[args.event]=[...(w.__handlers[args.event]??[]),args.handler];return 1;}
|
||||||
if(cmd==="plugin:event|unlisten") return null;
|
if(cmd==="plugin:event|unlisten") return null;
|
||||||
|
|||||||
+29
-1
@@ -2,6 +2,21 @@ import type en from "./en";
|
|||||||
|
|
||||||
/** Deutsch. Entwurf einer Übersetzung; vor der Veröffentlichung von Muttersprachlern zu prüfen. */
|
/** Deutsch. Entwurf einer Übersetzung; vor der Veröffentlichung von Muttersprachlern zu prüfen. */
|
||||||
const de: Partial<Record<keyof typeof en, string>> = {
|
const de: Partial<Record<keyof typeof en, string>> = {
|
||||||
|
"remote.clientReady": "Dein Client ist bereit. Speichere die Hostadresse und klicke auf Spielen.",
|
||||||
|
"remote.clientIntro": "Wähle einen vorhandenen Spielclient oder lade ihn hier herunter. Ein lokaler Server ist nicht nötig.",
|
||||||
|
"welcome.host.title": "Einen Server hosten",
|
||||||
|
"welcome.host.text": "Einen neuen Server installieren oder einen vorhandenen verwalten.",
|
||||||
|
"welcome.connect.title": "Mit anderem Server verbinden",
|
||||||
|
"welcome.connect.text": "Den Spielclient herunterladen oder aktualisieren und bei Freunden spielen.",
|
||||||
|
"remote.intro": "Richte deinen Spielclient ein. Dein Freund betreibt den Server.",
|
||||||
|
"remote.address": "Serveradresse",
|
||||||
|
"remote.addressHint": "Für LAN-Spiele frage den Host nach der lokalen IP-Adresse seines Computers.",
|
||||||
|
"remote.save": "Adresse speichern",
|
||||||
|
"remote.saved": "Serveradresse gespeichert.",
|
||||||
|
"remote.accountHint": "Bitte den Host, ein Spielkonto für dich anzulegen.",
|
||||||
|
"remote.hostInstead": "Eigenen Server hosten",
|
||||||
|
"welcome.roleSubtitle": "Wie möchtest du spielen?",
|
||||||
|
|
||||||
"nav.overview": "Übersicht",
|
"nav.overview": "Übersicht",
|
||||||
"nav.bots": "Bots",
|
"nav.bots": "Bots",
|
||||||
"nav.server": "Server",
|
"nav.server": "Server",
|
||||||
@@ -58,6 +73,8 @@ const de: Partial<Record<keyof typeof en, string>> = {
|
|||||||
"btn.stop": "SERVER STOPPEN",
|
"btn.stop": "SERVER STOPPEN",
|
||||||
"btn.stopSmall": "Stoppen",
|
"btn.stopSmall": "Stoppen",
|
||||||
"btn.restart": "Neustart",
|
"btn.restart": "Neustart",
|
||||||
|
"btn.startWithoutUpdate": "Ohne Update starten",
|
||||||
|
"btn.playWithoutUpdate": "Ohne Update spielen",
|
||||||
"btn.play": "SPIELEN",
|
"btn.play": "SPIELEN",
|
||||||
"btn.startPlay": "STARTEN & SPIELEN",
|
"btn.startPlay": "STARTEN & SPIELEN",
|
||||||
"btn.startingCaps": "STARTET …",
|
"btn.startingCaps": "STARTET …",
|
||||||
@@ -346,10 +363,11 @@ const de: Partial<Record<keyof typeof en, string>> = {
|
|||||||
"upd.confirmBack": "Zur vorherigen Version zurückkehren? Deine Charaktere und Konten werden nicht verändert.",
|
"upd.confirmBack": "Zur vorherigen Version zurückkehren? Deine Charaktere und Konten werden nicht verändert.",
|
||||||
"upd.wentBack": "Zur vorherigen Version zurückgekehrt. Deine Daten wurden nicht angetastet.",
|
"upd.wentBack": "Zur vorherigen Version zurückgekehrt. Deine Daten wurden nicht angetastet.",
|
||||||
"upd.dialogTitle": "Wähle einen Update-Paketordner",
|
"upd.dialogTitle": "Wähle einen Update-Paketordner",
|
||||||
|
"upd.retryValidation": "Serverstart erneut prüfen",
|
||||||
"upd.pendingBad": "Der aktualisierte Server ist nicht korrekt gestartet",
|
"upd.pendingBad": "Der aktualisierte Server ist nicht korrekt gestartet",
|
||||||
"upd.pendingUnfinished": "Ein früheres Update wurde nicht abgeschlossen",
|
"upd.pendingUnfinished": "Ein früheres Update wurde nicht abgeschlossen",
|
||||||
"upd.safeBack": "Du kannst sicher zur vorherigen Version zurückkehren.",
|
"upd.safeBack": "Du kannst sicher zur vorherigen Version zurückkehren.",
|
||||||
"upd.backNote": "Das Zurückkehren stellt Programmdateien und Einstellungen wieder her. Charaktere und Konten werden nie automatisch zurückgesetzt.",
|
"upd.backNote": "Die Rückkehr stellt Dateien und Einstellungen wieder her. Wurden Datenbankupdates begonnen, werden auch alle Datenbanken aus der Sicherung vor dem Update wiederhergestellt. Späterer Fortschritt geht verloren.",
|
||||||
"upd.goBackTo": "Zu Version {v} zurückkehren",
|
"upd.goBackTo": "Zu Version {v} zurückkehren",
|
||||||
"upd.goBackBefore": "Zur Version vor dem Update zurückkehren",
|
"upd.goBackBefore": "Zur Version vor dem Update zurückkehren",
|
||||||
"upd.title": "Server-Updates",
|
"upd.title": "Server-Updates",
|
||||||
@@ -724,6 +742,16 @@ const de: Partial<Record<keyof typeof en, string>> = {
|
|||||||
"realm.confirmDelete": "Realmlist „{name}“ entfernen? Der Spielclient behält die aktuelle Datei.",
|
"realm.confirmDelete": "Realmlist „{name}“ entfernen? Der Spielclient behält die aktuelle Datei.",
|
||||||
"nav.modules": "Module",
|
"nav.modules": "Module",
|
||||||
"q.modules": "Welche Zusatzfunktionen hat der Server?",
|
"q.modules": "Welche Zusatzfunktionen hat der Server?",
|
||||||
|
"mod.ahbot.types": "Verkaufte Gegenstandstypen",
|
||||||
|
"mod.ahbot.typesHint": "Typen für neue Angebote auswählen. Bestehende Auktionen bleiben. Einschalten stellt die vorherigen Gewichte dieser Sitzung oder die Standardwerte wieder her.",
|
||||||
|
"mod.ahbot.qualityWeights": "Qualität und Häufigkeit",
|
||||||
|
"mod.ahbot.weightsHint": "Relative Gewichte, keine Prozente. 0 schließt eine Qualität aus; höhere Werte erhöhen die Häufigkeit. Sind alle Standardwerte 0, wird gewöhnliche Qualität gewählt. Andere Filter gelten weiterhin.",
|
||||||
|
"mod.ahbot.noTypes": "Alle Typen sind deaktiviert. Der Verkäufer hat keine Typen für neue Angebote.",
|
||||||
|
"mod.noSettings": "Keine weiteren Einstellungen. Verwende den Modulschalter oben.",
|
||||||
|
"err.bot_modules_conflict.title": "Zwei Bot-Module sind aktiviert",
|
||||||
|
"err.bot_modules_conflict.message": "Deaktiviere CoA Companions oder SQUID Playerbots unter Module vor dem Serverstart.",
|
||||||
|
"mod.ahbot.setup": "GUID eines separaten Auktionscharakters eintragen, Verkäufer und Modul aktivieren. Der Charakter muss offline sein. Der CoA-Filter nutzt Beute-, Händler- und Berufstabellen; Stufengrenzen gelten zusätzlich. Erfordert einen Serverbuild mit CoA-Auktionsfilter.",
|
||||||
|
"mod.ahbot.allSettings": "Alle Auktionseinstellungen",
|
||||||
"mod.title": "Module",
|
"mod.title": "Module",
|
||||||
"mod.intro": "Zusatzfunktionen, die im Server eingebaut sind. Schalte die gewünschten ein oder aus, öffne ihre GitHub-Seite oder ändere ihre Einstellungen.",
|
"mod.intro": "Zusatzfunktionen, die im Server eingebaut sind. Schalte die gewünschten ein oder aus, öffne ihre GitHub-Seite oder ändere ihre Einstellungen.",
|
||||||
"mod.restart": "Änderungen werden nach einem Neustart des Weltservers wirksam.",
|
"mod.restart": "Änderungen werden nach einem Neustart des Weltservers wirksam.",
|
||||||
|
|||||||
+29
-1
@@ -1,5 +1,20 @@
|
|||||||
/** English is the source of truth: every key must exist here; other locales fall back to it. */
|
/** English is the source of truth: every key must exist here; other locales fall back to it. */
|
||||||
const en = {
|
const en = {
|
||||||
|
"remote.clientReady": "Your client is ready. Save the host’s address, then press Play.",
|
||||||
|
"remote.clientIntro": "Choose an existing game client or download one here. No local server is needed.",
|
||||||
|
"welcome.host.title": "Host a server",
|
||||||
|
"welcome.host.text": "Install a new server or manage one you already have.",
|
||||||
|
"welcome.connect.title": "Connect to another server",
|
||||||
|
"welcome.connect.text": "Download or update the game client and play on a friend’s server.",
|
||||||
|
"remote.intro": "Set up your game client. Your friend runs the server.",
|
||||||
|
"remote.address": "Server address",
|
||||||
|
"remote.addressHint": "For LAN play, ask the host for their computer’s local IP address.",
|
||||||
|
"remote.save": "Save address",
|
||||||
|
"remote.saved": "Server address saved.",
|
||||||
|
"remote.accountHint": "Ask the host to create a game account for you.",
|
||||||
|
"remote.hostInstead": "Host my own server",
|
||||||
|
"welcome.roleSubtitle": "How would you like to play?",
|
||||||
|
|
||||||
"realm.profileLabel": "Realm",
|
"realm.profileLabel": "Realm",
|
||||||
"realm.startupTitle": "Realm startup",
|
"realm.startupTitle": "Realm startup",
|
||||||
"realm.secondWorld": "Second world",
|
"realm.secondWorld": "Second world",
|
||||||
@@ -89,6 +104,8 @@ const en = {
|
|||||||
"btn.stop": "STOP SERVER",
|
"btn.stop": "STOP SERVER",
|
||||||
"btn.stopSmall": "Stop",
|
"btn.stopSmall": "Stop",
|
||||||
"btn.restart": "Restart",
|
"btn.restart": "Restart",
|
||||||
|
"btn.startWithoutUpdate": "Start without updating",
|
||||||
|
"btn.playWithoutUpdate": "Play without updating",
|
||||||
"btn.play": "PLAY",
|
"btn.play": "PLAY",
|
||||||
"btn.startPlay": "START & PLAY",
|
"btn.startPlay": "START & PLAY",
|
||||||
"btn.startingCaps": "STARTING…",
|
"btn.startingCaps": "STARTING…",
|
||||||
@@ -379,10 +396,11 @@ const en = {
|
|||||||
"upd.confirmBack": "Go back to the previous version? Your characters and accounts are not changed.",
|
"upd.confirmBack": "Go back to the previous version? Your characters and accounts are not changed.",
|
||||||
"upd.wentBack": "Went back to the previous version. Your data was not touched.",
|
"upd.wentBack": "Went back to the previous version. Your data was not touched.",
|
||||||
"upd.dialogTitle": "Choose an update package folder",
|
"upd.dialogTitle": "Choose an update package folder",
|
||||||
|
"upd.retryValidation": "Retry server startup",
|
||||||
"upd.pendingBad": "The updated server did not start correctly",
|
"upd.pendingBad": "The updated server did not start correctly",
|
||||||
"upd.pendingUnfinished": "An earlier update did not finish",
|
"upd.pendingUnfinished": "An earlier update did not finish",
|
||||||
"upd.safeBack": "You can safely go back to the previous version.",
|
"upd.safeBack": "You can safely go back to the previous version.",
|
||||||
"upd.backNote": "Going back restores program files and settings. Characters and accounts are never rolled back automatically.",
|
"upd.backNote": "Going back restores files and settings. If database updates started, it also restores all databases to the backup taken before the update. Later progress will be lost.",
|
||||||
"upd.goBackTo": "Go back to version {v}",
|
"upd.goBackTo": "Go back to version {v}",
|
||||||
"upd.goBackBefore": "Go back to the version before the update",
|
"upd.goBackBefore": "Go back to the version before the update",
|
||||||
"upd.title": "Server updates",
|
"upd.title": "Server updates",
|
||||||
@@ -745,6 +763,16 @@ const en = {
|
|||||||
"realm.confirmDelete": "Remove the realmlist “{name}”? The game client keeps whatever file it has now.",
|
"realm.confirmDelete": "Remove the realmlist “{name}”? The game client keeps whatever file it has now.",
|
||||||
"nav.modules": "Modules",
|
"nav.modules": "Modules",
|
||||||
"q.modules": "What extra features does the server have?",
|
"q.modules": "What extra features does the server have?",
|
||||||
|
"mod.ahbot.types": "Item types for sale",
|
||||||
|
"mod.ahbot.typesHint": "Choose types for new listings. Existing auctions remain. Enabling a type restores its previous weights in this session, or the configured defaults.",
|
||||||
|
"mod.ahbot.qualityWeights": "Quality and frequency",
|
||||||
|
"mod.ahbot.weightsHint": "Relative weights, not percentages. 0 excludes a quality; larger values make it more frequent. If all defaults are zero, enabling selects common quality. Other item filters still apply.",
|
||||||
|
"mod.ahbot.noTypes": "All types are disabled. The seller has no types to choose for new listings.",
|
||||||
|
"mod.noSettings": "There are no additional settings. Use the module switch above.",
|
||||||
|
"mod.ahbot.setup": "Enter a dedicated auction character GUID, enable the seller and the module. Keep that character offline. The CoA filter selects items from loot tables, vendors and professions; level restrictions also apply. Requires a server build with the CoA auction filter.",
|
||||||
|
"mod.ahbot.allSettings": "All settings",
|
||||||
|
"err.bot_modules_conflict.title": "Two bot modules are enabled",
|
||||||
|
"err.bot_modules_conflict.message": "Disable CoA Companions or SQUID Playerbots in Modules before starting the server.",
|
||||||
"mod.title": "Modules",
|
"mod.title": "Modules",
|
||||||
"mod.intro": "Extra features built into the server. Switch the ones you want on or off, open their GitHub page, or change their settings.",
|
"mod.intro": "Extra features built into the server. Switch the ones you want on or off, open their GitHub page, or change their settings.",
|
||||||
"mod.restart": "Changes apply after the world server restarts.",
|
"mod.restart": "Changes apply after the world server restarts.",
|
||||||
|
|||||||
+29
-1
@@ -2,6 +2,21 @@ import type en from "./en";
|
|||||||
|
|
||||||
/** Español. Traducción provisional; debe revisarla un hablante nativo antes de publicarse. */
|
/** Español. Traducción provisional; debe revisarla un hablante nativo antes de publicarse. */
|
||||||
const es: Partial<Record<keyof typeof en, string>> = {
|
const es: Partial<Record<keyof typeof en, string>> = {
|
||||||
|
"remote.clientReady": "Tu cliente está listo. Guarda la dirección del anfitrión y pulsa Jugar.",
|
||||||
|
"remote.clientIntro": "Elige un cliente existente o descárgalo aquí. No necesitas un servidor local.",
|
||||||
|
"welcome.host.title": "Alojar un servidor",
|
||||||
|
"welcome.host.text": "Instalar un servidor nuevo o gestionar uno existente.",
|
||||||
|
"welcome.connect.title": "Conectarse a otro servidor",
|
||||||
|
"welcome.connect.text": "Descargar o actualizar el cliente y jugar en el servidor de un amigo.",
|
||||||
|
"remote.intro": "Configura tu cliente. Tu amigo aloja el servidor.",
|
||||||
|
"remote.address": "Dirección del servidor",
|
||||||
|
"remote.addressHint": "Para jugar en LAN, pide al anfitrión la IP local de su ordenador.",
|
||||||
|
"remote.save": "Guardar dirección",
|
||||||
|
"remote.saved": "Dirección del servidor guardada.",
|
||||||
|
"remote.accountHint": "Pide al anfitrión que te cree una cuenta de juego.",
|
||||||
|
"remote.hostInstead": "Alojar mi servidor",
|
||||||
|
"welcome.roleSubtitle": "¿Cómo quieres jugar?",
|
||||||
|
|
||||||
"nav.overview": "Resumen",
|
"nav.overview": "Resumen",
|
||||||
"nav.bots": "Bots",
|
"nav.bots": "Bots",
|
||||||
"nav.server": "Servidor",
|
"nav.server": "Servidor",
|
||||||
@@ -58,6 +73,8 @@ const es: Partial<Record<keyof typeof en, string>> = {
|
|||||||
"btn.stop": "DETENER SERVIDOR",
|
"btn.stop": "DETENER SERVIDOR",
|
||||||
"btn.stopSmall": "Detener",
|
"btn.stopSmall": "Detener",
|
||||||
"btn.restart": "Reiniciar",
|
"btn.restart": "Reiniciar",
|
||||||
|
"btn.startWithoutUpdate": "Iniciar sin actualizar",
|
||||||
|
"btn.playWithoutUpdate": "Jugar sin actualizar",
|
||||||
"btn.play": "JUGAR",
|
"btn.play": "JUGAR",
|
||||||
"btn.startPlay": "INICIAR Y JUGAR",
|
"btn.startPlay": "INICIAR Y JUGAR",
|
||||||
"btn.startingCaps": "INICIANDO…",
|
"btn.startingCaps": "INICIANDO…",
|
||||||
@@ -346,10 +363,11 @@ const es: Partial<Record<keyof typeof en, string>> = {
|
|||||||
"upd.confirmBack": "¿Volver a la versión anterior? Tus personajes y cuentas no se modifican.",
|
"upd.confirmBack": "¿Volver a la versión anterior? Tus personajes y cuentas no se modifican.",
|
||||||
"upd.wentBack": "Se volvió a la versión anterior. Tus datos no se tocaron.",
|
"upd.wentBack": "Se volvió a la versión anterior. Tus datos no se tocaron.",
|
||||||
"upd.dialogTitle": "Elige una carpeta de paquete de actualización",
|
"upd.dialogTitle": "Elige una carpeta de paquete de actualización",
|
||||||
|
"upd.retryValidation": "Reintentar iniciar el servidor",
|
||||||
"upd.pendingBad": "El servidor actualizado no se inició correctamente",
|
"upd.pendingBad": "El servidor actualizado no se inició correctamente",
|
||||||
"upd.pendingUnfinished": "Una actualización anterior no terminó",
|
"upd.pendingUnfinished": "Una actualización anterior no terminó",
|
||||||
"upd.safeBack": "Puedes volver con seguridad a la versión anterior.",
|
"upd.safeBack": "Puedes volver con seguridad a la versión anterior.",
|
||||||
"upd.backNote": "Volver restaura los archivos del programa y los ajustes. Los personajes y cuentas nunca se revierten automáticamente.",
|
"upd.backNote": "Volver restaura los archivos y los ajustes. Si comenzaron las actualizaciones de las bases de datos, también se restauran todas las bases desde la copia anterior a la actualización. Se perderá el progreso posterior.",
|
||||||
"upd.goBackTo": "Volver a la versión {v}",
|
"upd.goBackTo": "Volver a la versión {v}",
|
||||||
"upd.goBackBefore": "Volver a la versión anterior a la actualización",
|
"upd.goBackBefore": "Volver a la versión anterior a la actualización",
|
||||||
"upd.title": "Actualizaciones del servidor",
|
"upd.title": "Actualizaciones del servidor",
|
||||||
@@ -724,6 +742,16 @@ const es: Partial<Record<keyof typeof en, string>> = {
|
|||||||
"realm.confirmDelete": "¿Eliminar la realmlist «{name}»? El cliente conserva el archivo actual.",
|
"realm.confirmDelete": "¿Eliminar la realmlist «{name}»? El cliente conserva el archivo actual.",
|
||||||
"nav.modules": "Módulos",
|
"nav.modules": "Módulos",
|
||||||
"q.modules": "¿Qué funciones adicionales tiene el servidor?",
|
"q.modules": "¿Qué funciones adicionales tiene el servidor?",
|
||||||
|
"mod.ahbot.types": "Tipos de objetos en venta",
|
||||||
|
"mod.ahbot.typesHint": "Elige tipos para nuevos anuncios. Las subastas existentes permanecen. Al activar se restauran los pesos de esta sesión o los valores predeterminados.",
|
||||||
|
"mod.ahbot.qualityWeights": "Calidad y frecuencia",
|
||||||
|
"mod.ahbot.weightsHint": "Pesos relativos, no porcentajes. 0 excluye una calidad; valores mayores aumentan su frecuencia. Si todos los valores predeterminados son cero, se elige calidad común. Los demás filtros siguen activos.",
|
||||||
|
"mod.ahbot.noTypes": "Todos los tipos están desactivados. El vendedor no tiene tipos para nuevos anuncios.",
|
||||||
|
"mod.noSettings": "No hay ajustes adicionales. Usa el interruptor del módulo de arriba.",
|
||||||
|
"err.bot_modules_conflict.title": "Hay dos módulos de bots activos",
|
||||||
|
"err.bot_modules_conflict.message": "Desactiva CoA Companions o SQUID Playerbots en Módulos antes de iniciar el servidor.",
|
||||||
|
"mod.ahbot.setup": "Indica el GUID de un personaje dedicado a subastas y activa vendedor y módulo. El personaje debe estar desconectado. El filtro CoA usa botín, vendedores y profesiones; los límites de nivel se aplican además. Requiere un servidor con filtro de subastas CoA.",
|
||||||
|
"mod.ahbot.allSettings": "Todos los ajustes de subastas",
|
||||||
"mod.title": "Módulos",
|
"mod.title": "Módulos",
|
||||||
"mod.intro": "Funciones adicionales integradas en el servidor. Activa o desactiva las que quieras, abre su página de GitHub o cambia sus ajustes.",
|
"mod.intro": "Funciones adicionales integradas en el servidor. Activa o desactiva las que quieras, abre su página de GitHub o cambia sus ajustes.",
|
||||||
"mod.restart": "Los cambios se aplican al reiniciar el servidor del mundo.",
|
"mod.restart": "Los cambios se aplican al reiniciar el servidor del mundo.",
|
||||||
|
|||||||
+29
-1
@@ -2,6 +2,21 @@ import type en from "./en";
|
|||||||
|
|
||||||
/** Français. Traduction provisoire ; à faire relire par un locuteur natif avant la publication. */
|
/** Français. Traduction provisoire ; à faire relire par un locuteur natif avant la publication. */
|
||||||
const fr: Partial<Record<keyof typeof en, string>> = {
|
const fr: Partial<Record<keyof typeof en, string>> = {
|
||||||
|
"remote.clientReady": "Votre client est prêt. Enregistrez l’adresse de l’hôte, puis cliquez sur Jouer.",
|
||||||
|
"remote.clientIntro": "Choisissez un client existant ou téléchargez-le ici. Aucun serveur local n’est nécessaire.",
|
||||||
|
"welcome.host.title": "Héberger un serveur",
|
||||||
|
"welcome.host.text": "Installer un serveur ou gérer un serveur existant.",
|
||||||
|
"welcome.connect.title": "Rejoindre un autre serveur",
|
||||||
|
"welcome.connect.text": "Télécharger ou mettre à jour le client et jouer sur le serveur d’un ami.",
|
||||||
|
"remote.intro": "Configurez votre client. Votre ami héberge le serveur.",
|
||||||
|
"remote.address": "Adresse du serveur",
|
||||||
|
"remote.addressHint": "Pour jouer en réseau local, demandez l’adresse IP locale de l’ordinateur hôte.",
|
||||||
|
"remote.save": "Enregistrer l’adresse",
|
||||||
|
"remote.saved": "Adresse du serveur enregistrée.",
|
||||||
|
"remote.accountHint": "Demandez à l’hôte de créer un compte de jeu pour vous.",
|
||||||
|
"remote.hostInstead": "Héberger mon serveur",
|
||||||
|
"welcome.roleSubtitle": "Comment souhaitez-vous jouer ?",
|
||||||
|
|
||||||
"nav.overview": "Vue d’ensemble",
|
"nav.overview": "Vue d’ensemble",
|
||||||
"nav.bots": "Bots",
|
"nav.bots": "Bots",
|
||||||
"nav.server": "Serveur",
|
"nav.server": "Serveur",
|
||||||
@@ -58,6 +73,8 @@ const fr: Partial<Record<keyof typeof en, string>> = {
|
|||||||
"btn.stop": "ARRÊTER LE SERVEUR",
|
"btn.stop": "ARRÊTER LE SERVEUR",
|
||||||
"btn.stopSmall": "Arrêter",
|
"btn.stopSmall": "Arrêter",
|
||||||
"btn.restart": "Redémarrer",
|
"btn.restart": "Redémarrer",
|
||||||
|
"btn.startWithoutUpdate": "Démarrer sans mise à jour",
|
||||||
|
"btn.playWithoutUpdate": "Jouer sans mise à jour",
|
||||||
"btn.play": "JOUER",
|
"btn.play": "JOUER",
|
||||||
"btn.startPlay": "DÉMARRER ET JOUER",
|
"btn.startPlay": "DÉMARRER ET JOUER",
|
||||||
"btn.startingCaps": "DÉMARRAGE…",
|
"btn.startingCaps": "DÉMARRAGE…",
|
||||||
@@ -346,10 +363,11 @@ const fr: Partial<Record<keyof typeof en, string>> = {
|
|||||||
"upd.confirmBack": "Revenir à la version précédente ? Vos personnages et comptes ne sont pas modifiés.",
|
"upd.confirmBack": "Revenir à la version précédente ? Vos personnages et comptes ne sont pas modifiés.",
|
||||||
"upd.wentBack": "Retour à la version précédente effectué. Vos données n’ont pas été touchées.",
|
"upd.wentBack": "Retour à la version précédente effectué. Vos données n’ont pas été touchées.",
|
||||||
"upd.dialogTitle": "Choisissez un dossier de paquet de mise à jour",
|
"upd.dialogTitle": "Choisissez un dossier de paquet de mise à jour",
|
||||||
|
"upd.retryValidation": "Réessayer de démarrer le serveur",
|
||||||
"upd.pendingBad": "Le serveur mis à jour n’a pas démarré correctement",
|
"upd.pendingBad": "Le serveur mis à jour n’a pas démarré correctement",
|
||||||
"upd.pendingUnfinished": "Une mise à jour précédente ne s’est pas terminée",
|
"upd.pendingUnfinished": "Une mise à jour précédente ne s’est pas terminée",
|
||||||
"upd.safeBack": "Vous pouvez revenir en toute sécurité à la version précédente.",
|
"upd.safeBack": "Vous pouvez revenir en toute sécurité à la version précédente.",
|
||||||
"upd.backNote": "Le retour restaure les fichiers du programme et les paramètres. Les personnages et comptes ne sont jamais restaurés automatiquement.",
|
"upd.backNote": "Le retour restaure les fichiers et les paramètres. Si la mise à jour des bases a commencé, toutes les bases sont aussi restaurées depuis la sauvegarde précédant la mise à jour. La progression ultérieure sera perdue.",
|
||||||
"upd.goBackTo": "Revenir à la version {v}",
|
"upd.goBackTo": "Revenir à la version {v}",
|
||||||
"upd.goBackBefore": "Revenir à la version d’avant la mise à jour",
|
"upd.goBackBefore": "Revenir à la version d’avant la mise à jour",
|
||||||
"upd.title": "Mises à jour du serveur",
|
"upd.title": "Mises à jour du serveur",
|
||||||
@@ -724,6 +742,16 @@ const fr: Partial<Record<keyof typeof en, string>> = {
|
|||||||
"realm.confirmDelete": "Supprimer la realmlist « {name} » ? Le client garde le fichier actuel.",
|
"realm.confirmDelete": "Supprimer la realmlist « {name} » ? Le client garde le fichier actuel.",
|
||||||
"nav.modules": "Modules",
|
"nav.modules": "Modules",
|
||||||
"q.modules": "Quelles fonctions supplémentaires le serveur propose-t-il ?",
|
"q.modules": "Quelles fonctions supplémentaires le serveur propose-t-il ?",
|
||||||
|
"mod.ahbot.types": "Types d’objets à vendre",
|
||||||
|
"mod.ahbot.typesHint": "Choisissez les types des nouvelles annonces. Les enchères existantes restent. L’activation restaure les poids de cette session ou les valeurs par défaut.",
|
||||||
|
"mod.ahbot.qualityWeights": "Qualité et fréquence",
|
||||||
|
"mod.ahbot.weightsHint": "Poids relatifs, pas des pourcentages. 0 exclut une qualité ; un poids supérieur augmente sa fréquence. Si tous les défauts sont nuls, la qualité commune est choisie. Les autres filtres restent actifs.",
|
||||||
|
"mod.ahbot.noTypes": "Tous les types sont désactivés. Le vendeur n’a aucun type à choisir.",
|
||||||
|
"mod.noSettings": "Aucun réglage supplémentaire. Utilisez l’interrupteur du module ci-dessus.",
|
||||||
|
"err.bot_modules_conflict.title": "Deux modules de bots sont activés",
|
||||||
|
"err.bot_modules_conflict.message": "Désactivez CoA Companions ou SQUID Playerbots dans Modules avant de démarrer le serveur.",
|
||||||
|
"mod.ahbot.setup": "Indiquez le GUID d’un personnage dédié aux enchères, activez le vendeur et le module. Le personnage doit être hors ligne. Le filtre CoA utilise le butin, les vendeurs et les métiers ; les limites de niveau s’ajoutent. Nécessite un serveur avec le filtre d’enchères CoA.",
|
||||||
|
"mod.ahbot.allSettings": "Tous les réglages d’enchères",
|
||||||
"mod.title": "Modules",
|
"mod.title": "Modules",
|
||||||
"mod.intro": "Fonctions supplémentaires intégrées au serveur. Activez ou désactivez celles que vous voulez, ouvrez leur page GitHub ou modifiez leurs réglages.",
|
"mod.intro": "Fonctions supplémentaires intégrées au serveur. Activez ou désactivez celles que vous voulez, ouvrez leur page GitHub ou modifiez leurs réglages.",
|
||||||
"mod.restart": "Les changements s’appliquent après le redémarrage du serveur de monde.",
|
"mod.restart": "Les changements s’appliquent après le redémarrage du serveur de monde.",
|
||||||
|
|||||||
+29
-1
@@ -2,6 +2,21 @@ import type en from "./en";
|
|||||||
|
|
||||||
/** Русский. Черновой перевод; требует проверки носителем перед релизом. */
|
/** Русский. Черновой перевод; требует проверки носителем перед релизом. */
|
||||||
const ru: Partial<Record<keyof typeof en, string>> = {
|
const ru: Partial<Record<keyof typeof en, string>> = {
|
||||||
|
"remote.clientReady": "Клиент готов. Сохраните адрес хоста и нажмите «Играть».",
|
||||||
|
"remote.clientIntro": "Выберите существующий клиент игры или скачайте его здесь. Локальный сервер не требуется.",
|
||||||
|
"welcome.host.title": "Хочу быть хостом",
|
||||||
|
"welcome.host.text": "Установить новый сервер или управлять существующим.",
|
||||||
|
"welcome.connect.title": "Подключиться к другому серверу",
|
||||||
|
"welcome.connect.text": "Скачать или обновить клиент и играть на сервере друга.",
|
||||||
|
"remote.intro": "Настройте игровой клиент. Сервер запускает ваш друг.",
|
||||||
|
"remote.address": "Адрес сервера",
|
||||||
|
"remote.addressHint": "Для игры по локальной сети попросите у хоста локальный IP его компьютера.",
|
||||||
|
"remote.save": "Сохранить адрес",
|
||||||
|
"remote.saved": "Адрес сервера сохранён.",
|
||||||
|
"remote.accountHint": "Попросите хоста создать для вас игровой аккаунт.",
|
||||||
|
"remote.hostInstead": "Создать свой сервер",
|
||||||
|
"welcome.roleSubtitle": "Как вы хотите играть?",
|
||||||
|
|
||||||
"realm.profileLabel": "Реалм",
|
"realm.profileLabel": "Реалм",
|
||||||
"realm.startupTitle": "Запуск реалмов",
|
"realm.startupTitle": "Запуск реалмов",
|
||||||
"realm.secondWorld": "Второй мир",
|
"realm.secondWorld": "Второй мир",
|
||||||
@@ -89,6 +104,8 @@ const ru: Partial<Record<keyof typeof en, string>> = {
|
|||||||
"btn.stop": "ОСТАНОВИТЬ СЕРВЕР",
|
"btn.stop": "ОСТАНОВИТЬ СЕРВЕР",
|
||||||
"btn.stopSmall": "Остановить",
|
"btn.stopSmall": "Остановить",
|
||||||
"btn.restart": "Перезапустить",
|
"btn.restart": "Перезапустить",
|
||||||
|
"btn.startWithoutUpdate": "Запустить без обновления",
|
||||||
|
"btn.playWithoutUpdate": "Играть без обновления",
|
||||||
"btn.play": "ИГРАТЬ",
|
"btn.play": "ИГРАТЬ",
|
||||||
"btn.startPlay": "ЗАПУСТИТЬ И ИГРАТЬ",
|
"btn.startPlay": "ЗАПУСТИТЬ И ИГРАТЬ",
|
||||||
"btn.startingCaps": "ЗАПУСК…",
|
"btn.startingCaps": "ЗАПУСК…",
|
||||||
@@ -377,10 +394,11 @@ const ru: Partial<Record<keyof typeof en, string>> = {
|
|||||||
"upd.confirmBack": "Вернуться к предыдущей версии? Ваши персонажи и учётные записи не изменятся.",
|
"upd.confirmBack": "Вернуться к предыдущей версии? Ваши персонажи и учётные записи не изменятся.",
|
||||||
"upd.wentBack": "Выполнен возврат к предыдущей версии. Ваши данные не затронуты.",
|
"upd.wentBack": "Выполнен возврат к предыдущей версии. Ваши данные не затронуты.",
|
||||||
"upd.dialogTitle": "Выберите папку с пакетом обновления",
|
"upd.dialogTitle": "Выберите папку с пакетом обновления",
|
||||||
|
"upd.retryValidation": "Повторить запуск сервера",
|
||||||
"upd.pendingBad": "Обновлённый сервер запустился некорректно",
|
"upd.pendingBad": "Обновлённый сервер запустился некорректно",
|
||||||
"upd.pendingUnfinished": "Предыдущее обновление не завершилось",
|
"upd.pendingUnfinished": "Предыдущее обновление не завершилось",
|
||||||
"upd.safeBack": "Можно безопасно вернуться к предыдущей версии.",
|
"upd.safeBack": "Можно безопасно вернуться к предыдущей версии.",
|
||||||
"upd.backNote": "Возврат восстанавливает файлы программы и настройки. Персонажи и учётные записи автоматически не откатываются никогда.",
|
"upd.backNote": "Возврат восстанавливает файлы и настройки. Если обновление баз уже началось, все базы также восстанавливаются из копии перед обновлением. Более поздний прогресс будет потерян.",
|
||||||
"upd.goBackTo": "Вернуться к версии {v}",
|
"upd.goBackTo": "Вернуться к версии {v}",
|
||||||
"upd.goBackBefore": "Вернуться к версии до обновления",
|
"upd.goBackBefore": "Вернуться к версии до обновления",
|
||||||
"upd.title": "Обновления сервера",
|
"upd.title": "Обновления сервера",
|
||||||
@@ -743,6 +761,16 @@ const ru: Partial<Record<keyof typeof en, string>> = {
|
|||||||
"realm.confirmDelete": "Удалить реалмлист «{name}»? В игровом клиенте останется текущий файл.",
|
"realm.confirmDelete": "Удалить реалмлист «{name}»? В игровом клиенте останется текущий файл.",
|
||||||
"nav.modules": "Модули",
|
"nav.modules": "Модули",
|
||||||
"q.modules": "Какие дополнительные возможности есть у сервера?",
|
"q.modules": "Какие дополнительные возможности есть у сервера?",
|
||||||
|
"mod.ahbot.types": "Типы предметов в продаже",
|
||||||
|
"mod.ahbot.typesHint": "Выберите типы для новых лотов. Уже выставленные лоты останутся. При включении возвращаются прежние веса этой сессии или значения по умолчанию.",
|
||||||
|
"mod.ahbot.qualityWeights": "Качество и частота",
|
||||||
|
"mod.ahbot.weightsHint": "Это относительные веса, а не проценты. 0 исключает качество; большее значение повышает частоту. Если все значения по умолчанию равны нулю, включается обычное качество. Остальные фильтры продолжают действовать.",
|
||||||
|
"mod.ahbot.noTypes": "Все типы отключены. Продавцу не из чего выбирать новые лоты.",
|
||||||
|
"mod.noSettings": "Дополнительных настроек нет. Используйте переключатель модуля выше.",
|
||||||
|
"mod.ahbot.setup": "Укажите GUID отдельного персонажа аукциониста, включите продавца и модуль. Персонаж должен быть офлайн. Фильтр CoA оставляет предметы из таблиц добычи, торговцев и профессий; ограничения уровней применяются дополнительно. Нужна сборка сервера с фильтром аукциона CoA.",
|
||||||
|
"mod.ahbot.allSettings": "Все настройки",
|
||||||
|
"err.bot_modules_conflict.title": "Включены две системы ботов",
|
||||||
|
"err.bot_modules_conflict.message": "Выключите CoA Companions или SQUID Playerbots в разделе «Модули» перед запуском сервера.",
|
||||||
"mod.title": "Модули",
|
"mod.title": "Модули",
|
||||||
"mod.intro": "Дополнительные возможности, встроенные в сервер. Включайте и выключайте нужные, открывайте их страницу на GitHub или меняйте настройки.",
|
"mod.intro": "Дополнительные возможности, встроенные в сервер. Включайте и выключайте нужные, открывайте их страницу на GitHub или меняйте настройки.",
|
||||||
"mod.restart": "Изменения применятся после перезапуска игрового сервера.",
|
"mod.restart": "Изменения применятся после перезапуска игрового сервера.",
|
||||||
|
|||||||
+29
-1
@@ -1,5 +1,20 @@
|
|||||||
/** Simplified Chinese localization (zh-CN) */
|
/** Simplified Chinese localization (zh-CN) */
|
||||||
const zh = {
|
const zh = {
|
||||||
|
"remote.clientReady": "客户端已就绪。保存服主地址,然后点击开始游戏。",
|
||||||
|
"remote.clientIntro": "选择已有游戏客户端,或在此下载。无需安装本地服务器。",
|
||||||
|
"welcome.host.title": "我要搭建服务器",
|
||||||
|
"welcome.host.text": "安装新服务器或管理已有服务器。",
|
||||||
|
"welcome.connect.title": "连接其他服务器",
|
||||||
|
"welcome.connect.text": "下载或更新游戏客户端,在朋友的服务器上游玩。",
|
||||||
|
"remote.intro": "设置游戏客户端,服务器由朋友运行。",
|
||||||
|
"remote.address": "服务器地址",
|
||||||
|
"remote.addressHint": "在局域网中游玩时,请向服主询问其电脑的局域网 IP 地址。",
|
||||||
|
"remote.save": "保存地址",
|
||||||
|
"remote.saved": "服务器地址已保存。",
|
||||||
|
"remote.accountHint": "请服主为你创建游戏账号。",
|
||||||
|
"remote.hostInstead": "搭建自己的服务器",
|
||||||
|
"welcome.roleSubtitle": "你想如何游玩?",
|
||||||
|
|
||||||
"realm.profileLabel": "服务器",
|
"realm.profileLabel": "服务器",
|
||||||
"realm.switching": "正在切换服务器…",
|
"realm.switching": "正在切换服务器…",
|
||||||
"realm.create": "创建 Wildcard 服务器",
|
"realm.create": "创建 Wildcard 服务器",
|
||||||
@@ -70,6 +85,8 @@ const zh = {
|
|||||||
"btn.stop": "停止服务器",
|
"btn.stop": "停止服务器",
|
||||||
"btn.stopSmall": "停止",
|
"btn.stopSmall": "停止",
|
||||||
"btn.restart": "重启",
|
"btn.restart": "重启",
|
||||||
|
"btn.startWithoutUpdate": "不更新启动服务器",
|
||||||
|
"btn.playWithoutUpdate": "不更新开始游戏",
|
||||||
"btn.play": "开始游戏",
|
"btn.play": "开始游戏",
|
||||||
"btn.startPlay": "启动并开始游戏",
|
"btn.startPlay": "启动并开始游戏",
|
||||||
"btn.startingCaps": "正在启动…",
|
"btn.startingCaps": "正在启动…",
|
||||||
@@ -358,10 +375,11 @@ const zh = {
|
|||||||
"upd.confirmBack": "是否回滚至上一个版本?你的角色与账号数据不会受到影响。",
|
"upd.confirmBack": "是否回滚至上一个版本?你的角色与账号数据不会受到影响。",
|
||||||
"upd.wentBack": "已回滚至上一个版本。你的个人数据完好无损。",
|
"upd.wentBack": "已回滚至上一个版本。你的个人数据完好无损。",
|
||||||
"upd.dialogTitle": "选择更新包文件夹",
|
"upd.dialogTitle": "选择更新包文件夹",
|
||||||
|
"upd.retryValidation": "重试启动服务器",
|
||||||
"upd.pendingBad": "更新后的服务器未能正常启动",
|
"upd.pendingBad": "更新后的服务器未能正常启动",
|
||||||
"upd.pendingUnfinished": "先前的更新尚未完成",
|
"upd.pendingUnfinished": "先前的更新尚未完成",
|
||||||
"upd.safeBack": "你可以安全回滚至先前的稳定版本。",
|
"upd.safeBack": "你可以安全回滚至先前的稳定版本。",
|
||||||
"upd.backNote": "回滚操作将恢复程序文件与配置文件。角色和账号数据绝不会被自动回滚。",
|
"upd.backNote": "回滚将恢复文件和设置。如果数据库更新已开始,所有数据库也将从更新前的备份恢复。之后的进度将丢失。",
|
||||||
"upd.goBackTo": "回滚至版本 {v}",
|
"upd.goBackTo": "回滚至版本 {v}",
|
||||||
"upd.goBackBefore": "回滚至更新前的版本",
|
"upd.goBackBefore": "回滚至更新前的版本",
|
||||||
"upd.title": "服务器更新",
|
"upd.title": "服务器更新",
|
||||||
@@ -724,6 +742,16 @@ const zh = {
|
|||||||
"realm.confirmDelete": "是否删除 realmlist 配置“{name}”?游戏客户端将继续保留其当前的文件内容。",
|
"realm.confirmDelete": "是否删除 realmlist 配置“{name}”?游戏客户端将继续保留其当前的文件内容。",
|
||||||
"nav.modules": "扩展模块",
|
"nav.modules": "扩展模块",
|
||||||
"q.modules": "服务器支持哪些扩展模块?",
|
"q.modules": "服务器支持哪些扩展模块?",
|
||||||
|
"mod.ahbot.types": "出售物品类型",
|
||||||
|
"mod.ahbot.typesHint": "选择新拍卖的物品类型,已有拍卖不受影响。启用会恢复本次会话的权重或默认值。",
|
||||||
|
"mod.ahbot.qualityWeights": "品质与频率",
|
||||||
|
"mod.ahbot.weightsHint": "相对权重而非百分比。0排除该品质,数值越大越常见。如果默认值全为0,启用时选择普通品质。其他筛选仍生效。",
|
||||||
|
"mod.ahbot.noTypes": "所有类型均已关闭,卖家没有可供新拍卖选择的类型。",
|
||||||
|
"mod.noSettings": "没有其他设置,请使用上方模块开关。",
|
||||||
|
"err.bot_modules_conflict.title": "已启用两个机器人模块",
|
||||||
|
"err.bot_modules_conflict.message": "启动服务器前,请在模块中关闭CoA Companions或SQUID Playerbots。",
|
||||||
|
"mod.ahbot.setup": "填写独立拍卖角色的GUID,并启用卖家和模块。角色必须离线。CoA筛选使用掉落、商人和专业物品表,等级限制另行生效。需要包含CoA拍卖筛选的服务器版本。",
|
||||||
|
"mod.ahbot.allSettings": "所有拍卖设置",
|
||||||
"mod.title": "模块管理",
|
"mod.title": "模块管理",
|
||||||
"mod.intro": "服务器内置的可选扩展特性。可按需开关、访问其 GitHub 页面或调整独立参数。",
|
"mod.intro": "服务器内置的可选扩展特性。可按需开关、访问其 GitHub 页面或调整独立参数。",
|
||||||
"mod.restart": "更改将在世界服务器重启后生效。",
|
"mod.restart": "更改将在世界服务器重启后生效。",
|
||||||
|
|||||||
@@ -1,5 +1,8 @@
|
|||||||
import { invoke } from "@tauri-apps/api/core";
|
import { invoke } from "@tauri-apps/api/core";
|
||||||
|
|
||||||
|
export const REMOTE_CLIENT_ID = "@remote-client";
|
||||||
|
export interface RemoteConnection { host: string; client_path: string | null }
|
||||||
|
|
||||||
export type Classification = "healthy" | "partial" | "unknown-custom" | "incompatible";
|
export type Classification = "healthy" | "partial" | "unknown-custom" | "incompatible";
|
||||||
export type ItemStatus = "found" | "missing" | "attention";
|
export type ItemStatus = "found" | "missing" | "attention";
|
||||||
|
|
||||||
@@ -194,6 +197,7 @@ export interface ModuleView {
|
|||||||
repo: string;
|
repo: string;
|
||||||
/** the module is part of this server build (its configuration exists) */
|
/** the module is part of this server build (its configuration exists) */
|
||||||
installed: boolean;
|
installed: boolean;
|
||||||
|
has_settings: boolean;
|
||||||
enabled: boolean;
|
enabled: boolean;
|
||||||
/** can be turned on and off (a part the game client needs is only configured) */
|
/** can be turned on and off (a part the game client needs is only configured) */
|
||||||
switchable: boolean;
|
switchable: boolean;
|
||||||
@@ -273,6 +277,7 @@ export interface UpdateTxn {
|
|||||||
from_version: string | null;
|
from_version: string | null;
|
||||||
to_version: string;
|
to_version: string;
|
||||||
recovery_point: string | null;
|
recovery_point: string | null;
|
||||||
|
databases_started: boolean;
|
||||||
message: string | null;
|
message: string | null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -374,6 +379,8 @@ export interface ConsoleLine {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export const api = {
|
export const api = {
|
||||||
|
remoteConnection: () => invoke<RemoteConnection>("remote_connection"),
|
||||||
|
remoteConnect: (host: string) => invoke<RemoteConnection>("remote_connect", { host }),
|
||||||
realmProfiles: (id: string) => invoke<RealmProfiles>("realm_profiles", { id }),
|
realmProfiles: (id: string) => invoke<RealmProfiles>("realm_profiles", { id }),
|
||||||
realmSelect: (id: string, mode: RealmMode, restart: boolean) => invoke<RealmProfiles>("realm_select", { id, mode, restart }),
|
realmSelect: (id: string, mode: RealmMode, restart: boolean) => invoke<RealmProfiles>("realm_select", { id, mode, restart }),
|
||||||
realmSimultaneous: (id: string, enabled: boolean) => invoke<RealmProfiles>("realm_simultaneous", { id, enabled }),
|
realmSimultaneous: (id: string, enabled: boolean) => invoke<RealmProfiles>("realm_simultaneous", { id, enabled }),
|
||||||
@@ -423,6 +430,7 @@ export const api = {
|
|||||||
applyUpdate: (id: string, resolutions: Record<string, "keep" | "replace">, source?: string) =>
|
applyUpdate: (id: string, resolutions: Record<string, "keep" | "replace">, source?: string) =>
|
||||||
invoke<{ txn: UpdateTxn }>("apply_update", { id, source: source ?? null, resolutions }),
|
invoke<{ txn: UpdateTxn }>("apply_update", { id, source: source ?? null, resolutions }),
|
||||||
rollbackUpdate: (id: string, txn: string) => invoke<UpdateTxn>("rollback_update", { id, txn }),
|
rollbackUpdate: (id: string, txn: string) => invoke<UpdateTxn>("rollback_update", { id, txn }),
|
||||||
|
retryUpdateValidation: (id: string, txn: string) => invoke<UpdateTxn>("retry_update_validation", { id, txn }),
|
||||||
population: (id: string) => invoke<Population | null>("get_population", { id }),
|
population: (id: string) => invoke<Population | null>("get_population", { id }),
|
||||||
stopSpawning: (id: string) => invoke<{ count: number }>("companions_stop_spawning", { id }),
|
stopSpawning: (id: string) => invoke<{ count: number }>("companions_stop_spawning", { id }),
|
||||||
takeOffline: (id: string) => invoke<{ count: number }>("companions_take_offline", { id }),
|
takeOffline: (id: string) => invoke<{ count: number }>("companions_take_offline", { id }),
|
||||||
|
|||||||
@@ -0,0 +1,190 @@
|
|||||||
|
import bots from "../../schemas/bots.json";
|
||||||
|
import server from "../../schemas/server.json";
|
||||||
|
import catalog from "../../modules/catalog.json";
|
||||||
|
import type { Locale } from "@/i18n";
|
||||||
|
import type { ModuleSetting } from "@/lib/api";
|
||||||
|
|
||||||
|
export interface ModuleField {
|
||||||
|
title: string; description: string; type: string; category: string; advanced: boolean;
|
||||||
|
min?: number; max?: number; step?: number;
|
||||||
|
options?: { value: string | number | boolean; label: string }[];
|
||||||
|
}
|
||||||
|
const locales: Locale[] = ["en", "ru", "de", "fr", "es", "zh"];
|
||||||
|
const text = (values: string[], locale: Locale) => values[locales.indexOf(locale)] ?? values[0];
|
||||||
|
type Entry = { key: string; type: string; title: string[]; description: string[]; min?: number; max?: number; advanced?: boolean; options?: { value: string; label: string[] }[] };
|
||||||
|
export const moduleSettingDefinitions: Entry[] = [];
|
||||||
|
const fields = moduleSettingDefinitions;
|
||||||
|
function add(key: string, type: string, title: string[], description: string[], extra: Partial<Entry> = {}) {
|
||||||
|
fields.push({ key, type, title, description, ...extra });
|
||||||
|
}
|
||||||
|
add("AiPlayerbot.RandomBotAutologin", "bool", ["Populate the world automatically", "Автоматически населять мир", "Welt automatisch bevölkern", "Peupler automatiquement le monde", "Poblar el mundo automáticamente", "自动填充世界"], ["Log random bots into the world when the server starts.", "Вводит случайных ботов в мир при запуске сервера.", "Meldet Zufallsbots beim Serverstart in der Welt an.", "Connecte les bots aléatoires au démarrage du serveur.", "Conecta bots aleatorios al iniciar el servidor.", "服务器启动时让随机机器人登录世界。"]);
|
||||||
|
add("AiPlayerbot.MinRandomBots", "int", ["Minimum online bots", "Минимум ботов онлайн", "Mindestens aktive Bots", "Minimum de bots connectés", "Mínimo de bots conectados", "最少在线机器人"], ["Lower limit of the automatically selected online population. Must not exceed the maximum.", "Нижний предел автоматически выбираемого числа ботов онлайн. Не должен превышать максимум.", "Untergrenze der automatisch gewählten Bot-Zahl. Darf das Maximum nicht überschreiten.", "Limite basse du nombre de bots connectés. Ne doit pas dépasser le maximum.", "Límite inferior de bots conectados. No debe superar el máximo.", "自动选择的在线机器人数量下限,不得超过上限。"], { min: 0 });
|
||||||
|
add("AiPlayerbot.MaxRandomBots", "int", ["Maximum online bots", "Максимум ботов онлайн", "Maximal aktive Bots", "Maximum de bots connectés", "Máximo de bots conectados", "最多在线机器人"], ["Upper limit of the random bot population; more bots use more server resources.", "Верхний предел числа случайных ботов онлайн. Больше ботов — выше нагрузка на сервер.", "Obergrenze der Zufallsbots; mehr Bots benötigen mehr Serverressourcen.", "Limite haute des bots aléatoires ; plus de bots utilisent plus de ressources.", "Límite superior de bots aleatorios; más bots requieren más recursos del servidor.", "随机机器人在线数量上限,数量越多越占用服务器资源。"], { min: 0 });
|
||||||
|
add("AiPlayerbot.RandomBotAccountCount", "int", ["Random bot accounts", "Аккаунтов случайных ботов", "Zufallsbot-Konten", "Comptes de bots aléatoires", "Cuentas de bots aleatorios", "随机机器人账号数量"], ["0 calculates the required accounts automatically. Each account contains multiple bots.", "0 — рассчитывать нужное число аккаунтов автоматически. Один аккаунт содержит несколько ботов.", "0 berechnet die benötigten Konten automatisch. Ein Konto enthält mehrere Bots.", "0 calcule automatiquement les comptes nécessaires. Chaque compte contient plusieurs bots.", "0 calcula automáticamente las cuentas necesarias. Cada cuenta contiene varios bots.", "0自动计算所需账号,每个账号包含多个机器人。"], { min: 0 });
|
||||||
|
add("AiPlayerbot.RandomBotMinLevel", "int", ["Minimum bot level", "Минимальный уровень ботов", "Minimale Bot-Stufe", "Niveau minimum des bots", "Nivel mínimo de bots", "最低机器人等级"], ["Lowest level used when generating random bots.", "Нижний уровень при создании случайных ботов.", "Niedrigste Stufe beim Erstellen von Zufallsbots.", "Niveau le plus bas lors de la génération des bots.", "Nivel más bajo al generar bots aleatorios.", "生成随机机器人时的最低等级。"], { min: 0, max: 80 });
|
||||||
|
add("AiPlayerbot.RandomBotMaxLevel", "int", ["Maximum bot level", "Максимальный уровень ботов", "Maximale Bot-Stufe", "Niveau maximum des bots", "Nivel máximo de bots", "最高机器人等级"], ["Highest level used when generating random bots. Keep within the server level cap.", "Верхний уровень при создании случайных ботов. Не превышайте максимальный уровень сервера.", "Höchste Stufe beim Erstellen von Zufallsbots. Server-Stufenlimit beachten.", "Niveau le plus haut lors de la génération. Respectez la limite du serveur.", "Nivel máximo al generar bots. Respeta el límite del servidor.", "生成机器人的最高等级,不应超过服务器等级上限。"], { min: 0, max: 80 });
|
||||||
|
add("AiPlayerbot.SyncLevelWithPlayers", "bool", ["Match player levels", "Подстраивать уровень под игроков", "Spielerstufen anpassen", "Adapter aux niveaux des joueurs", "Ajustar al nivel de jugadores", "匹配玩家等级"], ["Adjust random bot levels to the levels of real players.", "Подстраивает уровни случайных ботов под уровни настоящих игроков.", "Passt Zufallsbot-Stufen an echte Spieler an.", "Adapte le niveau des bots aux joueurs réels.", "Ajusta los niveles de bots a jugadores reales.", "根据真实玩家调整随机机器人等级。"]);
|
||||||
|
add("AiPlayerbot.RandomBotInvitePlayer", "bool", ["Bots invite players", "Боты приглашают игроков", "Bots laden Spieler ein", "Les bots invitent les joueurs", "Los bots invitan jugadores", "机器人邀请玩家"], ["Allow random bots to invite nearby players into groups.", "Разрешает случайным ботам приглашать игроков поблизости в группу.", "Zufallsbots dürfen nahe Spieler in Gruppen einladen.", "Permet aux bots d’inviter les joueurs proches dans un groupe.", "Permite a bots invitar a jugadores cercanos a grupos.", "允许随机机器人邀请附近玩家组队。"]);
|
||||||
|
add("AiPlayerbot.RandomBotJoinLfg", "bool", ["Join dungeon finder", "Участвовать в поиске подземелий", "Dungeonsuche nutzen", "Participer à la recherche de donjon", "Participar en buscador de mazmorras", "加入地下城查找器"], ["Allow random bots to participate in dungeon matchmaking.", "Разрешает случайным ботам участвовать в подборе группы для подземелий.", "Zufallsbots dürfen an der Dungeonsuche teilnehmen.", "Autorise les bots à participer à la recherche de donjon.", "Permite a bots participar en el buscador de mazmorras.", "允许随机机器人参与地下城匹配。"]);
|
||||||
|
add("AiPlayerbot.RandomBotJoinBG", "bool", ["Join battlegrounds", "Участвовать в полях боя", "Schlachtfeldern beitreten", "Rejoindre les champs de bataille", "Unirse a campos de batalla", "加入战场"], ["Allow random bots to enter battlegrounds.", "Разрешает случайным ботам входить на поля боя.", "Zufallsbots dürfen Schlachtfelder betreten.", "Autorise les bots à entrer sur les champs de bataille.", "Permite a bots entrar en campos de batalla.", "允许随机机器人进入战场。"]);
|
||||||
|
add("AiPlayerbot.RandomBotAutoJoinBG", "bool", ["Queue for battlegrounds automatically", "Автоматически вставать в очередь на поля боя", "Automatisch für Schlachtfelder anmelden", "Inscription automatique aux champs de bataille", "Cola automática para campos de batalla", "自动排队战场"], ["Queue random bots without waiting for a player to queue first.", "Ставит ботов в очередь, не дожидаясь первого игрока.", "Meldet Bots an, ohne auf die Anmeldung eines Spielers zu warten.", "Inscrit les bots sans attendre un premier joueur.", "Pone bots en cola sin esperar a un jugador.", "无需等待玩家先排队,即可让机器人排队。"]);
|
||||||
|
add("AiPlayerbot.RandomBotTalk", "bool", ["Bot chat", "Сообщения ботов", "Bot-Chat", "Discussion des bots", "Chat de bots", "机器人聊天"], ["Allow random bots to send chat messages.", "Разрешает случайным ботам отправлять сообщения в чат.", "Zufallsbots dürfen Chatnachrichten senden.", "Autorise les messages des bots dans le chat.", "Permite mensajes de bots en el chat.", "允许随机机器人发送聊天消息。"]);
|
||||||
|
add("AiPlayerbot.RandomBotEmote", "bool", ["Bot emotes", "Эмоции ботов", "Bot-Emotes", "Émotes des bots", "Gestos de bots", "机器人表情"], ["Allow random bots to perform emotes.", "Разрешает случайным ботам использовать эмоции.", "Zufallsbots dürfen Emotes verwenden.", "Autorise les émotes des bots.", "Permite a bots usar gestos.", "允许随机机器人使用表情动作。"]);
|
||||||
|
add("AiPlayerbot.RandomBotSuggestDungeons", "bool", ["Suggest dungeons", "Предлагать подземелья", "Dungeons vorschlagen", "Suggérer des donjons", "Sugerir mazmorras", "建议地下城"], ["Allow bots to suggest dungeons to players in chat.", "Разрешает ботам предлагать игрокам подземелья в чате.", "Bots dürfen Spielern im Chat Dungeons vorschlagen.", "Autorise les suggestions de donjons dans le chat.", "Permite sugerir mazmorras a jugadores en el chat.", "允许机器人在聊天中向玩家建议地下城。"]);
|
||||||
|
add("AiPlayerbot.CoaClassesOnly", "bool", ["Only CoA classes", "Только классы CoA", "Nur CoA-Klassen", "Classes CoA uniquement", "Solo clases CoA", "仅CoA职业"], ["Use Conquest of Azeroth classes for generated bots.", "Использует классы Conquest of Azeroth для создаваемых ботов.", "Nutzt CoA-Klassen für erstellte Bots.", "Utilise les classes CoA pour les bots générés.", "Usa clases CoA para bots generados.", "生成机器人时使用CoA职业。"]);
|
||||||
|
add("AiPlayerbot.CoaSmartHeal", "bool", ["Smart healing", "Умное лечение", "Intelligente Heilung", "Soins intelligents", "Sanación inteligente", "智能治疗"], ["Use CoA healing priorities to choose targets and spells.", "Использует приоритеты лечения CoA для выбора целей и заклинаний.", "Nutzt CoA-Heilprioritäten für Ziele und Zauber.", "Utilise les priorités de soins CoA pour les cibles et sorts.", "Usa prioridades de sanación CoA para objetivos y hechizos.", "根据CoA治疗优先级选择目标和法术。"]);
|
||||||
|
add("AiPlayerbot.CoaSmartTank", "bool", ["Smart tanking", "Умное танкование", "Intelligentes Tanken", "Tank intelligent", "Tanque inteligente", "智能坦克"], ["Use CoA tank priorities for threat and survival.", "Использует приоритеты танков CoA для угрозы и выживания.", "Nutzt CoA-Tankprioritäten für Bedrohung und Überleben.", "Utilise les priorités de tank CoA pour menace et survie.", "Usa prioridades de tanque CoA para amenaza y supervivencia.", "使用CoA坦克优先级控制仇恨和生存。"]);
|
||||||
|
add("AiPlayerbot.CoaSpecRotations", "bool", ["CoA specialization rotations", "Ротации специализаций CoA", "CoA-Spezialisierungsrotationen", "Rotations des spécialisations CoA", "Rotaciones de especialización CoA", "CoA专精循环"], ["Use authored specialization rotations alongside automatic spell selection.", "Использует готовые ротации специализаций вместе с автоматическим выбором заклинаний.", "Nutzt Spezialisierungsrotationen neben automatischer Zauberauswahl.", "Utilise les rotations de spécialisation avec la sélection automatique des sorts.", "Usa rotaciones de especialización junto a selección automática de hechizos.", "在自动选法术的基础上使用专精循环。"]);
|
||||||
|
add("AiPlayerbot.CoaInterruptCoordination", "bool", ["Coordinate interrupts", "Согласовывать прерывания", "Unterbrechungen koordinieren", "Coordonner les interruptions", "Coordinar interrupciones", "协调打断"], ["Coordinate bot interrupts so several bots do not interrupt the same cast.", "Согласовывает прерывания ботов, чтобы несколько ботов не тратили их на одно заклинание.", "Koordiniert Unterbrechungen, damit Bots nicht denselben Zauber unterbrechen.", "Coordonne les interruptions pour éviter de viser tous le même sort.", "Coordina interrupciones para evitar gastar varias en el mismo lanzamiento.", "协调打断,避免多个机器人同时打断同一个施法。"]);
|
||||||
|
add("AiPlayerbot.MaxAddedBots", "int", ["Bots controlled by one player", "Ботов под управлением игрока", "Bots pro Spieler", "Bots contrôlés par joueur", "Bots controlados por jugador", "每位玩家控制的机器人"], ["Maximum number of bots a player can control at once.", "Максимум ботов, которыми игрок может управлять одновременно.", "Maximale gleichzeitig steuerbare Bots pro Spieler.", "Nombre maximal de bots contrôlés simultanément par joueur.", "Máximo de bots controlados a la vez por jugador.", "玩家同时控制的机器人数量上限。"], { min: 0 });
|
||||||
|
add("AiPlayerbot.BotAutologin", "bool", ["Log in player alts automatically", "Автоматически вводить альтов игрока", "Spieler-Alts automatisch anmelden", "Connecter automatiquement les personnages secondaires", "Conectar personajes alternativos automáticamente", "自动登录玩家小号"], ["Log in other characters on the player’s account as bots when the player logs in.", "При входе игрока вводит других персонажей его аккаунта как ботов.", "Meldet andere Charaktere des Spielerkontos beim Login als Bots an.", "Connecte les autres personnages du compte comme bots à la connexion.", "Conecta otros personajes de la cuenta como bots al entrar el jugador.", "玩家登录时,将同账号其他角色作为机器人登录。"]);
|
||||||
|
add("AiPlayerbot.DisabledWithoutRealPlayer", "bool", ["Only populate while players are online", "Вводить ботов только при наличии игроков", "Bots nur bei aktiven Spielern", "Bots seulement avec des joueurs connectés", "Bots solo con jugadores conectados", "仅有玩家在线时填充机器人"], ["Log random bots out when no real players remain online.", "Выводит случайных ботов, когда на сервере нет настоящих игроков.", "Meldet Zufallsbots ab, wenn keine echten Spieler online sind.", "Déconnecte les bots quand aucun joueur réel ne reste connecté.", "Desconecta bots cuando no quedan jugadores reales.", "没有真实玩家在线时退出随机机器人。"]);
|
||||||
|
add("AiPlayerbot.AddClassCommand", "bool", ["Players can create bots by class", "Игроки могут создавать ботов по классу", "Spieler können Klassenbots erstellen", "Les joueurs peuvent créer des bots par classe", "Jugadores pueden crear bots por clase", "玩家可按职业创建机器人"], ["Allow the addclass command for players; disabled restricts it to game masters.", "Разрешает игрокам команду addclass. При выключении она доступна только ГМ.", "Erlaubt addclass für Spieler; deaktiviert nur für Spielleiter.", "Autorise addclass aux joueurs ; sinon réservé aux maîtres de jeu.", "Permite addclass a jugadores; desactivado solo para maestros de juego.", "允许玩家使用addclass命令,关闭后仅GM可用。"]);
|
||||||
|
add("AiPlayerbot.KeepAltsInGroup", "bool", ["Keep alts in the group", "Оставлять альтов в группе", "Alts in der Gruppe behalten", "Garder les personnages secondaires en groupe", "Mantener personajes alternativos en el grupo", "保留小号在队伍中"], ["Keep alt bots in the group after their owner leaves.", "Оставляет альтов-ботов в группе после выхода владельца.", "Behält Alt-Bots in der Gruppe, wenn ihr Besitzer geht.", "Garde les bots secondaires après le départ du propriétaire.", "Mantiene bots alternativos cuando sale su dueño.", "主人离队后,让小号机器人留在队伍中。"]);
|
||||||
|
add("AiPlayerbot.CoaRecruitSameFaction", "bool", ["Recruit bots of your faction", "Нанимать ботов своей фракции", "Bots der eigenen Fraktion anwerben", "Recruter les bots de votre faction", "Reclutar bots de tu facción", "招募同阵营机器人"], ["Restrict CoA role recruitment to the player’s faction.", "Ограничивает найм по роли CoA фракцией игрока.", "Beschränkt die CoA-Rollenanwerbung auf die Spielerfraktion.", "Limite le recrutement CoA à la faction du joueur.", "Limita el reclutamiento CoA a la facción del jugador.", "将CoA按职责招募限制为玩家同阵营。"]);
|
||||||
|
add("AiPlayerbot.CoaLfgBots", "bool", ["CoA bots fill dungeon groups", "Боты CoA заполняют группы подземелий", "CoA-Bots füllen Dungeongruppen", "Les bots CoA complètent les groupes de donjon", "Bots CoA completan grupos de mazmorras", "CoA机器人补齐地下城队伍"], ["Allow CoA bots to fill missing roles in dungeon finder groups.", "Разрешает ботам CoA занимать недостающие роли в группах поиска подземелий.", "Erlaubt CoA-Bots fehlende Rollen in Dungeonsuche-Gruppen zu füllen.", "Autorise les bots CoA à compléter les rôles manquants.", "Permite a bots CoA cubrir roles faltantes en grupos del buscador.", "允许CoA机器人补齐地下城查找器队伍的缺失职责。"]);
|
||||||
|
add("AiPlayerbot.RandomBotXPRate", "float", ["Bot experience multiplier", "Множитель опыта ботов", "Bot-Erfahrungsmultiplikator", "Multiplicateur d’expérience des bots", "Multiplicador de experiencia de bots", "机器人经验倍率"], ["1 uses the normal experience rate for random bots.", "1 — обычная скорость получения опыта случайными ботами.", "1 nutzt die normale Erfahrungsrate für Zufallsbots.", "1 conserve le gain d’expérience normal des bots aléatoires.", "1 usa la experiencia normal de bots aleatorios.", "1使用随机机器人的正常经验获取倍率。"], { min: 0 });
|
||||||
|
add("AiPlayerbot.FollowDistance", "float", ["Follow distance", "Дистанция следования", "Folgeabstand", "Distance de suivi", "Distancia de seguimiento", "跟随距离"], ["Distance bots maintain while following their owner.", "Расстояние до владельца при следовании.", "Abstand zum Besitzer beim Folgen.", "Distance maintenue en suivant le propriétaire.", "Distancia mantenida al seguir al dueño.", "跟随主人时保持的距离。"], { min: 0 });
|
||||||
|
const scaling = "CoAContentScaling.";
|
||||||
|
add(scaling + "LFG.AllowPartialGroups", "bool", ["Enter with the current party", "Входить текущим составом", "Mit aktueller Gruppe betreten", "Entrer avec le groupe actuel", "Entrar con el grupo actual", "以当前队伍进入"], ["Enter Dungeon Finder with 1–5 players without waiting for a full party. Requires group scaling. BotFill keeps filling empty slots.", "Вход через ЛФГ составом 1–5 игроков без ожидания полной группы. Требует скейлинга группы. BotFill продолжает заполнять свободные места.", "Dungeonbrowser mit 1–5 Spielern ohne volle Gruppe. Erfordert Gruppenanpassung. BotFill füllt freie Plätze.", "Entrée avec 1 à 5 joueurs sans attendre un groupe complet. Nécessite l’adaptation au groupe. BotFill remplit les places libres.", "Entrar con 1–5 jugadores sin esperar un grupo completo. Requiere ajuste al grupo. BotFill llena los huecos.", "以1至5名玩家进入,无需等待满员。需要队伍缩放。BotFill仍会填补空位。"]);
|
||||||
|
add(scaling + "World.Leech.Enable", "bool", ["Open-world life steal", "Отхил от урона в открытом мире", "Lebensraub in der offenen Welt", "Vol de vie en monde ouvert", "Robo de vida en mundo abierto", "开放世界吸血"], ["Heal from your damage to open-world creatures. Excludes players, their pets and instances. Requires the module; group scaling and solo assistance are optional.", "Восстанавливает здоровье от вашего урона существам открытого мира. Исключает игроков, их питомцев и инстансы. Требует включения модуля; скейлинг группы и соло-помощь необязательны.", "Heilt durch eigenen Schaden an Weltkreaturen. Ohne Spieler, deren Begleiter und Instanzen. Erfordert das Modul; Gruppenanpassung und Solohilfe sind optional.", "Soigne grâce aux dégâts aux créatures du monde ouvert. Exclut joueurs, familiers et instances. Nécessite le module ; adaptation au groupe et aide solo facultatives.", "Cura con tu daño a criaturas del mundo abierto. Excluye jugadores, mascotas e instancias. Requiere el módulo; ajuste al grupo y ayuda individual opcionales.", "对开放世界生物造成伤害时恢复生命。不适用于玩家、玩家宠物和副本。需要启用模块,队伍缩放和单人辅助可选。"]);
|
||||||
|
add(scaling + "World.Leech.Percent", "float", ["Life steal (%)", "Отхил от нанесённого урона (%)", "Lebensraub (%)", "Vol de vie (%)", "Robo de vida (%)", "吸血比例(%)"], ["Percentage of damage returned as health: 0–100. 10 means 10%. Requires open-world life steal. Overkill gives no extra healing.", "Процент урона, возвращаемый здоровьем: 0–100. Значение 10 означает 10%. Требует включения отхила в открытом мире. Избыточный урон при добивании не увеличивает отхил.", "Schadensanteil als Heilung: 0–100. 10 bedeutet 10%. Erfordert Welt-Lebensraub. Überzähliger Schaden heilt nicht zusätzlich.", "Pourcentage des dégâts rendu en vie : 0–100. 10 signifie 10%. Nécessite le vol de vie. Les dégâts excédentaires ne soignent pas davantage.", "Porcentaje del daño recuperado como salud: 0–100. 10 significa 10%. Requiere robo de vida. El daño excedente no aporta curación adicional.", "将伤害的0至100%转化为生命。10表示10%。需要启用吸血。过量伤害不会额外治疗。"], { min: 0, max: 100 });
|
||||||
|
add(scaling + "Difficulty.DamageMultiplier", "range", ["Enemy damage", "Урон противников", "Gegnerschaden", "Dégâts ennemis", "Daño enemigo", "敌人伤害"], ["Dungeon and raid damage after group scaling and solo assistance. 100% keeps the normal balance; lower is easier. Applies to everyone on this server. Does not change health, loot or instant-kill mechanics.", "Урон в подземельях и рейдах после скейлинга группы и соло-помощи. 100% — обычный баланс, ниже — легче. Действует для всех игроков сервера. Не меняет здоровье, добычу и механики мгновенной смерти.", "Schaden in Dungeons und Schlachtzügen nach Gruppenanpassung und Solohilfe. 100% ist normal, weniger ist leichter. Gilt für alle Spieler. Ändert weder Gesundheit noch Beute oder Soforttötungen.", "Dégâts en donjon et raid après adaptation au groupe et aide solo. 100% conserve l’équilibrage normal ; moins est plus facile. Pour tous les joueurs. Ne change ni la vie, ni le butin, ni les morts instantanées.", "Daño en mazmorras y bandas tras el ajuste del grupo y la ayuda individual. 100% mantiene el equilibrio normal; menos es más fácil. Para todos los jugadores. No cambia salud, botín ni muerte instantánea.", "队伍缩放和单人辅助后的地下城与团队副本伤害。100%为正常,降低后更容易。对全服玩家生效,不改变生命值、掉落或即死机制。"], { min: 0.25, max: 2 });
|
||||||
|
add(scaling + "SoloAssist.Mode", "enum", ["Solo assistance", "Помощь в соло", "Solohilfe", "Aide solo", "Ayuda individual", "单人辅助"], ["Additional damage reduction when the scaling target is one player.", "Дополнительное снижение урона, когда расчёт сложности рассчитан на одного игрока.", "Zusätzliche Schadensreduktion bei einem Skalierungsziel von einem Spieler.", "Réduction supplémentaire quand la difficulté est calculée pour un joueur.", "Reducción adicional cuando la dificultad se calcula para un jugador.", "难度目标为一名玩家时额外减伤。"], { options: [
|
||||||
|
{ value: "None", label: ["None", "Без помощи", "Keine", "Aucune", "Ninguna", "无"] },
|
||||||
|
{ value: "Light", label: ["Light (−15%)", "Лёгкая (−15%)", "Leicht (−15%)", "Légère (−15%)", "Ligera (−15%)", "轻度(−15%)"] },
|
||||||
|
{ value: "Full", label: ["Full (−30%)", "Полная (−30%)", "Voll (−30%)", "Complète (−30%)", "Completa (−30%)", "完整(−30%)"] },
|
||||||
|
] });
|
||||||
|
add(scaling + "GroupScaling.Enable", "bool", ["Scale to group size", "Подстраивать под размер группы", "An Gruppengröße anpassen", "Adapter à la taille du groupe", "Ajustar al tamaño del grupo", "按队伍人数缩放"], ["Adjust enemy health and damage to the party size. Required for damage difficulty and solo assistance.", "Подстраивает здоровье и урон врагов под группу. Необходимо для регулировки урона и соло-помощи.", "Passt Gesundheit und Schaden an die Gruppe an. Für Schadensregler und Solohilfe erforderlich.", "Adapte la vie et les dégâts au groupe. Requis pour le réglage des dégâts et l’aide solo.", "Ajusta salud y daño al grupo. Necesario para el control de daño y la ayuda individual.", "按队伍人数调整敌人生命和伤害。伤害调节和单人辅助需要启用此项。"]);
|
||||||
|
add(scaling + "GroupScaling.AllowSoloRaids", "bool", ["Enter raids solo", "Входить в рейды одному", "Schlachtzüge solo betreten", "Entrer seul en raid", "Entrar solo en bandas", "单人进入团队副本"], ["Allow raid entry without a raid group.", "Разрешает вход без рейдовой группы.", "Erlaubt den Eintritt ohne Schlachtzugsgruppe.", "Autorise l’entrée sans groupe de raid.", "Permite entrar sin grupo de banda.", "允许无需团队即可进入团队副本。"]);
|
||||||
|
add(scaling + "AdaptiveMechanics.Enable", "bool", ["Adapt encounter mechanics", "Адаптировать механики боёв", "Kampfmechaniken anpassen", "Adapter les mécaniques", "Adaptar mecánicas", "调整战斗机制"], ["Adapt supported encounters for smaller groups.", "Адаптирует поддерживаемые бои для малых групп.", "Passt unterstützte Kämpfe für kleine Gruppen an.", "Adapte les combats pris en charge aux petits groupes.", "Adapta los encuentros compatibles a grupos pequeños.", "为小队调整受支持的战斗。"]);
|
||||||
|
add(scaling + "Rewards.ScaleLootCount", "bool", ["Scale loot quantity", "Подстраивать количество добычи", "Beutemenge anpassen", "Adapter la quantité de butin", "Ajustar cantidad de botín", "缩放掉落数量"], ["Adjust drops to group size, keeping at least one drop.", "Подстраивает добычу под группу, сохраняя хотя бы один предмет.", "Passt Beute an die Gruppe an, mindestens ein Gegenstand bleibt.", "Adapte le butin au groupe, avec au moins un objet.", "Ajusta el botín al grupo, con al menos un objeto.", "按队伍人数调整掉落,至少保留一件。"]);
|
||||||
|
add(scaling + "ScaleItems", "bool", ["Scale equipment", "Масштабировать снаряжение", "Ausrüstung skalieren", "Adapter l’équipement", "Ajustar equipo", "缩放装备"], ["Adjust equipment stats to the selected progression level bands.", "Подстраивает характеристики снаряжения под уровни прогрессии.", "Passt Ausrüstungswerte an die Fortschrittsstufen an.", "Adapte les statistiques aux niveaux de progression.", "Ajusta estadísticas a los niveles de progresión.", "按所选进度等级范围调整装备属性。"]);
|
||||||
|
add(scaling + "LFG.DefaultMode", "enum", ["Dungeon Finder group", "Группа для поиска подземелий", "Dungeonbrowser-Gruppe", "Groupe de recherche de donjons", "Grupo del buscador", "地下城查找器组队"], ["Default queue mode. Players can override it with .lfgmode.", "Режим очереди по умолчанию. Игрок может изменить его командой .lfgmode.", "Standard-Warteschlange. Spieler können sie mit .lfgmode ändern.", "Mode de file par défaut. Modifiable avec .lfgmode.", "Cola predeterminada. Se puede cambiar con .lfgmode.", "默认排队模式,玩家可通过 .lfgmode 更改。"], { options: [
|
||||||
|
{ value: "Matchmaking", label: ["Find players", "Искать игроков", "Spieler suchen", "Chercher des joueurs", "Buscar jugadores", "寻找玩家"] },
|
||||||
|
{ value: "BotFill", label: ["Fill with bots", "Дополнить ботами", "Mit Bots auffüllen", "Compléter avec des bots", "Completar con bots", "机器人补位"] },
|
||||||
|
{ value: "CurrentParty", label: ["Current party / solo", "Текущая группа / соло", "Aktuelle Gruppe / solo", "Groupe actuel / solo", "Grupo actual / solo", "当前队伍 / 单人"] },
|
||||||
|
] });
|
||||||
|
add(scaling + "LFG.DefaultChallengeSize", "int", ["Challenge group size", "Размер группы для расчёта сложности", "Gruppengröße für die Schwierigkeit", "Taille du groupe pour la difficulté", "Tamaño del grupo para dificultad", "难度目标人数"], ["0 follows actual party size. 1–40 simulates that many players. Players can override with .lfgchallenge.", "0 — реальный размер группы. 1–40 — сложность как для указанного числа игроков. Игрок может изменить через .lfgchallenge.", "0 nutzt die tatsächliche Gruppe. 1–40 simuliert diese Spielerzahl. Mit .lfgchallenge änderbar.", "0 suit le groupe réel. 1–40 simule ce nombre de joueurs. Modifiable avec .lfgchallenge.", "0 usa el grupo real. 1–40 simula ese número de jugadores. Modificable con .lfgchallenge.", "0按实际人数,1–40模拟指定人数。玩家可通过 .lfgchallenge 更改。"], { min: 0, max: 40 });
|
||||||
|
add(scaling + "GroupScaling.LockOnEncounterStart", "bool", ["Lock scaling during combat", "Фиксировать скейлинг на время боя", "Skalierung im Kampf sperren", "Figer l’adaptation en combat", "Fijar ajuste durante combate", "战斗期间锁定缩放"], ["Joining or leaving during a boss fight does not change its scaling.", "Вход и выход игроков во время боя с боссом не меняют скейлинг.", "Beitreten oder Verlassen während eines Bosskampfs ändert die Skalierung nicht.", "Les arrivées et départs pendant un boss ne changent pas l’adaptation.", "Entrar o salir durante un jefe no cambia el ajuste.", "首领战期间玩家进出不会改变缩放。"], { advanced: true });
|
||||||
|
add(scaling + "Progression.Mode", "enum", ["Progression boundaries", "Границы прогрессии", "Fortschrittsgrenzen", "Limites de progression", "Límites de progresión", "进度边界"], ["Automatic boundaries follow the level cap and enabled expansions. Custom uses the levels below.", "Автоматические границы зависят от максимального уровня и включённых дополнений. Ручные используют уровни ниже.", "Automatisch folgt der Maximalstufe und Erweiterungen. Benutzerdefiniert nutzt die folgenden Stufen.", "Automatique suit le niveau maximal et les extensions. Manuel utilise les niveaux ci-dessous.", "Automático sigue el nivel máximo y las expansiones. Manual usa los niveles siguientes.", "自动边界按等级上限和启用的资料片计算,自定义使用以下等级。"], { advanced: true, options: [
|
||||||
|
{ value: "Auto", label: ["Automatic", "Автоматически", "Automatisch", "Automatique", "Automático", "自动"] },
|
||||||
|
{ value: "Custom", label: ["Custom", "Вручную", "Benutzerdefiniert", "Manuel", "Manual", "自定义"] },
|
||||||
|
] });
|
||||||
|
for (const era of ["Classic", "Tbc"]) add(scaling + `Progression.${era}End`, "int", [`${era} last level`, `Последний уровень ${era}`, `${era}-Endstufe`, `Dernier niveau ${era}`, `Último nivel ${era}`, `${era} 最高等级`], ["Used in custom progression. 0 chooses automatically.", "Для ручной прогрессии. 0 — автоматически.", "Für benutzerdefinierten Fortschritt. 0 wählt automatisch.", "Pour la progression manuelle. 0 choisit automatiquement.", "Para progresión manual. 0 elige automáticamente.", "用于自定义进度,0为自动。"], { min: 0, max: 80, advanced: true });
|
||||||
|
add(scaling + "Debug", "bool", ["Detailed scaling logs", "Подробные логи скейлинга", "Ausführliche Skalierungsprotokolle", "Journaux détaillés", "Registros detallados", "详细缩放日志"], ["Log scaling calculations for troubleshooting.", "Записывает расчёты скейлинга для диагностики.", "Protokolliert Berechnungen zur Fehleranalyse.", "Enregistre les calculs pour le diagnostic.", "Registra cálculos para diagnóstico.", "记录缩放计算以排查问题。"], { advanced: true });
|
||||||
|
|
||||||
|
const enchantDescription = ["Tell players about the enchanter NPC when they log in.", "Сообщает игрокам о НПС-зачарователе при входе в игру.", "Informiert Spieler beim Einloggen über den Verzauberer-NPC.", "Informe les joueurs du PNJ enchanteur à la connexion.", "Informa a los jugadores del PNJ encantador al iniciar sesión.", "玩家登录时提示附魔NPC。"];
|
||||||
|
add("Enchanter.CostCopper", "int", ["Price per enchantment (copper)", "Цена зачарования (медь)", "Preis pro Verzauberung (Kupfer)", "Prix par enchantement (cuivre)", "Precio por encantamiento (cobre)", "每次附魔价格(铜币)"], ["0 is free. 10,000 copper = 1 gold.", "0 — бесплатно. 10 000 меди = 1 золото.", "0 ist kostenlos. 10.000 Kupfer = 1 Gold.", "0 est gratuit. 10 000 cuivre = 1 or.", "0 es gratis. 10 000 cobre = 1 oro.", "0为免费。10000铜币=1金币。"], { min: 0 });
|
||||||
|
add("Enchanter.Announce", "bool", ["Announce on login", "Объявлять при входе", "Beim Einloggen ankündigen", "Annonce à la connexion", "Anunciar al iniciar sesión", "登录时公告"], enchantDescription);
|
||||||
|
for (const [key, title, desc] of [
|
||||||
|
["MessageTimer", ["Speech interval (milliseconds)", "Интервал реплик (миллисекунды)", "Sprechintervall (Millisekunden)", "Intervalle de parole (millisecondes)", "Intervalo de habla (milisegundos)", "发言间隔(毫秒)"], ["0 disables speech; 60,000 milliseconds = 1 minute.", "0 отключает реплики; 60 000 мс = 1 минута.", "0 deaktiviert Sprache; 60.000 ms = 1 Minute.", "0 désactive la parole ; 60 000 ms = 1 minute.", "0 desactiva el habla; 60 000 ms = 1 minuto.", "0关闭发言;60000毫秒=1分钟。"]],
|
||||||
|
["NumPhrases", ["Number of phrases", "Количество реплик", "Anzahl der Sätze", "Nombre de phrases", "Número de frases", "台词数量"], ["Number of configured phrases the NPC can choose from. 0 disables phrases.", "Количество настроенных реплик НПС. 0 отключает реплики.", "Anzahl verfügbarer Sätze. 0 deaktiviert sie.", "Nombre de phrases disponibles. 0 les désactive.", "Número de frases disponibles. 0 las desactiva.", "NPC可选台词数量,0关闭。"]],
|
||||||
|
["EmoteSpell", ["Attention spell ID", "ID заклинания для привлечения внимания", "Aufmerksamkeitszauber-ID", "ID du sort d’attention", "ID del hechizo de atención", "吸引注意的法术ID"], ["Spell cast by the NPC. 0 disables it.", "Заклинание НПС. 0 отключает его.", "Zauber des NPCs. 0 deaktiviert ihn.", "Sort du PNJ. 0 le désactive.", "Hechizo del PNJ. 0 lo desactiva.", "NPC施放的法术,0关闭。"]],
|
||||||
|
["EmoteCommand", ["Speech gesture ID", "ID жеста при разговоре", "Gesten-ID beim Sprechen", "ID du geste de parole", "ID del gesto al hablar", "发言动作ID"], ["0 disables gestures; 3 is a wave.", "0 отключает жесты; 3 — помахать рукой.", "0 deaktiviert Gesten; 3 ist Winken.", "0 désactive les gestes ; 3 est un salut.", "0 desactiva gestos; 3 es saludar.", "0关闭动作;3为挥手。"]],
|
||||||
|
] 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 });
|
||||||
|
|
||||||
|
const ah = "AuctionHouseBot.";
|
||||||
|
add(ah + "GUIDs", "string", ["Auction characters", "Персонажи аукциона", "Auktionscharaktere", "Personnages d’enchères", "Personajes de subasta", "拍卖角色"], ["Character GUIDs separated by commas, without spaces. Use dedicated offline characters, not companion bots. 0 selects nobody.", "GUID персонажей через запятую без пробелов. Используйте отдельных офлайн-персонажей, не ботов-компаньонов. 0 — никто.", "Charakter-GUIDs durch Kommas, ohne Leerzeichen. Separate Offline-Charaktere verwenden, keine Begleiter-Bots. 0 wählt niemanden.", "GUID séparés par des virgules sans espaces. Utilisez des personnages dédiés hors ligne, pas des bots compagnons. 0 ne sélectionne personne.", "GUID separados por comas sin espacios. Usa personajes dedicados desconectados, no bots acompañantes. 0 no selecciona a nadie.", "角色GUID以逗号分隔,不加空格。使用专用离线角色,勿用伙伴机器人。0不选择任何角色。"]);
|
||||||
|
add(ah + "EnableSeller", "bool", ["Post auctions", "Выставлять лоты", "Auktionen einstellen", "Publier des enchères", "Publicar subastas", "发布拍卖"], ["Let the auction characters sell items. The module switch and valid character GUIDs are also required.", "Разрешает персонажам продавать предметы. Нужны включённый модуль и действительные GUID персонажей.", "Erlaubt Verkäufe. Modulschalter und gültige Charakter-GUIDs sind ebenfalls erforderlich.", "Autorise les ventes. Le module doit être activé et les GUID valides.", "Permite vender. También requiere el módulo activado y GUID válidos.", "允许拍卖角色出售物品,还需启用模块并填写有效角色GUID。"]);
|
||||||
|
add(ah + "CoA.ObtainableItemsOnly", "bool", ["Only obtainable items", "Только доступные в игре предметы", "Nur erhältliche Gegenstände", "Objets accessibles uniquement", "Solo objetos obtenibles", "仅可获取物品"], ["List items from world loot, vendors and professions. Other item filters still apply.", "Выставляет предметы из добычи, торговцев и профессий. Остальные фильтры продолжают действовать.", "Listet Gegenstände aus Beute, Händlern und Berufen. Weitere Filter gelten weiterhin.", "Publie les objets de butin, vendeurs et métiers. Les autres filtres s’appliquent.", "Publica objetos de botín, vendedores y profesiones. Los demás filtros siguen activos.", "发布来自掉落、商人和专业的物品,其他筛选仍生效。"]);
|
||||||
|
add(ah + "ItemsPerCycle", "int", ["Listings per cycle", "Лотов за цикл", "Angebote pro Durchlauf", "Annonces par cycle", "Anuncios por ciclo", "每轮上架数量"], ["Maximum items posted during one auction update.", "Максимум предметов за одно обновление аукциона.", "Maximale Angebote pro Auktionsaktualisierung.", "Nombre maximal d’objets par mise à jour.", "Máximo de objetos por actualización.", "每轮拍卖更新最多上架的物品数量。"], { min: 0 });
|
||||||
|
for (const [kind, titles] of [
|
||||||
|
["Buy", ["Buying interval (minutes)", "Интервал покупки (минуты)", "Kaufintervall (Minuten)", "Intervalle d’achat (minutes)", "Intervalo de compra (minutos)", "购买间隔(分钟)"]],
|
||||||
|
["Sell", ["Selling interval (minutes)", "Интервал продажи (минуты)", "Verkaufsintervall (Minuten)", "Intervalle de vente (minutes)", "Intervalo de venta (minutos)", "出售间隔(分钟)"]],
|
||||||
|
] as [string, string[]][]) add(ah + `MinutesBetween${kind}Cycle`, "string", titles, ["A number for a fixed interval, or min:max for a random interval (e.g. 3:15).", "Число для фиксированного интервала или мин:макс для случайного (например, 3:15).", "Zahl für ein festes Intervall oder min:max für ein zufälliges (z. B. 3:15).", "Un nombre pour un délai fixe, ou min:max pour un délai aléatoire (ex. 3:15).", "Número para intervalo fijo o mín:máx para uno aleatorio (p. ej. 3:15).", "固定间隔填数字,随机间隔填最小:最大,如3:15。"]);
|
||||||
|
for (const [faction, names] of [
|
||||||
|
["Alliance", ["Alliance", "Альянс", "Allianz", "Alliance", "Alianza", "联盟"]],
|
||||||
|
["Horde", ["Horde", "Орда", "Horde", "Horde", "Horda", "部落"]],
|
||||||
|
["Neutral", ["Neutral", "Нейтральный аукцион", "Neutral", "Neutre", "Neutral", "中立"]],
|
||||||
|
] as [string, string[]][]) for (const bound of ["Min", "Max"]) {
|
||||||
|
const maximum = bound === "Max";
|
||||||
|
add(ah + `${faction}.${bound}Items`, "int", [
|
||||||
|
`${names[0]}: ${maximum ? "maximum" : "minimum"} listings`, `${names[1]}: ${maximum ? "максимум" : "минимум"} лотов`, `${names[2]}: ${maximum ? "maximale" : "minimale"} Angebote`, `${names[3]} : annonces ${maximum ? "maximales" : "minimales"}`, `${names[4]}: anuncios ${maximum ? "máximos" : "mínimos"}`, `${names[5]}:${maximum ? "最多" : "最少"}上架数量`,
|
||||||
|
], ["Target listing count for this auction house. Keep the minimum no higher than the maximum.", "Целевое число лотов этого аукциона. Минимум не должен превышать максимум.", "Zielanzahl für dieses Auktionshaus. Minimum nicht höher als Maximum einstellen.", "Nombre cible pour cet hôtel des ventes. Le minimum ne doit pas dépasser le maximum.", "Cantidad objetivo para esta casa de subastas. El mínimo no debe superar el máximo.", "此拍卖行的目标上架数量,最小值不得超过最大值。"], { min: 0 });
|
||||||
|
}
|
||||||
|
add(ah + "Buyer.Enabled", "bool", ["Buy player auctions", "Покупать лоты игроков", "Spielerauktionen kaufen", "Acheter les enchères des joueurs", "Comprar subastas de jugadores", "购买玩家拍卖"], ["Enable the auction buyer. It spends the auction characters’ money.", "Включает покупателя. Он тратит деньги персонажей аукциона.", "Aktiviert Käufe mit dem Geld der Auktionscharaktere.", "Active les achats avec l’argent des personnages d’enchères.", "Activa las compras con el dinero de los personajes de subasta.", "启用拍卖买家,会花费拍卖角色的金币。"]);
|
||||||
|
add(ah + "Buyer.BuyCandidatesPerBuyCycle", "int", ["Purchase candidates per cycle", "Кандидатов на покупку за цикл", "Kaufkandidaten pro Durchlauf", "Achats potentiels par cycle", "Candidatos de compra por ciclo", "每轮购买候选数量"], ["How many auctions the buyer considers per cycle.", "Сколько лотов покупатель рассматривает за цикл.", "Anzahl geprüfter Auktionen pro Durchlauf.", "Nombre d’enchères examinées par cycle.", "Subastas examinadas por ciclo.", "买家每轮考虑的拍卖数量。"], { min: 0 });
|
||||||
|
add(ah + "Buyer.AcceptablePriceModifier", "float", ["Buyer price multiplier", "Множитель цены покупателя", "Kaufpreisfaktor", "Multiplicateur du prix d’achat", "Multiplicador del precio de compra", "买家价格倍率"], ["1 uses the calculated price. Higher values allow more expensive purchases.", "1 — расчётная цена. Большие значения допускают более дорогие покупки.", "1 nutzt den berechneten Preis. Höhere Werte erlauben teurere Käufe.", "1 utilise le prix calculé. Une valeur supérieure autorise des achats plus chers.", "1 usa el precio calculado. Valores mayores permiten compras más caras.", "1使用计算价格,增大后允许更高价购买。"], { min: 0 });
|
||||||
|
add(ah + "MaxBuyoutPriceInCopper", "int", ["Maximum buyout (copper)", "Максимальная цена выкупа (медь)", "Maximaler Sofortkauf (Kupfer)", "Rachat maximal (cuivre)", "Compra máxima (cobre)", "最高一口价(铜币)"], ["Upper price limit. 10,000 copper = 1 gold.", "Верхний предел цены. 10 000 меди = 1 золото.", "Preisobergrenze. 10.000 Kupfer = 1 Gold.", "Prix maximal. 10 000 cuivre = 1 or.", "Precio máximo. 10 000 cobre = 1 oro.", "价格上限,10000铜币=1金币。"], { min: 0 });
|
||||||
|
for (const [key, titles] of [
|
||||||
|
["Buyer.AlwaysBidMaxCalculatedPrice", ["Bid the calculated maximum", "Ставить расчётный максимум", "Berechnetes Maximum bieten", "Enchérir au maximum calculé", "Pujar el máximo calculado", "按计算最高价出价"]],
|
||||||
|
["Buyer.PreventOverpayingForVendorItems", ["Avoid overpaying for vendor items", "Не переплачивать за товары торговцев", "Händlerwaren nicht überbezahlen", "Éviter de surpayer les objets de vendeurs", "Evitar sobrepagar objetos de vendedores", "避免高价购买商人物品"]],
|
||||||
|
["Buyer.BidAgainstPlayers", ["Compete with player bids", "Конкурировать со ставками игроков", "Mit Spielergeboten konkurrieren", "Concurrencer les enchères des joueurs", "Competir con pujas de jugadores", "与玩家竞价"]],
|
||||||
|
] as [string, string[]][]) add(ah + key, "bool", titles, ["Controls the auction buyer’s bidding behaviour.", "Настраивает поведение покупателя при торгах.", "Steuert das Bietverhalten des Käufers.", "Règle le comportement d’enchères de l’acheteur.", "Controla las pujas del comprador.", "控制拍卖买家的出价行为。"]);
|
||||||
|
for (const [prefix, labels, bounds, titles] of [
|
||||||
|
["ListedItemLevelRestrict", ["Filter by item level", "Фильтр по уровню предметов", "Nach Gegenstandsstufe filtern", "Filtrer par niveau d’objet", "Filtrar por nivel de objeto", "按物品等级筛选"], ["MinItemLevel", "MaxItemLevel"], ["Item level", "Уровень предметов", "Gegenstandsstufe", "Niveau d’objet", "Nivel de objeto", "物品等级"]],
|
||||||
|
["EquipItemUseOrEquipLevelRestrict", ["Filter by required player level", "Фильтр по требуемому уровню игрока", "Nach benötigter Spielerstufe filtern", "Filtrer par niveau requis", "Filtrar por nivel requerido", "按角色需求等级筛选"], ["MinLevel", "MaxLevel"], ["Required level", "Требуемый уровень", "Benötigte Stufe", "Niveau requis", "Nivel requerido", "需求等级"]],
|
||||||
|
] as [string, string[], string[], string[]][]) {
|
||||||
|
const desc = ["Only list items within these limits when this filter is enabled.", "При включённом фильтре выставляет только предметы в этих пределах.", "Bei aktivem Filter nur Gegenstände innerhalb dieser Grenzen einstellen.", "Lorsque le filtre est actif, publier uniquement les objets dans ces limites.", "Con filtro activo, publicar solo objetos dentro de estos límites.", "启用筛选后仅发布范围内的物品。"];
|
||||||
|
add(ah + prefix + ".Enabled", "bool", labels, desc);
|
||||||
|
bounds.forEach((bound, i) => add(ah + prefix + "." + bound, "int", [`${titles[0]}: ${i ? "maximum" : "minimum"}`, `${titles[1]}: ${i ? "максимум" : "минимум"}`, `${titles[2]}: ${i ? "Maximum" : "Minimum"}`, `${titles[3]} : ${i ? "maximum" : "minimum"}`, `${titles[4]}: ${i ? "máximo" : "mínimo"}`, `${titles[5]}:${i ? "最大" : "最小"}`], desc, { min: 0 }));
|
||||||
|
}
|
||||||
|
export function moduleEnableKey(id: string) { return catalog.modules.find(m => m.id === id)?.enable_key; }
|
||||||
|
export const auctionCategories: Record<string, string[]> = {
|
||||||
|
Consumable: ["Consumables", "Расходники", "Verbrauchsgüter", "Consommables", "Consumibles", "消耗品"],
|
||||||
|
Container: ["Bags", "Сумки", "Taschen", "Sacs", "Bolsas", "背包"],
|
||||||
|
Weapon: ["Weapons", "Оружие", "Waffen", "Armes", "Armas", "武器"],
|
||||||
|
Gem: ["Gems", "Самоцветы", "Edelsteine", "Gemmes", "Gemas", "宝石"],
|
||||||
|
Armor: ["Armor", "Броня", "Rüstung", "Armures", "Armaduras", "护甲"],
|
||||||
|
Reagent: ["Spell reagents", "Реагенты заклинаний", "Zauberreagenzien", "Composants de sorts", "Componentes de hechizos", "施法材料"],
|
||||||
|
Projectile: ["Ammunition", "Боеприпасы", "Munition", "Munitions", "Munición", "弹药"],
|
||||||
|
TradeGood: ["Crafting materials", "Материалы для профессий", "Handwerksmaterialien", "Matériaux d’artisanat", "Materiales de profesión", "专业材料"],
|
||||||
|
Generic: ["Generic items", "Общие предметы", "Allgemeine Gegenstände", "Objets génériques", "Objetos genéricos", "通用物品"],
|
||||||
|
Recipe: ["Recipes", "Рецепты", "Rezepte", "Recettes", "Recetas", "配方"],
|
||||||
|
Quiver: ["Quivers and ammo pouches", "Колчаны и подсумки", "Köcher und Munitionstaschen", "Carquois et gibernes", "Carcajes y bolsas de munición", "箭袋与弹药包"],
|
||||||
|
Quest: ["Quest items", "Предметы заданий", "Questgegenstände", "Objets de quête", "Objetos de misión", "任务物品"],
|
||||||
|
Key: ["Keys", "Ключи", "Schlüssel", "Clés", "Llaves", "钥匙"],
|
||||||
|
Misc: ["Miscellaneous", "Разное", "Verschiedenes", "Divers", "Varios", "杂项"],
|
||||||
|
Glyph: ["Glyphs", "Символы", "Glyphen", "Glyphes", "Glifos", "雕文"],
|
||||||
|
};
|
||||||
|
export const auctionQualities: Record<string, string[]> = {
|
||||||
|
Poor: ["Poor", "Низкое", "Schlecht", "Médiocre", "Pobre", "粗糙"],
|
||||||
|
Normal: ["Common", "Обычное", "Gewöhnlich", "Commun", "Común", "普通"],
|
||||||
|
Uncommon: ["Uncommon", "Необычное", "Ungewöhnlich", "Inhabituel", "Poco común", "优秀"],
|
||||||
|
Rare: ["Rare", "Редкое", "Selten", "Rare", "Raro", "精良"],
|
||||||
|
Epic: ["Epic", "Эпическое", "Episch", "Épique", "Épico", "史诗"],
|
||||||
|
Legendary: ["Legendary", "Легендарное", "Legendär", "Légendaire", "Legendario", "传说"],
|
||||||
|
Artifact: ["Artifact", "Артефакт", "Artefakt", "Artefact", "Artefacto", "神器"],
|
||||||
|
Heirloom: ["Heirloom", "Наследуемое", "Erbstück", "Héritage", "Reliquia", "传家宝"],
|
||||||
|
};
|
||||||
|
export const auctionCategoryLabel = (category: string, locale: Locale) => text(auctionCategories[category], locale);
|
||||||
|
export const auctionQualityLabel = (quality: string, locale: Locale) => text(auctionQualities[quality], locale);
|
||||||
|
export const auctionWeightKey = (key: string) => /^AuctionHouseBot\.ListProportion\.Category([A-Za-z]+)\.Quality([A-Za-z]+)$/.exec(key);
|
||||||
|
export function auctionCategorySettings(items: ModuleSetting[], category: string) {
|
||||||
|
return items.filter(item => auctionWeightKey(item.key)?.[1] === category);
|
||||||
|
}
|
||||||
|
/** Turn a type off across all qualities; on restores weights or selects one supported common quality. */
|
||||||
|
export function auctionTypeChanges(items: ModuleSetting[], on: boolean, remembered: Record<string, string> = {}): Record<string, string> {
|
||||||
|
if (!on) return Object.fromEntries(items.map(item => [item.key, "0"]));
|
||||||
|
const restored = Object.fromEntries(items.map(item => [item.key, remembered[item.key] ?? item.default ?? "0"]));
|
||||||
|
if (!Object.values(restored).some(value => Number(value) > 0)) {
|
||||||
|
const fallback = items.find(item => auctionWeightKey(item.key)?.[2] === "Normal") ?? items[0];
|
||||||
|
if (fallback) restored[fallback.key] = "1";
|
||||||
|
}
|
||||||
|
return restored;
|
||||||
|
}
|
||||||
|
for (const [category, categoryNames] of Object.entries(auctionCategories)) {
|
||||||
|
for (const [quality, qualityNames] of Object.entries(auctionQualities)) add(
|
||||||
|
`AuctionHouseBot.ListProportion.Category${category}.Quality${quality}`, "int",
|
||||||
|
categoryNames.map((name, index) => `${name}: ${qualityNames[index]}`),
|
||||||
|
["Relative listing weight, not a percentage. 0 excludes this type and quality. Larger values make it more frequent among new listings.", "Относительный вес, а не процент. 0 исключает этот тип и качество. Чем больше значение, тем чаще они встречаются среди новых лотов.", "Relatives Gewicht, kein Prozentwert. 0 schließt Typ und Qualität aus. Höhere Werte erzeugen häufiger neue Angebote.", "Poids relatif, pas un pourcentage. 0 exclut ce type et cette qualité. Une valeur plus élevée augmente leur fréquence.", "Peso relativo, no porcentaje. 0 excluye este tipo y calidad. Valores mayores aumentan su frecuencia en nuevas subastas.", "相对权重,并非百分比。0排除此类型与品质,数值越大越常出现在新拍卖中。"],
|
||||||
|
{ min: 0, max: 1000, advanced: true },
|
||||||
|
);
|
||||||
|
}
|
||||||
|
export function moduleField(key: string, locale: Locale): ModuleField | undefined {
|
||||||
|
const field = fields.find(f => f.key === key);
|
||||||
|
if (field) return { ...field, title: text(field.title, locale), description: text(field.description, locale), category: "general", advanced: field.advanced ?? false, step: field.type === "range" ? 0.05 : undefined, options: field.options?.map(o => ({ value: o.value, label: text(o.label, locale) })) };
|
||||||
|
const existing = [...bots.settings, ...server.settings].find(s => s.key === key);
|
||||||
|
return existing ? { ...existing, options: "options" in existing ? existing.options : undefined } as ModuleField : undefined;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Older configs accept numeric aliases; keep their effective selection when opening the editor. */
|
||||||
|
export function canonicalModuleValue(key: string, value: string): string {
|
||||||
|
const v = value.trim().replace(/^"|"$/g, "");
|
||||||
|
if (key === scaling + "SoloAssist.Mode") return ({ "0": "None", "1": "Light", "2": "Full", none: "None", light: "Light", full: "Full" } as Record<string, string>)[v.toLowerCase()] ?? v;
|
||||||
|
if (key === scaling + "LFG.DefaultMode") return ({ "0": "Matchmaking", "1": "BotFill", "2": "CurrentParty", matchmaking: "Matchmaking", botfill: "BotFill", currentparty: "CurrentParty" } as Record<string, string>)[v.toLowerCase()] ?? v;
|
||||||
|
if (key === scaling + "Progression.Mode") return v.toLowerCase() === "auto" ? "Auto" : v.toLowerCase() === "custom" ? "Custom" : v;
|
||||||
|
return v;
|
||||||
|
}
|
||||||
@@ -0,0 +1,45 @@
|
|||||||
|
import type { JsonValue, ModuleSetting, SettingsView, SettingView } from "@/lib/api";
|
||||||
|
import type { Locale } from "@/i18n";
|
||||||
|
import { moduleField } from "@/lib/moduleSettings";
|
||||||
|
|
||||||
|
const languages: Locale[] = ["en", "ru", "de", "fr", "es", "zh"];
|
||||||
|
const groups = [
|
||||||
|
{ id: "squid.population", titles: ["Population", "Население мира", "Bevölkerung", "Population", "Población", "世界人口"] },
|
||||||
|
{ id: "squid.party", titles: ["Groups", "Группы", "Gruppen", "Groupes", "Grupos", "队伍"] },
|
||||||
|
{ id: "squid.combat", titles: ["Combat", "Бой", "Kampf", "Combat", "Combate", "战斗"] },
|
||||||
|
{ id: "squid.activities", titles: ["Dungeons and PvP", "Подземелья и PvP", "Dungeons und PvP", "Donjons et JcJ", "Mazmorras y JcJ", "地下城与PvP"] },
|
||||||
|
{ id: "squid.chat", titles: ["Chat", "Общение", "Chat", "Discussion", "Chat", "聊天"] },
|
||||||
|
{ id: "squid.other", titles: ["Other settings", "Другие настройки", "Weitere Einstellungen", "Autres réglages", "Otros ajustes", "其他设置"] },
|
||||||
|
];
|
||||||
|
|
||||||
|
function group(key: string, curated: boolean) {
|
||||||
|
if (!curated) return "squid.other";
|
||||||
|
if (/Talk|Emote|Suggest/.test(key)) return "squid.chat";
|
||||||
|
if (/Lfg|JoinBG/.test(key)) return "squid.activities";
|
||||||
|
if (/Smart|SpecRotations|Interrupt/.test(key)) return "squid.combat";
|
||||||
|
if (/AddedBots|BotAutologin$|Invite|AddClassCommand|KeepAlts|Recruit|FollowDistance/.test(key) && !key.endsWith("RandomBotAutologin")) return "squid.party";
|
||||||
|
return "squid.population";
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Use the same settings screen as Companions, backed only by shipped SQUID options. */
|
||||||
|
export function squidSettingsView(items: ModuleSetting[], locale: Locale): SettingsView {
|
||||||
|
const settings: SettingView[] = items.filter(s => s.key !== "AiPlayerbot.Enabled" && !s.key.startsWith("PlayerbotsDatabase") && !s.key.startsWith("Playerbots.Updates.")).map(s => {
|
||||||
|
const field = moduleField(s.key, locale);
|
||||||
|
const type = field?.type === "bool" || field?.type === "int" || field?.type === "float" || field?.type === "enum" ? field.type : "string";
|
||||||
|
const decode = (raw: string): JsonValue => {
|
||||||
|
const value = raw.trim().replace(/^"|"$/g, "");
|
||||||
|
if (type === "bool") return !["0", "false", "no", "off"].includes(value.toLowerCase());
|
||||||
|
if (type === "int" || type === "float") return Number(value);
|
||||||
|
return value;
|
||||||
|
};
|
||||||
|
const value = decode(s.value), defaultValue = decode(s.default ?? s.value);
|
||||||
|
return {
|
||||||
|
key: s.key, type, title: field?.title ?? s.key, description: field?.description ?? s.doc,
|
||||||
|
category: group(s.key, !!field), advanced: !field || !!field.advanced,
|
||||||
|
min: field?.min, max: field?.max, options: field?.options ?? [],
|
||||||
|
value, default: defaultValue, is_default: value === defaultValue, present: true, problem: null,
|
||||||
|
drift: false, restartRequired: "world", dangerous: false,
|
||||||
|
};
|
||||||
|
});
|
||||||
|
return { scope: "bots", categories: groups.map(g => ({ id: g.id, title: g.titles[languages.indexOf(locale)] })), settings, unknown_keys: 0, drift_keys: [], files: ["Core/configs/modules/playerbots.conf"] };
|
||||||
|
}
|
||||||
@@ -0,0 +1,50 @@
|
|||||||
|
import { useRef } from "react";
|
||||||
|
import { useI18n } from "@/i18n";
|
||||||
|
import type { ModuleSetting } from "@/lib/api";
|
||||||
|
import { auctionCategories, auctionCategoryLabel, auctionCategorySettings, auctionQualityLabel, auctionTypeChanges, auctionWeightKey, canonicalModuleValue } from "@/lib/moduleSettings";
|
||||||
|
import { cn } from "@/lib/utils";
|
||||||
|
|
||||||
|
export function AuctionTypes({ items, edits, busy, query, errors, onChange }: {
|
||||||
|
items: ModuleSetting[]; edits: Record<string, string>; busy: boolean; query: string;
|
||||||
|
onChange: (changes: Record<string, string>) => void;
|
||||||
|
errors: Record<string, string>;
|
||||||
|
}) {
|
||||||
|
const { t, locale } = useI18n();
|
||||||
|
const remembered = useRef<Record<string, Record<string, string>>>({});
|
||||||
|
const groups = Object.keys(auctionCategories).map(category => ({ category, settings: auctionCategorySettings(items, category) })).filter(group => group.settings.length);
|
||||||
|
if (!groups.length) return null;
|
||||||
|
const valueOf = (item: ModuleSetting) => canonicalModuleValue(item.key, edits[item.key] ?? item.value);
|
||||||
|
const matching = groups.filter(group => `${auctionCategoryLabel(group.category, locale)} ${t("mod.ahbot.types")} ${group.settings.map(s => `${s.key} ${auctionQualityLabel(auctionWeightKey(s.key)![2], locale)}`).join(" ")}`.toLocaleLowerCase(locale).includes(query.trim().toLocaleLowerCase(locale)));
|
||||||
|
if (!matching.length) return null;
|
||||||
|
return <fieldset className="my-4 rounded-md border border-line px-4 pb-2">
|
||||||
|
<legend className="px-1 text-sm font-semibold">{t("mod.ahbot.types")}</legend>
|
||||||
|
<p className="mb-2 mt-1 text-sm text-muted">{t("mod.ahbot.typesHint")}</p>
|
||||||
|
<div className="grid gap-x-6 sm:grid-cols-2">
|
||||||
|
{matching.map(({ category, settings }) => {
|
||||||
|
const on = settings.some(item => Number(valueOf(item)) > 0);
|
||||||
|
const label = auctionCategoryLabel(category, locale);
|
||||||
|
return <div key={category} className="border-t border-line py-3">
|
||||||
|
<div className="flex items-center justify-between gap-3">
|
||||||
|
<span className="text-sm font-medium">{label}{settings.some(s => s.key in edits) && <span className="ml-2 text-xs text-gold">{t("set.changed")}</span>}</span>
|
||||||
|
<button role="switch" aria-label={label} aria-checked={on} disabled={busy} className={cn("relative h-6 w-11 shrink-0 cursor-pointer rounded-full transition-colors", on ? "bg-gold" : "bg-white/15")} onClick={() => {
|
||||||
|
if (on) remembered.current[category] = Object.fromEntries(settings.map(item => [item.key, valueOf(item)]));
|
||||||
|
const original = Object.fromEntries(settings.map(item => [item.key, canonicalModuleValue(item.key, item.value)]));
|
||||||
|
const saved = Object.values(original).some(v => Number(v) > 0) ? original : undefined;
|
||||||
|
onChange(auctionTypeChanges(settings, !on, remembered.current[category] ?? saved));
|
||||||
|
}}><span className={cn("absolute left-0.5 top-0.5 h-5 w-5 rounded-full bg-white transition-transform", on && "translate-x-5")} /></button>
|
||||||
|
</div>
|
||||||
|
<details className="mt-2 text-xs text-muted">
|
||||||
|
<summary className="cursor-pointer">{t("mod.ahbot.qualityWeights")}</summary>
|
||||||
|
<p className="my-2 leading-relaxed">{t("mod.ahbot.weightsHint")}</p>
|
||||||
|
{settings.map(item => <label key={item.key} className="mb-1 flex items-center justify-between gap-2">
|
||||||
|
{auctionQualityLabel(auctionWeightKey(item.key)![2], locale)}
|
||||||
|
<input aria-label={`${label}: ${auctionQualityLabel(auctionWeightKey(item.key)![2], locale)}`} type="number" min={0} max={1000} step={1} value={edits[item.key] ?? item.value} disabled={busy} onChange={e => onChange({ [item.key]: e.target.value })} className="w-20 rounded border border-line bg-bg px-2 py-1 text-sm text-ink outline-none focus:border-gold" />
|
||||||
|
</label>)}
|
||||||
|
</details>
|
||||||
|
{settings.filter(item => errors[item.key]).map(item => <p key={item.key} role="alert" className="mt-1 text-xs text-bad">{auctionQualityLabel(auctionWeightKey(item.key)![2], locale)}: {errors[item.key]}</p>)}
|
||||||
|
</div>;
|
||||||
|
})}
|
||||||
|
</div>
|
||||||
|
{!groups.some(group => group.settings.some(item => Number(valueOf(item)) > 0)) && <p className="my-2 text-sm text-warn" role="status">{t("mod.ahbot.noTypes")}</p>}
|
||||||
|
</fieldset>;
|
||||||
|
}
|
||||||
@@ -7,7 +7,7 @@ import { Button } from "@/components/ui/button";
|
|||||||
import { Card } from "@/components/ui/card";
|
import { Card } from "@/components/ui/card";
|
||||||
import { useHuman, useT } from "@/i18n";
|
import { useHuman, useT } from "@/i18n";
|
||||||
|
|
||||||
export function ClientCard({ serverId }: { serverId: string }) {
|
export function ClientCard({ serverId, remote = false }: { serverId: string; remote?: boolean }) {
|
||||||
const t = useT();
|
const t = useT();
|
||||||
const human = useHuman();
|
const human = useHuman();
|
||||||
const [info, setInfo] = useState<ClientInfo | null | undefined>(undefined);
|
const [info, setInfo] = useState<ClientInfo | null | undefined>(undefined);
|
||||||
@@ -33,6 +33,7 @@ export function ClientCard({ serverId }: { serverId: string }) {
|
|||||||
const msg = await fn();
|
const msg = await fn();
|
||||||
if (msg) setNote(msg);
|
if (msg) setNote(msg);
|
||||||
await refresh();
|
await refresh();
|
||||||
|
void checkClient(serverId);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
setError(asUiError(e));
|
setError(asUiError(e));
|
||||||
} finally {
|
} finally {
|
||||||
@@ -54,7 +55,7 @@ export function ClientCard({ serverId }: { serverId: string }) {
|
|||||||
{info === undefined && <p className="mt-2 text-sm text-muted">{t("client.looking")}</p>}
|
{info === undefined && <p className="mt-2 text-sm text-muted">{t("client.looking")}</p>}
|
||||||
{info === null && (
|
{info === null && (
|
||||||
<>
|
<>
|
||||||
<p className="mt-1 text-sm text-muted">{t("client.intro")}</p>
|
<p className="mt-1 text-sm text-muted">{t(remote ? "remote.clientIntro" : "client.intro")}</p>
|
||||||
<Button className="mt-4" onClick={() => setDialog("setup")} disabled={busy}>{t("btn.setupClient")}</Button>
|
<Button className="mt-4" onClick={() => setDialog("setup")} disabled={busy}>{t("btn.setupClient")}</Button>
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
@@ -65,7 +66,7 @@ export function ClientCard({ serverId }: { serverId: string }) {
|
|||||||
<dt className="text-muted">{t("client.connectsTo")}</dt>
|
<dt className="text-muted">{t("client.connectsTo")}</dt>
|
||||||
<dd>
|
<dd>
|
||||||
{hosts.length ? hosts.filter(Boolean).join(", ") : "—"}
|
{hosts.length ? hosts.filter(Boolean).join(", ") : "—"}
|
||||||
{pointsLocal ? <span className="ml-2 text-ok">{t("client.thisComputer")}</span> : <span className="ml-2 text-warn">{t("client.notThisServer")}</span>}
|
{!remote && (pointsLocal ? <span className="ml-2 text-ok">{t("client.thisComputer")}</span> : <span className="ml-2 text-warn">{t("client.notThisServer")}</span>)}
|
||||||
</dd>
|
</dd>
|
||||||
<dt className="text-muted">{t("client.version")}</dt>
|
<dt className="text-muted">{t("client.version")}</dt>
|
||||||
<dd>
|
<dd>
|
||||||
@@ -74,27 +75,29 @@ export function ClientCard({ serverId }: { serverId: string }) {
|
|||||||
: t("client.versionUntracked")}
|
: t("client.versionUntracked")}
|
||||||
{status?.update_available && <span className="ml-2 text-warn">{t("client.updateAvailable")}</span>}
|
{status?.update_available && <span className="ml-2 text-warn">{t("client.updateAvailable")}</span>}
|
||||||
</dd>
|
</dd>
|
||||||
|
{!remote && <>
|
||||||
<dt className="text-muted">{t("client.addon")}</dt>
|
<dt className="text-muted">{t("client.addon")}</dt>
|
||||||
<dd>
|
<dd>
|
||||||
{info.addon.installed ? (info.addon.version ? t("client.installedVersion", { v: info.addon.version }) : t("client.installed")) : t("client.addonNotInstalled")}
|
{info.addon.installed ? (info.addon.version ? t("client.installedVersion", { v: info.addon.version }) : t("client.installed")) : t("client.addonNotInstalled")}
|
||||||
{info.addon.up_to_date === false && <span className="ml-2 text-warn">{t("client.updateAvailable")}</span>}
|
{info.addon.up_to_date === false && <span className="ml-2 text-warn">{t("client.updateAvailable")}</span>}
|
||||||
<span className="mt-1 block text-xs text-muted">{t("client.addonWhat")}</span>
|
<span className="mt-1 block text-xs text-muted">{t("client.addonWhat")}</span>
|
||||||
</dd>
|
</dd>
|
||||||
|
</>}
|
||||||
<dt className="text-muted">{t("client.otherAddons")}</dt>
|
<dt className="text-muted">{t("client.otherAddons")}</dt>
|
||||||
<dd>{t("client.leftAsIs", { n: info.other_addons })}</dd>
|
<dd>{t("client.leftAsIs", { n: info.other_addons })}</dd>
|
||||||
</dl>
|
</dl>
|
||||||
<div className="mt-4 flex flex-wrap gap-2">
|
<div className="mt-4 flex flex-wrap gap-2">
|
||||||
{!pointsLocal && (
|
{!remote && !pointsLocal && (
|
||||||
<Button size="sm" disabled={busy} onClick={() => void run(async () => { await api.setRealmlist(serverId, "127.0.0.1"); return t("client.pointedNote"); })}>
|
<Button size="sm" disabled={busy} onClick={() => void run(async () => { await api.setRealmlist(serverId, "127.0.0.1"); return t("client.pointedNote"); })}>
|
||||||
{t("client.pointLocal")}
|
{t("client.pointLocal")}
|
||||||
</Button>
|
</Button>
|
||||||
)}
|
)}
|
||||||
{(!info.addon.installed || info.addon.up_to_date === false) && (
|
{!remote && (!info.addon.installed || info.addon.up_to_date === false) && (
|
||||||
<Button size="sm" disabled={busy} onClick={() => void run(async () => { await api.installAddon(serverId); return t("client.addonNote"); })}>
|
<Button size="sm" disabled={busy} onClick={() => void run(async () => { await api.installAddon(serverId); return t("client.addonNote"); })}>
|
||||||
{info.addon.installed ? t("client.updateAddon") : t("client.installAddon")}
|
{info.addon.installed ? t("client.updateAddon") : t("client.installAddon")}
|
||||||
</Button>
|
</Button>
|
||||||
)}
|
)}
|
||||||
{status?.update_available && (
|
{(status?.update_available || (remote && status?.managed)) && (
|
||||||
<Button size="sm" variant="primary" disabled={busy} onClick={() => setDialog("update")}>{t("client.upd.start")}</Button>
|
<Button size="sm" variant="primary" disabled={busy} onClick={() => setDialog("update")}>{t("client.upd.start")}</Button>
|
||||||
)}
|
)}
|
||||||
{status && !status.managed && (
|
{status && !status.managed && (
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ import { useEffect, useRef, useState } from "react";
|
|||||||
import { open } from "@tauri-apps/plugin-dialog";
|
import { open } from "@tauri-apps/plugin-dialog";
|
||||||
import { listen } from "@tauri-apps/api/event";
|
import { listen } from "@tauri-apps/api/event";
|
||||||
import { Check, Loader2 } from "lucide-react";
|
import { Check, Loader2 } from "lucide-react";
|
||||||
import { api, asUiError, type ClientDownloadCheck, type ClientPlan, type ClientStep, type UiError } from "@/lib/api";
|
import { api, asUiError, REMOTE_CLIENT_ID, type ClientDownloadCheck, type ClientPlan, type ClientStep, 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";
|
||||||
@@ -261,7 +261,7 @@ export function ClientDialog(props: {
|
|||||||
<span className="flex h-9 w-9 items-center justify-center rounded-full bg-ok/15 text-ok"><Check className="h-5 w-5" aria-hidden /></span>
|
<span className="flex h-9 w-9 items-center justify-center rounded-full bg-ok/15 text-ok"><Check className="h-5 w-5" aria-hidden /></span>
|
||||||
<div>
|
<div>
|
||||||
<p className="font-medium">{mode === "setup" ? t("client.dl.done") : t("client.upd.done")}</p>
|
<p className="font-medium">{mode === "setup" ? t("client.dl.done") : t("client.upd.done")}</p>
|
||||||
<p className="text-sm text-muted">{mode === "setup" ? t("client.dl.doneText") : t("client.upd.doneText")}</p>
|
<p className="text-sm text-muted">{mode === "setup" ? t(serverId === REMOTE_CLIENT_ID ? "remote.clientReady" : "client.dl.doneText") : t("client.upd.doneText")}</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div className="mt-5 flex justify-end">
|
<div className="mt-5 flex justify-end">
|
||||||
|
|||||||
+86
-18
@@ -4,7 +4,9 @@ import { api, asUiError, type ModuleSetting, type ModuleView, type UiError } fro
|
|||||||
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, type Key } from "@/i18n";
|
import { useHuman, useI18n, useSchemaText, type Key } from "@/i18n";
|
||||||
|
import { auctionWeightKey, canonicalModuleValue, moduleEnableKey, moduleField } from "@/lib/moduleSettings";
|
||||||
|
import { AuctionTypes } from "@/screens/AuctionTypes";
|
||||||
|
|
||||||
/** 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 }) {
|
||||||
@@ -160,7 +162,7 @@ export function ModulesPage({ serverId, onChanged }: { serverId: string; onChang
|
|||||||
>
|
>
|
||||||
<GithubMark className="h-4 w-4" />
|
<GithubMark className="h-4 w-4" />
|
||||||
</button>
|
</button>
|
||||||
{m.installed && m.status !== "soon" && m.compatibility !== "unsupported" && (
|
{!m.page && m.installed && m.has_settings && m.status !== "soon" && m.compatibility !== "unsupported" && (
|
||||||
<Button size="sm" variant="ghost" aria-expanded={open === m.id} onClick={() => setOpen(open === m.id ? null : m.id)}>
|
<Button size="sm" variant="ghost" aria-expanded={open === m.id} onClick={() => setOpen(open === m.id ? null : m.id)}>
|
||||||
<Settings2 className="h-3.5 w-3.5" aria-hidden /> {t("mod.settings")}
|
<Settings2 className="h-3.5 w-3.5" aria-hidden /> {t("mod.settings")}
|
||||||
</Button>
|
</Button>
|
||||||
@@ -168,7 +170,7 @@ export function ModulesPage({ serverId, onChanged }: { serverId: string; onChang
|
|||||||
</div>
|
</div>
|
||||||
</Card>
|
</Card>
|
||||||
{/* The settings open right under the row of the card they belong to, so they are never out of sight below a long grid. */}
|
{/* The settings open right under the row of the card they belong to, so they are never out of sight below a long grid. */}
|
||||||
{selected && 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)} />
|
||||||
@@ -182,22 +184,44 @@ export function ModulesPage({ serverId, onChanged }: { serverId: string; onChang
|
|||||||
}
|
}
|
||||||
|
|
||||||
function ModuleSettings({ serverId, module, onSaved }: { serverId: string; module: ModuleView; onSaved: () => void }) {
|
function ModuleSettings({ serverId, module, onSaved }: { serverId: string; module: ModuleView; onSaved: () => void }) {
|
||||||
const { t } = useI18n();
|
const { t, locale } = useI18n();
|
||||||
|
const sx = useSchemaText();
|
||||||
const human = useHuman();
|
const human = useHuman();
|
||||||
|
const [advanced, setAdvanced] = useState(false);
|
||||||
const [items, setItems] = useState<ModuleSetting[] | null>(null);
|
const [items, setItems] = useState<ModuleSetting[] | null>(null);
|
||||||
const [edits, setEdits] = useState<Record<string, string>>({});
|
const [edits, setEdits] = useState<Record<string, string>>({});
|
||||||
const [busy, setBusy] = useState(false);
|
const [busy, setBusy] = useState(false);
|
||||||
const [error, setError] = useState<UiError | null>(null);
|
const [error, setError] = useState<UiError | null>(null);
|
||||||
const [note, setNote] = useState<string | null>(null);
|
const [note, setNote] = useState<string | null>(null);
|
||||||
|
const [query, setQuery] = useState("");
|
||||||
|
const [fieldErrors, setFieldErrors] = useState<Record<string, string>>({});
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
|
let cancelled = false;
|
||||||
setItems(null);
|
setItems(null);
|
||||||
setEdits({});
|
setEdits({});
|
||||||
setNote(null);
|
setNote(null);
|
||||||
void api.moduleSettings(serverId, module.id).then((s) => setItems(s)).catch((e) => setError(asUiError(e)));
|
setError(null);
|
||||||
|
setFieldErrors({});
|
||||||
|
void api.moduleSettings(serverId, module.id).then((s) => { if (!cancelled) setItems(s); }).catch((e) => { if (!cancelled) setError(asUiError(e)); });
|
||||||
|
return () => { cancelled = true; };
|
||||||
}, [serverId, module.id]);
|
}, [serverId, module.id]);
|
||||||
|
|
||||||
async function save() {
|
async function save() {
|
||||||
|
const errors: Record<string, string> = {};
|
||||||
|
for (const [key, value] of Object.entries(edits)) {
|
||||||
|
const field = moduleField(key, locale);
|
||||||
|
if (field && ["int", "float", "range"].includes(field.type)) {
|
||||||
|
const number = Number(value);
|
||||||
|
const message = !value.trim() || !Number.isFinite(number) ? t("set.enterNumber")
|
||||||
|
: field.type === "int" && !Number.isInteger(number) ? t("set.enterInt")
|
||||||
|
: field.min !== undefined && number < field.min ? t("set.atLeast", { n: field.min })
|
||||||
|
: field.max !== undefined && number > field.max ? t("set.atMost", { n: field.max }) : null;
|
||||||
|
if (message) errors[key] = message;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
setFieldErrors(errors);
|
||||||
|
if (Object.keys(errors).length) return;
|
||||||
setBusy(true);
|
setBusy(true);
|
||||||
setError(null);
|
setError(null);
|
||||||
setNote(null);
|
setNote(null);
|
||||||
@@ -217,37 +241,81 @@ function ModuleSettings({ serverId, module, onSaved }: { serverId: string; modul
|
|||||||
}
|
}
|
||||||
|
|
||||||
const dirty = Object.keys(edits).length > 0;
|
const dirty = Object.keys(edits).length > 0;
|
||||||
|
const edit = (key: string, value: string) => setEdits(previous => {
|
||||||
|
const next = { ...previous };
|
||||||
|
if (value === items?.find(item => item.key === key)?.value) delete next[key];
|
||||||
|
else next[key] = value;
|
||||||
|
return next;
|
||||||
|
});
|
||||||
|
const available = items?.filter(s => s.key !== moduleEnableKey(module.id)) ?? [];
|
||||||
|
const advancedCount = available.filter(s => !auctionWeightKey(s.key) && (!moduleField(s.key, locale) || moduleField(s.key, locale)?.advanced)).length;
|
||||||
|
const visible = available.filter(s => {
|
||||||
|
if (module.id === "ah-bot" && auctionWeightKey(s.key)) return false;
|
||||||
|
const field = moduleField(s.key, locale);
|
||||||
|
if (!advanced && !query.trim() && (!field || field.advanced)) return false;
|
||||||
|
const title = field ? sx.title({ key: s.key, title: field.title }) : s.key;
|
||||||
|
const description = field ? sx.description({ key: s.key, description: field.description }) : s.doc;
|
||||||
|
return `${title} ${description} ${s.key}`.toLocaleLowerCase(locale).includes(query.trim().toLocaleLowerCase(locale));
|
||||||
|
});
|
||||||
return (
|
return (
|
||||||
<div className="mt-3 border-t border-line pt-3">
|
<div className="mt-3 border-t border-line pt-3">
|
||||||
{items === null && !error && <Loader2 className="h-4 w-4 animate-spin text-muted" aria-hidden />}
|
{items === null && !error && <Loader2 className="h-4 w-4 animate-spin text-muted" aria-hidden />}
|
||||||
|
{module.id === "ah-bot" && (
|
||||||
|
<div className="mb-4 space-y-2 text-sm text-muted">
|
||||||
|
<p>{t("mod.ahbot.setup")}</p>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
{available.length >= 10 && <input value={query} onChange={e => setQuery(e.target.value)} aria-label={t("set.search")} placeholder={t("set.search")} className="mb-3 w-full rounded-md border border-line bg-bg px-3 py-2 text-sm outline-none focus:border-gold" />}
|
||||||
|
{advancedCount > 0 && <label className="mb-3 flex items-center gap-2 text-sm text-muted"><input type="checkbox" checked={advanced} onChange={e => setAdvanced(e.target.checked)} />{t("set.advanced", { n: advancedCount })}</label>}
|
||||||
|
{module.id === "ah-bot" && <AuctionTypes items={available} edits={edits} busy={busy} query={query} errors={fieldErrors} onChange={changes => setEdits(previous => {
|
||||||
|
const next = { ...previous };
|
||||||
|
for (const [key, value] of Object.entries(changes)) {
|
||||||
|
if (value === items?.find(item => item.key === key)?.value) delete next[key];
|
||||||
|
else next[key] = value;
|
||||||
|
}
|
||||||
|
return next;
|
||||||
|
})} />}
|
||||||
|
{items && !visible.length && !available.some(s => module.id === "ah-bot" && auctionWeightKey(s.key)) && <p className="py-3 text-sm text-muted">{t(available.length ? "all.none" : "mod.noSettings")}</p>}
|
||||||
<ul className="divide-y divide-line">
|
<ul className="divide-y divide-line">
|
||||||
{items?.map((s) => (
|
{visible.map((s) => {
|
||||||
|
const field = moduleField(s.key, locale);
|
||||||
|
const title = field ? sx.title({ key: s.key, title: field.title }) : s.key;
|
||||||
|
const description = field ? sx.description({ key: s.key, description: field.description }) : s.doc;
|
||||||
|
const value = edits[s.key] ?? s.value;
|
||||||
|
const normalized = canonicalModuleValue(s.key, value);
|
||||||
|
const options = field?.options ?? [];
|
||||||
|
const bool = field?.type === "bool" || /^(true|false)$/i.test(normalized) || (/^(0|1)$/.test(normalized) && /(?:\.Enable(?:d)?$|Enable\/Disable)/i.test(s.key + " " + s.doc));
|
||||||
|
const on = /^(1|true|yes|on)$/i.test(normalized);
|
||||||
|
const id = `${module.id}-${s.key}`;
|
||||||
|
const controlClass = "selectable w-56 rounded-md border border-line bg-bg px-3 py-2 text-sm outline-none focus:border-gold";
|
||||||
|
return (
|
||||||
<li key={s.key} className="py-2.5">
|
<li key={s.key} className="py-2.5">
|
||||||
<div className="flex flex-wrap items-center justify-between gap-3">
|
<div className="flex flex-wrap items-center justify-between gap-3">
|
||||||
<label htmlFor={`${module.id}-${s.key}`} className="selectable text-sm font-medium">{s.key}</label>
|
<div className="selectable text-sm font-medium"><label htmlFor={id}>{title}</label>{s.key in edits && <span className="ml-2 text-xs text-gold">{t("set.changed")}</span>}</div>
|
||||||
<input
|
{bool ? <button id={id} role="switch" aria-checked={on} disabled={busy} onClick={() => edit(s.key, /^(true|false)$/i.test(canonicalModuleValue(s.key, s.value)) ? String(!on) : on ? "0" : "1")} className={cn("relative h-7 w-14 cursor-pointer rounded-full", on ? "bg-gold" : "bg-white/15")}><span className={cn("absolute left-1 top-1 h-5 w-5 rounded-full bg-white transition-transform", on && "translate-x-7")} /><span className="sr-only">{t(on ? "set.on" : "set.off")}</span></button>
|
||||||
id={`${module.id}-${s.key}`}
|
: options.length ? <select id={id} value={normalized} disabled={busy} onChange={e => edit(s.key, e.target.value)} className={controlClass}>{!options.some(o => String(o.value) === normalized) && <option value={normalized}>{normalized}</option>}{options.map(o => <option key={String(o.value)} value={String(o.value)}>{sx.option(s.key, o)}</option>)}</select>
|
||||||
value={edits[s.key] ?? s.value}
|
: field?.type === "range" ? <div className="flex w-56 items-center gap-3"><input id={id} type="range" min={field.min} max={field.max} step={field.step} value={Number(normalized)} disabled={busy} onChange={e => edit(s.key, e.target.value)} aria-valuetext={`${Math.round(Number(normalized) * 100)}%`} className="min-w-0 flex-1 accent-gold" /><output htmlFor={id} className="w-12 text-right text-sm">{Math.round(Number(normalized) * 100)}%</output></div>
|
||||||
onChange={(e) => setEdits((x) => ({ ...x, [s.key]: e.target.value }))}
|
: <input id={id} type={field?.type === "int" || field?.type === "float" ? "number" : "text"} min={field?.min} max={field?.max} step={field?.type === "float" ? "any" : 1} value={value} disabled={busy} onChange={e => edit(s.key, e.target.value)} className={controlClass} />}
|
||||||
className="selectable w-56 rounded-md border border-line bg-bg px-2.5 py-1.5 text-sm outline-none focus:border-gold"
|
|
||||||
/>
|
|
||||||
</div>
|
</div>
|
||||||
{s.doc && <p className="mt-1 text-xs text-muted">{s.doc}</p>}
|
{description && <p className="mt-1 text-sm text-muted">{description}</p>}
|
||||||
|
{fieldErrors[s.key] && <p className="mt-1 text-sm text-bad" role="alert">{fieldErrors[s.key]}</p>}
|
||||||
|
{advanced && <p className="mt-1 selectable text-xs text-muted/70">{s.key}</p>}
|
||||||
{s.default !== null && (edits[s.key] ?? s.value) !== s.default && (
|
{s.default !== null && (edits[s.key] ?? s.value) !== s.default && (
|
||||||
<button className="mt-1 cursor-pointer text-xs text-muted underline hover:text-ink" onClick={() => setEdits((x) => ({ ...x, [s.key]: s.default ?? "" }))}>
|
<button disabled={busy} className="mt-1 cursor-pointer text-xs text-muted underline hover:text-ink" onClick={() => edit(s.key, s.default ?? "")}>
|
||||||
{t("mod.default", { v: s.default })}
|
{t("mod.default", { v: s.default })}
|
||||||
</button>
|
</button>
|
||||||
)}
|
)}
|
||||||
</li>
|
</li>
|
||||||
))}
|
); })}
|
||||||
</ul>
|
</ul>
|
||||||
<div className="mt-3 flex items-center gap-3">
|
{available.length > 0 && <div className="mt-3 flex items-center gap-3">
|
||||||
<Button size="sm" variant="primary" disabled={!dirty || busy} onClick={() => void save()}>
|
<Button size="sm" variant="primary" disabled={!dirty || busy} onClick={() => void save()}>
|
||||||
{busy && <Loader2 className="h-4 w-4 animate-spin" aria-hidden />}
|
{busy && <Loader2 className="h-4 w-4 animate-spin" aria-hidden />}
|
||||||
{t("acc.save")}
|
{t("acc.save")}
|
||||||
</Button>
|
</Button>
|
||||||
|
{dirty && <Button size="sm" variant="ghost" disabled={busy} onClick={() => { setEdits({}); setFieldErrors({}); setNote(null); }}>{t("set.discard")}</Button>}
|
||||||
{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>}
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -274,6 +274,11 @@ export function Overview({ server, companions = true, onForget, onOpenUpdates, o
|
|||||||
{transitioning ? (action === "stopping" ? t("btn.stoppingCaps") : t("btn.startingCaps")) : t("btn.start")}
|
{transitioning ? (action === "stopping" ? t("btn.stoppingCaps") : t("btn.startingCaps")) : t("btn.start")}
|
||||||
</Button>
|
</Button>
|
||||||
)}
|
)}
|
||||||
|
{!running && upd.available && (
|
||||||
|
<Button variant="secondary" size="sm" disabled={transitioning || upd.applying} onClick={() => run("starting")}>
|
||||||
|
{t("btn.startWithoutUpdate")}
|
||||||
|
</Button>
|
||||||
|
)}
|
||||||
{running && (
|
{running && (
|
||||||
<Button variant="ghost" size="sm" disabled={transitioning || upd.applying} onClick={() => run("restarting")}>
|
<Button variant="ghost" size="sm" disabled={transitioning || upd.applying} onClick={() => run("restarting")}>
|
||||||
{t("btn.restart")}
|
{t("btn.restart")}
|
||||||
@@ -333,6 +338,11 @@ export function Overview({ server, companions = true, onForget, onOpenUpdates, o
|
|||||||
{t("btn.setupClient")}
|
{t("btn.setupClient")}
|
||||||
</Button>
|
</Button>
|
||||||
) : null}
|
) : null}
|
||||||
|
{client && !jobBusy && (clientStatus?.update_available || job.phase === "choose") && (
|
||||||
|
<Button variant="secondary" size="sm" disabled={realmBusy || playing || upd.applying} onClick={() => void play()}>
|
||||||
|
{t("btn.playWithoutUpdate")}
|
||||||
|
</Button>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{anyUp && !running && !transitioning && (
|
{anyUp && !running && !transitioning && (
|
||||||
|
|||||||
@@ -0,0 +1,86 @@
|
|||||||
|
import { useEffect, useState } from "react";
|
||||||
|
import { Gauge, Settings } from "lucide-react";
|
||||||
|
import { api, asUiError, REMOTE_CLIENT_ID } from "@/lib/api";
|
||||||
|
import { checkClient, startClientPolling, useClientStatus } from "@/lib/clientUpdate";
|
||||||
|
import { ClientCard } from "@/screens/ClientCard";
|
||||||
|
import { ClientDialog, type ClientDialogMode } from "@/screens/ClientDialog";
|
||||||
|
import { AboutCard } from "@/screens/AboutCard";
|
||||||
|
import { LanguagePicker } from "@/components/LanguagePicker";
|
||||||
|
import { Button } from "@/components/ui/button";
|
||||||
|
import { Card } from "@/components/ui/card";
|
||||||
|
import { useHuman, useT } from "@/i18n";
|
||||||
|
import { cn } from "@/lib/utils";
|
||||||
|
import logo from "@/assets/logo.png";
|
||||||
|
|
||||||
|
export function RemoteClient({ onHost }: { onHost: () => void }) {
|
||||||
|
const t = useT();
|
||||||
|
const human = useHuman();
|
||||||
|
const [page, setPage] = useState<"overview" | "settings">("overview");
|
||||||
|
const [host, setHost] = useState("");
|
||||||
|
const [savedHost, setSavedHost] = useState("");
|
||||||
|
const [loading, setLoading] = useState(true);
|
||||||
|
const [busy, setBusy] = useState(false);
|
||||||
|
const [error, setError] = useState<string | null>(null);
|
||||||
|
const [note, setNote] = useState<string | null>(null);
|
||||||
|
const [revision, setRevision] = useState(0);
|
||||||
|
const [dialog, setDialog] = useState<ClientDialogMode | null>(null);
|
||||||
|
const { status } = useClientStatus(REMOTE_CLIENT_ID);
|
||||||
|
function fail(e: unknown) {
|
||||||
|
const err = asUiError(e);
|
||||||
|
setError(err.human.code === "unknown" ? err.technical : human(err.human).message);
|
||||||
|
}
|
||||||
|
useEffect(() => {
|
||||||
|
void api.remoteConnection().then(p => { setHost(p.host); setSavedHost(p.host); }).catch(fail).finally(() => setLoading(false));
|
||||||
|
return startClientPolling(REMOTE_CLIENT_ID);
|
||||||
|
}, []); // eslint-disable-line react-hooks/exhaustive-deps
|
||||||
|
useEffect(() => { void checkClient(REMOTE_CLIENT_ID); }, [revision]);
|
||||||
|
|
||||||
|
async function save() {
|
||||||
|
setBusy(true); setError(null); setNote(null);
|
||||||
|
try {
|
||||||
|
const profile = await api.remoteConnect(host);
|
||||||
|
setHost(profile.host); setSavedHost(profile.host); setRevision(n => n + 1);
|
||||||
|
setNote(t("remote.saved"));
|
||||||
|
} catch (e) { fail(e); } finally { setBusy(false); }
|
||||||
|
}
|
||||||
|
async function launch() {
|
||||||
|
setBusy(true); setError(null); setNote(null);
|
||||||
|
try { await api.play(REMOTE_CLIENT_ID); } catch (e) { fail(e); } finally { setBusy(false); }
|
||||||
|
}
|
||||||
|
function play() {
|
||||||
|
if (!status?.linked) setDialog("setup");
|
||||||
|
else if (status.update_available) setDialog("update");
|
||||||
|
else void launch();
|
||||||
|
}
|
||||||
|
return <div className="flex h-full">
|
||||||
|
<nav className="flex w-60 shrink-0 flex-col border-r border-line bg-[#0b0c0e] p-3" aria-label={t("nav.main")}>
|
||||||
|
<div className="flex items-center gap-2 px-3 pb-4 pt-2 text-sm font-semibold tracking-wide text-gold"><img src={logo} alt="" className="h-7 w-7" />{t("app.name")}</div>
|
||||||
|
<ul className="flex flex-col gap-0.5">
|
||||||
|
{(["overview", "settings"] as const).map(id => { const Icon = id === "overview" ? Gauge : Settings; return <li key={id}>
|
||||||
|
<button onClick={() => setPage(id)} aria-current={page === id ? "page" : undefined} className={cn("flex h-10 w-full cursor-pointer items-center gap-3 rounded-md px-3 text-left text-[15px]", page === id ? "bg-white/[0.07] text-ink" : "text-muted hover:bg-white/5 hover:text-ink")}><Icon className="h-[18px] w-[18px]" aria-hidden />{t(id === "overview" ? "nav.overview" : "nav.settings")}</button>
|
||||||
|
</li>; })}
|
||||||
|
</ul>
|
||||||
|
<div className="mt-auto border-t border-line pt-3"><Button variant="ghost" size="sm" className="w-full justify-start" onClick={onHost}>{t("remote.hostInstead")}</Button></div>
|
||||||
|
</nav>
|
||||||
|
<main className="h-full flex-1 overflow-y-auto px-10 py-8">
|
||||||
|
{page === "settings" ? <><div className="flex items-center justify-between"><h1 className="text-2xl font-semibold">{t("nav.settings")}</h1><LanguagePicker /></div><AboutCard /></> : <>
|
||||||
|
<div className="flex items-center justify-between"><h1 className="text-2xl font-semibold">{t("welcome.connect.title")}</h1><LanguagePicker /></div>
|
||||||
|
<p className="mt-2 text-muted">{t("remote.intro")}</p>
|
||||||
|
<Card className="mt-6 p-6">
|
||||||
|
<form onSubmit={e => { e.preventDefault(); void save(); }}>
|
||||||
|
<label htmlFor="remote-host" className="font-semibold">{t("remote.address")}</label>
|
||||||
|
<p id="remote-host-hint" className="mt-1 text-sm text-muted">{t("remote.addressHint")}</p>
|
||||||
|
<div className="mt-4 flex gap-3"><input id="remote-host" aria-describedby="remote-host-hint" value={host} onChange={e => { setHost(e.target.value); setNote(null); }} disabled={loading || busy} placeholder="192.168.1.10" className="min-w-0 flex-1 rounded-md border border-line bg-card px-3 py-2" /><Button type="submit" disabled={loading || busy || !host.trim()}>{t("remote.save")}</Button></div>
|
||||||
|
</form>
|
||||||
|
<p className="mt-3 text-sm text-muted">{t("remote.accountHint")}</p>
|
||||||
|
<Button variant="primary" className="mt-4" disabled={loading || busy || !savedHost || host.trim() !== savedHost || status === null} onClick={play}>{t("btn.play")}</Button>
|
||||||
|
{status?.linked && status.update_available && <Button variant="secondary" className="mt-4 ml-3" disabled={loading || busy || !savedHost || host.trim() !== savedHost} onClick={() => void launch()}>{t("btn.playWithoutUpdate")}</Button>}
|
||||||
|
{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}</p>}
|
||||||
|
</Card>
|
||||||
|
<ClientCard key={revision} serverId={REMOTE_CLIENT_ID} remote />
|
||||||
|
</>}
|
||||||
|
</main>
|
||||||
|
{dialog && <ClientDialog serverId={REMOTE_CLIENT_ID} mode={dialog} onClose={() => setDialog(null)} onChanged={() => setRevision(n => n + 1)} onPlayAnyway={() => void launch()} />}
|
||||||
|
</div>;
|
||||||
|
}
|
||||||
@@ -23,7 +23,7 @@ export function SettingsHome({ serverId }: { serverId: string }) {
|
|||||||
const human = useHuman();
|
const human = useHuman();
|
||||||
const [preview, setPreview] = useState<UpdatePreview | null>(null);
|
const [preview, setPreview] = useState<UpdatePreview | null>(null);
|
||||||
const [pending, setPending] = useState<UpdateTxn | null>(null);
|
const [pending, setPending] = useState<UpdateTxn | null>(null);
|
||||||
const [localBusy, setBusy] = useState<"check" | "rollback" | null>(null);
|
const [localBusy, setBusy] = useState<"check" | "rollback" | "retry" | null>(null);
|
||||||
// an update keeps running in the background when this tab is left, so its state is the shared one
|
// an update keeps running in the background when this tab is left, so its state is the shared one
|
||||||
const busy = upd.applying ? "update" : localBusy;
|
const busy = upd.applying ? "update" : localBusy;
|
||||||
const progress = upd.applying ? { step: upd.step ?? "Starting", percent: upd.percent } : null;
|
const progress = upd.applying ? { step: upd.step ?? "Starting", percent: upd.percent } : null;
|
||||||
@@ -85,6 +85,21 @@ export function SettingsHome({ serverId }: { serverId: string }) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function retryValidation(txn: UpdateTxn) {
|
||||||
|
setBusy("retry");
|
||||||
|
setError(null);
|
||||||
|
try {
|
||||||
|
const result = await api.retryUpdateValidation(serverId, txn.id);
|
||||||
|
if (result.state === "committed") {
|
||||||
|
setPending(null);
|
||||||
|
setPreview(null);
|
||||||
|
setDone(t("upd.updatedTo", { v: result.to_version }));
|
||||||
|
clearServerUpdateResult(serverId);
|
||||||
|
} else setPending(result);
|
||||||
|
} catch (e) { setError(asUiError(e)); }
|
||||||
|
finally { setBusy(null); }
|
||||||
|
}
|
||||||
|
|
||||||
async function browse() {
|
async function browse() {
|
||||||
const p = await open({ directory: true, multiple: false, title: t("upd.dialogTitle") });
|
const p = await open({ directory: true, multiple: false, title: t("upd.dialogTitle") });
|
||||||
if (typeof p === "string") setSource(p);
|
if (typeof p === "string") setSource(p);
|
||||||
@@ -100,7 +115,13 @@ export function SettingsHome({ serverId }: { serverId: string }) {
|
|||||||
<p className="font-medium text-warn">
|
<p className="font-medium text-warn">
|
||||||
{pending.state === "needs-decision" ? t("upd.pendingBad") : t("upd.pendingUnfinished")}
|
{pending.state === "needs-decision" ? t("upd.pendingBad") : t("upd.pendingUnfinished")}
|
||||||
</p>
|
</p>
|
||||||
<p className="mt-1 text-sm text-muted">{pending.message ?? t("upd.safeBack")}</p>
|
<p className="mt-1 whitespace-pre-wrap text-sm text-muted">{pending.message ?? t("upd.safeBack")}</p>
|
||||||
|
{pending.state === "needs-decision" && (
|
||||||
|
<Button className="mt-3 mr-3" size="sm" disabled={!!busy} onClick={() => void retryValidation(pending)}>
|
||||||
|
{busy === "retry" && <Loader2 className="h-4 w-4 animate-spin" aria-hidden />}
|
||||||
|
{t("upd.retryValidation")}
|
||||||
|
</Button>
|
||||||
|
)}
|
||||||
<p className="mt-1 text-sm text-muted">{t("upd.backNote")}</p>
|
<p className="mt-1 text-sm text-muted">{t("upd.backNote")}</p>
|
||||||
<Button className="mt-3" size="sm" disabled={!!busy} onClick={() => void rollback(pending)}>
|
<Button className="mt-3" size="sm" disabled={!!busy} onClick={() => void rollback(pending)}>
|
||||||
{busy === "rollback" && <Loader2 className="h-4 w-4 animate-spin" aria-hidden />}
|
{busy === "rollback" && <Loader2 className="h-4 w-4 animate-spin" aria-hidden />}
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ import {
|
|||||||
type SettingView,
|
type SettingView,
|
||||||
type UiError,
|
type UiError,
|
||||||
} from "@/lib/api";
|
} from "@/lib/api";
|
||||||
|
import { squidSettingsView } from "@/lib/squidSettings";
|
||||||
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";
|
||||||
@@ -153,9 +154,10 @@ function Row(props: { s: SettingView; value: JsonValue; error: string | null; on
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
export function SettingsPage(props: { serverId: string; scope: Scope; title: string; question: string }) {
|
export function SettingsPage(props: { serverId: string; scope: Scope; botModule?: "companions" | "playerbots"; title: string; question: string }) {
|
||||||
const { serverId, scope } = props;
|
const { serverId, scope } = props;
|
||||||
const { t, tn } = useI18n();
|
const { t, tn, locale } = useI18n();
|
||||||
|
const squid = scope === "bots" && props.botModule === "playerbots";
|
||||||
const sx = useSchemaText();
|
const sx = useSchemaText();
|
||||||
const human = useHuman();
|
const human = useHuman();
|
||||||
const [view, setView] = useState<SettingsView | null>(null);
|
const [view, setView] = useState<SettingsView | null>(null);
|
||||||
@@ -181,7 +183,7 @@ export function SettingsPage(props: { serverId: string; scope: Scope; title: str
|
|||||||
|
|
||||||
const load = useCallback(async () => {
|
const load = useCallback(async () => {
|
||||||
try {
|
try {
|
||||||
const v = await api.settings(serverId, scope);
|
const v = squid ? squidSettingsView(await api.moduleSettings(serverId, "playerbots"), locale) : await api.settings(serverId, scope);
|
||||||
setView(v);
|
setView(v);
|
||||||
setDraft({});
|
setDraft({});
|
||||||
setErrors({});
|
setErrors({});
|
||||||
@@ -190,14 +192,14 @@ export function SettingsPage(props: { serverId: string; scope: Scope; title: str
|
|||||||
} catch (e) {
|
} catch (e) {
|
||||||
setFatal(asUiError(e));
|
setFatal(asUiError(e));
|
||||||
}
|
}
|
||||||
}, [serverId, scope]);
|
}, [serverId, scope, squid, locale]);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
setView(null);
|
setView(null);
|
||||||
setSaved(null);
|
setSaved(null);
|
||||||
setCategory("");
|
setCategory("");
|
||||||
void load();
|
void load();
|
||||||
void api.presets(scope).then(setPresets);
|
if (squid) setPresets([]); else void api.presets(scope).then(setPresets);
|
||||||
void api.status(serverId).then((s) => setRunning(s.observed.world.state === "running"));
|
void api.status(serverId).then((s) => setRunning(s.observed.world.state === "running"));
|
||||||
setQuery("");
|
setQuery("");
|
||||||
setRaw(null);
|
setRaw(null);
|
||||||
@@ -290,7 +292,10 @@ export function SettingsPage(props: { serverId: string; scope: Scope; title: str
|
|||||||
setBusy(true);
|
setBusy(true);
|
||||||
setSaveErr(null);
|
setSaveErr(null);
|
||||||
try {
|
try {
|
||||||
const report = await api.save(serverId, scope, changes);
|
const report: SaveReport = squid ? {
|
||||||
|
changed: (await api.moduleSaveSettings(serverId, "playerbots", Object.fromEntries(Object.entries(changes).map(([key, value]) => [key, typeof value === "boolean" ? value ? "1" : "0" : String(value)])))).map(key => ({ key, title: view!.settings.find(s => s.key === key)!.title, restart: "world", dangerous: false })),
|
||||||
|
restart: "world", snapshot: null,
|
||||||
|
} : await api.save(serverId, scope, changes);
|
||||||
setSaved(report);
|
setSaved(report);
|
||||||
setPreview(null);
|
setPreview(null);
|
||||||
await load();
|
await load();
|
||||||
@@ -338,7 +343,9 @@ export function SettingsPage(props: { serverId: string; scope: Scope; title: str
|
|||||||
|
|
||||||
async function openPreset(id: string) {
|
async function openPreset(id: string) {
|
||||||
setSaved(null);
|
setSaved(null);
|
||||||
setPreview(await api.previewPreset(serverId, scope, id));
|
if (squid) {
|
||||||
|
setPreview({ id: "defaults", title: t("set.restoreDefaults"), description: "", changes: view!.settings.filter(s => s.value !== s.default).map(s => ({ key: s.key, title: s.title, from: s.value, to: s.default, dangerous: false })) });
|
||||||
|
} else setPreview(await api.previewPreset(serverId, scope, id));
|
||||||
}
|
}
|
||||||
|
|
||||||
async function restartNow() {
|
async function restartNow() {
|
||||||
@@ -356,9 +363,9 @@ export function SettingsPage(props: { serverId: string; scope: Scope; title: str
|
|||||||
return (
|
return (
|
||||||
<div className="max-w-3xl pb-24">
|
<div className="max-w-3xl pb-24">
|
||||||
<h1 className="text-2xl font-semibold">{props.title}</h1>
|
<h1 className="text-2xl font-semibold">{props.title}</h1>
|
||||||
<p className="mt-1 text-muted">{props.question}</p>
|
<p className="mt-1 text-muted">{squid ? "SQUID’s Playerbots" : props.question}</p>
|
||||||
|
|
||||||
{scope === "bots" && <CompanionsCard serverId={serverId} />}
|
{scope === "bots" && !squid && <CompanionsCard serverId={serverId} />}
|
||||||
|
|
||||||
{view.drift_keys.length > 0 && (
|
{view.drift_keys.length > 0 && (
|
||||||
<Card className="mt-5 border-warn/40 p-4" role="status">
|
<Card className="mt-5 border-warn/40 p-4" role="status">
|
||||||
@@ -372,7 +379,7 @@ export function SettingsPage(props: { serverId: string; scope: Scope; title: str
|
|||||||
)}
|
)}
|
||||||
|
|
||||||
<div className="mt-5 flex flex-wrap items-center gap-2">
|
<div className="mt-5 flex flex-wrap items-center gap-2">
|
||||||
<span className="text-sm text-muted">{t("set.presets")}</span>
|
{presets.length > 0 && <span className="text-sm text-muted">{t("set.presets")}</span>}
|
||||||
{presets.map((p) => (
|
{presets.map((p) => (
|
||||||
<Button key={p.id} size="sm" title={sx.preset(p).description} onClick={() => void openPreset(p.id)}>
|
<Button key={p.id} size="sm" title={sx.preset(p).description} onClick={() => void openPreset(p.id)}>
|
||||||
{sx.preset(p).title}
|
{sx.preset(p).title}
|
||||||
|
|||||||
@@ -47,11 +47,16 @@ export function Shell(props: {
|
|||||||
const update = useServerUpdate(props.activeId);
|
const update = useServerUpdate(props.activeId);
|
||||||
|
|
||||||
// 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 [hiddenPages, setHiddenPages] = useState<string[]>([]);
|
const [hiddenPages, setHiddenPages] = useState<string[]>([]);
|
||||||
const reloadModules = useCallback(() => {
|
const reloadModules = useCallback(() => {
|
||||||
void api
|
void api
|
||||||
.modulesList(props.activeId)
|
.modulesList(props.activeId)
|
||||||
.then((list) => setHiddenPages(list.filter((m) => m.page && (!m.installed || m.compatibility === "unsupported" || (m.switchable && !m.enabled))).map((m) => m.page as string)))
|
.then((list) => {
|
||||||
|
const available = (m: typeof list[number]) => m.installed && m.compatibility !== "unsupported" && (!m.switchable || m.enabled);
|
||||||
|
setHiddenPages([...new Set(list.flatMap(m => m.page ? [m.page] : []))].filter(page => !list.some(m => m.page === page && available(m))));
|
||||||
|
setBotModule(list.some(m => m.id === "playerbots" && available(m)) ? "playerbots" : "companions");
|
||||||
|
})
|
||||||
.catch(() => setHiddenPages([]));
|
.catch(() => setHiddenPages([]));
|
||||||
}, [props.activeId]);
|
}, [props.activeId]);
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
@@ -122,9 +127,9 @@ export function Shell(props: {
|
|||||||
|
|
||||||
<main className="h-full flex-1 overflow-y-auto px-10 py-8">
|
<main className="h-full flex-1 overflow-y-auto px-10 py-8">
|
||||||
{page === "overview" ? (
|
{page === "overview" ? (
|
||||||
<Overview key={server.id} server={server} companions={!hiddenPages.includes("bots")} onForget={() => props.onForget(server.id)} onOpenUpdates={() => setPage("settings")} onRealmChanged={reloadModules} />
|
<Overview key={server.id} server={server} companions={botModule === "companions" && !hiddenPages.includes("bots")} onForget={() => props.onForget(server.id)} onOpenUpdates={() => setPage("settings")} onRealmChanged={reloadModules} />
|
||||||
) : page === "bots" || page === "server" ? (
|
) : page === "bots" || page === "server" ? (
|
||||||
<SettingsPage key={`${server.id}-${page}`} serverId={server.id} scope={page} 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)} />
|
||||||
) : page === "console" ? (
|
) : page === "console" ? (
|
||||||
<ConsolePage key={server.id} serverId={server.id} />
|
<ConsolePage key={server.id} serverId={server.id} />
|
||||||
) : page === "modules" ? (
|
) : page === "modules" ? (
|
||||||
|
|||||||
+21
-6
@@ -1,20 +1,34 @@
|
|||||||
import { FolderSearch, Download } from "lucide-react";
|
import { useState } from "react";
|
||||||
|
import { FolderSearch, Download, Server, Globe } from "lucide-react";
|
||||||
import { useT } from "@/i18n";
|
import { useT } from "@/i18n";
|
||||||
import logo from "@/assets/logo.png";
|
import logo from "@/assets/logo.png";
|
||||||
import { LanguagePicker } from "@/components/LanguagePicker";
|
import { LanguagePicker } from "@/components/LanguagePicker";
|
||||||
|
|
||||||
export function Welcome({ onImport, onInstall, onBack }: { onImport: () => void; onInstall: () => void; onBack?: () => void }) {
|
export function Welcome({ onImport, onInstall, onConnect, onBack }: { onImport: () => void; onInstall: () => void; onConnect: () => void; onBack?: () => void }) {
|
||||||
const t = useT();
|
const t = useT();
|
||||||
|
const [hosting, setHosting] = useState(false);
|
||||||
return (
|
return (
|
||||||
<main className="relative flex h-full flex-col items-center justify-center px-8">
|
<main className="relative flex h-full flex-col items-center justify-center px-8">
|
||||||
<LanguagePicker className="absolute right-6 top-5" />
|
<LanguagePicker className="absolute right-6 top-5" />
|
||||||
<div className="mb-10 text-center">
|
<div className="mb-10 text-center">
|
||||||
<img src={logo} alt="" aria-hidden className="mx-auto mb-5 h-24 w-24 drop-shadow-[0_6px_24px_rgb(201_162_74/0.35)]" />
|
<img src={logo} alt="" aria-hidden className="mx-auto mb-5 h-24 w-24 drop-shadow-[0_6px_24px_rgb(201_162_74/0.35)]" />
|
||||||
<h1 className="text-3xl font-semibold tracking-tight">{t("welcome.title")}</h1>
|
<h1 className="text-3xl font-semibold tracking-tight">{t("welcome.title")}</h1>
|
||||||
<p className="mt-2 text-muted">{t("welcome.subtitle")}</p>
|
<p className="mt-2 text-muted">{t(hosting ? "welcome.subtitle" : "welcome.roleSubtitle")}</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="grid w-full max-w-3xl grid-cols-2 gap-5">
|
<div className="grid w-full max-w-3xl grid-cols-2 gap-5">
|
||||||
|
{!hosting ? <>
|
||||||
|
<button onClick={() => setHosting(true)} className="cursor-pointer rounded-card border border-line bg-card/90 p-7 text-left transition-colors hover:border-gold/60">
|
||||||
|
<Server className="mb-4 h-7 w-7 text-gold" aria-hidden />
|
||||||
|
<h2 className="text-lg font-semibold">{t("welcome.host.title")}</h2>
|
||||||
|
<p className="mt-1 text-sm text-muted">{t("welcome.host.text")}</p>
|
||||||
|
</button>
|
||||||
|
<button onClick={onConnect} className="cursor-pointer rounded-card border border-line bg-card/90 p-7 text-left transition-colors hover:border-gold/60">
|
||||||
|
<Globe className="mb-4 h-7 w-7 text-gold" aria-hidden />
|
||||||
|
<h2 className="text-lg font-semibold">{t("welcome.connect.title")}</h2>
|
||||||
|
<p className="mt-1 text-sm text-muted">{t("welcome.connect.text")}</p>
|
||||||
|
</button>
|
||||||
|
</> : <>
|
||||||
<button
|
<button
|
||||||
onClick={onInstall}
|
onClick={onInstall}
|
||||||
className="cursor-pointer rounded-card border border-line bg-card/90 p-7 text-left shadow-[0_8px_30px_rgb(0_0_0/0.28)] transition-colors hover:border-gold/60"
|
className="cursor-pointer rounded-card border border-line bg-card/90 p-7 text-left shadow-[0_8px_30px_rgb(0_0_0/0.28)] transition-colors hover:border-gold/60"
|
||||||
@@ -34,10 +48,11 @@ export function Welcome({ onImport, onInstall, onBack }: { onImport: () => void;
|
|||||||
{t("welcome.import.text")}
|
{t("welcome.import.text")}
|
||||||
</p>
|
</p>
|
||||||
</button>
|
</button>
|
||||||
|
</>}
|
||||||
</div>
|
</div>
|
||||||
{onBack && (
|
{(hosting || onBack) && (
|
||||||
<button onClick={onBack} className="mt-8 cursor-pointer text-sm text-muted hover:text-ink">
|
<button onClick={hosting ? () => setHosting(false) : onBack} className="mt-8 cursor-pointer text-sm text-muted hover:text-ink">
|
||||||
{t("welcome.back")}
|
{t(hosting ? "client.dl.back" : "welcome.back")}
|
||||||
</button>
|
</button>
|
||||||
)}
|
)}
|
||||||
</main>
|
</main>
|
||||||
|
|||||||
@@ -0,0 +1,69 @@
|
|||||||
|
// Validate the module controls independently of the server/bot schema overlays.
|
||||||
|
import { readFileSync } from "node:fs";
|
||||||
|
import { stripTypeScriptTypes } from "node:module";
|
||||||
|
const root = new URL("../", import.meta.url);
|
||||||
|
let source = readFileSync(new URL("src/lib/moduleSettings.ts", root), "utf8");
|
||||||
|
source = source.replace(/import (\w+) from "(\.\.\/\.\.\/[^"\n]+\.json)";/g, (_, name, path) => {
|
||||||
|
const data = JSON.parse(readFileSync(new URL(path, new URL("src/lib/", root)), "utf8"));
|
||||||
|
return `const ${name} = ${JSON.stringify(data)};`;
|
||||||
|
});
|
||||||
|
const compiled = stripTypeScriptTypes(source);
|
||||||
|
const { moduleSettingDefinitions, moduleField, canonicalModuleValue, auctionTypeChanges, auctionCategorySettings, auctionCategories, auctionQualities } = await import(`data:text/javascript;base64,${Buffer.from(compiled).toString("base64")}`);
|
||||||
|
const ids = new Set();
|
||||||
|
for (const field of moduleSettingDefinitions) {
|
||||||
|
if (ids.has(field.key)) throw new Error(`Duplicate module setting: ${field.key}`);
|
||||||
|
ids.add(field.key);
|
||||||
|
for (const [label, translations] of [["title", field.title], ["description", field.description], ...(field.options ?? []).map(o => [o.value, o.label])]) {
|
||||||
|
if (translations.length !== 6 || translations.some(t => !t?.trim())) throw new Error(`${field.key}: incomplete ${label}`);
|
||||||
|
}
|
||||||
|
if (field.min !== undefined && field.max !== undefined && field.min > field.max) throw new Error(`${field.key}: invalid range`);
|
||||||
|
}
|
||||||
|
for (const [value, expected] of [["0", "None"], ["1", "Light"], ["2", "Full"], ['"light"', "Light"]]) {
|
||||||
|
if (canonicalModuleValue("CoAContentScaling.SoloAssist.Mode", value) !== expected) throw new Error(`Solo mode alias: ${value}`);
|
||||||
|
}
|
||||||
|
const difficulty = moduleField("CoAContentScaling.Difficulty.DamageMultiplier", "ru");
|
||||||
|
if (difficulty.type !== "range" || difficulty.min !== 0.25 || difficulty.max !== 2) throw new Error("Damage slider bounds disagree with the server");
|
||||||
|
for (const key of ["CoAContentScaling.LFG.AllowPartialGroups", "CoAContentScaling.World.Leech.Enable"]) {
|
||||||
|
if (moduleField(key, "ru")?.type !== "bool") throw new Error(`${key}: expected a toggle`);
|
||||||
|
}
|
||||||
|
const leech = moduleField("CoAContentScaling.World.Leech.Percent", "ru");
|
||||||
|
if (leech?.type !== "float" || leech.min !== 0 || leech.max !== 100 || leech.advanced) throw new Error("Life steal must use a visible percentage field from 0 to 100");
|
||||||
|
const sample = [
|
||||||
|
{ key: "AuctionHouseBot.ListProportion.CategoryWeapon.QualityNormal", value: "20", default: "10" },
|
||||||
|
{ key: "AuctionHouseBot.ListProportion.CategoryWeapon.QualityRare", value: "7", default: "5" },
|
||||||
|
{ key: "AuctionHouseBot.ListProportion.CategoryArmor.QualityNormal", value: "50", default: "50" },
|
||||||
|
];
|
||||||
|
const weapon = auctionCategorySettings(sample, "Weapon");
|
||||||
|
const off = auctionTypeChanges(weapon, false);
|
||||||
|
if (Object.keys(off).length !== 2 || Object.values(off).some(v => v !== "0")) throw new Error("Turning off a type must exclude all its qualities, and only that type");
|
||||||
|
const remembered = Object.fromEntries(weapon.map(item => [item.key, item.value]));
|
||||||
|
if (JSON.stringify(auctionTypeChanges(weapon, true, remembered)) !== JSON.stringify(remembered)) throw new Error("Custom weights must survive off/on");
|
||||||
|
const defaults = auctionTypeChanges(weapon, true);
|
||||||
|
if (defaults[weapon[0].key] !== "10" || defaults[weapon[1].key] !== "5") throw new Error("Enabling a type must restore documented weights");
|
||||||
|
const zero = weapon.map(item => ({...item, value: "0", default: "0"}));
|
||||||
|
const enabledZero = auctionTypeChanges(zero, true);
|
||||||
|
if (enabledZero[weapon[0].key] !== "1" || enabledZero[weapon[1].key] !== "0") throw new Error("Zero-default types must become enabled without adding missing keys");
|
||||||
|
for (const label of [...Object.values(auctionCategories), ...Object.values(auctionQualities)]) if (label.length !== 6 || label.some(t => !t)) throw new Error("Incomplete auction type/quality translation");
|
||||||
|
console.log(`${ids.size} module controls: all six languages, unique keys, ranges and legacy aliases verified`);
|
||||||
|
let squidSource = readFileSync(new URL("src/lib/squidSettings.ts", root), "utf8");
|
||||||
|
squidSource = squidSource.replace('import { moduleField } from "@/lib/moduleSettings";', `import { moduleField } from "data:text/javascript;base64,${Buffer.from(compiled).toString("base64")}";`);
|
||||||
|
const { squidSettingsView } = await import(`data:text/javascript;base64,${Buffer.from(stripTypeScriptTypes(squidSource)).toString("base64")}`);
|
||||||
|
const squidSample = [
|
||||||
|
{ key: "AiPlayerbot.Enabled", value: "1", default: "0", doc: "" },
|
||||||
|
{ key: "PlayerbotsDatabaseInfo", value: "private connection", default: "", doc: "" },
|
||||||
|
{ key: "Playerbots.Updates.EnableDatabases", value: "0", default: "1", doc: "" },
|
||||||
|
{ key: "AiPlayerbot.MaxRandomBots", value: "600", default: "500", doc: "" },
|
||||||
|
{ key: "AiPlayerbot.RandomBotTalk", value: "0", default: "1", doc: "" },
|
||||||
|
{ key: "AiPlayerbot.FollowDistance", value: "1.5", default: "1.5", doc: "" },
|
||||||
|
{ key: "AiPlayerbot.RandomBotAccountPrefix", value: '"rndbot"', default: '"rndbot"', doc: "Account prefix" },
|
||||||
|
];
|
||||||
|
for (const locale of ["en", "ru", "de", "fr", "es", "zh"]) {
|
||||||
|
const view = squidSettingsView(squidSample, locale);
|
||||||
|
if (view.settings.length !== 4 || view.settings.some(s => s.key === "AiPlayerbot.Enabled" || s.key.startsWith("Playerbots"))) throw new Error("Bots must hide master switches and managed connections");
|
||||||
|
const count = view.settings.find(s => s.key === "AiPlayerbot.MaxRandomBots");
|
||||||
|
if (count.value !== 600 || count.default !== 500 || count.category !== "squid.population") throw new Error("SQUID population values/defaults must be numeric and preserved");
|
||||||
|
if (view.settings.find(s => s.key === "AiPlayerbot.RandomBotTalk").value !== false) throw new Error("SQUID switches must use boolean values");
|
||||||
|
if (view.settings.find(s => s.key === "AiPlayerbot.FollowDistance").value !== 1.5) throw new Error("SQUID decimal settings must preserve fractions");
|
||||||
|
if (view.categories.some(c => !c.title)) throw new Error("SQUID categories must be translated");
|
||||||
|
}
|
||||||
|
console.log("SQUID Bots view: typed values, upstream defaults, categories and hidden managed settings verified");
|
||||||
Reference in new issue
Block a user