@whyour/qinglong 2.20.2-2 → 2.21.0

package/static/build/services/http.js

@@ -13,31 +13,46 @@ exports.HttpServerService = void 0;
 const logger_1 = __importDefault(require("../loaders/logger"));
 const metrics_1 = require("./metrics");
 const typedi_1 = require("typedi");
+const config_1 = __importDefault(require("../config"));
 let HttpServerService = class HttpServerService {
     constructor() {
         this.server = undefined;
     }
     async initialize(expressApp, port) {
-        try {
-            return new Promise((resolve, reject) => {
-                var _a;
-                this.server = expressApp.listen(port, '0.0.0.0', () => {
-                    logger_1.default.debug(`✌️ HTTP service started successfully`);
-                    metrics_1.metricsService.record('http_service_start', 1, {
-                        port: port.toString(),
-                    });
-                    resolve(this.server);
-                });
-                (_a = this.server) === null || _a === void 0 ? void 0 : _a.on('error', (err) => {
-                    logger_1.default.error('Failed to start HTTP service:', err);
-                    reject(err);
+        const hostsToTry = [
+            config_1.default.bindHost,
+            ...(config_1.default.bindHost !== '0.0.0.0' ? ['0.0.0.0'] : [])
+        ];
+        let lastError = null;
+        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}`);
+                metrics_1.metricsService.record('http_service_start', 1, {
+                    port: port.toString(),
+                    host
                 });
-            });
-        }
-        catch (err) {
-            logger_1.default.error('Failed to start HTTP service:', err);
-            throw err;
+                this.server = server;
+                return server;
+            }
+            catch (err) {
+                lastError = err;
+                logger_1.default.warn(`Failed to bind HTTP on ${host}:${port}, trying next...`, err);
+            }
         }
+        logger_1.default.error('Failed to start HTTP service on all hosts');
+        throw lastError || new Error('Failed to start HTTP service');
+    }
+    async tryListen(expressApp, port, host) {
+        return new Promise((resolve, reject) => {
+            const server = expressApp.listen(port, host, () => {
+                resolve(server);
+            });
+            server.on('error', (err) => {
+                server.close();
+                reject(err);
+            });
+        });
     }
     async shutdown() {
         try {

package/static/build/services/notify.js

@@ -27,6 +27,7 @@ const crypto_1 = __importDefault(require("crypto"));
 const nodemailer_1 = __importDefault(require("nodemailer"));
 const typedi_1 = require("typedi");
 const util_1 = require("../config/util");
+const i18n_1 = require("../shared/i18n");
 const user_1 = __importDefault(require("./user"));
 const http_1 = require("../config/http");
 const undici_1 = require("undici");
@@ -54,6 +55,7 @@ let NotificationService = class NotificationService {
             ['chronocat', this.chronocat],
             ['ntfy', this.ntfy],
             ['wxPusherBot', this.wxPusherBot],
+            ['openiLink', this.openiLink],
         ]);
         this.title = '';
         this.content = '';
@@ -97,6 +99,13 @@ let NotificationService = class NotificationService {
         }
         return true;
     }
+    parseMailRecipients(value) {
+        const recipients = (value || '')
+            .split(/[;；]/)
+            .map((item) => item.trim())
+            .filter(Boolean);
+        return recipients.length > 0 ? recipients : undefined;
+    }
     async gotify() {
         const { gotifyUrl, gotifyToken, gotifyPriority = 1 } = this.params;
         try {
@@ -488,6 +497,7 @@ let NotificationService = class NotificationService {
     }
     async email() {
         const { emailPass, emailService, emailUser, emailTo } = this.params;
+        const recipients = this.parseMailRecipients(emailTo) || emailUser;
         try {
             const transporter = nodemailer_1.default.createTransport({
                 service: emailService,
@@ -498,7 +508,7 @@ let NotificationService = class NotificationService {
             });
             const info = await transporter.sendMail({
                 from: `"青龙快讯" <${emailUser}>`,
-                to: emailTo ? emailTo.split(';') : emailUser,
+                to: recipients,
                 subject: `${this.title}`,
                 html: `${this.content.replace(/\n/g, '<br/>')}`,
             });
@@ -586,7 +596,7 @@ let NotificationService = class NotificationService {
             : [];
         // topic_ids 和 uids 至少要有一个
         if (!topicIds.length && !uids.length) {
-            throw new Error('wxPusher 服务的 TopicIds 和 Uids 至少配置一个才行');
+            throw new Error((0, i18n_1.t)('wxPusher 服务的 TopicIds 和 Uids 至少配置一个才行'));
         }
         const url = `https://wxpusher.zjiecode.com/api/send/message`;
         try {
@@ -665,7 +675,7 @@ let NotificationService = class NotificationService {
         var _a;
         const { webhookUrl, webhookBody, webhookHeaders, webhookMethod, webhookContentType, } = this.params;
         if (!(webhookUrl === null || webhookUrl === void 0 ? void 0 : webhookUrl.includes('$title')) && !(webhookBody === null || webhookBody === void 0 ? void 0 : webhookBody.includes('$title'))) {
-            throw new Error('Url 或者 Body 中必须包含 $title');
+            throw new Error((0, i18n_1.t)('Url 或者 Body 中必须包含 $title'));
         }
         const headers = (0, util_1.parseHeaders)(webhookHeaders);
         const body = (0, util_1.parseBody)(webhookBody, webhookContentType, (v) => { var _a; return (_a = v === null || v === void 0 ? void 0 : v.replaceAll('$title', this.title)) === null || _a === void 0 ? void 0 : _a.replaceAll('$content', this.content); });
@@ -700,6 +710,33 @@ let NotificationService = class NotificationService {
         }
         return {};
     }
+    async openiLink() {
+        const { openiLinkAppToken, openiLinkHubUrl, openiLinkContextToken } = this.params;
+        const baseUrl = (openiLinkHubUrl === null || openiLinkHubUrl === void 0 ? void 0 : openiLinkHubUrl.replace(/\/$/, '')) || 'https://hub.openilink.com';
+        const url = `${baseUrl}/bot/v1/message/send`;
+        const body = {
+            type: 'text',
+            content: `${this.title}\n\n${this.content}`,
+        };
+        if (openiLinkContextToken) {
+            body.context_token = openiLinkContextToken;
+        }
+        try {
+            const res = await http_1.httpClient.post(url, Object.assign(Object.assign({}, this.gotOption), { json: body, headers: {
+                    'Content-Type': 'application/json',
+                    Authorization: `Bearer ${openiLinkAppToken}`,
+                } }));
+            if (res.ok) {
+                return true;
+            }
+            else {
+                throw new Error(JSON.stringify(res));
+            }
+        }
+        catch (error) {
+            throw new Error(error.response ? error.response.body : error);
+        }
+    }
 };
 __decorate([
     (0, typedi_1.Inject)((type) => user_1.default),

package/static/build/services/open.js

@@ -22,6 +22,7 @@ const open_1 = require("../data/open");
 const uuid_1 = require("uuid");
 const sequelize_1 = require("sequelize");
 const store_1 = require("../shared/store");
+const i18n_1 = require("../shared/i18n");
 let OpenService = class OpenService {
     constructor(logger) {
         this.logger = logger;
@@ -141,7 +142,7 @@ let OpenService = class OpenService {
             };
         }
         else {
-            return { code: 400, message: 'client_id 或 client_seret 有误' };
+            return { code: 400, message: (0, i18n_1.t)('client_id 或 client_seret 有误') };
         }
     }
     async generateSystemToken() {

package/static/build/services/sshKey.js

@@ -48,9 +48,12 @@ let SshKeyService = class SshKeyService {
     }
     async generatePrivateKeyFile(alias, key) {
         try {
-            await (0, utils_1.writeFileWithLock)(path_1.default.join(this.sshPath, alias), `${key}${os_1.default.EOL}`, {
-                mode: '400',
-            });
+            const filePath = path_1.default.join(this.sshPath, alias);
+            try {
+                await (0, util_1.rmPath)(filePath);
+            }
+            catch (_a) { }
+            await (0, utils_1.writeFileWithLock)(filePath, `${key}${os_1.default.EOL}`, { mode: '400' });
         }
         catch (error) {
             this.logger.error('生成私钥文件失败', error);

package/static/build/services/subscription.js

@@ -48,6 +48,7 @@ const sequelize_1 = require("sequelize");
 const path_1 = __importStar(require("path"));
 const schedule_1 = __importDefault(require("./schedule"));
 const sock_1 = __importDefault(require("./sock"));
+const i18n_1 = require("../shared/i18n");
 const sshKey_1 = __importDefault(require("./sshKey"));
 const const_1 = require("../config/const");
 const subscription_2 = require("../config/subscription");
@@ -171,7 +172,7 @@ let SubscriptionService = class SubscriptionService {
                 await subscription_1.SubscriptionModel.update({ status: subscription_1.SubscriptionStatus.idle, pid: undefined }, { where: { id: sub.id } });
                 this.sockService.sendMessage({
                     type: 'runSubscriptionEnd',
-                    message: '订阅执行完成',
+                    message: (0, i18n_1.t)('订阅执行完成'),
                     references: [doc.id],
                 });
             },

package/static/build/services/system.js

@@ -44,6 +44,7 @@ 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 i18n_1 = require("../shared/i18n");
 const util_2 = require("../config/util");
 let SystemService = class SystemService {
     constructor(logger, scheduleService, sockService) {
@@ -80,7 +81,7 @@ let SystemService = class SystemService {
             return { code: 200, data: Object.assign(Object.assign({}, result), { code }) };
         }
         else {
-            return { code: 400, message: '通知发送失败，请检查参数' };
+            return { code: 400, message: (0, i18n_1.t)('通知发送失败，请检查参数') };
         }
     }
     async updateLogRemoveFrequency(info) {
@@ -302,10 +303,10 @@ let SystemService = class SystemService {
         }
         const isSuccess = await this.notificationService.notify(title, content, notificationInfo);
         if (isSuccess) {
-            return { code: 200, message: '通知发送成功' };
+            return { code: 200, message: (0, i18n_1.t)('通知发送成功') };
         }
         else {
-            return { code: 400, message: '通知发送失败，请检查系统设置/通知配置' };
+            return { code: 400, message: (0, i18n_1.t)('通知发送失败，请检查系统设置/通知配置') };
         }
     }
     async run({ command, logPath }, callback) {
@@ -321,7 +322,7 @@ let SystemService = class SystemService {
     }
     async stop({ command, pid }) {
         if (!pid && !command) {
-            return { code: 400, message: '参数错误' };
+            return { code: 400, message: (0, i18n_1.t)('参数错误') };
         }
         if (pid) {
             await (0, util_1.killTask)(pid);
@@ -336,7 +337,7 @@ let SystemService = class SystemService {
             return { code: 200 };
         }
         else {
-            return { code: 400, message: '任务未找到' };
+            return { code: 400, message: (0, i18n_1.t)('任务未找到') };
         }
     }
     async exportData(res, type) {
@@ -411,9 +412,23 @@ let SystemService = class SystemService {
             return { code: 200, data: info };
         }
         else {
-            return { code: 400, message: '设置时区失败' };
+            return { code: 400, message: (0, i18n_1.t)('设置时区失败') };
         }
     }
+    async updateLanguage(info) {
+        const oDoc = await this.getSystemConfig();
+        const lang = info.lang || 'zh';
+        await this.updateAuthDb(Object.assign(Object.assign({}, oDoc), { info: Object.assign(Object.assign({}, oDoc.info), { lang }) }));
+        // Write to standalone lang_env.sh, sourced by shell scripts
+        try {
+            await fs_1.default.promises.writeFile(config_1.default.langEnvFile, `export QL_LANG='${lang}'\n`);
+        }
+        catch (error) {
+            this.logger.error(`Failed to write lang_env.sh: ${error}`);
+        }
+        (0, i18n_1.setLang)(lang);
+        return { code: 200, data: { lang } };
+    }
     async updateGlobalSshKey(info) {
         const oDoc = await this.getSystemConfig();
         const result = await this.updateAuthDb(Object.assign(Object.assign({}, oDoc), { info: Object.assign(Object.assign({}, oDoc.info), info) }));
@@ -431,7 +446,7 @@ let SystemService = class SystemService {
     }
     async cleanDependence(type) {
         if (!type || !['node', 'python3'].includes(type)) {
-            return { code: 400, message: '参数错误' };
+            return { code: 400, message: (0, i18n_1.t)('参数错误') };
         }
         try {
             const finalPath = path_1.default.join(config_1.default.dependenceCachePath, type);

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;
@@ -195,16 +196,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 +229,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 +254,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,
@@ -316,7 +317,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,105 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+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',
+    },
+};
+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;
+//# sourceMappingURL=i18n.js.map

package/static/build/shared/pLimit.js

@@ -11,7 +11,18 @@ const notify_1 = __importDefault(require("../services/notify"));
 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 +53,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();

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