@whyour/qinglong 0.5.0 → 0.5.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whyour/qinglong",
-  "version": "0.5.0",
+  "version": "0.5.2",
   "description": "Timed task management platform supporting Python3, JavaScript, Shell, Typescript",
   "repository": {
     "type": "git",

package/sample/config.sample.sh

@@ -91,6 +91,10 @@ export TG_API_HOST=""
 export DD_BOT_TOKEN=""
 export DD_BOT_SECRET=""
 
+## 企业微信反向代理地址
+## (环境变量名 QYWX_ORIGIN)
+export QYWX_ORIGIN=""
+
 ## 5. 企业微信机器人
 ## 官方说明文档：https://work.weixin.qq.com/api/doc/90000/90136/91770
 ## 下方填写密钥，企业微信推送 webhook 后面的 key

package/shell/share.sh

@@ -305,7 +305,7 @@ git_clone_scripts() {
   local branch="$3"
   local proxy="$4"
   [[ $branch ]] && local part_cmd="-b $branch "
-  echo -e "开始克隆仓库 $url 到 $dir\n"
+  echo -e "开始拉取 $url 到 $dir\n"
 
   set_proxy "$proxy"
 

package/shell/update.sh

@@ -130,13 +130,9 @@ update_repo() {
   make_dir "${dir_scripts}/${uniq_path}"
 
   local formatUrl="$url"
-  if [[ -d ${repo_path}/.git ]]; then
-    reset_romote_url ${repo_path} "${formatUrl}" "${branch}"
-    git_pull_scripts ${repo_path} "${branch}" "${proxy}"
-  else
-    rm -rf ${repo_path} &>/dev/null
-    git_clone_scripts "${formatUrl}" ${repo_path} "${branch}" "${proxy}"
-  fi
+  rm -rf ${repo_path} &>/dev/null
+  git_clone_scripts "${formatUrl}" ${repo_path} "${branch}" "${proxy}"
+
   if [[ $exit_status -eq 0 ]]; then
     echo -e "\n更新${repo_path}成功...\n"
     diff_scripts "$repo_path" "$author" "$path" "$blackword" "$dependence" "$extensions" "$autoAddCron" "$autoDelCron"
@@ -269,13 +265,9 @@ update_qinglong_static() {
   local no_restart="$1"
   local primary_branch="$2"
   local url="https://${mirror}.com/whyour/qinglong-static.git"
-  if [[ -d ${ql_static_repo}/.git ]]; then
-    reset_romote_url ${ql_static_repo} ${url} ${primary_branch}
-    git_pull_scripts ${ql_static_repo} ${primary_branch}
-  else
-    rm -rf ${ql_static_repo} &>/dev/null
-    git_clone_scripts ${url} ${ql_static_repo} ${primary_branch}
-  fi
+  rm -rf ${ql_static_repo} &>/dev/null
+  git_clone_scripts ${url} ${ql_static_repo} ${primary_branch}
+
   if [[ $exit_status -eq 0 ]]; then
     echo -e "\n更新青龙静态资源成功...\n"
 

package/static/build/api/system.js

@@ -73,26 +73,27 @@ exports.default = (app) => {
             return next(e);
         }
     });
-    route.get('/log/remove', async (req, res, next) => {
+    route.get('/config', async (req, res, next) => {
         const logger = typedi_1.Container.get('logger');
         try {
             const systemService = typedi_1.Container.get(system_1.default);
-            const data = await systemService.getLogRemoveFrequency();
+            const data = await systemService.getSystemConfig();
             res.send({ code: 200, data });
         }
         catch (e) {
             return next(e);
         }
     });
-    route.put('/log/remove', (0, celebrate_1.celebrate)({
+    route.put('/config', (0, celebrate_1.celebrate)({
         body: celebrate_1.Joi.object({
-            frequency: celebrate_1.Joi.number().required(),
+            logRemoveFrequency: celebrate_1.Joi.number().optional().allow(null),
+            cronConcurrency: celebrate_1.Joi.number().optional().allow(null),
         }),
     }), async (req, res, next) => {
         const logger = typedi_1.Container.get('logger');
         try {
             const systemService = typedi_1.Container.get(system_1.default);
-            const result = await systemService.updateLogRemoveFrequency(req.body.frequency);
+            const result = await systemService.updateSystemConfig(req.body);
             res.send(result);
         }
         catch (e) {

package/static/build/data/auth.js

@@ -23,6 +23,7 @@ var AuthDataType;
     AuthDataType["authToken"] = "authToken";
     AuthDataType["notification"] = "notification";
     AuthDataType["removeLogFrequency"] = "removeLogFrequency";
+    AuthDataType["systemConfig"] = "systemConfig";
 })(AuthDataType = exports.AuthDataType || (exports.AuthDataType = {}));
 exports.AuthModel = _1.sequelize.define('Auth', {
     ip: sequelize_1.DataTypes.STRING,

package/static/build/data/cron.js

@@ -30,9 +30,9 @@ exports.Crontab = Crontab;
 var CrontabStatus;
 (function (CrontabStatus) {
     CrontabStatus[CrontabStatus["running"] = 0] = "running";
-    CrontabStatus[CrontabStatus["idle"] = 1] = "idle";
-    CrontabStatus[CrontabStatus["disabled"] = 2] = "disabled";
-    CrontabStatus[CrontabStatus["queued"] = 3] = "queued";
+    CrontabStatus[CrontabStatus["queued"] = 1] = "queued";
+    CrontabStatus[CrontabStatus["idle"] = 2] = "idle";
+    CrontabStatus[CrontabStatus["disabled"] = 3] = "disabled";
 })(CrontabStatus = exports.CrontabStatus || (exports.CrontabStatus = {}));
 exports.CrontabModel = _1.sequelize.define('Crontab', {
     name: {

package/static/build/loaders/initData.js

@@ -32,7 +32,7 @@ exports.default = async () => {
         }
     });
     // 初始化更新所有任务状态为空闲
-    await cron_1.CrontabModel.update({ status: cron_1.CrontabStatus.idle }, { where: { status: [cron_1.CrontabStatus.running, cron_1.CrontabStatus.queued] } });
+    await cron_1.CrontabModel.update({ status: cron_1.CrontabStatus.idle }, { where: { status: { [sequelize_1.Op.ne]: cron_1.CrontabStatus.disabled } } });
     // 初始化时安装所有处于安装中，安装成功，安装失败的依赖
     dependence_2.DependenceModel.findAll({
         where: {},

package/static/build/loaders/initFile.js

@@ -25,10 +25,13 @@ const confFile = path_1.default.join(configPath, 'config.sh');
 const authConfigFile = path_1.default.join(configPath, 'auth.json');
 const sampleConfigFile = path_1.default.join(samplePath, 'config.sample.sh');
 const sampleAuthFile = path_1.default.join(samplePath, 'auth.sample.json');
+const sampleTaskShellFile = path_1.default.join(samplePath, 'task.sample.sh');
 const sampleNotifyJsFile = path_1.default.join(samplePath, 'notify.js');
 const sampleNotifyPyFile = path_1.default.join(samplePath, 'notify.py');
 const scriptNotifyJsFile = path_1.default.join(scriptPath, 'sendNotify.js');
 const scriptNotifyPyFile = path_1.default.join(scriptPath, 'notify.py');
+const TaskBeforeFile = path_1.default.join(configPath, 'task_before.sh');
+const TaskAfterFile = path_1.default.join(configPath, 'task_after.sh');
 const homedir = os_1.default.homedir();
 const sshPath = path_1.default.resolve(homedir, '.ssh');
 const sshdPath = path_1.default.join(dataPath, 'ssh.d');
@@ -45,6 +48,8 @@ exports.default = async () => {
     const tmpDirExist = await (0, util_1.fileExist)(tmpPath);
     const scriptNotifyJsFileExist = await (0, util_1.fileExist)(scriptNotifyJsFile);
     const scriptNotifyPyFileExist = await (0, util_1.fileExist)(scriptNotifyPyFile);
+    const TaskBeforeFileExist = await (0, util_1.fileExist)(TaskBeforeFile);
+    const TaskAfterFileExist = await (0, util_1.fileExist)(TaskAfterFile);
     if (!configDirExist) {
         fs_1.default.mkdirSync(configPath);
     }
@@ -82,6 +87,12 @@ exports.default = async () => {
     if (!scriptNotifyPyFileExist) {
         fs_1.default.writeFileSync(scriptNotifyPyFile, fs_1.default.readFileSync(sampleNotifyPyFile));
     }
+    if (!TaskBeforeFileExist) {
+        fs_1.default.writeFileSync(TaskBeforeFile, fs_1.default.readFileSync(sampleTaskShellFile));
+    }
+    if (!TaskAfterFileExist) {
+        fs_1.default.writeFileSync(TaskAfterFile, fs_1.default.readFileSync(sampleTaskShellFile));
+    }
     dotenv_1.default.config({ path: confFile });
     logger_1.default.info('✌️ Init file down');
 };

package/static/build/loaders/initTask.js

@@ -30,7 +30,7 @@ exports.default = async () => {
         days: 28,
     });
     // 运行删除日志任务
-    const data = await systemService.getLogRemoveFrequency();
+    const data = await systemService.getSystemConfig();
     if (data && data.info && data.info.frequency) {
         const rmlogCron = {
             id: data.id,

package/static/build/services/cron.js

@@ -28,7 +28,7 @@ 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 pLimit_1 = __importDefault(require("../shared/pLimit"));
 const cross_spawn_1 = require("cross-spawn");
 let CronService = class CronService {
     constructor(logger) {
@@ -240,7 +240,7 @@ let CronService = class CronService {
                 if (!filterQuery[key])
                     continue;
                 if (key === 'status') {
-                    if (filterQuery[key].includes(2)) {
+                    if (filterQuery[key].includes(cron_1.CrontabStatus.disabled)) {
                         q = { [sequelize_1.Op.or]: [{ [key]: filterQuery[key] }, { isDisabled: 1 }] };
                     }
                     else {
@@ -336,7 +336,7 @@ let CronService = class CronService {
         await cron_1.CrontabModel.update({ status: cron_1.CrontabStatus.idle, pid: undefined }, { where: { id: ids } });
     }
     async runSingle(cronId) {
-        return (0, pLimit_1.runWithCpuLimit)(() => {
+        return pLimit_1.default.runWithCpuLimit(() => {
             return new Promise(async (resolve) => {
                 const cron = await this.getDb({ id: cronId });
                 if (cron.status !== cron_1.CrontabStatus.queued) {

package/static/build/services/dependence.js

@@ -33,7 +33,7 @@ const cross_spawn_1 = require("cross-spawn");
 const sock_1 = __importDefault(require("./sock"));
 const sequelize_1 = require("sequelize");
 const dayjs_1 = __importDefault(require("dayjs"));
-const pLimit_1 = require("../shared/pLimit");
+const pLimit_1 = __importDefault(require("../shared/pLimit"));
 let DependenceService = class DependenceService {
     constructor(logger, sockService) {
         this.logger = logger;
@@ -121,7 +121,7 @@ let DependenceService = class DependenceService {
         await dependence_1.DependenceModel.update({ log: newLog }, { where: { id: ids } });
     }
     installOrUninstallDependency(dependency, isInstall = true, force = false) {
-        return (0, pLimit_1.runOneByOne)(() => {
+        return pLimit_1.default.runOneByOne(() => {
             return new Promise(async (resolve) => {
                 const depIds = [dependency.id];
                 const status = isInstall

package/static/build/services/schedule.js

@@ -20,7 +20,7 @@ const winston_1 = __importDefault(require("winston"));
 const node_schedule_1 = __importDefault(require("node-schedule"));
 const toad_scheduler_1 = require("toad-scheduler");
 const dayjs_1 = __importDefault(require("dayjs"));
-const pLimit_1 = require("../shared/pLimit");
+const pLimit_1 = __importDefault(require("../shared/pLimit"));
 const cross_spawn_1 = require("cross-spawn");
 let ScheduleService = class ScheduleService {
     constructor(logger) {
@@ -30,7 +30,7 @@ let ScheduleService = class ScheduleService {
         this.maxBuffer = 200 * 1024 * 1024;
     }
     async runTask(command, callbacks = {}, completionTime = 'end') {
-        return (0, pLimit_1.runWithCpuLimit)(() => {
+        return pLimit_1.default.runWithCpuLimit(() => {
             return new Promise(async (resolve, reject) => {
                 var _a, _b, _c;
                 try {

package/static/build/services/system.js

@@ -26,14 +26,15 @@ const sock_1 = __importDefault(require("./sock"));
 const got_1 = __importDefault(require("got"));
 const util_1 = require("../config/util");
 const const_1 = require("../config/const");
+const pLimit_1 = __importDefault(require("../shared/pLimit"));
 let SystemService = class SystemService {
     constructor(logger, scheduleService, sockService) {
         this.logger = logger;
         this.scheduleService = scheduleService;
         this.sockService = sockService;
     }
-    async getLogRemoveFrequency() {
-        const doc = await this.getDb({ type: auth_1.AuthDataType.removeLogFrequency });
+    async getSystemConfig() {
+        const doc = await this.getDb({ type: auth_1.AuthDataType.systemConfig });
         return doc || {};
     }
     async updateAuthDb(payload) {
@@ -59,21 +60,26 @@ let SystemService = class SystemService {
             return { code: 400, message: '通知发送失败，请检查参数' };
         }
     }
-    async updateLogRemoveFrequency(frequency) {
-        const oDoc = await this.getLogRemoveFrequency();
-        const result = await this.updateAuthDb(Object.assign(Object.assign({}, oDoc), { type: auth_1.AuthDataType.removeLogFrequency, info: { frequency } }));
-        const cron = {
-            id: result.id,
-            name: '删除日志',
-            command: `ql rmlog ${frequency}`,
-        };
-        await this.scheduleService.cancelIntervalTask(cron);
-        if (frequency > 0) {
-            this.scheduleService.createIntervalTask(cron, {
-                days: frequency,
-            });
+    async updateSystemConfig(info) {
+        const oDoc = await this.getSystemConfig();
+        const result = await this.updateAuthDb(Object.assign(Object.assign({}, oDoc), { type: auth_1.AuthDataType.systemConfig, info }));
+        if (info.logRemoveFrequency) {
+            const cron = {
+                id: result.id,
+                name: '删除日志',
+                command: `ql rmlog ${info.logRemoveFrequency}`,
+            };
+            await this.scheduleService.cancelIntervalTask(cron);
+            if (info.logRemoveFrequency > 0) {
+                this.scheduleService.createIntervalTask(cron, {
+                    days: info.logRemoveFrequency,
+                });
+            }
+        }
+        if (info.cronConcurrency) {
+            await pLimit_1.default.setCustomLimit(info.cronConcurrency);
         }
-        return { code: 200, data: Object.assign({}, cron) };
+        return { code: 200, data: info };
     }
     async checkUpdate() {
         try {

package/static/build/shared/pLimit.js

@@ -3,21 +3,36 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.runOneByOne = exports.runWithCpuLimit = void 0;
 const p_limit_1 = __importDefault(require("p-limit"));
 const os_1 = __importDefault(require("os"));
-const cpuLimit = (0, p_limit_1.default)(os_1.default.cpus().length);
-const oneLimit = (0, p_limit_1.default)(1);
-function runWithCpuLimit(fn) {
-    return cpuLimit(() => {
-        return fn();
-    });
+const auth_1 = require("../data/auth");
+class TaskLimit {
+    constructor() {
+        this.oneLimit = (0, p_limit_1.default)(1);
+        this.cpuLimit = (0, p_limit_1.default)(Math.max(os_1.default.cpus().length, 4));
+        this.setCustomLimit();
+    }
+    async setCustomLimit(limit) {
+        var _a, _b;
+        if (limit) {
+            this.cpuLimit = (0, p_limit_1.default)(limit);
+            return;
+        }
+        const doc = await auth_1.AuthModel.findOne({ 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);
+        }
+    }
+    runWithCpuLimit(fn) {
+        return this.cpuLimit(() => {
+            return fn();
+        });
+    }
+    runOneByOne(fn) {
+        return this.oneLimit(() => {
+            return fn();
+        });
+    }
 }
-exports.runWithCpuLimit = runWithCpuLimit;
-function runOneByOne(fn) {
-    return oneLimit(() => {
-        return fn();
-    });
-}
-exports.runOneByOne = runOneByOne;
+exports.default = new TaskLimit();
 //# sourceMappingURL=pLimit.js.map

package/static/build/shared/runCron.js

@@ -5,10 +5,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runCron = void 0;
 const cross_spawn_1 = require("cross-spawn");
-const pLimit_1 = require("./pLimit");
+const pLimit_1 = __importDefault(require("./pLimit"));
 const logger_1 = __importDefault(require("../loaders/logger"));
 function runCron(cmd) {
-    return (0, pLimit_1.runWithCpuLimit)(() => {
+    return pLimit_1.default.runWithCpuLimit(() => {
         return new Promise(async (resolve) => {
             logger_1.default.silly('运行命令: ' + cmd);
             const cp = (0, cross_spawn_1.spawn)(cmd, { shell: '/bin/bash' });