test(startup): isolate main WebView construction for issue 37

scripts/smoke-packaged-app.js

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

src-tauri/src/lib.rs

@@ -18200,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]
@@ -18564,9 +18561,11 @@ pub fn run() {
                     .focused(false)
                     .focusable(false);
             }
-            main_window_builder
-                .build()
-                .map_err(|error| format!("failed to create main window: {error}"))?;
+            if std::env::var_os("FIRELINK_SKIP_MAIN_WINDOW").is_none() {
+                main_window_builder
+                    .build()
+                    .map_err(|error| format!("failed to create main window: {error}"))?;
+            }
             restore_pending_main_window(app.handle());
 
             #[cfg(any(target_os = "windows", target_os = "linux"))]
@@ -19903,6 +19902,7 @@ pub fn run() {
                 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

@@ -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();
 });