weixin-mcp 1.5.0 → 1.6.0

package/dist/cli.js

@@ -32,8 +32,10 @@ else if (command === "status") {
 else if (command === "start") {
     const portArg = process.argv.indexOf("--port");
     const port = portArg !== -1 ? Number(process.argv[portArg + 1]) : undefined;
+    const webhookArg = process.argv.indexOf("--webhook");
+    const webhook = webhookArg !== -1 ? process.argv[webhookArg + 1] : undefined;
     const { startDaemon } = await import("./daemon.js");
-    await startDaemon(port);
+    await startDaemon(port, webhook);
 }
 else if (command === "stop") {
     const { stopDaemon } = await import("./daemon.js");
@@ -113,7 +115,7 @@ Commands:
   (no args)                    Start stdio MCP server (Claude Desktop mode)
   login                        QR code login
   status                       Show account and daemon status
-  start [--port n]             Start HTTP MCP daemon in background (default: 3001)
+  start [--port n] [--webhook url]  Start HTTP daemon (with optional webhook push)
   stop                         Stop daemon
   restart                      Restart daemon
   logs [-f]                    Show daemon logs (-f to follow)

package/dist/daemon.d.ts

@@ -13,7 +13,7 @@ export declare function daemonStatus(): {
     running: boolean;
     info: DaemonInfo | null;
 };
-export declare function startDaemon(port?: number): Promise<void>;
+export declare function startDaemon(port?: number, webhook?: string): Promise<void>;
 export declare function stopDaemon(): void;
 export declare function restartDaemon(port?: number): Promise<void>;
 export declare function showLogs(follow?: boolean): void;

package/dist/daemon.js

@@ -44,7 +44,7 @@ export function daemonStatus() {
     }
     return { running, info: running ? info : null };
 }
-export async function startDaemon(port = DEFAULT_PORT) {
+export async function startDaemon(port = DEFAULT_PORT, webhook) {
     const { running, info } = daemonStatus();
     if (running && info) {
         console.log(`⚠️  Daemon already running (pid ${info.pid}, port ${info.port})`);
@@ -55,10 +55,13 @@ export async function startDaemon(port = DEFAULT_PORT) {
     const __dirname = path.dirname(__filename);
     const serverScript = path.join(__dirname, "server-http.js");
     const logFd = fs.openSync(LOG_FILE, "a");
-    const child = spawn(process.execPath, [serverScript, String(port)], {
+    const serverArgs = ["--port", String(port)];
+    if (webhook)
+        serverArgs.push("--webhook", webhook);
+    const child = spawn(process.execPath, [serverScript, ...serverArgs], {
         detached: true,
         stdio: ["ignore", logFd, logFd],
-        env: { ...process.env, WEIXIN_MCP_PORT: String(port) },
+        env: { ...process.env, WEIXIN_MCP_PORT: String(port), WEIXIN_WEBHOOK_URL: webhook ?? "" },
     });
     child.unref();
     fs.closeSync(logFd);
@@ -79,6 +82,8 @@ export async function startDaemon(port = DEFAULT_PORT) {
     console.log(`   PID:  ${child.pid}`);
     console.log(`   Port: ${port}`);
     console.log(`   URL:  http://localhost:${port}/mcp`);
+    if (webhook)
+        console.log(`   Webhook: ${webhook}`);
     console.log(`   Logs: ${LOG_FILE}`);
 }
 export function stopDaemon() {

package/dist/server-http.d.ts

@@ -2,6 +2,10 @@
  * HTTP MCP server — runs as a daemon process.
  * Spawned by `weixin-mcp start`, listens on a given port.
  *
- * Clients connect via: http://localhost:<port>/mcp
+ * Features:
+ * - MCP endpoint at /mcp (StreamableHTTP)
+ * - Health check at /health
+ * - Webhook push: --webhook <url> to receive new messages via POST
+ * - Auto-poll: when webhook is set, background polling forwards messages
  */
 export {};

package/dist/server-http.js

@@ -2,19 +2,28 @@
  * HTTP MCP server — runs as a daemon process.
  * Spawned by `weixin-mcp start`, listens on a given port.
  *
- * Clients connect via: http://localhost:<port>/mcp
+ * Features:
+ * - MCP endpoint at /mcp (StreamableHTTP)
+ * - Health check at /health
+ * - Webhook push: --webhook <url> to receive new messages via POST
+ * - Auto-poll: when webhook is set, background polling forwards messages
  */
 import express from "express";
 import { Server } from "@modelcontextprotocol/sdk/server/index.js";
 import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js";
 import { CallToolRequestSchema, ListToolsRequestSchema, } from "@modelcontextprotocol/sdk/types.js";
 import { randomUUID } from "node:crypto";
-// Reuse the same tool definitions and handlers from the main server
 import { DEFAULT_BASE_URL, getUpdates, getConfig, sendTextMessage, loadCursor, saveCursor, WeixinAuthError, WeixinNetworkError, } from "./api.js";
 import { ACCOUNTS_DIR } from "./paths.js";
+import { updateContactsFromMsgs, loadContacts } from "./contacts.js";
 import fs from "node:fs";
 import path from "node:path";
-const port = Number(process.env.WEIXIN_MCP_PORT ?? process.argv[2] ?? 3001);
+// Parse CLI args
+const args = process.argv.slice(2);
+const portIdx = args.indexOf("--port");
+const port = portIdx >= 0 ? Number(args[portIdx + 1]) : Number(process.env.WEIXIN_MCP_PORT ?? 3001);
+const webhookIdx = args.indexOf("--webhook");
+const webhookUrl = webhookIdx >= 0 ? args[webhookIdx + 1] : process.env.WEIXIN_WEBHOOK_URL;
 function loadAccount() {
     const files = fs.readdirSync(ACCOUNTS_DIR).filter((f) => f.endsWith(".json") && !f.endsWith(".sync.json") && !f.endsWith(".cursor.json"));
     if (files.length === 0)
@@ -35,9 +44,18 @@ function fmtErr(e) {
         return e.message;
     return String(e);
 }
+function resolveUserId(input, contacts) {
+    if (!input || input.includes("@"))
+        return input;
+    const ids = Object.keys(contacts);
+    const matches = ids.filter((id) => id.startsWith(input) || id.includes(input));
+    if (matches.length === 1)
+        return matches[0];
+    return input;
+}
 // ── MCP server factory ─────────────────────────────────────────────────────
 function createMCPServer() {
-    const server = new Server({ name: "weixin-mcp", version: "1.2.2" }, { capabilities: { tools: {} } });
+    const server = new Server({ name: "weixin-mcp", version: "1.5.0" }, { capabilities: { tools: {} } });
     server.setRequestHandler(ListToolsRequestSchema, async () => ({
         tools: [
             {
@@ -46,7 +64,7 @@ function createMCPServer() {
                 inputSchema: {
                     type: "object",
                     properties: {
-                        to: { type: "string" },
+                        to: { type: "string", description: "Recipient (full ID or short prefix)" },
                         text: { type: "string" },
                         context_token: { type: "string" },
                     },
@@ -61,6 +79,11 @@ function createMCPServer() {
                     properties: { reset_cursor: { type: "boolean" } },
                 },
             },
+            {
+                name: "weixin_contacts",
+                description: "List users who have messaged the bot.",
+                inputSchema: { type: "object", properties: {} },
+            },
             {
                 name: "weixin_get_config",
                 description: "Get user config (typing ticket, etc.).",
@@ -82,7 +105,8 @@ function createMCPServer() {
             let result;
             if (name === "weixin_send") {
                 const a = (args ?? {});
-                result = await sendTextMessage(assertStr(a.to, "to"), assertStr(a.text, "text"), token, baseUrl, a.context_token);
+                const resolvedTo = resolveUserId(assertStr(a.to, "to"), loadContacts());
+                result = await sendTextMessage(resolvedTo, assertStr(a.text, "text"), token, baseUrl, a.context_token);
             }
             else if (name === "weixin_poll") {
                 const { reset_cursor } = (args ?? {});
@@ -90,8 +114,13 @@ function createMCPServer() {
                 const resp = await getUpdates(token, baseUrl, cursor);
                 if (resp.get_updates_buf)
                     saveCursor(accountId, resp.get_updates_buf);
+                if (resp.msgs && resp.msgs.length > 0)
+                    updateContactsFromMsgs(resp.msgs);
                 result = resp;
             }
+            else if (name === "weixin_contacts") {
+                result = Object.values(loadContacts());
+            }
             else if (name === "weixin_get_config") {
                 const a = (args ?? {});
                 result = await getConfig(assertStr(a.user_id, "user_id"), token, baseUrl, a.context_token);
@@ -107,17 +136,55 @@ function createMCPServer() {
     });
     return server;
 }
+// ── Webhook push ───────────────────────────────────────────────────────────
+async function pushToWebhook(msgs) {
+    if (!webhookUrl || msgs.length === 0)
+        return;
+    try {
+        await fetch(webhookUrl, {
+            method: "POST",
+            headers: { "Content-Type": "application/json" },
+            body: JSON.stringify({ event: "weixin_messages", messages: msgs, timestamp: new Date().toISOString() }),
+        });
+    }
+    catch (err) {
+        console.error("[weixin-mcp] webhook push failed:", fmtErr(err));
+    }
+}
+// ── Background poller (when webhook is set) ────────────────────────────────
+async function startBackgroundPoller() {
+    if (!webhookUrl)
+        return;
+    console.log(`[weixin-mcp] Webhook enabled: ${webhookUrl}`);
+    console.log("[weixin-mcp] Starting background poller...");
+    while (true) {
+        try {
+            const { token, baseUrl = DEFAULT_BASE_URL, accountId } = loadAccount();
+            const cursor = loadCursor(accountId);
+            const resp = await getUpdates(token, baseUrl, cursor);
+            if (resp.get_updates_buf)
+                saveCursor(accountId, resp.get_updates_buf);
+            if (resp.msgs && resp.msgs.length > 0) {
+                updateContactsFromMsgs(resp.msgs);
+                await pushToWebhook(resp.msgs);
+                console.log(`[weixin-mcp] Pushed ${resp.msgs.length} message(s) to webhook`);
+            }
+        }
+        catch (err) {
+            console.error("[weixin-mcp] poll error:", fmtErr(err));
+            await new Promise((r) => setTimeout(r, 5000)); // backoff on error
+        }
+        // getUpdates is long-poll (~30s timeout), so no extra delay needed
+    }
+}
 // ── Express HTTP server ────────────────────────────────────────────────────
 const app = express();
 app.use(express.json());
-// Session store for stateful transports
 const sessions = new Map();
 app.post("/mcp", async (req, res) => {
-    // Check if this is an existing session
     const sessionId = req.headers["mcp-session-id"];
     let transport = sessionId ? sessions.get(sessionId) : undefined;
     if (!transport) {
-        // New session
         const newSessionId = randomUUID();
         transport = new StreamableHTTPServerTransport({
             sessionIdGenerator: () => newSessionId,
@@ -148,9 +215,11 @@ app.delete("/mcp", async (req, res) => {
     await transport.handleRequest(req, res);
 });
 app.get("/health", (_req, res) => {
-    res.json({ status: "ok", port, sessions: sessions.size });
+    res.json({ status: "ok", port, sessions: sessions.size, webhook: webhookUrl ?? null });
 });
 app.listen(port, () => {
-    console.log(`[weixin-mcp] HTTP MCP server listening on port ${port}`);
-    console.log(`[weixin-mcp] MCP endpoint: http://localhost:${port}/mcp`);
+    console.log(`[weixin-mcp] HTTP MCP server on port ${port}`);
+    console.log(`[weixin-mcp] MCP: http://localhost:${port}/mcp`);
+    if (webhookUrl)
+        startBackgroundPoller();
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weixin-mcp",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "description": "MCP server for WeChat (Weixin) — send messages via OpenClaw weixin plugin auth",
   "type": "module",
   "main": "dist/index.js",

package/src/cli.ts

@@ -35,8 +35,10 @@ if (command === "login") {
 } else if (command === "start") {
   const portArg = process.argv.indexOf("--port");
   const port = portArg !== -1 ? Number(process.argv[portArg + 1]) : undefined;
+  const webhookArg = process.argv.indexOf("--webhook");
+  const webhook = webhookArg !== -1 ? process.argv[webhookArg + 1] : undefined;
   const { startDaemon } = await import("./daemon.js");
-  await startDaemon(port);
+  await startDaemon(port, webhook);
 
 } else if (command === "stop") {
   const { stopDaemon } = await import("./daemon.js");
@@ -115,7 +117,7 @@ Commands:
   (no args)                    Start stdio MCP server (Claude Desktop mode)
   login                        QR code login
   status                       Show account and daemon status
-  start [--port n]             Start HTTP MCP daemon in background (default: 3001)
+  start [--port n] [--webhook url]  Start HTTP daemon (with optional webhook push)
   stop                         Stop daemon
   restart                      Restart daemon
   logs [-f]                    Show daemon logs (-f to follow)

package/src/daemon.ts

@@ -50,7 +50,7 @@ export function daemonStatus(): { running: boolean; info: DaemonInfo | null } {
   return { running, info: running ? info : null };
 }
 
-export async function startDaemon(port = DEFAULT_PORT): Promise<void> {
+export async function startDaemon(port = DEFAULT_PORT, webhook?: string): Promise<void> {
   const { running, info } = daemonStatus();
   if (running && info) {
     console.log(`⚠️  Daemon already running (pid ${info.pid}, port ${info.port})`);
@@ -64,10 +64,13 @@ export async function startDaemon(port = DEFAULT_PORT): Promise<void> {
   const serverScript = path.join(__dirname, "server-http.js");
 
   const logFd = fs.openSync(LOG_FILE, "a");
-  const child = spawn(process.execPath, [serverScript, String(port)], {
+  const serverArgs = ["--port", String(port)];
+  if (webhook) serverArgs.push("--webhook", webhook);
+
+  const child = spawn(process.execPath, [serverScript, ...serverArgs], {
     detached: true,
     stdio: ["ignore", logFd, logFd],
-    env: { ...process.env, WEIXIN_MCP_PORT: String(port) },
+    env: { ...process.env, WEIXIN_MCP_PORT: String(port), WEIXIN_WEBHOOK_URL: webhook ?? "" },
   });
 
   child.unref();
@@ -93,6 +96,7 @@ export async function startDaemon(port = DEFAULT_PORT): Promise<void> {
   console.log(`   PID:  ${child.pid}`);
   console.log(`   Port: ${port}`);
   console.log(`   URL:  http://localhost:${port}/mcp`);
+  if (webhook) console.log(`   Webhook: ${webhook}`);
   console.log(`   Logs: ${LOG_FILE}`);
 }
 

package/src/server-http.ts

@@ -2,7 +2,11 @@
  * HTTP MCP server — runs as a daemon process.
  * Spawned by `weixin-mcp start`, listens on a given port.
  *
- * Clients connect via: http://localhost:<port>/mcp
+ * Features:
+ * - MCP endpoint at /mcp (StreamableHTTP)
+ * - Health check at /health
+ * - Webhook push: --webhook <url> to receive new messages via POST
+ * - Auto-poll: when webhook is set, background polling forwards messages
  */
 
 import express from "express";
@@ -14,7 +18,6 @@ import {
 } from "@modelcontextprotocol/sdk/types.js";
 import { randomUUID } from "node:crypto";
 
-// Reuse the same tool definitions and handlers from the main server
 import {
   DEFAULT_BASE_URL,
   getUpdates,
@@ -26,10 +29,16 @@ import {
   WeixinNetworkError,
 } from "./api.js";
 import { ACCOUNTS_DIR } from "./paths.js";
+import { updateContactsFromMsgs, loadContacts, type ContactBook } from "./contacts.js";
 import fs from "node:fs";
 import path from "node:path";
 
-const port = Number(process.env.WEIXIN_MCP_PORT ?? process.argv[2] ?? 3001);
+// Parse CLI args
+const args = process.argv.slice(2);
+const portIdx = args.indexOf("--port");
+const port = portIdx >= 0 ? Number(args[portIdx + 1]) : Number(process.env.WEIXIN_MCP_PORT ?? 3001);
+const webhookIdx = args.indexOf("--webhook");
+const webhookUrl = webhookIdx >= 0 ? args[webhookIdx + 1] : process.env.WEIXIN_WEBHOOK_URL;
 
 // ── Account loader ─────────────────────────────────────────────────────────
 
@@ -56,11 +65,19 @@ function fmtErr(e: unknown): string {
   return String(e);
 }
 
+function resolveUserId(input: string, contacts: ContactBook): string {
+  if (!input || input.includes("@")) return input;
+  const ids = Object.keys(contacts);
+  const matches = ids.filter((id) => id.startsWith(input) || id.includes(input));
+  if (matches.length === 1) return matches[0];
+  return input;
+}
+
 // ── MCP server factory ─────────────────────────────────────────────────────
 
 function createMCPServer() {
   const server = new Server(
-    { name: "weixin-mcp", version: "1.2.2" },
+    { name: "weixin-mcp", version: "1.5.0" },
     { capabilities: { tools: {} } },
   );
 
@@ -72,7 +89,7 @@ function createMCPServer() {
         inputSchema: {
           type: "object",
           properties: {
-            to: { type: "string" },
+            to: { type: "string", description: "Recipient (full ID or short prefix)" },
             text: { type: "string" },
             context_token: { type: "string" },
           },
@@ -87,6 +104,11 @@ function createMCPServer() {
           properties: { reset_cursor: { type: "boolean" } },
         },
       },
+      {
+        name: "weixin_contacts",
+        description: "List users who have messaged the bot.",
+        inputSchema: { type: "object", properties: {} },
+      },
       {
         name: "weixin_get_config",
         description: "Get user config (typing ticket, etc.).",
@@ -109,13 +131,17 @@ function createMCPServer() {
       let result: unknown;
       if (name === "weixin_send") {
         const a = (args ?? {}) as { to?: string; text?: string; context_token?: string };
-        result = await sendTextMessage(assertStr(a.to, "to"), assertStr(a.text, "text"), token!, baseUrl, a.context_token);
+        const resolvedTo = resolveUserId(assertStr(a.to, "to"), loadContacts());
+        result = await sendTextMessage(resolvedTo, assertStr(a.text, "text"), token!, baseUrl, a.context_token);
       } else if (name === "weixin_poll") {
         const { reset_cursor } = (args ?? {}) as { reset_cursor?: boolean };
         const cursor = reset_cursor ? "" : loadCursor(accountId);
         const resp = await getUpdates(token!, baseUrl, cursor);
         if (resp.get_updates_buf) saveCursor(accountId, resp.get_updates_buf);
+        if (resp.msgs && resp.msgs.length > 0) updateContactsFromMsgs(resp.msgs as unknown[]);
         result = resp;
+      } else if (name === "weixin_contacts") {
+        result = Object.values(loadContacts());
       } else if (name === "weixin_get_config") {
         const a = (args ?? {}) as { user_id?: string; context_token?: string };
         result = await getConfig(assertStr(a.user_id, "user_id"), token!, baseUrl, a.context_token);
@@ -131,21 +157,61 @@ function createMCPServer() {
   return server;
 }
 
+// ── Webhook push ───────────────────────────────────────────────────────────
+
+async function pushToWebhook(msgs: unknown[]) {
+  if (!webhookUrl || msgs.length === 0) return;
+  try {
+    await fetch(webhookUrl, {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ event: "weixin_messages", messages: msgs, timestamp: new Date().toISOString() }),
+    });
+  } catch (err) {
+    console.error("[weixin-mcp] webhook push failed:", fmtErr(err));
+  }
+}
+
+// ── Background poller (when webhook is set) ────────────────────────────────
+
+async function startBackgroundPoller() {
+  if (!webhookUrl) return;
+  console.log(`[weixin-mcp] Webhook enabled: ${webhookUrl}`);
+  console.log("[weixin-mcp] Starting background poller...");
+
+  while (true) {
+    try {
+      const { token, baseUrl = DEFAULT_BASE_URL, accountId } = loadAccount();
+      const cursor = loadCursor(accountId);
+      const resp = await getUpdates(token!, baseUrl, cursor);
+
+      if (resp.get_updates_buf) saveCursor(accountId, resp.get_updates_buf);
+
+      if (resp.msgs && resp.msgs.length > 0) {
+        updateContactsFromMsgs(resp.msgs as unknown[]);
+        await pushToWebhook(resp.msgs);
+        console.log(`[weixin-mcp] Pushed ${resp.msgs.length} message(s) to webhook`);
+      }
+    } catch (err) {
+      console.error("[weixin-mcp] poll error:", fmtErr(err));
+      await new Promise((r) => setTimeout(r, 5000)); // backoff on error
+    }
+    // getUpdates is long-poll (~30s timeout), so no extra delay needed
+  }
+}
+
 // ── Express HTTP server ────────────────────────────────────────────────────
 
 const app = express();
 app.use(express.json());
 
-// Session store for stateful transports
 const sessions = new Map<string, StreamableHTTPServerTransport>();
 
 app.post("/mcp", async (req, res) => {
-  // Check if this is an existing session
   const sessionId = req.headers["mcp-session-id"] as string | undefined;
   let transport = sessionId ? sessions.get(sessionId) : undefined;
 
   if (!transport) {
-    // New session
     const newSessionId = randomUUID();
     transport = new StreamableHTTPServerTransport({
       sessionIdGenerator: () => newSessionId,
@@ -174,10 +240,11 @@ app.delete("/mcp", async (req, res) => {
 });
 
 app.get("/health", (_req, res) => {
-  res.json({ status: "ok", port, sessions: sessions.size });
+  res.json({ status: "ok", port, sessions: sessions.size, webhook: webhookUrl ?? null });
 });
 
 app.listen(port, () => {
-  console.log(`[weixin-mcp] HTTP MCP server listening on port ${port}`);
-  console.log(`[weixin-mcp] MCP endpoint: http://localhost:${port}/mcp`);
+  console.log(`[weixin-mcp] HTTP MCP server on port ${port}`);
+  console.log(`[weixin-mcp] MCP: http://localhost:${port}/mcp`);
+  if (webhookUrl) startBackgroundPoller();
 });