mslxdff 0.1.203 → 0.1.207
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/docs/cli_help_mini.md +146 -0
- package/package.json +38 -38
- package/plugins/README.md +14 -14
- package/plugins/prefer-model.mjs.example +14 -14
- package/src/anthropic/canonical-json.js +55 -0
- package/src/anthropic/count-tokens.js +61 -61
- package/src/anthropic/request-body.js +183 -126
- package/src/anthropic/request-shape.js +60 -0
- package/src/anthropic/session-id.js +58 -0
- package/src/anthropic/shared.js +18 -18
- package/src/anthropic/sse-aggregate.js +56 -56
- package/src/anthropic/tool-media.js +75 -0
- package/src/anthropic/translate.js +296 -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/index.js +8 -40
- package/src/chat-pipeline/serial-trial.js +279 -283
- package/src/chat-pipeline/terminal-verdict.js +132 -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 +158 -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 +71 -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 -254
- package/src/plugins.js +107 -107
- package/src/providers/AGENTS.md +49 -0
- 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 -180
- package/src/providers/raccoon/credits.js +185 -185
- package/src/providers/raccoon/crypto.js +43 -43
- 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 -102
- 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/AGENTS.md +37 -0
- 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 +93 -83
- package/src/routes/index.js +147 -147
- package/src/routes/messages-route.js +375 -365
- package/src/routes/peers.js +10 -2
- 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/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 -120
- 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/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 -74
- 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/usage/cache-fields.js +58 -0
- package/src/usage/record.js +109 -106
- package/src/usage/report.js +209 -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 -263
- 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/src/warp-pool/config.js
CHANGED
|
@@ -1,74 +1,74 @@
|
|
|
1
|
-
// warp-pool · 配置解析:env 优先,缺省值集中在一处;纯函数,便于单测。
|
|
2
|
-
import { join } from "node:path";
|
|
3
|
-
import { logDir } from "../logs.js";
|
|
4
|
-
|
|
5
|
-
/** 缺省开 + 429 时换身份换出口:他项目真机实测「同一身份连发 3 次 429,身份一换同一个请求立刻 200」⇒ 换身份=换桶。 */
|
|
6
|
-
export const DEFAULTS = {
|
|
7
|
-
enabled: true,
|
|
8
|
-
mode: "leader",
|
|
9
|
-
count: 4,
|
|
10
|
-
basePort: 10800,
|
|
11
|
-
strategy: "session",
|
|
12
|
-
cooldownMs: 600_000,
|
|
13
|
-
autodownload: true,
|
|
14
|
-
registerMinGapMs: 6_000,
|
|
15
|
-
registerMaxGapMs: 15_000,
|
|
16
|
-
probePath: "/zen/v1/models",
|
|
17
|
-
rotate: true,
|
|
18
|
-
};
|
|
19
|
-
|
|
20
|
-
const OFF = ["0", "off", "false", "no", "disable", "disabled"];
|
|
21
|
-
|
|
22
|
-
function envBool(env, name, fallback) {
|
|
23
|
-
const raw = env[name];
|
|
24
|
-
if (raw === undefined || raw === null || raw === "") return fallback;
|
|
25
|
-
return !OFF.includes(String(raw).trim().toLowerCase());
|
|
26
|
-
}
|
|
27
|
-
|
|
28
|
-
function envInt(env, name, fallback) {
|
|
29
|
-
const v = Number(env[name]);
|
|
30
|
-
return Number.isInteger(v) && v > 0 ? v : fallback;
|
|
31
|
-
}
|
|
32
|
-
|
|
33
|
-
function envStr(env, name, fallback) {
|
|
34
|
-
const raw = env[name];
|
|
35
|
-
return typeof raw === "string" && raw.trim() ? raw.trim() : fallback;
|
|
36
|
-
}
|
|
37
|
-
|
|
38
|
-
/**
|
|
39
|
-
* 解析 warp-pool 运行时配置。
|
|
40
|
-
* @param {Record<string,string|undefined>} env
|
|
41
|
-
* @param {{ logDirFn?: () => string }} [deps] 测试可注入 logDir
|
|
42
|
-
*/
|
|
43
|
-
export function resolveWarpConfig(env = process.env, { logDirFn = logDir } = {}) {
|
|
44
|
-
const enabled = envBool(env, "MSLXDFF_WARP_POOL", DEFAULTS.enabled);
|
|
45
|
-
const mode = envStr(env, "MSLXDFF_WARP_MODE", DEFAULTS.mode);
|
|
46
|
-
const count = envInt(env, "MSLXDFF_WARP_COUNT", DEFAULTS.count);
|
|
47
|
-
const basePort = envInt(env, "MSLXDFF_WARP_BASE_PORT", DEFAULTS.basePort);
|
|
48
|
-
const strategy = envStr(env, "MSLXDFF_WARP_STRATEGY", DEFAULTS.strategy) === "request" ? "request" : "session";
|
|
49
|
-
const cooldownMs = envInt(env, "MSLXDFF_WARP_COOLDOWN_MS", DEFAULTS.cooldownMs);
|
|
50
|
-
const dir = envStr(env, "MSLXDFF_WARP_DIR", join(logDirFn(), "warp-pool"));
|
|
51
|
-
const bin = envStr(env, "MSLXDFF_WARP_BIN", "");
|
|
52
|
-
const autodownload = envBool(env, "MSLXDFF_WARP_AUTODOWNLOAD", DEFAULTS.autodownload);
|
|
53
|
-
const probePath = envStr(env, "MSLXDFF_WARP_PROBE_PATH", DEFAULTS.probePath);
|
|
54
|
-
const rotate = envBool(env, "MSLXDFF_WARP_ROTATE", DEFAULTS.rotate);
|
|
55
|
-
|
|
56
|
-
return {
|
|
57
|
-
enabled,
|
|
58
|
-
active: enabled && mode === "leader",
|
|
59
|
-
mode,
|
|
60
|
-
count,
|
|
61
|
-
basePort,
|
|
62
|
-
strategy,
|
|
63
|
-
cooldownMs,
|
|
64
|
-
dir,
|
|
65
|
-
bin,
|
|
66
|
-
autodownload,
|
|
67
|
-
probePath,
|
|
68
|
-
rotate,
|
|
69
|
-
registerMinGapMs: DEFAULTS.registerMinGapMs,
|
|
70
|
-
registerMaxGapMs: DEFAULTS.registerMaxGapMs,
|
|
71
|
-
/** 节点端口列表:basePort .. basePort+count-1 */
|
|
72
|
-
ports: Array.from({ length: count }, (_, i) => basePort + i),
|
|
73
|
-
};
|
|
74
|
-
}
|
|
1
|
+
// warp-pool · 配置解析:env 优先,缺省值集中在一处;纯函数,便于单测。
|
|
2
|
+
import { join } from "node:path";
|
|
3
|
+
import { logDir } from "../logs.js";
|
|
4
|
+
|
|
5
|
+
/** 缺省开 + 429 时换身份换出口:他项目真机实测「同一身份连发 3 次 429,身份一换同一个请求立刻 200」⇒ 换身份=换桶。 */
|
|
6
|
+
export const DEFAULTS = {
|
|
7
|
+
enabled: true,
|
|
8
|
+
mode: "leader",
|
|
9
|
+
count: 4,
|
|
10
|
+
basePort: 10800,
|
|
11
|
+
strategy: "session",
|
|
12
|
+
cooldownMs: 600_000,
|
|
13
|
+
autodownload: true,
|
|
14
|
+
registerMinGapMs: 6_000,
|
|
15
|
+
registerMaxGapMs: 15_000,
|
|
16
|
+
probePath: "/zen/v1/models",
|
|
17
|
+
rotate: true,
|
|
18
|
+
};
|
|
19
|
+
|
|
20
|
+
const OFF = ["0", "off", "false", "no", "disable", "disabled"];
|
|
21
|
+
|
|
22
|
+
function envBool(env, name, fallback) {
|
|
23
|
+
const raw = env[name];
|
|
24
|
+
if (raw === undefined || raw === null || raw === "") return fallback;
|
|
25
|
+
return !OFF.includes(String(raw).trim().toLowerCase());
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
function envInt(env, name, fallback) {
|
|
29
|
+
const v = Number(env[name]);
|
|
30
|
+
return Number.isInteger(v) && v > 0 ? v : fallback;
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
function envStr(env, name, fallback) {
|
|
34
|
+
const raw = env[name];
|
|
35
|
+
return typeof raw === "string" && raw.trim() ? raw.trim() : fallback;
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
/**
|
|
39
|
+
* 解析 warp-pool 运行时配置。
|
|
40
|
+
* @param {Record<string,string|undefined>} env
|
|
41
|
+
* @param {{ logDirFn?: () => string }} [deps] 测试可注入 logDir
|
|
42
|
+
*/
|
|
43
|
+
export function resolveWarpConfig(env = process.env, { logDirFn = logDir } = {}) {
|
|
44
|
+
const enabled = envBool(env, "MSLXDFF_WARP_POOL", DEFAULTS.enabled);
|
|
45
|
+
const mode = envStr(env, "MSLXDFF_WARP_MODE", DEFAULTS.mode);
|
|
46
|
+
const count = envInt(env, "MSLXDFF_WARP_COUNT", DEFAULTS.count);
|
|
47
|
+
const basePort = envInt(env, "MSLXDFF_WARP_BASE_PORT", DEFAULTS.basePort);
|
|
48
|
+
const strategy = envStr(env, "MSLXDFF_WARP_STRATEGY", DEFAULTS.strategy) === "request" ? "request" : "session";
|
|
49
|
+
const cooldownMs = envInt(env, "MSLXDFF_WARP_COOLDOWN_MS", DEFAULTS.cooldownMs);
|
|
50
|
+
const dir = envStr(env, "MSLXDFF_WARP_DIR", join(logDirFn(), "warp-pool"));
|
|
51
|
+
const bin = envStr(env, "MSLXDFF_WARP_BIN", "");
|
|
52
|
+
const autodownload = envBool(env, "MSLXDFF_WARP_AUTODOWNLOAD", DEFAULTS.autodownload);
|
|
53
|
+
const probePath = envStr(env, "MSLXDFF_WARP_PROBE_PATH", DEFAULTS.probePath);
|
|
54
|
+
const rotate = envBool(env, "MSLXDFF_WARP_ROTATE", DEFAULTS.rotate);
|
|
55
|
+
|
|
56
|
+
return {
|
|
57
|
+
enabled,
|
|
58
|
+
active: enabled && mode === "leader",
|
|
59
|
+
mode,
|
|
60
|
+
count,
|
|
61
|
+
basePort,
|
|
62
|
+
strategy,
|
|
63
|
+
cooldownMs,
|
|
64
|
+
dir,
|
|
65
|
+
bin,
|
|
66
|
+
autodownload,
|
|
67
|
+
probePath,
|
|
68
|
+
rotate,
|
|
69
|
+
registerMinGapMs: DEFAULTS.registerMinGapMs,
|
|
70
|
+
registerMaxGapMs: DEFAULTS.registerMaxGapMs,
|
|
71
|
+
/** 节点端口列表:basePort .. basePort+count-1 */
|
|
72
|
+
ports: Array.from({ length: count }, (_, i) => basePort + i),
|
|
73
|
+
};
|
|
74
|
+
}
|
package/src/warp-pool/health.js
CHANGED
|
@@ -1,106 +1,106 @@
|
|
|
1
|
-
// warp-pool · 节点健康:主动探活(经隧道打上游 models,不烧 token)+ 失败冷却 + 连续失败触发重拨换 IP。
|
|
2
|
-
import { probeTunnel } from "./wireproxy.js";
|
|
3
|
-
import { fmtHealth, fmtHeartbeat, dur, MARK } from "./report.js";
|
|
4
|
-
|
|
5
|
-
export function createHealthMonitor({
|
|
6
|
-
dispatcher,
|
|
7
|
-
baseUrl = "https://opencode.ai",
|
|
8
|
-
probePath = "/zen/v1/models",
|
|
9
|
-
unhealthyAfter = 3,
|
|
10
|
-
intervalMs = 60_000,
|
|
11
|
-
heartbeatEvery = 10,
|
|
12
|
-
infoOf = null,
|
|
13
|
-
cooldownMs = 600_000,
|
|
14
|
-
onExhausted = null,
|
|
15
|
-
probe = probeTunnel,
|
|
16
|
-
headers = {},
|
|
17
|
-
now = Date.now,
|
|
18
|
-
log = () => {},
|
|
19
|
-
} = {}) {
|
|
20
|
-
let timer = null;
|
|
21
|
-
let rounds = 0;
|
|
22
|
-
let ticks = 0;
|
|
23
|
-
let lastAllDownAt = "";
|
|
24
|
-
/** @type {Map<number, boolean>} 每端口上一轮通不通(用来只在「状态变化」时打日志) */
|
|
25
|
-
const lastOk = new Map();
|
|
26
|
-
const stamp = () => new Date(now()).toISOString().slice(11, 19);
|
|
27
|
-
|
|
28
|
-
/**
|
|
29
|
-
* 跑一轮全池探活。日志纪律:**只在「状态有变化」「全池不通」「心跳点」时打**——每分钟一行会把日志淹掉。
|
|
30
|
-
* 每个不通的节点都要报全:HTTP 状态、错误原文、耗时、连续第几次、冷却多久(这样才不用靠猜)。
|
|
31
|
-
*/
|
|
32
|
-
async function tick() {
|
|
33
|
-
if (!dispatcher) return { checked: 0, healthy: 0 };
|
|
34
|
-
const list = dispatcher.entries();
|
|
35
|
-
let healthy = 0;
|
|
36
|
-
let slowestMs = 0;
|
|
37
|
-
const problems = [];
|
|
38
|
-
const changes = [];
|
|
39
|
-
for (const e of list) {
|
|
40
|
-
const r = await probe({ port: e.port, baseUrl, path: probePath, headers }).catch((err) => ({
|
|
41
|
-
ok: false,
|
|
42
|
-
error: String(err?.message || err),
|
|
43
|
-
}));
|
|
44
|
-
if (Number(r.ms) > slowestMs) slowestMs = Number(r.ms);
|
|
45
|
-
if (r.ok) {
|
|
46
|
-
dispatcher.markOk(e.index);
|
|
47
|
-
healthy += 1;
|
|
48
|
-
if (lastOk.get(e.port) === false) changes.push(`:${e.port} 恢复(HTTP ${r.status},${dur(r.ms)})`);
|
|
49
|
-
lastOk.set(e.port, true);
|
|
50
|
-
continue;
|
|
51
|
-
}
|
|
52
|
-
dispatcher.markFailure(e.index);
|
|
53
|
-
if (lastOk.get(e.port) !== false) {
|
|
54
|
-
changes.push(`:${e.port} 掉线(HTTP ${r.status || 0}${r.error ? ` ${String(r.error).slice(0, 80)}` : ""})`);
|
|
55
|
-
}
|
|
56
|
-
lastOk.set(e.port, false);
|
|
57
|
-
problems.push({ port: e.port, status: r.status, error: r.error, ms: r.ms, fails: Number(e.fails || 0) + 1, cooldownMs });
|
|
58
|
-
}
|
|
59
|
-
const allDown = list.length > 0 && healthy === 0;
|
|
60
|
-
ticks += 1;
|
|
61
|
-
if (allDown) {
|
|
62
|
-
rounds += 1;
|
|
63
|
-
lastAllDownAt = stamp();
|
|
64
|
-
} else {
|
|
65
|
-
rounds = 0;
|
|
66
|
-
}
|
|
67
|
-
if (changes.length || allDown || ticks % heartbeatEvery === 0) {
|
|
68
|
-
log(fmtHealth({ healthy, total: list.length, slowestMs, problems }));
|
|
69
|
-
}
|
|
70
|
-
for (const c of changes) log(`[warp-pool] ${MARK.warn} 状态变化:${c}`);
|
|
71
|
-
if (ticks % heartbeatEvery === 0) {
|
|
72
|
-
const extra = typeof infoOf === "function" ? infoOf() || {} : {};
|
|
73
|
-
log(fmtHeartbeat({
|
|
74
|
-
alive: extra.alive ?? list.length,
|
|
75
|
-
total: list.length,
|
|
76
|
-
pooled: extra.pooled ?? list.length,
|
|
77
|
-
exits: extra.exits || [],
|
|
78
|
-
cooling: list.filter((e) => Number(e.cooldownUntil) > now()).length,
|
|
79
|
-
lastAllDown: lastAllDownAt,
|
|
80
|
-
}));
|
|
81
|
-
}
|
|
82
|
-
if (allDown && rounds >= 2 && typeof onExhausted === "function") {
|
|
83
|
-
rounds = 0;
|
|
84
|
-
await onExhausted().catch((e) => log(`[warp-pool] 重拨失败:${String(e?.message || e)}`));
|
|
85
|
-
}
|
|
86
|
-
return { checked: list.length, healthy };
|
|
87
|
-
}
|
|
88
|
-
|
|
89
|
-
return {
|
|
90
|
-
tick,
|
|
91
|
-
start() {
|
|
92
|
-
if (timer || !(intervalMs > 0)) return;
|
|
93
|
-
timer = setInterval(() => {
|
|
94
|
-
tick().catch(() => {});
|
|
95
|
-
}, intervalMs);
|
|
96
|
-
if (typeof timer.unref === "function") timer.unref();
|
|
97
|
-
},
|
|
98
|
-
stop() {
|
|
99
|
-
if (timer) clearInterval(timer);
|
|
100
|
-
timer = null;
|
|
101
|
-
},
|
|
102
|
-
get running() {
|
|
103
|
-
return !!timer;
|
|
104
|
-
},
|
|
105
|
-
};
|
|
106
|
-
}
|
|
1
|
+
// warp-pool · 节点健康:主动探活(经隧道打上游 models,不烧 token)+ 失败冷却 + 连续失败触发重拨换 IP。
|
|
2
|
+
import { probeTunnel } from "./wireproxy.js";
|
|
3
|
+
import { fmtHealth, fmtHeartbeat, dur, MARK } from "./report.js";
|
|
4
|
+
|
|
5
|
+
export function createHealthMonitor({
|
|
6
|
+
dispatcher,
|
|
7
|
+
baseUrl = "https://opencode.ai",
|
|
8
|
+
probePath = "/zen/v1/models",
|
|
9
|
+
unhealthyAfter = 3,
|
|
10
|
+
intervalMs = 60_000,
|
|
11
|
+
heartbeatEvery = 10,
|
|
12
|
+
infoOf = null,
|
|
13
|
+
cooldownMs = 600_000,
|
|
14
|
+
onExhausted = null,
|
|
15
|
+
probe = probeTunnel,
|
|
16
|
+
headers = {},
|
|
17
|
+
now = Date.now,
|
|
18
|
+
log = () => {},
|
|
19
|
+
} = {}) {
|
|
20
|
+
let timer = null;
|
|
21
|
+
let rounds = 0;
|
|
22
|
+
let ticks = 0;
|
|
23
|
+
let lastAllDownAt = "";
|
|
24
|
+
/** @type {Map<number, boolean>} 每端口上一轮通不通(用来只在「状态变化」时打日志) */
|
|
25
|
+
const lastOk = new Map();
|
|
26
|
+
const stamp = () => new Date(now()).toISOString().slice(11, 19);
|
|
27
|
+
|
|
28
|
+
/**
|
|
29
|
+
* 跑一轮全池探活。日志纪律:**只在「状态有变化」「全池不通」「心跳点」时打**——每分钟一行会把日志淹掉。
|
|
30
|
+
* 每个不通的节点都要报全:HTTP 状态、错误原文、耗时、连续第几次、冷却多久(这样才不用靠猜)。
|
|
31
|
+
*/
|
|
32
|
+
async function tick() {
|
|
33
|
+
if (!dispatcher) return { checked: 0, healthy: 0 };
|
|
34
|
+
const list = dispatcher.entries();
|
|
35
|
+
let healthy = 0;
|
|
36
|
+
let slowestMs = 0;
|
|
37
|
+
const problems = [];
|
|
38
|
+
const changes = [];
|
|
39
|
+
for (const e of list) {
|
|
40
|
+
const r = await probe({ port: e.port, baseUrl, path: probePath, headers }).catch((err) => ({
|
|
41
|
+
ok: false,
|
|
42
|
+
error: String(err?.message || err),
|
|
43
|
+
}));
|
|
44
|
+
if (Number(r.ms) > slowestMs) slowestMs = Number(r.ms);
|
|
45
|
+
if (r.ok) {
|
|
46
|
+
dispatcher.markOk(e.index);
|
|
47
|
+
healthy += 1;
|
|
48
|
+
if (lastOk.get(e.port) === false) changes.push(`:${e.port} 恢复(HTTP ${r.status},${dur(r.ms)})`);
|
|
49
|
+
lastOk.set(e.port, true);
|
|
50
|
+
continue;
|
|
51
|
+
}
|
|
52
|
+
dispatcher.markFailure(e.index);
|
|
53
|
+
if (lastOk.get(e.port) !== false) {
|
|
54
|
+
changes.push(`:${e.port} 掉线(HTTP ${r.status || 0}${r.error ? ` ${String(r.error).slice(0, 80)}` : ""})`);
|
|
55
|
+
}
|
|
56
|
+
lastOk.set(e.port, false);
|
|
57
|
+
problems.push({ port: e.port, status: r.status, error: r.error, ms: r.ms, fails: Number(e.fails || 0) + 1, cooldownMs });
|
|
58
|
+
}
|
|
59
|
+
const allDown = list.length > 0 && healthy === 0;
|
|
60
|
+
ticks += 1;
|
|
61
|
+
if (allDown) {
|
|
62
|
+
rounds += 1;
|
|
63
|
+
lastAllDownAt = stamp();
|
|
64
|
+
} else {
|
|
65
|
+
rounds = 0;
|
|
66
|
+
}
|
|
67
|
+
if (changes.length || allDown || ticks % heartbeatEvery === 0) {
|
|
68
|
+
log(fmtHealth({ healthy, total: list.length, slowestMs, problems }));
|
|
69
|
+
}
|
|
70
|
+
for (const c of changes) log(`[warp-pool] ${MARK.warn} 状态变化:${c}`);
|
|
71
|
+
if (ticks % heartbeatEvery === 0) {
|
|
72
|
+
const extra = typeof infoOf === "function" ? infoOf() || {} : {};
|
|
73
|
+
log(fmtHeartbeat({
|
|
74
|
+
alive: extra.alive ?? list.length,
|
|
75
|
+
total: list.length,
|
|
76
|
+
pooled: extra.pooled ?? list.length,
|
|
77
|
+
exits: extra.exits || [],
|
|
78
|
+
cooling: list.filter((e) => Number(e.cooldownUntil) > now()).length,
|
|
79
|
+
lastAllDown: lastAllDownAt,
|
|
80
|
+
}));
|
|
81
|
+
}
|
|
82
|
+
if (allDown && rounds >= 2 && typeof onExhausted === "function") {
|
|
83
|
+
rounds = 0;
|
|
84
|
+
await onExhausted().catch((e) => log(`[warp-pool] 重拨失败:${String(e?.message || e)}`));
|
|
85
|
+
}
|
|
86
|
+
return { checked: list.length, healthy };
|
|
87
|
+
}
|
|
88
|
+
|
|
89
|
+
return {
|
|
90
|
+
tick,
|
|
91
|
+
start() {
|
|
92
|
+
if (timer || !(intervalMs > 0)) return;
|
|
93
|
+
timer = setInterval(() => {
|
|
94
|
+
tick().catch(() => {});
|
|
95
|
+
}, intervalMs);
|
|
96
|
+
if (typeof timer.unref === "function") timer.unref();
|
|
97
|
+
},
|
|
98
|
+
stop() {
|
|
99
|
+
if (timer) clearInterval(timer);
|
|
100
|
+
timer = null;
|
|
101
|
+
},
|
|
102
|
+
get running() {
|
|
103
|
+
return !!timer;
|
|
104
|
+
},
|
|
105
|
+
};
|
|
106
|
+
}
|
|
@@ -1,141 +1,141 @@
|
|
|
1
|
-
// warp-pool · 身份轮换:换一台 WARP 设备身份来换出口 IP。
|
|
2
|
-
//
|
|
3
|
-
// 依据(他项目真机实测,非推测):kyomufs/zen-router 的 internal/zen/errors.go:32-42 记录
|
|
4
|
-
// 同一身份连发 3 次 → 429 FreeUsageLimitError;身份一换,同一个请求立刻 200
|
|
5
|
-
// (104.28.198.244 → 429 ×3,104.28.198.247 → 200)。
|
|
6
|
-
// 故「多名额」的正解不是「N 台设备同时在线」(真机实测同时注册会折叠成同一个出口),
|
|
7
|
-
// 而是**串行换身份**:换一台设备 ⇒ 换一个出口 ⇒ 换一份按 IP 计的名额。
|
|
8
|
-
//
|
|
9
|
-
// 与 zen-router 对齐的三条纪律:
|
|
10
|
-
// 1. 轮换后**必须实测确认出口真的变了**;没变就整个 cycle 重试(它用 4 次,这里同)。
|
|
11
|
-
// 「注册成功」不等于「出口换了」——不校验就会拿同一个桶反复撞 429。
|
|
12
|
-
// 2. 同端口并发轮换去重 + 最小间隔,防 429 风暴把 CF 注册刷到限流(同类项目事故)。
|
|
13
|
-
// 3. 只轮换、不销毁别的节点:轮换失败保持原节点可用,绝不把池打空。
|
|
14
|
-
import { probeTunnel } from "./wireproxy.js";
|
|
15
|
-
import { EXIT_PROBE_URL, parseExitIp } from "./revive.js";
|
|
16
|
-
|
|
17
|
-
/** 经隧道读该端口真实出口地址(CF trace);取不到返回 "",绝不抛。 */
|
|
18
|
-
export async function readExitIp({ port, fetchImpl, timeoutMs = 12_000 } = {}) {
|
|
19
|
-
try {
|
|
20
|
-
const res = await probeTunnel({ port, baseUrl: EXIT_PROBE_URL, path: "", fetchImpl, timeoutMs, wantText: true });
|
|
21
|
-
return typeof res?.text === "string" ? parseExitIp(res.text) : "";
|
|
22
|
-
} catch {
|
|
23
|
-
return "";
|
|
24
|
-
}
|
|
25
|
-
}
|
|
26
|
-
|
|
27
|
-
/**
|
|
28
|
-
* 身份轮换器。
|
|
29
|
-
* @param {{ register: Function, apply: (node:object)=>Promise<void>, readIp?: Function,
|
|
30
|
-
* maxAttempts?: number, settleMs?: number, sleep?: Function, now?: Function,
|
|
31
|
-
* log?: (s:string)=>void }} opts
|
|
32
|
-
* apply 由调用方注入:把新身份落盘并起隧道(含停掉旧隧道)。
|
|
33
|
-
*/
|
|
34
|
-
export function createIdentityRotator({
|
|
35
|
-
register,
|
|
36
|
-
apply,
|
|
37
|
-
readIp = readExitIp,
|
|
38
|
-
maxAttempts = 4,
|
|
39
|
-
settleMs = 3000,
|
|
40
|
-
sleep = (ms) => new Promise((r) => setTimeout(r, ms)),
|
|
41
|
-
now = Date.now,
|
|
42
|
-
log = () => {},
|
|
43
|
-
} = {}) {
|
|
44
|
-
/** @type {Map<number, {ip:string, at:number}>} 各端口已知出口 */
|
|
45
|
-
const known = new Map();
|
|
46
|
-
/** @type {Map<number, Promise<object>>} 在途轮换(同端口去重) */
|
|
47
|
-
const inflight = new Map();
|
|
48
|
-
|
|
49
|
-
async function cycle(port, oldIp) {
|
|
50
|
-
for (let i = 1; i <= maxAttempts; i++) {
|
|
51
|
-
let reg;
|
|
52
|
-
try {
|
|
53
|
-
reg = await register({ log });
|
|
54
|
-
} catch (e) {
|
|
55
|
-
log(`[warp-pool] :${port} 轮换 ${i}/${maxAttempts}:注册失败(${String(e?.message || e).slice(0, 120)})`);
|
|
56
|
-
await sleep(settleMs);
|
|
57
|
-
continue;
|
|
58
|
-
}
|
|
59
|
-
try {
|
|
60
|
-
await apply({ port, ...reg });
|
|
61
|
-
} catch (e) {
|
|
62
|
-
log(`[warp-pool] :${port} 轮换 ${i}/${maxAttempts}:起隧道失败(${String(e?.message || e).slice(0, 120)})`);
|
|
63
|
-
}
|
|
64
|
-
await sleep(settleMs);
|
|
65
|
-
const ip = await readIp({ port });
|
|
66
|
-
if (ip && ip !== oldIp) {
|
|
67
|
-
known.set(port, { ip, at: now() });
|
|
68
|
-
log(`[warp-pool] :${port} 身份已轮换:出口 ${oldIp || "?"} → ${ip}(第 ${i}/${maxAttempts} 次)`);
|
|
69
|
-
return { ok: true, ip, attempts: i };
|
|
70
|
-
}
|
|
71
|
-
log(`[warp-pool] :${port} 轮换 ${i}/${maxAttempts}:出口未变(仍取到 ${ip || "空"}),重试`);
|
|
72
|
-
}
|
|
73
|
-
return { ok: false, attempts: maxAttempts };
|
|
74
|
-
}
|
|
75
|
-
|
|
76
|
-
return {
|
|
77
|
-
/** 记下入池时的实测出口(bootstrap 取证后调用)。 */
|
|
78
|
-
note(port, ip) {
|
|
79
|
-
if (ip) known.set(port, { ip, at: now() });
|
|
80
|
-
},
|
|
81
|
-
/** 该端口当前已知出口("" = 未知)。 */
|
|
82
|
-
ipOf(port) {
|
|
83
|
-
return known.get(port)?.ip || "";
|
|
84
|
-
},
|
|
85
|
-
/**
|
|
86
|
-
* 轮换某节点身份换出口。同端口在途时返回同一个 Promise;minGapMs 内重复请求被掐
|
|
87
|
-
* (429 风暴时每个失败请求都触发一次轮换会把 CF 刷黑)。
|
|
88
|
-
* @returns {Promise<{ok:boolean, ip?:string, attempts?:number, skipped?:boolean}>}
|
|
89
|
-
*/
|
|
90
|
-
rotate(port, { minGapMs = 60_000, force = false } = {}) {
|
|
91
|
-
const dup = inflight.get(port);
|
|
92
|
-
if (dup) return dup;
|
|
93
|
-
const prev = known.get(port);
|
|
94
|
-
if (!force && prev && now() - prev.at < minGapMs) {
|
|
95
|
-
return Promise.resolve({ ok: false, skipped: true });
|
|
96
|
-
}
|
|
97
|
-
const p = cycle(port, prev?.ip || "")
|
|
98
|
-
.catch((e) => {
|
|
99
|
-
log(`[warp-pool] :${port} 轮换异常:${String(e?.message || e)}`);
|
|
100
|
-
return { ok: false };
|
|
101
|
-
})
|
|
102
|
-
.finally(() => inflight.delete(port));
|
|
103
|
-
inflight.set(port, p);
|
|
104
|
-
return p;
|
|
105
|
-
},
|
|
106
|
-
|
|
107
|
-
/** 入池取证结果(labelExits 的分组)批量记账:每个节点的出口 IP 都要记住,轮换才能比对「是否真变了」。 */
|
|
108
|
-
noteExits(groups) {
|
|
109
|
-
for (const g of groups || []) for (const p of g.nodes || []) if (g.ip) known.set(p, { ip: g.ip, at: now() });
|
|
110
|
-
},
|
|
111
|
-
/** 轮换进行中 = 该节点正在换出口(调用方可据此避开它)。 */
|
|
112
|
-
busy(port) {
|
|
113
|
-
return inflight.has(port);
|
|
114
|
-
},
|
|
115
|
-
stats() {
|
|
116
|
-
return [...known.entries()].map(([port, v]) => ({ port, ip: v.ip, at: v.at }));
|
|
117
|
-
},
|
|
118
|
-
};
|
|
119
|
-
}
|
|
120
|
-
|
|
121
|
-
/**
|
|
122
|
-
* 把「429 → 换身份换出口」接进一个已建好的池。轮换窗口内**先把该节点冷却**(端口已停,
|
|
123
|
-
* 请求过去必失败),换好再放回。依赖全由调用方注入,本模块不反向依赖池。
|
|
124
|
-
* @returns {{note:Function, noteExits:Function, ipOf:Function, rotate:Function, busy:Function, stats:Function}}
|
|
125
|
-
*/
|
|
126
|
-
export function wireRotation({ dispatcher, register, tunnels, bringUp, swap = () => {}, log = () => {}, ...rest } = {}) {
|
|
127
|
-
return createIdentityRotator({
|
|
128
|
-
register,
|
|
129
|
-
apply: async (node) => {
|
|
130
|
-
const idx = dispatcher.entries().find((e) => e.port === node.port)?.index;
|
|
131
|
-
if (idx !== undefined) dispatcher.markFailure(idx); // 轮换窗口内先冷却:端口已停,请求过去必失败
|
|
132
|
-
tunnels.get(node.port)?.stop();
|
|
133
|
-
tunnels.delete(node.port);
|
|
134
|
-
swap(node.port, node);
|
|
135
|
-
await bringUp(node);
|
|
136
|
-
if (idx !== undefined) dispatcher.markOk(idx);
|
|
137
|
-
},
|
|
138
|
-
log,
|
|
139
|
-
...rest,
|
|
140
|
-
});
|
|
141
|
-
}
|
|
1
|
+
// warp-pool · 身份轮换:换一台 WARP 设备身份来换出口 IP。
|
|
2
|
+
//
|
|
3
|
+
// 依据(他项目真机实测,非推测):kyomufs/zen-router 的 internal/zen/errors.go:32-42 记录
|
|
4
|
+
// 同一身份连发 3 次 → 429 FreeUsageLimitError;身份一换,同一个请求立刻 200
|
|
5
|
+
// (104.28.198.244 → 429 ×3,104.28.198.247 → 200)。
|
|
6
|
+
// 故「多名额」的正解不是「N 台设备同时在线」(真机实测同时注册会折叠成同一个出口),
|
|
7
|
+
// 而是**串行换身份**:换一台设备 ⇒ 换一个出口 ⇒ 换一份按 IP 计的名额。
|
|
8
|
+
//
|
|
9
|
+
// 与 zen-router 对齐的三条纪律:
|
|
10
|
+
// 1. 轮换后**必须实测确认出口真的变了**;没变就整个 cycle 重试(它用 4 次,这里同)。
|
|
11
|
+
// 「注册成功」不等于「出口换了」——不校验就会拿同一个桶反复撞 429。
|
|
12
|
+
// 2. 同端口并发轮换去重 + 最小间隔,防 429 风暴把 CF 注册刷到限流(同类项目事故)。
|
|
13
|
+
// 3. 只轮换、不销毁别的节点:轮换失败保持原节点可用,绝不把池打空。
|
|
14
|
+
import { probeTunnel } from "./wireproxy.js";
|
|
15
|
+
import { EXIT_PROBE_URL, parseExitIp } from "./revive.js";
|
|
16
|
+
|
|
17
|
+
/** 经隧道读该端口真实出口地址(CF trace);取不到返回 "",绝不抛。 */
|
|
18
|
+
export async function readExitIp({ port, fetchImpl, timeoutMs = 12_000 } = {}) {
|
|
19
|
+
try {
|
|
20
|
+
const res = await probeTunnel({ port, baseUrl: EXIT_PROBE_URL, path: "", fetchImpl, timeoutMs, wantText: true });
|
|
21
|
+
return typeof res?.text === "string" ? parseExitIp(res.text) : "";
|
|
22
|
+
} catch {
|
|
23
|
+
return "";
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
/**
|
|
28
|
+
* 身份轮换器。
|
|
29
|
+
* @param {{ register: Function, apply: (node:object)=>Promise<void>, readIp?: Function,
|
|
30
|
+
* maxAttempts?: number, settleMs?: number, sleep?: Function, now?: Function,
|
|
31
|
+
* log?: (s:string)=>void }} opts
|
|
32
|
+
* apply 由调用方注入:把新身份落盘并起隧道(含停掉旧隧道)。
|
|
33
|
+
*/
|
|
34
|
+
export function createIdentityRotator({
|
|
35
|
+
register,
|
|
36
|
+
apply,
|
|
37
|
+
readIp = readExitIp,
|
|
38
|
+
maxAttempts = 4,
|
|
39
|
+
settleMs = 3000,
|
|
40
|
+
sleep = (ms) => new Promise((r) => setTimeout(r, ms)),
|
|
41
|
+
now = Date.now,
|
|
42
|
+
log = () => {},
|
|
43
|
+
} = {}) {
|
|
44
|
+
/** @type {Map<number, {ip:string, at:number}>} 各端口已知出口 */
|
|
45
|
+
const known = new Map();
|
|
46
|
+
/** @type {Map<number, Promise<object>>} 在途轮换(同端口去重) */
|
|
47
|
+
const inflight = new Map();
|
|
48
|
+
|
|
49
|
+
async function cycle(port, oldIp) {
|
|
50
|
+
for (let i = 1; i <= maxAttempts; i++) {
|
|
51
|
+
let reg;
|
|
52
|
+
try {
|
|
53
|
+
reg = await register({ log });
|
|
54
|
+
} catch (e) {
|
|
55
|
+
log(`[warp-pool] :${port} 轮换 ${i}/${maxAttempts}:注册失败(${String(e?.message || e).slice(0, 120)})`);
|
|
56
|
+
await sleep(settleMs);
|
|
57
|
+
continue;
|
|
58
|
+
}
|
|
59
|
+
try {
|
|
60
|
+
await apply({ port, ...reg });
|
|
61
|
+
} catch (e) {
|
|
62
|
+
log(`[warp-pool] :${port} 轮换 ${i}/${maxAttempts}:起隧道失败(${String(e?.message || e).slice(0, 120)})`);
|
|
63
|
+
}
|
|
64
|
+
await sleep(settleMs);
|
|
65
|
+
const ip = await readIp({ port });
|
|
66
|
+
if (ip && ip !== oldIp) {
|
|
67
|
+
known.set(port, { ip, at: now() });
|
|
68
|
+
log(`[warp-pool] :${port} 身份已轮换:出口 ${oldIp || "?"} → ${ip}(第 ${i}/${maxAttempts} 次)`);
|
|
69
|
+
return { ok: true, ip, attempts: i };
|
|
70
|
+
}
|
|
71
|
+
log(`[warp-pool] :${port} 轮换 ${i}/${maxAttempts}:出口未变(仍取到 ${ip || "空"}),重试`);
|
|
72
|
+
}
|
|
73
|
+
return { ok: false, attempts: maxAttempts };
|
|
74
|
+
}
|
|
75
|
+
|
|
76
|
+
return {
|
|
77
|
+
/** 记下入池时的实测出口(bootstrap 取证后调用)。 */
|
|
78
|
+
note(port, ip) {
|
|
79
|
+
if (ip) known.set(port, { ip, at: now() });
|
|
80
|
+
},
|
|
81
|
+
/** 该端口当前已知出口("" = 未知)。 */
|
|
82
|
+
ipOf(port) {
|
|
83
|
+
return known.get(port)?.ip || "";
|
|
84
|
+
},
|
|
85
|
+
/**
|
|
86
|
+
* 轮换某节点身份换出口。同端口在途时返回同一个 Promise;minGapMs 内重复请求被掐
|
|
87
|
+
* (429 风暴时每个失败请求都触发一次轮换会把 CF 刷黑)。
|
|
88
|
+
* @returns {Promise<{ok:boolean, ip?:string, attempts?:number, skipped?:boolean}>}
|
|
89
|
+
*/
|
|
90
|
+
rotate(port, { minGapMs = 60_000, force = false } = {}) {
|
|
91
|
+
const dup = inflight.get(port);
|
|
92
|
+
if (dup) return dup;
|
|
93
|
+
const prev = known.get(port);
|
|
94
|
+
if (!force && prev && now() - prev.at < minGapMs) {
|
|
95
|
+
return Promise.resolve({ ok: false, skipped: true });
|
|
96
|
+
}
|
|
97
|
+
const p = cycle(port, prev?.ip || "")
|
|
98
|
+
.catch((e) => {
|
|
99
|
+
log(`[warp-pool] :${port} 轮换异常:${String(e?.message || e)}`);
|
|
100
|
+
return { ok: false };
|
|
101
|
+
})
|
|
102
|
+
.finally(() => inflight.delete(port));
|
|
103
|
+
inflight.set(port, p);
|
|
104
|
+
return p;
|
|
105
|
+
},
|
|
106
|
+
|
|
107
|
+
/** 入池取证结果(labelExits 的分组)批量记账:每个节点的出口 IP 都要记住,轮换才能比对「是否真变了」。 */
|
|
108
|
+
noteExits(groups) {
|
|
109
|
+
for (const g of groups || []) for (const p of g.nodes || []) if (g.ip) known.set(p, { ip: g.ip, at: now() });
|
|
110
|
+
},
|
|
111
|
+
/** 轮换进行中 = 该节点正在换出口(调用方可据此避开它)。 */
|
|
112
|
+
busy(port) {
|
|
113
|
+
return inflight.has(port);
|
|
114
|
+
},
|
|
115
|
+
stats() {
|
|
116
|
+
return [...known.entries()].map(([port, v]) => ({ port, ip: v.ip, at: v.at }));
|
|
117
|
+
},
|
|
118
|
+
};
|
|
119
|
+
}
|
|
120
|
+
|
|
121
|
+
/**
|
|
122
|
+
* 把「429 → 换身份换出口」接进一个已建好的池。轮换窗口内**先把该节点冷却**(端口已停,
|
|
123
|
+
* 请求过去必失败),换好再放回。依赖全由调用方注入,本模块不反向依赖池。
|
|
124
|
+
* @returns {{note:Function, noteExits:Function, ipOf:Function, rotate:Function, busy:Function, stats:Function}}
|
|
125
|
+
*/
|
|
126
|
+
export function wireRotation({ dispatcher, register, tunnels, bringUp, swap = () => {}, log = () => {}, ...rest } = {}) {
|
|
127
|
+
return createIdentityRotator({
|
|
128
|
+
register,
|
|
129
|
+
apply: async (node) => {
|
|
130
|
+
const idx = dispatcher.entries().find((e) => e.port === node.port)?.index;
|
|
131
|
+
if (idx !== undefined) dispatcher.markFailure(idx); // 轮换窗口内先冷却:端口已停,请求过去必失败
|
|
132
|
+
tunnels.get(node.port)?.stop();
|
|
133
|
+
tunnels.delete(node.port);
|
|
134
|
+
swap(node.port, node);
|
|
135
|
+
await bringUp(node);
|
|
136
|
+
if (idx !== undefined) dispatcher.markOk(idx);
|
|
137
|
+
},
|
|
138
|
+
log,
|
|
139
|
+
...rest,
|
|
140
|
+
});
|
|
141
|
+
}
|