@yaoyuanchao/dingtalk 1.4.4 → 1.4.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yaoyuanchao/dingtalk",
-  "version": "1.4.4",
+  "version": "1.4.6",
   "type": "module",
   "description": "DingTalk channel plugin for Clawdbot with Stream Mode support",
   "license": "MIT",

package/src/monitor.ts

@@ -164,23 +164,30 @@ async function extractMessageContent(
         if (chatRecordStr && typeof chatRecordStr === 'string') {
           const records = JSON.parse(chatRecordStr) as Array<{
             senderId?: string;
+            senderStaffId?: string;  // Non-encrypted userId (available when app is published)
             senderNick?: string;
             msgType?: string;
             content?: string;
+            downloadCode?: string;  // For media messages (picture, video, file)
             createAt?: number;
           }>;
 
           if (Array.isArray(records) && records.length > 0) {
-            // Debug: log first record structure to understand available fields
-            log?.info?.("[dingtalk] chatRecord first record structure: " + JSON.stringify(records[0]));
+            // Debug: log first record structure with all keys
+            const firstRecord = records[0];
+            log?.info?.("[dingtalk] chatRecord first record keys: " + Object.keys(firstRecord).join(', '));
+            log?.info?.("[dingtalk] chatRecord first record: " + JSON.stringify(firstRecord));
 
-            // Collect unique senderIds for batch lookup
+            // Collect unique userIds for batch lookup
+            // Prefer senderStaffId (non-encrypted) over senderId
             const senderIds = [...new Set(
               records
-                .map(r => r.senderId)
-                .filter((id): id is string => !!id && !id.startsWith('$:')) // Skip encrypted IDs
+                .map(r => r.senderStaffId || (r.senderId && !r.senderId.startsWith('$:') ? r.senderId : null))
+                .filter((id): id is string => !!id)
             )].slice(0, 10); // Limit to 10 users
 
+            log?.info?.("[dingtalk] chatRecord senderIds for lookup: " + JSON.stringify(senderIds));
+
             // Try to resolve sender names via API
             let senderNameMap = new Map<string, string>();
             if (senderIds.length > 0 && account.clientId && account.clientSecret) {
@@ -193,14 +200,50 @@ async function extractMessageContent(
             }
 
             const formattedRecords = records.map((record, idx) => {
-              // Try: senderNick from record > API resolved name > senderId > '未知'
+              // Try: senderNick > API resolved name (via staffId or senderId) > fallback
               let sender = record.senderNick;
-              if (!sender && record.senderId) {
-                sender = senderNameMap.get(record.senderId) || (record.senderId.startsWith('$:') ? '成员' : record.senderId);
+              if (!sender) {
+                // Try to get name from API lookup
+                const lookupId = record.senderStaffId || record.senderId;
+                if (lookupId) {
+                  sender = senderNameMap.get(lookupId);
+                }
+                // Fallback for encrypted IDs
+                if (!sender && record.senderId?.startsWith('$:')) {
+                  sender = '成员';
+                }
               }
               sender = sender || '未知';
 
-              const msgContent = record.content || '[不支持的消息类型]';
+              // Handle different message types in chatRecord
+              let msgContent: string;
+              switch (record.msgType) {
+                case 'text':
+                  msgContent = record.content || '[空消息]';
+                  break;
+                case 'picture':
+                case 'image':
+                  msgContent = '[图片]';
+                  break;
+                case 'video':
+                  msgContent = '[视频]';
+                  break;
+                case 'file':
+                  msgContent = '[文件]';
+                  break;
+                case 'voice':
+                case 'audio':
+                  msgContent = '[语音]';
+                  break;
+                case 'richText':
+                  msgContent = record.content || '[富文本消息]';
+                  break;
+                case 'markdown':
+                  msgContent = record.content || '[Markdown消息]';
+                  break;
+                default:
+                  msgContent = record.content || `[${record.msgType || '未知'}消息]`;
+              }
               const time = record.createAt ? new Date(record.createAt).toLocaleString('zh-CN') : '';
               return `[${idx + 1}] ${sender}${time ? ` (${time})` : ''}: ${msgContent}`;
             });