@yaoyuanchao/dingtalk 1.3.2 → 1.3.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yaoyuanchao/dingtalk",
-  "version": "1.3.2",
+  "version": "1.3.4",
   "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

@@ -4,6 +4,18 @@ import { startDingTalkMonitor } from './monitor.js';
 import { sendDingTalkRestMessage } from './api.js';
 import { probeDingTalk } from './probe.js';
 
+/**
+ * Parse outbound `to` address, stripping optional channel prefix.
+ * Handles both "dm:id" and "dingtalk:dm:id" formats.
+ */
+function parseOutboundTo(to: string): { type: string; id: string } {
+  const parts = to.split(':');
+  if (parts[0] === 'dingtalk' && parts.length > 2) {
+    parts.shift();
+  }
+  return { type: parts[0], id: parts.slice(1).join(':') };
+}
+
 export const dingtalkPlugin = {
   id: 'dingtalk',
 
@@ -166,7 +178,7 @@ export const dingtalkPlugin = {
 
     async sendText({ to, text, accountId, cfg }) {
       const account = resolveDingTalkAccount({ cfg, accountId });
-      const [type, id] = to.split(':');
+      const { type, id } = parseOutboundTo(to);
 
       if (type === 'dm') {
         await sendDingTalkRestMessage({
@@ -204,7 +216,7 @@ export const dingtalkPlugin = {
       }
 
       const account = resolveDingTalkAccount({ cfg, accountId });
-      const [type, id] = to.split(':');
+      const { type, id } = parseOutboundTo(to);
 
       // Build text message with image URL as markdown image
       const imageMarkdown = `![image](${mediaUrl})`;

package/src/monitor.ts

@@ -52,6 +52,11 @@ export async function startDingTalkMonitor(ctx: DingTalkMonitorContext): Promise
   });
 
   client.registerCallbackListener(TOPIC_ROBOT, async (downstream: any) => {
+    // Immediately ACK to prevent DingTalk from retrying (60s timeout)
+    try {
+      client.socketResponse(downstream.headers.messageId, { status: 'SUCCESS' });
+    } catch (_) { /* best-effort ACK */ }
+
     try {
       const data: DingTalkRobotMessage = typeof downstream.data === "string"
         ? JSON.parse(downstream.data) : downstream.data;
@@ -577,10 +582,13 @@ async function processInboundMessage(
         cfg: actualCfg,
         dispatcherOptions: {
           deliver: async (payload: any) => {
+            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) => {
@@ -680,8 +688,12 @@ async function dispatchWithFullPipeline(params: {
     responsePrefix: '',
     deliver: async (payload: any) => {
       try {
+        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) return { ok: true };
+        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 };
@@ -709,7 +721,15 @@ async function dispatchWithFullPipeline(params: {
  * 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;
+  // 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')) {
@@ -762,13 +782,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) {