@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.
@@ -24,6 +24,7 @@ import { type CredentialRef } from '@deepseek-ai/dsh-credentials';
24
24
  import { type LoomyCredential } from './loomy.js';
25
25
  import { type LoomyProduct } from './loomy-product.js';
26
26
  import { type StartedLoomyWechatLoginFlow } from './loomy-wechat-login.js';
27
+ import { type StartedLoomySmsLoginFlow } from './loomy-sms-login.js';
27
28
  import { AccountPool } from './account-pool.js';
28
29
  /**
29
30
  * Loomy 的默认凭据 ref。
@@ -138,6 +139,31 @@ export declare class LoomyAuth extends Service {
138
139
  }, flowOptions?: {
139
140
  refName?: string;
140
141
  }): Promise<LoomyLoginResult>;
142
+ /**
143
+ * 启动**独立短信登录流**(2026-11-01 接入,微信扫码之外的第二条路)。
144
+ *
145
+ * 本地服务器承载表单页(短信验证码 + 密码直登两个 Tab),立即返回
146
+ * `loginUrl` —— 与其余 provider 的「两步式」契约一致。表单里**选填密码**
147
+ * (短信 Tab 不填、密码 Tab 必填):填了 ⇒ 该账号此后可**自动续期**
148
+ * (`autoRenewCredential`),不填 ⇒ 维持「到期重新登录」语义。
149
+ *
150
+ * 协议与编排的分界:发码/验码/密码登录都在 `loomy-oauth.ts` /
151
+ * `loomy-sms-login.ts`,本方法只转交调用。
152
+ */
153
+ startSmsLogin(): Promise<StartedLoomySmsLoginFlow>;
154
+ /**
155
+ * 把短信/密码登录流的结果落盘成凭据(与 `persistWechatLogin` 同构)。
156
+ *
157
+ * `outcome.password` 存在 ⇒ 写进凭据(该账号可自动续期);缺失 ⇒ 不写。
158
+ */
159
+ persistSmsLogin(outcome: {
160
+ session: string;
161
+ userid: string;
162
+ phone: string;
163
+ password?: string;
164
+ }, flowOptions?: {
165
+ refName?: string;
166
+ }): Promise<LoomyLoginResult>;
141
167
  /**
142
168
  * 用短信验证码登录并持久化凭据。
143
169
  *
@@ -184,6 +210,31 @@ export declare class LoomyAuth extends Service {
184
210
  * 只回写 `expiresAt`,见 `LOOMY_EXPIRY_ACCESSORS` 的说明。
185
211
  */
186
212
  refreshAccountCredential(refName: string, pool?: AccountPool, accountId?: string): Promise<void>;
213
+ /**
214
+ * **自动续期**(密码重登,2026-11-01 接入)。
215
+ *
216
+ * ## 协议事实与设计
217
+ *
218
+ * Loomy 的 session 是登录时**声明**的 14 天,服务端**没有 refresh 端点**
219
+ * ——「续期」唯一的全自动形态是**用存下的密码重新走一遍登录**
220
+ * (`getPuKey` → RSA/PKCS1v1.5 → `byPwd`;`rcode` 是服务端 nonce,
221
+ * 全程无需用户输入)。这是 loomy2api 项目 `ensure_session` 的同款策略:
222
+ * 剩余寿命不足 {@link LOOMY_AUTO_RENEW_LEAD_MS} 时静默重登一次。
223
+ *
224
+ * ## 判据与边界
225
+ *
226
+ * - 只对**带密码**的凭据生效(`isLoomyAutoRefreshable`):短信/微信登录的
227
+ * 凭据没有密码,维持「探测 + 提示重新登录」的既有语义;
228
+ * - lead-time 取 **3 天**(loomy2api 同值):重登会立刻换新 session,
229
+ * 提前量过小会在宿主停机几天后错过窗口;
230
+ * - 重登成功**原样写回同一个 ref**(密码字段保留),账号池 `expiresAt`
231
+ * 随之对账 —— 调用方(`refreshAccountCredential`)无需感知细节;
232
+ * - 重登失败按错误类型分派:凭据类错误(密码被改 / 账号被封)抛
233
+ * `RefreshTokenExpiredError` 终态;网络类错误原样上抛(下轮再试)。
234
+ *
235
+ * @returns 新凭据(已落盘);不可自动续期时返回 `undefined`(调用方回退探测)。
236
+ */
237
+ autoRenewCredential(credential: LoomyCredential): Promise<LoomyCredential | undefined>;
187
238
  /**
188
239
  * 用一次轻量只读请求验证凭据是否仍然有效。
189
240
  *
@@ -1 +1 @@
1
- {"version":3,"file":"loomy-auth.d.ts","sourceRoot":"","sources":["../src/loomy-auth.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"loomy-auth.d.ts","sourceRoot":"","sources":["../src/loomy-auth.ts"],"names":[],"mappings":"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"}
package/lib/loomy-auth.js CHANGED
@@ -21,13 +21,20 @@
21
21
  */
22
22
  import { Service } from '@deepseek-ai/cordis';
23
23
  import { credentialRef } from '@deepseek-ai/dsh-credentials';
24
- import { LOOMY_AUTH_ERROR_CODE, LOOMY_REQUEST_TIMEOUT_MS, credentialExpiresAtMs, isLoomyExpired, parseLoomyEnvelope, } from './loomy.js';
24
+ import { LOOMY_AUTH_ERROR_CODE, LOOMY_REQUEST_TIMEOUT_MS, credentialExpiresAtMs, isLoomyAutoRefreshable, isLoomyExpired, parseLoomyEnvelope, } from './loomy.js';
25
25
  import { LOOMY } from './loomy-product.js';
26
- import { LOOMY_SESSION_TTL_SECONDS, loginLoomyBySmsCode, sendLoomySmsCode } from './loomy-oauth.js';
26
+ import { LOOMY_SESSION_TTL_SECONDS, loginLoomyByPassword, loginLoomyBySmsCode, sendLoomySmsCode, } from './loomy-oauth.js';
27
27
  import { startLoomyWechatLoginFlow, } from './loomy-wechat-login.js';
