creditdaddy 1.7.1 → 1.7.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/build.json +3 -3
- package/package.json +1 -1
- package/src/authDevice.js +3 -1
- package/src/buildInfo.js +33 -0
- package/src/checkin.js +6 -2
- package/src/constants.js +3 -2
- package/src/cookieSites.js +1 -1
- package/src/daemon.js +43 -15
- package/src/i18n/en.json +2002 -1980
- package/src/i18n/ja.json +2002 -1980
- package/src/i18n/ko.json +2002 -1980
- package/src/i18n/zh-TW.json +2002 -1980
- package/src/lingxiClient.js +46 -5
- package/src/minimaxClient.js +86 -28
- package/src/minimaxLocal.js +22 -0
- package/src/panel.html +5638 -5528
- package/src/providers.js +18 -4
- package/src/riverClient.js +55 -12
- package/src/store.js +1 -0
- package/src/tenrouterAccounts.js +232 -222
- package/src/traeAuth.js +127 -58
- package/src/traeClient.js +25 -2
- package/src/traeGateway.js +100 -37
- package/src/transfer.js +20 -1
- package/src/workbuddyLocal.js +35 -4
package/src/traeAuth.js
CHANGED
|
@@ -44,20 +44,29 @@ import http from 'node:http';
|
|
|
44
44
|
import os from 'node:os';
|
|
45
45
|
import { FETCH_TIMEOUT_MS } from './constants.js';
|
|
46
46
|
|
|
47
|
-
/**
|
|
47
|
+
/** 授权页域:国内站 www.trae.cn / 国际站 www.trae.ai(#99:两站同协议同 client_id,
|
|
48
|
+
* 账号不互通——站点由 GetLoginGuidance 返回的 LoginHost 权威决定)。 */
|
|
48
49
|
const CONSOLE_BASE_CN = 'https://www.trae.cn';
|
|
49
|
-
const
|
|
50
|
+
const CONSOLE_BASE_INTL = 'https://www.trae.ai';
|
|
51
|
+
const CLIENT_ID = 'ono9krqynydwx5';
|
|
50
52
|
const AUTH_FROM = 'trae';
|
|
51
|
-
/**
|
|
53
|
+
/** 版本指纹常量:CN 来自真机客户端登录 URL 实抓样本(3.4.9 / 插件 2.3.97430);
|
|
54
|
+
* 国际版按 10R 口径(product.json 实测 3.6.4),上游更新后在此换。 */
|
|
52
55
|
const PLUGIN_VERSION = '2.3.97430';
|
|
53
|
-
const
|
|
56
|
+
const APP_VERSION_CN = '3.4.9';
|
|
57
|
+
const APP_VERSION_INTL = '3.6.4';
|
|
54
58
|
const APP_TYPE = 'stable';
|
|
55
|
-
/** 换票主机白名单(
|
|
56
|
-
*
|
|
57
|
-
|
|
59
|
+
/** 换票主机白名单(hostname 级):host 参数来自回调查询串(浏览器可控),拦 SSRF。
|
|
60
|
+
* CN 族 = api.trae.cn 系;国际族 = grow-normal 系(AuthCode v3 换票主机,10R #99 实测
|
|
61
|
+
* grow-normal.trae.ai / growsg-normal.trae.ai / USTTP 账号面 grow-normal.traeapi.us)
|
|
62
|
+
* + 老族兜底。回环放行是给本仓联调 / 测试用的。 */
|
|
63
|
+
const EXCHANGE_HOST_ALLOW_CN = ['api.trae.cn', 'api.trae.com.cn', 'api.marscode.cn', 'www.trae.cn'];
|
|
64
|
+
const EXCHANGE_HOST_ALLOW_INTL = ['grow-normal.trae.ai', 'growsg-normal.trae.ai', 'grow-normal.traeapi.us', 'api.trae.ai', 'api.marscode.com', 'www.trae.ai'];
|
|
58
65
|
const LOOPBACK_HOSTS = ['127.0.0.1', 'localhost', '::1', '[::1]'];
|
|
59
|
-
/** 换票回落主机:回调没带 host
|
|
60
|
-
|
|
66
|
+
/** 换票回落主机:回调没带 host(上游版本差异)时用。CN 真机实测打 api.trae.cn;
|
|
67
|
+
* 国际按 10R authCodeOrigins 顺序(growsg 优先,USTTP 账号面 traeapi.us 兜底)。 */
|
|
68
|
+
const EXCHANGE_HOST_FALLBACK_CN = 'https://api.trae.cn';
|
|
69
|
+
const EXCHANGE_HOST_FALLBACK_INTL = 'https://growsg-normal.trae.ai';
|
|
61
70
|
/** 回调端口候选:真机 3.4.9 客户端用 3379;workbuddy 钉旧版观察到 17388。 */
|
|
62
71
|
const CALLBACK_PORTS = [3379, 17388];
|
|
63
72
|
const LOGIN_TIMEOUT_MS = 5 * 60_000;
|
|
@@ -106,18 +115,34 @@ function osProfile() {
|
|
|
106
115
|
};
|
|
107
116
|
}
|
|
108
117
|
|
|
118
|
+
/** 站点上下文:由 kind 归一('trae'=CN / 'trae-intl'=国际),集中全部按站点分叉的常量。 */
|
|
119
|
+
function siteContext(kind) {
|
|
120
|
+
return { intl: kind === 'trae-intl' };
|
|
121
|
+
}
|
|
122
|
+
|
|
123
|
+
/** 站点权威判定:LoginHost / 回调 host 反推(10R traeRegionFromHost 同款后缀表)。 */
|
|
124
|
+
function isIntlHost(host) {
|
|
125
|
+
const h = String(host || '').trim().toLowerCase().replace(/^https?:\/\//, '').split('/')[0];
|
|
126
|
+
if (!h) return null;
|
|
127
|
+
if (/(^|\.)trae\.cn$|(^|\.)trae\.com\.cn$|(^|\.)marscode\.cn$/.test(h)) return false;
|
|
128
|
+
if (/(^|\.)trae\.ai$|(^|\.)marscode\.com$|(^|\.)traeapi\.us$/.test(h)) return true;
|
|
129
|
+
return null;
|
|
130
|
+
}
|
|
131
|
+
|
|
109
132
|
/** 拼内层授权 URL(22 参数,顺序与真机客户端抓包逐字一致——不要按语义重排)。 */
|
|
110
|
-
export function buildAuthorizeUrl({ port, traceId, challenge, identity }) {
|
|
133
|
+
export function buildAuthorizeUrl({ port, traceId, challenge, identity, intl = false }) {
|
|
111
134
|
const system = osProfile();
|
|
112
135
|
const callback = `http://127.0.0.1:${port}/authorize`;
|
|
113
136
|
const enc = encodeURIComponent;
|
|
114
|
-
const
|
|
137
|
+
const appVersion = intl ? APP_VERSION_INTL : APP_VERSION_CN;
|
|
138
|
+
const consoleBase = intl ? CONSOLE_BASE_INTL : CONSOLE_BASE_CN;
|
|
139
|
+
const inner = `${consoleBase}/authorization`
|
|
115
140
|
+ `?login_version=1`
|
|
116
141
|
+ `&auth_from=${AUTH_FROM}`
|
|
117
142
|
+ `&login_channel=native_ide`
|
|
118
143
|
+ `&plugin_version=${PLUGIN_VERSION}`
|
|
119
144
|
+ `&auth_type=local`
|
|
120
|
-
+ `&client_id=${
|
|
145
|
+
+ `&client_id=${CLIENT_ID}`
|
|
121
146
|
+ `&redirect=0`
|
|
122
147
|
+ `&login_trace_id=${traceId}`
|
|
123
148
|
+ `&auth_callback_url=${enc(callback)}`
|
|
@@ -129,13 +154,13 @@ export function buildAuthorizeUrl({ port, traceId, challenge, identity }) {
|
|
|
129
154
|
+ `&x_device_type=${enc(process.platform)}`
|
|
130
155
|
+ `&x_os_version=${enc(system.osVersion)}`
|
|
131
156
|
+ `&x_env=`
|
|
132
|
-
+ `&x_app_version=${
|
|
157
|
+
+ `&x_app_version=${appVersion}`
|
|
133
158
|
+ `&x_app_type=${APP_TYPE}`
|
|
134
159
|
+ `&code_challenge=${challenge}`
|
|
135
160
|
+ `&code_challenge_method=S256`
|
|
136
161
|
+ `&channel_name=common`;
|
|
137
162
|
// 外层包装与真机客户端一致(/login?login_platform=trae&redirect_url=<内层>)
|
|
138
|
-
return `${
|
|
163
|
+
return `${consoleBase}/login?login_platform=trae&redirect_url=${enc(inner)}`;
|
|
139
164
|
}
|
|
140
165
|
|
|
141
166
|
/** 回调查询解析:先剥到 ? 后(req.url 带着路径前缀)、按 & 切 → 整体反复解码(浏览器/页面
|
|
@@ -181,7 +206,7 @@ function jsonIntField(obj, keys) {
|
|
|
181
206
|
return 0;
|
|
182
207
|
}
|
|
183
208
|
|
|
184
|
-
/** 解析回调参数 → {authCode, userInfo, host, region, traceId, error}(muskke parseCallback 同款容错)。 */
|
|
209
|
+
/** 解析回调参数 → {authCode, userInfo, host, region, intl, traceId, error}(muskke parseCallback 同款容错)。 */
|
|
185
210
|
export function parseCallbackParams(params) {
|
|
186
211
|
const raw = params.authCodeInfo || params.auth_code_info || params.AuthCodeInfo || '';
|
|
187
212
|
let authCode = jsonStringField(params, ['authCode', 'auth_code', 'AuthCode', 'authorization_code', 'code']);
|
|
@@ -206,22 +231,27 @@ export function parseCallbackParams(params) {
|
|
|
206
231
|
name: user ? jsonStringField(user, ['ScreenName', 'screenName', 'nickname']) : null,
|
|
207
232
|
host,
|
|
208
233
|
region,
|
|
234
|
+
// 站点权威判定:回调 host 反推(LoginHost 由 GetLoginGuidance 下发并跟 authorize 全程)
|
|
235
|
+
intl: isIntlHost(host),
|
|
209
236
|
traceId: jsonStringField(params, ['loginTraceID', 'loginTraceId', 'login_trace_id']),
|
|
210
237
|
error: jsonStringField(params, ['error', 'error_description']),
|
|
211
238
|
};
|
|
212
239
|
}
|
|
213
240
|
|
|
214
|
-
/** 换票主机白名单校验(hostname
|
|
215
|
-
|
|
241
|
+
/** 换票主机白名单校验(hostname 级;按站点族放行,跨族一律回落本族 fallback——拦 SSRF
|
|
242
|
+
* 也拦「国内回调拿去国际端点换票」这类站错队)。回环放行给联调 / 测试。 */
|
|
243
|
+
export function resolveExchangeHost(host, { intl = false } = {}) {
|
|
216
244
|
const raw = String(host || '').trim().replace(/\/+$/, '');
|
|
217
245
|
const name = raw.split('://').pop()?.split('/')[0]?.split(':')[0]?.toLowerCase() || '';
|
|
218
|
-
|
|
246
|
+
const allow = intl ? EXCHANGE_HOST_ALLOW_INTL : EXCHANGE_HOST_ALLOW_CN;
|
|
247
|
+
const fallback = intl ? EXCHANGE_HOST_FALLBACK_INTL : EXCHANGE_HOST_FALLBACK_CN;
|
|
248
|
+
if (!name) return { host: fallback, usedFallback: 'missing' };
|
|
219
249
|
if (LOOPBACK_HOSTS.includes(name)) return { host: raw, usedFallback: null };
|
|
220
|
-
if (
|
|
221
|
-
return { host:
|
|
250
|
+
if (allow.includes(name)) return { host: raw.startsWith('http') ? raw : `https://${raw}`, usedFallback: null };
|
|
251
|
+
return { host: fallback, usedFallback: 'rejected' };
|
|
222
252
|
}
|
|
223
253
|
|
|
224
|
-
function deviceInfoPayload(identity) {
|
|
254
|
+
function deviceInfoPayload(identity, appVersion) {
|
|
225
255
|
const system = osProfile();
|
|
226
256
|
return {
|
|
227
257
|
DeviceID: identity.deviceId,
|
|
@@ -230,7 +260,7 @@ function deviceInfoPayload(identity) {
|
|
|
230
260
|
DeviceType: 'PC',
|
|
231
261
|
DeviceName: system.deviceName,
|
|
232
262
|
DeviceModel: system.deviceModel,
|
|
233
|
-
ClientVersion:
|
|
263
|
+
ClientVersion: appVersion,
|
|
234
264
|
DevicePublicKey: identity.publicKeyPem,
|
|
235
265
|
DeviceBrand: system.deviceBrand,
|
|
236
266
|
DeviceCPU: system.cpu,
|
|
@@ -239,13 +269,26 @@ function deviceInfoPayload(identity) {
|
|
|
239
269
|
};
|
|
240
270
|
}
|
|
241
271
|
|
|
242
|
-
/** 响应字段容错:
|
|
272
|
+
/** 响应字段容错:v3 端点的真机契约是**嵌套 Result.***(10Router #99 换票对照实验:
|
|
273
|
+
* Result.Token / Result.RefreshToken / Result.RefreshExpireAt 毫秒)——HTTP 200 却按
|
|
274
|
+
* 扁平字段读会解析成「无 token」,误判失败降级旧端点吃 10101(2026-11-11 用户实测:
|
|
275
|
+
* 授权页成功、面板报 ExchangeToken/DeviceInfo: HTTP 200)。扁平形态保留兜底
|
|
276
|
+
* (更老的回调/端点形态,muskke TokenData 同款)。 */
|
|
243
277
|
function pickToken(body) {
|
|
278
|
+
const nested = (body?.Result && typeof body.Result === 'object') ? body.Result
|
|
279
|
+
: (body?.result && typeof body.result === 'object') ? body.result
|
|
280
|
+
: (body?.data && typeof body.data === 'object') ? body.data
|
|
281
|
+
: {};
|
|
244
282
|
return {
|
|
245
|
-
accessToken: jsonStringField(body
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
283
|
+
accessToken: jsonStringField(body, ['accessToken', 'access_token'])
|
|
284
|
+
|| jsonStringField(nested, ['AccessToken', 'Token', 'accessToken', 'token']),
|
|
285
|
+
refreshToken: jsonStringField(body, ['refreshToken', 'refresh_token', 'RefreshToken'])
|
|
286
|
+
|| jsonStringField(nested, ['RefreshToken', 'refreshToken', 'refresh_token']),
|
|
287
|
+
// RefreshExpireAt(毫秒)优先——v3 契约的 refresh 寿命字段;ExpiresAt 系兜底
|
|
288
|
+
expiresAtMs: jsonIntField(nested, ['RefreshExpireAt', 'ExpiresAt', 'expiresAt', 'expire_at'])
|
|
289
|
+
|| jsonIntField(body, ['expiresAt', 'expires_at', 'ExpireAt', 'expireAt']),
|
|
290
|
+
expiresInSec: jsonIntField(body, ['expiresIn', 'expires_in'])
|
|
291
|
+
|| jsonIntField(nested, ['ExpiresIn', 'expiresIn']),
|
|
249
292
|
};
|
|
250
293
|
}
|
|
251
294
|
|
|
@@ -270,31 +313,47 @@ async function postJson(url, payload, extraHeaders = {}) {
|
|
|
270
313
|
return { res, body, text };
|
|
271
314
|
}
|
|
272
315
|
|
|
273
|
-
/** AuthCode 换 token
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
|
|
316
|
+
/** AuthCode 换 token:CN 真机验证的三段降级(新端点带 DeviceInfo → 旧端点扁平体 AuthCode/Code);
|
|
317
|
+
* 国际线保持 10R 实测的单段 v3(grow-normal 族未观察到需要降级,#99 全链验证)。 */
|
|
318
|
+
export async function exchangeAuthCode({ host, authCode, codeVerifier, identity, intl = false }) {
|
|
319
|
+
const appVersion = intl ? APP_VERSION_INTL : APP_VERSION_CN;
|
|
320
|
+
const attempts = intl
|
|
321
|
+
? [
|
|
322
|
+
{
|
|
323
|
+
tag: 'ExchangeToken/DeviceInfo',
|
|
324
|
+
url: `${host}/trae/api/v3/oauth/ExchangeToken`,
|
|
325
|
+
payload: {
|
|
326
|
+
ClientID: CLIENT_ID,
|
|
327
|
+
AuthCode: authCode,
|
|
328
|
+
CodeVerifier: codeVerifier,
|
|
329
|
+
DeviceInfo: deviceInfoPayload(identity, appVersion),
|
|
330
|
+
IDEVersion: appVersion,
|
|
331
|
+
},
|
|
285
332
|
},
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
|
|
291
|
-
|
|
292
|
-
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
|
|
333
|
+
]
|
|
334
|
+
: [
|
|
335
|
+
{
|
|
336
|
+
tag: 'ExchangeToken/DeviceInfo',
|
|
337
|
+
url: `${host}/trae/api/v3/oauth/ExchangeToken`,
|
|
338
|
+
payload: {
|
|
339
|
+
ClientID: CLIENT_ID,
|
|
340
|
+
AuthCode: authCode,
|
|
341
|
+
CodeVerifier: codeVerifier,
|
|
342
|
+
DeviceInfo: deviceInfoPayload(identity, appVersion),
|
|
343
|
+
IDEVersion: appVersion,
|
|
344
|
+
},
|
|
345
|
+
},
|
|
346
|
+
{
|
|
347
|
+
tag: 'ExchangeToken/AuthCode',
|
|
348
|
+
url: `${host}/cloudide/api/v3/trae/oauth/ExchangeToken`,
|
|
349
|
+
payload: { ClientID: CLIENT_ID, AuthCode: authCode, CodeVerifier: codeVerifier, DeviceID: identity.deviceId, PlatformCode: 'IDE_PC' },
|
|
350
|
+
},
|
|
351
|
+
{
|
|
352
|
+
tag: 'ExchangeToken/Code',
|
|
353
|
+
url: `${host}/cloudide/api/v3/trae/oauth/ExchangeToken`,
|
|
354
|
+
payload: { ClientID: CLIENT_ID, Code: authCode, CodeVerifier: codeVerifier, DeviceID: identity.deviceId, PlatformCode: 'IDE_PC' },
|
|
355
|
+
},
|
|
356
|
+
];
|
|
298
357
|
const errors = [];
|
|
299
358
|
for (const a of attempts) {
|
|
300
359
|
let r;
|
|
@@ -383,9 +442,11 @@ async function bindCallbackServer(session, ports) {
|
|
|
383
442
|
throw new Error(`Trae 回调端口都被占用(${errors.join(';')})——请关掉占用 3379/17388 的程序(可能是正在登录的 Trae 客户端)后重试`);
|
|
384
443
|
}
|
|
385
444
|
|
|
386
|
-
/** 发起一次浏览器授权登录。kind
|
|
445
|
+
/** 发起一次浏览器授权登录。kind:'trae'(国内站)/ 'trae-intl'(国际站,10R #99 同协议)。
|
|
446
|
+
* 授权 URL 直接用本站 console 域(与真机客户端一致——客户端不打 GetLoginGuidance 拿
|
|
447
|
+
* 授权域,回调里的换票 host 由授权页下发,按站点白名单放行)。 */
|
|
387
448
|
export async function startTraeLogin(kind, { ports = CALLBACK_PORTS } = {}) {
|
|
388
|
-
|
|
449
|
+
const site = siteContext(kind === 'trae-intl' ? 'trae-intl' : 'trae');
|
|
389
450
|
gcSessions();
|
|
390
451
|
const identity = newDeviceIdentity();
|
|
391
452
|
const verifier = crypto.randomBytes(48).toString('base64url');
|
|
@@ -393,6 +454,7 @@ export async function startTraeLogin(kind, { ports = CALLBACK_PORTS } = {}) {
|
|
|
393
454
|
const traceId = crypto.randomUUID();
|
|
394
455
|
const session = {
|
|
395
456
|
identity, verifier, traceId,
|
|
457
|
+
intl: site.intl,
|
|
396
458
|
result: null, error: null, settledAt: 0,
|
|
397
459
|
deadline: Date.now() + LOGIN_TIMEOUT_MS,
|
|
398
460
|
};
|
|
@@ -401,7 +463,7 @@ export async function startTraeLogin(kind, { ports = CALLBACK_PORTS } = {}) {
|
|
|
401
463
|
session.port = port;
|
|
402
464
|
const loginId = crypto.randomUUID();
|
|
403
465
|
sessions.set(loginId, session);
|
|
404
|
-
const url = buildAuthorizeUrl({ port, traceId, challenge, identity });
|
|
466
|
+
const url = buildAuthorizeUrl({ port, traceId, challenge, identity, intl: site.intl });
|
|
405
467
|
return {
|
|
406
468
|
url,
|
|
407
469
|
expiresInMs: LOGIN_TIMEOUT_MS,
|
|
@@ -445,12 +507,14 @@ export async function pollTraeLogin(data) {
|
|
|
445
507
|
|
|
446
508
|
// 旧契约直接带 token 的版本:跳过换票
|
|
447
509
|
if (info.directAccessToken && !info.authCode) {
|
|
510
|
+
const intlDirect = info.intl !== null ? info.intl : Boolean(session.intl);
|
|
448
511
|
return buildLoginResult({
|
|
449
512
|
accessToken: info.directAccessToken,
|
|
450
513
|
refreshToken: info.directRefreshToken,
|
|
451
514
|
identity: session.identity,
|
|
452
515
|
host: info.host,
|
|
453
516
|
region: info.region,
|
|
517
|
+
intl: intlDirect,
|
|
454
518
|
uid: info.uid,
|
|
455
519
|
name: info.name,
|
|
456
520
|
expiresAtMs: 0,
|
|
@@ -458,14 +522,17 @@ export async function pollTraeLogin(data) {
|
|
|
458
522
|
}
|
|
459
523
|
if (!info.authCode) throw new Error('回调里没有 AuthCode(授权页协议可能又变了),请重新发起或更新 CreditDaddy');
|
|
460
524
|
|
|
461
|
-
|
|
462
|
-
const
|
|
525
|
+
// 站点裁决:回调 host 反推 → 缺失/判不出时用本次登录的发起站点(startTraeLogin 定)
|
|
526
|
+
const intl = info.intl !== null ? info.intl : Boolean(session.intl);
|
|
527
|
+
const resolved = resolveExchangeHost(info.host, { intl });
|
|
528
|
+
const t = await exchangeAuthCode({ host: resolved.host, authCode: info.authCode, codeVerifier: session.verifier, identity: session.identity, intl });
|
|
463
529
|
return buildLoginResult({
|
|
464
530
|
accessToken: t.accessToken,
|
|
465
531
|
refreshToken: t.refreshToken,
|
|
466
532
|
identity: session.identity,
|
|
467
533
|
host: info.host || resolved.host,
|
|
468
534
|
region: info.region,
|
|
535
|
+
intl,
|
|
469
536
|
uid: info.uid,
|
|
470
537
|
name: info.name,
|
|
471
538
|
expiresAtMs: t.expiresAtMs,
|
|
@@ -481,7 +548,7 @@ function uidFromJwt(jwt) {
|
|
|
481
548
|
} catch { return { uid: null, exp: 0 }; }
|
|
482
549
|
}
|
|
483
550
|
|
|
484
|
-
function buildLoginResult({ accessToken, refreshToken, identity, host, region, uid, name, expiresAtMs, expiresInSec = 0, exchangeFallback }) {
|
|
551
|
+
function buildLoginResult({ accessToken, refreshToken, identity, host, region, intl = false, uid, name, expiresAtMs, expiresInSec = 0, exchangeFallback }) {
|
|
485
552
|
const jwt = uidFromJwt(accessToken);
|
|
486
553
|
const finalUid = uid || jwt.uid || null;
|
|
487
554
|
let expiresAt = null;
|
|
@@ -511,8 +578,10 @@ function buildLoginResult({ accessToken, refreshToken, identity, host, region, u
|
|
|
511
578
|
traeDevice: device,
|
|
512
579
|
traeHost: host || null,
|
|
513
580
|
traeRegion: region || null,
|
|
581
|
+
// 国际账号标记(切客户端选 exe / 10R 推送护栏 / 签到额度跳过口径都读它)
|
|
582
|
+
...(intl ? { isIntl: true } : {}),
|
|
514
583
|
traeExchangeFallback: exchangeFallback || undefined,
|
|
515
|
-
clientVersion:
|
|
584
|
+
clientVersion: intl ? APP_VERSION_INTL : APP_VERSION_CN,
|
|
516
585
|
pluginVersion: PLUGIN_VERSION,
|
|
517
586
|
capturedAt: new Date().toISOString(),
|
|
518
587
|
},
|
package/src/traeClient.js
CHANGED
|
@@ -102,8 +102,30 @@ export function traeDevice(uid, storedDeviceId, attempt = 0) {
|
|
|
102
102
|
};
|
|
103
103
|
}
|
|
104
104
|
|
|
105
|
-
function traeHeaders(jwt, dev) {
|
|
105
|
+
function traeHeaders(jwt, dev, intl = false) {
|
|
106
106
|
const token = jwt.startsWith('Cloud-IDE-JWT ') ? jwt : `Cloud-IDE-JWT ${jwt.trim()}`;
|
|
107
|
+
if (intl) {
|
|
108
|
+
// 国际版(trae.ai / grow-normal 族,10R SOLO intl 网关口径):区域与包型跟着站点走
|
|
109
|
+
return {
|
|
110
|
+
accept: '*/*',
|
|
111
|
+
'accept-language': 'en-US',
|
|
112
|
+
authorization: token,
|
|
113
|
+
'content-type': 'application/json',
|
|
114
|
+
'user-agent': 'VSCode 1.107.1 (TRAE SOLO INTL)',
|
|
115
|
+
'x-market-client-id': 'VSCode 1.107.1',
|
|
116
|
+
'x-market-user-id': dev.marketUserId,
|
|
117
|
+
'x-user-region': 'SG',
|
|
118
|
+
'x-device-id': dev.deviceId,
|
|
119
|
+
'x-lgw-req-sdk-type': '3',
|
|
120
|
+
'package-type': 'stable',
|
|
121
|
+
'x-request-id': hex(16),
|
|
122
|
+
'x-lscbd-aid': '787976',
|
|
123
|
+
'x-lscbd-platform': process.platform === 'win32' ? 'windows' : process.platform,
|
|
124
|
+
'app-version': '0.1.45',
|
|
125
|
+
'x-tt-trace-id': `00-${hex(8)}-01`,
|
|
126
|
+
'vscode-sessionid': dev.sessionId,
|
|
127
|
+
};
|
|
128
|
+
}
|
|
107
129
|
return {
|
|
108
130
|
accept: '*/*',
|
|
109
131
|
'accept-language': 'zh-CN',
|
|
@@ -142,10 +164,11 @@ async function post(url, account, body = {}, attempt = 0, storedDeviceId) {
|
|
|
142
164
|
const jwt = account.token;
|
|
143
165
|
if (!jwt) throw new Error('账号缺少 Trae 登录 token(请到 Trae 客户端登录后用「本机导入」同步)');
|
|
144
166
|
const uid = account.uid || uidFromJwt(jwt);
|
|
167
|
+
const intl = account.provider === 'trae-intl' || Boolean(account.meta?.isIntl);
|
|
145
168
|
const dev = traeDevice(uid || 'anonymous', storedDeviceId !== undefined ? storedDeviceId : account.meta?.deviceId, attempt);
|
|
146
169
|
const res = await fetchJsonRace(url, {
|
|
147
170
|
method: 'POST',
|
|
148
|
-
headers: traeHeaders(jwt, dev),
|
|
171
|
+
headers: traeHeaders(jwt, dev, intl),
|
|
149
172
|
body: JSON.stringify(body),
|
|
150
173
|
timeoutMs: FETCH_TIMEOUT_MS,
|
|
151
174
|
});
|
package/src/traeGateway.js
CHANGED
|
@@ -4,12 +4,19 @@
|
|
|
4
4
|
* 数据面端点:POST /gateway/trae/v1/messages
|
|
5
5
|
* (上游为 ByteDance Trae SOLO 远程 Agent 协议:https://solo.trae.cn/api/remote/v1)
|
|
6
6
|
*
|
|
7
|
+
* 双通道(同步 10Router 44b2bb27):普通模型走**直连非沙箱通道**
|
|
8
|
+
* (agent_type: "chat" + env: "local",不开云端沙箱容器,纯文本对话更快更省);
|
|
9
|
+
* 模型名显式含 solo/work/agent- 的走 SOLO 沙箱通道(solo_agent_remote + remote)。
|
|
10
|
+
* 服务端 chat_v3 的 ConfigName 严格区分大小写,模型名先过 canonicalTraeModel
|
|
11
|
+
* 规范化(传错报 4001 config empty)。
|
|
12
|
+
*
|
|
7
13
|
* 架构特性:
|
|
8
14
|
* 1. 账号多路轮换(provider=trae):自动在有效账号间按剩余积分加权轮询(SWRR)
|
|
9
15
|
* 2. 凭据热对齐:401 时若为本机导入账号,尝试重读 storage.json 最新登录态
|
|
10
16
|
* 3. 429 限流保护:429 限流自动冷却(退避阶梯 30s → 1min → 2min → 5min → 10min 封顶,成功一次即清零)
|
|
11
17
|
* 4. 局域网访问控制:继承相同的白名单与回环检查机制
|
|
12
|
-
* 5. SSE 增量转换:将 Trae
|
|
18
|
+
* 5. SSE 增量转换:将 Trae 累积流(沙箱 plan_item.thought / 直连 content/delta/text)
|
|
19
|
+
* 转换为标准 Anthropic 流式 SSE 或一次性 JSON 响应
|
|
13
20
|
*/
|
|
14
21
|
|
|
15
22
|
import { fetchJsonRace } from './zcodeClient.js';
|
|
@@ -29,6 +36,93 @@ const UPSTREAM_TIMEOUT_MS = 600_000;
|
|
|
29
36
|
const UPSTREAM_CONNECT_MS = 15_000;
|
|
30
37
|
const DEFAULT_MODEL = 'Doubao-Seed-Code';
|
|
31
38
|
|
|
39
|
+
// 模型名规范化映射(同步 10Router CANONICAL_TRAE_MODELS,#99 真机口径:
|
|
40
|
+
// 服务端严格区分大小写,传错 4001 config empty);表外原样透传。
|
|
41
|
+
const CANONICAL_TRAE_MODELS = {
|
|
42
|
+
'doubao-seed-code': 'Doubao-Seed-Code',
|
|
43
|
+
'doubao-seed-2.1-turbo': 'Doubao-Seed-2.1-Turbo',
|
|
44
|
+
'doubao-seed-2.1-pro': 'Doubao-Seed-2.1-Pro',
|
|
45
|
+
'doubao-seed-2.0-code': 'Doubao-Seed-2.0-Code',
|
|
46
|
+
'doubao-seed-evolving': 'Doubao-Seed-Evolving',
|
|
47
|
+
'deepseek-v4.1-flash': 'DeepSeek-V4-Flash',
|
|
48
|
+
'deepseek-v4-flash': 'DeepSeek-V4-Flash',
|
|
49
|
+
'deepseek-v4-pro': 'DeepSeek-V4-Pro',
|
|
50
|
+
'deepseek-v4-pro-official': 'DeepSeek-V4-Pro-Official',
|
|
51
|
+
'glm-5.3': 'GLM-5.3',
|
|
52
|
+
'glm-5.3-flash': 'GLM-5.3-Flash',
|
|
53
|
+
'glm-5.3-flashx': 'GLM-5.3-FlashX',
|
|
54
|
+
'kimi-k3.1-pro': 'Kimi-K3.1-Pro',
|
|
55
|
+
'kimi-k3': 'Kimi-K3',
|
|
56
|
+
'minimax-m3.1-flash': 'MiniMax-M3.1-Flash',
|
|
57
|
+
'minimax-m3': 'MiniMax-M3',
|
|
58
|
+
'step-5-preview': 'Step-5-Preview',
|
|
59
|
+
'qwen3.8-flash': 'qwen3.8-flash',
|
|
60
|
+
'qwen3.8-max': 'qwen3.8-max',
|
|
61
|
+
'mimo-v2.6-flash': 'mimo-v2.6-flash',
|
|
62
|
+
'mimo-v2.6-pro': 'mimo-v2.6-pro',
|
|
63
|
+
};
|
|
64
|
+
|
|
65
|
+
export function canonicalTraeModel(model) {
|
|
66
|
+
if (!model) return '';
|
|
67
|
+
return CANONICAL_TRAE_MODELS[String(model).trim().toLowerCase()] || model;
|
|
68
|
+
}
|
|
69
|
+
|
|
70
|
+
// 显式要求 SOLO 沙箱通道的模型名(含 solo/work/agent- 字样);其余走直连非沙箱
|
|
71
|
+
export function isSoloAgentMode(model = '') {
|
|
72
|
+
const m = String(model).trim().toLowerCase();
|
|
73
|
+
return m.includes('solo') || m.includes('work') || m.startsWith('agent-');
|
|
74
|
+
}
|
|
75
|
+
|
|
76
|
+
// mode/strategy 判定(同步 10Router resolveMode):work 族 = mode work + auto + 空模型名;
|
|
77
|
+
// auto/空 = mode code + auto;其余 = mode code + manual + 规范化模型名
|
|
78
|
+
export function resolveTraeMode(model = '') {
|
|
79
|
+
const m = String(model || '').trim().toLowerCase();
|
|
80
|
+
if (m === 'work' || m === 'auto-work' || m === 'solo-work') {
|
|
81
|
+
return { mode: 'work', strategy: 'auto', modelName: '' };
|
|
82
|
+
}
|
|
83
|
+
const auto = !m || m === 'auto';
|
|
84
|
+
return { mode: 'code', strategy: auto ? 'auto' : 'manual', modelName: auto ? '' : canonicalTraeModel(model) };
|
|
85
|
+
}
|
|
86
|
+
|
|
87
|
+
/** 会话载荷构造(按通道分流):直连 = agent_type chat + env local;沙箱 = solo_agent_remote + remote */
|
|
88
|
+
export function buildTraeSessionPayload(promptText, requestedModel) {
|
|
89
|
+
const { mode, strategy, modelName } = resolveTraeMode(requestedModel);
|
|
90
|
+
const solo = isSoloAgentMode(requestedModel);
|
|
91
|
+
return {
|
|
92
|
+
mode,
|
|
93
|
+
environment_id: 'default',
|
|
94
|
+
initial_message: {
|
|
95
|
+
chat_session_id: '',
|
|
96
|
+
content: [],
|
|
97
|
+
query: JSON.stringify([{ type: 'text', data: { content: promptText } }]),
|
|
98
|
+
model_name: modelName,
|
|
99
|
+
agent_type: solo ? 'solo_agent_remote' : 'chat',
|
|
100
|
+
model_selection_strategy: strategy,
|
|
101
|
+
common_params: JSON.stringify({
|
|
102
|
+
language: 'zh-cn',
|
|
103
|
+
app_language: 'zh-cn',
|
|
104
|
+
quality: 'stable',
|
|
105
|
+
app_version: '1.0.0.1229',
|
|
106
|
+
web_id: '',
|
|
107
|
+
user_identity: 'Free',
|
|
108
|
+
is_freshman: '0',
|
|
109
|
+
biz_user_id: '',
|
|
110
|
+
user_unique_id: '',
|
|
111
|
+
scope: 'marscode-cn',
|
|
112
|
+
tenant: 'marscode',
|
|
113
|
+
region: 'CN',
|
|
114
|
+
aiRegion: 'CN',
|
|
115
|
+
is_privacy_mode: 0,
|
|
116
|
+
privacy_mode: 'off',
|
|
117
|
+
solo_chat_mode: mode,
|
|
118
|
+
}),
|
|
119
|
+
},
|
|
120
|
+
env: solo ? 'remote' : 'local',
|
|
121
|
+
auto_create_project: false,
|
|
122
|
+
origin: 'web',
|
|
123
|
+
};
|
|
124
|
+
}
|
|
125
|
+
|
|
32
126
|
// ── 开关(持久化在 settings.traeGateway) ──
|
|
33
127
|
|
|
34
128
|
export async function gatewayEnabled() {
|
|
@@ -388,39 +482,7 @@ export async function handleGateway(req, res) {
|
|
|
388
482
|
const label = account.name || account.uid || account.id;
|
|
389
483
|
|
|
390
484
|
let token = account.token;
|
|
391
|
-
const sessionPayload =
|
|
392
|
-
mode: 'code',
|
|
393
|
-
environment_id: 'default',
|
|
394
|
-
initial_message: {
|
|
395
|
-
chat_session_id: '',
|
|
396
|
-
content: [],
|
|
397
|
-
query: JSON.stringify([{ type: 'text', data: { content: promptText } }]),
|
|
398
|
-
model_name: requestedModel,
|
|
399
|
-
agent_type: 'solo_agent_remote',
|
|
400
|
-
model_selection_strategy: 'manual',
|
|
401
|
-
common_params: JSON.stringify({
|
|
402
|
-
language: 'zh-cn',
|
|
403
|
-
app_language: 'zh-cn',
|
|
404
|
-
quality: 'stable',
|
|
405
|
-
app_version: '1.0.0.1229',
|
|
406
|
-
web_id: '',
|
|
407
|
-
user_identity: 'Free',
|
|
408
|
-
is_freshman: '0',
|
|
409
|
-
biz_user_id: '',
|
|
410
|
-
user_unique_id: '',
|
|
411
|
-
scope: 'marscode-cn',
|
|
412
|
-
tenant: 'marscode',
|
|
413
|
-
region: 'CN',
|
|
414
|
-
aiRegion: 'CN',
|
|
415
|
-
is_privacy_mode: 0,
|
|
416
|
-
privacy_mode: 'off',
|
|
417
|
-
solo_chat_mode: 'code',
|
|
418
|
-
}),
|
|
419
|
-
},
|
|
420
|
-
env: 'remote',
|
|
421
|
-
auto_create_project: false,
|
|
422
|
-
origin: 'web',
|
|
423
|
-
};
|
|
485
|
+
const sessionPayload = buildTraeSessionPayload(promptText, requestedModel);
|
|
424
486
|
|
|
425
487
|
const makeHeaders = (tok) => ({
|
|
426
488
|
Authorization: tok.startsWith('Cloud-IDE-JWT ') ? tok : `Cloud-IDE-JWT ${tok.trim()}`,
|
|
@@ -633,8 +695,9 @@ export async function handleGateway(req, res) {
|
|
|
633
695
|
});
|
|
634
696
|
}
|
|
635
697
|
|
|
636
|
-
// 2. Text delta
|
|
637
|
-
|
|
698
|
+
// 2. Text delta:兼顾沙箱通道的 plan_item.thought 与直连 chat 通道的
|
|
699
|
+
// content / delta.content / text(同步 10Router renderNewText 字段链)
|
|
700
|
+
const candidateText = data.thought || data.content || data.delta?.content || data.text || data.tool_call_info?.params?.summary || '';
|
|
638
701
|
if (candidateText && candidateText.length > emittedText.length) {
|
|
639
702
|
const delta = candidateText.slice(emittedText.length);
|
|
640
703
|
emittedText = candidateText;
|
|
@@ -724,7 +787,7 @@ export async function handleGateway(req, res) {
|
|
|
724
787
|
try {
|
|
725
788
|
const data = JSON.parse(raw);
|
|
726
789
|
if (data.reasoning_content) fullThinking = data.reasoning_content;
|
|
727
|
-
const t = data.thought || data.tool_call_info?.params?.summary;
|
|
790
|
+
const t = data.thought || data.content || data.delta?.content || data.text || data.tool_call_info?.params?.summary;
|
|
728
791
|
if (t) fullText = t;
|
|
729
792
|
if (data.prompt_tokens !== undefined || data.last_turn_total_tokens !== undefined) {
|
|
730
793
|
usageInfo = data;
|
package/src/transfer.js
CHANGED
|
@@ -93,6 +93,20 @@ export function openTransfer(blob, password) {
|
|
|
93
93
|
}
|
|
94
94
|
|
|
95
95
|
/** 构造导出载荷(10router 兼容字段 + CreditDaddy 旧字段) */
|
|
96
|
+
/**
|
|
97
|
+
* Trae 设备身份的出站整理(10Router 签到侧要用已注册设备号防 9074):
|
|
98
|
+
* - psd 增补 creditDaddyTraeDevice(deviceId/machineId,无敏感件)——10R 导入端本来就
|
|
99
|
+
* 持久化 psd,deviceId 零改动即达;隔壁曾计划「导入端把 meta.traeDevice 收进 psd」,
|
|
100
|
+
* 现在不需要了。
|
|
101
|
+
* - meta.traeDevice 剥掉 privateKeyJwk:EC P-256 私钥只服务 CD 本机的 DeviceProof
|
|
102
|
+
* 签名(refresh 链),签到接口用不到,不随载荷出本机。
|
|
103
|
+
*/
|
|
104
|
+
function stripDevicePrivateKey(provider, meta) {
|
|
105
|
+
if (!String(provider).startsWith('trae') || !meta?.traeDevice?.privateKeyJwk) return meta;
|
|
106
|
+
const { privateKeyJwk: _drop, ...rest } = meta.traeDevice;
|
|
107
|
+
return { ...meta, traeDevice: rest };
|
|
108
|
+
}
|
|
109
|
+
|
|
96
110
|
export function buildExportPayload(accounts, { provider, product } = {}) {
|
|
97
111
|
const list = accounts.filter((a) => (!provider || a.provider === provider) && (!product || productOf(a.provider) === product));
|
|
98
112
|
const providers = [...new Set(list.map((a) => a.provider))];
|
|
@@ -124,8 +138,13 @@ export function buildExportPayload(accounts, { provider, product } = {}) {
|
|
|
124
138
|
...(a.meta?.qoderWebSession?.cookie && String(a.provider).startsWith('qoder')
|
|
125
139
|
? { creditDaddyWebSession: { cookie: a.meta.qoderWebSession.cookie, capturedAt: a.meta.qoderWebSession.capturedAt || null, userId: a.uid || null } }
|
|
126
140
|
: {}),
|
|
141
|
+
// Trae 设备号(CD 登录注册的那台):10R 签到用同一设备号防 9074 设备风控;
|
|
142
|
+
// meta.traeDevice 里的私钥已在 stripDevicePrivateKey 剥除,不随载荷出本机
|
|
143
|
+
...(String(a.provider).startsWith('trae') && a.meta?.traeDevice?.deviceId
|
|
144
|
+
? { creditDaddyTraeDevice: { deviceId: a.meta.traeDevice.deviceId, machineId: a.meta.traeDevice.machineId || null } }
|
|
145
|
+
: {}),
|
|
127
146
|
},
|
|
128
|
-
...(a.meta && Object.keys(a.meta).length ? { meta: a.meta } : {}),
|
|
147
|
+
...(a.meta && Object.keys(a.meta).length ? { meta: stripDevicePrivateKey(a.provider, a.meta) } : {}),
|
|
129
148
|
})),
|
|
130
149
|
};
|
|
131
150
|
}
|