wechaty-web-panel 1.6.47 → 1.6.48

package/CHANGELOG.md

@@ -1,4 +1,8 @@
 ## 更新日志
+### V1.6.48(2024-04-23)
+1、优化 rss 解析
+2、修复 rss 定时任务初始化失效
+
 ### V1.6.47(2024-04-23)
 1、添加 Coze支持
 2、优化文件提取规则

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

@@ -1,4 +1,5 @@
 export function delHtmlTag(str: any): any;
+export function isCDNFileUrl(url: any): boolean;
 /**
  * 提取文字中的图片链接 文件链接
  * @param text

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

@@ -26,11 +26,12 @@ 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 = exports.extractImageLinks = exports.delHtmlTag = 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.extractImageLinks = exports.isCDNFileUrl = exports.delHtmlTag = void 0;
 const crypto_1 = __importDefault(require("crypto"));
 const schedule = __importStar(require("node-schedule"));
 const fs_1 = __importDefault(require("fs"));
 const dayjs_1 = __importDefault(require("dayjs"));
+const path_1 = __importDefault(require("path"));
 /**
  * 设置定时器
  * @param {*} date 日期
@@ -496,6 +497,21 @@ function delHtmlTag(str) {
     return str.replace(/<[^>]+>/g, ""); //去掉所有的html标记
 }
 exports.delHtmlTag = delHtmlTag;
+function isCDNFileUrl(url) {
+    // 常见的CDN文件扩展名
+    const cdnFileExtensions = ['.png', '.jpg', '.jpeg', '.gif', '.svg', '.webp', '.mp4', '.doc', '.docx', '.xls', '.xlsx', '.ppt', '.pptx', '.avi', '.zip', '.wav', '.rar', '.pdf', '.txt', '.log'];
+    try {
+        const parsedUrl = new URL(url);
+        const fileExt = path_1.default.extname(parsedUrl.pathname).toLowerCase();
+        // 检查文件扩展名是否在cdnFileExtensions列表中
+        return cdnFileExtensions.includes(fileExt);
+    }
+    catch (err) {
+        // 无效的URL
+        return false;
+    }
+}
+exports.isCDNFileUrl = isCDNFileUrl;
 /**
  * 提取文字中的图片链接 文件链接
  * @param text
@@ -520,7 +536,7 @@ function extractImageLinks(text) {
     while ((match = mdRegexHttp.exec(text)) !== null || (match = mdRegexHttps.exec(text)) !== null || (match = fileRegexHttp.exec(text)) !== null || (match = filesRegexHttp.exec(text)) !== null) {
         imageLinks.push(match[1]);
     }
-    imageLinks = Array.from(new Set(imageLinks));
+    imageLinks = Array.from(new Set(imageLinks)).filter(item => isCDNFileUrl(item));
     return imageLinks.map(item => ({ type: 2, url: item }));
 }
 exports.extractImageLinks = extractImageLinks;

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

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

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

@@ -65,7 +65,7 @@ async function setTask(that, item, name, callback) {
  * @param targets 发送的多个目标
  * @return {Promise<void>}
  */
-const sendCustom = async ({ that, target, item, isMulti, targets }) => {
+async function sendCustom({ that, target, item, isMulti, targets }) {
     for (let reply of item.contents) {
         console.log("定时任务开始发送，内容：", `${reply.type === 1 ? reply.content : reply.url}`);
         await (0, index_js_1.delay)(1000);
@@ -112,7 +112,8 @@ const sendCustom = async ({ that, target, item, isMulti, targets }) => {
             }
         }
     }
-};
+}
+;
 /**
  * 发送新闻资讯
  * @param that
@@ -122,7 +123,7 @@ const sendCustom = async ({ that, target, item, isMulti, targets }) => {
  * @param targets 发送的多个目标
  * @return {Promise<void>}
  */
-const sendNews = async ({ that, target, item, isMulti, targets }) => {
+async function sendNews({ that, target, item, isMulti, targets }) {
     let content = await (0, index_js_2.getNewsContent)(item.sortId, item.endWord, item.num || 10);
     console.log("新闻资讯开始发送，内容：", content);
     await (0, index_js_1.delay)(200);
@@ -145,7 +146,8 @@ const sendNews = async ({ that, target, item, isMulti, targets }) => {
             }
         }
     }
