@dingtalk-real-ai/dingtalk-connector 0.8.0-beta.0 → 0.8.0-beta.2

package/README.en.md

@@ -263,8 +263,30 @@ Both session routing/message policy options (including `pmpolicy` and `groupPoli
 
 Configure multiple bots connected to different agents:
 
-```json
+```json5
 {
+  "agents": {
+    "list": [
+      {
+        "agentId": "ding-bot1",
+        "model": "your-model-config",
+        "persona": {
+          "name": "Customer Service Bot",
+          "systemPrompt": "You are a professional customer service assistant..."
+        }
+        // Other agent configurations...
+      },
+      {
+        "agentId": "ding-bot2",
+        "model": "your-model-config",
+        "persona": {
+          "name": "Technical Support Bot",
+          "systemPrompt": "You are a technical support expert..."
+        }
+        // Other agent configurations...
+      }
+    ]
+  },
   "channels": {
     "dingtalk-connector": {
       "enabled": true,

package/README.md

@@ -276,6 +276,28 @@ openclaw logs --follow
 
 ```json5
 {
+  "agents": {
+    "list": [
+      {
+        "agentId": "ding-bot1",
+        "model": "your-model-config",
+        "persona": {
+          "name": "钉钉客服机器人",
+          "systemPrompt": "你是一个专业的客服助手..."
+        }
+        // 其他 agent 配置...
+      },
+      {
+        "agentId": "ding-bot2",
+        "model": "your-model-config",
+        "persona": {
+          "name": "钉钉技术支持机器人",
+          "systemPrompt": "你是一个技术支持专家..."
+        }
+        // 其他 agent 配置...
+      }
+    ]
+  },
   "channels": {
     "dingtalk-connector": {
       "enabled": true,

package/openclaw.plugin.json

@@ -1,7 +1,7 @@
 {
   "id": "dingtalk-connector",
   "name": "DingTalk Channel",
-  "version": "0.8.0",
+  "version": "0.8.0-beta.2",
   "description": "DingTalk (钉钉) messaging channel via Stream mode with AI Card streaming",
   "author": "DingTalk Real Team",
   "main": "index.ts",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dingtalk-real-ai/dingtalk-connector",
-  "version": "0.8.0-beta.0",
+  "version": "0.8.0-beta.2",
   "description": "DingTalk (钉钉) channel connector — Stream mode with AI Card streaming",
   "main": "index.ts",
   "type": "module",

package/src/config/schema.ts

@@ -128,4 +128,17 @@ export const DingtalkConfigSchema = z
         });
       }
     }
+    
+    // Validate groupPolicy and groupAllowFrom consistency
+    if (value.groupPolicy === "allowlist") {
+      const groupAllowFrom = value.groupAllowFrom ?? [];
+      if (groupAllowFrom.length === 0) {
+        ctx.addIssue({
+          code: z.ZodIssueCode.custom,
+          path: ["groupAllowFrom"],
+          message:
+            'channels.dingtalk-connector.groupPolicy="allowlist" requires channels.dingtalk-connector.groupAllowFrom to contain at least one entry',
+        });
+      }
+    }
   });

package/src/core/connection.ts

