@dingtalk-real-ai/dingtalk-connector 0.8.6 → 0.8.7

package/CHANGELOG.md

@@ -5,6 +5,21 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.8.7] - 2026-03-26
+
+### 修复 / Fixes
+- 🐛 **账号 ID 大小写敏感修复** - 修复 `normalizeAccountId` 函数强制将账号 ID 转为小写（`.toLowerCase()`）导致驼峰命名账号（如 `zhizaoDashuIP`）无法匹配配置的问题。现在账号 ID 仅做 `trim()` 处理，保留原始大小写，与配置文件中的 key 严格匹配  
+  **Account ID case-sensitivity fix** - Fixed `normalizeAccountId` forcibly lowercasing account IDs, which caused camelCase account IDs (e.g., `zhizaoDashuIP`) to fail configuration lookup. Account IDs are now only trimmed, preserving original casing for strict matching against config keys
+
+- 🐛 **WebSocket 连接代理控制统一** - 修复 `src/core/connection.ts` 中 WebSocket 连接未遵循 `DINGTALK_FORCE_PROXY` 环境变量的问题，现在与 HTTP 请求保持一致的代理控制逻辑  
+  **Unified proxy control for WebSocket connections** - Fixed WebSocket connections not respecting the `DINGTALK_FORCE_PROXY` environment variable; proxy control is now consistent with HTTP requests
+
+- 🐛 **媒体下载代理控制统一** - 修复 `src/core/message-handler.ts` 中图片/文件下载时代理配置与 HTTP 客户端不一致的问题，确保所有媒体下载请求统一遵循代理控制策略  
+  **Unified proxy control for media downloads** - Fixed inconsistent proxy configuration for image/file downloads; all media download requests now follow the unified proxy control policy
+
+- 🐛 **多账号消息去重误判** - 修复多账号（多机器人）场景下，同一条群消息 @多个机器人时，第二个机器人因去重缓存未按账号隔离，误将消息判定为重复而跳过处理的问题。`checkAndMarkDingtalkMessage` 的去重 key 现在带有 `accountId` 前缀，不同机器人账号的去重缓存完全隔离  
+  **Multi-account message deduplication false positive** - Fixed an issue where a group message mentioning multiple bots caused the second bot to skip processing due to a shared deduplication cache. The deduplication key now includes an `accountId` prefix, fully isolating each bot's cache
+
 ## [0.8.6] - 2026-03-24
 
 ### 改进 / Improvements

package/install-npm.sh

