creditdaddy 1.6.3 → 1.6.6

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/src/providers.js CHANGED
@@ -17,6 +17,7 @@ import { fetchCatpawQuota, fetchCatpawProfile } from './catpawClient.js';
17
17
  import { fetchTraeQuota, checkinTrae, verifyTraeAccount } from './traeClient.js';
18
18
  import { fetchMiniMaxQuota, checkinMiniMax, verifyMiniMaxAccount } from './minimaxClient.js';
19
19
  import { fetchDoubaoStatus, checkinDoubao } from './doubaoClient.js';
20
+ import { fetchLoomyQuota, verifyLoomyAccount } from './loomyClient.js';
20
21
  /** 从 userinfo 响应中挑一个可读的显示名 */
21
22
  export function displayNameFrom(ui) {
22
23
  const pick = [ui?.nickname, ui?.name, ui?.username, ui?.email]
@@ -230,6 +231,14 @@ const PRODUCTS = {
230
231
  };
231
232
  },
232
233
  },
234
+ loomy: {
235
+ label: '讯飞 Loomy',
236
+ quota: (account) => fetchLoomyQuota(account),
237
+ verify: (account) => verifyLoomyAccount(account),
238
+ },
239
+ // 码道 CodeArts(issue #40)已于 2026-10-30 撤下:华为云控制台会话受闲置超时 +
240
+ // WAF 指印绑定,本机无法续期,实测当日内即失效,无法支撑每日定时签到。详见
241
+ // cookieSites.js 末尾的口径说明。
233
242
  };
234
243
 
235
244
  /** 包裹 MiniMax 的 ctx.onRefresh:回写账号库后,安全同步新凭据回本机 auth.json(仅本机导入账号且客户端未运行时) */
package/src/qoderApp.js CHANGED
@@ -292,6 +292,8 @@ function riskRunner(provider) {
292
292
  if (app) return { exe: app.runtimeInfo, env: (VARIANTS.find((v) => v.provider === provider) || VARIANTS[0]).riskEnv, source: 'app' };
293
293
  const cli = installedUmid() || bundledCliUmid(provider);
294
294
  if (cli) return { exe: cli.path, env: CLI_RISK_ENV[provider] ?? CLI_RISK_ENV.qoder, source: 'cli' };
295
+ const localBin = qodercliRuntimeInfo(provider);
296
+ if (localBin) return { exe: localBin, env: CLI_RISK_ENV[provider] ?? CLI_RISK_ENV.qoder, source: 'cli' };
295
297
  return null;
296
298
  }
297
299
 
@@ -311,6 +313,27 @@ function bundledCliUmid(provider) {
311
313
  return null;
312
314
  }
313
315
 
316
+ /** macOS:官方 qodercli(@qoder-ai/qodercli)把 runtime-info 设备身份组件解压到 ~\.qoder\.bin\runtime-info-darwin-<arch>-*(国内版 ~\.qoder-cn) */
317
+ function qodercliRuntimeInfo(provider) {
318
+ if (process.platform !== 'darwin') return null;
319
+ const homes = provider === 'qoder-cn' ? ['.qoder-cn', '.qoder'] : ['.qoder', '.qoder-cn'];
320
+ for (const h of homes) {
321
+ const bin = path.join(os.homedir(), h, '.bin');
322
+ let entries = [];
323
+ try { entries = fs.readdirSync(bin, { withFileTypes: true }).filter((n) => n.name.startsWith(`runtime-info-darwin-${process.arch}`)); } catch {}
324
+ if (!entries.length) continue;
325
+ // 版本排序(1.2.10 > 1.2.9,字典序会反);目录形态时拼组件名,文件形态直接用;
326
+ // 必须 exists 校验——升级残留的旧条目/坏条目不能静默选中
327
+ const ver = (name) => name.split('-').slice(-1)[0].split('.').map((x) => Number(x) || 0);
328
+ const cmp = (a, b) => { const va = ver(a), vb = ver(b); for (let i = 0; i < Math.max(va.length, vb.length); i++) { if ((va[i] || 0) !== (vb[i] || 0)) return (va[i] || 0) - (vb[i] || 0); } return 0; };
329
+ for (const e of entries.sort((a, b) => cmp(b.name, a.name))) {
330
+ const p = e.isDirectory() ? path.join(bin, e.name, RUNTIME_INFO_EXE) : path.join(bin, e.name);
331
+ try { if (fs.statSync(p).isFile()) return p; } catch { /* 坏条目跳过,试下一个 */ }
332
+ }
333
+ }
334
+ return null;
335
+ }
336
+
314
337
  /** 获取某账号的设备风控身份;本机既没有 Qoder 客户端也没装设备身份组件时返回 null。 */