@@ -466,7 +466,23 @@ export async function monitorSingleAccount(
       
       try {
         // 解析消息数据
-        const data = JSON.parse(res.data);
+        let data;
+        try {
+          data = JSON.parse(res.data);
+        } catch (parseError: any) {
+          logger.error('Failed to parse response data as JSON:', {
+            error: parseError instanceof Error ? parseError.message : String(parseError),
+            rawData: typeof res.data === 'string' 
+              ? res.data.substring(0, 500) // 只记录前 500 字符
+              : res.data,
+            dataType: typeof res.data,
+          });
+          throw new Error(
+            `Invalid JSON response from DingTalk API. ` +
+            `Error: ${parseError instanceof Error ? parseError.message : String(parseError)}. ` +
+            `Raw data (first 100 chars): ${String(res.data).substring(0, 100)}`
+          );
+        }
 
         // ===== 第二步：记录解析后的消息详情 =====
         logger.info(`\n----- 消息详情 -----`);
@@ -564,10 +580,10 @@ export async function monitorSingleAccount(
         stop();
       };
 
-      // 进程退出时清理
-      process.on("exit", enhancedCleanup);
-      process.on("SIGINT", enhancedCleanup);
-      process.on("SIGTERM", enhancedCleanup);
+      // 进程退出时清理（使用 once 确保只执行一次）
+      process.once("exit", enhancedCleanup);
+      process.once("SIGINT", enhancedCleanup);
+      process.once("SIGTERM", enhancedCleanup);
     } catch (error: any) {
       cleanup(); // 连接失败时清理资源
 
@@ -585,7 +601,7 @@ export async function monitorSingleAccount(
           `[DingTalk][${accountId}] Bad Request (400):\n` +
             `  - clientId or clientSecret format is invalid\n` +
             `  - clientId: ${clientIdStr} (type: ${typeof account.clientId}, length: ${clientIdStr.length})\n` +
-            `  - clientSecret: ${clientSecretStr.substring(0, 8)}... (type: ${typeof account.clientSecret}, length: ${clientSecretStr.length})\n` +
+            `  - clientSecret: ****** (type: ${typeof account.clientSecret}, length: ${clientSecretStr.length})\n` +
             `  - Common issues:\n` +
             `    1. clientId/clientSecret must be strings, not numbers\n` +
             `    2. Remove any quotes or special characters\n` +

package/src/core/message-handler.ts

@@ -374,11 +374,33 @@ export async function downloadFileToLocal(
     const mediaDir = path.join(agentWorkspaceDir, 'media', 'inbound');
     fs.mkdirSync(mediaDir, { recursive: true });
     
+    // 安全过滤文件名
+    const sanitizeFileName = (name: string): string => {
+      // 移除路径分隔符，防止目录遍历攻击
+      let safe = name.replace(/[/\\]/g, '_');
+      // 移除或替换危险字符
+      safe = safe.replace(/[<>:"|?*\x00-\x1f]/g, '_');
+      // 移除开头的点，防止隐藏文件
+      safe = safe.replace(/^\.+/, '');
+      // 限制长度
+      if (safe.length > 200) {
+        const ext = path.extname(safe);
+        const base = path.basename(safe, ext);
+        safe = base.substring(0, 200 - ext.length) + ext;
+      }
+      // 如果处理后为空，使用默认名称
+      if (!safe) {
+        safe = 'unnamed_file';
+      }
+      return safe;
+    };
+    
     // 保留原始文件名，但添加时间戳避免冲突
     const ext = path.extname(fileName);
     const baseName = path.basename(fileName, ext);
     const timestamp = Date.now();
-    const safeFileName = `${baseName}-${timestamp}${ext}`;
+    const safeBaseName = sanitizeFileName(baseName);
+    const safeFileName = `${safeBaseName}-${timestamp}${ext}`;
     const localPath = path.join(mediaDir, safeFileName);
     
     fs.writeFileSync(localPath, buffer);
@@ -1021,13 +1043,11 @@ async function handleDingTalkMessageInternal(params: HandleMessageParams): Promi
       dispatchResult = await core.channel.reply.withReplyDispatcher({
         dispatcher,
         onSettled: () => {
-          log?.info?.(`onSettled 被调用`);
           log?.info?.(`onSettled 被调用`);
           markDispatchIdle();
         },
         run: async () => {
           log?.info?.(`run 被调用，开始 dispatchReplyFromConfig`);
-          log?.info?.(`run 被调用`);
           log?.info?.(`ctxPayload.SessionKey=${ctxPayload.SessionKey}`);
           log?.info?.(`ctxPayload.Body 长度=${ctxPayload.Body?.length || 0}`);
           log?.info?.(`replyOptions keys=${Object.keys(replyOptions).join(',')}`);
@@ -1056,7 +1076,6 @@ async function handleDingTalkMessageInternal(params: HandleMessageParams): Promi
     
     const { queuedFinal, counts } = dispatchResult;
     log?.info?.(`SDK dispatch 完成: queuedFinal=${queuedFinal}, replies=${counts.final}, asyncMode=${asyncMode}`);
-    log?.info?.(`SDK dispatch 完成: queuedFinal=${queuedFinal}, replies=${counts.final}`);
 
     // ===== 异步模式：主动推送最终结果 =====
     if (asyncMode) {

package/src/probe.ts

@@ -1,11 +1,50 @@
 import { raceWithTimeoutAndAbort } from "./utils/async.ts";
 import type { DingtalkProbeResult } from "./types/index.ts";
 
-/** Cache probe results to reduce repeated health-check calls. */
-const probeCache = new Map<string, { result: DingtalkProbeResult; expiresAt: number }>();
+/** LRU Cache for probe results to reduce repeated health-check calls. */
+class LRUCache<K, V> {
+  private cache = new Map<K, V>();
+  private maxSize: number;
+
+  constructor(maxSize: number) {
+    this.maxSize = maxSize;
+  }
+
+  get(key: K): V | undefined {
+    const value = this.cache.get(key);
+    if (value !== undefined) {
+      // 重新插入以更新访问顺序
+      this.cache.delete(key);
+      this.cache.set(key, value);
+    }
+    return value;
+  }
+
+  set(key: K, value: V): void {
+    // 如果已存在，先删除（更新顺序）
+    if (this.cache.has(key)) {
+      this.cache.delete(key);
+    }
+    
+    this.cache.set(key, value);
+    
+    // 超过大小限制时删除最旧的（最少使用的）
+    if (this.cache.size > this.maxSize) {
+      const oldest = this.cache.keys().next().value;
+      if (oldest !== undefined) {
+        this.cache.delete(oldest);
+      }
+    }
+  }
+
+  clear(): void {
+    this.cache.clear();
+  }
+}
+
+const probeCache = new LRUCache<string, { result: DingtalkProbeResult; expiresAt: number }>(64);
 const PROBE_SUCCESS_TTL_MS = 10 * 60 * 1000; // 10 minutes
 const PROBE_ERROR_TTL_MS = 60 * 1000; // 1 minute
-const MAX_PROBE_CACHE_SIZE = 64;
 export const DINGTALK_PROBE_REQUEST_TIMEOUT_MS = 10_000;
 export type ProbeDingtalkOptions = {
   timeoutMs?: number;
@@ -25,12 +64,6 @@ function setCachedProbeResult(
   ttlMs: number,
 ): DingtalkProbeResult {
   probeCache.set(cacheKey, { result, expiresAt: Date.now() + ttlMs });
-  if (probeCache.size > MAX_PROBE_CACHE_SIZE) {
-    const oldest = probeCache.keys().next().value;
-    if (oldest !== undefined) {
-      probeCache.delete(oldest);
-    }
-  }
   return result;
 }
 

package/src/sdk/helpers.ts

@@ -13,7 +13,7 @@ import type { SecretInput, SecretInputRef } from "./types/index.ts";
 /**
  * 默认账号 ID
  */
-export const DEFAULT_ACCOUNT_ID = "default" as const;
+export const DEFAULT_ACCOUNT_ID = "__default__" as const;
 
 /**
  * 规范化账号 ID

package/src/services/messaging/card.ts

@@ -24,6 +24,7 @@ const AICardStatus = {
 export interface AICardInstance {
   cardInstanceId: string;
   accessToken: string;
+  tokenExpireTime: number;
   inputingStarted: boolean;
 }
 
@@ -168,7 +169,10 @@ export async function createAICardForTarget(
       },
     );
 
-    return { cardInstanceId, accessToken: token, inputingStarted: false };
+    // 记录 token 过期时间（钉钉 token 有效期 2 小时）
+    const tokenExpireTime = Date.now() + 2 * 60 * 60 * 1000;
+    
+    return { cardInstanceId, accessToken: token, tokenExpireTime, inputingStarted: false };
   } catch (err: any) {
     log?.error?.(
       `[DingTalk][AICard] 创建卡片失败 (${targetDesc}): ${err.message}`,
@@ -182,6 +186,22 @@ export async function createAICardForTarget(
   }
 }
 
+/**
+ * 确保 Token 有效（自动刷新过期的 Token）
+ */
+async function ensureValidToken(
+  card: AICardInstance,
+  config: DingtalkConfig,
+): Promise<string> {
+  // 如果 token 即将过期（提前 5 分钟刷新）
+  if (Date.now() > card.tokenExpireTime - 5 * 60 * 1000) {
+    const newToken = await getAccessToken(config);
+    card.accessToken = newToken;
+    card.tokenExpireTime = Date.now() + 2 * 60 * 60 * 1000;
+  }
+  return card.accessToken;
+}
+
 /**
  * 流式更新 AI Card 内容
  */
@@ -189,8 +209,13 @@ export async function streamAICard(
   card: AICardInstance,
   content: string,
   finished: boolean = false,
+  config?: DingtalkConfig,
   log?: any,
 ): Promise<void> {
+  // 确保 token 有效
+  if (config) {
+    await ensureValidToken(card, config);
+  }
   if (!card.inputingStarted) {
     const statusBody = {
       outTrackId: card.cardInstanceId,
@@ -267,8 +292,13 @@ export async function streamAICard(
 export async function finishAICard(
   card: AICardInstance,
   content: string,
+  config?: DingtalkConfig,
   log?: any,
 ): Promise<void> {
+  // 确保 token 有效
+  if (config) {
+    await ensureValidToken(card, config);
+  }
   const fixedContent = ensureTableBlankLines(content);
   log?.info?.(
     `[DingTalk][AICard] 开始 finish，最终内容长度=${fixedContent.length}`,

package/src/utils/token.ts

@@ -25,8 +25,17 @@ const apiTokenCache = new Map<string, CachedToken>();
 const oapiTokenCache = new Map<string, CachedToken>();
 
 function cacheKey(config: DingtalkConfig): string {
-  // clientId 可能来自多账号合并配置，理论上必填；这里做兜底避免 Map key 为 undefined
-  return String((config as any)?.clientId ?? '').trim();
+  const clientId = String((config as any)?.clientId ?? '').trim();
+  
+  // 添加校验
+  if (!clientId) {
+    throw new Error(
+      'Invalid DingtalkConfig: clientId is required for token caching. ' +
+      'Please ensure your configuration includes a valid clientId.'
+    );
+  }
+  
+  return clientId;
 }
 
 /**

package/src/utils/utils-legacy.ts

@@ -42,7 +42,6 @@ export function buildSessionContext(params: {
   groupSubject?: string;
   separateSessionByConversation?: boolean;
   groupSessionScope?: 'group' | 'group_sender';
-  // 新版本可选：跨会话共享记忆（旧实现不处理，但允许透传以保持类型兼容）
   sharedMemoryAcrossConversations?: boolean;
 }): SessionContext {
   const {
@@ -54,9 +53,23 @@ export function buildSessionContext(params: {
     groupSubject,
     separateSessionByConversation,
     groupSessionScope,
+    sharedMemoryAcrossConversations,
   } = params;
   const isDirect = conversationType === '1';
 
+  // sharedMemoryAcrossConversations=true 时，所有会话共享记忆
+  if (sharedMemoryAcrossConversations === true) {
+    return {
+      channel: 'dingtalk-connector',
+      accountId,
+      chatType: isDirect ? 'direct' : 'group',
+      peerId: accountId, // 使用 accountId 作为 peerId，实现跨会话记忆共享
+      conversationId: isDirect ? undefined : conversationId,
+      senderName,
+      groupSubject: isDirect ? undefined : groupSubject,
+    };
+  }
+
   // separateSessionByConversation=false 时，不区分单聊/群聊，按用户维度维护 session
   if (separateSessionByConversation === false) {
     return {
@@ -130,7 +143,17 @@ const apiTokenCache = new Map<string, CachedToken>();
 const oapiTokenCache = new Map<string, CachedToken>();
 
 function cacheKey(config: DingtalkConfig): string {
-  return String((config as any)?.clientId ?? '').trim();
+  const clientId = String((config as any)?.clientId ?? '').trim();
+  
+  // 添加校验
+  if (!clientId) {
+    throw new Error(
+      'Invalid DingtalkConfig: clientId is required for token caching. ' +
+      'Please ensure your configuration includes a valid clientId.'
+    );
+  }
+  
+  return clientId;
 }
 
 /**
@@ -186,8 +209,16 @@ export async function getOapiAccessToken(config: DingtalkConfig): Promise<string
 
 // ============ 用户 ID 转换 ============
 
-/** staffId → unionId 缓存 */
-const unionIdCache = new Map<string, string>();
+/** staffId → unionId 缓存（带过期时间的 LRU 缓存） */
+const MAX_UNION_ID_CACHE_SIZE = 1000;
+const UNION_ID_CACHE_TTL = 24 * 60 * 60 * 1000; // 24 小时
+
+interface UnionIdCacheEntry {
+  unionId: string;
+  timestamp: number;
+}
+
+const unionIdCache = new Map<string, UnionIdCacheEntry>();
 
 /**
  * 通过 oapi 旧版接口将 staffId 转换为 unionId
@@ -197,8 +228,11 @@ export async function getUnionId(
   config: DingtalkConfig,
   log?: any,
 ): Promise<string | null> {
+  // 检查缓存
   const cached = unionIdCache.get(staffId);
-  if (cached) return cached;
+  if (cached && Date.now() - cached.timestamp < UNION_ID_CACHE_TTL) {
+    return cached.unionId;
+  }
 
   try {
     const token = await getOapiAccessToken(config);
@@ -213,7 +247,25 @@ export async function getUnionId(
     });
     const unionId = resp.data?.unionid;
     if (unionId) {
-      unionIdCache.set(staffId, unionId);
+      // 写入缓存前检查大小
+      if (unionIdCache.size >= MAX_UNION_ID_CACHE_SIZE) {
+        // 删除最旧的条目
+        let oldestKey: string | null = null;
+        let oldestTime = Date.now();
+        
+        for (const [key, entry] of unionIdCache.entries()) {
+          if (entry.timestamp < oldestTime) {
+            oldestTime = entry.timestamp;
+            oldestKey = key;
+          }
+        }
+        
+        if (oldestKey) {
+          unionIdCache.delete(oldestKey);
+        }
+      }
+      
+      unionIdCache.set(staffId, { unionId, timestamp: Date.now() });
       log?.info?.(`[DingTalk] getUnionId: ${staffId} → ${unionId}`);
       return unionId;
     }
@@ -233,6 +285,9 @@ const processedMessages = new Map<string, number>();
 /** 消息去重缓存过期时间（5分钟） */
 const MESSAGE_DEDUP_TTL = 5 * 60 * 1000;
 
+/** 定时清理器 */
+let cleanupTimer: NodeJS.Timeout | null = null;
+
 /**
  * 清理过期的消息去重缓存
  */
@@ -245,6 +300,28 @@ export function cleanupProcessedMessages(): void {
   }
 }
 
+/**
+ * 启动定时清理机制
+ */
+export function startMessageCleanup(): void {
+  if (cleanupTimer) return; // 防止重复启动
+  
+  // 每 5 分钟清理一次
+  cleanupTimer = setInterval(() => {
+    cleanupProcessedMessages();
+  }, 5 * 60 * 1000);
+}
+
+/**
+ * 停止定时清理机制
+ */
+export function stopMessageCleanup(): void {
+  if (cleanupTimer) {
+    clearInterval(cleanupTimer);
+    cleanupTimer = null;
+  }
+}
+
 /**
  * 检查消息是否已处理过（去重）
  */