Remove-server card, Accounts tab, quiet background update check, safer install cleanup

- Settings: a card removes a stopped server from the Manager (no files deleted).
- The Players tab is now Accounts in all languages.
- The five-minute background check no longer starts and stops MySQL on a stopped
  server; only an explicit check may start it.
- A failed install keeps its marker until the folder is complete, cleans up after a
  failure that happens after the move, and reports the launcher's output; install and
  update errors have a Copy button.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
This commit is contained in:
ДмитрийandClaude Sonnet 5.5 committed 2026-10-08 07:01:20 +05:00
1 parent c6e8a34509
commit 072a657649
17 files changed
+185 -50

No files matched your search

+8 -3
View File
@@ -20,7 +20,7 @@ const de: Partial<Record<keyof typeof en, string>> = {
"nav.overview": "Übersicht",
"nav.bots": "Bots",
"nav.server": "Server",
"nav.players": "Spieler",
"nav.players": "Konten",
"nav.friends": "Mit Freunden spielen",
"nav.backups": "Sicherungen",
"nav.console": "Konsole",
@@ -32,7 +32,7 @@ const de: Partial<Record<keyof typeof en, string>> = {
"q.overview": "Läuft mein Server?",
"q.bots": "Wie sind meine Bots eingestellt?",
"q.server": "Wie verhält sich mein Server?",
"q.players": "Wer spielt gerade?",
"q.players": "Wer kann sich im Spiel anmelden?",
"q.friends": "Wie kann mein Freund beitreten?",
"q.backups": "Sind meine Daten sicher?",
"q.console": "Was macht der Server gerade?",
@@ -167,7 +167,7 @@ const de: Partial<Record<keyof typeof en, string>> = {
"install.open": "MEINEN SERVER ÖFFNEN",
// Players
"players.title": "Spieler",
"players.title": "Konten",
"players.createTitle": "Erstelle dein Konto",
"players.createText": "Das sind der Name und das Passwort, mit denen du dich im Spiel anmeldest.",
"players.startFirst": "Starte zuerst den Server – Konten werden erstellt, solange er läuft.",
@@ -827,6 +827,11 @@ const de: Partial<Record<keyof typeof en, string>> = {
"set.searchAll": "Alle Einstellungen nach Name oder Beschreibung durchsuchen…",
"set.search": "Einstellungen durchsuchen…",
"upd.current": "Du bist auf dem neuesten Stand (Version {v}).",
"remove.title": "Diesen Server aus dem Manager entfernen",
"remove.text": "Der Manager zeigt diesen Server nicht mehr an. Es werden keine Dateien, Datenbanken oder Sicherungen gelöscht; den Ordner kannst du später über „Weiteren Server verwalten“ wieder hinzufügen.",
"remove.button": "Aus dem Manager entfernen",
"remove.stopFirst": "Halte zuerst den Server an.",
"remove.confirm": "Diesen Server aus dem Manager entfernen?\n\n{path}\n\nEs werden keine Dateien gelöscht.",
"upd.dbUnchecked": "Die Datenbank konnte nicht geprüft werden, daher sind offene Datenbankänderungen unbekannt: {why}",
"client.job.checking": "Client wird geprüft…",
"client.job.updating": "Client wird aktualisiert",
+8 -3
View File
@@ -51,7 +51,7 @@ const en = {
"nav.overview": "Overview",
"nav.bots": "Bots",
"nav.server": "Server",
"nav.players": "Players",
"nav.players": "Accounts",
"nav.friends": "Play with Friends",
"nav.backups": "Backups",
"nav.console": "Console",
@@ -63,7 +63,7 @@ const en = {
"q.overview": "Is my server running?",
"q.bots": "How are my bots configured?",
"q.server": "How does my server behave?",
"q.players": "Who is playing right now?",
"q.players": "Who can log in to the game?",
"q.friends": "How can my friend join?",
"q.backups": "Is my data safe?",
"q.console": "What is the server doing?",
@@ -200,7 +200,7 @@ const en = {
"install.open": "OPEN MY SERVER",
// Players
"players.title": "Players",
"players.title": "Accounts",
"players.createTitle": "Create your account",
"players.createText": "This is the name and password you use to log in to the game.",
"players.startFirst": "Start the server first — accounts are created while it is running.",
@@ -848,6 +848,11 @@ const en = {
"set.searchAll": "Search all settings by name or description…",
"set.search": "Search settings…",
"upd.current": "You are up to date (version {v}).",
"remove.title": "Remove this server from the Manager",
"remove.text": "The Manager stops listing this server. No files, databases or backups are deleted, and you can add the folder again later with “Manage another server”.",
"remove.button": "Remove from Manager",
"remove.stopFirst": "Stop the server first.",
"remove.confirm": "Remove this server from the Manager?\n\n{path}\n\nNo files are deleted.",
"upd.dbUnchecked": "The database could not be checked, so pending database changes are unknown: {why}",
"client.job.checking": "Checking the client…",
"client.job.updating": "Updating the client",
+8 -3
View File
@@ -20,7 +20,7 @@ const es: Partial<Record<keyof typeof en, string>> = {
"nav.overview": "Resumen",
"nav.bots": "Bots",
"nav.server": "Servidor",
"nav.players": "Jugadores",
"nav.players": "Cuentas",
"nav.friends": "Jugar con amigos",
"nav.backups": "Copias de seguridad",
"nav.console": "Consola",
@@ -32,7 +32,7 @@ const es: Partial<Record<keyof typeof en, string>> = {
"q.overview": "¿Está funcionando mi servidor?",
"q.bots": "¿Cómo están configurados mis bots?",
"q.server": "¿Cómo se comporta mi servidor?",
"q.players": "¿Quién está jugando ahora?",
"q.players": "¿Quién puede entrar al juego?",
"q.friends": "¿Cómo puede unirse mi amigo?",
"q.backups": "¿Están seguros mis datos?",
"q.console": "¿Qué está haciendo el servidor?",
@@ -167,7 +167,7 @@ const es: Partial<Record<keyof typeof en, string>> = {
"install.open": "ABRIR MI SERVIDOR",
// Players
"players.title": "Jugadores",
"players.title": "Cuentas",
"players.createTitle": "Crea tu cuenta",
"players.createText": "Este es el nombre y la contraseña con los que inicias sesión en el juego.",
"players.startFirst": "Inicia primero el servidor: las cuentas se crean mientras está en marcha.",
@@ -827,6 +827,11 @@ const es: Partial<Record<keyof typeof en, string>> = {
"set.searchAll": "Buscar en todos los ajustes por nombre o descripción…",
"set.search": "Buscar ajustes…",
"upd.current": "Estás al día (versión {v}).",
"remove.title": "Quitar este servidor del Manager",
"remove.text": "El Manager deja de mostrar este servidor. No se borran archivos, bases de datos ni copias de seguridad, y puedes volver a añadir la carpeta con «Gestionar otro servidor».",
"remove.button": "Quitar del Manager",
"remove.stopFirst": "Detén primero el servidor.",
"remove.confirm": "¿Quitar este servidor del Manager?\n\n{path}\n\nNo se borra ningún archivo.",
"upd.dbUnchecked": "No se pudo comprobar la base de datos, así que se desconocen los cambios pendientes: {why}",
"client.job.checking": "Comprobando el cliente…",
"client.job.updating": "Actualizando el cliente",
+8 -3
View File
@@ -20,7 +20,7 @@ const fr: Partial<Record<keyof typeof en, string>> = {
"nav.overview": "Vue d’ensemble",
"nav.bots": "Bots",
"nav.server": "Serveur",
"nav.players": "Joueurs",
"nav.players": "Comptes",
"nav.friends": "Jouer avec des amis",
"nav.backups": "Sauvegardes",
"nav.console": "Console",
@@ -32,7 +32,7 @@ const fr: Partial<Record<keyof typeof en, string>> = {
"q.overview": "Mon serveur fonctionne-t-il ?",
"q.bots": "Comment mes bots sont-ils configurés ?",
"q.server": "Comment se comporte mon serveur ?",
"q.players": "Qui joue en ce moment ?",
"q.players": "Qui peut se connecter au jeu ?",
"q.friends": "Comment mon ami peut-il se connecter ?",
"q.backups": "Mes données sont-elles en sécurité ?",
"q.console": "Que fait le serveur ?",
@@ -167,7 +167,7 @@ const fr: Partial<Record<keyof typeof en, string>> = {
"install.open": "OUVRIR MON SERVEUR",
// Players
"players.title": "Joueurs",
"players.title": "Comptes",
"players.createTitle": "Créez votre compte",
"players.createText": "C’est le nom et le mot de passe que vous utilisez pour vous connecter au jeu.",
"players.startFirst": "Démarrez d’abord le serveur : les comptes sont créés pendant qu’il fonctionne.",
@@ -827,6 +827,11 @@ const fr: Partial<Record<keyof typeof en, string>> = {
"set.searchAll": "Rechercher dans tous les réglages par nom ou description…",
"set.search": "Rechercher un réglage…",
"upd.current": "Vous êtes à jour (version {v}).",
"remove.title": "Retirer ce serveur du Manager",
"remove.text": "Le Manager n’affiche plus ce serveur. Aucun fichier, base de données ni sauvegarde n’est supprimé, et vous pourrez rajouter le dossier plus tard avec « Gérer un autre serveur ».",
"remove.button": "Retirer du Manager",
"remove.stopFirst": "Arrêtez d’abord le serveur.",
"remove.confirm": "Retirer ce serveur du Manager ?\n\n{path}\n\nAucun fichier n’est supprimé.",
"upd.dbUnchecked": "La base de données n'a pas pu être vérifiée ; les modifications en attente sont donc inconnues : {why}",
"client.job.checking": "Vérification du client…",
"client.job.updating": "Mise à jour du client",
+8 -3
View File
@@ -51,7 +51,7 @@ const ru: Partial<Record<keyof typeof en, string>> = {
"nav.overview": "Обзор",
"nav.bots": "Боты",
"nav.server": "Сервер",
"nav.players": "Игроки",
"nav.players": "Аккаунты",
"nav.friends": "Игра с друзьями",
"nav.backups": "Резервные копии",
"nav.console": "Консоль",
@@ -63,7 +63,7 @@ const ru: Partial<Record<keyof typeof en, string>> = {
"q.overview": "Мой сервер работает?",
"q.bots": "Как настроены мои боты?",
"q.server": "Как ведёт себя мой сервер?",
"q.players": "Кто сейчас играет?",
"q.players": "Кто может войти в игру?",
"q.friends": "Как подключиться другу?",
"q.backups": "Мои данные в безопасности?",
"q.console": "Что делает сервер?",
@@ -198,7 +198,7 @@ const ru: Partial<Record<keyof typeof en, string>> = {
"install.open": "ОТКРЫТЬ МОЙ СЕРВЕР",
// Players
"players.title": "Игроки",
"players.title": "Аккаунты",
"players.createTitle": "Создайте свою учётную запись",
"players.createText": "Это имя и пароль, с которыми вы входите в игру.",
"players.startFirst": "Сначала запустите сервер — учётные записи создаются, пока он работает.",
@@ -846,6 +846,11 @@ const ru: Partial<Record<keyof typeof en, string>> = {
"set.searchAll": "Поиск по всем настройкам: название или описание…",
"set.search": "Поиск по настройкам…",
"upd.current": "У вас последняя версия ({v}).",
"remove.title": "Убрать сервер из Manager",
"remove.text": "Manager перестанет показывать этот сервер. Файлы, базы данных и резервные копии не удаляются, папку можно добавить снова через «Управлять другим сервером».",
"remove.button": "Убрать из Manager",
"remove.stopFirst": "Сначала остановите сервер.",
"remove.confirm": "Убрать этот сервер из Manager?\n\n{path}\n\nФайлы не удаляются.",
"upd.dbUnchecked": "Не удалось проверить базу данных, поэтому неизвестно, нужны ли ей изменения: {why}",
"client.job.checking": "Проверка клиента…",
"client.job.updating": "Обновление клиента",
+8 -3
View File
@@ -32,7 +32,7 @@ const zh = {
"nav.overview": "概览",
"nav.bots": "机器人",
"nav.server": "服务器",
"nav.players": "玩家",
"nav.players": "账号",
"nav.friends": "好友联机",
"nav.backups": "备份",
"nav.console": "控制台",
@@ -44,7 +44,7 @@ const zh = {
"q.overview": "服务器当前是否正在运行?",
"q.bots": "机器人目前是如何配置的?",
"q.server": "服务器机制与规则是如何运行的?",
"q.players": "当前有哪些玩家在线?",
"q.players": "谁可以登录游戏?",
"q.friends": "好友如何加入我的服务器?",
"q.backups": "我的数据是否安全?",
"q.console": "服务器正在输出什么日志?",
@@ -179,7 +179,7 @@ const zh = {
"install.open": "打开我的服务器",
// Players
"players.title": "玩家",
"players.title": "账号",
"players.createTitle": "创建游戏账号",
"players.createText": "用于登录游戏的账号名称和密码。",
"players.startFirst": "请先启动服务器 —— 账号需要在服务器运行时创建。",
@@ -827,6 +827,11 @@ const zh = {
"set.searchAll": "按名称或描述搜索全部设置…",
"set.search": "搜索设置…",
"upd.current": "当前已是最新版本 ({v})。",
"remove.title": "从 Manager 中移除此服务器",
"remove.text": "Manager 将不再列出此服务器。不会删除任何文件、数据库或备份,之后可通过“管理其他服务器”重新添加该文件夹。",
"remove.button": "从 Manager 中移除",
"remove.stopFirst": "请先停止服务器。",
"remove.confirm": "要从 Manager 中移除此服务器吗?\n\n{path}\n\n不会删除任何文件。",
"upd.dbUnchecked": "无法检查数据库,因此不清楚是否有待应用的数据库更改:{why}",
"client.job.checking": "正在检查游戏客户端…",
"client.job.updating": "正在更新游戏客户端",
+4 -1
View File
@@ -285,6 +285,8 @@ export interface UpdatePreview {
migrations: number;
pending_migrations?: number;
download_bytes: number;
/** False when pending database changes were not counted (stopped server during a background check, or an error). */
database_checked?: boolean;
/** Set when the database could not be inspected; the file comparison is still valid. */
database_check_error?: string;
}
@@ -451,7 +453,8 @@ export const api = {
cancelInstall: () => invoke<void>("cancel_install"),
createAccount: (id: string, username: string, password: string, administrator: boolean) =>
invoke<void>("create_account", { id, username, password, administrator }),
checkUpdate: (id: string, source?: string) => invoke<UpdatePreview>("check_update", { id, source: source ?? null }),
/** `background`: the repeating check, which must not start the database of a stopped server. */
checkUpdate: (id: string, source?: string, background?: boolean) => invoke<UpdatePreview>("check_update", { id, source: source ?? null, background: background ?? false }),
pendingUpdate: (id: string) => invoke<UpdateTxn | null>("pending_update", { id }),
applyUpdate: (id: string, resolutions: Record<string, "keep" | "replace">, source?: string) =>
invoke<{ txn: UpdateTxn }>("apply_update", { id, source: source ?? null, resolutions }),
+4 -4
View File
@@ -34,12 +34,12 @@ function set(id: string, next: Partial<ServerUpdateState>) {
listeners.forEach((l) => l());
}
export async function checkServerUpdate(id: string): Promise<void> {
export async function checkServerUpdate(id: string, background = false): Promise<void> {
const cur = get(id);
if (cur.applying || cur.checking) return;
set(id, { checking: true });
try {
const p = await api.checkUpdate(id);
const p = await api.checkUpdate(id, undefined, background);
set(id, { preview: p, available: !isUpdateCurrent(p), error: null });
} catch (e) {
// A cached offer is no longer safe after an update or failed recheck.
@@ -51,8 +51,8 @@ export async function checkServerUpdate(id: string): Promise<void> {
/** Check now and then every five minutes. Returns the function that stops it. */
export function startServerUpdatePolling(id: string): () => void {
void checkServerUpdate(id);
const t = setInterval(() => void checkServerUpdate(id), CHECK_EVERY_MS);
void checkServerUpdate(id, true);
const t = setInterval(() => void checkServerUpdate(id, true), CHECK_EVERY_MS);
return () => clearInterval(t);
}
+1 -1
View File
@@ -3,5 +3,5 @@ import type { UpdatePreview } from "./api";
export function isUpdateCurrent(preview: UpdatePreview): boolean {
return preview.from_version === preview.to_version
&& preview.items.every((item) => item.action === "skip")
&& (preview.database_check_error !== undefined || (preview.pending_migrations ?? (preview.migrations === 0 ? 0 : undefined)) === 0);
&& (preview.database_check_error !== undefined || preview.database_checked === false || (preview.pending_migrations ?? (preview.migrations === 0 ? 0 : undefined)) === 0);
}
+8 -3
View File
@@ -158,9 +158,14 @@ export function InstallServer(props: { canCancel: boolean; onCancel: () => void;
<p className="font-medium text-bad">{error.human.code === "unknown" ? t("install.failedTitle") : human(error.human).title}</p>
<p className="mt-1 text-sm text-muted">{error.human.code === "unknown" ? error.technical : human(error.human).message}</p>
<p className="mt-1 text-sm text-muted">{t("install.nothingInstalled")}</p>
<button className="mt-2 cursor-pointer text-xs text-muted underline" onClick={() => setShowDetails((v) => !v)}>
{showDetails ? t("install.hideTech") : t("install.showTech")}
</button>
<div className="mt-2 flex items-center gap-4">
<button className="cursor-pointer text-xs text-muted underline" onClick={() => setShowDetails((v) => !v)}>
{showDetails ? t("install.hideTech") : t("install.showTech")}
</button>
<button className="cursor-pointer text-xs text-muted underline" onClick={() => void navigator.clipboard.writeText(error.technical)}>
{t("common.copyError")}
</button>
</div>
{showDetails && <pre className="mt-2 max-h-40 overflow-auto whitespace-pre-wrap rounded bg-black/40 p-2 text-xs">{error.technical}</pre>}
</Card>
)}
+39
View File
@@ -0,0 +1,39 @@
import { useEffect, useState } from "react";
import { api, asUiError } from "@/lib/api";
import { Button } from "@/components/ui/button";
import { Card } from "@/components/ui/card";
import { useT } from "@/i18n";
/** Takes a server out of the Manager's list. Nothing on disk is deleted, so the folder can be added again later. */
export function RemoveServerCard({ serverId, path, onForget }: { serverId: string; path: string; onForget: () => Promise<void> }) {
const t = useT();
const [running, setRunning] = useState(false);
const [error, setError] = useState<string | null>(null);
const [busy, setBusy] = useState(false);
useEffect(() => {
let active = true;
void api.status(serverId).then((s) => {
if (!active) return;
const all = [s.observed.mysql, s.observed.auth, s.observed.world, ...(s.observed.secondary_world ? [s.observed.secondary_world] : [])];
setRunning(all.some((x) => x.state === "running" || x.state === "starting" || x.state === "stopping"));
}).catch(() => { /* an unreadable status must not hide the button */ });
return () => { active = false; };
}, [serverId]);
async function remove() {
if (!window.confirm(t("remove.confirm", { path }))) return;
setBusy(true); setError(null);
try { await onForget(); }
catch (e) { setError(asUiError(e).technical); setBusy(false); }
}
return <Card className="mt-6 p-6">
<h2 className="font-semibold">{t("remove.title")}</h2>
<p className="mt-2 text-sm text-muted">{t("remove.text")}</p>
<p className="selectable mt-1 break-all text-sm text-muted">{path}</p>
<Button className="mt-4" disabled={busy || running} onClick={() => void remove()}>{t("remove.button")}</Button>
{running && <p className="mt-2 text-sm text-warn">{t("remove.stopFirst")}</p>}
{error && <p className="mt-3 text-sm text-bad" role="alert">{error}</p>}
</Card>;
}
+12 -4
View File
@@ -9,6 +9,7 @@ import { Card } from "@/components/ui/card";
import { ClientCard } from "@/screens/ClientCard";
import { DiagnosticsCard } from "@/screens/DiagnosticsCard";
import { AboutCard } from "@/screens/AboutCard";
import { RemoveServerCard } from "@/screens/RemoveServerCard";
import { hasKey, useHuman, useI18n, type Key } from "@/i18n";
import { LanguagePicker } from "@/components/LanguagePicker";
import { RealmStartupSettings } from "@/screens/RealmStartupSettings";
@@ -18,7 +19,7 @@ function mb(bytes: number) {
return bytes >= 1 << 20 ? `${(bytes / (1 << 20)).toFixed(1)} MB` : `${Math.max(1, Math.round(bytes / 1024))} KB`;
}
export function SettingsHome({ serverId }: { serverId: string }) {
export function SettingsHome({ serverId, path, onForget }: { serverId: string; path: string; onForget: () => Promise<void> }) {
const { t } = useI18n();
const upd = useServerUpdate(serverId);
const human = useHuman();
@@ -197,9 +198,14 @@ export function SettingsHome({ serverId }: { serverId: string }) {
{done && pendingChecked && !pendingStateError && <p className="mt-4 text-sm text-ok" role="status">{done}</p>}
{error && (
<p className="mt-4 text-sm text-bad" role="alert">
{error.human.code === "unknown" ? error.technical : human(error.human).message}
</p>
<div className="mt-4" role="alert">
<p className="selectable whitespace-pre-wrap break-words text-sm text-bad">
{error.human.code === "unknown" ? error.technical : human(error.human).message}
</p>
<button className="mt-1 cursor-pointer text-xs text-muted underline" onClick={() => void navigator.clipboard.writeText(error.technical)}>
{t("common.copyError")}
</button>
</div>
)}
{preview?.database_check_error && (
@@ -264,6 +270,8 @@ export function SettingsHome({ serverId }: { serverId: string }) {
</div>
)}
</Card>
<RemoveServerCard serverId={serverId} path={path} onForget={onForget} />
</div>
);
}
+1 -1
View File
@@ -139,7 +139,7 @@ export function Shell(props: {
) : page === "friends" ? (
<FriendsPage key={server.id} serverId={server.id} />
) : page === "settings" ? (
<SettingsHome key={server.id} serverId={server.id} />
<SettingsHome key={server.id} serverId={server.id} path={server.path} onForget={() => props.onForget(server.id)} />
) : page === "players" ? (
<PlayersPage key={server.id} serverId={server.id} />
) : page === "backups" ? (