@marshulll/openclaw-wecom 0.1.11 → 0.1.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marshulll/openclaw-wecom",
-  "version": "0.1.11",
+  "version": "0.1.13",
   "type": "module",
   "description": "OpenClaw WeCom channel plugin (intelligent bot + internal app)",
   "author": "OpenClaw",

package/wecom/src/wecom-app.ts

@@ -1,6 +1,6 @@
 import type { IncomingMessage, ServerResponse } from "node:http";
 import { XMLParser } from "fast-xml-parser";
-import { mkdir, readdir, rm, stat, unlink, writeFile } from "node:fs/promises";
+import { mkdir, readdir, rm, stat, writeFile } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
 
@@ -171,8 +171,13 @@ async function startAgentForApp(params: {
   chatId?: string;
   isGroup: boolean;
   messageText: string;
+  media?: {
+    type: "image" | "voice" | "video" | "file";
+    path: string;
+    url?: string;
+  } | null;
 }): Promise<void> {
-  const { target, fromUser, chatId, isGroup, messageText } = params;
+  const { target, fromUser, chatId, isGroup, messageText, media } = params;
   const core = getWecomRuntime();
   const config = target.config;
   const account = target.account;
@@ -221,6 +226,14 @@ async function startAgentForApp(params: {
     OriginatingTo: `wecom:${peerId}`,
   });
 
+  if (media?.path) {
+    ctxPayload.MediaPath = media.path;
+    ctxPayload.MediaType = media.type;
+    if (media.url) {
+      ctxPayload.MediaUrl = media.url;
+    }
+  }
+
   await core.channel.session.recordInboundSession({
     storePath,
     sessionKey: ctxPayload.SessionKey ?? route.sessionKey,
@@ -318,7 +331,7 @@ async function processAppMessage(params: {
   if (!fromUser) return;
 
   let messageText = "";
-  let tempImagePath: string | null = null;
+  let mediaContext: { type: "image" | "voice" | "video" | "file"; path: string; url?: string } | null = null;
 
   if (msgType === "text") {
     messageText = String(msgObj?.Content ?? "");
@@ -337,17 +350,19 @@ async function processAppMessage(params: {
           if (maxBytes && media.buffer.length > maxBytes) {
             messageText = "[语音消息过大，未处理]\n\n请发送更短的语音消息。";
           } else {
-          const ext = resolveExtFromContentType(media.contentType, "amr");
-          const tempDir = resolveMediaTempDir(target);
-          await mkdir(tempDir, { recursive: true });
-          await cleanupMediaDir(
-            tempDir,
-            target.account.config.media?.retentionHours,
-            target.account.config.media?.cleanupOnStart,
-          );
-          const tempVoicePath = join(tempDir, `voice-${Date.now()}-${Math.random().toString(36).slice(2)}.${ext}`);
-          await writeFile(tempVoicePath, media.buffer);
-          messageText = `[用户发送了一条语音消息，已保存到: ${tempVoicePath}]\n\n请根据语音内容回复用户。`;
+            const ext = resolveExtFromContentType(media.contentType, "amr");
+            const tempDir = resolveMediaTempDir(target);
+            await mkdir(tempDir, { recursive: true });
+            await cleanupMediaDir(
+              tempDir,
+              target.account.config.media?.retentionHours,
+              target.account.config.media?.cleanupOnStart,
+            );
+            const tempVoicePath = join(tempDir, `voice-${Date.now()}-${Math.random().toString(36).slice(2)}.${ext}`);
+            await writeFile(tempVoicePath, media.buffer);
+            mediaContext = { type: "voice", path: tempVoicePath };
+            logVerbose(target, `app voice saved (${media.buffer.length} bytes): ${tempVoicePath}`);
+            messageText = `[用户发送了一条语音消息]\n\n请根据语音内容回复用户。`;
           }
         } catch (err) {
           target.runtime.error?.(`wecom app voice download failed: ${String(err)}`);
@@ -380,17 +395,19 @@ async function processAppMessage(params: {
         if (maxBytes && buffer.length > maxBytes) {
           messageText = "[图片过大，未处理]\n\n请发送更小的图片。";
         } else {
-        const ext = resolveExtFromContentType(contentType, "jpg");
-        const tempDir = resolveMediaTempDir(target);
-        await mkdir(tempDir, { recursive: true });
-        await cleanupMediaDir(
-          tempDir,
-          target.account.config.media?.retentionHours,
-          target.account.config.media?.cleanupOnStart,
-        );
-        tempImagePath = join(tempDir, `image-${Date.now()}-${Math.random().toString(36).slice(2)}.${ext}`);
-        await writeFile(tempImagePath, buffer);
-        messageText = `[用户发送了一张图片，已保存到: ${tempImagePath}]\n\n请根据图片内容回复用户。`;
+          const ext = resolveExtFromContentType(contentType, "jpg");
+          const tempDir = resolveMediaTempDir(target);
+          await mkdir(tempDir, { recursive: true });
+          await cleanupMediaDir(
+            tempDir,
+            target.account.config.media?.retentionHours,
+            target.account.config.media?.cleanupOnStart,
+          );
+          const tempImagePath = join(tempDir, `image-${Date.now()}-${Math.random().toString(36).slice(2)}.${ext}`);
+          await writeFile(tempImagePath, buffer);
+          mediaContext = { type: "image", path: tempImagePath, url: picUrl || undefined };
+          logVerbose(target, `app image saved (${buffer.length} bytes): ${tempImagePath}`);
+          messageText = "[用户发送了一张图片]\n\n请根据图片内容回复用户。";
         }
       } else {
         messageText = "[用户发送了一张图片，但下载失败]\n\n请告诉用户图片处理暂时不可用。";
@@ -417,17 +434,19 @@ async function processAppMessage(params: {
         if (maxBytes && media.buffer.length > maxBytes) {
           messageText = "[视频过大，未处理]\n\n请发送更小的视频。";
         } else {
-        const ext = resolveExtFromContentType(media.contentType, "mp4");
-        const tempDir = resolveMediaTempDir(target);
-        await mkdir(tempDir, { recursive: true });
-        await cleanupMediaDir(
-          tempDir,
-          target.account.config.media?.retentionHours,
-          target.account.config.media?.cleanupOnStart,
-        );
-        const tempVideoPath = join(tempDir, `video-${Date.now()}-${Math.random().toString(36).slice(2)}.${ext}`);
-        await writeFile(tempVideoPath, media.buffer);
-        messageText = `[用户发送了一个视频文件，已保存到: ${tempVideoPath}]\n\n请根据视频内容回复用户。`;
+          const ext = resolveExtFromContentType(media.contentType, "mp4");
+          const tempDir = resolveMediaTempDir(target);
+          await mkdir(tempDir, { recursive: true });
+          await cleanupMediaDir(
+            tempDir,
+            target.account.config.media?.retentionHours,
+            target.account.config.media?.cleanupOnStart,
+          );
+          const tempVideoPath = join(tempDir, `video-${Date.now()}-${Math.random().toString(36).slice(2)}.${ext}`);
+          await writeFile(tempVideoPath, media.buffer);
+          mediaContext = { type: "video", path: tempVideoPath };
+          logVerbose(target, `app video saved (${media.buffer.length} bytes): ${tempVideoPath}`);
+          messageText = "[用户发送了一个视频文件]\n\n请根据视频内容回复用户。";
         }
       } catch (err) {
         target.runtime.error?.(`wecom app video download failed: ${String(err)}`);
@@ -446,18 +465,20 @@ async function processAppMessage(params: {
         if (maxBytes && media.buffer.length > maxBytes) {
           messageText = "[文件过大，未处理]\n\n请发送更小的文件。";
         } else {
-        const ext = fileName.includes(".") ? fileName.split(".").pop() : resolveExtFromContentType(media.contentType, "bin");
-        const tempDir = resolveMediaTempDir(target);
-        await mkdir(tempDir, { recursive: true });
-        await cleanupMediaDir(
-          tempDir,
-          target.account.config.media?.retentionHours,
-          target.account.config.media?.cleanupOnStart,
-        );
-        const safeName = sanitizeFilename(fileName, `file-${Date.now()}.${ext}`);
-        const tempFilePath = join(tempDir, safeName);
-        await writeFile(tempFilePath, media.buffer);
-        messageText = `[用户发送了一个文件: ${safeName}，已保存到: ${tempFilePath}]\n\n请根据文件内容回复用户。`;
+          const ext = fileName.includes(".") ? fileName.split(".").pop() : resolveExtFromContentType(media.contentType, "bin");
+          const tempDir = resolveMediaTempDir(target);
+          await mkdir(tempDir, { recursive: true });
+          await cleanupMediaDir(
+            tempDir,
+            target.account.config.media?.retentionHours,
+            target.account.config.media?.cleanupOnStart,
+          );
+          const safeName = sanitizeFilename(fileName, `file-${Date.now()}.${ext}`);
+          const tempFilePath = join(tempDir, safeName);
+          await writeFile(tempFilePath, media.buffer);
+          mediaContext = { type: "file", path: tempFilePath };
+          logVerbose(target, `app file saved (${media.buffer.length} bytes): ${tempFilePath}`);
+          messageText = `[用户发送了一个文件: ${safeName}]\n\n请根据文件内容回复用户。`;
         }
       } catch (err) {
         target.runtime.error?.(`wecom app file download failed: ${String(err)}`);
@@ -490,6 +511,7 @@ async function processAppMessage(params: {
       chatId,
       isGroup,
       messageText,
+      media: mediaContext,
     });
   } catch (err) {
     target.runtime.error?.(`wecom app agent failed: ${String(err)}`);
@@ -503,10 +525,6 @@ async function processAppMessage(params: {
     } catch {
       // ignore
     }
-  } finally {
-    if (tempImagePath) {
-      unlink(tempImagePath).catch(() => {});
-    }
   }
 }
 

package/wecom/src/wecom-bot.ts

@@ -753,6 +753,10 @@ export async function handleWecomBotWebhook(params: {
   pruneStreams();
 
   const { req, res, targets } = params;
+  const botTargets = targets.filter((candidate) => shouldHandleBot(candidate.account));
+  if (botTargets.length === 0) {
+    return false;
+  }
   const query = resolveQueryParams(req);
   const timestamp = query.get("timestamp") ?? "";
   const nonce = query.get("nonce") ?? "";
@@ -770,7 +774,7 @@ export async function handleWecomBotWebhook(params: {
       return false;
     }
 
-    const target = targets.find((candidate) => {
+    const target = botTargets.find((candidate) => {
       if (!shouldHandleBot(candidate.account)) return false;
       if (!candidate.account.configured || !candidate.account.token) return false;
       const ok = verifyWecomSignature({
@@ -823,9 +827,9 @@ export async function handleWecomBotWebhook(params: {
     return true;
   }
 
-  const target = targets.find((candidate) => {
-    if (!shouldHandleBot(candidate.account)) return false;
-    if (!candidate.account.token) return false;
+    const target = botTargets.find((candidate) => {
+      if (!shouldHandleBot(candidate.account)) return false;
+      if (!candidate.account.token) return false;
     const ok = verifyWecomSignature({
       token: candidate.account.token,
       timestamp,