mirror of
https://github.com/Corfirean/coa-server-manager.git
synced 2026-11-20 03:25:56 +00:00
wip(realms): checkpoint work-in-progress files on branch for clean build provenance
This commit is contained in:
1 parent
aff7659625
commit
b2572d4f7c
22 files changed
+474
-108
No files matched your search
@@ -96,6 +96,9 @@ pub fn run(root: &Path, meta: &InstallMeta) -> Report {
|
||||
if let Some(second) = &o.secondary_world {
|
||||
services.push(("Second world", second));
|
||||
}
|
||||
if let Some(reborn) = &o.reborn_world {
|
||||
services.push(("Warcraft Reborn world", reborn));
|
||||
}
|
||||
for (title, s) in services {
|
||||
let (lvl, text) = match (s.state, &s.conflict) {
|
||||
(ServiceState::Running, _) => (Level::Ok, "Running".to_string()),
|
||||
@@ -639,6 +642,7 @@ fn processes_report(root: &Path, ports: &layout::Ports) -> String {
|
||||
Some(&o.auth),
|
||||
Some(&o.world),
|
||||
o.secondary_world.as_ref(),
|
||||
o.reborn_world.as_ref(),
|
||||
]
|
||||
.into_iter()
|
||||
.flatten()
|
||||
|
||||
@@ -758,6 +758,7 @@ pub fn observe_with(d: &dyn Docker, root: &Path, ports: &Ports) -> Observed {
|
||||
auth: unknown("auth", ports.auth),
|
||||
world: unknown("world", ports.world),
|
||||
secondary_world: None,
|
||||
reborn_world: None,
|
||||
};
|
||||
};
|
||||
let n = cfg.names();
|
||||
@@ -767,6 +768,7 @@ pub fn observe_with(d: &dyn Docker, root: &Path, ports: &Ports) -> Observed {
|
||||
auth: unknown("auth", ports.auth),
|
||||
world: unknown("world", ports.world),
|
||||
secondary_world: None,
|
||||
reborn_world: None,
|
||||
};
|
||||
};
|
||||
let ip = connect_ip(&cfg);
|
||||
@@ -795,6 +797,7 @@ pub fn observe_with(d: &dyn Docker, root: &Path, ports: &Ports) -> Observed {
|
||||
listening(state.get(&n.world), ports.world),
|
||||
),
|
||||
secondary_world: None,
|
||||
reborn_world: None,
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -254,7 +254,7 @@ fn run_inner(root: &Path, verb: Verb, validating_update: bool) -> Result<DriverO
|
||||
let observed = crate::process::observe(&root, &crate::layout::read_ports(&root));
|
||||
for service in [&observed.mysql, &observed.auth, &observed.world]
|
||||
.into_iter()
|
||||
.chain(observed.secondary_world.iter())
|
||||
.chain(observed.extra_worlds())
|
||||
{
|
||||
if let Some(conflict) = &service.conflict {
|
||||
output.push_str(&format!(
|
||||
|
||||
@@ -88,23 +88,27 @@ fn run_elevated(commands: &[String]) -> Result<()> {
|
||||
|
||||
/// Make sure both rules exist (adds only the missing ones) and confirm afterwards.
|
||||
pub fn ensure_rules(ports: &Ports) -> Result<Status> {
|
||||
ensure_rules_with_secondary(ports, None)
|
||||
ensure_rules_with_extra(ports, &[])
|
||||
}
|
||||
|
||||
pub fn ensure_rules_with_secondary(ports: &Ports, secondary: Option<u16>) -> Result<Status> {
|
||||
/// As `ensure_rules`, plus one rule for the world port of each extra realm that runs next to the main one.
|
||||
pub fn ensure_rules_with_extra(ports: &Ports, extra: &[u16]) -> Result<Status> {
|
||||
let have = status();
|
||||
let mut cmds = plan(ports, &have);
|
||||
let second_name = secondary.map(|port| format!("CoA Server Manager - Second World {port}"));
|
||||
if let (Some(port), Some(name)) = (secondary, &second_name) {
|
||||
let extra_names: Vec<String> = extra
|
||||
.iter()
|
||||
.map(|port| format!("CoA Server Manager - Second World {port}"))
|
||||
.collect();
|
||||
for (port, name) in extra.iter().zip(&extra_names) {
|
||||
if !rule_exists(name) {
|
||||
cmds.push(add_cmd(name, port));
|
||||
cmds.push(add_cmd(name, *port));
|
||||
}
|
||||
}
|
||||
if !cmds.is_empty() {
|
||||
run_elevated(&cmds)?;
|
||||
}
|
||||
let now = status();
|
||||
if now.auth && now.world && second_name.as_ref().is_none_or(|name| rule_exists(name)) {
|
||||
if now.auth && now.world && extra_names.iter().all(|name| rule_exists(name)) {
|
||||
Ok(now)
|
||||
} else {
|
||||
Err(Error::Invalid(
|
||||
|
||||
@@ -168,12 +168,16 @@ pub fn apply_realm_address(root: &Path, host: &str) -> Result<()> {
|
||||
return Err(Error::Invalid("That address is not valid.".into()));
|
||||
}
|
||||
let db = Db::from_repack(root, Account::Admin)?;
|
||||
let realm = crate::realms::state(root)?.active.realm_id();
|
||||
let where_realms = if crate::realms::state(root)?.simultaneous {
|
||||
"id IN (1,2)".into()
|
||||
} else {
|
||||
format!("id={realm}")
|
||||
};
|
||||
let state = crate::realms::state(root)?;
|
||||
let mut ids = vec![state.active];
|
||||
ids.extend(state.extra_modes());
|
||||
let where_realms = format!(
|
||||
"id IN ({})",
|
||||
ids.iter()
|
||||
.map(|m| m.realm_id().to_string())
|
||||
.collect::<Vec<_>>()
|
||||
.join(",")
|
||||
);
|
||||
db.query(&format!(
|
||||
"UPDATE acore_auth.realmlist SET address='{host}' WHERE {where_realms};"
|
||||
))?;
|
||||
|
||||
@@ -284,7 +284,7 @@ fn stop_failure(
|
||||
)];
|
||||
for service in [&status.mysql, &status.auth, &status.world]
|
||||
.into_iter()
|
||||
.chain(status.secondary_world.iter())
|
||||
.chain(status.extra_worlds())
|
||||
{
|
||||
if service.state != crate::process::ServiceState::Stopped {
|
||||
details.push(format!(
|
||||
@@ -506,6 +506,7 @@ mod tests {
|
||||
auth: stopped("auth"),
|
||||
world: stopped("world"),
|
||||
secondary_world: None,
|
||||
reborn_world: None,
|
||||
};
|
||||
let outcome = crate::driver::DriverOutcome {
|
||||
ok: false,
|
||||
|
||||
@@ -64,6 +64,16 @@ pub struct Observed {
|
||||
pub auth: ServiceStatus,
|
||||
pub world: ServiceStatus,
|
||||
pub secondary_world: Option<ServiceStatus>,
|
||||
/// The Warcraft Reborn world that starts together with Conquest of Azeroth.
|
||||
#[serde(default)]
|
||||
pub reborn_world: Option<ServiceStatus>,
|
||||
}
|
||||
|
||||
impl Observed {
|
||||
/// The worlds that run next to the primary one.
|
||||
pub fn extra_worlds(&self) -> impl Iterator<Item = &ServiceStatus> {
|
||||
self.secondary_world.iter().chain(self.reborn_world.iter())
|
||||
}
|
||||
}
|
||||
|
||||
pub fn read_state_record(root: &Path, name: &str) -> Option<ProcessIdentity> {
|
||||
@@ -392,20 +402,30 @@ pub fn observe(root: &Path, ports: &Ports) -> Observed {
|
||||
}
|
||||
let listen = listeners();
|
||||
let (world, auth, mysql) = crate::layout::executables(root);
|
||||
let secondary = crate::multiworld::root(root);
|
||||
let secondary_world = if crate::realms::state(root).is_ok_and(|s| s.simultaneous)
|
||||
|| crate::multiworld::is_running(root)
|
||||
{
|
||||
Some(service(
|
||||
&secondary,
|
||||
"world-secondary",
|
||||
secondary.join("Core/worldserver.exe"),
|
||||
crate::layout::read_ports(&secondary).world,
|
||||
&listen,
|
||||
))
|
||||
} else {
|
||||
None
|
||||
use crate::multiworld::Tree;
|
||||
let realm_state = crate::realms::state(root).ok();
|
||||
let extra_world = |tree: Tree, name: &'static str, enabled: bool| {
|
||||
let folder = crate::multiworld::tree_root(root, tree);
|
||||
(enabled || crate::multiworld::tree_running(root, tree)).then(|| {
|
||||
service(
|
||||
&folder,
|
||||
name,
|
||||
folder.join("Core/worldserver.exe"),
|
||||
crate::layout::read_ports(&folder).world,
|
||||
&listen,
|
||||
)
|
||||
})
|
||||
};
|
||||
let secondary_world = extra_world(
|
||||
Tree::Second,
|
||||
"world-secondary",
|
||||
realm_state.as_ref().is_some_and(|s| s.simultaneous),
|
||||
);
|
||||
let reborn_world = extra_world(
|
||||
Tree::Reborn,
|
||||
"world-reborn",
|
||||
realm_state.as_ref().is_some_and(|s| s.with_reborn),
|
||||
);
|
||||
Observed {
|
||||
mysql: service(root, "mysql", mysql, ports.mysql, &listen),
|
||||
auth: service(root, "auth", auth, ports.auth, &listen),
|
||||
@@ -418,6 +438,7 @@ pub fn observe(root: &Path, ports: &Ports) -> Observed {
|
||||
&listen,
|
||||
),
|
||||
secondary_world,
|
||||
reborn_world,
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -154,7 +154,10 @@ pub fn find_access(
|
||||
st.active == crate::realms::Mode::Wildcard
|
||||
|| (st.simultaneous && st.wildcard_created)
|
||||
}
|
||||
crate::realms::Mode::Reborn => st.active == crate::realms::Mode::Reborn,
|
||||
crate::realms::Mode::Reborn => {
|
||||
st.active == crate::realms::Mode::Reborn
|
||||
|| (st.with_reborn && st.reborn_created)
|
||||
}
|
||||
};
|
||||
if !supported {
|
||||
return None;
|
||||
|
||||
+283
-50
@@ -63,15 +63,39 @@ pub struct RealmState {
|
||||
pub wildcard_created: bool,
|
||||
#[serde(default)]
|
||||
pub reborn_created: bool,
|
||||
/// Wildcard starts together with Conquest of Azeroth (the second of the two when Wildcard is the primary realm).
|
||||
#[serde(default)]
|
||||
pub simultaneous: bool,
|
||||
#[serde(default)]
|
||||
pub secondary_world_port: Option<u16>,
|
||||
#[serde(default)]
|
||||
pub secondary_ra_port: Option<u16>,
|
||||
/// Warcraft Reborn starts together with Conquest of Azeroth, which is then the primary realm.
|
||||
#[serde(default)]
|
||||
pub with_reborn: bool,
|
||||
#[serde(default)]
|
||||
pub reborn_world_port: Option<u16>,
|
||||
#[serde(default)]
|
||||
pub reborn_ra_port: Option<u16>,
|
||||
}
|
||||
|
||||
impl RealmState {
|
||||
/// Realms that run as a world of their own next to the primary one.
|
||||
pub fn extra_modes(&self) -> Vec<Mode> {
|
||||
let mut modes = Vec::new();
|
||||
if self.simultaneous {
|
||||
modes.push(if self.active == Mode::Coa {
|
||||
Mode::Wildcard
|
||||
} else {
|
||||
Mode::Coa
|
||||
});
|
||||
}
|
||||
if self.with_reborn {
|
||||
modes.push(Mode::Reborn);
|
||||
}
|
||||
modes
|
||||
}
|
||||
|
||||
pub fn created(&self, mode: Mode) -> bool {
|
||||
match mode {
|
||||
Mode::Coa => true,
|
||||
@@ -101,6 +125,9 @@ pub struct View {
|
||||
pub simultaneous: bool,
|
||||
pub secondary_world_port: Option<u16>,
|
||||
pub secondary_running: bool,
|
||||
pub with_reborn: bool,
|
||||
pub reborn_world_port: Option<u16>,
|
||||
pub reborn_running: bool,
|
||||
}
|
||||
|
||||
pub fn state(root: &Path) -> Result<RealmState> {
|
||||
@@ -139,7 +166,10 @@ pub fn view(root: &Path) -> Result<View> {
|
||||
recovery_pending: root.join(JOURNAL).exists(),
|
||||
simultaneous: s.simultaneous,
|
||||
secondary_world_port: s.secondary_world_port,
|
||||
secondary_running: crate::multiworld::is_running(root),
|
||||
secondary_running: crate::multiworld::tree_running(root, crate::multiworld::Tree::Second),
|
||||
with_reborn: s.with_reborn,
|
||||
reborn_world_port: s.reborn_world_port,
|
||||
reborn_running: crate::multiworld::tree_running(root, crate::multiworld::Tree::Reborn),
|
||||
})
|
||||
}
|
||||
|
||||
@@ -447,6 +477,58 @@ fn create_databases(root: &Path, mode: Mode) -> Result<()> {
|
||||
})
|
||||
}
|
||||
|
||||
/// Create the saved settings and the databases of a realm that was never set up. `before` is the current
|
||||
/// configuration, the base of a new realm while Conquest of Azeroth is the active one.
|
||||
fn create_realm(root: &Path, s: &mut RealmState, mode: Mode, before: &Files) -> Result<()> {
|
||||
if s.created(mode) {
|
||||
return Ok(());
|
||||
}
|
||||
let base = if s.active == Mode::Coa {
|
||||
before.clone()
|
||||
} else {
|
||||
fsx::read_json(&snapshot(root, Mode::Coa))?
|
||||
};
|
||||
let files = match mode {
|
||||
Mode::Wildcard => wildcard_configs(base)?,
|
||||
Mode::Reborn => reborn_configs(base)?,
|
||||
Mode::Coa => unreachable!(),
|
||||
};
|
||||
fsx::atomic_write_json(&snapshot(root, mode), &files)?;
|
||||
create_databases(root, mode)?;
|
||||
match mode {
|
||||
Mode::Wildcard => s.wildcard_created = true,
|
||||
Mode::Reborn => s.reborn_created = true,
|
||||
Mode::Coa => {}
|
||||
}
|
||||
fsx::atomic_write_json(&root.join(STATE), s)?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Set a realm up without making it the active one, so it can start next to the active realm.
|
||||
pub fn ensure_created(root: &Path, mode: Mode) -> Result<()> {
|
||||
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)?;
|
||||
recover(root)?;
|
||||
let mut s = state(root)?;
|
||||
let supported = view(root)?;
|
||||
if mode == Mode::Wildcard && !supported.supported {
|
||||
return Err(Error::Invalid(
|
||||
"Update the server to a build with Wildcard support first.".into(),
|
||||
));
|
||||
}
|
||||
if mode == Mode::Reborn && !supported.reborn_supported {
|
||||
return Err(Error::Invalid(
|
||||
"Update the server to a build with Warcraft Reborn support first.".into(),
|
||||
));
|
||||
}
|
||||
// Verify launcher support before creating databases, as selecting a realm does.
|
||||
prepare_launcher(root)?;
|
||||
let before = configs(root)?;
|
||||
create_realm(root, &mut s, mode, &before)
|
||||
}
|
||||
|
||||
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)?;
|
||||
@@ -467,35 +549,16 @@ pub fn select(root: &Path, mode: Mode) -> Result<View> {
|
||||
"Update the server to a build with Warcraft Reborn support first.".into(),
|
||||
));
|
||||
}
|
||||
if s.simultaneous && mode != s.active {
|
||||
if (s.simultaneous || s.with_reborn) && mode != s.active {
|
||||
return Err(Error::Invalid(
|
||||
"Disable simultaneous startup before switching realms.".into(),
|
||||
"Disable the realms that start together before switching realms.".into(),
|
||||
));
|
||||
}
|
||||
// Verify launcher support before creating databases or changing the selected realm.
|
||||
prepare_launcher(root)?;
|
||||
let before = configs(root)?;
|
||||
fsx::atomic_write_json(&snapshot(root, s.active), &before)?;
|
||||
if !s.created(mode) {
|
||||
let base = if s.active == Mode::Coa {
|
||||
before.clone()
|
||||
} else {
|
||||
fsx::read_json(&snapshot(root, Mode::Coa))?
|
||||
};
|
||||
let files = match mode {
|
||||
Mode::Wildcard => wildcard_configs(base)?,
|
||||
Mode::Reborn => reborn_configs(base)?,
|
||||
Mode::Coa => unreachable!(),
|
||||
};
|
||||
fsx::atomic_write_json(&snapshot(root, mode), &files)?;
|
||||
create_databases(root, mode)?;
|
||||
match mode {
|
||||
Mode::Wildcard => s.wildcard_created = true,
|
||||
Mode::Reborn => s.reborn_created = true,
|
||||
Mode::Coa => {}
|
||||
}
|
||||
fsx::atomic_write_json(&root.join(STATE), &s)?;
|
||||
}
|
||||
create_realm(root, &mut s, mode, &before)?;
|
||||
let target: Files = fsx::read_json(&snapshot(root, mode))?;
|
||||
// The launcher and batch files share this lock; recheck after the potentially long database copy.
|
||||
fs::create_dir_all(root.join(".state"))?;
|
||||
@@ -653,9 +716,46 @@ pub(crate) fn unpatch_launcher(source: &str) -> Option<String> {
|
||||
(check == source).then_some(original)
|
||||
}
|
||||
|
||||
/// The character-creation model the world server advertises for a realm. Every realm has its own database and its own
|
||||
/// entry on Overview, so it advertises exactly one model: a list such as `"coa wcr"` would let players create
|
||||
/// Warcraft Reborn characters in the Conquest of Azeroth realm.
|
||||
fn class_model_for(mode: Mode) -> &'static str {
|
||||
match mode {
|
||||
Mode::Coa => "coa",
|
||||
Mode::Wildcard => "hero",
|
||||
Mode::Reborn => "wcr",
|
||||
}
|
||||
}
|
||||
|
||||
/// The client builds its character-creation screen from `CoA.ClassModel`, so a realm whose setting lacks its own
|
||||
/// model would show the wrong screen (a Conquest of Azeroth realm set to `"hero"` has no classes). The realm chosen in
|
||||
/// the Manager wins: any other setting is replaced by the realm's own model.
|
||||
/// A missing key means the server default, `"coa"`; a missing file is left to the server.
|
||||
fn align_class_model(root: &Path, mode: Mode) -> Result<()> {
|
||||
let path = root.join("Core/configs/modules/coa.conf");
|
||||
let Ok(bytes) = fs::read(&path) else {
|
||||
return Ok(());
|
||||
};
|
||||
let mut conf = ConfFile::parse_bytes(&bytes)?;
|
||||
let current = conf
|
||||
.get("CoA.ClassModel")
|
||||
.map(crate::config::parser::unquote)
|
||||
.unwrap_or("coa")
|
||||
.to_string();
|
||||
let wanted = class_model_for(mode);
|
||||
if current.split_whitespace().eq([wanted]) {
|
||||
return Ok(());
|
||||
}
|
||||
conf.set("CoA.ClassModel", &format!("\"{wanted}\""), &[]);
|
||||
fsx::atomic_write(&path, conf.to_text().as_bytes())?;
|
||||
tracing::warn!(realm = mode.name(), from = %current, to = wanted, "CoA.ClassModel did not fit the selected realm and was corrected");
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub fn before_start(root: &Path) -> Result<()> {
|
||||
recover(root)?;
|
||||
let s = state(root)?;
|
||||
align_class_model(root, s.active)?;
|
||||
if !root.join(STATE).exists() {
|
||||
return Ok(());
|
||||
}
|
||||
@@ -665,12 +765,22 @@ pub fn before_start(root: &Path) -> Result<()> {
|
||||
"The installed server build does not support simultaneous Wildcard startup.".into(),
|
||||
));
|
||||
}
|
||||
if s.simultaneous && s.active == Mode::Reborn {
|
||||
if (s.simultaneous || s.with_reborn) && s.active == Mode::Reborn {
|
||||
return Err(Error::Invalid(
|
||||
"Simultaneous startup supports CoA and Wildcard only.".into(),
|
||||
"Realms that start together need Conquest of Azeroth or Wildcard as the main realm.".into(),
|
||||
));
|
||||
}
|
||||
if s.simultaneous {
|
||||
if s.with_reborn && s.active != Mode::Coa {
|
||||
return Err(Error::Invalid(
|
||||
"Warcraft Reborn can start together with Conquest of Azeroth only. Select Conquest of Azeroth first.".into(),
|
||||
));
|
||||
}
|
||||
if s.with_reborn && !view(root)?.reborn_supported {
|
||||
return Err(Error::Invalid(
|
||||
"The installed server build does not support Warcraft Reborn.".into(),
|
||||
));
|
||||
}
|
||||
if s.simultaneous || s.with_reborn {
|
||||
fsx::atomic_write_json(&snapshot(root, s.active), &configs(root)?)?;
|
||||
}
|
||||
if s.active == Mode::Reborn && !view(root)?.reborn_supported {
|
||||
@@ -734,37 +844,38 @@ pub fn setup_realmlist(root: &Path) -> Result<()> {
|
||||
};
|
||||
db.query(&format!("UPDATE acore_auth.realmlist SET port=CASE id WHEN 1 THEN {coa} ELSE {wildcard} END,flag=0 WHERE id IN (1,2);"))?;
|
||||
}
|
||||
if s.with_reborn {
|
||||
let reborn = s
|
||||
.reborn_world_port
|
||||
.ok_or_else(|| Error::Invalid("Warcraft Reborn realm port is missing.".into()))?;
|
||||
db.query(&format!(
|
||||
"UPDATE acore_auth.realmlist SET port={reborn},flag=0 WHERE id={};",
|
||||
Mode::Reborn.realm_id()
|
||||
))?;
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub fn world_port_for_mode(root: &Path, mode: Mode) -> Result<u16> {
|
||||
let ports = crate::layout::read_ports(root);
|
||||
let s = state(root)?;
|
||||
if s.simultaneous {
|
||||
let second = s
|
||||
.secondary_world_port
|
||||
.ok_or_else(|| Error::Invalid("Second realm port is missing.".into()))?;
|
||||
let port = match (s.active, mode) {
|
||||
(Mode::Coa, Mode::Coa) => ports.world,
|
||||
(Mode::Coa, Mode::Wildcard) => second,
|
||||
(Mode::Wildcard, Mode::Wildcard) => ports.world,
|
||||
(Mode::Wildcard, Mode::Coa) => second,
|
||||
_ => {
|
||||
return Err(Error::Invalid(format!(
|
||||
"Unsupported mode {mode:?} for simultaneous hosting (active: {:?})",
|
||||
s.active
|
||||
)))
|
||||
}
|
||||
};
|
||||
Ok(port)
|
||||
} else if mode == s.active {
|
||||
Ok(ports.world)
|
||||
} else {
|
||||
Err(Error::Invalid(format!(
|
||||
"Realm mode {mode:?} is not active (active: {:?}) and simultaneous mode is disabled.",
|
||||
s.active
|
||||
)))
|
||||
if mode == s.active {
|
||||
return Ok(ports.world);
|
||||
}
|
||||
if mode == Mode::Reborn && s.with_reborn && s.active == Mode::Coa {
|
||||
return s
|
||||
.reborn_world_port
|
||||
.ok_or_else(|| Error::Invalid("Warcraft Reborn realm port is missing.".into()));
|
||||
}
|
||||
if s.simultaneous && matches!((s.active, mode), (Mode::Coa, Mode::Wildcard) | (Mode::Wildcard, Mode::Coa)) {
|
||||
return s
|
||||
.secondary_world_port
|
||||
.ok_or_else(|| Error::Invalid("Second realm port is missing.".into()));
|
||||
}
|
||||
Err(Error::Invalid(format!(
|
||||
"Realm mode {mode:?} is not active (active: {:?}) and simultaneous mode is disabled.",
|
||||
s.active
|
||||
)))
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
@@ -838,6 +949,128 @@ mod tests {
|
||||
assert!(guard_module(t.path(), "content-scaling").is_ok());
|
||||
}
|
||||
|
||||
fn write_class_model(root: &Path, text: &str) {
|
||||
fsx::atomic_write(&root.join("Core/configs/modules/coa.conf"), text.as_bytes()).unwrap();
|
||||
}
|
||||
|
||||
fn class_model(root: &Path) -> String {
|
||||
let bytes = fs::read(root.join("Core/configs/modules/coa.conf")).unwrap();
|
||||
ConfFile::parse_bytes(&bytes)
|
||||
.unwrap()
|
||||
.get("CoA.ClassModel")
|
||||
.unwrap_or_default()
|
||||
.to_string()
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_class_model_that_does_not_fit_the_realm_is_replaced_by_the_realms_own() {
|
||||
let t = tempfile::tempdir().unwrap();
|
||||
// No file: left to the server. No key: the server default "coa" applies, which fits Conquest of Azeroth.
|
||||
align_class_model(t.path(), Mode::Coa).unwrap();
|
||||
assert!(!t.path().join("Core/configs/modules/coa.conf").exists());
|
||||
write_class_model(t.path(), "[worldserver]
|
||||
# CoA.ClassModel = \"hero\"
|
||||
");
|
||||
align_class_model(t.path(), Mode::Coa).unwrap();
|
||||
assert_eq!(class_model(t.path()), "");
|
||||
|
||||
write_class_model(t.path(), "# note
|
||||
CoA.ClassModel = \"hero\"
|
||||
CoA.GameModeMask = 0
|
||||
");
|
||||
align_class_model(t.path(), Mode::Coa).unwrap();
|
||||
assert_eq!(
|
||||
fs::read_to_string(t.path().join("Core/configs/modules/coa.conf")).unwrap(),
|
||||
"# note
|
||||
CoA.ClassModel = \"coa\"
|
||||
CoA.GameModeMask = 0
|
||||
"
|
||||
);
|
||||
align_class_model(t.path(), Mode::Wildcard).unwrap();
|
||||
assert_eq!(class_model(t.path()), "\"hero\"");
|
||||
align_class_model(t.path(), Mode::Reborn).unwrap();
|
||||
assert_eq!(class_model(t.path()), "\"wcr\"");
|
||||
|
||||
// A missing key does not fit a realm other than Conquest of Azeroth.
|
||||
write_class_model(t.path(), "[worldserver]
|
||||
");
|
||||
align_class_model(t.path(), Mode::Wildcard).unwrap();
|
||||
assert_eq!(class_model(t.path()), "\"hero\"");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_class_model_list_is_narrowed_to_the_realms_own_model() {
|
||||
let t = tempfile::tempdir().unwrap();
|
||||
// The shipped default serves two models; the realm chosen in the Manager keeps only its own.
|
||||
for (mode, want) in [(Mode::Coa, "\"coa\""), (Mode::Reborn, "\"wcr\"")] {
|
||||
write_class_model(t.path(), "CoA.ClassModel = \"coa wcr\"
|
||||
");
|
||||
align_class_model(t.path(), mode).unwrap();
|
||||
assert_eq!(class_model(t.path()), want);
|
||||
}
|
||||
// A setting that is already exactly right is not rewritten, quoted or not.
|
||||
for (text, mode) in [
|
||||
("CoA.ClassModel = \"coa\"
|
||||
", Mode::Coa),
|
||||
("CoA.ClassModel = hero
|
||||
", Mode::Wildcard),
|
||||
] {
|
||||
write_class_model(t.path(), text);
|
||||
align_class_model(t.path(), mode).unwrap();
|
||||
assert_eq!(
|
||||
fs::read_to_string(t.path().join("Core/configs/modules/coa.conf")).unwrap(),
|
||||
text
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn before_start_aligns_the_class_model_with_the_active_realm() {
|
||||
let t = tempfile::tempdir().unwrap();
|
||||
write_class_model(t.path(), "CoA.ClassModel = \"hero\"
|
||||
");
|
||||
before_start(t.path()).unwrap();
|
||||
assert_eq!(class_model(t.path()), "\"coa\"");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn extra_realms_follow_the_two_switches_and_old_states_still_load() {
|
||||
let old: RealmState = serde_json::from_str(
|
||||
r#"{"active":"coa","wildcard_created":true,"simultaneous":true,"secondary_world_port":8086}"#,
|
||||
)
|
||||
.unwrap();
|
||||
assert!(!old.with_reborn && old.reborn_world_port.is_none());
|
||||
assert_eq!(old.extra_modes(), [Mode::Wildcard]);
|
||||
let mut s = RealmState::default();
|
||||
assert!(s.extra_modes().is_empty());
|
||||
s.with_reborn = true;
|
||||
assert_eq!(s.extra_modes(), [Mode::Reborn]);
|
||||
s.simultaneous = true;
|
||||
assert_eq!(s.extra_modes(), [Mode::Wildcard, Mode::Reborn]);
|
||||
// Wildcard as the main realm still pairs with Conquest of Azeroth.
|
||||
s.active = Mode::Wildcard;
|
||||
s.with_reborn = false;
|
||||
assert_eq!(s.extra_modes(), [Mode::Coa]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn each_running_realm_has_its_own_world_port() {
|
||||
let t = tempfile::tempdir().unwrap();
|
||||
fsx::atomic_write(&t.path().join("Settings/repack.json"), br#"{"worldPort": 8085}"#).unwrap();
|
||||
let write = |json: &str| fsx::atomic_write(&t.path().join(STATE), json.as_bytes()).unwrap();
|
||||
write(r#"{"active":"coa","wildcard_created":true,"reborn_created":true,"simultaneous":true,"secondary_world_port":8086,"with_reborn":true,"reborn_world_port":8087}"#);
|
||||
assert_eq!(world_port_for_mode(t.path(), Mode::Coa).unwrap(), 8085);
|
||||
assert_eq!(world_port_for_mode(t.path(), Mode::Wildcard).unwrap(), 8086);
|
||||
assert_eq!(world_port_for_mode(t.path(), Mode::Reborn).unwrap(), 8087);
|
||||
// Only Reborn next to Conquest of Azeroth: Wildcard is not running anywhere.
|
||||
write(r#"{"active":"coa","wildcard_created":true,"reborn_created":true,"with_reborn":true,"reborn_world_port":8087}"#);
|
||||
assert_eq!(world_port_for_mode(t.path(), Mode::Reborn).unwrap(), 8087);
|
||||
assert!(world_port_for_mode(t.path(), Mode::Wildcard).is_err());
|
||||
// Reborn only pairs with Conquest of Azeroth as the main realm.
|
||||
write(r#"{"active":"wildcard","wildcard_created":true,"reborn_created":true,"with_reborn":true,"reborn_world_port":8087}"#);
|
||||
assert!(world_port_for_mode(t.path(), Mode::Reborn).is_err());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn reborn_support_requires_the_new_code_in_the_installed_binary() {
|
||||
let t = tempfile::tempdir().unwrap();
|
||||
|
||||
@@ -1848,9 +1848,8 @@ impl RepackEnv<'_> {
|
||||
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)
|
||||
&& o.extra_worlds()
|
||||
.all(|s| s.state == ServiceState::Running)
|
||||
{
|
||||
let since = ready_since.get_or_insert_with(std::time::Instant::now);
|
||||
if since.elapsed() >= std::time::Duration::from_secs(10) {
|
||||
|
||||
@@ -18,6 +18,20 @@ const FILES: &[&str] = &[
|
||||
".realms/secondary/Core/configs/worldserver.conf",
|
||||
".realms/secondary/Core/configs/authserver.conf",
|
||||
"Settings/realm-profiles/reborn.json",
|
||||
".realms/reborn/Settings/repack.json",
|
||||
".realms/reborn/Settings/realm-profile.json",
|
||||
".realms/reborn/Settings/worldserver.conf.template",
|
||||
".realms/reborn/Settings/authserver.conf.template",
|
||||
".realms/reborn/Core/configs/worldserver.conf",
|
||||
".realms/reborn/Core/configs/authserver.conf",
|
||||
];
|
||||
|
||||
/// Ports of the extra worlds kept in the realm profile.
|
||||
const REALM_PORT_KEYS: [&str; 4] = [
|
||||
"secondary_world_port",
|
||||
"secondary_ra_port",
|
||||
"reborn_world_port",
|
||||
"reborn_ra_port",
|
||||
];
|
||||
|
||||
#[derive(Serialize, Deserialize)]
|
||||
@@ -62,7 +76,7 @@ pub(crate) fn begin(root: &Path, meta: &Path) -> Result<()> {
|
||||
.collect();
|
||||
if let Some(state) = &realm {
|
||||
excluded.extend(
|
||||
["secondary_world_port", "secondary_ra_port"]
|
||||
REALM_PORT_KEYS
|
||||
.iter()
|
||||
.filter_map(|key| state[*key].as_u64()),
|
||||
);
|
||||
@@ -82,7 +96,7 @@ pub(crate) fn begin(root: &Path, meta: &Path) -> Result<()> {
|
||||
settings[key] = reserve()?.into();
|
||||
}
|
||||
if let Some(state) = &mut realm {
|
||||
for key in ["secondary_world_port", "secondary_ra_port"] {
|
||||
for key in REALM_PORT_KEYS {
|
||||
state[key] = reserve()?.into();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user