@whyour/qinglong 2.21.0-1 → 2.21.0-10

package/static/build/services/cron.js

@@ -105,15 +105,24 @@ let CronService = class CronService {
             return doc;
         }
         if (this.shouldUseCronClient(doc)) {
-            await client_1.default.addCron([
-                {
-                    name: doc.name || '',
-                    id: String(doc.id),
-                    schedule: doc.schedule,
-                    command: this.makeCommand(doc),
-                    extra_schedules: doc.extra_schedules || [],
-                },
-            ]);
+            try {
+                await client_1.default.addCron([
+                    {
+                        name: doc.name || '',
+                        id: String(doc.id),
+                        schedule: doc.schedule,
+                        command: this.makeCommand(doc),
+                        extra_schedules: doc.extra_schedules || [],
+                    },
+                ]);
+            }
+            catch (error) {
+                // gRPC 注册失败时回滚 DB 记录，避免产生"僵尸任务"
+                // （DB 和 crontab.list 有记录但调度器永远不会执行）
+                await cron_1.CrontabModel.destroy({ where: { id: doc.id } });
+                this.logger.error('[crontab] Failed to register cron job in scheduler, task creation rolled back:', (error === null || error === void 0 ? void 0 : error.message) || error);
+                throw new Error(`${(0, i18n_1.t)('调度器注册失败，任务创建已回滚')}: ${(error === null || error === void 0 ? void 0 : error.details) || (error === null || error === void 0 ? void 0 : error.message)}`);
+            }
         }
         await this.setCrontab();
         return doc;
