@wecom/wecom-openclaw-plugin 1.0.9-beta.0 → 1.0.9-beta.1

package/README.md

@@ -62,7 +62,7 @@ openclaw gateway restart
 | `channels.wecom.secret` | WeCom bot secret | — | — |
 | `channels.wecom.enabled` | Enable the channel | `true` / `false` | `false` |
 | `channels.wecom.websocketUrl` | WebSocket endpoint | — | `wss://openws.work.weixin.qq.com` |
-| `channels.wecom.dmPolicy` | DM access policy | `pairing` / `open` / `allowlist` / `disabled` | `pairing` |
+| `channels.wecom.dmPolicy` | DM access policy | `pairing` / `open` / `allowlist` / `disabled` | `open` |
 | `channels.wecom.allowFrom` | DM allowlist (user IDs) | — | `[]` |
 | `channels.wecom.groupPolicy` | Group chat access policy | `open` / `allowlist` / `disabled` | `open` |
 | `channels.wecom.groupAllowFrom` | Group allowlist (group IDs) | — | `[]` |
@@ -74,7 +74,7 @@ openclaw gateway restart
 
 ### DM (Direct Message) Access
 
-**Default**: `dmPolicy: "pairing"` — unrecognized users will receive a pairing code.
+**Default**: `dmPolicy: "open"` — all users can send direct messages without approval.
 
 #### Approve Pairing
 

package/dist/index.cjs.js

@@ -4,10 +4,14 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var pluginSdk = require('openclaw/plugin-sdk');
 var aibotNodeSdk = require('@wecom/aibot-node-sdk');
+var path = require('path');
+var url = require('url');
 var fileType = require('file-type');
 var os = require('node:os');
-var path = require('node:path');
+var path$1 = require('node:path');
+var os$1 = require('os');
 
