@whyour/qinglong 2.19.2-2 → 2.20.0-1

package/static/build/protos/api.js

@@ -5,7 +5,7 @@
 //   protoc               v3.17.3
 // source: back/protos/api.proto
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ApiClient = exports.ApiService = exports.SystemNotifyRequest = exports.NotificationInfo = exports.CronDetailResponse = exports.CronDetailRequest = exports.CronResponse = exports.CronsResponse = exports.DeleteCronsRequest = exports.UpdateCronRequest = exports.CreateCronRequest = exports.CronItem = exports.ExtraScheduleItem = exports.Response = exports.EnvResponse = exports.EnvsResponse = exports.GetEnvByIdRequest = exports.UpdateEnvNamesRequest = exports.EnableEnvsRequest = exports.DisableEnvsRequest = exports.MoveEnvRequest = exports.DeleteEnvsRequest = exports.UpdateEnvRequest = exports.CreateEnvRequest = exports.GetEnvsRequest = exports.EnvItem = exports.notificationModeToJSON = exports.notificationModeFromJSON = exports.NotificationMode = exports.protobufPackage = void 0;
+exports.ApiClient = exports.ApiService = exports.SystemNotifyRequest = exports.NotificationInfo = exports.CronDetailResponse = exports.CronDetailRequest = exports.CronResponse = exports.CronsResponse = exports.RunCronsRequest = exports.DisableCronsRequest = exports.EnableCronsRequest = exports.GetCronByIdRequest = exports.GetCronsRequest = exports.DeleteCronsRequest = exports.UpdateCronRequest = exports.CreateCronRequest = exports.CronItem = exports.ExtraScheduleItem = exports.Response = exports.EnvResponse = exports.EnvsResponse = exports.GetEnvByIdRequest = exports.UpdateEnvNamesRequest = exports.EnableEnvsRequest = exports.DisableEnvsRequest = exports.MoveEnvRequest = exports.DeleteEnvsRequest = exports.UpdateEnvRequest = exports.CreateEnvRequest = exports.GetEnvsRequest = exports.EnvItem = exports.notificationModeToJSON = exports.notificationModeFromJSON = exports.NotificationMode = exports.protobufPackage = void 0;
 /* eslint-disable */
 const wire_1 = require("@bufbuild/protobuf/wire");
 const grpc_js_1 = require("@grpc/grpc-js");
@@ -1829,6 +1829,296 @@ exports.DeleteCronsRequest = {
         return message;
     },
 };
