@xixka/dsh-hub 0.2.1-rc.21 → 0.2.1-rc.23
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/lib/client/jet-hub.js +117 -8
- package/lib/jet-hub-rpc.js +44 -0
- package/lib/jet-hub-rpc.js.map +1 -1
- package/lib/loomy-auth.d.ts +51 -0
- package/lib/loomy-auth.d.ts.map +1 -1
- package/lib/loomy-auth.js +149 -2
- package/lib/loomy-auth.js.map +1 -1
- package/lib/loomy-oauth.d.ts +44 -0
- package/lib/loomy-oauth.d.ts.map +1 -1
- package/lib/loomy-oauth.js +48 -1
- package/lib/loomy-oauth.js.map +1 -1
- package/lib/loomy-sms-login.d.ts +61 -0
- package/lib/loomy-sms-login.d.ts.map +1 -0
- package/lib/loomy-sms-login.js +330 -0
- package/lib/loomy-sms-login.js.map +1 -0
- package/lib/loomy.d.ts +22 -0
- package/lib/loomy.d.ts.map +1 -1
- package/lib/loomy.js +10 -0
- package/lib/loomy.js.map +1 -1
- package/lib/officeace-auth.d.ts +15 -0
- package/lib/officeace-auth.d.ts.map +1 -1
- package/lib/officeace-auth.js +99 -2
- package/lib/officeace-auth.js.map +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1,330 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Loomy 独立**短信验证码登录流**(2026-11-01 接入,用户报障「实现 loomy 短信登陆加自动续期」)。
|
|
3
|
+
*
|
|
4
|
+
* ## 为什么单独一条流(微信扫码之外)
|
|
5
|
+
*
|
|
6
|
+
* 微信扫码需要用户有微信且完成扫码;短信验证码是**不依赖微信**的第二条路
|
|
7
|
+
*(协议 §4.2,讯飞账号端点原生支持)。本模块起一个**本地 HTTP 服务器**
|
|
8
|
+
* 承载表单页(与 `autoclaw-oauth.ts` 的 `startAutoclawSmsLoginFlow` 同款形态):
|
|
9
|
+
* `account.create` 立即返回 `loginUrl`,前端 `window.open` —— 与其余 provider
|
|
10
|
+
* 的「两步式」契约完全一致(`window.open` 只在用户手势窗口内有效)。
|
|
11
|
+
*
|
|
12
|
+
* ## 端点复用
|
|
13
|
+
*
|
|
14
|
+
* 发码/验码协议在 `loomy-oauth.ts`(`sendLoomySmsCode` / `loginLoomyBySmsCode`,
|
|
15
|
+
* HMAC-SHA1 签名)——本文件**只做编排**(服务器 + 表单 + settle),一行协议不写。
|
|
16
|
+
* `msgid` 存在**流程内存**里(5 分钟一次性中间态),不进凭据库。
|
|
17
|
+
*
|
|
18
|
+
* ## 登录成功后的落盘
|
|
19
|
+
*
|
|
20
|
+
* `settleOk` 交回 `{ session, userid, phone }` + 用户在表单里**可选填写的密码**
|
|
21
|
+
* (填了 ⇒ 该账号此后可**自动续期**,见 `loomy-auth.ts` 的 `autoRenewCredential`;
|
|
22
|
+
* 不填 ⇒ 维持「到期重新登录」的既有语义)。落盘由调用方
|
|
23
|
+
* (`jet-hub-rpc.ts` 的 `started.result.then`)统一处理。
|
|
24
|
+
*/
|
|
25
|
+
import { createServer } from 'node:http';
|
|
26
|
+
import { loginLoomyByPassword, loginLoomyBySmsCode, sendLoomySmsCode, } from './loomy-oauth.js';
|
|
27
|
+
import { LOOMY } from './loomy-product.js';
|
|
28
|
+
/** 短信登录流的超时(发码 + 收码 + 提交,5 分钟与验证码 TTL 对齐)。 */
|
|
29
|
+
export const LOOMY_SMS_LOGIN_TIMEOUT_MS = 5 * 60 * 1000;
|
|
30
|
+
/** 表单里手机号的形状(大陆手机号;协议 `ccode` 恒 86)。 */
|
|
31
|
+
const PHONE_RE = /^1[3-9]\d{9}$/;
|
|
32
|
+
/**
|
|
33
|
+
* 启动短信验证码登录流。
|
|
34
|
+
*
|
|
35
|
+
* ⚠ 立即返回 `loginUrl`,**不阻塞** —— 手机号由表单页收集(不要求
|
|
36
|
+
* `account.create` 预先携带;那正是 2026-10 早期「顺序死锁」缺陷的成因,
|
|
37
|
+
* 见 `jet-hub-rpc.ts` 的 Loomy 分支注释)。
|
|
38
|
+
*/
|
|
39
|
+
export async function startLoomySmsLoginFlow(options = {}) {
|
|
40
|
+
const product = options.product ?? LOOMY;
|
|
41
|
+
const fetcher = options.fetcher ?? fetch;
|
|
42
|
+
const timeoutMs = options.timeoutMs ?? LOOMY_SMS_LOGIN_TIMEOUT_MS;
|
|
43
|
+
let settleOk;
|
|
44
|
+
let settleErr;
|
|
45
|
+
const result = new Promise((resolve, reject) => {
|
|
46
|
+
settleOk = resolve;
|
|
47
|
+
settleErr = reject;
|
|
48
|
+
});
|
|
49
|
+
// 先挂空处理器:用户极快完成/立刻失败时 promise 可能先于消费被 reject,
|
|
50
|
+
// 那段窗口 Node 会报 unhandled rejection(与 lobsterai-oauth 同因)。
|
|
51
|
+
result.catch(() => { });
|
|
52
|
+
/** 一次性中间态:msgid 与验证过的手机号(提交验码时必须配对)。 */
|
|
53
|
+
let msgid = '';
|
|
54
|
+
let pendingPhone = '';
|
|
55
|
+
let settled = false;
|
|
56
|
+
const ok = (value) => {
|
|
57
|
+
if (settled)
|
|
58
|
+
return;
|
|
59
|
+
settled = true;
|
|
60
|
+
settleOk(value);
|
|
61
|
+
};
|
|
62
|
+
const fail = (error) => {
|
|
63
|
+
if (settled)
|
|
64
|
+
return;
|
|
65
|
+
settled = true;
|
|
66
|
+
settleErr(error);
|
|
67
|
+
};
|
|
68
|
+
const json = (response, payload) => {
|
|
69
|
+
response.writeHead(200, { 'Content-Type': 'application/json; charset=utf-8' });
|
|
70
|
+
response.end(JSON.stringify(payload));
|
|
71
|
+
};
|
|
72
|
+
const server = createServer((request, response) => {
|
|
73
|
+
void (async () => {
|
|
74
|
+
const url = new URL(request.url ?? '/', 'http://127.0.0.1');
|
|
75
|
+
if (request.method === 'GET' && (url.pathname === '/loomy/login' || url.pathname === '/')) {
|
|
76
|
+
response.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' });
|
|
77
|
+
response.end(renderSmsPage());
|
|
78
|
+
return;
|
|
79
|
+
}
|
|
80
|
+
if (request.method === 'POST') {
|
|
81
|
+
const body = await readJsonBody(request);
|
|
82
|
+
try {
|
|
83
|
+
if (url.pathname === '/loomy/send-code') {
|
|
84
|
+
const phone = String(body.phone ?? '').trim();
|
|
85
|
+
if (!PHONE_RE.test(phone)) {
|
|
86
|
+
json(response, { ok: false, message: '请输入正确的 11 位手机号' });
|
|
87
|
+
return;
|
|
88
|
+
}
|
|
89
|
+
msgid = await sendLoomySmsCode(phone, product, fetcher);
|
|
90
|
+
pendingPhone = phone;
|
|
91
|
+
json(response, { ok: true });
|
|
92
|
+
return;
|
|
93
|
+
}
|
|
94
|
+
if (url.pathname === '/loomy/submit-code') {
|
|
95
|
+
const phone = String(body.phone ?? '').trim();
|
|
96
|
+
const code = String(body.code ?? '').trim();
|
|
97
|
+
const password = String(body.password ?? '').trim();
|
|
98
|
+
if (!PHONE_RE.test(phone)) {
|
|
99
|
+
json(response, { ok: false, message: '请输入正确的 11 位手机号' });
|
|
100
|
+
return;
|
|
101
|
+
}
|
|
102
|
+
if (code.length === 0) {
|
|
103
|
+
json(response, { ok: false, message: '请输入收到的短信验证码' });
|
|
104
|
+
return;
|
|
105
|
+
}
|
|
106
|
+
// ⚠ msgid 必须与**发码时**的手机号配对:页面把手机号改掉再提交
|
|
107
|
+
// 会拿到「别人的 msgid」,服务端报「msgid 无效」这种看不懂的错误。
|
|
108
|
+
if (msgid.length === 0 || phone !== pendingPhone) {
|
|
109
|
+
json(response, { ok: false, message: '请先获取验证码(手机号与发码时不一致)' });
|
|
110
|
+
return;
|
|
111
|
+
}
|
|
112
|
+
const login = await loginLoomyBySmsCode(phone, code, msgid, product, fetcher);
|
|
113
|
+
ok({
|
|
114
|
+
session: login.session,
|
|
115
|
+
userid: login.userid,
|
|
116
|
+
phone,
|
|
117
|
+
...(password.length > 0 ? { password } : {}),
|
|
118
|
+
});
|
|
119
|
+
json(response, { ok: true, phone });
|
|
120
|
+
return;
|
|
121
|
+
}
|
|
122
|
+
if (url.pathname === '/loomy/login-password') {
|
|
123
|
+
// 密码直登(表单的第二个 Tab):一步完成,成功即可自动续期。
|
|
124
|
+
const phone = String(body.phone ?? '').trim();
|
|
125
|
+
const password = String(body.password ?? '');
|
|
126
|
+
if (!PHONE_RE.test(phone)) {
|
|
127
|
+
json(response, { ok: false, message: '请输入正确的 11 位手机号' });
|
|
128
|
+
return;
|
|
129
|
+
}
|
|
130
|
+
if (password.length === 0) {
|
|
131
|
+
json(response, { ok: false, message: '请输入密码' });
|
|
132
|
+
return;
|
|
133
|
+
}
|
|
134
|
+
const login = await loginLoomyByPassword(phone, password, product, fetcher);
|
|
135
|
+
ok({ session: login.session, userid: login.userid, phone, password });
|
|
136
|
+
json(response, { ok: true, phone });
|
|
137
|
+
return;
|
|
138
|
+
}
|
|
139
|
+
json(response, { ok: false, message: `未知路径:${url.pathname}` });
|
|
140
|
+
}
|
|
141
|
+
catch (error) {
|
|
142
|
+
// 单步失败**不终止**流程:用户可能只是验证码输错,就地提示可重试
|
|
143
|
+
// (与微信流的 `verify_sms` 同一取向)。
|
|
144
|
+
json(response, { ok: false, message: error instanceof Error ? error.message : String(error) });
|
|
145
|
+
}
|
|
146
|
+
return;
|
|
147
|
+
}
|
|
148
|
+
response.writeHead(404, { 'Content-Type': 'text/plain; charset=utf-8' }).end('Not found');
|
|
149
|
+
})().catch((error) => {
|
|
150
|
+
// 异步处理器自身的意外异常:尽量回 500,不让 socket 挂死。
|
|
151
|
+
try {
|
|
152
|
+
response.writeHead(500, { 'Content-Type': 'text/plain; charset=utf-8' })
|
|
153
|
+
.end(`内部错误:${error instanceof Error ? error.message : String(error)}`);
|
|
154
|
+
}
|
|
155
|
+
catch {
|
|
156
|
+
// 响应可能已发出,忽略
|
|
157
|
+
}
|
|
158
|
+
});
|
|
159
|
+
});
|
|
160
|
+
await new Promise((resolve) => {
|
|
161
|
+
server.listen(0, '127.0.0.1', () => resolve());
|
|
162
|
+
});
|
|
163
|
+
const address = server.address();
|
|
164
|
+
const port = typeof address === 'object' && address !== null ? address.port : 0;
|
|
165
|
+
const loginUrl = `http://127.0.0.1:${port}/loomy/login`;
|
|
166
|
+
let closed = false;
|
|
167
|
+
const close = async () => {
|
|
168
|
+
if (closed)
|
|
169
|
+
return;
|
|
170
|
+
closed = true;
|
|
171
|
+
await new Promise((resolve) => server.close(() => resolve()));
|
|
172
|
+
};
|
|
173
|
+
const timer = setTimeout(() => {
|
|
174
|
+
fail(new Error(`Loomy 短信登录超时(${Math.round(timeoutMs / 1000)} 秒内未完成)`));
|
|
175
|
+
}, timeoutMs);
|
|
176
|
+
timer.unref?.();
|
|
177
|
+
result.catch(() => { }).finally(() => {
|
|
178
|
+
clearTimeout(timer);
|
|
179
|
+
void close();
|
|
180
|
+
});
|
|
181
|
+
return { loginUrl, result, close };
|
|
182
|
+
}
|
|
183
|
+
/** 读请求体(上限 64KB)。 */
|
|
184
|
+
async function readJsonBody(request) {
|
|
185
|
+
const chunks = [];
|
|
186
|
+
let total = 0;
|
|
187
|
+
for await (const chunk of request) {
|
|
188
|
+
const buf = chunk;
|
|
189
|
+
total += buf.length;
|
|
190
|
+
if (total > 64 * 1024)
|
|
191
|
+
throw new Error('请求体过大');
|
|
192
|
+
chunks.push(buf);
|
|
193
|
+
}
|
|
194
|
+
const text = Buffer.concat(chunks).toString('utf-8');
|
|
195
|
+
if (text.trim().length === 0)
|
|
196
|
+
return {};
|
|
197
|
+
try {
|
|
198
|
+
return JSON.parse(text);
|
|
199
|
+
}
|
|
200
|
+
catch {
|
|
201
|
+
throw new Error('请求体不是 JSON');
|
|
202
|
+
}
|
|
203
|
+
}
|
|
204
|
+
/** 渲染表单页(短信验证码 + 密码直登两个入口;密码选填 ⇒ 该账号可自动续期)。 */
|
|
205
|
+
function renderSmsPage() {
|
|
206
|
+
return `<!DOCTYPE html>
|
|
207
|
+
<html lang="zh-CN">
|
|
208
|
+
<head>
|
|
209
|
+
<meta charset="utf-8" />
|
|
210
|
+
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
|
211
|
+
<title>Loomy(讯飞)登录</title>
|
|
212
|
+
<style>
|
|
213
|
+
body { font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif; background: #0f172a; color: #f8fafc; display: flex; justify-content: center; align-items: center; min-height: 100vh; margin: 0; padding: 20px; box-sizing: border-box; }
|
|
214
|
+
.card { background: #1e293b; border: 1px solid #334155; border-radius: 12px; padding: 32px; width: 100%; max-width: 420px; box-shadow: 0 10px 25px -5px rgba(0,0,0,0.5); }
|
|
215
|
+
h2 { margin: 0 0 8px; font-size: 20px; font-weight: 600; color: #38bdf8; }
|
|
216
|
+
p.desc { color: #94a3b8; font-size: 13px; margin: 0 0 20px; line-height: 1.7; }
|
|
217
|
+
.tabs { display: flex; gap: 8px; margin-bottom: 18px; }
|
|
218
|
+
.tab { flex: 1; text-align: center; padding: 8px 0; border-radius: 6px; border: 1px solid #334155; color: #94a3b8; font-size: 13px; cursor: pointer; }
|
|
219
|
+
.tab.active { border-color: #0284c7; color: #38bdf8; background: rgba(2,132,199,0.12); }
|
|
220
|
+
.pane { display: none; }
|
|
221
|
+
.pane.active { display: block; }
|
|
222
|
+
label { display: block; font-size: 12px; color: #cbd5e1; margin-bottom: 6px; }
|
|
223
|
+
input { width: 100%; box-sizing: border-box; background: #0f172a; border: 1px solid #475569; border-radius: 6px; padding: 10px 12px; color: #f8fafc; font-size: 14px; outline: none; margin-bottom: 12px; }
|
|
224
|
+
input:focus { border-color: #38bdf8; }
|
|
225
|
+
.row { display: flex; gap: 8px; }
|
|
226
|
+
.row input { flex: 1; }
|
|
227
|
+
.btn-code { background: #0284c7; color: white; border: none; border-radius: 6px; padding: 0 16px; font-size: 13px; cursor: pointer; white-space: nowrap; }
|
|
228
|
+
.btn-code:disabled { background: #475569; cursor: not-allowed; }
|
|
229
|
+
.btn-primary { width: 100%; background: #0284c7; color: white; border: none; border-radius: 6px; padding: 11px 16px; font-size: 15px; font-weight: 500; cursor: pointer; margin-top: 4px; }
|
|
230
|
+
.btn-primary:hover { background: #0369a1; }
|
|
231
|
+
.btn-primary:disabled { background: #475569; cursor: not-allowed; }
|
|
232
|
+
.hint { color: #64748b; font-size: 12px; line-height: 1.7; margin-top: 14px; }
|
|
233
|
+
.msg { margin-top: 16px; padding: 10px 12px; border-radius: 6px; font-size: 13px; display: none; }
|
|
234
|
+
.msg.error { display: block; background: rgba(239,68,68,0.15); border: 1px solid #ef4444; color: #fca5a5; }
|
|
235
|
+
.msg.success { display: block; background: rgba(34,197,94,0.15); border: 1px solid #22c55e; color: #86efac; }
|
|
236
|
+
</style>
|
|
237
|
+
</head>
|
|
238
|
+
<body>
|
|
239
|
+
<div class="card">
|
|
240
|
+
<h2>Loomy(讯飞)账号登录</h2>
|
|
241
|
+
<p class="desc">短信验证码或账号密码登录。填了密码的账号会在凭据临期时<b>自动续期</b>(静默重登),无需人工干预。</p>
|
|
242
|
+
<div class="tabs">
|
|
243
|
+
<div class="tab active" id="tabSms">📱 短信验证码</div>
|
|
244
|
+
<div class="tab" id="tabPwd">🔑 账号密码</div>
|
|
245
|
+
</div>
|
|
246
|
+
<div class="pane active" id="paneSms">
|
|
247
|
+
<label for="phone">手机号</label>
|
|
248
|
+
<input type="tel" id="phone" placeholder="请输入 11 位手机号" maxlength="11" />
|
|
249
|
+
<label for="code">短信验证码</label>
|
|
250
|
+
<div class="row">
|
|
251
|
+
<input type="text" id="code" placeholder="6 位验证码" maxlength="6" />
|
|
252
|
+
<button type="button" class="btn-code" id="btnSend">获取验证码</button>
|
|
253
|
+
</div>
|
|
254
|
+
<button type="button" class="btn-primary" id="btnSmsLogin">登录</button>
|
|
255
|
+
</div>
|
|
256
|
+
<div class="pane" id="panePwd">
|
|
257
|
+
<label for="pwdPhone">手机号(讯飞账号即手机号)</label>
|
|
258
|
+
<input type="tel" id="pwdPhone" placeholder="请输入 11 位手机号" maxlength="11" />
|
|
259
|
+
<label for="pwd">密码</label>
|
|
260
|
+
<input type="password" id="pwd" placeholder="讯飞账号密码" />
|
|
261
|
+
<button type="button" class="btn-primary" id="btnPwdLogin">登录并记住密码(可自动续期)</button>
|
|
262
|
+
<div class="hint">密码仅保存在本机凭据库 / 加密备份中,用于凭据临期时静默重登(协议为讯飞官方密码登录)。不填密码请用短信验证码登录。</div>
|
|
263
|
+
</div>
|
|
264
|
+
<div class="msg" id="msgBox"></div>
|
|
265
|
+
</div>
|
|
266
|
+
<script>
|
|
267
|
+
const msgBox = document.getElementById('msgBox');
|
|
268
|
+
function showMsg(type, text) { msgBox.className = 'msg ' + type; msgBox.textContent = text; msgBox.style.display = 'block'; }
|
|
269
|
+
const tabSms = document.getElementById('tabSms'), tabPwd = document.getElementById('tabPwd');
|
|
270
|
+
const paneSms = document.getElementById('paneSms'), panePwd = document.getElementById('panePwd');
|
|
271
|
+
function switchTab(sms) {
|
|
272
|
+
tabSms.className = 'tab' + (sms ? ' active' : ''); tabPwd.className = 'tab' + (sms ? '' : ' active');
|
|
273
|
+
paneSms.className = 'pane' + (sms ? ' active' : ''); panePwd.className = 'pane' + (sms ? '' : ' active');
|
|
274
|
+
}
|
|
275
|
+
tabSms.addEventListener('click', () => switchTab(true));
|
|
276
|
+
tabPwd.addEventListener('click', () => switchTab(false));
|
|
277
|
+
const phone = document.getElementById('phone'), code = document.getElementById('code');
|
|
278
|
+
const btnSend = document.getElementById('btnSend'), btnSmsLogin = document.getElementById('btnSmsLogin');
|
|
279
|
+
const pwdPhone = document.getElementById('pwdPhone'), pwd = document.getElementById('pwd');
|
|
280
|
+
const btnPwdLogin = document.getElementById('btnPwdLogin');
|
|
281
|
+
async function post(path, body) {
|
|
282
|
+
const resp = await fetch(path, { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify(body) });
|
|
283
|
+
return resp.json();
|
|
284
|
+
}
|
|
285
|
+
let countdown = 0;
|
|
286
|
+
btnSend.addEventListener('click', async () => {
|
|
287
|
+
const p = phone.value.trim();
|
|
288
|
+
if (!/^1[3-9]\\d{9}$/.test(p)) { showMsg('error', '请输入正确的 11 位手机号'); return; }
|
|
289
|
+
btnSend.disabled = true; btnSend.textContent = '发送中...';
|
|
290
|
+
try {
|
|
291
|
+
const data = await post('/loomy/send-code', { phone: p });
|
|
292
|
+
if (data.ok) {
|
|
293
|
+
showMsg('success', '验证码已发送,请查收短信');
|
|
294
|
+
countdown = 60;
|
|
295
|
+
btnSend.textContent = countdown + 's 后重新获取';
|
|
296
|
+
const timer = setInterval(() => {
|
|
297
|
+
countdown--;
|
|
298
|
+
if (countdown <= 0) { clearInterval(timer); btnSend.disabled = false; btnSend.textContent = '获取验证码'; }
|
|
299
|
+
else { btnSend.textContent = countdown + 's 后重新获取'; }
|
|
300
|
+
}, 1000);
|
|
301
|
+
} else { showMsg('error', data.message || '发送验证码失败'); btnSend.disabled = false; btnSend.textContent = '获取验证码'; }
|
|
302
|
+
} catch (err) { showMsg('error', '网络异常:' + (err.message || String(err))); btnSend.disabled = false; btnSend.textContent = '获取验证码'; }
|
|
303
|
+
});
|
|
304
|
+
btnSmsLogin.addEventListener('click', async () => {
|
|
305
|
+
const p = phone.value.trim(), c = code.value.trim();
|
|
306
|
+
if (!/^1[3-9]\\d{9}$/.test(p)) { showMsg('error', '请输入正确的 11 位手机号'); return; }
|
|
307
|
+
if (!c) { showMsg('error', '请输入收到的短信验证码'); return; }
|
|
308
|
+
btnSmsLogin.disabled = true; btnSmsLogin.textContent = '登录中...';
|
|
309
|
+
try {
|
|
310
|
+
const data = await post('/loomy/submit-code', { phone: p, code: c });
|
|
311
|
+
if (data.ok) { showMsg('success', '✅ 登录成功!请关闭本窗口返回 IDE。'); btnSmsLogin.style.display = 'none'; }
|
|
312
|
+
else { showMsg('error', data.message || '验证码登录失败,请重试'); btnSmsLogin.disabled = false; btnSmsLogin.textContent = '登录'; }
|
|
313
|
+
} catch (err) { showMsg('error', '网络异常:' + (err.message || String(err))); btnSmsLogin.disabled = false; btnSmsLogin.textContent = '登录'; }
|
|
314
|
+
});
|
|
315
|
+
btnPwdLogin.addEventListener('click', async () => {
|
|
316
|
+
const p = pwdPhone.value.trim(), w = pwd.value;
|
|
317
|
+
if (!/^1[3-9]\\d{9}$/.test(p)) { showMsg('error', '请输入正确的 11 位手机号'); return; }
|
|
318
|
+
if (!w) { showMsg('error', '请输入密码'); return; }
|
|
319
|
+
btnPwdLogin.disabled = true; btnPwdLogin.textContent = '登录中...';
|
|
320
|
+
try {
|
|
321
|
+
const data = await post('/loomy/login-password', { phone: p, password: w });
|
|
322
|
+
if (data.ok) { showMsg('success', '✅ 登录成功!该账号将支持自动续期。请关闭本窗口返回 IDE。'); btnPwdLogin.style.display = 'none'; }
|
|
323
|
+
else { showMsg('error', data.message || '密码登录失败,请核对账号密码'); btnPwdLogin.disabled = false; btnPwdLogin.textContent = '登录并记住密码(可自动续期)'; }
|
|
324
|
+
} catch (err) { showMsg('error', '网络异常:' + (err.message || String(err))); btnPwdLogin.disabled = false; btnPwdLogin.textContent = '登录并记住密码(可自动续期)'; }
|
|
325
|
+
});
|
|
326
|
+
</script>
|
|
327
|
+
</body>
|
|
328
|
+
</html>`;
|
|
329
|
+
}
|
|
330
|
+
//# sourceMappingURL=loomy-sms-login.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"loomy-sms-login.js","sourceRoot":"","sources":["../src/loomy-sms-login.ts"],"names":[],"mappings":"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"}
|
package/lib/loomy.d.ts
CHANGED
|
@@ -60,6 +60,20 @@ export interface LoomyCredential {
|
|
|
60
60
|
* 登录请求里的 `expire` 参数,响应里不带到期时间。
|
|
61
61
|
*/
|
|
62
62
|
expires_at?: string;
|
|
63
|
+
/**
|
|
64
|
+
* 讯飞账号密码(**可选**,自动续期的根基,2026-11-01)。
|
|
65
|
+
*
|
|
66
|
+
* Loomy 的 session 是登录时**声明**的 14 天、服务端**没有 refresh 端点**
|
|
67
|
+
* ⇒ 到期只能重新登录;短信验证码每次都要人收,**密码重登**是唯一全自动
|
|
68
|
+
* 续期路径(协议:`getPuKey` → RSA/PKCS1v1.5 → `byPwd`,`rcode` 是服务端
|
|
69
|
+
* nonce 非验证码,见 `loomy-oauth.ts` 的 `loginLoomyByPassword`)。
|
|
70
|
+
*
|
|
71
|
+
* ⚠ **可选**:短信/微信登录的凭据没有它(不强迫用户提供密码),
|
|
72
|
+
* `isLoomyAutoRefreshable()` 据此判定该账号能否自动续期。
|
|
73
|
+
* ⚠ 备份 / WebDAV 同步走**加密信封**,密码随凭据整体加密落盘 ——
|
|
74
|
+
* 与产品内 AccessKey 常量(`.env.prod` 解密)的既有口径一致。
|
|
75
|
+
*/
|
|
76
|
+
password?: string;
|
|
63
77
|
}
|
|
64
78
|
/** 业务响应信封。 */
|
|
65
79
|
export interface LoomyEnvelope<T> {
|
|
@@ -132,6 +146,14 @@ export declare function isLoomyExpired(credential: LoomyCredential): boolean;
|
|
|
132
146
|
* 而不是假装能续期却永远失败。
|
|
133
147
|
*/
|
|
134
148
|
export declare function isLoomyRefreshable(_credential: LoomyCredential): boolean;
|
|
149
|
+
/**
|
|
150
|
+
* 该凭据**能否自动续期**(密码重登)。
|
|
151
|
+
*
|
|
152
|
+
* ⚠ 与 `isLoomyRefreshable`(恒 false,对协议的诚实标记)**语义不同**:
|
|
153
|
+
* 那个描述「服务端有没有 refresh 端点」(没有),这个描述「**本插件**能不能
|
|
154
|
+
* 在到期前用存下的凭据材料静默换新」(有密码才行)。UI 与续期调度读后者。
|
|
155
|
+
*/
|
|
156
|
+
export declare function isLoomyAutoRefreshable(credential: LoomyCredential): boolean;
|
|
135
157
|
/**
|
|
136
158
|
* 业务端点请求头(`/models`、`/points/*`、`/onboarding/*`)。
|
|
137
159
|
*
|
package/lib/loomy.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loomy.d.ts","sourceRoot":"","sources":["../src/loomy.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AAEH,qCAAqC;AACrC,eAAO,MAAM,cAAc,qCAAqC,CAAA;AAEhE,wBAAwB;AACxB,eAAO,MAAM,kBAAkB,+BAA+B,CAAA;AAE9D,aAAa;AACb,eAAO,MAAM,aAAa,WAAW,CAAA;AAErC,wCAAwC;AACxC,eAAO,MAAM,qBAAqB,WAAW,CAAA;AAE7C,2BAA2B;AAC3B,eAAO,MAAM,sBAAsB,WAAW,CAAA;AAE9C,8BAA8B;AAC9B,eAAO,MAAM,wBAAwB,QAAS,CAAA;AAE9C;;;;;;GAMG;AACH,MAAM,WAAW,eAAe;IAC9B,8BAA8B;IAC9B,YAAY,EAAE,MAAM,CAAA;IACpB,wBAAwB;IACxB,MAAM,EAAE,MAAM,CAAA;IACd,oBAAoB;IACpB,KAAK,EAAE,MAAM,CAAA;IACb,yCAAyC;IACzC,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB;;;;;OAKG;IACH,UAAU,CAAC,EAAE,MAAM,CAAA;
|
|
1
|
+
{"version":3,"file":"loomy.d.ts","sourceRoot":"","sources":["../src/loomy.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AAEH,qCAAqC;AACrC,eAAO,MAAM,cAAc,qCAAqC,CAAA;AAEhE,wBAAwB;AACxB,eAAO,MAAM,kBAAkB,+BAA+B,CAAA;AAE9D,aAAa;AACb,eAAO,MAAM,aAAa,WAAW,CAAA;AAErC,wCAAwC;AACxC,eAAO,MAAM,qBAAqB,WAAW,CAAA;AAE7C,2BAA2B;AAC3B,eAAO,MAAM,sBAAsB,WAAW,CAAA;AAE9C,8BAA8B;AAC9B,eAAO,MAAM,wBAAwB,QAAS,CAAA;AAE9C;;;;;;GAMG;AACH,MAAM,WAAW,eAAe;IAC9B,8BAA8B;IAC9B,YAAY,EAAE,MAAM,CAAA;IACpB,wBAAwB;IACxB,MAAM,EAAE,MAAM,CAAA;IACd,oBAAoB;IACpB,KAAK,EAAE,MAAM,CAAA;IACb,yCAAyC;IACzC,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB;;;;;OAKG;IACH,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB;;;;;;;;;;;;OAYG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB;AAED,cAAc;AACd,MAAM,WAAW,aAAa,CAAC,CAAC;IAC9B,EAAE,EAAE,OAAO,CAAA;IACX,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,CAAC,GAAG,SAAS,CAAA;CACpB;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,GAAG,aAAa,CAAC,CAAC,CAAC,CAkBxE;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAuB9E;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAGxD;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAKxD;AAED,mDAAmD;AACnD,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,eAAe,GAAG,MAAM,GAAG,SAAS,CAKrF;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,UAAU,EAAE,eAAe,GAAG,OAAO,CAGnE;AAED;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAAC,WAAW,EAAE,eAAe,GAAG,OAAO,CAExE;AAED;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CAAC,UAAU,EAAE,eAAe,GAAG,OAAO,CAE3E;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAE1E;AAED;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAOtE"}
|
package/lib/loomy.js
CHANGED
|
@@ -159,6 +159,16 @@ export function isLoomyExpired(credential) {
|
|
|
159
159
|
export function isLoomyRefreshable(_credential) {
|
|
160
160
|
return false;
|
|
161
161
|
}
|
|
162
|
+
/**
|
|
163
|
+
* 该凭据**能否自动续期**(密码重登)。
|
|
164
|
+
*
|
|
165
|
+
* ⚠ 与 `isLoomyRefreshable`(恒 false,对协议的诚实标记)**语义不同**:
|
|
166
|
+
* 那个描述「服务端有没有 refresh 端点」(没有),这个描述「**本插件**能不能
|
|
167
|
+
* 在到期前用存下的凭据材料静默换新」(有密码才行)。UI 与续期调度读后者。
|
|
168
|
+
*/
|
|
169
|
+
export function isLoomyAutoRefreshable(credential) {
|
|
170
|
+
return typeof credential.password === 'string' && credential.password.length > 0;
|
|
171
|
+
}
|
|
162
172
|
/**
|
|
163
173
|
* 业务端点请求头(`/models`、`/points/*`、`/onboarding/*`)。
|
|
164
174
|
*
|
package/lib/loomy.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loomy.js","sourceRoot":"","sources":["../src/loomy.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AAEH,qCAAqC;AACrC,MAAM,CAAC,MAAM,cAAc,GAAG,kCAAkC,CAAA;AAEhE,wBAAwB;AACxB,MAAM,CAAC,MAAM,kBAAkB,GAAG,4BAA4B,CAAA;AAE9D,aAAa;AACb,MAAM,CAAC,MAAM,aAAa,GAAG,QAAQ,CAAA;AAErC,wCAAwC;AACxC,MAAM,CAAC,MAAM,qBAAqB,GAAG,QAAQ,CAAA;AAE7C,2BAA2B;AAC3B,MAAM,CAAC,MAAM,sBAAsB,GAAG,QAAQ,CAAA;AAE9C,8BAA8B;AAC9B,MAAM,CAAC,MAAM,wBAAwB,GAAG,MAAM,CAAA;
|
|
1
|
+
{"version":3,"file":"loomy.js","sourceRoot":"","sources":["../src/loomy.ts"],"names":[],"mappings":"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"}
|
package/lib/officeace-auth.d.ts
CHANGED
|
@@ -41,6 +41,21 @@ export type DpopPrivateJwk = {
|
|
|
41
41
|
d?: string;
|
|
42
42
|
};
|
|
43
43
|
type JsonWebKey = DpopPrivateJwk;
|
|
44
|
+
/**
|
|
45
|
+
* OfficeAce 的 refresh_token 已**永久失效**(STS5.1806 / invalid_grant)——
|
|
46
|
+
* 与 `oauth.ts` 的 `RefreshTokenExpiredError`、`buddy-oauth.ts` 等各家的同名类
|
|
47
|
+
* **同构但独立**(跨模块 `instanceof` 恒为 false,expiry-sync.ts 的 PR159 教训),
|
|
48
|
+
* 故本家调用方只认本类。
|
|
49
|
+
*
|
|
50
|
+
* 触发形态(2026-11-01 用户报障,日志每 30 分钟重复同一条):
|
|
51
|
+
* `{"error_code":"STS5.1806","error_msg":"invalid refresh token: 'the refresh
|
|
52
|
+
* token has been used'"}`。refresh_token 一次性,该错误**重试无意义**,
|
|
53
|
+
* 唯一出路是重新登录 ⇒ 调用方必须把池条目的 `refreshable` 标成 `false`,
|
|
54
|
+
* 让调度器停手。
|
|
55
|
+
*/
|
|
56
|
+
export declare class OfficeAceRefreshTokenExpiredError extends Error {
|
|
57
|
+
constructor(message: string);
|
|
58
|
+
}
|
|
44
59
|
export interface OfficeAceCredential {
|
|
45
60
|
/** MaaS 推理的 Basic 凭据对(permission-validate 返回)。 */
|
|
46
61
|
modelAppKey: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"officeace-auth.d.ts","sourceRoot":"","sources":["../src/officeace-auth.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AAUH,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAA;AAMlD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAA;AAEtD,0DAA0D;AAC1D,MAAM,MAAM,cAAc,GAAG;IAAE,GAAG,CAAC,EAAE,MAAM,CAAC;IAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,CAAC,EAAE,MAAM,CAAA;CAAE,CAAA;AAC/F,KAAK,UAAU,GAAG,cAAc,CAAA;
|
|
1
|
+
{"version":3,"file":"officeace-auth.d.ts","sourceRoot":"","sources":["../src/officeace-auth.ts"],"names":[],"mappings":"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"}
|
package/lib/officeace-auth.js
CHANGED
|
@@ -45,6 +45,24 @@ import { markLoginNeedsExternalAction } from './login-failure.js';
|
|
|
45
45
|
/** 华为云端点(与 OfficeAce green-package 的默认值一致)。 */
|
|
46
46
|
const CLAW_BASE = 'https://agentarts.cn-southwest-2.myhuaweicloud.com';
|
|
47
47
|
const TOKEN_URL = 'https://sts.cn-north-4.myhuaweicloud.com/v1/oauth2/tokens';
|
|
48
|
+
/**
|
|
49
|
+
* OfficeAce 的 refresh_token 已**永久失效**(STS5.1806 / invalid_grant)——
|
|
50
|
+
* 与 `oauth.ts` 的 `RefreshTokenExpiredError`、`buddy-oauth.ts` 等各家的同名类
|
|
51
|
+
* **同构但独立**(跨模块 `instanceof` 恒为 false,expiry-sync.ts 的 PR159 教训),
|
|
52
|
+
* 故本家调用方只认本类。
|
|
53
|
+
*
|
|
54
|
+
* 触发形态(2026-11-01 用户报障,日志每 30 分钟重复同一条):
|
|
55
|
+
* `{"error_code":"STS5.1806","error_msg":"invalid refresh token: 'the refresh
|
|
56
|
+
* token has been used'"}`。refresh_token 一次性,该错误**重试无意义**,
|
|
57
|
+
* 唯一出路是重新登录 ⇒ 调用方必须把池条目的 `refreshable` 标成 `false`,
|
|
58
|
+
* 让调度器停手。
|
|
59
|
+
*/
|
|
60
|
+
export class OfficeAceRefreshTokenExpiredError extends Error {
|
|
61
|
+
constructor(message) {
|
|
62
|
+
super(message);
|
|
63
|
+
this.name = 'OfficeAceRefreshTokenExpiredError';
|
|
64
|
+
}
|
|
65
|
+
}
|
|
48
66
|
const CLIENT_ID = 'pdp5_for_agentarts';
|
|
49
67
|
const REDIRECT_URI = `${CLAW_BASE}/v1/claw/auth/callback`;
|
|
50
68
|
/**
|
|
@@ -645,6 +663,19 @@ async function doRefreshCredential(current) {
|
|
|
645
663
|
// `return undefined`,refresh_token 被消费丢失(STS5.1806)时日志零字,
|
|
646
664
|
// 用户只看到「渠道停了 / 余额不更新」,无从排查(2026-10-12 事故实测)。
|
|
647
665
|
const detail = await r.text().catch(() => '');
|
|
666
|
+
/**
|
|
667
|
+
* ★ STS5.1806 是**终态**(2026-11-01 用户报障:日志每 30 分钟刷屏同一条):
|
|
668
|
+
* `{"error_code":"STS5.1806","error_msg":"invalid refresh token: 'the
|
|
669
|
+
* refresh token has been used'"}` —— refresh_token 一次性,重试一万次
|
|
670
|
+
* 也是同一报文。原先只 warn + 返回 undefined,30 分钟调度器 / 积分自愈 /
|
|
671
|
+
* 适配器 401 兜底三条入口**每条都拿同一个死 token 再烧一次**,既刷屏
|
|
672
|
+
* 又永不自愈(oauth.ts 的 IKQY27 早已把该码定为终态,但本路径没接)。
|
|
673
|
+
* 抛 {@link OfficeAceRefreshTokenExpiredError} 让调用方把池里的
|
|
674
|
+
* `refreshable` 标成 false,调度器从此跳过该账号。
|
|
675
|
+
*/
|
|
676
|
+
if (r.status === 400 && /STS5\.1806|refresh\s*token\s+has\s+been\s+used|invalid_grant/i.test(detail)) {
|
|
677
|
+
throw new OfficeAceRefreshTokenExpiredError(`OfficeAce refresh_token 已失效(HTTP ${r.status}):${detail.slice(0, 200)} —— 请在面板删除该账号后重新登录`);
|
|
678
|
+
}
|
|
648
679
|
console.warn(`[officeace] STS 续期失败 HTTP ${r.status}:${detail.slice(0, 200)}`
|
|
649
680
|
+ '(refresh_token 是一次性的:若报 STS5.1806 已被消费,必须重新登录才能恢复云端 API)');
|
|
650
681
|
return undefined;
|
|
@@ -723,11 +754,63 @@ export async function refreshAccountCredential(refName, pool, accountId, credent
|
|
|
723
754
|
await writebackExpiry(current, pool, accountId);
|
|
724
755
|
return;
|
|
725
756
|
}
|
|
726
|
-
|
|
757
|
+
let next;
|
|
758
|
+
try {
|
|
759
|
+
next = await doRefreshCredential(current);
|
|
760
|
+
}
|
|
761
|
+
catch (error) {
|
|
762
|
+
if (error instanceof OfficeAceRefreshTokenExpiredError) {
|
|
763
|
+
/**
|
|
764
|
+
* ★ 终态(STS5.1806 / invalid_grant)也必须先过**规则 3**:并发/跨进程
|
|
765
|
+
* 下服务端烧掉的是旧 token,磁盘上可能已躺着新凭据 —— 那是「他处已续
|
|
766
|
+
* 成功」,标死它就是把好账号永久标死(gemini-auth.ts 头注释记过的
|
|
767
|
+
* 单向门形态)。重读没有更新凭据才真标死。
|
|
768
|
+
*/
|
|
769
|
+
const elsewhere = await latestAfterFailedRefresh(refName, credentials, current);
|
|
770
|
+
if (elsewhere !== undefined) {
|
|
771
|
+
await writebackExpiry(elsewhere, pool, accountId);
|
|
772
|
+
return;
|
|
773
|
+
}
|
|
774
|
+
/**
|
|
775
|
+
* ★ 真终态:标死并如实记日志(含上游原文,用户能看到「已被消费」的事实)。
|
|
776
|
+
* ⚠️ 标死失败只记日志不抛 —— 退回「每 30 分钟白烧一次请求」的旧
|
|
777
|
+
* 形态也好过让单账号的终态炸掉整轮批量续期。
|
|
778
|
+
* ⚠️ 自愈路径只有「重新登录」(jet-hub-rpc 的 handover 写
|
|
779
|
+
* `refreshable: true`)—— 判据是**异常类型**而非任何一次失败,
|
|
780
|
+
* 瞬时网络错误不会走到这里(返回 undefined 那条腿)。
|
|
781
|
+
*/
|
|
782
|
+
try {
|
|
783
|
+
await pool
|
|
784
|
+
?.updateAccount?.(accountId, { refreshable: false });
|
|
785
|
+
}
|
|
786
|
+
catch (patchError) {
|
|
787
|
+
console.warn(`[officeace] 终态标记写入账号池失败(${accountId}):${String(patchError)}`);
|
|
788
|
+
}
|
|
789
|
+
console.warn(`[officeace] ${error.message}`);
|
|
790
|
+
return;
|
|
791
|
+
}
|
|
792
|
+
throw error;
|
|
793
|
+
}
|
|
727
794
|
if (next === undefined) {
|
|
728
795
|
// ⚠️ **判终态前重读**(规则 3):先确认「是不是别处已经续成功了」。
|
|
729
796
|
const elsewhere = await latestAfterFailedRefresh(refName, credentials, current);
|
|
730
|
-
|
|
797
|
+
if (elsewhere !== undefined) {
|
|
798
|
+
await writebackExpiry(elsewhere, pool, accountId);
|
|
799
|
+
return;
|
|
800
|
+
}
|
|
801
|
+
/**
|
|
802
|
+
* ★ 真终态必须**标死**(2026-11-01 用户报障):原先这里静默返回,
|
|
803
|
+
* 30 分钟调度器 / 积分自愈 / 适配器 401 兜底三条入口每条都拿同一个
|
|
804
|
+
* 死 token 再烧一次 —— 日志每 30 分钟刷同一条 STS5.1806 且永不自愈。
|
|
805
|
+
* 把池条目的 `refreshable` 写成 false(调度器只按它过滤、不看 enabled),
|
|
806
|
+
* 面板同步显示「需重新登录」。
|
|
807
|
+
*
|
|
808
|
+
* ⚠️ 走到这里的还有一种情况:`doRefreshCredential` 返回 undefined 的
|
|
809
|
+
* **非终态**失败(无 refresh_token 的残缺凭据、网络读体失败等)。
|
|
810
|
+
* 那类失败维持「静默返回、下轮再试」的既有语义,**不标死**
|
|
811
|
+
* (一次瞬时失败把账号永久标死是 account-pool.ts:2785 记过的教训)。
|
|
812
|
+
* 故终态标记只由下面 catch 的**异常类型**触发。
|
|
813
|
+
*/
|
|
731
814
|
return;
|
|
732
815
|
}
|
|
733
816
|
if (credentials !== undefined) {
|
|
@@ -886,6 +969,20 @@ export async function refreshAccountList(pool, refreshOne, fallbackRefresh = ref
|
|
|
886
969
|
return;
|
|
887
970
|
}
|
|
888
971
|
for (const account of accounts) {
|
|
972
|
+
/**
|
|
973
|
+
* ★ 跳过已被**终态**标死的账号(`refreshable: false`,2026-11-01):
|
|
974
|
+
* STS5.1806 后不标过滤会让调度器每 30 分钟对死 token 白烧一次请求
|
|
975
|
+
* (用户报障的刷屏本体)。
|
|
976
|
+
*
|
|
977
|
+
* ⚠️ 为什么取「!== false」而不是真值过滤(gemini 那条单向门教训):
|
|
978
|
+
* `refreshable` 在老条目上可能**缺省**(undefined)—— 真值过滤会把
|
|
979
|
+
* 它们一并挡掉(老账号静默停止续期)。只跳**显式 false**,undefined
|
|
980
|
+
* 照常进循环,由 lead-time 判据与凭据材料本身决定发不发请求。
|
|
981
|
+
* ⚠️ 误标的自愈不在这里:`updateAccount(refreshable:true)` 只由
|
|
982
|
+
* 重新登录(handover)与续期成功路径写,本层不反转别人的标记。
|
|
983
|
+
*/
|
|
984
|
+
if (account.refreshable === false)
|
|
985
|
+
continue;
|
|
889
986
|
await refreshOne(account);
|
|
890
987
|
}
|
|
891
988
|
}
|