+var _documentCurrentScript = typeof document !== 'undefined' ? document.currentScript : null;
 let runtime = null;
 function setWeComRuntime(r) {
     runtime = r;
@@ -76,6 +80,20 @@ const MEDIA_DOCUMENT_PLACEHOLDER = "<media:document>";
 // ============================================================================
 // 默认值
 // ============================================================================
+// ============================================================================
+// MCP 配置
+// ============================================================================
+/** 获取 MCP 配置的 WebSocket 命令 */
+const MCP_GET_CONFIG_CMD = "aibot_get_mcp_config";
+/** MCP 配置拉取超时时间（毫秒） */
+const MCP_CONFIG_FETCH_TIMEOUT_MS = 15000;
+const __filename$1 = url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index.cjs.js', document.baseURI).href)));
+const __dirname$1 = path.dirname(__filename$1);
+const PLUGIN_JSON_FILENAME = "openclaw.plugin.json";
+path.resolve(path.join(__dirname$1, "../", PLUGIN_JSON_FILENAME));
+// ============================================================================
+// 默认值
+// ============================================================================
 /** 默认媒体大小上限（MB） */
 const DEFAULT_MEDIA_MAX_MB = 5;
 /** 文本分块大小上限 */
@@ -494,7 +512,7 @@ async function checkDmPolicy(params) {
     if (isGroup) {
         return { allowed: true };
     }
-    const dmPolicy = account.config.dmPolicy ?? "pairing";
+    const dmPolicy = account.config.dmPolicy ?? "open";
     const configAllowFrom = (account.config.allowFrom ?? []).map((v) => String(v));
     // 如果 dmPolicy 是 disabled，直接拒绝
     if (dmPolicy === "disabled") {
@@ -581,13 +599,13 @@ function resolveStateDirFromEnv(env = process.env) {
         return stateOverride;
     }
     if (env.VITEST || env.NODE_ENV === "test") {
-        return path.join(os.tmpdir(), ["openclaw-vitest", String(process.pid)].join("-"));
+        return path$1.join(os.tmpdir(), ["openclaw-vitest", String(process.pid)].join("-"));
     }
-    return path.join(os.homedir(), ".openclaw");
+    return path$1.join(os.homedir(), ".openclaw");
 }
 function resolveReqIdFilePath(accountId) {
     const safe = accountId.replace(/[^a-zA-Z0-9_-]/g, "_");
-    return path.join(resolveStateDirFromEnv(), "wecom", `reqid-map-${safe}.json`);
+    return path$1.join(resolveStateDirFromEnv(), "wecom", `reqid-map-${safe}.json`);
 }
 // ============================================================================
 // 核心实现
@@ -943,6 +961,138 @@ async function cleanupAccount(accountId) {
     }
 }
 
+/**
+ * MCP 配置拉取与持久化模块
+ *
+ * 负责:
+ * - 通过 WSClient 发送 aibot_get_mcp_config 请求
+ * - 解析服务端响应,提取 MCP 配置(url、type、is_authed)
+ * - 将配置写入 openclaw.plugin.json 的 wecomMcp 字段
+ */
+// ============================================================================
+// MCP 配置拉取
+// ============================================================================
+/**
+ * 通过 WSClient 发送 aibot_get_mcp_config 命令,获取 MCP 配置
+ *
+ * @param wsClient - 已认证的 WSClient 实例
+ * @returns MCP 配置(url、type、is_authed)
+ * @throws 响应错误码非 0 或缺少 url 字段时抛出错误
+ */
+async function fetchMcpConfig(wsClient) {
+    const reqId = aibotNodeSdk.generateReqId("mcp_config");
+    // 通过 reply 方法发送自定义命令
+    const response = await withTimeout(wsClient.reply({ headers: { req_id: reqId } }, { biz_type: "doc" }, MCP_GET_CONFIG_CMD), MCP_CONFIG_FETCH_TIMEOUT_MS, `MCP config fetch timed out after ${MCP_CONFIG_FETCH_TIMEOUT_MS}ms`);
+    // 校验响应错误码
+    if (response.errcode && response.errcode !== 0) {
+        throw new Error(`MCP config request failed: errcode=${response.errcode}, errmsg=${response.errmsg ?? "unknown"}`);
+    }
+    // 提取并校验 body
+    const body = response.body;
+    if (!body?.url) {
+        throw new Error("MCP config response missing required 'url' field");
+    }
+    return {
+        url: body.url,
+        type: 'doc',
+        is_authed: body.is_authed,
+    };
+}
+// ============================================================================
+// 配置持久化
+// ============================================================================
+/**
+ * 将 MCP 配置写入 openclaw.plugin.json 的 mcpConfig 字段
+ *
+ * 使用 OpenClaw SDK 提供的文件锁和原子写入,保证并发安全。
+ * 配置格式: { mcpConfig: { [type]: { type, url } } }
+ * 示例: { "mcpConfig": { "doc": { "type": "streamable-http", "url": "..." } } }
+ *
+ * @param config - MCP 配置
+ * @param runtime - 运行时环境
+ */
+async function saveMcpConfigToPluginJson(config, runtime) {
+    //   const pluginJsonPath = PLUGIN_JSON_PATH;
+    // 获取绝对路径并写入到配置文件
+    //   const absolutePath = path.resolve(pluginJsonPath);
+    const wecomConfigDir = path.join(os$1.homedir(), ".openclaw", "wecomConfig");
+    const wecomConfigPath = path.join(wecomConfigDir, "config.json");
+    //   // 写入 wecom 配置文件
+    //   try {
+    //     const lockOptions = {
+    //       stale: 60_000,
+    //       retries: {
+    //         retries: 3,
+    //         factor: 1.35,
+    //         minTimeout: 8,
+    //         maxTimeout: 200,
+    //         randomize: true,
+    //       },
+    //     };
+    //     await withFileLock(wecomConfigPath, lockOptions, async () => {
+    //       const { value: wecomConfig } = await readJsonFileWithFallback<Record<string, unknown>>(
+    //         wecomConfigPath,
+    //         {},
+    //       );
+    //       wecomConfig.pluginConfigPath = absolutePath;
+    //       await writeJsonFileAtomically(wecomConfigPath, wecomConfig);
+    //       runtime.log?.(`[WeCom] Plugin config path saved to ${wecomConfigPath}`);
+    //     });
+    //   } catch (err) {
+    //     runtime.error?.(`[WeCom] Failed to save plugin config path: ${String(err)}`);
+    //   }
+    const lockOptions = {
+        stale: 60000, // 60秒锁过期
+        retries: {
+            retries: 6,
+            factor: 1.35,
+            minTimeout: 8,
+            maxTimeout: 1200,
+            randomize: true,
+        },
+    };
+    await pluginSdk.withFileLock(wecomConfigPath, lockOptions, async () => {
+        // 读取现有配置(不存在时使用空对象)
+        const { value: pluginJson } = await pluginSdk.readJsonFileWithFallback(wecomConfigPath, {});
+        // 确保 mcpConfig 字段存在且为对象
+        if (!pluginJson.mcpConfig || typeof pluginJson.mcpConfig !== 'object') {
+            pluginJson.mcpConfig = {};
+        }
+        // 使用 type 作为键存储配置
+        const typeKey = config.type || 'default';
+        pluginJson.mcpConfig[typeKey] = {
+            type: config.type,
+            url: config.url,
+        };
+        // 原子写入
+        await pluginSdk.writeJsonFileAtomically(wecomConfigPath, pluginJson);
+        runtime.log?.(`[WeCom] MCP config saved to ${wecomConfigPath}`);
+    });
+}
+// ============================================================================
+// 组合入口
+// ============================================================================
+/**
+ * 拉取 MCP 配置并持久化到 openclaw.plugin.json
+ *
+ * 认证成功后调用。失败仅记录日志,不影响 WebSocket 消息正常收发。
+ *
+ * @param wsClient - 已认证的 WSClient 实例
+ * @param accountId - 账户 ID(用于日志)
+ * @param runtime - 运行时环境(用于日志)
+ */
+async function fetchAndSaveMcpConfig(wsClient, accountId, runtime) {
+    try {
+        runtime.log?.(`[${accountId}] Fetching MCP config...`);
+        const config = await fetchMcpConfig(wsClient);
+        runtime.log?.(`[${accountId}] MCP config fetched: url=${config.url}, type=${config.type ?? "N/A"}, is_authed=${config.is_authed ?? "N/A"}`);
+        await saveMcpConfigToPluginJson(config, runtime);
+    }
+    catch (err) {
+        runtime.error?.(`[${accountId}] Failed to fetch/save MCP config: ${String(err)}`);
+    }
+}
+
 /**
  * 企业微信 WebSocket 监控器主模块
  *
@@ -1278,6 +1428,8 @@ async function monitorWeComProvider(options) {
         wsClient.on("authenticated", () => {
             runtime.log?.(`[${account.accountId}] Authentication successful`);
             setWeComWebSocket(account.accountId, wsClient);
+            // 认证成功后自动拉取 MCP 配置（异步，失败不影响主流程）
+            fetchAndSaveMcpConfig(wsClient, account.accountId, runtime);
         });
         // 监听断开事件
         wsClient.on("disconnected", (reason) => {
@@ -1431,7 +1583,7 @@ const dmPolicy = {
     allowFromKey: `channels.${CHANNEL_ID}.allowFrom`,
     getCurrent: (cfg) => {
         const account = resolveWeComAccount(cfg);
-        return account.config.dmPolicy ?? "pairing";
+        return account.config.dmPolicy ?? "open";
     },
     setPolicy: (cfg, policy) => {
         return setWeComDmPolicy(cfg, policy);
@@ -1477,7 +1629,7 @@ const wecomOnboardingAdapter = {
             botId,
             secret,
             enabled: true,
-            dmPolicy: account.config.dmPolicy ?? "pairing",
+            dmPolicy: account.config.dmPolicy ?? "open",
             allowFrom: account.config.allowFrom ?? [],
         });
         return { cfg: cfgWithAccount };
@@ -1613,7 +1765,7 @@ const wecomPlugin = {
         resolveDmPolicy: ({ account }) => {
             const basePath = `channels.${CHANNEL_ID}.`;
             return {
-                policy: account.config.dmPolicy ?? "pairing",
+                policy: account.config.dmPolicy ?? "open",
                 allowFrom: account.config.allowFrom ?? [],
                 policyPath: `${basePath}dmPolicy`,
                 allowFromPath: basePath,
@@ -1624,7 +1776,7 @@ const wecomPlugin = {
         collectWarnings: ({ account, cfg }) => {
             const warnings = [];
             // DM 策略警告
-            const dmPolicy = account.config.dmPolicy ?? "pairing";
+            const dmPolicy = account.config.dmPolicy ?? "open";
             if (dmPolicy === "open") {
                 const hasWildcard = (account.config.allowFrom ?? []).some((entry) => String(entry).trim() === "*");
                 if (!hasWildcard) {
@@ -1666,7 +1818,7 @@ const wecomPlugin = {
         listGroups: async () => [],
     },
     outbound: {
-        deliveryMode: "direct",
+        deliveryMode: "gateway",
         chunker: (text, limit) => getWeComRuntime().channel.text.chunkMarkdownText(text, limit),
         textChunkLimit: TEXT_CHUNK_LIMIT,
         sendText: async ({ to, text, accountId, ...rest }) => {