@whyour/qinglong 2.20.2-3 → 2.21.0-2

package/static/build/services/user.js

@@ -32,6 +32,7 @@ const uniq_1 = __importDefault(require("lodash/uniq"));
 const pickBy_1 = __importDefault(require("lodash/pickBy"));
 const isNil_1 = __importDefault(require("lodash/isNil"));
 const store_1 = require("../shared/store");
+const i18n_1 = require("../shared/i18n");
 let UserService = class UserService {
     constructor(logger, scheduleService, sockService) {
         this.logger = logger;
@@ -48,7 +49,7 @@ let UserService = class UserService {
             const waitTime = Math.ceil((retriesTime - (timestamp - lastlogon)) / 1000);
             return {
                 code: 410,
-                message: `失败次数过多，请${waitTime}秒后重试`,
+                message: (0, i18n_1.tf)('失败次数过多，请%s秒后重试', waitTime),
                 data: waitTime,
             };
         }
@@ -97,7 +98,18 @@ let UserService = class UserService {
                 platform: req.platform,
                 isTwoFactorChecking: false,
             });
-            this.notificationService.notify('登录通知', `你于${(0, dayjs_1.default)(timestamp).format('YYYY-MM-DD HH:mm:ss')}在 ${address} ${req.platform}端 登录成功，ip地址 ${ip}`);
+            this.notificationService.notify((0, i18n_1.t)('登录通知'), (0, i18n_1.t)('你于') +
+                (0, dayjs_1.default)(timestamp).format('YYYY-MM-DD HH:mm:ss') +
+                (0, i18n_1.t)('在') +
+                address +
+                ' ' +
+                req.platform +
+                (0, i18n_1.t)('端') +
+                ' ' +
+                (0, i18n_1.t)('登录成功') +
+                (0, i18n_1.t)('，ip地址') +
+                ' ' +
+                ip);
             await this.insertDb({
                 type: system_1.AuthDataType.loginLog,
                 info: {
@@ -129,7 +141,18 @@ let UserService = class UserService {
                 lastaddr: address,
                 platform: req.platform,
             });
-            this.notificationService.notify('登录通知', `你于${(0, dayjs_1.default)(timestamp).format('YYYY-MM-DD HH:mm:ss')}在 ${address} ${req.platform}端 登录失败，ip地址 ${ip}`);
+            this.notificationService.notify((0, i18n_1.t)('登录通知'), (0, i18n_1.t)('你于') +
+                (0, dayjs_1.default)(timestamp).format('YYYY-MM-DD HH:mm:ss') +
+                (0, i18n_1.t)('在') +
+                address +
+                ' ' +
+                req.platform +
+                (0, i18n_1.t)('端') +
+                ' ' +
+                (0, i18n_1.t)('登录失败') +
+                (0, i18n_1.t)('，ip地址') +
+                ' ' +
+                ip);
             await this.insertDb({
                 type: system_1.AuthDataType.loginLog,
                 info: {
@@ -145,12 +168,12 @@ let UserService = class UserService {
                 const waitTime = Math.round(Math.pow(3, retries + 1));
                 return {
                     code: 410,
-                    message: `失败次数过多，请${waitTime}秒后重试`,
+                    message: (0, i18n_1.tf)('失败次数过多，请%s秒后重试', waitTime),
                     data: waitTime,
                 };
             }
             else {
-                return { code: 400, message: config_1.default.authError };
+                return { code: 400, message: (0, i18n_1.t)('错误的用户名密码，请重试') };
             }
         }
     }
@@ -195,16 +218,16 @@ let UserService = class UserService {
     }
     async updateUsernameAndPassword({ username, password, }) {
         if (password === 'admin') {
-            return { code: 400, message: '密码不能设置为admin' };
+            return { code: 400, message: (0, i18n_1.t)('密码不能设置为admin') };
         }
         const authInfo = await this.getAuthInfo();
         await this.updateAuthInfo(authInfo, { username, password });
-        return { code: 200, message: '更新成功' };
+        return { code: 200, message: (0, i18n_1.t)('更新成功') };
     }
     async updateAvatar(avatar) {
         const authInfo = await this.getAuthInfo();
         await this.updateAuthInfo(authInfo, { avatar });
-        return { code: 200, data: avatar, message: '更新成功' };
+        return { code: 200, data: avatar, message: (0, i18n_1.t)('更新成功') };
     }
     async initTwoFactor() {
         const secret = preset_default_1.authenticator.generateSecret();
@@ -228,7 +251,7 @@ let UserService = class UserService {
         const authInfo = await this.getAuthInfo();
         const { isTwoFactorChecking, twoFactorSecret } = authInfo;
         if (!isTwoFactorChecking) {
-            return { code: 450, message: '未知错误' };
+            return { code: 450, message: (0, i18n_1.t)('未知错误') };
         }
         const isValid = preset_default_1.authenticator.verify({
             token: code,
@@ -253,10 +276,10 @@ let UserService = class UserService {
                 lastaddr: address,
                 platform: req.platform,
             });
-            return { code: 430, message: '验证失败' };
+            return { code: 430, message: (0, i18n_1.t)('验证失败') };
         }
     }
-    async deactiveTwoFactor() {
+    async deactivateTwoFactor() {
         const authInfo = await this.getAuthInfo();
         await this.updateAuthInfo(authInfo, {
             twoFactorActivated: false,
@@ -307,7 +330,7 @@ let UserService = class UserService {
     }
     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,
@@ -316,7 +339,7 @@ let UserService = class UserService {
             return { code: 200, data: Object.assign(Object.assign({}, result), { code }) };
         }
         else {
-            return { code: 400, message: '通知发送失败，请检查参数' };
+            return { code: 400, message: (0, i18n_1.t)('通知发送失败，请检查参数') };
         }
     }
     normalizeTokens(tokens) {

package/static/build/shared/i18n.js

@@ -0,0 +1,145 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.tf = exports.t = exports.getLang = exports.setLang = void 0;
+const messages = {
+    zh: {},
+    en: {
+        '暂无权限': 'Access denied',
+        '参数错误': 'Invalid parameter',
+        '参数不正确': 'Invalid parameter',
+        '文件无法访问': 'File not accessible',
+        '文件不存在': 'File not found',
+        '路径不存在': 'Path does not exist',
+        '路径不正确': 'Invalid path',
+        '通知发送失败，请检查参数': 'Notification failed, check parameters',
+        '通知发送失败，请检查系统设置/通知配置': 'Notification failed, check system settings',
+        '通知发送成功': 'Notification sent successfully',
+        '设置时区失败': 'Failed to set timezone',
+        '任务未找到': 'Task not found',
+        '密码不能设置为admin': 'Password cannot be admin',
+        '更新成功': 'Update successful',
+        '未知错误': 'Unknown error',
+        '验证失败': 'Verification failed',
+        '实例不存在或已停止': 'Instance does not exist or stopped',
+        '实例已停止': 'Instance stopped',
+        '确认停止实例': 'Confirm to stop instance',
+        '确认停止运行实例': 'Confirm to stop running instance',
+        '确认停止': 'Confirm to stop',
+        '确认停止定时任务': 'Confirm to stop scheduled task',
+        '确认删除': 'Confirm to delete',
+        '确认删除定时任务': 'Confirm to delete scheduled task',
+        '确认删除选中的定时任务吗': 'Confirm to delete selected tasks?',
+        '确认运行': 'Confirm to run',
+        '确认运行定时任务': 'Confirm to run scheduled task',
+        '确认保存': 'Confirm to save',
+        '确认保存文件': 'Confirm to save file',
+        '确认重启': 'Confirm restart',
+        '确认启用': 'Confirm to enable',
+        '确认禁用': 'Confirm to disable',
+        '确认': 'Confirm',
+        '删除成功': 'Deleted successfully',
+        '操作成功': 'Operation successful',
+        '参数不完整': 'Incomplete parameters',
+        '默认路径不支持删除': 'Default path cannot be deleted',
+        '必须在日志目录下': 'Must be within log directory',
+        '备份数据上传成功，确认覆盖数据': 'Backup uploaded, confirm overwrite',
+        '如果恢复失败，可进入容器执行': 'If restore fails, run in container:',
+        '系统将在': 'System will',
+        '秒后自动刷新': 'refresh in seconds',
+        '生成数据中...': 'Generating data...',
+        '每条数据 name 或者 value 字段不能为空，参考导出文件格式': 'Each entry must have name and value, see export format',
+        '不支持当前依赖类型': 'Unsupported dependency type',
+        '依赖已存在': 'Dependency already exists',
+        '依赖不存在': 'Dependency does not exist',
+        '该脚本正在运行中': 'Script is running',
+        '该脚本未在运行中': 'Script is not running',
+        '文件内容为空': 'File content is empty',
+        '文件名不能为空': 'File name cannot be empty',
+        '标签不能为空': 'Label cannot be empty',
+        '名称不能为空': 'Name cannot be empty',
+        '名称不能为保留关键字': 'Name cannot be reserved keyword',
+        '名称已存在': 'Name already exists',
+        '密码错误': 'Incorrect password',
+        '用户不存在': 'User does not exist',
+        '请输入用户名和密码': 'Please enter username and password',
+        '无权访问': 'Access denied',
+        '登录成功': 'Login successful',
+        '退出成功': 'Logout successful',
+        'Token 已失效': 'Token expired',
+        'Token 无效': 'Invalid token',
+        '两步骤验证已开启': '2FA enabled',
+        '两步骤验证已关闭': '2FA disabled',
+        '验证码错误': 'Invalid verification code',
+        '验证码已过期': 'Verification code expired',
+        '请先开启两步骤验证': 'Please enable 2FA first',
+        '两步骤验证密钥不能为空': '2FA secret cannot be empty',
+        '用户已存在': 'User already exists',
+        '用户名不能为admin': 'Username cannot be admin',
+        '不能删除自己': 'Cannot delete yourself',
+        '不能禁用自己': 'Cannot disable yourself',
+        '文件路径无效': 'Invalid file path',
+        '保存成功': 'Saved successfully',
+        'client_id 或 client_seret 有误': 'Invalid client_id or client_secret',
+        '订阅执行完成': 'Subscription completed',
+        'wxPusher 服务的 TopicIds 和 Uids 至少配置一个才行': 'wxPusher requires at least one of TopicIds or Uids',
+        'Url 或者 Body 中必须包含 $title': 'Url or Body must contain $title',
+        '绝对路径必须在日志目录内或使用 /dev/null': 'Absolute path must be within log directory or use /dev/null',
+        '请先登录!': 'Please login first!',
+        '运行中...': 'Running...',
+        '日志不存在...': 'Log does not exist...',
+        '未分类': 'Uncategorized',
+        '任务重复运行': 'Duplicate task execution',
+        '日志设置为忽略': 'Log set to ignore',
+        '定时规则不能为空': 'Schedule rule cannot be empty',
+        '无效的定时规则': 'Invalid schedule rule',
+        '日志名称只能包含字母、数字、下划线和连字符': 'Log name can only contain letters, numbers, underscores, and hyphens',
+        '日志名称不能超过100个字符': 'Log name cannot exceed 100 characters',
+        '错误的用户名密码，请重试': 'Incorrect username or password, please try again',
+        '青龙快讯': 'QingLong',
+        '登录通知': 'Login Notification',
+        '你于': 'You at ',
+        '在': ' in ',
+        端: '',
+        登录失败: 'login failed',
+        '，ip地址': ', IP: ',
+        '任务#%s': 'Task#%s',
+        安装: 'Install',
+        删除: 'Uninstall',
+        成功: 'Succeeded',
+        失败: 'Failed',
+        '失败次数过多，请%s秒后重试': 'Too many failed attempts, please retry in %s seconds',
+        智能助手: 'Smart Assistant',
+        更多: 'More',
+        '开始%s依赖 %s，开始时间 %s\n\n当前系统不支持\n\n依赖%s失败，结束时间 %s，耗时 %s 秒': 'Start %s dependency %s, start time %s\n\nCurrent system not supported\n\nDependency %s failed, end time %s, elapsed %s seconds',
+        '检测到已经安装 %s\n\n%s\n\n跳过安装\n\n依赖%s成功，结束时间 %s，耗时 %s 秒': 'Already installed %s\n\n%s\n\nSkipping install\n\nDependency %s succeeded, end time %s, elapsed %s seconds',
+        '开始%s依赖 %s，开始时间 %s\n\n': 'Start %s dependency %s, start time %s\n\n',
+        '依赖%s%s，结束时间 %s，耗时 %s 秒': 'Dependency %s%s, end time %s, elapsed %s seconds',
+        '任务：%s，命令：%s，定时：%s，处于运行中的超过 %d 个，请检查定时设置': 'Task: %s, command: %s, schedule: %s, more than %d instances running, please check schedule settings',
+        青龙: 'QingLong',
+        '【蛟龙】测试通知 https://t.me/jiao_long': '[JiaoLong] Test notification https://t.me/jiao_long',
+        '生成token': 'Generate token',
+        '删除日志': 'Delete logs',
+    },
+};
+let currentLang = 'zh';
+function setLang(lang) {
+    currentLang = lang || 'zh';
+}
+exports.setLang = setLang;
+function getLang() {
+    return currentLang;
+}
+exports.getLang = getLang;
+function t(key, lang) {
+    const effectiveLang = lang || currentLang;
+    if (effectiveLang === 'en' && messages.en[key]) {
+        return messages.en[key];
+    }
+    return key;
+}
+exports.t = t;
+function tf(key, ...args) {
+    return args.reduce((str, arg) => str.replace(/%s|%d/, String(arg)), t(key));
+}
+exports.tf = tf;
+//# sourceMappingURL=i18n.js.map

package/static/build/shared/pLimit.js

@@ -8,10 +8,22 @@ 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"));
+const i18n_1 = require("../shared/i18n");
 const config_1 = __importDefault(require("../config"));
 const grpc_js_1 = require("@grpc/grpc-js");
 const api_1 = require("../protos/api");
+const grpcCerts_1 = require("../config/grpcCerts");
 class TaskLimit {
+    get client() {
+        if (!this._client) {
+            const tlsConfig = (0, grpcCerts_1.getGrpcCerts)();
+            const creds = tlsConfig
+                ? grpc_js_1.credentials.createSsl(Buffer.from(tlsConfig.caCert), Buffer.from(tlsConfig.clientKey), Buffer.from(tlsConfig.clientCert))
+                : grpc_js_1.credentials.createInsecure();
+            this._client = new api_1.ApiClient(`localhost:${config_1.default.grpcPort}`, creds, { 'grpc.enable_http_proxy': 0 });
+        }
+        return this._client;
+    }
     get cronLimitActiveCount() {
         return this.cronLimit.pending;
     }
@@ -42,7 +54,7 @@ class TaskLimit {
         this.systemLimit = new p_queue_cjs_1.default({
             concurrency: Math.max(os_1.default.cpus().length, 4),
         });
-        this.client = new api_1.ApiClient(`0.0.0.0:${config_1.default.grpcPort}`, grpc_js_1.credentials.createInsecure(), { 'grpc.enable_http_proxy': 0 });
+        this._client = null;
         this.notificationService = new notify_1.default();
         this.setCustomLimit();
         this.handleEvents();
@@ -106,8 +118,8 @@ class TaskLimit {
             if (repeatTimes < 3) {
                 this.repeatCronNotifyMap.set(cron.id, repeatTimes + 1);
                 this.client.systemNotify({
-                    title: '任务重复运行',
-                    content: `任务：${cron.name}，命令：${cron.command}，定时：${cron.schedule}，处于运行中的超过 5 个，请检查定时设置`,
+                    title: (0, i18n_1.t)('任务重复运行'),
+                    content: (0, i18n_1.tf)('任务：%s，命令：%s，定时：%s，处于运行中的超过 %d 个，请检查定时设置', cron.name || '', cron.command || '', cron.schedule || '', 5),
                 }, (err, res) => {
                     if (err) {
                         logger_1.default.error(`[schedule][任务重复运行] 通知失败 ${JSON.stringify(err)}`);

package/static/build/shared/runCron.js

@@ -9,6 +9,8 @@ const pLimit_1 = __importDefault(require("./pLimit"));
 const logger_1 = __importDefault(require("../loaders/logger"));
 const cron_1 = require("../data/cron");
 const util_1 = require("../config/util");
+const runningInstance_1 = require("../data/runningInstance");
+const dayjs_1 = __importDefault(require("dayjs"));
 function runCron(cmd, cron) {
     return pLimit_1.default.runWithCronLimit(cron, () => {
         return new Promise(async (resolve) => {
@@ -26,6 +28,9 @@ function runCron(cmd, cron) {
                         existingCron.status === cron_1.CrontabStatus.queued)) {
                     logger_1.default.info(`[schedule][停止已运行任务] 任务ID: ${cron.id}, PID: ${existingCron.pid}`);
                     await (0, util_1.killTask)(existingCron.pid);
+                    // Mark old running instances as stopped
+                    const stoppedAt = (0, dayjs_1.default)().unix();
+                    await runningInstance_1.RunningInstanceModel.update({ status: runningInstance_1.InstanceStatus.stopped, finished_at: stoppedAt }, { where: { cron_id: Number(cron.id), status: runningInstance_1.InstanceStatus.running } });
                     // Update the status to idle after killing
                     await cron_1.CrontabModel.update({ status: cron_1.CrontabStatus.idle, pid: undefined }, { where: { id: Number(cron.id) } });
                 }

package/static/build/validation/schedule.js

@@ -75,5 +75,6 @@ exports.commonCronSchema = {
         'string.unsafePath': '绝对路径必须在日志目录内或使用 /dev/null',
     }),
     allow_multiple_instances: celebrate_1.Joi.number().optional().valid(0, 1).allow(null),
+    work_dir: celebrate_1.Joi.string().optional().allow('').allow(null),
 };
 //# sourceMappingURL=schedule.js.map