@wecom/wecom-openclaw-plugin 1.0.0 → 1.0.3

package/dist/index.cjs.js

@@ -81,73 +81,6 @@ const DEFAULT_MEDIA_MAX_MB = 5;
 /** 文本分块大小上限 */
 const TEXT_CHUNK_LIMIT = 4000;
 
-/**
- * 企业微信公共工具函数
- */
-const DefaultWsUrl = "wss://openws.work.weixin.qq.com";
-/**
- * 解析企业微信账户配置
- */
-function resolveWeComAccount(cfg) {
-    const wecomConfig = (cfg.channels?.[CHANNEL_ID] ?? {});
-    return {
-        accountId: pluginSdk.DEFAULT_ACCOUNT_ID,
-        name: wecomConfig.name ?? "企业微信",
-        enabled: wecomConfig.enabled ?? false,
-        websocketUrl: wecomConfig.websocketUrl || DefaultWsUrl,
-        botId: wecomConfig.botId ?? "",
-        secret: wecomConfig.secret ?? "",
-        sendThinkingMessage: wecomConfig.sendThinkingMessage ?? true,
-        config: wecomConfig,
-    };
-}
-/**
- * 设置企业微信账户配置
- */
-function setWeComAccount(cfg, account) {
-    const existing = (cfg.channels?.[CHANNEL_ID] ?? {});
-    const merged = {
-        enabled: account.enabled ?? existing?.enabled ?? true,
-        botId: account.botId ?? existing?.botId ?? "",
-        secret: account.secret ?? existing?.secret ?? "",
-        allowFrom: account.allowFrom ?? existing?.allowFrom,
-        dmPolicy: account.dmPolicy ?? existing?.dmPolicy,
-        // 以下字段仅在已有配置值或显式传入时才写入，onboarding 时不主动生成
-        ...(account.websocketUrl || existing?.websocketUrl
-            ? { websocketUrl: account.websocketUrl ?? existing?.websocketUrl }
-            : {}),
-        ...(account.name || existing?.name
-            ? { name: account.name ?? existing?.name }
-            : {}),
-        ...(account.sendThinkingMessage !== undefined || existing?.sendThinkingMessage !== undefined
-            ? { sendThinkingMessage: account.sendThinkingMessage ?? existing?.sendThinkingMessage }
-            : {}),
-    };
-    return {
-        ...cfg,
-        channels: {
-            ...cfg.channels,
-            [CHANNEL_ID]: merged,
-        },
-    };
-}
-/**
- * 生成随机字符串
- */
-function generateRandomString(length = 9) {
-    return Math.random().toString(36).substr(2, length);
-}
-/**
- * 生成企业微信请求 ID
- * @param prefix - 请求类型前缀（subscribe, ping, response 等）
- * @returns 格式化的请求 ID
- */
-function generateReqId(prefix) {
-    const timestamp = Date.now();
-    const random = generateRandomString();
-    return `${prefix}_${timestamp}_${random}`;
-}
-
 /**
  * 企业微信消息内容解析模块
  *
@@ -286,7 +219,7 @@ async function sendWeComReply(params) {
     if (!text) {
         return "";
     }
-    const streamId = existingStreamId || generateReqId("stream");
+    const streamId = existingStreamId || aibotNodeSdk.generateReqId("stream");
     if (!wsClient.isConnected) {
         runtime.error?.(`[WeCom] WSClient not connected, cannot send reply`);
         throw new Error("WSClient not connected");
@@ -571,10 +504,14 @@ async function checkDmPolicy(params) {
     if (dmPolicy === "open") {
         return { allowed: true };
     }
-    // 检查发送者是否在允许列表中
-    const storeAllowFrom = await core.channel.pairing
+    // OpenClaw <= 2026.2.19 signature: readAllowFromStore(channel, env?, accountId?)
+    const oldStoreAllowFrom = await core.channel.pairing.readAllowFromStore('wecom', undefined, account.accountId).catch(() => []);
+    // Compatibility fallback for newer OpenClaw implementations.
+    const newStoreAllowFrom = await core.channel.pairing
         .readAllowFromStore({ channel: CHANNEL_ID, accountId: account.accountId })
         .catch(() => []);
+    // 检查发送者是否在允许列表中
+    const storeAllowFrom = [...oldStoreAllowFrom, ...newStoreAllowFrom];
     const effectiveAllowFrom = [...configAllowFrom, ...storeAllowFrom];
     const senderAllowedResult = isSenderAllowed(senderId, effectiveAllowFrom);
     if (senderAllowedResult) {
@@ -1080,7 +1017,7 @@ function buildMessageContext(frame, account, config, text, mediaList, quoteConte
         MediaPaths: mediaPaths,
         MediaTypes: mediaTypes,
         MediaUrls: mediaPaths,
-        QuoteContent: quoteContent,
+        ReplyToBody: quoteContent,
     });
 }
 // ============================================================================
@@ -1112,6 +1049,14 @@ async function sendThinkingReply(params) {
 async function routeAndDispatchMessage(params) {
     const { ctxPayload, config, wsClient, frame, state, runtime, onCleanup } = params;
     const core = getWeComRuntime();
+    // 防止 onCleanup 被多次调用（onError 回调与 catch 块可能重复触发）
+    let cleanedUp = false;
+    const safeCleanup = () => {
+        if (!cleanedUp) {
+            cleanedUp = true;
+            onCleanup();
+        }
+    };
     try {
         await core.channel.reply.dispatchReplyWithBufferedBlockDispatcher({
             ctx: ctxPayload,
@@ -1132,7 +1077,7 @@ async function routeAndDispatchMessage(params) {
                 },
                 onError: (err, info) => {
                     runtime.error?.(`[WeCom] ${info.kind} reply failed: ${String(err)}`);
-                    onCleanup();
+                    // 仅记录错误，不立即 cleanup，让外层 try/catch 统一处理最终回复和 cleanup
                 },
             },
         });
@@ -1147,11 +1092,11 @@ async function routeAndDispatchMessage(params) {
                 streamId: state.streamId,
             });
         }
-        onCleanup();
+        safeCleanup();
     }
     catch (err) {
         runtime.error?.(`[WeCom] Failed to process message: ${String(err)}`);
-        onCleanup();
+        safeCleanup();
     }
 }
 /**
@@ -1240,7 +1185,7 @@ async function processWeComMessage(params) {
     const mediaList = [...imageMediaList, ...fileMediaList];
     // Step 5: 初始化消息状态
     setReqIdForChat(chatId, reqId, account.accountId);
-    const streamId = generateReqId("stream");
+    const streamId = aibotNodeSdk.generateReqId("stream");
     const state = { accumulatedText: "", streamId };
     setMessageState(messageId, state);
     const cleanupState = () => {
@@ -1366,19 +1311,72 @@ async function monitorWeComProvider(options) {
                 runtime.error?.(`[${account.accountId}] Failed to process message: ${String(err)}`);
             }
         });
-        // 启动前预热 reqId 缓存
+        // 启动前预热 reqId 缓存，确保完成后再建立连接，避免 getSync 在预热完成前返回 undefined
         warmupReqIdStore(account.accountId, (...args) => runtime.log?.(...args))
             .then((count) => {
             runtime.log?.(`[${account.accountId}] Warmed up ${count} reqId entries from disk`);
         })
             .catch((err) => {
             runtime.error?.(`[${account.accountId}] Failed to warmup reqId store: ${String(err)}`);
+        })
+            .finally(() => {
+            // 无论预热成功或失败，都建立连接
+            wsClient.connect();
         });
-        // 建立连接
-        wsClient.connect();
     });
 }
 
+/**
+ * 企业微信公共工具函数
+ */
+const DefaultWsUrl = "wss://openws.work.weixin.qq.com";
+/**
+ * 解析企业微信账户配置
+ */
+function resolveWeComAccount(cfg) {
+    const wecomConfig = (cfg.channels?.[CHANNEL_ID] ?? {});
+    return {
+        accountId: pluginSdk.DEFAULT_ACCOUNT_ID,
+        name: wecomConfig.name ?? "企业微信",
+        enabled: wecomConfig.enabled ?? false,
+        websocketUrl: wecomConfig.websocketUrl || DefaultWsUrl,
+        botId: wecomConfig.botId ?? "",
+        secret: wecomConfig.secret ?? "",
+        sendThinkingMessage: wecomConfig.sendThinkingMessage ?? true,
+        config: wecomConfig,
+    };
+}
+/**
+ * 设置企业微信账户配置
+ */
+function setWeComAccount(cfg, account) {
+    const existing = (cfg.channels?.[CHANNEL_ID] ?? {});
+    const merged = {
+        enabled: account.enabled ?? existing?.enabled ?? true,
+        botId: account.botId ?? existing?.botId ?? "",
+        secret: account.secret ?? existing?.secret ?? "",
+        allowFrom: account.allowFrom ?? existing?.allowFrom,
+        dmPolicy: account.dmPolicy ?? existing?.dmPolicy,
+        // 以下字段仅在已有配置值或显式传入时才写入，onboarding 时不主动生成
+        ...(account.websocketUrl || existing?.websocketUrl
+            ? { websocketUrl: account.websocketUrl ?? existing?.websocketUrl }
+            : {}),
+        ...(account.name || existing?.name
+            ? { name: account.name ?? existing?.name }
+            : {}),
+        ...(account.sendThinkingMessage !== undefined || existing?.sendThinkingMessage !== undefined
+            ? { sendThinkingMessage: account.sendThinkingMessage ?? existing?.sendThinkingMessage }
+            : {}),
+    };
+    return {
+        ...cfg,
+        channels: {
+            ...cfg.channels,
+            [CHANNEL_ID]: merged,
+        },
+    };
+}
+
 /**
  * 企业微信 onboarding adapter for CLI setup wizard.
  */