@huo15/dingtalk-connector-pro 1.0.4 → 1.0.7

package/src/services/media.ts

@@ -8,9 +8,9 @@ import * as path from 'path';
 // form-data 是 CJS 模块，静态 import 可确保 jiti/ESM 环境下 CJS 互操作行为稳定，
 // 避免动态 import 时 .default 偶发为 undefined 导致 "Cannot read properties of undefined (reading 'registry')"
 import FormData from 'form-data';
-import type { DingtalkConfig } from '../types/index.ts';
-import { DINGTALK_OAPI, getOapiAccessToken } from '../utils/index.ts';
-import { dingtalkHttp, dingtalkOapiHttp } from '../utils/http-client.ts';
+import type { DingtalkConfig } from '../types/index.js';
+import { DINGTALK_OAPI, getOapiAccessToken } from '../utils/index.js';
+import { dingtalkHttp, dingtalkOapiHttp } from '../utils/http-client.js';
 
 
 /** 文本文件扩展名 */
@@ -716,7 +716,7 @@ async function sendVideoMessage(
   metadata?: { duration: number; width: number; height: number },
 ): Promise<void> {
   try {
-    const token = await (await import('../utils/index.ts')).getAccessToken(config);
+    const token = await (await import('../utils/index.js')).getAccessToken(config);
     
     // 钉钉视频消息格式（sessionWebhook 模式）
     const videoMessage = {
@@ -759,8 +759,8 @@ export async function sendVideoProactive(
   log?: any,
 ): Promise<void> {
   try {
-    const token = await (await import('../utils/index.ts')).getAccessToken(config);
-    const { DINGTALK_API } = await import('../utils/index.ts');
+    const token = await (await import('../utils/index.js')).getAccessToken(config);
+    const { DINGTALK_API } = await import('../utils/index.js');
 
     // 钉钉普通消息 API 的视频消息格式
     const msgParam = {
@@ -819,7 +819,7 @@ async function sendAudioMessage(
   durationMs?: number,
 ): Promise<void> {
   try {
-    const token = await (await import('../utils/index.ts')).getAccessToken(config);
+    const token = await (await import('../utils/index.js')).getAccessToken(config);
 
     // 钉钉语音消息格式
     const actualDuration = (durationMs && durationMs > 0) ? durationMs.toString() : '60000';
@@ -862,8 +862,8 @@ export async function sendAudioProactive(
   durationMs?: number,
 ): Promise<void> {
   try {
-    const token = await (await import('../utils/index.ts')).getAccessToken(config);
-    const { DINGTALK_API } = await import('../utils/index.ts');
+    const token = await (await import('../utils/index.js')).getAccessToken(config);
+    const { DINGTALK_API } = await import('../utils/index.js');
 
     // 钉钉普通消息 API 的音频消息格式
     const actualDuration = (durationMs && durationMs > 0) ? durationMs.toString() : '60000';
@@ -915,7 +915,7 @@ async function sendFileMessage(
   log?: any,
 ): Promise<void> {
   try {
-    const token = await (await import('../utils/index.ts')).getAccessToken(config);
+    const token = await (await import('../utils/index.js')).getAccessToken(config);
 
     const fileMessage = {
       msgtype: 'file',
@@ -956,8 +956,8 @@ export async function sendFileProactive(
   log?: any,
 ): Promise<void> {
   try {
-    const token = await (await import('../utils/index.ts')).getAccessToken(config);
-    const { DINGTALK_API } = await import('../utils/index.ts');
+    const token = await (await import('../utils/index.js')).getAccessToken(config);
+    const { DINGTALK_API } = await import('../utils/index.js');
 
     // 钉钉普通消息 API 的文件消息格式
     const msgParam = {

package/src/services/messaging/card.js

@@ -0,0 +1,234 @@
+/**
+ * AI Card 流式响应模块
+ * 支持 AI Card 创建、流式更新、完成
+ */
+import { DINGTALK_API, getAccessToken } from "../../utils/token.js";
+import { dingtalkHttp } from "../../utils/http-client.js";
+// ============ 常量 ============
+const AI_CARD_TEMPLATE_ID = "02fcf2f4-5e02-4a85-b672-46d1f715543e.schema";
+/** AI Card 状态 */
+const AICardStatus = {
+    PROCESSING: "1",
+    INPUTING: "2",
+    FINISHED: "3",
+    EXECUTING: "4",
+    FAILED: "5",
+};
+// ============ Markdown 格式修正 ============
+/**
+ * 确保 Markdown 表格前有空行，否则钉钉无法正确渲染表格
+ */
+function ensureTableBlankLines(text) {
+    const lines = text.split("\n");
+    const result = [];
+    const tableDividerRegex = /^\s*\|?\s*:?-+:?\s*(\|?\s*:?-+:?\s*)+\|?\s*$/;
+    const tableRowRegex = /^\s*\|?.*\|.*\|?\s*$/;
+    const isDivider = (line) => line &&
+        typeof line === "string" &&
+        line.includes("|") &&
+        tableDividerRegex.test(line);
+    for (let i = 0; i < lines.length; i++) {
+        const currentLine = lines[i];
+        const nextLine = lines[i + 1] ?? "";
+        if (tableRowRegex.test(currentLine) &&
+            isDivider(nextLine) &&
+            i > 0 &&
+            lines[i - 1].trim() !== "" &&
+            !tableRowRegex.test(lines[i - 1])) {
+            result.push("");
+        }
+        result.push(currentLine);
+    }
+    return result.join("\n");
+}
+// ============ AI Card 相关 ============
+/**
+ * 构建卡片投放请求体
+ */
+export function buildDeliverBody(cardInstanceId, target, robotCode) {
+    const base = { outTrackId: cardInstanceId, userIdType: 1 };
+    if (target.type === "group") {
+        return {
+            ...base,
+            openSpaceId: `dtv1.card//IM_GROUP.${target.openConversationId}`,
+            imGroupOpenDeliverModel: {
+                robotCode,
+            },
+        };
+    }
+    return {
+        ...base,
+        openSpaceId: `dtv1.card//IM_ROBOT.${target.userId}`,
+        imRobotOpenDeliverModel: {
+            spaceType: 'IM_ROBOT',
+            robotCode,
+            extension: {
+                dynamicSummary: 'true',
+            },
+        },
+    };
+}
+/**
+ * 通用 AI Card 创建函数
+ */
+export async function createAICardForTarget(config, target, log) {
+    const targetDesc = target.type === "group"
+        ? `群聊 ${target.openConversationId}`
+        : `用户 ${target.userId}`;
+    try {
+        const token = await getAccessToken(config);
+        const cardInstanceId = `card_${Date.now()}_${Math.random().toString(36).slice(2, 10)}`;
+        log?.info?.(`[DingTalk][AICard] 开始创建卡片：${targetDesc}, outTrackId=${cardInstanceId}`);
+        // 1. 创建卡片实例
+        const createBody = {
+            cardTemplateId: AI_CARD_TEMPLATE_ID,
+            outTrackId: cardInstanceId,
+            cardData: {
+                cardParamMap: {
+                    config: JSON.stringify({ autoLayout: true }),
+                }
+            },
+            callbackType: "STREAM",
+            imGroupOpenSpaceModel: { supportForward: true },
+            imRobotOpenSpaceModel: { supportForward: true },
+        };
+        const createResp = await dingtalkHttp.post(`${DINGTALK_API}/v1.0/card/instances`, createBody, {
+            headers: {
+                "x-acs-dingtalk-access-token": token,
+                "Content-Type": "application/json",
+            },
+        });
+        // 2. 投放卡片
+        const deliverBody = buildDeliverBody(cardInstanceId, target, String(config.clientId ?? ""));
+        const deliverResp = await dingtalkHttp.post(`${DINGTALK_API}/v1.0/card/instances/deliver`, deliverBody, {
+            headers: {
+                "x-acs-dingtalk-access-token": token,
+                "Content-Type": "application/json",
+            },
+        });
+        // 记录 token 过期时间（钉钉 token 有效期 2 小时）
+        const tokenExpireTime = Date.now() + 2 * 60 * 60 * 1000;
+        return { cardInstanceId, accessToken: token, tokenExpireTime, inputingStarted: false };
+    }
+    catch (err) {
+        log?.error?.(`[DingTalk][AICard] 创建卡片失败 (${targetDesc}): ${err.message}`);
+        if (err.response) {
+            log?.error?.(`[DingTalk][AICard] 错误响应：status=${err.response.status}`);
+        }
+        return null;
+    }
+}
+/**
+ * 确保 Token 有效（自动刷新过期的 Token）
+ */
+async function ensureValidToken(card, config) {
+    // 如果 token 即将过期（提前 5 分钟刷新）
+    if (Date.now() > card.tokenExpireTime - 5 * 60 * 1000) {
+        const newToken = await getAccessToken(config);
+        card.accessToken = newToken;
+        card.tokenExpireTime = Date.now() + 2 * 60 * 60 * 1000;
+    }
+    return card.accessToken;
+}
+/**
+ * 流式更新 AI Card 内容
+ */
+export async function streamAICard(card, content, finished = false, config, log) {
+    // 确保 token 有效
+    if (config) {
+        await ensureValidToken(card, config);
+    }
+    if (!card.inputingStarted) {
+        const statusBody = {
+            outTrackId: card.cardInstanceId,
+            cardData: {
+                cardParamMap: {
+                    flowStatus: AICardStatus.INPUTING,
+                    msgContent: content,
+                    staticMsgContent: "",
+                    sys_full_json_obj: JSON.stringify({
+                        order: ["msgContent"],
+                    }),
+                    config: JSON.stringify({ autoLayout: true }),
+                },
+            },
+        };
+        try {
+            const statusResp = await dingtalkHttp.put(`${DINGTALK_API}/v1.0/card/instances`, statusBody, {
+                headers: {
+                    "x-acs-dingtalk-access-token": card.accessToken,
+                    "Content-Type": "application/json",
+                },
+            });
+            log?.info?.(`[DingTalk][AICard] INPUTING 响应：status=${statusResp.status}`);
+        }
+        catch (err) {
+            log?.error?.(`[DingTalk][AICard] INPUTING 切换失败：${err.message}`);
+            throw err;
+        }
+        card.inputingStarted = true;
+    }
+    const fixedContent = ensureTableBlankLines(content);
+    const body = {
+        outTrackId: card.cardInstanceId,
+        guid: `${Date.now()}_${Math.random().toString(36).slice(2, 8)}`,
+        key: "msgContent",
+        content: fixedContent,
+        isFull: true,
+        isFinalize: finished,
+        isError: false,
+    };
+    log?.info?.(`[DingTalk][AICard] PUT /v1.0/card/streaming contentLen=${content.length} isFinalize=${finished}`);
+    try {
+        const streamResp = await dingtalkHttp.put(`${DINGTALK_API}/v1.0/card/streaming`, body, {
+            headers: {
+                "x-acs-dingtalk-access-token": card.accessToken,
+                "Content-Type": "application/json",
+            },
+        });
+        log?.info?.(`[DingTalk][AICard] streaming 响应：status=${streamResp.status}`);
+    }
+    catch (err) {
+        log?.error?.(`[DingTalk][AICard] streaming 更新失败：${err.message}`);
+        throw err;
+    }
+}
+/**
+ * 完成 AI Card
+ */
+export async function finishAICard(card, content, config, log) {
+    // 确保 token 有效
+    if (config) {
+        await ensureValidToken(card, config);
+    }
+    const fixedContent = ensureTableBlankLines(content);
+    log?.info?.(`[DingTalk][AICard] 开始 finish，最终内容长度=${fixedContent.length}`);
+    await streamAICard(card, fixedContent, true, log);
+    const body = {
+        outTrackId: card.cardInstanceId,
+        cardData: {
+            cardParamMap: {
+                flowStatus: AICardStatus.FINISHED,
+                msgContent: fixedContent,
+                staticMsgContent: "",
+                sys_full_json_obj: JSON.stringify({
+                    order: ["msgContent"],
+                }),
+                config: JSON.stringify({ autoLayout: true }),
+            },
+        },
+        cardUpdateOptions: { updateCardDataByKey: true },
+    };
+    try {
+        const finishResp = await dingtalkHttp.put(`${DINGTALK_API}/v1.0/card/instances`, body, {
+            headers: {
+                "x-acs-dingtalk-access-token": card.accessToken,
+                "Content-Type": "application/json",
+            },
+        });
+        log?.info?.(`[DingTalk][AICard] FINISHED 响应：status=${finishResp.status}`);
+    }
+    catch (err) {
+        log?.error?.(`[DingTalk][AICard] FINISHED 更新失败：${err.message}`);
+    }
+}

package/src/services/messaging/card.ts

@@ -3,9 +3,9 @@
  * 支持 AI Card 创建、流式更新、完成
  */
 
-import type { DingtalkConfig } from "../../types/index.ts";
-import { DINGTALK_API, getAccessToken } from "../../utils/token.ts";
-import { dingtalkHttp } from "../../utils/http-client.ts";
+import type { DingtalkConfig } from "../../types/index.js";
+import { DINGTALK_API, getAccessToken } from "../../utils/token.js";
+import { dingtalkHttp } from "../../utils/http-client.js";
 
 // ============ 常量 ============
 

package/src/services/messaging/index.js

@@ -0,0 +1,8 @@
+/**
+ * 消息发送模块统一导出
+ */
+export * from './send.js';
+export * from './card.js';
+// 兼容旧实现（`src/services/messaging.ts`）中仍被外部调用的 API。
+// 注意：这里只显式导出函数，避免与 `send.ts/card.ts` 的类型/常量命名冲突。
+export { sendMessage, sendProactive, sendToUser, sendToGroup, sendTextToDingTalk, sendMediaToDingTalk, } from '../messaging.js';

package/src/services/messaging/index.ts

@@ -2,8 +2,8 @@
  * 消息发送模块统一导出
  */
 
-export * from './send.ts';
-export * from './card.ts';
+export * from './send.js';
+export * from './card.js';
 
 // 兼容旧实现（`src/services/messaging.ts`）中仍被外部调用的 API。
 // 注意：这里只显式导出函数，避免与 `send.ts/card.ts` 的类型/常量命名冲突。
@@ -14,4 +14,4 @@ export {
   sendToGroup,
   sendTextToDingTalk,
   sendMediaToDingTalk,
-} from '../messaging.ts';
+} from '../messaging.js';

package/src/services/messaging/send.js

@@ -0,0 +1,85 @@
+/**
+ * 消息发送基础模块
+ * 支持 Markdown、文本、链接等消息类型
+ */
+import { getAccessToken } from '../../utils/token.js';
+import { dingtalkHttp } from '../../utils/http-client.js';
+/**
+ * 发送 Markdown 消息
+ */
+export async function sendMarkdownMessage(config, sessionWebhook, title, markdown, options = {}) {
+    const token = await getAccessToken(config);
+    let text = markdown;
+    if (options.atUserId)
+        text = `${text} @${options.atUserId}`;
+    const body = {
+        msgtype: 'markdown',
+        markdown: {
+            title,
+            text: text,
+        },
+    };
+    if (options.atUserId) {
+        body.at = {
+            userIds: [options.atUserId],
+            isAtAll: false,
+        };
+    }
+    const resp = await dingtalkHttp.post(sessionWebhook, body, {
+        headers: {
+            'x-acs-dingtalk-access-token': token,
+            'Content-Type': 'application/json',
+        },
+    });
+    return resp.data;
+}
+/**
+ * 发送文本消息
+ */
+export async function sendTextMessage(config, sessionWebhook, content, options = {}) {
+    const token = await getAccessToken(config);
+    let text = content;
+    if (options.atUserId)
+        text = `${text} @${options.atUserId}`;
+    const body = {
+        msgtype: 'text',
+        text: {
+            content: text,
+        },
+    };
+    if (options.atUserId) {
+        body.at = {
+            userIds: [options.atUserId],
+            isAtAll: false,
+        };
+    }
+    const resp = await dingtalkHttp.post(sessionWebhook, body, {
+        headers: {
+            'x-acs-dingtalk-access-token': token,
+            'Content-Type': 'application/json',
+        },
+    });
+    return resp.data;
+}
+/**
+ * 发送链接消息
+ */
+export async function sendLinkMessage(config, sessionWebhook, params) {
+    const token = await getAccessToken(config);
+    const body = {
+        msgtype: 'link',
+        link: {
+            title: params.title,
+            text: params.text,
+            picUrl: params.picUrl,
+            messageUrl: params.messageUrl,
+        },
+    };
+    const resp = await dingtalkHttp.post(sessionWebhook, body, {
+        headers: {
+            'x-acs-dingtalk-access-token': token,
+            'Content-Type': 'application/json',
+        },
+    });
+    return resp.data;
+}

package/src/services/messaging/send.ts

@@ -3,9 +3,9 @@
  * 支持 Markdown、文本、链接等消息类型
  */
 
-import type { DingtalkConfig } from '../../types/index.ts';
-import { DINGTALK_API, getAccessToken } from '../../utils/token.ts';
-import { dingtalkHttp } from '../../utils/http-client.ts';
+import type { DingtalkConfig } from '../../types/index.js';
+import { DINGTALK_API, getAccessToken } from '../../utils/token.js';
+import { dingtalkHttp } from '../../utils/http-client.js';
 
 /** 消息类型枚举 */
 export type DingTalkMsgType = 'text' | 'markdown' | 'link' | 'actionCard' | 'image';