+function createBaseGetCronsRequest() {
+    return { searchValue: undefined };
+}
+exports.GetCronsRequest = {
+    encode(message, writer = new wire_1.BinaryWriter()) {
+        if (message.searchValue !== undefined) {
+            writer.uint32(10).string(message.searchValue);
+        }
+        return writer;
+    },
+    decode(input, length) {
+        const reader = input instanceof wire_1.BinaryReader ? input : new wire_1.BinaryReader(input);
+        let end = length === undefined ? reader.len : reader.pos + length;
+        const message = createBaseGetCronsRequest();
+        while (reader.pos < end) {
+            const tag = reader.uint32();
+            switch (tag >>> 3) {
+                case 1: {
+                    if (tag !== 10) {
+                        break;
+                    }
+                    message.searchValue = reader.string();
+                    continue;
+                }
+            }
+            if ((tag & 7) === 4 || tag === 0) {
+                break;
+            }
+            reader.skip(tag & 7);
+        }
+        return message;
+    },
+    fromJSON(object) {
+        return { searchValue: isSet(object.searchValue) ? globalThis.String(object.searchValue) : undefined };
+    },
+    toJSON(message) {
+        const obj = {};
+        if (message.searchValue !== undefined) {
+            obj.searchValue = message.searchValue;
+        }
+        return obj;
+    },
+    create(base) {
+        return exports.GetCronsRequest.fromPartial(base !== null && base !== void 0 ? base : {});
+    },
+    fromPartial(object) {
+        var _a;
+        const message = createBaseGetCronsRequest();
+        message.searchValue = (_a = object.searchValue) !== null && _a !== void 0 ? _a : undefined;
+        return message;
+    },
+};
+function createBaseGetCronByIdRequest() {
+    return { id: 0 };
+}
+exports.GetCronByIdRequest = {
+    encode(message, writer = new wire_1.BinaryWriter()) {
+        if (message.id !== 0) {
+            writer.uint32(8).int32(message.id);
+        }
+        return writer;
+    },
+    decode(input, length) {
+        const reader = input instanceof wire_1.BinaryReader ? input : new wire_1.BinaryReader(input);
+        let end = length === undefined ? reader.len : reader.pos + length;
+        const message = createBaseGetCronByIdRequest();
+        while (reader.pos < end) {
+            const tag = reader.uint32();
+            switch (tag >>> 3) {
+                case 1: {
+                    if (tag !== 8) {
+                        break;
+                    }
+                    message.id = reader.int32();
+                    continue;
+                }
+            }
+            if ((tag & 7) === 4 || tag === 0) {
+                break;
+            }
+            reader.skip(tag & 7);
+        }
+        return message;
+    },
+    fromJSON(object) {
+        return { id: isSet(object.id) ? globalThis.Number(object.id) : 0 };
+    },
+    toJSON(message) {
+        const obj = {};
+        if (message.id !== 0) {
+            obj.id = Math.round(message.id);
+        }
+        return obj;
+    },
+    create(base) {
+        return exports.GetCronByIdRequest.fromPartial(base !== null && base !== void 0 ? base : {});
+    },
+    fromPartial(object) {
+        var _a;
+        const message = createBaseGetCronByIdRequest();
+        message.id = (_a = object.id) !== null && _a !== void 0 ? _a : 0;
+        return message;
+    },
+};
+function createBaseEnableCronsRequest() {
+    return { ids: [] };
+}
+exports.EnableCronsRequest = {
+    encode(message, writer = new wire_1.BinaryWriter()) {
+        writer.uint32(10).fork();
+        for (const v of message.ids) {
+            writer.int32(v);
+        }
+        writer.join();
+        return writer;
+    },
+    decode(input, length) {
+        const reader = input instanceof wire_1.BinaryReader ? input : new wire_1.BinaryReader(input);
+        let end = length === undefined ? reader.len : reader.pos + length;
+        const message = createBaseEnableCronsRequest();
+        while (reader.pos < end) {
+            const tag = reader.uint32();
+            switch (tag >>> 3) {
+                case 1: {
+                    if (tag === 8) {
+                        message.ids.push(reader.int32());
+                        continue;
+                    }
+                    if (tag === 10) {
+                        const end2 = reader.uint32() + reader.pos;
+                        while (reader.pos < end2) {
+                            message.ids.push(reader.int32());
+                        }
+                        continue;
+                    }
+                    break;
+                }
+            }
+            if ((tag & 7) === 4 || tag === 0) {
+                break;
+            }
+            reader.skip(tag & 7);
+        }
+        return message;
+    },
+    fromJSON(object) {
+        return { ids: globalThis.Array.isArray(object === null || object === void 0 ? void 0 : object.ids) ? object.ids.map((e) => globalThis.Number(e)) : [] };
+    },
+    toJSON(message) {
+        var _a;
+        const obj = {};
+        if ((_a = message.ids) === null || _a === void 0 ? void 0 : _a.length) {
+            obj.ids = message.ids.map((e) => Math.round(e));
+        }
+        return obj;
+    },
+    create(base) {
+        return exports.EnableCronsRequest.fromPartial(base !== null && base !== void 0 ? base : {});
+    },
+    fromPartial(object) {
+        var _a;
+        const message = createBaseEnableCronsRequest();
+        message.ids = ((_a = object.ids) === null || _a === void 0 ? void 0 : _a.map((e) => e)) || [];
+        return message;
+    },
+};
+function createBaseDisableCronsRequest() {
+    return { ids: [] };
+}
+exports.DisableCronsRequest = {
+    encode(message, writer = new wire_1.BinaryWriter()) {
+        writer.uint32(10).fork();
+        for (const v of message.ids) {
+            writer.int32(v);
+        }
+        writer.join();
+        return writer;
+    },
+    decode(input, length) {
+        const reader = input instanceof wire_1.BinaryReader ? input : new wire_1.BinaryReader(input);
+        let end = length === undefined ? reader.len : reader.pos + length;
+        const message = createBaseDisableCronsRequest();
+        while (reader.pos < end) {
+            const tag = reader.uint32();
+            switch (tag >>> 3) {
+                case 1: {
+                    if (tag === 8) {
+                        message.ids.push(reader.int32());
+                        continue;
+                    }
+                    if (tag === 10) {
+                        const end2 = reader.uint32() + reader.pos;
+                        while (reader.pos < end2) {
+                            message.ids.push(reader.int32());
+                        }
+                        continue;
+                    }
+                    break;
+                }
+            }
+            if ((tag & 7) === 4 || tag === 0) {
+                break;
+            }
+            reader.skip(tag & 7);
+        }
+        return message;
+    },
+    fromJSON(object) {
+        return { ids: globalThis.Array.isArray(object === null || object === void 0 ? void 0 : object.ids) ? object.ids.map((e) => globalThis.Number(e)) : [] };
+    },
+    toJSON(message) {
+        var _a;
+        const obj = {};
+        if ((_a = message.ids) === null || _a === void 0 ? void 0 : _a.length) {
+            obj.ids = message.ids.map((e) => Math.round(e));
+        }
+        return obj;
+    },
+    create(base) {
+        return exports.DisableCronsRequest.fromPartial(base !== null && base !== void 0 ? base : {});
+    },
+    fromPartial(object) {
+        var _a;
+        const message = createBaseDisableCronsRequest();
+        message.ids = ((_a = object.ids) === null || _a === void 0 ? void 0 : _a.map((e) => e)) || [];
+        return message;
+    },
+};
+function createBaseRunCronsRequest() {
+    return { ids: [] };
+}
+exports.RunCronsRequest = {
+    encode(message, writer = new wire_1.BinaryWriter()) {
+        writer.uint32(10).fork();
+        for (const v of message.ids) {
+            writer.int32(v);
+        }
+        writer.join();
+        return writer;
+    },
+    decode(input, length) {
+        const reader = input instanceof wire_1.BinaryReader ? input : new wire_1.BinaryReader(input);
+        let end = length === undefined ? reader.len : reader.pos + length;
+        const message = createBaseRunCronsRequest();
+        while (reader.pos < end) {
+            const tag = reader.uint32();
+            switch (tag >>> 3) {
+                case 1: {
+                    if (tag === 8) {
+                        message.ids.push(reader.int32());
+                        continue;
+                    }
+                    if (tag === 10) {
+                        const end2 = reader.uint32() + reader.pos;
+                        while (reader.pos < end2) {
+                            message.ids.push(reader.int32());
+                        }
+                        continue;
+                    }
+                    break;
+                }
+            }
+            if ((tag & 7) === 4 || tag === 0) {
+                break;
+            }
+            reader.skip(tag & 7);
+        }
+        return message;
+    },
+    fromJSON(object) {
+        return { ids: globalThis.Array.isArray(object === null || object === void 0 ? void 0 : object.ids) ? object.ids.map((e) => globalThis.Number(e)) : [] };
+    },
+    toJSON(message) {
+        var _a;
+        const obj = {};
+        if ((_a = message.ids) === null || _a === void 0 ? void 0 : _a.length) {
+            obj.ids = message.ids.map((e) => Math.round(e));
+        }
+        return obj;
+    },
+    create(base) {
+        return exports.RunCronsRequest.fromPartial(base !== null && base !== void 0 ? base : {});
+    },
+    fromPartial(object) {
+        var _a;
+        const message = createBaseRunCronsRequest();
+        message.ids = ((_a = object.ids) === null || _a === void 0 ? void 0 : _a.map((e) => e)) || [];
+        return message;
+    },
+};
 function createBaseCronsResponse() {
     return { code: 0, data: [], message: undefined };
 }
