@mocrane/wecom 2026.3.8-4 → 2026.3.12

package/src/outbound.ts

@@ -4,9 +4,63 @@ import { sendText as sendAgentText, sendMedia as sendAgentMedia, uploadMedia } f
 import { resolveWecomAccount, resolveWecomAccountConflict, resolveWecomAccounts } from "./config/index.js";
 import { getWecomRuntime } from "./runtime.js";
 import { getWsClient, waitForWsConnection } from "./ws-adapter.js";
+import { uploadAndSendMediaBuffer } from "./media/index.js";
 
 import { resolveWecomTarget } from "./target.js";
 
+// ─── MIME 类型映射表（扩展名 → Content-Type）──────────────────────────
+
+const MIME_BY_EXT: Record<string, string> = {
+  jpg: "image/jpeg", jpeg: "image/jpeg", png: "image/png", gif: "image/gif",
+  webp: "image/webp", bmp: "image/bmp", mp3: "audio/mpeg", wav: "audio/wav",
+  amr: "audio/amr", mp4: "video/mp4", mov: "video/quicktime",
+  pdf: "application/pdf", doc: "application/msword",
+  docx: "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
+  xls: "application/vnd.ms-excel", xlsx: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+  ppt: "application/vnd.ms-powerpoint", pptx: "application/vnd.openxmlformats-officedocument.presentationml.presentation",
+  txt: "text/plain", csv: "text/csv", tsv: "text/tab-separated-values", md: "text/markdown", json: "application/json",
+  xml: "application/xml", yaml: "application/yaml", yml: "application/yaml",
+  zip: "application/zip", rar: "application/vnd.rar", "7z": "application/x-7z-compressed",
+  tar: "application/x-tar", gz: "application/gzip", tgz: "application/gzip",
+  rtf: "application/rtf", odt: "application/vnd.oasis.opendocument.text",
+};
+
+// ─── 共享的媒体加载逻辑 ────────────────────────────────────────────
+
+/**
+ * 从 URL 或本地文件路径加载媒体文件，返回 buffer、contentType、filename。
+ * 供 Bot WS 和 Agent 两种发送模式共用。
+ */
+async function loadMediaBuffer(mediaUrl: string): Promise<{
+  buffer: Buffer;
+  contentType: string;
+  filename: string;
+}> {
+  const isRemoteUrl = /^https?:\/\//i.test(mediaUrl);
+
+  if (isRemoteUrl) {
+    const res = await fetch(mediaUrl, { signal: AbortSignal.timeout(30_000) });
+    if (!res.ok) {
+      throw new Error(`Failed to download media: ${res.status}`);
+    }
+    const buffer = Buffer.from(await res.arrayBuffer());
+    const contentType = res.headers.get("content-type") || "application/octet-stream";
+    const urlPath = new URL(mediaUrl).pathname;
+    const filename = urlPath.split("/").pop() || "media";
+    return { buffer, contentType, filename };
+  }
+
+  // 本地文件路径
+  const fs = await import("node:fs/promises");
+  const path = await import("node:path");
+  const buffer = await fs.readFile(mediaUrl);
+  const filename = path.basename(mediaUrl);
+  const ext = path.extname(mediaUrl).slice(1).toLowerCase();
+  const contentType = MIME_BY_EXT[ext] || "application/octet-stream";
+  console.log(`[wecom-outbound] Reading local file: ${mediaUrl}, ext=${ext}, contentType=${contentType}`);
+  return { buffer, contentType, filename };
+}
+
 function resolveAgentConfigOrThrow(params: {
   cfg: ChannelOutboundContext["cfg"];
   accountId?: string | null;
@@ -166,8 +220,68 @@ export const wecomOutbound: ChannelOutboundAdapter = {
     };
   },
   sendMedia: async ({ cfg, to, text, mediaUrl, accountId }: ChannelOutboundContext) => {
-    // signal removed - not supported in current SDK
+    if (!mediaUrl) {
+      throw new Error("WeCom outbound requires mediaUrl.");
+    }
+
+    // ── Bot WebSocket 模式 ──
+    const resolvedAccount = resolveWecomAccount({ cfg, accountId });
+    const botAccount = resolvedAccount.bot;
+    if (botAccount?.connectionMode === "websocket" && botAccount.configured) {
+      const rawTo = typeof to === "string" ? to.trim().toLowerCase() : "";
+      // 如果目标是 Agent 会话（wecom-agent:），跳过 WS Bot，走 Agent outbound
+      if (!rawTo.startsWith("wecom-agent:")) {
+        const wsTarget = resolveWecomTarget(to);
+        const chatId = wsTarget?.touser || wsTarget?.chatid;
+        if (!chatId) {
+          throw new Error(`[wecom-outbound] Bot WS sendMedia 无法解析目标 chatId (to=${String(to)})`);
+        }
 
+        // 确保 WS 连接可用
+        let wsClient = getWsClient(botAccount.accountId);
+        if (!wsClient?.isConnected) {
+          console.log(`[wecom-outbound] Bot WS 未连接，等待重连... (accountId=${botAccount.accountId})`);
+          const reconnected = await waitForWsConnection(botAccount.accountId, 10_000);
+          if (!reconnected) {
+            throw new Error(`[wecom-outbound] Bot WS 等待重连超时，无法发送媒体 (accountId=${botAccount.accountId})`);
+          }
+          wsClient = getWsClient(botAccount.accountId);
+        }
+        if (!wsClient?.isConnected) {
+          throw new Error(`[wecom-outbound] Bot WS 重连后仍不可用 (accountId=${botAccount.accountId})`);
+        }
+
+        // 加载媒体并通过 WSClient 上传发送
+        const { buffer, contentType, filename } = await loadMediaBuffer(mediaUrl);
+        console.log(`[wecom-outbound] Bot WS sendMedia: chatId=${chatId} filename=${filename} contentType=${contentType} size=${buffer.length}`);
+
+        const result = await uploadAndSendMediaBuffer({
+          wsClient,
+          buffer,
+          contentType,
+          fileName: filename,
+          chatId,
+          log: (msg) => console.log(`[wecom-outbound] ${msg}`),
+          errorLog: (msg) => console.error(`[wecom-outbound] ${msg}`),
+        });
+
+        if (result.rejected) {
+          throw new Error(`WeCom Bot WS 媒体被拒绝: ${result.rejectReason}`);
+        }
+        if (!result.ok) {
+          throw new Error(`WeCom Bot WS 媒体发送失败: ${result.error}`);
+        }
+
+        console.log(`[wecom-outbound] Bot WS sendMedia 成功: type=${result.finalType}${result.downgraded ? ` (降级: ${result.downgradeNote})` : ""}`);
+        return {
+          channel: "wecom",
+          messageId: `ws-bot-media-${Date.now()}`,
+          timestamp: Date.now(),
+        };
+      }
+    }
+
+    // ── Agent 模式 ──
     const agent = resolveAgentConfigOrThrow({ cfg, accountId });
     const target = resolveWecomTarget(to);
     if (!target) {
@@ -180,52 +294,8 @@ export const wecomOutbound: ChannelOutboundAdapter = {
           `请改为发送给用户（userid / user:xxx），或由 Bot 模式在群内交付。`,
       );
     }
-    if (!mediaUrl) {
-      throw new Error("WeCom outbound requires mediaUrl.");
-    }
-
-    let buffer: Buffer;
-    let contentType: string;
-    let filename: string;
-
-    // 判断是 URL 还是本地文件路径
-    const isRemoteUrl = /^https?:\/\//i.test(mediaUrl);
 
-    if (isRemoteUrl) {
-      const res = await fetch(mediaUrl, { signal: AbortSignal.timeout(30000) });
-      if (!res.ok) {
-        throw new Error(`Failed to download media: ${res.status}`);
-      }
-      buffer = Buffer.from(await res.arrayBuffer());
-      contentType = res.headers.get("content-type") || "application/octet-stream";
-      const urlPath = new URL(mediaUrl).pathname;
-      filename = urlPath.split("/").pop() || "media";
-    } else {
-      // 本地文件路径
-      const fs = await import("node:fs/promises");
-      const path = await import("node:path");
-
-      buffer = await fs.readFile(mediaUrl);
-      filename = path.basename(mediaUrl);
-
-      // 根据扩展名推断 content-type
-      const ext = path.extname(mediaUrl).slice(1).toLowerCase();
-      const mimeTypes: Record<string, string> = {
-        jpg: "image/jpeg", jpeg: "image/jpeg", png: "image/png", gif: "image/gif",
-        webp: "image/webp", bmp: "image/bmp", mp3: "audio/mpeg", wav: "audio/wav",
-        amr: "audio/amr", mp4: "video/mp4", pdf: "application/pdf", doc: "application/msword",
-        docx: "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
-        xls: "application/vnd.ms-excel", xlsx: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
-        ppt: "application/vnd.ms-powerpoint", pptx: "application/vnd.openxmlformats-officedocument.presentationml.presentation",
-        txt: "text/plain", csv: "text/csv", tsv: "text/tab-separated-values", md: "text/markdown", json: "application/json",
-        xml: "application/xml", yaml: "application/yaml", yml: "application/yaml",
-        zip: "application/zip", rar: "application/vnd.rar", "7z": "application/x-7z-compressed",
-        tar: "application/x-tar", gz: "application/gzip", tgz: "application/gzip",
-        rtf: "application/rtf", odt: "application/vnd.oasis.opendocument.text",
-      };
-      contentType = mimeTypes[ext] || "application/octet-stream";
-      console.log(`[wecom-outbound] Reading local file: ${mediaUrl}, ext=${ext}, contentType=${contentType}`);
-    }
+    const { buffer, contentType, filename } = await loadMediaBuffer(mediaUrl);
 
     let mediaType: "image" | "voice" | "video" | "file" = "file";
     if (contentType.startsWith("image/")) mediaType = "image";

package/src/timeout.ts

@@ -0,0 +1,45 @@
+/**
+ * 超时控制工具模块
+ *
+ * 为异步操作提供统一的超时保护机制
+ */
+
+/**
+ * 为 Promise 添加超时保护
+ *
+ * @param promise - 原始 Promise
+ * @param timeoutMs - 超时时间（毫秒）
+ * @param message - 超时错误消息
+ * @returns 带超时保护的 Promise
+ */
+export function withTimeout<T>(
+  promise: Promise<T>,
+  timeoutMs: number,
+  message?: string,
+): Promise<T> {
+  if (timeoutMs <= 0 || !Number.isFinite(timeoutMs)) {
+    return promise;
+  }
+
+  let timeoutId: ReturnType<typeof setTimeout>;
+
+  const timeoutPromise = new Promise<never>((_, reject) => {
+    timeoutId = setTimeout(() => {
+      reject(new TimeoutError(message ?? `Operation timed out after ${timeoutMs}ms`));
+    }, timeoutMs);
+  });
+
+  return Promise.race([promise, timeoutPromise]).finally(() => {
+    clearTimeout(timeoutId);
+  });
+}
+
+/**
+ * 超时错误类型
+ */
+export class TimeoutError extends Error {
+  constructor(message: string) {
+    super(message);
+    this.name = "TimeoutError";
+  }
+}

package/src/types/index.ts

@@ -31,6 +31,7 @@ export type {
     WecomBotInboundBase,
     WecomBotInboundText,
     WecomBotInboundVoice,
+    WecomBotInboundVideo,
     WecomBotInboundStreamRefresh,
     WecomBotInboundEvent,
     WecomBotInboundMessage,

package/src/types/message.ts

@@ -41,6 +41,12 @@ export type WecomBotInboundVoice = WecomBotInboundBase & {
     quote?: WecomInboundQuote;
 };
 
+export type WecomBotInboundVideo = WecomBotInboundBase & {
+    msgtype: "video";
+    video?: { url?: string; aeskey?: string };
+    quote?: WecomInboundQuote;
+};
+
 export type WecomBotInboundStreamRefresh = WecomBotInboundBase & {
     msgtype: "stream";
     stream?: { id?: string };
@@ -62,7 +68,7 @@ export type WecomBotInboundEvent = WecomBotInboundBase & {
  * 支持引用文本、图片、混合类型、语音、文件等。
  */
 export type WecomInboundQuote = {
-    msgtype?: "text" | "image" | "mixed" | "voice" | "file";
+    msgtype?: "text" | "image" | "mixed" | "voice" | "file" | "video";
     /** 引用文本内容 */
     text?: { content?: string };
     /** 引用图片 URL */
@@ -79,11 +85,14 @@ export type WecomInboundQuote = {
     voice?: { content?: string };
     /** 引用文件 */
     file?: { url?: string };
+    /** 引用视频 */
+    video?: { url?: string };
 };
 
 export type WecomBotInboundMessage =
     | WecomBotInboundText
     | WecomBotInboundVoice
+    | WecomBotInboundVideo
     | WecomBotInboundStreamRefresh
     | WecomBotInboundEvent
     | (WecomBotInboundBase & { quote?: WecomInboundQuote } & Record<string, unknown>);

package/src/ws-adapter.ts

@@ -32,6 +32,12 @@ import type { WecomRuntimeEnv, WecomWebhookTarget, StreamState } from "./monitor
 import { shouldProcessBotInboundMessage, buildInboundBody } from "./monitor.js";
 import { monitorState } from "./monitor/state.js";
 import { getWecomRuntime } from "./runtime.js";
+import { fetchAndSaveMcpConfig } from "./mcp-config.js";
+
+// ─── Constants ─────────────────────────────────────────────────────────
+
+/** "思考中" 占位消息，让用户立即看到机器人正在响应 */
+const THINKING_MESSAGE = "<think></think>";
 
 // ─── WSClient Instance Registry ────────────────────────────────────────
 
@@ -190,6 +196,10 @@ function convertSdkMessageToInbound(body: BaseMessage): WecomBotInboundMessage {
         const fileBody = body as FileMessage;
         return { ...base, msgtype: "file" as any, file: fileBody.file, quote: fileBody.quote as any } as any;
     }
+    if (msgtype === "video") {
+        // SDK 没有导出 VideoMessage 类型，直接从 BaseMessage 取 video 字段
+        return { ...base, msgtype: "video" as any, video: (body as any).video, quote: (body as any).quote } as any;
+    }
     if (msgtype === "mixed") {
         const mixedBody = body as MixedMessage;
         return { ...base, msgtype: "mixed" as any, mixed: mixedBody.mixed, quote: mixedBody.quote as any } as any;
@@ -265,6 +275,16 @@ function setupMessageHandler(params: {
             s.wsMode = true;
         });
 
+        // 立即发送"思考中"占位消息，让用户看到即时反馈
+        const sendThinking = (target.account.config as any).sendThinkingMessage ?? true;
+        if (sendThinking) {
+            wsClient.replyStream(frame, streamId, THINKING_MESSAGE, false).catch((err) => {
+                target.runtime.error?.(
+                    `[${accountId}] ws-thinking: failed to send thinking message: ${String(err)}`,
+                );
+            });
+        }
+
         // 注册流式回复监听器
         watchStreamReply({
             wsClient,
@@ -448,6 +468,8 @@ export function startWsClient(params: StartWsClientParams): () => void {
     });
     wsClient.on("authenticated", () => {
         runtime.log?.(`[${accountId}] ws: authenticated successfully`);
+        // 认证成功后拉取 MCP 配置（非阻塞，失败仅记日志）
+        void fetchAndSaveMcpConfig(wsClient, accountId, runtime);
     });
     wsClient.on("disconnected", (reason: string) => {
         runtime.log?.(`[${accountId}] ws: disconnected - ${reason}`);