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/v6pool/rotate.js
CHANGED
|
@@ -1,239 +1,263 @@
|
|
|
1
|
-
// v6pool · 槽位 dispatcher:每槽一个源地址 + 一个自带 `localAddress` 的 undici Agent。
|
|
2
|
-
//
|
|
3
|
-
// 契约与 warp-pool 的轮换 dispatcher 一致:`dispatch(opts, handler)` + `close()`,
|
|
4
|
-
// 注入点同为 `transport` 的 extDispatcher(legacy 与 SDK 两条路共用同一个对象,见 MODULES.md §1)。
|
|
5
|
-
//
|
|
6
|
-
// 与 WARP 池的差别只在「换出口」这一步:
|
|
7
|
-
// WARP:重注册设备 + 重启隧道(实测 5~8 秒,还会被 CF 注册限流)
|
|
8
|
-
// v6 :从前缀里挑一个新地址(≈0 成本:只多一条 `ip addr add`,bind 模式下连这条都省)
|
|
9
|
-
// 判决表照旧复用 warp-pool/verdict.js(403 FreeTierError 与 429 FreeUsageLimitError 同一条件 ⇒ 强制换)。
|
|
10
|
-
//
|
|
11
|
-
// 两个刻意的设计:
|
|
12
|
-
// ① 换址**不重置**旧槽的冷却账,而是把旧地址推进 retiring:先关旧 Agent、延后释放地址,
|
|
13
|
-
// 在飞请求(SSE 长连接)不会因为源地址被抽走而断。retiring 有硬上限 RETAIN_MAX。
|
|
14
|
-
// ② 每次响应都记账(不只 403/429):`fmtFirstOk` 那行「新地址首个 200」就是
|
|
15
|
-
// 「429 换 IP 到底有没有换来新额度」的直接证据——这正是本次要回答的问题。
|
|
16
|
-
import { getUndici } from "../compat.js";
|
|
17
|
-
import { headerValue, tapHandler } from "../warp-pool/rotate.js";
|
|
18
|
-
import { createSelector } from "../warp-pool/strategy.js";
|
|
19
|
-
import { SIGNAL_STATUSES, classifyWarpSignal } from "../warp-pool/verdict.js";
|
|
20
|
-
import { fmtDirect, fmtDispatch, fmtFirstOk, fmtNoRotate, fmtRetire, fmtSwap, fmtSwapFail, fmtVerdictNo } from "./report.js";
|
|
21
|
-
|
|
22
|
-
const SESSION_HEADER = "x-opencode-session";
|
|
23
|
-
|
|
24
|
-
/** 最多留几个「已换下但地址还在网卡上」的旧出口:保护在飞请求,同时给地址数量一个硬上限。 */
|
|
25
|
-
export const RETAIN_MAX = 8;
|
|
26
|
-
/** 挑新地址时最多重试几次(前缀太小/已在用的地址太多时会一直撞)。 */
|
|
27
|
-
export const PICK_TRIES = 16;
|
|
28
|
-
|
|
29
|
-
/**
|
|
30
|
-
* @param {{ addrs?: string[], strategy?: "session"|"request", retireMs?: number, rotate?: boolean, debug?: boolean,
|
|
31
|
-
* now?: () => number, log?: (s: string) => void, claimer?: object|null, pickAddress?: () => string,
|
|
32
|
-
* agentFactory?: (addr: string) => object, agentOptions?: object, fallbackAgent?: object, selector?: object }} [opts]
|
|
33
|
-
*/
|
|
34
|
-
export function createV6Dispatcher({
|
|
35
|
-
addrs = [],
|
|
36
|
-
strategy = "session",
|
|
37
|
-
retireMs = 60_000,
|
|
38
|
-
rotate = true,
|
|
39
|
-
debug = false,
|
|
40
|
-
now = Date.now,
|
|
41
|
-
log = () => {},
|
|
42
|
-
claimer = null,
|
|
43
|
-
pickAddress = () => "",
|
|
44
|
-
agentFactory,
|
|
45
|
-
agentOptions = { connections: 4, pipelining: 1, keepAliveTimeout: 30_000, keepAliveMaxTimeout: 60_000 },
|
|
46
|
-
fallbackAgent,
|
|
47
|
-
selector = createSelector({ strategy }),
|
|
48
|
-
} = {}) {
|
|
49
|
-
const { Agent } = getUndici();
|
|
50
|
-
if (typeof agentFactory !== "function") {
|
|
51
|
-
if (typeof Agent !== "function") throw new Error("undici Agent 不可用:无法建立 v6 出口池");
|
|
52
|
-
agentFactory = (addr) => new Agent({ connect: { localAddress: addr }, ...agentOptions });
|
|
53
|
-
}
|
|
54
|
-
const fallback = fallbackAgent !== undefined ? fallbackAgent : typeof Agent === "function" ? new Agent(agentOptions) : null;
|
|
55
|
-
|
|
56
|
-
let list = [];
|
|
57
|
-
/** @type {Array<{addr:string, agent:object, at:number, release:null|Function, counts:object, swaps:number}>} */
|
|
58
|
-
const retiring = [];
|
|
59
|
-
const history = [];
|
|
60
|
-
let directWarned = false;
|
|
61
|
-
|
|
62
|
-
function buildSlot(index, addr) {
|
|
63
|
-
return { index, addr, agent: agentFactory(addr), cooldownUntil: 0, swaps: 0, swapping: false, counts: {}, firstOkAt: 0 };
|
|
64
|
-
}
|
|
65
|
-
|
|
66
|
-
/** 装上源地址(bootstrap 探活通过后调用;空数组 = 池为空 ⇒ 直连兜底)。 */
|
|
67
|
-
function setAddresses(next = []) {
|
|
68
|
-
list = (next || []).map((a, i) => buildSlot(i, a));
|
|
69
|
-
return list.length;
|
|
70
|
-
}
|
|
71
|
-
// 构造时就装上地址(与 warp-pool 的轮换 dispatcher 同形状:入参即初始池)。
|
|
72
|
-
setAddresses(addrs);
|
|
73
|
-
|
|
74
|
-
function availableIndexes() {
|
|
75
|
-
const t = now();
|
|
76
|
-
return list.filter((e) => e.cooldownUntil <= t && !e.swapping).map((e) => e.index);
|
|
77
|
-
}
|
|
78
|
-
|
|
79
|
-
/** 退休账结算:只有「已过退休时长」且「超出保留上限」的才真关+真释放(close 时 force 全清)。 */
|
|
80
|
-
async function flushRetired({ force = false } = {}) {
|
|
81
|
-
const sorted = [...retiring].sort((a, b) => a.at - b.at);
|
|
82
|
-
const over = Math.max(0, sorted.length - RETAIN_MAX);
|
|
83
|
-
const keep = [];
|
|
84
|
-
for (let i = 0; i < sorted.length; i++) {
|
|
85
|
-
const r = sorted[i];
|
|
86
|
-
const aged = now() - r.at >= retireMs;
|
|
87
|
-
if (!force && !(aged && i < over)) {
|
|
88
|
-
keep.push(r);
|
|
89
|
-
continue;
|
|
90
|
-
}
|
|
91
|
-
try {
|
|
92
|
-
await r.agent?.close?.();
|
|
93
|
-
} catch {
|
|
94
|
-
/* 关不掉旧 Agent 不影响新出口 */
|
|
95
|
-
}
|
|
96
|
-
if (r.release) {
|
|
97
|
-
try {
|
|
98
|
-
await r.release();
|
|
99
|
-
} catch {
|
|
100
|
-
/* 释放失败已由 claim.js 自己打日志 */
|
|
101
|
-
}
|
|
102
|
-
}
|
|
103
|
-
history.push({ addr: r.addr, swaps: r.swaps, counts: { ...r.counts } });
|
|
104
|
-
if (history.length > 32) history.shift();
|
|
105
|
-
log(fmtRetire({ addr: r.addr }));
|
|
106
|
-
}
|
|
107
|
-
retiring.length = 0;
|
|
108
|
-
retiring.push(...keep);
|
|
109
|
-
}
|
|
110
|
-
|
|
111
|
-
/** 换该槽的源地址:挑新地址 → 认领 → 建新 Agent → 旧 Agent 退休(先关 Agent 再延后释放地址)。 */
|
|
112
|
-
async function swap(index, verdict = {}) {
|
|
113
|
-
const e = list[index];
|
|
114
|
-
if (!e) return { skipped: true };
|
|
115
|
-
if (e.swapping) return { skipped: true, reason: "该槽已在换址中" };
|
|
116
|
-
e.swapping = true;
|
|
117
|
-
try {
|
|
118
|
-
const taken = new Set(list.map((s) => s.addr));
|
|
119
|
-
let addr = "";
|
|
120
|
-
for (let i = 0; i < PICK_TRIES && (!addr || taken.has(addr)); i++) addr = pickAddress();
|
|
121
|
-
if (!addr || taken.has(addr)) throw new Error(`前缀里连续 ${PICK_TRIES} 次都撞上已在用的地址(前缀太小?)`);
|
|
122
|
-
if (claimer) await claimer.ensure(addr);
|
|
123
|
-
const oldAddr = e.addr;
|
|
124
|
-
const prevCounts = { ...e.counts };
|
|
125
|
-
const prevSwaps = e.swaps;
|
|
126
|
-
retiring.push({
|
|
127
|
-
addr: oldAddr,
|
|
128
|
-
agent: e.agent,
|
|
129
|
-
at: now(),
|
|
130
|
-
release: claimer ? () => claimer.release(oldAddr) : null,
|
|
131
|
-
counts: prevCounts,
|
|
132
|
-
swaps: prevSwaps,
|
|
133
|
-
});
|
|
134
|
-
e.addr = addr;
|
|
135
|
-
e.agent = agentFactory(addr);
|
|
136
|
-
e.cooldownUntil = 0;
|
|
137
|
-
e.swaps = prevSwaps + 1;
|
|
138
|
-
e.counts = {};
|
|
139
|
-
e.firstOkAt = 0;
|
|
140
|
-
log(fmtSwap({ from: oldAddr, to: addr, status: verdict.status, kind: verdict.kind, forced: verdict.forced, swaps: e.swaps, prevCounts }));
|
|
141
|
-
await flushRetired();
|
|
142
|
-
return { ok: true, from: oldAddr, to: addr };
|
|
143
|
-
} finally {
|
|
144
|
-
e.swapping = false;
|
|
145
|
-
}
|
|
146
|
-
}
|
|
147
|
-
|
|
148
|
-
/** 上游响应旁听:记账 → 换址后首个 200 的取证行 → 配额信号才换址。 */
|
|
149
|
-
function onTap(signal, e) {
|
|
150
|
-
const status = Number(signal?.status);
|
|
151
|
-
e.counts[status] = (e.counts[status] || 0) + 1;
|
|
152
|
-
if (status === 200 && !e.firstOkAt) {
|
|
153
|
-
e.firstOkAt = now();
|
|
154
|
-
log(fmtFirstOk({ addr: e.addr, swaps: e.swaps, counts: e.counts }));
|
|
155
|
-
}
|
|
156
|
-
if (!SIGNAL_STATUSES.includes(status)) return;
|
|
157
|
-
const v = classifyWarpSignal(signal);
|
|
158
|
-
if (!rotate) {
|
|
159
|
-
log(fmtNoRotate({ addr: e.addr, status, kind: v.kind }));
|
|
160
|
-
return;
|
|
161
|
-
}
|
|
162
|
-
if (!v.rotate) {
|
|
163
|
-
log(fmtVerdictNo({ addr: e.addr, status, kind: v.kind, why: v.why }));
|
|
164
|
-
return;
|
|
165
|
-
}
|
|
166
|
-
const addr = e.addr;
|
|
167
|
-
void swap(e.index, { ...v, status }).catch((err) => log(fmtSwapFail({ addr, error: String(err?.message || err) })));
|
|
168
|
-
}
|
|
169
|
-
|
|
170
|
-
return {
|
|
171
|
-
/** 每次请求调一次 = 选槽粒度(session 策略下同会话粘同一源地址)。 */
|
|
172
|
-
dispatch(opts, handler) {
|
|
173
|
-
if (!list.length) {
|
|
174
|
-
if (fallback) return fallback.dispatch(opts, handler);
|
|
175
|
-
throw new Error("v6pool:源地址池为空且无直连兜底");
|
|
176
|
-
}
|
|
177
|
-
const avail = availableIndexes();
|
|
178
|
-
if (!avail.length) {
|
|
179
|
-
// 全池都在冷却/换址中 ⇒ 直连兜底优先:硬派给正在换址的槽 = 把请求挂到超时
|
|
180
|
-
if (!directWarned) {
|
|
181
|
-
directWarned = true;
|
|
182
|
-
log(fmtDirect({ reason: `全部 ${list.length} 个源地址都在冷却/换址中(下一条恢复后自动回到池内)` }));
|
|
183
|
-
}
|
|
184
|
-
return (fallback || list[0].agent).dispatch(opts, handler);
|
|
185
|
-
}
|
|
186
|
-
directWarned = false;
|
|
187
|
-
const sessionKey = strategy === "session" ? headerValue(opts?.headers, SESSION_HEADER) : "";
|
|
188
|
-
const e = list[selector.pick(avail, sessionKey)];
|
|
189
|
-
if (debug) log(fmtDispatch({ addr: e.addr, session: sessionKey || "(无)" }));
|
|
190
|
-
return e.agent.dispatch(opts, tapHandler(handler, (sig) => onTap(sig, e)));
|
|
191
|
-
},
|
|
192
|
-
|
|
193
|
-
setAddresses,
|
|
194
|
-
|
|
195
|
-
/** 手动换某个槽的源地址(供运维/测试;正常路径由配额信号触发)。 */
|
|
196
|
-
swap,
|
|
197
|
-
|
|
198
|
-
/**
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
}
|
|
228
|
-
}
|
|
229
|
-
},
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
return
|
|
233
|
-
},
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
1
|
+
// v6pool · 槽位 dispatcher:每槽一个源地址 + 一个自带 `localAddress` 的 undici Agent。
|
|
2
|
+
//
|
|
3
|
+
// 契约与 warp-pool 的轮换 dispatcher 一致:`dispatch(opts, handler)` + `close()`,
|
|
4
|
+
// 注入点同为 `transport` 的 extDispatcher(legacy 与 SDK 两条路共用同一个对象,见 MODULES.md §1)。
|
|
5
|
+
//
|
|
6
|
+
// 与 WARP 池的差别只在「换出口」这一步:
|
|
7
|
+
// WARP:重注册设备 + 重启隧道(实测 5~8 秒,还会被 CF 注册限流)
|
|
8
|
+
// v6 :从前缀里挑一个新地址(≈0 成本:只多一条 `ip addr add`,bind 模式下连这条都省)
|
|
9
|
+
// 判决表照旧复用 warp-pool/verdict.js(403 FreeTierError 与 429 FreeUsageLimitError 同一条件 ⇒ 强制换)。
|
|
10
|
+
//
|
|
11
|
+
// 两个刻意的设计:
|
|
12
|
+
// ① 换址**不重置**旧槽的冷却账,而是把旧地址推进 retiring:先关旧 Agent、延后释放地址,
|
|
13
|
+
// 在飞请求(SSE 长连接)不会因为源地址被抽走而断。retiring 有硬上限 RETAIN_MAX。
|
|
14
|
+
// ② 每次响应都记账(不只 403/429):`fmtFirstOk` 那行「新地址首个 200」就是
|
|
15
|
+
// 「429 换 IP 到底有没有换来新额度」的直接证据——这正是本次要回答的问题。
|
|
16
|
+
import { getUndici } from "../compat.js";
|
|
17
|
+
import { headerValue, tapHandler } from "../warp-pool/rotate.js";
|
|
18
|
+
import { createSelector } from "../warp-pool/strategy.js";
|
|
19
|
+
import { SIGNAL_STATUSES, classifyWarpSignal } from "../warp-pool/verdict.js";
|
|
20
|
+
import { fmtDirect, fmtDispatch, fmtFirstOk, fmtNoRotate, fmtRetire, fmtSwap, fmtSwapFail, fmtVerdictNo } from "./report.js";
|
|
21
|
+
|
|
22
|
+
const SESSION_HEADER = "x-opencode-session";
|
|
23
|
+
|
|
24
|
+
/** 最多留几个「已换下但地址还在网卡上」的旧出口:保护在飞请求,同时给地址数量一个硬上限。 */
|
|
25
|
+
export const RETAIN_MAX = 8;
|
|
26
|
+
/** 挑新地址时最多重试几次(前缀太小/已在用的地址太多时会一直撞)。 */
|
|
27
|
+
export const PICK_TRIES = 16;
|
|
28
|
+
|
|
29
|
+
/**
|
|
30
|
+
* @param {{ addrs?: string[], strategy?: "session"|"request", retireMs?: number, rotate?: boolean, debug?: boolean,
|
|
31
|
+
* now?: () => number, log?: (s: string) => void, claimer?: object|null, pickAddress?: () => string,
|
|
32
|
+
* agentFactory?: (addr: string) => object, agentOptions?: object, fallbackAgent?: object, selector?: object }} [opts]
|
|
33
|
+
*/
|
|
34
|
+
export function createV6Dispatcher({
|
|
35
|
+
addrs = [],
|
|
36
|
+
strategy = "session",
|
|
37
|
+
retireMs = 60_000,
|
|
38
|
+
rotate = true,
|
|
39
|
+
debug = false,
|
|
40
|
+
now = Date.now,
|
|
41
|
+
log = () => {},
|
|
42
|
+
claimer = null,
|
|
43
|
+
pickAddress = () => "",
|
|
44
|
+
agentFactory,
|
|
45
|
+
agentOptions = { connections: 4, pipelining: 1, keepAliveTimeout: 30_000, keepAliveMaxTimeout: 60_000 },
|
|
46
|
+
fallbackAgent,
|
|
47
|
+
selector = createSelector({ strategy }),
|
|
48
|
+
} = {}) {
|
|
49
|
+
const { Agent } = getUndici();
|
|
50
|
+
if (typeof agentFactory !== "function") {
|
|
51
|
+
if (typeof Agent !== "function") throw new Error("undici Agent 不可用:无法建立 v6 出口池");
|
|
52
|
+
agentFactory = (addr) => new Agent({ connect: { localAddress: addr }, ...agentOptions });
|
|
53
|
+
}
|
|
54
|
+
const fallback = fallbackAgent !== undefined ? fallbackAgent : typeof Agent === "function" ? new Agent(agentOptions) : null;
|
|
55
|
+
|
|
56
|
+
let list = [];
|
|
57
|
+
/** @type {Array<{addr:string, agent:object, at:number, release:null|Function, counts:object, swaps:number}>} */
|
|
58
|
+
const retiring = [];
|
|
59
|
+
const history = [];
|
|
60
|
+
let directWarned = false;
|
|
61
|
+
|
|
62
|
+
function buildSlot(index, addr) {
|
|
63
|
+
return { index, addr, agent: agentFactory(addr), cooldownUntil: 0, swaps: 0, swapping: false, counts: {}, firstOkAt: 0 };
|
|
64
|
+
}
|
|
65
|
+
|
|
66
|
+
/** 装上源地址(bootstrap 探活通过后调用;空数组 = 池为空 ⇒ 直连兜底)。 */
|
|
67
|
+
function setAddresses(next = []) {
|
|
68
|
+
list = (next || []).map((a, i) => buildSlot(i, a));
|
|
69
|
+
return list.length;
|
|
70
|
+
}
|
|
71
|
+
// 构造时就装上地址(与 warp-pool 的轮换 dispatcher 同形状:入参即初始池)。
|
|
72
|
+
setAddresses(addrs);
|
|
73
|
+
|
|
74
|
+
function availableIndexes() {
|
|
75
|
+
const t = now();
|
|
76
|
+
return list.filter((e) => e.cooldownUntil <= t && !e.swapping).map((e) => e.index);
|
|
77
|
+
}
|
|
78
|
+
|
|
79
|
+
/** 退休账结算:只有「已过退休时长」且「超出保留上限」的才真关+真释放(close 时 force 全清)。 */
|
|
80
|
+
async function flushRetired({ force = false } = {}) {
|
|
81
|
+
const sorted = [...retiring].sort((a, b) => a.at - b.at);
|
|
82
|
+
const over = Math.max(0, sorted.length - RETAIN_MAX);
|
|
83
|
+
const keep = [];
|
|
84
|
+
for (let i = 0; i < sorted.length; i++) {
|
|
85
|
+
const r = sorted[i];
|
|
86
|
+
const aged = now() - r.at >= retireMs;
|
|
87
|
+
if (!force && !(aged && i < over)) {
|
|
88
|
+
keep.push(r);
|
|
89
|
+
continue;
|
|
90
|
+
}
|
|
91
|
+
try {
|
|
92
|
+
await r.agent?.close?.();
|
|
93
|
+
} catch {
|
|
94
|
+
/* 关不掉旧 Agent 不影响新出口 */
|
|
95
|
+
}
|
|
96
|
+
if (r.release) {
|
|
97
|
+
try {
|
|
98
|
+
await r.release();
|
|
99
|
+
} catch {
|
|
100
|
+
/* 释放失败已由 claim.js 自己打日志 */
|
|
101
|
+
}
|
|
102
|
+
}
|
|
103
|
+
history.push({ addr: r.addr, swaps: r.swaps, counts: { ...r.counts } });
|
|
104
|
+
if (history.length > 32) history.shift();
|
|
105
|
+
log(fmtRetire({ addr: r.addr }));
|
|
106
|
+
}
|
|
107
|
+
retiring.length = 0;
|
|
108
|
+
retiring.push(...keep);
|
|
109
|
+
}
|
|
110
|
+
|
|
111
|
+
/** 换该槽的源地址:挑新地址 → 认领 → 建新 Agent → 旧 Agent 退休(先关 Agent 再延后释放地址)。 */
|
|
112
|
+
async function swap(index, verdict = {}) {
|
|
113
|
+
const e = list[index];
|
|
114
|
+
if (!e) return { skipped: true };
|
|
115
|
+
if (e.swapping) return { skipped: true, reason: "该槽已在换址中" };
|
|
116
|
+
e.swapping = true;
|
|
117
|
+
try {
|
|
118
|
+
const taken = new Set(list.map((s) => s.addr));
|
|
119
|
+
let addr = "";
|
|
120
|
+
for (let i = 0; i < PICK_TRIES && (!addr || taken.has(addr)); i++) addr = pickAddress();
|
|
121
|
+
if (!addr || taken.has(addr)) throw new Error(`前缀里连续 ${PICK_TRIES} 次都撞上已在用的地址(前缀太小?)`);
|
|
122
|
+
if (claimer) await claimer.ensure(addr);
|
|
123
|
+
const oldAddr = e.addr;
|
|
124
|
+
const prevCounts = { ...e.counts };
|
|
125
|
+
const prevSwaps = e.swaps;
|
|
126
|
+
retiring.push({
|
|
127
|
+
addr: oldAddr,
|
|
128
|
+
agent: e.agent,
|
|
129
|
+
at: now(),
|
|
130
|
+
release: claimer ? () => claimer.release(oldAddr) : null,
|
|
131
|
+
counts: prevCounts,
|
|
132
|
+
swaps: prevSwaps,
|
|
133
|
+
});
|
|
134
|
+
e.addr = addr;
|
|
135
|
+
e.agent = agentFactory(addr);
|
|
136
|
+
e.cooldownUntil = 0;
|
|
137
|
+
e.swaps = prevSwaps + 1;
|
|
138
|
+
e.counts = {};
|
|
139
|
+
e.firstOkAt = 0;
|
|
140
|
+
log(fmtSwap({ from: oldAddr, to: addr, status: verdict.status, kind: verdict.kind, forced: verdict.forced, swaps: e.swaps, prevCounts }));
|
|
141
|
+
await flushRetired();
|
|
142
|
+
return { ok: true, from: oldAddr, to: addr };
|
|
143
|
+
} finally {
|
|
144
|
+
e.swapping = false;
|
|
145
|
+
}
|
|
146
|
+
}
|
|
147
|
+
|
|
148
|
+
/** 上游响应旁听:记账 → 换址后首个 200 的取证行 → 配额信号才换址。 */
|
|
149
|
+
function onTap(signal, e) {
|
|
150
|
+
const status = Number(signal?.status);
|
|
151
|
+
e.counts[status] = (e.counts[status] || 0) + 1;
|
|
152
|
+
if (status === 200 && !e.firstOkAt) {
|
|
153
|
+
e.firstOkAt = now();
|
|
154
|
+
log(fmtFirstOk({ addr: e.addr, swaps: e.swaps, counts: e.counts }));
|
|
155
|
+
}
|
|
156
|
+
if (!SIGNAL_STATUSES.includes(status)) return;
|
|
157
|
+
const v = classifyWarpSignal(signal);
|
|
158
|
+
if (!rotate) {
|
|
159
|
+
log(fmtNoRotate({ addr: e.addr, status, kind: v.kind }));
|
|
160
|
+
return;
|
|
161
|
+
}
|
|
162
|
+
if (!v.rotate) {
|
|
163
|
+
log(fmtVerdictNo({ addr: e.addr, status, kind: v.kind, why: v.why }));
|
|
164
|
+
return;
|
|
165
|
+
}
|
|
166
|
+
const addr = e.addr;
|
|
167
|
+
void swap(e.index, { ...v, status }).catch((err) => log(fmtSwapFail({ addr, error: String(err?.message || err) })));
|
|
168
|
+
}
|
|
169
|
+
|
|
170
|
+
return {
|
|
171
|
+
/** 每次请求调一次 = 选槽粒度(session 策略下同会话粘同一源地址)。 */
|
|
172
|
+
dispatch(opts, handler) {
|
|
173
|
+
if (!list.length) {
|
|
174
|
+
if (fallback) return fallback.dispatch(opts, handler);
|
|
175
|
+
throw new Error("v6pool:源地址池为空且无直连兜底");
|
|
176
|
+
}
|
|
177
|
+
const avail = availableIndexes();
|
|
178
|
+
if (!avail.length) {
|
|
179
|
+
// 全池都在冷却/换址中 ⇒ 直连兜底优先:硬派给正在换址的槽 = 把请求挂到超时
|
|
180
|
+
if (!directWarned) {
|
|
181
|
+
directWarned = true;
|
|
182
|
+
log(fmtDirect({ reason: `全部 ${list.length} 个源地址都在冷却/换址中(下一条恢复后自动回到池内)` }));
|
|
183
|
+
}
|
|
184
|
+
return (fallback || list[0].agent).dispatch(opts, handler);
|
|
185
|
+
}
|
|
186
|
+
directWarned = false;
|
|
187
|
+
const sessionKey = strategy === "session" ? headerValue(opts?.headers, SESSION_HEADER) : "";
|
|
188
|
+
const e = list[selector.pick(avail, sessionKey)];
|
|
189
|
+
if (debug) log(fmtDispatch({ addr: e.addr, session: sessionKey || "(无)" }));
|
|
190
|
+
return e.agent.dispatch(opts, tapHandler(handler, (sig) => onTap(sig, e)));
|
|
191
|
+
},
|
|
192
|
+
|
|
193
|
+
setAddresses,
|
|
194
|
+
|
|
195
|
+
/** 手动换某个槽的源地址(供运维/测试;正常路径由配额信号触发)。 */
|
|
196
|
+
swap,
|
|
197
|
+
|
|
198
|
+
/**
|
|
199
|
+
* G1a(ADR-0061):**请求内**换出口——撞出口池级 429 后由 upstream.js await 这一发,
|
|
200
|
+
* 把该会话粘的槽换新源地址,返回**换址完成后**的新 Agent 供同一请求立刻重发。
|
|
201
|
+
* 与 onTap 的 fire-and-forget 换址(只救下一个请求)不同,这里救的是**在飞请求**。
|
|
202
|
+
* 仅 v6 池提供本方法:换源地址成本≈0(bind/ip addr add);WARP 的换出口=重注册设备
|
|
203
|
+
* (6s~600s,会被 CF 限流),绝不允许在请求内做——白等 N 分钟换不来更快收场。
|
|
204
|
+
* 空池/全槽换址中/该槽被并发占走 ⇒ 返回 null(调用方正常收场,绝不黑洞)。
|
|
205
|
+
* 粘性安全:swap 是**原地**换 e.addr/e.agent(index 不变),session→slot 映射不失效。
|
|
206
|
+
* @param {string} sessionKey x-opencode-session 值(无 key 时由轮转游标挑槽)
|
|
207
|
+
* @returns {Promise<null | {agent: object, addr: string, from: string}>}
|
|
208
|
+
*/
|
|
209
|
+
async rotateFor(sessionKey = "") {
|
|
210
|
+
if (!list.length) return null;
|
|
211
|
+
const avail = availableIndexes();
|
|
212
|
+
if (!avail.length) return null;
|
|
213
|
+
const index = selector.pick(avail, strategy === "session" ? sessionKey : "");
|
|
214
|
+
const e = list[index];
|
|
215
|
+
if (!e) return null;
|
|
216
|
+
const r = await swap(index, { kind: "in-request-rotate", status: 429, forced: true });
|
|
217
|
+
if (r.skipped) return null;
|
|
218
|
+
const slot = list[index];
|
|
219
|
+
return { agent: slot.agent, addr: slot.addr, from: r.from };
|
|
220
|
+
},
|
|
221
|
+
|
|
222
|
+
/** 只读快照(含已退休出口的最终计数——"换址到底有没有换来新额度"看这里)。 */
|
|
223
|
+
stats() {
|
|
224
|
+
const t = now();
|
|
225
|
+
return {
|
|
226
|
+
slots: list.map((e) => ({ addr: e.addr, cooling: e.cooldownUntil > t, swaps: e.swaps, swapping: e.swapping, counts: { ...e.counts }, firstOk: !!e.firstOkAt })),
|
|
227
|
+
history: history.map((h) => ({ ...h, counts: { ...h.counts } })),
|
|
228
|
+
};
|
|
229
|
+
},
|
|
230
|
+
|
|
231
|
+
entries() {
|
|
232
|
+
return list.map((e) => ({ index: e.index, addr: e.addr, cooldownUntil: e.cooldownUntil, swaps: e.swaps }));
|
|
233
|
+
},
|
|
234
|
+
|
|
235
|
+
async close() {
|
|
236
|
+
const slots = list;
|
|
237
|
+
list = [];
|
|
238
|
+
for (const e of slots) {
|
|
239
|
+
try {
|
|
240
|
+
await e.agent?.close?.();
|
|
241
|
+
} catch {
|
|
242
|
+
/* 收摊时关不掉就算了 */
|
|
243
|
+
}
|
|
244
|
+
}
|
|
245
|
+
await flushRetired({ force: true });
|
|
246
|
+
if (fallback) {
|
|
247
|
+
try {
|
|
248
|
+
await fallback.close?.();
|
|
249
|
+
} catch {
|
|
250
|
+
/* 同上 */
|
|
251
|
+
}
|
|
252
|
+
}
|
|
253
|
+
},
|
|
254
|
+
|
|
255
|
+
async destroy() {
|
|
256
|
+
return this.close();
|
|
257
|
+
},
|
|
258
|
+
|
|
259
|
+
get size() {
|
|
260
|
+
return list.length;
|
|
261
|
+
},
|
|
262
|
+
};
|
|
263
|
+
}
|
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
|
+
}
|