@xixka/dsh-hub 0.2.4 → 0.2.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +2 -0
- package/lib/account-pool.d.ts +54 -1
- package/lib/account-pool.d.ts.map +1 -1
- package/lib/account-pool.js +173 -5
- package/lib/account-pool.js.map +1 -1
- package/lib/account-probe.d.ts +15 -1
- package/lib/account-probe.d.ts.map +1 -1
- package/lib/account-probe.js +27 -3
- package/lib/account-probe.js.map +1 -1
- package/lib/aggregate-adapter.d.ts +7 -0
- package/lib/aggregate-adapter.d.ts.map +1 -1
- package/lib/aggregate-adapter.js +70 -1
- package/lib/aggregate-adapter.js.map +1 -1
- package/lib/aggregate-expiry.d.ts +66 -0
- package/lib/aggregate-expiry.d.ts.map +1 -1
- package/lib/aggregate-expiry.js +142 -3
- package/lib/aggregate-expiry.js.map +1 -1
- package/lib/auto-checkin.d.ts +285 -26
- package/lib/auto-checkin.d.ts.map +1 -1
- package/lib/auto-checkin.js +701 -40
- package/lib/auto-checkin.js.map +1 -1
- package/lib/autoclaw-auth.d.ts +29 -6
- package/lib/autoclaw-auth.d.ts.map +1 -1
- package/lib/autoclaw-auth.js +32 -8
- package/lib/autoclaw-auth.js.map +1 -1
- package/lib/autoclaw-credits.d.ts +1 -1
- package/lib/autoclaw-credits.js +1 -1
- package/lib/autoclaw-oauth.d.ts +108 -9
- package/lib/autoclaw-oauth.d.ts.map +1 -1
- package/lib/autoclaw-oauth.js +393 -25
- package/lib/autoclaw-oauth.js.map +1 -1
- package/lib/autoclaw-product.d.ts +9 -4
- package/lib/autoclaw-product.d.ts.map +1 -1
- package/lib/autoclaw-product.js +9 -4
- package/lib/autoclaw-product.js.map +1 -1
- package/lib/baizhi-adapter.d.ts +182 -0
- package/lib/baizhi-adapter.d.ts.map +1 -0
- package/lib/baizhi-adapter.js +457 -0
- package/lib/baizhi-adapter.js.map +1 -0
- package/lib/baizhi-auth.d.ts +205 -0
- package/lib/baizhi-auth.d.ts.map +1 -0
- package/lib/baizhi-auth.js +387 -0
- package/lib/baizhi-auth.js.map +1 -0
- package/lib/baizhi-browser-login.d.ts +141 -0
- package/lib/baizhi-browser-login.d.ts.map +1 -0
- package/lib/baizhi-browser-login.js +216 -0
- package/lib/baizhi-browser-login.js.map +1 -0
- package/lib/baizhi-credits.d.ts +220 -0
- package/lib/baizhi-credits.d.ts.map +1 -0
- package/lib/baizhi-credits.js +507 -0
- package/lib/baizhi-credits.js.map +1 -0
- package/lib/baizhi-messages.d.ts +98 -0
- package/lib/baizhi-messages.d.ts.map +1 -0
- package/lib/baizhi-messages.js +154 -0
- package/lib/baizhi-messages.js.map +1 -0
- package/lib/baizhi-product.d.ts +126 -0
- package/lib/baizhi-product.d.ts.map +1 -0
- package/lib/baizhi-product.js +135 -0
- package/lib/baizhi-product.js.map +1 -0
- package/lib/baizhi-rpc.d.ts +103 -0
- package/lib/baizhi-rpc.d.ts.map +1 -0
- package/lib/baizhi-rpc.js +272 -0
- package/lib/baizhi-rpc.js.map +1 -0
- package/lib/baizhi.d.ts +191 -0
- package/lib/baizhi.d.ts.map +1 -0
- package/lib/baizhi.js +298 -0
- package/lib/baizhi.js.map +1 -0
- package/lib/buddy-adapter.d.ts +57 -0
- package/lib/buddy-adapter.d.ts.map +1 -1
- package/lib/buddy-adapter.js +70 -7
- package/lib/buddy-adapter.js.map +1 -1
- package/lib/buddy-balance-rank.d.ts +40 -3
- package/lib/buddy-balance-rank.d.ts.map +1 -1
- package/lib/buddy-balance-rank.js +24 -1
- package/lib/buddy-balance-rank.js.map +1 -1
- package/lib/buddy-growth.d.ts +135 -10
- package/lib/buddy-growth.d.ts.map +1 -1
- package/lib/buddy-growth.js +1430 -234
- package/lib/buddy-growth.js.map +1 -1
- package/lib/canonical-models.d.ts.map +1 -1
- package/lib/canonical-models.js +31 -3
- package/lib/canonical-models.js.map +1 -1
- package/lib/cap-pow.d.ts +82 -0
- package/lib/cap-pow.d.ts.map +1 -0
- package/lib/cap-pow.js +209 -0
- package/lib/cap-pow.js.map +1 -0
- package/lib/client/jet-hub.js +76 -31
- package/lib/cline-adapter.d.ts +15 -1
- package/lib/cline-adapter.d.ts.map +1 -1
- package/lib/cline-adapter.js +61 -8
- package/lib/cline-adapter.js.map +1 -1
- package/lib/cline-models-dev.d.ts +16 -0
- package/lib/cline-models-dev.d.ts.map +1 -1
- package/lib/cline-models-dev.js +49 -1
- package/lib/cline-models-dev.js.map +1 -1
- package/lib/cline-models.d.ts +12 -10
- package/lib/cline-models.d.ts.map +1 -1
- package/lib/cline-models.js +40 -8
- package/lib/cline-models.js.map +1 -1
- package/lib/codearts-credits.d.ts.map +1 -1
- package/lib/codearts-credits.js +33 -2
- package/lib/codearts-credits.js.map +1 -1
- package/lib/credential-resolver.d.ts +27 -0
- package/lib/credential-resolver.d.ts.map +1 -1
- package/lib/credential-resolver.js +23 -0
- package/lib/credential-resolver.js.map +1 -1
- package/lib/credits.d.ts +18 -1
- package/lib/credits.d.ts.map +1 -1
- package/lib/credits.js.map +1 -1
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js +555 -31
- package/lib/index.js.map +1 -1
- package/lib/jet-hub-rpc.d.ts +48 -0
- package/lib/jet-hub-rpc.d.ts.map +1 -1
- package/lib/jet-hub-rpc.js +985 -35
- package/lib/jet-hub-rpc.js.map +1 -1
- package/lib/jet-hub-store.d.ts.map +1 -1
- package/lib/jet-hub-store.js +54 -1
- package/lib/jet-hub-store.js.map +1 -1
- package/lib/llm-adapter.d.ts +54 -1
- package/lib/llm-adapter.d.ts.map +1 -1
- package/lib/llm-adapter.js +72 -3
- package/lib/llm-adapter.js.map +1 -1
- package/lib/llm-register-compat.d.ts +57 -0
- package/lib/llm-register-compat.d.ts.map +1 -1
- package/lib/llm-register-compat.js +91 -7
- package/lib/llm-register-compat.js.map +1 -1
- package/lib/login.d.ts.map +1 -1
- package/lib/login.js +8 -0
- package/lib/login.js.map +1 -1
- package/lib/magicrew-auth.d.ts.map +1 -1
- package/lib/magicrew-auth.js +4 -1
- package/lib/magicrew-auth.js.map +1 -1
- package/lib/magicrew-checkin.d.ts +139 -0
- package/lib/magicrew-checkin.d.ts.map +1 -0
- package/lib/magicrew-checkin.js +536 -0
- package/lib/magicrew-checkin.js.map +1 -0
- package/lib/magicrew-credits.d.ts +24 -1
- package/lib/magicrew-credits.d.ts.map +1 -1
- package/lib/magicrew-credits.js +175 -33
- package/lib/magicrew-credits.js.map +1 -1
- package/lib/magicrew-number.d.ts +68 -0
- package/lib/magicrew-number.d.ts.map +1 -0
- package/lib/magicrew-number.js +89 -0
- package/lib/magicrew-number.js.map +1 -0
- package/lib/magicrew-product.d.ts +75 -3
- package/lib/magicrew-product.d.ts.map +1 -1
- package/lib/magicrew-product.js +100 -0
- package/lib/magicrew-product.js.map +1 -1
- package/lib/minimax-dedup.d.ts +1 -1
- package/lib/minimax-dedup.d.ts.map +1 -1
- package/lib/minimax-dedup.js +1 -1
- package/lib/minimax-dedup.js.map +1 -1
- package/lib/model-catalog.d.ts +13 -0
- package/lib/model-catalog.d.ts.map +1 -1
- package/lib/model-catalog.js +12 -1
- package/lib/model-catalog.js.map +1 -1
- package/lib/models.d.ts +15 -1
- package/lib/models.d.ts.map +1 -1
- package/lib/models.js +112 -20
- package/lib/models.js.map +1 -1
- package/lib/monkeycode-adapter.d.ts +164 -0
- package/lib/monkeycode-adapter.d.ts.map +1 -0
- package/lib/monkeycode-adapter.js +438 -0
- package/lib/monkeycode-adapter.js.map +1 -0
- package/lib/monkeycode-auth.d.ts +222 -0
- package/lib/monkeycode-auth.d.ts.map +1 -0
- package/lib/monkeycode-auth.js +371 -0
- package/lib/monkeycode-auth.js.map +1 -0
- package/lib/monkeycode-browser-login.d.ts +180 -0
- package/lib/monkeycode-browser-login.d.ts.map +1 -0
- package/lib/monkeycode-browser-login.js +270 -0
- package/lib/monkeycode-browser-login.js.map +1 -0
- package/lib/monkeycode-credits.d.ts +277 -0
- package/lib/monkeycode-credits.d.ts.map +1 -0
- package/lib/monkeycode-credits.js +673 -0
- package/lib/monkeycode-credits.js.map +1 -0
- package/lib/monkeycode-messages.d.ts +137 -0
- package/lib/monkeycode-messages.d.ts.map +1 -0
- package/lib/monkeycode-messages.js +207 -0
- package/lib/monkeycode-messages.js.map +1 -0
- package/lib/monkeycode-product.d.ts +178 -0
- package/lib/monkeycode-product.d.ts.map +1 -0
- package/lib/monkeycode-product.js +156 -0
- package/lib/monkeycode-product.js.map +1 -0
- package/lib/monkeycode-rpc.d.ts +61 -0
- package/lib/monkeycode-rpc.d.ts.map +1 -0
- package/lib/monkeycode-rpc.js +342 -0
- package/lib/monkeycode-rpc.js.map +1 -0
- package/lib/monkeycode.d.ts +189 -0
- package/lib/monkeycode.d.ts.map +1 -0
- package/lib/monkeycode.js +296 -0
- package/lib/monkeycode.js.map +1 -0
- package/lib/oauth.d.ts +23 -0
- package/lib/oauth.d.ts.map +1 -1
- package/lib/oauth.js +98 -13
- package/lib/oauth.js.map +1 -1
- package/lib/openai-gateway/models.d.ts +23 -0
- package/lib/openai-gateway/models.d.ts.map +1 -1
- package/lib/openai-gateway/models.js +48 -19
- package/lib/openai-gateway/models.js.map +1 -1
- package/lib/openai-gateway/server.d.ts.map +1 -1
- package/lib/openai-gateway/server.js +6 -3
- package/lib/openai-gateway/server.js.map +1 -1
- package/lib/openai-gateway/tencent-fingerprint.d.ts.map +1 -1
- package/lib/openai-gateway/tencent-fingerprint.js +11 -0
- package/lib/openai-gateway/tencent-fingerprint.js.map +1 -1
- package/lib/opencode-proxy.d.ts +63 -0
- package/lib/opencode-proxy.d.ts.map +1 -1
- package/lib/opencode-proxy.js +80 -36
- package/lib/opencode-proxy.js.map +1 -1
- package/lib/permanent-lock-store.d.ts +7 -0
- package/lib/permanent-lock-store.d.ts.map +1 -1
- package/lib/permanent-lock-store.js +85 -10
- package/lib/permanent-lock-store.js.map +1 -1
- package/lib/provider-credits.d.ts.map +1 -1
- package/lib/provider-credits.js +167 -2
- package/lib/provider-credits.js.map +1 -1
- package/lib/provider-expiry.d.ts.map +1 -1
- package/lib/provider-expiry.js +67 -1
- package/lib/provider-expiry.js.map +1 -1
- package/lib/provider-onboarding.d.ts +10 -0
- package/lib/provider-onboarding.d.ts.map +1 -1
- package/lib/provider-onboarding.js +70 -0
- package/lib/provider-onboarding.js.map +1 -1
- package/lib/provider-registry.d.ts.map +1 -1
- package/lib/provider-registry.js +257 -16
- package/lib/provider-registry.js.map +1 -1
- package/lib/proxy-mask.d.ts.map +1 -1
- package/lib/proxy-mask.js +14 -1
- package/lib/proxy-mask.js.map +1 -1
- package/lib/qoder-adapter.d.ts +60 -2
- package/lib/qoder-adapter.d.ts.map +1 -1
- package/lib/qoder-adapter.js +215 -3
- package/lib/qoder-adapter.js.map +1 -1
- package/lib/qoder-credits.d.ts.map +1 -1
- package/lib/qoder-credits.js +34 -4
- package/lib/qoder-credits.js.map +1 -1
- package/lib/raccoon-adapter.d.ts +27 -0
- package/lib/raccoon-adapter.d.ts.map +1 -1
- package/lib/raccoon-adapter.js +38 -2
- package/lib/raccoon-adapter.js.map +1 -1
- package/lib/raccoon-product.d.ts.map +1 -1
- package/lib/raccoon-product.js +10 -4
- package/lib/raccoon-product.js.map +1 -1
- package/lib/refresh-scheduler.d.ts +14 -0
- package/lib/refresh-scheduler.d.ts.map +1 -1
- package/lib/refresh-scheduler.js +28 -2
- package/lib/refresh-scheduler.js.map +1 -1
- package/lib/service.d.ts +2 -0
- package/lib/service.d.ts.map +1 -1
- package/lib/service.js +55 -1
- package/lib/service.js.map +1 -1
- package/lib/session-cookie.d.ts +39 -0
- package/lib/session-cookie.d.ts.map +1 -0
- package/lib/session-cookie.js +69 -0
- package/lib/session-cookie.js.map +1 -0
- package/lib/types.d.ts +153 -5
- package/lib/types.d.ts.map +1 -1
- package/lib/types.js.map +1 -1
- package/lib/webdav-auto-sync.d.ts +8 -3
- package/lib/webdav-auto-sync.d.ts.map +1 -1
- package/lib/webdav-auto-sync.js +0 -0
- package/lib/webdav-auto-sync.js.map +1 -1
- package/lib/webdav-rpc.d.ts +13 -0
- package/lib/webdav-rpc.d.ts.map +1 -0
- package/lib/webdav-rpc.js +127 -0
- package/lib/webdav-rpc.js.map +1 -0
- package/lib/zcode-upstream.d.ts +23 -5
- package/lib/zcode-upstream.d.ts.map +1 -1
- package/lib/zcode-upstream.js +27 -9
- package/lib/zcode-upstream.js.map +1 -1
- package/package.json +3 -1
package/lib/autoclaw-oauth.js
CHANGED
|
@@ -6,7 +6,7 @@ import path from 'node:path';
|
|
|
6
6
|
import crypto from 'node:crypto';
|
|
7
7
|
import http from 'node:http';
|
|
8
8
|
import { execFileSync } from 'node:child_process';
|
|
9
|
-
import { AUTOCLAW, AUTOCLAW_SOURCE_ID, AUTOCLAW_CLIENT_VERSION, } from './autoclaw-product.js';
|
|
9
|
+
import { AUTOCLAW, AUTOCLAW_INTL, AUTOCLAW_SOURCE_ID, AUTOCLAW_CLIENT_VERSION, } from './autoclaw-product.js';
|
|
10
10
|
import { AUTOCLAW_REFRESH_PATH, AUTOCLAW_REFRESH_FALLBACK_PATH, AUTOCLAW_MODEL_CONFIG_PATH, AUTOCLAW_REQUEST_TIMEOUT_MS, calculateAutoclawSign, cleanBearerToken, readUserIdFromJwt, autoclawExpiresAtMs, autoclawAccessTokenExpiresAtMs, } from './autoclaw.js';
|
|
11
11
|
import { isDefinitiveRefreshRejection, refreshFailureFromResponse } from './refresh-failure.js';
|
|
12
12
|
export const AUTOCLAW_SEND_CODE_PATH = '/userapi/v1/agent-send-code';
|
|
@@ -35,15 +35,54 @@ export const AUTOCLAW_LOGIN_PATH = '/userapi/v1/agent-login';
|
|
|
35
35
|
// **`631001 User login error`** —— 这是「进入登录逻辑后 code 无效」,
|
|
36
36
|
// **不是**「state 无效」。⇒ 服务端不硬校验 `state` 的内容。
|
|
37
37
|
//
|
|
38
|
-
//
|
|
39
|
-
//
|
|
40
|
-
|
|
41
|
-
|
|
38
|
+
// ## ⚠️⚠️ 「`state` 交给授权页生成」这条路线**已被真机推翻**(2026-11-02,用户报障)
|
|
39
|
+
//
|
|
40
|
+
// 当时的推理是:`state` 留空、由官方授权页填、回调时透传 ⇒ 不必逆向 `nh`。
|
|
41
|
+
// 真机结果是**整条流程走不下去**:用户从登录页点「使用 Z.ai 账号继续」,
|
|
42
|
+
// 浏览器登录 Z.ai 成功后**停在 `chat.z.ai` 首页**,我们本地的
|
|
43
|
+
// `/auth/callback-zai` 一个请求都没收到(面板一直等,最后超时)。
|
|
44
|
+
//
|
|
45
|
+
// 服务端探针给出决定性证据(全部**匿名** GET,无凭据):
|
|
46
|
+
//
|
|
47
|
+
// | 请求 | 响应 |
|
|
48
|
+
// |---|---|
|
|
49
|
+
// | `GET /api/oauth/authorize?client_id=…&response_type=code&redirect_uri=…`(**无 state**) | **422 Unprocessable Entity** |
|
|
50
|
+
// | 同上 **+ `state=aosi.probe-…`** | **307** → `/auth?response_type=code&client_id=…&redirect_uri=…&state=aosi.probe-…` |
|
|
51
|
+
// | `GET /api/oauth/authorize?client_id=…(错的值)&state=…` | 307(**不校验 client_id**) |
|
|
52
|
+
// | 同上但 `redirect_uri` 换成 `https://evil.example.com/cb` | 307(**不校验 redirect_uri**) |
|
|
53
|
+
//
|
|
54
|
+
// ⇒ **`state` 是服务端必需参数**(缺了直接 422)。而 `/auth` 只是它的
|
|
55
|
+
// **前端登录页路由**,不是授权端点 —— 直接打开 `/auth` 时页面只拿
|
|
56
|
+
// `redirect_uri` 判断「我在 OAuth 流程里」(客户端 bundle 的
|
|
57
|
+
// `Hht = () => !!t.get("redirect_uri") || gJ() || !!t.get("sso_redirect")`),
|
|
58
|
+
// 真正的回跳目标走的是 `redirect` 参数 / sessionStorage,**不是**顶层 `redirect_uri`
|
|
59
|
+
// ⇒ 登录完没有可回的目标,落回首页。
|
|
60
|
+
//
|
|
61
|
+
// ⇒ 正确形态是走 **`/api/oauth/authorize`** 并**自己生成 `state`**:
|
|
62
|
+
// 未登录 ⇒ 它 307 到 `/auth?…&state=…`(把它原样带到登录页);
|
|
63
|
+
// 登录后 ⇒ 它 302 回 `redirect_uri?code=…&state=…`。
|
|
64
|
+
//
|
|
65
|
+
// `aosi.` 前缀 + 任意内容是可行的:`nh` 仍未知,但服务端**不硬校验 `state` 内容**
|
|
66
|
+
// (实测把瞎编的 `aosi.fake-state-probe` 打到 `zai-oauth-login`,回的是
|
|
67
|
+
// `631001 User login error` = **进了登录逻辑、code 无效**,而不是「state 无效」)。
|
|
68
|
+
/** Z.ai **授权端点**(国际版)。⚠️ 不是 `https://chat.z.ai/auth` —— 那是登录页前端路由,见上方实测。 */
|
|
69
|
+
export const AUTOCLAW_ZAI_AUTH_URL = 'https://chat.z.ai/api/oauth/authorize';
|
|
42
70
|
/**
|
|
43
|
-
* Z.ai OAuth
|
|
71
|
+
* Z.ai OAuth 的 `client_id` —— **只用于降级路径**,正常路径由服务端下发。
|
|
72
|
+
*
|
|
73
|
+
* ## ⚠️⚠️ 只用这个值自己拼**不成立**(2026-11-02 第三轮真机证伪)
|
|
44
74
|
*
|
|
45
|
-
*
|
|
46
|
-
*
|
|
75
|
+
* 它来自一次真实授权 URL(两次采样逐字节相同)。但真机复现时,用同一个 `client_id`
|
|
76
|
+
* + 已注册端口 + 自造 `state` 打 `/api/oauth/authorize`,服务端回
|
|
77
|
+
* `{"detail":"Redirect URI not registered for this client"}` —— 端口与路径都已经被
|
|
78
|
+
* 上一轮修对了,仍被拒。
|
|
79
|
+
*
|
|
80
|
+
* 客户端实现里**没有**这个常量:它走 `POST /userapi/overseasv1/zai-oauth-url`
|
|
81
|
+
* 拿 `{oauth_url, state}`。⇒ 真正成立的是「服务端按 `navigate_uri` 现注册一组」,
|
|
82
|
+
* 而不是「某个固定的 (client_id, redirect_uri) 组合」。
|
|
83
|
+
*
|
|
84
|
+
* ⇒ 生产路径见 `fetchAutoclawZaiAuthUrl`;这里保留常量只为「服务端不可达时仍能渲染出
|
|
85
|
+
* 可点的链接」这一降级分支,且页面会显式告知用户可能失败。
|
|
47
86
|
*/
|
|
48
87
|
export const AUTOCLAW_ZAI_CLIENT_ID = 'client_EnD0QI8bLRFT8cciLp389Q';
|
|
49
88
|
/** OAuth 换 token 端点(`overseasv1` 命名空间,仅国际站有)。 */
|
|
@@ -55,20 +94,168 @@ export const AUTOCLAW_OAUTH_CALLBACK_PATH = '/auth/callback-zai';
|
|
|
55
94
|
/** OAuth 回调端口候选(与客户端 `OAUTH_CALLBACK_PORTS` 逐字相同)。 */
|
|
56
95
|
export const AUTOCLAW_OAUTH_CALLBACK_PORTS = [18432, 19654, 19723, 53699];
|
|
57
96
|
/**
|
|
58
|
-
*
|
|
97
|
+
* 生成 Z.ai OAuth 的 `state`。
|
|
98
|
+
*
|
|
99
|
+
* 形态对齐官方:`aosi.<base64url(JSON)>`。官方那个 JWT 里 `dh = SHA256(deviceId)`
|
|
100
|
+
* **已破解**、`nh` **未解**,但服务端不硬校验内容(见上方实测表)⇒ 我们只放
|
|
101
|
+
* 一个能自证「这是本轮流程」的随机串,不做任何防伪。
|
|
102
|
+
*
|
|
103
|
+
* ⚠️ **它必须非空**:`/api/oauth/authorize` 缺 `state` 直接回 **422**(实测),
|
|
104
|
+
* 这正是 2026-11-02 那次「点完按钮、登录成功、回调永不发生」的根因。
|
|
105
|
+
*/
|
|
106
|
+
export function autoclawZaiState(now = Date.now()) {
|
|
107
|
+
const payload = JSON.stringify({ n: Math.random().toString(36).slice(2), t: now });
|
|
108
|
+
return `aosi.${Buffer.from(payload, 'utf8').toString('base64url')}`;
|
|
109
|
+
}
|
|
110
|
+
/**
|
|
111
|
+
* 按顺序尝试监听**注册过的回调端口**({@link AUTOCLAW_OAUTH_CALLBACK_PORTS})。
|
|
112
|
+
*
|
|
113
|
+
* ## ⚠️⚠️ 为什么不能 `listen(0)` 随机端口(2026-11-02 真机,第二处报障)
|
|
114
|
+
*
|
|
115
|
+
* Z.ai 的 `/api/oauth/authorize` 对**已登录**用户会校验 `redirect_uri` 白名单,
|
|
116
|
+
* 未注册的端口直接回一段 JSON:
|
|
117
|
+
*
|
|
118
|
+
* ```
|
|
119
|
+
* {"detail":"Redirect URI not registered for this client"}
|
|
120
|
+
* ```
|
|
121
|
+
*
|
|
122
|
+
* 实测端点是随机端口 `60768`。而 `AUTOCLAW_OAUTH_CALLBACK_PORTS` 正是官方客户端
|
|
123
|
+
* 注册的那几个 —— 它在本次接线之前是**零消费**常量(审查员登记过「与 `listen(0)`
|
|
124
|
+
* 冲突,若服务端做端口白名单会直接死在授权页」,现在被真机证实)。
|
|
125
|
+
*
|
|
126
|
+
* ⚠️ 未登录时**看不出**这个问题:那时 `/api/oauth/authorize` 一律 307 到登录页,
|
|
127
|
+
* 不做白名单校验 ⇒ 「curl 探针 307」**不能**当成「端口没问题」的证据。
|
|
128
|
+
*
|
|
129
|
+
* ## 回退策略
|
|
59
130
|
*
|
|
60
|
-
*
|
|
61
|
-
*
|
|
131
|
+
* 4 个端口全被占用 ⇒ 回退 `listen(0)`。此时 OAuth 一定登不上(未注册),但本地页
|
|
132
|
+
* 仍能打开 —— 用户至少能看到授权页并拿到一条可诊断的失败,而不是「窗口都起不来」。
|
|
133
|
+
* 回调里对这种情况已经会返回「授权失败」的可见文案。
|
|
134
|
+
*
|
|
135
|
+
* @param server - 只需 `listen` / `once` / `removeListener`(单测因此可以注入替身)。
|
|
136
|
+
* @param candidates - 候选端口,按顺序尝试。
|
|
137
|
+
*/
|
|
138
|
+
export async function listenOnCallbackPorts(server, candidates = AUTOCLAW_OAUTH_CALLBACK_PORTS) {
|
|
139
|
+
for (const candidate of candidates) {
|
|
140
|
+
const ok = await tryListen(server, candidate);
|
|
141
|
+
if (ok)
|
|
142
|
+
return;
|
|
143
|
+
}
|
|
144
|
+
await tryListen(server, 0);
|
|
145
|
+
}
|
|
146
|
+
/** 尝试监听一个端口;`EADDRINUSE` 等错误返回 `false`(不抛)。 */
|
|
147
|
+
function tryListen(server, port) {
|
|
148
|
+
return new Promise((resolve) => {
|
|
149
|
+
const onError = () => {
|
|
150
|
+
server.removeListener('listening', onListening);
|
|
151
|
+
resolve(false);
|
|
152
|
+
};
|
|
153
|
+
const onListening = () => {
|
|
154
|
+
server.removeListener('error', onError);
|
|
155
|
+
resolve(true);
|
|
156
|
+
};
|
|
157
|
+
server.once('error', onError);
|
|
158
|
+
server.once('listening', onListening);
|
|
159
|
+
server.listen(port, '127.0.0.1');
|
|
160
|
+
});
|
|
161
|
+
}
|
|
162
|
+
/**
|
|
163
|
+
* 构造 Z.ai 授权 URL。
|
|
62
164
|
*
|
|
63
|
-
* @param redirectUri - 回调地址(`http://
|
|
165
|
+
* @param redirectUri - 回调地址(`http://127.0.0.1:<port>/auth/callback-zai`)。
|
|
166
|
+
* @param state - **必填**(见 {@link autoclawZaiState})。回调时原样带回,用于认领本轮流程。
|
|
64
167
|
*/
|
|
65
|
-
export function buildAutoclawZaiAuthUrl(redirectUri) {
|
|
168
|
+
export function buildAutoclawZaiAuthUrl(redirectUri, state) {
|
|
66
169
|
const url = new URL(AUTOCLAW_ZAI_AUTH_URL);
|
|
67
170
|
url.searchParams.set('response_type', 'code');
|
|
68
171
|
url.searchParams.set('client_id', AUTOCLAW_ZAI_CLIENT_ID);
|
|
69
172
|
url.searchParams.set('redirect_uri', redirectUri);
|
|
173
|
+
url.searchParams.set('state', state);
|
|
70
174
|
return url.toString();
|
|
71
175
|
}
|
|
176
|
+
/**
|
|
177
|
+
* 由**服务端签发**授权 URL 的端点(`overseasv1`,仅国际站)。
|
|
178
|
+
*
|
|
179
|
+
* ## 为什么必须走它,而不是自己拼(2026-11-02 第三轮真机报障)
|
|
180
|
+
*
|
|
181
|
+
* 自己拼的 URL 在真机上被 Z.ai 拒绝:
|
|
182
|
+
* `{"detail":"Redirect URI not registered for this client"}`。
|
|
183
|
+
* 客户端实现(`dist/main.cjs`)里根本没有 `client_id` 常量 —— 它的顺序是:
|
|
184
|
+
*
|
|
185
|
+
* ```js
|
|
186
|
+
* // 1) 起 loopback,拿到 navigate_uri
|
|
187
|
+
* // 2) 向服务端要授权地址
|
|
188
|
+
* const t = await this.post('/userapi/overseasv1/zai-oauth-url', { navigate_uri });
|
|
189
|
+
* const oauthUrl = a.data.oauth_url, state = a.data.state; // ← 服务端签发
|
|
190
|
+
* // 3) 打开 oauthUrl;回调拿 code+state;4) POST zai-oauth-login
|
|
191
|
+
* ```
|
|
192
|
+
*
|
|
193
|
+
* ⇒ **`(client_id, redirect_uri, state)` 是服务端按 `navigate_uri` 现注册的一组**。
|
|
194
|
+
* 我们照抄过一次真实 URL 里的 `client_id`,但那一组的 `state` 已随上一轮流程失效
|
|
195
|
+
* ⇒ 服务端找不到「这个 redirect_uri 属于哪个 state」,于是报成「redirect_uri 未注册」。
|
|
196
|
+
* 这个报错文案极具误导性 —— 它让人以为是端口/路径问题(实际都改对了)。
|
|
197
|
+
*
|
|
198
|
+
* @param navigateUri - 回调地址,必须与 `zai-oauth-login` 的 `navigate_uri` 逐字节相同。
|
|
199
|
+
*/
|
|
200
|
+
export const AUTOCLAW_ZAI_AUTH_URL_PATH = '/userapi/overseasv1/zai-oauth-url';
|
|
201
|
+
/** HTML 转义(登录页与回调页共用同一份,避免两份实现在特殊字符上分叉)。 */
|
|
202
|
+
function escapeHtml(text) {
|
|
203
|
+
return text
|
|
204
|
+
.replace(/&/g, '&').replace(/</g, '<').replace(/>/g, '>')
|
|
205
|
+
.replace(/"/g, '"').replace(/'/g, ''');
|
|
206
|
+
}
|
|
207
|
+
/**
|
|
208
|
+
* 向服务端申请一次授权:返回**授权页地址**与配套的 `state`。
|
|
209
|
+
*
|
|
210
|
+
* 失败时**不抛**(返回 `{ ok: false, error }`)—— 调用方(登录页)要把原因显示出来。
|
|
211
|
+
*/
|
|
212
|
+
export async function fetchAutoclawZaiAuthUrl(navigateUri, options) {
|
|
213
|
+
const product = options?.product ?? AUTOCLAW;
|
|
214
|
+
const fetcher = options?.fetchImpl ?? fetch;
|
|
215
|
+
const deviceId = resolveDeviceId(product, options?.deviceId);
|
|
216
|
+
const ts = Math.floor(Date.now() / 1000).toString();
|
|
217
|
+
const sign = calculateAutoclawSign(product.appId, ts, product.appKey);
|
|
218
|
+
try {
|
|
219
|
+
const resp = await fetcher(`${product.apiBase}${AUTOCLAW_ZAI_AUTH_URL_PATH}`, {
|
|
220
|
+
method: 'POST',
|
|
221
|
+
headers: {
|
|
222
|
+
'Content-Type': 'application/json',
|
|
223
|
+
// 与 `exchangeAutoclawZaiCode` 完全同一组管理头(缺一个都进不了登录逻辑)。
|
|
224
|
+
'X-Version': AUTOCLAW_CLIENT_VERSION,
|
|
225
|
+
'X-Tm': 'win',
|
|
226
|
+
'X-Product': product.product,
|
|
227
|
+
'X-Auth-Appid': product.appId,
|
|
228
|
+
'X-Auth-TimeStamp': ts,
|
|
229
|
+
'X-Auth-Sign': sign,
|
|
230
|
+
'X-Lang': 'en-US',
|
|
231
|
+
'X-Channel': 'official',
|
|
232
|
+
'User-Agent': `AutoClaw/${AUTOCLAW_CLIENT_VERSION} (win)`,
|
|
233
|
+
},
|
|
234
|
+
body: JSON.stringify({
|
|
235
|
+
navigate_uri: navigateUri,
|
|
236
|
+
source_id: AUTOCLAW_SOURCE_ID,
|
|
237
|
+
device_id: deviceId,
|
|
238
|
+
}),
|
|
239
|
+
signal: AbortSignal.timeout(AUTOCLAW_REQUEST_TIMEOUT_MS),
|
|
240
|
+
});
|
|
241
|
+
if (!resp.ok) {
|
|
242
|
+
const text = await resp.text().catch(() => '');
|
|
243
|
+
return { ok: false, error: `申请授权地址失败(${resp.status}):${text.slice(0, 200)}` };
|
|
244
|
+
}
|
|
245
|
+
const json = (await resp.json());
|
|
246
|
+
const authUrl = typeof json.data?.oauth_url === 'string' ? json.data.oauth_url.trim() : '';
|
|
247
|
+
const state = typeof json.data?.state === 'string' ? json.data.state.trim() : '';
|
|
248
|
+
if (json.code !== 0 || authUrl === '' || state === '') {
|
|
249
|
+
// ⚠️ 服务端回 `code !== 0` 时 `msg` 才是用户能看懂的那句,别吞。
|
|
250
|
+
const detail = json.msg !== undefined && json.msg !== '' ? `:${json.msg}` : '';
|
|
251
|
+
return { ok: false, error: `服务端未返回授权地址(code=${json.code})${detail}` };
|
|
252
|
+
}
|
|
253
|
+
return { ok: true, value: { authUrl, state } };
|
|
254
|
+
}
|
|
255
|
+
catch (err) {
|
|
256
|
+
return { ok: false, error: `申请授权地址失败:${err instanceof Error ? err.message : String(err)}` };
|
|
257
|
+
}
|
|
258
|
+
}
|
|
72
259
|
/**
|
|
73
260
|
* 用授权码换 token(国际版 Z.ai OAuth)。
|
|
74
261
|
*
|
|
@@ -138,11 +325,25 @@ export async function exchangeAutoclawZaiCode(code, state, navigateUri, options)
|
|
|
138
325
|
}
|
|
139
326
|
const cleanAccess = cleanBearerToken(rawAccess);
|
|
140
327
|
const cleanRefresh = data.refresh_token === undefined ? '' : cleanBearerToken(data.refresh_token);
|
|
141
|
-
|
|
328
|
+
/**
|
|
329
|
+
* ⚠️⚠️ **沿用 IKOYEG 的修法:JWT 优先、声明值兜底、都读不到就 `undefined`**
|
|
330
|
+
* (2026-11-02 由 doc-wiring 审查打穿 —— 本轮之前这一行还是「编造 7 天」)。
|
|
331
|
+
*
|
|
332
|
+
* 旧实现写的是 `Date.now() + 7 * 86400_000`,与 `src/autoclaw.ts:227-246` 记录的
|
|
333
|
+
* 那次 P0 **逐字同型**:一个编造的有效期同时是「续期 lead-time」与「积分按需自愈」
|
|
334
|
+
* 的唯一判据 ⇒ 过期前不自愈、过期后也不自愈、**日志零字**。
|
|
335
|
+
*
|
|
336
|
+
* 它此前一直**不可达**(只有零调用的 `loginWithZaiCode` 会走到),所以历次审计都没
|
|
337
|
+
* 抓到;2026-11-02 把 Z.ai OAuth 接成生产路径后,这个 P0 立刻复活。
|
|
338
|
+
*
|
|
339
|
+
* ⚠️ 新测试的假上游固定回 `expires_in: 3600`,恰好把 7 天分支绕开 ⇒ 用例**恒绿**。
|
|
340
|
+
* 「被兜底分支掩盖的缺陷」要单独一格用例(`expires_at`/`expires_in` 都不给)。
|
|
341
|
+
*/
|
|
342
|
+
const expiresAt = autoclawAccessTokenExpiresAtMs(cleanAccess, typeof data.expires_at === 'number'
|
|
142
343
|
? autoclawExpiresAtMs(data.expires_at)
|
|
143
344
|
: typeof data.expires_in === 'number'
|
|
144
345
|
? Date.now() + data.expires_in * 1000
|
|
145
|
-
:
|
|
346
|
+
: undefined);
|
|
146
347
|
// ⚠️ 身份字段:优先服务端 `user_id`,其次 JWT 的 `user_id`(numericUserId)。
|
|
147
348
|
// 与国内版同口径(见 `autoclawIdentityOf` 的注释:UUID 与 numericUserId
|
|
148
349
|
// 是两个 id 空间,统一由自愈补齐,这里只保证「不会没有身份」)。
|
|
@@ -664,13 +865,67 @@ export async function startAutoclawSmsLoginFlow(options) {
|
|
|
664
865
|
const timeoutMs = options?.timeoutMs ?? 180_000;
|
|
665
866
|
let settleOk;
|
|
666
867
|
let settleErr;
|
|
868
|
+
/**
|
|
869
|
+
* 本轮流**最近一次**渲染登录页时生成的 `state`。
|
|
870
|
+
*
|
|
871
|
+
* 定义在这里(而不是 GET 处理器内)是因为回调处理器要读它比对:
|
|
872
|
+
* 两个处理器是同一 `createServer` 的回调,闭包共享这份变量。
|
|
873
|
+
*
|
|
874
|
+
* ⚠️ 用户刷新登录页会让它被覆盖 —— 所以回调**只 warn 不拒绝**(旧标签页的回调
|
|
875
|
+
* 仍应被认领;`state` 的价值是诊断「回调来自哪一轮」,不是防伪)。
|
|
876
|
+
*/
|
|
877
|
+
let pendingZaiState = '';
|
|
667
878
|
const result = new Promise((resolve, reject) => {
|
|
668
879
|
settleOk = resolve;
|
|
669
880
|
settleErr = reject;
|
|
670
881
|
});
|
|
671
882
|
const server = http.createServer((req, res) => {
|
|
883
|
+
void handleRequest(req, res);
|
|
884
|
+
});
|
|
885
|
+
/** 真正的处理器(异步:登录页要等服务端签发授权地址)。 */
|
|
886
|
+
async function handleRequest(req, res) {
|
|
672
887
|
const url = new URL(req.url ?? '/', `http://127.0.0.1:${req.socket.localPort ?? 0}`);
|
|
673
888
|
if (req.method === 'GET' && (url.pathname === '/autoclaw/login' || url.pathname === '/')) {
|
|
889
|
+
/**
|
|
890
|
+
* ⚠️⚠️ **登录方式按站点分裂**(2026-11-02 接线,此前这里写死国内形态)。
|
|
891
|
+
*
|
|
892
|
+
* | 站点 | 登录方式 | 依据 |
|
|
893
|
+
* |---|---|---|
|
|
894
|
+
* | 国内 `autoclaw` | 手机短信验证码 | `agent-send-code` / `agent-login` |
|
|
895
|
+
* | 国际 `autoclawintl` | **Z.ai OAuth** | 国际账号是邮箱 + OAuth 创建、`phone` 为 null、无绑手机端点 ⇒ 短信必然失败 |
|
|
896
|
+
*
|
|
897
|
+
* 依据见 `src/autoclaw-product.ts` 那张「为什么是两个 provider」的表,
|
|
898
|
+
* 以及 `autoclaw-oauth.ts` 文件头的实测记录。
|
|
899
|
+
*
|
|
900
|
+
* ## 为什么这里必须算 `redirectUri`
|
|
901
|
+
*
|
|
902
|
+
* OAuth 要求「授权时的 `redirect_uri`」与「换 token 时的 `navigate_uri`」**逐字节相同**
|
|
903
|
+
* (`exchangeAutoclawZaiCode` 的入参)。两处都从 `req.socket.localPort` 取 ——
|
|
904
|
+
* 端口由 {@link listenOnCallbackPorts} 按**注册过的回调端口**选定(不是 `listen(0)`
|
|
905
|
+
* 随机端口,那种端口会被 Z.ai 以「Redirect URI not registered」拒绝),
|
|
906
|
+
* 但处理器拿到的是 `req`,闭包里没有 port 变量,所以仍从 socket 现算。
|
|
907
|
+
*/
|
|
908
|
+
const smsLogin = product.id === AUTOCLAW.id;
|
|
909
|
+
const localPort = req.socket.localPort ?? 0;
|
|
910
|
+
const redirectUri = `http://127.0.0.1:${localPort}${AUTOCLAW_OAUTH_CALLBACK_PATH}`;
|
|
911
|
+
// ⚠️⚠️ **授权地址必须由服务端签发**(2026-11-02 第三轮真机报障)。
|
|
912
|
+
// 客户端里没有 `client_id` 常量:它先起 loopback,再 POST `zai-oauth-url`
|
|
913
|
+
// 拿 `{oauth_url, state}`,最后打开 —— 也就是说 `(client_id, redirect_uri, state)`
|
|
914
|
+
// 是服务端按 `navigate_uri` **现注册的一组**。我们照抄过一次真实 URL 的
|
|
915
|
+
// `client_id` 自己拼,真机被拒(`Redirect URI not registered for this client`,
|
|
916
|
+
// 报错文案误导,实际端口与路径都对)。
|
|
917
|
+
// 自拼只作**降级**(服务端不可达时至少还能看到页面与原因)。
|
|
918
|
+
const issued = smsLogin
|
|
919
|
+
? { ok: false, error: '' }
|
|
920
|
+
: await fetchAutoclawZaiAuthUrl(redirectUri, { product, fetchImpl: options?.fetchImpl });
|
|
921
|
+
const zaiAuthUrl = issued.ok
|
|
922
|
+
? ((pendingZaiState = issued.value.state), issued.value.authUrl)
|
|
923
|
+
: buildAutoclawZaiAuthUrl(redirectUri, (pendingZaiState = autoclawZaiState()));
|
|
924
|
+
const zaiIssue = issued.ok ? '' : issued.error;
|
|
925
|
+
const pageTitle = smsLogin ? 'AutoClaw 账号登录' : `${product.displayName ?? 'AutoClaw'} 账号登录`;
|
|
926
|
+
const pageDesc = smsLogin
|
|
927
|
+
? '支持一键读取本机桌面端凭据,或通过手机验证码快速登录。'
|
|
928
|
+
: '支持一键读取本机桌面端凭据,或使用 Z.ai 账号授权登录。';
|
|
674
929
|
res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' });
|
|
675
930
|
res.end(`<!DOCTYPE html>
|
|
676
931
|
<html lang="zh-CN">
|
|
@@ -707,10 +962,11 @@ export async function startAutoclawSmsLoginFlow(options) {
|
|
|
707
962
|
</head>
|
|
708
963
|
<body>
|
|
709
964
|
<div class="card">
|
|
710
|
-
<h2
|
|
711
|
-
<p class="desc"
|
|
712
|
-
<button type="button" class="btn-secondary" id="btnLocal">⚡
|
|
713
|
-
|
|
965
|
+
<h2>${pageTitle}</h2>
|
|
966
|
+
<p class="desc">${pageDesc}</p>
|
|
967
|
+
<button type="button" class="btn-secondary" id="btnLocal">⚡ 一键读取本机桌面端凭据</button>
|
|
968
|
+
${smsLogin
|
|
969
|
+
? ` <div class="divider">或者使用手机验证码登录</div>
|
|
714
970
|
<div class="input-group">
|
|
715
971
|
<label for="phone">手机号</label>
|
|
716
972
|
<input type="tel" id="phone" placeholder="请输入 11 位手机号" maxlength="11" />
|
|
@@ -722,7 +978,11 @@ export async function startAutoclawSmsLoginFlow(options) {
|
|
|
722
978
|
<button type="button" class="btn-code" id="btnSend">获取验证码</button>
|
|
723
979
|
</div>
|
|
724
980
|
</div>
|
|
725
|
-
<button type="button" class="btn-primary" id="btnLogin">登录并绑定账号</button
|
|
981
|
+
<button type="button" class="btn-primary" id="btnLogin">登录并绑定账号</button>`
|
|
982
|
+
: ` <div class="divider">或者使用 Z.ai 账号登录</div>
|
|
983
|
+
<a class="btn-primary" id="btnZai" href="${zaiAuthUrl}"
|
|
984
|
+
style="display:block;text-align:center;text-decoration:none;box-sizing:border-box;">🌐 使用 Z.ai 账号继续</a>
|
|
985
|
+
${zaiIssue === '' ? '' : `<div class="msg error" style="display:block">⚠️ 未能从 AutoClaw 服务端申请授权地址(正在使用降级链接,可能被 Z.ai 拒绝):${escapeHtml(zaiIssue)}</div>`}`}
|
|
726
986
|
<div class="msg" id="msgBox"></div>
|
|
727
987
|
</div>
|
|
728
988
|
<script>
|
|
@@ -743,7 +1003,7 @@ export async function startAutoclawSmsLoginFlow(options) {
|
|
|
743
1003
|
showMsg('success', '✅ 成功读取本机已登录凭据(' + (data.phone || 'AutoClaw账号') + ')!已自动绑定,请关闭本窗口返回 IDE。');
|
|
744
1004
|
btnLocal.style.display = 'none';
|
|
745
1005
|
} else {
|
|
746
|
-
showMsg('error', data.error || '未检测到本地 AutoClaw 桌面端有效登录凭据,请使用下方手机验证码登录。');
|
|
1006
|
+
showMsg('error', data.error || '${smsLogin ? '未检测到本地 AutoClaw 桌面端有效登录凭据,请使用下方手机验证码登录。' : '未检测到本地 AutoClaw 桌面端有效登录凭据,请改用下方的 Z.ai 账号登录。'}');
|
|
747
1007
|
btnLocal.disabled = false;
|
|
748
1008
|
btnLocal.textContent = '⚡ 一键读取本机 AutoClaw 桌面端凭据';
|
|
749
1009
|
}
|
|
@@ -753,6 +1013,7 @@ export async function startAutoclawSmsLoginFlow(options) {
|
|
|
753
1013
|
btnLocal.textContent = '⚡ 一键读取本机 AutoClaw 桌面端凭据';
|
|
754
1014
|
}
|
|
755
1015
|
});
|
|
1016
|
+
if (btnSend && btnLogin) {
|
|
756
1017
|
let countdown = 0;
|
|
757
1018
|
btnSend.addEventListener('click', async () => {
|
|
758
1019
|
const phone = phoneInput.value.trim();
|
|
@@ -806,11 +1067,118 @@ export async function startAutoclawSmsLoginFlow(options) {
|
|
|
806
1067
|
btnLogin.textContent = '登录并绑定账号';
|
|
807
1068
|
}
|
|
808
1069
|
});
|
|
1070
|
+
}
|
|
809
1071
|
</script>
|
|
810
1072
|
</body>
|
|
811
1073
|
</html>`);
|
|
812
1074
|
return;
|
|
813
1075
|
}
|
|
1076
|
+
/**
|
|
1077
|
+
* ⚠️⚠️ **Z.ai OAuth 回调**(2026-11-02 接线;此前是纯死代码)。
|
|
1078
|
+
*
|
|
1079
|
+
* 接之前的事实:`buildZaiAuthUrl` / `loginWithZaiCode` /
|
|
1080
|
+
* `AUTOCLAW_OAUTH_CALLBACK_PATH` 三样都在,但**零调用方** ——
|
|
1081
|
+
* 本地服务的路由只有 `/autoclaw/login`、`send-code`、`submit-code`、
|
|
1082
|
+
* `import-local` 四条,登录页也只有短信 + 一键读本机。
|
|
1083
|
+
* 后果:国际版**没有任何可用的登录入口**(短信对国际账号必然失败、
|
|
1084
|
+
* Z.ai 按钮不存在),只剩「一键导入本机桌面端凭据」。
|
|
1085
|
+
*
|
|
1086
|
+
* ## 两个必须对齐的点
|
|
1087
|
+
*
|
|
1088
|
+
* 1. `redirect_uri`(授权时)与 `navigate_uri`(换 token 时)**必须逐字节相同**,
|
|
1089
|
+
* 两处都从 `req.socket.localPort` 现算 —— 端口由 `listenOnCallbackPorts`
|
|
1090
|
+
* 按**注册过的回调端口**选定(`AUTOCLAW_OAUTH_CALLBACK_PORTS`)。
|
|
1091
|
+
* 2. **失败不要 `settleErr`**:那会立刻结束整个 flow(`result` 变成 reject),
|
|
1092
|
+
* 用户连重试都不行。这里只回一个错误页,flow 继续等用户再点一次。
|
|
1093
|
+
*/
|
|
1094
|
+
if (req.method === 'GET' && url.pathname === AUTOCLAW_OAUTH_CALLBACK_PATH) {
|
|
1095
|
+
/**
|
|
1096
|
+
* ⚠️⚠️ **只有国际版注册这条腿**(2026-11-02 审查打穿)。
|
|
1097
|
+
*
|
|
1098
|
+
* 实测缺陷:不门控时,以 `product: AUTOCLAW`(国内)起的 flow 上,
|
|
1099
|
+
* 直接 GET 本端点会**真的**走一遍换 token 并把凭据 settle 进**国内**占位账号,
|
|
1100
|
+
* 页面还写着「已绑定 AutoClaw(国际版)账号」—— 与「登录页按站点分裂」自相矛盾,
|
|
1101
|
+
* 且给「任意本机进程往 loopback 投递 code」开了一条无入口但可达的路。
|
|
1102
|
+
*
|
|
1103
|
+
* 同源问题:`/autoclaw/send-code` 与 `/autoclaw/submit-code` 对国际版也仍可达。
|
|
1104
|
+
* 那两条**保留**(国际站后端确实接受短信,只是账号没绑手机;UI 已不渲染入口),
|
|
1105
|
+
* 因为它们不会把凭据写进错误站点的槽位 —— 而这条会。
|
|
1106
|
+
*/
|
|
1107
|
+
if (product.id !== AUTOCLAW_INTL.id) {
|
|
1108
|
+
res.writeHead(404).end('Not Found');
|
|
1109
|
+
return;
|
|
1110
|
+
}
|
|
1111
|
+
const renderCallbackPage = (ok, text) => `<!DOCTYPE html>
|
|
1112
|
+
<html lang="zh-CN"><head><meta charset="utf-8" /><title>Z.ai 授权</title>
|
|
1113
|
+
<style>
|
|
1114
|
+
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; }
|
|
1115
|
+
.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); }
|
|
1116
|
+
h2 { margin: 0 0 12px 0; font-size: 19px; color: ${ok ? '#4ade80' : '#f87171'}; }
|
|
1117
|
+
p { color: #cbd5e1; font-size: 13px; line-height: 1.6; margin: 0; word-break: break-all; }
|
|
1118
|
+
</style></head><body><div class="card"><h2>${ok ? '✅ 授权已完成' : '❌ 授权失败'}</h2><p>${escapeHtml(text)}</p></div></body></html>`;
|
|
1119
|
+
const localPort = req.socket.localPort ?? 0;
|
|
1120
|
+
const redirectUri = `http://127.0.0.1:${localPort}${AUTOCLAW_OAUTH_CALLBACK_PATH}`;
|
|
1121
|
+
const code = url.searchParams.get('code') ?? '';
|
|
1122
|
+
const state = url.searchParams.get('state') ?? '';
|
|
1123
|
+
// 只 warn 不拒绝:用户可能刷新过登录页(`pendingZaiState` 被覆盖),旧标签页的回调
|
|
1124
|
+
// 仍应被认领;`state` 在这里的价值是「能不能看出回调来自哪一轮」,不是防伪。
|
|
1125
|
+
if (pendingZaiState !== '' && state !== pendingZaiState) {
|
|
1126
|
+
// 这里没有 logger 钩子(`AutoclawSmsLoginFlowOptions` 不带告警出口),按仓库惯例
|
|
1127
|
+
// 用带守卫的 `console.warn` 兜底 —— 静默丢掉的代价是「回调来自哪一轮」再也查不到。
|
|
1128
|
+
if (typeof console !== 'undefined') {
|
|
1129
|
+
console.warn(`[autoclaw] Z.ai 回调的 state 与本次流程不一致(收到 ${state === '' ? '空' : state.slice(0, 16) + '…'})—— 可能是刷新过登录页,继续认领`);
|
|
1130
|
+
}
|
|
1131
|
+
}
|
|
1132
|
+
if (code === '') {
|
|
1133
|
+
// ⚠️ 用户点「拒绝授权」时,授权页回的是 `?error=access_denied&error_description=…`
|
|
1134
|
+
// (实测形态)。原文案会把整串 query 甩给用户,等于让人自己读协议。
|
|
1135
|
+
const providerError = url.searchParams.get('error') ?? '';
|
|
1136
|
+
const providerErrorDesc = url.searchParams.get('error_description') ?? '';
|
|
1137
|
+
const hint = providerError === ''
|
|
1138
|
+
? `回调没带授权码。请回到登录页重新点击「使用 Z.ai 账号继续」。(${url.search})`
|
|
1139
|
+
: providerError === 'access_denied'
|
|
1140
|
+
? '你拒绝了授权。请回到登录页重新点击「使用 Z.ai 账号继续」并允许访问。'
|
|
1141
|
+
: `授权页返回了错误:${providerError}${providerErrorDesc === '' ? '' : `(${providerErrorDesc})`}。请回到登录页重试。`;
|
|
1142
|
+
res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' });
|
|
1143
|
+
res.end(renderCallbackPage(false, hint));
|
|
1144
|
+
return;
|
|
1145
|
+
}
|
|
1146
|
+
void (async () => {
|
|
1147
|
+
try {
|
|
1148
|
+
const exchanged = await exchangeAutoclawZaiCode(code, state, redirectUri, {
|
|
1149
|
+
product,
|
|
1150
|
+
fetchImpl: options?.fetchImpl,
|
|
1151
|
+
deviceId: options?.deviceId,
|
|
1152
|
+
});
|
|
1153
|
+
if (!exchanged.ok || exchanged.credential === undefined) {
|
|
1154
|
+
res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' });
|
|
1155
|
+
res.end(renderCallbackPage(false, `${exchanged.error ?? 'Z.ai 授权失败(未返回凭据)'}。请回到登录页重试。`));
|
|
1156
|
+
return;
|
|
1157
|
+
}
|
|
1158
|
+
settleOk({ credential: exchanged.credential, phone: exchanged.credential.user_phone ?? '' });
|
|
1159
|
+
res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' });
|
|
1160
|
+
/**
|
|
1161
|
+
* ⚠️⚠️ **文案必须中性,不能写「已绑定」**(2026-11-02 审查)。
|
|
1162
|
+
*
|
|
1163
|
+
* 此刻 `settleOk` 只是 resolve 了 Promise;真正的「这凭据能不能用」发生在
|
|
1164
|
+
* RPC 侧的 `verifyCredentialSite()`(它要打一次余额端点),失败就 `failLogin`
|
|
1165
|
+
* 并**删账号**。原文案会在浏览器上显示「✅ 已绑定」、IDE 里同时显示
|
|
1166
|
+
* 「导入的凭据无法通过校验」然后卡片消失 —— 两句互相打脸。
|
|
1167
|
+
*
|
|
1168
|
+
* 而且 `Z.ai OAuth 换出的 token 是否等价于 AutoClaw access_token`
|
|
1169
|
+
* 至今**零验证**(见 `docs/agent-notes/providers-autoclaw.md` 的「未验证」),
|
|
1170
|
+
* 所以这不是理论瑕疵。
|
|
1171
|
+
*/
|
|
1172
|
+
res.end(renderCallbackPage(true, '授权已完成,正在绑定账号 —— 请返回 IDE 查看结果。本窗口可以关闭。'));
|
|
1173
|
+
}
|
|
1174
|
+
catch (error) {
|
|
1175
|
+
const reason = error instanceof Error ? error.message : String(error);
|
|
1176
|
+
res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' });
|
|
1177
|
+
res.end(renderCallbackPage(false, `授权过程出错:${reason}`));
|
|
1178
|
+
}
|
|
1179
|
+
})();
|
|
1180
|
+
return;
|
|
1181
|
+
}
|
|
814
1182
|
if (req.method === 'POST') {
|
|
815
1183
|
let bodyStr = '';
|
|
816
1184
|
req.on('data', (chunk) => { bodyStr += chunk; });
|
|
@@ -886,10 +1254,10 @@ export async function startAutoclawSmsLoginFlow(options) {
|
|
|
886
1254
|
return;
|
|
887
1255
|
}
|
|
888
1256
|
res.writeHead(404).end('Not Found');
|
|
889
|
-
}
|
|
890
|
-
|
|
891
|
-
|
|
892
|
-
|
|
1257
|
+
}
|
|
1258
|
+
// ⚠️ 必须优先用**注册过的回调端口**(`listen(0)` 的随机端口会被 Z.ai 以
|
|
1259
|
+
// `{"detail":"Redirect URI not registered for this client"}` 拒绝,2026-11-02 真机)。
|
|
1260
|
+
await listenOnCallbackPorts(server);
|
|
893
1261
|
const addr = server.address();
|
|
894
1262
|
const port = typeof addr === 'object' && addr !== null ? addr.port : 0;
|
|
895
1263
|
const loginUrl = `http://127.0.0.1:${port}/autoclaw/login`;
|