wechaty-web-panel 1.6.17 → 1.6.18

package/CHANGELOG.md

@@ -1,5 +1,8 @@
 ## 更新日志
 
+### V1.6.18(2023-08-15)
+1、优化自定义对话配置
+
 ### V1.6.17(2023-08-12)
 1、优化换行在windows中的发送
 2、优化rss内容发送

package/dist/cjs/src/botInstance/dify.js

@@ -57,7 +57,7 @@ class DifyAi {
     async getReply(content, uid, adminId = '', systemMessage = '') {
         try {
             if (!this.difyChat) {
-                console.log('看到此消息说明已启用dify 对话平台');
+                console.log('启用dify对话平台');
                 await this.init();
             }
             if (this.config.filter) {

package/dist/cjs/src/db/global.js

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const gptConfig_js_1 = require("./gptConfig.js");
 class Config {
     constructor() {
         this.apiKey = '';
+        this.gptconfig = [];
     }
     getApikey() {
         return this.apiKey;
@@ -10,6 +12,23 @@ class Config {
     setApikey(val) {
         this.apiKey = val;
     }
+    getAllGptConfig() {
+        return this.gptconfig;
+    }
+    updateAllGptConfig(list) {
+        this.gptconfig = list;
+    }
+    getGptConfigById(id) {
+        return this.gptconfig.find(item => item.id === id);
+    }
+    updateOneGptConfig(id, info) {
+        this.gptconfig = this.gptconfig.map(item => {
+            if (item.id === id) {
+                return info;
+            }
+            return item;
+        });
+    }
 }
 if (!global.configHandler) {
     global.configHandler = new Config();

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

@@ -6,7 +6,7 @@ exports.packageJson = void 0;
  */
 exports.packageJson = {
     "name": "wechaty-web-panel",
-    "version": "1.6.17",
+    "version": "1.6.18",
     "description": "智能微秘书插件",
     "exports": {
         ".": {

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

@@ -1,12 +1,15 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPromotInfo = exports.updateChatRecord = exports.getFireNews = exports.getMaterial = exports.getOne = exports.getMeiNv = exports.getMqttConfig = exports.updatePanelVersion = exports.asyncData = exports.sendRoom = exports.sendFriend = exports.putqn = exports.sendRobotInfo = exports.sendHeartBeat = exports.setQrCode = exports.updateSchedule = exports.setSchedule = exports.getScheduleList = exports.getConfig = exports.getPanelVersion = exports.getRssConfig = exports.getGptConfig = exports.getWordCloud = exports.getWordCloudConfig = exports.getWordCloudRoom = void 0;
 const superagent_js_1 = require("./superagent.js");
 const configDb_js_1 = require("../db/configDb.js");
 const package_json_js_1 = require("../package-json.js");
-const gptConfig_js_1 = require("../db/gptConfig.js");
 const rssConfig_js_1 = require("../db/rssConfig.js");
 const puppet_type_js_1 = require("../const/puppet-type.js");
+const global_js_1 = __importDefault(require("../db/global.js"));
 /**
  * 获取美女图片
  */
@@ -211,8 +214,7 @@ async function getGptConfig() {
         let content = await (0, superagent_js_1.aiBotReq)(option);
         if (content.data) {
             const list = content.data.map(item => ({ ...item, _id: item.id }));
-            (0, gptConfig_js_1.resetData)();
-            await (0, gptConfig_js_1.updateAllGptConfig)(list);
+            global_js_1.default.updateAllGptConfig(list);
         }
     }
     catch (error) {

package/dist/cjs/src/proxy/bot/dispatch.js

@@ -1,11 +1,14 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.dispatchBot = void 0;
 const chatgpt_js_1 = require("./chatgpt.js");
 const chatgpt_web_js_1 = require("./chatgpt-web.js");
 const dify_js_1 = require("./dify.js");
-const gptConfig_js_1 = require("../../db/gptConfig.js");
 const aibotk_js_1 = require("../aibotk.js");
+const global_js_1 = __importDefault(require("../../db/global.js"));
 /**
  * 消息转发
  * @param {botType: 机器人类别, content: 消息内容, uid: 说话的用户id, updateId: 更新的用户id, adminId: 对话实例id，用于分割不同配置, config: 机器人配置}
@@ -14,7 +17,7 @@ const aibotk_js_1 = require("../aibotk.js");
 async function dispatchBot({ botType, content, uid, adminId, config }) {
     console.log('进入定制机器人回复');
     try {
-        const gptConfig = await (0, gptConfig_js_1.getGptConfigById)(adminId);
+        const gptConfig = global_js_1.default.getGptConfigById(adminId);
         let res, replys;
         switch (botType) {
             case 6:
@@ -40,7 +43,7 @@ async function dispatchBot({ botType, content, uid, adminId, config }) {
         }
         if (replys.length) {
             void (0, aibotk_js_1.updateChatRecord)(adminId, gptConfig.usedNum + 1);
-            void (0, gptConfig_js_1.updateOneGptConfig)(adminId, { ...gptConfig, usedNum: gptConfig.usedNum + 1 });
+            global_js_1.default.updateOneGptConfig(adminId, { ...gptConfig, usedNum: gptConfig.usedNum + 1 });
         }
         return replys;
     }

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

@@ -119,8 +119,9 @@ async function initMqtt(that) {
                     }
                     else if (topic === `aibotk/${userId}/gptconfig`) {
                         await (0, aibotk_js_1.getGptConfig)();
+                        console.log('更新最新自定义对话配置');
                         if (content.event === 'update' || content.event === 'delete') {
-                            console.log('更新gpt配置');
+                            console.log('更新自定义对话配置，重置对话');
                             (0, chatgpt_js_1.reset)(content.updateId);
                             (0, chatgpt_web_js_1.reset)(content.updateId);
                             (0, dify_js_1.reset)(content.updateId);

package/dist/cjs/src/service/msg-filter-service.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.filterRoomMsg = exports.filterFriendMsg = void 0;
 const configDb_js_1 = require("../db/configDb.js");
-const gptConfig_js_1 = require("../db/gptConfig.js");
+const global_js_1 = __importDefault(require("../db/global.js"));
 const msg_filters_js_1 = __importDefault(require("./msg-filters.js"));
 const WEIXINOFFICIAL = ['朋友推荐消息', '微信支付', '微信运动', '微信团队', 'recommendation message']; // 微信官方账户，针对此账户不做任何回复
 const DELETEFRIEND = '开启了朋友验证'; // 被人删除后，防止重复回复
@@ -41,7 +41,7 @@ async function getMsgReply(resArray, { that, msg, name, contact, config, avatar,
 async function filterFriendMsg(that, contact, msg) {
     try {
         const config = await (0, configDb_js_1.allConfig)(); // 获取配置信息
-        const gptConfig = await (0, gptConfig_js_1.getAllGptConfig)(); // 获取gpt配置信息
+        const gptConfig = global_js_1.default.getAllGptConfig(); // 获取gpt配置信息
         const name = contact.name();
         const id = contact.id;
         const avatar = await contact.avatar();
@@ -82,7 +82,7 @@ exports.filterFriendMsg = filterFriendMsg;
 async function filterRoomMsg({ that, msg, name, id, avatar, room, isMention, roomName, roomId }) {
     try {
         const config = await (0, configDb_js_1.allConfig)(); // 获取配置信息
-        const gptConfig = await (0, gptConfig_js_1.getAllGptConfig)(); // 获取gpt配置信息
+        const gptConfig = global_js_1.default.getAllGptConfig(); // 获取gpt配置信息
         const resArray = [
             { bool: msg === '', method: 'emptyMsg' },
             { bool: config.callBackEvents && config.callBackEvents.length > 0, method: 'callbackEvent' },

package/dist/cjs/src/service/msg-filters.js

@@ -10,7 +10,7 @@ const index_js_1 = require("../lib/index.js");
 const index_js_2 = require("../common/index.js");
 const superagent_js_1 = require("../proxy/superagent.js");
 const dispatch_js_1 = require("../proxy/bot/dispatch.js");
-const gptConfig_js_1 = require("../db/gptConfig.js");
+const global_js_1 = __importDefault(require("../db/global.js"));
 function emptyMsg({ room, isMention }) {
     if (room && !isMention)
         return [];
@@ -290,7 +290,7 @@ async function robotMsg({ msg, name, id, config, isMention, room }) {
 exports.robotMsg = robotMsg;
 async function customChat({ msg, name, id, config, isMention, room, roomId, roomName }) {
     try {
-        const gptConfigs = await (0, gptConfig_js_1.getAllGptConfig)();
+        const gptConfigs = global_js_1.default.getAllGptConfig();
         if (gptConfigs && gptConfigs.length) {
             let finalConfig = '';
             if (room) {
@@ -323,15 +323,24 @@ async function customChat({ msg, name, id, config, isMention, room, roomId, room
                         if (keyword || !finalConfig?.keywords.length) {
                             msg = keyword ? msg.replace(keyword, '') : msg;
                             if (finalConfig.limitNum > 0 && finalConfig.limitNum <= finalConfig.usedNum) {
-                                return [{ type: 1, content: '聊天次数已用完，请联系管理员充值' }];
+                                return [{ type: 1, content: finalConfig.rechargeTip || '聊天次数已用完，请联系管理员充值' }];
                             }
                             const msgArr = await (0, dispatch_js_1.dispatchBot)({ botType: finalConfig.robotType, content: msg, uid: id, adminId: finalConfig.id, config: finalConfig.botConfig });
-                            return msgArr;
+                            if (msgArr.length)
+                                return msgArr;
+                            console.log('自定义回复获取内容失败，启用全局配置');
+                            return [];
                         }
                     }
                     return [];
                 }
-                return finalConfig.defaultReply ? [{ type: 1, content: finalConfig.defaultReply }] : [];
+                else {
+                    // 如果没有开启对话 也要检测一下是不是需要@ 才返回默认回复
+                    if ((isRoom && finalConfig.needAt === 1 && isMention) || isRoom & !finalConfig.needAt || !isRoom) {
+                        return finalConfig.defaultReply ? [{ type: 1, content: finalConfig.defaultReply }] : [{ type: 1, content: '' }];
+                    }
+                    return [];
+                }
             }
             return [];
         }

package/dist/esm/src/botInstance/dify.js

@@ -52,7 +52,7 @@ class DifyAi {
     async getReply(content, uid, adminId = '', systemMessage = '') {
         try {
             if (!this.difyChat) {
-                console.log('看到此消息说明已启用dify 对话平台');
+                console.log('启用dify对话平台');
                 await this.init();
             }
             if (this.config.filter) {

package/dist/esm/src/db/global.js

@@ -1,6 +1,8 @@
+import { getGptConfigById, updateAllGptConfig, updateOneGptConfig } from "./gptConfig.js";
 class Config {
     constructor() {
         this.apiKey = '';
+        this.gptconfig = [];
     }
     getApikey() {
         return this.apiKey;
@@ -8,6 +10,23 @@ class Config {
     setApikey(val) {
         this.apiKey = val;
     }
+    getAllGptConfig() {
+        return this.gptconfig;
+    }
+    updateAllGptConfig(list) {
+        this.gptconfig = list;
+    }
+    getGptConfigById(id) {
+        return this.gptconfig.find(item => item.id === id);
+    }
+    updateOneGptConfig(id, info) {
+        this.gptconfig = this.gptconfig.map(item => {
+            if (item.id === id) {
+                return info;
+            }
+            return item;
+        });
+    }
 }
 if (!global.configHandler) {
     global.configHandler = new Config();

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

@@ -3,7 +3,7 @@
  */
 export const packageJson = {
     "name": "wechaty-web-panel",
-    "version": "1.6.17",
+    "version": "1.6.18",
     "description": "智能微秘书插件",
     "exports": {
         ".": {

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

@@ -1,9 +1,9 @@
 import { aiBotReq, req } from './superagent.js';
 import { updateConfig } from '../db/configDb.js';
 import { packageJson } from '../package-json.js';
-import { updateAllGptConfig, resetData } from "../db/gptConfig.js";
 import { updateAllRssConfig, resetRssData } from "../db/rssConfig.js";
 import { getPuppetEol } from "../const/puppet-type.js";
+import globalConfig from "../db/global.js";
 /**
  * 获取美女图片
  */
@@ -201,8 +201,7 @@ export async function getGptConfig() {
         let content = await aiBotReq(option);
         if (content.data) {
             const list = content.data.map(item => ({ ...item, _id: item.id }));
-            resetData();
-            await updateAllGptConfig(list);
+            globalConfig.updateAllGptConfig(list);
         }
     }
     catch (error) {

package/dist/esm/src/proxy/bot/dispatch.js

@@ -1,8 +1,8 @@
 import { getChatGPTReply } from "./chatgpt.js";
 import { getChatGPTWebReply } from "./chatgpt-web.js";
 import { getDifyAiReply } from "./dify.js";
-import { updateOneGptConfig, getGptConfigById } from "../../db/gptConfig.js";
 import { updateChatRecord } from "../aibotk.js";
+import globalConfig from '../../db/global.js';
 /**
  * 消息转发
  * @param {botType: 机器人类别, content: 消息内容, uid: 说话的用户id, updateId: 更新的用户id, adminId: 对话实例id，用于分割不同配置, config: 机器人配置}
@@ -11,7 +11,7 @@ import { updateChatRecord } from "../aibotk.js";
 export async function dispatchBot({ botType, content, uid, adminId, config }) {
     console.log('进入定制机器人回复');
     try {
-        const gptConfig = await getGptConfigById(adminId);
+        const gptConfig = globalConfig.getGptConfigById(adminId);
         let res, replys;
         switch (botType) {
             case 6:
@@ -37,7 +37,7 @@ export async function dispatchBot({ botType, content, uid, adminId, config }) {
         }
         if (replys.length) {
             void updateChatRecord(adminId, gptConfig.usedNum + 1);
-            void updateOneGptConfig(adminId, { ...gptConfig, usedNum: gptConfig.usedNum + 1 });
+            globalConfig.updateOneGptConfig(adminId, { ...gptConfig, usedNum: gptConfig.usedNum + 1 });
         }
         return replys;
     }

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

@@ -93,8 +93,9 @@ async function initMqtt(that) {
                     }
                     else if (topic === `aibotk/${userId}/gptconfig`) {
                         await getGptConfig();
+                        console.log('更新最新自定义对话配置');
                         if (content.event === 'update' || content.event === 'delete') {
-                            console.log('更新gpt配置');
+                            console.log('更新自定义对话配置，重置对话');
                             reset(content.updateId);
                             webReset(content.updateId);
                             difyReset(content.updateId);

package/dist/esm/src/service/msg-filter-service.js

@@ -1,5 +1,5 @@
 import { allConfig } from '../db/configDb.js';
-import { getAllGptConfig } from '../db/gptConfig.js';
+import globalConfig from '../db/global.js';
 import msgFilter from './msg-filters.js';
 const WEIXINOFFICIAL = ['朋友推荐消息', '微信支付', '微信运动', '微信团队', 'recommendation message']; // 微信官方账户，针对此账户不做任何回复
 const DELETEFRIEND = '开启了朋友验证'; // 被人删除后，防止重复回复
@@ -35,7 +35,7 @@ async function getMsgReply(resArray, { that, msg, name, contact, config, avatar,
 async function filterFriendMsg(that, contact, msg) {
     try {
         const config = await allConfig(); // 获取配置信息
-        const gptConfig = await getAllGptConfig(); // 获取gpt配置信息
+        const gptConfig = globalConfig.getAllGptConfig(); // 获取gpt配置信息
         const name = contact.name();
         const id = contact.id;
         const avatar = await contact.avatar();
@@ -75,7 +75,7 @@ async function filterFriendMsg(that, contact, msg) {
 async function filterRoomMsg({ that, msg, name, id, avatar, room, isMention, roomName, roomId }) {
     try {
         const config = await allConfig(); // 获取配置信息
-        const gptConfig = await getAllGptConfig(); // 获取gpt配置信息
+        const gptConfig = globalConfig.getAllGptConfig(); // 获取gpt配置信息
         const resArray = [
             { bool: msg === '', method: 'emptyMsg' },
             { bool: config.callBackEvents && config.callBackEvents.length > 0, method: 'callbackEvent' },

package/dist/esm/src/service/msg-filters.js

@@ -4,7 +4,7 @@ import { contentDistinguish, setLocalSchedule, isRealDate } from '../lib/index.j
 import { addRoom } from '../common/index.js';
 import { service, callbackAibotApi } from '../proxy/superagent.js';
 import { dispatchBot } from '../proxy/bot/dispatch.js';
-import { getAllGptConfig } from "../db/gptConfig.js";
+import globalConfig from "../db/global.js";
 function emptyMsg({ room, isMention }) {
     if (room && !isMention)
         return [];
@@ -274,7 +274,7 @@ async function robotMsg({ msg, name, id, config, isMention, room }) {
 }
 async function customChat({ msg, name, id, config, isMention, room, roomId, roomName }) {
     try {
-        const gptConfigs = await getAllGptConfig();
+        const gptConfigs = globalConfig.getAllGptConfig();
         if (gptConfigs && gptConfigs.length) {
             let finalConfig = '';
             if (room) {
@@ -307,15 +307,24 @@ async function customChat({ msg, name, id, config, isMention, room, roomId, room
                         if (keyword || !finalConfig?.keywords.length) {
                             msg = keyword ? msg.replace(keyword, '') : msg;
                             if (finalConfig.limitNum > 0 && finalConfig.limitNum <= finalConfig.usedNum) {
-                                return [{ type: 1, content: '聊天次数已用完，请联系管理员充值' }];
+                                return [{ type: 1, content: finalConfig.rechargeTip || '聊天次数已用完，请联系管理员充值' }];
                             }
                             const msgArr = await dispatchBot({ botType: finalConfig.robotType, content: msg, uid: id, adminId: finalConfig.id, config: finalConfig.botConfig });
-                            return msgArr;
+                            if (msgArr.length)
+                                return msgArr;
+                            console.log('自定义回复获取内容失败，启用全局配置');
+                            return [];
                         }
                     }
                     return [];
                 }
-                return finalConfig.defaultReply ? [{ type: 1, content: finalConfig.defaultReply }] : [];
+                else {
+                    // 如果没有开启对话 也要检测一下是不是需要@ 才返回默认回复
+                    if ((isRoom && finalConfig.needAt === 1 && isMention) || isRoom & !finalConfig.needAt || !isRoom) {
+                        return finalConfig.defaultReply ? [{ type: 1, content: finalConfig.defaultReply }] : [{ type: 1, content: '' }];
+                    }
+                    return [];
+                }
             }
             return [];
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wechaty-web-panel",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "description": "智能微秘书插件",
   "exports": {
     ".": {