mslxdff 0.1.246 → 0.1.247
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/autostart-health.js +65 -0
- package/src/autostart.js +57 -1
- package/src/cli/commands/daemon.js +8 -0
- package/src/cli/commands/provider/index.js +6 -1
- package/src/cli/commands/provider/models.js +3 -0
- package/src/cli/commands/provider/todaycn-login.js +121 -0
- package/src/cli/commands/provider/todaycn-persona.js +117 -0
- package/src/cli/commands/system.js +21 -5
- package/src/cli/help.js +4 -4
- package/src/cli/status.js +11 -4
- package/src/providers/classify.js +1 -1
- package/src/providers/codearts/stream.js +17 -0
- package/src/providers/dispatcher.js +1 -1
- package/src/providers/railway-endpoints.js +192 -0
- package/src/providers/railway.js +111 -45
- package/src/providers/registry.js +8 -2
- package/src/providers/share-keys.js +2 -1
- package/src/providers/todaycn/account-store.js +169 -0
- package/src/providers/todaycn/chat.js +168 -0
- package/src/providers/todaycn/const.js +59 -0
- package/src/providers/todaycn/index.js +202 -0
- package/src/providers/todaycn/models.js +93 -0
- package/src/providers/todaycn/persona.js +103 -0
- package/src/providers/todaycn/prompt.js +194 -0
- package/src/providers/todaycn/session.js +107 -0
- package/src/providers/todaycn/sse.js +86 -0
- package/src/providers/todaycn/token.js +66 -0
- package/src/providers/todaycn.js +2 -0
- package/src/runtime/autostart-repair.js +108 -0
- package/src/runtime/provider-gate.js +2 -2
- package/src/runtime/server-lifecycle.js +21 -48
- package/src/state/facade.js +1 -0
- package/src/state/merge.js +2 -0
- package/src/state/schemas/autostart.js +79 -0
|
@@ -1,6 +1,4 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { dirname, join } from "node:path";
|
|
3
|
-
import { fileURLToPath } from "node:url";
|
|
1
|
+
import { repairAutostartOnce } from "./autostart-repair.js";
|
|
4
2
|
import { startServer, resolvePort } from "../server.js";
|
|
5
3
|
import { createRouter } from "../routes.js";
|
|
6
4
|
import { createEventBus } from "../events.js";
|
|
@@ -10,24 +8,10 @@ import { fmtEvent } from "../cli/format.js";
|
|
|
10
8
|
import { writePid } from "../daemon.js";
|
|
11
9
|
import { underSystemd } from "./proc-info.js";
|
|
12
10
|
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
* unexplained-kill、daemon.alive 停在 uptimeMs:0、user unit 永远停在 disabled,下次裸跑继续循环)。
|
|
18
|
-
* helper 是普通进程:杀掉 daemon(此时是父进程)不伤自己,`systemctl --user start` 也能跑完。
|
|
19
|
-
*/
|
|
20
|
-
function spawnAutostartHelper() {
|
|
21
|
-
const entry = join(dirname(fileURLToPath(import.meta.url)), "..", "..", "bin", "mslxdff.js");
|
|
22
|
-
const child = spawn(process.execPath, [entry, "-enable-autostart"], {
|
|
23
|
-
detached: true,
|
|
24
|
-
stdio: "ignore",
|
|
25
|
-
windowsHide: true,
|
|
26
|
-
env: { ...process.env, MSLXDFF_DAEMON: "", MSLXDFF_NO_AUTOSTART: "1" },
|
|
27
|
-
});
|
|
28
|
-
child.unref();
|
|
29
|
-
return child;
|
|
30
|
-
}
|
|
11
|
+
// autostart 的接管动作与判据都在 `./autostart-repair.js`(`repairAutostartOnce`),本文件只在
|
|
12
|
+
// 启动 2.5s 后叫它一次。**为什么必须由独立进程做**(原有约束不变):`enableAutostart()` 在 Linux
|
|
13
|
+
// 的语义是「停掉裸 daemon、把端口让给 systemd」,由那个裸 daemon 自己调用 = 举手自杀
|
|
14
|
+
// (0.1.236 真机,ADR-0069)。CLI `-restart` 也调同一个函数 ⇒ 判据只有一套(ADR-0074)。
|
|
31
15
|
|
|
32
16
|
/**
|
|
33
17
|
* 服务生命周期 — router 装配 → server 创建/ready-EADDRINUSE 自愈 →
|
|
@@ -195,33 +179,22 @@ export async function startServerLifecycle({ VERSION, token, created, upstream,
|
|
|
195
179
|
console.log(`hedge: ${hd ? `${hd}ms` : "off"} (MSLXDFF_HEDGE_DELAY_MS)`);
|
|
196
180
|
} catch {}
|
|
197
181
|
|
|
198
|
-
//
|
|
199
|
-
//
|
|
200
|
-
//
|
|
201
|
-
//
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
const helper = spawnAutostartHelper();
|
|
215
|
-
if (!helper.pid) {
|
|
216
|
-
console.log("autostart 未启用且接管进程未启动:请手动运行 mslxdff -enable-autostart");
|
|
217
|
-
return;
|
|
218
|
-
}
|
|
219
|
-
console.log(`autostart 未启用:已派出接管进程 (pid ${helper.pid}),daemon 稍后交给 systemd;不想要就设 MSLXDFF_NO_AUTOSTART=1`);
|
|
220
|
-
try { logs.appendEvent({ ts: Date.now(), type: "autostart-takeover-spawned", pid: helper.pid }); } catch {}
|
|
221
|
-
try { bus?.emit({ ts: Date.now(), type: "autostart-takeover-spawned", pid: helper.pid }); } catch {}
|
|
222
|
-
} catch {}
|
|
223
|
-
}, 2500).unref?.();
|
|
224
|
-
}
|
|
182
|
+
// ---------- 开机自启自愈(Windows + Linux 同一条路,ADR-0074)----------
|
|
183
|
+
// 判据+动作在 `repairAutostartOnce()`(与 CLI `-restart` 共用,杜绝两套真相):env/平台门 →
|
|
184
|
+
// supervisor 托管则跳过 → 意愿位 → **内容健康**体检(未注册/任务禁用/注册里 node·脚本路径已不存在)
|
|
185
|
+
// → 在途互斥 → 重注入预算 → 才派 detached helper。延迟 2.5s:让 listen/健康先落地再动注册。
|
|
186
|
+
setTimeout(async () => {
|
|
187
|
+
try {
|
|
188
|
+
const r = await repairAutostartOnce({
|
|
189
|
+
log: (m) => console.log(m),
|
|
190
|
+
onEvent: (e) => {
|
|
191
|
+
try { logs.appendEvent(e); } catch {}
|
|
192
|
+
try { bus?.emit(e); } catch {}
|
|
193
|
+
},
|
|
194
|
+
});
|
|
195
|
+
if (r.action === "error") console.log(`autostart 体检失败:${r.reason}`);
|
|
196
|
+
} catch {}
|
|
197
|
+
}, 2500).unref?.();
|
|
225
198
|
|
|
226
199
|
return { srv, bus, router };
|
|
227
200
|
}
|
package/src/state/facade.js
CHANGED
|
@@ -56,3 +56,4 @@ export { loadPeers, savePeers, loadPeerErrors, savePeerErrors, loadPeerStats, sa
|
|
|
56
56
|
export { loadGroups, loadGroupsJoined, saveGroupsJoined, loadBans, saveBans, saveGroups } from "./schemas/group.js";
|
|
57
57
|
export { loadTimezone, loadTimezoneState, saveTimezone, clearTimezone, getTimezoneEnv, DEFAULT_TZ, isValidTimezone } from "./schemas/timezone.js";
|
|
58
58
|
export { loadUseGroup, saveUseGroup, getEffectiveUseGroup, shouldUseGroupForModel, isUseGroupEnabled, getUseGroupEnv } from "./schemas/use-group.js";
|
|
59
|
+
export { AUTOSTART_REPAIR_MAX_FAILS, loadAutostartWanted, saveAutostartWanted, loadAutostartRepair, recordAutostartRepair, markAutostartRepairAttempt, autostartRepairBudget } from "./schemas/autostart.js";
|
package/src/state/merge.js
CHANGED
|
@@ -0,0 +1,79 @@
|
|
|
1
|
+
import { readState, writeStateImmediate, defaultStateFile } from "../store.js";
|
|
2
|
+
|
|
3
|
+
/**
|
|
4
|
+
* 开机自启的「意愿位」与「重注入台账」。
|
|
5
|
+
*
|
|
6
|
+
* 为什么要意愿位:开机自启是这台网关的命脉 —— Windows 没有 systemd `Restart=always` 兜底,
|
|
7
|
+
* 注册一旦被安全/优化软件清掉(真机 2026-10-26:任务计划、HKCU Run、启动文件夹、WMI
|
|
8
|
+
* StartupCommand 四处全空,`-autostart status` 只会老实显示「未启用」),就永久静默失效,
|
|
9
|
+
* 没有任何自愈路径。于是 daemon 每次启动体检一次、缺了就补。
|
|
10
|
+
*
|
|
11
|
+
* 但「补」不能替别人决定开机自启,也不能和用户意愿打架:
|
|
12
|
+
* - `autostart` 缺省(老 state 没这个键)= **要自启**;只有显式跑过 `-disable-autostart`
|
|
13
|
+
* 写成 false,体检才闭嘴。
|
|
14
|
+
* - `autostartRepair.fails` 连续失败计数由执行注入的那个进程写(CLI / helper),
|
|
15
|
+
* 达 `AUTOSTART_REPAIR_MAX_FAILS` 后 daemon 只告警不再 fork —— 受限环境里
|
|
16
|
+
* `schtasks /create` 会被永久拒绝,不能每次重启都白派一个进程。
|
|
17
|
+
*/
|
|
18
|
+
export const AUTOSTART_REPAIR_MAX_FAILS = 3;
|
|
19
|
+
|
|
20
|
+
/** 用户是否要开机自启。缺省 = true(从未表态视为要)。env 不参与:这是本机意愿,不是运行参数。 */
|
|
21
|
+
export function loadAutostartWanted({ file } = {}) {
|
|
22
|
+
try {
|
|
23
|
+
const s = readState(file || defaultStateFile());
|
|
24
|
+
return s?.autostart !== false;
|
|
25
|
+
} catch {
|
|
26
|
+
return true;
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
export function saveAutostartWanted(on, { file } = {}) {
|
|
31
|
+
const f = file || defaultStateFile();
|
|
32
|
+
writeStateImmediate(f, { autostart: !!on });
|
|
33
|
+
return !!on;
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
/** 重注入台账:`{ fails, at, reason }`,读不出来的脏值一律按「没失败过」处理。 */
|
|
37
|
+
export function loadAutostartRepair({ file } = {}) {
|
|
38
|
+
try {
|
|
39
|
+
const s = readState(file || defaultStateFile());
|
|
40
|
+
const r = s?.autostartRepair;
|
|
41
|
+
if (!r || typeof r !== "object") return { fails: 0, at: 0, reason: "" };
|
|
42
|
+
return {
|
|
43
|
+
fails: Number.isFinite(Number(r.fails)) && Number(r.fails) > 0 ? Number(r.fails) : 0,
|
|
44
|
+
at: Number(r.at) || 0,
|
|
45
|
+
reason: String(r.reason || ""),
|
|
46
|
+
};
|
|
47
|
+
} catch {
|
|
48
|
+
return { fails: 0, at: 0, reason: "" };
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
|
|
52
|
+
/** 记一次注入结果:成功清零,失败累加。返回写入后的台账,供调用方直接打印剩余预算。 */
|
|
53
|
+
export function recordAutostartRepair({ ok, reason = "", file } = {}) {
|
|
54
|
+
const f = file || defaultStateFile();
|
|
55
|
+
const cur = loadAutostartRepair({ file: f });
|
|
56
|
+
const next = ok
|
|
57
|
+
? { fails: 0, at: Date.now(), reason: "" }
|
|
58
|
+
: { fails: cur.fails + 1, at: Date.now(), reason: String(reason).slice(0, 300) };
|
|
59
|
+
writeStateImmediate(f, { autostartRepair: next });
|
|
60
|
+
return next;
|
|
61
|
+
}
|
|
62
|
+
|
|
63
|
+
/** 还剩几次重注入机会(0 = 已停手,只告警)。 */
|
|
64
|
+
export function autostartRepairBudget({ file } = {}) {
|
|
65
|
+
return Math.max(0, AUTOSTART_REPAIR_MAX_FAILS - loadAutostartRepair({ file }).fails);
|
|
66
|
+
}
|
|
67
|
+
|
|
68
|
+
/**
|
|
69
|
+
* 记一次「已派重注入」的时刻(**不动 fails 计数**)—— 供在途互斥(`REPAIR_INFLIGHT_MS`)判据使用。
|
|
70
|
+
* 为什么不复用 recordAutostartRepair:那个函数只管成败、会把上一轮失败原因抹掉;这里只答
|
|
71
|
+
* 「刚刚有没有人在补」,成败要等 helper 自己跑完 `-enable-autostart` 再记(ADR-0074 二次修订)。
|
|
72
|
+
*/
|
|
73
|
+
export function markAutostartRepairAttempt({ file } = {}) {
|
|
74
|
+
const f = file || defaultStateFile();
|
|
75
|
+
const cur = loadAutostartRepair({ file: f });
|
|
76
|
+
const next = { fails: cur.fails, at: Date.now(), reason: cur.reason };
|
|
77
|
+
writeStateImmediate(f, { autostartRepair: next });
|
|
78
|
+
return next;
|
|
79
|
+
}
|