@yaoyuanchao/dingtalk 1.3.1 → 1.3.3

package/package.json

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

package/src/api.ts

@@ -93,12 +93,16 @@ export async function getDingTalkAccessToken(clientId: string, clientSecret: str
 export async function sendViaSessionWebhook(
   sessionWebhook: string,
   text: string,
-): Promise<{ ok: boolean }> {
+): Promise<{ ok: boolean; errcode?: number; errmsg?: string }> {
   const res = await jsonPost(sessionWebhook, {
     msgtype: "text",
     text: { content: text },
   });
-  return { ok: res?.errcode === 0 || !res?.errcode };
+  const ok = res?.errcode === 0 || !res?.errcode;
+  if (!ok) {
+    console.warn(`[dingtalk] SessionWebhook text error: errcode=${res?.errcode}, errmsg=${res?.errmsg}`);
+  }
+  return { ok, errcode: res?.errcode, errmsg: res?.errmsg };
 }
 
 /** Send markdown via sessionWebhook */
@@ -106,12 +110,16 @@ export async function sendMarkdownViaSessionWebhook(
   sessionWebhook: string,
   title: string,
   text: string,
-): Promise<{ ok: boolean }> {
+): Promise<{ ok: boolean; errcode?: number; errmsg?: string }> {
   const res = await jsonPost(sessionWebhook, {
     msgtype: "markdown",
     markdown: { title, text },
   });
-  return { ok: res?.errcode === 0 || !res?.errcode };
+  const ok = res?.errcode === 0 || !res?.errcode;
+  if (!ok) {
+    console.warn(`[dingtalk] SessionWebhook markdown error: errcode=${res?.errcode}, errmsg=${res?.errmsg}`);
+  }
+  return { ok, errcode: res?.errcode, errmsg: res?.errmsg };
 }
 
 /** Send image via sessionWebhook using markdown format */

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

@@ -577,9 +577,13 @@ async function processInboundMessage(
         cfg: actualCfg,
         dispatcherOptions: {
           deliver: async (payload: any) => {
-            if (payload.text) {
-              await deliverReply(replyTarget, payload.text, log);
+            log?.info?.("[dingtalk] Deliver payload keys: " + Object.keys(payload || {}).join(',') + " text?=" + (typeof payload?.text) + " markdown?=" + (typeof payload?.markdown));
+            const textToSend = resolveDeliverText(payload, log);
+            if (textToSend) {
+              await deliverReply(replyTarget, textToSend, log);
               setStatus?.({ lastOutboundAt: Date.now() });
+            } else {
+              log?.info?.("[dingtalk] Deliver: no text resolved from payload");
             }
           },
           onError: (err: any) => {
@@ -679,8 +683,12 @@ async function dispatchWithFullPipeline(params: {
     responsePrefix: '',
     deliver: async (payload: any) => {
       try {
-        const textToSend = payload.markdown || payload.text;
-        if (!textToSend) return { ok: true };
+        log?.info?.("[dingtalk] Pipeline deliver payload keys: " + Object.keys(payload || {}).join(',') + " text?=" + (typeof payload?.text) + " markdown?=" + (typeof payload?.markdown));
+        const textToSend = resolveDeliverText(payload, log);
+        if (!textToSend) {
+          log?.info?.("[dingtalk] Pipeline deliver: no text resolved from payload");
+          return { ok: true };
+        }
         await deliverReply(replyTarget, textToSend, log);
         setStatus?.({ lastOutboundAt: Date.now() });
         return { ok: true };
@@ -702,6 +710,32 @@ 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 {
+  // payload.markdown may be a boolean flag (not the actual text), so check type
+  let text = (typeof payload.markdown === 'string' && payload.markdown) || payload.text;
+
+  // Guard: ensure text is a string (platform might send unexpected types)
+  if (text != null && typeof text !== 'string') {
+    log?.info?.("[dingtalk] Deliver payload has non-string text type=" + typeof text + ", payload keys=" + Object.keys(payload).join(','));
+    text = String(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;
@@ -743,13 +777,17 @@ async function deliverReply(target: any, text: string, log?: any): Promise<void>
       for (let attempt = 1; attempt <= maxRetries; attempt++) {
         try {
           log?.info?.("[dingtalk] Using sessionWebhook (attempt " + attempt + "/" + maxRetries + "), format=" + messageFormat);
-          log?.info?.("[dingtalk] Sending text: " + chunk.substring(0, 200));
+          log?.info?.("[dingtalk] Sending text (" + chunk.length + " chars): " + chunk.substring(0, 200));
+          let sendResult: { ok: boolean; errcode?: number; errmsg?: string };
           if (isMarkdown) {
-            await sendMarkdownViaSessionWebhook(target.sessionWebhook, "Reply", chunk);
+            sendResult = await sendMarkdownViaSessionWebhook(target.sessionWebhook, "Reply", chunk);
           } else {
-            await sendViaSessionWebhook(target.sessionWebhook, chunk);
+            sendResult = await sendViaSessionWebhook(target.sessionWebhook, chunk);
+          }
+          if (!sendResult.ok) {
+            throw new Error(`SessionWebhook rejected: errcode=${sendResult.errcode}, errmsg=${sendResult.errmsg}`);
           }
-          log?.info?.("[dingtalk] SessionWebhook send OK");
+          log?.info?.("[dingtalk] SessionWebhook send OK (errcode=" + (sendResult.errcode ?? 0) + ")");
           webhookSuccess = true;
           break;
         } catch (err) {