mirror of
https://github.com/Corfirean/coa-server-manager.git
synced 2026-11-19 19:25:56 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
fac6ce469a | ||
|
|
f22cedd963 | ||
|
|
0b5f12941c | ||
|
|
f3fc14b55a | ||
|
|
beaec7d27e | ||
|
|
8490dc9983 | ||
|
|
3f8abcbbe8 | ||
|
|
b3c50a7b39 | ||
|
|
bbdad37e40 | ||
|
|
0ed4d5e268 | ||
|
|
b13ee55bb9 | ||
|
|
51a45db8cb | ||
|
|
3f700ee8f4 | ||
|
|
f25a1d425d | ||
|
|
b5e4a38d7d |
No files matched your search
Generated
+14
-3
@@ -491,7 +491,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "coa-core"
|
name = "coa-core"
|
||||||
version = "0.6.5"
|
version = "0.6.6"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"base64 0.22.1",
|
"base64 0.22.1",
|
||||||
"chrono",
|
"chrono",
|
||||||
@@ -499,6 +499,7 @@ dependencies = [
|
|||||||
"ed25519-dalek",
|
"ed25519-dalek",
|
||||||
"fs4",
|
"fs4",
|
||||||
"hex",
|
"hex",
|
||||||
|
"if-addrs",
|
||||||
"num-bigint",
|
"num-bigint",
|
||||||
"rand_core",
|
"rand_core",
|
||||||
"reqwest 0.12.28",
|
"reqwest 0.12.28",
|
||||||
@@ -519,7 +520,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "coa-release"
|
name = "coa-release"
|
||||||
version = "0.6.5"
|
version = "0.6.6"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"chrono",
|
"chrono",
|
||||||
"coa-core",
|
"coa-core",
|
||||||
@@ -528,7 +529,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "coa-server-manager"
|
name = "coa-server-manager"
|
||||||
version = "0.6.5"
|
version = "0.6.6"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"coa-core",
|
"coa-core",
|
||||||
"serde",
|
"serde",
|
||||||
@@ -1913,6 +1914,16 @@ dependencies = [
|
|||||||
"icu_properties",
|
"icu_properties",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "if-addrs"
|
||||||
|
version = "0.15.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "c0a05c691e1fae256cf7013d99dad472dc52d5543322761f83ec8d47eab40d2b"
|
||||||
|
dependencies = [
|
||||||
|
"libc",
|
||||||
|
"windows-sys 0.61.2",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "indexmap"
|
name = "indexmap"
|
||||||
version = "1.9.3"
|
version = "1.9.3"
|
||||||
|
|||||||
+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.5"
|
version = "0.6.6"
|
||||||
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: Install a server from a package on Linux, running in Docker (experimental)
|
||||||
|
---
|
||||||
|
Experimental. The Manager creates the database, imports the packaged baseline and starts the server in Docker containers. It needs a Linux server package and your own game data folder.
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: changed
|
||||||
|
audience: admins
|
||||||
|
title: The Auction House Bot card no longer asks for a character GUID
|
||||||
|
---
|
||||||
|
Turning the module and the seller on is enough: a server build with the automatic auction character creates its own account and character. The GUID field moved to the advanced settings.
|
||||||
|
The buyer option hint no longer says it spends the auction character's gold.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: fixed
|
||||||
|
audience: admins
|
||||||
|
title: Choose and remember the local network address friends use to connect
|
||||||
|
---
|
||||||
|
Select an adapter or custom IPv4 address when sharing on LAN. Your choice survives restarts and mode changes; unavailable addresses show a warning instead of silently switching adapters.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: added
|
||||||
|
audience: admins
|
||||||
|
title: The NPC Enchanter card explains how to place and remove the NPC
|
||||||
|
---
|
||||||
|
The card now shows the two commands: `.npc add 601015` where you stand, and `.npc delete` on the targeted NPC.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: fixed
|
||||||
|
audience: admins
|
||||||
|
title: Diagnostic files with database checks stay readable after secrets are removed
|
||||||
|
---
|
||||||
|
Removing a line that mentioned a secret could break the JSON files in a diagnostic package. Secret values are now replaced instead, so the files stay valid.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: added
|
||||||
|
audience: admins
|
||||||
|
title: One button collects all diagnostics, including crashes and Windows crash records
|
||||||
|
---
|
||||||
|
Report a problem collects logs, crash reports and small dumps, Windows crash records, update journals and the running server programs in one file, then shows its folder. Crashes without a server crash report are no longer missing.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: added
|
||||||
|
audience: admins
|
||||||
|
title: Problem reports go to the right project
|
||||||
|
---
|
||||||
|
Choose what the problem is about: Manager and other modules, CoA Companions, or SQUID Playerbots. The report opens in that project's GitHub page with the versions filled in. The bot system that is switched on is preselected.
|
||||||
@@ -25,6 +25,7 @@ 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"
|
tempfile = "3"
|
||||||
|
if-addrs = "0.15"
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
rand_core = { version = "0.6", features = ["getrandom"] }
|
rand_core = { version = "0.6", features = ["getrandom"] }
|
||||||
|
|||||||
@@ -0,0 +1,21 @@
|
|||||||
|
//! Install a new Docker server from a package folder, for a manual end-to-end check on Linux (needs docker).
|
||||||
|
//! usage: docker_install <package folder> <destination> <game data folder> <public key (base64)>
|
||||||
|
//! The key is the one the package was signed with (the production key is only used by the Manager itself).
|
||||||
|
use coa_core::docker::install::{install, Params};
|
||||||
|
use coa_core::download::Cancel;
|
||||||
|
use coa_core::install::Source;
|
||||||
|
use coa_core::registry::Registry;
|
||||||
|
use std::path::PathBuf;
|
||||||
|
|
||||||
|
fn main() {
|
||||||
|
let a: Vec<String> = std::env::args().skip(1).collect();
|
||||||
|
assert!(a.len() == 4, "usage: docker_install <package folder> <destination> <game data folder> <public key>");
|
||||||
|
let registry = Registry::at(std::env::temp_dir().join("coa-docker-install/installs.json"));
|
||||||
|
let t = std::time::Instant::now();
|
||||||
|
let done = install(
|
||||||
|
&Params { source: Source::Dir(PathBuf::from(&a[0])), dest: PathBuf::from(&a[1]), data_dir: PathBuf::from(&a[2]), trusted_key: &a[3], registry: ®istry, cancel: Cancel::default() },
|
||||||
|
&|s| eprintln!(" {:>3}% {} {}", s.percent, s.step, s.detail.unwrap_or_default()),
|
||||||
|
)
|
||||||
|
.unwrap_or_else(|e| panic!("install failed: {e}"));
|
||||||
|
println!("installed {} at {} in {:?}", done.version, done.path, t.elapsed());
|
||||||
|
}
|
||||||
+261
-5
@@ -172,19 +172,158 @@ pub fn squash_repeated_config_warnings(text: &str) -> String {
|
|||||||
s
|
s
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const SENSITIVE: [&str; 7] = ["password", "passwd", "secret", "token", "apikey", "api_key", "databaseinfo"];
|
||||||
|
|
||||||
/// Remove things that must never leave the machine from log text.
|
/// Remove things that must never leave the machine from log text.
|
||||||
pub fn redact(text: &str) -> String {
|
pub fn redact(text: &str) -> String {
|
||||||
let mut out = Vec::new();
|
let mut out = Vec::new();
|
||||||
for line in text.lines() {
|
for line in text.lines() {
|
||||||
let l = line.to_lowercase();
|
let l = line.to_lowercase();
|
||||||
let sensitive = ["password", "passwd", "secret", "token", "apikey", "api_key", "databaseinfo"].iter().any(|k| l.contains(k));
|
let sensitive = SENSITIVE.iter().any(|k| l.contains(k));
|
||||||
out.push(if sensitive { "[line removed: may contain a secret]".to_string() } else { line.to_string() });
|
out.push(if sensitive { "[line removed: may contain a secret]".to_string() } else { line.to_string() });
|
||||||
}
|
}
|
||||||
out.join("\n")
|
out.join("\n")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// The same for JSON: values under a sensitive key and strings that look like `password=...` are replaced, and the
|
||||||
|
/// result stays valid JSON (removing a whole line would break the file for whoever reads it). Text that is not JSON
|
||||||
|
/// falls back to the line rule.
|
||||||
|
pub fn redact_json(text: &str) -> String {
|
||||||
|
fn scrub(v: &mut serde_json::Value) {
|
||||||
|
use serde_json::Value;
|
||||||
|
match v {
|
||||||
|
Value::Object(map) => {
|
||||||
|
for (key, value) in map.iter_mut() {
|
||||||
|
let k = key.to_lowercase();
|
||||||
|
if SENSITIVE.iter().any(|s| k.contains(s)) && !value.is_object() && !value.is_array() {
|
||||||
|
*value = Value::String("[redacted]".into());
|
||||||
|
} else {
|
||||||
|
scrub(value);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Value::Array(items) => items.iter_mut().for_each(scrub),
|
||||||
|
Value::String(s) => {
|
||||||
|
let l = s.to_lowercase();
|
||||||
|
if ["password=", "passwd=", "secret=", "token=", "apikey=", "api_key=", "password:"].iter().any(|k| l.contains(k)) {
|
||||||
|
*s = "[redacted]".into();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
_ => {}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
match serde_json::from_str::<serde_json::Value>(text) {
|
||||||
|
Ok(mut v) => {
|
||||||
|
scrub(&mut v);
|
||||||
|
serde_json::to_string_pretty(&v).unwrap_or_else(|_| redact(text))
|
||||||
|
}
|
||||||
|
Err(_) => redact(text),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Keep the events of a `wevtutil ... /f:text` listing that mention one of `needles` (compared without case), in the
|
||||||
|
/// order listed, at most `max` of them.
|
||||||
|
pub fn filter_event_blocks(listing: &str, needles: &[&str], max: usize) -> String {
|
||||||
|
let mut blocks: Vec<Vec<&str>> = Vec::new();
|
||||||
|
for line in listing.lines() {
|
||||||
|
if line.starts_with("Event[") || blocks.is_empty() {
|
||||||
|
blocks.push(Vec::new());
|
||||||
|
}
|
||||||
|
if let Some(b) = blocks.last_mut() { b.push(line); }
|
||||||
|
}
|
||||||
|
blocks
|
||||||
|
.into_iter()
|
||||||
|
.map(|b| b.join("\n"))
|
||||||
|
.filter(|b| { let l = b.to_lowercase(); needles.iter().any(|n| l.contains(n)) })
|
||||||
|
.take(max)
|
||||||
|
.collect::<Vec<_>>()
|
||||||
|
.join("\n\n")
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Drop the lines of an event listing that name the person or the computer.
|
||||||
|
pub fn drop_identity_lines(listing: &str) -> String {
|
||||||
|
listing
|
||||||
|
.lines()
|
||||||
|
.filter(|l| { let t = l.trim_start(); !(t.starts_with("User:") || t.starts_with("User Name:") || t.starts_with("Computer:")) })
|
||||||
|
.collect::<Vec<_>>()
|
||||||
|
.join("\n")
|
||||||
|
}
|
||||||
|
|
||||||
|
/// `wevtutil /uni:true` writes UTF-16 with a byte order mark; anything else is read as UTF-8 (lossy).
|
||||||
|
fn decode_console_output(bytes: &[u8]) -> String {
|
||||||
|
if bytes.starts_with(&[0xFF, 0xFE]) {
|
||||||
|
let units: Vec<u16> = bytes[2..].chunks_exact(2).map(|c| u16::from_le_bytes([c[0], c[1]])).collect();
|
||||||
|
String::from_utf16_lossy(&units)
|
||||||
|
} else {
|
||||||
|
String::from_utf8_lossy(bytes).into_owned()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Crashes and hangs Windows recorded for the server programs in the last two weeks. This is the only trace of a crash
|
||||||
|
/// that ends the process without the server's own crash report (a stack buffer overrun, for example). The lines that
|
||||||
|
/// name the user and the computer are left out.
|
||||||
|
#[cfg(windows)]
|
||||||
|
fn windows_events() -> String {
|
||||||
|
use std::os::windows::process::CommandExt;
|
||||||
|
let query = "*[System[(Provider[@Name='Application Error' or @Name='Windows Error Reporting' or @Name='Application Hang']) and TimeCreated[timediff(@SystemTime) <= 1209600000]]]";
|
||||||
|
let out = std::process::Command::new("wevtutil")
|
||||||
|
.args(["qe", "Application", &format!("/q:{query}"), "/c:300", "/rd:true", "/f:text", "/uni:true"])
|
||||||
|
.creation_flags(0x0800_0000)
|
||||||
|
.output();
|
||||||
|
match out {
|
||||||
|
Ok(o) if o.status.success() => {
|
||||||
|
let text = filter_event_blocks(&decode_console_output(&o.stdout), &["worldserver", "authserver", "mysqld", "coa server manager", "coa-server-manager"], 40);
|
||||||
|
if text.is_empty() { "No crash or hang of the server programs was recorded by Windows in the last 14 days.".into() } else { drop_identity_lines(&text) }
|
||||||
|
}
|
||||||
|
Ok(o) => format!("Windows event log could not be read: {}", decode_console_output(&o.stderr).trim()),
|
||||||
|
Err(e) => format!("Windows event log could not be read: {e}"),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(not(windows))]
|
||||||
|
fn windows_events() -> String {
|
||||||
|
String::new()
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Newest files of a folder with the given extension (compared without case): path, size, modified time.
|
||||||
|
fn newest_files(dir: &Path, ext: &str, limit: usize) -> Vec<(PathBuf, u64, std::time::SystemTime)> {
|
||||||
|
let Ok(rd) = fs::read_dir(dir) else { return Vec::new() };
|
||||||
|
let mut v: Vec<_> = rd
|
||||||
|
.flatten()
|
||||||
|
.filter(|e| e.path().extension().is_some_and(|x| x.eq_ignore_ascii_case(ext)))
|
||||||
|
.filter_map(|e| { let m = e.metadata().ok()?; m.is_file().then(|| (e.path(), m.len(), m.modified().unwrap_or(std::time::UNIX_EPOCH))) })
|
||||||
|
.collect();
|
||||||
|
v.sort_by(|a, b| b.2.cmp(&a.2));
|
||||||
|
v.truncate(limit);
|
||||||
|
v
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Which server programs run right now and from where, next to what the Manager made of it. A program started from a
|
||||||
|
/// folder or a copy the Manager does not know shows up here even when the Manager reports "port in use".
|
||||||
|
fn processes_report(root: &Path, ports: &layout::Ports) -> String {
|
||||||
|
let here = root.to_string_lossy().to_lowercase().replace('/', "\\");
|
||||||
|
let listen = process::listeners_detailed();
|
||||||
|
let mut out = String::from("Server programs running now (any folder):\n");
|
||||||
|
let found = process::find_by_file_names(&["worldserver.exe", "authserver.exe", "mysqld.exe"]);
|
||||||
|
if found.is_empty() { out.push_str(" none\n"); }
|
||||||
|
for p in found {
|
||||||
|
let ports_of: Vec<String> = listen.iter().filter(|l| l.pid == p.pid).map(|l| l.port.to_string()).collect();
|
||||||
|
let inside = p.exe.to_lowercase().replace('/', "\\").starts_with(&here);
|
||||||
|
out.push_str(&format!(" pid {} {} | listening on: {} | {}\n", p.pid, p.exe, if ports_of.is_empty() { "-".into() } else { ports_of.join(", ") }, if inside { "inside this server folder" } else { "OUTSIDE this server folder" }));
|
||||||
|
}
|
||||||
|
let o = process::observe(root, ports);
|
||||||
|
out.push_str("\nThe Manager's view:\n");
|
||||||
|
for s in [Some(&o.mysql), Some(&o.auth), Some(&o.world), o.secondary_world.as_ref()].into_iter().flatten() {
|
||||||
|
out.push_str(&format!(" {:<16} {:?} port {} {}{}\n", s.name, s.state, s.port, s.pid.map(|p| format!("pid {p}")).unwrap_or_default(), s.conflict.as_ref().map(|c| format!(" | port held by pid {} {}", c.pid, c.exe.clone().unwrap_or_default())).unwrap_or_default()));
|
||||||
|
}
|
||||||
|
out
|
||||||
|
}
|
||||||
|
|
||||||
/// Zip with what a maintainer needs to debug a problem, with secrets removed. Returns the number of files inside.
|
/// Zip with what a maintainer needs to debug a problem, with secrets removed. Returns the number of files inside.
|
||||||
|
/// One call collects everything: the Manager's and the server's logs, crash reports and small crash dumps, Windows'
|
||||||
|
/// own record of crashes, the update journals, the running server programs and the settings the client depends on.
|
||||||
pub fn export_package(root: &Path, meta_dir: &Path, manager_log: &Path, meta: &InstallMeta, report: &Report, out_zip: &Path) -> Result<usize> {
|
pub fn export_package(root: &Path, meta_dir: &Path, manager_log: &Path, meta: &InstallMeta, report: &Report, out_zip: &Path) -> Result<usize> {
|
||||||
|
const DUMP_FILE_MAX: u64 = 30 * 1024 * 1024;
|
||||||
let file = fs::File::create(out_zip)?;
|
let file = fs::File::create(out_zip)?;
|
||||||
let mut zip = zip::ZipWriter::new(file);
|
let mut zip = zip::ZipWriter::new(file);
|
||||||
let opts = zip::write::SimpleFileOptions::default().compression_method(zip::CompressionMethod::Deflated);
|
let opts = zip::write::SimpleFileOptions::default().compression_method(zip::CompressionMethod::Deflated);
|
||||||
@@ -195,8 +334,10 @@ pub fn export_package(root: &Path, meta_dir: &Path, manager_log: &Path, meta: &I
|
|||||||
n += 1;
|
n += 1;
|
||||||
Ok(())
|
Ok(())
|
||||||
};
|
};
|
||||||
|
let ports = layout::read_ports(root);
|
||||||
let summary = serde_json::json!({
|
let summary = serde_json::json!({
|
||||||
"manager": crate::MANAGER_VERSION,
|
"manager": crate::MANAGER_VERSION,
|
||||||
|
"exported_utc": chrono::Utc::now().to_rfc3339(),
|
||||||
"core": meta.core,
|
"core": meta.core,
|
||||||
"bots": meta.bots,
|
"bots": meta.bots,
|
||||||
"squid_bots": crate::squid::release(root),
|
"squid_bots": crate::squid::release(root),
|
||||||
@@ -206,7 +347,25 @@ pub fn export_package(root: &Path, meta_dir: &Path, manager_log: &Path, meta: &I
|
|||||||
"wow_client_set": meta.client_path.is_some(),
|
"wow_client_set": meta.client_path.is_some(),
|
||||||
});
|
});
|
||||||
add("summary.json", serde_json::to_string_pretty(&summary)?.as_bytes())?;
|
add("summary.json", serde_json::to_string_pretty(&summary)?.as_bytes())?;
|
||||||
for (name, path) in [("manager.log", manager_log.to_path_buf()), ("manager-install.log", meta_dir.join("logs/manager.log")), ("Server.log.tail", root.join("Core/Logs/Server.log")), ("Errors.log.tail", root.join("Core/Logs/Errors.log")), ("Auth.log.tail", root.join("Core/Logs/Auth.log")), ("world-console.log.tail", root.join("Core/Logs/world-console.log")), ("mysql-error.log.tail", root.join("mysql/logs/mysql-error.log"))] {
|
|
||||||
|
// Logs. The newest update logs of the repack's own updater are added under their own names.
|
||||||
|
let mut logs: Vec<(String, PathBuf)> = vec![
|
||||||
|
("manager.log".into(), manager_log.to_path_buf()),
|
||||||
|
("manager-install.log".into(), meta_dir.join("logs/manager.log")),
|
||||||
|
("Server.log.tail".into(), root.join("Core/Logs/Server.log")),
|
||||||
|
("Errors.log.tail".into(), root.join("Core/Logs/Errors.log")),
|
||||||
|
("Auth.log.tail".into(), root.join("Core/Logs/Auth.log")),
|
||||||
|
("world-console.log.tail".into(), root.join("Core/Logs/world-console.log")),
|
||||||
|
("CoaBots.log.tail".into(), root.join("Core/Logs/CoaBots.log")),
|
||||||
|
("Playerbots.log.tail".into(), root.join("Core/Logs/Playerbots.log")),
|
||||||
|
("supervisor.log.tail".into(), root.join("Core/Logs/supervisor.log")),
|
||||||
|
("mysql-error.log.tail".into(), root.join("mysql/logs/mysql-error.log")),
|
||||||
|
];
|
||||||
|
let updater_logs = newest_files(&root.join("Core/Logs"), "log", usize::MAX).into_iter().filter(|(p, _, _)| p.file_name().is_some_and(|f| f.to_string_lossy().to_lowercase().starts_with("update-")));
|
||||||
|
for (p, _, _) in updater_logs.take(2) {
|
||||||
|
logs.push((format!("{}.tail", p.file_name().unwrap_or_default().to_string_lossy()), p));
|
||||||
|
}
|
||||||
|
for (name, path) in logs {
|
||||||
// A module that reads a missing setting on every tick fills a log with one warning, thousands of times; read far
|
// A module that reads a missing setting on every tick fills a log with one warning, thousands of times; read far
|
||||||
// enough back to see past that, fold the repeats, then keep the last part.
|
// enough back to see past that, fold the repeats, then keep the last part.
|
||||||
let bytes = tail(&path, 8 * 1024 * 1024);
|
let bytes = tail(&path, 8 * 1024 * 1024);
|
||||||
@@ -214,9 +373,44 @@ pub fn export_package(root: &Path, meta_dir: &Path, manager_log: &Path, meta: &I
|
|||||||
let text = squash_repeated_config_warnings(&String::from_utf8_lossy(&bytes));
|
let text = squash_repeated_config_warnings(&String::from_utf8_lossy(&bytes));
|
||||||
let keep = text.len().saturating_sub(512 * 1024);
|
let keep = text.len().saturating_sub(512 * 1024);
|
||||||
let start = (keep..text.len()).find(|i| text.is_char_boundary(*i)).unwrap_or(text.len());
|
let start = (keep..text.len()).find(|i| text.is_char_boundary(*i)).unwrap_or(text.len());
|
||||||
add(name, redact(&text[start..]).as_bytes())?;
|
add(&name, redact(&text[start..]).as_bytes())?;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Crash reports of the server (text, and the small dumps next to them), and what Windows recorded for the programs.
|
||||||
|
let crashes = root.join("Core/Crashes");
|
||||||
|
let mut listing = String::new();
|
||||||
|
for (p, len, _) in newest_files(&crashes, "txt", 10) {
|
||||||
|
let name = p.file_name().unwrap_or_default().to_string_lossy().into_owned();
|
||||||
|
listing.push_str(&format!("{name} ({len} bytes)\n"));
|
||||||
|
let text = String::from_utf8_lossy(&tail(&p, 1024 * 1024)).into_owned();
|
||||||
|
add(&format!("crashes/{name}"), redact(&text).as_bytes())?;
|
||||||
|
}
|
||||||
|
for (p, len, _) in newest_files(&crashes, "dmp", 3) {
|
||||||
|
let name = p.file_name().unwrap_or_default().to_string_lossy().into_owned();
|
||||||
|
if len > DUMP_FILE_MAX {
|
||||||
|
listing.push_str(&format!("{name} ({len} bytes) not included: larger than {} MB\n", DUMP_FILE_MAX >> 20));
|
||||||
|
} else if let Ok(bytes) = fs::read(&p) {
|
||||||
|
listing.push_str(&format!("{name} ({len} bytes) included\n"));
|
||||||
|
add(&format!("crashes/{name}"), &bytes)?;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
add("crashes.txt", if listing.is_empty() { "No crash reports in Core/Crashes.".to_string() } else { listing }.as_bytes())?;
|
||||||
|
let events = windows_events();
|
||||||
|
if !events.is_empty() { add("windows-events.txt", events.as_bytes())?; }
|
||||||
|
add("processes.txt", processes_report(root, &ports).as_bytes())?;
|
||||||
|
|
||||||
|
// The newest update journals: the state of each update and the reason it failed.
|
||||||
|
let mut journals: Vec<_> = fs::read_dir(meta_dir.join("updates")).into_iter().flatten().flatten()
|
||||||
|
.filter(|e| e.file_type().is_ok_and(|t| t.is_dir()) && e.file_name().to_string_lossy().chars().all(|c| c.is_ascii_alphanumeric() || matches!(c, '-' | '_')))
|
||||||
|
.collect();
|
||||||
|
journals.sort_by_key(|e| std::cmp::Reverse(e.file_name()));
|
||||||
|
for e in journals.into_iter().take(5) {
|
||||||
|
if let Ok(text) = fs::read_to_string(e.path().join("txn.json")) {
|
||||||
|
add(&format!("updates/{}-txn.json", e.file_name().to_string_lossy()), redact_json(&text).as_bytes())?;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Which files the server's own configuration folders hold, and the two CoA switches that decide whether the game
|
// Which files the server's own configuration folders hold, and the two CoA switches that decide whether the game
|
||||||
// client can talk to the world server at all.
|
// client can talk to the world server at all.
|
||||||
let mut present = String::new();
|
let mut present = String::new();
|
||||||
@@ -244,10 +438,10 @@ pub fn export_package(root: &Path, meta_dir: &Path, manager_log: &Path, meta: &I
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if let Ok(b) = fs::read(root.join("RELEASE.json")) {
|
if let Ok(b) = fs::read(root.join("RELEASE.json")) {
|
||||||
add("RELEASE.json", redact(&String::from_utf8_lossy(&b)).as_bytes())?;
|
add("RELEASE.json", redact_json(&String::from_utf8_lossy(&b)).as_bytes())?;
|
||||||
}
|
}
|
||||||
if let Ok(b) = fs::read(meta_dir.join("logs/database-checks.json")) {
|
if let Ok(b) = fs::read(meta_dir.join("logs/database-checks.json")) {
|
||||||
add("database-checks.json", redact(&String::from_utf8_lossy(&b)).as_bytes())?;
|
add("database-checks.json", redact_json(&String::from_utf8_lossy(&b)).as_bytes())?;
|
||||||
}
|
}
|
||||||
zip.finish().map_err(|e| Error::Invalid(e.to_string()))?;
|
zip.finish().map_err(|e| Error::Invalid(e.to_string()))?;
|
||||||
Ok(n)
|
Ok(n)
|
||||||
@@ -289,6 +483,68 @@ real error
|
|||||||
assert!(!t.contains("PASS") && !t.contains("abc"));
|
assert!(!t.contains("PASS") && !t.contains("abc"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn json_redaction_keeps_the_file_valid_and_hides_the_secrets() {
|
||||||
|
let t = redact_json(r#"{"id":"rev_20261006_token_cache","password":"hunter2","nested":{"apiKey":"k","note":"login with password=abc"},"list":[{"secret":1},"ok"]}"#);
|
||||||
|
let v: serde_json::Value = serde_json::from_str(&t).expect("still JSON");
|
||||||
|
assert_eq!(v["id"], "rev_20261006_token_cache", "an id that merely contains a word is kept");
|
||||||
|
assert_eq!(v["password"], "[redacted]");
|
||||||
|
assert_eq!(v["nested"]["apiKey"], "[redacted]");
|
||||||
|
assert_eq!(v["nested"]["note"], "[redacted]");
|
||||||
|
assert_eq!(v["list"][0]["secret"], "[redacted]");
|
||||||
|
assert_eq!(v["list"][1], "ok");
|
||||||
|
assert!(!t.contains("hunter2") && !t.contains("abc"));
|
||||||
|
assert!(redact_json("not json\nPassword=1").contains("[line removed"), "text falls back to the line rule");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn windows_events_are_filtered_to_the_server_programs() {
|
||||||
|
let listing = "Event[0]:\n Provider Name: Application Error\n Description: Faulting application name: worldserver.exe, version: 0.0.0.0\n\nEvent[1]:\n Provider Name: Application Error\n Description: Faulting application name: notepad.exe\n\nEvent[2]:\n Description: Faulting application name: MYSQLD.EXE\n";
|
||||||
|
let out = filter_event_blocks(listing, &["worldserver", "mysqld"], 10);
|
||||||
|
assert!(out.contains("worldserver.exe") && out.contains("MYSQLD.EXE") && !out.contains("notepad"));
|
||||||
|
assert_eq!(filter_event_blocks(listing, &["worldserver", "mysqld"], 1).matches("Event[").count(), 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn event_text_loses_the_user_and_computer_lines_and_reads_utf16() {
|
||||||
|
let out = drop_identity_lines("Event[0]\n Source: Application Error\n User: S-1-5-21-1\n User Name: PC\\Dion\n Computer: PC\n Description: worldserver.exe");
|
||||||
|
assert!(out.contains("Source") && out.contains("worldserver.exe"));
|
||||||
|
assert!(!out.contains("S-1-5") && !out.contains("Dion") && !out.contains("Computer"));
|
||||||
|
let mut bytes = vec![0xFF, 0xFE];
|
||||||
|
for u in "Сбой worldserver".encode_utf16() { bytes.extend_from_slice(&u.to_le_bytes()); }
|
||||||
|
assert_eq!(decode_console_output(&bytes), "Сбой worldserver");
|
||||||
|
assert_eq!(decode_console_output(b"plain"), "plain");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn the_package_carries_crash_reports_update_journals_and_the_process_view() {
|
||||||
|
let d = tempfile::tempdir().unwrap();
|
||||||
|
let root = d.path().join("srv");
|
||||||
|
layout::testkit::fake_repack(&root);
|
||||||
|
fs::create_dir_all(root.join("Core/Crashes")).unwrap();
|
||||||
|
fs::write(root.join("Core/Crashes/567e_worldserver.exe_[4-10_21-25-31].txt"), "Exception code: C0000005\nRCX:0\n").unwrap();
|
||||||
|
fs::write(root.join("Core/Crashes/567e_worldserver.exe_[4-10_21-25-31].dmp"), b"MDMP-small").unwrap();
|
||||||
|
fs::write(root.join("Core/Logs/CoaBots.log"), "bot line\n").unwrap();
|
||||||
|
fs::write(root.join("Core/Logs/update-1.8-20261005.log"), "updater line\n").unwrap();
|
||||||
|
let meta_dir = d.path().join("srv.manager");
|
||||||
|
fs::create_dir_all(meta_dir.join("updates/20261006-082021-0_261006_1-abc")).unwrap();
|
||||||
|
fs::write(meta_dir.join("updates/20261006-082021-0_261006_1-abc/txn.json"), r#"{"state":"rolled-back","message":"Database update 2026_02_24_00 failed: duplicate column"}"#).unwrap();
|
||||||
|
fs::create_dir_all(meta_dir.join("updates/not a journal!")).unwrap();
|
||||||
|
let meta = InstallMeta::new(InstallKind::Imported, &root);
|
||||||
|
let report = run(&root, &meta);
|
||||||
|
let zip_path = d.path().join("diag.zip");
|
||||||
|
export_package(&root, &meta_dir, &d.path().join("none.log"), &meta, &report, &zip_path).unwrap();
|
||||||
|
let mut z = zip::ZipArchive::new(fs::File::open(&zip_path).unwrap()).unwrap();
|
||||||
|
let names: Vec<String> = (0..z.len()).map(|i| z.by_index(i).unwrap().name().to_string()).collect();
|
||||||
|
for want in ["crashes.txt", "processes.txt", "CoaBots.log.tail", "update-1.8-20261005.log.tail", "updates/20261006-082021-0_261006_1-abc-txn.json", "crashes/567e_worldserver.exe_[4-10_21-25-31].txt", "crashes/567e_worldserver.exe_[4-10_21-25-31].dmp"] {
|
||||||
|
assert!(names.iter().any(|n| n == want), "{want} is in the package: {names:?}");
|
||||||
|
}
|
||||||
|
assert!(!names.iter().any(|n| n.contains("not a journal")));
|
||||||
|
let mut listing = String::new();
|
||||||
|
z.by_name("crashes.txt").unwrap().read_to_string(&mut listing).unwrap();
|
||||||
|
assert!(listing.contains("included"));
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn verify_reports_missing_and_changed_managed_files_only() {
|
fn verify_reports_missing_and_changed_managed_files_only() {
|
||||||
let d = tempfile::tempdir().unwrap();
|
let d = tempfile::tempdir().unwrap();
|
||||||
|
|||||||
@@ -0,0 +1,574 @@
|
|||||||
|
//! Installing a new server as a Docker installation, from a Linux package.
|
||||||
|
//!
|
||||||
|
//! The order of events is the one of `install::install_base`: nothing appears at the destination until the package is
|
||||||
|
//! signed-off, downloaded, verified, extracted and its database built, all of it in a sibling `<dest>.installing`
|
||||||
|
//! folder. But this is code of its own: the Windows installer is not touched and nothing here is specific to the
|
||||||
|
//! Windows layout. What both installers use is platform-neutral: the signed manifest, the download, the extraction,
|
||||||
|
//! the migration ledger and the registry.
|
||||||
|
//!
|
||||||
|
//! The databases start from the package's own dumps (`Database/baseline/<kind>.sql.zst`, the format of the Manager's
|
||||||
|
//! backups), as a Windows package starts from its prepared database: they hold the state in which every migration of the
|
||||||
|
//! package is already applied, and the installer records them as such. They cannot be rebuilt from the repository's
|
||||||
|
//! SQL files: some migrations are guards that only apply to the maintainers' own database. The game data is not part
|
||||||
|
//! of the package: the person points at a folder they already have.
|
||||||
|
|
||||||
|
use std::fs;
|
||||||
|
use std::path::{Path, PathBuf};
|
||||||
|
|
||||||
|
use super::cli::{Docker, SystemDocker};
|
||||||
|
use super::{Config, MARKER};
|
||||||
|
use crate::db::{self, Account, Db};
|
||||||
|
use crate::download::Cancel;
|
||||||
|
use crate::driver::Verb;
|
||||||
|
use crate::error::{Error, Result};
|
||||||
|
use crate::fsx;
|
||||||
|
use crate::install::{free_port, problem, random_hex, Installed, Preflight, Step};
|
||||||
|
use crate::manifest::{self, Migration};
|
||||||
|
use crate::migrations;
|
||||||
|
use crate::package::BASELINE_DIR;
|
||||||
|
use crate::pkgsource::{fetch_manifest, fetch_parts, Source};
|
||||||
|
use crate::registry::{metadata_dir_for, InstallKind, InstallMeta, MetaDir, Registry, LAYOUT_DOCKER_V1};
|
||||||
|
|
||||||
|
/// Created in the staging folder so a leftover of an earlier attempt can be told from somebody else's folder.
|
||||||
|
const STAGING_MARKER: &str = ".coa-installing";
|
||||||
|
/// The three game databases: kind (the name of the dump), schema.
|
||||||
|
const DATABASES: [(&str, &str); 3] = [("auth", "acore_auth"), ("characters", "acore_characters"), ("world", "acore_world")];
|
||||||
|
/// Ports the game uses by default on this computer.
|
||||||
|
const DEFAULT_PORTS: (u16, u16, u16) = (3724, 8085, 3443);
|
||||||
|
|
||||||
|
pub struct Params<'a> {
|
||||||
|
pub source: Source,
|
||||||
|
pub dest: PathBuf,
|
||||||
|
/// A folder with the game data (dbc, maps, vmaps, mmaps) that the person already has. Used in place, read-only.
|
||||||
|
pub data_dir: PathBuf,
|
||||||
|
/// Public key to verify the manifest with (production: `signing::EMBEDDED_PUBLIC_KEY`).
|
||||||
|
pub trusted_key: &'a str,
|
||||||
|
pub registry: &'a Registry,
|
||||||
|
pub cancel: Cancel,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Checks whether `dest` and the game data folder are sensible for a new server on Linux.
|
||||||
|
pub fn preflight(dest: &Path, data_dir: &Path, needed_bytes: u64, registry: &Registry) -> Preflight {
|
||||||
|
let mut problems = Vec::new();
|
||||||
|
let s = dest.to_string_lossy();
|
||||||
|
|
||||||
|
if !dest.is_absolute() {
|
||||||
|
problems.push(problem("relative", "Choose a full folder path, such as /home/you/CoaServer."));
|
||||||
|
}
|
||||||
|
if s.contains(':') {
|
||||||
|
problems.push(problem("colon", "Choose a folder whose path has no colon in it."));
|
||||||
|
}
|
||||||
|
let trimmed = s.trim_end_matches('/');
|
||||||
|
const SYSTEM: [&str; 13] = ["", "/bin", "/boot", "/dev", "/etc", "/lib", "/lib64", "/proc", "/run", "/sbin", "/sys", "/usr", "/var"];
|
||||||
|
if SYSTEM.iter().any(|p| trimmed == *p || (!p.is_empty() && trimmed.starts_with(&format!("{p}/")))) {
|
||||||
|
problems.push(problem("system_folder", "Please choose a normal folder for your games, not a system location."));
|
||||||
|
}
|
||||||
|
if let Some(home) = std::env::var_os("HOME") {
|
||||||
|
let home = home.to_string_lossy().trim_end_matches('/').to_string();
|
||||||
|
let special = ["", "/Documents", "/Desktop", "/Downloads", "/Pictures", "/Music", "/Videos", "/.config", "/.local", "/.local/share"];
|
||||||
|
if !home.is_empty() && special.iter().any(|sfx| trimmed == format!("{home}{sfx}")) {
|
||||||
|
problems.push(problem("personal_folder", "This folder contains unrelated files. Choose another folder or create a new CoA Server folder."));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if dest.exists() {
|
||||||
|
match fs::read_dir(dest) {
|
||||||
|
Ok(mut rd) => {
|
||||||
|
if rd.next().is_some() {
|
||||||
|
match crate::layout::scan(dest).map(|r| r.classification) {
|
||||||
|
Ok(crate::layout::Classification::Incompatible) | Err(_) => {
|
||||||
|
if dest.join("Wow.exe").is_file() || dest.join("Ascension.exe").is_file() {
|
||||||
|
problems.push(problem("client_folder", "This is a game client folder, not a place for a server."));
|
||||||
|
} else {
|
||||||
|
problems.push(problem("not_empty", "This folder contains unrelated files. Choose another folder or create a new CoA Server folder."));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(_) => problems.push(problem("already_server", "A server is already in this folder. Use \"I already have a server\" to add it instead.")),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Err(_) => problems.push(problem("unreadable", "This folder cannot be read. Choose another one.")),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if let Ok(list) = registry.list() {
|
||||||
|
for (_, existing) in list {
|
||||||
|
if let (Ok(a), Ok(b)) = (fsx::canonicalize_lenient(dest), fsx::canonicalize_lenient(&existing)) {
|
||||||
|
if fsx::starts_with_ci(&a, &b) || fsx::starts_with_ci(&b, &a) {
|
||||||
|
problems.push(problem("registered", "A server is already registered at or around this location."));
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
problems.extend(data_problems(data_dir));
|
||||||
|
|
||||||
|
let free_bytes = fsx::free_space(dest).unwrap_or(0);
|
||||||
|
let need = needed_bytes.saturating_add(needed_bytes / 5).saturating_add(512 * 1024 * 1024);
|
||||||
|
if free_bytes < need {
|
||||||
|
problems.push(problem("space", &format!("Not enough free space: about {} GB needed, {} GB available.", need / (1 << 30) + 1, free_bytes / (1 << 30))));
|
||||||
|
}
|
||||||
|
Preflight { ok: problems.is_empty(), problems, free_bytes }
|
||||||
|
}
|
||||||
|
|
||||||
|
fn data_problems(data_dir: &Path) -> Vec<crate::install::Problem> {
|
||||||
|
let s = data_dir.to_string_lossy();
|
||||||
|
if !data_dir.is_absolute() || s.contains(':') {
|
||||||
|
return vec![problem("data_path", "Choose the game data folder with its full path, without a colon in it.")];
|
||||||
|
}
|
||||||
|
let missing: Vec<&str> = ["dbc", "maps"].into_iter().filter(|d| !data_dir.join(d).is_dir()).collect();
|
||||||
|
if missing.is_empty() {
|
||||||
|
Vec::new()
|
||||||
|
} else {
|
||||||
|
vec![problem("data_missing", &format!("This folder does not look like the game data: {} not found in it. It should hold dbc, maps, vmaps and mmaps.", missing.join(" and ")))]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Port the game should use: the usual one when it is free on this computer, else any free one.
|
||||||
|
fn pick_port(preferred: u16) -> Result<u16> {
|
||||||
|
if std::net::TcpListener::bind(("127.0.0.1", preferred)).is_ok() {
|
||||||
|
Ok(preferred)
|
||||||
|
} else {
|
||||||
|
free_port()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Settings of a new installation: which containers belong to it, where the game data is, the ports, the passwords.
|
||||||
|
/// Written before anything runs, so the database can be started from the staging folder.
|
||||||
|
struct Settings {
|
||||||
|
app_password: String,
|
||||||
|
world_port: u16,
|
||||||
|
}
|
||||||
|
|
||||||
|
fn write_settings(root: &Path, data_dir: &Path) -> Result<Settings> {
|
||||||
|
let project = random_hex(10);
|
||||||
|
let (auth, world, ra) = (pick_port(DEFAULT_PORTS.0)?, pick_port(DEFAULT_PORTS.1)?, pick_port(DEFAULT_PORTS.2)?);
|
||||||
|
let (root_password, app_password) = (random_hex(48), random_hex(48));
|
||||||
|
fs::create_dir_all(root.join("Settings"))?;
|
||||||
|
let docker = Config { project, bind_address: "127.0.0.1".into(), mysql_image: super::MYSQL_IMAGE.into(), data_dir: Some(data_dir.to_string_lossy().into_owned()) };
|
||||||
|
fsx::atomic_write_json(&root.join(MARKER), &docker)?;
|
||||||
|
// Same file and keys as a repack, so the console, the ports and the settings screens work unchanged. The database is
|
||||||
|
// not published on the host; its port is only there to fill the key.
|
||||||
|
fsx::atomic_write_json(
|
||||||
|
&root.join("Settings/repack.json"),
|
||||||
|
&serde_json::json!({ "mysqlPort": 3307, "authPort": auth, "worldPort": world, "raPort": ra, "raUsername": db::SERVICE_ACCOUNT, "raPassword": "" }),
|
||||||
|
)?;
|
||||||
|
let secrets = root.join("Settings/database.json");
|
||||||
|
fsx::atomic_write_json(&secrets, &serde_json::json!({ "rootPassword": root_password, "appPassword": app_password }))?;
|
||||||
|
#[cfg(unix)]
|
||||||
|
{
|
||||||
|
use std::os::unix::fs::PermissionsExt;
|
||||||
|
fs::set_permissions(&secrets, fs::Permissions::from_mode(0o600))?;
|
||||||
|
}
|
||||||
|
Ok(Settings { app_password, world_port: world })
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The package must hold what a Docker installation is made of; say what is missing instead of failing later.
|
||||||
|
fn check_extracted(root: &Path) -> Result<()> {
|
||||||
|
let mut missing = Vec::new();
|
||||||
|
for rel in ["Core/worldserver", "Core/authserver", "Core/configs/worldserver.conf.dist", "Core/configs/authserver.conf.dist"] {
|
||||||
|
if !root.join(rel).is_file() {
|
||||||
|
missing.push(rel.to_string());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for (kind, _) in DATABASES {
|
||||||
|
if !root.join(BASELINE_DIR).join(format!("{kind}.sql.zst")).is_file() {
|
||||||
|
missing.push(format!("{BASELINE_DIR}/{kind}.sql.zst"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if missing.is_empty() {
|
||||||
|
Ok(())
|
||||||
|
} else {
|
||||||
|
Err(Error::Invalid(format!("This package is not a complete Linux server package; missing: {}.", missing.join(", "))))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Record every migration of the package as applied without running it, in a few statements (one `docker exec` for each
|
||||||
|
/// of more than a thousand would take minutes). Same ledger rows as `migrations::baseline`.
|
||||||
|
fn baseline_statements(list: &[Migration]) -> Result<Vec<String>> {
|
||||||
|
let ok = |t: &str| !t.is_empty() && t.len() <= 190 && t.chars().all(|c| c.is_ascii_alphanumeric() || matches!(c, '_' | '.' | '-'));
|
||||||
|
let mut rows = Vec::with_capacity(list.len());
|
||||||
|
for m in list {
|
||||||
|
if !matches!(m.db.as_str(), "auth" | "characters" | "world") || !ok(&m.id) || m.sha256.len() != 64 || !m.sha256.chars().all(|c| c.is_ascii_hexdigit()) {
|
||||||
|
return Err(Error::InvalidManifest(format!("migration {:?} is not valid", m.id)));
|
||||||
|
}
|
||||||
|
rows.push(format!("('{}','{}','{}','applied',NOW(),NULL,1)", m.db, m.id, m.sha256));
|
||||||
|
}
|
||||||
|
Ok(rows
|
||||||
|
.chunks(400)
|
||||||
|
.map(|c| format!("REPLACE INTO `acore_world`.`coa_manager_migrations` (`db`,`id`,`sha256`,`status`,`applied_at`,`error`,`baseline`) VALUES {};", c.join(",")))
|
||||||
|
.collect())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Create the three schemas and the game servers' account, load the starting databases and record the package's migrations
|
||||||
|
/// as applied. The database container is started from `root` and stopped again by the caller.
|
||||||
|
fn build_database(d: &dyn Docker, root: &Path, list: &[Migration], s: &Settings, say: &dyn Fn(u8, String)) -> Result<()> {
|
||||||
|
let started = super::run_with(d, root, Verb::StartMysql)?;
|
||||||
|
if !started.ok {
|
||||||
|
return Err(Error::Invalid(started.human.map(|h| h.message.to_string()).unwrap_or_else(|| "The database could not be started.".into())));
|
||||||
|
}
|
||||||
|
let db = Db::from_repack(root, Account::Admin)?;
|
||||||
|
let mut sql = String::new();
|
||||||
|
for (_, schema) in DATABASES {
|
||||||
|
sql.push_str(&format!("CREATE DATABASE `{schema}` CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;\n"));
|
||||||
|
}
|
||||||
|
// The pattern also covers the schemas of other realms (acore_world_wildcard, ...).
|
||||||
|
sql.push_str(&format!("CREATE USER 'acore'@'%' IDENTIFIED BY '{}';\nGRANT ALL PRIVILEGES ON `acore\\_%`.* TO 'acore'@'%';\nFLUSH PRIVILEGES;\n", s.app_password));
|
||||||
|
db.query(&sql)?;
|
||||||
|
|
||||||
|
for (i, (kind, schema)) in DATABASES.iter().enumerate() {
|
||||||
|
say(83 + (i * 4) as u8, format!("Loading the {kind} database"));
|
||||||
|
db.import_from(schema, &root.join(BASELINE_DIR).join(format!("{kind}.sql.zst")))?;
|
||||||
|
}
|
||||||
|
|
||||||
|
say(95 - 3, format!("Recording {} database updates as applied", list.len()));
|
||||||
|
// The ledger table is created by the first read of it.
|
||||||
|
migrations::Store::load(&db)?;
|
||||||
|
for statement in baseline_statements(list)? {
|
||||||
|
db.query(&statement)?;
|
||||||
|
}
|
||||||
|
|
||||||
|
// The realm advertises the port the game server really uses on this computer.
|
||||||
|
db.query(&format!("UPDATE acore_auth.realmlist SET port={} WHERE id=1;", s.world_port))?;
|
||||||
|
// The server console gets its own account with a random password.
|
||||||
|
let console_pw = db.provision_service_account()?;
|
||||||
|
db::write_console_credentials(root, &console_pw)?;
|
||||||
|
if !Db::from_repack(root, Account::Admin)?.ping() {
|
||||||
|
return Err(Error::Invalid("The database did not answer after it was set up.".into()));
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn install(p: &Params, report: &dyn Fn(Step)) -> Result<Installed> {
|
||||||
|
install_with(&SystemDocker, p, report)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn install_with(d: &dyn Docker, p: &Params, report: &dyn Fn(Step)) -> Result<Installed> {
|
||||||
|
let say = |step: &'static str, percent: u8, detail: Option<String>| report(Step { step, percent, detail });
|
||||||
|
let dest = p.dest.clone();
|
||||||
|
let staging_root = {
|
||||||
|
let mut n = dest.file_name().ok_or_else(|| Error::Invalid("bad destination".into()))?.to_os_string();
|
||||||
|
n.push(".installing");
|
||||||
|
dest.with_file_name(n)
|
||||||
|
};
|
||||||
|
let meta_dir = metadata_dir_for(&dest)?;
|
||||||
|
|
||||||
|
say("Checking your computer", 2, None);
|
||||||
|
super::check_docker(d)?;
|
||||||
|
// The manifest first: it is signed, and tells us how much space we need.
|
||||||
|
let (m, manifest_bytes) = fetch_manifest(&p.source, p.trusted_key)?;
|
||||||
|
if !matches!(m.kind, manifest::Kind::Base | manifest::Kind::Update) || !m.compatible_with_manager(crate::MANAGER_VERSION) {
|
||||||
|
return Err(Error::Invalid("This package needs a newer version of CoA Server Manager.".into()));
|
||||||
|
}
|
||||||
|
let archive = m.archive.clone().ok_or_else(|| Error::InvalidManifest("no archive".into()))?;
|
||||||
|
let download_size: u64 = archive.parts.iter().map(|x| x.size).sum();
|
||||||
|
|
||||||
|
let pre = preflight(&dest, &p.data_dir, archive.unpacked_size + download_size, p.registry);
|
||||||
|
if !pre.ok {
|
||||||
|
return Err(Error::Invalid(pre.problems.iter().map(|x| x.message.clone()).collect::<Vec<_>>().join(" ")));
|
||||||
|
}
|
||||||
|
|
||||||
|
let parts_dir = fetch_parts(&p.source, &m, &meta_dir.join("staging").join("download"), &p.cancel, &|frac, detail| say("Downloading server", 5 + (frac * 45.0) as u8, detail))?;
|
||||||
|
|
||||||
|
if staging_root.exists() {
|
||||||
|
if staging_root.join(STAGING_MARKER).is_file() {
|
||||||
|
fs::remove_dir_all(&staging_root)?; // leftover of an earlier failed attempt that we created
|
||||||
|
} else {
|
||||||
|
return Err(Error::Invalid(format!("{} already exists and was not created by the Manager.", staging_root.display())));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
fs::create_dir_all(&staging_root)?;
|
||||||
|
fs::write(staging_root.join(STAGING_MARKER), b"")?;
|
||||||
|
|
||||||
|
let mut project: Option<Config> = None;
|
||||||
|
let result = (|| -> Result<Installed> {
|
||||||
|
say("Unpacking", 50, None);
|
||||||
|
crate::package::extract(&parts_dir, &m, &staging_root, &|done, total| say("Unpacking", 50 + (done * 30 / total.max(1)) as u8, None))?;
|
||||||
|
check_extracted(&staging_root)?;
|
||||||
|
|
||||||
|
say("Preparing database", 82, None);
|
||||||
|
let settings = write_settings(&staging_root, &p.data_dir)?;
|
||||||
|
project = Some(Config::load(&staging_root)?);
|
||||||
|
let progress = |percent: u8, detail: String| say("Preparing database", percent, Some(detail));
|
||||||
|
let built = build_database(d, &staging_root, &m.migrations, &settings, &progress);
|
||||||
|
let _ = super::run_with(d, &staging_root, Verb::StopAll);
|
||||||
|
built?;
|
||||||
|
fs::remove_file(staging_root.join(STAGING_MARKER))?;
|
||||||
|
|
||||||
|
// Commit: the only moment the destination changes. The database lives in a docker volume, so it does not care
|
||||||
|
// that the folder moves.
|
||||||
|
say("Finishing", 95, None);
|
||||||
|
if dest.exists() {
|
||||||
|
fs::remove_dir(&dest)?; // only succeeds for an empty folder (preflight verified)
|
||||||
|
}
|
||||||
|
fs::rename(&staging_root, &dest)?;
|
||||||
|
super::ensure_main_configs(&dest)?;
|
||||||
|
crate::config::materialize_module_configs(&dest)?;
|
||||||
|
|
||||||
|
let mut meta = InstallMeta::new(InstallKind::New, &dest);
|
||||||
|
meta.layout = LAYOUT_DOCKER_V1.into();
|
||||||
|
meta.core.commit = m.core.commit.clone();
|
||||||
|
meta.core.version = Some(m.version.clone());
|
||||||
|
meta.database.schemas = DATABASES.iter().map(|(_, s)| s.to_string()).collect();
|
||||||
|
meta.managed_files = m.files.iter().map(|f| f.path.clone()).collect();
|
||||||
|
for f in &m.files {
|
||||||
|
meta.original_hashes.insert(f.path.clone(), f.sha256.clone());
|
||||||
|
}
|
||||||
|
let md = MetaDir::create(&dest, &meta)?;
|
||||||
|
fsx::atomic_write(&md.root.join("manifests").join("base.json"), &manifest_bytes)?;
|
||||||
|
p.registry.register(&meta.id, &dest)?;
|
||||||
|
say("Ready", 100, None);
|
||||||
|
Ok(Installed { id: meta.id, path: dest.to_string_lossy().into_owned(), version: m.version.clone() })
|
||||||
|
})();
|
||||||
|
|
||||||
|
if result.is_err() && staging_root.join(STAGING_MARKER).exists() {
|
||||||
|
// Unfinished work of ours; the destination was never touched. Give back what docker holds for it.
|
||||||
|
if let Some(cfg) = &project {
|
||||||
|
super::destroy(d, cfg);
|
||||||
|
}
|
||||||
|
let _ = fs::remove_dir_all(&staging_root);
|
||||||
|
}
|
||||||
|
result
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
use crate::docker::cli::{Call, Output};
|
||||||
|
use crate::package::{self, BuildOptions};
|
||||||
|
use base64::Engine;
|
||||||
|
use ed25519_dalek::{Signer, SigningKey};
|
||||||
|
use std::cell::RefCell;
|
||||||
|
|
||||||
|
struct Fake {
|
||||||
|
calls: RefCell<Vec<Vec<String>>>,
|
||||||
|
unavailable: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Fake {
|
||||||
|
fn new(unavailable: bool) -> Fake {
|
||||||
|
Fake { calls: Default::default(), unavailable }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Docker for Fake {
|
||||||
|
fn run(&self, call: &Call) -> Result<Output> {
|
||||||
|
self.calls.borrow_mut().push(call.args.clone());
|
||||||
|
if self.unavailable {
|
||||||
|
return Err(Error::Invalid("docker could not be started: not found".into()));
|
||||||
|
}
|
||||||
|
Ok(Output { code: Some(0), stdout: "27.3.1".into(), stderr: String::new() })
|
||||||
|
}
|
||||||
|
|
||||||
|
fn pause(&self, _d: std::time::Duration) {}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn reg(d: &Path) -> Registry {
|
||||||
|
Registry::at(d.join("reg/installs.json"))
|
||||||
|
}
|
||||||
|
|
||||||
|
fn codes(p: &Preflight) -> Vec<&'static str> {
|
||||||
|
p.problems.iter().map(|x| x.code).collect()
|
||||||
|
}
|
||||||
|
|
||||||
|
fn data_folder(d: &Path) -> PathBuf {
|
||||||
|
let data = d.join("data");
|
||||||
|
fs::create_dir_all(data.join("dbc")).unwrap();
|
||||||
|
fs::create_dir_all(data.join("maps")).unwrap();
|
||||||
|
data
|
||||||
|
}
|
||||||
|
|
||||||
|
/// A signed package folder holding `files`, and the key that verifies it.
|
||||||
|
fn signed_package(d: &Path, files: &[(&str, &str)]) -> (PathBuf, String) {
|
||||||
|
let src = d.join("src");
|
||||||
|
for (rel, content) in files {
|
||||||
|
let p = src.join(rel);
|
||||||
|
fs::create_dir_all(p.parent().unwrap()).unwrap();
|
||||||
|
fs::write(p, content).unwrap();
|
||||||
|
}
|
||||||
|
let pkg = d.join("pkg");
|
||||||
|
let opts = BuildOptions { kind: manifest::Kind::Update, version: "0.1.0".into(), core_commit: None, built_at: "x".into(), part_size: 1 << 20, bots_commit: None, migrations: vec![] };
|
||||||
|
package::build(&src, &pkg, &opts, &|_| {}).unwrap();
|
||||||
|
let key = SigningKey::generate(&mut rand_core::OsRng);
|
||||||
|
let engine = base64::engine::general_purpose::STANDARD;
|
||||||
|
let sig = engine.encode(key.sign(&fs::read(pkg.join("manifest.json")).unwrap()).to_bytes());
|
||||||
|
fs::write(pkg.join("manifest.json.sig"), sig).unwrap();
|
||||||
|
(pkg, engine.encode(key.verifying_key().to_bytes()))
|
||||||
|
}
|
||||||
|
|
||||||
|
const FULL: [(&str, &str); 7] = [
|
||||||
|
("Core/worldserver", "w"),
|
||||||
|
("Core/authserver", "a"),
|
||||||
|
("Core/configs/worldserver.conf.dist", "x"),
|
||||||
|
("Core/configs/authserver.conf.dist", "x"),
|
||||||
|
("Database/baseline/auth.sql.zst", "dump"),
|
||||||
|
("Database/baseline/characters.sql.zst", "dump"),
|
||||||
|
("Database/baseline/world.sql.zst", "dump"),
|
||||||
|
];
|
||||||
|
|
||||||
|
#[cfg(unix)]
|
||||||
|
#[test]
|
||||||
|
fn the_destination_rules_fit_a_linux_computer() {
|
||||||
|
let d = tempfile::tempdir().unwrap();
|
||||||
|
let data = data_folder(d.path());
|
||||||
|
let ok = |dest: &Path| codes(&preflight(dest, &data, 1000, ®(d.path())));
|
||||||
|
assert!(!ok(&d.path().join("CoaServer")).iter().any(|c| *c != "space"), "a new folder is fine");
|
||||||
|
for bad in ["/usr/local/coa", "/etc", "/", "/proc/x"] {
|
||||||
|
assert!(ok(Path::new(bad)).contains(&"system_folder"), "{bad}");
|
||||||
|
}
|
||||||
|
assert!(ok(Path::new("relative/dir")).contains(&"relative"));
|
||||||
|
assert!(ok(Path::new("/srv/with:colon")).contains(&"colon"));
|
||||||
|
let existing = d.path().join("existing");
|
||||||
|
fs::create_dir_all(&existing).unwrap();
|
||||||
|
fs::write(existing.join("notes.txt"), b"x").unwrap();
|
||||||
|
assert!(ok(&existing).contains(&"not_empty"));
|
||||||
|
let r = reg(d.path());
|
||||||
|
r.register("1", &existing).unwrap();
|
||||||
|
assert!(codes(&preflight(&existing.join("inner"), &data, 1000, &r)).contains(&"registered"));
|
||||||
|
// The same name in another case is another folder on Linux.
|
||||||
|
assert!(!codes(&preflight(&d.path().join("EXISTING"), &data, 1000, &r)).contains(&"registered"));
|
||||||
|
}
|
||||||
|
|
||||||
|
// The tests marked for unix use absolute folders of the temporary directory, which on Windows start with a drive letter and a
|
||||||
|
// colon; the Docker backend refuses a colon in a folder it mounts (it would be read as a separator of `--volume`) and only runs
|
||||||
|
// on Linux, so Windows has nothing to check here.
|
||||||
|
#[cfg(unix)]
|
||||||
|
#[test]
|
||||||
|
fn the_game_data_folder_must_look_like_game_data() {
|
||||||
|
let d = tempfile::tempdir().unwrap();
|
||||||
|
let reg = reg(d.path());
|
||||||
|
let dest = d.path().join("srv");
|
||||||
|
let empty = d.path().join("empty");
|
||||||
|
fs::create_dir_all(&empty).unwrap();
|
||||||
|
assert!(codes(&preflight(&dest, &empty, 1, ®)).contains(&"data_missing"));
|
||||||
|
assert!(codes(&preflight(&dest, Path::new("relative/data"), 1, ®)).contains(&"data_path"));
|
||||||
|
assert!(!codes(&preflight(&dest, &data_folder(d.path()), 1, ®)).iter().any(|c| c.starts_with("data")));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(unix)]
|
||||||
|
#[test]
|
||||||
|
fn new_settings_name_the_containers_and_keep_the_secrets_private() {
|
||||||
|
let d = tempfile::tempdir().unwrap();
|
||||||
|
let root = d.path().join("srv");
|
||||||
|
let data = data_folder(d.path());
|
||||||
|
let s = write_settings(&root, &data).unwrap();
|
||||||
|
|
||||||
|
let cfg = Config::load(&root).unwrap();
|
||||||
|
assert_eq!(cfg.bind_address, "127.0.0.1", "this computer only until the person opens it");
|
||||||
|
assert_eq!(cfg.project.len(), 10);
|
||||||
|
assert_eq!(cfg.data_path(&root), data);
|
||||||
|
|
||||||
|
let ports = crate::layout::read_ports(&root);
|
||||||
|
assert_eq!(ports.world, s.world_port);
|
||||||
|
assert!(ports.auth > 0 && ports.ra > 0);
|
||||||
|
let repack: serde_json::Value = fsx::read_json(&root.join("Settings/repack.json")).unwrap();
|
||||||
|
assert_eq!(repack["raUsername"], db::SERVICE_ACCOUNT);
|
||||||
|
|
||||||
|
let (root_pw, app_pw) = db::credentials(&root).unwrap();
|
||||||
|
assert!(root_pw.len() == 48 && app_pw.len() == 48 && root_pw != app_pw);
|
||||||
|
assert_eq!(app_pw, s.app_password);
|
||||||
|
#[cfg(unix)]
|
||||||
|
{
|
||||||
|
use std::os::unix::fs::PermissionsExt;
|
||||||
|
let mode = fs::metadata(root.join("Settings/database.json")).unwrap().permissions().mode() & 0o777;
|
||||||
|
assert_eq!(mode, 0o600, "the passwords are for their owner only");
|
||||||
|
}
|
||||||
|
// Two installations never share a project name.
|
||||||
|
let other = write_settings(&d.path().join("srv2"), &data).unwrap();
|
||||||
|
assert_ne!(Config::load(&d.path().join("srv2")).unwrap().project, cfg.project);
|
||||||
|
let _ = other;
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn a_busy_default_port_is_replaced_by_a_free_one() {
|
||||||
|
let held = std::net::TcpListener::bind("127.0.0.1:0").unwrap();
|
||||||
|
let busy = held.local_addr().unwrap().port();
|
||||||
|
let got = pick_port(busy).unwrap();
|
||||||
|
assert_ne!(got, busy);
|
||||||
|
drop(held);
|
||||||
|
assert_eq!(pick_port(busy).unwrap(), busy, "free again: the usual port is used");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn a_package_is_checked_for_everything_an_installation_needs() {
|
||||||
|
let d = tempfile::tempdir().unwrap();
|
||||||
|
let root = d.path();
|
||||||
|
assert!(check_extracted(root).unwrap_err().to_string().contains("Core/worldserver"));
|
||||||
|
for (rel, c) in FULL {
|
||||||
|
let p = root.join(rel);
|
||||||
|
fs::create_dir_all(p.parent().unwrap()).unwrap();
|
||||||
|
fs::write(p, c).unwrap();
|
||||||
|
}
|
||||||
|
check_extracted(root).unwrap();
|
||||||
|
fs::remove_file(root.join("Database/baseline/world.sql.zst")).unwrap();
|
||||||
|
assert!(check_extracted(root).unwrap_err().to_string().contains("Database/baseline/world.sql.zst"));
|
||||||
|
}
|
||||||
|
|
||||||
|
fn migration(db: &str, id: &str) -> Migration {
|
||||||
|
Migration { db: db.into(), id: id.into(), sha256: "ab".repeat(32), destructive: false, compatible_sha256: vec![] }
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn the_package_migrations_are_recorded_as_applied_in_a_few_statements() {
|
||||||
|
let list: Vec<Migration> = (0..1000).map(|i| migration(["auth", "characters", "world"][i % 3], &format!("rev_{i}"))).collect();
|
||||||
|
let statements = baseline_statements(&list).unwrap();
|
||||||
|
assert_eq!(statements.len(), 3, "400 rows at most in a statement");
|
||||||
|
assert!(statements[0].starts_with("REPLACE INTO `acore_world`.`coa_manager_migrations`"));
|
||||||
|
assert_eq!(statements.iter().map(|s| s.matches("'applied'").count()).sum::<usize>(), 1000);
|
||||||
|
assert!(statements[0].contains("('auth','rev_0',") && statements[0].contains(",NOW(),NULL,1)"), "marked as a baseline");
|
||||||
|
assert!(baseline_statements(&[]).unwrap().is_empty());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn a_migration_that_could_carry_sql_is_refused_before_anything_is_written() {
|
||||||
|
for bad in [migration("world", "x'); DROP TABLE y;--"), migration("mysql", "ok"), migration("world", ""), Migration { sha256: "zz".into(), ..migration("world", "ok") }] {
|
||||||
|
assert!(baseline_statements(&[migration("auth", "fine"), bad]).is_err());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn without_docker_nothing_is_downloaded_or_created() {
|
||||||
|
let d = tempfile::tempdir().unwrap();
|
||||||
|
let (pkg, key) = signed_package(d.path(), &FULL);
|
||||||
|
let dest = d.path().join("dest");
|
||||||
|
let r = reg(d.path());
|
||||||
|
let fake = Fake::new(true);
|
||||||
|
let err = install_with(&fake, &Params { source: Source::Dir(pkg), dest: dest.clone(), data_dir: data_folder(d.path()), trusted_key: &key, registry: &r, cancel: Cancel::default() }, &|_| {}).unwrap_err();
|
||||||
|
assert!(err.to_string().to_lowercase().contains("docker"), "{err}");
|
||||||
|
assert!(!dest.exists() && !dest.with_file_name("dest.installing").exists());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(unix)]
|
||||||
|
#[test]
|
||||||
|
fn a_package_without_the_server_is_refused_and_leaves_nothing() {
|
||||||
|
let d = tempfile::tempdir().unwrap();
|
||||||
|
let (pkg, key) = signed_package(d.path(), &[("Core/configs/worldserver.conf.dist", "x"), ("README.txt", "hello")]);
|
||||||
|
let dest = d.path().join("dest");
|
||||||
|
let r = reg(d.path());
|
||||||
|
let fake = Fake::new(false);
|
||||||
|
let err = install_with(&fake, &Params { source: Source::Dir(pkg), dest: dest.clone(), data_dir: data_folder(d.path()), trusted_key: &key, registry: &r, cancel: Cancel::default() }, &|_| {}).unwrap_err();
|
||||||
|
assert!(err.to_string().contains("not a complete Linux server package"), "{err}");
|
||||||
|
assert!(!dest.exists() && !dest.with_file_name("dest.installing").exists());
|
||||||
|
assert!(r.list().unwrap().is_empty());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(unix)]
|
||||||
|
#[test]
|
||||||
|
fn a_failed_database_setup_gives_back_what_docker_holds_and_leaves_no_server() {
|
||||||
|
let d = tempfile::tempdir().unwrap();
|
||||||
|
let (pkg, key) = signed_package(d.path(), &FULL);
|
||||||
|
let dest = d.path().join("dest");
|
||||||
|
let r = reg(d.path());
|
||||||
|
// This fake docker answers every command with success and no container, so the database never becomes ready.
|
||||||
|
let fake = Fake::new(false);
|
||||||
|
let err = install_with(&fake, &Params { source: Source::Dir(pkg), dest: dest.clone(), data_dir: data_folder(d.path()), trusted_key: &key, registry: &r, cancel: Cancel::default() }, &|_| {}).unwrap_err();
|
||||||
|
assert!(err.to_string().to_lowercase().contains("database"), "{err}");
|
||||||
|
assert!(!dest.exists() && !dest.with_file_name("dest.installing").exists(), "no half-installed server");
|
||||||
|
assert!(r.list().unwrap().is_empty());
|
||||||
|
let calls = fake.calls.borrow();
|
||||||
|
let removed = |suffix: &str| calls.iter().any(|c| c[0] == "rm" && c.last().is_some_and(|n| n.starts_with("coa-") && n.ends_with(suffix)));
|
||||||
|
assert!(removed("-db") && removed("-world") && removed("-auth"), "containers removed: {calls:?}");
|
||||||
|
assert!(calls.iter().any(|c| c[..2] == ["volume", "rm"]) && calls.iter().any(|c| c[..2] == ["network", "rm"]));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -80,6 +80,26 @@ fn docker(d: &dyn Docker, args: &[&str], timeout: Duration) -> Step<super::cli::
|
|||||||
d.run(&Call::new(args, timeout)).or_else(|e| fail(ErrorCode::DockerUnavailable, e.to_string()))
|
d.run(&Call::new(args, timeout)).or_else(|e| fail(ErrorCode::DockerUnavailable, e.to_string()))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Is docker usable by this user? Returns its version, or the reason in docker's own words.
|
||||||
|
pub fn check_docker(d: &dyn Docker) -> Result<String> {
|
||||||
|
let mut log = Log::default();
|
||||||
|
match preflight(d, &mut log) {
|
||||||
|
Ok(()) => Ok(log.0.join(" ")),
|
||||||
|
Err(f) => Err(crate::error::Error::Invalid(format!("{} {}", f.code.human().message, f.output.trim()).trim().to_string())),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Remove everything docker holds for an installation: containers, network and the database volume. Used when an
|
||||||
|
/// installation fails before it is finished, and later to uninstall. Missing pieces are not an error.
|
||||||
|
pub(crate) fn destroy(d: &dyn Docker, cfg: &Config) {
|
||||||
|
let n = cfg.names();
|
||||||
|
for name in [&n.auth, &n.world, &n.db] {
|
||||||
|
let _ = d.run(&Call::new(&["rm", "--force", name], QUICK));
|
||||||
|
}
|
||||||
|
let _ = d.run(&Call::new(&["network", "rm", &n.network], QUICK));
|
||||||
|
let _ = d.run(&Call::new(&["volume", "rm", &n.volume], QUICK));
|
||||||
|
}
|
||||||
|
|
||||||
fn preflight(d: &dyn Docker, log: &mut Log) -> Step<()> {
|
fn preflight(d: &dyn Docker, log: &mut Log) -> Step<()> {
|
||||||
let o = docker(d, &["version", "--format", "{{.Server.Version}}"], QUICK)?;
|
let o = docker(d, &["version", "--format", "{{.Server.Version}}"], QUICK)?;
|
||||||
if !o.ok() {
|
if !o.ok() {
|
||||||
@@ -204,6 +224,7 @@ fn start(d: &dyn Docker, root: &Path, cfg: &Config, with_game: bool, log: &mut L
|
|||||||
}
|
}
|
||||||
|
|
||||||
ensure_image(d, log)?;
|
ensure_image(d, log)?;
|
||||||
|
super::ensure_main_configs(root).map_err(|e| Failure { code: ErrorCode::ServerFilesIncomplete, output: e.to_string() })?;
|
||||||
std::fs::create_dir_all(root.join("Core/Logs")).map_err(|e| Failure { code: ErrorCode::ServerFilesIncomplete, output: e.to_string() })?;
|
std::fs::create_dir_all(root.join("Core/Logs")).map_err(|e| Failure { code: ErrorCode::ServerFilesIncomplete, output: e.to_string() })?;
|
||||||
let owner = owner_of(root);
|
let owner = owner_of(root);
|
||||||
let host = std::fs::canonicalize(root).unwrap_or_else(|_| root.to_path_buf());
|
let host = std::fs::canonicalize(root).unwrap_or_else(|_| root.to_path_buf());
|
||||||
@@ -212,7 +233,7 @@ fn start(d: &dyn Docker, root: &Path, cfg: &Config, with_game: bool, log: &mut L
|
|||||||
if !state.get(&n.world).is_some_and(Container::running) {
|
if !state.get(&n.world).is_some_and(Container::running) {
|
||||||
remove(d, &n.world);
|
remove(d, &n.world);
|
||||||
let mut call = Call::new(&[], Duration::from_secs(60));
|
let mut call = Call::new(&[], Duration::from_secs(60));
|
||||||
call.args = game_args(cfg, &n, GameKind::World, &host, ports.world, ports.ra, owner.as_deref());
|
call.args = game_args(cfg, &n, GameKind::World, &host, &cfg.data_path(&host), ports.world, ports.ra, owner.as_deref());
|
||||||
call.env = database_env(&secrets, true);
|
call.env = database_env(&secrets, true);
|
||||||
run_container(d, &call, &n.world, log)?;
|
run_container(d, &call, &n.world, log)?;
|
||||||
}
|
}
|
||||||
@@ -221,7 +242,7 @@ fn start(d: &dyn Docker, root: &Path, cfg: &Config, with_game: bool, log: &mut L
|
|||||||
if !state.get(&n.auth).is_some_and(Container::running) {
|
if !state.get(&n.auth).is_some_and(Container::running) {
|
||||||
remove(d, &n.auth);
|
remove(d, &n.auth);
|
||||||
let mut call = Call::new(&[], Duration::from_secs(60));
|
let mut call = Call::new(&[], Duration::from_secs(60));
|
||||||
call.args = game_args(cfg, &n, GameKind::Auth, &host, ports.auth, 0, owner.as_deref());
|
call.args = game_args(cfg, &n, GameKind::Auth, &host, &cfg.data_path(&host), ports.auth, 0, owner.as_deref());
|
||||||
call.env = database_env(&secrets, false);
|
call.env = database_env(&secrets, false);
|
||||||
run_container(d, &call, &n.auth, log)?;
|
run_container(d, &call, &n.auth, log)?;
|
||||||
}
|
}
|
||||||
@@ -320,8 +341,11 @@ fn db_args(cfg: &Config, n: &Names) -> Vec<String> {
|
|||||||
a.extend(["--volume".into(), format!("{}:/var/lib/mysql", n.volume)]);
|
a.extend(["--volume".into(), format!("{}:/var/lib/mysql", n.volume)]);
|
||||||
// The password comes from the environment of the docker client, not from this command line.
|
// The password comes from the environment of the docker client, not from this command line.
|
||||||
a.extend(["--env".into(), "MYSQL_ROOT_PASSWORD".into()]);
|
a.extend(["--env".into(), "MYSQL_ROOT_PASSWORD".into()]);
|
||||||
// "mysqladmin ping" succeeds as soon as the server answers, with or without a login.
|
// "mysqladmin ping" succeeds as soon as the server answers, with or without a login. It must go over TCP, like
|
||||||
a.extend(["--health-cmd".into(), "mysqladmin ping --silent".into()]);
|
// everything the Manager sends: while a new database initialises, the image first runs a temporary server that
|
||||||
|
// answers on its socket but takes no network connection, and a socket ping would call the container healthy for a few
|
||||||
|
// seconds in which every TCP connection is still refused.
|
||||||
|
a.extend(["--health-cmd".into(), "mysqladmin ping --protocol=tcp --host=127.0.0.1 --silent".into()]);
|
||||||
a.extend(["--health-interval".into(), "5s".into(), "--health-timeout".into(), "5s".into(), "--health-retries".into(), "40".into()]);
|
a.extend(["--health-interval".into(), "5s".into(), "--health-timeout".into(), "5s".into(), "--health-retries".into(), "40".into()]);
|
||||||
a.extend(["--stop-timeout".into(), "60".into()]);
|
a.extend(["--stop-timeout".into(), "60".into()]);
|
||||||
a.push(cfg.mysql_image.clone());
|
a.push(cfg.mysql_image.clone());
|
||||||
@@ -345,7 +369,7 @@ fn database_env(s: &Secrets, world: bool) -> Vec<(String, String)> {
|
|||||||
env
|
env
|
||||||
}
|
}
|
||||||
|
|
||||||
fn game_args(cfg: &Config, n: &Names, kind: GameKind, host: &Path, port: u16, ra_port: u16, owner: Option<&str>) -> Vec<String> {
|
fn game_args(cfg: &Config, n: &Names, kind: GameKind, host: &Path, data: &Path, port: u16, ra_port: u16, owner: Option<&str>) -> Vec<String> {
|
||||||
let (name, alias, binary, conf, inner_port) = match kind {
|
let (name, alias, binary, conf, inner_port) = match kind {
|
||||||
GameKind::World => (&n.world, "world", "./worldserver", "configs/worldserver.conf", WORLD_PORT),
|
GameKind::World => (&n.world, "world", "./worldserver", "configs/worldserver.conf", WORLD_PORT),
|
||||||
GameKind::Auth => (&n.auth, "auth", "./authserver", "configs/authserver.conf", AUTH_PORT),
|
GameKind::Auth => (&n.auth, "auth", "./authserver", "configs/authserver.conf", AUTH_PORT),
|
||||||
@@ -370,7 +394,7 @@ fn game_args(cfg: &Config, n: &Names, kind: GameKind, host: &Path, port: u16, ra
|
|||||||
// the container and stops the server when it cannot find one.
|
// the container and stops the server when it cannot find one.
|
||||||
a.extend(env("AC_UPDATES_ENABLE_DATABASES", "0"));
|
a.extend(env("AC_UPDATES_ENABLE_DATABASES", "0"));
|
||||||
if kind == GameKind::World {
|
if kind == GameKind::World {
|
||||||
a.extend(["--volume".into(), format!("{}:{DATA}:ro", host.join("Data").display())]);
|
a.extend(["--volume".into(), format!("{}:{DATA}:ro", data.display())]);
|
||||||
a.extend(env("AC_DATA_DIR", DATA));
|
a.extend(env("AC_DATA_DIR", DATA));
|
||||||
// The remote console is only ever reachable from this computer.
|
// The remote console is only ever reachable from this computer.
|
||||||
a.extend(["--publish".into(), format!("127.0.0.1:{ra_port}:{RA_PORT}")]);
|
a.extend(["--publish".into(), format!("127.0.0.1:{ra_port}:{RA_PORT}")]);
|
||||||
@@ -674,6 +698,17 @@ mod tests {
|
|||||||
assert!(runs[1].args.windows(2).any(|w| w == ["--env", "AC_WORLD_DATABASE_INFO"]), "name only, the value is in the environment");
|
assert!(runs[1].args.windows(2).any(|w| w == ["--env", "AC_WORLD_DATABASE_INFO"]), "name only, the value is in the environment");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn the_database_is_only_healthy_once_it_takes_tcp_connections() {
|
||||||
|
let (_d, root) = server("t1");
|
||||||
|
let sim = Sim::new();
|
||||||
|
assert!(start_all(&sim, &root).ok);
|
||||||
|
let db = &sim.calls_of("run")[0].args;
|
||||||
|
let i = db.iter().position(|a| a == "--health-cmd").expect("the database has a health check");
|
||||||
|
// Found on a new volume: a socket-only ping reported healthy about four seconds before TCP worked.
|
||||||
|
assert!(db[i + 1].contains("--protocol=tcp") && db[i + 1].contains("--host=127.0.0.1"), "{}", db[i + 1]);
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn the_world_container_is_wired_like_the_repack_layout() {
|
fn the_world_container_is_wired_like_the_repack_layout() {
|
||||||
let (_d, root) = server("t1");
|
let (_d, root) = server("t1");
|
||||||
@@ -714,8 +749,8 @@ mod tests {
|
|||||||
let (_d, root) = server("ports");
|
let (_d, root) = server("ports");
|
||||||
let cfg = Config::load(&root).unwrap();
|
let cfg = Config::load(&root).unwrap();
|
||||||
let n = cfg.names();
|
let n = cfg.names();
|
||||||
let world = game_args(&cfg, &n, GameKind::World, &root, 18085, 13443, None);
|
let world = game_args(&cfg, &n, GameKind::World, &root, &root.join("Data"), 18085, 13443, None);
|
||||||
let auth = game_args(&cfg, &n, GameKind::Auth, &root, 13724, 0, None);
|
let auth = game_args(&cfg, &n, GameKind::Auth, &root, &root.join("Data"), 13724, 0, None);
|
||||||
assert!(world.iter().any(|a| a == "127.0.0.1:18085:8085"));
|
assert!(world.iter().any(|a| a == "127.0.0.1:18085:8085"));
|
||||||
assert!(world.iter().any(|a| a == "127.0.0.1:13443:3443"));
|
assert!(world.iter().any(|a| a == "127.0.0.1:13443:3443"));
|
||||||
assert!(world.iter().any(|a| a == "AC_WORLD_SERVER_PORT=8085"));
|
assert!(world.iter().any(|a| a == "AC_WORLD_SERVER_PORT=8085"));
|
||||||
|
|||||||
@@ -15,10 +15,12 @@
|
|||||||
//! ```
|
//! ```
|
||||||
|
|
||||||
mod cli;
|
mod cli;
|
||||||
|
pub mod install;
|
||||||
mod lifecycle;
|
mod lifecycle;
|
||||||
|
|
||||||
pub use cli::{Call, Docker, Output, SystemDocker};
|
pub use cli::{Call, Docker, Output, SystemDocker};
|
||||||
pub use lifecycle::{observe, observe_with, run, run_with};
|
pub use lifecycle::{check_docker, observe, observe_with, run, run_with};
|
||||||
|
pub(crate) use lifecycle::destroy;
|
||||||
|
|
||||||
use std::net::IpAddr;
|
use std::net::IpAddr;
|
||||||
use std::path::Path;
|
use std::path::Path;
|
||||||
@@ -31,7 +33,7 @@ use crate::layout::{self, Classification, ScanReport};
|
|||||||
|
|
||||||
/// Present in a Docker installation, absent from a repack.
|
/// Present in a Docker installation, absent from a repack.
|
||||||
pub const MARKER: &str = "Settings/docker.json";
|
pub const MARKER: &str = "Settings/docker.json";
|
||||||
const MYSQL_IMAGE: &str = "mysql:8.4";
|
pub(crate) const MYSQL_IMAGE: &str = "mysql:8.4";
|
||||||
const RUNTIME_DOCKERFILE: &str = include_str!("Dockerfile.runtime");
|
const RUNTIME_DOCKERFILE: &str = include_str!("Dockerfile.runtime");
|
||||||
|
|
||||||
pub fn is_docker(root: &Path) -> bool {
|
pub fn is_docker(root: &Path) -> bool {
|
||||||
@@ -57,6 +59,10 @@ pub struct Config {
|
|||||||
pub bind_address: String,
|
pub bind_address: String,
|
||||||
#[serde(default = "mysql_image")]
|
#[serde(default = "mysql_image")]
|
||||||
pub mysql_image: String,
|
pub mysql_image: String,
|
||||||
|
/// Where the game data (dbc, maps, vmaps, mmaps) is, when it is not the `Data` folder of the server. Used in place and
|
||||||
|
/// mounted read-only, so one copy can serve several servers.
|
||||||
|
#[serde(default, skip_serializing_if = "Option::is_none")]
|
||||||
|
pub data_dir: Option<String>,
|
||||||
}
|
}
|
||||||
|
|
||||||
pub(crate) struct Names {
|
pub(crate) struct Names {
|
||||||
@@ -74,6 +80,11 @@ impl Config {
|
|||||||
Ok(cfg)
|
Ok(cfg)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// The folder mounted as the game data.
|
||||||
|
pub fn data_path(&self, root: &Path) -> std::path::PathBuf {
|
||||||
|
self.data_dir.as_deref().map(std::path::PathBuf::from).unwrap_or_else(|| root.join("Data"))
|
||||||
|
}
|
||||||
|
|
||||||
fn validate(&self) -> Result<()> {
|
fn validate(&self) -> Result<()> {
|
||||||
let name_ok = !self.project.is_empty()
|
let name_ok = !self.project.is_empty()
|
||||||
&& self.project.len() <= 32
|
&& self.project.len() <= 32
|
||||||
@@ -85,6 +96,12 @@ impl Config {
|
|||||||
if self.bind_address.parse::<IpAddr>().is_err() {
|
if self.bind_address.parse::<IpAddr>().is_err() {
|
||||||
return Err(Error::Invalid(format!("{} is not an IP address.", self.bind_address)));
|
return Err(Error::Invalid(format!("{} is not an IP address.", self.bind_address)));
|
||||||
}
|
}
|
||||||
|
if let Some(d) = &self.data_dir {
|
||||||
|
// The folder goes into a `--volume host:container:ro` option, where a colon would be read as a separator.
|
||||||
|
if !Path::new(d).is_absolute() || d.contains(':') {
|
||||||
|
return Err(Error::Invalid("The game data folder must be a full path without a colon.".into()));
|
||||||
|
}
|
||||||
|
}
|
||||||
let image_ok = !self.mysql_image.is_empty() && self.mysql_image.chars().all(|c| c.is_ascii_alphanumeric() || "._/:@-".contains(c));
|
let image_ok = !self.mysql_image.is_empty() && self.mysql_image.chars().all(|c| c.is_ascii_alphanumeric() || "._/:@-".contains(c));
|
||||||
if !image_ok {
|
if !image_ok {
|
||||||
return Err(Error::Invalid("The database image name is not valid.".into()));
|
return Err(Error::Invalid("The database image name is not valid.".into()));
|
||||||
@@ -103,6 +120,21 @@ impl Config {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Create the world and auth configuration files from their `.dist` templates when they do not exist. A package only
|
||||||
|
/// carries the templates, and on Windows the launcher writes the active files at every start; here nothing else would.
|
||||||
|
/// An existing file is never touched, so the person's settings survive updates. Returns the files created.
|
||||||
|
pub fn ensure_main_configs(root: &Path) -> Result<Vec<String>> {
|
||||||
|
let mut created = Vec::new();
|
||||||
|
for name in ["worldserver", "authserver"] {
|
||||||
|
let (conf, dist) = (root.join(format!("Core/configs/{name}.conf")), root.join(format!("Core/configs/{name}.conf.dist")));
|
||||||
|
if !conf.exists() && dist.is_file() {
|
||||||
|
std::fs::copy(&dist, &conf)?;
|
||||||
|
created.push(format!("{name}.conf"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(created)
|
||||||
|
}
|
||||||
|
|
||||||
/// Name of the runtime image: it follows the content of its Dockerfile, so changing the libraries builds a new image.
|
/// Name of the runtime image: it follows the content of its Dockerfile, so changing the libraries builds a new image.
|
||||||
pub(crate) fn runtime_image() -> String {
|
pub(crate) fn runtime_image() -> String {
|
||||||
format!("coa-runtime:{}", &fsx::sha256_bytes(RUNTIME_DOCKERFILE.as_bytes())[..12])
|
format!("coa-runtime:{}", &fsx::sha256_bytes(RUNTIME_DOCKERFILE.as_bytes())[..12])
|
||||||
@@ -123,7 +155,8 @@ pub(crate) fn scan(root: &Path) -> Result<ScanReport> {
|
|||||||
let bot_active = modules_dir.join("mod_coa_playerbots.conf");
|
let bot_active = modules_dir.join("mod_coa_playerbots.conf");
|
||||||
let bot_conf = if bot_active.is_file() { bot_active } else { modules_dir.join("mod_coa_playerbots.conf.dist") };
|
let bot_conf = if bot_active.is_file() { bot_active } else { modules_dir.join("mod_coa_playerbots.conf.dist") };
|
||||||
let bot_config_keys = layout::count_bot_keys(&bot_conf);
|
let bot_config_keys = layout::count_bot_keys(&bot_conf);
|
||||||
let has_data = layout::exists(root, "Data/dbc") && layout::exists(root, "Data/maps");
|
let data = cfg.as_ref().map(|c| c.data_path(root)).unwrap_or_else(|_| root.join("Data"));
|
||||||
|
let has_data = data.join("dbc").is_dir() && data.join("maps").is_dir();
|
||||||
let has_confs = layout::exists(root, "Core/configs/worldserver.conf") && layout::exists(root, "Core/configs/authserver.conf");
|
let has_confs = layout::exists(root, "Core/configs/worldserver.conf") && layout::exists(root, "Core/configs/authserver.conf");
|
||||||
|
|
||||||
let items = vec![
|
let items = vec![
|
||||||
@@ -162,3 +195,30 @@ pub(crate) fn scan(root: &Path) -> Result<ScanReport> {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
use std::fs;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn the_main_configs_are_created_from_their_templates_and_never_overwritten() {
|
||||||
|
let d = tempfile::tempdir().unwrap();
|
||||||
|
let cfg = d.path().join("Core/configs");
|
||||||
|
fs::create_dir_all(&cfg).unwrap();
|
||||||
|
fs::write(cfg.join("worldserver.conf.dist"), "Setting = default\n").unwrap();
|
||||||
|
fs::write(cfg.join("authserver.conf.dist"), "Auth = default\n").unwrap();
|
||||||
|
|
||||||
|
assert_eq!(ensure_main_configs(d.path()).unwrap(), ["worldserver.conf", "authserver.conf"]);
|
||||||
|
assert_eq!(fs::read_to_string(cfg.join("worldserver.conf")).unwrap(), "Setting = default\n");
|
||||||
|
|
||||||
|
// The person's own settings survive the next start.
|
||||||
|
fs::write(cfg.join("worldserver.conf"), "Setting = mine\n").unwrap();
|
||||||
|
assert!(ensure_main_configs(d.path()).unwrap().is_empty());
|
||||||
|
assert_eq!(fs::read_to_string(cfg.join("worldserver.conf")).unwrap(), "Setting = mine\n");
|
||||||
|
// Without a template there is nothing to create and nothing fails.
|
||||||
|
fs::remove_file(cfg.join("authserver.conf")).unwrap();
|
||||||
|
fs::remove_file(cfg.join("authserver.conf.dist")).unwrap();
|
||||||
|
assert!(ensure_main_configs(d.path()).unwrap().is_empty());
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -31,11 +31,25 @@ pub struct Settings {
|
|||||||
pub mode: Mode,
|
pub mode: Mode,
|
||||||
/// The address friends type into their client for this mode.
|
/// The address friends type into their client for this mode.
|
||||||
pub host: Option<String>,
|
pub host: Option<String>,
|
||||||
|
/// Independent of the effective host of the current mode. None means automatic LAN detection.
|
||||||
|
#[serde(default)]
|
||||||
|
pub lan_address_override: Option<String>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Default for Settings {
|
impl Default for Settings {
|
||||||
fn default() -> Self {
|
fn default() -> Self {
|
||||||
Settings { mode: Mode::Local, host: None }
|
Settings { mode: Mode::Local, host: None, lan_address_override: None }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Settings {
|
||||||
|
/// Only LAN application changes the LAN preference. Other modes keep it for the next LAN session.
|
||||||
|
pub fn select_mode(&mut self, mode: Mode, host: String, lan_override: Option<String>) {
|
||||||
|
if mode == Mode::Lan {
|
||||||
|
self.lan_address_override = lan_override;
|
||||||
|
}
|
||||||
|
self.mode = mode;
|
||||||
|
self.host = Some(host);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -233,7 +247,7 @@ CoA.AllowRemoteClients = 0
|
|||||||
fn a_shared_server_gets_its_bind_address_back_before_start_and_a_local_one_is_left_alone() {
|
fn a_shared_server_gets_its_bind_address_back_before_start_and_a_local_one_is_left_alone() {
|
||||||
let (_d, root, meta) = setup();
|
let (_d, root, meta) = setup();
|
||||||
assert!(!ensure_bind(&root, &meta).unwrap(), "local mode: nothing to do");
|
assert!(!ensure_bind(&root, &meta).unwrap(), "local mode: nothing to do");
|
||||||
save(&meta, &Settings { mode: Mode::Private, host: Some("100.64.1.2".into()) }).unwrap();
|
save(&meta, &Settings { mode: Mode::Private, host: Some("100.64.1.2".into()), ..Settings::default() }).unwrap();
|
||||||
assert!(ensure_bind(&root, &meta).unwrap(), "templates were reset to 127.0.0.1 -> reopened");
|
assert!(ensure_bind(&root, &meta).unwrap(), "templates were reset to 127.0.0.1 -> reopened");
|
||||||
assert!(bind_is_open(&root));
|
assert!(bind_is_open(&root));
|
||||||
assert!(!ensure_bind(&root, &meta).unwrap(), "already open: idempotent");
|
assert!(!ensure_bind(&root, &meta).unwrap(), "already open: idempotent");
|
||||||
@@ -243,11 +257,39 @@ CoA.AllowRemoteClients = 0
|
|||||||
fn settings_round_trip_and_default_to_local() {
|
fn settings_round_trip_and_default_to_local() {
|
||||||
let d = tempfile::tempdir().unwrap();
|
let d = tempfile::tempdir().unwrap();
|
||||||
assert_eq!(load(d.path()).mode, Mode::Local);
|
assert_eq!(load(d.path()).mode, Mode::Local);
|
||||||
save(d.path(), &Settings { mode: Mode::Private, host: Some("100.64.1.2".into()) }).unwrap();
|
save(d.path(), &Settings { mode: Mode::Private, host: Some("100.64.1.2".into()), ..Settings::default() }).unwrap();
|
||||||
let s = load(d.path());
|
let s = load(d.path());
|
||||||
assert_eq!((s.mode, s.host.as_deref()), (Mode::Private, Some("100.64.1.2")));
|
assert_eq!((s.mode, s.host.as_deref()), (Mode::Private, Some("100.64.1.2")));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn old_settings_load_without_migrating_effective_host_to_override() {
|
||||||
|
let s: Settings = serde_json::from_str(r#"{"mode":"lan","host":"192.168.1.50"}"#).unwrap();
|
||||||
|
assert_eq!(s.mode, Mode::Lan);
|
||||||
|
assert_eq!(s.host.as_deref(), Some("192.168.1.50"));
|
||||||
|
assert_eq!(s.lan_address_override, None);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn lan_preference_survives_save_load_and_every_other_mode_and_can_be_cleared() {
|
||||||
|
let d = tempfile::tempdir().unwrap();
|
||||||
|
let mut s = Settings::default();
|
||||||
|
s.select_mode(Mode::Lan, "192.168.1.50".into(), Some("192.168.1.50".into()));
|
||||||
|
for (mode, host) in [(Mode::Private, "100.101.20.5"), (Mode::Direct, "203.0.113.9"), (Mode::Local, "127.0.0.1")] {
|
||||||
|
s.select_mode(mode, host.into(), None);
|
||||||
|
save(d.path(), &s).unwrap();
|
||||||
|
s = load(d.path());
|
||||||
|
assert_eq!(s.lan_address_override.as_deref(), Some("192.168.1.50"));
|
||||||
|
assert_eq!(s.host.as_deref(), Some(host));
|
||||||
|
let lan = crate::net::resolve_lan_host(s.lan_address_override.as_deref(), Some("192.168.0.169".parse().unwrap())).unwrap();
|
||||||
|
s.select_mode(Mode::Lan, lan, s.lan_address_override.clone());
|
||||||
|
assert_eq!(s.host.as_deref(), Some("192.168.1.50"));
|
||||||
|
}
|
||||||
|
s.select_mode(Mode::Lan, "192.168.0.169".into(), None);
|
||||||
|
save(d.path(), &s).unwrap();
|
||||||
|
assert_eq!(load(d.path()).lan_address_override, None);
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn friend_package_contains_only_whitelisted_files() {
|
fn friend_package_contains_only_whitelisted_files() {
|
||||||
let (d, root, _m) = setup();
|
let (d, root, _m) = setup();
|
||||||
@@ -274,4 +316,23 @@ CoA.AllowRemoteClients = 0
|
|||||||
}
|
}
|
||||||
assert!(make_friend_package(&root, "bad host; x", false, &d.path().join("x.zip")).is_err());
|
assert!(make_friend_package(&root, "bad host; x", false, &d.path().join("x.zip")).is_err());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn manual_lan_host_survives_startup_bind_restoration_and_drives_friend_package() {
|
||||||
|
let (d, root, meta) = setup();
|
||||||
|
let mut s = Settings::default();
|
||||||
|
s.select_mode(Mode::Lan, "192.168.1.50".into(), Some("192.168.1.50".into()));
|
||||||
|
save(&meta, &s).unwrap();
|
||||||
|
assert!(ensure_bind(&root, &meta).unwrap());
|
||||||
|
assert!(bind_is_open(&root));
|
||||||
|
let restored = load(&meta);
|
||||||
|
assert_eq!(restored.host.as_deref(), Some("192.168.1.50"));
|
||||||
|
assert_eq!(restored.lan_address_override.as_deref(), Some("192.168.1.50"));
|
||||||
|
let package = d.path().join("manual-lan.zip");
|
||||||
|
make_friend_package(&root, restored.host.as_deref().unwrap(), false, &package).unwrap();
|
||||||
|
let mut zip = zip::ZipArchive::new(fs::File::open(package).unwrap()).unwrap();
|
||||||
|
let mut realm = String::new();
|
||||||
|
std::io::Read::read_to_string(&mut zip.by_name("realmlist.wtf").unwrap(), &mut realm).unwrap();
|
||||||
|
assert_eq!(realm, "set realmlist 192.168.1.50\r\n");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -35,7 +35,7 @@ pub struct Preflight {
|
|||||||
pub free_bytes: u64,
|
pub free_bytes: u64,
|
||||||
}
|
}
|
||||||
|
|
||||||
fn problem(code: &'static str, message: &str) -> Problem {
|
pub(crate) fn problem(code: &'static str, message: &str) -> Problem {
|
||||||
Problem { code, message: message.into() }
|
Problem { code, message: message.into() }
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -133,7 +133,7 @@ pub struct Installed {
|
|||||||
pub version: String,
|
pub version: String,
|
||||||
}
|
}
|
||||||
|
|
||||||
fn random_hex(n: usize) -> String {
|
pub(crate) fn random_hex(n: usize) -> String {
|
||||||
let mut s = String::new();
|
let mut s = String::new();
|
||||||
while s.len() < n {
|
while s.len() < n {
|
||||||
s.push_str(&uuid::Uuid::new_v4().simple().to_string());
|
s.push_str(&uuid::Uuid::new_v4().simple().to_string());
|
||||||
@@ -148,7 +148,7 @@ pub(crate) fn bootstrap_database(root: &Path) -> Result<()> {
|
|||||||
with_scratch_ports(root, || bootstrap_database_inner(root))
|
with_scratch_ports(root, || bootstrap_database_inner(root))
|
||||||
}
|
}
|
||||||
|
|
||||||
fn free_port() -> Result<u16> {
|
pub(crate) fn free_port() -> Result<u16> {
|
||||||
Ok(std::net::TcpListener::bind("127.0.0.1:0")?.local_addr()?.port())
|
Ok(std::net::TcpListener::bind("127.0.0.1:0")?.local_addr()?.port())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -37,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 report;
|
||||||
pub mod release_schema;
|
pub mod release_schema;
|
||||||
pub mod update;
|
pub mod update;
|
||||||
pub mod upnp;
|
pub mod upnp;
|
||||||
|
|||||||
@@ -19,6 +19,51 @@ pub fn lan_ip() -> Option<Ipv4Addr> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, PartialEq, Eq, Serialize)]
|
||||||
|
pub struct LanAddress {
|
||||||
|
pub interface: String,
|
||||||
|
pub address: String,
|
||||||
|
pub is_default: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Suitable unicast IPv4 addresses; shared carrier/Tailscale space belongs to Private mode.
|
||||||
|
pub fn is_lan_address(ip: Ipv4Addr) -> bool {
|
||||||
|
!ip.is_unspecified() && !ip.is_loopback() && !ip.is_link_local()
|
||||||
|
&& !ip.is_multicast() && !ip.is_broadcast() && ip.octets()[0] != 0
|
||||||
|
&& ip.octets()[0] < 240 && !is_cgnat_range(ip)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn validate_lan_address(address: &str) -> Result<Ipv4Addr> {
|
||||||
|
address.parse::<Ipv4Addr>().ok().filter(|ip| is_lan_address(*ip))
|
||||||
|
.ok_or_else(|| Error::Invalid("Invalid IPv4 address for local network.".into()))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// An absent/disconnected manual address is intentional: never fall back to another adapter.
|
||||||
|
pub fn resolve_lan_host(manual: Option<&str>, automatic: Option<Ipv4Addr>) -> Result<String> {
|
||||||
|
match manual {
|
||||||
|
Some(address) => validate_lan_address(address).map(|ip| ip.to_string()),
|
||||||
|
None => automatic.filter(|ip| is_lan_address(*ip)).map(|ip| ip.to_string())
|
||||||
|
.ok_or_else(|| Error::Invalid("This computer has no usable local network address.".into())),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn lan_candidates(rows: impl IntoIterator<Item = (String, Ipv4Addr)>, automatic: Option<Ipv4Addr>) -> Vec<LanAddress> {
|
||||||
|
let mut rows: Vec<_> = rows.into_iter().filter(|(_, ip)| is_lan_address(*ip)).collect();
|
||||||
|
rows.sort_by(|a, b| a.0.cmp(&b.0).then(a.1.cmp(&b.1)));
|
||||||
|
let mut seen = std::collections::HashSet::new();
|
||||||
|
rows.into_iter().filter(|(_, ip)| seen.insert(*ip)).map(|(interface, ip)| LanAddress {
|
||||||
|
interface, address: ip.to_string(), is_default: Some(ip) == automatic,
|
||||||
|
}).collect()
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Native OS enumeration (GetAdaptersAddresses on Windows, getifaddrs on Unix).
|
||||||
|
pub fn lan_addresses(automatic: Option<Ipv4Addr>) -> Result<Vec<LanAddress>> {
|
||||||
|
let interfaces = if_addrs::get_if_addrs()?;
|
||||||
|
Ok(lan_candidates(interfaces.into_iter().filter(|i| i.is_oper_up()).filter_map(|i| {
|
||||||
|
match i.ip() { IpAddr::V4(ip) => Some((i.name, ip)), _ => None }
|
||||||
|
}), automatic))
|
||||||
|
}
|
||||||
|
|
||||||
pub fn is_private(ip: Ipv4Addr) -> bool {
|
pub fn is_private(ip: Ipv4Addr) -> bool {
|
||||||
ip.is_private() || ip.is_loopback() || ip.is_link_local()
|
ip.is_private() || ip.is_loopback() || ip.is_link_local()
|
||||||
}
|
}
|
||||||
@@ -132,6 +177,42 @@ mod tests {
|
|||||||
s.parse().unwrap()
|
s.parse().unwrap()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn lan_validation_and_resolution_never_replace_manual_addresses() {
|
||||||
|
for good in ["192.168.1.20", "10.0.0.5", "172.16.2.4"] {
|
||||||
|
assert!(validate_lan_address(good).is_ok());
|
||||||
|
}
|
||||||
|
for bad in ["abc", "999.1.1.1", "0.0.0.0", "0.1.2.3", "127.0.0.1", "127.9.1.2", "169.254.10.20", "100.101.20.5", "224.0.0.1", "255.255.255.255", "240.0.0.1", "192.168.1.1'; DROP TABLE realmlist"] {
|
||||||
|
assert!(validate_lan_address(bad).is_err(), "{bad}");
|
||||||
|
}
|
||||||
|
let automatic = Some(ip("192.168.0.169"));
|
||||||
|
assert_eq!(resolve_lan_host(None, automatic).unwrap(), "192.168.0.169");
|
||||||
|
assert_eq!(resolve_lan_host(Some("192.168.1.50"), automatic).unwrap(), "192.168.1.50");
|
||||||
|
assert_eq!(resolve_lan_host(Some("192.168.1.50"), None).unwrap(), "192.168.1.50");
|
||||||
|
assert!(resolve_lan_host(Some("invalid"), automatic).is_err());
|
||||||
|
assert!(resolve_lan_host(None, None).is_err());
|
||||||
|
assert!(resolve_lan_host(None, Some(ip("169.254.1.2"))).is_err());
|
||||||
|
assert!(resolve_lan_host(None, Some(ip("100.100.1.2"))).is_err());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn candidates_are_filtered_deduplicated_deterministic_and_default_marked() {
|
||||||
|
let rows = vec![
|
||||||
|
("Wi-Fi", "192.168.0.25"), ("Ethernet 2", "192.168.1.50"),
|
||||||
|
("Ethernet", "192.168.0.169"), ("Duplicate", "192.168.1.50"),
|
||||||
|
("Loopback", "127.0.0.2"), ("APIPA", "169.254.1.2"),
|
||||||
|
("Tailscale", "100.101.20.5"), ("Empty", "0.0.0.0"),
|
||||||
|
("Hyper-V Virtual", "10.0.0.5"),
|
||||||
|
];
|
||||||
|
let make = |rows: Vec<(&str, &str)>| lan_candidates(rows.into_iter().map(|(name, address)| (name.into(), ip(address))), Some(ip("192.168.0.169")));
|
||||||
|
let result = make(rows.clone());
|
||||||
|
assert_eq!(result.len(), 4);
|
||||||
|
assert_eq!(result.iter().filter(|a| a.is_default).count(), 1);
|
||||||
|
assert!(result.iter().any(|a| a.interface == "Hyper-V Virtual"));
|
||||||
|
assert!(result.iter().any(|a| a.is_default && a.address == "192.168.0.169"));
|
||||||
|
assert_eq!(result, make(rows.into_iter().rev().collect()));
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn address_classes() {
|
fn address_classes() {
|
||||||
assert!(is_private(ip("192.168.1.5")) && is_private(ip("10.0.0.2")) && is_private(ip("172.16.4.4")) && is_private(ip("127.0.0.1")));
|
assert!(is_private(ip("192.168.1.5")) && is_private(ip("10.0.0.2")) && is_private(ip("172.16.4.4")) && is_private(ip("127.0.0.1")));
|
||||||
|
|||||||
@@ -21,6 +21,12 @@ pub const DEFAULT_PART_SIZE: u64 = 1_900_000_000;
|
|||||||
/// Archive path of the one-time database credentials shipped with a base package.
|
/// Archive path of the one-time database credentials shipped with a base package.
|
||||||
pub const BOOTSTRAP_CREDENTIALS: &str = "Settings/database.bootstrap.json";
|
pub const BOOTSTRAP_CREDENTIALS: &str = "Settings/database.bootstrap.json";
|
||||||
|
|
||||||
|
/// Folder of a Linux (Docker) package that holds the starting databases: `<kind>.sql.zst` for `auth`, `characters`
|
||||||
|
/// and `world`, in the format of the Manager's own backups. They hold the state in which every migration of the package is
|
||||||
|
/// already applied (a world database cannot be rebuilt from the repository's SQL files: some migrations are guarded and
|
||||||
|
/// only apply to the maintainers' own database).
|
||||||
|
pub const BASELINE_DIR: &str = "Database/baseline";
|
||||||
|
|
||||||
/// Files that never belong in a shipped package: per-install state, logs, secrets, old binaries.
|
/// Files that never belong in a shipped package: per-install state, logs, secrets, old binaries.
|
||||||
pub fn excluded(rel: &str) -> bool {
|
pub fn excluded(rel: &str) -> bool {
|
||||||
if rel.replace('\\', "/").to_lowercase().starts_with(".realms/") { return true; }
|
if rel.replace('\\', "/").to_lowercase().starts_with(".realms/") { return true; }
|
||||||
|
|||||||
@@ -250,6 +250,19 @@ pub fn is_alive(record: &ProcessIdentity) -> bool {
|
|||||||
identity(record.pid).map(|cur| cur.same_as(record)).unwrap_or(false)
|
identity(record.pid).map(|cur| cur.same_as(record)).unwrap_or(false)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Every running process whose image file is named one of `names` (compared without case), wherever it lives. Only for
|
||||||
|
/// diagnostics: a process found this way is not trusted to belong to any installation.
|
||||||
|
pub fn find_by_file_names(names: &[&str]) -> Vec<ProcessIdentity> {
|
||||||
|
sys::all_pids()
|
||||||
|
.into_iter()
|
||||||
|
.filter_map(identity)
|
||||||
|
.filter(|p| {
|
||||||
|
let file = p.exe.rsplit(['\\', '/']).next().unwrap_or("");
|
||||||
|
names.iter().any(|n| file.eq_ignore_ascii_case(n))
|
||||||
|
})
|
||||||
|
.collect()
|
||||||
|
}
|
||||||
|
|
||||||
/// Every running process whose image is exactly `exe`.
|
/// Every running process whose image is exactly `exe`.
|
||||||
pub fn find_by_exe(exe: &Path) -> Vec<ProcessIdentity> {
|
pub fn find_by_exe(exe: &Path) -> Vec<ProcessIdentity> {
|
||||||
let want = exe.to_string_lossy().to_lowercase().replace('/', "\\");
|
let want = exe.to_string_lossy().to_lowercase().replace('/', "\\");
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ use crate::fsx;
|
|||||||
|
|
||||||
pub const META_SCHEMA: u32 = 1;
|
pub const META_SCHEMA: u32 = 1;
|
||||||
pub const LAYOUT_REPACK_V1: &str = "repack-v1";
|
pub const LAYOUT_REPACK_V1: &str = "repack-v1";
|
||||||
|
pub const LAYOUT_DOCKER_V1: &str = "docker-v1";
|
||||||
const META_SUBDIRS: [&str; 6] = ["manifests", "backups", "migrations", "logs", "cache", "staging"];
|
const META_SUBDIRS: [&str; 6] = ["manifests", "backups", "migrations", "logs", "cache", "staging"];
|
||||||
|
|
||||||
#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
|
#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
|
|||||||
@@ -87,6 +87,21 @@ pub fn collect_core_sql(core: &Path) -> Result<Vec<SqlFile>> {
|
|||||||
Ok(out)
|
Ok(out)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Dump the three game databases of `server` (a repack or a Docker server, started if needed) into `out` as the starting
|
||||||
|
/// databases of a Linux package: `<kind>.sql.zst`. The databases must be in the state in which every migration of the
|
||||||
|
/// package is applied. Returns (kind, compressed bytes) per database.
|
||||||
|
pub fn export_baseline(server: &Path, out: &Path) -> Result<Vec<(String, u64)>> {
|
||||||
|
fs::create_dir_all(out)?;
|
||||||
|
crate::backup::with_database(server, |db| {
|
||||||
|
let mut done = Vec::new();
|
||||||
|
for (kind, schema) in crate::db::SCHEMAS {
|
||||||
|
let (bytes, _) = db.dump_to(schema, &out.join(format!("{kind}.sql.zst")))?;
|
||||||
|
done.push((kind.to_string(), bytes));
|
||||||
|
}
|
||||||
|
Ok(done)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
/// SQL a bots module checkout ships for the characters database (its `dist/sql`).
|
/// SQL a bots module checkout ships for the characters database (its `dist/sql`).
|
||||||
pub fn collect_bots_sql(bots: &Path) -> Result<Vec<SqlFile>> {
|
pub fn collect_bots_sql(bots: &Path) -> Result<Vec<SqlFile>> {
|
||||||
let mut out = Vec::new();
|
let mut out = Vec::new();
|
||||||
|
|||||||
@@ -0,0 +1,116 @@
|
|||||||
|
//! Where a problem report goes. A report about the bots goes to the repository of the bot system in question, anything
|
||||||
|
//! else to the Manager's own. The repositories come from the module catalog, so there is one list to keep right.
|
||||||
|
|
||||||
|
use std::path::Path;
|
||||||
|
|
||||||
|
use serde::Serialize;
|
||||||
|
|
||||||
|
pub const MANAGER_REPO: &str = "Corfirean/coa-server-manager";
|
||||||
|
|
||||||
|
/// One place a report can be filed. `id` is what the page sends back; `repo` is `owner/name` on GitHub.
|
||||||
|
#[derive(Debug, Clone, Serialize, PartialEq, Eq)]
|
||||||
|
pub struct Target {
|
||||||
|
pub id: &'static str,
|
||||||
|
pub repo: String,
|
||||||
|
/// The report form asks for the Manager's labels only where we own the repository.
|
||||||
|
pub ours: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// `https://github.com/owner/name/tree/main/x` -> `owner/name`.
|
||||||
|
fn repo_of(url: &str) -> Option<String> {
|
||||||
|
let rest = url.strip_prefix("https://github.com/")?;
|
||||||
|
let mut parts = rest.split('/');
|
||||||
|
let (owner, name) = (parts.next()?, parts.next()?);
|
||||||
|
let ok = |s: &str| !s.is_empty() && s.chars().all(|c| c.is_ascii_alphanumeric() || "._-".contains(c));
|
||||||
|
(ok(owner) && ok(name)).then(|| format!("{owner}/{name}"))
|
||||||
|
}
|
||||||
|
|
||||||
|
fn catalog_repo(id: &str) -> Option<String> {
|
||||||
|
crate::modules::catalog().into_iter().find(|e| e.id == id).and_then(|e| repo_of(&e.repo))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The three places, in the order the page lists them. A bot system whose repository is unknown falls back to the Manager's.
|
||||||
|
pub fn targets() -> Vec<Target> {
|
||||||
|
let mut v = vec![Target { id: "manager", repo: MANAGER_REPO.into(), ours: true }];
|
||||||
|
for (id, module) in [("companions", "companions"), ("squid", "playerbots")] {
|
||||||
|
if let Some(repo) = catalog_repo(module) {
|
||||||
|
v.push(Target { id, repo: repo.clone(), ours: repo.starts_with("Corfirean/") });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
v
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn target(id: &str) -> Option<Target> {
|
||||||
|
targets().into_iter().find(|t| t.id == id)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// True for the "new issue" page of one of the targets: exactly that page, optionally with a query.
|
||||||
|
pub fn is_new_issue_url(url: &str) -> bool {
|
||||||
|
targets().iter().any(|t| {
|
||||||
|
let base = format!("https://github.com/{}/issues/new", t.repo);
|
||||||
|
url == base || url.starts_with(&format!("{base}?"))
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
/// What the report form fills in about the bot systems of this server.
|
||||||
|
#[derive(Debug, Clone, Serialize, PartialEq, Eq)]
|
||||||
|
pub struct Bots {
|
||||||
|
/// The target the form should start with: the bot system that is switched on, else the Manager.
|
||||||
|
pub suggested: &'static str,
|
||||||
|
/// The release of SQUID Playerbots, when it is the one switched on.
|
||||||
|
pub squid_version: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn bots(root: &Path) -> Bots {
|
||||||
|
let list = crate::modules::list(root);
|
||||||
|
let on = |id: &str| list.iter().find(|m| m.id == id).filter(|m| m.installed && m.enabled);
|
||||||
|
let squid = on("playerbots");
|
||||||
|
Bots {
|
||||||
|
suggested: if squid.is_some() { "squid" } else if on("companions").is_some() { "companions" } else { "manager" },
|
||||||
|
squid_version: squid.and_then(|m| m.version.clone()).filter(|v| !v.is_empty()),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn the_three_targets_come_from_the_catalog() {
|
||||||
|
let t = targets();
|
||||||
|
let repo = |id: &str| t.iter().find(|x| x.id == id).map(|x| x.repo.clone());
|
||||||
|
assert_eq!(repo("manager").as_deref(), Some("Corfirean/coa-server-manager"));
|
||||||
|
assert_eq!(repo("companions").as_deref(), Some("Corfirean/mod-coa-playerbots"));
|
||||||
|
assert_eq!(repo("squid").as_deref(), Some("Zyth45/mod-playerbots"));
|
||||||
|
assert!(t.iter().find(|x| x.id == "squid").is_some_and(|x| !x.ours));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn repository_names_are_read_from_module_links() {
|
||||||
|
assert_eq!(repo_of("https://github.com/Corfirean/azerothcore-wotlk-coa/tree/coa-bots/modules/x").as_deref(), Some("Corfirean/azerothcore-wotlk-coa"));
|
||||||
|
assert_eq!(repo_of("https://github.com/Zyth45/mod-playerbots").as_deref(), Some("Zyth45/mod-playerbots"));
|
||||||
|
assert_eq!(repo_of("https://example.com/a/b"), None);
|
||||||
|
assert_eq!(repo_of("https://github.com/a"), None);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn only_the_new_issue_pages_of_the_targets_are_allowed() {
|
||||||
|
assert!(is_new_issue_url("https://github.com/Zyth45/mod-playerbots/issues/new"));
|
||||||
|
assert!(is_new_issue_url("https://github.com/Corfirean/mod-coa-playerbots/issues/new?title=a&body=b"));
|
||||||
|
assert!(!is_new_issue_url("https://github.com/Zyth45/mod-playerbots/issues/newer"));
|
||||||
|
assert!(!is_new_issue_url("https://github.com/Zyth45/other/issues/new"));
|
||||||
|
assert!(!is_new_issue_url("https://evil.example/Corfirean/coa-server-manager/issues/new"));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn the_suggested_target_follows_the_bot_system_that_is_on() {
|
||||||
|
let d = tempfile::tempdir().unwrap();
|
||||||
|
let root = d.path().join("srv");
|
||||||
|
crate::layout::testkit::fake_repack(&root);
|
||||||
|
let conf = root.join("Core/configs/modules");
|
||||||
|
std::fs::write(conf.join("mod_coa_playerbots.conf"), "CoaBots.Enable = 1\n").unwrap();
|
||||||
|
assert_eq!(bots(&root).suggested, "companions");
|
||||||
|
std::fs::write(conf.join("mod_coa_playerbots.conf"), "CoaBots.Enable = 0\n").unwrap();
|
||||||
|
assert_eq!(bots(&root).suggested, "manager");
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -6,6 +6,7 @@
|
|||||||
//! coa-release extract-schema-base --package DIR --fixture NEW-coa-schema-fixture-DIR
|
//! 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 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 export-baseline --server DIR --out DIR (the three databases of a prepared server, for a Linux package)
|
||||||
//! 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)
|
||||||
|
|
||||||
@@ -93,6 +94,12 @@ fn run() -> Result<(), String> {
|
|||||||
coa_core::cleanbase::build(&coa_core::cleanbase::Params { repack: &repack, core: &core, bots: bots.as_deref(), tree: &tree, data: data.as_deref(), out: &out }, &|s| eprintln!("{s}")).map_err(e)?;
|
coa_core::cleanbase::build(&coa_core::cleanbase::Params { repack: &repack, core: &core, bots: bots.as_deref(), tree: &tree, data: data.as_deref(), out: &out }, &|s| eprintln!("{s}")).map_err(e)?;
|
||||||
println!("clean base tree at {}", out.display());
|
println!("clean base tree at {}", out.display());
|
||||||
}
|
}
|
||||||
|
"export-baseline" => {
|
||||||
|
let done = coa_core::release::export_baseline(&PathBuf::from(need(&a, "server")?), &PathBuf::from(need(&a, "out")?)).map_err(e)?;
|
||||||
|
for (kind, bytes) in done {
|
||||||
|
println!("{kind}.sql.zst: {:.1} MB", bytes as f64 / 1e6);
|
||||||
|
}
|
||||||
|
}
|
||||||
"sign" => {
|
"sign" => {
|
||||||
let dir = PathBuf::from(need(&a, "dir")?);
|
let dir = PathBuf::from(need(&a, "dir")?);
|
||||||
require_contract_entry(&dir)?;
|
require_contract_entry(&dir)?;
|
||||||
|
|||||||
+38
-1
@@ -374,9 +374,46 @@ hand over to `coa_core::docker`; nothing else needed to change for start, stop,
|
|||||||
commands do on the host (password through `MYSQL_PWD`, never on a command line). Nothing else changes: accounts,
|
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
|
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.
|
MySQL client. A repack keeps using its bundled tools.
|
||||||
* **Not done yet**: installation and the database setup (schemas, `acore` user), updates, port conflict detection,
|
* **Health of the database container** is a ping over TCP, like every connection the Manager makes. On a new volume the
|
||||||
|
image first runs a temporary server that answers on its socket but takes no network connection; a socket ping reported
|
||||||
|
the container healthy about four seconds before TCP worked (measured: 10 s against 14 s).
|
||||||
|
* **Main configuration files**: a package carries only `worldserver.conf.dist` and `authserver.conf.dist` (the release
|
||||||
|
tool leaves active files out). On Windows the launcher writes them at each start; on Docker `ensure_main_configs` creates
|
||||||
|
them from the templates when they are missing, at installation and at every start, and never overwrites one.
|
||||||
|
* **Installing a new server** (`docker/install.rs`, separate from `install::install_base`, which is not touched). Same
|
||||||
|
order of events: signed manifest, space and folder checks, verified download, extraction into `<dest>.installing`,
|
||||||
|
database, then one rename. The package must hold `Core/worldserver`, `Core/authserver`, the `.dist` templates,
|
||||||
|
`_migrations/` and **`Database/baseline/{auth,characters,world}.sql.zst`**. The baseline is a dump, in the format of the
|
||||||
|
Manager's backups, of databases in which **every migration of the package is already applied**; the installer imports
|
||||||
|
it, records those migrations as applied (`baseline = 1`, a few bulk statements) and creates the `acore` account, the
|
||||||
|
realm port and the console account. It is the same arrangement as a Windows package, which ships its prepared database.
|
||||||
|
The databases are **not rebuilt from the repository's SQL**: some migrations are guards generated from the maintainers'
|
||||||
|
live database (`rev_20260903_01_live_class_baseline` refuses to run unless the table holds exactly the rows it expects),
|
||||||
|
so replaying the SQL files from the base scripts fails, in any order. `coa-release export-baseline --server DIR --out DIR`
|
||||||
|
produces the dumps from a prepared server (repack or Docker). The game data stays where the person has it
|
||||||
|
(`dataDir` in `docker.json`, mounted read-only). A failure removes the containers, the volume and the staging folder.
|
||||||
|
* **Not done yet**: wiring the installer into the screens, downloading the game data, updates, port conflict detection,
|
||||||
the firewall and exposure checks, the Wildcard realm profiles, and the client under Wine/Proton.
|
the firewall and exposure checks, the Wildcard realm profiles, and the client under Wine/Proton.
|
||||||
|
|
||||||
|
### D14. Keeping Windows and Linux apart
|
||||||
|
|
||||||
|
A fix for one platform must not be able to break the other. The rules:
|
||||||
|
|
||||||
|
1. **Platform code lives in its own modules**: `coa_core::docker` for Linux and Docker; the repack code (`driver`, `process`,
|
||||||
|
`install`, `layout` and the bundled-tool half of `db`) for Windows. A new Linux feature is a new file there, not an edit
|
||||||
|
of a repack function.
|
||||||
|
2. **Shared modules hold platform-neutral logic only** (manifest, signing, download, extraction, migrations, backups,
|
||||||
|
configuration editing, the registry).
|
||||||
|
3. **The difference enters in as few places as possible**: the early `is_docker` return at the top of `driver::run`,
|
||||||
|
`process::observe`, `layout::scan` and `Db::from_repack`, and the platform checks of the Tauri layer. Everything past
|
||||||
|
that point belongs to one platform.
|
||||||
|
4. **No `cfg` in the middle of a shared algorithm.** Where one is unavoidable (file modes, a path comparison), it is small,
|
||||||
|
commented, and the other platform's branch is the code that was there before.
|
||||||
|
5. **Reuse by calling, not by editing**: a Linux feature that needs a helper from a Windows-side file makes it
|
||||||
|
`pub(crate)` and calls it (visibility only); it does not change what the helper does.
|
||||||
|
6. **Both platforms are tested on every pull request** (`check.yml`: Windows and Linux). Tests of one platform's behaviour
|
||||||
|
are marked for that platform, so they cannot fail on the other.
|
||||||
|
|
||||||
---------------------------------------------------------------------------------------------------------
|
---------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
## 3. Flows
|
## 3. Flows
|
||||||
|
|||||||
Generated
+2
-2
@@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "coa-server-manager",
|
"name": "coa-server-manager",
|
||||||
"version": "0.6.5",
|
"version": "0.6.6",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "coa-server-manager",
|
"name": "coa-server-manager",
|
||||||
"version": "0.6.5",
|
"version": "0.6.6",
|
||||||
"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.5",
|
"version": "0.6.6",
|
||||||
"license": "AGPL-3.0-only",
|
"license": "AGPL-3.0-only",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|||||||
+30
-8
@@ -1249,6 +1249,7 @@ async fn play(state: State<'_, AppState>, id: String) -> std::result::Result<Dri
|
|||||||
struct FriendsStatus {
|
struct FriendsStatus {
|
||||||
settings: coa_core::friends::Settings,
|
settings: coa_core::friends::Settings,
|
||||||
lan_ip: Option<String>,
|
lan_ip: Option<String>,
|
||||||
|
lan_addresses: Vec<coa_core::net::LanAddress>,
|
||||||
exposure: Vec<coa_core::net::Exposure>,
|
exposure: Vec<coa_core::net::Exposure>,
|
||||||
/// The configuration lets other computers reach the login and world servers.
|
/// The configuration lets other computers reach the login and world servers.
|
||||||
servers_open: bool,
|
servers_open: bool,
|
||||||
@@ -1265,10 +1266,9 @@ struct FriendsStatus {
|
|||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
fn open_link(url: String) -> std::result::Result<(), UiError> {
|
fn open_link(url: String) -> std::result::Result<(), UiError> {
|
||||||
const ALLOWED: &[&str] = &["https://tailscale.com/", "https://login.tailscale.com/", "https://portforward.com/", "https://github.com/Corfirean/"];
|
const ALLOWED: &[&str] = &["https://tailscale.com/", "https://login.tailscale.com/", "https://portforward.com/", "https://github.com/Corfirean/"];
|
||||||
// A prefilled "new issue" page of this project: the address must be exactly that page, and its query may carry
|
// A prefilled "new issue" page of one of the places a report can go (the Manager, Companions, SQUID Playerbots): the
|
||||||
// `&` between the (percent-encoded) title and text.
|
// address must be exactly that page, and its query may carry `&` between the (percent-encoded) title and text.
|
||||||
const NEW_ISSUE: &str = "https://github.com/Corfirean/coa-server-manager/issues/new";
|
let issue = coa_core::report::is_new_issue_url(&url);
|
||||||
let issue = url == NEW_ISSUE || url.starts_with(&format!("{NEW_ISSUE}?"));
|
|
||||||
let chars_ok = url.chars().all(|c| c.is_ascii_alphanumeric() || "/:._-?=#%".contains(c) || (issue && c == '&'));
|
let chars_ok = url.chars().all(|c| c.is_ascii_alphanumeric() || "/:._-?=#%".contains(c) || (issue && c == '&'));
|
||||||
// the GitHub page of a module that is in the bundled catalog (some are not ours)
|
// the GitHub page of a module that is in the bundled catalog (some are not ours)
|
||||||
let catalog = coa_core::modules::catalog().iter().any(|e| e.repo == url);
|
let catalog = coa_core::modules::catalog().iter().any(|e| e.repo == url);
|
||||||
@@ -1286,6 +1286,16 @@ struct ReportContext {
|
|||||||
/// "new" for a server the Manager installed, "imported" for one that was added.
|
/// "new" for a server the Manager installed, "imported" for one that was added.
|
||||||
install_kind: String,
|
install_kind: String,
|
||||||
server_version: Option<String>,
|
server_version: Option<String>,
|
||||||
|
/// Where the form should start: the bot system that is switched on, else the Manager.
|
||||||
|
suggested_target: String,
|
||||||
|
/// The release of whichever bot system is on, for a report that goes to its repository.
|
||||||
|
bots_version: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The places a report can go, each with its GitHub repository.
|
||||||
|
#[tauri::command]
|
||||||
|
fn report_targets() -> Vec<coa_core::report::Target> {
|
||||||
|
coa_core::report::targets()
|
||||||
}
|
}
|
||||||
|
|
||||||
/// "Windows 11 (build 26200)" from `ver`; empty if it cannot be read.
|
/// "Windows 11 (build 26200)" from `ver`; empty if it cannot be read.
|
||||||
@@ -1312,11 +1322,15 @@ async fn report_context(state: State<'_, AppState>, id: String) -> std::result::
|
|||||||
let root = path_of(&state, &id)?;
|
let root = path_of(&state, &id)?;
|
||||||
blocking(move || {
|
blocking(move || {
|
||||||
let (_, meta) = install_meta(&root)?;
|
let (_, meta) = install_meta(&root)?;
|
||||||
|
let bots = coa_core::report::bots(&root);
|
||||||
|
let companions = [meta.bots.version.clone(), meta.bots.commit.as_ref().map(|c| c.chars().take(8).collect())].into_iter().flatten().collect::<Vec<String>>().join(" · ");
|
||||||
Ok(ReportContext {
|
Ok(ReportContext {
|
||||||
manager_version: coa_core::MANAGER_VERSION.to_string(),
|
manager_version: coa_core::MANAGER_VERSION.to_string(),
|
||||||
windows: windows_version(),
|
windows: windows_version(),
|
||||||
install_kind: if meta.kind == coa_core::registry::InstallKind::New { "new".into() } else { "imported".into() },
|
install_kind: if meta.kind == coa_core::registry::InstallKind::New { "new".into() } else { "imported".into() },
|
||||||
server_version: meta.core.version.clone(),
|
server_version: meta.core.version.clone(),
|
||||||
|
suggested_target: bots.suggested.to_string(),
|
||||||
|
bots_version: if bots.suggested == "squid" { bots.squid_version } else if bots.suggested == "companions" && !companions.is_empty() { Some(companions) } else { None },
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
.await
|
.await
|
||||||
@@ -1328,9 +1342,11 @@ async fn friends_status(state: State<'_, AppState>, id: String) -> std::result::
|
|||||||
blocking(move || {
|
blocking(move || {
|
||||||
let meta = meta_dir(&root)?;
|
let meta = meta_dir(&root)?;
|
||||||
let ports = layout::read_ports(&root);
|
let ports = layout::read_ports(&root);
|
||||||
|
let automatic = coa_core::net::lan_ip().filter(|ip| coa_core::net::is_lan_address(*ip));
|
||||||
Ok(FriendsStatus {
|
Ok(FriendsStatus {
|
||||||
settings: coa_core::friends::load(&meta),
|
settings: coa_core::friends::load(&meta),
|
||||||
lan_ip: coa_core::net::lan_ip().map(|a| a.to_string()),
|
lan_ip: automatic.map(|a| a.to_string()),
|
||||||
|
lan_addresses: coa_core::net::lan_addresses(automatic).unwrap_or_default(),
|
||||||
exposure: coa_core::net::exposure(&ports),
|
exposure: coa_core::net::exposure(&ports),
|
||||||
servers_open: coa_core::friends::bind_is_open(&root),
|
servers_open: coa_core::friends::bind_is_open(&root),
|
||||||
firewall: coa_core::firewall::status(),
|
firewall: coa_core::firewall::status(),
|
||||||
@@ -1383,9 +1399,10 @@ async fn friends_enable(
|
|||||||
id: String,
|
id: String,
|
||||||
mode: coa_core::friends::Mode,
|
mode: coa_core::friends::Mode,
|
||||||
host: Option<String>,
|
host: Option<String>,
|
||||||
|
lan_address_override: Option<String>,
|
||||||
use_upnp: bool,
|
use_upnp: bool,
|
||||||
) -> std::result::Result<FriendsResult, UiError> {
|
) -> std::result::Result<FriendsResult, UiError> {
|
||||||
use coa_core::friends::{self, Mode, Settings};
|
use coa_core::friends::{self, Mode};
|
||||||
let root = path_of(&state, &id)?;
|
let root = path_of(&state, &id)?;
|
||||||
let _guard = BusyGuard::acquire(&state, &id)?;
|
let _guard = BusyGuard::acquire(&state, &id)?;
|
||||||
blocking(move || {
|
blocking(move || {
|
||||||
@@ -1396,7 +1413,7 @@ async fn friends_enable(
|
|||||||
let secondary = realms.secondary_world_port.filter(|_| realms.simultaneous);
|
let secondary = realms.secondary_world_port.filter(|_| realms.simultaneous);
|
||||||
let host = match mode {
|
let host = match mode {
|
||||||
Mode::Local => "127.0.0.1".to_string(),
|
Mode::Local => "127.0.0.1".to_string(),
|
||||||
Mode::Lan => coa_core::net::lan_ip().ok_or_else(|| Error::Invalid("This computer has no network address.".into()))?.to_string(),
|
Mode::Lan => coa_core::net::resolve_lan_host(lan_address_override.as_deref(), coa_core::net::lan_ip())?,
|
||||||
Mode::Direct => host.filter(|h| !h.is_empty()).ok_or_else(|| Error::Invalid("Check your connection first to learn your public address.".into()))?,
|
Mode::Direct => host.filter(|h| !h.is_empty()).ok_or_else(|| Error::Invalid("Check your connection first to learn your public address.".into()))?,
|
||||||
Mode::Private => coa_core::net::tailscale().ip.ok_or_else(|| Error::Invalid("Tailscale is not connected. Install it, sign in, then try again.".into()))?,
|
Mode::Private => coa_core::net::tailscale().ip.ok_or_else(|| Error::Invalid("Tailscale is not connected. Install it, sign in, then try again.".into()))?,
|
||||||
};
|
};
|
||||||
@@ -1417,7 +1434,9 @@ async fn friends_enable(
|
|||||||
None => note = Some("Your router does not support automatic setup; forward the two game ports by hand or use the private network.".to_string()),
|
None => note = Some("Your router does not support automatic setup; forward the two game ports by hand or use the private network.".to_string()),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
friends::save(&meta, &Settings { mode, host: Some(host.clone()) })?;
|
let mut settings = friends::load(&meta);
|
||||||
|
settings.select_mode(mode, host.clone(), lan_address_override);
|
||||||
|
friends::save(&meta, &settings)?;
|
||||||
let running = coa_core::process::observe(&root, &ports).world.state == coa_core::process::ServiceState::Running;
|
let running = coa_core::process::observe(&root, &ports).world.state == coa_core::process::ServiceState::Running;
|
||||||
if running {
|
if running {
|
||||||
friends::apply_realm_address(&root, &host)?;
|
friends::apply_realm_address(&root, &host)?;
|
||||||
@@ -1470,6 +1489,8 @@ async fn export_diagnostics(state: State<'_, AppState>, id: String) -> std::resu
|
|||||||
let report = coa_core::diag::run(&root, &meta);
|
let report = coa_core::diag::run(&root, &meta);
|
||||||
let out = coa_core::diag::desktop_or_temp().join(format!("CoA-Diagnostics-{}.zip", coa_core::diag::stamp()));
|
let out = coa_core::diag::desktop_or_temp().join(format!("CoA-Diagnostics-{}.zip", coa_core::diag::stamp()));
|
||||||
coa_core::diag::export_package(&root, &dir, &data_dir().join("logs").join("manager.log"), &meta, &report, &out)?;
|
coa_core::diag::export_package(&root, &dir, &data_dir().join("logs").join("manager.log"), &meta, &report, &out)?;
|
||||||
|
// Show the file in its folder so nobody has to look for it; failing to open the folder is not a failure.
|
||||||
|
let _ = tauri_plugin_opener::reveal_item_in_dir(&out);
|
||||||
Ok(out.to_string_lossy().into_owned())
|
Ok(out.to_string_lossy().into_owned())
|
||||||
})
|
})
|
||||||
.await
|
.await
|
||||||
@@ -1579,6 +1600,7 @@ pub fn run() {
|
|||||||
companions_delete_all,
|
companions_delete_all,
|
||||||
companions_despawn_some,
|
companions_despawn_some,
|
||||||
open_link,
|
open_link,
|
||||||
|
report_targets,
|
||||||
companion_sizes,
|
companion_sizes,
|
||||||
add_companions,
|
add_companions,
|
||||||
remote_connection,
|
remote_connection,
|
||||||
|
|||||||
@@ -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.5",
|
"version": "0.6.6",
|
||||||
"identifier": "com.coa.servermanager",
|
"identifier": "com.coa.servermanager",
|
||||||
"build": {
|
"build": {
|
||||||
"beforeDevCommand": "npm run dev",
|
"beforeDevCommand": "npm run dev",
|
||||||
|
|||||||
+2
-1
@@ -87,7 +87,8 @@ export {};
|
|||||||
return (S[args.module]??[]).map(s => ({...s, value: moduleEdits[args.module]?.[s.key] ?? s.value}));
|
return (S[args.module]??[]).map(s => ({...s, value: moduleEdits[args.module]?.[s.key] ?? s.value}));
|
||||||
}
|
}
|
||||||
if(cmd==="module_save_settings") { moduleEdits[args.module] = {...moduleEdits[args.module], ...args.changes}; 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",suggested_target:"companions",bots_version:"0.2.1 · 1a2b3c4d"};
|
||||||
|
if(cmd==="report_targets") return [{id:"manager",repo:"Corfirean/coa-server-manager",ours:true},{id:"companions",repo:"Corfirean/mod-coa-playerbots",ours:true},{id:"squid",repo:"Zyth45/mod-playerbots",ours:false}];
|
||||||
if(cmd==="open_link"){(window as any).__lastLink=args.url;return null;}
|
if(cmd==="open_link"){(window as any).__lastLink=args.url;return null;}
|
||||||
if(cmd==="export_diagnostics") return "C:\\Users\\you\\Desktop\\CoA-Diagnostics-20261001-140000.zip";
|
if(cmd==="export_diagnostics") return "C:\\Users\\you\\Desktop\\CoA-Diagnostics-20261001-140000.zip";
|
||||||
if(cmd==="install_preflight") return {ok:true,problems:[],free_bytes:210*2**30};
|
if(cmd==="install_preflight") return {ok:true,problems:[],free_bytes:210*2**30};
|
||||||
|
|||||||
+24
-3
@@ -702,9 +702,9 @@ const de: Partial<Record<keyof typeof en, string>> = {
|
|||||||
"rep.expectedHint": "Beschreibe das erwartete Verhalten.",
|
"rep.expectedHint": "Beschreibe das erwartete Verhalten.",
|
||||||
"rep.steps": "Schritte zum Nachstellen",
|
"rep.steps": "Schritte zum Nachstellen",
|
||||||
"rep.attachTitle": "Logs und Screenshots",
|
"rep.attachTitle": "Logs und Screenshots",
|
||||||
"rep.attachText": "Erstelle eine Diagnosedatei (Einstellungen und Logs ohne Passwörter und Adressen) und ziehe sie zusammen mit Screenshots oder Videos auf die GitHub-Seite, sobald sie offen ist.",
|
"rep.attachText": "Ein Klick sammelt die Diagnose: Logs des Managers und des Servers, Absturzberichte, Windows-Absturzeinträge und Update-Protokolle, ohne Passwörter und Adressen. Der Ordner mit der Datei wird geöffnet; ziehe die Datei zusammen mit Screenshots oder Videos auf die GitHub-Seite.",
|
||||||
"rep.makeFile": "Diagnosedatei erstellen",
|
"rep.makeFile": "Diagnosedatei erstellen",
|
||||||
"rep.fileSaved": "Gespeichert unter {path}. Ziehe diese Datei in das GitHub-Issue.",
|
"rep.fileSaved": "Gespeichert unter {path}. Der Ordner wurde geöffnet. Ziehe diese Datei in das GitHub-Issue.",
|
||||||
"rep.privacy": "Bitte entferne Passwörter, Tokens, private IP-Angaben und andere sensible Daten, bevor du Logs veröffentlichst.",
|
"rep.privacy": "Bitte entferne Passwörter, Tokens, private IP-Angaben und andere sensible Daten, bevor du Logs veröffentlichst.",
|
||||||
"rep.open": "Bericht auf GitHub öffnen",
|
"rep.open": "Bericht auf GitHub öffnen",
|
||||||
"rep.copy": "Text kopieren",
|
"rep.copy": "Text kopieren",
|
||||||
@@ -714,6 +714,17 @@ const de: Partial<Record<keyof typeof en, string>> = {
|
|||||||
"rep.opened": "GitHub wurde im Browser geöffnet. Prüfe den Text, hänge Dateien an und klicke auf „Submit new issue“.",
|
"rep.opened": "GitHub wurde im Browser geöffnet. Prüfe den Text, hänge Dateien an und klicke auf „Submit new issue“.",
|
||||||
"rep.openedLong": "Der Bericht ist für einen Link zu lang und wurde deshalb in die Zwischenablage kopiert. GitHub ist geöffnet: Füge ihn (Strg+V) in die Beschreibung ein, hänge Dateien an und klicke auf „Submit new issue“.",
|
"rep.openedLong": "Der Bericht ist für einen Link zu lang und wurde deshalb in die Zwischenablage kopiert. GitHub ist geöffnet: Füge ihn (Strg+V) in die Beschreibung ein, hänge Dateien an und klicke auf „Submit new issue“.",
|
||||||
"rep.copied": "In die Zwischenablage kopiert.",
|
"rep.copied": "In die Zwischenablage kopiert.",
|
||||||
|
"rep.targetTitle": "Worum geht es bei dem Problem?",
|
||||||
|
"rep.target.manager": "CoA Server Manager, der Server oder andere Module",
|
||||||
|
"rep.target.companions": "CoA Companions (Bots und das CoABotUI-Addon)",
|
||||||
|
"rep.target.squid": "SQUID Playerbots",
|
||||||
|
"rep.targetPublic": "Der Bericht wird öffentlich auf GitHub in {repo} veröffentlicht.",
|
||||||
|
"rep.botsVersion": "Bot-Version",
|
||||||
|
"rep.withDiag": "Diagnose für mich sammeln (empfohlen)",
|
||||||
|
"rep.collectOpen": "Diagnose sammeln und Bericht öffnen",
|
||||||
|
"rep.collecting": "Diagnose wird gesammelt…",
|
||||||
|
"overview.reportHint": "Ein Dienst wurde von selbst beendet?",
|
||||||
|
"overview.reportBtn": "Diagnose sammeln und melden",
|
||||||
|
|
||||||
// Realmlist switcher and modules page
|
// Realmlist switcher and modules page
|
||||||
"realm.profileLabel": "Realm",
|
"realm.profileLabel": "Realm",
|
||||||
@@ -751,7 +762,9 @@ const de: Partial<Record<keyof typeof en, string>> = {
|
|||||||
"mod.noSettings": "Keine weiteren Einstellungen. Verwende den Modulschalter oben.",
|
"mod.noSettings": "Keine weiteren Einstellungen. Verwende den Modulschalter oben.",
|
||||||
"err.bot_modules_conflict.title": "Zwei Bot-Module sind aktiviert",
|
"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.",
|
"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.setup": "Modul und Verkäufer aktivieren. Der Server legt beim ersten Start selbst einen Auktionscharakter an (Konto AHBOT), eine GUID ist nicht nötig. Ein Charakter bietet in den Auktionshäusern beider Fraktionen an. Der CoA-Filter nutzt Beute-, Händler- und Berufstabellen; Stufengrenzen gelten zusätzlich. Erfordert einen Serverbuild mit CoA-Auktionsfilter und automatischem Auktionscharakter.",
|
||||||
|
"mod.enchanter.add": "Verzauberer platzieren: Stellt euch an die gewünschte Stelle und gebt .npc add 601015 ein",
|
||||||
|
"mod.enchanter.remove": "Verzauberer entfernen: Ziel auf den NPC setzen und .npc delete eingeben",
|
||||||
"mod.ahbot.allSettings": "Alle Auktionseinstellungen",
|
"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.",
|
||||||
@@ -816,6 +829,14 @@ const de: Partial<Record<keyof typeof en, string>> = {
|
|||||||
"upd.current": "Du bist auf dem neuesten Stand (Version {v}).",
|
"upd.current": "Du bist auf dem neuesten Stand (Version {v}).",
|
||||||
"client.job.checking": "Client wird geprüft…",
|
"client.job.checking": "Client wird geprüft…",
|
||||||
"client.job.updating": "Client wird aktualisiert",
|
"client.job.updating": "Client wird aktualisiert",
|
||||||
|
"fr.lan.address": "Netzwerkadresse",
|
||||||
|
"fr.lan.automatic": "Automatisch",
|
||||||
|
"fr.lan.default": "Standard",
|
||||||
|
"fr.lan.custom": "Eigene Adresse…",
|
||||||
|
"fr.lan.customIpv4": "Eigene IPv4-Adresse",
|
||||||
|
"fr.lan.unavailable": "Ausgewählte Adresse nicht verfügbar",
|
||||||
|
"fr.lan.unavailableText": "Die ausgewählte Adresse ist derzeit keinem erkannten lokalen Netzwerkadapter zugewiesen. Wählen Sie eine andere Adresse oder Automatisch, oder behalten Sie diese Adresse bewusst bei.",
|
||||||
|
"fr.lan.invalid": "Ungültige IPv4-Adresse",
|
||||||
};
|
};
|
||||||
|
|
||||||
export default de;
|
export default de;
|
||||||
+24
-3
@@ -735,9 +735,9 @@ const en = {
|
|||||||
"rep.expectedHint": "Describe the expected behaviour.",
|
"rep.expectedHint": "Describe the expected behaviour.",
|
||||||
"rep.steps": "Steps to reproduce",
|
"rep.steps": "Steps to reproduce",
|
||||||
"rep.attachTitle": "Logs and screenshots",
|
"rep.attachTitle": "Logs and screenshots",
|
||||||
"rep.attachText": "Create a diagnostics file (settings and logs with passwords and addresses removed) and drag it, together with any screenshot or video, into the GitHub page once it is open.",
|
"rep.attachText": "One click collects the diagnostics: the Manager's and the server's logs, crash reports, Windows crash records and update journals, with passwords and addresses removed. The file's folder opens; drag the file, together with any screenshot or video, into the GitHub page.",
|
||||||
"rep.makeFile": "Create the diagnostics file",
|
"rep.makeFile": "Create the diagnostics file",
|
||||||
"rep.fileSaved": "Saved to {path}. Drag this file into the GitHub issue.",
|
"rep.fileSaved": "Saved to {path}. The folder was opened. Drag this file into the GitHub issue.",
|
||||||
"rep.privacy": "Please remove passwords, tokens, private IP information or other sensitive data before posting logs.",
|
"rep.privacy": "Please remove passwords, tokens, private IP information or other sensitive data before posting logs.",
|
||||||
"rep.open": "Open the report on GitHub",
|
"rep.open": "Open the report on GitHub",
|
||||||
"rep.copy": "Copy the text",
|
"rep.copy": "Copy the text",
|
||||||
@@ -747,6 +747,17 @@ const en = {
|
|||||||
"rep.opened": "GitHub was opened in your browser. Check the text, attach files and press Submit new issue.",
|
"rep.opened": "GitHub was opened in your browser. Check the text, attach files and press Submit new issue.",
|
||||||
"rep.openedLong": "The report is too long for a link, so it was copied to the clipboard. GitHub is open: paste it (Ctrl+V) into the description, attach files and press Submit new issue.",
|
"rep.openedLong": "The report is too long for a link, so it was copied to the clipboard. GitHub is open: paste it (Ctrl+V) into the description, attach files and press Submit new issue.",
|
||||||
"rep.copied": "Copied to the clipboard.",
|
"rep.copied": "Copied to the clipboard.",
|
||||||
|
"rep.targetTitle": "What is the problem about?",
|
||||||
|
"rep.target.manager": "CoA Server Manager, the server or other modules",
|
||||||
|
"rep.target.companions": "CoA Companions (bots and the CoABotUI addon)",
|
||||||
|
"rep.target.squid": "SQUID Playerbots",
|
||||||
|
"rep.targetPublic": "The report will be public on GitHub in {repo}.",
|
||||||
|
"rep.botsVersion": "Bot release",
|
||||||
|
"rep.withDiag": "Collect the diagnostics for me (recommended)",
|
||||||
|
"rep.collectOpen": "Collect diagnostics and open the report",
|
||||||
|
"rep.collecting": "Collecting diagnostics…",
|
||||||
|
"overview.reportHint": "A service stopped on its own?",
|
||||||
|
"overview.reportBtn": "Collect diagnostics and report",
|
||||||
|
|
||||||
// Realmlist switcher and modules page
|
// Realmlist switcher and modules page
|
||||||
"realm.label": "Realm",
|
"realm.label": "Realm",
|
||||||
@@ -770,7 +781,9 @@ const en = {
|
|||||||
"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.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.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.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.setup": "Turn on the module and the seller. The server creates its own auction character (account AHBOT) the first time it starts, so no GUID is needed. One character lists in both factions' auction houses. The CoA filter selects items from loot tables, vendors and professions; level restrictions also apply. Requires a server build with the CoA auction filter and the automatic auction character.",
|
||||||
|
"mod.enchanter.add": "Place the enchanter: stand where you want him and enter .npc add 601015",
|
||||||
|
"mod.enchanter.remove": "Remove the enchanter: target him and enter .npc delete",
|
||||||
"mod.ahbot.allSettings": "All settings",
|
"mod.ahbot.allSettings": "All settings",
|
||||||
"err.bot_modules_conflict.title": "Two bot modules are enabled",
|
"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.",
|
"err.bot_modules_conflict.message": "Disable CoA Companions or SQUID Playerbots in Modules before starting the server.",
|
||||||
@@ -837,6 +850,14 @@ const en = {
|
|||||||
"upd.current": "You are up to date (version {v}).",
|
"upd.current": "You are up to date (version {v}).",
|
||||||
"client.job.checking": "Checking the client…",
|
"client.job.checking": "Checking the client…",
|
||||||
"client.job.updating": "Updating the client",
|
"client.job.updating": "Updating the client",
|
||||||
|
"fr.lan.address": "Network address",
|
||||||
|
"fr.lan.automatic": "Automatic",
|
||||||
|
"fr.lan.default": "Default",
|
||||||
|
"fr.lan.custom": "Custom address…",
|
||||||
|
"fr.lan.customIpv4": "Custom IPv4 address",
|
||||||
|
"fr.lan.unavailable": "Selected address unavailable",
|
||||||
|
"fr.lan.unavailableText": "The selected address is not currently assigned to a detected local interface. Choose another address or switch to Automatic, or keep this address intentionally.",
|
||||||
|
"fr.lan.invalid": "Invalid IPv4 address",
|
||||||
} as const;
|
} as const;
|
||||||
|
|
||||||
export default en;
|
export default en;
|
||||||
+24
-3
@@ -702,9 +702,9 @@ const es: Partial<Record<keyof typeof en, string>> = {
|
|||||||
"rep.expectedHint": "Describe el comportamiento esperado.",
|
"rep.expectedHint": "Describe el comportamiento esperado.",
|
||||||
"rep.steps": "Pasos para reproducirlo",
|
"rep.steps": "Pasos para reproducirlo",
|
||||||
"rep.attachTitle": "Registros y capturas",
|
"rep.attachTitle": "Registros y capturas",
|
||||||
"rep.attachText": "Crea un archivo de diagnóstico (ajustes y registros sin contraseñas ni direcciones) y arrástralo, junto con capturas o vídeos, a la página de GitHub cuando se abra.",
|
"rep.attachText": "Un clic reúne el diagnóstico: registros del Manager y del servidor, informes de fallos, registros de fallos de Windows y diarios de actualización, sin contraseñas ni direcciones. Se abre la carpeta del archivo; arrástralo, junto con capturas o vídeos, a la página de GitHub.",
|
||||||
"rep.makeFile": "Crear el archivo de diagnóstico",
|
"rep.makeFile": "Crear el archivo de diagnóstico",
|
||||||
"rep.fileSaved": "Guardado en {path}. Arrastra este archivo al issue de GitHub.",
|
"rep.fileSaved": "Guardado en {path}. Se abrió la carpeta. Arrastra este archivo al issue de GitHub.",
|
||||||
"rep.privacy": "Elimina contraseñas, tokens, información de IP privada y otros datos sensibles antes de publicar registros.",
|
"rep.privacy": "Elimina contraseñas, tokens, información de IP privada y otros datos sensibles antes de publicar registros.",
|
||||||
"rep.open": "Abrir el informe en GitHub",
|
"rep.open": "Abrir el informe en GitHub",
|
||||||
"rep.copy": "Copiar el texto",
|
"rep.copy": "Copiar el texto",
|
||||||
@@ -714,6 +714,17 @@ const es: Partial<Record<keyof typeof en, string>> = {
|
|||||||
"rep.opened": "GitHub se abrió en tu navegador. Revisa el texto, adjunta archivos y pulsa «Submit new issue».",
|
"rep.opened": "GitHub se abrió en tu navegador. Revisa el texto, adjunta archivos y pulsa «Submit new issue».",
|
||||||
"rep.openedLong": "El informe es demasiado largo para un enlace, así que se copió al portapapeles. GitHub está abierto: pégalo (Ctrl+V) en la descripción, adjunta archivos y pulsa «Submit new issue».",
|
"rep.openedLong": "El informe es demasiado largo para un enlace, así que se copió al portapapeles. GitHub está abierto: pégalo (Ctrl+V) en la descripción, adjunta archivos y pulsa «Submit new issue».",
|
||||||
"rep.copied": "Copiado al portapapeles.",
|
"rep.copied": "Copiado al portapapeles.",
|
||||||
|
"rep.targetTitle": "¿Sobre qué es el problema?",
|
||||||
|
"rep.target.manager": "CoA Server Manager, el servidor u otros módulos",
|
||||||
|
"rep.target.companions": "CoA Companions (bots y el addon CoABotUI)",
|
||||||
|
"rep.target.squid": "SQUID Playerbots",
|
||||||
|
"rep.targetPublic": "El informe será público en GitHub, en {repo}.",
|
||||||
|
"rep.botsVersion": "Versión de los bots",
|
||||||
|
"rep.withDiag": "Reunir el diagnóstico por mí (recomendado)",
|
||||||
|
"rep.collectOpen": "Reunir el diagnóstico y abrir el informe",
|
||||||
|
"rep.collecting": "Reuniendo el diagnóstico…",
|
||||||
|
"overview.reportHint": "¿Un servicio se detuvo solo?",
|
||||||
|
"overview.reportBtn": "Reunir el diagnóstico y avisar",
|
||||||
|
|
||||||
// Realmlist switcher and modules page
|
// Realmlist switcher and modules page
|
||||||
"realm.profileLabel": "Reino",
|
"realm.profileLabel": "Reino",
|
||||||
@@ -751,7 +762,9 @@ const es: Partial<Record<keyof typeof en, string>> = {
|
|||||||
"mod.noSettings": "No hay ajustes adicionales. Usa el interruptor del módulo de arriba.",
|
"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.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.",
|
"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.setup": "Activa el módulo y el vendedor. El servidor crea por sí mismo un personaje de subastas (cuenta AHBOT) en el primer arranque, no hace falta GUID. Un solo personaje publica en las casas de subastas de ambas facciones. 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 y personaje de subastas automático.",
|
||||||
|
"mod.enchanter.add": "Colocar al encantador: ponte donde quieras y escribe .npc add 601015",
|
||||||
|
"mod.enchanter.remove": "Quitar al encantador: selecciona al PNJ y escribe .npc delete",
|
||||||
"mod.ahbot.allSettings": "Todos los ajustes de subastas",
|
"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.",
|
||||||
@@ -816,6 +829,14 @@ const es: Partial<Record<keyof typeof en, string>> = {
|
|||||||
"upd.current": "Estás al día (versión {v}).",
|
"upd.current": "Estás al día (versión {v}).",
|
||||||
"client.job.checking": "Comprobando el cliente…",
|
"client.job.checking": "Comprobando el cliente…",
|
||||||
"client.job.updating": "Actualizando el cliente",
|
"client.job.updating": "Actualizando el cliente",
|
||||||
|
"fr.lan.address": "Dirección de red",
|
||||||
|
"fr.lan.automatic": "Automática",
|
||||||
|
"fr.lan.default": "Predeterminada",
|
||||||
|
"fr.lan.custom": "Dirección personalizada…",
|
||||||
|
"fr.lan.customIpv4": "Dirección IPv4 personalizada",
|
||||||
|
"fr.lan.unavailable": "Dirección seleccionada no disponible",
|
||||||
|
"fr.lan.unavailableText": "La dirección seleccionada no está asignada actualmente a ninguna interfaz local detectada. Elige otra dirección o Automática, o conserva esta dirección si así lo deseas.",
|
||||||
|
"fr.lan.invalid": "Dirección IPv4 no válida",
|
||||||
};
|
};
|
||||||
|
|
||||||
export default es;
|
export default es;
|
||||||
+24
-3
@@ -702,9 +702,9 @@ const fr: Partial<Record<keyof typeof en, string>> = {
|
|||||||
"rep.expectedHint": "Décrivez le comportement attendu.",
|
"rep.expectedHint": "Décrivez le comportement attendu.",
|
||||||
"rep.steps": "Étapes pour reproduire",
|
"rep.steps": "Étapes pour reproduire",
|
||||||
"rep.attachTitle": "Journaux et captures d’écran",
|
"rep.attachTitle": "Journaux et captures d’écran",
|
||||||
"rep.attachText": "Créez un fichier de diagnostic (réglages et journaux sans mots de passe ni adresses) et glissez-le, avec vos captures ou vidéos, sur la page GitHub une fois ouverte.",
|
"rep.attachText": "Un clic rassemble le diagnostic : journaux du Manager et du serveur, rapports de plantage, enregistrements de plantage de Windows et journaux de mise à jour, sans mots de passe ni adresses. Le dossier du fichier s’ouvre ; glissez le fichier, avec vos captures ou vidéos, sur la page GitHub.",
|
||||||
"rep.makeFile": "Créer le fichier de diagnostic",
|
"rep.makeFile": "Créer le fichier de diagnostic",
|
||||||
"rep.fileSaved": "Enregistré dans {path}. Glissez ce fichier dans l’issue GitHub.",
|
"rep.fileSaved": "Enregistré dans {path}. Le dossier a été ouvert. Glissez ce fichier dans l’issue GitHub.",
|
||||||
"rep.privacy": "Veuillez retirer les mots de passe, jetons, adresses IP privées et autres données sensibles avant de publier des journaux.",
|
"rep.privacy": "Veuillez retirer les mots de passe, jetons, adresses IP privées et autres données sensibles avant de publier des journaux.",
|
||||||
"rep.open": "Ouvrir le rapport sur GitHub",
|
"rep.open": "Ouvrir le rapport sur GitHub",
|
||||||
"rep.copy": "Copier le texte",
|
"rep.copy": "Copier le texte",
|
||||||
@@ -714,6 +714,17 @@ const fr: Partial<Record<keyof typeof en, string>> = {
|
|||||||
"rep.opened": "GitHub s’est ouvert dans votre navigateur. Vérifiez le texte, joignez les fichiers et appuyez sur « Submit new issue ».",
|
"rep.opened": "GitHub s’est ouvert dans votre navigateur. Vérifiez le texte, joignez les fichiers et appuyez sur « Submit new issue ».",
|
||||||
"rep.openedLong": "Le rapport est trop long pour un lien : il a été copié dans le presse-papiers. GitHub est ouvert : collez-le (Ctrl+V) dans la description, joignez les fichiers et appuyez sur « Submit new issue ».",
|
"rep.openedLong": "Le rapport est trop long pour un lien : il a été copié dans le presse-papiers. GitHub est ouvert : collez-le (Ctrl+V) dans la description, joignez les fichiers et appuyez sur « Submit new issue ».",
|
||||||
"rep.copied": "Copié dans le presse-papiers.",
|
"rep.copied": "Copié dans le presse-papiers.",
|
||||||
|
"rep.targetTitle": "De quoi parle le problème ?",
|
||||||
|
"rep.target.manager": "CoA Server Manager, le serveur ou d’autres modules",
|
||||||
|
"rep.target.companions": "CoA Companions (bots et addon CoABotUI)",
|
||||||
|
"rep.target.squid": "SQUID Playerbots",
|
||||||
|
"rep.targetPublic": "Le rapport sera public sur GitHub dans {repo}.",
|
||||||
|
"rep.botsVersion": "Version des bots",
|
||||||
|
"rep.withDiag": "Rassembler le diagnostic pour moi (recommandé)",
|
||||||
|
"rep.collectOpen": "Rassembler le diagnostic et ouvrir le rapport",
|
||||||
|
"rep.collecting": "Collecte du diagnostic…",
|
||||||
|
"overview.reportHint": "Un service s’est arrêté tout seul ?",
|
||||||
|
"overview.reportBtn": "Rassembler le diagnostic et signaler",
|
||||||
|
|
||||||
// Realmlist switcher and modules page
|
// Realmlist switcher and modules page
|
||||||
"realm.profileLabel": "Royaume",
|
"realm.profileLabel": "Royaume",
|
||||||
@@ -751,7 +762,9 @@ const fr: Partial<Record<keyof typeof en, string>> = {
|
|||||||
"mod.noSettings": "Aucun réglage supplémentaire. Utilisez l’interrupteur du module ci-dessus.",
|
"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.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.",
|
"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.setup": "Activez le module et le vendeur. Le serveur crée lui-même un personnage d’enchères (compte AHBOT) au premier démarrage, aucun GUID n’est nécessaire. Un seul personnage met en vente dans les hôtels des ventes des deux factions. 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 et le personnage d’enchères automatique.",
|
||||||
|
"mod.enchanter.add": "Placer l’enchanteur : placez-vous à l’endroit voulu et saisissez .npc add 601015",
|
||||||
|
"mod.enchanter.remove": "Retirer l’enchanteur : ciblez le PNJ et saisissez .npc delete",
|
||||||
"mod.ahbot.allSettings": "Tous les réglages d’enchères",
|
"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.",
|
||||||
@@ -816,6 +829,14 @@ const fr: Partial<Record<keyof typeof en, string>> = {
|
|||||||
"upd.current": "Vous êtes à jour (version {v}).",
|
"upd.current": "Vous êtes à jour (version {v}).",
|
||||||
"client.job.checking": "Vérification du client…",
|
"client.job.checking": "Vérification du client…",
|
||||||
"client.job.updating": "Mise à jour du client",
|
"client.job.updating": "Mise à jour du client",
|
||||||
|
"fr.lan.address": "Adresse réseau",
|
||||||
|
"fr.lan.automatic": "Automatique",
|
||||||
|
"fr.lan.default": "Par défaut",
|
||||||
|
"fr.lan.custom": "Adresse personnalisée…",
|
||||||
|
"fr.lan.customIpv4": "Adresse IPv4 personnalisée",
|
||||||
|
"fr.lan.unavailable": "Adresse sélectionnée indisponible",
|
||||||
|
"fr.lan.unavailableText": "Cette adresse n’est actuellement attribuée à aucune interface locale détectée. Choisissez une autre adresse ou le mode Automatique, ou conservez volontairement cette adresse.",
|
||||||
|
"fr.lan.invalid": "Adresse IPv4 non valide",
|
||||||
};
|
};
|
||||||
|
|
||||||
export default fr;
|
export default fr;
|
||||||
+24
-3
@@ -733,9 +733,9 @@ const ru: Partial<Record<keyof typeof en, string>> = {
|
|||||||
"rep.expectedHint": "Опишите ожидаемое поведение.",
|
"rep.expectedHint": "Опишите ожидаемое поведение.",
|
||||||
"rep.steps": "Как воспроизвести",
|
"rep.steps": "Как воспроизвести",
|
||||||
"rep.attachTitle": "Логи и скриншоты",
|
"rep.attachTitle": "Логи и скриншоты",
|
||||||
"rep.attachText": "Создайте файл диагностики (настройки и логи без паролей и адресов) и перетащите его вместе со скриншотами или видео на страницу GitHub, когда она откроется.",
|
"rep.attachText": "Диагностика собирается одним нажатием: логи менеджера и сервера, отчёты о падениях, записи Windows о сбоях и журналы обновлений, без паролей и адресов. Откроется папка с файлом; перетащите его вместе со скриншотами или видео на страницу GitHub.",
|
||||||
"rep.makeFile": "Создать файл диагностики",
|
"rep.makeFile": "Создать файл диагностики",
|
||||||
"rep.fileSaved": "Сохранено: {path}. Перетащите этот файл в issue на GitHub.",
|
"rep.fileSaved": "Сохранено: {path}. Папка открыта. Перетащите этот файл в issue на GitHub.",
|
||||||
"rep.privacy": "Перед публикацией логов удалите пароли, токены, частные IP-адреса и другие личные данные.",
|
"rep.privacy": "Перед публикацией логов удалите пароли, токены, частные IP-адреса и другие личные данные.",
|
||||||
"rep.open": "Открыть отчёт на GitHub",
|
"rep.open": "Открыть отчёт на GitHub",
|
||||||
"rep.copy": "Копировать текст",
|
"rep.copy": "Копировать текст",
|
||||||
@@ -745,6 +745,17 @@ const ru: Partial<Record<keyof typeof en, string>> = {
|
|||||||
"rep.opened": "GitHub открыт в браузере. Проверьте текст, прикрепите файлы и нажмите «Submit new issue».",
|
"rep.opened": "GitHub открыт в браузере. Проверьте текст, прикрепите файлы и нажмите «Submit new issue».",
|
||||||
"rep.openedLong": "Отчёт слишком длинный для ссылки, поэтому он скопирован в буфер обмена. GitHub открыт: вставьте текст (Ctrl+V) в описание, прикрепите файлы и нажмите «Submit new issue».",
|
"rep.openedLong": "Отчёт слишком длинный для ссылки, поэтому он скопирован в буфер обмена. GitHub открыт: вставьте текст (Ctrl+V) в описание, прикрепите файлы и нажмите «Submit new issue».",
|
||||||
"rep.copied": "Скопировано в буфер обмена.",
|
"rep.copied": "Скопировано в буфер обмена.",
|
||||||
|
"rep.targetTitle": "О чём проблема?",
|
||||||
|
"rep.target.manager": "CoA Server Manager, сервер или другие модули",
|
||||||
|
"rep.target.companions": "CoA Companions (боты и аддон CoABotUI)",
|
||||||
|
"rep.target.squid": "SQUID Playerbots",
|
||||||
|
"rep.targetPublic": "Репорт будет публичным на GitHub в {repo}.",
|
||||||
|
"rep.botsVersion": "Версия ботов",
|
||||||
|
"rep.withDiag": "Собрать диагностику за меня (рекомендуется)",
|
||||||
|
"rep.collectOpen": "Собрать диагностику и открыть репорт",
|
||||||
|
"rep.collecting": "Собираю диагностику…",
|
||||||
|
"overview.reportHint": "Служба остановилась сама?",
|
||||||
|
"overview.reportBtn": "Собрать диагностику и сообщить",
|
||||||
|
|
||||||
// Realmlist switcher and modules page
|
// Realmlist switcher and modules page
|
||||||
"realm.label": "Реалм",
|
"realm.label": "Реалм",
|
||||||
@@ -768,7 +779,9 @@ const ru: Partial<Record<keyof typeof en, string>> = {
|
|||||||
"mod.ahbot.weightsHint": "Это относительные веса, а не проценты. 0 исключает качество; большее значение повышает частоту. Если все значения по умолчанию равны нулю, включается обычное качество. Остальные фильтры продолжают действовать.",
|
"mod.ahbot.weightsHint": "Это относительные веса, а не проценты. 0 исключает качество; большее значение повышает частоту. Если все значения по умолчанию равны нулю, включается обычное качество. Остальные фильтры продолжают действовать.",
|
||||||
"mod.ahbot.noTypes": "Все типы отключены. Продавцу не из чего выбирать новые лоты.",
|
"mod.ahbot.noTypes": "Все типы отключены. Продавцу не из чего выбирать новые лоты.",
|
||||||
"mod.noSettings": "Дополнительных настроек нет. Используйте переключатель модуля выше.",
|
"mod.noSettings": "Дополнительных настроек нет. Используйте переключатель модуля выше.",
|
||||||
"mod.ahbot.setup": "Укажите GUID отдельного персонажа аукциониста, включите продавца и модуль. Персонаж должен быть офлайн. Фильтр CoA оставляет предметы из таблиц добычи, торговцев и профессий; ограничения уровней применяются дополнительно. Нужна сборка сервера с фильтром аукциона CoA.",
|
"mod.ahbot.setup": "Включите модуль и продавца. Сервер сам создаст персонажа аукциона (аккаунт AHBOT) при первом запуске, GUID вводить не нужно. Один персонаж выставляет лоты в аукционах обеих фракций. Фильтр CoA оставляет предметы из таблиц добычи, торговцев и профессий; ограничения уровней действуют дополнительно. Нужна сборка сервера с фильтром аукциона CoA и автоматическим персонажем аукциона.",
|
||||||
|
"mod.enchanter.add": "Разместить НПС зачарователя: встаньте в нужное место и введите команду .npc add 601015",
|
||||||
|
"mod.enchanter.remove": "Удалить НПС зачарователя: возьмите НПС в цель и введите команду .npc delete",
|
||||||
"mod.ahbot.allSettings": "Все настройки",
|
"mod.ahbot.allSettings": "Все настройки",
|
||||||
"err.bot_modules_conflict.title": "Включены две системы ботов",
|
"err.bot_modules_conflict.title": "Включены две системы ботов",
|
||||||
"err.bot_modules_conflict.message": "Выключите CoA Companions или SQUID Playerbots в разделе «Модули» перед запуском сервера.",
|
"err.bot_modules_conflict.message": "Выключите CoA Companions или SQUID Playerbots в разделе «Модули» перед запуском сервера.",
|
||||||
@@ -835,6 +848,14 @@ const ru: Partial<Record<keyof typeof en, string>> = {
|
|||||||
"upd.current": "У вас последняя версия ({v}).",
|
"upd.current": "У вас последняя версия ({v}).",
|
||||||
"client.job.checking": "Проверка клиента…",
|
"client.job.checking": "Проверка клиента…",
|
||||||
"client.job.updating": "Обновление клиента",
|
"client.job.updating": "Обновление клиента",
|
||||||
|
"fr.lan.address": "Сетевой адрес",
|
||||||
|
"fr.lan.automatic": "Автоматически",
|
||||||
|
"fr.lan.default": "По умолчанию",
|
||||||
|
"fr.lan.custom": "Другой адрес…",
|
||||||
|
"fr.lan.customIpv4": "Свой IPv4-адрес",
|
||||||
|
"fr.lan.unavailable": "Выбранный адрес недоступен",
|
||||||
|
"fr.lan.unavailableText": "Выбранный адрес сейчас не назначен обнаруженному сетевому интерфейсу. Выберите другой адрес, переключитесь на автоматический выбор или намеренно сохраните этот адрес.",
|
||||||
|
"fr.lan.invalid": "Некорректный IPv4-адрес",
|
||||||
};
|
};
|
||||||
|
|
||||||
export default ru;
|
export default ru;
|
||||||
+24
-3
@@ -714,9 +714,9 @@ const zh = {
|
|||||||
"rep.expectedHint": "描述你期望的正常表现。",
|
"rep.expectedHint": "描述你期望的正常表现。",
|
||||||
"rep.steps": "复现步骤",
|
"rep.steps": "复现步骤",
|
||||||
"rep.attachTitle": "日志与截图附件",
|
"rep.attachTitle": "日志与截图附件",
|
||||||
"rep.attachText": "生成一份诊断包文件(已自动脱敏密码与私有 IP 等敏感信息),并在浏览器打开 GitHub 页面后,将其连同截图或录屏一起拖拽上传。",
|
"rep.attachText": "一键收集诊断信息:管理器与服务器日志、崩溃报告、Windows 崩溃记录和更新日志(已去除密码与地址)。文件所在文件夹会自动打开;请将该文件连同截图或录屏一起拖入 GitHub 页面。",
|
||||||
"rep.makeFile": "生成诊断包文件",
|
"rep.makeFile": "生成诊断包文件",
|
||||||
"rep.fileSaved": "已保存至 {path}。请将该文件拖入 GitHub Issue 中。",
|
"rep.fileSaved": "已保存至 {path}。文件夹已打开。请将该文件拖入 GitHub Issue 中。",
|
||||||
"rep.privacy": "上传前请注意检查并移除日志中可能包含的私有密码、Token 或其他敏感隐私信息。",
|
"rep.privacy": "上传前请注意检查并移除日志中可能包含的私有密码、Token 或其他敏感隐私信息。",
|
||||||
"rep.open": "在 GitHub 上打开报告",
|
"rep.open": "在 GitHub 上打开报告",
|
||||||
"rep.copy": "复制报告文本",
|
"rep.copy": "复制报告文本",
|
||||||
@@ -726,6 +726,17 @@ const zh = {
|
|||||||
"rep.opened": "已在浏览器中打开 GitHub。请检查内容、附上日志文件并点击“Submit new issue”。",
|
"rep.opened": "已在浏览器中打开 GitHub。请检查内容、附上日志文件并点击“Submit new issue”。",
|
||||||
"rep.openedLong": "报告内容较长超出 URL 长度限制,已自动复制到剪贴板。请在已打开的 GitHub 页面中按 Ctrl+V 粘贴描述,附上文件后提交。",
|
"rep.openedLong": "报告内容较长超出 URL 长度限制,已自动复制到剪贴板。请在已打开的 GitHub 页面中按 Ctrl+V 粘贴描述,附上文件后提交。",
|
||||||
"rep.copied": "已复制到剪贴板。",
|
"rep.copied": "已复制到剪贴板。",
|
||||||
|
"rep.targetTitle": "问题与什么有关?",
|
||||||
|
"rep.target.manager": "CoA Server Manager、服务器或其他模块",
|
||||||
|
"rep.target.companions": "CoA Companions(机器人与 CoABotUI 插件)",
|
||||||
|
"rep.target.squid": "SQUID Playerbots",
|
||||||
|
"rep.targetPublic": "该报告将公开发布在 GitHub 的 {repo}。",
|
||||||
|
"rep.botsVersion": "机器人版本",
|
||||||
|
"rep.withDiag": "替我收集诊断信息(推荐)",
|
||||||
|
"rep.collectOpen": "收集诊断信息并打开报告",
|
||||||
|
"rep.collecting": "正在收集诊断信息…",
|
||||||
|
"overview.reportHint": "某个服务自己停止了?",
|
||||||
|
"overview.reportBtn": "收集诊断信息并反馈",
|
||||||
|
|
||||||
// Realmlist switcher and modules page
|
// Realmlist switcher and modules page
|
||||||
"realm.label": "服务器列表",
|
"realm.label": "服务器列表",
|
||||||
@@ -751,7 +762,9 @@ const zh = {
|
|||||||
"mod.noSettings": "没有其他设置,请使用上方模块开关。",
|
"mod.noSettings": "没有其他设置,请使用上方模块开关。",
|
||||||
"err.bot_modules_conflict.title": "已启用两个机器人模块",
|
"err.bot_modules_conflict.title": "已启用两个机器人模块",
|
||||||
"err.bot_modules_conflict.message": "启动服务器前,请在模块中关闭CoA Companions或SQUID Playerbots。",
|
"err.bot_modules_conflict.message": "启动服务器前,请在模块中关闭CoA Companions或SQUID Playerbots。",
|
||||||
"mod.ahbot.setup": "填写独立拍卖角色的GUID,并启用卖家和模块。角色必须离线。CoA筛选使用掉落、商人和专业物品表,等级限制另行生效。需要包含CoA拍卖筛选的服务器版本。",
|
"mod.ahbot.setup": "启用模块和卖家即可。服务器首次启动时会自动创建拍卖角色(账号AHBOT),无需填写GUID。一个角色即可在双方阵营的拍卖行上架。CoA筛选使用掉落、商人和专业物品表,等级限制另行生效。需要包含CoA拍卖筛选和自动拍卖角色的服务器版本。",
|
||||||
|
"mod.enchanter.add": "放置附魔师NPC:站在想要的位置,输入 .npc add 601015",
|
||||||
|
"mod.enchanter.remove": "删除附魔师NPC:选中该NPC,输入 .npc delete",
|
||||||
"mod.ahbot.allSettings": "所有拍卖设置",
|
"mod.ahbot.allSettings": "所有拍卖设置",
|
||||||
"mod.title": "模块管理",
|
"mod.title": "模块管理",
|
||||||
"mod.intro": "服务器内置的可选扩展特性。可按需开关、访问其 GitHub 页面或调整独立参数。",
|
"mod.intro": "服务器内置的可选扩展特性。可按需开关、访问其 GitHub 页面或调整独立参数。",
|
||||||
@@ -818,6 +831,14 @@ const zh = {
|
|||||||
"client.job.updating": "正在更新游戏客户端",
|
"client.job.updating": "正在更新游戏客户端",
|
||||||
"err.docker_unavailable.title": "Docker 不可用",
|
"err.docker_unavailable.title": "Docker 不可用",
|
||||||
"err.docker_unavailable.message": "此服务器通过 Docker 运行。请安装并启动 Docker,确保当前用户有权使用它,然后重试。",
|
"err.docker_unavailable.message": "此服务器通过 Docker 运行。请安装并启动 Docker,确保当前用户有权使用它,然后重试。",
|
||||||
|
"fr.lan.address": "网络地址",
|
||||||
|
"fr.lan.automatic": "自动",
|
||||||
|
"fr.lan.default": "默认",
|
||||||
|
"fr.lan.custom": "自定义地址…",
|
||||||
|
"fr.lan.customIpv4": "自定义 IPv4 地址",
|
||||||
|
"fr.lan.unavailable": "所选地址不可用",
|
||||||
|
"fr.lan.unavailableText": "所选地址目前未分配给检测到的本地网络接口。请选择其他地址、切换到自动,或有意保留此地址。",
|
||||||
|
"fr.lan.invalid": "无效的 IPv4 地址",
|
||||||
} as const;
|
} as const;
|
||||||
|
|
||||||
export default zh;
|
export default zh;
|
||||||
+24
-3
@@ -234,6 +234,19 @@ export interface ReportContext {
|
|||||||
windows: string;
|
windows: string;
|
||||||
install_kind: "new" | "imported";
|
install_kind: "new" | "imported";
|
||||||
server_version: string | null;
|
server_version: string | null;
|
||||||
|
/** where the form starts: the bot system that is switched on, else the Manager */
|
||||||
|
suggested_target: ReportTargetId;
|
||||||
|
/** the release of the bot system that is on */
|
||||||
|
bots_version: string | null;
|
||||||
|
}
|
||||||
|
|
||||||
|
export type ReportTargetId = "manager" | "companions" | "squid";
|
||||||
|
|
||||||
|
/** A place a problem report can go: its GitHub repository as `owner/name`. */
|
||||||
|
export interface ReportTarget {
|
||||||
|
id: ReportTargetId;
|
||||||
|
repo: string;
|
||||||
|
ours: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface InstallRequirements {
|
export interface InstallRequirements {
|
||||||
@@ -348,9 +361,16 @@ export interface ClientDownloadCheck {
|
|||||||
|
|
||||||
export type FriendsMode = "local" | "lan" | "direct" | "private";
|
export type FriendsMode = "local" | "lan" | "direct" | "private";
|
||||||
|
|
||||||
|
export interface LanAddress {
|
||||||
|
interface: string;
|
||||||
|
address: string;
|
||||||
|
is_default: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
export interface FriendsStatus {
|
export interface FriendsStatus {
|
||||||
settings: { mode: FriendsMode; host: string | null };
|
settings: { mode: FriendsMode; host: string | null; lan_address_override: string | null };
|
||||||
lan_ip: string | null;
|
lan_ip: string | null;
|
||||||
|
lan_addresses: LanAddress[];
|
||||||
exposure: { port: number; what: string; reachable_from_network: boolean; listening: boolean }[];
|
exposure: { port: number; what: string; reachable_from_network: boolean; listening: boolean }[];
|
||||||
servers_open: boolean;
|
servers_open: boolean;
|
||||||
firewall: { auth: boolean; world: boolean };
|
firewall: { auth: boolean; world: boolean };
|
||||||
@@ -419,6 +439,7 @@ export const api = {
|
|||||||
allSettings: (id: string) => invoke<AllSetting[]>("all_settings", { id }),
|
allSettings: (id: string) => invoke<AllSetting[]>("all_settings", { id }),
|
||||||
allSettingsSave: (id: string, changes: Record<string, string>) => invoke<string[]>("all_settings_save", { id, changes }),
|
allSettingsSave: (id: string, changes: Record<string, string>) => invoke<string[]>("all_settings_save", { id, changes }),
|
||||||
reportContext: (id: string) => invoke<ReportContext>("report_context", { id }),
|
reportContext: (id: string) => invoke<ReportContext>("report_context", { id }),
|
||||||
|
reportTargets: () => invoke<ReportTarget[]>("report_targets"),
|
||||||
listAccounts: (id: string) => invoke<AccountInfo[]>("list_accounts", { id }),
|
listAccounts: (id: string) => invoke<AccountInfo[]>("list_accounts", { id }),
|
||||||
accountSetPassword: (id: string, name: string, password: string) => invoke<void>("account_set_password", { id, name, password }),
|
accountSetPassword: (id: string, name: string, password: string) => invoke<void>("account_set_password", { id, name, password }),
|
||||||
accountSetAccess: (id: string, name: string, level: number) => invoke<void>("account_set_access", { id, name, level }),
|
accountSetAccess: (id: string, name: string, level: number) => invoke<void>("account_set_access", { id, name, level }),
|
||||||
@@ -456,8 +477,8 @@ export const api = {
|
|||||||
play: (id: string) => invoke<DriverOutcome>("play", { id }),
|
play: (id: string) => invoke<DriverOutcome>("play", { id }),
|
||||||
friendsStatus: (id: string) => invoke<FriendsStatus>("friends_status", { id }),
|
friendsStatus: (id: string) => invoke<FriendsStatus>("friends_status", { id }),
|
||||||
friendsCheckInternet: () => invoke<InternetCheck>("friends_check_internet"),
|
friendsCheckInternet: () => invoke<InternetCheck>("friends_check_internet"),
|
||||||
friendsEnable: (id: string, mode: FriendsMode, host?: string, useUpnp = false) =>
|
friendsEnable: (id: string, mode: FriendsMode, host?: string, useUpnp = false, lanAddressOverride: string | null = null) =>
|
||||||
invoke<{ host: string; restart_required: boolean; note: string | null }>("friends_enable", { id, mode, host: host ?? null, useUpnp }),
|
invoke<{ host: string; restart_required: boolean; note: string | null }>("friends_enable", { id, mode, host: host ?? null, useUpnp, lanAddressOverride }),
|
||||||
friendsPackage: (id: string) => invoke<string>("friends_package", { id }),
|
friendsPackage: (id: string) => invoke<string>("friends_package", { id }),
|
||||||
runDiagnostics: (id: string) => invoke<{ checks: DiagCheck[]; problems: number }>("run_diagnostics", { id }),
|
runDiagnostics: (id: string) => invoke<{ checks: DiagCheck[]; problems: number }>("run_diagnostics", { id }),
|
||||||
verifyFiles: (id: string) => invoke<{ path: string; kind: "missing" | "changed" }[]>("verify_files", { id }),
|
verifyFiles: (id: string) => invoke<{ path: string; kind: "missing" | "changed" }[]>("verify_files", { id }),
|
||||||
|
|||||||
@@ -86,8 +86,8 @@ for (const [key, title, desc] of [
|
|||||||
for (let n = 1; n <= 3; n++) add(`EC.P${n}`, "string", [`NPC phrase ${n}`, `Реплика НПС ${n}`, `NPC-Satz ${n}`, `Phrase du PNJ ${n}`, `Frase del PNJ ${n}`, `NPC台词 ${n}`], ["Text spoken by the NPC. Keep the enclosing quotes.", "Текст реплики НПС. Сохраните кавычки вокруг текста.", "Gesprochener Text. Anführungszeichen beibehalten.", "Texte prononcé. Conservez les guillemets.", "Texto hablado. Conserva las comillas.", "NPC发言内容,请保留外层引号。"], { advanced: true });
|
for (let n = 1; n <= 3; n++) add(`EC.P${n}`, "string", [`NPC phrase ${n}`, `Реплика НПС ${n}`, `NPC-Satz ${n}`, `Phrase du PNJ ${n}`, `Frase del PNJ ${n}`, `NPC台词 ${n}`], ["Text spoken by the NPC. Keep the enclosing quotes.", "Текст реплики НПС. Сохраните кавычки вокруг текста.", "Gesprochener Text. Anführungszeichen beibehalten.", "Texte prononcé. Conservez les guillemets.", "Texto hablado. Conserva las comillas.", "NPC发言内容,请保留外层引号。"], { advanced: true });
|
||||||
|
|
||||||
const ah = "AuctionHouseBot.";
|
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 + "GUIDs", "string", ["Auction characters", "Персонажи аукциона", "Auktionscharaktere", "Personnages d’enchères", "Personajes de subasta", "拍卖角色"], ["Leave 0 and the server creates and uses its own auction character. To use your own, enter GUIDs separated by commas, without spaces; use dedicated offline characters, not companion bots.", "Оставьте 0, и сервер сам создаст и будет использовать своего персонажа аукциона. Чтобы использовать своих, укажите GUID через запятую без пробелов; нужны отдельные офлайн-персонажи, не боты-компаньоны.", "Bei 0 legt der Server selbst einen Auktionscharakter an und nutzt ihn. Eigene Charaktere: GUIDs durch Kommas, ohne Leerzeichen; separate Offline-Charaktere verwenden, keine Begleiter-Bots.", "Laissez 0 : le serveur crée et utilise son propre personnage d’enchères. Pour les vôtres, indiquez des GUID séparés par des virgules sans espaces ; personnages dédiés hors ligne, pas des bots compagnons.", "Deja 0 y el servidor crea y usa su propio personaje de subastas. Para usar los tuyos, indica GUID separados por comas sin espacios; personajes dedicados desconectados, no bots acompañantes.", "保持0时由服务器自动创建并使用拍卖角色。要使用自己的角色,请以逗号分隔填写GUID,不加空格;使用专用离线角色,勿用伙伴机器人。"], { advanced: true });
|
||||||
add(ah + "EnableSeller", "bool", ["Post auctions", "Выставлять лоты", "Auktionen einstellen", "Publier des enchères", "Publicar subastas", "发布拍卖"], ["Let the auction characters sell items. The module switch 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 + "EnableSeller", "bool", ["Post auctions", "Выставлять лоты", "Auktionen einstellen", "Publier des enchères", "Publicar subastas", "发布拍卖"], ["Let the auction characters sell items. The module switch is also required.", "Разрешает персонажам продавать предметы. Нужен включённый модуль.", "Erlaubt Verkäufe. Der Modulschalter muss ebenfalls aktiv sein.", "Autorise les ventes. Le module doit aussi être activé.", "Permite vender. También requiere el módulo activado.", "允许拍卖角色出售物品,还需启用模块。"]);
|
||||||
add(ah + "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 + "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 });
|
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 [
|
for (const [kind, titles] of [
|
||||||
@@ -104,7 +104,7 @@ for (const [faction, names] of [
|
|||||||
`${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 ? "最多" : "最少"}上架数量`,
|
`${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 });
|
], ["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.Enabled", "bool", ["Buy player auctions", "Покупать лоты игроков", "Spielerauktionen kaufen", "Acheter les enchères des joueurs", "Comprar subastas de jugadores", "购买玩家拍卖"], ["The auctioneer bot buys listings.", "Бот-аукционист покупает лоты.", "Der Auktionator-Bot kauft Angebote.", "Le bot commissaire-priseur achète des annonces.", "El bot subastador compra anuncios.", "拍卖机器人会购买拍卖品。"]);
|
||||||
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.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 + "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 });
|
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 });
|
||||||
|
|||||||
+13
-4
@@ -1,9 +1,14 @@
|
|||||||
|
import type { ReportTarget, ReportTargetId } from "./api";
|
||||||
|
|
||||||
/** The text of a problem report, always in English so whoever reads it on GitHub can follow it; the person's own words go in as typed. */
|
/** The text of a problem report, always in English so whoever reads it on GitHub can follow it; the person's own words go in as typed. */
|
||||||
export interface ReportInput {
|
export interface ReportInput {
|
||||||
managerVersion: string;
|
managerVersion: string;
|
||||||
windows: string;
|
windows: string;
|
||||||
installKind: "new" | "imported";
|
installKind: "new" | "imported";
|
||||||
serverVersion: string | null;
|
serverVersion: string | null;
|
||||||
|
/** where the report goes; a bot repository is told which Manager and bot release it came from */
|
||||||
|
target: ReportTargetId;
|
||||||
|
botsVersion: string | null;
|
||||||
what: string;
|
what: string;
|
||||||
expected: string;
|
expected: string;
|
||||||
steps: string;
|
steps: string;
|
||||||
@@ -11,7 +16,10 @@ export interface ReportInput {
|
|||||||
diagnostics: boolean;
|
diagnostics: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
export const NEW_ISSUE_URL = "https://github.com/Corfirean/coa-server-manager/issues/new";
|
/** The "new issue" page of a repository given as `owner/name`. */
|
||||||
|
export function newIssueUrl(repo: string): string {
|
||||||
|
return `https://github.com/${repo}/issues/new`;
|
||||||
|
}
|
||||||
const PRIVACY = "> Please remove passwords, tokens, private IP information or other sensitive data before posting logs.";
|
const PRIVACY = "> Please remove passwords, tokens, private IP information or other sensitive data before posting logs.";
|
||||||
|
|
||||||
export function reportBody(r: ReportInput): string {
|
export function reportBody(r: ReportInput): string {
|
||||||
@@ -23,6 +31,7 @@ export function reportBody(r: ReportInput): string {
|
|||||||
`**Windows version:** ${r.windows || "unknown"} `,
|
`**Windows version:** ${r.windows || "unknown"} `,
|
||||||
`**Fresh install or imported server:** ${r.installKind === "new" ? "Fresh install" : "Imported server"} `,
|
`**Fresh install or imported server:** ${r.installKind === "new" ? "Fresh install" : "Imported server"} `,
|
||||||
...(r.serverVersion ? [`**Server version:** ${r.serverVersion} `] : []),
|
...(r.serverVersion ? [`**Server version:** ${r.serverVersion} `] : []),
|
||||||
|
...(r.target !== "manager" ? [`**Bot system:** ${r.target === "squid" ? "SQUID Playerbots" : "CoA Companions"}${r.botsVersion ? ` ${r.botsVersion}` : ""} `] : []),
|
||||||
"",
|
"",
|
||||||
"**What happened?** ",
|
"**What happened?** ",
|
||||||
text(r.what, "Describe the problem."),
|
text(r.what, "Describe the problem."),
|
||||||
@@ -54,9 +63,9 @@ export function encodeQuery(s: string): string {
|
|||||||
.join("");
|
.join("");
|
||||||
}
|
}
|
||||||
|
|
||||||
/** A link that opens GitHub's "new issue" page with the title and text filled in. */
|
/** A link that opens GitHub's "new issue" page of `target` with the title and text filled in. The bug label is only asked for in our own repositories. */
|
||||||
export function issueUrl(title: string, body: string): string {
|
export function issueUrl(target: Pick<ReportTarget, "repo" | "ours">, title: string, body: string): string {
|
||||||
return `${NEW_ISSUE_URL}?labels=bug&title=${encodeQuery(title)}&body=${encodeQuery(body)}`;
|
return `${newIssueUrl(target.repo)}?${target.ours ? "labels=bug&" : ""}title=${encodeQuery(title)}&body=${encodeQuery(body)}`;
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Links longer than this are not reliable in every browser; the full text is then copied to the clipboard instead. */
|
/** Links longer than this are not reliable in every browser; the full text is then copied to the clipboard instead. */
|
||||||
|
|||||||
@@ -5,6 +5,15 @@ import { Button } from "@/components/ui/button";
|
|||||||
import { Card } from "@/components/ui/card";
|
import { Card } from "@/components/ui/card";
|
||||||
import { useHuman, useT, type Key } from "@/i18n";
|
import { useHuman, useT, type Key } from "@/i18n";
|
||||||
|
|
||||||
|
/** Convenience only; Rust validates again before applying or saving. */
|
||||||
|
function validLanIpv4(value: string): boolean {
|
||||||
|
if (!/^(0|[1-9]\d{0,2})(\.(0|[1-9]\d{0,2})){3}$/.test(value)) return false;
|
||||||
|
const octets = value.split(".").map(Number);
|
||||||
|
const [a, b] = octets;
|
||||||
|
return octets.every((n) => n <= 255) && a > 0 && a < 224 && a !== 127
|
||||||
|
&& !(a === 169 && b === 254) && !(a === 100 && b >= 64 && b <= 127);
|
||||||
|
}
|
||||||
|
|
||||||
function Line({ ok, children, warn }: { ok: boolean; warn?: boolean; children: React.ReactNode }) {
|
function Line({ ok, children, warn }: { ok: boolean; warn?: boolean; children: React.ReactNode }) {
|
||||||
const t = useT();
|
const t = useT();
|
||||||
return (
|
return (
|
||||||
@@ -81,11 +90,28 @@ export function FriendsPage({ serverId }: { serverId: string }) {
|
|||||||
const [note, setNote] = useState<string | null>(null);
|
const [note, setNote] = useState<string | null>(null);
|
||||||
const [copied, setCopied] = useState(false);
|
const [copied, setCopied] = useState(false);
|
||||||
const [needsRestart, setNeedsRestart] = useState(false);
|
const [needsRestart, setNeedsRestart] = useState(false);
|
||||||
|
const [lanChoice, setLanChoice] = useState("automatic");
|
||||||
|
const [customLan, setCustomLan] = useState("");
|
||||||
|
|
||||||
const refresh = useCallback(() => api.friendsStatus(serverId).then(setSt).catch((e) => setError(asUiError(e))), [serverId]);
|
const refresh = useCallback(() => api.friendsStatus(serverId).then((status) => {
|
||||||
|
setSt(status);
|
||||||
|
}).catch((e) => setError(asUiError(e))), [serverId]);
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
void refresh();
|
let cancelled = false;
|
||||||
}, [refresh]);
|
setSt(null);
|
||||||
|
setNet(null);
|
||||||
|
void api.friendsStatus(serverId).then((status) => {
|
||||||
|
if (cancelled) return;
|
||||||
|
const saved = status.settings.lan_address_override;
|
||||||
|
setCustomLan(saved ?? "");
|
||||||
|
setLanChoice(saved === null ? "automatic" : status.lan_addresses.some((a) => a.address === saved) ? saved : "custom");
|
||||||
|
setSt(status);
|
||||||
|
}).catch((e) => { if (!cancelled) setError(asUiError(e)); });
|
||||||
|
return () => { cancelled = true; };
|
||||||
|
}, [serverId]);
|
||||||
|
|
||||||
|
const lanOverride = lanChoice === "automatic" ? null : lanChoice === "custom" ? customLan.trim() : lanChoice;
|
||||||
|
const lanValid = lanOverride === null || validLanIpv4(lanOverride);
|
||||||
|
|
||||||
async function run(label: string, fn: () => Promise<string | void>) {
|
async function run(label: string, fn: () => Promise<string | void>) {
|
||||||
setBusy(label);
|
setBusy(label);
|
||||||
@@ -109,7 +135,12 @@ export function FriendsPage({ serverId }: { serverId: string }) {
|
|||||||
|
|
||||||
const enable = (mode: FriendsMode) =>
|
const enable = (mode: FriendsMode) =>
|
||||||
run(`enable-${mode}`, async () => {
|
run(`enable-${mode}`, async () => {
|
||||||
const r = await api.friendsEnable(serverId, mode, net?.public_ip ?? undefined, mode === "direct" && !!net?.router_found);
|
const r = await api.friendsEnable(
|
||||||
|
serverId, mode,
|
||||||
|
mode === "direct" ? net?.public_ip ?? undefined : undefined,
|
||||||
|
mode === "direct" && !!net?.router_found,
|
||||||
|
mode === "lan" ? lanOverride : null,
|
||||||
|
);
|
||||||
setNeedsRestart(r.restart_required);
|
setNeedsRestart(r.restart_required);
|
||||||
return [r.restart_required ? t("fr.restartToApply") : null, r.note ? (r.note.startsWith("Your router was asked") ? t("fr.note.forwarded") : r.note.startsWith("Your router does not support") ? t("fr.note.manual") : r.note) : null].filter(Boolean).join(" ") || t("fr.ready");
|
return [r.restart_required ? t("fr.restartToApply") : null, r.note ? (r.note.startsWith("Your router was asked") ? t("fr.note.forwarded") : r.note.startsWith("Your router does not support") ? t("fr.note.manual") : r.note) : null].filter(Boolean).join(" ") || t("fr.ready");
|
||||||
});
|
});
|
||||||
@@ -119,6 +150,8 @@ export function FriendsPage({ serverId }: { serverId: string }) {
|
|||||||
const cur = st.settings;
|
const cur = st.settings;
|
||||||
const exposed = st.exposure.filter((e) => (e.what === "database" || e.what === "server console") && e.reachable_from_network);
|
const exposed = st.exposure.filter((e) => (e.what === "database" || e.what === "server console") && e.reachable_from_network);
|
||||||
const connection = cur.mode === "local" ? null : `set realmlist ${cur.host}`;
|
const connection = cur.mode === "local" ? null : `set realmlist ${cur.host}`;
|
||||||
|
const selectedLan = lanOverride ?? st.lan_ip;
|
||||||
|
const lanUnavailable = lanOverride !== null && lanValid && !st.lan_addresses.some((a) => a.address === lanOverride);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="max-w-3xl">
|
<div className="max-w-3xl">
|
||||||
@@ -157,8 +190,28 @@ export function FriendsPage({ serverId }: { serverId: string }) {
|
|||||||
|
|
||||||
{m.id === "lan" && (
|
{m.id === "lan" && (
|
||||||
<>
|
<>
|
||||||
<p className="mt-2 text-sm">{t("fr.yourLan")} <b className="selectable">{st.lan_ip ?? t("fr.unknown")}</b></p>
|
<label htmlFor="lan-address" className="mt-3 block text-sm">{t("fr.lan.address")}</label>
|
||||||
{st.lan_ip && cur.mode !== m.id && <RealmlistLine host={st.lan_ip} />}
|
<select id="lan-address" value={lanChoice} disabled={!!busy}
|
||||||
|
className="mt-1 w-full rounded-md border border-line bg-bg px-3 py-2 text-sm outline-none focus:border-gold"
|
||||||
|
onChange={(e) => {
|
||||||
|
if (e.target.value === "custom" && lanOverride) setCustomLan(lanOverride);
|
||||||
|
setLanChoice(e.target.value);
|
||||||
|
}}>
|
||||||
|
<option value="automatic">{t("fr.lan.automatic")} — {st.lan_ip ?? t("fr.unknown")}</option>
|
||||||
|
{st.lan_addresses.map((a) => <option key={a.address} value={a.address}>{a.interface} — {a.address}{a.is_default ? ` (${t("fr.lan.default")})` : ""}</option>)}
|
||||||
|
{lanChoice !== "automatic" && lanChoice !== "custom" && !st.lan_addresses.some((a) => a.address === lanChoice) && <option value={lanChoice}>{lanChoice}</option>}
|
||||||
|
<option value="custom">{t("fr.lan.custom")}</option>
|
||||||
|
</select>
|
||||||
|
{lanChoice === "custom" && <>
|
||||||
|
<label htmlFor="lan-custom" className="mt-2 block text-sm">{t("fr.lan.customIpv4")}</label>
|
||||||
|
<input id="lan-custom" value={customLan} disabled={!!busy} spellCheck={false} inputMode="decimal"
|
||||||
|
aria-invalid={!lanValid} aria-describedby={!lanValid ? "lan-invalid" : undefined}
|
||||||
|
className="mt-1 w-full rounded-md border border-line bg-bg px-3 py-2 text-sm outline-none focus:border-gold"
|
||||||
|
onChange={(e) => setCustomLan(e.target.value)} />
|
||||||
|
</>}
|
||||||
|
{!lanValid && <p id="lan-invalid" className="mt-2 text-sm text-bad" role="alert">{t("fr.lan.invalid")}</p>}
|
||||||
|
{lanUnavailable && <p className="mt-2 text-sm text-warn" role="status"><b>{t("fr.lan.unavailable")}</b> {t("fr.lan.unavailableText")}</p>}
|
||||||
|
{selectedLan && lanValid && <RealmlistLine host={selectedLan} />}
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
@@ -221,7 +274,7 @@ export function FriendsPage({ serverId }: { serverId: string }) {
|
|||||||
<Button
|
<Button
|
||||||
size="sm"
|
size="sm"
|
||||||
variant={m.id === "private" && net?.reachability === "cgnat" ? "primary" : "secondary"}
|
variant={m.id === "private" && net?.reachability === "cgnat" ? "primary" : "secondary"}
|
||||||
disabled={!!busy || (m.id === "direct" && !net?.public_ip) || (m.id === "private" && !st.tailscale.connected)}
|
disabled={!!busy || (m.id === "lan" && (!lanValid || !selectedLan)) || (m.id === "direct" && !net?.public_ip) || (m.id === "private" && !st.tailscale.connected)}
|
||||||
onClick={() => void enable(m.id)}
|
onClick={() => void enable(m.id)}
|
||||||
title={m.id === "direct" && !net?.public_ip ? t("fr.checkFirst") : undefined}
|
title={m.id === "direct" && !net?.public_ip ? t("fr.checkFirst") : undefined}
|
||||||
>
|
>
|
||||||
|
|||||||
@@ -261,6 +261,12 @@ function ModuleSettings({ serverId, module, onSaved }: { serverId: string; modul
|
|||||||
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 === "npc-enchanter" && (
|
||||||
|
<div className="mb-4 space-y-2 text-sm text-muted">
|
||||||
|
<p>{t("mod.enchanter.add")}</p>
|
||||||
|
<p>{t("mod.enchanter.remove")}</p>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
{module.id === "ah-bot" && (
|
{module.id === "ah-bot" && (
|
||||||
<div className="mb-4 space-y-2 text-sm text-muted">
|
<div className="mb-4 space-y-2 text-sm text-muted">
|
||||||
<p>{t("mod.ahbot.setup")}</p>
|
<p>{t("mod.ahbot.setup")}</p>
|
||||||
|
|||||||
@@ -64,7 +64,7 @@ function Row({ label, s }: { label: string; s: ServiceStatus }) {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
export function Overview({ server, companions = true, onForget, onOpenUpdates, onRealmChanged }: { server: ServerSummary; /** the companions module is on */ companions?: boolean; onForget: () => Promise<void>; onOpenUpdates: () => void; onRealmChanged: () => void }) {
|
export function Overview({ server, companions = true, onForget, onOpenUpdates, onRealmChanged, onReport }: { server: ServerSummary; /** the companions module is on */ companions?: boolean; onForget: () => Promise<void>; onOpenUpdates: () => void; onRealmChanged: () => void; /** open the problem report, which collects the diagnostics */ onReport: () => void }) {
|
||||||
const t = useT();
|
const t = useT();
|
||||||
const human = useHuman();
|
const human = useHuman();
|
||||||
const [status, setStatus] = useState<StatusView | null>(null);
|
const [status, setStatus] = useState<StatusView | null>(null);
|
||||||
@@ -228,6 +228,12 @@ export function Overview({ server, companions = true, onForget, onOpenUpdates, o
|
|||||||
/>
|
/>
|
||||||
{headline}
|
{headline}
|
||||||
</div>
|
</div>
|
||||||
|
{!transitioning && !running && anyUp && (
|
||||||
|
<p className="mt-2 text-sm text-muted">
|
||||||
|
{t("overview.reportHint")}{" "}
|
||||||
|
<button onClick={onReport} className="cursor-pointer text-gold underline hover:text-ink">{t("overview.reportBtn")}</button>
|
||||||
|
</p>
|
||||||
|
)}
|
||||||
|
|
||||||
<div className="mt-5 divide-y divide-line border-y border-line">
|
<div className="mt-5 divide-y divide-line border-y border-line">
|
||||||
<Row label={t("overview.database")} s={mysql} />
|
<Row label={t("overview.database")} s={mysql} />
|
||||||
|
|||||||
+90
-30
@@ -1,22 +1,36 @@
|
|||||||
import { useEffect, useMemo, useState } from "react";
|
import { useEffect, useState } from "react";
|
||||||
import { Loader2 } from "lucide-react";
|
import { Loader2 } from "lucide-react";
|
||||||
import { api, asUiError, type ReportContext, type UiError } from "@/lib/api";
|
import { api, asUiError, type ReportContext, type ReportTarget, type ReportTargetId, type UiError } from "@/lib/api";
|
||||||
import { MAX_LINK, issueUrl, reportBody } from "@/lib/report";
|
import { MAX_LINK, issueUrl, reportBody } from "@/lib/report";
|
||||||
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, useT } from "@/i18n";
|
import { useHuman, useT, type Key } from "@/i18n";
|
||||||
|
|
||||||
const field = "mt-1 block w-full rounded-md border border-line bg-bg px-3 py-2.5 text-[15px] outline-none focus:border-gold";
|
const field = "mt-1 block w-full rounded-md border border-line bg-bg px-3 py-2.5 text-[15px] outline-none focus:border-gold";
|
||||||
|
|
||||||
/** A problem report that becomes a prefilled GitHub issue. Nothing is sent from here: the person reviews and submits it on GitHub. */
|
const TARGET_LABEL: Record<ReportTargetId, Key> = {
|
||||||
|
manager: "rep.target.manager",
|
||||||
|
companions: "rep.target.companions",
|
||||||
|
squid: "rep.target.squid",
|
||||||
|
};
|
||||||
|
|
||||||
|
const FALLBACK: ReportTarget = { id: "manager", repo: "Corfirean/coa-server-manager", ours: true };
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A problem report that becomes a prefilled GitHub issue in the repository of whatever it is about. One button collects
|
||||||
|
* the diagnostics (and shows the file in its folder) and opens the issue; the person reviews it and submits it on GitHub.
|
||||||
|
*/
|
||||||
export function ReportPage({ serverId }: { serverId: string }) {
|
export function ReportPage({ serverId }: { serverId: string }) {
|
||||||
const t = useT();
|
const t = useT();
|
||||||
const human = useHuman();
|
const human = useHuman();
|
||||||
const [ctx, setCtx] = useState<ReportContext | null>(null);
|
const [ctx, setCtx] = useState<ReportContext | null>(null);
|
||||||
|
const [targets, setTargets] = useState<ReportTarget[]>([]);
|
||||||
|
const [targetId, setTargetId] = useState<ReportTargetId | null>(null);
|
||||||
const [title, setTitle] = useState("");
|
const [title, setTitle] = useState("");
|
||||||
const [what, setWhat] = useState("");
|
const [what, setWhat] = useState("");
|
||||||
const [expected, setExpected] = useState("");
|
const [expected, setExpected] = useState("");
|
||||||
const [steps, setSteps] = useState("");
|
const [steps, setSteps] = useState("");
|
||||||
|
const [withDiag, setWithDiag] = useState(true);
|
||||||
const [file, setFile] = useState<string | null>(null);
|
const [file, setFile] = useState<string | null>(null);
|
||||||
const [busy, setBusy] = useState(false);
|
const [busy, setBusy] = useState(false);
|
||||||
const [note, setNote] = useState<string | null>(null);
|
const [note, setNote] = useState<string | null>(null);
|
||||||
@@ -25,30 +39,44 @@ export function ReportPage({ serverId }: { serverId: string }) {
|
|||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
void api.reportContext(serverId).then(setCtx).catch(() => setCtx(null));
|
void api.reportContext(serverId).then(setCtx).catch(() => setCtx(null));
|
||||||
|
void api.reportTargets().then(setTargets).catch(() => setTargets([]));
|
||||||
}, [serverId]);
|
}, [serverId]);
|
||||||
|
|
||||||
const body = useMemo(
|
// start on the bot system that is switched on, until the person picks one
|
||||||
() =>
|
const chosen: ReportTargetId = targetId ?? ctx?.suggested_target ?? "manager";
|
||||||
reportBody({
|
const shown = targets.length ? targets : [FALLBACK];
|
||||||
managerVersion: ctx?.manager_version ?? "",
|
const target = shown.find((x) => x.id === chosen) ?? shown[0];
|
||||||
windows: ctx?.windows ?? "",
|
|
||||||
installKind: ctx?.install_kind ?? "new",
|
function bodyFor(hasFile: boolean): string {
|
||||||
serverVersion: ctx?.server_version ?? null,
|
return reportBody({
|
||||||
what,
|
managerVersion: ctx?.manager_version ?? "",
|
||||||
expected,
|
windows: ctx?.windows ?? "",
|
||||||
steps,
|
installKind: ctx?.install_kind ?? "new",
|
||||||
diagnostics: file !== null,
|
serverVersion: ctx?.server_version ?? null,
|
||||||
}),
|
target: target.id,
|
||||||
[ctx, what, expected, steps, file],
|
botsVersion: ctx?.bots_version ?? null,
|
||||||
);
|
what,
|
||||||
const issueTitle = `[Bug] ${title.trim()}`;
|
expected,
|
||||||
|
steps,
|
||||||
|
diagnostics: hasFile,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
const issueTitle = target.ours ? `[Bug] ${title.trim()}` : title.trim();
|
||||||
const ready = title.trim().length > 0 && what.trim().length > 0;
|
const ready = title.trim().length > 0 && what.trim().length > 0;
|
||||||
|
|
||||||
async function makeFile() {
|
/** Collects the diagnostics once; the Manager shows the file in its folder. */
|
||||||
|
async function collect(): Promise<string> {
|
||||||
|
if (file) return file;
|
||||||
|
const path = await api.exportDiagnostics(serverId);
|
||||||
|
setFile(path);
|
||||||
|
return path;
|
||||||
|
}
|
||||||
|
|
||||||
|
async function collectOnly() {
|
||||||
setBusy(true);
|
setBusy(true);
|
||||||
setError(null);
|
setError(null);
|
||||||
try {
|
try {
|
||||||
setFile(await api.exportDiagnostics(serverId));
|
await collect();
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
setError(asUiError(e));
|
setError(asUiError(e));
|
||||||
} finally {
|
} finally {
|
||||||
@@ -56,26 +84,32 @@ export function ReportPage({ serverId }: { serverId: string }) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** One button: collect the diagnostics (if asked), then open the issue with everything filled in. */
|
||||||
async function openIssue() {
|
async function openIssue() {
|
||||||
|
setBusy(true);
|
||||||
setError(null);
|
setError(null);
|
||||||
setNote(null);
|
setNote(null);
|
||||||
try {
|
try {
|
||||||
const full = issueUrl(issueTitle, body);
|
const path = withDiag ? await collect() : null;
|
||||||
|
const body = bodyFor(path !== null);
|
||||||
|
const full = issueUrl(target, issueTitle, body);
|
||||||
if (full.length <= MAX_LINK) {
|
if (full.length <= MAX_LINK) {
|
||||||
await api.openLink(full);
|
await api.openLink(full);
|
||||||
setNote(t("rep.opened"));
|
setNote(t("rep.opened"));
|
||||||
} else {
|
} else {
|
||||||
await navigator.clipboard.writeText(body);
|
await navigator.clipboard.writeText(body);
|
||||||
await api.openLink(issueUrl(issueTitle, "Paste the report text here (it was copied to the clipboard by CoA Server Manager)."));
|
await api.openLink(issueUrl(target, issueTitle, "Paste the report text here (it was copied to the clipboard by CoA Server Manager)."));
|
||||||
setNote(t("rep.openedLong"));
|
setNote(t("rep.openedLong"));
|
||||||
}
|
}
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
setError(asUiError(e));
|
setError(asUiError(e));
|
||||||
|
} finally {
|
||||||
|
setBusy(false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async function copy() {
|
async function copy() {
|
||||||
await navigator.clipboard.writeText(`${issueTitle}\n\n${body}`);
|
await navigator.clipboard.writeText(`${issueTitle}\n\n${bodyFor(file !== null)}`);
|
||||||
setNote(t("rep.copied"));
|
setNote(t("rep.copied"));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -85,6 +119,22 @@ export function ReportPage({ serverId }: { serverId: string }) {
|
|||||||
<p className="mt-1 text-muted">{t("q.report")}</p>
|
<p className="mt-1 text-muted">{t("q.report")}</p>
|
||||||
<p className="mt-3 text-sm text-muted">{t("rep.intro")}</p>
|
<p className="mt-3 text-sm text-muted">{t("rep.intro")}</p>
|
||||||
|
|
||||||
|
<Card className="mt-6 p-6">
|
||||||
|
<h2 className="font-semibold" id="rep-target">{t("rep.targetTitle")}</h2>
|
||||||
|
<div role="radiogroup" aria-labelledby="rep-target" className="mt-3 space-y-2">
|
||||||
|
{shown.map((x) => (
|
||||||
|
<label key={x.id} className={`flex cursor-pointer items-start gap-3 rounded-md border px-3 py-2.5 ${chosen === x.id ? "border-gold" : "border-line"}`}>
|
||||||
|
<input type="radio" name="rep-target" className="mt-1" checked={chosen === x.id} onChange={() => setTargetId(x.id)} />
|
||||||
|
<span>
|
||||||
|
<span className="block text-[15px]">{t(TARGET_LABEL[x.id])}</span>
|
||||||
|
<span className="selectable block text-xs text-muted">{x.repo}</span>
|
||||||
|
</span>
|
||||||
|
</label>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
<p className="mt-3 text-xs text-muted">{t("rep.targetPublic", { repo: target.repo })}</p>
|
||||||
|
</Card>
|
||||||
|
|
||||||
<Card className="mt-6 p-6">
|
<Card className="mt-6 p-6">
|
||||||
<h2 className="font-semibold">{t("rep.autoTitle")}</h2>
|
<h2 className="font-semibold">{t("rep.autoTitle")}</h2>
|
||||||
<dl className="mt-3 grid grid-cols-[auto_1fr] gap-x-6 gap-y-1 text-sm">
|
<dl className="mt-3 grid grid-cols-[auto_1fr] gap-x-6 gap-y-1 text-sm">
|
||||||
@@ -100,6 +150,12 @@ export function ReportPage({ serverId }: { serverId: string }) {
|
|||||||
<dd>{ctx.server_version}</dd>
|
<dd>{ctx.server_version}</dd>
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
|
{target.id !== "manager" && ctx?.bots_version && (
|
||||||
|
<>
|
||||||
|
<dt className="text-muted">{t("rep.botsVersion")}</dt>
|
||||||
|
<dd>{ctx.bots_version}</dd>
|
||||||
|
</>
|
||||||
|
)}
|
||||||
</dl>
|
</dl>
|
||||||
</Card>
|
</Card>
|
||||||
|
|
||||||
@@ -125,16 +181,20 @@ export function ReportPage({ serverId }: { serverId: string }) {
|
|||||||
<Card className="mt-6 p-6">
|
<Card className="mt-6 p-6">
|
||||||
<h2 className="font-semibold">{t("rep.attachTitle")}</h2>
|
<h2 className="font-semibold">{t("rep.attachTitle")}</h2>
|
||||||
<p className="mt-1 text-sm text-muted">{t("rep.attachText")}</p>
|
<p className="mt-1 text-sm text-muted">{t("rep.attachText")}</p>
|
||||||
<Button className="mt-3" size="sm" disabled={busy} onClick={() => void makeFile()}>
|
<label className="mt-3 flex cursor-pointer items-start gap-3 text-sm">
|
||||||
{busy && <Loader2 className="h-4 w-4 animate-spin" aria-hidden />}
|
<input type="checkbox" className="mt-1" checked={withDiag} onChange={(e) => setWithDiag(e.target.checked)} />
|
||||||
{t("rep.makeFile")}
|
<span>{t("rep.withDiag")}</span>
|
||||||
</Button>
|
</label>
|
||||||
{file && <p className="selectable mt-3 break-all text-sm text-ok" role="status">{t("rep.fileSaved", { path: file })}</p>}
|
{file && <p className="selectable mt-3 break-all text-sm text-ok" role="status">{t("rep.fileSaved", { path: file })}</p>}
|
||||||
<p className="mt-4 text-xs text-warn">{t("rep.privacy")}</p>
|
<p className="mt-4 text-xs text-warn">{t("rep.privacy")}</p>
|
||||||
</Card>
|
</Card>
|
||||||
|
|
||||||
<div className="mt-6 flex flex-wrap items-center gap-3">
|
<div className="mt-6 flex flex-wrap items-center gap-3">
|
||||||
<Button variant="primary" disabled={!ready} onClick={() => void openIssue()}>{t("rep.open")}</Button>
|
<Button variant="primary" disabled={!ready || busy} onClick={() => void openIssue()}>
|
||||||
|
{busy && <Loader2 className="h-4 w-4 animate-spin" aria-hidden />}
|
||||||
|
{busy ? t("rep.collecting") : withDiag ? t("rep.collectOpen") : t("rep.open")}
|
||||||
|
</Button>
|
||||||
|
<Button variant="ghost" disabled={busy} onClick={() => void collectOnly()}>{t("rep.makeFile")}</Button>
|
||||||
<Button variant="ghost" disabled={!ready} onClick={() => void copy()}>{t("rep.copy")}</Button>
|
<Button variant="ghost" disabled={!ready} onClick={() => void copy()}>{t("rep.copy")}</Button>
|
||||||
<button onClick={() => setShowPreview((v) => !v)} aria-expanded={showPreview} className="cursor-pointer text-sm text-muted underline hover:text-ink">
|
<button onClick={() => setShowPreview((v) => !v)} aria-expanded={showPreview} className="cursor-pointer text-sm text-muted underline hover:text-ink">
|
||||||
{t("rep.preview")}
|
{t("rep.preview")}
|
||||||
@@ -144,7 +204,7 @@ export function ReportPage({ serverId }: { serverId: string }) {
|
|||||||
<p className="mt-2 text-xs text-muted">{t("rep.githubNote")}</p>
|
<p className="mt-2 text-xs text-muted">{t("rep.githubNote")}</p>
|
||||||
{note && <p className="mt-3 text-sm text-ok" role="status">{note}</p>}
|
{note && <p className="mt-3 text-sm text-ok" role="status">{note}</p>}
|
||||||
{error && <p className="mt-3 text-sm text-bad" role="alert">{error.human.code === "unknown" ? error.technical : human(error.human).message}</p>}
|
{error && <p className="mt-3 text-sm text-bad" role="alert">{error.human.code === "unknown" ? error.technical : human(error.human).message}</p>}
|
||||||
{showPreview && <pre className="selectable mt-3 max-h-80 overflow-auto whitespace-pre-wrap rounded bg-black/40 p-3 text-xs text-muted">{`${issueTitle}\n\n${body}`}</pre>}
|
{showPreview && <pre className="selectable mt-3 max-h-80 overflow-auto whitespace-pre-wrap rounded bg-black/40 p-3 text-xs text-muted">{`${issueTitle}\n\n${bodyFor(file !== null || withDiag)}`}</pre>}
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -127,7 +127,7 @@ 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={botModule === "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} onReport={() => setPage("report")} />
|
||||||
) : page === "bots" || page === "server" ? (
|
) : page === "bots" || page === "server" ? (
|
||||||
<SettingsPage key={`${server.id}-${page}-${botModule}`} serverId={server.id} scope={page} botModule={botModule} title={t(current.label)} question={t(current.question)} />
|
<SettingsPage key={`${server.id}-${page}-${botModule}`} serverId={server.id} scope={page} botModule={botModule} title={t(current.label)} question={t(current.question)} />
|
||||||
) : page === "console" ? (
|
) : page === "console" ? (
|
||||||
|
|||||||
Reference in new issue
Block a user