mirror of
https://github.com/Corfirean/coa-server-manager.git
synced 2026-11-20 19:25:56 +00:00
Merge integrate/manager-0.9.14 into preview: game cache, friend's login, addon catalog
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> # Conflicts: # crates/coa-core/src/lib.rs
This commit is contained in:
commit
34f6fa1cd1
22 files changed
+8026
No files matched your search
@@ -1,6 +1,7 @@
|
||||
// Dev-only: lets the UI run in a plain browser for visual review. Never bundled in production builds.
|
||||
import { auctionCategories, auctionQualities } from "../lib/moduleSettings";
|
||||
import moduleCatalog from "../../modules/catalog.json";
|
||||
import addonCatalog from "../../addons/catalog.json";
|
||||
import botsSchema from "../../schemas/bots.json";
|
||||
import serverSchema from "../../schemas/server.json";
|
||||
import botsPresets from "../../schemas/presets/bots.json";
|
||||
@@ -29,6 +30,8 @@ export {};
|
||||
(window as any).__TAURI_INTERNALS__ = {
|
||||
transformCallback: (cb: unknown)=>cb, unregisterCallback(){}, convertFileSrc:(x: unknown)=>x,
|
||||
invoke: async (cmd: string, args?: any)=>{
|
||||
if(cmd==="clear_game_cache_on_play") return localStorage.getItem("demo-clear-cache")!=="0";
|
||||
if(cmd==="set_clear_game_cache_on_play"){localStorage.setItem("demo-clear-cache",args.enabled?"1":"0");return;}
|
||||
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}');
|
||||
@@ -39,6 +42,7 @@ export {};
|
||||
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==="addons_list"||cmd==="addons_install"||cmd==="addons_remove"){const w=window as any;w.__addons=w.__addons??{dragonui:"old"};if(cmd==="addons_install"){await new Promise(r=>setTimeout(r,700));w.__addons[args.addon]="new";}if(cmd==="addons_remove")delete w.__addons[args.addon];return addonCatalog.addons.map((a:any)=>({id:a.id,name:a.name,description:a.description,author:a.author,license:a.license,needs:a.needs??null,repo:a.repo,size:a.files.reduce((s:number,f:any)=>s+f.size,0),installed:a.id in w.__addons,updateAvailable:w.__addons[a.id]==="old",foreignFolders:a.id==="coacombat"&&!(a.id in w.__addons)?["CoACombat"]:[]}));}
|
||||
if(cmd==="restart_schedule"||cmd==="restart_schedule_save"){const w=window as any;w.__sched=w.__sched??{enabled:false,time:"05:00",warningMinutes:5};if(cmd==="restart_schedule_save"){const s=args.schedule;if(s.enabled&&!/^([01]\d|2[0-3]):[0-5]\d$/.test(s.time))throw new Error("The restart time must be HH:MM, for example 05:00.");w.__sched={...s};}return {schedule:w.__sched,supported:true};}
|
||||
if(cmd==="mysql_custom"||cmd==="mysql_custom_save"){const w=window as any;if(cmd==="mysql_custom_save")w.__my=args.text;const text:string=w.__my??"";const applied=text.split("\n").map((l:string)=>l.trim()).filter((l:string)=>l&&!l.startsWith("#")&&!/^(port|datadir|basedir|bind[-_]address)\b/i.test(l)).map((l:string)=>l+"\n").join("");return {text,applied};}
|
||||
if(cmd==="realm_names"||cmd==="realm_rename"){const w=window as any;w.__rn=w.__rn??{};const defs:[number,string][]=[[1,"Conquest of Azeroth"],[2,"Wildcard"]];if(cmd==="realm_rename"){await new Promise(r=>setTimeout(r,300));const n=(args.name??"").trim();if(n.length>32||n.includes('"'))throw new Error("The realm name can have at most 32 characters.");if(n)w.__rn[args.realmId]=n;else delete w.__rn[args.realmId];}return defs.map(([id,d])=>({id,name:w.__rn[id]??d,defaultName:d,custom:id in w.__rn}));}
|
||||
|
||||
@@ -788,6 +788,18 @@ const de: Partial<Record<keyof typeof en, string>> = {
|
||||
"sched.save": "Speichern",
|
||||
"sched.saved": "Gespeichert.",
|
||||
"sched.unsupported": "Dieser Server kann das noch nicht: Aktualisiere ihn auf einen Build mit dem neuen Launcher.",
|
||||
"client.clearCache": "Spiel-Cache vor jedem Start leeren",
|
||||
"client.clearCacheHint": "Das Spiel merkt sich Kreaturen, Gegenstände und Quests vom Server (Cache/WDB). Nach einem Server-Update zeigen sie sonst alte Namen und Werte; der Cache füllt sich in Sekunden wieder.",
|
||||
"addons.title": "Addons",
|
||||
"addons.hint": "Community-Addons für Conquest of Azeroth. Jedes kommt in einer geprüften Version vom GitHub seines Autors; jede Datei wird vor der Installation in Interface/AddOns geprüft. Schließe zuerst das Spiel.",
|
||||
"addons.by": "von {author}",
|
||||
"addons.installed": "Installiert",
|
||||
"addons.update": "Update verfügbar",
|
||||
"addons.needsSquid": "Für SQUID's Playerbots.",
|
||||
"addons.foreign": "Ein Ordner {folders} ist schon da; er wird nach AddOns/.coa-addons-backup verschoben.",
|
||||
"addons.doInstall": "Installieren",
|
||||
"addons.doUpdate": "Aktualisieren",
|
||||
"addons.doRemove": "Entfernen",
|
||||
"realm.namesTitle": "Realmnamen",
|
||||
"realm.namesHint": "So heißt der Realm in der Realmliste der Spieler. Ein laufender Server zeigt den Namen sofort, und er bleibt nach Updates erhalten.",
|
||||
"realm.nameSave": "Speichern",
|
||||
|
||||
@@ -72,6 +72,18 @@ const en = {
|
||||
"sched.save": "Save",
|
||||
"sched.saved": "Saved.",
|
||||
"sched.unsupported": "This server cannot do it yet: update the server to a build with the new launcher.",
|
||||
"client.clearCache": "Clear the game cache before every Play",
|
||||
"client.clearCacheHint": "The game remembers creatures, items and quests it got from a server (Cache/WDB). After a server update they can show old names and stats; the cache fills again within seconds.",
|
||||
"addons.title": "Addons",
|
||||
"addons.hint": "Community addons for Conquest of Azeroth. Each comes from its author's GitHub at a checked version; every file is verified before it is installed into Interface/AddOns. Close the game first.",
|
||||
"addons.by": "by {author}",
|
||||
"addons.installed": "Installed",
|
||||
"addons.update": "Update available",
|
||||
"addons.needsSquid": "For SQUID's Playerbots.",
|
||||
"addons.foreign": "A folder named {folders} is already there; it will be moved to AddOns/.coa-addons-backup.",
|
||||
"addons.doInstall": "Install",
|
||||
"addons.doUpdate": "Update",
|
||||
"addons.doRemove": "Remove",
|
||||
"realm.namesTitle": "Realm names",
|
||||
"realm.namesHint": "The name players see in the realm list. A running server shows it at once, and it stays after updates.",
|
||||
"realm.nameSave": "Save",
|
||||
|
||||
@@ -788,6 +788,18 @@ const es: Partial<Record<keyof typeof en, string>> = {
|
||||
"sched.save": "Guardar",
|
||||
"sched.saved": "Guardado.",
|
||||
"sched.unsupported": "Este servidor aún no puede hacerlo: actualízalo a una versión con el nuevo lanzador.",
|
||||
"client.clearCache": "Vaciar la caché del juego antes de cada inicio",
|
||||
"client.clearCacheHint": "El juego recuerda criaturas, objetos y misiones recibidos del servidor (Cache/WDB). Tras actualizar el servidor pueden mostrar nombres y estadísticas antiguos; la caché se llena de nuevo en segundos.",
|
||||
"addons.title": "Addons",
|
||||
"addons.hint": "Addons de la comunidad para Conquest of Azeroth. Cada uno viene del GitHub de su autor en una versión comprobada; cada archivo se verifica antes de instalarlo en Interface/AddOns. Cierra antes el juego.",
|
||||
"addons.by": "de {author}",
|
||||
"addons.installed": "Instalado",
|
||||
"addons.update": "Actualización disponible",
|
||||
"addons.needsSquid": "Para SQUID's Playerbots.",
|
||||
"addons.foreign": "Ya hay una carpeta {folders}; se moverá a AddOns/.coa-addons-backup.",
|
||||
"addons.doInstall": "Instalar",
|
||||
"addons.doUpdate": "Actualizar",
|
||||
"addons.doRemove": "Quitar",
|
||||
"realm.namesTitle": "Nombres de los reinos",
|
||||
"realm.namesHint": "El nombre que ven los jugadores en la lista de reinos. Un servidor en marcha lo muestra al instante y se mantiene tras las actualizaciones.",
|
||||
"realm.nameSave": "Guardar",
|
||||
|
||||
@@ -788,6 +788,18 @@ const fr: Partial<Record<keyof typeof en, string>> = {
|
||||
"sched.save": "Enregistrer",
|
||||
"sched.saved": "Enregistré.",
|
||||
"sched.unsupported": "Ce serveur ne le permet pas encore : mettez-le à jour vers une version avec le nouveau lanceur.",
|
||||
"client.clearCache": "Vider le cache du jeu avant chaque lancement",
|
||||
"client.clearCacheHint": "Le jeu garde les créatures, objets et quêtes reçus du serveur (Cache/WDB). Après une mise à jour du serveur, ils peuvent montrer d'anciens noms et statistiques ; le cache se remplit en quelques secondes.",
|
||||
"addons.title": "Addons",
|
||||
"addons.hint": "Addons de la communauté pour Conquest of Azeroth. Chacun vient du GitHub de son auteur dans une version vérifiée ; chaque fichier est contrôlé avant l'installation dans Interface/AddOns. Fermez d'abord le jeu.",
|
||||
"addons.by": "par {author}",
|
||||
"addons.installed": "Installé",
|
||||
"addons.update": "Mise à jour disponible",
|
||||
"addons.needsSquid": "Pour SQUID's Playerbots.",
|
||||
"addons.foreign": "Un dossier {folders} existe déjà ; il sera déplacé vers AddOns/.coa-addons-backup.",
|
||||
"addons.doInstall": "Installer",
|
||||
"addons.doUpdate": "Mettre à jour",
|
||||
"addons.doRemove": "Supprimer",
|
||||
"realm.namesTitle": "Noms des royaumes",
|
||||
"realm.namesHint": "Le nom que les joueurs voient dans la liste des royaumes. Un serveur en marche l'affiche aussitôt, et il reste après les mises à jour.",
|
||||
"realm.nameSave": "Enregistrer",
|
||||
|
||||
@@ -75,6 +75,18 @@ const ru: Partial<Record<keyof typeof en, string>> = {
|
||||
"sched.save": "Сохранить",
|
||||
"sched.saved": "Сохранено.",
|
||||
"sched.unsupported": "Этот сервер пока так не умеет: обновите его до сборки с новым лаунчером.",
|
||||
"client.clearCache": "Очищать кэш игры перед каждым запуском",
|
||||
"client.clearCacheHint": "Игра запоминает существ, предметы и задания, полученные от сервера (Cache/WDB). После обновления сервера там остаются старые названия и характеристики; кэш снова заполняется за секунды.",
|
||||
"addons.title": "Аддоны",
|
||||
"addons.hint": "Аддоны сообщества для Conquest of Azeroth. Каждый берётся с GitHub автора в проверенной версии; перед установкой в Interface/AddOns проверяется каждый файл. Сначала закройте игру.",
|
||||
"addons.by": "автор: {author}",
|
||||
"addons.installed": "Установлен",
|
||||
"addons.update": "Есть обновление",
|
||||
"addons.needsSquid": "Для SQUID's Playerbots.",
|
||||
"addons.foreign": "Папка {folders} уже есть; она будет перенесена в AddOns/.coa-addons-backup.",
|
||||
"addons.doInstall": "Установить",
|
||||
"addons.doUpdate": "Обновить",
|
||||
"addons.doRemove": "Удалить",
|
||||
"realm.namesTitle": "Названия реалмов",
|
||||
"realm.namesHint": "Так реалм называется в списке реалмов у игроков. Работающий сервер показывает новое название сразу, и оно сохраняется после обновлений.",
|
||||
"realm.nameSave": "Сохранить",
|
||||
|
||||
@@ -73,6 +73,18 @@ const zh = {
|
||||
"sched.save": "保存",
|
||||
"sched.saved": "已保存。",
|
||||
"sched.unsupported": "此服务器暂不支持:请将服务器更新到带有新启动器的版本。",
|
||||
"client.clearCache": "每次启动前清空游戏缓存",
|
||||
"client.clearCacheHint": "游戏会保存从服务器获得的生物、物品和任务(Cache/WDB)。服务器更新后,这些缓存可能显示旧的名称和属性;缓存会在几秒内重新生成。",
|
||||
"addons.title": "插件",
|
||||
"addons.hint": "Conquest of Azeroth 的社区插件。每个插件都来自作者的 GitHub 的已核验版本;安装到 Interface/AddOns 前会逐个校验文件。请先关闭游戏。",
|
||||
"addons.by": "作者:{author}",
|
||||
"addons.installed": "已安装",
|
||||
"addons.update": "有可用更新",
|
||||
"addons.needsSquid": "用于 SQUID's Playerbots。",
|
||||
"addons.foreign": "已存在名为 {folders} 的文件夹;它会被移到 AddOns/.coa-addons-backup。",
|
||||
"addons.doInstall": "安装",
|
||||
"addons.doUpdate": "更新",
|
||||
"addons.doRemove": "移除",
|
||||
"realm.namesTitle": "服务器名称",
|
||||
"realm.namesHint": "玩家在服务器列表中看到的名称。运行中的服务器会立即显示新名称,更新后也会保留。",
|
||||
"realm.nameSave": "保存",
|
||||
|
||||
@@ -64,6 +64,7 @@ export interface StatusView {
|
||||
}
|
||||
|
||||
export type RealmMode = "coa" | "wildcard" | "reborn";
|
||||
export interface AddonView { id: string; name: string; description: Record<string, string>; author: string; license: string; needs: string | null; repo: string; size: number; installed: boolean; updateAvailable: boolean; foreignFolders: string[] }
|
||||
export interface RestartSchedule { enabled: boolean; time: string; warningMinutes: number }
|
||||
export interface RestartScheduleView { schedule: RestartSchedule; supported: boolean }
|
||||
export interface CustomMysql { text: string; applied: string }
|
||||
@@ -735,6 +736,11 @@ export const api = {
|
||||
realmProfiles: (id: string) => invoke<RealmProfiles>("realm_profiles", { id }),
|
||||
realmSelect: (id: string, mode: RealmMode, restart: boolean) => invoke<RealmProfiles>("realm_select", { id, mode, restart }),
|
||||
realmSimultaneous: (id: string, enabled: boolean) => invoke<RealmProfiles>("realm_simultaneous", { id, enabled }),
|
||||
addonsList: (id: string) => invoke<AddonView[]>("addons_list", { id }),
|
||||
addonsInstall: (id: string, addon: string) => invoke<AddonView[]>("addons_install", { id, addon }),
|
||||
addonsRemove: (id: string, addon: string) => invoke<AddonView[]>("addons_remove", { id, addon }),
|
||||
clearGameCacheOnPlay: () => invoke<boolean>("clear_game_cache_on_play"),
|
||||
setClearGameCacheOnPlay: (enabled: boolean) => invoke<void>("set_clear_game_cache_on_play", { enabled }),
|
||||
restartSchedule: (id: string) => invoke<RestartScheduleView>("restart_schedule", { id }),
|
||||
restartScheduleSave: (id: string, schedule: RestartSchedule) => invoke<RestartScheduleView>("restart_schedule_save", { id, schedule }),
|
||||
mysqlCustom: (id: string) => invoke<CustomMysql>("mysql_custom", { id }),
|
||||
|
||||
@@ -0,0 +1,57 @@
|
||||
import { useEffect, useState } from "react";
|
||||
import { ExternalLink, Loader2 } from "lucide-react";
|
||||
import { api, asUiError, type AddonView } from "@/lib/api";
|
||||
import { Button } from "@/components/ui/button";
|
||||
import { useI18n } from "@/i18n";
|
||||
|
||||
function megabytes(bytes: number): string {
|
||||
return (bytes / 1024 / 1024).toFixed(bytes < 10 * 1024 * 1024 ? 1 : 0);
|
||||
}
|
||||
|
||||
/** Addons from the Manager's catalog: each pinned to a commit of its author's repository and checked file by file. */
|
||||
export function AddonCatalog({ serverId }: { serverId: string }) {
|
||||
const { t, locale } = useI18n();
|
||||
const [addons, setAddons] = useState<AddonView[] | null>(null);
|
||||
const [working, setWorking] = useState<string | null>(null);
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
|
||||
useEffect(() => {
|
||||
let alive = true;
|
||||
void api.addonsList(serverId).then(list => { if (alive) setAddons(list); }).catch(e => { if (alive) setError(asUiError(e).technical); });
|
||||
return () => { alive = false; };
|
||||
}, [serverId]);
|
||||
|
||||
async function run(id: string, action: "install" | "remove") {
|
||||
setWorking(id); setError(null);
|
||||
try { setAddons(await (action === "install" ? api.addonsInstall : api.addonsRemove)(serverId, id)); }
|
||||
catch (e) { setError(asUiError(e).technical); }
|
||||
finally { setWorking(null); }
|
||||
}
|
||||
|
||||
return <div className="mt-5 border-t border-line pt-4">
|
||||
<h3 className="text-sm font-semibold">{t("addons.title")}</h3>
|
||||
<p className="mt-1 text-xs text-muted">{t("addons.hint")}</p>
|
||||
<ul className="mt-3 space-y-3">
|
||||
{addons?.map(a => <li key={a.id} className="rounded-md border border-line p-3">
|
||||
<div className="flex flex-wrap items-center gap-2">
|
||||
<span className="font-medium">{a.name}</span>
|
||||
<span className="text-xs text-muted">{t("addons.by", { author: a.author })} · {megabytes(a.size)} MB</span>
|
||||
{a.installed && !a.updateAvailable && <span className="text-xs text-ok">{t("addons.installed")}</span>}
|
||||
{a.updateAvailable && <span className="text-xs text-warn">{t("addons.update")}</span>}
|
||||
<button type="button" className="ml-auto text-muted hover:text-ink" title={a.repo} aria-label={`GitHub: ${a.name}`} onClick={() => void api.openLink(a.repo)}><ExternalLink className="h-4 w-4" aria-hidden /></button>
|
||||
</div>
|
||||
<p className="mt-1 text-sm text-muted">{a.description[locale] ?? a.description.en}</p>
|
||||
{a.needs === "playerbots" && <p className="mt-1 text-xs text-muted">{t("addons.needsSquid")}</p>}
|
||||
{a.foreignFolders.length > 0 && !a.installed && <p className="mt-1 text-xs text-warn">{t("addons.foreign", { folders: a.foreignFolders.join(", ") })}</p>}
|
||||
<div className="mt-2 flex gap-2">
|
||||
{(!a.installed || a.updateAvailable) && <Button size="sm" disabled={working !== null} onClick={() => void run(a.id, "install")}>
|
||||
{working === a.id && <Loader2 className="h-4 w-4 animate-spin" aria-hidden />}
|
||||
{a.updateAvailable ? t("addons.doUpdate") : t("addons.doInstall")}
|
||||
</Button>}
|
||||
{a.installed && <Button size="sm" variant="ghost" disabled={working !== null} onClick={() => void run(a.id, "remove")}>{t("addons.doRemove")}</Button>}
|
||||
</div>
|
||||
</li>)}
|
||||
</ul>
|
||||
{error && <p className="mt-2 text-sm text-bad" role="alert">{error}</p>}
|
||||
</div>;
|
||||
}
|
||||
@@ -4,6 +4,7 @@ import { open } from "@tauri-apps/plugin-dialog";
|
||||
import { api, asUiError, type ClientInfo, type ClientStatus, type UiError } from "@/lib/api";
|
||||
import { checkClient } from "@/lib/clientUpdate";
|
||||
import { ClientGraphics } from "./ClientGraphics";
|
||||
import { AddonCatalog } from "./AddonCatalog";
|
||||
import { ClientDialog, type ClientDialogMode } from "@/screens/ClientDialog";
|
||||
import { Button } from "@/components/ui/button";
|
||||
import { Card } from "@/components/ui/card";
|
||||
@@ -97,6 +98,7 @@ export function ClientCard({ serverId, remote = false }: { serverId: string; rem
|
||||
<dd>{t("client.leftAsIs", { n: info.other_addons })}</dd>
|
||||
</dl>
|
||||
<ClientGraphics key={info.path} serverId={serverId} />
|
||||
<AddonCatalog key={"addons-" + info.path} serverId={serverId} />
|
||||
{!remote && (
|
||||
<label className="mt-4 flex cursor-pointer items-center gap-2 text-sm">
|
||||
<input type="checkbox" checked={playAfter} onChange={(e) => setPlayAfter(e.target.checked)} className="h-4 w-4 accent-[#c9a24a]" />
|
||||
|
||||
@@ -9,6 +9,12 @@ export function ClientGraphics({ serverId }: { serverId: string }) {
|
||||
const [busy, setBusy] = useState(false);
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
useEffect(() => { void api.clientGraphics(serverId).then(setState).catch(e => setError(asUiError(e).technical)); }, [serverId]);
|
||||
const [clearCache, setClearCache] = useState<boolean | null>(null);
|
||||
useEffect(() => { void api.clearGameCacheOnPlay().then(setClearCache).catch(() => setClearCache(true)); }, []);
|
||||
async function changeClearCache(on: boolean) {
|
||||
setClearCache(on);
|
||||
try { await api.setClearGameCacheOnPlay(on); } catch (e) { setClearCache(!on); setError(asUiError(e).technical); }
|
||||
}
|
||||
async function change(name: string, disabled: boolean) {
|
||||
setBusy(true); setError(null);
|
||||
try { setState(await api.clientSetGraphics(serverId, name, disabled)); await checkClient(serverId); }
|
||||
@@ -19,6 +25,8 @@ export function ClientGraphics({ serverId }: { serverId: string }) {
|
||||
<label className="flex items-center gap-2 text-sm"><input type="checkbox" checked={state?.dxvk_disabled ?? false} disabled={!state || busy} onChange={e => void change("d3d9.dll", e.target.checked)} />{t("client.graphics.dxvk")}</label>
|
||||
<label className="flex items-center gap-2 text-sm"><input type="checkbox" checked={state?.enhancements_disabled ?? false} disabled={!state || busy} onChange={e => void change("dxgi.dll", e.target.checked)} />{t("client.graphics.enhancements")}</label>
|
||||
<p className="text-xs text-muted">{t("client.graphics.hint")}</p>
|
||||
<label className="flex items-center gap-2 text-sm"><input type="checkbox" checked={clearCache ?? true} disabled={clearCache === null} onChange={e => void changeClearCache(e.target.checked)} />{t("client.clearCache")}</label>
|
||||
<p className="text-xs text-muted">{t("client.clearCacheHint")}</p>
|
||||
{error && <p className="text-sm text-bad" role="alert">{error}</p>}
|
||||
</div>;
|
||||
}
|
||||
Reference in new issue
Block a user