test(startup): isolate Aria2 launch path (#37)

scripts/smoke-packaged-app.js

@@ -30,6 +30,7 @@ const child = spawn(executable, [], {
   env: {
     ...process.env,
     FIRELINK_SMOKE_TEST: '1',
+    FIRELINK_DISABLE_ARIA2_STARTUP: '1',
     WEBKIT_DISABLE_COMPOSITING_MODE: '1',
     GDK_BACKEND: 'x11',
   },

src-tauri/src/lib.rs

@@ -3993,6 +3993,18 @@ fn mark_main_window_startup_complete(app_handle: &tauri::AppHandle) {
     }
 }
 
+#[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>()
@@ -18188,12 +18200,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]
@@ -18541,6 +18550,17 @@ pub fn run() {
             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}"))?;
@@ -18608,6 +18628,9 @@ pub fn run() {
             let aria2_secret_clone = aria2_secret.clone();
             let app_handle_bg = app.handle().clone();
             tauri::async_runtime::spawn(async move {
+                if std::env::var_os("FIRELINK_DISABLE_ARIA2_STARTUP").is_some() {
+                    return;
+                }
 
                 let mut ws_port = 6800;
                 match resolve_bundled_binary_path(&app_handle_bg, "aria2c") {
@@ -18987,6 +19010,9 @@ pub fn run() {
             let poll_secret = aria2_secret.clone();
             let poll_mgr = Arc::clone(&queue_manager_poll);
             tauri::async_runtime::spawn(async move {
+                if std::env::var_os("FIRELINK_DISABLE_ARIA2_STARTUP").is_some() {
+                    return;
+                }
                 let mut interval = tokio::time::interval(std::time::Duration::from_millis(1000));
                 let mut observations: HashMap<String, Aria2ConnectionObservation> = HashMap::new();
                 let mut missing_gid_recovery_at: HashMap<String, Instant> = HashMap::new();
@@ -19878,6 +19904,9 @@ pub fn run() {
         .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);
+                #[cfg(not(target_os = "windows"))]
                 restore_pending_main_window(app_handle);
             }
             #[cfg(target_os = "macos")]

src/main.tsx

@@ -10,12 +10,14 @@ import "./index.css";
 import { i18nReady } from "./i18n";
 import { ErrorBoundary } from "./components/ErrorBoundary";
 import { ToastProvider } from "./contexts/ToastContext";
-import { error as logError, warn as logWarn } from "./utils/logger";
+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;