test(startup): isolate compact invoke handler (#37)

- Issue #37: Windows still overflowed when startup IPC ran from the WebView2 load callback.
- Release the renderer startup gate on the next event-loop task after load returns.
- Keep logger and console forwarding behind the same post-load boundary.

Fixes #37.

src-tauri/src/lib.rs

@@ -3659,6 +3659,7 @@ pub struct AppState {
 #[derive(Default)]
 struct MainWindowRestoreState {
     requested: AtomicBool,
+    startup_complete: AtomicBool,
 }
 
 #[cfg(target_os = "macos")]
@@ -3955,6 +3956,25 @@ 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);
@@ -3967,6 +3987,24 @@ 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>()
@@ -18162,9 +18200,12 @@ fn toggle_log_pause(caller: tauri::WebviewWindow, pause: bool) -> Result<(), Str
 }
 
 #[tauri::command]
-fn is_log_paused(caller: tauri::WebviewWindow) -> bool {
-    properties_window::ensure_main_window(&caller).is_ok()
-        && LOG_PAUSED.load(std::sync::atomic::Ordering::Relaxed)
+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)
 }
 
 #[tauri::command]
@@ -18485,6 +18526,44 @@ 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}"))?;
@@ -19781,45 +19860,16 @@ pub fn run() {
                 }
             }
         })
-.invoke_handler(tauri::generate_handler![
- get_engine_status, get_aria2_engine_status, get_ytdlp_engine_status, get_ffmpeg_engine_status,
- get_deno_engine_status, test_ytdlp, test_aria2c, test_ffmpeg, test_deno,
- pause_download, resume_download, fetch_metadata, inspect_torrent, rekey_torrent_metadata, remove_torrent_metadata, fetch_media_metadata, fetch_media_playlist_metadata,
-            begin_dock_badge_session, update_dock_badge, get_platform_info, approve_download_root, set_prevent_sleep, set_power_preferences, get_free_space, perform_system_action,
-            ack_schedule_trigger,
-            check_automation_permission, request_automation_permission, open_automation_settings,
-            set_keychain_password, get_keychain_password, delete_keychain_password,
-            save_site_login, delete_site_login,
-            hydrate_extension_pairing_token, get_session_pairing_token, regenerate_pairing_token, grant_keychain_access,
-            get_keychain_grant_status, accept_keychain_grant, abandon_keychain_grant,
-            authorize_keychain_access,
-            acknowledge_pairing_token_change,
-            inspect_download_target, toggle_tray_icon, set_extension_pairing_token,
-            get_extension_server_port, set_extension_frontend_ready, ack_frontend_exit, ack_extension_download, set_concurrent_limit, set_queue_concurrency_limits, set_download_speed_limit, set_torrent_upload_limit, set_torrent_peer_options, get_torrent_peers, get_torrent_availability, get_torrent_file_progress, get_torrent_piece_progress, get_torrent_file_selection, set_torrent_file_selection, get_torrent_details, get_torrent_magnet_link, export_torrent_metadata, move_torrent_data, cancel_torrent_move_data, verify_torrent_data, get_torrent_web_seeds, set_torrent_web_seeds, set_torrent_max_open_files, set_torrent_overall_upload_limit, set_global_speed_limit, remove_download, get_download_primary_path,
-            detach_download_for_reconfigure,
-            enqueue_download, enqueue_many, cancel_enqueue_generation, move_in_queue, move_many_in_queue, remove_from_queue, get_pending_order,
-            commands::reveal_in_file_manager, commands::open_downloaded_file,
-            properties_window::open_download_properties_window,
-            properties_window::get_properties_window_download_id,
-            properties_window::properties_window_send_ready,
-            properties_window::properties_window_reveal,
-            properties_window::properties_window_send_action,
-            properties_window::validate_properties_window_request,
-            properties_window::close_download_properties_window,
-            properties_window::properties_window_registry_remove_for_download,
-            parity::get_system_proxy, parity::get_file_category, parity::check_for_updates, parity::is_supported_media, parity::get_supported_media_domains,
-            parity::create_category_directories,
-            db_save_settings, db_load_settings, canonicalize_torrent_network_setting,
-            db_get_all_downloads, db_replace_downloads,
-            db_commit_download_state,
-            clear_torrent_removal_paths, reconcile_torrent_removal_reservations,
-            db_get_all_queues, db_replace_queues,
-            read_logs, export_logs, toggle_log_pause, is_log_paused, clear_logs,
-            set_log_stream_active
-        ])
+.invoke_handler(tauri::generate_handler![begin_dock_badge_session, is_log_paused])
         .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": 760,
+        "height": 800,
         "minWidth": 960,
         "minHeight": 640,
         "transparent": false

src-tauri/tauri.linux.conf.json

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

src-tauri/tauri.macos.conf.json

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

src-tauri/tauri.windows.conf.json

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

src/main.tsx

@@ -1,128 +1,15 @@
-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';
+import { invoke } from '@tauri-apps/api/core';
 
-const isPropertiesWindow = getCurrentWindow().label.startsWith('properties-');
+const rootElement = document.getElementById('root');
+if (rootElement) rootElement.textContent = 'Firelink startup control';
 
-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");
-const renderRoot = (RootComponent: ComponentType) => {
-  if (!rootElement) return;
-
-  createRoot(rootElement).render(
-    <StrictMode>
-      <ErrorBoundary>
-        <ToastProvider>
-          <RootComponent />
-        </ToastProvider>
-      </ErrorBoundary>
-    </StrictMode>,
-  );
-};
-
-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();
+const documentLoaded = new Promise<void>((resolve) => {
+  const releaseAfterNativeLoad = () => window.setTimeout(resolve, 0);
+  if (document.readyState === 'complete') releaseAfterNativeLoad();
+  else window.addEventListener('load', releaseAfterNativeLoad, { once: true });
+});
+
+void documentLoaded.then(async () => {
+  await invoke<boolean>('is_log_paused');
+  if (rootElement) rootElement.textContent = 'Firelink post-load log read';
 });