@rezti/dsh-rez-wechat 0.1.1 → 0.1.2

package/README.md

@@ -2,24 +2,11 @@
 
 由 `@rezti/dsh-rez-suite` 一次装入。不要单独 `dsh plugin add`。
 
-通道接入复用现成 MCP，不自写微信长连接。
-
 | 能力 | 做法 |
 |---|---|
+| 个人微信（QClaw / ClawBot） | 打开 dsh Web → Rez 面板 → **微信** → 扫码。之后直接在微信里说话。 |
 | 企业微信发到群 | `wecom-mcp`（`mcp__wechat__*`）+ `REZ_WECHAT_WEBHOOK` |
-| 个人微信登录 / 收发 | `weixin-mcp`（`mcp__weixin__*`），QClaw / ClawBot 官方扫码 |
-
-## 个人微信（QClaw 那套）
-
-1. 微信 → 发现 → 小程序 → 搜索 **ClawBot**，创建一个机器人  
-2. 本机扫码一次：
-
-```bash
-npx weixin-mcp login
-```
-
-3. 装过 suite 后，dsh 会自动起 `npx -y weixin-mcp`。缺登录时该 MCP 空转，不把 dsh 打挂。
 
-凭证目录：`$WEIXIN_MCP_DIR` → `~/.openclaw/openclaw-weixin/` → `~/.weixin-mcp/`。
+个人微信复用现成 `dsh-wechat-bridge`（腾讯官方 iLink），不自写 WebSocket，也不用员工再跑 `npx weixin-mcp login`。
 
-这是 ClawBot 客服会话，不是个人微信号管好友/群。
+这是 ClawBot 客服会话，不是用个人微信号管好友/群。

package/lib/channel.d.ts

@@ -0,0 +1,32 @@
+/**
+ * QClaw-style WeChat channel: reuse dsh-wechat-bridge (official iLink / ClawBot).
+ * Scan QR in the Rez panel, then talk in WeChat. Do not expose MCP tools.
+ */
+export type WeixinPhase = 'idle' | 'login' | 'need_verify' | 'listening' | 'error';
+export interface WeixinStatus {
+    loggedIn: boolean;
+    listening: boolean;
+    phase: WeixinPhase;
+    qrContent?: string;
+    qrDataUrl?: string;
+    hint: string;
+}
+export declare class WeixinChannel {
+    private loginChild;
+    private runChild;
+    private phase;
+    private qrContent;
+    private qrDataUrl;
+    private hint;
+    private logBuf;
+    status(): WeixinStatus;
+    startIfLoggedIn(): void;
+    startLogin(): Promise<WeixinStatus>;
+    sendVerify(code: string): WeixinStatus;
+    logout(): Promise<WeixinStatus>;
+    dispose(): void;
+    private startRun;
+    private stopLogin;
+    private stopRun;
+}
+export declare const weixinDataDir: string;

package/lib/channel.js

