From 41667cb33b2b862379bb2fc154a4281621967137 Mon Sep 17 00:00:00 2001
From: imbytecat <imbytecat@gmail.com>
Date: Mon, 9 Feb 2026 01:27:29 +0800
Subject: [PATCH] refactor(desktop): simplify main process logic and improve
 naming

- Remove logLifecycle wrapper, inline the conditional logging
- Remove redundant shouldAbortWindowLoad check before final loadURL
- Rename getServerUrl to resolveServerUrl to reflect side effects
- Add .catch on createWindow to prevent silent async failures
---
 apps/desktop/src/main/index.ts | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/apps/desktop/src/main/index.ts b/apps/desktop/src/main/index.ts
index 2647e64..b0a724d 100644
--- a/apps/desktop/src/main/index.ts
+++ b/apps/desktop/src/main/index.ts
@@ -13,12 +13,6 @@ let isQuitting = false
 const shouldAbortWindowLoad = (): boolean =>
   isQuitting || !mainWindow || mainWindow.isDestroyed()
 
-const logLifecycle = (message: string) => {
-  if (!app.isPackaged) {
-    console.log(message)
-  }
-}
-
 const getAvailablePort = (): Promise<number> =>
   new Promise((resolve, reject) => {
     const server = createServer()
@@ -99,7 +93,7 @@ const spawnServer = (port: number): string => {
   return `http://127.0.0.1:${port}`
 }
 
-const getServerUrl = async (): Promise<string | null> => {
+const resolveServerUrl = async (): Promise<string | null> => {
   if (!app.isPackaged) {
     return DEV_SERVER_URL
   }
@@ -140,13 +134,13 @@ const createWindow = async () => {
   }
   mainWindow.show()
 
-  const serverUrl = await getServerUrl()
+  const serverUrl = await resolveServerUrl()
   if (!serverUrl || shouldAbortWindowLoad()) {
     stopServerProcess()
     return
   }
 
-  logLifecycle(`Waiting for server at ${serverUrl}...`)
+  if (!app.isPackaged) console.log(`Waiting for server at ${serverUrl}...`)
   const ready = await waitForServer(serverUrl)
   if (shouldAbortWindowLoad()) {
     stopServerProcess()
@@ -163,10 +157,6 @@ const createWindow = async () => {
     return
   }
 
-  logLifecycle(`Loading ${serverUrl}`)
-  if (shouldAbortWindowLoad()) {
-    return
-  }
   mainWindow.loadURL(serverUrl)
 }
 
@@ -175,7 +165,13 @@ const beginQuit = () => {
   stopServerProcess()
 }
 
-app.whenReady().then(createWindow)
+app
+  .whenReady()
+  .then(createWindow)
+  .catch((e) => {
+    console.error('Failed to create window:', e)
+    app.quit()
+  })
 
 app.on('window-all-closed', () => {
   if (process.platform !== 'darwin') {