mirror of
https://github.com/Corfirean/coa-server-manager.git
synced 2026-11-22 19:25:56 +00:00
feat(client): drop built-in client download, point players to the community launcher
The community moved the game client behind its official launcher (account sign-in, signed manifest, its own CDN), so the public manifest now answers 404 and the Manager must not pose as the launcher. Remove the client download and update path (clientdl, plan/sync/download/cancel commands, update job and progress UI, version tracking) and reduce "Set up the game client" to: open coa-development.org for the launcher, or pick a folder that already has the game. Linking a folder, realmlist switch, companion addon and the custom-race patch are unchanged. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
41977442e9
commit
169d8b8977
22 files changed
+116
-2036
No files matched your search
@@ -1,15 +1,14 @@
|
||||
import { useEffect, useState } from "react";
|
||||
import { listen } from "@tauri-apps/api/event";
|
||||
import { open } from "@tauri-apps/plugin-dialog";
|
||||
import { api, asUiError, type ClientInfo, type ClientStatus, type UiError } from "@/lib/api";
|
||||
import { api, asUiError, type ClientInfo, 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 { CLIENT_SITE, ClientDialog } from "@/screens/ClientDialog";
|
||||
import { Button } from "@/components/ui/button";
|
||||
import { Card } from "@/components/ui/card";
|
||||
import { useHuman, useT } from "@/i18n";
|
||||
import { useStartAfterUpdate } from "@/lib/updatePrefs";
|
||||
|
||||
export function ClientCard({ serverId, remote = false }: { serverId: string; remote?: boolean }) {
|
||||
const t = useT();
|
||||
@@ -18,13 +17,10 @@ export function ClientCard({ serverId, remote = false }: { serverId: string; rem
|
||||
const [error, setError] = useState<UiError | null>(null);
|
||||
const [note, setNote] = useState<string | null>(null);
|
||||
const [busy, setBusy] = useState(false);
|
||||
const [status, setStatus] = useState<ClientStatus | null>(null);
|
||||
const [patchProgress, setPatchProgress] = useState<string | null>(null);
|
||||
const [dialog, setDialog] = useState<ClientDialogMode | null>(null);
|
||||
const [playAfter, setPlayAfter] = useStartAfterUpdate("client", serverId);
|
||||
const [dialog, setDialog] = useState(false);
|
||||
|
||||
const refresh = () => {
|
||||
void api.clientStatus(serverId).then(setStatus).catch(() => setStatus(null));
|
||||
return api.clientInfo(serverId).then(setInfo).catch((e) => setError(asUiError(e)));
|
||||
};
|
||||
useEffect(() => {
|
||||
@@ -67,7 +63,7 @@ export function ClientCard({ serverId, remote = false }: { serverId: string; rem
|
||||
{info === null && (
|
||||
<>
|
||||
<p className="mt-1 text-sm text-muted">{t(remote ? "remote.clientIntro" : "client.intro")}</p>
|
||||
<Button className="mt-4" onClick={() => setDialog("setup")} disabled={busy}>{t("btn.setupClient")}</Button>
|
||||
<Button className="mt-4" onClick={() => setDialog(true)} disabled={busy}>{t("btn.setupClient")}</Button>
|
||||
</>
|
||||
)}
|
||||
{info && (
|
||||
@@ -79,24 +75,11 @@ export function ClientCard({ serverId, remote = false }: { serverId: string; rem
|
||||
{hosts.length ? hosts.filter(Boolean).join(", ") : "—"}
|
||||
{!remote && (pointsLocal ? <span className="ml-2 text-ok">{t("client.thisComputer")}</span> : <span className="ml-2 text-warn">{t("client.notThisServer")}</span>)}
|
||||
</dd>
|
||||
<dt className="text-muted">{t("client.version")}</dt>
|
||||
<dd>
|
||||
{status?.managed
|
||||
? status.installed_version ?? t("client.versionUnfinished")
|
||||
: t("client.versionUntracked")}
|
||||
{status?.update_available && <span className="ml-2 text-warn">{t("client.updateAvailable")}</span>}
|
||||
</dd>
|
||||
<dt className="text-muted">{t("client.otherAddons")}</dt>
|
||||
<dd>{t("client.leftAsIs", { n: info.other_addons })}</dd>
|
||||
</dl>
|
||||
<ClientGraphics key={info.path} serverId={serverId} />
|
||||
<AddonCatalog key={"addons-" + info.path} serverId={serverId} companions={remote ? null : info.addon} onCompanionsInstalled={() => void refresh()} />
|
||||
{!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]" />
|
||||
<span>{t("client.startAfter")}</span>
|
||||
</label>
|
||||
)}
|
||||
<div className="mt-4 flex flex-wrap gap-2">
|
||||
{!remote && !pointsLocal && (
|
||||
<Button size="sm" disabled={busy} onClick={() => void run(async () => { await api.setRealmlist(serverId, "127.0.0.1"); return t("client.pointedNote"); })}>
|
||||
@@ -108,15 +91,9 @@ export function ClientCard({ serverId, remote = false }: { serverId: string; rem
|
||||
{info.addon.installed ? t("client.updateAddon") : t("client.installAddon")}
|
||||
</Button>
|
||||
)}
|
||||
{(status?.update_available || (remote && status?.managed)) && (
|
||||
<Button size="sm" variant="primary" disabled={busy} onClick={() => setDialog("update")}>{t("client.upd.start")}</Button>
|
||||
)}
|
||||
{status && !status.managed && (
|
||||
<Button size="sm" disabled={busy} onClick={() => setDialog("track")}>{t("client.track.button")}</Button>
|
||||
)}
|
||||
{remote && <Button size="sm" disabled={busy} onClick={() => void run(() => api.customRacesInstall(serverId))}>{t("client.races.install")}</Button>}
|
||||
<Button size="sm" variant="ghost" disabled={busy} onClick={() => void choose()}>{t("client.changeFolder")}</Button>
|
||||
<Button size="sm" variant="ghost" disabled={busy} onClick={() => setDialog("setup")}>{t("client.downloadInstead")}</Button>
|
||||
<Button size="sm" variant="ghost" disabled={busy} onClick={() => void api.openLink(CLIENT_SITE).catch((e) => setError(asUiError(e)))}>{t("client.getFromSite")}</Button>
|
||||
</div>
|
||||
</>
|
||||
)}
|
||||
@@ -126,8 +103,7 @@ export function ClientCard({ serverId, remote = false }: { serverId: string; rem
|
||||
{dialog && (
|
||||
<ClientDialog
|
||||
serverId={serverId}
|
||||
mode={dialog}
|
||||
onClose={() => setDialog(null)}
|
||||
onClose={() => setDialog(false)}
|
||||
onChanged={() => {
|
||||
void refresh();
|
||||
void checkClient(serverId);
|
||||
|
||||
+29
-207
@@ -1,62 +1,35 @@
|
||||
import { useEffect, useRef, useState } from "react";
|
||||
import { useEffect, useState } from "react";
|
||||
import { open } from "@tauri-apps/plugin-dialog";
|
||||
import { listen } from "@tauri-apps/api/event";
|
||||
import { Check, Loader2 } from "lucide-react";
|
||||
import { api, asUiError, REMOTE_CLIENT_ID, type ClientDownloadCheck, type ClientPlan, type ClientStep, type UiError } from "@/lib/api";
|
||||
import { formatBytes } from "@/lib/utils";
|
||||
import { Check, ExternalLink } from "lucide-react";
|
||||
import { api, asUiError, REMOTE_CLIENT_ID, type UiError } from "@/lib/api";
|
||||
import { Button } from "@/components/ui/button";
|
||||
import { Card } from "@/components/ui/card";
|
||||
import { useHuman, useT } from "@/i18n";
|
||||
|
||||
/**
|
||||
* - setup: no client linked yet: pick an existing folder or download the client.
|
||||
* - update: a client the Manager keeps up to date has a newer version.
|
||||
* - track: an existing client the Manager has not looked at yet: compare it once, then keep it up to date.
|
||||
*/
|
||||
export type ClientDialogMode = "setup" | "update" | "track";
|
||||
type Phase = "choose" | "confirm" | "scanning" | "preview" | "working" | "done" | "stopped" | "failed";
|
||||
/** Where the community hands out its launcher, which downloads the game client. The Manager does not download it. */
|
||||
export const CLIENT_SITE = "https://coa-development.org/";
|
||||
|
||||
type Phase = "choose" | "done" | "failed";
|
||||
|
||||
/**
|
||||
* Linking the game client: pick a folder that already has the game, or go to the community site for the official
|
||||
* launcher (it downloads the client after signing in) and come back to pick the folder it installed to.
|
||||
*/
|
||||
export function ClientDialog(props: {
|
||||
serverId: string;
|
||||
mode: ClientDialogMode;
|
||||
onClose: () => void;
|
||||
/** The linked client or its version changed; the caller refreshes what it shows. */
|
||||
/** The linked client changed; the caller refreshes what it shows. */
|
||||
onChanged: () => void;
|
||||
/** Update mode only: start the game without updating. */
|
||||
onPlayAnyway?: () => void;
|
||||
}) {
|
||||
const t = useT();
|
||||
const human = useHuman();
|
||||
const { serverId, mode } = props;
|
||||
const [phase, setPhase] = useState<Phase>(mode === "setup" ? "choose" : "scanning");
|
||||
const [step, setStep] = useState<ClientStep | null>(null);
|
||||
const [parent, setParent] = useState<string | null>(null);
|
||||
const [check, setCheck] = useState<ClientDownloadCheck | null>(null);
|
||||
const [plan, setPlan] = useState<ClientPlan | null>(null);
|
||||
const [keep, setKeep] = useState(true);
|
||||
const { serverId } = props;
|
||||
const [phase, setPhase] = useState<Phase>("choose");
|
||||
const [error, setError] = useState<UiError | null>(null);
|
||||
const cancelled = useRef(false);
|
||||
const working = phase === "scanning" || phase === "working";
|
||||
|
||||
useEffect(() => {
|
||||
let un: (() => void) | undefined;
|
||||
let gone = false;
|
||||
listen<ClientStep>("client-progress", (e) => setStep(e.payload))
|
||||
.then((u) => (gone ? u() : (un = u)))
|
||||
.catch(() => undefined);
|
||||
return () => {
|
||||
gone = true;
|
||||
un?.();
|
||||
};
|
||||
}, []);
|
||||
|
||||
useEffect(() => {
|
||||
if (mode !== "setup") void startPlan();
|
||||
}, []); // eslint-disable-line react-hooks/exhaustive-deps
|
||||
|
||||
useEffect(() => {
|
||||
const onKey = (e: KeyboardEvent) => {
|
||||
if (e.key === "Escape" && !working) close();
|
||||
if (e.key === "Escape") close();
|
||||
};
|
||||
window.addEventListener("keydown", onKey);
|
||||
return () => window.removeEventListener("keydown", onKey);
|
||||
@@ -67,15 +40,6 @@ export function ClientDialog(props: {
|
||||
props.onClose();
|
||||
}
|
||||
|
||||
function fail(e: unknown) {
|
||||
if (cancelled.current) {
|
||||
setPhase("stopped");
|
||||
} else {
|
||||
setError(asUiError(e));
|
||||
setPhase("failed");
|
||||
}
|
||||
}
|
||||
|
||||
async function useExisting() {
|
||||
const picked = await open({ directory: true, multiple: false, title: t("client.dialogTitle") });
|
||||
if (typeof picked !== "string") return;
|
||||
@@ -89,68 +53,16 @@ export function ClientDialog(props: {
|
||||
}
|
||||
}
|
||||
|
||||
async function pickParent() {
|
||||
const picked = await open({ directory: true, multiple: false, title: t("client.dl.pickParent") });
|
||||
if (typeof picked !== "string") return;
|
||||
setError(null);
|
||||
async function openSite() {
|
||||
try {
|
||||
setCheck(await api.clientDownloadCheck(picked));
|
||||
setParent(picked);
|
||||
setPhase("confirm");
|
||||
await api.openLink(CLIENT_SITE);
|
||||
} catch (e) {
|
||||
setError(asUiError(e));
|
||||
setPhase("failed");
|
||||
}
|
||||
}
|
||||
|
||||
async function startDownload() {
|
||||
if (!parent) return;
|
||||
cancelled.current = false;
|
||||
setStep(null);
|
||||
setPhase("working");
|
||||
try {
|
||||
await api.clientDownload(serverId, parent);
|
||||
setPhase("done");
|
||||
} catch (e) {
|
||||
fail(e);
|
||||
}
|
||||
}
|
||||
|
||||
async function startPlan() {
|
||||
cancelled.current = false;
|
||||
setStep(null);
|
||||
setError(null);
|
||||
setPhase("scanning");
|
||||
try {
|
||||
const p = await api.clientPlan(serverId);
|
||||
setPlan(p);
|
||||
setKeep(p.items.some((i) => i.kind === "modified"));
|
||||
setPhase("preview");
|
||||
} catch (e) {
|
||||
fail(e);
|
||||
}
|
||||
}
|
||||
|
||||
async function startSync() {
|
||||
cancelled.current = false;
|
||||
setStep(null);
|
||||
setPhase("working");
|
||||
try {
|
||||
await api.clientSync(serverId, keep);
|
||||
setPhase("done");
|
||||
} catch (e) {
|
||||
fail(e);
|
||||
}
|
||||
}
|
||||
|
||||
function stop() {
|
||||
cancelled.current = true;
|
||||
void api.clientCancel();
|
||||
}
|
||||
|
||||
const modified = plan?.items.filter((i) => i.kind === "modified") ?? [];
|
||||
const pct = step && step.total > 0 ? Math.min(100, Math.floor((step.done / step.total) * 100)) : 0;
|
||||
const title = mode === "setup" ? t("client.setup.title") : mode === "update" ? t("client.upd.title") : t("client.track.title");
|
||||
const title = t("client.setup.title");
|
||||
|
||||
return (
|
||||
<div className="fixed inset-0 z-50 flex items-center justify-center bg-black/60 p-6" role="presentation">
|
||||
@@ -161,12 +73,16 @@ export function ClientDialog(props: {
|
||||
<>
|
||||
<p className="mt-1 text-sm text-muted">{t("client.setup.intro")}</p>
|
||||
<div className="mt-4 grid gap-3">
|
||||
<button type="button" onClick={() => void openSite()} className="cursor-pointer rounded-md border border-line bg-card-2 p-4 text-left transition-colors hover:border-gold/50">
|
||||
<span className="flex items-center gap-2 font-medium">
|
||||
{t("client.setup.getLauncher")}
|
||||
<ExternalLink className="h-4 w-4 text-muted" aria-hidden />
|
||||
</span>
|
||||
<span className="mt-1 block text-sm text-muted">{t("client.setup.getLauncherHint")}</span>
|
||||
</button>
|
||||
<button type="button" onClick={() => void useExisting()} className="cursor-pointer rounded-md border border-line bg-card-2 p-4 text-left transition-colors hover:border-gold/50">
|
||||
<span className="block font-medium">{t("client.setup.have")}</span>
|
||||
</button>
|
||||
<button type="button" onClick={() => void pickParent()} className="cursor-pointer rounded-md border border-line bg-card-2 p-4 text-left transition-colors hover:border-gold/50">
|
||||
<span className="block font-medium">{t("client.setup.download")}</span>
|
||||
<span className="mt-1 block text-sm text-muted">{t("client.setup.downloadHint")}</span>
|
||||
<span className="mt-1 block text-sm text-muted">{t("client.setup.haveHint")}</span>
|
||||
</button>
|
||||
</div>
|
||||
<div className="mt-5 flex justify-end">
|
||||
@@ -175,93 +91,13 @@ export function ClientDialog(props: {
|
||||
</>
|
||||
)}
|
||||
|
||||
{phase === "confirm" && check && (
|
||||
<>
|
||||
<p className="mt-1 text-sm text-muted">{t("client.dl.confirmText", { v: check.version, size: formatBytes(check.needed_bytes) })}</p>
|
||||
<p className="selectable mt-3 break-all rounded-md bg-black/30 px-3 py-2 text-sm">{check.dest}</p>
|
||||
<p className={check.free_bytes < check.needed_bytes + 512 * 1024 * 1024 ? "mt-3 text-sm text-bad" : "mt-3 text-sm text-muted"}>
|
||||
{check.free_bytes < check.needed_bytes + 512 * 1024 * 1024
|
||||
? t("client.dl.notEnough", { need: formatBytes(check.needed_bytes), free: formatBytes(check.free_bytes) })
|
||||
: t("client.dl.free", { free: formatBytes(check.free_bytes) })}
|
||||
</p>
|
||||
<div className="mt-5 flex justify-end gap-2">
|
||||
<Button variant="ghost" onClick={() => void pickParent()}>{t("client.dl.otherFolder")}</Button>
|
||||
<Button variant="primary" disabled={check.free_bytes < check.needed_bytes + 512 * 1024 * 1024} onClick={() => void startDownload()}>
|
||||
{t("client.dl.start")}
|
||||
</Button>
|
||||
</div>
|
||||
</>
|
||||
)}
|
||||
|
||||
{(phase === "scanning" || phase === "working") && (
|
||||
<div className="mt-4" role="status">
|
||||
<div className="flex items-center gap-2 text-sm">
|
||||
<Loader2 className="h-4 w-4 animate-spin text-gold" aria-hidden />
|
||||
<span>{phase === "scanning" || step?.phase === "scan" ? t("client.dl.scanning") : t("client.dl.downloading")}</span>
|
||||
<span className="ml-auto text-muted">{pct}%</span>
|
||||
</div>
|
||||
<div className="mt-2 h-2 overflow-hidden rounded-full bg-white/10" role="progressbar" aria-valuenow={pct} aria-valuemin={0} aria-valuemax={100}>
|
||||
<div className="h-full rounded-full bg-gold transition-[width] duration-300" style={{ width: `${pct}%` }} />
|
||||
</div>
|
||||
<div className="mt-2 flex justify-between gap-4 text-xs text-muted">
|
||||
<span className="min-w-0 truncate">{step?.file ?? ""}</span>
|
||||
<span className="shrink-0">
|
||||
{step ? t("client.dl.progress", { done: formatBytes(step.done), total: formatBytes(step.total) }) : ""}
|
||||
{step && step.phase === "download" && step.bytes_per_sec > 0 ? ` · ${t("client.dl.speed", { speed: formatBytes(step.bytes_per_sec) })}` : ""}
|
||||
</span>
|
||||
</div>
|
||||
<div className="mt-5 flex justify-end">
|
||||
<Button variant="ghost" onClick={stop}>{t("client.dl.cancel")}</Button>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{phase === "preview" && plan && (
|
||||
<>
|
||||
{plan.items.length === 0 ? (
|
||||
<p className="mt-2 text-sm">{t("client.upd.upToDate", { v: plan.version })}</p>
|
||||
) : (
|
||||
<>
|
||||
{mode === "update" && <p className="mt-2 text-sm">{t("client.upd.available", { v: plan.version })}</p>}
|
||||
<p className="mt-1 text-sm text-muted">{t("client.upd.summary", { n: plan.items.length, size: formatBytes(plan.download_bytes) })}</p>
|
||||
</>
|
||||
)}
|
||||
{mode === "track" && <p className="mt-3 text-sm text-muted">{t("client.track.text")}</p>}
|
||||
{modified.length > 0 && (
|
||||
<div className="mt-4 rounded-md border border-warn/40 bg-warn/5 p-3 text-sm">
|
||||
<p className="font-medium">{t("client.upd.modifiedTitle", { n: modified.length })}</p>
|
||||
<p className="mt-1 text-muted">{t("client.upd.modifiedText")}</p>
|
||||
<ul className="selectable mt-2 space-y-0.5 text-xs text-muted">
|
||||
{modified.slice(0, 8).map((i) => (
|
||||
<li key={i.path} className="truncate">{i.path}</li>
|
||||
))}
|
||||
{modified.length > 8 && <li>{t("client.upd.more", { n: modified.length - 8 })}</li>}
|
||||
</ul>
|
||||
<label className="mt-3 flex cursor-pointer items-center gap-2">
|
||||
<input type="checkbox" checked={keep} onChange={(e) => setKeep(e.target.checked)} className="h-4 w-4 accent-[#c9a24a]" />
|
||||
<span>{t("client.upd.keep")}</span>
|
||||
</label>
|
||||
</div>
|
||||
)}
|
||||
<div className="mt-5 flex flex-wrap justify-end gap-2">
|
||||
{mode === "update" && props.onPlayAnyway && (
|
||||
<Button variant="ghost" onClick={() => { close(); props.onPlayAnyway?.(); }}>{t("client.upd.playAnyway")}</Button>
|
||||
)}
|
||||
<Button variant="ghost" onClick={close}>{t("client.upd.later")}</Button>
|
||||
<Button variant="primary" onClick={() => void startSync()}>
|
||||
{mode === "track" ? (plan.items.length === 0 ? t("client.track.start") : t("client.track.startUpdate")) : t("client.upd.start")}
|
||||
</Button>
|
||||
</div>
|
||||
</>
|
||||
)}
|
||||
|
||||
{phase === "done" && (
|
||||
<>
|
||||
<div className="mt-4 flex items-center gap-3">
|
||||
<span className="flex h-9 w-9 items-center justify-center rounded-full bg-ok/15 text-ok"><Check className="h-5 w-5" aria-hidden /></span>
|
||||
<div>
|
||||
<p className="font-medium">{mode === "setup" ? t("client.dl.done") : t("client.upd.done")}</p>
|
||||
<p className="text-sm text-muted">{mode === "setup" ? t(serverId === REMOTE_CLIENT_ID ? "remote.clientReady" : "client.dl.doneText") : t("client.upd.doneText")}</p>
|
||||
<p className="font-medium">{t("client.dl.done")}</p>
|
||||
<p className="text-sm text-muted">{t(serverId === REMOTE_CLIENT_ID ? "remote.clientReady" : "client.dl.doneText")}</p>
|
||||
</div>
|
||||
</div>
|
||||
<div className="mt-5 flex justify-end">
|
||||
@@ -270,26 +106,12 @@ export function ClientDialog(props: {
|
||||
</>
|
||||
)}
|
||||
|
||||
{phase === "stopped" && (
|
||||
<>
|
||||
<p className="mt-3 text-sm text-muted">{t("client.dl.cancelled")}</p>
|
||||
<div className="mt-5 flex justify-end gap-2">
|
||||
<Button variant="ghost" onClick={close}>{t("btn.close")}</Button>
|
||||
{mode === "setup" ? (
|
||||
parent && <Button variant="primary" onClick={() => void startDownload()}>{t("client.dl.resume")}</Button>
|
||||
) : (
|
||||
<Button variant="primary" onClick={() => void startPlan()}>{t("client.dl.resume")}</Button>
|
||||
)}
|
||||
</div>
|
||||
</>
|
||||
)}
|
||||
|
||||
{phase === "failed" && error && (
|
||||
<>
|
||||
<p className="mt-3 text-sm text-bad" role="alert">{error.human.code === "unknown" ? error.technical : human(error.human).message}</p>
|
||||
<div className="mt-5 flex justify-end gap-2">
|
||||
<Button variant="ghost" onClick={close}>{t("btn.close")}</Button>
|
||||
{mode === "setup" ? <Button onClick={() => { setError(null); setPhase("choose"); }}>{t("client.dl.back")}</Button> : <Button onClick={() => void startPlan()}>{t("client.dl.retry")}</Button>}
|
||||
<Button onClick={() => { setError(null); setPhase("choose"); }}>{t("client.dl.back")}</Button>
|
||||
</div>
|
||||
</>
|
||||
)}
|
||||
|
||||
@@ -5,7 +5,7 @@ import { cn } from "@/lib/utils";
|
||||
import { useI18n, type Key } from "@/i18n";
|
||||
import { asControlError, control, type AccountView, type Credentials, type JoinOutcome, type RemoteCharacter } from "@/lib/control";
|
||||
import { REMOTE_CLIENT_ID } from "@/lib/api";
|
||||
import { ClientDialog, type ClientDialogMode } from "@/screens/ClientDialog";
|
||||
import { ClientDialog } from "@/screens/ClientDialog";
|
||||
import { Notes } from "@/screens/PortablePage";
|
||||
|
||||
const STATUS_TEXT: Record<string, Key> = {
|
||||
@@ -129,7 +129,7 @@ export function JoinPanel({ realm, character, automatic, onClaimed }: { realm: s
|
||||
const [err, setErr] = useState<{ code: string; message: string } | null>(null);
|
||||
const [linking, setLinking] = useState(false);
|
||||
const [bring, setBring] = useState(false);
|
||||
const [clientDialog, setClientDialog] = useState<ClientDialogMode | null>(null);
|
||||
const [clientDialog, setClientDialog] = useState(false);
|
||||
const refresh = () => control.account(realm).then(setAccount).catch(() => setAccount(null));
|
||||
useEffect(() => { setOutcome(null); setErr(null); setLinking(false); void refresh(); }, [realm]); // eslint-disable-line react-hooks/exhaustive-deps
|
||||
|
||||
@@ -139,7 +139,7 @@ export function JoinPanel({ realm, character, automatic, onClaimed }: { realm: s
|
||||
const o = await control.join(realm, bring && character ? character : null, true);
|
||||
setOutcome(o);
|
||||
if (o.status === "needs_link") setLinking(true);
|
||||
if (o.status === "needs_client") setClientDialog("setup");
|
||||
if (o.status === "needs_client") setClientDialog(true);
|
||||
await refresh();
|
||||
} catch (e) { setErr(asControlError(e)); } finally { setBusy(false); }
|
||||
}
|
||||
@@ -156,7 +156,7 @@ export function JoinPanel({ realm, character, automatic, onClaimed }: { realm: s
|
||||
{outcome && text && <div className={cn("mt-3 rounded-md border p-3 text-sm", bad ? "border-warn/50 bg-warn/10" : "border-ok/40 bg-ok/10")} role="status" data-status={outcome.status}>
|
||||
<p>{t(text)}</p>
|
||||
{outcome.status === "needs_client" && (
|
||||
<Button size="sm" className="mt-2" onClick={() => setClientDialog("setup")}>
|
||||
<Button size="sm" className="mt-2" onClick={() => setClientDialog(true)}>
|
||||
{t("btn.setupClient")}
|
||||
</Button>
|
||||
)}
|
||||
@@ -170,10 +170,9 @@ export function JoinPanel({ realm, character, automatic, onClaimed }: { realm: s
|
||||
{clientDialog && (
|
||||
<ClientDialog
|
||||
serverId={REMOTE_CLIENT_ID}
|
||||
mode={clientDialog}
|
||||
onClose={() => setClientDialog(null)}
|
||||
onClose={() => setClientDialog(false)}
|
||||
onChanged={() => {
|
||||
setClientDialog(null);
|
||||
setClientDialog(false);
|
||||
void join();
|
||||
}}
|
||||
/>
|
||||
|
||||
@@ -1,15 +1,14 @@
|
||||
import { ForceStopDialog } from "./ForceStopDialog";
|
||||
import { serverLifecycle } from "@/lib/serverLifecycle";
|
||||
import { serverUpdateBlocksRestart } from "@/lib/serverUpdate";
|
||||
import { dismissClientJob, startClientUpdate, stopClientJob, syncClient, useClientJob } from "@/lib/clientJob";
|
||||
import { useCallback, useEffect, useRef, useState } from "react";
|
||||
import { AlertTriangle, Loader2, X } from "lucide-react";
|
||||
import { api, asUiError, type ClientInfo, type Human, type Performance, type Population, type ServerSummary, type ServiceStatus, type StatusView } from "@/lib/api";
|
||||
import { cn, formatBytes, formatUptime } from "@/lib/utils";
|
||||
import { cn, formatUptime } from "@/lib/utils";
|
||||
import { useHuman, useT } from "@/i18n";
|
||||
import { applyServerUpdate, useServerUpdate } from "@/lib/serverUpdate";
|
||||
import { checkClient, useClientStatus } from "@/lib/clientUpdate";
|
||||
import { ClientDialog, type ClientDialogMode } from "@/screens/ClientDialog";
|
||||
import { checkClient } from "@/lib/clientUpdate";
|
||||
import { ClientDialog } from "@/screens/ClientDialog";
|
||||
import { RealmlistMenu } from "@/screens/RealmlistMenu";
|
||||
import { RealmPicker } from "@/screens/RealmPicker";
|
||||
import { CrashHistoryModal } from "@/screens/CrashHistoryModal";
|
||||
@@ -100,13 +99,8 @@ export function Overview({ server, companions = true, onForget, onOpenUpdates, o
|
||||
const [showDetails, setShowDetails] = useState(false);
|
||||
const [pop, setPop] = useState<Population | null>(null);
|
||||
const [client, setClient] = useState<ClientInfo | null | undefined>(undefined);
|
||||
const [dialog, setDialog] = useState<ClientDialogMode | null>(null);
|
||||
const clientStatus = useClientStatus(server.id).status;
|
||||
const [dialog, setDialog] = useState(false);
|
||||
const [playing, setPlaying] = useState(false);
|
||||
const job = useClientJob(server.id);
|
||||
const jobBusy = job.phase === "scanning" || job.phase === "working";
|
||||
const jobPct = job.step && job.step.total > 0 ? Math.min(100, Math.floor((job.step.done / job.step.total) * 100)) : 0;
|
||||
const [keepMine, setKeepMine] = useState(true);
|
||||
const [perf, setPerf] = useState<Performance | null>(null);
|
||||
const upd = useServerUpdate(server.id);
|
||||
const visibleFailure = failure ?? upd.stateError ?? upd.uiError;
|
||||
@@ -166,10 +160,6 @@ export function Overview({ server, companions = true, onForget, onOpenUpdates, o
|
||||
}, [server.id]);
|
||||
const alive = useRef(true);
|
||||
|
||||
useEffect(() => {
|
||||
if (job.phase === "done" || job.phase === "current") void api.clientInfo(server.id).then(setClient).catch(() => undefined);
|
||||
}, [job.phase, server.id]);
|
||||
|
||||
const run = useCallback(
|
||||
async (kind: Exclude<Action, null>) => {
|
||||
setStopFailed(false);
|
||||
@@ -454,45 +444,13 @@ export function Overview({ server, companions = true, onForget, onOpenUpdates, o
|
||||
)}
|
||||
<div className="ml-auto flex max-w-full flex-wrap items-center justify-end gap-3">
|
||||
{client && <RealmlistMenu serverId={server.id} />}
|
||||
{client && jobBusy ? (
|
||||
<div
|
||||
className="relative flex h-12 min-w-64 items-center overflow-hidden rounded-md border border-gold/50 bg-card-2"
|
||||
role="progressbar"
|
||||
aria-valuenow={jobPct}
|
||||
aria-valuemin={0}
|
||||
aria-valuemax={100}
|
||||
aria-label={job.phase === "scanning" ? t("client.job.checking") : t("client.job.updating")}
|
||||
>
|
||||
<div className="absolute inset-y-0 left-0 bg-gold/35 transition-[width] duration-300" style={{ width: `${jobPct}%` }} />
|
||||
<div className="relative z-10 flex min-w-0 flex-1 flex-col px-5 leading-tight">
|
||||
<span className="text-sm font-semibold uppercase tracking-wide">{job.phase === "scanning" ? t("client.job.checking") : t("client.job.updating")}</span>
|
||||
<span className="truncate text-xs text-muted">
|
||||
{jobPct}%
|
||||
{job.step && job.step.phase === "download" && job.step.bytes_per_sec > 0 ? ` · ${t("client.dl.speed", { speed: formatBytes(job.step.bytes_per_sec) })}` : ""}
|
||||
</span>
|
||||
</div>
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => stopClientJob(server.id)}
|
||||
title={t("client.dl.cancel")}
|
||||
aria-label={t("client.dl.cancel")}
|
||||
className="relative z-10 flex h-full w-12 cursor-pointer items-center justify-center text-muted hover:text-ink"
|
||||
>
|
||||
<X className="h-4 w-4" aria-hidden />
|
||||
</button>
|
||||
</div>
|
||||
) : client && (clientStatus?.update_available || job.phase === "choose") ? (
|
||||
<SplitButton label={t("btn.play")}
|
||||
primary={{ disabled: playing || job.phase === "choose", onClick: () => void startClientUpdate(server.id), children: t("btn.updateClient") }}
|
||||
secondary={{ disabled: realmBusy || playing || upd.applying, onClick: () => void play(), children: <>{playing && <Loader2 className="h-4 w-4 animate-spin" aria-hidden />}{t("btn.playWithoutUpdate")}</> }}
|
||||
/>
|
||||
) : client ? (
|
||||
{client ? (
|
||||
<Button variant="primary" size="xl" disabled={realmBusy || playing} onClick={() => void play()} className="min-w-40">
|
||||
{playing && <Loader2 className="h-5 w-5 animate-spin" aria-hidden />}
|
||||
{t("btn.play")}
|
||||
</Button>
|
||||
) : client === null ? (
|
||||
<Button variant="secondary" size="xl" onClick={() => setDialog("setup")} className="min-w-40">
|
||||
<Button variant="secondary" size="xl" onClick={() => setDialog(true)} className="min-w-40">
|
||||
{t("btn.setupClient")}
|
||||
</Button>
|
||||
) : null}
|
||||
@@ -522,35 +480,6 @@ export function Overview({ server, companions = true, onForget, onOpenUpdates, o
|
||||
{anyUp && !running && !transitioning && (
|
||||
<p className="mt-3 text-sm text-muted">{t("overview.partial")}</p>
|
||||
)}
|
||||
{job.phase === "choose" && job.plan && (
|
||||
<div className="mt-4 rounded-md border border-warn/40 bg-warn/5 p-3 text-sm">
|
||||
<p className="font-medium">{t("client.upd.modifiedTitle", { n: job.plan.items.filter((i) => i.kind === "modified").length })}</p>
|
||||
<p className="mt-1 text-muted">{t("client.upd.modifiedText")}</p>
|
||||
<label className="mt-3 flex cursor-pointer items-center gap-2">
|
||||
<input type="checkbox" checked={keepMine} onChange={(e) => setKeepMine(e.target.checked)} className="h-4 w-4 accent-[#c9a24a]" />
|
||||
<span>{t("client.upd.keep")}</span>
|
||||
</label>
|
||||
<div className="mt-3 flex gap-2">
|
||||
<Button size="sm" variant="primary" onClick={() => void syncClient(server.id, keepMine)}>{t("client.upd.start")}</Button>
|
||||
<Button size="sm" variant="ghost" onClick={() => dismissClientJob(server.id)}>{t("client.upd.later")}</Button>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
{job.phase === "done" && <p className="mt-3 text-sm text-ok" role="status">{t("client.upd.done")}</p>}
|
||||
{job.phase === "current" && <p className="mt-3 text-sm text-ok" role="status">{t("client.upd.upToDate", { v: job.plan?.version ?? "" })}</p>}
|
||||
{job.phase === "stopped" && (
|
||||
<p className="mt-3 flex items-center gap-3 text-sm text-muted" role="status">
|
||||
{t("client.dl.cancelled")}
|
||||
<Button size="sm" variant="ghost" onClick={() => void startClientUpdate(server.id)}>{t("client.dl.resume")}</Button>
|
||||
</p>
|
||||
)}
|
||||
{job.phase === "failed" && job.error && (
|
||||
<p className="mt-3 flex flex-wrap items-center gap-3 text-sm text-bad" role="alert">
|
||||
{job.error.human.code === "unknown" ? job.error.technical : human(job.error.human).message}
|
||||
<Button size="sm" variant="ghost" onClick={() => void startClientUpdate(server.id)}>{t("client.dl.retry")}</Button>
|
||||
</p>
|
||||
)}
|
||||
{upd.result && "committed" in upd.result && !!upd.result.preexistingCharacters && <p className="mt-3 text-sm text-warn" role="status">{t("upd.preexistingCharacters", { n: upd.result.preexistingCharacters })}</p>}
|
||||
{upd.available && upd.preview && (
|
||||
<div className="mt-4 rounded-md border border-gold/40 bg-gold/5 p-3 text-sm">
|
||||
<p>{t("overview.updateAvail", { to: upd.preview.to_version, from: upd.preview.from_version ?? "?" })}</p>
|
||||
@@ -650,13 +579,11 @@ export function Overview({ server, companions = true, onForget, onOpenUpdates, o
|
||||
{dialog && (
|
||||
<ClientDialog
|
||||
serverId={server.id}
|
||||
mode={dialog}
|
||||
onClose={() => setDialog(null)}
|
||||
onClose={() => setDialog(false)}
|
||||
onChanged={() => {
|
||||
void api.clientInfo(server.id).then(setClient).catch(() => setClient(null));
|
||||
void checkClient(server.id);
|
||||
}}
|
||||
onPlayAnyway={() => void play()}
|
||||
/>
|
||||
)}
|
||||
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
import { useEffect, useState } from "react";
|
||||
import { Gauge, Globe, Settings, Swords } from "lucide-react";
|
||||
import { api, asUiError, REMOTE_CLIENT_ID } from "@/lib/api";
|
||||
import { checkClient, startClientPolling, useClientStatus } from "@/lib/clientUpdate";
|
||||
import { checkClient, useClientStatus } from "@/lib/clientUpdate";
|
||||
import { ClientCard } from "@/screens/ClientCard";
|
||||
import { ClientDialog, type ClientDialogMode } from "@/screens/ClientDialog";
|
||||
import { ClientDialog } from "@/screens/ClientDialog";
|
||||
import { AboutCard } from "@/screens/AboutCard";
|
||||
import { PortablePage } from "@/screens/PortablePage";
|
||||
import { BrowsePage } from "@/screens/BrowsePage";
|
||||
@@ -27,7 +27,7 @@ export function RemoteClient({ onHost }: { onHost: () => void }) {
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
const [note, setNote] = useState<string | null>(null);
|
||||
const [revision, setRevision] = useState(0);
|
||||
const [dialog, setDialog] = useState<ClientDialogMode | null>(null);
|
||||
const [dialog, setDialog] = useState(false);
|
||||
const { status } = useClientStatus(REMOTE_CLIENT_ID);
|
||||
function fail(e: unknown) {
|
||||
const err = asUiError(e);
|
||||
@@ -35,7 +35,6 @@ export function RemoteClient({ onHost }: { onHost: () => void }) {
|
||||
}
|
||||
useEffect(() => {
|
||||
void api.remoteConnection().then(p => { setHost(p.host); setSavedHost(p.host); }).catch(fail).finally(() => setLoading(false));
|
||||
return startClientPolling(REMOTE_CLIENT_ID);
|
||||
}, []); // eslint-disable-line react-hooks/exhaustive-deps
|
||||
useEffect(() => { void checkClient(REMOTE_CLIENT_ID); }, [revision]);
|
||||
|
||||
@@ -52,8 +51,7 @@ export function RemoteClient({ onHost }: { onHost: () => void }) {
|
||||
try { await api.play(REMOTE_CLIENT_ID); } catch (e) { fail(e); } finally { setBusy(false); }
|
||||
}
|
||||
function play() {
|
||||
if (!status?.linked) setDialog("setup");
|
||||
else if (status.update_available) setDialog("update");
|
||||
if (!status?.linked) setDialog(true);
|
||||
else void launch();
|
||||
}
|
||||
return <div className="flex h-full">
|
||||
@@ -78,13 +76,12 @@ export function RemoteClient({ onHost }: { onHost: () => void }) {
|
||||
</form>
|
||||
<p className="mt-3 text-sm text-muted">{t("remote.accountHint")}</p>
|
||||
<Button variant="primary" className="mt-4" disabled={loading || busy || !savedHost || host.trim() !== savedHost || status === null} onClick={play}>{t("btn.play")}</Button>
|
||||
{status?.linked && status.update_available && <Button variant="secondary" className="mt-4 ml-3" disabled={loading || busy || !savedHost || host.trim() !== savedHost} onClick={() => void launch()}>{t("btn.playWithoutUpdate")}</Button>}
|
||||
{note && <p className="mt-3 text-sm text-ok" role="status">{note}</p>}
|
||||
{error && <p className="mt-3 text-sm text-bad" role="alert">{error}</p>}
|
||||
</Card>
|
||||
<ClientCard key={revision} serverId={REMOTE_CLIENT_ID} remote />
|
||||
</>}
|
||||
</main>
|
||||
{dialog && <ClientDialog serverId={REMOTE_CLIENT_ID} mode={dialog} onClose={() => setDialog(null)} onChanged={() => setRevision(n => n + 1)} onPlayAnyway={() => void launch()} />}
|
||||
{dialog && <ClientDialog serverId={REMOTE_CLIENT_ID} onClose={() => setDialog(false)} onChanged={() => setRevision(n => n + 1)} />}
|
||||
</div>;
|
||||
}
|
||||
@@ -19,7 +19,7 @@ import { DashboardPage } from "@/screens/DashboardPage";
|
||||
import { Button } from "@/components/ui/button";
|
||||
import { Card } from "@/components/ui/card";
|
||||
import { startServerUpdatePolling, useServerUpdate } from "@/lib/serverUpdate";
|
||||
import { startClientPolling } from "@/lib/clientUpdate";
|
||||
import { checkClient } from "@/lib/clientUpdate";
|
||||
import type { UnsavedChangesGuard } from "@/lib/unsavedGuard";
|
||||
|
||||
type Page = "overview" | "bots" | "dashboard" | "server" | "modules" | "players" | "characters" | "friends" | "backups" | "console" | "report" | "settings";
|
||||
@@ -88,14 +88,10 @@ export function Shell(props: {
|
||||
if (hiddenPages.includes(page)) setPage("overview");
|
||||
}, [hiddenPages, page]);
|
||||
|
||||
// Look for a server and a game client update when the app starts and then every five minutes.
|
||||
// Look for a server update when the app starts and then every five minutes; note whether a game client is linked.
|
||||
useEffect(() => {
|
||||
const stopServer = startServerUpdatePolling(props.activeId);
|
||||
const stopClient = startClientPolling(props.activeId);
|
||||
return () => {
|
||||
stopServer();
|
||||
stopClient();
|
||||
};
|
||||
void checkClient(props.activeId);
|
||||
return startServerUpdatePolling(props.activeId);
|
||||
}, [props.activeId]);
|
||||
|
||||
return (
|
||||
|
||||
Reference in new issue
Block a user