@@ -0,0 +1,167 @@
+#!/usr/bin/env bash
+# =============================================================================
+# install-npm.sh
+# 将 dingtalk-connector 插件从本地 git 路径安装切换到 npm 包安装
+#
+# 流程：
+#   1. 备份当前 openclaw.json 配置文件
+#   2. 写入最小化干净配置（让 openclaw plugins 命令能正常运行）
+#   3. 卸载旧插件（清除本地路径安装记录）
+#   4. 从 npm 安装最新版插件
+#   5. 恢复备份的配置文件（保留用户的所有业务配置）
+# =============================================================================
+
+set -euo pipefail
+
+# ============ 常量 ============
+OPENCLAW_CONFIG="$HOME/.openclaw/openclaw.json"
+PLUGIN_NAME="dingtalk-connector"
+NPM_PACKAGE="@dingtalk-real-ai/dingtalk-connector"
+TIMESTAMP=$(date +%Y%m%d_%H%M%S)
+BACKUP_FILE="${OPENCLAW_CONFIG}.migrate_backup.${TIMESTAMP}"
+
+# ============ 颜色输出 ============
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+YELLOW='\033[1;33m'
+BLUE='\033[0;34m'
+NC='\033[0m' # No Color
+
+log_info()    { echo -e "${BLUE}[INFO]${NC}  $*"; }
+log_success() { echo -e "${GREEN}[OK]${NC}    $*"; }
+log_warn()    { echo -e "${YELLOW}[WARN]${NC}  $*"; }
+log_error()   { echo -e "${RED}[ERROR]${NC} $*" >&2; }
+
+# ============ 错误恢复 ============
+# 如果脚本中途失败，自动恢复备份
+restore_on_error() {
+  if [[ -f "$BACKUP_FILE" ]]; then
+    log_warn "脚本异常退出，正在恢复备份配置..."
+    cp "$BACKUP_FILE" "$OPENCLAW_CONFIG"
+    log_warn "已恢复备份: $BACKUP_FILE"
+  fi
+}
+trap restore_on_error ERR
+
+# ============ 前置检查 ============
+echo ""
+echo "============================================================"
+echo "  DingTalk Connector — 切换到 npm 安装"
+echo "============================================================"
+echo ""
+
+if [[ ! -f "$OPENCLAW_CONFIG" ]]; then
+  log_error "找不到 OpenClaw 配置文件: $OPENCLAW_CONFIG"
+  exit 1
+fi
+
+if ! command -v openclaw &>/dev/null; then
+  log_error "找不到 openclaw 命令，请确认已安装 OpenClaw CLI"
+  exit 1
+fi
+
+# ============ 步骤 1：备份配置文件 ============
+log_info "步骤 1/5：备份当前配置文件..."
+cp "$OPENCLAW_CONFIG" "$BACKUP_FILE"
+log_success "备份已保存至: $BACKUP_FILE"
+
+# ============ 步骤 2：写入最小化干净配置 ============
+log_info "步骤 2/5：写入临时干净配置（用于执行插件命令）..."
+
+# 提取当前配置中 plugins 以外的所有字段，保留业务配置结构
+# 同时写入一个空的 plugins 配置，让 openclaw 能正常初始化
+python3 - <<'PYEOF'
+import json, sys, os
+
+config_path = os.path.expanduser("~/.openclaw/openclaw.json")
+
+with open(config_path, "r") as f:
+    original = json.load(f)
+
+# 保留所有非 plugins 字段，plugins 置为空（让 openclaw 重新初始化）
+clean_config = {k: v for k, v in original.items() if k != "plugins"}
+clean_config["plugins"] = {
+    "load": {},
+    "entries": {},
+    "allow": [],
+    "installs": {}
+}
+
+with open(config_path, "w") as f:
+    json.dump(clean_config, f, indent=2)
+
+print("  干净配置写入完成")
+PYEOF
+
+log_success "临时干净配置写入完成"
+
+# ============ 步骤 3：卸载旧插件 ============
+log_info "步骤 3/5：卸载旧版插件 (${PLUGIN_NAME})..."
+if openclaw plugins uninstall "$PLUGIN_NAME" --yes 2>&1 | grep -v "^$"; then
+  log_success "旧插件卸载完成"
+else
+  log_warn "卸载命令返回非零，可能插件本来就未安装，继续执行..."
+fi
+
+# ============ 步骤 4：从 npm 安装最新版插件 ============
+log_info "步骤 4/5：从 npm 安装最新版插件 (${NPM_PACKAGE})..."
+echo ""
+openclaw plugins install "$NPM_PACKAGE"
+echo ""
+log_success "npm 插件安装完成"
+
+# ============ 步骤 5：恢复备份配置（保留业务配置） ============
+log_info "步骤 5/5：将新安装的插件信息合并回原始业务配置..."
+
+python3 - <<'PYEOF'
+import json, os
+
+config_path = os.path.expanduser("~/.openclaw/openclaw.json")
+import glob
+backup_files = sorted(glob.glob(config_path + ".migrate_backup.*"))
+backup_path = backup_files[-1]  # 取最新的备份
+
+with open(config_path, "r") as f:
+    new_config = json.load(f)
+
+with open(backup_path, "r") as f:
+    original_config = json.load(f)
+
+# 策略：以原始业务配置为基础，只替换 plugins.installs 为新安装的结果
+# 这样保留了用户所有的 channels、agents、bindings 等业务配置
+merged = dict(original_config)
+merged["plugins"] = dict(original_config.get("plugins", {}))
+
+# 用新安装的 installs 记录覆盖旧的（包含新的 npm source 信息）
+new_installs = new_config.get("plugins", {}).get("installs", {})
+if new_installs:
+    merged["plugins"]["installs"] = new_installs
+    # 同步更新 entries 和 allow（保留原有的 enabled 状态）
+    for plugin_id in new_installs:
+        if plugin_id not in merged["plugins"].get("entries", {}):
+            merged["plugins"].setdefault("entries", {})[plugin_id] = {"enabled": True}
+        if plugin_id not in merged["plugins"].get("allow", []):
+            merged["plugins"].setdefault("allow", []).append(plugin_id)
+
+with open(config_path, "w") as f:
+    json.dump(merged, f, indent=2)
+
+print(f"  已合并配置，新插件安装信息:")
+for plugin_id, install_info in new_installs.items():
+    print(f"    - {plugin_id}: {install_info.get('spec', 'unknown')} (source: {install_info.get('source', 'unknown')})")
+PYEOF
+
+log_success "配置合并完成"
+
+# ============ 完成 ============
+echo ""
+echo "============================================================"
+log_success "迁移完成！"
+echo ""
+echo "  备份文件: $BACKUP_FILE"
+echo "  如需回滚: cp \"$BACKUP_FILE\" \"$OPENCLAW_CONFIG\""
+echo ""
+echo "  下一步：重启 OpenClaw Gateway 使新插件生效"
+echo "    openclaw gateway --force"
+echo "============================================================"
+echo ""

