@xixka/dsh-hub 0.2.1-rc.9 → 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 -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 +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 -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 +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 +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/officeace-adapter.js
CHANGED
|
@@ -7,10 +7,11 @@
|
|
|
7
7
|
* - `listModels` 静态(`OFFICEACE_MODELS`)+ 探测门控(凭据读不到 = 隐藏分组)
|
|
8
8
|
* - 响应含 `reasoning_content`,`consumeOpenAiSse` 已兼容 OpenAI 协议
|
|
9
9
|
*/
|
|
10
|
-
import { LlmAdapter } from '@deepseek-ai/dsh-llm';
|
|
10
|
+
import { LlmAdapter, LlmError } from '@deepseek-ai/dsh-llm';
|
|
11
11
|
import { OFFICEACE, OFFICEACE_MODELS } from './officeace-product.js';
|
|
12
|
+
import { providerPooledFetch } from './provider-http-pool.js';
|
|
12
13
|
import { basicAuthorization, fetchModelTokenRates, isExpiring, readOfficeAceCredential, refreshStoredCredential } from './officeace-auth.js';
|
|
13
|
-
import { collectImages, consumeOpenAiSse, serializeMessages } from './openai-compat.js';
|
|
14
|
+
import { collectImages, consumeOpenAiSse, isTransportError, serializeMessages } from './openai-compat.js';
|
|
14
15
|
import { registerAdapterIdempotent } from './llm-register-compat.js';
|
|
15
16
|
import { createModelCatalog, isCatalogFreshFor } from './model-catalog.js';
|
|
16
17
|
import { buildDsmlSystemPrompt, needsDsmlToolMode } from './dsml.js';
|
|
@@ -64,6 +65,49 @@ export function maasBaseUrlOf(credential) {
|
|
|
64
65
|
const base = raw.length > 0 ? raw : OFFICEACE.defaultBaseUrl;
|
|
65
66
|
return base.replace(/\/+$/, '');
|
|
66
67
|
}
|
|
68
|
+
/**
|
|
69
|
+
* 传输瞬态「冷却重发」的次数上限(2026-10-31,与 codearts / raccoon /
|
|
70
|
+
* lobsterai 三家同款策略对齐)。
|
|
71
|
+
*
|
|
72
|
+
* ## 为什么 officeace 也需要(此前是 8 家接池适配器里唯二没这层的)
|
|
73
|
+
*
|
|
74
|
+
* - 连接池把空闲复用窗口从 4s 放宽到 120s,**放大了「复用被服务端/中间盒
|
|
75
|
+
* 掐死的连接 → `ECONNRESET` / `fetch failed`」的失败面**:undici 维护者
|
|
76
|
+
* 对同款问题的定性(nodejs/undici #3492)是「*always retry the request
|
|
77
|
+
* if the other side is closed… also for POST*」——Node 不像 Go 的
|
|
78
|
+
* net/http 那样对可重放请求在断连时透明重试,应用层必须自己做;
|
|
79
|
+
* - 顺带补上 officeace 一直缺的**传输错误分类**:此前 `stream()` 的
|
|
80
|
+
* fetch 失败是裸 `TypeError: fetch failed` 直接上抛(无 `code`)——
|
|
81
|
+
* harness 判不了可重试、报障文案也只有一层外皮。现在翻译成 `TRANSPORT`
|
|
82
|
+
* (与 raccoon 的 `officeace` 同款文案形状);AUTH/QUOTA 那类会被
|
|
83
|
+
* DSH 客户端整段替换文案的码**仍然不带**(见 `diagnose()` 的约束注释)。
|
|
84
|
+
*
|
|
85
|
+
* 取 1:与三家先例一致——两次连续断连基本是持续故障,多发只会把真正的
|
|
86
|
+
* 持续故障拖长、掩盖问题(同日修复的结论)。
|
|
87
|
+
*/
|
|
88
|
+
const OFFICEACE_TRANSIENT_RETRY_MAX = 1;
|
|
89
|
+
/**
|
|
90
|
+
* 瞬时传输故障冷却毫秒数;可用环境变量覆盖(测试注入用)。
|
|
91
|
+
* 默认 10 秒(与 codearts / raccoon / lobsterai 完全一致:宿主自己的重试
|
|
92
|
+
* 退避只有几百毫秒,撞上的还是同一个挣扎中的链路——冷却必须长于它)。
|
|
93
|
+
*/
|
|
94
|
+
function resolveOfficeaceTransientRetryDelayMs() {
|
|
95
|
+
const raw = Number(process.env.DSH_OFFICEACE_TRANSIENT_RETRY_DELAY_MS);
|
|
96
|
+
return Number.isFinite(raw) && raw > 0 ? raw : 10_000;
|
|
97
|
+
}
|
|
98
|
+
/** 可中止的休眠;信号中止时立即 resolve(与 codearts / raccoon 的 delay 同款语义)。 */
|
|
99
|
+
function officeaceDelay(ms, signal) {
|
|
100
|
+
return new Promise((resolve) => {
|
|
101
|
+
if (signal?.aborted)
|
|
102
|
+
return resolve();
|
|
103
|
+
const onAbort = () => { clearTimeout(timer); resolve(); };
|
|
104
|
+
const timer = setTimeout(() => {
|
|
105
|
+
signal?.removeEventListener('abort', onAbort);
|
|
106
|
+
resolve();
|
|
107
|
+
}, ms);
|
|
108
|
+
signal?.addEventListener('abort', onAbort, { once: true });
|
|
109
|
+
});
|
|
110
|
+
}
|
|
67
111
|
/**
|
|
68
112
|
* 该模型是否接受图片输入(**实测表**,依据见 `OFFICEACE_MODELS` 的 `multimodal` 注)。
|
|
69
113
|
*
|
|
@@ -300,7 +344,8 @@ export class OfficeAceAdapter extends LlmAdapter {
|
|
|
300
344
|
const ctrl = new AbortController();
|
|
301
345
|
const timer = setTimeout(() => ctrl.abort(), 8_000);
|
|
302
346
|
try {
|
|
303
|
-
|
|
347
|
+
// 与其它适配器共用长 keep-alive 的 undici Agent;测试仍注入 fetchImpl。
|
|
348
|
+
const f = this.options.fetchImpl ?? providerPooledFetch;
|
|
304
349
|
const r = await f(`${maasBaseUrlOf(credential)}${OFFICEACE.modelsPath}`, {
|
|
305
350
|
headers: { Authorization: basicAuthorization(credential) },
|
|
306
351
|
signal: ctrl.signal,
|
|
@@ -329,7 +374,8 @@ export class OfficeAceAdapter extends LlmAdapter {
|
|
|
329
374
|
throw new Error('未找到 OfficeAce 凭据:请启动 OfficeAce 并登录华为云账号(凭据缓存于本机 Redis),'
|
|
330
375
|
+ '或确认 Redis 6399 与 Windows 凭据管理器条目可读');
|
|
331
376
|
}
|
|
332
|
-
|
|
377
|
+
// 与其它适配器共用长 keep-alive 的 undici Agent;测试仍注入 fetchImpl。
|
|
378
|
+
const f = this.options.fetchImpl ?? providerPooledFetch;
|
|
333
379
|
// ── 熔断快速失败(Gitee issue IKLTHB 第 ③ 条)──
|
|
334
380
|
//
|
|
335
381
|
// ⚠️ **为什么要在这里拦,而不只是靠聚合折算剔除**:
|
|
@@ -486,16 +532,59 @@ export class OfficeAceAdapter extends LlmAdapter {
|
|
|
486
532
|
...options.temperature === undefined ? {} : { temperature: options.temperature },
|
|
487
533
|
});
|
|
488
534
|
try {
|
|
489
|
-
|
|
490
|
-
|
|
491
|
-
|
|
492
|
-
|
|
493
|
-
|
|
494
|
-
|
|
495
|
-
|
|
496
|
-
|
|
497
|
-
|
|
498
|
-
|
|
535
|
+
/**
|
|
536
|
+
* 发送一次 chat 请求。传输层异常翻译成 `TRANSPORT`(此前裸抛
|
|
537
|
+
* `TypeError: fetch failed`:无 code、harness 判不了可重试——
|
|
538
|
+
* 2026-10-31 补齐,与 raccoon 的 `send()` 同款结构)。
|
|
539
|
+
*/
|
|
540
|
+
const send = async () => {
|
|
541
|
+
try {
|
|
542
|
+
return await f(`${maasBaseUrlOf(credential)}${OFFICEACE.chatPath}`, {
|
|
543
|
+
method: 'POST',
|
|
544
|
+
headers: {
|
|
545
|
+
Authorization: basicAuthorization(credential),
|
|
546
|
+
'Content-Type': 'application/json',
|
|
547
|
+
Accept: 'text/event-stream',
|
|
548
|
+
},
|
|
549
|
+
body: payload,
|
|
550
|
+
signal: controller.signal,
|
|
551
|
+
});
|
|
552
|
+
}
|
|
553
|
+
catch (error) {
|
|
554
|
+
if (options.signal?.aborted)
|
|
555
|
+
throw error;
|
|
556
|
+
if (isTransportError(error)) {
|
|
557
|
+
throw new LlmError(`officeace: transport error: ${error instanceof Error ? error.message : String(error)}`, 'TRANSPORT', { cause: error });
|
|
558
|
+
}
|
|
559
|
+
throw error;
|
|
560
|
+
}
|
|
561
|
+
};
|
|
562
|
+
/**
|
|
563
|
+
* 带冷却重试的发送:传输故障(`officeace: transport error: …`,TRANSPORT)
|
|
564
|
+
* 冷却 {@link resolveOfficeaceTransientRetryDelayMs}(默认 10 秒)后重发
|
|
565
|
+
* 一次;再失败如实抛出(raccoon `sendWithTransientRetry` 同款结构)。
|
|
566
|
+
*/
|
|
567
|
+
const sendWithTransientRetry = async () => {
|
|
568
|
+
let transportRetries = 0;
|
|
569
|
+
for (;;) {
|
|
570
|
+
try {
|
|
571
|
+
return await send();
|
|
572
|
+
}
|
|
573
|
+
catch (error) {
|
|
574
|
+
if (!(error instanceof LlmError) || error.code !== 'TRANSPORT'
|
|
575
|
+
|| transportRetries >= OFFICEACE_TRANSIENT_RETRY_MAX
|
|
576
|
+
|| options.signal?.aborted)
|
|
577
|
+
throw error;
|
|
578
|
+
transportRetries += 1;
|
|
579
|
+
await officeaceDelay(resolveOfficeaceTransientRetryDelayMs(), options.signal);
|
|
580
|
+
// ⚠️ delay 在 abort 时静默 resolve——必须复检,否则用户按「停止」后
|
|
581
|
+
// 还会再发一次完整请求(codearts 签名重试审计同款坑)。
|
|
582
|
+
if (options.signal?.aborted)
|
|
583
|
+
throw error;
|
|
584
|
+
}
|
|
585
|
+
}
|
|
586
|
+
};
|
|
587
|
+
const response = await sendWithTransientRetry();
|
|
499
588
|
if (!response.ok) {
|
|
500
589
|
const text = await response.text().catch(() => '');
|
|
501
590
|
// ── 401:先判断「续期一次再重发」这件事**有没有意义** ──
|
|
@@ -591,14 +680,51 @@ export class OfficeAceAdapter extends LlmAdapter {
|
|
|
591
680
|
+ `(${this.diagnose(finalStatus, finalText, renewal)})`);
|
|
592
681
|
}
|
|
593
682
|
// ⚠️ 成功即解除熔断(**唯一**的正常出口):这证明这对 Basic 凭据是好的。
|
|
683
|
+
// 首发送成功后的传输抖动**不再动熔断**(凭据好坏已由首发证明)。
|
|
594
684
|
noteOfficeaceSuccess(credential);
|
|
595
|
-
|
|
596
|
-
|
|
597
|
-
|
|
598
|
-
|
|
599
|
-
|
|
600
|
-
|
|
601
|
-
|
|
685
|
+
/**
|
|
686
|
+
* 消费 + 「首字节前被掐」冷却重发(raccoon `consumeWithTransientRetry`
|
|
687
|
+
* 同款结构):SSE 已建立但**尚无任何 chunk 流出**就被掐断(TERMINATED)时,
|
|
688
|
+
* 冷却后整请求重发一次;已有 chunk 流出则**绝不重发**——半截输出对
|
|
689
|
+
* 用户是已见事实,重发等于重复计费 + 文案跳变。
|
|
690
|
+
*/
|
|
691
|
+
let yielded = false;
|
|
692
|
+
let consumeTransportRetries = 0;
|
|
693
|
+
let sseResponse = response;
|
|
694
|
+
for (;;) {
|
|
695
|
+
try {
|
|
696
|
+
for await (const chunk of consumeOpenAiSse(sseResponse, { signal: controller.signal }, {
|
|
697
|
+
label: OFFICEACE.id,
|
|
698
|
+
firstTokenTimeoutMs: OFFICEACE.headerTimeoutMs,
|
|
699
|
+
chunkTimeoutMs: OFFICEACE.chunkTimeoutMs,
|
|
700
|
+
...maxTokens === undefined ? {} : { maxTokens },
|
|
701
|
+
...dsmlMode ? { dsmlToolMode: true } : {},
|
|
702
|
+
})) {
|
|
703
|
+
yielded = true;
|
|
704
|
+
yield chunk;
|
|
705
|
+
}
|
|
706
|
+
return;
|
|
707
|
+
}
|
|
708
|
+
catch (error) {
|
|
709
|
+
if (!(error instanceof LlmError) || error.code !== 'TRANSPORT'
|
|
710
|
+
|| yielded || consumeTransportRetries >= OFFICEACE_TRANSIENT_RETRY_MAX
|
|
711
|
+
|| options.signal?.aborted)
|
|
712
|
+
throw error;
|
|
713
|
+
consumeTransportRetries += 1;
|
|
714
|
+
await officeaceDelay(resolveOfficeaceTransientRetryDelayMs(), options.signal);
|
|
715
|
+
if (options.signal?.aborted)
|
|
716
|
+
throw error;
|
|
717
|
+
// 冷却后整请求重发(复用带重试的发送;SSE 被掐断时连接多半已换新)。
|
|
718
|
+
sseResponse = await sendWithTransientRetry();
|
|
719
|
+
if (!sseResponse.ok) {
|
|
720
|
+
// 与首发 !ok 的文案逐字同形(裸 Error——见 diagnose() 约束注释);
|
|
721
|
+
// 续期状态取 'not-attempted':重发腿不做凭据续期(凭据已被首发证明有效)。
|
|
722
|
+
const text = await sseResponse.text().catch(() => '');
|
|
723
|
+
throw new Error(`OfficeAce (华为MaaS) 返回 HTTP ${sseResponse.status}:${text.slice(0, 200)}`
|
|
724
|
+
+ `(${this.diagnose(sseResponse.status, text, 'not-attempted')})`);
|
|
725
|
+
}
|
|
726
|
+
}
|
|
727
|
+
}
|
|
602
728
|
}
|
|
603
729
|
finally {
|
|
604
730
|
options.signal?.removeEventListener('abort', onAbort);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"officeace-adapter.js","sourceRoot":"","sources":["../src/officeace-adapter.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"officeace-adapter.js","sourceRoot":"","sources":["../src/officeace-adapter.ts"],"names":[],"mappings":"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"}
|
package/lib/officeace-auth.d.ts
CHANGED
|
@@ -41,6 +41,21 @@ export type DpopPrivateJwk = {
|
|
|
41
41
|
d?: string;
|
|
42
42
|
};
|
|
43
43
|
type JsonWebKey = DpopPrivateJwk;
|
|
44
|
+
/**
|
|
45
|
+
* OfficeAce 的 refresh_token 已**永久失效**(STS5.1806 / invalid_grant)——
|
|
46
|
+
* 与 `oauth.ts` 的 `RefreshTokenExpiredError`、`buddy-oauth.ts` 等各家的同名类
|
|
47
|
+
* **同构但独立**(跨模块 `instanceof` 恒为 false,expiry-sync.ts 的 PR159 教训),
|
|
48
|
+
* 故本家调用方只认本类。
|
|
49
|
+
*
|
|
50
|
+
* 触发形态(2026-11-01 用户报障,日志每 30 分钟重复同一条):
|
|
51
|
+
* `{"error_code":"STS5.1806","error_msg":"invalid refresh token: 'the refresh
|
|
52
|
+
* token has been used'"}`。refresh_token 一次性,该错误**重试无意义**,
|
|
53
|
+
* 唯一出路是重新登录 ⇒ 调用方必须把池条目的 `refreshable` 标成 `false`,
|
|
54
|
+
* 让调度器停手。
|
|
55
|
+
*/
|
|
56
|
+
export declare class OfficeAceRefreshTokenExpiredError extends Error {
|
|
57
|
+
constructor(message: string);
|
|
58
|
+
}
|
|
44
59
|
export interface OfficeAceCredential {
|
|
45
60
|
/** MaaS 推理的 Basic 凭据对(permission-validate 返回)。 */
|
|
46
61
|
modelAppKey: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"officeace-auth.d.ts","sourceRoot":"","sources":["../src/officeace-auth.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AAUH,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAA;AAMlD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAA;AAEtD,0DAA0D;AAC1D,MAAM,MAAM,cAAc,GAAG;IAAE,GAAG,CAAC,EAAE,MAAM,CAAC;IAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,CAAC,EAAE,MAAM,CAAA;CAAE,CAAA;AAC/F,KAAK,UAAU,GAAG,cAAc,CAAA;
|
|
1
|
+
{"version":3,"file":"officeace-auth.d.ts","sourceRoot":"","sources":["../src/officeace-auth.ts"],"names":[],"mappings":"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"}
|
package/lib/officeace-auth.js
CHANGED
|
@@ -45,6 +45,24 @@ import { markLoginNeedsExternalAction } from './login-failure.js';
|
|
|
45
45
|
/** 华为云端点(与 OfficeAce green-package 的默认值一致)。 */
|
|
46
46
|
const CLAW_BASE = 'https://agentarts.cn-southwest-2.myhuaweicloud.com';
|
|
47
47
|
const TOKEN_URL = 'https://sts.cn-north-4.myhuaweicloud.com/v1/oauth2/tokens';
|
|
48
|
+
/**
|
|
49
|
+
* OfficeAce 的 refresh_token 已**永久失效**(STS5.1806 / invalid_grant)——
|
|
50
|
+
* 与 `oauth.ts` 的 `RefreshTokenExpiredError`、`buddy-oauth.ts` 等各家的同名类
|
|
51
|
+
* **同构但独立**(跨模块 `instanceof` 恒为 false,expiry-sync.ts 的 PR159 教训),
|
|
52
|
+
* 故本家调用方只认本类。
|
|
53
|
+
*
|
|
54
|
+
* 触发形态(2026-11-01 用户报障,日志每 30 分钟重复同一条):
|
|
55
|
+
* `{"error_code":"STS5.1806","error_msg":"invalid refresh token: 'the refresh
|
|
56
|
+
* token has been used'"}`。refresh_token 一次性,该错误**重试无意义**,
|
|
57
|
+
* 唯一出路是重新登录 ⇒ 调用方必须把池条目的 `refreshable` 标成 `false`,
|
|
58
|
+
* 让调度器停手。
|
|
59
|
+
*/
|
|
60
|
+
export class OfficeAceRefreshTokenExpiredError extends Error {
|
|
61
|
+
constructor(message) {
|
|
62
|
+
super(message);
|
|
63
|
+
this.name = 'OfficeAceRefreshTokenExpiredError';
|
|
64
|
+
}
|
|
65
|
+
}
|
|
48
66
|
const CLIENT_ID = 'pdp5_for_agentarts';
|
|
49
67
|
const REDIRECT_URI = `${CLAW_BASE}/v1/claw/auth/callback`;
|
|
50
68
|
/**
|
|
@@ -645,6 +663,19 @@ async function doRefreshCredential(current) {
|
|
|
645
663
|
// `return undefined`,refresh_token 被消费丢失(STS5.1806)时日志零字,
|
|
646
664
|
// 用户只看到「渠道停了 / 余额不更新」,无从排查(2026-10-12 事故实测)。
|
|
647
665
|
const detail = await r.text().catch(() => '');
|
|
666
|
+
/**
|
|
667
|
+
* ★ STS5.1806 是**终态**(2026-11-01 用户报障:日志每 30 分钟刷屏同一条):
|
|
668
|
+
* `{"error_code":"STS5.1806","error_msg":"invalid refresh token: 'the
|
|
669
|
+
* refresh token has been used'"}` —— refresh_token 一次性,重试一万次
|
|
670
|
+
* 也是同一报文。原先只 warn + 返回 undefined,30 分钟调度器 / 积分自愈 /
|
|
671
|
+
* 适配器 401 兜底三条入口**每条都拿同一个死 token 再烧一次**,既刷屏
|
|
672
|
+
* 又永不自愈(oauth.ts 的 IKQY27 早已把该码定为终态,但本路径没接)。
|
|
673
|
+
* 抛 {@link OfficeAceRefreshTokenExpiredError} 让调用方把池里的
|
|
674
|
+
* `refreshable` 标成 false,调度器从此跳过该账号。
|
|
675
|
+
*/
|
|
676
|
+
if (r.status === 400 && /STS5\.1806|refresh\s*token\s+has\s+been\s+used|invalid_grant/i.test(detail)) {
|
|
677
|
+
throw new OfficeAceRefreshTokenExpiredError(`OfficeAce refresh_token 已失效(HTTP ${r.status}):${detail.slice(0, 200)} —— 请在面板删除该账号后重新登录`);
|
|
678
|
+
}
|
|
648
679
|
console.warn(`[officeace] STS 续期失败 HTTP ${r.status}:${detail.slice(0, 200)}`
|
|
649
680
|
+ '(refresh_token 是一次性的:若报 STS5.1806 已被消费,必须重新登录才能恢复云端 API)');
|
|
650
681
|
return undefined;
|
|
@@ -723,11 +754,63 @@ export async function refreshAccountCredential(refName, pool, accountId, credent
|
|
|
723
754
|
await writebackExpiry(current, pool, accountId);
|
|
724
755
|
return;
|
|
725
756
|
}
|
|
726
|
-
|
|
757
|
+
let next;
|
|
758
|
+
try {
|
|
759
|
+
next = await doRefreshCredential(current);
|
|
760
|
+
}
|
|
761
|
+
catch (error) {
|
|
762
|
+
if (error instanceof OfficeAceRefreshTokenExpiredError) {
|
|
763
|
+
/**
|
|
764
|
+
* ★ 终态(STS5.1806 / invalid_grant)也必须先过**规则 3**:并发/跨进程
|
|
765
|
+
* 下服务端烧掉的是旧 token,磁盘上可能已躺着新凭据 —— 那是「他处已续
|
|
766
|
+
* 成功」,标死它就是把好账号永久标死(gemini-auth.ts 头注释记过的
|
|
767
|
+
* 单向门形态)。重读没有更新凭据才真标死。
|
|
768
|
+
*/
|
|
769
|
+
const elsewhere = await latestAfterFailedRefresh(refName, credentials, current);
|
|
770
|
+
if (elsewhere !== undefined) {
|
|
771
|
+
await writebackExpiry(elsewhere, pool, accountId);
|
|
772
|
+
return;
|
|
773
|
+
}
|
|
774
|
+
/**
|
|
775
|
+
* ★ 真终态:标死并如实记日志(含上游原文,用户能看到「已被消费」的事实)。
|
|
776
|
+
* ⚠️ 标死失败只记日志不抛 —— 退回「每 30 分钟白烧一次请求」的旧
|
|
777
|
+
* 形态也好过让单账号的终态炸掉整轮批量续期。
|
|
778
|
+
* ⚠️ 自愈路径只有「重新登录」(jet-hub-rpc 的 handover 写
|
|
779
|
+
* `refreshable: true`)—— 判据是**异常类型**而非任何一次失败,
|
|
780
|
+
* 瞬时网络错误不会走到这里(返回 undefined 那条腿)。
|
|
781
|
+
*/
|
|
782
|
+
try {
|
|
783
|
+
await pool
|
|
784
|
+
?.updateAccount?.(accountId, { refreshable: false });
|
|
785
|
+
}
|
|
786
|
+
catch (patchError) {
|
|
787
|
+
console.warn(`[officeace] 终态标记写入账号池失败(${accountId}):${String(patchError)}`);
|
|
788
|
+
}
|
|
789
|
+
console.warn(`[officeace] ${error.message}`);
|
|
790
|
+
return;
|
|
791
|
+
}
|
|
792
|
+
throw error;
|
|
793
|
+
}
|
|
727
794
|
if (next === undefined) {
|
|
728
795
|
// ⚠️ **判终态前重读**(规则 3):先确认「是不是别处已经续成功了」。
|
|
729
796
|
const elsewhere = await latestAfterFailedRefresh(refName, credentials, current);
|
|
730
|
-
|
|
797
|
+
if (elsewhere !== undefined) {
|
|
798
|
+
await writebackExpiry(elsewhere, pool, accountId);
|
|
799
|
+
return;
|
|
800
|
+
}
|
|
801
|
+
/**
|
|
802
|
+
* ★ 真终态必须**标死**(2026-11-01 用户报障):原先这里静默返回,
|
|
803
|
+
* 30 分钟调度器 / 积分自愈 / 适配器 401 兜底三条入口每条都拿同一个
|
|
804
|
+
* 死 token 再烧一次 —— 日志每 30 分钟刷同一条 STS5.1806 且永不自愈。
|
|
805
|
+
* 把池条目的 `refreshable` 写成 false(调度器只按它过滤、不看 enabled),
|
|
806
|
+
* 面板同步显示「需重新登录」。
|
|
807
|
+
*
|
|
808
|
+
* ⚠️ 走到这里的还有一种情况:`doRefreshCredential` 返回 undefined 的
|
|
809
|
+
* **非终态**失败(无 refresh_token 的残缺凭据、网络读体失败等)。
|
|
810
|
+
* 那类失败维持「静默返回、下轮再试」的既有语义,**不标死**
|
|
811
|
+
* (一次瞬时失败把账号永久标死是 account-pool.ts:2785 记过的教训)。
|
|
812
|
+
* 故终态标记只由下面 catch 的**异常类型**触发。
|
|
813
|
+
*/
|
|
731
814
|
return;
|
|
732
815
|
}
|
|
733
816
|
if (credentials !== undefined) {
|
|
@@ -886,6 +969,20 @@ export async function refreshAccountList(pool, refreshOne, fallbackRefresh = ref
|
|
|
886
969
|
return;
|
|
887
970
|
}
|
|
888
971
|
for (const account of accounts) {
|
|
972
|
+
/**
|
|
973
|
+
* ★ 跳过已被**终态**标死的账号(`refreshable: false`,2026-11-01):
|
|
974
|
+
* STS5.1806 后不标过滤会让调度器每 30 分钟对死 token 白烧一次请求
|
|
975
|
+
* (用户报障的刷屏本体)。
|
|
976
|
+
*
|
|
977
|
+
* ⚠️ 为什么取「!== false」而不是真值过滤(gemini 那条单向门教训):
|
|
978
|
+
* `refreshable` 在老条目上可能**缺省**(undefined)—— 真值过滤会把
|
|
979
|
+
* 它们一并挡掉(老账号静默停止续期)。只跳**显式 false**,undefined
|
|
980
|
+
* 照常进循环,由 lead-time 判据与凭据材料本身决定发不发请求。
|
|
981
|
+
* ⚠️ 误标的自愈不在这里:`updateAccount(refreshable:true)` 只由
|
|
982
|
+
* 重新登录(handover)与续期成功路径写,本层不反转别人的标记。
|
|
983
|
+
*/
|
|
984
|
+
if (account.refreshable === false)
|
|
985
|
+
continue;
|
|
889
986
|
await refreshOne(account);
|
|
890
987
|
}
|
|
891
988
|
}
|