grix-connector 4.9.2 → 4.9.3
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/dist/assets/dsh-bridge/{grix-dsh-bridge-4.9.2.tgz → grix-dsh-bridge-4.9.3.tgz} +0 -0
- package/dist/assets/dsh-bridge/manifest.json +4 -4
- package/dist/bridge/adapter-pool.js +1 -1
- package/dist/bridge/bridge.js +2 -2
- package/dist/bridge/connector-ops.js +1 -1
- package/dist/bridge/lifecycle-barrier.js +1 -1
- package/dist/core/upgrade/idle-wait.js +1 -0
- package/dist/core/upgrade/upgrade-checker.js +2 -2
- package/dist/grix.js +8 -8
- package/dist/launcher.mjs +103 -1
- package/dist/manager.js +1 -1
- package/dist/mcp/stream-http/security.js +1 -1
- package/dist/runtime/daemon-lock.js +2 -2
- package/dist/service/platform-adapter.js +29 -29
- package/dist/service/process-control.js +1 -1
- package/package.json +1 -1
- package/scripts/launcher.mjs +103 -1
package/scripts/launcher.mjs
CHANGED
|
@@ -15,15 +15,23 @@
|
|
|
15
15
|
// 崩溃时间戳落在 `<store>/crashes.json`,launcher 自身被重拉也不会把计数归零。
|
|
16
16
|
// 收到 SIGTERM/SIGINT/SIGHUP 时转发给子进程并随其退出(服务停止语义)。
|
|
17
17
|
//
|
|
18
|
+
// 同一个 store 只允许一个 launcher:启动时抢 store 级单例锁,抢不到就退出,
|
|
19
|
+
// 避免两个 launcher 各自拉起一个 daemon、把对方的 daemon 记成崩溃、再用共享的
|
|
20
|
+
// crashes.json 叠加计数,几秒内把健康版本"三振出局"回滚掉。
|
|
21
|
+
//
|
|
18
22
|
// 本文件由 daemon 在启动时按 LAUNCHER_TEMPLATE_VERSION 比对并原子重写,改动行为时必须 +1。
|
|
19
|
-
export const LAUNCHER_TEMPLATE_VERSION =
|
|
23
|
+
export const LAUNCHER_TEMPLATE_VERSION = 3;
|
|
20
24
|
|
|
21
25
|
import { spawn } from 'node:child_process';
|
|
26
|
+
import { createHash } from 'node:crypto';
|
|
22
27
|
import { existsSync, mkdirSync, readFileSync, realpathSync, renameSync, rmSync, writeFileSync, appendFileSync } from 'node:fs';
|
|
28
|
+
import { connect, createServer } from 'node:net';
|
|
23
29
|
import { dirname, join } from 'node:path';
|
|
24
30
|
import { fileURLToPath } from 'node:url';
|
|
25
31
|
|
|
26
32
|
const RESTART_EXIT_CODE = 75;
|
|
33
|
+
const LOCK_RETRY_ATTEMPTS = 20;
|
|
34
|
+
const LOCK_RETRY_INTERVAL_MS = 250;
|
|
27
35
|
const RAPID_CRASH_WINDOW_MS = 5 * 60 * 1000;
|
|
28
36
|
const RAPID_CRASH_LIMIT = 3;
|
|
29
37
|
const MAX_BACKOFF_MS = 30_000;
|
|
@@ -35,6 +43,79 @@ function resolveStoreDir() {
|
|
|
35
43
|
return dirname(real);
|
|
36
44
|
}
|
|
37
45
|
|
|
46
|
+
/**
|
|
47
|
+
* store 级单例锁的端点。Windows 用命名管道(进程消失即随之消失,不留残留);
|
|
48
|
+
* POSIX 用 store 里的 unix socket 文件——端口派生会和机器上无关服务撞车,
|
|
49
|
+
* 一旦撞上 launcher 就永远起不来,socket 路径没有这个风险。
|
|
50
|
+
*/
|
|
51
|
+
function launcherLockEndpoint(store, platform = process.platform) {
|
|
52
|
+
if (platform === 'win32') {
|
|
53
|
+
const digest = createHash('sha256').update(store).digest('hex');
|
|
54
|
+
return `\\\\.\\pipe\\grix-launcher-${digest.slice(0, 24)}`;
|
|
55
|
+
}
|
|
56
|
+
return join(store, 'launcher.lock.sock');
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
function listenOnce(server, endpoint) {
|
|
60
|
+
return new Promise((resolve, reject) => {
|
|
61
|
+
const onError = (error) => {
|
|
62
|
+
if (error?.code === 'EADDRINUSE' || error?.code === 'EACCES') resolve(error.code);
|
|
63
|
+
else reject(error);
|
|
64
|
+
};
|
|
65
|
+
server.once('error', onError);
|
|
66
|
+
server.once('listening', () => {
|
|
67
|
+
server.removeListener('error', onError);
|
|
68
|
+
server.on('error', () => { /* 锁只需活到进程结束,后续错误无需处理 */ });
|
|
69
|
+
// 锁只用监听端点本身表态,探活连上来就断掉,别攒着不放。
|
|
70
|
+
server.on('connection', (socket) => socket.destroy());
|
|
71
|
+
resolve(null);
|
|
72
|
+
});
|
|
73
|
+
server.listen(endpoint);
|
|
74
|
+
});
|
|
75
|
+
}
|
|
76
|
+
|
|
77
|
+
/** unix socket 文件在 launcher 被强杀后会留下,连得上才说明真有 launcher 在跑。 */
|
|
78
|
+
function isEndpointAlive(endpoint) {
|
|
79
|
+
return new Promise((resolve) => {
|
|
80
|
+
let settled = false;
|
|
81
|
+
const socket = connect(endpoint);
|
|
82
|
+
const done = (alive) => {
|
|
83
|
+
if (settled) return;
|
|
84
|
+
settled = true;
|
|
85
|
+
try { socket.destroy(); } catch { /* already gone */ }
|
|
86
|
+
resolve(alive);
|
|
87
|
+
};
|
|
88
|
+
socket.once('connect', () => done(true));
|
|
89
|
+
socket.once('error', () => done(false));
|
|
90
|
+
setTimeout(() => done(false), 1000).unref?.();
|
|
91
|
+
});
|
|
92
|
+
}
|
|
93
|
+
|
|
94
|
+
/**
|
|
95
|
+
* 抢 store 级单例锁。拿到返回持锁的 server(进程退出时由系统释放),
|
|
96
|
+
* 已被别的 launcher 持有返回 null。
|
|
97
|
+
*
|
|
98
|
+
* 锁机制本身出错(既不是占用也不是权限)时向上抛:调用方按放行处理——
|
|
99
|
+
* launcher 起不来比偶尔多一个 launcher 严重得多。
|
|
100
|
+
*/
|
|
101
|
+
export async function acquireLauncherStoreLock(store, deps = {}) {
|
|
102
|
+
const endpoint = deps.lockEndpoint ?? launcherLockEndpoint(store, deps.platform);
|
|
103
|
+
const create = deps.createServer ?? createServer;
|
|
104
|
+
const isSocketPath = typeof endpoint === 'string' && !endpoint.startsWith('\\\\');
|
|
105
|
+
let server = create();
|
|
106
|
+
let blocked = await listenOnce(server, endpoint);
|
|
107
|
+
if (blocked && isSocketPath) {
|
|
108
|
+
if (await isEndpointAlive(endpoint)) return null;
|
|
109
|
+
// 空壳 socket:上一轮 launcher 被强杀留下的,删掉再抢一次。
|
|
110
|
+
try { rmSync(endpoint, { force: true }); } catch { return null; }
|
|
111
|
+
server = create();
|
|
112
|
+
blocked = await listenOnce(server, endpoint);
|
|
113
|
+
}
|
|
114
|
+
if (blocked) return null;
|
|
115
|
+
server.unref?.();
|
|
116
|
+
return server;
|
|
117
|
+
}
|
|
118
|
+
|
|
38
119
|
function readPointer(store, name) {
|
|
39
120
|
try {
|
|
40
121
|
const value = readFileSync(join(store, name), 'utf8').trim();
|
|
@@ -183,6 +264,27 @@ async function main() {
|
|
|
183
264
|
const store = resolveStoreDir();
|
|
184
265
|
const args = process.argv.slice(2);
|
|
185
266
|
mkdirSync(join(store, 'health'), { recursive: true });
|
|
267
|
+
|
|
268
|
+
// 升级交接时新旧 launcher 会短暂重叠,退几拍再判定,别把交接当成重复实例。
|
|
269
|
+
let storeLock = null;
|
|
270
|
+
let lockError = null;
|
|
271
|
+
for (let attempt = 0; attempt < LOCK_RETRY_ATTEMPTS && !storeLock; attempt++) {
|
|
272
|
+
try {
|
|
273
|
+
storeLock = await acquireLauncherStoreLock(store);
|
|
274
|
+
} catch (error) {
|
|
275
|
+
lockError = error;
|
|
276
|
+
break;
|
|
277
|
+
}
|
|
278
|
+
if (!storeLock) await sleep(LOCK_RETRY_INTERVAL_MS);
|
|
279
|
+
}
|
|
280
|
+
if (lockError) {
|
|
281
|
+
log(store, `store lock unavailable (${lockError instanceof Error ? lockError.message : lockError}); continuing without it`);
|
|
282
|
+
} else if (!storeLock) {
|
|
283
|
+
// 退出码 0:supervisor 见 0 不会当成崩溃,也不会去动 crashes.json。
|
|
284
|
+
log(store, 'another launcher already holds this store; exiting without starting a daemon');
|
|
285
|
+
process.exit(0);
|
|
286
|
+
}
|
|
287
|
+
|
|
186
288
|
let backoffMs = 1000;
|
|
187
289
|
log(store, `started node=${process.version} store=${store} template=${LAUNCHER_TEMPLATE_VERSION}`);
|
|
188
290
|
|