@jeik/dingtalk-connector 0.8.26 → 0.8.27-fix2

package/dist/entry-bundled.mjs

@@ -23,7 +23,7 @@ var entry_bundled_default = defineBundledChannelEntry({
 		exportName: "setDingtalkRuntime"
 	},
 	async registerFull(api) {
-		const { registerGatewayMethods } = await import("./gateway-methods-BQd4E0Sk.mjs");
+		const { registerGatewayMethods } = await import("./gateway-methods-UECIpwQ9.mjs");
 		registerGatewayMethods(api);
 	}
 });

package/dist/{gateway-methods--aKsyMs-.mjs → gateway-methods-CfTm9PW_.mjs}

@@ -1,7 +1,7 @@
 import { a as resolveDingtalkAccount, t as listDingtalkAccountIds } from "./accounts-BAzdqkAV.mjs";
 import { t as dingtalkHttp } from "./http-client-DFWZgO1n.mjs";
 import { r as getAccessToken, t as DINGTALK_API } from "./utils-CIfI_3Jh.mjs";
-import { c as prepareMultiBotMentions, d as finishAICard, i as sendProactive, s as buildBotMentionTable } from "./messaging-WleKf54h.mjs";
+import { c as prepareMultiBotMentions, d as finishAICard, i as sendProactive, s as buildBotMentionTable } from "./messaging-Dvlan9M0.mjs";
 import { d as getUnionId, h as recallEmotionReply } from "./utils-legacy-DQ3HeGHh.mjs";
 //#region src/docs.ts
 var DingtalkDocsClient = class {

package/dist/gateway-methods-UECIpwQ9.mjs

@@ -0,0 +1,2 @@
+import { t as registerGatewayMethods } from "./gateway-methods-CfTm9PW_.mjs";
+export { registerGatewayMethods };

package/dist/index.mjs

@@ -1,5 +1,5 @@
-import { a as initDingtalkPluginConfigSchema, i as dingtalkPlugin, n as setDingtalkRuntime } from "./runtime-BdF5tr4a.mjs";
-import { t as registerGatewayMethods } from "./gateway-methods--aKsyMs-.mjs";
+import { a as initDingtalkPluginConfigSchema, i as dingtalkPlugin, n as setDingtalkRuntime } from "./runtime-BGp1YsZg.mjs";
+import { t as registerGatewayMethods } from "./gateway-methods-CfTm9PW_.mjs";
 //#region index.ts
 /**
 * 检测同一 plugin id 在多个路径被加载的情况。

package/dist/{message-handler-DLWxae1K.mjs → message-handler-a7kE1IEx.mjs}

@@ -1,9 +1,9 @@
 import { a as resolveDingtalkAccount } from "./accounts-BAzdqkAV.mjs";
-import { r as CHANNEL_ID, t as getDingtalkRuntime } from "./runtime-BdF5tr4a.mjs";
+import { r as CHANNEL_ID, t as getDingtalkRuntime } from "./runtime-BGp1YsZg.mjs";
 import { n as createLoggerFromConfig } from "./logger-mZ9OSbmD.mjs";
 import { t as dingtalkHttp } from "./http-client-DFWZgO1n.mjs";
 import { i as getOapiAccessToken } from "./utils-CIfI_3Jh.mjs";
-import { S as finalClean, _ as FINAL_TAG, a as sendTextMessage, b as estimateTokens, d as finishAICard, g as unregisterActiveCard, h as streamAICard, i as sendProactive, m as registerActiveCard, p as isQpsLimitError, r as sendMessage, t as sendMarkdownMessage, u as createAICardForTarget, v as PROCESS_TAG, x as extractFinal, y as displayClean } from "./messaging-WleKf54h.mjs";
+import { S as finalClean, _ as FINAL_TAG, a as sendTextMessage, b as estimateTokens, d as finishAICard, g as unregisterActiveCard, h as streamAICard, i as sendProactive, m as registerActiveCard, p as isQpsLimitError, r as sendMessage, t as sendMarkdownMessage, u as createAICardForTarget, v as PROCESS_TAG, x as extractFinal, y as displayClean } from "./messaging-Dvlan9M0.mjs";
 import { a as QUEUE_BUSY_ACK_PHRASES, n as normalizeSlashCommand, t as buildSessionContext } from "./session-DJ4jYqPv.mjs";
 import { c as formatSenderRoles, f as getUserProfile, h as recallEmotionReply, l as getAccessToken, o as formatHiredDateShanghai, r as addEmotionReply, s as formatSenderDisplayLabel, t as DINGTALK_API, u as getOapiAccessToken$1 } from "./utils-legacy-DQ3HeGHh.mjs";
 import "./chunk-upload-BBQgGtcZ.mjs";
@@ -2265,11 +2265,19 @@ async function handleDingTalkMessageInternal(params) {
 		}
 	} catch (err) {
 		log?.error?.(`SDK dispatch 失败: ${err.message}`);
-		try {
+		const errorText = matchModelErrorText(err.message, { includeCatchAll: true }) ?? `⚠️ 抱歉，处理请求时出错: ${err.message}`;
+		let cardSuccess = false;
+		if (earlyCard) try {
+			await finishAICard(earlyCard, errorText, config, log, void 0, void 0, data.conversationId);
+			cardSuccess = true;
+		} catch (cardErr) {
+			log?.error?.(`更新错误卡片失败: ${cardErr.message}`);
+		}
+		if (!cardSuccess) try {
 			const token = await getAccessToken(config);
 			const body = {
 				msgtype: "text",
-				text: { content: `抱歉，处理请求时出错: ${err.message}` }
+				text: { content: errorText }
 			};
 			if (!isDirect) body.at = {
 				atUserIds: [senderId],

package/dist/{messaging-WleKf54h.mjs → messaging-Dvlan9M0.mjs}

@@ -429,8 +429,12 @@ async function finishAICard(card, content, config, log, contentVar, skipInputing
 				return;
 			} catch (retryErr) {
 				log?.error?.(`[DingTalk][AICard] FINISHED 重试失败：${retryErr.message}`);
+				throw retryErr;
 			}
-		} else log?.error?.(`[DingTalk][AICard] FINISHED 更新失败：${err.message}`);
+		} else {
+			log?.error?.(`[DingTalk][AICard] FINISHED 更新失败：${err.message}`);
+			throw err;
+		}
 	}
 }
 //#endregion

package/dist/{runtime-BdF5tr4a.mjs → runtime-BGp1YsZg.mjs}

@@ -3,7 +3,7 @@ import { a as resolveDingtalkAccount, c as addWildcardAllowFrom, d as hasConfigu
 import { t as createLogger } from "./logger-mZ9OSbmD.mjs";
 import { t as dingtalkHttp } from "./http-client-DFWZgO1n.mjs";
 import "./utils-CIfI_3Jh.mjs";
-import { S as finalClean, f as getActiveCardForConversation, n as sendMediaToDingTalk, o as sendTextToDingTalk } from "./messaging-WleKf54h.mjs";
+import { S as finalClean, f as getActiveCardForConversation, n as sendMediaToDingTalk, o as sendTextToDingTalk } from "./messaging-Dvlan9M0.mjs";
 import { createRequire } from "node:module";
 import { z, z as z$1 } from "zod";
 //#region src/secret-input.ts
@@ -955,7 +955,7 @@ async function monitorDingtalkProvider(opts = {}) {
 	const log = createLogger(cfg.channels?.["dingtalk-connector"]?.debug ?? false);
 	const [accountsModule, monitorAccountModule, monitorSingleModule] = await Promise.all([
 		import("./accounts-BQptOmgB.mjs"),
-		import("./message-handler-DLWxae1K.mjs"),
+		import("./message-handler-a7kE1IEx.mjs"),
 		import("./connection-fc6B4z4G.mjs")
 	]);
 	const { resolveDingtalkAccount, listEnabledDingtalkAccounts } = accountsModule;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jeik/dingtalk-connector",
-  "version": "0.8.26",
+  "version": "0.8.27-fix2",
   "description": "OpenClaw DingTalk channel plugin (fork) | 钉钉 OpenClaw 渠道插件（fork 自官方，含标记/卡片渲染修复）",
   "type": "module",
   "exports": {

package/src/core/message-handler.ts

@@ -56,13 +56,13 @@ import {
   uploadAndReplaceFileMarkers
 } from "../services/media/index.ts";
 import { sendProactive, type AICardTarget } from "../services/messaging/index.ts";
-import { createAICardForTarget, streamAICard, registerActiveCard, type AICardInstance } from "../services/messaging/card.ts";
+import { createAICardForTarget, streamAICard, finishAICard, registerActiveCard, type AICardInstance } from "../services/messaging/card.ts";
 import {
   collectCardLookupIds,
   lookupCardContent,
 } from "../services/messaging/card-content-cache.ts";
 import { QUEUE_BUSY_ACK_PHRASES } from "../utils/constants.ts";
-import { createDingtalkReplyDispatcher } from "../reply-dispatcher.ts";
+import { createDingtalkReplyDispatcher, matchModelErrorText } from "../reply-dispatcher.ts";
 import { normalizeSlashCommand } from "../utils/session.ts";
 import { getDingtalkRuntime } from "../runtime.ts";
 import { dingtalkHttp } from '../utils/http-client.ts';
@@ -1906,20 +1906,36 @@ export async function handleDingTalkMessageInternal(params: HandleMessageParams)
   } catch (err: any) {
     log?.error?.(`SDK dispatch 失败: ${err.message}`);
     
-    // 降级：发送错误消息
-    try {
-      const token = await getAccessToken(config);
-      const body: any = { 
-        msgtype: 'text', 
-        text: { content: `抱歉，处理请求时出错: ${err.message}` } 
-      };
-      if (!isDirect) body.at = { atUserIds: [senderId], isAtAll: false };
-      
-      await dingtalkHttp.post(sessionWebhook, body, {
-        headers: { 'x-acs-dingtalk-access-token': token, 'Content-Type': 'application/json' },
-      });
-    } catch (fallbackErr: any) {
-      log?.error?.(`错误消息发送也失败: ${fallbackErr.message}`);
+    // 解析上游错误文本（例如 503 No available channel），匹配中文提示文案
+    const errorText = matchModelErrorText(err.message, { includeCatchAll: true }) ?? `⚠️ 抱歉，处理请求时出错: ${err.message}`;
+
+    // 如果已经建了 AI Card，则更新报错状态到 Card，避免停留在"正在召唤大模型"
+    let cardSuccess = false;
+    if (earlyCard) {
+      try {
+        await finishAICard(earlyCard, errorText, config, log, undefined, undefined, data.conversationId);
+        cardSuccess = true;
+      } catch (cardErr: any) {
+        log?.error?.(`更新错误卡片失败: ${cardErr.message}`);
+      }
+    }
+    
+    if (!cardSuccess) {
+      // 降级：发送错误文本消息
+      try {
+        const token = await getAccessToken(config);
+        const body: any = { 
+          msgtype: 'text', 
+          text: { content: errorText } 
+        };
+        if (!isDirect) body.at = { atUserIds: [senderId], isAtAll: false };
+        
+        await dingtalkHttp.post(sessionWebhook, body, {
+          headers: { 'x-acs-dingtalk-access-token': token, 'Content-Type': 'application/json' },
+        });
+      } catch (fallbackErr: any) {
+        log?.error?.(`错误消息发送也失败: ${fallbackErr.message}`);
+      }
     }
   }
 

package/src/reply-dispatcher.ts

@@ -239,7 +239,7 @@ const MODEL_ERROR_CATCH_ALL: [RegExp, string] = [/.{20,}/, MODEL_ERROR_GENERIC];
  * @param opts.includeCatchAll 为 true 时启用万能兜底
  * @returns 命中则返回中文提示，未命中返回 null
  */
-function matchModelErrorText(
+export function matchModelErrorText(
   source: string,
   opts?: { includeCatchAll?: boolean },
 ): string | null {

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/dist/gateway-methods-BQd4E0Sk.mjs

@@ -1,2 +0,0 @@
-import { t as registerGatewayMethods } from "./gateway-methods--aKsyMs-.mjs";
-export { registerGatewayMethods };