mirror of
https://github.com/Corfirean/coa-server-manager.git
synced 2026-11-19 19:25:56 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
fac6ce469a | ||
|
|
f22cedd963 | ||
|
|
0b5f12941c | ||
|
|
f3fc14b55a | ||
|
|
beaec7d27e | ||
|
|
8490dc9983 | ||
|
|
3f8abcbbe8 | ||
|
|
b3c50a7b39 | ||
|
|
bbdad37e40 | ||
|
|
0ed4d5e268 | ||
|
|
b13ee55bb9 | ||
|
|
51a45db8cb | ||
|
|
3f700ee8f4 | ||
|
|
277ebba847 | ||
|
|
9a0b815937 | ||
|
|
78b84e11c2 | ||
|
|
6aea9011f9 | ||
|
|
171d9a2bf8 | ||
|
|
0d6d8a0db8 | ||
|
|
3940506987 | ||
|
|
654b7cddd3 | ||
|
|
f8301d7394 | ||
|
|
cd3a963f70 | ||
|
|
6c771fae20 | ||
|
|
cfe0889a4f | ||
|
|
f25a1d425d | ||
|
|
b5e4a38d7d | ||
|
|
07ec22798f | ||
|
|
5d865fcaea | ||
|
|
a67d51804b | ||
|
|
7c096a4844 | ||
|
|
b90b377fc3 | ||
|
|
a02130f587 | ||
|
|
f4e36f21eb | ||
|
|
65c9945626 | ||
|
|
f13398bbd7 | ||
|
|
f05f94ba01 | ||
|
|
c39a7a0ac7 | ||
|
|
e8367354ef | ||
|
|
461fa035d0 | ||
|
|
3edc600f97 | ||
|
|
c3d87e1ff2 | ||
|
|
d2496603e7 | ||
|
|
2eea0e117c | ||
|
|
58b5ddeb07 |
No files matched your search
Generated
+14
-3
@@ -491,7 +491,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "coa-core"
|
name = "coa-core"
|
||||||
version = "0.6.1"
|
version = "0.6.6"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"base64 0.22.1",
|
"base64 0.22.1",
|
||||||
"chrono",
|
"chrono",
|
||||||
@@ -499,6 +499,7 @@ dependencies = [
|
|||||||
"ed25519-dalek",
|
"ed25519-dalek",
|
||||||
"fs4",
|
"fs4",
|
||||||
"hex",
|
"hex",
|
||||||
|
"if-addrs",
|
||||||
"num-bigint",
|
"num-bigint",
|
||||||
"rand_core",
|
"rand_core",
|
||||||
"reqwest 0.12.28",
|
"reqwest 0.12.28",
|
||||||
@@ -519,7 +520,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "coa-release"
|
name = "coa-release"
|
||||||
version = "0.6.1"
|
version = "0.6.6"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"chrono",
|
"chrono",
|
||||||
"coa-core",
|
"coa-core",
|
||||||
@@ -528,7 +529,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "coa-server-manager"
|
name = "coa-server-manager"
|
||||||
version = "0.6.1"
|
version = "0.6.6"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"coa-core",
|
"coa-core",
|
||||||
"serde",
|
"serde",
|
||||||
@@ -1913,6 +1914,16 @@ dependencies = [
|
|||||||
"icu_properties",
|
"icu_properties",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "if-addrs"
|
||||||
|
version = "0.15.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "c0a05c691e1fae256cf7013d99dad472dc52d5543322761f83ec8d47eab40d2b"
|
||||||
|
dependencies = [
|
||||||
|
"libc",
|
||||||
|
"windows-sys 0.61.2",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "indexmap"
|
name = "indexmap"
|
||||||
version = "1.9.3"
|
version = "1.9.3"
|
||||||
|
|||||||
+1
-1
@@ -3,7 +3,7 @@ resolver = "2"
|
|||||||
members = ["crates/coa-core", "crates/coa-release", "src-tauri"]
|
members = ["crates/coa-core", "crates/coa-release", "src-tauri"]
|
||||||
|
|
||||||
[workspace.package]
|
[workspace.package]
|
||||||
version = "0.6.1"
|
version = "0.6.6"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
license = "AGPL-3.0-only"
|
license = "AGPL-3.0-only"
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,104 @@
|
|||||||
|
# Urgent update hotfix
|
||||||
|
|
||||||
|
Deadline: 2026-10-06. This checkout starts at the exact v0.6.4 tag, commit
|
||||||
|
6c771fa, and excludes the ongoing isolated-trial/recovery redesign.
|
||||||
|
|
||||||
|
The client accepts checksum compatibility only from a verified signed manifest and only
|
||||||
|
for an Applied migration. It never updates the historical checksum, reruns historical
|
||||||
|
SQL, or excuses a Running/Failed ledger row. A server package must explicitly list the
|
||||||
|
verified published variants and append corrections under new migration IDs.
|
||||||
|
|
||||||
|
Current local evidence: the locked workspace tests passed, including 252 core tests
|
||||||
|
run serially. Six frontend logic tests and the frontend production build passed.
|
||||||
|
The hotfix runtime was tested against the exact signed candidate manifest on the marked
|
||||||
|
CoA/Wildcard fixture. Both published repair checksums were accepted independently in
|
||||||
|
both worlds, with zero migration executions, unchanged historical checksums, and unchanged
|
||||||
|
account, character and inventory counts. The original ledger rows were restored after
|
||||||
|
the test, and all fixture processes were stopped. A real Running or Failed repair row in
|
||||||
|
either world was rejected before staging or creating a transaction, with unchanged world
|
||||||
|
executable and installation metadata. Tests use independent hotfix metadata so experimental
|
||||||
|
transaction formats are not confused with the 0.6.4 upgrade path. Windows journal writes also use flushed
|
||||||
|
atomic replacement with long-path support. Changelog validation passed.
|
||||||
|
|
||||||
|
Additional guards implemented:
|
||||||
|
|
||||||
|
- Read migration history without creating its ledger before downloading or replacing files.
|
||||||
|
- Reject missing journals, invalid identities, paths, hashes and inconsistent operations.
|
||||||
|
Durable completed-cleanup markers distinguish interrupted pruning from a lost journal.
|
||||||
|
- Preserve all backups while an update is unfinished or its journal is damaged.
|
||||||
|
- Verify saved-file hashes and the complete database/configuration recovery point before
|
||||||
|
stopping services or changing files/databases. New snapshots include configuration hashes;
|
||||||
|
update journals bind their backup metadata to a hash.
|
||||||
|
- Surface state-reading errors in Settings and disable applying until the disk state is
|
||||||
|
successfully read. Checking again refreshes that state.
|
||||||
|
- Verify every extracted SQL artifact before taking the update snapshot or replacing
|
||||||
|
server files; missing files, invalid IDs, duplicate migrations and checksum disagreements
|
||||||
|
reject the update early. SQL application repeats the integrity check immediately before use.
|
||||||
|
- Count unapplied migrations in the active and secondary realms, counting shared auth once.
|
||||||
|
Matching versions and files do not hide remaining database work. Preview reads history
|
||||||
|
under the installation lock; a stopped database is temporarily started for inspection
|
||||||
|
and stopped again when no game services are running.
|
||||||
|
- Reread the disk state after every update/recovery attempt, including failed attempts and
|
||||||
|
background updates. Unfinished or unreadable state blocks another application in the UI.
|
||||||
|
- Acquire the installation lock before checking and deleting a backup.
|
||||||
|
|
||||||
|
Latest real-runtime test used the independently copied, doubly marked fixture
|
||||||
|
`C:\games\coa-schema-fixture-chaos-20261005-v1` and signed candidate `0.261005.24`, manifest SHA-256
|
||||||
|
`1284b1273815209c9621b6d173a2211bae316f33462ccbe8b578e53b8d26fb5b`.
|
||||||
|
All 1748 SQL artifacts passed verification after authenticated archive extraction.
|
||||||
|
Removing one repair record separately in CoA and Wildcard increased the pending count
|
||||||
|
by exactly one; restoring its original record restored the original count. No migrations
|
||||||
|
were executed, player counts were preserved and fixture services were stopped afterward.
|
||||||
|
The source checkout remains uncommitted; these results are not an installer acceptance report.
|
||||||
|
|
||||||
|
Additional acceptance on 2026-10-06: a new independent installation/database copy at
|
||||||
|
`C:\games\coa-schema-fixture-chaos-064-transition-20261006` received the authenticated
|
||||||
|
published `0.261005.22` program files, original CRLF repair checksum, and a deliberately
|
||||||
|
missing Wildcard table in both realms. The production hotfix update pipeline committed
|
||||||
|
signed candidate `0.261005.24`, repaired both realms, passed schema checks and actual
|
||||||
|
bundled-Python server startup, and preserved the selected account, character, item and
|
||||||
|
inventory fields byte-for-byte. The fixture was stopped afterward. The harness explicitly
|
||||||
|
instruments the launcher to prevent relay submissions and bind to localhost; this is not
|
||||||
|
proof of packaged UI behavior or operating-system network containment.
|
||||||
|
|
||||||
|
Local installer `C:\games\source\manager-065-local-installer-20261006\CoA Server Manager_0.6.5_x64-setup.exe`
|
||||||
|
has SHA-256 `520ee0391d923b92da0a20591e30006c048cdb60156275d7a829918bf1b77491`.
|
||||||
|
Its updater signature and the published 0.6.4 installer's signature passed independent
|
||||||
|
verification with the configured updater public key. Both executables extracted from
|
||||||
|
their exact NSIS packages started, created responsive windows, and were stopped using
|
||||||
|
an independent application/WebView profile. No installer was executed over a user's
|
||||||
|
installation, and no UI update operation was exercised.
|
||||||
|
|
||||||
|
Legacy limitation: old 0.6.4 transaction copies and configuration snapshots without recorded
|
||||||
|
hashes can be checked for presence and declared database hashes, but their original file
|
||||||
|
contents cannot be authenticated retroactively. Missing copies block restoration. This
|
||||||
|
hotfix does not claim that old unchecksummed copies received full integrity verification.
|
||||||
|
|
||||||
|
Remaining release requirements: reproduce the existing-user failures through the published
|
||||||
|
0.6.4 interface, verify legacy unfinished transaction handling on real-runtime fixtures,
|
||||||
|
and execute the exact installer over 0.6.4 in an isolated Windows environment with UI
|
||||||
|
state/settings/server-list verification. Windows native UI automation is unavailable in
|
||||||
|
this session. Packaged startup and signature checks do not satisfy that installer gate.
|
||||||
|
No public release has been made.
|
||||||
|
|
||||||
|
The user subsequently exercised the packaged UI: candidate 0.261005.24 committed and
|
||||||
|
both CoA and Wildcard were shown running. Repeat-check/restart acceptance is still pending.
|
||||||
|
The screenshots exposed an older published package being offered after the local candidate
|
||||||
|
was installed. Follow-up changes reject older packages before preview/database inspection
|
||||||
|
and application and clear a cached offer after a failed recheck. All 253 core tests and
|
||||||
|
seven frontend tests passed. The earlier installer hash above does not include this follow-up;
|
||||||
|
a separately recorded revision is required. Native UI control was subsequently initialized
|
||||||
|
through the deferred node_repl tool, then the user stopped automation with Escape and
|
||||||
|
performed the UI check manually.
|
||||||
|
|
||||||
|
Another user repeat-check exposed the already installed launcher being offered again.
|
||||||
|
The preview now verifies canonical launcher bytes against the current signed package,
|
||||||
|
caches those bytes by SHA-256, and compares only recognized Manager transformations.
|
||||||
|
The actual disposable fixture's repeat preview passed with all 104 files skipped and
|
||||||
|
zero pending SQL. User edits, recorded custom content, and a package with different
|
||||||
|
launcher bytes are not mistaken for that integration. All 254 core tests passed;
|
||||||
|
the strengthened regression test and seven frontend tests also passed. The first
|
||||||
|
preview of a managed launcher may download/extract its authenticated package to build
|
||||||
|
the optional canonical cache. Earlier installer revisions do not include this fix.
|
||||||
|
|
||||||
|
Do not recommend deleting an installation or replacing its player databases.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: added
|
||||||
|
audience: admins
|
||||||
|
title: Choose which item types the auction bot sells
|
||||||
|
---
|
||||||
|
Switch 15 item categories on or off and adjust listing frequency by quality. Labels and descriptions are translated into all six languages. Changes affect new listings; existing auctions remain.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: changed
|
||||||
|
audience: admins
|
||||||
|
title: Module settings now offer translated controls and an enemy damage slider
|
||||||
|
---
|
||||||
|
Configure scaling, auctions and enchantments with translated controls. Module switches no longer appear twice. Modules without settings hide their settings button; short lists need no search. New server builds support dungeon and raid damage from 25% to 200%.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: fixed
|
||||||
|
audience: admins
|
||||||
|
title: Failed server updates restore databases and files together
|
||||||
|
---
|
||||||
|
Updates save a full backup and recover databases and files together. Interrupted SQL is not replayed. Checks cover Wildcard tables and every supported race/class pair, including existing characters. Unfinished updates block startup until recovered.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: added
|
||||||
|
audience: admins
|
||||||
|
title: Configure partial dungeon parties and open-world life steal in module settings
|
||||||
|
---
|
||||||
|
Choose whether Dungeon Finder enters with the current party and enable open-world life steal with a healing percentage from 0 to 100. Available on server builds that support these options.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: added
|
||||||
|
audience: admins
|
||||||
|
title: Configure SQUID Playerbots and prevent conflicting bot systems
|
||||||
|
---
|
||||||
|
The Bots tab shows translated settings for the active bot system. Bot module cards keep enable switches without duplicate settings. Enable one bot system at a time; the Manager checks manual config changes before starting the server. Recovery points also include the SQUID database when installed.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: added
|
||||||
|
audience: players
|
||||||
|
title: Download and update the game client without installing a server
|
||||||
|
---
|
||||||
|
Choose to host a server or connect to someone else's. Players joining a friend can download, update and launch the client, save the host's address and use the Manager without installing a local server.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: added
|
||||||
|
audience: admins
|
||||||
|
title: Imported SquidBots servers warn before replacing their original binary
|
||||||
|
---
|
||||||
|
Imports explain that the original launcher and updater check the server binary hash. Updating that binary requires an explicit choice to keep or replace it.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: added
|
||||||
|
audience: players
|
||||||
|
title: Start your installed server or client without downloading an available update
|
||||||
|
---
|
||||||
|
Choose to update later and keep playing with your installed version. Interrupted server updates still require recovery before startup.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: added
|
||||||
|
audience: admins
|
||||||
|
title: Install a server from a package on Linux, running in Docker (experimental)
|
||||||
|
---
|
||||||
|
Experimental. The Manager creates the database, imports the packaged baseline and starts the server in Docker containers. It needs a Linux server package and your own game data folder.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: fixed
|
||||||
|
audience: admins
|
||||||
|
title: Finish a server update that was blocked by a startup failure
|
||||||
|
---
|
||||||
|
The Manager repairs the launcher import path and lets you retry startup for an already applied update. Successful validation finishes the update without replaying SQL or restoring old databases. Failure details are preserved and rollback remains available.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: added
|
||||||
|
audience: admins
|
||||||
|
title: SquidBots settings follow the options shipped by the module
|
||||||
|
---
|
||||||
|
New settings use the module's descriptions, groups, defaults and value limits while retaining existing translations. Unknown formats or invalid fields use built-in controls so the settings page remains available.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: added
|
||||||
|
audience: admins
|
||||||
|
title: SquidBots shows its bundled release and includes it in problem reports
|
||||||
|
---
|
||||||
|
The Bots and Modules pages and problem reports include the release identifiers. Imported repacks use their recorded bot revision; empty tags are hidden. The settings file's source commit is not presented as the build revision.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: fixed
|
||||||
|
audience: admins
|
||||||
|
title: Server updates accept verified published migration variants without rerunning them
|
||||||
|
---
|
||||||
|
Signed updates can recognise known published checksums without changing your migration history. Interrupted or failed SQL still requires recovery before retrying.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: fixed
|
||||||
|
audience: admins
|
||||||
|
title: Server updates replace older launchers adapted by the Manager for Wildcard
|
||||||
|
---
|
||||||
|
Updates recognize the Manager’s own realm and import adjustments even when older metadata still records the original launcher. New server binaries receive their matching launcher; genuine custom edits still require your decision.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: fixed
|
||||||
|
audience: admins
|
||||||
|
title: Server packages must include a complete database schema check
|
||||||
|
---
|
||||||
|
Release tools generate the expected database structure on an isolated copy of the signed base, verify all archive files and refuse packages without the schema check. Corrective SQL can restore missing Wildcard tables without replaying old updates.
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: changed
|
||||||
|
audience: admins
|
||||||
|
title: The Auction House Bot card no longer asks for a character GUID
|
||||||
|
---
|
||||||
|
Turning the module and the seller on is enough: a server build with the automatic auction character creates its own account and character. The GUID field moved to the advanced settings.
|
||||||
|
The buyer option hint no longer says it spends the auction character's gold.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: fixed
|
||||||
|
audience: admins
|
||||||
|
title: Choose and remember the local network address friends use to connect
|
||||||
|
---
|
||||||
|
Select an adapter or custom IPv4 address when sharing on LAN. Your choice survives restarts and mode changes; unavailable addresses show a warning instead of silently switching adapters.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: added
|
||||||
|
audience: admins
|
||||||
|
title: The NPC Enchanter card explains how to place and remove the NPC
|
||||||
|
---
|
||||||
|
The card now shows the two commands: `.npc add 601015` where you stand, and `.npc delete` on the targeted NPC.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: fixed
|
||||||
|
audience: admins
|
||||||
|
title: Older server packages cannot replace a newer installation
|
||||||
|
---
|
||||||
|
Update checks stop offering stale packages after an update. To undo an update, use its recovery point instead of applying an older server package.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: fixed
|
||||||
|
audience: admins
|
||||||
|
title: Checking again no longer offers an already installed launcher update
|
||||||
|
---
|
||||||
|
The Manager recognizes its own launcher integration while still detecting user edits and changes in newer signed packages.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: fixed
|
||||||
|
audience: admins
|
||||||
|
title: Large SQUID database imports have more time to finish on first startup
|
||||||
|
---
|
||||||
|
The Manager allows up to 45 minutes when SQUID Playerbots is enabled, covering its initial database import and bot creation. Ordinary server startup and shutdown keep their existing deadlines.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: fixed
|
||||||
|
audience: admins
|
||||||
|
title: Update history conflicts are detected before server files change
|
||||||
|
---
|
||||||
|
Damaged update records block changes and remain visible. Recovery checks saved copies before restoring, and unfinished updates protect backups from deletion and cleanup.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: fixed
|
||||||
|
audience: admins
|
||||||
|
title: Pending database updates remain visible when the server version matches
|
||||||
|
---
|
||||||
|
SQL files are checked before replacing server files. Update and recovery attempts refresh their saved status, including errors. Backup deletion cannot race with an update.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: fixed
|
||||||
|
audience: admins
|
||||||
|
title: Diagnostic files with database checks stay readable after secrets are removed
|
||||||
|
---
|
||||||
|
Removing a line that mentioned a secret could break the JSON files in a diagnostic package. Secret values are now replaced instead, so the files stay valid.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: added
|
||||||
|
audience: admins
|
||||||
|
title: One button collects all diagnostics, including crashes and Windows crash records
|
||||||
|
---
|
||||||
|
Report a problem collects logs, crash reports and small dumps, Windows crash records, update journals and the running server programs in one file, then shows its folder. Crashes without a server crash report are no longer missing.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: added
|
||||||
|
audience: admins
|
||||||
|
title: Problem reports go to the right project
|
||||||
|
---
|
||||||
|
Choose what the problem is about: Manager and other modules, CoA Companions, or SQUID Playerbots. The report opens in that project's GitHub page with the versions filled in. The bot system that is switched on is preselected.
|
||||||
@@ -24,14 +24,15 @@ num-bigint = "0.4"
|
|||||||
zip = { version = "2", default-features = false, features = ["deflate"] }
|
zip = { version = "2", default-features = false, features = ["deflate"] }
|
||||||
sha1 = "0.10"
|
sha1 = "0.10"
|
||||||
tracing-subscriber = { version = "0.3", default-features = false, features = ["fmt", "std"] }
|
tracing-subscriber = { version = "0.3", default-features = false, features = ["fmt", "std"] }
|
||||||
|
tempfile = "3"
|
||||||
|
if-addrs = "0.15"
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
tempfile = "3"
|
|
||||||
rand_core = { version = "0.6", features = ["getrandom"] }
|
rand_core = { version = "0.6", features = ["getrandom"] }
|
||||||
ed25519-dalek = { version = "2", features = ["rand_core"] }
|
ed25519-dalek = { version = "2", features = ["rand_core"] }
|
||||||
|
|
||||||
[target.'cfg(windows)'.dependencies]
|
[target.'cfg(windows)'.dependencies]
|
||||||
windows-sys = { version = "0.60", features = ["Win32_Foundation", "Win32_System_Threading", "Win32_System_SystemInformation", "Win32_System_Diagnostics_ToolHelp", "Win32_NetworkManagement_IpHelper", "Win32_Networking_WinSock"] }
|
windows-sys = { version = "0.60", features = ["Win32_Foundation", "Win32_Storage_FileSystem", "Win32_System_Threading", "Win32_System_SystemInformation", "Win32_System_Diagnostics_ToolHelp", "Win32_NetworkManagement_IpHelper", "Win32_Networking_WinSock"] }
|
||||||
|
|
||||||
[features]
|
[features]
|
||||||
testkit = []
|
testkit = []
|
||||||
@@ -0,0 +1,38 @@
|
|||||||
|
use std::{fs, path::PathBuf};
|
||||||
|
use coa_core::{manifest::{Kind, Manifest}, package::{self, BuildOptions}, pkgsource::{self, Source}, release, signing, Result};
|
||||||
|
|
||||||
|
fn main() -> Result<()> {
|
||||||
|
let args: Vec<String> = std::env::args().skip(1).collect();
|
||||||
|
let source = Source::Dir(args[1].clone().into());
|
||||||
|
let (previous, _) = pkgsource::fetch_manifest(&source, signing::EMBEDDED_PUBLIC_KEY)?;
|
||||||
|
let tree = PathBuf::from(&args[2]);
|
||||||
|
if args[0] == "extract" {
|
||||||
|
assert!(!tree.exists(), "Use a new release tree");
|
||||||
|
package::extract(&PathBuf::from(&args[1]), &previous, &tree, &|_, _| {})?;
|
||||||
|
println!("Verified and extracted {}: {} historical migrations", previous.version, previous.migrations.len());
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
assert_eq!(args[0], "pack");
|
||||||
|
let out = PathBuf::from(&args[3]);
|
||||||
|
assert!(!out.exists(), "Release addresses must be immutable");
|
||||||
|
for migration in &previous.migrations {
|
||||||
|
let entry = previous.files.iter().find(|file| file.path.starts_with("_migrations/") && file.sha256 == migration.sha256).expect("Historical SQL entry");
|
||||||
|
assert_eq!(coa_core::fsx::sha256_file(&tree.join(&entry.path))?, entry.sha256, "Historical SQL changed: {}", migration.id);
|
||||||
|
}
|
||||||
|
let mut manifest = package::build(&tree, &out, &BuildOptions {
|
||||||
|
kind: Kind::Update, version: args[4].clone(), core_commit: Some(args[5].clone()),
|
||||||
|
bots_commit: previous.bots.and_then(|revision| revision.commit),
|
||||||
|
built_at: chrono::Utc::now().to_rfc3339(), part_size: package::DEFAULT_PART_SIZE,
|
||||||
|
migrations: previous.migrations.clone(),
|
||||||
|
}, &|line| println!("{line}"))?;
|
||||||
|
manifest.min_manager_version = "0.6.5".into();
|
||||||
|
manifest.validate()?;
|
||||||
|
coa_core::fsx::atomic_write(&out.join("manifest.json"), &serde_json::to_vec_pretty(&manifest)?)?;
|
||||||
|
let key_path = PathBuf::from(std::env::var("USERPROFILE").unwrap()).join(".coa-manager/signing/manifest-signing.key");
|
||||||
|
release::sign_manifest(&out, &fs::read_to_string(key_path)?)?;
|
||||||
|
coa_core::release_schema::verify_package(&out, signing::EMBEDDED_PUBLIC_KEY)?;
|
||||||
|
let reread: Manifest = serde_json::from_slice(&fs::read(out.join("manifest.json"))?)?;
|
||||||
|
assert_eq!(serde_json::to_value(reread.migrations)?, serde_json::to_value(previous.migrations)?);
|
||||||
|
println!("PASS: signed {}; all historical migration bytes, checksums, aliases and order preserved", manifest.version);
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
@@ -0,0 +1,70 @@
|
|||||||
|
use std::path::{Path, PathBuf};
|
||||||
|
use coa_core::{backup, driver, fsx, Result};
|
||||||
|
|
||||||
|
fn set(root: &Path, filename: &str, values: &[(&str, &str)]) -> Result<()> {
|
||||||
|
let path = root.join("Core/configs/modules").join(filename);
|
||||||
|
let mut config = coa_core::config::parser::ConfFile::parse_bytes(&std::fs::read(&path)?)?;
|
||||||
|
for (key, value) in values { config.set(key, value, &[]); }
|
||||||
|
fsx::atomic_write(&path, config.to_text().as_bytes())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn ledgers(root: &Path) -> Result<Vec<String>> {
|
||||||
|
backup::with_database(root, |db| ["acore_playerbots", "acore_world", "acore_characters"].into_iter()
|
||||||
|
.map(|schema| db.query(&format!("SELECT path,sha256 FROM `{schema}`.coa_squid_migrations ORDER BY path;"))).collect())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn exercise(root: &Path) -> Result<()> {
|
||||||
|
let meta = coa_core::registry::metadata_dir_for(root)?;
|
||||||
|
let point = backup::create(root, &meta, backup::Kind::Full, backup::Trigger::Manual, Some("Disposable SQUID acceptance".into()), &|stage| println!("{stage}"))?;
|
||||||
|
assert!(backup::verify(&meta, &point.id)?.ok);
|
||||||
|
let result = std::panic::catch_unwind(std::panic::AssertUnwindSafe(|| -> Result<()> {
|
||||||
|
backup::with_database(root, |db| db.query("DROP DATABASE IF EXISTS acore_playerbots;").map(|_| ()))?;
|
||||||
|
assert!(driver::run(root, driver::Verb::StartAll)?.ok, "Disabled SQUID must start without its database");
|
||||||
|
assert!(driver::run(root, driver::Verb::StopAll)?.ok);
|
||||||
|
coa_core::multiworld::set_enabled(root, false)?;
|
||||||
|
coa_core::realms::select(root, coa_core::realms::Mode::Coa)?;
|
||||||
|
set(root, "mod_coa_playerbots.conf", &[("CoaBots.Enable", "0")])?;
|
||||||
|
set(root, "playerbots.conf", &[("AiPlayerbot.Enabled", "1"), ("AiPlayerbot.RandomBotAutologin", "0"), ("AiPlayerbot.MinRandomBots", "0"), ("AiPlayerbot.MaxRandomBots", "0"), ("AiPlayerbot.RandomBotGuildCount", "0"), ("AiPlayerbot.RandomBotAccountCount", "0")])?;
|
||||||
|
let started = driver::run(root, driver::Verb::StartAll)?;
|
||||||
|
assert!(started.ok, "Fresh SQUID startup: {}", coa_core::diag::redact(&started.output));
|
||||||
|
let before = ledgers(root)?;
|
||||||
|
assert!(!before[0].is_empty(), "Fresh SQUID history missing");
|
||||||
|
assert!(driver::run(root, driver::Verb::StopAll)?.ok);
|
||||||
|
let started = driver::run(root, driver::Verb::StartAll)?;
|
||||||
|
assert!(started.ok, "Repeated SQUID startup: {}", coa_core::diag::redact(&started.output));
|
||||||
|
assert_eq!(ledgers(root)?, before, "SQUID replay changed its migration history");
|
||||||
|
println!("PASS: SQUID-disabled dual startup without its database; fresh enabled SQUID import and startup; repeated startup preserves all three histories");
|
||||||
|
Ok(())
|
||||||
|
}));
|
||||||
|
assert!(driver::run(root, driver::Verb::StopAll)?.ok);
|
||||||
|
restore(root, &meta, &point)?;
|
||||||
|
result.map_err(|_| coa_core::Error::Invalid("SQUID acceptance failed; disposable databases and configurations restored".into()))?
|
||||||
|
}
|
||||||
|
|
||||||
|
fn restore(root: &Path, meta: &Path, point: &backup::RecoveryPoint) -> Result<()> {
|
||||||
|
assert!(backup::verify(meta, &point.id)?.ok);
|
||||||
|
assert!(driver::run(root, driver::Verb::StopAll)?.ok);
|
||||||
|
coa_core::realms::select(root, point.realm)?;
|
||||||
|
for component in point.components.iter().filter(|component| component.name != "configs") {
|
||||||
|
backup::restore_database(root, meta, &point.id, &component.name)?;
|
||||||
|
}
|
||||||
|
backup::restore_configs(root, meta, &point.id)?;
|
||||||
|
assert!(driver::run(root, driver::Verb::StopAll)?.ok);
|
||||||
|
println!("PASS: disposable SQUID acceptance databases and original realm configurations restored");
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn main() -> Result<()> {
|
||||||
|
let root = PathBuf::from(std::env::args().nth(1).unwrap());
|
||||||
|
assert!(root.file_name().unwrap().to_string_lossy().starts_with("coa-schema-fixture-chaos-064-transition-"));
|
||||||
|
assert_eq!(std::fs::read(root.join(".transition-fixture"))?, b"disposable published-064 transition fixture");
|
||||||
|
assert!(!root.join("Data").symlink_metadata()?.file_type().is_symlink());
|
||||||
|
assert!(driver::run(&root, driver::Verb::StopAll)?.ok);
|
||||||
|
if let Some(id) = std::env::args().nth(2) {
|
||||||
|
let meta = coa_core::registry::metadata_dir_for(&root)?;
|
||||||
|
return restore(&root, &meta, &backup::get(&meta, &id)?);
|
||||||
|
}
|
||||||
|
let result = exercise(&root);
|
||||||
|
assert!(driver::run(&root, driver::Verb::StopAll)?.ok);
|
||||||
|
result
|
||||||
|
}
|
||||||
@@ -0,0 +1,54 @@
|
|||||||
|
use std::{collections::BTreeMap, path::PathBuf};
|
||||||
|
use coa_core::{backup, driver, registry::MetaDir, update::{self, RepackEnv}, Result};
|
||||||
|
|
||||||
|
fn players(db: &coa_core::db::Db) -> Result<String> {
|
||||||
|
db.query("SELECT CONCAT(id,':',username,':',HEX(salt),':',HEX(verifier)) FROM acore_auth.account WHERE id=900001; SELECT CONCAT(guid,':',account,':',name,':',level,':',money) FROM acore_characters.characters WHERE guid=900001; SELECT CONCAT(guid,':',itemEntry,':',owner_guid,':',enchantments) FROM acore_characters.item_instance WHERE guid=900001; SELECT CONCAT(guid,':',bag,':',slot,':',item) FROM acore_characters.character_inventory WHERE guid=900001;")
|
||||||
|
}
|
||||||
|
|
||||||
|
fn exercise(root: &std::path::Path, package: &str) -> Result<()> {
|
||||||
|
let meta_dir = coa_core::registry::metadata_dir_for(root)?;
|
||||||
|
let (_, meta) = MetaDir::open(&meta_dir)?;
|
||||||
|
let expected = backup::with_database(root, |db| [coa_core::realms::Mode::Coa, coa_core::realms::Mode::Wildcard].into_iter().map(|mode| players(&db.clone().for_realm(mode))).collect::<Result<Vec<_>>>())?;
|
||||||
|
assert!(driver::run(root, driver::Verb::StopAll)?.ok);
|
||||||
|
let source = coa_core::pkgsource::Source::Dir(package.into());
|
||||||
|
let preview = update::preview(root, &meta, &source, coa_core::signing::EMBEDDED_PUBLIC_KEY, &BTreeMap::new())?;
|
||||||
|
assert_eq!(preview.pending_migrations, 0, "Historical SQL must not replay");
|
||||||
|
assert!(!preview.items.iter().any(|item| item.action == update::Action::Conflict), "Unresolved candidate files: {:?}", preview.items);
|
||||||
|
let environment = RepackEnv { root, meta_dir: &meta_dir };
|
||||||
|
let outcome = update::apply(&update::Params {
|
||||||
|
root, meta_dir: &meta_dir, source, trusted_key: coa_core::signing::EMBEDDED_PUBLIC_KEY,
|
||||||
|
resolutions: BTreeMap::new(), cancel: Default::default(), env: &environment, fail_after_ops: None,
|
||||||
|
}, &|stage, progress| println!("{progress}% {stage}"))?;
|
||||||
|
assert_eq!(outcome.txn.state, update::State::Committed, "{:?}", outcome.txn);
|
||||||
|
backup::with_database(root, |db| {
|
||||||
|
for (index, mode) in [coa_core::realms::Mode::Coa, coa_core::realms::Mode::Wildcard].into_iter().enumerate() {
|
||||||
|
let realm = db.clone().for_realm(mode);
|
||||||
|
assert_eq!(players(&realm)?, expected[index], "Player data changed in {mode:?}");
|
||||||
|
let problems = coa_core::schema_check::check(&realm, root)?;
|
||||||
|
assert!(problems.is_empty(), "{problems:?}");
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
})?;
|
||||||
|
let release = coa_core::squid::release(root).expect("SQUID release metadata");
|
||||||
|
println!("SQUID metadata: {release:?}");
|
||||||
|
assert_eq!(coa_core::squid::fields(root)?.len(), 40);
|
||||||
|
let (_, installed) = MetaDir::open(&meta_dir)?;
|
||||||
|
let repeated = update::preview(root, &installed, &coa_core::pkgsource::Source::Dir(package.into()), coa_core::signing::EMBEDDED_PUBLIC_KEY, &BTreeMap::new())?;
|
||||||
|
assert_eq!(repeated.pending_migrations, 0);
|
||||||
|
assert!(repeated.items.iter().all(|item| item.action == update::Action::Skip), "{:?}", repeated.items);
|
||||||
|
println!("PASS: coordinated update committed, both realms started, player fields preserved, historical SQL skipped, repeated preview clean");
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn main() -> Result<()> {
|
||||||
|
let args: Vec<String> = std::env::args().skip(1).collect();
|
||||||
|
let root = PathBuf::from(&args[0]);
|
||||||
|
assert!(root.file_name().unwrap().to_string_lossy().starts_with("coa-schema-fixture-chaos-064-transition-"));
|
||||||
|
assert_eq!(std::fs::read(root.join(".transition-fixture"))?, b"disposable published-064 transition fixture");
|
||||||
|
assert_eq!(std::fs::read(root.join(".release-schema-fixture"))?, b"disposable release-schema fixture");
|
||||||
|
assert!(!root.join("Data").symlink_metadata()?.file_type().is_symlink());
|
||||||
|
assert!(driver::run(&root, driver::Verb::StopAll)?.ok);
|
||||||
|
let outcome = std::panic::catch_unwind(std::panic::AssertUnwindSafe(|| exercise(&root, &args[1])));
|
||||||
|
assert!(driver::run(&root, driver::Verb::StopAll)?.ok, "Fixture shutdown failed");
|
||||||
|
outcome.map_err(|_| coa_core::Error::Invalid("Disposable coordinated acceptance failed; stopped services and retained recovery copies".into()))?
|
||||||
|
}
|
||||||
@@ -0,0 +1,21 @@
|
|||||||
|
//! Install a new Docker server from a package folder, for a manual end-to-end check on Linux (needs docker).
|
||||||
|
//! usage: docker_install <package folder> <destination> <game data folder> <public key (base64)>
|
||||||
|
//! The key is the one the package was signed with (the production key is only used by the Manager itself).
|
||||||
|
use coa_core::docker::install::{install, Params};
|
||||||
|
use coa_core::download::Cancel;
|
||||||
|
use coa_core::install::Source;
|
||||||
|
use coa_core::registry::Registry;
|
||||||
|
use std::path::PathBuf;
|
||||||
|
|
||||||
|
fn main() {
|
||||||
|
let a: Vec<String> = std::env::args().skip(1).collect();
|
||||||
|
assert!(a.len() == 4, "usage: docker_install <package folder> <destination> <game data folder> <public key>");
|
||||||
|
let registry = Registry::at(std::env::temp_dir().join("coa-docker-install/installs.json"));
|
||||||
|
let t = std::time::Instant::now();
|
||||||
|
let done = install(
|
||||||
|
&Params { source: Source::Dir(PathBuf::from(&a[0])), dest: PathBuf::from(&a[1]), data_dir: PathBuf::from(&a[2]), trusted_key: &a[3], registry: ®istry, cancel: Cancel::default() },
|
||||||
|
&|s| eprintln!(" {:>3}% {} {}", s.percent, s.step, s.detail.unwrap_or_default()),
|
||||||
|
)
|
||||||
|
.unwrap_or_else(|e| panic!("install failed: {e}"));
|
||||||
|
println!("installed {} at {} in {:?}", done.version, done.path, t.elapsed());
|
||||||
|
}
|
||||||
@@ -0,0 +1,93 @@
|
|||||||
|
//! Verify published checksum compatibility on a disposable real database, without running SQL migrations.
|
||||||
|
use std::{path::{Path, PathBuf}, sync::atomic::{AtomicUsize, Ordering}};
|
||||||
|
use coa_core::{backup, db::Db, migrations::{self, LedgerRow, Status, Store}, pkgsource::{self, Source}, Result};
|
||||||
|
|
||||||
|
struct Observed<'a> { db: &'a Db, executions: AtomicUsize }
|
||||||
|
impl Store for Observed<'_> {
|
||||||
|
fn load(&self) -> Result<Vec<LedgerRow>> { self.db.load() }
|
||||||
|
fn put(&self, row: &LedgerRow) -> Result<()> { self.db.put(row) }
|
||||||
|
fn run_file(&self, _: &str, _: &Path) -> Result<()> {
|
||||||
|
self.executions.fetch_add(1, Ordering::SeqCst);
|
||||||
|
panic!("Historical SQL must never be replayed");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn main() -> Result<()> {
|
||||||
|
let args: Vec<_> = std::env::args().skip(1).collect();
|
||||||
|
let root = PathBuf::from(&args[0]);
|
||||||
|
assert!(root.file_name().unwrap().to_string_lossy().starts_with("coa-schema-fixture-chaos-"));
|
||||||
|
assert_eq!(std::fs::read(root.join(".coa-chaos-fixture"))?, b"disposable update chaos fixture");
|
||||||
|
assert_eq!(std::fs::read(root.join(".release-schema-fixture"))?, b"disposable release-schema fixture");
|
||||||
|
let source = Source::Dir(PathBuf::from(&args[1]));
|
||||||
|
let package = pkgsource::fetch_manifest(&source, coa_core::signing::EMBEDDED_PUBLIC_KEY)?.0;
|
||||||
|
let staging = tempfile::tempdir()?;
|
||||||
|
let parts = pkgsource::fetch_parts(&source, &package, &staging.path().join("download"), &Default::default(), &|_, _| {})?;
|
||||||
|
coa_core::package::extract(&parts, &package, &staging.path().join("tree"), &|_, _| {})?;
|
||||||
|
migrations::verify_files(&package.migrations, &staging.path().join("tree/_migrations"))?;
|
||||||
|
println!("PASS: all {} signed-package SQL artifacts verified before any database mutation", package.migrations.len());
|
||||||
|
let migration = package.migrations.iter().find(|m| m.id == "manager_repair__20261005_missing_wildcard_tables").unwrap();
|
||||||
|
let hashes = ["c1d8dbf2271234283a48a39e4b4aea1106b83b70581f1e3c4aa9fff438e8e4d2", "9e4a36245c3f83255415c122c01f08ceb3e3b83898d3d427ac4e2fbcf61e9638"];
|
||||||
|
for hash in hashes { assert!(migration.sha256 == hash || migration.compatible_sha256.iter().any(|h| h == hash)); }
|
||||||
|
let fixture_meta = coa_core::registry::metadata_dir_for(&root)?;
|
||||||
|
let test_meta = tempfile::tempdir()?;
|
||||||
|
coa_core::fsx::atomic_write(&test_meta.path().join("install.json"), &std::fs::read(fixture_meta.join("install.json"))?)?;
|
||||||
|
coa_core::registry::MetaDir::open(test_meta.path())?;
|
||||||
|
std::fs::create_dir_all(test_meta.path().join("updates"))?;
|
||||||
|
let result = backup::with_database(&root, |db| {
|
||||||
|
let mut modes = vec![coa_core::realms::Mode::Coa];
|
||||||
|
if coa_core::realms::state(&root)?.wildcard_created { modes.push(coa_core::realms::Mode::Wildcard); }
|
||||||
|
for mode in modes {
|
||||||
|
let db = db.clone().for_realm(mode);
|
||||||
|
let saved = db.load()?.into_iter().find(|row| row.id == migration.id && row.db == migration.db).expect("Published repair must already be applied");
|
||||||
|
assert_eq!(saved.status, Status::Applied);
|
||||||
|
let counts = db.query("SELECT CONCAT((SELECT COUNT(*) FROM acore_characters.characters),':',(SELECT COUNT(*) FROM acore_characters.item_instance),':',(SELECT COUNT(*) FROM acore_auth.account));")?;
|
||||||
|
let check = || -> Result<()> {
|
||||||
|
for hash in hashes {
|
||||||
|
db.put(&LedgerRow { sha256: hash.into(), ..saved.clone() })?;
|
||||||
|
let observed = Observed { db: &db, executions: AtomicUsize::new(0) };
|
||||||
|
migrations::preflight(&db, std::slice::from_ref(migration))?;
|
||||||
|
let report = migrations::apply_pending(&observed, std::slice::from_ref(migration), &root.join(".unused-hotfix-sql"), &|| panic!("Already applied SQL needs no snapshot"))?;
|
||||||
|
assert!(report.applied.is_empty());
|
||||||
|
assert_eq!(observed.executions.load(Ordering::SeqCst), 0);
|
||||||
|
assert_eq!(db.load()?.into_iter().find(|r| r.id == migration.id && r.db == migration.db).unwrap().sha256, hash);
|
||||||
|
}
|
||||||
|
let meta = test_meta.path();
|
||||||
|
let file_hash = coa_core::fsx::sha256_file(&root.join("Core/worldserver.exe"))?;
|
||||||
|
let install_hash = coa_core::fsx::sha256_file(&meta.join("install.json"))?;
|
||||||
|
let transaction_count = std::fs::read_dir(meta.join("updates"))?.count();
|
||||||
|
for status in [Status::Running, Status::Failed] {
|
||||||
|
db.put(&LedgerRow { status, ..saved.clone() })?;
|
||||||
|
let env = coa_core::update::RepackEnv { root: &root, meta_dir: meta };
|
||||||
|
let rejected = coa_core::update::apply(&coa_core::update::Params {
|
||||||
|
root: &root, meta_dir: meta, source: Source::Dir(PathBuf::from(&args[1])),
|
||||||
|
trusted_key: coa_core::signing::EMBEDDED_PUBLIC_KEY, cancel: Default::default(),
|
||||||
|
resolutions: Default::default(), env: &env, fail_after_ops: None,
|
||||||
|
}, &|_, _| {});
|
||||||
|
let message = rejected.unwrap_err().to_string();
|
||||||
|
assert!(message.contains("partially applied"), "Unexpected rejection: {message}");
|
||||||
|
assert_eq!(std::fs::read_dir(meta.join("updates"))?.count(), transaction_count);
|
||||||
|
assert_eq!(coa_core::fsx::sha256_file(&root.join("Core/worldserver.exe"))?, file_hash);
|
||||||
|
assert_eq!(coa_core::fsx::sha256_file(&meta.join("install.json"))?, install_hash);
|
||||||
|
}
|
||||||
|
db.put(&saved)?;
|
||||||
|
let env = coa_core::update::RepackEnv { root: &root, meta_dir: meta };
|
||||||
|
let pending_before = env.pending_migrations(&package)?;
|
||||||
|
db.query("DELETE FROM acore_world.coa_manager_migrations WHERE db='characters' AND id='manager_repair__20261005_missing_wildcard_tables';")?;
|
||||||
|
assert_eq!(env.pending_migrations(&package)?, pending_before + 1,
|
||||||
|
"Missing history in either realm must remain visible even with identical server files");
|
||||||
|
db.put(&saved)?;
|
||||||
|
assert_eq!(env.pending_migrations(&package)?, pending_before);
|
||||||
|
Ok(())
|
||||||
|
};
|
||||||
|
let result = std::panic::catch_unwind(std::panic::AssertUnwindSafe(check));
|
||||||
|
db.put(&saved)?;
|
||||||
|
result.map_err(|_| coa_core::Error::Invalid("History regression assertion failed; the injected ledger row was restored.".into()))??;
|
||||||
|
assert_eq!(db.query("SELECT CONCAT((SELECT COUNT(*) FROM acore_characters.characters),':',(SELECT COUNT(*) FROM acore_characters.item_instance),':',(SELECT COUNT(*) FROM acore_auth.account));")?, counts);
|
||||||
|
println!("PASS: {} published checksums; Running/Failed rejected before staging; missing migration counted; zero SQL replays; history and player counts preserved", mode.name());
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
});
|
||||||
|
assert!(coa_core::driver::run(&root, coa_core::driver::Verb::StopAll)?.ok);
|
||||||
|
result?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
//! Read-only update preview against the marked disposable acceptance fixture.
|
||||||
|
use std::{collections::BTreeMap,path::PathBuf};
|
||||||
|
fn main()->coa_core::Result<()> {
|
||||||
|
let args:Vec<_>=std::env::args().skip(1).collect();
|
||||||
|
let root=PathBuf::from(&args[0]);
|
||||||
|
assert!(root.file_name().unwrap().to_string_lossy().starts_with("coa-schema-fixture-chaos-064-transition-"));
|
||||||
|
assert_eq!(std::fs::read(root.join(".transition-fixture"))?,b"disposable published-064 transition fixture");
|
||||||
|
let meta_dir=coa_core::registry::metadata_dir_for(&root)?;
|
||||||
|
let (_,meta)=coa_core::registry::MetaDir::open(&meta_dir)?;
|
||||||
|
let preview=coa_core::update::preview(&root,&meta,&coa_core::pkgsource::Source::Dir(args[1].clone().into()),coa_core::signing::EMBEDDED_PUBLIC_KEY,&BTreeMap::new())?;
|
||||||
|
assert_eq!(preview.from_version.as_deref(),Some(preview.to_version.as_str()));
|
||||||
|
assert_eq!(preview.pending_migrations,0);
|
||||||
|
assert!(preview.items.iter().all(|item|item.action==coa_core::update::Action::Skip),"{:?}",preview.items.iter().filter(|item|item.action!=coa_core::update::Action::Skip).collect::<Vec<_>>());
|
||||||
|
println!("PASS: real fixture repeated preview: {} files unchanged, zero pending SQL, no update offered",preview.items.len());
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
@@ -0,0 +1,165 @@
|
|||||||
|
//! Real signed-package transition on an independent, explicitly marked disposable copy.
|
||||||
|
//! The Env wrapper instruments only launcher isolation; migration/backup/update code is production code.
|
||||||
|
use std::{collections::BTreeMap, path::{Path, PathBuf}};
|
||||||
|
use coa_core::{backup, driver, fsx, migrations, pkgsource::{self, Source}, registry::{InstallMeta, MetaDir}, update::{self, Env, RepackEnv}, Result};
|
||||||
|
|
||||||
|
struct Offline<'a>(RepackEnv<'a>);
|
||||||
|
impl Env for Offline<'_> {
|
||||||
|
fn ensure_stopped(&self) -> Result<()> { self.0.ensure_stopped() }
|
||||||
|
fn preflight(&self, m: &coa_core::manifest::Manifest) -> Result<()> { self.0.preflight(m) }
|
||||||
|
fn verify_snapshot(&self, id: &str) -> Result<()> { self.0.verify_snapshot(id) }
|
||||||
|
fn snapshot(&self) -> Result<String> { self.0.snapshot() }
|
||||||
|
fn restore_snapshot(&self, id: &str) -> Result<()> { self.0.restore_snapshot(id) }
|
||||||
|
fn migrate(&self, m: &coa_core::manifest::Manifest, p: &Path) -> Result<migrations::ApplyReport> { self.0.migrate(m,p) }
|
||||||
|
fn validate(&self) -> Result<()> {
|
||||||
|
let path=self.0.root.join("Scripts/manage.py");
|
||||||
|
let source=std::fs::read_to_string(&path)?.replace("\r\n", "\n");
|
||||||
|
// Explicit test instrumentation prevents relay transmissions and binds services locally.
|
||||||
|
let guarded=source.replace("def spawn(name, command, cwd, log):\n", "def spawn(name, command, cwd, log):\n for filename in ('worldserver.conf', 'authserver.conf'):\n path = ROOT / 'Core/configs' / filename\n if path.exists():\n text = path.read_text(encoding='utf-8-sig')\n for key, value in (('BindIP', '\"127.0.0.1\"'), ('Ra.IP', '\"127.0.0.1\"'), ('SOAP.Enabled', '0')):\n text = re.sub(r'(?m)^\\s*' + re.escape(key) + r'\\s*=.*$', '', text)\n text += '\\n' + key + ' = ' + value + '\\n'\n path.write_text(text, encoding='utf-8')\n").replace("def relay_worker():\n", "def relay_worker():\n save_process('relay-ready', os.getpid())\n while not (STATE / 'stop-relay').exists():\n time.sleep(0.5)\n return\n");
|
||||||
|
assert_ne!(source,guarded,"Fixture launcher isolation failed");
|
||||||
|
fsx::atomic_write(&path,guarded.as_bytes())?;
|
||||||
|
self.0.validate()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
fn players(db: &coa_core::db::Db) -> Result<String> {
|
||||||
|
db.query("SELECT CONCAT(id,':',username,':',HEX(salt),':',HEX(verifier)) FROM acore_auth.account WHERE id=900001; SELECT CONCAT(guid,':',account,':',name,':',level,':',money) FROM acore_characters.characters WHERE guid=900001; SELECT CONCAT(guid,':',itemEntry,':',owner_guid,':',enchantments) FROM acore_characters.item_instance WHERE guid=900001; SELECT CONCAT(guid,':',bag,':',slot,':',item) FROM acore_characters.character_inventory WHERE guid=900001;")
|
||||||
|
}
|
||||||
|
fn main() -> Result<()> {
|
||||||
|
let args:Vec<_>=std::env::args().skip(1).collect();
|
||||||
|
let root=PathBuf::from(&args[0]);
|
||||||
|
assert!(root.file_name().unwrap().to_string_lossy().starts_with("coa-schema-fixture-chaos-064-transition-"));
|
||||||
|
assert_eq!(std::fs::read(root.join(".transition-fixture"))?,b"disposable published-064 transition fixture");
|
||||||
|
if args.get(3).is_some_and(|mode| mode=="legacy-recovery") {
|
||||||
|
return run_fixture(&root,||legacy_recovery(&root));
|
||||||
|
}
|
||||||
|
assert!(!root.join(".transition-started").exists(),"Use a new independent fixture");
|
||||||
|
fsx::atomic_write(&root.join(".transition-started"),b"started")?;
|
||||||
|
let meta=coa_core::registry::metadata_dir_for(&root)?;
|
||||||
|
assert!(!meta.exists(),"Do not reuse experimental or user metadata");
|
||||||
|
run_fixture(&root,||exercise(&root,&meta,&args[1],&args[2]))
|
||||||
|
}
|
||||||
|
fn run_fixture(root:&Path,operation:impl FnOnce()->Result<()>)->Result<()> {
|
||||||
|
let result=std::panic::catch_unwind(std::panic::AssertUnwindSafe(operation));
|
||||||
|
assert!(driver::run(root,driver::Verb::StopAll)?.ok,"Fixture shutdown failed");
|
||||||
|
result.map_err(|_|coa_core::Error::Invalid("Disposable acceptance assertion failed; services were stopped and recovery copies retained.".into()))?
|
||||||
|
}
|
||||||
|
fn legacy_recovery(root:&Path)->Result<()> {
|
||||||
|
let meta=coa_core::registry::metadata_dir_for(root)?;
|
||||||
|
assert!(driver::run(root,driver::Verb::StopAll)?.ok);
|
||||||
|
let expected=backup::with_database(root,|db| [coa_core::realms::Mode::Coa,coa_core::realms::Mode::Wildcard].into_iter().map(|mode|players(&db.clone().for_realm(mode))).collect::<Result<Vec<_>>>())?;
|
||||||
|
assert!(driver::run(root,driver::Verb::StopAll)?.ok);
|
||||||
|
let dirs=std::fs::read_dir(meta.join("updates"))?.collect::<std::io::Result<Vec<_>>>()?;
|
||||||
|
assert_eq!(dirs.len(),1,"Requires exactly the preceding successful disposable transition");
|
||||||
|
let txn_dir=dirs[0].path();
|
||||||
|
let journal=txn_dir.join("txn.json");
|
||||||
|
let mut legacy:serde_json::Value=fsx::read_json(&journal)?;
|
||||||
|
assert_eq!(legacy["state"],"committed");
|
||||||
|
let point=legacy["recovery_point"].as_str().unwrap().to_string();
|
||||||
|
let point_path=meta.join("backups").join(&point).join("backup.json");
|
||||||
|
let mut point_json:serde_json::Value=fsx::read_json(&point_path)?;
|
||||||
|
point_json["manager_version"]="0.6.4".into();
|
||||||
|
for component in point_json["components"].as_array_mut().unwrap() { component.as_object_mut().unwrap().remove("file_sha256"); }
|
||||||
|
fsx::atomic_write_json(&point_path,&point_json)?;
|
||||||
|
legacy.as_object_mut().unwrap().remove("recovery_hashes");
|
||||||
|
legacy.as_object_mut().unwrap().remove("databases_started");
|
||||||
|
legacy["state"]="applied".into();
|
||||||
|
fsx::atomic_write_json(&journal,&legacy)?;
|
||||||
|
assert!(update::ensure_recovered(&meta).is_err(),"Legacy unfinished update must block startup");
|
||||||
|
let id=legacy["id"].as_str().unwrap();
|
||||||
|
let env=RepackEnv {root,meta_dir:&meta};
|
||||||
|
println!("Recovering legacy-format transaction and recovery point on disposable installation");
|
||||||
|
assert_eq!(update::rollback(root,&meta,id,&env)?.state,update::State::RolledBack);
|
||||||
|
for op in legacy["ops"].as_array().unwrap() {
|
||||||
|
let relative=op["path"].as_str().unwrap();
|
||||||
|
if op["had_previous"]==true {
|
||||||
|
assert_eq!(fsx::sha256_file(&fsx::safe_join(root,relative)?)?,fsx::sha256_file(&fsx::safe_join(&txn_dir.join("before"),relative)?)?,"Legacy file restoration mismatch: {relative}");
|
||||||
|
} else { assert!(!fsx::safe_join(root,relative)?.exists()); }
|
||||||
|
}
|
||||||
|
assert_eq!(std::fs::read(meta.join("install.json"))?,std::fs::read(txn_dir.join("before/manager-install.json"))?);
|
||||||
|
backup::with_database(root,|db| {
|
||||||
|
for (index,mode) in [coa_core::realms::Mode::Coa,coa_core::realms::Mode::Wildcard].into_iter().enumerate() {
|
||||||
|
let db=db.clone().for_realm(mode);
|
||||||
|
assert_eq!(players(&db)?,expected[index]);
|
||||||
|
assert_eq!(db.query("SELECT COUNT(*) FROM acore_world.coa_manager_migrations WHERE id IN ('manager_repair__20261005_reconcile_wildcard_tables','manager_repair__20261005_reconcile_missing_class_starts');")?,"0");
|
||||||
|
assert_eq!(db.query("SELECT sha256 FROM acore_world.coa_manager_migrations WHERE id='manager_repair__20261005_missing_wildcard_tables';")?,"9e4a36245c3f83255415c122c01f08ceb3e3b83898d3d427ac4e2fbcf61e9638");
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
})?;
|
||||||
|
assert!(driver::run(root,driver::Verb::StopAll)?.ok);
|
||||||
|
assert!(update::pending_checked(&meta)?.is_none());
|
||||||
|
assert!(update::rollback(root,&meta,id,&env).is_err(),"Completed recovery must not run again");
|
||||||
|
println!("PASS: legacy journal blocked startup; old files, metadata, migration histories and player fields restored; completed recovery rejects replay. Original baseline had a missing table, so healthy startup is not claimed after rollback.");
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
fn exercise(root:&Path,meta:&Path,baseline:&str,candidate:&str)->Result<()> {
|
||||||
|
let mut install:InstallMeta=fsx::read_json(&PathBuf::from("C:/games/coa-schema-fixture-chaos-20261005-v1.manager/install.json"))?;
|
||||||
|
install.server_path=root.to_string_lossy().into_owned();
|
||||||
|
install.id=uuid::Uuid::new_v4().to_string();
|
||||||
|
install.manager_version="0.6.4".into();
|
||||||
|
MetaDir::create(root,&install)?;
|
||||||
|
// Private ports, and no inherited PID records or paths to the source database.
|
||||||
|
let mut cfg:serde_json::Value=fsx::read_json(&root.join("Settings/repack.json"))?;
|
||||||
|
let mut listeners=Vec::new();
|
||||||
|
for key in ["mysqlPort","authPort","worldPort","raPort"] {
|
||||||
|
let listener=std::net::TcpListener::bind("127.0.0.1:0")?;
|
||||||
|
cfg[key]=listener.local_addr()?.port().into(); listeners.push(listener);
|
||||||
|
}
|
||||||
|
fsx::atomic_write_json(&root.join("Settings/repack.json"),&cfg)?;
|
||||||
|
let mut profile:serde_json::Value=fsx::read_json(&root.join("Settings/realm-profile.json"))?;
|
||||||
|
for key in ["secondary_world_port","secondary_ra_port"] {
|
||||||
|
let listener=std::net::TcpListener::bind("127.0.0.1:0")?;
|
||||||
|
profile[key]=listener.local_addr()?.port().into(); listeners.push(listener);
|
||||||
|
}
|
||||||
|
fsx::atomic_write_json(&root.join("Settings/realm-profile.json"),&profile)?;
|
||||||
|
drop(listeners);
|
||||||
|
let state=root.join(".state");
|
||||||
|
if state.exists() { std::fs::remove_dir_all(&state)?; }
|
||||||
|
let secondary_state=root.join(".realms/secondary/.state");
|
||||||
|
if secondary_state.exists() { std::fs::remove_dir_all(&secondary_state)?; }
|
||||||
|
let source=Source::Dir(baseline.into());
|
||||||
|
let (manifest,_)=pkgsource::fetch_manifest(&source,coa_core::signing::EMBEDDED_PUBLIC_KEY)?;
|
||||||
|
let temp=tempfile::tempdir()?;
|
||||||
|
let parts=pkgsource::fetch_parts(&source,&manifest,&temp.path().join("download"),&Default::default(),&|_,_|{})?;
|
||||||
|
let tree=temp.path().join("tree");
|
||||||
|
coa_core::package::extract(&parts,&manifest,&tree,&|_,_|{})?;
|
||||||
|
for file in &manifest.files {
|
||||||
|
if file.path.starts_with("_migrations/") {continue;}
|
||||||
|
fsx::atomic_write(&fsx::safe_join(root,&file.path)?,&std::fs::read(fsx::safe_join(&tree,&file.path)?)?)?;
|
||||||
|
install.original_hashes.insert(file.path.clone(),file.sha256.clone());
|
||||||
|
}
|
||||||
|
install.core.version=Some(manifest.version);
|
||||||
|
fsx::atomic_write_json(&meta.join("install.json"),&install)?;
|
||||||
|
// Both worlds must remain local, including generated secondary configuration.
|
||||||
|
for relative in ["Settings/worldserver.conf.template","Settings/authserver.conf.template"] {
|
||||||
|
let p=root.join(relative);
|
||||||
|
let mut conf=coa_core::config::parser::ConfFile::parse_bytes(&std::fs::read(&p)?)?;
|
||||||
|
conf.set("BindIP","\"127.0.0.1\"",&[]); conf.set("Ra.IP","\"127.0.0.1\"",&[]); conf.set("SOAP.Enabled","0",&[]);
|
||||||
|
fsx::atomic_write(&p,conf.to_text().as_bytes())?;
|
||||||
|
}
|
||||||
|
let expected=backup::with_database(root,|db| {
|
||||||
|
let mut saved=Vec::new();
|
||||||
|
for mode in [coa_core::realms::Mode::Coa,coa_core::realms::Mode::Wildcard] {
|
||||||
|
let db=db.clone().for_realm(mode);
|
||||||
|
saved.push(players(&db)?);
|
||||||
|
db.query("DROP TABLE IF EXISTS acore_characters.coa_wildcard_skill_card; DELETE FROM acore_world.coa_manager_migrations WHERE id IN ('manager_repair__20261005_reconcile_wildcard_tables','manager_repair__20261005_reconcile_missing_class_starts'); UPDATE acore_world.coa_manager_migrations SET sha256='9e4a36245c3f83255415c122c01f08ceb3e3b83898d3d427ac4e2fbcf61e9638' WHERE id='manager_repair__20261005_missing_wildcard_tables' AND status='applied';")?;
|
||||||
|
}
|
||||||
|
Ok(saved)
|
||||||
|
})?;
|
||||||
|
let source=Source::Dir(candidate.into());
|
||||||
|
let candidate_manifest=pkgsource::fetch_manifest(&source,coa_core::signing::EMBEDDED_PUBLIC_KEY)?.0;
|
||||||
|
let choices:BTreeMap<_,_>=update::plan(root,&install,&candidate_manifest,&BTreeMap::new(),None)?.into_iter().filter(|p|p.action==update::Action::Conflict).map(|p|(p.path,update::Resolution::Replace)).collect();
|
||||||
|
let env=Offline(RepackEnv{root,meta_dir:meta});
|
||||||
|
let outcome=update::apply(&update::Params {root,meta_dir:meta,source,trusted_key:coa_core::signing::EMBEDDED_PUBLIC_KEY,cancel:Default::default(),resolutions:choices,env:&env,fail_after_ops:None},&|stage,pct|println!("{pct}% {stage}"))?;
|
||||||
|
assert_eq!(outcome.txn.state,update::State::Committed,"{:?}",outcome.txn.message);
|
||||||
|
backup::with_database(root,|db| {
|
||||||
|
for (index,mode) in [coa_core::realms::Mode::Coa,coa_core::realms::Mode::Wildcard].into_iter().enumerate() {
|
||||||
|
let db=db.clone().for_realm(mode);
|
||||||
|
assert_eq!(players(&db)?,expected[index],"Player data changed in {}",mode.name());
|
||||||
|
assert!(coa_core::schema_check::check(&db,root)?.is_empty());
|
||||||
|
assert_eq!(migrations::pending_count(&db,&candidate_manifest.migrations)?,0);
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
})?;
|
||||||
|
println!("PASS: signed historical package to candidate; missing Wildcard table repaired in both realms; player fields and inventory preserved; schema and startup verified. Launcher isolation was test instrumentation, not packaged UI acceptance.");
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
@@ -29,7 +29,7 @@ fn main() {
|
|||||||
let dst = staging.join(db).join(format!("{id}.sql"));
|
let dst = staging.join(db).join(format!("{id}.sql"));
|
||||||
std::fs::create_dir_all(dst.parent().unwrap()).unwrap();
|
std::fs::create_dir_all(dst.parent().unwrap()).unwrap();
|
||||||
std::fs::write(&dst, &bytes).unwrap();
|
std::fs::write(&dst, &bytes).unwrap();
|
||||||
list.push(Migration { id, db: db.into(), sha256: fsx::sha256_bytes(&bytes), destructive: false });
|
list.push(Migration { compatible_sha256: vec![], id, db: db.into(), sha256: fsx::sha256_bytes(&bytes), destructive: false });
|
||||||
};
|
};
|
||||||
for (kind, dirs) in [("auth", ["db_auth", "pending_db_auth"]), ("characters", ["db_characters", "pending_db_characters"]), ("world", ["db_world", "pending_db_world"])] {
|
for (kind, dirs) in [("auth", ["db_auth", "pending_db_auth"]), ("characters", ["db_characters", "pending_db_characters"]), ("world", ["db_world", "pending_db_world"])] {
|
||||||
for d in dirs {
|
for d in dirs {
|
||||||
|
|||||||
@@ -58,7 +58,7 @@ fn main() -> Result<()> {
|
|||||||
let path = staged.join(format!("{kind}/manager_realm_fixture.sql"));
|
let path = staged.join(format!("{kind}/manager_realm_fixture.sql"));
|
||||||
std::fs::create_dir_all(path.parent().unwrap())?;
|
std::fs::create_dir_all(path.parent().unwrap())?;
|
||||||
std::fs::write(&path, sql)?;
|
std::fs::write(&path, sql)?;
|
||||||
manifest.migrations.push(Migration { id: "manager_realm_fixture".into(), db: kind.into(), sha256: coa_core::fsx::sha256_file(&path)?, destructive: false });
|
manifest.migrations.push(Migration { compatible_sha256: vec![], id: "manager_realm_fixture".into(), db: kind.into(), sha256: coa_core::fsx::sha256_file(&path)?, destructive: false });
|
||||||
}
|
}
|
||||||
let result = env.migrate(&manifest, &staged)?;
|
let result = env.migrate(&manifest, &staged)?;
|
||||||
assert!(result.failed.is_none());
|
assert!(result.failed.is_none());
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ fn main() -> Result<()> {
|
|||||||
fsx::atomic_write(&update_tree.join(format!("_migrations/world/{id}.sql")), sql.as_bytes())?;
|
fsx::atomic_write(&update_tree.join(format!("_migrations/world/{id}.sql")), sql.as_bytes())?;
|
||||||
let options = |kind, version: &str, migrations| BuildOptions { kind, version: version.into(), core_commit: None, built_at: "fixture".into(), part_size: 1 << 20, bots_commit: None, migrations };
|
let options = |kind, version: &str, migrations| BuildOptions { kind, version: version.into(), core_commit: None, built_at: "fixture".into(), part_size: 1 << 20, bots_commit: None, migrations };
|
||||||
let base = package::build(&base_tree, &base_pkg, &options(Kind::Base, "1.0.0", vec![]), &|_| {})?;
|
let base = package::build(&base_tree, &base_pkg, &options(Kind::Base, "1.0.0", vec![]), &|_| {})?;
|
||||||
let update = package::build(&update_tree, &update_pkg, &options(Kind::Update, "1.0.1", vec![Migration { id: id.into(), db: "world".into(), sha256: fsx::sha256_bytes(sql.as_bytes()), destructive: false }]), &|_| {})?;
|
let update = package::build(&update_tree, &update_pkg, &options(Kind::Update, "1.0.1", vec![Migration { compatible_sha256: vec![], id: id.into(), db: "world".into(), sha256: fsx::sha256_bytes(sql.as_bytes()), destructive: false }]), &|_| {})?;
|
||||||
// A test-only trust key, unrelated to production signing material.
|
// A test-only trust key, unrelated to production signing material.
|
||||||
let key = SigningKey::from_bytes(&[23; 32]);
|
let key = SigningKey::from_bytes(&[23; 32]);
|
||||||
let public = STANDARD.encode(key.verifying_key().as_bytes());
|
let public = STANDARD.encode(key.verifying_key().as_bytes());
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ fn main() {
|
|||||||
let sql = "CREATE TABLE IF NOT EXISTS coa_manager_update_test (id INT PRIMARY KEY); INSERT IGNORE INTO coa_manager_update_test VALUES (1);";
|
let sql = "CREATE TABLE IF NOT EXISTS coa_manager_update_test (id INT PRIMARY KEY); INSERT IGNORE INTO coa_manager_update_test VALUES (1);";
|
||||||
put(&src, "_migrations/world/2026_09_30_00_update_e2e.sql", sql);
|
put(&src, "_migrations/world/2026_09_30_00_update_e2e.sql", sql);
|
||||||
let mut m = build(&src, &pkg, &BuildOptions { kind: Kind::Update, version: "0.2.0".into(), core_commit: None, built_at: chrono::Utc::now().to_rfc3339(), part_size: 1 << 20, bots_commit: None, migrations: vec![] }, &|_| {}).unwrap();
|
let mut m = build(&src, &pkg, &BuildOptions { kind: Kind::Update, version: "0.2.0".into(), core_commit: None, built_at: chrono::Utc::now().to_rfc3339(), part_size: 1 << 20, bots_commit: None, migrations: vec![] }, &|_| {}).unwrap();
|
||||||
m.migrations.push(Migration { id: "2026_09_30_00_update_e2e".into(), db: "world".into(), sha256: fsx::sha256_bytes(sql.as_bytes()), destructive: false });
|
m.migrations.push(Migration { compatible_sha256: vec![], id: "2026_09_30_00_update_e2e".into(), db: "world".into(), sha256: fsx::sha256_bytes(sql.as_bytes()), destructive: false });
|
||||||
std::fs::write(pkg.join("manifest.json"), serde_json::to_vec_pretty(&m).unwrap()).unwrap();
|
std::fs::write(pkg.join("manifest.json"), serde_json::to_vec_pretty(&m).unwrap()).unwrap();
|
||||||
let key = format!("{}/.coa-manager/signing/manifest-signing.key", std::env::var("USERPROFILE").unwrap());
|
let key = format!("{}/.coa-manager/signing/manifest-signing.key", std::env::var("USERPROFILE").unwrap());
|
||||||
let seed: [u8; 32] = STANDARD.decode(std::fs::read_to_string(key).unwrap().trim()).unwrap().try_into().unwrap();
|
let seed: [u8; 32] = STANDARD.decode(std::fs::read_to_string(key).unwrap().trim()).unwrap().try_into().unwrap();
|
||||||
|
|||||||
@@ -0,0 +1,73 @@
|
|||||||
|
//! Failure injection on a NEW disposable fixture created by tools/make-fixture.ps1.
|
||||||
|
//! Uses real MySQL dumps, SQL execution, signed packages and update rollback.
|
||||||
|
use std::{collections::BTreeMap, path::{Path, PathBuf}};
|
||||||
|
use coa_core::{backup, db::{Account, Db}, download::Cancel, driver::{self, Verb}, fsx,
|
||||||
|
manifest::{Kind, Migration}, package::{self, BuildOptions}, pkgsource::Source,
|
||||||
|
registry::{InstallKind, InstallMeta, MetaDir},
|
||||||
|
update::{self, Env, RepackEnv}, Error, Result};
|
||||||
|
use base64::Engine;
|
||||||
|
use ed25519_dalek::{Signer, SigningKey};
|
||||||
|
|
||||||
|
fn main() -> Result<()> {
|
||||||
|
let arg = std::env::args().nth(1).expect("usage: update_recovery_e2e <new fixture>");
|
||||||
|
let root = PathBuf::from(arg);
|
||||||
|
assert!(root.file_name().unwrap().to_string_lossy().starts_with("coa-update-recovery-fixture-"));
|
||||||
|
assert!(!root.join("recovery-e2e-started").exists(), "Use a new fixture; never reuse an owned server");
|
||||||
|
fsx::atomic_write(&root.join("recovery-e2e-started"), b"disposable fixture")?;
|
||||||
|
let result = exercise(&root);
|
||||||
|
let stopped = driver::run(&root, Verb::StopAll)?;
|
||||||
|
assert!(stopped.ok);
|
||||||
|
result
|
||||||
|
}
|
||||||
|
|
||||||
|
fn exercise(root: &Path) -> Result<()> {
|
||||||
|
let meta = coa_core::registry::metadata_dir_for(root)?;
|
||||||
|
let mut installed = InstallMeta::new(InstallKind::New, root);
|
||||||
|
installed.core.version = Some("1.0.0".into());
|
||||||
|
MetaDir::create(root, &installed)?;
|
||||||
|
backup::with_database(root, |db| {
|
||||||
|
db.query("CREATE TABLE acore_characters.manager_recovery_probe (id INT); INSERT INTO acore_characters.manager_recovery_probe VALUES (42); CREATE TABLE acore_world.manager_recovery_probe (id INT); INSERT INTO acore_world.manager_recovery_probe VALUES (43);")?;
|
||||||
|
Ok(())
|
||||||
|
})?;
|
||||||
|
let source = root.join("fixture-update-source");
|
||||||
|
fsx::atomic_write(&source.join("Core/recovery-probe.txt"), b"updated")?;
|
||||||
|
let mut migrations = Vec::new();
|
||||||
|
for (db, id, sql) in [
|
||||||
|
("characters", "probe_chars", "UPDATE manager_recovery_probe SET id=999;"),
|
||||||
|
("world", "probe_world", "DROP TABLE manager_recovery_probe; THIS IS INTENTIONALLY INVALID SQL;"),
|
||||||
|
] {
|
||||||
|
fsx::atomic_write(&source.join(format!("_migrations/{db}/{id}.sql")), sql.as_bytes())?;
|
||||||
|
migrations.push(Migration { compatible_sha256: vec![], db: db.into(), id: id.into(), sha256: fsx::sha256_bytes(sql.as_bytes()), destructive: false });
|
||||||
|
}
|
||||||
|
let pkg = root.join("fixture-package");
|
||||||
|
let manifest = package::build(&source, &pkg, &BuildOptions {
|
||||||
|
kind: Kind::Update, version: "2.0.0".into(), core_commit: None, bots_commit: None,
|
||||||
|
built_at: "fixture".into(), part_size: 1 << 20, migrations,
|
||||||
|
}, &|_| {})?;
|
||||||
|
let key = SigningKey::generate(&mut rand_core::OsRng);
|
||||||
|
let signature = base64::engine::general_purpose::STANDARD.encode(key.sign(&std::fs::read(pkg.join("manifest.json"))?).to_bytes());
|
||||||
|
fsx::atomic_write(&pkg.join("manifest.json.sig"), signature.as_bytes())?;
|
||||||
|
let trusted = base64::engine::general_purpose::STANDARD.encode(key.verifying_key().to_bytes());
|
||||||
|
let env = RepackEnv { root, meta_dir: &meta };
|
||||||
|
let error = update::apply(&update::Params {
|
||||||
|
root, meta_dir: &meta, source: Source::Dir(pkg), trusted_key: &trusted,
|
||||||
|
cancel: Cancel::default(), resolutions: BTreeMap::new(), env: &env, fail_after_ops: None,
|
||||||
|
}, &|step, pct| println!("{pct}% {step}" )).unwrap_err();
|
||||||
|
assert!(error.to_string().contains("probe_world"), "{error}");
|
||||||
|
assert!(error.to_string().contains("were restored"), "{error}");
|
||||||
|
assert!(!root.join("Core/recovery-probe.txt").exists());
|
||||||
|
assert!(update::unfinished(&meta).is_none());
|
||||||
|
assert_eq!(MetaDir::open(&meta)?.1.core.version.as_deref(), Some("1.0.0"));
|
||||||
|
backup::with_database(root, |db| {
|
||||||
|
assert_eq!(db.query("SELECT id FROM acore_characters.manager_recovery_probe;")?, "42");
|
||||||
|
assert_eq!(db.query("SELECT id FROM acore_world.manager_recovery_probe;")?, "43");
|
||||||
|
assert!(!coa_core::migrations::status(db, &manifest.migrations)?.iter().any(|m| m.status == coa_core::migrations::Status::Applied));
|
||||||
|
Ok(())
|
||||||
|
})?;
|
||||||
|
// A recovery point can be reused if the process died midway through restoring multiple schemas.
|
||||||
|
let point = backup::list(&meta).into_iter().find(|p| p.trigger == backup::Trigger::BeforeUpdate).ok_or_else(|| Error::Invalid("missing backup".into()))?;
|
||||||
|
env.restore_snapshot(&point.id)?;
|
||||||
|
assert_eq!(Db::from_repack(root, Account::Admin)?.realm(), coa_core::realms::Mode::Coa);
|
||||||
|
println!("PASS: failed SQL restored world, characters, ledger, files and version; repeated recovery succeeded");
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
use coa_core::update::{Env, RepackEnv};
|
||||||
|
use std::path::PathBuf;
|
||||||
|
|
||||||
|
fn main() {
|
||||||
|
let root = PathBuf::from(std::env::args().nth(1).expect("disposable fixture path"));
|
||||||
|
assert_eq!(std::fs::read(root.join(".release-schema-fixture")).unwrap(), b"disposable release-schema fixture");
|
||||||
|
let meta = coa_core::registry::metadata_dir_for(&root).unwrap();
|
||||||
|
let env = RepackEnv { root: &root, meta_dir: &meta };
|
||||||
|
let result = env.validate();
|
||||||
|
let _ = coa_core::driver::run(&root, coa_core::driver::Verb::StopAll);
|
||||||
|
if let Err(error) = result {
|
||||||
|
eprintln!("{}", error);
|
||||||
|
for log in ["Core/Logs/auth-console.log", "Core/Logs/world-console.log", "Core/Logs/supervisor.log"] {
|
||||||
|
eprintln!("{log}:\n{}", coa_core::diag::redact(&coa_core::health::tail(&root.join(log), 8192)));
|
||||||
|
}
|
||||||
|
std::process::exit(1);
|
||||||
|
}
|
||||||
|
println!("Published server startup validation passed on the disposable fixture");
|
||||||
|
}
|
||||||
@@ -0,0 +1,58 @@
|
|||||||
|
//! Reproduce applied migration history with five missing tables on a disposable MySQL fixture.
|
||||||
|
use std::path::PathBuf;
|
||||||
|
use coa_core::{backup, fsx, manifest::Migration, migrations::{self, LedgerRow, Status, Store}, release_schema, schema_check, Error, Result};
|
||||||
|
|
||||||
|
fn main() -> Result<()> {
|
||||||
|
let mut args = std::env::args().skip(1);
|
||||||
|
let root = PathBuf::from(args.next().ok_or_else(|| Error::Invalid("fixture path required".into()))?);
|
||||||
|
let old_sql = PathBuf::from(args.next().ok_or_else(|| Error::Invalid("core SQL directory required".into()))?);
|
||||||
|
let repairs = PathBuf::from(args.next().ok_or_else(|| Error::Invalid("repair SQL directory required".into()))?);
|
||||||
|
if !root.file_name().is_some_and(|n| n.to_string_lossy().starts_with("coa-update-recovery-fixture-"))
|
||||||
|
|| !root.join("recovery-e2e-started").exists() {
|
||||||
|
return Err(Error::Invalid("Refusing a non-disposable recovery fixture.".into()));
|
||||||
|
}
|
||||||
|
let tree = tempfile::tempdir()?;
|
||||||
|
backup::with_database(&root, |db| {
|
||||||
|
let db = db.clone().for_realm(coa_core::realms::Mode::Coa);
|
||||||
|
let characters = db.query("SELECT COUNT(*) FROM acore_characters.characters;")?;
|
||||||
|
db.load()?;
|
||||||
|
// Record exactly the old file hashes, as in the user's all-applied report.
|
||||||
|
let mut migrations = Vec::new();
|
||||||
|
for name in ["rev_20260929_92_coa_wildcard_skill_cards", "rev_20260929_93_coa_wildcard_skill_card_duplicates", "rev_20260929_94_coa_wildcard_specialization_cache"] {
|
||||||
|
let path = old_sql.join(format!("{name}.sql"));
|
||||||
|
let hash = fsx::sha256_file(&path)?;
|
||||||
|
db.put(&LedgerRow { db: "characters".into(), id: name.into(), sha256: hash.clone(), status: Status::Applied, error: None, baseline: false })?;
|
||||||
|
migrations.push(Migration { compatible_sha256: vec![], db: "characters".into(), id: name.into(), sha256: hash, destructive: false });
|
||||||
|
}
|
||||||
|
for (_, tables) in schema_check::WILDCARD_TABLES.iter().filter(|(kind,_)| *kind == "characters") {
|
||||||
|
for table in *tables { db.query(&format!("DROP TABLE IF EXISTS acore_characters.`{table}`;"))?; }
|
||||||
|
}
|
||||||
|
assert!(migrations::status(&db, &migrations)?.iter().all(|m| m.status == Status::Applied));
|
||||||
|
assert!(!db.tables("acore_characters")?.iter().any(|t| t == "coa_wildcard_skill_card"));
|
||||||
|
let empty_core = tempfile::tempdir()?;
|
||||||
|
let files = release_schema::collect(empty_core.path(), None, Some(&repairs))?;
|
||||||
|
assert_eq!(files.len(), 1);
|
||||||
|
let repair = &files[0];
|
||||||
|
migrations.push(Migration { compatible_sha256: vec![], db: repair.db.clone(), id: repair.id.clone(), sha256: repair.sha256.clone(), destructive: false });
|
||||||
|
let staged = tree.path().join("sql/characters");
|
||||||
|
fsx::atomic_write(&staged.join(format!("{}.sql", repair.id)), &std::fs::read(&repair.abs)?)?;
|
||||||
|
let report = migrations::apply_pending(&db, &migrations, &tree.path().join("sql"), &|| Ok("disposable fixture".into()))?;
|
||||||
|
assert!(report.failed.is_none());
|
||||||
|
assert_eq!(report.applied, [repair.id.clone()]);
|
||||||
|
assert_eq!(db.query("SELECT COUNT(*) FROM acore_characters.characters;")?, characters);
|
||||||
|
db.query("INSERT INTO acore_characters.coa_wildcard_skill_card VALUES (77,123,456);")?;
|
||||||
|
db.run_sql_file("acore_characters", &repair.abs)?;
|
||||||
|
assert_eq!(db.query("SELECT progress FROM acore_characters.coa_wildcard_skill_card WHERE account=77 AND card=123;")?, "456");
|
||||||
|
assert!(migrations::apply_pending(&db, &migrations, &tree.path().join("sql"), &|| Ok("disposable fixture".into()))?.applied.is_empty());
|
||||||
|
schema_check::capture(&db, tree.path())?;
|
||||||
|
db.query("DROP TABLE acore_characters.coa_wildcard_skill_card_purchase;")?;
|
||||||
|
assert!(schema_check::check(&db, tree.path())?.iter().any(|p| p.table == "coa_wildcard_skill_card_purchase" && p.detail == "Missing table"));
|
||||||
|
db.run_sql_file("acore_characters", &repair.abs)?;
|
||||||
|
db.query("ALTER TABLE acore_characters.coa_wildcard_skill_card DROP COLUMN progress;")?;
|
||||||
|
assert!(schema_check::check(&db, tree.path())?.iter().any(|p| p.table == "coa_wildcard_skill_card" && p.column == "progress"));
|
||||||
|
db.query("ALTER TABLE acore_characters.coa_wildcard_skill_card ADD COLUMN progress INT UNSIGNED NOT NULL DEFAULT 0;")?;
|
||||||
|
Ok(())
|
||||||
|
})?;
|
||||||
|
println!("Applied history with all five tables missing repaired; characters and existing card rows preserved; full contract detects missing tables and columns.");
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
@@ -51,6 +51,8 @@ pub struct Component {
|
|||||||
pub sha256: Option<String>,
|
pub sha256: Option<String>,
|
||||||
pub tables: Option<usize>,
|
pub tables: Option<usize>,
|
||||||
pub files: Option<Vec<String>>,
|
pub files: Option<Vec<String>>,
|
||||||
|
#[serde(default)]
|
||||||
|
pub file_sha256: std::collections::BTreeMap<String, String>,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||||
@@ -91,7 +93,9 @@ pub fn list(meta: &Path) -> Vec<RecoveryPoint> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub fn get(meta: &Path, id: &str) -> Result<RecoveryPoint> {
|
pub fn get(meta: &Path, id: &str) -> Result<RecoveryPoint> {
|
||||||
fsx::read_json(&point_dir(meta, id)?.join("backup.json")).map_err(|_| Error::Invalid(format!("backup {id} was not found")))
|
let point: RecoveryPoint = fsx::read_json(&fsx::ensure_within(meta, &point_dir(meta, id)?.join("backup.json"))?).map_err(|_| Error::Invalid(format!("backup {id} was not found or its metadata is damaged")))?;
|
||||||
|
if point.id != id || point.schema != 1 { return Err(Error::Invalid(format!("Backup {id} has inconsistent identity or an unsupported schema."))); }
|
||||||
|
Ok(point)
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Files that make up "configuration": everything a user or the Manager may have changed, minus secrets.
|
/// Files that make up "configuration": everything a user or the Manager may have changed, minus secrets.
|
||||||
@@ -139,13 +143,16 @@ fn copy_configs(root: &Path, dir: &Path) -> Result<Component> {
|
|||||||
let files = config_files(root);
|
let files = config_files(root);
|
||||||
let target = dir.join("files");
|
let target = dir.join("files");
|
||||||
let mut bytes = 0;
|
let mut bytes = 0;
|
||||||
|
let mut file_sha256 = std::collections::BTreeMap::new();
|
||||||
for rel in &files {
|
for rel in &files {
|
||||||
let src = fsx::safe_join(root, rel)?;
|
let src = fsx::safe_join(root, rel)?;
|
||||||
let dst = fsx::safe_join(&target, rel)?;
|
let dst = fsx::safe_join(&target, rel)?;
|
||||||
fs::create_dir_all(dst.parent().unwrap())?;
|
let content = fs::read(&src)?;
|
||||||
bytes += fs::copy(&src, &dst)?;
|
fsx::atomic_write(&dst, &content)?;
|
||||||
|
bytes += content.len() as u64;
|
||||||
|
file_sha256.insert(rel.clone(), fsx::sha256_bytes(&content));
|
||||||
}
|
}
|
||||||
Ok(Component { name: "configs".into(), path: "files".into(), bytes, sha256: None, tables: None, files: Some(files) })
|
Ok(Component { name: "configs".into(), path: "files".into(), bytes, sha256: None, tables: None, files: Some(files), file_sha256 })
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Make sure the database is up for `f`. If we had to start it (and nothing else is running), stop it again.
|
/// Make sure the database is up for `f`. If we had to start it (and nothing else is running), stop it again.
|
||||||
@@ -179,7 +186,7 @@ fn wanted_databases(kind: Kind) -> &'static [&'static str] {
|
|||||||
|
|
||||||
/// Create a recovery point. The server may be running: dumps are consistent snapshots (`--single-transaction`).
|
/// Create a recovery point. The server may be running: dumps are consistent snapshots (`--single-transaction`).
|
||||||
pub fn create(root: &Path, meta: &Path, kind: Kind, trigger: Trigger, label: Option<String>, progress: &dyn Fn(&str)) -> Result<RecoveryPoint> {
|
pub fn create(root: &Path, meta: &Path, kind: Kind, trigger: Trigger, label: Option<String>, progress: &dyn Fn(&str)) -> Result<RecoveryPoint> {
|
||||||
let id = format!("{}-{}", chrono::Utc::now().format("%Y%m%d-%H%M%S"), match trigger {
|
let id = format!("{}-{}-{}", chrono::Utc::now().format("%Y%m%d-%H%M%S"), match trigger {
|
||||||
Trigger::Manual => "manual",
|
Trigger::Manual => "manual",
|
||||||
Trigger::Automatic => "auto",
|
Trigger::Automatic => "auto",
|
||||||
Trigger::BeforeUpdate => "before-update",
|
Trigger::BeforeUpdate => "before-update",
|
||||||
@@ -188,7 +195,7 @@ pub fn create(root: &Path, meta: &Path, kind: Kind, trigger: Trigger, label: Opt
|
|||||||
Trigger::BeforeBots => "before-bots",
|
Trigger::BeforeBots => "before-bots",
|
||||||
Trigger::BeforeRepair => "before-repair",
|
Trigger::BeforeRepair => "before-repair",
|
||||||
Trigger::BeforeDangerousChange => "before-change",
|
Trigger::BeforeDangerousChange => "before-change",
|
||||||
});
|
}, uuid::Uuid::new_v4().simple());
|
||||||
let final_dir = point_dir(meta, &id)?;
|
let final_dir = point_dir(meta, &id)?;
|
||||||
let partial = backups_dir(meta).join(format!("{id}.partial"));
|
let partial = backups_dir(meta).join(format!("{id}.partial"));
|
||||||
fs::create_dir_all(&partial)?;
|
fs::create_dir_all(&partial)?;
|
||||||
@@ -203,6 +210,9 @@ pub fn create(root: &Path, meta: &Path, kind: Kind, trigger: Trigger, label: Opt
|
|||||||
databases.push((format!("{}-characters", other.name()), other.schema("characters")?));
|
databases.push((format!("{}-characters", other.name()), other.schema("characters")?));
|
||||||
if kind == Kind::Full { databases.push((format!("{}-world", other.name()), other.schema("world")?)); }
|
if kind == Kind::Full { databases.push((format!("{}-world", other.name()), other.schema("world")?)); }
|
||||||
}
|
}
|
||||||
|
if kind != Kind::Config && with_database(root, |db| db.schema_exists("acore_playerbots"))? {
|
||||||
|
databases.push(("playerbots".into(), "acore_playerbots"));
|
||||||
|
}
|
||||||
for (name, schema) in databases {
|
for (name, schema) in databases {
|
||||||
progress(&format!("Backing up {name} database"));
|
progress(&format!("Backing up {name} database"));
|
||||||
let component = with_database(root, |db| {
|
let component = with_database(root, |db| {
|
||||||
@@ -212,7 +222,7 @@ pub fn create(root: &Path, meta: &Path, kind: Kind, trigger: Trigger, label: Opt
|
|||||||
let tables = db.tables(schema)?.len();
|
let tables = db.tables(schema)?.len();
|
||||||
let file = format!("{name}.sql.zst");
|
let file = format!("{name}.sql.zst");
|
||||||
let (bytes, sha) = db.dump_to(schema, &partial.join(&file))?;
|
let (bytes, sha) = db.dump_to(schema, &partial.join(&file))?;
|
||||||
Ok(Component { name, path: file, bytes, sha256: Some(sha), tables: Some(tables), files: None })
|
Ok(Component { name, path: file, bytes, sha256: Some(sha), tables: Some(tables), files: None, file_sha256: Default::default() })
|
||||||
})?;
|
})?;
|
||||||
components.push(component);
|
components.push(component);
|
||||||
}
|
}
|
||||||
@@ -252,6 +262,7 @@ pub fn create(root: &Path, meta: &Path, kind: Kind, trigger: Trigger, label: Opt
|
|||||||
|
|
||||||
/// Keep the newest `keep` automatic recovery points; manual and safety ones are never pruned.
|
/// Keep the newest `keep` automatic recovery points; manual and safety ones are never pruned.
|
||||||
pub fn prune_automatic(meta: &Path, keep: usize) {
|
pub fn prune_automatic(meta: &Path, keep: usize) {
|
||||||
|
if crate::update::ensure_recovered(meta).is_err() { return; }
|
||||||
let autos: Vec<_> = list(meta).into_iter().filter(|p| p.trigger == Trigger::Automatic).collect();
|
let autos: Vec<_> = list(meta).into_iter().filter(|p| p.trigger == Trigger::Automatic).collect();
|
||||||
for p in autos.into_iter().skip(keep) {
|
for p in autos.into_iter().skip(keep) {
|
||||||
if let Ok(dir) = point_dir(meta, &p.id) {
|
if let Ok(dir) = point_dir(meta, &p.id) {
|
||||||
@@ -270,8 +281,21 @@ pub fn verify(meta: &Path, id: &str) -> Result<VerifyReport> {
|
|||||||
let point = get(meta, id)?;
|
let point = get(meta, id)?;
|
||||||
let dir = point_dir(meta, id)?;
|
let dir = point_dir(meta, id)?;
|
||||||
let mut problems = Vec::new();
|
let mut problems = Vec::new();
|
||||||
|
let mut names = std::collections::BTreeSet::new();
|
||||||
|
let mut schemas = std::collections::BTreeSet::new();
|
||||||
for c in &point.components {
|
for c in &point.components {
|
||||||
let path = dir.join(&c.path);
|
if !names.insert(&c.name) { problems.push(format!("{} appears more than once", c.name)); }
|
||||||
|
let path = fsx::ensure_within(&dir, &fsx::safe_join(&dir, &c.path)?)?;
|
||||||
|
if c.name != "configs" && (c.sha256.is_none() || c.tables.is_none()) { problems.push(format!("{} lacks database integrity metadata", c.name)); }
|
||||||
|
if c.name == "configs" {
|
||||||
|
if c.sha256.is_some() || c.files.is_none() { problems.push("configuration integrity metadata is inconsistent".into()); }
|
||||||
|
} else {
|
||||||
|
let schema = if c.name.contains('-') || c.name == "playerbots" { db::schema_of(&c.name) } else { point.realm.schema(&c.name) };
|
||||||
|
match schema {
|
||||||
|
Ok(schema) if schemas.insert(schema) => {}
|
||||||
|
_ => problems.push(format!("{} has an unknown or duplicate database target", c.name)),
|
||||||
|
}
|
||||||
|
}
|
||||||
match (&c.sha256, &c.files) {
|
match (&c.sha256, &c.files) {
|
||||||
(Some(sha), _) => match fsx::sha256_file(&path) {
|
(Some(sha), _) => match fsx::sha256_file(&path) {
|
||||||
Ok(actual) if actual.eq_ignore_ascii_case(sha) => {}
|
Ok(actual) if actual.eq_ignore_ascii_case(sha) => {}
|
||||||
@@ -280,12 +304,16 @@ pub fn verify(meta: &Path, id: &str) -> Result<VerifyReport> {
|
|||||||
},
|
},
|
||||||
(None, Some(files)) => {
|
(None, Some(files)) => {
|
||||||
for f in files {
|
for f in files {
|
||||||
|
if !c.file_sha256.is_empty() && !c.file_sha256.contains_key(f) { problems.push(format!("configuration file {f} lacks its checksum")); }
|
||||||
if !fsx::safe_join(&path, f).map(|p| p.is_file()).unwrap_or(false) {
|
if !fsx::safe_join(&path, f).map(|p| p.is_file()).unwrap_or(false) {
|
||||||
problems.push(format!("configuration file {f} is missing"));
|
problems.push(format!("configuration file {f} is missing"));
|
||||||
|
} else if let Some(expected) = c.file_sha256.get(f) {
|
||||||
|
let file = fsx::ensure_within(&dir, &fsx::safe_join(&path, f)?)?;
|
||||||
|
if fsx::sha256_file(&file)?.as_str() != expected { problems.push(format!("configuration file {f} is damaged")); }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
_ => {}
|
_ => problems.push(format!("{} lacks an integrity inventory", c.name)),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Ok(VerifyReport { ok: problems.is_empty(), problems })
|
Ok(VerifyReport { ok: problems.is_empty(), problems })
|
||||||
@@ -293,6 +321,11 @@ pub fn verify(meta: &Path, id: &str) -> Result<VerifyReport> {
|
|||||||
|
|
||||||
/// Delete one recovery point (its own folder only).
|
/// Delete one recovery point (its own folder only).
|
||||||
pub fn delete(meta: &Path, id: &str) -> Result<()> {
|
pub fn delete(meta: &Path, id: &str) -> Result<()> {
|
||||||
|
let _lock = crate::update::operation_lock(meta)?;
|
||||||
|
crate::update::ensure_recovered(meta)?;
|
||||||
|
if crate::update::unfinished(meta).is_some_and(|t| t.recovery_point.as_deref() == Some(id)) {
|
||||||
|
return Err(Error::Invalid("This recovery point is required by an unfinished update and cannot be deleted.".into()));
|
||||||
|
}
|
||||||
let dir = point_dir(meta, id)?;
|
let dir = point_dir(meta, id)?;
|
||||||
get(meta, id)?; // must be a real recovery point
|
get(meta, id)?; // must be a real recovery point
|
||||||
fs::remove_dir_all(dir)?;
|
fs::remove_dir_all(dir)?;
|
||||||
@@ -341,10 +374,10 @@ pub fn restore_database(root: &Path, meta: &Path, id: &str, name: &str) -> Resul
|
|||||||
if now.world.state != ServiceState::Stopped || now.auth.state != ServiceState::Stopped || crate::multiworld::is_running(root) {
|
if now.world.state != ServiceState::Stopped || now.auth.state != ServiceState::Stopped || crate::multiworld::is_running(root) {
|
||||||
return Err(Error::Invalid("Stop the server before restoring a database.".into()));
|
return Err(Error::Invalid("Stop the server before restoring a database.".into()));
|
||||||
}
|
}
|
||||||
let live = if name.contains('-') { db::schema_of(name)? } else { point.realm.schema(name)? };
|
let live = if name.contains('-') || name == "playerbots" { db::schema_of(name)? } else { point.realm.schema(name)? };
|
||||||
let expected_tables = comp.tables.unwrap_or(0);
|
let expected_tables = comp.tables.unwrap_or(0);
|
||||||
let dump = point_dir(meta, id)?.join(&comp.path);
|
let dump = point_dir(meta, id)?.join(&comp.path);
|
||||||
let stamp = chrono::Utc::now().format("%Y%m%d%H%M%S").to_string();
|
let stamp = uuid::Uuid::new_v4().simple().to_string()[..16].to_string();
|
||||||
|
|
||||||
// 1. Safety copy of the current state, so even a wrong restore is reversible.
|
// 1. Safety copy of the current state, so even a wrong restore is reversible.
|
||||||
let safety = create(root, meta, Kind::Database, Trigger::BeforeRestore, Some(format!("before restoring {name} from {id}")), &|_| {})?;
|
let safety = create(root, meta, Kind::Database, Trigger::BeforeRestore, Some(format!("before restoring {name} from {id}")), &|_| {})?;
|
||||||
@@ -361,7 +394,7 @@ pub fn restore_database(root: &Path, meta: &Path, id: &str, name: &str) -> Resul
|
|||||||
db.import_from(&staging, &dump)?;
|
db.import_from(&staging, &dump)?;
|
||||||
// 3. Sanity checks.
|
// 3. Sanity checks.
|
||||||
let staged = db.tables(&staging)?;
|
let staged = db.tables(&staging)?;
|
||||||
if staged.is_empty() || (expected_tables > 0 && staged.len() != expected_tables) {
|
if comp.tables.is_some_and(|expected| staged.len() != expected) || (comp.tables.is_none() && staged.is_empty()) {
|
||||||
return Err(Error::Invalid(format!("The restored copy looks incomplete ({} of {expected_tables} tables); nothing was changed.", staged.len())));
|
return Err(Error::Invalid(format!("The restored copy looks incomplete ({} of {expected_tables} tables); nothing was changed.", staged.len())));
|
||||||
}
|
}
|
||||||
if db.extra_objects(&staging)? > 0 || db.extra_objects(live)? > 0 {
|
if db.extra_objects(&staging)? > 0 || db.extra_objects(live)? > 0 {
|
||||||
@@ -377,7 +410,7 @@ pub fn restore_database(root: &Path, meta: &Path, id: &str, name: &str) -> Resul
|
|||||||
for t in &staged {
|
for t in &staged {
|
||||||
renames.push(format!("`{staging}`.`{t}` TO `{live}`.`{t}`"));
|
renames.push(format!("`{staging}`.`{t}` TO `{live}`.`{t}`"));
|
||||||
}
|
}
|
||||||
db.query(&format!("RENAME TABLE {};", renames.join(", ")))?;
|
if !renames.is_empty() { db.query(&format!("RENAME TABLE {};", renames.join(", ")))?; }
|
||||||
Ok(DbRestore { previous_schema: old, safety_backup: safety.id.clone(), tables_restored: staged.len() })
|
Ok(DbRestore { previous_schema: old, safety_backup: safety.id.clone(), tables_restored: staged.len() })
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@@ -399,6 +432,36 @@ mod tests {
|
|||||||
(dir, root, meta)
|
(dir, root, meta)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn backup_deletion_obeys_the_installation_lock() {
|
||||||
|
let (_d, root, meta) = setup();
|
||||||
|
let point = create(&root, &meta, Kind::Config, Trigger::Manual, None, &|_| {}).unwrap();
|
||||||
|
let lock = crate::update::operation_lock(&meta).unwrap();
|
||||||
|
assert!(delete(&meta, &point.id).is_err());
|
||||||
|
assert!(get(&meta, &point.id).is_ok());
|
||||||
|
drop(lock);
|
||||||
|
delete(&meta, &point.id).unwrap();
|
||||||
|
assert!(get(&meta, &point.id).is_err());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn damaged_configuration_is_detected_before_restore_and_copies_are_retained() {
|
||||||
|
let (_d, root, meta) = setup();
|
||||||
|
let point = create(&root, &meta, Kind::Config, Trigger::Automatic, None, &|_| {}).unwrap();
|
||||||
|
let file = point_dir(&meta, &point.id).unwrap().join("files/Core/configs/worldserver.conf");
|
||||||
|
fs::write(&file, b"corrupted").unwrap();
|
||||||
|
assert!(!verify(&meta, &point.id).unwrap().ok);
|
||||||
|
let original = fs::read(root.join("Core/configs/worldserver.conf")).unwrap();
|
||||||
|
assert!(restore_configs(&root, &meta, &point.id).is_err());
|
||||||
|
assert_eq!(fs::read(root.join("Core/configs/worldserver.conf")).unwrap(), original);
|
||||||
|
assert_eq!(list(&meta).len(), 1);
|
||||||
|
fs::create_dir_all(meta.join("updates/broken")).unwrap();
|
||||||
|
fs::write(meta.join("updates/broken/txn.json"), b"{damaged").unwrap();
|
||||||
|
assert!(delete(&meta, &point.id).is_err());
|
||||||
|
prune_automatic(&meta, 0);
|
||||||
|
assert!(file.exists());
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn config_backup_excludes_secrets_and_clutter_and_restores_byte_exact() {
|
fn config_backup_excludes_secrets_and_clutter_and_restores_byte_exact() {
|
||||||
let (_d, root, meta) = setup();
|
let (_d, root, meta) = setup();
|
||||||
|
|||||||
@@ -181,7 +181,7 @@ pub fn build(p: &Params, say: &dyn Fn(&str)) -> Result<()> {
|
|||||||
if let Some(b) = p.bots {
|
if let Some(b) = p.bots {
|
||||||
sql.extend(collect_bots_sql(b)?);
|
sql.extend(collect_bots_sql(b)?);
|
||||||
}
|
}
|
||||||
let migrations: Vec<_> = sql.iter().map(|f| crate::manifest::Migration { id: f.id.clone(), db: f.db.clone(), sha256: f.sha256.clone(), destructive: false }).collect();
|
let migrations: Vec<_> = sql.iter().map(|f| crate::manifest::Migration { compatible_sha256: vec![], id: f.id.clone(), db: f.db.clone(), sha256: f.sha256.clone(), destructive: false }).collect();
|
||||||
let staging = std::env::temp_dir().join("coa-cleanbase-sql");
|
let staging = std::env::temp_dir().join("coa-cleanbase-sql");
|
||||||
let _ = fs::remove_dir_all(&staging);
|
let _ = fs::remove_dir_all(&staging);
|
||||||
for f in &sql {
|
for f in &sql {
|
||||||
@@ -256,6 +256,9 @@ pub fn build(p: &Params, say: &dyn Fn(&str)) -> Result<()> {
|
|||||||
if accounts != "0" || chars != "0" || templates != 21 {
|
if accounts != "0" || chars != "0" || templates != 21 {
|
||||||
return Err(Error::Invalid(format!("The database is not clean ({accounts} accounts, {chars} player characters, {templates} templates).")));
|
return Err(Error::Invalid(format!("The database is not clean ({accounts} accounts, {chars} player characters, {templates} templates).")));
|
||||||
}
|
}
|
||||||
|
if let Some(p) = crate::schema_check::check(db, p.tree)?.first() {
|
||||||
|
return Err(Error::Invalid(format!("The rebuilt base database is incomplete: {}.{}.{}: {}", p.database, p.table, p.column, p.detail)));
|
||||||
|
}
|
||||||
crate::schema_check::capture(db, out)?;
|
crate::schema_check::capture(db, out)?;
|
||||||
Ok(())
|
Ok(())
|
||||||
})?;
|
})?;
|
||||||
@@ -276,7 +279,7 @@ pub fn build(p: &Params, say: &dyn Fn(&str)) -> Result<()> {
|
|||||||
fsx::atomic_write_json(&repack_json, &shipped)?;
|
fsx::atomic_write_json(&repack_json, &shipped)?;
|
||||||
|
|
||||||
say("Adding the release files");
|
say("Adding the release files");
|
||||||
copy_dir(p.tree, p.out, &|_| false, p.tree)?;
|
copy_dir(p.tree, p.out, &|rel| rel == crate::schema_check::CONTRACT, p.tree)?;
|
||||||
if let Some(data) = p.data {
|
if let Some(data) = p.data {
|
||||||
say("Copying game data");
|
say("Copying game data");
|
||||||
fs::create_dir_all(p.out.join("Data"))?;
|
fs::create_dir_all(p.out.join("Data"))?;
|
||||||
|
|||||||
@@ -180,7 +180,7 @@ fn backup_dir(meta: &Path) -> PathBuf {
|
|||||||
meta.join("backups").join("client")
|
meta.join("backups").join("client")
|
||||||
}
|
}
|
||||||
|
|
||||||
fn host_ok(h: &str) -> bool {
|
pub fn host_ok(h: &str) -> bool {
|
||||||
!h.is_empty() && h.len() <= 253 && h.chars().all(|c| c.is_ascii_alphanumeric() || matches!(c, '.' | '-' | ':')) && !h.starts_with('-')
|
!h.is_empty() && h.len() <= 253 && h.chars().all(|c| c.is_ascii_alphanumeric() || matches!(c, '.' | '-' | ':')) && !h.starts_with('-')
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+116
-4
@@ -1,4 +1,5 @@
|
|||||||
//! Database access through the MySQL client tools bundled with the repack (`mysql`, `mysqldump`, `mysqladmin`).
|
//! Database access through the MySQL client tools bundled with the repack (`mysql`, `mysqldump`, `mysqladmin`), or,
|
||||||
|
//! for a Docker installation, the same tools run inside the database container with `docker exec`.
|
||||||
//!
|
//!
|
||||||
//! Passwords travel only in the child's environment (`MYSQL_PWD`), never on a command line or in a log.
|
//! Passwords travel only in the child's environment (`MYSQL_PWD`), never on a command line or in a log.
|
||||||
|
|
||||||
@@ -45,6 +46,8 @@ pub struct Db {
|
|||||||
user: &'static str,
|
user: &'static str,
|
||||||
password: Secret,
|
password: Secret,
|
||||||
realm: crate::realms::Mode,
|
realm: crate::realms::Mode,
|
||||||
|
/// Name of the database container of a Docker installation; the client tools then run inside it.
|
||||||
|
container: Option<String>,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Deserialize)]
|
#[derive(Deserialize)]
|
||||||
@@ -68,6 +71,7 @@ fn no_window(cmd: &mut Command) {
|
|||||||
pub const SCHEMAS: [(&str, &str); 3] = [("characters", "acore_characters"), ("auth", "acore_auth"), ("world", "acore_world")];
|
pub const SCHEMAS: [(&str, &str); 3] = [("characters", "acore_characters"), ("auth", "acore_auth"), ("world", "acore_world")];
|
||||||
|
|
||||||
pub fn schema_of(kind: &str) -> Result<&'static str> {
|
pub fn schema_of(kind: &str) -> Result<&'static str> {
|
||||||
|
if kind == "playerbots" { return Ok("acore_playerbots"); }
|
||||||
if let Some(kind) = kind.strip_prefix("wildcard-") { return crate::realms::Mode::Wildcard.schema(kind); }
|
if let Some(kind) = kind.strip_prefix("wildcard-") { return crate::realms::Mode::Wildcard.schema(kind); }
|
||||||
if let Some(kind) = kind.strip_prefix("coa-") { return crate::realms::Mode::Coa.schema(kind); }
|
if let Some(kind) = kind.strip_prefix("coa-") { return crate::realms::Mode::Coa.schema(kind); }
|
||||||
SCHEMAS.iter().find(|(k, _)| *k == kind).map(|(_, s)| *s).ok_or_else(|| Error::Invalid(format!("unknown database {kind}")))
|
SCHEMAS.iter().find(|(k, _)| *k == kind).map(|(_, s)| *s).ok_or_else(|| Error::Invalid(format!("unknown database {kind}")))
|
||||||
@@ -89,6 +93,9 @@ impl Db {
|
|||||||
let creds: Credentials = fsx::read_json(&root.join("Settings/database.json"))
|
let creds: Credentials = fsx::read_json(&root.join("Settings/database.json"))
|
||||||
.map_err(|_| Error::Invalid("The database settings of this server could not be read.".into()))?;
|
.map_err(|_| Error::Invalid("The database settings of this server could not be read.".into()))?;
|
||||||
let ports: Ports = read_ports(root);
|
let ports: Ports = read_ports(root);
|
||||||
|
if crate::docker::is_docker(root) {
|
||||||
|
return Db::in_container(root, creds, account);
|
||||||
|
}
|
||||||
let bin = root.join("mysql/bin");
|
let bin = root.join("mysql/bin");
|
||||||
if !bin.join("mysqldump.exe").is_file() || !bin.join("mysql.exe").is_file() {
|
if !bin.join("mysqldump.exe").is_file() || !bin.join("mysql.exe").is_file() {
|
||||||
return Err(Error::Invalid("The bundled database tools are missing.".into()));
|
return Err(Error::Invalid("The bundled database tools are missing.".into()));
|
||||||
@@ -97,7 +104,20 @@ impl Db {
|
|||||||
Account::Admin => ("root", creds.root_password),
|
Account::Admin => ("root", creds.root_password),
|
||||||
Account::App => ("acore", creds.app_password),
|
Account::App => ("acore", creds.app_password),
|
||||||
};
|
};
|
||||||
Ok(Db { bin, port: ports.mysql, user, password: Secret(password), realm: crate::realms::state(root)?.active })
|
Ok(Db { bin, port: ports.mysql, user, password: Secret(password), realm: crate::realms::state(root)?.active, container: None })
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The database of a Docker installation: the client tools of the database image, run with `docker exec`. The
|
||||||
|
/// database is not published on the host, so nothing about this depends on a port or on tools installed here.
|
||||||
|
fn in_container(root: &Path, creds: Credentials, account: Account) -> Result<Db> {
|
||||||
|
let container = crate::docker::Config::load(root)?.database_container();
|
||||||
|
let (user, password) = match account {
|
||||||
|
Account::Admin => ("root", creds.root_password),
|
||||||
|
Account::App => ("acore", creds.app_password),
|
||||||
|
};
|
||||||
|
// Inside the container the server listens on its standard port; the commands below connect to it over TCP on
|
||||||
|
// the container's own loopback, exactly like the commands of a repack do on the host.
|
||||||
|
Ok(Db { bin: PathBuf::new(), port: 3306, user, password: Secret(password), realm: crate::realms::state(root)?.active, container: Some(container) })
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn for_realm(mut self, realm: crate::realms::Mode) -> Self { self.realm = realm; self }
|
pub fn for_realm(mut self, realm: crate::realms::Mode) -> Self { self.realm = realm; self }
|
||||||
@@ -133,7 +153,15 @@ impl Db {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn command(&self, tool: &str) -> Command {
|
fn command(&self, tool: &str) -> Command {
|
||||||
let mut c = Command::new(self.bin.join(tool));
|
let mut c = match &self.container {
|
||||||
|
None => Command::new(self.bin.join(tool)),
|
||||||
|
Some(name) => {
|
||||||
|
// `-e MYSQL_PWD` without a value takes it from this process's environment: never on a command line.
|
||||||
|
let mut c = Command::new("docker");
|
||||||
|
c.args(["exec", "-i", "-e", "MYSQL_PWD", name, tool.trim_end_matches(".exe")]);
|
||||||
|
c
|
||||||
|
}
|
||||||
|
};
|
||||||
c.env("MYSQL_PWD", self.password.expose())
|
c.env("MYSQL_PWD", self.password.expose())
|
||||||
.arg("--protocol=tcp")
|
.arg("--protocol=tcp")
|
||||||
.arg("--host=127.0.0.1")
|
.arg("--host=127.0.0.1")
|
||||||
@@ -148,7 +176,8 @@ impl Db {
|
|||||||
|
|
||||||
fn fail(&self, stderr: &[u8]) -> Error {
|
fn fail(&self, stderr: &[u8]) -> Error {
|
||||||
let text = String::from_utf8_lossy(stderr);
|
let text = String::from_utf8_lossy(stderr);
|
||||||
let code = if text.contains("2003") || text.contains("Can't connect") { ErrorCode::DatabaseNotRunning } else { ErrorCode::Unknown };
|
let down = text.contains("2003") || text.contains("Can't connect") || text.contains("is not running") || text.contains("No such container");
|
||||||
|
let code = if down { ErrorCode::DatabaseNotRunning } else { ErrorCode::Unknown };
|
||||||
match code {
|
match code {
|
||||||
ErrorCode::DatabaseNotRunning => Error::Invalid("The database is not running. Start the server first.".into()),
|
ErrorCode::DatabaseNotRunning => Error::Invalid("The database is not running. Start the server first.".into()),
|
||||||
_ => Error::Invalid(format!("database command failed: {}", text.trim().lines().last().unwrap_or(""))),
|
_ => Error::Invalid(format!("database command failed: {}", text.trim().lines().last().unwrap_or(""))),
|
||||||
@@ -380,3 +409,86 @@ mod realm_tests {
|
|||||||
assert_eq!(route_sql(sql, crate::realms::Mode::Wildcard), "SELECT * FROM `acore_characters_wildcard`.characters WHERE name='acore_world' AND x=\"acore_characters\"; -- acore_world\nSELECT * FROM acore_world_wildcard.items;");
|
assert_eq!(route_sql(sql, crate::realms::Mode::Wildcard), "SELECT * FROM `acore_characters_wildcard`.characters WHERE name='acore_world' AND x=\"acore_characters\"; -- acore_world\nSELECT * FROM acore_world_wildcard.items;");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
use std::ffi::OsStr;
|
||||||
|
|
||||||
|
const ROOT_PW: &str = "rootpw-ZZ1";
|
||||||
|
const APP_PW: &str = "apppw-QQ2";
|
||||||
|
|
||||||
|
fn folder(docker: bool) -> (tempfile::TempDir, PathBuf) {
|
||||||
|
let d = tempfile::tempdir().unwrap();
|
||||||
|
let root = d.path().join("srv");
|
||||||
|
std::fs::create_dir_all(root.join("Settings")).unwrap();
|
||||||
|
std::fs::write(root.join("Settings/database.json"), format!(r#"{{"rootPassword":"{ROOT_PW}","appPassword":"{APP_PW}"}}"#)).unwrap();
|
||||||
|
if docker {
|
||||||
|
std::fs::write(root.join("Settings/docker.json"), r#"{"project":"t1"}"#).unwrap();
|
||||||
|
}
|
||||||
|
(d, root)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn args(c: &Command) -> Vec<String> {
|
||||||
|
c.get_args().map(|a| a.to_string_lossy().into_owned()).collect()
|
||||||
|
}
|
||||||
|
|
||||||
|
fn env_of(c: &Command, key: &str) -> Option<String> {
|
||||||
|
c.get_envs().find(|(k, _)| *k == OsStr::new(key)).and_then(|(_, v)| v.map(|v| v.to_string_lossy().into_owned()))
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn a_docker_installation_runs_the_client_tools_inside_the_database_container() {
|
||||||
|
let (_d, root) = folder(true);
|
||||||
|
let db = Db::from_repack(&root, Account::Admin).unwrap();
|
||||||
|
for (tool, program) in [("mysql.exe", "mysql"), ("mysqldump.exe", "mysqldump"), ("mysqladmin.exe", "mysqladmin")] {
|
||||||
|
let c = db.command(tool);
|
||||||
|
assert_eq!(c.get_program(), "docker");
|
||||||
|
let a = args(&c);
|
||||||
|
assert_eq!(&a[..6], ["exec", "-i", "-e", "MYSQL_PWD", "coa-t1-db", program]);
|
||||||
|
assert!(a.contains(&"--protocol=tcp".to_string()) && a.contains(&"--host=127.0.0.1".to_string()) && a.contains(&"--port=3306".to_string()));
|
||||||
|
assert!(a.contains(&"--user=root".to_string()));
|
||||||
|
assert!(a.iter().all(|x| !x.contains(ROOT_PW)), "the password must not be on the command line");
|
||||||
|
assert_eq!(env_of(&c, "MYSQL_PWD").as_deref(), Some(ROOT_PW));
|
||||||
|
}
|
||||||
|
let app = Db::from_repack(&root, Account::App).unwrap().command("mysql.exe");
|
||||||
|
assert!(args(&app).contains(&"--user=acore".to_string()));
|
||||||
|
assert_eq!(env_of(&app, "MYSQL_PWD").as_deref(), Some(APP_PW));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn a_repack_still_uses_its_bundled_tools_on_the_host() {
|
||||||
|
let (_d, root) = folder(false);
|
||||||
|
std::fs::create_dir_all(root.join("mysql/bin")).unwrap();
|
||||||
|
for f in ["mysql.exe", "mysqldump.exe"] {
|
||||||
|
std::fs::write(root.join("mysql/bin").join(f), b"x").unwrap();
|
||||||
|
}
|
||||||
|
std::fs::write(root.join("Settings/repack.json"), r#"{"mysqlPort":3999}"#).unwrap();
|
||||||
|
let c = Db::from_repack(&root, Account::Admin).unwrap().command("mysql.exe");
|
||||||
|
assert_eq!(c.get_program(), root.join("mysql/bin").join("mysql.exe").as_os_str());
|
||||||
|
let a = args(&c);
|
||||||
|
assert!(!a.contains(&"exec".to_string()));
|
||||||
|
assert!(a.contains(&"--port=3999".to_string()) && a.contains(&"--host=127.0.0.1".to_string()));
|
||||||
|
assert_eq!(env_of(&c, "MYSQL_PWD").as_deref(), Some(ROOT_PW));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn a_docker_installation_does_not_need_tools_in_the_server_folder() {
|
||||||
|
let (_d, root) = folder(true);
|
||||||
|
assert!(!root.join("mysql").exists());
|
||||||
|
assert!(Db::from_repack(&root, Account::Admin).is_ok());
|
||||||
|
// ...but a broken Docker settings file is reported, not ignored.
|
||||||
|
std::fs::write(root.join("Settings/docker.json"), r#"{"project":"Bad Name"}"#).unwrap();
|
||||||
|
assert!(Db::from_repack(&root, Account::Admin).is_err());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn a_stopped_database_container_is_reported_as_a_database_that_is_not_running() {
|
||||||
|
let (_d, root) = folder(true);
|
||||||
|
let db = Db::from_repack(&root, Account::Admin).unwrap();
|
||||||
|
for text in ["Error response from daemon: container abc is not running", "Error response from daemon: No such container: coa-t1-db", "ERROR 2003 (HY000): Can't connect to MySQL server"] {
|
||||||
|
assert!(db.fail(text.as_bytes()).to_string().contains("not running"), "{text}");
|
||||||
|
}
|
||||||
|
assert!(db.fail(b"ERROR 1045 (28000): Access denied for user 'root'").to_string().contains("Access denied"));
|
||||||
|
}
|
||||||
|
}
|
||||||
+266
-6
@@ -172,19 +172,158 @@ pub fn squash_repeated_config_warnings(text: &str) -> String {
|
|||||||
s
|
s
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const SENSITIVE: [&str; 7] = ["password", "passwd", "secret", "token", "apikey", "api_key", "databaseinfo"];
|
||||||
|
|
||||||
/// Remove things that must never leave the machine from log text.
|
/// Remove things that must never leave the machine from log text.
|
||||||
pub fn redact(text: &str) -> String {
|
pub fn redact(text: &str) -> String {
|
||||||
let mut out = Vec::new();
|
let mut out = Vec::new();
|
||||||
for line in text.lines() {
|
for line in text.lines() {
|
||||||
let l = line.to_lowercase();
|
let l = line.to_lowercase();
|
||||||
let sensitive = ["password", "passwd", "secret", "token", "apikey", "api_key", "databaseinfo"].iter().any(|k| l.contains(k));
|
let sensitive = SENSITIVE.iter().any(|k| l.contains(k));
|
||||||
out.push(if sensitive { "[line removed: may contain a secret]".to_string() } else { line.to_string() });
|
out.push(if sensitive { "[line removed: may contain a secret]".to_string() } else { line.to_string() });
|
||||||
}
|
}
|
||||||
out.join("\n")
|
out.join("\n")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// The same for JSON: values under a sensitive key and strings that look like `password=...` are replaced, and the
|
||||||
|
/// result stays valid JSON (removing a whole line would break the file for whoever reads it). Text that is not JSON
|
||||||
|
/// falls back to the line rule.
|
||||||
|
pub fn redact_json(text: &str) -> String {
|
||||||
|
fn scrub(v: &mut serde_json::Value) {
|
||||||
|
use serde_json::Value;
|
||||||
|
match v {
|
||||||
|
Value::Object(map) => {
|
||||||
|
for (key, value) in map.iter_mut() {
|
||||||
|
let k = key.to_lowercase();
|
||||||
|
if SENSITIVE.iter().any(|s| k.contains(s)) && !value.is_object() && !value.is_array() {
|
||||||
|
*value = Value::String("[redacted]".into());
|
||||||
|
} else {
|
||||||
|
scrub(value);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Value::Array(items) => items.iter_mut().for_each(scrub),
|
||||||
|
Value::String(s) => {
|
||||||
|
let l = s.to_lowercase();
|
||||||
|
if ["password=", "passwd=", "secret=", "token=", "apikey=", "api_key=", "password:"].iter().any(|k| l.contains(k)) {
|
||||||
|
*s = "[redacted]".into();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
_ => {}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
match serde_json::from_str::<serde_json::Value>(text) {
|
||||||
|
Ok(mut v) => {
|
||||||
|
scrub(&mut v);
|
||||||
|
serde_json::to_string_pretty(&v).unwrap_or_else(|_| redact(text))
|
||||||
|
}
|
||||||
|
Err(_) => redact(text),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Keep the events of a `wevtutil ... /f:text` listing that mention one of `needles` (compared without case), in the
|
||||||
|
/// order listed, at most `max` of them.
|
||||||
|
pub fn filter_event_blocks(listing: &str, needles: &[&str], max: usize) -> String {
|
||||||
|
let mut blocks: Vec<Vec<&str>> = Vec::new();
|
||||||
|
for line in listing.lines() {
|
||||||
|
if line.starts_with("Event[") || blocks.is_empty() {
|
||||||
|
blocks.push(Vec::new());
|
||||||
|
}
|
||||||
|
if let Some(b) = blocks.last_mut() { b.push(line); }
|
||||||
|
}
|
||||||
|
blocks
|
||||||
|
.into_iter()
|
||||||
|
.map(|b| b.join("\n"))
|
||||||
|
.filter(|b| { let l = b.to_lowercase(); needles.iter().any(|n| l.contains(n)) })
|
||||||
|
.take(max)
|
||||||
|
.collect::<Vec<_>>()
|
||||||
|
.join("\n\n")
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Drop the lines of an event listing that name the person or the computer.
|
||||||
|
pub fn drop_identity_lines(listing: &str) -> String {
|
||||||
|
listing
|
||||||
|
.lines()
|
||||||
|
.filter(|l| { let t = l.trim_start(); !(t.starts_with("User:") || t.starts_with("User Name:") || t.starts_with("Computer:")) })
|
||||||
|
.collect::<Vec<_>>()
|
||||||
|
.join("\n")
|
||||||
|
}
|
||||||
|
|
||||||
|
/// `wevtutil /uni:true` writes UTF-16 with a byte order mark; anything else is read as UTF-8 (lossy).
|
||||||
|
fn decode_console_output(bytes: &[u8]) -> String {
|
||||||
|
if bytes.starts_with(&[0xFF, 0xFE]) {
|
||||||
|
let units: Vec<u16> = bytes[2..].chunks_exact(2).map(|c| u16::from_le_bytes([c[0], c[1]])).collect();
|
||||||
|
String::from_utf16_lossy(&units)
|
||||||
|
} else {
|
||||||
|
String::from_utf8_lossy(bytes).into_owned()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Crashes and hangs Windows recorded for the server programs in the last two weeks. This is the only trace of a crash
|
||||||
|
/// that ends the process without the server's own crash report (a stack buffer overrun, for example). The lines that
|
||||||
|
/// name the user and the computer are left out.
|
||||||
|
#[cfg(windows)]
|
||||||
|
fn windows_events() -> String {
|
||||||
|
use std::os::windows::process::CommandExt;
|
||||||
|
let query = "*[System[(Provider[@Name='Application Error' or @Name='Windows Error Reporting' or @Name='Application Hang']) and TimeCreated[timediff(@SystemTime) <= 1209600000]]]";
|
||||||
|
let out = std::process::Command::new("wevtutil")
|
||||||
|
.args(["qe", "Application", &format!("/q:{query}"), "/c:300", "/rd:true", "/f:text", "/uni:true"])
|
||||||
|
.creation_flags(0x0800_0000)
|
||||||
|
.output();
|
||||||
|
match out {
|
||||||
|
Ok(o) if o.status.success() => {
|
||||||
|
let text = filter_event_blocks(&decode_console_output(&o.stdout), &["worldserver", "authserver", "mysqld", "coa server manager", "coa-server-manager"], 40);
|
||||||
|
if text.is_empty() { "No crash or hang of the server programs was recorded by Windows in the last 14 days.".into() } else { drop_identity_lines(&text) }
|
||||||
|
}
|
||||||
|
Ok(o) => format!("Windows event log could not be read: {}", decode_console_output(&o.stderr).trim()),
|
||||||
|
Err(e) => format!("Windows event log could not be read: {e}"),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(not(windows))]
|
||||||
|
fn windows_events() -> String {
|
||||||
|
String::new()
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Newest files of a folder with the given extension (compared without case): path, size, modified time.
|
||||||
|
fn newest_files(dir: &Path, ext: &str, limit: usize) -> Vec<(PathBuf, u64, std::time::SystemTime)> {
|
||||||
|
let Ok(rd) = fs::read_dir(dir) else { return Vec::new() };
|
||||||
|
let mut v: Vec<_> = rd
|
||||||
|
.flatten()
|
||||||
|
.filter(|e| e.path().extension().is_some_and(|x| x.eq_ignore_ascii_case(ext)))
|
||||||
|
.filter_map(|e| { let m = e.metadata().ok()?; m.is_file().then(|| (e.path(), m.len(), m.modified().unwrap_or(std::time::UNIX_EPOCH))) })
|
||||||
|
.collect();
|
||||||
|
v.sort_by(|a, b| b.2.cmp(&a.2));
|
||||||
|
v.truncate(limit);
|
||||||
|
v
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Which server programs run right now and from where, next to what the Manager made of it. A program started from a
|
||||||
|
/// folder or a copy the Manager does not know shows up here even when the Manager reports "port in use".
|
||||||
|
fn processes_report(root: &Path, ports: &layout::Ports) -> String {
|
||||||
|
let here = root.to_string_lossy().to_lowercase().replace('/', "\\");
|
||||||
|
let listen = process::listeners_detailed();
|
||||||
|
let mut out = String::from("Server programs running now (any folder):\n");
|
||||||
|
let found = process::find_by_file_names(&["worldserver.exe", "authserver.exe", "mysqld.exe"]);
|
||||||
|
if found.is_empty() { out.push_str(" none\n"); }
|
||||||
|
for p in found {
|
||||||
|
let ports_of: Vec<String> = listen.iter().filter(|l| l.pid == p.pid).map(|l| l.port.to_string()).collect();
|
||||||
|
let inside = p.exe.to_lowercase().replace('/', "\\").starts_with(&here);
|
||||||
|
out.push_str(&format!(" pid {} {} | listening on: {} | {}\n", p.pid, p.exe, if ports_of.is_empty() { "-".into() } else { ports_of.join(", ") }, if inside { "inside this server folder" } else { "OUTSIDE this server folder" }));
|
||||||
|
}
|
||||||
|
let o = process::observe(root, ports);
|
||||||
|
out.push_str("\nThe Manager's view:\n");
|
||||||
|
for s in [Some(&o.mysql), Some(&o.auth), Some(&o.world), o.secondary_world.as_ref()].into_iter().flatten() {
|
||||||
|
out.push_str(&format!(" {:<16} {:?} port {} {}{}\n", s.name, s.state, s.port, s.pid.map(|p| format!("pid {p}")).unwrap_or_default(), s.conflict.as_ref().map(|c| format!(" | port held by pid {} {}", c.pid, c.exe.clone().unwrap_or_default())).unwrap_or_default()));
|
||||||
|
}
|
||||||
|
out
|
||||||
|
}
|
||||||
|
|
||||||
/// Zip with what a maintainer needs to debug a problem, with secrets removed. Returns the number of files inside.
|
/// Zip with what a maintainer needs to debug a problem, with secrets removed. Returns the number of files inside.
|
||||||
|
/// One call collects everything: the Manager's and the server's logs, crash reports and small crash dumps, Windows'
|
||||||
|
/// own record of crashes, the update journals, the running server programs and the settings the client depends on.
|
||||||
pub fn export_package(root: &Path, meta_dir: &Path, manager_log: &Path, meta: &InstallMeta, report: &Report, out_zip: &Path) -> Result<usize> {
|
pub fn export_package(root: &Path, meta_dir: &Path, manager_log: &Path, meta: &InstallMeta, report: &Report, out_zip: &Path) -> Result<usize> {
|
||||||
|
const DUMP_FILE_MAX: u64 = 30 * 1024 * 1024;
|
||||||
let file = fs::File::create(out_zip)?;
|
let file = fs::File::create(out_zip)?;
|
||||||
let mut zip = zip::ZipWriter::new(file);
|
let mut zip = zip::ZipWriter::new(file);
|
||||||
let opts = zip::write::SimpleFileOptions::default().compression_method(zip::CompressionMethod::Deflated);
|
let opts = zip::write::SimpleFileOptions::default().compression_method(zip::CompressionMethod::Deflated);
|
||||||
@@ -195,17 +334,38 @@ pub fn export_package(root: &Path, meta_dir: &Path, manager_log: &Path, meta: &I
|
|||||||
n += 1;
|
n += 1;
|
||||||
Ok(())
|
Ok(())
|
||||||
};
|
};
|
||||||
|
let ports = layout::read_ports(root);
|
||||||
let summary = serde_json::json!({
|
let summary = serde_json::json!({
|
||||||
"manager": crate::MANAGER_VERSION,
|
"manager": crate::MANAGER_VERSION,
|
||||||
|
"exported_utc": chrono::Utc::now().to_rfc3339(),
|
||||||
"core": meta.core,
|
"core": meta.core,
|
||||||
"bots": meta.bots,
|
"bots": meta.bots,
|
||||||
|
"squid_bots": crate::squid::release(root),
|
||||||
"kind": meta.kind,
|
"kind": meta.kind,
|
||||||
"layout": meta.layout,
|
"layout": meta.layout,
|
||||||
"checks": report.checks,
|
"checks": report.checks,
|
||||||
"wow_client_set": meta.client_path.is_some(),
|
"wow_client_set": meta.client_path.is_some(),
|
||||||
});
|
});
|
||||||
add("summary.json", serde_json::to_string_pretty(&summary)?.as_bytes())?;
|
add("summary.json", serde_json::to_string_pretty(&summary)?.as_bytes())?;
|
||||||
for (name, path) in [("manager.log", manager_log.to_path_buf()), ("manager-install.log", meta_dir.join("logs/manager.log")), ("Server.log.tail", root.join("Core/Logs/Server.log")), ("Errors.log.tail", root.join("Core/Logs/Errors.log")), ("Auth.log.tail", root.join("Core/Logs/Auth.log")), ("world-console.log.tail", root.join("Core/Logs/world-console.log")), ("mysql-error.log.tail", root.join("mysql/logs/mysql-error.log"))] {
|
|
||||||
|
// Logs. The newest update logs of the repack's own updater are added under their own names.
|
||||||
|
let mut logs: Vec<(String, PathBuf)> = vec![
|
||||||
|
("manager.log".into(), manager_log.to_path_buf()),
|
||||||
|
("manager-install.log".into(), meta_dir.join("logs/manager.log")),
|
||||||
|
("Server.log.tail".into(), root.join("Core/Logs/Server.log")),
|
||||||
|
("Errors.log.tail".into(), root.join("Core/Logs/Errors.log")),
|
||||||
|
("Auth.log.tail".into(), root.join("Core/Logs/Auth.log")),
|
||||||
|
("world-console.log.tail".into(), root.join("Core/Logs/world-console.log")),
|
||||||
|
("CoaBots.log.tail".into(), root.join("Core/Logs/CoaBots.log")),
|
||||||
|
("Playerbots.log.tail".into(), root.join("Core/Logs/Playerbots.log")),
|
||||||
|
("supervisor.log.tail".into(), root.join("Core/Logs/supervisor.log")),
|
||||||
|
("mysql-error.log.tail".into(), root.join("mysql/logs/mysql-error.log")),
|
||||||
|
];
|
||||||
|
let updater_logs = newest_files(&root.join("Core/Logs"), "log", usize::MAX).into_iter().filter(|(p, _, _)| p.file_name().is_some_and(|f| f.to_string_lossy().to_lowercase().starts_with("update-")));
|
||||||
|
for (p, _, _) in updater_logs.take(2) {
|
||||||
|
logs.push((format!("{}.tail", p.file_name().unwrap_or_default().to_string_lossy()), p));
|
||||||
|
}
|
||||||
|
for (name, path) in logs {
|
||||||
// A module that reads a missing setting on every tick fills a log with one warning, thousands of times; read far
|
// A module that reads a missing setting on every tick fills a log with one warning, thousands of times; read far
|
||||||
// enough back to see past that, fold the repeats, then keep the last part.
|
// enough back to see past that, fold the repeats, then keep the last part.
|
||||||
let bytes = tail(&path, 8 * 1024 * 1024);
|
let bytes = tail(&path, 8 * 1024 * 1024);
|
||||||
@@ -213,9 +373,44 @@ pub fn export_package(root: &Path, meta_dir: &Path, manager_log: &Path, meta: &I
|
|||||||
let text = squash_repeated_config_warnings(&String::from_utf8_lossy(&bytes));
|
let text = squash_repeated_config_warnings(&String::from_utf8_lossy(&bytes));
|
||||||
let keep = text.len().saturating_sub(512 * 1024);
|
let keep = text.len().saturating_sub(512 * 1024);
|
||||||
let start = (keep..text.len()).find(|i| text.is_char_boundary(*i)).unwrap_or(text.len());
|
let start = (keep..text.len()).find(|i| text.is_char_boundary(*i)).unwrap_or(text.len());
|
||||||
add(name, redact(&text[start..]).as_bytes())?;
|
add(&name, redact(&text[start..]).as_bytes())?;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Crash reports of the server (text, and the small dumps next to them), and what Windows recorded for the programs.
|
||||||
|
let crashes = root.join("Core/Crashes");
|
||||||
|
let mut listing = String::new();
|
||||||
|
for (p, len, _) in newest_files(&crashes, "txt", 10) {
|
||||||
|
let name = p.file_name().unwrap_or_default().to_string_lossy().into_owned();
|
||||||
|
listing.push_str(&format!("{name} ({len} bytes)\n"));
|
||||||
|
let text = String::from_utf8_lossy(&tail(&p, 1024 * 1024)).into_owned();
|
||||||
|
add(&format!("crashes/{name}"), redact(&text).as_bytes())?;
|
||||||
|
}
|
||||||
|
for (p, len, _) in newest_files(&crashes, "dmp", 3) {
|
||||||
|
let name = p.file_name().unwrap_or_default().to_string_lossy().into_owned();
|
||||||
|
if len > DUMP_FILE_MAX {
|
||||||
|
listing.push_str(&format!("{name} ({len} bytes) not included: larger than {} MB\n", DUMP_FILE_MAX >> 20));
|
||||||
|
} else if let Ok(bytes) = fs::read(&p) {
|
||||||
|
listing.push_str(&format!("{name} ({len} bytes) included\n"));
|
||||||
|
add(&format!("crashes/{name}"), &bytes)?;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
add("crashes.txt", if listing.is_empty() { "No crash reports in Core/Crashes.".to_string() } else { listing }.as_bytes())?;
|
||||||
|
let events = windows_events();
|
||||||
|
if !events.is_empty() { add("windows-events.txt", events.as_bytes())?; }
|
||||||
|
add("processes.txt", processes_report(root, &ports).as_bytes())?;
|
||||||
|
|
||||||
|
// The newest update journals: the state of each update and the reason it failed.
|
||||||
|
let mut journals: Vec<_> = fs::read_dir(meta_dir.join("updates")).into_iter().flatten().flatten()
|
||||||
|
.filter(|e| e.file_type().is_ok_and(|t| t.is_dir()) && e.file_name().to_string_lossy().chars().all(|c| c.is_ascii_alphanumeric() || matches!(c, '-' | '_')))
|
||||||
|
.collect();
|
||||||
|
journals.sort_by_key(|e| std::cmp::Reverse(e.file_name()));
|
||||||
|
for e in journals.into_iter().take(5) {
|
||||||
|
if let Ok(text) = fs::read_to_string(e.path().join("txn.json")) {
|
||||||
|
add(&format!("updates/{}-txn.json", e.file_name().to_string_lossy()), redact_json(&text).as_bytes())?;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Which files the server's own configuration folders hold, and the two CoA switches that decide whether the game
|
// Which files the server's own configuration folders hold, and the two CoA switches that decide whether the game
|
||||||
// client can talk to the world server at all.
|
// client can talk to the world server at all.
|
||||||
let mut present = String::new();
|
let mut present = String::new();
|
||||||
@@ -243,10 +438,10 @@ pub fn export_package(root: &Path, meta_dir: &Path, manager_log: &Path, meta: &I
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if let Ok(b) = fs::read(root.join("RELEASE.json")) {
|
if let Ok(b) = fs::read(root.join("RELEASE.json")) {
|
||||||
add("RELEASE.json", redact(&String::from_utf8_lossy(&b)).as_bytes())?;
|
add("RELEASE.json", redact_json(&String::from_utf8_lossy(&b)).as_bytes())?;
|
||||||
}
|
}
|
||||||
if let Ok(b) = fs::read(meta_dir.join("logs/database-checks.json")) {
|
if let Ok(b) = fs::read(meta_dir.join("logs/database-checks.json")) {
|
||||||
add("database-checks.json", redact(&String::from_utf8_lossy(&b)).as_bytes())?;
|
add("database-checks.json", redact_json(&String::from_utf8_lossy(&b)).as_bytes())?;
|
||||||
}
|
}
|
||||||
zip.finish().map_err(|e| Error::Invalid(e.to_string()))?;
|
zip.finish().map_err(|e| Error::Invalid(e.to_string()))?;
|
||||||
Ok(n)
|
Ok(n)
|
||||||
@@ -288,6 +483,68 @@ real error
|
|||||||
assert!(!t.contains("PASS") && !t.contains("abc"));
|
assert!(!t.contains("PASS") && !t.contains("abc"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn json_redaction_keeps_the_file_valid_and_hides_the_secrets() {
|
||||||
|
let t = redact_json(r#"{"id":"rev_20261006_token_cache","password":"hunter2","nested":{"apiKey":"k","note":"login with password=abc"},"list":[{"secret":1},"ok"]}"#);
|
||||||
|
let v: serde_json::Value = serde_json::from_str(&t).expect("still JSON");
|
||||||
|
assert_eq!(v["id"], "rev_20261006_token_cache", "an id that merely contains a word is kept");
|
||||||
|
assert_eq!(v["password"], "[redacted]");
|
||||||
|
assert_eq!(v["nested"]["apiKey"], "[redacted]");
|
||||||
|
assert_eq!(v["nested"]["note"], "[redacted]");
|
||||||
|
assert_eq!(v["list"][0]["secret"], "[redacted]");
|
||||||
|
assert_eq!(v["list"][1], "ok");
|
||||||
|
assert!(!t.contains("hunter2") && !t.contains("abc"));
|
||||||
|
assert!(redact_json("not json\nPassword=1").contains("[line removed"), "text falls back to the line rule");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn windows_events_are_filtered_to_the_server_programs() {
|
||||||
|
let listing = "Event[0]:\n Provider Name: Application Error\n Description: Faulting application name: worldserver.exe, version: 0.0.0.0\n\nEvent[1]:\n Provider Name: Application Error\n Description: Faulting application name: notepad.exe\n\nEvent[2]:\n Description: Faulting application name: MYSQLD.EXE\n";
|
||||||
|
let out = filter_event_blocks(listing, &["worldserver", "mysqld"], 10);
|
||||||
|
assert!(out.contains("worldserver.exe") && out.contains("MYSQLD.EXE") && !out.contains("notepad"));
|
||||||
|
assert_eq!(filter_event_blocks(listing, &["worldserver", "mysqld"], 1).matches("Event[").count(), 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn event_text_loses_the_user_and_computer_lines_and_reads_utf16() {
|
||||||
|
let out = drop_identity_lines("Event[0]\n Source: Application Error\n User: S-1-5-21-1\n User Name: PC\\Dion\n Computer: PC\n Description: worldserver.exe");
|
||||||
|
assert!(out.contains("Source") && out.contains("worldserver.exe"));
|
||||||
|
assert!(!out.contains("S-1-5") && !out.contains("Dion") && !out.contains("Computer"));
|
||||||
|
let mut bytes = vec![0xFF, 0xFE];
|
||||||
|
for u in "Сбой worldserver".encode_utf16() { bytes.extend_from_slice(&u.to_le_bytes()); }
|
||||||
|
assert_eq!(decode_console_output(&bytes), "Сбой worldserver");
|
||||||
|
assert_eq!(decode_console_output(b"plain"), "plain");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn the_package_carries_crash_reports_update_journals_and_the_process_view() {
|
||||||
|
let d = tempfile::tempdir().unwrap();
|
||||||
|
let root = d.path().join("srv");
|
||||||
|
layout::testkit::fake_repack(&root);
|
||||||
|
fs::create_dir_all(root.join("Core/Crashes")).unwrap();
|
||||||
|
fs::write(root.join("Core/Crashes/567e_worldserver.exe_[4-10_21-25-31].txt"), "Exception code: C0000005\nRCX:0\n").unwrap();
|
||||||
|
fs::write(root.join("Core/Crashes/567e_worldserver.exe_[4-10_21-25-31].dmp"), b"MDMP-small").unwrap();
|
||||||
|
fs::write(root.join("Core/Logs/CoaBots.log"), "bot line\n").unwrap();
|
||||||
|
fs::write(root.join("Core/Logs/update-1.8-20261005.log"), "updater line\n").unwrap();
|
||||||
|
let meta_dir = d.path().join("srv.manager");
|
||||||
|
fs::create_dir_all(meta_dir.join("updates/20261006-082021-0_261006_1-abc")).unwrap();
|
||||||
|
fs::write(meta_dir.join("updates/20261006-082021-0_261006_1-abc/txn.json"), r#"{"state":"rolled-back","message":"Database update 2026_02_24_00 failed: duplicate column"}"#).unwrap();
|
||||||
|
fs::create_dir_all(meta_dir.join("updates/not a journal!")).unwrap();
|
||||||
|
let meta = InstallMeta::new(InstallKind::Imported, &root);
|
||||||
|
let report = run(&root, &meta);
|
||||||
|
let zip_path = d.path().join("diag.zip");
|
||||||
|
export_package(&root, &meta_dir, &d.path().join("none.log"), &meta, &report, &zip_path).unwrap();
|
||||||
|
let mut z = zip::ZipArchive::new(fs::File::open(&zip_path).unwrap()).unwrap();
|
||||||
|
let names: Vec<String> = (0..z.len()).map(|i| z.by_index(i).unwrap().name().to_string()).collect();
|
||||||
|
for want in ["crashes.txt", "processes.txt", "CoaBots.log.tail", "update-1.8-20261005.log.tail", "updates/20261006-082021-0_261006_1-abc-txn.json", "crashes/567e_worldserver.exe_[4-10_21-25-31].txt", "crashes/567e_worldserver.exe_[4-10_21-25-31].dmp"] {
|
||||||
|
assert!(names.iter().any(|n| n == want), "{want} is in the package: {names:?}");
|
||||||
|
}
|
||||||
|
assert!(!names.iter().any(|n| n.contains("not a journal")));
|
||||||
|
let mut listing = String::new();
|
||||||
|
z.by_name("crashes.txt").unwrap().read_to_string(&mut listing).unwrap();
|
||||||
|
assert!(listing.contains("included"));
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn verify_reports_missing_and_changed_managed_files_only() {
|
fn verify_reports_missing_and_changed_managed_files_only() {
|
||||||
let d = tempfile::tempdir().unwrap();
|
let d = tempfile::tempdir().unwrap();
|
||||||
@@ -323,6 +580,8 @@ real error
|
|||||||
let d = tempfile::tempdir().unwrap();
|
let d = tempfile::tempdir().unwrap();
|
||||||
let root = d.path().join("srv");
|
let root = d.path().join("srv");
|
||||||
layout::testkit::fake_repack(&root);
|
layout::testkit::fake_repack(&root);
|
||||||
|
fs::create_dir_all(root.join("Extras/SquidPlayerbots")).unwrap();
|
||||||
|
fs::write(root.join("Extras/SquidPlayerbots/release.json"), r#"{"tag":"v1.8","commit":"48c4786a","password":"upstream-secret"}"#).unwrap();
|
||||||
fs::write(root.join("Core/Logs/Errors.log"), "boom\nDatabase password=hunter2 rejected\n").unwrap();
|
fs::write(root.join("Core/Logs/Errors.log"), "boom\nDatabase password=hunter2 rejected\n").unwrap();
|
||||||
fs::write(root.join("Core/configs/worldserver.conf"), "LoginDatabaseInfo = \"127.0.0.1;3307;acore;SECRETPW;auth\"\nRate.XP.Kill = 1\n").unwrap();
|
fs::write(root.join("Core/configs/worldserver.conf"), "LoginDatabaseInfo = \"127.0.0.1;3307;acore;SECRETPW;auth\"\nRate.XP.Kill = 1\n").unwrap();
|
||||||
let meta_dir = d.path().join("srv.manager");
|
let meta_dir = d.path().join("srv.manager");
|
||||||
@@ -340,6 +599,7 @@ real error
|
|||||||
all.push_str(&s);
|
all.push_str(&s);
|
||||||
}
|
}
|
||||||
assert!(all.contains("boom") && all.contains("Rate.XP.Kill"), "keys and ordinary log lines are included");
|
assert!(all.contains("boom") && all.contains("Rate.XP.Kill"), "keys and ordinary log lines are included");
|
||||||
assert!(!all.contains("hunter2") && !all.contains("SECRETPW"));
|
assert!(all.contains("v1.8") && all.contains("48c4786a"));
|
||||||
|
assert!(!all.contains("hunter2") && !all.contains("SECRETPW") && !all.contains("upstream-secret"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,574 @@
|
|||||||
|
//! Installing a new server as a Docker installation, from a Linux package.
|
||||||
|
//!
|
||||||
|
//! The order of events is the one of `install::install_base`: nothing appears at the destination until the package is
|
||||||
|
//! signed-off, downloaded, verified, extracted and its database built, all of it in a sibling `<dest>.installing`
|
||||||
|
//! folder. But this is code of its own: the Windows installer is not touched and nothing here is specific to the
|
||||||
|
//! Windows layout. What both installers use is platform-neutral: the signed manifest, the download, the extraction,
|
||||||
|
//! the migration ledger and the registry.
|
||||||
|
//!
|
||||||
|
//! The databases start from the package's own dumps (`Database/baseline/<kind>.sql.zst`, the format of the Manager's
|
||||||
|
//! backups), as a Windows package starts from its prepared database: they hold the state in which every migration of the
|
||||||
|
//! package is already applied, and the installer records them as such. They cannot be rebuilt from the repository's
|
||||||
|
//! SQL files: some migrations are guards that only apply to the maintainers' own database. The game data is not part
|
||||||
|
//! of the package: the person points at a folder they already have.
|
||||||
|
|
||||||
|
use std::fs;
|
||||||
|
use std::path::{Path, PathBuf};
|
||||||
|
|
||||||
|
use super::cli::{Docker, SystemDocker};
|
||||||
|
use super::{Config, MARKER};
|
||||||
|
use crate::db::{self, Account, Db};
|
||||||
|
use crate::download::Cancel;
|
||||||
|
use crate::driver::Verb;
|
||||||
|
use crate::error::{Error, Result};
|
||||||
|
use crate::fsx;
|
||||||
|
use crate::install::{free_port, problem, random_hex, Installed, Preflight, Step};
|
||||||
|
use crate::manifest::{self, Migration};
|
||||||
|
use crate::migrations;
|
||||||
|
use crate::package::BASELINE_DIR;
|
||||||
|
use crate::pkgsource::{fetch_manifest, fetch_parts, Source};
|
||||||
|
use crate::registry::{metadata_dir_for, InstallKind, InstallMeta, MetaDir, Registry, LAYOUT_DOCKER_V1};
|
||||||
|
|
||||||
|
/// Created in the staging folder so a leftover of an earlier attempt can be told from somebody else's folder.
|
||||||
|
const STAGING_MARKER: &str = ".coa-installing";
|
||||||
|
/// The three game databases: kind (the name of the dump), schema.
|
||||||
|
const DATABASES: [(&str, &str); 3] = [("auth", "acore_auth"), ("characters", "acore_characters"), ("world", "acore_world")];
|
||||||
|
/// Ports the game uses by default on this computer.
|
||||||
|
const DEFAULT_PORTS: (u16, u16, u16) = (3724, 8085, 3443);
|
||||||
|
|
||||||
|
pub struct Params<'a> {
|
||||||
|
pub source: Source,
|
||||||
|
pub dest: PathBuf,
|
||||||
|
/// A folder with the game data (dbc, maps, vmaps, mmaps) that the person already has. Used in place, read-only.
|
||||||
|
pub data_dir: PathBuf,
|
||||||
|
/// Public key to verify the manifest with (production: `signing::EMBEDDED_PUBLIC_KEY`).
|
||||||
|
pub trusted_key: &'a str,
|
||||||
|
pub registry: &'a Registry,
|
||||||
|
pub cancel: Cancel,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Checks whether `dest` and the game data folder are sensible for a new server on Linux.
|
||||||
|
pub fn preflight(dest: &Path, data_dir: &Path, needed_bytes: u64, registry: &Registry) -> Preflight {
|
||||||
|
let mut problems = Vec::new();
|
||||||
|
let s = dest.to_string_lossy();
|
||||||
|
|
||||||
|
if !dest.is_absolute() {
|
||||||
|
problems.push(problem("relative", "Choose a full folder path, such as /home/you/CoaServer."));
|
||||||
|
}
|
||||||
|
if s.contains(':') {
|
||||||
|
problems.push(problem("colon", "Choose a folder whose path has no colon in it."));
|
||||||
|
}
|
||||||
|
let trimmed = s.trim_end_matches('/');
|
||||||
|
const SYSTEM: [&str; 13] = ["", "/bin", "/boot", "/dev", "/etc", "/lib", "/lib64", "/proc", "/run", "/sbin", "/sys", "/usr", "/var"];
|
||||||
|
if SYSTEM.iter().any(|p| trimmed == *p || (!p.is_empty() && trimmed.starts_with(&format!("{p}/")))) {
|
||||||
|
problems.push(problem("system_folder", "Please choose a normal folder for your games, not a system location."));
|
||||||
|
}
|
||||||
|
if let Some(home) = std::env::var_os("HOME") {
|
||||||
|
let home = home.to_string_lossy().trim_end_matches('/').to_string();
|
||||||
|
let special = ["", "/Documents", "/Desktop", "/Downloads", "/Pictures", "/Music", "/Videos", "/.config", "/.local", "/.local/share"];
|
||||||
|
if !home.is_empty() && special.iter().any(|sfx| trimmed == format!("{home}{sfx}")) {
|
||||||
|
problems.push(problem("personal_folder", "This folder contains unrelated files. Choose another folder or create a new CoA Server folder."));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if dest.exists() {
|
||||||
|
match fs::read_dir(dest) {
|
||||||
|
Ok(mut rd) => {
|
||||||
|
if rd.next().is_some() {
|
||||||
|
match crate::layout::scan(dest).map(|r| r.classification) {
|
||||||
|
Ok(crate::layout::Classification::Incompatible) | Err(_) => {
|
||||||
|
if dest.join("Wow.exe").is_file() || dest.join("Ascension.exe").is_file() {
|
||||||
|
problems.push(problem("client_folder", "This is a game client folder, not a place for a server."));
|
||||||
|
} else {
|
||||||
|
problems.push(problem("not_empty", "This folder contains unrelated files. Choose another folder or create a new CoA Server folder."));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(_) => problems.push(problem("already_server", "A server is already in this folder. Use \"I already have a server\" to add it instead.")),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Err(_) => problems.push(problem("unreadable", "This folder cannot be read. Choose another one.")),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if let Ok(list) = registry.list() {
|
||||||
|
for (_, existing) in list {
|
||||||
|
if let (Ok(a), Ok(b)) = (fsx::canonicalize_lenient(dest), fsx::canonicalize_lenient(&existing)) {
|
||||||
|
if fsx::starts_with_ci(&a, &b) || fsx::starts_with_ci(&b, &a) {
|
||||||
|
problems.push(problem("registered", "A server is already registered at or around this location."));
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
problems.extend(data_problems(data_dir));
|
||||||
|
|
||||||
|
let free_bytes = fsx::free_space(dest).unwrap_or(0);
|
||||||
|
let need = needed_bytes.saturating_add(needed_bytes / 5).saturating_add(512 * 1024 * 1024);
|
||||||
|
if free_bytes < need {
|
||||||
|
problems.push(problem("space", &format!("Not enough free space: about {} GB needed, {} GB available.", need / (1 << 30) + 1, free_bytes / (1 << 30))));
|
||||||
|
}
|
||||||
|
Preflight { ok: problems.is_empty(), problems, free_bytes }
|
||||||
|
}
|
||||||
|
|
||||||
|
fn data_problems(data_dir: &Path) -> Vec<crate::install::Problem> {
|
||||||
|
let s = data_dir.to_string_lossy();
|
||||||
|
if !data_dir.is_absolute() || s.contains(':') {
|
||||||
|
return vec![problem("data_path", "Choose the game data folder with its full path, without a colon in it.")];
|
||||||
|
}
|
||||||
|
let missing: Vec<&str> = ["dbc", "maps"].into_iter().filter(|d| !data_dir.join(d).is_dir()).collect();
|
||||||
|
if missing.is_empty() {
|
||||||
|
Vec::new()
|
||||||
|
} else {
|
||||||
|
vec![problem("data_missing", &format!("This folder does not look like the game data: {} not found in it. It should hold dbc, maps, vmaps and mmaps.", missing.join(" and ")))]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Port the game should use: the usual one when it is free on this computer, else any free one.
|
||||||
|
fn pick_port(preferred: u16) -> Result<u16> {
|
||||||
|
if std::net::TcpListener::bind(("127.0.0.1", preferred)).is_ok() {
|
||||||
|
Ok(preferred)
|
||||||
|
} else {
|
||||||
|
free_port()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Settings of a new installation: which containers belong to it, where the game data is, the ports, the passwords.
|
||||||
|
/// Written before anything runs, so the database can be started from the staging folder.
|
||||||
|
struct Settings {
|
||||||
|
app_password: String,
|
||||||
|
world_port: u16,
|
||||||
|
}
|
||||||
|
|
||||||
|
fn write_settings(root: &Path, data_dir: &Path) -> Result<Settings> {
|
||||||
|
let project = random_hex(10);
|
||||||
|
let (auth, world, ra) = (pick_port(DEFAULT_PORTS.0)?, pick_port(DEFAULT_PORTS.1)?, pick_port(DEFAULT_PORTS.2)?);
|
||||||
|
let (root_password, app_password) = (random_hex(48), random_hex(48));
|
||||||
|
fs::create_dir_all(root.join("Settings"))?;
|
||||||
|
let docker = Config { project, bind_address: "127.0.0.1".into(), mysql_image: super::MYSQL_IMAGE.into(), data_dir: Some(data_dir.to_string_lossy().into_owned()) };
|
||||||
|
fsx::atomic_write_json(&root.join(MARKER), &docker)?;
|
||||||
|
// Same file and keys as a repack, so the console, the ports and the settings screens work unchanged. The database is
|
||||||
|
// not published on the host; its port is only there to fill the key.
|
||||||
|
fsx::atomic_write_json(
|
||||||
|
&root.join("Settings/repack.json"),
|
||||||
|
&serde_json::json!({ "mysqlPort": 3307, "authPort": auth, "worldPort": world, "raPort": ra, "raUsername": db::SERVICE_ACCOUNT, "raPassword": "" }),
|
||||||
|
)?;
|
||||||
|
let secrets = root.join("Settings/database.json");
|
||||||
|
fsx::atomic_write_json(&secrets, &serde_json::json!({ "rootPassword": root_password, "appPassword": app_password }))?;
|
||||||
|
#[cfg(unix)]
|
||||||
|
{
|
||||||
|
use std::os::unix::fs::PermissionsExt;
|
||||||
|
fs::set_permissions(&secrets, fs::Permissions::from_mode(0o600))?;
|
||||||
|
}
|
||||||
|
Ok(Settings { app_password, world_port: world })
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The package must hold what a Docker installation is made of; say what is missing instead of failing later.
|
||||||
|
fn check_extracted(root: &Path) -> Result<()> {
|
||||||
|
let mut missing = Vec::new();
|
||||||
|
for rel in ["Core/worldserver", "Core/authserver", "Core/configs/worldserver.conf.dist", "Core/configs/authserver.conf.dist"] {
|
||||||
|
if !root.join(rel).is_file() {
|
||||||
|
missing.push(rel.to_string());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for (kind, _) in DATABASES {
|
||||||
|
if !root.join(BASELINE_DIR).join(format!("{kind}.sql.zst")).is_file() {
|
||||||
|
missing.push(format!("{BASELINE_DIR}/{kind}.sql.zst"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if missing.is_empty() {
|
||||||
|
Ok(())
|
||||||
|
} else {
|
||||||
|
Err(Error::Invalid(format!("This package is not a complete Linux server package; missing: {}.", missing.join(", "))))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Record every migration of the package as applied without running it, in a few statements (one `docker exec` for each
|
||||||
|
/// of more than a thousand would take minutes). Same ledger rows as `migrations::baseline`.
|
||||||
|
fn baseline_statements(list: &[Migration]) -> Result<Vec<String>> {
|
||||||
|
let ok = |t: &str| !t.is_empty() && t.len() <= 190 && t.chars().all(|c| c.is_ascii_alphanumeric() || matches!(c, '_' | '.' | '-'));
|
||||||
|
let mut rows = Vec::with_capacity(list.len());
|
||||||
|
for m in list {
|
||||||
|
if !matches!(m.db.as_str(), "auth" | "characters" | "world") || !ok(&m.id) || m.sha256.len() != 64 || !m.sha256.chars().all(|c| c.is_ascii_hexdigit()) {
|
||||||
|
return Err(Error::InvalidManifest(format!("migration {:?} is not valid", m.id)));
|
||||||
|
}
|
||||||
|
rows.push(format!("('{}','{}','{}','applied',NOW(),NULL,1)", m.db, m.id, m.sha256));
|
||||||
|
}
|
||||||
|
Ok(rows
|
||||||
|
.chunks(400)
|
||||||
|
.map(|c| format!("REPLACE INTO `acore_world`.`coa_manager_migrations` (`db`,`id`,`sha256`,`status`,`applied_at`,`error`,`baseline`) VALUES {};", c.join(",")))
|
||||||
|
.collect())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Create the three schemas and the game servers' account, load the starting databases and record the package's migrations
|
||||||
|
/// as applied. The database container is started from `root` and stopped again by the caller.
|
||||||
|
fn build_database(d: &dyn Docker, root: &Path, list: &[Migration], s: &Settings, say: &dyn Fn(u8, String)) -> Result<()> {
|
||||||
|
let started = super::run_with(d, root, Verb::StartMysql)?;
|
||||||
|
if !started.ok {
|
||||||
|
return Err(Error::Invalid(started.human.map(|h| h.message.to_string()).unwrap_or_else(|| "The database could not be started.".into())));
|
||||||
|
}
|
||||||
|
let db = Db::from_repack(root, Account::Admin)?;
|
||||||
|
let mut sql = String::new();
|
||||||
|
for (_, schema) in DATABASES {
|
||||||
|
sql.push_str(&format!("CREATE DATABASE `{schema}` CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;\n"));
|
||||||
|
}
|
||||||
|
// The pattern also covers the schemas of other realms (acore_world_wildcard, ...).
|
||||||
|
sql.push_str(&format!("CREATE USER 'acore'@'%' IDENTIFIED BY '{}';\nGRANT ALL PRIVILEGES ON `acore\\_%`.* TO 'acore'@'%';\nFLUSH PRIVILEGES;\n", s.app_password));
|
||||||
|
db.query(&sql)?;
|
||||||
|
|
||||||
|
for (i, (kind, schema)) in DATABASES.iter().enumerate() {
|
||||||
|
say(83 + (i * 4) as u8, format!("Loading the {kind} database"));
|
||||||
|
db.import_from(schema, &root.join(BASELINE_DIR).join(format!("{kind}.sql.zst")))?;
|
||||||
|
}
|
||||||
|
|
||||||
|
say(95 - 3, format!("Recording {} database updates as applied", list.len()));
|
||||||
|
// The ledger table is created by the first read of it.
|
||||||
|
migrations::Store::load(&db)?;
|
||||||
|
for statement in baseline_statements(list)? {
|
||||||
|
db.query(&statement)?;
|
||||||
|
}
|
||||||
|
|
||||||
|
// The realm advertises the port the game server really uses on this computer.
|
||||||
|
db.query(&format!("UPDATE acore_auth.realmlist SET port={} WHERE id=1;", s.world_port))?;
|
||||||
|
// The server console gets its own account with a random password.
|
||||||
|
let console_pw = db.provision_service_account()?;
|
||||||
|
db::write_console_credentials(root, &console_pw)?;
|
||||||
|
if !Db::from_repack(root, Account::Admin)?.ping() {
|
||||||
|
return Err(Error::Invalid("The database did not answer after it was set up.".into()));
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn install(p: &Params, report: &dyn Fn(Step)) -> Result<Installed> {
|
||||||
|
install_with(&SystemDocker, p, report)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn install_with(d: &dyn Docker, p: &Params, report: &dyn Fn(Step)) -> Result<Installed> {
|
||||||
|
let say = |step: &'static str, percent: u8, detail: Option<String>| report(Step { step, percent, detail });
|
||||||
|
let dest = p.dest.clone();
|
||||||
|
let staging_root = {
|
||||||
|
let mut n = dest.file_name().ok_or_else(|| Error::Invalid("bad destination".into()))?.to_os_string();
|
||||||
|
n.push(".installing");
|
||||||
|
dest.with_file_name(n)
|
||||||
|
};
|
||||||
|
let meta_dir = metadata_dir_for(&dest)?;
|
||||||
|
|
||||||
|
say("Checking your computer", 2, None);
|
||||||
|
super::check_docker(d)?;
|
||||||
|
// The manifest first: it is signed, and tells us how much space we need.
|
||||||
|
let (m, manifest_bytes) = fetch_manifest(&p.source, p.trusted_key)?;
|
||||||
|
if !matches!(m.kind, manifest::Kind::Base | manifest::Kind::Update) || !m.compatible_with_manager(crate::MANAGER_VERSION) {
|
||||||
|
return Err(Error::Invalid("This package needs a newer version of CoA Server Manager.".into()));
|
||||||
|
}
|
||||||
|
let archive = m.archive.clone().ok_or_else(|| Error::InvalidManifest("no archive".into()))?;
|
||||||
|
let download_size: u64 = archive.parts.iter().map(|x| x.size).sum();
|
||||||
|
|
||||||
|
let pre = preflight(&dest, &p.data_dir, archive.unpacked_size + download_size, p.registry);
|
||||||
|
if !pre.ok {
|
||||||
|
return Err(Error::Invalid(pre.problems.iter().map(|x| x.message.clone()).collect::<Vec<_>>().join(" ")));
|
||||||
|
}
|
||||||
|
|
||||||
|
let parts_dir = fetch_parts(&p.source, &m, &meta_dir.join("staging").join("download"), &p.cancel, &|frac, detail| say("Downloading server", 5 + (frac * 45.0) as u8, detail))?;
|
||||||
|
|
||||||
|
if staging_root.exists() {
|
||||||
|
if staging_root.join(STAGING_MARKER).is_file() {
|
||||||
|
fs::remove_dir_all(&staging_root)?; // leftover of an earlier failed attempt that we created
|
||||||
|
} else {
|
||||||
|
return Err(Error::Invalid(format!("{} already exists and was not created by the Manager.", staging_root.display())));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
fs::create_dir_all(&staging_root)?;
|
||||||
|
fs::write(staging_root.join(STAGING_MARKER), b"")?;
|
||||||
|
|
||||||
|
let mut project: Option<Config> = None;
|
||||||
|
let result = (|| -> Result<Installed> {
|
||||||
|
say("Unpacking", 50, None);
|
||||||
|
crate::package::extract(&parts_dir, &m, &staging_root, &|done, total| say("Unpacking", 50 + (done * 30 / total.max(1)) as u8, None))?;
|
||||||
|
check_extracted(&staging_root)?;
|
||||||
|
|
||||||
|
say("Preparing database", 82, None);
|
||||||
|
let settings = write_settings(&staging_root, &p.data_dir)?;
|
||||||
|
project = Some(Config::load(&staging_root)?);
|
||||||
|
let progress = |percent: u8, detail: String| say("Preparing database", percent, Some(detail));
|
||||||
|
let built = build_database(d, &staging_root, &m.migrations, &settings, &progress);
|
||||||
|
let _ = super::run_with(d, &staging_root, Verb::StopAll);
|
||||||
|
built?;
|
||||||
|
fs::remove_file(staging_root.join(STAGING_MARKER))?;
|
||||||
|
|
||||||
|
// Commit: the only moment the destination changes. The database lives in a docker volume, so it does not care
|
||||||
|
// that the folder moves.
|
||||||
|
say("Finishing", 95, None);
|
||||||
|
if dest.exists() {
|
||||||
|
fs::remove_dir(&dest)?; // only succeeds for an empty folder (preflight verified)
|
||||||
|
}
|
||||||
|
fs::rename(&staging_root, &dest)?;
|
||||||
|
super::ensure_main_configs(&dest)?;
|
||||||
|
crate::config::materialize_module_configs(&dest)?;
|
||||||
|
|
||||||
|
let mut meta = InstallMeta::new(InstallKind::New, &dest);
|
||||||
|
meta.layout = LAYOUT_DOCKER_V1.into();
|
||||||
|
meta.core.commit = m.core.commit.clone();
|
||||||
|
meta.core.version = Some(m.version.clone());
|
||||||
|
meta.database.schemas = DATABASES.iter().map(|(_, s)| s.to_string()).collect();
|
||||||
|
meta.managed_files = m.files.iter().map(|f| f.path.clone()).collect();
|
||||||
|
for f in &m.files {
|
||||||
|
meta.original_hashes.insert(f.path.clone(), f.sha256.clone());
|
||||||
|
}
|
||||||
|
let md = MetaDir::create(&dest, &meta)?;
|
||||||
|
fsx::atomic_write(&md.root.join("manifests").join("base.json"), &manifest_bytes)?;
|
||||||
|
p.registry.register(&meta.id, &dest)?;
|
||||||
|
say("Ready", 100, None);
|
||||||
|
Ok(Installed { id: meta.id, path: dest.to_string_lossy().into_owned(), version: m.version.clone() })
|
||||||
|
})();
|
||||||
|
|
||||||
|
if result.is_err() && staging_root.join(STAGING_MARKER).exists() {
|
||||||
|
// Unfinished work of ours; the destination was never touched. Give back what docker holds for it.
|
||||||
|
if let Some(cfg) = &project {
|
||||||
|
super::destroy(d, cfg);
|
||||||
|
}
|
||||||
|
let _ = fs::remove_dir_all(&staging_root);
|
||||||
|
}
|
||||||
|
result
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
use crate::docker::cli::{Call, Output};
|
||||||
|
use crate::package::{self, BuildOptions};
|
||||||
|
use base64::Engine;
|
||||||
|
use ed25519_dalek::{Signer, SigningKey};
|
||||||
|
use std::cell::RefCell;
|
||||||
|
|
||||||
|
struct Fake {
|
||||||
|
calls: RefCell<Vec<Vec<String>>>,
|
||||||
|
unavailable: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Fake {
|
||||||
|
fn new(unavailable: bool) -> Fake {
|
||||||
|
Fake { calls: Default::default(), unavailable }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Docker for Fake {
|
||||||
|
fn run(&self, call: &Call) -> Result<Output> {
|
||||||
|
self.calls.borrow_mut().push(call.args.clone());
|
||||||
|
if self.unavailable {
|
||||||
|
return Err(Error::Invalid("docker could not be started: not found".into()));
|
||||||
|
}
|
||||||
|
Ok(Output { code: Some(0), stdout: "27.3.1".into(), stderr: String::new() })
|
||||||
|
}
|
||||||
|
|
||||||
|
fn pause(&self, _d: std::time::Duration) {}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn reg(d: &Path) -> Registry {
|
||||||
|
Registry::at(d.join("reg/installs.json"))
|
||||||
|
}
|
||||||
|
|
||||||
|
fn codes(p: &Preflight) -> Vec<&'static str> {
|
||||||
|
p.problems.iter().map(|x| x.code).collect()
|
||||||
|
}
|
||||||
|
|
||||||
|
fn data_folder(d: &Path) -> PathBuf {
|
||||||
|
let data = d.join("data");
|
||||||
|
fs::create_dir_all(data.join("dbc")).unwrap();
|
||||||
|
fs::create_dir_all(data.join("maps")).unwrap();
|
||||||
|
data
|
||||||
|
}
|
||||||
|
|
||||||
|
/// A signed package folder holding `files`, and the key that verifies it.
|
||||||
|
fn signed_package(d: &Path, files: &[(&str, &str)]) -> (PathBuf, String) {
|
||||||
|
let src = d.join("src");
|
||||||
|
for (rel, content) in files {
|
||||||
|
let p = src.join(rel);
|
||||||
|
fs::create_dir_all(p.parent().unwrap()).unwrap();
|
||||||
|
fs::write(p, content).unwrap();
|
||||||
|
}
|
||||||
|
let pkg = d.join("pkg");
|
||||||
|
let opts = BuildOptions { kind: manifest::Kind::Update, version: "0.1.0".into(), core_commit: None, built_at: "x".into(), part_size: 1 << 20, bots_commit: None, migrations: vec![] };
|
||||||
|
package::build(&src, &pkg, &opts, &|_| {}).unwrap();
|
||||||
|
let key = SigningKey::generate(&mut rand_core::OsRng);
|
||||||
|
let engine = base64::engine::general_purpose::STANDARD;
|
||||||
|
let sig = engine.encode(key.sign(&fs::read(pkg.join("manifest.json")).unwrap()).to_bytes());
|
||||||
|
fs::write(pkg.join("manifest.json.sig"), sig).unwrap();
|
||||||
|
(pkg, engine.encode(key.verifying_key().to_bytes()))
|
||||||
|
}
|
||||||
|
|
||||||
|
const FULL: [(&str, &str); 7] = [
|
||||||
|
("Core/worldserver", "w"),
|
||||||
|
("Core/authserver", "a"),
|
||||||
|
("Core/configs/worldserver.conf.dist", "x"),
|
||||||
|
("Core/configs/authserver.conf.dist", "x"),
|
||||||
|
("Database/baseline/auth.sql.zst", "dump"),
|
||||||
|
("Database/baseline/characters.sql.zst", "dump"),
|
||||||
|
("Database/baseline/world.sql.zst", "dump"),
|
||||||
|
];
|
||||||
|
|
||||||
|
#[cfg(unix)]
|
||||||
|
#[test]
|
||||||
|
fn the_destination_rules_fit_a_linux_computer() {
|
||||||
|
let d = tempfile::tempdir().unwrap();
|
||||||
|
let data = data_folder(d.path());
|
||||||
|
let ok = |dest: &Path| codes(&preflight(dest, &data, 1000, ®(d.path())));
|
||||||
|
assert!(!ok(&d.path().join("CoaServer")).iter().any(|c| *c != "space"), "a new folder is fine");
|
||||||
|
for bad in ["/usr/local/coa", "/etc", "/", "/proc/x"] {
|
||||||
|
assert!(ok(Path::new(bad)).contains(&"system_folder"), "{bad}");
|
||||||
|
}
|
||||||
|
assert!(ok(Path::new("relative/dir")).contains(&"relative"));
|
||||||
|
assert!(ok(Path::new("/srv/with:colon")).contains(&"colon"));
|
||||||
|
let existing = d.path().join("existing");
|
||||||
|
fs::create_dir_all(&existing).unwrap();
|
||||||
|
fs::write(existing.join("notes.txt"), b"x").unwrap();
|
||||||
|
assert!(ok(&existing).contains(&"not_empty"));
|
||||||
|
let r = reg(d.path());
|
||||||
|
r.register("1", &existing).unwrap();
|
||||||
|
assert!(codes(&preflight(&existing.join("inner"), &data, 1000, &r)).contains(&"registered"));
|
||||||
|
// The same name in another case is another folder on Linux.
|
||||||
|
assert!(!codes(&preflight(&d.path().join("EXISTING"), &data, 1000, &r)).contains(&"registered"));
|
||||||
|
}
|
||||||
|
|
||||||
|
// The tests marked for unix use absolute folders of the temporary directory, which on Windows start with a drive letter and a
|
||||||
|
// colon; the Docker backend refuses a colon in a folder it mounts (it would be read as a separator of `--volume`) and only runs
|
||||||
|
// on Linux, so Windows has nothing to check here.
|
||||||
|
#[cfg(unix)]
|
||||||
|
#[test]
|
||||||
|
fn the_game_data_folder_must_look_like_game_data() {
|
||||||
|
let d = tempfile::tempdir().unwrap();
|
||||||
|
let reg = reg(d.path());
|
||||||
|
let dest = d.path().join("srv");
|
||||||
|
let empty = d.path().join("empty");
|
||||||
|
fs::create_dir_all(&empty).unwrap();
|
||||||
|
assert!(codes(&preflight(&dest, &empty, 1, ®)).contains(&"data_missing"));
|
||||||
|
assert!(codes(&preflight(&dest, Path::new("relative/data"), 1, ®)).contains(&"data_path"));
|
||||||
|
assert!(!codes(&preflight(&dest, &data_folder(d.path()), 1, ®)).iter().any(|c| c.starts_with("data")));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(unix)]
|
||||||
|
#[test]
|
||||||
|
fn new_settings_name_the_containers_and_keep_the_secrets_private() {
|
||||||
|
let d = tempfile::tempdir().unwrap();
|
||||||
|
let root = d.path().join("srv");
|
||||||
|
let data = data_folder(d.path());
|
||||||
|
let s = write_settings(&root, &data).unwrap();
|
||||||
|
|
||||||
|
let cfg = Config::load(&root).unwrap();
|
||||||
|
assert_eq!(cfg.bind_address, "127.0.0.1", "this computer only until the person opens it");
|
||||||
|
assert_eq!(cfg.project.len(), 10);
|
||||||
|
assert_eq!(cfg.data_path(&root), data);
|
||||||
|
|
||||||
|
let ports = crate::layout::read_ports(&root);
|
||||||
|
assert_eq!(ports.world, s.world_port);
|
||||||
|
assert!(ports.auth > 0 && ports.ra > 0);
|
||||||
|
let repack: serde_json::Value = fsx::read_json(&root.join("Settings/repack.json")).unwrap();
|
||||||
|
assert_eq!(repack["raUsername"], db::SERVICE_ACCOUNT);
|
||||||
|
|
||||||
|
let (root_pw, app_pw) = db::credentials(&root).unwrap();
|
||||||
|
assert!(root_pw.len() == 48 && app_pw.len() == 48 && root_pw != app_pw);
|
||||||
|
assert_eq!(app_pw, s.app_password);
|
||||||
|
#[cfg(unix)]
|
||||||
|
{
|
||||||
|
use std::os::unix::fs::PermissionsExt;
|
||||||
|
let mode = fs::metadata(root.join("Settings/database.json")).unwrap().permissions().mode() & 0o777;
|
||||||
|
assert_eq!(mode, 0o600, "the passwords are for their owner only");
|
||||||
|
}
|
||||||
|
// Two installations never share a project name.
|
||||||
|
let other = write_settings(&d.path().join("srv2"), &data).unwrap();
|
||||||
|
assert_ne!(Config::load(&d.path().join("srv2")).unwrap().project, cfg.project);
|
||||||
|
let _ = other;
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn a_busy_default_port_is_replaced_by_a_free_one() {
|
||||||
|
let held = std::net::TcpListener::bind("127.0.0.1:0").unwrap();
|
||||||
|
let busy = held.local_addr().unwrap().port();
|
||||||
|
let got = pick_port(busy).unwrap();
|
||||||
|
assert_ne!(got, busy);
|
||||||
|
drop(held);
|
||||||
|
assert_eq!(pick_port(busy).unwrap(), busy, "free again: the usual port is used");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn a_package_is_checked_for_everything_an_installation_needs() {
|
||||||
|
let d = tempfile::tempdir().unwrap();
|
||||||
|
let root = d.path();
|
||||||
|
assert!(check_extracted(root).unwrap_err().to_string().contains("Core/worldserver"));
|
||||||
|
for (rel, c) in FULL {
|
||||||
|
let p = root.join(rel);
|
||||||
|
fs::create_dir_all(p.parent().unwrap()).unwrap();
|
||||||
|
fs::write(p, c).unwrap();
|
||||||
|
}
|
||||||
|
check_extracted(root).unwrap();
|
||||||
|
fs::remove_file(root.join("Database/baseline/world.sql.zst")).unwrap();
|
||||||
|
assert!(check_extracted(root).unwrap_err().to_string().contains("Database/baseline/world.sql.zst"));
|
||||||
|
}
|
||||||
|
|
||||||
|
fn migration(db: &str, id: &str) -> Migration {
|
||||||
|
Migration { db: db.into(), id: id.into(), sha256: "ab".repeat(32), destructive: false, compatible_sha256: vec![] }
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn the_package_migrations_are_recorded_as_applied_in_a_few_statements() {
|
||||||
|
let list: Vec<Migration> = (0..1000).map(|i| migration(["auth", "characters", "world"][i % 3], &format!("rev_{i}"))).collect();
|
||||||
|
let statements = baseline_statements(&list).unwrap();
|
||||||
|
assert_eq!(statements.len(), 3, "400 rows at most in a statement");
|
||||||
|
assert!(statements[0].starts_with("REPLACE INTO `acore_world`.`coa_manager_migrations`"));
|
||||||
|
assert_eq!(statements.iter().map(|s| s.matches("'applied'").count()).sum::<usize>(), 1000);
|
||||||
|
assert!(statements[0].contains("('auth','rev_0',") && statements[0].contains(",NOW(),NULL,1)"), "marked as a baseline");
|
||||||
|
assert!(baseline_statements(&[]).unwrap().is_empty());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn a_migration_that_could_carry_sql_is_refused_before_anything_is_written() {
|
||||||
|
for bad in [migration("world", "x'); DROP TABLE y;--"), migration("mysql", "ok"), migration("world", ""), Migration { sha256: "zz".into(), ..migration("world", "ok") }] {
|
||||||
|
assert!(baseline_statements(&[migration("auth", "fine"), bad]).is_err());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn without_docker_nothing_is_downloaded_or_created() {
|
||||||
|
let d = tempfile::tempdir().unwrap();
|
||||||
|
let (pkg, key) = signed_package(d.path(), &FULL);
|
||||||
|
let dest = d.path().join("dest");
|
||||||
|
let r = reg(d.path());
|
||||||
|
let fake = Fake::new(true);
|
||||||
|
let err = install_with(&fake, &Params { source: Source::Dir(pkg), dest: dest.clone(), data_dir: data_folder(d.path()), trusted_key: &key, registry: &r, cancel: Cancel::default() }, &|_| {}).unwrap_err();
|
||||||
|
assert!(err.to_string().to_lowercase().contains("docker"), "{err}");
|
||||||
|
assert!(!dest.exists() && !dest.with_file_name("dest.installing").exists());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(unix)]
|
||||||
|
#[test]
|
||||||
|
fn a_package_without_the_server_is_refused_and_leaves_nothing() {
|
||||||
|
let d = tempfile::tempdir().unwrap();
|
||||||
|
let (pkg, key) = signed_package(d.path(), &[("Core/configs/worldserver.conf.dist", "x"), ("README.txt", "hello")]);
|
||||||
|
let dest = d.path().join("dest");
|
||||||
|
let r = reg(d.path());
|
||||||
|
let fake = Fake::new(false);
|
||||||
|
let err = install_with(&fake, &Params { source: Source::Dir(pkg), dest: dest.clone(), data_dir: data_folder(d.path()), trusted_key: &key, registry: &r, cancel: Cancel::default() }, &|_| {}).unwrap_err();
|
||||||
|
assert!(err.to_string().contains("not a complete Linux server package"), "{err}");
|
||||||
|
assert!(!dest.exists() && !dest.with_file_name("dest.installing").exists());
|
||||||
|
assert!(r.list().unwrap().is_empty());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(unix)]
|
||||||
|
#[test]
|
||||||
|
fn a_failed_database_setup_gives_back_what_docker_holds_and_leaves_no_server() {
|
||||||
|
let d = tempfile::tempdir().unwrap();
|
||||||
|
let (pkg, key) = signed_package(d.path(), &FULL);
|
||||||
|
let dest = d.path().join("dest");
|
||||||
|
let r = reg(d.path());
|
||||||
|
// This fake docker answers every command with success and no container, so the database never becomes ready.
|
||||||
|
let fake = Fake::new(false);
|
||||||
|
let err = install_with(&fake, &Params { source: Source::Dir(pkg), dest: dest.clone(), data_dir: data_folder(d.path()), trusted_key: &key, registry: &r, cancel: Cancel::default() }, &|_| {}).unwrap_err();
|
||||||
|
assert!(err.to_string().to_lowercase().contains("database"), "{err}");
|
||||||
|
assert!(!dest.exists() && !dest.with_file_name("dest.installing").exists(), "no half-installed server");
|
||||||
|
assert!(r.list().unwrap().is_empty());
|
||||||
|
let calls = fake.calls.borrow();
|
||||||
|
let removed = |suffix: &str| calls.iter().any(|c| c[0] == "rm" && c.last().is_some_and(|n| n.starts_with("coa-") && n.ends_with(suffix)));
|
||||||
|
assert!(removed("-db") && removed("-world") && removed("-auth"), "containers removed: {calls:?}");
|
||||||
|
assert!(calls.iter().any(|c| c[..2] == ["volume", "rm"]) && calls.iter().any(|c| c[..2] == ["network", "rm"]));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -80,6 +80,26 @@ fn docker(d: &dyn Docker, args: &[&str], timeout: Duration) -> Step<super::cli::
|
|||||||
d.run(&Call::new(args, timeout)).or_else(|e| fail(ErrorCode::DockerUnavailable, e.to_string()))
|
d.run(&Call::new(args, timeout)).or_else(|e| fail(ErrorCode::DockerUnavailable, e.to_string()))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Is docker usable by this user? Returns its version, or the reason in docker's own words.
|
||||||
|
pub fn check_docker(d: &dyn Docker) -> Result<String> {
|
||||||
|
let mut log = Log::default();
|
||||||
|
match preflight(d, &mut log) {
|
||||||
|
Ok(()) => Ok(log.0.join(" ")),
|
||||||
|
Err(f) => Err(crate::error::Error::Invalid(format!("{} {}", f.code.human().message, f.output.trim()).trim().to_string())),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Remove everything docker holds for an installation: containers, network and the database volume. Used when an
|
||||||
|
/// installation fails before it is finished, and later to uninstall. Missing pieces are not an error.
|
||||||
|
pub(crate) fn destroy(d: &dyn Docker, cfg: &Config) {
|
||||||
|
let n = cfg.names();
|
||||||
|
for name in [&n.auth, &n.world, &n.db] {
|
||||||
|
let _ = d.run(&Call::new(&["rm", "--force", name], QUICK));
|
||||||
|
}
|
||||||
|
let _ = d.run(&Call::new(&["network", "rm", &n.network], QUICK));
|
||||||
|
let _ = d.run(&Call::new(&["volume", "rm", &n.volume], QUICK));
|
||||||
|
}
|
||||||
|
|
||||||
fn preflight(d: &dyn Docker, log: &mut Log) -> Step<()> {
|
fn preflight(d: &dyn Docker, log: &mut Log) -> Step<()> {
|
||||||
let o = docker(d, &["version", "--format", "{{.Server.Version}}"], QUICK)?;
|
let o = docker(d, &["version", "--format", "{{.Server.Version}}"], QUICK)?;
|
||||||
if !o.ok() {
|
if !o.ok() {
|
||||||
@@ -204,6 +224,7 @@ fn start(d: &dyn Docker, root: &Path, cfg: &Config, with_game: bool, log: &mut L
|
|||||||
}
|
}
|
||||||
|
|
||||||
ensure_image(d, log)?;
|
ensure_image(d, log)?;
|
||||||
|
super::ensure_main_configs(root).map_err(|e| Failure { code: ErrorCode::ServerFilesIncomplete, output: e.to_string() })?;
|
||||||
std::fs::create_dir_all(root.join("Core/Logs")).map_err(|e| Failure { code: ErrorCode::ServerFilesIncomplete, output: e.to_string() })?;
|
std::fs::create_dir_all(root.join("Core/Logs")).map_err(|e| Failure { code: ErrorCode::ServerFilesIncomplete, output: e.to_string() })?;
|
||||||
let owner = owner_of(root);
|
let owner = owner_of(root);
|
||||||
let host = std::fs::canonicalize(root).unwrap_or_else(|_| root.to_path_buf());
|
let host = std::fs::canonicalize(root).unwrap_or_else(|_| root.to_path_buf());
|
||||||
@@ -212,7 +233,7 @@ fn start(d: &dyn Docker, root: &Path, cfg: &Config, with_game: bool, log: &mut L
|
|||||||
if !state.get(&n.world).is_some_and(Container::running) {
|
if !state.get(&n.world).is_some_and(Container::running) {
|
||||||
remove(d, &n.world);
|
remove(d, &n.world);
|
||||||
let mut call = Call::new(&[], Duration::from_secs(60));
|
let mut call = Call::new(&[], Duration::from_secs(60));
|
||||||
call.args = game_args(cfg, &n, GameKind::World, &host, ports.world, ports.ra, owner.as_deref());
|
call.args = game_args(cfg, &n, GameKind::World, &host, &cfg.data_path(&host), ports.world, ports.ra, owner.as_deref());
|
||||||
call.env = database_env(&secrets, true);
|
call.env = database_env(&secrets, true);
|
||||||
run_container(d, &call, &n.world, log)?;
|
run_container(d, &call, &n.world, log)?;
|
||||||
}
|
}
|
||||||
@@ -221,7 +242,7 @@ fn start(d: &dyn Docker, root: &Path, cfg: &Config, with_game: bool, log: &mut L
|
|||||||
if !state.get(&n.auth).is_some_and(Container::running) {
|
if !state.get(&n.auth).is_some_and(Container::running) {
|
||||||
remove(d, &n.auth);
|
remove(d, &n.auth);
|
||||||
let mut call = Call::new(&[], Duration::from_secs(60));
|
let mut call = Call::new(&[], Duration::from_secs(60));
|
||||||
call.args = game_args(cfg, &n, GameKind::Auth, &host, ports.auth, 0, owner.as_deref());
|
call.args = game_args(cfg, &n, GameKind::Auth, &host, &cfg.data_path(&host), ports.auth, 0, owner.as_deref());
|
||||||
call.env = database_env(&secrets, false);
|
call.env = database_env(&secrets, false);
|
||||||
run_container(d, &call, &n.auth, log)?;
|
run_container(d, &call, &n.auth, log)?;
|
||||||
}
|
}
|
||||||
@@ -320,8 +341,11 @@ fn db_args(cfg: &Config, n: &Names) -> Vec<String> {
|
|||||||
a.extend(["--volume".into(), format!("{}:/var/lib/mysql", n.volume)]);
|
a.extend(["--volume".into(), format!("{}:/var/lib/mysql", n.volume)]);
|
||||||
// The password comes from the environment of the docker client, not from this command line.
|
// The password comes from the environment of the docker client, not from this command line.
|
||||||
a.extend(["--env".into(), "MYSQL_ROOT_PASSWORD".into()]);
|
a.extend(["--env".into(), "MYSQL_ROOT_PASSWORD".into()]);
|
||||||
// "mysqladmin ping" succeeds as soon as the server answers, with or without a login.
|
// "mysqladmin ping" succeeds as soon as the server answers, with or without a login. It must go over TCP, like
|
||||||
a.extend(["--health-cmd".into(), "mysqladmin ping --silent".into()]);
|
// everything the Manager sends: while a new database initialises, the image first runs a temporary server that
|
||||||
|
// answers on its socket but takes no network connection, and a socket ping would call the container healthy for a few
|
||||||
|
// seconds in which every TCP connection is still refused.
|
||||||
|
a.extend(["--health-cmd".into(), "mysqladmin ping --protocol=tcp --host=127.0.0.1 --silent".into()]);
|
||||||
a.extend(["--health-interval".into(), "5s".into(), "--health-timeout".into(), "5s".into(), "--health-retries".into(), "40".into()]);
|
a.extend(["--health-interval".into(), "5s".into(), "--health-timeout".into(), "5s".into(), "--health-retries".into(), "40".into()]);
|
||||||
a.extend(["--stop-timeout".into(), "60".into()]);
|
a.extend(["--stop-timeout".into(), "60".into()]);
|
||||||
a.push(cfg.mysql_image.clone());
|
a.push(cfg.mysql_image.clone());
|
||||||
@@ -345,7 +369,7 @@ fn database_env(s: &Secrets, world: bool) -> Vec<(String, String)> {
|
|||||||
env
|
env
|
||||||
}
|
}
|
||||||
|
|
||||||
fn game_args(cfg: &Config, n: &Names, kind: GameKind, host: &Path, port: u16, ra_port: u16, owner: Option<&str>) -> Vec<String> {
|
fn game_args(cfg: &Config, n: &Names, kind: GameKind, host: &Path, data: &Path, port: u16, ra_port: u16, owner: Option<&str>) -> Vec<String> {
|
||||||
let (name, alias, binary, conf, inner_port) = match kind {
|
let (name, alias, binary, conf, inner_port) = match kind {
|
||||||
GameKind::World => (&n.world, "world", "./worldserver", "configs/worldserver.conf", WORLD_PORT),
|
GameKind::World => (&n.world, "world", "./worldserver", "configs/worldserver.conf", WORLD_PORT),
|
||||||
GameKind::Auth => (&n.auth, "auth", "./authserver", "configs/authserver.conf", AUTH_PORT),
|
GameKind::Auth => (&n.auth, "auth", "./authserver", "configs/authserver.conf", AUTH_PORT),
|
||||||
@@ -370,7 +394,7 @@ fn game_args(cfg: &Config, n: &Names, kind: GameKind, host: &Path, port: u16, ra
|
|||||||
// the container and stops the server when it cannot find one.
|
// the container and stops the server when it cannot find one.
|
||||||
a.extend(env("AC_UPDATES_ENABLE_DATABASES", "0"));
|
a.extend(env("AC_UPDATES_ENABLE_DATABASES", "0"));
|
||||||
if kind == GameKind::World {
|
if kind == GameKind::World {
|
||||||
a.extend(["--volume".into(), format!("{}:{DATA}:ro", host.join("Data").display())]);
|
a.extend(["--volume".into(), format!("{}:{DATA}:ro", data.display())]);
|
||||||
a.extend(env("AC_DATA_DIR", DATA));
|
a.extend(env("AC_DATA_DIR", DATA));
|
||||||
// The remote console is only ever reachable from this computer.
|
// The remote console is only ever reachable from this computer.
|
||||||
a.extend(["--publish".into(), format!("127.0.0.1:{ra_port}:{RA_PORT}")]);
|
a.extend(["--publish".into(), format!("127.0.0.1:{ra_port}:{RA_PORT}")]);
|
||||||
@@ -674,6 +698,17 @@ mod tests {
|
|||||||
assert!(runs[1].args.windows(2).any(|w| w == ["--env", "AC_WORLD_DATABASE_INFO"]), "name only, the value is in the environment");
|
assert!(runs[1].args.windows(2).any(|w| w == ["--env", "AC_WORLD_DATABASE_INFO"]), "name only, the value is in the environment");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn the_database_is_only_healthy_once_it_takes_tcp_connections() {
|
||||||
|
let (_d, root) = server("t1");
|
||||||
|
let sim = Sim::new();
|
||||||
|
assert!(start_all(&sim, &root).ok);
|
||||||
|
let db = &sim.calls_of("run")[0].args;
|
||||||
|
let i = db.iter().position(|a| a == "--health-cmd").expect("the database has a health check");
|
||||||
|
// Found on a new volume: a socket-only ping reported healthy about four seconds before TCP worked.
|
||||||
|
assert!(db[i + 1].contains("--protocol=tcp") && db[i + 1].contains("--host=127.0.0.1"), "{}", db[i + 1]);
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn the_world_container_is_wired_like_the_repack_layout() {
|
fn the_world_container_is_wired_like_the_repack_layout() {
|
||||||
let (_d, root) = server("t1");
|
let (_d, root) = server("t1");
|
||||||
@@ -714,8 +749,8 @@ mod tests {
|
|||||||
let (_d, root) = server("ports");
|
let (_d, root) = server("ports");
|
||||||
let cfg = Config::load(&root).unwrap();
|
let cfg = Config::load(&root).unwrap();
|
||||||
let n = cfg.names();
|
let n = cfg.names();
|
||||||
let world = game_args(&cfg, &n, GameKind::World, &root, 18085, 13443, None);
|
let world = game_args(&cfg, &n, GameKind::World, &root, &root.join("Data"), 18085, 13443, None);
|
||||||
let auth = game_args(&cfg, &n, GameKind::Auth, &root, 13724, 0, None);
|
let auth = game_args(&cfg, &n, GameKind::Auth, &root, &root.join("Data"), 13724, 0, None);
|
||||||
assert!(world.iter().any(|a| a == "127.0.0.1:18085:8085"));
|
assert!(world.iter().any(|a| a == "127.0.0.1:18085:8085"));
|
||||||
assert!(world.iter().any(|a| a == "127.0.0.1:13443:3443"));
|
assert!(world.iter().any(|a| a == "127.0.0.1:13443:3443"));
|
||||||
assert!(world.iter().any(|a| a == "AC_WORLD_SERVER_PORT=8085"));
|
assert!(world.iter().any(|a| a == "AC_WORLD_SERVER_PORT=8085"));
|
||||||
|
|||||||
@@ -15,10 +15,12 @@
|
|||||||
//! ```
|
//! ```
|
||||||
|
|
||||||
mod cli;
|
mod cli;
|
||||||
|
pub mod install;
|
||||||
mod lifecycle;
|
mod lifecycle;
|
||||||
|
|
||||||
pub use cli::{Call, Docker, Output, SystemDocker};
|
pub use cli::{Call, Docker, Output, SystemDocker};
|
||||||
pub use lifecycle::{observe, observe_with, run, run_with};
|
pub use lifecycle::{check_docker, observe, observe_with, run, run_with};
|
||||||
|
pub(crate) use lifecycle::destroy;
|
||||||
|
|
||||||
use std::net::IpAddr;
|
use std::net::IpAddr;
|
||||||
use std::path::Path;
|
use std::path::Path;
|
||||||
@@ -31,7 +33,7 @@ use crate::layout::{self, Classification, ScanReport};
|
|||||||
|
|
||||||
/// Present in a Docker installation, absent from a repack.
|
/// Present in a Docker installation, absent from a repack.
|
||||||
pub const MARKER: &str = "Settings/docker.json";
|
pub const MARKER: &str = "Settings/docker.json";
|
||||||
const MYSQL_IMAGE: &str = "mysql:8.4";
|
pub(crate) const MYSQL_IMAGE: &str = "mysql:8.4";
|
||||||
const RUNTIME_DOCKERFILE: &str = include_str!("Dockerfile.runtime");
|
const RUNTIME_DOCKERFILE: &str = include_str!("Dockerfile.runtime");
|
||||||
|
|
||||||
pub fn is_docker(root: &Path) -> bool {
|
pub fn is_docker(root: &Path) -> bool {
|
||||||
@@ -57,6 +59,10 @@ pub struct Config {
|
|||||||
pub bind_address: String,
|
pub bind_address: String,
|
||||||
#[serde(default = "mysql_image")]
|
#[serde(default = "mysql_image")]
|
||||||
pub mysql_image: String,
|
pub mysql_image: String,
|
||||||
|
/// Where the game data (dbc, maps, vmaps, mmaps) is, when it is not the `Data` folder of the server. Used in place and
|
||||||
|
/// mounted read-only, so one copy can serve several servers.
|
||||||
|
#[serde(default, skip_serializing_if = "Option::is_none")]
|
||||||
|
pub data_dir: Option<String>,
|
||||||
}
|
}
|
||||||
|
|
||||||
pub(crate) struct Names {
|
pub(crate) struct Names {
|
||||||
@@ -74,6 +80,11 @@ impl Config {
|
|||||||
Ok(cfg)
|
Ok(cfg)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// The folder mounted as the game data.
|
||||||
|
pub fn data_path(&self, root: &Path) -> std::path::PathBuf {
|
||||||
|
self.data_dir.as_deref().map(std::path::PathBuf::from).unwrap_or_else(|| root.join("Data"))
|
||||||
|
}
|
||||||
|
|
||||||
fn validate(&self) -> Result<()> {
|
fn validate(&self) -> Result<()> {
|
||||||
let name_ok = !self.project.is_empty()
|
let name_ok = !self.project.is_empty()
|
||||||
&& self.project.len() <= 32
|
&& self.project.len() <= 32
|
||||||
@@ -85,6 +96,12 @@ impl Config {
|
|||||||
if self.bind_address.parse::<IpAddr>().is_err() {
|
if self.bind_address.parse::<IpAddr>().is_err() {
|
||||||
return Err(Error::Invalid(format!("{} is not an IP address.", self.bind_address)));
|
return Err(Error::Invalid(format!("{} is not an IP address.", self.bind_address)));
|
||||||
}
|
}
|
||||||
|
if let Some(d) = &self.data_dir {
|
||||||
|
// The folder goes into a `--volume host:container:ro` option, where a colon would be read as a separator.
|
||||||
|
if !Path::new(d).is_absolute() || d.contains(':') {
|
||||||
|
return Err(Error::Invalid("The game data folder must be a full path without a colon.".into()));
|
||||||
|
}
|
||||||
|
}
|
||||||
let image_ok = !self.mysql_image.is_empty() && self.mysql_image.chars().all(|c| c.is_ascii_alphanumeric() || "._/:@-".contains(c));
|
let image_ok = !self.mysql_image.is_empty() && self.mysql_image.chars().all(|c| c.is_ascii_alphanumeric() || "._/:@-".contains(c));
|
||||||
if !image_ok {
|
if !image_ok {
|
||||||
return Err(Error::Invalid("The database image name is not valid.".into()));
|
return Err(Error::Invalid("The database image name is not valid.".into()));
|
||||||
@@ -92,12 +109,32 @@ impl Config {
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Name of the database container (the one `docker exec` talks to).
|
||||||
|
pub(crate) fn database_container(&self) -> String {
|
||||||
|
self.names().db
|
||||||
|
}
|
||||||
|
|
||||||
pub(crate) fn names(&self) -> Names {
|
pub(crate) fn names(&self) -> Names {
|
||||||
let p = &self.project;
|
let p = &self.project;
|
||||||
Names { network: format!("coa-{p}"), volume: format!("coa-{p}-db"), db: format!("coa-{p}-db"), world: format!("coa-{p}-world"), auth: format!("coa-{p}-auth") }
|
Names { network: format!("coa-{p}"), volume: format!("coa-{p}-db"), db: format!("coa-{p}-db"), world: format!("coa-{p}-world"), auth: format!("coa-{p}-auth") }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Create the world and auth configuration files from their `.dist` templates when they do not exist. A package only
|
||||||
|
/// carries the templates, and on Windows the launcher writes the active files at every start; here nothing else would.
|
||||||
|
/// An existing file is never touched, so the person's settings survive updates. Returns the files created.
|
||||||
|
pub fn ensure_main_configs(root: &Path) -> Result<Vec<String>> {
|
||||||
|
let mut created = Vec::new();
|
||||||
|
for name in ["worldserver", "authserver"] {
|
||||||
|
let (conf, dist) = (root.join(format!("Core/configs/{name}.conf")), root.join(format!("Core/configs/{name}.conf.dist")));
|
||||||
|
if !conf.exists() && dist.is_file() {
|
||||||
|
std::fs::copy(&dist, &conf)?;
|
||||||
|
created.push(format!("{name}.conf"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(created)
|
||||||
|
}
|
||||||
|
|
||||||
/// Name of the runtime image: it follows the content of its Dockerfile, so changing the libraries builds a new image.
|
/// Name of the runtime image: it follows the content of its Dockerfile, so changing the libraries builds a new image.
|
||||||
pub(crate) fn runtime_image() -> String {
|
pub(crate) fn runtime_image() -> String {
|
||||||
format!("coa-runtime:{}", &fsx::sha256_bytes(RUNTIME_DOCKERFILE.as_bytes())[..12])
|
format!("coa-runtime:{}", &fsx::sha256_bytes(RUNTIME_DOCKERFILE.as_bytes())[..12])
|
||||||
@@ -118,7 +155,8 @@ pub(crate) fn scan(root: &Path) -> Result<ScanReport> {
|
|||||||
let bot_active = modules_dir.join("mod_coa_playerbots.conf");
|
let bot_active = modules_dir.join("mod_coa_playerbots.conf");
|
||||||
let bot_conf = if bot_active.is_file() { bot_active } else { modules_dir.join("mod_coa_playerbots.conf.dist") };
|
let bot_conf = if bot_active.is_file() { bot_active } else { modules_dir.join("mod_coa_playerbots.conf.dist") };
|
||||||
let bot_config_keys = layout::count_bot_keys(&bot_conf);
|
let bot_config_keys = layout::count_bot_keys(&bot_conf);
|
||||||
let has_data = layout::exists(root, "Data/dbc") && layout::exists(root, "Data/maps");
|
let data = cfg.as_ref().map(|c| c.data_path(root)).unwrap_or_else(|_| root.join("Data"));
|
||||||
|
let has_data = data.join("dbc").is_dir() && data.join("maps").is_dir();
|
||||||
let has_confs = layout::exists(root, "Core/configs/worldserver.conf") && layout::exists(root, "Core/configs/authserver.conf");
|
let has_confs = layout::exists(root, "Core/configs/worldserver.conf") && layout::exists(root, "Core/configs/authserver.conf");
|
||||||
|
|
||||||
let items = vec![
|
let items = vec![
|
||||||
@@ -157,3 +195,30 @@ pub(crate) fn scan(root: &Path) -> Result<ScanReport> {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
use std::fs;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn the_main_configs_are_created_from_their_templates_and_never_overwritten() {
|
||||||
|
let d = tempfile::tempdir().unwrap();
|
||||||
|
let cfg = d.path().join("Core/configs");
|
||||||
|
fs::create_dir_all(&cfg).unwrap();
|
||||||
|
fs::write(cfg.join("worldserver.conf.dist"), "Setting = default\n").unwrap();
|
||||||
|
fs::write(cfg.join("authserver.conf.dist"), "Auth = default\n").unwrap();
|
||||||
|
|
||||||
|
assert_eq!(ensure_main_configs(d.path()).unwrap(), ["worldserver.conf", "authserver.conf"]);
|
||||||
|
assert_eq!(fs::read_to_string(cfg.join("worldserver.conf")).unwrap(), "Setting = default\n");
|
||||||
|
|
||||||
|
// The person's own settings survive the next start.
|
||||||
|
fs::write(cfg.join("worldserver.conf"), "Setting = mine\n").unwrap();
|
||||||
|
assert!(ensure_main_configs(d.path()).unwrap().is_empty());
|
||||||
|
assert_eq!(fs::read_to_string(cfg.join("worldserver.conf")).unwrap(), "Setting = mine\n");
|
||||||
|
// Without a template there is nothing to create and nothing fails.
|
||||||
|
fs::remove_file(cfg.join("authserver.conf")).unwrap();
|
||||||
|
fs::remove_file(cfg.join("authserver.conf.dist")).unwrap();
|
||||||
|
assert!(ensure_main_configs(d.path()).unwrap().is_empty());
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -31,8 +31,9 @@ impl Verb {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn timeout(self) -> Duration {
|
fn timeout(self, root: &Path) -> Duration {
|
||||||
match self {
|
match self {
|
||||||
|
Verb::StartAll | Verb::StartWorld if squid_enabled(root) => Duration::from_secs(2700),
|
||||||
Verb::StartAll | Verb::StartWorld => Duration::from_secs(420),
|
Verb::StartAll | Verb::StartWorld => Duration::from_secs(420),
|
||||||
Verb::StartMysql => Duration::from_secs(120),
|
Verb::StartMysql => Duration::from_secs(120),
|
||||||
Verb::StopAll => Duration::from_secs(240),
|
Verb::StopAll => Duration::from_secs(240),
|
||||||
@@ -40,6 +41,14 @@ impl Verb {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn squid_enabled(root: &Path) -> bool {
|
||||||
|
let active = root.join("Core/configs/modules/playerbots.conf");
|
||||||
|
let path = if active.exists() { active } else { root.join("Core/configs/modules/playerbots.conf.dist") };
|
||||||
|
std::fs::read(path).ok().and_then(|bytes| crate::config::parser::ConfFile::parse_bytes(&bytes).ok())
|
||||||
|
.is_some_and(|config| config.get("AiPlayerbot.Enabled").is_none_or(|value|
|
||||||
|
!matches!(value.trim().trim_matches('"').to_ascii_lowercase().as_str(), "0" | "false" | "no" | "off")))
|
||||||
|
}
|
||||||
|
|
||||||
#[derive(Debug, Clone, Serialize)]
|
#[derive(Debug, Clone, Serialize)]
|
||||||
pub struct DriverOutcome {
|
pub struct DriverOutcome {
|
||||||
pub ok: bool,
|
pub ok: bool,
|
||||||
@@ -81,7 +90,22 @@ fn launcher(root: &Path) -> Result<(PathBuf, PathBuf)> {
|
|||||||
|
|
||||||
/// Run a launcher verb to completion (blocking; call from a worker thread).
|
/// Run a launcher verb to completion (blocking; call from a worker thread).
|
||||||
pub fn run(root: &Path, verb: Verb) -> Result<DriverOutcome> {
|
pub fn run(root: &Path, verb: Verb) -> Result<DriverOutcome> {
|
||||||
|
run_inner(root, verb, false)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(crate) fn validate_update(root: &Path) -> Result<DriverOutcome> {
|
||||||
|
run_inner(root, Verb::StartAll, true)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn run_inner(root: &Path, verb: Verb, validating_update: bool) -> Result<DriverOutcome> {
|
||||||
let root = fsx::canonicalize_lenient(root)?;
|
let root = fsx::canonicalize_lenient(root)?;
|
||||||
|
let _update_lock = if !validating_update && matches!(verb, Verb::StartAll | Verb::StartWorld) {
|
||||||
|
Some(crate::update::operation_lock(&crate::registry::metadata_dir_for(&root)?)?)
|
||||||
|
} else { None };
|
||||||
|
if !validating_update && matches!(verb, Verb::StartAll | Verb::StartWorld) {
|
||||||
|
crate::update::ensure_recovered(&crate::registry::metadata_dir_for(&root)?)?;
|
||||||
|
}
|
||||||
|
if matches!(verb, Verb::StartAll | Verb::StartWorld) { crate::modules::ensure_bot_exclusivity(&root)?; }
|
||||||
if crate::docker::is_docker(&root) {
|
if crate::docker::is_docker(&root) {
|
||||||
return crate::docker::run(&root, verb);
|
return crate::docker::run(&root, verb);
|
||||||
}
|
}
|
||||||
@@ -97,9 +121,24 @@ pub fn run(root: &Path, verb: Verb) -> Result<DriverOutcome> {
|
|||||||
crate::realms::setup_realmlist(&root)?;
|
crate::realms::setup_realmlist(&root)?;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if matches!(verb, Verb::StartAll | Verb::StartWorld) { crate::modules::ensure_bot_exclusivity(&root)?; }
|
||||||
let (python, script) = launcher(&root)?;
|
let (python, script) = launcher(&root)?;
|
||||||
|
let original = std::fs::read_to_string(&script)?;
|
||||||
|
let patched = patch_launcher_imports(&original)?;
|
||||||
|
if original != patched {
|
||||||
|
fsx::atomic_write(&script, patched.as_bytes())?;
|
||||||
|
if let Ok(dir) = crate::registry::metadata_dir_for(&root) {
|
||||||
|
if let Ok((_, mut meta)) = crate::registry::MetaDir::open(&dir) {
|
||||||
|
if meta.original_hashes.get("Scripts/manage.py") == Some(&fsx::sha256_bytes(original.as_bytes())) {
|
||||||
|
meta.original_hashes.insert("Scripts/manage.py".into(), fsx::sha256_bytes(patched.as_bytes()));
|
||||||
|
fsx::atomic_write_json(&dir.join("install.json"), &meta)?;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
let mut cmd = Command::new(&python);
|
let mut cmd = Command::new(&python);
|
||||||
cmd.arg("-B").arg(&script).arg(verb.arg()).current_dir(&root).stdin(Stdio::null()).stdout(Stdio::piped()).stderr(Stdio::piped());
|
cmd.arg("-B").arg("-c").arg(LAUNCH_SCRIPT).arg(&script).arg(verb.arg())
|
||||||
|
.current_dir(&root).stdin(Stdio::null()).stdout(Stdio::piped()).stderr(Stdio::piped());
|
||||||
#[cfg(windows)]
|
#[cfg(windows)]
|
||||||
{
|
{
|
||||||
use std::os::windows::process::CommandExt;
|
use std::os::windows::process::CommandExt;
|
||||||
@@ -119,7 +158,7 @@ pub fn run(root: &Path, verb: Verb) -> Result<DriverOutcome> {
|
|||||||
let _ = stderr.read_to_string(&mut s);
|
let _ = stderr.read_to_string(&mut s);
|
||||||
s
|
s
|
||||||
});
|
});
|
||||||
let deadline = Instant::now() + verb.timeout();
|
let deadline = Instant::now() + verb.timeout(&root);
|
||||||
let status = loop {
|
let status = loop {
|
||||||
if let Some(st) = child.try_wait()? {
|
if let Some(st) = child.try_wait()? {
|
||||||
break Some(st);
|
break Some(st);
|
||||||
@@ -153,10 +192,65 @@ pub fn run(root: &Path, verb: Verb) -> Result<DriverOutcome> {
|
|||||||
Ok(DriverOutcome { ok, exit_code, code, human: code.map(ErrorCode::human), output })
|
Ok(DriverOutcome { ok, exit_code, code, human: code.map(ErrorCode::human), output })
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const LAUNCH_SCRIPT: &str = "import runpy,sys;from pathlib import Path;script=sys.argv[1];sys.path.insert(0,str(Path(script).resolve().parent));sys.argv=sys.argv[1:];runpy.run_path(script,run_name='__main__')";
|
||||||
|
|
||||||
|
pub(crate) fn patch_launcher_imports(text: &str) -> Result<String> {
|
||||||
|
let line = "sys.path.insert(0, str(Path(__file__).resolve().parent))";
|
||||||
|
if !text.contains("from squid_playerbots import") || text.contains(line) { return Ok(text.into()); }
|
||||||
|
let root = "ROOT = Path(__file__).resolve().parents[1]";
|
||||||
|
if !text.contains(root) || !text.lines().any(|line| line.trim() == "import sys") {
|
||||||
|
return Err(Error::Invalid("The server launcher cannot load its integration scripts. Repair its program files.".into()));
|
||||||
|
}
|
||||||
|
Ok(text.replacen(root, &format!("{root}\n{line}"), 1))
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(crate) fn launcher_matches(signed: &str, actual: &[u8]) -> bool {
|
||||||
|
if signed.as_bytes() == actual { return true; }
|
||||||
|
if patch_launcher_imports(signed).is_ok_and(|s| s.as_bytes() == actual) { return true; }
|
||||||
|
crate::realms::patch_launcher(signed).is_ok_and(|s| s.as_bytes() == actual
|
||||||
|
|| patch_launcher_imports(&s).is_ok_and(|p| p.as_bytes() == actual))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Recover legacy metadata only when undoing supported Manager edits reproduces the recorded hash.
|
||||||
|
pub(crate) fn launcher_matches_recorded(recorded: &str, actual: &[u8]) -> bool {
|
||||||
|
let Ok(text) = std::str::from_utf8(actual) else { return false; };
|
||||||
|
let without_import = text.replacen(
|
||||||
|
"ROOT = Path(__file__).resolve().parents[1]\nsys.path.insert(0, str(Path(__file__).resolve().parent))",
|
||||||
|
"ROOT = Path(__file__).resolve().parents[1]", 1,
|
||||||
|
);
|
||||||
|
for candidate in [Some(without_import.clone()), crate::realms::unpatch_launcher(&without_import)].into_iter().flatten() {
|
||||||
|
if crate::fsx::sha256_bytes(candidate.as_bytes()).eq_ignore_ascii_case(recorded)
|
||||||
|
&& launcher_matches(&candidate, actual) { return true; }
|
||||||
|
}
|
||||||
|
false
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(crate) fn startup_failure(root: &Path, started: &DriverOutcome) -> String {
|
||||||
|
let code = started.code.filter(|c| *c != ErrorCode::Unknown)
|
||||||
|
.or_else(|| crate::health::diagnose_installation(root));
|
||||||
|
let title = code.map(|c| c.human().title).unwrap_or("The server did not become ready");
|
||||||
|
let output = crate::diag::redact(&started.output);
|
||||||
|
let lines: Vec<_> = output.lines().rev().take(12).collect();
|
||||||
|
if lines.is_empty() { title.into() }
|
||||||
|
else { format!("{title}\n{}", lines.into_iter().rev().collect::<Vec<_>>().join("\n")) }
|
||||||
|
}
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
use super::*;
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn large_squid_provisioning_has_time_to_finish_without_extending_shutdown() {
|
||||||
|
let folder = tempfile::tempdir().unwrap();
|
||||||
|
let modules = folder.path().join("Core/configs/modules");
|
||||||
|
std::fs::create_dir_all(&modules).unwrap();
|
||||||
|
std::fs::write(modules.join("playerbots.conf.dist"), "AiPlayerbot.Enabled = 1\n").unwrap();
|
||||||
|
assert_eq!(Verb::StartAll.timeout(folder.path()), Duration::from_secs(2700));
|
||||||
|
assert_eq!(Verb::StopAll.timeout(folder.path()), Duration::from_secs(240));
|
||||||
|
std::fs::write(modules.join("playerbots.conf"), "AiPlayerbot.Enabled = 0\n").unwrap();
|
||||||
|
assert_eq!(Verb::StartWorld.timeout(folder.path()), Duration::from_secs(420));
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn translates_known_launcher_messages() {
|
fn translates_known_launcher_messages() {
|
||||||
assert_eq!(translate("RuntimeError: Port 8085 is already used. Stop the other server"), ErrorCode::PortInUse);
|
assert_eq!(translate("RuntimeError: Port 8085 is already used. Stop the other server"), ErrorCode::PortInUse);
|
||||||
@@ -171,4 +265,25 @@ mod tests {
|
|||||||
let dir = tempfile::tempdir().unwrap();
|
let dir = tempfile::tempdir().unwrap();
|
||||||
assert!(run(dir.path(), Verb::StartAll).is_err());
|
assert!(run(dir.path(), Verb::StartAll).is_err());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn startup_failure_keeps_the_launcher_reason_without_secrets() {
|
||||||
|
let dir = tempfile::tempdir().unwrap();
|
||||||
|
let started = DriverOutcome { ok: false, exit_code: Some(1), code: Some(ErrorCode::Unknown),
|
||||||
|
human: Some(ErrorCode::Unknown.human()),
|
||||||
|
output: "appPassword=private\nModuleNotFoundError: No module named 'squid_playerbots'".into() };
|
||||||
|
let reason = startup_failure(dir.path(), &started);
|
||||||
|
assert!(reason.contains("ModuleNotFoundError"));
|
||||||
|
assert!(!reason.contains("private"));
|
||||||
|
assert!(!reason.contains("Something went wrong"));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn launcher_import_fix_is_idempotent_and_retains_other_code() {
|
||||||
|
let text = "import sys\nROOT = Path(__file__).resolve().parents[1]\nfrom squid_playerbots import validate_bots\ncustom = 42\n";
|
||||||
|
let fixed = patch_launcher_imports(text).unwrap();
|
||||||
|
assert!(fixed.contains("sys.path.insert(0, str(Path(__file__).resolve().parent))"));
|
||||||
|
assert!(fixed.ends_with("custom = 42\n"));
|
||||||
|
assert_eq!(patch_launcher_imports(&fixed).unwrap(), fixed);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -26,6 +26,8 @@ pub enum Error {
|
|||||||
NetworkUnreachable(String),
|
NetworkUnreachable(String),
|
||||||
#[error("the bot module found no level 80 template characters")]
|
#[error("the bot module found no level 80 template characters")]
|
||||||
CompanionTemplatesMissing,
|
CompanionTemplatesMissing,
|
||||||
|
#[error("CoA Companions and SQUID Playerbots cannot both be enabled. Disable one bot module.")]
|
||||||
|
BotModulesConflict,
|
||||||
#[error("this server's bot module does not have that command yet")]
|
#[error("this server's bot module does not have that command yet")]
|
||||||
CompanionCommandUnsupported,
|
CompanionCommandUnsupported,
|
||||||
#[error("invalid values: {}", .0.iter().map(|f| format!("{}: {}", f.key, f.message)).collect::<Vec<_>>().join("; "))]
|
#[error("invalid values: {}", .0.iter().map(|f| format!("{}: {}", f.key, f.message)).collect::<Vec<_>>().join("; "))]
|
||||||
@@ -58,6 +60,7 @@ pub enum ErrorCode {
|
|||||||
PackageNotPublished,
|
PackageNotPublished,
|
||||||
NetworkUnreachable,
|
NetworkUnreachable,
|
||||||
CompanionTemplatesMissing,
|
CompanionTemplatesMissing,
|
||||||
|
BotModulesConflict,
|
||||||
CompanionCommandUnsupported,
|
CompanionCommandUnsupported,
|
||||||
Unknown,
|
Unknown,
|
||||||
}
|
}
|
||||||
@@ -84,6 +87,7 @@ impl ErrorCode {
|
|||||||
pub fn human(self) -> Human {
|
pub fn human(self) -> Human {
|
||||||
use FixAction::*;
|
use FixAction::*;
|
||||||
let (title, message, actions): (&str, &str, &'static [FixAction]) = match self {
|
let (title, message, actions): (&str, &str, &'static [FixAction]) = match self {
|
||||||
|
ErrorCode::BotModulesConflict => ("Two bot modules are enabled", "Disable CoA Companions or SQUID Playerbots in Modules before starting the server.", &[ShowDetails]),
|
||||||
ErrorCode::DatabaseNotRunning => (
|
ErrorCode::DatabaseNotRunning => (
|
||||||
"Database isn't running",
|
"Database isn't running",
|
||||||
"The server needs its database to start. Start the database first.",
|
"The server needs its database to start. Start the database first.",
|
||||||
@@ -179,6 +183,7 @@ impl Error {
|
|||||||
Error::Validation(_) => ErrorCode::InvalidConfigValue,
|
Error::Validation(_) => ErrorCode::InvalidConfigValue,
|
||||||
Error::PackageNotPublished(_) => ErrorCode::PackageNotPublished,
|
Error::PackageNotPublished(_) => ErrorCode::PackageNotPublished,
|
||||||
Error::NetworkUnreachable(_) => ErrorCode::NetworkUnreachable,
|
Error::NetworkUnreachable(_) => ErrorCode::NetworkUnreachable,
|
||||||
|
Error::BotModulesConflict => ErrorCode::BotModulesConflict,
|
||||||
Error::CompanionTemplatesMissing => ErrorCode::CompanionTemplatesMissing,
|
Error::CompanionTemplatesMissing => ErrorCode::CompanionTemplatesMissing,
|
||||||
Error::CompanionCommandUnsupported => ErrorCode::CompanionCommandUnsupported,
|
Error::CompanionCommandUnsupported => ErrorCode::CompanionCommandUnsupported,
|
||||||
_ => ErrorCode::Unknown,
|
_ => ErrorCode::Unknown,
|
||||||
|
|||||||
@@ -31,11 +31,25 @@ pub struct Settings {
|
|||||||
pub mode: Mode,
|
pub mode: Mode,
|
||||||
/// The address friends type into their client for this mode.
|
/// The address friends type into their client for this mode.
|
||||||
pub host: Option<String>,
|
pub host: Option<String>,
|
||||||
|
/// Independent of the effective host of the current mode. None means automatic LAN detection.
|
||||||
|
#[serde(default)]
|
||||||
|
pub lan_address_override: Option<String>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Default for Settings {
|
impl Default for Settings {
|
||||||
fn default() -> Self {
|
fn default() -> Self {
|
||||||
Settings { mode: Mode::Local, host: None }
|
Settings { mode: Mode::Local, host: None, lan_address_override: None }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Settings {
|
||||||
|
/// Only LAN application changes the LAN preference. Other modes keep it for the next LAN session.
|
||||||
|
pub fn select_mode(&mut self, mode: Mode, host: String, lan_override: Option<String>) {
|
||||||
|
if mode == Mode::Lan {
|
||||||
|
self.lan_address_override = lan_override;
|
||||||
|
}
|
||||||
|
self.mode = mode;
|
||||||
|
self.host = Some(host);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -233,7 +247,7 @@ CoA.AllowRemoteClients = 0
|
|||||||
fn a_shared_server_gets_its_bind_address_back_before_start_and_a_local_one_is_left_alone() {
|
fn a_shared_server_gets_its_bind_address_back_before_start_and_a_local_one_is_left_alone() {
|
||||||
let (_d, root, meta) = setup();
|
let (_d, root, meta) = setup();
|
||||||
assert!(!ensure_bind(&root, &meta).unwrap(), "local mode: nothing to do");
|
assert!(!ensure_bind(&root, &meta).unwrap(), "local mode: nothing to do");
|
||||||
save(&meta, &Settings { mode: Mode::Private, host: Some("100.64.1.2".into()) }).unwrap();
|
save(&meta, &Settings { mode: Mode::Private, host: Some("100.64.1.2".into()), ..Settings::default() }).unwrap();
|
||||||
assert!(ensure_bind(&root, &meta).unwrap(), "templates were reset to 127.0.0.1 -> reopened");
|
assert!(ensure_bind(&root, &meta).unwrap(), "templates were reset to 127.0.0.1 -> reopened");
|
||||||
assert!(bind_is_open(&root));
|
assert!(bind_is_open(&root));
|
||||||
assert!(!ensure_bind(&root, &meta).unwrap(), "already open: idempotent");
|
assert!(!ensure_bind(&root, &meta).unwrap(), "already open: idempotent");
|
||||||
@@ -243,11 +257,39 @@ CoA.AllowRemoteClients = 0
|
|||||||
fn settings_round_trip_and_default_to_local() {
|
fn settings_round_trip_and_default_to_local() {
|
||||||
let d = tempfile::tempdir().unwrap();
|
let d = tempfile::tempdir().unwrap();
|
||||||
assert_eq!(load(d.path()).mode, Mode::Local);
|
assert_eq!(load(d.path()).mode, Mode::Local);
|
||||||
save(d.path(), &Settings { mode: Mode::Private, host: Some("100.64.1.2".into()) }).unwrap();
|
save(d.path(), &Settings { mode: Mode::Private, host: Some("100.64.1.2".into()), ..Settings::default() }).unwrap();
|
||||||
let s = load(d.path());
|
let s = load(d.path());
|
||||||
assert_eq!((s.mode, s.host.as_deref()), (Mode::Private, Some("100.64.1.2")));
|
assert_eq!((s.mode, s.host.as_deref()), (Mode::Private, Some("100.64.1.2")));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn old_settings_load_without_migrating_effective_host_to_override() {
|
||||||
|
let s: Settings = serde_json::from_str(r#"{"mode":"lan","host":"192.168.1.50"}"#).unwrap();
|
||||||
|
assert_eq!(s.mode, Mode::Lan);
|
||||||
|
assert_eq!(s.host.as_deref(), Some("192.168.1.50"));
|
||||||
|
assert_eq!(s.lan_address_override, None);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn lan_preference_survives_save_load_and_every_other_mode_and_can_be_cleared() {
|
||||||
|
let d = tempfile::tempdir().unwrap();
|
||||||
|
let mut s = Settings::default();
|
||||||
|
s.select_mode(Mode::Lan, "192.168.1.50".into(), Some("192.168.1.50".into()));
|
||||||
|
for (mode, host) in [(Mode::Private, "100.101.20.5"), (Mode::Direct, "203.0.113.9"), (Mode::Local, "127.0.0.1")] {
|
||||||
|
s.select_mode(mode, host.into(), None);
|
||||||
|
save(d.path(), &s).unwrap();
|
||||||
|
s = load(d.path());
|
||||||
|
assert_eq!(s.lan_address_override.as_deref(), Some("192.168.1.50"));
|
||||||
|
assert_eq!(s.host.as_deref(), Some(host));
|
||||||
|
let lan = crate::net::resolve_lan_host(s.lan_address_override.as_deref(), Some("192.168.0.169".parse().unwrap())).unwrap();
|
||||||
|
s.select_mode(Mode::Lan, lan, s.lan_address_override.clone());
|
||||||
|
assert_eq!(s.host.as_deref(), Some("192.168.1.50"));
|
||||||
|
}
|
||||||
|
s.select_mode(Mode::Lan, "192.168.0.169".into(), None);
|
||||||
|
save(d.path(), &s).unwrap();
|
||||||
|
assert_eq!(load(d.path()).lan_address_override, None);
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn friend_package_contains_only_whitelisted_files() {
|
fn friend_package_contains_only_whitelisted_files() {
|
||||||
let (d, root, _m) = setup();
|
let (d, root, _m) = setup();
|
||||||
@@ -274,4 +316,23 @@ CoA.AllowRemoteClients = 0
|
|||||||
}
|
}
|
||||||
assert!(make_friend_package(&root, "bad host; x", false, &d.path().join("x.zip")).is_err());
|
assert!(make_friend_package(&root, "bad host; x", false, &d.path().join("x.zip")).is_err());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn manual_lan_host_survives_startup_bind_restoration_and_drives_friend_package() {
|
||||||
|
let (d, root, meta) = setup();
|
||||||
|
let mut s = Settings::default();
|
||||||
|
s.select_mode(Mode::Lan, "192.168.1.50".into(), Some("192.168.1.50".into()));
|
||||||
|
save(&meta, &s).unwrap();
|
||||||
|
assert!(ensure_bind(&root, &meta).unwrap());
|
||||||
|
assert!(bind_is_open(&root));
|
||||||
|
let restored = load(&meta);
|
||||||
|
assert_eq!(restored.host.as_deref(), Some("192.168.1.50"));
|
||||||
|
assert_eq!(restored.lan_address_override.as_deref(), Some("192.168.1.50"));
|
||||||
|
let package = d.path().join("manual-lan.zip");
|
||||||
|
make_friend_package(&root, restored.host.as_deref().unwrap(), false, &package).unwrap();
|
||||||
|
let mut zip = zip::ZipArchive::new(fs::File::open(package).unwrap()).unwrap();
|
||||||
|
let mut realm = String::new();
|
||||||
|
std::io::Read::read_to_string(&mut zip.by_name("realmlist.wtf").unwrap(), &mut realm).unwrap();
|
||||||
|
assert_eq!(realm, "set realmlist 192.168.1.50\r\n");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -123,7 +123,7 @@ pub fn atomic_write(path: &Path, bytes: &[u8]) -> Result<()> {
|
|||||||
let tmp = parent.join(format!(
|
let tmp = parent.join(format!(
|
||||||
".{}.{}.tmp",
|
".{}.{}.tmp",
|
||||||
path.file_name().map(|n| n.to_string_lossy().into_owned()).unwrap_or_default(),
|
path.file_name().map(|n| n.to_string_lossy().into_owned()).unwrap_or_default(),
|
||||||
std::process::id()
|
uuid::Uuid::new_v4().simple()
|
||||||
));
|
));
|
||||||
let write = || -> std::io::Result<()> {
|
let write = || -> std::io::Result<()> {
|
||||||
let mut f = OpenOptions::new().write(true).create_new(true).open(&tmp)?;
|
let mut f = OpenOptions::new().write(true).create_new(true).open(&tmp)?;
|
||||||
@@ -135,13 +135,41 @@ pub fn atomic_write(path: &Path, bytes: &[u8]) -> Result<()> {
|
|||||||
let _ = fs::remove_file(&tmp);
|
let _ = fs::remove_file(&tmp);
|
||||||
return Err(e.into());
|
return Err(e.into());
|
||||||
}
|
}
|
||||||
if let Err(e) = fs::rename(&tmp, path) {
|
if let Err(e) = durable_replace(&tmp, path) {
|
||||||
let _ = fs::remove_file(&tmp);
|
let _ = fs::remove_file(&tmp);
|
||||||
return Err(e.into());
|
return Err(e.into());
|
||||||
}
|
}
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// The temporary file must already be flushed, on the same volume as the destination.
|
||||||
|
pub(crate) fn durable_replace(from: &Path, to: &Path) -> std::io::Result<()> {
|
||||||
|
#[cfg(windows)]
|
||||||
|
{
|
||||||
|
use std::os::windows::ffi::OsStrExt;
|
||||||
|
use windows_sys::Win32::Storage::FileSystem::{MoveFileExW, MOVEFILE_REPLACE_EXISTING, MOVEFILE_WRITE_THROUGH};
|
||||||
|
fn wide(path: &Path) -> std::io::Result<Vec<u16>> {
|
||||||
|
let absolute = std::path::absolute(path)?;
|
||||||
|
let text = absolute.as_os_str().to_string_lossy().replace('/', "\\");
|
||||||
|
let extended = if text.starts_with("\\\\?\\") { text }
|
||||||
|
else if let Some(unc) = text.strip_prefix("\\\\") { format!("\\\\?\\UNC\\{unc}") }
|
||||||
|
else { format!("\\\\?\\{text}") };
|
||||||
|
Ok(std::ffi::OsStr::new(&extended).encode_wide().chain(Some(0)).collect())
|
||||||
|
}
|
||||||
|
let src = wide(from)?;
|
||||||
|
let dst = wide(to)?;
|
||||||
|
if unsafe { MoveFileExW(src.as_ptr(), dst.as_ptr(), MOVEFILE_REPLACE_EXISTING | MOVEFILE_WRITE_THROUGH) } == 0 {
|
||||||
|
return Err(std::io::Error::last_os_error());
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
#[cfg(not(windows))]
|
||||||
|
{
|
||||||
|
fs::rename(from, to)?;
|
||||||
|
File::open(to.parent().unwrap())?.sync_all()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
pub fn atomic_write_json<T: serde::Serialize>(path: &Path, value: &T) -> Result<()> {
|
pub fn atomic_write_json<T: serde::Serialize>(path: &Path, value: &T) -> Result<()> {
|
||||||
let mut bytes = serde_json::to_vec_pretty(value)?;
|
let mut bytes = serde_json::to_vec_pretty(value)?;
|
||||||
bytes.push(b'\n');
|
bytes.push(b'\n');
|
||||||
@@ -174,7 +202,8 @@ pub fn sha256_bytes(bytes: &[u8]) -> String {
|
|||||||
|
|
||||||
/// Free bytes on the volume that holds `path` (or its nearest existing ancestor).
|
/// Free bytes on the volume that holds `path` (or its nearest existing ancestor).
|
||||||
pub fn free_space(path: &Path) -> Result<u64> {
|
pub fn free_space(path: &Path) -> Result<u64> {
|
||||||
let mut cursor = Some(path);
|
let path = std::path::absolute(path)?;
|
||||||
|
let mut cursor = Some(path.as_path());
|
||||||
while let Some(p) = cursor {
|
while let Some(p) = cursor {
|
||||||
if p.exists() {
|
if p.exists() {
|
||||||
return Ok(fs4::available_space(p)?);
|
return Ok(fs4::available_space(p)?);
|
||||||
@@ -198,6 +227,16 @@ pub fn require_space(path: &Path, needed: u64) -> Result<()> {
|
|||||||
mod tests {
|
mod tests {
|
||||||
use super::*;
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn durable_replacement_handles_long_transaction_backup_paths() {
|
||||||
|
let dir = tempfile::tempdir().unwrap();
|
||||||
|
let parent = dir.path().join("a".repeat(90)).join("b".repeat(90));
|
||||||
|
let path = parent.join("configuration-with-a-long-name.template");
|
||||||
|
atomic_write(&path, b"old").unwrap();
|
||||||
|
atomic_write(&path, b"new").unwrap();
|
||||||
|
assert_eq!(fs::read(&path).unwrap(), b"new");
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn safe_join_accepts_normal_and_rejects_traversal() {
|
fn safe_join_accepts_normal_and_rejects_traversal() {
|
||||||
let root = Path::new("C:/srv");
|
let root = Path::new("C:/srv");
|
||||||
@@ -281,4 +320,11 @@ mod tests {
|
|||||||
let dir = tempfile::tempdir().unwrap();
|
let dir = tempfile::tempdir().unwrap();
|
||||||
assert!(matches!(require_space(dir.path(), u64::MAX / 2), Err(Error::InsufficientSpace { .. })));
|
assert!(matches!(require_space(dir.path(), u64::MAX / 2), Err(Error::InsufficientSpace { .. })));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn free_space_resolves_a_new_relative_directory() {
|
||||||
|
let path = Path::new("coa-schema-fixture-not-created").join("nested");
|
||||||
|
assert!(!path.exists());
|
||||||
|
assert!(free_space(&path).unwrap() > 0);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -35,7 +35,7 @@ pub struct Preflight {
|
|||||||
pub free_bytes: u64,
|
pub free_bytes: u64,
|
||||||
}
|
}
|
||||||
|
|
||||||
fn problem(code: &'static str, message: &str) -> Problem {
|
pub(crate) fn problem(code: &'static str, message: &str) -> Problem {
|
||||||
Problem { code, message: message.into() }
|
Problem { code, message: message.into() }
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -133,7 +133,7 @@ pub struct Installed {
|
|||||||
pub version: String,
|
pub version: String,
|
||||||
}
|
}
|
||||||
|
|
||||||
fn random_hex(n: usize) -> String {
|
pub(crate) fn random_hex(n: usize) -> String {
|
||||||
let mut s = String::new();
|
let mut s = String::new();
|
||||||
while s.len() < n {
|
while s.len() < n {
|
||||||
s.push_str(&uuid::Uuid::new_v4().simple().to_string());
|
s.push_str(&uuid::Uuid::new_v4().simple().to_string());
|
||||||
@@ -144,17 +144,17 @@ fn random_hex(n: usize) -> String {
|
|||||||
|
|
||||||
/// Rotate the database users' passwords away from the packaged bootstrap values and write the launcher's
|
/// Rotate the database users' passwords away from the packaged bootstrap values and write the launcher's
|
||||||
/// `Settings/database.json`. MySQL is started from `root` and stopped again before returning.
|
/// `Settings/database.json`. MySQL is started from `root` and stopped again before returning.
|
||||||
fn bootstrap_database(root: &Path) -> Result<()> {
|
pub(crate) fn bootstrap_database(root: &Path) -> Result<()> {
|
||||||
with_scratch_ports(root, || bootstrap_database_inner(root))
|
with_scratch_ports(root, || bootstrap_database_inner(root))
|
||||||
}
|
}
|
||||||
|
|
||||||
fn free_port() -> Result<u16> {
|
pub(crate) fn free_port() -> Result<u16> {
|
||||||
Ok(std::net::TcpListener::bind("127.0.0.1:0")?.local_addr()?.port())
|
Ok(std::net::TcpListener::bind("127.0.0.1:0")?.local_addr()?.port())
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Run `f` with the staging copy listening on unused ports, so an installation never collides with a server (or any
|
/// Run `f` with the staging copy listening on unused ports, so an installation never collides with a server (or any
|
||||||
/// other program) already using the shipped ports. The shipped ports are put back afterwards.
|
/// other program) already using the shipped ports. The shipped ports are put back afterwards.
|
||||||
fn with_scratch_ports<T>(root: &Path, f: impl FnOnce() -> Result<T>) -> Result<T> {
|
pub(crate) fn with_scratch_ports<T>(root: &Path, f: impl FnOnce() -> Result<T>) -> Result<T> {
|
||||||
const KEYS: [&str; 4] = ["mysqlPort", "authPort", "worldPort", "raPort"];
|
const KEYS: [&str; 4] = ["mysqlPort", "authPort", "worldPort", "raPort"];
|
||||||
let path = root.join("Settings/repack.json");
|
let path = root.join("Settings/repack.json");
|
||||||
let original: serde_json::Value = fsx::read_json(&path)?;
|
let original: serde_json::Value = fsx::read_json(&path)?;
|
||||||
|
|||||||
@@ -315,6 +315,7 @@ pub fn scan(root: &Path) -> Result<ScanReport> {
|
|||||||
(None, None)
|
(None, None)
|
||||||
};
|
};
|
||||||
|
|
||||||
|
if crate::squid::imported_repack(&root) { notes.push("import.squidRepackWarning".into()); }
|
||||||
Ok(ScanReport {
|
Ok(ScanReport {
|
||||||
path: root.to_string_lossy().into_owned(),
|
path: root.to_string_lossy().into_owned(),
|
||||||
classification,
|
classification,
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ pub mod backup;
|
|||||||
pub mod cleanbase;
|
pub mod cleanbase;
|
||||||
pub mod companions;
|
pub mod companions;
|
||||||
pub mod client;
|
pub mod client;
|
||||||
|
pub mod remote_client;
|
||||||
pub mod clientdl;
|
pub mod clientdl;
|
||||||
pub mod config;
|
pub mod config;
|
||||||
pub mod console;
|
pub mod console;
|
||||||
@@ -36,6 +37,8 @@ pub mod realmlist;
|
|||||||
pub mod realms;
|
pub mod realms;
|
||||||
pub mod registry;
|
pub mod registry;
|
||||||
pub mod release;
|
pub mod release;
|
||||||
|
pub mod report;
|
||||||
|
pub mod release_schema;
|
||||||
pub mod update;
|
pub mod update;
|
||||||
pub mod upnp;
|
pub mod upnp;
|
||||||
pub mod signing;
|
pub mod signing;
|
||||||
@@ -44,3 +47,5 @@ pub mod srp6;
|
|||||||
pub use error::{Error, ErrorCode, Result};
|
pub use error::{Error, ErrorCode, Result};
|
||||||
|
|
||||||
pub const MANAGER_VERSION: &str = env!("CARGO_PKG_VERSION");
|
pub const MANAGER_VERSION: &str = env!("CARGO_PKG_VERSION");
|
||||||
|
|
||||||
|
pub mod squid;
|
||||||
@@ -48,6 +48,8 @@ pub struct FileEntry {
|
|||||||
|
|
||||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||||
pub struct Migration {
|
pub struct Migration {
|
||||||
|
#[serde(default, skip_serializing_if = "Vec::is_empty")]
|
||||||
|
pub compatible_sha256: Vec<String>,
|
||||||
pub id: String,
|
pub id: String,
|
||||||
pub db: String,
|
pub db: String,
|
||||||
pub sha256: String,
|
pub sha256: String,
|
||||||
@@ -134,6 +136,11 @@ impl Manifest {
|
|||||||
if parse_version(&self.min_manager_version).is_none() {
|
if parse_version(&self.min_manager_version).is_none() {
|
||||||
return bad(format!("bad minManagerVersion {:?}", self.min_manager_version));
|
return bad(format!("bad minManagerVersion {:?}", self.min_manager_version));
|
||||||
}
|
}
|
||||||
|
for migration in &self.migrations {
|
||||||
|
if !is_sha256(&migration.sha256) || migration.compatible_sha256.iter().any(|h| !is_sha256(h) || h == &"0".repeat(64)) {
|
||||||
|
return bad(format!("{}: invalid migration checksum compatibility", migration.id));
|
||||||
|
}
|
||||||
|
}
|
||||||
for (label, rev) in [("core", Some(&self.core)), ("bots", self.bots.as_ref())] {
|
for (label, rev) in [("core", Some(&self.core)), ("bots", self.bots.as_ref())] {
|
||||||
if let Some(Revision { commit: Some(c) }) = rev {
|
if let Some(Revision { commit: Some(c) }) = rev {
|
||||||
if !is_commit(c) {
|
if !is_commit(c) {
|
||||||
|
|||||||
@@ -19,6 +19,7 @@ pub enum Status {
|
|||||||
Applied,
|
Applied,
|
||||||
Pending,
|
Pending,
|
||||||
Failed,
|
Failed,
|
||||||
|
Running,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Clone)]
|
#[derive(Debug, Clone)]
|
||||||
@@ -34,6 +35,7 @@ pub struct LedgerRow {
|
|||||||
/// Storage for the ledger and the ability to run a SQL file; implemented by the real database and by tests.
|
/// Storage for the ledger and the ability to run a SQL file; implemented by the real database and by tests.
|
||||||
pub trait Store {
|
pub trait Store {
|
||||||
fn load(&self) -> Result<Vec<LedgerRow>>;
|
fn load(&self) -> Result<Vec<LedgerRow>>;
|
||||||
|
fn load_readonly(&self) -> Result<Vec<LedgerRow>> { self.load() }
|
||||||
fn put(&self, row: &LedgerRow) -> Result<()>;
|
fn put(&self, row: &LedgerRow) -> Result<()>;
|
||||||
fn run_file(&self, schema: &str, file: &Path) -> Result<()>;
|
fn run_file(&self, schema: &str, file: &Path) -> Result<()>;
|
||||||
}
|
}
|
||||||
@@ -51,11 +53,18 @@ impl Store for Db {
|
|||||||
self.query(&format!(
|
self.query(&format!(
|
||||||
"CREATE TABLE IF NOT EXISTS `{LEDGER_SCHEMA}`.`{LEDGER_TABLE}` (`db` VARCHAR(32) NOT NULL, `id` VARCHAR(190) NOT NULL, `sha256` CHAR(64) NOT NULL, `status` VARCHAR(16) NOT NULL, `applied_at` DATETIME NOT NULL, `error` TEXT NULL, `baseline` TINYINT NOT NULL DEFAULT 0, PRIMARY KEY (`db`,`id`)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;"
|
"CREATE TABLE IF NOT EXISTS `{LEDGER_SCHEMA}`.`{LEDGER_TABLE}` (`db` VARCHAR(32) NOT NULL, `id` VARCHAR(190) NOT NULL, `sha256` CHAR(64) NOT NULL, `status` VARCHAR(16) NOT NULL, `applied_at` DATETIME NOT NULL, `error` TEXT NULL, `baseline` TINYINT NOT NULL DEFAULT 0, PRIMARY KEY (`db`,`id`)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;"
|
||||||
))?;
|
))?;
|
||||||
let out = self.query(&format!("SELECT `db`,`id`,`sha256`,`status`,`baseline`,COALESCE(HEX(`error`),'') FROM `{LEDGER_SCHEMA}`.`{LEDGER_TABLE}` ORDER BY `db`,`id`;"))?;
|
self.load_readonly()
|
||||||
|
}
|
||||||
|
|
||||||
|
fn load_readonly(&self) -> Result<Vec<LedgerRow>> {
|
||||||
|
let out = if self.tables(LEDGER_SCHEMA)?.iter().any(|name| name == LEDGER_TABLE) {
|
||||||
|
self.query(&format!("SELECT `db`,`id`,`sha256`,`status`,`baseline`,COALESCE(HEX(`error`),'') FROM `{LEDGER_SCHEMA}`.`{LEDGER_TABLE}` ORDER BY `db`,`id`;"))?
|
||||||
|
} else { String::new() };
|
||||||
let mut rows = Vec::new();
|
let mut rows = Vec::new();
|
||||||
// Files the core's own updater (or whoever prepared this database) already recorded count as applied.
|
// Files the core's own updater (or whoever prepared this database) already recorded count as applied.
|
||||||
for (kind, schema) in db::SCHEMAS {
|
for (kind, schema) in db::SCHEMAS {
|
||||||
if let Ok(names) = self.query(&format!("SELECT name FROM `{schema}`.`updates`;")) {
|
if self.tables(schema)?.iter().any(|name| name == "updates") {
|
||||||
|
let names = self.query(&format!("SELECT name FROM `{schema}`.`updates`;"))?;
|
||||||
for name in names.lines().filter(|n| n.ends_with(".sql")) {
|
for name in names.lines().filter(|n| n.ends_with(".sql")) {
|
||||||
rows.push(LedgerRow { db: kind.into(), id: name.trim_end_matches(".sql").into(), sha256: "0".repeat(64), status: Status::Applied, error: None, baseline: true });
|
rows.push(LedgerRow { db: kind.into(), id: name.trim_end_matches(".sql").into(), sha256: "0".repeat(64), status: Status::Applied, error: None, baseline: true });
|
||||||
}
|
}
|
||||||
@@ -64,14 +73,17 @@ impl Store for Db {
|
|||||||
for line in out.lines().filter(|l| !l.is_empty()) {
|
for line in out.lines().filter(|l| !l.is_empty()) {
|
||||||
let f: Vec<&str> = line.split('\t').collect();
|
let f: Vec<&str> = line.split('\t').collect();
|
||||||
if f.len() < 5 {
|
if f.len() < 5 {
|
||||||
continue;
|
return Err(Error::Invalid("The database migration history is malformed; no SQL was replayed.".into()));
|
||||||
|
}
|
||||||
|
if !matches!(f[3], "applied" | "failed" | "running") || !ident_ok(f[1]) || f[2].len() != 64 || !f[2].chars().all(|c| c.is_ascii_hexdigit()) {
|
||||||
|
return Err(Error::Invalid("The database migration history is invalid; no SQL was replayed.".into()));
|
||||||
}
|
}
|
||||||
let err = f.get(5).filter(|h| !h.is_empty()).and_then(|h| hex::decode(h).ok()).map(|b| String::from_utf8_lossy(&b).into_owned());
|
let err = f.get(5).filter(|h| !h.is_empty()).and_then(|h| hex::decode(h).ok()).map(|b| String::from_utf8_lossy(&b).into_owned());
|
||||||
rows.push(LedgerRow {
|
rows.push(LedgerRow {
|
||||||
db: f[0].into(),
|
db: f[0].into(),
|
||||||
id: f[1].into(),
|
id: f[1].into(),
|
||||||
sha256: f[2].into(),
|
sha256: f[2].into(),
|
||||||
status: if f[3] == "applied" { Status::Applied } else { Status::Failed },
|
status: match f[3] { "applied" => Status::Applied, "running" => Status::Running, _ => Status::Failed },
|
||||||
baseline: f[4] == "1",
|
baseline: f[4] == "1",
|
||||||
error: err,
|
error: err,
|
||||||
});
|
});
|
||||||
@@ -83,7 +95,7 @@ impl Store for Db {
|
|||||||
if !ident_ok(&r.id) || !ident_ok(&r.db) || r.sha256.len() != 64 || !r.sha256.chars().all(|c| c.is_ascii_hexdigit()) {
|
if !ident_ok(&r.id) || !ident_ok(&r.db) || r.sha256.len() != 64 || !r.sha256.chars().all(|c| c.is_ascii_hexdigit()) {
|
||||||
return Err(Error::Invalid("migration record has an invalid identifier".into()));
|
return Err(Error::Invalid("migration record has an invalid identifier".into()));
|
||||||
}
|
}
|
||||||
let status = if r.status == Status::Applied { "applied" } else { "failed" };
|
let status = match r.status { Status::Applied => "applied", Status::Running => "running", _ => "failed" };
|
||||||
let err = r.error.as_deref().map(|e| format!("UNHEX('{}')", hex_of(e))).unwrap_or_else(|| "NULL".into());
|
let err = r.error.as_deref().map(|e| format!("UNHEX('{}')", hex_of(e))).unwrap_or_else(|| "NULL".into());
|
||||||
self.query(&format!(
|
self.query(&format!(
|
||||||
"REPLACE INTO `{LEDGER_SCHEMA}`.`{LEDGER_TABLE}` (`db`,`id`,`sha256`,`status`,`applied_at`,`error`,`baseline`) VALUES ('{}','{}','{}','{status}',NOW(),{err},{});",
|
"REPLACE INTO `{LEDGER_SCHEMA}`.`{LEDGER_TABLE}` (`db`,`id`,`sha256`,`status`,`applied_at`,`error`,`baseline`) VALUES ('{}','{}','{}','{status}',NOW(),{err},{});",
|
||||||
@@ -129,7 +141,7 @@ pub fn status(store: &dyn Store, list: &[Migration]) -> Result<Vec<Item>> {
|
|||||||
Item {
|
Item {
|
||||||
id: m.id.clone(),
|
id: m.id.clone(),
|
||||||
db: m.db.clone(),
|
db: m.db.clone(),
|
||||||
status: if changed { Status::Failed } else { row.map(|r| r.status).unwrap_or(Status::Pending) },
|
status: if changed || row.is_some_and(|r| r.status == Status::Running) { Status::Failed } else { row.map(|r| r.status).unwrap_or(Status::Pending) },
|
||||||
destructive: m.destructive,
|
destructive: m.destructive,
|
||||||
baseline: row.map(|r| r.baseline).unwrap_or(false),
|
baseline: row.map(|r| r.baseline).unwrap_or(false),
|
||||||
error: if changed { Some("An already applied SQL file changed. Publish a new migration instead of replaying it.".into()) } else { row.and_then(|r| r.error.clone()) },
|
error: if changed { Some("An already applied SQL file changed. Publish a new migration instead of replaying it.".into()) } else { row.and_then(|r| r.error.clone()) },
|
||||||
@@ -144,6 +156,50 @@ fn recorded<'a>(rows: &'a [LedgerRow], m: &Migration) -> Option<&'a LedgerRow> {
|
|||||||
|
|
||||||
fn hash_changed(row: &LedgerRow, m: &Migration) -> bool {
|
fn hash_changed(row: &LedgerRow, m: &Migration) -> bool {
|
||||||
row.status == Status::Applied && row.sha256 != "0".repeat(64) && !row.sha256.eq_ignore_ascii_case(&m.sha256)
|
row.status == Status::Applied && row.sha256 != "0".repeat(64) && !row.sha256.eq_ignore_ascii_case(&m.sha256)
|
||||||
|
&& !m.compatible_sha256.iter().any(|hash| hash.eq_ignore_ascii_case(&row.sha256))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Inspect recorded history without creating a ledger or executing migrations.
|
||||||
|
pub fn preflight(store: &dyn Store, list: &[Migration]) -> Result<()> {
|
||||||
|
check_history(&store.load_readonly()?, list)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn pending_count(store: &dyn Store, list: &[Migration]) -> Result<usize> {
|
||||||
|
let rows = store.load_readonly()?;
|
||||||
|
check_history(&rows, list)?;
|
||||||
|
Ok(list.iter().filter(|m| recorded(&rows, m).is_none_or(|r| r.status != Status::Applied)).count())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn verified_file(m: &Migration, dir: &Path) -> Result<(&'static str, std::path::PathBuf, bool)> {
|
||||||
|
if !ident_ok(&m.id) { return Err(Error::InvalidManifest(format!("migration id {:?} is not allowed", m.id))); }
|
||||||
|
let schema = db::schema_of(&m.db)?;
|
||||||
|
let path = fsx::safe_join(dir, &format!("{}/{}.sql", m.db, m.id))?;
|
||||||
|
let bytes = std::fs::read(&path).map_err(|_| Error::Invalid(format!("migration file {} is missing", m.id)))?;
|
||||||
|
let actual = fsx::sha256_bytes(&bytes);
|
||||||
|
if !actual.eq_ignore_ascii_case(&m.sha256) { return Err(Error::HashMismatch { path: path.display().to_string(), expected: m.sha256.clone(), actual }); }
|
||||||
|
Ok((schema, path, m.destructive || looks_destructive(&String::from_utf8_lossy(&bytes))))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Check every migration artifact, including applied history, before replacing server files.
|
||||||
|
pub fn verify_files(list: &[Migration], dir: &Path) -> Result<()> {
|
||||||
|
let mut seen = std::collections::BTreeSet::new();
|
||||||
|
for m in list {
|
||||||
|
if !seen.insert((&m.db, &m.id)) { return Err(Error::InvalidManifest(format!("duplicate migration {} ({})", m.id, m.db))); }
|
||||||
|
verified_file(m, dir)?;
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn check_history(rows: &[LedgerRow], list: &[Migration]) -> Result<()> {
|
||||||
|
for m in list {
|
||||||
|
if recorded(rows, m).is_some_and(|r| matches!(r.status, Status::Running | Status::Failed)) {
|
||||||
|
return Err(Error::Invalid(format!("Database update {} ({}) failed or was interrupted and may be partially applied. Restore its recovery point before retrying.", m.id, m.db)));
|
||||||
|
}
|
||||||
|
if recorded(rows, m).is_some_and(|r| hash_changed(r, m)) {
|
||||||
|
return Err(Error::Invalid(format!("Applied database update {} ({}) has a different checksum. A new migration is required; it was not replayed.", m.id, m.db)));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Record migrations as already present without running them (adopting an existing server whose database
|
/// Record migrations as already present without running them (adopting an existing server whose database
|
||||||
@@ -173,28 +229,16 @@ pub struct ApplyReport {
|
|||||||
pub fn apply_pending(store: &dyn Store, list: &[Migration], dir: &Path, snapshot: &dyn Fn() -> Result<String>) -> Result<ApplyReport> {
|
pub fn apply_pending(store: &dyn Store, list: &[Migration], dir: &Path, snapshot: &dyn Fn() -> Result<String>) -> Result<ApplyReport> {
|
||||||
let rows = store.load()?;
|
let rows = store.load()?;
|
||||||
// The list order is the release's order of application (released updates, then pending, then modules).
|
// The list order is the release's order of application (released updates, then pending, then modules).
|
||||||
for m in list {
|
check_history(&rows, list)?;
|
||||||
if recorded(&rows, m).is_some_and(|r| hash_changed(r, m)) {
|
|
||||||
return Err(Error::Invalid(format!("Applied database update {} ({}) has a different checksum. A new migration is required; it was not replayed.", m.id, m.db)));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
let todo: Vec<&Migration> = list.iter().filter(|m| recorded(&rows, m).is_none_or(|r| r.status != Status::Applied)).collect();
|
let todo: Vec<&Migration> = list.iter().filter(|m| recorded(&rows, m).is_none_or(|r| r.status != Status::Applied)).collect();
|
||||||
|
tracing::info!(total = list.len(), pending = todo.len(), skipped = list.len() - todo.len(), "database migration plan");
|
||||||
|
|
||||||
// Resolve and verify every file before running anything.
|
// Resolve and verify every file before running anything.
|
||||||
let mut files = Vec::new();
|
let mut files = Vec::new();
|
||||||
let mut any_destructive = false;
|
let mut any_destructive = false;
|
||||||
for m in &todo {
|
for m in &todo {
|
||||||
if !ident_ok(&m.id) {
|
let (schema, path, destructive) = verified_file(m, dir)?;
|
||||||
return Err(Error::InvalidManifest(format!("migration id {:?} is not allowed", m.id)));
|
any_destructive |= destructive;
|
||||||
}
|
|
||||||
let schema = db::schema_of(&m.db)?;
|
|
||||||
let path = fsx::safe_join(dir, &format!("{}/{}.sql", m.db, m.id))?;
|
|
||||||
let bytes = std::fs::read(&path).map_err(|_| Error::Invalid(format!("migration file {} is missing", m.id)))?;
|
|
||||||
let actual = fsx::sha256_bytes(&bytes);
|
|
||||||
if !actual.eq_ignore_ascii_case(&m.sha256) {
|
|
||||||
return Err(Error::HashMismatch { path: path.display().to_string(), expected: m.sha256.clone(), actual });
|
|
||||||
}
|
|
||||||
any_destructive |= m.destructive || looks_destructive(&String::from_utf8_lossy(&bytes));
|
|
||||||
files.push((*m, schema, path));
|
files.push((*m, schema, path));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -206,12 +250,16 @@ pub fn apply_pending(store: &dyn Store, list: &[Migration], dir: &Path, snapshot
|
|||||||
report.snapshot = Some(snapshot().map_err(|e| Error::Invalid(format!("No database update was applied because the safety backup failed: {e}")))?);
|
report.snapshot = Some(snapshot().map_err(|e| Error::Invalid(format!("No database update was applied because the safety backup failed: {e}")))?);
|
||||||
}
|
}
|
||||||
for (m, schema, path) in files {
|
for (m, schema, path) in files {
|
||||||
|
tracing::info!(migration = %m.id, database = %m.db, "database migration starting");
|
||||||
|
store.put(&LedgerRow { db: m.db.clone(), id: m.id.clone(), sha256: m.sha256.clone(), status: Status::Running, error: Some("Interrupted SQL must be recovered before replay.".into()), baseline: false })?;
|
||||||
match store.run_file(schema, &path) {
|
match store.run_file(schema, &path) {
|
||||||
Ok(()) => {
|
Ok(()) => {
|
||||||
store.put(&LedgerRow { db: m.db.clone(), id: m.id.clone(), sha256: m.sha256.clone(), status: Status::Applied, error: None, baseline: false })?;
|
store.put(&LedgerRow { db: m.db.clone(), id: m.id.clone(), sha256: m.sha256.clone(), status: Status::Applied, error: None, baseline: false })?;
|
||||||
report.applied.push(m.id.clone());
|
report.applied.push(m.id.clone());
|
||||||
|
tracing::info!(migration = %m.id, database = %m.db, "database migration applied");
|
||||||
}
|
}
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
|
tracing::error!(migration = %m.id, database = %m.db, "database migration failed; details saved in migration history");
|
||||||
let msg = e.to_string();
|
let msg = e.to_string();
|
||||||
let _ = store.put(&LedgerRow { db: m.db.clone(), id: m.id.clone(), sha256: m.sha256.clone(), status: Status::Failed, error: Some(msg.clone()), baseline: false });
|
let _ = store.put(&LedgerRow { db: m.db.clone(), id: m.id.clone(), sha256: m.sha256.clone(), status: Status::Failed, error: Some(msg.clone()), baseline: false });
|
||||||
report.failed = Some((m.id.clone(), msg));
|
report.failed = Some((m.id.clone(), msg));
|
||||||
@@ -260,7 +308,7 @@ mod tests {
|
|||||||
for (db, id, sql) in files {
|
for (db, id, sql) in files {
|
||||||
std::fs::create_dir_all(d.path().join(db)).unwrap();
|
std::fs::create_dir_all(d.path().join(db)).unwrap();
|
||||||
std::fs::write(d.path().join(db).join(format!("{id}.sql")), sql).unwrap();
|
std::fs::write(d.path().join(db).join(format!("{id}.sql")), sql).unwrap();
|
||||||
list.push(Migration { id: id.to_string(), db: db.to_string(), sha256: fsx::sha256_bytes(sql.as_bytes()), destructive: false });
|
list.push(Migration { compatible_sha256: vec![], id: id.to_string(), db: db.to_string(), sha256: fsx::sha256_bytes(sql.as_bytes()), destructive: false });
|
||||||
}
|
}
|
||||||
(d, list)
|
(d, list)
|
||||||
}
|
}
|
||||||
@@ -277,7 +325,8 @@ mod tests {
|
|||||||
let failed = LedgerRow { sha256: list[0].sha256.clone(), status: Status::Failed, error: Some("previous failure".into()), baseline: false, ..old.clone() };
|
let failed = LedgerRow { sha256: list[0].sha256.clone(), status: Status::Failed, error: Some("previous failure".into()), baseline: false, ..old.clone() };
|
||||||
store.rows.borrow_mut().extend([old, failed]);
|
store.rows.borrow_mut().extend([old, failed]);
|
||||||
assert_eq!(status(&store, &list).unwrap()[0].status, Status::Failed);
|
assert_eq!(status(&store, &list).unwrap()[0].status, Status::Failed);
|
||||||
assert_eq!(apply_pending(&store, &list, d.path(), &no_snapshot).unwrap().applied, ["same_id"]);
|
assert!(apply_pending(&store, &list, d.path(), &no_snapshot).unwrap_err().to_string().contains("partially applied"));
|
||||||
|
assert!(store.ran.borrow().is_empty());
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
@@ -290,6 +339,60 @@ mod tests {
|
|||||||
assert!(store.ran.borrow().is_empty());
|
assert!(store.ran.borrow().is_empty());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn staged_files_reject_missing_corrupt_duplicate_and_invalid_migrations() {
|
||||||
|
let (dir, list) = setup(&[("characters", "repair", "SELECT 1;\n")]);
|
||||||
|
verify_files(&list, dir.path()).unwrap();
|
||||||
|
let mut bad = list.clone();
|
||||||
|
bad[0].id = "../outside".into();
|
||||||
|
assert!(verify_files(&bad, dir.path()).is_err());
|
||||||
|
bad = list.clone();
|
||||||
|
bad.push(list[0].clone());
|
||||||
|
assert!(verify_files(&bad, dir.path()).is_err());
|
||||||
|
std::fs::write(dir.path().join("characters/repair.sql"), b"SELECT 2;\n").unwrap();
|
||||||
|
assert!(verify_files(&list, dir.path()).is_err());
|
||||||
|
std::fs::remove_file(dir.path().join("characters/repair.sql")).unwrap();
|
||||||
|
assert!(verify_files(&list, dir.path()).is_err());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn preflight_uses_readonly_history_and_rejects_conflicts_without_writes() {
|
||||||
|
struct ReadOnly<'a>(&'a Mem);
|
||||||
|
impl Store for ReadOnly<'_> {
|
||||||
|
fn load(&self) -> Result<Vec<LedgerRow>> { panic!("preflight must use readonly access") }
|
||||||
|
fn load_readonly(&self) -> Result<Vec<LedgerRow>> { self.0.load() }
|
||||||
|
fn put(&self, _: &LedgerRow) -> Result<()> { panic!("preflight must not rewrite history") }
|
||||||
|
fn run_file(&self, _: &str, _: &Path) -> Result<()> { panic!("preflight must not run SQL") }
|
||||||
|
}
|
||||||
|
let (_d, list) = setup(&[("characters", "repair", "SELECT 1;\n")]);
|
||||||
|
for state in [Status::Applied, Status::Running, Status::Failed] {
|
||||||
|
let store = Mem::default();
|
||||||
|
store.rows.borrow_mut().push(LedgerRow { db: "characters".into(), id: "repair".into(), sha256: "a".repeat(64), status: state, error: None, baseline: false });
|
||||||
|
assert!(preflight(&ReadOnly(&store), &list).is_err());
|
||||||
|
assert_eq!(store.rows.borrow()[0].sha256, "a".repeat(64));
|
||||||
|
assert_eq!(store.rows.borrow()[0].status, state);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn published_compatibility_preserves_history_and_never_replays_sql() {
|
||||||
|
let (d, mut list) = setup(&[("characters", "repair", "SELECT 1;\n")]);
|
||||||
|
let store = Mem::default();
|
||||||
|
let old = fsx::sha256_bytes(b"SELECT 1;\r\n");
|
||||||
|
store.rows.borrow_mut().push(LedgerRow { db: "characters".into(), id: "repair".into(), sha256: old.clone(), status: Status::Applied, error: None, baseline: false });
|
||||||
|
assert!(apply_pending(&store, &list, d.path(), &no_snapshot).is_err());
|
||||||
|
list[0].compatible_sha256.push(old.clone());
|
||||||
|
assert_eq!(status(&store, &list).unwrap()[0].status, Status::Applied);
|
||||||
|
assert!(apply_pending(&store, &list, d.path(), &no_snapshot).unwrap().applied.is_empty());
|
||||||
|
assert!(store.ran.borrow().is_empty());
|
||||||
|
assert_eq!(store.rows.borrow()[0].sha256, old);
|
||||||
|
store.rows.borrow_mut()[0].status = Status::Running;
|
||||||
|
assert!(apply_pending(&store, &list, d.path(), &no_snapshot).is_err());
|
||||||
|
store.rows.borrow_mut()[0].status = Status::Failed;
|
||||||
|
assert!(apply_pending(&store, &list, d.path(), &no_snapshot).is_err());
|
||||||
|
assert!(store.ran.borrow().is_empty());
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn applies_in_order_once_and_records_the_ledger() {
|
fn applies_in_order_once_and_records_the_ledger() {
|
||||||
let (d, list) = setup(&[("world", "2026_09_01_00_a", "CREATE TABLE t (id INT);"), ("world", "2026_09_02_00_b", "ALTER TABLE t ADD c INT;")]);
|
let (d, list) = setup(&[("world", "2026_09_01_00_a", "CREATE TABLE t (id INT);"), ("world", "2026_09_02_00_b", "ALTER TABLE t ADD c INT;")]);
|
||||||
@@ -340,6 +443,16 @@ mod tests {
|
|||||||
assert!(apply_pending(&store, &list[..1], d.path(), &no_snapshot).is_err());
|
assert!(apply_pending(&store, &list[..1], d.path(), &no_snapshot).is_err());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn interrupted_sql_is_reported_and_never_automatically_replayed() {
|
||||||
|
let (d, list) = setup(&[("world", "partial", "DROP TABLE valuable;")]);
|
||||||
|
let store = Mem::default();
|
||||||
|
store.rows.borrow_mut().push(LedgerRow { db: "world".into(), id: "partial".into(), sha256: list[0].sha256.clone(), status: Status::Running, error: Some("interrupted".into()), baseline: false });
|
||||||
|
assert_eq!(status(&store, &list).unwrap()[0].status, Status::Failed);
|
||||||
|
assert!(apply_pending(&store, &list, d.path(), &no_snapshot).unwrap_err().to_string().contains("interrupted"));
|
||||||
|
assert!(store.ran.borrow().is_empty());
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn baseline_marks_without_running_and_hostile_ids_are_rejected() {
|
fn baseline_marks_without_running_and_hostile_ids_are_rejected() {
|
||||||
let (d, list) = setup(&[("world", "b1", "SELECT 1;")]);
|
let (d, list) = setup(&[("world", "b1", "SELECT 1;")]);
|
||||||
|
|||||||
+281
-29
@@ -87,10 +87,13 @@ fn truthy(v: &str) -> bool {
|
|||||||
pub struct ModuleView {
|
pub struct ModuleView {
|
||||||
pub id: String,
|
pub id: String,
|
||||||
pub name: String,
|
pub name: String,
|
||||||
|
pub version: Option<String>,
|
||||||
pub description: BTreeMap<String, String>,
|
pub description: BTreeMap<String, String>,
|
||||||
pub repo: String,
|
pub repo: String,
|
||||||
/// The module's configuration is present on this server (otherwise it is not part of this server build).
|
/// The module's configuration is present on this server (otherwise it is not part of this server build).
|
||||||
pub installed: bool,
|
pub installed: bool,
|
||||||
|
/// At least one editable setting besides the master switch exists in this server build.
|
||||||
|
pub has_settings: bool,
|
||||||
pub enabled: bool,
|
pub enabled: bool,
|
||||||
pub switchable: bool,
|
pub switchable: bool,
|
||||||
pub status: String,
|
pub status: String,
|
||||||
@@ -125,17 +128,28 @@ fn list_in(cat: &[Entry], root: &Path) -> Vec<ModuleView> {
|
|||||||
let conf = dir(root).join(&name);
|
let conf = dir(root).join(&name);
|
||||||
let dist = dir(root).join(format!("{name}.dist"));
|
let dist = dir(root).join(format!("{name}.dist"));
|
||||||
let installed = conf.is_file() || dist.is_file();
|
let installed = conf.is_file() || dist.is_file();
|
||||||
|
let has_settings = installed && settings_in(cat, root, &e.id)
|
||||||
|
.map(|settings| settings.iter().any(|s| s.key != e.enable_key))
|
||||||
|
.unwrap_or(false);
|
||||||
// the active file decides; without one the documented default is what the server will use
|
// the active file decides; without one the documented default is what the server will use
|
||||||
let enabled = !e.switchable
|
let enabled = if matches!(e.id.as_str(), "companions" | "playerbots") {
|
||||||
|| read(&conf).or_else(|| read(&dist)).and_then(|c| c.get(&e.enable_key).map(truthy)).unwrap_or(e.default_on);
|
bot_enabled(root, &e).unwrap_or(true)
|
||||||
|
} else {
|
||||||
|
!e.switchable || read(&conf).or_else(|| read(&dist)).and_then(|c| c.get(&e.enable_key).map(truthy)).unwrap_or(e.default_on)
|
||||||
|
};
|
||||||
let blocked = wildcard && matches!(e.id.as_str(), "companions" | "playerbots");
|
let blocked = wildcard && matches!(e.id.as_str(), "companions" | "playerbots");
|
||||||
|
let version = if e.id == "playerbots" { crate::squid::release(root).map(|release| {
|
||||||
|
[release.tag, release.commit.map(|commit| commit.chars().take(8).collect())].into_iter().flatten().collect::<Vec<_>>().join(" · ")
|
||||||
|
}) } else { None };
|
||||||
ModuleView {
|
ModuleView {
|
||||||
|
version,
|
||||||
compatibility: if blocked { "unsupported" } else if wildcard && e.id != "client-compat" { "experimental" } else { "compatible" }.into(),
|
compatibility: if blocked { "unsupported" } else if wildcard && e.id != "client-compat" { "experimental" } else { "compatible" }.into(),
|
||||||
id: e.id,
|
id: e.id,
|
||||||
name: e.name,
|
name: e.name,
|
||||||
description: e.description,
|
description: e.description,
|
||||||
repo: e.repo,
|
repo: e.repo,
|
||||||
installed,
|
installed,
|
||||||
|
has_settings,
|
||||||
enabled: enabled && !blocked,
|
enabled: enabled && !blocked,
|
||||||
switchable: e.switchable && !blocked,
|
switchable: e.switchable && !blocked,
|
||||||
status: e.status,
|
status: e.status,
|
||||||
@@ -167,16 +181,61 @@ fn backup(meta: &Path, conf: &Path) -> Result<()> {
|
|||||||
fsx::atomic_write(&to, &fs::read(conf)?)
|
fsx::atomic_write(&to, &fs::read(conf)?)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn require_bot_server_stopped(root: &Path) -> Result<()> {
|
||||||
|
let observed = crate::process::observe(root, &crate::layout::read_ports(root));
|
||||||
|
if observed.world.state != crate::process::ServiceState::Stopped || crate::multiworld::is_running(root) {
|
||||||
|
return Err(Error::Invalid("Stop the server before changing the bot system.".into()));
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
pub fn set_enabled(root: &Path, meta: &Path, id: &str, on: bool) -> Result<()> {
|
pub fn set_enabled(root: &Path, meta: &Path, id: &str, on: bool) -> Result<()> {
|
||||||
|
let _update_lock = crate::update::operation_lock(meta)?;
|
||||||
|
crate::update::ensure_recovered(meta)?;
|
||||||
|
let _lock = if matches!(id, "companions" | "playerbots") {
|
||||||
|
require_bot_server_stopped(root)?;
|
||||||
|
fs::create_dir_all(root.join(".state"))?;
|
||||||
|
let lock = fs::OpenOptions::new().read(true).write(true).create(true).truncate(false).open(root.join(".state/control.lock"))?;
|
||||||
|
if !fs4::fs_std::FileExt::try_lock_exclusive(&lock)? {
|
||||||
|
return Err(Error::Invalid("Another start/stop action is in progress.".into()));
|
||||||
|
}
|
||||||
|
require_bot_server_stopped(root)?;
|
||||||
|
Some(lock)
|
||||||
|
} else { None };
|
||||||
if on { crate::realms::guard_module(root, id)?; }
|
if on { crate::realms::guard_module(root, id)?; }
|
||||||
set_enabled_in(&catalog(), root, meta, id, on)
|
set_enabled_in(&catalog(), root, meta, id, on)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn bot_enabled(root: &Path, e: &Entry) -> Result<bool> {
|
||||||
|
let name = conf_name(root, e);
|
||||||
|
let conf = dir(root).join(&name);
|
||||||
|
let dist = dir(root).join(format!("{name}.dist"));
|
||||||
|
let path = if conf.exists() { conf } else { dist };
|
||||||
|
if !path.exists() { return Ok(false); }
|
||||||
|
let file = ConfFile::parse_bytes(&fs::read(path)?)?;
|
||||||
|
// Invalid booleans use the modules' enabled compiled default: fail closed.
|
||||||
|
Ok(file.get(&e.enable_key).map(|v| !matches!(v.trim().trim_matches('"').to_ascii_lowercase().as_str(), "0" | "false" | "no" | "off")).unwrap_or(true))
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn ensure_bot_exclusivity(root: &Path) -> Result<()> {
|
||||||
|
let cat = catalog();
|
||||||
|
if bot_enabled(root, &entry_in(&cat, "companions")?)? && bot_enabled(root, &entry_in(&cat, "playerbots")?)? {
|
||||||
|
return Err(Error::BotModulesConflict);
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
fn set_enabled_in(cat: &[Entry], root: &Path, meta: &Path, id: &str, on: bool) -> Result<()> {
|
fn set_enabled_in(cat: &[Entry], root: &Path, meta: &Path, id: &str, on: bool) -> Result<()> {
|
||||||
let e = entry_in(cat, id)?;
|
let e = entry_in(cat, id)?;
|
||||||
if !e.switchable || e.enable_key.is_empty() {
|
if !e.switchable || e.enable_key.is_empty() {
|
||||||
return Err(Error::Invalid("This part cannot be switched off.".into()));
|
return Err(Error::Invalid("This part cannot be switched off.".into()));
|
||||||
}
|
}
|
||||||
|
if on && matches!(id, "companions" | "playerbots") {
|
||||||
|
let other = if id == "companions" { "playerbots" } else { "companions" };
|
||||||
|
if let Some(other) = cat.iter().find(|e| e.id == other) {
|
||||||
|
if bot_enabled(root, other)? { return Err(Error::BotModulesConflict); }
|
||||||
|
}
|
||||||
|
}
|
||||||
let conf = active_file(root, &e)?;
|
let conf = active_file(root, &e)?;
|
||||||
let mut file = ConfFile::parse_bytes(&fs::read(&conf)?)?;
|
let mut file = ConfFile::parse_bytes(&fs::read(&conf)?)?;
|
||||||
if file.get(&e.enable_key).map(truthy).unwrap_or(e.default_on) == on && file.get(&e.enable_key).is_some() {
|
if file.get(&e.enable_key).map(truthy).unwrap_or(e.default_on) == on && file.get(&e.enable_key).is_some() {
|
||||||
@@ -189,13 +248,14 @@ fn set_enabled_in(cat: &[Entry], root: &Path, meta: &Path, id: &str, on: bool) -
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Serialize, PartialEq, Eq)]
|
#[derive(Debug, Serialize, PartialEq)]
|
||||||
pub struct Setting {
|
pub struct Setting {
|
||||||
pub key: String,
|
pub key: String,
|
||||||
pub value: String,
|
pub value: String,
|
||||||
pub default: Option<String>,
|
pub default: Option<String>,
|
||||||
/// The documentation the module ships above the setting.
|
/// The documentation the module ships above the setting.
|
||||||
pub doc: String,
|
pub doc: String,
|
||||||
|
pub field: Option<crate::squid::Field>,
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Every active setting of the module with its current value, its documented default and its description.
|
/// Every active setting of the module with its current value, its documented default and its description.
|
||||||
@@ -209,12 +269,22 @@ fn settings_in(cat: &[Entry], root: &Path, id: &str) -> Result<Vec<Setting>> {
|
|||||||
let conf = dir(root).join(&name);
|
let conf = dir(root).join(&name);
|
||||||
let dist = read(&dir(root).join(format!("{name}.dist")));
|
let dist = read(&dir(root).join(format!("{name}.dist")));
|
||||||
let active = read(&conf).or_else(|| dist.clone()).ok_or_else(|| Error::Invalid("This module is not part of this server.".into()))?;
|
let active = read(&conf).or_else(|| dist.clone()).ok_or_else(|| Error::Invalid("This module is not part of this server.".into()))?;
|
||||||
Ok(active
|
let fields = if id == "playerbots" { crate::squid::fields(root)? } else { Default::default() };
|
||||||
|
let mut effective = active.clone();
|
||||||
|
if let Some(defaults) = &dist {
|
||||||
|
for (key, value) in defaults.entries() {
|
||||||
|
if effective.get(key).is_none() {
|
||||||
|
effective.set(key, value, &[]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(effective
|
||||||
.entries()
|
.entries()
|
||||||
.map(|(k, v)| Setting {
|
.map(|(k, v)| Setting {
|
||||||
key: k.to_string(),
|
key: k.to_string(),
|
||||||
value: v.to_string(),
|
value: fields.get(k).and_then(|field| field.default_if_missing.as_ref()).filter(|_| active.get(k).is_none()).and_then(crate::squid::scalar).unwrap_or_else(|| v.to_string()),
|
||||||
default: dist.as_ref().and_then(|d| d.get(k)).map(str::to_string),
|
default: fields.get(k).and_then(|field| crate::squid::scalar(&field.default)).or_else(|| dist.as_ref().and_then(|d| d.get(k)).map(str::to_string)),
|
||||||
|
field: fields.get(k).cloned(),
|
||||||
doc: dist.as_ref().map(|d| d.doc_for(k)).filter(|d| !d.is_empty()).unwrap_or_else(|| active.doc_for(k)).join(" "),
|
doc: dist.as_ref().map(|d| d.doc_for(k)).filter(|d| !d.is_empty()).unwrap_or_else(|| active.doc_for(k)).join(" "),
|
||||||
})
|
})
|
||||||
.collect())
|
.collect())
|
||||||
@@ -230,13 +300,41 @@ fn save_settings_in(cat: &[Entry], root: &Path, meta: &Path, id: &str, changes:
|
|||||||
let e = entry_in(cat, id)?;
|
let e = entry_in(cat, id)?;
|
||||||
let conf = active_file(root, &e)?;
|
let conf = active_file(root, &e)?;
|
||||||
let mut file = ConfFile::parse_bytes(&fs::read(&conf)?)?;
|
let mut file = ConfFile::parse_bytes(&fs::read(&conf)?)?;
|
||||||
|
let dist = read(&dir(root).join(format!("{}.dist", conf_name(root, &e))));
|
||||||
|
let fields = if id == "playerbots" { crate::squid::fields(root)? } else { Default::default() };
|
||||||
let mut changed = Vec::new();
|
let mut changed = Vec::new();
|
||||||
for (key, value) in changes {
|
for (key, value) in changes {
|
||||||
let value = value.trim();
|
let value = value.trim();
|
||||||
if file.get(key).is_none() {
|
if let Some(field) = fields.get(key) { crate::squid::validate(field, value)?; }
|
||||||
|
if e.switchable && key == &e.enable_key {
|
||||||
|
return Err(Error::Invalid("Use the module switch to turn this module on or off.".into()));
|
||||||
|
}
|
||||||
|
if id == "content-scaling" && key == "CoAContentScaling.Difficulty.DamageMultiplier" {
|
||||||
|
let multiplier = value.parse::<f32>().map_err(|_| Error::Invalid("Enemy damage must be a number from 0.25 to 2.0.".into()))?;
|
||||||
|
if !multiplier.is_finite() || !(0.25..=2.0).contains(&multiplier) {
|
||||||
|
return Err(Error::Invalid("Enemy damage must be a number from 0.25 to 2.0.".into()));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if id == "content-scaling" && key == "CoAContentScaling.World.Leech.Percent" {
|
||||||
|
let percent = value.parse::<f32>().map_err(|_| Error::Invalid("Life steal must be a number from 0 to 100 percent.".into()))?;
|
||||||
|
if !percent.is_finite() || !(0.0..=100.0).contains(&percent) {
|
||||||
|
return Err(Error::Invalid("Life steal must be a number from 0 to 100 percent.".into()));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if id == "content-scaling" && matches!(key.as_str(), "CoAContentScaling.LFG.AllowPartialGroups" | "CoAContentScaling.World.Leech.Enable") && !matches!(value, "0" | "1") {
|
||||||
|
return Err(Error::Invalid(format!("{key} must be 0 or 1.")));
|
||||||
|
}
|
||||||
|
if id == "ah-bot" && key.starts_with("AuctionHouseBot.ListProportion.Category") && key.contains(".Quality") {
|
||||||
|
let weight = value.parse::<u32>().map_err(|_| Error::Invalid("Auction listing weights must be whole numbers from 0 to 1000.".into()))?;
|
||||||
|
if weight > 1000 {
|
||||||
|
return Err(Error::Invalid("Auction listing weights must be whole numbers from 0 to 1000.".into()));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if file.get(key).is_none() && dist.as_ref().and_then(|d| d.get(key)).is_none() {
|
||||||
return Err(Error::Invalid(format!("{key} is not a setting of this module.")));
|
return Err(Error::Invalid(format!("{key} is not a setting of this module.")));
|
||||||
}
|
}
|
||||||
if value.is_empty() || value.len() > 500 || value.chars().any(char::is_control) {
|
let documented_empty = dist.as_ref().and_then(|d| d.get(key)).map(str::trim) == Some("");
|
||||||
|
if (value.is_empty() && !documented_empty) || value.len() > 500 || value.chars().any(char::is_control) {
|
||||||
return Err(Error::Invalid(format!("The value of {key} must be one line of text.")));
|
return Err(Error::Invalid(format!("The value of {key} must be one line of text.")));
|
||||||
}
|
}
|
||||||
if file.get(key).map(str::trim) != Some(value) {
|
if file.get(key).map(str::trim) != Some(value) {
|
||||||
@@ -286,6 +384,61 @@ mod tests {
|
|||||||
(root, meta)
|
(root, meta)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn squid_missing_keys_use_code_defaults_and_saves_enforce_json_ranges() {
|
||||||
|
let d = tempfile::tempdir().unwrap();
|
||||||
|
let root = d.path();
|
||||||
|
fs::create_dir_all(dir(root)).unwrap();
|
||||||
|
fs::write(dir(root).join("playerbots.conf"), "AiPlayerbot.Enabled = 0\n").unwrap();
|
||||||
|
fs::write(dir(root).join("playerbots.conf.dist"), "AiPlayerbot.Enabled = 0\nAiPlayerbot.MinRandomBots = 500\n").unwrap();
|
||||||
|
fs::write(dir(root).join("playerbots.conf.settings.json"), r#"{"format":1,"groups":{"population":"Population"},"settings":[{"key":"AiPlayerbot.MinRandomBots","type":"int","group":"population","title":"Minimum bots","description":"Lower bound","default":500,"default_if_missing":50,"min":0,"max":5000}]}"#).unwrap();
|
||||||
|
let cat = catalog();
|
||||||
|
let options = settings_in(&cat, root, "playerbots").unwrap();
|
||||||
|
let option = options.iter().find(|setting| setting.key == "AiPlayerbot.MinRandomBots").unwrap();
|
||||||
|
assert_eq!(option.value, "50");
|
||||||
|
assert_eq!(option.default.as_deref(), Some("500"));
|
||||||
|
assert_eq!(option.field.as_ref().unwrap().group_title.as_deref(), Some("Population"));
|
||||||
|
let before = fs::read(dir(root).join("playerbots.conf")).unwrap();
|
||||||
|
assert!(save_settings_in(&cat, root, root, "playerbots", &BTreeMap::from([("AiPlayerbot.MinRandomBots".into(), "5001".into())])).is_err());
|
||||||
|
assert_eq!(fs::read(dir(root).join("playerbots.conf")).unwrap(), before);
|
||||||
|
save_settings_in(&cat, root, root, "playerbots", &BTreeMap::from([("AiPlayerbot.MinRandomBots".into(), "42".into())])).unwrap();
|
||||||
|
assert_eq!(settings_in(&cat, root, "playerbots").unwrap().iter().find(|setting| setting.key == "AiPlayerbot.MinRandomBots").unwrap().value, "42");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn bot_systems_are_mutually_exclusive_in_both_directions_and_manual_configs() {
|
||||||
|
let d = tempfile::tempdir().unwrap();
|
||||||
|
let root = d.path();
|
||||||
|
fs::create_dir_all(dir(root)).unwrap();
|
||||||
|
let a = dir(root).join("mod_coa_playerbots.conf");
|
||||||
|
let b = dir(root).join("playerbots.conf");
|
||||||
|
fs::write(&a, "CoaBots.Enable = 1\n").unwrap();
|
||||||
|
fs::write(&b, "AiPlayerbot.Enabled = 0\n").unwrap();
|
||||||
|
assert!(ensure_bot_exclusivity(root).is_ok());
|
||||||
|
assert!(matches!(set_enabled_in(&catalog(), root, root, "playerbots", true), Err(Error::BotModulesConflict)));
|
||||||
|
assert_eq!(fs::read_to_string(&b).unwrap(), "AiPlayerbot.Enabled = 0\n");
|
||||||
|
fs::write(&a, "CoaBots.Enable = 0\n").unwrap();
|
||||||
|
set_enabled_in(&catalog(), root, root, "playerbots", true).unwrap();
|
||||||
|
assert!(matches!(set_enabled_in(&catalog(), root, root, "companions", true), Err(Error::BotModulesConflict)));
|
||||||
|
fs::write(&a, "CoaBots.Enable = true\n").unwrap();
|
||||||
|
assert!(matches!(ensure_bot_exclusivity(root), Err(Error::BotModulesConflict)));
|
||||||
|
fs::write(&b, "# missing key uses the compiled enabled default\n").unwrap();
|
||||||
|
assert!(matches!(ensure_bot_exclusivity(root), Err(Error::BotModulesConflict)));
|
||||||
|
set_enabled_in(&catalog(), root, root, "companions", false).unwrap();
|
||||||
|
assert!(ensure_bot_exclusivity(root).is_ok());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn startup_rejects_conflicting_bots_before_launching_any_service() {
|
||||||
|
let d = tempfile::tempdir().unwrap();
|
||||||
|
fs::create_dir_all(dir(d.path())).unwrap();
|
||||||
|
fs::write(dir(d.path()).join("mod_coa_playerbots.conf"), "CoaBots.Enable = 1").unwrap();
|
||||||
|
fs::write(dir(d.path()).join("playerbots.conf"), "AiPlayerbot.Enabled = 1").unwrap();
|
||||||
|
for verb in [crate::driver::Verb::StartAll, crate::driver::Verb::StartWorld] {
|
||||||
|
assert!(matches!(crate::driver::run(d.path(), verb), Err(Error::BotModulesConflict)));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn the_bundled_catalog_is_valid() {
|
fn the_bundled_catalog_is_valid() {
|
||||||
let c = catalog();
|
let c = catalog();
|
||||||
@@ -293,7 +446,7 @@ mod tests {
|
|||||||
for e in &c {
|
for e in &c {
|
||||||
assert!(e.description.contains_key("en") && e.description.len() == 5, "{} has all five descriptions", e.id);
|
assert!(e.description.contains_key("en") && e.description.len() == 5, "{} has all five descriptions", e.id);
|
||||||
assert!(e.repo.starts_with("https://github.com/") && e.conf.ends_with(".conf"), "{}", e.id);
|
assert!(e.repo.starts_with("https://github.com/") && e.conf.ends_with(".conf"), "{}", e.id);
|
||||||
assert!(!e.switchable || e.enable_key.ends_with(".Enable"), "{} needs the setting that switches it", e.id);
|
assert!(!e.switchable || (e.enable_key.ends_with(".Enable") || e.enable_key.ends_with(".Enabled")), "{} needs the setting that switches it", e.id);
|
||||||
assert!(["soon", "early", "beta", "release"].contains(&e.status.as_str()), "{} has an unknown status", e.id);
|
assert!(["soon", "early", "beta", "release"].contains(&e.status.as_str()), "{} has an unknown status", e.id);
|
||||||
assert!(e.status != "soon" || !e.switchable, "{} is only announced, so it cannot be switched", e.id);
|
assert!(e.status != "soon" || !e.switchable, "{} is only announced, so it cannot be switched", e.id);
|
||||||
}
|
}
|
||||||
@@ -312,25 +465,6 @@ mod tests {
|
|||||||
assert!(!list_in(&test_catalog(), &root).into_iter().find(|m| m.id == "spellbook").unwrap().installed, "no configuration of that module on this server");
|
assert!(!list_in(&test_catalog(), &root).into_iter().find(|m| m.id == "spellbook").unwrap().installed, "no configuration of that module on this server");
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn the_content_scaling_switch_persists_the_master_flag_and_preserves_other_settings() {
|
|
||||||
let d = tempfile::tempdir().unwrap();
|
|
||||||
let (root, meta) = server(d.path());
|
|
||||||
let e = entry_in(&catalog(), "content-scaling").unwrap();
|
|
||||||
assert_eq!(e.enable_key, "CoAContentScaling.Enable");
|
|
||||||
let defaults = "CoAContentScaling.Enable = 1\nCoAContentScaling.ScaleItems = 1\nCoAContentScaling.GroupScaling.Enable = 1\n";
|
|
||||||
fs::write(dir(&root).join(format!("{}.dist", e.conf)), defaults).unwrap();
|
|
||||||
set_enabled(&root, &meta, &e.id, false).unwrap();
|
|
||||||
let active = read(&dir(&root).join(&e.conf)).unwrap();
|
|
||||||
assert_eq!(active.get("CoAContentScaling.Enable"), Some("0"));
|
|
||||||
assert_eq!(active.get("CoAContentScaling.ScaleItems"), Some("1"));
|
|
||||||
assert_eq!(active.get("CoAContentScaling.GroupScaling.Enable"), Some("1"));
|
|
||||||
assert!(!list(&root).into_iter().find(|m| m.id == e.id).unwrap().enabled);
|
|
||||||
set_enabled(&root, &meta, &e.id, true).unwrap();
|
|
||||||
assert_eq!(read(&dir(&root).join(&e.conf)).unwrap().get("CoAContentScaling.Enable"), Some("1"));
|
|
||||||
assert!(list(&root).into_iter().find(|m| m.id == e.id).unwrap().enabled);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn switching_a_module_creates_its_file_saves_the_old_one_and_changes_only_that_line() {
|
fn switching_a_module_creates_its_file_saves_the_old_one_and_changes_only_that_line() {
|
||||||
let d = tempfile::tempdir().unwrap();
|
let d = tempfile::tempdir().unwrap();
|
||||||
@@ -353,7 +487,7 @@ mod tests {
|
|||||||
let (root, meta) = server(d.path());
|
let (root, meta) = server(d.path());
|
||||||
let s = settings_in(&test_catalog(), &root, "war-games").unwrap();
|
let s = settings_in(&test_catalog(), &root, "war-games").unwrap();
|
||||||
assert_eq!(s.len(), 2);
|
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[1], Setting { key: "WarGames.ChallengeSeconds".into(), value: "60".into(), default: Some("60".into()), doc: "How long a challenge stays open.".into(), field: None });
|
||||||
assert_eq!(s[0].doc, "Turns War Games on. Second line.");
|
assert_eq!(s[0].doc, "Turns War Games on. Second line.");
|
||||||
|
|
||||||
let ok = BTreeMap::from([("WarGames.ChallengeSeconds".to_string(), "90".to_string())]);
|
let ok = BTreeMap::from([("WarGames.ChallengeSeconds".to_string(), "90".to_string())]);
|
||||||
@@ -367,6 +501,124 @@ mod tests {
|
|||||||
assert!(!fs::read_to_string(dir(&root).join("war_games.conf")).unwrap().contains("Injected"));
|
assert!(!fs::read_to_string(dir(&root).join("war_games.conf")).unwrap().contains("Injected"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn updated_module_defaults_are_visible_and_can_be_saved_in_an_existing_config() {
|
||||||
|
let d = tempfile::tempdir().unwrap();
|
||||||
|
let (root, meta) = server(d.path());
|
||||||
|
fs::write(dir(&root).join("war_games.conf"), "WarGames.Enable = 0\n").unwrap();
|
||||||
|
let cat = test_catalog();
|
||||||
|
let values = settings_in(&cat, &root, "war-games").unwrap();
|
||||||
|
assert_eq!(values.iter().find(|s| s.key == "WarGames.Enable").unwrap().value, "0");
|
||||||
|
assert_eq!(values.iter().find(|s| s.key == "WarGames.ChallengeSeconds").unwrap().value, "60");
|
||||||
|
let changes = BTreeMap::from([("WarGames.ChallengeSeconds".to_string(), "90".to_string())]);
|
||||||
|
save_settings_in(&cat, &root, &meta, "war-games", &changes).unwrap();
|
||||||
|
let text = fs::read_to_string(dir(&root).join("war_games.conf")).unwrap();
|
||||||
|
assert!(text.contains("WarGames.Enable = 0") && text.contains("WarGames.ChallengeSeconds = 90"));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn module_enable_cannot_be_changed_through_the_settings_editor() {
|
||||||
|
let d = tempfile::tempdir().unwrap();
|
||||||
|
let (root, meta) = server(d.path());
|
||||||
|
let changes = BTreeMap::from([("WarGames.Enable".into(), "0".into())]);
|
||||||
|
assert!(save_settings_in(&test_catalog(), &root, &meta, "war-games", &changes).is_err());
|
||||||
|
assert_eq!(settings_in(&test_catalog(), &root, "war-games").unwrap()[0].value, "1");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn settings_button_requires_more_than_the_master_switch() {
|
||||||
|
let d = tempfile::tempdir().unwrap();
|
||||||
|
let (root, _) = server(d.path());
|
||||||
|
let cat = test_catalog();
|
||||||
|
assert!(list_in(&cat, &root).iter().find(|m| m.id == "war-games").unwrap().has_settings);
|
||||||
|
fs::write(dir(&root).join("war_games.conf.dist"), "WarGames.Enable = 1\n").unwrap();
|
||||||
|
assert!(!list_in(&cat, &root).iter().find(|m| m.id == "war-games").unwrap().has_settings);
|
||||||
|
fs::write(dir(&root).join("war_games.conf"), "WarGames.Enable = 0\nWarGames.ChallengeSeconds = 90\n").unwrap();
|
||||||
|
assert!(list_in(&cat, &root).iter().find(|m| m.id == "war-games").unwrap().has_settings, "custom active settings remain editable");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn documented_empty_lists_can_be_restored() {
|
||||||
|
let d = tempfile::tempdir().unwrap();
|
||||||
|
let (root, meta) = server(d.path());
|
||||||
|
fs::write(dir(&root).join("war_games.conf.dist"), "WarGames.Enable = 1\nWarGames.ExcludedItems = \n").unwrap();
|
||||||
|
fs::write(dir(&root).join("war_games.conf"), "WarGames.Enable = 1\nWarGames.ExcludedItems = 42\n").unwrap();
|
||||||
|
let changes = BTreeMap::from([("WarGames.ExcludedItems".into(), "".into())]);
|
||||||
|
save_settings_in(&test_catalog(), &root, &meta, "war-games", &changes).unwrap();
|
||||||
|
assert_eq!(settings_in(&test_catalog(), &root, "war-games").unwrap().iter().find(|s| s.key == "WarGames.ExcludedItems").unwrap().value, "");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn auction_type_weights_are_validated_before_any_setting_is_written() {
|
||||||
|
let d = tempfile::tempdir().unwrap();
|
||||||
|
let (root, meta) = server(d.path());
|
||||||
|
let cat = catalog();
|
||||||
|
let key = "AuctionHouseBot.ListProportion.CategoryWeapon.QualityNormal";
|
||||||
|
let conf = dir(&root).join("mod_ahbot.conf");
|
||||||
|
fs::write(&conf, format!("AuctionHouseBot.Enable = true\nAuctionHouseBot.ItemsPerCycle = 150\n{key} = 20\n")).unwrap();
|
||||||
|
let original = fs::read(&conf).unwrap();
|
||||||
|
for bad in ["-1", "1.5", "NaN", "1001", "", "4294967296"] {
|
||||||
|
let changes = BTreeMap::from([("AuctionHouseBot.ItemsPerCycle".into(), "25".into()), (key.into(), bad.into())]);
|
||||||
|
assert!(save_settings_in(&cat, &root, &meta, "ah-bot", &changes).is_err(), "{bad}");
|
||||||
|
assert_eq!(fs::read(&conf).unwrap(), original, "no partial save for {bad}");
|
||||||
|
}
|
||||||
|
let off = BTreeMap::from([(key.into(), "0".into())]);
|
||||||
|
save_settings_in(&cat, &root, &meta, "ah-bot", &off).unwrap();
|
||||||
|
assert_eq!(settings_in(&cat, &root, "ah-bot").unwrap().iter().find(|s| s.key == key).unwrap().value, "0");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn partial_lfg_and_world_leech_settings_round_trip_and_reject_invalid_values() {
|
||||||
|
let d = tempfile::tempdir().unwrap();
|
||||||
|
let (root, meta) = server(d.path());
|
||||||
|
let cat = catalog();
|
||||||
|
let conf = dir(&root).join("mod-coa-content-scaling.conf.dist");
|
||||||
|
let partial = "CoAContentScaling.LFG.AllowPartialGroups";
|
||||||
|
let enable = "CoAContentScaling.World.Leech.Enable";
|
||||||
|
let percent = "CoAContentScaling.World.Leech.Percent";
|
||||||
|
let change = |k: &str, v: &str| BTreeMap::from([(k.into(), v.into())]);
|
||||||
|
fs::write(&conf, "CoAContentScaling.Enable = 1\n").unwrap();
|
||||||
|
for key in [partial, enable, percent] {
|
||||||
|
assert!(save_settings_in(&cat, &root, &meta, "content-scaling", &change(key, "1")).is_err());
|
||||||
|
}
|
||||||
|
fs::write(&conf, format!("CoAContentScaling.Enable = 1\n{partial} = 1\n{enable} = 0\n{percent} = 5.0\n")).unwrap();
|
||||||
|
for bad in ["NaN", "inf", "-0.1", "100.1", "abc"] {
|
||||||
|
assert!(save_settings_in(&cat, &root, &meta, "content-scaling", &change(percent, bad)).is_err());
|
||||||
|
}
|
||||||
|
for key in [partial, enable] {
|
||||||
|
for bad in ["2", "-1", "true", "abc"] {
|
||||||
|
assert!(save_settings_in(&cat, &root, &meta, "content-scaling", &change(key, bad)).is_err());
|
||||||
|
}
|
||||||
|
for good in ["0", "1"] {
|
||||||
|
save_settings_in(&cat, &root, &meta, "content-scaling", &change(key, good)).unwrap();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for good in ["0", "10.5", "100"] {
|
||||||
|
save_settings_in(&cat, &root, &meta, "content-scaling", &change(percent, good)).unwrap();
|
||||||
|
let settings = settings_in(&cat, &root, "content-scaling").unwrap();
|
||||||
|
assert_eq!(settings.iter().find(|s| s.key == percent).unwrap().value, good);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn damage_difficulty_is_validated_and_older_server_builds_do_not_accept_it() {
|
||||||
|
let d = tempfile::tempdir().unwrap();
|
||||||
|
let (root, meta) = server(d.path());
|
||||||
|
let cat = catalog();
|
||||||
|
let conf = dir(&root).join("mod-coa-content-scaling.conf.dist");
|
||||||
|
fs::write(&conf, "CoAContentScaling.Enable = 1\n").unwrap();
|
||||||
|
let key = "CoAContentScaling.Difficulty.DamageMultiplier";
|
||||||
|
let changes = |v: &str| BTreeMap::from([(key.into(), v.into())]);
|
||||||
|
assert!(save_settings_in(&cat, &root, &meta, "content-scaling", &changes("0.5")).is_err());
|
||||||
|
fs::write(&conf, format!("CoAContentScaling.Enable = 1\n{key} = 1.0\n")).unwrap();
|
||||||
|
for bad in ["NaN", "inf", "0", "0.24", "2.01", "abc"] {
|
||||||
|
assert!(save_settings_in(&cat, &root, &meta, "content-scaling", &changes(bad)).is_err(), "{bad}");
|
||||||
|
}
|
||||||
|
assert_eq!(save_settings_in(&cat, &root, &meta, "content-scaling", &changes("0.25")).unwrap(), [key]);
|
||||||
|
assert_eq!(save_settings_in(&cat, &root, &meta, "content-scaling", &changes("2")).unwrap(), [key]);
|
||||||
|
assert_eq!(settings_in(&cat, &root, "content-scaling").unwrap().iter().find(|s| s.key == key).unwrap().value, "2");
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn an_older_file_name_is_used_when_the_current_one_is_missing_and_a_part_that_cannot_be_switched_stays_on() {
|
fn an_older_file_name_is_used_when_the_current_one_is_missing_and_a_part_that_cannot_be_switched_stays_on() {
|
||||||
let d = tempfile::tempdir().unwrap();
|
let d = tempfile::tempdir().unwrap();
|
||||||
|
|||||||
@@ -64,6 +64,10 @@ fn prepare(main: &Path) -> Result<PathBuf> {
|
|||||||
let mode = if s.active == Mode::Coa { Mode::Wildcard } else { Mode::Coa };
|
let mode = if s.active == Mode::Coa { Mode::Wildcard } else { Mode::Coa };
|
||||||
let second = fsx::ensure_within(main, &root(main))?;
|
let second = fsx::ensure_within(main, &root(main))?;
|
||||||
for folder in ["Runtime", "BugReport", "mysql/bin"] { copy_tree(&main.join(folder), &fsx::ensure_within(&second, &second.join(folder))?)?; }
|
for folder in ["Runtime", "BugReport", "mysql/bin"] { copy_tree(&main.join(folder), &fsx::ensure_within(&second, &second.join(folder))?)?; }
|
||||||
|
if main.join("Scripts/squid_playerbots.py").is_file() {
|
||||||
|
fs::create_dir_all(second.join("Scripts"))?;
|
||||||
|
fs::copy(main.join("Scripts/squid_playerbots.py"), second.join("Scripts/squid_playerbots.py"))?;
|
||||||
|
}
|
||||||
if main.join("Core/reference").is_dir() { copy_tree(&main.join("Core/reference"), &fsx::ensure_within(&second, &second.join("Core/reference"))?)?; }
|
if main.join("Core/reference").is_dir() { copy_tree(&main.join("Core/reference"), &fsx::ensure_within(&second, &second.join("Core/reference"))?)?; }
|
||||||
for entry in fs::read_dir(main.join("Core"))? {
|
for entry in fs::read_dir(main.join("Core"))? {
|
||||||
let entry = entry?;
|
let entry = entry?;
|
||||||
|
|||||||
@@ -19,6 +19,51 @@ pub fn lan_ip() -> Option<Ipv4Addr> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, PartialEq, Eq, Serialize)]
|
||||||
|
pub struct LanAddress {
|
||||||
|
pub interface: String,
|
||||||
|
pub address: String,
|
||||||
|
pub is_default: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Suitable unicast IPv4 addresses; shared carrier/Tailscale space belongs to Private mode.
|
||||||
|
pub fn is_lan_address(ip: Ipv4Addr) -> bool {
|
||||||
|
!ip.is_unspecified() && !ip.is_loopback() && !ip.is_link_local()
|
||||||
|
&& !ip.is_multicast() && !ip.is_broadcast() && ip.octets()[0] != 0
|
||||||
|
&& ip.octets()[0] < 240 && !is_cgnat_range(ip)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn validate_lan_address(address: &str) -> Result<Ipv4Addr> {
|
||||||
|
address.parse::<Ipv4Addr>().ok().filter(|ip| is_lan_address(*ip))
|
||||||
|
.ok_or_else(|| Error::Invalid("Invalid IPv4 address for local network.".into()))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// An absent/disconnected manual address is intentional: never fall back to another adapter.
|
||||||
|
pub fn resolve_lan_host(manual: Option<&str>, automatic: Option<Ipv4Addr>) -> Result<String> {
|
||||||
|
match manual {
|
||||||
|
Some(address) => validate_lan_address(address).map(|ip| ip.to_string()),
|
||||||
|
None => automatic.filter(|ip| is_lan_address(*ip)).map(|ip| ip.to_string())
|
||||||
|
.ok_or_else(|| Error::Invalid("This computer has no usable local network address.".into())),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn lan_candidates(rows: impl IntoIterator<Item = (String, Ipv4Addr)>, automatic: Option<Ipv4Addr>) -> Vec<LanAddress> {
|
||||||
|
let mut rows: Vec<_> = rows.into_iter().filter(|(_, ip)| is_lan_address(*ip)).collect();
|
||||||
|
rows.sort_by(|a, b| a.0.cmp(&b.0).then(a.1.cmp(&b.1)));
|
||||||
|
let mut seen = std::collections::HashSet::new();
|
||||||
|
rows.into_iter().filter(|(_, ip)| seen.insert(*ip)).map(|(interface, ip)| LanAddress {
|
||||||
|
interface, address: ip.to_string(), is_default: Some(ip) == automatic,
|
||||||
|
}).collect()
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Native OS enumeration (GetAdaptersAddresses on Windows, getifaddrs on Unix).
|
||||||
|
pub fn lan_addresses(automatic: Option<Ipv4Addr>) -> Result<Vec<LanAddress>> {
|
||||||
|
let interfaces = if_addrs::get_if_addrs()?;
|
||||||
|
Ok(lan_candidates(interfaces.into_iter().filter(|i| i.is_oper_up()).filter_map(|i| {
|
||||||
|
match i.ip() { IpAddr::V4(ip) => Some((i.name, ip)), _ => None }
|
||||||
|
}), automatic))
|
||||||
|
}
|
||||||
|
|
||||||
pub fn is_private(ip: Ipv4Addr) -> bool {
|
pub fn is_private(ip: Ipv4Addr) -> bool {
|
||||||
ip.is_private() || ip.is_loopback() || ip.is_link_local()
|
ip.is_private() || ip.is_loopback() || ip.is_link_local()
|
||||||
}
|
}
|
||||||
@@ -132,6 +177,42 @@ mod tests {
|
|||||||
s.parse().unwrap()
|
s.parse().unwrap()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn lan_validation_and_resolution_never_replace_manual_addresses() {
|
||||||
|
for good in ["192.168.1.20", "10.0.0.5", "172.16.2.4"] {
|
||||||
|
assert!(validate_lan_address(good).is_ok());
|
||||||
|
}
|
||||||
|
for bad in ["abc", "999.1.1.1", "0.0.0.0", "0.1.2.3", "127.0.0.1", "127.9.1.2", "169.254.10.20", "100.101.20.5", "224.0.0.1", "255.255.255.255", "240.0.0.1", "192.168.1.1'; DROP TABLE realmlist"] {
|
||||||
|
assert!(validate_lan_address(bad).is_err(), "{bad}");
|
||||||
|
}
|
||||||
|
let automatic = Some(ip("192.168.0.169"));
|
||||||
|
assert_eq!(resolve_lan_host(None, automatic).unwrap(), "192.168.0.169");
|
||||||
|
assert_eq!(resolve_lan_host(Some("192.168.1.50"), automatic).unwrap(), "192.168.1.50");
|
||||||
|
assert_eq!(resolve_lan_host(Some("192.168.1.50"), None).unwrap(), "192.168.1.50");
|
||||||
|
assert!(resolve_lan_host(Some("invalid"), automatic).is_err());
|
||||||
|
assert!(resolve_lan_host(None, None).is_err());
|
||||||
|
assert!(resolve_lan_host(None, Some(ip("169.254.1.2"))).is_err());
|
||||||
|
assert!(resolve_lan_host(None, Some(ip("100.100.1.2"))).is_err());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn candidates_are_filtered_deduplicated_deterministic_and_default_marked() {
|
||||||
|
let rows = vec![
|
||||||
|
("Wi-Fi", "192.168.0.25"), ("Ethernet 2", "192.168.1.50"),
|
||||||
|
("Ethernet", "192.168.0.169"), ("Duplicate", "192.168.1.50"),
|
||||||
|
("Loopback", "127.0.0.2"), ("APIPA", "169.254.1.2"),
|
||||||
|
("Tailscale", "100.101.20.5"), ("Empty", "0.0.0.0"),
|
||||||
|
("Hyper-V Virtual", "10.0.0.5"),
|
||||||
|
];
|
||||||
|
let make = |rows: Vec<(&str, &str)>| lan_candidates(rows.into_iter().map(|(name, address)| (name.into(), ip(address))), Some(ip("192.168.0.169")));
|
||||||
|
let result = make(rows.clone());
|
||||||
|
assert_eq!(result.len(), 4);
|
||||||
|
assert_eq!(result.iter().filter(|a| a.is_default).count(), 1);
|
||||||
|
assert!(result.iter().any(|a| a.interface == "Hyper-V Virtual"));
|
||||||
|
assert!(result.iter().any(|a| a.is_default && a.address == "192.168.0.169"));
|
||||||
|
assert_eq!(result, make(rows.into_iter().rev().collect()));
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn address_classes() {
|
fn address_classes() {
|
||||||
assert!(is_private(ip("192.168.1.5")) && is_private(ip("10.0.0.2")) && is_private(ip("172.16.4.4")) && is_private(ip("127.0.0.1")));
|
assert!(is_private(ip("192.168.1.5")) && is_private(ip("10.0.0.2")) && is_private(ip("172.16.4.4")) && is_private(ip("127.0.0.1")));
|
||||||
|
|||||||
@@ -21,6 +21,12 @@ pub const DEFAULT_PART_SIZE: u64 = 1_900_000_000;
|
|||||||
/// Archive path of the one-time database credentials shipped with a base package.
|
/// Archive path of the one-time database credentials shipped with a base package.
|
||||||
pub const BOOTSTRAP_CREDENTIALS: &str = "Settings/database.bootstrap.json";
|
pub const BOOTSTRAP_CREDENTIALS: &str = "Settings/database.bootstrap.json";
|
||||||
|
|
||||||
|
/// Folder of a Linux (Docker) package that holds the starting databases: `<kind>.sql.zst` for `auth`, `characters`
|
||||||
|
/// and `world`, in the format of the Manager's own backups. They hold the state in which every migration of the package is
|
||||||
|
/// already applied (a world database cannot be rebuilt from the repository's SQL files: some migrations are guarded and
|
||||||
|
/// only apply to the maintainers' own database).
|
||||||
|
pub const BASELINE_DIR: &str = "Database/baseline";
|
||||||
|
|
||||||
/// Files that never belong in a shipped package: per-install state, logs, secrets, old binaries.
|
/// Files that never belong in a shipped package: per-install state, logs, secrets, old binaries.
|
||||||
pub fn excluded(rel: &str) -> bool {
|
pub fn excluded(rel: &str) -> bool {
|
||||||
if rel.replace('\\', "/").to_lowercase().starts_with(".realms/") { return true; }
|
if rel.replace('\\', "/").to_lowercase().starts_with(".realms/") { return true; }
|
||||||
@@ -41,7 +47,7 @@ pub fn excluded(rel: &str) -> bool {
|
|||||||
|| l == "mysql/my.ini"
|
|| l == "mysql/my.ini"
|
||||||
|| l == "mysql/mysql.pid"
|
|| l == "mysql/mysql.pid"
|
||||||
|| l == "mysql/data.7z"
|
|| l == "mysql/data.7z"
|
||||||
|| l.starts_with("core/configs/") && !l.ends_with(".dist") // generated at first start from Settings templates
|
|| l.starts_with("core/configs/") && !l.ends_with(".dist") && l != "core/configs/modules/playerbots.conf.settings.json" // generated at first start from Settings templates
|
||||||
|| name.ends_with(".pdb")
|
|| name.ends_with(".pdb")
|
||||||
|| name.ends_with(".bak")
|
|| name.ends_with(".bak")
|
||||||
|| name.ends_with(".log")
|
|| name.ends_with(".log")
|
||||||
@@ -56,7 +62,7 @@ fn policy_for(rel: &str) -> (Owner, ReplacePolicy) {
|
|||||||
let l = rel.to_lowercase();
|
let l = rel.to_lowercase();
|
||||||
if l.starts_with("_migrations/") {
|
if l.starts_with("_migrations/") {
|
||||||
(Owner::Core, ReplacePolicy::NeverTouch) // staged for the migration runner, never copied into the server
|
(Owner::Core, ReplacePolicy::NeverTouch) // staged for the migration runner, never copied into the server
|
||||||
} else if l.ends_with(".dist") {
|
} else if l.ends_with(".dist") || l == "core/configs/modules/playerbots.conf.settings.json" {
|
||||||
(Owner::Core, ReplacePolicy::Replace)
|
(Owner::Core, ReplacePolicy::Replace)
|
||||||
} else if l.starts_with("mysql/data/") {
|
} else if l.starts_with("mysql/data/") {
|
||||||
(Owner::User, ReplacePolicy::NeverTouch)
|
(Owner::User, ReplacePolicy::NeverTouch)
|
||||||
@@ -257,6 +263,11 @@ impl Read for PartsReader {
|
|||||||
/// Unpack verified `parts_dir` into `dest` (an empty or new staging folder). Every file must be listed in the
|
/// Unpack verified `parts_dir` into `dest` (an empty or new staging folder). Every file must be listed in the
|
||||||
/// manifest with the recorded size and hash; anything else aborts the extraction.
|
/// manifest with the recorded size and hash; anything else aborts the extraction.
|
||||||
pub fn extract(parts_dir: &Path, manifest: &Manifest, dest: &Path, progress: &dyn Fn(u64, u64)) -> Result<()> {
|
pub fn extract(parts_dir: &Path, manifest: &Manifest, dest: &Path, progress: &dyn Fn(u64, u64)) -> Result<()> {
|
||||||
|
extract_selected(parts_dir, manifest, dest, &|_| true, progress)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Verify the entire archive, writing only selected files for a disposable release-schema fixture.
|
||||||
|
pub fn extract_selected(parts_dir: &Path, manifest: &Manifest, dest: &Path, select: &dyn Fn(&str) -> bool, progress: &dyn Fn(u64, u64)) -> Result<()> {
|
||||||
let archive = manifest.archive.as_ref().ok_or_else(|| Error::InvalidManifest("manifest has no archive".into()))?;
|
let archive = manifest.archive.as_ref().ok_or_else(|| Error::InvalidManifest("manifest has no archive".into()))?;
|
||||||
let mut paths = Vec::new();
|
let mut paths = Vec::new();
|
||||||
for part in &archive.parts {
|
for part in &archive.parts {
|
||||||
@@ -271,7 +282,8 @@ pub fn extract(parts_dir: &Path, manifest: &Manifest, dest: &Path, progress: &dy
|
|||||||
}
|
}
|
||||||
paths.push(p);
|
paths.push(p);
|
||||||
}
|
}
|
||||||
fsx::require_space(dest, archive.unpacked_size)?;
|
let selected_size = manifest.files.iter().filter(|f| select(&f.path)).map(|f| f.size).sum();
|
||||||
|
fsx::require_space(dest, selected_size)?;
|
||||||
fs::create_dir_all(dest)?;
|
fs::create_dir_all(dest)?;
|
||||||
|
|
||||||
let expected: HashMap<String, &FileEntry> = manifest.files.iter().map(|f| (f.path.replace('\\', "/").to_lowercase(), f)).collect();
|
let expected: HashMap<String, &FileEntry> = manifest.files.iter().map(|f| (f.path.replace('\\', "/").to_lowercase(), f)).collect();
|
||||||
@@ -294,8 +306,11 @@ pub fn extract(parts_dir: &Path, manifest: &Manifest, dest: &Path, progress: &dy
|
|||||||
return Err(Error::PathRejected(format!("{rel}: appears twice in the archive")));
|
return Err(Error::PathRejected(format!("{rel}: appears twice in the archive")));
|
||||||
}
|
}
|
||||||
let target = fsx::safe_join(dest, &want.path)?;
|
let target = fsx::safe_join(dest, &want.path)?;
|
||||||
fs::create_dir_all(target.parent().unwrap())?;
|
let selected = select(&want.path);
|
||||||
let mut out = BufWriter::new(File::create(&target)?);
|
let mut out = if selected {
|
||||||
|
fs::create_dir_all(target.parent().unwrap())?;
|
||||||
|
Some(BufWriter::new(File::create(&target)?))
|
||||||
|
} else { None };
|
||||||
let mut hasher = Sha256::new();
|
let mut hasher = Sha256::new();
|
||||||
let mut buf = vec![0u8; 1 << 20];
|
let mut buf = vec![0u8; 1 << 20];
|
||||||
let mut size = 0u64;
|
let mut size = 0u64;
|
||||||
@@ -313,9 +328,9 @@ pub fn extract(parts_dir: &Path, manifest: &Manifest, dest: &Path, progress: &dy
|
|||||||
return Err(Error::HashMismatch { path: rel, expected: format!("{} bytes", want.size), actual: "more".into() });
|
return Err(Error::HashMismatch { path: rel, expected: format!("{} bytes", want.size), actual: "more".into() });
|
||||||
}
|
}
|
||||||
hasher.update(&buf[..n]);
|
hasher.update(&buf[..n]);
|
||||||
out.write_all(&buf[..n])?;
|
if let Some(out) = out.as_mut() { out.write_all(&buf[..n])?; }
|
||||||
}
|
}
|
||||||
out.flush()?;
|
if let Some(out) = out.as_mut() { out.flush()?; }
|
||||||
let actual = hex::encode(hasher.finalize());
|
let actual = hex::encode(hasher.finalize());
|
||||||
if size != want.size || !actual.eq_ignore_ascii_case(&want.sha256) {
|
if size != want.size || !actual.eq_ignore_ascii_case(&want.sha256) {
|
||||||
return Err(Error::HashMismatch { path: rel, expected: want.sha256.clone(), actual });
|
return Err(Error::HashMismatch { path: rel, expected: want.sha256.clone(), actual });
|
||||||
@@ -323,7 +338,7 @@ pub fn extract(parts_dir: &Path, manifest: &Manifest, dest: &Path, progress: &dy
|
|||||||
// The archive does not carry per-file modes, so a Linux binary or script would be extracted unusable.
|
// The archive does not carry per-file modes, so a Linux binary or script would be extracted unusable.
|
||||||
// Recognise them by content (ELF header or `#!`); Windows has no execute bit and ignores this.
|
// Recognise them by content (ELF header or `#!`); Windows has no execute bit and ignores this.
|
||||||
#[cfg(unix)]
|
#[cfg(unix)]
|
||||||
if head.starts_with(b"\x7fELF") || head.starts_with(b"#!") {
|
if selected && (head.starts_with(b"\x7fELF") || head.starts_with(b"#!")) {
|
||||||
use std::os::unix::fs::PermissionsExt;
|
use std::os::unix::fs::PermissionsExt;
|
||||||
fs::set_permissions(&target, fs::Permissions::from_mode(0o755))?;
|
fs::set_permissions(&target, fs::Permissions::from_mode(0o755))?;
|
||||||
}
|
}
|
||||||
@@ -361,6 +376,20 @@ mod tests {
|
|||||||
v
|
v
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn upstream_settings_metadata_ships_and_updates_but_active_configs_stay_private() {
|
||||||
|
let d = tempfile::tempdir().unwrap();
|
||||||
|
let src = d.path().join("src");
|
||||||
|
fs::create_dir_all(src.join("Core/configs/modules")).unwrap();
|
||||||
|
fs::write(src.join("Core/configs/modules/playerbots.conf.settings.json"), "{}\n").unwrap();
|
||||||
|
fs::write(src.join("Core/configs/modules/playerbots.conf"), "PlayerbotsDatabaseInfo = private\n").unwrap();
|
||||||
|
let out = d.path().join("package");
|
||||||
|
let manifest = build(&src, &out, &BuildOptions { kind: Kind::Update, version: "1.0.0".into(), core_commit: None, built_at: "test".into(), part_size: 1 << 20, bots_commit: None, migrations: vec![] }, &|_| {}).unwrap();
|
||||||
|
assert_eq!(manifest.files.len(), 1);
|
||||||
|
assert_eq!(manifest.files[0].path, "Core/configs/modules/playerbots.conf.settings.json");
|
||||||
|
assert_eq!(manifest.files[0].policy, ReplacePolicy::Replace);
|
||||||
|
}
|
||||||
|
|
||||||
fn source() -> (tempfile::TempDir, PathBuf) {
|
fn source() -> (tempfile::TempDir, PathBuf) {
|
||||||
let d = tempfile::tempdir().unwrap();
|
let d = tempfile::tempdir().unwrap();
|
||||||
let src = d.path().join("src");
|
let src = d.path().join("src");
|
||||||
@@ -410,6 +439,19 @@ mod tests {
|
|||||||
assert_eq!(mode("Core/configs/worldserver.conf.dist"), 0, "plain files stay non-executable");
|
assert_eq!(mode("Core/configs/worldserver.conf.dist"), 0, "plain files stay non-executable");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn selective_extraction_still_validates_unselected_files() {
|
||||||
|
let (d, src) = source();
|
||||||
|
let out = d.path().join("out");
|
||||||
|
let mut manifest = build(&src, &out, &opts(64 * 1024), &|_| {}).unwrap();
|
||||||
|
let dest = d.path().join("selected");
|
||||||
|
extract_selected(&out, &manifest, &dest, &|p| p.starts_with("Core/"), &|_, _| {}).unwrap();
|
||||||
|
assert!(dest.join("Core/worldserver.exe").exists());
|
||||||
|
assert!(!dest.join("Data").exists());
|
||||||
|
manifest.files.iter_mut().find(|f| f.path.starts_with("Data/")).unwrap().sha256 = "f".repeat(64);
|
||||||
|
assert!(matches!(extract_selected(&out, &manifest, &d.path().join("bad"), &|_| false, &|_, _| {}), Err(Error::HashMismatch { .. })));
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn build_split_extract_roundtrip_excludes_noise_and_secrets() {
|
fn build_split_extract_roundtrip_excludes_noise_and_secrets() {
|
||||||
let (d, src) = source();
|
let (d, src) = source();
|
||||||
|
|||||||
@@ -250,6 +250,19 @@ pub fn is_alive(record: &ProcessIdentity) -> bool {
|
|||||||
identity(record.pid).map(|cur| cur.same_as(record)).unwrap_or(false)
|
identity(record.pid).map(|cur| cur.same_as(record)).unwrap_or(false)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Every running process whose image file is named one of `names` (compared without case), wherever it lives. Only for
|
||||||
|
/// diagnostics: a process found this way is not trusted to belong to any installation.
|
||||||
|
pub fn find_by_file_names(names: &[&str]) -> Vec<ProcessIdentity> {
|
||||||
|
sys::all_pids()
|
||||||
|
.into_iter()
|
||||||
|
.filter_map(identity)
|
||||||
|
.filter(|p| {
|
||||||
|
let file = p.exe.rsplit(['\\', '/']).next().unwrap_or("");
|
||||||
|
names.iter().any(|n| file.eq_ignore_ascii_case(n))
|
||||||
|
})
|
||||||
|
.collect()
|
||||||
|
}
|
||||||
|
|
||||||
/// Every running process whose image is exactly `exe`.
|
/// Every running process whose image is exactly `exe`.
|
||||||
pub fn find_by_exe(exe: &Path) -> Vec<ProcessIdentity> {
|
pub fn find_by_exe(exe: &Path) -> Vec<ProcessIdentity> {
|
||||||
let want = exe.to_string_lossy().to_lowercase().replace('/', "\\");
|
let want = exe.to_string_lossy().to_lowercase().replace('/', "\\");
|
||||||
|
|||||||
@@ -179,13 +179,13 @@ fn create_databases(root: &Path) -> Result<()> {
|
|||||||
return Err(Error::Invalid("Realm creation does not support databases with routines, triggers or views.".into()));
|
return Err(Error::Invalid("Realm creation does not support databases with routines, triggers or views.".into()));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
for (schema, tables) in [
|
for (kind, tables) in crate::schema_check::WILDCARD_TABLES {
|
||||||
("acore_world", &["ascension_wildcard_boss_marks", "ascension_wildcard_tooltip_links"][..]),
|
let schema = crate::db::schema_of(kind)?;
|
||||||
("acore_characters", &["coa_wildcard_skill_card", "coa_wildcard_skill_card_pending", "coa_wildcard_skill_card_account", "coa_wildcard_skill_card_purchase", "coa_wildcard_specialization_cache"][..]),
|
|
||||||
] {
|
|
||||||
let present = db.tables(schema)?;
|
let present = db.tables(schema)?;
|
||||||
if tables.iter().any(|table| !present.iter().any(|p| p == table)) {
|
let missing: Vec<_> = tables.iter().filter(|table| !present.iter().any(|p| p == **table)).copied().collect();
|
||||||
return Err(Error::Invalid("Wildcard database migrations are missing. Update the server database before creating this realm.".into()));
|
if !missing.is_empty() {
|
||||||
|
tracing::error!(root = %root.display(), database = schema, missing_tables = ?missing, "Wildcard realm creation blocked by missing database tables");
|
||||||
|
return Err(Error::Invalid(format!("Cannot create Wildcard: {schema} is missing tables: {}. Run Check files and database and include its report when requesting support.", missing.join(", "))));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
let cache = root.join("Settings/realm-profiles/staging");
|
let cache = root.join("Settings/realm-profiles/staging");
|
||||||
@@ -226,6 +226,9 @@ fn create_databases(root: &Path) -> Result<()> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub fn select(root: &Path, mode: Mode) -> Result<View> {
|
pub fn select(root: &Path, mode: Mode) -> Result<View> {
|
||||||
|
let meta = crate::registry::metadata_dir_for(root)?;
|
||||||
|
let _update_lock = crate::update::operation_lock(&meta)?;
|
||||||
|
crate::update::ensure_recovered(&meta)?;
|
||||||
require_world_stopped(root)?;
|
require_world_stopped(root)?;
|
||||||
recover(root)?;
|
recover(root)?;
|
||||||
let mut s = state(root)?;
|
let mut s = state(root)?;
|
||||||
@@ -247,7 +250,9 @@ pub fn select(root: &Path, mode: Mode) -> Result<View> {
|
|||||||
// The launcher and batch files share this lock; recheck after the potentially long database copy.
|
// The launcher and batch files share this lock; recheck after the potentially long database copy.
|
||||||
fs::create_dir_all(root.join(".state"))?;
|
fs::create_dir_all(root.join(".state"))?;
|
||||||
let lock = fs::OpenOptions::new().read(true).write(true).create(true).truncate(false).open(root.join(".state/control.lock"))?;
|
let lock = fs::OpenOptions::new().read(true).write(true).create(true).truncate(false).open(root.join(".state/control.lock"))?;
|
||||||
fs4::fs_std::FileExt::try_lock_exclusive(&lock).map_err(|_| Error::Invalid("Another start/stop action is in progress.".into()))?;
|
if !fs4::fs_std::FileExt::try_lock_exclusive(&lock)? {
|
||||||
|
return Err(Error::Invalid("Another start/stop action is in progress.".into()));
|
||||||
|
}
|
||||||
require_world_stopped(root)?;
|
require_world_stopped(root)?;
|
||||||
let original = state(root)?;
|
let original = state(root)?;
|
||||||
fsx::atomic_write_json(&root.join(JOURNAL), &Journal { before: original, files: before })?;
|
fsx::atomic_write_json(&root.join(JOURNAL), &Journal { before: original, files: before })?;
|
||||||
@@ -282,25 +287,35 @@ pub fn prepare_launcher(root: &Path) -> Result<()> {
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const LAUNCHER_REALM_REPLACEMENTS: &[(&str, &str)] = &[
|
||||||
|
("(\"WorldDatabaseInfo\", \"acore_world\")", "(\"WorldDatabaseInfo\", \"acore_world_wildcard\" if coa_realm() == 'wildcard' else \"acore_world\")"),
|
||||||
|
("(\"CharacterDatabaseInfo\", \"acore_characters\")", "(\"CharacterDatabaseInfo\", \"acore_characters_wildcard\" if coa_realm() == 'wildcard' else \"acore_characters\")"),
|
||||||
|
("SET name='AzerothCore',address=", "SET name='{coa_realm_name()}',address="),
|
||||||
|
("WHERE id=1;", "WHERE id={coa_realm_id()};"),
|
||||||
|
("mysql(\"UPDATE acore_auth.realmlist SET flag=0", "mysql(f\"UPDATE acore_auth.realmlist SET flag=0"),
|
||||||
|
];
|
||||||
|
|
||||||
|
const LAUNCHER_REALM_INSERT: &str = "# coa-manager-realm-profiles-v1\ndef coa_realm():\n path = ROOT / 'Settings/realm-profile.json'\n return json.loads(path.read_text(encoding='utf-8')).get('active', 'coa') if path.exists() else 'coa'\n\ndef coa_realm_id():\n return 2 if coa_realm() == 'wildcard' else 1\n\ndef coa_realm_name():\n return 'Wildcard' if coa_realm() == 'wildcard' else 'Conquest of Azeroth'\n\n";
|
||||||
|
|
||||||
pub(crate) fn patch_launcher(source: &str) -> Result<String> {
|
pub(crate) fn patch_launcher(source: &str) -> Result<String> {
|
||||||
if source.contains("# coa-manager-realm-profiles-v1") { return Ok(source.into()); }
|
if source.contains("# coa-manager-realm-profiles-v1") { return Ok(source.into()); }
|
||||||
let replacements = [
|
|
||||||
("(\"WorldDatabaseInfo\", \"acore_world\")", "(\"WorldDatabaseInfo\", \"acore_world_wildcard\" if coa_realm() == 'wildcard' else \"acore_world\")"),
|
|
||||||
("(\"CharacterDatabaseInfo\", \"acore_characters\")", "(\"CharacterDatabaseInfo\", \"acore_characters_wildcard\" if coa_realm() == 'wildcard' else \"acore_characters\")"),
|
|
||||||
("SET name='AzerothCore',address=", "SET name='{coa_realm_name()}',address="),
|
|
||||||
("WHERE id=1;", "WHERE id={coa_realm_id()};"),
|
|
||||||
("mysql(\"UPDATE acore_auth.realmlist SET flag=0", "mysql(f\"UPDATE acore_auth.realmlist SET flag=0"),
|
|
||||||
];
|
|
||||||
let mut out = source.to_string();
|
let mut out = source.to_string();
|
||||||
for (from, to) in replacements {
|
for &(from, to) in LAUNCHER_REALM_REPLACEMENTS {
|
||||||
if !out.contains(from) { return Err(Error::Invalid("This launcher does not support realm profiles. Update the server package first.".into())); }
|
if !out.contains(from) { return Err(Error::Invalid("This launcher does not support realm profiles. Update the server package first.".into())); }
|
||||||
out = out.replace(from, to);
|
out = out.replace(from, to);
|
||||||
}
|
}
|
||||||
let insert = "# coa-manager-realm-profiles-v1\ndef coa_realm():\n path = ROOT / 'Settings/realm-profile.json'\n return json.loads(path.read_text(encoding='utf-8')).get('active', 'coa') if path.exists() else 'coa'\n\ndef coa_realm_id():\n return 2 if coa_realm() == 'wildcard' else 1\n\ndef coa_realm_name():\n return 'Wildcard' if coa_realm() == 'wildcard' else 'Conquest of Azeroth'\n\n";
|
|
||||||
// Insert before the entry point so ROOT, json and functions are all defined when called.
|
// Insert before the entry point so ROOT, json and functions are all defined when called.
|
||||||
let marker = "if __name__ == \"__main__\":";
|
let marker = "if __name__ == \"__main__\":";
|
||||||
if !out.contains(marker) { return Err(Error::Invalid("Unrecognised server launcher entry point.".into())); }
|
if !out.contains(marker) { return Err(Error::Invalid("Unrecognised server launcher entry point.".into())); }
|
||||||
Ok(out.replace(marker, &format!("{insert}{marker}")))
|
Ok(out.replace(marker, &format!("{LAUNCHER_REALM_INSERT}{marker}")))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Reverse only our exact realm transformation; callers must verify the recovered original hash.
|
||||||
|
pub(crate) fn unpatch_launcher(source: &str) -> Option<String> {
|
||||||
|
if !source.contains(LAUNCHER_REALM_INSERT) { return None; }
|
||||||
|
let mut original = source.replacen(LAUNCHER_REALM_INSERT, "", 1);
|
||||||
|
for &(from, to) in LAUNCHER_REALM_REPLACEMENTS { original = original.replace(to, from); }
|
||||||
|
patch_launcher(&original).ok().filter(|patched| patched == source).map(|_| original)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn before_start(root: &Path) -> Result<()> {
|
pub fn before_start(root: &Path) -> Result<()> {
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ use crate::fsx;
|
|||||||
|
|
||||||
pub const META_SCHEMA: u32 = 1;
|
pub const META_SCHEMA: u32 = 1;
|
||||||
pub const LAYOUT_REPACK_V1: &str = "repack-v1";
|
pub const LAYOUT_REPACK_V1: &str = "repack-v1";
|
||||||
|
pub const LAYOUT_DOCKER_V1: &str = "docker-v1";
|
||||||
const META_SUBDIRS: [&str; 6] = ["manifests", "backups", "migrations", "logs", "cache", "staging"];
|
const META_SUBDIRS: [&str; 6] = ["manifests", "backups", "migrations", "logs", "cache", "staging"];
|
||||||
|
|
||||||
#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
|
#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
|
|||||||
@@ -87,6 +87,21 @@ pub fn collect_core_sql(core: &Path) -> Result<Vec<SqlFile>> {
|
|||||||
Ok(out)
|
Ok(out)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Dump the three game databases of `server` (a repack or a Docker server, started if needed) into `out` as the starting
|
||||||
|
/// databases of a Linux package: `<kind>.sql.zst`. The databases must be in the state in which every migration of the
|
||||||
|
/// package is applied. Returns (kind, compressed bytes) per database.
|
||||||
|
pub fn export_baseline(server: &Path, out: &Path) -> Result<Vec<(String, u64)>> {
|
||||||
|
fs::create_dir_all(out)?;
|
||||||
|
crate::backup::with_database(server, |db| {
|
||||||
|
let mut done = Vec::new();
|
||||||
|
for (kind, schema) in crate::db::SCHEMAS {
|
||||||
|
let (bytes, _) = db.dump_to(schema, &out.join(format!("{kind}.sql.zst")))?;
|
||||||
|
done.push((kind.to_string(), bytes));
|
||||||
|
}
|
||||||
|
Ok(done)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
/// SQL a bots module checkout ships for the characters database (its `dist/sql`).
|
/// SQL a bots module checkout ships for the characters database (its `dist/sql`).
|
||||||
pub fn collect_bots_sql(bots: &Path) -> Result<Vec<SqlFile>> {
|
pub fn collect_bots_sql(bots: &Path) -> Result<Vec<SqlFile>> {
|
||||||
let mut out = Vec::new();
|
let mut out = Vec::new();
|
||||||
@@ -98,7 +113,7 @@ pub fn collect_bots_sql(bots: &Path) -> Result<Vec<SqlFile>> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn to_migrations(files: &[SqlFile]) -> Vec<Migration> {
|
fn to_migrations(files: &[SqlFile]) -> Vec<Migration> {
|
||||||
files.iter().map(|f| Migration { id: f.id.clone(), db: f.db.clone(), sha256: f.sha256.clone(), destructive: false }).collect()
|
files.iter().map(|f| Migration { compatible_sha256: vec![], id: f.id.clone(), db: f.db.clone(), sha256: f.sha256.clone(), destructive: false }).collect()
|
||||||
}
|
}
|
||||||
|
|
||||||
pub struct UpdateParams<'a> {
|
pub struct UpdateParams<'a> {
|
||||||
@@ -139,7 +154,7 @@ pub fn pack_update(p: &UpdateParams, progress: &dyn Fn(&str)) -> Result<Manifest
|
|||||||
let mut changed = 0;
|
let mut changed = 0;
|
||||||
for rel in &rels {
|
for rel in &rels {
|
||||||
let src = fsx::safe_join(p.tree, rel)?;
|
let src = fsx::safe_join(p.tree, rel)?;
|
||||||
if base.get(&rel.to_lowercase()).map(|h| h.eq_ignore_ascii_case(&fsx::sha256_file(&src).unwrap_or_default())).unwrap_or(false) {
|
if rel != crate::schema_check::CONTRACT && base.get(&rel.to_lowercase()).map(|h| h.eq_ignore_ascii_case(&fsx::sha256_file(&src).unwrap_or_default())).unwrap_or(false) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
let dst = fsx::safe_join(&work, rel)?;
|
let dst = fsx::safe_join(&work, rel)?;
|
||||||
@@ -219,10 +234,12 @@ mod tests {
|
|||||||
let (base_src, base_out, tree, upd_out, sqldir) = (d.path().join("bs"), d.path().join("bo"), d.path().join("tree"), d.path().join("uo"), d.path().join("sql"));
|
let (base_src, base_out, tree, upd_out, sqldir) = (d.path().join("bs"), d.path().join("bo"), d.path().join("tree"), d.path().join("uo"), d.path().join("sql"));
|
||||||
write(&base_src, "Core/worldserver.exe", "v1");
|
write(&base_src, "Core/worldserver.exe", "v1");
|
||||||
write(&base_src, "Core/authserver.exe", "same");
|
write(&base_src, "Core/authserver.exe", "same");
|
||||||
|
write(&base_src, crate::schema_check::CONTRACT, "same contract");
|
||||||
let base = package::build(&base_src, &base_out, &BuildOptions { kind: Kind::Base, version: "1.0.0".into(), core_commit: None, built_at: "x".into(), part_size: 1 << 20, bots_commit: None, migrations: vec![] }, &|_| {}).unwrap();
|
let base = package::build(&base_src, &base_out, &BuildOptions { kind: Kind::Base, version: "1.0.0".into(), core_commit: None, built_at: "x".into(), part_size: 1 << 20, bots_commit: None, migrations: vec![] }, &|_| {}).unwrap();
|
||||||
write(&tree, "Core/worldserver.exe", "v2");
|
write(&tree, "Core/worldserver.exe", "v2");
|
||||||
write(&tree, "Core/authserver.exe", "same");
|
write(&tree, "Core/authserver.exe", "same");
|
||||||
write(&tree, "Core/newlib.dll", "n");
|
write(&tree, "Core/newlib.dll", "n");
|
||||||
|
write(&tree, crate::schema_check::CONTRACT, "same contract");
|
||||||
write(&sqldir, "world.sql", "SELECT 1;");
|
write(&sqldir, "world.sql", "SELECT 1;");
|
||||||
let sql = vec![SqlFile { db: "world".into(), id: "m1".into(), origin: "x".into(), abs: sqldir.join("world.sql"), sha256: fsx::sha256_file(&sqldir.join("world.sql")).unwrap() }];
|
let sql = vec![SqlFile { db: "world".into(), id: "m1".into(), origin: "x".into(), abs: sqldir.join("world.sql"), sha256: fsx::sha256_file(&sqldir.join("world.sql")).unwrap() }];
|
||||||
let m = pack_update(&UpdateParams { tree: &tree, base_manifest: &base, sql: &sql, out: &upd_out, version: "1.1.0".into(), core_commit: Some("a".repeat(40)), bots_commit: Some("b".repeat(40)), part_size: 1 << 20 }, &|_| {}).unwrap();
|
let m = pack_update(&UpdateParams { tree: &tree, base_manifest: &base, sql: &sql, out: &upd_out, version: "1.1.0".into(), core_commit: Some("a".repeat(40)), bots_commit: Some("b".repeat(40)), part_size: 1 << 20 }, &|_| {}).unwrap();
|
||||||
@@ -230,6 +247,7 @@ mod tests {
|
|||||||
assert!(paths.contains(&"Core/worldserver.exe") && paths.contains(&"Core/newlib.dll"));
|
assert!(paths.contains(&"Core/worldserver.exe") && paths.contains(&"Core/newlib.dll"));
|
||||||
assert!(!paths.contains(&"Core/authserver.exe"), "identical to the base: not shipped");
|
assert!(!paths.contains(&"Core/authserver.exe"), "identical to the base: not shipped");
|
||||||
assert!(paths.contains(&"_migrations/world/m1.sql"));
|
assert!(paths.contains(&"_migrations/world/m1.sql"));
|
||||||
|
assert!(paths.contains(&crate::schema_check::CONTRACT), "the contract ships even when identical to the base");
|
||||||
assert_eq!(m.kind, Kind::Update);
|
assert_eq!(m.kind, Kind::Update);
|
||||||
assert_eq!(m.migrations.len(), 1);
|
assert_eq!(m.migrations.len(), 1);
|
||||||
assert_eq!(m.bots.as_ref().and_then(|b| b.commit.clone()), Some("b".repeat(40)));
|
assert_eq!(m.bots.as_ref().and_then(|b| b.commit.clone()), Some("b".repeat(40)));
|
||||||
|
|||||||
@@ -0,0 +1,127 @@
|
|||||||
|
//! Database acceptance for release packages, using a freshly extracted signed base fixture.
|
||||||
|
use std::collections::HashSet;
|
||||||
|
use std::path::Path;
|
||||||
|
use crate::{backup, fsx, install, manifest::{Kind, Migration}, migrations, package, pkgsource, release::{self, SqlFile}, schema_check, Error, Result};
|
||||||
|
|
||||||
|
const MARKER: &str = ".release-schema-fixture";
|
||||||
|
|
||||||
|
pub fn collect(core: &Path, bots: Option<&Path>, repairs: Option<&Path>) -> Result<Vec<SqlFile>> {
|
||||||
|
let mut files = release::collect_core_sql(core)?;
|
||||||
|
if let Some(bots) = bots { files.extend(release::collect_bots_sql(bots)?); }
|
||||||
|
if let Some(repairs) = repairs {
|
||||||
|
for kind in ["auth", "characters", "world"] {
|
||||||
|
let dir = repairs.join(kind);
|
||||||
|
if !dir.exists() { continue; }
|
||||||
|
let mut paths: Vec<_> = std::fs::read_dir(&dir)?.map(|e| e.map(|e| e.path())).collect::<std::io::Result<_>>()?;
|
||||||
|
paths.sort();
|
||||||
|
for path in paths.into_iter().filter(|p| p.extension().is_some_and(|e| e == "sql")) {
|
||||||
|
let stem = path.file_stem().unwrap().to_string_lossy();
|
||||||
|
files.push(SqlFile { db: kind.into(), id: format!("manager_repair__{stem}"), origin: format!("{kind}/{stem}.sql"), sha256: fsx::sha256_file(&path)?, abs: path });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let mut seen = HashSet::new();
|
||||||
|
for file in &files {
|
||||||
|
if !seen.insert((&file.db, &file.id)) { return Err(Error::Invalid(format!("Duplicate release migration: {} / {}", file.db, file.id))); }
|
||||||
|
}
|
||||||
|
Ok(files)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn extract_base(source: &Path, fixture: &Path, trusted_key: &str) -> Result<()> {
|
||||||
|
if fixture.exists() || !fixture.file_name().is_some_and(|n| n.to_string_lossy().starts_with("coa-schema-fixture-")) {
|
||||||
|
return Err(Error::Invalid("Use a new coa-schema-fixture-* directory for release validation.".into()));
|
||||||
|
}
|
||||||
|
let (manifest, _) = pkgsource::fetch_manifest(&pkgsource::Source::Dir(source.into()), trusted_key)?;
|
||||||
|
if manifest.kind != Kind::Base { return Err(Error::Invalid("Release schema validation needs a signed base package.".into())); }
|
||||||
|
package::extract_selected(source, &manifest, fixture, &|path| {
|
||||||
|
let path = path.to_ascii_lowercase();
|
||||||
|
["mysql/", "settings/", "runtime/", "scripts/", "core/", "bugreport/"].iter().any(|prefix| path.starts_with(prefix))
|
||||||
|
}, &|_, _| {})?;
|
||||||
|
fsx::atomic_write(&fixture.join(MARKER), b"disposable release-schema fixture")?;
|
||||||
|
install::bootstrap_database(fixture)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn capture_release(fixture: &Path, tree: &Path, sql: &[SqlFile]) -> Result<()> {
|
||||||
|
if !fixture.file_name().is_some_and(|n| n.to_string_lossy().starts_with("coa-schema-fixture-"))
|
||||||
|
|| std::fs::read(fixture.join(MARKER)).ok().as_deref() != Some(b"disposable release-schema fixture") {
|
||||||
|
return Err(Error::Invalid("Refusing to apply release SQL to a non-fixture server.".into()));
|
||||||
|
}
|
||||||
|
let staging = tempfile::tempdir()?;
|
||||||
|
let migrations: Vec<_> = sql.iter().map(|f| Migration { compatible_sha256: vec![], db: f.db.clone(), id: f.id.clone(), sha256: f.sha256.clone(), destructive: false }).collect();
|
||||||
|
for file in sql {
|
||||||
|
let path = fsx::safe_join(staging.path(), &format!("{}/{}.sql", file.db, file.id))?;
|
||||||
|
fsx::atomic_write(&path, &std::fs::read(&file.abs)?)?;
|
||||||
|
}
|
||||||
|
install::with_scratch_ports(fixture, || backup::with_database(fixture, |db| {
|
||||||
|
let db = db.clone().for_realm(crate::realms::Mode::Coa);
|
||||||
|
let report = migrations::apply_pending(&db, &migrations, staging.path(), &|| Ok("disposable release fixture".into()))?;
|
||||||
|
if let Some((id, why)) = report.failed { return Err(Error::Invalid(format!("Release migration {id} failed: {why}"))); }
|
||||||
|
// Validate known critical feature effects before capturing; history may be stale in the base.
|
||||||
|
let previous = tree.join(schema_check::CONTRACT);
|
||||||
|
if previous.exists() { return Err(Error::Invalid("Release tree already contains a schema contract; generate it from a fresh tree.".into())); }
|
||||||
|
let problems = schema_check::check(&db, tree)?;
|
||||||
|
if let Some(p) = problems.first() { return Err(Error::Invalid(format!("Release database failed validation: {}.{}.{}: {}", p.database, p.table, p.column, p.detail))); }
|
||||||
|
schema_check::capture(&db, tree)?;
|
||||||
|
schema_check::require_release_contract(tree)?;
|
||||||
|
Ok(())
|
||||||
|
}))
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn verify_package(dir: &Path, trusted_key: &str) -> Result<()> {
|
||||||
|
let (manifest, _) = pkgsource::fetch_manifest(&pkgsource::Source::Dir(dir.into()), trusted_key)?;
|
||||||
|
if !manifest.files.iter().any(|f| f.path == schema_check::CONTRACT && f.size > 0) {
|
||||||
|
return Err(Error::Invalid("The release is missing its database schema contract.".into()));
|
||||||
|
}
|
||||||
|
let scratch = tempfile::tempdir()?;
|
||||||
|
package::extract_selected(dir, &manifest, scratch.path(), &|p| p == schema_check::CONTRACT, &|_, _| {})?;
|
||||||
|
schema_check::require_release_contract(scratch.path())?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
use base64::{engine::general_purpose::STANDARD, Engine};
|
||||||
|
use ed25519_dalek::{Signer, SigningKey};
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn signed_packages_must_carry_a_real_complete_schema_contract() {
|
||||||
|
let dir = tempfile::tempdir().unwrap();
|
||||||
|
let tree = dir.path().join("tree");
|
||||||
|
let out = dir.path().join("out");
|
||||||
|
fsx::atomic_write(&tree.join("Core/worldserver.exe"), b"fixture").unwrap();
|
||||||
|
let key = SigningKey::from_bytes(&[7; 32]);
|
||||||
|
let public = STANDARD.encode(key.verifying_key().as_bytes());
|
||||||
|
let opts = package::BuildOptions { kind: Kind::Update, version: "1.0.0".into(), core_commit: None, bots_commit: None, built_at: "test".into(), part_size: 1024 * 1024, migrations: vec![] };
|
||||||
|
let sign = || {
|
||||||
|
let bytes = std::fs::read(out.join("manifest.json")).unwrap();
|
||||||
|
fsx::atomic_write(&out.join("manifest.json.sig"), STANDARD.encode(key.sign(&bytes).to_bytes()).as_bytes()).unwrap();
|
||||||
|
};
|
||||||
|
package::build(&tree, &out, &opts, &|_| {}).unwrap(); sign();
|
||||||
|
assert!(verify_package(&out, &public).is_err());
|
||||||
|
fsx::atomic_write(&tree.join(schema_check::CONTRACT), br#"{"schema":1,"columns":{}}"#).unwrap();
|
||||||
|
package::build(&tree, &out, &opts, &|_| {}).unwrap(); sign();
|
||||||
|
assert!(verify_package(&out, &public).is_err());
|
||||||
|
fsx::atomic_write(&tree.join(schema_check::CONTRACT), br#"{"schema":1,"columns":{"auth":{"account":{"id":"int"}},"characters":{"characters":{"guid":"int"}},"world":{"creature":{"id":"int"}}}}"#).unwrap();
|
||||||
|
package::build(&tree, &out, &opts, &|_| {}).unwrap(); sign();
|
||||||
|
verify_package(&out, &public).unwrap();
|
||||||
|
}
|
||||||
|
#[test]
|
||||||
|
fn repair_sql_has_new_ids_and_runs_after_original_sql() {
|
||||||
|
let dir = tempfile::tempdir().unwrap();
|
||||||
|
let core = dir.path().join("core");
|
||||||
|
let repairs = dir.path().join("repairs");
|
||||||
|
fsx::atomic_write(&core.join("data/sql/updates/pending_db_characters/old.sql"), b"SELECT 1;").unwrap();
|
||||||
|
fsx::atomic_write(&repairs.join("characters/20261005_wildcard.sql"), b"SELECT 2;").unwrap();
|
||||||
|
let files = collect(&core, None, Some(&repairs)).unwrap();
|
||||||
|
assert_eq!(files.iter().map(|f| f.id.as_str()).collect::<Vec<_>>(), ["old", "manager_repair__20261005_wildcard"]);
|
||||||
|
assert_eq!(files[1].db, "characters");
|
||||||
|
}
|
||||||
|
#[test]
|
||||||
|
fn existing_server_cannot_be_used_for_schema_generation() {
|
||||||
|
let dir = tempfile::tempdir().unwrap();
|
||||||
|
assert!(extract_base(dir.path(), dir.path(), "irrelevant").is_err());
|
||||||
|
assert!(capture_release(dir.path(), dir.path(), &[]).is_err());
|
||||||
|
assert!(!dir.path().join(schema_check::CONTRACT).exists());
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,64 @@
|
|||||||
|
//! A player's client connection, independent of any local server installation.
|
||||||
|
use std::path::{Path, PathBuf};
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
use crate::{client, fsx, Error, Result};
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Default, Serialize, Deserialize)]
|
||||||
|
pub struct Profile {
|
||||||
|
pub host: String,
|
||||||
|
pub client_path: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn load(dir: &Path) -> Result<Profile> {
|
||||||
|
match std::fs::read(dir.join("connection.json")) {
|
||||||
|
Ok(bytes) => Ok(serde_json::from_slice(&bytes)?),
|
||||||
|
Err(e) if e.kind() == std::io::ErrorKind::NotFound => Ok(Profile::default()),
|
||||||
|
Err(e) => Err(e.into()),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn save(dir: &Path, profile: &Profile) -> Result<()> {
|
||||||
|
if !profile.host.is_empty() && !client::host_ok(&profile.host) {
|
||||||
|
return Err(Error::Invalid("Enter a server IP address or hostname, without a URL or port.".into()));
|
||||||
|
}
|
||||||
|
if let Some(path) = &profile.client_path {
|
||||||
|
let client = PathBuf::from(path);
|
||||||
|
if client::detect(&client, None).is_none() {
|
||||||
|
return Err(Error::Invalid("This folder does not look like a game client (it needs Data and the game executable).".into()));
|
||||||
|
}
|
||||||
|
if client::is_running(&client) {
|
||||||
|
return Err(Error::Invalid("Close the game before changing its connection.".into()));
|
||||||
|
}
|
||||||
|
if !profile.host.is_empty() { client::set_realmlist(&client, dir, &profile.host)?; }
|
||||||
|
}
|
||||||
|
fsx::atomic_write_json(&dir.join("connection.json"), profile)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
#[test]
|
||||||
|
fn connection_needs_no_server_and_survives_restart() {
|
||||||
|
let dir = tempfile::tempdir().unwrap();
|
||||||
|
let profile = Profile { host: "192.168.1.10".into(), client_path: None };
|
||||||
|
save(dir.path(), &profile).unwrap();
|
||||||
|
assert_eq!(load(dir.path()).unwrap().host, profile.host);
|
||||||
|
assert!(!dir.path().join("install.json").exists());
|
||||||
|
}
|
||||||
|
#[test]
|
||||||
|
fn linking_client_sets_host_without_touching_other_game_settings() {
|
||||||
|
let dir = tempfile::tempdir().unwrap();
|
||||||
|
let game = dir.path().join("game");
|
||||||
|
std::fs::create_dir_all(game.join("Data/enUS")).unwrap();
|
||||||
|
std::fs::write(game.join("Wow.exe"), b"fixture").unwrap();
|
||||||
|
std::fs::write(game.join("Data/enUS/realmlist.wtf"), "set realmlist 127.0.0.1\n").unwrap();
|
||||||
|
std::fs::create_dir_all(game.join("WTF")).unwrap();
|
||||||
|
std::fs::write(game.join("WTF/Config.wtf"), "SET realmName \"My realm\"\n").unwrap();
|
||||||
|
let profile = Profile { host: "192.168.1.10".into(), client_path: Some(game.to_string_lossy().into()) };
|
||||||
|
save(dir.path(), &profile).unwrap();
|
||||||
|
assert!(std::fs::read_to_string(game.join("Data/enUS/realmlist.wtf")).unwrap().contains(&profile.host));
|
||||||
|
assert_eq!(std::fs::read_to_string(game.join("WTF/Config.wtf")).unwrap(), "SET realmName \"My realm\"\n");
|
||||||
|
assert!(save(dir.path(), &Profile { host: "bad\nset realmlist other".into(), ..profile }).is_err());
|
||||||
|
assert_eq!(load(dir.path()).unwrap().host, "192.168.1.10");
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -90,9 +90,10 @@ fn restore_files(root: &Path, work: &Path, before: &Path, broken: &[(&FileEntry,
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub fn run(root: &Path, dir: &Path, base_source: &Source, update_source: &Source, key: &str, progress: &dyn Fn(&str, u8)) -> Result<Report> {
|
pub fn run(root: &Path, dir: &Path, base_source: &Source, update_source: &Source, key: &str, progress: &dyn Fn(&str, u8)) -> Result<Report> {
|
||||||
|
let _lock = crate::update::operation_lock(dir)?;
|
||||||
let env = RepackEnv { root, meta_dir: dir };
|
let env = RepackEnv { root, meta_dir: dir };
|
||||||
env.ensure_stopped()?;
|
env.ensure_stopped()?;
|
||||||
if crate::update::unfinished(dir).is_some() { return Err(Error::Invalid("Resolve the unfinished update before repairing the server.".into())); }
|
crate::update::ensure_recovered(dir)?;
|
||||||
let (_, mut meta) = MetaDir::open(dir)?;
|
let (_, mut meta) = MetaDir::open(dir)?;
|
||||||
progress("Checking signed packages", 2);
|
progress("Checking signed packages", 2);
|
||||||
let (update, _) = pkgsource::fetch_manifest(update_source, key)?;
|
let (update, _) = pkgsource::fetch_manifest(update_source, key)?;
|
||||||
@@ -128,6 +129,9 @@ pub fn run(root: &Path, dir: &Path, base_source: &Source, update_source: &Source
|
|||||||
}
|
}
|
||||||
progress("Backing up before repair", 65);
|
progress("Backing up before repair", 65);
|
||||||
let backup = crate::backup::create(root, dir, crate::backup::Kind::Full, crate::backup::Trigger::Manual, Some("before repair".into()), &|_| {})?.id;
|
let backup = crate::backup::create(root, dir, crate::backup::Kind::Full, crate::backup::Trigger::Manual, Some("before repair".into()), &|_| {})?.id;
|
||||||
|
env.verify_recovery_point(&crate::backup::get(dir, &backup)?)?;
|
||||||
|
let repair_files: Vec<_> = broken.iter().map(|(file, _)| (*file).clone()).collect();
|
||||||
|
let mut txn = crate::update::begin_repair(root, dir, &update.version, &backup, &repair_files)?;
|
||||||
let before = dir.join("repairs").join(&backup);
|
let before = dir.join("repairs").join(&backup);
|
||||||
fs::create_dir_all(&before)?;
|
fs::create_dir_all(&before)?;
|
||||||
fsx::require_space(root, broken.iter().map(|(e,_)| e.size.saturating_mul(2)).sum())?;
|
fsx::require_space(root, broken.iter().map(|(e,_)| e.size.saturating_mul(2)).sum())?;
|
||||||
@@ -137,15 +141,23 @@ pub fn run(root: &Path, dir: &Path, base_source: &Source, update_source: &Source
|
|||||||
}
|
}
|
||||||
fsx::atomic_write_json(&dir.join("install.json"), &meta)?;
|
fsx::atomic_write_json(&dir.join("install.json"), &meta)?;
|
||||||
progress("Repairing pending database updates", 80);
|
progress("Repairing pending database updates", 80);
|
||||||
|
crate::update::repair_migrating(dir, &mut txn)?;
|
||||||
let (applied, error) = match env.migrate(&update, &work.join("update/_migrations")) {
|
let (applied, error) = match env.migrate(&update, &work.join("update/_migrations")) {
|
||||||
Ok(r) => (r.applied, r.failed.map(|(id,why)| format!("{id}: {why}"))),
|
Ok(r) => (r.applied, r.failed.map(|(id,why)| format!("{id}: {why}"))),
|
||||||
Err(e) => (Vec::new(), Some(e.to_string())),
|
Err(e) => (Vec::new(), Some(e.to_string())),
|
||||||
};
|
};
|
||||||
|
if error.is_some() {
|
||||||
|
crate::update::finish_repair(root, dir, &mut txn, false, &env)?;
|
||||||
|
let report = Report { restored: Vec::new(), applied: Vec::new(), backup, database: check(root, dir)?, error };
|
||||||
|
fsx::atomic_write_json(&before.join("report.json"), &report)?;
|
||||||
|
return Ok(report);
|
||||||
|
}
|
||||||
crate::config::create_missing_module_configs(root)?;
|
crate::config::create_missing_module_configs(root)?;
|
||||||
progress("Checking database after repair", 95);
|
progress("Checking database after repair", 95);
|
||||||
let database = check(root, dir)?;
|
let database = check(root, dir)?;
|
||||||
let report = Report { restored, applied, backup, database, error };
|
let report = Report { restored, applied, backup, database, error };
|
||||||
fsx::atomic_write_json(&before.join("report.json"), &report)?;
|
fsx::atomic_write_json(&before.join("report.json"), &report)?;
|
||||||
|
crate::update::finish_repair(root, dir, &mut txn, true, &env)?;
|
||||||
progress("Done", 100);
|
progress("Done", 100);
|
||||||
Ok(report)
|
Ok(report)
|
||||||
})();
|
})();
|
||||||
|
|||||||
@@ -0,0 +1,116 @@
|
|||||||
|
//! Where a problem report goes. A report about the bots goes to the repository of the bot system in question, anything
|
||||||
|
//! else to the Manager's own. The repositories come from the module catalog, so there is one list to keep right.
|
||||||
|
|
||||||
|
use std::path::Path;
|
||||||
|
|
||||||
|
use serde::Serialize;
|
||||||
|
|
||||||
|
pub const MANAGER_REPO: &str = "Corfirean/coa-server-manager";
|
||||||
|
|
||||||
|
/// One place a report can be filed. `id` is what the page sends back; `repo` is `owner/name` on GitHub.
|
||||||
|
#[derive(Debug, Clone, Serialize, PartialEq, Eq)]
|
||||||
|
pub struct Target {
|
||||||
|
pub id: &'static str,
|
||||||
|
pub repo: String,
|
||||||
|
/// The report form asks for the Manager's labels only where we own the repository.
|
||||||
|
pub ours: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// `https://github.com/owner/name/tree/main/x` -> `owner/name`.
|
||||||
|
fn repo_of(url: &str) -> Option<String> {
|
||||||
|
let rest = url.strip_prefix("https://github.com/")?;
|
||||||
|
let mut parts = rest.split('/');
|
||||||
|
let (owner, name) = (parts.next()?, parts.next()?);
|
||||||
|
let ok = |s: &str| !s.is_empty() && s.chars().all(|c| c.is_ascii_alphanumeric() || "._-".contains(c));
|
||||||
|
(ok(owner) && ok(name)).then(|| format!("{owner}/{name}"))
|
||||||
|
}
|
||||||
|
|
||||||
|
fn catalog_repo(id: &str) -> Option<String> {
|
||||||
|
crate::modules::catalog().into_iter().find(|e| e.id == id).and_then(|e| repo_of(&e.repo))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The three places, in the order the page lists them. A bot system whose repository is unknown falls back to the Manager's.
|
||||||
|
pub fn targets() -> Vec<Target> {
|
||||||
|
let mut v = vec![Target { id: "manager", repo: MANAGER_REPO.into(), ours: true }];
|
||||||
|
for (id, module) in [("companions", "companions"), ("squid", "playerbots")] {
|
||||||
|
if let Some(repo) = catalog_repo(module) {
|
||||||
|
v.push(Target { id, repo: repo.clone(), ours: repo.starts_with("Corfirean/") });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
v
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn target(id: &str) -> Option<Target> {
|
||||||
|
targets().into_iter().find(|t| t.id == id)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// True for the "new issue" page of one of the targets: exactly that page, optionally with a query.
|
||||||
|
pub fn is_new_issue_url(url: &str) -> bool {
|
||||||
|
targets().iter().any(|t| {
|
||||||
|
let base = format!("https://github.com/{}/issues/new", t.repo);
|
||||||
|
url == base || url.starts_with(&format!("{base}?"))
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
/// What the report form fills in about the bot systems of this server.
|
||||||
|
#[derive(Debug, Clone, Serialize, PartialEq, Eq)]
|
||||||
|
pub struct Bots {
|
||||||
|
/// The target the form should start with: the bot system that is switched on, else the Manager.
|
||||||
|
pub suggested: &'static str,
|
||||||
|
/// The release of SQUID Playerbots, when it is the one switched on.
|
||||||
|
pub squid_version: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn bots(root: &Path) -> Bots {
|
||||||
|
let list = crate::modules::list(root);
|
||||||
|
let on = |id: &str| list.iter().find(|m| m.id == id).filter(|m| m.installed && m.enabled);
|
||||||
|
let squid = on("playerbots");
|
||||||
|
Bots {
|
||||||
|
suggested: if squid.is_some() { "squid" } else if on("companions").is_some() { "companions" } else { "manager" },
|
||||||
|
squid_version: squid.and_then(|m| m.version.clone()).filter(|v| !v.is_empty()),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn the_three_targets_come_from_the_catalog() {
|
||||||
|
let t = targets();
|
||||||
|
let repo = |id: &str| t.iter().find(|x| x.id == id).map(|x| x.repo.clone());
|
||||||
|
assert_eq!(repo("manager").as_deref(), Some("Corfirean/coa-server-manager"));
|
||||||
|
assert_eq!(repo("companions").as_deref(), Some("Corfirean/mod-coa-playerbots"));
|
||||||
|
assert_eq!(repo("squid").as_deref(), Some("Zyth45/mod-playerbots"));
|
||||||
|
assert!(t.iter().find(|x| x.id == "squid").is_some_and(|x| !x.ours));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn repository_names_are_read_from_module_links() {
|
||||||
|
assert_eq!(repo_of("https://github.com/Corfirean/azerothcore-wotlk-coa/tree/coa-bots/modules/x").as_deref(), Some("Corfirean/azerothcore-wotlk-coa"));
|
||||||
|
assert_eq!(repo_of("https://github.com/Zyth45/mod-playerbots").as_deref(), Some("Zyth45/mod-playerbots"));
|
||||||
|
assert_eq!(repo_of("https://example.com/a/b"), None);
|
||||||
|
assert_eq!(repo_of("https://github.com/a"), None);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn only_the_new_issue_pages_of_the_targets_are_allowed() {
|
||||||
|
assert!(is_new_issue_url("https://github.com/Zyth45/mod-playerbots/issues/new"));
|
||||||
|
assert!(is_new_issue_url("https://github.com/Corfirean/mod-coa-playerbots/issues/new?title=a&body=b"));
|
||||||
|
assert!(!is_new_issue_url("https://github.com/Zyth45/mod-playerbots/issues/newer"));
|
||||||
|
assert!(!is_new_issue_url("https://github.com/Zyth45/other/issues/new"));
|
||||||
|
assert!(!is_new_issue_url("https://evil.example/Corfirean/coa-server-manager/issues/new"));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn the_suggested_target_follows_the_bot_system_that_is_on() {
|
||||||
|
let d = tempfile::tempdir().unwrap();
|
||||||
|
let root = d.path().join("srv");
|
||||||
|
crate::layout::testkit::fake_repack(&root);
|
||||||
|
let conf = root.join("Core/configs/modules");
|
||||||
|
std::fs::write(conf.join("mod_coa_playerbots.conf"), "CoaBots.Enable = 1\n").unwrap();
|
||||||
|
assert_eq!(bots(&root).suggested, "companions");
|
||||||
|
std::fs::write(conf.join("mod_coa_playerbots.conf"), "CoaBots.Enable = 0\n").unwrap();
|
||||||
|
assert_eq!(bots(&root).suggested, "manager");
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -5,6 +5,19 @@ use serde::{Deserialize, Serialize};
|
|||||||
use crate::{db::Db, error::Result, fsx};
|
use crate::{db::Db, error::Result, fsx};
|
||||||
|
|
||||||
pub const CONTRACT: &str = "Scripts/database-schema.json";
|
pub const CONTRACT: &str = "Scripts/database-schema.json";
|
||||||
|
pub const WILDCARD_TABLES: &[(&str, &[&str])] = &[
|
||||||
|
("world", &["ascension_wildcard_boss_marks", "ascension_wildcard_tooltip_links"]),
|
||||||
|
("characters", &["coa_wildcard_skill_card", "coa_wildcard_skill_card_pending", "coa_wildcard_skill_card_account", "coa_wildcard_skill_card_purchase", "coa_wildcard_specialization_cache"]),
|
||||||
|
];
|
||||||
|
const WILDCARD_COLUMNS: &[(&str, &str, &[&str])] = &[
|
||||||
|
("world", "ascension_wildcard_boss_marks", &["CreatureEntry", "Amount"]),
|
||||||
|
("world", "ascension_wildcard_tooltip_links", &["Talent", "Ability"]),
|
||||||
|
("characters", "coa_wildcard_skill_card", &["account", "card", "progress"]),
|
||||||
|
("characters", "coa_wildcard_skill_card_pending", &["account", "id", "card"]),
|
||||||
|
("characters", "coa_wildcard_skill_card_account", &["account", "bonus_progress"]),
|
||||||
|
("characters", "coa_wildcard_skill_card_purchase", &["account", "type", "count"]),
|
||||||
|
("characters", "coa_wildcard_specialization_cache", &["account", "claimed_at"]),
|
||||||
|
];
|
||||||
type Columns = BTreeMap<String, BTreeMap<String, BTreeMap<String, String>>>;
|
type Columns = BTreeMap<String, BTreeMap<String, BTreeMap<String, String>>>;
|
||||||
|
|
||||||
#[derive(Debug, Serialize, Deserialize)]
|
#[derive(Debug, Serialize, Deserialize)]
|
||||||
@@ -13,6 +26,16 @@ pub struct Contract {
|
|||||||
pub columns: Columns,
|
pub columns: Columns,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn require_release_contract(root: &Path) -> Result<Contract> {
|
||||||
|
let contract: Contract = fsx::read_json(&root.join(CONTRACT))?;
|
||||||
|
if contract.schema != 1 || ["auth", "characters", "world"].iter().any(|kind| {
|
||||||
|
contract.columns.get(*kind).is_none_or(|tables| tables.is_empty() || tables.values().any(|columns| columns.is_empty()))
|
||||||
|
}) {
|
||||||
|
return Err(crate::Error::Invalid("The release must include a complete supported database schema contract.".into()));
|
||||||
|
}
|
||||||
|
Ok(contract)
|
||||||
|
}
|
||||||
|
|
||||||
#[derive(Debug, Serialize)]
|
#[derive(Debug, Serialize)]
|
||||||
pub struct Problem { pub database: String, pub table: String, pub column: String, pub detail: String }
|
pub struct Problem { pub database: String, pub table: String, pub column: String, pub detail: String }
|
||||||
|
|
||||||
@@ -44,6 +67,26 @@ pub fn check(db: &Db, root: &Path) -> Result<Vec<Problem>> {
|
|||||||
Contract { schema: 1, columns: BTreeMap::from([("characters".into(), tables.into_iter().map(|(t, cols)| (t, cols.into_iter().map(|c| (c, String::new())).collect())).collect())]) }
|
Contract { schema: 1, columns: BTreeMap::from([("characters".into(), tables.into_iter().map(|(t, cols)| (t, cols.into_iter().map(|c| (c, String::new())).collect())).collect())]) }
|
||||||
};
|
};
|
||||||
let mut problems = Vec::new();
|
let mut problems = Vec::new();
|
||||||
|
// Older releases omit a schema contract. Still verify the feature's actual tables,
|
||||||
|
// independently of its migration history, before declaring an update healthy.
|
||||||
|
if std::fs::read(root.join("Core/worldserver.exe")).is_ok_and(|bytes| bytes.windows(b"Wildcard synergy settings".len()).any(|w| w == b"Wildcard synergy settings")) {
|
||||||
|
for (kind, tables) in WILDCARD_TABLES {
|
||||||
|
let actual = read_columns(db, kind)?;
|
||||||
|
for table in *tables {
|
||||||
|
if !actual.contains_key(*table) {
|
||||||
|
problems.push(Problem { database: (*kind).into(), table: (*table).into(), column: String::new(), detail: "Missing required Wildcard table; migration history is not proof of its presence".into() });
|
||||||
|
} else {
|
||||||
|
for (_, _, columns) in WILDCARD_COLUMNS.iter().filter(|(k, t, _)| k == kind && t == table) {
|
||||||
|
for column in *columns {
|
||||||
|
if !actual[*table].contains_key(*column) {
|
||||||
|
problems.push(Problem { database: (*kind).into(), table: (*table).into(), column: (*column).into(), detail: "Missing required Wildcard column".into() });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
for (kind, expected) in &contract.columns {
|
for (kind, expected) in &contract.columns {
|
||||||
let actual = read_columns(db, kind)?;
|
let actual = read_columns(db, kind)?;
|
||||||
for (table, cols) in expected {
|
for (table, cols) in expected {
|
||||||
@@ -69,15 +112,65 @@ pub fn check(db: &Db, root: &Path) -> Result<Vec<Problem>> {
|
|||||||
problems.push(Problem { database: "characters".into(), table: table.into(), column: column.into(), detail: "Required column has no default and is not supplied by character creation".into() });
|
problems.push(Problem { database: "characters".into(), table: table.into(), column: column.into(), detail: "Required column has no default and is not supplied by character creation".into() });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Check every CoA class represented in the starting data, rather than one arbitrary pair.
|
// The any-race/class migration supports every standard playable race for all CoA classes.
|
||||||
|
// A class existing for just one race does not protect character creation or enumeration.
|
||||||
if db.realm() == crate::realms::Mode::Coa {
|
if db.realm() == crate::realms::Mode::Coa {
|
||||||
let rows = db.query("SELECT race,class FROM acore_world.playercreateinfo;")?;
|
let rows = db.query("SELECT race,class FROM acore_world.playercreateinfo;")?;
|
||||||
let pairs: BTreeSet<_> = rows.lines().filter_map(|l| l.split_once('\t')).map(|(a,b)| (a.to_owned(),b.to_owned())).collect();
|
problems.extend(missing_coa_starts(&rows));
|
||||||
for class in 12..=32 {
|
}
|
||||||
if !pairs.iter().any(|(_, c)| c == &class.to_string()) {
|
// Check owned characters too, including legacy classes and Wildcard characters. Their rows
|
||||||
problems.push(Problem { database: "world".into(), table: "playercreateinfo".into(), column: String::new(), detail: format!("No starting data for CoA class {class}") });
|
// must not silently disappear from character selection after an otherwise healthy update.
|
||||||
}
|
let missing = db.query("SELECT c.race,c.class,COUNT(*) FROM acore_characters.characters c LEFT JOIN acore_world.playercreateinfo p ON p.race=c.race AND p.class=c.class WHERE p.race IS NULL GROUP BY c.race,c.class;")?;
|
||||||
|
for row in missing.lines() {
|
||||||
|
let fields: Vec<_> = row.split('\t').collect();
|
||||||
|
if fields.len() == 3 {
|
||||||
|
problems.push(Problem { database: "world".into(), table: "playercreateinfo".into(), column: String::new(), detail: format!("{} existing characters have no starting data for race {} / class {} and would be hidden from character selection", fields[2], fields[0], fields[1]) });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Ok(problems)
|
Ok(problems)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn missing_coa_starts(rows: &str) -> Vec<Problem> {
|
||||||
|
let pairs: BTreeSet<_> = rows.lines().filter_map(|l| l.split_once('\t')).map(|(a,b)| (a.to_owned(),b.to_owned())).collect();
|
||||||
|
let mut problems = Vec::new();
|
||||||
|
for race in [1, 2, 3, 4, 5, 6, 7, 8, 10, 11] {
|
||||||
|
for class in 12..=32 {
|
||||||
|
if !pairs.contains(&(race.to_string(), class.to_string())) {
|
||||||
|
problems.push(Problem { database: "world".into(), table: "playercreateinfo".into(), column: String::new(), detail: format!("No starting data for CoA race {race} / class {class}") });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
problems
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn a_release_cannot_use_a_partial_or_empty_schema_contract() {
|
||||||
|
let dir = tempfile::tempdir().unwrap();
|
||||||
|
assert!(require_release_contract(dir.path()).is_err());
|
||||||
|
fsx::atomic_write_json(&dir.path().join(CONTRACT), &Contract { schema: 1, columns: Columns::new() }).unwrap();
|
||||||
|
assert!(require_release_contract(dir.path()).is_err());
|
||||||
|
let mut columns = Columns::new();
|
||||||
|
for kind in ["auth", "characters", "world"] {
|
||||||
|
columns.insert(kind.into(), BTreeMap::from([("table".into(), BTreeMap::from([("id".into(), "int|NO|<NULL>|<NONE>".into())]))]));
|
||||||
|
}
|
||||||
|
fsx::atomic_write_json(&dir.path().join(CONTRACT), &Contract { schema: 1, columns }).unwrap();
|
||||||
|
assert!(require_release_contract(dir.path()).is_ok());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn detects_a_missing_orc_class_pair_even_when_the_class_exists_for_other_races() {
|
||||||
|
let mut rows = String::new();
|
||||||
|
for race in [1, 2, 3, 4, 5, 6, 7, 8, 10, 11] {
|
||||||
|
for class in 12..=32 { rows.push_str(&format!("{race}\t{class}\n")); }
|
||||||
|
}
|
||||||
|
assert!(missing_coa_starts(&rows).is_empty());
|
||||||
|
let incomplete = rows.lines().filter(|line| *line != "2\t30").collect::<Vec<_>>().join("\n");
|
||||||
|
let problems = missing_coa_starts(&incomplete);
|
||||||
|
assert_eq!(problems.len(), 1);
|
||||||
|
assert!(problems[0].detail.contains("race 2 / class 30"));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,155 @@
|
|||||||
|
use std::path::Path;
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
#[derive(Debug, Serialize, PartialEq, Eq)]
|
||||||
|
pub struct Release {
|
||||||
|
pub tag: Option<String>,
|
||||||
|
pub commit: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn imported_repack(root: &Path) -> bool {
|
||||||
|
root.join("CoA-Bots/release.json").is_file()
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn release(root: &Path) -> Option<Release> {
|
||||||
|
for name in ["Extras/SquidPlayerbots/release.json", "Core/configs/modules/playerbots.conf.settings.json", "CoA-Bots/release.json"] {
|
||||||
|
let Ok(bytes) = std::fs::read(root.join(name)) else { continue; };
|
||||||
|
if bytes.len() > 1024 * 1024 { continue; }
|
||||||
|
let Ok(json) = serde_json::from_slice::<serde_json::Value>(&bytes) else { continue; };
|
||||||
|
let safe = |key: &str| json.get(key).and_then(|value| value.as_str())
|
||||||
|
.filter(|value| !value.is_empty() && value.len() <= 80 && value.chars().all(|c| c.is_ascii_alphanumeric() || "._-".contains(c))).map(str::to_owned);
|
||||||
|
let tag = safe("tag").or_else(|| safe("version"));
|
||||||
|
let revision = if name == "CoA-Bots/release.json" {
|
||||||
|
json.get("botsModuleRevision").and_then(|value| value.as_str()).and_then(|value| value.split_whitespace().next()).map(str::to_owned).or_else(|| safe("commit"))
|
||||||
|
} else if name.ends_with(".settings.json") { None } else { safe("commit") };
|
||||||
|
let commit = revision.filter(|value| value.len() >= 7 && value.len() <= 40 && value.chars().all(|c| c.is_ascii_hexdigit()));
|
||||||
|
if tag.is_some() || commit.is_some() { return Some(Release { tag, commit }); }
|
||||||
|
}
|
||||||
|
None
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Deserialize, Serialize, PartialEq)]
|
||||||
|
pub struct Field {
|
||||||
|
pub key: String,
|
||||||
|
#[serde(rename = "type")]
|
||||||
|
pub kind: String,
|
||||||
|
pub title: String,
|
||||||
|
pub description: String,
|
||||||
|
#[serde(default)]
|
||||||
|
pub group: String,
|
||||||
|
#[serde(default)]
|
||||||
|
pub group_title: Option<String>,
|
||||||
|
pub default: serde_json::Value,
|
||||||
|
#[serde(default)]
|
||||||
|
pub default_if_missing: Option<serde_json::Value>,
|
||||||
|
pub min: Option<f64>,
|
||||||
|
pub max: Option<f64>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Deserialize)]
|
||||||
|
struct Settings {
|
||||||
|
format: u32,
|
||||||
|
settings: Vec<serde_json::Value>,
|
||||||
|
#[serde(default)]
|
||||||
|
groups: std::collections::BTreeMap<String, String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn fields(root: &Path) -> crate::Result<std::collections::BTreeMap<String, Field>> {
|
||||||
|
let path = root.join("Core/configs/modules/playerbots.conf.settings.json");
|
||||||
|
if !path.is_file() { return Ok(Default::default()); }
|
||||||
|
let Ok(bytes) = std::fs::read(path) else { return Ok(Default::default()); };
|
||||||
|
if bytes.len() > 1024 * 1024 { return Ok(Default::default()); }
|
||||||
|
let Ok(settings) = serde_json::from_slice::<Settings>(&bytes) else { return Ok(Default::default()); };
|
||||||
|
if settings.format != 1 { return Ok(Default::default()); }
|
||||||
|
let mut fields = std::collections::BTreeMap::new();
|
||||||
|
for value in settings.settings {
|
||||||
|
let Ok(mut field) = serde_json::from_value::<Field>(value) else { continue; };
|
||||||
|
field.group_title = settings.groups.get(&field.group).cloned();
|
||||||
|
if !matches!(field.kind.as_str(), "bool" | "int" | "float" | "string")
|
||||||
|
|| field.key.len() > 200 || field.key.is_empty()
|
||||||
|
|| !field.key.chars().all(|c| c.is_ascii_alphanumeric() || "._".contains(c))
|
||||||
|
|| field.min.zip(field.max).is_some_and(|(min,max)| min > max)
|
||||||
|
|| !default_type(&field.kind, &field.default)
|
||||||
|
|| field.default_if_missing.as_ref().is_some_and(|value| !default_type(&field.kind, value))
|
||||||
|
|| fields.contains_key(&field.key) { continue; }
|
||||||
|
fields.insert(field.key.clone(), field);
|
||||||
|
}
|
||||||
|
Ok(fields)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn default_type(kind: &str, value: &serde_json::Value) -> bool {
|
||||||
|
match kind {
|
||||||
|
"bool" => value.is_boolean(),
|
||||||
|
"int" => value.is_i64() || value.is_u64(),
|
||||||
|
"float" => value.is_number(),
|
||||||
|
"string" => value.is_string(),
|
||||||
|
_ => false,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn scalar(value: &serde_json::Value) -> Option<String> {
|
||||||
|
match value {
|
||||||
|
serde_json::Value::Bool(value) => Some(if *value { "1" } else { "0" }.into()),
|
||||||
|
serde_json::Value::String(value) => Some(value.clone()),
|
||||||
|
serde_json::Value::Number(value) => Some(value.to_string()),
|
||||||
|
_ => None,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn validate(field: &Field, value: &str) -> crate::Result<()> {
|
||||||
|
let valid = match field.kind.as_str() {
|
||||||
|
"bool" => matches!(value, "0" | "1"),
|
||||||
|
"int" | "float" => value.parse::<f64>().is_ok_and(|number| number.is_finite()
|
||||||
|
&& (field.kind != "int" || number.fract() == 0.0)
|
||||||
|
&& field.min.is_none_or(|min| number >= min) && field.max.is_none_or(|max| number <= max)),
|
||||||
|
"string" => true,
|
||||||
|
_ => false,
|
||||||
|
};
|
||||||
|
if valid { Ok(()) } else { Err(crate::Error::Invalid(format!("{} must match its documented SquidBots type and range.", field.key))) }
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
#[test]
|
||||||
|
fn upstream_settings_preserve_types_ranges_and_distinct_defaults() {
|
||||||
|
let root = tempfile::tempdir().unwrap();
|
||||||
|
crate::fsx::atomic_write(&root.path().join("Core/configs/modules/playerbots.conf.settings.json"), br#"{"format":1,"settings":[{"key":"AiPlayerbot.MinRandomBots","type":"int","group":"population","title":"Minimum bots","description":"Lower bound","default":500,"default_if_missing":50,"min":0,"max":5000}]}"#).unwrap();
|
||||||
|
let fields = fields(root.path()).unwrap();
|
||||||
|
let field = &fields["AiPlayerbot.MinRandomBots"];
|
||||||
|
assert_eq!(scalar(&field.default).as_deref(), Some("500"));
|
||||||
|
assert_eq!(scalar(field.default_if_missing.as_ref().unwrap()).as_deref(), Some("50"));
|
||||||
|
assert!(validate(field, "5000").is_ok());
|
||||||
|
for value in ["5001", "-1", "0.5", "NaN"] { assert!(validate(field, value).is_err()); }
|
||||||
|
}
|
||||||
|
#[test]
|
||||||
|
fn unsupported_metadata_falls_back_and_bad_entries_do_not_hide_valid_fields() {
|
||||||
|
let root = tempfile::tempdir().unwrap();
|
||||||
|
let path = root.path().join("Core/configs/modules/playerbots.conf.settings.json");
|
||||||
|
for data in [r#"{"format":99,"settings":[]}"#, "invalid json", r#"{"format":1,"settings":{}}"#] {
|
||||||
|
crate::fsx::atomic_write(&path, data.as_bytes()).unwrap();
|
||||||
|
assert!(fields(root.path()).unwrap().is_empty());
|
||||||
|
}
|
||||||
|
crate::fsx::atomic_write(&path, br#"{"format":1,"settings":[{"key":"Broken","type":"enum","title":"Broken","description":"Unknown type","default":1},{"key":"Malformed"},{"key":"WrongDefault","type":"int","title":"Wrong","description":"Bad default","default":"oops"},{"key":"Good","type":"bool","title":"Good","description":"Good field","default":true}]}"#).unwrap();
|
||||||
|
let parsed = fields(root.path()).unwrap();
|
||||||
|
assert_eq!(parsed.len(), 1);
|
||||||
|
assert!(parsed.contains_key("Good"));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn imported_revision_uses_its_first_word_and_empty_tags_are_hidden() {
|
||||||
|
let root = tempfile::tempdir().unwrap();
|
||||||
|
crate::fsx::atomic_write(&root.path().join("CoA-Bots/release.json"), br#"{"tag":"","botsModuleRevision":"48c4786a 2026-10-01 (coa branch)","commit":"abcdef01"}"#).unwrap();
|
||||||
|
assert_eq!(release(root.path()).unwrap(), Release { tag: None, commit: Some("48c4786a".into()) });
|
||||||
|
crate::fsx::atomic_write(&root.path().join("Core/configs/modules/playerbots.conf.settings.json"), br#"{"tag":"v1.8.1","commit":"11111111"}"#).unwrap();
|
||||||
|
assert_eq!(release(root.path()).unwrap(), Release { tag: Some("v1.8.1".into()), commit: None });
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn diagnostics_only_expose_release_identifiers() {
|
||||||
|
let root = tempfile::tempdir().unwrap();
|
||||||
|
crate::fsx::atomic_write(&root.path().join("CoA-Bots/release.json"), br#"{"tag":"v1.8","commit":"48c4786a","password":"secret"}"#).unwrap();
|
||||||
|
assert!(imported_repack(root.path()));
|
||||||
|
assert_eq!(release(root.path()).unwrap(), Release { tag: Some("v1.8".into()), commit: Some("48c4786a".into()) });
|
||||||
|
}
|
||||||
|
}
|
||||||
+750
-71
File diff suppressed because it is too large.
Load diff
@@ -2,8 +2,11 @@
|
|||||||
//!
|
//!
|
||||||
//! coa-release pack-base --tree DIR --out DIR --version X [--core-commit SHA] [--part-size BYTES]
|
//! coa-release pack-base --tree DIR --out DIR --version X [--core-commit SHA] [--part-size BYTES]
|
||||||
//! coa-release pack-update --tree DIR --base-manifest FILE --core DIR --out DIR --version X
|
//! coa-release pack-update --tree DIR --base-manifest FILE --core DIR --out DIR --version X
|
||||||
//! [--bots DIR] [--core-commit SHA] [--bots-commit SHA] [--part-size BYTES]
|
//! [--bots DIR] [--repairs DIR] [--core-commit SHA] [--bots-commit SHA] [--part-size BYTES]
|
||||||
|
//! coa-release extract-schema-base --package DIR --fixture NEW-coa-schema-fixture-DIR
|
||||||
|
//! coa-release schema-contract --repack FIXTURE --tree DIR --core DIR [--bots DIR] [--repairs DIR]
|
||||||
//! coa-release clean-base --repack DIR --core DIR --tree DIR --out DIR [--bots DIR] [--data DIR]
|
//! coa-release clean-base --repack DIR --core DIR --tree DIR --out DIR [--bots DIR] [--data DIR]
|
||||||
|
//! coa-release export-baseline --server DIR --out DIR (the three databases of a prepared server, for a Linux package)
|
||||||
//! coa-release sign --dir DIR (key: env COA_SIGNING_KEY, or ~/.coa-manager/signing/manifest-signing.key)
|
//! coa-release sign --dir DIR (key: env COA_SIGNING_KEY, or ~/.coa-manager/signing/manifest-signing.key)
|
||||||
//! coa-release verify --dir DIR (against the public key built into this tool)
|
//! coa-release verify --dir DIR (against the public key built into this tool)
|
||||||
|
|
||||||
@@ -12,7 +15,7 @@ use std::path::PathBuf;
|
|||||||
|
|
||||||
use coa_core::manifest::{Kind, Manifest};
|
use coa_core::manifest::{Kind, Manifest};
|
||||||
use coa_core::package::{build, BuildOptions, DEFAULT_PART_SIZE};
|
use coa_core::package::{build, BuildOptions, DEFAULT_PART_SIZE};
|
||||||
use coa_core::release::{collect_bots_sql, collect_core_sql, pack_update, sign_manifest, UpdateParams};
|
use coa_core::release::{pack_update, sign_manifest, UpdateParams};
|
||||||
|
|
||||||
fn args(rest: &[String]) -> HashMap<String, String> {
|
fn args(rest: &[String]) -> HashMap<String, String> {
|
||||||
let mut m = HashMap::new();
|
let mut m = HashMap::new();
|
||||||
@@ -44,23 +47,38 @@ fn run() -> Result<(), String> {
|
|||||||
let e = |x: coa_core::Error| x.to_string();
|
let e = |x: coa_core::Error| x.to_string();
|
||||||
let part = a.get("part-size").and_then(|v| v.parse().ok()).unwrap_or(DEFAULT_PART_SIZE);
|
let part = a.get("part-size").and_then(|v| v.parse().ok()).unwrap_or(DEFAULT_PART_SIZE);
|
||||||
match cmd.as_str() {
|
match cmd.as_str() {
|
||||||
|
"extract-schema-base" => {
|
||||||
|
coa_core::release_schema::extract_base(
|
||||||
|
&PathBuf::from(need(&a, "package")?), &PathBuf::from(need(&a, "fixture")?),
|
||||||
|
coa_core::signing::EMBEDDED_PUBLIC_KEY,
|
||||||
|
).map_err(e)?;
|
||||||
|
println!("signed base extracted into a disposable database fixture");
|
||||||
|
}
|
||||||
"schema-contract" => {
|
"schema-contract" => {
|
||||||
let repack = PathBuf::from(need(&a, "repack")?);
|
let repack = PathBuf::from(need(&a, "repack")?);
|
||||||
let tree = PathBuf::from(need(&a, "tree")?);
|
let tree = PathBuf::from(need(&a, "tree")?);
|
||||||
coa_core::backup::with_database(&repack, |db| coa_core::schema_check::capture(db, &tree)).map_err(e)?;
|
if let Some(core) = a.get("core") {
|
||||||
|
let bots = a.get("bots").map(PathBuf::from);
|
||||||
|
let repairs = a.get("repairs").map(PathBuf::from);
|
||||||
|
let sql = coa_core::release_schema::collect(&PathBuf::from(core), bots.as_deref(), repairs.as_deref()).map_err(e)?;
|
||||||
|
coa_core::release_schema::capture_release(&repack, &tree, &sql).map_err(e)?;
|
||||||
|
} else {
|
||||||
|
coa_core::backup::with_database(&repack, |db| coa_core::schema_check::capture(db, &tree)).map_err(e)?;
|
||||||
|
}
|
||||||
println!("database schema contract captured");
|
println!("database schema contract captured");
|
||||||
}
|
}
|
||||||
"pack-base" => {
|
"pack-base" => {
|
||||||
|
coa_core::schema_check::require_release_contract(&PathBuf::from(need(&a, "tree")?)).map_err(e)?;
|
||||||
let opts = BuildOptions { kind: Kind::Base, version: need(&a, "version")?.clone(), core_commit: a.get("core-commit").cloned(), built_at: chrono_now(), part_size: part, bots_commit: a.get("bots-commit").cloned(), migrations: vec![] };
|
let opts = BuildOptions { kind: Kind::Base, version: need(&a, "version")?.clone(), core_commit: a.get("core-commit").cloned(), built_at: chrono_now(), part_size: part, bots_commit: a.get("bots-commit").cloned(), migrations: vec![] };
|
||||||
let m = build(&PathBuf::from(need(&a, "tree")?), &PathBuf::from(need(&a, "out")?), &opts, &|s| eprintln!("{s}")).map_err(e)?;
|
let m = build(&PathBuf::from(need(&a, "tree")?), &PathBuf::from(need(&a, "out")?), &opts, &|s| eprintln!("{s}")).map_err(e)?;
|
||||||
println!("base {}: {} files, {} parts", m.version, m.files.len(), m.archive.as_ref().map(|x| x.parts.len()).unwrap_or(0));
|
println!("base {}: {} files, {} parts", m.version, m.files.len(), m.archive.as_ref().map(|x| x.parts.len()).unwrap_or(0));
|
||||||
}
|
}
|
||||||
"pack-update" => {
|
"pack-update" => {
|
||||||
let base: Manifest = Manifest::parse(&std::fs::read(need(&a, "base-manifest")?).map_err(|x| x.to_string())?).map_err(e)?;
|
let base: Manifest = Manifest::parse(&std::fs::read(need(&a, "base-manifest")?).map_err(|x| x.to_string())?).map_err(e)?;
|
||||||
let mut sql = collect_core_sql(&PathBuf::from(need(&a, "core")?)).map_err(e)?;
|
coa_core::schema_check::require_release_contract(&PathBuf::from(need(&a, "tree")?)).map_err(e)?;
|
||||||
if let Some(b) = a.get("bots") {
|
let bots = a.get("bots").map(PathBuf::from);
|
||||||
sql.extend(collect_bots_sql(&PathBuf::from(b)).map_err(e)?);
|
let repairs = a.get("repairs").map(PathBuf::from);
|
||||||
}
|
let sql = coa_core::release_schema::collect(&PathBuf::from(need(&a, "core")?), bots.as_deref(), repairs.as_deref()).map_err(e)?;
|
||||||
let out = PathBuf::from(need(&a, "out")?);
|
let out = PathBuf::from(need(&a, "out")?);
|
||||||
let m = pack_update(
|
let m = pack_update(
|
||||||
&UpdateParams { tree: &PathBuf::from(need(&a, "tree")?), base_manifest: &base, sql: &sql, out: &out, version: need(&a, "version")?.clone(), core_commit: a.get("core-commit").cloned(), bots_commit: a.get("bots-commit").cloned(), part_size: part },
|
&UpdateParams { tree: &PathBuf::from(need(&a, "tree")?), base_manifest: &base, sql: &sql, out: &out, version: need(&a, "version")?.clone(), core_commit: a.get("core-commit").cloned(), bots_commit: a.get("bots-commit").cloned(), part_size: part },
|
||||||
@@ -76,24 +94,37 @@ fn run() -> Result<(), String> {
|
|||||||
coa_core::cleanbase::build(&coa_core::cleanbase::Params { repack: &repack, core: &core, bots: bots.as_deref(), tree: &tree, data: data.as_deref(), out: &out }, &|s| eprintln!("{s}")).map_err(e)?;
|
coa_core::cleanbase::build(&coa_core::cleanbase::Params { repack: &repack, core: &core, bots: bots.as_deref(), tree: &tree, data: data.as_deref(), out: &out }, &|s| eprintln!("{s}")).map_err(e)?;
|
||||||
println!("clean base tree at {}", out.display());
|
println!("clean base tree at {}", out.display());
|
||||||
}
|
}
|
||||||
|
"export-baseline" => {
|
||||||
|
let done = coa_core::release::export_baseline(&PathBuf::from(need(&a, "server")?), &PathBuf::from(need(&a, "out")?)).map_err(e)?;
|
||||||
|
for (kind, bytes) in done {
|
||||||
|
println!("{kind}.sql.zst: {:.1} MB", bytes as f64 / 1e6);
|
||||||
|
}
|
||||||
|
}
|
||||||
"sign" => {
|
"sign" => {
|
||||||
let dir = PathBuf::from(need(&a, "dir")?);
|
let dir = PathBuf::from(need(&a, "dir")?);
|
||||||
|
require_contract_entry(&dir)?;
|
||||||
sign_manifest(&dir, &signing_key()?).map_err(e)?;
|
sign_manifest(&dir, &signing_key()?).map_err(e)?;
|
||||||
|
coa_core::release_schema::verify_package(&dir, coa_core::signing::EMBEDDED_PUBLIC_KEY).map_err(e)?;
|
||||||
println!("signed {}", dir.join("manifest.json").display());
|
println!("signed {}", dir.join("manifest.json").display());
|
||||||
}
|
}
|
||||||
"verify" => {
|
"verify" => {
|
||||||
let dir = PathBuf::from(need(&a, "dir")?);
|
let dir = PathBuf::from(need(&a, "dir")?);
|
||||||
let bytes = std::fs::read(dir.join("manifest.json")).map_err(|x| x.to_string())?;
|
coa_core::release_schema::verify_package(&dir, coa_core::signing::EMBEDDED_PUBLIC_KEY).map_err(e)?;
|
||||||
let sig = std::fs::read_to_string(dir.join("manifest.json.sig")).map_err(|x| x.to_string())?;
|
println!("signature, archive contents and database schema contract OK");
|
||||||
coa_core::signing::verify_embedded(&bytes, &sig).map_err(e)?;
|
|
||||||
Manifest::parse(&bytes).map_err(e)?;
|
|
||||||
println!("signature and manifest OK");
|
|
||||||
}
|
}
|
||||||
other => return Err(format!("unknown command {other}")),
|
other => return Err(format!("unknown command {other}")),
|
||||||
}
|
}
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn require_contract_entry(dir: &std::path::Path) -> Result<(), String> {
|
||||||
|
let manifest = Manifest::parse(&std::fs::read(dir.join("manifest.json")).map_err(|e| e.to_string())?).map_err(|e| e.to_string())?;
|
||||||
|
if !manifest.files.iter().any(|f| f.path == coa_core::schema_check::CONTRACT && f.size > 0) {
|
||||||
|
return Err("The release is missing its database schema contract; refusing to sign or publish it.".into());
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
fn chrono_now() -> String {
|
fn chrono_now() -> String {
|
||||||
chrono::Utc::now().to_rfc3339()
|
chrono::Utc::now().to_rfc3339()
|
||||||
}
|
}
|
||||||
|
|||||||
+66
-12
@@ -233,18 +233,21 @@ hash**: current == recorded → safe to replace; current ≠ recorded → *modif
|
|||||||
2. **Download** to `staging\<txid>\dl\` with `.part` files, HTTP Range resume, retry/backoff, cancel, progress.
|
2. **Download** to `staging\<txid>\dl\` with `.part` files, HTTP Range resume, retry/backoff, cancel, progress.
|
||||||
3. **Verify** — SHA-256 of every artefact; nothing is executed or extracted into the live tree before this.
|
3. **Verify** — SHA-256 of every artefact; nothing is executed or extracted into the live tree before this.
|
||||||
4. **Snapshot** — server must be stopped (never copy over a running worldserver); create recovery point:
|
4. **Snapshot** — server must be stopped (never copy over a running worldserver); create recovery point:
|
||||||
replaced binaries, changed managed configs, module state, `characters`+`auth` dump (world optional);
|
replaced binaries, changed managed configs, module state, full dumps of every managed realm database;
|
||||||
write `txn.json {state: Snapshotted}`.
|
write `txn.json {state: Snapshotted}`.
|
||||||
5. **Apply** into `staging\<txid>\tree\`, resolve ownership conflicts, merge configs, then swap file-by-file with
|
5. **Apply** into `staging\<txid>\tree\`, resolve ownership conflicts, merge configs, then swap file-by-file with
|
||||||
same-volume atomic renames, journaling each step (`txn.json` lists done/undone operations).
|
same-volume atomic renames, journaling each step (`txn.json` lists done/undone operations).
|
||||||
6. **Migrate** — run pending SQL through the tracked runner (D7); failure ⇒ stop, keep DB backup, offer restore.
|
6. **Migrate** — durably mark SQL as running before execution. Failure restores the full database recovery point
|
||||||
7. **Validate** — start server, health check (D3) with timeout.
|
before restoring files. Interrupted SQL is never automatically replayed.
|
||||||
|
7. **Validate** — check database structure, start server, require ten seconds of continuous readiness with timeout.
|
||||||
8. **Commit** — ownership table + `install.json` version bump, mark txn `Committed`, prune staging.
|
8. **Commit** — ownership table + `install.json` version bump, mark txn `Committed`, prune staging.
|
||||||
Any crash before Commit leaves `txn.json` in a non-terminal state; on next launch the Manager detects it and
|
Any crash before Commit leaves `txn.json` in a non-terminal state; on next launch the Manager detects it and
|
||||||
offers *Roll forward* or *Roll back* — the install is "recoverable" by construction.
|
offers *Roll forward* or *Roll back* — the install is "recoverable" by construction.
|
||||||
|
|
||||||
Rollback = binaries + managed config state + module state only. Database restore is a **separate explicit
|
Rollback restores files, configuration and installation metadata. Once migrations started, it also restores all
|
||||||
action** (spec §19–20).
|
databases from the full pre-update recovery point. Failed recovery remains unfinished and blocks startup and another
|
||||||
|
update. The same journal protects Repair. Old transactions without a full recovery point cannot roll back database
|
||||||
|
changes automatically. Independent database restore remains available for other recovery points.
|
||||||
|
|
||||||
### D7. Database strategy (`db` module)
|
### D7. Database strategy (`db` module)
|
||||||
|
|
||||||
@@ -253,14 +256,15 @@ action** (spec §19–20).
|
|||||||
native Rust client (`mysql_async`) is used for health pings and migration ledger reads.
|
native Rust client (`mysql_async`) is used for health pings and migration ledger reads.
|
||||||
* Ledger: table `acore_world.coa_manager_migrations(id, db, sha256, applied_at, status, error)` (created by the
|
* Ledger: table `acore_world.coa_manager_migrations(id, db, sha256, applied_at, status, error)` (created by the
|
||||||
Manager, in a dedicated table — no core schema is changed) mirrored to `.manager\migrations\`.
|
Manager, in a dedicated table — no core schema is changed) mirrored to `.manager\migrations\`.
|
||||||
Statuses `Applied | Pending | Failed`. Each file runs in a single connection; DDL is not transactional, so
|
Statuses `Applied | Pending | Failed | Running`. Each file runs in a single connection; DDL is not transactional, so
|
||||||
"destructive" migrations (flag in manifest, or heuristic scan for `DROP|TRUNCATE|DELETE|ALTER ... DROP`) force
|
"destructive" migrations (flag in manifest, or heuristic scan for `DROP|TRUNCATE|DELETE|ALTER ... DROP`) force
|
||||||
a fresh DB backup first and require explicit confirmation.
|
a fresh DB backup first and require explicit confirmation.
|
||||||
* Backups: `mysqldump --single-transaction --routines --quick` per DB. Quick = characters + auth + configs +
|
* Backups: `mysqldump --single-transaction --routines --quick` per DB. Quick = characters + auth + configs +
|
||||||
metadata; Full adds world (large); Config-only; DB-only. Compressed with zstd. Restore is always to a
|
metadata; Full adds world (large); Config-only; DB-only. Compressed with zstd. Restore is always to a
|
||||||
staging schema first (`…_restore`), swapped only after a row-count sanity check, with the current DB dumped
|
staging schema first (`…_restore`), swapped only after a row-count sanity check, with the current DB dumped
|
||||||
beforehand.
|
beforehand.
|
||||||
* Never: `DROP DATABASE`, resetting characters, overwriting DBs, or restoring DB on a binary rollback. Delete/
|
* Never: `DROP DATABASE` or resetting characters. Update recovery restores databases into staging schemas and
|
||||||
|
keeps the replaced tables in separate schemas. Delete/
|
||||||
reset lives only in **Settings → Advanced → Danger Zone**, deletes tracked files only, and refuses to remove a
|
reset lives only in **Settings → Advanced → Danger Zone**, deletes tracked files only, and refuses to remove a
|
||||||
directory that still contains untracked files.
|
directory that still contains untracked files.
|
||||||
* Clean install: extract `mysql\data.7z` (packaged data dir), then **rotate** root/app passwords to fresh random
|
* Clean install: extract `mysql\data.7z` (packaged data dir), then **rotate** root/app passwords to fresh random
|
||||||
@@ -365,8 +369,50 @@ hand over to `coa_core::docker`; nothing else needed to change for start, stop,
|
|||||||
inside listens, so a plain connect proves nothing.
|
inside listens, so a plain connect proves nothing.
|
||||||
* **Configuration path in the binaries**: Linux builds must use `-DCONF_DIR=configs` (see `coa-server-build`),
|
* **Configuration path in the binaries**: Linux builds must use `-DCONF_DIR=configs` (see `coa-server-build`),
|
||||||
otherwise the core looks for module configs in a path baked in at build time.
|
otherwise the core looks for module configs in a path baked in at build time.
|
||||||
* **Not done yet**: installation and the database setup (schemas, `acore` user), backups and database access through the
|
* **Database access** (`db.rs`): for a Docker installation `Db` runs `mysql`, `mysqldump` and `mysqladmin` inside the
|
||||||
container, updates, port conflict detection, the firewall and exposure checks, and the client under Wine/Proton.
|
database container with `docker exec -i`, connecting over TCP on the container's loopback exactly as the repack's
|
||||||
|
commands do on the host (password through `MYSQL_PWD`, never on a command line). Nothing else changes: accounts,
|
||||||
|
backups, the population query, migrations and the RA service account all go through `Db`, and the host needs no
|
||||||
|
MySQL client. A repack keeps using its bundled tools.
|
||||||
|
* **Health of the database container** is a ping over TCP, like every connection the Manager makes. On a new volume the
|
||||||
|
image first runs a temporary server that answers on its socket but takes no network connection; a socket ping reported
|
||||||
|
the container healthy about four seconds before TCP worked (measured: 10 s against 14 s).
|
||||||
|
* **Main configuration files**: a package carries only `worldserver.conf.dist` and `authserver.conf.dist` (the release
|
||||||
|
tool leaves active files out). On Windows the launcher writes them at each start; on Docker `ensure_main_configs` creates
|
||||||
|
them from the templates when they are missing, at installation and at every start, and never overwrites one.
|
||||||
|
* **Installing a new server** (`docker/install.rs`, separate from `install::install_base`, which is not touched). Same
|
||||||
|
order of events: signed manifest, space and folder checks, verified download, extraction into `<dest>.installing`,
|
||||||
|
database, then one rename. The package must hold `Core/worldserver`, `Core/authserver`, the `.dist` templates,
|
||||||
|
`_migrations/` and **`Database/baseline/{auth,characters,world}.sql.zst`**. The baseline is a dump, in the format of the
|
||||||
|
Manager's backups, of databases in which **every migration of the package is already applied**; the installer imports
|
||||||
|
it, records those migrations as applied (`baseline = 1`, a few bulk statements) and creates the `acore` account, the
|
||||||
|
realm port and the console account. It is the same arrangement as a Windows package, which ships its prepared database.
|
||||||
|
The databases are **not rebuilt from the repository's SQL**: some migrations are guards generated from the maintainers'
|
||||||
|
live database (`rev_20260903_01_live_class_baseline` refuses to run unless the table holds exactly the rows it expects),
|
||||||
|
so replaying the SQL files from the base scripts fails, in any order. `coa-release export-baseline --server DIR --out DIR`
|
||||||
|
produces the dumps from a prepared server (repack or Docker). The game data stays where the person has it
|
||||||
|
(`dataDir` in `docker.json`, mounted read-only). A failure removes the containers, the volume and the staging folder.
|
||||||
|
* **Not done yet**: wiring the installer into the screens, downloading the game data, updates, port conflict detection,
|
||||||
|
the firewall and exposure checks, the Wildcard realm profiles, and the client under Wine/Proton.
|
||||||
|
|
||||||
|
### D14. Keeping Windows and Linux apart
|
||||||
|
|
||||||
|
A fix for one platform must not be able to break the other. The rules:
|
||||||
|
|
||||||
|
1. **Platform code lives in its own modules**: `coa_core::docker` for Linux and Docker; the repack code (`driver`, `process`,
|
||||||
|
`install`, `layout` and the bundled-tool half of `db`) for Windows. A new Linux feature is a new file there, not an edit
|
||||||
|
of a repack function.
|
||||||
|
2. **Shared modules hold platform-neutral logic only** (manifest, signing, download, extraction, migrations, backups,
|
||||||
|
configuration editing, the registry).
|
||||||
|
3. **The difference enters in as few places as possible**: the early `is_docker` return at the top of `driver::run`,
|
||||||
|
`process::observe`, `layout::scan` and `Db::from_repack`, and the platform checks of the Tauri layer. Everything past
|
||||||
|
that point belongs to one platform.
|
||||||
|
4. **No `cfg` in the middle of a shared algorithm.** Where one is unavoidable (file modes, a path comparison), it is small,
|
||||||
|
commented, and the other platform's branch is the code that was there before.
|
||||||
|
5. **Reuse by calling, not by editing**: a Linux feature that needs a helper from a Windows-side file makes it
|
||||||
|
`pub(crate)` and calls it (visibility only); it does not change what the helper does.
|
||||||
|
6. **Both platforms are tested on every pull request** (`check.yml`: Windows and Linux). Tests of one platform's behaviour
|
||||||
|
are marked for that platform, so they cannot fail on the other.
|
||||||
|
|
||||||
---------------------------------------------------------------------------------------------------------
|
---------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
@@ -392,8 +438,11 @@ files the running server itself changes, diffed before/after.
|
|||||||
disk-full at write n, network cut at byte n, migration returns error, new worldserver exits non-zero, port
|
disk-full at write n, network cut at byte n, migration returns error, new worldserver exits non-zero, port
|
||||||
taken, exe quarantined (file vanishes), folder moved, user-modified managed file, unknown config keys.
|
taken, exe quarantined (file vanishes), folder moved, user-modified managed file, unknown config keys.
|
||||||
|
|
||||||
### 3.4 Rollback — restore recovery point's binaries/configs/module state; database untouched unless the user
|
### 3.4 Rollback — restore the pre-update databases when migrations started, followed by files and metadata
|
||||||
picks "Restore database" separately (shows dump timestamp and warns that progress since then is lost).
|
|
||||||
|
The UI explains that progress after the recovery point is lost. SQL failures before startup recover automatically;
|
||||||
|
failed health checks keep the installation blocked until the owner chooses recovery. Every recovery point and staging
|
||||||
|
schema has a unique identifier, and corrupt update journals fail closed.
|
||||||
|
|
||||||
---------------------------------------------------------------------------------------------------------
|
---------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
@@ -566,6 +615,11 @@ The reference install classifies as **Healthy (customised)**: repack shape, bina
|
|||||||
* **UI:** PLAY becomes **UPDATE CLIENT** when a tracked client is outdated (with "Play without updating"); with no client linked it
|
* **UI:** PLAY becomes **UPDATE CLIENT** when a tracked client is outdated (with "Play without updating"); with no client linked it
|
||||||
becomes **Set up game client** (choose an existing folder, or download into `<chosen folder>/CoA Client` with a free-space check).
|
becomes **Set up game client** (choose an existing folder, or download into `<chosen folder>/CoA Client` with a free-space check).
|
||||||
An existing client that is not tracked can be adopted from Settings > Game client ("Keep this client up to date").
|
An existing client that is not tracked can be adopted from Settings > Game client ("Keep this client up to date").
|
||||||
A fresh download gets `realmlist.wtf` for each installed locale (the manifest has none) and the companion addon.
|
A fresh download gets `realmlist.wtf` for each installed locale (the manifest has none) and, for local hosts, the companion addon.
|
||||||
|
* **Joining another server:** the welcome screen offers hosting or joining. Joining uses a separate player profile in
|
||||||
|
the Manager's `remote-client/connection.json`, storing the host address and client folder without a server registry entry,
|
||||||
|
installation metadata, database or server processes. Only Overview and application Settings appear in the sidebar.
|
||||||
|
Downloading, adopting and updating clients use the same verified downloader; Play applies the saved realmlist without
|
||||||
|
forcing a local realm selection. The player can return to hosting without removing their saved connection.
|
||||||
* **Open points:** ask the launcher maintainers before putting heavy load on their API; DBCs live inside the MPQ patch archives
|
* **Open points:** ask the launcher maintainers before putting heavy load on their API; DBCs live inside the MPQ patch archives
|
||||||
(extracting them would need an MPQ reader), so the server's `Data\dbc` still comes from our `base` package for now.
|
(extracting them would need an MPQ reader), so the server's `Data\dbc` still comes from our `base` package for now.
|
||||||
@@ -15,10 +15,15 @@ Repair reports unresolved schema damage. It does not guess ALTER statements or r
|
|||||||
For each update, capture a fresh contract **from a disposable database already migrated to the exact packaged core**, into the release tree before `pack-update`:
|
For each update, capture a fresh contract **from a disposable database already migrated to the exact packaged core**, into the release tree before `pack-update`:
|
||||||
|
|
||||||
```powershell
|
```powershell
|
||||||
cargo run -p coa-release -- schema-contract --repack C:\games\release-fixture --tree C:\games\release-tree
|
cargo run -p coa-release -- extract-schema-base --package C:\games\signed-base --fixture C:\games\coa-schema-fixture-build
|
||||||
|
cargo run -p coa-release -- schema-contract --repack C:\games\coa-schema-fixture-build --tree C:\games\release-tree --core C:\games\release-core --bots C:\games\release-bots --repairs C:\games\release-repairs
|
||||||
```
|
```
|
||||||
|
|
||||||
The regular packager includes the contract and its hash in the signed manifest. Never capture it from a user's server or from the previous release database.
|
The first command verifies every entry in the signed base archive and extracts only the runtime needed for a disposable database. The second applies the release SQL with temporary ports, checks critical feature tables independently of migration history, and captures the resulting schema. It requires the disposable fixture marker and never starts a world server.
|
||||||
|
|
||||||
|
Base and update packaging require a complete contract for all three databases. Cumulative updates always carry it, even when unchanged. Signing and verification check the archive contents and contract before publication. Never capture it from a user's server or from an unmigrated previous release database.
|
||||||
|
|
||||||
|
Corrective SQL under `repairs/{auth,characters,world}` receives new `manager_repair__` migration IDs and runs after historical SQL. Missing Wildcard tables can therefore be restored without replaying historical data deletion. Existing malformed tables still fail schema checks; creating a missing table does not recover its lost rows.
|
||||||
|
|
||||||
## Simultaneous worlds
|
## Simultaneous worlds
|
||||||
|
|
||||||
|
|||||||
+11
-6
@@ -76,10 +76,12 @@
|
|||||||
"fr": "Remplit l'hôtel des ventes d'annonces réalistes et réglables.",
|
"fr": "Remplit l'hôtel des ventes d'annonces réalistes et réglables.",
|
||||||
"es": "Llena la casa de subastas con ofertas realistas y ajustables."
|
"es": "Llena la casa de subastas con ofertas realistas y ajustables."
|
||||||
},
|
},
|
||||||
"repo": "https://github.com/NathanHandley/mod-ah-bot-plus",
|
"repo": "https://github.com/Corfirean/azerothcore-wotlk-coa/tree/coa-bots/modules/mod-ah-bot-plus",
|
||||||
"conf": "mod_ahbot.conf",
|
"conf": "mod_ahbot.conf",
|
||||||
"switchable": false,
|
"enable_key": "AuctionHouseBot.Enable",
|
||||||
"status": "soon",
|
"default_on": false,
|
||||||
|
"switchable": true,
|
||||||
|
"status": "early",
|
||||||
"icon": "gavel"
|
"icon": "gavel"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -112,9 +114,12 @@
|
|||||||
},
|
},
|
||||||
"repo": "https://github.com/Zyth45/mod-playerbots",
|
"repo": "https://github.com/Zyth45/mod-playerbots",
|
||||||
"conf": "playerbots.conf",
|
"conf": "playerbots.conf",
|
||||||
"switchable": false,
|
"switchable": true,
|
||||||
"status": "soon",
|
"status": "early",
|
||||||
"icon": "swords"
|
"icon": "swords",
|
||||||
|
"enable_key": "AiPlayerbot.Enabled",
|
||||||
|
"default_on": false,
|
||||||
|
"page": "bots"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "client-compat",
|
"id": "client-compat",
|
||||||
|
|||||||
Generated
+2
-2
@@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "coa-server-manager",
|
"name": "coa-server-manager",
|
||||||
"version": "0.6.1",
|
"version": "0.6.6",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "coa-server-manager",
|
"name": "coa-server-manager",
|
||||||
"version": "0.6.1",
|
"version": "0.6.6",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@tauri-apps/api": "^2.12.0",
|
"@tauri-apps/api": "^2.12.0",
|
||||||
"@tauri-apps/plugin-dialog": "^2.8.0",
|
"@tauri-apps/plugin-dialog": "^2.8.0",
|
||||||
|
|||||||
+1
-1
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "coa-server-manager",
|
"name": "coa-server-manager",
|
||||||
"private": true,
|
"private": true,
|
||||||
"version": "0.6.1",
|
"version": "0.6.6",
|
||||||
"license": "AGPL-3.0-only",
|
"license": "AGPL-3.0-only",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|||||||
+144
-40
@@ -697,7 +697,7 @@ async fn check_update(state: State<'_, AppState>, id: String, source: Option<Str
|
|||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
fn pending_update(state: State<'_, AppState>, id: String) -> std::result::Result<Option<update::Txn>, UiError> {
|
fn pending_update(state: State<'_, AppState>, id: String) -> std::result::Result<Option<update::Txn>, UiError> {
|
||||||
let root = path_of(&state, &id)?;
|
let root = path_of(&state, &id)?;
|
||||||
Ok(update::unfinished(&meta_dir(&root)?))
|
Ok(update::pending_checked(&meta_dir(&root)?)?)
|
||||||
}
|
}
|
||||||
|
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
@@ -744,6 +744,19 @@ async fn rollback_update(state: State<'_, AppState>, id: String, txn: String) ->
|
|||||||
.await
|
.await
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[tauri::command]
|
||||||
|
async fn retry_update_validation(state: State<'_, AppState>, id: String, txn: String) -> std::result::Result<update::Txn, UiError> {
|
||||||
|
let root = path_of(&state, &id)?;
|
||||||
|
let _guard = BusyGuard::acquire(&state, &id)?;
|
||||||
|
blocking(move || {
|
||||||
|
let dir = meta_dir(&root)?;
|
||||||
|
let pending = update::load(&dir, &txn)?;
|
||||||
|
let source = coa_core::pkgsource::Source::Url(format!("https://github.com/Corfirean/coa-server-build/releases/download/server-{}/", pending.to_version));
|
||||||
|
let env = update::RepackEnv { root: &root, meta_dir: &dir };
|
||||||
|
update::retry_validation(&root, &dir, &txn, &source, coa_core::signing::EMBEDDED_PUBLIC_KEY, &env)
|
||||||
|
}).await
|
||||||
|
}
|
||||||
|
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
async fn get_population(state: State<'_, AppState>, id: String) -> std::result::Result<Option<coa_core::population::Population>, UiError> {
|
async fn get_population(state: State<'_, AppState>, id: String) -> std::result::Result<Option<coa_core::population::Population>, UiError> {
|
||||||
let root = path_of(&state, &id)?;
|
let root = path_of(&state, &id)?;
|
||||||
@@ -929,6 +942,68 @@ async fn add_companions(state: State<'_, AppState>, id: String, count: u32) -> s
|
|||||||
.await
|
.await
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const REMOTE_CLIENT_ID: &str = "@remote-client";
|
||||||
|
|
||||||
|
fn remote_dir() -> PathBuf { data_dir().join("remote-client") }
|
||||||
|
|
||||||
|
#[tauri::command]
|
||||||
|
fn remote_connection() -> std::result::Result<coa_core::remote_client::Profile, UiError> {
|
||||||
|
Ok(coa_core::remote_client::load(&remote_dir())?)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tauri::command]
|
||||||
|
fn remote_connect(state: State<'_, AppState>, host: String) -> std::result::Result<coa_core::remote_client::Profile, UiError> {
|
||||||
|
let job = state.client_cancel.lock().unwrap();
|
||||||
|
if job.is_some() { return Err(Error::Invalid("Wait for the client operation to finish.".into()).into()); }
|
||||||
|
let dir = remote_dir();
|
||||||
|
let mut profile = coa_core::remote_client::load(&dir)?;
|
||||||
|
let host = host.trim();
|
||||||
|
if host.is_empty() { return Err(Error::Invalid("Enter the host's IP address or hostname.".into()).into()); }
|
||||||
|
profile.host = host.into();
|
||||||
|
coa_core::remote_client::save(&dir, &profile)?;
|
||||||
|
Ok(profile)
|
||||||
|
}
|
||||||
|
|
||||||
|
struct ClientContext {
|
||||||
|
dir: PathBuf,
|
||||||
|
path: Option<PathBuf>,
|
||||||
|
source: Option<PathBuf>,
|
||||||
|
host: String,
|
||||||
|
root: Option<PathBuf>,
|
||||||
|
}
|
||||||
|
|
||||||
|
fn client_context(state: &AppState, id: &str) -> Result<ClientContext> {
|
||||||
|
if id == REMOTE_CLIENT_ID {
|
||||||
|
let dir = remote_dir();
|
||||||
|
let profile = coa_core::remote_client::load(&dir)?;
|
||||||
|
return Ok(ClientContext { dir, path: profile.client_path.map(PathBuf::from), source: None, host: profile.host, root: None });
|
||||||
|
}
|
||||||
|
let root = path_of(state, id)?;
|
||||||
|
let (dir, meta) = install_meta(&root)?;
|
||||||
|
let source = coa_core::client::addon_source(&root);
|
||||||
|
Ok(ClientContext { dir, path: meta.client_path.map(PathBuf::from), source, host: "127.0.0.1".into(), root: Some(root) })
|
||||||
|
}
|
||||||
|
|
||||||
|
impl ClientContext {
|
||||||
|
fn linked(&self) -> Option<PathBuf> {
|
||||||
|
self.path.clone().filter(|p| coa_core::client::detect(p, None).is_some())
|
||||||
|
}
|
||||||
|
fn require(&self) -> Result<PathBuf> {
|
||||||
|
self.linked().ok_or_else(|| Error::Invalid("Set up a game client first.".into()))
|
||||||
|
}
|
||||||
|
fn link(&self, path: &str) -> Result<()> {
|
||||||
|
if let Some(root) = &self.root {
|
||||||
|
let (_, mut meta) = install_meta(root)?;
|
||||||
|
meta.client_path = Some(path.into());
|
||||||
|
coa_core::fsx::atomic_write_json(&self.dir.join("install.json"), &meta)
|
||||||
|
} else {
|
||||||
|
let mut profile = coa_core::remote_client::load(&self.dir)?;
|
||||||
|
profile.client_path = Some(path.into());
|
||||||
|
coa_core::remote_client::save(&self.dir, &profile)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
fn client_of(root: &std::path::Path) -> Result<(PathBuf, InstallMeta, Option<PathBuf>)> {
|
fn client_of(root: &std::path::Path) -> Result<(PathBuf, InstallMeta, Option<PathBuf>)> {
|
||||||
let (dir, meta) = install_meta(root)?;
|
let (dir, meta) = install_meta(root)?;
|
||||||
let client = meta.client_path.clone().map(PathBuf::from).ok_or_else(|| Error::Invalid("No game client is set up for this server yet.".into()))?;
|
let client = meta.client_path.clone().map(PathBuf::from).ok_or_else(|| Error::Invalid("No game client is set up for this server yet.".into()))?;
|
||||||
@@ -937,22 +1012,19 @@ fn client_of(root: &std::path::Path) -> Result<(PathBuf, InstallMeta, Option<Pat
|
|||||||
|
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
fn client_info(state: State<'_, AppState>, id: String) -> std::result::Result<Option<coa_core::client::ClientInfo>, UiError> {
|
fn client_info(state: State<'_, AppState>, id: String) -> std::result::Result<Option<coa_core::client::ClientInfo>, UiError> {
|
||||||
let root = path_of(&state, &id)?;
|
let ctx = client_context(&state, &id)?;
|
||||||
let (_, meta) = install_meta(&root)?;
|
Ok(ctx.path.and_then(|p| coa_core::client::detect(&p, ctx.source.as_deref())))
|
||||||
let source = coa_core::client::addon_source(&root);
|
|
||||||
Ok(meta.client_path.and_then(|p| coa_core::client::detect(std::path::Path::new(&p), source.as_deref())))
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
fn set_client(state: State<'_, AppState>, id: String, path: String) -> std::result::Result<coa_core::client::ClientInfo, UiError> {
|
fn set_client(state: State<'_, AppState>, id: String, path: String) -> std::result::Result<coa_core::client::ClientInfo, UiError> {
|
||||||
let root = path_of(&state, &id)?;
|
let job = state.client_cancel.lock().unwrap();
|
||||||
let (dir, mut meta) = install_meta(&root)?;
|
if job.is_some() { return Err(Error::Invalid("Wait for the client operation to finish.".into()).into()); }
|
||||||
let source = coa_core::client::addon_source(&root);
|
let ctx = client_context(&state, &id)?;
|
||||||
let info = coa_core::client::detect(std::path::Path::new(&path), source.as_deref())
|
let info = coa_core::client::detect(std::path::Path::new(&path), ctx.source.as_deref())
|
||||||
.ok_or_else(|| Error::Invalid("This folder does not look like a game client (it needs Data and the game executable).".into()))?;
|
.ok_or_else(|| Error::Invalid("This folder does not look like a game client (it needs Data and the game executable).".into()))?;
|
||||||
meta.client_path = Some(info.path.clone());
|
ctx.link(&info.path)?;
|
||||||
coa_core::fsx::atomic_write_json(&dir.join("install.json"), &meta).map_err(UiError::from)?;
|
Ok(coa_core::client::detect(std::path::Path::new(&info.path), ctx.source.as_deref()).unwrap_or(info))
|
||||||
Ok(info)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
@@ -991,9 +1063,9 @@ fn linked_client(root: &std::path::Path) -> Result<Option<PathBuf>> {
|
|||||||
/// Cheap: one small manifest request and the local state file; no game file is read.
|
/// Cheap: one small manifest request and the local state file; no game file is read.
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
async fn client_status(state: State<'_, AppState>, id: String) -> std::result::Result<ClientStatus, UiError> {
|
async fn client_status(state: State<'_, AppState>, id: String) -> std::result::Result<ClientStatus, UiError> {
|
||||||
let root = path_of(&state, &id)?;
|
let ctx = client_context(&state, &id)?;
|
||||||
blocking(move || {
|
blocking(move || {
|
||||||
let client = linked_client(&root)?;
|
let client = ctx.linked();
|
||||||
let latest = coa_core::clientdl::fetch_latest().ok();
|
let latest = coa_core::clientdl::fetch_latest().ok();
|
||||||
let local = client.as_deref().map(coa_core::clientdl::local);
|
let local = client.as_deref().map(coa_core::clientdl::local);
|
||||||
let managed = local.as_ref().map(|l| l.managed).unwrap_or(false);
|
let managed = local.as_ref().map(|l| l.managed).unwrap_or(false);
|
||||||
@@ -1040,10 +1112,10 @@ async fn client_download_check(parent: String) -> std::result::Result<ClientDown
|
|||||||
/// Compare the linked client with the published one. Hashes files only where the recorded state cannot vouch for them.
|
/// Compare the linked client with the published one. Hashes files only where the recorded state cannot vouch for them.
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
async fn client_plan(app: AppHandle, state: State<'_, AppState>, id: String) -> std::result::Result<coa_core::clientdl::Plan, UiError> {
|
async fn client_plan(app: AppHandle, state: State<'_, AppState>, id: String) -> std::result::Result<coa_core::clientdl::Plan, UiError> {
|
||||||
let root = path_of(&state, &id)?;
|
let ctx = client_context(&state, &id)?;
|
||||||
let cancel = begin_client_job(&state)?;
|
let cancel = begin_client_job(&state)?;
|
||||||
let result = blocking(move || {
|
let result = blocking(move || {
|
||||||
let client = linked_client(&root)?.ok_or_else(|| Error::Invalid("No game client is set up for this server yet.".into()))?;
|
let client = ctx.require()?;
|
||||||
let manifest = coa_core::clientdl::fetch_latest()?;
|
let manifest = coa_core::clientdl::fetch_latest()?;
|
||||||
let current = coa_core::clientdl::load_state(&client).unwrap_or_default();
|
let current = coa_core::clientdl::load_state(&client).unwrap_or_default();
|
||||||
coa_core::clientdl::plan(&client, &manifest, ¤t, &cancel, &|s| {
|
coa_core::clientdl::plan(&client, &manifest, ¤t, &cancel, &|s| {
|
||||||
@@ -1058,11 +1130,13 @@ async fn client_plan(app: AppHandle, state: State<'_, AppState>, id: String) ->
|
|||||||
/// Bring the linked client to the published version. `keep_modified` leaves files the player changed alone.
|
/// Bring the linked client to the published version. `keep_modified` leaves files the player changed alone.
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
async fn client_sync(app: AppHandle, state: State<'_, AppState>, id: String, keep_modified: bool) -> std::result::Result<(), UiError> {
|
async fn client_sync(app: AppHandle, state: State<'_, AppState>, id: String, keep_modified: bool) -> std::result::Result<(), UiError> {
|
||||||
let root = path_of(&state, &id)?;
|
let ctx = client_context(&state, &id)?;
|
||||||
let cancel = begin_client_job(&state)?;
|
let cancel = begin_client_job(&state)?;
|
||||||
let result = blocking(move || {
|
let result = blocking(move || {
|
||||||
let client = linked_client(&root)?.ok_or_else(|| Error::Invalid("No game client is set up for this server yet.".into()))?;
|
let client = ctx.require()?;
|
||||||
run_client_sync(&app, &client, keep_modified, &cancel)
|
run_client_sync(&app, &client, keep_modified, &cancel)?;
|
||||||
|
if ctx.root.is_none() && !ctx.host.is_empty() { coa_core::client::set_realmlist(&client, &ctx.dir, &ctx.host)?; }
|
||||||
|
Ok(())
|
||||||
})
|
})
|
||||||
.await;
|
.await;
|
||||||
end_client_job(&state);
|
end_client_job(&state);
|
||||||
@@ -1086,13 +1160,12 @@ fn run_client_sync(app: &AppHandle, client: &std::path::Path, keep_modified: boo
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Download the whole client into `<parent>/CoA Client`, then link it to this server.
|
/// Download the client into `<parent>/CoA Client`, then link it to a host or player profile.
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
async fn client_download(app: AppHandle, state: State<'_, AppState>, id: String, parent: String) -> std::result::Result<coa_core::client::ClientInfo, UiError> {
|
async fn client_download(app: AppHandle, state: State<'_, AppState>, id: String, parent: String) -> std::result::Result<coa_core::client::ClientInfo, UiError> {
|
||||||
let root = path_of(&state, &id)?;
|
let ctx = client_context(&state, &id)?;
|
||||||
let cancel = begin_client_job(&state)?;
|
let cancel = begin_client_job(&state)?;
|
||||||
let result = blocking(move || {
|
let result = blocking(move || {
|
||||||
let (dir, mut meta) = install_meta(&root)?;
|
|
||||||
let parent = PathBuf::from(&parent);
|
let parent = PathBuf::from(&parent);
|
||||||
if !parent.is_dir() {
|
if !parent.is_dir() {
|
||||||
return Err(Error::Invalid("Choose an existing folder to put the game client in.".into()));
|
return Err(Error::Invalid("Choose an existing folder to put the game client in.".into()));
|
||||||
@@ -1105,16 +1178,11 @@ async fn client_download(app: AppHandle, state: State<'_, AppState>, id: String,
|
|||||||
}
|
}
|
||||||
std::fs::create_dir_all(&dest)?;
|
std::fs::create_dir_all(&dest)?;
|
||||||
run_client_sync(&app, &dest, false, &cancel)?;
|
run_client_sync(&app, &dest, false, &cancel)?;
|
||||||
let source = coa_core::client::addon_source(&root);
|
let info = coa_core::client::detect(&dest, ctx.source.as_deref()).ok_or_else(|| Error::Invalid("The downloaded client looks incomplete.".into()))?;
|
||||||
let info = coa_core::client::detect(&dest, source.as_deref()).ok_or_else(|| Error::Invalid("The downloaded client looks incomplete.".into()))?;
|
ctx.link(&info.path)?;
|
||||||
meta.client_path = Some(info.path.clone());
|
if !ctx.host.is_empty() { coa_core::client::set_realmlist(&dest, &ctx.dir, &ctx.host)?; }
|
||||||
coa_core::fsx::atomic_write_json(&dir.join("install.json"), &meta)?;
|
if let Some(src) = &ctx.source { coa_core::client::install_addon(&dest, &ctx.dir, src)?; }
|
||||||
// a fresh client has no realmlist; this server is on this computer
|
Ok(coa_core::client::detect(&dest, ctx.source.as_deref()).unwrap_or(info))
|
||||||
coa_core::client::set_realmlist(&dest, &dir, "127.0.0.1")?;
|
|
||||||
if let Some(src) = source {
|
|
||||||
coa_core::client::install_addon(&dest, &dir, &src)?;
|
|
||||||
}
|
|
||||||
Ok(coa_core::client::detect(&dest, coa_core::client::addon_source(&root).as_deref()).unwrap_or(info))
|
|
||||||
})
|
})
|
||||||
.await;
|
.await;
|
||||||
end_client_job(&state);
|
end_client_job(&state);
|
||||||
@@ -1149,6 +1217,17 @@ fn end_client_job(state: &AppState) {
|
|||||||
/// Launch the game client independently of the local server.
|
/// Launch the game client independently of the local server.
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
async fn play(state: State<'_, AppState>, id: String) -> std::result::Result<DriverOutcome, UiError> {
|
async fn play(state: State<'_, AppState>, id: String) -> std::result::Result<DriverOutcome, UiError> {
|
||||||
|
if id == REMOTE_CLIENT_ID {
|
||||||
|
let ctx = client_context(&state, &id)?;
|
||||||
|
let client = ctx.require()?;
|
||||||
|
return blocking(move || {
|
||||||
|
if ctx.host.is_empty() { return Err(Error::Invalid("Enter the host's IP address or hostname first.".into())); }
|
||||||
|
if coa_core::client::is_running(&client) { return Err(Error::Invalid("The game is already running.".into())); }
|
||||||
|
coa_core::client::set_realmlist(&client, &ctx.dir, &ctx.host)?;
|
||||||
|
coa_core::client::launch(&client)?;
|
||||||
|
Ok(DriverOutcome { ok: true, exit_code: None, code: None, human: None, output: String::new() })
|
||||||
|
}).await;
|
||||||
|
}
|
||||||
let root = path_of(&state, &id)?;
|
let root = path_of(&state, &id)?;
|
||||||
let (dir, _, client) = client_of(&root)?;
|
let (dir, _, client) = client_of(&root)?;
|
||||||
let client = client.unwrap();
|
let client = client.unwrap();
|
||||||
@@ -1170,6 +1249,7 @@ async fn play(state: State<'_, AppState>, id: String) -> std::result::Result<Dri
|
|||||||
struct FriendsStatus {
|
struct FriendsStatus {
|
||||||
settings: coa_core::friends::Settings,
|
settings: coa_core::friends::Settings,
|
||||||
lan_ip: Option<String>,
|
lan_ip: Option<String>,
|
||||||
|
lan_addresses: Vec<coa_core::net::LanAddress>,
|
||||||
exposure: Vec<coa_core::net::Exposure>,
|
exposure: Vec<coa_core::net::Exposure>,
|
||||||
/// The configuration lets other computers reach the login and world servers.
|
/// The configuration lets other computers reach the login and world servers.
|
||||||
servers_open: bool,
|
servers_open: bool,
|
||||||
@@ -1186,10 +1266,9 @@ struct FriendsStatus {
|
|||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
fn open_link(url: String) -> std::result::Result<(), UiError> {
|
fn open_link(url: String) -> std::result::Result<(), UiError> {
|
||||||
const ALLOWED: &[&str] = &["https://tailscale.com/", "https://login.tailscale.com/", "https://portforward.com/", "https://github.com/Corfirean/"];
|
const ALLOWED: &[&str] = &["https://tailscale.com/", "https://login.tailscale.com/", "https://portforward.com/", "https://github.com/Corfirean/"];
|
||||||
// A prefilled "new issue" page of this project: the address must be exactly that page, and its query may carry
|
// A prefilled "new issue" page of one of the places a report can go (the Manager, Companions, SQUID Playerbots): the
|
||||||
// `&` between the (percent-encoded) title and text.
|
// address must be exactly that page, and its query may carry `&` between the (percent-encoded) title and text.
|
||||||
const NEW_ISSUE: &str = "https://github.com/Corfirean/coa-server-manager/issues/new";
|
let issue = coa_core::report::is_new_issue_url(&url);
|
||||||
let issue = url == NEW_ISSUE || url.starts_with(&format!("{NEW_ISSUE}?"));
|
|
||||||
let chars_ok = url.chars().all(|c| c.is_ascii_alphanumeric() || "/:._-?=#%".contains(c) || (issue && c == '&'));
|
let chars_ok = url.chars().all(|c| c.is_ascii_alphanumeric() || "/:._-?=#%".contains(c) || (issue && c == '&'));
|
||||||
// the GitHub page of a module that is in the bundled catalog (some are not ours)
|
// the GitHub page of a module that is in the bundled catalog (some are not ours)
|
||||||
let catalog = coa_core::modules::catalog().iter().any(|e| e.repo == url);
|
let catalog = coa_core::modules::catalog().iter().any(|e| e.repo == url);
|
||||||
@@ -1207,6 +1286,16 @@ struct ReportContext {
|
|||||||
/// "new" for a server the Manager installed, "imported" for one that was added.
|
/// "new" for a server the Manager installed, "imported" for one that was added.
|
||||||
install_kind: String,
|
install_kind: String,
|
||||||
server_version: Option<String>,
|
server_version: Option<String>,
|
||||||
|
/// Where the form should start: the bot system that is switched on, else the Manager.
|
||||||
|
suggested_target: String,
|
||||||
|
/// The release of whichever bot system is on, for a report that goes to its repository.
|
||||||
|
bots_version: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The places a report can go, each with its GitHub repository.
|
||||||
|
#[tauri::command]
|
||||||
|
fn report_targets() -> Vec<coa_core::report::Target> {
|
||||||
|
coa_core::report::targets()
|
||||||
}
|
}
|
||||||
|
|
||||||
/// "Windows 11 (build 26200)" from `ver`; empty if it cannot be read.
|
/// "Windows 11 (build 26200)" from `ver`; empty if it cannot be read.
|
||||||
@@ -1233,11 +1322,15 @@ async fn report_context(state: State<'_, AppState>, id: String) -> std::result::
|
|||||||
let root = path_of(&state, &id)?;
|
let root = path_of(&state, &id)?;
|
||||||
blocking(move || {
|
blocking(move || {
|
||||||
let (_, meta) = install_meta(&root)?;
|
let (_, meta) = install_meta(&root)?;
|
||||||
|
let bots = coa_core::report::bots(&root);
|
||||||
|
let companions = [meta.bots.version.clone(), meta.bots.commit.as_ref().map(|c| c.chars().take(8).collect())].into_iter().flatten().collect::<Vec<String>>().join(" · ");
|
||||||
Ok(ReportContext {
|
Ok(ReportContext {
|
||||||
manager_version: coa_core::MANAGER_VERSION.to_string(),
|
manager_version: coa_core::MANAGER_VERSION.to_string(),
|
||||||
windows: windows_version(),
|
windows: windows_version(),
|
||||||
install_kind: if meta.kind == coa_core::registry::InstallKind::New { "new".into() } else { "imported".into() },
|
install_kind: if meta.kind == coa_core::registry::InstallKind::New { "new".into() } else { "imported".into() },
|
||||||
server_version: meta.core.version.clone(),
|
server_version: meta.core.version.clone(),
|
||||||
|
suggested_target: bots.suggested.to_string(),
|
||||||
|
bots_version: if bots.suggested == "squid" { bots.squid_version } else if bots.suggested == "companions" && !companions.is_empty() { Some(companions) } else { None },
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
.await
|
.await
|
||||||
@@ -1249,9 +1342,11 @@ async fn friends_status(state: State<'_, AppState>, id: String) -> std::result::
|
|||||||
blocking(move || {
|
blocking(move || {
|
||||||
let meta = meta_dir(&root)?;
|
let meta = meta_dir(&root)?;
|
||||||
let ports = layout::read_ports(&root);
|
let ports = layout::read_ports(&root);
|
||||||
|
let automatic = coa_core::net::lan_ip().filter(|ip| coa_core::net::is_lan_address(*ip));
|
||||||
Ok(FriendsStatus {
|
Ok(FriendsStatus {
|
||||||
settings: coa_core::friends::load(&meta),
|
settings: coa_core::friends::load(&meta),
|
||||||
lan_ip: coa_core::net::lan_ip().map(|a| a.to_string()),
|
lan_ip: automatic.map(|a| a.to_string()),
|
||||||
|
lan_addresses: coa_core::net::lan_addresses(automatic).unwrap_or_default(),
|
||||||
exposure: coa_core::net::exposure(&ports),
|
exposure: coa_core::net::exposure(&ports),
|
||||||
servers_open: coa_core::friends::bind_is_open(&root),
|
servers_open: coa_core::friends::bind_is_open(&root),
|
||||||
firewall: coa_core::firewall::status(),
|
firewall: coa_core::firewall::status(),
|
||||||
@@ -1304,9 +1399,10 @@ async fn friends_enable(
|
|||||||
id: String,
|
id: String,
|
||||||
mode: coa_core::friends::Mode,
|
mode: coa_core::friends::Mode,
|
||||||
host: Option<String>,
|
host: Option<String>,
|
||||||
|
lan_address_override: Option<String>,
|
||||||
use_upnp: bool,
|
use_upnp: bool,
|
||||||
) -> std::result::Result<FriendsResult, UiError> {
|
) -> std::result::Result<FriendsResult, UiError> {
|
||||||
use coa_core::friends::{self, Mode, Settings};
|
use coa_core::friends::{self, Mode};
|
||||||
let root = path_of(&state, &id)?;
|
let root = path_of(&state, &id)?;
|
||||||
let _guard = BusyGuard::acquire(&state, &id)?;
|
let _guard = BusyGuard::acquire(&state, &id)?;
|
||||||
blocking(move || {
|
blocking(move || {
|
||||||
@@ -1317,7 +1413,7 @@ async fn friends_enable(
|
|||||||
let secondary = realms.secondary_world_port.filter(|_| realms.simultaneous);
|
let secondary = realms.secondary_world_port.filter(|_| realms.simultaneous);
|
||||||
let host = match mode {
|
let host = match mode {
|
||||||
Mode::Local => "127.0.0.1".to_string(),
|
Mode::Local => "127.0.0.1".to_string(),
|
||||||
Mode::Lan => coa_core::net::lan_ip().ok_or_else(|| Error::Invalid("This computer has no network address.".into()))?.to_string(),
|
Mode::Lan => coa_core::net::resolve_lan_host(lan_address_override.as_deref(), coa_core::net::lan_ip())?,
|
||||||
Mode::Direct => host.filter(|h| !h.is_empty()).ok_or_else(|| Error::Invalid("Check your connection first to learn your public address.".into()))?,
|
Mode::Direct => host.filter(|h| !h.is_empty()).ok_or_else(|| Error::Invalid("Check your connection first to learn your public address.".into()))?,
|
||||||
Mode::Private => coa_core::net::tailscale().ip.ok_or_else(|| Error::Invalid("Tailscale is not connected. Install it, sign in, then try again.".into()))?,
|
Mode::Private => coa_core::net::tailscale().ip.ok_or_else(|| Error::Invalid("Tailscale is not connected. Install it, sign in, then try again.".into()))?,
|
||||||
};
|
};
|
||||||
@@ -1338,7 +1434,9 @@ async fn friends_enable(
|
|||||||
None => note = Some("Your router does not support automatic setup; forward the two game ports by hand or use the private network.".to_string()),
|
None => note = Some("Your router does not support automatic setup; forward the two game ports by hand or use the private network.".to_string()),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
friends::save(&meta, &Settings { mode, host: Some(host.clone()) })?;
|
let mut settings = friends::load(&meta);
|
||||||
|
settings.select_mode(mode, host.clone(), lan_address_override);
|
||||||
|
friends::save(&meta, &settings)?;
|
||||||
let running = coa_core::process::observe(&root, &ports).world.state == coa_core::process::ServiceState::Running;
|
let running = coa_core::process::observe(&root, &ports).world.state == coa_core::process::ServiceState::Running;
|
||||||
if running {
|
if running {
|
||||||
friends::apply_realm_address(&root, &host)?;
|
friends::apply_realm_address(&root, &host)?;
|
||||||
@@ -1391,6 +1489,8 @@ async fn export_diagnostics(state: State<'_, AppState>, id: String) -> std::resu
|
|||||||
let report = coa_core::diag::run(&root, &meta);
|
let report = coa_core::diag::run(&root, &meta);
|
||||||
let out = coa_core::diag::desktop_or_temp().join(format!("CoA-Diagnostics-{}.zip", coa_core::diag::stamp()));
|
let out = coa_core::diag::desktop_or_temp().join(format!("CoA-Diagnostics-{}.zip", coa_core::diag::stamp()));
|
||||||
coa_core::diag::export_package(&root, &dir, &data_dir().join("logs").join("manager.log"), &meta, &report, &out)?;
|
coa_core::diag::export_package(&root, &dir, &data_dir().join("logs").join("manager.log"), &meta, &report, &out)?;
|
||||||
|
// Show the file in its folder so nobody has to look for it; failing to open the folder is not a failure.
|
||||||
|
let _ = tauri_plugin_opener::reveal_item_in_dir(&out);
|
||||||
Ok(out.to_string_lossy().into_owned())
|
Ok(out.to_string_lossy().into_owned())
|
||||||
})
|
})
|
||||||
.await
|
.await
|
||||||
@@ -1492,6 +1592,7 @@ pub fn run() {
|
|||||||
pending_update,
|
pending_update,
|
||||||
apply_update,
|
apply_update,
|
||||||
rollback_update,
|
rollback_update,
|
||||||
|
retry_update_validation,
|
||||||
get_population,
|
get_population,
|
||||||
get_performance,
|
get_performance,
|
||||||
companions_stop_spawning,
|
companions_stop_spawning,
|
||||||
@@ -1499,8 +1600,11 @@ pub fn run() {
|
|||||||
companions_delete_all,
|
companions_delete_all,
|
||||||
companions_despawn_some,
|
companions_despawn_some,
|
||||||
open_link,
|
open_link,
|
||||||
|
report_targets,
|
||||||
companion_sizes,
|
companion_sizes,
|
||||||
add_companions,
|
add_companions,
|
||||||
|
remote_connection,
|
||||||
|
remote_connect,
|
||||||
client_info,
|
client_info,
|
||||||
set_client,
|
set_client,
|
||||||
client_realmlist,
|
client_realmlist,
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"$schema": "https://schema.tauri.app/config/2",
|
"$schema": "https://schema.tauri.app/config/2",
|
||||||
"productName": "CoA Server Manager",
|
"productName": "CoA Server Manager",
|
||||||
"version": "0.6.1",
|
"version": "0.6.6",
|
||||||
"identifier": "com.coa.servermanager",
|
"identifier": "com.coa.servermanager",
|
||||||
"build": {
|
"build": {
|
||||||
"beforeDevCommand": "npm run dev",
|
"beforeDevCommand": "npm run dev",
|
||||||
|
|||||||
+17
-2
@@ -4,14 +4,20 @@ import { Welcome } from "@/screens/Welcome";
|
|||||||
import { ImportServer } from "@/screens/ImportServer";
|
import { ImportServer } from "@/screens/ImportServer";
|
||||||
import { Shell } from "@/screens/Shell";
|
import { Shell } from "@/screens/Shell";
|
||||||
import { InstallServer } from "@/screens/InstallServer";
|
import { InstallServer } from "@/screens/InstallServer";
|
||||||
|
import { RemoteClient } from "@/screens/RemoteClient";
|
||||||
import { UpdateBanner } from "@/components/UpdateBanner";
|
import { UpdateBanner } from "@/components/UpdateBanner";
|
||||||
import { autoUpdateEnabled, installOnClose, lookForUpdate } from "@/lib/selfUpdate";
|
import { autoUpdateEnabled, installOnClose, lookForUpdate } from "@/lib/selfUpdate";
|
||||||
|
|
||||||
type View = "welcome" | "add" | "import" | "install";
|
type View = "welcome" | "add" | "import" | "install" | "remote";
|
||||||
|
|
||||||
|
function initialView(): View {
|
||||||
|
try { return localStorage.getItem("coa-play-mode") === "remote" ? "remote" : "welcome"; }
|
||||||
|
catch { return "welcome"; }
|
||||||
|
}
|
||||||
|
|
||||||
function Main() {
|
function Main() {
|
||||||
const [servers, setServers] = useState<ServerSummary[] | null>(null);
|
const [servers, setServers] = useState<ServerSummary[] | null>(null);
|
||||||
const [view, setView] = useState<View>("welcome");
|
const [view, setView] = useState<View>(initialView);
|
||||||
const [activeId, setActiveId] = useState<string | null>(null);
|
const [activeId, setActiveId] = useState<string | null>(null);
|
||||||
|
|
||||||
const refresh = useCallback(async () => {
|
const refresh = useCallback(async () => {
|
||||||
@@ -26,6 +32,11 @@ function Main() {
|
|||||||
|
|
||||||
if (servers === null) return null;
|
if (servers === null) return null;
|
||||||
|
|
||||||
|
if (view === "remote") return <RemoteClient onHost={() => {
|
||||||
|
try { localStorage.setItem("coa-play-mode", "host"); } catch { /* storage unavailable */ }
|
||||||
|
setView(servers.length ? "welcome" : "add");
|
||||||
|
}} />;
|
||||||
|
|
||||||
if (servers.length > 0 && view === "welcome" && activeId) {
|
if (servers.length > 0 && view === "welcome" && activeId) {
|
||||||
return (
|
return (
|
||||||
<Shell
|
<Shell
|
||||||
@@ -71,6 +82,10 @@ function Main() {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<Welcome
|
<Welcome
|
||||||
|
onConnect={() => {
|
||||||
|
try { localStorage.setItem("coa-play-mode", "remote"); } catch { /* storage unavailable */ }
|
||||||
|
setView("remote");
|
||||||
|
}}
|
||||||
onImport={() => setView("import")}
|
onImport={() => setView("import")}
|
||||||
onInstall={() => setView("install")}
|
onInstall={() => setView("install")}
|
||||||
onBack={servers.length > 0 ? () => setView("welcome") : undefined}
|
onBack={servers.length > 0 ? () => setView("welcome") : undefined}
|
||||||
|
|||||||
+18
-9
@@ -1,4 +1,5 @@
|
|||||||
// Dev-only: lets the UI run in a plain browser for visual review. Never bundled in production builds.
|
// Dev-only: lets the UI run in a plain browser for visual review. Never bundled in production builds.
|
||||||
|
import { auctionCategories, auctionQualities } from "../lib/moduleSettings";
|
||||||
import botsSchema from "../../schemas/bots.json";
|
import botsSchema from "../../schemas/bots.json";
|
||||||
import serverSchema from "../../schemas/server.json";
|
import serverSchema from "../../schemas/server.json";
|
||||||
import botsPresets from "../../schemas/presets/bots.json";
|
import botsPresets from "../../schemas/presets/bots.json";
|
||||||
@@ -9,6 +10,8 @@ export {};
|
|||||||
let added = new URLSearchParams(location.search).has("demo"), running = false;
|
let added = new URLSearchParams(location.search).has("demo"), running = false;
|
||||||
let realm: "coa" | "wildcard" = "coa", wildcardCreated = false;
|
let realm: "coa" | "wildcard" = "coa", wildcardCreated = false;
|
||||||
let simultaneous = false;
|
let simultaneous = false;
|
||||||
|
let remoteHost = localStorage.getItem("demo-remote-host") ?? "";
|
||||||
|
const moduleEdits: Record<string, Record<string, string>> = {};
|
||||||
const modState: Record<string, boolean> = { "companions": true, "content-scaling": true, "client-compat": true, "tbc-content": true, "wotlk-content": true, "npc-enchanter": true };
|
const modState: Record<string, boolean> = { "companions": true, "content-scaling": true, "client-compat": true, "tbc-content": true, "wotlk-content": true, "npc-enchanter": true };
|
||||||
const report = {path:"C:\\games\\CoA-Repack",classification:"healthy",items:[
|
const report = {path:"C:\\games\\CoA-Repack",classification:"healthy",items:[
|
||||||
{key:"worldserver",label:"World server",status:"found",detail:null},
|
{key:"worldserver",label:"World server",status:"found",detail:null},
|
||||||
@@ -28,6 +31,9 @@ export {};
|
|||||||
if(cmd==="check_database") return [{realm, migrations:[],problems:[],full_schema:false}];
|
if(cmd==="check_database") return [{realm, migrations:[],problems:[],full_schema:false}];
|
||||||
if(cmd==="repair_server") { if(running) throw new Error("Stop the server before repairing it."); return {restored:[],applied:[],backup:"demo-before-repair",database:[{realm,migrations:[],problems:[],full_schema:false}],error:null}; }
|
if(cmd==="repair_server") { if(running) throw new Error("Stop the server before repairing it."); return {restored:[],applied:[],backup:"demo-before-repair",database:[{realm,migrations:[],problems:[],full_schema:false}],error:null}; }
|
||||||
if(cmd==="realm_select"){await new Promise(r=>setTimeout(r,600));realm=args.mode;wildcardCreated ||= realm==="wildcard";modState.companions=realm==="coa";return {active:realm,wildcard_created:wildcardCreated,supported:true,recovery_pending:false,simultaneous,secondary_world_port:simultaneous?8086:null,secondary_running:simultaneous&&running};}
|
if(cmd==="realm_select"){await new Promise(r=>setTimeout(r,600));realm=args.mode;wildcardCreated ||= realm==="wildcard";modState.companions=realm==="coa";return {active:realm,wildcard_created:wildcardCreated,supported:true,recovery_pending:false,simultaneous,secondary_world_port:simultaneous?8086:null,secondary_running:simultaneous&&running};}
|
||||||
|
if(cmd==="remote_connection") return {host:remoteHost,client_path:null};
|
||||||
|
if(cmd==="remote_connect") { remoteHost=args.host.trim(); localStorage.setItem("demo-remote-host",remoteHost); return {host:remoteHost,client_path:null}; }
|
||||||
|
if(cmd==="play") return {ok:true,exit_code:null,code:null,human:null,output:""};
|
||||||
if(cmd==="list_servers") return added?[{id:"1",name:"CoA-Repack",path:report.path}]:[];
|
if(cmd==="list_servers") return added?[{id:"1",name:"CoA-Repack",path:report.path}]:[];
|
||||||
if(cmd==="scan_server") return report;
|
if(cmd==="scan_server") return report;
|
||||||
if(cmd==="add_server"){added=true;return {id:"1",name:"CoA-Repack",path:report.path};}
|
if(cmd==="add_server"){added=true;return {id:"1",name:"CoA-Repack",path:report.path};}
|
||||||
@@ -40,7 +46,7 @@ export {};
|
|||||||
if(cmd==="preview_preset"){const a=args;const sc=a.scope==="server"?serverSchema:botsSchema;const pr=(a.scope==="server"?serverPresets:botsPresets).presets as any[];const p=pr.find(x=>x.id===a.preset)??{id:a.preset??"defaults",title:"Recommended defaults",description:"Every setting returns to its default value."};const st=(sc.settings as any[]).filter(x=>x.type==="int"||x.type==="float"||x.type==="enum").slice(0,3);return {id:p.id,title:p.title,description:p.description,changes:st.map(x=>({key:x.key,title:x.title,from:x.default,to:x.type==="enum"?(x.options?.[1]?.value??x.default):(Number(x.default)||1)*2,dangerous:false}))};}
|
if(cmd==="preview_preset"){const a=args;const sc=a.scope==="server"?serverSchema:botsSchema;const pr=(a.scope==="server"?serverPresets:botsPresets).presets as any[];const p=pr.find(x=>x.id===a.preset)??{id:a.preset??"defaults",title:"Recommended defaults",description:"Every setting returns to its default value."};const st=(sc.settings as any[]).filter(x=>x.type==="int"||x.type==="float"||x.type==="enum").slice(0,3);return {id:p.id,title:p.title,description:p.description,changes:st.map(x=>({key:x.key,title:x.title,from:x.default,to:x.type==="enum"?(x.options?.[1]?.value??x.default):(Number(x.default)||1)*2,dangerous:false}))};}
|
||||||
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,pending_migrations:(window as any).__updated?0:5,download_bytes:6000000};
|
||||||
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==="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;
|
||||||
@@ -63,23 +69,26 @@ export {};
|
|||||||
if(cmd==="realmlist_save"){const w=window as any;const rl=w.__rl;if(args.profileId){const p=rl.profiles.find((x: any)=>x.id===args.profileId);p.name=args.name;p.data=args.data;return p;}if(rl.profiles.some((x: any)=>x.name.toLowerCase()===String(args.name).toLowerCase()))throw {human:{code:"unknown",title:"",message:"",actions:[]},technical:"A realmlist with that name already exists."};const p={id:String(args.name).toLowerCase().replace(/[^a-z0-9]+/g,"-"),name:args.name,data:(/\s/.test(args.data.trim())?args.data.trim():"set realmlist "+args.data.trim())+"\r\n"};rl.profiles.push(p);return p;}
|
if(cmd==="realmlist_save"){const w=window as any;const rl=w.__rl;if(args.profileId){const p=rl.profiles.find((x: any)=>x.id===args.profileId);p.name=args.name;p.data=args.data;return p;}if(rl.profiles.some((x: any)=>x.name.toLowerCase()===String(args.name).toLowerCase()))throw {human:{code:"unknown",title:"",message:"",actions:[]},technical:"A realmlist with that name already exists."};const p={id:String(args.name).toLowerCase().replace(/[^a-z0-9]+/g,"-"),name:args.name,data:(/\s/.test(args.data.trim())?args.data.trim():"set realmlist "+args.data.trim())+"\r\n"};rl.profiles.push(p);return p;}
|
||||||
if(cmd==="realmlist_delete"){const rl=(window as any).__rl;rl.profiles=rl.profiles.filter((x: any)=>x.id!==args.profileId);return null;}
|
if(cmd==="realmlist_delete"){const rl=(window as any).__rl;rl.profiles=rl.profiles.filter((x: any)=>x.id!==args.profileId);return null;}
|
||||||
if(cmd==="account_delete") return null;
|
if(cmd==="account_delete") return null;
|
||||||
if(cmd==="modules_list") return [{id:"companions",name:"CoA Companions",description:{en:"Companion bots for groups, dungeons and your guild.",ru:"Боты-компаньоны для групп, подземелий и гильдии."},repo:"https://github.com/Corfirean/mod-coa-playerbots",installed:true,enabled:modState["companions"],switchable:true,status:"beta",icon:"bot",page:"bots"},{id:"content-scaling",name:"Content Scaling",description:{en:"Scales dungeons and raids to your group, with solo modes.",ru:"Подстраивает подземелья и рейды под вашу группу, есть соло-режимы."},repo:"https://github.com/Corfirean/mod-coa-content-scaling",installed:true,enabled:modState["content-scaling"],switchable:true,status:"early",icon:"scaling",page:null},{id:"tbc-content",name:"TBC Content",description:{en:"Outland dungeons and raids, scaled to your level range.",ru:"Подземелья и рейды Запределья, подогнанные под ваши уровни."},repo:"https://github.com/Corfirean/mod-coa-content-scaling/tree/main/content-packs/mod-coa-tbc-content",installed:true,enabled:modState["tbc-content"],switchable:true,status:"early",icon:"tbc",page:null},{id:"wotlk-content",name:"WotLK Content",description:{en:"Northrend dungeons and raids, scaled to your level range.",ru:"Подземелья и рейды Нордскола, подогнанные под ваши уровни."},repo:"https://github.com/Corfirean/mod-coa-content-scaling/tree/main/content-packs/mod-coa-wotlk-content",installed:true,enabled:modState["wotlk-content"],switchable:true,status:"early",icon:"wotlk",page:null},{id:"ah-bot",name:"Auction House Bot",description:{en:"Fills the auction house with realistic, adjustable listings.",ru:"Наполняет аукцион реалистичными настраиваемыми лотами."},repo:"https://github.com/NathanHandley/mod-ah-bot-plus",installed:false,enabled:false,switchable:false,status:"soon",icon:"gavel",page:null,hidden:false},{id:"npc-enchanter",name:"NPC Enchanter",description:{en:"An NPC that enchants your gear for you.",ru:"НПС, который зачаровывает ваше снаряжение."},repo:"https://github.com/azerothcore/mod-npc-enchanter",installed:true,enabled:modState["npc-enchanter"],switchable:true,status:"early",icon:"sparkles",page:null,hidden:false},{id:"playerbots",name:"SQUID's Playerbots",description:{en:"An alternative bot system with random bots and full AI.",ru:"Альтернативная система ботов со случайными ботами и полным ИИ."},repo:"https://github.com/Zyth45/mod-playerbots",installed:false,enabled:false,switchable:false,status:"soon",icon:"swords",page:null,hidden:false},{id:"client-compat",name:"Client compatibility",description:{en:"Client-server link and appearance unlocks.",ru:"Связь клиента с сервером и разблокировка внешних видов."},repo:"https://github.com/Corfirean/azerothcore-wotlk-coa",installed:true,enabled:modState["client-compat"],switchable:false,status:"release",icon:"plug",page:null,hidden:true}].map(m => ({...m, compatibility: realm === "wildcard" ? (["companions", "playerbots"].includes(m.id) ? "unsupported" : m.id === "client-compat" ? "compatible" : "experimental") : "compatible", switchable: realm === "wildcard" && ["companions", "playerbots"].includes(m.id) ? false : m.switchable}));
|
if(cmd==="modules_list") return [{id:"companions",name:"CoA Companions",description:{en:"Companion bots for groups, dungeons and your guild.",ru:"Боты-компаньоны для групп, подземелий и гильдии."},repo:"https://github.com/Corfirean/mod-coa-playerbots",installed:true,enabled:modState["companions"],switchable:true,status:"beta",icon:"bot",page:"bots"},{id:"content-scaling",name:"Content Scaling",description:{en:"Scales dungeons and raids to your group, with solo modes.",ru:"Подстраивает подземелья и рейды под вашу группу, есть соло-режимы."},repo:"https://github.com/Corfirean/mod-coa-content-scaling",installed:true,enabled:modState["content-scaling"],switchable:true,status:"early",icon:"scaling",page:null},{id:"tbc-content",name:"TBC Content",description:{en:"Outland dungeons and raids, scaled to your level range.",ru:"Подземелья и рейды Запределья, подогнанные под ваши уровни."},repo:"https://github.com/Corfirean/mod-coa-content-scaling/tree/main/content-packs/mod-coa-tbc-content",installed:true,enabled:modState["tbc-content"],switchable:true,status:"early",icon:"tbc",page:null},{id:"wotlk-content",name:"WotLK Content",description:{en:"Northrend dungeons and raids, scaled to your level range.",ru:"Подземелья и рейды Нордскола, подогнанные под ваши уровни."},repo:"https://github.com/Corfirean/mod-coa-content-scaling/tree/main/content-packs/mod-coa-wotlk-content",installed:true,enabled:modState["wotlk-content"],switchable:true,status:"early",icon:"wotlk",page:null},{id:"ah-bot",name:"Auction House Bot",description:{en:"Fills the auction house with realistic, adjustable listings.",ru:"Наполняет аукцион реалистичными настраиваемыми лотами."},repo:"https://github.com/Corfirean/azerothcore-wotlk-coa",installed:true,enabled:modState["ah-bot"] ?? false,switchable:true,status:"early",icon:"gavel",page:null,hidden:false},{id:"npc-enchanter",name:"NPC Enchanter",description:{en:"An NPC that enchants your gear for you.",ru:"НПС, который зачаровывает ваше снаряжение."},repo:"https://github.com/azerothcore/mod-npc-enchanter",installed:true,enabled:modState["npc-enchanter"],switchable:true,status:"early",icon:"sparkles",page:null,hidden:false},{id:"playerbots",name:"SQUID's Playerbots",description:{en:"An alternative bot system with random bots and full AI.",ru:"Альтернативная система ботов со случайными ботами и полным ИИ."},repo:"https://github.com/Zyth45/mod-playerbots",installed:true,enabled:modState["playerbots"] ?? false,switchable:true,status:"early",icon:"swords",page:"bots",hidden:false},{id:"client-compat",name:"Client compatibility",description:{en:"Client-server link and appearance unlocks.",ru:"Связь клиента с сервером и разблокировка внешних видов."},repo:"https://github.com/Corfirean/azerothcore-wotlk-coa",installed:true,enabled:modState["client-compat"],switchable:false,status:"release",icon:"plug",page:null,hidden:true}].map(m => ({...m, has_settings: !["tbc-content", "wotlk-content"].includes(m.id), compatibility: realm === "wildcard" ? (["companions", "playerbots"].includes(m.id) ? "unsupported" : m.id === "client-compat" ? "compatible" : "experimental") : "compatible", switchable: realm === "wildcard" && ["companions", "playerbots"].includes(m.id) ? false : m.switchable}));
|
||||||
if(cmd==="module_set_enabled"){ modState[args.module]=args.enabled; return null; }
|
if(cmd==="module_set_enabled"){ if(args.enabled && ["companions","playerbots"].includes(args.module) && modState[args.module === "companions" ? "playerbots" : "companions"]) throw {human:{code:"bot_modules_conflict",title:"",message:"",actions:[]},technical:"Only one bot system may be enabled."}; modState[args.module]=args.enabled; return null; }
|
||||||
if(cmd==="all_settings") return [{key:"Visibility.Distance.Continents",value:"100",default:"90",doc:"Description: Visibility distance on continents. Range: 45-250 Default: 90",changed:true},{key:"Death.SicknessLevel",value:"11",default:"11",doc:"Description: Character level up to which characters get resurrection sickness. Default: 11",changed:false},{key:"Rate.Drop.Item.Epic",value:"3",default:"1",doc:"Description: Drop rates for money and items based on quality. Default: 1",changed:true},{key:"Instance.ResetTimeHour",value:"4",default:"4",doc:"Description: Hour of the day when the global instance reset occurs. Range: 0-23 Default: 4 - (04:00 AM)",changed:false},{key:"PlayerLimit",value:"1000",default:"1000",doc:"Description: Maximum number of players in the world.",changed:false}];
|
if(cmd==="all_settings") return [{key:"Visibility.Distance.Continents",value:"100",default:"90",doc:"Description: Visibility distance on continents. Range: 45-250 Default: 90",changed:true},{key:"Death.SicknessLevel",value:"11",default:"11",doc:"Description: Character level up to which characters get resurrection sickness. Default: 11",changed:false},{key:"Rate.Drop.Item.Epic",value:"3",default:"1",doc:"Description: Drop rates for money and items based on quality. Default: 1",changed:true},{key:"Instance.ResetTimeHour",value:"4",default:"4",doc:"Description: Hour of the day when the global instance reset occurs. Range: 0-23 Default: 4 - (04:00 AM)",changed:false},{key:"PlayerLimit",value:"1000",default:"1000",doc:"Description: Maximum number of players in the world.",changed:false}];
|
||||||
if(cmd==="all_settings_save") return Object.keys(args&&args.changes||{});
|
if(cmd==="all_settings_save") return Object.keys(args&&args.changes||{});
|
||||||
if(cmd==="module_settings" && args.module==="client-compat") return [{key:"CoA.UnlockLocalAppearanceCatalog",value:"1",default:"1",doc:""},{key:"CoA.UnlockAllVanity",value:"1",default:"1",doc:""},{key:"CoA.AutoCollectAppearances",value:"0",default:"1",doc:""},{key:"CoA.LearnOwnedCompanions",value:"1",default:"1",doc:""},{key:"CoA.MaxRidingFromStart",value:"1",default:"1",doc:""}];
|
if(cmd==="module_settings" && args.module==="client-compat") return [{key:"CoA.UnlockLocalAppearanceCatalog",value:"1",default:"1",doc:""},{key:"CoA.UnlockAllVanity",value:"1",default:"1",doc:""},{key:"CoA.AutoCollectAppearances",value:"0",default:"1",doc:""},{key:"CoA.LearnOwnedCompanions",value:"1",default:"1",doc:""},{key:"CoA.MaxRidingFromStart",value:"1",default:"1",doc:""}];
|
||||||
if(cmd==="module_settings"){
|
if(cmd==="module_settings"){
|
||||||
const S:Record<string,{key:string;value:string;default:string;doc:string}[]>={
|
const S:Record<string,{key:string;value:string;default:string;doc:string}[]>={
|
||||||
"npc-enchanter":[{key:"Enchanter.Enable",value:"1",default:"1",doc:"Enable the module."},{key:"Enchanter.Announce",value:"0",default:"0",doc:"Announce the module when the player logs in."},{key:"Enchanter.CostCopper",value:"0",default:"0",doc:"What one enchantment costs, in copper (10000 = 1 gold). 0 = free."},{key:"Enchanter.MessageTimer",value:"60000",default:"60000",doc:"How often the NPC emotes, in milliseconds."}],
|
"npc-enchanter":[{key:"Enchanter.Enable",value:"1",default:"1",doc:"Enable the module."},{key:"Enchanter.Announce",value:"0",default:"0",doc:"Announce the module when the player logs in."},{key:"Enchanter.CostCopper",value:"0",default:"0",doc:"What one enchantment costs, in copper (10000 = 1 gold). 0 = free."},{key:"Enchanter.MessageTimer",value:"60000",default:"60000",doc:"How often the NPC emotes, in milliseconds."}],
|
||||||
"companions":[{key:"CoaBots.Enable",value:"1",default:"1",doc:"Master switch of the companion bots."},{key:"CoaBots.MaxPerPlayer",value:"4",default:"4",doc:"How many bots one player can have at a time."}],
|
"playerbots":[{"key": "AiPlayerbot.RandomBotAutologin", "value": "1", "default": "1", "doc": ""}, {"key": "AiPlayerbot.MinRandomBots", "value": "500", "default": "500", "doc": ""}, {"key": "AiPlayerbot.MaxRandomBots", "value": "500", "default": "500", "doc": ""}, {"key": "AiPlayerbot.RandomBotAccountCount", "value": "0", "default": "0", "doc": ""}, {"key": "AiPlayerbot.RandomBotMinLevel", "value": "1", "default": "1", "doc": ""}, {"key": "AiPlayerbot.RandomBotMaxLevel", "value": "60", "default": "60", "doc": ""}, {"key": "AiPlayerbot.SyncLevelWithPlayers", "value": "0", "default": "0", "doc": ""}, {"key": "AiPlayerbot.RandomBotInvitePlayer", "value": "0", "default": "0", "doc": ""}, {"key": "AiPlayerbot.RandomBotJoinLfg", "value": "1", "default": "1", "doc": ""}, {"key": "AiPlayerbot.RandomBotJoinBG", "value": "1", "default": "1", "doc": ""}, {"key": "AiPlayerbot.RandomBotAutoJoinBG", "value": "0", "default": "0", "doc": ""}, {"key": "AiPlayerbot.RandomBotTalk", "value": "1", "default": "1", "doc": ""}, {"key": "AiPlayerbot.RandomBotEmote", "value": "0", "default": "0", "doc": ""}, {"key": "AiPlayerbot.RandomBotSuggestDungeons", "value": "1", "default": "1", "doc": ""}, {"key": "AiPlayerbot.CoaClassesOnly", "value": "1", "default": "1", "doc": ""}, {"key": "AiPlayerbot.CoaSmartHeal", "value": "1", "default": "1", "doc": ""}, {"key": "AiPlayerbot.CoaSmartTank", "value": "1", "default": "1", "doc": ""}, {"key": "AiPlayerbot.CoaSpecRotations", "value": "1", "default": "1", "doc": ""}, {"key": "AiPlayerbot.CoaInterruptCoordination", "value": "1", "default": "1", "doc": ""}, {"key": "AiPlayerbot.MaxAddedBots", "value": "40", "default": "40", "doc": ""}, {"key": "AiPlayerbot.BotAutologin", "value": "0", "default": "0", "doc": ""}, {"key": "AiPlayerbot.DisabledWithoutRealPlayer", "value": "0", "default": "0", "doc": ""}, {"key": "AiPlayerbot.AddClassCommand", "value": "1", "default": "1", "doc": ""}, {"key": "AiPlayerbot.KeepAltsInGroup", "value": "0", "default": "0", "doc": ""}, {"key": "AiPlayerbot.CoaRecruitSameFaction", "value": "1", "default": "1", "doc": ""}, {"key": "AiPlayerbot.CoaLfgBots", "value": "1", "default": "1", "doc": ""}, {"key": "AiPlayerbot.RandomBotXPRate", "value": "1.0", "default": "1.0", "doc": ""}, {"key": "AiPlayerbot.FollowDistance", "value": "1.5", "default": "1.5", "doc": ""}, {"key": "AiPlayerbot.Enabled", "value": "0", "default": "0", "doc": ""}, {"key": "AiPlayerbot.RandomBotAccountPrefix", "value": "\"rndbot\"", "default": "\"rndbot\"", "doc": ""}, {"key": "AiPlayerbot.RandomBotUpdateInterval", "value": "20", "default": "20", "doc": ""}],
|
||||||
"content-scaling":[{key:"CoAContentScaling.Enable",value:"1",default:"1",doc:"Scale dungeons and raids to the group."}],
|
"companions":[{key:"CoaBots.Enable",value:"1",default:"1",doc:"Master switch of the companion bots."},{key:"CoaBots.RandomSpawn.DefaultCount",value:"10",default:"10",doc:""}],
|
||||||
|
"content-scaling":[{key:"CoAContentScaling.Enable",value:"1",default:"1",doc:"Scale dungeons and raids to the group."}, ...[{key:"CoAContentScaling.LFG.AllowPartialGroups",value:"1"},{key:"CoAContentScaling.World.Leech.Enable",value:"0"},{key:"CoAContentScaling.World.Leech.Percent",value:"5.0"},{key:"CoAContentScaling.Difficulty.DamageMultiplier",value:"1.0"},{key:"CoAContentScaling.SoloAssist.Mode",value:"1"},{key:"CoAContentScaling.GroupScaling.Enable",value:"1"},{key:"CoAContentScaling.LFG.DefaultMode",value:"CurrentParty"},{key:"CoAContentScaling.LFG.DefaultChallengeSize",value:"0"},{key:"CoAContentScaling.Debug",value:"0"}].map(s=>({...s,default:s.value,doc:""}))],
|
||||||
|
"ah-bot":[...Object.keys(auctionCategories).flatMap(category => Object.keys(auctionQualities).map(quality => ({key:`AuctionHouseBot.ListProportion.Category${category}.Quality${quality}`,value:String(quality === "Normal" && !["Quest","Key","Generic","Reagent"].includes(category) ? 50 : quality === "Rare" && ["Armor","Weapon"].includes(category) ? 5 : 0),default:String(quality === "Normal" && !["Quest","Key","Generic","Reagent"].includes(category) ? 50 : quality === "Rare" && ["Armor","Weapon"].includes(category) ? 5 : 0),doc:""}))), {key:"AuctionHouseBot.Enable",value:"false",default:"false",doc:""}, ...[{key:"AuctionHouseBot.GUIDs",value:"0"},{key:"AuctionHouseBot.EnableSeller",value:"true"},{key:"AuctionHouseBot.CoA.ObtainableItemsOnly",value:"true"},{key:"AuctionHouseBot.ItemsPerCycle",value:"150"},{key:"AuctionHouseBot.MinutesBetweenSellCycle",value:"1"},{key:"AuctionHouseBot.Alliance.MinItems",value:"15000"},{key:"AuctionHouseBot.Alliance.MaxItems",value:"15000"}].map(s=>({...s,default:s.value,doc:""}))],
|
||||||
"tbc-content":[{key:"CoATBC.Enable",value:"1",default:"1",doc:"Outland dungeons and raids."}],
|
"tbc-content":[{key:"CoATBC.Enable",value:"1",default:"1",doc:"Outland dungeons and raids."}],
|
||||||
"wotlk-content":[{key:"CoAWotLK.Enable",value:"1",default:"1",doc:"Northrend dungeons and raids."}],
|
"wotlk-content":[{key:"CoAWotLK.Enable",value:"1",default:"1",doc:"Northrend dungeons and raids."}],
|
||||||
};
|
};
|
||||||
return S[args.module]??[];
|
return (S[args.module]??[]).map(s => ({...s, value: moduleEdits[args.module]?.[s.key] ?? s.value}));
|
||||||
}
|
}
|
||||||
if(cmd==="module_save_settings") return Object.keys(args.changes);
|
if(cmd==="module_save_settings") { moduleEdits[args.module] = {...moduleEdits[args.module], ...args.changes}; return Object.keys(args.changes); }
|
||||||
if(cmd==="report_context") return {manager_version:"0.3.1",windows:"Windows 11 (build 26200)",install_kind:"new",server_version:"0.261001.10"};
|
if(cmd==="report_context") return {manager_version:"0.3.1",windows:"Windows 11 (build 26200)",install_kind:"new",server_version:"0.261001.10",suggested_target:"companions",bots_version:"0.2.1 · 1a2b3c4d"};
|
||||||
|
if(cmd==="report_targets") return [{id:"manager",repo:"Corfirean/coa-server-manager",ours:true},{id:"companions",repo:"Corfirean/mod-coa-playerbots",ours:true},{id:"squid",repo:"Zyth45/mod-playerbots",ours:false}];
|
||||||
if(cmd==="open_link"){(window as any).__lastLink=args.url;return null;}
|
if(cmd==="open_link"){(window as any).__lastLink=args.url;return null;}
|
||||||
if(cmd==="export_diagnostics") return "C:\\Users\\you\\Desktop\\CoA-Diagnostics-20261001-140000.zip";
|
if(cmd==="export_diagnostics") return "C:\\Users\\you\\Desktop\\CoA-Diagnostics-20261001-140000.zip";
|
||||||
if(cmd==="install_preflight") return {ok:true,problems:[],free_bytes:210*2**30};
|
if(cmd==="install_preflight") return {ok:true,problems:[],free_bytes:210*2**30};
|
||||||
@@ -88,7 +97,7 @@ export {};
|
|||||||
if(cmd==="account_set_access"){const a=(window as any).__acc.find((x: any)=>x.name===args.name);if(a)a.access=args.level;return null;}
|
if(cmd==="account_set_access"){const a=(window as any).__acc.find((x: any)=>x.name===args.name);if(a)a.access=args.level;return null;}
|
||||||
if(cmd==="account_set_password") return null;
|
if(cmd==="account_set_password") return null;
|
||||||
if(cmd==="account_rename"){const a=(window as any).__acc.find((x: any)=>x.name===args.name);if(a)a.name=String(args.newName).toUpperCase();return null;}
|
if(cmd==="account_rename"){const a=(window as any).__acc.find((x: any)=>x.name===args.name);if(a)a.name=String(args.newName).toUpperCase();return null;}
|
||||||
if(cmd==="client_info"){const c=(window as any).__client??"none";return c==="none"?null:{path:"C:\\games\\CoA Client",executable:"Ascension.exe",realmlists:[{path:"x",host:"127.0.0.1"}],addon:{installed:true,version:"1",up_to_date:true},other_addons:2};}
|
if(cmd==="client_info"){const c=(window as any).__client??"none";return c==="none"?null:{path:"C:\\games\\CoA Client",executable:"Ascension.exe",realmlists:[{path:"x",host:args.id==="@remote-client"?remoteHost:"127.0.0.1"}],addon:{installed:true,version:"1",up_to_date:true},other_addons:2};}
|
||||||
if(cmd==="set_client"){(window as any).__client="foreign";return {path:args.path,executable:"Ascension.exe",realmlists:[],addon:{installed:false,version:null,up_to_date:null},other_addons:0};}
|
if(cmd==="set_client"){(window as any).__client="foreign";return {path:args.path,executable:"Ascension.exe",realmlists:[],addon:{installed:false,version:null,up_to_date:null},other_addons:0};}
|
||||||
if(cmd==="plugin:event|listen"){const w=window as any;(w.__handlers??={})[args.event]=[...(w.__handlers[args.event]??[]),args.handler];return 1;}
|
if(cmd==="plugin:event|listen"){const w=window as any;(w.__handlers??={})[args.event]=[...(w.__handlers[args.event]??[]),args.handler];return 1;}
|
||||||
if(cmd==="plugin:event|unlisten") return null;
|
if(cmd==="plugin:event|unlisten") return null;
|
||||||
|
|||||||
+53
-3
@@ -2,6 +2,21 @@ import type en from "./en";
|
|||||||
|
|
||||||
/** Deutsch. Entwurf einer Übersetzung; vor der Veröffentlichung von Muttersprachlern zu prüfen. */
|
/** Deutsch. Entwurf einer Übersetzung; vor der Veröffentlichung von Muttersprachlern zu prüfen. */
|
||||||
const de: Partial<Record<keyof typeof en, string>> = {
|
const de: Partial<Record<keyof typeof en, string>> = {
|
||||||
|
"remote.clientReady": "Dein Client ist bereit. Speichere die Hostadresse und klicke auf Spielen.",
|
||||||
|
"remote.clientIntro": "Wähle einen vorhandenen Spielclient oder lade ihn hier herunter. Ein lokaler Server ist nicht nötig.",
|
||||||
|
"welcome.host.title": "Einen Server hosten",
|
||||||
|
"welcome.host.text": "Einen neuen Server installieren oder einen vorhandenen verwalten.",
|
||||||
|
"welcome.connect.title": "Mit anderem Server verbinden",
|
||||||
|
"welcome.connect.text": "Den Spielclient herunterladen oder aktualisieren und bei Freunden spielen.",
|
||||||
|
"remote.intro": "Richte deinen Spielclient ein. Dein Freund betreibt den Server.",
|
||||||
|
"remote.address": "Serveradresse",
|
||||||
|
"remote.addressHint": "Für LAN-Spiele frage den Host nach der lokalen IP-Adresse seines Computers.",
|
||||||
|
"remote.save": "Adresse speichern",
|
||||||
|
"remote.saved": "Serveradresse gespeichert.",
|
||||||
|
"remote.accountHint": "Bitte den Host, ein Spielkonto für dich anzulegen.",
|
||||||
|
"remote.hostInstead": "Eigenen Server hosten",
|
||||||
|
"welcome.roleSubtitle": "Wie möchtest du spielen?",
|
||||||
|
|
||||||
"nav.overview": "Übersicht",
|
"nav.overview": "Übersicht",
|
||||||
"nav.bots": "Bots",
|
"nav.bots": "Bots",
|
||||||
"nav.server": "Server",
|
"nav.server": "Server",
|
||||||
@@ -58,6 +73,9 @@ const de: Partial<Record<keyof typeof en, string>> = {
|
|||||||
"btn.stop": "SERVER STOPPEN",
|
"btn.stop": "SERVER STOPPEN",
|
||||||
"btn.stopSmall": "Stoppen",
|
"btn.stopSmall": "Stoppen",
|
||||||
"btn.restart": "Neustart",
|
"btn.restart": "Neustart",
|
||||||
|
"btn.startWithoutUpdate": "Ohne Update starten",
|
||||||
|
"btn.playWithoutUpdate": "Ohne Update spielen",
|
||||||
|
"import.squidRepackWarning": "Dieses SquidBots-Repack prüft den Worldserver-Hash. Ein Austausch kann Start_All_Bots und coa_update deaktivieren. Updates fragen vorher nach.",
|
||||||
"btn.play": "SPIELEN",
|
"btn.play": "SPIELEN",
|
||||||
"btn.startPlay": "STARTEN & SPIELEN",
|
"btn.startPlay": "STARTEN & SPIELEN",
|
||||||
"btn.startingCaps": "STARTET …",
|
"btn.startingCaps": "STARTET …",
|
||||||
@@ -346,10 +364,11 @@ const de: Partial<Record<keyof typeof en, string>> = {
|
|||||||
"upd.confirmBack": "Zur vorherigen Version zurückkehren? Deine Charaktere und Konten werden nicht verändert.",
|
"upd.confirmBack": "Zur vorherigen Version zurückkehren? Deine Charaktere und Konten werden nicht verändert.",
|
||||||
"upd.wentBack": "Zur vorherigen Version zurückgekehrt. Deine Daten wurden nicht angetastet.",
|
"upd.wentBack": "Zur vorherigen Version zurückgekehrt. Deine Daten wurden nicht angetastet.",
|
||||||
"upd.dialogTitle": "Wähle einen Update-Paketordner",
|
"upd.dialogTitle": "Wähle einen Update-Paketordner",
|
||||||
|
"upd.retryValidation": "Serverstart erneut prüfen",
|
||||||
"upd.pendingBad": "Der aktualisierte Server ist nicht korrekt gestartet",
|
"upd.pendingBad": "Der aktualisierte Server ist nicht korrekt gestartet",
|
||||||
"upd.pendingUnfinished": "Ein früheres Update wurde nicht abgeschlossen",
|
"upd.pendingUnfinished": "Ein früheres Update wurde nicht abgeschlossen",
|
||||||
"upd.safeBack": "Du kannst sicher zur vorherigen Version zurückkehren.",
|
"upd.safeBack": "Du kannst sicher zur vorherigen Version zurückkehren.",
|
||||||
"upd.backNote": "Das Zurückkehren stellt Programmdateien und Einstellungen wieder her. Charaktere und Konten werden nie automatisch zurückgesetzt.",
|
"upd.backNote": "Die Rückkehr stellt Dateien und Einstellungen wieder her. Wurden Datenbankupdates begonnen, werden auch alle Datenbanken aus der Sicherung vor dem Update wiederhergestellt. Späterer Fortschritt geht verloren.",
|
||||||
"upd.goBackTo": "Zu Version {v} zurückkehren",
|
"upd.goBackTo": "Zu Version {v} zurückkehren",
|
||||||
"upd.goBackBefore": "Zur Version vor dem Update zurückkehren",
|
"upd.goBackBefore": "Zur Version vor dem Update zurückkehren",
|
||||||
"upd.title": "Server-Updates",
|
"upd.title": "Server-Updates",
|
||||||
@@ -683,9 +702,9 @@ const de: Partial<Record<keyof typeof en, string>> = {
|
|||||||
"rep.expectedHint": "Beschreibe das erwartete Verhalten.",
|
"rep.expectedHint": "Beschreibe das erwartete Verhalten.",
|
||||||
"rep.steps": "Schritte zum Nachstellen",
|
"rep.steps": "Schritte zum Nachstellen",
|
||||||
"rep.attachTitle": "Logs und Screenshots",
|
"rep.attachTitle": "Logs und Screenshots",
|
||||||
"rep.attachText": "Erstelle eine Diagnosedatei (Einstellungen und Logs ohne Passwörter und Adressen) und ziehe sie zusammen mit Screenshots oder Videos auf die GitHub-Seite, sobald sie offen ist.",
|
"rep.attachText": "Ein Klick sammelt die Diagnose: Logs des Managers und des Servers, Absturzberichte, Windows-Absturzeinträge und Update-Protokolle, ohne Passwörter und Adressen. Der Ordner mit der Datei wird geöffnet; ziehe die Datei zusammen mit Screenshots oder Videos auf die GitHub-Seite.",
|
||||||
"rep.makeFile": "Diagnosedatei erstellen",
|
"rep.makeFile": "Diagnosedatei erstellen",
|
||||||
"rep.fileSaved": "Gespeichert unter {path}. Ziehe diese Datei in das GitHub-Issue.",
|
"rep.fileSaved": "Gespeichert unter {path}. Der Ordner wurde geöffnet. Ziehe diese Datei in das GitHub-Issue.",
|
||||||
"rep.privacy": "Bitte entferne Passwörter, Tokens, private IP-Angaben und andere sensible Daten, bevor du Logs veröffentlichst.",
|
"rep.privacy": "Bitte entferne Passwörter, Tokens, private IP-Angaben und andere sensible Daten, bevor du Logs veröffentlichst.",
|
||||||
"rep.open": "Bericht auf GitHub öffnen",
|
"rep.open": "Bericht auf GitHub öffnen",
|
||||||
"rep.copy": "Text kopieren",
|
"rep.copy": "Text kopieren",
|
||||||
@@ -695,6 +714,17 @@ const de: Partial<Record<keyof typeof en, string>> = {
|
|||||||
"rep.opened": "GitHub wurde im Browser geöffnet. Prüfe den Text, hänge Dateien an und klicke auf „Submit new issue“.",
|
"rep.opened": "GitHub wurde im Browser geöffnet. Prüfe den Text, hänge Dateien an und klicke auf „Submit new issue“.",
|
||||||
"rep.openedLong": "Der Bericht ist für einen Link zu lang und wurde deshalb in die Zwischenablage kopiert. GitHub ist geöffnet: Füge ihn (Strg+V) in die Beschreibung ein, hänge Dateien an und klicke auf „Submit new issue“.",
|
"rep.openedLong": "Der Bericht ist für einen Link zu lang und wurde deshalb in die Zwischenablage kopiert. GitHub ist geöffnet: Füge ihn (Strg+V) in die Beschreibung ein, hänge Dateien an und klicke auf „Submit new issue“.",
|
||||||
"rep.copied": "In die Zwischenablage kopiert.",
|
"rep.copied": "In die Zwischenablage kopiert.",
|
||||||
|
"rep.targetTitle": "Worum geht es bei dem Problem?",
|
||||||
|
"rep.target.manager": "CoA Server Manager, der Server oder andere Module",
|
||||||
|
"rep.target.companions": "CoA Companions (Bots und das CoABotUI-Addon)",
|
||||||
|
"rep.target.squid": "SQUID Playerbots",
|
||||||
|
"rep.targetPublic": "Der Bericht wird öffentlich auf GitHub in {repo} veröffentlicht.",
|
||||||
|
"rep.botsVersion": "Bot-Version",
|
||||||
|
"rep.withDiag": "Diagnose für mich sammeln (empfohlen)",
|
||||||
|
"rep.collectOpen": "Diagnose sammeln und Bericht öffnen",
|
||||||
|
"rep.collecting": "Diagnose wird gesammelt…",
|
||||||
|
"overview.reportHint": "Ein Dienst wurde von selbst beendet?",
|
||||||
|
"overview.reportBtn": "Diagnose sammeln und melden",
|
||||||
|
|
||||||
// Realmlist switcher and modules page
|
// Realmlist switcher and modules page
|
||||||
"realm.profileLabel": "Realm",
|
"realm.profileLabel": "Realm",
|
||||||
@@ -724,6 +754,18 @@ const de: Partial<Record<keyof typeof en, string>> = {
|
|||||||
"realm.confirmDelete": "Realmlist „{name}“ entfernen? Der Spielclient behält die aktuelle Datei.",
|
"realm.confirmDelete": "Realmlist „{name}“ entfernen? Der Spielclient behält die aktuelle Datei.",
|
||||||
"nav.modules": "Module",
|
"nav.modules": "Module",
|
||||||
"q.modules": "Welche Zusatzfunktionen hat der Server?",
|
"q.modules": "Welche Zusatzfunktionen hat der Server?",
|
||||||
|
"mod.ahbot.types": "Verkaufte Gegenstandstypen",
|
||||||
|
"mod.ahbot.typesHint": "Typen für neue Angebote auswählen. Bestehende Auktionen bleiben. Einschalten stellt die vorherigen Gewichte dieser Sitzung oder die Standardwerte wieder her.",
|
||||||
|
"mod.ahbot.qualityWeights": "Qualität und Häufigkeit",
|
||||||
|
"mod.ahbot.weightsHint": "Relative Gewichte, keine Prozente. 0 schließt eine Qualität aus; höhere Werte erhöhen die Häufigkeit. Sind alle Standardwerte 0, wird gewöhnliche Qualität gewählt. Andere Filter gelten weiterhin.",
|
||||||
|
"mod.ahbot.noTypes": "Alle Typen sind deaktiviert. Der Verkäufer hat keine Typen für neue Angebote.",
|
||||||
|
"mod.noSettings": "Keine weiteren Einstellungen. Verwende den Modulschalter oben.",
|
||||||
|
"err.bot_modules_conflict.title": "Zwei Bot-Module sind aktiviert",
|
||||||
|
"err.bot_modules_conflict.message": "Deaktiviere CoA Companions oder SQUID Playerbots unter Module vor dem Serverstart.",
|
||||||
|
"mod.ahbot.setup": "Modul und Verkäufer aktivieren. Der Server legt beim ersten Start selbst einen Auktionscharakter an (Konto AHBOT), eine GUID ist nicht nötig. Ein Charakter bietet in den Auktionshäusern beider Fraktionen an. Der CoA-Filter nutzt Beute-, Händler- und Berufstabellen; Stufengrenzen gelten zusätzlich. Erfordert einen Serverbuild mit CoA-Auktionsfilter und automatischem Auktionscharakter.",
|
||||||
|
"mod.enchanter.add": "Verzauberer platzieren: Stellt euch an die gewünschte Stelle und gebt .npc add 601015 ein",
|
||||||
|
"mod.enchanter.remove": "Verzauberer entfernen: Ziel auf den NPC setzen und .npc delete eingeben",
|
||||||
|
"mod.ahbot.allSettings": "Alle Auktionseinstellungen",
|
||||||
"mod.title": "Module",
|
"mod.title": "Module",
|
||||||
"mod.intro": "Zusatzfunktionen, die im Server eingebaut sind. Schalte die gewünschten ein oder aus, öffne ihre GitHub-Seite oder ändere ihre Einstellungen.",
|
"mod.intro": "Zusatzfunktionen, die im Server eingebaut sind. Schalte die gewünschten ein oder aus, öffne ihre GitHub-Seite oder ändere ihre Einstellungen.",
|
||||||
"mod.restart": "Änderungen werden nach einem Neustart des Weltservers wirksam.",
|
"mod.restart": "Änderungen werden nach einem Neustart des Weltservers wirksam.",
|
||||||
@@ -787,6 +829,14 @@ const de: Partial<Record<keyof typeof en, string>> = {
|
|||||||
"upd.current": "Du bist auf dem neuesten Stand (Version {v}).",
|
"upd.current": "Du bist auf dem neuesten Stand (Version {v}).",
|
||||||
"client.job.checking": "Client wird geprüft…",
|
"client.job.checking": "Client wird geprüft…",
|
||||||
"client.job.updating": "Client wird aktualisiert",
|
"client.job.updating": "Client wird aktualisiert",
|
||||||
|
"fr.lan.address": "Netzwerkadresse",
|
||||||
|
"fr.lan.automatic": "Automatisch",
|
||||||
|
"fr.lan.default": "Standard",
|
||||||
|
"fr.lan.custom": "Eigene Adresse…",
|
||||||
|
"fr.lan.customIpv4": "Eigene IPv4-Adresse",
|
||||||
|
"fr.lan.unavailable": "Ausgewählte Adresse nicht verfügbar",
|
||||||
|
"fr.lan.unavailableText": "Die ausgewählte Adresse ist derzeit keinem erkannten lokalen Netzwerkadapter zugewiesen. Wählen Sie eine andere Adresse oder Automatisch, oder behalten Sie diese Adresse bewusst bei.",
|
||||||
|
"fr.lan.invalid": "Ungültige IPv4-Adresse",
|
||||||
};
|
};
|
||||||
|
|
||||||
export default de;
|
export default de;
|
||||||
+53
-3
@@ -1,5 +1,20 @@
|
|||||||
/** English is the source of truth: every key must exist here; other locales fall back to it. */
|
/** English is the source of truth: every key must exist here; other locales fall back to it. */
|
||||||
const en = {
|
const en = {
|
||||||
|
"remote.clientReady": "Your client is ready. Save the host’s address, then press Play.",
|
||||||
|
"remote.clientIntro": "Choose an existing game client or download one here. No local server is needed.",
|
||||||
|
"welcome.host.title": "Host a server",
|
||||||
|
"welcome.host.text": "Install a new server or manage one you already have.",
|
||||||
|
"welcome.connect.title": "Connect to another server",
|
||||||
|
"welcome.connect.text": "Download or update the game client and play on a friend’s server.",
|
||||||
|
"remote.intro": "Set up your game client. Your friend runs the server.",
|
||||||
|
"remote.address": "Server address",
|
||||||
|
"remote.addressHint": "For LAN play, ask the host for their computer’s local IP address.",
|
||||||
|
"remote.save": "Save address",
|
||||||
|
"remote.saved": "Server address saved.",
|
||||||
|
"remote.accountHint": "Ask the host to create a game account for you.",
|
||||||
|
"remote.hostInstead": "Host my own server",
|
||||||
|
"welcome.roleSubtitle": "How would you like to play?",
|
||||||
|
|
||||||
"realm.profileLabel": "Realm",
|
"realm.profileLabel": "Realm",
|
||||||
"realm.startupTitle": "Realm startup",
|
"realm.startupTitle": "Realm startup",
|
||||||
"realm.secondWorld": "Second world",
|
"realm.secondWorld": "Second world",
|
||||||
@@ -89,6 +104,9 @@ const en = {
|
|||||||
"btn.stop": "STOP SERVER",
|
"btn.stop": "STOP SERVER",
|
||||||
"btn.stopSmall": "Stop",
|
"btn.stopSmall": "Stop",
|
||||||
"btn.restart": "Restart",
|
"btn.restart": "Restart",
|
||||||
|
"btn.startWithoutUpdate": "Start without updating",
|
||||||
|
"btn.playWithoutUpdate": "Play without updating",
|
||||||
|
"import.squidRepackWarning": "This SquidBots repack checks its worldserver hash. Replacing the binary can stop Start_All_Bots and coa_update from working. Updates will ask before replacing it.",
|
||||||
"btn.play": "PLAY",
|
"btn.play": "PLAY",
|
||||||
"btn.startPlay": "START & PLAY",
|
"btn.startPlay": "START & PLAY",
|
||||||
"btn.startingCaps": "STARTING…",
|
"btn.startingCaps": "STARTING…",
|
||||||
@@ -379,10 +397,11 @@ const en = {
|
|||||||
"upd.confirmBack": "Go back to the previous version? Your characters and accounts are not changed.",
|
"upd.confirmBack": "Go back to the previous version? Your characters and accounts are not changed.",
|
||||||
"upd.wentBack": "Went back to the previous version. Your data was not touched.",
|
"upd.wentBack": "Went back to the previous version. Your data was not touched.",
|
||||||
"upd.dialogTitle": "Choose an update package folder",
|
"upd.dialogTitle": "Choose an update package folder",
|
||||||
|
"upd.retryValidation": "Retry server startup",
|
||||||
"upd.pendingBad": "The updated server did not start correctly",
|
"upd.pendingBad": "The updated server did not start correctly",
|
||||||
"upd.pendingUnfinished": "An earlier update did not finish",
|
"upd.pendingUnfinished": "An earlier update did not finish",
|
||||||
"upd.safeBack": "You can safely go back to the previous version.",
|
"upd.safeBack": "You can safely go back to the previous version.",
|
||||||
"upd.backNote": "Going back restores program files and settings. Characters and accounts are never rolled back automatically.",
|
"upd.backNote": "Going back restores files and settings. If database updates started, it also restores all databases to the backup taken before the update. Later progress will be lost.",
|
||||||
"upd.goBackTo": "Go back to version {v}",
|
"upd.goBackTo": "Go back to version {v}",
|
||||||
"upd.goBackBefore": "Go back to the version before the update",
|
"upd.goBackBefore": "Go back to the version before the update",
|
||||||
"upd.title": "Server updates",
|
"upd.title": "Server updates",
|
||||||
@@ -716,9 +735,9 @@ const en = {
|
|||||||
"rep.expectedHint": "Describe the expected behaviour.",
|
"rep.expectedHint": "Describe the expected behaviour.",
|
||||||
"rep.steps": "Steps to reproduce",
|
"rep.steps": "Steps to reproduce",
|
||||||
"rep.attachTitle": "Logs and screenshots",
|
"rep.attachTitle": "Logs and screenshots",
|
||||||
"rep.attachText": "Create a diagnostics file (settings and logs with passwords and addresses removed) and drag it, together with any screenshot or video, into the GitHub page once it is open.",
|
"rep.attachText": "One click collects the diagnostics: the Manager's and the server's logs, crash reports, Windows crash records and update journals, with passwords and addresses removed. The file's folder opens; drag the file, together with any screenshot or video, into the GitHub page.",
|
||||||
"rep.makeFile": "Create the diagnostics file",
|
"rep.makeFile": "Create the diagnostics file",
|
||||||
"rep.fileSaved": "Saved to {path}. Drag this file into the GitHub issue.",
|
"rep.fileSaved": "Saved to {path}. The folder was opened. Drag this file into the GitHub issue.",
|
||||||
"rep.privacy": "Please remove passwords, tokens, private IP information or other sensitive data before posting logs.",
|
"rep.privacy": "Please remove passwords, tokens, private IP information or other sensitive data before posting logs.",
|
||||||
"rep.open": "Open the report on GitHub",
|
"rep.open": "Open the report on GitHub",
|
||||||
"rep.copy": "Copy the text",
|
"rep.copy": "Copy the text",
|
||||||
@@ -728,6 +747,17 @@ const en = {
|
|||||||
"rep.opened": "GitHub was opened in your browser. Check the text, attach files and press Submit new issue.",
|
"rep.opened": "GitHub was opened in your browser. Check the text, attach files and press Submit new issue.",
|
||||||
"rep.openedLong": "The report is too long for a link, so it was copied to the clipboard. GitHub is open: paste it (Ctrl+V) into the description, attach files and press Submit new issue.",
|
"rep.openedLong": "The report is too long for a link, so it was copied to the clipboard. GitHub is open: paste it (Ctrl+V) into the description, attach files and press Submit new issue.",
|
||||||
"rep.copied": "Copied to the clipboard.",
|
"rep.copied": "Copied to the clipboard.",
|
||||||
|
"rep.targetTitle": "What is the problem about?",
|
||||||
|
"rep.target.manager": "CoA Server Manager, the server or other modules",
|
||||||
|
"rep.target.companions": "CoA Companions (bots and the CoABotUI addon)",
|
||||||
|
"rep.target.squid": "SQUID Playerbots",
|
||||||
|
"rep.targetPublic": "The report will be public on GitHub in {repo}.",
|
||||||
|
"rep.botsVersion": "Bot release",
|
||||||
|
"rep.withDiag": "Collect the diagnostics for me (recommended)",
|
||||||
|
"rep.collectOpen": "Collect diagnostics and open the report",
|
||||||
|
"rep.collecting": "Collecting diagnostics…",
|
||||||
|
"overview.reportHint": "A service stopped on its own?",
|
||||||
|
"overview.reportBtn": "Collect diagnostics and report",
|
||||||
|
|
||||||
// Realmlist switcher and modules page
|
// Realmlist switcher and modules page
|
||||||
"realm.label": "Realm",
|
"realm.label": "Realm",
|
||||||
@@ -745,6 +775,18 @@ const en = {
|
|||||||
"realm.confirmDelete": "Remove the realmlist “{name}”? The game client keeps whatever file it has now.",
|
"realm.confirmDelete": "Remove the realmlist “{name}”? The game client keeps whatever file it has now.",
|
||||||
"nav.modules": "Modules",
|
"nav.modules": "Modules",
|
||||||
"q.modules": "What extra features does the server have?",
|
"q.modules": "What extra features does the server have?",
|
||||||
|
"mod.ahbot.types": "Item types for sale",
|
||||||
|
"mod.ahbot.typesHint": "Choose types for new listings. Existing auctions remain. Enabling a type restores its previous weights in this session, or the configured defaults.",
|
||||||
|
"mod.ahbot.qualityWeights": "Quality and frequency",
|
||||||
|
"mod.ahbot.weightsHint": "Relative weights, not percentages. 0 excludes a quality; larger values make it more frequent. If all defaults are zero, enabling selects common quality. Other item filters still apply.",
|
||||||
|
"mod.ahbot.noTypes": "All types are disabled. The seller has no types to choose for new listings.",
|
||||||
|
"mod.noSettings": "There are no additional settings. Use the module switch above.",
|
||||||
|
"mod.ahbot.setup": "Turn on the module and the seller. The server creates its own auction character (account AHBOT) the first time it starts, so no GUID is needed. One character lists in both factions' auction houses. The CoA filter selects items from loot tables, vendors and professions; level restrictions also apply. Requires a server build with the CoA auction filter and the automatic auction character.",
|
||||||
|
"mod.enchanter.add": "Place the enchanter: stand where you want him and enter .npc add 601015",
|
||||||
|
"mod.enchanter.remove": "Remove the enchanter: target him and enter .npc delete",
|
||||||
|
"mod.ahbot.allSettings": "All settings",
|
||||||
|
"err.bot_modules_conflict.title": "Two bot modules are enabled",
|
||||||
|
"err.bot_modules_conflict.message": "Disable CoA Companions or SQUID Playerbots in Modules before starting the server.",
|
||||||
"mod.title": "Modules",
|
"mod.title": "Modules",
|
||||||
"mod.intro": "Extra features built into the server. Switch the ones you want on or off, open their GitHub page, or change their settings.",
|
"mod.intro": "Extra features built into the server. Switch the ones you want on or off, open their GitHub page, or change their settings.",
|
||||||
"mod.restart": "Changes apply after the world server restarts.",
|
"mod.restart": "Changes apply after the world server restarts.",
|
||||||
@@ -808,6 +850,14 @@ const en = {
|
|||||||
"upd.current": "You are up to date (version {v}).",
|
"upd.current": "You are up to date (version {v}).",
|
||||||
"client.job.checking": "Checking the client…",
|
"client.job.checking": "Checking the client…",
|
||||||
"client.job.updating": "Updating the client",
|
"client.job.updating": "Updating the client",
|
||||||
|
"fr.lan.address": "Network address",
|
||||||
|
"fr.lan.automatic": "Automatic",
|
||||||
|
"fr.lan.default": "Default",
|
||||||
|
"fr.lan.custom": "Custom address…",
|
||||||
|
"fr.lan.customIpv4": "Custom IPv4 address",
|
||||||
|
"fr.lan.unavailable": "Selected address unavailable",
|
||||||
|
"fr.lan.unavailableText": "The selected address is not currently assigned to a detected local interface. Choose another address or switch to Automatic, or keep this address intentionally.",
|
||||||
|
"fr.lan.invalid": "Invalid IPv4 address",
|
||||||
} as const;
|
} as const;
|
||||||
|
|
||||||
export default en;
|
export default en;
|
||||||
+53
-3
@@ -2,6 +2,21 @@ import type en from "./en";
|
|||||||
|
|
||||||
/** Español. Traducción provisional; debe revisarla un hablante nativo antes de publicarse. */
|
/** Español. Traducción provisional; debe revisarla un hablante nativo antes de publicarse. */
|
||||||
const es: Partial<Record<keyof typeof en, string>> = {
|
const es: Partial<Record<keyof typeof en, string>> = {
|
||||||
|
"remote.clientReady": "Tu cliente está listo. Guarda la dirección del anfitrión y pulsa Jugar.",
|
||||||
|
"remote.clientIntro": "Elige un cliente existente o descárgalo aquí. No necesitas un servidor local.",
|
||||||
|
"welcome.host.title": "Alojar un servidor",
|
||||||
|
"welcome.host.text": "Instalar un servidor nuevo o gestionar uno existente.",
|
||||||
|
"welcome.connect.title": "Conectarse a otro servidor",
|
||||||
|
"welcome.connect.text": "Descargar o actualizar el cliente y jugar en el servidor de un amigo.",
|
||||||
|
"remote.intro": "Configura tu cliente. Tu amigo aloja el servidor.",
|
||||||
|
"remote.address": "Dirección del servidor",
|
||||||
|
"remote.addressHint": "Para jugar en LAN, pide al anfitrión la IP local de su ordenador.",
|
||||||
|
"remote.save": "Guardar dirección",
|
||||||
|
"remote.saved": "Dirección del servidor guardada.",
|
||||||
|
"remote.accountHint": "Pide al anfitrión que te cree una cuenta de juego.",
|
||||||
|
"remote.hostInstead": "Alojar mi servidor",
|
||||||
|
"welcome.roleSubtitle": "¿Cómo quieres jugar?",
|
||||||
|
|
||||||
"nav.overview": "Resumen",
|
"nav.overview": "Resumen",
|
||||||
"nav.bots": "Bots",
|
"nav.bots": "Bots",
|
||||||
"nav.server": "Servidor",
|
"nav.server": "Servidor",
|
||||||
@@ -58,6 +73,9 @@ const es: Partial<Record<keyof typeof en, string>> = {
|
|||||||
"btn.stop": "DETENER SERVIDOR",
|
"btn.stop": "DETENER SERVIDOR",
|
||||||
"btn.stopSmall": "Detener",
|
"btn.stopSmall": "Detener",
|
||||||
"btn.restart": "Reiniciar",
|
"btn.restart": "Reiniciar",
|
||||||
|
"btn.startWithoutUpdate": "Iniciar sin actualizar",
|
||||||
|
"btn.playWithoutUpdate": "Jugar sin actualizar",
|
||||||
|
"import.squidRepackWarning": "Este repack SquidBots verifica el hash del servidor. Sustituirlo puede impedir el funcionamiento de Start_All_Bots y coa_update. Se solicitará confirmación.",
|
||||||
"btn.play": "JUGAR",
|
"btn.play": "JUGAR",
|
||||||
"btn.startPlay": "INICIAR Y JUGAR",
|
"btn.startPlay": "INICIAR Y JUGAR",
|
||||||
"btn.startingCaps": "INICIANDO…",
|
"btn.startingCaps": "INICIANDO…",
|
||||||
@@ -346,10 +364,11 @@ const es: Partial<Record<keyof typeof en, string>> = {
|
|||||||
"upd.confirmBack": "¿Volver a la versión anterior? Tus personajes y cuentas no se modifican.",
|
"upd.confirmBack": "¿Volver a la versión anterior? Tus personajes y cuentas no se modifican.",
|
||||||
"upd.wentBack": "Se volvió a la versión anterior. Tus datos no se tocaron.",
|
"upd.wentBack": "Se volvió a la versión anterior. Tus datos no se tocaron.",
|
||||||
"upd.dialogTitle": "Elige una carpeta de paquete de actualización",
|
"upd.dialogTitle": "Elige una carpeta de paquete de actualización",
|
||||||
|
"upd.retryValidation": "Reintentar iniciar el servidor",
|
||||||
"upd.pendingBad": "El servidor actualizado no se inició correctamente",
|
"upd.pendingBad": "El servidor actualizado no se inició correctamente",
|
||||||
"upd.pendingUnfinished": "Una actualización anterior no terminó",
|
"upd.pendingUnfinished": "Una actualización anterior no terminó",
|
||||||
"upd.safeBack": "Puedes volver con seguridad a la versión anterior.",
|
"upd.safeBack": "Puedes volver con seguridad a la versión anterior.",
|
||||||
"upd.backNote": "Volver restaura los archivos del programa y los ajustes. Los personajes y cuentas nunca se revierten automáticamente.",
|
"upd.backNote": "Volver restaura los archivos y los ajustes. Si comenzaron las actualizaciones de las bases de datos, también se restauran todas las bases desde la copia anterior a la actualización. Se perderá el progreso posterior.",
|
||||||
"upd.goBackTo": "Volver a la versión {v}",
|
"upd.goBackTo": "Volver a la versión {v}",
|
||||||
"upd.goBackBefore": "Volver a la versión anterior a la actualización",
|
"upd.goBackBefore": "Volver a la versión anterior a la actualización",
|
||||||
"upd.title": "Actualizaciones del servidor",
|
"upd.title": "Actualizaciones del servidor",
|
||||||
@@ -683,9 +702,9 @@ const es: Partial<Record<keyof typeof en, string>> = {
|
|||||||
"rep.expectedHint": "Describe el comportamiento esperado.",
|
"rep.expectedHint": "Describe el comportamiento esperado.",
|
||||||
"rep.steps": "Pasos para reproducirlo",
|
"rep.steps": "Pasos para reproducirlo",
|
||||||
"rep.attachTitle": "Registros y capturas",
|
"rep.attachTitle": "Registros y capturas",
|
||||||
"rep.attachText": "Crea un archivo de diagnóstico (ajustes y registros sin contraseñas ni direcciones) y arrástralo, junto con capturas o vídeos, a la página de GitHub cuando se abra.",
|
"rep.attachText": "Un clic reúne el diagnóstico: registros del Manager y del servidor, informes de fallos, registros de fallos de Windows y diarios de actualización, sin contraseñas ni direcciones. Se abre la carpeta del archivo; arrástralo, junto con capturas o vídeos, a la página de GitHub.",
|
||||||
"rep.makeFile": "Crear el archivo de diagnóstico",
|
"rep.makeFile": "Crear el archivo de diagnóstico",
|
||||||
"rep.fileSaved": "Guardado en {path}. Arrastra este archivo al issue de GitHub.",
|
"rep.fileSaved": "Guardado en {path}. Se abrió la carpeta. Arrastra este archivo al issue de GitHub.",
|
||||||
"rep.privacy": "Elimina contraseñas, tokens, información de IP privada y otros datos sensibles antes de publicar registros.",
|
"rep.privacy": "Elimina contraseñas, tokens, información de IP privada y otros datos sensibles antes de publicar registros.",
|
||||||
"rep.open": "Abrir el informe en GitHub",
|
"rep.open": "Abrir el informe en GitHub",
|
||||||
"rep.copy": "Copiar el texto",
|
"rep.copy": "Copiar el texto",
|
||||||
@@ -695,6 +714,17 @@ const es: Partial<Record<keyof typeof en, string>> = {
|
|||||||
"rep.opened": "GitHub se abrió en tu navegador. Revisa el texto, adjunta archivos y pulsa «Submit new issue».",
|
"rep.opened": "GitHub se abrió en tu navegador. Revisa el texto, adjunta archivos y pulsa «Submit new issue».",
|
||||||
"rep.openedLong": "El informe es demasiado largo para un enlace, así que se copió al portapapeles. GitHub está abierto: pégalo (Ctrl+V) en la descripción, adjunta archivos y pulsa «Submit new issue».",
|
"rep.openedLong": "El informe es demasiado largo para un enlace, así que se copió al portapapeles. GitHub está abierto: pégalo (Ctrl+V) en la descripción, adjunta archivos y pulsa «Submit new issue».",
|
||||||
"rep.copied": "Copiado al portapapeles.",
|
"rep.copied": "Copiado al portapapeles.",
|
||||||
|
"rep.targetTitle": "¿Sobre qué es el problema?",
|
||||||
|
"rep.target.manager": "CoA Server Manager, el servidor u otros módulos",
|
||||||
|
"rep.target.companions": "CoA Companions (bots y el addon CoABotUI)",
|
||||||
|
"rep.target.squid": "SQUID Playerbots",
|
||||||
|
"rep.targetPublic": "El informe será público en GitHub, en {repo}.",
|
||||||
|
"rep.botsVersion": "Versión de los bots",
|
||||||
|
"rep.withDiag": "Reunir el diagnóstico por mí (recomendado)",
|
||||||
|
"rep.collectOpen": "Reunir el diagnóstico y abrir el informe",
|
||||||
|
"rep.collecting": "Reuniendo el diagnóstico…",
|
||||||
|
"overview.reportHint": "¿Un servicio se detuvo solo?",
|
||||||
|
"overview.reportBtn": "Reunir el diagnóstico y avisar",
|
||||||
|
|
||||||
// Realmlist switcher and modules page
|
// Realmlist switcher and modules page
|
||||||
"realm.profileLabel": "Reino",
|
"realm.profileLabel": "Reino",
|
||||||
@@ -724,6 +754,18 @@ const es: Partial<Record<keyof typeof en, string>> = {
|
|||||||
"realm.confirmDelete": "¿Eliminar la realmlist «{name}»? El cliente conserva el archivo actual.",
|
"realm.confirmDelete": "¿Eliminar la realmlist «{name}»? El cliente conserva el archivo actual.",
|
||||||
"nav.modules": "Módulos",
|
"nav.modules": "Módulos",
|
||||||
"q.modules": "¿Qué funciones adicionales tiene el servidor?",
|
"q.modules": "¿Qué funciones adicionales tiene el servidor?",
|
||||||
|
"mod.ahbot.types": "Tipos de objetos en venta",
|
||||||
|
"mod.ahbot.typesHint": "Elige tipos para nuevos anuncios. Las subastas existentes permanecen. Al activar se restauran los pesos de esta sesión o los valores predeterminados.",
|
||||||
|
"mod.ahbot.qualityWeights": "Calidad y frecuencia",
|
||||||
|
"mod.ahbot.weightsHint": "Pesos relativos, no porcentajes. 0 excluye una calidad; valores mayores aumentan su frecuencia. Si todos los valores predeterminados son cero, se elige calidad común. Los demás filtros siguen activos.",
|
||||||
|
"mod.ahbot.noTypes": "Todos los tipos están desactivados. El vendedor no tiene tipos para nuevos anuncios.",
|
||||||
|
"mod.noSettings": "No hay ajustes adicionales. Usa el interruptor del módulo de arriba.",
|
||||||
|
"err.bot_modules_conflict.title": "Hay dos módulos de bots activos",
|
||||||
|
"err.bot_modules_conflict.message": "Desactiva CoA Companions o SQUID Playerbots en Módulos antes de iniciar el servidor.",
|
||||||
|
"mod.ahbot.setup": "Activa el módulo y el vendedor. El servidor crea por sí mismo un personaje de subastas (cuenta AHBOT) en el primer arranque, no hace falta GUID. Un solo personaje publica en las casas de subastas de ambas facciones. El filtro CoA usa botín, vendedores y profesiones; los límites de nivel se aplican además. Requiere un servidor con filtro de subastas CoA y personaje de subastas automático.",
|
||||||
|
"mod.enchanter.add": "Colocar al encantador: ponte donde quieras y escribe .npc add 601015",
|
||||||
|
"mod.enchanter.remove": "Quitar al encantador: selecciona al PNJ y escribe .npc delete",
|
||||||
|
"mod.ahbot.allSettings": "Todos los ajustes de subastas",
|
||||||
"mod.title": "Módulos",
|
"mod.title": "Módulos",
|
||||||
"mod.intro": "Funciones adicionales integradas en el servidor. Activa o desactiva las que quieras, abre su página de GitHub o cambia sus ajustes.",
|
"mod.intro": "Funciones adicionales integradas en el servidor. Activa o desactiva las que quieras, abre su página de GitHub o cambia sus ajustes.",
|
||||||
"mod.restart": "Los cambios se aplican al reiniciar el servidor del mundo.",
|
"mod.restart": "Los cambios se aplican al reiniciar el servidor del mundo.",
|
||||||
@@ -787,6 +829,14 @@ const es: Partial<Record<keyof typeof en, string>> = {
|
|||||||
"upd.current": "Estás al día (versión {v}).",
|
"upd.current": "Estás al día (versión {v}).",
|
||||||
"client.job.checking": "Comprobando el cliente…",
|
"client.job.checking": "Comprobando el cliente…",
|
||||||
"client.job.updating": "Actualizando el cliente",
|
"client.job.updating": "Actualizando el cliente",
|
||||||
|
"fr.lan.address": "Dirección de red",
|
||||||
|
"fr.lan.automatic": "Automática",
|
||||||
|
"fr.lan.default": "Predeterminada",
|
||||||
|
"fr.lan.custom": "Dirección personalizada…",
|
||||||
|
"fr.lan.customIpv4": "Dirección IPv4 personalizada",
|
||||||
|
"fr.lan.unavailable": "Dirección seleccionada no disponible",
|
||||||
|
"fr.lan.unavailableText": "La dirección seleccionada no está asignada actualmente a ninguna interfaz local detectada. Elige otra dirección o Automática, o conserva esta dirección si así lo deseas.",
|
||||||
|
"fr.lan.invalid": "Dirección IPv4 no válida",
|
||||||
};
|
};
|
||||||
|
|
||||||
export default es;
|
export default es;
|
||||||
+53
-3
@@ -2,6 +2,21 @@ import type en from "./en";
|
|||||||
|
|
||||||
/** Français. Traduction provisoire ; à faire relire par un locuteur natif avant la publication. */
|
/** Français. Traduction provisoire ; à faire relire par un locuteur natif avant la publication. */
|
||||||
const fr: Partial<Record<keyof typeof en, string>> = {
|
const fr: Partial<Record<keyof typeof en, string>> = {
|
||||||
|
"remote.clientReady": "Votre client est prêt. Enregistrez l’adresse de l’hôte, puis cliquez sur Jouer.",
|
||||||
|
"remote.clientIntro": "Choisissez un client existant ou téléchargez-le ici. Aucun serveur local n’est nécessaire.",
|
||||||
|
"welcome.host.title": "Héberger un serveur",
|
||||||
|
"welcome.host.text": "Installer un serveur ou gérer un serveur existant.",
|
||||||
|
"welcome.connect.title": "Rejoindre un autre serveur",
|
||||||
|
"welcome.connect.text": "Télécharger ou mettre à jour le client et jouer sur le serveur d’un ami.",
|
||||||
|
"remote.intro": "Configurez votre client. Votre ami héberge le serveur.",
|
||||||
|
"remote.address": "Adresse du serveur",
|
||||||
|
"remote.addressHint": "Pour jouer en réseau local, demandez l’adresse IP locale de l’ordinateur hôte.",
|
||||||
|
"remote.save": "Enregistrer l’adresse",
|
||||||
|
"remote.saved": "Adresse du serveur enregistrée.",
|
||||||
|
"remote.accountHint": "Demandez à l’hôte de créer un compte de jeu pour vous.",
|
||||||
|
"remote.hostInstead": "Héberger mon serveur",
|
||||||
|
"welcome.roleSubtitle": "Comment souhaitez-vous jouer ?",
|
||||||
|
|
||||||
"nav.overview": "Vue d’ensemble",
|
"nav.overview": "Vue d’ensemble",
|
||||||
"nav.bots": "Bots",
|
"nav.bots": "Bots",
|
||||||
"nav.server": "Serveur",
|
"nav.server": "Serveur",
|
||||||
@@ -58,6 +73,9 @@ const fr: Partial<Record<keyof typeof en, string>> = {
|
|||||||
"btn.stop": "ARRÊTER LE SERVEUR",
|
"btn.stop": "ARRÊTER LE SERVEUR",
|
||||||
"btn.stopSmall": "Arrêter",
|
"btn.stopSmall": "Arrêter",
|
||||||
"btn.restart": "Redémarrer",
|
"btn.restart": "Redémarrer",
|
||||||
|
"btn.startWithoutUpdate": "Démarrer sans mise à jour",
|
||||||
|
"btn.playWithoutUpdate": "Jouer sans mise à jour",
|
||||||
|
"import.squidRepackWarning": "Ce repack SquidBots vérifie le hash du serveur. Le remplacer peut empêcher Start_All_Bots et coa_update de fonctionner. Une confirmation sera demandée.",
|
||||||
"btn.play": "JOUER",
|
"btn.play": "JOUER",
|
||||||
"btn.startPlay": "DÉMARRER ET JOUER",
|
"btn.startPlay": "DÉMARRER ET JOUER",
|
||||||
"btn.startingCaps": "DÉMARRAGE…",
|
"btn.startingCaps": "DÉMARRAGE…",
|
||||||
@@ -346,10 +364,11 @@ const fr: Partial<Record<keyof typeof en, string>> = {
|
|||||||
"upd.confirmBack": "Revenir à la version précédente ? Vos personnages et comptes ne sont pas modifiés.",
|
"upd.confirmBack": "Revenir à la version précédente ? Vos personnages et comptes ne sont pas modifiés.",
|
||||||
"upd.wentBack": "Retour à la version précédente effectué. Vos données n’ont pas été touchées.",
|
"upd.wentBack": "Retour à la version précédente effectué. Vos données n’ont pas été touchées.",
|
||||||
"upd.dialogTitle": "Choisissez un dossier de paquet de mise à jour",
|
"upd.dialogTitle": "Choisissez un dossier de paquet de mise à jour",
|
||||||
|
"upd.retryValidation": "Réessayer de démarrer le serveur",
|
||||||
"upd.pendingBad": "Le serveur mis à jour n’a pas démarré correctement",
|
"upd.pendingBad": "Le serveur mis à jour n’a pas démarré correctement",
|
||||||
"upd.pendingUnfinished": "Une mise à jour précédente ne s’est pas terminée",
|
"upd.pendingUnfinished": "Une mise à jour précédente ne s’est pas terminée",
|
||||||
"upd.safeBack": "Vous pouvez revenir en toute sécurité à la version précédente.",
|
"upd.safeBack": "Vous pouvez revenir en toute sécurité à la version précédente.",
|
||||||
"upd.backNote": "Le retour restaure les fichiers du programme et les paramètres. Les personnages et comptes ne sont jamais restaurés automatiquement.",
|
"upd.backNote": "Le retour restaure les fichiers et les paramètres. Si la mise à jour des bases a commencé, toutes les bases sont aussi restaurées depuis la sauvegarde précédant la mise à jour. La progression ultérieure sera perdue.",
|
||||||
"upd.goBackTo": "Revenir à la version {v}",
|
"upd.goBackTo": "Revenir à la version {v}",
|
||||||
"upd.goBackBefore": "Revenir à la version d’avant la mise à jour",
|
"upd.goBackBefore": "Revenir à la version d’avant la mise à jour",
|
||||||
"upd.title": "Mises à jour du serveur",
|
"upd.title": "Mises à jour du serveur",
|
||||||
@@ -683,9 +702,9 @@ const fr: Partial<Record<keyof typeof en, string>> = {
|
|||||||
"rep.expectedHint": "Décrivez le comportement attendu.",
|
"rep.expectedHint": "Décrivez le comportement attendu.",
|
||||||
"rep.steps": "Étapes pour reproduire",
|
"rep.steps": "Étapes pour reproduire",
|
||||||
"rep.attachTitle": "Journaux et captures d’écran",
|
"rep.attachTitle": "Journaux et captures d’écran",
|
||||||
"rep.attachText": "Créez un fichier de diagnostic (réglages et journaux sans mots de passe ni adresses) et glissez-le, avec vos captures ou vidéos, sur la page GitHub une fois ouverte.",
|
"rep.attachText": "Un clic rassemble le diagnostic : journaux du Manager et du serveur, rapports de plantage, enregistrements de plantage de Windows et journaux de mise à jour, sans mots de passe ni adresses. Le dossier du fichier s’ouvre ; glissez le fichier, avec vos captures ou vidéos, sur la page GitHub.",
|
||||||
"rep.makeFile": "Créer le fichier de diagnostic",
|
"rep.makeFile": "Créer le fichier de diagnostic",
|
||||||
"rep.fileSaved": "Enregistré dans {path}. Glissez ce fichier dans l’issue GitHub.",
|
"rep.fileSaved": "Enregistré dans {path}. Le dossier a été ouvert. Glissez ce fichier dans l’issue GitHub.",
|
||||||
"rep.privacy": "Veuillez retirer les mots de passe, jetons, adresses IP privées et autres données sensibles avant de publier des journaux.",
|
"rep.privacy": "Veuillez retirer les mots de passe, jetons, adresses IP privées et autres données sensibles avant de publier des journaux.",
|
||||||
"rep.open": "Ouvrir le rapport sur GitHub",
|
"rep.open": "Ouvrir le rapport sur GitHub",
|
||||||
"rep.copy": "Copier le texte",
|
"rep.copy": "Copier le texte",
|
||||||
@@ -695,6 +714,17 @@ const fr: Partial<Record<keyof typeof en, string>> = {
|
|||||||
"rep.opened": "GitHub s’est ouvert dans votre navigateur. Vérifiez le texte, joignez les fichiers et appuyez sur « Submit new issue ».",
|
"rep.opened": "GitHub s’est ouvert dans votre navigateur. Vérifiez le texte, joignez les fichiers et appuyez sur « Submit new issue ».",
|
||||||
"rep.openedLong": "Le rapport est trop long pour un lien : il a été copié dans le presse-papiers. GitHub est ouvert : collez-le (Ctrl+V) dans la description, joignez les fichiers et appuyez sur « Submit new issue ».",
|
"rep.openedLong": "Le rapport est trop long pour un lien : il a été copié dans le presse-papiers. GitHub est ouvert : collez-le (Ctrl+V) dans la description, joignez les fichiers et appuyez sur « Submit new issue ».",
|
||||||
"rep.copied": "Copié dans le presse-papiers.",
|
"rep.copied": "Copié dans le presse-papiers.",
|
||||||
|
"rep.targetTitle": "De quoi parle le problème ?",
|
||||||
|
"rep.target.manager": "CoA Server Manager, le serveur ou d’autres modules",
|
||||||
|
"rep.target.companions": "CoA Companions (bots et addon CoABotUI)",
|
||||||
|
"rep.target.squid": "SQUID Playerbots",
|
||||||
|
"rep.targetPublic": "Le rapport sera public sur GitHub dans {repo}.",
|
||||||
|
"rep.botsVersion": "Version des bots",
|
||||||
|
"rep.withDiag": "Rassembler le diagnostic pour moi (recommandé)",
|
||||||
|
"rep.collectOpen": "Rassembler le diagnostic et ouvrir le rapport",
|
||||||
|
"rep.collecting": "Collecte du diagnostic…",
|
||||||
|
"overview.reportHint": "Un service s’est arrêté tout seul ?",
|
||||||
|
"overview.reportBtn": "Rassembler le diagnostic et signaler",
|
||||||
|
|
||||||
// Realmlist switcher and modules page
|
// Realmlist switcher and modules page
|
||||||
"realm.profileLabel": "Royaume",
|
"realm.profileLabel": "Royaume",
|
||||||
@@ -724,6 +754,18 @@ const fr: Partial<Record<keyof typeof en, string>> = {
|
|||||||
"realm.confirmDelete": "Supprimer la realmlist « {name} » ? Le client garde le fichier actuel.",
|
"realm.confirmDelete": "Supprimer la realmlist « {name} » ? Le client garde le fichier actuel.",
|
||||||
"nav.modules": "Modules",
|
"nav.modules": "Modules",
|
||||||
"q.modules": "Quelles fonctions supplémentaires le serveur propose-t-il ?",
|
"q.modules": "Quelles fonctions supplémentaires le serveur propose-t-il ?",
|
||||||
|
"mod.ahbot.types": "Types d’objets à vendre",
|
||||||
|
"mod.ahbot.typesHint": "Choisissez les types des nouvelles annonces. Les enchères existantes restent. L’activation restaure les poids de cette session ou les valeurs par défaut.",
|
||||||
|
"mod.ahbot.qualityWeights": "Qualité et fréquence",
|
||||||
|
"mod.ahbot.weightsHint": "Poids relatifs, pas des pourcentages. 0 exclut une qualité ; un poids supérieur augmente sa fréquence. Si tous les défauts sont nuls, la qualité commune est choisie. Les autres filtres restent actifs.",
|
||||||
|
"mod.ahbot.noTypes": "Tous les types sont désactivés. Le vendeur n’a aucun type à choisir.",
|
||||||
|
"mod.noSettings": "Aucun réglage supplémentaire. Utilisez l’interrupteur du module ci-dessus.",
|
||||||
|
"err.bot_modules_conflict.title": "Deux modules de bots sont activés",
|
||||||
|
"err.bot_modules_conflict.message": "Désactivez CoA Companions ou SQUID Playerbots dans Modules avant de démarrer le serveur.",
|
||||||
|
"mod.ahbot.setup": "Activez le module et le vendeur. Le serveur crée lui-même un personnage d’enchères (compte AHBOT) au premier démarrage, aucun GUID n’est nécessaire. Un seul personnage met en vente dans les hôtels des ventes des deux factions. Le filtre CoA utilise le butin, les vendeurs et les métiers ; les limites de niveau s’ajoutent. Nécessite un serveur avec le filtre d’enchères CoA et le personnage d’enchères automatique.",
|
||||||
|
"mod.enchanter.add": "Placer l’enchanteur : placez-vous à l’endroit voulu et saisissez .npc add 601015",
|
||||||
|
"mod.enchanter.remove": "Retirer l’enchanteur : ciblez le PNJ et saisissez .npc delete",
|
||||||
|
"mod.ahbot.allSettings": "Tous les réglages d’enchères",
|
||||||
"mod.title": "Modules",
|
"mod.title": "Modules",
|
||||||
"mod.intro": "Fonctions supplémentaires intégrées au serveur. Activez ou désactivez celles que vous voulez, ouvrez leur page GitHub ou modifiez leurs réglages.",
|
"mod.intro": "Fonctions supplémentaires intégrées au serveur. Activez ou désactivez celles que vous voulez, ouvrez leur page GitHub ou modifiez leurs réglages.",
|
||||||
"mod.restart": "Les changements s’appliquent après le redémarrage du serveur de monde.",
|
"mod.restart": "Les changements s’appliquent après le redémarrage du serveur de monde.",
|
||||||
@@ -787,6 +829,14 @@ const fr: Partial<Record<keyof typeof en, string>> = {
|
|||||||
"upd.current": "Vous êtes à jour (version {v}).",
|
"upd.current": "Vous êtes à jour (version {v}).",
|
||||||
"client.job.checking": "Vérification du client…",
|
"client.job.checking": "Vérification du client…",
|
||||||
"client.job.updating": "Mise à jour du client",
|
"client.job.updating": "Mise à jour du client",
|
||||||
|
"fr.lan.address": "Adresse réseau",
|
||||||
|
"fr.lan.automatic": "Automatique",
|
||||||
|
"fr.lan.default": "Par défaut",
|
||||||
|
"fr.lan.custom": "Adresse personnalisée…",
|
||||||
|
"fr.lan.customIpv4": "Adresse IPv4 personnalisée",
|
||||||
|
"fr.lan.unavailable": "Adresse sélectionnée indisponible",
|
||||||
|
"fr.lan.unavailableText": "Cette adresse n’est actuellement attribuée à aucune interface locale détectée. Choisissez une autre adresse ou le mode Automatique, ou conservez volontairement cette adresse.",
|
||||||
|
"fr.lan.invalid": "Adresse IPv4 non valide",
|
||||||
};
|
};
|
||||||
|
|
||||||
export default fr;
|
export default fr;
|
||||||
+53
-3
@@ -2,6 +2,21 @@ import type en from "./en";
|
|||||||
|
|
||||||
/** Русский. Черновой перевод; требует проверки носителем перед релизом. */
|
/** Русский. Черновой перевод; требует проверки носителем перед релизом. */
|
||||||
const ru: Partial<Record<keyof typeof en, string>> = {
|
const ru: Partial<Record<keyof typeof en, string>> = {
|
||||||
|
"remote.clientReady": "Клиент готов. Сохраните адрес хоста и нажмите «Играть».",
|
||||||
|
"remote.clientIntro": "Выберите существующий клиент игры или скачайте его здесь. Локальный сервер не требуется.",
|
||||||
|
"welcome.host.title": "Хочу быть хостом",
|
||||||
|
"welcome.host.text": "Установить новый сервер или управлять существующим.",
|
||||||
|
"welcome.connect.title": "Подключиться к другому серверу",
|
||||||
|
"welcome.connect.text": "Скачать или обновить клиент и играть на сервере друга.",
|
||||||
|
"remote.intro": "Настройте игровой клиент. Сервер запускает ваш друг.",
|
||||||
|
"remote.address": "Адрес сервера",
|
||||||
|
"remote.addressHint": "Для игры по локальной сети попросите у хоста локальный IP его компьютера.",
|
||||||
|
"remote.save": "Сохранить адрес",
|
||||||
|
"remote.saved": "Адрес сервера сохранён.",
|
||||||
|
"remote.accountHint": "Попросите хоста создать для вас игровой аккаунт.",
|
||||||
|
"remote.hostInstead": "Создать свой сервер",
|
||||||
|
"welcome.roleSubtitle": "Как вы хотите играть?",
|
||||||
|
|
||||||
"realm.profileLabel": "Реалм",
|
"realm.profileLabel": "Реалм",
|
||||||
"realm.startupTitle": "Запуск реалмов",
|
"realm.startupTitle": "Запуск реалмов",
|
||||||
"realm.secondWorld": "Второй мир",
|
"realm.secondWorld": "Второй мир",
|
||||||
@@ -89,6 +104,9 @@ const ru: Partial<Record<keyof typeof en, string>> = {
|
|||||||
"btn.stop": "ОСТАНОВИТЬ СЕРВЕР",
|
"btn.stop": "ОСТАНОВИТЬ СЕРВЕР",
|
||||||
"btn.stopSmall": "Остановить",
|
"btn.stopSmall": "Остановить",
|
||||||
"btn.restart": "Перезапустить",
|
"btn.restart": "Перезапустить",
|
||||||
|
"btn.startWithoutUpdate": "Запустить без обновления",
|
||||||
|
"btn.playWithoutUpdate": "Играть без обновления",
|
||||||
|
"import.squidRepackWarning": "Этот репак SquidBots проверяет хеш worldserver. Замена файла может нарушить работу Start_All_Bots и coa_update. Перед заменой менеджер запросит ваше решение.",
|
||||||
"btn.play": "ИГРАТЬ",
|
"btn.play": "ИГРАТЬ",
|
||||||
"btn.startPlay": "ЗАПУСТИТЬ И ИГРАТЬ",
|
"btn.startPlay": "ЗАПУСТИТЬ И ИГРАТЬ",
|
||||||
"btn.startingCaps": "ЗАПУСК…",
|
"btn.startingCaps": "ЗАПУСК…",
|
||||||
@@ -377,10 +395,11 @@ const ru: Partial<Record<keyof typeof en, string>> = {
|
|||||||
"upd.confirmBack": "Вернуться к предыдущей версии? Ваши персонажи и учётные записи не изменятся.",
|
"upd.confirmBack": "Вернуться к предыдущей версии? Ваши персонажи и учётные записи не изменятся.",
|
||||||
"upd.wentBack": "Выполнен возврат к предыдущей версии. Ваши данные не затронуты.",
|
"upd.wentBack": "Выполнен возврат к предыдущей версии. Ваши данные не затронуты.",
|
||||||
"upd.dialogTitle": "Выберите папку с пакетом обновления",
|
"upd.dialogTitle": "Выберите папку с пакетом обновления",
|
||||||
|
"upd.retryValidation": "Повторить запуск сервера",
|
||||||
"upd.pendingBad": "Обновлённый сервер запустился некорректно",
|
"upd.pendingBad": "Обновлённый сервер запустился некорректно",
|
||||||
"upd.pendingUnfinished": "Предыдущее обновление не завершилось",
|
"upd.pendingUnfinished": "Предыдущее обновление не завершилось",
|
||||||
"upd.safeBack": "Можно безопасно вернуться к предыдущей версии.",
|
"upd.safeBack": "Можно безопасно вернуться к предыдущей версии.",
|
||||||
"upd.backNote": "Возврат восстанавливает файлы программы и настройки. Персонажи и учётные записи автоматически не откатываются никогда.",
|
"upd.backNote": "Возврат восстанавливает файлы и настройки. Если обновление баз уже началось, все базы также восстанавливаются из копии перед обновлением. Более поздний прогресс будет потерян.",
|
||||||
"upd.goBackTo": "Вернуться к версии {v}",
|
"upd.goBackTo": "Вернуться к версии {v}",
|
||||||
"upd.goBackBefore": "Вернуться к версии до обновления",
|
"upd.goBackBefore": "Вернуться к версии до обновления",
|
||||||
"upd.title": "Обновления сервера",
|
"upd.title": "Обновления сервера",
|
||||||
@@ -714,9 +733,9 @@ const ru: Partial<Record<keyof typeof en, string>> = {
|
|||||||
"rep.expectedHint": "Опишите ожидаемое поведение.",
|
"rep.expectedHint": "Опишите ожидаемое поведение.",
|
||||||
"rep.steps": "Как воспроизвести",
|
"rep.steps": "Как воспроизвести",
|
||||||
"rep.attachTitle": "Логи и скриншоты",
|
"rep.attachTitle": "Логи и скриншоты",
|
||||||
"rep.attachText": "Создайте файл диагностики (настройки и логи без паролей и адресов) и перетащите его вместе со скриншотами или видео на страницу GitHub, когда она откроется.",
|
"rep.attachText": "Диагностика собирается одним нажатием: логи менеджера и сервера, отчёты о падениях, записи Windows о сбоях и журналы обновлений, без паролей и адресов. Откроется папка с файлом; перетащите его вместе со скриншотами или видео на страницу GitHub.",
|
||||||
"rep.makeFile": "Создать файл диагностики",
|
"rep.makeFile": "Создать файл диагностики",
|
||||||
"rep.fileSaved": "Сохранено: {path}. Перетащите этот файл в issue на GitHub.",
|
"rep.fileSaved": "Сохранено: {path}. Папка открыта. Перетащите этот файл в issue на GitHub.",
|
||||||
"rep.privacy": "Перед публикацией логов удалите пароли, токены, частные IP-адреса и другие личные данные.",
|
"rep.privacy": "Перед публикацией логов удалите пароли, токены, частные IP-адреса и другие личные данные.",
|
||||||
"rep.open": "Открыть отчёт на GitHub",
|
"rep.open": "Открыть отчёт на GitHub",
|
||||||
"rep.copy": "Копировать текст",
|
"rep.copy": "Копировать текст",
|
||||||
@@ -726,6 +745,17 @@ const ru: Partial<Record<keyof typeof en, string>> = {
|
|||||||
"rep.opened": "GitHub открыт в браузере. Проверьте текст, прикрепите файлы и нажмите «Submit new issue».",
|
"rep.opened": "GitHub открыт в браузере. Проверьте текст, прикрепите файлы и нажмите «Submit new issue».",
|
||||||
"rep.openedLong": "Отчёт слишком длинный для ссылки, поэтому он скопирован в буфер обмена. GitHub открыт: вставьте текст (Ctrl+V) в описание, прикрепите файлы и нажмите «Submit new issue».",
|
"rep.openedLong": "Отчёт слишком длинный для ссылки, поэтому он скопирован в буфер обмена. GitHub открыт: вставьте текст (Ctrl+V) в описание, прикрепите файлы и нажмите «Submit new issue».",
|
||||||
"rep.copied": "Скопировано в буфер обмена.",
|
"rep.copied": "Скопировано в буфер обмена.",
|
||||||
|
"rep.targetTitle": "О чём проблема?",
|
||||||
|
"rep.target.manager": "CoA Server Manager, сервер или другие модули",
|
||||||
|
"rep.target.companions": "CoA Companions (боты и аддон CoABotUI)",
|
||||||
|
"rep.target.squid": "SQUID Playerbots",
|
||||||
|
"rep.targetPublic": "Репорт будет публичным на GitHub в {repo}.",
|
||||||
|
"rep.botsVersion": "Версия ботов",
|
||||||
|
"rep.withDiag": "Собрать диагностику за меня (рекомендуется)",
|
||||||
|
"rep.collectOpen": "Собрать диагностику и открыть репорт",
|
||||||
|
"rep.collecting": "Собираю диагностику…",
|
||||||
|
"overview.reportHint": "Служба остановилась сама?",
|
||||||
|
"overview.reportBtn": "Собрать диагностику и сообщить",
|
||||||
|
|
||||||
// Realmlist switcher and modules page
|
// Realmlist switcher and modules page
|
||||||
"realm.label": "Реалм",
|
"realm.label": "Реалм",
|
||||||
@@ -743,6 +773,18 @@ const ru: Partial<Record<keyof typeof en, string>> = {
|
|||||||
"realm.confirmDelete": "Удалить реалмлист «{name}»? В игровом клиенте останется текущий файл.",
|
"realm.confirmDelete": "Удалить реалмлист «{name}»? В игровом клиенте останется текущий файл.",
|
||||||
"nav.modules": "Модули",
|
"nav.modules": "Модули",
|
||||||
"q.modules": "Какие дополнительные возможности есть у сервера?",
|
"q.modules": "Какие дополнительные возможности есть у сервера?",
|
||||||
|
"mod.ahbot.types": "Типы предметов в продаже",
|
||||||
|
"mod.ahbot.typesHint": "Выберите типы для новых лотов. Уже выставленные лоты останутся. При включении возвращаются прежние веса этой сессии или значения по умолчанию.",
|
||||||
|
"mod.ahbot.qualityWeights": "Качество и частота",
|
||||||
|
"mod.ahbot.weightsHint": "Это относительные веса, а не проценты. 0 исключает качество; большее значение повышает частоту. Если все значения по умолчанию равны нулю, включается обычное качество. Остальные фильтры продолжают действовать.",
|
||||||
|
"mod.ahbot.noTypes": "Все типы отключены. Продавцу не из чего выбирать новые лоты.",
|
||||||
|
"mod.noSettings": "Дополнительных настроек нет. Используйте переключатель модуля выше.",
|
||||||
|
"mod.ahbot.setup": "Включите модуль и продавца. Сервер сам создаст персонажа аукциона (аккаунт AHBOT) при первом запуске, GUID вводить не нужно. Один персонаж выставляет лоты в аукционах обеих фракций. Фильтр CoA оставляет предметы из таблиц добычи, торговцев и профессий; ограничения уровней действуют дополнительно. Нужна сборка сервера с фильтром аукциона CoA и автоматическим персонажем аукциона.",
|
||||||
|
"mod.enchanter.add": "Разместить НПС зачарователя: встаньте в нужное место и введите команду .npc add 601015",
|
||||||
|
"mod.enchanter.remove": "Удалить НПС зачарователя: возьмите НПС в цель и введите команду .npc delete",
|
||||||
|
"mod.ahbot.allSettings": "Все настройки",
|
||||||
|
"err.bot_modules_conflict.title": "Включены две системы ботов",
|
||||||
|
"err.bot_modules_conflict.message": "Выключите CoA Companions или SQUID Playerbots в разделе «Модули» перед запуском сервера.",
|
||||||
"mod.title": "Модули",
|
"mod.title": "Модули",
|
||||||
"mod.intro": "Дополнительные возможности, встроенные в сервер. Включайте и выключайте нужные, открывайте их страницу на GitHub или меняйте настройки.",
|
"mod.intro": "Дополнительные возможности, встроенные в сервер. Включайте и выключайте нужные, открывайте их страницу на GitHub или меняйте настройки.",
|
||||||
"mod.restart": "Изменения применятся после перезапуска игрового сервера.",
|
"mod.restart": "Изменения применятся после перезапуска игрового сервера.",
|
||||||
@@ -806,6 +848,14 @@ const ru: Partial<Record<keyof typeof en, string>> = {
|
|||||||
"upd.current": "У вас последняя версия ({v}).",
|
"upd.current": "У вас последняя версия ({v}).",
|
||||||
"client.job.checking": "Проверка клиента…",
|
"client.job.checking": "Проверка клиента…",
|
||||||
"client.job.updating": "Обновление клиента",
|
"client.job.updating": "Обновление клиента",
|
||||||
|
"fr.lan.address": "Сетевой адрес",
|
||||||
|
"fr.lan.automatic": "Автоматически",
|
||||||
|
"fr.lan.default": "По умолчанию",
|
||||||
|
"fr.lan.custom": "Другой адрес…",
|
||||||
|
"fr.lan.customIpv4": "Свой IPv4-адрес",
|
||||||
|
"fr.lan.unavailable": "Выбранный адрес недоступен",
|
||||||
|
"fr.lan.unavailableText": "Выбранный адрес сейчас не назначен обнаруженному сетевому интерфейсу. Выберите другой адрес, переключитесь на автоматический выбор или намеренно сохраните этот адрес.",
|
||||||
|
"fr.lan.invalid": "Некорректный IPv4-адрес",
|
||||||
};
|
};
|
||||||
|
|
||||||
export default ru;
|
export default ru;
|
||||||
+53
-3
@@ -1,5 +1,20 @@
|
|||||||
/** Simplified Chinese localization (zh-CN) */
|
/** Simplified Chinese localization (zh-CN) */
|
||||||
const zh = {
|
const zh = {
|
||||||
|
"remote.clientReady": "客户端已就绪。保存服主地址,然后点击开始游戏。",
|
||||||
|
"remote.clientIntro": "选择已有游戏客户端,或在此下载。无需安装本地服务器。",
|
||||||
|
"welcome.host.title": "我要搭建服务器",
|
||||||
|
"welcome.host.text": "安装新服务器或管理已有服务器。",
|
||||||
|
"welcome.connect.title": "连接其他服务器",
|
||||||
|
"welcome.connect.text": "下载或更新游戏客户端,在朋友的服务器上游玩。",
|
||||||
|
"remote.intro": "设置游戏客户端,服务器由朋友运行。",
|
||||||
|
"remote.address": "服务器地址",
|
||||||
|
"remote.addressHint": "在局域网中游玩时,请向服主询问其电脑的局域网 IP 地址。",
|
||||||
|
"remote.save": "保存地址",
|
||||||
|
"remote.saved": "服务器地址已保存。",
|
||||||
|
"remote.accountHint": "请服主为你创建游戏账号。",
|
||||||
|
"remote.hostInstead": "搭建自己的服务器",
|
||||||
|
"welcome.roleSubtitle": "你想如何游玩?",
|
||||||
|
|
||||||
"realm.profileLabel": "服务器",
|
"realm.profileLabel": "服务器",
|
||||||
"realm.switching": "正在切换服务器…",
|
"realm.switching": "正在切换服务器…",
|
||||||
"realm.create": "创建 Wildcard 服务器",
|
"realm.create": "创建 Wildcard 服务器",
|
||||||
@@ -70,6 +85,9 @@ const zh = {
|
|||||||
"btn.stop": "停止服务器",
|
"btn.stop": "停止服务器",
|
||||||
"btn.stopSmall": "停止",
|
"btn.stopSmall": "停止",
|
||||||
"btn.restart": "重启",
|
"btn.restart": "重启",
|
||||||
|
"btn.startWithoutUpdate": "不更新启动服务器",
|
||||||
|
"btn.playWithoutUpdate": "不更新开始游戏",
|
||||||
|
"import.squidRepackWarning": "此 SquidBots 整合包会检查 worldserver 哈希。替换程序可能导致 Start_All_Bots 和 coa_update 无法运行。更新前会要求您选择。",
|
||||||
"btn.play": "开始游戏",
|
"btn.play": "开始游戏",
|
||||||
"btn.startPlay": "启动并开始游戏",
|
"btn.startPlay": "启动并开始游戏",
|
||||||
"btn.startingCaps": "正在启动…",
|
"btn.startingCaps": "正在启动…",
|
||||||
@@ -358,10 +376,11 @@ const zh = {
|
|||||||
"upd.confirmBack": "是否回滚至上一个版本?你的角色与账号数据不会受到影响。",
|
"upd.confirmBack": "是否回滚至上一个版本?你的角色与账号数据不会受到影响。",
|
||||||
"upd.wentBack": "已回滚至上一个版本。你的个人数据完好无损。",
|
"upd.wentBack": "已回滚至上一个版本。你的个人数据完好无损。",
|
||||||
"upd.dialogTitle": "选择更新包文件夹",
|
"upd.dialogTitle": "选择更新包文件夹",
|
||||||
|
"upd.retryValidation": "重试启动服务器",
|
||||||
"upd.pendingBad": "更新后的服务器未能正常启动",
|
"upd.pendingBad": "更新后的服务器未能正常启动",
|
||||||
"upd.pendingUnfinished": "先前的更新尚未完成",
|
"upd.pendingUnfinished": "先前的更新尚未完成",
|
||||||
"upd.safeBack": "你可以安全回滚至先前的稳定版本。",
|
"upd.safeBack": "你可以安全回滚至先前的稳定版本。",
|
||||||
"upd.backNote": "回滚操作将恢复程序文件与配置文件。角色和账号数据绝不会被自动回滚。",
|
"upd.backNote": "回滚将恢复文件和设置。如果数据库更新已开始,所有数据库也将从更新前的备份恢复。之后的进度将丢失。",
|
||||||
"upd.goBackTo": "回滚至版本 {v}",
|
"upd.goBackTo": "回滚至版本 {v}",
|
||||||
"upd.goBackBefore": "回滚至更新前的版本",
|
"upd.goBackBefore": "回滚至更新前的版本",
|
||||||
"upd.title": "服务器更新",
|
"upd.title": "服务器更新",
|
||||||
@@ -695,9 +714,9 @@ const zh = {
|
|||||||
"rep.expectedHint": "描述你期望的正常表现。",
|
"rep.expectedHint": "描述你期望的正常表现。",
|
||||||
"rep.steps": "复现步骤",
|
"rep.steps": "复现步骤",
|
||||||
"rep.attachTitle": "日志与截图附件",
|
"rep.attachTitle": "日志与截图附件",
|
||||||
"rep.attachText": "生成一份诊断包文件(已自动脱敏密码与私有 IP 等敏感信息),并在浏览器打开 GitHub 页面后,将其连同截图或录屏一起拖拽上传。",
|
"rep.attachText": "一键收集诊断信息:管理器与服务器日志、崩溃报告、Windows 崩溃记录和更新日志(已去除密码与地址)。文件所在文件夹会自动打开;请将该文件连同截图或录屏一起拖入 GitHub 页面。",
|
||||||
"rep.makeFile": "生成诊断包文件",
|
"rep.makeFile": "生成诊断包文件",
|
||||||
"rep.fileSaved": "已保存至 {path}。请将该文件拖入 GitHub Issue 中。",
|
"rep.fileSaved": "已保存至 {path}。文件夹已打开。请将该文件拖入 GitHub Issue 中。",
|
||||||
"rep.privacy": "上传前请注意检查并移除日志中可能包含的私有密码、Token 或其他敏感隐私信息。",
|
"rep.privacy": "上传前请注意检查并移除日志中可能包含的私有密码、Token 或其他敏感隐私信息。",
|
||||||
"rep.open": "在 GitHub 上打开报告",
|
"rep.open": "在 GitHub 上打开报告",
|
||||||
"rep.copy": "复制报告文本",
|
"rep.copy": "复制报告文本",
|
||||||
@@ -707,6 +726,17 @@ const zh = {
|
|||||||
"rep.opened": "已在浏览器中打开 GitHub。请检查内容、附上日志文件并点击“Submit new issue”。",
|
"rep.opened": "已在浏览器中打开 GitHub。请检查内容、附上日志文件并点击“Submit new issue”。",
|
||||||
"rep.openedLong": "报告内容较长超出 URL 长度限制,已自动复制到剪贴板。请在已打开的 GitHub 页面中按 Ctrl+V 粘贴描述,附上文件后提交。",
|
"rep.openedLong": "报告内容较长超出 URL 长度限制,已自动复制到剪贴板。请在已打开的 GitHub 页面中按 Ctrl+V 粘贴描述,附上文件后提交。",
|
||||||
"rep.copied": "已复制到剪贴板。",
|
"rep.copied": "已复制到剪贴板。",
|
||||||
|
"rep.targetTitle": "问题与什么有关?",
|
||||||
|
"rep.target.manager": "CoA Server Manager、服务器或其他模块",
|
||||||
|
"rep.target.companions": "CoA Companions(机器人与 CoABotUI 插件)",
|
||||||
|
"rep.target.squid": "SQUID Playerbots",
|
||||||
|
"rep.targetPublic": "该报告将公开发布在 GitHub 的 {repo}。",
|
||||||
|
"rep.botsVersion": "机器人版本",
|
||||||
|
"rep.withDiag": "替我收集诊断信息(推荐)",
|
||||||
|
"rep.collectOpen": "收集诊断信息并打开报告",
|
||||||
|
"rep.collecting": "正在收集诊断信息…",
|
||||||
|
"overview.reportHint": "某个服务自己停止了?",
|
||||||
|
"overview.reportBtn": "收集诊断信息并反馈",
|
||||||
|
|
||||||
// Realmlist switcher and modules page
|
// Realmlist switcher and modules page
|
||||||
"realm.label": "服务器列表",
|
"realm.label": "服务器列表",
|
||||||
@@ -724,6 +754,18 @@ const zh = {
|
|||||||
"realm.confirmDelete": "是否删除 realmlist 配置“{name}”?游戏客户端将继续保留其当前的文件内容。",
|
"realm.confirmDelete": "是否删除 realmlist 配置“{name}”?游戏客户端将继续保留其当前的文件内容。",
|
||||||
"nav.modules": "扩展模块",
|
"nav.modules": "扩展模块",
|
||||||
"q.modules": "服务器支持哪些扩展模块?",
|
"q.modules": "服务器支持哪些扩展模块?",
|
||||||
|
"mod.ahbot.types": "出售物品类型",
|
||||||
|
"mod.ahbot.typesHint": "选择新拍卖的物品类型,已有拍卖不受影响。启用会恢复本次会话的权重或默认值。",
|
||||||
|
"mod.ahbot.qualityWeights": "品质与频率",
|
||||||
|
"mod.ahbot.weightsHint": "相对权重而非百分比。0排除该品质,数值越大越常见。如果默认值全为0,启用时选择普通品质。其他筛选仍生效。",
|
||||||
|
"mod.ahbot.noTypes": "所有类型均已关闭,卖家没有可供新拍卖选择的类型。",
|
||||||
|
"mod.noSettings": "没有其他设置,请使用上方模块开关。",
|
||||||
|
"err.bot_modules_conflict.title": "已启用两个机器人模块",
|
||||||
|
"err.bot_modules_conflict.message": "启动服务器前,请在模块中关闭CoA Companions或SQUID Playerbots。",
|
||||||
|
"mod.ahbot.setup": "启用模块和卖家即可。服务器首次启动时会自动创建拍卖角色(账号AHBOT),无需填写GUID。一个角色即可在双方阵营的拍卖行上架。CoA筛选使用掉落、商人和专业物品表,等级限制另行生效。需要包含CoA拍卖筛选和自动拍卖角色的服务器版本。",
|
||||||
|
"mod.enchanter.add": "放置附魔师NPC:站在想要的位置,输入 .npc add 601015",
|
||||||
|
"mod.enchanter.remove": "删除附魔师NPC:选中该NPC,输入 .npc delete",
|
||||||
|
"mod.ahbot.allSettings": "所有拍卖设置",
|
||||||
"mod.title": "模块管理",
|
"mod.title": "模块管理",
|
||||||
"mod.intro": "服务器内置的可选扩展特性。可按需开关、访问其 GitHub 页面或调整独立参数。",
|
"mod.intro": "服务器内置的可选扩展特性。可按需开关、访问其 GitHub 页面或调整独立参数。",
|
||||||
"mod.restart": "更改将在世界服务器重启后生效。",
|
"mod.restart": "更改将在世界服务器重启后生效。",
|
||||||
@@ -789,6 +831,14 @@ const zh = {
|
|||||||
"client.job.updating": "正在更新游戏客户端",
|
"client.job.updating": "正在更新游戏客户端",
|
||||||
"err.docker_unavailable.title": "Docker 不可用",
|
"err.docker_unavailable.title": "Docker 不可用",
|
||||||
"err.docker_unavailable.message": "此服务器通过 Docker 运行。请安装并启动 Docker,确保当前用户有权使用它,然后重试。",
|
"err.docker_unavailable.message": "此服务器通过 Docker 运行。请安装并启动 Docker,确保当前用户有权使用它,然后重试。",
|
||||||
|
"fr.lan.address": "网络地址",
|
||||||
|
"fr.lan.automatic": "自动",
|
||||||
|
"fr.lan.default": "默认",
|
||||||
|
"fr.lan.custom": "自定义地址…",
|
||||||
|
"fr.lan.customIpv4": "自定义 IPv4 地址",
|
||||||
|
"fr.lan.unavailable": "所选地址不可用",
|
||||||
|
"fr.lan.unavailableText": "所选地址目前未分配给检测到的本地网络接口。请选择其他地址、切换到自动,或有意保留此地址。",
|
||||||
|
"fr.lan.invalid": "无效的 IPv4 地址",
|
||||||
} as const;
|
} as const;
|
||||||
|
|
||||||
export default zh;
|
export default zh;
|
||||||
+35
-3
@@ -1,5 +1,8 @@
|
|||||||
import { invoke } from "@tauri-apps/api/core";
|
import { invoke } from "@tauri-apps/api/core";
|
||||||
|
|
||||||
|
export const REMOTE_CLIENT_ID = "@remote-client";
|
||||||
|
export interface RemoteConnection { host: string; client_path: string | null }
|
||||||
|
|
||||||
export type Classification = "healthy" | "partial" | "unknown-custom" | "incompatible";
|
export type Classification = "healthy" | "partial" | "unknown-custom" | "incompatible";
|
||||||
export type ItemStatus = "found" | "missing" | "attention";
|
export type ItemStatus = "found" | "missing" | "attention";
|
||||||
|
|
||||||
@@ -190,10 +193,12 @@ export interface RealmProfile {
|
|||||||
export interface ModuleView {
|
export interface ModuleView {
|
||||||
id: string;
|
id: string;
|
||||||
name: string;
|
name: string;
|
||||||
|
version?: string | null;
|
||||||
description: Record<string, string>;
|
description: Record<string, string>;
|
||||||
repo: string;
|
repo: string;
|
||||||
/** the module is part of this server build (its configuration exists) */
|
/** the module is part of this server build (its configuration exists) */
|
||||||
installed: boolean;
|
installed: boolean;
|
||||||
|
has_settings: boolean;
|
||||||
enabled: boolean;
|
enabled: boolean;
|
||||||
/** can be turned on and off (a part the game client needs is only configured) */
|
/** can be turned on and off (a part the game client needs is only configured) */
|
||||||
switchable: boolean;
|
switchable: boolean;
|
||||||
@@ -212,6 +217,7 @@ export interface ModuleSetting {
|
|||||||
value: string;
|
value: string;
|
||||||
default: string | null;
|
default: string | null;
|
||||||
doc: string;
|
doc: string;
|
||||||
|
field?: { key: string; type: string; title: string; description: string; group: string; group_title?: string | null; min?: number | null; max?: number | null } | null;
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface AllSetting {
|
export interface AllSetting {
|
||||||
@@ -228,6 +234,19 @@ export interface ReportContext {
|
|||||||
windows: string;
|
windows: string;
|
||||||
install_kind: "new" | "imported";
|
install_kind: "new" | "imported";
|
||||||
server_version: string | null;
|
server_version: string | null;
|
||||||
|
/** where the form starts: the bot system that is switched on, else the Manager */
|
||||||
|
suggested_target: ReportTargetId;
|
||||||
|
/** the release of the bot system that is on */
|
||||||
|
bots_version: string | null;
|
||||||
|
}
|
||||||
|
|
||||||
|
export type ReportTargetId = "manager" | "companions" | "squid";
|
||||||
|
|
||||||
|
/** A place a problem report can go: its GitHub repository as `owner/name`. */
|
||||||
|
export interface ReportTarget {
|
||||||
|
id: ReportTargetId;
|
||||||
|
repo: string;
|
||||||
|
ours: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface InstallRequirements {
|
export interface InstallRequirements {
|
||||||
@@ -264,6 +283,7 @@ export interface UpdatePreview {
|
|||||||
items: UpdatePlanItem[];
|
items: UpdatePlanItem[];
|
||||||
conflicts: string[];
|
conflicts: string[];
|
||||||
migrations: number;
|
migrations: number;
|
||||||
|
pending_migrations?: number;
|
||||||
download_bytes: number;
|
download_bytes: number;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -273,6 +293,7 @@ export interface UpdateTxn {
|
|||||||
from_version: string | null;
|
from_version: string | null;
|
||||||
to_version: string;
|
to_version: string;
|
||||||
recovery_point: string | null;
|
recovery_point: string | null;
|
||||||
|
databases_started: boolean;
|
||||||
message: string | null;
|
message: string | null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -340,9 +361,16 @@ export interface ClientDownloadCheck {
|
|||||||
|
|
||||||
export type FriendsMode = "local" | "lan" | "direct" | "private";
|
export type FriendsMode = "local" | "lan" | "direct" | "private";
|
||||||
|
|
||||||
|
export interface LanAddress {
|
||||||
|
interface: string;
|
||||||
|
address: string;
|
||||||
|
is_default: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
export interface FriendsStatus {
|
export interface FriendsStatus {
|
||||||
settings: { mode: FriendsMode; host: string | null };
|
settings: { mode: FriendsMode; host: string | null; lan_address_override: string | null };
|
||||||
lan_ip: string | null;
|
lan_ip: string | null;
|
||||||
|
lan_addresses: LanAddress[];
|
||||||
exposure: { port: number; what: string; reachable_from_network: boolean; listening: boolean }[];
|
exposure: { port: number; what: string; reachable_from_network: boolean; listening: boolean }[];
|
||||||
servers_open: boolean;
|
servers_open: boolean;
|
||||||
firewall: { auth: boolean; world: boolean };
|
firewall: { auth: boolean; world: boolean };
|
||||||
@@ -374,6 +402,8 @@ export interface ConsoleLine {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export const api = {
|
export const api = {
|
||||||
|
remoteConnection: () => invoke<RemoteConnection>("remote_connection"),
|
||||||
|
remoteConnect: (host: string) => invoke<RemoteConnection>("remote_connect", { host }),
|
||||||
realmProfiles: (id: string) => invoke<RealmProfiles>("realm_profiles", { id }),
|
realmProfiles: (id: string) => invoke<RealmProfiles>("realm_profiles", { id }),
|
||||||
realmSelect: (id: string, mode: RealmMode, restart: boolean) => invoke<RealmProfiles>("realm_select", { id, mode, restart }),
|
realmSelect: (id: string, mode: RealmMode, restart: boolean) => invoke<RealmProfiles>("realm_select", { id, mode, restart }),
|
||||||
realmSimultaneous: (id: string, enabled: boolean) => invoke<RealmProfiles>("realm_simultaneous", { id, enabled }),
|
realmSimultaneous: (id: string, enabled: boolean) => invoke<RealmProfiles>("realm_simultaneous", { id, enabled }),
|
||||||
@@ -409,6 +439,7 @@ export const api = {
|
|||||||
allSettings: (id: string) => invoke<AllSetting[]>("all_settings", { id }),
|
allSettings: (id: string) => invoke<AllSetting[]>("all_settings", { id }),
|
||||||
allSettingsSave: (id: string, changes: Record<string, string>) => invoke<string[]>("all_settings_save", { id, changes }),
|
allSettingsSave: (id: string, changes: Record<string, string>) => invoke<string[]>("all_settings_save", { id, changes }),
|
||||||
reportContext: (id: string) => invoke<ReportContext>("report_context", { id }),
|
reportContext: (id: string) => invoke<ReportContext>("report_context", { id }),
|
||||||
|
reportTargets: () => invoke<ReportTarget[]>("report_targets"),
|
||||||
listAccounts: (id: string) => invoke<AccountInfo[]>("list_accounts", { id }),
|
listAccounts: (id: string) => invoke<AccountInfo[]>("list_accounts", { id }),
|
||||||
accountSetPassword: (id: string, name: string, password: string) => invoke<void>("account_set_password", { id, name, password }),
|
accountSetPassword: (id: string, name: string, password: string) => invoke<void>("account_set_password", { id, name, password }),
|
||||||
accountSetAccess: (id: string, name: string, level: number) => invoke<void>("account_set_access", { id, name, level }),
|
accountSetAccess: (id: string, name: string, level: number) => invoke<void>("account_set_access", { id, name, level }),
|
||||||
@@ -423,6 +454,7 @@ export const api = {
|
|||||||
applyUpdate: (id: string, resolutions: Record<string, "keep" | "replace">, source?: string) =>
|
applyUpdate: (id: string, resolutions: Record<string, "keep" | "replace">, source?: string) =>
|
||||||
invoke<{ txn: UpdateTxn }>("apply_update", { id, source: source ?? null, resolutions }),
|
invoke<{ txn: UpdateTxn }>("apply_update", { id, source: source ?? null, resolutions }),
|
||||||
rollbackUpdate: (id: string, txn: string) => invoke<UpdateTxn>("rollback_update", { id, txn }),
|
rollbackUpdate: (id: string, txn: string) => invoke<UpdateTxn>("rollback_update", { id, txn }),
|
||||||
|
retryUpdateValidation: (id: string, txn: string) => invoke<UpdateTxn>("retry_update_validation", { id, txn }),
|
||||||
population: (id: string) => invoke<Population | null>("get_population", { id }),
|
population: (id: string) => invoke<Population | null>("get_population", { id }),
|
||||||
stopSpawning: (id: string) => invoke<{ count: number }>("companions_stop_spawning", { id }),
|
stopSpawning: (id: string) => invoke<{ count: number }>("companions_stop_spawning", { id }),
|
||||||
takeOffline: (id: string) => invoke<{ count: number }>("companions_take_offline", { id }),
|
takeOffline: (id: string) => invoke<{ count: number }>("companions_take_offline", { id }),
|
||||||
@@ -445,8 +477,8 @@ export const api = {
|
|||||||
play: (id: string) => invoke<DriverOutcome>("play", { id }),
|
play: (id: string) => invoke<DriverOutcome>("play", { id }),
|
||||||
friendsStatus: (id: string) => invoke<FriendsStatus>("friends_status", { id }),
|
friendsStatus: (id: string) => invoke<FriendsStatus>("friends_status", { id }),
|
||||||
friendsCheckInternet: () => invoke<InternetCheck>("friends_check_internet"),
|
friendsCheckInternet: () => invoke<InternetCheck>("friends_check_internet"),
|
||||||
friendsEnable: (id: string, mode: FriendsMode, host?: string, useUpnp = false) =>
|
friendsEnable: (id: string, mode: FriendsMode, host?: string, useUpnp = false, lanAddressOverride: string | null = null) =>
|
||||||
invoke<{ host: string; restart_required: boolean; note: string | null }>("friends_enable", { id, mode, host: host ?? null, useUpnp }),
|
invoke<{ host: string; restart_required: boolean; note: string | null }>("friends_enable", { id, mode, host: host ?? null, useUpnp, lanAddressOverride }),
|
||||||
friendsPackage: (id: string) => invoke<string>("friends_package", { id }),
|
friendsPackage: (id: string) => invoke<string>("friends_package", { id }),
|
||||||
runDiagnostics: (id: string) => invoke<{ checks: DiagCheck[]; problems: number }>("run_diagnostics", { id }),
|
runDiagnostics: (id: string) => invoke<{ checks: DiagCheck[]; problems: number }>("run_diagnostics", { id }),
|
||||||
verifyFiles: (id: string) => invoke<{ path: string; kind: "missing" | "changed" }[]>("verify_files", { id }),
|
verifyFiles: (id: string) => invoke<{ path: string; kind: "missing" | "changed" }[]>("verify_files", { id }),
|
||||||
|
|||||||
@@ -0,0 +1,192 @@
|
|||||||
|
import bots from "../../schemas/bots.json";
|
||||||
|
import server from "../../schemas/server.json";
|
||||||
|
import catalog from "../../modules/catalog.json";
|
||||||
|
import type { Locale } from "@/i18n";
|
||||||
|
import type { ModuleSetting } from "@/lib/api";
|
||||||
|
|
||||||
|
export interface ModuleField {
|
||||||
|
title: string; description: string; type: string; category: string; advanced: boolean;
|
||||||
|
min?: number; max?: number; step?: number;
|
||||||
|
options?: { value: string | number | boolean; label: string }[];
|
||||||
|
}
|
||||||
|
const locales: Locale[] = ["en", "ru", "de", "fr", "es", "zh"];
|
||||||
|
const text = (values: string[], locale: Locale) => values[locales.indexOf(locale)] ?? values[0];
|
||||||
|
type Entry = { key: string; type: string; title: string[]; description: string[]; min?: number; max?: number; advanced?: boolean; options?: { value: string; label: string[] }[] };
|
||||||
|
export const moduleSettingDefinitions: Entry[] = [];
|
||||||
|
const fields = moduleSettingDefinitions;
|
||||||
|
function add(key: string, type: string, title: string[], description: string[], extra: Partial<Entry> = {}) {
|
||||||
|
fields.push({ key, type, title, description, ...extra });
|
||||||
|
}
|
||||||
|
add("AiPlayerbot.RandomBotAutologin", "bool", ["Populate the world automatically", "Автоматически населять мир", "Welt automatisch bevölkern", "Peupler automatiquement le monde", "Poblar el mundo automáticamente", "自动填充世界"], ["Log random bots into the world when the server starts.", "Вводит случайных ботов в мир при запуске сервера.", "Meldet Zufallsbots beim Serverstart in der Welt an.", "Connecte les bots aléatoires au démarrage du serveur.", "Conecta bots aleatorios al iniciar el servidor.", "服务器启动时让随机机器人登录世界。"]);
|
||||||
|
add("AiPlayerbot.MinRandomBots", "int", ["Minimum online bots", "Минимум ботов онлайн", "Mindestens aktive Bots", "Minimum de bots connectés", "Mínimo de bots conectados", "最少在线机器人"], ["Lower limit of the automatically selected online population. Must not exceed the maximum.", "Нижний предел автоматически выбираемого числа ботов онлайн. Не должен превышать максимум.", "Untergrenze der automatisch gewählten Bot-Zahl. Darf das Maximum nicht überschreiten.", "Limite basse du nombre de bots connectés. Ne doit pas dépasser le maximum.", "Límite inferior de bots conectados. No debe superar el máximo.", "自动选择的在线机器人数量下限,不得超过上限。"], { min: 0 });
|
||||||
|
add("AiPlayerbot.MaxRandomBots", "int", ["Maximum online bots", "Максимум ботов онлайн", "Maximal aktive Bots", "Maximum de bots connectés", "Máximo de bots conectados", "最多在线机器人"], ["Upper limit of the random bot population; more bots use more server resources.", "Верхний предел числа случайных ботов онлайн. Больше ботов — выше нагрузка на сервер.", "Obergrenze der Zufallsbots; mehr Bots benötigen mehr Serverressourcen.", "Limite haute des bots aléatoires ; plus de bots utilisent plus de ressources.", "Límite superior de bots aleatorios; más bots requieren más recursos del servidor.", "随机机器人在线数量上限,数量越多越占用服务器资源。"], { min: 0 });
|
||||||
|
add("AiPlayerbot.RandomBotAccountCount", "int", ["Random bot accounts", "Аккаунтов случайных ботов", "Zufallsbot-Konten", "Comptes de bots aléatoires", "Cuentas de bots aleatorios", "随机机器人账号数量"], ["0 calculates the required accounts automatically. Each account contains multiple bots.", "0 — рассчитывать нужное число аккаунтов автоматически. Один аккаунт содержит несколько ботов.", "0 berechnet die benötigten Konten automatisch. Ein Konto enthält mehrere Bots.", "0 calcule automatiquement les comptes nécessaires. Chaque compte contient plusieurs bots.", "0 calcula automáticamente las cuentas necesarias. Cada cuenta contiene varios bots.", "0自动计算所需账号,每个账号包含多个机器人。"], { min: 0 });
|
||||||
|
add("AiPlayerbot.RandomBotMinLevel", "int", ["Minimum bot level", "Минимальный уровень ботов", "Minimale Bot-Stufe", "Niveau minimum des bots", "Nivel mínimo de bots", "最低机器人等级"], ["Lowest level used when generating random bots.", "Нижний уровень при создании случайных ботов.", "Niedrigste Stufe beim Erstellen von Zufallsbots.", "Niveau le plus bas lors de la génération des bots.", "Nivel más bajo al generar bots aleatorios.", "生成随机机器人时的最低等级。"], { min: 0, max: 80 });
|
||||||
|
add("AiPlayerbot.RandomBotMaxLevel", "int", ["Maximum bot level", "Максимальный уровень ботов", "Maximale Bot-Stufe", "Niveau maximum des bots", "Nivel máximo de bots", "最高机器人等级"], ["Highest level used when generating random bots. Keep within the server level cap.", "Верхний уровень при создании случайных ботов. Не превышайте максимальный уровень сервера.", "Höchste Stufe beim Erstellen von Zufallsbots. Server-Stufenlimit beachten.", "Niveau le plus haut lors de la génération. Respectez la limite du serveur.", "Nivel máximo al generar bots. Respeta el límite del servidor.", "生成机器人的最高等级,不应超过服务器等级上限。"], { min: 0, max: 80 });
|
||||||
|
add("AiPlayerbot.SyncLevelWithPlayers", "bool", ["Match player levels", "Подстраивать уровень под игроков", "Spielerstufen anpassen", "Adapter aux niveaux des joueurs", "Ajustar al nivel de jugadores", "匹配玩家等级"], ["Adjust random bot levels to the levels of real players.", "Подстраивает уровни случайных ботов под уровни настоящих игроков.", "Passt Zufallsbot-Stufen an echte Spieler an.", "Adapte le niveau des bots aux joueurs réels.", "Ajusta los niveles de bots a jugadores reales.", "根据真实玩家调整随机机器人等级。"]);
|
||||||
|
add("AiPlayerbot.RandomBotInvitePlayer", "bool", ["Bots invite players", "Боты приглашают игроков", "Bots laden Spieler ein", "Les bots invitent les joueurs", "Los bots invitan jugadores", "机器人邀请玩家"], ["Allow random bots to invite nearby players into groups.", "Разрешает случайным ботам приглашать игроков поблизости в группу.", "Zufallsbots dürfen nahe Spieler in Gruppen einladen.", "Permet aux bots d’inviter les joueurs proches dans un groupe.", "Permite a bots invitar a jugadores cercanos a grupos.", "允许随机机器人邀请附近玩家组队。"]);
|
||||||
|
add("AiPlayerbot.RandomBotJoinLfg", "bool", ["Join dungeon finder", "Участвовать в поиске подземелий", "Dungeonsuche nutzen", "Participer à la recherche de donjon", "Participar en buscador de mazmorras", "加入地下城查找器"], ["Allow random bots to participate in dungeon matchmaking.", "Разрешает случайным ботам участвовать в подборе группы для подземелий.", "Zufallsbots dürfen an der Dungeonsuche teilnehmen.", "Autorise les bots à participer à la recherche de donjon.", "Permite a bots participar en el buscador de mazmorras.", "允许随机机器人参与地下城匹配。"]);
|
||||||
|
add("AiPlayerbot.RandomBotJoinBG", "bool", ["Join battlegrounds", "Участвовать в полях боя", "Schlachtfeldern beitreten", "Rejoindre les champs de bataille", "Unirse a campos de batalla", "加入战场"], ["Allow random bots to enter battlegrounds.", "Разрешает случайным ботам входить на поля боя.", "Zufallsbots dürfen Schlachtfelder betreten.", "Autorise les bots à entrer sur les champs de bataille.", "Permite a bots entrar en campos de batalla.", "允许随机机器人进入战场。"]);
|
||||||
|
add("AiPlayerbot.RandomBotAutoJoinBG", "bool", ["Queue for battlegrounds automatically", "Автоматически вставать в очередь на поля боя", "Automatisch für Schlachtfelder anmelden", "Inscription automatique aux champs de bataille", "Cola automática para campos de batalla", "自动排队战场"], ["Queue random bots without waiting for a player to queue first.", "Ставит ботов в очередь, не дожидаясь первого игрока.", "Meldet Bots an, ohne auf die Anmeldung eines Spielers zu warten.", "Inscrit les bots sans attendre un premier joueur.", "Pone bots en cola sin esperar a un jugador.", "无需等待玩家先排队,即可让机器人排队。"]);
|
||||||
|
add("AiPlayerbot.RandomBotTalk", "bool", ["Bot chat", "Сообщения ботов", "Bot-Chat", "Discussion des bots", "Chat de bots", "机器人聊天"], ["Allow random bots to send chat messages.", "Разрешает случайным ботам отправлять сообщения в чат.", "Zufallsbots dürfen Chatnachrichten senden.", "Autorise les messages des bots dans le chat.", "Permite mensajes de bots en el chat.", "允许随机机器人发送聊天消息。"]);
|
||||||
|
add("AiPlayerbot.RandomBotEmote", "bool", ["Bot emotes", "Эмоции ботов", "Bot-Emotes", "Émotes des bots", "Gestos de bots", "机器人表情"], ["Allow random bots to perform emotes.", "Разрешает случайным ботам использовать эмоции.", "Zufallsbots dürfen Emotes verwenden.", "Autorise les émotes des bots.", "Permite a bots usar gestos.", "允许随机机器人使用表情动作。"]);
|
||||||
|
add("AiPlayerbot.RandomBotSuggestDungeons", "bool", ["Suggest dungeons", "Предлагать подземелья", "Dungeons vorschlagen", "Suggérer des donjons", "Sugerir mazmorras", "建议地下城"], ["Allow bots to suggest dungeons to players in chat.", "Разрешает ботам предлагать игрокам подземелья в чате.", "Bots dürfen Spielern im Chat Dungeons vorschlagen.", "Autorise les suggestions de donjons dans le chat.", "Permite sugerir mazmorras a jugadores en el chat.", "允许机器人在聊天中向玩家建议地下城。"]);
|
||||||
|
add("AiPlayerbot.CoaClassesOnly", "bool", ["Only CoA classes", "Только классы CoA", "Nur CoA-Klassen", "Classes CoA uniquement", "Solo clases CoA", "仅CoA职业"], ["Use Conquest of Azeroth classes for generated bots.", "Использует классы Conquest of Azeroth для создаваемых ботов.", "Nutzt CoA-Klassen für erstellte Bots.", "Utilise les classes CoA pour les bots générés.", "Usa clases CoA para bots generados.", "生成机器人时使用CoA职业。"]);
|
||||||
|
add("AiPlayerbot.CoaSmartHeal", "bool", ["Smart healing", "Умное лечение", "Intelligente Heilung", "Soins intelligents", "Sanación inteligente", "智能治疗"], ["Use CoA healing priorities to choose targets and spells.", "Использует приоритеты лечения CoA для выбора целей и заклинаний.", "Nutzt CoA-Heilprioritäten für Ziele und Zauber.", "Utilise les priorités de soins CoA pour les cibles et sorts.", "Usa prioridades de sanación CoA para objetivos y hechizos.", "根据CoA治疗优先级选择目标和法术。"]);
|
||||||
|
add("AiPlayerbot.CoaSmartTank", "bool", ["Smart tanking", "Умное танкование", "Intelligentes Tanken", "Tank intelligent", "Tanque inteligente", "智能坦克"], ["Use CoA tank priorities for threat and survival.", "Использует приоритеты танков CoA для угрозы и выживания.", "Nutzt CoA-Tankprioritäten für Bedrohung und Überleben.", "Utilise les priorités de tank CoA pour menace et survie.", "Usa prioridades de tanque CoA para amenaza y supervivencia.", "使用CoA坦克优先级控制仇恨和生存。"]);
|
||||||
|
add("AiPlayerbot.CoaSpecRotations", "bool", ["CoA specialization rotations", "Ротации специализаций CoA", "CoA-Spezialisierungsrotationen", "Rotations des spécialisations CoA", "Rotaciones de especialización CoA", "CoA专精循环"], ["Use authored specialization rotations alongside automatic spell selection.", "Использует готовые ротации специализаций вместе с автоматическим выбором заклинаний.", "Nutzt Spezialisierungsrotationen neben automatischer Zauberauswahl.", "Utilise les rotations de spécialisation avec la sélection automatique des sorts.", "Usa rotaciones de especialización junto a selección automática de hechizos.", "在自动选法术的基础上使用专精循环。"]);
|
||||||
|
add("AiPlayerbot.CoaInterruptCoordination", "bool", ["Coordinate interrupts", "Согласовывать прерывания", "Unterbrechungen koordinieren", "Coordonner les interruptions", "Coordinar interrupciones", "协调打断"], ["Coordinate bot interrupts so several bots do not interrupt the same cast.", "Согласовывает прерывания ботов, чтобы несколько ботов не тратили их на одно заклинание.", "Koordiniert Unterbrechungen, damit Bots nicht denselben Zauber unterbrechen.", "Coordonne les interruptions pour éviter de viser tous le même sort.", "Coordina interrupciones para evitar gastar varias en el mismo lanzamiento.", "协调打断,避免多个机器人同时打断同一个施法。"]);
|
||||||
|
add("AiPlayerbot.MaxAddedBots", "int", ["Bots controlled by one player", "Ботов под управлением игрока", "Bots pro Spieler", "Bots contrôlés par joueur", "Bots controlados por jugador", "每位玩家控制的机器人"], ["Maximum number of bots a player can control at once.", "Максимум ботов, которыми игрок может управлять одновременно.", "Maximale gleichzeitig steuerbare Bots pro Spieler.", "Nombre maximal de bots contrôlés simultanément par joueur.", "Máximo de bots controlados a la vez por jugador.", "玩家同时控制的机器人数量上限。"], { min: 0 });
|
||||||
|
add("AiPlayerbot.BotAutologin", "bool", ["Log in player alts automatically", "Автоматически вводить альтов игрока", "Spieler-Alts automatisch anmelden", "Connecter automatiquement les personnages secondaires", "Conectar personajes alternativos automáticamente", "自动登录玩家小号"], ["Log in other characters on the player’s account as bots when the player logs in.", "При входе игрока вводит других персонажей его аккаунта как ботов.", "Meldet andere Charaktere des Spielerkontos beim Login als Bots an.", "Connecte les autres personnages du compte comme bots à la connexion.", "Conecta otros personajes de la cuenta como bots al entrar el jugador.", "玩家登录时,将同账号其他角色作为机器人登录。"]);
|
||||||
|
add("AiPlayerbot.DisabledWithoutRealPlayer", "bool", ["Only populate while players are online", "Вводить ботов только при наличии игроков", "Bots nur bei aktiven Spielern", "Bots seulement avec des joueurs connectés", "Bots solo con jugadores conectados", "仅有玩家在线时填充机器人"], ["Log random bots out when no real players remain online.", "Выводит случайных ботов, когда на сервере нет настоящих игроков.", "Meldet Zufallsbots ab, wenn keine echten Spieler online sind.", "Déconnecte les bots quand aucun joueur réel ne reste connecté.", "Desconecta bots cuando no quedan jugadores reales.", "没有真实玩家在线时退出随机机器人。"]);
|
||||||
|
add("AiPlayerbot.AddClassCommand", "bool", ["Players can create bots by class", "Игроки могут создавать ботов по классу", "Spieler können Klassenbots erstellen", "Les joueurs peuvent créer des bots par classe", "Jugadores pueden crear bots por clase", "玩家可按职业创建机器人"], ["Allow the addclass command for players; disabled restricts it to game masters.", "Разрешает игрокам команду addclass. При выключении она доступна только ГМ.", "Erlaubt addclass für Spieler; deaktiviert nur für Spielleiter.", "Autorise addclass aux joueurs ; sinon réservé aux maîtres de jeu.", "Permite addclass a jugadores; desactivado solo para maestros de juego.", "允许玩家使用addclass命令,关闭后仅GM可用。"]);
|
||||||
|
add("AiPlayerbot.KeepAltsInGroup", "bool", ["Keep alts in the group", "Оставлять альтов в группе", "Alts in der Gruppe behalten", "Garder les personnages secondaires en groupe", "Mantener personajes alternativos en el grupo", "保留小号在队伍中"], ["Keep alt bots in the group after their owner leaves.", "Оставляет альтов-ботов в группе после выхода владельца.", "Behält Alt-Bots in der Gruppe, wenn ihr Besitzer geht.", "Garde les bots secondaires après le départ du propriétaire.", "Mantiene bots alternativos cuando sale su dueño.", "主人离队后,让小号机器人留在队伍中。"]);
|
||||||
|
add("AiPlayerbot.CoaRecruitSameFaction", "bool", ["Recruit bots of your faction", "Нанимать ботов своей фракции", "Bots der eigenen Fraktion anwerben", "Recruter les bots de votre faction", "Reclutar bots de tu facción", "招募同阵营机器人"], ["Restrict CoA role recruitment to the player’s faction.", "Ограничивает найм по роли CoA фракцией игрока.", "Beschränkt die CoA-Rollenanwerbung auf die Spielerfraktion.", "Limite le recrutement CoA à la faction du joueur.", "Limita el reclutamiento CoA a la facción del jugador.", "将CoA按职责招募限制为玩家同阵营。"]);
|
||||||
|
add("AiPlayerbot.CoaLfgBots", "bool", ["CoA bots fill dungeon groups", "Боты CoA заполняют группы подземелий", "CoA-Bots füllen Dungeongruppen", "Les bots CoA complètent les groupes de donjon", "Bots CoA completan grupos de mazmorras", "CoA机器人补齐地下城队伍"], ["Allow CoA bots to fill missing roles in dungeon finder groups.", "Разрешает ботам CoA занимать недостающие роли в группах поиска подземелий.", "Erlaubt CoA-Bots fehlende Rollen in Dungeonsuche-Gruppen zu füllen.", "Autorise les bots CoA à compléter les rôles manquants.", "Permite a bots CoA cubrir roles faltantes en grupos del buscador.", "允许CoA机器人补齐地下城查找器队伍的缺失职责。"]);
|
||||||
|
add("AiPlayerbot.RandomBotXPRate", "float", ["Bot experience multiplier", "Множитель опыта ботов", "Bot-Erfahrungsmultiplikator", "Multiplicateur d’expérience des bots", "Multiplicador de experiencia de bots", "机器人经验倍率"], ["1 uses the normal experience rate for random bots.", "1 — обычная скорость получения опыта случайными ботами.", "1 nutzt die normale Erfahrungsrate für Zufallsbots.", "1 conserve le gain d’expérience normal des bots aléatoires.", "1 usa la experiencia normal de bots aleatorios.", "1使用随机机器人的正常经验获取倍率。"], { min: 0 });
|
||||||
|
add("AiPlayerbot.FollowDistance", "float", ["Follow distance", "Дистанция следования", "Folgeabstand", "Distance de suivi", "Distancia de seguimiento", "跟随距离"], ["Distance bots maintain while following their owner.", "Расстояние до владельца при следовании.", "Abstand zum Besitzer beim Folgen.", "Distance maintenue en suivant le propriétaire.", "Distancia mantenida al seguir al dueño.", "跟随主人时保持的距离。"], { min: 0 });
|
||||||
|
const scaling = "CoAContentScaling.";
|
||||||
|
add(scaling + "LFG.AllowPartialGroups", "bool", ["Enter with the current party", "Входить текущим составом", "Mit aktueller Gruppe betreten", "Entrer avec le groupe actuel", "Entrar con el grupo actual", "以当前队伍进入"], ["Enter Dungeon Finder with 1–5 players without waiting for a full party. Requires group scaling. BotFill keeps filling empty slots.", "Вход через ЛФГ составом 1–5 игроков без ожидания полной группы. Требует скейлинга группы. BotFill продолжает заполнять свободные места.", "Dungeonbrowser mit 1–5 Spielern ohne volle Gruppe. Erfordert Gruppenanpassung. BotFill füllt freie Plätze.", "Entrée avec 1 à 5 joueurs sans attendre un groupe complet. Nécessite l’adaptation au groupe. BotFill remplit les places libres.", "Entrar con 1–5 jugadores sin esperar un grupo completo. Requiere ajuste al grupo. BotFill llena los huecos.", "以1至5名玩家进入,无需等待满员。需要队伍缩放。BotFill仍会填补空位。"]);
|
||||||
|
add(scaling + "World.Leech.Enable", "bool", ["Open-world life steal", "Отхил от урона в открытом мире", "Lebensraub in der offenen Welt", "Vol de vie en monde ouvert", "Robo de vida en mundo abierto", "开放世界吸血"], ["Heal from your damage to open-world creatures. Excludes players, their pets and instances. Requires the module; group scaling and solo assistance are optional.", "Восстанавливает здоровье от вашего урона существам открытого мира. Исключает игроков, их питомцев и инстансы. Требует включения модуля; скейлинг группы и соло-помощь необязательны.", "Heilt durch eigenen Schaden an Weltkreaturen. Ohne Spieler, deren Begleiter und Instanzen. Erfordert das Modul; Gruppenanpassung und Solohilfe sind optional.", "Soigne grâce aux dégâts aux créatures du monde ouvert. Exclut joueurs, familiers et instances. Nécessite le module ; adaptation au groupe et aide solo facultatives.", "Cura con tu daño a criaturas del mundo abierto. Excluye jugadores, mascotas e instancias. Requiere el módulo; ajuste al grupo y ayuda individual opcionales.", "对开放世界生物造成伤害时恢复生命。不适用于玩家、玩家宠物和副本。需要启用模块,队伍缩放和单人辅助可选。"]);
|
||||||
|
add(scaling + "World.Leech.Percent", "float", ["Life steal (%)", "Отхил от нанесённого урона (%)", "Lebensraub (%)", "Vol de vie (%)", "Robo de vida (%)", "吸血比例(%)"], ["Percentage of damage returned as health: 0–100. 10 means 10%. Requires open-world life steal. Overkill gives no extra healing.", "Процент урона, возвращаемый здоровьем: 0–100. Значение 10 означает 10%. Требует включения отхила в открытом мире. Избыточный урон при добивании не увеличивает отхил.", "Schadensanteil als Heilung: 0–100. 10 bedeutet 10%. Erfordert Welt-Lebensraub. Überzähliger Schaden heilt nicht zusätzlich.", "Pourcentage des dégâts rendu en vie : 0–100. 10 signifie 10%. Nécessite le vol de vie. Les dégâts excédentaires ne soignent pas davantage.", "Porcentaje del daño recuperado como salud: 0–100. 10 significa 10%. Requiere robo de vida. El daño excedente no aporta curación adicional.", "将伤害的0至100%转化为生命。10表示10%。需要启用吸血。过量伤害不会额外治疗。"], { min: 0, max: 100 });
|
||||||
|
add(scaling + "Difficulty.DamageMultiplier", "range", ["Enemy damage", "Урон противников", "Gegnerschaden", "Dégâts ennemis", "Daño enemigo", "敌人伤害"], ["Dungeon and raid damage after group scaling and solo assistance. 100% keeps the normal balance; lower is easier. Applies to everyone on this server. Does not change health, loot or instant-kill mechanics.", "Урон в подземельях и рейдах после скейлинга группы и соло-помощи. 100% — обычный баланс, ниже — легче. Действует для всех игроков сервера. Не меняет здоровье, добычу и механики мгновенной смерти.", "Schaden in Dungeons und Schlachtzügen nach Gruppenanpassung und Solohilfe. 100% ist normal, weniger ist leichter. Gilt für alle Spieler. Ändert weder Gesundheit noch Beute oder Soforttötungen.", "Dégâts en donjon et raid après adaptation au groupe et aide solo. 100% conserve l’équilibrage normal ; moins est plus facile. Pour tous les joueurs. Ne change ni la vie, ni le butin, ni les morts instantanées.", "Daño en mazmorras y bandas tras el ajuste del grupo y la ayuda individual. 100% mantiene el equilibrio normal; menos es más fácil. Para todos los jugadores. No cambia salud, botín ni muerte instantánea.", "队伍缩放和单人辅助后的地下城与团队副本伤害。100%为正常,降低后更容易。对全服玩家生效,不改变生命值、掉落或即死机制。"], { min: 0.25, max: 2 });
|
||||||
|
add(scaling + "SoloAssist.Mode", "enum", ["Solo assistance", "Помощь в соло", "Solohilfe", "Aide solo", "Ayuda individual", "单人辅助"], ["Additional damage reduction when the scaling target is one player.", "Дополнительное снижение урона, когда расчёт сложности рассчитан на одного игрока.", "Zusätzliche Schadensreduktion bei einem Skalierungsziel von einem Spieler.", "Réduction supplémentaire quand la difficulté est calculée pour un joueur.", "Reducción adicional cuando la dificultad se calcula para un jugador.", "难度目标为一名玩家时额外减伤。"], { options: [
|
||||||
|
{ value: "None", label: ["None", "Без помощи", "Keine", "Aucune", "Ninguna", "无"] },
|
||||||
|
{ value: "Light", label: ["Light (−15%)", "Лёгкая (−15%)", "Leicht (−15%)", "Légère (−15%)", "Ligera (−15%)", "轻度(−15%)"] },
|
||||||
|
{ value: "Full", label: ["Full (−30%)", "Полная (−30%)", "Voll (−30%)", "Complète (−30%)", "Completa (−30%)", "完整(−30%)"] },
|
||||||
|
] });
|
||||||
|
add(scaling + "GroupScaling.Enable", "bool", ["Scale to group size", "Подстраивать под размер группы", "An Gruppengröße anpassen", "Adapter à la taille du groupe", "Ajustar al tamaño del grupo", "按队伍人数缩放"], ["Adjust enemy health and damage to the party size. Required for damage difficulty and solo assistance.", "Подстраивает здоровье и урон врагов под группу. Необходимо для регулировки урона и соло-помощи.", "Passt Gesundheit und Schaden an die Gruppe an. Für Schadensregler und Solohilfe erforderlich.", "Adapte la vie et les dégâts au groupe. Requis pour le réglage des dégâts et l’aide solo.", "Ajusta salud y daño al grupo. Necesario para el control de daño y la ayuda individual.", "按队伍人数调整敌人生命和伤害。伤害调节和单人辅助需要启用此项。"]);
|
||||||
|
add(scaling + "GroupScaling.AllowSoloRaids", "bool", ["Enter raids solo", "Входить в рейды одному", "Schlachtzüge solo betreten", "Entrer seul en raid", "Entrar solo en bandas", "单人进入团队副本"], ["Allow raid entry without a raid group.", "Разрешает вход без рейдовой группы.", "Erlaubt den Eintritt ohne Schlachtzugsgruppe.", "Autorise l’entrée sans groupe de raid.", "Permite entrar sin grupo de banda.", "允许无需团队即可进入团队副本。"]);
|
||||||
|
add(scaling + "AdaptiveMechanics.Enable", "bool", ["Adapt encounter mechanics", "Адаптировать механики боёв", "Kampfmechaniken anpassen", "Adapter les mécaniques", "Adaptar mecánicas", "调整战斗机制"], ["Adapt supported encounters for smaller groups.", "Адаптирует поддерживаемые бои для малых групп.", "Passt unterstützte Kämpfe für kleine Gruppen an.", "Adapte les combats pris en charge aux petits groupes.", "Adapta los encuentros compatibles a grupos pequeños.", "为小队调整受支持的战斗。"]);
|
||||||
|
add(scaling + "Rewards.ScaleLootCount", "bool", ["Scale loot quantity", "Подстраивать количество добычи", "Beutemenge anpassen", "Adapter la quantité de butin", "Ajustar cantidad de botín", "缩放掉落数量"], ["Adjust drops to group size, keeping at least one drop.", "Подстраивает добычу под группу, сохраняя хотя бы один предмет.", "Passt Beute an die Gruppe an, mindestens ein Gegenstand bleibt.", "Adapte le butin au groupe, avec au moins un objet.", "Ajusta el botín al grupo, con al menos un objeto.", "按队伍人数调整掉落,至少保留一件。"]);
|
||||||
|
add(scaling + "ScaleItems", "bool", ["Scale equipment", "Масштабировать снаряжение", "Ausrüstung skalieren", "Adapter l’équipement", "Ajustar equipo", "缩放装备"], ["Adjust equipment stats to the selected progression level bands.", "Подстраивает характеристики снаряжения под уровни прогрессии.", "Passt Ausrüstungswerte an die Fortschrittsstufen an.", "Adapte les statistiques aux niveaux de progression.", "Ajusta estadísticas a los niveles de progresión.", "按所选进度等级范围调整装备属性。"]);
|
||||||
|
add(scaling + "LFG.DefaultMode", "enum", ["Dungeon Finder group", "Группа для поиска подземелий", "Dungeonbrowser-Gruppe", "Groupe de recherche de donjons", "Grupo del buscador", "地下城查找器组队"], ["Default queue mode. Players can override it with .lfgmode.", "Режим очереди по умолчанию. Игрок может изменить его командой .lfgmode.", "Standard-Warteschlange. Spieler können sie mit .lfgmode ändern.", "Mode de file par défaut. Modifiable avec .lfgmode.", "Cola predeterminada. Se puede cambiar con .lfgmode.", "默认排队模式,玩家可通过 .lfgmode 更改。"], { options: [
|
||||||
|
{ value: "Matchmaking", label: ["Find players", "Искать игроков", "Spieler suchen", "Chercher des joueurs", "Buscar jugadores", "寻找玩家"] },
|
||||||
|
{ value: "BotFill", label: ["Fill with bots", "Дополнить ботами", "Mit Bots auffüllen", "Compléter avec des bots", "Completar con bots", "机器人补位"] },
|
||||||
|
{ value: "CurrentParty", label: ["Current party / solo", "Текущая группа / соло", "Aktuelle Gruppe / solo", "Groupe actuel / solo", "Grupo actual / solo", "当前队伍 / 单人"] },
|
||||||
|
] });
|
||||||
|
add(scaling + "LFG.DefaultChallengeSize", "int", ["Challenge group size", "Размер группы для расчёта сложности", "Gruppengröße für die Schwierigkeit", "Taille du groupe pour la difficulté", "Tamaño del grupo para dificultad", "难度目标人数"], ["0 follows actual party size. 1–40 simulates that many players. Players can override with .lfgchallenge.", "0 — реальный размер группы. 1–40 — сложность как для указанного числа игроков. Игрок может изменить через .lfgchallenge.", "0 nutzt die tatsächliche Gruppe. 1–40 simuliert diese Spielerzahl. Mit .lfgchallenge änderbar.", "0 suit le groupe réel. 1–40 simule ce nombre de joueurs. Modifiable avec .lfgchallenge.", "0 usa el grupo real. 1–40 simula ese número de jugadores. Modificable con .lfgchallenge.", "0按实际人数,1–40模拟指定人数。玩家可通过 .lfgchallenge 更改。"], { min: 0, max: 40 });
|
||||||
|
add(scaling + "GroupScaling.LockOnEncounterStart", "bool", ["Lock scaling during combat", "Фиксировать скейлинг на время боя", "Skalierung im Kampf sperren", "Figer l’adaptation en combat", "Fijar ajuste durante combate", "战斗期间锁定缩放"], ["Joining or leaving during a boss fight does not change its scaling.", "Вход и выход игроков во время боя с боссом не меняют скейлинг.", "Beitreten oder Verlassen während eines Bosskampfs ändert die Skalierung nicht.", "Les arrivées et départs pendant un boss ne changent pas l’adaptation.", "Entrar o salir durante un jefe no cambia el ajuste.", "首领战期间玩家进出不会改变缩放。"], { advanced: true });
|
||||||
|
add(scaling + "Progression.Mode", "enum", ["Progression boundaries", "Границы прогрессии", "Fortschrittsgrenzen", "Limites de progression", "Límites de progresión", "进度边界"], ["Automatic boundaries follow the level cap and enabled expansions. Custom uses the levels below.", "Автоматические границы зависят от максимального уровня и включённых дополнений. Ручные используют уровни ниже.", "Automatisch folgt der Maximalstufe und Erweiterungen. Benutzerdefiniert nutzt die folgenden Stufen.", "Automatique suit le niveau maximal et les extensions. Manuel utilise les niveaux ci-dessous.", "Automático sigue el nivel máximo y las expansiones. Manual usa los niveles siguientes.", "自动边界按等级上限和启用的资料片计算,自定义使用以下等级。"], { advanced: true, options: [
|
||||||
|
{ value: "Auto", label: ["Automatic", "Автоматически", "Automatisch", "Automatique", "Automático", "自动"] },
|
||||||
|
{ value: "Custom", label: ["Custom", "Вручную", "Benutzerdefiniert", "Manuel", "Manual", "自定义"] },
|
||||||
|
] });
|
||||||
|
for (const era of ["Classic", "Tbc"]) add(scaling + `Progression.${era}End`, "int", [`${era} last level`, `Последний уровень ${era}`, `${era}-Endstufe`, `Dernier niveau ${era}`, `Último nivel ${era}`, `${era} 最高等级`], ["Used in custom progression. 0 chooses automatically.", "Для ручной прогрессии. 0 — автоматически.", "Für benutzerdefinierten Fortschritt. 0 wählt automatisch.", "Pour la progression manuelle. 0 choisit automatiquement.", "Para progresión manual. 0 elige automáticamente.", "用于自定义进度,0为自动。"], { min: 0, max: 80, advanced: true });
|
||||||
|
add(scaling + "Debug", "bool", ["Detailed scaling logs", "Подробные логи скейлинга", "Ausführliche Skalierungsprotokolle", "Journaux détaillés", "Registros detallados", "详细缩放日志"], ["Log scaling calculations for troubleshooting.", "Записывает расчёты скейлинга для диагностики.", "Protokolliert Berechnungen zur Fehleranalyse.", "Enregistre les calculs pour le diagnostic.", "Registra cálculos para diagnóstico.", "记录缩放计算以排查问题。"], { advanced: true });
|
||||||
|
|
||||||
|
const enchantDescription = ["Tell players about the enchanter NPC when they log in.", "Сообщает игрокам о НПС-зачарователе при входе в игру.", "Informiert Spieler beim Einloggen über den Verzauberer-NPC.", "Informe les joueurs du PNJ enchanteur à la connexion.", "Informa a los jugadores del PNJ encantador al iniciar sesión.", "玩家登录时提示附魔NPC。"];
|
||||||
|
add("Enchanter.CostCopper", "int", ["Price per enchantment (copper)", "Цена зачарования (медь)", "Preis pro Verzauberung (Kupfer)", "Prix par enchantement (cuivre)", "Precio por encantamiento (cobre)", "每次附魔价格(铜币)"], ["0 is free. 10,000 copper = 1 gold.", "0 — бесплатно. 10 000 меди = 1 золото.", "0 ist kostenlos. 10.000 Kupfer = 1 Gold.", "0 est gratuit. 10 000 cuivre = 1 or.", "0 es gratis. 10 000 cobre = 1 oro.", "0为免费。10000铜币=1金币。"], { min: 0 });
|
||||||
|
add("Enchanter.Announce", "bool", ["Announce on login", "Объявлять при входе", "Beim Einloggen ankündigen", "Annonce à la connexion", "Anunciar al iniciar sesión", "登录时公告"], enchantDescription);
|
||||||
|
for (const [key, title, desc] of [
|
||||||
|
["MessageTimer", ["Speech interval (milliseconds)", "Интервал реплик (миллисекунды)", "Sprechintervall (Millisekunden)", "Intervalle de parole (millisecondes)", "Intervalo de habla (milisegundos)", "发言间隔(毫秒)"], ["0 disables speech; 60,000 milliseconds = 1 minute.", "0 отключает реплики; 60 000 мс = 1 минута.", "0 deaktiviert Sprache; 60.000 ms = 1 Minute.", "0 désactive la parole ; 60 000 ms = 1 minute.", "0 desactiva el habla; 60 000 ms = 1 minuto.", "0关闭发言;60000毫秒=1分钟。"]],
|
||||||
|
["NumPhrases", ["Number of phrases", "Количество реплик", "Anzahl der Sätze", "Nombre de phrases", "Número de frases", "台词数量"], ["Number of configured phrases the NPC can choose from. 0 disables phrases.", "Количество настроенных реплик НПС. 0 отключает реплики.", "Anzahl verfügbarer Sätze. 0 deaktiviert sie.", "Nombre de phrases disponibles. 0 les désactive.", "Número de frases disponibles. 0 las desactiva.", "NPC可选台词数量,0关闭。"]],
|
||||||
|
["EmoteSpell", ["Attention spell ID", "ID заклинания для привлечения внимания", "Aufmerksamkeitszauber-ID", "ID du sort d’attention", "ID del hechizo de atención", "吸引注意的法术ID"], ["Spell cast by the NPC. 0 disables it.", "Заклинание НПС. 0 отключает его.", "Zauber des NPCs. 0 deaktiviert ihn.", "Sort du PNJ. 0 le désactive.", "Hechizo del PNJ. 0 lo desactiva.", "NPC施放的法术,0关闭。"]],
|
||||||
|
["EmoteCommand", ["Speech gesture ID", "ID жеста при разговоре", "Gesten-ID beim Sprechen", "ID du geste de parole", "ID del gesto al hablar", "发言动作ID"], ["0 disables gestures; 3 is a wave.", "0 отключает жесты; 3 — помахать рукой.", "0 deaktiviert Gesten; 3 ist Winken.", "0 désactive les gestes ; 3 est un salut.", "0 desactiva gestos; 3 es saludar.", "0关闭动作;3为挥手。"]],
|
||||||
|
] as [string, string[], string[]][]) add(`Enchanter.${key}`, "int", title, desc, { min: 0, advanced: true });
|
||||||
|
for (let n = 1; n <= 3; n++) add(`EC.P${n}`, "string", [`NPC phrase ${n}`, `Реплика НПС ${n}`, `NPC-Satz ${n}`, `Phrase du PNJ ${n}`, `Frase del PNJ ${n}`, `NPC台词 ${n}`], ["Text spoken by the NPC. Keep the enclosing quotes.", "Текст реплики НПС. Сохраните кавычки вокруг текста.", "Gesprochener Text. Anführungszeichen beibehalten.", "Texte prononcé. Conservez les guillemets.", "Texto hablado. Conserva las comillas.", "NPC发言内容,请保留外层引号。"], { advanced: true });
|
||||||
|
|
||||||
|
const ah = "AuctionHouseBot.";
|
||||||
|
add(ah + "GUIDs", "string", ["Auction characters", "Персонажи аукциона", "Auktionscharaktere", "Personnages d’enchères", "Personajes de subasta", "拍卖角色"], ["Leave 0 and the server creates and uses its own auction character. To use your own, enter GUIDs separated by commas, without spaces; use dedicated offline characters, not companion bots.", "Оставьте 0, и сервер сам создаст и будет использовать своего персонажа аукциона. Чтобы использовать своих, укажите GUID через запятую без пробелов; нужны отдельные офлайн-персонажи, не боты-компаньоны.", "Bei 0 legt der Server selbst einen Auktionscharakter an und nutzt ihn. Eigene Charaktere: GUIDs durch Kommas, ohne Leerzeichen; separate Offline-Charaktere verwenden, keine Begleiter-Bots.", "Laissez 0 : le serveur crée et utilise son propre personnage d’enchères. Pour les vôtres, indiquez des GUID séparés par des virgules sans espaces ; personnages dédiés hors ligne, pas des bots compagnons.", "Deja 0 y el servidor crea y usa su propio personaje de subastas. Para usar los tuyos, indica GUID separados por comas sin espacios; personajes dedicados desconectados, no bots acompañantes.", "保持0时由服务器自动创建并使用拍卖角色。要使用自己的角色,请以逗号分隔填写GUID,不加空格;使用专用离线角色,勿用伙伴机器人。"], { advanced: true });
|
||||||
|
add(ah + "EnableSeller", "bool", ["Post auctions", "Выставлять лоты", "Auktionen einstellen", "Publier des enchères", "Publicar subastas", "发布拍卖"], ["Let the auction characters sell items. The module switch is also required.", "Разрешает персонажам продавать предметы. Нужен включённый модуль.", "Erlaubt Verkäufe. Der Modulschalter muss ebenfalls aktiv sein.", "Autorise les ventes. Le module doit aussi être activé.", "Permite vender. También requiere el módulo activado.", "允许拍卖角色出售物品,还需启用模块。"]);
|
||||||
|
add(ah + "CoA.ObtainableItemsOnly", "bool", ["Only obtainable items", "Только доступные в игре предметы", "Nur erhältliche Gegenstände", "Objets accessibles uniquement", "Solo objetos obtenibles", "仅可获取物品"], ["List items from world loot, vendors and professions. Other item filters still apply.", "Выставляет предметы из добычи, торговцев и профессий. Остальные фильтры продолжают действовать.", "Listet Gegenstände aus Beute, Händlern und Berufen. Weitere Filter gelten weiterhin.", "Publie les objets de butin, vendeurs et métiers. Les autres filtres s’appliquent.", "Publica objetos de botín, vendedores y profesiones. Los demás filtros siguen activos.", "发布来自掉落、商人和专业的物品,其他筛选仍生效。"]);
|
||||||
|
add(ah + "ItemsPerCycle", "int", ["Listings per cycle", "Лотов за цикл", "Angebote pro Durchlauf", "Annonces par cycle", "Anuncios por ciclo", "每轮上架数量"], ["Maximum items posted during one auction update.", "Максимум предметов за одно обновление аукциона.", "Maximale Angebote pro Auktionsaktualisierung.", "Nombre maximal d’objets par mise à jour.", "Máximo de objetos por actualización.", "每轮拍卖更新最多上架的物品数量。"], { min: 0 });
|
||||||
|
for (const [kind, titles] of [
|
||||||
|
["Buy", ["Buying interval (minutes)", "Интервал покупки (минуты)", "Kaufintervall (Minuten)", "Intervalle d’achat (minutes)", "Intervalo de compra (minutos)", "购买间隔(分钟)"]],
|
||||||
|
["Sell", ["Selling interval (minutes)", "Интервал продажи (минуты)", "Verkaufsintervall (Minuten)", "Intervalle de vente (minutes)", "Intervalo de venta (minutos)", "出售间隔(分钟)"]],
|
||||||
|
] as [string, string[]][]) add(ah + `MinutesBetween${kind}Cycle`, "string", titles, ["A number for a fixed interval, or min:max for a random interval (e.g. 3:15).", "Число для фиксированного интервала или мин:макс для случайного (например, 3:15).", "Zahl für ein festes Intervall oder min:max für ein zufälliges (z. B. 3:15).", "Un nombre pour un délai fixe, ou min:max pour un délai aléatoire (ex. 3:15).", "Número para intervalo fijo o mín:máx para uno aleatorio (p. ej. 3:15).", "固定间隔填数字,随机间隔填最小:最大,如3:15。"]);
|
||||||
|
for (const [faction, names] of [
|
||||||
|
["Alliance", ["Alliance", "Альянс", "Allianz", "Alliance", "Alianza", "联盟"]],
|
||||||
|
["Horde", ["Horde", "Орда", "Horde", "Horde", "Horda", "部落"]],
|
||||||
|
["Neutral", ["Neutral", "Нейтральный аукцион", "Neutral", "Neutre", "Neutral", "中立"]],
|
||||||
|
] as [string, string[]][]) for (const bound of ["Min", "Max"]) {
|
||||||
|
const maximum = bound === "Max";
|
||||||
|
add(ah + `${faction}.${bound}Items`, "int", [
|
||||||
|
`${names[0]}: ${maximum ? "maximum" : "minimum"} listings`, `${names[1]}: ${maximum ? "максимум" : "минимум"} лотов`, `${names[2]}: ${maximum ? "maximale" : "minimale"} Angebote`, `${names[3]} : annonces ${maximum ? "maximales" : "minimales"}`, `${names[4]}: anuncios ${maximum ? "máximos" : "mínimos"}`, `${names[5]}:${maximum ? "最多" : "最少"}上架数量`,
|
||||||
|
], ["Target listing count for this auction house. Keep the minimum no higher than the maximum.", "Целевое число лотов этого аукциона. Минимум не должен превышать максимум.", "Zielanzahl für dieses Auktionshaus. Minimum nicht höher als Maximum einstellen.", "Nombre cible pour cet hôtel des ventes. Le minimum ne doit pas dépasser le maximum.", "Cantidad objetivo para esta casa de subastas. El mínimo no debe superar el máximo.", "此拍卖行的目标上架数量,最小值不得超过最大值。"], { min: 0 });
|
||||||
|
}
|
||||||
|
add(ah + "Buyer.Enabled", "bool", ["Buy player auctions", "Покупать лоты игроков", "Spielerauktionen kaufen", "Acheter les enchères des joueurs", "Comprar subastas de jugadores", "购买玩家拍卖"], ["The auctioneer bot buys listings.", "Бот-аукционист покупает лоты.", "Der Auktionator-Bot kauft Angebote.", "Le bot commissaire-priseur achète des annonces.", "El bot subastador compra anuncios.", "拍卖机器人会购买拍卖品。"]);
|
||||||
|
add(ah + "Buyer.BuyCandidatesPerBuyCycle", "int", ["Purchase candidates per cycle", "Кандидатов на покупку за цикл", "Kaufkandidaten pro Durchlauf", "Achats potentiels par cycle", "Candidatos de compra por ciclo", "每轮购买候选数量"], ["How many auctions the buyer considers per cycle.", "Сколько лотов покупатель рассматривает за цикл.", "Anzahl geprüfter Auktionen pro Durchlauf.", "Nombre d’enchères examinées par cycle.", "Subastas examinadas por ciclo.", "买家每轮考虑的拍卖数量。"], { min: 0 });
|
||||||
|
add(ah + "Buyer.AcceptablePriceModifier", "float", ["Buyer price multiplier", "Множитель цены покупателя", "Kaufpreisfaktor", "Multiplicateur du prix d’achat", "Multiplicador del precio de compra", "买家价格倍率"], ["1 uses the calculated price. Higher values allow more expensive purchases.", "1 — расчётная цена. Большие значения допускают более дорогие покупки.", "1 nutzt den berechneten Preis. Höhere Werte erlauben teurere Käufe.", "1 utilise le prix calculé. Une valeur supérieure autorise des achats plus chers.", "1 usa el precio calculado. Valores mayores permiten compras más caras.", "1使用计算价格,增大后允许更高价购买。"], { min: 0 });
|
||||||
|
add(ah + "MaxBuyoutPriceInCopper", "int", ["Maximum buyout (copper)", "Максимальная цена выкупа (медь)", "Maximaler Sofortkauf (Kupfer)", "Rachat maximal (cuivre)", "Compra máxima (cobre)", "最高一口价(铜币)"], ["Upper price limit. 10,000 copper = 1 gold.", "Верхний предел цены. 10 000 меди = 1 золото.", "Preisobergrenze. 10.000 Kupfer = 1 Gold.", "Prix maximal. 10 000 cuivre = 1 or.", "Precio máximo. 10 000 cobre = 1 oro.", "价格上限,10000铜币=1金币。"], { min: 0 });
|
||||||
|
for (const [key, titles] of [
|
||||||
|
["Buyer.AlwaysBidMaxCalculatedPrice", ["Bid the calculated maximum", "Ставить расчётный максимум", "Berechnetes Maximum bieten", "Enchérir au maximum calculé", "Pujar el máximo calculado", "按计算最高价出价"]],
|
||||||
|
["Buyer.PreventOverpayingForVendorItems", ["Avoid overpaying for vendor items", "Не переплачивать за товары торговцев", "Händlerwaren nicht überbezahlen", "Éviter de surpayer les objets de vendeurs", "Evitar sobrepagar objetos de vendedores", "避免高价购买商人物品"]],
|
||||||
|
["Buyer.BidAgainstPlayers", ["Compete with player bids", "Конкурировать со ставками игроков", "Mit Spielergeboten konkurrieren", "Concurrencer les enchères des joueurs", "Competir con pujas de jugadores", "与玩家竞价"]],
|
||||||
|
] as [string, string[]][]) add(ah + key, "bool", titles, ["Controls the auction buyer’s bidding behaviour.", "Настраивает поведение покупателя при торгах.", "Steuert das Bietverhalten des Käufers.", "Règle le comportement d’enchères de l’acheteur.", "Controla las pujas del comprador.", "控制拍卖买家的出价行为。"]);
|
||||||
|
for (const [prefix, labels, bounds, titles] of [
|
||||||
|
["ListedItemLevelRestrict", ["Filter by item level", "Фильтр по уровню предметов", "Nach Gegenstandsstufe filtern", "Filtrer par niveau d’objet", "Filtrar por nivel de objeto", "按物品等级筛选"], ["MinItemLevel", "MaxItemLevel"], ["Item level", "Уровень предметов", "Gegenstandsstufe", "Niveau d’objet", "Nivel de objeto", "物品等级"]],
|
||||||
|
["EquipItemUseOrEquipLevelRestrict", ["Filter by required player level", "Фильтр по требуемому уровню игрока", "Nach benötigter Spielerstufe filtern", "Filtrer par niveau requis", "Filtrar por nivel requerido", "按角色需求等级筛选"], ["MinLevel", "MaxLevel"], ["Required level", "Требуемый уровень", "Benötigte Stufe", "Niveau requis", "Nivel requerido", "需求等级"]],
|
||||||
|
] as [string, string[], string[], string[]][]) {
|
||||||
|
const desc = ["Only list items within these limits when this filter is enabled.", "При включённом фильтре выставляет только предметы в этих пределах.", "Bei aktivem Filter nur Gegenstände innerhalb dieser Grenzen einstellen.", "Lorsque le filtre est actif, publier uniquement les objets dans ces limites.", "Con filtro activo, publicar solo objetos dentro de estos límites.", "启用筛选后仅发布范围内的物品。"];
|
||||||
|
add(ah + prefix + ".Enabled", "bool", labels, desc);
|
||||||
|
bounds.forEach((bound, i) => add(ah + prefix + "." + bound, "int", [`${titles[0]}: ${i ? "maximum" : "minimum"}`, `${titles[1]}: ${i ? "максимум" : "минимум"}`, `${titles[2]}: ${i ? "Maximum" : "Minimum"}`, `${titles[3]} : ${i ? "maximum" : "minimum"}`, `${titles[4]}: ${i ? "máximo" : "mínimo"}`, `${titles[5]}:${i ? "最大" : "最小"}`], desc, { min: 0 }));
|
||||||
|
}
|
||||||
|
export function moduleEnableKey(id: string) { return catalog.modules.find(m => m.id === id)?.enable_key; }
|
||||||
|
export const auctionCategories: Record<string, string[]> = {
|
||||||
|
Consumable: ["Consumables", "Расходники", "Verbrauchsgüter", "Consommables", "Consumibles", "消耗品"],
|
||||||
|
Container: ["Bags", "Сумки", "Taschen", "Sacs", "Bolsas", "背包"],
|
||||||
|
Weapon: ["Weapons", "Оружие", "Waffen", "Armes", "Armas", "武器"],
|
||||||
|
Gem: ["Gems", "Самоцветы", "Edelsteine", "Gemmes", "Gemas", "宝石"],
|
||||||
|
Armor: ["Armor", "Броня", "Rüstung", "Armures", "Armaduras", "护甲"],
|
||||||
|
Reagent: ["Spell reagents", "Реагенты заклинаний", "Zauberreagenzien", "Composants de sorts", "Componentes de hechizos", "施法材料"],
|
||||||
|
Projectile: ["Ammunition", "Боеприпасы", "Munition", "Munitions", "Munición", "弹药"],
|
||||||
|
TradeGood: ["Crafting materials", "Материалы для профессий", "Handwerksmaterialien", "Matériaux d’artisanat", "Materiales de profesión", "专业材料"],
|
||||||
|
Generic: ["Generic items", "Общие предметы", "Allgemeine Gegenstände", "Objets génériques", "Objetos genéricos", "通用物品"],
|
||||||
|
Recipe: ["Recipes", "Рецепты", "Rezepte", "Recettes", "Recetas", "配方"],
|
||||||
|
Quiver: ["Quivers and ammo pouches", "Колчаны и подсумки", "Köcher und Munitionstaschen", "Carquois et gibernes", "Carcajes y bolsas de munición", "箭袋与弹药包"],
|
||||||
|
Quest: ["Quest items", "Предметы заданий", "Questgegenstände", "Objets de quête", "Objetos de misión", "任务物品"],
|
||||||
|
Key: ["Keys", "Ключи", "Schlüssel", "Clés", "Llaves", "钥匙"],
|
||||||
|
Misc: ["Miscellaneous", "Разное", "Verschiedenes", "Divers", "Varios", "杂项"],
|
||||||
|
Glyph: ["Glyphs", "Символы", "Glyphen", "Glyphes", "Glifos", "雕文"],
|
||||||
|
};
|
||||||
|
export const auctionQualities: Record<string, string[]> = {
|
||||||
|
Poor: ["Poor", "Низкое", "Schlecht", "Médiocre", "Pobre", "粗糙"],
|
||||||
|
Normal: ["Common", "Обычное", "Gewöhnlich", "Commun", "Común", "普通"],
|
||||||
|
Uncommon: ["Uncommon", "Необычное", "Ungewöhnlich", "Inhabituel", "Poco común", "优秀"],
|
||||||
|
Rare: ["Rare", "Редкое", "Selten", "Rare", "Raro", "精良"],
|
||||||
|
Epic: ["Epic", "Эпическое", "Episch", "Épique", "Épico", "史诗"],
|
||||||
|
Legendary: ["Legendary", "Легендарное", "Legendär", "Légendaire", "Legendario", "传说"],
|
||||||
|
Artifact: ["Artifact", "Артефакт", "Artefakt", "Artefact", "Artefacto", "神器"],
|
||||||
|
Heirloom: ["Heirloom", "Наследуемое", "Erbstück", "Héritage", "Reliquia", "传家宝"],
|
||||||
|
};
|
||||||
|
export const auctionCategoryLabel = (category: string, locale: Locale) => text(auctionCategories[category], locale);
|
||||||
|
export const auctionQualityLabel = (quality: string, locale: Locale) => text(auctionQualities[quality], locale);
|
||||||
|
export const auctionWeightKey = (key: string) => /^AuctionHouseBot\.ListProportion\.Category([A-Za-z]+)\.Quality([A-Za-z]+)$/.exec(key);
|
||||||
|
export function auctionCategorySettings(items: ModuleSetting[], category: string) {
|
||||||
|
return items.filter(item => auctionWeightKey(item.key)?.[1] === category);
|
||||||
|
}
|
||||||
|
/** Turn a type off across all qualities; on restores weights or selects one supported common quality. */
|
||||||
|
export function auctionTypeChanges(items: ModuleSetting[], on: boolean, remembered: Record<string, string> = {}): Record<string, string> {
|
||||||
|
if (!on) return Object.fromEntries(items.map(item => [item.key, "0"]));
|
||||||
|
const restored = Object.fromEntries(items.map(item => [item.key, remembered[item.key] ?? item.default ?? "0"]));
|
||||||
|
if (!Object.values(restored).some(value => Number(value) > 0)) {
|
||||||
|
const fallback = items.find(item => auctionWeightKey(item.key)?.[2] === "Normal") ?? items[0];
|
||||||
|
if (fallback) restored[fallback.key] = "1";
|
||||||
|
}
|
||||||
|
return restored;
|
||||||
|
}
|
||||||
|
for (const [category, categoryNames] of Object.entries(auctionCategories)) {
|
||||||
|
for (const [quality, qualityNames] of Object.entries(auctionQualities)) add(
|
||||||
|
`AuctionHouseBot.ListProportion.Category${category}.Quality${quality}`, "int",
|
||||||
|
categoryNames.map((name, index) => `${name}: ${qualityNames[index]}`),
|
||||||
|
["Relative listing weight, not a percentage. 0 excludes this type and quality. Larger values make it more frequent among new listings.", "Относительный вес, а не процент. 0 исключает этот тип и качество. Чем больше значение, тем чаще они встречаются среди новых лотов.", "Relatives Gewicht, kein Prozentwert. 0 schließt Typ und Qualität aus. Höhere Werte erzeugen häufiger neue Angebote.", "Poids relatif, pas un pourcentage. 0 exclut ce type et cette qualité. Une valeur plus élevée augmente leur fréquence.", "Peso relativo, no porcentaje. 0 excluye este tipo y calidad. Valores mayores aumentan su frecuencia en nuevas subastas.", "相对权重,并非百分比。0排除此类型与品质,数值越大越常出现在新拍卖中。"],
|
||||||
|
{ min: 0, max: 1000, advanced: true },
|
||||||
|
);
|
||||||
|
}
|
||||||
|
export function moduleField(key: string, locale: Locale, metadata?: ModuleSetting["field"]): ModuleField | undefined {
|
||||||
|
const translated = locale !== "en" ? fields.find(f => f.key === key) : undefined;
|
||||||
|
if (metadata) return { title: translated ? text(translated.title, locale) : metadata.title, description: translated ? text(translated.description, locale) : metadata.description, type: metadata.type, category: metadata.group, advanced: false, min: metadata.min ?? undefined, max: metadata.max ?? undefined };
|
||||||
|
const field = fields.find(f => f.key === key);
|
||||||
|
if (field) return { ...field, title: text(field.title, locale), description: text(field.description, locale), category: "general", advanced: field.advanced ?? false, step: field.type === "range" ? 0.05 : undefined, options: field.options?.map(o => ({ value: o.value, label: text(o.label, locale) })) };
|
||||||
|
const existing = [...bots.settings, ...server.settings].find(s => s.key === key);
|
||||||
|
return existing ? { ...existing, options: "options" in existing ? existing.options : undefined } as ModuleField : undefined;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Older configs accept numeric aliases; keep their effective selection when opening the editor. */
|
||||||
|
export function canonicalModuleValue(key: string, value: string): string {
|
||||||
|
const v = value.trim().replace(/^"|"$/g, "");
|
||||||
|
if (key === scaling + "SoloAssist.Mode") return ({ "0": "None", "1": "Light", "2": "Full", none: "None", light: "Light", full: "Full" } as Record<string, string>)[v.toLowerCase()] ?? v;
|
||||||
|
if (key === scaling + "LFG.DefaultMode") return ({ "0": "Matchmaking", "1": "BotFill", "2": "CurrentParty", matchmaking: "Matchmaking", botfill: "BotFill", currentparty: "CurrentParty" } as Record<string, string>)[v.toLowerCase()] ?? v;
|
||||||
|
if (key === scaling + "Progression.Mode") return v.toLowerCase() === "auto" ? "Auto" : v.toLowerCase() === "custom" ? "Custom" : v;
|
||||||
|
return v;
|
||||||
|
}
|
||||||
+13
-4
@@ -1,9 +1,14 @@
|
|||||||
|
import type { ReportTarget, ReportTargetId } from "./api";
|
||||||
|
|
||||||
/** The text of a problem report, always in English so whoever reads it on GitHub can follow it; the person's own words go in as typed. */
|
/** The text of a problem report, always in English so whoever reads it on GitHub can follow it; the person's own words go in as typed. */
|
||||||
export interface ReportInput {
|
export interface ReportInput {
|
||||||
managerVersion: string;
|
managerVersion: string;
|
||||||
windows: string;
|
windows: string;
|
||||||
installKind: "new" | "imported";
|
installKind: "new" | "imported";
|
||||||
serverVersion: string | null;
|
serverVersion: string | null;
|
||||||
|
/** where the report goes; a bot repository is told which Manager and bot release it came from */
|
||||||
|
target: ReportTargetId;
|
||||||
|
botsVersion: string | null;
|
||||||
what: string;
|
what: string;
|
||||||
expected: string;
|
expected: string;
|
||||||
steps: string;
|
steps: string;
|
||||||
@@ -11,7 +16,10 @@ export interface ReportInput {
|
|||||||
diagnostics: boolean;
|
diagnostics: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
export const NEW_ISSUE_URL = "https://github.com/Corfirean/coa-server-manager/issues/new";
|
/** The "new issue" page of a repository given as `owner/name`. */
|
||||||
|
export function newIssueUrl(repo: string): string {
|
||||||
|
return `https://github.com/${repo}/issues/new`;
|
||||||
|
}
|
||||||
const PRIVACY = "> Please remove passwords, tokens, private IP information or other sensitive data before posting logs.";
|
const PRIVACY = "> Please remove passwords, tokens, private IP information or other sensitive data before posting logs.";
|
||||||
|
|
||||||
export function reportBody(r: ReportInput): string {
|
export function reportBody(r: ReportInput): string {
|
||||||
@@ -23,6 +31,7 @@ export function reportBody(r: ReportInput): string {
|
|||||||
`**Windows version:** ${r.windows || "unknown"} `,
|
`**Windows version:** ${r.windows || "unknown"} `,
|
||||||
`**Fresh install or imported server:** ${r.installKind === "new" ? "Fresh install" : "Imported server"} `,
|
`**Fresh install or imported server:** ${r.installKind === "new" ? "Fresh install" : "Imported server"} `,
|
||||||
...(r.serverVersion ? [`**Server version:** ${r.serverVersion} `] : []),
|
...(r.serverVersion ? [`**Server version:** ${r.serverVersion} `] : []),
|
||||||
|
...(r.target !== "manager" ? [`**Bot system:** ${r.target === "squid" ? "SQUID Playerbots" : "CoA Companions"}${r.botsVersion ? ` ${r.botsVersion}` : ""} `] : []),
|
||||||
"",
|
"",
|
||||||
"**What happened?** ",
|
"**What happened?** ",
|
||||||
text(r.what, "Describe the problem."),
|
text(r.what, "Describe the problem."),
|
||||||
@@ -54,9 +63,9 @@ export function encodeQuery(s: string): string {
|
|||||||
.join("");
|
.join("");
|
||||||
}
|
}
|
||||||
|
|
||||||
/** A link that opens GitHub's "new issue" page with the title and text filled in. */
|
/** A link that opens GitHub's "new issue" page of `target` with the title and text filled in. The bug label is only asked for in our own repositories. */
|
||||||
export function issueUrl(title: string, body: string): string {
|
export function issueUrl(target: Pick<ReportTarget, "repo" | "ours">, title: string, body: string): string {
|
||||||
return `${NEW_ISSUE_URL}?labels=bug&title=${encodeQuery(title)}&body=${encodeQuery(body)}`;
|
return `${newIssueUrl(target.repo)}?${target.ours ? "labels=bug&" : ""}title=${encodeQuery(title)}&body=${encodeQuery(body)}`;
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Links longer than this are not reliable in every browser; the full text is then copied to the clipboard instead. */
|
/** Links longer than this are not reliable in every browser; the full text is then copied to the clipboard instead. */
|
||||||
|
|||||||
+26
-5
@@ -1,6 +1,7 @@
|
|||||||
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 UiError, type UpdatePreview, type UpdateTxn } from "@/lib/api";
|
import { api, asUiError, type UiError, type UpdatePreview, type UpdateTxn } from "@/lib/api";
|
||||||
|
import { isUpdateCurrent } from "./serverUpdateStatus";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 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,
|
||||||
@@ -16,11 +17,13 @@ export interface ServerUpdateState {
|
|||||||
error: string | null;
|
error: string | null;
|
||||||
/** The full error of the last update attempt, for the Settings card. */
|
/** The full error of the last update attempt, for the Settings card. */
|
||||||
uiError: UiError | null;
|
uiError: UiError | null;
|
||||||
|
stateError: UiError | null;
|
||||||
|
stateRevision: number;
|
||||||
/** How the last update ended; kept here so the Settings card can show it after the user left and came back. */
|
/** 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;
|
result: { committed: string } | { pending: UpdateTxn } | null;
|
||||||
}
|
}
|
||||||
|
|
||||||
const EMPTY: ServerUpdateState = { preview: null, available: false, checking: false, applying: false, step: null, percent: 0, error: null, uiError: null, result: null };
|
const EMPTY: ServerUpdateState = { preview: null, available: false, checking: false, applying: false, step: null, percent: 0, error: null, uiError: null, stateError: null, stateRevision: 0, 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;
|
||||||
@@ -37,10 +40,10 @@ export async function checkServerUpdate(id: string): Promise<void> {
|
|||||||
set(id, { checking: true });
|
set(id, { checking: true });
|
||||||
try {
|
try {
|
||||||
const p = await api.checkUpdate(id);
|
const p = await api.checkUpdate(id);
|
||||||
set(id, { preview: p, available: p.to_version !== (p.from_version ?? ""), error: null });
|
set(id, { preview: p, available: !isUpdateCurrent(p), error: null });
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
// offline or no package published: keep what we knew and stay quiet
|
// A cached offer is no longer safe after an update or failed recheck.
|
||||||
set(id, { error: asUiError(e).human.code });
|
set(id, { preview: null, available: false, error: asUiError(e).human.code });
|
||||||
} finally {
|
} finally {
|
||||||
set(id, { checking: false });
|
set(id, { checking: false });
|
||||||
}
|
}
|
||||||
@@ -57,6 +60,20 @@ export function clearServerUpdateResult(id: string) {
|
|||||||
set(id, { result: null, uiError: null });
|
set(id, { result: null, uiError: null });
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export async function refreshServerUpdateState(id: string): Promise<UpdateTxn | null> {
|
||||||
|
try {
|
||||||
|
const pending = await api.pendingUpdate(id);
|
||||||
|
const current = get(id).result;
|
||||||
|
set(id, { stateError: null, stateRevision: get(id).stateRevision + 1,
|
||||||
|
...(pending ? { available: false, preview: null } : {}),
|
||||||
|
result: pending ? { pending } : current && "committed" in current ? current : null });
|
||||||
|
return pending;
|
||||||
|
} catch (e) {
|
||||||
|
set(id, { stateError: asUiError(e), stateRevision: get(id).stateRevision + 1, available: false, preview: null });
|
||||||
|
throw e;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Apply an update. Without options this is the main-screen button: the pending update, only when no file needs a
|
* 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
|
* decision. With options (the Settings card) the owner has already chosen what to do with each changed file and may
|
||||||
@@ -65,7 +82,8 @@ export function clearServerUpdateResult(id: string) {
|
|||||||
*/
|
*/
|
||||||
export async function applyServerUpdate(id: string, opts?: { choices: Record<string, "keep" | "replace">; source?: string }): Promise<boolean> {
|
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 (get(id).applying) return false;
|
const current = get(id);
|
||||||
|
if (current.applying || current.stateError || (current.result && "pending" in current.result)) return false;
|
||||||
if (!opts && (!p || p.conflicts.length > 0)) return false;
|
if (!opts && (!p || p.conflicts.length > 0)) return false;
|
||||||
set(id, { applying: true, step: null, percent: 0, error: null, uiError: null, result: null });
|
set(id, { applying: true, step: null, percent: 0, error: null, uiError: null, result: null });
|
||||||
let un: (() => void) | undefined;
|
let un: (() => void) | undefined;
|
||||||
@@ -84,6 +102,9 @@ export async function applyServerUpdate(id: string, opts?: { choices: Record<str
|
|||||||
return false;
|
return false;
|
||||||
} finally {
|
} finally {
|
||||||
un?.();
|
un?.();
|
||||||
|
try {
|
||||||
|
await refreshServerUpdateState(id);
|
||||||
|
} catch { /* The state error remains visible and prevents another apply. */ }
|
||||||
set(id, { applying: false });
|
set(id, { applying: false });
|
||||||
void checkServerUpdate(id);
|
void checkServerUpdate(id);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,7 @@
|
|||||||
|
import type { UpdatePreview } from "./api";
|
||||||
|
|
||||||
|
export function isUpdateCurrent(preview: UpdatePreview): boolean {
|
||||||
|
return preview.from_version === preview.to_version
|
||||||
|
&& preview.items.every((item) => item.action === "skip")
|
||||||
|
&& (preview.pending_migrations ?? (preview.migrations === 0 ? 0 : undefined)) === 0;
|
||||||
|
}
|
||||||
@@ -0,0 +1,47 @@
|
|||||||
|
import type { JsonValue, ModuleSetting, SettingsView, SettingView } from "@/lib/api";
|
||||||
|
import type { Locale } from "@/i18n";
|
||||||
|
import { moduleField } from "@/lib/moduleSettings";
|
||||||
|
|
||||||
|
const languages: Locale[] = ["en", "ru", "de", "fr", "es", "zh"];
|
||||||
|
const groups = [
|
||||||
|
{ id: "squid.population", titles: ["Population", "Население мира", "Bevölkerung", "Population", "Población", "世界人口"] },
|
||||||
|
{ id: "squid.party", titles: ["Groups", "Группы", "Gruppen", "Groupes", "Grupos", "队伍"] },
|
||||||
|
{ id: "squid.combat", titles: ["Combat", "Бой", "Kampf", "Combat", "Combate", "战斗"] },
|
||||||
|
{ id: "squid.activities", titles: ["Dungeons and PvP", "Подземелья и PvP", "Dungeons und PvP", "Donjons et JcJ", "Mazmorras y JcJ", "地下城与PvP"] },
|
||||||
|
{ id: "squid.chat", titles: ["Chat", "Общение", "Chat", "Discussion", "Chat", "聊天"] },
|
||||||
|
{ id: "squid.other", titles: ["Other settings", "Другие настройки", "Weitere Einstellungen", "Autres réglages", "Otros ajustes", "其他设置"] },
|
||||||
|
];
|
||||||
|
|
||||||
|
function group(key: string, curated: boolean) {
|
||||||
|
if (!curated) return "squid.other";
|
||||||
|
if (/Talk|Emote|Suggest/.test(key)) return "squid.chat";
|
||||||
|
if (/Lfg|JoinBG/.test(key)) return "squid.activities";
|
||||||
|
if (/Smart|SpecRotations|Interrupt/.test(key)) return "squid.combat";
|
||||||
|
if (/AddedBots|BotAutologin$|Invite|AddClassCommand|KeepAlts|Recruit|FollowDistance/.test(key) && !key.endsWith("RandomBotAutologin")) return "squid.party";
|
||||||
|
return "squid.population";
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Use the same settings screen as Companions, backed only by shipped SQUID options. */
|
||||||
|
export function squidSettingsView(items: ModuleSetting[], locale: Locale): SettingsView {
|
||||||
|
const settings: SettingView[] = items.filter(s => s.key !== "AiPlayerbot.Enabled" && !s.key.startsWith("PlayerbotsDatabase") && !s.key.startsWith("Playerbots.Updates.")).map(s => {
|
||||||
|
const field = moduleField(s.key, locale, s.field);
|
||||||
|
const type = field?.type === "bool" || field?.type === "int" || field?.type === "float" || field?.type === "enum" ? field.type : "string";
|
||||||
|
const decode = (raw: string): JsonValue => {
|
||||||
|
const value = raw.trim().replace(/^"|"$/g, "");
|
||||||
|
if (type === "bool") return !["0", "false", "no", "off"].includes(value.toLowerCase());
|
||||||
|
if (type === "int" || type === "float") return Number(value);
|
||||||
|
return value;
|
||||||
|
};
|
||||||
|
const value = decode(s.value), defaultValue = decode(s.default ?? s.value);
|
||||||
|
return {
|
||||||
|
key: s.key, type, title: field?.title ?? s.key, description: field?.description ?? s.doc,
|
||||||
|
category: s.field?.group ? "squid." + s.field.group : group(s.key, !!field), advanced: !field || !!field.advanced,
|
||||||
|
min: field?.min, max: field?.max, options: field?.options ?? [],
|
||||||
|
value, default: defaultValue, is_default: value === defaultValue, present: true, problem: null,
|
||||||
|
drift: false, restartRequired: "world", dangerous: false,
|
||||||
|
};
|
||||||
|
});
|
||||||
|
const categories = new Map(groups.map(g => [g.id, g.titles[languages.indexOf(locale)]]));
|
||||||
|
for (const item of items) if (item.field?.group) categories.set("squid." + item.field.group, categories.get("squid." + item.field.group) ?? item.field.group_title ?? item.field.group);
|
||||||
|
return { scope: "bots", categories: [...categories].map(([id, title]) => ({ id, title })), settings, unknown_keys: 0, drift_keys: [], files: ["Core/configs/modules/playerbots.conf"] };
|
||||||
|
}
|
||||||
@@ -0,0 +1,50 @@
|
|||||||
|
import { useRef } from "react";
|
||||||
|
import { useI18n } from "@/i18n";
|
||||||
|
import type { ModuleSetting } from "@/lib/api";
|
||||||
|
import { auctionCategories, auctionCategoryLabel, auctionCategorySettings, auctionQualityLabel, auctionTypeChanges, auctionWeightKey, canonicalModuleValue } from "@/lib/moduleSettings";
|
||||||
|
import { cn } from "@/lib/utils";
|
||||||
|
|
||||||
|
export function AuctionTypes({ items, edits, busy, query, errors, onChange }: {
|
||||||
|
items: ModuleSetting[]; edits: Record<string, string>; busy: boolean; query: string;
|
||||||
|
onChange: (changes: Record<string, string>) => void;
|
||||||
|
errors: Record<string, string>;
|
||||||
|
}) {
|
||||||
|
const { t, locale } = useI18n();
|
||||||
|
const remembered = useRef<Record<string, Record<string, string>>>({});
|
||||||
|
const groups = Object.keys(auctionCategories).map(category => ({ category, settings: auctionCategorySettings(items, category) })).filter(group => group.settings.length);
|
||||||
|
if (!groups.length) return null;
|
||||||
|
const valueOf = (item: ModuleSetting) => canonicalModuleValue(item.key, edits[item.key] ?? item.value);
|
||||||
|
const matching = groups.filter(group => `${auctionCategoryLabel(group.category, locale)} ${t("mod.ahbot.types")} ${group.settings.map(s => `${s.key} ${auctionQualityLabel(auctionWeightKey(s.key)![2], locale)}`).join(" ")}`.toLocaleLowerCase(locale).includes(query.trim().toLocaleLowerCase(locale)));
|
||||||
|
if (!matching.length) return null;
|
||||||
|
return <fieldset className="my-4 rounded-md border border-line px-4 pb-2">
|
||||||
|
<legend className="px-1 text-sm font-semibold">{t("mod.ahbot.types")}</legend>
|
||||||
|
<p className="mb-2 mt-1 text-sm text-muted">{t("mod.ahbot.typesHint")}</p>
|
||||||
|
<div className="grid gap-x-6 sm:grid-cols-2">
|
||||||
|
{matching.map(({ category, settings }) => {
|
||||||
|
const on = settings.some(item => Number(valueOf(item)) > 0);
|
||||||
|
const label = auctionCategoryLabel(category, locale);
|
||||||
|
return <div key={category} className="border-t border-line py-3">
|
||||||
|
<div className="flex items-center justify-between gap-3">
|
||||||
|
<span className="text-sm font-medium">{label}{settings.some(s => s.key in edits) && <span className="ml-2 text-xs text-gold">{t("set.changed")}</span>}</span>
|
||||||
|
<button role="switch" aria-label={label} aria-checked={on} disabled={busy} className={cn("relative h-6 w-11 shrink-0 cursor-pointer rounded-full transition-colors", on ? "bg-gold" : "bg-white/15")} onClick={() => {
|
||||||
|
if (on) remembered.current[category] = Object.fromEntries(settings.map(item => [item.key, valueOf(item)]));
|
||||||
|
const original = Object.fromEntries(settings.map(item => [item.key, canonicalModuleValue(item.key, item.value)]));
|
||||||
|
const saved = Object.values(original).some(v => Number(v) > 0) ? original : undefined;
|
||||||
|
onChange(auctionTypeChanges(settings, !on, remembered.current[category] ?? saved));
|
||||||
|
}}><span className={cn("absolute left-0.5 top-0.5 h-5 w-5 rounded-full bg-white transition-transform", on && "translate-x-5")} /></button>
|
||||||
|
</div>
|
||||||
|
<details className="mt-2 text-xs text-muted">
|
||||||
|
<summary className="cursor-pointer">{t("mod.ahbot.qualityWeights")}</summary>
|
||||||
|
<p className="my-2 leading-relaxed">{t("mod.ahbot.weightsHint")}</p>
|
||||||
|
{settings.map(item => <label key={item.key} className="mb-1 flex items-center justify-between gap-2">
|
||||||
|
{auctionQualityLabel(auctionWeightKey(item.key)![2], locale)}
|
||||||
|
<input aria-label={`${label}: ${auctionQualityLabel(auctionWeightKey(item.key)![2], locale)}`} type="number" min={0} max={1000} step={1} value={edits[item.key] ?? item.value} disabled={busy} onChange={e => onChange({ [item.key]: e.target.value })} className="w-20 rounded border border-line bg-bg px-2 py-1 text-sm text-ink outline-none focus:border-gold" />
|
||||||
|
</label>)}
|
||||||
|
</details>
|
||||||
|
{settings.filter(item => errors[item.key]).map(item => <p key={item.key} role="alert" className="mt-1 text-xs text-bad">{auctionQualityLabel(auctionWeightKey(item.key)![2], locale)}: {errors[item.key]}</p>)}
|
||||||
|
</div>;
|
||||||
|
})}
|
||||||
|
</div>
|
||||||
|
{!groups.some(group => group.settings.some(item => Number(valueOf(item)) > 0)) && <p className="my-2 text-sm text-warn" role="status">{t("mod.ahbot.noTypes")}</p>}
|
||||||
|
</fieldset>;
|
||||||
|
}
|
||||||
@@ -7,7 +7,7 @@ import { Button } from "@/components/ui/button";
|
|||||||
import { Card } from "@/components/ui/card";
|
import { Card } from "@/components/ui/card";
|
||||||
import { useHuman, useT } from "@/i18n";
|
import { useHuman, useT } from "@/i18n";
|
||||||
|
|
||||||
export function ClientCard({ serverId }: { serverId: string }) {
|
export function ClientCard({ serverId, remote = false }: { serverId: string; remote?: boolean }) {
|
||||||
const t = useT();
|
const t = useT();
|
||||||
const human = useHuman();
|
const human = useHuman();
|
||||||
const [info, setInfo] = useState<ClientInfo | null | undefined>(undefined);
|
const [info, setInfo] = useState<ClientInfo | null | undefined>(undefined);
|
||||||
@@ -33,6 +33,7 @@ export function ClientCard({ serverId }: { serverId: string }) {
|
|||||||
const msg = await fn();
|
const msg = await fn();
|
||||||
if (msg) setNote(msg);
|
if (msg) setNote(msg);
|
||||||
await refresh();
|
await refresh();
|
||||||
|
void checkClient(serverId);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
setError(asUiError(e));
|
setError(asUiError(e));
|
||||||
} finally {
|
} finally {
|
||||||
@@ -54,7 +55,7 @@ export function ClientCard({ serverId }: { serverId: string }) {
|
|||||||
{info === undefined && <p className="mt-2 text-sm text-muted">{t("client.looking")}</p>}
|
{info === undefined && <p className="mt-2 text-sm text-muted">{t("client.looking")}</p>}
|
||||||
{info === null && (
|
{info === null && (
|
||||||
<>
|
<>
|
||||||
<p className="mt-1 text-sm text-muted">{t("client.intro")}</p>
|
<p className="mt-1 text-sm text-muted">{t(remote ? "remote.clientIntro" : "client.intro")}</p>
|
||||||
<Button className="mt-4" onClick={() => setDialog("setup")} disabled={busy}>{t("btn.setupClient")}</Button>
|
<Button className="mt-4" onClick={() => setDialog("setup")} disabled={busy}>{t("btn.setupClient")}</Button>
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
@@ -65,7 +66,7 @@ export function ClientCard({ serverId }: { serverId: string }) {
|
|||||||
<dt className="text-muted">{t("client.connectsTo")}</dt>
|
<dt className="text-muted">{t("client.connectsTo")}</dt>
|
||||||
<dd>
|
<dd>
|
||||||
{hosts.length ? hosts.filter(Boolean).join(", ") : "—"}
|
{hosts.length ? hosts.filter(Boolean).join(", ") : "—"}
|
||||||
{pointsLocal ? <span className="ml-2 text-ok">{t("client.thisComputer")}</span> : <span className="ml-2 text-warn">{t("client.notThisServer")}</span>}
|
{!remote && (pointsLocal ? <span className="ml-2 text-ok">{t("client.thisComputer")}</span> : <span className="ml-2 text-warn">{t("client.notThisServer")}</span>)}
|
||||||
</dd>
|
</dd>
|
||||||
<dt className="text-muted">{t("client.version")}</dt>
|
<dt className="text-muted">{t("client.version")}</dt>
|
||||||
<dd>
|
<dd>
|
||||||
@@ -74,27 +75,29 @@ export function ClientCard({ serverId }: { serverId: string }) {
|
|||||||
: t("client.versionUntracked")}
|
: t("client.versionUntracked")}
|
||||||
{status?.update_available && <span className="ml-2 text-warn">{t("client.updateAvailable")}</span>}
|
{status?.update_available && <span className="ml-2 text-warn">{t("client.updateAvailable")}</span>}
|
||||||
</dd>
|
</dd>
|
||||||
|
{!remote && <>
|
||||||
<dt className="text-muted">{t("client.addon")}</dt>
|
<dt className="text-muted">{t("client.addon")}</dt>
|
||||||
<dd>
|
<dd>
|
||||||
{info.addon.installed ? (info.addon.version ? t("client.installedVersion", { v: info.addon.version }) : t("client.installed")) : t("client.addonNotInstalled")}
|
{info.addon.installed ? (info.addon.version ? t("client.installedVersion", { v: info.addon.version }) : t("client.installed")) : t("client.addonNotInstalled")}
|
||||||
{info.addon.up_to_date === false && <span className="ml-2 text-warn">{t("client.updateAvailable")}</span>}
|
{info.addon.up_to_date === false && <span className="ml-2 text-warn">{t("client.updateAvailable")}</span>}
|
||||||
<span className="mt-1 block text-xs text-muted">{t("client.addonWhat")}</span>
|
<span className="mt-1 block text-xs text-muted">{t("client.addonWhat")}</span>
|
||||||
</dd>
|
</dd>
|
||||||
|
</>}
|
||||||
<dt className="text-muted">{t("client.otherAddons")}</dt>
|
<dt className="text-muted">{t("client.otherAddons")}</dt>
|
||||||
<dd>{t("client.leftAsIs", { n: info.other_addons })}</dd>
|
<dd>{t("client.leftAsIs", { n: info.other_addons })}</dd>
|
||||||
</dl>
|
</dl>
|
||||||
<div className="mt-4 flex flex-wrap gap-2">
|
<div className="mt-4 flex flex-wrap gap-2">
|
||||||
{!pointsLocal && (
|
{!remote && !pointsLocal && (
|
||||||
<Button size="sm" disabled={busy} onClick={() => void run(async () => { await api.setRealmlist(serverId, "127.0.0.1"); return t("client.pointedNote"); })}>
|
<Button size="sm" disabled={busy} onClick={() => void run(async () => { await api.setRealmlist(serverId, "127.0.0.1"); return t("client.pointedNote"); })}>
|
||||||
{t("client.pointLocal")}
|
{t("client.pointLocal")}
|
||||||
</Button>
|
</Button>
|
||||||
)}
|
)}
|
||||||
{(!info.addon.installed || info.addon.up_to_date === false) && (
|
{!remote && (!info.addon.installed || info.addon.up_to_date === false) && (
|
||||||
<Button size="sm" disabled={busy} onClick={() => void run(async () => { await api.installAddon(serverId); return t("client.addonNote"); })}>
|
<Button size="sm" disabled={busy} onClick={() => void run(async () => { await api.installAddon(serverId); return t("client.addonNote"); })}>
|
||||||
{info.addon.installed ? t("client.updateAddon") : t("client.installAddon")}
|
{info.addon.installed ? t("client.updateAddon") : t("client.installAddon")}
|
||||||
</Button>
|
</Button>
|
||||||
)}
|
)}
|
||||||
{status?.update_available && (
|
{(status?.update_available || (remote && status?.managed)) && (
|
||||||
<Button size="sm" variant="primary" disabled={busy} onClick={() => setDialog("update")}>{t("client.upd.start")}</Button>
|
<Button size="sm" variant="primary" disabled={busy} onClick={() => setDialog("update")}>{t("client.upd.start")}</Button>
|
||||||
)}
|
)}
|
||||||
{status && !status.managed && (
|
{status && !status.managed && (
|
||||||
|
|||||||
Loaded 100 of 114 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user