mirror of
https://github.com/Corfirean/coa-server-manager.git
synced 2026-11-19 03:25:56 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
db16d95558 | ||
|
|
4eda03ab63 |
No files matched your search
Generated
+3
-3
@@ -347,7 +347,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "coa-core"
|
name = "coa-core"
|
||||||
version = "0.1.2"
|
version = "0.1.4"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"base64 0.22.1",
|
"base64 0.22.1",
|
||||||
"chrono",
|
"chrono",
|
||||||
@@ -375,7 +375,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "coa-release"
|
name = "coa-release"
|
||||||
version = "0.1.2"
|
version = "0.1.4"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"chrono",
|
"chrono",
|
||||||
"coa-core",
|
"coa-core",
|
||||||
@@ -384,7 +384,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "coa-server-manager"
|
name = "coa-server-manager"
|
||||||
version = "0.1.2"
|
version = "0.1.4"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"coa-core",
|
"coa-core",
|
||||||
"serde",
|
"serde",
|
||||||
|
|||||||
+1
-1
@@ -3,7 +3,7 @@ resolver = "2"
|
|||||||
members = ["crates/coa-core", "crates/coa-release", "src-tauri"]
|
members = ["crates/coa-core", "crates/coa-release", "src-tauri"]
|
||||||
|
|
||||||
[workspace.package]
|
[workspace.package]
|
||||||
version = "0.1.2"
|
version = "0.1.4"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
license = "AGPL-3.0-only"
|
license = "AGPL-3.0-only"
|
||||||
|
|
||||||
|
|||||||
@@ -109,6 +109,17 @@ pub fn apply_realm_address(root: &Path, host: &str) -> Result<()> {
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Before every server start: when the owner shares the server with friends, make sure the login and world servers
|
||||||
|
/// listen on all addresses. The launcher's own tools (for example switching detailed logging off) restore the config
|
||||||
|
/// templates from older copies and would silently put `BindIP` back to 127.0.0.1 while the realm list still advertises
|
||||||
|
/// the shared address - the game then shows the realm and drops back to the login screen without any message.
|
||||||
|
pub fn ensure_bind(root: &Path, meta: &Path) -> Result<bool> {
|
||||||
|
match load(meta).mode {
|
||||||
|
Mode::Local => Ok(false),
|
||||||
|
_ => set_open(root, meta, true),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// After every server start: put the chosen address back into the realm list (the launcher resets it to 127.0.0.1).
|
/// After every server start: put the chosen address back into the realm list (the launcher resets it to 127.0.0.1).
|
||||||
pub fn reapply(root: &Path, meta: &Path) -> Result<()> {
|
pub fn reapply(root: &Path, meta: &Path) -> Result<()> {
|
||||||
let s = load(meta);
|
let s = load(meta);
|
||||||
@@ -189,6 +200,16 @@ mod tests {
|
|||||||
assert!(fs::read_to_string(root.join("Core/configs/worldserver.conf")).unwrap().contains("BindIP = \"127.0.0.1\""));
|
assert!(fs::read_to_string(root.join("Core/configs/worldserver.conf")).unwrap().contains("BindIP = \"127.0.0.1\""));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn a_shared_server_gets_its_bind_address_back_before_start_and_a_local_one_is_left_alone() {
|
||||||
|
let (_d, root, meta) = setup();
|
||||||
|
assert!(!ensure_bind(&root, &meta).unwrap(), "local mode: nothing to do");
|
||||||
|
save(&meta, &Settings { mode: Mode::Private, host: Some("100.64.1.2".into()) }).unwrap();
|
||||||
|
assert!(ensure_bind(&root, &meta).unwrap(), "templates were reset to 127.0.0.1 -> reopened");
|
||||||
|
assert!(bind_is_open(&root));
|
||||||
|
assert!(!ensure_bind(&root, &meta).unwrap(), "already open: idempotent");
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn settings_round_trip_and_default_to_local() {
|
fn settings_round_trip_and_default_to_local() {
|
||||||
let d = tempfile::tempdir().unwrap();
|
let d = tempfile::tempdir().unwrap();
|
||||||
|
|||||||
+1
-1
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "coa-server-manager",
|
"name": "coa-server-manager",
|
||||||
"private": true,
|
"private": true,
|
||||||
"version": "0.1.2",
|
"version": "0.1.4",
|
||||||
"license": "AGPL-3.0-only",
|
"license": "AGPL-3.0-only",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|||||||
@@ -195,6 +195,8 @@ async fn start_server(state: State<'_, AppState>, id: String) -> std::result::Re
|
|||||||
if meta.kind == coa_core::registry::InstallKind::New {
|
if meta.kind == coa_core::registry::InstallKind::New {
|
||||||
coa_core::config::materialize_module_configs(&root)?;
|
coa_core::config::materialize_module_configs(&root)?;
|
||||||
}
|
}
|
||||||
|
let dir = meta_dir(&root)?;
|
||||||
|
coa_core::friends::ensure_bind(&root, &dir)?;
|
||||||
Ok::<(), Error>(())
|
Ok::<(), Error>(())
|
||||||
})
|
})
|
||||||
.await;
|
.await;
|
||||||
|
|||||||
@@ -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.1.2",
|
"version": "0.1.4",
|
||||||
"identifier": "com.coa.servermanager",
|
"identifier": "com.coa.servermanager",
|
||||||
"build": {
|
"build": {
|
||||||
"beforeDevCommand": "npm run dev",
|
"beforeDevCommand": "npm run dev",
|
||||||
|
|||||||
@@ -430,6 +430,9 @@ const de: Partial<Record<keyof typeof en, string>> = {
|
|||||||
"selfupd.now": "Jetzt installieren",
|
"selfupd.now": "Jetzt installieren",
|
||||||
"about.auto": "Updates im Hintergrund laden und beim Schließen des Managers installieren",
|
"about.auto": "Updates im Hintergrund laden und beim Schließen des Managers installieren",
|
||||||
"about.autoHint": "Ein Manager-Update stoppt oder verändert deine Server nie.",
|
"about.autoHint": "Ein Manager-Update stoppt oder verändert deine Server nie.",
|
||||||
|
|
||||||
|
// Friends line
|
||||||
|
"fr.copyLine": "Zeile kopieren",
|
||||||
};
|
};
|
||||||
|
|
||||||
export default de;
|
export default de;
|
||||||
@@ -430,6 +430,9 @@ const en = {
|
|||||||
"selfupd.now": "Install now",
|
"selfupd.now": "Install now",
|
||||||
"about.auto": "Download updates in the background and install them when I close the Manager",
|
"about.auto": "Download updates in the background and install them when I close the Manager",
|
||||||
"about.autoHint": "Your servers are never stopped or changed by a Manager update.",
|
"about.autoHint": "Your servers are never stopped or changed by a Manager update.",
|
||||||
|
|
||||||
|
// Friends line
|
||||||
|
"fr.copyLine": "Copy line",
|
||||||
} as const;
|
} as const;
|
||||||
|
|
||||||
export default en;
|
export default en;
|
||||||
@@ -430,6 +430,9 @@ const es: Partial<Record<keyof typeof en, string>> = {
|
|||||||
"selfupd.now": "Instalar ahora",
|
"selfupd.now": "Instalar ahora",
|
||||||
"about.auto": "Descargar las actualizaciones en segundo plano e instalarlas al cerrar el Manager",
|
"about.auto": "Descargar las actualizaciones en segundo plano e instalarlas al cerrar el Manager",
|
||||||
"about.autoHint": "Una actualización del Manager nunca detiene ni cambia tus servidores.",
|
"about.autoHint": "Una actualización del Manager nunca detiene ni cambia tus servidores.",
|
||||||
|
|
||||||
|
// Friends line
|
||||||
|
"fr.copyLine": "Copiar línea",
|
||||||
};
|
};
|
||||||
|
|
||||||
export default es;
|
export default es;
|
||||||
@@ -430,6 +430,9 @@ const fr: Partial<Record<keyof typeof en, string>> = {
|
|||||||
"selfupd.now": "Installer maintenant",
|
"selfupd.now": "Installer maintenant",
|
||||||
"about.auto": "Télécharger les mises à jour en arrière-plan et les installer à la fermeture du Manager",
|
"about.auto": "Télécharger les mises à jour en arrière-plan et les installer à la fermeture du Manager",
|
||||||
"about.autoHint": "Une mise à jour du Manager n’arrête ni ne modifie jamais vos serveurs.",
|
"about.autoHint": "Une mise à jour du Manager n’arrête ni ne modifie jamais vos serveurs.",
|
||||||
|
|
||||||
|
// Friends line
|
||||||
|
"fr.copyLine": "Copier la ligne",
|
||||||
};
|
};
|
||||||
|
|
||||||
export default fr;
|
export default fr;
|
||||||
@@ -430,6 +430,9 @@ const ru: Partial<Record<keyof typeof en, string>> = {
|
|||||||
"selfupd.now": "Установить сейчас",
|
"selfupd.now": "Установить сейчас",
|
||||||
"about.auto": "Скачивать обновления в фоне и устанавливать их, когда я закрою менеджер",
|
"about.auto": "Скачивать обновления в фоне и устанавливать их, когда я закрою менеджер",
|
||||||
"about.autoHint": "Обновление менеджера никогда не останавливает и не меняет ваши серверы.",
|
"about.autoHint": "Обновление менеджера никогда не останавливает и не меняет ваши серверы.",
|
||||||
|
|
||||||
|
// Friends line
|
||||||
|
"fr.copyLine": "Скопировать строку",
|
||||||
};
|
};
|
||||||
|
|
||||||
export default ru;
|
export default ru;
|
||||||
@@ -16,6 +16,12 @@
|
|||||||
--font-sans: "Segoe UI Variable Text", "Segoe UI", system-ui, sans-serif;
|
--font-sans: "Segoe UI Variable Text", "Segoe UI", system-ui, sans-serif;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Everything is sized in rem, so scaling the root font grows the whole interface with the window
|
||||||
|
(16px up to about 1280px wide, then gradually larger; capped at 26px). */
|
||||||
|
html {
|
||||||
|
font-size: clamp(16px, calc(0.75vw + 6.4px), 26px);
|
||||||
|
}
|
||||||
|
|
||||||
html,
|
html,
|
||||||
body,
|
body,
|
||||||
#root {
|
#root {
|
||||||
|
|||||||
+21
-16
@@ -103,22 +103,27 @@ export async function installNow(): Promise<void> {
|
|||||||
/** Install a downloaded update when the user closes the window. Call once at start-up. */
|
/** Install a downloaded update when the user closes the window. Call once at start-up. */
|
||||||
export function installOnClose(): () => void {
|
export function installOnClose(): () => void {
|
||||||
let stop: (() => void) | undefined;
|
let stop: (() => void) | undefined;
|
||||||
void getCurrentWindow()
|
try {
|
||||||
.onCloseRequested(async (event) => {
|
const win = getCurrentWindow();
|
||||||
if (state.phase !== "ready" || !update || !autoUpdateEnabled()) return;
|
void win
|
||||||
event.preventDefault();
|
.onCloseRequested(async (event) => {
|
||||||
try {
|
if (state.phase !== "ready" || !update || !autoUpdateEnabled()) return;
|
||||||
set({ phase: "installing" });
|
event.preventDefault();
|
||||||
await update.install();
|
try {
|
||||||
} catch (e) {
|
set({ phase: "installing" });
|
||||||
set({ phase: "error", error: String(e) });
|
await update.install();
|
||||||
await getCurrentWindow().destroy();
|
} catch (e) {
|
||||||
}
|
set({ phase: "error", error: String(e) });
|
||||||
})
|
await win.destroy();
|
||||||
.then((un) => {
|
}
|
||||||
stop = un;
|
})
|
||||||
})
|
.then((un) => {
|
||||||
.catch(() => {});
|
stop = un;
|
||||||
|
})
|
||||||
|
.catch(() => {});
|
||||||
|
} catch {
|
||||||
|
/* not running inside the desktop shell (browser preview) */
|
||||||
|
}
|
||||||
return () => stop?.();
|
return () => stop?.();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -22,6 +22,30 @@ const MODES: { id: FriendsMode; title: Key; text: Key }[] = [
|
|||||||
{ id: "private", title: "fr.mode.private.title", text: "fr.mode.private.text" },
|
{ id: "private", title: "fr.mode.private.title", text: "fr.mode.private.text" },
|
||||||
];
|
];
|
||||||
|
|
||||||
|
/** A ready-to-paste realmlist line for the friend, shown as soon as the address is known. */
|
||||||
|
function RealmlistLine({ host }: { host: string }) {
|
||||||
|
const t = useT();
|
||||||
|
const [copied, setCopied] = useState(false);
|
||||||
|
const line = `set realmlist ${host}`;
|
||||||
|
return (
|
||||||
|
<div className="mt-2 flex flex-wrap items-center gap-2">
|
||||||
|
<code className="selectable rounded bg-black/40 px-2 py-1 text-sm">{line}</code>
|
||||||
|
<Button
|
||||||
|
size="sm"
|
||||||
|
variant="ghost"
|
||||||
|
onClick={() =>
|
||||||
|
void navigator.clipboard.writeText(line).then(() => {
|
||||||
|
setCopied(true);
|
||||||
|
setTimeout(() => setCopied(false), 2000);
|
||||||
|
})
|
||||||
|
}
|
||||||
|
>
|
||||||
|
{copied ? t("fr.copied") : t("fr.copyLine")}
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
export function FriendsPage({ serverId }: { serverId: string }) {
|
export function FriendsPage({ serverId }: { serverId: string }) {
|
||||||
const t = useT();
|
const t = useT();
|
||||||
const human = useHuman();
|
const human = useHuman();
|
||||||
@@ -31,6 +55,7 @@ export function FriendsPage({ serverId }: { serverId: string }) {
|
|||||||
const [error, setError] = useState<UiError | null>(null);
|
const [error, setError] = useState<UiError | null>(null);
|
||||||
const [note, setNote] = useState<string | null>(null);
|
const [note, setNote] = useState<string | null>(null);
|
||||||
const [copied, setCopied] = useState(false);
|
const [copied, setCopied] = useState(false);
|
||||||
|
const [needsRestart, setNeedsRestart] = useState(false);
|
||||||
|
|
||||||
const refresh = useCallback(() => api.friendsStatus(serverId).then(setSt).catch((e) => setError(asUiError(e))), [serverId]);
|
const refresh = useCallback(() => api.friendsStatus(serverId).then(setSt).catch((e) => setError(asUiError(e))), [serverId]);
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
@@ -60,6 +85,7 @@ export function FriendsPage({ serverId }: { serverId: string }) {
|
|||||||
const enable = (mode: FriendsMode) =>
|
const enable = (mode: FriendsMode) =>
|
||||||
run(`enable-${mode}`, async () => {
|
run(`enable-${mode}`, async () => {
|
||||||
const r = await api.friendsEnable(serverId, mode, net?.public_ip ?? undefined, mode === "direct" && !!net?.router_found);
|
const r = await api.friendsEnable(serverId, mode, net?.public_ip ?? undefined, mode === "direct" && !!net?.router_found);
|
||||||
|
setNeedsRestart(r.restart_required);
|
||||||
return [r.restart_required ? t("fr.restartToApply") : null, r.note].filter(Boolean).join(" ") || t("fr.ready");
|
return [r.restart_required ? t("fr.restartToApply") : null, r.note].filter(Boolean).join(" ") || t("fr.ready");
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -103,7 +129,12 @@ export function FriendsPage({ serverId }: { serverId: string }) {
|
|||||||
</h3>
|
</h3>
|
||||||
<p className="mt-0.5 text-sm text-muted">{t(m.text)}</p>
|
<p className="mt-0.5 text-sm text-muted">{t(m.text)}</p>
|
||||||
|
|
||||||
{m.id === "lan" && <p className="mt-2 text-sm">{t("fr.yourLan")} <b className="selectable">{st.lan_ip ?? t("fr.unknown")}</b></p>}
|
{m.id === "lan" && (
|
||||||
|
<>
|
||||||
|
<p className="mt-2 text-sm">{t("fr.yourLan")} <b className="selectable">{st.lan_ip ?? t("fr.unknown")}</b></p>
|
||||||
|
{st.lan_ip && cur.mode !== m.id && <RealmlistLine host={st.lan_ip} />}
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
|
||||||
{m.id === "direct" && (
|
{m.id === "direct" && (
|
||||||
<div className="mt-2 text-sm">
|
<div className="mt-2 text-sm">
|
||||||
@@ -119,6 +150,7 @@ export function FriendsPage({ serverId }: { serverId: string }) {
|
|||||||
{net?.public_ip && net.reachability !== "cgnat" && (
|
{net?.public_ip && net.reachability !== "cgnat" && (
|
||||||
<p className="mt-2">{t("fr.publicAddr")} <b className="selectable">{net.public_ip}</b>{!net.router_found && <span className="text-muted">{t("fr.noRouter")}</span>}</p>
|
<p className="mt-2">{t("fr.publicAddr")} <b className="selectable">{net.public_ip}</b>{!net.router_found && <span className="text-muted">{t("fr.noRouter")}</span>}</p>
|
||||||
)}
|
)}
|
||||||
|
{net?.public_ip && net.reachability !== "cgnat" && cur.mode !== m.id && <RealmlistLine host={net.public_ip} />}
|
||||||
{net && !net.public_ip && <p className="mt-2 text-warn">{t("fr.noInternet")}</p>}
|
{net && !net.public_ip && <p className="mt-2 text-warn">{t("fr.noInternet")}</p>}
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
@@ -130,6 +162,7 @@ export function FriendsPage({ serverId }: { serverId: string }) {
|
|||||||
{st.tailscale.connected && <>{t("fr.privateAddr")} <b className="selectable">{st.tailscale.ip}</b></>}
|
{st.tailscale.connected && <>{t("fr.privateAddr")} <b className="selectable">{st.tailscale.ip}</b></>}
|
||||||
</p>
|
</p>
|
||||||
)}
|
)}
|
||||||
|
{m.id === "private" && st.tailscale.connected && st.tailscale.ip && cur.mode !== m.id && <RealmlistLine host={st.tailscale.ip} />}
|
||||||
</div>
|
</div>
|
||||||
<Button
|
<Button
|
||||||
size="sm"
|
size="sm"
|
||||||
@@ -168,6 +201,24 @@ export function FriendsPage({ serverId }: { serverId: string }) {
|
|||||||
)}
|
)}
|
||||||
|
|
||||||
{note && <p className="mt-4 text-sm text-ok" role="status">{note}</p>}
|
{note && <p className="mt-4 text-sm text-ok" role="status">{note}</p>}
|
||||||
|
{needsRestart && st.server_running && (
|
||||||
|
<Button
|
||||||
|
className="mt-3"
|
||||||
|
size="sm"
|
||||||
|
variant="primary"
|
||||||
|
disabled={!!busy}
|
||||||
|
onClick={() =>
|
||||||
|
void run("restart", async () => {
|
||||||
|
await api.stop(serverId);
|
||||||
|
await api.start(serverId);
|
||||||
|
setNeedsRestart(false);
|
||||||
|
})
|
||||||
|
}
|
||||||
|
>
|
||||||
|
{busy === "restart" && <Loader2 className="h-4 w-4 animate-spin" aria-hidden />}
|
||||||
|
{t("set.restartNow")}
|
||||||
|
</Button>
|
||||||
|
)}
|
||||||
{error && <p className="mt-4 text-sm text-bad" role="alert">{error.human.code === "unknown" ? error.technical : human(error.human).message}</p>}
|
{error && <p className="mt-4 text-sm text-bad" role="alert">{error.human.code === "unknown" ? error.technical : human(error.human).message}</p>}
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
|||||||
Reference in new issue
Block a user