28
+ import { startLoomySmsLoginFlow, } from './loomy-sms-login.js';
28
29
  import { claimLoomyDailyQuota, fetchLoomyCreditBalance, fetchLoomyCreditDetail } from './loomy-credits.js';
29
30
  import { claimAllLoomyOnboardingTasks, fetchLoomyOnboardingTasks, } from './loomy-onboarding.js';
30
31
  import { syncAccountExpiry } from './expiry-sync.js';
32
+ /**
33
+ * 自动续期(密码重登)的提前量:剩余寿命不足 3 天时触发。
34
+ * 与 loomy2api 的 session_renew_before_days 同值;session 总寿命 14 天,
35
+ * 提前 3 天重登意味着每 11 天最多付一次登录请求。
36
+ */
37
+ const LOOMY_AUTO_RENEW_LEAD_MS = 3 * 24 * 60 * 60 * 1000;
31
38
  /**
32
39
  * Loomy 凭据 → 账号池有效期的提取器。
33
40
  *
@@ -160,6 +167,52 @@ export class LoomyAuth extends Service {
160
167
  refreshable: false,
161
168
  };
162
169
  }
170
+ /**
171
+ * 启动**独立短信登录流**(2026-11-01 接入,微信扫码之外的第二条路)。
172
+ *
173
+ * 本地服务器承载表单页(短信验证码 + 密码直登两个 Tab),立即返回
174
+ * `loginUrl` —— 与其余 provider 的「两步式」契约一致。表单里**选填密码**
175
+ * (短信 Tab 不填、密码 Tab 必填):填了 ⇒ 该账号此后可**自动续期**
176
+ * (`autoRenewCredential`),不填 ⇒ 维持「到期重新登录」语义。
177
+ *
178
+ * 协议与编排的分界:发码/验码/密码登录都在 `loomy-oauth.ts` /
179
+ * `loomy-sms-login.ts`,本方法只转交调用。
180
+ */
181
+ async startSmsLogin() {
182
+ this.active = true;
183
+ return startLoomySmsLoginFlow({
184
+ product: this.product,
185
+ ...this.options.fetcher === undefined ? {} : { fetcher: this.options.fetcher },
186
+ });
187
+ }
188
+ /**
189
+ * 把短信/密码登录流的结果落盘成凭据(与 `persistWechatLogin` 同构)。
190
+ *
191
+ * `outcome.password` 存在 ⇒ 写进凭据(该账号可自动续期);缺失 ⇒ 不写。
192
+ */
193
+ async persistSmsLogin(outcome, flowOptions = {}) {
194
+ const credential = this.buildCredential(outcome.session, outcome.userid, outcome.phone);
195
+ if (outcome.password !== undefined && outcome.password.length > 0) {
196
+ credential.password = outcome.password;
197
+ }
198
+ const refName = flowOptions.refName ?? this.credentialRefName;
199
+ const ref = credentialRef(refName);
200
+ await this.ctx.credentials.set(ref, JSON.stringify(credential));
201
+ this.lastRefreshError = undefined;
202
+ // 尽力初始化每日额度(与官方登录后行为一致;失败不影响登录)。
203
+ try {
204
+ await claimLoomyDailyQuota(credential, this.product, this.fetchImpl);
205
+ }
206
+ catch (error) {
207
+ this.ctx.logger?.warn?.(`[loomy] 短信登录后初始化每日额度失败(不影响登录):${error instanceof Error ? error.message : String(error)}`);
208
+ }
209
+ return {
210
+ access: JSON.stringify(credential),
211
+ expires: credentialExpiresAtMs(credential) ?? 0,
212
+ ref,
213
+ refreshable: false,
214
+ };
215
+ }
163
216
  /**
164
217
  * 用短信验证码登录并持久化凭据。
165
218
  *
@@ -278,6 +331,32 @@ export class LoomyAuth extends Service {
278
331
  const credential = parseCredential(resolved.value);
279
332
  if (!credential)
280
333
  throw new RefreshTokenExpiredError('凭据解析失败,请重新登录 Loomy');
334
+ // ★ 先试**自动续期**(密码重登,2026-11-01):带密码且临期的账号在这里
335
+ // 静默换新,用户无感;不带密码(短信/微信登录)返回 undefined,回落
336
+ // 到下面的既有探测语义(失效 ⇒ 提示重新登录)。
337
+ // ⚠ 续期失败(网络抖动)必须**继续探测**而不是直接抛:重登腿挂了
338
+ // 不代表现有 session 已死 —— probe 才是「凭据是否仍有效」的权威。
339
+ let renewed;
340
+ try {
341
+ renewed = await this.autoRenewCredential(credential);
342
+ }
343
+ catch (error) {
344
+ this.ctx.logger?.warn?.(`[loomy] 自动续期(密码重登)失败,回落到凭据探测:${error instanceof Error ? error.message : String(error)}`);
345
+ }
346
+ if (renewed !== undefined) {
347
+ // 新凭据写回**同一个 ref**(含密码字段,下个周期还能续)。
348
+ await this.ctx.credentials.set(ref, JSON.stringify(renewed));
349
+ await syncAccountExpiry({
350
+ pool,
351
+ provider: this.product.id,
352
+ credential: renewed,
353
+ accessors: LOOMY_EXPIRY_ACCESSORS,
354
+ accountId,
355
+ tag: '[loomy]',
356
+ warn: (message) => this.ctx.logger?.warn?.(message),
357
+ });
358
+ return;
359
+ }
281
360
  await this.probeCredential(credential);
282
361
  await syncAccountExpiry({
283
362
  pool,
@@ -289,6 +368,45 @@ export class LoomyAuth extends Service {
289
368
  warn: (message) => this.ctx.logger?.warn?.(message),
290
369
  });
291
370
  }
371
+ /**
372
+ * **自动续期**(密码重登,2026-11-01 接入)。
373
+ *
374
+ * ## 协议事实与设计
375
+ *
376
+ * Loomy 的 session 是登录时**声明**的 14 天,服务端**没有 refresh 端点**
377
+ * ——「续期」唯一的全自动形态是**用存下的密码重新走一遍登录**
378
+ * (`getPuKey` → RSA/PKCS1v1.5 → `byPwd`;`rcode` 是服务端 nonce,
379
+ * 全程无需用户输入)。这是 loomy2api 项目 `ensure_session` 的同款策略:
380
+ * 剩余寿命不足 {@link LOOMY_AUTO_RENEW_LEAD_MS} 时静默重登一次。
381
+ *
382
+ * ## 判据与边界
383
+ *
384
+ * - 只对**带密码**的凭据生效(`isLoomyAutoRefreshable`):短信/微信登录的
385
+ * 凭据没有密码,维持「探测 + 提示重新登录」的既有语义;
386
+ * - lead-time 取 **3 天**(loomy2api 同值):重登会立刻换新 session,
387
+ * 提前量过小会在宿主停机几天后错过窗口;
388
+ * - 重登成功**原样写回同一个 ref**(密码字段保留),账号池 `expiresAt`
389
+ * 随之对账 —— 调用方(`refreshAccountCredential`)无需感知细节;
390
+ * - 重登失败按错误类型分派:凭据类错误(密码被改 / 账号被封)抛
391
+ * `RefreshTokenExpiredError` 终态;网络类错误原样上抛(下轮再试)。
392
+ *
393
+ * @returns 新凭据(已落盘);不可自动续期时返回 `undefined`(调用方回退探测)。
394
+ */
395
+ async autoRenewCredential(credential) {
396
+ if (!isLoomyAutoRefreshable(credential))
397
+ return undefined;
398
+ const expiresAt = credentialExpiresAtMs(credential);
399
+ // 未过期且距过期还远 ⇒ 不重登(每 30 分钟的调度器只对临期账号发请求)。
400
+ if (expiresAt !== undefined && expiresAt - Date.now() > LOOMY_AUTO_RENEW_LEAD_MS) {
401
+ return undefined;
402
+ }
403
+ const renewed = await loginLoomyByPassword(credential.phone, credential.password, this.product, this.fetchImpl);
404
+ const next = this.buildCredential(renewed.session, renewed.userid, credential.phone, credential.nickname);
405
+ // ⚠ 密码必须**带进新凭据**:buildCredential 不知道旧密码,丢了它
406
+ // 下个 14 天周期就无法再续(单向门)。
407
+ next.password = credential.password;
408
+ return next;
409
+ }
292
410
  /**
293
411
  * 用一次轻量只读请求验证凭据是否仍然有效。
294
412
  *
@@ -373,6 +491,35 @@ export class LoomyAuth extends Service {
373
491
  });
374
492
  continue;
375
493
  }
494
+ // ★ 先试**自动续期**(密码重登):过期账号若带密码,直接静默换新,
495
+ // 不必走「探测确认已死 → 提示重新登录」那条用户路径。
496
+ // 失败回落探测(重登腿挂了不代表 session 已死,与主路径同口径)。
497
+ let renewed;
498
+ try {
499
+ renewed = await this.autoRenewCredential(credential);
500
+ }
501
+ catch (error) {
502
+ this.ctx.logger?.warn?.(`[loomy] 账号 ${entry.id} 自动续期失败,回落探测:${error instanceof Error ? error.message : String(error)}`);
503
+ }
504
+ if (renewed !== undefined) {
505
+ try {
506
+ await this.ctx.credentials.set(ref, JSON.stringify(renewed));
507
+ await syncAccountExpiry({
508
+ pool,
509
+ provider: this.product.id,
510
+ credential: renewed,
511
+ accessors: LOOMY_EXPIRY_ACCESSORS,
512
+ accountId: entry.id,
513
+ current: entry,
514
+ tag: '[loomy]',
515
+ warn: (message) => this.ctx.logger?.warn?.(message),
516
+ });
517
+ }
518
+ catch (error) {
519
+ this.ctx.logger?.warn?.(`[loomy] 账号 ${entry.id} 续期结果落盘失败:${error instanceof Error ? error.message : String(error)}`);
520
+ }
521
+ continue;
522
+ }
376
523
  try {
377
524
  await this.probeCredential(credential);
378
525
  }
@@ -1 +1 @@
1
- {"version":3,"file":"loomy-auth.js","sourceRoot":"","sources":["../src/loomy-auth.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,OAAO,EAAE,OAAO,EAAgB,MAAM,qBAAqB,CAAA;AAC3D,OAAO,EAAE,aAAa,EAAsB,MAAM,8BAA8B,CAAA;AAChF,OAAO,EACL,qBAAqB,EACrB,wBAAwB,EACxB,qBAAqB,EACrB,cAAc,EACd,kBAAkB,GAEnB,MAAM,YAAY,CAAA;AACnB,OAAO,EAAE,KAAK,EAAqB,MAAM,oBAAoB,CAAA;AAC7D,OAAO,EAAE,yBAAyB,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAA;AACnG,OAAO,EACL,yBAAyB,GAE1B,MAAM,yBAAyB,CAAA;AAChC,OAAO,EAAE,oBAAoB,EAAE,uBAAuB,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAA;AAC1G,OAAO,EACL,4BAA4B,EAC5B,yBAAyB,GAC1B,MAAM,uBAAuB,CAAA;AAE9B,OAAO,EAAE,iBAAiB,EAAwB,MAAM,kBAAkB,CAAA;AAE1E;;;;;;;GAOG;AACH,MAAM,sBAAsB,GAAqC;IAC/D,WAAW,EAAE,qBAAqB;IAClC,UAAU,EAAE,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,YAAY,IAAI,EAAE;CAC1D,CAAA;AAED;;;;;GAKG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG,oBAAoB,CAAA;AAExD;;;;;;GAMG;AACH,MAAM,OAAO,wBAAyB,SAAQ,KAAK;IACjD,YAAY,OAAe;QACzB,KAAK,CAAC,OAAO,CAAC,CAAA;QACd,IAAI,CAAC,IAAI,GAAG,0BAA0B,CAAA;IACxC,CAAC;CACF;AAgCD,sCAAsC;AACtC,SAAS,eAAe,CAAC,KAAa;IACpC,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAoB,CAAA;QACnD,OAAO,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,IAAI,IAAI,OAAO,MAAM,CAAC,YAAY,KAAK,QAAQ;YAC7F,CAAC,CAAC,MAAM;YACR,CAAC,CAAC,SAAS,CAAA;IACf,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,SAAS,CAAA;IAClB,CAAC;AACH,CAAC;AAYD;;GAEG;AACH,MAAM,OAAO,SAAU,SAAQ,OAAO;IAuBO;IAtB3C,kBAAkB;IACT,OAAO,CAAc;IAC9B,+CAA+C;IACtC,iBAAiB,CAAQ;IAElC;;;;;;;;;;;OAWG;IACH,wCAAwC;IAChC,gBAAgB,CAAoB;IAC5C,yCAAyC;IACjC,MAAM,GAAG,IAAI,CAAA;IAErB,YAAY,GAAY,EAAmB,UAA4B,EAAE;QACvE,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,IAAI,KAAK,CAAA;QACxC,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,WAAW,IAAI,GAAG,OAAO,CAAC,EAAE,MAAM,CAAC,CAAA;QAFb,YAAO,GAAP,OAAO,CAAuB;QAGvE,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACtB,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAA;IAC5D,CAAC;IAED,kCAAkC;IAClC,IAAY,SAAS;QACnB,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,IAAI,KAAK,CAAA;IACtC,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,WAAW,CAAC,KAAa;QAC7B,OAAO,gBAAgB,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,CAAA;IAC9D,CAAC;IAED;;;;;;;;;;OAUG;IACH,KAAK,CAAC,gBAAgB;QACpB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAA;QAClB,OAAO,yBAAyB,CAAC;YAC/B,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE;SAC/E,CAAC,CAAA;IACJ,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,kBAAkB,CACtB,KAA4E,EAC5E,cAAoC,EAAE;QAEtC,MAAM,UAAU,GAAG,IAAI,CAAC,eAAe,CACrC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,QAAQ,CACzD,CAAA;QACD,MAAM,OAAO,GAAG,WAAW,CAAC,OAAO,IAAI,IAAI,CAAC,iBAAiB,CAAA;QAC7D,MAAM,GAAG,GAAG,aAAa,CAAC,OAAO,CAAC,CAAA;QAClC,MAAM,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,CAAA;QAC/D,IAAI,CAAC,gBAAgB,GAAG,SAAS,CAAA;QAEjC,iCAAiC;QACjC,IAAI,CAAC;YACH,MAAM,oBAAoB,CAAC,UAAU,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,CAAA;QACtE,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,EAAE,CACrB,iCAAiC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAC1F,CAAA;QACH,CAAC;QAED,OAAO;YACL,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC;YAClC,OAAO,EAAE,qBAAqB,CAAC,UAAU,CAAC,IAAI,CAAC;YAC/C,GAAG;YACH,WAAW,EAAE,KAAK;SACnB,CAAA;IACH,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,gBAAgB,CACpB,KAAa,EACb,IAAY,EACZ,KAAa,EACb,cAA4E,EAAE;QAE9E,IAAI,CAAC,MAAM,GAAG,IAAI,CAAA;QAClB,MAAM,MAAM,GAAG,MAAM,mBAAmB,CAAC,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,CAAA;QAC1F,MAAM,UAAU,GAAG,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;QAC7E,MAAM,OAAO,GAAG,WAAW,CAAC,OAAO,IAAI,IAAI,CAAC,iBAAiB,CAAA;QAC7D,MAAM,GAAG,GAAG,aAAa,CAAC,OAAO,CAAC,CAAA;QAClC,MAAM,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,CAAA;QAE/D,IAAI,CAAC,gBAAgB,GAAG,SAAS,CAAA;QAEjC,wCAAwC;QACxC,oCAAoC;QACpC,IAAI,CAAC;YACH,MAAM,oBAAoB,CAAC,UAAU,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,CAAA;QACtE,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,EAAE,CACrB,+BAA+B,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CACxF,CAAA;QACH,CAAC;QAED,OAAO;YACL,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC;YAClC,OAAO,EAAE,qBAAqB,CAAC,UAAU,CAAC,IAAI,CAAC;YAC/C,GAAG;YACH,0BAA0B;YAC1B,WAAW,EAAE,KAAK;SACnB,CAAA;IACH,CAAC;IAED;;;;;OAKG;IACH,eAAe,CAAC,OAAe,EAAE,MAAc,EAAE,KAAa,EAAE,QAAiB;QAC/E,OAAO;YACL,YAAY,EAAE,OAAO;YACrB,MAAM;YACN,KAAK;YACL,GAAG,QAAQ,KAAK,SAAS,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE;YACtE,UAAU,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,yBAAyB,GAAG,IAAI,CAAC;SAClE,CAAA;IACH,CAAC;IAED,uBAAuB;IACf,KAAK,CAAC,wBAAwB;QACpC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAA;QAC1F,OAAO,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,eAAe,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;IAC7E,CAAC;IAED,cAAc;IACd,KAAK,CAAC,MAAM;QACV,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,wBAAwB,EAAE,CAAA;QACxD,IAAI,UAAU,KAAK,SAAS;YAAE,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,CAAA;QAC9E,MAAM,SAAS,GAAG,qBAAqB,CAAC,UAAU,CAAC,CAAA;QACnD,OAAO;YACL,UAAU,EAAE,IAAI;YAChB,MAAM,EAAE,IAAI,CAAC,iBAAiB;YAC9B,GAAG,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE;YAC/C,2CAA2C;YAC3C,WAAW,EAAE,KAAK;YAClB,GAAG,IAAI,CAAC,gBAAgB,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,IAAI,CAAC,gBAAgB,EAAE;SACtF,CAAA;IACH,CAAC;IAED;;;;;;;OAOG;IACH,KAAK,CAAC,OAAO;QACX,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,wBAAwB,EAAE,CAAA;QACxD,IAAI,UAAU,KAAK,SAAS;YAAE,MAAM,IAAI,wBAAwB,CAAC,YAAY,CAAC,CAAA;QAC9E,MAAM,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,CAAA;QACtC,IAAI,CAAC,gBAAgB,GAAG,SAAS,CAAA;IACnC,CAAC;IAED;;;;;;;;;;;;;;OAcG;IACH,KAAK,CAAC,wBAAwB,CAC5B,OAAe,EACf,IAAkB,EAClB,SAAkB;QAElB,MAAM,GAAG,GAAG,aAAa,CAAC,OAAO,CAAC,CAAA;QAClC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;QACxD,0CAA0C;QAC1C,EAAE;QACF,2BAA2B;QAC3B,wCAAwC;QACxC,mDAAmD;QACnD,EAAE;QACF,mDAAmD;QACnD,wDAAwD;QACxD,qCAAqC;QACrC,kEAAkE;QAClE,yCAAyC;QACzC,qCAAqC;QACrC,EAAE;QACF,+CAA+C;QAC/C,wDAAwD;QACxD,yBAAyB;QACzB,IAAI,CAAC,QAAQ;YAAE,MAAM,IAAI,wBAAwB,CAAC,4BAA4B,CAAC,CAAA;QAC/E,MAAM,UAAU,GAAG,eAAe,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;QAClD,IAAI,CAAC,UAAU;YAAE,MAAM,IAAI,wBAAwB,CAAC,oBAAoB,CAAC,CAAA;QACzE,MAAM,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,CAAA;QACtC,MAAM,iBAAiB,CAAC;YACtB,IAAI;YACJ,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE;YACzB,UAAU;YACV,SAAS,EAAE,sBAAsB;YACjC,SAAS;YACT,GAAG,EAAE,SAAS;YACd,IAAI,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,OAAO,CAAC;SACpD,CAAC,CAAA;IACJ,CAAC;IAED;;;;;;;OAOG;IACK,KAAK,CAAC,eAAe,CAAC,UAA2B;QACvD,IAAI,QAAkB,CAAA;QACtB,IAAI,CAAC;YACH,QAAQ,GAAG,MAAM,IAAI,CAAC,SAAS,CAC7B,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,oDAAoD,EAC3E;gBACE,MAAM,EAAE,KAAK;gBACb,OAAO,EAAE,EAAE,MAAM,EAAE,kBAAkB,EAAE,KAAK,EAAE,UAAU,CAAC,YAAY,EAAE;gBACvE,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,wBAAwB,CAAC;aACtD,CACF,CAAA;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,oCAAoC;YACpC,MAAM,IAAI,KAAK,CAAC,kBAAkB,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;QAC7F,CAAC;QAED,IAAI,MAAe,CAAA;QACnB,IAAI,CAAC;YACH,MAAM,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAA;QAChC,CAAC;QAAC,MAAM,CAAC;YACP,MAAM,IAAI,KAAK,CAAC,4BAA4B,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAA;QACjE,CAAC;QAED,MAAM,QAAQ,GAAG,kBAAkB,CAAC,MAAM,CAAC,CAAA;QAC3C,IAAI,QAAQ,CAAC,EAAE;YAAE,OAAM;QACvB,IAAI,QAAQ,CAAC,IAAI,KAAK,qBAAqB,EAAE,CAAC;YAC5C,gCAAgC;YAChC,2BAA2B;YAC3B,MAAM,IAAI,wBAAwB,CAAC,qBAAqB,QAAQ,CAAC,OAAO,GAAG,CAAC,CAAA;QAC9E,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,gBAAgB,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAA;IACrD,CAAC;IAED;;;;;;;;;;OAUG;IACH,KAAK,CAAC,UAAU,CAAC,IAAiB;QAChC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;QACzD,KAAK,MAAM,KAAK,IAAI,QAAQ,EAAE,CAAC;YAC7B,MAAM,GAAG,GAAG,aAAa,CAAC,KAAK,CAAC,aAAa,CAAC,CAAA;YAC9C,IAAI,UAAuC,CAAA;YAC3C,IAAI,CAAC;gBACH,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;gBACxD,IAAI,CAAC,QAAQ;oBAAE,SAAQ;gBACvB,UAAU,GAAG,eAAe,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;YAC9C,CAAC;YAAC,MAAM,CAAC;gBACP,SAAQ;YACV,CAAC;YACD,IAAI,UAAU,KAAK,SAAS;gBAAE,SAAQ;YAEtC,uCAAuC;YACvC,EAAE;YACF,2CAA2C;YAC3C,8CAA8C;YAC9C,yCAAyC;YACzC,sCAAsC;YACtC,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,EAAE,CAAC;gBAChC,MAAM,iBAAiB,CAAC;oBACtB,IAAI;oBACJ,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE;oBACzB,UAAU;oBACV,SAAS,EAAE,sBAAsB;oBACjC,SAAS,EAAE,KAAK,CAAC,EAAE;oBACnB,OAAO,EAAE,KAAK;oBACd,GAAG,EAAE,SAAS;oBACd,IAAI,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,OAAO,CAAC;iBACpD,CAAC,CAAA;gBACF,SAAQ;YACV,CAAC;YAED,IAAI,CAAC;gBACH,MAAM,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,CAAA;YACxC,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,IAAI,KAAK,YAAY,wBAAwB,EAAE,CAAC;oBAC9C,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,EAAE,CACrB,cAAc,KAAK,CAAC,EAAE,4BAA4B,CACnD,CAAA;gBACH,CAAC;qBAAM,CAAC;oBACN,kCAAkC;oBAClC,2BAA2B;oBAC3B,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,EAAE,CACrB,cAAc,KAAK,CAAC,EAAE,WAAW,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAC1F,CAAA;gBACH,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED,kBAAkB;IAClB,KAAK,CAAC,MAAM;QACV,IAAI,CAAC,MAAM,GAAG,KAAK,CAAA;QACnB,MAAM,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAA;QACvE,IAAI,CAAC,gBAAgB,GAAG,SAAS,CAAA;IACnC,CAAC;IAED;;;;;;;;;OASG;IACH,eAAe;QACb,oBAAoB;IACtB,CAAC;IAED;;;;;OAKG;IACH,IAAI;QACF,IAAI,CAAC,MAAM,GAAG,KAAK,CAAA;IACrB,CAAC;IAED,4DAA4D;IAE5D,sCAAsC;IACtC,KAAK,CAAC,kBAAkB,CAAC,UAA2B;QAClD,OAAO,uBAAuB,CAAC,UAAU,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,CAAA;IAC1E,CAAC;IAED,oBAAoB;IACpB,KAAK,CAAC,iBAAiB,CAAC,UAA2B;QACjD,OAAO,sBAAsB,CAAC,UAAU,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,CAAA;IACzE,CAAC;IAED,mBAAmB;IACnB,KAAK,CAAC,eAAe,CAAC,UAA2B;QAC/C,OAAO,oBAAoB,CAAC,UAAU,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,CAAA;IACvE,CAAC;IAED,gBAAgB;IAChB,KAAK,CAAC,oBAAoB,CAAC,UAA2B;QACpD,OAAO,yBAAyB,CAAC,UAAU,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,CAAA;IAC5E,CAAC;IAED,qBAAqB;IACrB,KAAK,CAAC,oBAAoB,CAAC,UAA2B;QACpD,OAAO,4BAA4B,CAAC,UAAU,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,CAAA;IAC/E,CAAC;CACF"}
1
+ {"version":3,"file":"loomy-auth.js","sourceRoot":"","sources":["../src/loomy-auth.ts"],"names":[],"mappings":"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"}
@@ -31,6 +31,50 @@ export declare const LOOMY_SMS_CODE_TTL_SECONDS = 300;
31
31
  * 故凭据的 `expires_at` 由本地按此推算。
32
32
  */
