creditdaddy 1.8.2 → 1.8.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/build.json CHANGED
@@ -1,8 +1,8 @@
1
1
  {
2
- "version": "1.8.2",
3
- "commit": "6921de5",
2
+ "version": "1.8.3",
3
+ "commit": "1c23d00",
4
4
  "branch": "main",
5
- "builtAt": "2026-11-19T16:43:46.983Z",
5
+ "builtAt": "2026-11-21T15:56:36.372Z",
6
6
  "channel": "local",
7
7
  "dirty": true
8
8
  }
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "creditdaddy",
3
- "version": "1.8.2",
4
- "description": "CreditDaddy — Qoder / WorkBuddy / ZCode / mirasim / 妙手 / Trae / MiniMax / ModelScope / 豆包 Doubao / 讯飞 Loomy / DuMate 百度搭子 / WPS 灵犀 / Meoo 秒悟多账号本地管理与每日积分自动签到助手,及 10Router 供应商 Cookie 会话捕获与外部配额(Token Harbor / 小米 MiMo / River / ModelScope 魔搭 / LongCat)",
3
+ "version": "1.8.3",
4
+ "description": "CreditDaddy — Qoder / WorkBuddy / ZCode / mirasim / 妙手 / Trae / MiniMax / ModelScope / 豆包 Doubao / 讯飞 Loomy / DuMate 百度搭子 / WPS 灵犀 / Meoo 秒悟 / Croli / CrowLLM 多账号本地管理与每日积分自动签到助手,及 10Router 供应商 Cookie 会话捕获与外部配额(Token Harbor / 小米 MiMo / River / ModelScope 魔搭 / LongCat)",
5
5
  "homepage": "https://github.com/techysy/CreditDaddy",