@@ -0,0 +1,170 @@
+/**
+ * QClaw-style WeChat channel: reuse dsh-wechat-bridge (official iLink / ClawBot).
+ * Scan QR in the Rez panel, then talk in WeChat. Do not expose MCP tools.
+ */
+import { spawn } from 'node:child_process';
+import { existsSync } from 'node:fs';
+import { homedir } from 'node:os';
+import { join } from 'node:path';
+const DATA_DIR = join(homedir(), '.dsh', 'dsh-rez-weixin');
+const AUTH_FILE = join(DATA_DIR, 'weixin-auth.json');
+function extractQrContent(chunk) {
+    const labeled = chunk.match(/二维码链接[^\n]*\n\s*(\S+)/);
+    if (labeled?.[1] !== undefined && labeled[1].length > 8)
+        return labeled[1];
+    const probe = chunk.match(/📱 链接:\s*(\S+)/);
+    if (probe?.[1] !== undefined)
+        return probe[1];
+    const https = chunk.match(/https?:\/\/[^\s]+/);
+    return https?.[0];
+}
+async function toDataUrl(content) {
+    try {
+        const qrcode = await import('qrcode');
+        const fn = qrcode.toDataURL ?? qrcode.default?.toDataURL;
+        if (typeof fn !== 'function')
+            return undefined;
+        return await fn(content, { margin: 1, width: 240 });
+    }
+    catch {
+        return undefined;
+    }
+}
+export class WeixinChannel {
+    loginChild;
+    runChild;
+    phase = 'idle';
+    qrContent;
+    qrDataUrl;
+    hint = '打开 Rez 面板的「微信」页扫码，然后直接在微信里说话。';
+    logBuf = '';
+    status() {
+        const loggedIn = existsSync(AUTH_FILE);
+        const status = {
+            loggedIn,
+            listening: this.runChild !== undefined && this.runChild.exitCode === null,
+            phase: this.phase,
+            hint: this.hint,
+        };
+        if (this.qrContent !== undefined)
+            status.qrContent = this.qrContent;
+        if (this.qrDataUrl !== undefined)
+            status.qrDataUrl = this.qrDataUrl;
+        return status;
+    }
+    startIfLoggedIn() {
+        if (existsSync(AUTH_FILE))
+            this.startRun();
+    }
+    async startLogin() {
+        this.stopLogin();
+        this.phase = 'login';
+        this.qrContent = undefined;
+        this.qrDataUrl = undefined;
+        this.logBuf = '';
+        this.hint = '正在向微信申请二维码…';
+        const child = spawn('npx', ['-y', 'dsh-wechat-bridge', 'login', '--data-dir', DATA_DIR], {
+            env: process.env,
+            stdio: ['pipe', 'pipe', 'pipe'],
+        });
+        this.loginChild = child;
+        const onChunk = (buf) => {
+            const text = buf.toString('utf8');
+            this.logBuf += text;
+            if (this.logBuf.includes('输入手机微信显示的数字') || this.logBuf.includes('请重新输入手机上显示的数字')) {
+                this.phase = 'need_verify';
+                this.hint = '手机上出现了配对数字，填到下面确认。';
+            }
+            if (this.logBuf.includes('已扫码'))
+                this.hint = '已扫码，请在手机上确认。';
+            const qr = extractQrContent(text) ?? extractQrContent(this.logBuf);
+            if (qr !== undefined && qr !== this.qrContent) {
+                this.qrContent = qr;
+                this.hint = '用微信扫一扫这个二维码（或在手机微信打开链接）。';
+                void toDataUrl(qr).then(url => {
+                    if (url !== undefined && this.qrContent === qr)
+                        this.qrDataUrl = url;
+                });
+            }
+        };
+        child.stdout?.on('data', onChunk);
+        child.stderr?.on('data', onChunk);
+        child.on('exit', code => {
+            if (this.loginChild === child)
+                this.loginChild = undefined;
+            if (code === 0 && existsSync(AUTH_FILE)) {
+                this.phase = 'listening';
+                this.hint = '已登录。直接在微信里给 ClawBot 发消息即可，不必再跑命令。';
+                this.startRun();
+                return;
+            }
+            if (this.phase === 'login' || this.phase === 'need_verify') {
+                this.phase = existsSync(AUTH_FILE) ? 'idle' : 'error';
+                this.hint = code === 0 ? '登录结束。' : '登录未完成，请再扫一次。';
+            }
+        });
+        return this.status();
+    }
+    sendVerify(code) {
+        const trimmed = code.trim();
+        if (trimmed.length === 0)
+            return this.status();
+        this.loginChild?.stdin?.write(trimmed + '\n');
+        this.phase = 'login';
+        this.hint = '已提交配对码，等待手机确认…';
+        return this.status();
+    }
+    async logout() {
+        this.stopRun();
+        this.stopLogin();
+        await new Promise(resolve => {
+            const child = spawn('npx', ['-y', 'dsh-wechat-bridge', 'logout', '--data-dir', DATA_DIR], {
+                env: process.env,
+                stdio: 'ignore',
+            });
+            child.on('exit', () => resolve());
+            child.on('error', () => resolve());
+        });
+        this.phase = 'idle';
+        this.qrContent = undefined;
+        this.qrDataUrl = undefined;
+        this.hint = '已退出。再点「扫码登录」即可。';
+        return this.status();
+    }
+    dispose() {
+        this.stopLogin();
+        this.stopRun();
+    }
+    startRun() {
+        if (this.runChild !== undefined && this.runChild.exitCode === null)
+            return;
+        this.phase = 'listening';
+        this.hint = '微信通道已在后台听着。在微信里发消息就会进本机 dsh。';
+        const child = spawn('npx', ['-y', 'dsh-wechat-bridge', 'run', '--data-dir', DATA_DIR], {
+            env: process.env,
+            stdio: ['ignore', 'pipe', 'pipe'],
+        });
+        this.runChild = child;
+        child.on('exit', code => {
+            if (this.runChild === child)
+                this.runChild = undefined;
+            if (this.phase === 'listening') {
+                this.phase = existsSync(AUTH_FILE) ? 'idle' : 'error';
+                this.hint = code === 0 ? '微信监听已停。' : '微信监听退出，可再点扫码或等自动重连。';
+            }
+        });
+    }
+    stopLogin() {
+        if (this.loginChild === undefined)
+            return;
+        this.loginChild.kill('SIGTERM');
+        this.loginChild = undefined;
+    }
+    stopRun() {
+        if (this.runChild === undefined)
+            return;
+        this.runChild.kill('SIGTERM');
+        this.runChild = undefined;
+    }
+}
+export const weixinDataDir = DATA_DIR;

