@henryxiaoyang/wechat-access-unqclawed 1.0.3 → 1.0.4

package/auth/index.ts

@@ -17,3 +17,5 @@ export { QClawAPI } from "./qclaw-api.js";
 export { loadState, saveState, clearState } from "./state-store.js";
 export { performLogin } from "./wechat-login.js";
 export type { PerformLoginOptions } from "./wechat-login.js";
+export { buildAuthUrl, fetchQrUuid, fetchQrImageDataUrl, pollQrStatus } from "./wechat-qr-poll.js";
+export type { QrPollResult } from "./wechat-qr-poll.js";

package/auth/wechat-qr-poll.ts

@@ -0,0 +1,88 @@
+/**
+ * @file wechat-qr-poll.ts
+ * @description 微信 QR 扫码登录轮询逻辑
+ *
+ * 流程：获取 state → 抓取 QR 页面拿 uuid → 长轮询扫码状态 → 拿到 code
+ */
+
+import type { QClawEnvironment } from "./types.js";
+
+/** 构造微信 OAuth2 授权 URL */
+export const buildAuthUrl = (state: string, env: QClawEnvironment): string => {
+  const params = new URLSearchParams({
+    appid: env.wxAppId,
+    redirect_uri: env.wxLoginRedirectUri,
+    response_type: "code",
+    scope: "snsapi_login",
+    state,
+  });
+  return `https://open.weixin.qq.com/connect/qrconnect?${params.toString()}#wechat_redirect`;
+};
+
+/** 从微信 QR 登录页面 HTML 中提取 uuid */
+export const fetchQrUuid = async (authUrl: string): Promise<string> => {
+  const res = await fetch(authUrl, {
+    headers: {
+      "User-Agent":
+        "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36",
+    },
+    signal: AbortSignal.timeout(15_000),
+  });
+  const html = await res.text();
+  const match = html.match(/\/connect\/qrcode\/([a-zA-Z0-9_=-]+)/);
+  if (!match?.[1]) {
+    throw new Error("无法从微信登录页面提取 QR UUID");
+  }
+  return match[1];
+};
+
+/** 抓取微信 QR 码图片并返回 base64 data URL */
+export const fetchQrImageDataUrl = async (uuid: string): Promise<string> => {
+  const url = `https://open.weixin.qq.com/connect/qrcode/${uuid}`;
+  const res = await fetch(url, { signal: AbortSignal.timeout(15_000) });
+  const buf = Buffer.from(await res.arrayBuffer());
+  const contentType = res.headers.get("content-type") || "image/png";
+  return `data:${contentType};base64,${buf.toString("base64")}`;
+};
+
+export interface QrPollResult {
+  /** waiting=未扫码, scanned=已扫码待确认, confirmed=已确认(含code), expired=过期, error=异常 */
+  status: "waiting" | "scanned" | "confirmed" | "expired" | "error";
+  code?: string;
+}
+
+/**
+ * 长轮询微信扫码状态
+ *
+ * 微信返回的 errcode：
+ * - 408: 等待扫码（长轮询超时，需重试）
+ * - 404: 已扫码，等待用户在手机上确认
+ * - 405: 已确认，wx_code 里带授权 code
+ * - 403/402: 二维码过期
+ */
+export const pollQrStatus = async (uuid: string): Promise<QrPollResult> => {
+  try {
+    const url = `https://lp.open.weixin.qq.com/connect/l/qrconnect?uuid=${uuid}&_=${Date.now()}`;
+    const res = await fetch(url, {
+      headers: {
+        "User-Agent":
+          "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36",
+      },
+      signal: AbortSignal.timeout(30_000),
+    });
+    const text = await res.text();
+
+    const errMatch = text.match(/wx_errcode=(\d+)/);
+    const codeMatch = text.match(/wx_code='([^']*)'/);
+    const errCode = errMatch ? parseInt(errMatch[1], 10) : 0;
+    const wxCode = codeMatch?.[1] || "";
+
+    if (errCode === 408) return { status: "waiting" };
+    if (errCode === 404) return { status: "scanned" };
+    if (errCode === 405 && wxCode) return { status: "confirmed", code: wxCode };
+    if (errCode === 403 || errCode === 402) return { status: "expired" };
+    return { status: "error" };
+  } catch {
+    return { status: "error" };
+  }
+};

package/index.ts

@@ -3,7 +3,9 @@ import { emptyPluginConfigSchema } from "openclaw/plugin-sdk";
 import { WechatAccessWebSocketClient, handlePrompt, handleCancel } from "./websocket/index.js";
 // import { handleSimpleWecomWebhook } from "./http/webhook.js";
 import { setWecomRuntime } from "./common/runtime.js";
-import { performLogin, loadState, clearState, getDeviceGuid, getEnvironment } from "./auth/index.js";
+import { performLogin, loadState, clearState, saveState, getDeviceGuid, getEnvironment, QClawAPI, buildAuthUrl, fetchQrUuid, fetchQrImageDataUrl, pollQrStatus } from "./auth/index.js";
+import type { QClawEnvironment, PersistedAuthState } from "./auth/index.js";
+import { nested } from "./auth/utils.js";
 
 // 类型定义
 type NormalizedChatType = "direct" | "group" | "channel";
@@ -11,6 +13,16 @@ type NormalizedChatType = "direct" | "group" | "channel";
 // WebSocket 客户端实例（按 accountId 存储）
 const wsClients = new Map<string, WechatAccessWebSocketClient>();
 
