@whyour/qinglong 2.17.9 → 2.17.10-rc.2

package/static/build/loaders/initData.js

@@ -16,15 +16,21 @@ const cronView_1 = require("../data/cronView");
 const env_2 = require("../data/env");
 const system_1 = require("../data/system");
 const system_2 = __importDefault(require("../services/system"));
+const user_1 = __importDefault(require("../services/user"));
+const promises_1 = require("fs/promises");
 exports.default = async () => {
     var _a, _b, _c, _d, _e, _f;
     const cronService = typedi_1.Container.get(cron_2.default);
     const envService = typedi_1.Container.get(env_1.default);
     const dependenceService = typedi_1.Container.get(dependence_1.default);
     const systemService = typedi_1.Container.get(system_2.default);
+    const userService = typedi_1.Container.get(user_1.default);
     // 初始化增加系统配置
     await system_1.SystemModel.upsert({ type: system_1.AuthDataType.systemConfig });
     await system_1.SystemModel.upsert({ type: system_1.AuthDataType.notification });
+    // 初始化通知配置
+    const notifyConfig = await userService.getNotificationMode();
+    await (0, promises_1.writeFile)(config_1.default.systemNotifyFile, JSON.stringify(notifyConfig));
     const installDependencies = () => {
         // 初始化时安装所有处于安装中，安装成功，安装失败的依赖
         dependence_2.DependenceModel.findAll({

package/static/build/loaders/initTask.js

@@ -24,11 +24,12 @@ exports.default = async () => {
         id: NaN,
         name: '生成token',
         command: tokenCommand,
+        runOrigin: 'system',
     };
     await scheduleService.cancelIntervalTask(cron);
     scheduleService.createIntervalTask(cron, {
         days: 28,
-    });
+    }, true);
     // 运行删除日志任务
     const data = await systemService.getSystemConfig();
     if (data && data.info && data.info.logRemoveFrequency) {
@@ -36,17 +37,13 @@ exports.default = async () => {
             id: data.id,
             name: '删除日志',
             command: `ql rmlog ${data.info.logRemoveFrequency}`,
+            runOrigin: 'system',
         };
         await scheduleService.cancelIntervalTask(rmlogCron);
         scheduleService.createIntervalTask(rmlogCron, {
             days: data.info.logRemoveFrequency,
-        });
+        }, true);
     }
-    // 运行所有订阅
     await subscriptionService.setSshConfig();
-    const subs = await subscriptionService.list();
-    for (const sub of subs) {
-        subscriptionService.handleTask(sub, !sub.is_disabled, !sub.is_disabled);
-    }
 };
 //# sourceMappingURL=initTask.js.map

package/static/build/loaders/sentry.js

@@ -28,28 +28,26 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const Sentry = __importStar(require("@sentry/node"));
 const logger_1 = __importDefault(require("./logger"));
+const fs_1 = __importDefault(require("fs"));
 const config_1 = __importDefault(require("../config"));
 const util_1 = require("../config/util");
-exports.default = async ({ expressApp }) => {
-    const { version } = await (0, util_1.parseVersion)(config_1.default.versionFile);
-    Sentry.init({
-        ignoreErrors: [
-            /SequelizeUniqueConstraintError/i,
-            /Validation error/i,
-            /UnauthorizedError/i,
-            /celebrate request validation failed/i,
-        ],
-        dsn: 'https://8b5c84cfef3e22541bc84de0ed00497b@o1098464.ingest.sentry.io/6122819',
-        integrations: [
-            new Sentry.Integrations.Http({ tracing: true }),
-            new Sentry.Integrations.Express({ app: expressApp }),
-        ],
-        tracesSampleRate: 0.8,
-        release: version,
-    });
-    expressApp.use(Sentry.Handlers.requestHandler());
-    expressApp.use(Sentry.Handlers.tracingHandler());
-    logger_1.default.info('✌️ Sentry loaded');
-    console.log('✌️ Sentry loaded');
-};
+let version = '1.0.0';
+try {
+    const content = fs_1.default.readFileSync(config_1.default.versionFile, 'utf-8');
+    ({ version } = (0, util_1.parseContentVersion)(content));
+}
+catch (error) { }
+Sentry.init({
+    ignoreErrors: [
+        /SequelizeUniqueConstraintError/i,
+        /Validation error/i,
+        /UnauthorizedError/i,
+        /celebrate request validation failed/i,
+    ],
+    dsn: 'https://8b5c84cfef3e22541bc84de0ed00497b@o1098464.ingest.sentry.io/6122819',
+    tracesSampleRate: 0.5,
+    release: version,
+});
+logger_1.default.info('✌️ Sentry loaded');
+console.log('✌️ Sentry loaded');
 //# sourceMappingURL=sentry.js.map

