mirror of
https://github.com/Corfirean/coa-server-manager.git
synced 2026-11-19 19:25:56 +00:00
Compare commits
50
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3c26004e04 | ||
|
|
e8ffa6efe3 | ||
|
|
baeecd2ddf | ||
|
|
d352731280 | ||
|
|
a0545286ee | ||
|
|
6f8ed793a7 | ||
|
|
b3c88ce2a6 | ||
|
|
d71c5635e3 | ||
|
|
755761d0de | ||
|
|
550e475962 | ||
|
|
b4dc30b84a | ||
|
|
73a6cca753 | ||
|
|
705bee7d56 | ||
|
|
5aa9b32283 | ||
|
|
711f378ae8 | ||
|
|
c29d56e2b3 | ||
|
|
d63e85bb18 | ||
|
|
c513649beb | ||
|
|
d2e6fef188 | ||
|
|
2224afd2ea | ||
|
|
3a5558f388 | ||
|
|
173248efbe | ||
|
|
5697a1d36e | ||
|
|
bc62ae206f | ||
|
|
076fba185c | ||
|
|
23cbb108ad | ||
|
|
1a1976d9ad | ||
|
|
dc3fcab7e1 | ||
|
|
ba5816e3ae | ||
|
|
56faaa3a2a | ||
|
|
35084dbce8 | ||
|
|
7e7216979a | ||
|
|
7c0c4cda1f | ||
|
|
642da8fdc1 | ||
|
|
30d2f56997 | ||
|
|
4d1a6e0b21 | ||
|
|
bda38b9f26 | ||
|
|
c004b90c54 | ||
|
|
d44e00f9ad | ||
|
|
dad10d8a5d | ||
|
|
b33821e7eb | ||
|
|
1288a84da2 | ||
|
|
e7b76137d1 | ||
|
|
7bb0ea9472 | ||
|
|
1dab6154c7 | ||
|
|
06a6302732 | ||
|
|
65631450ff | ||
|
|
a8ab201d7d | ||
|
|
733d73ef76 | ||
|
|
5525325160 |
No files matched your search
@@ -69,6 +69,8 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
node-version: 22
|
node-version: 22
|
||||||
- run: npm ci
|
- run: npm ci
|
||||||
|
# tauri::generate_context! needs ../dist; without a warm target cache the tests do not compile without it.
|
||||||
|
- run: npm run build
|
||||||
- name: Tests
|
- name: Tests
|
||||||
run: cargo test --workspace --locked -- --test-threads=1
|
run: cargo test --workspace --locked -- --test-threads=1
|
||||||
- run: node --experimental-strip-types --test tools/*.test.mjs
|
- run: node --experimental-strip-types --test tools/*.test.mjs
|
||||||
|
|||||||
@@ -0,0 +1,72 @@
|
|||||||
|
name: sign-local-installer
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches: [release/20261108-manager]
|
||||||
|
workflow_dispatch:
|
||||||
|
inputs:
|
||||||
|
build_run_id:
|
||||||
|
description: Successful manager-local run in coa-server-build
|
||||||
|
required: true
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
actions: read
|
||||||
|
jobs:
|
||||||
|
sign:
|
||||||
|
if: github.event_name == 'workflow_dispatch'
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v7
|
||||||
|
- uses: actions/setup-node@v4
|
||||||
|
with:
|
||||||
|
node-version: 22
|
||||||
|
- name: Verify local build provenance
|
||||||
|
env:
|
||||||
|
GH_TOKEN: ${{ github.token }}
|
||||||
|
BUILD_RUN: ${{ inputs.build_run_id }}
|
||||||
|
run: |
|
||||||
|
python3 - <<'PY'
|
||||||
|
import json, os, subprocess
|
||||||
|
run = os.environ['BUILD_RUN']
|
||||||
|
if not run.isdigit():
|
||||||
|
raise RuntimeError('Invalid build run')
|
||||||
|
data = json.loads(subprocess.check_output(['gh', 'api', f'repos/Corfirean/coa-server-build/actions/runs/{run}']))
|
||||||
|
if data['conclusion'] != 'success' or data['path'] != '.github/workflows/manager-local.yml':
|
||||||
|
raise RuntimeError('Not a successful local Manager build')
|
||||||
|
subprocess.run(['gh', 'run', 'download', run, '-R', 'Corfirean/coa-server-build', '-n', 'unsigned-manager-windows', '-D', '_prepared-manager'], check=True)
|
||||||
|
from pathlib import Path
|
||||||
|
import hashlib
|
||||||
|
root = Path('_prepared-manager')
|
||||||
|
meta = json.loads((root / 'prepared-source.json').read_text())
|
||||||
|
version = json.loads(Path('package.json').read_text())['version']
|
||||||
|
name = meta['installer']
|
||||||
|
if Path(name).name != name or meta['source'] != os.environ['GITHUB_SHA'] or meta['version'] != version or str(meta['run']) != run:
|
||||||
|
raise RuntimeError('Installer identity differs')
|
||||||
|
if hashlib.sha256((root / name).read_bytes()).hexdigest() != meta['sha256']:
|
||||||
|
raise RuntimeError('Installer hash differs')
|
||||||
|
PY
|
||||||
|
- run: npm ci
|
||||||
|
- name: Sign exact locally compiled bytes
|
||||||
|
env:
|
||||||
|
TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY }}
|
||||||
|
TAURI_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY_PASSWORD }}
|
||||||
|
run: |
|
||||||
|
node --input-type=module <<'JS'
|
||||||
|
import { readFileSync, writeFileSync } from 'node:fs';
|
||||||
|
import { execFileSync } from 'node:child_process';
|
||||||
|
import { createHash } from 'node:crypto';
|
||||||
|
const root = '_prepared-manager/';
|
||||||
|
const meta = JSON.parse(readFileSync(root + 'prepared-source.json'));
|
||||||
|
execFileSync('node_modules/.bin/tauri', ['signer', 'sign', '--app-version', meta.version, root + meta.installer], {stdio: 'inherit'});
|
||||||
|
if (createHash('sha256').update(readFileSync(root + meta.installer)).digest('hex') !== meta.sha256) throw new Error('Signed bytes changed');
|
||||||
|
const signature = readFileSync(root + meta.installer + '.sig', 'utf8').trim();
|
||||||
|
const url = `https://github.com/Corfirean/coa-server-manager/releases/download/v${meta.version}/${encodeURIComponent(meta.installer)}`;
|
||||||
|
writeFileSync(root + 'latest.json', JSON.stringify({version: meta.version, notes: 'See the release notes.', pub_date: new Date().toISOString(), platforms: {'windows-x86_64': {signature, url}}}, null, 2) + '\n');
|
||||||
|
meta.signingRun = process.env.GITHUB_RUN_ID;
|
||||||
|
writeFileSync(root + 'prepared-source.json', JSON.stringify(meta, null, 2) + '\n');
|
||||||
|
JS
|
||||||
|
- uses: actions/upload-artifact@v4
|
||||||
|
with:
|
||||||
|
name: prepared-manager-windows
|
||||||
|
path: _prepared-manager/*
|
||||||
|
retention-days: 14
|
||||||
|
if-no-files-found: error
|
||||||
@@ -35,6 +35,16 @@ Every published Manager version, including a clearly marked Pre-release, belongs
|
|||||||
CHANGELOG.md and changelog/history.json. Its GitHub release notes use the same reviewed record.
|
CHANGELOG.md and changelog/history.json. Its GitHub release notes use the same reviewed record.
|
||||||
Promotion updates that entry without duplicating it; Manager and server histories remain separate.
|
Promotion updates that entry without duplicating it; Manager and server histories remain separate.
|
||||||
|
|
||||||
|
Translated release notes are a required preparation step before freezing a new Manager source. Follow the
|
||||||
|
runbook's "Mandatory translated release notes during preparation" checklist: translate every new reviewed
|
||||||
|
Manager/server note into Russian, German, French, Spanish and Simplified Chinese in
|
||||||
|
`src/data/latest-note-translations.json`, keyed by exact canonical English text. Preserve existing translations
|
||||||
|
and released fragments. Refresh the bundled server-history snapshot from a pinned canonical commit and record
|
||||||
|
its provenance. Run `node --test tools/release-history.test.mjs`, `node tools/check-i18n.mjs` and `npm run build`;
|
||||||
|
verify each new record, all six viewer languages, English fallback and offline use. Save source/version and checks
|
||||||
|
in the handoff. Translations ship with Manager: a server-only release must record the carrying Manager version or
|
||||||
|
pending translation delivery, without forcing another Manager release or changing already signed installers.
|
||||||
|
|
||||||
Before preparing or publishing a Manager/server release, read the maintained
|
Before preparing or publishing a Manager/server release, read the maintained
|
||||||
[release runbook](https://github.com/Corfirean/coa-server-build/blob/main/docs/server-release.md)
|
[release runbook](https://github.com/Corfirean/coa-server-build/blob/main/docs/server-release.md)
|
||||||
and [build agent instructions](https://github.com/Corfirean/coa-server-build/blob/main/AGENTS.md).
|
and [build agent instructions](https://github.com/Corfirean/coa-server-build/blob/main/AGENTS.md).
|
||||||
|
|||||||
@@ -8,6 +8,90 @@ Published releases and previews. Pre-release entries do not change the stable up
|
|||||||
|
|
||||||
Dates follow GitHub publication (UTC); legacy records retain their archived dates. Newest releases first.
|
Dates follow GitHub publication (UTC); legacy records retain their archived dates. Newest releases first.
|
||||||
|
|
||||||
|
## 0.9.13 — 2026-11-15
|
||||||
|
|
||||||
|
- The custom races client is updated to Custom Races V2.
|
||||||
|
|
||||||
|
[Release](https://github.com/Corfirean/coa-server-manager/releases/tag/v0.9.13) · [Source changes](https://github.com/Corfirean/coa-server-manager/compare/v0.9.12...v0.9.13)
|
||||||
|
|
||||||
|
## 0.9.12 — 2026-11-14
|
||||||
|
|
||||||
|
- Settings for how much help bots get in dungeons and raids.
|
||||||
|
|
||||||
|
[Release](https://github.com/Corfirean/coa-server-manager/releases/tag/v0.9.12) · [Source changes](https://github.com/Corfirean/coa-server-manager/compare/v0.9.10...v0.9.12)
|
||||||
|
|
||||||
|
## 0.9.10 — 2026-11-08
|
||||||
|
|
||||||
|
- Custom Races patch installation recovers from interrupted downloads.
|
||||||
|
|
||||||
|
[Release](https://github.com/Corfirean/coa-server-manager/releases/tag/v0.9.10) · [Source changes](https://github.com/Corfirean/coa-server-manager/compare/v0.9.9...v0.9.10)
|
||||||
|
|
||||||
|
## 0.9.9 — 2026-11-04
|
||||||
|
|
||||||
|
- Update and recovery checks use the temporary login port even with a Windows override.
|
||||||
|
|
||||||
|
[Release](https://github.com/Corfirean/coa-server-manager/releases/tag/v0.9.9) · [Source changes](https://github.com/Corfirean/coa-server-manager/compare/v0.9.8...v0.9.9)
|
||||||
|
|
||||||
|
## 0.9.8 — 2026-11-01
|
||||||
|
|
||||||
|
- Dungeon Clear can be enabled when SQUID bots are active.
|
||||||
|
- Diagnostic exports include launcher stages and lock owner records.
|
||||||
|
- Choose normal logs, errors only or no server logs in maintenance settings.
|
||||||
|
- Update checks temporarily suspend bot population and restore your configuration.
|
||||||
|
- Update validation keeps MySQL running between compatible checks.
|
||||||
|
|
||||||
|
[Release](https://github.com/Corfirean/coa-server-manager/releases/tag/v0.9.8) · [Source changes](https://github.com/Corfirean/coa-server-manager/compare/v0.9.7...v0.9.8)
|
||||||
|
|
||||||
|
## 0.9.7 — 2026-10-30
|
||||||
|
|
||||||
|
- Show available update notes even when release history is cached.
|
||||||
|
|
||||||
|
[Release](https://github.com/Corfirean/coa-server-manager/releases/tag/v0.9.7) · [Source changes](https://github.com/Corfirean/coa-server-manager/compare/v0.9.5...v0.9.7)
|
||||||
|
|
||||||
|
## 0.9.5 — 2026-10-30
|
||||||
|
|
||||||
|
- Account creation verifies a lost console reply against the requested login.
|
||||||
|
- Abandoned game relay tunnels close their local connection immediately.
|
||||||
|
- Keep disabled graphics components disabled during client updates.
|
||||||
|
- Force-stop an unresponsive world after a failed normal shutdown.
|
||||||
|
- Crash history includes reports from every world and Windows text files.
|
||||||
|
- Show the online bot count for Playerbots on the overview.
|
||||||
|
- Disable public server browsing in Settings.
|
||||||
|
- Keep deliberate stops and update shutdowns from triggering crash restart.
|
||||||
|
- Server startup waits for a responsive console before reporting success.
|
||||||
|
- Restore the existing Manager window when launching it again.
|
||||||
|
|
||||||
|
[Release](https://github.com/Corfirean/coa-server-manager/releases/tag/v0.9.5) · [Source changes](https://github.com/Corfirean/coa-server-manager/compare/v0.9.4...v0.9.5)
|
||||||
|
|
||||||
|
## 0.9.4 — 2026-10-29
|
||||||
|
|
||||||
|
**Portable Characters are experimental and may contain bugs.**
|
||||||
|
|
||||||
|
- Settings group updates, startup and maintenance with translated release history.
|
||||||
|
- Update and launch without updating share a divided button.
|
||||||
|
- Maximizing the window keeps text and controls at a comfortable size.
|
||||||
|
|
||||||
|
[Release](https://github.com/Corfirean/coa-server-manager/releases/tag/v0.9.4) · [Source changes](https://github.com/Corfirean/coa-server-manager/compare/v0.9.3...v0.9.4)
|
||||||
|
|
||||||
|
## 0.9.3 — 2026-10-29
|
||||||
|
|
||||||
|
**Portable Characters are experimental and may contain bugs.**
|
||||||
|
|
||||||
|
- Slow server startup no longer triggers an early update rollback.
|
||||||
|
|
||||||
|
[Release](https://github.com/Corfirean/coa-server-manager/releases/tag/v0.9.3) · [Source changes](https://github.com/Corfirean/coa-server-manager/compare/v0.9.2...v0.9.3)
|
||||||
|
|
||||||
|
## 0.9.2 — 2026-10-28
|
||||||
|
|
||||||
|
**Portable Characters are experimental and may contain bugs.**
|
||||||
|
|
||||||
|
- New server installation waits for slower database startup.
|
||||||
|
- Find and edit CoA options in the existing server settings.
|
||||||
|
- Simultaneous update checks share results or wait their turn.
|
||||||
|
- Recovery can stop an unfinished world startup after restoring an older launcher.
|
||||||
|
|
||||||
|
[Release](https://github.com/Corfirean/coa-server-manager/releases/tag/v0.9.2) · [Source changes](https://github.com/Corfirean/coa-server-manager/compare/v0.9.1...v0.9.2)
|
||||||
|
|
||||||
## 0.9.1 — 2026-10-28
|
## 0.9.1 — 2026-10-28
|
||||||
|
|
||||||
**Portable Characters are experimental and may contain bugs.**
|
**Portable Characters are experimental and may contain bugs.**
|
||||||
|
|||||||
Generated
+20
-3
@@ -586,7 +586,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "coa-core"
|
name = "coa-core"
|
||||||
version = "0.9.2"
|
version = "0.9.13"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"base64 0.22.1",
|
"base64 0.22.1",
|
||||||
"chrono",
|
"chrono",
|
||||||
@@ -634,7 +634,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "coa-release"
|
name = "coa-release"
|
||||||
version = "0.9.2"
|
version = "0.9.13"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"chrono",
|
"chrono",
|
||||||
"coa-core",
|
"coa-core",
|
||||||
@@ -643,7 +643,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "coa-server-manager"
|
name = "coa-server-manager"
|
||||||
version = "0.9.2"
|
version = "0.9.13"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"coa-control-proto",
|
"coa-control-proto",
|
||||||
"coa-core",
|
"coa-core",
|
||||||
@@ -655,6 +655,7 @@ dependencies = [
|
|||||||
"tauri-plugin-dialog",
|
"tauri-plugin-dialog",
|
||||||
"tauri-plugin-opener",
|
"tauri-plugin-opener",
|
||||||
"tauri-plugin-process",
|
"tauri-plugin-process",
|
||||||
|
"tauri-plugin-single-instance",
|
||||||
"tauri-plugin-updater",
|
"tauri-plugin-updater",
|
||||||
"tracing",
|
"tracing",
|
||||||
]
|
]
|
||||||
@@ -4606,6 +4607,22 @@ dependencies = [
|
|||||||
"tauri-plugin",
|
"tauri-plugin",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "tauri-plugin-single-instance"
|
||||||
|
version = "2.5.5"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "726b6da0dd5bd1344f84f4108a622c07d01923baacb5c803a605189672c5352f"
|
||||||
|
dependencies = [
|
||||||
|
"serde",
|
||||||
|
"serde_json",
|
||||||
|
"tauri",
|
||||||
|
"thiserror 2.0.21",
|
||||||
|
"tokio",
|
||||||
|
"tracing",
|
||||||
|
"windows-sys 0.61.2",
|
||||||
|
"zbus",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tauri-plugin-updater"
|
name = "tauri-plugin-updater"
|
||||||
version = "2.13.1"
|
version = "2.13.1"
|
||||||
|
|||||||
+1
-1
@@ -4,7 +4,7 @@ members = ["crates/coa-core", "crates/coa-release", "crates/coa-registry-proto",
|
|||||||
exclude = ["services/coa-registry", "services/coa-registry-e2e", "services/coa-coordinator", "services/coa-relay"]
|
exclude = ["services/coa-registry", "services/coa-registry-e2e", "services/coa-coordinator", "services/coa-relay"]
|
||||||
|
|
||||||
[workspace.package]
|
[workspace.package]
|
||||||
version = "0.9.2"
|
version = "0.9.13"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
license = "AGPL-3.0-only"
|
license = "AGPL-3.0-only"
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: changed
|
||||||
|
audience: admins
|
||||||
|
title: Settings group updates, startup and maintenance with translated release history
|
||||||
|
---
|
||||||
|
Server and Manager keep separate update controls. Read their published changes in one place, including translations of the latest releases in all six interface languages. Saved notes remain available offline. Find public realm controls under Play with friends.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: changed
|
||||||
|
audience: admins
|
||||||
|
title: Update and launch without updating share a divided button
|
||||||
|
---
|
||||||
|
Server and game client actions each use two adjacent segments of equal height. Both actions remain visible and keep their own availability checks.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: fixed
|
||||||
|
audience: admins
|
||||||
|
title: Maximizing the window keeps text and controls at a comfortable size
|
||||||
|
---
|
||||||
|
The interface no longer enlarges with window width. System display scaling and browser zoom still work, and large action buttons use more compact spacing.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: fixed
|
||||||
|
audience: admins
|
||||||
|
title: Slow server startup no longer triggers an early update rollback
|
||||||
|
---
|
||||||
|
World startup now allows up to 25 minutes with either bot system and waits for both game and console ports within one deadline. Servers that stop during startup still fail immediately.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: fixed
|
||||||
|
audience: admins
|
||||||
|
title: Account creation verifies a lost console reply against the requested login
|
||||||
|
---
|
||||||
|
Confirm the requested credentials after a lost reply, block creation during another server action, and explicitly report accounts whose administrator access could not be confirmed.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: fixed
|
||||||
|
audience: admins
|
||||||
|
title: Abandoned game relay tunnels close their local connection immediately
|
||||||
|
---
|
||||||
|
Dropping a tunnel shuts down its shared socket directly instead of relying only on a background message, releasing its local read and write connection.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: fixed
|
||||||
|
audience: admins
|
||||||
|
title: Keep disabled graphics components disabled during client updates
|
||||||
|
---
|
||||||
|
Client settings can disable DXVK and graphics enhancements. Existing launcher DISABLED files are respected.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: added
|
||||||
|
audience: admins
|
||||||
|
title: Force-stop an unresponsive world after a failed normal shutdown
|
||||||
|
---
|
||||||
|
Confirm the risk of unsaved progress before stopping verified server processes. Shared databases stay running until every owned world has stopped.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: fixed
|
||||||
|
audience: admins
|
||||||
|
title: Crash history includes reports from every world and Windows text files
|
||||||
|
---
|
||||||
|
Create and verify the crash report folder before native startup, and include reports from simultaneous worlds and files containing Windows ANSI text.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: fixed
|
||||||
|
audience: admins
|
||||||
|
title: Show the online bot count for Playerbots on the overview
|
||||||
|
---
|
||||||
|
The overview displays bot population for both supported bot systems.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: added
|
||||||
|
audience: admins
|
||||||
|
title: Disable public server browsing in Settings
|
||||||
|
---
|
||||||
|
Turn off public server browsing to block catalog list and detail requests. When browsing is enabled, load the list with Refresh.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: fixed
|
||||||
|
audience: admins
|
||||||
|
title: Keep deliberate stops and update shutdowns from triggering crash restart
|
||||||
|
---
|
||||||
|
Status checks no longer forget a stop request while the world is still shutting down. Update validation and recovery do not trigger automatic crash restarts.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: fixed
|
||||||
|
audience: admins
|
||||||
|
title: Show available update notes even when release history is cached
|
||||||
|
---
|
||||||
|
Fetch the release notes for the offered update when they are missing from the cached history, including when an update becomes available while the history is open.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: fixed
|
||||||
|
audience: admins
|
||||||
|
title: Server startup waits for a responsive console before reporting success
|
||||||
|
---
|
||||||
|
An open port no longer marks a loading world as ready. Account creation checks that the console processes commands before sending a create request.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: fixed
|
||||||
|
audience: admins
|
||||||
|
title: Restore the existing Manager window when launching it again
|
||||||
|
---
|
||||||
|
Choose whether closing the window exits the Manager or minimizes it to the tray. Tray actions restore the window on the UI thread.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: added
|
||||||
|
audience: admins
|
||||||
|
title: Dungeon Clear can be enabled when SQUID bots are active
|
||||||
|
---
|
||||||
|
Dungeon Clear starts disabled. Switching SQUID bots off also switches Dungeon Clear off; enabling SQUID again leaves Dungeon Clear off until you choose to enable it.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: added
|
||||||
|
audience: admins
|
||||||
|
title: Diagnostic exports include launcher stages and lock owner records
|
||||||
|
---
|
||||||
|
Support packages include recent launcher diagnostics for each realm, with sensitive fields removed. Recorded lock owners help diagnose overlapping startup and shutdown actions.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: fixed
|
||||||
|
audience: admins
|
||||||
|
title: Custom Races patch installation recovers from interrupted downloads
|
||||||
|
---
|
||||||
|
Unfinished downloads resume automatically. Invalid archives in Downloads are skipped without changing them, and damaged cached archives are downloaded again.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: added
|
||||||
|
audience: admins
|
||||||
|
title: Choose normal logs, errors only or no server logs in maintenance settings
|
||||||
|
---
|
||||||
|
The logging preset updates both the game world and login server, including their configuration templates. Previous settings are saved in configuration snapshots. Restart the server to apply the change.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: fixed
|
||||||
|
audience: admins
|
||||||
|
title: Update checks temporarily suspend bot population and restore your configuration
|
||||||
|
---
|
||||||
|
Validation preserves the selected bot system and its population limits. Original configuration files are restored after validation, including recovery from interrupted updates.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: fixed
|
||||||
|
audience: admins
|
||||||
|
title: Update validation keeps MySQL running between compatible checks
|
||||||
|
---
|
||||||
|
Database checks and the temporary server startup share one MySQL session. The server still stops before files or database snapshots are replaced or restored.
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: fixed
|
||||||
|
audience: admins
|
||||||
|
title: Update and recovery checks use the temporary login port even with a Windows override
|
||||||
|
---
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: added
|
||||||
|
audience: admins
|
||||||
|
title: Settings for how much help bots get in dungeons and raids
|
||||||
|
---
|
||||||
|
Bot damage, healing, damage taken and tank threat can now be tuned under Bots, Combat. Everything defaults to 1 (no change); a switch turns the extra help for four hard bosses on.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: fixed
|
||||||
|
audience: players
|
||||||
|
title: Turning the custom races client patch on or off takes seconds again
|
||||||
|
---
|
||||||
|
V2 has over 7,000 files and switching it could run for many minutes. Now only the files the game itself loads are hidden, and the rest stays in place. A switch that was cut short is undone safely.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: changed
|
||||||
|
audience: players
|
||||||
|
title: The custom races client is updated to Custom Races V2
|
||||||
|
---
|
||||||
|
The client update installs V2 and starts its own CoACustomRace.exe; Ascension.exe is left as it was. Four archives are the same as in 1.9.2, so a game folder that already had 1.9.2 downloads only the rest.
|
||||||
+166
-1
@@ -149,8 +149,36 @@
|
|||||||
"Corfirean/coa-server-manager:20261027-skill-gain-controls.md",
|
"Corfirean/coa-server-manager:20261027-skill-gain-controls.md",
|
||||||
"Corfirean/coa-server-manager:20261027-start-checks-the-realm-class-setting.md",
|
"Corfirean/coa-server-manager:20261027-start-checks-the-realm-class-setting.md",
|
||||||
"Corfirean/coa-server-manager:20261027-start-wildcard-and-reborn-with-coa.md",
|
"Corfirean/coa-server-manager:20261027-start-wildcard-and-reborn-with-coa.md",
|
||||||
|
"Corfirean/coa-server-manager:20261028-coa-config-search.md",
|
||||||
"Corfirean/coa-server-manager:20261028-existing-character-update-validation.md",
|
"Corfirean/coa-server-manager:20261028-existing-character-update-validation.md",
|
||||||
"Corfirean/coa-server-manager:20261028-portable-settings-and-tray.md"
|
"Corfirean/coa-server-manager:20261028-legacy-world-shutdown.md",
|
||||||
|
"Corfirean/coa-server-manager:20261028-mysql-install-startup.md",
|
||||||
|
"Corfirean/coa-server-manager:20261028-portable-settings-and-tray.md",
|
||||||
|
"Corfirean/coa-server-manager:20261028-settings-release-history.md",
|
||||||
|
"Corfirean/coa-server-manager:20261028-split-update-actions.md",
|
||||||
|
"Corfirean/coa-server-manager:20261028-update-check-queue.md",
|
||||||
|
"Corfirean/coa-server-manager:20261028-window-density.md",
|
||||||
|
"Corfirean/coa-server-manager:20261029-slow-world-startup.md",
|
||||||
|
"Corfirean/coa-server-manager:20261030-account-console-confirmation.md",
|
||||||
|
"Corfirean/coa-server-manager:20261030-close-abandoned-relay-sockets.md",
|
||||||
|
"Corfirean/coa-server-manager:20261030-disabled-client-renderers.md",
|
||||||
|
"Corfirean/coa-server-manager:20261030-force-stop-unresponsive-world.md",
|
||||||
|
"Corfirean/coa-server-manager:20261030-native-crash-reports.md",
|
||||||
|
"Corfirean/coa-server-manager:20261030-playerbots-overview-count.md",
|
||||||
|
"Corfirean/coa-server-manager:20261030-public-server-browsing-control.md",
|
||||||
|
"Corfirean/coa-server-manager:20261030-stop-does-not-trigger-auto-restart.md",
|
||||||
|
"Corfirean/coa-server-manager:20261030-update-history-target-cache.md",
|
||||||
|
"Corfirean/coa-server-manager:20261030-wait-for-world-console-readiness.md",
|
||||||
|
"Corfirean/coa-server-manager:20261030-window-lifecycle.md",
|
||||||
|
"Corfirean/coa-server-manager:20261031-dungeon-clear-dependency.md",
|
||||||
|
"Corfirean/coa-server-manager:20261031-launcher-diagnostics-export.md",
|
||||||
|
"Corfirean/coa-server-manager:20261031-recover-client-patch-downloads.md",
|
||||||
|
"Corfirean/coa-server-manager:20261031-server-logging-controls.md",
|
||||||
|
"Corfirean/coa-server-manager:20261031-validation-bot-population.md",
|
||||||
|
"Corfirean/coa-server-manager:20261031-validation-mysql-reuse.md",
|
||||||
|
"Corfirean/coa-server-manager:20261103-isolated-login-port.md",
|
||||||
|
"Corfirean/coa-server-manager:20261107-bot-strength-scaling-settings.md",
|
||||||
|
"Corfirean/coa-server-manager:20261115-custom-races-v2-client.md"
|
||||||
],
|
],
|
||||||
"releases": [
|
"releases": [
|
||||||
{
|
{
|
||||||
@@ -771,6 +799,143 @@
|
|||||||
"url": "https://github.com/Corfirean/coa-server-manager/releases/tag/v0.9.1",
|
"url": "https://github.com/Corfirean/coa-server-manager/releases/tag/v0.9.1",
|
||||||
"compare": "https://github.com/Corfirean/coa-server-manager/compare/v0.9.0...v0.9.1",
|
"compare": "https://github.com/Corfirean/coa-server-manager/compare/v0.9.0...v0.9.1",
|
||||||
"commit": "8bbf16ed4f14e9b78c680783e4be5d8c580cc06b"
|
"commit": "8bbf16ed4f14e9b78c680783e4be5d8c580cc06b"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"tag": "v0.9.2",
|
||||||
|
"version": "0.9.2",
|
||||||
|
"date": "2026-10-28",
|
||||||
|
"url": "https://github.com/Corfirean/coa-server-manager/releases/tag/v0.9.2",
|
||||||
|
"notes": [
|
||||||
|
"New server installation waits for slower database startup",
|
||||||
|
"Find and edit CoA options in the existing server settings",
|
||||||
|
"Simultaneous update checks share results or wait their turn",
|
||||||
|
"Recovery can stop an unfinished world startup after restoring an older launcher"
|
||||||
|
],
|
||||||
|
"commit": "2d9c6a65bbb1e296dc919e4c9e5785ed9d4a070b",
|
||||||
|
"compare": "https://github.com/Corfirean/coa-server-manager/compare/v0.9.1...v0.9.2",
|
||||||
|
"experimentalFeatures": [
|
||||||
|
"portable-characters"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"tag": "v0.9.3",
|
||||||
|
"version": "0.9.3",
|
||||||
|
"date": "2026-10-29",
|
||||||
|
"url": "https://github.com/Corfirean/coa-server-manager/releases/tag/v0.9.3",
|
||||||
|
"notes": [
|
||||||
|
"Slow server startup no longer triggers an early update rollback"
|
||||||
|
],
|
||||||
|
"commit": "e7b76137d1b22a7596c2b1fa05ca9d12403b99d3",
|
||||||
|
"compare": "https://github.com/Corfirean/coa-server-manager/compare/v0.9.2...v0.9.3",
|
||||||
|
"experimentalFeatures": [
|
||||||
|
"portable-characters"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"tag": "v0.9.4",
|
||||||
|
"version": "0.9.4",
|
||||||
|
"date": "2026-10-29",
|
||||||
|
"url": "https://github.com/Corfirean/coa-server-manager/releases/tag/v0.9.4",
|
||||||
|
"notes": [
|
||||||
|
"Settings group updates, startup and maintenance with translated release history",
|
||||||
|
"Update and launch without updating share a divided button",
|
||||||
|
"Maximizing the window keeps text and controls at a comfortable size"
|
||||||
|
],
|
||||||
|
"commit": "c004b90c54fa358b3037c56b093cf019dfcf02b8",
|
||||||
|
"compare": "https://github.com/Corfirean/coa-server-manager/compare/v0.9.3...v0.9.4",
|
||||||
|
"experimentalFeatures": [
|
||||||
|
"portable-characters"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"tag": "v0.9.5",
|
||||||
|
"version": "0.9.5",
|
||||||
|
"date": "2026-10-30",
|
||||||
|
"url": "https://github.com/Corfirean/coa-server-manager/releases/tag/v0.9.5",
|
||||||
|
"notes": [
|
||||||
|
"Account creation verifies a lost console reply against the requested login",
|
||||||
|
"Abandoned game relay tunnels close their local connection immediately",
|
||||||
|
"Keep disabled graphics components disabled during client updates",
|
||||||
|
"Force-stop an unresponsive world after a failed normal shutdown",
|
||||||
|
"Crash history includes reports from every world and Windows text files",
|
||||||
|
"Show the online bot count for Playerbots on the overview",
|
||||||
|
"Disable public server browsing in Settings",
|
||||||
|
"Keep deliberate stops and update shutdowns from triggering crash restart",
|
||||||
|
"Server startup waits for a responsive console before reporting success",
|
||||||
|
"Restore the existing Manager window when launching it again"
|
||||||
|
],
|
||||||
|
"commit": "642da8fdc1a0165aea74fbd1ab1b46933fc7e589",
|
||||||
|
"compare": "https://github.com/Corfirean/coa-server-manager/compare/v0.9.4...v0.9.5"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"tag": "v0.9.7",
|
||||||
|
"version": "0.9.7",
|
||||||
|
"date": "2026-10-30",
|
||||||
|
"url": "https://github.com/Corfirean/coa-server-manager/releases/tag/v0.9.7",
|
||||||
|
"notes": [
|
||||||
|
"Show available update notes even when release history is cached"
|
||||||
|
],
|
||||||
|
"commit": "ba5816e3aea471d5b870e5f0db0b03920c071ed3",
|
||||||
|
"compare": "https://github.com/Corfirean/coa-server-manager/compare/v0.9.5...v0.9.7"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"tag": "v0.9.8",
|
||||||
|
"version": "0.9.8",
|
||||||
|
"date": "2026-11-01",
|
||||||
|
"url": "https://github.com/Corfirean/coa-server-manager/releases/tag/v0.9.8",
|
||||||
|
"notes": [
|
||||||
|
"Dungeon Clear can be enabled when SQUID bots are active",
|
||||||
|
"Diagnostic exports include launcher stages and lock owner records",
|
||||||
|
"Choose normal logs, errors only or no server logs in maintenance settings",
|
||||||
|
"Update checks temporarily suspend bot population and restore your configuration",
|
||||||
|
"Update validation keeps MySQL running between compatible checks"
|
||||||
|
],
|
||||||
|
"commit": "076fba185c4d96d74f7258d6ca0cae6a4ae4a613",
|
||||||
|
"compare": "https://github.com/Corfirean/coa-server-manager/compare/v0.9.7...v0.9.8"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"tag": "v0.9.9",
|
||||||
|
"version": "0.9.9",
|
||||||
|
"date": "2026-11-04",
|
||||||
|
"url": "https://github.com/Corfirean/coa-server-manager/releases/tag/v0.9.9",
|
||||||
|
"notes": [
|
||||||
|
"Update and recovery checks use the temporary login port even with a Windows override"
|
||||||
|
],
|
||||||
|
"commit": "173248efbe24da9b4c1b5ca12fa7580fcd1e8ea7",
|
||||||
|
"compare": "https://github.com/Corfirean/coa-server-manager/compare/v0.9.8...v0.9.9"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"tag": "v0.9.10",
|
||||||
|
"version": "0.9.10",
|
||||||
|
"date": "2026-11-08",
|
||||||
|
"url": "https://github.com/Corfirean/coa-server-manager/releases/tag/v0.9.10",
|
||||||
|
"notes": [
|
||||||
|
"Custom Races patch installation recovers from interrupted downloads"
|
||||||
|
],
|
||||||
|
"commit": "711f378ae82f75d3fc64368c042889c773315c54",
|
||||||
|
"compare": "https://github.com/Corfirean/coa-server-manager/compare/v0.9.9...v0.9.10"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"tag": "v0.9.12",
|
||||||
|
"version": "0.9.12",
|
||||||
|
"date": "2026-11-14",
|
||||||
|
"url": "https://github.com/Corfirean/coa-server-manager/releases/tag/v0.9.12",
|
||||||
|
"notes": [
|
||||||
|
"Settings for how much help bots get in dungeons and raids"
|
||||||
|
],
|
||||||
|
"commit": "d71c5635e3262a775b400a1c90ac81d7bddcbeaf",
|
||||||
|
"compare": "https://github.com/Corfirean/coa-server-manager/compare/v0.9.10...v0.9.12"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"tag": "v0.9.13",
|
||||||
|
"version": "0.9.13",
|
||||||
|
"date": "2026-11-15",
|
||||||
|
"url": "https://github.com/Corfirean/coa-server-manager/releases/tag/v0.9.13",
|
||||||
|
"notes": [
|
||||||
|
"The custom races client is updated to Custom Races V2"
|
||||||
|
],
|
||||||
|
"commit": "d3527312803fb5a3e1cd48e01496645a8bbc9dcf",
|
||||||
|
"compare": "https://github.com/Corfirean/coa-server-manager/compare/v0.9.12...v0.9.13"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,154 @@
|
|||||||
|
use coa_core::{
|
||||||
|
db::{Account, Db},
|
||||||
|
driver::{self, Verb},
|
||||||
|
ra::Ra,
|
||||||
|
Result,
|
||||||
|
};
|
||||||
|
use std::path::PathBuf;
|
||||||
|
fn main() -> Result<()> {
|
||||||
|
let root = PathBuf::from(std::env::args().nth(1).expect("disposable fixture"));
|
||||||
|
assert!(root
|
||||||
|
.file_name()
|
||||||
|
.unwrap()
|
||||||
|
.to_string_lossy()
|
||||||
|
.starts_with("coa-update-recovery-fixture-"));
|
||||||
|
assert!(root.join("recovery-e2e-started").is_file());
|
||||||
|
let result = std::panic::catch_unwind(|| -> Result<()> {
|
||||||
|
let started = driver::run(&root, Verb::StartAll)?;
|
||||||
|
assert!(started.ok, "{}", started.output);
|
||||||
|
assert!(root.join("Core/Crashes").is_dir());
|
||||||
|
let db = Db::from_repack(&root, Account::Admin)?;
|
||||||
|
println!("Account acceptance: server started, connecting to RA");
|
||||||
|
let mut ra = Ra::connect(&root)?;
|
||||||
|
println!("Account acceptance: RA authenticated");
|
||||||
|
let name = "STABILITYACCT2";
|
||||||
|
assert_eq!(
|
||||||
|
db.query("SELECT COUNT(*) FROM acore_auth.account WHERE username='STABILITYACCT2';")?
|
||||||
|
.trim(),
|
||||||
|
"0"
|
||||||
|
);
|
||||||
|
println!("Account acceptance: sending create command");
|
||||||
|
coa_core::accounts::create(&root, name, "PrivateTest773", true)?;
|
||||||
|
println!("Account acceptance: created");
|
||||||
|
assert_eq!(db.query("SELECT COUNT(*) FROM acore_auth.account WHERE username='STABILITYACCT2' AND LENGTH(salt)=32 AND LENGTH(verifier)=32;")?.trim(), "1");
|
||||||
|
assert!(ra
|
||||||
|
.create_account(name, "PrivateTest773")
|
||||||
|
.unwrap_err()
|
||||||
|
.to_string()
|
||||||
|
.contains("already taken"));
|
||||||
|
ra.set_account_password(name, "PrivateTest774")?;
|
||||||
|
ra.set_account_access(name, 3)?;
|
||||||
|
assert_eq!(db.query("SELECT gmlevel FROM acore_auth.account_access WHERE id=(SELECT id FROM acore_auth.account WHERE username='STABILITYACCT2');")?.trim(), "3");
|
||||||
|
ra.delete_account(name)?;
|
||||||
|
assert_eq!(
|
||||||
|
db.query("SELECT COUNT(*) FROM acore_auth.account WHERE username='STABILITYACCT2';")?
|
||||||
|
.trim(),
|
||||||
|
"0"
|
||||||
|
);
|
||||||
|
lost_reply(&root, &db)?;
|
||||||
|
println!("PASS: native RA account create, SRP salt/verifier, duplicate refusal, password change, administrator access and deletion");
|
||||||
|
Ok(())
|
||||||
|
});
|
||||||
|
let stopped = driver::run(&root, Verb::StopAll)?;
|
||||||
|
assert!(stopped.ok, "{}", stopped.output);
|
||||||
|
result.map_err(|_| {
|
||||||
|
coa_core::Error::Invalid("Native account acceptance failed; fixture stopped".into())
|
||||||
|
})?
|
||||||
|
}
|
||||||
|
|
||||||
|
fn lost_reply(root: &std::path::Path, db: &Db) -> Result<()> {
|
||||||
|
use std::io::{Read, Write};
|
||||||
|
use std::net::{TcpListener, TcpStream};
|
||||||
|
let path = root.join("Settings/repack.json");
|
||||||
|
let original = std::fs::read(&path)?;
|
||||||
|
struct Restore(std::path::PathBuf, Vec<u8>);
|
||||||
|
impl Drop for Restore {
|
||||||
|
fn drop(&mut self) {
|
||||||
|
std::fs::write(&self.0, &self.1).expect("restore disposable fixture settings");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let restore = Restore(path.clone(), original.clone());
|
||||||
|
let actual = coa_core::layout::read_ports(root).ra;
|
||||||
|
for (name, forward, ready) in [
|
||||||
|
("STABLOSTREPLY", true, true),
|
||||||
|
("STABNOTCREATED", false, true),
|
||||||
|
("STABNOTREADY", false, false),
|
||||||
|
] {
|
||||||
|
assert_eq!(
|
||||||
|
db.query(&format!(
|
||||||
|
"SELECT COUNT(*) FROM acore_auth.account WHERE username='{name}';"
|
||||||
|
))?
|
||||||
|
.trim(),
|
||||||
|
"0"
|
||||||
|
);
|
||||||
|
let listener = TcpListener::bind(("127.0.0.1", 0))?;
|
||||||
|
let mut config: serde_json::Value = serde_json::from_slice(&original)?;
|
||||||
|
config["raPort"] = listener.local_addr()?.port().into();
|
||||||
|
coa_core::fsx::atomic_write_json(&path, &config)?;
|
||||||
|
let proxy = std::thread::spawn(move || {
|
||||||
|
fn until(s: &mut TcpStream, marker: &[u8]) -> Vec<u8> {
|
||||||
|
s.set_read_timeout(Some(std::time::Duration::from_secs(30)))
|
||||||
|
.unwrap();
|
||||||
|
let mut bytes = Vec::new();
|
||||||
|
let mut byte = [0];
|
||||||
|
while !bytes.ends_with(marker) {
|
||||||
|
s.read_exact(&mut byte).unwrap();
|
||||||
|
bytes.push(byte[0]);
|
||||||
|
}
|
||||||
|
bytes
|
||||||
|
}
|
||||||
|
let (mut client, _) = listener.accept().unwrap();
|
||||||
|
let mut server = TcpStream::connect(("127.0.0.1", actual)).unwrap();
|
||||||
|
for marker in [b"Username: ".as_slice(), b"Password: ".as_slice()] {
|
||||||
|
client.write_all(&until(&mut server, marker)).unwrap();
|
||||||
|
server.write_all(&until(&mut client, b"\r\n")).unwrap();
|
||||||
|
}
|
||||||
|
client.write_all(&until(&mut server, b"AC>")).unwrap();
|
||||||
|
let readiness = until(&mut client, b"\r\n");
|
||||||
|
assert_eq!(readiness, b"server info\r\n");
|
||||||
|
if !ready {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
server.write_all(&readiness).unwrap();
|
||||||
|
client.write_all(&until(&mut server, b"AC>")).unwrap();
|
||||||
|
let command = until(&mut client, b"\r\n");
|
||||||
|
if forward {
|
||||||
|
server.write_all(&command).unwrap();
|
||||||
|
let _ = until(&mut server, b"AC>");
|
||||||
|
}
|
||||||
|
});
|
||||||
|
let outcome = coa_core::accounts::create(root, name, "PrivateTest773", false);
|
||||||
|
proxy.join().unwrap();
|
||||||
|
std::fs::write(&path, &original)?;
|
||||||
|
if forward {
|
||||||
|
outcome?;
|
||||||
|
assert_eq!(
|
||||||
|
db.query(&format!(
|
||||||
|
"SELECT COUNT(*) FROM acore_auth.account WHERE username='{name}';"
|
||||||
|
))?
|
||||||
|
.trim(),
|
||||||
|
"1"
|
||||||
|
);
|
||||||
|
assert!(coa_core::accounts::create(root, name, "DifferentPass77", false).is_err());
|
||||||
|
Ra::connect(root)?.delete_account(name)?;
|
||||||
|
} else {
|
||||||
|
assert!(outcome.is_err());
|
||||||
|
if !ready {
|
||||||
|
assert!(outcome
|
||||||
|
.unwrap_err()
|
||||||
|
.to_string()
|
||||||
|
.contains("No create command was sent"));
|
||||||
|
}
|
||||||
|
assert_eq!(
|
||||||
|
db.query(&format!(
|
||||||
|
"SELECT COUNT(*) FROM acore_auth.account WHERE username='{name}';"
|
||||||
|
))?
|
||||||
|
.trim(),
|
||||||
|
"0"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
drop(restore);
|
||||||
|
println!("PASS: a lost native console reply is reconciled by exact SRP credentials; a command that was never executed is rejected");
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
use coa_core::{crashes, Result};
|
||||||
|
fn main()->Result<()> {
|
||||||
|
let root=std::path::PathBuf::from(std::env::args().nth(1).expect("marked native fixture"));
|
||||||
|
assert!(root.join("recovery-e2e-started").is_file());
|
||||||
|
let reports=crashes::list(&root,30)?;
|
||||||
|
let matching:Vec<_>=reports.iter().filter(|r|r.full_log.contains("AllowableRaces")).collect();
|
||||||
|
assert!(!matching.is_empty());
|
||||||
|
assert!(matching.iter().all(|r|r.exception_code.as_deref()==Some("C0000420")));
|
||||||
|
println!("PASS: Manager discovered {} actual worldserver SQL assertion reports from Core/Crashes, including Windows ANSI text",matching.len());
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
@@ -0,0 +1,91 @@
|
|||||||
|
use coa_core::{
|
||||||
|
db::{Account, Db},
|
||||||
|
driver::{self, Verb},
|
||||||
|
ra::Ra,
|
||||||
|
Result,
|
||||||
|
};
|
||||||
|
use std::{
|
||||||
|
path::PathBuf,
|
||||||
|
time::{Duration, Instant},
|
||||||
|
};
|
||||||
|
fn main() -> Result<()> {
|
||||||
|
let root = PathBuf::from(
|
||||||
|
std::env::args()
|
||||||
|
.nth(1)
|
||||||
|
.expect("disposable recovery fixture"),
|
||||||
|
);
|
||||||
|
assert!(root
|
||||||
|
.file_name()
|
||||||
|
.unwrap()
|
||||||
|
.to_string_lossy()
|
||||||
|
.starts_with("coa-update-recovery-fixture-"));
|
||||||
|
assert!(root.join("recovery-e2e-started").is_file());
|
||||||
|
let result = std::panic::catch_unwind(|| -> Result<()> {
|
||||||
|
let start = driver::run(&root, Verb::StartAll)?;
|
||||||
|
assert!(start.ok, "{}", start.output);
|
||||||
|
let db = Db::from_repack(&root, Account::Admin)?;
|
||||||
|
coa_core::companions::ensure_templates(&db)?;
|
||||||
|
let mut ra = Ra::connect(&root)?;
|
||||||
|
let before = coa_core::population::query(&root)?;
|
||||||
|
assert_eq!(before.bots_online, 0);
|
||||||
|
let rejected = db.query("SELECT name, at_login FROM acore_characters.characters WHERE guid=3030 AND account IN (SELECT id FROM acore_auth.account WHERE username LIKE 'COABOTHOST%');")?;
|
||||||
|
assert!(rejected.contains("Christian Shadowheart"));
|
||||||
|
assert_eq!(rejected.split_whitespace().last(), Some("1"));
|
||||||
|
println!("Repair reply: {}", ra.run("botcmd spawnbot 3030")?);
|
||||||
|
let repair_deadline = Instant::now() + Duration::from_secs(60);
|
||||||
|
loop {
|
||||||
|
let row = db.query(
|
||||||
|
"SELECT name, at_login, online FROM acore_characters.characters WHERE guid=3030;",
|
||||||
|
)?;
|
||||||
|
if row.trim().ends_with("0\t1") {
|
||||||
|
assert!(!row.contains("Christian Shadowheart"));
|
||||||
|
println!("PASS: the exact previously rejected companion was renamed by server validation and logged in");
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
assert!(
|
||||||
|
Instant::now() < repair_deadline,
|
||||||
|
"previously rejected companion logged in"
|
||||||
|
);
|
||||||
|
std::thread::sleep(Duration::from_secs(1));
|
||||||
|
}
|
||||||
|
let _ = ra.despawn_all()?;
|
||||||
|
let clear_deadline = Instant::now() + Duration::from_secs(30);
|
||||||
|
while coa_core::population::query(&root)?.bots_online > 0 {
|
||||||
|
assert!(Instant::now() < clear_deadline);
|
||||||
|
std::thread::sleep(Duration::from_secs(1));
|
||||||
|
}
|
||||||
|
println!("Spawn reply: {}", ra.spawn_bots(21)?);
|
||||||
|
let deadline = Instant::now() + Duration::from_secs(180);
|
||||||
|
loop {
|
||||||
|
let pop = coa_core::population::query(&root)?;
|
||||||
|
if pop.bots_online >= 21 {
|
||||||
|
println!(
|
||||||
|
"PASS: {} companions logged in; real players={}",
|
||||||
|
pop.bots_online, pop.players_online
|
||||||
|
);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
if Instant::now() > deadline {
|
||||||
|
return Err(coa_core::Error::Invalid(format!(
|
||||||
|
"Only {} of 21 companion logins completed",
|
||||||
|
pop.bots_online
|
||||||
|
)));
|
||||||
|
}
|
||||||
|
std::thread::sleep(Duration::from_secs(2));
|
||||||
|
}
|
||||||
|
let _ = ra.cancel_spawning()?;
|
||||||
|
let _ = ra.despawn_all()?;
|
||||||
|
let deadline = Instant::now() + Duration::from_secs(30);
|
||||||
|
while coa_core::population::query(&root)?.bots_online > 0 {
|
||||||
|
assert!(Instant::now() < deadline, "companions despawned");
|
||||||
|
std::thread::sleep(Duration::from_secs(1));
|
||||||
|
}
|
||||||
|
println!("PASS: companion despawn completed");
|
||||||
|
Ok(())
|
||||||
|
});
|
||||||
|
let stopped = driver::run(&root, Verb::StopAll)?;
|
||||||
|
assert!(stopped.ok, "{}", stopped.output);
|
||||||
|
result.map_err(|_| {
|
||||||
|
coa_core::Error::Invalid("Companion native acceptance panicked; fixture stopped".into())
|
||||||
|
})?
|
||||||
|
}
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
use coa_core::{crashes, Result};
|
||||||
|
fn main() -> Result<()> {
|
||||||
|
let root = std::path::PathBuf::from(std::env::args().nth(1).expect("native crash evidence"));
|
||||||
|
assert!(root.join(".crash-report-evidence").is_file());
|
||||||
|
let reports = crashes::list(&root, 10)?;
|
||||||
|
assert_eq!(reports.len(), 1);
|
||||||
|
assert_eq!(reports[0].exception_code.as_deref(), Some("C0000005"));
|
||||||
|
assert_eq!(reports[0].category, "access_violation");
|
||||||
|
assert!(!reports[0].full_log.is_empty());
|
||||||
|
println!("PASS: Manager crash history discovers and classifies the actual native handler report from Core/Crashes");
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
@@ -0,0 +1,90 @@
|
|||||||
|
use coa_core::{driver, fsx, process, Result};
|
||||||
|
#[cfg(windows)]
|
||||||
|
use std::os::windows::process::CommandExt;
|
||||||
|
use std::{
|
||||||
|
path::Path,
|
||||||
|
process::{Child, Command, Stdio},
|
||||||
|
};
|
||||||
|
|
||||||
|
struct OwnedChild(Child);
|
||||||
|
impl Drop for OwnedChild {
|
||||||
|
fn drop(&mut self) {
|
||||||
|
let _ = self.0.kill();
|
||||||
|
let _ = self.0.wait();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
fn copy_tree(source: &Path, target: &Path) -> Result<()> {
|
||||||
|
std::fs::create_dir_all(target)?;
|
||||||
|
for entry in std::fs::read_dir(source)? {
|
||||||
|
let entry = entry?;
|
||||||
|
let destination = target.join(entry.file_name());
|
||||||
|
if entry.file_type()?.is_dir() {
|
||||||
|
copy_tree(&entry.path(), &destination)?;
|
||||||
|
} else {
|
||||||
|
std::fs::copy(entry.path(), destination)?;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
fn spawn(path: &Path) -> OwnedChild {
|
||||||
|
let mut cmd = Command::new(path);
|
||||||
|
cmd.args(["-t", "127.0.0.1"])
|
||||||
|
.stdin(Stdio::null())
|
||||||
|
.stdout(Stdio::null())
|
||||||
|
.stderr(Stdio::null());
|
||||||
|
#[cfg(windows)]
|
||||||
|
cmd.creation_flags(0x0800_0000);
|
||||||
|
OwnedChild(cmd.spawn().unwrap())
|
||||||
|
}
|
||||||
|
fn main() -> Result<()> {
|
||||||
|
assert!(cfg!(windows));
|
||||||
|
let source = std::path::PathBuf::from(
|
||||||
|
std::env::args()
|
||||||
|
.nth(1)
|
||||||
|
.expect("marked disposable runtime source"),
|
||||||
|
);
|
||||||
|
assert_eq!(
|
||||||
|
std::fs::read(source.join(".release-schema-fixture"))?,
|
||||||
|
b"disposable release-schema fixture"
|
||||||
|
);
|
||||||
|
let temp = tempfile::tempdir()?;
|
||||||
|
let root = temp.path();
|
||||||
|
copy_tree(&source.join("Runtime"), &root.join("Runtime"))?;
|
||||||
|
std::fs::create_dir_all(root.join("Core"))?;
|
||||||
|
std::fs::create_dir_all(root.join("Scripts"))?;
|
||||||
|
let system =
|
||||||
|
std::path::PathBuf::from(std::env::var_os("SystemRoot").unwrap()).join("System32/ping.exe");
|
||||||
|
std::fs::copy(&system, root.join("Core/worldserver.exe"))?;
|
||||||
|
std::fs::copy(&system, root.join("foreign.exe"))?;
|
||||||
|
let mut ports = Vec::new();
|
||||||
|
let mut listeners = Vec::new();
|
||||||
|
for _ in 0..4 {
|
||||||
|
let listener = std::net::TcpListener::bind("127.0.0.1:0")?;
|
||||||
|
ports.push(listener.local_addr()?.port());
|
||||||
|
listeners.push(listener);
|
||||||
|
}
|
||||||
|
let config = serde_json::json!({"mysqlPort":ports[0],"authPort":ports[1],"worldPort":ports[2],"raPort":ports[3],"raUsername":"fixture","raPassword":"fixture"});
|
||||||
|
fsx::atomic_write_json(&root.join("Settings/repack.json"), &config)?;
|
||||||
|
drop(listeners);
|
||||||
|
let mut launcher = std::fs::read_to_string(source.join("Scripts/manage.py"))?;
|
||||||
|
launcher.push_str("\nfrom contextlib import nullcontext\ndef control_lock(): return nullcontext()\ndef stop_all(config):\n assert not process('world'), 'world must stop before database'\n (ROOT/'database-stage').write_text('safe')\n");
|
||||||
|
fsx::atomic_write(&root.join("Scripts/manage.py"), launcher.as_bytes())?;
|
||||||
|
let mut foreign = spawn(&root.join("foreign.exe"));
|
||||||
|
let foreign_identity = process::identity(foreign.0.id()).unwrap();
|
||||||
|
fsx::atomic_write_json(&root.join(".state/world.json"), &foreign_identity)?;
|
||||||
|
let rejected = driver::force_stop(root)?;
|
||||||
|
assert!(!rejected.ok, "a foreign world record must be rejected");
|
||||||
|
assert!(!root.join("database-stage").exists());
|
||||||
|
assert!(foreign.0.try_wait()?.is_none());
|
||||||
|
let mut owned = spawn(&root.join("Core/worldserver.exe"));
|
||||||
|
let stopped = driver::force_stop(root)?;
|
||||||
|
assert!(stopped.ok, "{}", stopped.output);
|
||||||
|
assert!(owned.0.try_wait()?.is_some());
|
||||||
|
assert!(
|
||||||
|
foreign.0.try_wait()?.is_none(),
|
||||||
|
"foreign process was untouched"
|
||||||
|
);
|
||||||
|
assert_eq!(std::fs::read(root.join("database-stage"))?, b"safe");
|
||||||
|
println!("PASS: native Windows forced-stop rejects foreign records, recovers the exact owned world identity, stops it before the database stage, and leaves the foreign process alive");
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
@@ -0,0 +1,199 @@
|
|||||||
|
use base64::{engine::general_purpose::STANDARD, Engine};
|
||||||
|
use coa_core::{
|
||||||
|
backup,
|
||||||
|
db::Db,
|
||||||
|
driver::{self, Verb},
|
||||||
|
fsx,
|
||||||
|
manifest::{Kind, Migration},
|
||||||
|
package::{self, BuildOptions},
|
||||||
|
pkgsource::Source,
|
||||||
|
registry::MetaDir,
|
||||||
|
update::{self, RepackEnv},
|
||||||
|
Result,
|
||||||
|
};
|
||||||
|
use ed25519_dalek::{Signer, SigningKey};
|
||||||
|
use std::{collections::BTreeMap, path::PathBuf};
|
||||||
|
fn main() -> Result<()> {
|
||||||
|
let root = PathBuf::from(
|
||||||
|
std::env::args()
|
||||||
|
.nth(1)
|
||||||
|
.expect("qualified disposable fixture"),
|
||||||
|
);
|
||||||
|
let sql = std::fs::read(std::env::args().nth(2).expect("corrective SQL"))?;
|
||||||
|
assert_eq!(
|
||||||
|
root.file_name().unwrap(),
|
||||||
|
"coa-schema-fixture-stability-upgrade-76-85-20261030"
|
||||||
|
);
|
||||||
|
assert!(root.join(".release-schema-fixture").is_file());
|
||||||
|
assert!(!root.join("legacy-start-data-e2e-started").exists());
|
||||||
|
fsx::atomic_write(
|
||||||
|
&root.join("legacy-start-data-e2e-started"),
|
||||||
|
b"disposable regression test",
|
||||||
|
)?;
|
||||||
|
let result = std::panic::catch_unwind(|| -> Result<()> {
|
||||||
|
let meta = coa_core::registry::metadata_dir_for(&root)?;
|
||||||
|
let mut identities = String::new();
|
||||||
|
let mut custom = String::new();
|
||||||
|
backup::with_database(&root, |db| {
|
||||||
|
assert_eq!(
|
||||||
|
db.query(
|
||||||
|
"SELECT COUNT(*) FROM acore_world.playercreateinfo WHERE race IN (33,45);"
|
||||||
|
)?
|
||||||
|
.trim(),
|
||||||
|
"0"
|
||||||
|
);
|
||||||
|
let base: u32 = db
|
||||||
|
.query("SELECT MAX(guid)+100 FROM acore_characters.characters;")?
|
||||||
|
.trim()
|
||||||
|
.parse()
|
||||||
|
.unwrap();
|
||||||
|
clone_character(db, base, 33, 12, "Thinprobe")?;
|
||||||
|
clone_character(db, base + 1, 45, 30, "Leperprobe")?;
|
||||||
|
identities = db.query(&format!(
|
||||||
|
"SELECT * FROM acore_characters.characters WHERE guid IN ({base},{});",
|
||||||
|
base + 1
|
||||||
|
))?;
|
||||||
|
let missing = coa_core::character_start_check::missing(db)?;
|
||||||
|
assert!(missing
|
||||||
|
.iter()
|
||||||
|
.any(|c| c.guid == base && c.race == 33 && c.class == 12));
|
||||||
|
assert!(missing
|
||||||
|
.iter()
|
||||||
|
.any(|c| c.guid == base + 1 && c.race == 45 && c.class == 30));
|
||||||
|
db.query("INSERT INTO acore_world.playercreateinfo SELECT 33,class,map,zone,position_x+0.125,position_y,position_z,orientation FROM acore_world.playercreateinfo WHERE race=1 AND class=32;")?;
|
||||||
|
custom =
|
||||||
|
db.query("SELECT * FROM acore_world.playercreateinfo WHERE race=33 AND class=32;")?;
|
||||||
|
fsx::atomic_write(
|
||||||
|
&root.join("legacy-probe-guids.json"),
|
||||||
|
serde_json::to_string(&[base, base + 1])?.as_bytes(),
|
||||||
|
)?;
|
||||||
|
println!("PASS: reproduced missing starting data for existing race 33/class 12 and race 45/class 30 characters");
|
||||||
|
Ok(())
|
||||||
|
})?;
|
||||||
|
let source = root.join("legacy-start-data-source");
|
||||||
|
let pkg = root.join("legacy-start-data-package");
|
||||||
|
fsx::atomic_write(
|
||||||
|
&source.join("Core/legacy-start-data-proof.txt"),
|
||||||
|
b"corrective migration acceptance",
|
||||||
|
)?;
|
||||||
|
fsx::atomic_write(
|
||||||
|
&source.join("_migrations/world/stabilization_legacy_starts.sql"),
|
||||||
|
&sql,
|
||||||
|
)?;
|
||||||
|
let manifest = package::build(
|
||||||
|
&source,
|
||||||
|
&pkg,
|
||||||
|
&BuildOptions {
|
||||||
|
kind: Kind::Update,
|
||||||
|
version: "2.0.0".into(),
|
||||||
|
core_commit: None,
|
||||||
|
bots_commit: None,
|
||||||
|
built_at: "private regression acceptance".into(),
|
||||||
|
part_size: 1 << 20,
|
||||||
|
migrations: vec![Migration {
|
||||||
|
id: "stabilization_legacy_starts".into(),
|
||||||
|
db: "world".into(),
|
||||||
|
sha256: fsx::sha256_bytes(&sql),
|
||||||
|
compatible_sha256: vec![],
|
||||||
|
destructive: false,
|
||||||
|
}],
|
||||||
|
},
|
||||||
|
&|_| {},
|
||||||
|
)?;
|
||||||
|
let key = SigningKey::generate(&mut rand_core::OsRng);
|
||||||
|
fsx::atomic_write(
|
||||||
|
&pkg.join("manifest.json.sig"),
|
||||||
|
STANDARD
|
||||||
|
.encode(
|
||||||
|
key.sign(&std::fs::read(pkg.join("manifest.json"))?)
|
||||||
|
.to_bytes(),
|
||||||
|
)
|
||||||
|
.as_bytes(),
|
||||||
|
)?;
|
||||||
|
let trusted = STANDARD.encode(key.verifying_key().to_bytes());
|
||||||
|
let env = RepackEnv {
|
||||||
|
root: &root,
|
||||||
|
meta_dir: &meta,
|
||||||
|
};
|
||||||
|
let out = update::apply(
|
||||||
|
&update::Params {
|
||||||
|
root: &root,
|
||||||
|
meta_dir: &meta,
|
||||||
|
source: Source::Dir(pkg),
|
||||||
|
trusted_key: &trusted,
|
||||||
|
cancel: Default::default(),
|
||||||
|
resolutions: BTreeMap::new(),
|
||||||
|
env: &env,
|
||||||
|
fail_after_ops: None,
|
||||||
|
},
|
||||||
|
&|step, pct| println!("{pct}% {step}"),
|
||||||
|
)?;
|
||||||
|
assert_eq!(out.txn.state, update::State::Committed);
|
||||||
|
assert_eq!(
|
||||||
|
MetaDir::open(&meta)?.1.core.version.as_deref(),
|
||||||
|
Some("2.0.0")
|
||||||
|
);
|
||||||
|
backup::with_database(&root, |db| {
|
||||||
|
let guids: Vec<u32> =
|
||||||
|
serde_json::from_slice(&std::fs::read(root.join("legacy-probe-guids.json"))?)?;
|
||||||
|
assert_eq!(
|
||||||
|
db.query(&format!(
|
||||||
|
"SELECT * FROM acore_characters.characters WHERE guid IN ({},{});",
|
||||||
|
guids[0], guids[1]
|
||||||
|
))?,
|
||||||
|
identities
|
||||||
|
);
|
||||||
|
assert!(coa_core::character_start_check::missing(db)?
|
||||||
|
.iter()
|
||||||
|
.all(|c| !guids.contains(&c.guid)));
|
||||||
|
assert_eq!(
|
||||||
|
db.query("SELECT * FROM acore_world.playercreateinfo WHERE race=33 AND class=32;")?,
|
||||||
|
custom
|
||||||
|
);
|
||||||
|
assert!(coa_core::migrations::status(db, &manifest.migrations)?
|
||||||
|
.iter()
|
||||||
|
.all(|m| m.status == coa_core::migrations::Status::Applied));
|
||||||
|
let before = counts(db)?;
|
||||||
|
db.query(&format!(
|
||||||
|
"USE acore_world; {}",
|
||||||
|
String::from_utf8_lossy(&sql)
|
||||||
|
))?;
|
||||||
|
assert_eq!(counts(db)?, before);
|
||||||
|
assert_eq!(
|
||||||
|
db.query("SELECT * FROM acore_world.playercreateinfo WHERE race=33 AND class=32;")?,
|
||||||
|
custom
|
||||||
|
);
|
||||||
|
println!("PASS: signed Manager update restored legacy starts, preserved complete character rows and custom starts, and remained idempotent on a second SQL execution");
|
||||||
|
Ok(())
|
||||||
|
})?;
|
||||||
|
Ok(())
|
||||||
|
});
|
||||||
|
let stopped = driver::run(&root, Verb::StopAll)?;
|
||||||
|
assert!(stopped.ok, "{}", stopped.output);
|
||||||
|
result.map_err(|_| {
|
||||||
|
coa_core::Error::Invalid("Legacy start regression failed; fixture stopped".into())
|
||||||
|
})?
|
||||||
|
}
|
||||||
|
fn counts(db: &Db) -> Result<String> {
|
||||||
|
db.query("SELECT COUNT(*) FROM acore_world.playercreateinfo WHERE race IN (33,45); SELECT COUNT(*) FROM acore_world.playercreateinfo_item WHERE race IN (33,45); SELECT COUNT(*) FROM acore_world.playercreateinfo_action WHERE race IN (33,45); SELECT COUNT(*) FROM acore_world.player_race_stats WHERE Race IN (33,45); SELECT COUNT(*) FROM acore_world.ascension_custom_class_race WHERE race IN (33,45);")
|
||||||
|
}
|
||||||
|
fn clone_character(db: &Db, guid: u32, race: u32, class: u32, name: &str) -> Result<()> {
|
||||||
|
let columns = db.query("SHOW COLUMNS FROM acore_characters.characters;")?;
|
||||||
|
let names: Vec<_> = columns
|
||||||
|
.lines()
|
||||||
|
.map(|l| l.split('\t').next().unwrap())
|
||||||
|
.collect();
|
||||||
|
let values: Vec<String> = names
|
||||||
|
.iter()
|
||||||
|
.map(|c| match *c {
|
||||||
|
"guid" => guid.to_string(),
|
||||||
|
"name" => format!("'{name}'"),
|
||||||
|
"race" => race.to_string(),
|
||||||
|
"class" => class.to_string(),
|
||||||
|
"online" | "at_login" => "0".into(),
|
||||||
|
_ => format!("`{c}`"),
|
||||||
|
})
|
||||||
|
.collect();
|
||||||
|
db.query(&format!("INSERT INTO acore_characters.characters ({}) SELECT {} FROM acore_characters.characters WHERE class={class} LIMIT 1;",names.iter().map(|c|format!("`{c}`")).collect::<Vec<_>>().join(","),values.join(",")))?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
use coa_core::{backup, schema_check, Result};
|
||||||
|
fn main()->Result<()> {
|
||||||
|
let root=std::path::PathBuf::from(std::env::args().nth(1).unwrap());
|
||||||
|
let contract=std::path::PathBuf::from(std::env::args().nth(2).unwrap());
|
||||||
|
assert!(root.join("recovery-e2e-started").is_file());
|
||||||
|
assert!(contract.join(".release-schema-fixture").is_file());
|
||||||
|
backup::with_database(&root,|db| {for p in schema_check::check(db,&contract)? {println!("{}.{}.{}: {}",p.database,p.table,p.column,p.detail);} Ok(())})
|
||||||
|
}
|
||||||
@@ -0,0 +1,132 @@
|
|||||||
|
use base64::{engine::general_purpose::STANDARD, Engine};
|
||||||
|
use coa_core::{
|
||||||
|
backup,
|
||||||
|
driver::{self, Verb},
|
||||||
|
fsx,
|
||||||
|
manifest::{Kind, Migration},
|
||||||
|
package::{self, BuildOptions},
|
||||||
|
pkgsource::Source,
|
||||||
|
update::{self, RepackEnv},
|
||||||
|
Result,
|
||||||
|
};
|
||||||
|
use ed25519_dalek::{Signer, SigningKey};
|
||||||
|
use std::{collections::BTreeMap, path::PathBuf};
|
||||||
|
fn main() -> Result<()> {
|
||||||
|
let root = PathBuf::from(std::env::args().nth(1).unwrap());
|
||||||
|
let core = PathBuf::from(std::env::args().nth(2).unwrap());
|
||||||
|
let release = PathBuf::from(std::env::args().nth(3).unwrap());
|
||||||
|
assert!(root.join("recovery-e2e-started").is_file());
|
||||||
|
let result = std::panic::catch_unwind(|| -> Result<()> {
|
||||||
|
let meta = coa_core::registry::metadata_dir_for(&root)?;
|
||||||
|
let source = root.join("schema-sync-source-v2");
|
||||||
|
let pkg = root.join("schema-sync-package-v2");
|
||||||
|
assert!(!pkg.exists());
|
||||||
|
fsx::atomic_write(
|
||||||
|
&source.join("Core/schema-sync-proof.txt"),
|
||||||
|
b"official schema migration acceptance",
|
||||||
|
)?;
|
||||||
|
let published =
|
||||||
|
coa_core::manifest::Manifest::parse(&std::fs::read(release.join("manifest.json"))?)?;
|
||||||
|
let contract_path = PathBuf::from("C:/games/source/coa-schema-fixture-stability-upgrade-76-85-20261030/Scripts/database-schema.json");
|
||||||
|
let contract = std::fs::read(contract_path)?;
|
||||||
|
let expected = published
|
||||||
|
.files
|
||||||
|
.iter()
|
||||||
|
.find(|f| f.path == "Scripts/database-schema.json")
|
||||||
|
.unwrap();
|
||||||
|
assert_eq!(fsx::sha256_bytes(&contract), expected.sha256);
|
||||||
|
fsx::atomic_write(&source.join("Scripts/database-schema.json"), &contract)?;
|
||||||
|
let mut migrations: Vec<Migration> = Vec::new();
|
||||||
|
for id in [
|
||||||
|
"rev_1793212891571528600",
|
||||||
|
"rev_20261027_18_coa_strange_piece_of_scrap_faction_diamond",
|
||||||
|
] {
|
||||||
|
let m = published
|
||||||
|
.migrations
|
||||||
|
.iter()
|
||||||
|
.find(|m| m.id == id)
|
||||||
|
.unwrap()
|
||||||
|
.clone();
|
||||||
|
let sql = std::fs::read(
|
||||||
|
core.join(format!("data/sql/updates/pending_db_{}/{}.sql", m.db, m.id)),
|
||||||
|
)?;
|
||||||
|
assert_eq!(fsx::sha256_bytes(&sql), m.sha256);
|
||||||
|
fsx::atomic_write(
|
||||||
|
&source.join(format!("_migrations/{}/{}.sql", m.db, m.id)),
|
||||||
|
&sql,
|
||||||
|
)?;
|
||||||
|
migrations.push(m);
|
||||||
|
}
|
||||||
|
package::build(
|
||||||
|
&source,
|
||||||
|
&pkg,
|
||||||
|
&BuildOptions {
|
||||||
|
kind: Kind::Update,
|
||||||
|
version: "3.0.0".into(),
|
||||||
|
core_commit: None,
|
||||||
|
bots_commit: None,
|
||||||
|
built_at: "private native fixture schema sync".into(),
|
||||||
|
part_size: 1 << 20,
|
||||||
|
migrations,
|
||||||
|
},
|
||||||
|
&|_| {},
|
||||||
|
)?;
|
||||||
|
let key = SigningKey::generate(&mut rand_core::OsRng);
|
||||||
|
fsx::atomic_write(
|
||||||
|
&pkg.join("manifest.json.sig"),
|
||||||
|
STANDARD
|
||||||
|
.encode(
|
||||||
|
key.sign(&std::fs::read(pkg.join("manifest.json"))?)
|
||||||
|
.to_bytes(),
|
||||||
|
)
|
||||||
|
.as_bytes(),
|
||||||
|
)?;
|
||||||
|
let trusted = STANDARD.encode(key.verifying_key().to_bytes());
|
||||||
|
let env = RepackEnv {
|
||||||
|
root: &root,
|
||||||
|
meta_dir: &meta,
|
||||||
|
};
|
||||||
|
let out = update::apply(
|
||||||
|
&update::Params {
|
||||||
|
root: &root,
|
||||||
|
meta_dir: &meta,
|
||||||
|
source: Source::Dir(pkg),
|
||||||
|
trusted_key: &trusted,
|
||||||
|
cancel: Default::default(),
|
||||||
|
resolutions: BTreeMap::from([(
|
||||||
|
"Scripts/database-schema.json".into(),
|
||||||
|
update::Resolution::Replace,
|
||||||
|
)]),
|
||||||
|
env: &env,
|
||||||
|
fail_after_ops: None,
|
||||||
|
},
|
||||||
|
&|step, pct| println!("{pct}% {step}"),
|
||||||
|
)?;
|
||||||
|
assert_eq!(out.txn.state, update::State::Committed);
|
||||||
|
backup::with_database(&root, |db| {
|
||||||
|
assert_eq!(
|
||||||
|
db.query("SELECT name,at_login FROM acore_characters.characters WHERE guid=3030;")?
|
||||||
|
.trim(),
|
||||||
|
"Christian Shadowheart\t1"
|
||||||
|
);
|
||||||
|
assert_eq!(
|
||||||
|
db.query("SELECT id FROM acore_characters.manager_recovery_probe;")?
|
||||||
|
.trim(),
|
||||||
|
"42"
|
||||||
|
);
|
||||||
|
assert_eq!(
|
||||||
|
db.query("SELECT id FROM acore_world.manager_recovery_probe;")?
|
||||||
|
.trim(),
|
||||||
|
"44"
|
||||||
|
);
|
||||||
|
Ok(())
|
||||||
|
})?;
|
||||||
|
println!("PASS: the exact two published migrations brought the old fixture schema forward through the Manager updater while preserving the rejected companion and recovery probes");
|
||||||
|
Ok(())
|
||||||
|
});
|
||||||
|
let stop = driver::run(&root, Verb::StopAll)?;
|
||||||
|
assert!(stop.ok, "{}", stop.output);
|
||||||
|
result.map_err(|_| {
|
||||||
|
coa_core::Error::Invalid("Schema sync acceptance failed; fixture stopped".into())
|
||||||
|
})?
|
||||||
|
}
|
||||||
@@ -0,0 +1,166 @@
|
|||||||
|
use base64::{engine::general_purpose::STANDARD, Engine};
|
||||||
|
use coa_core::{
|
||||||
|
backup, driver, fsx,
|
||||||
|
manifest::{Kind, Migration},
|
||||||
|
package::{self, BuildOptions},
|
||||||
|
pkgsource::Source,
|
||||||
|
registry::MetaDir,
|
||||||
|
update::{self, RepackEnv},
|
||||||
|
Result,
|
||||||
|
};
|
||||||
|
use ed25519_dalek::{Signer, SigningKey};
|
||||||
|
use std::{collections::BTreeMap, path::PathBuf};
|
||||||
|
|
||||||
|
fn main() -> Result<()> {
|
||||||
|
let root = PathBuf::from(
|
||||||
|
std::env::args()
|
||||||
|
.nth(1)
|
||||||
|
.expect("disposable recovery fixture"),
|
||||||
|
);
|
||||||
|
assert!(root
|
||||||
|
.file_name()
|
||||||
|
.unwrap()
|
||||||
|
.to_string_lossy()
|
||||||
|
.starts_with("coa-update-recovery-fixture-"));
|
||||||
|
assert!(root.join("recovery-e2e-started").is_file());
|
||||||
|
let cycles_only = std::env::args().nth(2).as_deref() == Some("--cycles-only");
|
||||||
|
if !cycles_only {
|
||||||
|
assert!(!root.join("success-e2e-started").exists());
|
||||||
|
fsx::atomic_write(
|
||||||
|
&root.join("success-e2e-started"),
|
||||||
|
b"disposable success acceptance",
|
||||||
|
)?;
|
||||||
|
}
|
||||||
|
let result = std::panic::catch_unwind(std::panic::AssertUnwindSafe(|| {
|
||||||
|
if cycles_only {
|
||||||
|
restart_cycles(&root)
|
||||||
|
} else {
|
||||||
|
exercise(&root)
|
||||||
|
}
|
||||||
|
}));
|
||||||
|
assert!(
|
||||||
|
driver::run(&root, driver::Verb::StopAll)?.ok,
|
||||||
|
"fixture shutdown"
|
||||||
|
);
|
||||||
|
result.map_err(|_| {
|
||||||
|
coa_core::Error::Invalid(
|
||||||
|
"Success acceptance assertion failed; fixture services stopped".into(),
|
||||||
|
)
|
||||||
|
})?
|
||||||
|
}
|
||||||
|
|
||||||
|
fn exercise(root: &std::path::Path) -> Result<()> {
|
||||||
|
let meta = coa_core::registry::metadata_dir_for(root)?;
|
||||||
|
assert!(update::unfinished(&meta).is_none());
|
||||||
|
assert!(driver::run(root, driver::Verb::StopAll)?.ok);
|
||||||
|
let source = root.join("success-source");
|
||||||
|
let pkg = root.join("success-package");
|
||||||
|
fsx::atomic_write(
|
||||||
|
&source.join("Core/stabilization-success.txt"),
|
||||||
|
b"verified update",
|
||||||
|
)?;
|
||||||
|
let sql = b"UPDATE manager_recovery_probe SET id=44 WHERE id=43;";
|
||||||
|
fsx::atomic_write(
|
||||||
|
&source.join("_migrations/world/stabilization_success.sql"),
|
||||||
|
sql,
|
||||||
|
)?;
|
||||||
|
let manifest = package::build(
|
||||||
|
&source,
|
||||||
|
&pkg,
|
||||||
|
&BuildOptions {
|
||||||
|
kind: Kind::Update,
|
||||||
|
version: "2.0.0".into(),
|
||||||
|
core_commit: None,
|
||||||
|
bots_commit: None,
|
||||||
|
built_at: "disposable acceptance".into(),
|
||||||
|
part_size: 1 << 20,
|
||||||
|
migrations: vec![Migration {
|
||||||
|
id: "stabilization_success".into(),
|
||||||
|
db: "world".into(),
|
||||||
|
sha256: fsx::sha256_bytes(sql),
|
||||||
|
compatible_sha256: vec![],
|
||||||
|
destructive: false,
|
||||||
|
}],
|
||||||
|
},
|
||||||
|
&|_| {},
|
||||||
|
)?;
|
||||||
|
let key = SigningKey::generate(&mut rand_core::OsRng);
|
||||||
|
fsx::atomic_write(
|
||||||
|
&pkg.join("manifest.json.sig"),
|
||||||
|
STANDARD
|
||||||
|
.encode(
|
||||||
|
key.sign(&std::fs::read(pkg.join("manifest.json"))?)
|
||||||
|
.to_bytes(),
|
||||||
|
)
|
||||||
|
.as_bytes(),
|
||||||
|
)?;
|
||||||
|
let trusted = STANDARD.encode(key.verifying_key().to_bytes());
|
||||||
|
let env = RepackEnv {
|
||||||
|
root,
|
||||||
|
meta_dir: &meta,
|
||||||
|
};
|
||||||
|
let outcome = update::apply(
|
||||||
|
&update::Params {
|
||||||
|
root,
|
||||||
|
meta_dir: &meta,
|
||||||
|
source: Source::Dir(pkg),
|
||||||
|
trusted_key: &trusted,
|
||||||
|
cancel: Default::default(),
|
||||||
|
resolutions: BTreeMap::new(),
|
||||||
|
env: &env,
|
||||||
|
fail_after_ops: None,
|
||||||
|
},
|
||||||
|
&|step, pct| println!("{pct}% {step}"),
|
||||||
|
)?;
|
||||||
|
assert_eq!(outcome.txn.state, update::State::Committed);
|
||||||
|
assert_eq!(
|
||||||
|
MetaDir::open(&meta)?.1.core.version.as_deref(),
|
||||||
|
Some("2.0.0")
|
||||||
|
);
|
||||||
|
assert!(update::unfinished(&meta).is_none());
|
||||||
|
assert_eq!(
|
||||||
|
std::fs::read(root.join("Core/stabilization-success.txt"))?,
|
||||||
|
b"verified update"
|
||||||
|
);
|
||||||
|
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_characters.manager_recovery_view;")?,
|
||||||
|
"42"
|
||||||
|
);
|
||||||
|
assert_eq!(
|
||||||
|
db.query("SELECT id FROM acore_world.manager_recovery_probe;")?,
|
||||||
|
"44"
|
||||||
|
);
|
||||||
|
assert!(coa_core::migrations::status(db, &manifest.migrations)?
|
||||||
|
.iter()
|
||||||
|
.all(|m| m.status == coa_core::migrations::Status::Applied));
|
||||||
|
Ok(())
|
||||||
|
})?;
|
||||||
|
restart_cycles(root)?;
|
||||||
|
println!("PASS: signed update committed after failed rehearsal and recovery; SQL, files, metadata and player data verified; two native restart cycles passed");
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn restart_cycles(root: &std::path::Path) -> Result<()> {
|
||||||
|
for cycle in 0..2 {
|
||||||
|
let stopped = driver::run(root, driver::Verb::StopAll)?;
|
||||||
|
assert!(
|
||||||
|
stopped.ok,
|
||||||
|
"Stop cycle {cycle}: {}",
|
||||||
|
coa_core::diag::redact(&stopped.output)
|
||||||
|
);
|
||||||
|
let started = driver::run(root, driver::Verb::StartAll)?;
|
||||||
|
assert!(started.ok, "{}", started.output);
|
||||||
|
let pop = coa_core::population::query(root)?;
|
||||||
|
println!(
|
||||||
|
"Restart cycle {cycle}: world ready, players={}, bots={}",
|
||||||
|
pop.players_online, pop.bots_online
|
||||||
|
);
|
||||||
|
}
|
||||||
|
println!("PASS: two native restart cycles finished");
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
@@ -30,15 +30,27 @@ fn main() -> Result<()> {
|
|||||||
.unwrap()
|
.unwrap()
|
||||||
.to_string_lossy()
|
.to_string_lossy()
|
||||||
.starts_with("coa-update-recovery-fixture-"));
|
.starts_with("coa-update-recovery-fixture-"));
|
||||||
|
let resume = std::env::args().nth(2).as_deref() == Some("--verify-recovered");
|
||||||
|
let result = std::panic::catch_unwind(std::panic::AssertUnwindSafe(|| {
|
||||||
|
if resume {
|
||||||
|
assert!(root.join("recovery-e2e-started").is_file());
|
||||||
|
let manifest = coa_core::manifest::Manifest::parse(&std::fs::read(
|
||||||
|
root.join("fixture-package/manifest.json"),
|
||||||
|
)?)?;
|
||||||
|
verify_recovered(&root, &manifest)
|
||||||
|
} else {
|
||||||
assert!(
|
assert!(
|
||||||
!root.join("recovery-e2e-started").exists(),
|
!root.join("recovery-e2e-started").exists(),
|
||||||
"Use a new fixture; never reuse an owned server"
|
"Use a new fixture"
|
||||||
);
|
);
|
||||||
fsx::atomic_write(&root.join("recovery-e2e-started"), b"disposable fixture")?;
|
fsx::atomic_write(&root.join("recovery-e2e-started"), b"disposable fixture")?;
|
||||||
let result = exercise(&root);
|
exercise(&root)
|
||||||
let stopped = driver::run(&root, Verb::StopAll)?;
|
}
|
||||||
assert!(stopped.ok);
|
}));
|
||||||
result
|
assert!(driver::run(&root, Verb::StopAll)?.ok);
|
||||||
|
result.map_err(|_| {
|
||||||
|
Error::Invalid("Recovery acceptance assertion failed; owned services were stopped".into())
|
||||||
|
})?
|
||||||
}
|
}
|
||||||
|
|
||||||
fn exercise(root: &Path) -> Result<()> {
|
fn exercise(root: &Path) -> Result<()> {
|
||||||
@@ -122,9 +134,18 @@ fn exercise(root: &Path) -> Result<()> {
|
|||||||
assert!(
|
assert!(
|
||||||
error
|
error
|
||||||
.to_string()
|
.to_string()
|
||||||
.contains("private update rehearsal failed"),
|
.contains("files and databases were restored to the recovery point"),
|
||||||
"{error}"
|
"{error}"
|
||||||
);
|
);
|
||||||
|
verify_recovered(root, &manifest)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn verify_recovered(root: &Path, manifest: &coa_core::manifest::Manifest) -> Result<()> {
|
||||||
|
let meta = coa_core::registry::metadata_dir_for(root)?;
|
||||||
|
let env = RepackEnv {
|
||||||
|
root,
|
||||||
|
meta_dir: &meta,
|
||||||
|
};
|
||||||
assert!(!root.join("Core/recovery-probe.txt").exists());
|
assert!(!root.join("Core/recovery-probe.txt").exists());
|
||||||
assert!(update::unfinished(&meta).is_none());
|
assert!(update::unfinished(&meta).is_none());
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
@@ -168,6 +189,6 @@ fn exercise(root: &Path) -> Result<()> {
|
|||||||
Db::from_repack(root, Account::Admin)?.realm(),
|
Db::from_repack(root, Account::Admin)?.realm(),
|
||||||
coa_core::realms::Mode::Coa
|
coa_core::realms::Mode::Coa
|
||||||
);
|
);
|
||||||
println!("PASS: private rehearsal caught failed SQL before changing the installed world, characters, ledger, objects, files or version; complete recovery succeeded");
|
println!("PASS: failed SQL was rolled back; characters, world, ledger, views, triggers, routines, files and version were verified; the saved recovery point was restored again");
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
@@ -80,6 +80,60 @@ fn upper(name: &str) -> Result<String> {
|
|||||||
Ok(name.to_ascii_uppercase())
|
Ok(name.to_ascii_uppercase())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn create(root: &Path, name: &str, password: &str, administrator: bool) -> Result<()> {
|
||||||
|
validate_account(name, password)?;
|
||||||
|
let name = name.to_ascii_uppercase();
|
||||||
|
let db = Db::from_repack(root, Account::Admin)?;
|
||||||
|
if db
|
||||||
|
.query(&format!(
|
||||||
|
"SELECT COUNT(*) FROM acore_auth.account WHERE username='{name}';"
|
||||||
|
))?
|
||||||
|
.trim()
|
||||||
|
!= "0"
|
||||||
|
{
|
||||||
|
return Err(Error::Invalid("That account name is already taken.".into()));
|
||||||
|
}
|
||||||
|
let mut ra = Ra::connect(root)?;
|
||||||
|
ra.performance().map_err(|error| Error::Invalid(format!("The server console is not ready for account creation. No create command was sent. {error}")))?;
|
||||||
|
let confirmed = ra.create_account(&name, password);
|
||||||
|
if let Err(error) = confirmed {
|
||||||
|
let stored = db.query(&format!(
|
||||||
|
"SELECT HEX(salt), HEX(verifier) FROM acore_auth.account WHERE username='{name}';"
|
||||||
|
))?;
|
||||||
|
if !matches_credentials(&stored, &name, password) {
|
||||||
|
return Err(Error::Invalid(format!("Account creation was not confirmed. Refresh the account list before retrying. {error}")));
|
||||||
|
}
|
||||||
|
if administrator {
|
||||||
|
ra = Ra::connect(root).map_err(|error| Error::Invalid(format!("The account was created, but administrator access was not confirmed. Refresh the account list and check its access level. {error}")))?;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if administrator {
|
||||||
|
if let Err(error) = ra.make_administrator(&name) {
|
||||||
|
let access = db.query(&format!("SELECT COUNT(*) FROM acore_auth.account_access WHERE id=(SELECT id FROM acore_auth.account WHERE username='{name}') AND gmlevel=3 AND RealmID=-1;"))?;
|
||||||
|
if access.trim() != "1" {
|
||||||
|
return Err(Error::Invalid(format!("The account was created, but administrator access was not confirmed. Refresh the account list and check its access level. {error}")));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn matches_credentials(stored: &str, name: &str, password: &str) -> bool {
|
||||||
|
let Some((salt, verifier)) = stored.trim().split_once('\t') else {
|
||||||
|
return false;
|
||||||
|
};
|
||||||
|
let Ok(salt) = hex::decode(salt) else {
|
||||||
|
return false;
|
||||||
|
};
|
||||||
|
let Ok(salt): std::result::Result<[u8; 32], _> = salt.try_into() else {
|
||||||
|
return false;
|
||||||
|
};
|
||||||
|
let Ok(verifier) = hex::decode(verifier) else {
|
||||||
|
return false;
|
||||||
|
};
|
||||||
|
verifier.as_slice() == crate::srp6::verifier(name, password, &salt)
|
||||||
|
}
|
||||||
|
|
||||||
/// Give the account a new name. Needs the world console (the new password is what makes the login work again) and an
|
/// Give the account a new name. Needs the world console (the new password is what makes the login work again) and an
|
||||||
/// account that is not logged in. The old name is put back if anything goes wrong.
|
/// account that is not logged in. The old name is put back if anything goes wrong.
|
||||||
pub fn rename(root: &Path, ra: &mut Ra, old: &str, new: &str, password: &str) -> Result<()> {
|
pub fn rename(root: &Path, ra: &mut Ra, old: &str, new: &str, password: &str) -> Result<()> {
|
||||||
@@ -165,6 +219,19 @@ pub fn delete(root: &Path, ra: &mut Ra, name: &str) -> Result<()> {
|
|||||||
mod tests {
|
mod tests {
|
||||||
use super::*;
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn lost_reply_requires_the_exact_requested_credentials() {
|
||||||
|
let salt = [42; 32];
|
||||||
|
let verifier = crate::srp6::verifier("NewPlayer", "Password77", &salt);
|
||||||
|
let stored = format!("{}\t{}\n", hex::encode(salt), hex::encode(verifier));
|
||||||
|
assert!(matches_credentials(&stored, "NEWPLAYER", "password77"));
|
||||||
|
assert!(!matches_credentials(&stored, "NEWPLAYER", "wrongpass"));
|
||||||
|
assert!(!matches_credentials(&stored, "OTHERPLAYER", "Password77"));
|
||||||
|
for value in ["", "NULL\tNULL", "00\t00", "malformed"] {
|
||||||
|
assert!(!matches_credentials(value, "NewPlayer", "Password77"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn rows_from_the_client_become_accounts() {
|
fn rows_from_the_client_become_accounts() {
|
||||||
let out = "2\tALICE\t3\t0\t2026-09-30 21:04:11\t4\n5\tBOB\t0\t1\t\t0\n7\tBROKEN\n";
|
let out = "2\tALICE\t3\t0\t2026-09-30 21:04:11\t4\n5\tBOB\t0\t1\t\t0\n7\tBROKEN\n";
|
||||||
|
|||||||
@@ -15,7 +15,8 @@ use crate::fsx;
|
|||||||
pub use crate::glue_config;
|
pub use crate::glue_config;
|
||||||
|
|
||||||
pub const ADDON_NAME: &str = "CoABotUI";
|
pub const ADDON_NAME: &str = "CoABotUI";
|
||||||
const EXECUTABLES: [&str; 3] = ["Ascension.exe", "Wow.exe", "WoW.exe"];
|
// CoA Custom Races V2 ships its own client (CoACustomRace.exe) next to Ascension.exe and must be started instead.
|
||||||
|
const EXECUTABLES: [&str; 4] = ["CoACustomRace.exe", "Ascension.exe", "Wow.exe", "WoW.exe"];
|
||||||
|
|
||||||
pub fn is_running(client: &Path) -> bool {
|
pub fn is_running(client: &Path) -> bool {
|
||||||
if crate::platform::flavor() == crate::platform::Flavor::Docker {
|
if crate::platform::flavor() == crate::platform::Flavor::Docker {
|
||||||
|
|||||||
@@ -0,0 +1,134 @@
|
|||||||
|
use crate::{fsx, Error, Result};
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
use std::{fs, path::Path};
|
||||||
|
|
||||||
|
#[derive(Default, Serialize, Deserialize)]
|
||||||
|
pub struct Graphics {
|
||||||
|
pub dxvk_disabled: bool,
|
||||||
|
pub enhancements_disabled: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
fn preferences(client: &Path) -> Result<Option<Graphics>> {
|
||||||
|
match fs::read(client.join(".coa-manager/graphics.json")) {
|
||||||
|
Ok(bytes) => Ok(Some(serde_json::from_slice(&bytes)?)),
|
||||||
|
Err(e) if e.kind() == std::io::ErrorKind::NotFound => Ok(None),
|
||||||
|
Err(e) => Err(e.into()),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn status(client: &Path) -> Result<Graphics> {
|
||||||
|
let saved = preferences(client)?.unwrap_or_default();
|
||||||
|
let actual = |name: &str, remembered: bool| -> Result<bool> {
|
||||||
|
let active = client.join(name).is_file();
|
||||||
|
let inactive = client.join(format!("{name}.DISABLED")).is_file();
|
||||||
|
if active && inactive {
|
||||||
|
return Err(Error::Invalid(
|
||||||
|
"Both enabled and disabled renderer files exist.".into(),
|
||||||
|
));
|
||||||
|
}
|
||||||
|
Ok(inactive || (!active && remembered))
|
||||||
|
};
|
||||||
|
Ok(Graphics {
|
||||||
|
dxvk_disabled: actual("d3d9.dll", saved.dxvk_disabled)?,
|
||||||
|
enhancements_disabled: actual("dxgi.dll", saved.enhancements_disabled)?,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn disabled(client: &Path, path: &str) -> Result<bool> {
|
||||||
|
let name = path.to_ascii_lowercase();
|
||||||
|
if !matches!(name.as_str(), "d3d9.dll" | "dxgi.dll") {
|
||||||
|
return Ok(false);
|
||||||
|
}
|
||||||
|
let state = status(client)?;
|
||||||
|
Ok(if name == "d3d9.dll" {
|
||||||
|
state.dxvk_disabled
|
||||||
|
} else {
|
||||||
|
state.enhancements_disabled
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn set(client: &Path, name: &str, disabled: bool) -> Result<Graphics> {
|
||||||
|
if !matches!(name, "d3d9.dll" | "dxgi.dll") {
|
||||||
|
return Err(Error::Invalid("Unknown graphics setting.".into()));
|
||||||
|
}
|
||||||
|
if crate::client::is_running(client) {
|
||||||
|
return Err(Error::Invalid(
|
||||||
|
"Close the game before changing graphics settings.".into(),
|
||||||
|
));
|
||||||
|
}
|
||||||
|
let active = fsx::safe_join(client, name)?;
|
||||||
|
let inactive = fsx::safe_join(client, &format!("{name}.DISABLED"))?;
|
||||||
|
if active.exists() && inactive.exists() {
|
||||||
|
return Err(Error::Invalid("Both enabled and disabled renderer files exist. Resolve the conflict before changing graphics settings.".into()));
|
||||||
|
}
|
||||||
|
let mut state = status(client)?;
|
||||||
|
if name == "d3d9.dll" {
|
||||||
|
state.dxvk_disabled = disabled;
|
||||||
|
} else {
|
||||||
|
state.enhancements_disabled = disabled;
|
||||||
|
}
|
||||||
|
let (source, target) = if disabled {
|
||||||
|
(&active, &inactive)
|
||||||
|
} else {
|
||||||
|
(&inactive, &active)
|
||||||
|
};
|
||||||
|
// The no-clobber link also preserves an existing destination if another app changes the setting.
|
||||||
|
if source.is_file() {
|
||||||
|
if let Err(error) = fs::hard_link(source, target) {
|
||||||
|
if error.kind() == std::io::ErrorKind::AlreadyExists {
|
||||||
|
return Err(error.into());
|
||||||
|
}
|
||||||
|
let mut output = fs::OpenOptions::new()
|
||||||
|
.write(true)
|
||||||
|
.create_new(true)
|
||||||
|
.open(target)?;
|
||||||
|
let copied = std::fs::File::open(source)
|
||||||
|
.and_then(|mut input| std::io::copy(&mut input, &mut output))
|
||||||
|
.and_then(|_| output.sync_all());
|
||||||
|
drop(output);
|
||||||
|
if let Err(error) = copied {
|
||||||
|
let _ = fs::remove_file(target);
|
||||||
|
return Err(error.into());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if let Err(error) = fs::remove_file(source) {
|
||||||
|
let _ = fs::remove_file(target);
|
||||||
|
return Err(error.into());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
fsx::atomic_write_json(&client.join(".coa-manager/graphics.json"), &state)?;
|
||||||
|
Ok(state)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
#[test]
|
||||||
|
fn toggles_preserve_bytes_and_refuse_conflicts() {
|
||||||
|
let dir = tempfile::tempdir().unwrap();
|
||||||
|
let root = dir.path();
|
||||||
|
fs::write(root.join("d3d9.dll"), b"custom renderer").unwrap();
|
||||||
|
assert!(set(root, "d3d9.dll", true).unwrap().dxvk_disabled);
|
||||||
|
assert!(!root.join("d3d9.dll").exists());
|
||||||
|
assert_eq!(
|
||||||
|
fs::read(root.join("d3d9.dll.DISABLED")).unwrap(),
|
||||||
|
b"custom renderer"
|
||||||
|
);
|
||||||
|
assert!(!set(root, "d3d9.dll", false).unwrap().dxvk_disabled);
|
||||||
|
fs::write(root.join("d3d9.dll.DISABLED"), b"other").unwrap();
|
||||||
|
assert!(set(root, "d3d9.dll", false).is_err());
|
||||||
|
assert_eq!(fs::read(root.join("d3d9.dll")).unwrap(), b"custom renderer");
|
||||||
|
assert_eq!(fs::read(root.join("d3d9.dll.DISABLED")).unwrap(), b"other");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn remembers_missing_wrapper_and_imports_launcher_marker() {
|
||||||
|
let dir = tempfile::tempdir().unwrap();
|
||||||
|
let root = dir.path();
|
||||||
|
assert!(set(root, "d3d9.dll", true).unwrap().dxvk_disabled);
|
||||||
|
assert!(disabled(root, "d3d9.dll").unwrap());
|
||||||
|
fs::write(root.join("dxgi.dll.DISABLED"), b"launcher disabled").unwrap();
|
||||||
|
assert!(disabled(root, "dxgi.dll").unwrap());
|
||||||
|
assert!(!disabled(root, "Data/d3d9.dll").unwrap());
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -299,6 +299,11 @@ pub fn plan(
|
|||||||
bytes_per_sec: 0,
|
bytes_per_sec: 0,
|
||||||
file: Some(f.path.clone()),
|
file: Some(f.path.clone()),
|
||||||
});
|
});
|
||||||
|
if crate::client_graphics::disabled(client, &f.path)? {
|
||||||
|
kept += 1;
|
||||||
|
done += f.size;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
let path = fsx::safe_join(client, &f.path)?;
|
let path = fsx::safe_join(client, &f.path)?;
|
||||||
let meta = match fs::metadata(&path) {
|
let meta = match fs::metadata(&path) {
|
||||||
Ok(meta) if meta.is_file() => meta,
|
Ok(meta) if meta.is_file() => meta,
|
||||||
@@ -440,6 +445,9 @@ pub fn apply(a: &Apply, on_step: &dyn Fn(Step)) -> Result<()> {
|
|||||||
|
|
||||||
let mut todo = Vec::new();
|
let mut todo = Vec::new();
|
||||||
for item in &a.plan.items {
|
for item in &a.plan.items {
|
||||||
|
if crate::client_graphics::disabled(a.client, &item.path)? {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
if item.kind == Kind::Modified && a.keep_modified {
|
if item.kind == Kind::Modified && a.keep_modified {
|
||||||
let path = fsx::safe_join(a.client, &item.path)?;
|
let path = fsx::safe_join(a.client, &item.path)?;
|
||||||
let meta = fs::metadata(&path)?;
|
let meta = fs::metadata(&path)?;
|
||||||
@@ -777,6 +785,52 @@ mod tests {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn disabled_launcher_renderers_are_never_restored_even_with_a_stale_plan() {
|
||||||
|
let dir = tempfile::tempdir().unwrap();
|
||||||
|
let files: Vec<(&str, &[u8])> = vec![("d3d9.dll", b"dxvk"), ("dxgi.dll", b"enhancements")];
|
||||||
|
let manifest = manifest("v1", &files);
|
||||||
|
let cancel = Cancel::default();
|
||||||
|
let old_plan = plan(dir.path(), &manifest, &State::default(), &cancel, &|_| {}).unwrap();
|
||||||
|
fs::write(dir.path().join("d3d9.dll.DISABLED"), b"custom disabled").unwrap();
|
||||||
|
crate::client_graphics::set(dir.path(), "dxgi.dll", true).unwrap();
|
||||||
|
let server = Server::new(&files);
|
||||||
|
apply(
|
||||||
|
&Apply {
|
||||||
|
client: dir.path(),
|
||||||
|
manifest: &manifest,
|
||||||
|
plan: &old_plan,
|
||||||
|
keep_modified: false,
|
||||||
|
transport: &server,
|
||||||
|
objects_url: "https://x.invalid/objects",
|
||||||
|
cancel: &cancel,
|
||||||
|
},
|
||||||
|
&|_| {},
|
||||||
|
)
|
||||||
|
.unwrap();
|
||||||
|
assert!(server.requested.lock().unwrap().is_empty());
|
||||||
|
assert!(!dir.path().join("d3d9.dll").exists());
|
||||||
|
assert!(!dir.path().join("dxgi.dll").exists());
|
||||||
|
assert_eq!(
|
||||||
|
fs::read(dir.path().join("d3d9.dll.DISABLED")).unwrap(),
|
||||||
|
b"custom disabled"
|
||||||
|
);
|
||||||
|
let after = plan(
|
||||||
|
dir.path(),
|
||||||
|
&manifest,
|
||||||
|
&load_state(dir.path()).unwrap(),
|
||||||
|
&cancel,
|
||||||
|
&|_| {},
|
||||||
|
)
|
||||||
|
.unwrap();
|
||||||
|
assert!(after.items.is_empty());
|
||||||
|
crate::client_graphics::set(dir.path(), "d3d9.dll", false).unwrap();
|
||||||
|
assert_eq!(
|
||||||
|
fs::read(dir.path().join("d3d9.dll")).unwrap(),
|
||||||
|
b"custom disabled"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn renderer_files_configs_and_everything_not_in_the_manifest_survive_an_update_untouched() {
|
fn renderer_files_configs_and_everything_not_in_the_manifest_survive_an_update_untouched() {
|
||||||
let d = tempfile::tempdir().unwrap();
|
let d = tempfile::tempdir().unwrap();
|
||||||
|
|||||||
@@ -214,11 +214,13 @@ fn run(
|
|||||||
struct StreamWorker {
|
struct StreamWorker {
|
||||||
tx: Sender<TunnelMsg>,
|
tx: Sender<TunnelMsg>,
|
||||||
reset_on_drop: bool,
|
reset_on_drop: bool,
|
||||||
|
shutdown: Arc<TcpStream>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Drop for StreamWorker {
|
impl Drop for StreamWorker {
|
||||||
fn drop(&mut self) {
|
fn drop(&mut self) {
|
||||||
if self.reset_on_drop {
|
if self.reset_on_drop {
|
||||||
|
let _ = self.shutdown.shutdown(std::net::Shutdown::Both);
|
||||||
let _ = self.tx.send(TunnelMsg::Reset { stream_id: 0 });
|
let _ = self.tx.send(TunnelMsg::Reset { stream_id: 0 });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -388,6 +390,8 @@ fn session(
|
|||||||
};
|
};
|
||||||
match TcpStream::connect(("127.0.0.1", local_port)) {
|
match TcpStream::connect(("127.0.0.1", local_port)) {
|
||||||
Ok(tcp) => {
|
Ok(tcp) => {
|
||||||
|
let tcp = Arc::new(tcp);
|
||||||
|
let shutdown = tcp.clone();
|
||||||
let (stream_tx, stream_rx) = channel::<TunnelMsg>();
|
let (stream_tx, stream_rx) = channel::<TunnelMsg>();
|
||||||
let ws_tx = ws_out_tx.clone();
|
let ws_tx = ws_out_tx.clone();
|
||||||
|
|
||||||
@@ -398,6 +402,7 @@ fn session(
|
|||||||
StreamWorker {
|
StreamWorker {
|
||||||
tx: stream_tx,
|
tx: stream_tx,
|
||||||
reset_on_drop: true,
|
reset_on_drop: true,
|
||||||
|
shutdown,
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -456,19 +461,20 @@ fn session(
|
|||||||
|
|
||||||
fn spawn_local_tcp_bridge(
|
fn spawn_local_tcp_bridge(
|
||||||
stream_id: u32,
|
stream_id: u32,
|
||||||
mut tcp: TcpStream,
|
tcp: Arc<TcpStream>,
|
||||||
from_tunnel: Receiver<TunnelMsg>,
|
from_tunnel: Receiver<TunnelMsg>,
|
||||||
to_tunnel: Sender<TunnelMsg>,
|
to_tunnel: Sender<TunnelMsg>,
|
||||||
) {
|
) {
|
||||||
let _ = tcp.set_nonblocking(false);
|
let _ = tcp.set_nonblocking(false);
|
||||||
let _ = tcp.set_nodelay(true);
|
let _ = tcp.set_nodelay(true);
|
||||||
let mut tcp_read = tcp.try_clone().expect("tcp clone");
|
let tcp_read = tcp.clone();
|
||||||
let to_tunnel_read = to_tunnel.clone();
|
let to_tunnel_read = to_tunnel.clone();
|
||||||
|
|
||||||
// Local TCP read -> to tunnel
|
// Local TCP read -> to tunnel
|
||||||
std::thread::Builder::new()
|
std::thread::Builder::new()
|
||||||
.name(format!("relay-stream-{stream_id}-read"))
|
.name(format!("relay-stream-{stream_id}-read"))
|
||||||
.spawn(move || {
|
.spawn(move || {
|
||||||
|
let mut tcp_read = tcp_read.as_ref();
|
||||||
let mut buf = [0u8; 16384];
|
let mut buf = [0u8; 16384];
|
||||||
loop {
|
loop {
|
||||||
match tcp_read.read(&mut buf) {
|
match tcp_read.read(&mut buf) {
|
||||||
@@ -498,11 +504,12 @@ fn spawn_local_tcp_bridge(
|
|||||||
std::thread::Builder::new()
|
std::thread::Builder::new()
|
||||||
.name(format!("relay-stream-{stream_id}-write"))
|
.name(format!("relay-stream-{stream_id}-write"))
|
||||||
.spawn(move || {
|
.spawn(move || {
|
||||||
|
let mut tcp_write = tcp.as_ref();
|
||||||
while let Ok(msg) = from_tunnel.recv() {
|
while let Ok(msg) = from_tunnel.recv() {
|
||||||
match msg {
|
match msg {
|
||||||
TunnelMsg::Data { chunk, .. } => {
|
TunnelMsg::Data { chunk, .. } => {
|
||||||
if let Ok(data) = base64::engine::general_purpose::STANDARD.decode(&chunk) {
|
if let Ok(data) = base64::engine::general_purpose::STANDARD.decode(&chunk) {
|
||||||
if tcp.write_all(&data).is_err() {
|
if tcp_write.write_all(&data).is_err() {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -608,9 +615,52 @@ mod tests {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn dropping_a_tunnel_closes_its_local_tcp_stream() {
|
fn local_tunnel_exchanges_data_in_both_directions_before_reset() {
|
||||||
let listener = TcpListener::bind("127.0.0.1:0").unwrap();
|
let listener = TcpListener::bind("127.0.0.1:0").unwrap();
|
||||||
let tcp = TcpStream::connect(listener.local_addr().unwrap()).unwrap();
|
let tcp = Arc::new(TcpStream::connect(listener.local_addr().unwrap()).unwrap());
|
||||||
|
let shutdown = tcp.clone();
|
||||||
|
let (mut peer, _) = listener.accept().unwrap();
|
||||||
|
peer.set_read_timeout(Some(Duration::from_secs(3))).unwrap();
|
||||||
|
let (tx, rx) = channel();
|
||||||
|
let (out, replies) = channel();
|
||||||
|
spawn_local_tcp_bridge(8, tcp, rx, out);
|
||||||
|
let worker = StreamWorker {
|
||||||
|
tx,
|
||||||
|
reset_on_drop: true,
|
||||||
|
shutdown,
|
||||||
|
};
|
||||||
|
worker
|
||||||
|
.tx
|
||||||
|
.send(TunnelMsg::Data {
|
||||||
|
stream_id: 8,
|
||||||
|
chunk: base64::engine::general_purpose::STANDARD.encode(b"request"),
|
||||||
|
})
|
||||||
|
.unwrap();
|
||||||
|
let mut request = [0; 7];
|
||||||
|
peer.read_exact(&mut request).unwrap();
|
||||||
|
assert_eq!(&request, b"request");
|
||||||
|
peer.write_all(b"response").unwrap();
|
||||||
|
let mut response = Vec::new();
|
||||||
|
while response.len() < 8 {
|
||||||
|
match replies.recv_timeout(Duration::from_secs(3)).unwrap() {
|
||||||
|
TunnelMsg::Data { chunk, .. } => response.extend(
|
||||||
|
base64::engine::general_purpose::STANDARD
|
||||||
|
.decode(chunk)
|
||||||
|
.unwrap(),
|
||||||
|
),
|
||||||
|
other => panic!("Expected the local reply, got {other:?}"),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
assert_eq!(response, b"response");
|
||||||
|
drop(worker);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn dropping_a_tunnel_closes_its_local_tcp_stream() {
|
||||||
|
for _ in 0..32 {
|
||||||
|
let listener = TcpListener::bind("127.0.0.1:0").unwrap();
|
||||||
|
let tcp = Arc::new(TcpStream::connect(listener.local_addr().unwrap()).unwrap());
|
||||||
|
let shutdown = tcp.clone();
|
||||||
let (mut peer, _) = listener.accept().unwrap();
|
let (mut peer, _) = listener.accept().unwrap();
|
||||||
peer.set_read_timeout(Some(Duration::from_secs(3))).unwrap();
|
peer.set_read_timeout(Some(Duration::from_secs(3))).unwrap();
|
||||||
let (tx, rx) = channel();
|
let (tx, rx) = channel();
|
||||||
@@ -619,11 +669,17 @@ mod tests {
|
|||||||
drop(StreamWorker {
|
drop(StreamWorker {
|
||||||
tx,
|
tx,
|
||||||
reset_on_drop: true,
|
reset_on_drop: true,
|
||||||
|
shutdown,
|
||||||
});
|
});
|
||||||
match peer.read(&mut [0u8; 1]) {
|
match peer.read(&mut [0u8; 1]) {
|
||||||
Ok(0) => {},
|
Ok(0) => {}
|
||||||
Err(error) if matches!(error.kind(), std::io::ErrorKind::ConnectionReset | std::io::ErrorKind::ConnectionAborted) => {},
|
Err(error)
|
||||||
|
if matches!(
|
||||||
|
error.kind(),
|
||||||
|
std::io::ErrorKind::ConnectionReset | std::io::ErrorKind::ConnectionAborted
|
||||||
|
) => {}
|
||||||
other => panic!("The abandoned relay stream must close, got {other:?}"),
|
other => panic!("The abandoned relay stream must close, got {other:?}"),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
@@ -24,9 +24,16 @@ pub struct CrashItem {
|
|||||||
|
|
||||||
/// Lists recent crash reports from `Core/Crashes`, sorted newest first.
|
/// Lists recent crash reports from `Core/Crashes`, sorted newest first.
|
||||||
pub fn list(root: &Path, limit: usize) -> Result<Vec<CrashItem>> {
|
pub fn list(root: &Path, limit: usize) -> Result<Vec<CrashItem>> {
|
||||||
let dir = root.join("Core/Crashes");
|
let mut roots = vec![root.to_path_buf()];
|
||||||
|
roots.extend(crate::multiworld::Tree::ALL.map(|tree| crate::multiworld::tree_root(root, tree)));
|
||||||
let mut files: Vec<(PathBuf, SystemTime)> = Vec::new();
|
let mut files: Vec<(PathBuf, SystemTime)> = Vec::new();
|
||||||
if let Ok(entries) = fs::read_dir(&dir) {
|
for world_root in roots {
|
||||||
|
let entries = match fs::read_dir(world_root.join("Core/Crashes")) {
|
||||||
|
Ok(entries) => Some(entries),
|
||||||
|
Err(e) if e.kind() == std::io::ErrorKind::NotFound => None,
|
||||||
|
Err(e) => return Err(e.into()),
|
||||||
|
};
|
||||||
|
if let Some(entries) = entries {
|
||||||
for entry in entries.flatten() {
|
for entry in entries.flatten() {
|
||||||
let path = entry.path();
|
let path = entry.path();
|
||||||
if path.is_file() && path.extension().and_then(|e| e.to_str()) == Some("txt") {
|
if path.is_file() && path.extension().and_then(|e| e.to_str()) == Some("txt") {
|
||||||
@@ -38,13 +45,18 @@ pub fn list(root: &Path, limit: usize) -> Result<Vec<CrashItem>> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
files.sort_by_key(|(_, t)| std::cmp::Reverse(*t));
|
files.sort_by_key(|(_, t)| std::cmp::Reverse(*t));
|
||||||
files.truncate(limit.max(1));
|
files.truncate(limit.max(1));
|
||||||
|
|
||||||
let mut items = Vec::new();
|
let mut items = Vec::new();
|
||||||
for (path, mtime) in files {
|
for (path, mtime) in files {
|
||||||
if let Ok(content) = fs::read_to_string(&path) {
|
if let Ok(bytes) = fs::read(&path) {
|
||||||
let item = parse_crash_content(&path, mtime, &content);
|
let content = String::from_utf8_lossy(&bytes);
|
||||||
|
let mut item = parse_crash_content(&path, mtime, &content);
|
||||||
|
if let Ok(relative) = path.strip_prefix(root) {
|
||||||
|
item.id = relative.to_string_lossy().replace('\\', "/");
|
||||||
|
}
|
||||||
items.push(item);
|
items.push(item);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -237,6 +249,49 @@ fn explain(
|
|||||||
mod tests {
|
mod tests {
|
||||||
use super::*;
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn discovers_native_ansi_reports_and_ignores_dump_files() {
|
||||||
|
let root = tempfile::tempdir().unwrap();
|
||||||
|
assert!(list(root.path(), 10).unwrap().is_empty());
|
||||||
|
fs::create_dir_all(root.path().join("Core/Crashes")).unwrap();
|
||||||
|
fs::write(
|
||||||
|
root.path().join("Core/Crashes/report.txt"),
|
||||||
|
b"Exception code: C0000005 \xff\r\n",
|
||||||
|
)
|
||||||
|
.unwrap();
|
||||||
|
fs::write(root.path().join("Core/Crashes/report.dmp"), b"binary").unwrap();
|
||||||
|
let reports = list(root.path(), 10).unwrap();
|
||||||
|
assert_eq!(reports.len(), 1);
|
||||||
|
assert_eq!(reports[0].exception_code.as_deref(), Some("C0000005"));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn discovers_reports_from_all_worlds_without_filename_collisions() {
|
||||||
|
let root = tempfile::tempdir().unwrap();
|
||||||
|
for relative in [
|
||||||
|
"Core/Crashes",
|
||||||
|
".realms/secondary/Core/Crashes",
|
||||||
|
".realms/reborn/Core/Crashes",
|
||||||
|
] {
|
||||||
|
fs::create_dir_all(root.path().join(relative)).unwrap();
|
||||||
|
fs::write(
|
||||||
|
root.path().join(relative).join("same.txt"),
|
||||||
|
b"Exception code: C0000005",
|
||||||
|
)
|
||||||
|
.unwrap();
|
||||||
|
}
|
||||||
|
let reports = list(root.path(), 10).unwrap();
|
||||||
|
assert_eq!(reports.len(), 3);
|
||||||
|
assert_eq!(
|
||||||
|
reports
|
||||||
|
.iter()
|
||||||
|
.map(|r| &r.id)
|
||||||
|
.collect::<std::collections::HashSet<_>>()
|
||||||
|
.len(),
|
||||||
|
3
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn parses_assertion_report() {
|
fn parses_assertion_report() {
|
||||||
let report = r#"Revision: AzerothCore rev. df5bcdf26092 2026-10-02 22:08:42 +0500 (coa-bots branch) (Win64, RelWithDebInfo, Static)
|
let report = r#"Revision: AzerothCore rev. df5bcdf26092 2026-10-02 22:08:42 +0500 (coa-bots branch) (Win64, RelWithDebInfo, Static)
|
||||||
|
|||||||
+957
-161
File diff suppressed because it is too large.
Load diff
File diff suppressed because it is too large.
Load diff
@@ -0,0 +1,116 @@
|
|||||||
|
{
|
||||||
|
"Ascension.exe": "e2c347019d554a59639e5978fd68e50e906973ab313c6573cc56ca82e8e3c547",
|
||||||
|
"Data/Retail/Assets/EquipmentFitting/1068-1.bin": "332d2c38b037a118f262bbb3096a01ebfb33c5347e96bbfb64157437b300281b",
|
||||||
|
"Data/Retail/Assets/EquipmentFitting/60-0.bin": "ffbf6efc9ea09b0c442f048c5bc7b4c5975258045cfddedd9a77a93363312b5e",
|
||||||
|
"Data/Retail/Assets/EquipmentFitting/60-1.bin": "36ceed2a55756f3322e018938809acea5124351161405058ef27d100173778da",
|
||||||
|
"Data/Retail/Assets/EquipmentFitting/61-0.bin": "3b302a4055d1e795c451b02e38dfe8007527ee1bc5f926ebcd6ef17f433cd232",
|
||||||
|
"Data/Retail/Assets/EquipmentFitting/61-1.bin": "c42df399ed99be3c7ce1b5fdb95a873711011713a4cd867bc226a14b1ce0e8ca",
|
||||||
|
"Data/Retail/Assets/EquipmentFitting/65-0.bin": "8ce3f884ae197d14dff0f955c2cf05abb716742c8aff79f7af1cec5cf7225f04",
|
||||||
|
"Data/Retail/Assets/EquipmentFitting/68-0.bin": "f1d878f0f943cbdb8025af8daac4a38c1d1e159bd961d9d76f225931c11648ac",
|
||||||
|
"Data/Retail/Assets/EquipmentFitting/68-1.bin": "2ccbae634384200340c0cc3dca36a7a014a8ddad110598e4470ff1b266576465",
|
||||||
|
"Data/Retail/Assets/EquipmentFitting/73-0.bin": "5530882678f677ad47987ce906e851338a35f7d9737e3f9d829938027b8af67f",
|
||||||
|
"Data/Retail/Assets/EquipmentFitting/74-0.bin": "53a7be86b3bfdd6995406c706df3ca091484206d8141cebb39113c714500384a",
|
||||||
|
"Data/Retail/Assets/EquipmentFitting/74-1.bin": "e688c55a355231978d42480a003c26d379460f5931c2469c119ecb073ea153e1",
|
||||||
|
"Data/Retail/Assets/EquipmentFitting/75-0.bin": "289abc71c6df0e031a64d62a40e658eaefd37e45373a062ca52f08fbe803500c",
|
||||||
|
"Data/Retail/Assets/EquipmentFitting/76-0.bin": "63a493e70b91f59ff49f1942d959df986062bd267fe2ba589f344963df771021",
|
||||||
|
"Data/Retail/Assets/EquipmentFitting/77-0.bin": "b1366ce0dc4f31cb8c8c9705be2da565df4b905224af04b6b88f8c8e9c87e3c9",
|
||||||
|
"Data/Retail/Assets/EquipmentFitting/78-0.bin": "7b0031fb12ab19020005bdccacca2dd3991349c36949a58b035992585b4134db",
|
||||||
|
"Data/patch-T.MPQ": "fe597138ab7f56881b5f4f27d6dc9d81bb278b483ca0d91b7207ffd4a5ae7bfd",
|
||||||
|
"Data/patch-ZE1.MPQ": "69d79dbbea54ec0312c37770debc79c7bc9ce2e21eedef99c03cd8d911955283",
|
||||||
|
"Data/patch-ZE2.MPQ": "1a41cae77ad730e9cf69e8d63fd12ae3a579418bb550d351fff469573a97ac3c",
|
||||||
|
"Data/patch-ZE3.MPQ": "b587202c21b6f580682b601b7c2e905fbfa766276e74733db55c1bddbffb7f87",
|
||||||
|
"Data/patch-ZE5.MPQ": "476b5a1fcf69f64fdb281e3b445362b936d016066ccd12f897acfcf200d6c0cf",
|
||||||
|
"Data/patch-ZE6.MPQ": "762592c9ed950b4a7b6c7d85d45050b30fa3f35d53e348ee1e1516fdbb7e5484",
|
||||||
|
"Data/patch-ZE7.MPQ": "de54b0189d242763d2872223419a259b6b8a4b380c24b50a2ef9c6fa44466248",
|
||||||
|
"Data/patch-ZE8.MPQ": "1bc5691fb84a84f3e7a0a70baaa9192a97b4ec5906ee37c85838ffe08adef934",
|
||||||
|
"Data/patch-ZE9.MPQ": "d49c94463e9548e76378ce2c0454d8f204f0745c8c0de32b6dce7f0b0fd67c4a",
|
||||||
|
"Data/patch-ZEA.MPQ": "78fd10ec5262ae2417eba9700d2172553bbc1e5cfb0b597aada8f1753ca46d9d",
|
||||||
|
"Data/patch-ZES.MPQ": "a2d9348f917f745c7aa25b2eed96efa312f7b2d2f62cb86a4f2eaabc2dfa895f",
|
||||||
|
"Data/patch-ZG.MPQ": "48979e1fda775f8deb47bffa48e0a468595d4c71286fee518f51dc5801c5ca39",
|
||||||
|
"Data/patch-ZH.MPQ": "5e1d2fe287053abba703d7af381e10096c6525ba477ffed3971c2fc4f93e919c",
|
||||||
|
"Data/patch-ZHA.MPQ": "0fc6ebeafe1d14192dc64bafc90bde3c49230df1297f98bf65900a3bcf953617",
|
||||||
|
"Data/patch-ZHM.MPQ": "317d3ae00f0bd674b358af07544976acb7804aa6d8b19d1788ad96030e8c9bf0",
|
||||||
|
"Data/patch-ZJ.MPQ": "f821e99add86ef68d108c5ec466328c97677d3ed52f7944e200f3fe38c13b4de",
|
||||||
|
"Data/patch-ZK.MPQ": "444d0ecb72c1e990509d53e3cfa5b7634c816733533e8a97e5d7f5653ee32cce",
|
||||||
|
"Data/patch-ZM.MPQ": "424ab1978986e854551633983a94bd15beba6328aabea8c02f98eaa32f6f0b61",
|
||||||
|
"Data/patch-ZVU.MPQ": "c679b85a2e97344395756b54d2cf6abefe4e80e74944cb55b6e573ad17b7d020",
|
||||||
|
"Data/patch-ZZE.MPQ": "4b1e289e12c82644cb78f50170e6b5fd53918eb2de834f9e0cebddd81873a8bb",
|
||||||
|
"Data/patch-ZZR.MPQ": "5a7575e592dc0c8a6913e0d946bbe06fa0ca2e4d817ef1f8548d3d13142bcbd3",
|
||||||
|
"Data/patch-ZZS.MPQ": "533fd69d5784d83e872a5a28d27301dc9ab5d0cb925f8b2116926854e4a0a5b8",
|
||||||
|
"Data/patch-ZZT.MPQ": "e60dab63fe5650fdf5f0846ea6d4136219293bcfdad46d9b796697faeff9ab4c",
|
||||||
|
"Data/patch-ZZU.MPQ": "0311de8f034eae7dec1bd2c92b1fe6c741cbaf53da62c7609cd12b6c37908e47",
|
||||||
|
"Data/patch-ZZV.MPQ": "3b04008905e7185d165827d68f7ca228dda8272816364f7d71874ecc83b64f0e",
|
||||||
|
"Data/patch-ZZW.MPQ": "3bbbc72901fd2d662113036485c380701e693f5a39ba9479af306bf2fa2030bd",
|
||||||
|
"Data/patch-ZZX.MPQ": "4c12608089cfe356f7c8882d66db90239ed3ec8ddd980d91d7a3a488680f3c88",
|
||||||
|
"Data/patch-ZZZ.MPQ": "566aaadf501af42e29a828b1bc2edbd36d436288fb309fe423bd74b9619bf593",
|
||||||
|
"Data/patch-ZZZA.MPQ": "57ccbdc0a66000767554ffd194088df6d602ddd8341a141bca8201e7d5435889",
|
||||||
|
"Data/patch-ZZZC.MPQ": "691a53f6325c2615a64ced0802f18bc4d96e99c62aaa606fc930f9406ee74cdf",
|
||||||
|
"Data/patch-ZZZD.MPQ": "ca893cf8129f6fd442a63f0697a8ddea88546e3ce71bde713be2cc832b892bc9",
|
||||||
|
"Data/patch-ZZZE.MPQ": "2e245ee0fe3b913087eed399062fda5843d98b04afac38024f7c64ac3bf43e18",
|
||||||
|
"Data/patch-ZZZF.MPQ": "40eac695cfcafb598b8376f3b9a61ecc037e4d445b87279cfe387a91edad32c3",
|
||||||
|
"Data/patch-ZZZZ.MPQ": "860c990db3b4185fdc36e1a001d3ca3507a68253a4506793a115f86eb0892a15",
|
||||||
|
"EsteriaAppearance.bin": "90d9cfaeaf6de10f014f1d1610ea10453ec9b240255759aea99513cac488a3ec",
|
||||||
|
"EsteriaAppearance.dll": "88e268d3be9eca3b0644f543d823f4bdcc04a9700a6e8ed73fd2a1260ad191af",
|
||||||
|
"EsteriaAppearanceGeometry.bin": "19de5b4b4f79778ea5316659efc2f66c6edb6b5149c46efa47c46bfa4ec6904c",
|
||||||
|
"EsteriaAppearanceMaterials.bin": "f72f027f54a55c05aa0f76b457b97b484fe0e1aedc0e068cc0e0ca53e1878cba",
|
||||||
|
"EsteriaBanshee.bin": "d3fe66caa6a0ecba96bddb07ac1cbdb915694e87fc1608da0fdabecdf9ffea4d",
|
||||||
|
"EsteriaBansheeTextures.bin": "837774377ca055e6a5c79c1a4cfd8151e7c1f7ce2c16990b00fd445281137433",
|
||||||
|
"EsteriaCentaur.bin": "d63f0b7d21cee67d234d134e832fe6d55c398f2b63f9f6c191dcfa9671637185",
|
||||||
|
"EsteriaCentaurTextures.bin": "837774377ca055e6a5c79c1a4cfd8151e7c1f7ce2c16990b00fd445281137433",
|
||||||
|
"EsteriaCosmeticWings.bin": "57352c28459d073a29b3014d33b70f3b3756afa37fa9583ef6b30d503422ac3f",
|
||||||
|
"EsteriaDrakonid.bin": "95440ee9c065ef20bb7fed6158d20623d68745291cedc2726fc746ff54601f95",
|
||||||
|
"EsteriaDrakonidCoverage.bin": "9cdc227f08329e1245d2b864a996e7a772c96ecdbe5d81925f4d60cdbe4fa11e",
|
||||||
|
"EsteriaDrakonidTextures.bin": "1ba9133a75dad291d98a068b2dcde01f31a897a1764cd7f3e2c316c288a8f605",
|
||||||
|
"EsteriaEarthen.bin": "8a0db93ba2d5c756b44ed84f2f7bc7c15eef13be6a7d87baf1383c6c0c624e02",
|
||||||
|
"EsteriaEthereal.bin": "ada3b7588511a847dd5154d91e3041e9f7f193998b06bfede5e0afc32570b48c",
|
||||||
|
"EsteriaEtherealTextures.bin": "837774377ca055e6a5c79c1a4cfd8151e7c1f7ce2c16990b00fd445281137433",
|
||||||
|
"EsteriaFaceless.bin": "1c5a1d7a6b1db6984a8e41bc4804e9f7c50d65dcdbb8c0a9d1a9e8af8c91bd8f",
|
||||||
|
"EsteriaFacelessTextures.bin": "837774377ca055e6a5c79c1a4cfd8151e7c1f7ce2c16990b00fd445281137433",
|
||||||
|
"EsteriaGnoll.bin": "cfacc8e681bb8e54a4f01ee9c12a91bf0bd23a23527bb548d4dc21ec1b33eea2",
|
||||||
|
"EsteriaGnollTextures.bin": "1ba9133a75dad291d98a068b2dcde01f31a897a1764cd7f3e2c316c288a8f605",
|
||||||
|
"EsteriaHaranir.bin": "59f31d00e372fd2646e1cf0d9d3d5d671b31edd60ff7b862f8d1ce7e53ba1f2f",
|
||||||
|
"EsteriaHaranirTextures.bin": "99948ca570be2d376f0c67e3b8088739b6fa9f9d2c73985e19f68df77689a229",
|
||||||
|
"EsteriaHighmountain.bin": "e83349252ad2687ac23fcfc5623db7401cf32e5faf47a5a7be20c2f94b014938",
|
||||||
|
"EsteriaHozen.bin": "739bc3775388976f5c09bcbf3a98b62d804dff78d545e25a41d07dd99b5fddc5",
|
||||||
|
"EsteriaHozenTextures.bin": "837774377ca055e6a5c79c1a4cfd8151e7c1f7ce2c16990b00fd445281137433",
|
||||||
|
"EsteriaKvItems.bin": "fc5f9d86114234b38dbb0e14a6a5ec16249eaa92a73411a7fc371a950549dcce",
|
||||||
|
"EsteriaKvSkins.bin": "60b2b899f5f83137368514928f92f3b04c0fae058f534c487ddbe913ee4bec18",
|
||||||
|
"EsteriaKyrian.bin": "9329147f08805ff4003f9e062fea7c6ea8fdd8c4d6a40de63a6d228ebe1b7c9a",
|
||||||
|
"EsteriaKyrianTextures.bin": "837774377ca055e6a5c79c1a4cfd8151e7c1f7ce2c16990b00fd445281137433",
|
||||||
|
"EsteriaMantid.bin": "71536dee6c2abd0b0e13f33bc73cad7e6fb1b0fc1f6912a95c55d57bc7ee1787",
|
||||||
|
"EsteriaMantidTextures.bin": "837774377ca055e6a5c79c1a4cfd8151e7c1f7ce2c16990b00fd445281137433",
|
||||||
|
"EsteriaNaga.bin": "e87547cff5d09500c294f8b06935d134cdd0bbb962e294a72de09404505bd8b3",
|
||||||
|
"EsteriaNagaTextures.bin": "57ec560f99c1d48ac1e8f6a797c156513b99e7d349e3071afe405f812d159ae3",
|
||||||
|
"EsteriaSaberon.bin": "7735c9325c807c5125760d87f323d6b7d4162fb542c1d8b5f435ea2d6b9a4daa",
|
||||||
|
"EsteriaSaberonCoverage.bin": "9cdc227f08329e1245d2b864a996e7a772c96ecdbe5d81925f4d60cdbe4fa11e",
|
||||||
|
"EsteriaSaberonTextures.bin": "1ba9133a75dad291d98a068b2dcde01f31a897a1764cd7f3e2c316c288a8f605",
|
||||||
|
"EsteriaSethrak.bin": "bd14857a8c11fdf8027128763293701586b2102f9a6539d33a727014789fd606",
|
||||||
|
"EsteriaSethrakTextures.bin": "d2b2cf58087a391f00198008fe871edd400ddf28d54a3a05674df74c5198528a",
|
||||||
|
"EsteriaSlime.bin": "491e942ceb6abda83c0249afebae7c9c43af3897b35e45fa33d6f9177ecbc177",
|
||||||
|
"EsteriaSlimeTextures.bin": "837774377ca055e6a5c79c1a4cfd8151e7c1f7ce2c16990b00fd445281137433",
|
||||||
|
"EsteriaTarasek.bin": "f718444d5ec36f7aff018883486ae1981151fe6e01f5b7781d68d74e9fadfa47",
|
||||||
|
"EsteriaTarasekTextures.bin": "1ba9133a75dad291d98a068b2dcde01f31a897a1764cd7f3e2c316c288a8f605",
|
||||||
|
"EsteriaThinHuman.bin": "bc12e5ca2c087ca0a8642ff6cd8e78fe2e1f85928518b12c19b4245a8320585d",
|
||||||
|
"EsteriaThinHumanTextures.bin": "27488a7494fa9733b53118d1d0f4acef50a9e19004f81f9c8a614b10f4c3fd5e",
|
||||||
|
"EsteriaTuskarr.bin": "ecbe7ef490ba67eca029a57639192db61238522618491549766fe38529914387",
|
||||||
|
"EsteriaTuskarrTextures.bin": "e2116c2c83adea079126fd5da765d20da24f044d4f161c4124e4368cb3d6bc71",
|
||||||
|
"EsteriaVenthyr.bin": "5bcf7804363e59b3c922830d06de17bbd348b9967307f39b7d72bc09f58814eb",
|
||||||
|
"EsteriaVenthyrTextures.bin": "837774377ca055e6a5c79c1a4cfd8151e7c1f7ce2c16990b00fd445281137433",
|
||||||
|
"EsteriaVorkai.bin": "d6d2088c7e867b5db437e9afc2d323c22d830c6f84a3598415eedcaa27e2461f",
|
||||||
|
"EsteriaVorkaiTextures.bin": "837774377ca055e6a5c79c1a4cfd8151e7c1f7ce2c16990b00fd445281137433",
|
||||||
|
"EsteriaVrykul.bin": "39e2b7b4c67997dbbd34bae840bd606a59290f7f2fc82565a0ba00090335415c",
|
||||||
|
"EsteriaVrykulTextures.bin": "46098750a0e235724c6e9cc8d9d4e26550aa47bef95fd5f0f82efe5e945bf296",
|
||||||
|
"EsteriaVulpera.bin": "c5434993b9af4a17d881965e4735cd2ac379e39c7142aac9844adff9528562d4",
|
||||||
|
"EsteriaVulperaTextures.bin": "1ab844e74684aced2b069f1b91cd563aade45e05bd5e23f866a6c0c301cb098e",
|
||||||
|
"Interface/AddOns/CoAHideArmor/CoAHideArmor.lua": "8c1c7403524fc9bd56c0809b4101b141da700ba163701209bf1420f2ef106aa7",
|
||||||
|
"Interface/AddOns/CoAHideArmor/CoAHideArmor.toc": "123580d92fd5ceee258e96296f42c359b7e83cdff151af49c50c6c4e2059677c",
|
||||||
|
"Interface/AddOns/CoAQuestSafe/CoAQuestSafe.lua": "062de55c91228971553f482fd2c8753f4752993b4e8e49d4ded04fa18b98bde7",
|
||||||
|
"Interface/AddOns/CoAQuestSafe/CoAQuestSafe.toc": "890bb9d1087e236f4823603f5df3ab0e316dbb65c28feebbda08fb0ab53a408f",
|
||||||
|
"Interface/AddOns/CoAWC2Cursor/CoAWC2Cursor.lua": "1cf9537ff5f10b77250fea4407aea1008da690afe102ed6ed2dac21f79638cfa",
|
||||||
|
"Interface/AddOns/CoAWC2Cursor/CoAWC2Cursor.toc": "48ce695dce712b3643ebe13a77e318d623c964acc69479b8fc8cc675099801bf",
|
||||||
|
"Interface/AddOns/CoA_TalentReset/CoA_TalentReset.lua": "827d756d5948ef918fafaf8b869290b3a1faa4e4cc21b19b512a00d4509f3d41",
|
||||||
|
"Interface/AddOns/CoA_TalentReset/CoA_TalentReset.toc": "16298c04af68e68d6445e7a11f42aee525dd4145f85d2771ff434fb7c6e95a85",
|
||||||
|
"dinput8.dll": "f8de78606c241fb3911dce22faf68f5b9f9885b142b183c1e2c09ddc8f7e380c",
|
||||||
|
"wc2_human.cur": "f609736e29596bb386ef1597b157d211e01a86d32c2a929e256c581c37d71791",
|
||||||
|
"wc2_orc.cur": "baa512c9b9045762ba35b6e0d35b8f79c54b7649f35cc9c0e0cc8c168a1e5a97"
|
||||||
|
}
|
||||||
@@ -718,6 +718,24 @@ pub fn export_package(
|
|||||||
"maintenance.json",
|
"maintenance.json",
|
||||||
serde_json::to_string_pretty(&maintenance)?.as_bytes(),
|
serde_json::to_string_pretty(&maintenance)?.as_bytes(),
|
||||||
)?;
|
)?;
|
||||||
|
for (realm, prefix) in [("primary", ""), ("secondary", ".realms/secondary/"), ("reborn", ".realms/reborn/")] {
|
||||||
|
let state = root.join(format!("{prefix}.state"));
|
||||||
|
if let Ok(owner) = fs::read_to_string(state.join("control-owner.json")) {
|
||||||
|
add(&format!("launcher/{realm}/control-owner.json"), redact_json(&owner).as_bytes())?;
|
||||||
|
}
|
||||||
|
for (path, _, _) in newest_files(&state.join("diagnostics"), "jsonl", 20)
|
||||||
|
.into_iter()
|
||||||
|
.filter(|(path, _, _)| path.file_name().is_some_and(|name| name.to_string_lossy().starts_with("manage-")))
|
||||||
|
.take(5)
|
||||||
|
{
|
||||||
|
let bytes = tail(&path, 512 * 1024);
|
||||||
|
let entries: Vec<serde_json::Value> = String::from_utf8_lossy(&bytes).lines().map(|line| {
|
||||||
|
serde_json::from_str(&redact_json(line)).unwrap_or_else(|_| serde_json::Value::String(redact(line)))
|
||||||
|
}).collect();
|
||||||
|
add(&format!("launcher/{realm}/{}.json", path.file_stem().unwrap_or_default().to_string_lossy()),
|
||||||
|
serde_json::to_string_pretty(&entries)?.as_bytes())?;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Logs. The newest update logs of the repack's own updater are added under their own names.
|
// Logs. The newest update logs of the repack's own updater are added under their own names.
|
||||||
let mut logs: Vec<(String, PathBuf)> = vec![
|
let mut logs: Vec<(String, PathBuf)> = vec![
|
||||||
@@ -1257,6 +1275,12 @@ real error
|
|||||||
fs::create_dir_all(meta_dir.join("diagnostics")).unwrap();
|
fs::create_dir_all(meta_dir.join("diagnostics")).unwrap();
|
||||||
fs::write(meta_dir.join("diagnostics/schema-validation-CoA-test.json"), r#"{"problems":[{"table":"creature_display_preset","column":"display_id","detail":"default mismatch"}],"password":"schema-secret"}"#).unwrap();
|
fs::write(meta_dir.join("diagnostics/schema-validation-CoA-test.json"), r#"{"problems":[{"table":"creature_display_preset","column":"display_id","detail":"default mismatch"}],"password":"schema-secret"}"#).unwrap();
|
||||||
fs::write(meta_dir.join("diagnostics/database-recovery-test.json"), r#"{"objects":[{"database":"acore_characters","kind":"TRIGGER","name":"user_character_trigger"}],"password":"recovery-secret"}"#).unwrap();
|
fs::write(meta_dir.join("diagnostics/database-recovery-test.json"), r#"{"objects":[{"database":"acore_characters","kind":"TRIGGER","name":"user_character_trigger"}],"password":"recovery-secret"}"#).unwrap();
|
||||||
|
for prefix in ["", ".realms/secondary/", ".realms/reborn/"] {
|
||||||
|
let state = root.join(format!("{prefix}.state"));
|
||||||
|
fs::create_dir_all(state.join("diagnostics")).unwrap();
|
||||||
|
fs::write(state.join("control-owner.json"), r#"{"pid":42,"action":"start-all","password":"launcher-owner-secret"}"#).unwrap();
|
||||||
|
fs::write(state.join("diagnostics/manage-test.jsonl"), "{\"event\":\"launcher-stage-test\",\"password\":\"launcher-stage-secret\"}\n{\"event\":\"wait_ready.error\",\"port\":3307}\n").unwrap();
|
||||||
|
}
|
||||||
let meta = InstallMeta::new(InstallKind::Imported, &root);
|
let meta = InstallMeta::new(InstallKind::Imported, &root);
|
||||||
let report = run(&root, &meta);
|
let report = run(&root, &meta);
|
||||||
let zip_path = d.path().join("diag.zip");
|
let zip_path = d.path().join("diag.zip");
|
||||||
@@ -1289,6 +1313,9 @@ real error
|
|||||||
assert!(all.contains("checking updates") && all.contains("1234"));
|
assert!(all.contains("checking updates") && all.contains("1234"));
|
||||||
assert!(all.contains("lockFilePresent") && all.contains("does not establish"));
|
assert!(all.contains("lockFilePresent") && all.contains("does not establish"));
|
||||||
assert!(!all.contains("owner-secret"));
|
assert!(!all.contains("owner-secret"));
|
||||||
|
assert!(all.contains("launcher-stage-test"));
|
||||||
|
assert!(all.contains("wait_ready.error"));
|
||||||
|
assert!(!all.contains("launcher-stage-secret"));
|
||||||
assert_eq!(fs::read(meta_dir.join("update.lock")).unwrap(), b"");
|
assert_eq!(fs::read(meta_dir.join("update.lock")).unwrap(), b"");
|
||||||
assert!(
|
assert!(
|
||||||
!all.contains("hunter2")
|
!all.contains("hunter2")
|
||||||
|
|||||||
@@ -31,36 +31,17 @@ impl Verb {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn timeout(self, root: &Path) -> Duration {
|
fn timeout(self, _root: &Path) -> Duration {
|
||||||
match self {
|
match self {
|
||||||
Verb::StartAll | Verb::StartWorld if squid_enabled(root) => Duration::from_secs(2700),
|
// Includes database startup, optional bot provisioning and the shared 25-minute
|
||||||
Verb::StartAll | Verb::StartWorld => Duration::from_secs(720),
|
// world/console wait in launcher_bridge.py, even for older installed scripts.
|
||||||
|
Verb::StartAll | Verb::StartWorld => Duration::from_secs(3600),
|
||||||
Verb::StartMysql => Duration::from_secs(360),
|
Verb::StartMysql => Duration::from_secs(360),
|
||||||
Verb::StopAll => Duration::from_secs(240),
|
Verb::StopAll => Duration::from_secs(240),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
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,
|
||||||
@@ -122,7 +103,69 @@ pub(crate) fn validate_update(root: &Path) -> Result<DriverOutcome> {
|
|||||||
run_inner(root, Verb::StartAll, true)
|
run_inner(root, Verb::StartAll, true)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn force_stop(root: &Path) -> Result<DriverOutcome> {
|
||||||
|
if crate::docker::is_docker(root) {
|
||||||
|
return Err(Error::Invalid(
|
||||||
|
"Forced shutdown is only available for Windows repacks.".into(),
|
||||||
|
));
|
||||||
|
}
|
||||||
|
for tree in crate::multiworld::Tree::ALL {
|
||||||
|
let path = crate::multiworld::tree_root(root, tree);
|
||||||
|
if crate::multiworld::tree_running(root, tree)
|
||||||
|
|| !crate::process::find_by_exe(&path.join("Core/worldserver.exe")).is_empty()
|
||||||
|
{
|
||||||
|
let child = fsx::ensure_within(root, &path)?;
|
||||||
|
let out = run_inner_mode(&child, Verb::StopAll, false, true)?;
|
||||||
|
if !out.ok || crate::multiworld::tree_running(root, tree) {
|
||||||
|
return Err(Error::Invalid(format!(
|
||||||
|
"An extra world could not stop; the shared database was left running. {}",
|
||||||
|
out.output
|
||||||
|
)));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
run_inner_mode(root, Verb::StopAll, false, true)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn recover_world_for_forced_stop(root: &Path) -> Result<()> {
|
||||||
|
let worlds = crate::process::find_by_exe(&root.join("Core/worldserver.exe"));
|
||||||
|
if worlds.len() > 1 {
|
||||||
|
return Err(Error::Invalid(
|
||||||
|
"More than one world process belongs to this folder; its database was left running."
|
||||||
|
.into(),
|
||||||
|
));
|
||||||
|
}
|
||||||
|
if let Some(world) = worlds.first() {
|
||||||
|
if !crate::process::is_alive(world) {
|
||||||
|
return Err(Error::Invalid(
|
||||||
|
"The world process identity changed; retry the stop.".into(),
|
||||||
|
));
|
||||||
|
}
|
||||||
|
if crate::process::read_state_record(root, "world")
|
||||||
|
.is_none_or(|saved| !saved.same_as(world))
|
||||||
|
{
|
||||||
|
let record = root.join(".state/world.json");
|
||||||
|
let previous = root.join(".state/world-before-forced-stop-recovery.json");
|
||||||
|
if record.is_file() && !previous.exists() {
|
||||||
|
fsx::atomic_write(&previous, &std::fs::read(&record)?)?;
|
||||||
|
}
|
||||||
|
fsx::atomic_write_json(&record, world)?;
|
||||||
|
tracing::warn!(pid = world.pid, root = %root.display(), "Recovered owned world identity before an explicitly requested forced stop");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
fn run_inner(root: &Path, verb: Verb, validating_update: bool) -> Result<DriverOutcome> {
|
fn run_inner(root: &Path, verb: Verb, validating_update: bool) -> Result<DriverOutcome> {
|
||||||
|
run_inner_mode(root, verb, validating_update, false)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn run_inner_mode(
|
||||||
|
root: &Path,
|
||||||
|
verb: Verb,
|
||||||
|
validating_update: bool,
|
||||||
|
force: 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) {
|
let _update_lock = if !validating_update && matches!(verb, Verb::StartAll | Verb::StartWorld) {
|
||||||
Some(crate::update::operation_lock_for(
|
Some(crate::update::operation_lock_for(
|
||||||
@@ -143,7 +186,7 @@ fn run_inner(root: &Path, verb: Verb, validating_update: bool) -> Result<DriverO
|
|||||||
prepare_headless_world(&root, verb)?;
|
prepare_headless_world(&root, verb)?;
|
||||||
return crate::docker::run(&root, verb);
|
return crate::docker::run(&root, verb);
|
||||||
}
|
}
|
||||||
if verb == Verb::StopAll {
|
if verb == Verb::StopAll && !force {
|
||||||
crate::multiworld::stop(&root)?;
|
crate::multiworld::stop(&root)?;
|
||||||
}
|
}
|
||||||
if verb == Verb::StartAll {
|
if verb == Verb::StartAll {
|
||||||
@@ -186,12 +229,19 @@ fn run_inner(root: &Path, verb: Verb, validating_update: bool) -> Result<DriverO
|
|||||||
if matches!(verb, Verb::StopAll | Verb::StartMysql | Verb::StartAll) {
|
if matches!(verb, Verb::StopAll | Verb::StartMysql | Verb::StartAll) {
|
||||||
recover_mysql_launcher_state(&root, verb != Verb::StopAll)?;
|
recover_mysql_launcher_state(&root, verb != Verb::StopAll)?;
|
||||||
}
|
}
|
||||||
|
if force {
|
||||||
|
recover_world_for_forced_stop(&root)?;
|
||||||
|
}
|
||||||
let mut cmd = Command::new(&python);
|
let mut cmd = Command::new(&python);
|
||||||
|
if validating_update {
|
||||||
|
// Isolated startup must use the port from its temporary auth config.
|
||||||
|
cmd.env_remove("AC_REALM_SERVER_PORT");
|
||||||
|
}
|
||||||
cmd.arg("-B")
|
cmd.arg("-B")
|
||||||
.arg("-c")
|
.arg("-c")
|
||||||
.arg(LAUNCH_SCRIPT)
|
.arg(LAUNCH_SCRIPT)
|
||||||
.arg(&script)
|
.arg(&script)
|
||||||
.arg(verb.arg())
|
.arg(if force { "force-stop-all" } else { verb.arg() })
|
||||||
.current_dir(&root)
|
.current_dir(&root)
|
||||||
.stdin(Stdio::null())
|
.stdin(Stdio::null())
|
||||||
.stdout(Stdio::piped())
|
.stdout(Stdio::piped())
|
||||||
@@ -230,6 +280,13 @@ fn run_inner(root: &Path, verb: Verb, validating_update: bool) -> Result<DriverO
|
|||||||
let mut output = out_t.join().unwrap_or_default();
|
let mut output = out_t.join().unwrap_or_default();
|
||||||
output.push_str(&err_t.join().unwrap_or_default());
|
output.push_str(&err_t.join().unwrap_or_default());
|
||||||
let mut output = output.trim().to_string();
|
let mut output = output.trim().to_string();
|
||||||
|
if status.is_none() {
|
||||||
|
output.push_str(&format!(
|
||||||
|
"\nLauncher {} exceeded its {} second deadline; check the server logs.",
|
||||||
|
verb.arg(),
|
||||||
|
verb.timeout(&root).as_secs()
|
||||||
|
));
|
||||||
|
}
|
||||||
let (ok, exit_code) = match status {
|
let (ok, exit_code) = match status {
|
||||||
Some(st) => (st.success(), st.code()),
|
Some(st) => (st.success(), st.code()),
|
||||||
None => (false, None),
|
None => (false, None),
|
||||||
@@ -290,6 +347,9 @@ fn prepare_headless_world(root: &Path, verb: Verb) -> Result<()> {
|
|||||||
if !matches!(verb, Verb::StartAll | Verb::StartWorld) {
|
if !matches!(verb, Verb::StartAll | Verb::StartWorld) {
|
||||||
return Ok(());
|
return Ok(());
|
||||||
}
|
}
|
||||||
|
std::fs::create_dir_all(root.join("Core/Crashes"))?;
|
||||||
|
let probe = tempfile::NamedTempFile::new_in(root.join("Core/Crashes"))?;
|
||||||
|
probe.close()?;
|
||||||
for relative in [
|
for relative in [
|
||||||
"Settings/worldserver.conf.template",
|
"Settings/worldserver.conf.template",
|
||||||
"Core/configs/worldserver.conf",
|
"Core/configs/worldserver.conf",
|
||||||
@@ -587,6 +647,7 @@ mod tests {
|
|||||||
let folder = tempfile::tempdir().unwrap();
|
let folder = tempfile::tempdir().unwrap();
|
||||||
let root = folder.path();
|
let root = folder.path();
|
||||||
prepare_headless_world(root, Verb::StartAll).unwrap();
|
prepare_headless_world(root, Verb::StartAll).unwrap();
|
||||||
|
assert!(root.join("Core/Crashes").is_dir());
|
||||||
std::fs::create_dir_all(root.join("Core/configs")).unwrap();
|
std::fs::create_dir_all(root.join("Core/configs")).unwrap();
|
||||||
let path = root.join("Core/configs/worldserver.conf");
|
let path = root.join("Core/configs/worldserver.conf");
|
||||||
for original in [
|
for original in [
|
||||||
@@ -604,7 +665,7 @@ mod tests {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn large_squid_provisioning_has_time_to_finish_without_extending_shutdown() {
|
fn slow_world_startup_has_time_with_either_bot_system_without_extending_shutdown() {
|
||||||
let folder = tempfile::tempdir().unwrap();
|
let folder = tempfile::tempdir().unwrap();
|
||||||
let modules = folder.path().join("Core/configs/modules");
|
let modules = folder.path().join("Core/configs/modules");
|
||||||
std::fs::create_dir_all(&modules).unwrap();
|
std::fs::create_dir_all(&modules).unwrap();
|
||||||
@@ -615,7 +676,7 @@ mod tests {
|
|||||||
.unwrap();
|
.unwrap();
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
Verb::StartAll.timeout(folder.path()),
|
Verb::StartAll.timeout(folder.path()),
|
||||||
Duration::from_secs(2700)
|
Duration::from_secs(3600)
|
||||||
);
|
);
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
Verb::StopAll.timeout(folder.path()),
|
Verb::StopAll.timeout(folder.path()),
|
||||||
@@ -624,7 +685,7 @@ mod tests {
|
|||||||
std::fs::write(modules.join("playerbots.conf"), "AiPlayerbot.Enabled = 0\n").unwrap();
|
std::fs::write(modules.join("playerbots.conf"), "AiPlayerbot.Enabled = 0\n").unwrap();
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
Verb::StartWorld.timeout(folder.path()),
|
Verb::StartWorld.timeout(folder.path()),
|
||||||
Duration::from_secs(720)
|
Duration::from_secs(3600)
|
||||||
);
|
);
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
Verb::StartMysql.timeout(folder.path()),
|
Verb::StartMysql.timeout(folder.path()),
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
import runpy
|
import runpy
|
||||||
import sys
|
import sys
|
||||||
|
import time
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
|
|
||||||
script = sys.argv[1]
|
script = sys.argv[1]
|
||||||
@@ -7,21 +8,42 @@ sys.path.insert(0, str(Path(script).resolve().parent))
|
|||||||
sys.argv = sys.argv[1:]
|
sys.argv = sys.argv[1:]
|
||||||
launcher = runpy.run_path(script, run_name="coa_manager_launcher")
|
launcher = runpy.run_path(script, run_name="coa_manager_launcher")
|
||||||
original_wait = launcher["wait_ready"]
|
original_wait = launcher["wait_ready"]
|
||||||
|
world_deadline = None
|
||||||
|
|
||||||
|
|
||||||
def wait_ready(name, port, seconds=180):
|
def wait_ready(name, port, seconds=180):
|
||||||
return original_wait(name, port, max(seconds, 300) if name == "mysql" else seconds)
|
global world_deadline
|
||||||
|
if name == "mysql":
|
||||||
|
seconds = max(seconds, 300)
|
||||||
|
elif name == "world":
|
||||||
|
# Both game and console listeners belong to one startup, including on old repacks.
|
||||||
|
# Ordinary CoA worlds can load slowly too; this must not depend on SQUID.
|
||||||
|
if world_deadline is None:
|
||||||
|
world_deadline = time.monotonic() + max(seconds, 1500)
|
||||||
|
seconds = max(0, world_deadline - time.monotonic())
|
||||||
|
return original_wait(name, port, seconds)
|
||||||
|
|
||||||
|
|
||||||
launcher["start_mysql"].__globals__["wait_ready"] = wait_ready
|
launcher["start_mysql"].__globals__["wait_ready"] = wait_ready
|
||||||
if sys.argv[1] == "stop-all":
|
if sys.argv[1] in ("stop-all", "force-stop-all"):
|
||||||
shutdown = launcher["stop_all"].__globals__
|
shutdown = launcher["stop_all"].__globals__
|
||||||
if "ra" in shutdown:
|
|
||||||
original_ra = shutdown["ra"]
|
|
||||||
|
|
||||||
class UnsafeShutdown(Exception):
|
class UnsafeShutdown(Exception):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
def stop_owned_world(world):
|
||||||
|
expected = Path(script).resolve().parents[1] / "Core" / "worldserver.exe"
|
||||||
|
if Path(world.get("exe", "")) != expected or not shutdown["same_process"](world):
|
||||||
|
raise UnsafeShutdown("World process ownership could not be verified; the database was left running.")
|
||||||
|
try:
|
||||||
|
shutdown["terminate"](world)
|
||||||
|
except (OSError, RuntimeError) as error:
|
||||||
|
raise UnsafeShutdown("Worldserver could not be stopped safely; its database was left running.") from error
|
||||||
|
if not shutdown["wait_stopped"](world, 90):
|
||||||
|
raise UnsafeShutdown("Worldserver is still stopping; its database was left running.")
|
||||||
|
|
||||||
|
if "ra" in shutdown:
|
||||||
|
original_ra = shutdown["ra"]
|
||||||
|
|
||||||
def shutdown_command(command, config):
|
def shutdown_command(command, config):
|
||||||
try:
|
try:
|
||||||
return original_ra(command, config)
|
return original_ra(command, config)
|
||||||
@@ -31,20 +53,33 @@ if sys.argv[1] == "stop-all":
|
|||||||
world = shutdown["process"]("world")
|
world = shutdown["process"]("world")
|
||||||
if not world:
|
if not world:
|
||||||
return "Worldserver has already stopped."
|
return "Worldserver has already stopped."
|
||||||
expected = Path(script).resolve().parents[1] / "Core" / "worldserver.exe"
|
stop_owned_world(world)
|
||||||
if Path(world.get("exe", "")) != expected or not shutdown["same_process"](world):
|
|
||||||
raise UnsafeShutdown("World process ownership could not be verified; the database was left running.")
|
|
||||||
try:
|
|
||||||
shutdown["terminate"](world)
|
|
||||||
except (OSError, RuntimeError) as error:
|
|
||||||
raise UnsafeShutdown("Worldserver could not be stopped safely; its database was left running.") from error
|
|
||||||
if not shutdown["wait_stopped"](world, 90):
|
|
||||||
raise UnsafeShutdown("Worldserver is still stopping; its database was left running.")
|
|
||||||
return "Stopped this server's recorded world process without its unavailable console."
|
return "Stopped this server's recorded world process without its unavailable console."
|
||||||
|
|
||||||
shutdown["ra"] = shutdown_command
|
shutdown["ra"] = shutdown_command
|
||||||
config = launcher["settings"]()
|
config = launcher["settings"]()
|
||||||
with launcher["control_lock"]():
|
with launcher["control_lock"]():
|
||||||
|
if sys.argv[1] == "force-stop-all":
|
||||||
|
world = shutdown["process"]("world")
|
||||||
|
if world:
|
||||||
|
stop_owned_world(world)
|
||||||
|
print("Force-stopped this server's verified world process; unsaved progress may be lost.", flush=True)
|
||||||
launcher["stop_all"](config)
|
launcher["stop_all"](config)
|
||||||
else:
|
else:
|
||||||
launcher["main"]()
|
launcher["main"]()
|
||||||
|
if sys.argv[1] in ("start-all", "start-world"):
|
||||||
|
config = launcher["settings"]()
|
||||||
|
deadline = world_deadline if world_deadline is not None else time.monotonic() + 1500
|
||||||
|
last_error = None
|
||||||
|
while time.monotonic() < deadline:
|
||||||
|
if not launcher["process"]("world"):
|
||||||
|
raise RuntimeError("World startup failed: worldserver stopped before its console accepted commands.")
|
||||||
|
try:
|
||||||
|
launcher["ra"]("server info", config)
|
||||||
|
print("World console is accepting commands.", flush=True)
|
||||||
|
break
|
||||||
|
except (OSError, RuntimeError) as error:
|
||||||
|
last_error = error
|
||||||
|
time.sleep(0.5)
|
||||||
|
else:
|
||||||
|
raise RuntimeError(f"World startup failed: its console is still starting. {last_error}")
|
||||||
@@ -14,6 +14,7 @@ pub mod channels;
|
|||||||
pub mod character_start_check;
|
pub mod character_start_check;
|
||||||
pub mod cleanbase;
|
pub mod cleanbase;
|
||||||
pub mod client;
|
pub mod client;
|
||||||
|
pub mod client_graphics;
|
||||||
pub mod clientdl;
|
pub mod clientdl;
|
||||||
pub mod companions;
|
pub mod companions;
|
||||||
pub mod config;
|
pub mod config;
|
||||||
@@ -36,6 +37,7 @@ pub mod health;
|
|||||||
pub mod install;
|
pub mod install;
|
||||||
pub mod layout;
|
pub mod layout;
|
||||||
pub mod logging;
|
pub mod logging;
|
||||||
|
pub mod server_logging;
|
||||||
pub mod manifest;
|
pub mod manifest;
|
||||||
pub mod migrations;
|
pub mod migrations;
|
||||||
pub mod modules;
|
pub mod modules;
|
||||||
@@ -55,6 +57,7 @@ pub mod realmlist;
|
|||||||
pub mod realms;
|
pub mod realms;
|
||||||
pub mod registry;
|
pub mod registry;
|
||||||
pub mod release;
|
pub mod release;
|
||||||
|
pub mod release_history;
|
||||||
pub mod release_schema;
|
pub mod release_schema;
|
||||||
pub mod remote_client;
|
pub mod remote_client;
|
||||||
pub mod repair;
|
pub mod repair;
|
||||||
|
|||||||
@@ -307,6 +307,51 @@ pub struct Item {
|
|||||||
pub error: Option<String>,
|
pub error: Option<String>,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Serialize)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct Audit {
|
||||||
|
pub total: usize,
|
||||||
|
pub applied: usize,
|
||||||
|
pub checksum_verified: usize,
|
||||||
|
pub legacy_unknown: usize,
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn inventory_sha256(list: &[Migration]) -> Result<String> {
|
||||||
|
let inventory: Vec<_> = list
|
||||||
|
.iter()
|
||||||
|
.map(|m| (&m.db, &m.id, &m.sha256, &m.compatible_sha256, m.destructive))
|
||||||
|
.collect();
|
||||||
|
Ok(fsx::sha256_bytes(&serde_json::to_vec(&inventory)?))
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn audit_applied(store: &dyn Store, list: &[Migration]) -> Result<Audit> {
|
||||||
|
let rows = store.load_readonly()?;
|
||||||
|
check_history(&rows, list)?;
|
||||||
|
let mut audit = Audit {
|
||||||
|
total: list.len(),
|
||||||
|
applied: 0,
|
||||||
|
checksum_verified: 0,
|
||||||
|
legacy_unknown: 0,
|
||||||
|
};
|
||||||
|
for migration in list {
|
||||||
|
let row = recorded(&rows, migration)
|
||||||
|
.filter(|r| r.status == Status::Applied)
|
||||||
|
.ok_or_else(|| {
|
||||||
|
Error::Invalid(format!(
|
||||||
|
"Release migration {} ({}) is not recorded as applied.",
|
||||||
|
migration.id, migration.db
|
||||||
|
))
|
||||||
|
})?;
|
||||||
|
audit.applied += 1;
|
||||||
|
if row.sha256 == "0".repeat(64) {
|
||||||
|
audit.legacy_unknown += 1;
|
||||||
|
} else {
|
||||||
|
audit.checksum_verified += 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(audit)
|
||||||
|
}
|
||||||
|
|
||||||
pub fn status(store: &dyn Store, list: &[Migration]) -> Result<Vec<Item>> {
|
pub fn status(store: &dyn Store, list: &[Migration]) -> Result<Vec<Item>> {
|
||||||
let rows = store.load()?;
|
let rows = store.load()?;
|
||||||
Ok(list
|
Ok(list
|
||||||
@@ -358,7 +403,7 @@ fn preserve_auth_history(store: &dyn Store, rows: &[LedgerRow], list: &[Migratio
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// Migrations that were published with different bytes but have the same effect, so a server that applied either
|
/// Migrations that were published with different bytes but have the same effect, so a server that applied either
|
||||||
/// version accepts the other. The Wildcard table repair went out as `c1d8…` (0.261005.0, 0.261006.1) and as `9e4a…`
|
/// version accepts the other. The Wildcard table repair went out as `c1d8…` (0.261005.0, 0.261006.1) and as `9e4a…`
|
||||||
/// (0.261005.22, 0.261007.24); the packages carry no list of compatible versions, so the Manager knows this pair.
|
/// (0.261005.22, 0.261007.24); the packages carry no list of compatible versions, so the Manager knows this pair.
|
||||||
const SAME_EFFECT: &[(&str, &[&str])] = &[(
|
const SAME_EFFECT: &[(&str, &[&str])] = &[(
|
||||||
"manager_repair__20261005_missing_wildcard_tables",
|
"manager_repair__20261005_missing_wildcard_tables",
|
||||||
@@ -667,6 +712,61 @@ mod tests {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn qualification_inventory_digest_matches_release_pipeline_encoding() {
|
||||||
|
let list = vec![Migration {
|
||||||
|
id: "one".into(),
|
||||||
|
db: "world".into(),
|
||||||
|
sha256: "a".repeat(64),
|
||||||
|
compatible_sha256: vec![],
|
||||||
|
destructive: false,
|
||||||
|
}];
|
||||||
|
assert_eq!(
|
||||||
|
inventory_sha256(&list).unwrap(),
|
||||||
|
"b35e45f666304500e69ff352f83103910075ace998afb7915b548765b8c30703"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn qualification_rejects_missing_interrupted_failed_and_changed_history() {
|
||||||
|
let (_dir, list) = setup(&[("world", "qualification_probe", "SELECT 1;")]);
|
||||||
|
let store = Mem::default();
|
||||||
|
assert!(audit_applied(&store, &list).is_err());
|
||||||
|
for status in [Status::Running, Status::Failed, Status::Pending] {
|
||||||
|
store
|
||||||
|
.put(&LedgerRow {
|
||||||
|
db: "world".into(),
|
||||||
|
id: list[0].id.clone(),
|
||||||
|
sha256: list[0].sha256.clone(),
|
||||||
|
status,
|
||||||
|
error: None,
|
||||||
|
baseline: false,
|
||||||
|
})
|
||||||
|
.unwrap();
|
||||||
|
assert!(audit_applied(&store, &list).is_err());
|
||||||
|
}
|
||||||
|
store
|
||||||
|
.put(&LedgerRow {
|
||||||
|
db: "world".into(),
|
||||||
|
id: list[0].id.clone(),
|
||||||
|
sha256: "a".repeat(64),
|
||||||
|
status: Status::Applied,
|
||||||
|
error: None,
|
||||||
|
baseline: false,
|
||||||
|
})
|
||||||
|
.unwrap();
|
||||||
|
assert!(audit_applied(&store, &list).is_err());
|
||||||
|
store.rows.borrow_mut()[0].sha256 = list[0].sha256.clone();
|
||||||
|
assert_eq!(audit_applied(&store, &list).unwrap().checksum_verified, 1);
|
||||||
|
store.rows.borrow_mut()[0].sha256 = "0".repeat(64);
|
||||||
|
let audit = audit_applied(&store, &list).unwrap();
|
||||||
|
assert_eq!(
|
||||||
|
(audit.applied, audit.checksum_verified, audit.legacy_unknown),
|
||||||
|
(1, 0, 1)
|
||||||
|
);
|
||||||
|
assert!(store.ran.borrow().is_empty());
|
||||||
|
}
|
||||||
|
|
||||||
fn setup(files: &[(&str, &str, &str)]) -> (tempfile::TempDir, Vec<Migration>) {
|
fn setup(files: &[(&str, &str, &str)]) -> (tempfile::TempDir, Vec<Migration>) {
|
||||||
let d = tempfile::tempdir().unwrap();
|
let d = tempfile::tempdir().unwrap();
|
||||||
let mut list = Vec::new();
|
let mut list = Vec::new();
|
||||||
|
|||||||
@@ -197,7 +197,13 @@ fn list_in(cat: &[Entry], root: &Path) -> Vec<ModuleView> {
|
|||||||
.and_then(|c| c.get(&e.enable_key).map(truthy))
|
.and_then(|c| c.get(&e.enable_key).map(truthy))
|
||||||
.unwrap_or(e.default_on)
|
.unwrap_or(e.default_on)
|
||||||
};
|
};
|
||||||
let blocked = wildcard && matches!(e.id.as_str(), "companions" | "playerbots");
|
let dependency_missing = e.id == "dungeon-clear"
|
||||||
|
&& entry_in(cat, "playerbots")
|
||||||
|
.and_then(|entry| bot_enabled(root, &entry))
|
||||||
|
.map(|enabled| !enabled)
|
||||||
|
.unwrap_or(true);
|
||||||
|
let blocked = dependency_missing
|
||||||
|
|| (wildcard && matches!(e.id.as_str(), "companions" | "playerbots" | "dungeon-clear"));
|
||||||
let version = if e.id == "playerbots" {
|
let version = if e.id == "playerbots" {
|
||||||
crate::squid::release(root).map(|release| {
|
crate::squid::release(root).map(|release| {
|
||||||
[
|
[
|
||||||
@@ -228,7 +234,9 @@ fn list_in(cat: &[Entry], root: &Path) -> Vec<ModuleView> {
|
|||||||
};
|
};
|
||||||
ModuleView {
|
ModuleView {
|
||||||
version,
|
version,
|
||||||
compatibility: if blocked {
|
compatibility: if dependency_missing {
|
||||||
|
"requires-squid"
|
||||||
|
} else if blocked {
|
||||||
"unsupported"
|
"unsupported"
|
||||||
} else if wildcard && e.id != "client-compat" {
|
} else if wildcard && e.id != "client-compat" {
|
||||||
"experimental"
|
"experimental"
|
||||||
@@ -296,7 +304,7 @@ fn require_bot_server_stopped(root: &Path) -> Result<()> {
|
|||||||
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)?;
|
let _update_lock = crate::update::operation_lock(meta)?;
|
||||||
crate::update::ensure_recovered(meta)?;
|
crate::update::ensure_recovered(meta)?;
|
||||||
let _lock = if matches!(id, "companions" | "playerbots") {
|
let _lock = if matches!(id, "companions" | "playerbots" | "dungeon-clear") {
|
||||||
require_bot_server_stopped(root)?;
|
require_bot_server_stopped(root)?;
|
||||||
fs::create_dir_all(root.join(".state"))?;
|
fs::create_dir_all(root.join(".state"))?;
|
||||||
let lock = fs::OpenOptions::new()
|
let lock = fs::OpenOptions::new()
|
||||||
@@ -317,6 +325,9 @@ pub fn set_enabled(root: &Path, meta: &Path, id: &str, on: bool) -> Result<()> {
|
|||||||
};
|
};
|
||||||
if on {
|
if on {
|
||||||
crate::realms::guard_module(root, id)?;
|
crate::realms::guard_module(root, id)?;
|
||||||
|
if id == "dungeon-clear" {
|
||||||
|
crate::realms::guard_module(root, "playerbots")?;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if id == "custom-races" {
|
if id == "custom-races" {
|
||||||
if let Ok(meta_content) = fs::read_to_string(meta.join("install.json")) {
|
if let Ok(meta_content) = fs::read_to_string(meta.join("install.json")) {
|
||||||
@@ -379,6 +390,9 @@ pub fn ensure_bot_exclusivity(root: &Path) -> Result<()> {
|
|||||||
|
|
||||||
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 on && id == "dungeon-clear" && !bot_enabled(root, &entry_in(cat, "playerbots")?)? {
|
||||||
|
return Err(Error::Invalid("Enable SQUID bots before enabling Dungeon Clear.".into()));
|
||||||
|
}
|
||||||
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()));
|
||||||
}
|
}
|
||||||
@@ -394,6 +408,15 @@ fn set_enabled_in(cat: &[Entry], root: &Path, meta: &Path, id: &str, on: bool) -
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (id == "playerbots" && !on) || (id == "companions" && on) {
|
||||||
|
if let Some(dependency) = cat.iter().find(|entry| entry.id == "dungeon-clear") {
|
||||||
|
if dir(root).join(&dependency.conf).exists()
|
||||||
|
|| dir(root).join(format!("{}.dist", dependency.conf)).exists()
|
||||||
|
{
|
||||||
|
set_enabled_in(cat, root, meta, "dungeon-clear", false)?;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
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
|
if file.get(&e.enable_key).map(truthy).unwrap_or(e.default_on) == on
|
||||||
@@ -818,6 +841,27 @@ mod tests {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn dungeon_clear_requires_squid_and_stays_off_after_squid_is_reenabled() {
|
||||||
|
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("mod_coa_playerbots.conf"), "CoaBots.Enable = 0\n").unwrap();
|
||||||
|
let dungeon = dir(root).join("mod_dungeon_clear.conf");
|
||||||
|
fs::write(&dungeon, "DungeonClear.Enable = 0\n").unwrap();
|
||||||
|
let cat = catalog();
|
||||||
|
assert!(set_enabled_in(&cat, root, root, "dungeon-clear", true).is_err());
|
||||||
|
assert!(!list_in(&cat, root).iter().find(|entry| entry.id == "dungeon-clear").unwrap().switchable);
|
||||||
|
set_enabled_in(&cat, root, root, "playerbots", true).unwrap();
|
||||||
|
set_enabled_in(&cat, root, root, "dungeon-clear", true).unwrap();
|
||||||
|
assert!(read(&dungeon).unwrap().get("DungeonClear.Enable").map(truthy).unwrap());
|
||||||
|
set_enabled_in(&cat, root, root, "playerbots", false).unwrap();
|
||||||
|
assert!(!read(&dungeon).unwrap().get("DungeonClear.Enable").map(truthy).unwrap());
|
||||||
|
set_enabled_in(&cat, root, root, "playerbots", true).unwrap();
|
||||||
|
assert!(!read(&dungeon).unwrap().get("DungeonClear.Enable").map(truthy).unwrap());
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn bot_systems_are_mutually_exclusive_in_both_directions_and_manual_configs() {
|
fn bot_systems_are_mutually_exclusive_in_both_directions_and_manual_configs() {
|
||||||
let d = tempfile::tempdir().unwrap();
|
let d = tempfile::tempdir().unwrap();
|
||||||
|
|||||||
@@ -497,7 +497,12 @@ mod tests {
|
|||||||
)
|
)
|
||||||
.unwrap();
|
.unwrap();
|
||||||
let err = set_reborn_enabled(t.path(), true).unwrap_err().to_string();
|
let err = set_reborn_enabled(t.path(), true).unwrap_err().to_string();
|
||||||
assert!(err.contains("Select Conquest of Azeroth first"), "{err}");
|
let expected = if cfg!(windows) {
|
||||||
|
"Select Conquest of Azeroth first"
|
||||||
|
} else {
|
||||||
|
"Simultaneous realms currently require Windows"
|
||||||
|
};
|
||||||
|
assert!(err.contains(expected), "{err}");
|
||||||
assert!(!realms::state(t.path()).unwrap().with_reborn);
|
assert!(!realms::state(t.path()).unwrap().with_reborn);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -21,22 +21,33 @@ pub struct SqlFile {
|
|||||||
pub sha256: String,
|
pub sha256: String,
|
||||||
}
|
}
|
||||||
|
|
||||||
fn sql_in(dir: &Path) -> Vec<PathBuf> {
|
fn entries(dir: &Path) -> Result<Vec<fs::DirEntry>> {
|
||||||
let mut v: Vec<PathBuf> = fs::read_dir(dir)
|
match fs::read_dir(dir) {
|
||||||
.map(|rd| {
|
Ok(rd) => Ok(rd.collect::<std::io::Result<Vec<_>>>()?),
|
||||||
rd.flatten()
|
Err(error) if error.kind() == std::io::ErrorKind::NotFound => Ok(vec![]),
|
||||||
.map(|e| e.path())
|
Err(error) => Err(error.into()),
|
||||||
.filter(|p| p.extension().map(|e| e == "sql").unwrap_or(false))
|
}
|
||||||
.collect()
|
}
|
||||||
})
|
|
||||||
.unwrap_or_default();
|
fn sql_in(dir: &Path) -> Result<Vec<PathBuf>> {
|
||||||
v.sort();
|
let mut paths: Vec<_> = entries(dir)?
|
||||||
v
|
.into_iter()
|
||||||
|
.map(|entry| entry.path())
|
||||||
|
.filter(|path| path.extension().is_some_and(|ext| ext == "sql"))
|
||||||
|
.collect();
|
||||||
|
paths.sort();
|
||||||
|
Ok(paths)
|
||||||
}
|
}
|
||||||
|
|
||||||
/// The order in which files were first added to the repository (a pending script may rely on a table a module
|
/// The order in which files were first added to the repository (a pending script may rely on a table a module
|
||||||
/// created earlier). Files git does not know come last, in name order.
|
/// created earlier). Files git does not know come last, in name order.
|
||||||
fn introduction_rank(repo: &Path, pathspecs: &[&str]) -> std::collections::HashMap<String, usize> {
|
fn introduction_rank(
|
||||||
|
repo: &Path,
|
||||||
|
pathspecs: &[&str],
|
||||||
|
) -> Result<std::collections::HashMap<String, usize>> {
|
||||||
|
if !repo.join(".git").exists() {
|
||||||
|
return Ok(Default::default());
|
||||||
|
}
|
||||||
let mut args = vec![
|
let mut args = vec![
|
||||||
"log",
|
"log",
|
||||||
"--full-history",
|
"--full-history",
|
||||||
@@ -48,18 +59,22 @@ fn introduction_rank(repo: &Path, pathspecs: &[&str]) -> std::collections::HashM
|
|||||||
"--",
|
"--",
|
||||||
];
|
];
|
||||||
args.extend_from_slice(pathspecs);
|
args.extend_from_slice(pathspecs);
|
||||||
let out = Command::new("git").current_dir(repo).args(&args).output();
|
let out = Command::new("git").current_dir(repo).args(&args).output()?;
|
||||||
|
if !out.status.success() {
|
||||||
|
return Err(Error::Invalid(format!(
|
||||||
|
"Cannot establish SQL migration order: {}",
|
||||||
|
String::from_utf8_lossy(&out.stderr)
|
||||||
|
)));
|
||||||
|
}
|
||||||
let mut rank = std::collections::HashMap::new();
|
let mut rank = std::collections::HashMap::new();
|
||||||
if let Ok(o) = out {
|
for (i, line) in String::from_utf8_lossy(&out.stdout)
|
||||||
for (i, line) in String::from_utf8_lossy(&o.stdout)
|
|
||||||
.lines()
|
.lines()
|
||||||
.filter(|l| l.ends_with(".sql"))
|
.filter(|line| line.ends_with(".sql"))
|
||||||
.enumerate()
|
.enumerate()
|
||||||
{
|
{
|
||||||
rank.entry(line.to_string()).or_insert(i);
|
rank.entry(line.to_string()).or_insert(i);
|
||||||
}
|
}
|
||||||
}
|
Ok(rank)
|
||||||
rank
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Incremental SQL of a core checkout. Installation-only module bases must never be replayed on a live database.
|
/// Incremental SQL of a core checkout. Installation-only module bases must never be replayed on a live database.
|
||||||
@@ -91,7 +106,7 @@ fn collect_core_sql_mode(core: &Path, include_base: bool) -> Result<Vec<SqlFile>
|
|||||||
("world", ["db_world", "pending_db_world"]),
|
("world", ["db_world", "pending_db_world"]),
|
||||||
] {
|
] {
|
||||||
for d in dirs {
|
for d in dirs {
|
||||||
for f in sql_in(&core.join("data/sql/updates").join(d)) {
|
for f in sql_in(&core.join("data/sql/updates").join(d))? {
|
||||||
let stem = f.file_stem().unwrap().to_string_lossy().into_owned();
|
let stem = f.file_stem().unwrap().to_string_lossy().into_owned();
|
||||||
let rel = format!(
|
let rel = format!(
|
||||||
"data/sql/updates/{d}/{}",
|
"data/sql/updates/{d}/{}",
|
||||||
@@ -101,8 +116,8 @@ fn collect_core_sql_mode(core: &Path, include_base: bool) -> Result<Vec<SqlFile>
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if let Ok(rd) = fs::read_dir(core.join("modules")) {
|
{
|
||||||
let mut mods: Vec<_> = rd.flatten().collect();
|
let mut mods = entries(&core.join("modules"))?;
|
||||||
mods.sort_by_key(|e| e.file_name());
|
mods.sort_by_key(|e| e.file_name());
|
||||||
for m in mods {
|
for m in mods {
|
||||||
let name = m.file_name().to_string_lossy().into_owned();
|
let name = m.file_name().to_string_lossy().into_owned();
|
||||||
@@ -110,7 +125,7 @@ fn collect_core_sql_mode(core: &Path, include_base: bool) -> Result<Vec<SqlFile>
|
|||||||
for kind in ["auth", "characters", "world"] {
|
for kind in ["auth", "characters", "world"] {
|
||||||
let base = m.path().join(format!("data/sql/db-{kind}"));
|
let base = m.path().join(format!("data/sql/db-{kind}"));
|
||||||
for f in if include_base {
|
for f in if include_base {
|
||||||
sql_in(&base.join("base"))
|
sql_in(&base.join("base"))?
|
||||||
} else {
|
} else {
|
||||||
vec![]
|
vec![]
|
||||||
} {
|
} {
|
||||||
@@ -121,7 +136,7 @@ fn collect_core_sql_mode(core: &Path, include_base: bool) -> Result<Vec<SqlFile>
|
|||||||
);
|
);
|
||||||
push(kind, format!("mod_{mname}__base__{stem}"), f, rel)?;
|
push(kind, format!("mod_{mname}__base__{stem}"), f, rel)?;
|
||||||
}
|
}
|
||||||
for f in sql_in(&base) {
|
for f in sql_in(&base)? {
|
||||||
let stem = f.file_stem().unwrap().to_string_lossy().into_owned();
|
let stem = f.file_stem().unwrap().to_string_lossy().into_owned();
|
||||||
let rel = format!(
|
let rel = format!(
|
||||||
"modules/{name}/data/sql/db-{kind}/{}",
|
"modules/{name}/data/sql/db-{kind}/{}",
|
||||||
@@ -132,7 +147,7 @@ fn collect_core_sql_mode(core: &Path, include_base: bool) -> Result<Vec<SqlFile>
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
let rank = introduction_rank(core, &["data/sql/updates", "modules"]);
|
let rank = introduction_rank(core, &["data/sql/updates", "modules"])?;
|
||||||
out.sort_by_key(|f| rank.get(&f.origin).copied().unwrap_or(usize::MAX));
|
out.sort_by_key(|f| rank.get(&f.origin).copied().unwrap_or(usize::MAX));
|
||||||
Ok(out)
|
Ok(out)
|
||||||
}
|
}
|
||||||
@@ -155,7 +170,7 @@ pub fn export_baseline(server: &Path, out: &Path) -> Result<Vec<(String, u64)>>
|
|||||||
/// 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();
|
||||||
for f in sql_in(&bots.join("dist/sql")) {
|
for f in sql_in(&bots.join("dist/sql"))? {
|
||||||
let stem = f.file_stem().unwrap().to_string_lossy().into_owned();
|
let stem = f.file_stem().unwrap().to_string_lossy().into_owned();
|
||||||
out.push(SqlFile {
|
out.push(SqlFile {
|
||||||
db: "characters".into(),
|
db: "characters".into(),
|
||||||
@@ -364,6 +379,30 @@ mod tests {
|
|||||||
fs::write(p, c).unwrap();
|
fs::write(p, c).unwrap();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn sql_collection_rejects_broken_history_in_a_git_checkout() {
|
||||||
|
let dir = tempfile::tempdir().unwrap();
|
||||||
|
write(dir.path(), ".git", "gitdir: missing-history");
|
||||||
|
write(dir.path(), "data/sql/updates/db_world/one.sql", "SELECT 1;");
|
||||||
|
assert!(collect_core_sql(dir.path())
|
||||||
|
.unwrap_err()
|
||||||
|
.to_string()
|
||||||
|
.contains("migration order"));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn sql_collection_rejects_unreadable_directories_instead_of_omitting_migrations() {
|
||||||
|
let dir = tempfile::tempdir().unwrap();
|
||||||
|
write(dir.path(), "data/sql/updates/db_world", "not a directory");
|
||||||
|
assert!(collect_core_sql(dir.path()).is_err());
|
||||||
|
let bots = tempfile::tempdir().unwrap();
|
||||||
|
write(bots.path(), "dist/sql", "not a directory");
|
||||||
|
assert!(collect_bots_sql(bots.path()).is_err());
|
||||||
|
let modules = tempfile::tempdir().unwrap();
|
||||||
|
write(modules.path(), "modules", "not a directory");
|
||||||
|
assert!(collect_core_sql(modules.path()).is_err());
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn collects_core_and_module_sql_with_module_base_first_and_stable_ids() {
|
fn collects_core_and_module_sql_with_module_base_first_and_stable_ids() {
|
||||||
let d = tempfile::tempdir().unwrap();
|
let d = tempfile::tempdir().unwrap();
|
||||||
|
|||||||
@@ -0,0 +1,229 @@
|
|||||||
|
//! Read-only, bounded canonical histories. Offline fallback is also bundled in the UI.
|
||||||
|
use serde_json::Value;
|
||||||
|
use std::{io::Read, path::Path, time::Duration};
|
||||||
|
|
||||||
|
const LIMIT: u64 = 2 * 1024 * 1024;
|
||||||
|
|
||||||
|
fn repository(component: &str) -> Result<(&'static str, &'static str), String> {
|
||||||
|
match component {
|
||||||
|
"server" => Ok(("Corfirean/coa-server-build", "main")),
|
||||||
|
"manager" => Ok(("Corfirean/coa-server-manager", "master")),
|
||||||
|
_ => Err("Unknown release component".into()),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn validate(bytes: &[u8], component: &str) -> Result<Value, String> {
|
||||||
|
let (repo, _) = repository(component)?;
|
||||||
|
if bytes.len() as u64 > LIMIT {
|
||||||
|
return Err("Release history is too large".into());
|
||||||
|
}
|
||||||
|
let value: Value = serde_json::from_slice(bytes).map_err(|e| e.to_string())?;
|
||||||
|
if value["schema"] != 1 || value["component"] != component || value["repository"] != repo {
|
||||||
|
return Err("Release history identity mismatch".into());
|
||||||
|
}
|
||||||
|
let releases = value["releases"].as_array().ok_or("Missing releases")?;
|
||||||
|
if releases.len() > 2000 {
|
||||||
|
return Err("Too many releases".into());
|
||||||
|
}
|
||||||
|
for release in releases {
|
||||||
|
if release.get("prerelease").is_some_and(|v| !v.is_boolean())
|
||||||
|
|| release.get("experimentalFeatures").is_some_and(|v| {
|
||||||
|
v.as_array()
|
||||||
|
.is_none_or(|items| items.iter().any(|item| !item.is_string()))
|
||||||
|
})
|
||||||
|
{
|
||||||
|
return Err("Invalid release flags".into());
|
||||||
|
}
|
||||||
|
for field in ["tag", "date"] {
|
||||||
|
if release[field]
|
||||||
|
.as_str()
|
||||||
|
.is_none_or(|s| s.is_empty() || s.len() > 100)
|
||||||
|
{
|
||||||
|
return Err("Invalid release metadata".into());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let version = release["version"].as_str().ok_or("Missing version")?;
|
||||||
|
if version.len() > 80
|
||||||
|
|| !version
|
||||||
|
.bytes()
|
||||||
|
.all(|b| b.is_ascii_alphanumeric() || b".-+".contains(&b))
|
||||||
|
{
|
||||||
|
return Err("Invalid version".into());
|
||||||
|
}
|
||||||
|
let notes = release["notes"].as_array().ok_or("Missing notes")?;
|
||||||
|
if notes.len() > 500
|
||||||
|
|| notes
|
||||||
|
.iter()
|
||||||
|
.any(|n| n.as_str().is_none_or(|s| s.len() > 10000))
|
||||||
|
{
|
||||||
|
return Err("Invalid release notes".into());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(value)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn load(component: &str, cache_dir: &Path) -> Result<Value, String> {
|
||||||
|
load_for_target(component, cache_dir, None)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn load_for_target(
|
||||||
|
component: &str,
|
||||||
|
cache_dir: &Path,
|
||||||
|
target: Option<&str>,
|
||||||
|
) -> Result<Value, String> {
|
||||||
|
let (repo, branch) = repository(component)?;
|
||||||
|
load_with_remote(component, cache_dir, target, || {
|
||||||
|
let client = reqwest::blocking::Client::builder()
|
||||||
|
.timeout(Duration::from_secs(8))
|
||||||
|
.redirect(reqwest::redirect::Policy::none())
|
||||||
|
.build()
|
||||||
|
.map_err(|e| e.to_string())?;
|
||||||
|
let response = client
|
||||||
|
.get(format!(
|
||||||
|
"https://raw.githubusercontent.com/{repo}/{branch}/changelog/history.json"
|
||||||
|
))
|
||||||
|
.query(&[("target", target.unwrap_or(""))])
|
||||||
|
.header(reqwest::header::CACHE_CONTROL, "no-cache")
|
||||||
|
.send()
|
||||||
|
.and_then(|r| r.error_for_status())
|
||||||
|
.map_err(|e| e.to_string())?;
|
||||||
|
let mut bytes = Vec::new();
|
||||||
|
response
|
||||||
|
.take(LIMIT + 1)
|
||||||
|
.read_to_end(&mut bytes)
|
||||||
|
.map_err(|e| e.to_string())?;
|
||||||
|
Ok(bytes)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
fn load_with_remote(
|
||||||
|
component: &str,
|
||||||
|
cache_dir: &Path,
|
||||||
|
target: Option<&str>,
|
||||||
|
remote: impl FnOnce() -> Result<Vec<u8>, String>,
|
||||||
|
) -> Result<Value, String> {
|
||||||
|
repository(component)?;
|
||||||
|
let cache = cache_dir.join(format!("{component}.json"));
|
||||||
|
let cached = || {
|
||||||
|
let mut bytes = Vec::new();
|
||||||
|
std::fs::File::open(&cache)
|
||||||
|
.ok()?
|
||||||
|
.take(LIMIT + 1)
|
||||||
|
.read_to_end(&mut bytes)
|
||||||
|
.ok()?;
|
||||||
|
validate(&bytes, component).ok()
|
||||||
|
};
|
||||||
|
if cache
|
||||||
|
.metadata()
|
||||||
|
.and_then(|m| m.modified())
|
||||||
|
.ok()
|
||||||
|
.and_then(|t| t.elapsed().ok())
|
||||||
|
.is_some_and(|age| age < Duration::from_secs(3600))
|
||||||
|
{
|
||||||
|
if let Some(mut value) = cached() {
|
||||||
|
if target.is_none_or(|target| {
|
||||||
|
value["releases"].as_array().is_some_and(|releases| {
|
||||||
|
releases
|
||||||
|
.iter()
|
||||||
|
.any(|release| release["version"].as_str() == Some(target))
|
||||||
|
})
|
||||||
|
}) {
|
||||||
|
value["source"] = "cache".into();
|
||||||
|
return Ok(value);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let fetched = (|| {
|
||||||
|
let bytes = remote()?;
|
||||||
|
let mut value = validate(&bytes, component)?;
|
||||||
|
if std::fs::create_dir_all(cache_dir).is_ok() {
|
||||||
|
let _ = crate::fsx::atomic_write(&cache, &bytes);
|
||||||
|
}
|
||||||
|
value["source"] = "remote".into();
|
||||||
|
Ok(value)
|
||||||
|
})();
|
||||||
|
fetched.or_else(|error| {
|
||||||
|
cached()
|
||||||
|
.map(|mut value| {
|
||||||
|
value["source"] = "cache".into();
|
||||||
|
value
|
||||||
|
})
|
||||||
|
.ok_or(error)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
#[test]
|
||||||
|
fn accepts_both_complete_bundled_canonical_histories() {
|
||||||
|
assert!(validate(include_bytes!("../../../changelog/history.json"), "manager").is_ok());
|
||||||
|
assert!(validate(
|
||||||
|
include_bytes!("../../../src/data/server-history.json"),
|
||||||
|
"server"
|
||||||
|
)
|
||||||
|
.is_ok());
|
||||||
|
}
|
||||||
|
#[test]
|
||||||
|
fn rejects_cross_component_and_untrusted_components() {
|
||||||
|
let bytes = br#"{"schema":1,"component":"manager","repository":"Corfirean/coa-server-manager","releases":[]}"#;
|
||||||
|
assert!(validate(bytes, "manager").is_ok());
|
||||||
|
assert!(validate(bytes, "server").is_err());
|
||||||
|
assert!(repository("../../other").is_err());
|
||||||
|
assert!(validate(&vec![b' '; LIMIT as usize + 1], "manager").is_err());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn rejects_malformed_records_before_the_ui_can_use_them() {
|
||||||
|
let mut value = serde_json::json!({"schema": 1, "component": "server",
|
||||||
|
"repository": "Corfirean/coa-server-build", "releases": [{
|
||||||
|
"version": "0.261028.83", "tag": "0.261028.83", "date": "2026-10-28",
|
||||||
|
"notes": ["Reviewed note"]
|
||||||
|
}]});
|
||||||
|
assert!(validate(&serde_json::to_vec(&value).unwrap(), "server").is_ok());
|
||||||
|
value["releases"][0]["date"] = Value::Null;
|
||||||
|
assert!(validate(&serde_json::to_vec(&value).unwrap(), "server").is_err());
|
||||||
|
value["releases"][0]["date"] = "2026-10-28".into();
|
||||||
|
value["releases"][0]["notes"] = serde_json::json!([{"html": "not a text note"}]);
|
||||||
|
assert!(validate(&serde_json::to_vec(&value).unwrap(), "server").is_err());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn available_update_bypasses_fresh_cache_missing_the_target_and_keeps_offline_fallback() {
|
||||||
|
let dir = tempfile::tempdir().unwrap();
|
||||||
|
let feed = |version: &str| {
|
||||||
|
serde_json::to_vec(&serde_json::json!({
|
||||||
|
"schema":1,"component":"manager","repository":"Corfirean/coa-server-manager",
|
||||||
|
"releases":[{"version":version,"tag":format!("v{version}"),"date":"2026-10-30",
|
||||||
|
"notes":["Visible update notes"]}]
|
||||||
|
}))
|
||||||
|
.unwrap()
|
||||||
|
};
|
||||||
|
std::fs::write(dir.path().join("manager.json"), feed("0.9.4")).unwrap();
|
||||||
|
let value =
|
||||||
|
load_with_remote("manager", dir.path(), Some("0.9.5"), || Ok(feed("0.9.5"))).unwrap();
|
||||||
|
assert_eq!(value["source"], "remote");
|
||||||
|
assert_eq!(value["releases"][0]["version"], "0.9.5");
|
||||||
|
let cached = load_with_remote("manager", dir.path(), Some("0.9.5"), || {
|
||||||
|
panic!("fresh target is cached")
|
||||||
|
})
|
||||||
|
.unwrap();
|
||||||
|
assert_eq!(cached["source"], "cache");
|
||||||
|
let offline = load_with_remote("manager", dir.path(), Some("0.9.6"), || {
|
||||||
|
Err("offline".into())
|
||||||
|
})
|
||||||
|
.unwrap();
|
||||||
|
assert_eq!(offline["releases"][0]["version"], "0.9.5");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn fresh_valid_cache_is_available_without_network() {
|
||||||
|
let dir = std::env::temp_dir().join(format!("coa-history-{}", uuid::Uuid::new_v4()));
|
||||||
|
std::fs::create_dir_all(&dir).unwrap();
|
||||||
|
std::fs::write(dir.join("manager.json"), br#"{"schema":1,"component":"manager","repository":"Corfirean/coa-server-manager","releases":[]}"#).unwrap();
|
||||||
|
let result = load("manager", &dir).unwrap();
|
||||||
|
assert_eq!(result["source"], "cache");
|
||||||
|
std::fs::remove_file(dir.join("manager.json")).unwrap();
|
||||||
|
std::fs::remove_dir(dir).unwrap();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -96,7 +96,7 @@ pub fn qualify_upgrade(
|
|||||||
pkgsource::fetch_manifest(&pkgsource::Source::Dir(base.into()), trusted_key)?;
|
pkgsource::fetch_manifest(&pkgsource::Source::Dir(base.into()), trusted_key)?;
|
||||||
let (source_manifest, source_bytes) =
|
let (source_manifest, source_bytes) =
|
||||||
pkgsource::fetch_manifest(&pkgsource::Source::Dir(source.into()), trusted_key)?;
|
pkgsource::fetch_manifest(&pkgsource::Source::Dir(source.into()), trusted_key)?;
|
||||||
let (candidate_manifest, _) =
|
let (candidate_manifest, candidate_bytes) =
|
||||||
pkgsource::fetch_manifest(&pkgsource::Source::Dir(candidate.into()), trusted_key)?;
|
pkgsource::fetch_manifest(&pkgsource::Source::Dir(candidate.into()), trusted_key)?;
|
||||||
if candidate_manifest.kind != Kind::Update
|
if candidate_manifest.kind != Kind::Update
|
||||||
|| !matches!(source_manifest.kind, Kind::Base | Kind::Update)
|
|| !matches!(source_manifest.kind, Kind::Base | Kind::Update)
|
||||||
@@ -149,6 +149,7 @@ pub fn qualify_upgrade(
|
|||||||
}
|
}
|
||||||
env.ensure_stopped()
|
env.ensure_stopped()
|
||||||
};
|
};
|
||||||
|
let mut migration_audit = None;
|
||||||
install::with_scratch_ports(fixture, || {
|
install::with_scratch_ports(fixture, || {
|
||||||
if source_manifest.kind == Kind::Update {
|
if source_manifest.kind == Kind::Update {
|
||||||
apply(source)?;
|
apply(source)?;
|
||||||
@@ -157,6 +158,7 @@ pub fn qualify_upgrade(
|
|||||||
let user_bytes = b"Qualification.UserSetting = 7391\r\n";
|
let user_bytes = b"Qualification.UserSetting = 7391\r\n";
|
||||||
fsx::atomic_write(&user_file, user_bytes)?;
|
fsx::atomic_write(&user_file, user_bytes)?;
|
||||||
apply(candidate)?;
|
apply(candidate)?;
|
||||||
|
migration_audit = Some(audit_migrations(fixture, &candidate_manifest.migrations)?);
|
||||||
if std::fs::read(&user_file)?.as_slice() != user_bytes {
|
if std::fs::read(&user_file)?.as_slice() != user_bytes {
|
||||||
return Err(Error::Invalid(
|
return Err(Error::Invalid(
|
||||||
"The update changed a user configuration file.".into(),
|
"The update changed a user configuration file.".into(),
|
||||||
@@ -175,9 +177,10 @@ pub fn qualify_upgrade(
|
|||||||
})?;
|
})?;
|
||||||
Ok(serde_json::json!({
|
Ok(serde_json::json!({
|
||||||
"schema": 1, "result": "passed", "fromVersion": source_manifest.version,
|
"schema": 1, "result": "passed", "fromVersion": source_manifest.version,
|
||||||
"toVersion": candidate_manifest.version, "fromManifestSha256": fsx::sha256_bytes(&source_bytes),
|
"toVersion": candidate_manifest.version, "toManifestSha256": fsx::sha256_bytes(&candidate_bytes),
|
||||||
|
"migrationInventorySha256": migrations::inventory_sha256(&candidate_manifest.migrations)?, "migrations": migration_audit, "fromManifestSha256": fsx::sha256_bytes(&source_bytes),
|
||||||
"fromSchemaSha256": source_manifest.files.iter().find(|file| file.path == schema_check::CONTRACT).map(|file| &file.sha256),
|
"fromSchemaSha256": source_manifest.files.iter().find(|file| file.path == schema_check::CONTRACT).map(|file| &file.sha256),
|
||||||
"checks": ["manager-transaction", "recovery-backed-database-update", "database-schema", "private-auth-world-startup", "existing-identities", "user-file-preservation"],
|
"checks": ["legacy-race-start-data", "migration-ledger", "manager-transaction", "recovery-backed-database-update", "database-schema", "private-auth-world-startup", "existing-identities", "user-file-preservation"],
|
||||||
}))
|
}))
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -238,6 +241,15 @@ pub fn qualify_install(
|
|||||||
package: &Path,
|
package: &Path,
|
||||||
fixture: &Path,
|
fixture: &Path,
|
||||||
trusted_key: &str,
|
trusted_key: &str,
|
||||||
|
) -> Result<serde_json::Value> {
|
||||||
|
qualify_install_against(package, None, fixture, trusted_key)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn qualify_install_against(
|
||||||
|
package: &Path,
|
||||||
|
update: Option<&Path>,
|
||||||
|
fixture: &Path,
|
||||||
|
trusted_key: &str,
|
||||||
) -> Result<serde_json::Value> {
|
) -> Result<serde_json::Value> {
|
||||||
use crate::update::Env;
|
use crate::update::Env;
|
||||||
if !cfg!(windows)
|
if !cfg!(windows)
|
||||||
@@ -254,6 +266,21 @@ pub fn qualify_install(
|
|||||||
let package = fsx::canonicalize_lenient(package)?;
|
let package = fsx::canonicalize_lenient(package)?;
|
||||||
let (manifest, bytes) =
|
let (manifest, bytes) =
|
||||||
pkgsource::fetch_manifest(&pkgsource::Source::Dir(package.clone()), trusted_key)?;
|
pkgsource::fetch_manifest(&pkgsource::Source::Dir(package.clone()), trusted_key)?;
|
||||||
|
let expected_update = update
|
||||||
|
.map(|path| pkgsource::fetch_manifest(&pkgsource::Source::Dir(path.into()), trusted_key))
|
||||||
|
.transpose()?;
|
||||||
|
if let Some((expected, _)) = &expected_update {
|
||||||
|
if expected.kind != Kind::Update
|
||||||
|
|| expected.version != manifest.version
|
||||||
|
|| expected.core.commit != manifest.core.commit
|
||||||
|
|| expected.bots.as_ref().and_then(|b| b.commit.as_ref())
|
||||||
|
!= manifest.bots.as_ref().and_then(|b| b.commit.as_ref())
|
||||||
|
{
|
||||||
|
return Err(Error::Invalid(
|
||||||
|
"Clean installation image does not match the selected release.".into(),
|
||||||
|
));
|
||||||
|
}
|
||||||
|
}
|
||||||
let registry_dir = tempfile::tempdir()?;
|
let registry_dir = tempfile::tempdir()?;
|
||||||
let registry = crate::registry::Registry::at(registry_dir.path().join("registry.json"));
|
let registry = crate::registry::Registry::at(registry_dir.path().join("registry.json"));
|
||||||
let installed = install::install_base(
|
let installed = install::install_base(
|
||||||
@@ -280,13 +307,84 @@ pub fn qualify_install(
|
|||||||
"Clean installation did not finish at the packaged release.".into(),
|
"Clean installation did not finish at the packaged release.".into(),
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
let migration_audit = expected_update
|
||||||
|
.as_ref()
|
||||||
|
.map(|(expected, _)| audit_migrations(&fixture, &expected.migrations))
|
||||||
|
.transpose()?;
|
||||||
|
env.ensure_stopped()?;
|
||||||
|
crate::mysql_snapshot::stop(&fixture)?;
|
||||||
|
let inventory = expected_update
|
||||||
|
.as_ref()
|
||||||
|
.map(|(expected, _)| migrations::inventory_sha256(&expected.migrations))
|
||||||
|
.transpose()?;
|
||||||
|
let mut checks = vec![
|
||||||
|
"clean-install",
|
||||||
|
"signed-full-package",
|
||||||
|
"credential-rotation",
|
||||||
|
"schema-contract",
|
||||||
|
"private-auth-world-startup",
|
||||||
|
];
|
||||||
|
if expected_update.is_some() {
|
||||||
|
checks.push("migration-ledger");
|
||||||
|
checks.push("legacy-race-start-data");
|
||||||
|
}
|
||||||
Ok(
|
Ok(
|
||||||
serde_json::json!({ "schema": 1, "result": "passed", "version": installed.version,
|
serde_json::json!({ "schema": 1, "result": "passed", "version": installed.version,
|
||||||
"manifestSha256": fsx::sha256_bytes(&bytes),
|
"manifestSha256": fsx::sha256_bytes(&bytes),
|
||||||
"checks": ["clean-install", "signed-full-package", "credential-rotation", "schema-contract", "private-auth-world-startup"] }),
|
"checks": checks, "migrationInventorySha256": inventory, "migrations": migration_audit }),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn audit_migrations(
|
||||||
|
root: &Path,
|
||||||
|
list: &[Migration],
|
||||||
|
) -> Result<std::collections::BTreeMap<String, migrations::Audit>> {
|
||||||
|
install::with_scratch_ports(root, || {
|
||||||
|
backup::with_database(root, |db| {
|
||||||
|
crate::realms::state(root)?
|
||||||
|
.modes()
|
||||||
|
.into_iter()
|
||||||
|
.map(|mode| {
|
||||||
|
if mode == crate::realms::Mode::Coa {
|
||||||
|
let rows = db
|
||||||
|
.clone()
|
||||||
|
.for_realm(mode)
|
||||||
|
.query("SELECT race,class FROM acore_world.playercreateinfo;")?;
|
||||||
|
let missing = missing_legacy_starts(&rows);
|
||||||
|
if !missing.is_empty() {
|
||||||
|
return Err(Error::Invalid(format!(
|
||||||
|
"Release is missing legacy race starting data: {}",
|
||||||
|
missing.join(", ")
|
||||||
|
)));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok((
|
||||||
|
mode.name().to_string(),
|
||||||
|
migrations::audit_applied(&db.clone().for_realm(mode), list)?,
|
||||||
|
))
|
||||||
|
})
|
||||||
|
.collect()
|
||||||
|
})
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
fn missing_legacy_starts(rows: &str) -> Vec<String> {
|
||||||
|
let pairs: std::collections::BTreeSet<(u32, u32)> = rows
|
||||||
|
.lines()
|
||||||
|
.filter_map(|line| line.split_once('\t'))
|
||||||
|
.filter_map(|(race, class)| Some((race.parse().ok()?, class.parse().ok()?)))
|
||||||
|
.collect();
|
||||||
|
let mut missing = Vec::new();
|
||||||
|
for (race, parent) in [(33, 1), (45, 8)] {
|
||||||
|
for &(source, class) in &pairs {
|
||||||
|
if source == parent && !pairs.contains(&(race, class)) {
|
||||||
|
missing.push(format!("race {race} / class {class}"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
missing
|
||||||
|
}
|
||||||
|
|
||||||
pub fn collect(core: &Path, bots: Option<&Path>, repairs: Option<&Path>) -> Result<Vec<SqlFile>> {
|
pub fn collect(core: &Path, bots: Option<&Path>, repairs: Option<&Path>) -> Result<Vec<SqlFile>> {
|
||||||
let mut files = release::collect_core_sql(core)?;
|
let mut files = release::collect_core_sql(core)?;
|
||||||
if let Some(bots) = bots {
|
if let Some(bots) = bots {
|
||||||
@@ -617,6 +715,56 @@ mod tests {
|
|||||||
use base64::{engine::general_purpose::STANDARD, Engine};
|
use base64::{engine::general_purpose::STANDARD, Engine};
|
||||||
use ed25519_dalek::{Signer, SigningKey};
|
use ed25519_dalek::{Signer, SigningKey};
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
#[ignore = "Requires the disposable current-release installation audit fixture"]
|
||||||
|
fn real_current_image_is_blocked_until_legacy_start_data_is_restored() {
|
||||||
|
let root = std::path::PathBuf::from(std::env::var_os("COA_RELEASE_AUDIT_FIXTURE").unwrap());
|
||||||
|
assert_eq!(
|
||||||
|
root.file_name().unwrap(),
|
||||||
|
"coa-schema-fixture-latest-install-audit-20261030"
|
||||||
|
);
|
||||||
|
assert!(root.join(".release-schema-fixture").is_file());
|
||||||
|
assert!(!root.join("legacy-release-gate-probe-started").exists());
|
||||||
|
fsx::atomic_write(
|
||||||
|
&root.join("legacy-release-gate-probe-started"),
|
||||||
|
b"disposable regression test",
|
||||||
|
)
|
||||||
|
.unwrap();
|
||||||
|
let candidate =
|
||||||
|
std::path::PathBuf::from(std::env::var_os("COA_RELEASE_AUDIT_PACKAGE").unwrap());
|
||||||
|
let (manifest, _) = pkgsource::fetch_manifest(
|
||||||
|
&pkgsource::Source::Dir(candidate),
|
||||||
|
crate::signing::EMBEDDED_PUBLIC_KEY,
|
||||||
|
)
|
||||||
|
.unwrap();
|
||||||
|
let failure = audit_migrations(&root, &manifest.migrations).unwrap_err();
|
||||||
|
assert!(failure.to_string().contains("race 33 / class 12"));
|
||||||
|
assert!(failure.to_string().contains("race 45 / class 30"));
|
||||||
|
println!("PASS: signed current image is blocked for missing legacy starts despite a complete migration ledger");
|
||||||
|
let sql =
|
||||||
|
fs::read_to_string(std::env::var_os("COA_RELEASE_AUDIT_CORRECTION").unwrap()).unwrap();
|
||||||
|
install::with_scratch_ports(&root, || backup::with_database(&root, |db| {
|
||||||
|
let before = db.query("SELECT * FROM acore_characters.characters ORDER BY guid;")?;
|
||||||
|
db.query(&format!("USE acore_world;\n{sql}"))?;
|
||||||
|
let once = db.query("SELECT * FROM acore_world.playercreateinfo WHERE race IN (33,45) ORDER BY race,class;")?;
|
||||||
|
db.query(&format!("USE acore_world;\n{sql}"))?;
|
||||||
|
assert_eq!(once, db.query("SELECT * FROM acore_world.playercreateinfo WHERE race IN (33,45) ORDER BY race,class;")?);
|
||||||
|
assert_eq!(before, db.query("SELECT * FROM acore_characters.characters ORDER BY guid;")?);
|
||||||
|
Ok(())
|
||||||
|
})).unwrap();
|
||||||
|
let audits = audit_migrations(&root, &manifest.migrations).unwrap();
|
||||||
|
println!("PASS: corrected data passes the release gate; characters unchanged; correction idempotent; audit={}", serde_json::to_string(&audits).unwrap());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn release_rejects_missing_legacy_starts_even_without_existing_characters() {
|
||||||
|
assert_eq!(
|
||||||
|
missing_legacy_starts("1\t12\n8\t30\n"),
|
||||||
|
["race 33 / class 12", "race 45 / class 30"]
|
||||||
|
);
|
||||||
|
assert!(missing_legacy_starts("1\t12\n8\t30\n33\t12\n45\t30\n").is_empty());
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
#[ignore = "Requires a composed disposable installation image"]
|
#[ignore = "Requires a composed disposable installation image"]
|
||||||
fn real_full_package_installs_the_current_version_without_an_update_transaction() {
|
fn real_full_package_installs_the_current_version_without_an_update_transaction() {
|
||||||
|
|||||||
@@ -0,0 +1,165 @@
|
|||||||
|
use std::{fs, path::Path};
|
||||||
|
|
||||||
|
use crate::{
|
||||||
|
config::{parser::ConfFile, Scope},
|
||||||
|
error::{Error, Result},
|
||||||
|
fsx,
|
||||||
|
};
|
||||||
|
|
||||||
|
fn transform(bytes: &[u8], preset: &str) -> Result<String> {
|
||||||
|
let level = match preset {
|
||||||
|
"normal" => 4,
|
||||||
|
"errors" => 2,
|
||||||
|
"off" => 0,
|
||||||
|
_ => return Err(Error::Invalid("Unknown server logging preset.".into())),
|
||||||
|
};
|
||||||
|
let mut conf = ConfFile::parse_bytes(bytes)?;
|
||||||
|
let entries: Vec<_> = conf
|
||||||
|
.entries()
|
||||||
|
.map(|(key, value)| (key.to_string(), value.to_string()))
|
||||||
|
.collect();
|
||||||
|
for (key, value) in entries {
|
||||||
|
if key.starts_with("Logger.") {
|
||||||
|
let Some((_, appenders)) = value.split_once(',') else {
|
||||||
|
continue;
|
||||||
|
};
|
||||||
|
let value = if preset == "normal"
|
||||||
|
&& matches!(
|
||||||
|
key.as_str(),
|
||||||
|
"Logger.network" | "Logger.sql.sql" | "Logger.entities.player"
|
||||||
|
) {
|
||||||
|
2
|
||||||
|
} else {
|
||||||
|
level
|
||||||
|
};
|
||||||
|
conf.set(&key, &format!("{value},{appenders}"), &[]);
|
||||||
|
} else if key.starts_with("Appender.") {
|
||||||
|
let mut fields: Vec<_> = value.split(',').map(str::to_string).collect();
|
||||||
|
if fields.len() >= 3 {
|
||||||
|
fields[1] = if key == "Appender.Errors" && preset == "normal" {
|
||||||
|
"2".into()
|
||||||
|
} else {
|
||||||
|
level.to_string()
|
||||||
|
};
|
||||||
|
conf.set(&key, &fields.join(","), &[]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(conf.to_text())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn apply(root: &Path, meta: &Path, preset: &str) -> Result<()> {
|
||||||
|
let _operation = crate::update::operation_lock(meta)?;
|
||||||
|
crate::update::ensure_recovered(meta)?;
|
||||||
|
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(),
|
||||||
|
));
|
||||||
|
}
|
||||||
|
let mut originals = Vec::new();
|
||||||
|
let mut texts = Vec::new();
|
||||||
|
for prefix in ["", ".realms/secondary/", ".realms/reborn/"] {
|
||||||
|
for name in [
|
||||||
|
"Settings/worldserver.conf.template",
|
||||||
|
"Settings/authserver.conf.template",
|
||||||
|
"Core/configs/worldserver.conf",
|
||||||
|
"Core/configs/authserver.conf",
|
||||||
|
] {
|
||||||
|
let path = fsx::ensure_within(root, &root.join(format!("{prefix}{name}")))?;
|
||||||
|
if path.is_file() {
|
||||||
|
let bytes = fs::read(&path)?;
|
||||||
|
texts.push(transform(&bytes, preset)?);
|
||||||
|
originals.push((path, bytes));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let marker = root.join(format!("{prefix}.state/debug-logs.json"));
|
||||||
|
if marker.is_file() {
|
||||||
|
originals.push((marker.clone(), fs::read(marker)?));
|
||||||
|
texts.push("{\"enabled\":false}\n".into());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if originals.is_empty() {
|
||||||
|
return Err(Error::Invalid(
|
||||||
|
"Server configuration files were not found.".into(),
|
||||||
|
));
|
||||||
|
}
|
||||||
|
crate::config::take_snapshot(
|
||||||
|
meta,
|
||||||
|
Scope::Server,
|
||||||
|
"before changing server logging",
|
||||||
|
&originals,
|
||||||
|
)?;
|
||||||
|
for (index, (path, _)) in originals.iter().enumerate() {
|
||||||
|
if let Err(error) = fsx::atomic_write(path, texts[index].as_bytes()) {
|
||||||
|
for (path, bytes) in originals.iter().take(index) {
|
||||||
|
let _ = fsx::atomic_write(path, bytes);
|
||||||
|
}
|
||||||
|
return Err(error);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn changes_auth_world_and_templates_in_all_realms_with_restorable_snapshots() {
|
||||||
|
let temp = tempfile::tempdir().unwrap();
|
||||||
|
let root = temp.path().join("server");
|
||||||
|
let meta = temp.path().join("meta");
|
||||||
|
fs::create_dir_all(&root).unwrap();
|
||||||
|
let mut files = Vec::new();
|
||||||
|
for prefix in ["", ".realms/secondary/", ".realms/reborn/"] {
|
||||||
|
for name in [
|
||||||
|
"Settings/worldserver.conf.template",
|
||||||
|
"Settings/authserver.conf.template",
|
||||||
|
"Core/configs/worldserver.conf",
|
||||||
|
"Core/configs/authserver.conf",
|
||||||
|
] {
|
||||||
|
let path = root.join(format!("{prefix}{name}"));
|
||||||
|
fs::create_dir_all(path.parent().unwrap()).unwrap();
|
||||||
|
let bytes =
|
||||||
|
b"Logger.root=6,Console\r\nAppender.Console=1,6,0\r\nKeep = unchanged\r\n"
|
||||||
|
.to_vec();
|
||||||
|
fs::write(&path, &bytes).unwrap();
|
||||||
|
files.push((path, bytes));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
apply(&root, &meta, "errors").unwrap();
|
||||||
|
for (path, _) in &files {
|
||||||
|
assert!(fs::read_to_string(path)
|
||||||
|
.unwrap()
|
||||||
|
.contains("Logger.root=2,Console\r\n"));
|
||||||
|
}
|
||||||
|
let snapshots = crate::config::list_snapshots(&meta);
|
||||||
|
assert_eq!(snapshots.len(), 1);
|
||||||
|
crate::config::restore_snapshot(&meta, &snapshots[0].id).unwrap();
|
||||||
|
for (path, bytes) in files {
|
||||||
|
assert_eq!(fs::read(path).unwrap(), bytes);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn presets_control_dispatch_and_appenders_and_can_restore_useful_logs() {
|
||||||
|
let original = b"Logger.root=6,Console Server\r\nLogger.sql.sql=6,Console Server\r\nAppender.Console=1,6,0,\"1 9 3 6 5 8\"\r\nAppender.Errors=2,2,0,Errors.log,w\r\nOther = keep\r\n";
|
||||||
|
let off = transform(original, "off").unwrap();
|
||||||
|
assert!(off.contains("Logger.root=0,Console Server\r\n"));
|
||||||
|
assert!(off.contains("Appender.Errors=2,0,0,Errors.log,w\r\n"));
|
||||||
|
let normal = transform(off.as_bytes(), "normal").unwrap();
|
||||||
|
assert!(normal.contains("Logger.root=4,Console Server\r\n"));
|
||||||
|
assert!(normal.contains("Logger.sql.sql=2,Console Server\r\n"));
|
||||||
|
assert!(normal.contains("Appender.Errors=2,2,0,Errors.log,w\r\n"));
|
||||||
|
assert!(normal.contains("Other = keep\r\n"));
|
||||||
|
assert_eq!(transform(normal.as_bytes(), "normal").unwrap(), normal);
|
||||||
|
assert!(transform(original, "unsupported").is_err());
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1888,6 +1888,10 @@ impl RepackEnv<'_> {
|
|||||||
};
|
};
|
||||||
let result = (|| -> Result<()> {
|
let result = (|| -> Result<()> {
|
||||||
crate::update_isolation::begin(self.root, self.meta_dir)?;
|
crate::update_isolation::begin(self.root, self.meta_dir)?;
|
||||||
|
let database = crate::driver::run(self.root, crate::driver::Verb::StartMysql)?;
|
||||||
|
if !database.ok {
|
||||||
|
return Err(Error::Invalid(crate::driver::startup_failure(self.root, &database)));
|
||||||
|
}
|
||||||
use crate::process::{observe, ServiceState};
|
use crate::process::{observe, ServiceState};
|
||||||
let identities = crate::backup::with_database(self.root, |db| {
|
let identities = crate::backup::with_database(self.root, |db| {
|
||||||
if check_schema {
|
if check_schema {
|
||||||
|
|||||||
@@ -41,6 +41,24 @@ struct Saved {
|
|||||||
sha256: Option<String>,
|
sha256: Option<String>,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn bot_files() -> Vec<String> {
|
||||||
|
["", ".realms/secondary/", ".realms/reborn/"]
|
||||||
|
.into_iter()
|
||||||
|
.flat_map(|prefix| {
|
||||||
|
[
|
||||||
|
"mod_coa_playerbots.conf",
|
||||||
|
"mod_coa_playerbots.conf.dist",
|
||||||
|
"playerbots.conf",
|
||||||
|
"playerbots.conf.dist",
|
||||||
|
"mod_playerbots.conf",
|
||||||
|
"mod_playerbots.conf.dist",
|
||||||
|
]
|
||||||
|
.into_iter()
|
||||||
|
.map(move |name| format!("{prefix}Core/configs/modules/{name}"))
|
||||||
|
})
|
||||||
|
.collect()
|
||||||
|
}
|
||||||
|
|
||||||
pub(crate) fn pending(meta: &Path) -> bool {
|
pub(crate) fn pending(meta: &Path) -> bool {
|
||||||
meta.join("validation-configs.json").exists()
|
meta.join("validation-configs.json").exists()
|
||||||
}
|
}
|
||||||
@@ -52,15 +70,20 @@ pub(crate) fn begin(root: &Path, meta: &Path) -> Result<()> {
|
|||||||
));
|
));
|
||||||
}
|
}
|
||||||
let mut saved = BTreeMap::new();
|
let mut saved = BTreeMap::new();
|
||||||
for rel in FILES {
|
let modules = bot_files();
|
||||||
let path = fsx::ensure_within(root, &fsx::safe_join(root, rel)?)?;
|
for rel in FILES
|
||||||
|
.iter()
|
||||||
|
.map(|rel| rel.to_string())
|
||||||
|
.chain(modules.iter().cloned())
|
||||||
|
{
|
||||||
|
let path = fsx::ensure_within(root, &fsx::safe_join(root, &rel)?)?;
|
||||||
let bytes = if path.exists() {
|
let bytes = if path.exists() {
|
||||||
Some(fs::read(path)?)
|
Some(fs::read(path)?)
|
||||||
} else {
|
} else {
|
||||||
None
|
None
|
||||||
};
|
};
|
||||||
let sha256 = bytes.as_ref().map(|b| fsx::sha256_bytes(b));
|
let sha256 = bytes.as_ref().map(|b| fsx::sha256_bytes(b));
|
||||||
saved.insert(*rel, Saved { bytes, sha256 });
|
saved.insert(rel, Saved { bytes, sha256 });
|
||||||
}
|
}
|
||||||
let mut settings: serde_json::Value = fsx::read_json(&root.join("Settings/repack.json"))?;
|
let mut settings: serde_json::Value = fsx::read_json(&root.join("Settings/repack.json"))?;
|
||||||
let mut realm: Option<serde_json::Value> = if root.join("Settings/realm-profile.json").exists()
|
let mut realm: Option<serde_json::Value> = if root.join("Settings/realm-profile.json").exists()
|
||||||
@@ -101,14 +124,14 @@ pub(crate) fn begin(root: &Path, meta: &Path) -> Result<()> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
let mut configs = Vec::new();
|
let mut configs = Vec::new();
|
||||||
for rel in [
|
for rel in FILES.iter().copied().filter(|rel| {
|
||||||
"Settings/worldserver.conf.template",
|
rel.ends_with("worldserver.conf.template")
|
||||||
"Settings/authserver.conf.template",
|
|| rel.ends_with("authserver.conf.template")
|
||||||
"Core/configs/worldserver.conf",
|
|| rel.ends_with("worldserver.conf")
|
||||||
"Core/configs/authserver.conf",
|
|| rel.ends_with("authserver.conf")
|
||||||
] {
|
}) {
|
||||||
let path = root.join(rel);
|
let path = root.join(rel);
|
||||||
if !path.exists() && rel.ends_with(".template") {
|
if !path.exists() && rel.ends_with(".template") && !rel.starts_with(".realms/") {
|
||||||
return Err(Error::Invalid(format!(
|
return Err(Error::Invalid(format!(
|
||||||
"Cannot isolate validation without {rel}."
|
"Cannot isolate validation without {rel}."
|
||||||
)));
|
)));
|
||||||
@@ -118,10 +141,34 @@ pub(crate) fn begin(root: &Path, meta: &Path) -> Result<()> {
|
|||||||
conf.set("BindIP", "\"127.0.0.1\"", &[]);
|
conf.set("BindIP", "\"127.0.0.1\"", &[]);
|
||||||
if rel.contains("worldserver") {
|
if rel.contains("worldserver") {
|
||||||
conf.set("Ra.IP", "\"127.0.0.1\"", &[]);
|
conf.set("Ra.IP", "\"127.0.0.1\"", &[]);
|
||||||
|
conf.set("CoA.ValidationMode", "1", &[]);
|
||||||
}
|
}
|
||||||
configs.push((path, conf.to_text()));
|
configs.push((path, conf.to_text()));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
for rel in modules {
|
||||||
|
let path = fsx::ensure_within(root, &fsx::safe_join(root, &rel)?)?;
|
||||||
|
if !path.exists() {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
let mut conf = ConfFile::parse_bytes(&fs::read(&path)?)?;
|
||||||
|
let keys: &[&str] = if rel.contains("mod_coa_playerbots.") {
|
||||||
|
&[
|
||||||
|
"CoaBots.AutoLoginOnStartup",
|
||||||
|
"CoaBots.RandomSpawn.AutoLogin",
|
||||||
|
]
|
||||||
|
} else {
|
||||||
|
&[
|
||||||
|
"AiPlayerbot.RandomBotAutologin",
|
||||||
|
"AiPlayerbot.BotAutologin",
|
||||||
|
"AiPlayerbot.DeleteRandomBotAccounts",
|
||||||
|
]
|
||||||
|
};
|
||||||
|
for key in keys {
|
||||||
|
conf.set(key, "0", &[]);
|
||||||
|
}
|
||||||
|
configs.push((path, conf.to_text()));
|
||||||
|
}
|
||||||
fsx::atomic_write_json(&meta.join("validation-configs.json"), &saved)?;
|
fsx::atomic_write_json(&meta.join("validation-configs.json"), &saved)?;
|
||||||
fsx::atomic_write_json(&root.join("Settings/repack.json"), &settings)?;
|
fsx::atomic_write_json(&root.join("Settings/repack.json"), &settings)?;
|
||||||
if let Some(state) = realm {
|
if let Some(state) = realm {
|
||||||
@@ -139,16 +186,20 @@ pub(crate) fn restore(root: &Path, meta: &Path) -> Result<()> {
|
|||||||
}
|
}
|
||||||
let journal = meta.join("validation-configs.json");
|
let journal = meta.join("validation-configs.json");
|
||||||
let saved: BTreeMap<String, Saved> = fsx::read_json(&journal)?;
|
let saved: BTreeMap<String, Saved> = fsx::read_json(&journal)?;
|
||||||
// Previous managers could journal only the first two profiles. Recover those
|
let modules = bot_files();
|
||||||
// journals too, while continuing to reject missing or unknown legacy entries.
|
let complete_core = FILES.iter().all(|rel| saved.contains_key(*rel));
|
||||||
let legacy = saved.len() == FILES.len() - 1
|
let legacy_core = FILES
|
||||||
|
.iter()
|
||||||
|
.filter(|rel| **rel != "Settings/realm-profiles/reborn.json")
|
||||||
|
.all(|rel| saved.contains_key(*rel));
|
||||||
|
let current = complete_core
|
||||||
|
&& saved.len() == FILES.len() + modules.len()
|
||||||
|
&& modules.iter().all(|rel| saved.contains_key(rel));
|
||||||
|
let previous = complete_core && saved.len() == FILES.len();
|
||||||
|
let legacy = legacy_core
|
||||||
|
&& saved.len() == FILES.len() - 1
|
||||||
&& !saved.contains_key("Settings/realm-profiles/reborn.json");
|
&& !saved.contains_key("Settings/realm-profiles/reborn.json");
|
||||||
let required = if legacy {
|
if !(current || previous || legacy) {
|
||||||
&FILES[..FILES.len() - 1]
|
|
||||||
} else {
|
|
||||||
FILES
|
|
||||||
};
|
|
||||||
if saved.len() != required.len() || required.iter().any(|rel| !saved.contains_key(*rel)) {
|
|
||||||
return Err(Error::Invalid(
|
return Err(Error::Invalid(
|
||||||
"Isolated validation configuration journal is incomplete.".into(),
|
"Isolated validation configuration journal is incomplete.".into(),
|
||||||
));
|
));
|
||||||
@@ -263,4 +314,92 @@ mod tests {
|
|||||||
assert!(!pending(&meta));
|
assert!(!pending(&meta));
|
||||||
assert_eq!(fs::read(root.join(FILES[0])).unwrap(), before);
|
assert_eq!(fs::read(root.join(FILES[0])).unwrap(), before);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn bot_population_is_suppressed_in_all_realms_and_restored_exactly() {
|
||||||
|
let (_dir, root, meta) = fixture();
|
||||||
|
let companion = b"[worldserver]\r\n# owner settings\r\nCoaBots.Enable = 1\r\nCoaBots.AutoLoginOnStartup = 1\r\nCoaBots.RandomSpawn.AutoLogin = 1\r\nCoaBots.AutoLogin.MaxCount = 2000\r\n";
|
||||||
|
let squid = b"[worldserver]\nAiPlayerbot.Enabled = 1\nAiPlayerbot.RandomBotAutologin = 1\nAiPlayerbot.BotAutologin = 1\nAiPlayerbot.DeleteRandomBotAccounts = 1\n";
|
||||||
|
for rel in bot_files() {
|
||||||
|
fsx::atomic_write(
|
||||||
|
&root.join(&rel),
|
||||||
|
if rel.contains("mod_coa_playerbots.") {
|
||||||
|
companion
|
||||||
|
} else {
|
||||||
|
squid
|
||||||
|
},
|
||||||
|
)
|
||||||
|
.unwrap();
|
||||||
|
}
|
||||||
|
begin(&root, &meta).unwrap();
|
||||||
|
for rel in bot_files() {
|
||||||
|
let conf = ConfFile::parse_bytes(&fs::read(root.join(&rel)).unwrap()).unwrap();
|
||||||
|
if rel.contains("mod_coa_playerbots.") {
|
||||||
|
assert_eq!(conf.get("CoaBots.Enable"), Some("1"));
|
||||||
|
assert_eq!(conf.get("CoaBots.AutoLoginOnStartup"), Some("0"));
|
||||||
|
assert_eq!(conf.get("CoaBots.RandomSpawn.AutoLogin"), Some("0"));
|
||||||
|
assert_eq!(conf.get("CoaBots.AutoLogin.MaxCount"), Some("2000"));
|
||||||
|
} else {
|
||||||
|
assert_eq!(conf.get("AiPlayerbot.Enabled"), Some("1"));
|
||||||
|
assert_eq!(conf.get("AiPlayerbot.RandomBotAutologin"), Some("0"));
|
||||||
|
assert_eq!(conf.get("AiPlayerbot.BotAutologin"), Some("0"));
|
||||||
|
assert_eq!(conf.get("AiPlayerbot.DeleteRandomBotAccounts"), Some("0"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
restore(&root, &meta).unwrap();
|
||||||
|
for rel in bot_files() {
|
||||||
|
assert_eq!(
|
||||||
|
fs::read(root.join(&rel)).unwrap(),
|
||||||
|
if rel.contains("mod_coa_playerbots.") {
|
||||||
|
companion.as_slice()
|
||||||
|
} else {
|
||||||
|
squid.as_slice()
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn validation_removes_only_module_configs_created_during_the_check() {
|
||||||
|
let (_dir, root, meta) = fixture();
|
||||||
|
let dist = root.join("Core/configs/modules/mod_coa_playerbots.conf.dist");
|
||||||
|
let active = root.join("Core/configs/modules/mod_coa_playerbots.conf");
|
||||||
|
let original = b"CoaBots.AutoLoginOnStartup = 1\n";
|
||||||
|
fsx::atomic_write(&dist, original).unwrap();
|
||||||
|
begin(&root, &meta).unwrap();
|
||||||
|
fs::copy(&dist, &active).unwrap();
|
||||||
|
restore(&root, &meta).unwrap();
|
||||||
|
assert!(!active.exists());
|
||||||
|
assert_eq!(fs::read(dist).unwrap(), original);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn previous_manager_journals_remain_recoverable() {
|
||||||
|
for without_reborn in [false, true] {
|
||||||
|
let (_dir, root, meta) = fixture();
|
||||||
|
begin(&root, &meta).unwrap();
|
||||||
|
let journal = meta.join("validation-configs.json");
|
||||||
|
let mut saved: BTreeMap<String, Saved> = fsx::read_json(&journal).unwrap();
|
||||||
|
saved.retain(|key, _| FILES.contains(&key.as_str()));
|
||||||
|
if without_reborn {
|
||||||
|
saved.remove("Settings/realm-profiles/reborn.json");
|
||||||
|
}
|
||||||
|
fsx::atomic_write_json(&journal, &saved).unwrap();
|
||||||
|
restore(&root, &meta).unwrap();
|
||||||
|
assert!(!pending(&meta));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn incomplete_bot_journal_blocks_restoration_before_writing() {
|
||||||
|
let (_dir, root, meta) = fixture();
|
||||||
|
begin(&root, &meta).unwrap();
|
||||||
|
let journal = meta.join("validation-configs.json");
|
||||||
|
let mut saved: BTreeMap<String, Saved> = fsx::read_json(&journal).unwrap();
|
||||||
|
saved.remove(&bot_files()[0]);
|
||||||
|
fsx::atomic_write_json(&journal, &saved).unwrap();
|
||||||
|
let before = fs::read(root.join(FILES[2])).unwrap();
|
||||||
|
assert!(restore(&root, &meta).is_err());
|
||||||
|
assert_eq!(fs::read(root.join(FILES[2])).unwrap(), before);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -94,8 +94,9 @@ fn run() -> Result<(), String> {
|
|||||||
.map_err(e)?;
|
.map_err(e)?;
|
||||||
}
|
}
|
||||||
"qualify-install" => {
|
"qualify-install" => {
|
||||||
let report = coa_core::release_schema::qualify_install(
|
let report = coa_core::release_schema::qualify_install_against(
|
||||||
&PathBuf::from(need(&a, "package")?),
|
&PathBuf::from(need(&a, "package")?),
|
||||||
|
Some(&PathBuf::from(need(&a, "update")?)),
|
||||||
&PathBuf::from(need(&a, "fixture")?),
|
&PathBuf::from(need(&a, "fixture")?),
|
||||||
coa_core::signing::EMBEDDED_PUBLIC_KEY,
|
coa_core::signing::EMBEDDED_PUBLIC_KEY,
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -1,6 +1,24 @@
|
|||||||
{
|
{
|
||||||
"schema": 1,
|
"schema": 1,
|
||||||
"modules": [
|
"modules": [
|
||||||
|
{
|
||||||
|
"id": "dungeon-clear",
|
||||||
|
"name": "Dungeon Clear",
|
||||||
|
"description": {
|
||||||
|
"en": "Dungeon tactics for SQUID bots. Requires SQUID bots to be enabled.",
|
||||||
|
"ru": "Тактика подземелий для SQUID bots. Работает только при включённых SQUID bots.",
|
||||||
|
"de": "Dungeon-Taktiken für SQUID-Bots. Erfordert aktivierte SQUID-Bots.",
|
||||||
|
"fr": "Tactiques de donjon pour les bots SQUID. Nécessite les bots SQUID activés.",
|
||||||
|
"es": "Tácticas de mazmorra para bots SQUID. Requiere activar los bots SQUID.",
|
||||||
|
"zh": "为 SQUID 机器人提供地下城战术。需要启用 SQUID 机器人。"
|
||||||
|
},
|
||||||
|
"repo": "https://github.com/Zyth45/mod-dungeon-clear",
|
||||||
|
"conf": "mod_dungeon_clear.conf",
|
||||||
|
"enable_key": "DungeonClear.Enable",
|
||||||
|
"default_on": false,
|
||||||
|
"status": "early",
|
||||||
|
"icon": "bot"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"id": "companions",
|
"id": "companions",
|
||||||
"name": "CoA Companions",
|
"name": "CoA Companions",
|
||||||
|
|||||||
Generated
+2
-2
@@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "coa-server-manager",
|
"name": "coa-server-manager",
|
||||||
"version": "0.9.2",
|
"version": "0.9.13",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "coa-server-manager",
|
"name": "coa-server-manager",
|
||||||
"version": "0.9.2",
|
"version": "0.9.13",
|
||||||
"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.9.2",
|
"version": "0.9.13",
|
||||||
"license": "AGPL-3.0-only",
|
"license": "AGPL-3.0-only",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|||||||
@@ -422,6 +422,128 @@
|
|||||||
"max": 40,
|
"max": 40,
|
||||||
"unit": "yards"
|
"unit": "yards"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"key": "CoaBots.Scaling.Enable",
|
||||||
|
"type": "bool",
|
||||||
|
"category": "combat",
|
||||||
|
"title": "Bot strength help in dungeons and raids",
|
||||||
|
"description": "Master switch for the multipliers below. They are all 1 (no change) until you raise them.",
|
||||||
|
"default": true,
|
||||||
|
"advanced": false,
|
||||||
|
"restartRequired": "world",
|
||||||
|
"dangerous": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"key": "CoaBots.Scaling.Dungeons",
|
||||||
|
"type": "bool",
|
||||||
|
"category": "combat",
|
||||||
|
"title": "Help in 5-player dungeons",
|
||||||
|
"description": "Apply the multipliers while a bot is in a 5-player dungeon.",
|
||||||
|
"default": true,
|
||||||
|
"advanced": false,
|
||||||
|
"restartRequired": "world",
|
||||||
|
"dangerous": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"key": "CoaBots.Scaling.Raids",
|
||||||
|
"type": "bool",
|
||||||
|
"category": "combat",
|
||||||
|
"title": "Help in raids",
|
||||||
|
"description": "Apply the multipliers while a bot is in a raid.",
|
||||||
|
"default": true,
|
||||||
|
"advanced": false,
|
||||||
|
"restartRequired": "world",
|
||||||
|
"dangerous": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"key": "CoaBots.Scaling.Battlegrounds",
|
||||||
|
"type": "bool",
|
||||||
|
"category": "combat",
|
||||||
|
"title": "Help in battlegrounds and arenas",
|
||||||
|
"description": "Apply the multipliers in battlegrounds and arenas.",
|
||||||
|
"default": false,
|
||||||
|
"advanced": true,
|
||||||
|
"restartRequired": "world",
|
||||||
|
"dangerous": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"key": "CoaBots.Scaling.World",
|
||||||
|
"type": "bool",
|
||||||
|
"category": "combat",
|
||||||
|
"title": "Help in the open world",
|
||||||
|
"description": "Apply the multipliers outside dungeons and raids. Usually not wanted.",
|
||||||
|
"default": false,
|
||||||
|
"advanced": true,
|
||||||
|
"restartRequired": "world",
|
||||||
|
"dangerous": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"key": "CoaBots.Scaling.DamageDone",
|
||||||
|
"type": "float",
|
||||||
|
"category": "combat",
|
||||||
|
"title": "Bot damage",
|
||||||
|
"description": "Multiplies the damage bots and their pets deal to creatures. 1 is no change; higher makes content easier.",
|
||||||
|
"default": 1.0,
|
||||||
|
"advanced": false,
|
||||||
|
"restartRequired": "world",
|
||||||
|
"dangerous": false,
|
||||||
|
"min": 0.1,
|
||||||
|
"max": 10,
|
||||||
|
"unit": "x"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"key": "CoaBots.Scaling.HealingDone",
|
||||||
|
"type": "float",
|
||||||
|
"category": "combat",
|
||||||
|
"title": "Bot healing",
|
||||||
|
"description": "Multiplies the healing bots cast. 1 is no change.",
|
||||||
|
"default": 1.0,
|
||||||
|
"advanced": false,
|
||||||
|
"restartRequired": "world",
|
||||||
|
"dangerous": false,
|
||||||
|
"min": 0.1,
|
||||||
|
"max": 10,
|
||||||
|
"unit": "x"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"key": "CoaBots.Scaling.DamageTaken",
|
||||||
|
"type": "float",
|
||||||
|
"category": "combat",
|
||||||
|
"title": "Damage taken by bots",
|
||||||
|
"description": "Multiplies the damage creatures deal to bots. Below 1 bots take less; 1 is no change.",
|
||||||
|
"default": 1.0,
|
||||||
|
"advanced": false,
|
||||||
|
"restartRequired": "world",
|
||||||
|
"dangerous": false,
|
||||||
|
"min": 0.1,
|
||||||
|
"max": 10,
|
||||||
|
"unit": "x"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"key": "CoaBots.Scaling.TankThreat",
|
||||||
|
"type": "float",
|
||||||
|
"category": "combat",
|
||||||
|
"title": "Tank threat",
|
||||||
|
"description": "Extra threat generated by bot tanks so they hold the enemy's attention. 1 is no change.",
|
||||||
|
"default": 1.0,
|
||||||
|
"advanced": false,
|
||||||
|
"restartRequired": "world",
|
||||||
|
"dangerous": false,
|
||||||
|
"min": 1,
|
||||||
|
"max": 10,
|
||||||
|
"unit": "x"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"key": "CoaBots.Scaling.BossTuning",
|
||||||
|
"type": "bool",
|
||||||
|
"category": "combat",
|
||||||
|
"title": "Extra help against four bosses",
|
||||||
|
"description": "Adds stronger multipliers for Loken, the Drakkari Elemental, the Drakkari Colossus and Gal'darah, whom level 60 bots could not beat otherwise. For testing; off by default.",
|
||||||
|
"default": false,
|
||||||
|
"advanced": true,
|
||||||
|
"restartRequired": "world",
|
||||||
|
"dangerous": false
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"key": "CoaBots.WorldBrain.MountDistanceMin",
|
"key": "CoaBots.WorldBrain.MountDistanceMin",
|
||||||
"type": "int",
|
"type": "int",
|
||||||
|
|||||||
@@ -16,6 +16,7 @@ tauri = { version = "2", features = ["tray-icon"] }
|
|||||||
tauri-plugin-dialog = "2"
|
tauri-plugin-dialog = "2"
|
||||||
tauri-plugin-updater = "2"
|
tauri-plugin-updater = "2"
|
||||||
tauri-plugin-process = "2"
|
tauri-plugin-process = "2"
|
||||||
|
tauri-plugin-single-instance = "2"
|
||||||
tauri-plugin-opener = "2"
|
tauri-plugin-opener = "2"
|
||||||
serde = { version = "1", features = ["derive"] }
|
serde = { version = "1", features = ["derive"] }
|
||||||
serde_json = "1"
|
serde_json = "1"
|
||||||
|
|||||||
@@ -0,0 +1,52 @@
|
|||||||
|
use std::path::Path;
|
||||||
|
|
||||||
|
pub fn enabled(dir: &Path) -> coa_core::Result<bool> {
|
||||||
|
match std::fs::read(dir.join("public-server-browsing.json")) {
|
||||||
|
Ok(bytes) => Ok(serde_json::from_slice(&bytes)?),
|
||||||
|
Err(e) if e.kind() == std::io::ErrorKind::NotFound => Ok(true),
|
||||||
|
Err(e) => Err(e.into()),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn save(dir: &Path, enabled: bool) -> coa_core::Result<()> {
|
||||||
|
coa_core::fsx::atomic_write_json(&dir.join("public-server-browsing.json"), &enabled)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn require_enabled(dir: &Path) -> coa_core::Result<()> {
|
||||||
|
if enabled(dir)? {
|
||||||
|
Ok(())
|
||||||
|
} else {
|
||||||
|
Err(coa_core::Error::Invalid(
|
||||||
|
"Public server browsing is disabled in Settings.".into(),
|
||||||
|
))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn disabled_and_corrupt_preferences_block_browsing() {
|
||||||
|
let dir = std::env::temp_dir().join(format!(
|
||||||
|
"coa-browse-prefs-{}-{}",
|
||||||
|
std::process::id(),
|
||||||
|
std::time::SystemTime::now()
|
||||||
|
.duration_since(std::time::UNIX_EPOCH)
|
||||||
|
.unwrap()
|
||||||
|
.as_nanos()
|
||||||
|
));
|
||||||
|
std::fs::create_dir_all(&dir).unwrap();
|
||||||
|
assert!(enabled(&dir).unwrap());
|
||||||
|
save(&dir, false).unwrap();
|
||||||
|
assert!(!enabled(&dir).unwrap());
|
||||||
|
assert!(require_enabled(&dir).is_err());
|
||||||
|
save(&dir, true).unwrap();
|
||||||
|
assert!(require_enabled(&dir).is_ok());
|
||||||
|
let file = dir.join("public-server-browsing.json");
|
||||||
|
std::fs::write(&file, b"broken").unwrap();
|
||||||
|
assert!(require_enabled(&dir).is_err());
|
||||||
|
std::fs::remove_file(file).unwrap();
|
||||||
|
std::fs::remove_dir(dir).unwrap();
|
||||||
|
}
|
||||||
|
}
|
||||||
+204
-36
@@ -5,7 +5,9 @@ use std::collections::HashSet;
|
|||||||
use std::path::PathBuf;
|
use std::path::PathBuf;
|
||||||
use std::sync::{Arc, Mutex};
|
use std::sync::{Arc, Mutex};
|
||||||
|
|
||||||
|
mod browse_preferences;
|
||||||
mod docker_install;
|
mod docker_install;
|
||||||
|
mod window_preferences;
|
||||||
|
|
||||||
use coa_core::backup::{self, Kind, RecoveryPoint, Trigger, VerifyReport};
|
use coa_core::backup::{self, Kind, RecoveryPoint, Trigger, VerifyReport};
|
||||||
use coa_core::config::{self, Scope, SettingsView};
|
use coa_core::config::{self, Scope, SettingsView};
|
||||||
@@ -28,6 +30,16 @@ use tauri::{AppHandle, Emitter, Manager, State};
|
|||||||
|
|
||||||
mod control_cmds;
|
mod control_cmds;
|
||||||
|
|
||||||
|
/// Informational release notes only; never used to select or authorize an update.
|
||||||
|
#[tauri::command]
|
||||||
|
async fn release_history(component: String, target: Option<String>) -> std::result::Result<Value, String> {
|
||||||
|
tauri::async_runtime::spawn_blocking(move || {
|
||||||
|
coa_core::release_history::load_for_target(&component, &data_dir().join("release-history"), target.as_deref())
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
.map_err(|e| e.to_string())?
|
||||||
|
}
|
||||||
|
|
||||||
struct AppState {
|
struct AppState {
|
||||||
registry: Registry,
|
registry: Registry,
|
||||||
/// Installation ids with a start/stop currently running (one action at a time per server).
|
/// Installation ids with a start/stop currently running (one action at a time per server).
|
||||||
@@ -291,10 +303,39 @@ fn installation_source(custom: Option<String>) -> Result<Source> {
|
|||||||
.ok()
|
.ok()
|
||||||
.filter(|value| !value.trim().is_empty())
|
.filter(|value| !value.trim().is_empty())
|
||||||
});
|
});
|
||||||
|
select_installation_source(custom, || update_source(None))
|
||||||
|
}
|
||||||
|
|
||||||
|
fn select_installation_source(
|
||||||
|
custom: Option<String>,
|
||||||
|
latest: impl FnOnce() -> Result<Source>,
|
||||||
|
) -> Result<Source> {
|
||||||
if custom.is_some() {
|
if custom.is_some() {
|
||||||
return Ok(package_source(custom));
|
return Ok(package_source(custom));
|
||||||
}
|
}
|
||||||
Ok(Source::Installation(Box::new(update_source(None)?)))
|
Ok(Source::Installation(Box::new(latest()?)))
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod installation_source_tests {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn fresh_install_uses_the_selected_current_release_full_image() {
|
||||||
|
let source = select_installation_source(None, || {
|
||||||
|
Ok(Source::Url("https://example.test/releases/current".into()))
|
||||||
|
}).unwrap();
|
||||||
|
assert!(matches!(source, Source::Installation(inner)
|
||||||
|
if matches!(*inner, Source::Url(ref url) if url.ends_with("/current"))));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn unavailable_current_release_does_not_fall_back_to_an_old_base() {
|
||||||
|
let result = select_installation_source(None, || {
|
||||||
|
Err(Error::PackageNotPublished("current unavailable".into()))
|
||||||
|
});
|
||||||
|
assert!(matches!(result, Err(Error::PackageNotPublished(_))));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Serialize)]
|
#[derive(Serialize)]
|
||||||
@@ -612,7 +653,10 @@ async fn start_server(
|
|||||||
&& coa_core::friends::load(&meta).mode != coa_core::friends::Mode::Local
|
&& coa_core::friends::load(&meta).mode != coa_core::friends::Mode::Local
|
||||||
{
|
{
|
||||||
let extra = coa_core::realms::state(&root)?.extra_world_ports();
|
let extra = coa_core::realms::state(&root)?.extra_world_ports();
|
||||||
if let Err(e) = coa_core::firewall::ensure_rules_with_extra(&layout::read_ports(&root), &extra) {
|
if let Err(e) = coa_core::firewall::ensure_rules_with_extra(
|
||||||
|
&layout::read_ports(&root),
|
||||||
|
&extra,
|
||||||
|
) {
|
||||||
tracing::warn!("firewall rules for the running worlds were not added: {e}");
|
tracing::warn!("firewall rules for the running worlds were not added: {e}");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -624,6 +668,16 @@ async fn start_server(
|
|||||||
Ok(out)
|
Ok(out)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[tauri::command]
|
||||||
|
async fn force_stop_server(
|
||||||
|
state: State<'_, AppState>,
|
||||||
|
id: String,
|
||||||
|
) -> std::result::Result<DriverOutcome, UiError> {
|
||||||
|
let root = path_of(&state, &id)?;
|
||||||
|
let _guard = BusyGuard::acquire(&state, &id)?;
|
||||||
|
blocking(move || driver::force_stop(&root)).await
|
||||||
|
}
|
||||||
|
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
async fn stop_server(
|
async fn stop_server(
|
||||||
state: State<'_, AppState>,
|
state: State<'_, AppState>,
|
||||||
@@ -669,6 +723,20 @@ async fn get_settings(
|
|||||||
blocking(move || config::load(&root, scope)).await
|
blocking(move || config::load(&root, scope)).await
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[tauri::command]
|
||||||
|
async fn server_logging_preset(
|
||||||
|
state: State<'_, AppState>,
|
||||||
|
id: String,
|
||||||
|
preset: String,
|
||||||
|
) -> std::result::Result<(), UiError> {
|
||||||
|
let root = path_of(&state, &id)?;
|
||||||
|
let _guard = BusyGuard::acquire(&state, &id)?;
|
||||||
|
blocking(move || {
|
||||||
|
let meta = meta_dir(&root)?;
|
||||||
|
coa_core::server_logging::apply(&root, &meta, &preset)
|
||||||
|
}).await
|
||||||
|
}
|
||||||
|
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
async fn save_settings(
|
async fn save_settings(
|
||||||
state: State<'_, AppState>,
|
state: State<'_, AppState>,
|
||||||
@@ -1030,14 +1098,10 @@ async fn create_account(
|
|||||||
password: String,
|
password: String,
|
||||||
administrator: bool,
|
administrator: bool,
|
||||||
) -> std::result::Result<(), UiError> {
|
) -> std::result::Result<(), UiError> {
|
||||||
|
let _guard = BusyGuard::acquire(&state, &id)?;
|
||||||
let root = path_of(&state, &id)?;
|
let root = path_of(&state, &id)?;
|
||||||
blocking(move || {
|
blocking(move || {
|
||||||
coa_core::ra::validate_account(&username, &password)?;
|
coa_core::accounts::create(&root, &username, &password, administrator)?;
|
||||||
let mut ra = Ra::connect(&root)?;
|
|
||||||
ra.create_account(&username, &password)?;
|
|
||||||
if administrator {
|
|
||||||
ra.make_administrator(&username)?;
|
|
||||||
}
|
|
||||||
tracing::info!(%username, administrator, "account created");
|
tracing::info!(%username, administrator, "account created");
|
||||||
Ok(())
|
Ok(())
|
||||||
})
|
})
|
||||||
@@ -1987,6 +2051,34 @@ fn client_of(root: &std::path::Path) -> Result<(PathBuf, InstallMeta, Option<Pat
|
|||||||
Ok((dir, meta, Some(client)))
|
Ok((dir, meta, Some(client)))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[tauri::command]
|
||||||
|
fn client_graphics(
|
||||||
|
state: State<'_, AppState>,
|
||||||
|
id: String,
|
||||||
|
) -> std::result::Result<coa_core::client_graphics::Graphics, UiError> {
|
||||||
|
Ok(coa_core::client_graphics::status(
|
||||||
|
&client_context(&state, &id)?.require()?,
|
||||||
|
)?)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tauri::command]
|
||||||
|
fn client_set_graphics(
|
||||||
|
state: State<'_, AppState>,
|
||||||
|
id: String,
|
||||||
|
name: String,
|
||||||
|
disabled: bool,
|
||||||
|
) -> std::result::Result<coa_core::client_graphics::Graphics, 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());
|
||||||
|
}
|
||||||
|
Ok(coa_core::client_graphics::set(
|
||||||
|
&client_context(&state, &id)?.require()?,
|
||||||
|
&name,
|
||||||
|
disabled,
|
||||||
|
)?)
|
||||||
|
}
|
||||||
|
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
fn client_info(
|
fn client_info(
|
||||||
state: State<'_, AppState>,
|
state: State<'_, AppState>,
|
||||||
@@ -2482,7 +2574,7 @@ async fn report_context(
|
|||||||
.into_iter()
|
.into_iter()
|
||||||
.flatten()
|
.flatten()
|
||||||
.collect::<Vec<String>>()
|
.collect::<Vec<String>>()
|
||||||
.join(" · ");
|
.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(),
|
||||||
@@ -2782,30 +2874,69 @@ async fn console_command(
|
|||||||
.await
|
.await
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[tauri::command]
|
||||||
|
fn manager_installing(enabled: bool) {
|
||||||
|
QUIT_REQUESTED.store(enabled, std::sync::atomic::Ordering::SeqCst);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tauri::command]
|
||||||
|
fn close_manager(app: AppHandle) -> std::result::Result<(), UiError> {
|
||||||
|
if window_preferences::close_to_tray(&data_dir()).unwrap_or(false) {
|
||||||
|
QUIT_REQUESTED.store(false, std::sync::atomic::Ordering::SeqCst);
|
||||||
|
if let Some(window) = app.get_webview_window("main") {
|
||||||
|
window.hide().map_err(|e| Error::Invalid(e.to_string()))?;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
QUIT_REQUESTED.store(true, std::sync::atomic::Ordering::SeqCst);
|
||||||
|
app.exit(0);
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tauri::command]
|
||||||
|
fn close_to_tray() -> std::result::Result<bool, UiError> {
|
||||||
|
Ok(window_preferences::close_to_tray(&data_dir())?)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tauri::command]
|
||||||
|
fn set_close_to_tray(enabled: bool) -> std::result::Result<(), UiError> {
|
||||||
|
Ok(window_preferences::save(&data_dir(), enabled)?)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn show_main_window(app: &AppHandle) {
|
||||||
|
let handle = app.clone();
|
||||||
|
if let Err(error) = app.run_on_main_thread(move || {
|
||||||
|
if let Some(window) = handle.get_webview_window("main") {
|
||||||
|
let result = window
|
||||||
|
.unminimize()
|
||||||
|
.and_then(|_| window.show())
|
||||||
|
.and_then(|_| window.set_focus());
|
||||||
|
if let Err(error) = result {
|
||||||
|
tracing::error!(%error, "Could not restore the Manager window");
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
tracing::error!("The Manager main window is missing");
|
||||||
|
}
|
||||||
|
}) {
|
||||||
|
tracing::error!(%error, "Could not schedule Manager window restoration");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
static QUIT_REQUESTED: std::sync::atomic::AtomicBool = std::sync::atomic::AtomicBool::new(false);
|
static QUIT_REQUESTED: std::sync::atomic::AtomicBool = std::sync::atomic::AtomicBool::new(false);
|
||||||
|
|
||||||
pub fn run() {
|
pub fn run() {
|
||||||
let dir = data_dir();
|
let dir = data_dir();
|
||||||
let _ = coa_core::logging::init(&dir.join("logs").join("manager.log"));
|
let _ = coa_core::logging::init(&dir.join("logs").join("manager.log"));
|
||||||
// Crash safety: recover any unfinished client realmlist overrides from previous abnormal termination
|
|
||||||
let _ = coa_core::client::revert_realmlist_override(&dir);
|
|
||||||
let portable = start_portable(&dir);
|
|
||||||
let (control, host_control) = control_cmds::start(&dir, portable.clone());
|
|
||||||
tauri::Builder::default()
|
tauri::Builder::default()
|
||||||
|
.plugin(tauri_plugin_single_instance::init(|app, _, _| {
|
||||||
|
show_main_window(app)
|
||||||
|
}))
|
||||||
.plugin(tauri_plugin_dialog::init())
|
.plugin(tauri_plugin_dialog::init())
|
||||||
.plugin(tauri_plugin_updater::Builder::new().build())
|
.plugin(tauri_plugin_updater::Builder::new().build())
|
||||||
.plugin(tauri_plugin_process::init())
|
.plugin(tauri_plugin_process::init())
|
||||||
.manage(AppState {
|
|
||||||
registry: Registry::at(dir.join("installs.json")),
|
|
||||||
busy: Mutex::new(HashSet::new()),
|
|
||||||
install_cancel: Mutex::new(None),
|
|
||||||
client_cancel: Mutex::new(None),
|
|
||||||
portable,
|
|
||||||
realm_registry: start_realm_registry(&dir),
|
|
||||||
control,
|
|
||||||
host_control,
|
|
||||||
})
|
|
||||||
.invoke_handler(tauri::generate_handler![
|
.invoke_handler(tauri::generate_handler![
|
||||||
|
server_logging_preset,
|
||||||
|
release_history,
|
||||||
default_install_dir,
|
default_install_dir,
|
||||||
game_data_folder,
|
game_data_folder,
|
||||||
set_game_data_folder,
|
set_game_data_folder,
|
||||||
@@ -2817,6 +2948,7 @@ pub fn run() {
|
|||||||
server_status,
|
server_status,
|
||||||
start_server,
|
start_server,
|
||||||
stop_server,
|
stop_server,
|
||||||
|
force_stop_server,
|
||||||
get_settings,
|
get_settings,
|
||||||
save_settings,
|
save_settings,
|
||||||
list_presets,
|
list_presets,
|
||||||
@@ -2881,6 +3013,8 @@ pub fn run() {
|
|||||||
remote_connection,
|
remote_connection,
|
||||||
remote_connect,
|
remote_connect,
|
||||||
client_info,
|
client_info,
|
||||||
|
client_graphics,
|
||||||
|
client_set_graphics,
|
||||||
set_client,
|
set_client,
|
||||||
client_realmlist,
|
client_realmlist,
|
||||||
client_install_addon,
|
client_install_addon,
|
||||||
@@ -2921,6 +3055,12 @@ pub fn run() {
|
|||||||
portable_launch,
|
portable_launch,
|
||||||
registry_status,
|
registry_status,
|
||||||
portable_preflight_remote,
|
portable_preflight_remote,
|
||||||
|
manager_installing,
|
||||||
|
close_manager,
|
||||||
|
close_to_tray,
|
||||||
|
set_close_to_tray,
|
||||||
|
browse_enabled,
|
||||||
|
browse_set_enabled,
|
||||||
browse_list,
|
browse_list,
|
||||||
browse_detail,
|
browse_detail,
|
||||||
module_catalog,
|
module_catalog,
|
||||||
@@ -2941,18 +3081,43 @@ pub fn run() {
|
|||||||
])
|
])
|
||||||
.on_window_event(|window, event| {
|
.on_window_event(|window, event| {
|
||||||
if let tauri::WindowEvent::CloseRequested { api, .. } = event {
|
if let tauri::WindowEvent::CloseRequested { api, .. } = event {
|
||||||
|
if window.label() != "main" {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if window_preferences::close_to_tray(&data_dir()).unwrap_or(false) {
|
||||||
api.prevent_close();
|
api.prevent_close();
|
||||||
let _ = window.hide();
|
if let Err(error) = window.hide() {
|
||||||
|
tracing::warn!(%error, "Could not hide the Manager window");
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
QUIT_REQUESTED.store(true, std::sync::atomic::Ordering::SeqCst);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.setup(|app| {
|
.setup(|app| {
|
||||||
|
let dir = data_dir();
|
||||||
|
// Crash safety: recover any unfinished client realmlist overrides from previous abnormal termination
|
||||||
|
let _ = coa_core::client::revert_realmlist_override(&dir);
|
||||||
|
let portable = start_portable(&dir);
|
||||||
|
let (control, host_control) = control_cmds::start(&dir, portable.clone());
|
||||||
|
app.manage(AppState {
|
||||||
|
registry: Registry::at(dir.join("installs.json")),
|
||||||
|
busy: Mutex::new(HashSet::new()),
|
||||||
|
install_cancel: Mutex::new(None),
|
||||||
|
client_cancel: Mutex::new(None),
|
||||||
|
portable,
|
||||||
|
realm_registry: start_realm_registry(&dir),
|
||||||
|
control,
|
||||||
|
host_control,
|
||||||
|
});
|
||||||
|
|
||||||
#[cfg(desktop)]
|
#[cfg(desktop)]
|
||||||
{
|
{
|
||||||
use tauri::menu::{Menu, MenuItem};
|
use tauri::menu::{Menu, MenuItem};
|
||||||
use tauri::tray::{MouseButton, MouseButtonState, TrayIconBuilder, TrayIconEvent};
|
use tauri::tray::{MouseButton, MouseButtonState, TrayIconBuilder, TrayIconEvent};
|
||||||
use tauri::Manager;
|
|
||||||
|
|
||||||
let show = MenuItem::with_id(app, "show", "Open CoA Server Manager", true, None::<&str>)?;
|
let show =
|
||||||
|
MenuItem::with_id(app, "show", "Open CoA Server Manager", true, None::<&str>)?;
|
||||||
let quit = MenuItem::with_id(app, "quit", "Exit", true, None::<&str>)?;
|
let quit = MenuItem::with_id(app, "quit", "Exit", true, None::<&str>)?;
|
||||||
let menu = Menu::with_items(app, &[&show, &quit])?;
|
let menu = Menu::with_items(app, &[&show, &quit])?;
|
||||||
|
|
||||||
@@ -2962,11 +3127,7 @@ pub fn run() {
|
|||||||
.show_menu_on_left_click(false)
|
.show_menu_on_left_click(false)
|
||||||
.on_menu_event(|app, event| match event.id.as_ref() {
|
.on_menu_event(|app, event| match event.id.as_ref() {
|
||||||
"show" => {
|
"show" => {
|
||||||
if let Some(window) = app.get_webview_window("main") {
|
show_main_window(app);
|
||||||
let _ = window.show();
|
|
||||||
let _ = window.unminimize();
|
|
||||||
let _ = window.set_focus();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
"quit" => {
|
"quit" => {
|
||||||
QUIT_REQUESTED.store(true, std::sync::atomic::Ordering::SeqCst);
|
QUIT_REQUESTED.store(true, std::sync::atomic::Ordering::SeqCst);
|
||||||
@@ -2982,11 +3143,7 @@ pub fn run() {
|
|||||||
} = event
|
} = event
|
||||||
{
|
{
|
||||||
let app = tray.app_handle();
|
let app = tray.app_handle();
|
||||||
if let Some(window) = app.get_webview_window("main") {
|
show_main_window(app);
|
||||||
let _ = window.show();
|
|
||||||
let _ = window.unminimize();
|
|
||||||
let _ = window.set_focus();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -3046,6 +3203,7 @@ async fn portable_preflight_remote(
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn browse_client() -> std::result::Result<coa_core::realm_registry::BrowseClient, UiError> {
|
fn browse_client() -> std::result::Result<coa_core::realm_registry::BrowseClient, UiError> {
|
||||||
|
browse_preferences::require_enabled(&data_dir())?;
|
||||||
let settings = coa_core::realm_registry::settings::load(&data_dir().join("registry"))?;
|
let settings = coa_core::realm_registry::settings::load(&data_dir().join("registry"))?;
|
||||||
let url = std::env::var("COA_REGISTRY_URL")
|
let url = std::env::var("COA_REGISTRY_URL")
|
||||||
.ok()
|
.ok()
|
||||||
@@ -3054,6 +3212,16 @@ fn browse_client() -> std::result::Result<coa_core::realm_registry::BrowseClient
|
|||||||
Ok(coa_core::realm_registry::BrowseClient::new(&url)?)
|
Ok(coa_core::realm_registry::BrowseClient::new(&url)?)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[tauri::command]
|
||||||
|
fn browse_enabled() -> std::result::Result<bool, UiError> {
|
||||||
|
Ok(browse_preferences::enabled(&data_dir())?)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tauri::command]
|
||||||
|
fn browse_set_enabled(enabled: bool) -> std::result::Result<(), UiError> {
|
||||||
|
Ok(browse_preferences::save(&data_dir(), enabled)?)
|
||||||
|
}
|
||||||
|
|
||||||
fn browse_error(e: coa_core::realm_registry::ClientError) -> UiError {
|
fn browse_error(e: coa_core::realm_registry::ClientError) -> UiError {
|
||||||
Error::Invalid(e.to_string()).into()
|
Error::Invalid(e.to_string()).into()
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,13 @@
|
|||||||
|
use std::path::Path;
|
||||||
|
|
||||||
|
pub fn close_to_tray(dir: &Path) -> coa_core::Result<bool> {
|
||||||
|
match std::fs::read(dir.join("close-to-tray.json")) {
|
||||||
|
Ok(bytes) => Ok(serde_json::from_slice(&bytes)?),
|
||||||
|
Err(e) if e.kind() == std::io::ErrorKind::NotFound => Ok(false),
|
||||||
|
Err(e) => Err(e.into()),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn save(dir: &Path, enabled: bool) -> coa_core::Result<()> {
|
||||||
|
coa_core::fsx::atomic_write_json(&dir.join("close-to-tray.json"), &enabled)
|
||||||
|
}
|
||||||
@@ -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.9.2",
|
"version": "0.9.13",
|
||||||
"identifier": "com.coa.servermanager",
|
"identifier": "com.coa.servermanager",
|
||||||
"build": {
|
"build": {
|
||||||
"beforeDevCommand": "npm run dev",
|
"beforeDevCommand": "npm run dev",
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ const buttonVariants = cva(
|
|||||||
size: {
|
size: {
|
||||||
sm: "h-9 px-3 text-sm",
|
sm: "h-9 px-3 text-sm",
|
||||||
md: "h-11 px-5 text-[15px]",
|
md: "h-11 px-5 text-[15px]",
|
||||||
xl: "h-16 px-10 text-lg tracking-wide",
|
xl: "h-12 px-6 text-base",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
defaultVariants: { variant: "secondary", size: "md" },
|
defaultVariants: { variant: "secondary", size: "md" },
|
||||||
|
|||||||
@@ -0,0 +1,15 @@
|
|||||||
|
import { Button, type ButtonProps } from "./button";
|
||||||
|
|
||||||
|
/** Two explicit actions, each with its own enabled state and keyboard focus. */
|
||||||
|
export function SplitButton({ label, primary, secondary }: {
|
||||||
|
label: string;
|
||||||
|
primary: ButtonProps;
|
||||||
|
secondary: ButtonProps;
|
||||||
|
}) {
|
||||||
|
return <div role="group" aria-label={label} className="inline-flex max-w-full items-stretch rounded-md">
|
||||||
|
<Button type="button" variant="primary" {...primary}
|
||||||
|
className="h-auto min-h-12 min-w-0 rounded-r-none px-5 py-2 text-sm whitespace-normal" />
|
||||||
|
<Button type="button" variant="secondary" {...secondary}
|
||||||
|
className="h-auto min-h-12 min-w-0 rounded-l-none border-l border-l-gold/30 px-4 py-2 text-sm whitespace-normal" />
|
||||||
|
</div>;
|
||||||
|
}
|
||||||
@@ -0,0 +1,51 @@
|
|||||||
|
# Release history data (internal)
|
||||||
|
|
||||||
|
The Manager feed is imported from the canonical `changelog/history.json`. The
|
||||||
|
server snapshot in this directory is copied from `Corfirean/coa-server-build`
|
||||||
|
commit `902ed8eed3017e3ee8c31e5dc5e4df6f551362bf`, path
|
||||||
|
`changelog/history.json`, on 2026-11-03. Only schema, component, repository and
|
||||||
|
releases are retained. Do not independently edit historical records here.
|
||||||
|
|
||||||
|
At runtime the native read-only command fetches the fixed canonical URL, bounds
|
||||||
|
and validates the feed, and caches it for offline use. The bundled records appear
|
||||||
|
immediately and remain available if neither network nor cache is usable. These
|
||||||
|
records cannot select a package or authorize an update.
|
||||||
|
|
||||||
|
`latest-note-translations.json` contains the reviewed Manager notes through 0.9.3, the new
|
||||||
|
0.9.4 Manager entries, and the 0.261028.83 server notes in Russian, German, French, Spanish and Simplified
|
||||||
|
Chinese. English remains canonical. Translations are keyed by exact original
|
||||||
|
text: changing an original invalidates its translation. A partly translated
|
||||||
|
release falls back entirely to English and displays an explicit notice.
|
||||||
|
|
||||||
|
When preparing future release notes, refresh the server snapshot from a pinned
|
||||||
|
canonical commit and add all five translations for each new original note.
|
||||||
|
Never rewrite released fragments to add translations. Run
|
||||||
|
`node --test tools/release-history.test.mjs`; its completeness check expects the
|
||||||
|
latest bundled record of each component to have every translation.
|
||||||
|
|
||||||
|
Manager 0.9.5 prepares all five translations of the ten reviewed stabilization notes and
|
||||||
|
three server stabilization notes before their release. The bundled snapshot includes server
|
||||||
|
0.261029.85 from the pinned commit above. Pending notes do not fabricate published records.
|
||||||
|
|
||||||
|
The reviewed upcoming server record is tested from tools/reviewed-server-notes.json,
|
||||||
|
bound to the exact core, companions and SQUID source commits. This includes the
|
||||||
|
SQUID 2.8.2 update note. The plan is not a published history record. Manager 0.9.7
|
||||||
|
carries these translations; the unpublished 0.9.6 installer is retained as an older candidate.
|
||||||
|
|
||||||
|
Manager 0.9.8 preparation refreshes the bundled server history through 0.261030.90.
|
||||||
|
The two reviewed upcoming records are in `tools/reviewed-manager-notes.json` and
|
||||||
|
`tools/reviewed-server-notes.json`; every new note has all five translations.
|
||||||
|
These files describe preparation and do not add unpublished releases to canonical history.
|
||||||
|
|
||||||
|
Manager 0.9.10 refreshes the bundled server history through 0.261104.94 from
|
||||||
|
canonical build commit `a9c6b17c8c1a295680fda4ad4bcdde266357264d` on 2026-11-08.
|
||||||
|
The reviewed upcoming Manager and server records carry translations in all five languages.
|
||||||
|
|
||||||
|
Manager 0.9.12 refreshes the bundled server history through 0.261108.95 from
|
||||||
|
canonical build commit `ca04f96f600481446f97ac611c7f914d786af00b` on 2026-11-14.
|
||||||
|
The reviewed upcoming Manager and server records carry translations in all five languages.
|
||||||
|
|
||||||
|
Manager 0.9.13 refreshes the bundled server history through 0.261114.106 from
|
||||||
|
canonical build commit `3308e3a957cd9fd1a2cd145a7f023f2cf521c54c` on 2026-11-15.
|
||||||
|
The reviewed upcoming Manager and server records (Custom Races V2, 213 server notes)
|
||||||
|
carry translations in all five languages.
|
||||||
File diff suppressed because it is too large.
Load diff
File diff suppressed because it is too large.
Load diff
+14
-2
@@ -25,9 +25,20 @@ export {};
|
|||||||
notes:["worldserver.exe differs from the one listed in RELEASE.json (release 2026-09-11); this looks like a customised build."],modifies_files:false};
|
notes:["worldserver.exe differs from the one listed in RELEASE.json (release 2026-09-11); this looks like a customised build."],modifies_files:false};
|
||||||
const svc=(n: string,p: number,st: string)=>({name:n,state:st,pid:st==="running"?100:null,port:p,port_ready:st==="running",conflict:null,uptime_secs:st==="running"?4206:null});
|
const svc=(n: string,p: number,st: string)=>({name:n,state:st,pid:st==="running"?100:null,port:p,port_ready:st==="running",conflict:null,uptime_secs:st==="running"?4206:null});
|
||||||
{ const q = new URLSearchParams(location.search); const w0 = window as any; if (q.get("client")) w0.__client = q.get("client"); if (q.get("modified")) w0.__modified = true; }
|
{ const q = new URLSearchParams(location.search); const w0 = window as any; if (q.get("client")) w0.__client = q.get("client"); if (q.get("modified")) w0.__modified = true; }
|
||||||
|
(window as any).__TAURI_EVENT_PLUGIN_INTERNALS__ = { unregisterListener() {} };
|
||||||
(window as any).__TAURI_INTERNALS__ = {
|
(window as any).__TAURI_INTERNALS__ = {
|
||||||
transformCallback: (cb: unknown)=>cb, unregisterCallback(){}, convertFileSrc:(x: unknown)=>x,
|
transformCallback: (cb: unknown)=>cb, unregisterCallback(){}, convertFileSrc:(x: unknown)=>x,
|
||||||
invoke: async (cmd: string, args?: any)=>{
|
invoke: async (cmd: string, args?: any)=>{
|
||||||
|
if(cmd==="close_to_tray") return localStorage.getItem("demo-close-tray")==="1";
|
||||||
|
if(cmd==="set_close_to_tray"){localStorage.setItem("demo-close-tray",args.enabled?"1":"0");return;}
|
||||||
|
if(cmd==="client_graphics") return JSON.parse(localStorage.getItem("demo-graphics")??'{"dxvk_disabled":false,"enhancements_disabled":false}');
|
||||||
|
if(cmd==="client_set_graphics"){const g=JSON.parse(localStorage.getItem("demo-graphics")??'{"dxvk_disabled":false,"enhancements_disabled":false}');g[args.name==="d3d9.dll"?"dxvk_disabled":"enhancements_disabled"]=args.disabled;localStorage.setItem("demo-graphics",JSON.stringify(g));return g;}
|
||||||
|
if(cmd==="browse_enabled") return localStorage.getItem("demo-browse-enabled") !== "0";
|
||||||
|
if(cmd==="browse_set_enabled"){localStorage.setItem("demo-browse-enabled", args.enabled ? "1" : "0");return;}
|
||||||
|
if(cmd==="open_link") return null;
|
||||||
|
if(cmd==="pending_update") return null;
|
||||||
|
if(cmd==="plugin:app|version") return "0.8.2";
|
||||||
|
if(cmd==="release_history") throw new Error("Offline demo: using bundled notes");
|
||||||
if(cmd==="realm_profiles") return {active:realm,wildcard_created:wildcardCreated,reborn_created:rebornCreated,reborn_supported:true,supported:true,recovery_pending:false,simultaneous,secondary_world_port:simultaneous?8086:null,secondary_running:simultaneous&&running,with_reborn:withReborn,reborn_world_port:withReborn?8087:null,reborn_running:withReborn&&running};
|
if(cmd==="realm_profiles") return {active:realm,wildcard_created:wildcardCreated,reborn_created:rebornCreated,reborn_supported:true,supported:true,recovery_pending:false,simultaneous,secondary_world_port:simultaneous?8086:null,secondary_running:simultaneous&&running,with_reborn:withReborn,reborn_world_port:withReborn?8087:null,reborn_running:withReborn&&running};
|
||||||
if(cmd==="realm_simultaneous") { if(running) throw new Error("Stop both realms before changing simultaneous startup."); simultaneous=args.enabled; wildcardCreated ||= simultaneous; return {active:realm,wildcard_created:wildcardCreated,reborn_created:rebornCreated,reborn_supported:true,supported:true,recovery_pending:false,simultaneous,secondary_world_port:simultaneous?8086:null,secondary_running:false,with_reborn:withReborn,reborn_world_port:withReborn?8087:null,reborn_running:false}; }
|
if(cmd==="realm_simultaneous") { if(running) throw new Error("Stop both realms before changing simultaneous startup."); simultaneous=args.enabled; wildcardCreated ||= simultaneous; return {active:realm,wildcard_created:wildcardCreated,reborn_created:rebornCreated,reborn_supported:true,supported:true,recovery_pending:false,simultaneous,secondary_world_port:simultaneous?8086:null,secondary_running:false,with_reborn:withReborn,reborn_world_port:withReborn?8087:null,reborn_running:false}; }
|
||||||
if(cmd==="realm_with_reborn") { if(running) throw new Error("Stop all realms before changing which realms start together."); withReborn=args.enabled; rebornCreated ||= withReborn; return {active:realm,wildcard_created:wildcardCreated,reborn_created:rebornCreated,reborn_supported:true,supported:true,recovery_pending:false,simultaneous,secondary_world_port:simultaneous?8086:null,secondary_running:false,with_reborn:withReborn,reborn_world_port:withReborn?8087:null,reborn_running:false}; }
|
if(cmd==="realm_with_reborn") { if(running) throw new Error("Stop all realms before changing which realms start together."); withReborn=args.enabled; rebornCreated ||= withReborn; return {active:realm,wildcard_created:wildcardCreated,reborn_created:rebornCreated,reborn_supported:true,supported:true,recovery_pending:false,simultaneous,secondary_world_port:simultaneous?8086:null,secondary_running:false,with_reborn:withReborn,reborn_world_port:withReborn?8087:null,reborn_running:false}; }
|
||||||
@@ -42,6 +53,7 @@ export {};
|
|||||||
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};}
|
||||||
if(cmd==="server_status"){const s=running?"running":"stopped";return {observed:{mysql:svc("mysql",3307,s),auth:svc("auth",3724,s),world:svc("world",8085,s),secondary_world:simultaneous?svc("world-secondary",8086,s):null,reborn_world:withReborn?svc("world-reborn",8087,s):null},busy:false,path_exists:true};}
|
if(cmd==="server_status"){const s=running?"running":"stopped";return {observed:{mysql:svc("mysql",3307,s),auth:svc("auth",3724,s),world:svc("world",8085,s),secondary_world:simultaneous?svc("world-secondary",8086,s):null,reborn_world:withReborn?svc("world-reborn",8087,s):null},busy:false,path_exists:true};}
|
||||||
if(cmd==="start_server"){await new Promise((r: any)=>setTimeout(r,1500));running=true;return {ok:true,exit_code:0,code:null,human:null,output:""};}
|
if(cmd==="start_server"){await new Promise((r: any)=>setTimeout(r,1500));running=true;return {ok:true,exit_code:0,code:null,human:null,output:""};}
|
||||||
|
if(cmd==="force_stop_server"){running=false;return {ok:true,exit_code:0,code:null,human:null,output:""};}
|
||||||
if(cmd==="stop_server"){await new Promise((r: any)=>setTimeout(r,1500));running=false;return {ok:true,exit_code:0,code:null,human:null,output:""};}
|
if(cmd==="stop_server"){await new Promise((r: any)=>setTimeout(r,1500));running=false;return {ok:true,exit_code:0,code:null,human:null,output:""};}
|
||||||
if(cmd.startsWith("plugin:dialog")) return "C:\\games\\CoA-Repack";
|
if(cmd.startsWith("plugin:dialog")) return "C:\\games\\CoA-Repack";
|
||||||
if(cmd==="get_settings"){const sc=args?.scope==="server"?serverSchema:botsSchema;return {scope:args?.scope,categories:sc.categories,settings:(sc.settings as any[]).map(x=>({...x,options:x.options??[],value:x.default,is_default:true,present:true,problem:null,drift:false})),unknown_keys:3,drift_keys:[],files:[]};}
|
if(cmd==="get_settings"){const sc=args?.scope==="server"?serverSchema:botsSchema;return {scope:args?.scope,categories:sc.categories,settings:(sc.settings as any[]).map(x=>({...x,options:x.options??[],value:x.default,is_default:true,present:true,problem:null,drift:false})),unknown_keys:3,drift_keys:[],files:[]};}
|
||||||
@@ -49,8 +61,8 @@ 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,pending_migrations:(window as any).__updated?0:5,download_bytes:6000000};
|
if(cmd==="check_update") return {from_version:(window as any).__updated?"0.261028.83":"0.261026.81",to_version:"0.261028.83",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.261028.83"},migrations:null};}
|
||||||
if(cmd==="get_population"){if(!running) return null;let b=(window as any).__bots??85;const t=(window as any).__target??0;if(t>b){b=Math.min(t,b+25);(window as any).__bots=b;}return {online_total:b,bots_online:Math.max(0,b-7),players_online:0,bots_total:b};}
|
if(cmd==="get_population"){if(!running) return null;let b=(window as any).__bots??85;const t=(window as any).__target??0;if(t>b){b=Math.min(t,b+25);(window as any).__bots=b;}return {online_total:b,bots_online:Math.max(0,b-7),players_online:0,bots_total:b};}
|
||||||
if(cmd==="get_performance") return running?{mean_ms:14,median_ms:15,p95_ms:24,p99_ms:30,max_ms:61,ticks_per_sec:71.4}:null;
|
if(cmd==="get_performance") return running?{mean_ms:14,median_ms:15,p95_ms:24,p99_ms:30,max_ms:61,ticks_per_sec:71.4}:null;
|
||||||
if(cmd==="run_diagnostics") return {problems:2,checks:[{id:"files",title:"Server files",level:"ok",detail:"All expected server parts were found."},{id:"world",title:"World server",level:"warn",detail:"Not running."},{id:"disk",title:"Free disk space",level:"warn",detail:"Only 3 GB free; backups and updates need room."},{id:"exposure",title:"Private services",level:"ok",detail:"Database and server console are not reachable from the network."}]};
|
if(cmd==="run_diagnostics") return {problems:2,checks:[{id:"files",title:"Server files",level:"ok",detail:"All expected server parts were found."},{id:"world",title:"World server",level:"warn",detail:"Not running."},{id:"disk",title:"Free disk space",level:"warn",detail:"Only 3 GB free; backups and updates need room."},{id:"exposure",title:"Private services",level:"ok",detail:"Database and server console are not reachable from the network."}]};
|
||||||
|
|||||||
@@ -3,6 +3,32 @@ 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>> = {
|
||||||
"upd.preexistingCharacters": "Bereits vor dem Update fehlten bei {n} Charakterdatensätzen die Startdaten für Volk/Klasse. Unveränderte Datensätze wurden bewahrt und blockierten das Update nicht. Details stehen in der Diagnose; diese älteren Unstimmigkeiten wurden nicht automatisch behoben.",
|
"upd.preexistingCharacters": "Bereits vor dem Update fehlten bei {n} Charakterdatensätzen die Startdaten für Volk/Klasse. Unveränderte Datensätze wurden bewahrt und blockierten das Update nicht. Details stehen in der Diagnose; diese älteren Unstimmigkeiten wurden nicht automatisch behoben.",
|
||||||
|
"settings.autoManager": "Updates im Hintergrund herunterladen",
|
||||||
|
"settings.startServer": "Nach dem Update starten",
|
||||||
|
"settings.version": "Version {v}",
|
||||||
|
"settings.startupHelp": "Details zum Start",
|
||||||
|
|
||||||
|
"settings.section.updates": "Updates",
|
||||||
|
"settings.section.startup": "Start",
|
||||||
|
"settings.section.client": "Client und Dateien",
|
||||||
|
"settings.section.service": "Wartung",
|
||||||
|
"settings.section.interface": "Oberfläche",
|
||||||
|
"settings.organized": "Updates, Serverstart und Spieldateien verwalten",
|
||||||
|
"settings.clientLink": "Clientdateien und Spieldaten",
|
||||||
|
"history.title": "Änderungsverlauf",
|
||||||
|
"history.open": "Was sich ändert",
|
||||||
|
"history.server": "Server",
|
||||||
|
"history.manager": "Manager",
|
||||||
|
"history.all": "Alle Versionen",
|
||||||
|
"history.range": "Für dieses Update",
|
||||||
|
"history.language": "Sprache der Einträge",
|
||||||
|
"history.fallback": "Englisches Original: Diese Version wurde noch nicht übersetzt",
|
||||||
|
"history.empty": "Für dieses Update sind noch keine Einträge veröffentlicht",
|
||||||
|
"history.files": "Dateiänderungen",
|
||||||
|
"history.offline": "Gespeicherter Verlauf · offline verfügbar",
|
||||||
|
"history.refreshed": "Veröffentlichter Verlauf aktualisiert",
|
||||||
|
"history.experimental": "Portable Charaktere sind experimentell. Sichere deine Charaktere vor der Verwendung.",
|
||||||
|
"settings.attention": "Ein Update erfordert Aufmerksamkeit. Öffne Updates für die Wiederherstellungsoptionen.",
|
||||||
|
|
||||||
"races.unknownIds": "Nicht mehr im Katalog vorhandene Völker-IDs: {ids}. Beim Speichern werden diese alten Einschränkungen entfernt.",
|
"races.unknownIds": "Nicht mehr im Katalog vorhandene Völker-IDs: {ids}. Beim Speichern werden diese alten Einschränkungen entfernt.",
|
||||||
"races.reviewCatalog": "Der Völkerkatalog wurde geändert oder noch nicht geprüft. Prüfe die Liste und speichere sie erneut.",
|
"races.reviewCatalog": "Der Völkerkatalog wurde geändert oder noch nicht geprüft. Prüfe die Liste und speichere sie erneut.",
|
||||||
@@ -1040,6 +1066,30 @@ const de: Partial<Record<keyof typeof en, string>> = {
|
|||||||
"registry.realmStoppedHint": "Der Realm ist gestoppt. Den Server starten, damit Spieler beitreten und Charaktersitzungen verfolgen können.",
|
"registry.realmStoppedHint": "Der Realm ist gestoppt. Den Server starten, damit Spieler beitreten und Charaktersitzungen verfolgen können.",
|
||||||
"access.portableEnabled": "Portable Charaktere zulassen",
|
"access.portableEnabled": "Portable Charaktere zulassen",
|
||||||
"access.portableEnabledHint": "Spieler können auf diesem Realm mit ihren im Manager gespeicherten Charakteren spielen.",
|
"access.portableEnabledHint": "Spieler können auf diesem Realm mit ihren im Manager gespeicherten Charakteren spielen.",
|
||||||
|
"settings.publicServers": "Öffentliche Server anzeigen",
|
||||||
|
"settings.publicServersHint": "Wenn deaktiviert, ruft der Manager keine öffentlichen Serverlisten oder Details ab. Wenn aktiviert, lädt Aktualisieren die Liste.",
|
||||||
|
"browse.disabled": "Die Anzeige öffentlicher Server ist deaktiviert. Aktiviere sie in den Einstellungen, um den Katalog zu laden.",
|
||||||
|
|
||||||
|
"client.graphics.dxvk": "Kompatible Grafik verwenden (DXVK deaktivieren)",
|
||||||
|
"client.graphics.enhancements": "Zusätzliche Grafikverbesserungen deaktivieren",
|
||||||
|
"client.graphics.hint": "Schließe das Spiel vor Änderungen. Client-Updates lassen deaktivierte Grafikkomponenten ausgeschaltet.",
|
||||||
|
"settings.closeToTray": "Beim Schließen in den Infobereich minimieren",
|
||||||
|
"settings.closeToTrayHint": "Wenn ausgeschaltet, beendet das Schließen des Fensters den Manager. Ein erneuter Start öffnet das bereits laufende Fenster.",
|
||||||
|
|
||||||
|
"overview.bots": "+ {n} Bots",
|
||||||
|
|
||||||
|
"stop.force": "Beenden erzwingen",
|
||||||
|
"stop.forceTitle": "Diesen Server zwangsweise beenden?",
|
||||||
|
"stop.forceWarning": "Ungespeicherter Spielfortschritt kann verloren gehen. Nur geprüfte Prozesse dieses Servers werden beendet. Die Datenbank läuft weiter, bis alle Welten beendet sind.",
|
||||||
|
"stop.cancel": "Abbrechen",
|
||||||
|
|
||||||
|
"serverLogs.title": "Serverprotokolle",
|
||||||
|
"serverLogs.description": "Protokollierung für Spielwelt und Anmeldeserver wählen. Änderungen gelten nach einem Serverneustart. Die vorherige Konfiguration wird als Einstellungssicherung gespeichert.",
|
||||||
|
"serverLogs.normal": "Normal",
|
||||||
|
"serverLogs.errors": "Nur Fehler",
|
||||||
|
"serverLogs.off": "Aus",
|
||||||
|
"serverLogs.saved": "Gespeichert. Zum Anwenden den Server neu starten.",
|
||||||
|
"mod.requiresSquid": "Aktivieren Sie SQUID-Bots, um Dungeon Clear zu verwenden.",
|
||||||
};
|
};
|
||||||
|
|
||||||
export default de;
|
export default de;
|
||||||
+50
-1
@@ -1,6 +1,32 @@
|
|||||||
/** 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 = {
|
||||||
"upd.preexistingCharacters": "Before the update, {n} character records already lacked race/class starting data. Unchanged records were preserved and did not block the update. Details are saved in diagnostics; these older inconsistencies have not been automatically repaired.",
|
"upd.preexistingCharacters": "Before the update, {n} character records already lacked race/class starting data. Unchanged records were preserved and did not block the update. Details are saved in diagnostics; these older inconsistencies have not been automatically repaired.",
|
||||||
|
"settings.autoManager": "Download updates in the background",
|
||||||
|
"settings.startServer": "Start after updating",
|
||||||
|
"settings.version": "Version {v}",
|
||||||
|
"settings.startupHelp": "Startup details",
|
||||||
|
|
||||||
|
"settings.section.updates": "Updates",
|
||||||
|
"settings.section.startup": "Startup",
|
||||||
|
"settings.section.client": "Client and files",
|
||||||
|
"settings.section.service": "Maintenance",
|
||||||
|
"settings.section.interface": "Interface",
|
||||||
|
"settings.organized": "Manage updates, startup and your game files",
|
||||||
|
"settings.clientLink": "Client files and game data",
|
||||||
|
"history.title": "Release history",
|
||||||
|
"history.open": "What changed",
|
||||||
|
"history.server": "Server",
|
||||||
|
"history.manager": "Manager",
|
||||||
|
"history.all": "All versions",
|
||||||
|
"history.range": "For this update",
|
||||||
|
"history.language": "Notes language",
|
||||||
|
"history.fallback": "Original English notes: this release has not been translated yet",
|
||||||
|
"history.empty": "No published notes for this update",
|
||||||
|
"history.files": "File changes",
|
||||||
|
"history.offline": "Saved release history · available offline",
|
||||||
|
"history.refreshed": "Published notes refreshed",
|
||||||
|
"history.experimental": "Portable Characters is experimental. Back up your characters before using it.",
|
||||||
|
"settings.attention": "An update needs attention. Open Updates to review recovery options.",
|
||||||
|
|
||||||
"races.unknownIds": "RaceIDs no longer in this catalog: {ids}. Saving the reviewed list removes these old restrictions.",
|
"races.unknownIds": "RaceIDs no longer in this catalog: {ids}. Saving the reviewed list removes these old restrictions.",
|
||||||
"races.reviewCatalog": "The race catalog changed or has not been verified. Review the list and save it before applying restrictions.",
|
"races.reviewCatalog": "The race catalog changed or has not been verified. Review the list and save it before applying restrictions.",
|
||||||
@@ -1125,7 +1151,7 @@ const en = {
|
|||||||
"browse.offlineWarning": "The server is currently offline. Joining with a portable character will become available once the host starts the server.",
|
"browse.offlineWarning": "The server is currently offline. Joining with a portable character will become available once the host starts the server.",
|
||||||
"browse.play": "Play",
|
"browse.play": "Play",
|
||||||
"browse.playSoon": "Joining arrives with the account support of the next step.",
|
"browse.playSoon": "Joining arrives with the account support of the next step.",
|
||||||
"registry.title": "Public listing",
|
"registry.title": "Public realms",
|
||||||
"registry.dialogTitle": "Public listing · {realm}",
|
"registry.dialogTitle": "Public listing · {realm}",
|
||||||
"registry.publishAll": "Publish all realms",
|
"registry.publishAll": "Publish all realms",
|
||||||
"registry.publishAllText": "One description, language and region for every realm that is not listed yet. Each realm is listed under the server name; the realms that start next to the main one get their realm name added.",
|
"registry.publishAllText": "One description, language and region for every realm that is not listed yet. Each realm is listed under the server name; the realms that start next to the main one get their realm name added.",
|
||||||
@@ -1251,6 +1277,29 @@ const en = {
|
|||||||
"access.relay": "Relay",
|
"access.relay": "Relay",
|
||||||
"access.relayUp": "Game relay connected",
|
"access.relayUp": "Game relay connected",
|
||||||
"access.relayDown": "Game relay disconnected",
|
"access.relayDown": "Game relay disconnected",
|
||||||
|
"settings.publicServers": "Allow public server browsing",
|
||||||
|
"settings.publicServersHint": "When disabled, the Manager does not request public server lists or details. When enabled, load the list with Refresh.",
|
||||||
|
"browse.disabled": "Public server browsing is disabled. Enable it in Settings to load the catalog.",
|
||||||
|
"client.graphics.dxvk": "Use compatibility graphics (disable DXVK)",
|
||||||
|
"client.graphics.enhancements": "Disable additional graphics enhancements",
|
||||||
|
"client.graphics.hint": "Close the game before changing these settings. Disabled renderers stay disabled during client updates.",
|
||||||
|
"settings.closeToTray": "Minimize to tray when closing the window",
|
||||||
|
"settings.closeToTrayHint": "When off, closing the window exits the Manager. Launching it again opens the existing window if it is already running.",
|
||||||
|
|
||||||
|
"overview.bots": "+ {n} bots",
|
||||||
|
|
||||||
|
"stop.force": "Force stop",
|
||||||
|
"stop.forceTitle": "Force-stop this server?",
|
||||||
|
"stop.forceWarning": "Unsaved player progress may be lost. Only verified processes belonging to this server will be stopped. The database will remain running until every world has stopped.",
|
||||||
|
"stop.cancel": "Cancel",
|
||||||
|
|
||||||
|
"serverLogs.title": "Server logs",
|
||||||
|
"serverLogs.description": "Choose logging for the game world and login server. Changes apply after a server restart. Previous configuration is saved in configuration snapshots.",
|
||||||
|
"serverLogs.normal": "Normal",
|
||||||
|
"serverLogs.errors": "Errors only",
|
||||||
|
"serverLogs.off": "Off",
|
||||||
|
"serverLogs.saved": "Saved. Restart the server to apply.",
|
||||||
|
"mod.requiresSquid": "Enable SQUID bots to use Dungeon Clear.",
|
||||||
} as const;
|
} as const;
|
||||||
|
|
||||||
export default en;
|
export default en;
|
||||||
@@ -3,6 +3,32 @@ 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>> = {
|
||||||
"upd.preexistingCharacters": "Antes de actualizar, a {n} registros de personaje ya les faltaban datos iniciales de raza/clase. Los registros sin cambios se conservaron y no bloquearon la actualización. Los detalles están en el diagnóstico; estas inconsistencias anteriores no se repararon automáticamente.",
|
"upd.preexistingCharacters": "Antes de actualizar, a {n} registros de personaje ya les faltaban datos iniciales de raza/clase. Los registros sin cambios se conservaron y no bloquearon la actualización. Los detalles están en el diagnóstico; estas inconsistencias anteriores no se repararon automáticamente.",
|
||||||
|
"settings.autoManager": "Descargar actualizaciones en segundo plano",
|
||||||
|
"settings.startServer": "Iniciar tras actualizar",
|
||||||
|
"settings.version": "Versión {v}",
|
||||||
|
"settings.startupHelp": "Detalles del inicio",
|
||||||
|
|
||||||
|
"settings.section.updates": "Actualizaciones",
|
||||||
|
"settings.section.startup": "Inicio",
|
||||||
|
"settings.section.client": "Cliente y archivos",
|
||||||
|
"settings.section.service": "Mantenimiento",
|
||||||
|
"settings.section.interface": "Interfaz",
|
||||||
|
"settings.organized": "Gestiona actualizaciones, inicio y archivos del juego",
|
||||||
|
"settings.clientLink": "Archivos del cliente y datos del juego",
|
||||||
|
"history.title": "Historial de cambios",
|
||||||
|
"history.open": "Qué cambia",
|
||||||
|
"history.server": "Servidor",
|
||||||
|
"history.manager": "Manager",
|
||||||
|
"history.all": "Todas las versiones",
|
||||||
|
"history.range": "Para esta actualización",
|
||||||
|
"history.language": "Idioma de las notas",
|
||||||
|
"history.fallback": "Original en inglés: esta versión aún no está traducida",
|
||||||
|
"history.empty": "No hay notas publicadas para esta actualización",
|
||||||
|
"history.files": "Cambios en archivos",
|
||||||
|
"history.offline": "Historial guardado · disponible sin conexión",
|
||||||
|
"history.refreshed": "Historial publicado actualizado",
|
||||||
|
"history.experimental": "Los personajes portátiles son experimentales. Haz una copia de seguridad de tus personajes antes de usarlos.",
|
||||||
|
"settings.attention": "Una actualización requiere atención. Abre Actualizaciones para ver las opciones de recuperación.",
|
||||||
|
|
||||||
"races.unknownIds": "RaceID que ya no están en el catálogo: {ids}. Al guardar la lista revisada se eliminan estas restricciones antiguas.",
|
"races.unknownIds": "RaceID que ya no están en el catálogo: {ids}. Al guardar la lista revisada se eliminan estas restricciones antiguas.",
|
||||||
"races.reviewCatalog": "El catálogo de razas ha cambiado o aún no está verificado. Revisa la lista y guárdala.",
|
"races.reviewCatalog": "El catálogo de razas ha cambiado o aún no está verificado. Revisa la lista y guárdala.",
|
||||||
@@ -1040,6 +1066,30 @@ const es: Partial<Record<keyof typeof en, string>> = {
|
|||||||
"registry.realmStoppedHint": "El reino está detenido. Inicia el servidor para que los jugadores entren y se registren las sesiones de personajes.",
|
"registry.realmStoppedHint": "El reino está detenido. Inicia el servidor para que los jugadores entren y se registren las sesiones de personajes.",
|
||||||
"access.portableEnabled": "Permitir personajes portátiles",
|
"access.portableEnabled": "Permitir personajes portátiles",
|
||||||
"access.portableEnabledHint": "Los jugadores pueden usar en este reino sus personajes guardados en Manager.",
|
"access.portableEnabledHint": "Los jugadores pueden usar en este reino sus personajes guardados en Manager.",
|
||||||
|
"settings.publicServers": "Permitir consultar servidores públicos",
|
||||||
|
"settings.publicServersHint": "Si se desactiva, el gestor no solicita listas ni detalles de servidores públicos. Si se activa, carga la lista con Actualizar.",
|
||||||
|
"browse.disabled": "La consulta de servidores públicos está desactivada. Actívala en los ajustes para cargar el catálogo.",
|
||||||
|
|
||||||
|
"client.graphics.dxvk": "Usar gráficos compatibles (desactivar DXVK)",
|
||||||
|
"client.graphics.enhancements": "Desactivar mejoras gráficas adicionales",
|
||||||
|
"client.graphics.hint": "Cierra el juego antes de cambiar estos ajustes. Las actualizaciones mantienen desactivados los componentes gráficos elegidos.",
|
||||||
|
"settings.closeToTray": "Minimizar a la bandeja al cerrar la ventana",
|
||||||
|
"settings.closeToTrayHint": "Si se desactiva, cerrar la ventana sale del gestor. Volver a iniciarlo abre la ventana existente si ya está en ejecución.",
|
||||||
|
|
||||||
|
"overview.bots": "+ {n} bots",
|
||||||
|
|
||||||
|
"stop.force": "Forzar detención",
|
||||||
|
"stop.forceTitle": "¿Forzar la detención de este servidor?",
|
||||||
|
"stop.forceWarning": "Puede perderse el progreso sin guardar. Solo se detendrán los procesos verificados de este servidor. La base de datos seguirá activa hasta que se detengan todos los mundos.",
|
||||||
|
"stop.cancel": "Cancelar",
|
||||||
|
|
||||||
|
"serverLogs.title": "Registros del servidor",
|
||||||
|
"serverLogs.description": "Elige los registros del mundo y del servidor de acceso. Los cambios se aplican al reiniciar el servidor. La configuración anterior se guarda en las instantáneas de ajustes.",
|
||||||
|
"serverLogs.normal": "Normales",
|
||||||
|
"serverLogs.errors": "Solo errores",
|
||||||
|
"serverLogs.off": "Desactivados",
|
||||||
|
"serverLogs.saved": "Guardado. Reinicia el servidor para aplicar los cambios.",
|
||||||
|
"mod.requiresSquid": "Activa los bots SQUID para usar Dungeon Clear.",
|
||||||
};
|
};
|
||||||
|
|
||||||
export default es;
|
export default es;
|
||||||
@@ -3,6 +3,32 @@ 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>> = {
|
||||||
"upd.preexistingCharacters": "Avant la mise à jour, {n} fiches de personnage n’avaient déjà pas de données de départ pour leur race/classe. Les fiches inchangées ont été conservées sans bloquer la mise à jour. Les détails sont dans le diagnostic ; ces incohérences anciennes n’ont pas été corrigées automatiquement.",
|
"upd.preexistingCharacters": "Avant la mise à jour, {n} fiches de personnage n’avaient déjà pas de données de départ pour leur race/classe. Les fiches inchangées ont été conservées sans bloquer la mise à jour. Les détails sont dans le diagnostic ; ces incohérences anciennes n’ont pas été corrigées automatiquement.",
|
||||||
|
"settings.autoManager": "Télécharger les mises à jour en arrière-plan",
|
||||||
|
"settings.startServer": "Démarrer après la mise à jour",
|
||||||
|
"settings.version": "Version {v}",
|
||||||
|
"settings.startupHelp": "Détails du démarrage",
|
||||||
|
|
||||||
|
"settings.section.updates": "Mises à jour",
|
||||||
|
"settings.section.startup": "Démarrage",
|
||||||
|
"settings.section.client": "Client et fichiers",
|
||||||
|
"settings.section.service": "Maintenance",
|
||||||
|
"settings.section.interface": "Interface",
|
||||||
|
"settings.organized": "Gérer les mises à jour, le démarrage et les fichiers du jeu",
|
||||||
|
"settings.clientLink": "Fichiers du client et données du jeu",
|
||||||
|
"history.title": "Historique des changements",
|
||||||
|
"history.open": "Ce qui change",
|
||||||
|
"history.server": "Serveur",
|
||||||
|
"history.manager": "Manager",
|
||||||
|
"history.all": "Toutes les versions",
|
||||||
|
"history.range": "Pour cette mise à jour",
|
||||||
|
"history.language": "Langue des notes",
|
||||||
|
"history.fallback": "Original anglais : cette version n’est pas encore traduite",
|
||||||
|
"history.empty": "Aucune note publiée pour cette mise à jour",
|
||||||
|
"history.files": "Fichiers modifiés",
|
||||||
|
"history.offline": "Historique enregistré · disponible hors ligne",
|
||||||
|
"history.refreshed": "Historique publié actualisé",
|
||||||
|
"history.experimental": "Les personnages portables sont expérimentaux. Sauvegardez vos personnages avant utilisation.",
|
||||||
|
"settings.attention": "Une mise à jour nécessite votre attention. Ouvrez Mises à jour pour les options de récupération.",
|
||||||
|
|
||||||
"races.unknownIds": "RaceID absents de ce catalogue : {ids}. Sauvegarder la liste vérifiée supprime ces anciennes restrictions.",
|
"races.unknownIds": "RaceID absents de ce catalogue : {ids}. Sauvegarder la liste vérifiée supprime ces anciennes restrictions.",
|
||||||
"races.reviewCatalog": "Le catalogue des races a changé ou n’a pas été vérifié. Vérifiez la liste et sauvegardez-la.",
|
"races.reviewCatalog": "Le catalogue des races a changé ou n’a pas été vérifié. Vérifiez la liste et sauvegardez-la.",
|
||||||
@@ -1040,6 +1066,30 @@ const fr: Partial<Record<keyof typeof en, string>> = {
|
|||||||
"registry.realmStoppedHint": "Le royaume est arrêté. Démarrez le serveur pour permettre la connexion et le suivi des sessions des personnages.",
|
"registry.realmStoppedHint": "Le royaume est arrêté. Démarrez le serveur pour permettre la connexion et le suivi des sessions des personnages.",
|
||||||
"access.portableEnabled": "Autoriser les personnages portables",
|
"access.portableEnabled": "Autoriser les personnages portables",
|
||||||
"access.portableEnabledHint": "Les joueurs peuvent utiliser sur ce royaume leurs personnages enregistrés dans Manager.",
|
"access.portableEnabledHint": "Les joueurs peuvent utiliser sur ce royaume leurs personnages enregistrés dans Manager.",
|
||||||
|
"settings.publicServers": "Autoriser la consultation des serveurs publics",
|
||||||
|
"settings.publicServersHint": "Si cette option est désactivée, le gestionnaire ne demande ni liste ni détails des serveurs publics. Sinon, chargez la liste avec Actualiser.",
|
||||||
|
"browse.disabled": "La consultation des serveurs publics est désactivée. Activez-la dans les paramètres pour charger le catalogue.",
|
||||||
|
|
||||||
|
"client.graphics.dxvk": "Utiliser le mode graphique compatible (désactiver DXVK)",
|
||||||
|
"client.graphics.enhancements": "Désactiver les améliorations graphiques supplémentaires",
|
||||||
|
"client.graphics.hint": "Fermez le jeu avant toute modification. Les mises à jour du client conservent les composants graphiques désactivés.",
|
||||||
|
"settings.closeToTray": "Réduire dans la zone de notification à la fermeture",
|
||||||
|
"settings.closeToTrayHint": "Sinon, fermer la fenêtre quitte le gestionnaire. Un nouveau lancement ouvre la fenêtre existante si le gestionnaire est déjà actif.",
|
||||||
|
|
||||||
|
"overview.bots": "+ {n} bots",
|
||||||
|
|
||||||
|
"stop.force": "Forcer l’arrêt",
|
||||||
|
"stop.forceTitle": "Forcer l’arrêt de ce serveur ?",
|
||||||
|
"stop.forceWarning": "La progression non enregistrée peut être perdue. Seuls les processus vérifiés de ce serveur seront arrêtés. La base de données reste active jusqu’à l’arrêt de tous les mondes.",
|
||||||
|
"stop.cancel": "Annuler",
|
||||||
|
|
||||||
|
"serverLogs.title": "Journaux du serveur",
|
||||||
|
"serverLogs.description": "Choisissez la journalisation du monde et du serveur de connexion. Les changements prennent effet après un redémarrage. La configuration précédente est sauvegardée dans les instantanés des paramètres.",
|
||||||
|
"serverLogs.normal": "Normaux",
|
||||||
|
"serverLogs.errors": "Erreurs uniquement",
|
||||||
|
"serverLogs.off": "Désactivés",
|
||||||
|
"serverLogs.saved": "Enregistré. Redémarrez le serveur pour appliquer.",
|
||||||
|
"mod.requiresSquid": "Activez les bots SQUID pour utiliser Dungeon Clear.",
|
||||||
};
|
};
|
||||||
|
|
||||||
export default fr;
|
export default fr;
|
||||||
+51
-1
@@ -3,6 +3,32 @@ import type en from "./en";
|
|||||||
/** Русский. Черновой перевод; требует проверки носителем перед релизом. */
|
/** Русский. Черновой перевод; требует проверки носителем перед релизом. */
|
||||||
const ru: Partial<Record<keyof typeof en, string>> = {
|
const ru: Partial<Record<keyof typeof en, string>> = {
|
||||||
"upd.preexistingCharacters": "До обновления у {n} записей персонажей уже отсутствовали стартовые данные расы/класса. Неизменившиеся записи сохранены и не заблокировали обновление. Подробности есть в диагностике; эти старые несоответствия автоматически не исправлялись.",
|
"upd.preexistingCharacters": "До обновления у {n} записей персонажей уже отсутствовали стартовые данные расы/класса. Неизменившиеся записи сохранены и не заблокировали обновление. Подробности есть в диагностике; эти старые несоответствия автоматически не исправлялись.",
|
||||||
|
"settings.autoManager": "Скачивать обновления в фоне",
|
||||||
|
"settings.startServer": "Запустить после обновления",
|
||||||
|
"settings.version": "Версия {v}",
|
||||||
|
"settings.startupHelp": "Подробнее о запуске",
|
||||||
|
|
||||||
|
"settings.section.updates": "Обновления",
|
||||||
|
"settings.section.startup": "Запуск",
|
||||||
|
"settings.section.client": "Клиент и файлы",
|
||||||
|
"settings.section.service": "Обслуживание",
|
||||||
|
"settings.section.interface": "Интерфейс",
|
||||||
|
"settings.organized": "Обновления, запуск сервера и файлы игры",
|
||||||
|
"settings.clientLink": "Файлы клиента и игровые данные",
|
||||||
|
"history.title": "История изменений",
|
||||||
|
"history.open": "Что изменится",
|
||||||
|
"history.server": "Сервер",
|
||||||
|
"history.manager": "Manager",
|
||||||
|
"history.all": "Все версии",
|
||||||
|
"history.range": "К обновлению",
|
||||||
|
"history.language": "Язык записей",
|
||||||
|
"history.fallback": "Английский оригинал: этот выпуск пока не переведён",
|
||||||
|
"history.empty": "Для этого обновления пока нет опубликованных записей",
|
||||||
|
"history.files": "Изменения файлов",
|
||||||
|
"history.offline": "Сохранённая история · доступна без сети",
|
||||||
|
"history.refreshed": "Опубликованная история обновлена",
|
||||||
|
"history.experimental": "Переносимые персонажи — экспериментальная функция. Перед использованием сохраните резервную копию персонажей.",
|
||||||
|
"settings.attention": "Обновление требует внимания. Откройте «Обновления», чтобы выбрать способ восстановления.",
|
||||||
|
|
||||||
"races.unknownIds": "RaceID, которых больше нет в каталоге: {ids}. Сохранение проверенного списка удалит эти старые ограничения.",
|
"races.unknownIds": "RaceID, которых больше нет в каталоге: {ids}. Сохранение проверенного списка удалит эти старые ограничения.",
|
||||||
"races.reviewCatalog": "Каталог рас изменился или ещё не проверен. Проверьте список и сохраните его перед применением ограничений.",
|
"races.reviewCatalog": "Каталог рас изменился или ещё не проверен. Проверьте список и сохраните его перед применением ограничений.",
|
||||||
@@ -1107,7 +1133,7 @@ const ru: Partial<Record<keyof typeof en, string>> = {
|
|||||||
"browse.offlineWarning": "Сервер сейчас не запущен хостом. Игра переносимым персонажем станет доступна, когда владелец включит сервер.",
|
"browse.offlineWarning": "Сервер сейчас не запущен хостом. Игра переносимым персонажем станет доступна, когда владелец включит сервер.",
|
||||||
"browse.play": "Играть",
|
"browse.play": "Играть",
|
||||||
"browse.playSoon": "Вход на сервер появится вместе с поддержкой аккаунтов на следующем шаге.",
|
"browse.playSoon": "Вход на сервер появится вместе с поддержкой аккаунтов на следующем шаге.",
|
||||||
"registry.title": "Публичный список",
|
"registry.title": "Публичные реалмы",
|
||||||
"registry.dialogTitle": "Публичный список · {realm}",
|
"registry.dialogTitle": "Публичный список · {realm}",
|
||||||
"registry.publishAll": "Опубликовать все реалмы",
|
"registry.publishAll": "Опубликовать все реалмы",
|
||||||
"registry.publishAllText": "Одно описание, язык и регион для каждого реалма, которого ещё нет в списке. Реалмы публикуются под названием сервера; к реалмам, которые запускаются рядом с основным, добавляется название реалма.",
|
"registry.publishAllText": "Одно описание, язык и регион для каждого реалма, которого ещё нет в списке. Реалмы публикуются под названием сервера; к реалмам, которые запускаются рядом с основным, добавляется название реалма.",
|
||||||
@@ -1233,6 +1259,30 @@ const ru: Partial<Record<keyof typeof en, string>> = {
|
|||||||
"access.relay": "Relay",
|
"access.relay": "Relay",
|
||||||
"access.relayUp": "Игровой relay подключён",
|
"access.relayUp": "Игровой relay подключён",
|
||||||
"access.relayDown": "Игровой relay не подключён",
|
"access.relayDown": "Игровой relay не подключён",
|
||||||
|
"settings.publicServers": "Разрешить просмотр публичных серверов",
|
||||||
|
"settings.publicServersHint": "Если выключено, менеджер не запрашивает списки и сведения о публичных серверах. Если включено, список загружается кнопкой «Обновить».",
|
||||||
|
"browse.disabled": "Просмотр публичных серверов отключён. Включите его в настройках, чтобы загрузить каталог.",
|
||||||
|
|
||||||
|
"client.graphics.dxvk": "Совместимый режим графики (отключить DXVK)",
|
||||||
|
"client.graphics.enhancements": "Отключить дополнительные графические улучшения",
|
||||||
|
"client.graphics.hint": "Перед изменением закройте игру. Обновление клиента сохраняет отключённые графические компоненты.",
|
||||||
|
"settings.closeToTray": "Сворачивать в трей при закрытии окна",
|
||||||
|
"settings.closeToTrayHint": "Если выключено, закрытие окна завершает менеджер. Повторный запуск открывает уже работающий экземпляр.",
|
||||||
|
|
||||||
|
"overview.bots": "+ {n} ботов",
|
||||||
|
|
||||||
|
"stop.force": "Принудительно остановить",
|
||||||
|
"stop.forceTitle": "Принудительно остановить этот сервер?",
|
||||||
|
"stop.forceWarning": "Несохранённый прогресс игроков может быть потерян. Будут остановлены только проверенные процессы этого сервера. База данных останется работать до остановки всех миров.",
|
||||||
|
"stop.cancel": "Отмена",
|
||||||
|
|
||||||
|
"serverLogs.title": "Логи сервера",
|
||||||
|
"serverLogs.description": "Выберите режим логов игрового мира и сервера входа. Изменения применятся после перезапуска сервера. Предыдущая конфигурация сохранится в снимках настроек.",
|
||||||
|
"serverLogs.normal": "Обычные",
|
||||||
|
"serverLogs.errors": "Только ошибки",
|
||||||
|
"serverLogs.off": "Выключены",
|
||||||
|
"serverLogs.saved": "Сохранено. Перезапустите сервер для применения.",
|
||||||
|
"mod.requiresSquid": "Для Dungeon Clear сначала включите SQUID bots.",
|
||||||
};
|
};
|
||||||
|
|
||||||
export default ru;
|
export default ru;
|
||||||
@@ -1,6 +1,32 @@
|
|||||||
/** Simplified Chinese localization (zh-CN) */
|
/** Simplified Chinese localization (zh-CN) */
|
||||||
const zh = {
|
const zh = {
|
||||||
"upd.preexistingCharacters": "更新前已有 {n} 条角色记录缺少种族/职业初始数据。未变化的记录已保留,不会阻止更新。详情已保存到诊断报告;这些既有问题尚未自动修复。",
|
"upd.preexistingCharacters": "更新前已有 {n} 条角色记录缺少种族/职业初始数据。未变化的记录已保留,不会阻止更新。详情已保存到诊断报告;这些既有问题尚未自动修复。",
|
||||||
|
"settings.autoManager": "在后台下载更新",
|
||||||
|
"settings.startServer": "更新后启动",
|
||||||
|
"settings.version": "版本 {v}",
|
||||||
|
"settings.startupHelp": "启动详情",
|
||||||
|
|
||||||
|
"settings.section.updates": "更新",
|
||||||
|
"settings.section.startup": "启动",
|
||||||
|
"settings.section.client": "客户端与文件",
|
||||||
|
"settings.section.service": "维护",
|
||||||
|
"settings.section.interface": "界面",
|
||||||
|
"settings.organized": "管理更新、服务器启动与游戏文件",
|
||||||
|
"settings.clientLink": "客户端文件与游戏数据",
|
||||||
|
"history.title": "更新日志",
|
||||||
|
"history.open": "更新内容",
|
||||||
|
"history.server": "服务器",
|
||||||
|
"history.manager": "Manager",
|
||||||
|
"history.all": "所有版本",
|
||||||
|
"history.range": "本次更新",
|
||||||
|
"history.language": "日志语言",
|
||||||
|
"history.fallback": "英文原文:此版本尚未翻译",
|
||||||
|
"history.empty": "本次更新暂无已发布的日志",
|
||||||
|
"history.files": "文件变更",
|
||||||
|
"history.offline": "已保存的日志 · 离线可用",
|
||||||
|
"history.refreshed": "已刷新发布日志",
|
||||||
|
"history.experimental": "可携带角色功能仍处于实验阶段。使用前请备份角色。",
|
||||||
|
"settings.attention": "某次更新需要处理。请打开“更新”查看恢复选项。",
|
||||||
|
|
||||||
"races.unknownIds": "此目录中已不存在的种族 ID:{ids}。保存检查后的列表将移除这些旧限制。",
|
"races.unknownIds": "此目录中已不存在的种族 ID:{ids}。保存检查后的列表将移除这些旧限制。",
|
||||||
"races.reviewCatalog": "种族目录已更改或尚未验证。请检查列表并保存后再应用限制。",
|
"races.reviewCatalog": "种族目录已更改或尚未验证。请检查列表并保存后再应用限制。",
|
||||||
@@ -1042,6 +1068,30 @@ const zh = {
|
|||||||
"registry.realmStoppedHint": "世界当前已停止。请启动服务器,以便玩家加入并跟踪角色会话。",
|
"registry.realmStoppedHint": "世界当前已停止。请启动服务器,以便玩家加入并跟踪角色会话。",
|
||||||
"access.portableEnabled": "允许便携角色",
|
"access.portableEnabled": "允许便携角色",
|
||||||
"access.portableEnabledHint": "允许玩家在此服务器使用保存在 Manager 中的角色。",
|
"access.portableEnabledHint": "允许玩家在此服务器使用保存在 Manager 中的角色。",
|
||||||
|
"settings.publicServers": "允许浏览公共服务器",
|
||||||
|
"settings.publicServersHint": "关闭后,管理器不会请求公共服务器列表或详情。启用后,点击“刷新”加载列表。",
|
||||||
|
"browse.disabled": "公共服务器浏览已关闭。请在设置中启用以加载目录。",
|
||||||
|
|
||||||
|
"client.graphics.dxvk": "使用兼容图形模式(禁用 DXVK)",
|
||||||
|
"client.graphics.enhancements": "禁用额外图形增强",
|
||||||
|
"client.graphics.hint": "更改前请关闭游戏。客户端更新会保留已禁用的图形组件。",
|
||||||
|
"settings.closeToTray": "关闭窗口时最小化到托盘",
|
||||||
|
"settings.closeToTrayHint": "关闭此选项后,关闭窗口将退出管理器。再次启动会打开已运行的窗口。",
|
||||||
|
|
||||||
|
"overview.bots": "+ {n} 个机器人",
|
||||||
|
|
||||||
|
"stop.force": "强制停止",
|
||||||
|
"stop.forceTitle": "强制停止此服务器?",
|
||||||
|
"stop.forceWarning": "玩家未保存的进度可能丢失。只会停止经验证属于此服务器的进程。所有世界停止后才会关闭数据库。",
|
||||||
|
"stop.cancel": "取消",
|
||||||
|
|
||||||
|
"serverLogs.title": "服务器日志",
|
||||||
|
"serverLogs.description": "选择游戏世界和登录服务器的日志模式。重启服务器后生效。原配置会保存在设置快照中。",
|
||||||
|
"serverLogs.normal": "普通",
|
||||||
|
"serverLogs.errors": "仅错误",
|
||||||
|
"serverLogs.off": "关闭",
|
||||||
|
"serverLogs.saved": "已保存。重启服务器后生效。",
|
||||||
|
"mod.requiresSquid": "请先启用 SQUID 机器人,再使用 Dungeon Clear。",
|
||||||
} as const;
|
} as const;
|
||||||
|
|
||||||
export default zh;
|
export default zh;
|
||||||
@@ -148,6 +148,16 @@
|
|||||||
"t": "Suchradius für Ziele",
|
"t": "Suchradius für Ziele",
|
||||||
"d": "Wie weit ein Bot innerhalb eines Zielgebiets nach Questzielen sucht."
|
"d": "Wie weit ein Bot innerhalb eines Zielgebiets nach Questzielen sucht."
|
||||||
},
|
},
|
||||||
|
"CoaBots.Scaling.Enable": {"t": "Stärkehilfe für Bots in Dungeons und Schlachtzügen", "d": "Hauptschalter für die Multiplikatoren unten. Bis du sie erhöhst, sind alle 1 (keine Änderung)."},
|
||||||
|
"CoaBots.Scaling.Dungeons": {"t": "Hilfe in 5-Spieler-Dungeons", "d": "Multiplikatoren anwenden, solange ein Bot in einem 5-Spieler-Dungeon ist."},
|
||||||
|
"CoaBots.Scaling.Raids": {"t": "Hilfe in Schlachtzügen", "d": "Multiplikatoren anwenden, solange ein Bot in einem Schlachtzug ist."},
|
||||||
|
"CoaBots.Scaling.Battlegrounds": {"t": "Hilfe in Schlachtfeldern und Arenen", "d": "Multiplikatoren in Schlachtfeldern und Arenen anwenden."},
|
||||||
|
"CoaBots.Scaling.World": {"t": "Hilfe in der offenen Welt", "d": "Multiplikatoren außerhalb von Dungeons und Schlachtzügen anwenden. Meist nicht gewünscht."},
|
||||||
|
"CoaBots.Scaling.DamageDone": {"t": "Schaden der Bots", "d": "Multipliziert den Schaden, den Bots und ihre Begleiter Kreaturen zufügen. 1 heißt keine Änderung; höher macht Inhalte leichter."},
|
||||||
|
"CoaBots.Scaling.HealingDone": {"t": "Heilung der Bots", "d": "Multipliziert die Heilung, die Bots wirken. 1 heißt keine Änderung."},
|
||||||
|
"CoaBots.Scaling.DamageTaken": {"t": "Schaden an Bots", "d": "Multipliziert den Schaden, den Kreaturen Bots zufügen. Unter 1 erleiden Bots weniger; 1 heißt keine Änderung."},
|
||||||
|
"CoaBots.Scaling.TankThreat": {"t": "Bedrohung der Tanks", "d": "Zusätzliche Bedrohung durch Bot-Tanks, damit sie die Aufmerksamkeit der Gegner halten. 1 heißt keine Änderung."},
|
||||||
|
"CoaBots.Scaling.BossTuning": {"t": "Zusatzhilfe gegen vier Bosse", "d": "Fügt stärkere Multiplikatoren für Loken, den Drakkari-Elementar, den Drakkari-Koloss und Gal'darah hinzu, die Bots der Stufe 60 sonst nicht besiegten. Zum Testen; standardmäßig aus."},
|
||||||
"CoaBots.WorldBrain.EngageRange": {
|
"CoaBots.WorldBrain.EngageRange": {
|
||||||
"t": "Angriffsentfernung",
|
"t": "Angriffsentfernung",
|
||||||
"d": "Entfernung, ab der ein Bot einen Quest-Gegner bekämpft."
|
"d": "Entfernung, ab der ein Bot einen Quest-Gegner bekämpft."
|
||||||
|
|||||||
@@ -148,6 +148,16 @@
|
|||||||
"t": "Radio de búsqueda de objetivos",
|
"t": "Radio de búsqueda de objetivos",
|
||||||
"d": "Hasta dónde examina un bot en busca de objetivos de misión dentro de una zona de objetivo."
|
"d": "Hasta dónde examina un bot en busca de objetivos de misión dentro de una zona de objetivo."
|
||||||
},
|
},
|
||||||
|
"CoaBots.Scaling.Enable": {"t": "Ayuda de fuerza para bots en mazmorras y bandas", "d": "Interruptor general de los multiplicadores de abajo. Hasta que los subas, todos valen 1 (sin cambios)."},
|
||||||
|
"CoaBots.Scaling.Dungeons": {"t": "Ayuda en mazmorras de 5 jugadores", "d": "Aplica los multiplicadores mientras un bot está en una mazmorra de 5 jugadores."},
|
||||||
|
"CoaBots.Scaling.Raids": {"t": "Ayuda en bandas", "d": "Aplica los multiplicadores mientras un bot está en una banda."},
|
||||||
|
"CoaBots.Scaling.Battlegrounds": {"t": "Ayuda en campos de batalla y arenas", "d": "Aplica los multiplicadores en campos de batalla y arenas."},
|
||||||
|
"CoaBots.Scaling.World": {"t": "Ayuda en el mundo abierto", "d": "Aplica los multiplicadores fuera de mazmorras y bandas. Normalmente no se desea."},
|
||||||
|
"CoaBots.Scaling.DamageDone": {"t": "Daño de los bots", "d": "Multiplica el daño que los bots y sus mascotas infligen a las criaturas. 1 no cambia nada; más alto facilita el contenido."},
|
||||||
|
"CoaBots.Scaling.HealingDone": {"t": "Curación de los bots", "d": "Multiplica la curación que lanzan los bots. 1 no cambia nada."},
|
||||||
|
"CoaBots.Scaling.DamageTaken": {"t": "Daño recibido por los bots", "d": "Multiplica el daño que las criaturas infligen a los bots. Por debajo de 1 los bots reciben menos; 1 no cambia nada."},
|
||||||
|
"CoaBots.Scaling.TankThreat": {"t": "Amenaza de los tanques", "d": "Amenaza extra que generan los tanques bot para mantener la atención de los enemigos. 1 no cambia nada."},
|
||||||
|
"CoaBots.Scaling.BossTuning": {"t": "Ayuda extra contra cuatro jefes", "d": "Añade multiplicadores más fuertes para Loken, el elemental drakkari, el coloso drakkari y Gal'darah, a quienes los bots de nivel 60 no vencían de otro modo. Para pruebas; desactivado por defecto."},
|
||||||
"CoaBots.WorldBrain.EngageRange": {
|
"CoaBots.WorldBrain.EngageRange": {
|
||||||
"t": "Distancia de enfrentamiento",
|
"t": "Distancia de enfrentamiento",
|
||||||
"d": "Distancia a la que un bot empieza a combatir a un monstruo de misión."
|
"d": "Distancia a la que un bot empieza a combatir a un monstruo de misión."
|
||||||
|
|||||||
@@ -148,6 +148,16 @@
|
|||||||
"t": "Rayon de recherche des cibles",
|
"t": "Rayon de recherche des cibles",
|
||||||
"d": "Jusqu’où un bot cherche des cibles de quête dans une zone d’objectif."
|
"d": "Jusqu’où un bot cherche des cibles de quête dans une zone d’objectif."
|
||||||
},
|
},
|
||||||
|
"CoaBots.Scaling.Enable": {"t": "Aide de puissance pour les bots en donjon et en raid", "d": "Interrupteur général des multiplicateurs ci-dessous. Tant que vous ne les augmentez pas, ils valent tous 1 (aucun changement)."},
|
||||||
|
"CoaBots.Scaling.Dungeons": {"t": "Aide en donjon à 5 joueurs", "d": "Applique les multiplicateurs tant qu'un bot est dans un donjon à 5 joueurs."},
|
||||||
|
"CoaBots.Scaling.Raids": {"t": "Aide en raid", "d": "Applique les multiplicateurs tant qu'un bot est dans un raid."},
|
||||||
|
"CoaBots.Scaling.Battlegrounds": {"t": "Aide en champ de bataille et en arène", "d": "Applique les multiplicateurs en champ de bataille et en arène."},
|
||||||
|
"CoaBots.Scaling.World": {"t": "Aide en monde ouvert", "d": "Applique les multiplicateurs hors des donjons et des raids. Rarement souhaité."},
|
||||||
|
"CoaBots.Scaling.DamageDone": {"t": "Dégâts des bots", "d": "Multiplie les dégâts que les bots et leurs familiers infligent aux créatures. 1 : aucun changement ; plus élevé = contenu plus facile."},
|
||||||
|
"CoaBots.Scaling.HealingDone": {"t": "Soins des bots", "d": "Multiplie les soins lancés par les bots. 1 : aucun changement."},
|
||||||
|
"CoaBots.Scaling.DamageTaken": {"t": "Dégâts subis par les bots", "d": "Multiplie les dégâts que les créatures infligent aux bots. Sous 1, les bots en subissent moins ; 1 : aucun changement."},
|
||||||
|
"CoaBots.Scaling.TankThreat": {"t": "Menace des tanks", "d": "Menace supplémentaire générée par les tanks bots, pour qu'ils gardent l'attention des ennemis. 1 : aucun changement."},
|
||||||
|
"CoaBots.Scaling.BossTuning": {"t": "Aide supplémentaire contre quatre boss", "d": "Ajoute des multiplicateurs plus forts pour Loken, l'élémentaire drakkari, le colosse drakkari et Gal'darah, que les bots de niveau 60 ne battaient pas autrement. Pour les tests ; désactivé par défaut."},
|
||||||
"CoaBots.WorldBrain.EngageRange": {
|
"CoaBots.WorldBrain.EngageRange": {
|
||||||
"t": "Distance d’engagement",
|
"t": "Distance d’engagement",
|
||||||
"d": "Distance à laquelle un bot commence à combattre un monstre de quête."
|
"d": "Distance à laquelle un bot commence à combattre un monstre de quête."
|
||||||
|
|||||||
@@ -148,6 +148,16 @@
|
|||||||
"t": "Радиус поиска целей",
|
"t": "Радиус поиска целей",
|
||||||
"d": "Как далеко бот высматривает цели заданий внутри области задачи."
|
"d": "Как далеко бот высматривает цели заданий внутри области задачи."
|
||||||
},
|
},
|
||||||
|
"CoaBots.Scaling.Enable": {"t": "Помощь ботам в подземельях и рейдах", "d": "Главный выключатель множителей ниже. Пока вы их не повысите, все равны 1 (без изменений)."},
|
||||||
|
"CoaBots.Scaling.Dungeons": {"t": "Помощь в подземельях на 5 человек", "d": "Применять множители, пока бот находится в подземелье на 5 человек."},
|
||||||
|
"CoaBots.Scaling.Raids": {"t": "Помощь в рейдах", "d": "Применять множители, пока бот находится в рейде."},
|
||||||
|
"CoaBots.Scaling.Battlegrounds": {"t": "Помощь на полях боя и аренах", "d": "Применять множители на полях боя и аренах."},
|
||||||
|
"CoaBots.Scaling.World": {"t": "Помощь в открытом мире", "d": "Применять множители вне подземелий и рейдов. Обычно не нужно."},
|
||||||
|
"CoaBots.Scaling.DamageDone": {"t": "Урон ботов", "d": "Умножает урон, который наносят существам боты и их питомцы. 1 — без изменений, больше — проще."},
|
||||||
|
"CoaBots.Scaling.HealingDone": {"t": "Лечение ботов", "d": "Умножает лечение, которое накладывают боты. 1 — без изменений."},
|
||||||
|
"CoaBots.Scaling.DamageTaken": {"t": "Урон по ботам", "d": "Умножает урон, который существа наносят ботам. Меньше 1 — боты получают меньше урона, 1 — без изменений."},
|
||||||
|
"CoaBots.Scaling.TankThreat": {"t": "Угроза танков", "d": "Дополнительная угроза от ботов-танков, чтобы они удерживали внимание врагов. 1 — без изменений."},
|
||||||
|
"CoaBots.Scaling.BossTuning": {"t": "Дополнительная помощь против четырёх боссов", "d": "Добавляет усиленные множители для Локена, элементаля Драккари, колосса Драккари и Гал'дараха, которых боты 60 уровня иначе не побеждали. Для тестов; по умолчанию выключено."},
|
||||||
"CoaBots.WorldBrain.EngageRange": {
|
"CoaBots.WorldBrain.EngageRange": {
|
||||||
"t": "Дистанция начала боя",
|
"t": "Дистанция начала боя",
|
||||||
"d": "Расстояние, на котором бот начинает бой с монстром из задания."
|
"d": "Расстояние, на котором бот начинает бой с монстром из задания."
|
||||||
|
|||||||
@@ -168,6 +168,16 @@
|
|||||||
"t": "任务目标搜索半径",
|
"t": "任务目标搜索半径",
|
||||||
"d": "机器人在目标区域内寻找任务怪或任务道具的扫描范围。"
|
"d": "机器人在目标区域内寻找任务怪或任务道具的扫描范围。"
|
||||||
},
|
},
|
||||||
|
"CoaBots.Scaling.Enable": {"t": "机器人在地下城和团队副本中的强度辅助", "d": "下方倍率的总开关。在你调高之前,所有倍率均为1(无变化)。"},
|
||||||
|
"CoaBots.Scaling.Dungeons": {"t": "5人地下城辅助", "d": "机器人处于5人地下城时应用倍率。"},
|
||||||
|
"CoaBots.Scaling.Raids": {"t": "团队副本辅助", "d": "机器人处于团队副本时应用倍率。"},
|
||||||
|
"CoaBots.Scaling.Battlegrounds": {"t": "战场与竞技场辅助", "d": "在战场和竞技场中应用倍率。"},
|
||||||
|
"CoaBots.Scaling.World": {"t": "野外辅助", "d": "在地下城和团队副本之外应用倍率。通常不需要。"},
|
||||||
|
"CoaBots.Scaling.DamageDone": {"t": "机器人伤害", "d": "倍乘机器人及其宠物对生物造成的伤害。1表示无变化;越高内容越容易。"},
|
||||||
|
"CoaBots.Scaling.HealingDone": {"t": "机器人治疗", "d": "倍乘机器人施放的治疗量。1表示无变化。"},
|
||||||
|
"CoaBots.Scaling.DamageTaken": {"t": "机器人受到的伤害", "d": "倍乘生物对机器人造成的伤害。低于1时机器人受到的伤害更少;1表示无变化。"},
|
||||||
|
"CoaBots.Scaling.TankThreat": {"t": "坦克仇恨", "d": "机器人坦克额外产生的仇恨,使其更容易吸引敌人注意。1表示无变化。"},
|
||||||
|
"CoaBots.Scaling.BossTuning": {"t": "针对四个首领的额外辅助", "d": "为洛肯、达卡莱元素、达卡莱巨像和加尔达拉添加更强的倍率,60级机器人否则无法击败他们。用于测试;默认关闭。"},
|
||||||
"CoaBots.WorldBrain.EngageRange": {
|
"CoaBots.WorldBrain.EngageRange": {
|
||||||
"t": "开战交战距离",
|
"t": "开战交战距离",
|
||||||
"d": "机器人发现任务目标怪并开始主动进入战斗的距离。"
|
"d": "机器人发现任务目标怪并开始主动进入战斗的距离。"
|
||||||
|
|||||||
+3
-3
@@ -16,10 +16,10 @@
|
|||||||
--font-sans: "Segoe UI Variable Text", "Segoe UI", "Microsoft YaHei UI", "Microsoft YaHei", system-ui, sans-serif;
|
--font-sans: "Segoe UI Variable Text", "Segoe UI", "Microsoft YaHei UI", "Microsoft YaHei", system-ui, sans-serif;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Everything is sized in rem, so scaling the root font grows the whole interface with the window
|
/* Window size changes layout, not UI density. Keep rem tied to the user's default
|
||||||
(16px up to about 1280px wide, then gradually larger; capped at 26px). */
|
font size; browser zoom and operating-system display scaling still apply. */
|
||||||
html {
|
html {
|
||||||
font-size: clamp(16px, calc(0.75vw + 6.4px), 26px);
|
font-size: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
html,
|
html,
|
||||||
|
|||||||
+5
-1
@@ -229,7 +229,7 @@ export interface ModuleView {
|
|||||||
page: string | null;
|
page: string | null;
|
||||||
/** not shown on the Modules page */
|
/** not shown on the Modules page */
|
||||||
hidden: boolean;
|
hidden: boolean;
|
||||||
compatibility?: "compatible" | "experimental" | "unsupported";
|
compatibility?: "compatible" | "experimental" | "unsupported" | "requires-squid";
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface ModuleSetting {
|
export interface ModuleSetting {
|
||||||
@@ -496,8 +496,10 @@ export const api = {
|
|||||||
forget: (id: string) => invoke<void>("forget_server", { id }),
|
forget: (id: string) => invoke<void>("forget_server", { id }),
|
||||||
status: (id: string) => invoke<StatusView>("server_status", { id }),
|
status: (id: string) => invoke<StatusView>("server_status", { id }),
|
||||||
start: (id: string) => invoke<DriverOutcome>("start_server", { id }),
|
start: (id: string) => invoke<DriverOutcome>("start_server", { id }),
|
||||||
|
forceStop: (id: string) => invoke<DriverOutcome>("force_stop_server", { id }),
|
||||||
stop: (id: string) => invoke<DriverOutcome>("stop_server", { id }),
|
stop: (id: string) => invoke<DriverOutcome>("stop_server", { id }),
|
||||||
settings: (id: string, scope: Scope) => invoke<SettingsView>("get_settings", { id, scope }),
|
settings: (id: string, scope: Scope) => invoke<SettingsView>("get_settings", { id, scope }),
|
||||||
|
serverLoggingPreset: (id: string, preset: "normal" | "errors" | "off") => invoke<void>("server_logging_preset", { id, preset }),
|
||||||
save: (id: string, scope: Scope, changes: Record<string, JsonValue>) => invoke<SaveReport>("save_settings", { id, scope, changes }),
|
save: (id: string, scope: Scope, changes: Record<string, JsonValue>) => invoke<SaveReport>("save_settings", { id, scope, changes }),
|
||||||
presets: (scope: Scope) => invoke<PresetInfo[]>("list_presets", { scope }),
|
presets: (scope: Scope) => invoke<PresetInfo[]>("list_presets", { scope }),
|
||||||
backups: (id: string) => invoke<RecoveryPoint[]>("list_backups", { id }),
|
backups: (id: string) => invoke<RecoveryPoint[]>("list_backups", { id }),
|
||||||
@@ -560,6 +562,8 @@ export const api = {
|
|||||||
performance: (id: string) => invoke<Performance | null>("get_performance", { id }),
|
performance: (id: string) => invoke<Performance | null>("get_performance", { id }),
|
||||||
companionSizes: () => invoke<CompanionSizes>("companion_sizes"),
|
companionSizes: () => invoke<CompanionSizes>("companion_sizes"),
|
||||||
addCompanions: (id: string, count: number) => invoke<{ spawned: string | null; created: number | null; baseline: number | null }>("add_companions", { id, count }),
|
addCompanions: (id: string, count: number) => invoke<{ spawned: string | null; created: number | null; baseline: number | null }>("add_companions", { id, count }),
|
||||||
|
clientGraphics: (id: string) => invoke<{ dxvk_disabled: boolean; enhancements_disabled: boolean }>("client_graphics", { id }),
|
||||||
|
clientSetGraphics: (id: string, name: string, disabled: boolean) => invoke<{ dxvk_disabled: boolean; enhancements_disabled: boolean }>("client_set_graphics", { id, name, disabled }),
|
||||||
clientInfo: (id: string) => invoke<ClientInfo | null>("client_info", { id }),
|
clientInfo: (id: string) => invoke<ClientInfo | null>("client_info", { id }),
|
||||||
setClient: (id: string, path: string) => invoke<ClientInfo>("set_client", { id, path }),
|
setClient: (id: string, path: string) => invoke<ClientInfo>("set_client", { id, path }),
|
||||||
setRealmlist: (id: string, host: string) => invoke<string[]>("client_realmlist", { id, host }),
|
setRealmlist: (id: string, host: string) => invoke<string[]>("client_realmlist", { id, host }),
|
||||||
|
|||||||
@@ -69,6 +69,8 @@ export interface BrowseParams {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export const browse = {
|
export const browse = {
|
||||||
|
enabled: () => invoke<boolean>("browse_enabled"),
|
||||||
|
setEnabled: (enabled: boolean) => invoke<void>("browse_set_enabled", { enabled }),
|
||||||
list: (params: BrowseParams) => invoke<RealmPage>("browse_list", { params }),
|
list: (params: BrowseParams) => invoke<RealmPage>("browse_list", { params }),
|
||||||
detail: (realmId: string) => invoke<RealmDetail>("browse_detail", { realmId }),
|
detail: (realmId: string) => invoke<RealmDetail>("browse_detail", { realmId }),
|
||||||
modules: () => invoke<ModuleInfo[]>("module_catalog"),
|
modules: () => invoke<ModuleInfo[]>("module_catalog"),
|
||||||
|
|||||||
@@ -0,0 +1,16 @@
|
|||||||
|
import manager from "../../changelog/history.json";
|
||||||
|
import server from "@/data/server-history.json";
|
||||||
|
import translations from "@/data/latest-note-translations.json";
|
||||||
|
import type { Locale } from "@/i18n";
|
||||||
|
|
||||||
|
import { localizeNotes, type Component, type History, type Release } from "./releaseHistoryModel";
|
||||||
|
export { compareVersions, releasesForUpdate } from "./releaseHistoryModel";
|
||||||
|
export type { Component, History } from "./releaseHistoryModel";
|
||||||
|
export const bundledHistories: Record<Component, History> = { manager: manager as History, server: server as History };
|
||||||
|
export const repositories = { manager: "Corfirean/coa-server-manager", server: "Corfirean/coa-server-build" };
|
||||||
|
|
||||||
|
export function translatedNotes(component: Component, release: Release, locale: Locale): { notes: string[]; fallback: boolean } {
|
||||||
|
if (locale === "en") return { notes: release.notes, fallback: false };
|
||||||
|
const dict = (translations[component] as Record<string, Record<string, string>>)[locale] ?? {};
|
||||||
|
return localizeNotes(release.notes, dict);
|
||||||
|
}
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
export type Component = "server" | "manager";
|
||||||
|
export interface Release { version: string; tag: string; date: string; notes: string[]; prerelease?: boolean; experimentalFeatures?: string[] }
|
||||||
|
export interface History { component: Component; releases: Release[]; source?: "remote" | "cache" }
|
||||||
|
|
||||||
|
// Only stable numeric versions participate in an installed-to-target update range.
|
||||||
|
export function compareVersions(a: string, b: string): number {
|
||||||
|
const aa = a.split(".").map(Number), bb = b.split(".").map(Number);
|
||||||
|
for (let i = 0; i < Math.max(aa.length, bb.length); i++) {
|
||||||
|
const d = (aa[i] ?? 0) - (bb[i] ?? 0);
|
||||||
|
if (d) return d;
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
export function releasesForUpdate(releases: Release[], from?: string, to?: string): Release[] {
|
||||||
|
if (!to || !/^\d+(\.\d+)+$/.test(to)) return [];
|
||||||
|
const knownFrom = from && /^\d+(\.\d+)+$/.test(from);
|
||||||
|
return releases.filter(r => !r.prerelease && /^\d+(\.\d+)+$/.test(r.version) &&
|
||||||
|
(knownFrom ? compareVersions(r.version, from) > 0 && compareVersions(r.version, to) <= 0 : r.version === to));
|
||||||
|
}
|
||||||
|
export function localizeNotes(notes: string[], dictionary: Record<string, string> = {}) {
|
||||||
|
const complete = notes.every(note => dictionary[note]);
|
||||||
|
return { notes: complete ? notes.map(note => dictionary[note]) : notes, fallback: !complete };
|
||||||
|
}
|
||||||
+14
-2
@@ -1,3 +1,4 @@
|
|||||||
|
import { invoke } from "@tauri-apps/api/core";
|
||||||
import { useSyncExternalStore } from "react";
|
import { useSyncExternalStore } from "react";
|
||||||
import { getCurrentWindow } from "@tauri-apps/api/window";
|
import { getCurrentWindow } from "@tauri-apps/api/window";
|
||||||
import { check, type Update } from "@tauri-apps/plugin-updater";
|
import { check, type Update } from "@tauri-apps/plugin-updater";
|
||||||
@@ -93,9 +94,11 @@ export async function installNow(): Promise<void> {
|
|||||||
if (state.phase !== "ready") await downloadPending();
|
if (state.phase !== "ready") await downloadPending();
|
||||||
if (state.phase !== "ready") return;
|
if (state.phase !== "ready") return;
|
||||||
set({ phase: "installing" });
|
set({ phase: "installing" });
|
||||||
|
await invoke("manager_installing", { enabled: true });
|
||||||
await update.install();
|
await update.install();
|
||||||
await relaunch();
|
await relaunch();
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
|
await invoke("manager_installing", { enabled: false }).catch(() => {});
|
||||||
set({ phase: "error", error: String(e) });
|
set({ phase: "error", error: String(e) });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -107,14 +110,23 @@ export function installOnClose(): () => void {
|
|||||||
const win = getCurrentWindow();
|
const win = getCurrentWindow();
|
||||||
void win
|
void win
|
||||||
.onCloseRequested(async (event) => {
|
.onCloseRequested(async (event) => {
|
||||||
if (state.phase !== "ready" || !update || !autoUpdateEnabled()) return;
|
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
|
if (state.phase !== "ready" || !update || !autoUpdateEnabled()) {
|
||||||
|
await invoke("close_manager");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (await invoke<boolean>("close_to_tray")) {
|
||||||
|
await invoke("close_manager");
|
||||||
|
return;
|
||||||
|
}
|
||||||
try {
|
try {
|
||||||
set({ phase: "installing" });
|
set({ phase: "installing" });
|
||||||
|
await invoke("manager_installing", { enabled: true });
|
||||||
await update.install();
|
await update.install();
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
|
await invoke("manager_installing", { enabled: false }).catch(() => {});
|
||||||
set({ phase: "error", error: String(e) });
|
set({ phase: "error", error: String(e) });
|
||||||
await win.destroy();
|
await invoke("close_manager");
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.then((un) => {
|
.then((un) => {
|
||||||
|
|||||||
@@ -0,0 +1,38 @@
|
|||||||
|
export class ServerLifecycle {
|
||||||
|
private wasRunning = false;
|
||||||
|
private maintenance = false;
|
||||||
|
private stopRequested = false;
|
||||||
|
private operationPending = false;
|
||||||
|
|
||||||
|
request(action: "starting" | "stopping" | "restarting") {
|
||||||
|
this.stopRequested = action !== "starting";
|
||||||
|
this.operationPending = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
complete(action: "starting" | "stopping" | "restarting") {
|
||||||
|
this.operationPending = false;
|
||||||
|
if (action !== "stopping") { this.stopRequested = false; this.wasRunning = false; }
|
||||||
|
}
|
||||||
|
|
||||||
|
beginMaintenance() { this.maintenance = true; this.wasRunning = false; }
|
||||||
|
endMaintenance() { this.maintenance = false; this.wasRunning = false; }
|
||||||
|
|
||||||
|
observe(running: boolean, busy: boolean, updating: boolean): boolean {
|
||||||
|
if (this.maintenance) { this.wasRunning = false; return false; }
|
||||||
|
if (running) { this.wasRunning = true; return false; }
|
||||||
|
if (this.stopRequested || updating || this.operationPending) {
|
||||||
|
this.wasRunning = false;
|
||||||
|
if (!busy && !this.operationPending) this.stopRequested = false;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if (this.wasRunning && !busy) { this.wasRunning = false; return true; }
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const lifecycles = new Map<string, ServerLifecycle>();
|
||||||
|
export function serverLifecycle(id: string) {
|
||||||
|
let lifecycle = lifecycles.get(id);
|
||||||
|
if (!lifecycle) { lifecycle = new ServerLifecycle(); lifecycles.set(id, lifecycle); }
|
||||||
|
return lifecycle;
|
||||||
|
}
|
||||||
@@ -1,3 +1,4 @@
|
|||||||
|
import { serverLifecycle } from "@/lib/serverLifecycle";
|
||||||
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";
|
||||||
@@ -30,6 +31,11 @@ const listeners = new Set<() => void>();
|
|||||||
export const CHECK_EVERY_MS = 5 * 60 * 1000;
|
export const CHECK_EVERY_MS = 5 * 60 * 1000;
|
||||||
|
|
||||||
const get = (id: string) => states.get(id) ?? EMPTY;
|
const get = (id: string) => states.get(id) ?? EMPTY;
|
||||||
|
export function serverUpdateBlocksRestart(id: string): boolean {
|
||||||
|
const state = get(id);
|
||||||
|
return state.applying || state.stateError !== null || !!(state.result && "pending" in state.result);
|
||||||
|
}
|
||||||
|
|
||||||
function set(id: string, next: Partial<ServerUpdateState>) {
|
function set(id: string, next: Partial<ServerUpdateState>) {
|
||||||
states.set(id, { ...get(id), ...next });
|
states.set(id, { ...get(id), ...next });
|
||||||
listeners.forEach((l) => l());
|
listeners.forEach((l) => l());
|
||||||
@@ -89,6 +95,7 @@ export async function applyServerUpdate(id: string, opts?: { choices: Record<str
|
|||||||
// The update stops a running server and proves the new build by starting it; a server that was stopped stays stopped
|
// The update stops a running server and proves the new build by starting it; a server that was stopped stays stopped
|
||||||
// unless the owner asked for it to start.
|
// unless the owner asked for it to start.
|
||||||
const wasRunning = await api.status(id).then((s) => [s.observed.mysql, s.observed.auth, s.observed.world].some((x) => x.state === "running" || x.state === "starting")).catch(() => true);
|
const wasRunning = await api.status(id).then((s) => [s.observed.mysql, s.observed.auth, s.observed.world].some((x) => x.state === "running" || x.state === "starting")).catch(() => true);
|
||||||
|
serverLifecycle(id).beginMaintenance();
|
||||||
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;
|
||||||
try {
|
try {
|
||||||
@@ -110,6 +117,7 @@ export async function applyServerUpdate(id: string, opts?: { choices: Record<str
|
|||||||
try {
|
try {
|
||||||
await refreshServerUpdateState(id);
|
await refreshServerUpdateState(id);
|
||||||
} catch { /* The state error remains visible and prevents another apply. */ }
|
} catch { /* The state error remains visible and prevents another apply. */ }
|
||||||
|
serverLifecycle(id).endMaintenance();
|
||||||
set(id, { applying: false });
|
set(id, { applying: false });
|
||||||
void checkServerUpdate(id);
|
void checkServerUpdate(id);
|
||||||
}
|
}
|
||||||
|
|||||||
+11
-33
@@ -1,12 +1,12 @@
|
|||||||
import { useEffect, useState } from "react";
|
import { useEffect, useState } from "react";
|
||||||
import { getVersion } from "@tauri-apps/api/app";
|
import { getVersion } from "@tauri-apps/api/app";
|
||||||
import { Loader2 } from "lucide-react";
|
import { Loader2, RefreshCw, Monitor } from "lucide-react";
|
||||||
import { Button } from "@/components/ui/button";
|
import { Button } from "@/components/ui/button";
|
||||||
import { Card } from "@/components/ui/card";
|
import { Card } from "@/components/ui/card";
|
||||||
import { useT } from "@/i18n";
|
import { useT } from "@/i18n";
|
||||||
import { autoUpdateEnabled, installNow, lookForUpdate, setAutoUpdate, useSelfUpdate } from "@/lib/selfUpdate";
|
import { autoUpdateEnabled, installNow, lookForUpdate, setAutoUpdate, useSelfUpdate } from "@/lib/selfUpdate";
|
||||||
|
|
||||||
export function AboutCard() {
|
export function AboutCard({ onHistory }: { onHistory?: () => void }) {
|
||||||
const t = useT();
|
const t = useT();
|
||||||
const s = useSelfUpdate();
|
const s = useSelfUpdate();
|
||||||
const [version, setVersion] = useState("");
|
const [version, setVersion] = useState("");
|
||||||
@@ -21,37 +21,12 @@ export function AboutCard() {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<Card className="mt-6 p-6">
|
<Card className="mt-6 p-6">
|
||||||
<h2 className="font-semibold">{t("app.name")}</h2>
|
<div className="flex items-start justify-between gap-3">
|
||||||
<p className="mt-1 text-sm text-muted">{t("about.version", { v: version || "…" })}</p>
|
<div><h2 className="flex items-center gap-2 font-semibold"><Monitor className="h-4 w-4 text-gold" aria-hidden />{t("history.manager")}</h2><p className="mt-2 text-sm text-muted">{t("settings.version", { v: version || "…" })}</p></div>
|
||||||
|
<Button size="sm" disabled={busy} aria-label={t("about.check")} title={t("about.check")} onClick={() => { setAsked(true); void lookForUpdate({ download: false }); }}><RefreshCw className={`h-4 w-4 ${s.phase === "checking" ? "animate-spin" : ""}`} aria-hidden /></Button>
|
||||||
<label className="mt-3 flex cursor-pointer items-start gap-2 text-sm">
|
</div>
|
||||||
<input
|
<p className="mt-3 text-xs text-muted">{t("about.autoHint")}</p>
|
||||||
type="checkbox"
|
|
||||||
className="mt-1"
|
|
||||||
checked={auto}
|
|
||||||
onChange={(e) => {
|
|
||||||
setAuto(e.target.checked);
|
|
||||||
setAutoUpdate(e.target.checked);
|
|
||||||
}}
|
|
||||||
/>
|
|
||||||
<span>
|
|
||||||
{t("about.auto")}
|
|
||||||
<span className="block text-xs text-muted">{t("about.autoHint")}</span>
|
|
||||||
</span>
|
|
||||||
</label>
|
|
||||||
|
|
||||||
<div className="mt-4 flex flex-wrap items-center gap-3">
|
<div className="mt-4 flex flex-wrap items-center gap-3">
|
||||||
<Button
|
|
||||||
size="sm"
|
|
||||||
disabled={busy}
|
|
||||||
onClick={() => {
|
|
||||||
setAsked(true);
|
|
||||||
void lookForUpdate({ download: false });
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
{s.phase === "checking" && <Loader2 className="h-4 w-4 animate-spin" aria-hidden />}
|
|
||||||
{t("about.check")}
|
|
||||||
</Button>
|
|
||||||
{s.version && s.phase !== "current" && (
|
{s.version && s.phase !== "current" && (
|
||||||
<Button size="sm" variant="primary" disabled={busy} onClick={() => void installNow()}>
|
<Button size="sm" variant="primary" disabled={busy} onClick={() => void installNow()}>
|
||||||
{(s.phase === "downloading" || s.phase === "installing") && <Loader2 className="h-4 w-4 animate-spin" aria-hidden />}
|
{(s.phase === "downloading" || s.phase === "installing") && <Loader2 className="h-4 w-4 animate-spin" aria-hidden />}
|
||||||
@@ -64,7 +39,7 @@ export function AboutCard() {
|
|||||||
</span>
|
</span>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
{s.version && s.notes && s.phase !== "current" && <p className="mt-3 whitespace-pre-line text-sm text-muted">{s.notes}</p>}
|
{onHistory ? <button className="mt-3 cursor-pointer text-sm text-gold hover:underline" onClick={onHistory}>{t(s.version && s.phase !== "current" ? "history.open" : "history.title")}</button> : s.version && s.notes && s.phase !== "current" && <p className="mt-3 whitespace-pre-line text-sm text-muted">{s.notes}</p>}
|
||||||
{s.phase === "ready" && <p className="mt-3 text-sm text-ok" role="status">{t("selfupd.onClose")}</p>}
|
{s.phase === "ready" && <p className="mt-3 text-sm text-ok" role="status">{t("selfupd.onClose")}</p>}
|
||||||
{asked && s.phase === "current" && <p className="mt-3 text-sm text-ok" role="status">{t("about.upToDate")}</p>}
|
{asked && s.phase === "current" && <p className="mt-3 text-sm text-ok" role="status">{t("about.upToDate")}</p>}
|
||||||
{s.phase === "error" && (
|
{s.phase === "error" && (
|
||||||
@@ -73,6 +48,9 @@ export function AboutCard() {
|
|||||||
{s.error && <p className="selectable mt-1 break-all text-xs text-muted">{s.error}</p>}
|
{s.error && <p className="selectable mt-1 break-all text-xs text-muted">{s.error}</p>}
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
<label className="mt-5 flex cursor-pointer items-center justify-between gap-3 border-t border-line pt-4 text-sm" title={t("about.auto")}>
|
||||||
|
<span>{t("settings.autoManager")}</span><input type="checkbox" role="switch" aria-description={t("about.auto")} checked={auto} onChange={e => { setAuto(e.target.checked); setAutoUpdate(e.target.checked); }} className="h-4 w-4 accent-[#c9a24a]" />
|
||||||
|
</label>
|
||||||
</Card>
|
</Card>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
Loaded 100 of 127 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user