6
6
  "repository": {
7
7
  "type": "git",
Binary file
package/src/authDevice.js CHANGED
@@ -31,6 +31,7 @@ import { startWorkbuddyLogin, pollWorkbuddyLogin } from './workbuddyAuth.js';
31
31
  import { startZcodeLogin, pollZcodeLogin } from './zcodeAuth.js';
32
32
  import { startMiniMaxLogin, pollMiniMaxLogin } from './minimaxAuth.js';
33
33
  import { startTraeLogin, pollTraeLogin } from './traeAuth.js';
34
+ import { startCroliLogin, pollCroliLogin } from './croliAuth.js';
34
35
 
35
36
  const FETCH_TIMEOUT_MS = 15000;
36
37
  const QODER_TTL_MS = 5 * 60 * 1000; // Qoder 授权链接 5 分钟有效
@@ -136,6 +137,9 @@ const FLOWS = {
136
137
  // trae-intl 走国际站(www.trae.ai,同协议同 client_id,#99 10R 侧全链验证)
137
138
  trae: { start: startTraeLogin, poll: pollTraeLogin },
138
139
  'trae-intl': { start: startTraeLogin, poll: pollTraeLogin },
140
+ // Croli:授权码 + PKCE 的本地回调流(协议同桌面端 croli-server,clerk.croli.net,
141
+ // redirect_uri=/callback loopback 通配;凭据 = Clerk JWT + refresh 轮换)
142
+ croli: { start: startCroliLogin, poll: pollCroliLogin },
139
143
  };
140
144
  export const LOGIN_KINDS = Object.keys(FLOWS);
141
145
  const KIND_LABEL = { 'zcode-bigmodel': 'ZCode(BigModel)', 'zcode-zai': 'ZCode(Z.ai)' };
package/src/checkin.js CHANGED
@@ -6,7 +6,8 @@
6
6
  import { loadAccounts, loadSettings, loadState, withAccounts, withState } from './store.js';
7
7
  import { productImpl } from './providers.js';
8
8
  import { productOf, PROVIDER_LABEL } from './constants.js';
9
- import { startUsageSyncScheduler } from './tenrouter.js';
9
+ import { loadConfig as loadTenrouterConfig, startUsageSyncScheduler } from './tenrouter.js';
10
+ import { startCroliResyncWatch } from './tenrouterAccounts.js';
10
11
  import { refreshContext } from './accounts.js';
11
12
  import { zcodeAutoClaim } from './zcodeAutoClaim.js';
12
13
  import { traePrimaryIds } from './traeClient.js';
@@ -36,7 +37,7 @@ const ZCODE_FIRST_DELAY_MS = 2 * 60 * 1000;
36
37
  // 签到日 = 对应时点起的日历日:dayKey(now, provider) = (now + (8 - 刷新小时)h) 的 UTC 日期
37
38
  const DAY_REFRESH_HOUR_UTC8 = { qoder: 10, 'qoder-cn': 10 };
38
39
  // 领取日志的积分单位:默认 Credits(Qoder/WorkBuddy 系),网页会话线各自带单位
39
- const CHECKIN_UNIT = { lingxi: '灵点', doubao: '额度', meoo: '秒悟积分', dumate: '积分' };
40
+ const CHECKIN_UNIT = { lingxi: '灵点', doubao: '额度', meoo: '秒悟积分', dumate: '积分', croli: '积分' };
40
41
 
41
42
  let timerHandle = null;
42
43
  let zcodeTimerHandle = null;
@@ -483,6 +484,7 @@ async function scheduleTick() {
483
484
  export async function startScheduler() {
484
485
  if (timerHandle) return;
485
486
  startUsageSyncScheduler();
487
+ startCroliResyncWatch(loadTenrouterConfig);
486
488
  startWebSessionWatch();
487
489
  warmZcodeAppVersion();
488
490
  // WorkBuddy 自定义安装路径发现(issue #46):注册表 / 进程探测要起子进程,
package/src/constants.js CHANGED
@@ -35,7 +35,7 @@ export const WEB_USAGE_PATH = '/api/v2/me/usages/big_model_credits';
35
35
  export const JOB_TOKEN_EXCHANGE_PATH = '/api/v1/jobToken/exchange';
36
36
 
37
37
  // 账号的 provider = 产品 + 区域。新增产品时在此登记,并在 providers.js 挂上对应实现。
38
- export const PROVIDERS = ['qoder', 'qoder-cn', 'workbuddy', 'workbuddy-intl', 'zcode', 'mirasim', 'catpaw', 'trae', 'trae-intl', 'minimax', 'minimax-global', 'tokenharbor', 'xiaomi-mimo', 'river', 'modelscope', 'longcat', 'doubao', 'loomy', 'lingxi', 'meoo', 'dumate'];
38
+ export const PROVIDERS = ['qoder', 'qoder-cn', 'workbuddy', 'workbuddy-intl', 'zcode', 'mirasim', 'catpaw', 'trae', 'trae-intl', 'minimax', 'minimax-global', 'tokenharbor', 'xiaomi-mimo', 'river', 'modelscope', 'longcat', 'doubao', 'loomy', 'lingxi', 'meoo', 'dumate', 'croli', 'crowllm'];
39
39
  export const PROVIDER_LABEL = {
40
40
  qoder: 'Qoder 国际版',
41
41
  'qoder-cn': 'Qoder 国内版',
@@ -58,6 +58,8 @@ export const PROVIDER_LABEL = {
58
58
  lingxi: 'WPS 灵犀',
59
59
  meoo: 'Meoo 秒悟',
60
60
  dumate: 'DuMate',
61
+ croli: 'Croli',
62
+ crowllm: 'CrowLLM',
61
63
  };
62
64
  /** provider → 产品线(qoder / workbuddy / zcode / mirasim / catpaw / trae / minimax / tokenharbor / xiaomi-mimo / river) */
63
65
  export const productOf = (provider) => {
@@ -78,6 +80,8 @@ export const productOf = (provider) => {
78
80
  if (p === 'lingxi') return 'lingxi';
79
81
  if (p === 'meoo') return 'meoo';
80
82
  if (p === 'dumate') return 'dumate';
83
+ if (p === 'croli') return 'croli';
84
+ if (p === 'crowllm') return 'crowllm';
81
85
  return 'qoder';
82
86
  };
83
87
  /** provider 是否国内版 */
@@ -104,6 +104,43 @@ export const COOKIE_SITES = [
104
104
  accountName: '小米 MiMo',
105
105
  hint: '登录后自动抓取 UID 与充值余额;推送到 10Router 显示余额卡片。',
106
106
  },
107
+ {
108
+ id: 'crowllm',
109
+ name: 'CrowLLM',
110
+ provider: 'crowllm',
111
+ label: 'CrowLLM',
112
+ // one-hub/new-api 系中转:钱包额度(含活动赠送)只在登录后的 /api/user/self(quota
113
+ // 字段,500000 quota = $1),连接的 chat key 读不到(/v1/dashboard/billing/subscription
114
+ // 恒回假上限 100000000,2026-11-21 实测)——与 tokenharbor/lingxi 同款,凭据只能是
115
+ // 网页会话 Cookie。登录入口走邀请码池轮换(与 croli/meoo 同口径),未带码回退主链接。
116
+ loginUrl: 'https://crowllm.com/sign-up',
117
+ loginUrls: [
118
+ 'https://crowllm.com/sign-up?aff=xGk0',
119
+ 'https://crowllm.com/sign-up?aff=quJ8',
120
+ 'https://crowllm.com/sign-up?aff=tEjJ',
121
+ 'https://crowllm.com/sign-up?aff=6CNM',
122
+ 'https://crowllm.com/sign-up?aff=T9Tu',
123
+ ],
124
+ homeUrl: 'https://crowllm.com',
125
+ cookieUrls: ['https://crowllm.com'],
126
+ // 凭据现实(2026-11-21 全部实测):钱包数据端点 /api/user/self 只认登录签发的
127
+ // 15 分钟 JWT(Authorization Bearer)——无 session Cookie、无刷新端点、无令牌
128
+ // 生成 UI、密码登录带 Turnstile,服务端自动化全线不通。唯一出路 = 真浏览器:
129
+ // persist 分区里的 GitHub 会话让 SPA 静默重跑 OAuth → JWT 进页面内存 → 捕获走
130
+ // **HTML 探针**(隐藏窗渲染 /wallet 等钱包数字出现,DOM 里抽快照)+ **CDP 嗅探**
131
+ // (desktop 侧拦 XHR 的 Authorization 头拿 JWT,storage 同形键 `crowllm:access-jwt`
132
+ // 交给 daemon 实时拉 /api/user/self——比 DOM 解析准,身份/余额一并取回)。
133
+ probe: {
134
+ url: 'https://crowllm.com/wallet',
135
+ // 钱包页渲染完成的标记(SPA 静默 OAuth 需要几秒,probeViaHiddenWindow 轮询等);
136
+ // 中英 UI 都容。CF challenge 页 / 登录页壳不含这些标记 → 继续轮询或判失效。
137
+ match: (text) => /可用总数|Total available|赠送额度|Gift/i.test(text),
138
+ },
139
+ quota: { fromHtml: parseCrowllmWalletHtml },
140
+ noReprobe: true, // 服务端 HTML 探针进 CF 盾——重探必假阴性;续期 = 登录窗静默重跑 OAuth
141
+ accountName: 'CrowLLM',
142
+ hint: '登录 crowllm.com(GitHub/Google/Discord/邮箱)后自动抓取钱包余额与赠送额度;GitHub 会话记住后,后续登录窗打开即静默完成。推 10Router 免费额度页出卡,聊天连接仍用 10R 侧的 API key。',
143
+ },
107
144
  {
108
145
  id: 'modelscope',
109
146
  name: 'ModelScope 魔搭',
@@ -242,6 +279,29 @@ export const COOKIE_SITES = [
242
279
 
243
280
  export const getSite = (id) => COOKIE_SITES.find((s) => s.id === id) || null;
244
281
 
282
+ /**
283
+ * CrowLLM 钱包页 DOM → 快照读数。SPA 渲染出的数字是本地化美元串("$110"、"$1,234.5"),
284
+ * 「可用总数」= 付费 + 赠送总额、「赠送额度」= earned 拆分(存在才出)。与
285
+ * /api/user/self 的字段映射(earned_quota/quota)同口径,只是来源从 XHR JSON 换成
286
+ * DOM 文本——探针窗拿不到 XHR 响应体时的兜底。
287
+ * @returns {{ used: number, total: number, isCreditBalance: true, giftUsd: number|null } | null}
288
+ */
289
+ export function parseCrowllmWalletHtml(html) {
290
+ const text = String(html || '');
291
+ const money = (re) => {
292
+ const m = re.exec(text);
293
+ if (!m) return null;
294
+ const n = Number(String(m[1]).replace(/[$,]/g, ''));
295
+ return Number.isFinite(n) ? n : null;
296
+ };
297
+ // 主读数:优先「可用总数」,退化到页面上第一个「$N」大额数字(免费目录可用)
298
+ let total = money(/(?:可用总数|Total available)[\s\S]{0,300}?\$\s*([\d,]+(?:\.\d+)?)/i);
299
+ if (total === null) total = money(/\$\s*([\d,]{2,}(?:\.\d+)?)/);
300
+ if (total === null) return null;
301
+ const gift = money(/(?:赠送额度|Gift)[\s\S]{0,300}?\$\s*([\d,]+(?:\.\d+)?)/i);
302
+ return { used: 0, total, isCreditBalance: true, giftUsd: gift };
303
+ }
304
+
245
305
  /** 按登录窗口 URL 找到对应站点配置(登录页或其同源首页) */
246
306
  export function siteForLoginUrl(url) {
247
307
  const u = String(url || '');
@@ -0,0 +1,268 @@
1
+ /**
2
+ * Croli OAuth PKCE 回环登录——协议 1:1 对齐桌面端 croli-server.exe(Rust
3
+ * desktop_auth.rs,2026-11-20 二进制考古 + authorize 端点实测):
4
+ * client_id znV4SkcUsY1AektQ(Clerk OAuth application,no secret)
5
+ * issuer https://clerk.croli.net
6
+ * authorize {issuer}/oauth/authorize(302 → /oauth/authorize/continue,参数透传;
7
+ * redirect_uri = http://127.0.0.1:<随机端口>/callback,loopback 通配放行)
8
+ * token {issuer}/oauth/token(form-urlencoded;code 换票带 code_verifier,
9
+ * 刷新 grant_type=refresh_token + client_id——均无 client secret)
10
+ * scope profile email offline_access(offline_access 才发 refresh_token)
11
+ * userinfo {issuer}/oauth/userinfo(sidecar 登录后校验用,CD 侧可选)
12
+ *
13
+ * JWT 契约:iss=clerk.croli.net,sub=user_…,24h 短命 + refresh 轮换。
14
+ * 与 meooAuth 同款骨架:回环服务器收 code → token 换票 → 读身份 → 落账号。
15
+ * token 响应契约比 meoo 宽(Clerk 字段集不同):access_token/refresh_token/
16
+ * token_type=Bearer/expires_in 四项缺一即拒。
17
+ *
18
+ * 凭据只在本机会话内流转,日志不落 token。
19
+ */
20
+
21
+ import http from 'node:http';
22
+ import crypto from 'node:crypto';
23
+ import { fetchJsonRace } from './zcodeClient.js';
24
+ import { FETCH_TIMEOUT_MS } from './constants.js';
25
+ import { fetchCroliProfile } from './croliLocal.js';
26
+
27
+ export const CROLI_CLERK_ISSUER = 'https://clerk.croli.net';
28
+ export const CROLI_CLIENT_ID = 'znV4SkcUsY1AektQ';
29
+ export const CROLI_OAUTH_AUTHORIZE_URL = `${CROLI_CLERK_ISSUER}/oauth/authorize`;
30
+ export const CROLI_OAUTH_TOKEN_URL = `${CROLI_CLERK_ISSUER}/oauth/token`;
31
+ export const CROLI_OAUTH_SCOPE = 'profile email offline_access';
32
+ const CALLBACK_PATH = '/callback';
33
+
34
+ const LOGIN_TIMEOUT_MS = 5 * 60_000;
35
+
36
+ const sessions = new Map();
37
+
38
+ function gcSessions() {
39
+ const now = Date.now();
40
+ for (const [k, s] of sessions) if (s.expiresAt < now || s.done) sessions.delete(k);
41
+ }
42
+
43
+ const securityHeaders = (type) => ({
44
+ 'Content-Type': `${type || 'text/plain'}; charset=utf-8`,
45
+ 'Cache-Control': 'no-store',
46
+ 'X-Content-Type-Options': 'nosniff',
47
+ });
48
+
49
+ // 回调页:Croli 官方成功页口径(「登录成功 / 桌面会话已就绪,现在可以回到 Croli」)
50
+ const ICON_OK = '<svg width="72" height="72" viewBox="0 0 72 72" fill="none" xmlns="http://www.w3.org/2000/svg"><circle cx="36" cy="36" r="34" fill="#22c55e"/><path d="M22 37.5 31.5 47 50 27" stroke="#fff" stroke-width="5" stroke-linecap="round" stroke-linejoin="round"/></svg>';
51
+ const ICON_WARN = '<svg width="72" height="72" viewBox="0 0 72 72" fill="none" xmlns="http://www.w3.org/2000/svg"><circle cx="36" cy="36" r="34" fill="#f59e0b"/><path d="M36 20v22" stroke="#fff" stroke-width="5" stroke-linecap="round"/><circle cx="36" cy="50" r="3.5" fill="#fff"/></svg>';
52
+ const callbackHtml = (title, body, ok) => `<!doctype html><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><title>${title}</title>`
53
+ + '<body style="margin:0;min-height:100vh;display:grid;place-items:center;background:#fafafa;font-family:system-ui,-apple-system,\'Segoe UI\',sans-serif">'
54
+ + '<div style="text-align:center;padding:36px 44px;background:#fff;border:1px solid #e5e7eb;border-radius:16px;box-shadow:0 8px 30px rgba(0,0,0,.06)">'
55
+ + (ok ? ICON_OK : ICON_WARN)
56
+ + `<p style="margin:18px 0 6px;font-size:17px;font-weight:600;color:#111827">${title}</p>`
57
+ + `<p style="margin:0;font-size:14px;color:#6b7280">${body}</p></div></body>`;
58
+
59
+ /** 回调监听:只绑 127.0.0.1 随机端口(sidecar 同款 loopback 通配) */
60
+ function startCallbackServer(session) {
61
+ const server = http.createServer((req, res) => {
62
+ const url = new URL(req.url || '/', 'http://127.0.0.1');
63
+ if (req.method !== 'GET' || url.pathname !== CALLBACK_PATH) {
64
+ res.writeHead(404, securityHeaders('text/plain'));
65
+ res.end('Not Found');
66
+ return;
67
+ }
68
+ if (session.error || session.result) {
69
+ res.writeHead(200, securityHeaders('text/plain'));
70
+ res.end('ok');
71
+ return;
72
+ }
73
+ const callbackState = url.searchParams.get('state') || '';
74
+ if (!callbackState || callbackState !== session.state) {
75
+ res.writeHead(400, securityHeaders('text/html'));
76
+ res.end(callbackHtml('授权请求校验失败', '请回到 CreditDaddy 重新发起登录。', false));
77
+ return;
78
+ }
79
+ const oauthError = url.searchParams.get('error');
80
+ if (oauthError) {
81
+ session.error = `授权被拒绝或失败(${url.searchParams.get('error_description') || oauthError})`;
82
+ finish(session);
83
+ res.writeHead(400, securityHeaders('text/html'));
84
+ res.end(callbackHtml('未完成授权', '你可以关闭此页面。', false));
85
+ return;
86
+ }
87
+ const code = url.searchParams.get('code') || '';
88
+ if (!code) {
89
+ res.writeHead(400, securityHeaders('text/html'));
90
+ res.end(callbackHtml('授权回调无效', '未收到授权码,请回到 CreditDaddy 重试。', false));
91
+ return;
92
+ }
93
+ session.result = { code };
94
+ finish(session);
95
+ res.writeHead(200, securityHeaders('text/html'));
96
+ res.end(callbackHtml('授权成功', '桌面会话已就绪,现在可以回到 CreditDaddy。', true));
97
+ });
98
+ return server;
99
+ }
100
+
101
+ function finish(session) {
102
+ session.settledAt = Date.now();
103
+ setTimeout(() => { try { session.server.close(); } catch {} }, 500).unref();
104
+ }
105
+
106
+ /** 随机回环端口(sidecar bindLoopback 同款 listen(0)) */
107
+ async function bindLoopback(server) {
108
+ await new Promise((resolve, reject) => {
109
+ const onErr = (e) => { server.off('listening', onOk); reject(e); };
110
+ const onOk = () => { server.off('error', onErr); resolve(); };
111
+ server.once('error', onErr);
112
+ server.once('listening', onOk);
113
+ server.listen(0, '127.0.0.1');
114
+ });
115
+ return server.address().port;
116
+ }
117
+
118
+ /** 发起一次 OAuth PKCE 授权登录 */
119
+ export async function startCroliLogin(_kind) {
120
+ gcSessions();
121
+ const state = crypto.randomBytes(32).toString('base64url');
122
+ const verifier = crypto.randomBytes(32).toString('base64url');
123
+ const challenge = crypto.createHash('sha256').update(verifier).digest('base64url');
124
+ const session = { verifier, state, result: null, error: null, settledAt: 0, deadline: Date.now() + LOGIN_TIMEOUT_MS };
125
+ session.server = startCallbackServer(session);
126
+ const port = await bindLoopback(session.server);
127
+ session.redirectUri = `http://127.0.0.1:${port}${CALLBACK_PATH}`;
128
+ const loginId = crypto.randomUUID();
129
+ sessions.set(loginId, session);
130
+ const url = CROLI_OAUTH_AUTHORIZE_URL + '?' + new URLSearchParams({
131
+ response_type: 'code',
132
+ client_id: CROLI_CLIENT_ID,
133
+ redirect_uri: session.redirectUri,
134
+ scope: CROLI_OAUTH_SCOPE,
135
+ state,
136
+ code_challenge: challenge,
137
+ code_challenge_method: 'S256',
138
+ }).toString();
139
+ return { url, expiresInMs: LOGIN_TIMEOUT_MS, intervalMs: 1500, data: { loginId } };
140
+ }
141
+
142
+ /** token 响应契约校验(Clerk 字段集:四项缺一即拒)。
143
+ * token_type 按 RFC 6749 大小写不敏感(实测 Clerk 返回小写 'bearer',
144
+ * 严格等 'Bearer' 会把完整成功的响应误判为格式无效——诊断片段实锤)。 */
145
+ function validateTokenResponse(result) {
146
+ const missing = [];
147
+ if (typeof result?.access_token !== 'string' || !result.access_token) missing.push('access_token');
148
+ if (typeof result?.refresh_token !== 'string' || !result.refresh_token) missing.push('refresh_token');
149
+ if (String(result?.token_type || '').toLowerCase() !== 'bearer') missing.push(`token_type=${JSON.stringify(result?.token_type ?? null)}`);
150
+ const exp = Number(result?.expires_in);
151
+ if (!Number.isFinite(exp) || exp <= 0) missing.push(`expires_in=${JSON.stringify(result?.expires_in ?? null)}`);
152
+ if (missing.length) {
153
+ const err = new Error(`Croli OAuth Token 响应缺字段/值异常:${missing.join(', ')}`);
154
+ err.oauth = true;
155
+ throw err;
156
+ }
157
+ }
158
+
159
+ /** OAuth 换票 / 刷新(form-urlencoded,无 secret——sidecar 同款) */
160
+ export async function croliTokenRequest(parameters, { fetchImpl } = {}) {
161
+ let res;
162
+ try {
163
+ res = await (fetchImpl || fetchJsonRace)(CROLI_OAUTH_TOKEN_URL, {
164
+ method: 'POST',
165
+ headers: { 'Content-Type': 'application/x-www-form-urlencoded', Accept: 'application/json' },
166
+ body: new URLSearchParams(parameters).toString(),
167
+ timeoutMs: FETCH_TIMEOUT_MS,
168
+ });
169
+ } catch (e) {
170
+ throw new Error(`Croli OAuth 请求失败:${e?.cause?.code || e.message}`);
171
+ }
172
+ const rawText = await res.text().catch(() => '');
173
+ let result = {};
174
+ try { result = JSON.parse(rawText); } catch { /* 非 JSON(Cloudflare HTML / 空体)走下方诊断 */ }
175
+ if (!res.ok) {
176
+ throw new Error(`Croli OAuth 失败:${result.error_description || result.error || `HTTP ${res.status}`}`);
177
+ }
178
+ try {
179
+ validateTokenResponse(result);
180
+ } catch (e) {
181
+ // 响应 200 但字段缺失:把实际拿到什么(字段名集合 / 非 JSON 时片段)带出来——
182
+ // 「格式无效」四个字无法定位是 Cloudflare 拦截还是 Clerk 降级响应
183
+ const keys = Object.keys(result || {}).join(',');
184
+ const snippet = keys ? `字段[${keys}]` : String(rawText).replace(/\s+/g, ' ').slice(0, 120);
185
+ const err = new Error(`Croli OAuth Token 响应格式无效(HTTP ${res.status},实际收到:${snippet})`);
186
+ err.oauth = true;
187
+ throw err;
188
+ }
189
+ return result;
190
+ }
191
+
192
+ /** 刷新令牌(凭据续期共用;Clerk refresh 是轮换制——响应里的新 rt 替换旧值) */
193
+ export async function refreshCroliToken(refreshToken, { fetchImpl } = {}) {
194
+ return croliTokenRequest({
195
+ grant_type: 'refresh_token',
196
+ client_id: CROLI_CLIENT_ID,
197
+ refresh_token: refreshToken,
198
+ }, { fetchImpl });
199
+ }
200
+
201
+ /**
202
+ * 轮询登录结果(authDevice 骨架约定):
203
+ * {status:'pending'} | {status:'ok', input};终态失败抛错。
204
+ */
205
+ export async function pollCroliLogin(data) {
206
+ const session = sessions.get(data?.loginId);
207
+ if (!session) throw new Error('Croli 登录会话不存在或已超时,请重新发起');
208
+ if (session.error) {
209
+ sessions.delete(data.loginId);
210
+ throw new Error(session.error);
211
+ }
212
+ if (!session.result) {
213
+ if (Date.now() > session.deadline) {
214
+ sessions.delete(data.loginId);
215
+ try { session.server.close(); } catch {}
216
+ throw new Error('Croli 授权超时(5 分钟未完成),请重新发起');
217
+ }
218
+ return { status: 'pending' };
219
+ }
220
+
221
+ const params = session.result;
222
+ sessions.delete(data.loginId);
223
+ const tok = await croliTokenRequest({
224
+ grant_type: 'authorization_code',
225
+ code: params.code,
226
+ client_id: CROLI_CLIENT_ID,
227
+ redirect_uri: session.redirectUri,
228
+ code_verifier: session.verifier,
229
+ });
230
+
231
+ const accessToken = tok.access_token;
232
+ const refreshToken = tok.refresh_token;
233
+ const expiresAt = new Date(Date.now() + Number(tok.expires_in) * 1000).toISOString();
234
+
235
+ // 身份读补 uid/昵称:uid = Clerk JWT sub;命名用 userinfo 的 name/email
236
+ //(「Croli (师洋 余)」可辨识多号,失败回退 null 由 addAccount 侧兜底)
237
+ let uid = null, name = null, email = null, avatarUrl = null;
238
+ try {
239
+ const profile = await fetchCroliProfile(accessToken);
240
+ if (profile) {
241
+ uid = profile.sub || null;
242
+ email = profile.email || null;
243
+ avatarUrl = profile.picture || null;
244
+ const display = (profile.name || profile.email || '').trim();
245
+ if (display) name = `Croli (${display})`;
246
+ }
247
+ } catch { /* 身份读失败不阻断入库(addAccount verify 再补) */ }
248
+
249
+ return {
250
+ status: 'ok',
251
+ input: {
252
+ provider: 'croli',
253
+ token: accessToken,
254
+ refreshToken,
255
+ expiresAt,
256
+ uid,
257
+ name,
258
+ email,
259
+ source: 'browser',
260
+ meta: {
261
+ loginVia: 'oauth-authcode-pkce',
262
+ displayName: name ? name.slice('Croli ('.length, -1) : null,
263
+ avatarUrl,
264
+ scope: tok.scope || CROLI_OAUTH_SCOPE,
265
+ },
266
+ },
267
+ };
268
+ }