wechaty-web-panel 1.6.11 → 1.6.12

package/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## 更新日志
 
+### V1.6.12(2023-07-23)
+1、修复自定义对话更新配置问题
+2、添加rss订阅功能
+3、优化登录判断
+
 ### V1.6.11(2023-06-09)
 1、修复dify角色设置bug
 

package/README.md

@@ -24,6 +24,7 @@ Wechaty Web Panel 插件，让你的 wechaty 机器人快速接入 web 控制面
 - [x] ChatGPT api (支持切换模型)
 - [x] ChatGPT 网页hook
 - [x] 微信对话开放平台
+- [x] dify 平台和fastgpt无缝适配
 - [ ] 更多
 
 * 定时任务
@@ -71,6 +72,7 @@ Wechaty Web Panel 插件，让你的 wechaty 机器人快速接入 web 控制面
 - [x] 回调事件
 - [x] 群发助手
 - [x] openapi请求
+- [x] rss订阅推送
 
 更多详情介绍：[传送门](https://www.xkboke.com/web-inn/secretary/client.html#%E5%B0%8F%E5%8A%A9%E6%89%8B%E5%8A%9F%E8%83%BD%E4%B8%80%E8%A7%88)
 
@@ -185,4 +187,4 @@ $ node mybot.js
 
 群消息同步
 
-<img src="./doc/img/async.png" width="300">
+<img src="./doc/img/async.png" width="300">

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

@@ -59,6 +59,10 @@ class OfficialOpenAi {
                 baseOptions.maxResponseTokens = 2048;
             }
         }