-};
+}
+;
 /**
  * 发送自定义定制内容
  * @param that
@@ -156,7 +158,7 @@ const sendNews = async ({ that, target, item, isMulti, targets }) => {
  * @param targets 发送的多个目标
  * @return {Promise<void>}
  */
-const sendCustomContent = async ({ that, target, type, item, isMulti, targets }) => {
+async function sendCustomContent({ that, target, type, item, isMulti, targets }) {
     let contents = await (0, index_js_2.getCustomContent)(item.sortId);
     console.log("定制内容发送", contents);
     if (!isMulti) {
@@ -184,7 +186,8 @@ const sendCustomContent = async ({ that, target, type, item, isMulti, targets })
             }
         }
     }
-};
+}
+;
 /**
  * 发送每日说
  * @param that
@@ -192,7 +195,7 @@ const sendCustomContent = async ({ that, target, type, item, isMulti, targets })
  * @param item
  * @return {Promise<void>}
  */
-const sendEveryDay = async ({ that, target, item }) => {
+async function sendEveryDay({ that, target, item }) {
     let content = "";
     if (item.type === "room") {
         content = await (0, index_js_2.getRoomEveryDayContent)(item.memorialDay, item.city, item.endWord);
@@ -203,7 +206,8 @@ const sendEveryDay = async ({ that, target, item }) => {
     console.log("每日说任务开始工作,发送内容：", content);
     await (0, index_js_1.delay)(1000);
     await target.say(content);
-};
+}
+;
 /**
  * 发送倒计时
  * @param that
@@ -213,7 +217,7 @@ const sendEveryDay = async ({ that, target, item }) => {
  * @param targets 发送的多个目标
  * @return {Promise<void>}
  */
-const sendCountDown = async ({ that, target, item, isMulti, targets }) => {
+async function sendCountDown({ that, target, item, isMulti, targets }) {
     let content = await (0, index_js_2.getCountDownContent)(item.memorialDay, item.prefix, item.suffix, item.endWord);
     console.log("倒计时任务开始工作,发送内容：", content);
     await (0, index_js_1.delay)(1000);
@@ -236,7 +240,8 @@ const sendCountDown = async ({ that, target, item, isMulti, targets }) => {
             }
         }
     }
-};
+}
+;
 /**
  * 立即发送群消息
  * @param {*} that bot对象

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

@@ -13,7 +13,12 @@ const puppet_type_js_1 = require("../const/puppet-type.js");
 const dayjs_1 = __importDefault(require("dayjs"));
 async function getRssContent(info) {
     try {
-        const parser = new rss_parser_1.default();
+        const parser = new rss_parser_1.default({
+            requestOptions: {
+                rejectUnauthorized: false,
+            },
+            headers: { 'User-Agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36' },
+        });
         console.log('订阅源:' + info.rssUrl);
         const feed = await parser.parseURL(info.rssUrl);
         const lastItem = await (0, rssHistory_js_1.getRssHistoryById)(info.id);
@@ -21,7 +26,7 @@ async function getRssContent(info) {
         if (feed.items && feed.items.length) {
             // 当存在历史推送记录 需要判读是否推送过
             const last = feed.items[0];
-            const lastContent = last.link;
+            const lastContent = last.link || last.title;
             if (lastItem) {
                 if (lastContent !== lastItem.lastContent) {
                     const content = await setContent(last, info);
@@ -49,7 +54,7 @@ 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, 600)}...${eol}【链接】:${feed.link}${eol}${eol}${info.suffixWord || ''}`;
+        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 }];
     }
 }
@@ -107,7 +112,7 @@ async function setTask(that, item, name, callback) {
  * @param item
  * @return {Promise<void>}
  */
