wechaty-web-panel 1.6.118 → 1.6.120

package/dist/common/index.js

@@ -9,7 +9,8 @@ import { getPuppetEol, isWindowsPlatform } from "../const/puppet-type.js";
 import dayjs from "dayjs";
 import { addHistory } from "../db/chatHistory.js";
 import { getPuppetInfo } from "../db/puppetDb.js";
-import * as URL from 'url';
+import url from 'url';
+import path from 'path';
 async function formatContent(text) {
     text = text.replaceAll('\\n', '\n');
     const isWin = await isWindowsPlatform();
@@ -229,6 +230,7 @@ function getFileNameFromUrl(fileUrl) {
         return decodeURIComponent(path.basename(urlObj.pathname));
     }
     catch (err) {
+        console.error('获取文件名失败', err);
         return null;
     }
 }
@@ -269,7 +271,7 @@ async function roomSay(room, contact, msg, noNeedAt = false) {
         else if (msg.type === 2 && msg.url) {
             // url文件
             const name = getFileNameFromUrl(msg.url);
-            let obj = FileBox.fromUrl(msg.url, name);
+            let obj = FileBox.fromUrl(encodeURI(msg.url), name);
             if (obj.mediaType === 'image/webp') {
                 obj = FileBox.fromUrl(`${AIBOTK_OUTAPI}/convert?url=${msg.url}`);
             }
@@ -363,7 +365,7 @@ async function contactSay(contact, msg, isRoom = false) {
         else if (msg.type === 2 && msg.url) {
             // url文件
             const name = getFileNameFromUrl(msg.url);
-            let obj = FileBox.fromUrl(msg.url, name);
+            let obj = FileBox.fromUrl(encodeURI(msg.url), name);
             await obj.ready();
             if (obj.mediaType === 'image/webp') {
                 obj = FileBox.fromUrl(`${AIBOTK_OUTAPI}/convert?url=${msg.url}`, getFileNameFromUrl(msg.url));

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

@@ -18,6 +18,7 @@ async function onRecordMessage(msg) {
         const room = msg.room(); // 是否为群消息
         const roomName = room ? await room.topic() : '';
         const msgSelf = msg.self(); // 是否自己发给自己的消息
+        const msgId = msg.id;
         const type = msg.type();
         const timestamp = msg.timestamp || dayjs().unix();
         const robotInfo = this.currentUser;
@@ -75,7 +76,7 @@ async function onRecordMessage(msg) {
                 baseMsg.type = '自定义表情';
                 const emoticonFileBox = await msg.toFileBox();
                 const emoticonBuffer = await emoticonFileBox.toBuffer();
-                const emoticonUrl = await uploadOssFile(`${conversationRecord?.ossConfig?.custom_path || ''}${dayjs().valueOf()}_${emoticonFileBox.name}`, emoticonBuffer);
+                const emoticonUrl = await uploadOssFile(`${conversationRecord?.ossConfig?.custom_path || ''}${msgId}_${dayjs().valueOf()}_${emoticonFileBox.name}`, emoticonBuffer);
                 baseMsg.url = emoticonUrl;
                 break;
             case this.Message.Type.Text:
@@ -114,14 +115,14 @@ async function onRecordMessage(msg) {
                 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 || ''}${dayjs().valueOf()}_${attachFileBox.name}`, buffer);
+                const url = await uploadOssFile(`${conversationRecord?.ossConfig?.custom_path || ''}${msgId}_${dayjs().valueOf()}_${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 || ''}${dayjs().valueOf()}_${audioFileBox.name}`, audioBuffer);
+                const audioUrl = await uploadOssFile(`${conversationRecord?.ossConfig?.custom_path || ''}${msgId}_${dayjs().valueOf()}_${audioFileBox.name}`, audioBuffer);
                 baseMsg.url = audioUrl;
                 break;
             case this.Message.Type.ChatHistory:
@@ -170,7 +171,7 @@ async function formatHistory(that, history, conversationRecord) {
             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 || ''}${dayjs().valueOf()}_${attachFileBox.name}`, buffer);
+            const url = await uploadOssFile(`${conversationRecord?.ossConfig?.custom_path || ''}${msgId}_${dayjs().valueOf()}_${attachFileBox.name}`, buffer);
             contents.push(`()[${url}]`);
         }
         else if (history.type === that.Message.Type.ChatHistory) {

package/dist/handlers/on-claw-message.js

@@ -0,0 +1,397 @@
+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";
+import { getClawMqttConfig } from "../proxy/aibotk.js";
+import * as mqtt from 'mqtt';
+import { randomRange } from '../lib/index.js';
+import { v4 as uuidv4 } from 'uuid';
+let clawMqttClient = null;
+// allowScope: 1 所有群和好友 2 所有群 3 所有好友 4 部分群和部分好友
+// allowFriends: [{label: '昵称', value: 'wixd'}] 只需要 checkId即可
+async function checkAllow(clawConfig, contactId, roomId) {
+    const { allowScope = 1, allowFriends = [], allowRooms = [] } = clawConfig;
+    if (allowScope === 1) {
+        // 所有群和好友
+        return true;
+    }
+    else if (allowScope === 2) {
+        // 仅所有群
+        return !!room;
+    }
+    else if (allowScope === 3) {
+        // 仅所有好友
+        return !room;
+    }
+    else if (allowScope === 4) {
+        // 部分群和部分好友
+        if (room) {
+            return allowRooms.some(r => r.value === roomId);
+        }
+        else {
+            return allowFriends.some(f => f.value === contactId);
+        }
+    }
+    return false;
+}
+async function onClawMessage(msg) {
+    try {
+        const puppetInfo = await getPuppetInfo();
+        const config = await allConfig();
+        const clawConfig = config?.clawConfig || { open: false, allowScope: 1, allowFriends: [], allowRooms: [], forwardAllMsg: false, forwardIncludeKeywordsMsg: [], forwardMediaMsg: false, ossConfig: {} };
+        const { role } = config && config.userInfo || { role: 'default' };
+        if (role !== 'vip' || !clawConfig?.open)
+            return;
+        if (!clawMqttClient || !clawMqttClient.connected)
+            return;
+        const contact = msg.talker(); // 发消息人
+        const contactName = contact && contact.name() || ''; // 发消息人昵称
+        const contactAlias = contact && 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 allowed = await checkAllow(clawConfig, contact.id, room ? room.id : null);
+        if (!allowed)
+            return;
+        let isOfficial = null;
+        try {
+            isOfficial = contact && contact.type() === this.Contact.Type.Official;
+        }
+        catch (e) {
+            console.log('check isOfficial error, don`t worry, no effect :', e);
+            isOfficial = false;
+        }
+        const userWeixin = contact && contact.weixin() || '';
+        if (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,
+            chatUserWeixin: userWeixin,
+            isMyself: !!msgSelf,
+            time: timestamp.length > 10 ? parseInt(timestamp / 1000) : timestamp,
+            msgId: msg.id,
+        };
+        switch (type) {
+            case this.Message.Type.Channel:
+                baseMsg.type = '视频号';
+                const channelInfo = await msg.toChannel();
+                baseMsg.content = `【视频号消息】\n视频号昵称：${channelInfo.nickname()}\n视频号简介：${channelInfo.desc}\n视频号链接：${channelInfo.url}`;
+                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.content = "【名片消息】\n" + `联系人昵称：${contactInfo.name()}\n联系人ID：${contactInfo.id}`;
+                baseMsg.mediaInfo = {
+                    name: contactInfo.name(),
+                    avatar: contactInfo.payload.avatar || '',
+                    wxid: contactInfo.id,
+                };
+                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.content = `【链接消息】\n链接标题：${urlLink.title()}\n链接描述：${urlLink.description()}\n链接地址：${urlLink.url()}`;
+                baseMsg.mediaInfo = {
+                    url: urlLink.url(),
+                    description: urlLink.description(),
+                    imageUrl: urlLink.thumbnailUrl(),
+                    title: urlLink.title(),
+                };
+                break;
+            case this.Message.Type.Attachment:
+            case this.Message.Type.Image:
+            case this.Message.Type.Video:
+                const attachFileBox = await msg.toFileBox();
+                if (attachFileBox.remoteUrl) {
+                    // 直接使用远程链接，无需上传
+                    baseMsg.url = attachFileBox.remoteUrl;
+                    baseMsg.content = `【${type === this.Message.Type.Image ? '图片' : type === this.Message.Type.Video ? '视频' : '文件'}消息】\n文件名：${attachFileBox.name}\n下载链接：${attachFileBox.remoteUrl}`;
+                    break;
+                }
+                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();
+                if (clawConfig?.ossConfig.type) {
+                    const url = await uploadOssFile(`${clawConfig?.ossConfig?.custom_path || ''}${dayjs().valueOf()}_${attachFileBox.name}`, buffer, clawConfig?.ossConfig);
+                    baseMsg.url = url;
+                    baseMsg.content = `【${isImage ? '图片' : '文件'}消息】\n文件名：${attachFileBox.name}\n下载链接：${url}`;
+                }
+                else {
+                    // 没有配置OSS，使用base64
+                    const base64 = attachFileBox.toBase64();
+                    baseMsg.url = base64;
+                    baseMsg.content = `【${isImage ? '图片' : '文件'}消息】\n文件名：${attachFileBox.name}\n文件大小：${buffer.length} bytes\n（文件内容未上传，仅提供base64字符串）`;
+                }
+                break;
+            case this.Message.Type.Audio:
+                if (puppetInfo.puppetType.includes('PuppetService') && !msg.text().startsWith('@')) {
+                    baseMsg.type = '文字';
+                    baseMsg.content = msg.text().trim();
+                    break;
+                }
+                baseMsg.type = '语音';
+                const audioFileBox = await msg.toFileBox();
+                const audioBuffer = await audioFileBox.toBuffer();
+                if (clawConfig?.ossConfig.type) {
+                    const audioUrl = await uploadOssFile(`${clawConfig?.ossConfig?.custom_path || ''}${dayjs().valueOf()}_${audioFileBox.name}`, audioBuffer, clawConfig?.ossConfig);
+                    baseMsg.url = audioUrl;
+                    baseMsg.content = `【语音消息】\n文件名：${audioFileBox.name}\n下载链接：${audioUrl}`;
+                }
+                else {
+                    // 没有配置OSS，使用base64
+                    const audioBase64 = audioFileBox.toBase64();
+                    baseMsg.url = audioBase64;
+                    baseMsg.content = `【语音消息】\n文件名：${audioFileBox.name}\n文件大小：${audioBuffer.length} bytes\n（文件内容未上传，仅提供base64字符串）`;
+                }
+                break;
+            case this.Message.Type.ChatHistory:
+                const historys = await msg.toChatHistory();
+                const contents = await formatHistory(this, historys.payload, clawConfig);
+                baseMsg.type = '历史记录';
+                baseMsg.content = contents;
+                break;
+            case this.Message.Type.Location:
+                const location = await msg.toLocation();
+                const locationParse = `【位置解析结果】\n纬度：${locationInfo?.payload?.latitude}\n经度：${locationInfo?.payload?.longitude}\n地点名：${locationInfo?.payload?.name}\n城市：${locationInfo?.payload?.city || ''}\n具体地址：${locationInfo?.payload?.address}\nPoiId：${locationInfo?.payload?.poiId || ''}`;
+                baseMsg.type = '位置';
+                baseMsg.content = locationParse;
+                break;
+            default:
+                break;
+        }
+        console.log('baseMsg', baseMsg);
+        const { forwardAllMsg, forwardIncludeKeywordsMsg = [], forwardMediaMsg } = clawConfig;
+        if (baseMsg.type === '文字') {
+            if (!forwardAllMsg) {
+                const hit = forwardIncludeKeywordsMsg.some(kw => baseMsg.content && baseMsg.content.includes(kw));
+                if (!hit)
+                    return;
+            }
+        }
+        else {
+            if (!forwardMediaMsg)
+                return;
+        }
+        publishClawMessage(baseMsg, robotInfo);
+    }
+    catch (e) {
+        console.log('claw 消息处理失败', e);
+    }
+}
+async function formatHistory(that, history, clawConfig) {
+    const contents = [];
+    for (const history of historys) {
+        if (history.type === that.Message.Type.Text) {
+            contents.push(history.message);
+        }
+        else if (history.type === that.Message.Type.Recalled || history.type === that.Message.Type.Attachment || history.type === that.Message.Type.Image || history.type === that.Message.Type.Video) {
+            const attachFileBox = await history.message.toFileBox();
+            const fileExtname = path.extname(attachFileBox.name);
+            const isImage = fileExtname.includes('.png') || fileExtname.includes('.jpg') || fileExtname.includes('.jpeg') || fileExtname.includes('.gif');
+            baseMsg.type = isImage ? '图片' : '文件';
+            if (attachFileBox.remoteUrl) {
+                // 直接使用远程链接，无需上传
+                const url = attachFileBox.remoteUrl;
+                contents.push(`【${isImage ? '图片' : '文件'}消息】\n文件名：${attachFileBox.name}\n下载链接：${url}`);
+                continue;
+            }
+            const buffer = await attachFileBox.toBuffer();
+            if (!clawConfig?.ossConfig.type) {
+                const base64 = attachFileBox.toBase64();
+                contents.push(`【${isImage ? '图片' : '文件'}消息】\n文件名：${attachFileBox.name}\n文件大小：${buffer.length} bytes\n（文件内容未上传，仅提供base64字符串）`);
+                continue;
+            }
+            const url = await uploadOssFile(`${clawConfig?.ossConfig?.custom_path || ''}${dayjs().valueOf()}_${attachFileBox.name}`, buffer, clawConfig?.ossConfig);
+            contents.push(`【${isImage ? '图片' : '文件'}消息】\n文件名：${attachFileBox.name}\n下载链接：${url}`);
+        }
+        else if (history.type === that.Message.Type.ChatHistory) {
+            const res = await formatHistory(that, history.message, clawConfig);
+            contents.push(res);
+        }
+    }
+    return contents.join('\n');
+}
+/**
+ * 将消息通过 MQTT 发布到 reciveTopic
+ */
+function publishClawMessage(baseMsg, robotInfo) {
+    try {
+        if (!clawMqttClient || !clawMqttClient.connected)
+            return;
+        const payload = {
+            content: baseMsg.content || '',
+            robotId: robotInfo.id,
+            senderId: baseMsg.chatId,
+            senderName: baseMsg.chatName,
+            isGroup: baseMsg.isRoom,
+            groupId: baseMsg.isRoom ? baseMsg.conversionId : undefined,
+            groupName: baseMsg.isRoom ? baseMsg.conversionName : undefined,
+            timestamp: baseMsg.time * 1000, // 转换为 11 位毫秒时间戳
+            messageId: baseMsg.msgId,
+            type: baseMsg.type,
+            mediaInfo: baseMsg.mediaInfo,
+            url: baseMsg.url,
+        };
+        console.log('发布 Claw MQTT 消息', payload);
+        clawMqttClient.publish(clawMqttClient._clawReciveTopic, JSON.stringify(payload), { qos: 1 });
+    }
+    catch (e) {
+        console.log('发布 Claw MQTT 消息失败', e);
+    }
+}
+/**
+ * 初始化 Claw MQTT 连接
+ * 1. 连接 MQTT，将入站消息发布到 reciveTopic
+ * 2. 订阅 sendTopic，收到消息后通过微信发送
+ */
+async function initClawMqtt(that) {
+    try {
+        const config = await allConfig();
+        const clawConfig = config?.clawConfig || { open: false, allowScope: 1, allowFriends: [], allowRooms: [], forwardAllMsg: false, forwardIncludeKeywordsMsg: [], forwardMediaMsg: false, ossConfig: {} };
+        const { role } = config && config.userInfo || { role: 'default' };
+        if (role !== 'vip' || !clawConfig?.open)
+            return;
+        if (clawMqttClient && clawMqttClient.connected)
+            return;
+        const mqttConfig = await getClawMqttConfig();
+        if (!mqttConfig)
+            return;
+        const { port, host, username, password, clientId, reciveTopic, sendTopic } = mqttConfig;
+        if (!host)
+            return;
+        clawMqttClient = mqtt.connect(`mqtt://${host}:${port}`, {
+            username,
+            password,
+            clientId: clientId + randomRange(1, 10000),
+        });
+        // 在 client 上挂载 topic 便于 publishClawMessage 使用
+        clawMqttClient._clawReciveTopic = reciveTopic;
+        clawMqttClient.on('connect', function () {
+            console.log('Claw MQTT 连接成功');
+            clawMqttClient.subscribe(sendTopic, function (err) {
+                if (err) {
+                    console.log('Claw MQTT 订阅失败', err);
+                }
+                else {
+                    console.log(`Claw MQTT 订阅成功: ${sendTopic}`);
+                }
+            });
+        });
+        clawMqttClient.on('reconnect', function () {
+            console.log('Claw MQTT 重连中...');
+        });
+        clawMqttClient.on('error', function (e) {
+            console.log('Claw MQTT 错误', e);
+        });
+        clawMqttClient.on('message', async function (topic, message) {
+            try {
+                if (topic !== sendTopic)
+                    return;
+                const content = JSON.parse(message.toString());
+                /**
+                 * 收到消息格式：
+                 * {
+                 *   isGroup: false,
+                 *   groupId: 'roomid_xxx',
+                 *   contactId: 'wxid_xxx',
+                 *   mentionIds: ['wxid_xxx'],
+                 *   messages: [
+                 *     { type: 1, content: '文本内容' },
+                 *     { type: 2, url: 'http link' },
+                 *   ]
+                 * }
+                 */
+                const { isGroup, groupId, contactId, mentionIds = [], messages = [] } = content;
+                if (isGroup && groupId) {
+                    const room = await that.Room.find({ id: groupId });
+                    if (!room) {
+                        console.log(`Claw MQTT: 查找不到群 ${groupId}`);
+                        return;
+                    }
+                    // 解析 @ 联系人
+                    let atContacts = [];
+                    for (const wxid of mentionIds) {
+                        const c = await that.Contact.find({ id: wxid });
+                        if (c)
+                            atContacts.push(c);
+                    }
+                    for (const msg of messages) {
+                        if (msg.type === 1) {
+                            // 文字消息
+                            if (atContacts.length > 0) {
+                                await room.say(msg.content, ...atContacts);
+                            }
+                            else {
+                                await room.say(msg.content);
+                            }
+                        }
+                        else if (msg.type === 2) {
+                            // 图片消息
+                            const { FileBox } = await import('file-box');
+                            const fileBox = FileBox.fromUrl(msg.url);
+                            await room.say(fileBox);
+                        }
+                    }
+                }
+                else if (!isGroup && contactId) {
+                    const contact = await that.Contact.find({ id: contactId });
+                    if (!contact) {
+                        console.log(`Claw MQTT: 查找不到联系人 ${contactId}`);
+                        return;
+                    }
+                    for (const msg of messages) {
+                        if (msg.type === 1) {
+                            await contact.say(msg.content);
+                        }
+                        else if (msg.type === 2) {
+                            const { FileBox } = await import('file-box');
+                            const fileBox = FileBox.fromUrl(msg.url);
+                            await contact.say(fileBox);
+                        }
+                    }
+                }
+            }
+            catch (e) {
+                console.log('Claw MQTT 处理消息失败', e);
+            }
+        });
+    }
+    catch (e) {
+        console.log('Claw MQTT 初始化失败', e);
+    }
+}
+function closeClawMqtt() {
+    if (clawMqttClient && clawMqttClient.connected) {
+        clawMqttClient.end();
+        clawMqttClient = null;
+    }
+}
+export default onClawMessage;
+export { initClawMqtt, closeClawMqtt };
+//# sourceMappingURL=on-claw-message.js.map

package/dist/handlers/on-login.js

@@ -5,6 +5,7 @@ import { allConfig } from '../db/configDb.js';
 import { updatePuppetConfig } from "../db/puppetDb.js";
 import { PUPPET_MAP } from '../const/puppet-type.js';
 import { packageJson } from '../package-json.js';
+import { initClawMqtt } from './on-claw-message.js';
 /**
  * 登录成功监听事件
  * @param {*} user 登录用户
@@ -49,6 +50,7 @@ async function onLogin(user) {
         }
         await sendRobotInfo(avatarUrl, user.name(), userInfo.robotId); // 更新用户头像
         await initMqtt(this); // 初始化mqtt任务
+        await initClawMqtt(this); // 初始化爪子mqtt
     }
     catch (e) {
         console.log('登录后初始化失败', e);

package/dist/handlers/on-message.js

@@ -53,7 +53,7 @@ async function dispatchFriendFilterByMsgType(that, msg) {
         const userAlias = contact && (await contact.alias()) || '';
         let isOfficial = null;
         try {
-            isOfficial = contact && contact.type() === this.Contact.Type.Official;
+            isOfficial = contact && contact.type() === that.Contact.Type.Official;
         }
         catch (e) {
             console.log('check isOfficial error, don`t worry, no effect', e);

package/dist/index.js

@@ -14,6 +14,7 @@ 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 onClawMessage from "./handlers/on-claw-message.js";
 import dayjs from "dayjs";
 const originalConsoleLog = console.log;
 // 重写 console.log 方法
@@ -83,5 +84,10 @@ function WechatyMessageCallBackPlugin() {
         bot.on('message', onCallbackMessage);
     };
 }
-export { WechatyWebPanelPlugin, WechatyMessageRecordPlugin, WechatyMessageCallBackPlugin };
+function WechatyClawChatPlugin() {
+    return function (bot) {
+        bot.on('message', onClawMessage);
+    };
+}
+export { WechatyWebPanelPlugin, WechatyMessageRecordPlugin, WechatyMessageCallBackPlugin, WechatyClawChatPlugin };
 //# sourceMappingURL=index.js.map

package/dist/lib/oss.js

@@ -2,9 +2,9 @@ import OSS from 'ali-oss';
 import { allConfig } from '../db/configDb.js';
 import { uploadGlobalS3File, uploadS3File } from './s3oss.js';
 import { uploadTencentOssFile, uploadGlobalTencentOssFile } from './tencentOss.js';
-export async function uploadOssFile(fileName, file) {
+export async function uploadOssFile(fileName, file, moreOssConfig) {
     const config = await allConfig();
-    const ossConfig = config.conversationRecord && config.conversationRecord.ossConfig;
+    const ossConfig = config.conversationRecord && config.conversationRecord.ossConfig || moreOssConfig;
     if (ossConfig.type === 2) {
         // 使用S3存储
         return await uploadS3File(fileName, file, ossConfig);

package/dist/package-json.js

@@ -3,7 +3,7 @@
  */
 export const packageJson = {
     "name": "wechaty-web-panel",
-    "version": "1.6.118",
+    "version": "1.6.120",
     "exports": {
         ".": {
             "import": "./dist/index.js"
@@ -60,12 +60,13 @@ export const packageJson = {
         "dotenv": "^16.3.0",
         "eventsource-parser": "^1.0.0",
         "express": "^5.1.0",
+        "file-box": "^1.5.5",
         "form-data": "^4.0.0",
         "https-proxy-agent": "^5.0.1",
         "jsonwebtoken": "^9.0.2",
         "keyv": "^4.5.2",
         "langchain": "^0.3.19",
-        "mqtt": "^4.2.6",
+        "mqtt": "^4.3.8",
         "mustache": "^4.2.0",
         "nedb": "^1.8.0",
         "node-fetch": "^2.6.9",

package/dist/proxy/aibotk.js

@@ -238,7 +238,8 @@ async function getConfig() {
             ignoreFiles: false,
             filterLinkContent: false,
             ...config,
-            cloudRoom
+            cloudRoom,
+            clawConfig: { open: false, allowScope: 1, allowFriends: [], allowRooms: [], forwardAllMsg: true, forwardIncludeKeywordsMsg: [], forwardMediaMsg: false, ossConfig: {} }
         });
         return cres;
     }
@@ -755,6 +756,24 @@ async function getMqttConfig() {
         console.log('获取mqtt配置错误', error);
     }
 }
+/**
+ * 获取claw mqtt信息
+ * @param {*} version
+ */
+async function getClawMqttConfig() {
+    try {
+        let option = {
+            method: 'GET',
+            url: '/claw/mqtt/config',
+            params: {},
+        };
+        let content = await aiBotReq(option);
+        return content.data;
+    }
+    catch (error) {
+        console.log('获取claw mqtt配置错误', error);
+    }
+}
 /**
  * 获取实时素材
  * @param {*} version
@@ -801,6 +820,7 @@ export { getRssLast };
 export { updateRssLast };
 export { clearVerifyInfo };
 export { setVerifyInfo };
+export { getClawMqttConfig };
 export default {
     getConfig,
     getScheduleList,
@@ -824,6 +844,8 @@ export default {
     updateRssLast,
     getVerifyCode,
     clearVerifyInfo,
-    setVerifyInfo
+    setVerifyInfo,
+    getClawMqttConfig,
+    getClawMqttConfig
 };
 //# sourceMappingURL=aibotk.js.map

package/dist/service/event-dispatch-service.js

@@ -13,6 +13,7 @@ import { getCozeReply, getCozeSimpleReply, reset as cozeReset } from '../proxy/c
 import { getQAnyReply, reset as qanyReset } from '../proxy/qAnyAi.js';
 import { outApi } from '../proxy/outapi.js';
 import { getUser } from '../db/userDb.js';
+import { initClawMqtt } from '../handlers/on-claw-message.js';
 /**
  * 根据事件名称分配不同的api处理，并获取返回内容
  * @param {string} eName 事件名称
@@ -129,6 +130,7 @@ async function dispatchEventContent(that, eName, msg, name, id, avatar, room, ro
                 qanyReset();
                 cozeV3Reset();
                 fastGptReset();
+                initClawMqtt(that);
                 content = '更新配置成功，请稍等一分钟后生效';
                 break;
             case 'autoRoomCreate':

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wechaty-web-panel",
-  "version": "1.6.118",
+  "version": "1.6.120",
   "exports": {
     ".": {
       "import": "./dist/index.js"
@@ -57,12 +57,13 @@
     "dotenv": "^16.3.0",
     "eventsource-parser": "^1.0.0",
     "express": "^5.1.0",
+    "file-box": "^1.5.5",
     "form-data": "^4.0.0",
     "https-proxy-agent": "^5.0.1",
     "jsonwebtoken": "^9.0.2",
     "keyv": "^4.5.2",
     "langchain": "^0.3.19",
-    "mqtt": "^4.2.6",
+    "mqtt": "^4.3.8",
     "mustache": "^4.2.0",
     "nedb": "^1.8.0",
     "node-fetch": "^2.6.9",