@whyour/qinglong 0.11.2 → 0.12.0

package/static/build/services/cron.js

@@ -31,6 +31,8 @@ const client_1 = __importDefault(require("../schedule/client"));
 const pLimit_1 = __importDefault(require("../shared/pLimit"));
 const cross_spawn_1 = require("cross-spawn");
 const dayjs_1 = __importDefault(require("dayjs"));
+const pickBy_1 = __importDefault(require("lodash/pickBy"));
+const omit_1 = __importDefault(require("lodash/omit"));
 let CronService = class CronService {
     constructor(logger) {
         this.logger = logger;
@@ -47,7 +49,7 @@ let CronService = class CronService {
         tab.saved = false;
         const doc = await this.insert(tab);
         await client_1.default.addCron([
-            { id: String(doc.id), schedule: doc.schedule, command: this.makeCommand(doc), extraSchedules: doc.extra_schedules || [] },
+            { name: doc.name || '', id: String(doc.id), schedule: doc.schedule, command: this.makeCommand(doc), extraSchedules: doc.extra_schedules || [] },
         ]);
         await this.set_crontab();
         return doc;
@@ -66,6 +68,7 @@ let CronService = class CronService {
         await client_1.default.delCron([String(newDoc.id)]);
         await client_1.default.addCron([
             {
+                name: doc.name || '',
                 id: String(newDoc.id),
                 schedule: newDoc.schedule,
                 command: this.makeCommand(newDoc),
@@ -80,7 +83,7 @@ let CronService = class CronService {
         return await this.getDb({ id: payload.id });
     }
     async status({ ids, status, pid, log_path, last_running_time = 0, last_execution_time = 0, }) {
-        const options = {
+        let options = {
             status,
             pid,
             log_path,
@@ -89,7 +92,13 @@ let CronService = class CronService {
         if (last_running_time > 0) {
             options.last_running_time = last_running_time;
         }
-        return await cron_1.CrontabModel.update(Object.assign({}, options), { where: { id: ids } });
+        for (const id of ids) {
+            const cron = await this.getDb({ id });
+            if (status === cron_1.CrontabStatus.idle && log_path !== cron.log_path) {
+                options = (0, omit_1.default)(options, ['status', 'log_path', 'pid']);
+            }
+            await cron_1.CrontabModel.update(Object.assign({}, (0, pickBy_1.default)(options, (v) => v === 0 || !!v)), { where: { id } });
+        }
     }
     async remove(ids) {
         await cron_1.CrontabModel.destroy({ where: { id: ids } });
@@ -338,14 +347,16 @@ let CronService = class CronService {
         await cron_1.CrontabModel.update({ status: cron_1.CrontabStatus.idle, pid: undefined }, { where: { id: ids } });
     }
     async runSingle(cronId) {
-        return pLimit_1.default.runWithCpuLimit(() => {
+        return pLimit_1.default.runWithCronLimit(() => {
             return new Promise(async (resolve) => {
                 var _a;
                 const cron = await this.getDb({ id: cronId });
+                const params = { name: cron.name, command: cron.command, schedule: cron.schedule, extraSchedules: cron.extra_schedules };
                 if (cron.status !== cron_1.CrontabStatus.queued) {
-                    resolve();
+                    resolve(params);
                     return;
                 }
+                this.logger.info(`[panel][开始执行任务] 参数 ${JSON.stringify(params)}`);
                 let { id, command, log_path } = cron;
                 const uniqPath = await (0, util_1.getUniqPath)(command, `${id}`);
                 const logTime = (0, dayjs_1.default)().format('YYYY-MM-DD-HH-mm-ss-SSS');
@@ -355,9 +366,6 @@ let CronService = class CronService {
                 }
                 const logPath = `${uniqPath}/${logTime}.log`;
                 const absolutePath = path_1.default.resolve(config_1.default.logPath, `${logPath}`);
-                this.logger.silly('Running job');
-                this.logger.silly('ID: ' + id);
-                this.logger.silly('Original command: ' + command);
                 const cp = (0, cross_spawn_1.spawn)(`real_log_path=${logPath} no_delay=true ${this.makeCommand(cron)}`, { shell: '/bin/bash' });
                 await cron_1.CrontabModel.update({ status: cron_1.CrontabStatus.running, pid: cp.pid, log_path: logPath }, { where: { id } });
                 cp.stderr.on('data', (data) => {
@@ -366,12 +374,9 @@ let CronService = class CronService {
                 cp.on('error', (err) => {
                     fs_1.default.appendFileSync(`${absolutePath}`, `${JSON.stringify(err)}`);
                 });
-                cp.on('exit', async (code, signal) => {
-                    this.logger.info(`[panel][任务退出] 任务 ${command} 进程id: ${cp.pid}, 退出码 ${code}`);
-                });
-                cp.on('close', async (code) => {
+                cp.on('exit', async (code) => {
                     await cron_1.CrontabModel.update({ status: cron_1.CrontabStatus.idle, pid: undefined }, { where: { id } });
-                    resolve();
+                    resolve(Object.assign(Object.assign({}, params), { pid: cp.pid, code }));
                 });
             });
         });
@@ -385,6 +390,7 @@ let CronService = class CronService {
         await cron_1.CrontabModel.update({ isDisabled: 0 }, { where: { id: ids } });
         const docs = await cron_1.CrontabModel.findAll({ where: { id: ids } });
         const crons = docs.map((doc) => ({
+            name: doc.name || '',
             id: String(doc.id),
             schedule: doc.schedule,
             command: this.makeCommand(doc),
@@ -502,6 +508,7 @@ let CronService = class CronService {
         const sixCron = tabs.data
             .filter((x) => x.isDisabled !== 1)
             .map((doc) => ({
+            name: doc.name || '',
             id: String(doc.id),
             schedule: doc.schedule,
             command: this.makeCommand(doc),

package/static/build/services/dependence.js

@@ -217,7 +217,7 @@ let DependenceService = class DependenceService {
                     });
                     this.updateLog(depIds, JSON.stringify(err));
                 });
-                cp.on('close', async (code) => {
+                cp.on('exit', async (code) => {
                     const endTime = (0, dayjs_1.default)();
                     const isSucceed = code === 0;
                     const resultText = isSucceed ? '成功' : '失败';

package/static/build/services/notify.js

@@ -26,14 +26,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const typedi_1 = require("typedi");
-const winston_1 = __importDefault(require("winston"));
-const user_1 = __importDefault(require("./user"));
-const got_1 = __importDefault(require("got"));
-const nodemailer_1 = __importDefault(require("nodemailer"));
 const crypto_1 = __importDefault(require("crypto"));
+const got_1 = __importDefault(require("got"));
 const hpagent_1 = require("hpagent");
+const nodemailer_1 = __importDefault(require("nodemailer"));
+const typedi_1 = require("typedi");
+const winston_1 = __importDefault(require("winston"));
 const util_1 = require("../config/util");
+const user_1 = __importDefault(require("./user"));
 let NotificationService = class NotificationService {
     constructor(logger) {
         this.logger = logger;
@@ -55,6 +55,7 @@ let NotificationService = class NotificationService {
             ['pushMe', this.pushMe],
             ['webhook', this.webhook],
             ['lark', this.lark],
+            ['chronocat', this.chronocat],
         ]);
         this.title = '';
         this.content = '';
@@ -508,6 +509,57 @@ let NotificationService = class NotificationService {
             throw new Error(error.response ? error.response.body : error);
         }
     }
+    async chronocat() {
+        var _a, _b;
+        const { chronocatURL, chronocatQQ, chronocatToekn } = this.params;
+        try {
+            const user_ids = (_a = chronocatQQ
+                .match(/user_id=(\d+)/g)) === null || _a === void 0 ? void 0 : _a.map((match) => match.split('=')[1]);
+            const group_ids = (_b = chronocatQQ
+                .match(/group_id=(\d+)/g)) === null || _b === void 0 ? void 0 : _b.map((match) => match.split('=')[1]);
+            const url = `${chronocatURL}/api/message/send`;
+            const headers = {
+                'Content-Type': 'application/json',
+                Authorization: `Bearer ${chronocatToekn}`,
+            };
+            for (const [chat_type, ids] of [
+                [1, user_ids],
+                [2, group_ids],
+            ]) {
+                if (!ids) {
+                    continue;
+                }
+                let _ids = ids;
+                for (const chat_id of _ids) {
+                    const data = {
+                        peer: {
+                            chatType: chat_type,
+                            peerUin: chat_id,
+                        },
+                        elements: [
+                            {
+                                elementType: 1,
+                                textElement: {
+                                    content: `${this.title}\n\n${this.content}`,
+                                },
+                            },
+                        ],
+                    };
+                    const res = await got_1.default.post(url, Object.assign(Object.assign({}, this.gotOption), { json: data, headers }));
+                    if (res.body === 'success') {
+                        return true;
+                    }
+                    else {
+                        throw new Error(res.body);
+                    }
+                }
+            }
+            return false;
+        }
+        catch (error) {
+            throw new Error(error.response ? error.response.body : error);
+        }
+    }
     async webhook() {
         const { webhookUrl, webhookBody, webhookHeaders, webhookMethod, webhookContentType, } = this.params;
         const { formatBody, formatUrl } = this.formatNotifyContent(webhookUrl, webhookBody);

package/static/build/services/schedule.js

@@ -29,10 +29,11 @@ let ScheduleService = class ScheduleService {
         this.intervalSchedule = new toad_scheduler_1.ToadScheduler();
         this.maxBuffer = 200 * 1024 * 1024;
     }
-    async runTask(command, callbacks = {}, completionTime = 'end') {
-        return pLimit_1.default.runWithCpuLimit(() => {
+    async runTask(command, callbacks = {}, params, completionTime = 'end') {
+        return pLimit_1.default.runWithCronLimit(() => {
             return new Promise(async (resolve, reject) => {
                 var _a, _b, _c;
+                this.logger.info(`[panel][开始执行任务] 参数 ${JSON.stringify(Object.assign(Object.assign({}, params), { command }))}`);
                 try {
                     const startTime = (0, dayjs_1.default)();
                     await ((_a = callbacks.onBefore) === null || _a === void 0 ? void 0 : _a.call(callbacks, startTime));
@@ -53,14 +54,11 @@ let ScheduleService = class ScheduleService {
                         this.logger.error('[panel][创建任务失败] 命令: %s, 错误信息: %j', command, err);
                         await ((_a = callbacks.onError) === null || _a === void 0 ? void 0 : _a.call(callbacks, JSON.stringify(err)));
                     });
-                    cp.on('exit', async (code, signal) => {
-                        this.logger.info(`[panel][任务退出] ${command} 进程id: ${cp.pid}, 退出码 ${code}`);
-                    });
-                    cp.on('close', async (code) => {
+                    cp.on('exit', async (code) => {
                         var _a;
                         const endTime = (0, dayjs_1.default)();
                         await ((_a = callbacks.onEnd) === null || _a === void 0 ? void 0 : _a.call(callbacks, cp, endTime, endTime.diff(startTime, 'seconds')));
-                        resolve(null);
+                        resolve(Object.assign(Object.assign({}, params), { pid: cp.pid, code }));
                     });
                 }
                 catch (error) {
@@ -74,10 +72,18 @@ let ScheduleService = class ScheduleService {
         const _id = this.formatId(id);
         this.logger.info('[panel][创建cron任务], 任务ID: %s, cron: %s, 任务名: %s, 执行命令: %s', _id, schedule, name, command);
         this.scheduleStacks.set(_id, node_schedule_1.default.scheduleJob(_id, schedule, async () => {
-            this.runTask(command, callbacks);
+            this.runTask(command, callbacks, {
+                name,
+                schedule,
+                command,
+            });
         }));
         if (runImmediately) {
-            this.runTask(command, callbacks);
+            this.runTask(command, callbacks, {
+                name,
+                schedule,
+                command,
+            });
         }
     }
     async cancelCronTask({ id = 0, name }) {
@@ -93,14 +99,20 @@ let ScheduleService = class ScheduleService {
         const _id = this.formatId(id);
         this.logger.info('[panel][创建interval任务], 任务ID: %s, 任务名: %s, 执行命令: %s', _id, name, command);
         const task = new toad_scheduler_1.Task(name, () => {
-            this.runTask(command, callbacks);
+            this.runTask(command, callbacks, {
+                name,
+                command,
+            });
         }, (err) => {
             this.logger.error('[执行任务失败] 命令: %s, 错误信息: %j', command, err);
         });
         const job = new toad_scheduler_1.LongIntervalJob(Object.assign({ runImmediately: false }, schedule), task, _id);
         this.intervalSchedule.addIntervalJob(job);
         if (runImmediately) {
-            this.runTask(command, callbacks);
+            this.runTask(command, callbacks, {
+                name,
+                command,
+            });
         }
     }
     async cancelIntervalTask({ id = 0, name }) {

package/static/build/services/script.js

@@ -57,7 +57,7 @@ let ScriptService = class ScriptService {
     async runScript(filePath) {
         const relativePath = path_1.default.relative(config_1.default.scriptPath, filePath);
         const command = `${const_1.TASK_COMMAND} -l ${relativePath} now`;
-        const pid = await this.scheduleService.runTask(command, this.taskCallbacks(filePath), 'start');
+        const pid = await this.scheduleService.runTask(command, this.taskCallbacks(filePath), { command }, 'start');
         return { code: 200, data: pid };
     }
     async stopScript(filePath, pid) {

package/static/build/services/subscription.js

@@ -266,7 +266,11 @@ let SubscriptionService = class SubscriptionService {
             return;
         }
         const command = (0, subscription_2.formatCommand)(subscription);
-        this.scheduleService.runTask(command, this.taskCallbacks(subscription));
+        this.scheduleService.runTask(command, this.taskCallbacks(subscription), {
+            name: subscription.name,
+            schedule: subscription.schedule,
+            command
+        });
     }
     async disabled(ids) {
         await subscription_1.SubscriptionModel.update({ is_disabled: 1 }, { where: { id: ids } });

package/static/build/services/system.js

@@ -189,7 +189,9 @@ let SystemService = class SystemService {
         if (!command.startsWith(const_1.TASK_COMMAND)) {
             command = `${const_1.TASK_COMMAND} ${command}`;
         }
-        this.scheduleService.runTask(`real_log_path=${logPath} real_time=true ${command}`, callback);
+        this.scheduleService.runTask(`real_log_path=${logPath} real_time=true ${command}`, callback, {
+            command,
+        });
     }
     async stop({ command, pid }) {
         if (!pid && !command) {

package/static/build/shared/pLimit.js

@@ -3,27 +3,48 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const p_limit_1 = __importDefault(require("p-limit"));
+const p_queue_cjs_1 = __importDefault(require("p-queue-cjs"));
 const os_1 = __importDefault(require("os"));
 const auth_1 = require("../data/auth");
 const logger_1 = __importDefault(require("../loaders/logger"));
 class TaskLimit {
-    get cpuLimitActiveCount() {
-        return this.cpuLimit.activeCount;
+    get cronLimitActiveCount() {
+        return this.cronLimit.pending;
     }
-    get cpuLimitPendingCount() {
-        return this.cpuLimit.pendingCount;
+    get cronLimitPendingCount() {
+        return this.cronLimit.size;
     }
     constructor() {
-        this.oneLimit = (0, p_limit_1.default)(1);
-        this.updateLogLimit = (0, p_limit_1.default)(1);
-        this.cpuLimit = (0, p_limit_1.default)(Math.max(os_1.default.cpus().length, 4));
+        this.oneLimit = new p_queue_cjs_1.default({ concurrency: 1 });
+        this.updateLogLimit = new p_queue_cjs_1.default({ concurrency: 1 });
+        this.cronLimit = new p_queue_cjs_1.default({ concurrency: Math.max(os_1.default.cpus().length, 4) });
         this.setCustomLimit();
+        this.handleEvents();
+    }
+    handleEvents() {
+        this.cronLimit.on('add', () => {
+            logger_1.default.info(`[schedule][任务加入队列] 运行中任务数: ${this.cronLimitActiveCount}, 等待中任务数: ${this.cronLimitPendingCount}`);
+        });
+        this.cronLimit.on('active', () => {
+            logger_1.default.info(`[schedule][开始处理任务] 运行中任务数: ${this.cronLimitActiveCount + 1}, 等待中任务数: ${this.cronLimitPendingCount}`);
+        });
+        this.cronLimit.on('completed', (param) => {
+            logger_1.default.info(`[schedule][任务处理成功] 参数 ${JSON.stringify(param)}`);
+        });
+        this.cronLimit.on('error', error => {
+            logger_1.default.error(`[schedule][任务处理错误] 参数 ${JSON.stringify(error)}`);
+        });
+        this.cronLimit.on('next', () => {
+            logger_1.default.info(`[schedule][任务处理结束] 运行中任务数: ${this.cronLimitActiveCount}, 等待中任务数: ${this.cronLimitPendingCount}`);
+        });
+        this.cronLimit.on('idle', () => {
+            logger_1.default.info(`[schedule][任务队列] 空闲中...`);
+        });
     }
     async setCustomLimit(limit) {
-        var _a, _b;
+        var _a;
         if (limit) {
-            this.cpuLimit = (0, p_limit_1.default)(limit);
+            this.cronLimit.concurrency = limit;
             return;
         }
         await auth_1.AuthModel.sync();
@@ -31,18 +52,17 @@ class TaskLimit {
             where: { type: auth_1.AuthDataType.systemConfig },
         });
         if ((_a = doc === null || doc === void 0 ? void 0 : doc.info) === null || _a === void 0 ? void 0 : _a.cronConcurrency) {
-            this.cpuLimit = (0, p_limit_1.default)((_b = doc === null || doc === void 0 ? void 0 : doc.info) === null || _b === void 0 ? void 0 : _b.cronConcurrency);
+            this.cronLimit.concurrency = doc.info.cronConcurrency;
         }
     }
-    runWithCpuLimit(fn) {
-        logger_1.default.info(`[schedule][任务加入队列] 运行中任务数: ${this.cpuLimitActiveCount}, 等待中任务数: ${this.cpuLimitPendingCount}`);
-        return this.cpuLimit(fn);
+    async runWithCronLimit(fn, options) {
+        return this.cronLimit.add(fn, options);
     }
-    runOneByOne(fn) {
-        return this.oneLimit(fn);
+    runOneByOne(fn, options) {
+        return this.oneLimit.add(fn, options);
     }
-    updateDepLog(fn) {
-        return this.updateLogLimit(fn);
+    updateDepLog(fn, options) {
+        return this.updateLogLimit.add(fn, options);
     }
 }
 exports.default = new TaskLimit();

package/static/build/shared/runCron.js

@@ -7,10 +7,10 @@ exports.runCron = void 0;
 const cross_spawn_1 = require("cross-spawn");
 const pLimit_1 = __importDefault(require("./pLimit"));
 const logger_1 = __importDefault(require("../loaders/logger"));
-function runCron(cmd) {
-    return pLimit_1.default.runWithCpuLimit(() => {
+function runCron(cmd, options) {
+    return pLimit_1.default.runWithCronLimit(() => {
         return new Promise(async (resolve) => {
-            logger_1.default.info(`[schedule][开始执行任务] 运行命令: ${cmd}`);
+            logger_1.default.info(`[schedule][开始执行任务] 参数 ${JSON.stringify(Object.assign(Object.assign({}, options), { command: cmd }))}`);
             const cp = (0, cross_spawn_1.spawn)(cmd, { shell: '/bin/bash' });
             cp.stderr.on('data', (data) => {
                 logger_1.default.info('[schedule][执行任务失败] 命令: %s, 错误信息: %j', cmd, data.toString());
@@ -18,9 +18,8 @@ function runCron(cmd) {
             cp.on('error', (err) => {
                 logger_1.default.error('[schedule][创建任务失败] 命令: %s, 错误信息: %j', cmd, err);
             });
-            cp.on('close', async (code) => {
-                logger_1.default.info(`[schedule][任务退出] ${cmd} 进程id: ${cp.pid} 退出, 退出码 ${code}`);
-                resolve();
+            cp.on('exit', async (code) => {
+                resolve(Object.assign(Object.assign({}, options), { command: cmd, pid: cp.pid, code }));
             });
         });
     });