Compare commits

...

11 Commits

Author SHA1 Message Date
8c0ea632d7 style(desktop): 规范 package.json 字段排序 2026-02-08 20:31:17 +08:00
db23ee42fc chore: 更新 lockfile 依赖版本 2026-02-08 20:26:16 +08:00
0784546e50 fix(desktop): 修复 artifactName 路径错误并移除 deb 构建目标
scoped package name 中的 / 导致 ${name} 作为路径出错,改用 ${productName};
移除 deb target(fpm 依赖不可用);补充 package.json 元信息字段
2026-02-08 20:03:47 +08:00
2fe3e15659 refactor: 重命名 build.ts → compile.ts,统一脚本与文件命名
- compile 脚本调用 compile.ts,消除与 build 的歧义
- desktop turbo.json 添加 build outputs 缓存配置
2026-02-08 19:46:04 +08:00
ed02993350 style(desktop): loading 页面改为白色轻盈主题 2026-02-08 19:40:20 +08:00
e4e5ff2211 chore: 移除 useSortedClasses 规则,等待 nursery 毕业后再启用 2026-02-08 19:19:18 +08:00
d69a573a33 feat: 为 desktop/server 添加 Tailwind CSS 支持和 Biome 集成
- desktop renderer 接入 @tailwindcss/vite,loading 页面改用 Tailwind 类
- 两个 app 添加 biome.json 继承配置:tailwindDirectives + useSortedClasses
2026-02-08 19:17:53 +08:00
6cc1bc6834 refactor(desktop): 用类型收窄替代 as AddressInfo 断言 2026-02-08 19:03:13 +08:00
894fd17d1a fix(desktop): 动态分配 sidecar 端口替代硬编码,避免端口冲突
使用 net.createServer().listen(0) 探测可用端口,通过 PORT 环境变量
传递给 sidecar binary(VS Code language server 同款模式)
2026-02-08 18:38:45 +08:00
888f20fdab fix(desktop): 加载 loading 页面作为启动屏,配置平台级 extraResources 对接交叉编译
- main process 启动时先加载 renderer/index.html 显示 spinner
- electron-builder 按平台引用 server/out/ 下对应架构的 sidecar binary
- 移除 mise.toml 中无关的 rust 工具配置
2026-02-08 18:21:40 +08:00
7318600e20 refactor(desktop): 替换 WebUI 为 Electron + electron-vite 桌面壳方案
- 使用 electron-vite 构建 main/preload,electron-builder 打包分发
- main process: dev 模式直连 localhost:3000,生产模式 spawn sidecar binary
- 添加 loading 页面,server 就绪前显示加载动画
- 更新 catalog 依赖: electron, electron-vite, electron-builder
- 移除 @webui-dev/bun-webui 依赖
2026-02-08 18:16:13 +08:00
19 changed files with 1036 additions and 115 deletions

View File