@@ -3487,6 +3777,51 @@ exports.ApiService = {
         responseSerialize: (value) => Buffer.from(exports.Response.encode(value).finish()),
         responseDeserialize: (value) => exports.Response.decode(value),
     },
+    getCrons: {
+        path: "/com.ql.api.Api/GetCrons",
+        requestStream: false,
+        responseStream: false,
+        requestSerialize: (value) => Buffer.from(exports.GetCronsRequest.encode(value).finish()),
+        requestDeserialize: (value) => exports.GetCronsRequest.decode(value),
+        responseSerialize: (value) => Buffer.from(exports.CronsResponse.encode(value).finish()),
+        responseDeserialize: (value) => exports.CronsResponse.decode(value),
+    },
+    getCronById: {
+        path: "/com.ql.api.Api/GetCronById",
+        requestStream: false,
+        responseStream: false,
+        requestSerialize: (value) => Buffer.from(exports.GetCronByIdRequest.encode(value).finish()),
+        requestDeserialize: (value) => exports.GetCronByIdRequest.decode(value),
+        responseSerialize: (value) => Buffer.from(exports.CronResponse.encode(value).finish()),
+        responseDeserialize: (value) => exports.CronResponse.decode(value),
+    },
+    enableCrons: {
+        path: "/com.ql.api.Api/EnableCrons",
+        requestStream: false,
+        responseStream: false,
+        requestSerialize: (value) => Buffer.from(exports.EnableCronsRequest.encode(value).finish()),
+        requestDeserialize: (value) => exports.EnableCronsRequest.decode(value),
+        responseSerialize: (value) => Buffer.from(exports.Response.encode(value).finish()),
+        responseDeserialize: (value) => exports.Response.decode(value),
+    },
+    disableCrons: {
+        path: "/com.ql.api.Api/DisableCrons",
+        requestStream: false,
+        responseStream: false,
+        requestSerialize: (value) => Buffer.from(exports.DisableCronsRequest.encode(value).finish()),
+        requestDeserialize: (value) => exports.DisableCronsRequest.decode(value),
+        responseSerialize: (value) => Buffer.from(exports.Response.encode(value).finish()),
+        responseDeserialize: (value) => exports.Response.decode(value),
+    },
+    runCrons: {
+        path: "/com.ql.api.Api/RunCrons",
+        requestStream: false,
+        responseStream: false,
+        requestSerialize: (value) => Buffer.from(exports.RunCronsRequest.encode(value).finish()),
+        requestDeserialize: (value) => exports.RunCronsRequest.decode(value),
+        responseSerialize: (value) => Buffer.from(exports.Response.encode(value).finish()),
+        responseDeserialize: (value) => exports.Response.decode(value),
+    },
 };
 exports.ApiClient = (0, grpc_js_1.makeGenericClientConstructor)(exports.ApiService, "com.ql.api.Api");
 function longToNumber(int64) {

package/static/build/schedule/addCron.js

@@ -15,10 +15,10 @@ const addCron = (call, callback) => {
         if (data_1.scheduleStacks.has(id)) {
             (_a = data_1.scheduleStacks.get(id)) === null || _a === void 0 ? void 0 : _a.forEach((x) => x.cancel());
         }
-        logger_1.default.info('[schedule][创建定时任务], 任务ID: %s, 名称: %s, cron: %s, 执行命令: %s', id, name, schedule, command);
+        logger_1.default.info('[schedule][创建定时任务] 任务ID: %s, 名称: %s, cron: %s, 执行命令: %s', id, name, schedule, command);
         if (extra_schedules === null || extra_schedules === void 0 ? void 0 : extra_schedules.length) {
             extra_schedules.forEach((x) => {
-                logger_1.default.info('[schedule][创建定时任务], 任务ID: %s, 名称: %s, cron: %s, 执行命令: %s', id, name, x.schedule, command);
+                logger_1.default.info('[schedule][创建定时任务] 任务ID: %s, 名称: %s, cron: %s, 执行命令: %s', id, name, x.schedule, command);
             });
         }
         data_1.scheduleStacks.set(id, [

package/static/build/schedule/api.js

@@ -14,7 +14,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.deleteCrons = exports.updateCron = exports.createCron = exports.getCronDetail = exports.systemNotify = exports.getEnvById = exports.updateEnvNames = exports.enableEnvs = exports.disableEnvs = exports.moveEnv = exports.deleteEnvs = exports.updateEnv = exports.createEnv = exports.getEnvs = void 0;
+exports.runCrons = exports.disableCrons = exports.enableCrons = exports.getCronById = exports.getCrons = exports.deleteCrons = exports.updateCron = exports.createCron = exports.getCronDetail = exports.systemNotify = exports.getEnvById = exports.updateEnvNames = exports.enableEnvs = exports.disableEnvs = exports.moveEnv = exports.deleteEnvs = exports.updateEnv = exports.createEnv = exports.getEnvs = void 0;
 require("reflect-metadata");
 const typedi_1 = require("typedi");
 const env_1 = __importDefault(require("../services/env"));
@@ -265,4 +265,103 @@ const deleteCrons = async (call, callback) => {
     }
 };
 exports.deleteCrons = deleteCrons;
+const getCrons = async (call, callback) => {
+    try {
+        const cronService = typedi_1.Container.get(cron_1.default);
+        const result = await cronService.crontabs({
+            searchValue: call.request.searchValue || '',
+            page: '0',
+            size: '0',
+            sorter: '',
+            filters: '',
+            queryString: '',
+        });
+        const data = result.data.map((x) => normalizeCronData(x));
+        callback(null, {
+            code: 200,
+            data: data.filter((x) => x !== undefined),
+        });
+    }
+    catch (e) {
+        callback(null, {
+            code: 500,
+            data: [],
+            message: e.message,
+        });
+    }
+};
+exports.getCrons = getCrons;
+const getCronById = async (call, callback) => {
+    try {
+        if (!call.request.id) {
+            return callback(null, {
+                code: 400,
+                data: undefined,
+                message: 'id parameter is required',
+            });
+        }
+        const cronService = typedi_1.Container.get(cron_1.default);
+        const data = (await cronService.getDb({ id: call.request.id }));
+        callback(null, { code: 200, data: normalizeCronData(data) });
+    }
+    catch (e) {
+        callback(null, {
+            code: 404,
+            data: undefined,
+            message: e.message,
+        });
+    }
+};
+exports.getCronById = getCronById;
+const enableCrons = async (call, callback) => {
+    try {
+        if (!call.request.ids || call.request.ids.length === 0) {
+            return callback(null, {
+                code: 400,
+                message: 'ids parameter is required',
+            });
+        }
+        const cronService = typedi_1.Container.get(cron_1.default);
+        await cronService.enabled(call.request.ids);
+        callback(null, { code: 200 });
+    }
+    catch (e) {
+        callback(e);
+    }
+};
+exports.enableCrons = enableCrons;
+const disableCrons = async (call, callback) => {
+    try {
+        if (!call.request.ids || call.request.ids.length === 0) {
+            return callback(null, {
+                code: 400,
+                message: 'ids parameter is required',
+            });
+        }
+        const cronService = typedi_1.Container.get(cron_1.default);
+        await cronService.disabled(call.request.ids);
+        callback(null, { code: 200 });
+    }
+    catch (e) {
+        callback(e);
+    }
+};
+exports.disableCrons = disableCrons;
+const runCrons = async (call, callback) => {
+    try {
+        if (!call.request.ids || call.request.ids.length === 0) {
+            return callback(null, {
+                code: 400,
+                message: 'ids parameter is required',
+            });
+        }
+        const cronService = typedi_1.Container.get(cron_1.default);
+        await cronService.run(call.request.ids);
+        callback(null, { code: 200 });
+    }
+    catch (e) {
+        callback(e);
+    }
+};
+exports.runCrons = runCrons;
 //# sourceMappingURL=api.js.map

package/static/build/schedule/delCron.js

@@ -10,7 +10,7 @@ const delCron = (call, callback) => {
     var _a;
     for (const id of call.request.ids) {
         if (data_1.scheduleStacks.has(id)) {
-            logger_1.default.info('[schedule][取消定时任务], 任务ID: %s', id);
+            logger_1.default.info('[schedule][取消定时任务] 任务ID: %s', id);
             (_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/schedule/health.js

@@ -13,9 +13,8 @@ const check = async (call, callback) => {
             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 || ''}\n${res}`.trim()));
+            const qinglongErrLog = await (0, util_1.promiseExec)(`tail -n 300 ~/.pm2/logs/qinglong-error.log`);
+            return callback(new Error(`${qinglongErrLog || ''}\n${res}`.trim()));
         default:
             return callback(null, { status: 1 });
     }

package/static/build/services/cron.js

@@ -21,7 +21,7 @@ const config_1 = __importDefault(require("../config"));
 const cron_1 = require("../data/cron");
 const child_process_1 = require("child_process");
 const promises_1 = __importDefault(require("fs/promises"));
-const cron_parser_1 = __importDefault(require("cron-parser"));
+const cron_parser_1 = require("cron-parser");
 const util_1 = require("../config/util");
 const sequelize_1 = require("sequelize");
 const path_1 = __importDefault(require("path"));
@@ -34,6 +34,7 @@ const pickBy_1 = __importDefault(require("lodash/pickBy"));
 const omit_1 = __importDefault(require("lodash/omit"));
 const utils_1 = require("../shared/utils");
 const schedule_1 = require("../interface/schedule");
+const logStreamManager_1 = require("../shared/logStreamManager");
 let CronService = class CronService {
     constructor(logger) {
         this.logger = logger;
@@ -54,9 +55,28 @@ let CronService = class CronService {
     isSpecialSchedule(schedule) {
         return this.isOnceSchedule(schedule) || this.isBootSchedule(schedule);
     }
+    async getLogName(cron) {
+        const { log_name, command, id } = cron;
+        if (log_name === '/dev/null') {
+            return log_name;
+        }
+        let uniqPath = await (0, util_1.getUniqPath)(command, `${id}`);
+        if (log_name) {
+            const normalizedLogName = log_name.startsWith('/')
+                ? log_name
+                : path_1.default.join(config_1.default.logPath, log_name);
+            if (normalizedLogName.startsWith(config_1.default.logPath)) {
+                uniqPath = log_name;
+            }
+        }
+        const logDirPath = path_1.default.resolve(config_1.default.logPath, `${uniqPath}`);
+        await promises_1.default.mkdir(logDirPath, { recursive: true });
+        return uniqPath;
+    }
     async create(payload) {
         const tab = new cron_1.Crontab(payload);
         tab.saved = false;
+        tab.log_name = await this.getLogName(tab);
         const doc = await this.insert(tab);
         if ((0, util_1.isDemoEnv)()) {
             return doc;
@@ -82,6 +102,7 @@ let CronService = class CronService {
         const doc = await this.getDb({ id: payload.id });
         const tab = new cron_1.Crontab(Object.assign(Object.assign({}, doc), payload));
         tab.saved = false;
+        tab.log_name = await this.getLogName(tab);
         const newDoc = await this.updateDb(tab);
         if (doc.isDisabled === 1 || (0, util_1.isDemoEnv)()) {
             return newDoc;
@@ -384,13 +405,14 @@ let CronService = class CronService {
     async stop(ids) {
         const docs = await cron_1.CrontabModel.findAll({ where: { id: ids } });
         for (const doc of docs) {
-            if (doc.pid) {
-                try {
-                    await (0, util_1.killTask)(doc.pid);
-                }
-                catch (error) {
-                    this.logger.error(error);
-                }
+            // Kill all running instances of this task
+            try {
+                const command = this.makeCommand(doc);
+                await (0, util_1.killAllTasks)(command);
+                this.logger.info(`[panel][停止所有运行中的任务实例] 任务ID: ${doc.id}, 命令: ${command}`);
+            }
+            catch (error) {
+                this.logger.error(`[panel][停止任务失败] 任务ID: ${doc.id}, 错误: ${error}`);
             }
         }
         await cron_1.CrontabModel.update({ status: cron_1.CrontabStatus.idle, pid: undefined }, { where: { id: ids } });
@@ -398,7 +420,6 @@ let CronService = class CronService {
     async runSingle(cronId) {
         return pLimit_1.default.manualRunWithCronLimit(() => {
             return new Promise(async (resolve) => {
-                var _a;
                 const cron = await this.getDb({ id: cronId });
                 const params = {
                     name: cron.name,
@@ -411,30 +432,32 @@ let CronService = class CronService {
                     return;
                 }
                 this.logger.info(`[panel][开始执行任务] 参数: ${JSON.stringify(params)}`);
-                let { id, command, log_path } = cron;
-                const uniqPath = await (0, util_1.getUniqPath)(command, `${id}`);
+                let { id, command, log_name } = cron;
+                const uniqPath = log_name === '/dev/null' || !log_name
+                    ? await (0, util_1.getUniqPath)(command, `${id}`)
+                    : log_name;
                 const logTime = (0, dayjs_1.default)().format('YYYY-MM-DD-HH-mm-ss-SSS');
                 const logDirPath = path_1.default.resolve(config_1.default.logPath, `${uniqPath}`);
-                if ((_a = log_path === null || log_path === void 0 ? void 0 : log_path.split('/')) === null || _a === void 0 ? void 0 : _a.every((x) => x !== uniqPath)) {
-                    await promises_1.default.mkdir(logDirPath, { recursive: true });
-                }
+                await promises_1.default.mkdir(logDirPath, { recursive: true });
                 const logPath = `${uniqPath}/${logTime}.log`;
                 const absolutePath = path_1.default.resolve(config_1.default.logPath, `${logPath}`);
                 const cp = (0, cross_spawn_1.spawn)(`real_log_path=${logPath} no_delay=true ${this.makeCommand(cron, true)}`, { shell: '/bin/bash' });
                 await cron_1.CrontabModel.update({ status: cron_1.CrontabStatus.running, pid: cp.pid, log_path: logPath }, { where: { id } });
                 cp.stdout.on('data', async (data) => {
-                    await promises_1.default.appendFile(absolutePath, data.toString());
+                    await logStreamManager_1.logStreamManager.write(absolutePath, data.toString());
                 });
                 cp.stderr.on('data', async (data) => {
                     this.logger.info('[panel][执行任务失败] 命令: %s, 错误信息: %j', command, data.toString());
-                    await promises_1.default.appendFile(absolutePath, data.toString());
+                    await logStreamManager_1.logStreamManager.write(absolutePath, data.toString());
                 });
                 cp.on('error', async (err) => {
                     this.logger.error('[panel][创建任务失败] 命令: %s, 错误信息: %j', command, err);
-                    await promises_1.default.appendFile(absolutePath, JSON.stringify(err));
+                    await logStreamManager_1.logStreamManager.write(absolutePath, JSON.stringify(err));
                 });
                 cp.on('exit', async (code) => {
                     this.logger.info('[panel][执行任务结束] 参数: %s, 退出码: %j', JSON.stringify(params), code);
+                    // Close the stream after task completion
+                    await logStreamManager_1.logStreamManager.closeStream(absolutePath);
                     await cron_1.CrontabModel.update({ status: cron_1.CrontabStatus.idle, pid: undefined }, { where: { id } });
                     resolve(Object.assign(Object.assign({}, params), { pid: cp.pid, code }));
                 });
@@ -467,6 +490,9 @@ let CronService = class CronService {
         if (!doc) {
             return '';
         }
+        if (doc.log_name === '/dev/null') {
+            return '日志设置为忽略';
+        }
         const absolutePath = path_1.default.resolve(config_1.default.logPath, `${doc.log_path}`);
         const logFileExist = doc.log_path && (await (0, util_1.fileExist)(absolutePath));
         if (logFileExist) {
@@ -492,7 +518,7 @@ let CronService = class CronService {
             return (await Promise.all(files.map(async (x) => ({
                 filename: x,
                 directory: relativeDir.replace(config_1.default.logPath, ''),
-                time: (await promises_1.default.lstat(`${dir}/${x}`)).mtime.getTime(),
+                time: (await promises_1.default.lstat(`${dir}/${x}`)).birthtimeMs,
             })))).sort((a, b) => b.time - a.time);
         }
         else {
@@ -505,6 +531,10 @@ let CronService = class CronService {
             command = `${const_1.TASK_PREFIX}${tab.command}`;
         }
         let commandVariable = `real_time=${Boolean(realTime)} no_tee=true ID=${tab.id} `;
+        // Only include log_name if it has a truthy value to avoid passing null/undefined to shell
+        if (tab.log_name) {
+            commandVariable += `log_name=${tab.log_name} `;
+        }
         if (tab.task_before) {
             commandVariable += `task_before='${tab.task_before
                 .replace(/'/g, "'\\''")
@@ -544,7 +574,11 @@ let CronService = class CronService {
         await cron_1.CrontabModel.update({ saved: true }, { where: {} });
     }
     importCrontab() {
-        (0, child_process_1.exec)('crontab -l', (error, stdout, stderr) => {
+        (0, child_process_1.exec)('crontab -l', (error, stdout) => {
+            if (error) {
+                const errorMsg = error.message || String(error);
+                this.logger.error('[crontab] Failed to read system crontab:', errorMsg);
+            }
             const lines = stdout.split('\n');
             const namePrefix = new Date().getTime();
             lines.reverse().forEach(async (line, index) => {
@@ -554,7 +588,7 @@ let CronService = class CronService {
                 const schedule = line.replace(command, '').trim();
                 if (command &&
                     schedule &&
-                    cron_parser_1.default.parseExpression(schedule).hasNext()) {
+                    cron_parser_1.CronExpressionParser.parse(schedule).hasNext()) {
                     const name = namePrefix + '_' + index;
                     const _crontab = await cron_1.CrontabModel.findOne({
                         where: { command, schedule },