33
33
  export declare const LOOMY_SESSION_TTL_SECONDS = 1209600;
34
+ /**
35
+ * 密码登录(**自动续期的根基**,2026-11-01 接入)。
36
+ *
37
+ * ## 协议依据(loomy2api 逆向,`docs/PROTOCOL.md` §4.1)
38
+ *
39
+ * ```
40
+ * ① POST {accountBase}/login/account/getPuKey { base } → { pukey, rcode }
41
+ * ② POST {accountBase}/login/account/byPwd { base, param:{ loginid, password, rcode, type:1, expire } }
42
+ * password = base64(RSA_PKCS1v1.5(pukey, 明文)) → { session, userid, phone }
43
+ * ```
44
+ *
45
+ * ⚠⚠ **`rcode` 是服务端下发的 nonce,不是验证码** —— 这正是密码登录
46
+ * **可以全自动**的原因(短信登录才需要人收码)。别看名字像验证码就去找
47
+ * 「rcode 从哪获取用户输入」。
48
+ *
49
+ * ⚠ RSA 是 **1024 位 PKCS#1 v1.5**(DER SubjectPublicKeyInfo,base64):
50
+ * Node 的 `publicEncrypt` + `RSA_PKCS1_PADDING` 直接可用,无需自己拼 bignum。
51
+ * ⚠ `loginid` 是**手机号**(讯飞账号体系里手机号即登录名)。
52
+ *
53
+ * ## 为什么密码登录值得接(用户报障「实现短信登录加自动续期」)
54
+ *
55
+ * session 是登录时**声明**的 14 天(`LOOMY_SESSION_TTL_SECONDS`),服务端
56
+ * **没有任何 refresh 端点** ⇒ 到期只能重新登录。短信验证码每次都要人收,
57
+ * 不可能自动;**密码重登**是唯一全自动的续期路径(loomy2api 的
58
+ * `ensure_session` 同款:剩余 <3 天时用存下的密码静默重登一次)。
59
+ * 密码存进凭据库(`LoomyCredential.password`,可选字段)—— 备份/WebDAV
60
+ * 同步走**加密信封**,与产品内 AccessKey 常量的既有口径一致。
61
+ */
62
+ export interface LoomyPuKey {
63
+ /** DER SubjectPublicKeyInfo 的 base64(RSA-1024)。 */
64
+ pukey: string;
65
+ /** 服务端 nonce(第 ② 步必须原样带回)。 */
66
+ rcode: string;
67
+ }
68
+ /** 第 ① 步:取 RSA 公钥与 nonce。 */
69
+ export declare function getLoomyPublicKey(product: LoomyProduct, fetcher?: typeof fetch): Promise<LoomyPuKey>;
70
+ /** RSA/PKCS#1 v1.5 加密密码(getPuKey 下发的公钥;base64 输出)。 */
71
+ export declare function encryptLoomyPassword(pukey: string, password: string): string;
72
+ /**
73
+ * 第 ② 步:密码登录。
74
+ *
75
+ * @returns `{ session, userid }`(phone 常回但登录名就是 loginid,调用方已有)。
76
+ */
77
+ export declare function loginLoomyByPassword(phone: string, password: string, product: LoomyProduct, fetcher?: typeof fetch): Promise<LoomyLoginResult>;
34
78
  /** 一次成功登录的结果。 */
