Compare commits

..
6 Commits
Author SHA1 Message Date
ДмитрийandClaude Sonnet 5.5 d01e401f3c Layout fixes (fluid main card, password field), no emoji in reports, empty modules page; Release 0.3.1
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
2026-10-01 16:30:12 +05:00
ДмитрийandClaude Sonnet 5.5 81aacdf5bb Realmlist switcher next to PLAY, and a Modules page
- Named realmlists (e.g. Solo, PTR): a drop-down by the PLAY button switches the game client by writing the chosen text into every
  locale's realmlist.wtf (the replaced file is saved first); add / edit / remove with a name and the realmlist text (or just an
  address). First use offers 'Solo' (127.0.0.1) and, if the client held another realmlist, 'Previous'.
- Modules page: bundled catalog (modules/catalog.json) of the optional modules built into the server; switch each on or off (its
  Enable setting), open its page on GitHub, edit its configuration with the module's own documentation. Nine modules to start with.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
2026-10-01 16:10:45 +05:00
ДмитрийandClaude Sonnet 5.5 a79c26ed49 Report a problem: a tab that prepares a prefilled GitHub bug report
Form (summary, what happened, expected, steps) plus the Manager version, Windows version, install kind and server version filled in
automatically, a redacted diagnostics file to attach, and a button that opens GitHub's new-issue page with the standard template
(the full text goes to the clipboard when it is too long for a link). Nothing is sent from the Manager and no token is needed.
open_link accepts only this project's new-issue page for that.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
2026-10-01 15:56:53 +05:00
ДмитрийandClaude Sonnet 5.5 a4c1080575 Tester suggestions: account management, install size and download volume, password show button, addon explanation
- Players page: list of the server's accounts with password change, access level (player/moderator/GM/administrator) and
  rename (a rename also sets a new password because the login verifier depends on the name; refused while logged in).
  Companion and console accounts are never listed.