315
338
  export async function getRiskIdentity(provider, uid) {
316
339
  if (!uid) return null;
@@ -55,8 +55,10 @@ export async function exchangePatToJobToken(pat, isCn = false) {
55
55
  const text = await res.text().catch(() => '');
56
56
  throw new Error(`PAT 兑换失败: HTTP ${res.status} ${text.slice(0, 120)}`);
57
57
  }
58
- const data = await res.json();
59
- if (!data.token) throw new Error('PAT 兑换未返回 job token');
58
+ // 200 但 body 非 JSON(边缘节点 HTML 拦截页/空响应):裸 res.json() 抛 SyntaxError,
59
+ // resolveToken 的兜底 catch 会把它报成「token 不可用」,用户冤枉地去重导 token
60
+ const data = await res.json().catch(() => null);
61
+ if (!data?.token) throw new Error('PAT 兑换未返回 job token(响应非 JSON 或缺 token)');
60
62
  return { jobToken: data.token, expiresAt: data.expires_at || null };
61
63
  }
62
64
 
@@ -84,7 +86,9 @@ export async function fetchUserinfo(account) {
84
86
  preferProxy: account.provider === 'qoder',
85
87
  });
86
88
  if (!res.ok) throw new Error(`userinfo HTTP ${res.status}`);
87
- return res.json();
89
+ const data = await res.json().catch(() => null);
90
+ if (!data || typeof data !== 'object') throw new Error(`userinfo 响应非 JSON(HTTP ${res.status})`);
91
+ return data;
88
92
  }
89
93
 
90
94
  /** 查询配额/积分用量 */
@@ -97,7 +101,9 @@ export async function fetchQuotaUsage(account) {
97
101
  });
98
102
  if (res.status === 401 || res.status === 403) throw new Error(`鉴权失败 (HTTP ${res.status}),token 可能已过期`);
99
103
  if (!res.ok) throw new Error(`quota HTTP ${res.status}`);
100
- return res.json();
104
+ const data = await res.json().catch(() => null);
105
+ if (!data || typeof data !== 'object') throw new Error(`quota 响应非 JSON(HTTP ${res.status})`);
106
+ return data;
101
107
  }
102
108
 
103
109
  function webHeaders(cookie, provider) {
@@ -135,7 +141,9 @@ export async function fetchUsageDetail(account) {
135
141
  throw err;
136
142
  }
137
143
  if (!res.ok) throw new Error(`usage detail HTTP ${res.status}`);
138
- return res.json();
144
+ const data = await res.json().catch(() => null);
145
+ if (!data || typeof data !== 'object') return null; // 结构异常按「无明细」回落聚合数据
146
+ return data;
139
147
  }
140
148
 
