@yaoyuanchao/dingtalk 1.4.6 → 1.4.8

package/package.json

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

package/src/api.ts

@@ -70,6 +70,29 @@ function httpGetBuffer(url: string, headers?: Record<string, string>): Promise<B
   });
 }
 
+/** Retry wrapper for async functions */
+async function withRetry<T>(
+  fn: () => Promise<T>,
+  maxRetries: number = 3,
+  delayMs: number = 1000,
+  backoffMultiplier: number = 2,
+): Promise<T> {
+  let lastError: Error | undefined;
+  for (let attempt = 1; attempt <= maxRetries; attempt++) {
+    try {
+      return await fn();
+    } catch (err) {
+      lastError = err instanceof Error ? err : new Error(String(err));
+      if (attempt < maxRetries) {
+        const delay = delayMs * Math.pow(backoffMultiplier, attempt - 1);
+        console.log(`[dingtalk] Retry ${attempt}/${maxRetries} after ${delay}ms: ${lastError.message}`);
+        await new Promise(resolve => setTimeout(resolve, delay));
+      }
+    }
+  }
+  throw lastError;
+}
+
 export async function getDingTalkAccessToken(clientId: string, clientSecret: string): Promise<string> {
   const cached = tokenCache.get(clientId);
   if (cached && cached.expiresAt > Date.now() + 60_000) {
@@ -337,9 +360,14 @@ export async function downloadPicture(
       return { error: response.errmsg || "Download failed" };
     }
 
-    // If response has a file URL, download it
+    // If response has a file URL, download it with retry
     if (response.downloadUrl) {
-      const imageBuffer = await httpGetBuffer(response.downloadUrl);
+      const imageBuffer = await withRetry(
+        () => httpGetBuffer(response.downloadUrl),
+        3,  // maxRetries
+        1000,  // initial delay 1s
+        2,  // backoff multiplier
+      );
 
       // Convert to base64
       const base64 = imageBuffer.toString('base64');
@@ -404,7 +432,12 @@ export async function downloadMediaFile(
     }
 
     if (response.downloadUrl) {
-      const mediaBuffer = await httpGetBuffer(response.downloadUrl);
+      const mediaBuffer = await withRetry(
+        () => httpGetBuffer(response.downloadUrl),
+        3,  // maxRetries
+        1000,  // initial delay 1s
+        2,  // backoff multiplier
+      );
 
       if (!fs.existsSync(TEMP_DIR)) {
         fs.mkdirSync(TEMP_DIR, { recursive: true });

package/src/monitor.ts

@@ -199,7 +199,8 @@ async function extractMessageContent(
               }
             }
 
-            const formattedRecords = records.map((record, idx) => {
+            // Process records with async image downloads
+            const formattedRecords = await Promise.all(records.map(async (record, idx) => {
               // Try: senderNick > API resolved name (via staffId or senderId) > fallback
               let sender = record.senderNick;
               if (!sender) {
@@ -223,7 +224,28 @@ async function extractMessageContent(
                   break;
                 case 'picture':
                 case 'image':
-                  msgContent = '[图片]';
+                  // Try to download the image
+                  if (record.downloadCode && account.clientId && account.clientSecret) {
+                    try {
+                      const robotCode = account.robotCode || account.clientId;
+                      const pictureResult = await downloadPicture(
+                        account.clientId, account.clientSecret, robotCode!, record.downloadCode,
+                      );
+                      if (pictureResult.filePath) {
+                        msgContent = `[图片: ${pictureResult.filePath}]`;
+                        log?.info?.("[dingtalk] Downloaded chatRecord picture: " + pictureResult.filePath);
+                      } else if (pictureResult.error) {
+                        msgContent = `[图片下载失败: ${pictureResult.error}]`;
+                      } else {
+                        msgContent = '[图片]';
+                      }
+                    } catch (err) {
+                      log?.info?.("[dingtalk] Error downloading chatRecord picture: " + err);
+                      msgContent = '[图片]';
+                    }
+                  } else {
+                    msgContent = '[图片]';
+                  }
                   break;
                 case 'video':
                   msgContent = '[视频]';
@@ -246,7 +268,7 @@ async function extractMessageContent(
               }
               const time = record.createAt ? new Date(record.createAt).toLocaleString('zh-CN') : '';
               return `[${idx + 1}] ${sender}${time ? ` (${time})` : ''}: ${msgContent}`;
-            });
+            }));
             const text = `[聊天记录合集 - ${records.length}条消息]\n${formattedRecords.join('\n')}`;
             log?.info?.("[dingtalk] Parsed chatRecord with " + records.length + " messages");
             return {