@whyour/qinglong 0.3.2 → 0.4.0

package/static/build/schedule/addCron.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addCron = void 0;
 const node_schedule_1 = __importDefault(require("node-schedule"));
 const data_1 = require("./data");
-const child_process_1 = require("child_process");
+const runCron_1 = require("../shared/runCron");
 const addCron = (call, callback) => {
     var _a;
     for (const item of call.request.crons) {
@@ -15,7 +15,7 @@ const addCron = (call, callback) => {
             (_a = data_1.scheduleStacks.get(id)) === null || _a === void 0 ? void 0 : _a.cancel();
         }
         data_1.scheduleStacks.set(id, node_schedule_1.default.scheduleJob(id, schedule, async () => {
-            (0, child_process_1.exec)(`ID=${id} ${command}`);
+            (0, runCron_1.runCron)(`ID=${id} ${command}`);
         }));
     }
     callback(null, null);

package/static/build/schedule/health.js

@@ -9,13 +9,13 @@ const util_1 = require("../config/util");
 const check = async (call, callback) => {
     switch (call.request.service) {
         case 'cron':
-            const res = await (0, util_1.promiseExec)(`curl -sf http://localhost:${config_1.default.port}/api/system`);
+            const res = await (0, util_1.promiseExec)(`curl -s http://localhost:${config_1.default.port}/api/system`);
             if (res.includes('200')) {
                 return callback(null, { status: 1 });
             }
             const panelErrLog = await (0, util_1.promiseExec)(`tail -n 300 ~/.pm2/logs/panel-error.log`);
             const scheduleErrLog = await (0, util_1.promiseExec)(`tail -n 300 ~/.pm2/logs/schedule-error.log`);
-            return callback(new Error(`${scheduleErrLog}\n${panelErrLog}`));
+            return callback(new Error(`${scheduleErrLog || ''}\n${panelErrLog || ''}\n${res}`));
         default:
             return callback(null, { status: 1 });
     }

package/static/build/services/cron.js

@@ -28,6 +28,8 @@ const sequelize_1 = require("sequelize");
 const path_1 = __importDefault(require("path"));
 const const_1 = require("../config/const");
 const client_1 = __importDefault(require("../schedule/client"));
+const pLimit_1 = require("../shared/pLimit");
+const cross_spawn_1 = require("cross-spawn");
 let CronService = class CronService {
     constructor(logger) {
         this.logger = logger;
@@ -165,13 +167,13 @@ let CronService = class CronService {
                             {
                                 [operate2]: [
                                     { [operate]: `%${value}%` },
-                                    { [operate]: `%${encodeURIComponent(value)}%` },
+                                    { [operate]: `%${encodeURI(value)}%` },
                                 ],
                             },
                             {
                                 [operate2]: [
                                     (0, sequelize_1.where)((0, sequelize_1.col)(property), operate, `%${value}%`),
-                                    (0, sequelize_1.where)((0, sequelize_1.col)(property), operate, `%${encodeURIComponent(value)}%`),
+                                    (0, sequelize_1.where)((0, sequelize_1.col)(property), operate, `%${encodeURI(value)}%`),
                                 ],
                             },
                         ],
@@ -197,7 +199,7 @@ let CronService = class CronService {
                     q[column] = {
                         [sequelize_1.Op.or]: [
                             { [sequelize_1.Op.like]: `%${textArray[1]}%` },
-                            { [sequelize_1.Op.like]: `%${encodeURIComponent(textArray[1])}%` },
+                            { [sequelize_1.Op.like]: `%${encodeURI(textArray[1])}%` },
                         ],
                     };
                     break;
@@ -205,7 +207,7 @@ let CronService = class CronService {
                     const reg = {
                         [sequelize_1.Op.or]: [
                             { [sequelize_1.Op.like]: `%${searchText}%` },
-                            { [sequelize_1.Op.like]: `%${encodeURIComponent(searchText)}%` },
+                            { [sequelize_1.Op.like]: `%${encodeURI(searchText)}%` },
                         ],
                     };
                     q[sequelize_1.Op.or] = [
@@ -315,7 +317,9 @@ let CronService = class CronService {
     }
     async run(ids) {
         await cron_1.CrontabModel.update({ status: cron_1.CrontabStatus.queued }, { where: { id: ids } });
-        (0, util_1.concurrentRun)(ids.map((id) => async () => await this.runSingle(id)), 10);
+        ids.forEach((id) => {
+            this.runSingle(id);
+        });
     }
     async stop(ids) {
         const docs = await cron_1.CrontabModel.findAll({ where: { id: ids } });
@@ -332,47 +336,49 @@ let CronService = class CronService {
         await cron_1.CrontabModel.update({ status: cron_1.CrontabStatus.idle, pid: undefined }, { where: { id: ids } });
     }
     async runSingle(cronId) {
-        return new Promise(async (resolve) => {
-            const cron = await this.getDb({ id: cronId });
-            if (cron.status !== cron_1.CrontabStatus.queued) {
-                resolve();
-                return;
-            }
-            let { id, command, log_path } = cron;
-            const absolutePath = path_1.default.resolve(config_1.default.logPath, `${log_path}`);
-            const logFileExist = log_path && (await (0, util_1.fileExist)(absolutePath));
-            this.logger.silly('Running job');
-            this.logger.silly('ID: ' + id);
-            this.logger.silly('Original command: ' + command);
-            let cmdStr = command;
-            if (!cmdStr.startsWith(const_1.TASK_PREFIX) && !cmdStr.startsWith(const_1.QL_PREFIX)) {
-                cmdStr = `${const_1.TASK_PREFIX}${cmdStr}`;
-            }
-            if (cmdStr.endsWith('.js') ||
-                cmdStr.endsWith('.py') ||
-                cmdStr.endsWith('.pyc') ||
-                cmdStr.endsWith('.sh') ||
-                cmdStr.endsWith('.ts')) {
-                cmdStr = `${cmdStr} now`;
-            }
-            const cp = (0, child_process_1.spawn)(`ID=${id} ${cmdStr}`, { shell: '/bin/bash' });
-            await cron_1.CrontabModel.update({ status: cron_1.CrontabStatus.running, pid: cp.pid }, { where: { id } });
-            cp.stderr.on('data', (data) => {
-                if (logFileExist) {
-                    fs_1.default.appendFileSync(`${absolutePath}`, `${data.toString()}`);
+        return (0, pLimit_1.runCronWithLimit)(() => {
+            return new Promise(async (resolve) => {
+                const cron = await this.getDb({ id: cronId });
+                if (cron.status !== cron_1.CrontabStatus.queued) {
+                    resolve();
+                    return;
                 }
-            });
-            cp.on('error', (err) => {
-                if (logFileExist) {
-                    fs_1.default.appendFileSync(`${absolutePath}`, `${JSON.stringify(err)}`);
+                let { id, command, log_path } = cron;
+                const absolutePath = path_1.default.resolve(config_1.default.logPath, `${log_path}`);
+                const logFileExist = log_path && (await (0, util_1.fileExist)(absolutePath));
+                this.logger.silly('Running job');
+                this.logger.silly('ID: ' + id);
+                this.logger.silly('Original command: ' + command);
+                let cmdStr = command;
+                if (!cmdStr.startsWith(const_1.TASK_PREFIX) && !cmdStr.startsWith(const_1.QL_PREFIX)) {
+                    cmdStr = `${const_1.TASK_PREFIX}${cmdStr}`;
                 }
-            });
-            cp.on('exit', async (code, signal) => {
-                this.logger.info(`任务 ${command} 进程id: ${cp.pid} 退出，退出码 ${code}`);
-            });
-            cp.on('close', async (code) => {
-                await cron_1.CrontabModel.update({ status: cron_1.CrontabStatus.idle, pid: undefined }, { where: { id } });
-                resolve();
+                if (cmdStr.endsWith('.js') ||
+                    cmdStr.endsWith('.py') ||
+                    cmdStr.endsWith('.pyc') ||
+                    cmdStr.endsWith('.sh') ||
+                    cmdStr.endsWith('.ts')) {
+                    cmdStr = `${cmdStr} now`;
+                }
+                const cp = (0, cross_spawn_1.spawn)(`ID=${id} ${cmdStr}`, { shell: '/bin/bash' });
+                await cron_1.CrontabModel.update({ status: cron_1.CrontabStatus.running, pid: cp.pid }, { where: { id } });
+                cp.stderr.on('data', (data) => {
+                    if (logFileExist) {
+                        fs_1.default.appendFileSync(`${absolutePath}`, `${data.toString()}`);
+                    }
+                });
+                cp.on('error', (err) => {
+                    if (logFileExist) {
+                        fs_1.default.appendFileSync(`${absolutePath}`, `${JSON.stringify(err)}`);
+                    }
+                });
+                cp.on('exit', async (code, signal) => {
+                    this.logger.info(`任务 ${command} 进程id: ${cp.pid} 退出，退出码 ${code}`);
+                });
+                cp.on('close', async (code) => {
+                    await cron_1.CrontabModel.update({ status: cron_1.CrontabStatus.idle, pid: undefined }, { where: { id } });
+                    resolve();
+                });
             });
         });
     }

package/static/build/services/dependence.js

@@ -29,11 +29,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const typedi_1 = require("typedi");
 const winston_1 = __importDefault(require("winston"));
 const dependence_1 = require("../data/dependence");
-const child_process_1 = require("child_process");
+const cross_spawn_1 = require("cross-spawn");
 const sock_1 = __importDefault(require("./sock"));
 const sequelize_1 = require("sequelize");
-const util_1 = require("../config/util");
 const dayjs_1 = __importDefault(require("dayjs"));
+const pLimit_1 = require("../shared/pLimit");
 let DependenceService = class DependenceService {
     constructor(logger, sockService) {
         this.logger = logger;
@@ -76,7 +76,7 @@ let DependenceService = class DependenceService {
     async dependencies({ searchValue, type }, sort = { position: -1 }, query = {}) {
         let condition = Object.assign(Object.assign({}, query), { type: dependence_1.DependenceTypes[type] });
         if (searchValue) {
-            const encodeText = encodeURIComponent(searchValue);
+            const encodeText = encodeURI(searchValue);
             const reg = {
                 [sequelize_1.Op.or]: [
                     { [sequelize_1.Op.like]: `%${searchValue}%` },
@@ -94,13 +94,9 @@ let DependenceService = class DependenceService {
         }
     }
     installDependenceOneByOne(docs, isInstall = true, force = false) {
-        (0, util_1.concurrentRun)(docs.map((dep) => async () => {
-            const status = isInstall
-                ? dependence_1.DependenceStatus.installing
-                : dependence_1.DependenceStatus.removing;
-            await dependence_1.DependenceModel.update({ status }, { where: { id: dep.id } });
-            return await this.installOrUninstallDependencies([dep], isInstall, force);
-        }), 1);
+        docs.forEach((dep) => {
+            this.installOrUninstallDependencies([dep], isInstall, force);
+        });
     }
     async reInstall(ids) {
         await dependence_1.DependenceModel.update({ status: dependence_1.DependenceStatus.queued, log: [] }, { where: { id: ids } });
@@ -125,82 +121,89 @@ let DependenceService = class DependenceService {
         await dependence_1.DependenceModel.update({ log: newLog }, { where: { id: ids } });
     }
     installOrUninstallDependencies(dependencies, isInstall = true, force = false) {
-        return new Promise(async (resolve) => {
-            if (dependencies.length === 0) {
-                resolve(null);
-                return;
-            }
-            const socketMessageType = !force
-                ? 'installDependence'
-                : 'uninstallDependence';
-            const depNames = dependencies.map((x) => x.name).join(' ');
-            const depRunCommand = (isInstall
-                ? dependence_1.InstallDependenceCommandTypes
-                : dependence_1.unInstallDependenceCommandTypes)[dependencies[0].type];
-            const actionText = isInstall ? '安装' : '删除';
-            const depIds = dependencies.map((x) => x.id);
-            const startTime = (0, dayjs_1.default)();
-            const message = `开始${actionText}依赖 ${depNames}，开始时间 ${startTime.format('YYYY-MM-DD HH:mm:ss')}\n\n`;
-            this.sockService.sendMessage({
-                type: socketMessageType,
-                message,
-                references: depIds,
-            });
-            await this.updateLog(depIds, message);
-            const cp = (0, child_process_1.spawn)(`${depRunCommand} ${depNames}`, { shell: '/bin/bash' });
-            cp.stdout.on('data', async (data) => {
+        return (0, pLimit_1.runCronWithLimit)(() => {
+            return new Promise(async (resolve) => {
+                if (dependencies.length === 0) {
+                    resolve(null);
+                    return;
+                }
+                const depIds = dependencies.map((x) => x.id);
+                const status = isInstall
+                    ? dependence_1.DependenceStatus.installing
+                    : dependence_1.DependenceStatus.removing;
+                await dependence_1.DependenceModel.update({ status }, { where: { id: depIds } });
+                const socketMessageType = !force
+                    ? 'installDependence'
+                    : 'uninstallDependence';
+                const depNames = dependencies.map((x) => x.name).join(' ');
+                const depRunCommand = (isInstall
+                    ? dependence_1.InstallDependenceCommandTypes
+                    : dependence_1.unInstallDependenceCommandTypes)[dependencies[0].type];
+                const actionText = isInstall ? '安装' : '删除';
+                const startTime = (0, dayjs_1.default)();
+                const message = `开始${actionText}依赖 ${depNames}，开始时间 ${startTime.format('YYYY-MM-DD HH:mm:ss')}\n\n`;
                 this.sockService.sendMessage({
                     type: socketMessageType,
-                    message: data.toString(),
+                    message,
                     references: depIds,
                 });
-                await this.updateLog(depIds, data.toString());
-            });
-            cp.stderr.on('data', async (data) => {
-                this.sockService.sendMessage({
-                    type: socketMessageType,
-                    message: data.toString(),
-                    references: depIds,
+                await this.updateLog(depIds, message);
+                const cp = (0, cross_spawn_1.spawn)(`${depRunCommand} ${depNames}`, {
+                    shell: '/bin/bash',
                 });
-                await this.updateLog(depIds, data.toString());
-            });
-            cp.on('error', async (err) => {
-                this.sockService.sendMessage({
-                    type: socketMessageType,
-                    message: JSON.stringify(err),
-                    references: depIds,
+                cp.stdout.on('data', async (data) => {
+                    this.sockService.sendMessage({
+                        type: socketMessageType,
+                        message: data.toString(),
+                        references: depIds,
+                    });
+                    await this.updateLog(depIds, data.toString());
                 });
-                await this.updateLog(depIds, JSON.stringify(err));
-                resolve(null);
-            });
-            cp.on('close', async (code) => {
-                const endTime = (0, dayjs_1.default)();
-                const isSucceed = code === 0;
-                const resultText = isSucceed ? '成功' : '失败';
-                const message = `\n依赖${actionText}${resultText}，结束时间 ${endTime.format('YYYY-MM-DD HH:mm:ss')}，耗时 ${endTime.diff(startTime, 'second')} 秒`;
-                this.sockService.sendMessage({
-                    type: socketMessageType,
-                    message,
-                    references: depIds,
+                cp.stderr.on('data', async (data) => {
+                    this.sockService.sendMessage({
+                        type: socketMessageType,
+                        message: data.toString(),
+                        references: depIds,
+                    });
+                    await this.updateLog(depIds, data.toString());
+                });
+                cp.on('error', async (err) => {
+                    this.sockService.sendMessage({
+                        type: socketMessageType,
+                        message: JSON.stringify(err),
+                        references: depIds,
+                    });
+                    await this.updateLog(depIds, JSON.stringify(err));
+                });
+                cp.on('close', async (code) => {
+                    const endTime = (0, dayjs_1.default)();
+                    const isSucceed = code === 0;
+                    const resultText = isSucceed ? '成功' : '失败';
+                    const message = `\n依赖${actionText}${resultText}，结束时间 ${endTime.format('YYYY-MM-DD HH:mm:ss')}，耗时 ${endTime.diff(startTime, 'second')} 秒`;
+                    this.sockService.sendMessage({
+                        type: socketMessageType,
+                        message,
+                        references: depIds,
+                    });
+                    await this.updateLog(depIds, message);
+                    let status = null;
+                    if (isSucceed) {
+                        status = isInstall
+                            ? dependence_1.DependenceStatus.installed
+                            : dependence_1.DependenceStatus.removed;
+                    }
+                    else {
+                        status = isInstall
+                            ? dependence_1.DependenceStatus.installFailed
+                            : dependence_1.DependenceStatus.removeFailed;
+                    }
+                    await dependence_1.DependenceModel.update({ status }, { where: { id: depIds } });
+                    // 如果删除依赖成功或者强制删除
+                    if ((isSucceed || force) && !isInstall) {
+                        this.removeDb(depIds);
+                    }
+                    resolve(null);
                 });
-                await this.updateLog(depIds, message);
-                let status = null;
-                if (isSucceed) {
-                    status = isInstall
-                        ? dependence_1.DependenceStatus.installed
-                        : dependence_1.DependenceStatus.removed;
-                }
-                else {
-                    status = isInstall
-                        ? dependence_1.DependenceStatus.installFailed
-                        : dependence_1.DependenceStatus.removeFailed;
-                }
-                await dependence_1.DependenceModel.update({ status }, { where: { id: depIds } });
-                // 如果删除依赖成功或者强制删除
-                if ((isSucceed || force) && !isInstall) {
-                    this.removeDb(depIds);
-                }
-                resolve(null);
             });
         });
     }

package/static/build/services/env.js

@@ -130,7 +130,7 @@ let EnvService = class EnvService {
     async envs(searchText = '', query = {}) {
         let condition = Object.assign({}, query);
         if (searchText) {
-            const encodeText = encodeURIComponent(searchText);
+            const encodeText = encodeURI(searchText);
             const reg = {
                 [sequelize_1.Op.or]: [
                     { [sequelize_1.Op.like]: `%${searchText}%` },

package/static/build/services/notify.js

@@ -270,8 +270,8 @@ let NotificationService = class NotificationService {
         }
     }
     async weWorkBot() {
-        const { weWorkBotKey } = this.params;
-        const url = `https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=${weWorkBotKey}`;
+        const { weWorkBotKey, weWorkOrigin = 'https://qyapi.weixin.qq.com' } = this.params;
+        const url = `${weWorkOrigin}/cgi-bin/webhook/send?key=${weWorkBotKey}`;
         try {
             const res = await got_1.default
                 .post(url, Object.assign(Object.assign({}, this.gotOption), { json: {
@@ -293,9 +293,9 @@ let NotificationService = class NotificationService {
         }
     }
     async weWorkApp() {
-        const { weWorkAppKey } = this.params;
+        const { weWorkAppKey, weWorkOrigin = 'https://qyapi.weixin.qq.com' } = this.params;
         const [corpid, corpsecret, touser, agentid, thumb_media_id = '1'] = weWorkAppKey.split(',');
-        const url = `https://qyapi.weixin.qq.com/cgi-bin/gettoken`;
+        const url = `${weWorkOrigin}/cgi-bin/gettoken`;
         const tokenRes = await got_1.default
             .post(url, Object.assign(Object.assign({}, this.gotOption), { json: {
                 corpid,
@@ -340,7 +340,7 @@ let NotificationService = class NotificationService {
         }
         try {
             const res = await got_1.default
-                .post(`https://qyapi.weixin.qq.com/cgi-bin/message/send?access_token=${tokenRes.access_token}`, Object.assign(Object.assign({}, this.gotOption), { json: Object.assign({ touser,
+                .post(`${weWorkOrigin}/cgi-bin/message/send?access_token=${tokenRes.access_token}`, Object.assign(Object.assign({}, this.gotOption), { json: Object.assign({ touser,
                     agentid, safe: '0' }, options) }))
                 .json();
             if (res.errcode === 0) {

package/static/build/services/open.js

@@ -78,7 +78,7 @@ let OpenService = class OpenService {
     async list(searchText = '', sort = {}, query = {}) {
         let condition = Object.assign({}, query);
         if (searchText) {
-            const encodeText = encodeURIComponent(searchText);
+            const encodeText = encodeURI(searchText);
             const reg = {
                 [sequelize_1.Op.or]: [
                     { [sequelize_1.Op.like]: `%${searchText}%` },

package/static/build/services/schedule.js

@@ -18,9 +18,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const typedi_1 = require("typedi");
 const winston_1 = __importDefault(require("winston"));
 const node_schedule_1 = __importDefault(require("node-schedule"));
-const child_process_1 = require("child_process");
 const toad_scheduler_1 = require("toad-scheduler");
 const dayjs_1 = __importDefault(require("dayjs"));
+const pLimit_1 = require("../shared/pLimit");
+const cross_spawn_1 = require("cross-spawn");
 let ScheduleService = class ScheduleService {
     constructor(logger) {
         this.logger = logger;
@@ -29,53 +30,54 @@ let ScheduleService = class ScheduleService {
         this.maxBuffer = 200 * 1024 * 1024;
     }
     async runTask(command, callbacks = {}, completionTime = 'end') {
-        return new Promise(async (resolve, reject) => {
-            var _a, _b, _c;
-            try {
-                const startTime = (0, dayjs_1.default)();
-                await ((_a = callbacks.onBefore) === null || _a === void 0 ? void 0 : _a.call(callbacks, startTime));
-                const cp = (0, child_process_1.spawn)(command, { shell: '/bin/bash' });
-                // TODO:
-                (_b = callbacks.onStart) === null || _b === void 0 ? void 0 : _b.call(callbacks, cp, startTime);
-                completionTime === 'start' && resolve(cp.pid);
-                cp.stdout.on('data', async (data) => {
-                    var _a;
-                    await ((_a = callbacks.onLog) === null || _a === void 0 ? void 0 : _a.call(callbacks, data.toString()));
-                });
-                cp.stderr.on('data', async (data) => {
-                    var _a;
-                    this.logger.info('[执行任务失败] %s，时间：%s, 错误信息：%j', command, new Date().toLocaleString(), data.toString());
-                    await ((_a = callbacks.onError) === null || _a === void 0 ? void 0 : _a.call(callbacks, data.toString()));
-                });
-                cp.on('error', async (err) => {
-                    var _a;
-                    this.logger.error('[创建任务失败] %s，时间：%s, 错误信息：%j', command, new Date().toLocaleString(), 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(`[任务退出] ${command} 进程id: ${cp.pid}，退出码 ${code}`);
-                });
-                cp.on('close', 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);
-                });
-            }
-            catch (error) {
-                await this.logger.error('执行任务%s失败，时间：%s, 错误信息：%j', command, new Date().toLocaleString(), error);
-                await ((_c = callbacks.onError) === null || _c === void 0 ? void 0 : _c.call(callbacks, JSON.stringify(error)));
-            }
+        return (0, pLimit_1.runCronWithLimit)(() => {
+            return new Promise(async (resolve, reject) => {
+                var _a, _b, _c;
+                try {
+                    const startTime = (0, dayjs_1.default)();
+                    await ((_a = callbacks.onBefore) === null || _a === void 0 ? void 0 : _a.call(callbacks, startTime));
+                    const cp = (0, cross_spawn_1.spawn)(command, { shell: '/bin/bash' });
+                    (_b = callbacks.onStart) === null || _b === void 0 ? void 0 : _b.call(callbacks, cp, startTime);
+                    completionTime === 'start' && resolve(cp.pid);
+                    cp.stdout.on('data', async (data) => {
+                        var _a;
+                        await ((_a = callbacks.onLog) === null || _a === void 0 ? void 0 : _a.call(callbacks, data.toString()));
+                    });
+                    cp.stderr.on('data', async (data) => {
+                        var _a;
+                        this.logger.info('[执行任务失败] %s，时间：%s, 错误信息：%j', command, new Date().toLocaleString(), data.toString());
+                        await ((_a = callbacks.onError) === null || _a === void 0 ? void 0 : _a.call(callbacks, data.toString()));
+                    });
+                    cp.on('error', async (err) => {
+                        var _a;
+                        this.logger.error('[创建任务失败] %s，时间：%s, 错误信息：%j', command, new Date().toLocaleString(), 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(`[任务退出] ${command} 进程id: ${cp.pid}，退出码 ${code}`);
+                    });
+                    cp.on('close', 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);
+                    });
+                }
+                catch (error) {
+                    await this.logger.error('执行任务%s失败，时间：%s, 错误信息：%j', command, new Date().toLocaleString(), error);
+                    await ((_c = callbacks.onError) === null || _c === void 0 ? void 0 : _c.call(callbacks, JSON.stringify(error)));
+                }
+            });
         });
     }
     async createCronTask({ id = 0, command, name, schedule = '' }, callbacks, runImmediately = false) {
         const _id = this.formatId(id);
         this.logger.info('[创建cron任务]，任务ID: %s，cron: %s，任务名: %s，执行命令: %s', _id, schedule, name, command);
         this.scheduleStacks.set(_id, node_schedule_1.default.scheduleJob(_id, schedule, async () => {
-            await this.runTask(command, callbacks);
+            this.runTask(command, callbacks);
         }));
         if (runImmediately) {
-            await this.runTask(command, callbacks);
+            this.runTask(command, callbacks);
         }
     }
     async cancelCronTask({ id = 0, name }) {

package/static/build/services/subscription.js

@@ -19,7 +19,6 @@ const typedi_1 = require("typedi");
 const winston_1 = __importDefault(require("winston"));
 const config_1 = __importDefault(require("../config"));
 const subscription_1 = require("../data/subscription");
-const child_process_1 = require("child_process");
 const fs_1 = __importDefault(require("fs"));
 const util_1 = require("../config/util");
 const fs_2 = require("fs");
@@ -44,7 +43,7 @@ let SubscriptionService = class SubscriptionService {
             const reg = {
                 [sequelize_1.Op.or]: [
                     { [sequelize_1.Op.like]: `%${searchText}%` },
-                    { [sequelize_1.Op.like]: `%${encodeURIComponent(searchText)}%` },
+                    { [sequelize_1.Op.like]: `%${encodeURI(searchText)}%` },
                 ],
             };
             query = {
@@ -91,13 +90,6 @@ let SubscriptionService = class SubscriptionService {
         const docs = await subscription_1.SubscriptionModel.findAll();
         this.sshKeyService.setSshConfig(docs);
     }
-    async promiseExec(command) {
-        return new Promise((resolve, reject) => {
-            (0, child_process_1.exec)(command, { maxBuffer: 200 * 1024 * 1024, encoding: 'utf8' }, (err, stdout, stderr) => {
-                resolve(stdout || stderr || JSON.stringify(err));
-            });
-        });
-    }
     taskCallbacks(doc) {
         return {
             onBefore: async (startTime) => {
@@ -113,7 +105,7 @@ let SubscriptionService = class SubscriptionService {
                 try {
                     if (doc.sub_before) {
                         fs_1.default.appendFileSync(absolutePath, `\n## 执行before命令...\n\n`);
-                        beforeStr = await this.promiseExec(doc.sub_before);
+                        beforeStr = await (0, util_1.promiseExec)(doc.sub_before);
                     }
                 }
                 catch (error) {
@@ -137,7 +129,7 @@ let SubscriptionService = class SubscriptionService {
                 try {
                     if (sub.sub_after) {
                         fs_1.default.appendFileSync(absolutePath, `\n\n## 执行after命令...\n\n`);
-                        afterStr = await this.promiseExec(sub.sub_after);
+                        afterStr = await (0, util_1.promiseExec)(sub.sub_after);
                     }
                 }
                 catch (error) {
@@ -215,7 +207,9 @@ let SubscriptionService = class SubscriptionService {
     }
     async run(ids) {
         await subscription_1.SubscriptionModel.update({ status: subscription_1.SubscriptionStatus.queued }, { where: { id: ids } });
-        (0, util_1.concurrentRun)(ids.map((id) => async () => await this.runSingle(id)), 10);
+        ids.forEach((id) => {
+            this.runSingle(id);
+        });
     }
     async stop(ids) {
         const docs = await subscription_1.SubscriptionModel.findAll({ where: { id: ids } });
@@ -239,7 +233,7 @@ let SubscriptionService = class SubscriptionService {
             return;
         }
         const command = (0, subscription_2.formatCommand)(subscription);
-        await this.scheduleService.runTask(command, this.taskCallbacks(subscription));
+        this.scheduleService.runTask(command, this.taskCallbacks(subscription));
     }
     async disabled(ids) {
         await subscription_1.SubscriptionModel.update({ is_disabled: 1 }, { where: { id: ids } });

package/static/build/services/system.js

@@ -21,7 +21,7 @@ const config_1 = __importDefault(require("../config"));
 const auth_1 = require("../data/auth");
 const notify_1 = __importDefault(require("./notify"));
 const schedule_1 = __importDefault(require("./schedule"));
-const child_process_1 = require("child_process");
+const cross_spawn_1 = require("cross-spawn");
 const sock_1 = __importDefault(require("./sock"));
 const got_1 = __importDefault(require("got"));
 const util_1 = require("../config/util");
@@ -123,7 +123,7 @@ let SystemService = class SystemService {
         return false;
     }
     async updateSystem() {
-        const cp = (0, child_process_1.spawn)('ql -l update', { shell: '/bin/bash' });
+        const cp = (0, cross_spawn_1.spawn)('ql -l update', { shell: '/bin/bash' });
         cp.stdout.on('data', (data) => {
             this.sockService.sendMessage({
                 type: 'updateSystemVersion',

package/static/build/shared/pLimit.js

@@ -0,0 +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.runCronWithLimit = void 0;
+const p_limit_1 = __importDefault(require("p-limit"));
+const os_1 = __importDefault(require("os"));
+const cronLimit = (0, p_limit_1.default)(os_1.default.cpus().length);
+function runCronWithLimit(fn) {
+    return cronLimit(() => {
+        return fn();
+    });
+}
+exports.runCronWithLimit = runCronWithLimit;
+//# sourceMappingURL=pLimit.js.map