141
149
  /**
@@ -174,7 +182,8 @@ async function getCampaigns(base, headers) {
174
182
  throw err;
175
183
  }
176
184
  if (!res.ok) throw new Error(`活动列表 HTTP ${res.status}`);
177
- const payload = await res.json();
185
+ const payload = await res.json().catch(() => null);
186
+ if (!payload || typeof payload !== 'object') throw new Error(`活动列表响应非 JSON(HTTP ${res.status})`);
178
187
  return {
179
188
  uid: typeof payload?.uid === 'string' ? payload.uid : null,
180
189
  campaigns: Array.isArray(payload?.campaigns) ? payload.campaigns : [],
@@ -103,6 +103,11 @@ export async function verifyQuotaRefresh({ source, exp, sig }, { nowMs } = {}) {
103
103
  const hits = new Map(); // ip → number[]
104
104
  export function refreshRateLimited(ip, { limit = 20, windowMs = 60_000, nowMs } = {}) {
105
105
  const now = nowMs ?? Date.now();
106
+ // 顺手清掉整个窗口都没动静的来源:公网/网段扫描器每个 IP 都会占一条,永不回收
107
+ for (const [k, v] of hits) {
108
+ const last = v.length ? v[v.length - 1] : 0;
109
+ if (now - last >= windowMs) hits.delete(k);
110
+ }
106
111
  const arr = (hits.get(ip) || []).filter((t) => now - t < windowMs);
107
112
  arr.push(now);
108
113
  hits.set(ip, arr);
package/src/store.js CHANGED
@@ -59,7 +59,14 @@ export async function atomicWrite(file, content, { retries = 6 } = {}) {
59
59
  path.dirname(file),
60
60
  `.tmp-${path.basename(file)}-${crypto.randomBytes(4).toString('hex')}`
61
61
  );
62
- await fs.writeFile(tmp, content, { mode: 0o600 });
62
+ try {
63
+ await fs.writeFile(tmp, content, { mode: 0o600 });
64
+ } catch (e) {
65
+ // 首写就失败(ENOSPC/EPERM):清掉半截临时文件再上抛,否则数据目录里
66
+ // 每次失败都多一个 .tmp-* 残骸
67
+ await fs.unlink(tmp).catch(() => {});
68
+ throw e;
69
+ }
63
70
  const doRename = renameImpl || ((a, b) => fs.rename(a, b));
64
71
  let transientRetries = 0;
65
72
  try {
@@ -231,7 +238,7 @@ export function publicAccount(a) {
231
238
  qoderWebDead: String(a.provider).startsWith('qoder')
232
239
  ? (meta.qoderWebDead?.at || null)
233
240
  : null,
234
- canSwitch: Boolean(meta.session?.account || meta.credentials || meta.qoderAuth || a.provider === 'catpaw' || a.provider === 'trae'),
241
+ canSwitch: Boolean(meta.session?.account || meta.credentials || meta.qoderAuth || a.provider === 'catpaw' || a.provider === 'trae' || a.provider === 'loomy'),
235
242
  verified: a.verified ?? null,
236
243
  createdAt: a.createdAt,
237
244
  lastCheckin: a.lastCheckin,
package/src/tenrouter.js CHANGED
@@ -44,20 +44,37 @@ const SOURCES_VERSION = 3; // 3: 新增 10Router 本机实例来源(10r)
44
44
 
45
45
  export function loadConfig() {
46
46
  try {
47
- const c = JSON.parse(fs.readFileSync(FILE(), 'utf8'));
48
- const sync = { ...DEFAULT_CONFIG.sync, ...(c.sync || {}) };
49
- const quotaPush = { ...DEFAULT_CONFIG.quotaPush, ...(c.quotaPush || {}) };
50
- const accountSync = { ...DEFAULT_CONFIG.accountSync, ...(c.accountSync || {}) };
51
- // 旧配置里的 sources 是保存时的快照,会盖掉新增来源(妙手因此被静默关掉);
52
- // 只把此后新增的来源默认并入,用户手动关掉的保持关闭。
53
- const savedVersion = Number(c.sync?.sourcesVersion) || 1;
54
- if (savedVersion < SOURCES_VERSION) {
55
- sync.sources = (Array.isArray(sync.sources) ? [...sync.sources] : [...SOURCES]);
56
- for (const s of SOURCES) if (!LEGACY_SOURCES.includes(s) && !sync.sources.includes(s)) sync.sources.push(s);
57
- sync.sourcesVersion = SOURCES_VERSION;
47
+ return normalizeLoaded(JSON.parse(fs.readFileSync(FILE(), 'utf8')));
48
+ } catch (e) {
49
+ // 只有「文件不存在」才回默认值。EPERM/EBUSY(杀软/同步盘瞬时占用)或 JSON 损坏时
50
+ // 返回默认对象,下一个 withConfig 会把「默认值 + 本轮改动」整份写回——端点、key、
51
+ // 同步水位全部被静默抹掉,且 catpaw 的 sentTotals 清零会让历史用量整段重发。宁可报错。
52
+ if (e.code === 'ENOENT') return structuredClone(DEFAULT_CONFIG);
53
+ if (e instanceof SyntaxError) {
54
+ try {
55
+ const bak = JSON.parse(fs.readFileSync(FILE() + '.bak', 'utf8'));
56
+ console.error('tenrouter: 配置文件损坏,已用备份恢复 ' + FILE() + '.bak');
57
+ return normalizeLoaded(bak);
58
+ } catch { /* 备份也没有/同坏——按原错误上抛,禁止用默认值覆盖现场 */ }
58
59
  }
59
- return { ...DEFAULT_CONFIG, ...c, sync, quotaPush, accountSync, syncState: c.syncState || {} };
60
- } catch { return structuredClone(DEFAULT_CONFIG); }
60
+ throw new Error(`读取 ${FILE()} 失败: ${e.message}`);
61
+ }
62
+ }
63
+
64
+ // loadConfig 的归一化(旧配置 sources 快照迁移等,主文件与 .bak 同一形状)
65
+ function normalizeLoaded(c) {
66
+ const sync = { ...DEFAULT_CONFIG.sync, ...(c.sync || {}) };
67
+ const quotaPush = { ...DEFAULT_CONFIG.quotaPush, ...(c.quotaPush || {}) };
68
+ const accountSync = { ...DEFAULT_CONFIG.accountSync, ...(c.accountSync || {}) };
69
+ // 旧配置里的 sources 是保存时的快照,会盖掉新增来源(妙手因此被静默关掉);
70
+ // 只把此后新增的来源默认并入,用户手动关掉的保持关闭。
71
+ const savedVersion = Number(c.sync?.sourcesVersion) || 1;
72
+ if (savedVersion < SOURCES_VERSION) {
73
+ sync.sources = (Array.isArray(sync.sources) ? [...sync.sources] : [...SOURCES]);
74
+ for (const s of SOURCES) if (!LEGACY_SOURCES.includes(s) && !sync.sources.includes(s)) sync.sources.push(s);
75
+ sync.sourcesVersion = SOURCES_VERSION;
76
+ }
77
+ return { ...DEFAULT_CONFIG, ...c, sync, quotaPush, accountSync, syncState: c.syncState || {} };
61
78
  }
