wechaty-web-panel 1.4.8 → 1.4.9

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## 更新日志
 
+### V1.4.9(2023-02-15)
+1、添加倒计时功能
+2、默认使用带上下文的chatGPT模型
+
 ### V1.4.8(2023-02-08)
 1、修复历史消息问题
 2、添加两个chatGPT 回复模型，尽量保证有返回

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

@@ -2,7 +2,7 @@ declare namespace _default {
     export { updateRoomOnly };
     export { updateContactOnly };
     export { getEveryDayContent };
-    export { getEveryDayRoomContent };
+    export { getNewsContent };
     export { updateContactInfo };
     export { updateRoomInfo };
     export { addRoom };
@@ -10,7 +10,7 @@ declare namespace _default {
     export { roomSay };
     export { addRoomWelcomeSay };
     export { updateContactAndRoom };
-    export { getRoomEveryDayContent };
+    export { getCountDownContent };
 }
 export default _default;
 /**
@@ -37,7 +37,7 @@ export function getEveryDayContent(date: any, city: any, endWord: any): Promise<
  * @param {*} sortId 新闻资讯分类Id
  * @param {*} endWord 结尾备注
  */
-export function getEveryDayRoomContent(sortId: any, endWord?: any, num?: number): Promise<string>;
+export function getNewsContent(sortId: any, endWord?: any, num?: number): Promise<string>;
 /**
  * 更新用户信息
  */
@@ -82,4 +82,13 @@ export function addRoomWelcomeSay(room: any, roomName: any, contactName: any, ms
  */
 export function updateContactAndRoom(that: any): Promise<void>;
 export function getRoomEveryDayContent(date: any, city: any, endWord: any): Promise<string>;
+/**
+ * 获取倒计时内容
+ * @param date
+ * @param prefix
+ * @param suffix
+ * @param endWord
+ * @return {string}
+ */
+export function getCountDownContent(date: any, prefix: any, suffix: any, endWord: any): string;
 //# sourceMappingURL=index.d.ts.map

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getRoomEveryDayContent = exports.updateContactAndRoom = exports.addRoomWelcomeSay = exports.roomSay = exports.contactSay = exports.addRoom = exports.updateRoomInfo = exports.updateContactInfo = exports.getEveryDayRoomContent = exports.getEveryDayContent = exports.updateContactOnly = exports.updateRoomOnly = void 0;
+exports.getCountDownContent = exports.getRoomEveryDayContent = exports.updateContactAndRoom = exports.addRoomWelcomeSay = exports.roomSay = exports.contactSay = exports.addRoom = exports.updateRoomInfo = exports.updateContactInfo = exports.getNewsContent = exports.getEveryDayContent = exports.updateContactOnly = exports.updateRoomOnly = void 0;
 const api_js_1 = require("../proxy/api.js");
 const aibotk_js_1 = require("../proxy/aibotk.js");
 const userDb_js_1 = require("../db/userDb.js");
@@ -12,13 +12,13 @@ const configDb_js_1 = require("../db/configDb.js");
  * @param {*} sortId 新闻资讯分类Id
  * @param {*} endWord 结尾备注
  */
-async function getEveryDayRoomContent(sortId, endWord = '微信小助手', num = 10) {
+async function getNewsContent(sortId, endWord = '', num = 10) {
     let today = (0, index_js_1.formatDate)(new Date()); //获取今天的日期
     let news = await (0, api_js_1.getNews)(sortId, num);
     let content = `${today}\n${news}\n${endWord ? '————————' : ''}${endWord}`;
     return content;
 }
-exports.getEveryDayRoomContent = getEveryDayRoomContent;
+exports.getNewsContent = getNewsContent;
 /**
  * 获取每日说内容
  * @param {*} date 与朋友的纪念日
@@ -44,6 +44,21 @@ async function getRoomEveryDayContent(date, city, endWord) {
     return str;
 }
 exports.getRoomEveryDayContent = getRoomEveryDayContent;
+/**
+ * 获取倒计时内容
+ * @param date
+ * @param prefix
+ * @param suffix
+ * @param endWord
+ * @return {string}
+ */
+function getCountDownContent(date, prefix, suffix, endWord) {
+    let countDownDay = (0, index_js_1.getDay)(date); //获取倒计时天数
+    let today = (0, index_js_1.formatDate)(new Date()); //获取今天的日期
+    let str = `${today}\r距离${prefix}还有\r\r✦✦✦✦ ${countDownDay}天 ✦✦✦✦\r\r${suffix}${endWord ? `\r\r————————${endWord}` : ''}`;
+    return str;
+}
+exports.getCountDownContent = getCountDownContent;
 /**
  * 更新用户信息
  */
@@ -360,7 +375,7 @@ exports.default = {
     updateRoomOnly,
     updateContactOnly,
     getEveryDayContent,
-    getEveryDayRoomContent,
+    getNewsContent,
     updateContactInfo,
     updateRoomInfo,
     addRoom,
@@ -368,6 +383,6 @@ exports.default = {
     roomSay,
     addRoomWelcomeSay,
     updateContactAndRoom,
-    getRoomEveryDayContent
+    getCountDownContent
 };
 //# sourceMappingURL=index.js.map

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

@@ -133,10 +133,10 @@ async function dispatchRoomFilterByMsgType(that, room, msg) {
         switch (type) {
             case that.Message.Type.Text:
                 content = msg.text();
-                console.log(`群名: ${roomName} 发消息人: ${contactName} 内容: ${content}`);
                 const mentionSelf = await msg.mentionSelf() || content.includes(`@${userSelfName}`);
                 const receiverName = receiver?.name();
                 content = content.replace('@' + receiverName, "").replace('@' + userSelfName, "").replace(/@[^,，：:\s@]+/g, "").trim();
+                console.log(`群名: ${roomName} 发消息人: ${contactName} 内容: ${content} | 机器人被@：${mentionSelf ? '是' : '否'}`);
                 // 检测是否需要这条消息
                 const isIgnore = checkIgnore(content, aibotConfig.ignoreMessages);
                 if (isIgnore)

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

@@ -31,6 +31,7 @@ const crypto_1 = __importDefault(require("crypto"));
 const schedule = __importStar(require("node-schedule"));
 const fs_1 = __importDefault(require("fs"));
 const roomAvatarDb_js_1 = require("../db/roomAvatarDb.js");
+const dayjs_1 = __importDefault(require("dayjs"));
 /**
  * 设置定时器
  * @param {*} date 日期
@@ -92,9 +93,9 @@ exports.delay = delay;
  * @param {*} date 日期
  */
 function getDay(date) {
-    var date2 = new Date();
-    var date1 = new Date(date);
-    var iDays = parseInt(Math.abs(date2.getTime() - date1.getTime()) / 1000 / 60 / 60 / 24);
+    var date2 = (0, dayjs_1.default)().startOf('day').valueOf();
+    var date1 = (0, dayjs_1.default)(date).endOf('day').valueOf();
+    var iDays = parseInt(Math.abs(date2 - date1) / 1000 / 60 / 60 / 24);
     return iDays;
 }
 exports.getDay = getDay;

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

@@ -42,7 +42,6 @@ export namespace packageJson {
         "npm-run-all": string;
         prettier: string;
         wechaty: string;
-        "wechaty-puppet-wechat4u": string;
     };
     const readme: string;
     namespace engines {
@@ -52,6 +51,7 @@ export namespace packageJson {
     const dependencies: {
         axios: string;
         chatgpt: string;
+        dayjs: string;
         "isomorphic-fetch": string;
         ix: string;
         jsonwebtoken: string;

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

@@ -6,8 +6,8 @@ exports.packageJson = void 0;
  */
 exports.packageJson = {
     "name": "wechaty-web-panel",
-    "version": "1.4.8",
-    "description": "",
+    "version": "1.4.9",
+    "description": "智能微秘书插件",
     "exports": {
         ".": {
             "import": "./dist/esm/src/index.js",
@@ -59,8 +59,7 @@ exports.packageJson = {
         "eslint-plugin-prettier": "^3.1.4",
         "npm-run-all": "^4.1.5",
         "prettier": "^2.0.5",
-        "wechaty": "^1.20.2",
-        "wechaty-puppet-wechat4u": "^1.13.14"
+        "wechaty": "^1.20.2"
     },
     "readme": "README.md",
     "engines": {
@@ -69,7 +68,8 @@ exports.packageJson = {
     },
     "dependencies": {
         "axios": "^0.27.2",
-        "chatgpt": "^4.1.2",
+        "chatgpt": "^4.4.0",
+        "dayjs": "^1.11.7",
         "isomorphic-fetch": "^3.0.0",
         "ix": "^4.5.2",
         "jsonwebtoken": "^8.5.1",

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

@@ -126,9 +126,14 @@ async function getFireNews(id, num) {
         let news = '';
         for (let i in newList) {
             let num = parseInt(i) + 1;
-            news = `${news}\n${num}.${newList[i].title}\n${newList[i].shortUrl ? newList[i].shortUrl : newList[i].url}\n`;
+            const url = newList[i].shortUrl ? newList[i].shortUrl : newList[i].url;
+            news = `${news}\r${num}.${newList[i].title}${url ? `\r${url}\r` : `\r`}`;
         }
-        return `${news}…………………………\n\n您可以 @消防小助手+新闻标题，通过ChatGPT为您分析时事新闻！`;
+        const endMap = {
+            1001: '您可以 @消防小助手+新闻标题，通过ChatGPT为您分析时事新闻！',
+            1002: '您可以 @消防小助手+新闻标题，通过ChatGPT为您分析今日消防行业招标信息！',
+        };
+        return `${news}…………………………\r\r${endMap[id]}`;
     }
     catch (e) {
         console.log('获取每日一句失败', e);
@@ -150,7 +155,7 @@ async function getConfig() {
         let content = await (0, superagent_js_1.aiBotReq)(option);
         const config = JSON.parse(content.data.config);
         const cloudRoom = await getWordCloudRoom();
-        let cres = await (0, configDb_js_1.updateConfig)({ puppetType: 'wechaty-puppet-wechat', botScope: 'all', parseMini: false, parseMiniRooms: [], preventLength: 1000, ...config, cloudRoom });
+        let cres = await (0, configDb_js_1.updateConfig)({ puppetType: 'wechaty-puppet-wechat', botScope: 'all', parseMini: false, countDownTaskSchedule: [], parseMiniRooms: [], preventLength: 1000, ...config, cloudRoom });
         return cres;
     }
     catch (e) {

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

@@ -225,9 +225,9 @@ async function getNews(id, num = 10) {
             // let shortUrl = 'https://www.tianapi.com/weixin/news/?col=' + id
             for (let i in newList) {
                 let num = parseInt(i) + 1;
-                news = `${news}\n${num}.${newList[i].title}`;
+                news = `${news}\r${num}.${newList[i].title}`;
             }
-            return `${news}\n`;
+            return `${news}\r`;
         }
         else {
             console.log('获取新闻接口失败', content.msg);
@@ -251,7 +251,7 @@ async function getMingYan() {
         let content = await (0, superagent_js_1.txReq)(option);
         if (content.code === 200) {
             let newList = content.newslist;
-            let news = `${newList[0].content}\n——————————${newList[0].author}`;
+            let news = `${newList[0].content}\r——————————${newList[0].author}`;
             return news;
         }
         else {

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

@@ -36,8 +36,9 @@ async function geGPTReply(content) {
             top_p: 1,
             frequency_penalty: 0.0,
             presence_penalty: 0.6,
-            stop: [' Human:', ' AI:'],
+            stop: ['Human:', 'AI:'],
         });
+        console.log('chat gpt返回原始数据：' + response.data.choices[0].text);
         response = markdownToText(response.data.choices[0].text);
         let replys = [];
         let message = response;

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

@@ -102,11 +102,11 @@ async function initMqtt(that) {
                         }
                         else if (content.target === 'Room') {
                             console.log('触发了群事件');
-                            await (0, index_js_2.sendRoomTaskMessage)(that, content);
+                            await (0, index_js_2.sendTaskMessage)(that, content);
                         }
                         else if (content.target === 'Contact') {
                             console.log('触发了好友事件');
-                            await (0, index_js_2.sendContactTaskMessage)(that, content);
+                            await (0, index_js_2.sendTaskMessage)(that, content);
                         }
                     }
                 });

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

@@ -227,10 +227,10 @@ async function dispatchAiBot(bot, msg, name, id) {
                 break;
             case 6:
                 // ChatGPT3
-                res = await (0, chatgpt_js_1.geGPTReply)(msg, id);
+                res = await (0, openAi_js_1.geGPT3Reply)(msg, id);
                 if (res.length === 1 && !res[0].content) {
                     console.log('第一个gpt接口返回失败，开始请求第二个gpt接口');
-                    res = await (0, openAi_js_1.geGPT3Reply)(msg, id);
+                    res = await (0, chatgpt_js_1.geGPTReply)(msg, id);
                 }
                 replys = res;
                 break;

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

@@ -2,8 +2,6 @@ declare namespace _default {
     export { initTaskLocalSchedule };
     export { initAllSchedule };
     export { initTimeSchedule };
-    export { sendRoomTaskMessage };
-    export { sendContactTaskMessage };
 }
 export default _default;
 /**
@@ -25,15 +23,9 @@ export function initAllSchedule(that: any): Promise<void>;
  */
 export function initTimeSchedule(that: any): Promise<void>;
 /**
- * 立即发送资讯
+ * 立即发送群消息
  * @param {*} that bot对象
  * @param {*} item 任务项  { target: 'Room', event: '', message: { roomName: '', type: 'news 新闻 ||task 定时任务', contents: [] } }
  */
-export function sendRoomTaskMessage(that: any, info: any): Promise<void>;
-/**
- * 立即发送每日说
- * @param {*} that bot对象
- * @param {*} item 任务项  { target: 'Contact', event:'wechatEveryday', message: { roomName: '', type: 'news 新闻 ||task 定时任务', contents: [] } }
- */
-export function sendContactTaskMessage(that: any, info: any): Promise<void>;
+export function sendTaskMessage(that: any, info: any): Promise<void>;
 //# sourceMappingURL=index.d.ts.map