mslxdff 0.1.199 → 0.1.203
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/README.md +3 -3
- package/bin/mslxdff.js +1 -1
- package/package.json +38 -38
- package/plugins/README.md +14 -14
- package/plugins/prefer-model.mjs.example +14 -14
- package/src/anthropic/count-tokens.js +61 -61
- package/src/anthropic/request-body.js +126 -126
- package/src/anthropic/shared.js +18 -18
- package/src/anthropic/sse-aggregate.js +56 -56
- package/src/anthropic/translate.js +287 -287
- package/src/anthropic/web-search.js +361 -361
- package/src/api-kind.js +31 -31
- package/src/autostart.js +288 -288
- package/src/bench/probe.js +1 -1
- package/src/bench/runner.js +1 -1
- package/src/bench/via-probe.js +1 -1
- package/src/bench/via.js +144 -144
- package/src/bench/workbuddy-bench.js +1 -1
- package/src/chat/config.js +11 -11
- package/src/chat/cooling.js +81 -81
- package/src/chat/direct.js +58 -58
- package/src/chat/index.js +6 -6
- package/src/chat/spinner.js +38 -38
- package/src/chat/sse.js +69 -69
- package/src/chat/stats.js +247 -247
- package/src/chat/store.js +48 -48
- package/src/chat/tool-handlers.js +67 -67
- package/src/chat/tools.js +1 -1
- package/src/chat/upstream.js +59 -59
- package/src/chat-pipeline/auto-race.js +158 -158
- package/src/chat-pipeline/empty-turn.js +147 -147
- package/src/chat-pipeline/engine.js +17 -17
- package/src/chat-pipeline/serial-trial.js +283 -283
- package/src/chat-pipeline/terminal-verdict.js +147 -147
- package/src/chooser.js +54 -54
- package/src/claude-desktop/apply.js +101 -101
- package/src/claude-desktop/context1m.js +38 -38
- package/src/claude-desktop/doctor.js +146 -146
- package/src/claude-desktop/slots.js +152 -152
- package/src/cli/bootstrap.js +1 -1
- package/src/cli/commands/claude-desktop.js +284 -284
- package/src/cli/commands/daemon.js +231 -231
- package/src/cli/commands/model/list-live.js +22 -22
- package/src/cli/commands/model/list-providers.js +76 -76
- package/src/cli/commands/model/list-render.js +77 -77
- package/src/cli/commands/model/list-sort.js +52 -52
- package/src/cli/commands/model/list-tty.js +76 -76
- package/src/cli/commands/model/list.js +166 -166
- package/src/cli/commands/model/live-models.js +24 -24
- package/src/cli/commands/model/stats.js +43 -43
- package/src/cli/commands/model/status.js +47 -47
- package/src/cli/commands/model.js +51 -51
- package/src/cli/commands/provider/add.js +108 -108
- package/src/cli/commands/provider/allowlist.js +99 -99
- package/src/cli/commands/provider/cline-free.js +99 -99
- package/src/cli/commands/provider/cline-login.js +218 -218
- package/src/cli/commands/provider/cline-quota.js +65 -65
- package/src/cli/commands/provider/codearts-login.js +45 -45
- package/src/cli/commands/provider/config.js +119 -119
- package/src/cli/commands/provider/globalqwenwork-login.js +126 -126
- package/src/cli/commands/provider/keys-guard.js +50 -50
- package/src/cli/commands/provider/keys.js +161 -161
- package/src/cli/commands/provider/qoder-checkin.js +81 -81
- package/src/cli/commands/provider/qoder-login.js +102 -102
- package/src/cli/commands/provider/raccoon-login.js +180 -180
- package/src/cli/commands/provider/raccoon-password.js +162 -162
- package/src/cli/commands/provider/raccoon-quota.js +109 -109
- package/src/cli/commands/provider/traework-checkin.js +144 -144
- package/src/cli/commands/provider/traework-login.js +164 -164
- package/src/cli/commands/provider/workbuddy-login.js +153 -153
- package/src/cli/commands/provider/zcode-login.js +77 -77
- package/src/cli/commands/provider/zcode-quota.js +55 -55
- package/src/cli/commands/provider.js +1 -1
- package/src/cli/commands/stats.js +149 -149
- package/src/cli/commands/system.js +261 -261
- package/src/cli/commands/timezone.js +47 -47
- package/src/cli/commands/use-group.js +60 -60
- package/src/cli/commands/workbuddy.js +189 -189
- package/src/cli/format.js +141 -141
- package/src/cli/group-helpers.js +70 -70
- package/src/cli/help.js +80 -80
- package/src/cli/index.js +70 -70
- package/src/cli/interactive.js +121 -121
- package/src/cli/join-core.js +99 -99
- package/src/cli/join-wizard.js +175 -175
- package/src/cli/policy.js +136 -136
- package/src/cli/provider-row.js +126 -126
- package/src/cli/util.js +24 -24
- package/src/compat.js +53 -53
- package/src/events.js +38 -38
- package/src/free-lane.js +131 -131
- package/src/free-watcher.js +63 -63
- package/src/groups.js +262 -262
- package/src/logs.js +195 -195
- package/src/metrics.js +62 -62
- package/src/model-capabilities/context-lookup.js +65 -65
- package/src/model-capabilities/merge.js +142 -142
- package/src/model-trace.js +187 -187
- package/src/models.js +1 -1
- package/src/opencode-identity.js +72 -72
- package/src/peers.js +254 -251
- package/src/plugins.js +107 -107
- package/src/providers/base.js +164 -164
- package/src/providers/classify.js +22 -22
- package/src/providers/cline/allowlist-sync.js +93 -93
- package/src/providers/cline/free-catalog.js +71 -71
- package/src/providers/cline/headers.js +37 -37
- package/src/providers/cline/index.js +130 -130
- package/src/providers/cline/models.js +150 -150
- package/src/providers/cline/usage.js +274 -274
- package/src/providers/codearts/auth-pool.js +148 -148
- package/src/providers/codearts/concurrency.js +34 -34
- package/src/providers/codearts/const.js +65 -65
- package/src/providers/codearts/dpop.js +95 -95
- package/src/providers/codearts/index.js +175 -175
- package/src/providers/codearts/login.js +214 -214
- package/src/providers/codearts/models.js +182 -182
- package/src/providers/codearts/sign.js +96 -96
- package/src/providers/codearts/sse.js +204 -204
- package/src/providers/codearts/stream.js +209 -209
- package/src/providers/codearts/sts.js +124 -124
- package/src/providers/codearts.js +1 -1
- package/src/providers/dispatcher.js +146 -146
- package/src/providers/generic.js +156 -156
- package/src/providers/globalqwenwork/account-store.js +141 -141
- package/src/providers/globalqwenwork/constants.js +73 -73
- package/src/providers/globalqwenwork/crypto.js +2 -2
- package/src/providers/globalqwenwork/http.js +2 -2
- package/src/providers/globalqwenwork/index.js +331 -331
- package/src/providers/globalqwenwork/payload.js +147 -147
- package/src/providers/globalqwenwork/rsa.js +2 -2
- package/src/providers/globalqwenwork/sse.js +2 -2
- package/src/providers/globalqwenwork/stream.js +2 -2
- package/src/providers/globalqwenwork.js +1 -1
- package/src/providers/globalworkbuddy/account-store.js +198 -198
- package/src/providers/globalworkbuddy/auth.js +97 -97
- package/src/providers/globalworkbuddy/catalog.js +138 -138
- package/src/providers/globalworkbuddy/constants.js +73 -73
- package/src/providers/globalworkbuddy/device-auth.js +120 -120
- package/src/providers/globalworkbuddy/errors.js +98 -98
- package/src/providers/globalworkbuddy/headers.js +89 -89
- package/src/providers/globalworkbuddy/models.js +96 -96
- package/src/providers/globalworkbuddy/payload.js +80 -80
- package/src/providers/index.js +5 -5
- package/src/providers/model-id.js +172 -172
- package/src/providers/opencode.js +19 -19
- package/src/providers/openrouter.js +31 -31
- package/src/providers/qoder/account-store.js +106 -106
- package/src/providers/qoder/aggregate.js +60 -60
- package/src/providers/qoder/baseprompt.json +591 -591
- package/src/providers/qoder/checkin.js +160 -160
- package/src/providers/qoder/constants.js +44 -44
- package/src/providers/qoder/encode.js +41 -41
- package/src/providers/qoder/fingerprint.js +38 -38
- package/src/providers/qoder/models.js +77 -77
- package/src/providers/qoder/oauth.js +84 -84
- package/src/providers/qoder/payload.js +162 -162
- package/src/providers/qoder/request.js +27 -27
- package/src/providers/qoder/session.js +134 -134
- package/src/providers/qoder/sticky.js +38 -38
- package/src/providers/qoder/stream.js +116 -116
- package/src/providers/qoder.js +1 -1
- package/src/providers/raccoon/account-store.js +216 -216
- package/src/providers/raccoon/auth.js +67 -67
- package/src/providers/raccoon/chat.js +228 -228
- package/src/providers/raccoon/const.js +180 -165
- package/src/providers/raccoon/credits.js +185 -175
- package/src/providers/raccoon/crypto.js +43 -0
- package/src/providers/raccoon/envelope.js +31 -31
- package/src/providers/raccoon/headers.js +45 -45
- package/src/providers/raccoon/index.js +216 -216
- package/src/providers/raccoon/login.js +279 -279
- package/src/providers/raccoon/models.js +160 -160
- package/src/providers/raccoon/password-login.js +102 -87
- package/src/providers/raccoon/qr-codewords.js +115 -115
- package/src/providers/raccoon/qr.js +236 -236
- package/src/providers/raccoon/sse.js +135 -135
- package/src/providers/responses-channel.js +120 -120
- package/src/providers/share-keys.js +53 -53
- package/src/providers/traework/account-store.js +234 -234
- package/src/providers/traework/chat.js +217 -217
- package/src/providers/traework/checkin.js +77 -77
- package/src/providers/traework/constants.js +41 -41
- package/src/providers/traework/errors.js +52 -52
- package/src/providers/traework/headers.js +79 -79
- package/src/providers/traework/index.js +132 -132
- package/src/providers/traework/market-identity.js +116 -116
- package/src/providers/traework/models.js +98 -98
- package/src/providers/traework/payload.js +86 -86
- package/src/providers/traework/sse.js +184 -184
- package/src/providers/traework/token.js +52 -52
- package/src/providers/traework.js +2 -2
- package/src/providers/workbuddy/account-store.js +186 -186
- package/src/providers/workbuddy/auth.js +158 -158
- package/src/providers/workbuddy/balance.js +86 -86
- package/src/providers/workbuddy/cat-travel.js +125 -125
- package/src/providers/workbuddy/checkin.js +75 -75
- package/src/providers/workbuddy/desktop-info.js +78 -78
- package/src/providers/workbuddy/growth-api.js +67 -67
- package/src/providers/workbuddy/growth-plans.js +63 -63
- package/src/providers/workbuddy/growth.js +181 -181
- package/src/providers/workbuddy/index.js +217 -217
- package/src/providers/workbuddy/models.js +126 -126
- package/src/providers/workbuddy/payload.js +141 -141
- package/src/providers/workbuddy/rotation-log.js +83 -83
- package/src/providers/workbuddy/sanitize-tools.js +61 -61
- package/src/providers/workbuddy/sdk-chat.js +26 -26
- package/src/providers/workbuddy-balance.js +78 -78
- package/src/providers/zcode/account-store.js +129 -129
- package/src/providers/zcode/auth.js +28 -28
- package/src/providers/zcode/chat.js +179 -179
- package/src/providers/zcode/const.js +54 -54
- package/src/providers/zcode/context-shape.js +162 -162
- package/src/providers/zcode/headers.js +93 -93
- package/src/providers/zcode/index.js +124 -124
- package/src/providers/zcode/models.js +65 -65
- package/src/providers/zcode/oauth.js +120 -120
- package/src/providers/zcode/quota.js +176 -176
- package/src/providers/zcode/sse.js +196 -196
- package/src/readline-compat.js +25 -25
- package/src/responses/translate.js +311 -311
- package/src/routes/chat/broadband-handler.js +72 -72
- package/src/routes/chat/empty-turn-report.js +31 -31
- package/src/routes/chat/exhausted-handler.js +87 -87
- package/src/routes/chat/hedge-handler.js +130 -130
- package/src/routes/chat/index.js +1 -1
- package/src/routes/chat/local-handler.js +63 -63
- package/src/routes/chat/peer-handler.js +81 -81
- package/src/routes/chat.js +3 -3
- package/src/routes/fallback.js +88 -88
- package/src/routes/groups-relay.js +214 -214
- package/src/routes/groups.js +122 -122
- package/src/routes/helpers.js +83 -83
- package/src/routes/index.js +147 -147
- package/src/routes/messages-route.js +365 -365
- package/src/routes/peers.js +23 -1
- package/src/routes/relay-queue.js +181 -181
- package/src/routes/relay.js +60 -60
- package/src/routes/responses-route.js +213 -213
- package/src/routes/stream-body.js +84 -84
- package/src/routes/stream-hold.js +337 -337
- package/src/routes/stream-scan.js +366 -366
- package/src/routes.js +3 -3
- package/src/runtime/auto-update.js +113 -113
- package/src/runtime/bootstrap.js +8 -0
- package/src/runtime/broadband-stream.js +79 -79
- package/src/runtime/broadband.js +103 -103
- package/src/runtime/group-sync.js +81 -81
- package/src/runtime/keep-warm.js +120 -0
- package/src/runtime/lifecycle-forensics.js +116 -116
- package/src/runtime/lifecycle-log.js +87 -87
- package/src/runtime/log-stamp.js +73 -73
- package/src/runtime/proc-info.js +137 -137
- package/src/runtime/qoder-checkin.js +93 -93
- package/src/runtime/raccoon-checkin.js +126 -126
- package/src/runtime/server-lifecycle.js +189 -189
- package/src/runtime/traework-checkin.js +118 -118
- package/src/runtime/workbuddy-checkin.js +120 -120
- package/src/runtime/workbuddy-growth.js +133 -133
- package/src/server.js +7 -0
- package/src/state/facade.js +58 -58
- package/src/state/memory.js +162 -162
- package/src/state/merge.js +25 -25
- package/src/state/migrations/cline-unify.js +94 -94
- package/src/state/migrations.js +33 -33
- package/src/state/persist.js +42 -42
- package/src/state/provider-config.js +142 -142
- package/src/state/schemas/group.js +31 -31
- package/src/state/schemas/model.js +94 -94
- package/src/state/schemas/peer.js +31 -31
- package/src/state/schemas/port.js +10 -10
- package/src/state/schemas/provider.js +202 -202
- package/src/state/schemas/timezone.js +70 -70
- package/src/state/schemas/token.js +48 -48
- package/src/state/schemas/use-group.js +102 -102
- package/src/state/store.js +176 -176
- package/src/state.js +1 -1
- package/src/sync-claude-desktop.js +234 -234
- package/src/sync-claude.js +152 -152
- package/src/sync-codex.js +116 -116
- package/src/sync-workbuddy.js +158 -158
- package/src/talk-full-redact.js +129 -129
- package/src/talk-full.js +131 -131
- package/src/talk-log.js +257 -257
- package/src/text-tokens.js +52 -52
- package/src/thinking-effort.js +67 -67
- package/src/time.js +106 -106
- package/src/timeline.js +26 -26
- package/src/transport/index.js +1 -1
- package/src/upstream-engine/index.js +74 -72
- package/src/upstream-engine/mode.js +15 -15
- package/src/upstream-engine/sdk/attempt.js +221 -221
- package/src/upstream-engine/sdk/chat.js +28 -28
- package/src/upstream-engine/sdk/convert.js +192 -192
- package/src/upstream-engine/sdk/diagnose.js +62 -62
- package/src/upstream-engine/sdk/dispatch.js +55 -55
- package/src/upstream-engine/sdk/responses.js +176 -176
- package/src/upstream-engine/sdk/sse.js +166 -166
- package/src/upstream-responses.js +305 -305
- package/src/upstream.js +53 -1
- package/src/usage/record.js +106 -106
- package/src/usage/report.js +195 -195
- package/src/v6pool/claim.js +157 -157
- package/src/v6pool/config.js +65 -65
- package/src/v6pool/detect.js +130 -130
- package/src/v6pool/index.js +152 -152
- package/src/v6pool/prefix.js +140 -140
- package/src/v6pool/probe.js +40 -40
- package/src/v6pool/report.js +104 -104
- package/src/v6pool/rotate.js +263 -239
- package/src/warp-pool/config.js +74 -74
- package/src/warp-pool/health.js +106 -106
- package/src/warp-pool/identity.js +141 -141
- package/src/warp-pool/index.js +358 -358
- package/src/warp-pool/keys.js +29 -29
- package/src/warp-pool/nodes.js +95 -95
- package/src/warp-pool/ports.js +160 -160
- package/src/warp-pool/register.js +113 -113
- package/src/warp-pool/report.js +232 -232
- package/src/warp-pool/revive.js +168 -168
- package/src/warp-pool/rotate.js +214 -214
- package/src/warp-pool/strategy.js +43 -43
- package/src/warp-pool/verdict.js +69 -69
- package/src/warp-pool/wireproxy.js +162 -162
- package/docs/cli_help_mini.md +0 -146
- package/src/providers/AGENTS.md +0 -49
- package/src/routes/AGENTS.md +0 -37
package/src/cli/join-wizard.js
CHANGED
|
@@ -1,175 +1,175 @@
|
|
|
1
|
-
import { createInterface } from "../readline-compat.js";
|
|
2
|
-
import { normalizeLeaderUrl, joinGroupCore } from "./join-core.js";
|
|
3
|
-
import { compatFetch, timeoutSignal } from "../compat.js";
|
|
4
|
-
import { errMsg } from "./util.js";
|
|
5
|
-
|
|
6
|
-
const PROBE_TIMEOUT_MS = 6000;
|
|
7
|
-
const SERVICE_HEALTH_TIMEOUT_MS = 6000;
|
|
8
|
-
const MAX_ATTEMPTS = 3;
|
|
9
|
-
|
|
10
|
-
export function isTermux(env = process.env) {
|
|
11
|
-
return Boolean(env?.TERMUX_VERSION) || String(env?.PREFIX || "").includes("com.termux");
|
|
12
|
-
}
|
|
13
|
-
|
|
14
|
-
export function createAskSession() {
|
|
15
|
-
const rl = createInterface({ input: process.stdin, output: process.stdout, terminal: Boolean(process.stdin.isTTY) });
|
|
16
|
-
// 逐行异步迭代而非 rl.question:question 回调在管道/多行同 chunk 时会丢行(绑定前的行被 emit 掉),
|
|
17
|
-
// 且 stdin 结束(管道 EOF / Ctrl+D)时 pending 的 question 永不 resolve,会让顶层 await 悬挂退出(exit 13)。
|
|
18
|
-
const it = rl[Symbol.asyncIterator]();
|
|
19
|
-
return {
|
|
20
|
-
ask: async (q) => {
|
|
21
|
-
process.stdout.write(q);
|
|
22
|
-
const { value, done } = await it.next();
|
|
23
|
-
return done ? null : value;
|
|
24
|
-
},
|
|
25
|
-
close: () => {
|
|
26
|
-
try { rl.close(); } catch {}
|
|
27
|
-
},
|
|
28
|
-
};
|
|
29
|
-
}
|
|
30
|
-
|
|
31
|
-
/** 出口 IP:组长侧 clientIp() 视角(ADR-0006:不靠 ifconfig.me)。 */
|
|
32
|
-
export async function probeExitIp({ leaderUrl, token, group }) {
|
|
33
|
-
try {
|
|
34
|
-
const res = await compatFetch(`${leaderUrl}/v1/groups/relay/heartbeat`, {
|
|
35
|
-
method: "POST",
|
|
36
|
-
headers: { "Content-Type": "application/json", Authorization: `Bearer ${token}` },
|
|
37
|
-
body: JSON.stringify({ name: group, group }),
|
|
38
|
-
signal: timeoutSignal(PROBE_TIMEOUT_MS),
|
|
39
|
-
});
|
|
40
|
-
if (!res.ok) return null;
|
|
41
|
-
const j = await res.json().catch(() => null);
|
|
42
|
-
return j?.ip || null;
|
|
43
|
-
} catch {
|
|
44
|
-
return null;
|
|
45
|
-
}
|
|
46
|
-
}
|
|
47
|
-
|
|
48
|
-
/** 确保后台服务在跑:已在跑则复用;否则启动并等 health(daemon 的 10s ensure 会自动接上长连)。 */
|
|
49
|
-
export async function ensureServiceRunning() {
|
|
50
|
-
const { readPid, isPidAlive, startDaemon } = await import("../daemon.js");
|
|
51
|
-
const { waitForHealth, effectivePort } = await import("./policy.js");
|
|
52
|
-
const pid = readPid();
|
|
53
|
-
if (pid && isPidAlive(pid)) return { pid, started: false };
|
|
54
|
-
const newPid = startDaemon([]);
|
|
55
|
-
// 只认刚起的 pid:旧 daemon 若仍占端口,它的 /health 照样 200(同 BUG-29/30)。
|
|
56
|
-
const health = await waitForHealth(effectivePort([]), SERVICE_HEALTH_TIMEOUT_MS, { expectPid: newPid });
|
|
57
|
-
// 起完立即退出 = 端口被占(EADDRINUSE)。向导不能报「服务已启动」,那会把后续入组失败归错因。
|
|
58
|
-
if (!isPidAlive(newPid)) return { pid: null, started: false, failed: true, reason: "daemon exited right after start (port in use?)" };
|
|
59
|
-
return { pid: newPid, started: true, healthy: health.ok };
|
|
60
|
-
}
|
|
61
|
-
|
|
62
|
-
/**
|
|
63
|
-
* 手机宽带接入向导:问组长地址 → 问组名 → 宽带入组 → 报出口 IP → 确保服务运行 → 保活指引。
|
|
64
|
-
* 依赖全可注入(session/join/probeIp/ensureService/out/env),便于单测与复用。
|
|
65
|
-
* // Note: 为什么默认 broadband、为何用 iterator 而非 rl.question — 见 .agents/notes/implemented/feature/2026-09-16-mobile-broadband-join-wizard.md
|
|
66
|
-
*/
|
|
67
|
-
export async function runJoinWizard(opts = {}) {
|
|
68
|
-
const out = opts.out || ((line) => console.log(line));
|
|
69
|
-
const env = opts.env || process.env;
|
|
70
|
-
const session = opts.session || createAskSession();
|
|
71
|
-
const ask = opts.ask || ((q) => session.ask(q));
|
|
72
|
-
const join = opts.join || joinGroupCore;
|
|
73
|
-
const ensureService = opts.ensureService || ensureServiceRunning;
|
|
74
|
-
const probeIp = opts.probeIp || probeExitIp;
|
|
75
|
-
const maxAttempts = opts.maxAttempts ?? MAX_ATTEMPTS;
|
|
76
|
-
|
|
77
|
-
out("");
|
|
78
|
-
out(" 手机宽带接入 — 让这台设备成为组内出口(不占端口,只出站)");
|
|
79
|
-
out("");
|
|
80
|
-
|
|
81
|
-
let leaderUrl = null;
|
|
82
|
-
let name = String(opts.groupName ?? "").trim();
|
|
83
|
-
|
|
84
|
-
try {
|
|
85
|
-
if (opts.leaderInput) {
|
|
86
|
-
const norm = normalizeLeaderUrl(opts.leaderInput);
|
|
87
|
-
if (!norm.ok) {
|
|
88
|
-
out(`✗ 组长地址无效:${norm.reason}`);
|
|
89
|
-
out(" 重试:mslxdff -addtogroup");
|
|
90
|
-
return { ok: false, error: norm.reason };
|
|
91
|
-
}
|
|
92
|
-
leaderUrl = norm.url;
|
|
93
|
-
} else {
|
|
94
|
-
for (let i = 0; i < maxAttempts; i++) {
|
|
95
|
-
const raw = await ask("1/2 组长地址(ip:端口,如 149.13.91.10:8989): ");
|
|
96
|
-
if (raw === null) {
|
|
97
|
-
out("· 已取消(输入结束)");
|
|
98
|
-
return { ok: false, error: "cancelled" };
|
|
99
|
-
}
|
|
100
|
-
const norm = normalizeLeaderUrl(raw);
|
|
101
|
-
if (norm.ok) {
|
|
102
|
-
leaderUrl = norm.url;
|
|
103
|
-
break;
|
|
104
|
-
}
|
|
105
|
-
out(` ✗ ${norm.reason}`);
|
|
106
|
-
}
|
|
107
|
-
if (!leaderUrl) {
|
|
108
|
-
out("✗ 组长地址始终无效,已退出。重试:mslxdff -addtogroup");
|
|
109
|
-
return { ok: false, error: "invalid leader input" };
|
|
110
|
-
}
|
|
111
|
-
}
|
|
112
|
-
|
|
113
|
-
if (!name) {
|
|
114
|
-
for (let i = 0; i < maxAttempts; i++) {
|
|
115
|
-
const raw = await ask("2/2 组名: ");
|
|
116
|
-
if (raw === null) {
|
|
117
|
-
out("· 已取消(输入结束)");
|
|
118
|
-
return { ok: false, error: "cancelled" };
|
|
119
|
-
}
|
|
120
|
-
const v = String(raw).trim();
|
|
121
|
-
if (v) {
|
|
122
|
-
name = v;
|
|
123
|
-
break;
|
|
124
|
-
}
|
|
125
|
-
out(" ✗ 组名不能为空");
|
|
126
|
-
}
|
|
127
|
-
if (!name) {
|
|
128
|
-
out("✗ 未填写组名,已退出。重试:mslxdff -addtogroup");
|
|
129
|
-
return { ok: false, error: "empty group name" };
|
|
130
|
-
}
|
|
131
|
-
}
|
|
132
|
-
} finally {
|
|
133
|
-
session.close();
|
|
134
|
-
}
|
|
135
|
-
|
|
136
|
-
out(`→ 正在连接组长 ${leaderUrl} ...`);
|
|
137
|
-
const r = await join({ leaderHost: leaderUrl, name, isBroadband: true });
|
|
138
|
-
if (!r?.ok) {
|
|
139
|
-
out(`✗ 加入失败:${r?.error || "未知错误"}`);
|
|
140
|
-
out(" 检查:① 地址与端口是否正确 ② 组长服务是否在跑 ③ 手机网络是否可达");
|
|
141
|
-
out(" 重试:mslxdff -addtogroup");
|
|
142
|
-
return { ok: false, leaderUrl, error: r?.error || "join failed" };
|
|
143
|
-
}
|
|
144
|
-
out(`✓ 已加入组「${name}」(宽带成员 ${r.myUrl})`);
|
|
145
|
-
if (r.syncError) out(` ⚠ 组员列表同步失败(不影响出口贡献):${r.syncError}`);
|
|
146
|
-
|
|
147
|
-
out("→ 正在确认出口 IP ...");
|
|
148
|
-
const exitIp = await probeIp({ leaderUrl: r.leaderUrl || leaderUrl, token: r.token, group: name }).catch(() => null);
|
|
149
|
-
if (exitIp) out(`✓ 出口 IP: ${exitIp}(组长视角,上游分流按这个 IP)`);
|
|
150
|
-
else out("· 出口 IP 待确认(组长暂时不可达,恢复后自动重试)");
|
|
151
|
-
|
|
152
|
-
out("→ 正在启动后台服务 ...");
|
|
153
|
-
const service = await ensureService().catch((err) => ({ error: errMsg(err) }));
|
|
154
|
-
if (service?.error || service?.failed) {
|
|
155
|
-
// failed 是「进程起来又立刻死了」(端口被占用):不能落到下面「已在运行(pid null)」分支谎报成功。
|
|
156
|
-
out(`✗ 后台服务启动失败:${service.error || service.reason}`);
|
|
157
|
-
out(" 手动启动:mslxdff -d 查看日志:mslxdff -log 50");
|
|
158
|
-
} else if (service?.started) {
|
|
159
|
-
out(`✓ 后台服务已启动(pid ${service.pid})`);
|
|
160
|
-
} else {
|
|
161
|
-
out(`✓ 后台服务已在运行(pid ${service.pid}),已自动接入`);
|
|
162
|
-
}
|
|
163
|
-
|
|
164
|
-
out("");
|
|
165
|
-
out("保持在线:");
|
|
166
|
-
if (isTermux(env)) {
|
|
167
|
-
out(" • termux-wake-lock 防止系统休眠杀进程(强烈建议)");
|
|
168
|
-
} else {
|
|
169
|
-
out(" • 关机/断网后需重跑本命令");
|
|
170
|
-
}
|
|
171
|
-
out(" • mslxdff -status 查看组与出口状态");
|
|
172
|
-
out(" • mslxdff -stop 停止贡献");
|
|
173
|
-
out("");
|
|
174
|
-
return { ok: true, leaderUrl, name, myUrl: r.myUrl, exitIp, service };
|
|
175
|
-
}
|
|
1
|
+
import { createInterface } from "../readline-compat.js";
|
|
2
|
+
import { normalizeLeaderUrl, joinGroupCore } from "./join-core.js";
|
|
3
|
+
import { compatFetch, timeoutSignal } from "../compat.js";
|
|
4
|
+
import { errMsg } from "./util.js";
|
|
5
|
+
|
|
6
|
+
const PROBE_TIMEOUT_MS = 6000;
|
|
7
|
+
const SERVICE_HEALTH_TIMEOUT_MS = 6000;
|
|
8
|
+
const MAX_ATTEMPTS = 3;
|
|
9
|
+
|
|
10
|
+
export function isTermux(env = process.env) {
|
|
11
|
+
return Boolean(env?.TERMUX_VERSION) || String(env?.PREFIX || "").includes("com.termux");
|
|
12
|
+
}
|
|
13
|
+
|
|
14
|
+
export function createAskSession() {
|
|
15
|
+
const rl = createInterface({ input: process.stdin, output: process.stdout, terminal: Boolean(process.stdin.isTTY) });
|
|
16
|
+
// 逐行异步迭代而非 rl.question:question 回调在管道/多行同 chunk 时会丢行(绑定前的行被 emit 掉),
|
|
17
|
+
// 且 stdin 结束(管道 EOF / Ctrl+D)时 pending 的 question 永不 resolve,会让顶层 await 悬挂退出(exit 13)。
|
|
18
|
+
const it = rl[Symbol.asyncIterator]();
|
|
19
|
+
return {
|
|
20
|
+
ask: async (q) => {
|
|
21
|
+
process.stdout.write(q);
|
|
22
|
+
const { value, done } = await it.next();
|
|
23
|
+
return done ? null : value;
|
|
24
|
+
},
|
|
25
|
+
close: () => {
|
|
26
|
+
try { rl.close(); } catch {}
|
|
27
|
+
},
|
|
28
|
+
};
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
/** 出口 IP:组长侧 clientIp() 视角(ADR-0006:不靠 ifconfig.me)。 */
|
|
32
|
+
export async function probeExitIp({ leaderUrl, token, group }) {
|
|
33
|
+
try {
|
|
34
|
+
const res = await compatFetch(`${leaderUrl}/v1/groups/relay/heartbeat`, {
|
|
35
|
+
method: "POST",
|
|
36
|
+
headers: { "Content-Type": "application/json", Authorization: `Bearer ${token}` },
|
|
37
|
+
body: JSON.stringify({ name: group, group }),
|
|
38
|
+
signal: timeoutSignal(PROBE_TIMEOUT_MS),
|
|
39
|
+
});
|
|
40
|
+
if (!res.ok) return null;
|
|
41
|
+
const j = await res.json().catch(() => null);
|
|
42
|
+
return j?.ip || null;
|
|
43
|
+
} catch {
|
|
44
|
+
return null;
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
/** 确保后台服务在跑:已在跑则复用;否则启动并等 health(daemon 的 10s ensure 会自动接上长连)。 */
|
|
49
|
+
export async function ensureServiceRunning() {
|
|
50
|
+
const { readPid, isPidAlive, startDaemon } = await import("../daemon.js");
|
|
51
|
+
const { waitForHealth, effectivePort } = await import("./policy.js");
|
|
52
|
+
const pid = readPid();
|
|
53
|
+
if (pid && isPidAlive(pid)) return { pid, started: false };
|
|
54
|
+
const newPid = startDaemon([]);
|
|
55
|
+
// 只认刚起的 pid:旧 daemon 若仍占端口,它的 /health 照样 200(同 BUG-29/30)。
|
|
56
|
+
const health = await waitForHealth(effectivePort([]), SERVICE_HEALTH_TIMEOUT_MS, { expectPid: newPid });
|
|
57
|
+
// 起完立即退出 = 端口被占(EADDRINUSE)。向导不能报「服务已启动」,那会把后续入组失败归错因。
|
|
58
|
+
if (!isPidAlive(newPid)) return { pid: null, started: false, failed: true, reason: "daemon exited right after start (port in use?)" };
|
|
59
|
+
return { pid: newPid, started: true, healthy: health.ok };
|
|
60
|
+
}
|
|
61
|
+
|
|
62
|
+
/**
|
|
63
|
+
* 手机宽带接入向导:问组长地址 → 问组名 → 宽带入组 → 报出口 IP → 确保服务运行 → 保活指引。
|
|
64
|
+
* 依赖全可注入(session/join/probeIp/ensureService/out/env),便于单测与复用。
|
|
65
|
+
* // Note: 为什么默认 broadband、为何用 iterator 而非 rl.question — 见 .agents/notes/implemented/feature/2026-09-16-mobile-broadband-join-wizard.md
|
|
66
|
+
*/
|
|
67
|
+
export async function runJoinWizard(opts = {}) {
|
|
68
|
+
const out = opts.out || ((line) => console.log(line));
|
|
69
|
+
const env = opts.env || process.env;
|
|
70
|
+
const session = opts.session || createAskSession();
|
|
71
|
+
const ask = opts.ask || ((q) => session.ask(q));
|
|
72
|
+
const join = opts.join || joinGroupCore;
|
|
73
|
+
const ensureService = opts.ensureService || ensureServiceRunning;
|
|
74
|
+
const probeIp = opts.probeIp || probeExitIp;
|
|
75
|
+
const maxAttempts = opts.maxAttempts ?? MAX_ATTEMPTS;
|
|
76
|
+
|
|
77
|
+
out("");
|
|
78
|
+
out(" 手机宽带接入 — 让这台设备成为组内出口(不占端口,只出站)");
|
|
79
|
+
out("");
|
|
80
|
+
|
|
81
|
+
let leaderUrl = null;
|
|
82
|
+
let name = String(opts.groupName ?? "").trim();
|
|
83
|
+
|
|
84
|
+
try {
|
|
85
|
+
if (opts.leaderInput) {
|
|
86
|
+
const norm = normalizeLeaderUrl(opts.leaderInput);
|
|
87
|
+
if (!norm.ok) {
|
|
88
|
+
out(`✗ 组长地址无效:${norm.reason}`);
|
|
89
|
+
out(" 重试:mslxdff -addtogroup");
|
|
90
|
+
return { ok: false, error: norm.reason };
|
|
91
|
+
}
|
|
92
|
+
leaderUrl = norm.url;
|
|
93
|
+
} else {
|
|
94
|
+
for (let i = 0; i < maxAttempts; i++) {
|
|
95
|
+
const raw = await ask("1/2 组长地址(ip:端口,如 149.13.91.10:8989): ");
|
|
96
|
+
if (raw === null) {
|
|
97
|
+
out("· 已取消(输入结束)");
|
|
98
|
+
return { ok: false, error: "cancelled" };
|
|
99
|
+
}
|
|
100
|
+
const norm = normalizeLeaderUrl(raw);
|
|
101
|
+
if (norm.ok) {
|
|
102
|
+
leaderUrl = norm.url;
|
|
103
|
+
break;
|
|
104
|
+
}
|
|
105
|
+
out(` ✗ ${norm.reason}`);
|
|
106
|
+
}
|
|
107
|
+
if (!leaderUrl) {
|
|
108
|
+
out("✗ 组长地址始终无效,已退出。重试:mslxdff -addtogroup");
|
|
109
|
+
return { ok: false, error: "invalid leader input" };
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
|
|
113
|
+
if (!name) {
|
|
114
|
+
for (let i = 0; i < maxAttempts; i++) {
|
|
115
|
+
const raw = await ask("2/2 组名: ");
|
|
116
|
+
if (raw === null) {
|
|
117
|
+
out("· 已取消(输入结束)");
|
|
118
|
+
return { ok: false, error: "cancelled" };
|
|
119
|
+
}
|
|
120
|
+
const v = String(raw).trim();
|
|
121
|
+
if (v) {
|
|
122
|
+
name = v;
|
|
123
|
+
break;
|
|
124
|
+
}
|
|
125
|
+
out(" ✗ 组名不能为空");
|
|
126
|
+
}
|
|
127
|
+
if (!name) {
|
|
128
|
+
out("✗ 未填写组名,已退出。重试:mslxdff -addtogroup");
|
|
129
|
+
return { ok: false, error: "empty group name" };
|
|
130
|
+
}
|
|
131
|
+
}
|
|
132
|
+
} finally {
|
|
133
|
+
session.close();
|
|
134
|
+
}
|
|
135
|
+
|
|
136
|
+
out(`→ 正在连接组长 ${leaderUrl} ...`);
|
|
137
|
+
const r = await join({ leaderHost: leaderUrl, name, isBroadband: true });
|
|
138
|
+
if (!r?.ok) {
|
|
139
|
+
out(`✗ 加入失败:${r?.error || "未知错误"}`);
|
|
140
|
+
out(" 检查:① 地址与端口是否正确 ② 组长服务是否在跑 ③ 手机网络是否可达");
|
|
141
|
+
out(" 重试:mslxdff -addtogroup");
|
|
142
|
+
return { ok: false, leaderUrl, error: r?.error || "join failed" };
|
|
143
|
+
}
|
|
144
|
+
out(`✓ 已加入组「${name}」(宽带成员 ${r.myUrl})`);
|
|
145
|
+
if (r.syncError) out(` ⚠ 组员列表同步失败(不影响出口贡献):${r.syncError}`);
|
|
146
|
+
|
|
147
|
+
out("→ 正在确认出口 IP ...");
|
|
148
|
+
const exitIp = await probeIp({ leaderUrl: r.leaderUrl || leaderUrl, token: r.token, group: name }).catch(() => null);
|
|
149
|
+
if (exitIp) out(`✓ 出口 IP: ${exitIp}(组长视角,上游分流按这个 IP)`);
|
|
150
|
+
else out("· 出口 IP 待确认(组长暂时不可达,恢复后自动重试)");
|
|
151
|
+
|
|
152
|
+
out("→ 正在启动后台服务 ...");
|
|
153
|
+
const service = await ensureService().catch((err) => ({ error: errMsg(err) }));
|
|
154
|
+
if (service?.error || service?.failed) {
|
|
155
|
+
// failed 是「进程起来又立刻死了」(端口被占用):不能落到下面「已在运行(pid null)」分支谎报成功。
|
|
156
|
+
out(`✗ 后台服务启动失败:${service.error || service.reason}`);
|
|
157
|
+
out(" 手动启动:mslxdff -d 查看日志:mslxdff -log 50");
|
|
158
|
+
} else if (service?.started) {
|
|
159
|
+
out(`✓ 后台服务已启动(pid ${service.pid})`);
|
|
160
|
+
} else {
|
|
161
|
+
out(`✓ 后台服务已在运行(pid ${service.pid}),已自动接入`);
|
|
162
|
+
}
|
|
163
|
+
|
|
164
|
+
out("");
|
|
165
|
+
out("保持在线:");
|
|
166
|
+
if (isTermux(env)) {
|
|
167
|
+
out(" • termux-wake-lock 防止系统休眠杀进程(强烈建议)");
|
|
168
|
+
} else {
|
|
169
|
+
out(" • 关机/断网后需重跑本命令");
|
|
170
|
+
}
|
|
171
|
+
out(" • mslxdff -status 查看组与出口状态");
|
|
172
|
+
out(" • mslxdff -stop 停止贡献");
|
|
173
|
+
out("");
|
|
174
|
+
return { ok: true, leaderUrl, name, myUrl: r.myUrl, exitIp, service };
|
|
175
|
+
}
|
package/src/cli/policy.js
CHANGED
|
@@ -1,136 +1,136 @@
|
|
|
1
|
-
import { readPid, readPidVersion, isPidAlive, stopDaemon } from "../daemon.js";
|
|
2
|
-
import { resolvePort } from "../server.js";
|
|
3
|
-
import { getPort, loadGroupsJoined } from "../state.js";
|
|
4
|
-
import { compatFetch } from "../compat.js";
|
|
5
|
-
|
|
6
|
-
export function compareSemver(a, b) {
|
|
7
|
-
const pa = a.split(".").map((x) => parseInt(x, 10) || 0);
|
|
8
|
-
const pb = b.split(".").map((x) => parseInt(x, 10) || 0);
|
|
9
|
-
for (let i = 0; i < Math.max(pa.length, pb.length); i++) {
|
|
10
|
-
const av = pa[i] || 0, bv = pb[i] || 0;
|
|
11
|
-
if (av !== bv) return av - bv;
|
|
12
|
-
}
|
|
13
|
-
return 0;
|
|
14
|
-
}
|
|
15
|
-
|
|
16
|
-
export function argValue(args, ...names) {
|
|
17
|
-
for (let i = 0; i < args.length; i++) {
|
|
18
|
-
if (names.includes(args[i])) return args[i + 1];
|
|
19
|
-
}
|
|
20
|
-
return null;
|
|
21
|
-
}
|
|
22
|
-
|
|
23
|
-
export function effectivePort(args) {
|
|
24
|
-
const arg = argValue(args, "-port", "--port");
|
|
25
|
-
if (arg) return Number(arg);
|
|
26
|
-
return resolvePort();
|
|
27
|
-
}
|
|
28
|
-
|
|
29
|
-
export function effectiveHost() {
|
|
30
|
-
const envHost = process.env.MSLXDFF_HOST || process.env.MSLXDFF_BIND_HOST;
|
|
31
|
-
if (typeof envHost === "string" && envHost.trim()) return envHost.trim();
|
|
32
|
-
try {
|
|
33
|
-
const joined = loadGroupsJoined();
|
|
34
|
-
if (joined.some((g) => g.kind === "broadband")) return "127.0.0.1";
|
|
35
|
-
} catch {}
|
|
36
|
-
return "0.0.0.0";
|
|
37
|
-
}
|
|
38
|
-
|
|
39
|
-
/**
|
|
40
|
-
* 等 /health 可用。给了 expectPid 就**只认那个 pid**:旧 daemon 仍占着端口时它也会回 200,
|
|
41
|
-
* 不校验身份的话「新进程 EADDRINUSE 秒退、旧版还在服务」会被当成启动成功(BUG-29)。
|
|
42
|
-
* 返回 { ok, pid, version }:ok=true 表示确认到位(无 expectPid 时即 res.ok)。
|
|
43
|
-
*/
|
|
44
|
-
export async function waitForHealth(port, timeoutMs, { expectPid = null } = {}) {
|
|
45
|
-
const start = Date.now();
|
|
46
|
-
while (Date.now() - start < timeoutMs) {
|
|
47
|
-
try {
|
|
48
|
-
const res = await compatFetch(`http://127.0.0.1:${port}/health`);
|
|
49
|
-
if (res.ok) {
|
|
50
|
-
if (expectPid == null) return { ok: true, pid: null, version: null };
|
|
51
|
-
let body = null;
|
|
52
|
-
try { body = await res.json(); } catch { /* 老版本 daemon 不认 JSON 之外的东西 */ }
|
|
53
|
-
// 老版本 /health 只回 {status:"ok"},没有 pid ⇒ 无法证明是新进程,继续等(旧版本来就该被换掉)
|
|
54
|
-
if (body && Number(body.pid) === Number(expectPid)) return { ok: true, pid: body.pid, version: body.version ?? null };
|
|
55
|
-
}
|
|
56
|
-
} catch {
|
|
57
|
-
// not up yet
|
|
58
|
-
}
|
|
59
|
-
await new Promise((r) => setTimeout(r, 100));
|
|
60
|
-
}
|
|
61
|
-
return { ok: false, pid: null, version: null };
|
|
62
|
-
}
|
|
63
|
-
|
|
64
|
-
// Only upgrade, never downgrade. Keeps a newer daemon running.
|
|
65
|
-
export function stopDaemonIfOutdated(VERSION) {
|
|
66
|
-
const pid = readPid();
|
|
67
|
-
if (!pid) return;
|
|
68
|
-
if (!isPidAlive(pid)) {
|
|
69
|
-
console.log(`daemon pid ${pid} is stale (not running) — starting fresh`);
|
|
70
|
-
return;
|
|
71
|
-
}
|
|
72
|
-
const runningVersion = readPidVersion();
|
|
73
|
-
if (!runningVersion) {
|
|
74
|
-
console.log(`daemon version unknown — restarting with v${VERSION}...`);
|
|
75
|
-
stopDaemon({ reason: "upgrade" });
|
|
76
|
-
return;
|
|
77
|
-
}
|
|
78
|
-
if (runningVersion === VERSION) return;
|
|
79
|
-
const cmp = compareSemver(VERSION, runningVersion);
|
|
80
|
-
if (cmp <= 0) {
|
|
81
|
-
console.log(`daemon running v${runningVersion} — keeping v${runningVersion} (local v${VERSION} is lower, not downgrading)`);
|
|
82
|
-
return;
|
|
83
|
-
}
|
|
84
|
-
console.log(`daemon running v${runningVersion} — upgrading to v${VERSION}, restarting...`);
|
|
85
|
-
stopDaemon({ reason: "upgrade" });
|
|
86
|
-
}
|
|
87
|
-
|
|
88
|
-
export function refreshIntervalMs() {
|
|
89
|
-
const n = Number(process.env.MODELS_REFRESH_MS);
|
|
90
|
-
return Number.isInteger(n) && n > 0 ? n : 2 * 60 * 60 * 1000;
|
|
91
|
-
}
|
|
92
|
-
export function modelCooldownMs() {
|
|
93
|
-
const n = Number(process.env.MSLXDFF_MODEL_COOLDOWN_MS);
|
|
94
|
-
return Number.isInteger(n) && n > 0 ? n : 60_000;
|
|
95
|
-
}
|
|
96
|
-
export function slowCooldownMs() {
|
|
97
|
-
const n = Number(process.env.MSLXDFF_SLOW_COOLDOWN_MS);
|
|
98
|
-
return Number.isInteger(n) && n > 0 ? n : 5 * 60_000;
|
|
99
|
-
}
|
|
100
|
-
export function peerCooldownMs() {
|
|
101
|
-
const n = Number(process.env.MSLXDFF_PEER_COOLDOWN_MS);
|
|
102
|
-
return Number.isInteger(n) && n > 0 ? n :
|
|
103
|
-
}
|
|
104
|
-
export function peerLimitCooldownMs() {
|
|
105
|
-
const n = Number(process.env.MSLXDFF_PEER_LIMIT_COOLDOWN_MS);
|
|
106
|
-
return Number.isInteger(n) && n > 0 ? n :
|
|
107
|
-
}
|
|
108
|
-
export function peerHeatMs() {
|
|
109
|
-
const n = Number(process.env.MSLXDFF_PEER_HEAT_MS);
|
|
110
|
-
return Number.isInteger(n) && n > 0 ? n : 5 * 60_000;
|
|
111
|
-
}
|
|
112
|
-
export function maxHopsValue() {
|
|
113
|
-
const n = Number(process.env.MSLXDFF_MAX_HOPS);
|
|
114
|
-
return Number.isInteger(n) && n > 0 ? n : 3;
|
|
115
|
-
}
|
|
116
|
-
export function groupSyncIntervalMs() {
|
|
117
|
-
const n = Number(process.env.MSLXDFF_GROUP_SYNC_MS);
|
|
118
|
-
return Number.isInteger(n) && n > 0 ? n : 60_000;
|
|
119
|
-
}
|
|
120
|
-
export function autoUpdateIntervalMs() {
|
|
121
|
-
const raw = process.env.MSLXDFF_AUTO_UPDATE_MS ?? process.env.MSLXDFF_AUTO_UPDATE;
|
|
122
|
-
if (raw === undefined || raw === null || raw === "") return 60 * 60 * 1000;
|
|
123
|
-
const s = String(raw).trim().toLowerCase();
|
|
124
|
-
if (s === "0" || s === "off" || s === "false" || s === "no" || s === "disable" || s === "disabled") return 0;
|
|
125
|
-
if (s === "1" || s === "true" || s === "on" || s === "yes" || s === "enable" || s === "enabled") return 60 * 60 * 1000;
|
|
126
|
-
const n = Number(raw);
|
|
127
|
-
return Number.isInteger(n) && n > 0 ? n : 60 * 60 * 1000;
|
|
128
|
-
}
|
|
129
|
-
export function banWindowMs() {
|
|
130
|
-
const n = Number(process.env.MSLXDFF_BAN_WINDOW_MS);
|
|
131
|
-
return Number.isInteger(n) && n > 0 ? n : 48 * 60 * 60 * 1000;
|
|
132
|
-
}
|
|
133
|
-
export function banThreshold() {
|
|
134
|
-
const n = Number(process.env.MSLXDFF_BAN_THRESHOLD);
|
|
135
|
-
return Number.isInteger(n) && n > 0 ? n : 5;
|
|
136
|
-
}
|
|
1
|
+
import { readPid, readPidVersion, isPidAlive, stopDaemon } from "../daemon.js";
|
|
2
|
+
import { resolvePort } from "../server.js";
|
|
3
|
+
import { getPort, loadGroupsJoined } from "../state.js";
|
|
4
|
+
import { compatFetch } from "../compat.js";
|
|
5
|
+
|
|
6
|
+
export function compareSemver(a, b) {
|
|
7
|
+
const pa = a.split(".").map((x) => parseInt(x, 10) || 0);
|
|
8
|
+
const pb = b.split(".").map((x) => parseInt(x, 10) || 0);
|
|
9
|
+
for (let i = 0; i < Math.max(pa.length, pb.length); i++) {
|
|
10
|
+
const av = pa[i] || 0, bv = pb[i] || 0;
|
|
11
|
+
if (av !== bv) return av - bv;
|
|
12
|
+
}
|
|
13
|
+
return 0;
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
export function argValue(args, ...names) {
|
|
17
|
+
for (let i = 0; i < args.length; i++) {
|
|
18
|
+
if (names.includes(args[i])) return args[i + 1];
|
|
19
|
+
}
|
|
20
|
+
return null;
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
export function effectivePort(args) {
|
|
24
|
+
const arg = argValue(args, "-port", "--port");
|
|
25
|
+
if (arg) return Number(arg);
|
|
26
|
+
return resolvePort();
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
export function effectiveHost() {
|
|
30
|
+
const envHost = process.env.MSLXDFF_HOST || process.env.MSLXDFF_BIND_HOST;
|
|
31
|
+
if (typeof envHost === "string" && envHost.trim()) return envHost.trim();
|
|
32
|
+
try {
|
|
33
|
+
const joined = loadGroupsJoined();
|
|
34
|
+
if (joined.some((g) => g.kind === "broadband")) return "127.0.0.1";
|
|
35
|
+
} catch {}
|
|
36
|
+
return "0.0.0.0";
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
/**
|
|
40
|
+
* 等 /health 可用。给了 expectPid 就**只认那个 pid**:旧 daemon 仍占着端口时它也会回 200,
|
|
41
|
+
* 不校验身份的话「新进程 EADDRINUSE 秒退、旧版还在服务」会被当成启动成功(BUG-29)。
|
|
42
|
+
* 返回 { ok, pid, version }:ok=true 表示确认到位(无 expectPid 时即 res.ok)。
|
|
43
|
+
*/
|
|
44
|
+
export async function waitForHealth(port, timeoutMs, { expectPid = null } = {}) {
|
|
45
|
+
const start = Date.now();
|
|
46
|
+
while (Date.now() - start < timeoutMs) {
|
|
47
|
+
try {
|
|
48
|
+
const res = await compatFetch(`http://127.0.0.1:${port}/health`);
|
|
49
|
+
if (res.ok) {
|
|
50
|
+
if (expectPid == null) return { ok: true, pid: null, version: null };
|
|
51
|
+
let body = null;
|
|
52
|
+
try { body = await res.json(); } catch { /* 老版本 daemon 不认 JSON 之外的东西 */ }
|
|
53
|
+
// 老版本 /health 只回 {status:"ok"},没有 pid ⇒ 无法证明是新进程,继续等(旧版本来就该被换掉)
|
|
54
|
+
if (body && Number(body.pid) === Number(expectPid)) return { ok: true, pid: body.pid, version: body.version ?? null };
|
|
55
|
+
}
|
|
56
|
+
} catch {
|
|
57
|
+
// not up yet
|
|
58
|
+
}
|
|
59
|
+
await new Promise((r) => setTimeout(r, 100));
|
|
60
|
+
}
|
|
61
|
+
return { ok: false, pid: null, version: null };
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
// Only upgrade, never downgrade. Keeps a newer daemon running.
|
|
65
|
+
export function stopDaemonIfOutdated(VERSION) {
|
|
66
|
+
const pid = readPid();
|
|
67
|
+
if (!pid) return;
|
|
68
|
+
if (!isPidAlive(pid)) {
|
|
69
|
+
console.log(`daemon pid ${pid} is stale (not running) — starting fresh`);
|
|
70
|
+
return;
|
|
71
|
+
}
|
|
72
|
+
const runningVersion = readPidVersion();
|
|
73
|
+
if (!runningVersion) {
|
|
74
|
+
console.log(`daemon version unknown — restarting with v${VERSION}...`);
|
|
75
|
+
stopDaemon({ reason: "upgrade" });
|
|
76
|
+
return;
|
|
77
|
+
}
|
|
78
|
+
if (runningVersion === VERSION) return;
|
|
79
|
+
const cmp = compareSemver(VERSION, runningVersion);
|
|
80
|
+
if (cmp <= 0) {
|
|
81
|
+
console.log(`daemon running v${runningVersion} — keeping v${runningVersion} (local v${VERSION} is lower, not downgrading)`);
|
|
82
|
+
return;
|
|
83
|
+
}
|
|
84
|
+
console.log(`daemon running v${runningVersion} — upgrading to v${VERSION}, restarting...`);
|
|
85
|
+
stopDaemon({ reason: "upgrade" });
|
|
86
|
+
}
|
|
87
|
+
|
|
88
|
+
export function refreshIntervalMs() {
|
|
89
|
+
const n = Number(process.env.MODELS_REFRESH_MS);
|
|
90
|
+
return Number.isInteger(n) && n > 0 ? n : 2 * 60 * 60 * 1000;
|
|
91
|
+
}
|
|
92
|
+
export function modelCooldownMs() {
|
|
93
|
+
const n = Number(process.env.MSLXDFF_MODEL_COOLDOWN_MS);
|
|
94
|
+
return Number.isInteger(n) && n > 0 ? n : 60_000;
|
|
95
|
+
}
|
|
96
|
+
export function slowCooldownMs() {
|
|
97
|
+
const n = Number(process.env.MSLXDFF_SLOW_COOLDOWN_MS);
|
|
98
|
+
return Number.isInteger(n) && n > 0 ? n : 5 * 60_000;
|
|
99
|
+
}
|
|
100
|
+
export function peerCooldownMs() {
|
|
101
|
+
const n = Number(process.env.MSLXDFF_PEER_COOLDOWN_MS);
|
|
102
|
+
return Number.isInteger(n) && n > 0 ? n : 10_000;
|
|
103
|
+
}
|
|
104
|
+
export function peerLimitCooldownMs() {
|
|
105
|
+
const n = Number(process.env.MSLXDFF_PEER_LIMIT_COOLDOWN_MS);
|
|
106
|
+
return Number.isInteger(n) && n > 0 ? n : 10 * 60_000;
|
|
107
|
+
}
|
|
108
|
+
export function peerHeatMs() {
|
|
109
|
+
const n = Number(process.env.MSLXDFF_PEER_HEAT_MS);
|
|
110
|
+
return Number.isInteger(n) && n > 0 ? n : 5 * 60_000;
|
|
111
|
+
}
|
|
112
|
+
export function maxHopsValue() {
|
|
113
|
+
const n = Number(process.env.MSLXDFF_MAX_HOPS);
|
|
114
|
+
return Number.isInteger(n) && n > 0 ? n : 3;
|
|
115
|
+
}
|
|
116
|
+
export function groupSyncIntervalMs() {
|
|
117
|
+
const n = Number(process.env.MSLXDFF_GROUP_SYNC_MS);
|
|
118
|
+
return Number.isInteger(n) && n > 0 ? n : 60_000;
|
|
119
|
+
}
|
|
120
|
+
export function autoUpdateIntervalMs() {
|
|
121
|
+
const raw = process.env.MSLXDFF_AUTO_UPDATE_MS ?? process.env.MSLXDFF_AUTO_UPDATE;
|
|
122
|
+
if (raw === undefined || raw === null || raw === "") return 60 * 60 * 1000;
|
|
123
|
+
const s = String(raw).trim().toLowerCase();
|
|
124
|
+
if (s === "0" || s === "off" || s === "false" || s === "no" || s === "disable" || s === "disabled") return 0;
|
|
125
|
+
if (s === "1" || s === "true" || s === "on" || s === "yes" || s === "enable" || s === "enabled") return 60 * 60 * 1000;
|
|
126
|
+
const n = Number(raw);
|
|
127
|
+
return Number.isInteger(n) && n > 0 ? n : 60 * 60 * 1000;
|
|
128
|
+
}
|
|
129
|
+
export function banWindowMs() {
|
|
130
|
+
const n = Number(process.env.MSLXDFF_BAN_WINDOW_MS);
|
|
131
|
+
return Number.isInteger(n) && n > 0 ? n : 48 * 60 * 60 * 1000;
|
|
132
|
+
}
|
|
133
|
+
export function banThreshold() {
|
|
134
|
+
const n = Number(process.env.MSLXDFF_BAN_THRESHOLD);
|
|
135
|
+
return Number.isInteger(n) && n > 0 ? n : 5;
|
|
136
|
+
}
|