@xixka/dsh-hub 0.2.1-rc.9 → 0.2.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/README.md +60 -889
- package/lib/accio-adapter.d.ts.map +1 -1
- package/lib/accio-adapter.js +3 -1
- package/lib/accio-adapter.js.map +1 -1
- package/lib/account-pool.d.ts +128 -0
- package/lib/account-pool.d.ts.map +1 -1
- package/lib/account-pool.js +252 -15
- package/lib/account-pool.js.map +1 -1
- package/lib/aggregate-adapter.d.ts +38 -0
- package/lib/aggregate-adapter.d.ts.map +1 -1
- package/lib/aggregate-adapter.js +145 -12
- package/lib/aggregate-adapter.js.map +1 -1
- package/lib/aggregate-expiry.d.ts.map +1 -1
- package/lib/aggregate-expiry.js +4 -0
- package/lib/aggregate-expiry.js.map +1 -1
- package/lib/analyze-image.d.ts.map +1 -1
- package/lib/analyze-image.js.map +1 -1
- package/lib/astudio-adapter.d.ts.map +1 -1
- package/lib/astudio-adapter.js +3 -1
- package/lib/astudio-adapter.js.map +1 -1
- package/lib/buddy-adapter.d.ts.map +1 -1
- package/lib/buddy-adapter.js +22 -4
- package/lib/buddy-adapter.js.map +1 -1
- package/lib/buddy.d.ts +7 -2
- package/lib/buddy.d.ts.map +1 -1
- package/lib/buddy.js +7 -2
- package/lib/buddy.js.map +1 -1
- package/lib/canonical-models.d.ts.map +1 -1
- package/lib/canonical-models.js +20 -0
- package/lib/canonical-models.js.map +1 -1
- package/lib/chromium-session.d.ts +174 -0
- package/lib/chromium-session.d.ts.map +1 -1
- package/lib/chromium-session.js +418 -1
- package/lib/chromium-session.js.map +1 -1
- package/lib/client/jet-hub.js +287 -13918
- package/lib/codearts-credits.d.ts +176 -16
- package/lib/codearts-credits.d.ts.map +1 -1
- package/lib/codearts-credits.js +316 -34
- package/lib/codearts-credits.js.map +1 -1
- package/lib/codearts-vision.d.ts +95 -4
- package/lib/codearts-vision.d.ts.map +1 -1
- package/lib/codearts-vision.js +136 -5
- package/lib/codearts-vision.js.map +1 -1
- package/lib/codely-adapter.d.ts +36 -3
- package/lib/codely-adapter.d.ts.map +1 -1
- package/lib/codely-adapter.js +252 -11
- package/lib/codely-adapter.js.map +1 -1
- package/lib/codely-auth-service.d.ts +17 -0
- package/lib/codely-auth-service.d.ts.map +1 -1
- package/lib/codely-auth-service.js +40 -3
- package/lib/codely-auth-service.js.map +1 -1
- package/lib/codely-auth.d.ts.map +1 -1
- package/lib/codely-auth.js +23 -0
- package/lib/codely-auth.js.map +1 -1
- package/lib/codely-credits.d.ts.map +1 -1
- package/lib/codely-credits.js +18 -1
- package/lib/codely-credits.js.map +1 -1
- package/lib/codely-product.d.ts +10 -5
- package/lib/codely-product.d.ts.map +1 -1
- package/lib/codely-product.js +4 -2
- package/lib/codely-product.js.map +1 -1
- package/lib/credential-resolver.d.ts +41 -1
- package/lib/credential-resolver.d.ts.map +1 -1
- package/lib/credential-resolver.js +31 -6
- package/lib/credential-resolver.js.map +1 -1
- package/lib/image-budget.d.ts +3 -11
- package/lib/image-budget.d.ts.map +1 -1
- package/lib/image-budget.js +43 -5
- package/lib/image-budget.js.map +1 -1
- package/lib/image-data-cache.d.ts +87 -0
- package/lib/image-data-cache.d.ts.map +1 -0
- package/lib/image-data-cache.js +144 -0
- package/lib/image-data-cache.js.map +1 -0
- package/lib/index.d.ts +0 -51
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js +290 -164
- package/lib/index.js.map +1 -1
- package/lib/jet-hub-rpc.d.ts +14 -19
- package/lib/jet-hub-rpc.d.ts.map +1 -1
- package/lib/jet-hub-rpc.js +812 -496
- package/lib/jet-hub-rpc.js.map +1 -1
- package/lib/jet-hub-store.d.ts +52 -0
- package/lib/jet-hub-store.d.ts.map +1 -1
- package/lib/jet-hub-store.js +52 -4
- package/lib/jet-hub-store.js.map +1 -1
- package/lib/llm-adapter.d.ts +96 -5
- package/lib/llm-adapter.d.ts.map +1 -1
- package/lib/llm-adapter.js +742 -62
- package/lib/llm-adapter.js.map +1 -1
- package/lib/lobsterai-adapter.d.ts.map +1 -1
- package/lib/lobsterai-adapter.js +54 -15
- package/lib/lobsterai-adapter.js.map +1 -1
- package/lib/login.d.ts +5 -13
- package/lib/login.d.ts.map +1 -1
- package/lib/login.js +75 -14
- package/lib/login.js.map +1 -1
- package/lib/loomy-adapter.d.ts +3 -0
- package/lib/loomy-adapter.d.ts.map +1 -1
- package/lib/loomy-adapter.js +11 -3
- package/lib/loomy-adapter.js.map +1 -1
- package/lib/loomy-auth.d.ts +64 -1
- package/lib/loomy-auth.d.ts.map +1 -1
- package/lib/loomy-auth.js +191 -22
- package/lib/loomy-auth.js.map +1 -1
- package/lib/loomy-credits.d.ts +17 -0
- package/lib/loomy-credits.d.ts.map +1 -1
- package/lib/loomy-credits.js +35 -2
- package/lib/loomy-credits.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 +41 -0
- package/lib/loomy.d.ts.map +1 -1
- package/lib/loomy.js +29 -0
- package/lib/loomy.js.map +1 -1
- package/lib/magicrew-adapter.d.ts +201 -0
- package/lib/magicrew-adapter.d.ts.map +1 -0
- package/lib/magicrew-adapter.js +595 -0
- package/lib/magicrew-adapter.js.map +1 -0
- package/lib/magicrew-auth.d.ts +494 -0
- package/lib/magicrew-auth.d.ts.map +1 -0
- package/lib/magicrew-auth.js +951 -0
- package/lib/magicrew-auth.js.map +1 -0
- package/lib/magicrew-browser-login.d.ts +333 -0
- package/lib/magicrew-browser-login.d.ts.map +1 -0
- package/lib/magicrew-browser-login.js +740 -0
- package/lib/magicrew-browser-login.js.map +1 -0
- package/lib/magicrew-catalog.d.ts +19 -0
- package/lib/magicrew-catalog.d.ts.map +1 -0
- package/lib/magicrew-catalog.js +80 -0
- package/lib/magicrew-catalog.js.map +1 -0
- package/lib/magicrew-credits.d.ts +112 -0
- package/lib/magicrew-credits.d.ts.map +1 -0
- package/lib/magicrew-credits.js +319 -0
- package/lib/magicrew-credits.js.map +1 -0
- package/lib/magicrew-local-browser.d.ts +123 -0
- package/lib/magicrew-local-browser.d.ts.map +1 -0
- package/lib/magicrew-local-browser.js +321 -0
- package/lib/magicrew-local-browser.js.map +1 -0
- package/lib/magicrew-product.d.ts +127 -0
- package/lib/magicrew-product.d.ts.map +1 -0
- package/lib/magicrew-product.js +159 -0
- package/lib/magicrew-product.js.map +1 -0
- package/lib/magicrew-profile.d.ts +74 -0
- package/lib/magicrew-profile.d.ts.map +1 -0
- package/lib/magicrew-profile.js +148 -0
- package/lib/magicrew-profile.js.map +1 -0
- package/lib/magicrew.d.ts +185 -0
- package/lib/magicrew.d.ts.map +1 -0
- package/lib/magicrew.js +215 -0
- package/lib/magicrew.js.map +1 -0
- package/lib/model-catalog.d.ts +8 -0
- package/lib/model-catalog.d.ts.map +1 -1
- package/lib/model-catalog.js +127 -5
- package/lib/model-catalog.js.map +1 -1
- package/lib/models.d.ts +216 -32
- package/lib/models.d.ts.map +1 -1
- package/lib/models.js +500 -47
- package/lib/models.js.map +1 -1
- package/lib/modelscope-adapter.d.ts.map +1 -1
- package/lib/modelscope-adapter.js +7 -2
- package/lib/modelscope-adapter.js.map +1 -1
- package/lib/modelscope-product.d.ts +44 -6
- package/lib/modelscope-product.d.ts.map +1 -1
- package/lib/modelscope-product.js +98 -9
- package/lib/modelscope-product.js.map +1 -1
- package/lib/officeace-adapter.d.ts.map +1 -1
- package/lib/officeace-adapter.js +147 -21
- package/lib/officeace-adapter.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/lib/openai-gateway/tencent-fingerprint.d.ts.map +1 -1
- package/lib/openai-gateway/tencent-fingerprint.js +28 -3
- package/lib/openai-gateway/tencent-fingerprint.js.map +1 -1
- package/lib/opencode-adapter.d.ts +27 -0
- package/lib/opencode-adapter.d.ts.map +1 -1
- package/lib/opencode-adapter.js +57 -8
- package/lib/opencode-adapter.js.map +1 -1
- package/lib/opencode-bun-tls.d.ts +103 -0
- package/lib/opencode-bun-tls.d.ts.map +1 -0
- package/lib/opencode-bun-tls.js +212 -0
- package/lib/opencode-bun-tls.js.map +1 -0
- package/lib/opencode-messages.d.ts +0 -19
- package/lib/opencode-messages.d.ts.map +1 -1
- package/lib/opencode-messages.js +30 -33
- package/lib/opencode-messages.js.map +1 -1
- package/lib/opencode-official-prompt.d.ts +62 -0
- package/lib/opencode-official-prompt.d.ts.map +1 -0
- package/lib/opencode-official-prompt.js +119 -0
- package/lib/opencode-official-prompt.js.map +1 -0
- package/lib/opencode-official-tools.d.ts +27 -0
- package/lib/opencode-official-tools.d.ts.map +1 -0
- package/lib/opencode-official-tools.js +340 -0
- package/lib/opencode-official-tools.js.map +1 -0
- package/lib/opencode-product.d.ts.map +1 -1
- package/lib/opencode-product.js +3 -2
- package/lib/opencode-product.js.map +1 -1
- package/lib/opencode-stream.d.ts.map +1 -1
- package/lib/opencode-stream.js +8 -7
- package/lib/opencode-stream.js.map +1 -1
- package/lib/product.d.ts +15 -3
- package/lib/product.d.ts.map +1 -1
- package/lib/product.js +44 -11
- package/lib/product.js.map +1 -1
- package/lib/provider-credits.d.ts +2 -0
- package/lib/provider-credits.d.ts.map +1 -1
- package/lib/provider-credits.js +46 -17
- package/lib/provider-credits.js.map +1 -1
- package/lib/provider-expiry.d.ts.map +1 -1
- package/lib/provider-expiry.js +29 -0
- package/lib/provider-expiry.js.map +1 -1
- package/lib/provider-http-pool.d.ts +85 -0
- package/lib/provider-http-pool.d.ts.map +1 -0
- package/lib/provider-http-pool.js +224 -0
- package/lib/provider-http-pool.js.map +1 -0
- package/lib/provider-registry.d.ts.map +1 -1
- package/lib/provider-registry.js +73 -39
- package/lib/provider-registry.js.map +1 -1
- package/lib/qiniu-adapter.d.ts +276 -0
- package/lib/qiniu-adapter.d.ts.map +1 -0
- package/lib/qiniu-adapter.js +689 -0
- package/lib/qiniu-adapter.js.map +1 -0
- package/lib/qiniu-auth.d.ts +130 -0
- package/lib/qiniu-auth.d.ts.map +1 -0
- package/lib/qiniu-auth.js +234 -0
- package/lib/qiniu-auth.js.map +1 -0
- package/lib/qiniu-messages.d.ts +96 -0
- package/lib/qiniu-messages.d.ts.map +1 -0
- package/lib/qiniu-messages.js +97 -0
- package/lib/qiniu-messages.js.map +1 -0
- package/lib/qiniu-product.d.ts +126 -0
- package/lib/qiniu-product.d.ts.map +1 -0
- package/lib/qiniu-product.js +269 -0
- package/lib/qiniu-product.js.map +1 -0
- package/lib/qiniu-rpc.d.ts +119 -0
- package/lib/qiniu-rpc.d.ts.map +1 -0
- package/lib/qiniu-rpc.js +214 -0
- package/lib/qiniu-rpc.js.map +1 -0
- package/lib/qiniu.d.ts +145 -0
- package/lib/qiniu.d.ts.map +1 -0
- package/lib/qiniu.js +164 -0
- package/lib/qiniu.js.map +1 -0
- package/lib/raccoon-adapter.d.ts +52 -2
- package/lib/raccoon-adapter.d.ts.map +1 -1
- package/lib/raccoon-adapter.js +148 -29
- package/lib/raccoon-adapter.js.map +1 -1
- package/lib/raccoon-auth.d.ts +6 -0
- package/lib/raccoon-auth.d.ts.map +1 -1
- package/lib/raccoon-auth.js +9 -1
- package/lib/raccoon-auth.js.map +1 -1
- package/lib/raccoon-credits.d.ts +38 -5
- package/lib/raccoon-credits.d.ts.map +1 -1
- package/lib/raccoon-credits.js +127 -6
- package/lib/raccoon-credits.js.map +1 -1
- package/lib/raccoon.d.ts +14 -2
- package/lib/raccoon.d.ts.map +1 -1
- package/lib/raccoon.js +14 -2
- package/lib/raccoon.js.map +1 -1
- package/lib/service.d.ts +46 -6
- package/lib/service.d.ts.map +1 -1
- package/lib/service.js +104 -16
- package/lib/service.js.map +1 -1
- package/lib/session-balance.d.ts +203 -0
- package/lib/session-balance.d.ts.map +1 -0
- package/lib/session-balance.js +279 -0
- package/lib/session-balance.js.map +1 -0
- package/lib/sign.d.ts +97 -1
- package/lib/sign.d.ts.map +1 -1
- package/lib/sign.js +174 -2
- package/lib/sign.js.map +1 -1
- package/lib/token-ledger-store.d.ts.map +1 -1
- package/lib/token-ledger-store.js +121 -27
- package/lib/token-ledger-store.js.map +1 -1
- package/lib/trae-adapter.d.ts.map +1 -1
- package/lib/trae-adapter.js +3 -1
- package/lib/trae-adapter.js.map +1 -1
- package/lib/types.d.ts +75 -15
- package/lib/types.d.ts.map +1 -1
- package/lib/types.js.map +1 -1
- package/lib/usage-badge.d.ts +77 -7
- package/lib/usage-badge.d.ts.map +1 -1
- package/lib/usage-badge.js +190 -28
- package/lib/usage-badge.js.map +1 -1
- package/lib/webdav-auto-sync.d.ts +96 -0
- package/lib/webdav-auto-sync.d.ts.map +1 -0
- package/lib/webdav-auto-sync.js +0 -0
- package/lib/webdav-auto-sync.js.map +1 -0
- package/lib/webdav-sync-crypto.d.ts +18 -0
- package/lib/webdav-sync-crypto.d.ts.map +1 -0
- package/lib/webdav-sync-crypto.js +72 -0
- package/lib/webdav-sync-crypto.js.map +1 -0
- package/lib/webdav-sync-merge.d.ts +31 -0
- package/lib/webdav-sync-merge.d.ts.map +1 -0
- package/lib/webdav-sync-merge.js +0 -0
- package/lib/webdav-sync-merge.js.map +1 -0
- package/lib/webdav-sync.d.ts +43 -7
- package/lib/webdav-sync.d.ts.map +1 -1
- package/lib/webdav-sync.js +72 -11
- package/lib/webdav-sync.js.map +1 -1
- package/lib/zcode-adapter.d.ts +4 -2
- package/lib/zcode-adapter.d.ts.map +1 -1
- package/lib/zcode-adapter.js +132 -37
- package/lib/zcode-adapter.js.map +1 -1
- package/lib/zcode-upstream.d.ts +59 -0
- package/lib/zcode-upstream.d.ts.map +1 -1
- package/lib/zcode-upstream.js +137 -2
- package/lib/zcode-upstream.js.map +1 -1
- package/package.json +5 -4
- package/lib/stepcode-adapter.d.ts +0 -158
- package/lib/stepcode-adapter.d.ts.map +0 -1
- package/lib/stepcode-adapter.js +0 -318
- package/lib/stepcode-adapter.js.map +0 -1
- package/lib/stepcode-auth.d.ts +0 -154
- package/lib/stepcode-auth.d.ts.map +0 -1
- package/lib/stepcode-auth.js +0 -287
- package/lib/stepcode-auth.js.map +0 -1
- package/lib/stepcode-oauth.d.ts +0 -194
- package/lib/stepcode-oauth.d.ts.map +0 -1
- package/lib/stepcode-oauth.js +0 -496
- package/lib/stepcode-oauth.js.map +0 -1
- package/lib/stepcode-product.d.ts +0 -255
- package/lib/stepcode-product.d.ts.map +0 -1
- package/lib/stepcode-product.js +0 -256
- package/lib/stepcode-product.js.map +0 -1
- package/lib/stepcode.d.ts +0 -230
- package/lib/stepcode.d.ts.map +0 -1
- package/lib/stepcode.js +0 -300
- package/lib/stepcode.js.map +0 -1
- package/lib/teleagent-adapter.d.ts +0 -116
- package/lib/teleagent-adapter.d.ts.map +0 -1
- package/lib/teleagent-adapter.js +0 -293
- package/lib/teleagent-adapter.js.map +0 -1
- package/lib/teleagent-auth.d.ts +0 -279
- package/lib/teleagent-auth.d.ts.map +0 -1
- package/lib/teleagent-auth.js +0 -512
- package/lib/teleagent-auth.js.map +0 -1
- package/lib/teleagent-cdp-login.d.ts +0 -100
- package/lib/teleagent-cdp-login.d.ts.map +0 -1
- package/lib/teleagent-cdp-login.js +0 -402
- package/lib/teleagent-cdp-login.js.map +0 -1
- package/lib/teleagent-credits.d.ts +0 -120
- package/lib/teleagent-credits.d.ts.map +0 -1
- package/lib/teleagent-credits.js +0 -288
- package/lib/teleagent-credits.js.map +0 -1
- package/lib/teleagent-product.d.ts +0 -196
- package/lib/teleagent-product.d.ts.map +0 -1
- package/lib/teleagent-product.js +0 -212
- package/lib/teleagent-product.js.map +0 -1
- package/lib/teleagent.d.ts +0 -288
- package/lib/teleagent.d.ts.map +0 -1
- package/lib/teleagent.js +0 -450
- package/lib/teleagent.js.map +0 -1
package/lib/loomy-credits.js
CHANGED
|
@@ -35,8 +35,12 @@
|
|
|
35
35
|
* | 一键签到 | `POST /points/first-login` | 写,幂等 |
|
|
36
36
|
*
|
|
37
37
|
* 这样「打开面板」不会悄悄触发签到。
|
|
38
|
+
*
|
|
39
|
+
* ⚠️ 唯一例外:读**已失败/空**(积分侧会话未识别或档案未初始化)时,查余额
|
|
40
|
+
* 路径会按官方客户端协议补调一次幂等的 `first-login` 再重读 —— 见
|
|
41
|
+
* {@link fetchLoomyCreditDetail} 的说明(2026-11-03「新登录账号没有额度」)。
|
|
38
42
|
*/
|
|
39
|
-
import { LOOMY_REQUEST_TIMEOUT_MS, parseLoomyEnvelope, } from './loomy.js';
|
|
43
|
+
import { LOOMY_POINTS_SESSION_UNRECOGNIZED_CODES, LOOMY_REQUEST_TIMEOUT_MS, parseLoomyEnvelope, } from './loomy.js';
|
|
40
44
|
/** 「一键签到」的语义说明(供 UI 提示用,避免写成「+5000 积分」)。 */
|
|
41
45
|
export const LOOMY_DAILY_QUOTA_DESCRIPTION = '每日赠送额度(消耗后不回补)';
|
|
42
46
|
/** 发一次业务请求并拆信封;失败返回结构化错误(余额查询不抛错)。 */
|
|
@@ -83,10 +87,39 @@ function readNumber(value) {
|
|
|
83
87
|
* ⚠️ 用 `points/records` 而不是 `first-login`:后者是**写**端点,
|
|
84
88
|
* 在「打开面板」这种高频路径上调用会意外触发签到。
|
|
85
89
|
*
|
|
90
|
+
* ## 唯一的例外:积分侧会话/档案未初始化(2026-11-03「新登录账号没有
|
|
91
|
+
* 额度」报障修复)
|
|
92
|
+
*
|
|
93
|
+
* Loomy 的积分服务有**独立的会话表**:新登录、密码续期换新 session 后,
|
|
94
|
+
* `points/records` 会回 `100002`/`020002`(会话不被积分侧识别),或成功但
|
|
95
|
+
* `data` 为空(积分档案未初始化)。此时按官方客户端协议**补调一次幂等的
|
|
96
|
+
* `first-login` 再重读一次** —— 详见
|
|
97
|
+
* {@link LOOMY_POINTS_SESSION_UNRECOGNIZED_CODES} 的取证。
|
|
98
|
+
*
|
|
99
|
+
* 这个例外**不违反**上面的读写分离:它只在「读已经失败/空」时触发一次,
|
|
100
|
+
* 健康路径的读永远不会碰写端点;且 `first-login` 幂等(当日已初始化则只回
|
|
101
|
+
* `alreadyProcessed`),补调不会重复发放额度。
|
|
102
|
+
*
|
|
86
103
|
* @returns 查不到(凭据失效 / 响应异常)时返回 `null`,与「余额为 0」严格区分。
|
|
87
104
|
*/
|
|
88
105
|
export async function fetchLoomyCreditDetail(credential, product, fetcher = fetch) {
|
|
89
|
-
const
|
|
106
|
+
const recordsPath = '/points/records?pageNo=1&pageSize=1&recordType=all';
|
|
107
|
+
const readRecords = () => tryRequestLoomy(credential, product, recordsPath, { method: 'GET' }, fetcher);
|
|
108
|
+
let result = await readRecords();
|
|
109
|
+
// 积分侧会话未被识别(100002/020002),或档案未初始化(成功但余额字段全空)
|
|
110
|
+
// ⇒ 按客户端协议补调幂等的 first-login 初始化后重读一次。
|
|
111
|
+
const sessionUnrecognized = !result.ok
|
|
112
|
+
&& LOOMY_POINTS_SESSION_UNRECOGNIZED_CODES.includes(result.code);
|
|
113
|
+
const profileEmpty = result.ok
|
|
114
|
+
&& readNumber(result.data?.balance) === undefined
|
|
115
|
+
&& readNumber(result.data?.dailyBalance) === undefined
|
|
116
|
+
&& readNumber(result.data?.availableBalance) === undefined;
|
|
117
|
+
if (sessionUnrecognized || profileEmpty) {
|
|
118
|
+
// first-login 幂等且不抛错(内部全走 tryRequestLoomy);
|
|
119
|
+
// 初始化成败都继续重读一次 —— 失败时重读的结果就是给用户的真实结论。
|
|
120
|
+
await claimLoomyDailyQuota(credential, product, fetcher);
|
|
121
|
+
result = await readRecords();
|
|
122
|
+
}
|
|
90
123
|
if (!result.ok)
|
|
91
124
|
return null;
|
|
92
125
|
const permanent = readNumber(result.data?.balance);
|
package/lib/loomy-credits.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loomy-credits.js","sourceRoot":"","sources":["../src/loomy-credits.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"loomy-credits.js","sourceRoot":"","sources":["../src/loomy-credits.ts"],"names":[],"mappings":"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"}
|
package/lib/loomy-oauth.d.ts
CHANGED
|
@@ -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。 */
|
package/lib/loomy-oauth.d.ts.map
CHANGED
|
@@ -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":"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"}
|
package/lib/loomy-oauth.js
CHANGED
|
@@ -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
|
*
|
package/lib/loomy-oauth.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loomy-oauth.js","sourceRoot":"","sources":["../src/loomy-oauth.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;
|
|
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"}
|
|
@@ -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
|