wechaty-web-panel 1.6.67 → 1.6.69

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## 更新日志
 
+### V1.6.69(2024-12-10)
+1、修复批量发消息失败
+
+### V1.6.68(2024-11-29)
+1、支持群消息带@
+
 ### V1.6.66(2024-10-25)
 1、修复发送消息问题
 

package/dist/cjs/src/common/index.js

@@ -253,7 +253,12 @@ async function roomSay(room, contact, msg) {
         if (msg.type === 1 && msg.content) {
             const content = await formatContent(msg.content);
             // 文字
-            contact ? await room.say(content, contact) : await room.say(content);
+            if (Array.isArray(contact)) {
+                await room.say(content, ...contact);
+            }
+            else {
+                contact ? await room.say(content, contact) : await room.say(content);
+            }
             void addReplyHistory(this, { content, contact: null, room: room });
         }
         else if (msg.type === 2 && msg.url) {
@@ -270,11 +275,17 @@ async function roomSay(room, contact, msg) {
         else if (msg.type === 3 && msg.url) {
             // bse64文件
             let obj = file_box_1.FileBox.fromDataURL(msg.url, 'room-avatar.jpg');
-            contact ? await room.say('', contact) : '';
+            if (Array.isArray(contact)) {
+                await room.say('', ...contact);
+            }
+            else {
+                contact ? await room.say('', contact) : '';
+            }
             await (0, index_js_1.delay)(500);
             await room.say(obj);
         }
         else if (msg.type === 4 && msg.url && msg.title && msg.description) {
+            // @ts-ignore
             const description = await formatContent(msg.description);
             const title = await formatContent(msg.title);
             let url = new this.UrlLink({

package/dist/cjs/src/handlers/on-callback-message.d.ts

@@ -0,0 +1,3 @@
+export default onRecordMessage;
+declare function onRecordMessage(msg: any): Promise<void>;
+//# sourceMappingURL=on-callback-message.d.ts.map

package/dist/cjs/src/handlers/on-callback-message.js

@@ -0,0 +1,178 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const configDb_js_1 = require("../db/configDb.js");
+const oss_js_1 = require("../lib/oss.js");
+const dayjs_1 = __importDefault(require("dayjs"));
+const puppetDb_js_1 = require("../db/puppetDb.js");
+const path_1 = __importDefault(require("path"));
+const axios_1 = __importDefault(require("axios"));
+async function onRecordMessage(msg) {
+    try {
+        const puppetInfo = await (0, puppetDb_js_1.getPuppetInfo)();
+        const config = await (0, configDb_js_1.allConfig)();
+        const conversationRecord = config.conversationRecord || {};
+        const { role } = config && config.userInfo || { role: 'default' };
+        if (role !== 'vip' || !conversationRecord?.open)
+            return;
+        const contact = msg.talker(); // 发消息人
+        const contactName = contact.name(); // 发消息人昵称
+        const contactAlias = await contact.alias();
+        const room = msg.room(); // 是否为群消息
+        const roomName = room ? await room.topic() : '';
+        const msgSelf = msg.self(); // 是否自己发给自己的消息
+        const type = msg.type();
+        const timestamp = msg.timestamp || (0, dayjs_1.default)().unix();
+        const robotInfo = this.currentUser;
+        const isOfficial = contact.type() === this.Contact.Type.Official;
+        if (msgSelf || isOfficial)
+            return;
+        console.log('msg', msg);
+        const baseMsg = {
+            conversionId: room ? room.id : contact.id,
+            conversionName: room ? roomName : contactName,
+            isRoom: !!room,
+            chatName: contactName,
+            chatId: contact.id,
+            chatAlias: contactAlias,
+            time: timestamp.length > 10 ? parseInt(timestamp / 1000) : timestamp
+        };
+        switch (type) {
+            case this.Message.Type.Channel:
+                baseMsg.type = '视频号';
+                const channelInfo = await msg.toChannel();
+                baseMsg.mediaInfo = {
+                    nickname: channelInfo.nickname(),
+                    coverUrl: channelInfo.coverUrl(),
+                    avatar: channelInfo.avatar(),
+                    desc: channelInfo.desc(),
+                    url: channelInfo.url(),
+                    objectId: channelInfo.objectId(),
+                    objectNonceId: channelInfo.objectNonceId()
+                };
+                break;
+            case this.Message.Type.Contact:
+                baseMsg.type = '名片';
+                const contactInfo = await msg.toContact();
+                baseMsg.mediaInfo = {
+                    name: contactInfo.name(),
+                    avatar: contactInfo.payload.avatar || '',
+                    wxid: contactInfo.id,
+                };
+                break;
+            case this.Message.Type.RedEnvelope:
+                baseMsg.type = '红包';
+                baseMsg.content = "收到红包";
+                break;
+            case this.Message.Type.Emoticon:
+                baseMsg.type = '自定义表情';
+                const emoticonFileBox = await msg.toFileBox();
+                const emoticonBuffer = await emoticonFileBox.toBuffer();
+                const emoticonUrl = await (0, oss_js_1.uploadOssFile)(`${conversationRecord?.ossConfig?.custom_path || ''}${emoticonFileBox.name}`, emoticonBuffer);
+                baseMsg.url = emoticonUrl;
+                break;
+            case this.Message.Type.Text:
+                baseMsg.type = '文字';
+                baseMsg.content = msg.text().trim();
+                break;
+            case this.Message.Type.Url:
+                const urlLink = await msg.toUrlLink();
+                baseMsg.type = 'h5链接';
+                baseMsg.mediaInfo = {
+                    url: urlLink.url(),
+                    description: urlLink.description(),
+                    imageUrl: urlLink.thumbnailUrl(),
+                    title: urlLink.title(),
+                };
+                break;
+            case this.Message.Type.MiniProgram:
+                const miniProgram = await msg.toMiniProgram();
+                const appid = puppetInfo.puppetType === 'PuppetService' ? miniProgram.username() : miniProgram.appid().replaceAll('@app', '');
+                const username = puppetInfo.puppetType === 'PuppetService' ? miniProgram.appid().replaceAll('@app', '') : miniProgram.username();
+                baseMsg.type = '小程序';
+                baseMsg.mediaInfo = {
+                    url: decodeURIComponent(miniProgram.pagePath()),
+                    appid,
+                    username,
+                    description: miniProgram.description(),
+                    imageUrl: miniProgram.thumbnailUrl(),
+                    title: miniProgram.title(),
+                };
+                break;
+            case this.Message.Type.Attachment:
+            case this.Message.Type.Image:
+            case this.Message.Type.Video:
+                const attachFileBox = await msg.toFileBox();
+                const fileExtname = path_1.default.extname(attachFileBox.name);
+                const isImage = fileExtname.includes('.png') || fileExtname.includes('.jpg') || fileExtname.includes('.jpeg') || fileExtname.includes('.gif');
+                baseMsg.type = isImage ? '图片' : '文件';
+                const buffer = await attachFileBox.toBuffer();
+                const url = await (0, oss_js_1.uploadOssFile)(`${conversationRecord?.ossConfig?.custom_path || ''}${attachFileBox.name}`, buffer);
+                baseMsg.url = url;
+                break;
+            case this.Message.Type.Audio:
+                baseMsg.type = '语音';
+                const audioFileBox = await msg.toFileBox();
+                const audioBuffer = await audioFileBox.toBuffer();
+                const audioUrl = await (0, oss_js_1.uploadOssFile)(`${conversationRecord?.ossConfig?.custom_path || ''}${audioFileBox.name}`, audioBuffer);
+                baseMsg.url = audioUrl;
+                break;
+            default:
+                break;
+        }
+        console.log('baseMsg', baseMsg);
+        sendMessage(baseMsg, conversationRecord, robotInfo);
+    }
+    catch (e) {
+        console.log('记录消息失败', e);
+    }
+}
+function sendMessage(msgInfo, recordConfig, robotInfo) {
+    const blackKey = ['conversationId', 'conversionName', 'isRoom', 'isRobot', 'chatName', 'chatId', 'chatAlias', 'time', 'type', 'url', 'mediaInfo', 'content'];
+    const baseData = {
+        ...msgInfo
+    };
+    recordConfig.moreData &&
+        recordConfig.moreData.length &&
+        recordConfig.moreData.forEach((mItem) => {
+            if (!blackKey.includes(mItem.key) && mItem.key && mItem.value) {
+                baseData[mItem.key] = mItem.value;
+            }
+        });
+    const timeout = recordConfig.timeout || 180;
+    const header = {
+        'Content-Type': 'application/json'
+    };
+    recordConfig.header &&
+        recordConfig.header.length &&
+        recordConfig.header.forEach((mItem) => {
+            if (mItem.key && mItem.value) {
+                header[mItem.key] = mItem.value;
+            }
+        });
+    const config = {
+        url: recordConfig.customUrl,
+        method: 'POST',
+        timeout: timeout * 1000,
+        headers: header,
+        data: {
+            robotInfo: {
+                wxid: robotInfo.id,
+                name: robotInfo.name(),
+            },
+            message: baseData
+        }
+    };
+    if (recordConfig?.debug) {
+        console.log('消息回调请求参数', config);
+    }
+    axios_1.default.request(config).then((res) => {
+        console.log('消息发送成功', res);
+    }).catch((err) => {
+        console.log('消息发送失败', err);
+    });
+}
+exports.default = onRecordMessage;
+//# sourceMappingURL=on-callback-message.js.map

package/dist/cjs/src/handlers/on-message.js

@@ -248,7 +248,11 @@ async function dispatchRoomFilterByMsgType(that, room, msg) {
                 else {
                     content = msg.text();
                 }
-                const mentionSelf = await msg.mentionSelf() || content.includes(`@${userSelfName}`);
+                let mentionSelf = await msg.mentionSelf() || content.includes(`@${userSelfName}`);
+                const isMentionAll = await msg.isMentionAll();
+                if (config?.ignoreRoomMentionAll && isMentionAll && mentionSelf) {
+                    mentionSelf = false;
+                }
                 const receiverName = receiver?.name();
                 content = content.replace('@' + receiverName, '').replace('@' + userSelfName, '').replace(/@[^,，：:\s@]+/g, '').trim();
                 console.log(`群名: ${roomName} 发消息人: ${contactName} 内容: ${content} | 机器人被@：${mentionSelf ? '是' : '否'}`);

package/dist/cjs/src/index.d.ts

@@ -4,4 +4,5 @@ export function WechatyWebPanelPlugin(config?: {
     scanTimes: any;
 }): (bot: any) => void;
 export function WechatyMessageRecordPlugin(): (bot: any) => void;
+export function WechatyMessageCallBackPlugin(): (bot: any) => void;
 //# sourceMappingURL=index.d.ts.map

package/dist/cjs/src/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WechatyMessageRecordPlugin = exports.WechatyWebPanelPlugin = void 0;
+exports.WechatyMessageCallBackPlugin = exports.WechatyMessageRecordPlugin = exports.WechatyWebPanelPlugin = void 0;
 const global_js_1 = __importDefault(require("./db/global.js"));
 const aiDb_js_1 = require("./db/aiDb.js");
 const on_scan_js_1 = __importDefault(require("./handlers/on-scan.js"));
@@ -19,6 +19,7 @@ const on_roomtopic_js_1 = __importDefault(require("./handlers/on-roomtopic.js"))
 const on_roomleave_js_1 = __importDefault(require("./handlers/on-roomleave.js"));
 const on_verifycode_js_1 = __importDefault(require("./handlers/on-verifycode.js"));
 const on_record_message_js_1 = __importDefault(require("./handlers/on-record-message.js"));
+const on_callback_message_js_1 = __importDefault(require("./handlers/on-callback-message.js"));
 const dayjs_1 = __importDefault(require("dayjs"));
 const originalConsoleLog = console.log;
 // 重写 console.log 方法
@@ -85,4 +86,10 @@ function WechatyMessageRecordPlugin() {
     };
 }
 exports.WechatyMessageRecordPlugin = WechatyMessageRecordPlugin;
+function WechatyMessageCallBackPlugin() {
+    return function (bot) {
+        bot.on('message', on_callback_message_js_1.default);
+    };
+}
+exports.WechatyMessageCallBackPlugin = WechatyMessageCallBackPlugin;
 //# sourceMappingURL=index.js.map

package/dist/cjs/src/lib/oss.d.ts

@@ -0,0 +1,2 @@
+export function uploadOssFile(fileName: any, file: any): Promise<any>;
+//# sourceMappingURL=oss.d.ts.map

package/dist/cjs/src/lib/oss.js

@@ -0,0 +1,31 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.uploadOssFile = void 0;
+const ali_oss_1 = __importDefault(require("ali-oss"));
+const configDb_js_1 = require("../db/configDb.js");
+async function initStore() {
+    const config = await (0, configDb_js_1.allConfig)();
+    const ossConfig = config.conversationRecord && config.conversationRecord.ossConfig;
+    const options = {
+        region: ossConfig.region,
+        accessKeyId: ossConfig.aliAkId,
+        accessKeySecret: ossConfig.aliAkSecret,
+        bucket: ossConfig.bucket
+    };
+    if (ossConfig.custom_domain) {
+        options.endpoint = ossConfig.custom_domain;
+    }
+    const store = new ali_oss_1.default(options);
+    return store;
+}
+async function uploadOssFile(fileName, file) {
+    console.log('file', file);
+    const store = await initStore();
+    const result = await store.put(fileName, file);
+    return result?.url || '';
+}
+exports.uploadOssFile = uploadOssFile;
+//# sourceMappingURL=oss.js.map

package/dist/cjs/src/package-json.d.ts

@@ -56,6 +56,7 @@ export namespace packageJson {
     }
     const dependencies: {
         "@dqbd/tiktoken": string;
+        "ali-oss": string;
         axios: string;
         "baidu-aip-sdk": string;
         dayjs: string;

package/dist/cjs/src/package-json.js

@@ -6,7 +6,7 @@ exports.packageJson = void 0;
  */
 exports.packageJson = {
     "name": "wechaty-web-panel",
-    "version": "1.6.67",
+    "version": "1.6.69",
     "description": "智能微秘书插件",
     "exports": {
         ".": {
@@ -77,6 +77,7 @@ exports.packageJson = {
     },
     "dependencies": {
         "@dqbd/tiktoken": "^1.0.2",
+        "ali-oss": "^6.21.0",
         "axios": "^1.6.6",
         "baidu-aip-sdk": "^4.16.10",
         "dayjs": "^1.11.7",

package/dist/cjs/src/proxy/aibotk.js

@@ -260,6 +260,9 @@ async function getConfig() {
             defaultReply: '',
             forwards: [],
             openRecord: false,
+            openWhisper: false,
+            whisperConfig: {},
+            ignoreRoomMentionAll: true,
             ...config,
             cloudRoom
         });

package/dist/cjs/src/proxy/mqtt.js

@@ -44,23 +44,32 @@ const global_js_1 = __importDefault(require("../db/global.js"));
 const on_scan_js_1 = require("../handlers/on-scan.js");
 const chatHistory_js_1 = require("../db/chatHistory.js");
 let mqttclient = null;
-async function sendRoomSay(that, room, messages) {
+async function getContact(that, contact) {
+    const contactInfo = (contact.wxid && await that.Contact.find({ id: contact.wxid || '' })) || (contact.id && await that.Contact.find({ id: contact.id || '' })) || (contact.name && await that.Contact.find({ name: contact.name || '' })) || (contact.alias && await that.Contact.find({ alias: contact.alias || '' })) || (contact.weixin && await that.Contact.find({ weixin: contact.weixin || '' }));
+    return contactInfo;
+}
+async function getRoom(that, room) {
+    const roomInfo = (room.wxid && await that.Room.find({ id: room.wxid || '' })) || (room.id && await that.Room.find({ id: room.id || '' })) || (room.name && await that.Room.find({ topic: room.name || '' })) || (room.roomName && await that.Room.find({ topic: room.roomName || '' }));
+    return roomInfo;
+}
+async function sendRoomSay(that, room, messages, atList) {
     console.log(`收到群：${room.name}批量发送消息请求， 消息数量【${messages.length}】`);
-    const finalRoom = await that.Room.find({ id: room.id, topic: room.name });
+    const finalRoom = await getRoom(that, room);
     if (!finalRoom) {
         console.log(`查找不到群：${room.name}，请检查群名是否正确`);
         return;
     }
     else {
         for (let message of messages) {
-            await index_js_1.roomSay.call(that, finalRoom, '', message);
+            const atContacts = await getAtContacts(that, atList);
+            await index_js_1.roomSay.call(that, finalRoom, atContacts, message);
             await (0, index_js_3.delay)(500);
         }
     }
 }
 async function sendContactSay(that, contact, messages) {
     console.log(`收到好友：${contact.name}批量发送消息请求， 消息数量【${messages.length}】`);
-    const finalContact = await that.Contact.find({ id: contact.id || '', name: contact.name, alias: contact.alias || '', weixin: contact.weixin || '' });
+    const finalContact = await getContact(that, contact);
     if (!finalContact) {
         console.log(`查找不到好友：${contact.name}，请检查好友名称是否正确`);
         return;
@@ -72,9 +81,27 @@ async function sendContactSay(that, contact, messages) {
         }
     }
 }
+async function getAtContacts(that, atList) {
+    if (!atList || atList.length === 0)
+        return '';
+    console.log('atList', atList);
+    let contacts = [];
+    for (let contact of atList) {
+        if (contact.id === '@all' || contact.name === '@all') {
+            contacts.push('@all');
+            return contacts;
+        }
+        let atContact = await getContact(that, contact);
+        if (atContact) {
+            contacts.push(atContact);
+        }
+    }
+    console.log('search contact', contacts);
+    return contacts;
+}
 async function sendRoomsNotice(that, room, messages) {
     console.log(`收到群：${room.name}批量发送群公告请求， 公告数量【${messages.length}】`);
-    const finalRoom = await that.Room.find({ id: room.id, topic: room.name });
+    const finalRoom = await getRoom(that, room);
     if (!finalRoom) {
         console.log(`查找不到群：${room.name}，请检查群名是否正确`);
         return;
@@ -132,12 +159,13 @@ async function initMqtt(that) {
                                 return;
                             }
                             else {
-                                await index_js_1.roomSay.call(that, room, '', content.message);
+                                const atContacts = content?.atList && content?.atList.length ? await getAtContacts(that, content?.atList) : '';
+                                await index_js_1.roomSay.call(that, room, atContacts, content.message);
                             }
                         }
                         else if (content.target === 'Contact' || content.target === 'contact') {
                             console.log(`收到联系人：${content.alias || content.name}发送消息请求： ${content.message.content || content.message.url}`);
-                            let contact = (content.wxid && await that.Contact.load(content.wxid)) || (await that.Contact.find({ name: content.name })) || (await that.Contact.find({ alias: content.alias })) || (await that.Contact.find({ weixin: content.weixin })); // 获取你要发送的联系人
+                            let contact = await getContact(that, content); // 获取你要发送的联系人
                             if (!contact) {
                                 console.log(`查找不到联系人：${content.name || content.alias}，请检查联系人名称是否正确`);
                                 return;
@@ -151,7 +179,7 @@ async function initMqtt(that) {
                         console.log('触发批量发送消息请求', content.target);
                         if (content.target === 'Room' || content.target === 'room') {
                             for (let room of content.groups) {
-                                await sendRoomSay(that, room, content.messages);
+                                await sendRoomSay(that, room, content.messages, content?.atList);
                                 await (0, index_js_3.delay)(600);
                             }
                         }

package/dist/cjs/src/proxy/multimodal.js

@@ -26,7 +26,7 @@ async function getVoiceText(file, aiConfig) {
         let config = {
             method: 'post',
             maxBodyLength: Infinity,
-            timeout: 60000,
+            timeout: 180000,
             url: config_js_1.AIBOTK_OUTAPI + '/voice/text',
             headers: {
                 ...formData.getHeaders(),
@@ -62,7 +62,7 @@ async function getText2Speech(text, aiConfig) {
         let config = {
             method: 'post',
             maxBodyLength: Infinity,
-            timeout: 60000,
+            timeout: 180000,
             url: config_js_1.AIBOTK_OUTAPI + '/text/speech',
             headers: {
                 'Content-Type': 'application/json',
@@ -102,7 +102,7 @@ async function getImageVision(images, question, config) {
         const reqConfig = {
             method: 'post',
             maxBodyLength: Infinity,
-            timeout: 60000,
+            timeout: 180000,
             url: config_js_1.AIBOTK_OUTAPI + '/image/vision',
             headers: {
                 Authorization: `Bearer ${apiKey}`,

package/dist/esm/src/common/index.js

@@ -239,7 +239,12 @@ async function roomSay(room, contact, msg) {
         if (msg.type === 1 && msg.content) {
             const content = await formatContent(msg.content);
             // 文字
-            contact ? await room.say(content, contact) : await room.say(content);
+            if (Array.isArray(contact)) {
+                await room.say(content, ...contact);
+            }
+            else {
+                contact ? await room.say(content, contact) : await room.say(content);
+            }
             void addReplyHistory(this, { content, contact: null, room: room });
         }
         else if (msg.type === 2 && msg.url) {
@@ -256,11 +261,17 @@ async function roomSay(room, contact, msg) {
         else if (msg.type === 3 && msg.url) {
             // bse64文件
             let obj = FileBox.fromDataURL(msg.url, 'room-avatar.jpg');
-            contact ? await room.say('', contact) : '';
+            if (Array.isArray(contact)) {
+                await room.say('', ...contact);
+            }
+            else {
+                contact ? await room.say('', contact) : '';
+            }
             await delay(500);
             await room.say(obj);
         }
         else if (msg.type === 4 && msg.url && msg.title && msg.description) {
+            // @ts-ignore
             const description = await formatContent(msg.description);
             const title = await formatContent(msg.title);
             let url = new this.UrlLink({

package/dist/esm/src/handlers/on-callback-message.d.ts

@@ -0,0 +1,3 @@
+export default onRecordMessage;
+declare function onRecordMessage(msg: any): Promise<void>;
+//# sourceMappingURL=on-callback-message.d.ts.map

package/dist/esm/src/handlers/on-callback-message.js

@@ -0,0 +1,173 @@
+import { allConfig } from '../db/configDb.js';
+import { uploadOssFile } from "../lib/oss.js";
+import dayjs from "dayjs";
+import { getPuppetInfo } from "../db/puppetDb.js";
+import path from "path";
+import axios from "axios";
+async function onRecordMessage(msg) {
+    try {
+        const puppetInfo = await getPuppetInfo();
+        const config = await allConfig();
+        const conversationRecord = config.conversationRecord || {};
+        const { role } = config && config.userInfo || { role: 'default' };
+        if (role !== 'vip' || !conversationRecord?.open)
+            return;
+        const contact = msg.talker(); // 发消息人
+        const contactName = contact.name(); // 发消息人昵称
+        const contactAlias = await contact.alias();
+        const room = msg.room(); // 是否为群消息
+        const roomName = room ? await room.topic() : '';
+        const msgSelf = msg.self(); // 是否自己发给自己的消息
+        const type = msg.type();
+        const timestamp = msg.timestamp || dayjs().unix();
+        const robotInfo = this.currentUser;
+        const isOfficial = contact.type() === this.Contact.Type.Official;
+        if (msgSelf || isOfficial)
+            return;
+        console.log('msg', msg);
+        const baseMsg = {
+            conversionId: room ? room.id : contact.id,
+            conversionName: room ? roomName : contactName,
+            isRoom: !!room,
+            chatName: contactName,
+            chatId: contact.id,
+            chatAlias: contactAlias,
+            time: timestamp.length > 10 ? parseInt(timestamp / 1000) : timestamp
+        };
+        switch (type) {
+            case this.Message.Type.Channel:
+                baseMsg.type = '视频号';
+                const channelInfo = await msg.toChannel();
+                baseMsg.mediaInfo = {
+                    nickname: channelInfo.nickname(),
+                    coverUrl: channelInfo.coverUrl(),
+                    avatar: channelInfo.avatar(),
+                    desc: channelInfo.desc(),
+                    url: channelInfo.url(),
+                    objectId: channelInfo.objectId(),
+                    objectNonceId: channelInfo.objectNonceId()
+                };
+                break;
+            case this.Message.Type.Contact:
+                baseMsg.type = '名片';
+                const contactInfo = await msg.toContact();
+                baseMsg.mediaInfo = {
+                    name: contactInfo.name(),
+                    avatar: contactInfo.payload.avatar || '',
+                    wxid: contactInfo.id,
+                };
+                break;
+            case this.Message.Type.RedEnvelope:
+                baseMsg.type = '红包';
+                baseMsg.content = "收到红包";
+                break;
+            case this.Message.Type.Emoticon:
+                baseMsg.type = '自定义表情';
+                const emoticonFileBox = await msg.toFileBox();
+                const emoticonBuffer = await emoticonFileBox.toBuffer();
+                const emoticonUrl = await uploadOssFile(`${conversationRecord?.ossConfig?.custom_path || ''}${emoticonFileBox.name}`, emoticonBuffer);
+                baseMsg.url = emoticonUrl;
+                break;
+            case this.Message.Type.Text:
+                baseMsg.type = '文字';
+                baseMsg.content = msg.text().trim();
+                break;
+            case this.Message.Type.Url:
+                const urlLink = await msg.toUrlLink();
+                baseMsg.type = 'h5链接';
+                baseMsg.mediaInfo = {
+                    url: urlLink.url(),
+                    description: urlLink.description(),
+                    imageUrl: urlLink.thumbnailUrl(),
+                    title: urlLink.title(),
+                };
+                break;
+            case this.Message.Type.MiniProgram:
+                const miniProgram = await msg.toMiniProgram();
+                const appid = puppetInfo.puppetType === 'PuppetService' ? miniProgram.username() : miniProgram.appid().replaceAll('@app', '');
+                const username = puppetInfo.puppetType === 'PuppetService' ? miniProgram.appid().replaceAll('@app', '') : miniProgram.username();
+                baseMsg.type = '小程序';
+                baseMsg.mediaInfo = {
+                    url: decodeURIComponent(miniProgram.pagePath()),
+                    appid,
+                    username,
+                    description: miniProgram.description(),
+                    imageUrl: miniProgram.thumbnailUrl(),
+                    title: miniProgram.title(),
+                };
+                break;
+            case this.Message.Type.Attachment:
+            case this.Message.Type.Image:
+            case this.Message.Type.Video:
+                const attachFileBox = await msg.toFileBox();
+                const fileExtname = path.extname(attachFileBox.name);
+                const isImage = fileExtname.includes('.png') || fileExtname.includes('.jpg') || fileExtname.includes('.jpeg') || fileExtname.includes('.gif');
+                baseMsg.type = isImage ? '图片' : '文件';
+                const buffer = await attachFileBox.toBuffer();
+                const url = await uploadOssFile(`${conversationRecord?.ossConfig?.custom_path || ''}${attachFileBox.name}`, buffer);
+                baseMsg.url = url;
+                break;
+            case this.Message.Type.Audio:
+                baseMsg.type = '语音';
+                const audioFileBox = await msg.toFileBox();
+                const audioBuffer = await audioFileBox.toBuffer();
+                const audioUrl = await uploadOssFile(`${conversationRecord?.ossConfig?.custom_path || ''}${audioFileBox.name}`, audioBuffer);
+                baseMsg.url = audioUrl;
+                break;
+            default:
+                break;
+        }
+        console.log('baseMsg', baseMsg);
+        sendMessage(baseMsg, conversationRecord, robotInfo);
+    }
+    catch (e) {
+        console.log('记录消息失败', e);
+    }
+}
+function sendMessage(msgInfo, recordConfig, robotInfo) {
+    const blackKey = ['conversationId', 'conversionName', 'isRoom', 'isRobot', 'chatName', 'chatId', 'chatAlias', 'time', 'type', 'url', 'mediaInfo', 'content'];
+    const baseData = {
+        ...msgInfo
+    };
+    recordConfig.moreData &&
+        recordConfig.moreData.length &&
+        recordConfig.moreData.forEach((mItem) => {
+            if (!blackKey.includes(mItem.key) && mItem.key && mItem.value) {
+                baseData[mItem.key] = mItem.value;
+            }
+        });
+    const timeout = recordConfig.timeout || 180;
+    const header = {
+        'Content-Type': 'application/json'
+    };
+    recordConfig.header &&
+        recordConfig.header.length &&
+        recordConfig.header.forEach((mItem) => {
+            if (mItem.key && mItem.value) {
+                header[mItem.key] = mItem.value;
+            }
+        });
+    const config = {
+        url: recordConfig.customUrl,
+        method: 'POST',
+        timeout: timeout * 1000,
+        headers: header,
+        data: {
+            robotInfo: {
+                wxid: robotInfo.id,
+                name: robotInfo.name(),
+            },
+            message: baseData
+        }
+    };
+    if (recordConfig?.debug) {
+        console.log('消息回调请求参数', config);
+    }
+    axios.request(config).then((res) => {
+        console.log('消息发送成功', res);
+    }).catch((err) => {
+        console.log('消息发送失败', err);
+    });
+}
+export default onRecordMessage;
+//# sourceMappingURL=on-callback-message.js.map

package/dist/esm/src/handlers/on-message.js

@@ -246,7 +246,11 @@ async function dispatchRoomFilterByMsgType(that, room, msg) {
                 else {
                     content = msg.text();
                 }
-                const mentionSelf = await msg.mentionSelf() || content.includes(`@${userSelfName}`);
+                let mentionSelf = await msg.mentionSelf() || content.includes(`@${userSelfName}`);
+                const isMentionAll = await msg.isMentionAll();
+                if (config?.ignoreRoomMentionAll && isMentionAll && mentionSelf) {
+                    mentionSelf = false;
+                }
                 const receiverName = receiver?.name();
                 content = content.replace('@' + receiverName, '').replace('@' + userSelfName, '').replace(/@[^,，：:\s@]+/g, '').trim();
                 console.log(`群名: ${roomName} 发消息人: ${contactName} 内容: ${content} | 机器人被@：${mentionSelf ? '是' : '否'}`);

package/dist/esm/src/index.d.ts

@@ -4,4 +4,5 @@ export function WechatyWebPanelPlugin(config?: {
     scanTimes: any;
 }): (bot: any) => void;
 export function WechatyMessageRecordPlugin(): (bot: any) => void;
+export function WechatyMessageCallBackPlugin(): (bot: any) => void;
 //# sourceMappingURL=index.d.ts.map

package/dist/esm/src/index.js

@@ -13,6 +13,7 @@ import onRoomtopic from './handlers/on-roomtopic.js';
 import onRoomleave from './handlers/on-roomleave.js';
 import onVerifyCode from './handlers/on-verifycode.js';
 import onRecordMessage from './handlers/on-record-message.js';
+import onCallbackMessage from "./handlers/on-callback-message.js";
 import dayjs from "dayjs";
 const originalConsoleLog = console.log;
 // 重写 console.log 方法
@@ -77,5 +78,10 @@ function WechatyMessageRecordPlugin() {
         bot.on('message', onRecordMessage);
     };
 }
-export { WechatyWebPanelPlugin, WechatyMessageRecordPlugin };
+function WechatyMessageCallBackPlugin() {
+    return function (bot) {
+        bot.on('message', onCallbackMessage);
+    };
+}
+export { WechatyWebPanelPlugin, WechatyMessageRecordPlugin, WechatyMessageCallBackPlugin };
 //# sourceMappingURL=index.js.map

package/dist/esm/src/lib/oss.d.ts

@@ -0,0 +1,2 @@
+export function uploadOssFile(fileName: any, file: any): Promise<any>;
+//# sourceMappingURL=oss.d.ts.map

package/dist/esm/src/lib/oss.js

@@ -0,0 +1,24 @@
+import OSS from 'ali-oss';
+import { allConfig } from '../db/configDb.js';
+async function initStore() {
+    const config = await allConfig();
+    const ossConfig = config.conversationRecord && config.conversationRecord.ossConfig;
+    const options = {
+        region: ossConfig.region,
+        accessKeyId: ossConfig.aliAkId,
+        accessKeySecret: ossConfig.aliAkSecret,
+        bucket: ossConfig.bucket
+    };
+    if (ossConfig.custom_domain) {
+        options.endpoint = ossConfig.custom_domain;
+    }
+    const store = new OSS(options);
+    return store;
+}
+export async function uploadOssFile(fileName, file) {
+    console.log('file', file);
+    const store = await initStore();
+    const result = await store.put(fileName, file);
+    return result?.url || '';
+}
+//# sourceMappingURL=oss.js.map

package/dist/esm/src/package-json.d.ts

@@ -56,6 +56,7 @@ export namespace packageJson {
     }
     const dependencies: {
         "@dqbd/tiktoken": string;
+        "ali-oss": string;
         axios: string;
         "baidu-aip-sdk": string;
         dayjs: string;

package/dist/esm/src/package-json.js

@@ -3,7 +3,7 @@
  */
 export const packageJson = {
     "name": "wechaty-web-panel",
-    "version": "1.6.67",
+    "version": "1.6.69",
     "description": "智能微秘书插件",
     "exports": {
         ".": {
@@ -74,6 +74,7 @@ export const packageJson = {
     },
     "dependencies": {
         "@dqbd/tiktoken": "^1.0.2",
+        "ali-oss": "^6.21.0",
         "axios": "^1.6.6",
         "baidu-aip-sdk": "^4.16.10",
         "dayjs": "^1.11.7",

package/dist/esm/src/proxy/aibotk.js

@@ -246,6 +246,9 @@ async function getConfig() {
             defaultReply: '',
             forwards: [],
             openRecord: false,
+            openWhisper: false,
+            whisperConfig: {},
+            ignoreRoomMentionAll: true,
             ...config,
             cloudRoom
         });

package/dist/esm/src/proxy/mqtt.js

@@ -1,9 +1,9 @@
 import * as mqtt from 'mqtt';
 import { allConfig } from '../db/configDb.js';
 import { contactSay, roomSay, sendRoomNotice } from '../common/index.js';
-import { getConfig, getMqttConfig, getGptConfig, getRssConfig, getVerifyCode, getTasks } from "./aibotk.js";
+import { getConfig, getGptConfig, getMqttConfig, getRssConfig, getTasks, getVerifyCode } from "./aibotk.js";
 import { dispatchEventContent } from '../service/event-dispatch-service.js';
-import { sendTaskMessage, initMultiTask, sendMultiTaskMessage } from "../task/index.js";
+import { initMultiTask, sendMultiTaskMessage, sendTaskMessage } from "../task/index.js";
 import { delay, randomRange } from "../lib/index.js";
 import { reset } from './bot/chatgpt.js';
 import { reset as difyReset } from './bot/dify.js';
@@ -15,23 +15,32 @@ import globalConfig from "../db/global.js";
 import { resetScanTime } from '../handlers/on-scan.js';
 import { clearHistory } from "../db/chatHistory.js";
 let mqttclient = null;
-async function sendRoomSay(that, room, messages) {
+async function getContact(that, contact) {
+    const contactInfo = (contact.wxid && await that.Contact.find({ id: contact.wxid || '' })) || (contact.id && await that.Contact.find({ id: contact.id || '' })) || (contact.name && await that.Contact.find({ name: contact.name || '' })) || (contact.alias && await that.Contact.find({ alias: contact.alias || '' })) || (contact.weixin && await that.Contact.find({ weixin: contact.weixin || '' }));
+    return contactInfo;
+}
+async function getRoom(that, room) {
+    const roomInfo = (room.wxid && await that.Room.find({ id: room.wxid || '' })) || (room.id && await that.Room.find({ id: room.id || '' })) || (room.name && await that.Room.find({ topic: room.name || '' })) || (room.roomName && await that.Room.find({ topic: room.roomName || '' }));
+    return roomInfo;
+}
+async function sendRoomSay(that, room, messages, atList) {
     console.log(`收到群：${room.name}批量发送消息请求， 消息数量【${messages.length}】`);
-    const finalRoom = await that.Room.find({ id: room.id, topic: room.name });
+    const finalRoom = await getRoom(that, room);
     if (!finalRoom) {
         console.log(`查找不到群：${room.name}，请检查群名是否正确`);
         return;
     }
     else {
         for (let message of messages) {
-            await roomSay.call(that, finalRoom, '', message);
+            const atContacts = await getAtContacts(that, atList);
+            await roomSay.call(that, finalRoom, atContacts, message);
             await delay(500);
         }
     }
 }
 async function sendContactSay(that, contact, messages) {
     console.log(`收到好友：${contact.name}批量发送消息请求， 消息数量【${messages.length}】`);
-    const finalContact = await that.Contact.find({ id: contact.id || '', name: contact.name, alias: contact.alias || '', weixin: contact.weixin || '' });
+    const finalContact = await getContact(that, contact);
     if (!finalContact) {
         console.log(`查找不到好友：${contact.name}，请检查好友名称是否正确`);
         return;
@@ -43,9 +52,27 @@ async function sendContactSay(that, contact, messages) {
         }
     }
 }
+async function getAtContacts(that, atList) {
+    if (!atList || atList.length === 0)
+        return '';
+    console.log('atList', atList);
+    let contacts = [];
+    for (let contact of atList) {
+        if (contact.id === '@all' || contact.name === '@all') {
+            contacts.push('@all');
+            return contacts;
+        }
+        let atContact = await getContact(that, contact);
+        if (atContact) {
+            contacts.push(atContact);
+        }
+    }
+    console.log('search contact', contacts);
+    return contacts;
+}
 async function sendRoomsNotice(that, room, messages) {
     console.log(`收到群：${room.name}批量发送群公告请求， 公告数量【${messages.length}】`);
-    const finalRoom = await that.Room.find({ id: room.id, topic: room.name });
+    const finalRoom = await getRoom(that, room);
     if (!finalRoom) {
         console.log(`查找不到群：${room.name}，请检查群名是否正确`);
         return;
@@ -103,12 +130,13 @@ async function initMqtt(that) {
                                 return;
                             }
                             else {
-                                await roomSay.call(that, room, '', content.message);
+                                const atContacts = content?.atList && content?.atList.length ? await getAtContacts(that, content?.atList) : '';
+                                await roomSay.call(that, room, atContacts, content.message);
                             }
                         }
                         else if (content.target === 'Contact' || content.target === 'contact') {
                             console.log(`收到联系人：${content.alias || content.name}发送消息请求： ${content.message.content || content.message.url}`);
-                            let contact = (content.wxid && await that.Contact.load(content.wxid)) || (await that.Contact.find({ name: content.name })) || (await that.Contact.find({ alias: content.alias })) || (await that.Contact.find({ weixin: content.weixin })); // 获取你要发送的联系人
+                            let contact = await getContact(that, content); // 获取你要发送的联系人
                             if (!contact) {
                                 console.log(`查找不到联系人：${content.name || content.alias}，请检查联系人名称是否正确`);
                                 return;
@@ -122,7 +150,7 @@ async function initMqtt(that) {
                         console.log('触发批量发送消息请求', content.target);
                         if (content.target === 'Room' || content.target === 'room') {
                             for (let room of content.groups) {
-                                await sendRoomSay(that, room, content.messages);
+                                await sendRoomSay(that, room, content.messages, content?.atList);
                                 await delay(600);
                             }
                         }

package/dist/esm/src/proxy/multimodal.js

@@ -20,7 +20,7 @@ export async function getVoiceText(file, aiConfig) {
         let config = {
             method: 'post',
             maxBodyLength: Infinity,
-            timeout: 60000,
+            timeout: 180000,
             url: AIBOTK_OUTAPI + '/voice/text',
             headers: {
                 ...formData.getHeaders(),
@@ -55,7 +55,7 @@ export async function getText2Speech(text, aiConfig) {
         let config = {
             method: 'post',
             maxBodyLength: Infinity,
-            timeout: 60000,
+            timeout: 180000,
             url: AIBOTK_OUTAPI + '/text/speech',
             headers: {
                 'Content-Type': 'application/json',
@@ -94,7 +94,7 @@ export async function getImageVision(images, question, config) {
         const reqConfig = {
             method: 'post',
             maxBodyLength: Infinity,
-            timeout: 60000,
+            timeout: 180000,
             url: AIBOTK_OUTAPI + '/image/vision',
             headers: {
                 Authorization: `Bearer ${apiKey}`,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wechaty-web-panel",
-  "version": "1.6.67",
+  "version": "1.6.69",
   "description": "智能微秘书插件",
   "exports": {
     ".": {
@@ -71,6 +71,7 @@
   },
   "dependencies": {
     "@dqbd/tiktoken": "^1.0.2",
+    "ali-oss": "^6.21.0",
     "axios": "^1.6.6",
     "baidu-aip-sdk": "^4.16.10",
     "dayjs": "^1.11.7",