test(startup): isolate persisted geometry regression (#37)

- Issue #37: remove only the persisted main-window startup geometry path and restore the pre-1.4.0 window dimensions for an A/B package run.\n- Keep the application startup workaround disabled so the test isolates the 1.4.0 regression instead of masking it.\n\nRefs #37.

src-tauri/src/lib.rs

@@ -3659,7 +3659,6 @@ pub struct AppState {
 #[derive(Default)]
 struct MainWindowRestoreState {
     requested: AtomicBool,
-    startup_complete: AtomicBool,
 }
 
 #[cfg(target_os = "macos")]
@@ -3956,25 +3955,6 @@ where
 }
 
 pub(crate) fn restore_main_window(app_handle: &tauri::AppHandle) {
-    let startup_complete = app_handle
-        .try_state::<MainWindowRestoreState>()
-        .is_none_or(|state| state.startup_complete.load(Ordering::Acquire));
-    if !startup_complete {
-        if let Some(state) = app_handle.try_state::<MainWindowRestoreState>() {
-            // The first window can be requested by a single-instance callback
-            // or an opened .torrent path while the native host is still being
-            // constructed. Do not touch the HWND until RunEvent::Ready.
-            state.requested.store(true, Ordering::Release);
-            // Ready may have won the transition between the first load and
-            // the request store. Re-check before returning so that request is
-            // serviced by this call instead of being left pending forever.
-            if !state.startup_complete.load(Ordering::Acquire) {
-                return;
-            }
-        } else {
-            return;
-        }
-    }
     let Some(window) = app_handle.get_webview_window("main") else {
         if let Some(state) = app_handle.try_state::<MainWindowRestoreState>() {
             state.requested.store(true, Ordering::Release);
@@ -3987,24 +3967,6 @@ pub(crate) fn restore_main_window(app_handle: &tauri::AppHandle) {
     let _ = window.set_focus();
 }
 
-fn mark_main_window_startup_complete(app_handle: &tauri::AppHandle) {
-    if let Some(state) = app_handle.try_state::<MainWindowRestoreState>() {
-        state.startup_complete.store(true, Ordering::Release);
-    }
-}
-
-#[cfg(target_os = "windows")]
-fn reveal_main_window(app_handle: &tauri::AppHandle) {
-    if let Some(window) = app_handle.get_webview_window("main") {
-        if let Err(error) = window.set_focusable(true) {
-            log::warn!("Could not make the main window focusable: {error}");
-        }
-        if let Err(error) = window.show() {
-            eprintln!("Failed to reveal the main window: {error}");
-        }
-    }
-}
-
 fn restore_pending_main_window(app_handle: &tauri::AppHandle) {
     if app_handle
         .try_state::<MainWindowRestoreState>()
@@ -18200,12 +18162,9 @@ fn toggle_log_pause(caller: tauri::WebviewWindow, pause: bool) -> Result<(), Str
 }
 
 #[tauri::command]
-fn is_log_paused() -> bool {
-    // This read is needed during renderer bootstrap, including by standalone
-    // Properties windows. Avoid extracting a WebviewWindow here: on Windows,
-    // WebView2 can invoke the command while its host is still initializing.
-    // Mutating logging commands remain restricted to the main window below.
-    LOG_PAUSED.load(std::sync::atomic::Ordering::Relaxed)
+fn is_log_paused(caller: tauri::WebviewWindow) -> bool {
+    properties_window::ensure_main_window(&caller).is_ok()
+        && LOG_PAUSED.load(std::sync::atomic::Ordering::Relaxed)
 }
 
 #[tauri::command]
@@ -18526,44 +18485,6 @@ pub fn run() {
             // Build the window only after all command state is registered. This
             // prevents the frontend from racing startup and invoking IPC before
             // the database and portable storage layout are available.
-            let startup_size = persisted_settings
-                .as_ref()
-                .and_then(|settings| settings.main_window_size.as_ref())
-                .and_then(|size| crate::window_geometry::normalize_main_window_size(Some(size)))
-                .unwrap_or_else(crate::window_geometry::default_main_window_size);
-            let startup_size = app
-                .primary_monitor()
-                .ok()
-                .flatten()
-                .and_then(|monitor| {
-                    let scale_factor = monitor.scale_factor();
-                    if !scale_factor.is_finite() || scale_factor <= 0.0 {
-                        return None;
-                    }
-                    let work_area = monitor.work_area().size;
-                    let logical_width = (work_area.width as f64 / scale_factor).round() as u32;
-                    let logical_height = (work_area.height as f64 / scale_factor).round() as u32;
-                    Some(crate::window_geometry::clamp_main_window_size(
-                        startup_size.clone(),
-                        logical_width,
-                        logical_height,
-                    ))
-                })
-                .unwrap_or(startup_size);
-            main_window_builder = main_window_builder
-                .inner_size(startup_size.width as f64, startup_size.height as f64)
-                .prevent_overflow();
-            #[cfg(target_os = "windows")]
-            {
-                // Wry installs its parent WM_SETFOCUS handler while WebView2
-                // is still being initialized. Keep the host hidden and
-                // non-activatable until RunEvent::Ready so Windows cannot
-                // re-enter that handler during native construction.
-                main_window_builder = main_window_builder
-                    .visible(false)
-                    .focused(false)
-                    .focusable(false);
-            }
             main_window_builder
                 .build()
                 .map_err(|error| format!("failed to create main window: {error}"))?;
@@ -19899,12 +19820,6 @@ pub fn run() {
         .build(tauri::generate_context!())
         .expect("error while building tauri application")
         .run(|app_handle, event| match event {
-            tauri::RunEvent::Ready => {
-                mark_main_window_startup_complete(app_handle);
-                #[cfg(target_os = "windows")]
-                reveal_main_window(app_handle);
-                restore_pending_main_window(app_handle);
-            }
             #[cfg(target_os = "macos")]
             tauri::RunEvent::Opened { urls } => {
                 let paths = collect_opened_torrent_paths(

src-tauri/tauri.conf.json

@@ -16,7 +16,7 @@
         "create": false,
         "title": "Firelink",
         "width": 1280,
-        "height": 800,
+        "height": 760,
         "minWidth": 960,
         "minHeight": 640,
         "transparent": false

src-tauri/tauri.linux.conf.json

@@ -5,7 +5,7 @@
         "create": false,
         "title": "Firelink",
         "width": 1280,
-        "height": 800,
+        "height": 760,
         "minWidth": 960,
         "minHeight": 640,
         "transparent": false,

src-tauri/tauri.macos.conf.json

@@ -5,7 +5,7 @@
         "create": false,
         "title": "Firelink",
         "width": 1280,
-        "height": 800,
+        "height": 760,
         "minWidth": 960,
         "minHeight": 640,
         "transparent": true,

src-tauri/tauri.windows.conf.json

@@ -5,7 +5,7 @@
         "create": false,
         "title": "Firelink",
         "width": 1280,
-        "height": 800,
+        "height": 760,
         "minWidth": 960,
         "minHeight": 640,
         "transparent": true,

src/main.tsx

@@ -1,15 +1,128 @@
-import { invoke } from "@tauri-apps/api/core";
+import { StrictMode, type ComponentType } from "react";
+import { createRoot } from "react-dom/client";
+import "@fontsource-variable/inter/wght.css";
+import "@fontsource-variable/noto-sans-hebrew/wght.css";
+import "@fontsource-variable/noto-sans-sc/wght.css";
+import "@fontsource-variable/outfit/wght.css";
+import "@fontsource-variable/roboto/wght.css";
+import "@fontsource-variable/vazirmatn/wght.css";
+import "./index.css";
+import { i18nReady } from "./i18n";
+import { ErrorBoundary } from "./components/ErrorBoundary";
+import { ToastProvider } from "./contexts/ToastContext";
+import { error as logError, warn as logWarn, initLogger } from "./utils/logger";
+import { getCurrentWindow } from '@tauri-apps/api/window';
+import { invokeCommand as invoke } from './ipc';
+
+const isPropertiesWindow = getCurrentWindow().label.startsWith('properties-');
+
+void initLogger();
+
+const serializeConsoleArguments = (values: unknown[]) => values.map(value => {
+  if (value instanceof Error) return `${value.name}: ${value.message}\n${value.stack || ''}`;
+  if (typeof value === 'string') return value;
+  try {
+    return JSON.stringify(value);
+  } catch {
+    return String(value);
+  }
+}).join(' ');
+
+const redactConsoleMessage = (message: string) => message
+  .replace(/(authorization|cookie|password|token|secret)\s*[:=]\s*([^\s,;]+)/gi, '$1=[redacted]')
+  .replace(/(https?:\/\/[^\s?]+)\?[^\s]+/g, '$1?[redacted]');
+
+const originalConsoleError = console.error.bind(console);
+const originalConsoleWarn = console.warn.bind(console);
+console.error = (...values: unknown[]) => {
+  originalConsoleError(...values);
+  void logError(redactConsoleMessage(serializeConsoleArguments(values))).catch(() => undefined);
+};
+console.warn = (...values: unknown[]) => {
+  originalConsoleWarn(...values);
+  void logWarn(redactConsoleMessage(serializeConsoleArguments(values))).catch(() => undefined);
+};
 
 const rootElement = document.getElementById("root");
-if (rootElement) rootElement.textContent = "Firelink startup control";
+const renderRoot = (RootComponent: ComponentType) => {
+  if (!rootElement) return;
 
-const documentLoaded = new Promise<void>((resolve) => {
-  const releaseAfterNativeLoad = () => window.setTimeout(resolve, 0);
-  if (document.readyState === "complete") releaseAfterNativeLoad();
-  else window.addEventListener("load", releaseAfterNativeLoad, { once: true });
-});
+  createRoot(rootElement).render(
+    <StrictMode>
+      <ErrorBoundary>
+        <ToastProvider>
+          <RootComponent />
+        </ToastProvider>
+      </ErrorBoundary>
+    </StrictMode>,
+  );
+};
 
-void documentLoaded.then(async () => {
-  await invoke<boolean>("is_log_paused");
-  if (rootElement) rootElement.textContent = "Firelink post-load log read";
+const PropertiesStartupFailure = () => (
+  <main className="properties-window-shell flex h-screen min-h-0 flex-col items-center justify-center gap-4 bg-main-bg p-6 text-text-primary">
+    <p role="alert">Download Properties could not be loaded.</p>
+    <button
+      type="button"
+      className="app-button app-button-primary px-3 text-xs"
+      onClick={() => {
+        void getCurrentWindow().close().catch(error => {
+          console.error('[PropertiesStartupFailure] close failed', error);
+        });
+      }}
+    >
+      Close
+    </button>
+  </main>
+);
+
+const renderMainApp = async () => {
+  if (!rootElement) return;
+
+  // Keep the child entrypoint isolated from the main application module. App
+  // imports the persistent Zustand stores, whose module initialization issues
+  // main-window-only IPC commands. Loading it in a Properties child creates a
+  // second persistence owner and can race the bridge handshake.
+  const RootComponent = (await import('./App')).default;
+  renderRoot(RootComponent);
+};
+
+const renderPropertiesApp = async () => {
+  if (!rootElement) return;
+
+  try {
+    // Properties starts with the synchronous English catalog and changes locale
+    // after its first paint. Waiting for a lazy locale chunk here delays the
+    // loading shell and makes native window startup visible to the user.
+    const RootComponent = (await import('./components/PropertiesWindowApp')).PropertiesWindowApp;
+    renderRoot(RootComponent);
+  } catch (error) {
+    // A failed lazy chunk must not leave the native window hidden forever. Show
+    // a styled, closable failure state and use the same caller-validated native
+    // reveal command as the normal child path.
+    console.error('Failed to initialize the Properties window:', error);
+    renderRoot(PropertiesStartupFailure);
+    const fallbackSessionId = crypto.randomUUID();
+    void invoke('properties_window_send_ready', { sessionId: fallbackSessionId })
+      .then(() => invoke('properties_window_reveal', { sessionId: fallbackSessionId }))
+      .catch(revealError => {
+        console.error('Failed to reveal the Properties startup error:', revealError);
+      });
+  }
+};
+
+if (isPropertiesWindow) {
+  void renderPropertiesApp();
+} else {
+  void i18nReady.then(renderMainApp).catch(error => {
+    console.error('Failed to initialize localization:', error);
+    void renderMainApp();
+  });
+}
+
+// Prevent the webview's default context menu ("Reload", etc.) on right-click.
+// Individual components that provide custom context menus call preventDefault()
+// in their own onContextMenu handlers, which fires before this document-level
+// listener and is unaffected.
+document.addEventListener('contextmenu', (e) => {
+  e.preventDefault();
 });