-const sendRssContent = async ({ that, target, item }) => {
+async function sendRssContent({ that, target, item }) {
     const replys = await getRssContent(item);
     for (let reply of replys) {
         console.log("检测到rss内容更新，开始发送：", `${reply.type === 1 ? reply.content : reply.url}`);
@@ -119,7 +124,7 @@ const sendRssContent = async ({ that, target, item }) => {
             await index_js_2.contactSay.call(that, target, reply);
         }
     }
-};
+}
 /**
  * 立即发送rss消息
  * @param {*} that bot对象
@@ -151,6 +156,7 @@ async function initRssTask(that) {
     try {
         (0, index_js_1.cancelAllSchedule)("task_rss");
         const rssTasks = await (0, rssConfig_js_1.getAllRssConfig)(); // 获取配置信息
+        console.log(`获取到 rss 任务 :${rssTasks.length}个`);
         // 每日说定时任务
         if (rssTasks && rssTasks.length > 0) {
             rssTasks.forEach((item, index) => {

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

@@ -1,4 +1,5 @@
 export function delHtmlTag(str: any): any;
+export function isCDNFileUrl(url: any): boolean;
 /**
  * 提取文字中的图片链接 文件链接
  * @param text

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

@@ -2,6 +2,7 @@ import Crypto from 'crypto';
 import * as schedule from 'node-schedule';
 import fs from 'fs';
 import dayjs from "dayjs";
+import path from 'path';
 /**
  * 设置定时器
  * @param {*} date 日期
@@ -445,6 +446,20 @@ function groupArray(array, subGroupLength) {
 export function delHtmlTag(str) {
     return str.replace(/<[^>]+>/g, ""); //去掉所有的html标记
 }
+export function isCDNFileUrl(url) {
+    // 常见的CDN文件扩展名
+    const cdnFileExtensions = ['.png', '.jpg', '.jpeg', '.gif', '.svg', '.webp', '.mp4', '.doc', '.docx', '.xls', '.xlsx', '.ppt', '.pptx', '.avi', '.zip', '.wav', '.rar', '.pdf', '.txt', '.log'];
+    try {
+        const parsedUrl = new URL(url);
+        const fileExt = path.extname(parsedUrl.pathname).toLowerCase();
+        // 检查文件扩展名是否在cdnFileExtensions列表中
+        return cdnFileExtensions.includes(fileExt);
+    }
+    catch (err) {
+        // 无效的URL
+        return false;
+    }
+}
 /**
  * 提取文字中的图片链接 文件链接
  * @param text
@@ -469,7 +484,7 @@ export function extractImageLinks(text) {
     while ((match = mdRegexHttp.exec(text)) !== null || (match = mdRegexHttps.exec(text)) !== null || (match = fileRegexHttp.exec(text)) !== null || (match = filesRegexHttp.exec(text)) !== null) {
         imageLinks.push(match[1]);
     }
-    imageLinks = Array.from(new Set(imageLinks));
+    imageLinks = Array.from(new Set(imageLinks)).filter(item => isCDNFileUrl(item));
     return imageLinks.map(item => ({ type: 2, url: item }));
 }
 export { Base64Encode };

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

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

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

@@ -59,7 +59,7 @@ async function setTask(that, item, name, callback) {
  * @param targets 发送的多个目标
  * @return {Promise<void>}
  */
-const sendCustom = async ({ that, target, item, isMulti, targets }) => {
+async function sendCustom({ that, target, item, isMulti, targets }) {
     for (let reply of item.contents) {
         console.log("定时任务开始发送，内容：", `${reply.type === 1 ? reply.content : reply.url}`);
         await delay(1000);
@@ -106,7 +106,8 @@ const sendCustom = async ({ that, target, item, isMulti, targets }) => {
             }
         }
     }
-};
+}
+;
 /**
  * 发送新闻资讯
  * @param that
@@ -116,7 +117,7 @@ const sendCustom = async ({ that, target, item, isMulti, targets }) => {
  * @param targets 发送的多个目标
  * @return {Promise<void>}
  */
-const sendNews = async ({ that, target, item, isMulti, targets }) => {
+async function sendNews({ that, target, item, isMulti, targets }) {
     let content = await getNewsContent(item.sortId, item.endWord, item.num || 10);
     console.log("新闻资讯开始发送，内容：", content);
     await delay(200);
@@ -139,7 +140,8 @@ const sendNews = async ({ that, target, item, isMulti, targets }) => {
             }
         }
     }
-};
+}
+;
 /**
  * 发送自定义定制内容
  * @param that
@@ -150,7 +152,7 @@ const sendNews = async ({ that, target, item, isMulti, targets }) => {
  * @param targets 发送的多个目标
  * @return {Promise<void>}
  */