+// QR 扫码登录中间状态（loginWithQrStart 写入，loginWithQrWait 消费）
+let pendingQrLogin: {
+  state: string;
+  uuid: string;
+  env: QClawEnvironment;
+  guid: string;
+  bypassInvite: boolean;
+  authStatePath?: string;
+} | null = null;
+
 // 渠道元数据
 const meta = {
   id: "wechat-access-unqclawed",
@@ -195,6 +207,123 @@ const tencentAccessPlugin = {
         log?.warn(`[wechat-access] stopAccount: 未找到账号 ${accountId} 的客户端`);
       }
     },
+
+    // QR 扫码登录：生成二维码（openclaw channels login 调用）
+    loginWithQrStart: async (_params: { accountId?: string; force?: boolean; timeoutMs?: number; verbose?: boolean }) => {
+      try {
+        const runtime = getWecomRuntime();
+        const cfg = runtime.config.loadConfig();
+        const channelCfg = cfg?.channels?.["wechat-access-unqclawed"];
+
+        const envName = channelCfg?.environment ? String(channelCfg.environment) : "production";
+        const bypassInvite = channelCfg?.bypassInvite === true;
+        const authStatePath = channelCfg?.authStatePath ? String(channelCfg.authStatePath) : undefined;
+
+        const env = getEnvironment(envName);
+        const guid = getDeviceGuid();
+
+        // 1. 获取 OAuth state
+        const api = new QClawAPI(env, guid);
+        const stateResult = await api.getWxLoginState();
+        let state = String(Math.floor(Math.random() * 10000));
+        if (stateResult.success) {
+          const s = nested(stateResult.data, "state") as string | undefined;
+          if (s) state = s;
+        }
+
+        // 2. 构造 auth URL → 抓取 QR 页面拿 uuid
+        const authUrl = buildAuthUrl(state, env);
+        const uuid = await fetchQrUuid(authUrl);
+
+        // 3. 拿 QR 图片转 base64 data URL
+        const qrDataUrl = await fetchQrImageDataUrl(uuid);
+
+        // 4. 存中间状态给 loginWithQrWait 用
+        pendingQrLogin = { state, uuid, env, guid, bypassInvite, authStatePath };
+
+        return { qrDataUrl, message: "请用微信扫描二维码登录" };
+      } catch (err) {
+        return { message: `登录初始化失败: ${err instanceof Error ? err.message : String(err)}` };
+      }
+    },
+
+    // QR 扫码登录：轮询扫码状态（openclaw channels login 循环调用）
+    loginWithQrWait: async (_params: { accountId?: string; timeoutMs?: number }) => {
+      if (!pendingQrLogin) {
+        return { connected: false, message: "请先执行 loginWithQrStart" };
+      }
+
+      try {
+        const result = await pollQrStatus(pendingQrLogin.uuid);
+
+        if (result.status === "waiting") {
+          return { connected: false, message: "等待扫码..." };
+        }
+
+        if (result.status === "scanned") {
+          return { connected: false, message: "已扫码，请在手机上确认..." };
+        }
+
+        if (result.status === "expired") {
+          pendingQrLogin = null;
+          return { connected: false, message: "二维码已过期，请重新执行 openclaw channels login" };
+        }
+
+        if (result.status === "confirmed" && result.code) {
+          const { state, env, guid, authStatePath } = pendingQrLogin;
+          const api = new QClawAPI(env, guid);
+
+          // 用 code 换 token
+          const loginResult = await api.wxLogin(result.code, state);
+          if (!loginResult.success) {
+            pendingQrLogin = null;
+            return { connected: false, message: `登录失败: ${loginResult.message ?? "未知错误"}` };
+          }
+
+          const loginData = loginResult.data as Record<string, unknown>;
+          const jwtToken = (loginData.token as string) || "";
+          const channelToken = (loginData.openclaw_channel_token as string) || "";
+          const userInfo = (loginData.user_info as Record<string, unknown>) || {};
+
+          // 保存登录态
+          const persistedState: PersistedAuthState = {
+            jwtToken,
+            channelToken,
+            apiKey: "",
+            guid,
+            userInfo,
+            savedAt: Date.now(),
+          };
+          saveState(persistedState, authStatePath);
+
+          // 创建 API Key（非致命）
+          api.jwtToken = jwtToken;
+          api.userId = String(userInfo.user_id ?? "");
+          try {
+            const keyResult = await api.createApiKey();
+            if (keyResult.success) {
+              const apiKey =
+                (nested(keyResult.data, "key") as string) ??
+                (nested(keyResult.data, "resp", "data", "key") as string) ??
+                "";
+              if (apiKey) {
+                persistedState.apiKey = apiKey;
+                saveState(persistedState, authStatePath);
+              }
+            }
+          } catch { /* non-fatal */ }
+
+          pendingQrLogin = null;
+          const nickname = (userInfo.nickname as string) ?? "用户";
+          return { connected: true, message: `登录成功! 欢迎 ${nickname}，请重启 Gateway 生效。` };
+        }
+
+        // error 或其他未知状态
+        return { connected: false, message: "等待扫码..." };
+      } catch (err) {
+        return { connected: false, message: `轮询失败: ${err instanceof Error ? err.message : String(err)}` };
+      }
+    },
   },
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@henryxiaoyang/wechat-access-unqclawed",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "type": "module",
   "description": "OpenClaw 微信通路插件 — 扫码登录 + AGP WebSocket 双向通信",
   "author": "HenryXiaoYang",