wechaty-web-panel 1.6.51 → 1.6.53

package/CHANGELOG.md

@@ -1,4 +1,11 @@
 ## 更新日志
+
+
+### V1.6.53(2024-05-14)
+1、修复rss任务重复推送问题
+2、修复FastGPT非简单模式对话的报错
+3、添加 gpt-4o支持
+
 ### V1.6.50(2024-05-07)
 1、修复rss任务被取消问题
 

package/dist/cjs/src/botInstance/officialOpenAi.d.ts

@@ -1,6 +1,9 @@
 export default OfficialOpenAi;
 declare class OfficialOpenAi {
     constructor(config?: {
+        temperature: number;
+        top_p: number;
+        presence_penalty: number;
         token: string;
         debug: number;
         proxyPass: string;
@@ -40,6 +43,9 @@ declare class OfficialOpenAi {
         _defaultUpsertMessage(message: any): Promise<void>;
     } | null;
     config: {
+        temperature: number;
+        top_p: number;
+        presence_penalty: number;
         token: string;
         debug: number;
         proxyPass: string;

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

@@ -16,6 +16,9 @@ const index_js_1 = require("../lib/index.js");
 let chatGPT = null;
 class OfficialOpenAi {
     constructor(config = {
+        temperature: 0.8,
+        top_p: 1,
+        presence_penalty: 1,
         token: '',
         debug: 0,
         proxyPass: '',
@@ -47,7 +50,7 @@ class OfficialOpenAi {
         }
         const baseOptions = {
             apiKey: this.config.token,
-            completionParams: { model: this.config.model },
+            completionParams: { model: this.config.model, temperature: this.config?.temperature || 0.8, top_p: this.config?.top_p || 1, presence_penalty: this.config?.presence_penalty || 1 },
             debug: this.config.debug,
             systemMessage: this.config.systemMessage || '',
         };
@@ -57,25 +60,32 @@ class OfficialOpenAi {
             if (this.config.model.toLowerCase().includes('32k')) {
                 baseOptions.maxModelTokens = 32768;
                 baseOptions.maxResponseTokens = 8192;
-            } // if use GPT-4 Turbo
-            else if (this.config.model.toLowerCase().includes('1106-preview')) {
+            } // if use GPT-4 Turbo preview 4o
+            else if (this.config.model.toLowerCase().includes('-preview') || this.config.model.toLowerCase().includes('-turbo') || this.config.model.toLowerCase().includes('gpt-4o')) {
                 baseOptions.maxModelTokens = 128000;
                 baseOptions.maxResponseTokens = 4096;
             }
             else {
                 baseOptions.maxModelTokens = 8192;
-                baseOptions.maxResponseTokens = 2048;
+                baseOptions.maxResponseTokens = 4096;
             }
         }
         if (this.config.model.toLowerCase().includes('gpt-3.5')) {
-            if (this.config.model.toLowerCase().includes('16k') || this.config.model.toLowerCase().includes('turbo-1106')) {
+            if (this.config.model.toLowerCase() === 'gpt-3.5-turbo' || this.config.model.toLowerCase().includes('16k') || this.config.model.toLowerCase().includes('turbo-1106') || this.config.model.toLowerCase().includes('turbo-0125')) {
                 baseOptions.maxModelTokens = 16385;
                 baseOptions.maxResponseTokens = 4096;
             }
             else {
-                baseOptions.maxResponseTokens = 1000;
+                baseOptions.maxModelTokens = 4096;
+                baseOptions.maxResponseTokens = 1024;
             }
         }
+        if (this.config?.modelMaxToken) {
+            baseOptions.maxModelTokens = this.config.modelMaxToken;
+        }
+        if (this.config?.maxToken) {
+            baseOptions.maxResponseTokens = this.config.maxToken;
+        }
         if (this.config.proxyUrl) {
             console.log(`启用代理请求:${this.config.proxyUrl}`);
             this.chatGPT = new chatGPT_js_1.ChatGPTAPI({

package/dist/cjs/src/botInstance/sdk/chatGPT.js

@@ -120,12 +120,11 @@ let ChatGPTAPI = class {
             ...completionParams
         };
         this._systemMessage = systemMessage;
-        if (this._systemMessage === void 0) {
-            const currentDate = new Date().toISOString().split("T")[0];
-            this._systemMessage = `You are ChatGPT, a large language model trained by OpenAI. Answer as concisely as possible.
-Knowledge cutoff: 2021-09-01
-Current date: ${currentDate}`;
-        }
+        //     if (!this._systemMessage) {
+        //       const currentDate = new Date().toISOString().split("T")[0];
+        //       this._systemMessage = `You are ChatGPT, a large language model trained by OpenAI. Answer as concisely as possible.
+        // Current date: ${currentDate}`;
+        //     }
         this._maxModelTokens = maxModelTokens;
         this._maxResponseTokens = maxResponseTokens;
         this._getMessageById = getMessageById ?? this._defaultGetMessageById;
@@ -257,7 +256,15 @@ Current date: ${currentDate}`;
                     }
                     if ((_a = response == null ? void 0 : response.choices) == null ? void 0 : _a.length) {
                         const message2 = response.choices[0].message;
-                        result.text = message2.content;
+                        if (typeof message2.content === 'string') {
+                            result.text = message2.content;
+                        }
+                        else if (Array.isArray(message2.content)) {
+                            const finalContent = message2.content.find(item => item.type === 'text');
+                            if (finalContent) {
+                                result.text = finalContent?.text?.content || '';
+                            }
+                        }
                         if (message2.role) {
                             result.role = message2.role;
                         }

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

@@ -22,7 +22,7 @@ async function onFriend(friendship) {
                         await (0, index_js_1.delay)(10000);
                         await friendship.accept();
                     }
-                    else if (config.acceptFriendKeyWords.length > 0 && config.acceptFriendKeyWords.includes(hello)) {
+                    else if (config.acceptFriendKeyWords.length > 0 && config.acceptFriendKeyWords.find(item => item.includes(hello))) {
                         console.log(`触发关键词${hello},10秒后自动通过好友请求`);
                         await (0, index_js_1.delay)(10000);
                         await friendship.accept();

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

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

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

@@ -67,6 +67,8 @@ declare namespace _default {
     export { getMaterial };
     export { getFireNews };
     export { clearVerifyCode };
+    export { getRssLast };
+    export { updateRssLast };
     export { getVerifyCode };
 }
 export default _default;
@@ -184,4 +186,14 @@ export function updateChatRecord(id: any, num: any): Promise<any>;
  * @return {Promise<*>}
  */
 export function getPromotInfo(id: any): Promise<any>;
+/**
+ * 更新rss最后一条内容的配置
+ * @return {Promise<*>}
+ */
+export function getRssLast(id: any): Promise<any>;
+/**
+ * 更新rss最后一条内容的配置
+ * @return {Promise<*>}
+ */
+export function updateRssLast(id: any, lastcontent: any): Promise<any>;
 //# sourceMappingURL=aibotk.d.ts.map

package/dist/cjs/src/proxy/aibotk.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.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.clearVerifyCode = exports.getVerifyCode = exports.getPanelVersion = exports.getRssConfig = exports.getTasks = exports.getGptConfig = exports.getCustomEvents = exports.getCustomNews = exports.getWordCloud = exports.getWordCloudConfig = exports.getWordCloudRoom = void 0;
+exports.updateRssLast = exports.getRssLast = 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.clearVerifyCode = exports.getVerifyCode = exports.getPanelVersion = exports.getRssConfig = exports.getTasks = exports.getGptConfig = exports.getCustomEvents = exports.getCustomNews = 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");
@@ -224,6 +224,11 @@ async function getConfig() {
             openaiAccessToken: '',
             openaiDebug: false,
             openaiModel: 'gpt-3.5-turbo',
+            temperature: 0.8,
+            top_p: 1,
+            presence_penalty: 1,
+            maxToken: null,
+            modelMaxToken: null,
             dify_token: '',
             dify_baseUrl: '',
             difyAgent: false,
@@ -324,6 +329,47 @@ async function getRssConfig() {
     }
 }
 exports.getRssConfig = getRssConfig;
+/**
+ * 更新rss最后一条内容的配置
+ * @return {Promise<*>}
+ */
+async function updateRssLast(id, lastcontent) {
+    try {
+        console.log('id----', id, lastcontent);
+        let option = {
+            method: 'POST',
+            url: `/rss/lastcontent/${id}`,
+            params: {
+                content: lastcontent
+            },
+        };
+        let content = await (0, superagent_js_1.aiBotReq)(option);
+        return content;
+    }
+    catch (error) {
+        console.log('获取rss配置文件失败:' + error);
+    }
+}
+exports.updateRssLast = updateRssLast;
+/**
+ * 更新rss最后一条内容的配置
+ * @return {Promise<*>}
+ */
+async function getRssLast(id) {
+    try {
+        let option = {
+            method: 'GET',
+            url: `/rss/lastcontent/${id}`,
+            params: {},
+        };
+        let content = await (0, superagent_js_1.aiBotReq)(option);
+        return content.data;
+    }
+    catch (error) {
+        console.log('获取rss配置文件失败:' + error);
+    }
+}
+exports.getRssLast = getRssLast;
 /**
  * 更新对话次数
  * @param id
@@ -741,6 +787,8 @@ exports.default = {
     getMaterial,
     getFireNews,
     clearVerifyCode,
+    getRssLast,
+    updateRssLast,
     getVerifyCode
 };
 //# sourceMappingURL=aibotk.js.map

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

@@ -31,6 +31,9 @@ async function getGptOfficialReply(content, uid, isFastGPT) {
         showQuestion: config.showQuestion,
         timeoutMs: config.openaiTimeout,
         model: config.openaiModel,
+        temperature: config?.temperature,
+        top_p: config?.top_p,
+        presence_penalty: config?.presence_penalty,
         systemMessage: config.openaiSystemMessage,
         filter: config.chatFilter,
         filterConfig: {

package/dist/cjs/src/task/rss.js

@@ -11,6 +11,7 @@ const index_js_2 = require("../common/index.js");
 const rss_parser_1 = __importDefault(require("rss-parser"));
 const puppet_type_js_1 = require("../const/puppet-type.js");
 const dayjs_1 = __importDefault(require("dayjs"));
+const aibotk_js_1 = require("../proxy/aibotk.js");
 async function getRssContent(info) {
     try {
         const parser = new rss_parser_1.default({
@@ -21,17 +22,17 @@ async function getRssContent(info) {
         });
         console.log('订阅源:' + info.rssUrl);
         const feed = await parser.parseURL(info.rssUrl);
-        const lastItem = await (0, rssHistory_js_1.getRssHistoryById)(info.id);
-        console.log('上一条消息', JSON.stringify(lastItem));
+        const lastItem = await (0, aibotk_js_1.getRssLast)(info.id);
+        console.log('上一条已经推送的消息', JSON.stringify(lastItem));
         // 当存在文章的时候
         if (feed.items && feed.items.length) {
             // 当存在历史推送记录 需要判读是否推送过
             const last = feed.items[0];
             const lastContent = last.link || last.title;
             if (lastItem) {
-                if (lastContent !== lastItem.lastContent) {
+                if (lastContent !== lastItem?.lastContent) {
                     const content = await setContent(last, info);
-                    void (0, rssHistory_js_1.updateRssHistory)(info.id, { lastContent: lastContent, lastTime: (0, dayjs_1.default)().format('YYYY-MM-DD HH:mm:ss') });
+                    void (0, aibotk_js_1.updateRssLast)(info.id, lastContent);
                     return content;
                 }
                 console.log('rss内容未更新,最后一条内容已推送');
@@ -39,13 +40,14 @@ async function getRssContent(info) {
             }
             else {
                 const content = await setContent(last, info);
-                void (0, rssHistory_js_1.addRssHistory)({ _id: info.id, id: info.id, lastContent: lastContent, lastTime: (0, dayjs_1.default)().format('YYYY-MM-DD HH:mm:ss') });
+                void (0, aibotk_js_1.updateRssLast)(info.id, lastContent);
                 return content;
             }
         }
     }
     catch (e) {
         console.log("获取rss内容失败，大概率是订阅源格式不规范，请更换:" + e);
+        return [];
     }
 }
 async function setContent(feed, info) {
@@ -56,7 +58,8 @@ async function setContent(feed, info) {
             return [res];
         }
         else {
-            const content = `${info.prefixWord ? info.prefixWord + eol + eol : ''}${(0, index_js_1.delHtmlTag)(feed.title)}${eol}${eol}【摘要】：${(0, index_js_1.delHtmlTag)(feed.content).substring(0, 1500)}...${eol}【链接】:${feed.link}${eol}${eol}${info.suffixWord || ''}`;
+            const desc = (0, index_js_1.delHtmlTag)(feed.content)?.substring(0, 1500)?.trim();
+            const content = `${info.prefixWord ? info.prefixWord + eol + eol : ''}${(0, index_js_1.delHtmlTag)(feed.title)}${eol}${eol} ${desc ? `【摘要】：${desc}...${eol}` : ''}【链接】:${feed.link}${eol}${eol}${info.suffixWord || ''}`;
             return [{ type: 1, content: content }];
         }
     }

package/dist/esm/src/botInstance/officialOpenAi.d.ts

@@ -1,6 +1,9 @@
 export default OfficialOpenAi;
 declare class OfficialOpenAi {
     constructor(config?: {
+        temperature: number;
+        top_p: number;
+        presence_penalty: number;
         token: string;
         debug: number;
         proxyPass: string;
@@ -40,6 +43,9 @@ declare class OfficialOpenAi {
         _defaultUpsertMessage(message: any): Promise<void>;
     } | null;
     config: {
+        temperature: number;
+        top_p: number;
+        presence_penalty: number;
         token: string;
         debug: number;
         proxyPass: string;

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

@@ -11,6 +11,9 @@ import { extractImageLinks } from '../lib/index.js';
 let chatGPT = null;
 class OfficialOpenAi {
     constructor(config = {
+        temperature: 0.8,
+        top_p: 1,
+        presence_penalty: 1,
         token: '',
         debug: 0,
         proxyPass: '',
@@ -42,7 +45,7 @@ class OfficialOpenAi {
         }
         const baseOptions = {
             apiKey: this.config.token,
-            completionParams: { model: this.config.model },
+            completionParams: { model: this.config.model, temperature: this.config?.temperature || 0.8, top_p: this.config?.top_p || 1, presence_penalty: this.config?.presence_penalty || 1 },
             debug: this.config.debug,
             systemMessage: this.config.systemMessage || '',
         };
@@ -52,25 +55,32 @@ class OfficialOpenAi {
             if (this.config.model.toLowerCase().includes('32k')) {
                 baseOptions.maxModelTokens = 32768;
                 baseOptions.maxResponseTokens = 8192;
-            } // if use GPT-4 Turbo
-            else if (this.config.model.toLowerCase().includes('1106-preview')) {
+            } // if use GPT-4 Turbo preview 4o
+            else if (this.config.model.toLowerCase().includes('-preview') || this.config.model.toLowerCase().includes('-turbo') || this.config.model.toLowerCase().includes('gpt-4o')) {
                 baseOptions.maxModelTokens = 128000;
                 baseOptions.maxResponseTokens = 4096;
             }
             else {
                 baseOptions.maxModelTokens = 8192;
-                baseOptions.maxResponseTokens = 2048;
+                baseOptions.maxResponseTokens = 4096;
             }
         }
         if (this.config.model.toLowerCase().includes('gpt-3.5')) {
-            if (this.config.model.toLowerCase().includes('16k') || this.config.model.toLowerCase().includes('turbo-1106')) {
+            if (this.config.model.toLowerCase() === 'gpt-3.5-turbo' || this.config.model.toLowerCase().includes('16k') || this.config.model.toLowerCase().includes('turbo-1106') || this.config.model.toLowerCase().includes('turbo-0125')) {
                 baseOptions.maxModelTokens = 16385;
                 baseOptions.maxResponseTokens = 4096;
             }
             else {
-                baseOptions.maxResponseTokens = 1000;
+                baseOptions.maxModelTokens = 4096;
+                baseOptions.maxResponseTokens = 1024;
             }
         }
+        if (this.config?.modelMaxToken) {
+            baseOptions.maxModelTokens = this.config.modelMaxToken;
+        }
+        if (this.config?.maxToken) {
+            baseOptions.maxResponseTokens = this.config.maxToken;
+        }
         if (this.config.proxyUrl) {
             console.log(`启用代理请求:${this.config.proxyUrl}`);
             this.chatGPT = new ChatGPTAPI({

package/dist/esm/src/botInstance/sdk/chatGPT.js

@@ -112,12 +112,11 @@ let ChatGPTAPI = class {
             ...completionParams
         };
         this._systemMessage = systemMessage;
-        if (this._systemMessage === void 0) {
-            const currentDate = new Date().toISOString().split("T")[0];
-            this._systemMessage = `You are ChatGPT, a large language model trained by OpenAI. Answer as concisely as possible.
-Knowledge cutoff: 2021-09-01
-Current date: ${currentDate}`;
-        }
+        //     if (!this._systemMessage) {
+        //       const currentDate = new Date().toISOString().split("T")[0];
+        //       this._systemMessage = `You are ChatGPT, a large language model trained by OpenAI. Answer as concisely as possible.
+        // Current date: ${currentDate}`;
+        //     }
         this._maxModelTokens = maxModelTokens;
         this._maxResponseTokens = maxResponseTokens;
         this._getMessageById = getMessageById ?? this._defaultGetMessageById;
@@ -249,7 +248,15 @@ Current date: ${currentDate}`;
                     }
                     if ((_a = response == null ? void 0 : response.choices) == null ? void 0 : _a.length) {
                         const message2 = response.choices[0].message;
-                        result.text = message2.content;
+                        if (typeof message2.content === 'string') {
+                            result.text = message2.content;
+                        }
+                        else if (Array.isArray(message2.content)) {
+                            const finalContent = message2.content.find(item => item.type === 'text');
+                            if (finalContent) {
+                                result.text = finalContent?.text?.content || '';
+                            }
+                        }
                         if (message2.role) {
                             result.role = message2.role;
                         }

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

@@ -20,7 +20,7 @@ async function onFriend(friendship) {
                         await delay(10000);
                         await friendship.accept();
                     }
-                    else if (config.acceptFriendKeyWords.length > 0 && config.acceptFriendKeyWords.includes(hello)) {
+                    else if (config.acceptFriendKeyWords.length > 0 && config.acceptFriendKeyWords.find(item => item.includes(hello))) {
                         console.log(`触发关键词${hello},10秒后自动通过好友请求`);
                         await delay(10000);
                         await friendship.accept();

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

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

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

@@ -67,6 +67,8 @@ declare namespace _default {
     export { getMaterial };
     export { getFireNews };
     export { clearVerifyCode };
+    export { getRssLast };
+    export { updateRssLast };
     export { getVerifyCode };
 }
 export default _default;
@@ -184,4 +186,14 @@ export function updateChatRecord(id: any, num: any): Promise<any>;
  * @return {Promise<*>}
  */
 export function getPromotInfo(id: any): Promise<any>;
+/**
+ * 更新rss最后一条内容的配置
+ * @return {Promise<*>}
+ */
+export function getRssLast(id: any): Promise<any>;
+/**
+ * 更新rss最后一条内容的配置
+ * @return {Promise<*>}
+ */
+export function updateRssLast(id: any, lastcontent: any): Promise<any>;
 //# sourceMappingURL=aibotk.d.ts.map

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

@@ -210,6 +210,11 @@ async function getConfig() {
             openaiAccessToken: '',
             openaiDebug: false,
             openaiModel: 'gpt-3.5-turbo',
+            temperature: 0.8,
+            top_p: 1,
+            presence_penalty: 1,
+            maxToken: null,
+            modelMaxToken: null,
             dify_token: '',
             dify_baseUrl: '',
             difyAgent: false,
@@ -306,6 +311,45 @@ export async function getRssConfig() {
         console.log('获取rss配置文件失败:' + error);
     }
 }
+/**
+ * 更新rss最后一条内容的配置
+ * @return {Promise<*>}
+ */
+async function updateRssLast(id, lastcontent) {
+    try {
+        console.log('id----', id, lastcontent);
+        let option = {
+            method: 'POST',
+            url: `/rss/lastcontent/${id}`,
+            params: {
+                content: lastcontent
+            },
+        };
+        let content = await aiBotReq(option);
+        return content;
+    }
+    catch (error) {
+        console.log('获取rss配置文件失败:' + error);
+    }
+}
+/**
+ * 更新rss最后一条内容的配置
+ * @return {Promise<*>}
+ */
+async function getRssLast(id) {
+    try {
+        let option = {
+            method: 'GET',
+            url: `/rss/lastcontent/${id}`,
+            params: {},
+        };
+        let content = await aiBotReq(option);
+        return content.data;
+    }
+    catch (error) {
+        console.log('获取rss配置文件失败:' + error);
+    }
+}
 /**
  * 更新对话次数
  * @param id
@@ -707,6 +751,8 @@ export { getMaterial };
 export { getFireNews };
 export { updateChatRecord };
 export { getPromotInfo };
+export { getRssLast };
+export { updateRssLast };
 export default {
     getConfig,
     getScheduleList,
@@ -726,6 +772,8 @@ export default {
     getMaterial,
     getFireNews,
     clearVerifyCode,
+    getRssLast,
+    updateRssLast,
     getVerifyCode
 };
 //# sourceMappingURL=aibotk.js.map

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

@@ -24,6 +24,9 @@ export async function getGptOfficialReply(content, uid, isFastGPT) {
         showQuestion: config.showQuestion,
         timeoutMs: config.openaiTimeout,
         model: config.openaiModel,
+        temperature: config?.temperature,
+        top_p: config?.top_p,
+        presence_penalty: config?.presence_penalty,
         systemMessage: config.openaiSystemMessage,
         filter: config.chatFilter,
         filterConfig: {

package/dist/esm/src/task/rss.js

@@ -5,6 +5,7 @@ import { roomSay, contactSay } from "../common/index.js";
 import rssParser from 'rss-parser';
 import { getPuppetEol } from "../const/puppet-type.js";
 import dayjs from "dayjs";
+import { getRssLast, updateRssLast } from '../proxy/aibotk.js';
 async function getRssContent(info) {
     try {
         const parser = new rssParser({
@@ -15,17 +16,17 @@ async function getRssContent(info) {
         });
         console.log('订阅源:' + info.rssUrl);
         const feed = await parser.parseURL(info.rssUrl);
-        const lastItem = await getRssHistoryById(info.id);
-        console.log('上一条消息', JSON.stringify(lastItem));
+        const lastItem = await getRssLast(info.id);
+        console.log('上一条已经推送的消息', JSON.stringify(lastItem));
         // 当存在文章的时候
         if (feed.items && feed.items.length) {
             // 当存在历史推送记录 需要判读是否推送过
             const last = feed.items[0];
             const lastContent = last.link || last.title;
             if (lastItem) {
-                if (lastContent !== lastItem.lastContent) {
+                if (lastContent !== lastItem?.lastContent) {
                     const content = await setContent(last, info);
-                    void updateRssHistory(info.id, { lastContent: lastContent, lastTime: dayjs().format('YYYY-MM-DD HH:mm:ss') });
+                    void updateRssLast(info.id, lastContent);
                     return content;
                 }
                 console.log('rss内容未更新,最后一条内容已推送');
@@ -33,13 +34,14 @@ async function getRssContent(info) {
             }
             else {
                 const content = await setContent(last, info);
-                void addRssHistory({ _id: info.id, id: info.id, lastContent: lastContent, lastTime: dayjs().format('YYYY-MM-DD HH:mm:ss') });
+                void updateRssLast(info.id, lastContent);
                 return content;
             }
         }
     }
     catch (e) {
         console.log("获取rss内容失败，大概率是订阅源格式不规范，请更换:" + e);
+        return [];
     }
 }
 async function setContent(feed, info) {
@@ -50,7 +52,8 @@ async function setContent(feed, info) {
             return [res];
         }
         else {
-            const content = `${info.prefixWord ? info.prefixWord + eol + eol : ''}${delHtmlTag(feed.title)}${eol}${eol}【摘要】：${delHtmlTag(feed.content).substring(0, 1500)}...${eol}【链接】:${feed.link}${eol}${eol}${info.suffixWord || ''}`;
+            const desc = delHtmlTag(feed.content)?.substring(0, 1500)?.trim();
+            const content = `${info.prefixWord ? info.prefixWord + eol + eol : ''}${delHtmlTag(feed.title)}${eol}${eol} ${desc ? `【摘要】：${desc}...${eol}` : ''}【链接】:${feed.link}${eol}${eol}${info.suffixWord || ''}`;
             return [{ type: 1, content: content }];
         }
     }

package/package.json

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