cicy-desktop 2.1.72 → 2.1.74
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/package.json +1 -1
- package/src/backends/homepage-preload.js +6 -2
- package/src/backends/homepage-window.js +4 -1
- package/src/backends/local-teams.js +59 -1
- package/src/backends/sidecar-ipc.js +3 -0
- package/src/sidecar/cicy-code.js +19 -0
- package/src/sidecar/localbin.js +198 -63
- package/src/utils/window-monitor.js +15 -9
- package/workers/render/src/App.css +4 -0
- package/workers/render/src/App.jsx +9 -6
package/package.json
CHANGED
|
@@ -24,13 +24,17 @@ const { contextBridge, ipcRenderer, shell } = require("electron");
|
|
|
24
24
|
// args, and the reply (or error) to the console. Skip noisy channels that
|
|
25
25
|
// fire on every render tick to avoid drowning the console.
|
|
26
26
|
const __noisy = new Set(["backends:list", "backends:health-all"]);
|
|
27
|
+
// Per-IPC call/reply tracing floods the console on every render tick and is
|
|
28
|
+
// pure debug noise for someone just running `npx cicy-desktop`. Off by default;
|
|
29
|
+
// set CICY_DEBUG=1 to restore it. Errors are always logged.
|
|
30
|
+
const __verbose = !!(process.env.CICY_DEBUG || process.env.CICY_VERBOSE);
|
|
27
31
|
let __ipcSeq = 0;
|
|
28
32
|
function logInvoke(channel, ...args) {
|
|
29
33
|
const id = ++__ipcSeq;
|
|
30
34
|
const noisy = __noisy.has(channel);
|
|
31
|
-
if (!noisy) console.log(`[ipc#${id}] call`, channel, ...args);
|
|
35
|
+
if (__verbose && !noisy) console.log(`[ipc#${id}] call`, channel, ...args);
|
|
32
36
|
return ipcRenderer.invoke(channel, ...args).then(
|
|
33
|
-
(res) => { if (!noisy) console.log(`[ipc#${id}] reply`, channel, res); return res; },
|
|
37
|
+
(res) => { if (__verbose && !noisy) console.log(`[ipc#${id}] reply`, channel, res); return res; },
|
|
34
38
|
(err) => { console.error(`[ipc#${id}] error`, channel, err); throw err; },
|
|
35
39
|
);
|
|
36
40
|
}
|
|
@@ -72,8 +72,11 @@ async function openHomepage() {
|
|
|
72
72
|
|
|
73
73
|
// Pipe renderer console + load failures to main-process stdout so we can
|
|
74
74
|
// diagnose blank-page bugs from logs without opening DevTools.
|
|
75
|
+
const __verbose = !!(process.env.CICY_DEBUG || process.env.CICY_VERBOSE);
|
|
75
76
|
homepage.webContents.on("console-message", (_e, level, msg, line, source) => {
|
|
76
|
-
|
|
77
|
+
// Warnings/errors (level>=2) always surface — they're what diagnose a blank
|
|
78
|
+
// page. The chatty info stream only with CICY_DEBUG.
|
|
79
|
+
if (level >= 2 || (__verbose && level >= 1)) console.log(`[homepage:console L${line}] ${msg} (${source})`);
|
|
77
80
|
});
|
|
78
81
|
// Log load failures (corrupt/missing install) — no remote fallback by
|
|
79
82
|
// design: the homepage is the bundled SPA, full stop.
|
|
@@ -258,6 +258,20 @@ async function openTeam(id) {
|
|
|
258
258
|
return { ok: true, windowId: existing.id, reused: true };
|
|
259
259
|
}
|
|
260
260
|
|
|
261
|
+
// No window yet. Before opening one against a LOCAL sidecar, make sure the
|
|
262
|
+
// daemon is REALLY up (TCP 探活) — opening a window at a not-yet-ready :8008
|
|
263
|
+
// loads a blank page the user has to manually reload (主人 bug). Start it if
|
|
264
|
+
// it isn't running, then poll until it answers; bail (no blank window) if it
|
|
265
|
+
// never comes up. Remote/custom (non-localhost) teams skip this — their page
|
|
266
|
+
// shows its own connecting/login UI.
|
|
267
|
+
if (isLocalOrigin(url)) {
|
|
268
|
+
const ready = await ensureLocalSidecarAlive(url);
|
|
269
|
+
if (!ready) {
|
|
270
|
+
log.warn(`[local-teams] open ${id} → local sidecar not ready, not opening blank window`);
|
|
271
|
+
return { ok: false, error: "sidecar_not_ready" };
|
|
272
|
+
}
|
|
273
|
+
}
|
|
274
|
+
|
|
261
275
|
const { createWindow } = require("../utils/window-utils");
|
|
262
276
|
const win = createWindow(
|
|
263
277
|
{ url, title: `Local · ${node.name || id}` },
|
|
@@ -268,6 +282,31 @@ async function openTeam(id) {
|
|
|
268
282
|
return { ok: true, windowId: win.id, reused: false };
|
|
269
283
|
}
|
|
270
284
|
|
|
285
|
+
// Is this URL served by something on the local machine (the cicy-code sidecar)?
|
|
286
|
+
function isLocalOrigin(url) {
|
|
287
|
+
try { const h = new URL(url).hostname; return h === "127.0.0.1" || h === "localhost" || h === "::1"; }
|
|
288
|
+
catch { return false; }
|
|
289
|
+
}
|
|
290
|
+
|
|
291
|
+
// Ensure the local cicy-code daemon serving `url` actually answers before we
|
|
292
|
+
// open a window at it. Already up → true immediately. Down → start it, then
|
|
293
|
+
// poll a TCP probe (NOT /api/health, which is unreliable mid-boot) until it
|
|
294
|
+
// binds or we time out.
|
|
295
|
+
async function ensureLocalSidecarAlive(url, { timeoutMs = 15000 } = {}) {
|
|
296
|
+
let port;
|
|
297
|
+
try { port = Number(new URL(url).port) || 8008; } catch { return true; } // unparseable → don't block
|
|
298
|
+
let sidecar;
|
|
299
|
+
try { sidecar = require("../sidecar/cicy-code"); } catch { return true; }
|
|
300
|
+
if (await sidecar.probeExisting(port)) return true; // already answering
|
|
301
|
+
try { await sidecar.start({ port }); } catch {} // not up → bring it up
|
|
302
|
+
const t0 = Date.now();
|
|
303
|
+
while (Date.now() - t0 < timeoutMs) {
|
|
304
|
+
if (await sidecar.probeExisting(port)) return true;
|
|
305
|
+
await new Promise((r) => setTimeout(r, 300));
|
|
306
|
+
}
|
|
307
|
+
return false;
|
|
308
|
+
}
|
|
309
|
+
|
|
271
310
|
function stripVolatile(u) {
|
|
272
311
|
try {
|
|
273
312
|
const p = new URL(u);
|
|
@@ -303,6 +342,25 @@ function reloadTeam(id) {
|
|
|
303
342
|
}
|
|
304
343
|
}
|
|
305
344
|
|
|
345
|
+
// Close any open window served by the local sidecar (origin
|
|
346
|
+
// http://127.0.0.1:<port> or http://localhost:<port>). Called when the sidecar
|
|
347
|
+
// is STOPPED so a now-dead :8008 team window doesn't linger showing a broken
|
|
348
|
+
// page (主人 bug report: stop 后应关掉 localhost 的 window).
|
|
349
|
+
function closeLocalWindows(port = 8008) {
|
|
350
|
+
const origins = new Set([`http://127.0.0.1:${port}`, `http://localhost:${port}`]);
|
|
351
|
+
let closed = 0;
|
|
352
|
+
for (const w of BrowserWindow.getAllWindows()) {
|
|
353
|
+
if (!w || w.isDestroyed()) continue;
|
|
354
|
+
let origin = "";
|
|
355
|
+
try { origin = new URL(w.webContents.getURL()).origin; } catch { continue; }
|
|
356
|
+
if (origins.has(origin)) {
|
|
357
|
+
try { w.close(); closed++; } catch {}
|
|
358
|
+
}
|
|
359
|
+
}
|
|
360
|
+
if (closed) log.info(`[local-teams] closed ${closed} local window(s) on :${port} after stop`);
|
|
361
|
+
return closed;
|
|
362
|
+
}
|
|
363
|
+
|
|
306
364
|
// ── mutations ──────────────────────────────────────────────────────────
|
|
307
365
|
//
|
|
308
366
|
// add/remove/upgrade let an external caller (currently the cloud Team
|
|
@@ -737,4 +795,4 @@ async function upgradeTeam(id) {
|
|
|
737
795
|
return result;
|
|
738
796
|
}
|
|
739
797
|
|
|
740
|
-
module.exports = { list, openTeam, reloadTeam, addTeam, removeTeam, updateTeam, upgradeTeam };
|
|
798
|
+
module.exports = { list, openTeam, reloadTeam, closeLocalWindows, addTeam, removeTeam, updateTeam, upgradeTeam };
|
|
@@ -92,6 +92,9 @@ function register({ sidecarLogPath } = {}) {
|
|
|
92
92
|
ipcMain.handle("sidecar:stop", async () => {
|
|
93
93
|
try {
|
|
94
94
|
await sidecar.stop();
|
|
95
|
+
// The daemon is gone — close any open team window pointing at it so the
|
|
96
|
+
// user isn't left staring at a dead :8008 page (主人 bug report).
|
|
97
|
+
try { require("./local-teams").closeLocalWindows(PORT); } catch {}
|
|
95
98
|
return { ok: true };
|
|
96
99
|
} catch (e) {
|
|
97
100
|
return { ok: false, error: e.message };
|
package/src/sidecar/cicy-code.js
CHANGED
|
@@ -112,9 +112,22 @@ async function start({ logPath, port = DEFAULT_PORT, force = false, version = nu
|
|
|
112
112
|
if (!exe) {
|
|
113
113
|
try { exe = (await localbin.ensure({ version }))?.exe; }
|
|
114
114
|
catch (e) { console.warn(`[cicy-code-sidecar] localbin ensure failed: ${e.message}`); }
|
|
115
|
+
} else {
|
|
116
|
+
// Present — let ensure() do a zero-network bundle upgrade if cicy-desktop
|
|
117
|
+
// itself was updated and now ships a newer cicy-code (版本高了就更新).
|
|
118
|
+
try { await localbin.ensure({ version }); } catch {}
|
|
115
119
|
}
|
|
116
120
|
if (!exe) { console.warn("[cicy-code-sidecar] no cicy-code binary available"); return null; }
|
|
117
121
|
|
|
122
|
+
// cicy-desktop ALSO owns the mihomo binary (same npm/localbin model). Seed it
|
|
123
|
+
// into ~/.local/bin/mihomo from the bundle (zero network) BEFORE the cicy-code
|
|
124
|
+
// daemon boots, so cicy-code's own startup finds it already present and skips
|
|
125
|
+
// its GitHub/COS download. Best-effort — never block cicy-code on it.
|
|
126
|
+
try {
|
|
127
|
+
const r = await localbin.ensure({ name: "mihomo" });
|
|
128
|
+
if (r?.exe) console.log(`[cicy-code-sidecar] mihomo ready at ${r.exe} (v${r.version || "?"})`);
|
|
129
|
+
} catch (e) { console.warn(`[cicy-code-sidecar] mihomo seed skipped: ${e.message}`); }
|
|
130
|
+
|
|
118
131
|
let stdio = ["ignore", "ignore", "ignore"];
|
|
119
132
|
if (logPath) {
|
|
120
133
|
fs.mkdirSync(path.dirname(logPath), { recursive: true });
|
|
@@ -248,8 +261,14 @@ async function update({ logPath, port = DEFAULT_PORT, emit } = {}) {
|
|
|
248
261
|
const localbin = require("./localbin");
|
|
249
262
|
try {
|
|
250
263
|
e({ phase: "download", status: "running", message: "检查最新版本…" });
|
|
264
|
+
const cur = localbin.currentVersion();
|
|
251
265
|
const latest = await localbin.latestVersion();
|
|
252
266
|
if (!latest) throw new Error("无法获取最新版本号");
|
|
267
|
+
if (cur && localbin.cmpVer(latest, cur) <= 0) {
|
|
268
|
+
// Already current — no download, no restart (不重复下载/更新).
|
|
269
|
+
e({ phase: "done", status: "done", message: `已是最新 ${cur}` });
|
|
270
|
+
return null;
|
|
271
|
+
}
|
|
253
272
|
await localbin.fetchToLocalBin(latest, { emit }); // download → ~/.local/bin → re-link
|
|
254
273
|
e({ phase: "swap", status: "running", message: `切换到 ${latest},启动…` });
|
|
255
274
|
await stop({ port });
|
package/src/sidecar/localbin.js
CHANGED
|
@@ -1,35 +1,120 @@
|
|
|
1
|
-
// ~/.local/bin install model for the cicy-
|
|
1
|
+
// ~/.local/bin install model for the binaries cicy-desktop OWNS.
|
|
2
2
|
//
|
|
3
|
-
// 主人指令 (2026-06): cicy-desktop OWNS
|
|
4
|
-
//
|
|
5
|
-
//
|
|
6
|
-
// ~/.local/bin/cicy-code
|
|
7
|
-
//
|
|
8
|
-
//
|
|
9
|
-
//
|
|
3
|
+
// 主人指令 (2026-06): cicy-desktop OWNS its runtime binaries and distributes
|
|
4
|
+
// them THROUGH npm — one channel for everything. Today that's two components:
|
|
5
|
+
//
|
|
6
|
+
// cicy-code ← npm cicy-code-<plat> → ~/.local/bin/cicy-code
|
|
7
|
+
// mihomo ← npm cicy-mihomo-<plat> → ~/.local/bin/mihomo
|
|
8
|
+
//
|
|
9
|
+
// Each is bundled per-platform as an optionalDependency of cicy-desktop. On
|
|
10
|
+
// first run we copy the bundled, version-named binary into
|
|
11
|
+
// ~/.local/bin/<base>-<ver>-<plat> and point ~/.local/bin/<base> at it
|
|
12
|
+
// (symlink on mac/linux; a plain COPY on Windows — symlink/junction perms there
|
|
13
|
+
// are a minefield). The binary is ALWAYS run from that stable ~/.local/bin path
|
|
14
|
+
// — never `npx`, which would reuse a stale globally-installed copy and shadow
|
|
15
|
+
// updates.
|
|
16
|
+
//
|
|
17
|
+
// Semantics (主人指令): 有就不装、没有就装、版本高了就更新、不重复下载/更新.
|
|
18
|
+
// - present & current → reuse, no work, no network
|
|
19
|
+
// - absent → seed from the bundle (zero network)
|
|
20
|
+
// - bundle newer than link → re-seed from the bundle (zero network upgrade,
|
|
21
|
+
// e.g. after cicy-desktop itself updated)
|
|
22
|
+
// - explicit update() → npm `pack` the latest per-platform subpackage,
|
|
23
|
+
// ONLY when the registry is actually ahead.
|
|
10
24
|
//
|
|
11
25
|
// Updates use npm ONLY as a download channel: `npm pack` the per-platform
|
|
12
26
|
// subpackage (sha512-verified), extract the binary, copy it in as a NEW
|
|
13
|
-
// version-named file, then re-point the
|
|
27
|
+
// version-named file, then re-point the link (re-copy on Windows). A version
|
|
28
|
+
// manifest at ~/.local/bin/.cicy-localbin.json records what each link points
|
|
29
|
+
// at, so version checks work cross-platform (including the Windows copy, which
|
|
30
|
+
// has no symlink target to parse).
|
|
14
31
|
|
|
15
32
|
const fs = require("fs");
|
|
16
33
|
const os = require("os");
|
|
17
34
|
const path = require("path");
|
|
18
|
-
const { execFile } = require("child_process");
|
|
35
|
+
const { execFile, execFileSync } = require("child_process");
|
|
19
36
|
|
|
20
37
|
const IS_WIN = process.platform === "win32";
|
|
21
38
|
const REGISTRY = process.env.CICY_NPM_REGISTRY || "https://registry.npmmirror.com";
|
|
22
39
|
const LOCAL_BIN = path.join(os.homedir(), ".local", "bin");
|
|
40
|
+
const MANIFEST = path.join(LOCAL_BIN, ".cicy-localbin.json");
|
|
41
|
+
|
|
42
|
+
// The binaries we own. `pkgPrefix` + platform = the npm subpackage name;
|
|
43
|
+
// `base` is the stable link/file base name. The default component everywhere is
|
|
44
|
+
// cicy-code, so the legacy single-component callers keep working unchanged.
|
|
45
|
+
const COMPONENTS = {
|
|
46
|
+
"cicy-code": { pkgPrefix: "cicy-code", base: "cicy-code" },
|
|
47
|
+
"mihomo": { pkgPrefix: "cicy-mihomo", base: "mihomo" },
|
|
48
|
+
};
|
|
49
|
+
const DEFAULT = "cicy-code";
|
|
50
|
+
function comp(name) {
|
|
51
|
+
const c = COMPONENTS[name || DEFAULT];
|
|
52
|
+
if (!c) throw new Error(`unknown localbin component: ${name}`);
|
|
53
|
+
return c;
|
|
54
|
+
}
|
|
23
55
|
|
|
24
56
|
function plat() {
|
|
25
57
|
const osStr = IS_WIN ? "windows" : process.platform === "darwin" ? "darwin" : "linux";
|
|
26
58
|
const arch = process.arch === "arm64" ? "arm64" : "x64";
|
|
27
59
|
return `${osStr}-${arch}`;
|
|
28
60
|
}
|
|
29
|
-
const
|
|
30
|
-
const
|
|
31
|
-
const
|
|
32
|
-
const
|
|
61
|
+
const pkgFor = (name) => `${comp(name).pkgPrefix}-${plat()}`;
|
|
62
|
+
const binFor = (name) => comp(name).base + (IS_WIN ? ".exe" : "");
|
|
63
|
+
const linkFor = (name) => path.join(LOCAL_BIN, binFor(name));
|
|
64
|
+
const versionedFor = (name, ver) =>
|
|
65
|
+
path.join(LOCAL_BIN, `${comp(name).base}-${ver}-${plat()}${IS_WIN ? ".exe" : ""}`);
|
|
66
|
+
|
|
67
|
+
// Legacy aliases (cicy-code is the default component).
|
|
68
|
+
const BIN = binFor(DEFAULT);
|
|
69
|
+
const LINK = linkFor(DEFAULT);
|
|
70
|
+
const versioned = (ver, name = DEFAULT) => versionedFor(name, ver);
|
|
71
|
+
|
|
72
|
+
// ── version helpers ───────────────────────────────────────────────────────
|
|
73
|
+
// Normalize "v1.10.3" / "1.10.3" → [1,10,3]; compare numerically.
|
|
74
|
+
function parseVer(v) {
|
|
75
|
+
return String(v || "").replace(/^v/i, "").split(/[.\-+]/).map((n) => parseInt(n, 10) || 0);
|
|
76
|
+
}
|
|
77
|
+
function cmpVer(a, b) {
|
|
78
|
+
const pa = parseVer(a), pb = parseVer(b);
|
|
79
|
+
for (let i = 0; i < Math.max(pa.length, pb.length); i++) {
|
|
80
|
+
const d = (pa[i] || 0) - (pb[i] || 0);
|
|
81
|
+
if (d) return d > 0 ? 1 : -1;
|
|
82
|
+
}
|
|
83
|
+
return 0;
|
|
84
|
+
}
|
|
85
|
+
|
|
86
|
+
function readManifest() {
|
|
87
|
+
try { return JSON.parse(fs.readFileSync(MANIFEST, "utf8")) || {}; } catch { return {}; }
|
|
88
|
+
}
|
|
89
|
+
function writeManifest(name, ver) {
|
|
90
|
+
const m = readManifest();
|
|
91
|
+
m[name] = ver;
|
|
92
|
+
try { fs.mkdirSync(LOCAL_BIN, { recursive: true }); fs.writeFileSync(MANIFEST, JSON.stringify(m, null, 2) + "\n"); } catch {}
|
|
93
|
+
}
|
|
94
|
+
|
|
95
|
+
// Best-effort: run the binary to read its version (fallback when the manifest
|
|
96
|
+
// has no record — e.g. a binary installed by the old GitHub/COS path).
|
|
97
|
+
function probeVersion(name) {
|
|
98
|
+
const link = linkFor(name);
|
|
99
|
+
if (!fs.existsSync(link)) return null;
|
|
100
|
+
const flag = name === "mihomo" ? "-v" : "--version";
|
|
101
|
+
try {
|
|
102
|
+
const out = execFileSync(link, [flag], { encoding: "utf8", timeout: 5000, stdio: ["ignore", "pipe", "ignore"] });
|
|
103
|
+
const m = out.match(/\bv?(\d+\.\d+\.\d+)\b/);
|
|
104
|
+
return m ? m[1] : null;
|
|
105
|
+
} catch { return null; }
|
|
106
|
+
}
|
|
107
|
+
|
|
108
|
+
// The version the ~/.local/bin link currently points at: manifest first (fast,
|
|
109
|
+
// cross-platform), else probe the binary, else null.
|
|
110
|
+
function currentVersion(name = DEFAULT) {
|
|
111
|
+
if (!fs.existsSync(linkFor(name))) return null;
|
|
112
|
+
const m = readManifest();
|
|
113
|
+
if (m[name]) return m[name];
|
|
114
|
+
const probed = probeVersion(name);
|
|
115
|
+
if (probed) { writeManifest(name, probed); return probed; }
|
|
116
|
+
return null;
|
|
117
|
+
}
|
|
33
118
|
|
|
34
119
|
function npmExec(args, timeout = 600000) {
|
|
35
120
|
return new Promise((resolve, reject) => {
|
|
@@ -39,95 +124,145 @@ function npmExec(args, timeout = 600000) {
|
|
|
39
124
|
}
|
|
40
125
|
|
|
41
126
|
// Latest published version of the per-platform subpackage.
|
|
42
|
-
async function latestVersion() {
|
|
43
|
-
return (await npmExec(["view",
|
|
127
|
+
async function latestVersion(name = DEFAULT) {
|
|
128
|
+
return (await npmExec(["view", pkgFor(name), "version", `--registry=${REGISTRY}`], 30000)).trim();
|
|
44
129
|
}
|
|
45
130
|
|
|
46
|
-
// Point ~/.local/bin
|
|
47
|
-
//
|
|
48
|
-
function linkTo(verBinPath) {
|
|
131
|
+
// Point ~/.local/bin/<base> at a version-named binary: symlink on POSIX, a plain
|
|
132
|
+
// copy on Windows. Records the version in the manifest.
|
|
133
|
+
function linkTo(name, verBinPath, ver) {
|
|
134
|
+
const link = linkFor(name);
|
|
49
135
|
fs.mkdirSync(LOCAL_BIN, { recursive: true });
|
|
50
|
-
try { fs.rmSync(
|
|
51
|
-
if (IS_WIN)
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
}
|
|
56
|
-
return LINK;
|
|
136
|
+
try { fs.rmSync(link, { force: true }); } catch {}
|
|
137
|
+
if (IS_WIN) fs.copyFileSync(verBinPath, link);
|
|
138
|
+
else fs.symlinkSync(verBinPath, link);
|
|
139
|
+
if (ver) writeManifest(name, ver);
|
|
140
|
+
return link;
|
|
57
141
|
}
|
|
58
142
|
|
|
59
|
-
function placeBinary(srcBin, ver) {
|
|
143
|
+
function placeBinary(name, srcBin, ver) {
|
|
60
144
|
if (!fs.existsSync(srcBin)) throw new Error(`source binary missing: ${srcBin}`);
|
|
61
145
|
fs.mkdirSync(LOCAL_BIN, { recursive: true });
|
|
62
|
-
const dst =
|
|
146
|
+
const dst = versionedFor(name, ver);
|
|
63
147
|
fs.copyFileSync(srcBin, dst);
|
|
64
148
|
if (!IS_WIN) fs.chmodSync(dst, 0o755);
|
|
65
|
-
linkTo(dst);
|
|
66
|
-
return { exe:
|
|
149
|
+
linkTo(name, dst, ver);
|
|
150
|
+
return { exe: linkFor(name), target: dst, version: ver };
|
|
67
151
|
}
|
|
68
152
|
|
|
69
153
|
// The bundled per-platform subpackage shipped inside cicy-desktop (zero network).
|
|
70
|
-
function bundledPkgDir() {
|
|
154
|
+
function bundledPkgDir(name) {
|
|
155
|
+
const pkg = pkgFor(name);
|
|
71
156
|
const candidates = [
|
|
72
|
-
path.join(__dirname, "..", "..", "node_modules",
|
|
73
|
-
path.join(process.resourcesPath || "", "runtime-pkgs",
|
|
157
|
+
path.join(__dirname, "..", "..", "node_modules", pkg), // npm install layout
|
|
158
|
+
path.join(process.resourcesPath || "", "runtime-pkgs", pkg), // packaged (NSIS/dmg) layout
|
|
74
159
|
];
|
|
75
160
|
for (const p of candidates) {
|
|
76
161
|
try { if (fs.existsSync(path.join(p, "package.json"))) return p; } catch {}
|
|
77
162
|
}
|
|
78
163
|
return null;
|
|
79
164
|
}
|
|
165
|
+
function bundledVersion(name) {
|
|
166
|
+
const dir = bundledPkgDir(name);
|
|
167
|
+
if (!dir) return null;
|
|
168
|
+
try { return JSON.parse(fs.readFileSync(path.join(dir, "package.json"), "utf8")).version || null; } catch { return null; }
|
|
169
|
+
}
|
|
80
170
|
|
|
81
|
-
// Install the binary from the bundled subpackage
|
|
82
|
-
|
|
83
|
-
|
|
171
|
+
// Install/upgrade the binary from the bundled subpackage (zero network). Returns
|
|
172
|
+
// {exe,version} or null when not bundled. Reuses the existing link when it is
|
|
173
|
+
// already at the bundle version or newer (有就不装).
|
|
174
|
+
function fromBundle(name = DEFAULT) {
|
|
175
|
+
const dir = bundledPkgDir(name);
|
|
84
176
|
if (!dir) return null;
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
const src = path.join(dir,
|
|
177
|
+
const ver = bundledVersion(name);
|
|
178
|
+
if (!ver) return null;
|
|
179
|
+
const src = path.join(dir, binFor(name));
|
|
88
180
|
if (!fs.existsSync(src)) return null;
|
|
89
|
-
|
|
90
|
-
|
|
181
|
+
const cur = currentVersion(name);
|
|
182
|
+
if (cur && currentLink(name) && cmpVer(cur, ver) >= 0) return { exe: linkFor(name), version: cur };
|
|
183
|
+
if (fs.existsSync(versionedFor(name, ver))) { linkTo(name, versionedFor(name, ver), ver); return { exe: linkFor(name), version: ver }; }
|
|
184
|
+
return placeBinary(name, src, ver);
|
|
91
185
|
}
|
|
92
186
|
|
|
93
187
|
// Download <pkg>@<ver> via `npm pack` and install it into ~/.local/bin. npm is
|
|
94
188
|
// ONLY the download channel — we copy the binary out and run it from ~/.local/bin.
|
|
95
|
-
|
|
189
|
+
// No-op download when that version is already on disk (不重复下载).
|
|
190
|
+
async function fetchToLocalBin(ver, { emit, name = DEFAULT } = {}) {
|
|
96
191
|
const e = emit || (() => {});
|
|
97
|
-
if (fs.existsSync(
|
|
98
|
-
const
|
|
192
|
+
if (fs.existsSync(versionedFor(name, ver))) { linkTo(name, versionedFor(name, ver), ver); return { exe: linkFor(name), version: ver }; }
|
|
193
|
+
const label = comp(name).base;
|
|
194
|
+
const tmp = fs.mkdtempSync(path.join(os.tmpdir(), "cicy-lb-"));
|
|
99
195
|
try {
|
|
100
|
-
e({ phase: "download", status: "running", message: `下载
|
|
101
|
-
const out = await npmExec(["pack", `${
|
|
196
|
+
e({ phase: "download", status: "running", message: `下载 ${label} ${ver}…` });
|
|
197
|
+
const out = await npmExec(["pack", `${pkgFor(name)}@${ver}`, `--registry=${REGISTRY}`, "--pack-destination", tmp]);
|
|
102
198
|
const tgz = path.join(tmp, out.trim().split("\n").pop().trim());
|
|
103
199
|
await new Promise((resolve, reject) =>
|
|
104
200
|
execFile("tar", ["-xzf", tgz, "-C", tmp], { windowsHide: true, timeout: 120000 }, (err) => (err ? reject(err) : resolve())));
|
|
105
|
-
const res = placeBinary(path.join(tmp, "package",
|
|
106
|
-
e({ phase: "download", status: "done", message:
|
|
201
|
+
const res = placeBinary(name, path.join(tmp, "package", binFor(name)), ver);
|
|
202
|
+
e({ phase: "download", status: "done", message: `${label} ${ver} 就绪` });
|
|
107
203
|
return res;
|
|
108
204
|
} finally {
|
|
109
205
|
fs.rmSync(tmp, { recursive: true, force: true });
|
|
110
206
|
}
|
|
111
207
|
}
|
|
112
208
|
|
|
113
|
-
// ~/.local/bin
|
|
114
|
-
function currentLink() {
|
|
115
|
-
return fs.existsSync(
|
|
209
|
+
// ~/.local/bin/<base>, if it exists.
|
|
210
|
+
function currentLink(name = DEFAULT) {
|
|
211
|
+
return fs.existsSync(linkFor(name)) ? linkFor(name) : null;
|
|
116
212
|
}
|
|
117
213
|
|
|
118
|
-
// Ensure ~/.local/bin
|
|
119
|
-
//
|
|
120
|
-
// -
|
|
121
|
-
// -
|
|
122
|
-
|
|
123
|
-
|
|
214
|
+
// Ensure ~/.local/bin/<base> exists and points at a usable binary, version-aware
|
|
215
|
+
// and network-frugal:
|
|
216
|
+
// - present & no newer bundle → reuse as-is (有就不装, zero network)
|
|
217
|
+
// - present & bundle is newer → re-seed from the bundle (zero network upgrade)
|
|
218
|
+
// - pinned version → reuse if already that version, else fetch it
|
|
219
|
+
// - absent → seed from the bundle, else fetch latest from npm
|
|
220
|
+
async function ensure({ name = DEFAULT, version = null, force = false, emit = null } = {}) {
|
|
124
221
|
const pin = version && version !== "latest" ? version : null;
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
222
|
+
|
|
223
|
+
if (pin) {
|
|
224
|
+
const cur = currentVersion(name);
|
|
225
|
+
if (!force && cur && cmpVer(cur, pin) === 0) return { exe: linkFor(name), version: cur };
|
|
226
|
+
if (fs.existsSync(versionedFor(name, pin))) { linkTo(name, versionedFor(name, pin), pin); return { exe: linkFor(name), version: pin }; }
|
|
227
|
+
return fetchToLocalBin(pin, { emit, name });
|
|
228
|
+
}
|
|
229
|
+
|
|
230
|
+
if (!force && currentLink(name)) {
|
|
231
|
+
// Present — only touch it if the bundle ships something newer (zero network).
|
|
232
|
+
const cur = currentVersion(name);
|
|
233
|
+
const bv = bundledVersion(name);
|
|
234
|
+
if (bv && (!cur || cmpVer(bv, cur) > 0)) {
|
|
235
|
+
const b = fromBundle(name);
|
|
236
|
+
if (b) return b;
|
|
237
|
+
}
|
|
238
|
+
return { exe: linkFor(name), version: cur };
|
|
239
|
+
}
|
|
240
|
+
|
|
241
|
+
// Absent (or forced): prefer the zero-network bundle seed, else npm latest.
|
|
242
|
+
const b = fromBundle(name);
|
|
243
|
+
if (b) return b;
|
|
244
|
+
const ver = await latestVersion(name);
|
|
245
|
+
return fetchToLocalBin(ver, { emit, name });
|
|
246
|
+
}
|
|
247
|
+
|
|
248
|
+
// On-demand update from the registry (the 更新 button). Fetches the latest only
|
|
249
|
+
// when the registry is actually ahead of what's installed (不重复下载/更新).
|
|
250
|
+
async function update({ name = DEFAULT, emit } = {}) {
|
|
251
|
+
const e = emit || (() => {});
|
|
252
|
+
const cur = currentVersion(name);
|
|
253
|
+
const latest = await latestVersion(name);
|
|
254
|
+
if (!latest) throw new Error("无法获取最新版本号");
|
|
255
|
+
if (cur && cmpVer(latest, cur) <= 0) {
|
|
256
|
+
e({ phase: "done", status: "done", message: `已是最新 ${cur}` });
|
|
257
|
+
return { exe: linkFor(name), version: cur, updated: false };
|
|
128
258
|
}
|
|
129
|
-
const
|
|
130
|
-
return
|
|
259
|
+
const res = await fetchToLocalBin(latest, { emit, name });
|
|
260
|
+
return { ...res, updated: true };
|
|
131
261
|
}
|
|
132
262
|
|
|
133
|
-
module.exports = {
|
|
263
|
+
module.exports = {
|
|
264
|
+
LOCAL_BIN, LINK, BIN, COMPONENTS, plat,
|
|
265
|
+
pkgFor, binFor, linkFor, versionedFor, versioned,
|
|
266
|
+
cmpVer, currentVersion, latestVersion,
|
|
267
|
+
fromBundle, bundledVersion, fetchToLocalBin, currentLink, ensure, update,
|
|
268
|
+
};
|
|
@@ -331,15 +331,21 @@ function initWindowMonitoring(win) {
|
|
|
331
331
|
const logs = windowLogs.get(winId);
|
|
332
332
|
|
|
333
333
|
const counters = windowIndexCounters.get(winId);
|
|
334
|
-
log
|
|
335
|
-
|
|
336
|
-
|
|
337
|
-
|
|
338
|
-
|
|
339
|
-
|
|
340
|
-
|
|
341
|
-
|
|
342
|
-
|
|
334
|
+
// Mirror EVERY renderer console line into the main log only with CICY_DEBUG;
|
|
335
|
+
// by default forward warnings/errors (level>=2) so normal startup stays quiet
|
|
336
|
+
// but real problems still surface. The in-memory log store below is unaffected
|
|
337
|
+
// (the log-viewer API still sees everything).
|
|
338
|
+
if (level >= 2 || process.env.CICY_DEBUG || process.env.CICY_VERBOSE) {
|
|
339
|
+
log.info(
|
|
340
|
+
`[${JSON.stringify({
|
|
341
|
+
timestamp: Date.now(),
|
|
342
|
+
level: ["verbose", "info", "warning", "error"][level] || "log",
|
|
343
|
+
message,
|
|
344
|
+
line,
|
|
345
|
+
source: sourceId,
|
|
346
|
+
})}`
|
|
347
|
+
);
|
|
348
|
+
}
|
|
343
349
|
if (logs && counters) {
|
|
344
350
|
logs.push({
|
|
345
351
|
index: ++counters.log,
|
|
@@ -927,6 +927,10 @@ body {
|
|
|
927
927
|
|
|
928
928
|
/* 首启门控条款页 (合规第一道整体同意) */
|
|
929
929
|
.terms-gate { display: flex; align-items: center; justify-content: center; padding: 24px; }
|
|
930
|
+
/* .shell sets -webkit-app-region: drag; only .shell--app un-drags itself. The
|
|
931
|
+
terms gate / splash screens are bare .shell, so without this the whole panel
|
|
932
|
+
is a window-drag region and its buttons can't be clicked. */
|
|
933
|
+
.terms-gate__panel, .terms-gate__panel * { -webkit-app-region: no-drag; }
|
|
930
934
|
.terms-gate__panel {
|
|
931
935
|
position: relative; z-index: 1; width: min(680px, 94vw); max-height: 90vh;
|
|
932
936
|
display: flex; flex-direction: column;
|
|
@@ -568,7 +568,7 @@ export default function App() {
|
|
|
568
568
|
))}
|
|
569
569
|
</div>
|
|
570
570
|
|
|
571
|
-
{
|
|
571
|
+
{/* Docker 安装卡已下线 (主人令): Windows 走原生 cicy-code.exe --helper,不再用 Docker。 */}
|
|
572
572
|
{showLocal && localList.length > 0 && <MitmConsentCard team={localList[0]} />}
|
|
573
573
|
|
|
574
574
|
{profileError && (
|
|
@@ -1061,10 +1061,13 @@ function LocalTeamCard({ team, onOpen, onRename, onRefresh }) {
|
|
|
1061
1061
|
};
|
|
1062
1062
|
const BUSY_LABEL = { start: "启动中…", restart: "重启中…", update: "更新中…", stop: "停止中…" };
|
|
1063
1063
|
|
|
1064
|
-
// 打开
|
|
1065
|
-
//
|
|
1066
|
-
//
|
|
1067
|
-
// and
|
|
1064
|
+
// 打开 flow (主人 spec): start the LOCAL daemon if it's down (with a 启动中…
|
|
1065
|
+
// toast), then open. The window itself is opened by openTeam() in main, which
|
|
1066
|
+
// (1) reuses an already-open window for this team (list_windows check first),
|
|
1067
|
+
// and (2) for a local team, TCP-探活 until :8008 actually answers before
|
|
1068
|
+
// creating the window — so we never pop a blank page that needs a manual
|
|
1069
|
+
// reload. (/api/health is NOT used — it's unreliable mid-boot; the gate is a
|
|
1070
|
+
// raw TCP probe.) Remote/custom teams just open and show their own UI.
|
|
1068
1071
|
const handleOpen = async () => {
|
|
1069
1072
|
if (busy) return;
|
|
1070
1073
|
if (!running && local && window.cicy?.sidecar?.start) {
|
|
@@ -1078,7 +1081,7 @@ function LocalTeamCard({ team, onOpen, onRename, onRefresh }) {
|
|
|
1078
1081
|
}
|
|
1079
1082
|
toast.dismiss(opToastId); // came up — no lingering toast, the window opens
|
|
1080
1083
|
}
|
|
1081
|
-
onOpen(); //
|
|
1084
|
+
onOpen(); // openTeam() gates on list_windows + TCP liveness before showing
|
|
1082
1085
|
};
|
|
1083
1086
|
const openLabel = running
|
|
1084
1087
|
? tr("localTeams.open", "打开")
|