@vincentbanana/banana-gui 0.4.9 → 0.6.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/desktop/main.cjs +75 -8
- package/desktop/preload.cjs +20 -0
- package/package.json +2 -2
- package/ui/app.js +1703 -359
- package/ui/index.html +88 -34
- package/ui/style.css +1159 -70
- package/ui/vendor/addon-fit.js +2 -0
- package/ui/vendor/highlight.min.js +1262 -0
- package/ui/vendor/xterm.css +285 -0
- package/ui/vendor/xterm.js +2 -0
package/desktop/main.cjs
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
// Banana 桌面版主进程:拉起本地 GUI 服务,再用窗口加载它。
|
|
2
2
|
// 界面资源仍来自本包 ui/,agent 内核来自 @vincentbanana/bananacli。
|
|
3
|
-
const { app, BrowserWindow, Menu, shell, dialog } = require('electron');
|
|
4
|
-
const { spawn } = require('node:child_process');
|
|
3
|
+
const { app, BrowserWindow, Menu, shell, dialog, ipcMain } = require('electron');
|
|
4
|
+
const { spawn, spawnSync } = require('node:child_process');
|
|
5
5
|
const { createRequire } = require('node:module');
|
|
6
6
|
const { join } = require('node:path');
|
|
7
|
-
const { mkdirSync } = require('node:fs');
|
|
7
|
+
const { mkdirSync, writeFileSync } = require('node:fs');
|
|
8
8
|
|
|
9
9
|
// 用户数据、Electron 缓存统一放 D 盘,不写系统盘
|
|
10
10
|
try {
|
|
@@ -40,6 +40,21 @@ function serverArgs() {
|
|
|
40
40
|
return ['--ui', '--no-open', ...extra];
|
|
41
41
|
}
|
|
42
42
|
|
|
43
|
+
// 优先用系统 node 跑内核:Electron 自带的 node 版本和原生模块(PTY)不一定匹配,
|
|
44
|
+
// 系统 node 更稳。找不到再退回 electron.exe(ELECTRON_RUN_AS_NODE)。
|
|
45
|
+
function resolveNode() {
|
|
46
|
+
const candidate = process.env.BANANA_NODE || 'node';
|
|
47
|
+
try {
|
|
48
|
+
const probe = spawnSync(candidate, ['-v'], { encoding: 'utf8', windowsHide: true, timeout: 5000 });
|
|
49
|
+
if (probe.status === 0 && /^v\d+\./.test((probe.stdout || '').trim())) {
|
|
50
|
+
return { file: candidate, env: {} };
|
|
51
|
+
}
|
|
52
|
+
} catch {
|
|
53
|
+
// PATH 里没有 node,退回 Electron
|
|
54
|
+
}
|
|
55
|
+
return { file: process.execPath, env: { ELECTRON_RUN_AS_NODE: '1' } };
|
|
56
|
+
}
|
|
57
|
+
|
|
43
58
|
function startServer() {
|
|
44
59
|
let entry;
|
|
45
60
|
try {
|
|
@@ -48,11 +63,13 @@ function startServer() {
|
|
|
48
63
|
} catch (error) {
|
|
49
64
|
throw new Error('找不到依赖 @vincentbanana/bananacli,请重新安装:npm install -g @vincentbanana/banana-gui');
|
|
50
65
|
}
|
|
51
|
-
|
|
66
|
+
const node = resolveNode();
|
|
67
|
+
child = spawn(node.file, [entry, ...serverArgs()], {
|
|
52
68
|
stdio: ['ignore', 'pipe', 'pipe'],
|
|
69
|
+
windowsHide: true,
|
|
53
70
|
env: {
|
|
54
71
|
...process.env,
|
|
55
|
-
|
|
72
|
+
...node.env,
|
|
56
73
|
BANANA_UI_DIR: process.env.BANANA_UI_DIR ?? join(__dirname, '..', 'ui'),
|
|
57
74
|
},
|
|
58
75
|
});
|
|
@@ -80,6 +97,7 @@ function startServer() {
|
|
|
80
97
|
|
|
81
98
|
async function createWindow() {
|
|
82
99
|
const url = await startServer();
|
|
100
|
+
const frameless = process.platform !== 'darwin';
|
|
83
101
|
win = new BrowserWindow({
|
|
84
102
|
width: 1180,
|
|
85
103
|
height: 820,
|
|
@@ -88,10 +106,20 @@ async function createWindow() {
|
|
|
88
106
|
backgroundColor: '#ffffff',
|
|
89
107
|
title: 'Banana',
|
|
90
108
|
autoHideMenuBar: true,
|
|
109
|
+
// Windows / Linux 用自绘标题栏;macOS 保留原生红绿灯更符合习惯
|
|
110
|
+
frame: !frameless,
|
|
111
|
+
titleBarStyle: frameless ? 'default' : 'hiddenInset',
|
|
112
|
+
trafficLightPosition: frameless ? undefined : { x: 14, y: 16 },
|
|
113
|
+
hasShadow: true,
|
|
91
114
|
// 先不显示,等页面就绪再 show():启动器用了 windowsHide,
|
|
92
115
|
// 那种情况下 Electron 会把首个窗口以隐藏状态创建,不显式 show 就看不到
|
|
93
116
|
show: false,
|
|
94
|
-
webPreferences: {
|
|
117
|
+
webPreferences: {
|
|
118
|
+
contextIsolation: true,
|
|
119
|
+
nodeIntegration: false,
|
|
120
|
+
sandbox: true,
|
|
121
|
+
preload: join(__dirname, 'preload.cjs'),
|
|
122
|
+
},
|
|
95
123
|
});
|
|
96
124
|
await win.loadURL(url);
|
|
97
125
|
win.show();
|
|
@@ -99,6 +127,14 @@ async function createWindow() {
|
|
|
99
127
|
win.on('closed', () => {
|
|
100
128
|
win = null;
|
|
101
129
|
});
|
|
130
|
+
// 自绘标题栏需要知道最大化状态来切换图标
|
|
131
|
+
const reportMaximized = () => {
|
|
132
|
+
if (!win) return;
|
|
133
|
+
win.webContents.send('banana:maximized', win.isMaximized());
|
|
134
|
+
};
|
|
135
|
+
win.on('maximize', reportMaximized);
|
|
136
|
+
win.on('unmaximize', reportMaximized);
|
|
137
|
+
win.webContents.on('did-finish-load', reportMaximized);
|
|
102
138
|
// 外部链接交给系统浏览器,窗口只负责本地界面
|
|
103
139
|
win.webContents.setWindowOpenHandler(({ url: target }) => {
|
|
104
140
|
shell.openExternal(target);
|
|
@@ -107,8 +143,36 @@ async function createWindow() {
|
|
|
107
143
|
if (process.argv.includes('--selftest')) await selfTest(url);
|
|
108
144
|
}
|
|
109
145
|
|
|
146
|
+
// 页面只能通过 preload 发三个固定动作;发送方必须就是主窗口。
|
|
147
|
+
ipcMain.on('banana:window', (event, action) => {
|
|
148
|
+
const target = BrowserWindow.fromWebContents(event.sender);
|
|
149
|
+
if (!target || target !== win) return;
|
|
150
|
+
if (action === 'minimize') target.minimize();
|
|
151
|
+
else if (action === 'toggle-maximize') {
|
|
152
|
+
if (target.isMaximized()) target.unmaximize();
|
|
153
|
+
else target.maximize();
|
|
154
|
+
} else if (action === 'close') target.close();
|
|
155
|
+
});
|
|
156
|
+
|
|
110
157
|
/** --selftest:不靠人眼看,直接在页面里断言界面渲染成功,然后退出。 */
|
|
111
158
|
async function selfTest(url) {
|
|
159
|
+
const report = (payload) => {
|
|
160
|
+
const line = 'SELFTEST ' + JSON.stringify(payload);
|
|
161
|
+
console.log(line);
|
|
162
|
+
// Electron 在 Windows 上是 GUI 子系统,stdout 常被丢掉;同时落一份文件方便自动化读取
|
|
163
|
+
for (const target of [
|
|
164
|
+
join(app.getPath('temp'), 'banana-desktop-selftest.json'),
|
|
165
|
+
join(__dirname, 'selftest.json'),
|
|
166
|
+
join(process.env.BANANA_HOME || __dirname, 'banana-desktop-selftest.json'),
|
|
167
|
+
]) {
|
|
168
|
+
try {
|
|
169
|
+
writeFileSync(target, line + '\n', 'utf8');
|
|
170
|
+
break;
|
|
171
|
+
} catch {
|
|
172
|
+
/* 换下一个位置 */
|
|
173
|
+
}
|
|
174
|
+
}
|
|
175
|
+
};
|
|
112
176
|
try {
|
|
113
177
|
const probe = await win.webContents.executeJavaScript(`(() => ({
|
|
114
178
|
title: document.title,
|
|
@@ -116,13 +180,16 @@ async function selfTest(url) {
|
|
|
116
180
|
sidebar: Boolean(document.querySelector('#sidebar')),
|
|
117
181
|
scriptLoaded: typeof window.fetch === 'function' && Boolean(document.querySelector('#input')),
|
|
118
182
|
theme: getComputedStyle(document.documentElement).getPropertyValue('--bg').trim(),
|
|
183
|
+
frameless: Boolean(window.bananaDesktop?.frameless),
|
|
184
|
+
winControls: !document.querySelector('#winControls')?.hidden,
|
|
185
|
+
customTitlebar: getComputedStyle(document.querySelector('.topbar')).webkitAppRegion,
|
|
119
186
|
}))()`);
|
|
120
187
|
const ok = probe.title === 'Banana' && probe.composed && probe.sidebar && probe.scriptLoaded;
|
|
121
|
-
|
|
188
|
+
report({ ok, url: url.replace(/\/t\/[a-f0-9]+\//, '/t/<token>/'), ...probe });
|
|
122
189
|
child?.kill();
|
|
123
190
|
app.exit(ok ? 0 : 1);
|
|
124
191
|
} catch (error) {
|
|
125
|
-
|
|
192
|
+
report({ ok: false, error: String(error?.message ?? error) });
|
|
126
193
|
child?.kill();
|
|
127
194
|
app.exit(1);
|
|
128
195
|
}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
// 桌面版预加载:只暴露窗口控制所需的最小接口。
|
|
2
|
+
// 页面拿不到 Node,也拿不到任意 ipcRenderer,只能发三个固定动作。
|
|
3
|
+
const { contextBridge, ipcRenderer } = require('electron');
|
|
4
|
+
|
|
5
|
+
const ACTIONS = new Set(['minimize', 'toggle-maximize', 'close']);
|
|
6
|
+
|
|
7
|
+
contextBridge.exposeInMainWorld('bananaDesktop', {
|
|
8
|
+
platform: process.platform,
|
|
9
|
+
frameless: process.platform !== 'darwin',
|
|
10
|
+
minimize: () => ipcRenderer.send('banana:window', 'minimize'),
|
|
11
|
+
toggleMaximize: () => ipcRenderer.send('banana:window', 'toggle-maximize'),
|
|
12
|
+
close: () => ipcRenderer.send('banana:window', 'close'),
|
|
13
|
+
onMaximizeChange: (callback) => {
|
|
14
|
+
if (typeof callback !== 'function') return () => {};
|
|
15
|
+
const handler = (_event, maximized) => callback(Boolean(maximized));
|
|
16
|
+
ipcRenderer.on('banana:maximized', handler);
|
|
17
|
+
return () => ipcRenderer.removeListener('banana:maximized', handler);
|
|
18
|
+
},
|
|
19
|
+
isAction: (action) => ACTIONS.has(action),
|
|
20
|
+
});
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@vincentbanana/banana-gui",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.6.0",
|
|
4
4
|
"description": "Banana 的图形界面:本地服务 + 浏览器。黑白主题,自绘图标,无第三方 UI 依赖",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"engines": {
|
|
@@ -71,7 +71,7 @@
|
|
|
71
71
|
"electron-builder": "^25.0.0"
|
|
72
72
|
},
|
|
73
73
|
"dependencies": {
|
|
74
|
-
"@vincentbanana/bananacli": "^0.4.
|
|
74
|
+
"@vincentbanana/bananacli": "^0.4.9"
|
|
75
75
|
},
|
|
76
76
|
"license": "MIT",
|
|
77
77
|
"publishConfig": {
|