wechaty-web-panel 1.6.27 → 1.6.29

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## 更新日志
 
+### V1.6.28(2023-11-09)
+1、添加批量定时任务功能
+
+### V1.6.28(2023-11-07)
+1、优化报错提示
+
 ### V1.6.27(2023-10-30)
 1、添加群不用@也可以回复
 

package/dist/cjs/src/db/global.js

@@ -12,6 +12,13 @@ class Config {
         this.verifyCode = ''; // 企微验证码
         this.verifyId = ''; // 企微验证码id
         this.gptconfig = [];
+        this.allTasks = [];
+    }
+    getAllTasks() {
+        return this.allTasks;
+    }
+    updateAllTasks(list) {
+        this.allTasks = list;
     }
     getVerifyId() {
         return this.verifyId;

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

@@ -120,7 +120,7 @@ async function dispatchFriendFilterByMsgType(that, msg) {
 async function dispatchRoomFilterByMsgType(that, room, msg) {
     const aibotConfig = await (0, aiDb_js_1.getAibotConfig)();
     const config = await (0, configDb_js_1.allConfig)();
-    const { role } = config.userInfo;
+    const { role } = config && config.userInfo || { role: 'default' };
     try {
         const eol = await (0, puppet_type_js_1.getPuppetEol)();
         const contact = msg.talker(); // 发消息人

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

@@ -19,6 +19,7 @@ async function onReady() {
         await (0, puppetDb_js_1.updatePuppetConfig)({ puppetType: this.puppet.constructor.name });
         await (0, aibotk_js_1.getConfig)(); // 获取配置文件
         (0, index_js_3.initAllSchedule)(this); // 初始化任务
+        (0, index_js_3.initMultiTask)(this); // 初始化批量定时任务
         const config = await (0, configDb_js_1.allConfig)();
         const { role } = config.userInfo;
         if (role === 'vip') {

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

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

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

@@ -15,6 +15,11 @@ export function getWordCloud(wordcontent: any, background: any, border: any): Pr
  * @return {Promise<*>}
  */
 export function getGptConfig(): Promise<any>;
+/**
+ * 获取批量任务
+ * @return {Promise<*>}
+ */
+export function getTasks(): Promise<any>;
 /**
  * 获取rss配置
  * @return {Promise<*>}

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.getGptConfig = exports.getWordCloud = exports.getWordCloudConfig = exports.getWordCloudRoom = void 0;
+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.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");
@@ -165,6 +165,7 @@ async function getConfig() {
         if (config.userInfo.role === 'vip') {
             await getGptConfig();
             await getRssConfig();
+            await getTasks();
             cloudRoom = await getWordCloudRoom();
         }
         let cres = await (0, configDb_js_1.updateConfig)({
@@ -226,6 +227,28 @@ async function getGptConfig() {
     }
 }
 exports.getGptConfig = getGptConfig;
+/**
+ * 获取批量任务
+ * @return {Promise<*>}
+ */
+async function getTasks() {
+    try {
+        let option = {
+            method: 'GET',
+            url: '/user/task',
+            params: {},
+        };
+        let content = await (0, superagent_js_1.aiBotReq)(option);
+        if (content.data) {
+            const list = content.data.map(item => ({ ...item, _id: item.id }));
+            global_js_1.default.updateAllTasks(list);
+        }
+    }
+    catch (error) {
+        console.log('获取批量任务失败:' + error);
+    }
+}
+exports.getTasks = getTasks;
 /**
  * 获取rss配置
  * @return {Promise<*>}

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

@@ -183,6 +183,10 @@ async function initMqtt(that) {
                             console.log('触发了rss立即更新事件');
                             await (0, rss_js_1.sendRssTaskMessage)(that, content);
                         }
+                        else if (content.target === 'Tasks') {
+                            console.log('触发了批量任务立即发送');
+                            await (0, index_js_2.sendMultiTaskMessage)(that, content.task);
+                        }
                         else if (content.target === 'refreshCode') {
                             console.log('强制更新二维码');
                             await this.refreshQrCode();
@@ -223,6 +227,11 @@ async function initMqtt(that) {
                         await (0, aibotk_js_1.getRssConfig)();
                         void (0, rss_js_1.initRssTask)(that);
                     }
+                    else if (topic === `aibotk/${userId}/tasks`) {
+                        console.log('更新批量定时任务');
+                        await (0, aibotk_js_1.getTasks)();
+                        void (0, index_js_2.initMultiTask)(that);
+                    }
                 });
             }
         }

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

@@ -17,6 +17,11 @@ export function initTaskLocalSchedule(that: any): Promise<void>;
  * @param {*} RoomSayList 群资讯任务列表
  */
 export function initAllSchedule(that: any): Promise<void>;
+/**
+ * 初始化批量定时任务
+ * @param that
+ */
+export function initMultiTask(that: any): void;
 /**
  * 初始化提醒任务
  * @param {}} that
@@ -28,4 +33,10 @@ export function initTimeSchedule(that: any): Promise<void>;
  * @param {*} item 任务项  { target: 'Room', event: '', message: { roomName: '', type: 'news 新闻 ||task 定时任务', contents: [] } }
  */
 export function sendTaskMessage(that: any, info: any): Promise<void>;
+/**
+ * 立即发送批量任务消息
+ * @param {*} that bot对象
+ * @param {*} item 任务项  { target: 'Room', event: '', message: { roomName: '', type: 'news 新闻 ||task 定时任务', contents: [] } }
+ */
+export function sendMultiTaskMessage(that: any, task: any): Promise<void>;
 //# sourceMappingURL=index.d.ts.map

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

@@ -1,13 +1,16 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sendTaskMessage = exports.initTimeSchedule = exports.initAllSchedule = exports.initTaskLocalSchedule = void 0;
+exports.sendMultiTaskMessage = exports.sendTaskMessage = exports.initTimeSchedule = exports.initMultiTask = exports.initAllSchedule = exports.initTaskLocalSchedule = void 0;
 const index_js_1 = require("../lib/index.js");
 const configDb_js_1 = require("../db/configDb.js");
 const aibotk_js_1 = require("../proxy/aibotk.js");
 const index_js_2 = require("../common/index.js");
+const global_js_1 = __importDefault(require("../db/global.js"));
 const typeMap = {
-    contact: "用户名",
-    room: "群名"
+    contact: "用户名", room: "群名"
 };
 /**
  * 查找发送的目标
@@ -16,7 +19,7 @@ const typeMap = {
  * alias: 别名
  * wxid: wxid
  */
-async function findTarget({ that, type, name, alias, wxid = '' }) {
+async function findTarget({ that, type, name, alias, wxid = "" }) {
     let target = null;
     if (type === "contact") {
         target = wxid && that.Contact.find({ id: wxid }) || name && (await that.Contact.find({ name: name })) || alias && (await that.Contact.find({ alias: alias })); // 获取你要发送的联系人
@@ -38,7 +41,9 @@ async function setTask(that, item, name, callback) {
     try {
         let time = item.date;
         item.type = item.type ? item.type : "contact";
-        const target = await findTarget({ that, type: item.type, name: item.roomName || item.name, alias: item.alias || '', wxid: item.wxid || '' });
+        const target = await findTarget({
+            that, type: item.type, name: item.roomName || item.name, alias: item.alias || "", wxid: item.wxid || ""
+        });
         if (!target) {
             console.log(`查找不到${typeMap[item.type]}：${item.roomName || item.name}`);
         }
@@ -56,17 +61,45 @@ async function setTask(that, item, name, callback) {
  * @param that
  * @param target
  * @param item
+ * @param isMulti 是否多个目标
+ * @param targets 发送的多个目标
  * @return {Promise<void>}
  */
-const sendCustom = async ({ that, target, item }) => {
+const sendCustom = async ({ 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);
         if (item.type === "room") {
-            await index_js_2.roomSay.call(that, target, "", reply);
+            if (!isMulti) {
+                await index_js_2.roomSay.call(that, target, "", reply);
+            }
+            else {
+                for (let single of targets) {
+                    await index_js_2.roomSay.call(that, single, "", reply);
+                    if (item.delay) {
+                        await (0, index_js_1.delay)(item.delay);
+                    }
+                    else {
+                        await (0, index_js_1.delay)(1000);
+                    }
+                }
+            }
         }
         else {
-            await index_js_2.contactSay.call(that, target, reply);
+            if (!isMulti) {
+                await index_js_2.contactSay.call(that, target, reply);
+            }
+            else {
+                for (let single of targets) {
+                    await index_js_2.contactSay.call(that, single, reply);
+                    if (item.delay) {
+                        await (0, index_js_1.delay)(item.delay);
+                    }
+                    else {
+                        await (0, index_js_1.delay)(1000);
+                    }
+                }
+            }
         }
     }
 };
@@ -75,13 +108,28 @@ const sendCustom = async ({ that, target, item }) => {
  * @param that
  * @param target
  * @param item
+ * @param isMulti 是否多个目标
+ * @param targets 发送的多个目标
  * @return {Promise<void>}
  */
-const sendNews = async ({ that, target, item }) => {
+const sendNews = async ({ 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)(3000);
-    await target.say(content);
+    await (0, index_js_1.delay)(200);
+    if (!isMulti) {
+        await target.say(content);
+    }
+    else {
+        for (let single of targets) {
+            await single.say(content);
+            if (item.delay) {
+                await (0, index_js_1.delay)(item.delay);
+            }
+            else {
+                await (0, index_js_1.delay)(1000);
+            }
+        }
+    }
 };
 /**
  * 发送每日说
@@ -99,7 +147,7 @@ const sendEveryDay = async ({ that, target, item }) => {
         content = await (0, index_js_2.getEveryDayContent)(item.memorialDay, item.city, item.endWord);
     }
     console.log("每日说任务开始工作,发送内容：", content);
-    await (0, index_js_1.delay)(3000);
+    await (0, index_js_1.delay)(1000);
     await target.say(content);
 };
 /**
@@ -107,13 +155,28 @@ const sendEveryDay = async ({ that, target, item }) => {
  * @param that
  * @param target
  * @param item
+ * @param isMulti 是否多个目标
+ * @param targets 发送的多个目标
  * @return {Promise<void>}
  */
-const sendCountDown = async ({ that, target, item }) => {
+const sendCountDown = async ({ 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)(3000);
-    await target.say(content);
+    await (0, index_js_1.delay)(1000);
+    if (!isMulti) {
+        await target.say(content);
+    }
+    else {
+        for (let single of targets) {
+            await single.say(content);
+            if (item.delay) {
+                await (0, index_js_1.delay)(item.delay);
+            }
+            else {
+                await (0, index_js_1.delay)(1000);
+            }
+        }
+    }
 };
 /**
  * 立即发送群消息
@@ -124,7 +187,9 @@ async function sendTaskMessage(that, info) {
     try {
         const item = info.message;
         item.type = item.type ? item.type : "room";
-        const target = await findTarget({ that, type: item.type, name: item.roomName || item.name, alias: item.alias || '', wxid: item.wxid || '' });
+        const target = await findTarget({
+            that, type: item.type, name: item.roomName || item.name, alias: item.alias || "", wxid: item.wxid || ""
+        });
         if (!target) {
             console.log(`查找不到${typeMap[item.type]}：${item.roomName || item.name}`);
         }
@@ -210,19 +275,19 @@ async function initTaskLocalSchedule(that) {
         // 每日说定时任务
         if (dayTaskSchedule && dayTaskSchedule.length > 0) {
             dayTaskSchedule.forEach((item, index) => {
-                setTask(that, { type: 'contact', ...item }, `task_day_${index}`, sendEveryDay);
+                setTask(that, { type: "contact", ...item }, `task_day_${index}`, sendEveryDay);
             });
         }
         // 新闻资讯定时任务
         if (roomNewsSchedule && roomNewsSchedule.length > 0) {
             roomNewsSchedule.forEach((item, index) => {
-                setTask(that, { type: 'room', ...item }, `task_news_${index}`, sendNews);
+                setTask(that, { type: "room", ...item }, `task_news_${index}`, sendNews);
             });
         }
         // 自定义内容定时任务
         if (roomTaskSchedule && roomTaskSchedule.length > 0) {
             roomTaskSchedule.forEach((item, index) => {
-                setTask(that, { type: 'room', ...item }, `task_custom_${index}`, sendCustom);
+                setTask(that, { type: "room", ...item }, `task_custom_${index}`, sendCustom);
             });
         }
         // 倒计时定时任务
@@ -237,6 +302,123 @@ async function initTaskLocalSchedule(that) {
     }
 }
 exports.initTaskLocalSchedule = initTaskLocalSchedule;
+async function getMultiTargets(that, type, task) {
+    const targets = [];
+    if (task.isAll) {
+        const allTargets = type === "room" ? await that.Room.findAll() : await that.Contact.findAll();
+        if (task.excludeTargets) {
+            allTargets.forEach(target => {
+                const find = type === "room" ? task.excludeTargets.find(eItem => target.id === eItem.id || target.topic() === eItem.name) : task.excludeTargets.find(eItem => target.id === eItem.id || target.name() === eItem.name);
+                if (type === "room") {
+                    if (!find) {
+                        targets.push(target);
+                    }
+                }
+                else {
+                    if (!find && target.friend()) {
+                        targets.push(target);
+                    }
+                }
+            });
+        }
+    }
+    else {
+        for (let target of task.targets) {
+            const finalTarget = type === "room" ? await that.Room.find({
+                id: target.id, topic: target.name
+            }) : await that.Contact.find({ id: target.id, name: target.name });
+            if (finalTarget) {
+                targets.push(finalTarget);
+            }
+            else {
+                console.log(`定时任务查找不到${type === "room" ? "群" : "好友"}：${target.name}，请检查${type === "room" ? "群名" : "好友昵称"}是否正确`);
+            }
+        }
+    }
+    return targets;
+}
+/**
+ * 立即发送批量任务消息
+ * @param {*} that bot对象
+ * @param {*} item 任务项  { target: 'Room', event: '', message: { roomName: '', type: 'news 新闻 ||task 定时任务', contents: [] } }
+ */
+async function sendMultiTaskMessage(that, task) {
+    try {
+        const targets = await getMultiTargets(that, task.type, task);
+        if (!targets.length) {
+            console.log("查找不到要发送的目标，请检查后重试");
+            return;
+        }
+        if (task.taskType === 'news') {
+            await sendNews({ that, isMulti: true, targets, item: task.taskInfo });
+        }
+        else if (task.taskType === 'custom') {
+            await sendCustom({ that, isMulti: true, targets, item: { ...task.taskInfo, type: task.type } });
+        }
+        else if (task.taskType === "countdown") {
+            await sendCountDown({ that, isMulti: true, targets, item: task.taskInfo });
+        }
+    }
+    catch (error) {
+        console.log("立即发送定时任务失败：", error);
+    }
+}
+exports.sendMultiTaskMessage = sendMultiTaskMessage;
+async function setMultiTask(that, task) {
+    try {
+        // 获取要发送的目标
+        const targets = await getMultiTargets(that, task.type, task);
+        if (!targets.length) {
+            return;
+        }
+        if (task.taskType === "news") {
+            (0, index_js_1.setLocalSchedule)(task.cron, sendNews.bind(null, {
+                that,
+                isMulti: true,
+                targets,
+                item: task.taskInfo
+            }), `schedule_news_${task.id}`);
+        }
+        else if (task.taskType === "custom") {
+            (0, index_js_1.setLocalSchedule)(task.cron, sendCustom.bind(null, {
+                that,
+                isMulti: true,
+                targets,
+                item: { ...task.taskInfo, type: task.type }
+            }), `schedule_custom_${task.id}`);
+        }
+        else if (task.taskType === "countDown") {
+            (0, index_js_1.setLocalSchedule)(task.cron, sendCountDown.bind(null, {
+                that,
+                isMulti: true,
+                targets,
+                item: task.taskInfo
+            }), `schedule_countdown_${task.id}`);
+        }
+    }
+    catch (e) {
+        console.log("catch error:" + e);
+    }
+}
+/**
+ * 初始化批量定时任务
+ * @param that
+ */
+function initMultiTask(that) {
+    try {
+        (0, index_js_1.cancelAllSchedule)("schedule");
+        const tasks = global_js_1.default.getAllTasks(); // 获取所有任务
+        if (tasks && tasks.length) {
+            tasks.forEach((item, index) => {
+                void setMultiTask(that, item);
+            });
+        }
+    }
+    catch (e) {
+        console.log("initMultiTask error:" + e);
+    }
+}
+exports.initMultiTask = initMultiTask;
 /**
  * 初始化小助手任务
  * @param {*} that bot对象
@@ -250,8 +432,6 @@ async function initAllSchedule(that) {
 }
 exports.initAllSchedule = initAllSchedule;
 exports.default = {
-    initTaskLocalSchedule,
-    initAllSchedule,
-    initTimeSchedule,
+    initTaskLocalSchedule, initAllSchedule, initTimeSchedule
 };
 //# sourceMappingURL=index.js.map

package/dist/esm/src/db/global.js

@@ -7,6 +7,13 @@ class Config {
         this.verifyCode = ''; // 企微验证码
         this.verifyId = ''; // 企微验证码id
         this.gptconfig = [];
+        this.allTasks = [];
+    }
+    getAllTasks() {
+        return this.allTasks;
+    }
+    updateAllTasks(list) {
+        this.allTasks = list;
     }
     getVerifyId() {
         return this.verifyId;

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

@@ -118,7 +118,7 @@ async function dispatchFriendFilterByMsgType(that, msg) {
 async function dispatchRoomFilterByMsgType(that, room, msg) {
     const aibotConfig = await getAibotConfig();
     const config = await allConfig();
-    const { role } = config.userInfo;
+    const { role } = config && config.userInfo || { role: 'default' };
     try {
         const eol = await getPuppetEol();
         const contact = msg.talker(); // 发消息人

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

@@ -2,7 +2,7 @@ import common from '../common/index.js';
 import { delay } from '../lib/index.js';
 import { getConfig, sendHeartBeat } from "../proxy/aibotk.js";
 import { getUser } from '../db/userDb.js';
-import { initAllSchedule } from "../task/index.js";
+import { initAllSchedule, initMultiTask } from "../task/index.js";
 import { updatePuppetConfig } from "../db/puppetDb.js";
 import { initRssTask } from "../task/rss.js";
 import { allConfig } from "../db/configDb.js";
@@ -14,6 +14,7 @@ async function onReady() {
         await updatePuppetConfig({ puppetType: this.puppet.constructor.name });
         await getConfig(); // 获取配置文件
         initAllSchedule(this); // 初始化任务
+        initMultiTask(this); // 初始化批量定时任务
         const config = await allConfig();
         const { role } = config.userInfo;
         if (role === 'vip') {

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

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

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

@@ -15,6 +15,11 @@ export function getWordCloud(wordcontent: any, background: any, border: any): Pr
  * @return {Promise<*>}
  */
 export function getGptConfig(): Promise<any>;
+/**
+ * 获取批量任务
+ * @return {Promise<*>}
+ */
+export function getTasks(): Promise<any>;
 /**
  * 获取rss配置
  * @return {Promise<*>}

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

@@ -153,6 +153,7 @@ async function getConfig() {
         if (config.userInfo.role === 'vip') {
             await getGptConfig();
             await getRssConfig();
+            await getTasks();
             cloudRoom = await getWordCloudRoom();
         }
         let cres = await updateConfig({
@@ -212,6 +213,27 @@ export async function getGptConfig() {
         console.log('获取gpt配置文件失败:' + error);
     }
 }
+/**
+ * 获取批量任务
+ * @return {Promise<*>}
+ */
+export async function getTasks() {
+    try {
+        let option = {
+            method: 'GET',
+            url: '/user/task',
+            params: {},
+        };
+        let content = await aiBotReq(option);
+        if (content.data) {
+            const list = content.data.map(item => ({ ...item, _id: item.id }));
+            globalConfig.updateAllTasks(list);
+        }
+    }
+    catch (error) {
+        console.log('获取批量任务失败:' + error);
+    }
+}
 /**
  * 获取rss配置
  * @return {Promise<*>}

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

@@ -1,9 +1,9 @@
 import * as mqtt from 'mqtt';
 import { allConfig } from '../db/configDb.js';
 import { contactSay, roomSay, sendRoomNotice } from '../common/index.js';
-import { getConfig, getMqttConfig, getGptConfig, getRssConfig, getVerifyCode } from "./aibotk.js";
+import { getConfig, getMqttConfig, getGptConfig, getRssConfig, getVerifyCode, getTasks } from "./aibotk.js";
 import { dispatchEventContent } from '../service/event-dispatch-service.js';
-import { sendTaskMessage } from "../task/index.js";
+import { sendTaskMessage, initMultiTask, sendMultiTaskMessage } from "../task/index.js";
 import { delay, randomRange } from "../lib/index.js";
 import { reset } from './bot/chatgpt.js';
 import { reset as webReset } from './bot/chatgpt-web.js';
@@ -154,6 +154,10 @@ async function initMqtt(that) {
                             console.log('触发了rss立即更新事件');
                             await sendRssTaskMessage(that, content);
                         }
+                        else if (content.target === 'Tasks') {
+                            console.log('触发了批量任务立即发送');
+                            await sendMultiTaskMessage(that, content.task);
+                        }
                         else if (content.target === 'refreshCode') {
                             console.log('强制更新二维码');
                             await this.refreshQrCode();
@@ -194,6 +198,11 @@ async function initMqtt(that) {
                         await getRssConfig();
                         void initRssTask(that);
                     }
+                    else if (topic === `aibotk/${userId}/tasks`) {
+                        console.log('更新批量定时任务');
+                        await getTasks();
+                        void initMultiTask(that);
+                    }
                 });
             }
         }

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

@@ -17,6 +17,11 @@ export function initTaskLocalSchedule(that: any): Promise<void>;
  * @param {*} RoomSayList 群资讯任务列表
  */
 export function initAllSchedule(that: any): Promise<void>;
+/**
+ * 初始化批量定时任务
+ * @param that
+ */
+export function initMultiTask(that: any): void;
 /**
  * 初始化提醒任务
  * @param {}} that
@@ -28,4 +33,10 @@ export function initTimeSchedule(that: any): Promise<void>;
  * @param {*} item 任务项  { target: 'Room', event: '', message: { roomName: '', type: 'news 新闻 ||task 定时任务', contents: [] } }
  */
 export function sendTaskMessage(that: any, info: any): Promise<void>;
+/**
+ * 立即发送批量任务消息
+ * @param {*} that bot对象
+ * @param {*} item 任务项  { target: 'Room', event: '', message: { roomName: '', type: 'news 新闻 ||task 定时任务', contents: [] } }
+ */
+export function sendMultiTaskMessage(that: any, task: any): Promise<void>;
 //# sourceMappingURL=index.d.ts.map

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

@@ -2,9 +2,9 @@ import { setLocalSchedule, delay, cancelAllSchedule } from "../lib/index.js";
 import { allConfig } from "../db/configDb.js";
 import { getScheduleList, updateSchedule } from "../proxy/aibotk.js";
 import { getNewsContent, getEveryDayContent, roomSay, getRoomEveryDayContent, contactSay, getCountDownContent } from "../common/index.js";
+import globalConfig from "../db/global.js";
 const typeMap = {
-    contact: "用户名",
-    room: "群名"
+    contact: "用户名", room: "群名"
 };
 /**
  * 查找发送的目标
@@ -13,7 +13,7 @@ const typeMap = {
  * alias: 别名
  * wxid: wxid
  */
-async function findTarget({ that, type, name, alias, wxid = '' }) {
+async function findTarget({ that, type, name, alias, wxid = "" }) {
     let target = null;
     if (type === "contact") {
         target = wxid && that.Contact.find({ id: wxid }) || name && (await that.Contact.find({ name: name })) || alias && (await that.Contact.find({ alias: alias })); // 获取你要发送的联系人
@@ -35,7 +35,9 @@ async function setTask(that, item, name, callback) {
     try {
         let time = item.date;
         item.type = item.type ? item.type : "contact";
-        const target = await findTarget({ that, type: item.type, name: item.roomName || item.name, alias: item.alias || '', wxid: item.wxid || '' });
+        const target = await findTarget({
+            that, type: item.type, name: item.roomName || item.name, alias: item.alias || "", wxid: item.wxid || ""
+        });
         if (!target) {
             console.log(`查找不到${typeMap[item.type]}：${item.roomName || item.name}`);
         }
@@ -53,17 +55,45 @@ async function setTask(that, item, name, callback) {
  * @param that
  * @param target
  * @param item
+ * @param isMulti 是否多个目标
+ * @param targets 发送的多个目标
  * @return {Promise<void>}
  */
-const sendCustom = async ({ that, target, item }) => {
+const sendCustom = async ({ that, target, item, isMulti, targets }) => {
     for (let reply of item.contents) {
         console.log("定时任务开始发送，内容：", `${reply.type === 1 ? reply.content : reply.url}`);
         await delay(1000);
         if (item.type === "room") {
-            await roomSay.call(that, target, "", reply);
+            if (!isMulti) {
+                await roomSay.call(that, target, "", reply);
+            }
+            else {
+                for (let single of targets) {
+                    await roomSay.call(that, single, "", reply);
+                    if (item.delay) {
+                        await delay(item.delay);
+                    }
+                    else {
+                        await delay(1000);
+                    }
+                }
+            }
         }
         else {
-            await contactSay.call(that, target, reply);
+            if (!isMulti) {
+                await contactSay.call(that, target, reply);
+            }
+            else {
+                for (let single of targets) {
+                    await contactSay.call(that, single, reply);
+                    if (item.delay) {
+                        await delay(item.delay);
+                    }
+                    else {
+                        await delay(1000);
+                    }
+                }
+            }
         }
     }
 };
@@ -72,13 +102,28 @@ const sendCustom = async ({ that, target, item }) => {
  * @param that
  * @param target
  * @param item
+ * @param isMulti 是否多个目标
+ * @param targets 发送的多个目标
  * @return {Promise<void>}
  */
-const sendNews = async ({ that, target, item }) => {
+const sendNews = async ({ that, target, item, isMulti, targets }) => {
     let content = await getNewsContent(item.sortId, item.endWord, item.num || 10);
     console.log("新闻资讯开始发送，内容：", content);
-    await delay(3000);
-    await target.say(content);
+    await delay(200);
+    if (!isMulti) {
+        await target.say(content);
+    }
+    else {
+        for (let single of targets) {
+            await single.say(content);
+            if (item.delay) {
+                await delay(item.delay);
+            }
+            else {
+                await delay(1000);
+            }
+        }
+    }
 };
 /**
  * 发送每日说
@@ -96,7 +141,7 @@ const sendEveryDay = async ({ that, target, item }) => {
         content = await getEveryDayContent(item.memorialDay, item.city, item.endWord);
     }
     console.log("每日说任务开始工作,发送内容：", content);
-    await delay(3000);
+    await delay(1000);
     await target.say(content);
 };
 /**
@@ -104,13 +149,28 @@ const sendEveryDay = async ({ that, target, item }) => {
  * @param that
  * @param target
  * @param item
+ * @param isMulti 是否多个目标
+ * @param targets 发送的多个目标
  * @return {Promise<void>}
  */
-const sendCountDown = async ({ that, target, item }) => {
+const sendCountDown = async ({ that, target, item, isMulti, targets }) => {
     let content = await getCountDownContent(item.memorialDay, item.prefix, item.suffix, item.endWord);
     console.log("倒计时任务开始工作,发送内容：", content);
-    await delay(3000);
-    await target.say(content);
+    await delay(1000);
+    if (!isMulti) {
+        await target.say(content);
+    }
+    else {
+        for (let single of targets) {
+            await single.say(content);
+            if (item.delay) {
+                await delay(item.delay);
+            }
+            else {
+                await delay(1000);
+            }
+        }
+    }
 };
 /**
  * 立即发送群消息
@@ -121,7 +181,9 @@ async function sendTaskMessage(that, info) {
     try {
         const item = info.message;
         item.type = item.type ? item.type : "room";
-        const target = await findTarget({ that, type: item.type, name: item.roomName || item.name, alias: item.alias || '', wxid: item.wxid || '' });
+        const target = await findTarget({
+            that, type: item.type, name: item.roomName || item.name, alias: item.alias || "", wxid: item.wxid || ""
+        });
         if (!target) {
             console.log(`查找不到${typeMap[item.type]}：${item.roomName || item.name}`);
         }
@@ -205,19 +267,19 @@ async function initTaskLocalSchedule(that) {
         // 每日说定时任务
         if (dayTaskSchedule && dayTaskSchedule.length > 0) {
             dayTaskSchedule.forEach((item, index) => {
-                setTask(that, { type: 'contact', ...item }, `task_day_${index}`, sendEveryDay);
+                setTask(that, { type: "contact", ...item }, `task_day_${index}`, sendEveryDay);
             });
         }
         // 新闻资讯定时任务
         if (roomNewsSchedule && roomNewsSchedule.length > 0) {
             roomNewsSchedule.forEach((item, index) => {
-                setTask(that, { type: 'room', ...item }, `task_news_${index}`, sendNews);
+                setTask(that, { type: "room", ...item }, `task_news_${index}`, sendNews);
             });
         }
         // 自定义内容定时任务
         if (roomTaskSchedule && roomTaskSchedule.length > 0) {
             roomTaskSchedule.forEach((item, index) => {
-                setTask(that, { type: 'room', ...item }, `task_custom_${index}`, sendCustom);
+                setTask(that, { type: "room", ...item }, `task_custom_${index}`, sendCustom);
             });
         }
         // 倒计时定时任务
@@ -231,6 +293,121 @@ async function initTaskLocalSchedule(that) {
         console.log("initTaskLocalSchedule error", e);
     }
 }
+async function getMultiTargets(that, type, task) {
+    const targets = [];
+    if (task.isAll) {
+        const allTargets = type === "room" ? await that.Room.findAll() : await that.Contact.findAll();
+        if (task.excludeTargets) {
+            allTargets.forEach(target => {
+                const find = type === "room" ? task.excludeTargets.find(eItem => target.id === eItem.id || target.topic() === eItem.name) : task.excludeTargets.find(eItem => target.id === eItem.id || target.name() === eItem.name);
+                if (type === "room") {
+                    if (!find) {
+                        targets.push(target);
+                    }
+                }
+                else {
+                    if (!find && target.friend()) {
+                        targets.push(target);
+                    }
+                }
+            });
+        }
+    }
+    else {
+        for (let target of task.targets) {
+            const finalTarget = type === "room" ? await that.Room.find({
+                id: target.id, topic: target.name
+            }) : await that.Contact.find({ id: target.id, name: target.name });
+            if (finalTarget) {
+                targets.push(finalTarget);
+            }
+            else {
+                console.log(`定时任务查找不到${type === "room" ? "群" : "好友"}：${target.name}，请检查${type === "room" ? "群名" : "好友昵称"}是否正确`);
+            }
+        }
+    }
+    return targets;
+}
+/**
+ * 立即发送批量任务消息
+ * @param {*} that bot对象
+ * @param {*} item 任务项  { target: 'Room', event: '', message: { roomName: '', type: 'news 新闻 ||task 定时任务', contents: [] } }
+ */
+async function sendMultiTaskMessage(that, task) {
+    try {
+        const targets = await getMultiTargets(that, task.type, task);
+        if (!targets.length) {
+            console.log("查找不到要发送的目标，请检查后重试");
+            return;
+        }
+        if (task.taskType === 'news') {
+            await sendNews({ that, isMulti: true, targets, item: task.taskInfo });
+        }
+        else if (task.taskType === 'custom') {
+            await sendCustom({ that, isMulti: true, targets, item: { ...task.taskInfo, type: task.type } });
+        }
+        else if (task.taskType === "countdown") {
+            await sendCountDown({ that, isMulti: true, targets, item: task.taskInfo });
+        }
+    }
+    catch (error) {
+        console.log("立即发送定时任务失败：", error);
+    }
+}
+async function setMultiTask(that, task) {
+    try {
+        // 获取要发送的目标
+        const targets = await getMultiTargets(that, task.type, task);
+        if (!targets.length) {
+            return;
+        }
+        if (task.taskType === "news") {
+            setLocalSchedule(task.cron, sendNews.bind(null, {
+                that,
+                isMulti: true,
+                targets,
+                item: task.taskInfo
+            }), `schedule_news_${task.id}`);
+        }
+        else if (task.taskType === "custom") {
+            setLocalSchedule(task.cron, sendCustom.bind(null, {
+                that,
+                isMulti: true,
+                targets,
+                item: { ...task.taskInfo, type: task.type }
+            }), `schedule_custom_${task.id}`);
+        }
+        else if (task.taskType === "countDown") {
+            setLocalSchedule(task.cron, sendCountDown.bind(null, {
+                that,
+                isMulti: true,
+                targets,
+                item: task.taskInfo
+            }), `schedule_countdown_${task.id}`);
+        }
+    }
+    catch (e) {
+        console.log("catch error:" + e);
+    }
+}
+/**
+ * 初始化批量定时任务
+ * @param that
+ */
+function initMultiTask(that) {
+    try {
+        cancelAllSchedule("schedule");
+        const tasks = globalConfig.getAllTasks(); // 获取所有任务
+        if (tasks && tasks.length) {
+            tasks.forEach((item, index) => {
+                void setMultiTask(that, item);
+            });
+        }
+    }
+    catch (e) {
+        console.log("initMultiTask error:" + e);
+    }
+}
 /**
  * 初始化小助手任务
  * @param {*} that bot对象
@@ -244,11 +421,11 @@ async function initAllSchedule(that) {
 }
 export { initTaskLocalSchedule };
 export { initAllSchedule };
+export { initMultiTask };
 export { initTimeSchedule };
 export { sendTaskMessage };
+export { sendMultiTaskMessage };
 export default {
-    initTaskLocalSchedule,
-    initAllSchedule,
-    initTimeSchedule,
+    initTaskLocalSchedule, initAllSchedule, initTimeSchedule
 };
 //# sourceMappingURL=index.js.map

package/package.json

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