package/static/build/loaders/sock.js

@@ -22,7 +22,6 @@ exports.default = async ({ server }) => {
         if (data) {
             const { token = '', tokens = {} } = (0, util_1.safeJSONParse)(data);
             if (headerToken === token || tokens[platform] === headerToken) {
-                conn.write(JSON.stringify({ type: 'ping', message: 'hanhh' }));
                 sockService.addClient(conn);
                 conn.on('data', (message) => {
                     conn.write(message);
@@ -32,9 +31,6 @@ exports.default = async ({ server }) => {
                 });
                 return;
             }
-            else {
-                conn.write(JSON.stringify({ type: 'ping', message: 'whyour' }));
-            }
         }
         conn.close('404');
     });

package/static/build/public.js

@@ -21,7 +21,6 @@ app.get('/api/health', (req, res) => {
 app
     .listen(config_1.default.publicPort, '0.0.0.0', async () => {
     var _a;
-    await require('./loaders/sentry').default({ expressApp: app });
     await require('./loaders/db').default();
     logger_1.default.debug(`✌️ 公共服务启动成功！`);
     console.debug(`✌️ 公共服务启动成功！`);

package/static/build/schedule/addCron.js

@@ -17,19 +17,19 @@ const addCron = (call, callback) => {
         }
         logger_1.default.info('[schedule][创建定时任务], 任务ID: %s, 名称: %s, cron: %s, 执行命令: %s', id, name, schedule, command);
         if (extraSchedules === null || extraSchedules === void 0 ? void 0 : extraSchedules.length) {
-            extraSchedules.forEach(x => {
+            extraSchedules.forEach((x) => {
                 logger_1.default.info('[schedule][创建定时任务], 任务ID: %s, 名称: %s, cron: %s, 执行命令: %s', id, name, 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, { name, schedule, extraSchedules });
+                (0, runCron_1.runCron)(command, item);
             }),
             ...((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, { name, schedule, extraSchedules });
+                    (0, runCron_1.runCron)(command, item);
                 }))
                 : []),
         ]);

package/static/build/services/cron.js

@@ -370,7 +370,7 @@ let CronService = class CronService {
                     resolve(params);
                     return;
                 }
-                this.logger.info(`[panel][开始执行任务] 参数 ${JSON.stringify(params)}`);
+                this.logger.info(`[panel][开始执行任务] 参数: ${JSON.stringify(params)}`);
                 let { id, command, log_path } = cron;
                 const uniqPath = await (0, util_1.getUniqPath)(command, `${id}`);
                 const logTime = (0, dayjs_1.default)().format('YYYY-MM-DD-HH-mm-ss-SSS');
@@ -386,12 +386,15 @@ let CronService = class CronService {
                     await promises_1.default.appendFile(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());
                 });
                 cp.on('error', async (err) => {
+                    this.logger.error('[panel][创建任务失败] 命令: %s, 错误信息: %j', command, err);
                     await promises_1.default.appendFile(absolutePath, JSON.stringify(err));
                 });
                 cp.on('exit', async (code) => {
+                    this.logger.info('[panel][执行任务结束] 参数: %s, 退出码: %j', JSON.stringify(params), code);
                     await cron_1.CrontabModel.update({ status: cron_1.CrontabStatus.idle, pid: undefined }, { where: { id } });
                     resolve(Object.assign(Object.assign({}, params), { pid: cp.pid, code }));
                 });

package/static/build/services/notify.js

@@ -8,9 +8,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-var __param = (this && this.__param) || function (paramIndex, decorator) {
-    return function (target, key) { decorator(target, key, paramIndex); }
-};
 var __rest = (this && this.__rest) || function (s, e) {
     var t = {};
     for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
@@ -31,12 +28,12 @@ const got_1 = __importDefault(require("got"));
 const hpagent_1 = require("hpagent");
 const nodemailer_1 = __importDefault(require("nodemailer"));
 const typedi_1 = require("typedi");
-const winston_1 = __importDefault(require("winston"));
 const util_1 = require("../config/util");
 const user_1 = __importDefault(require("./user"));
+const promises_1 = require("fs/promises");
+const config_1 = __importDefault(require("../config"));
 let NotificationService = class NotificationService {
-    constructor(logger) {
-        this.logger = logger;
+    constructor() {
         this.modeMap = new Map([
             ['gotify', this.gotify],
             ['goCqHttpBot', this.goCqHttpBot],
@@ -65,6 +62,22 @@ let NotificationService = class NotificationService {
             retry: 1,
         };
     }
+    async externalNotify(title, content) {
+        const _a = (0, util_1.safeJSONParse)(await (0, promises_1.readFile)(config_1.default.systemNotifyFile, 'utf-8')), { type } = _a, rest = __rest(_a, ["type"]);
+        if (type) {
+            this.title = title;
+            this.content = content;
+            this.params = rest;
+            const notificationModeAction = this.modeMap.get(type);
+            try {
+                return await (notificationModeAction === null || notificationModeAction === void 0 ? void 0 : notificationModeAction.call(this));
+            }
+            catch (error) {
+                throw error;
+            }
+        }
+        return false;
+    }
     async notify(title, content) {
         const _a = await this.userService.getNotificationMode(), { type } = _a, rest = __rest(_a, ["type"]);
         if (type) {
@@ -648,8 +661,7 @@ __decorate([
 ], NotificationService.prototype, "userService", void 0);
 NotificationService = __decorate([
     (0, typedi_1.Service)(),
-    __param(0, (0, typedi_1.Inject)('logger')),
-    __metadata("design:paramtypes", [winston_1.default.Logger])
+    __metadata("design:paramtypes", [])
 ], NotificationService);
 exports.default = NotificationService;
 //# sourceMappingURL=notify.js.map

package/static/build/services/schedule.js

@@ -11,6 +11,17 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -27,13 +38,18 @@ let ScheduleService = class ScheduleService {
         this.logger = logger;
         this.scheduleStacks = new Map();
         this.intervalSchedule = new toad_scheduler_1.ToadScheduler();
-        this.maxBuffer = 200 * 1024 * 1024;
+        this.taskLimitMap = {
+            system: 'runWithSystemLimit',
+            script: 'runWithScriptLimit',
+            subscription: 'runWithSubscriptionLimit',
+        };
     }
     async runTask(command, callbacks = {}, params, completionTime = 'end') {
-        return pLimit_1.default.runWithCronLimit(() => {
+        const { runOrigin } = params, others = __rest(params, ["runOrigin"]);
+        return pLimit_1.default[this.taskLimitMap[runOrigin]](others, () => {
             return new Promise(async (resolve, reject) => {
                 var _a, _b, _c;
-                this.logger.info(`[panel][开始执行任务] 参数 ${JSON.stringify(Object.assign(Object.assign({}, params), { command }))}`);
+                this.logger.info(`[panel][开始执行任务] 参数: ${JSON.stringify(Object.assign(Object.assign({}, others), { command }))}`);
                 try {
                     const startTime = (0, dayjs_1.default)();
                     await ((_a = callbacks.onBefore) === null || _a === void 0 ? void 0 : _a.call(callbacks, startTime));
@@ -56,9 +72,10 @@ let ScheduleService = class ScheduleService {
                     });
                     cp.on('exit', async (code) => {
                         var _a;
+                        this.logger.info('[panel][执行任务结束] 参数: %s, 退出码: %j', JSON.stringify(Object.assign(Object.assign({}, others), { command })), code);
                         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(Object.assign(Object.assign({}, params), { pid: cp.pid, code }));
+                        resolve(Object.assign(Object.assign({}, others), { pid: cp.pid, code }));
                     });
                 }
                 catch (error) {
@@ -68,7 +85,7 @@ let ScheduleService = class ScheduleService {
             });
         });
     }
-    async createCronTask({ id = 0, command, name, schedule = '' }, callbacks, runImmediately = false) {
+    async createCronTask({ id = 0, command, name, schedule = '', runOrigin }, callbacks, runImmediately = false) {
         const _id = this.formatId(id);
         this.logger.info('[panel][创建cron任务], 任务ID: %s, cron: %s, 任务名: %s, 执行命令: %s', _id, schedule, name, command);
         this.scheduleStacks.set(_id, node_schedule_1.default.scheduleJob(_id, schedule, async () => {
@@ -76,6 +93,8 @@ let ScheduleService = class ScheduleService {
                 name,
                 schedule,
                 command,
+                id: _id,
+                runOrigin,
             });
         }));
         if (runImmediately) {
@@ -83,6 +102,8 @@ let ScheduleService = class ScheduleService {
                 name,
                 schedule,
                 command,
+                id: _id,
+                runOrigin,
             });
         }
     }
@@ -95,16 +116,18 @@ let ScheduleService = class ScheduleService {
             this.scheduleStacks.delete(_id);
         }
     }
-    async createIntervalTask({ id = 0, command, name = '' }, schedule, runImmediately = true, callbacks) {
+    async createIntervalTask({ id = 0, command, name = '', runOrigin }, schedule, runImmediately = true, callbacks) {
         const _id = this.formatId(id);
         this.logger.info('[panel][创建interval任务], 任务ID: %s, 任务名: %s, 执行命令: %s', _id, name, command);
         const task = new toad_scheduler_1.Task(name, () => {
             this.runTask(command, callbacks, {
                 name,
                 command,
+                id: _id,
+                runOrigin,
             });
         }, (err) => {
-            this.logger.error('[执行任务失败] 命令: %s, 错误信息: %j', command, err);
+            this.logger.error('[panel][执行任务失败] 命令: %s, 错误信息: %j', command, err);
         });
         const job = new toad_scheduler_1.LongIntervalJob(Object.assign({ runImmediately: false }, schedule), task, _id);
         this.intervalSchedule.addIntervalJob(job);
@@ -112,12 +135,14 @@ let ScheduleService = class ScheduleService {
             this.runTask(command, callbacks, {
                 name,
                 command,
+                id: _id,
+                runOrigin,
             });
         }
     }
     async cancelIntervalTask({ id = 0, name }) {
         const _id = this.formatId(id);
-        this.logger.info('[取消interval任务], 任务ID: %s, 任务名: %s', _id, name);
+        this.logger.info('[panel][取消interval任务], 任务ID: %s, 任务名: %s', _id, name);
         this.intervalSchedule.removeById(_id);
     }
     formatId(id) {

package/static/build/services/script.js

@@ -47,6 +47,7 @@ const schedule_1 = __importDefault(require("./schedule"));
 const config_1 = __importDefault(require("../config"));
 const const_1 = require("../config/const");
 const util_1 = require("../config/util");
+const pLimit_1 = __importDefault(require("../shared/pLimit"));
 let ScriptService = class ScriptService {
     constructor(logger, sockService, cronService, scheduleService) {
         this.logger = logger;
@@ -76,12 +77,13 @@ let ScriptService = class ScriptService {
     async runScript(filePath) {
         const relativePath = path_1.default.relative(config_1.default.scriptPath, filePath);
         const command = `${const_1.TASK_COMMAND} ${relativePath} now`;
-        const pid = await this.scheduleService.runTask(`real_time=true ${command}`, this.taskCallbacks(filePath), { command }, 'start');
+        const pid = await this.scheduleService.runTask(`real_time=true ${command}`, this.taskCallbacks(filePath), { command, id: relativePath.replace(/ /g, '-'), runOrigin: 'script' }, 'start');
         return { code: 200, data: pid };
     }
     async stopScript(filePath, pid) {
         if (!pid) {
             const relativePath = path_1.default.relative(config_1.default.scriptPath, filePath);
+            pLimit_1.default.removeQueuedCron(relativePath.replace(/ /g, '-'));
             pid = (await (0, util_1.getPid)(`${const_1.TASK_COMMAND} ${relativePath} now`));
         }
         try {

package/static/build/services/subscription.js

@@ -61,8 +61,9 @@ let SubscriptionService = class SubscriptionService {
         this.sshKeyService = sshKeyService;
         this.crontabService = crontabService;
     }
-    async list(searchText) {
+    async list(searchText, ids) {
         let query = {};
+        const subIds = JSON.parse(ids || '[]');
         if (searchText) {
             const reg = {
                 [sequelize_1.Op.or]: [
@@ -83,7 +84,7 @@ let SubscriptionService = class SubscriptionService {
         }
         try {
             const result = await subscription_1.SubscriptionModel.findAll({
-                where: query,
+                where: Object.assign(Object.assign({}, query), (ids ? { id: subIds } : undefined)),
                 order: [
                     ['is_disabled', 'ASC'],
                     ['createdAt', 'DESC'],
@@ -101,13 +102,13 @@ let SubscriptionService = class SubscriptionService {
         if (doc.schedule_type === 'crontab') {
             this.scheduleService.cancelCronTask(doc);
             needCreate &&
-                (await this.scheduleService.createCronTask(doc, this.taskCallbacks(doc), runImmediately));
+                (await this.scheduleService.createCronTask(Object.assign(Object.assign({}, doc), { runOrigin: 'subscription' }), this.taskCallbacks(doc), runImmediately));
         }
         else if (doc.interval_schedule) {
             this.scheduleService.cancelIntervalTask(doc);
             const { type, value } = doc.interval_schedule;
             needCreate &&
-                (await this.scheduleService.createIntervalTask(doc, { [type]: value }, runImmediately, this.taskCallbacks(doc)));
+                (await this.scheduleService.createIntervalTask(Object.assign(Object.assign({}, doc), { runOrigin: 'subscription' }), { [type]: value }, runImmediately, this.taskCallbacks(doc)));
         }
     }
     async setSshConfig() {
@@ -272,6 +273,8 @@ let SubscriptionService = class SubscriptionService {
             name: subscription.name,
             schedule: subscription.schedule,
             command,
+            id: String(subscription.id),
+            runOrigin: 'subscription',
         });
     }
     async disabled(ids) {

package/static/build/services/system.js

@@ -32,6 +32,7 @@ const notify_1 = __importDefault(require("./notify"));
 const schedule_1 = __importDefault(require("./schedule"));
 const sock_1 = __importDefault(require("./sock"));
 const os_1 = __importDefault(require("os"));
+const dayjs_1 = __importDefault(require("dayjs"));
 const util_2 = require("../config/util");
 let SystemService = class SystemService {
     constructor(logger, scheduleService, sockService) {
@@ -74,9 +75,10 @@ let SystemService = class SystemService {
         const oDoc = await this.getSystemConfig();
         const result = await this.updateAuthDb(Object.assign(Object.assign({}, oDoc), { info: Object.assign(Object.assign({}, oDoc.info), info) }));
         const cron = {
-            id: result.id || NaN,
+            id: result.id,
             name: '删除日志',
             command: `ql rmlog ${info.logRemoveFrequency}`,
+            runOrigin: 'system',
         };
         if ((_a = oDoc.info) === null || _a === void 0 ? void 0 : _a.logRemoveFrequency) {
             await this.scheduleService.cancelIntervalTask(cron);
@@ -84,7 +86,7 @@ let SystemService = class SystemService {
         if (info.logRemoveFrequency && info.logRemoveFrequency > 0) {
             this.scheduleService.createIntervalTask(cron, {
                 days: info.logRemoveFrequency,
-            });
+            }, true);
         }
         return { code: 200, data: info };
     }
@@ -143,6 +145,8 @@ let SystemService = class SystemService {
             },
         }, {
             command,
+            id: 'update-node-mirror',
+            runOrigin: 'system',
         });
     }
     async updatePythonMirror(info) {
@@ -186,6 +190,8 @@ let SystemService = class SystemService {
             },
         }, {
             command,
+            id: 'update-linux-mirror',
+            runOrigin: 'system',
         });
     }
     async checkUpdate() {
@@ -196,7 +202,7 @@ let SystemService = class SystemService {
                 const result = await got_1.default.get(`${config_1.default.lastVersionFile}?t=${Date.now()}`, {
                     timeout: 30000,
                 });
-                lastVersionContent = await (0, util_1.parseContentVersion)(result.body);
+                lastVersionContent = (0, util_1.parseContentVersion)(result.body);
             }
             catch (error) { }
             if (!lastVersionContent) {
@@ -278,6 +284,8 @@ let SystemService = class SystemService {
         }
         this.scheduleService.runTask(`real_time=true ${command}`, callback, {
             command,
+            id: command.replace(/ /g, '-'),
+            runOrigin: 'system',
         });
     }
     async stop({ command, pid }) {
@@ -319,9 +327,18 @@ let SystemService = class SystemService {
             return { code: 400, message: error.message };
         }
     }
-    async getSystemLog(res) {
+    async getSystemLog(res, query) {
+        const startTime = (0, dayjs_1.default)(query.startTime || undefined)
+            .startOf('d')
+            .valueOf();
+        const endTime = (0, dayjs_1.default)(query.endTime || undefined)
+            .endOf('d')
+            .valueOf();
         const result = await (0, util_1.readDirs)(config_1.default.systemLogPath, config_1.default.systemLogPath);
-        const logs = result.reverse().filter((x) => x.title.endsWith('.log'));
+        const logs = result
+            .reverse()
+            .filter((x) => x.title.endsWith('.log'))
+            .filter((x) => x.mtime >= startTime && x.mtime <= endTime);
         res.set({
             'Content-Length': (0, sum_1.default)(logs.map((x) => x.size)),
         });
@@ -340,6 +357,13 @@ let SystemService = class SystemService {
             }
         })(res, logs);
     }
+    async deleteSystemLog() {
+        const result = await (0, util_1.readDirs)(config_1.default.systemLogPath, config_1.default.systemLogPath);
+        const logs = result.reverse().filter((x) => x.title.endsWith('.log'));
+        for (const log of logs) {
+            await (0, util_1.rmPath)(path_1.default.join(config_1.default.systemLogPath, log.title));
+        }
+    }
 };
 __decorate([
     (0, typedi_1.Inject)((type) => notify_1.default),

package/static/build/services/user.js

@@ -135,6 +135,7 @@ let UserService = class UserService {
                         status: system_1.LoginStatus.success,
                     },
                 });
+                this.getLoginLog();
                 return {
                     code: 200,
                     data: { token, lastip, lastaddr, lastlogon, retries, platform },
@@ -159,6 +160,7 @@ let UserService = class UserService {
                         status: system_1.LoginStatus.fail,
                     },
                 });
+                this.getLoginLog();
                 if (retries > 2) {
                     const waitTime = Math.round(Math.pow(3, retries + 1));
                     return {
@@ -190,8 +192,9 @@ let UserService = class UserService {
         if (docs && docs.length > 0) {
             const result = docs.sort((a, b) => b.info.timestamp - a.info.timestamp);
             if (result.length > 100) {
+                const ids = result.slice(0, result.length - 100).map((x) => x.id);
                 await system_1.SystemModel.destroy({
-                    where: { id: result[result.length - 1].id },
+                    where: { id: ids },
                 });
             }
             return result.map((x) => x.info);

package/static/build/shared/interface.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=interface.js.map

package/static/build/shared/pLimit.js

@@ -7,6 +7,7 @@ const p_queue_cjs_1 = __importDefault(require("p-queue-cjs"));
 const os_1 = __importDefault(require("os"));
 const system_1 = require("../data/system");
 const logger_1 = __importDefault(require("../loaders/logger"));
+const notify_1 = __importDefault(require("../services/notify"));
 class TaskLimit {
     get cronLimitActiveCount() {
         return this.cronLimit.pending;
@@ -20,6 +21,8 @@ class TaskLimit {
     constructor() {
         this.dependenyLimit = new p_queue_cjs_1.default({ concurrency: 1 });
         this.queuedDependencyIds = new Set([]);
+        this.queuedCrons = new Map();
+        this.repeatCronNotifyMap = new Map();
         this.updateLogLimit = new p_queue_cjs_1.default({ concurrency: 1 });
         this.cronLimit = new p_queue_cjs_1.default({
             concurrency: Math.max(os_1.default.cpus().length, 4),
@@ -27,6 +30,16 @@ class TaskLimit {
         this.manualCronoLimit = new p_queue_cjs_1.default({
             concurrency: Math.max(os_1.default.cpus().length, 4),
         });
+        this.subscriptionLimit = new p_queue_cjs_1.default({
+            concurrency: Math.max(os_1.default.cpus().length, 4),
+        });
+        this.scriptLimit = new p_queue_cjs_1.default({
+            concurrency: Math.max(os_1.default.cpus().length, 4),
+        });
+        this.systemLimit = new p_queue_cjs_1.default({
+            concurrency: Math.max(os_1.default.cpus().length, 4),
+        });
+        this.notificationService = new notify_1.default();
         this.setCustomLimit();
         this.handleEvents();
     }
@@ -55,6 +68,15 @@ class TaskLimit {
             this.queuedDependencyIds.delete(dependency.id);
         }
     }
+    removeQueuedCron(id) {
+        if (this.queuedCrons.has(id)) {
+            const runs = this.queuedCrons.get(id);
+            if (runs && runs.length > 0) {
+                runs.pop();
+                this.queuedCrons.set(id, runs);
+            }
+        }
+    }
     async setCustomLimit(limit) {
         var _a;
         if (limit) {
@@ -71,12 +93,37 @@ class TaskLimit {
             this.manualCronoLimit.concurrency = doc.info.cronConcurrency;
         }
     }
-    async runWithCronLimit(fn, options) {
+    async runWithCronLimit(cron, fn, options) {
+        fn.cron = cron;
+        let runs = this.queuedCrons.get(cron.id);
+        const result = (runs === null || runs === void 0 ? void 0 : runs.length) ? [...runs, fn] : [fn];
+        const repeatTimes = this.repeatCronNotifyMap.get(cron.id) || 0;
+        if ((result === null || result === void 0 ? void 0 : result.length) > 5) {
+            if (repeatTimes < 3) {
+                this.repeatCronNotifyMap.set(cron.id, repeatTimes + 1);
+                this.notificationService.externalNotify('任务重复运行', `任务：${cron.name}，命令：${cron.command}，定时：${cron.schedule}，处于运行中的超过 5 个，请检查定时设置`);
+            }
+            logger_1.default.warn(`[schedule][任务重复运行] 参数 ${JSON.stringify(cron)}`);
+            return;
+        }
+        this.queuedCrons.set(cron.id, result);
         return this.cronLimit.add(fn, options);
     }
     async manualRunWithCronLimit(fn, options) {
         return this.manualCronoLimit.add(fn, options);
     }
+    async runWithSubscriptionLimit(schedule, fn, options) {
+        fn.schedule = schedule;
+        return this.subscriptionLimit.add(fn, options);
+    }
+    async runWithSystemLimit(schedule, fn, options) {
+        fn.schedule = schedule;
+        return this.systemLimit.add(fn, options);
+    }
+    async runWithScriptLimit(schedule, fn, options) {
+        fn.schedule = schedule;
+        return this.scriptLimit.add(fn, options);
+    }
     runDependeny(dependency, fn, options) {
         this.queuedDependencyIds.add(dependency.id);
         fn.dependency = dependency;