+        if (this.config.model.config.model.toLowerCase().includes('gpt-3.5-turbo-16k')) {
+            baseOptions.maxModelTokens = 16384;
+            baseOptions.maxResponseTokens = 4096;
+        }
         if (this.config.proxyUrl) {
             console.log(`启用代理请求:${this.config.proxyUrl}`);
             this.chatGPT = new chatGPT_js_1.ChatGPTAPI({

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

@@ -7,10 +7,20 @@ exports.getAichatQuestion = exports.removeRecord = exports.getAichatRecord = exp
 const nedb_js_1 = __importDefault(require("./nedb.js"));
 const path_1 = __importDefault(require("path"));
 const os_1 = __importDefault(require("os"));
-const baseDir = path_1.default.join(os_1.default.homedir(), path_1.default.sep, ".wechaty", "wechaty-panel-cache", path_1.default.sep);
-const dbpath = baseDir + "aichat.db";
-const rdb = (0, nedb_js_1.default)(dbpath);
-console.log('聊天记录路径：如果开启了记录会存到此处，未开启不会记录，所有记录都是存在本地', dbpath);
+const global_js_1 = __importDefault(require("./global.js"));
+const fs_1 = __importDefault(require("fs"));
+let rdb = null;
+function initDb() {
+    if (!rdb) {
+        const baseDir = path_1.default.join(os_1.default.homedir(), path_1.default.sep, ".wechaty", "wechaty-panel-cache", global_js_1.default.getApikey(), path_1.default.sep);
+        const dbpath = baseDir + "aichat.db";
+        console.log('聊天记录路径：如果开启了记录会存到此处，未开启不会记录，所有记录都是存在本地', dbpath);
+        if (fs_1.default.existsSync(dbpath)) {
+            fs_1.default.unlinkSync(dbpath);
+        }
+        rdb = (0, nedb_js_1.default)(dbpath);
+    }
+}
 /**
  * 记录群聊天记录 记录格式
  * { contactName: '', contactId: '', roomName: '', roomId: '', input: '输入的问题', output: '输出内容', time: '时间' }
@@ -19,6 +29,7 @@ console.log('聊天记录路径：如果开启了记录会存到此处，未开
  */
 async function addAichatRecord(info) {
     try {
+        initDb();
         let doc = await rdb.insert(info);
         return doc;
     }

package/dist/cjs/src/db/global.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=global.d.ts.map

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

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+class Config {
+    constructor() {
+        this.apiKey = '';
+    }
+    getApikey() {
+        return this.apiKey;
+    }
+    setApikey(val) {
+        this.apiKey = val;
+    }
+}
+if (!global.configHandler) {
+    global.configHandler = new Config();
+}
+exports.default = global.configHandler;
+//# sourceMappingURL=global.js.map

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

@@ -8,12 +8,18 @@ const nedb_js_1 = __importDefault(require("./nedb.js"));
 const path_1 = __importDefault(require("path"));
 const os_1 = __importDefault(require("os"));
 const fs_1 = __importDefault(require("fs"));
-const baseDir = path_1.default.join(os_1.default.homedir(), path_1.default.sep, ".wechaty", "wechaty-panel-cache", path_1.default.sep);
-const dbpath = baseDir + "gptconfig.db";
-if (fs_1.default.existsSync(dbpath)) {
-    fs_1.default.unlinkSync(dbpath);
+const global_js_1 = __importDefault(require("./global.js"));
+let rdb = null;
+function initDb() {
+    if (!rdb) {
+        const baseDir = path_1.default.join(os_1.default.homedir(), path_1.default.sep, ".wechaty", "wechaty-panel-cache", global_js_1.default.getApikey(), path_1.default.sep);
+        const dbpath = baseDir + "gptconfig.db";
+        if (fs_1.default.existsSync(dbpath)) {
+            fs_1.default.unlinkSync(dbpath);
+        }
+        rdb = (0, nedb_js_1.default)(dbpath);
+    }
 }
-const rdb = (0, nedb_js_1.default)(dbpath);
 /**
  * 存储gpt配置
  * { contactName: '', contactId: '', roomName: '', roomId: '', input: '输入的问题', output: '输出内容', time: '时间' }
@@ -22,6 +28,7 @@ const rdb = (0, nedb_js_1.default)(dbpath);
  */
 async function addGptConfig(info) {
     try {
+        initDb();
         let doc = await rdb.insert(info);
         return doc;
     }
@@ -37,6 +44,7 @@ exports.addGptConfig = addGptConfig;
  */
 async function getAllGptConfig() {
     try {
+        initDb();
         let search = await rdb.find({});
         return search;
     }
@@ -47,6 +55,7 @@ async function getAllGptConfig() {
 exports.getAllGptConfig = getAllGptConfig;
 async function getGptConfigById(id) {
     try {
+        initDb();
         let search = await rdb.find({ id });
         return search[0];
     }
@@ -57,6 +66,7 @@ async function getGptConfigById(id) {
 exports.getGptConfigById = getGptConfigById;
 async function updateAllGptConfig(infos) {
     try {
+        initDb();
         for (const item of infos) {
             await rdb.update({ _id: item._id }, item, { upsert: true });
         }
@@ -77,6 +87,8 @@ async function updateOneGptConfig(id, info) {
 }
 exports.updateOneGptConfig = updateOneGptConfig;
 function resetData() {
+    const baseDir = path_1.default.join(os_1.default.homedir(), path_1.default.sep, ".wechaty", "wechaty-panel-cache", global_js_1.default.getApikey(), path_1.default.sep);
+    const dbpath = baseDir + "gptconfig.db";
     if (fs_1.default.existsSync(dbpath)) {
         fs_1.default.unlinkSync(dbpath);
     }

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

@@ -7,9 +7,19 @@ exports.getRoomRecordContent = exports.removeRecord = exports.getRoomRecord = ex
 const nedb_js_1 = __importDefault(require("./nedb.js"));
 const path_1 = __importDefault(require("path"));
 const os_1 = __importDefault(require("os"));
-const baseDir = path_1.default.join(os_1.default.homedir(), path_1.default.sep, ".wechaty", "wechaty-panel-cache", path_1.default.sep);
-const dbpath = baseDir + 'room.db';
-const rdb = (0, nedb_js_1.default)(dbpath);
+const global_js_1 = __importDefault(require("./global.js"));
+const fs_1 = __importDefault(require("fs"));
+let rdb = null;
+function initDb() {
+    if (!rdb) {
+        const baseDir = path_1.default.join(os_1.default.homedir(), path_1.default.sep, ".wechaty", "wechaty-panel-cache", global_js_1.default.getApikey(), path_1.default.sep);
+        const dbpath = baseDir + "room.db";
+        if (fs_1.default.existsSync(dbpath)) {
+            fs_1.default.unlinkSync(dbpath);
+        }
+        rdb = (0, nedb_js_1.default)(dbpath);
+    }
+}
 /**
  * 记录群聊天记录 记录格式
  * { roomName: '群名', roomId: '', content: '内容', contact: '用户名', wxid: '', time: '时间' }
@@ -18,6 +28,7 @@ const rdb = (0, nedb_js_1.default)(dbpath);
  */
 async function addRoomRecord(info) {
     try {
+        initDb();
         let doc = await rdb.insert(info);
         return doc;
     }

package/dist/cjs/src/db/rssConfig.d.ts

@@ -0,0 +1,18 @@
+/**
+ * 存储rss配置
+ * { contactName: '', contactId: '', roomName: '', roomId: '', input: '输入的问题', output: '输出内容', time: '时间' }
+ * @param info
+ * @returns {Promise<unknown>}
+ */
+export function addRssConfig(info: any): Promise<unknown>;
+/**
+ * 获取指定群的聊天记录
+ * @param room
+ * @returns {Promise<*>}
+ */
+export function getAllRssConfig(): Promise<any>;
+export function getRssConfigById(id: any): Promise<any>;
+export function updateAllRssConfig(infos: any): Promise<void>;
+export function updateOneRssConfig(id: any, info: any): Promise<any>;
+export function resetRssData(): void;
+//# sourceMappingURL=rssConfig.d.ts.map

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

@@ -0,0 +1,94 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resetRssData = exports.updateOneRssConfig = exports.updateAllRssConfig = exports.getRssConfigById = exports.getAllRssConfig = exports.addRssConfig = void 0;
+const nedb_js_1 = __importDefault(require("./nedb.js"));
+const path_1 = __importDefault(require("path"));
+const os_1 = __importDefault(require("os"));
+const fs_1 = __importDefault(require("fs"));
+const global_js_1 = __importDefault(require("./global.js"));
+let rdb = null;
+function initDb() {
+    if (!rdb) {
+        const baseDir = path_1.default.join(os_1.default.homedir(), path_1.default.sep, ".wechaty", "wechaty-panel-cache", global_js_1.default.getApikey(), path_1.default.sep);
+        const dbpath = baseDir + "rssconfig.db";
+        if (fs_1.default.existsSync(dbpath)) {
+            fs_1.default.unlinkSync(dbpath);
+        }
+        rdb = (0, nedb_js_1.default)(dbpath);
+    }
+}
+/**
+ * 存储rss配置
+ * { contactName: '', contactId: '', roomName: '', roomId: '', input: '输入的问题', output: '输出内容', time: '时间' }
+ * @param info
+ * @returns {Promise<unknown>}
+ */
+async function addRssConfig(info) {
+    try {
+        let doc = await rdb.insert(info);
+        return doc;
+    }
+    catch (error) {
+        console.log("插入数据错误", error);
+    }
+}
+exports.addRssConfig = addRssConfig;
+/**
+ * 获取指定群的聊天记录
+ * @param room
+ * @returns {Promise<*>}
+ */
+async function getAllRssConfig() {
+    try {
+        let search = await rdb.find({});
+        return search;
+    }
+    catch (error) {
+        console.log("查询数据错误", error);
+    }
+}
+exports.getAllRssConfig = getAllRssConfig;
+async function getRssConfigById(id) {
+    try {
+        let search = await rdb.find({ id });
+        return search[0];
+    }
+    catch (error) {
+        console.log("查询数据错误", error);
+    }
+}
+exports.getRssConfigById = getRssConfigById;
+async function updateAllRssConfig(infos) {
+    try {
+        initDb();
+        for (const item of infos) {
+            await rdb.update({ _id: item._id }, item, { upsert: true });
+        }
+    }
+    catch (error) {
+        console.log('更新失败', error);
+    }
+}
+exports.updateAllRssConfig = updateAllRssConfig;
+async function updateOneRssConfig(id, info) {
+    try {
+        let search = await rdb.update({ id }, { ...info });
+        return search;
+    }
+    catch (error) {
+        console.log("查询数据错误", error);
+    }
+}
+exports.updateOneRssConfig = updateOneRssConfig;
+function resetRssData() {
+    const baseDir = path_1.default.join(os_1.default.homedir(), path_1.default.sep, ".wechaty", "wechaty-panel-cache", global_js_1.default.getApikey(), path_1.default.sep);
+    const dbpath = baseDir + "rssconfig.db";
+    if (fs_1.default.existsSync(dbpath)) {
+        fs_1.default.unlinkSync(dbpath);
+    }
+}
+exports.resetRssData = resetRssData;
+//# sourceMappingURL=rssConfig.js.map

package/dist/cjs/src/db/rssHistory.d.ts

@@ -0,0 +1,22 @@
+/**
+ * 记录rss 最后一条历史记录
+ * { id: '', lastContent: '', lastTime: '' }
+ * @param info
+ * @returns {Promise<unknown>}
+ */
+export function addRssHistory(info: any): Promise<unknown>;
+/**
+ * 获取指定群的聊天记录
+ * @param room
+ * @returns {Promise<*>}
+ */
+export function getRssHistory(query: any): Promise<any>;
+export function getRssHistoryById(id: any): Promise<any>;
+export function updateRssHistory(id: any, info: any): Promise<any>;
+/**
+ * 清楚指定群的聊天记录
+ * @param roomName
+ * @returns {Promise<void>}
+ */
+export function removeRssRecord(query: any): Promise<void>;
+//# sourceMappingURL=rssHistory.d.ts.map

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

@@ -0,0 +1,95 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.removeRssRecord = exports.updateRssHistory = exports.getRssHistoryById = exports.getRssHistory = exports.addRssHistory = void 0;
+const nedb_js_1 = __importDefault(require("./nedb.js"));
+const path_1 = __importDefault(require("path"));
+const os_1 = __importDefault(require("os"));
+const global_js_1 = __importDefault(require("./global.js"));
+const fs_1 = __importDefault(require("fs"));
+let rdb = null;
+function initDb() {
+    if (!rdb) {
+        const baseDir = path_1.default.join(os_1.default.homedir(), path_1.default.sep, ".wechaty", "wechaty-panel-cache", global_js_1.default.getApikey(), path_1.default.sep);
+        const dbpath = baseDir + "rssHistory.db";
+        console.log('rss历史推送路径', dbpath);
+        // if (fs.existsSync(dbpath)) {
+        //   fs.unlinkSync(dbpath);
+        // }
+        rdb = (0, nedb_js_1.default)(dbpath);
+    }
+}
+/**
+ * 记录rss 最后一条历史记录
+ * { id: '', lastContent: '', lastTime: '' }
+ * @param info
+ * @returns {Promise<unknown>}
+ */
+async function addRssHistory(info) {
+    try {
+        initDb();
+        let doc = await rdb.update({ _id: info.id }, info, { upsert: true });
+        return doc;
+    }
+    catch (error) {
+        console.log("插入数据错误", error);
+    }
+}
+exports.addRssHistory = addRssHistory;
+/**
+ * 获取指定群的聊天记录
+ * @param room
+ * @returns {Promise<*>}
+ */
+async function getRssHistory(query) {
+    try {
+        initDb();
+        let search = await rdb.find(query);
+        return search;
+    }
+    catch (error) {
+        console.log("查询数据错误", error);
+    }
+}
+exports.getRssHistory = getRssHistory;
+async function getRssHistoryById(id) {
+    try {
+        initDb();
+        let search = await rdb.find({ id });
+        return search[0];
+    }
+    catch (error) {
+        console.log("查询数据错误", error);
+    }
+}
+exports.getRssHistoryById = getRssHistoryById;
+async function updateRssHistory(id, info) {
+    try {
+        initDb();
+        let search = await rdb.update({ id }, { ...info });
+        return search;
+    }
+    catch (error) {
+        console.log("更新数据错误", error);
+    }
+}
+exports.updateRssHistory = updateRssHistory;
+/**
+ * 清楚指定群的聊天记录
+ * @param roomName
+ * @returns {Promise<void>}
+ */
+async function removeRssRecord(query) {
+    try {
+        initDb();
+        let search = await rdb.remove(query, { multi: true });
+        return search;
+    }
+    catch (e) {
+        console.log("error", e);
+    }
+}
+exports.removeRssRecord = removeRssRecord;
+//# sourceMappingURL=rssHistory.js.map

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

@@ -1,13 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const aibotk_js_1 = require("../proxy/aibotk.js");
+const index_js_1 = require("../lib/index.js");
 async function onHeartBeat(str) {
     if (!str) {
         await (0, aibotk_js_1.sendHeartBeat)('dead');
     }
-    if (str.type === 'scan') {
+    else if (str.type === 'scan') {
         await (0, aibotk_js_1.sendHeartBeat)('scan');
     }
+    else if (str.includes('heartbeat')) {
+        (0, index_js_1.throttle)((0, aibotk_js_1.sendHeartBeat)('live'), 30000);
+    }
 }
 exports.default = onHeartBeat;
 //# sourceMappingURL=on-heartbeat.js.map

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

@@ -14,7 +14,7 @@ async function onLogin(user) {
     try {
         console.log(`
       ==========================================================
-       贴心助理${user}登录了
+       贴心AI助理${user}登录了
        你正在使用的是:${puppet_type_js_1.PUPPET_MAP[this.puppet.constructor.name]}!
       ==========================================================
     `);

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

@@ -9,6 +9,7 @@ const aibotk_js_1 = require("../proxy/aibotk.js");
 const userDb_js_1 = require("../db/userDb.js");
 const index_js_3 = require("../task/index.js");
 const puppetDb_js_1 = require("../db/puppetDb.js");
+const rss_js_1 = require("../task/rss.js");
 /**
  * 准备好的事件
  */
@@ -17,6 +18,7 @@ async function onReady() {
         await (0, puppetDb_js_1.updatePuppetConfig)({ puppetType: this.puppet.constructor.name });
         await (0, aibotk_js_1.getConfig)(); // 获取配置文件
         (0, index_js_3.initAllSchedule)(this); // 初始化任务
+        (0, rss_js_1.initRssTask)(this); // 初始化rss 任务
         await (0, userDb_js_1.getUser)();
         console.log(`所有数据准备完毕`);
         (0, aibotk_js_1.sendHeartBeat)('live');

package/dist/cjs/src/index.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 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"));
 const on_login_js_1 = __importDefault(require("./handlers/on-login.js"));
@@ -45,6 +46,7 @@ function WechatyWebPanelPlugin(config = { apiKey, apiSecret, scanTimes }) {
         ignoreEvents: config.ignoreEvents || [],
         scanTimes: config.scanTimes || 50
     };
+    global_js_1.default.setApikey(initConfig.apiKey);
     (0, aiDb_js_1.addAibotConfig)(initConfig);
     return function (bot) {
         const ignoreEvents = initConfig.ignoreEvents;

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

@@ -62,6 +62,7 @@ export namespace packageJson {
         "node-fetch": string;
         "node-schedule": string;
         "qrcode-terminal": string;
+        "rss-parser": string;
         superagent: string;
         uuid: 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.11",
+    "version": "1.6.12",
     "description": "智能微秘书插件",
     "exports": {
         ".": {
@@ -80,6 +80,7 @@ exports.packageJson = {
         "node-fetch": "^2.6.9",
         "node-schedule": "^1.3.2",
         "qrcode-terminal": "^0.12.0",
+        "rss-parser": "^3.13.0",
         "superagent": "^5.3.1",
         "uuid": "^9.0.0"
     },

package/dist/cjs/src/proxy/aibotk.d.ts

@@ -15,6 +15,11 @@ export function getWordCloud(wordcontent: any, background: any, border: any): Pr
  * @return {Promise<*>}
  */
 export function getGptConfig(): Promise<any>;
+/**
+ * 获取rss配置
+ * @return {Promise<*>}
+ */
+export function getRssConfig(): Promise<any>;
 declare namespace _default {
     export { getConfig };
     export { getScheduleList };

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

@@ -1,10 +1,11 @@
 "use strict";
 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.getGptConfig = exports.getWordCloud = exports.getWordCloudConfig = exports.getWordCloudRoom = void 0;
+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.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");
 /**
  * 获取美女图片
@@ -157,9 +158,11 @@ async function getConfig() {
         };
         let content = await (0, superagent_js_1.aiBotReq)(option);
         const config = JSON.parse(content.data.config);
-        const cloudRoom = await getWordCloudRoom();
-        if (config.role === 'vip') {
+        let cloudRoom = [];
+        if (config.userInfo.role === 'vip') {
             await getGptConfig();
+            await getRssConfig();
+            cloudRoom = await getWordCloudRoom();
         }
         let cres = await (0, configDb_js_1.updateConfig)({
             puppetType: 'wechaty-puppet-wechat',
@@ -217,6 +220,29 @@ async function getGptConfig() {
     }
 }
 exports.getGptConfig = getGptConfig;
+/**
+ * 获取rss配置
+ * @return {Promise<*>}
+ */
+async function getRssConfig() {
+    try {
+        let option = {
+            method: 'GET',
+            url: '/rss/config',
+            params: {},
+        };
+        let content = await (0, superagent_js_1.aiBotReq)(option);
+        if (content.data) {
+            const list = content.data.map(item => ({ ...item, _id: item.id }));
+            (0, rssConfig_js_1.resetRssData)();
+            await (0, rssConfig_js_1.updateAllRssConfig)(list);
+        }
+    }
+    catch (error) {
+        console.log('获取rss配置文件失败:' + error);
+    }
+}
+exports.getRssConfig = getRssConfig;
 /**
  * 更新对话次数
  * @param id
@@ -360,7 +386,6 @@ async function sendHeartBeat(heart) {
             params: { heartBeat: heart },
         };
         let content = await (0, superagent_js_1.aiBotReq)(option);
-        console.log('推送心跳成功');
     }
     catch (error) {
         console.log('推送心跳失败', error);

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

@@ -34,6 +34,7 @@ const index_js_3 = require("../lib/index.js");
 const chatgpt_js_1 = require("./bot/chatgpt.js");
 const chatgpt_web_js_1 = require("./bot/chatgpt-web.js");
 const dify_js_1 = require("./bot/dify.js");
+const rss_js_1 = require("../task/rss.js");
 let mqttclient = null;
 async function initMqtt(that) {
     try {
@@ -111,6 +112,10 @@ async function initMqtt(that) {
                             console.log('触发了好友事件');
                             await (0, index_js_2.sendTaskMessage)(that, content);
                         }
+                        else if (content.target === 'Rss') {
+                            console.log('触发了rss立即更新事件');
+                            await (0, rss_js_1.sendRssTaskMessage)(that, content);
+                        }
                     }
                     else if (topic === `aibotk/${userId}/gptconfig`) {
                         await (0, aibotk_js_1.getGptConfig)();
@@ -121,6 +126,11 @@ async function initMqtt(that) {
                             (0, dify_js_1.reset)(content.updateId);
                         }
                     }
+                    else if (topic === `aibotk/${userId}/rssconfig`) {
+                        console.log('更新rss配置');
+                        await (0, aibotk_js_1.getRssConfig)();
+                        void (0, rss_js_1.initRssTask)(that);
+                    }
                 });
             }
         }

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

@@ -316,15 +316,15 @@ async function customChat({ msg, name, id, config, isMention, room, roomId, room
                 });
             }
             if (finalConfig) {
-                if (finalConfig.limitNum > 0 && finalConfig.limitNum <= finalConfig.usedNum) {
-                    return [{ type: 1, content: '聊天次数已用完，请联系管理员充值' }];
-                }
                 const isRoom = finalConfig.type === 'room';
                 if (finalConfig.openChat) {
                     if ((isRoom && finalConfig.needAt === 1 && isMention) || isRoom & !finalConfig.needAt || !isRoom) {
                         const keyword = finalConfig?.keywords.find((item) => msg.includes(item));
                         if (keyword || !finalConfig?.keywords.length) {
                             msg = keyword ? msg.replace(keyword, '') : msg;
+                            if (finalConfig.limitNum > 0 && finalConfig.limitNum <= finalConfig.usedNum) {
+                                return [{ type: 1, content: '聊天次数已用完，请联系管理员充值' }];
+                            }
                             const msgArr = await (0, dispatch_js_1.dispatchBot)({ botType: finalConfig.robotType, content: msg, uid: id, adminId: finalConfig.id, config: finalConfig.botConfig });
                             return msgArr;
                         }

package/dist/cjs/src/task/rss.d.ts

@@ -0,0 +1,12 @@
+/**
+ * 立即发送rss消息
+ * @param {*} that bot对象
+ * @param {*} item 任务项  { target: 'Room', event: '', message: { roomName: '', type: 'news 新闻 ||task 定时任务', contents: [] } }
+ */
+export function sendRssTaskMessage(that: any, info: any): Promise<void>;
+/**
+ * 初始化rss定时任务
+ * @param {}} that
+ */
+export function initRssTask(that: any): Promise<void>;
+//# sourceMappingURL=rss.d.ts.map