From 6723a7eda10ecf6683965f3afa757268dc52e56d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=BC=D0=B8=D1=82=D1=80=D0=B8=D0=B9?= Date: Fri, 6 Nov 2026 18:48:00 +0500 Subject: [PATCH] preview: remove developer test-realm shortcuts before the first public preview The Modules page had a 'Register test-realm-v03' button and the app registered a hardcoded local folder into an empty server list at startup. Both pointed at a developer's machine. The startup registration now happens only when COA_TEST_REALM_DIR is set. test_detect_toolchain skips when the local spike realm is absent (CI runners). Co-Authored-By: Claude Opus 5.5 --- crates/coa-core/src/build_engine.rs | 6 ++++- src-tauri/src/lib.rs | 40 +++-------------------------- src/lib/api.ts | 1 - src/screens/ModulesPage.tsx | 31 ---------------------- 4 files changed, 9 insertions(+), 69 deletions(-) diff --git a/crates/coa-core/src/build_engine.rs b/crates/coa-core/src/build_engine.rs index 43f7464..83e3b62 100644 --- a/crates/coa-core/src/build_engine.rs +++ b/crates/coa-core/src/build_engine.rs @@ -1332,7 +1332,11 @@ mod tests { #[test] fn test_detect_toolchain() { - let tc = detect_toolchain_for(Some(Path::new("C:/games/coa-work/plugin-spike/server-v03"))); + let realm = Path::new("C:/games/coa-work/plugin-spike/server-v03"); + if !realm.join("worldserver.exe").is_file() { + return; // needs the local spike realm and its SDK (not on CI runners) + } + let tc = detect_toolchain_for(Some(realm)); assert!(tc.msvc_available, "MSVC vcvars64.bat should be detected"); assert!(tc.cmake_available, "CMake should be detected"); assert!(tc.ninja_available, "Ninja should be detected"); diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs index 747e064..3088f78 100644 --- a/src-tauri/src/lib.rs +++ b/src-tauri/src/lib.rs @@ -2981,27 +2981,6 @@ async fn preview_install_msvc( blocking(move || coa_core::msvc_setup::install_build_tools(realm_root.as_deref())).await } -#[tauri::command] -async fn preview_register_test_realm( - state: State<'_, AppState>, - path: Option, -) -> std::result::Result { - let target = path - .map(PathBuf::from) - .unwrap_or_else(|| PathBuf::from(r"C:\games\coa-work\plugin-spike\server-v03")); - - if !target.join("worldserver.exe").is_file() && !target.join("Core/worldserver.exe").is_file() { - return Err(UiError::from(coa_core::Error::Invalid(format!( - "Target path '{}' does not contain a valid worldserver.exe", - target.display() - )))); - } - - let id = "test-realm-v03".to_string(); - state.registry.register(&id, &target)?; - Ok(summary(id, target)) -} - #[tauri::command] async fn preview_build_module( app: AppHandle, @@ -3401,7 +3380,6 @@ pub fn run() { release_history, preview_toolchain_status, preview_install_msvc, - preview_register_test_realm, preview_build_module, preview_install_module, preview_toggle_module, @@ -3579,22 +3557,12 @@ pub fn run() { let portable = start_portable(&dir); let (control, host_control) = control_cmds::start(&dir, portable.clone()); let registry = Registry::at(dir.join("installs.json")); + // Development only: an explicitly named test realm is registered into an empty list. if registry.list().map(|l| l.is_empty()).unwrap_or(true) { - let test_realm_path = std::env::var("COA_TEST_REALM_DIR") - .map(PathBuf::from) - .unwrap_or_else(|_| PathBuf::from(r"C:\games\CoA Server Preview")); - let target_realm = if test_realm_path.join("worldserver.exe").is_file() { - Some(("preview-realm", test_realm_path)) - } else { - let spike_path = PathBuf::from(r"C:\games\coa-work\plugin-spike\server-v03"); - if spike_path.join("worldserver.exe").is_file() { - Some(("test-realm-v03", spike_path)) - } else { - None + if let Ok(path) = std::env::var("COA_TEST_REALM_DIR").map(PathBuf::from) { + if path.join("worldserver.exe").is_file() { + let _ = registry.register("preview-realm", &path); } - }; - if let Some((name, path)) = target_realm { - let _ = registry.register(name, &path); } } app.manage(AppState { diff --git a/src/lib/api.ts b/src/lib/api.ts index e26f108..4dc4a11 100644 --- a/src/lib/api.ts +++ b/src/lib/api.ts @@ -859,7 +859,6 @@ export const api = { invoke<{ ready: boolean; restart_required: boolean; message: string; toolchain: ToolchainStatus }>("preview_install_msvc", { realmId: realmId ?? null }), previewToolchainStatus: (realmId?: string) => invoke("preview_toolchain_status", { realmId: realmId ?? null }), - previewRegisterTestRealm: (path?: string) => invoke("preview_register_test_realm", { path: path ?? null }), previewBuildModule: (realmId: string, sourceUrlOrPath: string) => invoke("preview_build_module", { realmId, sourceUrlOrPath }), previewInstallModule: (realmId: string, moduleId: string, version: string, applySql: boolean) => diff --git a/src/screens/ModulesPage.tsx b/src/screens/ModulesPage.tsx index 16e1215..449dc87 100644 --- a/src/screens/ModulesPage.tsx +++ b/src/screens/ModulesPage.tsx @@ -10,7 +10,6 @@ import { Download, ExternalLink, Flame, - FolderPlus, Gavel, GitFork, Hammer, @@ -791,25 +790,6 @@ export function ModulesPage({ } } - async function registerTestRealm() { - setActionInProgress("register-realm"); - setError(null); - try { - await api.previewRegisterTestRealm(); - setNotification( - locale === "ru" - ? "Экспериментальный тестовый реалм server-v03 успешно зарегистрирован!" - : "Experimental server-v03 test realm registered successfully!" - ); - onChanged?.(); - await load(); - } catch (e) { - setError(asUiError(e)); - } finally { - setActionInProgress(null); - } - } - async function exportDiagnostics() { setActionInProgress("export-diag"); try { @@ -1201,17 +1181,6 @@ export function ModulesPage({ {locale === "ru" ? "Экспорт отчёта" : "Export Diagnostics"} - -