@yaoyuanchao/dingtalk 1.4.3 → 1.4.5

package/package.json

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

package/src/monitor.ts

@@ -164,6 +164,7 @@ 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;
@@ -171,11 +172,48 @@ async function extractMessageContent(
           }>;
 
           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 userIds for batch lookup
+            // Prefer senderStaffId (non-encrypted) over senderId
+            const senderIds = [...new Set(
+              records
+                .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) {
+              try {
+                senderNameMap = await batchGetUserInfo(account.clientId, account.clientSecret, senderIds, 3000);
+                log?.info?.("[dingtalk] Resolved " + senderNameMap.size + " sender names from API");
+              } catch (err) {
+                log?.info?.("[dingtalk] Failed to resolve sender names: " + err);
+              }
+            }
 
             const formattedRecords = records.map((record, idx) => {
-              const sender = record.senderNick || record.senderId || '未知';
+              // Try: senderNick > API resolved name (via staffId or senderId) > fallback
+              let sender = record.senderNick;
+              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 || '[不支持的消息类型]';
               const time = record.createAt ? new Date(record.createAt).toLocaleString('zh-CN') : '';
               return `[${idx + 1}] ${sender}${time ? ` (${time})` : ''}: ${msgContent}`;