@@ -130,17 +139,46 @@ let CronService = class CronService {
         if (doc.isDisabled === 1 || (0, util_1.isDemoEnv)()) {
             return newDoc;
         }
-        await client_1.default.delCron([String(newDoc.id)]);
+        try {
+            await client_1.default.delCron([String(newDoc.id)]);
+        }
+        catch (error) {
+            this.logger.warn('[crontab] Failed to unregister cron job in scheduler:', (error === null || error === void 0 ? void 0 : error.message) || error);
+        }
         if (this.shouldUseCronClient(newDoc)) {
-            await client_1.default.addCron([
-                {
-                    name: doc.name || '',
-                    id: String(newDoc.id),
-                    schedule: newDoc.schedule,
-                    command: this.makeCommand(newDoc),
-                    extra_schedules: newDoc.extra_schedules || [],
-                },
-            ]);
+            try {
+                await client_1.default.addCron([
+                    {
+                        name: doc.name || '',
+                        id: String(newDoc.id),
+                        schedule: newDoc.schedule,
+                        command: this.makeCommand(newDoc),
+                        extra_schedules: newDoc.extra_schedules || [],
+                    },
+                ]);
+            }
+            catch (error) {
+                // gRPC 注册新任务失败 → 回滚 DB 到旧数据，并尝试恢复旧调度注册
+                await cron_1.CrontabModel.update(doc, { where: { id: doc.id } });
+                if (this.shouldUseCronClient(doc)) {
+                    try {
+                        await client_1.default.addCron([
+                            {
+                                name: doc.name || '',
+                                id: String(doc.id),
+                                schedule: doc.schedule,
+                                command: this.makeCommand(doc),
+                                extra_schedules: doc.extra_schedules || [],
+                            },
+                        ]);
+                    }
+                    catch (_recoveryError) {
+                        this.logger.warn('[crontab] Failed to restore old cron job in scheduler after rollback:', (_recoveryError === null || _recoveryError === void 0 ? void 0 : _recoveryError.message) || _recoveryError);
+                    }
+                }
+                this.logger.error('[crontab] Failed to register updated cron job in scheduler, update rolled back:', (error === null || error === void 0 ? void 0 : error.message) || error);
+                throw new Error(`${(0, i18n_1.t)('调度器注册失败，任务更新已回滚')}: ${(error === null || error === void 0 ? void 0 : error.details) || (error === null || error === void 0 ? void 0 : error.message)}`);
+            }
         }
         await this.setCrontab();
         return newDoc;
@@ -149,7 +187,7 @@ let CronService = class CronService {
         await cron_1.CrontabModel.update(payload, { where: { id: payload.id } });
         return await this.getDb({ id: payload.id });
     }
-    async status({ ids, status, pid, log_path, last_running_time = 0, last_execution_time = 0, }) {
+    async status({ ids, status, pid, log_path, last_running_time = 0, last_execution_time = 0, exit_code, }) {
         let options = {
             status,
             pid,
@@ -185,9 +223,13 @@ let CronService = class CronService {
             else if (status === cron_1.CrontabStatus.idle) {
                 // Mark the matching running instance as finished
                 const finishedAt = (0, dayjs_1.default)().unix();
+                const instanceStatus = exit_code !== undefined && exit_code !== null && exit_code !== 0
+                    ? runningInstance_1.InstanceStatus.error
+                    : runningInstance_1.InstanceStatus.finished;
                 await runningInstance_1.RunningInstanceModel.update({
                     finished_at: finishedAt,
-                    status: runningInstance_1.InstanceStatus.finished,
+                    status: instanceStatus,
+                    exit_code: exit_code !== null && exit_code !== void 0 ? exit_code : undefined,
                 }, {
                     where: {
                         cron_id: id,
@@ -201,7 +243,12 @@ let CronService = class CronService {
     }
     async remove(ids) {
         await cron_1.CrontabModel.destroy({ where: { id: ids } });
-        await client_1.default.delCron(ids.map(String));
+        try {
+            await client_1.default.delCron(ids.map(String));
+        }
+        catch (error) {
+            this.logger.warn('[crontab] Failed to unregister cron job in scheduler:', (error === null || error === void 0 ? void 0 : error.message) || error);
+        }
         await this.setCrontab();
     }
     async pin(ids) {
@@ -486,7 +533,7 @@ let CronService = class CronService {
                 this.logger.error(`[panel][停止实例失败] 实例ID: ${instanceId}, PID: ${instance.pid}, 错误: ${error}`);
             }
         }
-        await runningInstance_1.RunningInstanceModel.update({ status: runningInstance_1.InstanceStatus.stopped, finished_at: (0, dayjs_1.default)().unix() }, { where: { id: instanceId } });
+        await runningInstance_1.RunningInstanceModel.update({ status: runningInstance_1.InstanceStatus.stopped, finished_at: (0, dayjs_1.default)().unix(), exit_code: 143 }, { where: { id: instanceId } });
         // Check if there are still other running instances for this cron
         const otherRunning = await runningInstance_1.RunningInstanceModel.count({
             where: { cron_id: instance.cron_id, status: runningInstance_1.InstanceStatus.running },
@@ -521,14 +568,6 @@ let CronService = class CronService {
                 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' });
-                const startedAt = (0, dayjs_1.default)().unix();
-                const instance = await runningInstance_1.RunningInstanceModel.create({
-                    cron_id: id,
-                    pid: cp.pid,
-                    log_path: logPath,
-                    started_at: startedAt,
-                    status: runningInstance_1.InstanceStatus.running,
-                });
                 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 logStreamManager_1.logStreamManager.write(absolutePath, data.toString());
@@ -544,19 +583,6 @@ let CronService = class CronService {
                 cp.on('exit', async (code) => {
                     this.logger.info('[panel][执行任务结束] 参数: %s, 退出码: %j', JSON.stringify(params), code);
                     await logStreamManager_1.logStreamManager.closeStream(absolutePath);
-                    const finishedAt = (0, dayjs_1.default)().unix();
-                    await runningInstance_1.RunningInstanceModel.update({
-                        finished_at: finishedAt,
-                        status: code === 0 ? runningInstance_1.InstanceStatus.finished : runningInstance_1.InstanceStatus.error,
-                        exit_code: code !== null && code !== void 0 ? code : undefined,
-                    }, { where: { id: instance.id } });
-                    // Only set cron to idle if no other running instances exist
-                    const otherRunning = await runningInstance_1.RunningInstanceModel.count({
-                        where: { cron_id: id, status: runningInstance_1.InstanceStatus.running },
-                    });
-                    if (otherRunning === 0) {
-                        await cron_1.CrontabModel.update({ status: cron_1.CrontabStatus.idle, pid: undefined }, { where: { id } });
-                    }
                     resolve(Object.assign(Object.assign({}, params), { pid: cp.pid, code }));
                 });
             });
@@ -564,7 +590,12 @@ let CronService = class CronService {
     }
     async disabled(ids) {
         await cron_1.CrontabModel.update({ isDisabled: 1 }, { where: { id: ids } });
-        await client_1.default.delCron(ids.map(String));
+        try {
+            await client_1.default.delCron(ids.map(String));
+        }
+        catch (error) {
+            this.logger.warn('[crontab] Failed to unregister cron job in scheduler:', (error === null || error === void 0 ? void 0 : error.message) || error);
+        }
         await this.setCrontab();
     }
     async enabled(ids) {
@@ -582,27 +613,38 @@ let CronService = class CronService {
         if ((0, util_1.isDemoEnv)()) {
             return;
         }
-        await client_1.default.addCron(crons);
+        try {
+            await client_1.default.addCron(crons);
+        }
+        catch (error) {
+            // gRPC 注册失败 → 回滚启用状态，避免 DB 显示已启用但调度器未注册
+            await cron_1.CrontabModel.update({ isDisabled: 1 }, { where: { id: ids } });
+            this.logger.error('[crontab] Failed to register cron job in scheduler, enable rolled back:', (error === null || error === void 0 ? void 0 : error.message) || error);
+            throw new Error(`${(0, i18n_1.t)('调度器注册失败，任务启用已回滚')}: ${(error === null || error === void 0 ? void 0 : error.details) || (error === null || error === void 0 ? void 0 : error.message)}`);
+        }
         await this.setCrontab();
     }
     async log(id) {
         const doc = await this.getDb({ id });
         if (!doc) {
-            return '';
+            return { content: '', status: 'empty' };
         }
         if (doc.log_name === '/dev/null') {
-            return '日志设置为忽略';
+            return { content: (0, i18n_1.t)('日志设置为忽略'), status: 'ignored' };
         }
         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) {
-            return await (0, util_1.getFileContentByName)(`${absolutePath}`);
+            const content = await (0, util_1.getFileContentByName)(`${absolutePath}`);
+            const isRunning = typeof doc.status === 'number' &&
+                [cron_1.CrontabStatus.running, cron_1.CrontabStatus.queued].includes(doc.status);
+            return { content, status: isRunning ? 'running' : 'completed' };
         }
         else {
             return typeof doc.status === 'number' &&
                 [cron_1.CrontabStatus.queued, cron_1.CrontabStatus.running].includes(doc.status)
-                ? '运行中...'
-                : '日志不存在...';
+                ? { content: (0, i18n_1.t)('运行中...'), status: 'running' }
+                : { content: (0, i18n_1.t)('日志不存在...'), status: 'notFound' };
         }
     }
     async logs(id) {
@@ -733,8 +775,16 @@ let CronService = class CronService {
             await (0, utils_1.writeFileWithLock)(config_1.default.crontabFile, '');
             return;
         }
-        await client_1.default.addCron(regularCrons);
-        this.setCrontab(tabs);
+        // 先同步 crontab.list 与系统 crontab，确保其始终反映数据库真实状态。
+        // gRPC 调度注册为尽力而为：失败时不阻断文件同步，调度器重启后会重新注册。
+        // 这避免了因调度器短暂不可用导致 crontab.list 与数据库脱节（订阅更新误判任务已存在）。
+        await this.setCrontab(tabs);
+        try {
+            await client_1.default.addCron(regularCrons);
+        }
+        catch (error) {
+            this.logger.warn('[crontab] Failed to register cron job in scheduler:', (error === null || error === void 0 ? void 0 : error.message) || error);
+        }
     }
     async bootTask() {
         const tabs = await this.crontabs();

package/static/build/services/dependence.js

@@ -38,6 +38,7 @@ const dayjs_1 = __importDefault(require("dayjs"));
 const pLimit_1 = __importDefault(require("../shared/pLimit"));
 const util_2 = require("../config/util");
 const const_1 = require("../config/const");
+const i18n_1 = require("../shared/i18n");
 let DependenceService = class DependenceService {
     constructor(logger, sockService) {
         this.logger = logger;
@@ -183,7 +184,7 @@ let DependenceService = class DependenceService {
                 }
                 const depIds = [dependency.id];
                 let depName = dependency.name.trim();
-                const actionText = isInstall ? '安装' : '删除';
+                const actionText = isInstall ? (0, i18n_1.t)('安装') : (0, i18n_1.t)('删除');
                 const socketMessageType = isInstall
                     ? 'installDependence'
                     : 'uninstallDependence';
@@ -197,11 +198,12 @@ let DependenceService = class DependenceService {
                     if (!osType) {
                         await dependence_1.DependenceModel.update({ status: dependence_1.DependenceStatus.installFailed }, { where: { id: depIds } });
                         const startTime = (0, dayjs_1.default)();
-                        const message = `开始${actionText}依赖 ${depName}，开始时间 ${startTime.format('YYYY-MM-DD HH:mm:ss')}\n\n当前系统不支持\n\n依赖${actionText}失败，结束时间 ${startTime.format('YYYY-MM-DD HH:mm:ss')}，耗时 ${startTime.diff(startTime, 'second')} 秒`;
+                        const message = (0, i18n_1.tf)('开始%s依赖 %s，开始时间 %s\n\n当前系统不支持\n\n依赖%s失败，结束时间 %s，耗时 %s 秒', actionText, depName, startTime.format('YYYY-MM-DD HH:mm:ss'), actionText, startTime.format('YYYY-MM-DD HH:mm:ss'), String(startTime.diff(startTime, 'second')));
                         this.sockService.sendMessage({
                             type: socketMessageType,
                             message,
                             references: depIds,
+                            status: dependence_1.DependenceStatus.installFailed,
                         });
                         this.updateLog(depIds, message);
                         return resolve(null);
@@ -221,11 +223,12 @@ let DependenceService = class DependenceService {
                         : `${linuxCommand.uninstall} ${depName.trim()}`;
                 }
                 const startTime = (0, dayjs_1.default)();
-                const message = `开始${actionText}依赖 ${depName}，开始时间 ${startTime.format('YYYY-MM-DD HH:mm:ss')}\n\n`;
+                const message = (0, i18n_1.tf)('开始%s依赖 %s，开始时间 %s\n\n', actionText, depName, startTime.format('YYYY-MM-DD HH:mm:ss'));
                 this.sockService.sendMessage({
                     type: socketMessageType,
                     message,
                     references: depIds,
+                    status,
                 });
                 this.updateLog(depIds, message);
                 // 判断是否已经安装过依赖
@@ -254,11 +257,12 @@ let DependenceService = class DependenceService {
                             isPythonDependence) &&
                         (!depVersion || depInfo.includes(depVersion))) {
                         const endTime = (0, dayjs_1.default)();
-                        const _message = `检测到已经安装 ${depName}\n\n${depInfo}\n\n跳过安装\n\n依赖${actionText}成功，结束时间 ${endTime.format('YYYY-MM-DD HH:mm:ss')}，耗时 ${endTime.diff(startTime, 'second')} 秒`;
+                        const _message = (0, i18n_1.tf)('检测到已经安装 %s\n\n%s\n\n跳过安装\n\n依赖%s成功，结束时间 %s，耗时 %s 秒', depName, depInfo, actionText, endTime.format('YYYY-MM-DD HH:mm:ss'), String(endTime.diff(startTime, 'second')));
                         this.sockService.sendMessage({
                             type: socketMessageType,
                             message: _message,
                             references: depIds,
+                            status: dependence_1.DependenceStatus.installed,
                         });
                         this.updateLog(depIds, _message);
                         await dependence_1.DependenceModel.update({ status: dependence_1.DependenceStatus.installed }, { where: { id: depIds } });
@@ -277,6 +281,7 @@ let DependenceService = class DependenceService {
                         type: socketMessageType,
                         message: data.toString(),
                         references: depIds,
+                        status,
                     });
                     this.updateLog(depIds, data.toString());
                 });
@@ -285,6 +290,7 @@ let DependenceService = class DependenceService {
                         type: socketMessageType,
                         message: data.toString(),
                         references: depIds,
+                        status,
                     });
                     this.updateLog(depIds, data.toString());
                 });
@@ -293,37 +299,32 @@ let DependenceService = class DependenceService {
                         type: socketMessageType,
                         message: JSON.stringify(err),
                         references: depIds,
+                        status,
                     });
                     this.updateLog(depIds, JSON.stringify(err));
                 });
                 cp.on('exit', async (code) => {
                     const endTime = (0, dayjs_1.default)();
                     const isSucceed = code === 0;
-                    const resultText = isSucceed ? '成功' : '失败';
-                    const message = `\n依赖${actionText}${resultText}，结束时间 ${endTime.format('YYYY-MM-DD HH:mm:ss')}，耗时 ${endTime.diff(startTime, 'second')} 秒`;
+                    const resultText = isSucceed ? (0, i18n_1.t)('成功') : (0, i18n_1.t)('失败');
+                    const message = '\n' +
+                        (0, i18n_1.tf)('依赖%s%s，结束时间 %s，耗时 %s 秒', actionText, resultText, endTime.format('YYYY-MM-DD HH:mm:ss'), String(endTime.diff(startTime, 'second')));
+                    const exitStatus = isSucceed
+                        ? (isInstall ? dependence_1.DependenceStatus.installed : dependence_1.DependenceStatus.removed)
+                        : (isInstall ? dependence_1.DependenceStatus.installFailed : dependence_1.DependenceStatus.removeFailed);
                     this.sockService.sendMessage({
                         type: socketMessageType,
                         message,
                         references: depIds,
+                        status: exitStatus,
                     });
                     this.updateLog(depIds, message);
-                    let status;
-                    if (isSucceed) {
-                        status = isInstall
-                            ? dependence_1.DependenceStatus.installed
-                            : dependence_1.DependenceStatus.removed;
-                    }
-                    else {
-                        status = isInstall
-                            ? dependence_1.DependenceStatus.installFailed
-                            : dependence_1.DependenceStatus.removeFailed;
-                    }
                     const docs = await dependence_1.DependenceModel.findAll({ where: { id: depIds } });
                     const _docIds = docs
                         .filter((x) => x.status !== dependence_1.DependenceStatus.cancelled)
                         .map((x) => x.id);
                     if (_docIds.length > 0) {
-                        await dependence_1.DependenceModel.update({ status }, { where: { id: _docIds } });
+                        await dependence_1.DependenceModel.update({ status: exitStatus }, { where: { id: _docIds } });
                     }
                     // 如果删除依赖成功或者强制删除
                     if ((isSucceed || force) && !isInstall) {

package/static/build/services/grpc.js

@@ -75,7 +75,7 @@ let GrpcServerService = class GrpcServerService {
                 try {
                     const address = this.formatGrpcAddress(host, grpcPort);
                     await bindAsync(address, credentials);
-                    logger_1.default.debug(`✌️ gRPC service started successfully on ${address}`);
+                    logger_1.default.debug(`[boot] gRPC service started successfully on ${address}`);
                     metrics_1.metricsService.record('grpc_service_start', 1, {
                         port: grpcPort.toString(),
                         host

package/static/build/services/http.js

@@ -27,7 +27,7 @@ let HttpServerService = class HttpServerService {
         for (const host of hostsToTry) {
             try {
                 const server = await this.tryListen(expressApp, port, host);
-                logger_1.default.debug(`✌️ HTTP service started successfully on ${host}:${port}`);
+                logger_1.default.debug(`[boot] HTTP service started successfully on ${host}:${port}`);
                 metrics_1.metricsService.record('http_service_start', 1, {
                     port: port.toString(),
                     host

package/static/build/services/notify.js

@@ -55,6 +55,7 @@ let NotificationService = class NotificationService {
             ['chronocat', this.chronocat],
             ['ntfy', this.ntfy],
             ['wxPusherBot', this.wxPusherBot],
+            ['wxPusherSpt', this.wxPusherSpt],
             ['openiLink', this.openiLink],
         ]);
         this.title = '';
@@ -306,7 +307,7 @@ let NotificationService = class NotificationService {
                     {
                         title: `${this.title}`,
                         thumb_media_id,
-                        author: `智能助手`,
+                        author: (0, i18n_1.t)('智能助手'),
                         content_source_url: ``,
                         content: `${this.content.replace(/\n/g, '<br/>')}`,
                         digest: `${this.content}`,
@@ -322,7 +323,7 @@ let NotificationService = class NotificationService {
                         title: `${this.title}`,
                         description: `${this.content}`,
                         url: 'https://github.com/whyour/qinglong',
-                        btntxt: '更多',
+                        btntxt: (0, i18n_1.t)('更多'),
                     },
                 };
                 break;
@@ -361,7 +362,7 @@ let NotificationService = class NotificationService {
                     roomName: `${aibotkName}`,
                     message: {
                         type: 1,
-                        content: `【青龙快讯】\n\n${this.title}\n${this.content}`,
+                        content: `【${(0, i18n_1.t)('青龙快讯')}】\n\n${this.title}\n${this.content}`,
                     },
                 };
                 break;
@@ -372,7 +373,7 @@ let NotificationService = class NotificationService {
                     name: `${aibotkName}`,
                     message: {
                         type: 1,
-                        content: `【青龙快讯】\n\n${this.title}\n${this.content}`,
+                        content: `【${(0, i18n_1.t)('青龙快讯')}】\n\n${this.title}\n${this.content}`,
                     },
                 };
                 break;
@@ -507,7 +508,7 @@ let NotificationService = class NotificationService {
                 },
             });
             const info = await transporter.sendMail({
-                from: `"青龙快讯" <${emailUser}>`,
+                from: `"${(0, i18n_1.t)('青龙快讯')}" <${emailUser}>`,
                 to: recipients,
                 subject: `${this.title}`,
                 html: `${this.content.replace(/\n/g, '<br/>')}`,
@@ -620,6 +621,47 @@ let NotificationService = class NotificationService {
             throw new Error(error.response ? error.response.body : error);
         }
     }
+    async wxPusherSpt() {
+        const { wxPusherSptList } = this.params;
+        // 处理 SPT，将逗号分隔的字符串转为数组
+        const spts = wxPusherSptList
+            ? wxPusherSptList
+                .split(',')
+                .map((spt) => spt.trim())
+                .filter((spt) => spt)
+            : [];
+        if (!spts.length) {
+            throw new Error((0, i18n_1.t)('wxPusher SPT 不能为空'));
+        }
+        if (spts.length > 10) {
+            throw new Error((0, i18n_1.t)('wxPusher SPT 最多支持 10 个'));
+        }
+        const url = `https://wxpusher.zjiecode.com/api/send/message/simple-push`;
+        const json = {
+            content: `<h1>${this.title}</h1><br/><div style='white-space: pre-wrap;'>${this.content}</div>`,
+            summary: this.title,
+            contentType: 2,
+        };
+        // 单个 SPT 用 spt，多个用 sptList
+        if (spts.length === 1) {
+            json.spt = spts[0];
+        }
+        else {
+            json.sptList = spts;
+        }
+        try {
+            const res = await http_1.httpClient.post(url, Object.assign(Object.assign({}, this.gotOption), { json }));
+            if (res.code === 1000) {
+                return true;
+            }
+            else {
+                throw new Error(JSON.stringify(res));
+            }
+        }
+        catch (error) {
+            throw new Error(error.response ? error.response.body : error);
+        }
+    }
     async chronocat() {
         var _a, _b;
         const { chronocatURL, chronocatQQ, chronocatToken } = this.params;

package/static/build/services/subscription.js

@@ -126,12 +126,12 @@ let SubscriptionService = class SubscriptionService {
                     status: subscription_1.SubscriptionStatus.running,
                     log_path: logPath,
                 }, { where: { id: doc.id } });
-                const absolutePath = await (0, util_1.handleLogPath)(logPath, `## 开始执行... ${startTime.format('YYYY-MM-DD HH:mm:ss')}\n`);
+                const absolutePath = await (0, util_1.handleLogPath)(logPath, (0, i18n_1.tf)('## 开始执行... %s\n', startTime.format('YYYY-MM-DD HH:mm:ss')));
                 // 执行sub_before
                 let beforeStr = '';
                 try {
                     if (doc.sub_before) {
-                        await logStreamManager_1.logStreamManager.write(absolutePath, `\n## 执行before命令...\n\n`);
+                        await logStreamManager_1.logStreamManager.write(absolutePath, `\n## ${(0, i18n_1.t)('执行before命令...')}\n\n`);
                         beforeStr = await (0, util_1.promiseExec)(doc.sub_before);
                     }
                 }
@@ -155,7 +155,7 @@ let SubscriptionService = class SubscriptionService {
                 let afterStr = '';
                 try {
                     if (sub.sub_after) {
-                        await logStreamManager_1.logStreamManager.write(absolutePath, `\n\n## 执行after命令...\n\n`);
+                        await logStreamManager_1.logStreamManager.write(absolutePath, `\n\n## ${(0, i18n_1.t)('执行after命令...')}\n\n`);
                         afterStr = await (0, util_1.promiseExec)(sub.sub_after);
                     }
                 }
@@ -166,7 +166,9 @@ let SubscriptionService = class SubscriptionService {
                 if (afterStr) {
                     await logStreamManager_1.logStreamManager.write(absolutePath, `${afterStr}\n`);
                 }
-                await logStreamManager_1.logStreamManager.write(absolutePath, `\n## 执行结束... ${endTime.format('YYYY-MM-DD HH:mm:ss')}  耗时 ${diff} 秒${const_1.LOG_END_SYMBOL}`);
+                await logStreamManager_1.logStreamManager.write(absolutePath, '\n' +
+                    (0, i18n_1.tf)('## 执行结束... %s  耗时 %s 秒', endTime.format('YYYY-MM-DD HH:mm:ss'), String(diff)) +
+                    const_1.LOG_END_SYMBOL);
                 // Close the stream after task completion
                 await logStreamManager_1.logStreamManager.closeStream(absolutePath);
                 await subscription_1.SubscriptionModel.update({ status: subscription_1.SubscriptionStatus.idle, pid: undefined }, { where: { id: sub.id } });

package/static/build/services/system.js

@@ -72,7 +72,7 @@ let SystemService = class SystemService {
     }
     async updateNotificationMode(notificationInfo) {
         const code = Math.random().toString().slice(-6);
-        const isSuccess = await this.notificationService.testNotify(notificationInfo, '青龙', `【蛟龙】测试通知 https://t.me/jiao_long`);
+        const isSuccess = await this.notificationService.testNotify(notificationInfo, (0, i18n_1.t)('青龙'), (0, i18n_1.t)('【蛟龙】测试通知 https://t.me/jiao_long'));
         if (isSuccess) {
             const result = await this.updateAuthDb({
                 type: system_1.AuthDataType.notification,
@@ -90,7 +90,7 @@ let SystemService = class SystemService {
         const result = await this.updateAuthDb(Object.assign(Object.assign({}, oDoc), { info: Object.assign(Object.assign({}, oDoc.info), info) }));
         const cron = {
             id: result.id,
-            name: '删除日志',
+            name: (0, i18n_1.t)('删除日志'),
             command: `ql rmlog ${info.logRemoveFrequency}`,
             runOrigin: 'system',
         };
@@ -149,6 +149,7 @@ let SystemService = class SystemService {
                 this.sockService.sendMessage({
                     type: 'updateNodeMirror',
                     message: 'update node mirror end',
+                    status: 'completed',
                 });
             },
             onError: async (message) => {
@@ -189,6 +190,7 @@ let SystemService = class SystemService {
                 this.sockService.sendMessage({
                     type: 'updateLinuxMirror',
                     message: 'update linux mirror end',
+                    status: 'completed',
                 });
                 onEnd === null || onEnd === void 0 ? void 0 : onEnd();
                 if (!hasError) {
@@ -277,6 +279,14 @@ let SystemService = class SystemService {
             this.sockService.sendMessage({
                 type: 'updateSystemVersion',
                 message: JSON.stringify(err),
+                status: 'failed',
+            });
+        });
+        cp.on('exit', (code) => {
+            this.sockService.sendMessage({
+                type: 'updateSystemVersion',
+                message: '',
+                status: code === 0 ? 'success' : 'failed',
             });
         });
         return { code: 200 };