package/lib/index.js

@@ -1,15 +1,115 @@
+import { WeixinChannel } from './channel.js';
 export const name = 'rez-wechat';
 export const inject = ['systemPrompt'];
 const GUIDANCE = [
     '企业微信群发送走官方 dsh-mcp-client + wecom-mcp（mcp__wechat__*），密钥 REZ_WECHAT_WEBHOOK。',
-    '个人微信登录/收发走官方 ClawBot API，复用现成 weixin-mcp（mcp__weixin__*：weixin_send / weixin_poll / weixin_contacts）。这是 QClaw 同款扫码登录，不要自写 WebSocket。',
-    '员工先在微信小程序创建 ClawBot，本机执行一次：npx weixin-mcp login。凭证默认在 ~/.weixin-mcp/，可用 WEIXIN_MCP_DIR 改目录。',
+    '个人微信是 QClaw 同款 ClawBot 通道：在 Rez 面板「微信」页扫码一次，然后直接在微信里说话，dsh 会自动回。不要再跑 npx weixin-mcp login，也不要调用 mcp__weixin__*。',
     '这是 ClawBot 客服会话，不是用个人微信号管好友/群。对外发消息必须先征得用户批准。',
 ].join('');
+function isLoopbackRequest(request) {
+    const address = request.socket.remoteAddress;
+    if (address !== '127.0.0.1' && address !== '::1' && address !== '::ffff:127.0.0.1')
+        return false;
+    const host = request.headers.host;
+    if (typeof host !== 'string')
+        return false;
+    try {
+        const hostUrl = new URL('http://' + host);
+        return hostUrl.hostname === '127.0.0.1' || hostUrl.hostname === 'localhost' || hostUrl.hostname === '[::1]';
+    }
+    catch {
+        return false;
+    }
+}
+function writeJson(res, status, body) {
+    res.writeHead(status, { 'content-type': 'application/json; charset=utf-8', 'referrer-policy': 'no-referrer' });
+    res.end(JSON.stringify(body));
+}
+async function readJsonBody(req) {
+    const chunks = [];
+    let size = 0;
+    for await (const chunk of req) {
+        size += chunk.length;
+        if (size > 16 * 1024)
+            return undefined;
+        chunks.push(chunk);
+    }
+    try {
+        const parsed = JSON.parse(Buffer.concat(chunks).toString('utf8'));
+        return typeof parsed === 'object' && parsed !== null ? parsed : undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
+function weixinRoutes(channel) {
+    const path = '/api/dsh-rez-suite/weixin';
+    const guard = (req, res, method) => {
+        if (!isLoopbackRequest(req)) {
+            writeJson(res, 403, { error: 'forbidden: loopback-only' });
+            return false;
+        }
+        if (req.method !== method) {
+            writeJson(res, 405, { error: 'method not allowed' });
+            return false;
+        }
+        return true;
+    };
+    return [
+        {
+            kind: 'exact',
+            path,
+            handler: async (req, res) => {
+                if (req.method === 'GET') {
+                    if (!guard(req, res, 'GET'))
+                        return;
+                    writeJson(res, 200, channel.status());
+                    return;
+                }
+                if (req.method === 'POST') {
+                    if (!guard(req, res, 'POST'))
+                        return;
+                    writeJson(res, 200, await channel.startLogin());
+                    return;
+                }
+                if (req.method === 'DELETE') {
+                    if (!guard(req, res, 'DELETE'))
+                        return;
+                    writeJson(res, 200, await channel.logout());
+                    return;
+                }
+                writeJson(res, 405, { error: 'method not allowed' });
+            },
+        },
+        {
+            kind: 'exact',
+            path: path + '/verify',
+            handler: async (req, res) => {
+                if (!guard(req, res, 'POST'))
+                    return;
+                const body = await readJsonBody(req);
+                const code = typeof body?.code === 'string' ? body.code : '';
+                writeJson(res, 200, channel.sendVerify(code));
+            },
+        },
+    ];
+}
 export function apply(ctx) {
+    const channel = new WeixinChannel();
+    channel.startIfLoggedIn();
     ctx.effect(() => ctx.systemPrompt.section({
         name: 'plugin:dsh-rez-wechat',
         order: 162,
         text: GUIDANCE,
     }), 'dsh-rez-wechat: prompt');
+    const bag = ctx;
+    if (bag.webServer !== undefined) {
+        const routes = weixinRoutes(channel);
+        ctx.effect(() => {
+            const disposers = routes.map(route => bag.webServer.register(route));
+            return () => { for (const dispose of disposers)
+                dispose(); };
+        }, 'dsh-rez-wechat: weixin routes');
+    }
+    ctx.effect(() => () => { channel.dispose(); }, 'dsh-rez-wechat: weixin channel');
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@rezti/dsh-rez-wechat",
-  "version": "0.1.1",
-  "description": "ReZ-TI WeChat/WeCom bridges for DeepSeek Harness. WeCom send uses wecom-mcp; personal WeChat login/chat reuses weixin-mcp (QClaw/ClawBot).",
+  "version": "0.1.2",
+  "description": "ReZ-TI WeChat/WeCom bridges. Personal WeChat is QClaw/ClawBot scan-and-chat via dsh-wechat-bridge; WeCom group send uses wecom-mcp.",
   "type": "module",
   "engines": {
     "node": "^22.19.0 || >=24.0.0"
@@ -20,10 +20,15 @@
     "README.md"
   ],
   "license": "Apache-2.0",
+  "dependencies": {
+    "qrcode": "^1.5.4"
+  },
   "devDependencies": {
     "@deepseek-ai/cordis": "^4.0.1",
+    "@deepseek-ai/dsh-host-webserver": "^0.1.0-rc.6",
     "@deepseek-ai/dsh-system-prompt": "^0.1.0-rc.6",
     "@types/node": "^22.20.0",
+    "@types/qrcode": "^1.5.5",
     "typescript": "~5.7.2"
   },
   "publishConfig": {