@@ -11,7 +11,7 @@ Guidelines for AI agents working in this Bun monorepo.
- **Package Manager**: Bun — **NOT npm / yarn / pnpm**
- **Apps**:
- `apps/server` - TanStack Start fullstack web app (see `apps/server/AGENTS.md`)
- `apps/desktop` - Electrobun desktop shell, loads server in native window (see `apps/desktop/AGENTS.md`)
- `apps/desktop` - Electron desktop shell, sidecar server pattern (see `apps/desktop/AGENTS.md`)
- **Packages**: `packages/utils`, `packages/tsconfig` (shared configs)
## Build / Lint / Test Commands
@@ -41,9 +41,11 @@ bun db:studio # Open Drizzle Studio
### Desktop App (`apps/desktop`)
```bash
bun dev # Start Electrobun dev mode (requires server dev running)
bun build # Build canary release
bun build:stable # Build stable release
bun dev # electron-vite dev mode (requires server dev running)
bun build # electron-vite build (main + preload)
bun build:win # Build + package for Windows
bun build:mac # Build + package for macOS
bun build:linux # Build + package for Linux
bun fix # Biome auto-fix
bun typecheck # TypeScript check
```
@@ -158,11 +160,14 @@ export const myTable = pgTable('my_table', {
│ │ │ ├── api/ # ORPC contracts, routers, middlewares
│ │ │ └── db/ # Drizzle schema
│ │ └── AGENTS.md
│ └── desktop/ # Electrobun desktop shell
│ └── desktop/ # Electron desktop shell
│ ├── src/
│ │ ── bun/
│ │ └── index.ts # Main process entry
├── electrobun.config.ts # Electrobun configuration
│ │ ── main/
│ │ └── index.ts # Main process entry
│ └── preload/
│ │ └── index.ts # Preload script
│ ├── electron.vite.config.ts
│ ├── electron-builder.yml # Packaging config
│ └── AGENTS.md
├── packages/
│ ├── tsconfig/ # Shared TS configs
@@ -175,4 +180,4 @@ export const myTable = pgTable('my_table', {
## See Also
- `apps/server/AGENTS.md` - Detailed TanStack Start / ORPC patterns
- `apps/desktop/AGENTS.md` - Electrobun desktop development guide
- `apps/desktop/AGENTS.md` - Electron desktop development guide

View File

@@ -1,4 +1,7 @@
# WebUI native libraries (auto-downloaded)
*.dll
*.so
*.dylib
# Electron-vite build output
out/
dist/
# Sidecar binary (copied from apps/server build)
resources/server
resources/server.exe

View File

@@ -1,27 +1,32 @@
# AGENTS.md - Desktop App Guidelines
Thin WebUI shell hosting the fullstack server app.
Thin Electron shell hosting the fullstack server app.
## Tech Stack
> **⚠️ This project uses Bun — NOT Node.js / npm. All commands use `bun`. Never use `npm`, `npx`, or `node`.**
> **⚠️ This project uses Bun as the package manager. Runtime is Electron (Node.js). Never use `npm`, `npx`, `yarn`, or `pnpm`.**
- **Type**: WebUI desktop shell
- **Type**: Electron desktop shell
- **Design**: Server-driven desktop (thin native window hosting web app)
- **Runtime**: Bun (Main process) + System browser / WebView (via WebUI)
- **Window Library**: [webui-dev/webui](https://github.com/webui-dev/webui) — opens installed browser or native WebView as GUI
- **Build**: Turborepo
- **Runtime**: Electron (Main/Renderer) + Sidecar server binary (Bun-compiled)
- **Build Tool**: electron-vite (Vite-based, handles main + preload builds)
- **Packager**: electron-builder (installers, signing, auto-update)
- **Orchestration**: Turborepo
## Architecture
- **Server-driven design**: The desktop app is a "thin" native shell. It does not contain UI or business logic; it opens a browser window pointing to the `apps/server` TanStack Start application.
- **Dev mode**: Waits for the Vite dev server at `localhost:3000`, then opens a WebUI window. Requires `apps/server` to be running separately.
- **WebUI**: Uses `@webui-dev/bun-webui` (FFI-based C library binding). Auto-detects and opens the best available browser in a private profile, or uses the system WebView.
- **Server-driven design**: The desktop app is a "thin" native shell. It does not contain UI or business logic; it opens a BrowserWindow pointing to the `apps/server` TanStack Start application.
- **Dev mode**: Opens a BrowserWindow pointing to `localhost:3000`. Requires `apps/server` to be running separately (Turbo handles this).
- **Production mode**: Spawns a compiled server binary (from `resources/`) as a sidecar process, waits for readiness, then loads its URL.
## Commands
```bash
bun dev # Open WebUI window (requires server dev running)
bun dev # electron-vite dev (requires server dev running)
bun build # electron-vite build (main + preload)
bun build:win # Build + package for Windows
bun build:mac # Build + package for macOS
bun build:linux # Build + package for Linux
bun fix # Biome auto-fix
bun typecheck # TypeScript check
```
@@ -31,27 +36,40 @@ bun typecheck # TypeScript check
```
.
├── src/
── bun/
└── index.ts # Main process entry (server readiness check + WebUI window)
├── package.json # Scripts and dependencies
├── turbo.json # Dev pipeline (depends on server dev)
── AGENTS.md # Desktop guidelines (this file)
── main/
└── index.ts # Main process (server lifecycle + BrowserWindow)
│ └── preload/
│ └── index.ts # Preload script (security isolation)
── resources/ # Sidecar binaries (gitignored, copied from server build)
├── out/ # electron-vite build output (gitignored)
├── electron.vite.config.ts
├── electron-builder.yml # Packaging configuration
├── package.json
├── turbo.json
└── AGENTS.md
```
## Development Workflow
1. **Start server**: In `apps/server`, run `bun dev`.
2. **Start desktop**: In `apps/desktop`, run `bun dev`.
3. **Connection**: The desktop app polls `localhost:3000` until responsive, then opens the browser window.
1. **Start server**: `bun dev` in `apps/server` (or use root `bun dev` via Turbo).
2. **Start desktop**: `bun dev` in `apps/desktop`.
3. **Connection**: Main process polls `localhost:3000` until responsive, then opens BrowserWindow.
## Production Build Workflow
1. **Build server**: `bun build` in `apps/server``.output/`
2. **Compile server**: `bun compile` in `apps/server``out/server-{platform}`
3. **Copy binary**: Copy the platform-appropriate binary to `apps/desktop/resources/server`
4. **Package desktop**: `bun build:linux` (or `:mac` / `:win`) in `apps/desktop`
## Critical Rules
**DO:**
- Use arrow functions for all utility functions.
- Ensure `apps/server` dev server is running before starting desktop.
- Keep the desktop app as a thin shell — no UI or business logic.
- Use `catalog:` for all dependency versions in `package.json`.
**DON'T:**
- Use `npm`, `npx`, `node`, `yarn`, or `pnpm`. Always use `bun`.
- Include UI components or business logic in the desktop app (keep it thin).
- Use `npm`, `npx`, `yarn`, or `pnpm`. Use `bun` for package management.
- Include UI components or business logic in the desktop app.
- Use `as any` or `@ts-ignore`.

9
apps/desktop/biome.json Normal file
View File

@@ -0,0 +1,9 @@
{
"$schema": "../../node_modules/@biomejs/biome/configuration_schema.json",
"extends": "//",
"css": {
"parser": {
"tailwindDirectives": true
}
}
}

View File

@@ -0,0 +1,41 @@
appId: com.furtherverse.app
productName: Furtherverse
directories:
buildResources: build
files:
- '!**/.vscode/*'
- '!src/*'
- '!electron.vite.config.{js,ts,mjs,cjs}'
- '!{.env,.env.*,bun.lock}'
- '!{tsconfig.json,tsconfig.node.json}'
- '!{AGENTS.md,README.md,CHANGELOG.md}'
asarUnpack:
- resources/**
win:
executableName: Furtherverse
extraResources:
- from: ../server/out/server-windows-x64.exe
to: server.exe
nsis:
artifactName: ${productName}-${version}-setup.${ext}
shortcutName: ${productName}
uninstallDisplayName: ${productName}
createDesktopShortcut: always
mac:
category: public.app-category.productivity
extraResources:
- from: ../server/out/server-darwin-arm64
to: server
dmg:
artifactName: ${productName}-${version}.${ext}
linux:
target:
- AppImage
maintainer: furtherverse.com
category: Utility
extraResources:
- from: ../server/out/server-linux-x64
to: server
appImage:
artifactName: ${productName}-${version}.${ext}
npmRebuild: false

View File

@@ -0,0 +1,10 @@
import tailwindcss from '@tailwindcss/vite'
import { defineConfig } from 'electron-vite'
export default defineConfig({
main: {},
preload: {},
renderer: {
plugins: [tailwindcss()],
},
})

View File

@@ -2,17 +2,27 @@
"name": "@furtherverse/desktop",
"version": "1.0.0",
"private": true,
"description": "Furtherverse desktop app",
"homepage": "https://furtherverse.com",
"author": "Furtherverse",
"type": "module",
"main": "out/main/index.js",
"scripts": {
"dev": "bun src/bun/index.ts",
"build": "electron-vite build",
"build:linux": "electron-vite build && electron-builder --linux --config",
"build:mac": "electron-vite build && electron-builder --mac --config",
"build:win": "electron-vite build && electron-builder --win --config",
"dev": "electron-vite dev",
"fix": "biome check --write",
"typecheck": "tsc --noEmit"
},
"dependencies": {
"@webui-dev/bun-webui": "catalog:"
},
"devDependencies": {
"@furtherverse/tsconfig": "workspace:*",
"@types/bun": "catalog:"
"@tailwindcss/vite": "catalog:",
"@types/node": "catalog:",
"electron": "catalog:",
"electron-builder": "catalog:",
"electron-vite": "catalog:",
"tailwindcss": "catalog:"
}
}

View File

@@ -1,55 +0,0 @@
import { WebUI } from '@webui-dev/bun-webui'
const DEV_SERVER_URL = 'http://localhost:3000'
const SERVER_READY_TIMEOUT_MS = 10_000
const isServerReady = async (url: string): Promise<boolean> => {
try {
const response = await fetch(url, { method: 'HEAD' })
return response.ok
} catch {
return false
}
}
const waitForServer = async (
url: string,
timeoutMs = SERVER_READY_TIMEOUT_MS,
): Promise<boolean> => {
const start = Date.now()
while (Date.now() - start < timeoutMs) {
if (await isServerReady(url)) return true
await Bun.sleep(100)
}
return false
}
const main = async () => {
console.log('Starting Furtherverse Desktop...')
console.log('Waiting for server at', DEV_SERVER_URL)
const ready = await waitForServer(DEV_SERVER_URL)
if (!ready) {
console.error(
'Dev server not responding. Run `bun dev` in apps/server first.',
)
process.exit(1)
}
console.log('Opening window at', DEV_SERVER_URL)
const win = new WebUI()
win.setSize(1200, 800)
win.setCenter()
await win.show(DEV_SERVER_URL)
console.log('Window opened. Waiting for close...')
await WebUI.wait()
process.exit(0)
}
main().catch((error) => {
console.error('Failed to start:', error)
process.exit(1)
})

View File

@@ -0,0 +1,143 @@
import { spawn } from 'node:child_process'
import { createServer } from 'node:net'
import { join } from 'node:path'
import { app, BrowserWindow, shell } from 'electron'
const DEV_SERVER_URL = 'http://localhost:3000'
let mainWindow: BrowserWindow | null = null
let serverProcess: ReturnType<typeof spawn> | null = null
const getAvailablePort = (): Promise<number> =>
new Promise((resolve, reject) => {
const server = createServer()
server.listen(0, () => {
const addr = server.address()
if (!addr || typeof addr === 'string') {
server.close()
reject(new Error('Failed to resolve port'))
return
}
server.close(() => resolve(addr.port))
})
server.on('error', reject)
})
const isServerReady = async (url: string): Promise<boolean> => {
try {
const response = await fetch(url, { method: 'HEAD' })
return response.ok
} catch {
return false
}
}
const waitForServer = async (
url: string,
timeoutMs = 15_000,
): Promise<boolean> => {
const start = Date.now()
while (Date.now() - start < timeoutMs) {
if (await isServerReady(url)) return true
await new Promise<void>((resolve) => setTimeout(resolve, 200))
}
return false
}
const spawnServer = (port: number): string => {
const binaryName = process.platform === 'win32' ? 'server.exe' : 'server'
const binaryPath = join(process.resourcesPath, binaryName)
serverProcess = spawn(binaryPath, [], {
env: {
...process.env,
PORT: String(port),
HOST: '127.0.0.1',
},
stdio: 'pipe',
})
serverProcess.stdout?.on('data', (data: Buffer) => {
console.log(`[server] ${data.toString().trim()}`)
})
serverProcess.stderr?.on('data', (data: Buffer) => {
console.error(`[server] ${data.toString().trim()}`)
})
serverProcess.on('error', (err) => {
console.error('Failed to start server:', err)
})
return `http://127.0.0.1:${port}`
}
const getServerUrl = async (): Promise<string> => {
if (!app.isPackaged) {
return DEV_SERVER_URL
}
const port = await getAvailablePort()
return spawnServer(port)
}
const createWindow = async () => {
mainWindow = new BrowserWindow({
width: 1200,
height: 800,
show: false,
webPreferences: {
preload: join(__dirname, '../preload/index.mjs'),
sandbox: true,
},
})
mainWindow.webContents.setWindowOpenHandler(({ url }) => {
shell.openExternal(url)
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 = await getServerUrl()
console.log(`Waiting for server at ${serverUrl}...`)
const ready = await waitForServer(serverUrl)
if (!ready) {
console.error(
app.isPackaged
? 'Server binary did not start in time.'
: 'Dev server not responding. Run `bun dev` in apps/server first.',
)
app.quit()
return
}
console.log(`Loading ${serverUrl}`)
mainWindow.loadURL(serverUrl)
}
app.whenReady().then(createWindow)
app.on('window-all-closed', () => {
if (process.platform !== 'darwin') {
app.quit()
}
})
app.on('activate', () => {
if (BrowserWindow.getAllWindows().length === 0) {
createWindow()
}
})
app.on('before-quit', () => {
if (serverProcess) {
serverProcess.kill()
serverProcess = null
}
})

View File

@@ -0,0 +1 @@
export {}

View File

@@ -0,0 +1,18 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Furtherverse</title>
<link rel="stylesheet" href="./styles.css" />
</head>
<body class="bg-white h-screen w-screen flex flex-col items-center justify-center overflow-hidden select-none cursor-default font-sans antialiased m-0">
<div class="flex flex-col items-center gap-8 animate-fade-in">
<h1 class="text-3xl font-medium tracking-tight text-zinc-900">Furtherverse</h1>
<div class="w-24 h-[2px] bg-zinc-100 rounded-full overflow-hidden relative">
<div class="h-full w-full bg-zinc-800 origin-left animate-loading-bar"></div>
</div>
<div class="text-[10px] uppercase tracking-widest text-zinc-400 font-medium animate-pulse-slow">Starting</div>
</div>
</body>
</html>

View File

@@ -0,0 +1,40 @@
@import "tailwindcss";
@theme {
--animate-fade-in: fade-in 1.2s cubic-bezier(0.16, 1, 0.3, 1) forwards;
--animate-pulse-slow: pulse-slow 3s ease-in-out infinite;
--animate-loading-bar: loading-bar 2s cubic-bezier(0.4, 0, 0.2, 1) infinite;
}
@keyframes fade-in {
from {
opacity: 0;
transform: translateY(4px);
}
to {
opacity: 1;
transform: translateY(0);
}
}
@keyframes pulse-slow {
0%,
100% {
opacity: 0.4;
}
50% {
opacity: 0.8;
}
}
@keyframes loading-bar {
0% {
transform: translateX(-100%);
}
50% {
transform: translateX(0);
}
100% {
transform: translateX(100%);
}
}

View File

@@ -1,6 +1,7 @@
{
"extends": "@furtherverse/tsconfig/bun.json",
"extends": "@furtherverse/tsconfig/base.json",
"compilerOptions": {
"lib": ["ESNext", "DOM", "DOM.Iterable"]
}
"types": ["node"]
},
"include": ["src/main/**/*", "src/preload/**/*", "electron.vite.config.ts"]
}

View File

@@ -1,5 +1,9 @@
{
"$schema": "../../node_modules/turbo/schema.json",
"extends": ["//"],
"tasks": {}
"tasks": {
"build": {
"outputs": ["out/**"]
}
}
}

View File

@@ -3,5 +3,10 @@
"extends": "//",
"files": {
"includes": ["**", "!**/routeTree.gen.ts"]
},
"css": {
"parser": {
"tailwindDirectives": true
}
}
}

View File

@@ -5,7 +5,7 @@
"type": "module",
"scripts": {
"build": "vite build",
"compile": "bun build.ts",
"compile": "bun compile.ts",
"db:generate": "drizzle-kit generate",
"db:migrate": "drizzle-kit migrate",
"db:push": "drizzle-kit push",

696
bun.lock

File diff suppressed because it is too large Load Diff

View File

@@ -44,7 +44,9 @@
"drizzle-kit": "^0.31.8",
"drizzle-orm": "^0.45.1",
"drizzle-zod": "^0.8.3",
"@webui-dev/bun-webui": "^2.5.4",
"electron": "^34.0.0",
"electron-builder": "^26.0.0",
"electron-vite": "^5.0.0",
"nitro": "npm:nitro-nightly@3.0.1-20260206-171553-bc737c0c",
"ohash": "^2.0.11",
"postgres": "^3.4.8",