@xixka/dsh-hub 0.2.1-rc.8 → 0.2.2
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 +60 -854
- package/lib/accio-adapter.d.ts.map +1 -1
- package/lib/accio-adapter.js +3 -1
- package/lib/accio-adapter.js.map +1 -1
- package/lib/account-pool.d.ts +162 -1
- package/lib/account-pool.d.ts.map +1 -1
- package/lib/account-pool.js +322 -15
- package/lib/account-pool.js.map +1 -1
- package/lib/aggregate-adapter.d.ts +38 -0
- package/lib/aggregate-adapter.d.ts.map +1 -1
- package/lib/aggregate-adapter.js +145 -12
- package/lib/aggregate-adapter.js.map +1 -1
- package/lib/aggregate-expiry.d.ts.map +1 -1
- package/lib/aggregate-expiry.js +4 -0
- package/lib/aggregate-expiry.js.map +1 -1
- package/lib/analyze-image.d.ts.map +1 -1
- package/lib/analyze-image.js.map +1 -1
- package/lib/astudio-adapter.d.ts.map +1 -1
- package/lib/astudio-adapter.js +3 -1
- package/lib/astudio-adapter.js.map +1 -1
- package/lib/buddy-adapter.d.ts.map +1 -1
- package/lib/buddy-adapter.js +22 -4
- package/lib/buddy-adapter.js.map +1 -1
- package/lib/buddy.d.ts +7 -2
- package/lib/buddy.d.ts.map +1 -1
- package/lib/buddy.js +7 -2
- package/lib/buddy.js.map +1 -1
- package/lib/canonical-models.d.ts.map +1 -1
- package/lib/canonical-models.js +20 -0
- package/lib/canonical-models.js.map +1 -1
- package/lib/chromium-session.d.ts +174 -0
- package/lib/chromium-session.d.ts.map +1 -1
- package/lib/chromium-session.js +418 -1
- package/lib/chromium-session.js.map +1 -1
- package/lib/client/jet-hub.js +287 -13303
- package/lib/codearts-credits.d.ts +123 -13
- package/lib/codearts-credits.d.ts.map +1 -1
- package/lib/codearts-credits.js +168 -25
- package/lib/codearts-credits.js.map +1 -1
- package/lib/codearts-vision.d.ts +95 -4
- package/lib/codearts-vision.d.ts.map +1 -1
- package/lib/codearts-vision.js +136 -5
- package/lib/codearts-vision.js.map +1 -1
- package/lib/codely-adapter.d.ts +36 -3
- package/lib/codely-adapter.d.ts.map +1 -1
- package/lib/codely-adapter.js +252 -11
- package/lib/codely-adapter.js.map +1 -1
- package/lib/codely-auth-service.d.ts +17 -0
- package/lib/codely-auth-service.d.ts.map +1 -1
- package/lib/codely-auth-service.js +40 -3
- package/lib/codely-auth-service.js.map +1 -1
- package/lib/codely-auth.d.ts.map +1 -1
- package/lib/codely-auth.js +23 -0
- package/lib/codely-auth.js.map +1 -1
- package/lib/codely-credits.d.ts.map +1 -1
- package/lib/codely-credits.js +18 -1
- package/lib/codely-credits.js.map +1 -1
- package/lib/codely-product.d.ts +10 -5
- package/lib/codely-product.d.ts.map +1 -1
- package/lib/codely-product.js +4 -2
- package/lib/codely-product.js.map +1 -1
- package/lib/credential-resolver.d.ts +41 -1
- package/lib/credential-resolver.d.ts.map +1 -1
- package/lib/credential-resolver.js +31 -6
- package/lib/credential-resolver.js.map +1 -1
- package/lib/image-budget.d.ts +3 -11
- package/lib/image-budget.d.ts.map +1 -1
- package/lib/image-budget.js +43 -5
- package/lib/image-budget.js.map +1 -1
- package/lib/image-data-cache.d.ts +87 -0
- package/lib/image-data-cache.d.ts.map +1 -0
- package/lib/image-data-cache.js +144 -0
- package/lib/image-data-cache.js.map +1 -0
- package/lib/index.d.ts +0 -51
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js +290 -164
- package/lib/index.js.map +1 -1
- package/lib/jet-hub-rpc.d.ts +14 -17
- package/lib/jet-hub-rpc.d.ts.map +1 -1
- package/lib/jet-hub-rpc.js +812 -328
- package/lib/jet-hub-rpc.js.map +1 -1
- package/lib/jet-hub-store.d.ts +74 -1
- package/lib/jet-hub-store.d.ts.map +1 -1
- package/lib/jet-hub-store.js +72 -4
- package/lib/jet-hub-store.js.map +1 -1
- package/lib/llm-adapter.d.ts +96 -5
- package/lib/llm-adapter.d.ts.map +1 -1
- package/lib/llm-adapter.js +742 -62
- package/lib/llm-adapter.js.map +1 -1
- package/lib/lobsterai-adapter.d.ts.map +1 -1
- package/lib/lobsterai-adapter.js +54 -15
- package/lib/lobsterai-adapter.js.map +1 -1
- package/lib/login.d.ts +5 -13
- package/lib/login.d.ts.map +1 -1
- package/lib/login.js +75 -14
- package/lib/login.js.map +1 -1
- package/lib/loomy-adapter.d.ts +3 -0
- package/lib/loomy-adapter.d.ts.map +1 -1
- package/lib/loomy-adapter.js +11 -3
- package/lib/loomy-adapter.js.map +1 -1
- package/lib/loomy-auth.d.ts +51 -0
- package/lib/loomy-auth.d.ts.map +1 -1
- package/lib/loomy-auth.js +149 -2
- package/lib/loomy-auth.js.map +1 -1
- package/lib/loomy-oauth.d.ts +44 -0
- package/lib/loomy-oauth.d.ts.map +1 -1
- package/lib/loomy-oauth.js +48 -1
- package/lib/loomy-oauth.js.map +1 -1
- package/lib/loomy-sms-login.d.ts +61 -0
- package/lib/loomy-sms-login.d.ts.map +1 -0
- package/lib/loomy-sms-login.js +330 -0
- package/lib/loomy-sms-login.js.map +1 -0
- package/lib/loomy.d.ts +22 -0
- package/lib/loomy.d.ts.map +1 -1
- package/lib/loomy.js +10 -0
- package/lib/loomy.js.map +1 -1
- package/lib/magicrew-adapter.d.ts +201 -0
- package/lib/magicrew-adapter.d.ts.map +1 -0
- package/lib/magicrew-adapter.js +595 -0
- package/lib/magicrew-adapter.js.map +1 -0
- package/lib/magicrew-auth.d.ts +494 -0
- package/lib/magicrew-auth.d.ts.map +1 -0
- package/lib/magicrew-auth.js +951 -0
- package/lib/magicrew-auth.js.map +1 -0
- package/lib/magicrew-browser-login.d.ts +333 -0
- package/lib/magicrew-browser-login.d.ts.map +1 -0
- package/lib/magicrew-browser-login.js +740 -0
- package/lib/magicrew-browser-login.js.map +1 -0
- package/lib/magicrew-catalog.d.ts +19 -0
- package/lib/magicrew-catalog.d.ts.map +1 -0
- package/lib/magicrew-catalog.js +80 -0
- package/lib/magicrew-catalog.js.map +1 -0
- package/lib/magicrew-credits.d.ts +112 -0
- package/lib/magicrew-credits.d.ts.map +1 -0
- package/lib/magicrew-credits.js +319 -0
- package/lib/magicrew-credits.js.map +1 -0
- package/lib/magicrew-local-browser.d.ts +123 -0
- package/lib/magicrew-local-browser.d.ts.map +1 -0
- package/lib/magicrew-local-browser.js +321 -0
- package/lib/magicrew-local-browser.js.map +1 -0
- package/lib/magicrew-product.d.ts +127 -0
- package/lib/magicrew-product.d.ts.map +1 -0
- package/lib/magicrew-product.js +159 -0
- package/lib/magicrew-product.js.map +1 -0
- package/lib/magicrew-profile.d.ts +74 -0
- package/lib/magicrew-profile.d.ts.map +1 -0
- package/lib/magicrew-profile.js +148 -0
- package/lib/magicrew-profile.js.map +1 -0
- package/lib/magicrew.d.ts +185 -0
- package/lib/magicrew.d.ts.map +1 -0
- package/lib/magicrew.js +215 -0
- package/lib/magicrew.js.map +1 -0
- package/lib/model-catalog.d.ts +8 -0
- package/lib/model-catalog.d.ts.map +1 -1
- package/lib/model-catalog.js +127 -5
- package/lib/model-catalog.js.map +1 -1
- package/lib/models.d.ts +216 -32
- package/lib/models.d.ts.map +1 -1
- package/lib/models.js +500 -47
- package/lib/models.js.map +1 -1
- package/lib/modelscope-adapter.d.ts.map +1 -1
- package/lib/modelscope-adapter.js +7 -2
- package/lib/modelscope-adapter.js.map +1 -1
- package/lib/modelscope-product.d.ts +44 -6
- package/lib/modelscope-product.d.ts.map +1 -1
- package/lib/modelscope-product.js +98 -9
- package/lib/modelscope-product.js.map +1 -1
- package/lib/officeace-adapter.d.ts.map +1 -1
- package/lib/officeace-adapter.js +147 -21
- package/lib/officeace-adapter.js.map +1 -1
- package/lib/officeace-auth.d.ts +15 -0
- package/lib/officeace-auth.d.ts.map +1 -1
- package/lib/officeace-auth.js +99 -2
- package/lib/officeace-auth.js.map +1 -1
- package/lib/openai-gateway/tencent-fingerprint.d.ts.map +1 -1
- package/lib/openai-gateway/tencent-fingerprint.js +28 -3
- package/lib/openai-gateway/tencent-fingerprint.js.map +1 -1
- package/lib/opencode-adapter.d.ts +27 -0
- package/lib/opencode-adapter.d.ts.map +1 -1
- package/lib/opencode-adapter.js +57 -8
- package/lib/opencode-adapter.js.map +1 -1
- package/lib/opencode-bun-tls.d.ts +103 -0
- package/lib/opencode-bun-tls.d.ts.map +1 -0
- package/lib/opencode-bun-tls.js +212 -0
- package/lib/opencode-bun-tls.js.map +1 -0
- package/lib/opencode-messages.d.ts +0 -19
- package/lib/opencode-messages.d.ts.map +1 -1
- package/lib/opencode-messages.js +30 -33
- package/lib/opencode-messages.js.map +1 -1
- package/lib/opencode-official-prompt.d.ts +62 -0
- package/lib/opencode-official-prompt.d.ts.map +1 -0
- package/lib/opencode-official-prompt.js +119 -0
- package/lib/opencode-official-prompt.js.map +1 -0
- package/lib/opencode-official-tools.d.ts +27 -0
- package/lib/opencode-official-tools.d.ts.map +1 -0
- package/lib/opencode-official-tools.js +340 -0
- package/lib/opencode-official-tools.js.map +1 -0
- package/lib/opencode-product.d.ts.map +1 -1
- package/lib/opencode-product.js +3 -2
- package/lib/opencode-product.js.map +1 -1
- package/lib/opencode-stream.d.ts.map +1 -1
- package/lib/opencode-stream.js +8 -7
- package/lib/opencode-stream.js.map +1 -1
- package/lib/product.d.ts +15 -3
- package/lib/product.d.ts.map +1 -1
- package/lib/product.js +44 -11
- package/lib/product.js.map +1 -1
- package/lib/provider-credits.d.ts +2 -0
- package/lib/provider-credits.d.ts.map +1 -1
- package/lib/provider-credits.js +46 -17
- package/lib/provider-credits.js.map +1 -1
- package/lib/provider-expiry.d.ts.map +1 -1
- package/lib/provider-expiry.js +29 -0
- package/lib/provider-expiry.js.map +1 -1
- package/lib/provider-http-pool.d.ts +85 -0
- package/lib/provider-http-pool.d.ts.map +1 -0
- package/lib/provider-http-pool.js +224 -0
- package/lib/provider-http-pool.js.map +1 -0
- package/lib/provider-registry.d.ts.map +1 -1
- package/lib/provider-registry.js +73 -39
- package/lib/provider-registry.js.map +1 -1
- package/lib/qiniu-adapter.d.ts +276 -0
- package/lib/qiniu-adapter.d.ts.map +1 -0
- package/lib/qiniu-adapter.js +689 -0
- package/lib/qiniu-adapter.js.map +1 -0
- package/lib/qiniu-auth.d.ts +130 -0
- package/lib/qiniu-auth.d.ts.map +1 -0
- package/lib/qiniu-auth.js +234 -0
- package/lib/qiniu-auth.js.map +1 -0
- package/lib/qiniu-messages.d.ts +96 -0
- package/lib/qiniu-messages.d.ts.map +1 -0
- package/lib/qiniu-messages.js +97 -0
- package/lib/qiniu-messages.js.map +1 -0
- package/lib/qiniu-product.d.ts +126 -0
- package/lib/qiniu-product.d.ts.map +1 -0
- package/lib/qiniu-product.js +269 -0
- package/lib/qiniu-product.js.map +1 -0
- package/lib/qiniu-rpc.d.ts +119 -0
- package/lib/qiniu-rpc.d.ts.map +1 -0
- package/lib/qiniu-rpc.js +214 -0
- package/lib/qiniu-rpc.js.map +1 -0
- package/lib/qiniu.d.ts +145 -0
- package/lib/qiniu.d.ts.map +1 -0
- package/lib/qiniu.js +164 -0
- package/lib/qiniu.js.map +1 -0
- package/lib/raccoon-adapter.d.ts +18 -2
- package/lib/raccoon-adapter.d.ts.map +1 -1
- package/lib/raccoon-adapter.js +154 -21
- package/lib/raccoon-adapter.js.map +1 -1
- package/lib/raccoon-auth.d.ts +6 -0
- package/lib/raccoon-auth.d.ts.map +1 -1
- package/lib/raccoon-auth.js +9 -1
- package/lib/raccoon-auth.js.map +1 -1
- package/lib/raccoon-credits.d.ts +38 -5
- package/lib/raccoon-credits.d.ts.map +1 -1
- package/lib/raccoon-credits.js +127 -6
- package/lib/raccoon-credits.js.map +1 -1
- package/lib/raccoon.d.ts +14 -2
- package/lib/raccoon.d.ts.map +1 -1
- package/lib/raccoon.js +14 -2
- package/lib/raccoon.js.map +1 -1
- package/lib/service.d.ts +46 -6
- package/lib/service.d.ts.map +1 -1
- package/lib/service.js +104 -16
- package/lib/service.js.map +1 -1
- package/lib/session-balance.d.ts +203 -0
- package/lib/session-balance.d.ts.map +1 -0
- package/lib/session-balance.js +279 -0
- package/lib/session-balance.js.map +1 -0
- package/lib/sign.d.ts +97 -1
- package/lib/sign.d.ts.map +1 -1
- package/lib/sign.js +174 -2
- package/lib/sign.js.map +1 -1
- package/lib/token-ledger-store.d.ts.map +1 -1
- package/lib/token-ledger-store.js +121 -27
- package/lib/token-ledger-store.js.map +1 -1
- package/lib/trae-adapter.d.ts.map +1 -1
- package/lib/trae-adapter.js +3 -1
- package/lib/trae-adapter.js.map +1 -1
- package/lib/types.d.ts +165 -13
- package/lib/types.d.ts.map +1 -1
- package/lib/types.js.map +1 -1
- package/lib/usage-badge.d.ts +77 -7
- package/lib/usage-badge.d.ts.map +1 -1
- package/lib/usage-badge.js +190 -28
- package/lib/usage-badge.js.map +1 -1
- package/lib/webdav-auto-sync.d.ts +96 -0
- package/lib/webdav-auto-sync.d.ts.map +1 -0
- package/lib/webdav-auto-sync.js +0 -0
- package/lib/webdav-auto-sync.js.map +1 -0
- package/lib/webdav-sync-crypto.d.ts +18 -0
- package/lib/webdav-sync-crypto.d.ts.map +1 -0
- package/lib/webdav-sync-crypto.js +72 -0
- package/lib/webdav-sync-crypto.js.map +1 -0
- package/lib/webdav-sync-merge.d.ts +31 -0
- package/lib/webdav-sync-merge.d.ts.map +1 -0
- package/lib/webdav-sync-merge.js +0 -0
- package/lib/webdav-sync-merge.js.map +1 -0
- package/lib/webdav-sync.d.ts +155 -0
- package/lib/webdav-sync.d.ts.map +1 -0
- package/lib/webdav-sync.js +412 -0
- package/lib/webdav-sync.js.map +1 -0
- package/lib/zcode-adapter.d.ts +4 -2
- package/lib/zcode-adapter.d.ts.map +1 -1
- package/lib/zcode-adapter.js +132 -37
- package/lib/zcode-adapter.js.map +1 -1
- package/lib/zcode-upstream.d.ts +59 -0
- package/lib/zcode-upstream.d.ts.map +1 -1
- package/lib/zcode-upstream.js +137 -2
- package/lib/zcode-upstream.js.map +1 -1
- package/package.json +5 -4
- package/lib/stepcode-adapter.d.ts +0 -158
- package/lib/stepcode-adapter.d.ts.map +0 -1
- package/lib/stepcode-adapter.js +0 -318
- package/lib/stepcode-adapter.js.map +0 -1
- package/lib/stepcode-auth.d.ts +0 -154
- package/lib/stepcode-auth.d.ts.map +0 -1
- package/lib/stepcode-auth.js +0 -287
- package/lib/stepcode-auth.js.map +0 -1
- package/lib/stepcode-oauth.d.ts +0 -194
- package/lib/stepcode-oauth.d.ts.map +0 -1
- package/lib/stepcode-oauth.js +0 -496
- package/lib/stepcode-oauth.js.map +0 -1
- package/lib/stepcode-product.d.ts +0 -255
- package/lib/stepcode-product.d.ts.map +0 -1
- package/lib/stepcode-product.js +0 -256
- package/lib/stepcode-product.js.map +0 -1
- package/lib/stepcode.d.ts +0 -230
- package/lib/stepcode.d.ts.map +0 -1
- package/lib/stepcode.js +0 -300
- package/lib/stepcode.js.map +0 -1
- package/lib/teleagent-adapter.d.ts +0 -116
- package/lib/teleagent-adapter.d.ts.map +0 -1
- package/lib/teleagent-adapter.js +0 -293
- package/lib/teleagent-adapter.js.map +0 -1
- package/lib/teleagent-auth.d.ts +0 -279
- package/lib/teleagent-auth.d.ts.map +0 -1
- package/lib/teleagent-auth.js +0 -512
- package/lib/teleagent-auth.js.map +0 -1
- package/lib/teleagent-cdp-login.d.ts +0 -100
- package/lib/teleagent-cdp-login.d.ts.map +0 -1
- package/lib/teleagent-cdp-login.js +0 -402
- package/lib/teleagent-cdp-login.js.map +0 -1
- package/lib/teleagent-credits.d.ts +0 -120
- package/lib/teleagent-credits.d.ts.map +0 -1
- package/lib/teleagent-credits.js +0 -288
- package/lib/teleagent-credits.js.map +0 -1
- package/lib/teleagent-product.d.ts +0 -196
- package/lib/teleagent-product.d.ts.map +0 -1
- package/lib/teleagent-product.js +0 -212
- package/lib/teleagent-product.js.map +0 -1
- package/lib/teleagent.d.ts +0 -288
- package/lib/teleagent.d.ts.map +0 -1
- package/lib/teleagent.js +0 -450
- package/lib/teleagent.js.map +0 -1
package/lib/account-pool.js
CHANGED
|
@@ -3,8 +3,14 @@ import { createJetHubStore, clearRejectionLayer, DEFAULT_PANEL_ENTRY, isValidRes
|
|
|
3
3
|
import { createPermanentLockStore } from './permanent-lock-store.js';
|
|
4
4
|
import { normalizeOpencodeGeneration } from './opencode-auth.js';
|
|
5
5
|
import { maskProxyPassword } from './proxy-mask.js';
|
|
6
|
+
// ⚠️ 快照形状与净化器住在 usage-badge.ts(形状的唯一主人)。usage-badge 只
|
|
7
|
+
// import ttl-cache / badge-subscription / types ⇒ 不引入环。
|
|
8
|
+
import { sanitizePersistedSnapshotMap } from './usage-badge.js';
|
|
6
9
|
// ⚠️ `model-queue.ts` **零 import**(纯函数模块,见其模块头)⇒ 不引入环。
|
|
7
10
|
import { nextUtc8DayStartMs } from './model-queue.js';
|
|
11
|
+
import { readTokenLedgerDayMap, utc8DayKey } from './token-ledger.js';
|
|
12
|
+
import { accountLoadIndex, overflowRequestsThreshold, rankAccountsBySessionWithOverflow, shuffleAccounts } from './session-balance.js';
|
|
13
|
+
import { defaultDeviceName, sanitizeWebdavSyncAccount } from './webdav-sync.js';
|
|
8
14
|
// 兼容既有的导入路径:命名空间名与黑名单类型原本定义在本模块。
|
|
9
15
|
export { JET_HUB_NS } from './jet-hub-store.js';
|
|
10
16
|
/**
|
|
@@ -367,6 +373,17 @@ export class AccountPool {
|
|
|
367
373
|
* 唯一后果是回到原生搜索,用户再关一次即可。
|
|
368
374
|
*/
|
|
369
375
|
nativeWebSearchCache = true;
|
|
376
|
+
/**
|
|
377
|
+
* 「ZCode 会话负载均衡」开关的进程内副本。
|
|
378
|
+
*
|
|
379
|
+
* 缺键语义是**启用**(与 {@link nativeWebSearchCache} 同一方向):老文档没有
|
|
380
|
+
* 本键时保持会话亲和,不会因读取失败而静默改回「手动顺序压一个号」
|
|
381
|
+
*(那正是 2026-10-30 用户要求修掉的形态)。
|
|
382
|
+
*
|
|
383
|
+
* ⚠️ 与 {@link nativeWebSearchCache} 同级、**不需要**独立文档:丢失本键的
|
|
384
|
+
* 唯一后果是回到手动顺序,用户再开一次即可。
|
|
385
|
+
*/
|
|
386
|
+
sessionBalanceCache = true;
|
|
370
387
|
/**
|
|
371
388
|
* 「面板入口」的进程内副本:Jet Hub 的唯一入口位置(两个取值互斥)。
|
|
372
389
|
*
|
|
@@ -400,6 +417,30 @@ export class AccountPool {
|
|
|
400
417
|
* `queueStoreSave` 的整体写入(否则「任何一次改账号都会静默清掉它」)。
|
|
401
418
|
*/
|
|
402
419
|
minimaxXffCache;
|
|
420
|
+
/**
|
|
421
|
+
* WebDAV 同步账号的进程内副本(「同步」按钮的云端通道配置)。
|
|
422
|
+
*
|
|
423
|
+
* 语义与信任边界见 `jet-hub-store.ts` 的 `JetHubState.webdavSync` 与
|
|
424
|
+
* `webdav-sync.ts` 的 `sanitizeWebdavSyncAccount`(**同一份判据**,
|
|
425
|
+
* 本文件不另写一份)。
|
|
426
|
+
*
|
|
427
|
+
* `undefined` = 未配置(缺省;与升级前行为一致)。丢失后果可逆(重填一次
|
|
428
|
+
* 表单),但必须被带进 `queueStoreSave` 的整体写入 —— 否则「任何一次改账号
|
|
429
|
+
* 都会静默清掉它」,用户重启后发现同步配置消失。
|
|
430
|
+
*/
|
|
431
|
+
webdavSyncCache;
|
|
432
|
+
/**
|
|
433
|
+
* 用量徽标的**持久化余额快照**的进程内副本(provider id → 最近一次成功读数)。
|
|
434
|
+
*
|
|
435
|
+
* 语义与信任边界见 `jet-hub-store.ts` 的 `JetHubState.usageSnapshots` 与
|
|
436
|
+
* `usage-badge.ts` 的 `sanitizePersistedSnapshotMap`(**同一份判据**,
|
|
437
|
+
* 本文件不另写一份)。写入口是 {@link writeUsageSnapshot}(usage-badge 的
|
|
438
|
+
* `deps.persist`),读入口是 {@link readUsageSnapshot}(`deps.loadPersisted`)。
|
|
439
|
+
*
|
|
440
|
+
* ⚠️ 必须被带进 `queueStoreSave` 的整体写入 —— 否则「任何一次改账号都会
|
|
441
|
+
* 静默清掉它」,重启后徽标又回到「读取中」。
|
|
442
|
+
*/
|
|
443
|
+
usageSnapshotsCache = {};
|
|
403
444
|
/**
|
|
404
445
|
* ★ **由折算观测写下的** `modelRateLimits` 标记集合(键 = `accountId\u0000modelId`)。
|
|
405
446
|
*
|
|
@@ -495,6 +536,8 @@ export class AccountPool {
|
|
|
495
536
|
this.gatewayAllowLanCache = state.gatewayAllowLan === true;
|
|
496
537
|
// 原生搜索总开关同理:老文档没有该键 → 保持默认启用。
|
|
497
538
|
this.nativeWebSearchCache = state.nativeWebSearchEnabled !== false;
|
|
539
|
+
// 会话负载均衡开关同理:老文档没有该键 → 保持默认启用。
|
|
540
|
+
this.sessionBalanceCache = state.sessionBalanceEnabled !== false;
|
|
498
541
|
// 面板入口同理:老文档没有该键(或值是脏值)→ 回到默认「仅侧栏」。
|
|
499
542
|
// 过一遍 sanitize:store 层的 load 已归一,这里再判一次是因为老契约
|
|
500
543
|
// 后端可能绕过 schema 直接给出原始文档。
|
|
@@ -504,9 +547,16 @@ export class AccountPool {
|
|
|
504
547
|
// MiniMax 国际站 XFF 同理:老文档没有该键 → `undefined`(不附头,
|
|
505
548
|
// 与修复前行为逐字节一致)。**过一遍 sanitize**:老文档里可能有脏值。
|
|
506
549
|
this.minimaxXffCache = sanitizeMinimaxXff(state.minimaxXff);
|
|
550
|
+
// WebDAV 同步账号同理:老文档没有该键 / 字段残缺 → `undefined`
|
|
551
|
+
// (未配置,与升级前行为一致)。**过一遍 sanitize**:老文档里可能有
|
|
552
|
+
// 手工编辑出来的半截配置(如只有 url 没有密码),不能让它进缓存。
|
|
553
|
+
this.webdavSyncCache = sanitizeWebdavSyncAccount(state.webdavSync);
|
|
507
554
|
// 供应商关闭意图同理:老文档没有该键 → 空表(没有任何供应商被关闭,
|
|
508
555
|
// 与升级前行为一致)。**过一遍 sanitize**:老文档里可能有脏值。
|
|
509
556
|
this.providerClosedCache = sanitizeProviderClosed(state.providerClosed);
|
|
557
|
+
// 余额快照同理:老文档没有该键 → 空表(没有快照可兼顶 = 与改动前行为
|
|
558
|
+
// 一致)。**过一遍 sanitize**:快照会被客户端当真实读数渲染,脏值不能进。
|
|
559
|
+
this.usageSnapshotsCache = sanitizePersistedSnapshotMap(state.usageSnapshots);
|
|
510
560
|
}
|
|
511
561
|
this.loadLocks(state);
|
|
512
562
|
}
|
|
@@ -601,6 +651,10 @@ export class AccountPool {
|
|
|
601
651
|
gatewayAllowLan: this.gatewayAllowLanCache,
|
|
602
652
|
nativeWebSearchEnabled: this.nativeWebSearchCache,
|
|
603
653
|
// ⚠️ **必须带上本键**(与 `nativeWebSearchEnabled` 同一个整体替换陷阱):
|
|
654
|
+
// 漏键会让用户明确关闭的「会话负载均衡」在任何一次其它写入时被抹掉,
|
|
655
|
+
// 重启后静默回到开启。
|
|
656
|
+
sessionBalanceEnabled: this.sessionBalanceCache,
|
|
657
|
+
// ⚠️ **必须带上本键**(与 `nativeWebSearchEnabled` 同一个整体替换陷阱):
|
|
604
658
|
// 漏键会让用户改过的面板入口在**任何**一次账号/黑名单/网关/顺序写入时
|
|
605
659
|
// 被静默清掉,重启后入口又变回默认「仅侧栏」。
|
|
606
660
|
panelEntry: this.panelEntryCache,
|
|
@@ -614,6 +668,15 @@ export class AccountPool {
|
|
|
614
668
|
// 漏键 ⇒ 关闭意图**永不落盘**,且任何账号/黑名单写入都会把它抹掉
|
|
615
669
|
// ⇒ 重启后供应商静默回到「已打开」(Gitee issue IKP8OF 原样复发)。
|
|
616
670
|
providerClosed: this.providerClosedCache,
|
|
671
|
+
// ⚠️ **必须带上本键**(与 `minimaxXff` 同因):`write` 是整体替换语义 ⇒
|
|
672
|
+
// 漏键会让 WebDAV 同步账号在任何一次改账号 / 改黑名单 / 拖顺序时
|
|
673
|
+
// 被静默清掉,重启后「同步」按钮回到未配置态。
|
|
674
|
+
webdavSync: this.webdavSyncCache,
|
|
675
|
+
// ⚠️⚠️ **必须带上本键**(同一整体替换陷阱):漏键会让余额快照在**任何**
|
|
676
|
+
// 一次账号 / 黑名单 / 网关 / 顺序写入时被抹掉 ⇒ 重启后徽标又回到
|
|
677
|
+
// 「读取中」(本次改动要解决的问题原样复发)。缓存里的快照**已经过
|
|
678
|
+
// sanitize**(载入与 writeUsageSnapshot 两处),此处原样携带。
|
|
679
|
+
usageSnapshots: this.usageSnapshotsCache,
|
|
617
680
|
});
|
|
618
681
|
});
|
|
619
682
|
this.storeChain = next.catch(() => { });
|
|
@@ -1098,6 +1161,36 @@ export class AccountPool {
|
|
|
1098
1161
|
}
|
|
1099
1162
|
await this.queueStoreSave();
|
|
1100
1163
|
}
|
|
1164
|
+
/**
|
|
1165
|
+
* 「ZCode 会话负载均衡」开关当前是否启用。
|
|
1166
|
+
*
|
|
1167
|
+
* 缺键语义为**启用**(见 {@link sessionBalanceCache})。
|
|
1168
|
+
*
|
|
1169
|
+
* ⚠️ 调用方(`credential-resolver.ts` 与 `zcode-adapter.ts` 的选号路径)
|
|
1170
|
+
* **必须每次现读**,不能缓存返回值:用户随时可能在 Jet Hub 页头切换。
|
|
1171
|
+
*/
|
|
1172
|
+
sessionBalanceEnabled() {
|
|
1173
|
+
this.ensureLoaded();
|
|
1174
|
+
return this.sessionBalanceCache;
|
|
1175
|
+
}
|
|
1176
|
+
/**
|
|
1177
|
+
* 打开/关闭「ZCode 会话负载均衡」并落盘。
|
|
1178
|
+
*
|
|
1179
|
+
* 关闭后 ZCode 回到「手动顺序首个可用账号」的既有语义 —— 与开关加入前
|
|
1180
|
+
* 逐字节同路径(`getAvailableAccount`),不经过 session 排序。
|
|
1181
|
+
*/
|
|
1182
|
+
async setSessionBalanceEnabled(enabled) {
|
|
1183
|
+
this.ensureLoaded();
|
|
1184
|
+
if (this.sessionBalanceCache === enabled)
|
|
1185
|
+
return;
|
|
1186
|
+
this.sessionBalanceCache = enabled;
|
|
1187
|
+
this.loaded = true;
|
|
1188
|
+
if (this.store.kind === 'memory') {
|
|
1189
|
+
this.ctx.logger?.warn?.('[jet-hub] 无持久化后端,会话负载均衡开关仅本次会话有效');
|
|
1190
|
+
return;
|
|
1191
|
+
}
|
|
1192
|
+
await this.queueStoreSave();
|
|
1193
|
+
}
|
|
1101
1194
|
/**
|
|
1102
1195
|
* 「面板入口」的当前取值:Jet Hub 的唯一入口位置。
|
|
1103
1196
|
*
|
|
@@ -1195,6 +1288,55 @@ export class AccountPool {
|
|
|
1195
1288
|
}
|
|
1196
1289
|
await this.queueStoreSave();
|
|
1197
1290
|
}
|
|
1291
|
+
/**
|
|
1292
|
+
* 当前保存的 WebDAV 同步账号;`undefined` = 未配置。
|
|
1293
|
+
*
|
|
1294
|
+
* ⚠️ 调用方(`jet-hub-rpc.ts` 的 `sync.*` 端点族)**每次现读**,不能缓存
|
|
1295
|
+
* 返回值:用户随时可能在另一台打开的面板里改它。
|
|
1296
|
+
*
|
|
1297
|
+
* ⚠️ 返回值含 WebDAV 密码与同步口令 —— 只给 RPC 响应用(同一回环通道
|
|
1298
|
+
* 已在返回明文凭据载荷),**不得**写进任何日志。
|
|
1299
|
+
*/
|
|
1300
|
+
webdavSyncAccount() {
|
|
1301
|
+
this.ensureLoaded();
|
|
1302
|
+
return this.webdavSyncCache;
|
|
1303
|
+
}
|
|
1304
|
+
/**
|
|
1305
|
+
* 保存(或清除)WebDAV 同步账号并落盘。
|
|
1306
|
+
*
|
|
1307
|
+
* 入参一律过 `sanitizeWebdavSyncAccount`:字段残缺 / 非法(非 http(s)、
|
|
1308
|
+
* URL 内嵌凭据、目录含 `..`)的配置被归一成 `undefined`(= 未配置)。
|
|
1309
|
+
* 归一后的实际值由调用方回给客户端渲染(「填了没生效」立刻可见)。
|
|
1310
|
+
*
|
|
1311
|
+
* 设备名留空时用**本机主机名**补齐(`defaultDeviceName`):多设备同步的
|
|
1312
|
+
* 快照元数据要区分「来自哪台设备」,而浏览器侧拿不到 hostname。
|
|
1313
|
+
*/
|
|
1314
|
+
async setWebdavSyncAccount(raw) {
|
|
1315
|
+
this.ensureLoaded();
|
|
1316
|
+
const sanitized = sanitizeWebdavSyncAccount(raw);
|
|
1317
|
+
const next = sanitized === undefined
|
|
1318
|
+
? undefined
|
|
1319
|
+
: (sanitized.deviceName.length > 0 ? sanitized : { ...sanitized, deviceName: defaultDeviceName() });
|
|
1320
|
+
if (this.webdavSyncCache === undefined && next === undefined)
|
|
1321
|
+
return undefined;
|
|
1322
|
+
if (this.webdavSyncCache !== undefined && next !== undefined
|
|
1323
|
+
&& this.webdavSyncCache.url === next.url
|
|
1324
|
+
&& this.webdavSyncCache.username === next.username
|
|
1325
|
+
&& this.webdavSyncCache.password === next.password
|
|
1326
|
+
&& this.webdavSyncCache.remotePath === next.remotePath
|
|
1327
|
+
&& this.webdavSyncCache.passphrase === next.passphrase
|
|
1328
|
+
&& this.webdavSyncCache.deviceName === next.deviceName) {
|
|
1329
|
+
return next;
|
|
1330
|
+
}
|
|
1331
|
+
this.webdavSyncCache = next;
|
|
1332
|
+
this.loaded = true;
|
|
1333
|
+
if (this.store.kind === 'memory') {
|
|
1334
|
+
this.ctx.logger?.warn?.('[jet-hub] 无持久化后端,WebDAV 同步账号仅本次会话有效');
|
|
1335
|
+
return next;
|
|
1336
|
+
}
|
|
1337
|
+
await this.queueStoreSave();
|
|
1338
|
+
return next;
|
|
1339
|
+
}
|
|
1198
1340
|
/**
|
|
1199
1341
|
* 打开/关闭某个模型。
|
|
1200
1342
|
*
|
|
@@ -2101,6 +2243,100 @@ export class AccountPool {
|
|
|
2101
2243
|
listAccountsByProvider(provider) {
|
|
2102
2244
|
return this.readAccounts().filter(a => a.provider === provider);
|
|
2103
2245
|
}
|
|
2246
|
+
/**
|
|
2247
|
+
* 读某渠道**最近一次成功读到**的持久化余额快照(usage-badge 的
|
|
2248
|
+
* `deps.loadPersisted`)。
|
|
2249
|
+
*
|
|
2250
|
+
* 没有就返回 `undefined` —— 冷启动第一次、或该渠道从未读到过数。
|
|
2251
|
+
* 返回的是**进程内副本的引用**:快照对消费方是只读值(usage-badge 只读字段
|
|
2252
|
+
* 组装响应),不做防御性拷贝(每 60s 轮询拷一次整表是白费)。
|
|
2253
|
+
*/
|
|
2254
|
+
readUsageSnapshot(provider) {
|
|
2255
|
+
this.ensureLoaded();
|
|
2256
|
+
return this.usageSnapshotsCache[provider];
|
|
2257
|
+
}
|
|
2258
|
+
/**
|
|
2259
|
+
* 写入一份**刚读到**的余额快照(usage-badge 的 `deps.persist`)。
|
|
2260
|
+
*
|
|
2261
|
+
* ## 尽力而为
|
|
2262
|
+
*
|
|
2263
|
+
* - 入参先过 `sanitizePersistedSnapshotMap`:usage-badge 的快照形状虽受我们
|
|
2264
|
+
* 控制,但这个 dep 是**公开接缝**,脏值不该进缓存(客户端会当真实读数渲染);
|
|
2265
|
+
* 净化后没有该键(形状不合格)⇒ 静默忽略;
|
|
2266
|
+
* - 落盘失败**只告警**:快照丢了 = 下次重启后徽标多转一圈「读取中」,
|
|
2267
|
+
* 绝不配让正在进行的读数失败(调用方在 `loadSnapshot` 的出口调用它,
|
|
2268
|
+
* 抛错会把一次成功的读数变成失败)。
|
|
2269
|
+
*/
|
|
2270
|
+
writeUsageSnapshot(provider, snapshot) {
|
|
2271
|
+
this.ensureLoaded();
|
|
2272
|
+
const sanitized = sanitizePersistedSnapshotMap({ [provider]: snapshot });
|
|
2273
|
+
const next = sanitized[provider];
|
|
2274
|
+
if (next === undefined)
|
|
2275
|
+
return;
|
|
2276
|
+
this.usageSnapshotsCache = { ...this.usageSnapshotsCache, [provider]: next };
|
|
2277
|
+
// ⚠️ **快照走短窗口尾沿合并,其余键保持实时写盘**(性能优化 #2,2026-11-02):
|
|
2278
|
+
// 快照是**可重建**的数据(重启后徽标顶一拍、后台回源即刷新),不值得为它
|
|
2279
|
+
// 每次都重写整份 state.json(账号、黑名单、各开关)。这里只把该 provider 的
|
|
2280
|
+
// 快照标记为「待落盘」,由一个防抖定时器在窗口末尾**走同一条
|
|
2281
|
+
// {@link storeChain}** 落盘 —— 与账号/黑名单写入串行,绝不乱序覆盖。
|
|
2282
|
+
// 内存(`usageSnapshotsCache`)仍然立即更新,读路径语义不变。
|
|
2283
|
+
if (this.store.kind === 'memory')
|
|
2284
|
+
return;
|
|
2285
|
+
this.scheduleUsageSnapshotSave();
|
|
2286
|
+
}
|
|
2287
|
+
/** 快照尾沿合并的防抖窗口(毫秒)。 */
|
|
2288
|
+
static USAGE_SNAPSHOT_SAVE_DEBOUNCE_MS = 2_000;
|
|
2289
|
+
/** 快照防抖定时器(unref:不拖住进程退出)。 */
|
|
2290
|
+
usageSnapshotSaveTimer;
|
|
2291
|
+
/** 防抖窗口内又发生写入时,落盘后需要再排一轮。 */
|
|
2292
|
+
usageSnapshotSaveDirty = false;
|
|
2293
|
+
/**
|
|
2294
|
+
* 快照落盘的**尾沿合并**调度(性能优化 #2)。
|
|
2295
|
+
*
|
|
2296
|
+
* - 窗口首笔启动计时器;期间新写入只置 dirty;
|
|
2297
|
+
* - 到点后把**此刻**的 `usageSnapshotsCache` 整体交给 {@link queueStoreSave}
|
|
2298
|
+
* —— `queueStoreSave` 自己会在轮到本次时重新取快照(三份数据同源的既有
|
|
2299
|
+
* 约定),这里只是触发者;
|
|
2300
|
+
* - 失败照旧只告警(快照丢了 = 下次重启后徽标多转一圈,不连坐任何读数);
|
|
2301
|
+
* 失败后本轮 dirty 一并放弃——下一笔 `writeUsageSnapshot` 会重新调度,
|
|
2302
|
+
* 不做后台无限重试(与该数据「尽力而为」的定级一致)。
|
|
2303
|
+
*/
|
|
2304
|
+
scheduleUsageSnapshotSave() {
|
|
2305
|
+
if (this.usageSnapshotSaveTimer !== undefined) {
|
|
2306
|
+
this.usageSnapshotSaveDirty = true;
|
|
2307
|
+
return;
|
|
2308
|
+
}
|
|
2309
|
+
this.usageSnapshotSaveTimer = setTimeout(() => {
|
|
2310
|
+
this.usageSnapshotSaveTimer = undefined;
|
|
2311
|
+
void this.queueStoreSave().then(() => {
|
|
2312
|
+
if (this.usageSnapshotSaveDirty) {
|
|
2313
|
+
this.usageSnapshotSaveDirty = false;
|
|
2314
|
+
this.scheduleUsageSnapshotSave();
|
|
2315
|
+
}
|
|
2316
|
+
}).catch(error => {
|
|
2317
|
+
this.usageSnapshotSaveDirty = false;
|
|
2318
|
+
this.ctx.logger?.warn?.(`[jet-hub] 余额快照落盘失败(不影响本次读数): ${String(error)}`);
|
|
2319
|
+
});
|
|
2320
|
+
}, AccountPool.USAGE_SNAPSHOT_SAVE_DEBOUNCE_MS);
|
|
2321
|
+
this.usageSnapshotSaveTimer.unref?.();
|
|
2322
|
+
}
|
|
2323
|
+
/**
|
|
2324
|
+
* 立即把**待落盘**的快照刷出(插件卸载/关停前调用,性能优化 #2 的兜底腿)。
|
|
2325
|
+
*
|
|
2326
|
+
* ⚠️ 只在防抖窗口内**确有**待写快照时才触发一次保存:账号等关键数据的写入
|
|
2327
|
+
* 一直是实时的,这里不重复触发。走同一条 {@link storeChain},与其它写串行。
|
|
2328
|
+
*/
|
|
2329
|
+
flushUsageSnapshots() {
|
|
2330
|
+
if (this.store.kind === 'memory')
|
|
2331
|
+
return Promise.resolve();
|
|
2332
|
+
if (this.usageSnapshotSaveTimer !== undefined) {
|
|
2333
|
+
clearTimeout(this.usageSnapshotSaveTimer);
|
|
2334
|
+
this.usageSnapshotSaveTimer = undefined;
|
|
2335
|
+
this.usageSnapshotSaveDirty = false;
|
|
2336
|
+
return this.queueStoreSave();
|
|
2337
|
+
}
|
|
2338
|
+
return Promise.resolve();
|
|
2339
|
+
}
|
|
2104
2340
|
/**
|
|
2105
2341
|
* 该 provider 是否**至少有一个已登录(凭据可用)的账号**。
|
|
2106
2342
|
*
|
|
@@ -2247,18 +2483,7 @@ export class AccountPool {
|
|
|
2247
2483
|
* 而它们本就不关心具体形状。
|
|
2248
2484
|
*/
|
|
2249
2485
|
async getAvailableAccount(provider, modelId, excludeAccountIds) {
|
|
2250
|
-
const candidates = this.
|
|
2251
|
-
.filter(a => a.provider === provider && a.enabled)
|
|
2252
|
-
.filter(a => excludeAccountIds === undefined || !excludeAccountIds.has(a.id))
|
|
2253
|
-
.filter(a => {
|
|
2254
|
-
// 空 modelId(未知目标模型):无可比对的键,保持候选不变。
|
|
2255
|
-
if (modelId.length === 0)
|
|
2256
|
-
return true;
|
|
2257
|
-
if (!a.modelRateLimits)
|
|
2258
|
-
return true;
|
|
2259
|
-
const resetAt = a.modelRateLimits[modelId];
|
|
2260
|
-
return resetAt === undefined || resetAt === 0 || Date.now() >= resetAt;
|
|
2261
|
-
});
|
|
2486
|
+
const candidates = this.candidateAccounts(provider, modelId, excludeAccountIds);
|
|
2262
2487
|
if (candidates.length === 0)
|
|
2263
2488
|
return null;
|
|
2264
2489
|
// 候选顺序即**用户在 Jet Hub 拖拽设定的手动顺序**(`reorderAccounts` 写入)。
|
|
@@ -2267,12 +2492,94 @@ export class AccountPool {
|
|
|
2267
2492
|
// 那个排序会让手动顺序形同虚设 —— 用户把某账号拖到首位,只要另一个
|
|
2268
2493
|
// 账号的限流重置时间更早,实际选中的仍是后者,拖拽变成纯 UI 装饰。
|
|
2269
2494
|
// 现在的语义是「手动顺序优先,限流豁免」:顺序完全由用户决定,
|
|
2270
|
-
//
|
|
2495
|
+
// 而当前正处于限流期的账号已被候选筛排除,不会选到。
|
|
2271
2496
|
//
|
|
2272
2497
|
// 注意 candidates 来自 readAccounts() 的 filter,而 filter 保持原数组
|
|
2273
2498
|
// 顺序,故这里天然就是手动顺序,无需任何排序。
|
|
2274
|
-
|
|
2275
|
-
|
|
2499
|
+
return await this.resolveFirstCredential(provider, candidates);
|
|
2500
|
+
}
|
|
2501
|
+
/**
|
|
2502
|
+
* 按 **sessionId** 选号(ZCode 专用,2026-10-30 用户要求)。
|
|
2503
|
+
*
|
|
2504
|
+
* - `sessionId` 非空:用 rendezvous 哈希把同一会话**稳定映射**到同一个候选
|
|
2505
|
+
* 账号(会话亲和),不同会话自动分散到不同账号;账号集合变化时只迁移
|
|
2506
|
+
* 原本落在该账号上的会话。
|
|
2507
|
+
* - `sessionId` 为空/未传:随机洗牌后取第一个可用账号(本地 OpenAI 网关等
|
|
2508
|
+
* 不带 DSH 会话标识的请求,随机均衡)。
|
|
2509
|
+
*
|
|
2510
|
+
* ⚠️ 本方法**刻意覆盖手动顺序** —— 这是 ZCode 用户明确要求的负载均衡语义。
|
|
2511
|
+
* 其余 provider 继续走 {@link getAvailableAccount}(手动顺序优先),不受影响。
|
|
2512
|
+
*
|
|
2513
|
+
* `excludeAccountIds` 与 {@link getAvailableAccount} 同义:请求级换号时
|
|
2514
|
+
* 排除刚失败的账号,避免拿回同一个。
|
|
2515
|
+
*/
|
|
2516
|
+
async getAvailableAccountForSession(provider, modelId, sessionId, excludeAccountIds) {
|
|
2517
|
+
const candidates = this.candidateAccounts(provider, modelId, excludeAccountIds);
|
|
2518
|
+
if (candidates.length === 0)
|
|
2519
|
+
return null;
|
|
2520
|
+
const ordered = sessionId !== undefined && sessionId.length > 0
|
|
2521
|
+
? // ⚠️ 溢出均衡(2026-10-31 用户报障「每个账号的负载并不太均衡」)。
|
|
2522
|
+
//
|
|
2523
|
+
// 语义是**上限(cap)不是均衡器**:账号今日请求数达阈值后整组沉底,
|
|
2524
|
+
// 于是**新会话**落到还有余量的号上;而一个**正在跑的会话**,一旦它所在
|
|
2525
|
+
// 账号越过阈值,下一次请求就会迁移 —— 本修法正是靠这次迁移把长会话摊开的
|
|
2526
|
+
// (**不是**「已有会话保持亲和」,初版这么写是错的,见
|
|
2527
|
+
// `session-balance.ts` 的 `rankAccountsBySessionWithOverflow` 长注释)。
|
|
2528
|
+
//
|
|
2529
|
+
// 阈值 env `DSH_ZCODE_SESSION_BALANCE_OVERFLOW_REQUESTS`(缺省 300,0=关闭)。
|
|
2530
|
+
// 负载数据源 = token-ledger 日聚合(纯内存读,零网络请求,实测 ~1 µs)。
|
|
2531
|
+
//
|
|
2532
|
+
// ⚠️ 账本读取**不得反噬推理**(与 `src/index.ts` 记账处同一条纪律):
|
|
2533
|
+
// 记账后端是外部注入点,`load()` 抛错不该让选号整体失败 —— 失败时按
|
|
2534
|
+
// 「读不到负载」处理,即全员 fresh,退回纯哈希亲和(与没装这个功能逐字节
|
|
2535
|
+
// 同语义)。**不要**为了「看得见错误」把它改成 rethrow:那会让一次统计
|
|
2536
|
+
// 故障变成整条推理链路不可用。
|
|
2537
|
+
rankAccountsBySessionWithOverflow(candidates, sessionId, provider, this.sessionLoadIndex(provider), overflowRequestsThreshold())
|
|
2538
|
+
: shuffleAccounts(candidates);
|
|
2539
|
+
return await this.resolveFirstCredential(provider, ordered);
|
|
2540
|
+
}
|
|
2541
|
+
/**
|
|
2542
|
+
* 今日账号负载索引(`provider` 维度);任何读取异常都退化为**空表**。
|
|
2543
|
+
*
|
|
2544
|
+
* 抽成方法是为了让「失败兜底」只有一份实现(`getAvailableAccountForSession`
|
|
2545
|
+
* 与将来的调用点共用),也让单测能单独验证兜底语义(见
|
|
2546
|
+
* `tests/unit/session-balance.spec.ts` 的「账本读取抛错」用例)。
|
|
2547
|
+
*/
|
|
2548
|
+
sessionLoadIndex(provider) {
|
|
2549
|
+
try {
|
|
2550
|
+
return accountLoadIndex(readTokenLedgerDayMap(), provider, utc8DayKey(Date.now()));
|
|
2551
|
+
}
|
|
2552
|
+
catch {
|
|
2553
|
+
return new Map();
|
|
2554
|
+
}
|
|
2555
|
+
}
|
|
2556
|
+
/**
|
|
2557
|
+
* 选号候选:`provider` + `enabled` + 不在 `excludeAccountIds` + 目标模型未限流。
|
|
2558
|
+
*
|
|
2559
|
+
* 与 {@link getAvailableAccount} / {@link getAvailableAccountForSession} 共用,
|
|
2560
|
+
* 避免同一判据出现两份实现(两份必然漂移)。
|
|
2561
|
+
*/
|
|
2562
|
+
candidateAccounts(provider, modelId, excludeAccountIds) {
|
|
2563
|
+
return this.readAccounts()
|
|
2564
|
+
.filter(a => a.provider === provider && a.enabled)
|
|
2565
|
+
.filter(a => excludeAccountIds === undefined || !excludeAccountIds.has(a.id))
|
|
2566
|
+
.filter(a => {
|
|
2567
|
+
// 空 modelId(未知目标模型):无可比对的键,保持候选不变。
|
|
2568
|
+
if (modelId.length === 0)
|
|
2569
|
+
return true;
|
|
2570
|
+
if (!a.modelRateLimits)
|
|
2571
|
+
return true;
|
|
2572
|
+
const resetAt = a.modelRateLimits[modelId];
|
|
2573
|
+
return resetAt === undefined || resetAt === 0 || Date.now() >= resetAt;
|
|
2574
|
+
});
|
|
2575
|
+
}
|
|
2576
|
+
/**
|
|
2577
|
+
* 按给定顺序逐个解析凭据,返回第一个可用账号;坏的跳过并记录原因。
|
|
2578
|
+
*
|
|
2579
|
+
* 抽成私有方法是为了让「手动顺序」与「sessionId / 随机顺序」共用**同一份**
|
|
2580
|
+
* 凭据解析与日志语义 —— 否则两条选号路径对「凭据损坏」的处理会分叉。
|
|
2581
|
+
*/
|
|
2582
|
+
async resolveFirstCredential(provider, candidates) {
|
|
2276
2583
|
const failures = [];
|
|
2277
2584
|
for (const entry of candidates) {
|
|
2278
2585
|
let resolved;
|