@wecom/wecom-openclaw-plugin 1.0.3-beta.0 → 1.0.4

package/dist/index.esm.js

@@ -1,4 +1,4 @@
-import { resolveDefaultGroupPolicy, resolveOpenProviderRuntimeGroupPolicy, warnMissingProviderGroupPolicyFallbackOnce, readJsonFileWithFallback, withFileLock, writeJsonFileAtomically, DEFAULT_ACCOUNT_ID, addWildcardAllowFrom, formatPairingApproveHint, emptyPluginConfigSchema } from 'openclaw/plugin-sdk';
+import { readJsonFileWithFallback, withFileLock, writeJsonFileAtomically, DEFAULT_ACCOUNT_ID, addWildcardAllowFrom, formatPairingApproveHint, emptyPluginConfigSchema } from 'openclaw/plugin-sdk';
 import { generateReqId, WSClient } from '@wecom/aibot-node-sdk';
 import { fileTypeFromBuffer } from 'file-type';
 import os from 'node:os';
@@ -424,18 +424,19 @@ function isGroupSenderAllowed(params) {
 function checkGroupPolicy(params) {
     const { chatId, senderId, account, config, runtime } = params;
     const wecomConfig = (config.channels?.[CHANNEL_ID] ?? {});
-    const defaultGroupPolicy = resolveDefaultGroupPolicy(config);
-    const { groupPolicy, providerMissingFallbackApplied } = resolveOpenProviderRuntimeGroupPolicy({
-        providerConfigPresent: config.channels?.[CHANNEL_ID] !== undefined,
-        groupPolicy: wecomConfig.groupPolicy,
-        defaultGroupPolicy,
-    });
-    warnMissingProviderGroupPolicyFallbackOnce({
-        providerMissingFallbackApplied,
-        providerKey: CHANNEL_ID,
-        accountId: account.accountId,
-        log: (msg) => runtime.log?.(msg),
-    });
+    const defaultGroupPolicy = config.channels?.[CHANNEL_ID]?.groupPolicy;
+    const groupPolicy = account.config.groupPolicy ?? defaultGroupPolicy ?? "open";
+    // const { groupPolicy, providerMissingFallbackApplied } = resolveOpenProviderRuntimeGroupPolicy({
+    //   providerConfigPresent: config.channels?.[CHANNEL_ID] !== undefined,
+    //   groupPolicy: wecomConfig.groupPolicy,
+    //   defaultGroupPolicy,
+    // });
+    // warnMissingProviderGroupPolicyFallbackOnce({
+    //   providerMissingFallbackApplied,
+    //   providerKey: CHANNEL_ID,
+    //   accountId: account.accountId,
+    //   log: (msg) => runtime.log?.(msg),
+    // });
     const groupAllowFrom = wecomConfig.groupAllowFrom ?? [];
     const groupAllowed = isWeComGroupAllowed({
         groupPolicy,
@@ -689,7 +690,7 @@ function createPersistentReqIdStore(accountId, options) {
         }
         catch (error) {
             // 磁盘写入失败不影响内存使用，降级到纯内存模式
-            console.error(`[WeCom] reqid-store: flush to disk failed: ${String(error)}`);
+            // console.error(`[WeCom] reqid-store: flush to disk failed: ${String(error)}`);
         }
     }
     // ========== 公开 API ==========
@@ -1497,7 +1498,7 @@ async function sendWeComMessage({ to, content, accountId, }) {
     console.log(`[WeCom] sendWeComMessage: ${JSON.stringify({ to, content, accountId })}`);
     // 获取 WSClient 实例
     const wsClient = getWeComWebSocket(resolvedAccountId);
-    if (!wsClient || !wsClient.isConnected) {
+    if (!wsClient) {
         throw new Error(`WSClient not connected for account ${resolvedAccountId}`);
     }
     // 使用 SDK 的 sendMessage 主动发送 markdown 消息
@@ -1534,8 +1535,11 @@ const wecomPlugin = {
         idLabel: "wecomUserId",
         normalizeAllowEntry: (entry) => entry.replace(new RegExp(`^(${CHANNEL_ID}|user):`, "i"), "").trim(),
         notifyApproval: async ({ cfg, id }) => {
-            // 企业微信机器人不支持主动发送消息，只能在用户下次发消息时通知
-            // 这里暂时不实现，因为需要有 reqId 才能回复
+            // sendWeComMessage({
+            //   to: id,
+            //   content: " pairing approved",
+            //   accountId: cfg.accountId,
+            // });
             console.log(`[WeCom] Pairing approved for user: ${id}`);
         },
     },
@@ -1615,7 +1619,7 @@ const wecomPlugin = {
                 normalizeEntry: (raw) => raw.replace(new RegExp(`^${CHANNEL_ID}:`, "i"), "").trim(),
             };
         },
-        collectWarnings: ({ account }) => {
+        collectWarnings: ({ account, cfg }) => {
             const warnings = [];
             // DM 策略警告
             const dmPolicy = account.config.dmPolicy ?? "pairing";
@@ -1626,12 +1630,13 @@ const wecomPlugin = {
                 }
             }
             // 群组策略警告
-            const defaultGroupPolicy = resolveDefaultGroupPolicy({});
-            const { groupPolicy } = resolveOpenProviderRuntimeGroupPolicy({
-                providerConfigPresent: true,
-                groupPolicy: account.config.groupPolicy,
-                defaultGroupPolicy,
-            });
+            const defaultGroupPolicy = cfg.channels?.defaults?.groupPolicy;
+            const groupPolicy = account.config.groupPolicy ?? defaultGroupPolicy ?? "open";
+            // const { groupPolicy } = resolveOpenProviderRuntimeGroupPolicy({
+            //   providerConfigPresent: true,
+            //   groupPolicy: account.config.groupPolicy,
+            //   defaultGroupPolicy,
+            // });
             if (groupPolicy === "open") {
                 warnings.push(`- 企业微信群组：groupPolicy="open" 允许所有群组中的成员触发。设置 channels.${CHANNEL_ID}.groupPolicy="allowlist" + channels.${CHANNEL_ID}.groupAllowFrom 来限制群组。`);
             }