wechaty-web-panel 1.6.48 → 1.6.50

package/CHANGELOG.md

@@ -1,5 +1,8 @@
 ## 更新日志
-### V1.6.48(2024-04-23)
+### V1.6.50(2024-05-07)
+1、修复rss任务被取消问题
+
+### V1.6.49(2024-04-23)
 1、优化 rss 解析
 2、修复 rss 定时任务初始化失效
 

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

@@ -494,7 +494,10 @@ function groupArray(array, subGroupLength) {
 }
 exports.groupArray = groupArray;
 function delHtmlTag(str) {
-    return str.replace(/<[^>]+>/g, ""); //去掉所有的html标记
+    if (str) {
+        return str.replace(/<[^>]+>/g, ""); //去掉所有的html标记
+    }
+    return '';
 }
 exports.delHtmlTag = delHtmlTag;
 function isCDNFileUrl(url) {

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

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

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

@@ -246,6 +246,7 @@ async function getConfig() {
             roomAt: 1,
             friendNoReplyInRoom: 0,
             defaultReply: '',
+            forwards: [],
             ...config,
             cloudRoom
         });

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

@@ -52,6 +52,7 @@ async function filterFriendMsg(that, contact, msg) {
             { bool: msg.includes(NEWADDFRIEND), method: 'newFriendMsg' },
             { bool: config.roomJoinKeywords && config.roomJoinKeywords.length > 0, method: 'roomInviteMsg' },
             { bool: msg.startsWith(REMINDKEY), method: 'scheduleJobMsg' },
+            { bool: config.forwards && config.forwards.length > 0, method: 'keywordForward' },
             { bool: config.callBackEvents && config.callBackEvents.length > 0, method: 'callbackEvent' },
             { bool: config.preventWords, method: 'preventWordCheck' },
             { bool: config.eventKeywords && config.eventKeywords.length > 0, method: 'eventMsg' },
@@ -86,6 +87,7 @@ async function filterRoomMsg({ that, msg, name, id, avatar, room, isMention, roo
         const gptConfig = global_js_1.default.getAllGptConfig(); // 获取gpt配置信息
         const resArray = [
             { bool: msg === '', method: 'emptyMsg' },
+            { bool: config.forwards && config.forwards.length > 0, method: 'keywordForward' },
             { bool: config.callBackEvents && config.callBackEvents.length > 0, method: 'callbackEvent' },
             { bool: !!config.preventWords, method: 'preventWordCheck' },
             { bool: config.eventKeywords && config.eventKeywords.length > 0, method: 'eventMsg' },

package/dist/cjs/src/service/msg-filters.d.ts

@@ -1,3 +1,17 @@
+export function keywordForward({ that, msg, name, id, config, room, isMention, roomId, roomName }: {
+    that: any;
+    msg: any;
+    name: any;
+    id: any;
+    config: any;
+    room: any;
+    isMention: any;
+    roomId: any;
+    roomName: any;
+}): Promise<{
+    type: number;
+    content: string;
+}[]>;
 declare namespace _default {
     export { getCustomConfig };
     export { customBot };
@@ -13,6 +27,7 @@ declare namespace _default {
     export { maxLengthMsg };
     export { customChat };
     export { preventWordCheck };
+    export { keywordForward };
 }
 export default _default;
 export function customBot({ that, msg, name, id, config, room, isMention }: {

package/dist/cjs/src/service/msg-filters.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.getCustomConfig = exports.preventWordCheck = exports.customChat = exports.maxLengthMsg = exports.robotMsg = exports.keywordsMsg = exports.eventMsg = exports.scheduleJobMsg = exports.roomInviteMsg = exports.newFriendMsg = exports.officialMsg = exports.emptyMsg = exports.callbackEvent = exports.customBot = void 0;
+exports.getCustomConfig = exports.preventWordCheck = exports.customChat = exports.maxLengthMsg = exports.robotMsg = exports.keywordsMsg = exports.eventMsg = exports.scheduleJobMsg = exports.roomInviteMsg = exports.newFriendMsg = exports.officialMsg = exports.emptyMsg = exports.callbackEvent = exports.customBot = exports.keywordForward = void 0;
 const event_dispatch_service_js_1 = __importDefault(require("./event-dispatch-service.js"));
 const aibotk_js_1 = require("../proxy/aibotk.js");
 const index_js_1 = require("../lib/index.js");
@@ -13,6 +13,8 @@ const dispatch_js_1 = require("../proxy/bot/dispatch.js");
 const global_js_1 = __importDefault(require("../db/global.js"));
 const userDb_js_1 = require("../db/userDb.js");
 const configDb_js_1 = require("../db/configDb.js");
+const puppet_type_js_1 = require("../const/puppet-type.js");
+const dayjs_1 = __importDefault(require("dayjs"));
 async function emptyMsg({ room, isMention }) {
     const config = await (0, configDb_js_1.allConfig)();
     if (room && !isMention)
@@ -455,6 +457,99 @@ async function customBot({ that, msg, name, id, config, room, isMention }) {
     return res;
 }
 exports.customBot = customBot;
+function checkKeyword(forward, msg) {
+    const keywords = forward.keywords;
+    const reg = forward.reg;
+    for (let key of keywords) {
+        if ((reg === 1 && msg.includes(key)) || (reg === 2 && msg === key)) {
+            return true;
+        }
+    }
+    return false;
+}
+function getForwardConfig({ name, id, room, roomId, roomName, msg, config }) {
+    const configs = config.forwards;
+    if (configs && configs.length) {
+        let finalConfig = '';
+        if (room) {
+            finalConfig = room && configs.find((item) => {
+                const targetNames = [];
+                const targetIds = [];
+                item.targets.forEach(tItem => {
+                    targetNames.push(tItem.name);
+                    targetIds.push(tItem.id);
+                });
+                const keywordCheck = checkKeyword(item, msg);
+                return keywordCheck && item.type === 'room' && (targetNames.includes(roomName) || targetIds.includes(roomId));
+            });
+        }
+        else {
+            finalConfig = configs.find((item) => {
+                const targetNames = [];
+                const targetIds = [];
+                item.targets.forEach(tItem => {
+                    targetNames.push(tItem.name);
+                    targetIds.push(tItem.id);
+                });
+                const keywordCheck = checkKeyword(item, msg);
+                return keywordCheck && item.type === 'contact' && (targetNames.includes(name) || targetIds.includes(id));
+            });
+        }
+        return finalConfig;
+    }
+}
+async function getTargets(that, targets, type) {
+    const finalTargets = [];
+    if (type === 'room') {
+        for (let item of targets) {
+            try {
+                const room = await that.Room.find({ id: item.id, topic: item.name });
+                finalTargets.push(room);
+            }
+            catch (e) {
+                console.log('查询转发群组失败', e);
+            }
+        }
+    }
+    else {
+        for (let item of targets) {
+            try {
+                const room = await that.Contact.find({ id: item.id, name: item.name });
+                finalTargets.push(room);
+            }
+            catch (e) {
+                console.log('查询转发好友失败', e);
+            }
+        }
+    }
+    return finalTargets;
+}
+async function keywordForward({ that, msg, name, id, config, room, isMention, roomId, roomName }) {
+    try {
+        const forwards = config.forwards || [];
+        if (forwards.length) {
+            const finalConfig = getForwardConfig({ name, id, room, msg, config, roomId, roomName });
+            if (finalConfig) {
+                const finalTargets = await getTargets(that, finalConfig.forwardTargets, finalConfig.forwardType);
+                if (finalTargets.length) {
+                    const eol = await (0, puppet_type_js_1.getPuppetEol)();
+                    for (let contact of finalTargets) {
+                        const content = room ? `【关键词转发】${eol} 时间：${(0, dayjs_1.default)().format('MM-DD HH:mm:ss')} ${eol}收到群聊【${roomName}】中【${name}】发送的内容：${msg}` : `【关键词转发】${eol} 时间：${(0, dayjs_1.default)().format('MM-DD HH:mm:ss')} ${eol}收到好友【${name}】发送的内容：${msg}`;
+                        await contact.say(content);
+                        await (0, index_js_1.delay)(3000);
+                    }
+                    return [{ type: 1, content: '' }];
+                }
+            }
+        }
+        return [];
+    }
+    catch (e) {
+        console.log('转发消息失败', e);
+        return [];
+    }
+}
+exports.keywordForward = keywordForward;
 exports.default = {
     getCustomConfig,
     customBot,
@@ -469,6 +564,7 @@ exports.default = {
     robotMsg,
     maxLengthMsg,
     customChat,
-    preventWordCheck
+    preventWordCheck,
+    keywordForward
 };
 //# sourceMappingURL=msg-filters.js.map

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

@@ -48,14 +48,20 @@ 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: (0, index_js_1.delHtmlTag)(feed.title), description: (0, index_js_1.delHtmlTag)(feed.content).substring(0, 80), thumbUrl: info.thumbUrl };
-        return [res];
+    try {
+        const eol = await (0, puppet_type_js_1.getPuppetEol)();
+        if (info.showLink) {
+            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 : ''}${(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 || ''}`;
+            return [{ type: 1, content: content }];
+        }
     }
-    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 || ''}`;
-        return [{ type: 1, content: content }];
+    catch (e) {
+        console.log('设置rss发送内容报错：', e);
+        return [{ type: 1, content: '' }];
     }
 }
 const typeMap = {
@@ -154,13 +160,13 @@ exports.sendRssTaskMessage = sendRssTaskMessage;
  */
 async function initRssTask(that) {
     try {
-        (0, index_js_1.cancelAllSchedule)("task_rss");
+        (0, index_js_1.cancelAllSchedule)("rss_");
         const rssTasks = await (0, rssConfig_js_1.getAllRssConfig)(); // 获取配置信息
         console.log(`获取到 rss 任务 :${rssTasks.length}个`);
         // 每日说定时任务
         if (rssTasks && rssTasks.length > 0) {
             rssTasks.forEach((item, index) => {
-                setTask(that, item, `task_rss_${index}`, sendRssContent);
+                setTask(that, item, `rss_${index}`, sendRssContent);
             });
         }
     }

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

@@ -444,7 +444,10 @@ function groupArray(array, subGroupLength) {
     return newArray;
 }
 export function delHtmlTag(str) {
-    return str.replace(/<[^>]+>/g, ""); //去掉所有的html标记
+    if (str) {
+        return str.replace(/<[^>]+>/g, ""); //去掉所有的html标记
+    }
+    return '';
 }
 export function isCDNFileUrl(url) {
     // 常见的CDN文件扩展名

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

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

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

@@ -232,6 +232,7 @@ async function getConfig() {
             roomAt: 1,
             friendNoReplyInRoom: 0,
             defaultReply: '',
+            forwards: [],
             ...config,
             cloudRoom
         });

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

@@ -46,6 +46,7 @@ async function filterFriendMsg(that, contact, msg) {
             { bool: msg.includes(NEWADDFRIEND), method: 'newFriendMsg' },
             { bool: config.roomJoinKeywords && config.roomJoinKeywords.length > 0, method: 'roomInviteMsg' },
             { bool: msg.startsWith(REMINDKEY), method: 'scheduleJobMsg' },
+            { bool: config.forwards && config.forwards.length > 0, method: 'keywordForward' },
             { bool: config.callBackEvents && config.callBackEvents.length > 0, method: 'callbackEvent' },
             { bool: config.preventWords, method: 'preventWordCheck' },
             { bool: config.eventKeywords && config.eventKeywords.length > 0, method: 'eventMsg' },
@@ -79,6 +80,7 @@ async function filterRoomMsg({ that, msg, name, id, avatar, room, isMention, roo
         const gptConfig = globalConfig.getAllGptConfig(); // 获取gpt配置信息
         const resArray = [
             { bool: msg === '', method: 'emptyMsg' },
+            { bool: config.forwards && config.forwards.length > 0, method: 'keywordForward' },
             { bool: config.callBackEvents && config.callBackEvents.length > 0, method: 'callbackEvent' },
             { bool: !!config.preventWords, method: 'preventWordCheck' },
             { bool: config.eventKeywords && config.eventKeywords.length > 0, method: 'eventMsg' },

package/dist/esm/src/service/msg-filters.d.ts

@@ -1,3 +1,17 @@
+export function keywordForward({ that, msg, name, id, config, room, isMention, roomId, roomName }: {
+    that: any;
+    msg: any;
+    name: any;
+    id: any;
+    config: any;
+    room: any;
+    isMention: any;
+    roomId: any;
+    roomName: any;
+}): Promise<{
+    type: number;
+    content: string;
+}[]>;
 declare namespace _default {
     export { getCustomConfig };
     export { customBot };
@@ -13,6 +27,7 @@ declare namespace _default {
     export { maxLengthMsg };
     export { customChat };
     export { preventWordCheck };
+    export { keywordForward };
 }
 export default _default;
 export function customBot({ that, msg, name, id, config, room, isMention }: {

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

@@ -1,12 +1,14 @@
 import dispatch from './event-dispatch-service.js';
 import { getConfig, setSchedule, updateSchedule } from '../proxy/aibotk.js';
-import { contentDistinguish, setLocalSchedule, isRealDate } from '../lib/index.js';
+import { contentDistinguish, setLocalSchedule, isRealDate, delay } from '../lib/index.js';
 import { addRoom } from '../common/index.js';
 import { service, callbackAibotApi } from '../proxy/superagent.js';
 import { dispatchBot } from '../proxy/bot/dispatch.js';
 import globalConfig from '../db/global.js';
 import { getUser } from '../db/userDb.js';
 import { allConfig } from '../db/configDb.js';
+import { getPuppetEol } from '../const/puppet-type.js';
+import dayjs from 'dayjs';
 async function emptyMsg({ room, isMention }) {
     const config = await allConfig();
     if (room && !isMention)
@@ -435,6 +437,98 @@ async function customBot({ that, msg, name, id, config, room, isMention }) {
     let res = await service.post(item.customUrl, data, { timeout: timeout * 1000 });
     return res;
 }
+function checkKeyword(forward, msg) {
+    const keywords = forward.keywords;
+    const reg = forward.reg;
+    for (let key of keywords) {
+        if ((reg === 1 && msg.includes(key)) || (reg === 2 && msg === key)) {
+            return true;
+        }
+    }
+    return false;
+}
+function getForwardConfig({ name, id, room, roomId, roomName, msg, config }) {
+    const configs = config.forwards;
+    if (configs && configs.length) {
+        let finalConfig = '';
+        if (room) {
+            finalConfig = room && configs.find((item) => {
+                const targetNames = [];
+                const targetIds = [];
+                item.targets.forEach(tItem => {
+                    targetNames.push(tItem.name);
+                    targetIds.push(tItem.id);
+                });
+                const keywordCheck = checkKeyword(item, msg);
+                return keywordCheck && item.type === 'room' && (targetNames.includes(roomName) || targetIds.includes(roomId));
+            });
+        }
+        else {
+            finalConfig = configs.find((item) => {
+                const targetNames = [];
+                const targetIds = [];
+                item.targets.forEach(tItem => {
+                    targetNames.push(tItem.name);
+                    targetIds.push(tItem.id);
+                });
+                const keywordCheck = checkKeyword(item, msg);
+                return keywordCheck && item.type === 'contact' && (targetNames.includes(name) || targetIds.includes(id));
+            });
+        }
+        return finalConfig;
+    }
+}
+async function getTargets(that, targets, type) {
+    const finalTargets = [];
+    if (type === 'room') {
+        for (let item of targets) {
+            try {
+                const room = await that.Room.find({ id: item.id, topic: item.name });
+                finalTargets.push(room);
+            }
+            catch (e) {
+                console.log('查询转发群组失败', e);
+            }
+        }
+    }
+    else {
+        for (let item of targets) {
+            try {
+                const room = await that.Contact.find({ id: item.id, name: item.name });
+                finalTargets.push(room);
+            }
+            catch (e) {
+                console.log('查询转发好友失败', e);
+            }
+        }
+    }
+    return finalTargets;
+}
+export async function keywordForward({ that, msg, name, id, config, room, isMention, roomId, roomName }) {
+    try {
+        const forwards = config.forwards || [];
+        if (forwards.length) {
+            const finalConfig = getForwardConfig({ name, id, room, msg, config, roomId, roomName });
+            if (finalConfig) {
+                const finalTargets = await getTargets(that, finalConfig.forwardTargets, finalConfig.forwardType);
+                if (finalTargets.length) {
+                    const eol = await getPuppetEol();
+                    for (let contact of finalTargets) {
+                        const content = room ? `【关键词转发】${eol} 时间：${dayjs().format('MM-DD HH:mm:ss')} ${eol}收到群聊【${roomName}】中【${name}】发送的内容：${msg}` : `【关键词转发】${eol} 时间：${dayjs().format('MM-DD HH:mm:ss')} ${eol}收到好友【${name}】发送的内容：${msg}`;
+                        await contact.say(content);
+                        await delay(3000);
+                    }
+                    return [{ type: 1, content: '' }];
+                }
+            }
+        }
+        return [];
+    }
+    catch (e) {
+        console.log('转发消息失败', e);
+        return [];
+    }
+}
 export { customBot };
 export { callbackEvent };
 export { emptyMsg };
@@ -463,6 +557,7 @@ export default {
     robotMsg,
     maxLengthMsg,
     customChat,
-    preventWordCheck
+    preventWordCheck,
+    keywordForward
 };
 //# sourceMappingURL=msg-filters.js.map

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

@@ -42,14 +42,20 @@ async function getRssContent(info) {
     }
 }
 async function setContent(feed, info) {
-    const eol = await getPuppetEol();
-    if (info.showLink) {
-        const res = { type: 4, url: feed.link, title: delHtmlTag(feed.title), description: delHtmlTag(feed.content).substring(0, 80), thumbUrl: info.thumbUrl };
-        return [res];
+    try {
+        const eol = await getPuppetEol();
+        if (info.showLink) {
+            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 : ''}${delHtmlTag(feed.title)}${eol}${eol}【摘要】：${delHtmlTag(feed.content).substring(0, 1500)}...${eol}【链接】:${feed.link}${eol}${eol}${info.suffixWord || ''}`;
+            return [{ type: 1, content: content }];
+        }
     }
-    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 || ''}`;
-        return [{ type: 1, content: content }];
+    catch (e) {
+        console.log('设置rss发送内容报错：', e);
+        return [{ type: 1, content: '' }];
     }
 }
 const typeMap = {
@@ -147,13 +153,13 @@ export async function sendRssTaskMessage(that, info) {
  */
 export async function initRssTask(that) {
     try {
-        cancelAllSchedule("task_rss");
+        cancelAllSchedule("rss_");
         const rssTasks = await getAllRssConfig(); // 获取配置信息
         console.log(`获取到 rss 任务 :${rssTasks.length}个`);
         // 每日说定时任务
         if (rssTasks && rssTasks.length > 0) {
             rssTasks.forEach((item, index) => {
-                setTask(that, item, `task_rss_${index}`, sendRssContent);
+                setTask(that, item, `rss_${index}`, sendRssContent);
             });
         }
     }

package/package.json

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