package/openclaw.plugin.json

@@ -1,7 +1,7 @@
 {
   "id": "dingtalk-connector",
   "name": "DingTalk Channel",
-  "version": "0.8.6",
+  "version": "0.8.7",
   "description": "DingTalk (钉钉) messaging channel via Stream mode with AI Card streaming",
   "author": "DingTalk Real Team",
   "main": "index.ts",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dingtalk-real-ai/dingtalk-connector",
-  "version": "0.8.6",
+  "version": "0.8.7",
   "description": "DingTalk (钉钉) channel connector — Stream mode with AI Card streaming",
   "main": "index.ts",
   "type": "module",

package/src/core/connection.ts

@@ -100,15 +100,26 @@ export async function monitorSingleAccount(
   logger.info(`Initializing with clientId: ${clientIdStr.substring(0, 8)}...`);
   logger.info(`WebSocket keepAlive: false (using application-layer heartbeat)`);
 
-  // 🔧 修复代理问题：禁用 axios 的代理配置
-  // 问题：dingtalk-stream SDK 内部使用 axios，会被系统 PAC 文件影响
-  // 解决：在导入 dingtalk-stream 之前，先导入 axios 并禁用全局代理
-  // 注意：这会影响 dingtalk-stream SDK 内部的 axios，与 src/utils/http-client.ts 是两个不同的配置
+  // 🔧 配置 dingtalk-stream SDK 的代理策略
+  //
+  // dingtalk-stream SDK 内部使用 axios 发起 HTTP 请求（获取 WebSocket endpoint）。
+  // 策略与 src/utils/http-client.ts 保持一致：
+  //   - 默认禁用代理：避免阿里内网 PAC 文件将 *.dingtalk.com 路由到内网代理，
+  //     导致外网环境连接超时。
+  //   - DINGTALK_FORCE_PROXY=true：保留系统代理，供需要通过代理访问外网的内网环境使用。
+  //
+  // 注意：这里修改的是 axios 全局默认值，会影响 dingtalk-stream SDK 内部的 axios 实例。
+  // src/utils/http-client.ts 中的专用实例已在创建时单独配置，不受此处影响。
   try {
     const axios = (await import("axios")).default;
     if (axios.defaults) {
-      axios.defaults.proxy = false; // 禁用全局代理
-      logger.debug(`已禁用 axios 全局代理配置（用于 dingtalk-stream SDK）`);
+      const shouldDisableProxy = process.env.DINGTALK_FORCE_PROXY !== 'true';
+      if (shouldDisableProxy) {
+        axios.defaults.proxy = false;
+        logger.debug(`已禁用 axios 全局代理（dingtalk-stream SDK），如需代理请设置 DINGTALK_FORCE_PROXY=true`);
+      } else {
+        logger.debug(`保留系统代理配置（DINGTALK_FORCE_PROXY=true），dingtalk-stream SDK 将通过代理连接`);
+      }
     }
   } catch (err) {
     logger.warn(`无法配置 axios 代理设置: ${err}`);
@@ -491,7 +502,7 @@ export async function monitorSingleAccount(
       // 协议层去重（headers.messageId）：拦截同一次投递的重复回调
       // 注意：业务层去重（data.msgId）在 JSON 解析后执行，两层合并在 checkAndMarkDingtalkMessage 中
       // 此处仅做协议层的快速预检，避免不必要的 JSON 解析
-      if (messageId && checkAndMarkDingtalkMessage(messageId, undefined)) {
+      if (messageId && checkAndMarkDingtalkMessage(accountId, messageId, undefined)) {
         processedCount++;
         logger.warn(`⚠️ 检测到重复消息（协议层），跳过处理：messageId=${messageId} (${processedCount}/${receivedCount})`);
         logger.info(`========== 消息处理结束（重复） ==========\n`);
@@ -545,12 +556,6 @@ export async function monitorSingleAccount(
         // 钉钉重发时 headers.messageId 是新值，但 data.msgId 不变，
         // checkAndMarkDingtalkMessage 会命中 data.msgId 并返回 true 拦截重发。
         const businessMsgId = data.msgId;
-        if (checkAndMarkDingtalkMessage(undefined, businessMsgId)) {
-          processedCount++;
-          logger.warn(`⚠️ 检测到钉钉服务端重发消息，跳过处理：msgId=${businessMsgId} (${processedCount}/${receivedCount})`);
-          logger.info(`========== 消息处理结束（业务层去重） ==========\n`);
-          return;
-        }
 
         // 记录消息内容（简化版，避免过长）
         let contentPreview = "N/A";

package/src/core/message-handler.ts

@@ -62,7 +62,7 @@ import { QUEUE_BUSY_ACK_PHRASES } from "../utils/constants.ts";
 import { createDingtalkReplyDispatcher, normalizeSlashCommand } from "../reply-dispatcher.ts";
 import { getDingtalkRuntime } from "../runtime.ts";
 import { dingtalkHttp } from '../utils/http-client.ts';
-import { createLoggerFromConfig } from '../utils/logger.ts';
+import { createLoggerFromConfig } from '../utils/index.ts';
 import * as fs from 'fs';
 import * as path from 'path';
 import * as os from 'os';
@@ -1033,47 +1033,23 @@ export async function handleDingTalkMessageInternal(params: HandleMessageParams)
     });
 
     // 使用 SDK 的 dispatchReplyFromConfig
-    log?.info?.(`调用 withReplyDispatcher，asyncMode=${asyncMode}`);
-    log?.info?.(`准备调用 withReplyDispatcher...`);
-    
-    let dispatchResult;
-    try {
-      dispatchResult = await core.channel.reply.withReplyDispatcher({
-        dispatcher,
-        onSettled: () => {
-          log?.info?.(`onSettled 被调用`);
-          markDispatchIdle();
-        },
-        run: async () => {
-          log?.info?.(`run 被调用，开始 dispatchReplyFromConfig`);
-          log?.info?.(`ctxPayload.SessionKey=${ctxPayload.SessionKey}`);
-          log?.info?.(`ctxPayload.Body 长度=${ctxPayload.Body?.length || 0}`);
-          log?.info?.(`replyOptions keys=${Object.keys(replyOptions).join(',')}`);
-          
-          const result = await core.channel.reply.dispatchReplyFromConfig({
-            ctx: ctxPayload,
-            cfg,
-            dispatcher,
-            replyOptions,
-          });
-          
-          log?.info?.(`dispatchReplyFromConfig 返回: queuedFinal=${result.queuedFinal}, counts=${JSON.stringify(result.counts)}`);
-          return result;
-        },
-      });
-      log?.info?.(`withReplyDispatcher 返回成功`);
-    } catch (dispatchErr: any) {
-      log?.error?.(`withReplyDispatcher 抛出异常: ${dispatchErr?.message || dispatchErr}`);
-      log?.error?.(`异常堆栈: ${dispatchErr?.stack || 'no stack'}`);
-      log?.error?.(`消息处理异常，但不阻塞后续消息: ${dispatchErr?.message || dispatchErr}`);
-
-      // ⚠️ 不要直接 throw，避免阻塞后续消息处理
-      // 记录错误后继续执行，确保后续消息能正常处理
-      dispatchResult = { queuedFinal: false, counts: { final: 0, partial: 0, tool: 0 } };
-    }
-    
+    const dispatchResult = await core.channel.reply.withReplyDispatcher({
+      dispatcher,
+      onSettled: () => {
+        markDispatchIdle();
+      },
+      run: async () => {
+        const result = await core.channel.reply.dispatchReplyFromConfig({
+          ctx: ctxPayload,
+          cfg,
+          dispatcher,
+          replyOptions,
+        });
+        return result;
+      },
+    });
+
     const { queuedFinal, counts } = dispatchResult;
-    log?.info?.(`SDK dispatch 完成: queuedFinal=${queuedFinal}, replies=${counts.final}, asyncMode=${asyncMode}`);
 
     // ===== 异步模式：主动推送最终结果 =====
     if (asyncMode) {

package/src/sdk/helpers.ts

@@ -17,10 +17,15 @@ export const DEFAULT_ACCOUNT_ID = "__default__" as const;
 
 /**
  * 规范化账号 ID
+ *
+ * 注意：账号 ID 保留原始大小写，仅做 trim 处理。
+ * 不做 toLowerCase，因为配置文件中的 accounts key 是大小写敏感的，
+ * 如 "zhizaoDashuIP" 与 "zhizaodashuip" 是不同的账号。
+ * 特殊值 "default"（不区分大小写）和空字符串映射到 DEFAULT_ACCOUNT_ID。
  */
 export function normalizeAccountId(accountId: string): string {
-  const trimmed = accountId.trim().toLowerCase();
-  if (trimmed === "default" || trimmed === "") {
+  const trimmed = accountId.trim();
+  if (trimmed.toLowerCase() === "default" || trimmed === "") {
     return DEFAULT_ACCOUNT_ID;
   }
   return trimmed;

package/src/services/media/common.ts

@@ -4,6 +4,9 @@
 
 import * as fs from 'fs';
 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 { createLogger } from '../../utils/logger.ts';
 import { CHUNK_CONFIG } from './chunk-upload.ts';
 import { dingtalkOapiHttp, dingtalkUploadHttp } from '../../utils/http-client.ts';
@@ -76,8 +79,6 @@ export async function uploadMediaToDingTalk(
   );
   
   try {
-    const FormData = (await import('form-data')).default;
-
     const absPath = toLocalPath(filePath);
     log?.info?.(`检查文件是否存在：${absPath}`);
     if (!fs.existsSync(absPath)) {

package/src/utils/utils-legacy.ts

@@ -256,26 +256,37 @@ export function markMessageProcessed(messageId: string): void {
  *   1. 协议层去重（headers.messageId）：拦截同一次投递的重复回调
  *   2. 业务层去重（data.msgId）：拦截 ~60 秒后服务端因未收到业务回复而触发的重发
  *
+ * 重要：key 必须带 accountId 前缀，避免多账号（多机器人）场景下，
+ * 同一条群消息 @多个机器人时，不同机器人收到相同 msgId 导致误判为重复消息。
+ *
+ * @param accountId         - 当前账号 ID（用于命名空间隔离，防止多账号误判）
  * @param protocolMessageId - res.headers.messageId（WebSocket 协议层投递 ID）
  * @param businessMsgId     - data.msgId（钉钉业务层消息 ID，来自 JSON.parse(res.data).msgId）
  * @returns true 表示消息已处理过（应跳过），false 表示首次处理（已标记为已处理）
  */
 export function checkAndMarkDingtalkMessage(
+  accountId: string,
   protocolMessageId: string | undefined,
   businessMsgId: string | undefined,
 ): boolean {
+  // 加 accountId 前缀，确保不同机器人账号的去重缓存互相隔离
+  // 场景：群聊 @多个机器人时，钉钉推送给每个机器人的消息 msgId 相同，
+  // 若不隔离，第二个机器人会被误判为重复消息而跳过处理。
+  const scopedProtocolId = protocolMessageId ? `${accountId}:${protocolMessageId}` : undefined;
+  const scopedBusinessId = businessMsgId ? `${accountId}:${businessMsgId}` : undefined;
+
   // 先完整检查两个 ID，再决定是否标记
   // 不能提前 return，否则命中去重的那条路径会漏掉对另一个 ID 的标记
-  const isProtocolDuplicate = protocolMessageId ? isMessageProcessed(protocolMessageId) : false;
-  const isBusinessDuplicate = businessMsgId ? isMessageProcessed(businessMsgId) : false;
+  const isProtocolDuplicate = scopedProtocolId ? isMessageProcessed(scopedProtocolId) : false;
+  const isBusinessDuplicate = scopedBusinessId ? isMessageProcessed(scopedBusinessId) : false;
 
   if (isProtocolDuplicate || isBusinessDuplicate) {
     return true;
   }
 
   // 首次处理：同时标记两个 ID，确保后续任意一个 ID 都能命中去重
-  if (protocolMessageId) markMessageProcessed(protocolMessageId);
-  if (businessMsgId) markMessageProcessed(businessMsgId);
+  if (scopedProtocolId) markMessageProcessed(scopedProtocolId);
+  if (scopedBusinessId) markMessageProcessed(scopedBusinessId);
 
   return false;
 }