@xixka/dsh-hub 0.3.2 → 0.3.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 +56 -1
- package/lib/account-pool.d.ts +31 -0
- package/lib/account-pool.d.ts.map +1 -1
- package/lib/account-pool.js +98 -7
- package/lib/account-pool.js.map +1 -1
- package/lib/aggregate-adapter.d.ts.map +1 -1
- package/lib/aggregate-adapter.js +7 -0
- package/lib/aggregate-adapter.js.map +1 -1
- package/lib/aggregate-expiry.d.ts +19 -0
- package/lib/aggregate-expiry.d.ts.map +1 -1
- package/lib/aggregate-expiry.js +31 -0
- package/lib/aggregate-expiry.js.map +1 -1
- package/lib/astudio-adapter.d.ts +1 -1
- package/lib/astudio-adapter.js +1 -1
- package/lib/astudio-auth.d.ts +2 -2
- package/lib/astudio-auth.js +2 -2
- package/lib/astudio-credits.d.ts +1 -1
- package/lib/astudio-credits.js +1 -1
- package/lib/astudio-product.d.ts +21 -6
- package/lib/astudio-product.d.ts.map +1 -1
- package/lib/astudio-product.js +22 -7
- package/lib/astudio-product.js.map +1 -1
- package/lib/astudio.d.ts +3 -3
- package/lib/astudio.js +3 -3
- package/lib/auto-adapter.d.ts +6 -1
- package/lib/auto-adapter.d.ts.map +1 -1
- package/lib/auto-adapter.js +13 -1
- package/lib/auto-adapter.js.map +1 -1
- package/lib/auto-checkin.d.ts.map +1 -1
- package/lib/auto-checkin.js +20 -1
- package/lib/auto-checkin.js.map +1 -1
- package/lib/baizhi-adapter.d.ts.map +1 -1
- package/lib/baizhi-adapter.js +38 -2
- package/lib/baizhi-adapter.js.map +1 -1
- package/lib/baizhi-messages.d.ts +43 -3
- package/lib/baizhi-messages.d.ts.map +1 -1
- package/lib/baizhi-messages.js +46 -6
- package/lib/baizhi-messages.js.map +1 -1
- package/lib/baizhi-product.d.ts +31 -2
- package/lib/baizhi-product.d.ts.map +1 -1
- package/lib/baizhi-product.js +71 -18
- package/lib/baizhi-product.js.map +1 -1
- package/lib/baizhi.d.ts.map +1 -1
- package/lib/baizhi.js +2 -0
- package/lib/baizhi.js.map +1 -1
- package/lib/buddy-balance-rank.d.ts +42 -0
- package/lib/buddy-balance-rank.d.ts.map +1 -1
- package/lib/buddy-balance-rank.js +42 -0
- package/lib/buddy-balance-rank.js.map +1 -1
- package/lib/buddy-balance-selector.d.ts +15 -0
- package/lib/buddy-balance-selector.d.ts.map +1 -1
- package/lib/buddy-balance-selector.js +18 -3
- package/lib/buddy-balance-selector.js.map +1 -1
- package/lib/canonical-models.d.ts.map +1 -1
- package/lib/canonical-models.js +6 -0
- package/lib/canonical-models.js.map +1 -1
- package/lib/chromium-session.d.ts +35 -0
- package/lib/chromium-session.d.ts.map +1 -1
- package/lib/chromium-session.js +47 -1
- package/lib/chromium-session.js.map +1 -1
- package/lib/client/jet-hub.js +118 -52
- package/lib/credential-resolver.d.ts +10 -0
- package/lib/credential-resolver.d.ts.map +1 -1
- package/lib/credential-resolver.js +7 -1
- package/lib/credential-resolver.js.map +1 -1
- package/lib/credits.d.ts +22 -0
- package/lib/credits.d.ts.map +1 -1
- package/lib/credits.js.map +1 -1
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js +104 -9
- package/lib/index.js.map +1 -1
- package/lib/jet-hub-rpc.d.ts +10 -0
- package/lib/jet-hub-rpc.d.ts.map +1 -1
- package/lib/jet-hub-rpc.js +306 -5
- package/lib/jet-hub-rpc.js.map +1 -1
- package/lib/jet-hub-store.d.ts +49 -0
- package/lib/jet-hub-store.d.ts.map +1 -1
- package/lib/jet-hub-store.js +50 -0
- package/lib/jet-hub-store.js.map +1 -1
- package/lib/loomy-balance-rank.d.ts +26 -0
- package/lib/loomy-balance-rank.d.ts.map +1 -1
- package/lib/loomy-balance-rank.js +29 -0
- package/lib/loomy-balance-rank.js.map +1 -1
- package/lib/loomy-balance-selector.d.ts.map +1 -1
- package/lib/loomy-balance-selector.js +6 -2
- package/lib/loomy-balance-selector.js.map +1 -1
- package/lib/magicrew-adapter.d.ts.map +1 -1
- package/lib/magicrew-adapter.js +6 -7
- package/lib/magicrew-adapter.js.map +1 -1
- package/lib/magicrew-auth.d.ts.map +1 -1
- package/lib/magicrew-auth.js +7 -4
- package/lib/magicrew-auth.js.map +1 -1
- package/lib/magicrew-catalog.d.ts +6 -0
- package/lib/magicrew-catalog.d.ts.map +1 -1
- package/lib/magicrew-catalog.js +8 -4
- package/lib/magicrew-catalog.js.map +1 -1
- package/lib/magicrew-credits.d.ts.map +1 -1
- package/lib/magicrew-credits.js +34 -18
- package/lib/magicrew-credits.js.map +1 -1
- package/lib/magicrew-product.d.ts +40 -0
- package/lib/magicrew-product.d.ts.map +1 -1
- package/lib/magicrew-product.js +41 -0
- package/lib/magicrew-product.js.map +1 -1
- package/lib/magicrew-profile.d.ts.map +1 -1
- package/lib/magicrew-profile.js +8 -4
- package/lib/magicrew-profile.js.map +1 -1
- package/lib/marvis-adapter.d.ts +142 -0
- package/lib/marvis-adapter.d.ts.map +1 -0
- package/lib/marvis-adapter.js +335 -0
- package/lib/marvis-adapter.js.map +1 -0
- package/lib/marvis-auth.d.ts +188 -0
- package/lib/marvis-auth.d.ts.map +1 -0
- package/lib/marvis-auth.js +555 -0
- package/lib/marvis-auth.js.map +1 -0
- package/lib/marvis-browser-login.d.ts +118 -0
- package/lib/marvis-browser-login.d.ts.map +1 -0
- package/lib/marvis-browser-login.js +249 -0
- package/lib/marvis-browser-login.js.map +1 -0
- package/lib/marvis-credits.d.ts +57 -0
- package/lib/marvis-credits.d.ts.map +1 -0
- package/lib/marvis-credits.js +182 -0
- package/lib/marvis-credits.js.map +1 -0
- package/lib/marvis-device.d.ts +23 -0
- package/lib/marvis-device.d.ts.map +1 -0
- package/lib/marvis-device.js +26 -0
- package/lib/marvis-device.js.map +1 -0
- package/lib/marvis-messages.d.ts +72 -0
- package/lib/marvis-messages.d.ts.map +1 -0
- package/lib/marvis-messages.js +79 -0
- package/lib/marvis-messages.js.map +1 -0
- package/lib/marvis-product.d.ts +134 -0
- package/lib/marvis-product.d.ts.map +1 -0
- package/lib/marvis-product.js +236 -0
- package/lib/marvis-product.js.map +1 -0
- package/lib/marvis.d.ts +186 -0
- package/lib/marvis.d.ts.map +1 -0
- package/lib/marvis.js +282 -0
- package/lib/marvis.js.map +1 -0
- package/lib/monkeycode-adapter.d.ts +11 -2
- package/lib/monkeycode-adapter.d.ts.map +1 -1
- package/lib/monkeycode-adapter.js +35 -3
- package/lib/monkeycode-adapter.js.map +1 -1
- package/lib/monkeycode-messages.d.ts +8 -0
- package/lib/monkeycode-messages.d.ts.map +1 -1
- package/lib/monkeycode-messages.js +8 -0
- package/lib/monkeycode-messages.js.map +1 -1
- package/lib/monkeycode-product.d.ts +35 -0
- package/lib/monkeycode-product.d.ts.map +1 -1
- package/lib/monkeycode-product.js +35 -8
- package/lib/monkeycode-product.js.map +1 -1
- package/lib/provider-credits.d.ts.map +1 -1
- package/lib/provider-credits.js +28 -0
- package/lib/provider-credits.js.map +1 -1
- package/lib/provider-expiry.d.ts.map +1 -1
- package/lib/provider-expiry.js +13 -0
- package/lib/provider-expiry.js.map +1 -1
- package/lib/provider-http-pool.d.ts +38 -4
- package/lib/provider-http-pool.d.ts.map +1 -1
- package/lib/provider-http-pool.js +52 -7
- package/lib/provider-http-pool.js.map +1 -1
- package/lib/provider-registry.d.ts +30 -0
- package/lib/provider-registry.d.ts.map +1 -1
- package/lib/provider-registry.js +83 -0
- package/lib/provider-registry.js.map +1 -1
- package/lib/qoder-adapter.d.ts.map +1 -1
- package/lib/qoder-adapter.js +8 -1
- package/lib/qoder-adapter.js.map +1 -1
- package/lib/qoder-credits.d.ts +10 -3
- package/lib/qoder-credits.d.ts.map +1 -1
- package/lib/qoder-credits.js +65 -4
- package/lib/qoder-credits.js.map +1 -1
- package/lib/types.d.ts +62 -2
- package/lib/types.d.ts.map +1 -1
- package/lib/types.js.map +1 -1
- package/lib/zcode-auth.d.ts.map +1 -1
- package/lib/zcode-auth.js +8 -1
- package/lib/zcode-auth.js.map +1 -1
- package/lib/zcode-login.d.ts.map +1 -1
- package/lib/zcode-login.js +5 -3
- package/lib/zcode-login.js.map +1 -1
- package/lib/zcode-transport.d.ts.map +1 -1
- package/lib/zcode-transport.js +3 -1
- package/lib/zcode-transport.js.map +1 -1
- package/lib/zcode-upstream.d.ts.map +1 -1
- package/lib/zcode-upstream.js +19 -8
- package/lib/zcode-upstream.js.map +1 -1
- package/package.json +2 -1
package/lib/marvis.d.ts
ADDED
|
@@ -0,0 +1,186 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* 腾讯 Marvis(应用宝 AI 助手)的凭据结构、请求头与 UAL 签名原语。
|
|
3
|
+
*
|
|
4
|
+
* ## 两条腿,两套鉴权,**不能混**
|
|
5
|
+
*
|
|
6
|
+
* | 端点 | 需要的头 | 绝不能带的头 |
|
|
7
|
+
* |---|---|---|
|
|
8
|
+
* | `/v1/chat/completions`(模型网关) | `Ual-Access-{Openid,Access-Token,Login-Type,Guid}` + `Ual-Access-MarvisExt` | **UAL 签名** |
|
|
9
|
+
* | `/v3/*`(钱包、用户信息) | 上面四个 + `Ual-Access-{Businessid,Timestamp,Nonce,Signature}` | — |
|
|
10
|
+
*
|
|
11
|
+
* ⚠️ **把签名头加到模型网关上是错的**:实测会把 `403 风控拦截` 变成
|
|
12
|
+
* `401 登录态过期/未登录`(2026-11-09 请求头矩阵)。症状指向「凭据坏了」,
|
|
13
|
+
* 而凭据完全正常 —— 这种错误最贵,故两条腿分成两个函数、并有单测钉死
|
|
14
|
+
* 「推理头不带签名」。
|
|
15
|
+
*
|
|
16
|
+
* ## 凭据形态
|
|
17
|
+
*
|
|
18
|
+
* 一份账号一份 JSON(与 `modelscope` / `loomy` 同属「凭据是静态材料」那一类):
|
|
19
|
+
* 登录换来的是 **access token + refresh token 对**,两者都不可再生。
|
|
20
|
+
*
|
|
21
|
+
* ⚠️ 字段名 **必须**是 `access_token`:`AccountPool.findAccountIdByCredential`
|
|
22
|
+
* 对非 codearts 的 provider 统一取它作身份标识(`src/account-pool.ts:1271`),
|
|
23
|
+
* 改名会让限流记录的账号归属**恒匹配失败且静默**。
|
|
24
|
+
*
|
|
25
|
+
* @module src/marvis.ts
|
|
26
|
+
*/
|
|
27
|
+
/** 业务接口基址(`/v3/*` 与登录回调都在这个 host 上)。 */
|
|
28
|
+
export declare const MARVIS_BASE_URL = "https://yybadaccess.3g.qq.com";
|
|
29
|
+
/**
|
|
30
|
+
* 业务接口签名用的 accessKey。
|
|
31
|
+
*
|
|
32
|
+
* ⚠️ 这不是密钥:明文硬编码在 Marvis 的渲染层里(`config_defaults` 的
|
|
33
|
+
* Fernet 解密产物),任何登录了客户端的机器上都能读出来。写在这里是为了
|
|
34
|
+
* 「签名能算对」,不是「保密」。
|
|
35
|
+
*/
|
|
36
|
+
export declare const MARVIS_ACCESS_KEY = "fpzkeTlcGLVP37qiOWd29MyaOqaJYxMi";
|
|
37
|
+
/** 上游 business id(请求头 `Ual-Access-Businessid`)。 */
|
|
38
|
+
export declare const MARVIS_BUSINESS_ID = "marvis_client";
|
|
39
|
+
/**
|
|
40
|
+
* 模型网关的 UA。
|
|
41
|
+
*
|
|
42
|
+
* ⚠️ **必须**是 Marvis agent 自己的 `AsyncOpenAI/Python 2.32.0`:
|
|
43
|
+
* 换成浏览器 UA 或 magpie 自己的 UA 会被风控拦 `4100404`
|
|
44
|
+
* (2026-11-09 请求头矩阵)。这不是「伪装」,是这个端点的准入条件。
|
|
45
|
+
*/
|
|
46
|
+
export declare const MARVIS_CLIENT_UA = "AsyncOpenAI/Python 2.32.0";
|
|
47
|
+
/** 业务接口(`/v3/*`、授权页)用的浏览器 UA,照抄 Marvis 自己的。 */
|
|
48
|
+
export declare const MARVIS_BROWSER_UA: string;
|
|
49
|
+
/** QQ 互联 appid。 */
|
|
50
|
+
export declare const MARVIS_QQ_APP_ID = "1903794758";
|
|
51
|
+
/** 微信开放平台 appid。 */
|
|
52
|
+
export declare const MARVIS_WX_APP_ID = "wxb650708317d56f88";
|
|
53
|
+
/**
|
|
54
|
+
* 登录回调地址。
|
|
55
|
+
*
|
|
56
|
+
* ⚠️ **预注册、改不了**:换成本地地址会被微信/QQ 拒绝(域名白名单)。
|
|
57
|
+
* 故登录必须「在浏览器里打开授权页 → 在 Request 阶段截停回调 →
|
|
58
|
+
* Node 侧带 `Ual-Access-Guid` 换 code」(见 `marvis-browser-login.ts`)。
|
|
59
|
+
*/
|
|
60
|
+
export declare const MARVIS_REDIRECT_URI = "https://yybadaccess.3g.qq.com/marvis_client_login/marvis_oauth";
|
|
61
|
+
/** 默认客户端版本(`Ual-Access-MarvisExt.clientVersion`)。 */
|
|
62
|
+
export declare const MARVIS_DEFAULT_CLIENT_VERSION = "1.60.3300.765";
|
|
63
|
+
/** 一份可持久化的 Marvis 凭据。 */
|
|
64
|
+
export interface MarvisCredential {
|
|
65
|
+
/**
|
|
66
|
+
* access token(`mv_…`)。
|
|
67
|
+
*
|
|
68
|
+
* ⚠️ 字段名 **必须**是 `access_token`(见模块头)。
|
|
69
|
+
*/
|
|
70
|
+
access_token: string;
|
|
71
|
+
/** refresh token(一次性轮换,必须写回)。 */
|
|
72
|
+
refresh_token: string;
|
|
73
|
+
/** QQ / 微信的 openid(账号身份)。 */
|
|
74
|
+
openid: string;
|
|
75
|
+
/** 设备 guid(token 与它绑定,换 guid 会 401)。 */
|
|
76
|
+
guid: string;
|
|
77
|
+
/** `1` = QQ(QC),`2` = 微信(WX)。 */
|
|
78
|
+
login_type: '1' | '2';
|
|
79
|
+
/** 展示名。 */
|
|
80
|
+
nickname?: string;
|
|
81
|
+
/**
|
|
82
|
+
* 毫秒时间戳字符串(上游的 `access_token_expire_time`)。
|
|
83
|
+
*
|
|
84
|
+
* ⚠️ **兼容秒级**:`> 1e12` 视为毫秒,否则视为秒。
|
|
85
|
+
*/
|
|
86
|
+
expires_at?: string;
|
|
87
|
+
}
|
|
88
|
+
/** 发请求时用的账号视图(凭据里与「怎么发」有关的那几个字段)。 */
|
|
89
|
+
export interface MarvisAccount {
|
|
90
|
+
accessToken: string;
|
|
91
|
+
openid: string;
|
|
92
|
+
guid: string;
|
|
93
|
+
loginType: '1' | '2';
|
|
94
|
+
/** 覆盖 `Ual-Access-MarvisExt.clientVersion`(探测/兼容用)。 */
|
|
95
|
+
clientVersion?: string;
|
|
96
|
+
}
|
|
97
|
+
/**
|
|
98
|
+
* 解析一份持久化的凭据。
|
|
99
|
+
*
|
|
100
|
+
* ⚠️ **四个必填字段缺一不可**:`access_token` / `openid` / `guid` /
|
|
101
|
+
* `login_type`。半份凭据比没有更糟 —— 它会让「账号存在」与「请求必 401」
|
|
102
|
+
* 同时成立,而症状(登录态过期)指向错误的方向。
|
|
103
|
+
*
|
|
104
|
+
* @returns 解析失败返回 `undefined`(**不抛错**:调用方要能区分「没凭据」
|
|
105
|
+
* 与「凭据坏了」,而不是让异常冒到 RPC 层变成 500)。
|
|
106
|
+
*/
|
|
107
|
+
export declare function parseMarvisCredential(value: string | undefined): MarvisCredential | undefined;
|
|
108
|
+
/** 凭据 → 请求头用的账号对象。 */
|
|
109
|
+
export declare function marvisAccountOf(credential: MarvisCredential): MarvisAccount;
|
|
110
|
+
/**
|
|
111
|
+
* 解析凭据里的过期时刻(毫秒)。
|
|
112
|
+
*
|
|
113
|
+
* ⚠️ **读取时兼容秒级**(`> 1e12` 视为毫秒,否则视为秒)—— 上游的
|
|
114
|
+
* `access_token_expire_time` 历史上两种量纲都出现过;不兼容会让「秒」被当成
|
|
115
|
+
* 1970 年 ⇒ **恒判已过期**、每轮都白跑一次续期。
|
|
116
|
+
*/
|
|
117
|
+
export declare function credentialExpiresAtMs(credential: MarvisCredential | undefined): number | undefined;
|
|
118
|
+
/**
|
|
119
|
+
* 凭据是否已过期。
|
|
120
|
+
*
|
|
121
|
+
* ⚠️ **没有 `expires_at` 时恒返回 `false`(= 未过期)**:读不到不等于已失效。
|
|
122
|
+
* 判成过期会让卡片整片变红、续期定时器每轮空转,而真正的失效由**上游 401**
|
|
123
|
+
* 反映(客户端会给出「请重新登录」)。
|
|
124
|
+
*/
|
|
125
|
+
export declare function isMarvisCredentialExpired(credential: MarvisCredential | undefined, nowMs?: number): boolean;
|
|
126
|
+
/**
|
|
127
|
+
* 把 access token 打码成 `mv_1…cdef`(UI 一律用它,**绝不**展示明文)。
|
|
128
|
+
*
|
|
129
|
+
* ⚠️ 形状不合法时**返回空串**而不是回显原文 —— 打码函数绝不能成为
|
|
130
|
+
* 「把任意输入原样上屏」的通道。
|
|
131
|
+
*/
|
|
132
|
+
export declare function maskMarvisKey(value: string | undefined | null): string;
|
|
133
|
+
/**
|
|
134
|
+
* 生成一次性的设备指纹(uskey)。
|
|
135
|
+
*
|
|
136
|
+
* ⚠️ **每次调用都现签**(376 字节随机 base64):magpie 的 README 声称
|
|
137
|
+
* 「同一 uskey 用第 3 次会 403」,本次实测未复现,但现签的代价可忽略,
|
|
138
|
+
* 且能规避「指纹被服务端按次数判定」这类不可见风险。
|
|
139
|
+
*/
|
|
140
|
+
export declare function uskeyOf(): string;
|
|
141
|
+
/**
|
|
142
|
+
* `Ual-Access-MarvisExt` 的值(**紧凑 JSON,不能有空格**)。
|
|
143
|
+
*
|
|
144
|
+
* 服务端按原文字符串校验,带空格会被判成不同的指纹。
|
|
145
|
+
*/
|
|
146
|
+
export declare function marvisExt(account: MarvisAccount, uskey?: string): string;
|
|
147
|
+
/**
|
|
148
|
+
* 模型网关(`/v1/chat/completions`)的完整请求头。
|
|
149
|
+
*
|
|
150
|
+
* ⚠️ **不含任何 UAL 签名头**(见模块头)。
|
|
151
|
+
*/
|
|
152
|
+
export declare function llmHeaders(account: MarvisAccount, options?: {
|
|
153
|
+
accept?: string;
|
|
154
|
+
conversationId?: string;
|
|
155
|
+
responseId?: string;
|
|
156
|
+
agentTag?: string;
|
|
157
|
+
scene?: string;
|
|
158
|
+
}): Record<string, string>;
|
|
159
|
+
/**
|
|
160
|
+
* `/v3/*` 业务接口的签名:`md5(query + timestamp + accessKey + nonce)`。
|
|
161
|
+
*
|
|
162
|
+
* @param query 签名原文 —— GET 是查询串(不含 `?`),POST 是 JSON body 原文
|
|
163
|
+
* @returns 32 位小写 hex
|
|
164
|
+
*/
|
|
165
|
+
export declare function ualSignature(query: string, timestamp: string, nonce: string): string;
|
|
166
|
+
/** `/v3/*` 业务接口的完整请求头(带签名四件套)。 */
|
|
167
|
+
export declare function businessHeaders(account: MarvisAccount, options: {
|
|
168
|
+
query: string;
|
|
169
|
+
method?: string;
|
|
170
|
+
now?: number;
|
|
171
|
+
nonce?: string;
|
|
172
|
+
}): Record<string, string>;
|
|
173
|
+
/**
|
|
174
|
+
* `login_type`(`'1'`/`'2'`)→ 回调/授权页用的码(`QC`/`WX`)。
|
|
175
|
+
*
|
|
176
|
+
* ⚠️ 只有**登录/授权**这条腿用 `QC`/`WX`;续期 body 里的 `loginType`
|
|
177
|
+
* 恒为字面量 `"Marvis"`(见 `marvis-auth.ts`),别混。
|
|
178
|
+
*/
|
|
179
|
+
export declare function marvisLanguageOf(loginType: '1' | '2'): 'QC' | 'WX';
|
|
180
|
+
/** 账号展示名:`QQ·昵称` / `微信·昵称`(无昵称时退化成平台名)。 */
|
|
181
|
+
export declare function marvisAccountLabel(nickname: string | undefined, loginType: '1' | '2'): string;
|
|
182
|
+
/** 推理端点全 URL。 */
|
|
183
|
+
export declare function marvisChatUrl(baseUrl?: string): string;
|
|
184
|
+
/** 续期端点全 URL(**POST**,path 见 `marvis-product.ts` 的 `refreshPath`)。 */
|
|
185
|
+
export declare function marvisRefreshUrl(refreshPath: string, baseUrl?: string): string;
|
|
186
|
+
//# sourceMappingURL=marvis.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"marvis.d.ts","sourceRoot":"","sources":["../src/marvis.ts"],"names":[],"mappings":"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"}
|
package/lib/marvis.js
ADDED
|
@@ -0,0 +1,282 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* 腾讯 Marvis(应用宝 AI 助手)的凭据结构、请求头与 UAL 签名原语。
|
|
3
|
+
*
|
|
4
|
+
* ## 两条腿,两套鉴权,**不能混**
|
|
5
|
+
*
|
|
6
|
+
* | 端点 | 需要的头 | 绝不能带的头 |
|
|
7
|
+
* |---|---|---|
|
|
8
|
+
* | `/v1/chat/completions`(模型网关) | `Ual-Access-{Openid,Access-Token,Login-Type,Guid}` + `Ual-Access-MarvisExt` | **UAL 签名** |
|
|
9
|
+
* | `/v3/*`(钱包、用户信息) | 上面四个 + `Ual-Access-{Businessid,Timestamp,Nonce,Signature}` | — |
|
|
10
|
+
*
|
|
11
|
+
* ⚠️ **把签名头加到模型网关上是错的**:实测会把 `403 风控拦截` 变成
|
|
12
|
+
* `401 登录态过期/未登录`(2026-11-09 请求头矩阵)。症状指向「凭据坏了」,
|
|
13
|
+
* 而凭据完全正常 —— 这种错误最贵,故两条腿分成两个函数、并有单测钉死
|
|
14
|
+
* 「推理头不带签名」。
|
|
15
|
+
*
|
|
16
|
+
* ## 凭据形态
|
|
17
|
+
*
|
|
18
|
+
* 一份账号一份 JSON(与 `modelscope` / `loomy` 同属「凭据是静态材料」那一类):
|
|
19
|
+
* 登录换来的是 **access token + refresh token 对**,两者都不可再生。
|
|
20
|
+
*
|
|
21
|
+
* ⚠️ 字段名 **必须**是 `access_token`:`AccountPool.findAccountIdByCredential`
|
|
22
|
+
* 对非 codearts 的 provider 统一取它作身份标识(`src/account-pool.ts:1271`),
|
|
23
|
+
* 改名会让限流记录的账号归属**恒匹配失败且静默**。
|
|
24
|
+
*
|
|
25
|
+
* @module src/marvis.ts
|
|
26
|
+
*/
|
|
27
|
+
import { createHash, randomBytes, randomUUID } from 'node:crypto';
|
|
28
|
+
/** 业务接口基址(`/v3/*` 与登录回调都在这个 host 上)。 */
|
|
29
|
+
export const MARVIS_BASE_URL = 'https://yybadaccess.3g.qq.com';
|
|
30
|
+
/**
|
|
31
|
+
* 业务接口签名用的 accessKey。
|
|
32
|
+
*
|
|
33
|
+
* ⚠️ 这不是密钥:明文硬编码在 Marvis 的渲染层里(`config_defaults` 的
|
|
34
|
+
* Fernet 解密产物),任何登录了客户端的机器上都能读出来。写在这里是为了
|
|
35
|
+
* 「签名能算对」,不是「保密」。
|
|
36
|
+
*/
|
|
37
|
+
export const MARVIS_ACCESS_KEY = 'fpzkeTlcGLVP37qiOWd29MyaOqaJYxMi';
|
|
38
|
+
/** 上游 business id(请求头 `Ual-Access-Businessid`)。 */
|
|
39
|
+
export const MARVIS_BUSINESS_ID = 'marvis_client';
|
|
40
|
+
/**
|
|
41
|
+
* 模型网关的 UA。
|
|
42
|
+
*
|
|
43
|
+
* ⚠️ **必须**是 Marvis agent 自己的 `AsyncOpenAI/Python 2.32.0`:
|
|
44
|
+
* 换成浏览器 UA 或 magpie 自己的 UA 会被风控拦 `4100404`
|
|
45
|
+
* (2026-11-09 请求头矩阵)。这不是「伪装」,是这个端点的准入条件。
|
|
46
|
+
*/
|
|
47
|
+
export const MARVIS_CLIENT_UA = 'AsyncOpenAI/Python 2.32.0';
|
|
48
|
+
/** 业务接口(`/v3/*`、授权页)用的浏览器 UA,照抄 Marvis 自己的。 */
|
|
49
|
+
export const MARVIS_BROWSER_UA = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) '
|
|
50
|
+
+ 'AppleWebKit/537.36 (KHTML, like Gecko) Marvis/1.60.3300.408 '
|
|
51
|
+
+ 'Chrome/152.0.7977.130 Electron/44.7.0 Safari/537.36';
|
|
52
|
+
/** QQ 互联 appid。 */
|
|
53
|
+
export const MARVIS_QQ_APP_ID = '1903794758';
|
|
54
|
+
/** 微信开放平台 appid。 */
|
|
55
|
+
export const MARVIS_WX_APP_ID = 'wxb650708317d56f88';
|
|
56
|
+
/**
|
|
57
|
+
* 登录回调地址。
|
|
58
|
+
*
|
|
59
|
+
* ⚠️ **预注册、改不了**:换成本地地址会被微信/QQ 拒绝(域名白名单)。
|
|
60
|
+
* 故登录必须「在浏览器里打开授权页 → 在 Request 阶段截停回调 →
|
|
61
|
+
* Node 侧带 `Ual-Access-Guid` 换 code」(见 `marvis-browser-login.ts`)。
|
|
62
|
+
*/
|
|
63
|
+
export const MARVIS_REDIRECT_URI = `${MARVIS_BASE_URL}/marvis_client_login/marvis_oauth`;
|
|
64
|
+
/** 默认客户端版本(`Ual-Access-MarvisExt.clientVersion`)。 */
|
|
65
|
+
export const MARVIS_DEFAULT_CLIENT_VERSION = '1.60.3300.765';
|
|
66
|
+
/** uskey 的字节数(Marvis 设备指纹的长度,实测 376)。 */
|
|
67
|
+
const USKEY_BYTES = 376;
|
|
68
|
+
/**
|
|
69
|
+
* 解析一份持久化的凭据。
|
|
70
|
+
*
|
|
71
|
+
* ⚠️ **四个必填字段缺一不可**:`access_token` / `openid` / `guid` /
|
|
72
|
+
* `login_type`。半份凭据比没有更糟 —— 它会让「账号存在」与「请求必 401」
|
|
73
|
+
* 同时成立,而症状(登录态过期)指向错误的方向。
|
|
74
|
+
*
|
|
75
|
+
* @returns 解析失败返回 `undefined`(**不抛错**:调用方要能区分「没凭据」
|
|
76
|
+
* 与「凭据坏了」,而不是让异常冒到 RPC 层变成 500)。
|
|
77
|
+
*/
|
|
78
|
+
export function parseMarvisCredential(value) {
|
|
79
|
+
if (typeof value !== 'string' || value.trim().length === 0)
|
|
80
|
+
return undefined;
|
|
81
|
+
let raw;
|
|
82
|
+
try {
|
|
83
|
+
raw = JSON.parse(value);
|
|
84
|
+
}
|
|
85
|
+
catch {
|
|
86
|
+
return undefined;
|
|
87
|
+
}
|
|
88
|
+
if (typeof raw !== 'object' || raw === null)
|
|
89
|
+
return undefined;
|
|
90
|
+
const record = raw;
|
|
91
|
+
const accessToken = record.access_token;
|
|
92
|
+
const refreshToken = record.refresh_token;
|
|
93
|
+
const openid = record.openid;
|
|
94
|
+
const guid = record.guid;
|
|
95
|
+
const loginType = record.login_type;
|
|
96
|
+
if (typeof accessToken !== 'string' || accessToken.length === 0)
|
|
97
|
+
return undefined;
|
|
98
|
+
if (typeof openid !== 'string' || openid.length === 0)
|
|
99
|
+
return undefined;
|
|
100
|
+
if (typeof guid !== 'string' || guid.length === 0)
|
|
101
|
+
return undefined;
|
|
102
|
+
if (loginType !== '1' && loginType !== '2')
|
|
103
|
+
return undefined;
|
|
104
|
+
const credential = {
|
|
105
|
+
access_token: accessToken,
|
|
106
|
+
// ⚠️ refresh_token 允许为空串:上游续期响应可能回空(「不变」),
|
|
107
|
+
// 解析层不该因此把整份凭据判死。
|
|
108
|
+
refresh_token: typeof refreshToken === 'string' ? refreshToken : '',
|
|
109
|
+
openid,
|
|
110
|
+
guid,
|
|
111
|
+
login_type: loginType,
|
|
112
|
+
};
|
|
113
|
+
if (typeof record.nickname === 'string' && record.nickname.length > 0) {
|
|
114
|
+
credential.nickname = record.nickname;
|
|
115
|
+
}
|
|
116
|
+
if (typeof record.expires_at === 'string' && record.expires_at.length > 0) {
|
|
117
|
+
credential.expires_at = record.expires_at;
|
|
118
|
+
}
|
|
119
|
+
return credential;
|
|
120
|
+
}
|
|
121
|
+
/** 凭据 → 请求头用的账号对象。 */
|
|
122
|
+
export function marvisAccountOf(credential) {
|
|
123
|
+
return {
|
|
124
|
+
accessToken: credential.access_token,
|
|
125
|
+
openid: credential.openid,
|
|
126
|
+
guid: credential.guid,
|
|
127
|
+
loginType: credential.login_type,
|
|
128
|
+
};
|
|
129
|
+
}
|
|
130
|
+
/**
|
|
131
|
+
* 解析凭据里的过期时刻(毫秒)。
|
|
132
|
+
*
|
|
133
|
+
* ⚠️ **读取时兼容秒级**(`> 1e12` 视为毫秒,否则视为秒)—— 上游的
|
|
134
|
+
* `access_token_expire_time` 历史上两种量纲都出现过;不兼容会让「秒」被当成
|
|
135
|
+
* 1970 年 ⇒ **恒判已过期**、每轮都白跑一次续期。
|
|
136
|
+
*/
|
|
137
|
+
export function credentialExpiresAtMs(credential) {
|
|
138
|
+
const raw = credential?.expires_at;
|
|
139
|
+
if (typeof raw !== 'string' || raw.trim().length === 0)
|
|
140
|
+
return undefined;
|
|
141
|
+
const parsed = Number(raw);
|
|
142
|
+
if (!Number.isFinite(parsed) || parsed <= 0)
|
|
143
|
+
return undefined;
|
|
144
|
+
return parsed > 1e12 ? parsed : parsed * 1000;
|
|
145
|
+
}
|
|
146
|
+
/**
|
|
147
|
+
* 凭据是否已过期。
|
|
148
|
+
*
|
|
149
|
+
* ⚠️ **没有 `expires_at` 时恒返回 `false`(= 未过期)**:读不到不等于已失效。
|
|
150
|
+
* 判成过期会让卡片整片变红、续期定时器每轮空转,而真正的失效由**上游 401**
|
|
151
|
+
* 反映(客户端会给出「请重新登录」)。
|
|
152
|
+
*/
|
|
153
|
+
export function isMarvisCredentialExpired(credential, nowMs = Date.now()) {
|
|
154
|
+
const expiresAt = credentialExpiresAtMs(credential);
|
|
155
|
+
if (expiresAt === undefined)
|
|
156
|
+
return false;
|
|
157
|
+
return expiresAt <= nowMs;
|
|
158
|
+
}
|
|
159
|
+
/**
|
|
160
|
+
* 把 access token 打码成 `mv_1…cdef`(UI 一律用它,**绝不**展示明文)。
|
|
161
|
+
*
|
|
162
|
+
* ⚠️ 形状不合法时**返回空串**而不是回显原文 —— 打码函数绝不能成为
|
|
163
|
+
* 「把任意输入原样上屏」的通道。
|
|
164
|
+
*/
|
|
165
|
+
export function maskMarvisKey(value) {
|
|
166
|
+
if (typeof value !== 'string')
|
|
167
|
+
return '';
|
|
168
|
+
const trimmed = value.trim();
|
|
169
|
+
if (!/^mv_[A-Za-z0-9_-]{16,}$/.test(trimmed))
|
|
170
|
+
return '';
|
|
171
|
+
return `${trimmed.slice(0, 4)}…${trimmed.slice(-4)}`;
|
|
172
|
+
}
|
|
173
|
+
/**
|
|
174
|
+
* 生成一次性的设备指纹(uskey)。
|
|
175
|
+
*
|
|
176
|
+
* ⚠️ **每次调用都现签**(376 字节随机 base64):magpie 的 README 声称
|
|
177
|
+
* 「同一 uskey 用第 3 次会 403」,本次实测未复现,但现签的代价可忽略,
|
|
178
|
+
* 且能规避「指纹被服务端按次数判定」这类不可见风险。
|
|
179
|
+
*/
|
|
180
|
+
export function uskeyOf() {
|
|
181
|
+
return randomBytes(USKEY_BYTES).toString('base64');
|
|
182
|
+
}
|
|
183
|
+
/**
|
|
184
|
+
* `Ual-Access-MarvisExt` 的值(**紧凑 JSON,不能有空格**)。
|
|
185
|
+
*
|
|
186
|
+
* 服务端按原文字符串校验,带空格会被判成不同的指纹。
|
|
187
|
+
*/
|
|
188
|
+
export function marvisExt(account, uskey = uskeyOf()) {
|
|
189
|
+
return JSON.stringify({
|
|
190
|
+
osVersion: 'Windows-10-10.0.26200',
|
|
191
|
+
guid: account.guid ?? '',
|
|
192
|
+
uskey,
|
|
193
|
+
nonce: randomUUID(),
|
|
194
|
+
reqScene: 1,
|
|
195
|
+
taskType: 'user',
|
|
196
|
+
clientVersion: account.clientVersion ?? MARVIS_DEFAULT_CLIENT_VERSION,
|
|
197
|
+
isIoa: false,
|
|
198
|
+
});
|
|
199
|
+
}
|
|
200
|
+
/**
|
|
201
|
+
* 模型网关(`/v1/chat/completions`)的完整请求头。
|
|
202
|
+
*
|
|
203
|
+
* ⚠️ **不含任何 UAL 签名头**(见模块头)。
|
|
204
|
+
*/
|
|
205
|
+
export function llmHeaders(account, options = {}) {
|
|
206
|
+
return {
|
|
207
|
+
Accept: options.accept ?? 'application/json',
|
|
208
|
+
'Content-Type': 'application/json',
|
|
209
|
+
'User-Agent': MARVIS_CLIENT_UA,
|
|
210
|
+
'X-Stainless-Lang': 'python',
|
|
211
|
+
'X-Stainless-Package-Version': '2.32.0',
|
|
212
|
+
'X-Stainless-OS': 'Windows',
|
|
213
|
+
'X-Stainless-Arch': 'other:amd64',
|
|
214
|
+
'X-Stainless-Runtime': 'CPython',
|
|
215
|
+
'X-Stainless-Runtime-Version': '3.11.9',
|
|
216
|
+
'X-Stainless-Async': 'async:asyncio',
|
|
217
|
+
'X-Stainless-Raw-Response': 'true',
|
|
218
|
+
Authorization: 'Bearer placeholder',
|
|
219
|
+
'Ual-Access-Openid': account.openid,
|
|
220
|
+
'Ual-Access-Access-Token': account.accessToken,
|
|
221
|
+
'Ual-Access-Login-Type': account.loginType,
|
|
222
|
+
'Ual-Access-Guid': account.guid ?? '',
|
|
223
|
+
'Marvis-AgentTag': options.agentTag ?? 'auto_discovery',
|
|
224
|
+
'Marvis-Conversation-ID': options.conversationId ?? '',
|
|
225
|
+
'Marvis-Response-ID': options.responseId ?? '',
|
|
226
|
+
'Marvis-Scene': options.scene ?? 'preload_summary',
|
|
227
|
+
'Marvis-Protocol-Version': '1000',
|
|
228
|
+
'X-Device-GUID': account.guid ?? '',
|
|
229
|
+
'Ual-Access-MarvisExt': marvisExt(account),
|
|
230
|
+
};
|
|
231
|
+
}
|
|
232
|
+
/**
|
|
233
|
+
* `/v3/*` 业务接口的签名:`md5(query + timestamp + accessKey + nonce)`。
|
|
234
|
+
*
|
|
235
|
+
* @param query 签名原文 —— GET 是查询串(不含 `?`),POST 是 JSON body 原文
|
|
236
|
+
* @returns 32 位小写 hex
|
|
237
|
+
*/
|
|
238
|
+
export function ualSignature(query, timestamp, nonce) {
|
|
239
|
+
return createHash('md5').update(`${query}${timestamp}${MARVIS_ACCESS_KEY}${nonce}`).digest('hex');
|
|
240
|
+
}
|
|
241
|
+
/** `/v3/*` 业务接口的完整请求头(带签名四件套)。 */
|
|
242
|
+
export function businessHeaders(account, options) {
|
|
243
|
+
const timestamp = String(options.now ?? Date.now());
|
|
244
|
+
const nonce = options.nonce ?? String(1000 + Math.floor(Math.random() * 9000));
|
|
245
|
+
return {
|
|
246
|
+
Accept: '*/*',
|
|
247
|
+
'Content-Type': 'application/json; charset=utf-8',
|
|
248
|
+
'User-Agent': MARVIS_BROWSER_UA,
|
|
249
|
+
'Ual-Access-Businessid': MARVIS_BUSINESS_ID,
|
|
250
|
+
'Ual-Access-Timestamp': timestamp,
|
|
251
|
+
'Ual-Access-Nonce': nonce,
|
|
252
|
+
'Ual-Access-Signature': ualSignature(options.query, timestamp, nonce),
|
|
253
|
+
'Ual-Access-Guid': account.guid ?? '',
|
|
254
|
+
'Ual-Access-Access-Token': account.accessToken,
|
|
255
|
+
'Ual-Access-Login-Type': account.loginType,
|
|
256
|
+
'Ual-Access-Openid': account.openid,
|
|
257
|
+
};
|
|
258
|
+
}
|
|
259
|
+
/**
|
|
260
|
+
* `login_type`(`'1'`/`'2'`)→ 回调/授权页用的码(`QC`/`WX`)。
|
|
261
|
+
*
|
|
262
|
+
* ⚠️ 只有**登录/授权**这条腿用 `QC`/`WX`;续期 body 里的 `loginType`
|
|
263
|
+
* 恒为字面量 `"Marvis"`(见 `marvis-auth.ts`),别混。
|
|
264
|
+
*/
|
|
265
|
+
export function marvisLanguageOf(loginType) {
|
|
266
|
+
return loginType === '2' ? 'WX' : 'QC';
|
|
267
|
+
}
|
|
268
|
+
/** 账号展示名:`QQ·昵称` / `微信·昵称`(无昵称时退化成平台名)。 */
|
|
269
|
+
export function marvisAccountLabel(nickname, loginType) {
|
|
270
|
+
const platform = loginType === '2' ? '微信' : 'QQ';
|
|
271
|
+
const name = typeof nickname === 'string' ? nickname.trim() : '';
|
|
272
|
+
return name.length === 0 ? platform : `${platform}·${name}`;
|
|
273
|
+
}
|
|
274
|
+
/** 推理端点全 URL。 */
|
|
275
|
+
export function marvisChatUrl(baseUrl = MARVIS_BASE_URL) {
|
|
276
|
+
return `${baseUrl}/v1/chat/completions`;
|
|
277
|
+
}
|
|
278
|
+
/** 续期端点全 URL(**POST**,path 见 `marvis-product.ts` 的 `refreshPath`)。 */
|
|
279
|
+
export function marvisRefreshUrl(refreshPath, baseUrl = MARVIS_BASE_URL) {
|
|
280
|
+
return `${baseUrl}${refreshPath}`;
|
|
281
|
+
}
|
|
282
|
+
//# sourceMappingURL=marvis.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"marvis.js","sourceRoot":"","sources":["../src/marvis.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,8 +25,17 @@
|
|
|
25
25
|
* MonkeyCode 没有下发「每个模型支持哪些思考档位」的元数据。凭空编一张表
|
|
26
26
|
* 就是假能力(Qoder 的教训:UI 给了选项、请求却被丢弃)。
|
|
27
27
|
* - 目录条目**不带** `reasoning` ⇒ UI 不出现档位选择器;
|
|
28
|
-
* -
|
|
29
|
-
*
|
|
28
|
+
* - ⚠️ 2026-11-08 审计**订正**:本注释原写「但 harness 自己传了
|
|
29
|
+
* `reasoningEffort`(例如用户在别处设过)时仍会映射成
|
|
30
|
+
* `thinking.budget_tokens`」—— **不成立**。宿主 `dsh-llm` 的
|
|
31
|
+
* `resolveCallWithInfo`(`lib/index.js:2186-2196`)在
|
|
32
|
+
* `reasoning === void 0 && requested !== void 0` 时**直接抛**
|
|
33
|
+
* `UNSUPPORTED_REASONING_EFFORT`,请求根本到不了适配器。
|
|
34
|
+
* 故 `monkeycodeThinkingFor` 的档位阶梯(low 2048 / medium 4096 /
|
|
35
|
+
* high 8192)当前是**死代码**;真正会生效的只有 `purpose ===
|
|
36
|
+
* 'session-title'` 的强制 `disabled` 与「不发该字段」两条。
|
|
37
|
+
* 保留阶梯是为了上游将来下发档位表时不必重写,**不是当前可达的行为**
|
|
38
|
+
* (不要再拿它当「思考预算会影响输出」的依据)。
|
|
30
39
|
*
|
|
31
40
|
* ## 错误码纪律(与 minimax 同口径)
|
|
32
41
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monkeycode-adapter.d.ts","sourceRoot":"","sources":["../src/monkeycode-adapter.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"monkeycode-adapter.d.ts","sourceRoot":"","sources":["../src/monkeycode-adapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,8 +25,17 @@
|
|
|
25
25
|
* MonkeyCode 没有下发「每个模型支持哪些思考档位」的元数据。凭空编一张表
|
|
26
26
|
* 就是假能力(Qoder 的教训:UI 给了选项、请求却被丢弃)。
|
|
27
27
|
* - 目录条目**不带** `reasoning` ⇒ UI 不出现档位选择器;
|
|
28
|
-
* -
|
|
29
|
-
*
|
|
28
|
+
* - ⚠️ 2026-11-08 审计**订正**:本注释原写「但 harness 自己传了
|
|
29
|
+
* `reasoningEffort`(例如用户在别处设过)时仍会映射成
|
|
30
|
+
* `thinking.budget_tokens`」—— **不成立**。宿主 `dsh-llm` 的
|
|
31
|
+
* `resolveCallWithInfo`(`lib/index.js:2186-2196`)在
|
|
32
|
+
* `reasoning === void 0 && requested !== void 0` 时**直接抛**
|
|
33
|
+
* `UNSUPPORTED_REASONING_EFFORT`,请求根本到不了适配器。
|
|
34
|
+
* 故 `monkeycodeThinkingFor` 的档位阶梯(low 2048 / medium 4096 /
|
|
35
|
+
* high 8192)当前是**死代码**;真正会生效的只有 `purpose ===
|
|
36
|
+
* 'session-title'` 的强制 `disabled` 与「不发该字段」两条。
|
|
37
|
+
* 保留阶梯是为了上游将来下发档位表时不必重写,**不是当前可达的行为**
|
|
38
|
+
* (不要再拿它当「思考预算会影响输出」的依据)。
|
|
30
39
|
*
|
|
31
40
|
* ## 错误码纪律(与 minimax 同口径)
|
|
32
41
|
*
|
|
@@ -48,10 +57,16 @@ import { isAbortLike } from './aggregate-adapter.js';
|
|
|
48
57
|
import { registerAdapterIdempotent } from './llm-register-compat.js';
|
|
49
58
|
import { MONKEYCODE, monkeycodeFallbackModels, } from './monkeycode-product.js';
|
|
50
59
|
import { classifyMonkeycodeFailure, monkeycodeHeaders, monkeycodeMessagesUrl, recordsMonkeycodeRateLimit, shouldRotateMonkeycodeAccount, } from './monkeycode.js';
|
|
51
|
-
import { buildMonkeycodeMessagesPayload, consumeMonkeycodeSse, monkeycodeThinkingFor, } from './monkeycode-messages.js';
|
|
60
|
+
import { MONKEYCODE_DEFAULT_MAX_TOKENS, buildMonkeycodeMessagesPayload, consumeMonkeycodeSse, monkeycodeThinkingFor, } from './monkeycode-messages.js';
|
|
52
61
|
import { monkeycodeDirectFetch } from './monkeycode-http.js';
|
|
53
62
|
/** 单次请求允许最多换几个账号(防止池里 20 个坏 key 时打满上游)。 */
|
|
54
63
|
const MONKEYCODE_MAX_ROTATE = 4;
|
|
64
|
+
/**
|
|
65
|
+
* 已经为「目录未声明 maxTokens 的模型」告警过的 id。
|
|
66
|
+
*
|
|
67
|
+
* 只告警一次:这类模型每一轮都会走到兜底值,每轮刷一条没有信息量。
|
|
68
|
+
*/
|
|
69
|
+
const warnedMissingMaxTokens = new Set();
|
|
55
70
|
/** 限流冷却:1 小时。 */
|
|
56
71
|
const MONKEYCODE_RATE_LIMIT_COOLDOWN_MS = 3_600_000;
|
|
57
72
|
/**
|
|
@@ -168,6 +183,17 @@ export class MonkeycodeAdapter extends LlmAdapter {
|
|
|
168
183
|
const thinking = options.purpose === 'session-title'
|
|
169
184
|
? { type: 'disabled' }
|
|
170
185
|
: monkeycodeThinkingFor(options.reasoningEffort);
|
|
186
|
+
// ⚠️ 目录**没有**声明 `defaultMaxTokens` 时宿主不下发 `maxTokens`,出站只能
|
|
187
|
+
// 回落到 4096 ⇒ 长回答被静默截断(`finish_reason=max_tokens` 而正文 0 字,
|
|
188
|
+
// 正是本 PR 要修的那个症状)。`glm-5` 就是这种:它既无 `maxTokens` 也无
|
|
189
|
+
// `contextWindow`。这里**不编**上限(编了就是拿假设换真故障),只把
|
|
190
|
+
// 「你正在踩这个坑」说清楚 —— 否则症状与「上游就这德行」同形,无法诊断。
|
|
191
|
+
if (options.maxTokens === undefined && !warnedMissingMaxTokens.has(options.model)) {
|
|
192
|
+
warnedMissingMaxTokens.add(options.model);
|
|
193
|
+
this.warn(`[monkeycode] 模型 ${options.model} 未在目录里声明 maxTokens ⇒ 出站回落 `
|
|
194
|
+
+ `${MONKEYCODE_DEFAULT_MAX_TOKENS},长回答可能被截断。`
|
|
195
|
+
+ '请在 src/monkeycode-product.ts 的网关模型表里补上实测值。');
|
|
196
|
+
}
|
|
171
197
|
const payload = buildMonkeycodeMessagesPayload({
|
|
172
198
|
model: options.model,
|
|
173
199
|
messages: options.messages,
|
|
@@ -398,6 +424,12 @@ export class MonkeycodeAdapter extends LlmAdapter {
|
|
|
398
424
|
...model.contextWindow !== undefined && model.contextWindow > 0
|
|
399
425
|
? { contextWindow: model.contextWindow }
|
|
400
426
|
: {},
|
|
427
|
+
// ⚠️ 输出上限必须走 `CatalogEntry.maxTokens`(宿主映射成 `defaultMaxTokens`)。
|
|
428
|
+
// 写进 `context` 是无效的:`LlmModelContext` 只认 `contextWindow`,
|
|
429
|
+
// `normalizeModelInfo` 会白名单重建并静默丢掉多写的键。
|
|
430
|
+
...model.maxTokens !== undefined && model.maxTokens > 0
|
|
431
|
+
? { maxTokens: model.maxTokens }
|
|
432
|
+
: {},
|
|
401
433
|
};
|
|
402
434
|
}
|
|
403
435
|
async loadCatalogEntries() {
|