From 888f20fdab9e6f3e30db88b2b5ee5c91625bc084 Mon Sep 17 00:00:00 2001
From: imbytecat <imbytecat@gmail.com>
Date: Sun, 8 Feb 2026 18:21:40 +0800
Subject: [PATCH] =?UTF-8?q?fix(desktop):=20=E5=8A=A0=E8=BD=BD=20loading=20?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BD=9C=E4=B8=BA=E5=90=AF=E5=8A=A8=E5=B1=8F?=
 =?UTF-8?q?=EF=BC=8C=E9=85=8D=E7=BD=AE=E5=B9=B3=E5=8F=B0=E7=BA=A7=20extraR?=
 =?UTF-8?q?esources=20=E5=AF=B9=E6=8E=A5=E4=BA=A4=E5=8F=89=E7=BC=96?=
 =?UTF-8?q?=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- main process 启动时先加载 renderer/index.html 显示 spinner
- electron-builder 按平台引用 server/out/ 下对应架构的 sidecar binary
- 移除 mise.toml 中无关的 rust 工具配置
---
 apps/desktop/electron-builder.yml | 14 +++++++++-----
 apps/desktop/src/main/index.ts    |  5 +++++
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/apps/desktop/electron-builder.yml b/apps/desktop/electron-builder.yml
index f5f507c..25f9d6f 100644
--- a/apps/desktop/electron-builder.yml
+++ b/apps/desktop/electron-builder.yml
@@ -9,15 +9,13 @@ files:
   - '!{.env,.env.*,bun.lock}'
   - '!{tsconfig.json,tsconfig.node.json}'
   - '!{AGENTS.md,README.md,CHANGELOG.md}'
-extraResources:
-  - from: resources/
-    to: .
-    filter:
-      - '**/*'
 asarUnpack:
   - resources/**
 win:
   executableName: Furtherverse
+  extraResources:
+    - from: ../server/out/server-windows-x64.exe
+      to: server.exe
 nsis:
   artifactName: ${name}-${version}-setup.${ext}
   shortcutName: ${productName}
@@ -25,6 +23,9 @@ nsis:
   createDesktopShortcut: always
 mac:
   category: public.app-category.productivity
+  extraResources:
+    - from: ../server/out/server-darwin-arm64
+      to: server
 dmg:
   artifactName: ${name}-${version}.${ext}
 linux:
@@ -33,6 +34,9 @@ linux:
     - deb
   maintainer: furtherverse.com
   category: Utility
+  extraResources:
+    - from: ../server/out/server-linux-x64
+      to: server
 appImage:
   artifactName: ${name}-${version}.${ext}
 npmRebuild: false
diff --git a/apps/desktop/src/main/index.ts b/apps/desktop/src/main/index.ts
index 04c3711..c91ef7c 100644
--- a/apps/desktop/src/main/index.ts
+++ b/apps/desktop/src/main/index.ts
@@ -80,6 +80,11 @@ const createWindow = async () => {
     return { action: 'deny' }
   })
 
+  if (process.env.ELECTRON_RENDERER_URL) {
+    mainWindow.loadURL(process.env.ELECTRON_RENDERER_URL)
+  } else {
+    mainWindow.loadFile(join(__dirname, '../renderer/index.html'))
+  }
   mainWindow.show()
 
   const serverUrl = getServerUrl()