@dingtalk-real-ai/dingtalk-connector 0.8.12 → 0.8.13

package/src/services/media.ts

@@ -607,7 +607,12 @@ export interface FileInfo {
 }
 
 /**
- * 提取文件标记并发送文件消息
+ * 提取文件标记，上传文件到钉钉，并发送独立的文件消息（webhook 或 proactive API）。
+ * 
+ * 注意：此函数既做「上传」也做「发送」，是完整版的文件处理流程。
+ * 与 media/file.ts 中的 uploadAndReplaceFileMarkers 不同，后者只做上传+文本替换。
+ * 
+ * 调用方：messaging.ts（直接 import media.ts）
  */
 export async function processFileMarkers(
   content: string,
@@ -672,11 +677,11 @@ export async function processFileMarkers(
         continue;
       }
 
-      // 发送文件消息
+      // 发送文件消息（钉钉 API 统一要求带 @ 前缀的 mediaId）
       if (useProactiveApi && target) {
-        await sendFileProactive(config, target, fileInfo, uploadResult.cleanMediaId, log);
+        await sendFileProactive(config, target, fileInfo, uploadResult.mediaId, log);
       } else {
-        await sendFileMessage(config, sessionWebhook, fileInfo, uploadResult.downloadUrl, log);
+        await sendFileMessage(config, sessionWebhook, fileInfo, uploadResult.mediaId, log);
       }
       statusMessages.push(`✅ 文件已发送: ${fileName}`);
       log?.info?.(`${logPrefix} 文件处理完成: ${fileName}`);
@@ -771,7 +776,7 @@ export async function sendVideoProactive(
     };
 
     const body: any = {
-      robotCode: config.clientId,
+      robotCode: String(config.clientId),
       msgKey: 'sampleVideo',
       msgParam: JSON.stringify(msgParam),
     };
@@ -873,7 +878,7 @@ export async function sendAudioProactive(
     };
 
     const body: any = {
-      robotCode: config.clientId,
+      robotCode: String(config.clientId),
       msgKey: 'sampleAudio',
       msgParam: JSON.stringify(msgParam),
     };
@@ -942,6 +947,7 @@ async function sendFileMessage(
     }
   } catch (err: any) {
     log?.error?.(`发送文件消息异常: ${fileInfo.fileName}, 错误: ${err.message}`);
+    throw err;
   }
 }
 
@@ -960,14 +966,16 @@ export async function sendFileProactive(
     const { DINGTALK_API } = await import('../utils/index.ts');
 
     // 钉钉普通消息 API 的文件消息格式
+    const resolvedFileName = fileInfo.fileName || path.basename(fileInfo.path);
+    const resolvedFileType = fileInfo.fileType || resolvedFileName.split('.').pop() || 'file';
     const msgParam = {
       mediaId: mediaId,
-      fileName: fileInfo.fileName,
-      fileType: fileInfo.fileType,
+      fileName: resolvedFileName,
+      fileType: resolvedFileType,
     };
 
     const body: any = {
-      robotCode: config.clientId,
+      robotCode: String(config.clientId),
       msgKey: 'sampleFile',
       msgParam: JSON.stringify(msgParam),
     };
@@ -994,6 +1002,7 @@ export async function sendFileProactive(
     }
   } catch (err: any) {
     log?.error?.(`File[Proactive] 发送文件消息失败: ${fileInfo.fileName}, 错误: ${err.message}`);
+    throw err;
   }
 }
 
@@ -1109,9 +1118,7 @@ export async function processRawMediaPaths(
         };
         
         if (target) {
-          // 文件消息使用下载链接
-          // 文件消息使用媒体文件ID（cleanMediaId）通过主动API发送
-          await sendFileProactive(config, target, fileInfo, uploadResult.cleanMediaId, log);
+          await sendFileProactive(config, target, fileInfo, uploadResult.mediaId, log);
         }
         statusMessages.push(`✅ 文件已发送: ${fileName}`);
       }

package/src/services/messaging/card.ts

@@ -281,7 +281,6 @@ export async function streamAICard(
       `[DingTalk][AICard] streaming 响应：status=${streamResp.status}`,
     );
   } catch (err: any) {
-    log?.error?.(`[DingTalk][AICard] streaming 更新失败：${err.message}`);
     throw err;
   }
 }
@@ -304,7 +303,7 @@ export async function finishAICard(
     `[DingTalk][AICard] 开始 finish，最终内容长度=${fixedContent.length}`,
   );
 