35
79
  export interface LoomyLoginResult {
36
80
  /** 32 位小写 hex 的讯飞 session。 */
@@ -1 +1 @@
1
- {"version":3,"file":"loomy-oauth.d.ts","sourceRoot":"","sources":["../src/loomy-oauth.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAKH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAEtD,mBAAmB;AACnB,eAAO,MAAM,0BAA0B,MAAM,CAAA;AAE7C;;;;;;GAMG;AACH,eAAO,MAAM,yBAAyB,UAAY,CAAA;AAElD,iBAAiB;AACjB,MAAM,WAAW,gBAAgB;IAC/B,8BAA8B;IAC9B,OAAO,EAAE,MAAM,CAAA;IACf,eAAe;IACf,MAAM,EAAE,MAAM,CAAA;CACf;AAED;;;;;GAKG;AACH,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,YAAY,EACrB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC7B,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAazB;AAsDD;;;;;GAKG;AACH,wBAAsB,gBAAgB,CACpC,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,YAAY,EACrB,OAAO,GAAE,OAAO,KAAa,GAC5B,OAAO,CAAC,MAAM,CAAC,CAgBjB;AAED;;;;;GAKG;AACH,wBAAsB,mBAAmB,CACvC,KAAK,EAAE,MAAM,EACb,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,YAAY,EACrB,OAAO,GAAE,OAAO,KAAa,GAC5B,OAAO,CAAC,gBAAgB,CAAC,CAe3B;AAeD,2BAA2B;AAC3B,MAAM,WAAW,mBAAmB;IAClC,6CAA6C;IAC7C,IAAI,EAAE,CAAC,GAAG,CAAC,CAAA;IACX,oBAAoB;IACpB,KAAK,EAAE,MAAM,CAAA;IACb,qBAAqB;IACrB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,kBAAkB;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,kBAAkB;IAClB,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAED;;;;GAIG;AACH,wBAAsB,qBAAqB,CACzC,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,YAAY,EACrB,OAAO,GAAE,OAAO,KAAa,GAC5B,OAAO,CAAC,mBAAmB,CAAC,CAwB9B;AAED;;;;GAIG;AACH,wBAAsB,gBAAgB,CACpC,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,YAAY,EACrB,OAAO,GAAE,OAAO,KAAa,GAC5B,OAAO,CAAC,MAAM,CAAC,CAajB;AAED;;;;GAIG;AACH,wBAAsB,kBAAkB,CACtC,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,YAAY,EACrB,OAAO,GAAE,OAAO,KAAa,GAC5B,OAAO,CAAC,gBAAgB,GAAG;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC,CAe/C;AAED;;;;;GAKG;AACH,wBAAsB,aAAa,CACjC,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,YAAY,EACrB,OAAO,GAAE,OAAO,KAAa,GAC5B,OAAO,CAAC,gBAAgB,CAAC,CAY3B"}
1
+ {"version":3,"file":"loomy-oauth.d.ts","sourceRoot":"","sources":["../src/loomy-oauth.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAKH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAEtD,mBAAmB;AACnB,eAAO,MAAM,0BAA0B,MAAM,CAAA;AAE7C;;;;;;GAMG;AACH,eAAO,MAAM,yBAAyB,UAAY,CAAA;AAElD;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,MAAM,WAAW,UAAU;IACzB,mDAAmD;IACnD,KAAK,EAAE,MAAM,CAAA;IACb,8BAA8B;IAC9B,KAAK,EAAE,MAAM,CAAA;CACd;AAED,6BAA6B;AAC7B,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,YAAY,EACrB,OAAO,GAAE,OAAO,KAAa,GAC5B,OAAO,CAAC,UAAU,CAAC,CAWrB;AAED,sDAAsD;AACtD,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAS5E;AAED;;;;GAIG;AACH,wBAAsB,oBAAoB,CACxC,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,YAAY,EACrB,OAAO,GAAE,OAAO,KAAa,GAC5B,OAAO,CAAC,gBAAgB,CAAC,CAgB3B;AAED,iBAAiB;AACjB,MAAM,WAAW,gBAAgB;IAC/B,8BAA8B;IAC9B,OAAO,EAAE,MAAM,CAAA;IACf,eAAe;IACf,MAAM,EAAE,MAAM,CAAA;CACf;AAED;;;;;GAKG;AACH,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,YAAY,EACrB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC7B,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAazB;AAsDD;;;;;GAKG;AACH,wBAAsB,gBAAgB,CACpC,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,YAAY,EACrB,OAAO,GAAE,OAAO,KAAa,GAC5B,OAAO,CAAC,MAAM,CAAC,CAgBjB;AAED;;;;;GAKG;AACH,wBAAsB,mBAAmB,CACvC,KAAK,EAAE,MAAM,EACb,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,YAAY,EACrB,OAAO,GAAE,OAAO,KAAa,GAC5B,OAAO,CAAC,gBAAgB,CAAC,CAe3B;AAeD,2BAA2B;AAC3B,MAAM,WAAW,mBAAmB;IAClC,6CAA6C;IAC7C,IAAI,EAAE,CAAC,GAAG,CAAC,CAAA;IACX,oBAAoB;IACpB,KAAK,EAAE,MAAM,CAAA;IACb,qBAAqB;IACrB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,kBAAkB;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,kBAAkB;IAClB,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAED;;;;GAIG;AACH,wBAAsB,qBAAqB,CACzC,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,YAAY,EACrB,OAAO,GAAE,OAAO,KAAa,GAC5B,OAAO,CAAC,mBAAmB,CAAC,CAwB9B;AAED;;;;GAIG;AACH,wBAAsB,gBAAgB,CACpC,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,YAAY,EACrB,OAAO,GAAE,OAAO,KAAa,GAC5B,OAAO,CAAC,MAAM,CAAC,CAajB;AAED;;;;GAIG;AACH,wBAAsB,kBAAkB,CACtC,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,YAAY,EACrB,OAAO,GAAE,OAAO,KAAa,GAC5B,OAAO,CAAC,gBAAgB,GAAG;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC,CAe/C;AAED;;;;;GAKG;AACH,wBAAsB,aAAa,CACjC,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,YAAY,EACrB,OAAO,GAAE,OAAO,KAAa,GAC5B,OAAO,CAAC,gBAAgB,CAAC,CAY3B"}
@@ -20,7 +20,7 @@
20
20
  * 二次序列化会改变字节(键序/空格)导致签名失效。
21
21
  * ⚠️ `ua` 硬编码 `Loomy|Desktop|Electron|macOS`,Windows 上也是这个值。
22
22
  */
23
- import { randomUUID } from 'node:crypto';
23
+ import { publicEncrypt, createPublicKey, randomUUID, constants as cryptoConstants } from 'node:crypto';
24
24
  import { LOOMY_REQUEST_TIMEOUT_MS, parseLoomyEnvelope } from './loomy.js';
25
25
  import { loomyAuthHeaders } from './loomy-sign.js';
26
26
  /** 短信验证码有效期(秒)。 */
@@ -33,6 +33,53 @@ export const LOOMY_SMS_CODE_TTL_SECONDS = 300;
33
33
  * 故凭据的 `expires_at` 由本地按此推算。
34
34
  */
35
35
  export const LOOMY_SESSION_TTL_SECONDS = 1_209_600;
36
+ /** 第 ① 步:取 RSA 公钥与 nonce。 */
37
+ export async function getLoomyPublicKey(product, fetcher = fetch) {
38
+ const body = buildLoomyAccountBody(product, {});
39
+ const data = await postLoomyAccount('/login/account/getPuKey', body, product, fetcher);
40
+ const record = (data ?? {});
41
+ const pukey = typeof record.pukey === 'string' ? record.pukey : '';
42
+ const rcode = typeof record.rcode === 'string' ? record.rcode : '';
43
+ if (pukey.length === 0)
44
+ throw new Error('密码登录响应缺少公钥(getPuKey)');
45
+ // rcode 允许缺失吗?——不允许:byPwd 必须原样带回,缺失时带上空串必然失败,
46
+ // 早失败才能给出可读的原因。
47
+ if (rcode.length === 0)
48
+ throw new Error('密码登录响应缺少 rcode');
49
+ return { pukey, rcode };
50
+ }
51
+ /** RSA/PKCS#1 v1.5 加密密码(getPuKey 下发的公钥;base64 输出)。 */
52
+ export function encryptLoomyPassword(pukey, password) {
53
+ // ⚠ 必须经 createPublicKey 转成 KeyObject:直接把 { key: Buffer, format, type }`n // 字面量传给 publicEncrypt 在 @types/node(Node 22 系)下报 TS2353 ——
54
+ // 那个重载要的是**已解析的** KeyObject,DER 归一化是 createPublicKey 的职责。
55
+ const key = createPublicKey({ key: Buffer.from(pukey, 'base64'), format: 'der', type: 'spki' });
56
+ const encrypted = publicEncrypt({ key, padding: cryptoConstants.RSA_PKCS1_PADDING }, Buffer.from(password, 'utf8'));
57
+ return encrypted.toString('base64');
58
+ }
59
+ /**
60
+ * 第 ② 步:密码登录。
61
+ *
62
+ * @returns `{ session, userid }`(phone 常回但登录名就是 loginid,调用方已有)。
63
+ */
64
+ export async function loginLoomyByPassword(phone, password, product, fetcher = fetch) {
65
+ const { pukey, rcode } = await getLoomyPublicKey(product, fetcher);
66
+ const body = buildLoomyAccountBody(product, {
67
+ loginid: phone,
68
+ password: encryptLoomyPassword(pukey, password),
69
+ rcode,
70
+ type: 1,
71
+ expire: LOOMY_SESSION_TTL_SECONDS,
72
+ });
73
+ const data = await postLoomyAccount('/login/account/byPwd', body, product, fetcher);
74
+ const record = (data ?? {});
75
+ const session = typeof record.session === 'string' ? record.session : '';
76
+ const userid = typeof record.userid === 'string' ? record.userid : '';
77
+ if (session.length === 0)
78
+ throw new Error('密码登录响应缺少 session');
79
+ if (userid.length === 0)
80
+ throw new Error('密码登录响应缺少 userid');
81
+ return { session, userid };
82
+ }
36
83
  /**
37
84
  * 构建账号端点的请求体信封 `{ base, param }`。
38
85
  *
@@ -1 +1 @@
1
- {"version":3,"file":"loomy-oauth.js","sourceRoot":"","sources":["../src/loomy-oauth.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"loomy-oauth.js","sourceRoot":"","sources":["../src/loomy-oauth.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,61 @@
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 { type LoomyProduct } from './loomy-product.js';
26
+ /** 短信登录流的超时(发码 + 收码 + 提交,5 分钟与验证码 TTL 对齐)。 */
27
+ export declare const LOOMY_SMS_LOGIN_TIMEOUT_MS: number;
28
+ /** 一次短信登录流程的最终产物。 */
29
+ export interface LoomySmsLoginOutcome {
30
+ session: string;
31
+ userid: string;
32
+ phone: string;
33
+ /** 用户在表单里选填的密码(空串 = 未填,账号不可自动续期)。 */
34
+ password?: string;
35
+ }
36
+ /** `startLoomySmsLoginFlow` 的返回值(与其余 provider 的 `StartedXxxLoginFlow` 同形)。 */
37
+ export interface StartedLoomySmsLoginFlow {
38
+ /** 弹窗地址(本地服务器表单页)。 */
39
+ loginUrl: string;
40
+ /** 登录结果 promise(settle 后由调用方落盘)。 */
41
+ result: Promise<LoomySmsLoginOutcome>;
42
+ /** 主动关闭本地服务器。 */
43
+ close: () => Promise<void>;
44
+ }
45
+ /** 流程选项。 */
46
+ export interface LoomySmsLoginFlowOptions {
47
+ product?: LoomyProduct;
48
+ /** 注入的 fetch(测试用)。 */
49
+ fetcher?: typeof fetch;
50
+ /** 超时(毫秒);默认 {@link LOOMY_SMS_LOGIN_TIMEOUT_MS}。 */
51
+ timeoutMs?: number;
52
+ }
53
+ /**
54
+ * 启动短信验证码登录流。
55
+ *
56
+ * ⚠ 立即返回 `loginUrl`,**不阻塞** —— 手机号由表单页收集(不要求
57
+ * `account.create` 预先携带;那正是 2026-10 早期「顺序死锁」缺陷的成因,
58
+ * 见 `jet-hub-rpc.ts` 的 Loomy 分支注释)。
59
+ */
60
+ export declare function startLoomySmsLoginFlow(options?: LoomySmsLoginFlowOptions): Promise<StartedLoomySmsLoginFlow>;
61
+ //# sourceMappingURL=loomy-sms-login.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"loomy-sms-login.d.ts","sourceRoot":"","sources":["../src/loomy-sms-login.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAQH,OAAO,EAAS,KAAK,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAE7D,8CAA8C;AAC9C,eAAO,MAAM,0BAA0B,QAAgB,CAAA;AAKvD,qBAAqB;AACrB,MAAM,WAAW,oBAAoB;IACnC,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,MAAM,CAAA;IACd,KAAK,EAAE,MAAM,CAAA;IACb,qCAAqC;IACrC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB;AAED,8EAA8E;AAC9E,MAAM,WAAW,wBAAwB;IACvC,sBAAsB;IACtB,QAAQ,EAAE,MAAM,CAAA;IAChB,oCAAoC;IACpC,MAAM,EAAE,OAAO,CAAC,oBAAoB,CAAC,CAAA;IACrC,iBAAiB;IACjB,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;CAC3B;AAED,YAAY;AACZ,MAAM,WAAW,wBAAwB;IACvC,OAAO,CAAC,EAAE,YAAY,CAAA;IACtB,sBAAsB;IACtB,OAAO,CAAC,EAAE,OAAO,KAAK,CAAA;IACtB,oDAAoD;IACpD,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB;AAED;;;;;;GAMG;AACH,wBAAsB,sBAAsB,CAC1C,OAAO,GAAE,wBAA6B,GACrC,OAAO,CAAC,wBAAwB,CAAC,CAmJnC"}