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
package/package.json
CHANGED
|
@@ -0,0 +1,65 @@
|
|
|
1
|
+
import { existsSync } from "node:fs";
|
|
2
|
+
|
|
3
|
+
/**
|
|
4
|
+
* 开机自启注册项的「体检判据」—— 纯函数层,零 IO、不读 env(`exists` 由调用方注入)。
|
|
5
|
+
*
|
|
6
|
+
* 为什么单独一片文件:2026-10-26 真机的病状是「注册被清/注册里的路径搬走,但一切判据都说
|
|
7
|
+
* 已启用」,于是 daemon 静默不再开机自启。修法要在 `src/autostart.js` 之外再长一层判断逻辑,
|
|
8
|
+
* 而那份文件已经 19KB 贴着仓库 20KB 硬顶 —— 判据是纯函数,天然可拆、可单测(见
|
|
9
|
+
* `test/autostart-keep.test.js`),IO 侧(schtasks/systemctl/注册表)留在 autostart.js。
|
|
10
|
+
*/
|
|
11
|
+
|
|
12
|
+
/**
|
|
13
|
+
* 把注册下来的命令行切成 token:引号包裹的优先,其余按空白切。
|
|
14
|
+
* Windows 的 `Task To Run` / Run 值常是「带空格路径加引号 + 裸脚本路径」混排,只按空白切会把
|
|
15
|
+
* `C:\Program Files\nodejs\node.exe` 劈成两截,只取引号又会漏掉没引号的那半。
|
|
16
|
+
*/
|
|
17
|
+
export function splitCmdTokens(s) {
|
|
18
|
+
const out = [];
|
|
19
|
+
const re = /"([^"]*)"|(\S+)/g;
|
|
20
|
+
let m;
|
|
21
|
+
while ((m = re.exec(String(s || "")))) {
|
|
22
|
+
const v = String(m[1] !== undefined ? m[1] : m[2]).trim();
|
|
23
|
+
if (v) out.push(v);
|
|
24
|
+
}
|
|
25
|
+
return out;
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
/**
|
|
29
|
+
* 从注册命令行里抠出真实路径(node 可执行 + mslxdff.js 脚本)。
|
|
30
|
+
* 为什么非要看内容不可:老判据只问「任务/键在不在」,于是换 npm prefix、把仓库目录搬家、
|
|
31
|
+
* 删掉全局包留着死键这三种情况下,`-status` 一路报「已启用」,而开机时 schtasks/systemd
|
|
32
|
+
* 根本起不来 —— 静默失效。
|
|
33
|
+
*/
|
|
34
|
+
export function extractRegisteredPaths(commandLine) {
|
|
35
|
+
const paths = [];
|
|
36
|
+
for (const t of splitCmdTokens(commandLine)) {
|
|
37
|
+
if (t.startsWith("-") || t.startsWith("=")) continue; // --daemon / ExecStart 的 flag
|
|
38
|
+
if (!/[\\/]/.test(t) && !/\.(exe|js|mjs|cjs)$/i.test(t)) continue; // 无路径特征 = 服务名/参数
|
|
39
|
+
paths.push(t);
|
|
40
|
+
}
|
|
41
|
+
return [...new Set(paths)];
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
/**
|
|
45
|
+
* 体检一条注册项:`{ ok, reason, paths, missing }`。
|
|
46
|
+
* 判不出路径时**不判死**(无凭据不误杀,同 `filterStalePicks` 的默认放行哲学)——
|
|
47
|
+
* 否则一条格式意外的任务就能让自愈每轮白派一个 helper 进程。
|
|
48
|
+
* Windows 侧调用方必须把 `taskStatus`(schtasks 的 `Status:`)带进来:任务被人工禁用
|
|
49
|
+
* 也是「开机不起」,光看键在不在抓不到。
|
|
50
|
+
*/
|
|
51
|
+
export function assessRegistrationHealth({ status, exists = existsSync, platform = process.platform } = {}) {
|
|
52
|
+
const win = platform === "win32";
|
|
53
|
+
if (!status || !status.enabled) {
|
|
54
|
+
return { ok: false, reason: win ? "未注册(任务计划与 HKCU Run 都没有)" : "未注册(无 systemd user unit 或未 enable)", paths: [], missing: [] };
|
|
55
|
+
}
|
|
56
|
+
if (win && status.taskStatus && /disabled|已禁用|已停止/i.test(status.taskStatus)) {
|
|
57
|
+
return { ok: false, reason: `任务计划处于禁用态(${status.taskStatus.trim()})`, paths: [], missing: [] };
|
|
58
|
+
}
|
|
59
|
+
const cmd = win ? String(status.taskToRun || "") : String(status.execStart || "");
|
|
60
|
+
const paths = extractRegisteredPaths(cmd);
|
|
61
|
+
if (!paths.length) return { ok: true, reason: "", paths: [], missing: [], unknown: true };
|
|
62
|
+
const missing = paths.filter((p) => !exists(p));
|
|
63
|
+
if (missing.length) return { ok: false, reason: `注册项里的路径已不存在:${missing.join("、")}`, paths, missing };
|
|
64
|
+
return { ok: true, reason: "", paths, missing: [] };
|
|
65
|
+
}
|
package/src/autostart.js
CHANGED
|
@@ -5,6 +5,7 @@ import { join, dirname } from "node:path";
|
|
|
5
5
|
import { fileURLToPath } from "node:url";
|
|
6
6
|
import { daemonDir, readPid, isPidAlive } from "./daemon.js";
|
|
7
7
|
import { writeExitMarker } from "./runtime/lifecycle-forensics.js";
|
|
8
|
+
import { assessRegistrationHealth } from "./autostart-health.js";
|
|
8
9
|
|
|
9
10
|
const TASK_NAME = "mslxdff";
|
|
10
11
|
const SERVICE_NAME = "mslxdff";
|
|
@@ -111,6 +112,8 @@ async function winStatus() {
|
|
|
111
112
|
enabled: true,
|
|
112
113
|
detail: `已启用 · ${m ? m[1].trim() : "Ready"}${last ? ` · 上次结果 ${last[1].trim()}` : ""}`,
|
|
113
114
|
taskToRun: tr ? tr[1].trim() : "",
|
|
115
|
+
taskStatus: m ? m[1].trim() : "",
|
|
116
|
+
method: "schtasks",
|
|
114
117
|
raw: q.raw,
|
|
115
118
|
};
|
|
116
119
|
}
|
|
@@ -306,11 +309,18 @@ async function linuxStatus() {
|
|
|
306
309
|
const unit = systemdUnitPath();
|
|
307
310
|
const exists = existsSync(unit);
|
|
308
311
|
if (!exists) return { enabled: false, detail: "未启用(无 systemd user unit)" };
|
|
312
|
+
// ExecStart 一并读出来:体检要拿它核对「unit 里写的 node/脚本还在不在」,
|
|
313
|
+
// 只看 `is-enabled` 会在 npm 换 prefix / 目录搬家后继续报「已启用」。
|
|
314
|
+
let execStart = "";
|
|
315
|
+
try {
|
|
316
|
+
const mm = readFileSync(unit, "utf8").match(/^ExecStart=(.+)$/m);
|
|
317
|
+
if (mm) execStart = mm[1].trim();
|
|
318
|
+
} catch {}
|
|
309
319
|
const r = await execAsync("systemctl", ["--user", "is-enabled", SERVICE_NAME]);
|
|
310
320
|
const enabled = !r.err && /enabled/i.test(r.stdout);
|
|
311
321
|
const r2 = await execAsync("systemctl", ["--user", "is-active", SERVICE_NAME]);
|
|
312
322
|
const active = !r2.err && /active/i.test(r2.stdout);
|
|
313
|
-
return { enabled, detail: `${enabled ? "已启用" : "已禁用"} · ${active ? "运行中" : "未运行"} · ${unit}`, unit };
|
|
323
|
+
return { enabled, detail: `${enabled ? "已启用" : "已禁用"} · ${active ? "运行中" : "未运行"} · ${unit}`, unit, execStart };
|
|
314
324
|
}
|
|
315
325
|
|
|
316
326
|
// ---------- facade ----------
|
|
@@ -333,3 +343,49 @@ export function autostartHelp() {
|
|
|
333
343
|
if (isWin()) return `Windows: schtasks 任务 "mslxdff"(ONLOGON,最高权限,当前用户登录即自启)`;
|
|
334
344
|
return `Linux: systemd user unit ~/.config/systemd/user/mslxdff.service`;
|
|
335
345
|
}
|
|
346
|
+
|
|
347
|
+
// 注册内容体检的**纯判据**在 `src/autostart-health.js`(拆出去的理由写在那份文件头:
|
|
348
|
+
// 判据零 IO 可单测,且本文件贴着仓库 20KB 硬顶)。本文件只留 IO 侧:schtasks / 注册表 / systemctl。
|
|
349
|
+
export { extractRegisteredPaths, assessRegistrationHealth } from "./autostart-health.js";
|
|
350
|
+
|
|
351
|
+
/**
|
|
352
|
+
* 一次完整体检 = 意愿 + 现状 + 内容健康 + 剩余预算。daemon 启动自愈与 `-autostart status`
|
|
353
|
+
* 共用这一条判据,免得「面板说没事、自愈说有」两套真相。
|
|
354
|
+
*/
|
|
355
|
+
export async function checkAutostartHealth({ file, exists = existsSync, platform = process.platform, supervised = null } = {}) {
|
|
356
|
+
const { loadAutostartWanted, loadAutostartRepair, autostartRepairBudget } = await import("./state.js");
|
|
357
|
+
const status = await getAutostartStatus();
|
|
358
|
+
const assess = assessRegistrationHealth({ status, exists, platform });
|
|
359
|
+
let supervisedNow = supervised;
|
|
360
|
+
if (supervisedNow === null && platform === "linux") {
|
|
361
|
+
try {
|
|
362
|
+
const { underSystemd } = await import("./runtime/proc-info.js");
|
|
363
|
+
supervisedNow = underSystemd() || await linuxSystemUnitActive();
|
|
364
|
+
} catch { supervisedNow = false; }
|
|
365
|
+
}
|
|
366
|
+
return {
|
|
367
|
+
wanted: loadAutostartWanted({ file }),
|
|
368
|
+
ok: assess.ok,
|
|
369
|
+
reason: assess.reason,
|
|
370
|
+
paths: assess.paths,
|
|
371
|
+
missing: assess.missing,
|
|
372
|
+
supervised: !!supervisedNow,
|
|
373
|
+
status,
|
|
374
|
+
repair: loadAutostartRepair({ file }),
|
|
375
|
+
budget: autostartRepairBudget({ file }),
|
|
376
|
+
};
|
|
377
|
+
}
|
|
378
|
+
|
|
379
|
+
/**
|
|
380
|
+
* 有没有**别的** supervisor 在管 mslxdff(system 级 unit 存在或 active)—— ADR-0064 的坑:
|
|
381
|
+
* `underSystemd()` 只看**当前进程**是不是 systemd 拉起来的,而 CLI(`mslxdff -restart`)永远不是
|
|
382
|
+
* ⇒ 少了这一问,体检会在「系统 unit 托管」的机器上判「未注册」(它查的是 **user** unit)并去接管,
|
|
383
|
+
* 与系统 unit 抢同一个端口(0.1.209 无限重启原样复发)。
|
|
384
|
+
* 判据只认精确值 `active`/`activating`:`inactive` 含子串 `active`,用正则包含判会永远为真。
|
|
385
|
+
*/
|
|
386
|
+
export async function linuxSystemUnitActive() {
|
|
387
|
+
try { if (existsSync("/etc/systemd/system/mslxdff.service")) return true; } catch {}
|
|
388
|
+
const r = await execAsync("systemctl", ["is-active", SERVICE_NAME]);
|
|
389
|
+
const out = String(r.stdout || "").trim();
|
|
390
|
+
return out === "active" || out === "activating";
|
|
391
|
+
}
|
|
@@ -21,10 +21,10 @@ const FREE_TIER_PATTERNS = [
|
|
|
21
21
|
/FreeTierError/i,
|
|
22
22
|
// ⚠ `FreeUsageLimitError` 曾列在此(BUG-8 于 2026-10-16 加入)**现已移除**(2026-10-17 纠正):
|
|
23
23
|
// 它是**限额/限流**判决,不是身份闸门。三条独立实证都证明「换出口/换组员就恢复」⇒ 属可接力:
|
|
24
|
-
// ①
|
|
24
|
+
// ① 本仓自测记录(原 warp-pool/verdict.js:9-10,该模块已随 ADR-0073 移除):同一身份连发 3 次 429 FreeUsageLimitError,
|
|
25
25
|
// **身份一换、同一个请求立刻 200**(限额按出口 IP 计);
|
|
26
|
-
// ② warp-pool 的决策表(verdict.js:62)对 429 FreeUsage
|
|
27
|
-
// ③ v6 池(v6pool-claim-rotate.test.js:140
|
|
26
|
+
// ② 原 warp-pool 的决策表(verdict.js:62)对 429 FreeUsage 明写「强制换出口、跳过冷却」(该模块已随 ADR-0073 移除);
|
|
27
|
+
// ③ 原 v6 池(v6pool-claim-rotate.test.js:140)同样据它换源地址(已随 ADR-0073 移除)。
|
|
28
28
|
// 更根本:ADR-0058 §2 本就把「401/402/**429**/5xx」明列为**可恢复、接力照常**;本文件头 :9-11 也是
|
|
29
29
|
// 同一口径。BUG-8 把 429 的具名文案判成终局,偏离了本模块自己写下的边界 —— 现网代价是
|
|
30
30
|
// 组员额度还在、仍被 `peersSkipped:true` 一刀跳过(2026-10-18 events.log 满屏实证)。
|
|
@@ -62,7 +62,7 @@ const TRANSIENT_MARKERS = [
|
|
|
62
62
|
// 限额/限流具名判决 ⇒ **可恢复**(换出口换组员就恢复,见 FREE_TIER_PATTERNS 上方三条实证)。
|
|
63
63
|
// 显式列出而非指望 message 里的 "rate limit" 字样:上游改文案时这层不能跟着失明
|
|
64
64
|
// (`FreeUsageLimitError` 的类名比它的 message 稳定得多)。
|
|
65
|
-
// GoUsageLimitError
|
|
65
|
+
// GoUsageLimitError 与它同族(原 warp-pool/verdict.js:25 把两者并列),同族同判。
|
|
66
66
|
/FreeUsageLimitError|GoUsageLimitError/i,
|
|
67
67
|
/security_reject/i,
|
|
68
68
|
/安全校验拒绝/,
|
|
@@ -56,7 +56,7 @@ export async function handleRestart(args, VERSION) {
|
|
|
56
56
|
console.log("daemon not running — starting...");
|
|
57
57
|
}
|
|
58
58
|
// 结构性盲区收口:不在 daemon.pid 里的 daemon 永远杀不到(真机:Oct16 起的旧 daemon 活了一整天,
|
|
59
|
-
//
|
|
59
|
+
// 与新版互抢本机端口;两边日志格式交错才暴露)。起新的之前先清干净。
|
|
60
60
|
const ghosts = await reapGhostDaemons({ log: (m) => console.log(m) });
|
|
61
61
|
if (ghosts.length) console.log(`已清掉 ${ghosts.length} 个不在册的 daemon(pid ${ghosts.map((g) => g.pid).join(", ")})`);
|
|
62
62
|
const port = effectivePort(args);
|
|
@@ -80,6 +80,14 @@ export async function handleRestart(args, VERSION) {
|
|
|
80
80
|
console.log(`endpoint: http://localhost:${port}/v1`);
|
|
81
81
|
console.log(`log: ${logFile()}`);
|
|
82
82
|
console.log(`pid: ${pidFile()}`);
|
|
83
|
+
// ADR-0074:restart 本体也要管开机自启 —— 用户点名「每次 restart 都查一遍,不在就重新注入」。
|
|
84
|
+
// 判据与动作都在 `runtime/autostart-repair.js`(daemon 启动 2.5s 后还会查一次,靠在途互斥不重复派)。
|
|
85
|
+
// reportOk=true:连「体检通过」也要打一行,restart 的输出必须看得见自己查过了。
|
|
86
|
+
try {
|
|
87
|
+
const { repairAutostartOnce } = await import("../../runtime/autostart-repair.js");
|
|
88
|
+
const asr = await repairAutostartOnce({ log: (m) => console.log(m), reportOk: true });
|
|
89
|
+
if (asr.action === "skip-env") console.log("autostart: 自愈已按 env 关闭(MSLXDFF_NO_AUTOSTART / MSLXDFF_AUTOSTART_REPAIR=0),本次未体检");
|
|
90
|
+
} catch (e) { console.log(`autostart 体检失败:${e?.message || e}`); }
|
|
83
91
|
process.exit(0);
|
|
84
92
|
}
|
|
85
93
|
|
|
@@ -51,7 +51,8 @@ export async function handleProvider(args) {
|
|
|
51
51
|
console.error(" mslxdff -provider raccoon login --password Raccoon 手机号+密码登录(多号免扫码;密码输入不回显)");
|
|
52
52
|
console.error(" mslxdff -provider raccoon quota|checkin [--json] 查积分余额 / 每日积分结算+补领登录奖励");
|
|
53
53
|
console.error(" mslxdff -provider traework login|checkin|quota [--json] SOLO 国内号:登录 / 每日签到领积分 / 查签到与积分额度(quota 只读,不烧配额)");
|
|
54
|
-
console.error(" mslxdff -provider
|
|
54
|
+
console.error(" mslxdff -provider todaycn login [--refresh <串>] Today AI:导入本机桌面登录态(默认)或手填第二号(多号轮换)");
|
|
55
|
+
console.error(" mslxdff -provider todaycn persona [show|apply|rollback] 查看 / 把工具格式契约写进 agent 人设(可选,控制面免费,可回滚)");
|
|
55
56
|
process.exit(1);
|
|
56
57
|
}
|
|
57
58
|
if (id === "list" || id === "status") {
|
|
@@ -101,6 +102,10 @@ const { handleQoderLogin } = await import("./qoder-login.js");
|
|
|
101
102
|
if (await handleZcodeLogin(id, sub, rest)) return true;
|
|
102
103
|
const { handleZcodeQuota } = await import("./zcode-quota.js");
|
|
103
104
|
if (await handleZcodeQuota(id, sub, rest)) return true;
|
|
105
|
+
const { handleTodaycnLogin } = await import("./todaycn-login.js");
|
|
106
|
+
if (await handleTodaycnLogin(id, sub, rest)) return true;
|
|
107
|
+
const { handleTodaycnPersona } = await import("./todaycn-persona.js");
|
|
108
|
+
if (await handleTodaycnPersona(id, sub, rest)) return true;
|
|
104
109
|
|
|
105
110
|
const { handleRaccoonLogin } = await import("./raccoon-login.js");
|
|
106
111
|
if (await handleRaccoonLogin(id, sub, rest)) return true;
|
|
@@ -59,6 +59,9 @@ export async function handleProviderModels(id, sub, args, rest) {
|
|
|
59
59
|
} else if (id === "zcode") {
|
|
60
60
|
const { createZcodeProvider } = await import("../../../providers/zcode/index.js");
|
|
61
61
|
provider = createZcodeProvider({ id, apiKeys: keys, file: defaultStateFile() });
|
|
62
|
+
} else if (id === "todaycn") {
|
|
63
|
+
const { createTodaycnProvider } = await import("../../../providers/todaycn/index.js");
|
|
64
|
+
provider = createTodaycnProvider({ id, apiKeys: keys, file: defaultStateFile() });
|
|
62
65
|
} else if (id === "raccoon") {
|
|
63
66
|
const { createRaccoonProvider } = await import("../../../providers/raccoon/index.js");
|
|
64
67
|
provider = createRaccoonProvider({ id, apiKeys: keys, file: defaultStateFile() });
|
|
@@ -0,0 +1,121 @@
|
|
|
1
|
+
// mslxdff -provider todaycn login — Today AI 多号接入:
|
|
2
|
+
// 默认:解密本机桌面登录态(Windows/DPAPI)导入这一枚 refreshCredential(一机一号);
|
|
3
|
+
// --refresh <串>:手填另一台机/另一个账号的 refreshCredential —— 多号轮换的唯一途径。
|
|
4
|
+
// 落盘 auths/todaycn-<uid>.json(0600)+ state.providerConfigs.todaycn.keys,并按账号目录播种 allowlist。
|
|
5
|
+
// 全部动作都在控制面(refresh / pricing-status 均不消耗额度),登录不烧配额。
|
|
6
|
+
|
|
7
|
+
import { createHash } from "node:crypto";
|
|
8
|
+
import { normalizeProviderId } from "../../../providers/model-id.js";
|
|
9
|
+
import { compatFetch } from "../../../compat.js";
|
|
10
|
+
import { readTodaycnDesktopSession } from "../../../providers/todaycn/session.js";
|
|
11
|
+
import { listTodaycnAccountDocs, saveTodaycnAccount } from "../../../providers/todaycn/account-store.js";
|
|
12
|
+
import { createTokenStore } from "../../../providers/todaycn/token.js";
|
|
13
|
+
import { parseModelStatus, seedTodaycnAllowlist } from "../../../providers/todaycn/models.js";
|
|
14
|
+
import { buildHeaders } from "../../../providers/todaycn/chat.js";
|
|
15
|
+
import { TODAYCN_API_BASE, toGatewayModelId } from "../../../providers/todaycn/const.js";
|
|
16
|
+
|
|
17
|
+
const LOGIN_SUBS = new Set(["login", "auth"]);
|
|
18
|
+
|
|
19
|
+
/** 凭据指纹(uid 取不到时的兜底账号 id):同一枚凭据稳定,不泄露原文。 */
|
|
20
|
+
export function credentialFingerprint(credential = "") {
|
|
21
|
+
return createHash("sha1").update(String(credential)).digest("hex").slice(0, 12);
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
/** 从 accessToken(JWT)payload 里认 uid;认不到给空串(调用方兜底指纹)。 */
|
|
25
|
+
export function uidFromToken(token = "") {
|
|
26
|
+
try {
|
|
27
|
+
const part = String(token).split(".")[1];
|
|
28
|
+
if (!part) return "";
|
|
29
|
+
const p = JSON.parse(Buffer.from(part.replace(/-/g, "+").replace(/_/g, "/"), "base64").toString("utf8"));
|
|
30
|
+
return String(p?.sub || p?.uid || p?.userId || p?.user?.id || "");
|
|
31
|
+
} catch {
|
|
32
|
+
return "";
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
/** 该号当前可选模型位(pricing/status 的 modelOptions;失败给空数组,登录照旧成功)。 */
|
|
37
|
+
async function loadOptionIds(token, { fetchImpl, apiBase }) {
|
|
38
|
+
try {
|
|
39
|
+
const res = await fetchImpl(`${apiBase}/v1/pricing/status`, { headers: buildHeaders(token, "") });
|
|
40
|
+
if (!res.ok) return [];
|
|
41
|
+
const json = await res.json().catch(() => null);
|
|
42
|
+
return parseModelStatus(json).options.map((o) => o.optionId).filter(Boolean);
|
|
43
|
+
} catch {
|
|
44
|
+
return [];
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
export async function handleTodaycnLogin(id, sub, rest = [], deps = {}) {
|
|
49
|
+
if (normalizeProviderId(id) !== "todaycn") return false;
|
|
50
|
+
if (!LOGIN_SUBS.has(sub)) return false;
|
|
51
|
+
|
|
52
|
+
const fetchImpl = deps.fetchImpl || compatFetch;
|
|
53
|
+
const log = deps.log || ((m) => console.log(m));
|
|
54
|
+
const exit = deps.exit || ((code) => process.exit(code));
|
|
55
|
+
const apiBase = deps.apiBase || TODAYCN_API_BASE;
|
|
56
|
+
const save = deps.saveAccount || saveTodaycnAccount;
|
|
57
|
+
|
|
58
|
+
const at = rest.findIndex((x) => x === "--refresh" || x === "--refresh-credential" || x === "--credential");
|
|
59
|
+
const manual = at >= 0 ? String(rest[at + 1] || "").trim() : "";
|
|
60
|
+
|
|
61
|
+
log("=".repeat(60));
|
|
62
|
+
log(" Today AI 登录(今日工作助手 · api.todayai.cn)");
|
|
63
|
+
log("=".repeat(60));
|
|
64
|
+
|
|
65
|
+
let credential = manual;
|
|
66
|
+
let uid = "";
|
|
67
|
+
let name = "";
|
|
68
|
+
let email = "";
|
|
69
|
+
|
|
70
|
+
if (manual) {
|
|
71
|
+
log(" 来源: --refresh 手填凭据");
|
|
72
|
+
} else {
|
|
73
|
+
const s = readTodaycnDesktopSession(deps.dir ? { dir: deps.dir } : {});
|
|
74
|
+
if (!s.ok) {
|
|
75
|
+
log("");
|
|
76
|
+
log(`❌ 本机登录态导入失败:${s.reason}`);
|
|
77
|
+
log(" 另一条路(多号 / 其它机器):mslxdff -provider todaycn login --refresh <refreshCredential>");
|
|
78
|
+
exit(1);
|
|
79
|
+
return true;
|
|
80
|
+
}
|
|
81
|
+
credential = s.refreshCredential;
|
|
82
|
+
uid = s.uid;
|
|
83
|
+
name = s.name;
|
|
84
|
+
email = s.email;
|
|
85
|
+
log(` 来源: 本机桌面登录态(${s.dir})`);
|
|
86
|
+
}
|
|
87
|
+
|
|
88
|
+
const store = createTokenStore({ fetchImpl });
|
|
89
|
+
const tok = await store.getToken(credential, { force: true });
|
|
90
|
+
if (!tok.ok) {
|
|
91
|
+
log("");
|
|
92
|
+
log(`❌ 这枚凭据换不到令牌:${tok.reason}`);
|
|
93
|
+
log(" 检查:复制是否漏字符 / 该号是否已在别处登出 / 是否把 accessToken 当成了 refreshCredential");
|
|
94
|
+
log(" 本机重新导入:先在桌面客户端登录一次,再跑 mslxdff -provider todaycn login");
|
|
95
|
+
exit(1);
|
|
96
|
+
return true;
|
|
97
|
+
}
|
|
98
|
+
if (!uid) uid = uidFromToken(tok.token) || `cred-${credentialFingerprint(credential)}`;
|
|
99
|
+
|
|
100
|
+
const saved = await save({ uid, refreshCredential: credential, name, email, dir: deps.dir, file: deps.file });
|
|
101
|
+
const optionIds = await loadOptionIds(tok.token, { fetchImpl, apiBase });
|
|
102
|
+
const allow = seedTodaycnAllowlist({ ids: optionIds, file: deps.file });
|
|
103
|
+
const total = (() => {
|
|
104
|
+
try { return listTodaycnAccountDocs().length; } catch { return 0; }
|
|
105
|
+
})();
|
|
106
|
+
|
|
107
|
+
log("");
|
|
108
|
+
log(`✅ 已接入:uid=${uid}${name ? ` 昵称=${name}` : ""} token=${tok.token.slice(0, 12)}…`);
|
|
109
|
+
log(` 凭据: ${saved.file}${saved.updated ? "(更新既有号)" : "(新号)"}`);
|
|
110
|
+
log(` 账号总数: ${total} 个(轮换顺序 = 落盘顺序)`);
|
|
111
|
+
if (allow.allowed.length) {
|
|
112
|
+
log(` allowlist: ${allow.allowed.map((m) => toGatewayModelId(m)).join(", ")}${allow.added.length ? `(本次新增 ${allow.added.length})` : ""}`);
|
|
113
|
+
} else {
|
|
114
|
+
log(" allowlist: 暂空 —— 目录要等 provider 装配后拉取;先跑 mslxdff -provider todaycn models 看看");
|
|
115
|
+
}
|
|
116
|
+
log("");
|
|
117
|
+
log(` 下一步: mslxdff -provider todaycn models 列出可选模型位(含消耗倍率)`);
|
|
118
|
+
log(` 加第二号(多号轮换): mslxdff -provider todaycn login --refresh <另一枚 refreshCredential>`);
|
|
119
|
+
log(` 生效: mslxdff -provider todaycn models 后如常使用(模型 id: todaycn/<模型名>)`);
|
|
120
|
+
return true;
|
|
121
|
+
}
|
|
@@ -0,0 +1,117 @@
|
|
|
1
|
+
// mslxdff -provider todaycn persona [show|apply|rollback] —— 把「工具契约」写进 / 摘出 agent 人设。
|
|
2
|
+
//
|
|
3
|
+
// 为什么需要它:Today 没有 system prompt 通道,也没有逐请求 tools 参数,工具只能靠文本契约模拟。
|
|
4
|
+
// 只按轮在消息里写契约时,任务型请求会被平台自带工具通道劫走(原话「已经派出去抓了」,零 tool_calls);
|
|
5
|
+
// 把同一份契约定格进 agent 人设(`PATCH /v1/agents/default` 的 agentCharacter,控制面免费、
|
|
6
|
+
// 是产品允许用户自己改的设置项)后,实测同一句请求稳定回单行 JSON。详见 persona.js 顶部注释。
|
|
7
|
+
// 代价:人设是账号级、全局生效(桌面端聊天同样受影响),故契约只对「我在写一个小脚本」开头的
|
|
8
|
+
// 机器请求生效,普通聊天不受影响;随时 `rollback` 幂等摘除。
|
|
9
|
+
|
|
10
|
+
import { normalizeProviderId } from "../../../providers/model-id.js";
|
|
11
|
+
import { compatFetch } from "../../../compat.js";
|
|
12
|
+
import { listTodaycnAccountDocs } from "../../../providers/todaycn/account-store.js";
|
|
13
|
+
import { createTokenStore } from "../../../providers/todaycn/token.js";
|
|
14
|
+
import {
|
|
15
|
+
TODAYCN_PERSONA_CONTRACT,
|
|
16
|
+
applyTodaycnPersona,
|
|
17
|
+
hasPersonaContract,
|
|
18
|
+
readTodaycnPersona,
|
|
19
|
+
removeTodaycnPersona,
|
|
20
|
+
} from "../../../providers/todaycn/persona.js";
|
|
21
|
+
import { TODAYCN_API_BASE } from "../../../providers/todaycn/const.js";
|
|
22
|
+
|
|
23
|
+
const SUBS = new Set(["persona", "contract", "persona-contract"]);
|
|
24
|
+
const ACTIONS = new Set(["show", "apply", "rollback"]);
|
|
25
|
+
|
|
26
|
+
function normalizeAction(sub = "", rest = []) {
|
|
27
|
+
const hit = rest.find((x) => ACTIONS.has(x));
|
|
28
|
+
if (hit) return hit;
|
|
29
|
+
if (["off", "remove", "revert", "rollback"].includes(String(rest[0] || sub || ""))) return "rollback";
|
|
30
|
+
if (["on", "add", "enable", "apply"].includes(String(rest[0] || sub || ""))) return "apply";
|
|
31
|
+
return "show";
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
export async function handleTodaycnPersona(id, sub, rest = [], deps = {}) {
|
|
35
|
+
if (normalizeProviderId(id) !== "todaycn") return false;
|
|
36
|
+
if (!SUBS.has(sub)) return false;
|
|
37
|
+
|
|
38
|
+
const action = normalizeAction(sub, rest);
|
|
39
|
+
const fetchImpl = deps.fetchImpl || compatFetch;
|
|
40
|
+
const log = deps.log || ((m) => console.log(m));
|
|
41
|
+
const exit = deps.exit || ((code) => process.exit(code));
|
|
42
|
+
const apiBase = deps.apiBase || TODAYCN_API_BASE;
|
|
43
|
+
|
|
44
|
+
log("=".repeat(60));
|
|
45
|
+
log(" Today AI · agent 人设契约(工具调用的格式约定)");
|
|
46
|
+
log("=".repeat(60));
|
|
47
|
+
|
|
48
|
+
const uidArg = (() => {
|
|
49
|
+
const i = rest.findIndex((x) => x === "--uid");
|
|
50
|
+
return i >= 0 ? String(rest[i + 1] || "").trim() : "";
|
|
51
|
+
})();
|
|
52
|
+
let accounts = Array.isArray(deps.accounts) ? deps.accounts : [];
|
|
53
|
+
if (!Array.isArray(deps.accounts)) { try { accounts = listTodaycnAccountDocs(); } catch {} }
|
|
54
|
+
const acct = uidArg ? accounts.find((a) => String(a.uid) === uidArg) : accounts[0];
|
|
55
|
+
if (!acct) {
|
|
56
|
+
log("");
|
|
57
|
+
log(uidArg ? `❌ 找不到 uid=${uidArg} 的落盘账号` : "❌ 没有落盘账号");
|
|
58
|
+
log(" 先接入账号: mslxdff -provider todaycn login");
|
|
59
|
+
exit(1);
|
|
60
|
+
return true;
|
|
61
|
+
}
|
|
62
|
+
|
|
63
|
+
const store = createTokenStore({ fetchImpl });
|
|
64
|
+
const tok = await store.getToken(acct.refreshCredential);
|
|
65
|
+
if (!tok.ok) {
|
|
66
|
+
log("");
|
|
67
|
+
log(`❌ 该号换不到令牌:${tok.reason}`);
|
|
68
|
+
log(" 检查凭据是否失效;必要时重新跑 mslxdff -provider todaycn login");
|
|
69
|
+
exit(1);
|
|
70
|
+
return true;
|
|
71
|
+
}
|
|
72
|
+
const call = { token: tok.token, fetchImpl, apiBase, deviceId: acct.deviceId };
|
|
73
|
+
|
|
74
|
+
log("");
|
|
75
|
+
log(` 账号: uid=${acct.uid}${acct.name ? ` 昵称=${acct.name}` : ""} 动作=${action}`);
|
|
76
|
+
log("");
|
|
77
|
+
|
|
78
|
+
if (action === "show") {
|
|
79
|
+
const r = await readTodaycnPersona(call);
|
|
80
|
+
if (!r.ok) {
|
|
81
|
+
log(`❌ 读人设失败(HTTP ${r.status})${String(r.text || "").slice(0, 160)}`);
|
|
82
|
+
exit(1);
|
|
83
|
+
return true;
|
|
84
|
+
}
|
|
85
|
+
const has = hasPersonaContract(r.agentCharacter);
|
|
86
|
+
log(` agentName: ${r.agentName || "(空)"}`);
|
|
87
|
+
log(` agentCharacter: ${r.agentCharacter.length} 字`);
|
|
88
|
+
log(` 契约段是否已写入: ${has ? "是" : "否"}`);
|
|
89
|
+
log("");
|
|
90
|
+
log(` 人设预览(末 300 字):\n${r.agentCharacter.slice(-300) || "(空)"}`);
|
|
91
|
+
log("");
|
|
92
|
+
log(has
|
|
93
|
+
? " 下一步: 要摘掉就 mslxdff -provider todaycn persona rollback"
|
|
94
|
+
: " 下一步: 要写入就 mslxdff -provider todaycn persona apply");
|
|
95
|
+
return true;
|
|
96
|
+
}
|
|
97
|
+
|
|
98
|
+
const r = action === "apply" ? await applyTodaycnPersona(call) : await removeTodaycnPersona(call);
|
|
99
|
+
if (!r.ok) {
|
|
100
|
+
log(`❌ ${action === "apply" ? "写入" : "摘除"}失败(HTTP ${r.status}):${r.reason || ""}`);
|
|
101
|
+
exit(1);
|
|
102
|
+
return true;
|
|
103
|
+
}
|
|
104
|
+
log(` ${action === "apply" ? "写入" : "摘除"}${r.changed ? "完成" : "跳过(幂等)"}:agentCharacter ${String(r.before || "").length} 字 → ${String(r.after || "").length} 字`);
|
|
105
|
+
if (r.reason) log(` 说明: ${r.reason}`);
|
|
106
|
+
if (action === "apply") {
|
|
107
|
+
log("");
|
|
108
|
+
log(` 契约已进人设(${TODAYCN_PERSONA_CONTRACT.length} 字)。它只对「我在写一个小脚本」开头的机器请求生效,`);
|
|
109
|
+
log(" 普通聊天照旧 —— 桌面端对话不受影响。");
|
|
110
|
+
log(" 下一步: mslxdff -provider todaycn persona show 复核 · 不满意就 persona rollback");
|
|
111
|
+
} else {
|
|
112
|
+
log("");
|
|
113
|
+
log(" 人设里的契约段已摘除(其余文字一字未动)。");
|
|
114
|
+
log(" 下一步: mslxdff -provider todaycn persona show 复核");
|
|
115
|
+
}
|
|
116
|
+
return true;
|
|
117
|
+
}
|
|
@@ -228,32 +228,48 @@ export async function handleFree(args) {
|
|
|
228
228
|
|
|
229
229
|
export async function handleAutostart(args) {
|
|
230
230
|
if (!(args.includes("-enable-autostart") || args.includes("--enable-autostart") || args.includes("-disable-autostart") || args.includes("--disable-autostart") || args.includes("-autostart") || args.includes("--autostart"))) return false;
|
|
231
|
-
const { enableAutostart, disableAutostart, getAutostartStatus, autostartHelp } = await import("../../autostart.js");
|
|
231
|
+
const { enableAutostart, disableAutostart, getAutostartStatus, autostartHelp, checkAutostartHealth } = await import("../../autostart.js");
|
|
232
|
+
const { saveAutostartWanted, recordAutostartRepair, AUTOSTART_REPAIR_MAX_FAILS } = await import("../../state.js");
|
|
232
233
|
if (args.includes("-enable-autostart") || args.includes("--enable-autostart")) {
|
|
233
234
|
const r = await enableAutostart();
|
|
234
235
|
if (r.ok) {
|
|
236
|
+
// 意愿位 + 台账:enable 成功即表态「要自启」并清零失败计数 —— daemon 每次启动的自愈据此保持注册
|
|
237
|
+
saveAutostartWanted(true);
|
|
238
|
+
recordAutostartRepair({ ok: true });
|
|
235
239
|
console.log(`autostart 已启用 · ${r.method || autostartHelp()}`);
|
|
236
|
-
console.log(`验证: mslxdff -autostart status
|
|
240
|
+
console.log(`验证: mslxdff -autostart status ;此后注册被清理软件抹掉或注册里的路径搬家失效,daemon 启动时会自动重注入`);
|
|
237
241
|
} else {
|
|
242
|
+
const rep = recordAutostartRepair({ ok: false, reason: r.error || "unknown" });
|
|
238
243
|
console.error(`启用自启失败: ${r.error || "unknown"}`);
|
|
239
244
|
console.error(`提示: Windows 需允许任务计划,Linux 需 systemd --user`);
|
|
245
|
+
if (rep.fails >= AUTOSTART_REPAIR_MAX_FAILS) console.error(`已连续失败 ${rep.fails} 次:daemon 启动时的自动重注入停手只告警(整块开关 MSLXDFF_AUTOSTART_REPAIR=0)`);
|
|
240
246
|
process.exit(1);
|
|
241
247
|
}
|
|
242
248
|
process.exit(0);
|
|
243
249
|
}
|
|
244
250
|
if (args.includes("-disable-autostart") || args.includes("--disable-autostart")) {
|
|
245
251
|
const r = await disableAutostart();
|
|
246
|
-
if (r.ok)
|
|
252
|
+
if (r.ok) {
|
|
253
|
+
saveAutostartWanted(false);
|
|
254
|
+
recordAutostartRepair({ ok: true });
|
|
255
|
+
console.log(`autostart 已禁用 — 意愿已记进 state,daemon 重启不会再自动补注册;要恢复:mslxdff -enable-autostart`);
|
|
256
|
+
}
|
|
247
257
|
else { console.error(`禁用失败: ${r.error}`); process.exit(1); }
|
|
248
258
|
process.exit(0);
|
|
249
259
|
}
|
|
250
260
|
const idx = args.findIndex((x) => x === "-autostart" || x === "--autostart");
|
|
251
261
|
const sub = args[idx + 1];
|
|
252
262
|
if (!sub || sub === "status" || sub === "list") {
|
|
253
|
-
|
|
254
|
-
|
|
263
|
+
// 与 daemon 启动自愈共用 checkAutostartHealth():面板与自愈必须同一判据,不许两套真相
|
|
264
|
+
const h = await checkAutostartHealth();
|
|
265
|
+
const s = h.status || await getAutostartStatus();
|
|
266
|
+
const verdict = !h.wanted ? "按意愿关闭(不会自动补注册)" : (h.ok ? "已启用 · 体检通过" : `失效 → ${h.reason}`);
|
|
267
|
+
console.log(`autostart: ${verdict}`);
|
|
268
|
+
console.log(` ${s.detail || autostartHelp()}`);
|
|
255
269
|
if (s.taskToRun) console.log(` task: ${s.taskToRun}`);
|
|
270
|
+
if (s.execStart) console.log(` exec: ${s.execStart}`);
|
|
256
271
|
if (s.unit) console.log(` unit: ${s.unit}`);
|
|
272
|
+
if (h.repair.fails) console.log(` 重注入台账: 连续失败 ${h.repair.fails} 次(剩 ${h.budget} 次)· 上次原因 ${h.repair.reason || "-"}`);
|
|
257
273
|
process.exit(0);
|
|
258
274
|
}
|
|
259
275
|
console.error("usage: mslxdff -enable-autostart | mslxdff -disable-autostart | mslxdff -autostart status");
|
package/src/cli/help.js
CHANGED
|
@@ -16,7 +16,7 @@ Usage:
|
|
|
16
16
|
mslxdff -model refresh force-refresh the model cache from the upstream
|
|
17
17
|
mslxdff -debug live-follow the daemon event stream (requests, errors, peer forwards)
|
|
18
18
|
mslxdff -stop stop the running daemon
|
|
19
|
-
mslxdff -restart restart the daemon
|
|
19
|
+
mslxdff -restart restart the daemon(末尾顺带体检开机自启:注册被清或注册里的路径失效会自动重注入并打印回执,MSLXDFF_AUTOSTART_REPAIR=0 关这步)
|
|
20
20
|
mslxdff -uninstall stop the daemon and delete all state/log files
|
|
21
21
|
mslxdff -port N persist the listen port (restarts the daemon on it if running)
|
|
22
22
|
mslxdff -update update mslxdff to the latest published version
|
|
@@ -46,9 +46,9 @@ Usage:
|
|
|
46
46
|
mslxdff -delgroup <name> disband a group this node leads (deletes it and its members)
|
|
47
47
|
mslxdff -free V2EX 白嫖雷达(仅 V2EX 单源:latest+hot 按 白嫖|限免|免费额度|注册送|羊毛 过滤)
|
|
48
48
|
mslxdff -free-watch V2EX 白嫖雷达 watch 模式(每 5 分钟轮询)
|
|
49
|
-
mslxdff -enable-autostart 开机自启:注册 Windows 任务计划 / Linux systemd user
|
|
50
|
-
mslxdff -disable-autostart
|
|
51
|
-
mslxdff -autostart status
|
|
49
|
+
mslxdff -enable-autostart 开机自启:注册 Windows 任务计划 / Linux systemd user(重启后自动拉起),并记下意愿位;此后 daemon 每次启动自动体检,注册被清或注册里的路径失效会自己重注入
|
|
50
|
+
mslxdff -disable-autostart 关闭开机自启并记下意愿位(daemon 自愈此后不再补注册)
|
|
51
|
+
mslxdff -autostart status 自启体检:意愿 + 注册现状 + 注册内容路径是否还在 + 重注入台账(连续失败 3 次自动停手,开关 MSLXDFF_AUTOSTART_REPAIR=0)
|
|
52
52
|
mslxdff -chat ["prompt"] chat REPL(mimo-v2.5-free 优先/big-pickle 兜底,自然语言转命令,模糊匹配由模型完成,历史持久化,超长自动压缩,仅拦 -uninstall,daemon 重启不影响)
|
|
53
53
|
mslxdff -resetban [ip] clear join-failure bans (all, or one ip)
|
|
54
54
|
mslxdff -use-group [on|off] 本机失败时是否走组员网络(默认 on;off 则所有供应商仅本机,MSLXDFF_USE_GROUP 环境变量可覆盖)
|
package/src/cli/index.js
CHANGED
|
@@ -41,11 +41,6 @@ export async function run(args = process.argv.slice(2)) {
|
|
|
41
41
|
if (await handleAutostart(args)) return;
|
|
42
42
|
if (await handleFree(args)) return;
|
|
43
43
|
|
|
44
|
-
const { handleV6Pool } = await import("./commands/v6-pool.js");
|
|
45
|
-
if (await handleV6Pool(args)) return;
|
|
46
|
-
|
|
47
|
-
const { handleMultiIpPool } = await import("./commands/multi-ip-pool.js");
|
|
48
|
-
if (await handleMultiIpPool(args)) return;
|
|
49
44
|
|
|
50
45
|
const { handleProviders, handleProvider } = await import("./commands/provider.js");
|
|
51
46
|
if (await handleProviders(args)) return;
|
package/src/cli/status.js
CHANGED
|
@@ -142,13 +142,20 @@ export async function printStatus(VERSION) {
|
|
|
142
142
|
}
|
|
143
143
|
|
|
144
144
|
try {
|
|
145
|
-
|
|
146
|
-
|
|
145
|
+
// 与 daemon 启动自愈共用 checkAutostartHealth() —— 面板绝不能比自愈少知道一层:
|
|
146
|
+
// 老写法只问「注册在不在」,注册里的 node/脚本已搬家失效时它照样印「已启用」。
|
|
147
|
+
const { checkAutostartHealth } = await import("../autostart.js");
|
|
148
|
+
const h = await checkAutostartHealth();
|
|
149
|
+
const a = h.status || {};
|
|
147
150
|
const detail = a.detail || (a.enabled ? "已启用" : "未启用");
|
|
148
|
-
const
|
|
149
|
-
|
|
151
|
+
const head = !h.wanted ? "按意愿关闭(不会自动补注册)"
|
|
152
|
+
: h.ok ? (detail.startsWith("已启用") || detail.startsWith("未启用") ? detail : `已启用 · ${detail}`)
|
|
153
|
+
: `失效 → ${h.reason}(重启 daemon 会自动重注入)`;
|
|
154
|
+
console.log(`\nautostart: ${head} — mslxdff -autostart status`);
|
|
150
155
|
if (a.taskToRun) console.log(` task: ${a.taskToRun.slice(0, 120)}`);
|
|
156
|
+
if (a.execStart) console.log(` exec: ${a.execStart.slice(0, 120)}`);
|
|
151
157
|
if (a.unit) console.log(` unit: ${a.unit}`);
|
|
158
|
+
if (h.repair.fails) console.log(` 重注入台账: 连续失败 ${h.repair.fails} 次(剩 ${h.budget} 次)`);
|
|
152
159
|
} catch {}
|
|
153
160
|
try {
|
|
154
161
|
const { resolvePluginDirs, loadPlugins } = await import("../plugins.js");
|
package/src/daemon.js
CHANGED
|
@@ -180,7 +180,7 @@ export async function waitPidGone(pid, { timeoutMs = 5000, killWaitMs = 2000, st
|
|
|
180
180
|
|
|
181
181
|
/**
|
|
182
182
|
* 清「不在 daemon.pid 里的」幽灵 daemon —— `-restart` 的结构性盲区
|
|
183
|
-
*(真机事故:旧 daemon
|
|
183
|
+
*(真机事故:旧 daemon 活了一整天,与新版互抢本机端口,两边日志格式交错才暴露)。
|
|
184
184
|
* 先 SIGTERM 全清 → 等 5s → 仍活着的 SIGKILL。返回**确实清掉**的清单(供调用方诚实汇报)。
|
|
185
185
|
*/
|
|
186
186
|
export async function reapGhostDaemons({ self = process.pid, list = () => findDaemons({ self }), kill = process.kill, log = () => {}, isAlive = isPidAlive, settleMs = 5000, killWaitMs = 2000, sleep = (ms) => new Promise((r) => setTimeout(r, ms)) } = {}) {
|
|
@@ -201,7 +201,7 @@ export async function reapGhostDaemons({ self = process.pid, list = () => findDa
|
|
|
201
201
|
* 接管:内存里若还有**别的** mslxdff daemon,先把比我们旧的那批请出去。
|
|
202
202
|
* 为什么必须有(用户点名要求 + 真机 2026-10-17 事故):`-restart` 只认 `daemon.pid`,
|
|
203
203
|
* 不在册的 daemon(SIGTERM 后没真退出、pid 文件又被删掉的那个)会活一整天,与新版互抢
|
|
204
|
-
* warp-pool 的
|
|
204
|
+
* 本机那 4 个长驻端口(当年是 warp-pool 的 wireproxy,该模块已随 ADR-0073 移除)——日志里只能看到「起一条死一条」,看不出是两个 daemon 在互杀。
|
|
205
205
|
* 判据:比自己早启动 ≥ `minAgeMs` 的一律清(SIGTERM → 等 → SIGKILL);与本次启动几乎同时的不动
|
|
206
206
|
* (谁该活由 8989 的 bind 决定,`server-lifecycle` 的 EADDRINUSE 自愈会收口),避免两边互杀。
|
|
207
207
|
* 全程不抛(接管失败绝不能挡住启动)。
|
|
@@ -227,7 +227,7 @@ export async function takeoverOlderDaemons({
|
|
|
227
227
|
const older = sibs.filter(isOlder);
|
|
228
228
|
const skipped = sibs.filter((d) => !isOlder(d));
|
|
229
229
|
|
|
230
|
-
for (const d of older) log(`[daemon] 内存里还有别的 mslxdff daemon:pid ${d.pid}(父 ${d.ppid},已运行 ${fmtAlive(d.aliveSec)},比本进程旧)—— 先请它退出,否则两个 daemon
|
|
230
|
+
for (const d of older) log(`[daemon] 内存里还有别的 mslxdff daemon:pid ${d.pid}(父 ${d.ppid},已运行 ${fmtAlive(d.aliveSec)},比本进程旧)—— 先请它退出,否则两个 daemon 会抢同一批端口(当年是 warp-pool 起一条死一条的真因,该模块已随 ADR-0073 移除)`);
|
|
231
231
|
for (const d of older) { try { kill(d.pid, "SIGTERM"); } catch {} }
|
|
232
232
|
const t0 = Date.now();
|
|
233
233
|
while (Date.now() - t0 < settleMs && older.some((d) => isAlive(d.pid))) await sleep(100);
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
// latency-compare:key/token 类,direct vs link+remote 比延迟
|
|
5
5
|
export function classifyProvider(id) {
|
|
6
6
|
const s = String(id || "").trim().toLowerCase();
|
|
7
|
-
if (s === "workbuddy" || s === "cline" || s === "codearts" || s === "traework" || s === "qoder" || s === "qwenwork" || s === "globalqwenwork" || s === "zcode" || s === "raccoon") return "local-only";
|
|
7
|
+
if (s === "workbuddy" || s === "cline" || s === "codearts" || s === "traework" || s === "qoder" || s === "qwenwork" || s === "globalqwenwork" || s === "zcode" || s === "raccoon" || s === "todaycn") return "local-only";
|
|
8
8
|
if (s === "opencode") return "quota-pool";
|
|
9
9
|
return "latency-compare";
|
|
10
10
|
}
|