@yaoyuanchao/dingtalk 1.3.0 → 1.3.2

package/package.json

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

package/src/channel.ts

@@ -206,10 +206,11 @@ export const dingtalkPlugin = {
       const account = resolveDingTalkAccount({ cfg, accountId });
       const [type, id] = to.split(':');
 
-      // Build text message with image URL
+      // Build text message with image URL as markdown image
+      const imageMarkdown = `![image](${mediaUrl})`;
       const textMessage = text
-        ? `${text}\n\n图片链接: ${mediaUrl}`
-        : `图片链接: ${mediaUrl}`;
+        ? `${text}\n\n${imageMarkdown}`
+        : imageMarkdown;
 
       if (type === 'dm') {
         await sendDingTalkRestMessage({

package/src/monitor.ts

@@ -221,6 +221,9 @@ async function extractRichTextContent(
       for (const item of content.richText) {
         if (item.msgType === "text" && item.content) {
           parts.push(item.content);
+        } else if (item.text) {
+          // DingTalk sometimes sends richText items as {text: "..."} without msgType wrapper
+          parts.push(item.text);
         } else if ((item.msgType === "picture" || item.pictureDownloadCode || item.downloadCode) && (item.downloadCode || item.pictureDownloadCode)) {
           const downloadCode = item.downloadCode || item.pictureDownloadCode;
           try {
@@ -425,8 +428,8 @@ async function processInboundMessage(
 
     if (userIds.length > 0 && account.clientId && account.clientSecret) {
       try {
-        // Batch query user info with 500ms timeout
-        const userInfoMap = await batchGetUserInfo(account.clientId, account.clientSecret, userIds, 500);
+        // Batch query user info (3s timeout — needs token fetch + API call)
+        const userInfoMap = await batchGetUserInfo(account.clientId, account.clientSecret, userIds, 3000);
 
         if (userInfoMap.size > 0) {
           // Build mention list: [@张三 @李四]
@@ -574,8 +577,9 @@ async function processInboundMessage(
         cfg: actualCfg,
         dispatcherOptions: {
           deliver: async (payload: any) => {
-            if (payload.text) {
-              await deliverReply(replyTarget, payload.text, log);
+            const textToSend = resolveDeliverText(payload, log);
+            if (textToSend) {
+              await deliverReply(replyTarget, textToSend, log);
               setStatus?.({ lastOutboundAt: Date.now() });
             }
           },
@@ -676,7 +680,7 @@ async function dispatchWithFullPipeline(params: {
     responsePrefix: '',
     deliver: async (payload: any) => {
       try {
-        const textToSend = payload.markdown || payload.text;
+        const textToSend = resolveDeliverText(payload, log);
         if (!textToSend) return { ok: true };
         await deliverReply(replyTarget, textToSend, log);
         setStatus?.({ lastOutboundAt: Date.now() });
@@ -699,6 +703,24 @@ async function dispatchWithFullPipeline(params: {
   rt.channel?.activity?.record?.('dingtalk', account.accountId, 'message');
 }
 
+/**
+ * Extract text + media URL from a deliver payload.
+ * The Clawdbot platform may send media URLs in separate fields (e.g. from the `message` tool).
+ * We merge them into the text as markdown image syntax so DingTalk can render them.
+ */
+function resolveDeliverText(payload: any, log?: any): string | undefined {
+  let text = payload.markdown || payload.text;
+  const mediaUrl = payload.mediaUrl || payload.media || payload.imageUrl || payload.image;
+
+  if (mediaUrl && typeof mediaUrl === 'string' && mediaUrl.startsWith('http')) {
+    log?.info?.("[dingtalk] Deliver payload includes media URL: " + mediaUrl);
+    const imageMarkdown = `![image](${mediaUrl})`;
+    text = text ? `${text}\n\n${imageMarkdown}` : imageMarkdown;
+  }
+
+  return text || undefined;
+}
+
 async function deliverReply(target: any, text: string, log?: any): Promise<void> {
   const now = Date.now();
   const chunkLimit = 2000;