evolclaw 2.2.0 → 2.4.0

package/dist/channels/wechat.js

@@ -3,6 +3,7 @@ import fs from 'fs';
 import path from 'path';
 import { resolvePaths } from '../paths.js';
 import { logger } from '../utils/logger.js';
+import { sanitizeFileName, saveToUploads, safeFetch } from '../utils/media-cache.js';
 const CHANNEL_VERSION = '1.0.0';
 const DEFAULT_LONG_POLL_TIMEOUT_MS = 35_000;
 const DEFAULT_API_TIMEOUT_MS = 15_000;
@@ -61,10 +62,7 @@ async function downloadMedia(cdnMedia, hexKey) {
     if (!cdnMedia.encrypt_query_param)
         throw new Error('No encrypt_query_param');
     const url = `${CDN_BASE_URL}/download?encrypted_query_param=${encodeURIComponent(cdnMedia.encrypt_query_param)}`;
-    const res = await fetch(url);
-    if (!res.ok)
-        throw new Error(`CDN download failed: ${res.status}`);
-    const encrypted = Buffer.from(await res.arrayBuffer());
+    const encrypted = await safeFetch(url);
     if (!aesKeyBase64)
         return encrypted; // 无 key = 明文
     return decryptAesEcb(encrypted, parseAesKey(aesKeyBase64));
@@ -142,6 +140,7 @@ export class WechatChannel {
     // Session expired 状态
     sessionPausedUntil = 0;
     onSessionExpired;
+    eventBus;
     // Project path resolver（用于保存文件到 uploads 目录）
     projectPathResolver;
     constructor(config) {
@@ -158,6 +157,10 @@ export class WechatChannel {
     onSessionExpiredNotify(handler) {
         this.onSessionExpired = handler;
     }
+    /** 注册事件总线（推荐，替代 onSessionExpiredNotify） */
+    setEventBus(bus) {
+        this.eventBus = bus;
+    }
     /** 当前是否处于 session 暂停状态 */
     isSessionPaused() {
         return Date.now() < this.sessionPausedUntil;
@@ -385,9 +388,19 @@ export class WechatChannel {
                         const pauseMin = SESSION_PAUSE_DURATION_MS / 60_000;
                         this.sessionPausedUntil = Date.now() + SESSION_PAUSE_DURATION_MS;
                         logger.error(`[WeChat] Session still expired, pausing for ${pauseMin}min`);
-                        // 通知用户（通过其他渠道）
-                        if (this.onSessionExpired) {
-                            this.onSessionExpired(`⚠️ 微信 token 已过期，通道暂停 ${pauseMin} 分钟后自动重试。\n如需立即恢复，请运行: evolclaw init wechat`);
+                        // 通知用户（通过事件总线或回调）
+                        const authMsg = `⚠️ 微信 token 已过期，通道暂停 ${pauseMin} 分钟后自动重试。\n如需立即恢复，请运行: evolclaw init wechat`;
+                        if (this.eventBus) {
+                            this.eventBus.publish({
+                                type: 'channel:health',
+                                channel: 'wechat',
+                                status: 'auth_error',
+                                message: authMsg,
+                                timestamp: Date.now(),
+                            });
+                        }
+                        else if (this.onSessionExpired) {
+                            this.onSessionExpired(authMsg);
                         }
                         await this.sleep(SESSION_PAUSE_DURATION_MS, signal);
                         if (signal.aborted)
@@ -527,14 +540,14 @@ export class WechatChannel {
                 }
                 else if (item.type === MSG_ITEM_FILE && item.file_item?.media) {
                     const buf = await downloadMedia(item.file_item.media);
-                    const fileName = this.sanitizeFileName(item.file_item.file_name || `file_${Date.now()}`);
-                    const savePath = await this.saveToUploads(buf, fileName, channelId);
+                    const fileName = sanitizeFileName(item.file_item.file_name || `file_${Date.now()}`);
+                    const savePath = await this.saveToUploadsLocal(buf, fileName, channelId);
                     prompts.push(`用户发送了文件：${fileName}\n文件已保存到：${savePath}\n请使用 Read 工具读取并分析文件内容。`);
                 }
                 else if (item.type === MSG_ITEM_VIDEO && item.video_item?.media) {
                     const buf = await downloadMedia(item.video_item.media);
                     const fileName = `video_${Date.now()}.mp4`;
-                    const savePath = await this.saveToUploads(buf, fileName, channelId);
+                    const savePath = await this.saveToUploadsLocal(buf, fileName, channelId);
                     prompts.push(`用户发送了视频：${fileName}\n文件已保存到：${savePath}`);
                 }
             }
@@ -544,19 +557,12 @@ export class WechatChannel {
         }
         return { prompt: prompts.join('\n\n'), images };
     }
-    async saveToUploads(buf, fileName, channelId) {
+    async saveToUploadsLocal(buf, fileName, channelId) {
         const projectPath = this.projectPathResolver
             ? await this.projectPathResolver(channelId)
             : process.cwd();
-        const uploadsDir = path.join(projectPath, '.evolclaw', 'uploads');
-        fs.mkdirSync(uploadsDir, { recursive: true });
-        const savePath = path.join(uploadsDir, fileName);
-        fs.writeFileSync(savePath, buf);
-        return savePath;
-    }
-    /** 清理文件名：移除路径穿越字符，只保留 basename */
-    sanitizeFileName(name) {
-        return path.basename(name).replace(/[<>:"|?*\x00-\x1f]/g, '_') || `file_${Date.now()}`;
+        const { filePath } = saveToUploads(buf, fileName, projectPath);
+        return filePath;
     }
     // ── Media Upload (Outbound) ──────────────────────────────────────────
     async getUploadUrl(params) {
@@ -701,66 +707,84 @@ export class WechatChannel {
         });
     }
 }
+import { normalizeChannelInstances } from '../config.js';
 export class WechatChannelPlugin {
     name = 'wechat';
     isEnabled(config) {
-        return config.channels?.wechat?.enabled === true && !!config.channels?.wechat?.token;
+        const raw = config.channels?.wechat;
+        if (!raw)
+            return false;
+        if (Array.isArray(raw)) {
+            return raw.some(inst => inst.enabled !== false && !!inst.token);
+        }
+        return raw.enabled === true && !!raw.token;
+    }
+    async createChannels(config) {
+        const instances = normalizeChannelInstances(config.channels?.wechat, 'wechat');
+        const result = [];
+        for (const inst of instances) {
+            if (inst.enabled === false || !inst.token)
+                continue;
+            const channel = new WechatChannel({
+                baseUrl: inst.baseUrl || 'https://ilinkai.weixin.qq.com',
+                token: inst.token,
+            });
+            const adapter = {
+                channelName: inst.name,
+                sendText: (id, text) => channel.sendMessage(id, text),
+                sendFile: (id, filePath) => channel.sendFile(id, filePath),
+            };
+            const policy = {
+                canSwitchProject: (chatType, identity) => identity === 'owner',
+                canListProjects: (chatType, identity) => identity === 'owner',
+                canCreateSession: (chatType, identity) => true,
+                canDeleteSession: (chatType, identity) => true,
+                canImportCliSession: (chatType, identity) => identity === 'owner',
+                messagePrefix: (chatType, peerName) => '',
+                showMiddleResult: (chatType, identity) => {
+                    const mode = inst.showActivities ?? config.showActivities ?? 'all';
+                    if (mode === 'none')
+                        return false;
+                    if (mode === 'dm-only')
+                        return chatType === 'private';
+                    if (mode === 'owner-dm-only')
+                        return chatType === 'private' && identity === 'owner';
+                    return true;
+                },
+                showIdleMonitor: (chatType, identity) => {
+                    const mode = inst.showActivities ?? config.showActivities ?? 'all';
+                    if (mode === 'none')
+                        return false;
+                    if (mode === 'dm-only')
+                        return chatType === 'private';
+                    if (mode === 'owner-dm-only')
+                        return chatType === 'private' && identity === 'owner';
+                    return true;
+                },
+                accumulateErrors: (chatType, identity) => true,
+            };
+            const options = {
+                fileMarkerPattern: /\[SEND_FILE:(?:(\w+):)?([^\]]+)\]/g,
+                flushDelay: inst.flushDelay ?? 3, // WeChat 默认 3s
+            };
+            result.push({
+                channelType: 'wechat',
+                adapter,
+                channel,
+                policy,
+                options,
+                connect: () => channel.connect(),
+                disconnect: () => channel.disconnect(),
+                onProjectPathRequest: (channelId) => Promise.resolve(config.projects?.defaultPath || process.cwd()),
+            });
+        }
+        return result;
     }
     async createChannel(config) {
-        const wechatConfig = config.channels?.wechat;
-        if (!wechatConfig?.token) {
+        const instances = await this.createChannels(config);
+        if (instances.length === 0) {
             throw new Error('WeChat config missing');
         }
-        const channel = new WechatChannel({
-            baseUrl: wechatConfig.baseUrl || 'https://ilinkai.weixin.qq.com',
-            token: wechatConfig.token,
-        });
-        const adapter = {
-            name: 'wechat',
-            sendText: (id, text) => channel.sendMessage(id, text),
-            sendFile: (id, filePath) => channel.sendFile(id, filePath),
-        };
-        const policy = {
-            canSwitchProject: (chatType, identity) => identity === 'owner',
-            canListProjects: (chatType, identity) => identity === 'owner',
-            canCreateSession: (chatType, identity) => true,
-            canDeleteSession: (chatType, identity) => true,
-            canImportCliSession: (chatType, identity) => identity === 'owner',
-            messagePrefix: (chatType, peerName) => '',
-            showMiddleResult: (chatType, identity) => {
-                const mode = wechatConfig.showActivities ?? config.showActivities ?? 'all';
-                if (mode === 'none')
-                    return false;
-                if (mode === 'dm-only')
-                    return chatType === 'private';
-                if (mode === 'owner-dm-only')
-                    return chatType === 'private' && identity === 'owner';
-                return true;
-            },
-            showIdleMonitor: (chatType, identity) => {
-                const mode = wechatConfig.showActivities ?? config.showActivities ?? 'all';
-                if (mode === 'none')
-                    return false;
-                if (mode === 'dm-only')
-                    return chatType === 'private';
-                if (mode === 'owner-dm-only')
-                    return chatType === 'private' && identity === 'owner';
-                return true;
-            },
-            accumulateErrors: (chatType, identity) => true,
-        };
-        const options = {
-            fileMarkerPattern: /\[SEND_FILE:(?:(\w+):)?([^\]]+)\]/g,
-            flushDelay: wechatConfig.flushDelay ?? 3, // WeChat 默认 3s
-        };
-        return {
-            adapter,
-            channel,
-            policy,
-            options,
-            connect: () => channel.connect(),
-            disconnect: () => channel.disconnect(),
-            onProjectPathRequest: (channelId) => Promise.resolve(config.projects?.defaultPath || process.cwd()),
-        };
+        return instances[0];
     }
 }