Compare commits

...

8 Commits

Author SHA1 Message Date
cb92835d2f docs: rewrite README to match current architecture
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-05-16 12:53:24 +01:00
97c4e7ad96 feat(desktop): self-contained — bundle the frontend
- build:renderer builds Fabric.Frontend with relative base and copies
  the static bundle into renderer/; dist/pack scripts run it first.
- main.js: production loads renderer/index.html when present (falls
  back to offline.html); packaged app no longer needs a separate
  frontend server (still talks to Center/Guild backends, which the
  login screen points at — file:// origin is CORS-allowed).
- package files += renderer/**; gitignore renderer/.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-05-16 12:11:43 +01:00
f641d42a8b fix(desktop): crash on launch + wrong icon (deb)
- productName 'Fabric Desktop' put the app in /opt/Fabric Desktop/;
  the space broke Electron's zygote/chrome-sandbox execvp
  (failed to execvp: /opt/Fabric -> FATAL zygote_host, instant
  crash). productName -> 'Fabric' (/opt/Fabric, no space);
  linux.executableName=fabric-desktop, linux.desktop.Name keeps the
  'Fabric Desktop' label.
- Icon landed in hicolor/0x0/apps (theme ignores it -> generic gear).
  Ship a real build/icons/<NxN>.png set and point linux.icon there;
  deb now installs 16..1024 hicolor sizes.

Verified in the rebuilt .deb: /opt/Fabric/fabric-desktop, hicolor
16x16..1024x1024, no zygote core dump on run.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-05-16 11:47:38 +01:00
77b6caab7b fix(brand): bolder strokes for app/tray icons
Match the frontend: thicker (dilated) strokes, deeper green
#1DB800, regenerated window/app + tray PNGs.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-05-16 11:21:39 +01:00
4473aa1b8b feat(brand): deeper green app/tray icons (#1DB800)
Regenerate window/app (assets/icon.png, build/icon.png) and tray
(tray.png/@2x) with the deeper, fully-saturated green + emboldened
strokes to match the frontend favicon. (Electron uses raster icons;
no SVG.)

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-05-16 11:16:58 +01:00
5c4770f051 fix(brand): transparent bg + tight crop for app/tray icons
Same treatment as the favicon: transparent background and tight
square crop so the window, app and tray icons fill their frames
instead of a tiny mark on a black box.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-05-16 11:10:58 +01:00
8952b9d3ed feat(brand): use no-text mark for window/app icon
Switch BrowserWindow + electron-builder icon to the no-text mark
(tray was already the no-text mark). Wordmark dropped from app-icon
contexts where it doesn't read small.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-05-16 11:07:34 +01:00
ca51ba7063 feat(brand): apply Fabric app + tray icons
- assets/icon.png (512) -> BrowserWindow icon; build/icon.png (1024)
  for electron-builder (linux uses it directly, mac/win generated from
  it); package.json build.files += assets/**, build.icon set.
- Tray: replace the placeholder base64 data-URL with the designed
  no-text tray icon (assets/tray.png 22 + tray@2x.png 44) via
  nativeImage.createFromPath.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-05-16 11:04:55 +01:00
18 changed files with 98 additions and 60 deletions

1
.gitignore vendored
View File

@@ -1,2 +1,3 @@
node_modules/
dist/
renderer/

View File

@@ -1,64 +1,52 @@
# Fabric.Desktop
Electron desktop shell for Fabric.Frontend.
A **self-contained** Electron desktop app for Fabric. It bundles the
`Fabric.Frontend` SPA inside the package and loads it locally over
`file://` — no separate frontend web server is needed. It still talks to the
Center/Guild **backends** over HTTP (the Center base is set on the login
screen, so the desktop app points at whatever host runs the backends).
## 功能(当前)
- BrowserWindow 基础配置(尺寸/最小尺寸/标题)
- Dev/Prod 加载策略dev server / 本地 offline.html
- 基础菜单与快捷键(刷新、开发者工具、退出)
- 安全基线:`contextIsolation` + `sandbox` + 禁止任意新窗口/导航
- `preload + IPC` 白名单:
- `fabric:config:get`
- `fabric:config:set`
- `fabric:notify`
## How it works
## Dev
- `npm run build:renderer` builds `Fabric.Frontend` with a relative asset
base (`build:desktop`) and copies the bundle into `renderer/`.
- `main.js` loads `renderer/index.html` in production (falls back to
`offline.html` if the bundle is missing); dev mode loads
`FABRIC_DESKTOP_URL` (default `http://localhost:5173`).
- Security baseline: `contextIsolation` + `sandbox`, no arbitrary new
windows/navigation; `preload` exposes a small IPC allowlist
(`fabric:config:get|set`, `fabric:notify`).
- System tray (show/hide window, quit) with the Fabric tray icon; app/window
icons use the Fabric mark.
## Develop
```bash
npm install
npm run start:dev
npm run start:dev # expects Fabric.Frontend dev server at :5173
# or, against the bundled renderer:
npm run build:renderer && npm start
```
`start:dev` expects Frontend dev server at `http://localhost:5173`.
## Standalone
```bash
npm start
```
## Build / Release
先安装依赖(包含 `electron-builder`
## Build / package
```bash
npm install
npm run pack # unpacked dir (no installer)
npm run dist:linux # AppImage, deb, tar.gz -> dist/
npm run dist:mac # dmg, zip
npm run dist:win # nsis, zip
```
仅打包目录(不生成安装包):
Each `dist:*`/`pack` runs `build:renderer` first (so `Fabric.Frontend` must
be present beside this submodule, which it is in the `Fabric` checkout).
Output goes to `dist/` (git-ignored). `productName` is **Fabric** so the app
installs to `/opt/Fabric/` (a space there breaks Electron's sandbox); the
launcher is still labelled "Fabric Desktop". Linux icons are generated from
`build/icons/`.
```bash
npm run pack
```
## Notes
跨平台构建入口:
```bash
npm run dist
```
按平台构建:
```bash
npm run dist:linux
npm run dist:mac
npm run dist:win
```
构建产物输出到:
- `dist/`
产物命名规范:
- `Fabric-Desktop-${version}-${os}-${arch}.${ext}`
- The bundled SPA uses `HashRouter` under `file://` (no server for the
History API). The Center/Guild backends are HTTP and CORS-allow the
Electron `file://` origin (`null`).

BIN
assets/icon.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 54 KiB

BIN
assets/tray.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
assets/tray@2x.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 KiB

BIN
build/icon.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 121 KiB

BIN
build/icons/1024x1024.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 121 KiB

BIN
build/icons/128x128.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

BIN
build/icons/16x16.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 683 B

BIN
build/icons/24x24.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
build/icons/256x256.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 25 KiB

BIN
build/icons/32x32.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
build/icons/48x48.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

BIN
build/icons/512x512.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 54 KiB

BIN
build/icons/64x64.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.6 KiB

11
main.js
View File

@@ -4,7 +4,11 @@ const path = require('path')
const isDev = !!process.env.FABRIC_DESKTOP_URL
const DEFAULT_DEV_URL = 'http://localhost:5173'
const DEFAULT_PROD_ENTRY = path.join(__dirname, 'offline.html')
// Self-contained: load the bundled frontend if present, else the placeholder.
const BUNDLED_ENTRY = path.join(__dirname, 'renderer', 'index.html')
const DEFAULT_PROD_ENTRY = fs.existsSync(BUNDLED_ENTRY)
? BUNDLED_ENTRY
: path.join(__dirname, 'offline.html')
let mainWindow = null
let tray = null
@@ -60,6 +64,7 @@ function createWindow() {
minWidth: 1024,
minHeight: 700,
title: 'Fabric Desktop',
icon: path.join(__dirname, 'assets/icon.png'),
autoHideMenuBar: false,
webPreferences: {
contextIsolation: true,
@@ -99,9 +104,7 @@ function createWindow() {
function createTrayIcon() {
if (tray) return tray
const iconDataUrl =
'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAQAAAC1+jfqAAAAfElEQVR4AWNw4PjPwMDA8J+BgYHhP4MDA8N/BgYGhv8MDAwM/2dgYGB4R2JgYGB4w8DAwPCfgYGB4R8DAwPDf4aGhob/BgwMDAz/Z2BgYHhHYmBgYHjDwMDA8J+BgYHhHwMDA8N/hoYGhv8GDAwMDP9nYGBgeEdiYGAAAB7RImfVq6X8AAAAAElFTkSuQmCC'
const icon = nativeImage.createFromDataURL(iconDataUrl)
const icon = nativeImage.createFromPath(path.join(__dirname, 'assets/tray.png'))
tray = new Tray(icon)
tray.setToolTip('Fabric Desktop')

View File

@@ -12,11 +12,12 @@
"scripts": {
"start": "electron .",
"start:dev": "FABRIC_DESKTOP_URL=http://localhost:5173 electron .",
"pack": "electron-builder --dir",
"dist": "electron-builder",
"dist:linux": "electron-builder --linux AppImage deb tar.gz",
"dist:mac": "electron-builder --mac dmg zip",
"dist:win": "electron-builder --win nsis zip"
"build:renderer": "node scripts/build-renderer.mjs",
"pack": "npm run build:renderer && electron-builder --dir",
"dist": "npm run build:renderer && electron-builder",
"dist:linux": "npm run build:renderer && electron-builder --linux AppImage deb tar.gz",
"dist:mac": "npm run build:renderer && electron-builder --mac dmg zip",
"dist:win": "npm run build:renderer && electron-builder --win nsis zip"
},
"devDependencies": {
"electron": "^37.2.1",
@@ -24,7 +25,7 @@
},
"build": {
"appId": "ai.hangman.fabric.desktop",
"productName": "Fabric Desktop",
"productName": "Fabric",
"artifactName": "Fabric-Desktop-${version}-${os}-${arch}.${ext}",
"directories": {
"output": "dist"
@@ -33,9 +34,12 @@
"main.js",
"preload.js",
"offline.html",
"package.json"
"package.json",
"assets/**",
"renderer/**"
],
"asar": true,
"icon": "build/icon.png",
"linux": {
"target": [
"AppImage",
@@ -43,7 +47,13 @@
"tar.gz"
],
"category": "Utility",
"maintainer": "Hangman <noreply@hangman-lab.top>"
"maintainer": "Hangman <noreply@hangman-lab.top>",
"executableName": "fabric-desktop",
"icon": "build/icons",
"desktop": {
"Name": "Fabric Desktop",
"StartupWMClass": "Fabric Desktop"
}
},
"mac": {
"target": [

View File

@@ -0,0 +1,36 @@
#!/usr/bin/env node
/**
* Build the Fabric web frontend with a relative asset base and copy the
* static bundle into Fabric.Desktop/renderer/ so the packaged Electron app
* is self-contained (loaded via file://, no separate web server needed).
*
* Fabric.Frontend is the sibling submodule under the parent Fabric repo.
*/
import { execSync } from 'node:child_process'
import fs from 'node:fs'
import path from 'node:path'
import { fileURLToPath } from 'node:url'
const __dirname = path.dirname(fileURLToPath(import.meta.url))
const DESKTOP = path.resolve(__dirname, '..')
const FRONTEND = path.resolve(DESKTOP, '..', 'Fabric.Frontend')
const SRC = path.join(FRONTEND, 'dist-desktop')
const DEST = path.join(DESKTOP, 'renderer')
if (!fs.existsSync(FRONTEND)) {
console.error(`[build-renderer] Fabric.Frontend not found at ${FRONTEND}`)
process.exit(1)
}
console.log('[build-renderer] building frontend (relative base)…')
execSync('npm install --no-audit --no-fund', { cwd: FRONTEND, stdio: 'inherit' })
execSync('npm run build:desktop', { cwd: FRONTEND, stdio: 'inherit' })
if (!fs.existsSync(path.join(SRC, 'index.html'))) {
console.error(`[build-renderer] expected ${SRC}/index.html after build`)
process.exit(1)
}
fs.rmSync(DEST, { recursive: true, force: true })
fs.cpSync(SRC, DEST, { recursive: true })
console.log(`[build-renderer] copied ${SRC} -> ${DEST}`)