-  await streamAICard(card, fixedContent, true, log);
+  await streamAICard(card, fixedContent, true, config, log);
 
   const body = {
     outTrackId: card.cardInstanceId,

package/src/services/messaging.ts

@@ -229,7 +229,7 @@ export async function sendNormalToUser(
   try {
     const token = await getAccessToken(config);
     const body = {
-      robotCode: config.clientId,
+      robotCode: String(config.clientId),
       userIds: userIdArray,
       msgKey: payload.msgKey,
       msgParam: JSON.stringify(payload.msgParam),
@@ -306,7 +306,7 @@ export async function sendNormalToGroup(
   try {
     const token = await getAccessToken(config);
     const body = {
-      robotCode: config.clientId,
+      robotCode: String(config.clientId),
       openConversationId,
       msgKey: payload.msgKey,
       msgParam: JSON.stringify(payload.msgParam),
@@ -439,7 +439,7 @@ export async function sendAICardInternal(
     }
 
     // 7. 使用 finishAICard 设置内容
-    await finishAICard(card, processedContent, log);
+    await finishAICard(card, processedContent, config, log);
 
     log?.info?.(
       `AI Card 发送成功: ${targetDesc}, cardInstanceId=${card.cardInstanceId}`,
@@ -552,11 +552,17 @@ export async function sendTextToDingTalk(params: {
     return { ok: false, error: "Invalid target parameter", usedAICard: false };
   }
 
-  // 判断目标是用户还是群
-  const isUser = !target.startsWith("cid");
-  const targetParam = isUser
-    ? { type: "user" as const, userId: target }
-    : { type: "group" as const, openConversationId: target };
+  // 判断目标是用户还是群（支持 group:/user: 前缀，与 gateway-methods.ts 逻辑保持一致）
+  let targetParam: { type: "user"; userId: string } | { type: "group"; openConversationId: string };
+  if (target.startsWith("group:")) {
+    targetParam = { type: "group", openConversationId: target.slice(6) };
+  } else if (target.startsWith("user:")) {
+    targetParam = { type: "user", userId: target.slice(5) };
+  } else if (target.startsWith("cid")) {
+    targetParam = { type: "group", openConversationId: target };
+  } else {
+    targetParam = { type: "user", userId: target };
+  }
 
   return sendProactive(config, targetParam, text, {
     msgType: "text",
@@ -595,11 +601,17 @@ export async function sendMediaToDingTalk(params: {
     return { ok: false, error: "Invalid target parameter", usedAICard: false };
   }
 
-  // 判断目标是用户还是群
-  const isUser = !target.startsWith("cid");
-  const targetParam = isUser
-    ? { type: "user" as const, userId: target }
-    : { type: "group" as const, openConversationId: target };
+  // 判断目标是用户还是群（支持 group:/user: 前缀，与 gateway-methods.ts 逻辑保持一致）
+  let targetParam: { type: "user"; userId: string } | { type: "group"; openConversationId: string };
+  if (target.startsWith("group:")) {
+    targetParam = { type: "group", openConversationId: target.slice(6) };
+  } else if (target.startsWith("user:")) {
+    targetParam = { type: "user", userId: target.slice(5) };
+  } else if (target.startsWith("cid")) {
+    targetParam = { type: "group", openConversationId: target };
+  } else {
+    targetParam = { type: "user", userId: target };
+  }
 
   log.info("参数解析完成，mediaUrl:", mediaUrl, "type:", typeof mediaUrl);
 
@@ -755,8 +767,9 @@ export async function sendMediaToDingTalk(params: {
     // 获取文件扩展名作为 fileType
     const fileType = ext || "file";
     
-    // 构建文件信息
+    // 构建文件信息（path 字段用于 sendFileProactive 中 fileName 的 fallback）
     const fileInfo = {
+      path: mediaUrl,
       fileName: fileName,
       fileType: fileType,
     };
@@ -892,7 +905,7 @@ async function sendProactiveInternal(
     try {
       const card = await createAICardForTarget(config, target, externalLog);
       if (card) {
-        await finishAICard(card, content, externalLog);
+        await finishAICard(card, content, config, externalLog);
         return {
           ok: true,
           cardInstanceId: card.cardInstanceId,
@@ -944,7 +957,7 @@ async function sendProactiveInternal(
     }
 
     const body: any = {
-      robotCode: config.clientId,
+      robotCode: String(config.clientId),
       msgKey: payload.msgKey,
       msgParam: JSON.stringify(payload.msgParam),
     };

package/src/utils/http-client.ts

@@ -2,6 +2,7 @@
  * HTTP 客户端配置模块
  * 
  * 提供统一的 axios 实例，用于钉钉 API 请求。
+ * 所有钉钉 API 调用必须使用此模块导出的实例，禁止直接使用 axios 或 fetch。
  * 
  * 使用方式：
  * ```typescript
@@ -13,7 +14,7 @@
 
 import axios, { type AxiosInstance } from 'axios';
 
-/** 钉钉专用 HTTP 客户端（30 秒超时） */
+/** 钉钉新版 API 专用 HTTP 客户端（30 秒超时，用于 api.dingtalk.com） */
 export const dingtalkHttp: AxiosInstance = axios.create({
   timeout: 30000,
   headers: {

package/docs/images/dingtalk.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" fill="none" viewBox="0 0 48 48"><path fill="#171A1D" d="M37.05 22.783c-6.758-5.216-14.378-12.128-22.73-19.538-.655-.585-1.242-.354-1.536.42-1.88 4.973-.058 9.386 2.889 11.932s7.368 4.912 10.058 6.155c.105.049.013.203-.093.163-4.953-2.182-8.397-3.765-13.07-7.368-.497-.388-1.01-.242-1.07.521-.384 4.748 2.657 8.483 6.058 9.745 2.1.781 4.398 1.212 6.53 1.474.109.015.084.178-.027.178-2.747.01-6.058-.654-8.935-1.751-.606-.233-.818.25-.722.633.491 2.008 2.974 5.076 6.926 5.73a12 12 0 0 0 2.228.115c.164 0 .208.089.154.217q-2.685 4.6-2.803 4.797c-.091.152-.036.275.156.275h3.543c.164 0 .264.106.18.246l-4.958 8.196c-.191.328.035.565.395.301s15.212-11.133 15.636-11.448c.195-.142.148-.327-.124-.327h-3.18c-.206 0-.252-.14-.111-.28.14-.141 3.602-3.594 4.837-4.888 1.283-1.35 1.938-3.825-.231-5.498"/></svg>