- Install screen: size of the server from the signed package list (unpacked, download, peak) and the drive check uses it.
- Install progress shows downloaded / total volume and speed.
- Own show/hide button on password fields (the browser's one disappeared after leaving the field).
- Settings: one sentence on what the companion addon does.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
2026-10-01 15:13:11 +05:00
ДмитрийandClaude Sonnet 5.5 2c0bb2bac3 Settings: a running server update survives leaving the tab
The update's busy flag, progress and result were local to the Settings card, so switching tabs and coming back showed 'Update now'
again while the update was still running (and the server rightly answered 'another action is still in progress'). They now live in the
shared server-update store: the card re-attaches to the running update with its progress, and shows how it ended.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
2026-10-01 14:05:56 +05:00
ДмитрийandClaude Sonnet 5.5 645ffd8999 New servers and updated ones run the world on several threads: MapUpdate.Threads setting, one-time performance defaults, debug loggers lowered
- Server settings page gains 'CPU cores for the world' (MapUpdate.Threads), translated in all languages.
- On the first start of an installed server (not imports) the Manager sets it to half the logical processors (2..8) unless
  the owner already raised it, and lowers Logger.network / Logger.entities.player from debug to info; once per server.
- tools/sample_stacks.py: sampling profiler for a running worldserver (dbghelp + PDB), used to find what the world thread spends time on.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
2026-10-01 13:14:41 +05:00
43 changed files with 2704 additions and 62 deletions

No files matched your search

Generated
+3 -3
View File
@@ -347,7 +347,7 @@ dependencies = [
[[package]] [[package]]
name = "coa-core" name = "coa-core"
version = "0.3.0" version = "0.3.1"
dependencies = [ dependencies = [
"base64 0.22.1", "base64 0.22.1",
"chrono", "chrono",
@@ -375,7 +375,7 @@ dependencies = [
[[package]] [[package]]
name = "coa-release" name = "coa-release"
version = "0.3.0" version = "0.3.1"
dependencies = [ dependencies = [
"chrono", "chrono",
"coa-core", "coa-core",
@@ -384,7 +384,7 @@ dependencies = [
[[package]] [[package]]
name = "coa-server-manager" name = "coa-server-manager"
version = "0.3.0" version = "0.3.1"
dependencies = [ dependencies = [
"coa-core", "coa-core",
"serde", "serde",
+1 -1
View File
@@ -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.3.0" version = "0.3.1"
edition = "2021" edition = "2021"
license = "AGPL-3.0-only" license = "AGPL-3.0-only"
+5
View File
@@ -20,6 +20,11 @@ no console, no config files, no database tools. Tauri 2 + Rust + React.
from the app. from the app.
* **Companions (bots).** Fill the world with level-appropriate bots, see progress, stop spawning, take them offline, * **Companions (bots).** Fill the world with level-appropriate bots, see progress, stop spawning, take them offline,
despawn N to relieve the server, and choose how many log in at server start. despawn N to relieve the server, and choose how many log in at server start.
* **Realmlist switcher.** Keep named realmlists (for example *Solo* and *PTR*) and switch the game client between them from a
drop-down next to PLAY; the file that was replaced is saved first.
* **Accounts.** See everyone who can log in, change passwords and access levels, rename an account.
* **Modules.** A page for the server's optional modules (switch on/off, GitHub, settings); it fills up as modules are added.
* **Report a problem.** A form that prepares a ready bug report for GitHub with your versions filled in.
* **Settings without files.** Bots and Server pages with plain-language options and presets, a console to the world * **Settings without files.** Bots and Server pages with plain-language options and presets, a console to the world
server, player list with account tools. server, player list with account tools.
* **Play with friends.** Checks whether your server is reachable, opens firewall rules, finds your router (UPnP), * **Play with friends.** Checks whether your server is reachable, opens firewall rules, finds your router (UPnP),
+110
View File
@@ -0,0 +1,110 @@
//! The accounts of the people who play on this server: listed from the login database, changed through the world
//! console (password, access level) or - for a rename - by changing the stored name and then letting the console set
//! a new password, because the login verifier is computed from the name and would no longer match.
//! The accounts the Manager and the companions use themselves are never listed.
use std::path::Path;
use serde::Serialize;
use crate::db::{Account, Db};
use crate::error::{Error, Result};
use crate::ra::{validate_account, Ra};
#[derive(Debug, Clone, Serialize, PartialEq, Eq)]
pub struct AccountInfo {
pub id: u32,
pub name: String,
/// 0 player, 1 moderator, 2 game master, 3 administrator.
pub access: u8,
pub online: bool,
pub last_login: Option<String>,
pub characters: u32,
}
const LIST_SQL: &str = "SELECT a.id, a.username, \
IFNULL((SELECT MAX(aa.gmlevel) FROM acore_auth.account_access aa WHERE aa.id = a.id), 0), \
a.online, IFNULL(a.last_login, ''), \
(SELECT COUNT(*) FROM acore_characters.characters c WHERE c.account = a.id) \
FROM acore_auth.account a \
WHERE a.username NOT LIKE 'COABOTHOST%' AND a.username <> 'COAMANAGER' ORDER BY a.id;";
/// Rows of tab-separated columns as the `mysql` client prints them.
pub fn parse_list(out: &str) -> Vec<AccountInfo> {
out.lines()
.filter_map(|line| {
let c: Vec<&str> = line.split('\t').collect();
if c.len() < 6 {
return None;
}
Some(AccountInfo {
id: c[0].trim().parse().ok()?,
name: c[1].trim().to_string(),
access: c[2].trim().parse().unwrap_or(0),
online: c[3].trim() != "0",
last_login: Some(c[4].trim().to_string()).filter(|s| !s.is_empty() && s != "NULL"),
characters: c[5].trim().parse().unwrap_or(0),
})
})
.collect()
}
pub fn list(root: &Path) -> Result<Vec<AccountInfo>> {
let db = Db::from_repack(root, Account::Admin)?;
Ok(parse_list(&db.query(LIST_SQL)?))
}
fn upper(name: &str) -> Result<String> {
validate_account(name, "placeholder")?;
Ok(name.to_ascii_uppercase())
}
/// Give the account a new name. Needs the world console (the new password is what makes the login work again) and an
/// account that is not logged in. The old name is put back if anything goes wrong.
pub fn rename(root: &Path, ra: &mut Ra, old: &str, new: &str, password: &str) -> Result<()> {
let (old, new) = (upper(old)?, upper(new)?);
validate_account(&new, password)?;
if old == new {
return Err(Error::Invalid("That is already the name of this account.".into()));
}
let db = Db::from_repack(root, Account::Admin)?;
let taken = db.query(&format!("SELECT COUNT(*) FROM acore_auth.account WHERE username = '{new}';"))?;
if taken.trim() != "0" {
return Err(Error::Invalid("That account name is already taken.".into()));
}
let changed = db.query(&format!("UPDATE acore_auth.account SET username = '{new}' WHERE username = '{old}' AND online = 0; SELECT ROW_COUNT();"))?;
if changed.trim() != "1" {
return Err(Error::Invalid("The account was not renamed: it does not exist or is logged in right now.".into()));
}
if let Err(e) = ra.set_account_password(&new, password) {
let _ = db.query(&format!("UPDATE acore_auth.account SET username = '{old}' WHERE username = '{new}';"));
return Err(e);
}
tracing::info!(%old, %new, "account renamed");
Ok(())
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn rows_from_the_client_become_accounts() {
let out = "2\tALICE\t3\t0\t2026-09-30 21:04:11\t4\n5\tBOB\t0\t1\t\t0\n7\tBROKEN\n";
let a = parse_list(out);
assert_eq!(a.len(), 2, "a short row is skipped");
assert_eq!(a[0], AccountInfo { id: 2, name: "ALICE".into(), access: 3, online: false, last_login: Some("2026-09-30 21:04:11".into()), characters: 4 });
assert!(a[1].online && a[1].last_login.is_none() && a[1].access == 0);
}
#[test]
fn the_internal_accounts_are_filtered_out_by_the_query() {
assert!(LIST_SQL.contains("COABOTHOST%") && LIST_SQL.contains("COAMANAGER"));
}
#[test]
fn names_are_validated_and_stored_in_capitals() {
assert_eq!(upper("Alice1").unwrap(), "ALICE1");
assert!(upper("a").is_err() && upper("x; DROP TABLE account").is_err() && upper("bad name").is_err());
}
}
+26
View File
@@ -189,6 +189,32 @@ pub fn set_realmlist(client: &Path, meta: &Path, host: &str) -> Result<Vec<Strin
Ok(changed) Ok(changed)
} }
/// Replace the text of every locale's realmlist with `content` (a named realmlist chosen by the player). Each changed file
/// is saved to the backup folder first; files that already hold the same lines are left alone. A client without one gets a
/// file for each installed locale. Returns the files that changed.
pub fn write_realmlist(client: &Path, meta: &Path, content: &str) -> Result<Vec<String>> {
let compact = |t: &str| t.lines().map(|l| l.trim().to_ascii_lowercase()).filter(|l| !l.is_empty()).collect::<Vec<_>>().join("\n");
let mut files = realmlist_files(client);
if files.is_empty() {
files = installed_locales(client).into_iter().map(|loc| client.join("Data").join(loc).join("realmlist.wtf")).collect();
}
let stamp = chrono::Utc::now().format("%Y%m%d-%H%M%S").to_string();
let mut changed = Vec::new();
for file in files {
let old = fs::read(&file).ok();
if let Some(old) = &old {
if compact(&String::from_utf8_lossy(old)) == compact(content) {
continue;
}
let locale = file.parent().and_then(|p| p.file_name()).map(|n| n.to_string_lossy().into_owned()).unwrap_or_default();
fsx::atomic_write(&backup_dir(meta).join(format!("realmlist-{locale}-{stamp}.wtf")), old)?;
}
fsx::atomic_write(&file, content.as_bytes())?;
changed.push(file.to_string_lossy().into_owned());
}
Ok(changed)
}
/// Copy the addon into the client. If a different version is there, that one folder is backed up first; /// Copy the addon into the client. If a different version is there, that one folder is backed up first;
/// files in it that the package does not contain are left alone. /// files in it that the package does not contain are left alone.
pub fn install_addon(client: &Path, meta: &Path, source: &Path) -> Result<()> { pub fn install_addon(client: &Path, meta: &Path, source: &Path) -> Result<()> {
+93
View File
@@ -355,6 +355,67 @@ pub fn list_snapshots(meta_dir: &Path) -> Vec<SnapshotInfo> {
out out
} }
/// How many threads the world should use to update maps on this computer: half the logical processors, between 2 and 8.
/// Maps (continents, dungeons, battlegrounds) are updated in parallel, one thread per map, so more threads than the
/// number of maps in use bring nothing.
pub fn recommended_map_threads() -> u32 {
let cores = std::thread::available_parallelism().map(|n| n.get() as u32).unwrap_or(4);
(cores / 2).clamp(2, 8)
}
const PERFORMANCE_MARKER: &str = "performance-defaults-v1.done";
/// Once per server: switch the world to updating maps on several threads (`MapUpdate.Threads`), which the stock
/// configuration leaves at 1. A value the owner already raised is respected, and because this runs a single time
/// (a marker file in the Manager's folder for the server) a later choice to go back to 1 is never overridden.
/// Returns the new thread count when something was written.
pub fn ensure_performance_defaults(root: &Path, meta_dir: &Path) -> Result<Option<u32>> {
let marker = meta_dir.join(PERFORMANCE_MARKER);
if marker.exists() {
return Ok(None);
}
let view = load(root, Scope::Server)?;
let current = view.settings.iter().find(|s| s.meta.key == "MapUpdate.Threads");
let already = current.map(|s| s.present && s.value.as_i64().unwrap_or(1) > 1).unwrap_or(false);
let threads = recommended_map_threads();
let written = if already {
None
} else {
let changes = BTreeMap::from([("MapUpdate.Threads".to_string(), Value::from(threads))]);
save(root, meta_dir, Scope::Server, &changes)?;
Some(threads)
};
let quieted = quiet_debug_loggers(root)?;
fsx::atomic_write(&marker, b"MapUpdate.Threads and logging levels set by the Manager\n")?;
tracing::info!(?written, ?quieted, "performance defaults applied");
Ok(written)
}
/// Loggers some configurations leave at debug level: `network` writes a line for every packet sent and
/// `entities.player` one for every item check. With companions that is thousands of lines a second, each a disk write.
/// They are put back to info level (the next level up); anything else in the file is untouched.
fn quiet_debug_loggers(root: &Path) -> Result<Vec<String>> {
let mut changed = Vec::new();
for path in targets(root, Scope::Server)?.writes {
let mut conf = ConfFile::parse_bytes(&fs::read(&path)?)?;
let mut touched = false;
for key in ["Logger.network", "Logger.entities.player"] {
let Some(value) = conf.get(key).map(|v| v.trim().to_string()) else { continue };
if let Some(rest) = value.strip_prefix("5,") {
conf.set(key, &format!("4,{rest}"), &["Lowered from debug by CoA Server Manager: it wrote a line for every packet and item check"]);
touched = true;
if !changed.contains(&key.to_string()) {
changed.push(key.to_string());
}
}
}
if touched {
fsx::atomic_write(&path, conf.to_text().as_bytes())?;
}
}
Ok(changed)
}
/// Apply validated `changes`. Nothing is written unless every change is valid; previous contents are snapshotted first. /// Apply validated `changes`. Nothing is written unless every change is valid; previous contents are snapshotted first.
pub fn save(root: &Path, meta_dir: &Path, scope: Scope, changes: &BTreeMap<String, Value>) -> Result<SaveReport> { pub fn save(root: &Path, meta_dir: &Path, scope: Scope, changes: &BTreeMap<String, Value>) -> Result<SaveReport> {
let raws = validate(root, scope, changes)?; let raws = validate(root, scope, changes)?;
@@ -508,6 +569,38 @@ mod tests {
pairs.iter().map(|(k, v)| (k.to_string(), v.clone())).collect() pairs.iter().map(|(k, v)| (k.to_string(), v.clone())).collect()
} }
#[test]
fn the_world_gets_several_map_threads_once_and_an_owner_choice_is_never_overridden() {
let (_d, root, meta) = fixture();
let wanted = recommended_map_threads();
assert!((2..=8).contains(&wanted));
for p in ["Settings/worldserver.conf.template", "Core/configs/worldserver.conf"] {
let mut t = fs::read_to_string(root.join(p)).unwrap();
t.push_str("Logger.network=5,Server\r\nLogger.entities.player=5,Server\r\nLogger.module=4,Console Server\r\n");
fs::write(root.join(p), t).unwrap();
}
assert_eq!(ensure_performance_defaults(&root, &meta).unwrap(), Some(wanted));
for p in ["Settings/worldserver.conf.template", "Core/configs/worldserver.conf"] {
let t = fs::read_to_string(root.join(p)).unwrap();
assert!(t.contains(&format!("MapUpdate.Threads = {wanted}")), "{p}: {t}");
assert!(t.contains("Unknown.Custom = \"keep me\""), "other settings untouched");
assert!(t.contains("Logger.network=4,Server") && t.contains("Logger.entities.player=4,Server"), "{p}: {t}");
assert!(t.contains("Logger.module=4,Console Server"), "info level loggers are left alone");
}
// the owner goes back to one thread: it stays that way
save(&root, &meta, Scope::Server, &set(&[("MapUpdate.Threads", json!(1))])).unwrap();
assert_eq!(ensure_performance_defaults(&root, &meta).unwrap(), None);
assert!(fs::read_to_string(root.join("Core/configs/worldserver.conf")).unwrap().contains("MapUpdate.Threads = 1"));
}
#[test]
fn an_already_raised_value_is_respected_on_the_first_run() {
let (_d, root, meta) = fixture();
save(&root, &meta, Scope::Server, &set(&[("MapUpdate.Threads", json!(6))])).unwrap();
assert_eq!(ensure_performance_defaults(&root, &meta).unwrap(), None);
assert!(fs::read_to_string(root.join("Core/configs/worldserver.conf")).unwrap().contains("MapUpdate.Threads = 6"));
}
#[test] #[test]
fn missing_module_configs_are_created_from_their_dist_and_existing_ones_are_kept() { fn missing_module_configs_are_created_from_their_dist_and_existing_ones_are_kept() {
let (_d, root, _m) = fixture(); let (_d, root, _m) = fixture();
+3
View File
@@ -1,3 +1,4 @@
pub mod accounts;
pub mod backup; pub mod backup;
pub mod cleanbase; pub mod cleanbase;
pub mod companions; pub mod companions;
@@ -25,6 +26,8 @@ pub mod migrations;
pub mod net; pub mod net;
pub mod package; pub mod package;
pub mod ra; pub mod ra;
pub mod modules;
pub mod realmlist;
pub mod registry; pub mod registry;
pub mod release; pub mod release;
pub mod update; pub mod update;
+267
View File
@@ -0,0 +1,267 @@
//! Optional server modules. They are compiled into the server; what the owner decides is whether each one is on and how it is
//! configured, which lives in `Core/configs/modules/<module>.conf` (the documented defaults are in the `.dist` beside it).
//! The list of known modules is a bundled catalog, so a module is added to the Manager by adding a few lines to it.
use std::collections::BTreeMap;
use std::fs;
use std::path::{Path, PathBuf};
use serde::{Deserialize, Serialize};
use crate::config::parser::ConfFile;
use crate::error::{Error, Result};
use crate::fsx;
static CATALOG: &str = include_str!("../../../modules/catalog.json");
#[derive(Debug, Clone, Deserialize)]
pub struct Entry {
pub id: String,
pub name: String,
/// language code -> text; "en" is always there.
pub description: BTreeMap<String, String>,
pub repo: String,
/// File in `Core/configs/modules` that holds this module's settings.
pub conf: String,
/// The setting that switches the whole module on or off (1 / 0).
pub enable_key: String,
}
#[derive(Deserialize)]
struct Catalog {
modules: Vec<Entry>,
}
pub fn catalog() -> Vec<Entry> {
serde_json::from_str::<Catalog>(CATALOG).map(|c| c.modules).unwrap_or_default()
}
fn entry_in(cat: &[Entry], id: &str) -> Result<Entry> {
cat.iter().find(|e| e.id == id).cloned().ok_or_else(|| Error::Invalid("That module is not known to the Manager.".into()))
}
fn dir(root: &Path) -> PathBuf {
root.join("Core/configs/modules")
}
fn read(path: &Path) -> Option<ConfFile> {
fs::read(path).ok().and_then(|b| ConfFile::parse_bytes(&b).ok())
}
fn truthy(v: &str) -> bool {
matches!(v.trim().trim_matches('"').to_ascii_lowercase().as_str(), "1" | "true" | "yes" | "on")
}
#[derive(Debug, Serialize)]
pub struct ModuleView {
pub id: String,
pub name: String,
pub description: BTreeMap<String, String>,
pub repo: String,
/// The module's configuration is present on this server (otherwise it is not part of this server build).
pub installed: bool,
pub enabled: bool,
}
pub fn list(root: &Path) -> Vec<ModuleView> {
list_in(&catalog(), root)
}
fn list_in(cat: &[Entry], root: &Path) -> Vec<ModuleView> {
cat.iter()
.cloned()
.map(|e| {
let conf = dir(root).join(&e.conf);
let dist = dir(root).join(format!("{}.dist", e.conf));
let installed = conf.is_file() || dist.is_file();
// the active file decides; without one the documented default is what the server will use
let enabled = read(&conf).or_else(|| read(&dist)).and_then(|c| c.get(&e.enable_key).map(truthy)).unwrap_or(false);
ModuleView { id: e.id, name: e.name, description: e.description, repo: e.repo, installed, enabled }
})
.collect()
}
/// The active file, created from its `.dist` when it does not exist yet.
fn active_file(root: &Path, e: &Entry) -> Result<PathBuf> {
let conf = dir(root).join(&e.conf);
if !conf.is_file() {
let dist = dir(root).join(format!("{}.dist", e.conf));
if !dist.is_file() {
return Err(Error::Invalid("This module is not part of this server.".into()));
}
fsx::atomic_write(&conf, &fs::read(&dist)?)?;
}
Ok(conf)
}
fn backup(meta: &Path, conf: &Path) -> Result<()> {
let name = conf.file_name().map(|n| n.to_string_lossy().into_owned()).unwrap_or_default();
let to = meta.join("backups").join("modules").join(format!("{name}-{}", chrono::Utc::now().format("%Y%m%d-%H%M%S")));
fsx::atomic_write(&to, &fs::read(conf)?)
}
pub fn set_enabled(root: &Path, meta: &Path, id: &str, on: bool) -> Result<()> {
set_enabled_in(&catalog(), root, meta, id, on)
}
fn set_enabled_in(cat: &[Entry], root: &Path, meta: &Path, id: &str, on: bool) -> Result<()> {
let e = entry_in(cat, id)?;
let conf = active_file(root, &e)?;
let mut file = ConfFile::parse_bytes(&fs::read(&conf)?)?;
if file.get(&e.enable_key).map(truthy) == Some(on) {
return Ok(());
}
backup(meta, &conf)?;
file.set(&e.enable_key, if on { "1" } else { "0" }, &["Changed by CoA Server Manager"]);
fsx::atomic_write(&conf, file.to_text().as_bytes())?;
tracing::info!(module = id, on, "module switched");
Ok(())
}
#[derive(Debug, Serialize, PartialEq, Eq)]
pub struct Setting {
pub key: String,
pub value: String,
pub default: Option<String>,
/// The documentation the module ships above the setting.
pub doc: String,
}
/// Every active setting of the module with its current value, its documented default and its description.
pub fn settings(root: &Path, id: &str) -> Result<Vec<Setting>> {
settings_in(&catalog(), root, id)
}
fn settings_in(cat: &[Entry], root: &Path, id: &str) -> Result<Vec<Setting>> {
let e = entry_in(cat, id)?;
let conf = dir(root).join(&e.conf);
let dist = read(&dir(root).join(format!("{}.dist", e.conf)));
let active = read(&conf).or_else(|| dist.clone()).ok_or_else(|| Error::Invalid("This module is not part of this server.".into()))?;
Ok(active
.entries()
.map(|(k, v)| Setting {
key: k.to_string(),
value: v.to_string(),
default: dist.as_ref().and_then(|d| d.get(k)).map(str::to_string),
doc: dist.as_ref().map(|d| d.doc_for(k)).filter(|d| !d.is_empty()).unwrap_or_else(|| active.doc_for(k)).join(" "),
})
.collect())
}
/// Change values of settings the module already has. A value is one line of at most 500 characters.
pub fn save_settings(root: &Path, meta: &Path, id: &str, changes: &BTreeMap<String, String>) -> Result<Vec<String>> {
save_settings_in(&catalog(), root, meta, id, changes)
}
fn save_settings_in(cat: &[Entry], root: &Path, meta: &Path, id: &str, changes: &BTreeMap<String, String>) -> Result<Vec<String>> {
let e = entry_in(cat, id)?;
let conf = active_file(root, &e)?;
let mut file = ConfFile::parse_bytes(&fs::read(&conf)?)?;
let mut changed = Vec::new();
for (key, value) in changes {
let value = value.trim();
if file.get(key).is_none() {
return Err(Error::Invalid(format!("{key} is not a setting of this module.")));
}
if value.is_empty() || value.len() > 500 || value.chars().any(char::is_control) {
return Err(Error::Invalid(format!("The value of {key} must be one line of text.")));
}
if file.get(key).map(str::trim) != Some(value) {
changed.push((key.clone(), value.to_string()));
}
}
if changed.is_empty() {
return Ok(Vec::new());
}
backup(meta, &conf)?;
for (k, v) in &changed {
file.set(k, v, &[]);
}
fsx::atomic_write(&conf, file.to_text().as_bytes())?;
Ok(changed.into_iter().map(|(k, _)| k).collect())
}
#[cfg(test)]
mod tests {
use super::*;
fn test_catalog() -> Vec<Entry> {
let one = |id: &str, name: &str, conf: &str, key: &str| Entry {
id: id.into(),
name: name.into(),
description: ["en", "ru", "de", "fr", "es"].iter().map(|l| (l.to_string(), format!("{name} ({l})"))).collect(),
repo: format!("https://github.com/Corfirean/example/{id}"),
conf: conf.into(),
enable_key: key.into(),
};
vec![one("war-games", "War Games", "war_games.conf", "WarGames.Enable"), one("spellbook", "Spellbook", "spellbook.conf", "Spellbook.Enable")]
}
fn server(d: &Path) -> (PathBuf, PathBuf) {
let (root, meta) = (d.join("srv"), d.join("meta"));
let m = dir(&root);
fs::create_dir_all(&m).unwrap();
fs::create_dir_all(&meta).unwrap();
fs::write(m.join("war_games.conf.dist"), "# Turns War Games on.\r\n# Second line.\r\nWarGames.Enable = 1\r\n\r\n# How long a challenge stays open.\r\nWarGames.ChallengeSeconds = 60\r\n").unwrap();
(root, meta)
}
#[test]
fn the_bundled_catalog_is_valid() {
let c = catalog();
// it may be empty (modules are added to it one by one); whatever is in it must be complete
for e in &c {
assert!(e.description.contains_key("en") && e.description.len() == 5, "{} has all five descriptions", e.id);
assert!(e.repo.starts_with("https://github.com/Corfirean/") && e.conf.ends_with(".conf") && e.enable_key.ends_with(".Enable"), "{}", e.id);
}
let mut ids: Vec<_> = c.iter().map(|e| e.id.as_str()).collect();
ids.sort();
ids.dedup();
assert_eq!(ids.len(), c.len(), "ids are unique");
}
#[test]
fn a_module_is_listed_as_installed_with_its_documented_default_until_a_file_exists() {
let d = tempfile::tempdir().unwrap();
let (root, _) = server(d.path());
let wg = list_in(&test_catalog(), &root).into_iter().find(|m| m.id == "war-games").unwrap();
assert!(wg.installed && wg.enabled, "the .dist says 1");
assert!(!list_in(&test_catalog(), &root).into_iter().find(|m| m.id == "spellbook").unwrap().installed, "no configuration of that module on this server");
}
#[test]
fn switching_a_module_creates_its_file_saves_the_old_one_and_changes_only_that_line() {
let d = tempfile::tempdir().unwrap();
let (root, meta) = server(d.path());
set_enabled_in(&test_catalog(), &root, &meta, "war-games", false).unwrap();
let conf = fs::read_to_string(dir(&root).join("war_games.conf")).unwrap();
assert!(conf.contains("WarGames.Enable = 0") && conf.contains("WarGames.ChallengeSeconds = 60"), "{conf}");
assert!(!list_in(&test_catalog(), &root).into_iter().find(|m| m.id == "war-games").unwrap().enabled);
set_enabled_in(&test_catalog(), &root, &meta, "war-games", false).unwrap();
assert_eq!(fs::read_dir(meta.join("backups/modules")).unwrap().count(), 1, "no change, no backup");
set_enabled_in(&test_catalog(), &root, &meta, "war-games", true).unwrap();
assert!(fs::read_to_string(dir(&root).join("war_games.conf")).unwrap().contains("WarGames.Enable = 1"));
assert!(set_enabled_in(&test_catalog(), &root, &meta, "spellbook", true).is_err(), "not part of this server");
assert!(set_enabled_in(&test_catalog(), &root, &meta, "nonsense", true).is_err());
}
#[test]
fn settings_show_the_documentation_and_only_known_keys_with_one_line_values_can_be_saved() {
let d = tempfile::tempdir().unwrap();
let (root, meta) = server(d.path());
let s = settings_in(&test_catalog(), &root, "war-games").unwrap();
assert_eq!(s.len(), 2);
assert_eq!(s[1], Setting { key: "WarGames.ChallengeSeconds".into(), value: "60".into(), default: Some("60".into()), doc: "How long a challenge stays open.".into() });
assert_eq!(s[0].doc, "Turns War Games on. Second line.");
let ok = BTreeMap::from([("WarGames.ChallengeSeconds".to_string(), "90".to_string())]);
assert_eq!(save_settings_in(&test_catalog(), &root, &meta, "war-games", &ok).unwrap(), ["WarGames.ChallengeSeconds"]);
assert!(settings_in(&test_catalog(), &root, "war-games").unwrap()[1].value == "90");
assert!(save_settings_in(&test_catalog(), &root, &meta, "war-games", &ok).unwrap().is_empty(), "same value: nothing to do");
for bad in [("Other.Key", "1"), ("WarGames.ChallengeSeconds", ""), ("WarGames.ChallengeSeconds", "1\nInjected = 1")] {
let c = BTreeMap::from([(bad.0.to_string(), bad.1.to_string())]);
assert!(save_settings_in(&test_catalog(), &root, &meta, "war-games", &c).is_err(), "{bad:?}");
}
assert!(!fs::read_to_string(dir(&root).join("war_games.conf")).unwrap().contains("Injected"));
}
}
+32 -4
View File
@@ -53,20 +53,48 @@ pub fn fetch_manifest(source: &Source, trusted_key: &str) -> Result<(Manifest, V
/// Make every archive part available in a verified folder: a local source is used in place, a remote one is /// Make every archive part available in a verified folder: a local source is used in place, a remote one is
/// downloaded (resumable) into `download_dir`. `report(fraction 0..1, speed_text)`. /// downloaded (resumable) into `download_dir`. `report(fraction 0..1, speed_text)`.
/// 1536 -> "1.5 KB", 6.3e9 -> "5.9 GB" (binary units, as drive sizes are shown).
pub fn human_bytes(n: u64) -> String {
let units = ["B", "KB", "MB", "GB", "TB"];
let mut v = n as f64;
let mut i = 0;
while v >= 1024.0 && i < units.len() - 1 {
v /= 1024.0;
i += 1;
}
if i == 0 || v >= 100.0 { format!("{} {}", v.round() as u64, units[i]) } else { format!("{v:.1} {}", units[i]) }
}
pub fn fetch_parts(source: &Source, manifest: &Manifest, download_dir: &Path, cancel: &Cancel, report: &dyn Fn(f64, Option<String>)) -> Result<PathBuf> { pub fn fetch_parts(source: &Source, manifest: &Manifest, download_dir: &Path, cancel: &Cancel, report: &dyn Fn(f64, Option<String>)) -> Result<PathBuf> {
let archive = manifest.archive.as_ref().ok_or_else(|| Error::InvalidManifest("manifest has no archive".into()))?; let archive = manifest.archive.as_ref().ok_or_else(|| Error::InvalidManifest("manifest has no archive".into()))?;
match source { match source {
Source::Dir(d) => Ok(d.clone()), Source::Dir(d) => Ok(d.clone()),
Source::Url(base) => { Source::Url(base) => {
let total = archive.parts.len(); let all: u64 = archive.parts.iter().map(|p| p.size).sum::<u64>().max(1);
for (i, part) in archive.parts.iter().enumerate() { let mut before = 0u64;
for part in archive.parts.iter() {
let job = Job { url: format!("{}/{}", base.trim_end_matches('/'), part.name), dest: download_dir.join(&part.name), sha256: part.sha256.clone(), size: part.size }; let job = Job { url: format!("{}/{}", base.trim_end_matches('/'), part.name), dest: download_dir.join(&part.name), sha256: part.sha256.clone(), size: part.size };
download::fetch(&job, cancel, &|p: Progress| { download::fetch(&job, cancel, &|p: Progress| {
let frac = (i as f64 + p.downloaded as f64 / p.total.max(1) as f64) / total as f64; let done = before + p.downloaded.min(part.size);
report(frac, Some(format!("{:.1} MB/s", p.bytes_per_sec as f64 / 1e6))); // language-neutral so the screen can show it as it is: "3.1 GB / 5.9 GB · 40.6 MB/s"
report(done as f64 / all as f64, Some(format!("{} / {} \u{b7} {:.1} MB/s", human_bytes(done), human_bytes(all), p.bytes_per_sec as f64 / 1e6)));
})?; })?;
before += part.size;
} }
Ok(download_dir.to_path_buf()) Ok(download_dir.to_path_buf())
} }
} }
} }
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn sizes_are_shown_in_binary_units() {
assert_eq!(human_bytes(0), "0 B");
assert_eq!(human_bytes(1536), "1.5 KB");
assert_eq!(human_bytes(6 * (1 << 30)), "6.0 GB");
assert_eq!(human_bytes(150 * (1 << 20)), "150 MB");
}
}
+57
View File
@@ -138,6 +138,23 @@ impl Ra {
Ok(out.lines().last().unwrap_or("").to_string()) Ok(out.lines().last().unwrap_or("").to_string())
} }
/// Set a new password for an existing account.
pub fn set_account_password(&mut self, name: &str, password: &str) -> Result<()> {
validate_account(name, password)?;
let out = self.command(&format!("account set password {name} {password} {password}"))?;
account_reply(&out, "The password was not changed")
}
/// Access level of an account on all realms: 0 player, 1 moderator, 2 game master, 3 administrator.
pub fn set_account_access(&mut self, name: &str, level: u8) -> Result<()> {
validate_account(name, "placeholder")?;
if level > 3 {
return Err(Error::Invalid("The access level must be 0 to 3.".into()));
}
let out = self.command(&format!("account set gmlevel {name} {level} -1"))?;
account_reply(&out, "The access level was not changed")
}
/// Give `name` administrator rights on all realms (GM level 3). /// Give `name` administrator rights on all realms (GM level 3).
pub fn make_administrator(&mut self, name: &str) -> Result<()> { pub fn make_administrator(&mut self, name: &str) -> Result<()> {
validate_account(name, "placeholder")?; validate_account(name, "placeholder")?;
@@ -150,6 +167,16 @@ impl Ra {
} }
} }
/// The console reports a failed account command in words; anything else (including silence) counts as done.
fn account_reply(out: &str, what: &str) -> Result<()> {
let l = out.to_lowercase();
let failed = ["does not exist", "not exist", "not found", "do not match", "don't match", "usage", "unknown", "incorrect", "error"];
if failed.iter().any(|m| l.contains(m)) {
return Err(Error::Invalid(format!("{what}: {}", out.lines().last().unwrap_or("").trim())));
}
Ok(())
}
/// The console answers an unknown sub-command with the list of the ones it knows. /// The console answers an unknown sub-command with the list of the ones it knows.
fn is_unsupported_command(out: &str) -> bool { fn is_unsupported_command(out: &str) -> bool {
let l = out.to_lowercase(); let l = out.to_lowercase();
@@ -287,6 +314,36 @@ AC>";
assert_eq!(h.join().unwrap(), ["local", "secretra", "account create Player1 hunter22"]); assert_eq!(h.join().unwrap(), ["local", "secretra", "account create Player1 hunter22"]);
} }
#[test]
fn changes_a_password_with_the_expected_command() {
let _lock = serial();
let (port, h) = fake_ra("The password was changed");
let mut ra = Ra::connect_to(port, "u", "p").unwrap();
ra.set_account_password("Player1", "newpass9").unwrap();
drop(ra);
assert_eq!(h.join().unwrap()[2], "account set password Player1 newpass9 newpass9");
}
#[test]
fn changes_an_access_level_with_the_expected_command() {
let _lock = serial();
let (port, h) = fake_ra("You have changed security level of Player1 to 2.");
let mut ra = Ra::connect_to(port, "u", "p").unwrap();
ra.set_account_access("Player1", 2).unwrap();
assert!(ra.set_account_access("Player1", 4).is_err(), "only 0 to 3");
drop(ra);
assert_eq!(h.join().unwrap()[2], "account set gmlevel Player1 2 -1");
}
#[test]
fn a_failed_account_command_is_reported_and_bad_names_never_reach_the_console() {
let _lock = serial();
let (port, _h) = fake_ra("Account not found.");
let mut ra = Ra::connect_to(port, "u", "p").unwrap();
assert!(ra.set_account_password("x", "newpass9").is_err(), "the name is validated before anything is sent");
assert!(ra.set_account_password("Nobody", "newpass9").unwrap_err().to_string().contains("not found"));
}
#[test] #[test]
fn spawn_bots_sends_only_a_bounded_number() { fn spawn_bots_sends_only_a_bounded_number() {
let _lock = serial(); let _lock = serial();
+235
View File
@@ -0,0 +1,235 @@
//! Named realmlists for the game client ("Solo" for your own server, "PTR" for the shared one, ...). Choosing one writes its
//! text into the client's `Data/<locale>/realmlist.wtf` files; the file that was there is saved first. The profiles live
//! in the Manager's folder for the server, never in the client.
use std::fs;
use std::path::Path;
use serde::{Deserialize, Serialize};
use crate::client;
use crate::error::{Error, Result};
use crate::fsx;
const FILE: &str = "realmlists.json";
const MAX_PROFILES: usize = 24;
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
pub struct Profile {
pub id: String,
pub name: String,
/// The text of `realmlist.wtf` (normalised: `set <name> <value>` lines).
pub data: String,
}
#[derive(Debug, Default, Serialize, Deserialize)]
struct Store {
profiles: Vec<Profile>,
}
#[derive(Debug, Serialize)]
pub struct View {
pub profiles: Vec<Profile>,
/// The profile whose text every realmlist file of the client currently holds.
pub active: Option<String>,
}
fn compact(text: &str) -> String {
text.lines().map(|l| l.trim().to_ascii_lowercase()).filter(|l| !l.is_empty()).collect::<Vec<_>>().join("\n")
}
/// Accept either the whole file text or just an address ("play.example.com", "192.168.0.5:3724"), and make sure that
/// what is written into the client is nothing but `set <name> <value>` lines.
pub fn normalize(data: &str) -> Result<String> {
let bad = |m: &str| Err(Error::Invalid(m.into()));
let text = data.trim();
if text.is_empty() {
return bad("Enter the realmlist text or an address.");
}
if text.len() > 2000 {
return bad("That text is too long for a realmlist.");
}
let lines: Vec<String> = if !text.contains(char::is_whitespace) {
vec![format!("set realmlist {text}")]
} else {
text.lines().map(|l| l.trim().to_string()).filter(|l| !l.is_empty()).collect()
};
for line in &lines {
let mut parts = line.splitn(3, char::is_whitespace);
let (set, key, value) = (parts.next().unwrap_or(""), parts.next().unwrap_or(""), parts.next().unwrap_or("").trim());
if !set.eq_ignore_ascii_case("set") || key.is_empty() || value.is_empty() || !key.chars().all(|c| c.is_ascii_alphanumeric() || c == '_') {
return bad("Each line must look like: set realmlist 127.0.0.1");
}
if !value.chars().all(|c| c.is_ascii_graphic() || c == ' ') {
return bad("The realmlist may only use plain letters, digits and punctuation.");
}
if key.eq_ignore_ascii_case("realmlist") && !value.trim_matches('"').chars().all(|c| c.is_ascii_alphanumeric() || matches!(c, '.' | '-' | ':' | '_')) {
return bad("That address is not valid.");
}
}
Ok(lines.join("\r\n") + "\r\n")
}
fn slug(name: &str) -> String {
let s: String = name.to_ascii_lowercase().chars().map(|c| if c.is_ascii_alphanumeric() { c } else { '-' }).collect();
let s = s.trim_matches('-').to_string();
if s.is_empty() { "realm".into() } else { s }
}
fn load(meta: &Path, client_dir: Option<&Path>) -> Store {
let mut store: Store = fsx::read_json(&meta.join(FILE)).unwrap_or_default();
if store.profiles.is_empty() {
// First use: "Solo" for this computer, and what the client held before so that it can be switched back to.
store.profiles.push(Profile { id: "solo".into(), name: "Solo".into(), data: "set realmlist 127.0.0.1\r\n".into() });
if let Some(files) = client_dir.map(client::realmlist_files) {
if let Some(text) = files.iter().find_map(|f| fs::read_to_string(f).ok()) {
if let Ok(data) = normalize(&text) {
if compact(&data) != compact(&store.profiles[0].data) {
store.profiles.push(Profile { id: "previous".into(), name: "Previous".into(), data });
}
}
}
}
let _ = fsx::atomic_write_json(&meta.join(FILE), &store);
}
store
}
fn save_store(meta: &Path, store: &Store) -> Result<()> {
fsx::atomic_write_json(&meta.join(FILE), store)
}
pub fn view(meta: &Path, client_dir: Option<&Path>) -> View {
let store = load(meta, client_dir);
let active = client_dir.and_then(|c| {
let files = client::realmlist_files(c);
let texts: Vec<String> = files.iter().filter_map(|f| fs::read_to_string(f).ok()).map(|t| compact(&t)).collect();
let first = texts.first()?;
if texts.iter().any(|t| t != first) {
return None;
}
store.profiles.iter().find(|p| compact(&p.data) == *first).map(|p| p.id.clone())
});
View { profiles: store.profiles, active }
}
/// Add a profile (`id` None) or change one. Names are 1-32 characters and unique regardless of capitals.
pub fn save_profile(meta: &Path, client_dir: Option<&Path>, id: Option<&str>, name: &str, data: &str) -> Result<Profile> {
let name = name.trim();
if name.is_empty() || name.chars().count() > 32 || name.chars().any(char::is_control) {
return Err(Error::Invalid("The name must be 1 to 32 characters.".into()));
}
let data = normalize(data)?;
let mut store = load(meta, client_dir);
if store.profiles.iter().any(|p| p.name.eq_ignore_ascii_case(name) && Some(p.id.as_str()) != id) {
return Err(Error::Invalid("A realmlist with that name already exists.".into()));
}
let profile = match id {
Some(id) => {
let p = store.profiles.iter_mut().find(|p| p.id == id).ok_or_else(|| Error::Invalid("That realmlist does not exist.".into()))?;
p.name = name.to_string();
p.data = data;
p.clone()
}
None => {
if store.profiles.len() >= MAX_PROFILES {
return Err(Error::Invalid("There are too many realmlists; remove one first.".into()));
}
let mut new_id = slug(name);
while store.profiles.iter().any(|p| p.id == new_id) {
new_id.push('-');
}
let p = Profile { id: new_id, name: name.to_string(), data };
store.profiles.push(p.clone());
p
}
};
save_store(meta, &store)?;
Ok(profile)
}
pub fn delete_profile(meta: &Path, client_dir: Option<&Path>, id: &str) -> Result<()> {
let mut store = load(meta, client_dir);
if store.profiles.len() <= 1 {
return Err(Error::Invalid("The last realmlist cannot be removed.".into()));
}
store.profiles.retain(|p| p.id != id);
save_store(meta, &store)
}
/// Write the profile into the client; returns the files that changed (each was saved to the backup folder first).
pub fn activate(meta: &Path, client_dir: &Path, id: &str) -> Result<Vec<String>> {
let store = load(meta, Some(client_dir));
let profile = store.profiles.iter().find(|p| p.id == id).ok_or_else(|| Error::Invalid("That realmlist does not exist.".into()))?;
client::write_realmlist(client_dir, meta, &profile.data)
}
#[cfg(test)]
mod tests {
use super::*;
fn fake_client(d: &Path, host: &str) -> std::path::PathBuf {
let c = d.join("wow");
for loc in ["enUS", "ruRU"] {
fs::create_dir_all(c.join("Data").join(loc)).unwrap();
fs::write(c.join("Data").join(loc).join("realmlist.wtf"), format!("set realmlist {host}\r\nset patchlist x.example\r\n")).unwrap();
}
fs::write(c.join("Ascension.exe"), b"exe").unwrap();
c
}
#[test]
fn an_address_or_whole_lines_are_accepted_and_anything_else_is_not() {
assert_eq!(normalize("play.example.com").unwrap(), "set realmlist play.example.com\r\n");
assert_eq!(normalize("SET realmlist 192.168.0.5:3724\nset patchlist x.example\n").unwrap(), "SET realmlist 192.168.0.5:3724\r\nset patchlist x.example\r\n");
for bad in ["", " ", "rm -rf /", "set realmlist bad host;calc", "set realmlist", "x\ny", "set realmlist a\"b", &"a".repeat(2100)] {
assert!(normalize(bad).is_err(), "{bad:?}");
}
}
#[test]
fn the_first_use_offers_solo_and_what_the_client_had_and_the_active_one_is_recognised() {
let d = tempfile::tempdir().unwrap();
let (c, meta) = (fake_client(d.path(), "ptr.example.org"), d.path().join("meta"));
fs::create_dir_all(&meta).unwrap();
let v = view(&meta, Some(&c));
assert_eq!(v.profiles.iter().map(|p| p.name.as_str()).collect::<Vec<_>>(), ["Solo", "Previous"]);
assert_eq!(v.active.as_deref(), Some("previous"), "the files hold exactly what was captured");
assert!(activate(&meta, &c, "previous").unwrap().is_empty(), "already what the files hold");
assert_eq!(fs::read_to_string(c.join("Data/enUS/realmlist.wtf")).unwrap(), "set realmlist ptr.example.org\r\nset patchlist x.example\r\n");
}
#[test]
fn switching_writes_every_locale_saves_the_old_file_and_changes_nothing_else() {
let d = tempfile::tempdir().unwrap();
let (c, meta) = (fake_client(d.path(), "ptr.example.org"), d.path().join("meta"));
fs::create_dir_all(&meta).unwrap();
fs::write(c.join("WTF.txt"), b"mine").unwrap();
let ptr = save_profile(&meta, Some(&c), None, "PTR", "ptr.example.org").unwrap();
let changed = activate(&meta, &c, "solo").unwrap();
assert_eq!(changed.len(), 2);
for loc in ["enUS", "ruRU"] {
assert_eq!(fs::read_to_string(c.join("Data").join(loc).join("realmlist.wtf")).unwrap(), "set realmlist 127.0.0.1\r\n");
}
assert_eq!(view(&meta, Some(&c)).active.as_deref(), Some("solo"));
assert_eq!(fs::read_dir(meta.join("backups/client")).unwrap().count(), 2, "each replaced file was saved");
activate(&meta, &c, &ptr.id).unwrap();
assert_eq!(view(&meta, Some(&c)).active.as_deref(), Some(ptr.id.as_str()));
assert_eq!(fs::read(c.join("WTF.txt")).unwrap(), b"mine");
}
#[test]
fn names_are_unique_profiles_can_be_edited_and_the_last_one_stays() {
let d = tempfile::tempdir().unwrap();
let meta = d.path().join("meta");
fs::create_dir_all(&meta).unwrap();
let a = save_profile(&meta, None, None, "PTR", "ptr.example.org").unwrap();
assert!(save_profile(&meta, None, None, "ptr", "other.example.org").is_err(), "names are unique regardless of capitals");
let edited = save_profile(&meta, None, Some(&a.id), "PTR 2", "ptr2.example.org").unwrap();
assert_eq!((edited.id.as_str(), edited.data.as_str()), (a.id.as_str(), "set realmlist ptr2.example.org\r\n"));
assert!(save_profile(&meta, None, None, "", "x.example.org").is_err());
delete_profile(&meta, None, &a.id).unwrap();
assert!(delete_profile(&meta, None, "solo").is_err(), "one profile must remain");
assert_eq!(view(&meta, None).profiles.len(), 1);
}
}
+4
View File
@@ -0,0 +1,4 @@
{
"schema": 1,
"modules": []
}
+1 -1
View File
@@ -1,7 +1,7 @@
{ {
"name": "coa-server-manager", "name": "coa-server-manager",
"private": true, "private": true,
"version": "0.3.0", "version": "0.3.1",
"license": "AGPL-3.0-only", "license": "AGPL-3.0-only",
"type": "module", "type": "module",
"scripts": { "scripts": {
+13
View File
@@ -489,6 +489,19 @@
"max": 1000, "max": 1000,
"unit": "ms" "unit": "ms"
}, },
{
"key": "MapUpdate.Threads",
"type": "int",
"category": "performance",
"title": "CPU cores for the world",
"description": "How many processor cores the world uses to update maps. Companions spread over several maps run much faster with more than one. Takes effect when the world server restarts.",
"default": 4,
"advanced": false,
"restartRequired": "world",
"dangerous": false,
"min": 1,
"max": 16
},
{ {
"key": "MinWorldUpdateTime", "key": "MinWorldUpdateTime",
"type": "int", "type": "int",
+205 -5
View File
@@ -199,6 +199,9 @@ async fn start_server(state: State<'_, AppState>, id: String) -> std::result::Re
} }
let dir = meta_dir(&root)?; let dir = meta_dir(&root)?;
coa_core::friends::ensure_bind(&root, &dir)?; coa_core::friends::ensure_bind(&root, &dir)?;
if meta.kind == coa_core::registry::InstallKind::New {
coa_core::config::ensure_performance_defaults(&root, &dir)?;
}
Ok::<(), Error>(()) Ok::<(), Error>(())
}) })
.await; .await;
@@ -382,9 +385,30 @@ async fn restore_backup_database(state: State<'_, AppState>, id: String, backup_
} }
#[tauri::command] #[tauri::command]
fn install_preflight(state: State<'_, AppState>, dest: String) -> Preflight { fn install_preflight(state: State<'_, AppState>, dest: String, needed: Option<u64>) -> Preflight {
// The real size is checked again once the signed manifest is known; assume a typical install here. // `needed` is the real size from the signed package list when the screen already has it; the real size is checked
install::preflight(std::path::Path::new(&dest), 6 * 1024 * 1024 * 1024, &state.registry) // again at install time either way.
install::preflight(std::path::Path::new(&dest), needed.unwrap_or(6 * 1024 * 1024 * 1024), &state.registry)
}
#[derive(Serialize)]
struct InstallRequirements {
/// What is downloaded.
download_bytes: u64,
/// What the unpacked server takes on the drive (the downloaded parts are removed afterwards).
unpacked_bytes: u64,
version: String,
}
/// How big the server is, read from the package's signed list before anything is downloaded.
#[tauri::command]
async fn install_requirements(package: Option<String>) -> std::result::Result<InstallRequirements, UiError> {
blocking(move || {
let (m, _) = coa_core::pkgsource::fetch_manifest(&package_source(package), coa_core::signing::EMBEDDED_PUBLIC_KEY)?;
let archive = m.archive.ok_or_else(|| Error::InvalidManifest("no archive".into()))?;
Ok(InstallRequirements { download_bytes: archive.parts.iter().map(|p| p.size).sum(), unpacked_bytes: archive.unpacked_size, version: m.version })
})
.await
} }
#[tauri::command] #[tauri::command]
@@ -435,6 +459,120 @@ async fn create_account(state: State<'_, AppState>, id: String, username: String
.await .await
} }
#[tauri::command]
async fn realmlist_profiles(state: State<'_, AppState>, id: String) -> std::result::Result<coa_core::realmlist::View, UiError> {
let root = path_of(&state, &id)?;
blocking(move || {
let (dir, _) = install_meta(&root)?;
Ok(coa_core::realmlist::view(&dir, linked_client(&root)?.as_deref()))
})
.await
}
#[tauri::command]
async fn realmlist_save(state: State<'_, AppState>, id: String, profile_id: Option<String>, name: String, data: String) -> std::result::Result<coa_core::realmlist::Profile, UiError> {
let root = path_of(&state, &id)?;
blocking(move || {
let (dir, _) = install_meta(&root)?;
coa_core::realmlist::save_profile(&dir, linked_client(&root)?.as_deref(), profile_id.as_deref(), &name, &data)
})
.await
}
#[tauri::command]
async fn realmlist_delete(state: State<'_, AppState>, id: String, profile_id: String) -> std::result::Result<(), UiError> {
let root = path_of(&state, &id)?;
blocking(move || {
let (dir, _) = install_meta(&root)?;
coa_core::realmlist::delete_profile(&dir, linked_client(&root)?.as_deref(), &profile_id)
})
.await
}
/// Write the chosen realmlist into the linked game client.
#[tauri::command]
async fn realmlist_activate(state: State<'_, AppState>, id: String, profile_id: String) -> std::result::Result<Vec<String>, UiError> {
let root = path_of(&state, &id)?;
blocking(move || {
let (dir, _) = install_meta(&root)?;
let client = linked_client(&root)?.ok_or_else(|| Error::Invalid("No game client is set up for this server yet.".into()))?;
let changed = coa_core::realmlist::activate(&dir, &client, &profile_id)?;
tracing::info!(profile = %profile_id, files = changed.len(), "realmlist switched");
Ok(changed)
})
.await
}
#[tauri::command]
async fn modules_list(state: State<'_, AppState>, id: String) -> std::result::Result<Vec<coa_core::modules::ModuleView>, UiError> {
let root = path_of(&state, &id)?;
blocking(move || Ok(coa_core::modules::list(&root))).await
}
#[tauri::command]
async fn module_set_enabled(state: State<'_, AppState>, id: String, module: String, enabled: bool) -> std::result::Result<(), UiError> {
let root = path_of(&state, &id)?;
blocking(move || {
let (dir, _) = install_meta(&root)?;
coa_core::modules::set_enabled(&root, &dir, &module, enabled)
})
.await
}
#[tauri::command]
async fn module_settings(state: State<'_, AppState>, id: String, module: String) -> std::result::Result<Vec<coa_core::modules::Setting>, UiError> {
let root = path_of(&state, &id)?;
blocking(move || coa_core::modules::settings(&root, &module)).await
}
#[tauri::command]
async fn module_save_settings(state: State<'_, AppState>, id: String, module: String, changes: BTreeMap<String, String>) -> std::result::Result<Vec<String>, UiError> {
let root = path_of(&state, &id)?;
blocking(move || {
let (dir, _) = install_meta(&root)?;
coa_core::modules::save_settings(&root, &dir, &module, &changes)
})
.await
}
#[tauri::command]
async fn list_accounts(state: State<'_, AppState>, id: String) -> std::result::Result<Vec<coa_core::accounts::AccountInfo>, UiError> {
let root = path_of(&state, &id)?;
blocking(move || coa_core::accounts::list(&root)).await
}
#[tauri::command]
async fn account_set_password(state: State<'_, AppState>, id: String, name: String, password: String) -> std::result::Result<(), UiError> {
let root = path_of(&state, &id)?;
blocking(move || {
Ra::connect(&root)?.set_account_password(&name, &password)?;
tracing::info!(%name, "account password changed");
Ok(())
})
.await
}
#[tauri::command]
async fn account_set_access(state: State<'_, AppState>, id: String, name: String, level: u8) -> std::result::Result<(), UiError> {
let root = path_of(&state, &id)?;
blocking(move || {
Ra::connect(&root)?.set_account_access(&name, level)?;
tracing::info!(%name, level, "account access level changed");
Ok(())
})
.await
}
#[tauri::command]
async fn account_rename(state: State<'_, AppState>, id: String, name: String, new_name: String, password: String) -> std::result::Result<(), UiError> {
let root = path_of(&state, &id)?;
blocking(move || {
let mut ra = Ra::connect(&root)?;
coa_core::accounts::rename(&root, &mut ra, &name, &new_name, &password)
})
.await
}
fn install_meta(root: &std::path::Path) -> Result<(PathBuf, InstallMeta)> { fn install_meta(root: &std::path::Path) -> Result<(PathBuf, InstallMeta)> {
let dir = meta_dir(root)?; let dir = meta_dir(root)?;
let (_, meta) = MetaDir::open(&dir)?; let (_, meta) = MetaDir::open(&dir)?;
@@ -945,8 +1083,13 @@ struct FriendsStatus {
/// Manager to launch an arbitrary address. /// Manager to launch an arbitrary address.
#[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/"]; const ALLOWED: &[&str] = &["https://tailscale.com/", "https://login.tailscale.com/", "https://portforward.com/", "https://github.com/Corfirean/"];
if !ALLOWED.iter().any(|p| url.starts_with(p)) || !url.chars().all(|c| c.is_ascii_alphanumeric() || "/:._-?=#%".contains(c)) { // A prefilled "new issue" page of this project: the 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 = url == NEW_ISSUE || url.starts_with(&format!("{NEW_ISSUE}?"));
let chars_ok = url.chars().all(|c| c.is_ascii_alphanumeric() || "/:._-?=#%".contains(c) || (issue && c == '&'));
if !(issue || ALLOWED.iter().any(|p| url.starts_with(p))) || !chars_ok || url.len() > 12_000 {
return Err(Error::Invalid("That link is not allowed.".into()).into()); return Err(Error::Invalid("That link is not allowed.".into()).into());
} }
// explorer.exe opens the address in the default browser without going through a shell. // explorer.exe opens the address in the default browser without going through a shell.
@@ -954,6 +1097,49 @@ fn open_link(url: String) -> std::result::Result<(), UiError> {
Ok(()) Ok(())
} }
#[derive(Serialize)]
struct ReportContext {
manager_version: String,
windows: String,
/// "new" for a server the Manager installed, "imported" for one that was added.
install_kind: String,
server_version: Option<String>,
}
/// "Windows 11 (build 26200)" from `ver`; empty if it cannot be read.
fn windows_version() -> String {
let mut cmd = std::process::Command::new("cmd.exe");
cmd.args(["/C", "ver"]);
#[cfg(windows)]
{
use std::os::windows::process::CommandExt;
cmd.creation_flags(0x0800_0000);
}
let out = cmd.output().map(|o| String::from_utf8_lossy(&o.stdout).into_owned()).unwrap_or_default();
let build: Option<u32> = out.split("Version").nth(1).and_then(|v| v.trim().trim_end_matches(']').split('.').nth(2)).and_then(|b| b.trim().parse().ok());
match build {
Some(b) if b >= 22000 => format!("Windows 11 (build {b})"),
Some(b) => format!("Windows 10 (build {b})"),
None => String::new(),
}
}
/// What the problem report fills in on its own. Nothing here identifies the person or the machine.
#[tauri::command]
async fn report_context(state: State<'_, AppState>, id: String) -> std::result::Result<ReportContext, UiError> {
let root = path_of(&state, &id)?;
blocking(move || {
let (_, meta) = install_meta(&root)?;
Ok(ReportContext {
manager_version: coa_core::MANAGER_VERSION.to_string(),
windows: windows_version(),
install_kind: if meta.kind == coa_core::registry::InstallKind::New { "new".into() } else { "imported".into() },
server_version: meta.core.version.clone(),
})
})
.await
}
#[tauri::command] #[tauri::command]
async fn friends_status(state: State<'_, AppState>, id: String) -> std::result::Result<FriendsStatus, UiError> { async fn friends_status(state: State<'_, AppState>, id: String) -> std::result::Result<FriendsStatus, UiError> {
let root = path_of(&state, &id)?; let root = path_of(&state, &id)?;
@@ -1170,6 +1356,20 @@ pub fn run() {
restore_backup_configs, restore_backup_configs,
restore_backup_database, restore_backup_database,
install_preflight, install_preflight,
install_requirements,
report_context,
list_accounts,
realmlist_profiles,
realmlist_save,
realmlist_delete,
realmlist_activate,
modules_list,
module_set_enabled,
module_settings,
module_save_settings,
account_set_password,
account_set_access,
account_rename,
install_new, install_new,
cancel_install, cancel_install,
create_account, create_account,
+1 -1
View File
@@ -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.3.0", "version": "0.3.1",
"identifier": "com.coa.servermanager", "identifier": "com.coa.servermanager",
"build": { "build": {
"beforeDevCommand": "npm run dev", "beforeDevCommand": "npm run dev",
+1 -1
View File
@@ -3,7 +3,7 @@ import * as React from "react";
import { cn } from "@/lib/utils"; import { cn } from "@/lib/utils";
const buttonVariants = cva( const buttonVariants = cva(
"inline-flex items-center justify-center gap-2 rounded-md font-medium transition-colors disabled:pointer-events-none disabled:opacity-45 cursor-pointer", "inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md font-medium transition-colors disabled:pointer-events-none disabled:opacity-45 cursor-pointer",
{ {
variants: { variants: {
variant: { variant: {
+31
View File
@@ -0,0 +1,31 @@
import * as React from "react";
import { Eye, EyeOff } from "lucide-react";
import { cn } from "@/lib/utils";
import { useT } from "@/i18n";
/**
* A password field with its own show/hide button. The browser's built-in one only exists while the field is focused and
* comes back only after the field is emptied, so people could not look at a password they had already typed.
*/
export const PasswordInput = React.forwardRef<HTMLInputElement, Omit<React.InputHTMLAttributes<HTMLInputElement>, "type">>(
({ className, ...props }, ref) => {
const t = useT();
const [shown, setShown] = React.useState(false);
return (
<div className="relative block w-fit">
<input ref={ref} type={shown ? "text" : "password"} className={cn(className, "pr-11 [&::-ms-reveal]:hidden")} {...props} />
<button
type="button"
onClick={() => setShown((v) => !v)}
aria-label={shown ? t("pw.hide") : t("pw.show")}
aria-pressed={shown}
title={shown ? t("pw.hide") : t("pw.show")}
className="absolute inset-y-0 right-0 flex w-10 cursor-pointer items-center justify-center text-muted hover:text-ink"
>
{shown ? <EyeOff className="h-4 w-4" aria-hidden /> : <Eye className="h-4 w-4" aria-hidden />}
</button>
</div>
);
},
);
PasswordInput.displayName = "PasswordInput";
+18 -1
View File
@@ -32,7 +32,7 @@ export {};
if(cmd==="companion_sizes") return {hardware:{cores:16,ram_gb:31,free_ram_gb:12},sizes:[{id:"small",title:"Small",bots:50,warning:null},{id:"medium",title:"Medium",bots:250,warning:null},{id:"large",title:"Large",bots:500,warning:"500 companions may need more CPU and memory than this computer has (8 cores, 16 GB)."}]}; if(cmd==="companion_sizes") return {hardware:{cores:16,ram_gb:31,free_ram_gb:12},sizes:[{id:"small",title:"Small",bots:50,warning:null},{id:"medium",title:"Medium",bots:250,warning:null},{id:"large",title:"Large",bots:500,warning:"500 companions may need more CPU and memory than this computer has (8 cores, 16 GB)."}]};
if(cmd==="add_companions"){const base=(window as any).__bots??85;(window as any).__target=base+args.count;return {spawned:"queued",created:null,baseline:base};} if(cmd==="add_companions"){const base=(window as any).__bots??85;(window as any).__target=base+args.count;return {spawned:"queued",created:null,baseline:base};}
if(cmd==="check_update") return {from_version:(window as any).__updated?"0.261001.8":"0.260930.5",to_version:"0.261001.8",items:[],conflicts:[],migrations:5,download_bytes:6000000}; if(cmd==="check_update") return {from_version:(window as any).__updated?"0.261001.8":"0.260930.5",to_version:"0.261001.8",items:[],conflicts:[],migrations:5,download_bytes:6000000};
if(cmd==="apply_update"){await new Promise((r: any)=>setTimeout(r,1500));(window as any).__updated=true;return {txn:{state:"committed",to_version:"0.261001.8"},migrations:null};} if(cmd==="apply_update"){const w=window as any;for(let i=1;i<=8;i++){await new Promise((r: any)=>setTimeout(r,700));(w.__handlers?.["update-progress"]??[]).forEach((h: any)=>h({event:"update-progress",id:1,payload:{step:i<4?"Downloading the update":i<7?"Applying the update":"Finishing",percent:i*12}}));}(window as any).__updated=true;return {txn:{state:"committed",to_version:"0.261001.8"},migrations:null};}
if(cmd==="get_population"){if(!running) return null;let b=(window as any).__bots??85;const t=(window as any).__target??0;if(t>b){b=Math.min(t,b+25);(window as any).__bots=b;}return {online_total:b,bots_online:Math.max(0,b-7),players_online:0,bots_total:b};} if(cmd==="get_population"){if(!running) return null;let b=(window as any).__bots??85;const t=(window as any).__target??0;if(t>b){b=Math.min(t,b+25);(window as any).__bots=b;}return {online_total:b,bots_online:Math.max(0,b-7),players_online:0,bots_total:b};}
if(cmd==="get_performance") return running?{mean_ms:14,median_ms:15,p95_ms:24,p99_ms:30,max_ms:61,ticks_per_sec:71.4}:null; if(cmd==="get_performance") return running?{mean_ms:14,median_ms:15,p95_ms:24,p99_ms:30,max_ms:61,ticks_per_sec:71.4}:null;
if(cmd==="run_diagnostics") return {problems:2,checks:[{id:"files",title:"Server files",level:"ok",detail:"All expected server parts were found."},{id:"world",title:"World server",level:"warn",detail:"Not running."},{id:"disk",title:"Free disk space",level:"warn",detail:"Only 3 GB free; backups and updates need room."},{id:"exposure",title:"Private services",level:"ok",detail:"Database and server console are not reachable from the network."}]}; if(cmd==="run_diagnostics") return {problems:2,checks:[{id:"files",title:"Server files",level:"ok",detail:"All expected server parts were found."},{id:"world",title:"World server",level:"warn",detail:"Not running."},{id:"disk",title:"Free disk space",level:"warn",detail:"Only 3 GB free; backups and updates need room."},{id:"exposure",title:"Private services",level:"ok",detail:"Database and server console are not reachable from the network."}]};
@@ -49,6 +49,23 @@ export {};
if(cmd==="client_download"){await run("scan",4,0);await run("download",40,41e6);w.__client="new";return {path:args.parent+"\\CoA Client",executable:"Ascension.exe",realmlists:[{path:"x",host:"127.0.0.1"}],addon:{installed:true,version:"1",up_to_date:true},other_addons:0};} if(cmd==="client_download"){await run("scan",4,0);await run("download",40,41e6);w.__client="new";return {path:args.parent+"\\CoA Client",executable:"Ascension.exe",realmlists:[{path:"x",host:"127.0.0.1"}],addon:{installed:true,version:"1",up_to_date:true},other_addons:0};}
if(cmd==="client_cancel"){w.__stop=true;return null;} if(cmd==="client_cancel"){w.__stop=true;return null;}
} }
if(cmd==="realmlist_profiles"){const w=window as any;w.__rl=w.__rl??{profiles:[{id:"solo",name:"Solo",data:"set realmlist 127.0.0.1\r\n"},{id:"ptr",name:"PTR",data:"set realmlist ptr.example.org\r\n"}],active:"solo"};return w.__rl;}
if(cmd==="realmlist_activate"){(window as any).__rl.active=args.profileId;return [];}
if(cmd==="realmlist_save"){const w=window as any;const rl=w.__rl;if(args.profileId){const p=rl.profiles.find((x: any)=>x.id===args.profileId);p.name=args.name;p.data=args.data;return p;}if(rl.profiles.some((x: any)=>x.name.toLowerCase()===String(args.name).toLowerCase()))throw {human:{code:"unknown",title:"",message:"",actions:[]},technical:"A realmlist with that name already exists."};const p={id:String(args.name).toLowerCase().replace(/[^a-z0-9]+/g,"-"),name:args.name,data:(/\s/.test(args.data.trim())?args.data.trim():"set realmlist "+args.data.trim())+"\r\n"};rl.profiles.push(p);return p;}
if(cmd==="realmlist_delete"){const rl=(window as any).__rl;rl.profiles=rl.profiles.filter((x: any)=>x.id!==args.profileId);return null;}
if(cmd==="modules_list") return [];
if(cmd==="module_set_enabled"){const m=(window as any).__mods.find((x: any)=>x.id===args.module);m.enabled=args.enabled;return null;}
if(cmd==="module_settings") return [{key:"WarGames.Enable",value:"1",default:"1",doc:"Turns War Games on."},{key:"WarGames.ChallengeSeconds",value:"60",default:"60",doc:"How long a challenge stays open."}];
if(cmd==="module_save_settings") 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==="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==="install_preflight") return {ok:true,problems:[],free_bytes:210*2**30};
if(cmd==="install_requirements") return {download_bytes:Math.round(5.9*2**30),unpacked_bytes:Math.round(11.4*2**30),version:"0.2.0"};
if(cmd==="list_accounts"){const w=window as any;w.__acc=w.__acc??[{id:2,name:"ALICE",access:3,online:true,last_login:"2026-10-01 12:04:11",characters:4},{id:5,name:"BOB",access:0,online:false,last_login:null,characters:0},{id:6,name:"CAROL",access:2,online:false,last_login:"2026-09-30 21:40:02",characters:2}];return w.__acc;}
if(cmd==="account_set_access"){const a=(window as any).__acc.find((x: any)=>x.name===args.name);if(a)a.access=args.level;return null;}
if(cmd==="account_set_password") return null;
if(cmd==="account_rename"){const a=(window as any).__acc.find((x: any)=>x.name===args.name);if(a)a.name=String(args.newName).toUpperCase();return null;}
if(cmd==="client_info"){const c=(window as any).__client??"none";return c==="none"?null:{path:"C:\\games\\CoA Client",executable:"Ascension.exe",realmlists:[{path:"x",host:"127.0.0.1"}],addon:{installed:true,version:"1",up_to_date:true},other_addons:2};} if(cmd==="client_info"){const c=(window as any).__client??"none";return c==="none"?null:{path:"C:\\games\\CoA Client",executable:"Ascension.exe",realmlists:[{path:"x",host:"127.0.0.1"}],addon:{installed:true,version:"1",up_to_date:true},other_addons:2};}
if(cmd==="set_client"){(window as any).__client="foreign";return {path:args.path,executable:"Ascension.exe",realmlists:[],addon:{installed:false,version:null,up_to_date:null},other_addons:0};} if(cmd==="set_client"){(window as any).__client="foreign";return {path:args.path,executable:"Ascension.exe",realmlists:[],addon:{installed:false,version:null,up_to_date:null},other_addons:0};}
if(cmd==="plugin:event|listen"){const w=window as any;(w.__handlers??={})[args.event]=[...(w.__handlers[args.event]??[]),args.handler];return 1;} if(cmd==="plugin:event|listen"){const w=window as any;(w.__handlers??={})[args.event]=[...(w.__handlers[args.event]??[]),args.handler];return 1;}
+97
View File
@@ -627,6 +627,103 @@ const de: Partial<Record<keyof typeof en, string>> = {
"client.versionUntracked": "vom Manager nicht verfolgt", "client.versionUntracked": "vom Manager nicht verfolgt",
"client.versionUnfinished": "Download nicht abgeschlossen", "client.versionUnfinished": "Download nicht abgeschlossen",
"client.downloadInstead": "Client herunterladen …", "client.downloadInstead": "Client herunterladen …",
// Accounts panel, password toggle, install size, addon explanation
"pw.show": "Passwort anzeigen",
"pw.hide": "Passwort verbergen",
"install.size": "Der Server belegt etwa {size} auf dem Laufwerk. Der Download ist {download} groß; während der Installation werden etwa {peak} benötigt.",
"client.addonWhat": "Ein Panel im Spiel (über eine Minimap-Schaltfläche) zur Steuerung deiner Begleiter: Gruppe auffüllen, Rollen und Formationen festlegen, Befehle wie Angriff, Pull oder Position halten geben und ihre Ausrüstung und Aufgaben ansehen. Ohne ihn funktioniert das Spiel; die Begleiter folgen dann nur ihrer eigenen KI.",
"acc.title": "Konten",
"acc.text": "Alle, die sich auf diesem Server anmelden können. Für Änderungen an Passwort und Zugriff muss der Server laufen.",
"acc.refresh": "Liste aktualisieren",
"acc.unavailable": "Die Liste ist gerade nicht verfügbar. Starte den Server und versuche es erneut.",
"acc.empty": "Noch keine Konten. Erstelle oben das erste.",
"acc.col.name": "Konto",
"acc.col.chars": "Charaktere",
"acc.col.access": "Zugriff",
"acc.col.last": "Letzte Anmeldung",
"acc.online": "online",
"acc.never": "nie",
"acc.level.0": "Spieler",
"acc.level.1": "Moderator",
"acc.level.2": "Spielleiter",
"acc.level.3": "Administrator",
"acc.changePassword": "Passwort ändern",
"acc.rename": "Umbenennen",
"acc.needsRunning": "Starte den Server, um Konten zu ändern.",
"acc.changeFor": "Neues Passwort für {name}",
"acc.renameFor": "{name} umbenennen",
"acc.newName": "Neuer Kontoname",
"acc.newPassword": "Neues Passwort",
"acc.nameRule": "3–17 Buchstaben oder Ziffern.",
"acc.passRule": "6–16 Zeichen, keine Leerzeichen oder Anführungszeichen.",
"acc.renameNote": "Ein neues Passwort ist nötig, weil das Anmeldepasswort vom Kontonamen abhängt. Der Spieler meldet sich mit dem neuen Namen und diesem Passwort an. Das Konto darf nicht angemeldet sein.",
"acc.save": "Speichern",
"acc.passwordChanged": "Das Passwort von {name} wurde geändert.",
"acc.renamed": "{name} heißt jetzt {new}.",
"acc.accessChanged": "{name} ist jetzt: {level}.",
// Problem report (GitHub issue)
"nav.report": "Problem melden",
"q.report": "Etwas funktioniert nicht?",
"rep.title": "Problem melden",
"rep.intro": "Beschreibe, was schiefgelaufen ist. Der Manager bereitet daraus einen Fehlerbericht für GitHub vor und öffnet ihn im Browser; dort prüfst du ihn, fügst Screenshots hinzu und sendest ihn ab. Du brauchst ein kostenloses GitHub-Konto. Aus diesem Fenster wird nichts gesendet.",
"rep.autoTitle": "Wird automatisch ausgefüllt",
"rep.manager": "Manager-Version",
"rep.windows": "Windows-Version",
"rep.kind": "Server",
"rep.kindNew": "Neu installiert",
"rep.kindImported": "Importierter Server",
"rep.server": "Server-Version",
"rep.summary": "Kurze Zusammenfassung",
"rep.summaryHint": "Zum Beispiel: Ladebildschirm hängt nach dem Erstellen eines Charakters",
"rep.what": "Was ist passiert?",
"rep.whatHint": "Beschreibe das Problem.",
"rep.expected": "Was hast du erwartet?",
"rep.expectedHint": "Beschreibe das erwartete Verhalten.",
"rep.steps": "Schritte zum Nachstellen",
"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.makeFile": "Diagnosedatei erstellen",
"rep.fileSaved": "Gespeichert unter {path}. 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.open": "Bericht auf GitHub öffnen",
"rep.copy": "Text kopieren",
"rep.preview": "Text ansehen",
"rep.needFields": "Fülle zuerst die Zusammenfassung und „Was ist passiert?“ aus.",
"rep.githubNote": "Der Bericht ist auf Englisch gehalten, damit die Entwickler ihn lesen können; deine eigenen Worte bleiben so, wie du sie geschrieben hast.",
"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.copied": "In die Zwischenablage kopiert.",
// Realmlist switcher and modules page
"realm.label": "Realm",
"realm.other": "Anderer",
"realm.add": "Realmlist hinzufügen …",
"realm.addTitle": "Neue Realmlist",
"realm.editTitle": "Realmlist ändern",
"realm.name": "Name",
"realm.nameHint": "Zum Beispiel Solo oder PTR",
"realm.data": "Realmlist-Text",
"realm.dataHint": "Was in die realmlist.wtf geschrieben wird, zum Beispiel: set realmlist play.example.com. Du kannst auch nur die Adresse eingeben. Beim Auswählen wird die Realmlist in deinen Spielclient geschrieben; die vorherige Datei wird zuvor gesichert.",
"realm.switched": "Das Spiel verwendet jetzt „{name}“.",
"realm.edit": "{name} ändern",
"realm.delete": "{name} entfernen",
"realm.confirmDelete": "Realmlist „{name}“ entfernen? Der Spielclient behält die aktuelle Datei.",
"nav.modules": "Module",
"q.modules": "Welche Zusatzfunktionen hat der Server?",
"mod.title": "Module",
"mod.intro": "Zusatzfunktionen, die bereits im Server eingebaut sind. Schalte die gewünschten ein oder aus, lies auf GitHub darüber oder ändere ihre Einstellungen.",
"mod.restart": "Änderungen werden nach einem Neustart des Weltservers wirksam.",
"mod.switch": "{name} ein- oder ausschalten",
"mod.notHere": "Nicht Teil dieses Servers",
"mod.github": "GitHub",
"mod.settings": "Einstellungen",
"mod.default": "Zurück zum Standard ({v})",
"mod.saved": "Gespeichert ({n} geändert).",
// Modules page: nothing yet
"mod.empty": "Hier ist noch nichts. Optionale Module erscheinen auf dieser Seite, sobald sie hinzugefügt werden.",
}; };
export default de; export default de;
+97
View File
@@ -627,6 +627,103 @@ const en = {
"client.versionUntracked": "not tracked by the Manager", "client.versionUntracked": "not tracked by the Manager",
"client.versionUnfinished": "download not finished", "client.versionUnfinished": "download not finished",
"client.downloadInstead": "Download a client…", "client.downloadInstead": "Download a client…",
// Accounts panel, password toggle, install size, addon explanation
"pw.show": "Show password",
"pw.hide": "Hide password",
"install.size": "The server will take about {size} on the drive. The download is {download}; while it installs about {peak} is needed.",
"client.addonWhat": "A panel inside the game (opened from a minimap button) for commanding your companions: fill your group, set roles and formations, give orders such as attack, pull or hold, and see their gear and tasks. The game works without it; companions then simply follow their own AI.",
"acc.title": "Accounts",
"acc.text": "Everyone who can log in to this server. Password and access changes need the server to be running.",
"acc.refresh": "Refresh the list",
"acc.unavailable": "The list is not available right now. Start the server and try again.",
"acc.empty": "No accounts yet. Create the first one above.",
"acc.col.name": "Account",
"acc.col.chars": "Characters",
"acc.col.access": "Access",
"acc.col.last": "Last login",
"acc.online": "online",
"acc.never": "never",
"acc.level.0": "Player",
"acc.level.1": "Moderator",
"acc.level.2": "Game master",
"acc.level.3": "Administrator",
"acc.changePassword": "Change password",
"acc.rename": "Rename",
"acc.needsRunning": "Start the server to change accounts.",
"acc.changeFor": "New password for {name}",
"acc.renameFor": "Rename {name}",
"acc.newName": "New account name",
"acc.newPassword": "New password",
"acc.nameRule": "3–17 letters or digits.",
"acc.passRule": "6–16 characters, no spaces or quotes.",
"acc.renameNote": "A new password is needed because the login password depends on the account name. The player logs in with the new name and this password. The account must not be logged in.",
"acc.save": "Save",
"acc.passwordChanged": "The password of {name} was changed.",
"acc.renamed": "{name} is now called {new}.",
"acc.accessChanged": "{name} is now: {level}.",
// Problem report (GitHub issue)
"nav.report": "Report a problem",
"q.report": "Something not working?",
"rep.title": "Report a problem",
"rep.intro": "Describe what went wrong. The Manager prepares a bug report for GitHub from this and opens it in your browser; you read it, add screenshots and press Submit there. You need a free GitHub account. Nothing is sent from this window.",
"rep.autoTitle": "Filled in automatically",
"rep.manager": "Manager version",
"rep.windows": "Windows version",
"rep.kind": "Server",
"rep.kindNew": "Fresh install",
"rep.kindImported": "Imported server",
"rep.server": "Server version",
"rep.summary": "Short summary",
"rep.summaryHint": "For example: stuck on the loading screen after creating a character",
"rep.what": "What happened?",
"rep.whatHint": "Describe the problem.",
"rep.expected": "What did you expect to happen?",
"rep.expectedHint": "Describe the expected behaviour.",
"rep.steps": "Steps to reproduce",
"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.makeFile": "Create the diagnostics file",
"rep.fileSaved": "Saved to {path}. Drag this file into the GitHub issue.",
"rep.privacy": "Please remove passwords, tokens, private IP information or other sensitive data before posting logs.",
"rep.open": "Open the report on GitHub",
"rep.copy": "Copy the text",
"rep.preview": "Preview the text",
"rep.needFields": "Fill in the summary and what happened first.",
"rep.githubNote": "The report is written in English so the developers can read it; your own words stay as you typed them.",
"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.copied": "Copied to the clipboard.",
// Realmlist switcher and modules page
"realm.label": "Realm",
"realm.other": "Other",
"realm.add": "Add a realmlist…",
"realm.addTitle": "New realmlist",
"realm.editTitle": "Change the realmlist",
"realm.name": "Name",
"realm.nameHint": "For example Solo or PTR",
"realm.data": "Realmlist text",
"realm.dataHint": "What goes into realmlist.wtf, for example: set realmlist play.example.com. You can also type just the address. Choosing a realmlist writes it into your game client; the previous file is saved first.",
"realm.switched": "The game now uses “{name}”.",
"realm.edit": "Change {name}",
"realm.delete": "Remove {name}",
"realm.confirmDelete": "Remove the realmlist “{name}”? The game client keeps whatever file it has now.",
"nav.modules": "Modules",
"q.modules": "What extra features does the server have?",
"mod.title": "Modules",
"mod.intro": "Extra features that are already built into the server. Switch the ones you want on or off, read about them on GitHub, or change their settings.",
"mod.restart": "Changes apply after the world server restarts.",
"mod.switch": "Turn {name} on or off",
"mod.notHere": "Not part of this server",
"mod.github": "GitHub",
"mod.settings": "Settings",
"mod.default": "Back to the default ({v})",
"mod.saved": "Saved ({n} changed).",
// Modules page: nothing yet
"mod.empty": "There is nothing here yet. Optional modules will appear on this page as they are added.",
} as const; } as const;
export default en; export default en;
+97
View File
@@ -627,6 +627,103 @@ const es: Partial<Record<keyof typeof en, string>> = {
"client.versionUntracked": "el Manager no la sigue", "client.versionUntracked": "el Manager no la sigue",
"client.versionUnfinished": "descarga sin terminar", "client.versionUnfinished": "descarga sin terminar",
"client.downloadInstead": "Descargar un cliente…", "client.downloadInstead": "Descargar un cliente…",
// Accounts panel, password toggle, install size, addon explanation
"pw.show": "Mostrar contraseña",
"pw.hide": "Ocultar contraseña",
"install.size": "El servidor ocupará unos {size} en la unidad. La descarga es de {download}; durante la instalación se necesitan unos {peak}.",
"client.addonWhat": "Un panel dentro del juego (se abre desde un botón del minimapa) para dirigir a tus compañeros: completar el grupo, definir roles y formaciones, dar órdenes como atacar, iniciar combate o mantener posición, y ver su equipo y tareas. El juego funciona sin él; los compañeros simplemente siguen su propia IA.",
"acc.title": "Cuentas",
"acc.text": "Todas las personas que pueden entrar en este servidor. Para cambiar contraseñas y accesos el servidor debe estar en marcha.",
"acc.refresh": "Actualizar la lista",
"acc.unavailable": "La lista no está disponible ahora. Inicia el servidor e inténtalo de nuevo.",
"acc.empty": "Aún no hay cuentas. Crea la primera arriba.",
"acc.col.name": "Cuenta",
"acc.col.chars": "Personajes",
"acc.col.access": "Acceso",
"acc.col.last": "Último acceso",
"acc.online": "en línea",
"acc.never": "nunca",
"acc.level.0": "Jugador",
"acc.level.1": "Moderador",
"acc.level.2": "Maestro del juego",
"acc.level.3": "Administrador",
"acc.changePassword": "Cambiar contraseña",
"acc.rename": "Renombrar",
"acc.needsRunning": "Inicia el servidor para cambiar las cuentas.",
"acc.changeFor": "Nueva contraseña para {name}",
"acc.renameFor": "Renombrar {name}",
"acc.newName": "Nuevo nombre de cuenta",
"acc.newPassword": "Nueva contraseña",
"acc.nameRule": "De 3 a 17 letras o dígitos.",
"acc.passRule": "De 6 a 16 caracteres, sin espacios ni comillas.",
"acc.renameNote": "Hace falta una contraseña nueva porque la contraseña de acceso depende del nombre de la cuenta. El jugador entra con el nuevo nombre y esta contraseña. La cuenta no debe estar conectada.",
"acc.save": "Guardar",
"acc.passwordChanged": "Se cambió la contraseña de {name}.",
"acc.renamed": "{name} ahora se llama {new}.",
"acc.accessChanged": "{name} ahora es: {level}.",
// Problem report (GitHub issue)
"nav.report": "Informar de un problema",
"q.report": "¿Algo no funciona?",
"rep.title": "Informar de un problema",
"rep.intro": "Describe qué salió mal. El Manager prepara con ello un informe de error para GitHub y lo abre en tu navegador; allí lo revisas, añades capturas y lo envías. Necesitas una cuenta gratuita de GitHub. Desde esta ventana no se envía nada.",
"rep.autoTitle": "Se rellena automáticamente",
"rep.manager": "Versión del Manager",
"rep.windows": "Versión de Windows",
"rep.kind": "Servidor",
"rep.kindNew": "Instalación nueva",
"rep.kindImported": "Servidor importado",
"rep.server": "Versión del servidor",
"rep.summary": "Resumen breve",
"rep.summaryHint": "Por ejemplo: pantalla de carga atascada tras crear un personaje",
"rep.what": "¿Qué pasó?",
"rep.whatHint": "Describe el problema.",
"rep.expected": "¿Qué esperabas que pasara?",
"rep.expectedHint": "Describe el comportamiento esperado.",
"rep.steps": "Pasos para reproducirlo",
"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.makeFile": "Crear el archivo de diagnóstico",
"rep.fileSaved": "Guardado en {path}. 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.open": "Abrir el informe en GitHub",
"rep.copy": "Copiar el texto",
"rep.preview": "Ver el texto",
"rep.needFields": "Rellena primero el resumen y «¿Qué pasó?».",
"rep.githubNote": "El informe está en inglés para que los desarrolladores puedan leerlo; tus propias palabras se quedan como las escribiste.",
"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.copied": "Copiado al portapapeles.",
// Realmlist switcher and modules page
"realm.label": "Reino",
"realm.other": "Otro",
"realm.add": "Añadir una realmlist…",
"realm.addTitle": "Nueva realmlist",
"realm.editTitle": "Cambiar la realmlist",
"realm.name": "Nombre",
"realm.nameHint": "Por ejemplo Solo o PTR",
"realm.data": "Texto de la realmlist",
"realm.dataHint": "Lo que se escribe en realmlist.wtf, por ejemplo: set realmlist play.example.com. También puedes escribir solo la dirección. Al elegir una realmlist se escribe en tu cliente; el archivo anterior se guarda antes.",
"realm.switched": "El juego ahora usa «{name}».",
"realm.edit": "Cambiar {name}",
"realm.delete": "Eliminar {name}",
"realm.confirmDelete": "¿Eliminar la realmlist «{name}»? El cliente conserva el archivo actual.",
"nav.modules": "Módulos",
"q.modules": "¿Qué funciones adicionales tiene el servidor?",
"mod.title": "Módulos",
"mod.intro": "Funciones adicionales ya integradas en el servidor. Activa o desactiva las que quieras, léelas en GitHub o cambia sus ajustes.",
"mod.restart": "Los cambios se aplican al reiniciar el servidor del mundo.",
"mod.switch": "Activar o desactivar {name}",
"mod.notHere": "No forma parte de este servidor",
"mod.github": "GitHub",
"mod.settings": "Ajustes",
"mod.default": "Volver al valor por defecto ({v})",
"mod.saved": "Guardado ({n} cambiado(s)).",
// Modules page: nothing yet
"mod.empty": "Aquí todavía no hay nada. Los módulos opcionales aparecerán en esta página a medida que se añadan.",
}; };
export default es; export default es;
+97
View File
@@ -627,6 +627,103 @@ const fr: Partial<Record<keyof typeof en, string>> = {
"client.versionUntracked": "non suivi par le Manager", "client.versionUntracked": "non suivi par le Manager",
"client.versionUnfinished": "téléchargement inachevé", "client.versionUnfinished": "téléchargement inachevé",
"client.downloadInstead": "Télécharger un client…", "client.downloadInstead": "Télécharger un client…",
// Accounts panel, password toggle, install size, addon explanation
"pw.show": "Afficher le mot de passe",
"pw.hide": "Masquer le mot de passe",
"install.size": "Le serveur occupera environ {size} sur le disque. Le téléchargement fait {download} ; pendant l’installation, environ {peak} sont nécessaires.",
"client.addonWhat": "Un panneau dans le jeu (ouvert depuis un bouton de la minicarte) pour commander vos compagnons : compléter le groupe, définir rôles et formations, donner des ordres (attaquer, engager, tenir la position) et voir leur équipement et leurs tâches. Le jeu fonctionne sans lui ; les compagnons suivent alors simplement leur propre IA.",
"acc.title": "Comptes",
"acc.text": "Toutes les personnes qui peuvent se connecter à ce serveur. Changer un mot de passe ou un accès nécessite que le serveur soit lancé.",
"acc.refresh": "Actualiser la liste",
"acc.unavailable": "La liste n’est pas disponible pour le moment. Lancez le serveur et réessayez.",
"acc.empty": "Aucun compte pour l’instant. Créez le premier ci-dessus.",
"acc.col.name": "Compte",
"acc.col.chars": "Personnages",
"acc.col.access": "Accès",
"acc.col.last": "Dernière connexion",
"acc.online": "en ligne",
"acc.never": "jamais",
"acc.level.0": "Joueur",
"acc.level.1": "Modérateur",
"acc.level.2": "Maître de jeu",
"acc.level.3": "Administrateur",
"acc.changePassword": "Changer le mot de passe",
"acc.rename": "Renommer",
"acc.needsRunning": "Lancez le serveur pour modifier les comptes.",
"acc.changeFor": "Nouveau mot de passe pour {name}",
"acc.renameFor": "Renommer {name}",
"acc.newName": "Nouveau nom de compte",
"acc.newPassword": "Nouveau mot de passe",
"acc.nameRule": "3 à 17 lettres ou chiffres.",
"acc.passRule": "6 à 16 caractères, sans espaces ni guillemets.",
"acc.renameNote": "Un nouveau mot de passe est nécessaire car le mot de passe de connexion dépend du nom du compte. Le joueur se connecte avec le nouveau nom et ce mot de passe. Le compte ne doit pas être connecté.",
"acc.save": "Enregistrer",
"acc.passwordChanged": "Le mot de passe de {name} a été modifié.",
"acc.renamed": "{name} s’appelle maintenant {new}.",
"acc.accessChanged": "{name} est maintenant : {level}.",
// Problem report (GitHub issue)
"nav.report": "Signaler un problème",
"q.report": "Quelque chose ne marche pas ?",
"rep.title": "Signaler un problème",
"rep.intro": "Décrivez ce qui s’est mal passé. Le Manager en prépare un rapport de bug pour GitHub et l’ouvre dans votre navigateur ; vous le relisez, ajoutez des captures d’écran et l’envoyez là-bas. Un compte GitHub gratuit est nécessaire. Rien n’est envoyé depuis cette fenêtre.",
"rep.autoTitle": "Rempli automatiquement",
"rep.manager": "Version du Manager",
"rep.windows": "Version de Windows",
"rep.kind": "Serveur",
"rep.kindNew": "Nouvelle installation",
"rep.kindImported": "Serveur importé",
"rep.server": "Version du serveur",
"rep.summary": "Résumé court",
"rep.summaryHint": "Par exemple : écran de chargement bloqué après la création d’un personnage",
"rep.what": "Que s’est-il passé ?",
"rep.whatHint": "Décrivez le problème.",
"rep.expected": "Qu’attendiez-vous ?",
"rep.expectedHint": "Décrivez le comportement attendu.",
"rep.steps": "Étapes pour reproduire",
"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.makeFile": "Créer le fichier de diagnostic",
"rep.fileSaved": "Enregistré dans {path}. 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.open": "Ouvrir le rapport sur GitHub",
"rep.copy": "Copier le texte",
"rep.preview": "Aperçu du texte",
"rep.needFields": "Remplissez d’abord le résumé et « Que s’est-il passé ? ».",
"rep.githubNote": "Le rapport est rédigé en anglais pour que les développeurs puissent le lire ; vos propres mots restent tels que vous les avez écrits.",
"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.copied": "Copié dans le presse-papiers.",
// Realmlist switcher and modules page
"realm.label": "Royaume",
"realm.other": "Autre",
"realm.add": "Ajouter une realmlist…",
"realm.addTitle": "Nouvelle realmlist",
"realm.editTitle": "Modifier la realmlist",
"realm.name": "Nom",
"realm.nameHint": "Par exemple Solo ou PTR",
"realm.data": "Texte de la realmlist",
"realm.dataHint": "Ce qui sera écrit dans realmlist.wtf, par exemple : set realmlist play.example.com. Vous pouvez aussi saisir seulement l’adresse. Choisir une realmlist l’écrit dans votre client ; l’ancien fichier est d’abord sauvegardé.",
"realm.switched": "Le jeu utilise maintenant « {name} ».",
"realm.edit": "Modifier {name}",
"realm.delete": "Supprimer {name}",
"realm.confirmDelete": "Supprimer la realmlist « {name} » ? Le client garde le fichier actuel.",
"nav.modules": "Modules",
"q.modules": "Quelles fonctions supplémentaires le serveur propose-t-il ?",
"mod.title": "Modules",
"mod.intro": "Fonctions supplémentaires déjà intégrées au serveur. Activez ou désactivez celles que vous voulez, lisez-en plus sur GitHub ou modifiez leurs réglages.",
"mod.restart": "Les changements s’appliquent après le redémarrage du serveur de monde.",
"mod.switch": "Activer ou désactiver {name}",
"mod.notHere": "Ne fait pas partie de ce serveur",
"mod.github": "GitHub",
"mod.settings": "Réglages",
"mod.default": "Revenir à la valeur par défaut ({v})",
"mod.saved": "Enregistré ({n} modifié(s)).",
// Modules page: nothing yet
"mod.empty": "Il n’y a encore rien ici. Les modules optionnels apparaîtront sur cette page au fur et à mesure de leur ajout.",
}; };
export default fr; export default fr;
+97
View File
@@ -627,6 +627,103 @@ const ru: Partial<Record<keyof typeof en, string>> = {
"client.versionUntracked": "менеджер не отслеживает", "client.versionUntracked": "менеджер не отслеживает",
"client.versionUnfinished": "загрузка не завершена", "client.versionUnfinished": "загрузка не завершена",
"client.downloadInstead": "Скачать клиент…", "client.downloadInstead": "Скачать клиент…",
// Accounts panel, password toggle, install size, addon explanation
"pw.show": "Показать пароль",
"pw.hide": "Скрыть пароль",
"install.size": "Сервер займёт на диске около {size}. Загрузка — {download}; на время установки нужно около {peak}.",
"client.addonWhat": "Панель внутри игры (открывается кнопкой у миникарты) для управления компаньонами: набрать группу, назначить роли и построения, отдавать приказы (атаковать, начать бой, держать позицию), смотреть их снаряжение и задания. Без аддона игра работает: компаньоны просто действуют по своему ИИ.",
"acc.title": "Аккаунты",
"acc.text": "Все, кто может войти на этот сервер. Для смены пароля и прав сервер должен быть запущен.",
"acc.refresh": "Обновить список",
"acc.unavailable": "Список сейчас недоступен. Запустите сервер и попробуйте снова.",
"acc.empty": "Аккаунтов пока нет. Создайте первый выше.",
"acc.col.name": "Аккаунт",
"acc.col.chars": "Персонажи",
"acc.col.access": "Права",
"acc.col.last": "Последний вход",
"acc.online": "в игре",
"acc.never": "никогда",
"acc.level.0": "Игрок",
"acc.level.1": "Модератор",
"acc.level.2": "Гейм-мастер",
"acc.level.3": "Администратор",
"acc.changePassword": "Сменить пароль",
"acc.rename": "Переименовать",
"acc.needsRunning": "Чтобы менять аккаунты, запустите сервер.",
"acc.changeFor": "Новый пароль для {name}",
"acc.renameFor": "Переименовать {name}",
"acc.newName": "Новое имя аккаунта",
"acc.newPassword": "Новый пароль",
"acc.nameRule": "От 3 до 17 букв или цифр.",
"acc.passRule": "От 6 до 16 символов, без пробелов и кавычек.",
"acc.renameNote": "Нужен новый пароль: пароль для входа зависит от имени аккаунта. Игрок входит под новым именем и этим паролем. Аккаунт не должен быть в игре.",
"acc.save": "Сохранить",
"acc.passwordChanged": "Пароль {name} изменён.",
"acc.renamed": "{name} теперь называется {new}.",
"acc.accessChanged": "{name}: теперь {level}.",
// Problem report (GitHub issue)
"nav.report": "Сообщить о проблеме",
"q.report": "Что-то не работает?",
"rep.title": "Сообщить о проблеме",
"rep.intro": "Опишите, что пошло не так. Менеджер подготовит по этому отчёт об ошибке для GitHub и откроет его в браузере; вы прочитаете его, добавите скриншоты и нажмёте «Submit» уже там. Нужен бесплатный аккаунт GitHub. Из этого окна ничего не отправляется.",
"rep.autoTitle": "Заполняется автоматически",
"rep.manager": "Версия менеджера",
"rep.windows": "Версия Windows",
"rep.kind": "Сервер",
"rep.kindNew": "Новая установка",
"rep.kindImported": "Импортированный сервер",
"rep.server": "Версия сервера",
"rep.summary": "Краткое описание",
"rep.summaryHint": "Например: завис экран загрузки после создания персонажа",
"rep.what": "Что произошло?",
"rep.whatHint": "Опишите проблему.",
"rep.expected": "Что вы ожидали?",
"rep.expectedHint": "Опишите ожидаемое поведение.",
"rep.steps": "Как воспроизвести",
"rep.attachTitle": "Логи и скриншоты",
"rep.attachText": "Создайте файл диагностики (настройки и логи без паролей и адресов) и перетащите его вместе со скриншотами или видео на страницу GitHub, когда она откроется.",
"rep.makeFile": "Создать файл диагностики",
"rep.fileSaved": "Сохранено: {path}. Перетащите этот файл в issue на GitHub.",
"rep.privacy": "Перед публикацией логов удалите пароли, токены, частные IP-адреса и другие личные данные.",
"rep.open": "Открыть отчёт на GitHub",
"rep.copy": "Копировать текст",
"rep.preview": "Показать текст отчёта",
"rep.needFields": "Сначала заполните краткое описание и «Что произошло?».",
"rep.githubNote": "Шаблон отчёта на английском, чтобы его мог прочитать разработчик; ваши формулировки остаются как вы их написали.",
"rep.opened": "GitHub открыт в браузере. Проверьте текст, прикрепите файлы и нажмите «Submit new issue».",
"rep.openedLong": "Отчёт слишком длинный для ссылки, поэтому он скопирован в буфер обмена. GitHub открыт: вставьте текст (Ctrl+V) в описание, прикрепите файлы и нажмите «Submit new issue».",
"rep.copied": "Скопировано в буфер обмена.",
// Realmlist switcher and modules page
"realm.label": "Реалм",
"realm.other": "Другой",
"realm.add": "Добавить реалмлист…",
"realm.addTitle": "Новый реалмлист",
"realm.editTitle": "Изменить реалмлист",
"realm.name": "Название",
"realm.nameHint": "Например: Solo или PTR",
"realm.data": "Текст реалмлиста",
"realm.dataHint": "То, что попадёт в realmlist.wtf, например: set realmlist play.example.com. Можно ввести и просто адрес. Выбор реалмлиста записывает его в ваш игровой клиент; прежний файл сначала сохраняется.",
"realm.switched": "Игра теперь использует «{name}».",
"realm.edit": "Изменить {name}",
"realm.delete": "Удалить {name}",
"realm.confirmDelete": "Удалить реалмлист «{name}»? В игровом клиенте останется текущий файл.",
"nav.modules": "Модули",
"q.modules": "Какие дополнительные возможности есть у сервера?",
"mod.title": "Модули",
"mod.intro": "Дополнительные возможности, уже встроенные в сервер. Включайте и выключайте нужные, читайте о них на GitHub или меняйте их настройки.",
"mod.restart": "Изменения применятся после перезапуска игрового сервера.",
"mod.switch": "Включить или выключить {name}",
"mod.notHere": "Нет в этом сервере",
"mod.github": "GitHub",
"mod.settings": "Настройки",
"mod.default": "Вернуть по умолчанию ({v})",
"mod.saved": "Сохранено (изменено: {n}).",
// Modules page: nothing yet
"mod.empty": "Здесь пока пусто. Дополнительные модули появятся на этой странице по мере добавления.",
}; };
export default ru; export default ru;
+4
View File
@@ -462,6 +462,10 @@
"Updates.EnableDatabases": { "Updates.EnableDatabases": {
"t": "Automatische Datenbank-Updates", "t": "Automatische Datenbank-Updates",
"d": "Erlaubt dem Server, seine Datenbanken beim Start selbst zu ändern. Lass es auf 0: Der Manager wendet Datenbank-Updates sicher an und verfolgt sie." "d": "Erlaubt dem Server, seine Datenbanken beim Start selbst zu ändern. Lass es auf 0: Der Manager wendet Datenbank-Updates sicher an und verfolgt sie."
},
"MapUpdate.Threads": {
"t": "CPU-Kerne für die Welt",
"d": "Wie viele Prozessorkerne die Welt zum Aktualisieren der Karten nutzt. Begleiter, die sich über mehrere Karten verteilen, laufen mit mehr als einem Kern deutlich schneller. Wird nach einem Neustart des Weltservers wirksam."
} }
}, },
"options": { "options": {
+4
View File
@@ -462,6 +462,10 @@
"Updates.EnableDatabases": { "Updates.EnableDatabases": {
"t": "Actualizaciones automáticas de bases de datos", "t": "Actualizaciones automáticas de bases de datos",
"d": "Permite que el servidor cambie él mismo sus bases de datos al arrancar. Déjalo en 0: el Manager aplica y registra las actualizaciones de bases de datos de forma segura." "d": "Permite que el servidor cambie él mismo sus bases de datos al arrancar. Déjalo en 0: el Manager aplica y registra las actualizaciones de bases de datos de forma segura."
},
"MapUpdate.Threads": {
"t": "Núcleos de CPU para el mundo",
"d": "Cuántos núcleos del procesador usa el mundo para actualizar los mapas. Los compañeros repartidos por varios mapas van mucho más rápido con más de un núcleo. Se aplica al reiniciar el servidor del mundo."
} }
}, },
"options": { "options": {
+4
View File
@@ -462,6 +462,10 @@
"Updates.EnableDatabases": { "Updates.EnableDatabases": {
"t": "Mises à jour automatiques des bases de données", "t": "Mises à jour automatiques des bases de données",
"d": "Permet au serveur de modifier lui-même ses bases de données au démarrage. Gardez 0 : le Manager applique et suit les mises à jour de base de données en toute sécurité." "d": "Permet au serveur de modifier lui-même ses bases de données au démarrage. Gardez 0 : le Manager applique et suit les mises à jour de base de données en toute sécurité."
},
"MapUpdate.Threads": {
"t": "Cœurs du processeur pour le monde",
"d": "Nombre de cœurs du processeur utilisés par le monde pour mettre à jour les cartes. Les compagnons répartis sur plusieurs cartes vont nettement plus vite avec plus d’un cœur. Pris en compte au redémarrage du serveur de monde."
} }
}, },
"options": { "options": {
+4
View File
@@ -462,6 +462,10 @@
"Updates.EnableDatabases": { "Updates.EnableDatabases": {
"t": "Автоматические обновления баз данных", "t": "Автоматические обновления баз данных",
"d": "Позволяет серверу самому менять свои базы данных при запуске. Оставьте 0: менеджер безопасно применяет и учитывает обновления баз данных." "d": "Позволяет серверу самому менять свои базы данных при запуске. Оставьте 0: менеджер безопасно применяет и учитывает обновления баз данных."
},
"MapUpdate.Threads": {
"t": "Ядра процессора для мира",
"d": "Сколько ядер процессора мир использует для обновления карт. Компаньоны, разбросанные по нескольким картам, работают заметно быстрее при значении больше одного. Применяется после перезапуска игрового сервера."
} }
}, },
"options": { "options": {
+61 -1
View File
@@ -167,6 +167,52 @@ export interface Preflight {
free_bytes: number; free_bytes: number;
} }
export interface RealmProfile {
id: string;
name: string;
data: string;
}
export interface ModuleView {
id: string;
name: string;
description: Record<string, string>;
repo: string;
/** the module is part of this server build (its configuration exists) */
installed: boolean;
enabled: boolean;
}
export interface ModuleSetting {
key: string;
value: string;
default: string | null;
doc: string;
}
export interface ReportContext {
manager_version: string;
windows: string;
install_kind: "new" | "imported";
server_version: string | null;
}
export interface InstallRequirements {
download_bytes: number;
unpacked_bytes: number;
version: string;
}
export interface AccountInfo {
id: number;
name: string;
/** 0 player, 1 moderator, 2 game master, 3 administrator */
access: number;
online: boolean;
last_login: string | null;
characters: number;
}
export interface InstallStep { export interface InstallStep {
step: string; step: string;
percent: number; percent: number;
@@ -311,7 +357,21 @@ export const api = {
deleteBackup: (id: string, backupId: string) => invoke<void>("delete_backup", { id, backupId }), deleteBackup: (id: string, backupId: string) => invoke<void>("delete_backup", { id, backupId }),
restoreConfigs: (id: string, backupId: string) => invoke<RecoveryPoint>("restore_backup_configs", { id, backupId }), restoreConfigs: (id: string, backupId: string) => invoke<RecoveryPoint>("restore_backup_configs", { id, backupId }),
restoreDatabase: (id: string, backupId: string, database: string) => invoke<DbRestore>("restore_backup_database", { id, backupId, database }), restoreDatabase: (id: string, backupId: string, database: string) => invoke<DbRestore>("restore_backup_database", { id, backupId, database }),
installPreflight: (dest: string) => invoke<Preflight>("install_preflight", { dest }), installPreflight: (dest: string, needed?: number) => invoke<Preflight>("install_preflight", { dest, needed: needed ?? null }),
installRequirements: (pkg?: string) => invoke<InstallRequirements>("install_requirements", { package: pkg ?? null }),
realmlistProfiles: (id: string) => invoke<{ profiles: RealmProfile[]; active: string | null }>("realmlist_profiles", { id }),
realmlistSave: (id: string, profileId: string | null, name: string, data: string) => invoke<RealmProfile>("realmlist_save", { id, profileId, name, data }),
realmlistDelete: (id: string, profileId: string) => invoke<void>("realmlist_delete", { id, profileId }),
realmlistActivate: (id: string, profileId: string) => invoke<string[]>("realmlist_activate", { id, profileId }),
modulesList: (id: string) => invoke<ModuleView[]>("modules_list", { id }),
moduleSetEnabled: (id: string, module: string, enabled: boolean) => invoke<void>("module_set_enabled", { id, module, enabled }),
moduleSettings: (id: string, module: string) => invoke<ModuleSetting[]>("module_settings", { id, module }),
moduleSaveSettings: (id: string, module: string, changes: Record<string, string>) => invoke<string[]>("module_save_settings", { id, module, changes }),
reportContext: (id: string) => invoke<ReportContext>("report_context", { id }),
listAccounts: (id: string) => invoke<AccountInfo[]>("list_accounts", { id }),
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 }),
accountRename: (id: string, name: string, newName: string, password: string) => invoke<void>("account_rename", { id, name, newName, password }),
installNew: (dest: string, pkg?: string) => invoke<ServerSummary>("install_new", { dest, package: pkg ?? null }), installNew: (dest: string, pkg?: string) => invoke<ServerSummary>("install_new", { dest, package: pkg ?? null }),
cancelInstall: () => invoke<void>("cancel_install"), cancelInstall: () => invoke<void>("cancel_install"),
createAccount: (id: string, username: string, password: string, administrator: boolean) => createAccount: (id: string, username: string, password: string, administrator: boolean) =>
+63
View File
@@ -0,0 +1,63 @@
/** 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 {
managerVersion: string;
windows: string;
installKind: "new" | "imported";
serverVersion: string | null;
what: string;
expected: string;
steps: string;
/** a diagnostics file was created for this report */
diagnostics: boolean;
}
export const NEW_ISSUE_URL = "https://github.com/Corfirean/coa-server-manager/issues/new";
const PRIVACY = "> Please remove passwords, tokens, private IP information or other sensitive data before posting logs.";
export function reportBody(r: ReportInput): string {
const text = (s: string, fallback: string) => (s.trim() ? s.trim() : fallback);
return [
"## Bug Report",
"",
`**Manager version:** ${r.managerVersion || "unknown"} `,
`**Windows version:** ${r.windows || "unknown"} `,
`**Fresh install or imported server:** ${r.installKind === "new" ? "Fresh install" : "Imported server"} `,
...(r.serverVersion ? [`**Server version:** ${r.serverVersion} `] : []),
"",
"**What happened?** ",
text(r.what, "Describe the problem."),
"",
"**What did you expect to happen?** ",
text(r.expected, "Describe the expected behaviour."),
"",
"**Steps to reproduce:** ",
text(r.steps, "1.\n2.\n3."),
"",
"**Screenshot / video:** ",
"Attach it if possible.",
"",
"**Logs:** ",
r.diagnostics ? "The diagnostics file from the Manager is attached below (it has passwords and addresses removed)." : "Attach relevant Manager/server logs if available.",
"",
PRIVACY,
"",
].join("\n");
}
/** Percent-encode everything that is not a plain letter, digit or one of . _ - so the link carries nothing the browser could misread. */
export function encodeQuery(s: string): string {
return Array.from(new TextEncoder().encode(s))
.map((b) => {
const c = String.fromCharCode(b);
return /[A-Za-z0-9._-]/.test(c) ? c : "%" + b.toString(16).toUpperCase().padStart(2, "0");
})
.join("");
}
/** A link that opens GitHub's "new issue" page with the title and text filled in. */
export function issueUrl(title: string, body: string): string {
return `${NEW_ISSUE_URL}?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. */
export const MAX_LINK = 6500;
+24 -8
View File
@@ -1,6 +1,6 @@
import { useSyncExternalStore } from "react"; import { useSyncExternalStore } from "react";
import { listen } from "@tauri-apps/api/event"; import { listen } from "@tauri-apps/api/event";
import { api, asUiError, type UpdatePreview } from "@/lib/api"; import { api, asUiError, type UiError, type UpdatePreview, type UpdateTxn } from "@/lib/api";
/** /**
* Server update status for the main screen and the navigation: checked when the app starts and every five minutes, * Server update status for the main screen and the navigation: checked when the app starts and every five minutes,
@@ -14,9 +14,13 @@ export interface ServerUpdateState {
step: string | null; step: string | null;
percent: number; percent: number;
error: string | null; error: string | null;
/** The full error of the last update attempt, for the Settings card. */
uiError: UiError | null;
/** How the last update ended; kept here so the Settings card can show it after the user left and came back. */
result: { committed: string } | { pending: UpdateTxn } | null;
} }
const EMPTY: ServerUpdateState = { preview: null, available: false, checking: false, applying: false, step: null, percent: 0, error: null }; const EMPTY: ServerUpdateState = { preview: null, available: false, checking: false, applying: false, step: null, percent: 0, error: null, uiError: null, result: null };
const states = new Map<string, ServerUpdateState>(); const states = new Map<string, ServerUpdateState>();
const listeners = new Set<() => void>(); const listeners = new Set<() => void>();
export const CHECK_EVERY_MS = 5 * 60 * 1000; export const CHECK_EVERY_MS = 5 * 60 * 1000;
@@ -49,11 +53,21 @@ export function startServerUpdatePolling(id: string): () => void {
return () => clearInterval(t); return () => clearInterval(t);
} }
/** Apply the pending update when no file needs a decision. Resolves true on success. */ export function clearServerUpdateResult(id: string) {
export async function applyServerUpdate(id: string): Promise<boolean> { set(id, { result: null, uiError: null });
}
/**
* Apply an update. Without options this is the main-screen button: the pending update, only when no file needs a
* decision. With options (the Settings card) the owner has already chosen what to do with each changed file and may
* point at another package source. The state lives here, not in a screen, so leaving the Settings tab and coming back
* shows the update still running (and its progress) instead of an "Update now" button the server would refuse.
*/
export async function applyServerUpdate(id: string, opts?: { choices: Record<string, "keep" | "replace">; source?: string }): Promise<boolean> {
const p = get(id).preview; const p = get(id).preview;
if (!p || p.conflicts.length > 0 || get(id).applying) return false; if (get(id).applying) return false;
set(id, { applying: true, step: null, percent: 0, error: null }); if (!opts && (!p || p.conflicts.length > 0)) return false;
set(id, { applying: true, step: null, percent: 0, error: null, uiError: null, result: null });
let un: (() => void) | undefined; let un: (() => void) | undefined;
try { try {
un = await listen<{ step: string; percent: number }>("update-progress", (e) => set(id, { step: e.payload.step, percent: e.payload.percent })); un = await listen<{ step: string; percent: number }>("update-progress", (e) => set(id, { step: e.payload.step, percent: e.payload.percent }));
@@ -61,10 +75,12 @@ export async function applyServerUpdate(id: string): Promise<boolean> {
/* progress is optional */ /* progress is optional */
} }
try { try {
await api.applyUpdate(id, {}); const out = await api.applyUpdate(id, opts?.choices ?? {}, opts?.source);
set(id, { result: out.txn.state === "committed" ? { committed: out.txn.to_version ?? "" } : { pending: out.txn } });
return true; return true;
} catch (e) { } catch (e) {
set(id, { error: asUiError(e).human.code }); const ui = asUiError(e);
set(id, { error: ui.human.code, uiError: ui });
return false; return false;
} finally { } finally {
un?.(); un?.();
+171
View File
@@ -0,0 +1,171 @@
import { useCallback, useEffect, useState } from "react";
import { Loader2, RefreshCw } from "lucide-react";
import { api, asUiError, type AccountInfo, type UiError } from "@/lib/api";
import { Button } from "@/components/ui/button";
import { Card } from "@/components/ui/card";
import { PasswordInput } from "@/components/ui/password-input";
import { useHuman, useT, type Key } from "@/i18n";
const LEVELS = [0, 1, 2, 3] as const;
const inputClass = "w-64 rounded-md border border-line bg-bg px-3 py-2 text-sm outline-none focus:border-gold";
type Editor = { name: string; mode: "password" | "rename" };
/** Everyone who can log in to the server, with the changes an owner usually needs: password, access level, name. */
export function AccountsCard({ serverId, online, reloadKey }: { serverId: string; online: boolean | null; reloadKey: number }) {
const t = useT();
const human = useHuman();
const [accounts, setAccounts] = useState<AccountInfo[] | null>(null);
const [listError, setListError] = useState(false);
const [editor, setEditor] = useState<Editor | null>(null);
const [newName, setNewName] = useState("");
const [password, setPassword] = useState("");
const [busy, setBusy] = useState<string | null>(null);
const [error, setError] = useState<UiError | null>(null);
const [note, setNote] = useState<string | null>(null);
const load = useCallback(async () => {
try {
setAccounts(await api.listAccounts(serverId));
setListError(false);
} catch {
setAccounts(null);
setListError(true);
}
}, [serverId]);
useEffect(() => {
void load();
}, [load, reloadKey, online]);
async function run(label: string, fn: () => Promise<void>, ok: string) {
setBusy(label);
setError(null);
setNote(null);
try {
await fn();
setNote(ok);
setEditor(null);
setPassword("");
setNewName("");
await load();
} catch (e) {
setError(asUiError(e));
} finally {
setBusy(null);
}
}
const passOk = password.length >= 6 && password.length <= 16 && /^[\x21-\x7e]+$/.test(password) && !/["']/.test(password);
const nameOk = /^[A-Za-z0-9]{3,17}$/.test(newName);
return (
<Card className="mt-6 p-6">
<div className="flex items-start justify-between gap-3">
<div>
<h2 className="font-semibold">{t("acc.title")}</h2>
<p className="mt-1 text-sm text-muted">{t("acc.text")}</p>
</div>
<Button size="sm" variant="ghost" onClick={() => void load()} aria-label={t("acc.refresh")} title={t("acc.refresh")}>
<RefreshCw className="h-4 w-4" aria-hidden />
</Button>
</div>
{listError && <p className="mt-4 text-sm text-warn">{t("acc.unavailable")}</p>}
{accounts && accounts.length === 0 && <p className="mt-4 text-sm text-muted">{t("acc.empty")}</p>}
{accounts && accounts.length > 0 && (
<div className="mt-4 overflow-x-auto">
<table className="w-full text-left text-sm">
<thead className="text-xs text-muted">
<tr>
<th className="py-2 pr-3 font-normal">{t("acc.col.name")}</th>
<th className="py-2 pr-3 font-normal">{t("acc.col.chars")}</th>
<th className="py-2 pr-3 font-normal">{t("acc.col.access")}</th>
<th className="py-2 pr-3 font-normal">{t("acc.col.last")}</th>
<th className="py-2 font-normal" />
</tr>
</thead>
<tbody className="divide-y divide-line">
{accounts.map((a) => (
<tr key={a.id}>
<td className="py-2 pr-3 font-medium">
{a.name}
{a.online && <span className="ml-2 text-xs text-ok">{t("acc.online")}</span>}
</td>
<td className="py-2 pr-3">{a.characters}</td>
<td className="py-2 pr-3">
<select
aria-label={t("acc.col.access")}
className="rounded-md border border-line bg-bg px-2 py-1 text-sm"
value={a.access}
disabled={!online || busy !== null}
onChange={(e) =>
void run(
`access:${a.name}`,
() => api.accountSetAccess(serverId, a.name, Number(e.target.value)),
t("acc.accessChanged", { name: a.name, level: t(`acc.level.${e.target.value}` as Key) }),
)
}
>
{LEVELS.map((l) => (
<option key={l} value={l}>{t(`acc.level.${l}` as Key)}</option>
))}
</select>
</td>
<td className="py-2 pr-3 text-muted">{a.last_login ?? t("acc.never")}</td>
<td className="py-2 text-right whitespace-nowrap">
<Button size="sm" variant="ghost" disabled={!online || busy !== null} onClick={() => { setEditor({ name: a.name, mode: "password" }); setError(null); setNote(null); }}>
{t("acc.changePassword")}
</Button>
<Button size="sm" variant="ghost" disabled={!online || busy !== null || a.online} onClick={() => { setEditor({ name: a.name, mode: "rename" }); setError(null); setNote(null); }}>
{t("acc.rename")}
</Button>
</td>
</tr>
))}
</tbody>
</table>
</div>
)}
{online === false && accounts && accounts.length > 0 && <p className="mt-3 text-xs text-muted">{t("acc.needsRunning")}</p>}
{editor && (
<div className="mt-4 rounded-md border border-line bg-black/20 p-4">
<p className="font-medium">{editor.mode === "password" ? t("acc.changeFor", { name: editor.name }) : t("acc.renameFor", { name: editor.name })}</p>
{editor.mode === "rename" && (
<div className="mt-3">
<label htmlFor="acc-newname" className="text-sm text-muted">{t("acc.newName")}</label>
<input id="acc-newname" className={inputClass + " mt-1 block"} value={newName} onChange={(e) => setNewName(e.target.value)} autoComplete="off" />
<p className="mt-1 text-xs text-muted">{t("acc.nameRule")}</p>
</div>
)}
<div className="mt-3">
<label htmlFor="acc-newpass" className="text-sm text-muted">{t("acc.newPassword")}</label>
<PasswordInput id="acc-newpass" className={inputClass + " mt-1 block"} value={password} onChange={(e) => setPassword(e.target.value)} autoComplete="new-password" />
<p className="mt-1 text-xs text-muted">{t("acc.passRule")}</p>
</div>
{editor.mode === "rename" && <p className="mt-3 text-xs text-muted">{t("acc.renameNote")}</p>}
<div className="mt-4 flex gap-2">
<Button
variant="primary"
size="sm"
disabled={busy !== null || !passOk || (editor.mode === "rename" && !nameOk)}
onClick={() =>
editor.mode === "password"
? void run("password", () => api.accountSetPassword(serverId, editor.name, password), t("acc.passwordChanged", { name: editor.name }))
: void run("rename", () => api.accountRename(serverId, editor.name, newName, password), t("acc.renamed", { name: editor.name, new: newName.toUpperCase() }))
}
>
{busy && <Loader2 className="h-4 w-4 animate-spin" aria-hidden />}
{t("acc.save")}
</Button>
<Button size="sm" variant="ghost" onClick={() => { setEditor(null); setPassword(""); setNewName(""); }}>{t("common.cancel")}</Button>
</div>
</div>
)}
{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>}
</Card>
);
}
+1
View File
@@ -78,6 +78,7 @@ export function ClientCard({ serverId }: { serverId: string }) {
<dd> <dd>
{info.addon.installed ? (info.addon.version ? t("client.installedVersion", { v: info.addon.version }) : t("client.installed")) : t("client.addonNotInstalled")} {info.addon.installed ? (info.addon.version ? t("client.installedVersion", { v: info.addon.version }) : t("client.installed")) : t("client.addonNotInstalled")}
{info.addon.up_to_date === false && <span className="ml-2 text-warn">{t("client.updateAvailable")}</span>} {info.addon.up_to_date === false && <span className="ml-2 text-warn">{t("client.updateAvailable")}</span>}
<span className="mt-1 block text-xs text-muted">{t("client.addonWhat")}</span>
</dd> </dd>
<dt className="text-muted">{t("client.otherAddons")}</dt> <dt className="text-muted">{t("client.otherAddons")}</dt>
<dd>{t("client.leftAsIs", { n: info.other_addons })}</dd> <dd>{t("client.leftAsIs", { n: info.other_addons })}</dd>
+19 -4
View File
@@ -2,7 +2,8 @@ import { useEffect, useState } from "react";
import { listen } from "@tauri-apps/api/event"; import { listen } from "@tauri-apps/api/event";
import { open } from "@tauri-apps/plugin-dialog"; import { open } from "@tauri-apps/plugin-dialog";
import { Check, ChevronDown, ChevronRight, Loader2 } from "lucide-react"; import { Check, ChevronDown, ChevronRight, Loader2 } from "lucide-react";
import { api, asUiError, type InstallStep, type Preflight, type ServerSummary, type UiError } from "@/lib/api"; import { api, asUiError, type InstallRequirements, type InstallStep, type Preflight, type ServerSummary, type UiError } from "@/lib/api";
import { formatBytes } from "@/lib/utils";
import { Button } from "@/components/ui/button"; import { Button } from "@/components/ui/button";
import { Card } from "@/components/ui/card"; import { Card } from "@/components/ui/card";
import { useHuman, useT, type Key } from "@/i18n"; import { useHuman, useT, type Key } from "@/i18n";
@@ -24,6 +25,7 @@ export function InstallServer(props: { canCancel: boolean; onCancel: () => void;
const human = useHuman(); const human = useHuman();
const [dest, setDest] = useState("C:\\Games\\CoA Server"); const [dest, setDest] = useState("C:\\Games\\CoA Server");
const [pre, setPre] = useState<Preflight | null>(null); const [pre, setPre] = useState<Preflight | null>(null);
const [req, setReq] = useState<InstallRequirements | null>(null);
const [phase, setPhase] = useState<Phase>("choose"); const [phase, setPhase] = useState<Phase>("choose");
const [step, setStep] = useState<InstallStep>({ step: "Preparing your server", percent: 0, detail: null }); const [step, setStep] = useState<InstallStep>({ step: "Preparing your server", percent: 0, detail: null });
const [error, setError] = useState<UiError | null>(null); const [error, setError] = useState<UiError | null>(null);
@@ -32,10 +34,18 @@ export function InstallServer(props: { canCancel: boolean; onCancel: () => void;
const [installed, setInstalled] = useState<ServerSummary | null>(null); const [installed, setInstalled] = useState<ServerSummary | null>(null);
const [showDetails, setShowDetails] = useState(false); const [showDetails, setShowDetails] = useState(false);
// how big the server is, from the package's signed list (re-read when another package source is entered)
useEffect(() => { useEffect(() => {
const t = setTimeout(() => void api.installPreflight(dest).then(setPre).catch(() => setPre(null)), 250); const timer = setTimeout(() => void api.installRequirements(pkg.trim() || undefined).then(setReq).catch(() => setReq(null)), 400);
return () => clearTimeout(t); return () => clearTimeout(timer);
}, [dest]); }, [pkg]);
// room for the unpacked server plus the download that is removed afterwards
const needed = req ? req.unpacked_bytes + req.download_bytes : undefined;
useEffect(() => {
const timer = setTimeout(() => void api.installPreflight(dest, needed).then(setPre).catch(() => setPre(null)), 250);
return () => clearTimeout(timer);
}, [dest, needed]);
useEffect(() => { useEffect(() => {
const un = listen<InstallStep>("install-progress", (e) => setStep(e.payload)); const un = listen<InstallStep>("install-progress", (e) => setStep(e.payload));
@@ -136,6 +146,11 @@ export function InstallServer(props: { canCancel: boolean; onCancel: () => void;
))} ))}
</Card> </Card>
)} )}
{req && (
<p className="text-sm text-muted">
{t("install.size", { size: formatBytes(req.unpacked_bytes), download: formatBytes(req.download_bytes), peak: formatBytes(req.unpacked_bytes + req.download_bytes) })}
</p>
)}
{pre?.ok && <p className="text-sm text-ok">{t("install.ready", { gb: Math.round(pre.free_bytes / (1 << 30)) })}</p>} {pre?.ok && <p className="text-sm text-ok">{t("install.ready", { gb: Math.round(pre.free_bytes / (1 << 30)) })}</p>}
{error && ( {error && (
+158
View File
@@ -0,0 +1,158 @@
import { useCallback, useEffect, useState } from "react";
import { ExternalLink, Loader2 } from "lucide-react";
import { api, asUiError, type ModuleSetting, type ModuleView, type UiError } from "@/lib/api";
import { cn } from "@/lib/utils";
import { Button } from "@/components/ui/button";
import { Card } from "@/components/ui/card";
import { useHuman, useI18n } from "@/i18n";
/** The server's optional modules: switch each on or off, open its page on GitHub, change its settings. */
export function ModulesPage({ serverId }: { serverId: string }) {
const { t, locale } = useI18n();
const human = useHuman();
const [modules, setModules] = useState<ModuleView[] | null>(null);
const [open, setOpen] = useState<string | null>(null);
const [error, setError] = useState<UiError | null>(null);
const [changed, setChanged] = useState(false);
const load = useCallback(async () => {
try {
setModules(await api.modulesList(serverId));
} catch (e) {
setError(asUiError(e));
}
}, [serverId]);
useEffect(() => {
void load();
}, [load]);
async function toggle(m: ModuleView) {
setError(null);
try {
await api.moduleSetEnabled(serverId, m.id, !m.enabled);
setChanged(true);
await load();
} catch (e) {
setError(asUiError(e));
}
}
return (
<div className="max-w-3xl">
<h1 className="text-2xl font-semibold">{t("mod.title")}</h1>
<p className="mt-1 text-muted">{t("q.modules")}</p>
<p className="mt-3 text-sm text-muted">{t("mod.intro")}</p>
{changed && <p className="mt-3 rounded-md border border-gold/40 bg-gold/5 px-3 py-2 text-sm" role="status">{t("mod.restart")}</p>}
{error && <p className="mt-3 text-sm text-bad" role="alert">{error.human.code === "unknown" ? error.technical : human(error.human).message}</p>}
<div className="mt-6 space-y-4">
{modules === null && !error && <p className="text-muted">{t("overview.checking")}</p>}
{modules?.length === 0 && <Card className="p-6 text-center text-muted">{t("mod.empty")}</Card>}
{modules?.map((m) => (
<Card key={m.id} className={cn("p-5", !m.installed && "opacity-60")}>
<div className="flex items-start justify-between gap-4">
<div className="min-w-0">
<h2 className="font-semibold">{m.name}</h2>
<p className="mt-1 text-sm text-muted">{m.description[locale] ?? m.description.en}</p>
</div>
{m.installed ? (
<button
role="switch"
aria-checked={m.enabled}
aria-label={t("mod.switch", { name: m.name })}
onClick={() => void toggle(m)}
className={cn("relative mt-1 h-6 w-11 shrink-0 cursor-pointer rounded-full transition-colors", m.enabled ? "bg-gold" : "bg-white/15")}
>
<span className={cn("absolute top-0.5 h-5 w-5 rounded-full bg-white transition-all", m.enabled ? "left-[22px]" : "left-0.5")} />
</button>
) : (
<span className="mt-1 shrink-0 text-xs text-muted">{t("mod.notHere")}</span>
)}
</div>
<div className="mt-3 flex flex-wrap gap-2">
<Button size="sm" variant="ghost" onClick={() => void api.openLink(m.repo)}>
<ExternalLink className="h-3.5 w-3.5" aria-hidden /> {t("mod.github")}
</Button>
{m.installed && (
<Button size="sm" variant="ghost" aria-expanded={open === m.id} onClick={() => setOpen(open === m.id ? null : m.id)}>
{t("mod.settings")}
</Button>
)}
</div>
{open === m.id && <ModuleSettings serverId={serverId} module={m} onSaved={() => setChanged(true)} />}
</Card>
))}
</div>
</div>
);
}
function ModuleSettings({ serverId, module, onSaved }: { serverId: string; module: ModuleView; onSaved: () => void }) {
const { t } = useI18n();
const human = useHuman();
const [items, setItems] = useState<ModuleSetting[] | null>(null);
const [edits, setEdits] = useState<Record<string, string>>({});
const [busy, setBusy] = useState(false);
const [error, setError] = useState<UiError | null>(null);
const [note, setNote] = useState<string | null>(null);
useEffect(() => {
void api.moduleSettings(serverId, module.id).then((s) => setItems(s)).catch((e) => setError(asUiError(e)));
}, [serverId, module.id]);
async function save() {
setBusy(true);
setError(null);
setNote(null);
try {
const done = await api.moduleSaveSettings(serverId, module.id, edits);
setEdits({});
setItems(await api.moduleSettings(serverId, module.id));
if (done.length) {
onSaved();
setNote(t("mod.saved", { n: done.length }));
}
} catch (e) {
setError(asUiError(e));
} finally {
setBusy(false);
}
}
const dirty = Object.keys(edits).length > 0;
return (
<div className="mt-4 border-t border-line pt-4">
{items === null && !error && <Loader2 className="h-4 w-4 animate-spin text-muted" aria-hidden />}
<ul className="divide-y divide-line">
{items?.map((s) => (
<li key={s.key} className="py-2.5">
<div className="flex flex-wrap items-center justify-between gap-3">
<label htmlFor={`${module.id}-${s.key}`} className="selectable text-sm font-medium">{s.key}</label>
<input
id={`${module.id}-${s.key}`}
value={edits[s.key] ?? s.value}
onChange={(e) => setEdits((x) => ({ ...x, [s.key]: e.target.value }))}
className="selectable w-56 rounded-md border border-line bg-bg px-2.5 py-1.5 text-sm outline-none focus:border-gold"
/>
</div>
{s.doc && <p className="mt-1 text-xs text-muted">{s.doc}</p>}
{s.default !== null && (edits[s.key] ?? s.value) !== s.default && (
<button className="mt-1 cursor-pointer text-xs text-muted underline hover:text-ink" onClick={() => setEdits((x) => ({ ...x, [s.key]: s.default ?? "" }))}>
{t("mod.default", { v: s.default })}
</button>
)}
</li>
))}
</ul>
<div className="mt-3 flex items-center gap-3">
<Button size="sm" variant="primary" disabled={!dirty || busy} onClick={() => void save()}>
{busy && <Loader2 className="h-4 w-4 animate-spin" aria-hidden />}
{t("acc.save")}
</Button>
{note && <span className="text-sm text-ok" role="status">{note}</span>}
</div>
{error && <p className="mt-2 text-sm text-bad" role="alert">{error.human.code === "unknown" ? error.technical : human(error.human).message}</p>}
</div>
);
}
+9 -5
View File
@@ -6,6 +6,7 @@ import { useHuman, useT } from "@/i18n";
import { applyServerUpdate, useServerUpdate } from "@/lib/serverUpdate"; import { applyServerUpdate, useServerUpdate } from "@/lib/serverUpdate";
import { checkClient, useClientStatus } from "@/lib/clientUpdate"; import { checkClient, useClientStatus } from "@/lib/clientUpdate";
import { ClientDialog, type ClientDialogMode } from "@/screens/ClientDialog"; import { ClientDialog, type ClientDialogMode } from "@/screens/ClientDialog";
import { RealmlistMenu } from "@/screens/RealmlistMenu";
import { Button } from "@/components/ui/button"; import { Button } from "@/components/ui/button";
import { Card } from "@/components/ui/card"; import { Card } from "@/components/ui/card";
@@ -202,7 +203,7 @@ export function Overview({ server, onForget, onOpenUpdates }: { server: ServerSu
const tone = transitioning ? "text-warn" : running ? "text-ok" : anyUp ? "text-warn" : "text-muted"; const tone = transitioning ? "text-warn" : running ? "text-ok" : anyUp ? "text-warn" : "text-muted";
return ( return (
<div className="max-w-2xl"> <div className="w-full max-w-4xl">
<h1 className="text-2xl font-semibold">{server.name}</h1> <h1 className="text-2xl font-semibold">{server.name}</h1>
<p className="selectable mt-0.5 text-xs text-muted">{server.path}</p> <p className="selectable mt-0.5 text-xs text-muted">{server.path}</p>
@@ -237,7 +238,7 @@ export function Overview({ server, onForget, onOpenUpdates }: { server: ServerSu
)} )}
{perf && <TickRate perf={perf} />} {perf && <TickRate perf={perf} />}
<div className="mt-7 flex items-center gap-4"> <div className="mt-7 flex flex-wrap items-center gap-x-4 gap-y-3">
{running ? ( {running ? (
<Button variant="secondary" size="xl" disabled={transitioning} onClick={() => run("stopping")} className="min-w-56"> <Button variant="secondary" size="xl" disabled={transitioning} onClick={() => run("stopping")} className="min-w-56">
{transitioning && <Loader2 className="h-5 w-5 animate-spin" aria-hidden />} {transitioning && <Loader2 className="h-5 w-5 animate-spin" aria-hidden />}
@@ -276,20 +277,23 @@ export function Overview({ server, onForget, onOpenUpdates }: { server: ServerSu
{t("btn.stopSmall")} {t("btn.stopSmall")}
</Button> </Button>
)} )}
<div className="ml-auto flex items-center gap-3">
{client && <RealmlistMenu serverId={server.id} />}
{client && clientStatus?.update_available ? ( {client && clientStatus?.update_available ? (
<Button variant="primary" size="xl" disabled={playing} onClick={() => setDialog("update")} className="ml-auto min-w-40"> <Button variant="primary" size="xl" disabled={playing} onClick={() => setDialog("update")} className="min-w-40">
{t("btn.updateClient")} {t("btn.updateClient")}
</Button> </Button>
) : client ? ( ) : client ? (
<Button variant={running ? "primary" : "secondary"} size="xl" disabled={transitioning || playing} onClick={() => void play()} className="ml-auto min-w-40"> <Button variant={running ? "primary" : "secondary"} size="xl" disabled={transitioning || playing} onClick={() => void play()} className="min-w-40">
{playing && <Loader2 className="h-5 w-5 animate-spin" aria-hidden />} {playing && <Loader2 className="h-5 w-5 animate-spin" aria-hidden />}
{running ? t("btn.play") : t("btn.startPlay")} {running ? t("btn.play") : t("btn.startPlay")}
</Button> </Button>
) : client === null ? ( ) : client === null ? (
<Button variant="secondary" size="xl" onClick={() => setDialog("setup")} className="ml-auto min-w-40"> <Button variant="secondary" size="xl" onClick={() => setDialog("setup")} className="min-w-40">
{t("btn.setupClient")} {t("btn.setupClient")}
</Button> </Button>
) : null} ) : null}
</div>
</div> </div>
{anyUp && !running && !transitioning && ( {anyUp && !running && !transitioning && (
<p className="mt-3 text-sm text-muted">{t("overview.partial")}</p> <p className="mt-3 text-sm text-muted">{t("overview.partial")}</p>
+8 -2
View File
@@ -2,6 +2,8 @@ import { useEffect, useState } from "react";
import { api, asUiError, type UiError } from "@/lib/api"; import { api, asUiError, type UiError } from "@/lib/api";
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 { PasswordInput } from "@/components/ui/password-input";
import { AccountsCard } from "@/screens/AccountsCard";
import { useHuman, useT } from "@/i18n"; import { useHuman, useT } from "@/i18n";
export function PlayersPage({ serverId }: { serverId: string }) { export function PlayersPage({ serverId }: { serverId: string }) {
@@ -14,6 +16,7 @@ export function PlayersPage({ serverId }: { serverId: string }) {
const [busy, setBusy] = useState(false); const [busy, setBusy] = useState(false);
const [error, setError] = useState<UiError | null>(null); const [error, setError] = useState<UiError | null>(null);
const [done, setDone] = useState<string | null>(null); const [done, setDone] = useState<string | null>(null);
const [created, setCreated] = useState(0);
useEffect(() => { useEffect(() => {
let alive = true; let alive = true;
@@ -33,6 +36,7 @@ export function PlayersPage({ serverId }: { serverId: string }) {
try { try {
await api.createAccount(serverId, username, password, admin); await api.createAccount(serverId, username, password, admin);
setDone(username); setDone(username);
setCreated((n) => n + 1);
setUsername(""); setUsername("");
setPassword(""); setPassword("");
} catch (e) { } catch (e) {
@@ -44,7 +48,7 @@ export function PlayersPage({ serverId }: { serverId: string }) {
const input = "w-72 rounded-md border border-line bg-bg px-3 py-2.5 text-[15px] outline-none focus:border-gold"; const input = "w-72 rounded-md border border-line bg-bg px-3 py-2.5 text-[15px] outline-none focus:border-gold";
return ( return (
<div className="max-w-xl"> <div className="max-w-3xl">
<h1 className="text-2xl font-semibold">{t("players.title")}</h1> <h1 className="text-2xl font-semibold">{t("players.title")}</h1>
<p className="mt-1 text-muted">{t("q.players")}</p> <p className="mt-1 text-muted">{t("q.players")}</p>
@@ -59,7 +63,7 @@ export function PlayersPage({ serverId }: { serverId: string }) {
</div> </div>
<div> <div>
<label htmlFor="acc-pass" className="text-sm text-muted">{t("players.password")}</label> <label htmlFor="acc-pass" className="text-sm text-muted">{t("players.password")}</label>
<input id="acc-pass" type="password" className={input + " mt-1 block"} value={password} onChange={(e) => setPassword(e.target.value)} autoComplete="new-password" /> <PasswordInput id="acc-pass" className={input + " mt-1 block"} value={password} onChange={(e) => setPassword(e.target.value)} autoComplete="new-password" />
</div> </div>
<label className="flex cursor-pointer items-start gap-2 text-sm"> <label className="flex cursor-pointer items-start gap-2 text-sm">
<input type="checkbox" checked={admin} onChange={(e) => setAdmin(e.target.checked)} className="mt-1" /> <input type="checkbox" checked={admin} onChange={(e) => setAdmin(e.target.checked)} className="mt-1" />
@@ -79,6 +83,8 @@ export function PlayersPage({ serverId }: { serverId: string }) {
</p> </p>
)} )}
</Card> </Card>
<AccountsCard serverId={serverId} online={online} reloadKey={created} />
</div> </div>
); );
} }
+154
View File
@@ -0,0 +1,154 @@
import { useCallback, useEffect, useRef, useState } from "react";
import { Check, ChevronDown, Pencil, Plus, Trash2 } from "lucide-react";
import { api, asUiError, type RealmProfile, type UiError } from "@/lib/api";
import { cn } from "@/lib/utils";
import { Button } from "@/components/ui/button";
import { Card } from "@/components/ui/card";
import { useHuman, useT } from "@/i18n";
/** The first `set realmlist` value of a realmlist text, for the small caption under a name. */
function host(data: string): string {
const m = data.match(/^\s*set\s+realmlist\s+(\S+)/im);
return m ? m[1].replace(/"/g, "") : "";
}
/** Named realmlists for the game client, switched with one click: "Solo" for your own server, "PTR" for the shared one, and so on. */
export function RealmlistMenu({ serverId, className }: { serverId: string; className?: string }) {
const t = useT();
const human = useHuman();
const [profiles, setProfiles] = useState<RealmProfile[]>([]);
const [active, setActive] = useState<string | null>(null);
const [open, setOpen] = useState(false);
const [editing, setEditing] = useState<{ id: string | null; name: string; data: string } | null>(null);
const [error, setError] = useState<UiError | null>(null);
const [note, setNote] = useState<string | null>(null);
const box = useRef<HTMLDivElement>(null);
const load = useCallback(async () => {
try {
const v = await api.realmlistProfiles(serverId);
setProfiles(v.profiles);
setActive(v.active);
} catch (e) {
setError(asUiError(e));
}
}, [serverId]);
useEffect(() => {
void load();
}, [load]);
useEffect(() => {
if (!open) return;
const away = (e: MouseEvent) => {
if (box.current && !box.current.contains(e.target as Node)) setOpen(false);
};
document.addEventListener("mousedown", away);
return () => document.removeEventListener("mousedown", away);
}, [open]);
async function choose(p: RealmProfile) {
setError(null);
setNote(null);
try {
await api.realmlistActivate(serverId, p.id);
setActive(p.id);
setNote(t("realm.switched", { name: p.name }));
} catch (e) {
setError(asUiError(e));
}
}
async function remove(p: RealmProfile) {
if (!window.confirm(t("realm.confirmDelete", { name: p.name }))) return;
setError(null);
try {
await api.realmlistDelete(serverId, p.id);
await load();
} catch (e) {
setError(asUiError(e));
}
}
async function save() {
if (!editing) return;
setError(null);
try {
await api.realmlistSave(serverId, editing.id, editing.name, editing.data);
setEditing(null);
await load();
} catch (e) {
setError(asUiError(e));
}
}
const current = profiles.find((p) => p.id === active);
const message = error ? (error.human.code === "unknown" ? error.technical : human(error.human).message) : null;
return (
<div ref={box} className={cn("relative", className)}>
<button
type="button"
onClick={() => setOpen((v) => !v)}
aria-haspopup="menu"
aria-expanded={open}
className="flex h-16 cursor-pointer items-center gap-3 rounded-md border border-line bg-card-2 px-4 text-left transition-colors hover:border-gold/50"
>
<span>
<span className="block text-[11px] uppercase tracking-wide text-muted">{t("realm.label")}</span>
<span className="block max-w-40 truncate text-[15px] font-medium">{current ? current.name : t("realm.other")}</span>
</span>
<ChevronDown className="h-4 w-4 text-muted" aria-hidden />
</button>
{open && (
<div role="menu" className="absolute right-0 top-full z-30 mt-2 w-80 rounded-md border border-line bg-card shadow-2xl">
<ul className="max-h-72 overflow-y-auto py-1">
{profiles.map((p) => (
<li key={p.id} className="group flex items-center">
<button role="menuitemradio" aria-checked={p.id === active} onClick={() => void choose(p)} className="flex min-w-0 flex-1 cursor-pointer items-center gap-3 px-3 py-2 text-left hover:bg-white/5">
<span className="flex h-4 w-4 shrink-0 items-center justify-center text-gold">{p.id === active && <Check className="h-4 w-4" aria-hidden />}</span>
<span className="min-w-0">
<span className="block truncate text-sm">{p.name}</span>
<span className="selectable block truncate text-xs text-muted">{host(p.data)}</span>
</span>
</button>
<button aria-label={t("realm.edit", { name: p.name })} title={t("realm.edit", { name: p.name })} onClick={() => setEditing({ id: p.id, name: p.name, data: p.data.trim() })} className="cursor-pointer p-2 text-muted hover:text-ink">
<Pencil className="h-3.5 w-3.5" aria-hidden />
</button>
<button aria-label={t("realm.delete", { name: p.name })} title={t("realm.delete", { name: p.name })} disabled={profiles.length <= 1} onClick={() => void remove(p)} className="cursor-pointer p-2 text-muted hover:text-bad disabled:cursor-default disabled:opacity-30">
<Trash2 className="h-3.5 w-3.5" aria-hidden />
</button>
</li>
))}
</ul>
<div className="border-t border-line p-1">
<button role="menuitem" onClick={() => { setEditing({ id: null, name: "", data: "" }); setError(null); }} className="flex w-full cursor-pointer items-center gap-2 rounded px-3 py-2 text-sm hover:bg-white/5">
<Plus className="h-4 w-4 text-gold" aria-hidden /> {t("realm.add")}
</button>
</div>
{note && <p className="border-t border-line px-3 py-2 text-xs text-ok" role="status">{note}</p>}
{message && !editing && <p className="border-t border-line px-3 py-2 text-xs text-bad" role="alert">{message}</p>}
</div>
)}
{editing && (
<div className="fixed inset-0 z-50 flex items-center justify-center bg-black/60 p-6" role="presentation">
<Card className="w-full max-w-md p-6 shadow-2xl" role="dialog" aria-modal="true" aria-label={editing.id ? t("realm.editTitle") : t("realm.addTitle")}>
<h2 className="text-lg font-semibold">{editing.id ? t("realm.editTitle") : t("realm.addTitle")}</h2>
<label htmlFor="realm-name" className="mt-4 block text-sm text-muted">{t("realm.name")}</label>
<input id="realm-name" autoFocus maxLength={32} value={editing.name} onChange={(e) => setEditing({ ...editing, name: e.target.value })} placeholder={t("realm.nameHint")} className="mt-1 block w-full rounded-md border border-line bg-bg px-3 py-2.5 text-[15px] outline-none focus:border-gold" />
<label htmlFor="realm-data" className="mt-4 block text-sm text-muted">{t("realm.data")}</label>
<textarea id="realm-data" rows={3} value={editing.data} onChange={(e) => setEditing({ ...editing, data: e.target.value })} placeholder="set realmlist play.example.com" className="selectable mt-1 block w-full rounded-md border border-line bg-bg px-3 py-2.5 font-mono text-sm outline-none focus:border-gold" />
<p className="mt-1 text-xs text-muted">{t("realm.dataHint")}</p>
{message && <p className="mt-3 text-sm text-bad" role="alert">{message}</p>}
<div className="mt-5 flex justify-end gap-2">
<Button variant="ghost" onClick={() => { setEditing(null); setError(null); }}>{t("common.cancel")}</Button>
<Button variant="primary" disabled={!editing.name.trim() || !editing.data.trim()} onClick={() => void save()}>{t("acc.save")}</Button>
</div>
</Card>
</div>
)}
</div>
);
}
+150
View File
@@ -0,0 +1,150 @@
import { useEffect, useMemo, useState } from "react";
import { Loader2 } from "lucide-react";
import { api, asUiError, type ReportContext, type UiError } from "@/lib/api";
import { MAX_LINK, issueUrl, reportBody } from "@/lib/report";
import { Button } from "@/components/ui/button";
import { Card } from "@/components/ui/card";
import { useHuman, useT } 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";
/** A problem report that becomes a prefilled GitHub issue. Nothing is sent from here: the person reviews and submits it on GitHub. */
export function ReportPage({ serverId }: { serverId: string }) {
const t = useT();
const human = useHuman();
const [ctx, setCtx] = useState<ReportContext | null>(null);
const [title, setTitle] = useState("");
const [what, setWhat] = useState("");
const [expected, setExpected] = useState("");
const [steps, setSteps] = useState("");
const [file, setFile] = useState<string | null>(null);
const [busy, setBusy] = useState(false);
const [note, setNote] = useState<string | null>(null);
const [error, setError] = useState<UiError | null>(null);
const [showPreview, setShowPreview] = useState(false);
useEffect(() => {
void api.reportContext(serverId).then(setCtx).catch(() => setCtx(null));
}, [serverId]);
const body = useMemo(
() =>
reportBody({
managerVersion: ctx?.manager_version ?? "",
windows: ctx?.windows ?? "",
installKind: ctx?.install_kind ?? "new",
serverVersion: ctx?.server_version ?? null,
what,
expected,
steps,
diagnostics: file !== null,
}),
[ctx, what, expected, steps, file],
);
const issueTitle = `[Bug] ${title.trim()}`;
const ready = title.trim().length > 0 && what.trim().length > 0;
async function makeFile() {
setBusy(true);
setError(null);
try {
setFile(await api.exportDiagnostics(serverId));
} catch (e) {
setError(asUiError(e));
} finally {
setBusy(false);
}
}
async function openIssue() {
setError(null);
setNote(null);
try {
const full = issueUrl(issueTitle, body);
if (full.length <= MAX_LINK) {
await api.openLink(full);
setNote(t("rep.opened"));
} else {
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)."));
setNote(t("rep.openedLong"));
}
} catch (e) {
setError(asUiError(e));
}
}
async function copy() {
await navigator.clipboard.writeText(`${issueTitle}\n\n${body}`);
setNote(t("rep.copied"));
}
return (
<div className="max-w-2xl">
<h1 className="text-2xl font-semibold">{t("rep.title")}</h1>
<p className="mt-1 text-muted">{t("q.report")}</p>
<p className="mt-3 text-sm text-muted">{t("rep.intro")}</p>
<Card className="mt-6 p-6">
<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">
<dt className="text-muted">{t("rep.manager")}</dt>
<dd>{ctx?.manager_version ?? "…"}</dd>
<dt className="text-muted">{t("rep.windows")}</dt>
<dd>{ctx ? ctx.windows || "—" : "…"}</dd>
<dt className="text-muted">{t("rep.kind")}</dt>
<dd>{ctx ? (ctx.install_kind === "new" ? t("rep.kindNew") : t("rep.kindImported")) : "…"}</dd>
{ctx?.server_version && (
<>
<dt className="text-muted">{t("rep.server")}</dt>
<dd>{ctx.server_version}</dd>
</>
)}
</dl>
</Card>
<Card className="mt-6 p-6">
<div>
<label htmlFor="rep-title" className="text-sm text-muted">{t("rep.summary")}</label>
<input id="rep-title" className={field} value={title} maxLength={100} onChange={(e) => setTitle(e.target.value)} placeholder={t("rep.summaryHint")} />
</div>
<div className="mt-4">
<label htmlFor="rep-what" className="text-sm text-muted">{t("rep.what")}</label>
<textarea id="rep-what" rows={4} className={field} value={what} onChange={(e) => setWhat(e.target.value)} placeholder={t("rep.whatHint")} />
</div>
<div className="mt-4">
<label htmlFor="rep-exp" className="text-sm text-muted">{t("rep.expected")}</label>
<textarea id="rep-exp" rows={2} className={field} value={expected} onChange={(e) => setExpected(e.target.value)} placeholder={t("rep.expectedHint")} />
</div>
<div className="mt-4">
<label htmlFor="rep-steps" className="text-sm text-muted">{t("rep.steps")}</label>
<textarea id="rep-steps" rows={4} className={field} value={steps} onChange={(e) => setSteps(e.target.value)} placeholder={"1.\n2.\n3."} />
</div>
</Card>
<Card className="mt-6 p-6">
<h2 className="font-semibold">{t("rep.attachTitle")}</h2>
<p className="mt-1 text-sm text-muted">{t("rep.attachText")}</p>
<Button className="mt-3" size="sm" disabled={busy} onClick={() => void makeFile()}>
{busy && <Loader2 className="h-4 w-4 animate-spin" aria-hidden />}
{t("rep.makeFile")}
</Button>
{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>
</Card>
<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="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">
{t("rep.preview")}
</button>
</div>
{!ready && <p className="mt-2 text-xs text-muted">{t("rep.needFields")}</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>}
{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>}
</div>
);
}
+21 -23
View File
@@ -1,7 +1,7 @@
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { listen } from "@tauri-apps/api/event";
import { open } from "@tauri-apps/plugin-dialog"; import { open } from "@tauri-apps/plugin-dialog";
import { ChevronDown, ChevronRight, Loader2 } from "lucide-react"; import { ChevronDown, ChevronRight, Loader2 } from "lucide-react";
import { applyServerUpdate, clearServerUpdateResult, useServerUpdate } from "@/lib/serverUpdate";
import { api, asUiError, type UiError, type UpdatePreview, type UpdateTxn } from "@/lib/api"; import { api, asUiError, type UiError, type UpdatePreview, type UpdateTxn } from "@/lib/api";
import { Button } from "@/components/ui/button"; import { Button } from "@/components/ui/button";
import { Card } from "@/components/ui/card"; import { Card } from "@/components/ui/card";
@@ -17,29 +17,39 @@ function mb(bytes: number) {
export function SettingsHome({ serverId }: { serverId: string }) { export function SettingsHome({ serverId }: { serverId: string }) {
const { t } = useI18n(); const { t } = useI18n();
const upd = useServerUpdate(serverId);
const human = useHuman(); const human = useHuman();
const [preview, setPreview] = useState<UpdatePreview | null>(null); const [preview, setPreview] = useState<UpdatePreview | null>(null);
const [pending, setPending] = useState<UpdateTxn | null>(null); const [pending, setPending] = useState<UpdateTxn | null>(null);
const [busy, setBusy] = useState<"check" | "update" | "rollback" | null>(null); const [localBusy, setBusy] = useState<"check" | "rollback" | null>(null);
const [progress, setProgress] = useState<{ step: string; percent: number } | null>(null); // an update keeps running in the background when this tab is left, so its state is the shared one
const [error, setError] = useState<UiError | null>(null); const busy = upd.applying ? "update" : localBusy;
const [done, setDone] = useState<string | null>(null); const progress = upd.applying ? { step: upd.step ?? "Starting", percent: upd.percent } : null;
const [localError, setError] = useState<UiError | null>(null);
const error = localError ?? upd.uiError;
const [localDone, setDone] = useState<string | null>(null);
const done = upd.result && "committed" in upd.result ? t("upd.updatedTo", { v: upd.result.committed }) : localDone;
const [choices, setChoices] = useState<Record<string, "keep" | "replace">>({}); const [choices, setChoices] = useState<Record<string, "keep" | "replace">>({});
const [advanced, setAdvanced] = useState(false); const [advanced, setAdvanced] = useState(false);
const [source, setSource] = useState(""); const [source, setSource] = useState("");
useEffect(() => { useEffect(() => {
void api.pendingUpdate(serverId).then(setPending).catch(() => {}); void api.pendingUpdate(serverId).then(setPending).catch(() => {});
const un = listen<{ step: string; percent: number }>("update-progress", (e) => setProgress(e.payload));
return () => {
void un.then((f) => f());
};
}, [serverId]); }, [serverId]);
// the update finished (possibly while another tab was open): drop the stale preview, show what is left to decide
useEffect(() => {
if (!upd.result) return;
setPreview(null);
if ("pending" in upd.result) setPending(upd.result.pending);
else void api.pendingUpdate(serverId).then(setPending).catch(() => {});
}, [upd.result, serverId]);
async function check() { async function check() {
setBusy("check"); setBusy("check");
setError(null); setError(null);
setDone(null); setDone(null);
clearServerUpdateResult(serverId);
setPreview(null); setPreview(null);
try { try {
const p = await api.checkUpdate(serverId, source.trim() || undefined); const p = await api.checkUpdate(serverId, source.trim() || undefined);
@@ -53,21 +63,9 @@ export function SettingsHome({ serverId }: { serverId: string }) {
} }
async function update() { async function update() {
setBusy("update");
setError(null); setError(null);
setProgress({ step: "Starting", percent: 0 }); setDone(null);
try { await applyServerUpdate(serverId, { choices, source: source.trim() || undefined });
const out = await api.applyUpdate(serverId, choices, source.trim() || undefined);
setPreview(null);
if (out.txn.state === "committed") setDone(t("upd.updatedTo", { v: out.txn.to_version ?? "" }));
else setPending(out.txn);
} catch (e) {
setError(asUiError(e));
} finally {
setBusy(null);
setProgress(null);
void api.pendingUpdate(serverId).then(setPending).catch(() => {});
}
} }
async function rollback(txn: UpdateTxn) { async function rollback(txn: UpdateTxn) {
+10 -2
View File
@@ -1,5 +1,5 @@
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { Archive, Bot, Gauge, Globe, Server, Settings, Terminal, Users, type LucideIcon } from "lucide-react"; import { Archive, Bot, Bug, Gauge, Globe, Puzzle, Server, Settings, Terminal, Users, type LucideIcon } from "lucide-react";
import { type ServerSummary } from "@/lib/api"; import { type ServerSummary } from "@/lib/api";
import { useT, type Key } from "@/i18n"; import { useT, type Key } from "@/i18n";
import logo from "@/assets/logo.png"; import logo from "@/assets/logo.png";
@@ -11,21 +11,25 @@ import { BackupsPage } from "@/screens/BackupsPage";
import { PlayersPage } from "@/screens/PlayersPage"; import { PlayersPage } from "@/screens/PlayersPage";
import { SettingsHome } from "@/screens/SettingsHome"; import { SettingsHome } from "@/screens/SettingsHome";
import { FriendsPage } from "@/screens/FriendsPage"; import { FriendsPage } from "@/screens/FriendsPage";
import { ReportPage } from "@/screens/ReportPage";
import { ModulesPage } from "@/screens/ModulesPage";
import { ConsolePage } from "@/screens/ConsolePage"; import { ConsolePage } from "@/screens/ConsolePage";
import { Button } from "@/components/ui/button"; import { Button } from "@/components/ui/button";
import { startServerUpdatePolling, useServerUpdate } from "@/lib/serverUpdate"; import { startServerUpdatePolling, useServerUpdate } from "@/lib/serverUpdate";
import { startClientPolling } from "@/lib/clientUpdate"; import { startClientPolling } from "@/lib/clientUpdate";
type Page = "overview" | "bots" | "server" | "players" | "friends" | "backups" | "console" | "settings"; type Page = "overview" | "bots" | "server" | "modules" | "players" | "friends" | "backups" | "console" | "report" | "settings";
const NAV: { id: Page; label: Key; icon: LucideIcon; question: Key }[] = [ const NAV: { id: Page; label: Key; icon: LucideIcon; question: Key }[] = [
{ id: "overview", label: "nav.overview", icon: Gauge, question: "q.overview" }, { id: "overview", label: "nav.overview", icon: Gauge, question: "q.overview" },
{ id: "bots", label: "nav.bots", icon: Bot, question: "q.bots" }, { id: "bots", label: "nav.bots", icon: Bot, question: "q.bots" },
{ id: "server", label: "nav.server", icon: Server, question: "q.server" }, { id: "server", label: "nav.server", icon: Server, question: "q.server" },
{ id: "modules", label: "nav.modules", icon: Puzzle, question: "q.modules" },
{ id: "players", label: "nav.players", icon: Users, question: "q.players" }, { id: "players", label: "nav.players", icon: Users, question: "q.players" },
{ id: "friends", label: "nav.friends", icon: Globe, question: "q.friends" }, { id: "friends", label: "nav.friends", icon: Globe, question: "q.friends" },
{ id: "backups", label: "nav.backups", icon: Archive, question: "q.backups" }, { id: "backups", label: "nav.backups", icon: Archive, question: "q.backups" },
{ id: "console", label: "nav.console", icon: Terminal, question: "q.console" }, { id: "console", label: "nav.console", icon: Terminal, question: "q.console" },
{ id: "report", label: "nav.report", icon: Bug, question: "q.report" },
{ id: "settings", label: "nav.settings", icon: Settings, question: "q.settings" }, { id: "settings", label: "nav.settings", icon: Settings, question: "q.settings" },
]; ];
@@ -108,6 +112,10 @@ export function Shell(props: {
<SettingsPage key={`${server.id}-${page}`} serverId={server.id} scope={page} title={t(current.label)} question={t(current.question)} /> <SettingsPage key={`${server.id}-${page}`} serverId={server.id} scope={page} title={t(current.label)} question={t(current.question)} />
) : page === "console" ? ( ) : page === "console" ? (
<ConsolePage key={server.id} serverId={server.id} /> <ConsolePage key={server.id} serverId={server.id} />
) : page === "modules" ? (
<ModulesPage key={server.id} serverId={server.id} />
) : page === "report" ? (
<ReportPage key={server.id} serverId={server.id} />
) : page === "friends" ? ( ) : page === "friends" ? (
<FriendsPage key={server.id} serverId={server.id} /> <FriendsPage key={server.id} serverId={server.id} />
) : page === "settings" ? ( ) : page === "settings" ? (
+1
View File
@@ -39,6 +39,7 @@ R = [
("AutoBroadcast.Timer", "int", "world", "Announcement interval", "Time between automatic announcements.", 60000, 5000, 3600000, "ms", True, "world", False), ("AutoBroadcast.Timer", "int", "world", "Announcement interval", "Time between automatic announcements.", 60000, 5000, 3600000, "ms", True, "world", False),
("Warden.Enabled", "bool", "advanced", "Anti-cheat (Warden)", "Enables the client anti-cheat check. Usually unnecessary on a private server.", True, None, None, None, True, "world", False), ("Warden.Enabled", "bool", "advanced", "Anti-cheat (Warden)", "Enables the client anti-cheat check. Usually unnecessary on a private server.", True, None, None, None, True, "world", False),
("MapUpdateInterval", "int", "performance", "Map update interval", "How often the world updates maps. Lower is smoother but uses more CPU.", 10, 1, 1000, "ms", True, "world", False), ("MapUpdateInterval", "int", "performance", "Map update interval", "How often the world updates maps. Lower is smoother but uses more CPU.", 10, 1, 1000, "ms", True, "world", False),
("MapUpdate.Threads", "int", "performance", "CPU cores for the world", "How many processor cores the world uses to update maps. Companions spread over several maps run much faster with more than one. Takes effect when the world server restarts.", 4, 1, 16, None, False, "world", False),
("MinWorldUpdateTime", "int", "performance", "Minimum world update time", "Shortest time between world updates. Raise it to reduce CPU use.", 1, 1, 1000, "ms", True, "world", False), ("MinWorldUpdateTime", "int", "performance", "Minimum world update time", "Shortest time between world updates. Raise it to reduce CPU use.", 1, 1, 1000, "ms", True, "world", False),
("ThreadPool", "int", "performance", "Worker threads", "Number of background worker threads. More helps large populations.", 2, 1, 32, None, True, "full", False), ("ThreadPool", "int", "performance", "Worker threads", "Number of background worker threads. More helps large populations.", 2, 1, 32, None, True, "full", False),
("Network.Threads", "int", "network", "Network threads", "Threads that handle player connections. One is enough for small servers.", 1, 1, 16, None, True, "full", False), ("Network.Threads", "int", "network", "Network threads", "Threads that handle player connections. One is enough for small servers.", 1, 1, 16, None, True, "full", False),
+247
View File
@@ -0,0 +1,247 @@
"""Poor man's sampling profiler for a running worldserver (Windows, 64-bit, needs worldserver.pdb next to the exe).
python tools/sample_stacks.py <pid> [seconds=30] [hz=100] [--threads N] [--depth D] [--out report.txt]
Every 1/hz seconds each busy thread is suspended for a moment, its call stack is walked with dbghelp and symbolised from
the PDB, then the thread is resumed. Prints, per thread, the functions that were on the stack most often (inclusive) and
the ones that were running (self). Only for diagnosis: sampling slows the process a little.
"""
import argparse
import collections
import ctypes
import ctypes.wintypes as wt
import os
import sys
import time
k32 = ctypes.WinDLL("kernel32", use_last_error=True)
dbg = ctypes.WinDLL("dbghelp")
THREAD_ALL = 0x1FFFFF
PROCESS_ALL = 0x1FFFFF
CONTEXT_AMD64 = 0x100000
CONTEXT_CONTROL = CONTEXT_AMD64 | 0x1
CONTEXT_INTEGER = CONTEXT_AMD64 | 0x2
TH32CS_SNAPTHREAD = 0x4
class THREADENTRY32(ctypes.Structure):
_fields_ = [("dwSize", wt.DWORD), ("cntUsage", wt.DWORD), ("th32ThreadID", wt.DWORD), ("th32OwnerProcessID", wt.DWORD),
("tpBasePri", wt.LONG), ("tpDeltaPri", wt.LONG), ("dwFlags", wt.DWORD)]
class M128A(ctypes.Structure):
_fields_ = [("Low", ctypes.c_ulonglong), ("High", ctypes.c_longlong)]
class CONTEXT(ctypes.Structure):
_pack_ = 16
_fields_ = [("P1Home", ctypes.c_ulonglong), ("P2Home", ctypes.c_ulonglong), ("P3Home", ctypes.c_ulonglong),
("P4Home", ctypes.c_ulonglong), ("P5Home", ctypes.c_ulonglong), ("P6Home", ctypes.c_ulonglong),
("ContextFlags", wt.DWORD), ("MxCsr", wt.DWORD),
("SegCs", wt.WORD), ("SegDs", wt.WORD), ("SegEs", wt.WORD), ("SegFs", wt.WORD), ("SegGs", wt.WORD), ("SegSs", wt.WORD),
("EFlags", wt.DWORD),
("Dr0", ctypes.c_ulonglong), ("Dr1", ctypes.c_ulonglong), ("Dr2", ctypes.c_ulonglong), ("Dr3", ctypes.c_ulonglong),
("Dr6", ctypes.c_ulonglong), ("Dr7", ctypes.c_ulonglong),
("Rax", ctypes.c_ulonglong), ("Rcx", ctypes.c_ulonglong), ("Rdx", ctypes.c_ulonglong), ("Rbx", ctypes.c_ulonglong),
("Rsp", ctypes.c_ulonglong), ("Rbp", ctypes.c_ulonglong), ("Rsi", ctypes.c_ulonglong), ("Rdi", ctypes.c_ulonglong),
("R8", ctypes.c_ulonglong), ("R9", ctypes.c_ulonglong), ("R10", ctypes.c_ulonglong), ("R11", ctypes.c_ulonglong),
("R12", ctypes.c_ulonglong), ("R13", ctypes.c_ulonglong), ("R14", ctypes.c_ulonglong), ("R15", ctypes.c_ulonglong),
("Rip", ctypes.c_ulonglong),
("FltSave", ctypes.c_ubyte * 512),
("VectorRegister", M128A * 26), ("VectorControl", ctypes.c_ulonglong),
("DebugControl", ctypes.c_ulonglong), ("LastBranchToRip", ctypes.c_ulonglong), ("LastBranchFromRip", ctypes.c_ulonglong),
("LastExceptionToRip", ctypes.c_ulonglong), ("LastExceptionFromRip", ctypes.c_ulonglong)]
class ADDRESS64(ctypes.Structure):
_fields_ = [("Offset", ctypes.c_ulonglong), ("Segment", wt.WORD), ("Mode", wt.DWORD)]
class KDHELP64(ctypes.Structure):
_fields_ = [("Thread", ctypes.c_ulonglong), ("ThCallbackStack", wt.DWORD), ("ThCallbackBStore", wt.DWORD),
("NextCallback", wt.DWORD), ("FramePointer", wt.DWORD), ("KiCallUserMode", ctypes.c_ulonglong),
("KeUserCallbackDispatcher", ctypes.c_ulonglong), ("SystemRangeStart", ctypes.c_ulonglong),
("KiUserExceptionDispatcher", ctypes.c_ulonglong), ("StackBase", ctypes.c_ulonglong),
("StackLimit", ctypes.c_ulonglong), ("Reserved", ctypes.c_ulonglong * 5)]
class STACKFRAME64(ctypes.Structure):
_fields_ = [("AddrPC", ADDRESS64), ("AddrReturn", ADDRESS64), ("AddrFrame", ADDRESS64), ("AddrStack", ADDRESS64),
("AddrBStore", ADDRESS64), ("FuncTableEntry", ctypes.c_void_p), ("Params", ctypes.c_ulonglong * 4),
("Far", wt.BOOL), ("Virtual", wt.BOOL), ("Reserved", ctypes.c_ulonglong * 3), ("KdHelp", KDHELP64)]
MAX_NAME = 512
class SYMBOL_INFO(ctypes.Structure):
_fields_ = [("SizeOfStruct", wt.ULONG), ("TypeIndex", wt.ULONG), ("Reserved", ctypes.c_ulonglong * 2), ("Index", wt.ULONG),
("Size", wt.ULONG), ("ModBase", ctypes.c_ulonglong), ("Flags", wt.ULONG), ("Value", ctypes.c_ulonglong),
("Address", ctypes.c_ulonglong), ("Register", wt.ULONG), ("Scope", wt.ULONG), ("Tag", wt.ULONG),
("NameLen", wt.ULONG), ("MaxNameLen", wt.ULONG), ("Name", ctypes.c_char * MAX_NAME)]
k32.OpenProcess.restype = wt.HANDLE
k32.OpenThread.restype = wt.HANDLE
k32.GetCurrentProcess.restype = wt.HANDLE
dbg.SymFunctionTableAccess64.restype = ctypes.c_void_p
dbg.SymGetModuleBase64.restype = ctypes.c_ulonglong
dbg.SymFunctionTableAccess64.argtypes = [wt.HANDLE, ctypes.c_ulonglong]
dbg.SymGetModuleBase64.argtypes = [wt.HANDLE, ctypes.c_ulonglong]
dbg.StackWalk64.argtypes = [wt.DWORD, wt.HANDLE, wt.HANDLE, ctypes.POINTER(STACKFRAME64), ctypes.c_void_p, ctypes.c_void_p,
ctypes.c_void_p, ctypes.c_void_p, ctypes.c_void_p]
dbg.SymFromAddr.argtypes = [wt.HANDLE, ctypes.c_ulonglong, ctypes.POINTER(ctypes.c_ulonglong), ctypes.POINTER(SYMBOL_INFO)]
dbg.SymInitialize.argtypes = [wt.HANDLE, ctypes.c_char_p, wt.BOOL]
dbg.SymSetOptions.argtypes = [wt.DWORD]
_name_cache = {}
def symbol(proc, addr):
# cache by 64-byte block: good enough to group samples, saves a lookup per frame
key = addr >> 4
hit = _name_cache.get(key)
if hit is not None:
return hit
info = SYMBOL_INFO()
info.SizeOfStruct = 88 # sizeof(SYMBOL_INFO) in the Windows headers (Name[1])
info.MaxNameLen = MAX_NAME - 1
disp = ctypes.c_ulonglong(0)
if dbg.SymFromAddr(proc, addr, ctypes.byref(disp), ctypes.byref(info)):
name = info.Name[: info.NameLen].decode("utf-8", "replace")
else:
name = f"?{addr:#x}"
_name_cache[key] = name
return name
def threads_of(pid):
snap = k32.CreateToolhelp32Snapshot(TH32CS_SNAPTHREAD, 0)
out = []
te = THREADENTRY32()
te.dwSize = ctypes.sizeof(te)
ok = k32.Thread32First(snap, ctypes.byref(te))
while ok:
if te.th32OwnerProcessID == pid:
out.append(te.th32ThreadID)
ok = k32.Thread32Next(snap, ctypes.byref(te))
k32.CloseHandle(snap)
return out
def cpu_time(h):
c, e, kt, ut = (wt.FILETIME() for _ in range(4))
k32.GetThreadTimes(h, ctypes.byref(c), ctypes.byref(e), ctypes.byref(kt), ctypes.byref(ut))
f = lambda x: (x.dwHighDateTime << 32 | x.dwLowDateTime) / 1e7
return f(kt) + f(ut)
def aligned_context():
raw = ctypes.create_string_buffer(ctypes.sizeof(CONTEXT) + 32)
addr = ctypes.addressof(raw)
off = (-addr) % 16
ctx = CONTEXT.from_buffer(raw, off)
return raw, ctx
def stack(proc, th, depth):
raw, ctx = aligned_context()
ctx.ContextFlags = CONTEXT_CONTROL | CONTEXT_INTEGER
if k32.SuspendThread(th) == 0xFFFFFFFF:
return None
try:
if not k32.GetThreadContext(th, ctypes.byref(ctx)):
return None
frame = STACKFRAME64()
frame.AddrPC.Offset, frame.AddrPC.Mode = ctx.Rip, 3
frame.AddrFrame.Offset, frame.AddrFrame.Mode = ctx.Rsp, 3
frame.AddrStack.Offset, frame.AddrStack.Mode = ctx.Rsp, 3
addrs = [ctx.Rip]
for _ in range(depth):
ok = dbg.StackWalk64(0x8664, proc, th, ctypes.byref(frame), ctypes.byref(ctx), None,
dbg.SymFunctionTableAccess64, dbg.SymGetModuleBase64, None)
if not ok or frame.AddrPC.Offset == 0:
break
addrs.append(frame.AddrPC.Offset)
finally:
k32.ResumeThread(th)
return addrs
def main():
ap = argparse.ArgumentParser()
ap.add_argument("pid", type=int)
ap.add_argument("seconds", type=float, nargs="?", default=30)
ap.add_argument("hz", type=float, nargs="?", default=100)
ap.add_argument("--threads", type=int, default=5)
ap.add_argument("--depth", type=int, default=40)
ap.add_argument("--out")
ap.add_argument("--symbols", help="symbol path (folder with worldserver.pdb)")
ap.add_argument("--under", action="append", default=[], help="function name: also report what it spends its time in (its direct callees); repeatable")
a = ap.parse_args()
proc = k32.OpenProcess(PROCESS_ALL, False, a.pid)
if not proc:
sys.exit("cannot open the process (run as the same user)")
dbg.SymSetOptions(0x2 | 0x4 | 0x10 | 0x200) # UNDNAME | DEFERRED_LOADS | LOAD_LINES | FAIL_CRITICAL_ERRORS off
if not dbg.SymInitialize(proc, a.symbols.encode() if a.symbols else None, True):
sys.exit("SymInitialize failed")
tids = threads_of(a.pid)
handles = {t: k32.OpenThread(THREAD_ALL, False, t) for t in tids}
t0 = {t: cpu_time(h) for t, h in handles.items()}
time.sleep(2)
busy = sorted(((cpu_time(h) - t0[t]) / 2 * 100, t) for t, h in handles.items())[::-1]
chosen = [t for pct, t in busy[: a.threads] if pct > 3]
print("sampling threads:", ", ".join(f"{t} ({pct:.0f}%)" for pct, t in busy[: a.threads] if pct > 3), flush=True)
incl = {t: collections.Counter() for t in chosen}
selfc = {t: collections.Counter() for t in chosen}
samples = {t: 0 for t in chosen}
callees = {t: {u: collections.Counter() for u in a.under} for t in chosen}
period = 1.0 / a.hz
end = time.time() + a.seconds
first = True
while time.time() < end:
for t in chosen:
addrs = stack(proc, handles[t], a.depth)
if not addrs:
continue
names = [symbol(proc, ad) for ad in addrs]
samples[t] += 1
selfc[t][names[0]] += 1
for n in set(names):
incl[t][n] += 1
for u in a.under:
for i, n in enumerate(names):
if n == u and i > 0:
callees[t][u][names[i - 1]] += 1
break
if first:
print("first samples taken", flush=True)
first = False
time.sleep(period)
lines = []
for t in chosen:
n = max(1, samples[t])
lines.append(f"\n=== thread {t}: {samples[t]} samples")
lines.append("-- running (self) --")
for name, c in selfc[t].most_common(25):
lines.append(f"{c * 100 / n:5.1f}% {name[:150]}")
lines.append("-- on the stack (inclusive) --")
for name, c in incl[t].most_common(45):
lines.append(f"{c * 100 / n:5.1f}% {name[:150]}")
for u in a.under:
lines.append(f"-- inside {u}: where its time goes (share of ALL samples) --")
for name, c in callees[t][u].most_common(15):
lines.append(f"{c * 100 / n:5.1f}% {name[:150]}")
text = "\n".join(lines)
print(text)
if a.out:
open(a.out, "w", encoding="utf-8").write(text)
if __name__ == "__main__":
main()