@whyour/qinglong 0.10.1 → 0.11.1

package/static/build/protos/cron.js

@@ -3,25 +3,77 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CronClient = exports.CronService = exports.DeleteCronResponse = exports.DeleteCronRequest = exports.AddCronResponse = exports.AddCronRequest = exports.ICron = exports.protobufPackage = void 0;
+exports.CronClient = exports.CronService = exports.DeleteCronResponse = exports.DeleteCronRequest = exports.AddCronResponse = exports.AddCronRequest = exports.ICron = exports.ISchedule = exports.protobufPackage = void 0;
 /* eslint-disable */
 const grpc_js_1 = require("@grpc/grpc-js");
 const minimal_1 = __importDefault(require("protobufjs/minimal"));
-exports.protobufPackage = 'com.ql.cron';
+exports.protobufPackage = "com.ql.cron";
+function createBaseISchedule() {
+    return { schedule: "" };
+}
+exports.ISchedule = {
+    encode(message, writer = minimal_1.default.Writer.create()) {
+        if (message.schedule !== "") {
+            writer.uint32(10).string(message.schedule);
+        }
+        return writer;
+    },
+    decode(input, length) {
+        const reader = input instanceof minimal_1.default.Reader ? input : minimal_1.default.Reader.create(input);
+        let end = length === undefined ? reader.len : reader.pos + length;
+        const message = createBaseISchedule();
+        while (reader.pos < end) {
+            const tag = reader.uint32();
+            switch (tag >>> 3) {
+                case 1:
+                    if (tag !== 10) {
+                        break;
+                    }
+                    message.schedule = reader.string();
+                    continue;
+            }
+            if ((tag & 7) === 4 || tag === 0) {
+                break;
+            }
+            reader.skipType(tag & 7);
+        }
+        return message;
+    },
+    fromJSON(object) {
+        return { schedule: isSet(object.schedule) ? String(object.schedule) : "" };
+    },
+    toJSON(message) {
+        const obj = {};
+        message.schedule !== undefined && (obj.schedule = message.schedule);
+        return obj;
+    },
+    create(base) {
+        return exports.ISchedule.fromPartial(base !== null && base !== void 0 ? base : {});
+    },
+    fromPartial(object) {
+        var _a;
+        const message = createBaseISchedule();
+        message.schedule = (_a = object.schedule) !== null && _a !== void 0 ? _a : "";
+        return message;
+    },
+};
 function createBaseICron() {
-    return { id: '', schedule: '', command: '' };
+    return { id: "", schedule: "", command: "", extraSchedules: [] };
 }
 exports.ICron = {
     encode(message, writer = minimal_1.default.Writer.create()) {
-        if (message.id !== '') {
+        if (message.id !== "") {
             writer.uint32(10).string(message.id);
         }
-        if (message.schedule !== '') {
+        if (message.schedule !== "") {
             writer.uint32(18).string(message.schedule);
         }
-        if (message.command !== '') {
+        if (message.command !== "") {
             writer.uint32(26).string(message.command);
         }
+        for (const v of message.extraSchedules) {
+            exports.ISchedule.encode(v, writer.uint32(34).fork()).ldelim();
+        }
         return writer;
     },
     decode(input, length) {
@@ -32,25 +84,31 @@ exports.ICron = {
             const tag = reader.uint32();
             switch (tag >>> 3) {
                 case 1:
-                    if (tag != 10) {
+                    if (tag !== 10) {
                         break;
                     }
                     message.id = reader.string();
                     continue;
                 case 2:
-                    if (tag != 18) {
+                    if (tag !== 18) {
                         break;
                     }
                     message.schedule = reader.string();
                     continue;
                 case 3:
-                    if (tag != 26) {
+                    if (tag !== 26) {
                         break;
                     }
                     message.command = reader.string();
                     continue;
+                case 4:
+                    if (tag !== 34) {
+                        break;
+                    }
+                    message.extraSchedules.push(exports.ISchedule.decode(reader, reader.uint32()));
+                    continue;
             }
-            if ((tag & 7) == 4 || tag == 0) {
+            if ((tag & 7) === 4 || tag === 0) {
                 break;
             }
             reader.skipType(tag & 7);
@@ -59,9 +117,12 @@ exports.ICron = {
     },
     fromJSON(object) {
         return {
-            id: isSet(object.id) ? String(object.id) : '',
-            schedule: isSet(object.schedule) ? String(object.schedule) : '',
-            command: isSet(object.command) ? String(object.command) : '',
+            id: isSet(object.id) ? String(object.id) : "",
+            schedule: isSet(object.schedule) ? String(object.schedule) : "",
+            command: isSet(object.command) ? String(object.command) : "",
+            extraSchedules: Array.isArray(object === null || object === void 0 ? void 0 : object.extraSchedules)
+                ? object.extraSchedules.map((e) => exports.ISchedule.fromJSON(e))
+                : [],
         };
     },
     toJSON(message) {
@@ -69,17 +130,24 @@ exports.ICron = {
         message.id !== undefined && (obj.id = message.id);
         message.schedule !== undefined && (obj.schedule = message.schedule);
         message.command !== undefined && (obj.command = message.command);
+        if (message.extraSchedules) {
+            obj.extraSchedules = message.extraSchedules.map((e) => e ? exports.ISchedule.toJSON(e) : undefined);
+        }
+        else {
+            obj.extraSchedules = [];
+        }
         return obj;
     },
     create(base) {
         return exports.ICron.fromPartial(base !== null && base !== void 0 ? base : {});
     },
     fromPartial(object) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         const message = createBaseICron();
-        message.id = (_a = object.id) !== null && _a !== void 0 ? _a : '';
-        message.schedule = (_b = object.schedule) !== null && _b !== void 0 ? _b : '';
-        message.command = (_c = object.command) !== null && _c !== void 0 ? _c : '';
+        message.id = (_a = object.id) !== null && _a !== void 0 ? _a : "";
+        message.schedule = (_b = object.schedule) !== null && _b !== void 0 ? _b : "";
+        message.command = (_c = object.command) !== null && _c !== void 0 ? _c : "";
+        message.extraSchedules = ((_d = object.extraSchedules) === null || _d === void 0 ? void 0 : _d.map((e) => exports.ISchedule.fromPartial(e))) || [];
         return message;
     },
 };
@@ -101,13 +169,13 @@ exports.AddCronRequest = {
             const tag = reader.uint32();
             switch (tag >>> 3) {
                 case 1:
-                    if (tag != 10) {
+                    if (tag !== 10) {
                         break;
                     }
                     message.crons.push(exports.ICron.decode(reader, reader.uint32()));
                     continue;
             }
-            if ((tag & 7) == 4 || tag == 0) {
+            if ((tag & 7) === 4 || tag === 0) {
                 break;
             }
             reader.skipType(tag & 7);
@@ -115,16 +183,12 @@ exports.AddCronRequest = {
         return message;
     },
     fromJSON(object) {
-        return {
-            crons: Array.isArray(object === null || object === void 0 ? void 0 : object.crons)
-                ? object.crons.map((e) => exports.ICron.fromJSON(e))
-                : [],
-        };
+        return { crons: Array.isArray(object === null || object === void 0 ? void 0 : object.crons) ? object.crons.map((e) => exports.ICron.fromJSON(e)) : [] };
     },
     toJSON(message) {
         const obj = {};
         if (message.crons) {
-            obj.crons = message.crons.map((e) => (e ? exports.ICron.toJSON(e) : undefined));
+            obj.crons = message.crons.map((e) => e ? exports.ICron.toJSON(e) : undefined);
         }
         else {
             obj.crons = [];
@@ -156,7 +220,7 @@ exports.AddCronResponse = {
             const tag = reader.uint32();
             switch (tag >>> 3) {
             }
-            if ((tag & 7) == 4 || tag == 0) {
+            if ((tag & 7) === 4 || tag === 0) {
                 break;
             }
             reader.skipType(tag & 7);
@@ -196,13 +260,13 @@ exports.DeleteCronRequest = {
             const tag = reader.uint32();
             switch (tag >>> 3) {
                 case 1:
-                    if (tag != 10) {
+                    if (tag !== 10) {
                         break;
                     }
                     message.ids.push(reader.string());
                     continue;
             }
-            if ((tag & 7) == 4 || tag == 0) {
+            if ((tag & 7) === 4 || tag === 0) {
                 break;
             }
             reader.skipType(tag & 7);
@@ -210,11 +274,7 @@ exports.DeleteCronRequest = {
         return message;
     },
     fromJSON(object) {
-        return {
-            ids: Array.isArray(object === null || object === void 0 ? void 0 : object.ids)
-                ? object.ids.map((e) => String(e))
-                : [],
-        };
+        return { ids: Array.isArray(object === null || object === void 0 ? void 0 : object.ids) ? object.ids.map((e) => String(e)) : [] };
     },
     toJSON(message) {
         const obj = {};
@@ -251,7 +311,7 @@ exports.DeleteCronResponse = {
             const tag = reader.uint32();
             switch (tag >>> 3) {
             }
-            if ((tag & 7) == 4 || tag == 0) {
+            if ((tag & 7) === 4 || tag === 0) {
                 break;
             }
             reader.skipType(tag & 7);
@@ -275,7 +335,7 @@ exports.DeleteCronResponse = {
 };
 exports.CronService = {
     addCron: {
-        path: '/com.ql.cron.Cron/addCron',
+        path: "/com.ql.cron.Cron/addCron",
         requestStream: false,
         responseStream: false,
         requestSerialize: (value) => Buffer.from(exports.AddCronRequest.encode(value).finish()),
@@ -284,7 +344,7 @@ exports.CronService = {
         responseDeserialize: (value) => exports.AddCronResponse.decode(value),
     },
     delCron: {
-        path: '/com.ql.cron.Cron/delCron',
+        path: "/com.ql.cron.Cron/delCron",
         requestStream: false,
         responseStream: false,
         requestSerialize: (value) => Buffer.from(exports.DeleteCronRequest.encode(value).finish()),
@@ -293,7 +353,7 @@ exports.CronService = {
         responseDeserialize: (value) => exports.DeleteCronResponse.decode(value),
     },
 };
-exports.CronClient = (0, grpc_js_1.makeGenericClientConstructor)(exports.CronService, 'com.ql.cron.Cron');
+exports.CronClient = (0, grpc_js_1.makeGenericClientConstructor)(exports.CronService, "com.ql.cron.Cron");
 function isSet(value) {
     return value !== null && value !== undefined;
 }

package/static/build/protos/health.js

@@ -7,7 +7,7 @@ exports.HealthClient = exports.HealthService = exports.HealthCheckResponse = exp
 /* eslint-disable */
 const grpc_js_1 = require("@grpc/grpc-js");
 const minimal_1 = __importDefault(require("protobufjs/minimal"));
-exports.protobufPackage = 'com.ql.health';
+exports.protobufPackage = "com.ql.health";
 var HealthCheckResponse_ServingStatus;
 (function (HealthCheckResponse_ServingStatus) {
     HealthCheckResponse_ServingStatus[HealthCheckResponse_ServingStatus["UNKNOWN"] = 0] = "UNKNOWN";
@@ -15,23 +15,23 @@ var HealthCheckResponse_ServingStatus;
     HealthCheckResponse_ServingStatus[HealthCheckResponse_ServingStatus["NOT_SERVING"] = 2] = "NOT_SERVING";
     HealthCheckResponse_ServingStatus[HealthCheckResponse_ServingStatus["SERVICE_UNKNOWN"] = 3] = "SERVICE_UNKNOWN";
     HealthCheckResponse_ServingStatus[HealthCheckResponse_ServingStatus["UNRECOGNIZED"] = -1] = "UNRECOGNIZED";
-})(HealthCheckResponse_ServingStatus = exports.HealthCheckResponse_ServingStatus || (exports.HealthCheckResponse_ServingStatus = {}));
+})(HealthCheckResponse_ServingStatus || (exports.HealthCheckResponse_ServingStatus = HealthCheckResponse_ServingStatus = {}));
 function healthCheckResponse_ServingStatusFromJSON(object) {
     switch (object) {
         case 0:
-        case 'UNKNOWN':
+        case "UNKNOWN":
             return HealthCheckResponse_ServingStatus.UNKNOWN;
         case 1:
-        case 'SERVING':
+        case "SERVING":
             return HealthCheckResponse_ServingStatus.SERVING;
         case 2:
-        case 'NOT_SERVING':
+        case "NOT_SERVING":
             return HealthCheckResponse_ServingStatus.NOT_SERVING;
         case 3:
-        case 'SERVICE_UNKNOWN':
+        case "SERVICE_UNKNOWN":
             return HealthCheckResponse_ServingStatus.SERVICE_UNKNOWN;
         case -1:
-        case 'UNRECOGNIZED':
+        case "UNRECOGNIZED":
         default:
             return HealthCheckResponse_ServingStatus.UNRECOGNIZED;
     }
@@ -40,25 +40,25 @@ exports.healthCheckResponse_ServingStatusFromJSON = healthCheckResponse_ServingS
 function healthCheckResponse_ServingStatusToJSON(object) {
     switch (object) {
         case HealthCheckResponse_ServingStatus.UNKNOWN:
-            return 'UNKNOWN';
+            return "UNKNOWN";
         case HealthCheckResponse_ServingStatus.SERVING:
-            return 'SERVING';
+            return "SERVING";
         case HealthCheckResponse_ServingStatus.NOT_SERVING:
-            return 'NOT_SERVING';
+            return "NOT_SERVING";
         case HealthCheckResponse_ServingStatus.SERVICE_UNKNOWN:
-            return 'SERVICE_UNKNOWN';
+            return "SERVICE_UNKNOWN";
         case HealthCheckResponse_ServingStatus.UNRECOGNIZED:
         default:
-            return 'UNRECOGNIZED';
+            return "UNRECOGNIZED";
     }
 }
 exports.healthCheckResponse_ServingStatusToJSON = healthCheckResponse_ServingStatusToJSON;
 function createBaseHealthCheckRequest() {
-    return { service: '' };
+    return { service: "" };
 }
 exports.HealthCheckRequest = {
     encode(message, writer = minimal_1.default.Writer.create()) {
-        if (message.service !== '') {
+        if (message.service !== "") {
             writer.uint32(10).string(message.service);
         }
         return writer;
@@ -71,13 +71,13 @@ exports.HealthCheckRequest = {
             const tag = reader.uint32();
             switch (tag >>> 3) {
                 case 1:
-                    if (tag != 10) {
+                    if (tag !== 10) {
                         break;
                     }
                     message.service = reader.string();
                     continue;
             }
-            if ((tag & 7) == 4 || tag == 0) {
+            if ((tag & 7) === 4 || tag === 0) {
                 break;
             }
             reader.skipType(tag & 7);
@@ -85,7 +85,7 @@ exports.HealthCheckRequest = {
         return message;
     },
     fromJSON(object) {
-        return { service: isSet(object.service) ? String(object.service) : '' };
+        return { service: isSet(object.service) ? String(object.service) : "" };
     },
     toJSON(message) {
         const obj = {};
@@ -98,7 +98,7 @@ exports.HealthCheckRequest = {
     fromPartial(object) {
         var _a;
         const message = createBaseHealthCheckRequest();
-        message.service = (_a = object.service) !== null && _a !== void 0 ? _a : '';
+        message.service = (_a = object.service) !== null && _a !== void 0 ? _a : "";
         return message;
     },
 };
@@ -120,13 +120,13 @@ exports.HealthCheckResponse = {
             const tag = reader.uint32();
             switch (tag >>> 3) {
                 case 1:
-                    if (tag != 8) {
+                    if (tag !== 8) {
                         break;
                     }
                     message.status = reader.int32();
                     continue;
             }
-            if ((tag & 7) == 4 || tag == 0) {
+            if ((tag & 7) === 4 || tag === 0) {
                 break;
             }
             reader.skipType(tag & 7);
@@ -134,16 +134,11 @@ exports.HealthCheckResponse = {
         return message;
     },
     fromJSON(object) {
-        return {
-            status: isSet(object.status)
-                ? healthCheckResponse_ServingStatusFromJSON(object.status)
-                : 0,
-        };
+        return { status: isSet(object.status) ? healthCheckResponse_ServingStatusFromJSON(object.status) : 0 };
     },
     toJSON(message) {
         const obj = {};
-        message.status !== undefined &&
-            (obj.status = healthCheckResponse_ServingStatusToJSON(message.status));
+        message.status !== undefined && (obj.status = healthCheckResponse_ServingStatusToJSON(message.status));
         return obj;
     },
     create(base) {
@@ -158,7 +153,7 @@ exports.HealthCheckResponse = {
 };
 exports.HealthService = {
     check: {
-        path: '/com.ql.health.Health/Check',
+        path: "/com.ql.health.Health/Check",
         requestStream: false,
         responseStream: false,
         requestSerialize: (value) => Buffer.from(exports.HealthCheckRequest.encode(value).finish()),
@@ -167,7 +162,7 @@ exports.HealthService = {
         responseDeserialize: (value) => exports.HealthCheckResponse.decode(value),
     },
     watch: {
-        path: '/com.ql.health.Health/Watch',
+        path: "/com.ql.health.Health/Watch",
         requestStream: false,
         responseStream: true,
         requestSerialize: (value) => Buffer.from(exports.HealthCheckRequest.encode(value).finish()),
@@ -176,7 +171,7 @@ exports.HealthService = {
         responseDeserialize: (value) => exports.HealthCheckResponse.decode(value),
     },
 };
-exports.HealthClient = (0, grpc_js_1.makeGenericClientConstructor)(exports.HealthService, 'com.ql.health.Health');
+exports.HealthClient = (0, grpc_js_1.makeGenericClientConstructor)(exports.HealthService, "com.ql.health.Health");
 function isSet(value) {
     return value !== null && value !== undefined;
 }

package/static/build/schedule/addCron.js

@@ -7,24 +7,32 @@ exports.addCron = void 0;
 const node_schedule_1 = __importDefault(require("node-schedule"));
 const data_1 = require("./data");
 const runCron_1 = require("../shared/runCron");
-const const_1 = require("../config/const");
 const logger_1 = __importDefault(require("../loaders/logger"));
 const addCron = (call, callback) => {
     var _a;
     for (const item of call.request.crons) {
-        const { id, schedule, command } = item;
+        const { id, schedule, command, extraSchedules } = item;
         if (data_1.scheduleStacks.has(id)) {
-            (_a = data_1.scheduleStacks.get(id)) === null || _a === void 0 ? void 0 : _a.cancel();
-        }
-        let cmdStr = command.trim();
-        if (!cmdStr.startsWith(const_1.TASK_PREFIX) && !cmdStr.startsWith(const_1.QL_PREFIX)) {
-            cmdStr = `${const_1.TASK_PREFIX}${cmdStr}`;
+            (_a = data_1.scheduleStacks.get(id)) === null || _a === void 0 ? void 0 : _a.forEach((x) => x.cancel());
         }
         logger_1.default.info('[schedule][创建定时任务], 任务ID: %s, cron: %s, 执行命令: %s', id, schedule, command);
-        data_1.scheduleStacks.set(id, node_schedule_1.default.scheduleJob(id, schedule, async () => {
-            logger_1.default.info(`[schedule][准备运行任务] 命令: ${cmdStr}`);
-            (0, runCron_1.runCron)(`ID=${id} ${cmdStr}`);
-        }));
+        if (extraSchedules === null || extraSchedules === void 0 ? void 0 : extraSchedules.length) {
+            extraSchedules.forEach(x => {
+                logger_1.default.info('[schedule][创建定时任务], 任务ID: %s, cron: %s, 执行命令: %s', id, x.schedule, command);
+            });
+        }
+        data_1.scheduleStacks.set(id, [
+            node_schedule_1.default.scheduleJob(id, schedule, async () => {
+                logger_1.default.info(`[schedule][准备运行任务] 命令: ${command}`);
+                (0, runCron_1.runCron)(command);
+            }),
+            ...((extraSchedules === null || extraSchedules === void 0 ? void 0 : extraSchedules.length)
+                ? extraSchedules.map((x) => node_schedule_1.default.scheduleJob(id, x.schedule, async () => {
+                    logger_1.default.info(`[schedule][准备运行任务] 命令: ${command}`);
+                    (0, runCron_1.runCron)(command);
+                }))
+                : []),
+        ]);
     }
     callback(null, null);
 };

package/static/build/schedule/delCron.js

@@ -11,7 +11,7 @@ const delCron = (call, callback) => {
     for (const id of call.request.ids) {
         if (data_1.scheduleStacks.has(id)) {
             logger_1.default.info('[schedule][取消定时任务], 任务ID: %s', id);
-            (_a = data_1.scheduleStacks.get(id)) === null || _a === void 0 ? void 0 : _a.cancel();
+            (_a = data_1.scheduleStacks.get(id)) === null || _a === void 0 ? void 0 : _a.forEach(x => x.cancel());
             data_1.scheduleStacks.delete(id);
         }
     }

package/static/build/services/cron.js

@@ -47,7 +47,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: doc.command },
+            { id: String(doc.id), schedule: doc.schedule, command: this.makeCommand(doc), extraSchedules: doc.extra_schedules || [] },
         ]);
         await this.set_crontab();
         return doc;
@@ -68,7 +68,8 @@ let CronService = class CronService {
             {
                 id: String(newDoc.id),
                 schedule: newDoc.schedule,
-                command: newDoc.command,
+                command: this.makeCommand(newDoc),
+                extraSchedules: newDoc.extra_schedules || []
             },
         ]);
         await this.set_crontab();
@@ -357,18 +358,7 @@ let CronService = class CronService {
                 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, cross_spawn_1.spawn)(`real_log_path=${logPath} ID=${id} ${cmdStr}`, { shell: '/bin/bash' });
+                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) => {
                     fs_1.default.appendFileSync(`${absolutePath}`, `${data.toString()}`);
@@ -397,7 +387,8 @@ let CronService = class CronService {
         const crons = docs.map((doc) => ({
             id: String(doc.id),
             schedule: doc.schedule,
-            command: doc.command,
+            command: this.makeCommand(doc),
+            extraSchedules: doc.extra_schedules || []
         }));
         await client_1.default.addCron(crons);
         await this.set_crontab();
@@ -437,30 +428,40 @@ let CronService = class CronService {
             return [];
         }
     }
-    make_command(tab) {
+    makeCommand(tab) {
         let command = tab.command.trim();
         if (!command.startsWith(const_1.TASK_PREFIX) && !command.startsWith(const_1.QL_PREFIX)) {
             command = `${const_1.TASK_PREFIX}${tab.command}`;
         }
-        const crontab_job_string = `ID=${tab.id} ${command}`;
+        let commandVariable = `ID=${tab.id} `;
+        if (tab.task_before) {
+            commandVariable += `task_before='${tab.task_before.replace(/'/g, "'\\''")
+                .trim()}' `;
+        }
+        if (tab.task_after) {
+            commandVariable += `task_after='${tab.task_after.replace(/'/g, "'\\''")
+                .trim()}' `;
+        }
+        const crontab_job_string = `${commandVariable}${command}`;
         return crontab_job_string;
     }
     async set_crontab(data) {
         const tabs = data !== null && data !== void 0 ? data : (await this.crontabs());
         var crontab_string = '';
         tabs.data.forEach((tab) => {
+            var _a;
             const _schedule = tab.schedule && tab.schedule.split(/ +/);
-            if (tab.isDisabled === 1 || _schedule.length !== 5) {
+            if (tab.isDisabled === 1 || _schedule.length !== 5 || ((_a = tab.extra_schedules) === null || _a === void 0 ? void 0 : _a.length)) {
                 crontab_string += '# ';
                 crontab_string += tab.schedule;
                 crontab_string += ' ';
-                crontab_string += this.make_command(tab);
+                crontab_string += this.makeCommand(tab);
                 crontab_string += '\n';
             }
             else {
                 crontab_string += tab.schedule;
                 crontab_string += ' ';
-                crontab_string += this.make_command(tab);
+                crontab_string += this.makeCommand(tab);
                 crontab_string += '\n';
             }
         });
@@ -503,7 +504,8 @@ let CronService = class CronService {
             .map((doc) => ({
             id: String(doc.id),
             schedule: doc.schedule,
-            command: doc.command,
+            command: this.makeCommand(doc),
+            extraSchedules: doc.extra_schedules || []
         }));
         await client_1.default.addCron(sixCron);
     }

package/static/build/services/notify.js

@@ -184,11 +184,11 @@ let NotificationService = class NotificationService {
         }
     }
     async bark() {
-        let { barkPush, barkIcon, barkSound, barkGroup } = this.params;
+        let { barkPush, barkIcon, barkSound, barkGroup, barkLevel, barkUrl } = this.params;
         if (!barkPush.startsWith('http')) {
             barkPush = `https://api.day.app/${barkPush}`;
         }
-        const url = `${barkPush}/${encodeURIComponent(this.title)}/${encodeURIComponent(this.content)}?icon=${barkIcon}&sound=${barkSound}&group=${barkGroup}`;
+        const url = `${barkPush}/${encodeURIComponent(this.title)}/${encodeURIComponent(this.content)}?icon=${barkIcon}&sound=${barkSound}&group=${barkGroup}&level=${barkLevel}&url=${barkUrl}`;
         try {
             const res = await got_1.default
                 .get(url, Object.assign(Object.assign({}, this.gotOption), { headers: { 'Content-Type': 'application/x-www-form-urlencoded' } }))

package/static/build/services/system.js

@@ -30,7 +30,7 @@ const pLimit_1 = __importDefault(require("../shared/pLimit"));
 const tar_1 = __importDefault(require("tar"));
 const path_1 = __importDefault(require("path"));
 const fs_1 = __importDefault(require("fs"));
-const lodash_1 = require("lodash");
+const sum_1 = __importDefault(require("lodash/sum"));
 let SystemService = class SystemService {
     constructor(logger, scheduleService, sockService) {
         this.logger = logger;
@@ -69,7 +69,7 @@ let SystemService = class SystemService {
         const result = await this.updateAuthDb(Object.assign(Object.assign({}, oDoc), { type: auth_1.AuthDataType.systemConfig, info }));
         if (info.logRemoveFrequency) {
             const cron = {
-                id: result.id,
+                id: result.id || NaN,
                 name: '删除日志',
                 command: `ql rmlog ${info.logRemoveFrequency}`,
             };
@@ -234,7 +234,7 @@ let SystemService = class SystemService {
         const result = (0, util_1.readDirs)(config_1.default.systemLogPath, config_1.default.systemLogPath);
         const logs = result.reverse().filter((x) => x.title.endsWith('.log'));
         res.set({
-            'Content-Length': (0, lodash_1.sum)(logs.map((x) => x.size)),
+            'Content-Length': (0, sum_1.default)(logs.map((x) => x.size)),
         });
         (function sendFiles(res, fileNames) {
             if (fileNames.length === 0) {

package/static/build/shared/pLimit.js

@@ -8,18 +8,18 @@ const os_1 = __importDefault(require("os"));
 const auth_1 = require("../data/auth");
 const logger_1 = __importDefault(require("../loaders/logger"));
 class TaskLimit {
-    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.setCustomLimit();
-    }
     get cpuLimitActiveCount() {
         return this.cpuLimit.activeCount;
     }
     get cpuLimitPendingCount() {
         return this.cpuLimit.pendingCount;
     }
+    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.setCustomLimit();
+    }
     async setCustomLimit(limit) {
         var _a, _b;
         if (limit) {