wechaty-web-panel 1.6.15 → 1.6.16

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## 更新日志
 
+### V1.6.16(2023-08-12)
+1、优化换行在windows中的发送
+2、优化rss内容发送
+3、优化小程序解析地址
+4、添加reset 和 重置 指令清空gpt对话上下文
+
 ### V1.6.15(2023-07-23)
 1、修复自定义对话更新配置问题
 2、添加rss订阅功能

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

@@ -67,8 +67,8 @@ class DifyAi {
                     return [{ type: 1, content: '这个话题不适合讨论，换个话题吧。' }];
                 }
             }
-            if (systemMessage) {
-                console.log('带角色重新更新上下文对话');
+            if (systemMessage || content === 'reset' || content === '重置') {
+                console.log('重新更新上下文对话');
                 this.chatOption[uid] = {};
             }
             console.log('this.chatOption[uid]', this.chatOption[uid]);

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

@@ -125,8 +125,8 @@ class OfficialOpenAi {
                     return [{ type: 1, content: '这个话题不适合讨论，换个话题吧。' }];
                 }
             }
-            if (systemMessage) {
-                console.log('带角色重新更新上下文对话');
+            if (systemMessage || content === 'reset' || content === '重置') {
+                console.log('重新更新上下文对话');
                 this.chatOption[uid] = {};
             }
             const { conversationId, text, id } = systemMessage ? await this.chatGPT.sendMessage(content, { ...this.chatOption[uid], systemMessage, timeoutMs: this.config.timeoutMs * 1000 || 80 * 1000 }) : await this.chatGPT.sendMessage(content, { ...this.chatOption[uid], timeoutMs: this.config.timeoutMs * 1000 || 80 * 1000 });

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

@@ -83,9 +83,9 @@ class UnOfficialOpenAi {
                 await this.init();
             }
             let question = this.config.systemMessage ? this.config.systemMessage + content : content;
-            if (systemMessage) {
+            if (systemMessage || content === 'reset' || content === '重置') {
                 question = systemMessage + content;
-                console.log('带角色重新更新上下文对话');
+                console.log('重新更新上下文对话');
                 this.chatOption[uid] = {};
             }
             const { conversationId, text, id } = systemMessage ? await this.chatGPT.sendMessage(question, { ...this.chatOption[uid], systemMessage, timeoutMs: this.config.timeoutMs * 1000 || 80 * 1000 }) : await this.chatGPT.sendMessage(question, { ...this.chatOption[uid], timeoutMs: this.config.timeoutMs * 1000 || 80 * 1000 });

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

@@ -8,6 +8,13 @@ const index_js_1 = require("../lib/index.js");
 const file_box_1 = require("file-box");
 const configDb_js_1 = require("../db/configDb.js");
 const puppet_type_js_1 = require("../const/puppet-type.js");
+async function formatContent(text) {
+    const isWin = (0, puppet_type_js_1.isWindowsPlatform)();
+    if (isWin) {
+        return text.replace(/\n/g, "\r");
+    }
+    return text;
+}
 /**
  * 获取每日新闻内容
  * @param {*} sortId 新闻资讯分类Id
@@ -202,8 +209,9 @@ async function roomSay(room, contact, msg) {
     console.log('回复内容：', JSON.stringify(msg));
     try {
         if (msg.type === 1 && msg.content) {
+            const content = await formatContent(msg.content);
             // 文字
-            contact ? await room.say(msg.content, contact) : await room.say(msg.content);
+            contact ? await room.say(content, contact) : await room.say(content);
         }
         else if (msg.type === 2 && msg.url) {
             // url文件
@@ -220,9 +228,11 @@ async function roomSay(room, contact, msg) {
             await room.say(obj);
         }
         else if (msg.type === 4 && msg.url && msg.title && msg.description) {
+            const description = await formatContent(msg.description);
+            const title = await formatContent(msg.title);
             let url = new this.UrlLink({
-                description: msg.description,
-                thumbnailUrl: msg.thumbUrl,
+                description: description,
+                thumbnailUrl: title,
                 title: msg.title,
                 url: msg.url,
             });
@@ -265,8 +275,9 @@ async function contactSay(contact, msg, isRoom = false) {
     console.log('回复内容：', JSON.stringify(msg));
     try {
         if (msg.type === 1 && msg.content) {
+            const content = await formatContent(msg.content);
             // 文字
-            await contact.say(msg.content);
+            await contact.say(content);
         }
         else if (msg.type === 2 && msg.url) {
             // url文件
@@ -280,10 +291,12 @@ async function contactSay(contact, msg, isRoom = false) {
             await contact.say(obj);
         }
         else if (msg.type === 4 && msg.url && msg.title && msg.description) {
+            const description = await formatContent(msg.description);
+            const title = await formatContent(msg.title);
             let url = new this.UrlLink({
-                description: msg.description,
+                description: description,
                 thumbnailUrl: msg.thumbUrl,
-                title: msg.title,
+                title: title,
                 url: msg.url,
             });
             await contact.say(url);

package/dist/cjs/src/const/puppet-type.d.ts

@@ -1,4 +1,9 @@
 export function getPuppetEol(): Promise<"\r" | "\n">;
+/**
+ * 判断是不是windows平台
+ * @return {Promise<boolean>}
+ */
+export function isWindowsPlatform(): Promise<boolean>;
 /**
  * 判断是否是web 协议
  * @return {Promise<boolean>}

package/dist/cjs/src/const/puppet-type.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isNotWebPuppet = exports.getPuppetEol = exports.SEND_APP_MSG_PUPPET = exports.WRAP_REPLACE_PUPPET = exports.PUPPET_MAP = void 0;
+exports.isNotWebPuppet = exports.isWindowsPlatform = exports.getPuppetEol = exports.SEND_APP_MSG_PUPPET = exports.WRAP_REPLACE_PUPPET = exports.PUPPET_MAP = void 0;
 const puppetDb_js_1 = require("../db/puppetDb.js");
 exports.PUPPET_MAP = {
     // https://github.com/wechaty/puppet-wechat4u
@@ -52,6 +52,18 @@ async function getPuppetEol() {
     return '\n';
 }
 exports.getPuppetEol = getPuppetEol;
+/**
+ * 判断是不是windows平台
+ * @return {Promise<boolean>}
+ */
+async function isWindowsPlatform() {
+    const puppetInfo = await (0, puppetDb_js_1.getPuppetInfo)();
+    if (puppetInfo.puppetType === 'PuppetXp' || puppetInfo.puppetType === 'PuppetEngine') {
+        return true;
+    }
+    return false;
+}
+exports.isWindowsPlatform = isWindowsPlatform;
 /**
  * 判断是否是web 协议
  * @return {Promise<boolean>}

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

@@ -85,7 +85,7 @@ async function dispatchFriendFilterByMsgType(that, msg) {
                 console.log(`发消息人${await contact.name()}:发了一个小程序`);
                 const miniProgram = await msg.toMiniProgram();
                 if (config.parseMini && miniProgram.payload) {
-                    const miniParse = `【小程序解析】${eol}${eol}appid：${miniProgram.appid()}${eol}username：${miniProgram.username()}${eol}标题：${miniProgram.title()}${eol}描述：${miniProgram.description()}${eol}路径：${miniProgram.pagePath()}`;
+                    const miniParse = `【小程序解析】${eol}${eol}appid：${miniProgram.appid()}${eol}username：${miniProgram.username().replace('@app', '')}${eol}标题：${miniProgram.title()}${eol}描述：${miniProgram.description()}${eol}路径：${decodeURIComponent(miniProgram.pagePath())}`;
                     contact.say(miniParse);
                 }
                 console.log('mini', miniProgram);
@@ -190,7 +190,7 @@ async function dispatchRoomFilterByMsgType(that, room, msg) {
                 console.log(`群名: ${roomName} 发消息人: ${contactName} 发了一个小程序`);
                 const miniProgram = await msg.toMiniProgram();
                 if (config.parseMiniRooms.includes(roomName) && miniProgram.payload) {
-                    const miniParse = `【小程序解析】${eol}${eol}appid:${miniProgram.appid()}${eol}username：${miniProgram.username()}${eol}标题：${miniProgram.title()}${eol}描述：${miniProgram.description()}${eol}路径：${miniProgram.pagePath()}${eol}`;
+                    const miniParse = `【小程序解析】${eol}${eol}appid:${miniProgram.appid()}${eol}username：${miniProgram.username().replace('@app', '')}${eol}标题：${miniProgram.title()}${eol}描述：${miniProgram.description()}${eol}路径：${decodeURIComponent(miniProgram.pagePath())}${eol}`;
                     room.say(miniParse);
                 }
                 console.log('mini', miniProgram);

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

@@ -1,3 +1,4 @@
+export function delHtmlTag(str: any): any;
 declare namespace _default {
     export { Base64Encode };
     export { Base64Decode };

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

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getNewsType = exports.groupArray = exports.cancelAllSchedule = exports.throttle = exports.msgArr = exports.contentDistinguish = exports.getFormatQuery = exports.MD5 = exports.writeFile = exports.randomRange = exports.getConstellation = exports.isRealDate = exports.formatDate = exports.getDay = exports.convertTime = exports.getToday = exports.delay = exports.parseBody = exports.setLocalSchedule = exports.Base64Decode = exports.Base64Encode = void 0;
+exports.getNewsType = exports.groupArray = exports.cancelAllSchedule = exports.throttle = exports.msgArr = exports.contentDistinguish = exports.getFormatQuery = exports.MD5 = exports.writeFile = exports.randomRange = exports.getConstellation = exports.isRealDate = exports.formatDate = exports.getDay = exports.convertTime = exports.getToday = exports.delay = exports.parseBody = exports.setLocalSchedule = exports.Base64Decode = exports.Base64Encode = exports.delHtmlTag = void 0;
 const crypto_1 = __importDefault(require("crypto"));
 const schedule = __importStar(require("node-schedule"));
 const fs_1 = __importDefault(require("fs"));
@@ -492,6 +492,10 @@ function groupArray(array, subGroupLength) {
     return newArray;
 }
 exports.groupArray = groupArray;
+function delHtmlTag(str) {
+    return str.replace(/<[^>]+>/g, ""); //去掉所有的html标记
+}
+exports.delHtmlTag = delHtmlTag;
 exports.default = {
     Base64Encode,
     Base64Decode,

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

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

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

@@ -45,11 +45,11 @@ async function getRssContent(info) {
 async function setContent(feed, info) {
     const eol = await (0, puppet_type_js_1.getPuppetEol)();
     if (info.showLink) {
-        const res = { type: 4, url: feed.link, title: feed.title, description: feed.content.substring(0, 30), thumbUrl: info.thumbUrl };
+        const res = { type: 4, url: feed.link, title: (0, index_js_1.delHtmlTag)(feed.title), description: (0, index_js_1.delHtmlTag)(feed.content.substring(0, 80)), thumbUrl: info.thumbUrl };
         return [res];
     }
     else {
-        const content = `${info.prefixWord ? info.prefixWord + eol + eol : ''}《${feed.title}》${eol}【原链接】:${feed.link}${eol}【摘要】：${feed.content.substring(0, 100)}...${eol}${eol}${info.suffixWord || ''}`;
+        const content = `${info.prefixWord ? info.prefixWord + eol + eol : ''}《${(0, index_js_1.delHtmlTag)(feed.title)}》${eol}【原链接】:${feed.link}${eol}【摘要】：${(0, index_js_1.delHtmlTag)(feed.content.substring(0, 300))}...${eol}${eol}${info.suffixWord || ''}`;
         return [{ type: 1, content: content }];
     }
 }

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

@@ -62,8 +62,8 @@ class DifyAi {
                     return [{ type: 1, content: '这个话题不适合讨论，换个话题吧。' }];
                 }
             }
-            if (systemMessage) {
-                console.log('带角色重新更新上下文对话');
+            if (systemMessage || content === 'reset' || content === '重置') {
+                console.log('重新更新上下文对话');
                 this.chatOption[uid] = {};
             }
             console.log('this.chatOption[uid]', this.chatOption[uid]);

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

@@ -120,8 +120,8 @@ class OfficialOpenAi {
                     return [{ type: 1, content: '这个话题不适合讨论，换个话题吧。' }];
                 }
             }
-            if (systemMessage) {
-                console.log('带角色重新更新上下文对话');
+            if (systemMessage || content === 'reset' || content === '重置') {
+                console.log('重新更新上下文对话');
                 this.chatOption[uid] = {};
             }
             const { conversationId, text, id } = systemMessage ? await this.chatGPT.sendMessage(content, { ...this.chatOption[uid], systemMessage, timeoutMs: this.config.timeoutMs * 1000 || 80 * 1000 }) : await this.chatGPT.sendMessage(content, { ...this.chatOption[uid], timeoutMs: this.config.timeoutMs * 1000 || 80 * 1000 });

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

@@ -78,9 +78,9 @@ class UnOfficialOpenAi {
                 await this.init();
             }
             let question = this.config.systemMessage ? this.config.systemMessage + content : content;
-            if (systemMessage) {
+            if (systemMessage || content === 'reset' || content === '重置') {
                 question = systemMessage + content;
-                console.log('带角色重新更新上下文对话');
+                console.log('重新更新上下文对话');
                 this.chatOption[uid] = {};
             }
             const { conversationId, text, id } = systemMessage ? await this.chatGPT.sendMessage(question, { ...this.chatOption[uid], systemMessage, timeoutMs: this.config.timeoutMs * 1000 || 80 * 1000 }) : await this.chatGPT.sendMessage(question, { ...this.chatOption[uid], timeoutMs: this.config.timeoutMs * 1000 || 80 * 1000 });

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

@@ -4,7 +4,14 @@ import { getUser } from '../db/userDb.js';
 import { formatDate, getDay, groupArray, delay } from '../lib/index.js';
 import { FileBox } from 'file-box';
 import { allConfig } from '../db/configDb.js';
-import { getPuppetEol } from "../const/puppet-type.js";
+import { getPuppetEol, isWindowsPlatform } from "../const/puppet-type.js";
+async function formatContent(text) {
+    const isWin = isWindowsPlatform();
+    if (isWin) {
+        return text.replace(/\n/g, "\r");
+    }
+    return text;
+}
 /**
  * 获取每日新闻内容
  * @param {*} sortId 新闻资讯分类Id
@@ -192,8 +199,9 @@ async function roomSay(room, contact, msg) {
     console.log('回复内容：', JSON.stringify(msg));
     try {
         if (msg.type === 1 && msg.content) {
+            const content = await formatContent(msg.content);
             // 文字
-            contact ? await room.say(msg.content, contact) : await room.say(msg.content);
+            contact ? await room.say(content, contact) : await room.say(content);
         }
         else if (msg.type === 2 && msg.url) {
             // url文件
@@ -210,9 +218,11 @@ async function roomSay(room, contact, msg) {
             await room.say(obj);
         }
         else if (msg.type === 4 && msg.url && msg.title && msg.description) {
+            const description = await formatContent(msg.description);
+            const title = await formatContent(msg.title);
             let url = new this.UrlLink({
-                description: msg.description,
-                thumbnailUrl: msg.thumbUrl,
+                description: description,
+                thumbnailUrl: title,
                 title: msg.title,
                 url: msg.url,
             });
@@ -254,8 +264,9 @@ async function contactSay(contact, msg, isRoom = false) {
     console.log('回复内容：', JSON.stringify(msg));
     try {
         if (msg.type === 1 && msg.content) {
+            const content = await formatContent(msg.content);
             // 文字
-            await contact.say(msg.content);
+            await contact.say(content);
         }
         else if (msg.type === 2 && msg.url) {
             // url文件
@@ -269,10 +280,12 @@ async function contactSay(contact, msg, isRoom = false) {
             await contact.say(obj);
         }
         else if (msg.type === 4 && msg.url && msg.title && msg.description) {
+            const description = await formatContent(msg.description);
+            const title = await formatContent(msg.title);
             let url = new this.UrlLink({
-                description: msg.description,
+                description: description,
                 thumbnailUrl: msg.thumbUrl,
-                title: msg.title,
+                title: title,
                 url: msg.url,
             });
             await contact.say(url);

package/dist/esm/src/const/puppet-type.d.ts

@@ -1,4 +1,9 @@
 export function getPuppetEol(): Promise<"\r" | "\n">;
+/**
+ * 判断是不是windows平台
+ * @return {Promise<boolean>}
+ */
+export function isWindowsPlatform(): Promise<boolean>;
 /**
  * 判断是否是web 协议
  * @return {Promise<boolean>}

package/dist/esm/src/const/puppet-type.js

@@ -48,6 +48,17 @@ export async function getPuppetEol() {
     }
     return '\n';
 }
+/**
+ * 判断是不是windows平台
+ * @return {Promise<boolean>}
+ */
+export async function isWindowsPlatform() {
+    const puppetInfo = await getPuppetInfo();
+    if (puppetInfo.puppetType === 'PuppetXp' || puppetInfo.puppetType === 'PuppetEngine') {
+        return true;
+    }
+    return false;
+}
 /**
  * 判断是否是web 协议
  * @return {Promise<boolean>}

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

@@ -83,7 +83,7 @@ async function dispatchFriendFilterByMsgType(that, msg) {
                 console.log(`发消息人${await contact.name()}:发了一个小程序`);
                 const miniProgram = await msg.toMiniProgram();
                 if (config.parseMini && miniProgram.payload) {
-                    const miniParse = `【小程序解析】${eol}${eol}appid：${miniProgram.appid()}${eol}username：${miniProgram.username()}${eol}标题：${miniProgram.title()}${eol}描述：${miniProgram.description()}${eol}路径：${miniProgram.pagePath()}`;
+                    const miniParse = `【小程序解析】${eol}${eol}appid：${miniProgram.appid()}${eol}username：${miniProgram.username().replace('@app', '')}${eol}标题：${miniProgram.title()}${eol}描述：${miniProgram.description()}${eol}路径：${decodeURIComponent(miniProgram.pagePath())}`;
                     contact.say(miniParse);
                 }
                 console.log('mini', miniProgram);
@@ -188,7 +188,7 @@ async function dispatchRoomFilterByMsgType(that, room, msg) {
                 console.log(`群名: ${roomName} 发消息人: ${contactName} 发了一个小程序`);
                 const miniProgram = await msg.toMiniProgram();
                 if (config.parseMiniRooms.includes(roomName) && miniProgram.payload) {
-                    const miniParse = `【小程序解析】${eol}${eol}appid:${miniProgram.appid()}${eol}username：${miniProgram.username()}${eol}标题：${miniProgram.title()}${eol}描述：${miniProgram.description()}${eol}路径：${miniProgram.pagePath()}${eol}`;
+                    const miniParse = `【小程序解析】${eol}${eol}appid:${miniProgram.appid()}${eol}username：${miniProgram.username().replace('@app', '')}${eol}标题：${miniProgram.title()}${eol}描述：${miniProgram.description()}${eol}路径：${decodeURIComponent(miniProgram.pagePath())}${eol}`;
                     room.say(miniParse);
                 }
                 console.log('mini', miniProgram);

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

@@ -1,3 +1,4 @@
+export function delHtmlTag(str: any): any;
 declare namespace _default {
     export { Base64Encode };
     export { Base64Decode };

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

@@ -442,6 +442,9 @@ function groupArray(array, subGroupLength) {
     }
     return newArray;
 }
+export function delHtmlTag(str) {
+    return str.replace(/<[^>]+>/g, ""); //去掉所有的html标记
+}
 export { Base64Encode };
 export { Base64Decode };
 export { setLocalSchedule };

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

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

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

@@ -1,4 +1,4 @@
-import { setLocalSchedule, delay, cancelAllSchedule } from "../lib/index.js";
+import { setLocalSchedule, delay, cancelAllSchedule, delHtmlTag } from "../lib/index.js";
 import { getAllRssConfig } from '../db/rssConfig.js';
 import { addRssHistory, updateRssHistory, getRssHistoryById } from "../db/rssHistory.js";
 import { roomSay, contactSay } from "../common/index.js";
@@ -39,11 +39,11 @@ async function getRssContent(info) {
 async function setContent(feed, info) {
     const eol = await getPuppetEol();
     if (info.showLink) {
-        const res = { type: 4, url: feed.link, title: feed.title, description: feed.content.substring(0, 30), thumbUrl: info.thumbUrl };
+        const res = { type: 4, url: feed.link, title: delHtmlTag(feed.title), description: delHtmlTag(feed.content.substring(0, 80)), thumbUrl: info.thumbUrl };
         return [res];
     }
     else {
-        const content = `${info.prefixWord ? info.prefixWord + eol + eol : ''}《${feed.title}》${eol}【原链接】:${feed.link}${eol}【摘要】：${feed.content.substring(0, 100)}...${eol}${eol}${info.suffixWord || ''}`;
+        const content = `${info.prefixWord ? info.prefixWord + eol + eol : ''}《${delHtmlTag(feed.title)}》${eol}【原链接】:${feed.link}${eol}【摘要】：${delHtmlTag(feed.content.substring(0, 300))}...${eol}${eol}${info.suffixWord || ''}`;
         return [{ type: 1, content: content }];
     }
 }

package/package.json

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