@jeik/dingtalk-connector 0.8.27 → 0.8.29

package/src/services/messaging/card.ts

@@ -674,9 +674,11 @@ export async function finishAICard(
         log?.error?.(
           `[DingTalk][AICard] FINISHED 重试失败：${retryErr.message}`,
         );
+        throw retryErr;
       }
     } else {
       log?.error?.(`[DingTalk][AICard] FINISHED 更新失败：${err.message}`);
+      throw err;
     }
   }
 }

package/src/services/messaging.ts

@@ -7,7 +7,7 @@ import type { DingtalkConfig } from "../types/index.ts";
 import { DINGTALK_API, getAccessToken, getOapiAccessToken } from "../utils/index.ts";
 import { dingtalkHttp, dingtalkOapiHttp } from "../utils/http-client.ts";
 import { MEDIA_MSG_TYPES } from "../utils/constants.ts";
-import { createLoggerFromConfig } from "../utils/logger.ts";
+import { createLoggerFromConfig, isDingtalkDebug } from "../utils/logger.ts";
 import {
   processLocalImages,
   processImagesForOutbound,
@@ -779,7 +779,9 @@ async function downloadRemoteMediaToTemp(
 ): Promise<string | null> {
   const tag = "[DingTalk][RemoteMedia]";
   try {
-    console.log(`${tag} 开始下载 | ${url}`);
+    if (isDingtalkDebug()) {
+      console.log(`${tag} 开始下载 | ${url}`);
+    }
     const res = await fetch(url, {
       redirect: "follow",
       signal: AbortSignal.timeout(60_000),
@@ -819,7 +821,9 @@ async function downloadRemoteMediaToTemp(
       `dingtalk-remote-${Date.now()}-${Math.random().toString(36).slice(2, 8)}${ext}`,
     );
     writeFileSync(tmp, buf);
-    console.log(`${tag} 下载成功 | bytes=${buf.length} ct=${ct || "-"} tmp=${tmp}`);
+    if (isDingtalkDebug()) {
+      console.log(`${tag} 下载成功 | bytes=${buf.length} ct=${ct || "-"} tmp=${tmp}`);
+    }
     return tmp;
   } catch (err: any) {
     console.warn(`${tag} 下载异常 | ${err?.message || err}`);
@@ -883,26 +887,27 @@ export async function sendTextToDingTalk(params: {
 
   const targetParam = resolveOutboundTarget(target);
 
-  console.log(
-    `[DingTalk][LocalImage] sendTextToDingTalk 入口 | target=${target} textLen=${text?.length ?? 0}`,
-  );
-  logMediaIdTrace("sendTextToDingTalk:in", text, `target=${target}`, true);
-
   // 图片：![] 上传为 mediaId；下载链接原 URL 留在同一条 markdown（不拆消息）
+  // 无图路径全程静默；有 MD 图/失败才打日志（debug: true 可开全量）
   const beforeLen = text?.length ?? 0;
+  const hasMdImg = /!\[[^\]]*\]\([^)]+\)/.test(text || "");
+  if (hasMdImg || isDingtalkDebug()) {
+    logMediaIdTrace("sendTextToDingTalk:in", text, `target=${target}`);
+  }
   try {
     const oapiToken = await getOapiAccessToken(config);
-    console.log(
-      `[DingTalk][LocalImage] sendTextToDingTalk 入口 | target=${target} textLen=${beforeLen} hasToken=${!!oapiToken}`,
-    );
     if (oapiToken && text) {
       const processed = await processImagesForOutbound(text, oapiToken, log);
       text = processed.text;
-      console.log(
-        `[DingTalk][LocalImage] sendTextToDingTalk 处理后 | ${beforeLen}→${text.length} 字`,
-      );
-      logMediaIdTrace("sendTextToDingTalk:after-process", text, undefined, true);
-    } else if (!oapiToken) {
+      if (beforeLen !== text.length && (hasMdImg || isDingtalkDebug())) {
+        console.log(
+          `[DingTalk][LocalImage] sendTextToDingTalk 处理后 | ${beforeLen}→${text.length} 字`,
+        );
+      }
+      if (hasMdImg || isDingtalkDebug()) {
+        logMediaIdTrace("sendTextToDingTalk:after-process", text);
+      }
+    } else if (!oapiToken && hasMdImg) {
       console.warn(
         `[DingTalk][LocalImage] sendTextToDingTalk 无 oapiToken，跳过图片上传（本地 MD 图会灰）`,
       );
@@ -915,15 +920,13 @@ export async function sendTextToDingTalk(params: {
 
   const msgType: DingTalkMsgType = shouldSendAsMarkdown(text) ? "markdown" : "text";
   const cardOpts = messageToolProactiveCardOptions(config);
-  logMediaIdTrace(
-    "sendTextToDingTalk:API前",
-    text,
-    `msgType=${msgType} messageAnswerCard=${isMessageAnswerCardEnabled(config)} useAICard=${cardOpts.useAICard}`,
-    true,
-  );
-  console.log(
-    `[DingTalk][MessageCard] sendTextToDingTalk | messageAnswerCard=${isMessageAnswerCardEnabled(config)} useAICard=${cardOpts.useAICard} tpl=${cardOpts.cardTemplateId || "-"}`,
-  );
+  if (hasMdImg || isDingtalkDebug()) {
+    logMediaIdTrace(
+      "sendTextToDingTalk:API前",
+      text,
+      `msgType=${msgType} messageAnswerCard=${isMessageAnswerCardEnabled(config)} useAICard=${cardOpts.useAICard}`,
+    );
+  }
 
   return sendProactive(config, targetParam, text, {
     msgType,
@@ -1127,9 +1130,11 @@ export async function sendMediaToDingTalk(params: {
         const mergeMd =
           config.messageImageMd === true && caption.length > 0 && imgsInCaption >= 1;
 
-        console.log(
-          `[DingTalk][LocalImage] sendMedia 图片策略 | messageImageMd=${config.messageImageMd === true} imgsInCaption=${imgsInCaption} mergeMd=${mergeMd} remote=${isRemoteHttpUrl(mediaUrl)}`,
-        );
+        if (isDingtalkDebug()) {
+          console.log(
+            `[DingTalk][LocalImage] sendMedia 图片策略 | messageImageMd=${config.messageImageMd === true} imgsInCaption=${imgsInCaption} mergeMd=${mergeMd} remote=${isRemoteHttpUrl(mediaUrl)}`,
+          );
+        }
 
         if (mergeMd) {
           const combined = `${caption}\n\n![](${mediaId})`;
@@ -1250,7 +1255,9 @@ export async function sendMediaToDingTalk(params: {
       if (cleanupTemp) {
         try {
           _fs.unlinkSync(cleanupTemp);
-          console.log(`[DingTalk][RemoteMedia] 已清理临时文件 | ${cleanupTemp}`);
+          if (isDingtalkDebug()) {
+            console.log(`[DingTalk][RemoteMedia] 已清理临时文件 | ${cleanupTemp}`);
+          }
         } catch {
           // ignore
         }
@@ -1392,9 +1399,11 @@ async function sendProactiveInternal(
           undefined,
           skipInputingWalk,
         );
-        console.log(
-          `[DingTalk][MessageCard] AI Card 发送成功 | outTrack=${card.cardInstanceId} tpl=${cardTemplateId || "default"} skipInputing=${skipInputingWalk}`,
-        );
+        if (isDingtalkDebug()) {
+          console.log(
+            `[DingTalk][MessageCard] AI Card 发送成功 | outTrack=${card.cardInstanceId} tpl=${cardTemplateId || "default"} skipInputing=${skipInputingWalk}`,
+          );
+        }
         return {
           ok: true,
           cardInstanceId: card.cardInstanceId,
@@ -1455,12 +1464,17 @@ async function sendProactiveInternal(
       return { ok: false, error: payload.error, usedAICard: false };
     }
 
-    logMediaIdTrace(
-      "API出站",
-      content,
-      `msgKey=${payload.msgKey} type=${msgType}`,
-      true,
-    );
+    // 仅有 MD 图或调试时追踪（纯文本出站不再刷屏）
+    if (
+      /!\[[^\]]*\]\([^)]+\)/.test(content || "") ||
+      isDingtalkDebug()
+    ) {
+      logMediaIdTrace(
+        "API出站",
+        content,
+        `msgKey=${payload.msgKey} type=${msgType}`,
+      );
+    }
 
     const body: any = {
       robotCode: String(config.clientId),

package/src/utils/background-work.ts

@@ -0,0 +1,65 @@
+/**
+ * 后台任务引用计数。
+ *
+ * 钉钉 WS 回调只「入队」后就返回，真正的 AI 跑在 sessionQueues 后台 Promise 里。
+ * 若只在 WS 回调里 markMessageProcessingStart/End，会在入队后立刻 End，
+ * 长任务（尤其 503 重试）期间心跳超时会触发幽灵重连 → 后续消息「网关没反应」。
+ *
+ * 用法：session 队列任务创建后 trackBackgroundWork(taskPromise)。
+ * connection 层订阅计数变化，在 count>0 时保持处理中 keepAlive。
+ */
+
+import { isDingtalkDebug } from "./logger.ts";
+
+type CountListener = (count: number) => void;
+
+let activeCount = 0;
+const listeners = new Set<CountListener>();
+
+export function getActiveBackgroundWorkCount(): number {
+  return activeCount;
+}
+
+/** 订阅计数变化；返回取消订阅函数 */
+export function onBackgroundWorkCountChange(listener: CountListener): () => void {
+  listeners.add(listener);
+  return () => {
+    listeners.delete(listener);
+  };
+}
+
+function notify(): void {
+  for (const listener of listeners) {
+    try {
+      listener(activeCount);
+    } catch {
+      // ignore listener errors
+    }
+  }
+}
+
+/**
+ * 跟踪一个后台 Promise：开始 +1，settle -1。
+ * 重复 settle 安全（只减一次）。
+ */
+export function trackBackgroundWork(
+  work: Promise<unknown>,
+  label?: string,
+): void {
+  activeCount += 1;
+  notify();
+  let settled = false;
+  const done = () => {
+    if (settled) return;
+    settled = true;
+    activeCount = Math.max(0, activeCount - 1);
+    notify();
+  };
+  void work.then(done, done);
+  if (label && typeof process !== "undefined" && isDingtalkDebug()) {
+    console.log(`[DingTalk][bgWork] +1 label=${label} count=${activeCount}`);
+    void work.finally(() => {
+      console.log(`[DingTalk][bgWork] -1 label=${label} count=${activeCount}`);
+    });
+  }
+}

package/src/utils/logger.ts

@@ -1,8 +1,24 @@
 /**
  * 日志工具模块
- * 根据 debug 配置控制日志输出
+ * 根据配置里的 debug 控制日志输出（无需环境变量）
  */
 
+/** 任一账号/连接开启过 debug 后为 true；默认静默 */
+let pluginDebugEnabled = false;
+
+/**
+ * 设置插件全局 debug（由配置 `debug: true` 驱动）
+ * 仅在 true 时打开；避免多账号中未开 debug 的账号把开关关掉。
+ */
+export function setDingtalkDebug(enabled: boolean): void {
+  if (enabled) pluginDebugEnabled = true;
+}
+
+/** 是否输出图片/引用/队列等详细诊断日志 */
+export function isDingtalkDebug(): boolean {
+  return pluginDebugEnabled;
+}
+
 /**
  * 创建日志记录器
  * @param debug - 是否启用 debug 模式
@@ -10,6 +26,8 @@
  * @returns 日志记录器对象
  */
 export function createLogger(debug: boolean = false, prefix: string = '') {
+  if (debug) setDingtalkDebug(true);
+
   const logger = {
     /**
      * 打印 info 级别日志
@@ -73,6 +91,9 @@ export function createLogger(debug: boolean = false, prefix: string = '') {
  * @param prefix - 日志前缀
  * @returns 日志记录器对象
  */
-export function createLoggerFromConfig(config: { debug?: boolean } | undefined | null, prefix: string = '') {
+export function createLoggerFromConfig(
+  config: { debug?: boolean } | undefined | null,
+  prefix: string = '',
+) {
   return createLogger(!!config?.debug, prefix);
 }

package/dist/card-content-cache-Dwd8HICP.mjs

@@ -1,2 +0,0 @@
-import { r as rememberCardContent } from "./card-content-cache-CYUzCaQJ.mjs";
-export { rememberCardContent };

package/dist/chunk-upload-DaLXXZH3.mjs

@@ -1,2 +0,0 @@
-import { a as uploadLargeFileByChunks } from "./chunk-upload-BBQgGtcZ.mjs";
-export { uploadLargeFileByChunks };