@cloudcli-ai/cloudcli 1.34.0 → 1.35.1
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/README.de.md +9 -1
- package/README.ja.md +8 -0
- package/README.ko.md +9 -1
- package/README.md +23 -5
- package/README.ru.md +9 -1
- package/README.tr.md +8 -1
- package/README.zh-CN.md +9 -1
- package/README.zh-TW.md +9 -1
- package/dist/api-docs.html +36 -18
- package/dist/assets/index-BvX30NW5.css +32 -0
- package/dist/assets/index-D1IdCTT6.js +1418 -0
- package/dist/index.html +12 -4
- package/dist-server/server/browser-use-mcp.js +350 -0
- package/dist-server/server/browser-use-mcp.js.map +1 -0
- package/dist-server/server/claude-sdk.js +25 -5
- package/dist-server/server/claude-sdk.js.map +1 -1
- package/dist-server/server/cli.js +14 -6
- package/dist-server/server/cli.js.map +1 -1
- package/dist-server/server/cursor-cli.js +27 -11
- package/dist-server/server/cursor-cli.js.map +1 -1
- package/dist-server/server/gemini-cli.js +17 -2
- package/dist-server/server/gemini-cli.js.map +1 -1
- package/dist-server/server/index.js +136 -40
- package/dist-server/server/index.js.map +1 -1
- package/dist-server/server/load-env.js +1 -1
- package/dist-server/server/load-env.js.map +1 -1
- package/dist-server/server/modules/browser-use/browser-use-mcp.routes.js +107 -0
- package/dist-server/server/modules/browser-use/browser-use-mcp.routes.js.map +1 -0
- package/dist-server/server/modules/browser-use/browser-use.routes.js +93 -0
- package/dist-server/server/modules/browser-use/browser-use.routes.js.map +1 -0
- package/dist-server/server/modules/browser-use/browser-use.service.js +688 -0
- package/dist-server/server/modules/browser-use/browser-use.service.js.map +1 -0
- package/dist-server/server/modules/browser-use/tests/browser-use.service.test.js +8 -0
- package/dist-server/server/modules/browser-use/tests/browser-use.service.test.js.map +1 -0
- package/dist-server/server/modules/database/index.js +1 -0
- package/dist-server/server/modules/database/index.js.map +1 -1
- package/dist-server/server/modules/database/migrations.js +23 -1
- package/dist-server/server/modules/database/migrations.js.map +1 -1
- package/dist-server/server/modules/database/repositories/notification-channel-endpoints.js +100 -0
- package/dist-server/server/modules/database/repositories/notification-channel-endpoints.js.map +1 -0
- package/dist-server/server/modules/database/repositories/notification-preferences.js +8 -0
- package/dist-server/server/modules/database/repositories/notification-preferences.js.map +1 -1
- package/dist-server/server/modules/database/repositories/sessions.db.js +173 -17
- package/dist-server/server/modules/database/repositories/sessions.db.js.map +1 -1
- package/dist-server/server/modules/database/schema.js +26 -0
- package/dist-server/server/modules/database/schema.js.map +1 -1
- package/dist-server/server/modules/database/tests/projects.db.integration.test.js.map +1 -0
- package/dist-server/server/modules/database/tests/sessions-provider-mapping.test.js +78 -0
- package/dist-server/server/modules/database/tests/sessions-provider-mapping.test.js.map +1 -0
- package/dist-server/server/modules/database/{repositories → tests}/sessions.db.integration.test.js +10 -0
- package/dist-server/server/modules/database/tests/sessions.db.integration.test.js.map +1 -0
- package/dist-server/server/modules/notifications/index.js +4 -0
- package/dist-server/server/modules/notifications/index.js.map +1 -0
- package/dist-server/server/modules/notifications/notifications.routes.js +115 -0
- package/dist-server/server/modules/notifications/notifications.routes.js.map +1 -0
- package/dist-server/server/modules/notifications/services/desktop-notification-clients.service.js +97 -0
- package/dist-server/server/modules/notifications/services/desktop-notification-clients.service.js.map +1 -0
- package/dist-server/server/modules/notifications/services/notification-orchestrator.service.js +229 -0
- package/dist-server/server/modules/notifications/services/notification-orchestrator.service.js.map +1 -0
- package/dist-server/server/modules/notifications/websocket/desktop-notifications-websocket.service.js +79 -0
- package/dist-server/server/modules/notifications/websocket/desktop-notifications-websocket.service.js.map +1 -0
- package/dist-server/server/modules/projects/services/project-management.service.js +0 -4
- package/dist-server/server/modules/projects/services/project-management.service.js.map +1 -1
- package/dist-server/server/modules/projects/services/projects-with-sessions-fetch.service.js +10 -38
- package/dist-server/server/modules/projects/services/projects-with-sessions-fetch.service.js.map +1 -1
- package/dist-server/server/modules/providers/index.js +1 -0
- package/dist-server/server/modules/providers/index.js.map +1 -1
- package/dist-server/server/modules/providers/list/claude/claude-session-synchronizer.provider.js +24 -1
- package/dist-server/server/modules/providers/list/claude/claude-session-synchronizer.provider.js.map +1 -1
- package/dist-server/server/modules/providers/list/claude/claude-sessions.provider.js +9 -12
- package/dist-server/server/modules/providers/list/claude/claude-sessions.provider.js.map +1 -1
- package/dist-server/server/modules/providers/list/claude/claude-skills.provider.js +7 -0
- package/dist-server/server/modules/providers/list/claude/claude-skills.provider.js.map +1 -1
- package/dist-server/server/modules/providers/list/codex/codex-session-synchronizer.provider.js +7 -3
- package/dist-server/server/modules/providers/list/codex/codex-session-synchronizer.provider.js.map +1 -1
- package/dist-server/server/modules/providers/list/codex/codex-sessions.provider.js +3 -9
- package/dist-server/server/modules/providers/list/codex/codex-sessions.provider.js.map +1 -1
- package/dist-server/server/modules/providers/list/codex/codex-skills.provider.js +7 -0
- package/dist-server/server/modules/providers/list/codex/codex-skills.provider.js.map +1 -1
- package/dist-server/server/modules/providers/list/cursor/cursor-sessions.provider.js +13 -22
- package/dist-server/server/modules/providers/list/cursor/cursor-sessions.provider.js.map +1 -1
- package/dist-server/server/modules/providers/list/cursor/cursor-skills.provider.js +7 -0
- package/dist-server/server/modules/providers/list/cursor/cursor-skills.provider.js.map +1 -1
- package/dist-server/server/modules/providers/list/gemini/gemini-models.provider.js +5 -8
- package/dist-server/server/modules/providers/list/gemini/gemini-models.provider.js.map +1 -1
- package/dist-server/server/modules/providers/list/gemini/gemini-sessions.provider.js +6 -6
- package/dist-server/server/modules/providers/list/gemini/gemini-sessions.provider.js.map +1 -1
- package/dist-server/server/modules/providers/list/gemini/gemini-skills.provider.js +7 -0
- package/dist-server/server/modules/providers/list/gemini/gemini-skills.provider.js.map +1 -1
- package/dist-server/server/modules/providers/list/opencode/opencode-session-synchronizer.provider.js +17 -3
- package/dist-server/server/modules/providers/list/opencode/opencode-session-synchronizer.provider.js.map +1 -1
- package/dist-server/server/modules/providers/list/opencode/opencode-sessions.provider.js +9 -10
- package/dist-server/server/modules/providers/list/opencode/opencode-sessions.provider.js.map +1 -1
- package/dist-server/server/modules/providers/provider.routes.js +123 -1
- package/dist-server/server/modules/providers/provider.routes.js.map +1 -1
- package/dist-server/server/modules/providers/services/mcp.service.js +23 -0
- package/dist-server/server/modules/providers/services/mcp.service.js.map +1 -1
- package/dist-server/server/modules/providers/services/provider-capabilities.service.js +65 -0
- package/dist-server/server/modules/providers/services/provider-capabilities.service.js.map +1 -0
- package/dist-server/server/modules/providers/services/provider-models.service.js +1 -1
- package/dist-server/server/modules/providers/services/provider-models.service.js.map +1 -1
- package/dist-server/server/modules/providers/services/sessions-watcher.service.js +62 -23
- package/dist-server/server/modules/providers/services/sessions-watcher.service.js.map +1 -1
- package/dist-server/server/modules/providers/services/sessions.service.js +62 -4
- package/dist-server/server/modules/providers/services/sessions.service.js.map +1 -1
- package/dist-server/server/modules/providers/services/skills.service.js +11 -0
- package/dist-server/server/modules/providers/services/skills.service.js.map +1 -1
- package/dist-server/server/modules/providers/shared/skills/skills.provider.js +163 -1
- package/dist-server/server/modules/providers/shared/skills/skills.provider.js.map +1 -1
- package/dist-server/server/modules/providers/tests/opencode-sessions.test.js +45 -0
- package/dist-server/server/modules/providers/tests/opencode-sessions.test.js.map +1 -1
- package/dist-server/server/modules/providers/tests/skills.test.js +160 -0
- package/dist-server/server/modules/providers/tests/skills.test.js.map +1 -1
- package/dist-server/server/modules/websocket/index.js +1 -0
- package/dist-server/server/modules/websocket/index.js.map +1 -1
- package/dist-server/server/modules/websocket/services/chat-run-registry.service.js +252 -0
- package/dist-server/server/modules/websocket/services/chat-run-registry.service.js.map +1 -0
- package/dist-server/server/modules/websocket/services/chat-session-writer.service.js +105 -0
- package/dist-server/server/modules/websocket/services/chat-session-writer.service.js.map +1 -0
- package/dist-server/server/modules/websocket/services/chat-websocket.service.js +218 -156
- package/dist-server/server/modules/websocket/services/chat-websocket.service.js.map +1 -1
- package/dist-server/server/modules/websocket/services/shell-websocket.service.js +83 -31
- package/dist-server/server/modules/websocket/services/shell-websocket.service.js.map +1 -1
- package/dist-server/server/modules/websocket/services/websocket-server.service.js +5 -0
- package/dist-server/server/modules/websocket/services/websocket-server.service.js.map +1 -1
- package/dist-server/server/modules/websocket/tests/chat-run-registry.test.js +216 -0
- package/dist-server/server/modules/websocket/tests/chat-run-registry.test.js.map +1 -0
- package/dist-server/server/openai-codex.js +24 -14
- package/dist-server/server/openai-codex.js.map +1 -1
- package/dist-server/server/opencode-cli.js +21 -8
- package/dist-server/server/opencode-cli.js.map +1 -1
- package/dist-server/server/opencode-cli.test.js +19 -1
- package/dist-server/server/opencode-cli.test.js.map +1 -1
- package/dist-server/server/routes/settings.js +1 -1
- package/dist-server/server/routes/settings.js.map +1 -1
- package/dist-server/server/services/notification-orchestrator.js +1 -176
- package/dist-server/server/services/notification-orchestrator.js.map +1 -1
- package/dist-server/server/services/tests/notification-orchestrator.test.js +64 -0
- package/dist-server/server/services/tests/notification-orchestrator.test.js.map +1 -0
- package/dist-server/server/shared/{claude-cli-path.test.js → tests/claude-cli-path.test.js} +1 -1
- package/dist-server/server/shared/tests/claude-cli-path.test.js.map +1 -0
- package/dist-server/server/shared/tests/slice-tail-page.test.js +35 -0
- package/dist-server/server/shared/tests/slice-tail-page.test.js.map +1 -0
- package/dist-server/server/shared/utils.js +73 -1
- package/dist-server/server/shared/utils.js.map +1 -1
- package/dist-server/server/voice-proxy.js +226 -0
- package/dist-server/server/voice-proxy.js.map +1 -0
- package/electron/assets/logo-macos.icns +0 -0
- package/electron/assets/logo-macos.png +0 -0
- package/electron/assets/logo-windows.ico +0 -0
- package/electron/cloud.js +260 -0
- package/electron/desktopNotifications.js +378 -0
- package/electron/desktopWindow.js +766 -0
- package/electron/launcher/index.html +14 -0
- package/electron/launcher/launcher.css +801 -0
- package/electron/launcher/launcher.js +687 -0
- package/electron/localServer.js +550 -0
- package/electron/main.js +944 -0
- package/electron/preload.cjs +60 -0
- package/electron/scripts/generate-macos-icon.js +62 -0
- package/electron/serverInstaller.js +277 -0
- package/electron/tabs.js +87 -0
- package/electron/viewHost.js +331 -0
- package/package.json +79 -3
- package/public/api-docs.html +36 -18
- package/scripts/release/build-server-bundle.js +176 -0
- package/scripts/release/prepare-desktop-app.js +152 -0
- package/server/browser-use-mcp.ts +384 -0
- package/server/claude-sdk.js +27 -5
- package/server/cli.js +15 -6
- package/server/cursor-cli.js +27 -11
- package/server/gemini-cli.js +17 -2
- package/server/index.js +137 -47
- package/server/load-env.js +1 -1
- package/server/modules/browser-use/browser-use-mcp.routes.ts +120 -0
- package/server/modules/browser-use/browser-use.routes.ts +96 -0
- package/server/modules/browser-use/browser-use.service.ts +836 -0
- package/server/modules/browser-use/tests/browser-use.service.test.ts +10 -0
- package/server/modules/database/index.ts +1 -0
- package/server/modules/database/migrations.ts +25 -0
- package/server/modules/database/repositories/notification-channel-endpoints.ts +153 -0
- package/server/modules/database/repositories/notification-preferences.ts +12 -1
- package/server/modules/database/repositories/sessions.db.ts +227 -23
- package/server/modules/database/schema.ts +27 -0
- package/server/modules/database/tests/sessions-provider-mapping.test.ts +108 -0
- package/server/modules/database/{repositories → tests}/sessions.db.integration.test.ts +12 -0
- package/server/modules/notifications/index.ts +13 -0
- package/server/modules/notifications/notifications.routes.ts +127 -0
- package/server/modules/notifications/services/desktop-notification-clients.service.ts +124 -0
- package/server/modules/notifications/services/notification-orchestrator.service.js +288 -0
- package/server/modules/notifications/websocket/desktop-notifications-websocket.service.ts +109 -0
- package/server/modules/projects/services/project-management.service.ts +0 -8
- package/server/modules/projects/services/projects-with-sessions-fetch.service.ts +12 -53
- package/server/modules/providers/README.md +1 -1
- package/server/modules/providers/index.ts +1 -0
- package/server/modules/providers/list/claude/claude-session-synchronizer.provider.ts +26 -1
- package/server/modules/providers/list/claude/claude-sessions.provider.ts +9 -14
- package/server/modules/providers/list/claude/claude-skills.provider.ts +8 -0
- package/server/modules/providers/list/codex/codex-session-synchronizer.provider.ts +7 -3
- package/server/modules/providers/list/codex/codex-sessions.provider.ts +3 -12
- package/server/modules/providers/list/codex/codex-skills.provider.ts +8 -0
- package/server/modules/providers/list/cursor/cursor-sessions.provider.ts +13 -22
- package/server/modules/providers/list/cursor/cursor-skills.provider.ts +8 -0
- package/server/modules/providers/list/gemini/gemini-models.provider.ts +5 -8
- package/server/modules/providers/list/gemini/gemini-sessions.provider.ts +6 -6
- package/server/modules/providers/list/gemini/gemini-skills.provider.ts +8 -0
- package/server/modules/providers/list/opencode/opencode-session-synchronizer.provider.ts +18 -4
- package/server/modules/providers/list/opencode/opencode-sessions.provider.ts +9 -12
- package/server/modules/providers/provider.routes.ts +167 -1
- package/server/modules/providers/services/mcp.service.ts +26 -0
- package/server/modules/providers/services/provider-capabilities.service.ts +91 -0
- package/server/modules/providers/services/provider-models.service.ts +1 -1
- package/server/modules/providers/services/sessions-watcher.service.ts +71 -25
- package/server/modules/providers/services/sessions.service.ts +79 -4
- package/server/modules/providers/services/skills.service.ts +25 -1
- package/server/modules/providers/shared/skills/skills.provider.ts +223 -0
- package/server/modules/providers/tests/opencode-sessions.test.ts +49 -0
- package/server/modules/providers/tests/skills.test.ts +212 -0
- package/server/modules/websocket/README.md +33 -27
- package/server/modules/websocket/index.ts +1 -0
- package/server/modules/websocket/services/chat-run-registry.service.ts +327 -0
- package/server/modules/websocket/services/chat-session-writer.service.ts +145 -0
- package/server/modules/websocket/services/chat-websocket.service.ts +292 -207
- package/server/modules/websocket/services/shell-websocket.service.ts +108 -32
- package/server/modules/websocket/services/websocket-server.service.ts +6 -0
- package/server/modules/websocket/tests/chat-run-registry.test.ts +244 -0
- package/server/openai-codex.js +24 -14
- package/server/opencode-cli.js +21 -8
- package/server/opencode-cli.test.js +20 -1
- package/server/routes/settings.js +6 -1
- package/server/services/notification-orchestrator.js +3 -224
- package/server/services/tests/notification-orchestrator.test.js +80 -0
- package/server/shared/interfaces.ts +15 -0
- package/server/shared/tests/slice-tail-page.test.ts +42 -0
- package/server/shared/types.ts +84 -1
- package/server/shared/utils.ts +95 -1
- package/server/voice-proxy.js +224 -0
- package/dist/assets/index-73Xw3i9v.css +0 -32
- package/dist/assets/index-BIHaviaA.js +0 -1361
- package/dist/modelConstants.js +0 -854
- package/dist-server/server/modules/database/repositories/projects.db.integration.test.js.map +0 -1
- package/dist-server/server/modules/database/repositories/sessions.db.integration.test.js.map +0 -1
- package/dist-server/server/shared/claude-cli-path.test.js.map +0 -1
- package/public/modelConstants.js +0 -854
- /package/dist-server/server/modules/database/{repositories → tests}/projects.db.integration.test.js +0 -0
- /package/server/modules/database/{repositories → tests}/projects.db.integration.test.ts +0 -0
- /package/server/shared/{claude-cli-path.test.ts → tests/claude-cli-path.test.ts} +0 -0
|
@@ -0,0 +1,550 @@
|
|
|
1
|
+
import { spawn } from 'node:child_process';
|
|
2
|
+
import fs from 'node:fs/promises';
|
|
3
|
+
import http from 'node:http';
|
|
4
|
+
import net from 'node:net';
|
|
5
|
+
import os from 'node:os';
|
|
6
|
+
import path from 'node:path';
|
|
7
|
+
|
|
8
|
+
import { ServerInstaller } from './serverInstaller.js';
|
|
9
|
+
|
|
10
|
+
const DEFAULT_PORT = 3001;
|
|
11
|
+
const HOST = '127.0.0.1';
|
|
12
|
+
const DISPLAY_HOST = 'localhost';
|
|
13
|
+
const HEALTH_TIMEOUT_MS = 1000;
|
|
14
|
+
const SERVER_START_TIMEOUT_MS = 30000;
|
|
15
|
+
const MAX_STARTUP_LOG_LINES = 300;
|
|
16
|
+
const SERVER_MARKER_PATH = path.join(os.homedir(), '.cloudcli', 'local-server.json');
|
|
17
|
+
const LOCAL_SERVER_URL_ENV_KEYS = [
|
|
18
|
+
'CLOUDCLI_DESKTOP_LOCAL_SERVER_URL',
|
|
19
|
+
'CLOUDCLI_LOCAL_SERVER_URL',
|
|
20
|
+
'ELECTRON_LOCAL_SERVER_URL',
|
|
21
|
+
];
|
|
22
|
+
const LOCAL_SERVER_PORT_ENV_KEYS = [
|
|
23
|
+
'CLOUDCLI_DESKTOP_LOCAL_SERVER_PORT',
|
|
24
|
+
'CLOUDCLI_SERVER_PORT',
|
|
25
|
+
'SERVER_PORT',
|
|
26
|
+
'PORT',
|
|
27
|
+
];
|
|
28
|
+
|
|
29
|
+
function requestJson(url, timeoutMs = HEALTH_TIMEOUT_MS) {
|
|
30
|
+
return new Promise((resolve) => {
|
|
31
|
+
const req = http.get(url, { timeout: timeoutMs }, (res) => {
|
|
32
|
+
let body = '';
|
|
33
|
+
|
|
34
|
+
res.setEncoding('utf8');
|
|
35
|
+
res.on('data', (chunk) => {
|
|
36
|
+
body += chunk;
|
|
37
|
+
});
|
|
38
|
+
res.on('end', () => {
|
|
39
|
+
try {
|
|
40
|
+
resolve({
|
|
41
|
+
ok: res.statusCode >= 200 && res.statusCode < 300,
|
|
42
|
+
json: JSON.parse(body),
|
|
43
|
+
});
|
|
44
|
+
} catch {
|
|
45
|
+
resolve({ ok: false, json: null });
|
|
46
|
+
}
|
|
47
|
+
});
|
|
48
|
+
});
|
|
49
|
+
|
|
50
|
+
req.on('timeout', () => {
|
|
51
|
+
req.destroy();
|
|
52
|
+
resolve({ ok: false, json: null });
|
|
53
|
+
});
|
|
54
|
+
req.on('error', () => resolve({ ok: false, json: null }));
|
|
55
|
+
});
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
async function isCloudCliServer(baseUrl) {
|
|
59
|
+
const response = await requestJson(`${baseUrl}/health`);
|
|
60
|
+
return response.ok
|
|
61
|
+
&& response.json?.status === 'ok'
|
|
62
|
+
&& typeof response.json?.installMode === 'string';
|
|
63
|
+
}
|
|
64
|
+
|
|
65
|
+
function isPortAvailable(port, host = HOST) {
|
|
66
|
+
return new Promise((resolve) => {
|
|
67
|
+
const server = net.createServer();
|
|
68
|
+
|
|
69
|
+
server.once('error', () => resolve(false));
|
|
70
|
+
server.once('listening', () => {
|
|
71
|
+
server.close(() => resolve(true));
|
|
72
|
+
});
|
|
73
|
+
server.listen(port, host);
|
|
74
|
+
});
|
|
75
|
+
}
|
|
76
|
+
|
|
77
|
+
function getFreePort() {
|
|
78
|
+
return new Promise((resolve, reject) => {
|
|
79
|
+
const server = net.createServer();
|
|
80
|
+
|
|
81
|
+
server.once('error', reject);
|
|
82
|
+
server.once('listening', () => {
|
|
83
|
+
const address = server.address();
|
|
84
|
+
const port = typeof address === 'object' && address ? address.port : DEFAULT_PORT;
|
|
85
|
+
server.close(() => resolve(port));
|
|
86
|
+
});
|
|
87
|
+
server.listen(0, HOST);
|
|
88
|
+
});
|
|
89
|
+
}
|
|
90
|
+
|
|
91
|
+
async function chooseServerPort(host) {
|
|
92
|
+
if (await isPortAvailable(DEFAULT_PORT, host)) {
|
|
93
|
+
return DEFAULT_PORT;
|
|
94
|
+
}
|
|
95
|
+
|
|
96
|
+
return getFreePort();
|
|
97
|
+
}
|
|
98
|
+
|
|
99
|
+
function getDesktopPath() {
|
|
100
|
+
const currentPath = process.env.PATH || '';
|
|
101
|
+
const commonPaths = process.platform === 'win32'
|
|
102
|
+
? []
|
|
103
|
+
: ['/opt/homebrew/bin', '/usr/local/bin', '/usr/bin', '/bin', '/usr/sbin', '/sbin'];
|
|
104
|
+
|
|
105
|
+
return [...commonPaths, currentPath].filter(Boolean).join(path.delimiter);
|
|
106
|
+
}
|
|
107
|
+
|
|
108
|
+
function getNodeRuntime(usePackagedElectronRuntime) {
|
|
109
|
+
if (process.env.ELECTRON_NODE_PATH) {
|
|
110
|
+
return { command: process.env.ELECTRON_NODE_PATH, env: {}, label: 'ELECTRON_NODE_PATH' };
|
|
111
|
+
}
|
|
112
|
+
|
|
113
|
+
if (usePackagedElectronRuntime && process.versions.electron) {
|
|
114
|
+
return {
|
|
115
|
+
command: process.execPath,
|
|
116
|
+
env: { ELECTRON_RUN_AS_NODE: '1' },
|
|
117
|
+
label: `Electron ${process.versions.electron} Node ${process.versions.node}`,
|
|
118
|
+
};
|
|
119
|
+
}
|
|
120
|
+
|
|
121
|
+
if (process.env.npm_node_execpath) {
|
|
122
|
+
return { command: process.env.npm_node_execpath, env: {}, label: 'npm_node_execpath' };
|
|
123
|
+
}
|
|
124
|
+
|
|
125
|
+
return { command: 'node', env: {}, label: 'PATH node' };
|
|
126
|
+
}
|
|
127
|
+
|
|
128
|
+
function stripTrailingSlash(value) {
|
|
129
|
+
return value.endsWith('/') ? value.slice(0, -1) : value;
|
|
130
|
+
}
|
|
131
|
+
|
|
132
|
+
function addCandidateUrl(urls, rawUrl) {
|
|
133
|
+
if (!rawUrl) return;
|
|
134
|
+
try {
|
|
135
|
+
const parsed = new URL(String(rawUrl));
|
|
136
|
+
if (parsed.protocol !== 'http:' && parsed.protocol !== 'https:') return;
|
|
137
|
+
parsed.hash = '';
|
|
138
|
+
parsed.search = '';
|
|
139
|
+
const normalized = stripTrailingSlash(parsed.toString());
|
|
140
|
+
if (!urls.includes(normalized)) urls.push(normalized);
|
|
141
|
+
} catch {
|
|
142
|
+
// Ignore invalid user-provided discovery values.
|
|
143
|
+
}
|
|
144
|
+
}
|
|
145
|
+
|
|
146
|
+
function addCandidatePort(urls, rawPort) {
|
|
147
|
+
const port = Number.parseInt(String(rawPort || ''), 10);
|
|
148
|
+
if (!Number.isInteger(port) || port < 1 || port > 65535) return;
|
|
149
|
+
addCandidateUrl(urls, `http://${HOST}:${port}`);
|
|
150
|
+
}
|
|
151
|
+
|
|
152
|
+
function getPortFromUrl(baseUrl) {
|
|
153
|
+
try {
|
|
154
|
+
const parsed = new URL(baseUrl);
|
|
155
|
+
if (parsed.port) return Number.parseInt(parsed.port, 10);
|
|
156
|
+
return parsed.protocol === 'https:' ? 443 : 80;
|
|
157
|
+
} catch {
|
|
158
|
+
return null;
|
|
159
|
+
}
|
|
160
|
+
}
|
|
161
|
+
|
|
162
|
+
function getDisplayUrl(baseUrl) {
|
|
163
|
+
try {
|
|
164
|
+
const parsed = new URL(baseUrl);
|
|
165
|
+
if (parsed.hostname === HOST) {
|
|
166
|
+
parsed.hostname = DISPLAY_HOST;
|
|
167
|
+
}
|
|
168
|
+
return stripTrailingSlash(parsed.toString());
|
|
169
|
+
} catch {
|
|
170
|
+
return baseUrl;
|
|
171
|
+
}
|
|
172
|
+
}
|
|
173
|
+
|
|
174
|
+
async function pathExists(filePath) {
|
|
175
|
+
try {
|
|
176
|
+
await fs.access(filePath);
|
|
177
|
+
return true;
|
|
178
|
+
} catch {
|
|
179
|
+
return false;
|
|
180
|
+
}
|
|
181
|
+
}
|
|
182
|
+
|
|
183
|
+
async function readServerBundleConfig(appRoot) {
|
|
184
|
+
try {
|
|
185
|
+
const raw = await fs.readFile(path.join(appRoot, 'electron', 'server-bundle-config.json'), 'utf8');
|
|
186
|
+
const config = JSON.parse(raw);
|
|
187
|
+
return {
|
|
188
|
+
releaseTag: typeof config.releaseTag === 'string' && config.releaseTag.trim()
|
|
189
|
+
? config.releaseTag.trim()
|
|
190
|
+
: '',
|
|
191
|
+
};
|
|
192
|
+
} catch {
|
|
193
|
+
return { releaseTag: '' };
|
|
194
|
+
}
|
|
195
|
+
}
|
|
196
|
+
|
|
197
|
+
function getServerCwd(appRoot, serverEntry) {
|
|
198
|
+
const normalizedEntry = path.resolve(serverEntry);
|
|
199
|
+
const bundledEntry = path.resolve(appRoot, 'dist-server', 'server', 'index.js');
|
|
200
|
+
if (normalizedEntry === bundledEntry) {
|
|
201
|
+
return appRoot;
|
|
202
|
+
}
|
|
203
|
+
|
|
204
|
+
// Installed server entries are laid out as <root>/dist-server/server/index.js.
|
|
205
|
+
return path.resolve(path.dirname(normalizedEntry), '..', '..');
|
|
206
|
+
}
|
|
207
|
+
|
|
208
|
+
async function readServerMarkerUrl() {
|
|
209
|
+
try {
|
|
210
|
+
const raw = await fs.readFile(SERVER_MARKER_PATH, 'utf8');
|
|
211
|
+
const marker = JSON.parse(raw);
|
|
212
|
+
return marker.url || (marker.port ? `http://${marker.host || HOST}:${marker.port}` : null);
|
|
213
|
+
} catch {
|
|
214
|
+
return null;
|
|
215
|
+
}
|
|
216
|
+
}
|
|
217
|
+
|
|
218
|
+
async function getExistingServerCandidateUrls(defaultUrl) {
|
|
219
|
+
const urls = [];
|
|
220
|
+
|
|
221
|
+
for (const key of LOCAL_SERVER_URL_ENV_KEYS) {
|
|
222
|
+
addCandidateUrl(urls, process.env[key]);
|
|
223
|
+
}
|
|
224
|
+
|
|
225
|
+
addCandidateUrl(urls, await readServerMarkerUrl());
|
|
226
|
+
|
|
227
|
+
for (const key of LOCAL_SERVER_PORT_ENV_KEYS) {
|
|
228
|
+
addCandidatePort(urls, process.env[key]);
|
|
229
|
+
}
|
|
230
|
+
|
|
231
|
+
addCandidateUrl(urls, defaultUrl);
|
|
232
|
+
return urls;
|
|
233
|
+
}
|
|
234
|
+
|
|
235
|
+
async function waitForCloudCliServer(baseUrl, timeoutMs) {
|
|
236
|
+
const startedAt = Date.now();
|
|
237
|
+
|
|
238
|
+
while (Date.now() - startedAt < timeoutMs) {
|
|
239
|
+
if (await isCloudCliServer(baseUrl)) {
|
|
240
|
+
return true;
|
|
241
|
+
}
|
|
242
|
+
await new Promise((resolve) => setTimeout(resolve, 300));
|
|
243
|
+
}
|
|
244
|
+
|
|
245
|
+
return false;
|
|
246
|
+
}
|
|
247
|
+
|
|
248
|
+
export class LocalServerController {
|
|
249
|
+
constructor({ appRoot, settingsPath, isPackaged = false, appVersion, onChange }) {
|
|
250
|
+
this.appRoot = appRoot;
|
|
251
|
+
this.settingsPath = settingsPath;
|
|
252
|
+
this.isPackaged = isPackaged;
|
|
253
|
+
this.appVersion = appVersion;
|
|
254
|
+
this.onChange = onChange;
|
|
255
|
+
this.localServerUrl = null;
|
|
256
|
+
this.localServerPort = null;
|
|
257
|
+
this.ownedServerProcess = null;
|
|
258
|
+
this.startupLogs = [];
|
|
259
|
+
this.desktopSettings = {
|
|
260
|
+
keepLocalServerRunning: false,
|
|
261
|
+
exposeLocalServerOnNetwork: false,
|
|
262
|
+
themeMode: 'system',
|
|
263
|
+
};
|
|
264
|
+
}
|
|
265
|
+
|
|
266
|
+
getSettings() {
|
|
267
|
+
return this.desktopSettings;
|
|
268
|
+
}
|
|
269
|
+
|
|
270
|
+
getLocalServerUrl() {
|
|
271
|
+
return this.localServerUrl;
|
|
272
|
+
}
|
|
273
|
+
|
|
274
|
+
getHealthCheckUrl() {
|
|
275
|
+
if (!this.localServerPort) return this.localServerUrl;
|
|
276
|
+
return `http://${HOST}:${this.localServerPort}`;
|
|
277
|
+
}
|
|
278
|
+
|
|
279
|
+
appendStartupLog(line) {
|
|
280
|
+
const text = String(line || '').trimEnd();
|
|
281
|
+
if (!text) return;
|
|
282
|
+
const timestamp = new Date().toLocaleTimeString();
|
|
283
|
+
this.startupLogs.push(`[${timestamp}] ${text}`);
|
|
284
|
+
if (this.startupLogs.length > MAX_STARTUP_LOG_LINES) {
|
|
285
|
+
this.startupLogs.splice(0, this.startupLogs.length - MAX_STARTUP_LOG_LINES);
|
|
286
|
+
}
|
|
287
|
+
this.onChange?.();
|
|
288
|
+
}
|
|
289
|
+
|
|
290
|
+
getStartupLogs() {
|
|
291
|
+
return [...this.startupLogs];
|
|
292
|
+
}
|
|
293
|
+
|
|
294
|
+
getPendingTarget() {
|
|
295
|
+
return {
|
|
296
|
+
kind: 'local',
|
|
297
|
+
name: 'Local CloudCLI',
|
|
298
|
+
url: this.localServerUrl || `http://${DISPLAY_HOST}:${this.localServerPort || DEFAULT_PORT}`,
|
|
299
|
+
};
|
|
300
|
+
}
|
|
301
|
+
|
|
302
|
+
getLanAddress() {
|
|
303
|
+
const interfaces = os.networkInterfaces();
|
|
304
|
+
for (const entries of Object.values(interfaces)) {
|
|
305
|
+
for (const entry of entries || []) {
|
|
306
|
+
if (entry.family === 'IPv4' && !entry.internal) {
|
|
307
|
+
return entry.address;
|
|
308
|
+
}
|
|
309
|
+
}
|
|
310
|
+
}
|
|
311
|
+
return null;
|
|
312
|
+
}
|
|
313
|
+
|
|
314
|
+
getShareableWebUrl() {
|
|
315
|
+
if (!this.localServerUrl || !this.localServerPort) return null;
|
|
316
|
+
if (this.desktopSettings.exposeLocalServerOnNetwork) {
|
|
317
|
+
const lanAddress = this.getLanAddress();
|
|
318
|
+
if (lanAddress) {
|
|
319
|
+
return `http://${lanAddress}:${this.localServerPort}`;
|
|
320
|
+
}
|
|
321
|
+
}
|
|
322
|
+
return this.getLocalServerUrl();
|
|
323
|
+
}
|
|
324
|
+
|
|
325
|
+
getServerBindHost() {
|
|
326
|
+
return this.desktopSettings.exposeLocalServerOnNetwork ? '0.0.0.0' : HOST;
|
|
327
|
+
}
|
|
328
|
+
|
|
329
|
+
async loadDesktopSettings() {
|
|
330
|
+
try {
|
|
331
|
+
const raw = await fs.readFile(this.settingsPath, 'utf8');
|
|
332
|
+
const stored = JSON.parse(raw);
|
|
333
|
+
this.desktopSettings = {
|
|
334
|
+
keepLocalServerRunning: Boolean(stored.keepLocalServerRunning),
|
|
335
|
+
exposeLocalServerOnNetwork: Boolean(stored.exposeLocalServerOnNetwork),
|
|
336
|
+
themeMode: stored.themeMode === 'light' || stored.themeMode === 'dark' ? stored.themeMode : 'system',
|
|
337
|
+
};
|
|
338
|
+
} catch {
|
|
339
|
+
this.desktopSettings = {
|
|
340
|
+
keepLocalServerRunning: false,
|
|
341
|
+
exposeLocalServerOnNetwork: false,
|
|
342
|
+
themeMode: 'system',
|
|
343
|
+
};
|
|
344
|
+
}
|
|
345
|
+
}
|
|
346
|
+
|
|
347
|
+
async saveDesktopSettings(nextSettings = this.desktopSettings) {
|
|
348
|
+
this.desktopSettings = {
|
|
349
|
+
keepLocalServerRunning: Boolean(nextSettings.keepLocalServerRunning),
|
|
350
|
+
exposeLocalServerOnNetwork: Boolean(nextSettings.exposeLocalServerOnNetwork),
|
|
351
|
+
themeMode: nextSettings.themeMode === 'light' || nextSettings.themeMode === 'dark' ? nextSettings.themeMode : 'system',
|
|
352
|
+
};
|
|
353
|
+
await fs.mkdir(path.dirname(this.settingsPath), { recursive: true });
|
|
354
|
+
await fs.writeFile(this.settingsPath, JSON.stringify(this.desktopSettings, null, 2), 'utf8');
|
|
355
|
+
this.onChange?.();
|
|
356
|
+
}
|
|
357
|
+
|
|
358
|
+
async updateDesktopSetting(key, value) {
|
|
359
|
+
if (!Object.prototype.hasOwnProperty.call(this.desktopSettings, key)) {
|
|
360
|
+
throw new Error(`Unknown desktop setting: ${key}`);
|
|
361
|
+
}
|
|
362
|
+
|
|
363
|
+
const wasExposeSetting = key === 'exposeLocalServerOnNetwork';
|
|
364
|
+
const wasLocalRunning = Boolean(this.localServerUrl);
|
|
365
|
+
const nextValue = key === 'themeMode' ? value : Boolean(value);
|
|
366
|
+
await this.saveDesktopSettings({ ...this.desktopSettings, [key]: nextValue });
|
|
367
|
+
|
|
368
|
+
return {
|
|
369
|
+
desktopSettings: this.desktopSettings,
|
|
370
|
+
requiresRestartNotice: wasExposeSetting && wasLocalRunning,
|
|
371
|
+
};
|
|
372
|
+
}
|
|
373
|
+
|
|
374
|
+
/** Resolves the local server entry, installing the matching runtime if needed. */
|
|
375
|
+
async resolveServerEntry() {
|
|
376
|
+
if (process.env.ELECTRON_SERVER_ENTRY) {
|
|
377
|
+
return process.env.ELECTRON_SERVER_ENTRY;
|
|
378
|
+
}
|
|
379
|
+
|
|
380
|
+
const bundledEntry = path.join(this.appRoot, 'dist-server', 'server', 'index.js');
|
|
381
|
+
if (process.env.CLOUDCLI_USE_INSTALLED_SERVER !== '1' && await pathExists(bundledEntry)) {
|
|
382
|
+
return bundledEntry;
|
|
383
|
+
}
|
|
384
|
+
|
|
385
|
+
if (!this.appVersion) {
|
|
386
|
+
throw new Error('Cannot install local server: app version is unknown.');
|
|
387
|
+
}
|
|
388
|
+
const bundleConfig = await readServerBundleConfig(this.appRoot);
|
|
389
|
+
const installer = new ServerInstaller({
|
|
390
|
+
version: this.appVersion,
|
|
391
|
+
bundleReleaseTag: bundleConfig.releaseTag,
|
|
392
|
+
onLog: (line) => this.appendStartupLog(line),
|
|
393
|
+
});
|
|
394
|
+
return installer.ensureInstalled();
|
|
395
|
+
}
|
|
396
|
+
|
|
397
|
+
startBundledServer(port, serverEntry) {
|
|
398
|
+
const bindHost = this.getServerBindHost();
|
|
399
|
+
const runtime = getNodeRuntime(this.isPackaged);
|
|
400
|
+
const serverCwd = getServerCwd(this.appRoot, serverEntry);
|
|
401
|
+
|
|
402
|
+
const command = `${runtime.command} ${serverEntry}`;
|
|
403
|
+
this.appendStartupLog(`$ ${command}`);
|
|
404
|
+
this.appendStartupLog(`runtime: ${runtime.label}`);
|
|
405
|
+
this.appendStartupLog(`cwd: ${serverCwd}`);
|
|
406
|
+
this.appendStartupLog(`HOST=${bindHost} SERVER_PORT=${port} NODE_ENV=production`);
|
|
407
|
+
|
|
408
|
+
this.ownedServerProcess = spawn(runtime.command, [serverEntry], {
|
|
409
|
+
cwd: serverCwd,
|
|
410
|
+
detached: true,
|
|
411
|
+
env: {
|
|
412
|
+
...process.env,
|
|
413
|
+
...runtime.env,
|
|
414
|
+
HOST: bindHost,
|
|
415
|
+
SERVER_PORT: String(port),
|
|
416
|
+
NODE_ENV: 'production',
|
|
417
|
+
PATH: getDesktopPath(),
|
|
418
|
+
},
|
|
419
|
+
stdio: ['ignore', 'pipe', 'pipe'],
|
|
420
|
+
windowsHide: true,
|
|
421
|
+
});
|
|
422
|
+
|
|
423
|
+
this.ownedServerProcess.once('error', (error) => {
|
|
424
|
+
this.appendStartupLog(`failed to start process: ${error.message}`);
|
|
425
|
+
this.ownedServerProcess = null;
|
|
426
|
+
});
|
|
427
|
+
|
|
428
|
+
this.ownedServerProcess.stdout?.on('data', (chunk) => {
|
|
429
|
+
for (const line of String(chunk).split(/\r?\n/)) {
|
|
430
|
+
this.appendStartupLog(line);
|
|
431
|
+
}
|
|
432
|
+
});
|
|
433
|
+
|
|
434
|
+
this.ownedServerProcess.stderr?.on('data', (chunk) => {
|
|
435
|
+
for (const line of String(chunk).split(/\r?\n/)) {
|
|
436
|
+
this.appendStartupLog(`stderr: ${line}`);
|
|
437
|
+
}
|
|
438
|
+
});
|
|
439
|
+
|
|
440
|
+
this.ownedServerProcess.once('exit', (code, signal) => {
|
|
441
|
+
this.appendStartupLog(`process exited with code ${code ?? 'null'} and signal ${signal ?? 'null'}`);
|
|
442
|
+
if (this.ownedServerProcess) {
|
|
443
|
+
console.error(`CloudCLI desktop server exited with code ${code ?? 'null'} and signal ${signal ?? 'null'}`);
|
|
444
|
+
}
|
|
445
|
+
this.ownedServerProcess = null;
|
|
446
|
+
});
|
|
447
|
+
}
|
|
448
|
+
|
|
449
|
+
async resolveLocalServerUrl() {
|
|
450
|
+
const defaultUrl = `http://${HOST}:${DEFAULT_PORT}`;
|
|
451
|
+
const defaultDisplayUrl = `http://${DISPLAY_HOST}:${DEFAULT_PORT}`;
|
|
452
|
+
const devUrl = process.env.ELECTRON_DEV_URL;
|
|
453
|
+
const forceOwnServer = process.env.ELECTRON_FORCE_OWN_SERVER === '1';
|
|
454
|
+
|
|
455
|
+
if (devUrl) {
|
|
456
|
+
const ready = await waitForCloudCliServer(defaultUrl, SERVER_START_TIMEOUT_MS);
|
|
457
|
+
if (!ready) {
|
|
458
|
+
throw new Error(`Development backend did not become ready at ${defaultDisplayUrl}`);
|
|
459
|
+
}
|
|
460
|
+
this.localServerPort = DEFAULT_PORT;
|
|
461
|
+
return devUrl;
|
|
462
|
+
}
|
|
463
|
+
|
|
464
|
+
if (!forceOwnServer) {
|
|
465
|
+
const candidateUrls = await getExistingServerCandidateUrls(defaultUrl);
|
|
466
|
+
for (const candidateUrl of candidateUrls) {
|
|
467
|
+
if (await isCloudCliServer(candidateUrl)) {
|
|
468
|
+
const displayUrl = getDisplayUrl(candidateUrl);
|
|
469
|
+
this.localServerPort = getPortFromUrl(candidateUrl);
|
|
470
|
+
this.appendStartupLog(`Using existing Local CloudCLI at ${displayUrl}`);
|
|
471
|
+
return displayUrl;
|
|
472
|
+
}
|
|
473
|
+
}
|
|
474
|
+
}
|
|
475
|
+
|
|
476
|
+
const serverEntry = await this.resolveServerEntry();
|
|
477
|
+
|
|
478
|
+
const port = await chooseServerPort(this.getServerBindHost());
|
|
479
|
+
const serverUrl = `http://${HOST}:${port}`;
|
|
480
|
+
const displayUrl = `http://${DISPLAY_HOST}:${port}`;
|
|
481
|
+
this.localServerPort = port;
|
|
482
|
+
this.startBundledServer(port, serverEntry);
|
|
483
|
+
|
|
484
|
+
const ready = await waitForCloudCliServer(serverUrl, SERVER_START_TIMEOUT_MS);
|
|
485
|
+
if (!ready) {
|
|
486
|
+
const recentLogs = this.getStartupLogs().slice(-20).join('\n');
|
|
487
|
+
await this.shutdownOwnedServer();
|
|
488
|
+
this.localServerPort = null;
|
|
489
|
+
throw new Error([
|
|
490
|
+
`Bundled backend did not become ready at ${displayUrl}.`,
|
|
491
|
+
recentLogs ? `Recent startup output:\n${recentLogs}` : 'No startup output was captured.',
|
|
492
|
+
].join('\n\n'));
|
|
493
|
+
}
|
|
494
|
+
|
|
495
|
+
this.appendStartupLog(`Local CloudCLI ready at ${displayUrl}`);
|
|
496
|
+
this.localServerUrl = displayUrl;
|
|
497
|
+
return displayUrl;
|
|
498
|
+
}
|
|
499
|
+
|
|
500
|
+
async ensureLocalServer() {
|
|
501
|
+
if (!this.localServerUrl) {
|
|
502
|
+
this.localServerUrl = await this.resolveLocalServerUrl();
|
|
503
|
+
}
|
|
504
|
+
return this.localServerUrl;
|
|
505
|
+
}
|
|
506
|
+
|
|
507
|
+
async getResolvedTarget() {
|
|
508
|
+
await this.ensureLocalServer();
|
|
509
|
+
return {
|
|
510
|
+
kind: 'local',
|
|
511
|
+
name: 'Local CloudCLI',
|
|
512
|
+
url: this.localServerUrl,
|
|
513
|
+
};
|
|
514
|
+
}
|
|
515
|
+
|
|
516
|
+
async loadLocalTarget() {
|
|
517
|
+
return {
|
|
518
|
+
pendingTarget: this.getPendingTarget(),
|
|
519
|
+
target: await this.getResolvedTarget(),
|
|
520
|
+
};
|
|
521
|
+
}
|
|
522
|
+
|
|
523
|
+
hasOwnedServer() {
|
|
524
|
+
return Boolean(this.ownedServerProcess);
|
|
525
|
+
}
|
|
526
|
+
|
|
527
|
+
detachOwnedServer() {
|
|
528
|
+
if (!this.ownedServerProcess) return;
|
|
529
|
+
this.ownedServerProcess.unref();
|
|
530
|
+
this.ownedServerProcess = null;
|
|
531
|
+
}
|
|
532
|
+
|
|
533
|
+
async shutdownOwnedServer() {
|
|
534
|
+
if (!this.ownedServerProcess) return;
|
|
535
|
+
|
|
536
|
+
const child = this.ownedServerProcess;
|
|
537
|
+
this.ownedServerProcess = null;
|
|
538
|
+
child.kill('SIGTERM');
|
|
539
|
+
|
|
540
|
+
await new Promise((resolve) => {
|
|
541
|
+
const timeout = setTimeout(resolve, 3000);
|
|
542
|
+
child.once('exit', () => {
|
|
543
|
+
clearTimeout(timeout);
|
|
544
|
+
resolve();
|
|
545
|
+
});
|
|
546
|
+
});
|
|
547
|
+
}
|
|
548
|
+
}
|
|
549
|
+
|
|
550
|
+
export { DEFAULT_PORT, HOST };
|