-const sendCustomContent = async ({ that, target, type, item, isMulti, targets }) => {
+async function sendCustomContent({ that, target, type, item, isMulti, targets }) {
     let contents = await getCustomContent(item.sortId);
     console.log("定制内容发送", contents);
     if (!isMulti) {
@@ -178,7 +180,8 @@ const sendCustomContent = async ({ that, target, type, item, isMulti, targets })
             }
         }
     }
-};
+}
+;
 /**
  * 发送每日说
  * @param that
@@ -186,7 +189,7 @@ const sendCustomContent = async ({ that, target, type, item, isMulti, targets })
  * @param item
  * @return {Promise<void>}
  */
-const sendEveryDay = async ({ that, target, item }) => {
+async function sendEveryDay({ that, target, item }) {
     let content = "";
     if (item.type === "room") {
         content = await getRoomEveryDayContent(item.memorialDay, item.city, item.endWord);
@@ -197,7 +200,8 @@ const sendEveryDay = async ({ that, target, item }) => {
     console.log("每日说任务开始工作,发送内容：", content);
     await delay(1000);
     await target.say(content);
-};
+}
+;
 /**
  * 发送倒计时
  * @param that
@@ -207,7 +211,7 @@ const sendEveryDay = async ({ that, target, item }) => {
  * @param targets 发送的多个目标
  * @return {Promise<void>}
  */
-const sendCountDown = async ({ that, target, item, isMulti, targets }) => {
+async function sendCountDown({ that, target, item, isMulti, targets }) {
     let content = await getCountDownContent(item.memorialDay, item.prefix, item.suffix, item.endWord);
     console.log("倒计时任务开始工作,发送内容：", content);
     await delay(1000);
@@ -230,7 +234,8 @@ const sendCountDown = async ({ that, target, item, isMulti, targets }) => {
             }
         }
     }
-};
+}
+;
 /**
  * 立即发送群消息
  * @param {*} that bot对象

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

@@ -7,7 +7,12 @@ import { getPuppetEol } from "../const/puppet-type.js";
 import dayjs from "dayjs";
 async function getRssContent(info) {
     try {
-        const parser = new rssParser();
+        const parser = new rssParser({
+            requestOptions: {
+                rejectUnauthorized: false,
+            },
+            headers: { 'User-Agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36' },
+        });
         console.log('订阅源:' + info.rssUrl);
         const feed = await parser.parseURL(info.rssUrl);
         const lastItem = await getRssHistoryById(info.id);
@@ -15,7 +20,7 @@ async function getRssContent(info) {
         if (feed.items && feed.items.length) {
             // 当存在历史推送记录 需要判读是否推送过
             const last = feed.items[0];
-            const lastContent = last.link;
+            const lastContent = last.link || last.title;
             if (lastItem) {
                 if (lastContent !== lastItem.lastContent) {
                     const content = await setContent(last, info);
@@ -43,7 +48,7 @@ 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, 600)}...${eol}【链接】:${feed.link}${eol}${eol}${info.suffixWord || ''}`;
+        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 }];
     }
 }
@@ -101,7 +106,7 @@ async function setTask(that, item, name, callback) {
  * @param item
  * @return {Promise<void>}
  */
-const sendRssContent = async ({ that, target, item }) => {
+async function sendRssContent({ that, target, item }) {
     const replys = await getRssContent(item);
     for (let reply of replys) {
         console.log("检测到rss内容更新，开始发送：", `${reply.type === 1 ? reply.content : reply.url}`);
@@ -113,7 +118,7 @@ const sendRssContent = async ({ that, target, item }) => {
             await contactSay.call(that, target, reply);
         }
     }
-};
+}
 /**
  * 立即发送rss消息
  * @param {*} that bot对象
@@ -144,6 +149,7 @@ export async function initRssTask(that) {
     try {
         cancelAllSchedule("task_rss");
         const rssTasks = await getAllRssConfig(); // 获取配置信息
+        console.log(`获取到 rss 任务 :${rssTasks.length}个`);
         // 每日说定时任务
         if (rssTasks && rssTasks.length > 0) {
             rssTasks.forEach((item, index) => {

package/package.json

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