@xixka/dsh-hub 0.2.1-rc.9 → 0.2.3
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 -889
- 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 +128 -0
- package/lib/account-pool.d.ts.map +1 -1
- package/lib/account-pool.js +252 -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 -13918
- package/lib/codearts-credits.d.ts +176 -16
- package/lib/codearts-credits.d.ts.map +1 -1
- package/lib/codearts-credits.js +316 -34
- 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 -19
- package/lib/jet-hub-rpc.d.ts.map +1 -1
- package/lib/jet-hub-rpc.js +812 -496
- package/lib/jet-hub-rpc.js.map +1 -1
- package/lib/jet-hub-store.d.ts +52 -0
- package/lib/jet-hub-store.d.ts.map +1 -1
- package/lib/jet-hub-store.js +52 -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 +64 -1
- package/lib/loomy-auth.d.ts.map +1 -1
- package/lib/loomy-auth.js +191 -22
- package/lib/loomy-auth.js.map +1 -1
- package/lib/loomy-credits.d.ts +17 -0
- package/lib/loomy-credits.d.ts.map +1 -1
- package/lib/loomy-credits.js +35 -2
- package/lib/loomy-credits.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 +41 -0
- package/lib/loomy.d.ts.map +1 -1
- package/lib/loomy.js +29 -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 +52 -2
- package/lib/raccoon-adapter.d.ts.map +1 -1
- package/lib/raccoon-adapter.js +148 -29
- 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 +75 -15
- 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 +43 -7
- package/lib/webdav-sync.d.ts.map +1 -1
- package/lib/webdav-sync.js +72 -11
- package/lib/webdav-sync.js.map +1 -1
- 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/magicrew.js
ADDED
|
@@ -0,0 +1,215 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Magicrew provider 的**装配层**:把 product / auth / adapter / credits 组装成
|
|
3
|
+
* `src/index.ts` 接线需要的形状(与其余 provider 的「服务入口」同一定位)。
|
|
4
|
+
*
|
|
5
|
+
* ⚠️ 本文件**不持有**任何状态(账号池由 `index.ts` 传入),也**不发**自发的请求
|
|
6
|
+
* —— 唯一例外是 `login()` 里的「登录 + 签发」两步(那是登录语义的一部分)。
|
|
7
|
+
*
|
|
8
|
+
* ## ⚠️⚠️ 与 `MagicrewAuth` 的分工(**两层都留,别合并、别互相调用**)
|
|
9
|
+
*
|
|
10
|
+
* | | `MagicrewAuth`(`magicrew-auth.ts`) | `MagicrewService`(本文件) |
|
|
11
|
+
* |---|---|---|
|
|
12
|
+
* | 入参 / 出参 | `credentialRef` + `AccountPool` ⇒ `void` | **凭据对象** ⇒ 新凭据对象 |
|
|
13
|
+
* | 账号池 | 读池 + `pool.updateAccount({ expiresAt })` 写回 | **完全不碰** |
|
|
14
|
+
* | 凭据库 | 读 + 写(序列化自己做) | **不碰** |
|
|
15
|
+
* | 一次性 token 串行 | `createMagicrewRefreshOnce` + `SerialQueue` | 无(调用方保证) |
|
|
16
|
+
* | 语义 | 「按账号从池里续期并写回」—— 有副作用 | 「纯凭据变换」—— 无副作用 |
|
|
17
|
+
*
|
|
18
|
+
* ⇒ **多账号续期必须走 `MagicrewAuth.refreshAccountCredential` / `refreshAll`**
|
|
19
|
+
* (那里才有写回 `expiresAt` 与串行器,issue !IKIRTT 的修法);本文件的
|
|
20
|
+
* `refresh()` 只服务「手上已有一份凭据」的场景(脚本 / 单测 / 一次性刷新)。
|
|
21
|
+
*
|
|
22
|
+
* ## ⚠️⚠️ `resolveCredential` / `fetchRemoteModels` **必须由接线层注入**
|
|
23
|
+
*
|
|
24
|
+
* `MagicrewServiceOptions` 只是 `MagicrewAdapterOptions` 的**子集**(本层不自己
|
|
25
|
+
* 生产凭据,也不自己决定目录从哪来)⇒ 漏透传时适配器会退回到它自己的缺省值,
|
|
26
|
+
* 而那两个缺省值都是**「看起来完整、实际不可用」**:
|
|
27
|
+
*
|
|
28
|
+
* - 缺 `resolveCredential` ⇒ 适配器的缺省是 `async () => undefined` ⇒ **每条请求**
|
|
29
|
+
* 抛 `LlmError(…, 'AUTH')`「账号未登录或缺少 api_key,请重新登录」。已登录用户
|
|
30
|
+
* 也看到这句,且 `AUTH` 会吞掉文案(本仓库 IKLBSH)⇒ 归因极难。
|
|
31
|
+
* - 缺 `fetchRemoteModels` ⇒ 目录**只有静态兜底**,且**完全静默**(无日志、无报错)。
|
|
32
|
+
*
|
|
33
|
+
* ⇒ 故本文件的构造函数把这两项**逐项透传**(`undefined` 时不写该键,让适配器的
|
|
34
|
+
* 缺省语义保持「未接线」而不是被一个 `undefined` 值覆盖)。接线层必须都给。
|
|
35
|
+
*
|
|
36
|
+
* ## ⚠️ 热路径绝不签发
|
|
37
|
+
*
|
|
38
|
+
* 签新 `mgw_` key 会**吊销旧 key**(`magicrew-auth.ts` 模块头第 1 条硬约束)⇒
|
|
39
|
+
* 整个 provider 只允许两个签发入口:**登录**(本文件的 `login()`)与**续期**
|
|
40
|
+
* (`refreshMagicrewKey`)。本文件不额外提供任何「顺手签一把」的方法。
|
|
41
|
+
*/
|
|
42
|
+
import { parseMagicrewCredential, refreshMagicrewKey, } from './magicrew-auth.js';
|
|
43
|
+
import { MAGICREW } from './magicrew-product.js';
|
|
44
|
+
import { MagicrewAdapter } from './magicrew-adapter.js';
|
|
45
|
+
import { fetchMagicrewBalance, magicrewExpiry } from './magicrew-credits.js';
|
|
46
|
+
import { UNUSABLE } from './aggregate-core.js';
|
|
47
|
+
export class MagicrewService {
|
|
48
|
+
product;
|
|
49
|
+
adapter;
|
|
50
|
+
fetchImpl;
|
|
51
|
+
warnImpl;
|
|
52
|
+
/** 注入的时钟;未注入时为 `undefined`(交给 `magicrewExpiry` 的 `Date.now()` 缺省)。 */
|
|
53
|
+
nowImpl;
|
|
54
|
+
/** 登录实现的宿主(`auth.ts` 的 `MagicrewAuth.login`);本 service 只做薄委托。 */
|
|
55
|
+
auth;
|
|
56
|
+
constructor(options = {}) {
|
|
57
|
+
this.product = options.product ?? MAGICREW;
|
|
58
|
+
this.fetchImpl = options.fetchImpl ?? fetch;
|
|
59
|
+
this.warnImpl = options.warn ?? ((message) => { console.warn(message); });
|
|
60
|
+
this.nowImpl = options.now;
|
|
61
|
+
this.auth = options.auth;
|
|
62
|
+
// ⚠️ `product` / `fetchImpl` **必须透传**:注入点是任务 4/4d 定的
|
|
63
|
+
// (适配器不自己读全局 `fetch`,否则单测会真发请求到 `i-magic-service`)。
|
|
64
|
+
// ⚠️⚠️ `resolveCredential` / `fetchRemoteModels` **更要透传** —— 适配器对它们的
|
|
65
|
+
// 缺省分别是「永远没有凭据」(每请求抛 `AUTH`)与「只有静态目录」(静默)
|
|
66
|
+
// ⇒ 漏传 = 一个「看起来完整、实际不可用」的 provider,见文件头。
|
|
67
|
+
// 逐项 `=== undefined ? {} : {…}` 是本文件既有风格:不把一个 `undefined`
|
|
68
|
+
// 值塞进去覆盖掉适配器的缺省语义。
|
|
69
|
+
this.adapter = new MagicrewAdapter({
|
|
70
|
+
product: this.product,
|
|
71
|
+
fetchImpl: this.fetchImpl,
|
|
72
|
+
warn: this.warnImpl,
|
|
73
|
+
...options.readImage === undefined ? {} : { readImage: options.readImage },
|
|
74
|
+
...options.resolveCredential === undefined
|
|
75
|
+
? {} : { resolveCredential: options.resolveCredential },
|
|
76
|
+
...options.fetchRemoteModels === undefined
|
|
77
|
+
? {} : { fetchRemoteModels: options.fetchRemoteModels },
|
|
78
|
+
...options.accountPool === undefined ? {} : { accountPool: options.accountPool },
|
|
79
|
+
...options.now === undefined ? {} : { now: options.now },
|
|
80
|
+
});
|
|
81
|
+
}
|
|
82
|
+
/**
|
|
83
|
+
* 从本机浏览器读取已登录的凭据(**不开窗口**)—— **薄委托**给
|
|
84
|
+
* {@link MagicrewAuth.importFromLocalBrowser}。
|
|
85
|
+
*
|
|
86
|
+
* ⚠️ 实现刻意只长在 auth 层(与 `loginViaBrowser` 同因,见其注释):`account.create`
|
|
87
|
+
* 的 RPC 分派只能拿到 `JetHubAuths` 的实例。本方法存在只为「持有 service 的调用方
|
|
88
|
+
* 不必再握住 auth 实例」。
|
|
89
|
+
*
|
|
90
|
+
* ⚠️ 未注入 `auth` 时**抛错**(不静默返回 `undefined`):`undefined` 的语义是
|
|
91
|
+
* 「本机浏览器里没有登录态」,而接线漏了 `auth` 是完全不同的一件事 —— 混成
|
|
92
|
+
* 一个返回值会把装配缺陷伪装成「用户没登录」。
|
|
93
|
+
*/
|
|
94
|
+
async importFromLocalBrowser() {
|
|
95
|
+
if (this.auth === undefined) {
|
|
96
|
+
throw new Error('magicrew: 未注入 `auth`,无法从本机浏览器读取登录态'
|
|
97
|
+
+ '(接线层必须把 MagicrewAuth 传进 MagicrewServiceOptions)');
|
|
98
|
+
}
|
|
99
|
+
return await this.auth.importFromLocalBrowser();
|
|
100
|
+
}
|
|
101
|
+
/**
|
|
102
|
+
* **网页版登录**(开窗 → 等用户登完 → 取凭据)—— **薄委托**给
|
|
103
|
+
* {@link MagicrewAuth.loginViaBrowser}。
|
|
104
|
+
*
|
|
105
|
+
* ⚠️ 与 {@link importFromLocalBrowser} **同一条腿的两种入口**:都不开/开窗口的差别,
|
|
106
|
+
* 落库与签发 `mgw_` key 的纪律完全一致(那条腿只在 auth 层实现一份 ——
|
|
107
|
+
* `account.create` 的 RPC 分派拿不到本 service)。
|
|
108
|
+
*
|
|
109
|
+
* ⚠️ 返回 `undefined` = **用户没登完**(超时 / 关掉了窗口),**不是**失败:
|
|
110
|
+
* 调用方不得据此弹错(详见 auth 层同名方法的四条语义)。
|
|
111
|
+
* ⚠️ 未注入 `auth` 时**抛错**(理由同上:不把装配缺陷伪装成「用户没登录」)。
|
|
112
|
+
*/
|
|
113
|
+
async loginViaBrowser(options) {
|
|
114
|
+
if (this.auth === undefined) {
|
|
115
|
+
throw new Error('magicrew: 未注入 `auth`,无法发起网页版登录'
|
|
116
|
+
+ '(接线层必须把 MagicrewAuth 传进 MagicrewServiceOptions)');
|
|
117
|
+
}
|
|
118
|
+
return await this.auth.loginViaBrowser(options);
|
|
119
|
+
}
|
|
120
|
+
/**
|
|
121
|
+
* 用 refresh_token 换新 api_key —— **薄包装:纯凭据变换,无副作用**。
|
|
122
|
+
*
|
|
123
|
+
* ⚠️ 只是 {@link refreshMagicrewKey} 的一层形状映射(凭据进 → 新凭据出),
|
|
124
|
+
* **不碰账号池、不写凭据库**;分层理由见文件头那张表。别在这里另写一套续期,
|
|
125
|
+
* 也别让它转调 `MagicrewAuth`(那样会把「写回 `expiresAt`」和「串行器」带进来,
|
|
126
|
+
* 而本方法的调用方往往**没有**池)。
|
|
127
|
+
*
|
|
128
|
+
* ⚠️ `refreshToken` 是一次性轮换的 ⇒ 上游回了新 token 就必须用新的
|
|
129
|
+
* (否则下一轮拿旧 token 去换必然失败)。串行由调用方负责 —— 并发两次会让其中一个
|
|
130
|
+
* 的 token 立即失效。
|
|
131
|
+
*
|
|
132
|
+
* ⚠️ 没有 `refresh_token` 时**原样返回**(不是抛错):凭据仍能用 jwt 拉目录 / 积分,
|
|
133
|
+
* 把「没法续」当失败会让调用方无谓地走一遍重新登录。
|
|
134
|
+
*/
|
|
135
|
+
async refresh(credential) {
|
|
136
|
+
if (credential.refreshToken === undefined || credential.refreshToken.length === 0) {
|
|
137
|
+
return credential;
|
|
138
|
+
}
|
|
139
|
+
const key = await refreshMagicrewKey({
|
|
140
|
+
refreshToken: credential.refreshToken,
|
|
141
|
+
product: this.product,
|
|
142
|
+
fetchImpl: this.fetchImpl,
|
|
143
|
+
});
|
|
144
|
+
return {
|
|
145
|
+
...credential,
|
|
146
|
+
apiKey: key.apiKey,
|
|
147
|
+
...key.apiKeyExpiresAt === undefined ? {} : { apiKeyExpiresAt: key.apiKeyExpiresAt },
|
|
148
|
+
...key.refreshToken === undefined ? {} : { refreshToken: key.refreshToken },
|
|
149
|
+
};
|
|
150
|
+
}
|
|
151
|
+
/**
|
|
152
|
+
* 读积分余额 —— 薄委托 {@link fetchMagicrewBalance}。
|
|
153
|
+
*
|
|
154
|
+
* ⚠️ 这不是 {@link expiry} 的同义重复:后者的入参是「凭据 + DSH 的折算上下文」
|
|
155
|
+
* 且只回**一个时刻**,而余额本身(`CreditBalance`,含逐批次明细)是 Jet Hub
|
|
156
|
+
* 积分行的展示数据。删掉它 `login` / `refresh` / `credits` 三件套就缺一条腿。
|
|
157
|
+
*
|
|
158
|
+
* ⚠️ 必须**显式**把 `this.fetchImpl` 交给原语:`fetchImpl` 在本类是 `private`,
|
|
159
|
+
* 外部拿不到 ⇒ 没有这个方法,调用方只能让原语退回全局 `fetch`,单测/接线
|
|
160
|
+
* 的注入就**静默失效**(未来 credits 单测无法桩掉网络)。
|
|
161
|
+
*
|
|
162
|
+
* ⚠️ 失败返回 `undefined`(调用方**不得**把它当 0 —— 「查不到」与「余额为零」
|
|
163
|
+
* 在 UI 上是两件事)。
|
|
164
|
+
*/
|
|
165
|
+
async balance(credential) {
|
|
166
|
+
return await fetchMagicrewBalance({
|
|
167
|
+
jwt: credential.jwt,
|
|
168
|
+
organizationCode: credential.organizationCode,
|
|
169
|
+
product: this.product,
|
|
170
|
+
fetchImpl: this.fetchImpl,
|
|
171
|
+
});
|
|
172
|
+
}
|
|
173
|
+
/**
|
|
174
|
+
* 聚合折算原语(`src/provider-expiry.ts` 的 `createProviderExpiry` 会挂它)。
|
|
175
|
+
*
|
|
176
|
+
* ⚠️⚠️ **只委托、不重算**:折算口径(余额为 0 / 批次到期 / 长期积分)全部在
|
|
177
|
+
* {@link magicrewExpiry} 里 —— 本方法只做「凭据 → 它要的入参」这一层映射。
|
|
178
|
+
* 在这里再写一遍折算必然与原语分叉(而该原语的口径刚被任务 5a 修正过:
|
|
179
|
+
* 缓存缺席 / `null` / `undefined` 时**必须自己发请求**,否则该渠道折算恒
|
|
180
|
+
* `UNUSABLE` ⇒ 在聚合候选表里**静默消失**)。
|
|
181
|
+
*
|
|
182
|
+
* ⚠️ 第二参是 DSH 的 {@link ProviderExpiryContext}(**不是**余额):共享读数
|
|
183
|
+
* 是 `context.cachedBalance(accountId)` 这条**按账号取数**的函数,而原语要的是
|
|
184
|
+
* 「零参 thunk」⇒ 这里包一层转发(与 buddy / trae / astudio 同款)。
|
|
185
|
+
* 原语在 thunk 缺席 / 返回 `null` / 返回 `undefined` 时都会自己取数。
|
|
186
|
+
*
|
|
187
|
+
* ⚠️ 凭据里没有 jwt ⇒ 连余额都查不到 ⇒ `UNUSABLE`(**不是** `NEVER`:
|
|
188
|
+
* 后者会把一个不可用的渠道排到候选最前并当选)。判据复用
|
|
189
|
+
* {@link parseMagicrewCredential}(它与适配器 / 池同一条「jwt 是唯一必需字段」口径)。
|
|
190
|
+
*
|
|
191
|
+
* ⚠️ 时钟**从构造函数注入**(`options.now`),**不是**本方法的参数:任务 8c 的
|
|
192
|
+
* 接线形状是 `(c, ctx) => service.expiry(c, ctx)`,多一个参数就会改变它。
|
|
193
|
+
* 注入后 `magicrewExpiry` 的 `expiresAt > now` 判据不再依赖真实时钟 ——
|
|
194
|
+
* 否则单测里写死的「未来日期」会随时间自己变红(日期炸弹)。
|
|
195
|
+
*/
|
|
196
|
+
async expiry(credential, context) {
|
|
197
|
+
const parsed = parseMagicrewCredential(credential);
|
|
198
|
+
if (parsed === undefined)
|
|
199
|
+
return UNUSABLE;
|
|
200
|
+
const accountId = context?.accountId;
|
|
201
|
+
const cachedBalance = context?.cachedBalance;
|
|
202
|
+
const cachedThunk = cachedBalance === undefined
|
|
203
|
+
? undefined
|
|
204
|
+
: () => cachedBalance(accountId);
|
|
205
|
+
return await magicrewExpiry({
|
|
206
|
+
jwt: parsed.jwt,
|
|
207
|
+
organizationCode: parsed.organizationCode,
|
|
208
|
+
product: this.product,
|
|
209
|
+
fetchImpl: this.fetchImpl,
|
|
210
|
+
...cachedThunk === undefined ? {} : { cachedBalance: cachedThunk },
|
|
211
|
+
...this.nowImpl === undefined ? {} : { now: this.nowImpl() },
|
|
212
|
+
});
|
|
213
|
+
}
|
|
214
|
+
}
|
|
215
|
+
//# sourceMappingURL=magicrew.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"magicrew.js","sourceRoot":"","sources":["../src/magicrew.ts"],"names":[],"mappings":"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"}
|
package/lib/model-catalog.d.ts
CHANGED
|
@@ -198,6 +198,14 @@ export interface ModelCatalogConfig {
|
|
|
198
198
|
* 该用哪个),共享骨架只看到**一份已合并的 `CatalogEntry[]`**。
|
|
199
199
|
*/
|
|
200
200
|
loadCatalog(): readonly CatalogEntry[] | Promise<readonly CatalogEntry[]>;
|
|
201
|
+
/**
|
|
202
|
+
* **骨架层 stale-while-revalidate 用的时钟**(可选;缺省 `Date.now()`)。
|
|
203
|
+
*
|
|
204
|
+
* ⚠️ **只供测试注入确定时刻** —— 各家 `loadCatalog` 内部的新鲜度判据
|
|
205
|
+
* 仍用各家自己的 `options.now`,两处的**语义**(多久算新鲜)都由本文件的
|
|
206
|
+
* `isCatalogFresh` 唯一持有,这里只是**取时刻**的来源。
|
|
207
|
+
*/
|
|
208
|
+
now?: () => number;
|
|
201
209
|
/**
|
|
202
210
|
* **同步**全量目录(`listAllModels()` 用)。
|
|
203
211
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-catalog.d.ts","sourceRoot":"","sources":["../src/model-catalog.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"model-catalog.d.ts","sourceRoot":"","sources":["../src/model-catalog.ts"],"names":[],"mappings":"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"}
|
package/lib/model-catalog.js
CHANGED
|
@@ -311,6 +311,122 @@ export function createModelCatalog(deps, config) {
|
|
|
311
311
|
info.description = entry.description;
|
|
312
312
|
return info;
|
|
313
313
|
}
|
|
314
|
+
/** `cached` 的落地时刻(毫秒)—— SWR 判「旧值还能不能先端出去」的输入。 */
|
|
315
|
+
let cachedAt;
|
|
316
|
+
/** 后台刷新的 in-flight 去重(同一时刻只允许一个在跑)。 */
|
|
317
|
+
let backgroundRefresh;
|
|
318
|
+
/**
|
|
319
|
+
* 目录的 **id 索引**(性能优化 #4,2026-11-02)。
|
|
320
|
+
*
|
|
321
|
+
* ## 为什么需要它
|
|
322
|
+
*
|
|
323
|
+
* `resolveModel()` 每次都 `all.find(item => item.id === model)` —— 宿主按模型
|
|
324
|
+
* 逐个解析时(模型选择器元数据、菜单装配等),同一份目录被线性扫描 O(N) 次。
|
|
325
|
+
* Cline 实测 471 条(见 `docs/agent-notes/providers-cline.md` 的 O(N²) 记录),
|
|
326
|
+
* 聚合渠道更大。
|
|
327
|
+
*
|
|
328
|
+
* ## 判据:按**数组身份**缓存(与 cline 那次修法的同一条红线)
|
|
329
|
+
*
|
|
330
|
+
* `loadCatalogForRead` 在内容未变时返回**同一个数组对象**(SWR 短路返回
|
|
331
|
+
* `cached`、同步路径也是 `loadCatalog` 的内部缓存),故以「最后一次见到
|
|
332
|
+
* 的数组引用是否相同」为失效判据:引用变了才重建 `Map`,否则直接复用。
|
|
333
|
+
* ⚠️ **不能按 `length` 判**(同数量、不同内容的目录会拿到脏索引)。
|
|
334
|
+
*
|
|
335
|
+
* ## 语义保持
|
|
336
|
+
*
|
|
337
|
+
* - **重复 id 取首项**:`Map.set` 不覆盖同键已有值(`has` 先判),
|
|
338
|
+
* 与 `Array.find` 的「取第一个命中」逐字同语义;
|
|
339
|
+
* - 索引只存 `CatalogEntry` 的**引用**,不复制条目数据;
|
|
340
|
+
* - SWR、主动失效(`catalogInvalidatedAt`)与黑名单过滤都发生在**上游**
|
|
341
|
+
* (`loadCatalogForRead` / `listModels`),本索引只加速查找,不改变任何
|
|
342
|
+
* 可见行为。
|
|
343
|
+
*/
|
|
344
|
+
let idIndex;
|
|
345
|
+
function catalogIndexFor(all) {
|
|
346
|
+
if (idIndex !== undefined && idIndex.source === all)
|
|
347
|
+
return idIndex.byId;
|
|
348
|
+
const byId = new Map();
|
|
349
|
+
for (const entry of all) {
|
|
350
|
+
// 重复 id 取首项(= `Array.find` 的既有语义),后续同名条目跳过。
|
|
351
|
+
if (!byId.has(entry.id))
|
|
352
|
+
byId.set(entry.id, entry);
|
|
353
|
+
}
|
|
354
|
+
idIndex = { source: all, byId };
|
|
355
|
+
return byId;
|
|
356
|
+
}
|
|
357
|
+
/**
|
|
358
|
+
* ★ stale-while-revalidate 读目录(2026-11-02 用户要求:进程存活期内缓存)。
|
|
359
|
+
*
|
|
360
|
+
* ## 被修的等待感(用户 2026-11-02 10:58 原话)
|
|
361
|
+
*
|
|
362
|
+
* 「供应商开关没有缓存,模型列表也是,过一段时间打开需要重新加载,
|
|
363
|
+
* 只要不重启,帮我缓存有用的数据」。
|
|
364
|
+
*
|
|
365
|
+
* 根因:`loadCatalog` 各家内部的 20 分钟 TTL(CATALOG_REFRESH_INTERVAL_MS,
|
|
366
|
+
* 用户 2026-10-18 要求的倍率更新)过期后,`listModels` / `resolveModel`
|
|
367
|
+
* **同步阻塞**在远端拉取上 —— 设置页每次打开都可能吃一次完整的网络往返
|
|
368
|
+
* (`model.list` 与 `provider.status` 的 closed 核实都经这里)。
|
|
369
|
+
*
|
|
370
|
+
* ## 解法:旧值先端出去,新值后台补
|
|
371
|
+
*
|
|
372
|
+
* - **有非空缓存 + 纯 TTL 过期** ⇒ 立即返回 `cached`,同时**后台**重拉
|
|
373
|
+
* (不阻塞读、失败保留旧值);下次读自然用上新目录与**新倍率** ——
|
|
374
|
+
* 20-10-18 的倍率要求**没有丢**,只是从「读时同步等」改成「后台更新」。
|
|
375
|
+
* - **其余情形逐字走老路**(同步 `loadCatalog`):
|
|
376
|
+
* - 从未读到过(`cached` 空)—— 首次必须等,否则没有数据可显示;
|
|
377
|
+
* - **用户主动失效**(`catalogInvalidatedAt >= cachedAt`,改开关)——
|
|
378
|
+
* 规格 §6 要求「改完开关立即重拉」不能被 SWR 挡掉(那会让「关闭了
|
|
379
|
+
* 供应商、目录里还有它的模型」跨过整整一轮刷新);
|
|
380
|
+
* - TTL 未过期 —— `loadCatalog` 内部本就短路(零网络),同步等无代价。
|
|
381
|
+
*
|
|
382
|
+
* ⚠️ **判据复用 `isCatalogFresh`(唯一判据红线)**:这里只吃**纯 TTL** 那条腿
|
|
383
|
+
* (不传 `invalidatedAt`),失效腿由上面的排除条件单独处理 ——
|
|
384
|
+
* 两半各管各的,不在本函数里再合成一份新判据。
|
|
385
|
+
* ⚠️ **重启即失效**:`cached` / `cachedAt` 都在闭包里,进程不存活就没了 ——
|
|
386
|
+
* 与用户「只要不重启」的口径一致(没有引入任何磁盘持久化)。
|
|
387
|
+
*/
|
|
388
|
+
const loadCatalogForRead = () => {
|
|
389
|
+
const now = config.now?.() ?? Date.now();
|
|
390
|
+
// ⚠️ **「用户主动失效」必须排除**(见方法头):失效**不早于**缓存落地 ⇒ 走同步路径。
|
|
391
|
+
// 边界刻意用 `>=` 而不是 `>`:与 `isCatalogFresh` 失效腿的 `at <= invalidatedAt`
|
|
392
|
+
// 同向 —— 同一毫秒的「缓存落地 + 改开关」宁可多拉一次(同步拿到新目录),
|
|
393
|
+
// 也不要让 SWR 把「用户刚改完的开关」用旧目录盖过去。
|
|
394
|
+
const userInvalidatedAfterCache = catalogInvalidatedAt(providerId) >= (cachedAt ?? 0);
|
|
395
|
+
// ⚠️ 用**局部快照**判非空并返回:后台刷新闭包可能在外部改写 `cached`,
|
|
396
|
+
// TS 对 `let` 闭包变量的非空窄化不会跨闭包存活(TS2322 实测);
|
|
397
|
+
// 快照同时保证「本次读拿到的是读那一刻的目录」—— 后台落地的新目录
|
|
398
|
+
// 属于下一次读。
|
|
399
|
+
const staleCache = cached;
|
|
400
|
+
const staleByTtlOnly = staleCache !== undefined && staleCache.length > 0
|
|
401
|
+
&& !isCatalogFresh(cachedAt, now);
|
|
402
|
+
if (staleByTtlOnly && !userInvalidatedAfterCache) {
|
|
403
|
+
if (backgroundRefresh === undefined) {
|
|
404
|
+
backgroundRefresh = (async () => {
|
|
405
|
+
try {
|
|
406
|
+
const fresh = await config.loadCatalog();
|
|
407
|
+
cached = fresh;
|
|
408
|
+
cachedAt = config.now?.() ?? Date.now();
|
|
409
|
+
}
|
|
410
|
+
catch {
|
|
411
|
+
// ⚠️ 后台刷新失败**保留旧值**(与 refresh() 的既有取舍一致:
|
|
412
|
+
// 清空只会让 UI 从完整列表退化成兜底子集)。
|
|
413
|
+
}
|
|
414
|
+
finally {
|
|
415
|
+
backgroundRefresh = undefined;
|
|
416
|
+
}
|
|
417
|
+
})();
|
|
418
|
+
// ⚠️ 挂一层 catch 防止 unhandled rejection:内部已全 catch,这层是保险。
|
|
419
|
+
backgroundRefresh.catch(() => { });
|
|
420
|
+
}
|
|
421
|
+
return staleCache;
|
|
422
|
+
}
|
|
423
|
+
return (async () => {
|
|
424
|
+
const all = await config.loadCatalog();
|
|
425
|
+
cached = all;
|
|
426
|
+
cachedAt = config.now?.() ?? Date.now();
|
|
427
|
+
return all;
|
|
428
|
+
})();
|
|
429
|
+
};
|
|
314
430
|
return {
|
|
315
431
|
async listModels(provider) {
|
|
316
432
|
// ⚠️ 无已登录账号时返回 `[]` → DSH 的 buildModelCatalog 把整个 provider
|
|
@@ -347,9 +463,10 @@ export function createModelCatalog(deps, config) {
|
|
|
347
463
|
// ⇒ 先正常读目录(写 `cached`),**再**决定要不要返回 `[]`。
|
|
348
464
|
// ⚠️ 代价:关闭态下多读一次目录。这是**必要**的 —— 设置页必须能列出
|
|
349
465
|
// 全部模型(含新增的),否则用户无法逐条打开(本文件的设计承诺)。
|
|
466
|
+
// (2026-11-02 SWR 化后这条代价进一步降低:TTL 过期时这一读
|
|
467
|
+
// 不再阻塞 —— 旧目录先端出去,新目录后台补。)
|
|
350
468
|
const closedWholeProvider = deps.accountPool?.providerClosedFor?.(providerId) === true;
|
|
351
|
-
const all = await
|
|
352
|
-
cached = all;
|
|
469
|
+
const all = await loadCatalogForRead();
|
|
353
470
|
if (closedWholeProvider)
|
|
354
471
|
return [];
|
|
355
472
|
const disabled = deps.accountPool?.disabledModelsFor(providerId);
|
|
@@ -374,8 +491,11 @@ export function createModelCatalog(deps, config) {
|
|
|
374
491
|
// `listAllModels` 会在下一次 `listModels` 之前一直看到旧目录。
|
|
375
492
|
// ⚠️ 不清成 `undefined`(那会退回兜底表 —— 兜底表是**子集**,
|
|
376
493
|
// 用户会以为「刷新后模型反而变少了」)。
|
|
494
|
+
// ⚠️ `cachedAt` 同步推进(2026-11-02 SWR):否则后台刷新成功后
|
|
495
|
+
// SWR 判据仍认为目录过期,读路径会再发起一次后台刷新。
|
|
377
496
|
try {
|
|
378
497
|
cached = await config.loadCatalog();
|
|
498
|
+
cachedAt = config.now?.() ?? Date.now();
|
|
379
499
|
}
|
|
380
500
|
catch {
|
|
381
501
|
// ⚠️ 刷新失败**保留旧值**:后台刷新没有调用方可通知,清空只会让
|
|
@@ -384,9 +504,11 @@ export function createModelCatalog(deps, config) {
|
|
|
384
504
|
},
|
|
385
505
|
},
|
|
386
506
|
async resolveModel(provider, model, _signal) {
|
|
387
|
-
const all = await
|
|
388
|
-
|
|
389
|
-
|
|
507
|
+
const all = await loadCatalogForRead();
|
|
508
|
+
// ⚠️ **id 索引**(性能优化 #4):按目录数组身份缓存 `Map`,避免宿主逐模型
|
|
509
|
+
// 解析时的重复线性扫描(判据与语义见 `catalogIndexFor` 的注释 ——
|
|
510
|
+
// 重复 id 取首项,与 `Array.find` 同语义)。
|
|
511
|
+
const entry = catalogIndexFor(all).get(model);
|
|
390
512
|
// ⚠️ name 三级回退,**绝不空**(空名会让选择器出现空白项):
|
|
391
513
|
// `bareName` → `name` → 裸 `model`。
|
|
392
514
|
//
|
package/lib/model-catalog.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-catalog.js","sourceRoot":"","sources":["../src/model-catalog.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"model-catalog.js","sourceRoot":"","sources":["../src/model-catalog.ts"],"names":[],"mappings":"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"}
|