62
79
 
63
80
  // 配置落盘走 store.atomicWrite:Windows 上杀软/同步盘瞬时占文件会直接 EPERM,
@@ -65,7 +82,18 @@ export function loadConfig() {
65
82
  async function saveConfig(c) {
66
83
  fs.mkdirSync(dataDir(), { recursive: true, mode: 0o700 });
67
84
  const { atomicWrite } = await import('./store.js');
68
- await atomicWrite(FILE(), JSON.stringify(c, null, 2));
85
+ const file = FILE();
86
+ // 同 saveAccounts:写前留一份 .bak,主文件损坏(断电半写/杀软截断)时 loadConfig 有路可回。
87
+ // 只有主文件本身可解析时才允许它覆盖 .bak——否则「从 .bak 恢复后第一次保存」会把
88
+ // 仍损坏的主文件内容写进 .bak,把唯一的退路也毁掉
89
+ try {
90
+ const existing = fs.readFileSync(file, 'utf8');
91
+ if (existing.trim().length > 2) {
92
+ JSON.parse(existing); // 抛 = 主文件是坏的,.bak 保持原样
93
+ await atomicWrite(file + '.bak', existing);
94
+ }
95
+ } catch { /* 主文件不存在/读不了/已损坏:没有可备份的,.bak 不动 */ }
96
+ await atomicWrite(file, JSON.stringify(c, null, 2));
69
97
  }
70
98
 
71
99
  // 读改写串行,避免面板保存与后台同步互相覆盖
@@ -335,7 +363,14 @@ export function startUsageSyncScheduler() {
335
363
  let lastSyncAt = 0;
336
364
  let lastPushAt = 0;
337
365
  const tick = () => {
338
- const c = loadConfig();
366
+ // loadConfig 在读失败(杀软/同步盘瞬时占用、JSON 损坏且无备份)时会抛——
367
+ // setInterval 回调里的未捕获异常会直接干掉整个 daemon(无 uncaughtException 兜底),
368
+ // 跳过这一轮即可,下一轮再试
369
+ let c;
370
+ try { c = loadConfig(); } catch (e) {
371
+ logger.warn('10R', '调度轮读取配置失败,跳过本轮:{err}', { err: e.message });
372
+ return;
373
+ }
339
374
  if (!isConfigured(c)) return;
340
375
  const now = Date.now();
341
376
  // 1) 用量同步:每 1 小时一轮(需开启自动开关)
@@ -22,6 +22,7 @@ export const TENROUTER_PROVIDER_MAP = {
22
22
  workbuddy: 'codebuddy-cn',
23
23
  'workbuddy-intl': 'codebuddy-intl',
24
24
  tokenharbor: 'tokenharbor-free', // #23:会话 cookie 只喂「额度监控卡」(freeTier,不走路由);tokenharbor 钱包卡留给 sk- 运输 key
25
+ loomy: 'loomy',
25
26
  // zcode → glm:等 zcode 反代就绪后补一行(同步流程已就绪,无需改代码)
26
27
  };
27
28
 
package/src/traeClient.js CHANGED
@@ -52,14 +52,32 @@ function seeded(uid, salt, n) {
52
52
  return out.slice(0, n);
53
53
  }
54
54
 
55
+ /**
56
+ * 同机多账号的设备分离(issue #28):同一个真机 deviceId 只能给「该设备的首账号」用
57
+ * (服务端按设备限每日一领,第二个号起必吃 9074)。首账号按账号顺序定,与签到轮顺序一致。
58
+ * 返回 Set<accountId>;调用方对非首账号不得传 storedDeviceId(走派生号)。
59
+ */
60
+ export function traePrimaryIds(accounts) {
61
+ const seen = new Set();
62
+ const primary = new Set();
63
+ for (const a of accounts || []) {
64
+ if (!a || a.provider !== 'trae') continue;
65
+ const dev = String(a.meta?.deviceId || '').trim();
66
+ if (!dev || seen.has(dev)) continue;
67
+ seen.add(dev);
68
+ primary.add(a.id);
69
+ }
70
+ return primary;
71
+ }
72
+
55
73
  export function traeDevice(uid, storedDeviceId, attempt = 0) {
56
74
  // 首选**登录时注册的真机号**(meta.deviceId,本机导入时从 storage.json 抓的):
57
75
  // 服务端大概率把「号-设备」绑在登录时注册的那台上——陌生设备号打接口吃 9074
58
76
  //(issue #31 报告者实测派生号一律被拒、同一时刻真机号可领;本机实测同现象:
59
77
  // 导入首日派生号签到成功,之后每天 9074,重试换派生号 3 轮也全拒)。
60
- // attempt>0 才走派生:多账号同机时真机号只有一个,第二个账号起服务端按设备限
61
- // 每日一领会拒(issue #28,TraeTools 的「设备码切换」本质就是给每号换独立设备码),
62
- // 此时轮换派生号,至少有一个号能落在服务端风控放行的窗口里。
78
+ // 注意:同机导入的 N 个账号 meta.deviceId 相同(traeLocal 导入时盖同一个值)——
79
+ // 真机号只能给该设备的首账号(见 traePrimaryIds),其余账号由调用方传 null 走派生,
80
+ // 否则第二个号起每天 9074(issue #28 的回归)。attempt>0 一律轮换派生号。
63
81
  if (attempt === 0 && storedDeviceId && /^\d{8,}$/.test(String(storedDeviceId))) {
64
82
  const m = seeded(`${uid}`, 'market:0', 16);
65
83
  m[6] = (m[6] & 0x0f) | 0x40;
@@ -118,12 +136,13 @@ function findField(obj, key, depth = 0) {
118
136
  return undefined;
119
137
  }
120
138
 
121
- /** 统一 POST → { status, body };401 / code 1001 抛 auth 错误(凭据失效)。attempt 透传给设备派生(9074 轮换重试用) */
122
- async function post(url, account, body = {}, attempt = 0) {
139
+ /** 统一 POST → { status, body };401 / code 1001 抛 auth 错误(凭据失效)。attempt 透传给设备派生(9074 轮换重试用)。
140
+ * storedDeviceId 显式传 null = 强制走派生号(同机非首账号,见 traePrimaryIds);缺省读 account.meta.deviceId */
141
+ async function post(url, account, body = {}, attempt = 0, storedDeviceId) {
123
142
  const jwt = account.token;
124
143
  if (!jwt) throw new Error('账号缺少 Trae 登录 token(请到 Trae 客户端登录后用「本机导入」同步)');
125
144
  const uid = account.uid || uidFromJwt(jwt);
126
- const dev = traeDevice(uid || 'anonymous', account.meta?.deviceId, attempt);
145
+ const dev = traeDevice(uid || 'anonymous', storedDeviceId !== undefined ? storedDeviceId : account.meta?.deviceId, attempt);
127
146
  const res = await fetchJsonRace(url, {
128
147
  method: 'POST',
129
148
  headers: traeHeaders(jwt, dev),
@@ -233,9 +252,12 @@ export async function checkinTrae(account, ctx = {}) {
233
252
  const uid = account.uid || uidFromJwt(account.token || '');
234
253
  const label = account.name || account.id;
235
254
  const base = { accountId: account.id, account: label, provider: 'trae' };
255
+ // 同机多账号:真机号只给该 deviceId 的首账号(ctx.traePrimaryIds 由签到循环按全量
256
+ // trae 账号算好),非首账号强制派生号——否则第二个号起每天 9074(issue #28)
257
+ const devArg = (!ctx.traePrimaryIds || ctx.traePrimaryIds.has(account.id)) ? undefined : null;
236
258
  let r;
237
259
  try {
238
- r = await post(STATUS_URL, account);
260
+ r = await post(STATUS_URL, account, {}, 0, devArg);
239
261
  } catch (e) {
240
262
  if (authDead(e)) throw e;
241
263
  return { ...base, status: 'failed', message: e.message, uid };
@@ -251,7 +273,7 @@ export async function checkinTrae(account, ctx = {}) {
251
273
  // 注册的设备号。因此重试时**轮换派生设备号**(attempt 递增),退避 + 换号双管齐下;
252
274
  // 重试耗尽归 failed(不写签到 memo,下一轮还试)
253
275
  if (r.code === 9074) {
254
- return finalizeClaim(await claimWithRetry(ctx, (i) => post(CLAIM_URL, account, {}, i)), base, uid, TRAE_DEFAULT_DAILY_CREDITS);
276
+ return finalizeClaim(await claimWithRetry(ctx, (i) => post(CLAIM_URL, account, {}, i, devArg)), base, uid, TRAE_DEFAULT_DAILY_CREDITS);
255
277
  }
256
278
  return { ...base, status: 'failed', message: withCode(r.message || `code ${r.code}`, r.code), uid };
257
279
  }
@@ -264,7 +286,7 @@ export async function checkinTrae(account, ctx = {}) {
264
286
  // claim 接口有时只返回 { code: 0, message: "success" } 而不包含 credits 字段,作为 fallback 避免 +0
265
287
  const expectedCredits = Number(findField(r.body, 'credits') ?? findField(r.body, 'extra_credits')) || TRAE_DEFAULT_DAILY_CREDITS;
266
288
 
267
- return finalizeClaim(await claimWithRetry(ctx, (i) => post(CLAIM_URL, account, {}, i)), base, uid, expectedCredits);
289
+ return finalizeClaim(await claimWithRetry(ctx, (i) => post(CLAIM_URL, account, {}, i, devArg)), base, uid, expectedCredits);
268
290
  }
269
291
 
270
292
  /**
@@ -45,6 +45,27 @@ export async function setGatewayEnabled(v) {
45
45
  }
46
46
  }
47
47
 
48
+ /** 丢弃错误响应的 body:不读不取消的 undici body 会把连接钉住到服务端关闭或 ~300s 超时
49
+ * (429 风暴时每个失败尝试泄漏一条 socket)。cancel 即可,错误体不需要内容。 */
50
+ function drainErr(res) {
51
+ try { res?.body?.cancel?.()?.catch?.(() => {}); } catch { /* 已读/已取消 */ }
52
+ }
53
+
54
+ /** 账号被删除时清掉它在各轮换 Map 里的残留(daemon DELETE /api/accounts/:id 调用) */
55
+ export function forgetAccount(id) {
56
+ cooling.delete(id);
57
+ coolingStreak.delete(id);
58
+ dead.delete(id);
59
+ weights.delete(id);
60
+ swrr.delete(id);
61
+ // 在途的权重刷新 resolve 后会把 id 写回 weights——清掉 inflight 句柄,
62
+ // 让它落地时发现 Map 里已无自己(weightRefresh 的 finally 只删「仍是自己」的条目),
63
+ // 否则删号后残留条目永不回收(无界增长泄漏)
64
+ const inflight = weightInflight.get(id);
65
+ weightInflight.delete(id);
66
+ if (inflight) inflight.catch(() => {}).then(() => { weights.delete(id); swrr.delete(id); });
67
+ }
68
+
48
69
  // ── 账号轮换状态(进程内) ──
49
70
 
50
71
  const cooling = new Map(); // accountId → 冷却截止(ms)
@@ -53,6 +74,8 @@ const coolingStreak = new Map();
53
74
  const dead = new Map(); // accountId → 拉黑时的凭据指纹(指纹变化 = 已重新授权/导入,自动复活)
54
75
  const weights = new Map(); // accountId → { w: 剩余积分权重, at: 查询时刻 }
55
76
  const WEIGHT_TTL_MS = 10 * 60_000; // 超过 10 分钟重查额度,让积分变化反映到分流上
77
+ const WEIGHT_REFRESH_CAP_MS = 2_000; // 请求路径等新权重的上限;超时先用旧快照,刷新转后台
78
+ const weightInflight = new Map(); // accountId → 刷新中 Promise(并发请求共用一次查询)
56
79
 
57
80
  export const stats = {
58
81
  lastCallAt: null,
@@ -107,6 +130,7 @@ export function __resetForTests() {
107
130
  coolingStreak.clear();
108
131
  dead.clear();
109
132
  weights.clear();
133
+ weightInflight.clear();
110
134
  swrr.clear();
111
135
  stats.lastCallAt = null;
112
136
  stats.calls = 0;
@@ -116,15 +140,40 @@ export function __resetForTests() {
116
140
  async function accountWeight(a) {
117
141
  const hit = weights.get(a.id);
118
142
  if (hit && Date.now() - hit.at < WEIGHT_TTL_MS) return hit.w;
119
- let w = hit?.w ?? MIN_WEIGHT;
143
+ const fallback = hit?.w ?? MIN_WEIGHT;
144
+ // 请求路径只等一个很短的上限:额度接口健康时(通常亚秒)照常拿到新权重精准分流;
145
+ // 上游黑洞时最多等这么久就先用旧快照——刷新仍在后台继续,下一个请求就有新值。
146
+ // 此前是完整等待额度查询(两个 POST,各 15s 上限)且逐号串行,一个黑洞的上游
147
+ // 能让权重过期后的第一个补全请求卡 1-2 分钟
148
+ const refresh = weightRefresh(a);
149
+ let timer;
150
+ const capped = new Promise((r) => { timer = setTimeout(() => r(fallback), WEIGHT_REFRESH_CAP_MS); });
120
151
  try {
121
- const q = await fetchTraeQuota(a);
122
- w = Math.max(MIN_WEIGHT, Number(q?.remaining) || 0);
123
- } catch {
124
- // 额度查询失败保留上次快照权重(网络抖动不该把主力踢成保底权重)
152
+ return await Promise.race([refresh, capped]);
153
+ } finally {
154
+ clearTimeout(timer);
125
155
  }
126
- weights.set(a.id, { w, at: Date.now() });
127
- return w;
156
+ }
157
+
158
+ /** 去重后的权重刷新:并发请求共用同一次额度查询;查询失败保留旧快照权重(时间戳仍刷新,避免每请求都撞同一坏接口) */
159
+ function weightRefresh(a) {
160
+ const existing = weightInflight.get(a.id);
161
+ if (existing) return existing;
162
+ const run = (async () => {
163
+ const hit = weights.get(a.id);
164
+ let w = hit?.w ?? MIN_WEIGHT;
165
+ try {
166
+ const q = await fetchTraeQuota(a);
167
+ w = Math.max(MIN_WEIGHT, Number(q?.remaining) || 0);
168
+ } catch {
169
+ // 额度查询失败保留上次快照权重(网络抖动不该把主力踢成保底权重)
170
+ }
171
+ weights.set(a.id, { w, at: Date.now() });
172
+ return w;
173
+ })();
174
+ weightInflight.set(a.id, run);
175
+ run.finally(() => { if (weightInflight.get(a.id) === run) weightInflight.delete(a.id); }).catch(() => {});
176
+ return run;
128
177
  }
129
178
 
130
179
  const swrr = new Map();
@@ -133,16 +182,20 @@ function ensureSwrr(id) { if (!swrr.has(id)) swrr.set(id, 0); }
133
182
  async function rotationQueue() {
134
183
  const all = (await loadAccounts()).filter((a) => a.provider === 'trae');
135
184
  const now = Date.now();
136
- const ready = [];
185
+ const candidates = [];
137
186
  for (const a of all) {
138
187
  if (isDead(a)) continue;
139
188
  if ((cooling.get(a.id) || 0) > now) continue;
140
189
  if (!a.token) continue;
141
190
  ensureSwrr(a.id);
142
- const w = await accountWeight(a);
143
- swrr.set(a.id, (swrr.get(a.id) || 0) + w);
144
- ready.push({ account: a, weight: w });
191
+ candidates.push(a);
145
192
  }
193
+ // 权重并行取(各自 2s 封顶),不再逐号串行等——N 个账号的最坏停顿从 N×上限变成 1 个上限
194
+ const ws = await Promise.all(candidates.map((a) => accountWeight(a)));
195
+ const ready = candidates.map((a, i) => {
196
+ swrr.set(a.id, (swrr.get(a.id) || 0) + ws[i]);
197
+ return { account: a, weight: ws[i] };
198
+ });
146
199
  if (!ready.length) return [];
147
200
 
148
201
  let pick = ready[0];
@@ -323,6 +376,9 @@ export async function handleGateway(req, res) {
323
376
  const attempted = [];
324
377
  const clientAbort = new AbortController();
325
378
  req.once('close', () => { if (!res.writableEnded) clientAbort.abort(); });
379
+ // 优雅断开(客户端 fetch abort 在上游响应前)只触发 res 'close',不触发 req 'close'
380
+ // ——少这一个钩子,取消后还会真的创建 SOLO 会话烧掉额度
381
+ res.once('close', () => { if (!res.writableEnded) clientAbort.abort(); });
326
382
 
327
383
  for (let i = 0; i < Math.min(MAX_ATTEMPTS, queue.length); i++) {
328
384
  const account = queue[i];
@@ -414,6 +470,7 @@ export async function handleGateway(req, res) {
414
470
  }
415
471
 
416
472
  if (sessionRes.status === 401) {
473
+ drainErr(sessionRes);
417
474
  markDead(account);
418
475
  attempted.push({ account: label, ok: false, error: 'Token 彻底失效 (401),拉黑' });
419
476
  logger.info('TRAE-GW', '{label} 凭据失效,拉黑', { label });
@@ -421,6 +478,7 @@ export async function handleGateway(req, res) {
421
478
  }
422
479
 
423
480
  if (sessionRes.status === 429) {
481
+ drainErr(sessionRes);
424
482
  const ms = markRateLimited(account.id);
425
483
  const dur = formatDurationMs(ms);
426
484
  const streak = coolingStreak.get(account.id);
@@ -431,6 +489,7 @@ export async function handleGateway(req, res) {
431
489
 
432
490
  const sessionData = await sessionRes.json().catch(() => null);
433
491
  if (!sessionRes.ok || sessionData?.code !== 0 || !sessionData?.data?.chat_session_id) {
492
+ drainErr(sessionRes);
434
493
  const errMsg = sessionData?.message || `HTTP ${sessionRes.status}`;
435
494
  attempted.push({ account: label, ok: false, error: `会话创建失败: ${errMsg}` });
436
495
  continue;
@@ -439,11 +498,13 @@ export async function handleGateway(req, res) {
439
498
  const chatSessionId = sessionData.data.chat_session_id;
440
499
  const messageId = sessionData.data.message_id;
441
500
 
442
- // 清理 session 的辅助函数
501
+ // 清理 session 的辅助函数。不挂 clientAbort 信号——客户端取消时恰恰要执行这里的
502
+ // 清理;DELETE 也走 fetchJsonRace 限时,裸 fetch 黑洞时会吊住 socket 约 5 分钟
443
503
  const cleanupSession = () => {
444
- fetch(`${TRAE_SOLO_BASE}/chat_sessions/${chatSessionId}`, {
504
+ fetchJsonRace(`${TRAE_SOLO_BASE}/chat_sessions/${chatSessionId}`, {
445
505
  method: 'DELETE',
446
506
  headers: makeHeaders(token),
507
+ timeoutMs: 10_000,
447
508
  }).catch(() => {});
448
509
  };
449
510
 
@@ -471,6 +532,7 @@ export async function handleGateway(req, res) {
471
532
  }
472
533
 
473
534
  if (!eventsRes.ok || !eventsRes.body) {
535
+ drainErr(eventsRes);
474
536
  cleanupSession();
475
537
  // 事件流被 429(会话建好了、拉流被限流)同样按阶梯冷却——不判的话这个号
476
538
  // 下一轮会话创建仍从 30 秒档起算,继续撞限流
package/src/transfer.js CHANGED
@@ -111,6 +111,9 @@ export function buildExportPayload(accounts, { provider, product } = {}) {
111
111
  refreshToken: a.refreshToken || null,
112
112
  expiresAt: a.expiresAt || null,
113
113
  createdAt: a.createdAt,
114
+ // 10Router 原生 Loomy 行是 authType:'apikey'(apiKey=session,sms-login 路由同款);
115
+ // 不带这个字段,10R 导入端按默认 oauth 落库、不写 apiKey 字段,loomy 运行时读不到凭据
116
+ ...(a.provider === 'loomy' ? { authType: 'apikey' } : {}),
114
117
  providerSpecificData: {
115
118
  authMethod: a.token.startsWith('pt-') ? 'pat' : 'device',
116
119
  userId: a.uid || null,
package/src/usageSync.js CHANGED
@@ -287,7 +287,17 @@ async function collectCatpaw(accounts, modelLabel, sentTotals = {}) {
287
287
  if (failed && !out.length) throw lastErr;
288
288
  if (failed) notes.push(`${failed} 个妙手账号用量拉取失败:${lastErr && lastErr.message}`);
289
289
  out.sort((x, y) => (x.timestamp < y.timestamp ? -1 : 1));
290
- return { entries: out, notes, nextSentTotals: { ...sentTotals, ...nextSent } };
290
+ // 水位只服务 400 天回溯窗的差量记账:窗口外的桶永远不会再被读到,
291
+ // 留着只是让 tenrouter.json 每小时白白重写几千条死账(多留 10 天余量,
292
+ // 不剪回溯窗边界附近的活水位——剪早了那桶会被当新差量整段重发)
293
+ const minDate = localDateKey(new Date(now - 410 * 86400e3));
294
+ const merged = {};
295
+ for (const [key, v] of Object.entries({ ...sentTotals, ...nextSent })) {
296
+ const date = String(key).split('|')[1];
297
+ if (date && date < minDate) continue;
298
+ merged[key] = v;
299
+ }
300
+ return { entries: out, notes, nextSentTotals: merged };
291
301
  }
292
302
 
293
303
  /** 本机 10Router/9Router 的 usageHistory 行 → 导入行(同 10router-sync 插件 --source 10r)。
@@ -51,6 +51,7 @@ export function inspectToken(token) {
51
51
  uid: typeof c.sub === 'string' ? c.sub : null,
52
52
  expiresAt: Number.isFinite(c.exp) ? new Date(c.exp * 1000).toISOString() : null,
53
53
  name: c.name || c.preferred_username || c.nickname || null,
54
+ phone: [c.phone_number, c.phoneNumber, c.mobile, c.preferred_username].map((v) => String(v == null ? '' : v).trim()).find((v) => /^1\d{10}$/.test(v)) || null,
54
55
  };
55
56
  }
56
57