mslxdff 0.1.245 → 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/chat-pipeline/terminal-verdict.js +4 -4
- package/src/cli/commands/daemon.js +9 -1
- 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/index.js +0 -5
- package/src/cli/status.js +11 -4
- package/src/daemon.js +3 -3
- 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/bootstrap.js +1 -1
- package/src/runtime/proc-info.js +2 -2
- package/src/runtime/provider-gate.js +2 -2
- package/src/runtime/providers-setup.js +2 -4
- package/src/runtime/server-lifecycle.js +21 -48
- package/src/server.js +3 -3
- package/src/state/facade.js +1 -0
- package/src/state/merge.js +2 -0
- package/src/state/schemas/autostart.js +79 -0
- package/src/upstream-engine/index.js +2 -17
- package/src/upstream.js +1 -61
- package/src/cli/commands/multi-ip-pool-fetch.js +0 -173
- package/src/cli/commands/multi-ip-pool-test.js +0 -136
- package/src/cli/commands/multi-ip-pool.js +0 -83
- package/src/cli/commands/v6-pool.js +0 -123
- package/src/multi-ip-pool/config.js +0 -157
- package/src/multi-ip-pool/diagnose.js +0 -159
- package/src/multi-ip-pool/dial.js +0 -179
- package/src/multi-ip-pool/dispatch.js +0 -244
- package/src/multi-ip-pool/index.js +0 -174
- package/src/multi-ip-pool/nodes-fetch.js +0 -160
- package/src/multi-ip-pool/nodes.js +0 -205
- package/src/multi-ip-pool/report.js +0 -162
- package/src/multi-ip-pool/selftest.js +0 -168
- package/src/multi-ip-pool/standby.js +0 -157
- package/src/multi-ip-pool/tunnel.js +0 -291
- package/src/v6pool/claim.js +0 -157
- package/src/v6pool/config.js +0 -65
- package/src/v6pool/detect.js +0 -130
- package/src/v6pool/index.js +0 -157
- package/src/v6pool/prefix.js +0 -140
- package/src/v6pool/probe.js +0 -40
- package/src/v6pool/report.js +0 -104
- package/src/v6pool/rotate.js +0 -263
- package/src/v6pool/selftest.js +0 -178
- package/src/warp-pool/config.js +0 -74
- package/src/warp-pool/health.js +0 -106
- package/src/warp-pool/identity.js +0 -141
- package/src/warp-pool/index.js +0 -358
- package/src/warp-pool/keys.js +0 -29
- package/src/warp-pool/nodes.js +0 -95
- package/src/warp-pool/ports.js +0 -160
- package/src/warp-pool/register.js +0 -113
- package/src/warp-pool/report.js +0 -232
- package/src/warp-pool/revive.js +0 -168
- package/src/warp-pool/rotate.js +0 -214
- package/src/warp-pool/strategy.js +0 -43
- package/src/warp-pool/verdict.js +0 -69
- package/src/warp-pool/wireproxy.js +0 -162
|
@@ -0,0 +1,108 @@
|
|
|
1
|
+
import { spawn } from "node:child_process";
|
|
2
|
+
import { dirname, join } from "node:path";
|
|
3
|
+
import { fileURLToPath } from "node:url";
|
|
4
|
+
import { underSystemd } from "./proc-info.js";
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* 开机自启「重注入」的唯一执行者 —— daemon 启动自愈与 CLI `-restart` 共用这一份。
|
|
8
|
+
*
|
|
9
|
+
* 为什么要抽出来(2026-10-26,ADR-0074 二次修订):用户点名「`-restart` 里没查吗?」——
|
|
10
|
+
* 第一版把体检只埋在 daemon 启动路径(`server-lifecycle.js`),于是 `-restart` 的输出一行
|
|
11
|
+
* 相关回执都没有,也说不清「查过没查过」。判据与动作散在调用方 = 迟早长第二套真相。
|
|
12
|
+
*
|
|
13
|
+
* 三条不变量(改动时一条都不能破):
|
|
14
|
+
* 1. **绝不在本进程里调 `enableAutostart()`**:它在 Linux 的语义是「停掉裸 daemon、把端口
|
|
15
|
+
* 让给 systemd」,由裸 daemon 自己调用 = 举手自杀(0.1.236 真机,ADR-0069)。CLI 侧同样
|
|
16
|
+
* 危险:`-restart` 刚把新 daemon 起来,inline 一句 `enableAutostart()` 就会把它当裸 daemon 停掉。
|
|
17
|
+
* ⇒ 动作一律交给 detached helper 子进程。
|
|
18
|
+
* 2. **在途互斥**:CLI 刚派完 helper,2.5s 后 daemon 启动自愈会**再看一次**(那时注册往往还没
|
|
19
|
+
* 写完)⇒ 不去重就会连派两个进程抢着 `schtasks /create /f`。判据 = 台账 `autostartRepair.at`
|
|
20
|
+
* 距今 < `REPAIR_INFLIGHT_MS` 就认「已经有人在补了」,本轮只报 deferred。
|
|
21
|
+
* 3. **systemd 托管下整块跳过**:supervisor 已保证单实例+自启;且本块查的是 **user** unit,
|
|
22
|
+
* 被**系统** unit 托管时必得 enabled=false ⇒ 误判成「没注册」而反复接管(2026-10-19 无限重启)。
|
|
23
|
+
*/
|
|
24
|
+
export const REPAIR_INFLIGHT_MS = 60_000;
|
|
25
|
+
|
|
26
|
+
/** helper 走的是正经 CLI 入口 `-enable-autostart`;带 NO_AUTOSTART 防它自己再触发一次自愈。 */
|
|
27
|
+
export function spawnAutostartHelper() {
|
|
28
|
+
const entry = join(dirname(fileURLToPath(import.meta.url)), "..", "..", "bin", "mslxdff.js");
|
|
29
|
+
const child = spawn(process.execPath, [entry, "-enable-autostart"], {
|
|
30
|
+
detached: true,
|
|
31
|
+
stdio: "ignore",
|
|
32
|
+
windowsHide: true,
|
|
33
|
+
env: { ...process.env, MSLXDFF_DAEMON: "", MSLXDFF_NO_AUTOSTART: "1" },
|
|
34
|
+
});
|
|
35
|
+
child.unref();
|
|
36
|
+
return child;
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
/** 平台与 env 开关:macOS 排除(没有 systemd,走 linuxEnable 必连败三次)。 */
|
|
40
|
+
export function autostartRepairEnabled(env = process.env, platform = process.platform) {
|
|
41
|
+
if (platform !== "win32" && platform !== "linux") return false;
|
|
42
|
+
if (env.MSLXDFF_NO_AUTOSTART) return false;
|
|
43
|
+
const off = String(env.MSLXDFF_AUTOSTART_REPAIR ?? "").trim().toLowerCase();
|
|
44
|
+
return off !== "0" && off !== "off" && off !== "false";
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
/**
|
|
48
|
+
* 体检一次,必要时派 helper 重注入。返回结构化判决(`action`),并把人话回执交给 `log`。
|
|
49
|
+
* `reportOk=true`(CLI 用)时连「体检通过」也打一行 —— restart 要看得见自己查过了。
|
|
50
|
+
*/
|
|
51
|
+
export async function repairAutostartOnce({
|
|
52
|
+
log = () => {},
|
|
53
|
+
onEvent = () => {},
|
|
54
|
+
reportOk = false,
|
|
55
|
+
check = null,
|
|
56
|
+
env = process.env,
|
|
57
|
+
platform = process.platform,
|
|
58
|
+
inflightMs = REPAIR_INFLIGHT_MS,
|
|
59
|
+
now = () => Date.now(),
|
|
60
|
+
spawnHelper = null,
|
|
61
|
+
mark = null,
|
|
62
|
+
} = {}) {
|
|
63
|
+
if (!autostartRepairEnabled(env, platform)) return { action: "skip-env" };
|
|
64
|
+
if (platform === "linux" && underSystemd()) return { action: "skip-systemd" };
|
|
65
|
+
const doSpawn = spawnHelper || spawnAutostartHelper;
|
|
66
|
+
const { checkAutostartHealth } = check ? { checkAutostartHealth: check } : await import("../autostart.js");
|
|
67
|
+
const doMark = mark || (await import("../state.js")).markAutostartRepairAttempt;
|
|
68
|
+
let h;
|
|
69
|
+
try {
|
|
70
|
+
h = check ? await check() : await checkAutostartHealth();
|
|
71
|
+
} catch (e) {
|
|
72
|
+
return { action: "error", reason: String(e?.message || e) };
|
|
73
|
+
}
|
|
74
|
+
if (h.supervised) {
|
|
75
|
+
// 有 supervisor 在管就别抢:systemd 已保证单实例+自启,重复注入只会与它互踢(ADR-0064/0069)
|
|
76
|
+
if (reportOk) log("autostart: 由 supervisor 托管中(systemd),体检不接管、不重注入");
|
|
77
|
+
return { action: "skip-supervised" };
|
|
78
|
+
}
|
|
79
|
+
if (!h.wanted) {
|
|
80
|
+
if (reportOk) log("autostart: 按意愿关闭(-disable-autostart 过),本次不补注册");
|
|
81
|
+
return { action: "unwanted" };
|
|
82
|
+
}
|
|
83
|
+
if (h.ok) {
|
|
84
|
+
if (reportOk) log(`autostart: 体检通过 — 注册在,且里面的路径都还在${h.paths.length ? `(${h.paths.length} 条)` : ""}`);
|
|
85
|
+
return { action: "ok" };
|
|
86
|
+
}
|
|
87
|
+
const prev = String(h.status?.taskToRun || h.status?.execStart || "").trim();
|
|
88
|
+
const since = now() - (h.repair?.at || 0);
|
|
89
|
+
if (h.repair?.at && since < inflightMs) {
|
|
90
|
+
log(`autostart 失效(${h.reason})→ 已有重注入在途(${Math.round(since / 1000)}s 前派的),本轮不重复派`);
|
|
91
|
+
return { action: "deferred", reason: h.reason, sinceMs: since };
|
|
92
|
+
}
|
|
93
|
+
if (h.budget <= 0) {
|
|
94
|
+
log(`autostart 已失效(${h.reason}),但连续重注入已失败 ${h.repair?.fails ?? "?"} 次 —— 停手,只告警:查权限或手动 mslxdff -enable-autostart(整块开关 MSLXDFF_AUTOSTART_REPAIR=0)`);
|
|
95
|
+
onEvent({ ts: now(), type: "autostart-repair-giveup", reason: h.reason, fails: h.repair?.fails ?? null });
|
|
96
|
+
return { action: "giveup", reason: h.reason };
|
|
97
|
+
}
|
|
98
|
+
const helper = doSpawn();
|
|
99
|
+
if (!helper?.pid) {
|
|
100
|
+
log("autostart 已失效且接管进程未启动:请手动运行 mslxdff -enable-autostart");
|
|
101
|
+
return { action: "spawn-failed", reason: h.reason };
|
|
102
|
+
}
|
|
103
|
+
// 先立在途标记再返回:否则 daemon 侧 2.5s 后的第二次体检看不到「刚有人派过」
|
|
104
|
+
try { doMark(); } catch {}
|
|
105
|
+
log(`autostart 失效(${h.reason})→ 已派接管进程 (pid ${helper.pid}) 重注入,剩余预算 ${h.budget - 1} 次${prev ? `;旧注册值:${prev}` : ""}`);
|
|
106
|
+
onEvent({ ts: now(), type: "autostart-takeover-spawned", pid: helper.pid, reason: h.reason, prev, platform });
|
|
107
|
+
return { action: "spawned", reason: h.reason, helperPid: helper.pid, prev };
|
|
108
|
+
}
|
package/src/runtime/bootstrap.js
CHANGED
|
@@ -18,7 +18,7 @@ export async function startDaemonMain(VERSION) {
|
|
|
18
18
|
const { installLifecycleLog } = await import("./lifecycle-log.js");
|
|
19
19
|
installLifecycleLog({ version: VERSION, logs });
|
|
20
20
|
// 接管:内存里若还有旧的 mslxdff daemon,先请它退出。它不在 daemon.pid 里(-restart 结构性碰不到它),
|
|
21
|
-
// 两个 daemon
|
|
21
|
+
// 两个 daemon 会互抢本机长驻端口(真机 2026-10-17:旧 daemon 活了一整天,日志只显示「起一条死一条」)。
|
|
22
22
|
// 必须早于 setupProviders —— 那一步才建池抢端口。debug 前台有自己的收口逻辑,不在这里抢。
|
|
23
23
|
if (process.env.MSLXDFF_DAEMON === "1" && process.env.MSLXDFF_DEBUG !== "1") {
|
|
24
24
|
try {
|
package/src/runtime/proc-info.js
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
// 进程取证层(Linux /proc 只读)——2026-10-17 组长 VPS「幽灵 daemon 互杀」事故后新增。
|
|
2
2
|
//
|
|
3
|
-
// 事故:两个 daemon
|
|
3
|
+
// 事故:两个 daemon 同时活着(一个从昨天起活了一整天),都管同一批长驻目录(原 warp-pool,已随 ADR-0073 移除),
|
|
4
4
|
// 把对方的 wireproxy 当「上一代残留」杀掉 ⇒ 无限互杀、池永远不稳。三处都缺「读 /proc 说事实」的能力:
|
|
5
5
|
// ① 日志不知道「同机还有几个 daemon」(只能靠人肉 ps 才发现);
|
|
6
6
|
// ② 清理不知道「这个 wireproxy 的父进程还活着(= 另一个 daemon 的活隧道)」;
|
|
7
7
|
// ③ 「SIGKILL 都清不掉」其实是**僵尸**(state=Z,kill 对它无效,但 kill(pid,0) 仍返回成功)。
|
|
8
|
-
// 放 runtime
|
|
8
|
+
// 放 runtime 而不是某个子系统目录:daemon 与子系统都要用,放子系统里会让 daemon 反向依赖它。
|
|
9
9
|
// 非 Linux 一律返回空 —— 读不到 /proc 就别猜(不在别的平台做危险推断)。
|
|
10
10
|
import { readFileSync, readdirSync } from "node:fs";
|
|
11
11
|
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
// Note: auth 号型不要求 baseUrl 是硬约束(旧门禁 baseUrl&&keys 曾静默跳过整家 qoder)— 见 .agents/notes/implemented/bug-fix/2026-09-21-auth-doc-provider-gate.md
|
|
5
5
|
|
|
6
6
|
/** 凭证在 auth 目录、无需 baseUrl 的「auth 号型」定制供应商(端点由各自 constants 决定)。 */
|
|
7
|
-
export const AUTH_DOC_PROVIDER_IDS = ["workbuddy", "traework", "qoder", "qwenwork", "globalqwenwork", "raccoon"];
|
|
7
|
+
export const AUTH_DOC_PROVIDER_IDS = ["workbuddy", "traework", "qoder", "qwenwork", "globalqwenwork", "raccoon", "todaycn"];
|
|
8
8
|
|
|
9
9
|
/**
|
|
10
10
|
* 免凭证供应商:上游就是 opencode zen 的免费层代理,没有 key 也能用(按出口 IP 计额度)。
|
|
@@ -35,7 +35,7 @@ export async function loadAuthDocs(gid) { try {
|
|
|
35
35
|
? await import("../providers/globalqwenwork/account-store.js")
|
|
36
36
|
: gid === "raccoon"
|
|
37
37
|
? await import("../providers/raccoon/account-store.js")
|
|
38
|
-
: await import("../providers/qoder/account-store.js");
|
|
38
|
+
: (gid === "todaycn" ? await import("../providers/todaycn/account-store.js") : await import("../providers/qoder/account-store.js"));
|
|
39
39
|
return store.listAccountDocs();
|
|
40
40
|
} catch {
|
|
41
41
|
return [];
|
|
@@ -13,7 +13,6 @@ import { createOpenCodeProvider } from "../providers/opencode.js";
|
|
|
13
13
|
import { loadProviderKeys, loadProviderAuths, loadProviderConfigs, saveProviderConfig } from "../state.js";
|
|
14
14
|
import { refreshIntervalMs, modelCooldownMs, slowCooldownMs, peerCooldownMs, peerLimitCooldownMs, peerHeatMs, banWindowMs, banThreshold } from "../cli/policy.js";
|
|
15
15
|
import { errMsg } from "../cli/util.js";
|
|
16
|
-
import { createPreferredDispatcher } from "../v6pool/index.js";
|
|
17
16
|
|
|
18
17
|
|
|
19
18
|
import { shouldEnableCustomProvider, loadAuthDocs, seedNoCredentialProviders } from "./provider-gate.js";
|
|
@@ -51,7 +50,6 @@ export async function setupProviders() {
|
|
|
51
50
|
const baseUrl = process.env.UPSTREAM_BASE_URL || "https://opencode.ai";
|
|
52
51
|
let providers = [];
|
|
53
52
|
|
|
54
|
-
const outboundDispatcher = createPreferredDispatcher({ baseUrl });
|
|
55
53
|
if (providerPlugin) {
|
|
56
54
|
if (!upstream) {
|
|
57
55
|
try {
|
|
@@ -63,9 +61,9 @@ export async function setupProviders() {
|
|
|
63
61
|
appendEvent({ ts: Date.now(), type: "plugin-upstream-error", plugin: providerPlugin.name, error: errMsg(err) });
|
|
64
62
|
}
|
|
65
63
|
}
|
|
66
|
-
if (!upstream) upstream = createUpstreamClient({ hooks: upstreamHooks
|
|
64
|
+
if (!upstream) upstream = createUpstreamClient({ hooks: upstreamHooks });
|
|
67
65
|
} else {
|
|
68
|
-
const opencodeClient = createUpstreamEngine({ hooks: upstreamHooks
|
|
66
|
+
const opencodeClient = createUpstreamEngine({ hooks: upstreamHooks });
|
|
69
67
|
const opencodeModels = createModelsService({
|
|
70
68
|
baseUrl,
|
|
71
69
|
headers: opencodeClient.headers,
|
|
@@ -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/server.js
CHANGED
|
@@ -50,10 +50,10 @@ export function startServer({ router, signals = true, host, onBeforeClose }, por
|
|
|
50
50
|
if (stopping) return;
|
|
51
51
|
stopping = true;
|
|
52
52
|
try { console.log(`[lifecycle] ${sig} received — shutting down (pid ${process.pid}, uptime ${Math.round(process.uptime())}s)`); } catch {}
|
|
53
|
-
//
|
|
53
|
+
// 关停必须**真的退出**:长驻子进程(当年是 warp-pool 的 wireproxy,已随 ADR-0073 移除)的 stdio 是 pipe,活着的子进程会把事件循环钉住;
|
|
54
54
|
// 只 close() server(放开 8989)会留下「不监听端口却还活着」的幽灵 daemon
|
|
55
|
-
//(真机 2026-10-17:Oct16
|
|
56
|
-
// process.exit 会跑 exit 钩子(
|
|
55
|
+
//(真机 2026-10-17:Oct16 起的幽灵与新版互抢本机端口一整天,且它不在 daemon.pid 里,-restart 永远碰不到)。
|
|
56
|
+
// process.exit 会跑 exit 钩子(lifecycle 写遗书等已注册钩子),故清理不会被跳过。
|
|
57
57
|
const hard = setTimeout(() => { try { console.log(`[lifecycle] ${sig} 优雅关停 8s 未完成 — 强制退出`); } catch {} process.exit(0); }, 8000);
|
|
58
58
|
hard.unref?.();
|
|
59
59
|
close().then(() => process.exit(0), (e) => { try { console.log(`[lifecycle] 关停抛错:${String(e?.message || e)}`); } catch {} process.exit(1); });
|
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
|
+
}
|
|
@@ -21,7 +21,7 @@ export function createUpstreamEngine(opts = {}) {
|
|
|
21
21
|
const baseUrl = opts.baseUrl || process.env.UPSTREAM_BASE_URL || "https://opencode.ai";
|
|
22
22
|
const sdkFactory = opts.sdkFactory ?? createSdkChat;
|
|
23
23
|
const responsesFactory = opts.responsesFactory ?? createSdkResponses;
|
|
24
|
-
const { buildHeaders
|
|
24
|
+
const { buildHeaders } = createOpencodeHeaderBuilder({
|
|
25
25
|
authToken: opts.authToken || process.env.UPSTREAM_AUTH_TOKEN || "public",
|
|
26
26
|
});
|
|
27
27
|
const dispatcher = legacy.dispatcher;
|
|
@@ -46,22 +46,7 @@ export function createUpstreamEngine(opts = {}) {
|
|
|
46
46
|
const via = useResponses ? "@ai-sdk/openai · responses" : "@ai-sdk/openai-compatible · chat";
|
|
47
47
|
try { console.error(`[upstream-engine] sdk 引擎生效(${via})`); } catch {}
|
|
48
48
|
}
|
|
49
|
-
//
|
|
50
|
-
// 也走这条委派——重试环在 legacy.chat 里。
|
|
51
|
-
// ⚠ 顺序契约(用户 2026-10-19):先借人(组员/组长,用对方 IPv4 出口),全都用完才换出口。
|
|
52
|
-
// 故 v6 换出口**默认关**,只有显式 MSLXDFF_V6_INREQUEST_ROTATE=1 才委派;
|
|
53
|
-
// 默认把 429 原样返回,交给 chat-pipeline 去试组员/组长。
|
|
54
|
-
const v6RotateOn = (() => {
|
|
55
|
-
const raw = process.env.MSLXDFF_V6_INREQUEST_ROTATE;
|
|
56
|
-
if (raw === undefined || raw === null || raw === "") return false;
|
|
57
|
-
const s = String(raw).trim().toLowerCase();
|
|
58
|
-
return !(s === "0" || s === "false" || s === "off" || s === "no");
|
|
59
|
-
})();
|
|
60
|
-
const canRotate = v6RotateOn && typeof dispatcher?.rotateFor === "function";
|
|
61
|
-
// 原语义:撞 429 且是 free 模型,且(非匿名首试 或 有 v6 池可换址)⇒ 委派 legacy 重试环。
|
|
62
|
-
// 新语义:**只有显式开启 v6 请求内换址时才委派**;默认 429 原样返回,交给上层去借人
|
|
63
|
-
// (组员/组长,用对方 IPv4 出口),符合用户 2026-10-19 的「先借人再换出口」顺序。
|
|
64
|
-
if (res.status === 429 && isFreeModel(body?.model) && (anonFirst ? canRotate : v6RotateOn)) return legacy.chat(body);
|
|
49
|
+
// 出口池(v6/WARP/多出口)已移除:free 429 原样返回,交给上层去借人(组员/组长,用对方 IPv4 出口)。
|
|
65
50
|
return res;
|
|
66
51
|
} catch (e) {
|
|
67
52
|
if (e && e._sdkLoadFailed) {
|
package/src/upstream.js
CHANGED
|
@@ -33,11 +33,6 @@ function envInt(name, fallback) {
|
|
|
33
33
|
const v = Number(process.env[name]);
|
|
34
34
|
return Number.isInteger(v) && v > 0 ? v : fallback;
|
|
35
35
|
}
|
|
36
|
-
/** 允许 0 的数值 env(G1a 的逃生阀要认 0=关;envInt 的 `v>0` 会把 0 吞回默认值,那就是个假开关)。 */
|
|
37
|
-
function envIntOrZero(name, fallback) {
|
|
38
|
-
const v = Number(process.env[name]);
|
|
39
|
-
return Number.isInteger(v) && v >= 0 ? v : fallback;
|
|
40
|
-
}
|
|
41
36
|
function isPreheatDisabled() {
|
|
42
37
|
const raw = process.env.MSLXDFF_PREHEAT;
|
|
43
38
|
if (raw === undefined || raw === null || raw === "") return false;
|
|
@@ -188,62 +183,7 @@ export function createUpstreamClient({
|
|
|
188
183
|
try { console.error(`[free-lane] resp model=${body?.model} status=${res.status} ct=${res.headers?.get?.("content-type") || ""}`); } catch {}
|
|
189
184
|
}
|
|
190
185
|
|
|
191
|
-
//
|
|
192
|
-
//
|
|
193
|
-
// ⚠ 顺序契约(用户 2026-10-19 明确):**先借人,再换出口**。
|
|
194
|
-
// 429 ⇒ ① 先走组员/组长接力(用**对方的 IPv4 出口**);② 全都没得用/都失败,
|
|
195
|
-
// 才轮到 WARP / IPv6 换出口拿"新的自然额度"。WARP/IPv6 是另一层兜底,不该抢在借人之前。
|
|
196
|
-
// 故本功能**默认关闭**,需要时才显式开:MSLXDFF_V6_INREQUEST_ROTATE=1(原 ADR-0061 行为)。
|
|
197
|
-
// 关闭时 429 原样交回上层 → chat-pipeline 去试组员/组长,符合用户要的顺序。
|
|
198
|
-
// 边界(探测实证过的硬约束):① 仅头部即 429 才换(不碰半开的 200 流);② 429 错误体已被
|
|
199
|
-
// transport 非流分支读尽,无连接泄漏;③ 每轮换的是 session 粘的那个槽(swap 原地换 addr/e.agent,
|
|
200
|
-
// 粘性映射不失效);④ 次数上限防 429 风暴空烧认领地址;⑤ 无 rotateFor 的 dispatcher(直连/WARP)
|
|
201
|
-
// 条件短路——WARP 换出口=重注册设备 6s~600s,在请求内做只会白等,**设计上排除**。
|
|
202
|
-
const inRequestRotateOn = (() => {
|
|
203
|
-
const raw = process.env.MSLXDFF_V6_INREQUEST_ROTATE;
|
|
204
|
-
if (raw === undefined || raw === null || raw === "") return false; // 缺省关:先借人
|
|
205
|
-
const s = String(raw).trim().toLowerCase();
|
|
206
|
-
return !(s === "0" || s === "false" || s === "off" || s === "no");
|
|
207
|
-
})();
|
|
208
|
-
if (inRequestRotateOn && freeLane && res.status === 429 && typeof transport.dispatcher?.rotateFor === "function") {
|
|
209
|
-
const maxRot = envIntOrZero("MSLXDFF_V6_INREQUEST_RETRIES", 3); // 0 = 关掉请求内换出口
|
|
210
|
-
let rotated = 0;
|
|
211
|
-
while (res.status === 429 && rotated < maxRot) {
|
|
212
|
-
let next = null;
|
|
213
|
-
try {
|
|
214
|
-
// 用**线上传的那个** session 头定位粘性槽(无 messages 时 buildHeaders 兜底成进程级
|
|
215
|
-
// FALLBACK_SESSION;传 null 会让 selector 轮转到别的槽,换掉一个没准真没耗尽的健康出口)
|
|
216
|
-
next = await transport.dispatcher.rotateFor(firstHeaders["x-opencode-session"] || "");
|
|
217
|
-
} catch { break; }
|
|
218
|
-
if (!next?.agent) break; // 换不到新出口(空池/全在换址/认领失败)⇒ 正常收场,不黑洞
|
|
219
|
-
rotated += 1;
|
|
220
|
-
if (laneDebug) {
|
|
221
|
-
try { console.error(`[free-lane] v6 in-request rotate #${rotated} ${next.from} -> ${next.addr} model=${body?.model}`); } catch {}
|
|
222
|
-
}
|
|
223
|
-
try {
|
|
224
|
-
res = await transport.request({
|
|
225
|
-
url,
|
|
226
|
-
method: "POST",
|
|
227
|
-
headers: buildHeaders(reqBody, { sessionId }),
|
|
228
|
-
body: reqBody,
|
|
229
|
-
stream: reqBody.stream !== false,
|
|
230
|
-
timeoutMs: connectTimeoutMs,
|
|
231
|
-
retry,
|
|
232
|
-
dispatcher: next.agent, // per-call 出口:绕开 extDispatcher 的旧槽选择
|
|
233
|
-
});
|
|
234
|
-
} catch (e) {
|
|
235
|
-
e._t = e._t || { attempts: [], waitMs: 0, totalMs: Math.round(performance.now() - t0) };
|
|
236
|
-
throw e;
|
|
237
|
-
}
|
|
238
|
-
}
|
|
239
|
-
if (rotated) {
|
|
240
|
-
res._t = { ...(res._t || {}), egressRotations: rotated, egressRecovered: res.status < 400 };
|
|
241
|
-
try {
|
|
242
|
-
appendFile(freeAnonLogFile(), `${fmtShanghaiYMDHMS(new Date())} model=${body?.model} v6-in-request-rotations=${rotated} finalStatus=${res.status}\n`).catch(() => {});
|
|
243
|
-
} catch {}
|
|
244
|
-
}
|
|
245
|
-
}
|
|
246
|
-
|
|
186
|
+
// 出口池(v6 换址 / WARP / 多出口)已移除(2026-10-25):free 429 原样交回上层去借人(组员/组长,用对方 IPv4 出口)。
|
|
247
187
|
// 匿名兜底:仅非 anonFirst 时,public 429 + free 模型才走 hermes 空头重试
|
|
248
188
|
if (!anonFirst && res.status === 429 && isFreeModel(body?.model) && shouldTryAnonFree()) {
|
|
249
189
|
const anonRetries = envInt("MSLXDFF_FREE_ANON_RETRIES", 3);
|