@whyour/qinglong 2.20.2-2 → 2.21.0

package/static/build/data/runningInstance.js

@@ -0,0 +1,57 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RunningInstanceModel = exports.RunningInstance = exports.InstanceStatus = void 0;
+const _1 = require(".");
+const sequelize_1 = require("sequelize");
+var InstanceStatus;
+(function (InstanceStatus) {
+    InstanceStatus[InstanceStatus["running"] = 0] = "running";
+    InstanceStatus[InstanceStatus["finished"] = 1] = "finished";
+    InstanceStatus[InstanceStatus["stopped"] = 2] = "stopped";
+    InstanceStatus[InstanceStatus["error"] = 3] = "error";
+})(InstanceStatus || (exports.InstanceStatus = InstanceStatus = {}));
+class RunningInstance {
+    constructor(options) {
+        this.id = options.id;
+        this.cron_id = options.cron_id;
+        this.pid = options.pid;
+        this.log_path = options.log_path;
+        this.started_at = options.started_at;
+        this.finished_at = options.finished_at;
+        this.status = options.status;
+        this.exit_code = options.exit_code;
+    }
+}
+exports.RunningInstance = RunningInstance;
+exports.RunningInstanceModel = _1.sequelize.define('RunningInstance', {
+    cron_id: {
+        type: sequelize_1.DataTypes.NUMBER,
+        allowNull: false,
+    },
+    pid: {
+        type: sequelize_1.DataTypes.NUMBER,
+        allowNull: true,
+    },
+    log_path: {
+        type: sequelize_1.DataTypes.STRING,
+        allowNull: true,
+    },
+    started_at: {
+        type: sequelize_1.DataTypes.NUMBER,
+        allowNull: false,
+    },
+    finished_at: {
+        type: sequelize_1.DataTypes.NUMBER,
+        allowNull: true,
+    },
+    status: {
+        type: sequelize_1.DataTypes.NUMBER,
+        allowNull: false,
+        defaultValue: InstanceStatus.running,
+    },
+    exit_code: {
+        type: sequelize_1.DataTypes.NUMBER,
+        allowNull: true,
+    },
+});
+//# sourceMappingURL=runningInstance.js.map

package/static/build/loaders/app.js

@@ -15,7 +15,7 @@ exports.default = async ({ app }) => {
     logger_1.default.info('✌️ Dependency loaded');
     await (0, deps_1.default)();
     logger_1.default.info('✌️ Link deps loaded');
-    (0, initFile_1.default)();
+    await (0, initFile_1.default)();
     logger_1.default.info('✌️ Init file loaded');
     await (0, initData_1.default)();
     logger_1.default.info('✌️ Init data loaded');

package/static/build/loaders/db.js

@@ -11,6 +11,8 @@ const open_1 = require("../data/open");
 const system_1 = require("../data/system");
 const subscription_1 = require("../data/subscription");
 const cronView_1 = require("../data/cronView");
+const cronStats_1 = require("../data/cronStats");
+const runningInstance_1 = require("../data/runningInstance");
 const data_1 = require("../data");
 exports.default = async () => {
     try {
@@ -21,6 +23,8 @@ exports.default = async () => {
         await env_1.EnvModel.sync();
         await subscription_1.SubscriptionModel.sync();
         await cronView_1.CrontabViewModel.sync();
+        await cronStats_1.CrontabStatModel.sync();
+        await runningInstance_1.RunningInstanceModel.sync();
         // 初始化新增字段
         const migrations = [
             {
@@ -42,7 +46,9 @@ exports.default = async () => {
                 column: 'allow_multiple_instances',
                 type: 'NUMBER',
             },
+            { table: 'Crontabs', column: 'work_dir', type: 'VARCHAR(255)' },
             { table: 'Envs', column: 'isPinned', type: 'NUMBER' },
+            { table: 'Envs', column: 'labels', type: 'JSON' },
         ];
         for (const migration of migrations) {
             try {

package/static/build/loaders/express.js

@@ -16,6 +16,7 @@ const serverEnv_1 = require("../config/serverEnv");
 const store_1 = require("../shared/store");
 const auth_1 = require("../shared/auth");
 const path_1 = __importDefault(require("path"));
+const i18n_1 = require("../shared/i18n");
 exports.default = ({ app }) => {
     // Security: Enable strict routing to prevent case-insensitive path bypass
     app.set('case sensitive routing', true);
@@ -119,7 +120,7 @@ exports.default = ({ app }) => {
             isInitialized = false;
         }
         if (isInitialized) {
-            return res.send({ code: 450, message: '未知错误' });
+            return res.send({ code: 450, message: (0, i18n_1.t)('未知错误') });
         }
         else {
             return next();

package/static/build/loaders/initData.js

@@ -46,8 +46,10 @@ const open_1 = __importDefault(require("../services/open"));
 const store_1 = require("../shared/store");
 const logger_1 = __importDefault(require("./logger"));
 const open_2 = require("../data/open");
+const runningInstance_1 = require("../data/runningInstance");
+const i18n_1 = require("../shared/i18n");
 exports.default = async () => {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
     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);
@@ -61,11 +63,14 @@ exports.default = async () => {
     if (!systemApp) {
         systemApp = await open_2.AppModel.create({
             name: 'system',
-            scopes: ['crons', 'system'],
+            scopes: ['crons', 'system', 'dashboard'],
             client_id: (0, util_1.createRandomString)(12, 12),
             client_secret: (0, util_1.createRandomString)(24, 24),
         });
     }
+    else if (!systemApp.scopes.includes('dashboard')) {
+        await open_2.AppModel.update({ scopes: [...systemApp.scopes, 'dashboard'] }, { where: { name: 'system' } });
+    }
     const [systemConfig] = await system_1.SystemModel.findOrCreate({
         where: { type: system_1.AuthDataType.systemConfig },
     });
@@ -146,6 +151,8 @@ exports.default = async () => {
     });
     // 初始化更新所有任务状态为空闲
     await cron_1.CrontabModel.update({ status: cron_1.CrontabStatus.idle }, { where: {} });
+    // 清空所有运行中的实例记录（服务重启后进程已不存在）
+    await runningInstance_1.RunningInstanceModel.update({ status: runningInstance_1.InstanceStatus.stopped }, { where: { status: runningInstance_1.InstanceStatus.running } });
     // 初始化时执行一次所有的 ql repo 任务
     cron_1.CrontabModel.findAll({
         where: {
@@ -201,6 +208,16 @@ exports.default = async () => {
     });
     // 初始化保存一次ck和定时任务数据
     await cronService.autosave_crontab();
+    // 确保 lang_env.sh 存在，提供默认 QL_LANG
+    try {
+        const langEnvExist = await (0, util_1.fileExist)(config_1.default.langEnvFile);
+        if (!langEnvExist) {
+            const lang = ((_h = systemConfig.info) === null || _h === void 0 ? void 0 : _h.lang) || 'zh';
+            await (0, promises_1.writeFile)(config_1.default.langEnvFile, `export QL_LANG='${lang}'\n`);
+        }
+    }
+    catch (_k) { }
+    (0, i18n_1.setLang)(((_j = systemConfig.info) === null || _j === void 0 ? void 0 : _j.lang) || 'zh');
     await envService.set_envs();
     const authInfo = await userService.getAuthInfo();
     const apps = await openService.findApps();

package/static/build/loaders/initFile.js

@@ -22,6 +22,7 @@ const uploadPath = path_1.default.join(dataPath, 'upload/');
 const bakPath = path_1.default.join(dataPath, 'bak/');
 const samplePath = path_1.default.join(rootPath, 'sample/');
 const tmpPath = path_1.default.join(logPath, '.tmp/');
+const rootTmpPath = path_1.default.join(rootPath, '.tmp/');
 const confFile = path_1.default.join(configPath, 'config.sh');
 const sampleConfigFile = path_1.default.join(samplePath, 'config.sample.sh');
 const sampleTaskShellFile = path_1.default.join(samplePath, 'task.sample.sh');
@@ -45,6 +46,7 @@ const directories = [
     preloadPath,
     logPath,
     tmpPath,
+    rootTmpPath,
     uploadPath,
     sshPath,
     bakPath,

package/static/build/schedule/api.js

@@ -203,7 +203,7 @@ const normalizeCronData = (data) => {
     var _a, _b, _c, _d, _e;
     if (!data)
         return undefined;
-    return Object.assign(Object.assign({}, data), { sub_id: (_a = data.sub_id) !== null && _a !== void 0 ? _a : undefined, extra_schedules: (_b = data.extra_schedules) !== null && _b !== void 0 ? _b : undefined, pid: (_c = data.pid) !== null && _c !== void 0 ? _c : undefined, task_before: (_d = data.task_before) !== null && _d !== void 0 ? _d : undefined, task_after: (_e = data.task_after) !== null && _e !== void 0 ? _e : undefined });
+    return Object.assign(Object.assign({}, data), { sub_id: (_a = data.sub_id) !== null && _a !== void 0 ? _a : undefined, extra_schedules: (_b = data.extra_schedules) !== null && _b !== void 0 ? _b : [], pid: (_c = data.pid) !== null && _c !== void 0 ? _c : undefined, task_before: (_d = data.task_before) !== null && _d !== void 0 ? _d : undefined, task_after: (_e = data.task_after) !== null && _e !== void 0 ? _e : undefined });
 };
 const getCronDetail = async (call, callback) => {
     try {

package/static/build/schedule/client.js

@@ -6,9 +6,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const grpc_js_1 = require("@grpc/grpc-js");
 const cron_1 = require("../protos/cron");
 const config_1 = __importDefault(require("../config"));
+const grpcCerts_1 = require("../config/grpcCerts");
 class Client {
     constructor() {
-        this.client = new cron_1.CronClient(`0.0.0.0:${config_1.default.grpcPort}`, grpc_js_1.credentials.createInsecure(), { 'grpc.enable_http_proxy': 0 });
+        this._client = null;
+    }
+    get client() {
+        if (!this._client) {
+            const tlsConfig = (0, grpcCerts_1.getGrpcCerts)();
+            this._client = new cron_1.CronClient(`localhost:${config_1.default.grpcPort}`, grpc_js_1.credentials.createSsl(Buffer.from(tlsConfig.caCert), Buffer.from(tlsConfig.clientKey), Buffer.from(tlsConfig.clientCert)), { 'grpc.enable_http_proxy': 0 });
+        }
+        return this._client;
     }
     addCron(request) {
         return new Promise((resolve, reject) => {

package/static/build/schedule/health.js

@@ -9,7 +9,7 @@ const util_1 = require("../config/util");
 const check = async (call, callback) => {
     switch (call.request.service) {
         case 'cron':
-            const res = await (0, util_1.promiseExec)(`curl -s --noproxy '*' http://0.0.0.0:${config_1.default.port}/api/system`);
+            const res = await (0, util_1.promiseExec)(`curl -s --noproxy '*' http://localhost:${config_1.default.port}/api/system`);
             if (res.includes('200')) {
                 return callback(null, { status: 1 });
             }

package/static/build/services/config.js

@@ -39,16 +39,30 @@ const typedi_1 = require("typedi");
 const path_1 = __importStar(require("path"));
 const config_1 = __importDefault(require("../config"));
 const util_1 = require("../config/util");
+const i18n_1 = require("../shared/i18n");
 const undici_1 = require("undici");
 let ConfigService = class ConfigService {
     constructor() { }
     async getFile(filePath, res) {
         let content = '';
-        const avaliablePath = [config_1.default.rootPath, config_1.default.configPath].map((x) => path_1.default.resolve(x, filePath));
-        if (config_1.default.blackFileList.includes(filePath) ||
-            avaliablePath.every((x) => !x.startsWith(config_1.default.scriptPath) && !x.startsWith(config_1.default.configPath)) ||
-            !filePath) {
-            return res.send({ code: 403, message: '文件无法访问' });
+        if (!filePath) {
+            return res.send({ code: 403, message: (0, i18n_1.t)('文件无法访问') });
+        }
+        const normalized = path_1.default.normalize(filePath);
+        if (normalized.startsWith('..') || path_1.default.isAbsolute(normalized)) {
+            return res.send({ code: 403, message: (0, i18n_1.t)('文件无法访问') });
+        }
+        const resolvedRoot = path_1.default.resolve(config_1.default.rootPath, normalized);
+        const resolvedConfig = path_1.default.resolve(config_1.default.configPath, normalized);
+        const isValidPath = resolvedRoot.startsWith(config_1.default.scriptPath) ||
+            resolvedRoot.startsWith(config_1.default.configPath) ||
+            resolvedConfig.startsWith(config_1.default.scriptPath) ||
+            resolvedConfig.startsWith(config_1.default.configPath);
+        if (!isValidPath) {
+            return res.send({ code: 403, message: (0, i18n_1.t)('文件无法访问') });
+        }
+        if (config_1.default.blackFileList.includes(path_1.default.basename(normalized))) {
+            return res.send({ code: 403, message: (0, i18n_1.t)('文件无法访问') });
         }
         if (filePath.startsWith('sample/')) {
             const res = await (0, undici_1.request)(`https://gitlab.com/whyour/qinglong/-/raw/master/${filePath}`);

package/static/build/services/cron.js

@@ -19,6 +19,7 @@ const typedi_1 = require("typedi");
 const winston_1 = __importDefault(require("winston"));
 const config_1 = __importDefault(require("../config"));
 const cron_1 = require("../data/cron");
+const runningInstance_1 = require("../data/runningInstance");
 const child_process_1 = require("child_process");
 const promises_1 = __importDefault(require("fs/promises"));
 const cron_parser_1 = __importDefault(require("cron-parser"));
@@ -33,8 +34,10 @@ const dayjs_1 = __importDefault(require("dayjs"));
 const pickBy_1 = __importDefault(require("lodash/pickBy"));
 const omit_1 = __importDefault(require("lodash/omit"));
 const utils_1 = require("../shared/utils");
+const i18n_1 = require("../shared/i18n");
 const schedule_1 = require("../interface/schedule");
 const logStreamManager_1 = require("../shared/logStreamManager");
+const lodash_1 = require("lodash");
 let CronService = class CronService {
     constructor(logger) {
         this.logger = logger;
@@ -46,6 +49,26 @@ let CronService = class CronService {
         }
         return false;
     }
+    get schedulerMode() {
+        const env = process.env.QL_SCHEDULER;
+        if (env === 'system')
+            return 'system';
+        if (env === 'node')
+            return 'node';
+        try {
+            (0, child_process_1.execSync)('which crond', { stdio: 'ignore' });
+            return 'system';
+        }
+        catch (_a) {
+            return 'node';
+        }
+    }
+    shouldUseCronClient(cron) {
+        if (this.schedulerMode === 'node') {
+            return !this.isSpecialSchedule(cron.schedule);
+        }
+        return this.isNodeCron(cron) && !this.isSpecialSchedule(cron.schedule);
+    }
     isOnceSchedule(schedule) {
         return schedule === null || schedule === void 0 ? void 0 : schedule.startsWith(schedule_1.ScheduleType.ONCE);
     }
@@ -81,7 +104,7 @@ let CronService = class CronService {
         if ((0, util_1.isDemoEnv)()) {
             return doc;
         }
-        if (!this.isSpecialSchedule(doc.schedule)) {
+        if (this.shouldUseCronClient(doc)) {
             await client_1.default.addCron([
                 {
                     name: doc.name || '',
@@ -108,7 +131,7 @@ let CronService = class CronService {
             return newDoc;
         }
         await client_1.default.delCron([String(newDoc.id)]);
-        if (!this.isSpecialSchedule(newDoc.schedule)) {
+        if (this.shouldUseCronClient(newDoc)) {
             await client_1.default.addCron([
                 {
                     name: doc.name || '',
@@ -148,6 +171,31 @@ let CronService = class CronService {
             if (status === cron_1.CrontabStatus.idle && log_path !== cron.log_path) {
                 options = (0, omit_1.default)(options, ['status', 'log_path', 'pid']);
             }
+            // Manage RunningInstance records for status transitions from shell scripts
+            if (status === cron_1.CrontabStatus.running) {
+                // Create a new running instance record
+                await runningInstance_1.RunningInstanceModel.create({
+                    cron_id: id,
+                    pid: pid || undefined,
+                    log_path: log_path || undefined,
+                    started_at: last_execution_time || (0, dayjs_1.default)().unix(),
+                    status: runningInstance_1.InstanceStatus.running,
+                });
+            }
+            else if (status === cron_1.CrontabStatus.idle) {
+                // Mark the matching running instance as finished
+                const finishedAt = (0, dayjs_1.default)().unix();
+                await runningInstance_1.RunningInstanceModel.update({
+                    finished_at: finishedAt,
+                    status: runningInstance_1.InstanceStatus.finished,
+                }, {
+                    where: {
+                        cron_id: id,
+                        pid: pid || undefined,
+                        status: runningInstance_1.InstanceStatus.running,
+                    },
+                });
+            }
             await cron_1.CrontabModel.update(Object.assign({}, (0, pickBy_1.default)(options, (v) => v === 0 || !!v)), { where: { id } });
         }
     }
@@ -308,7 +356,7 @@ let CronService = class CronService {
         }
     }
     formatFilterQuery(query, filterQuery) {
-        if (filterQuery) {
+        if (!(0, lodash_1.isEmpty)(filterQuery)) {
             if (!query[sequelize_1.Op.and]) {
                 query[sequelize_1.Op.and] = [];
             }
@@ -418,8 +466,36 @@ let CronService = class CronService {
                 this.logger.error(`[panel][停止任务失败] 任务ID: ${doc.id}, 错误: ${error}`);
             }
         }
+        // Mark all running instances as stopped
+        const finishedAt = (0, dayjs_1.default)().unix();
+        await runningInstance_1.RunningInstanceModel.update({ status: runningInstance_1.InstanceStatus.stopped, finished_at: finishedAt }, { where: { cron_id: ids, status: runningInstance_1.InstanceStatus.running } });
         await cron_1.CrontabModel.update({ status: cron_1.CrontabStatus.idle, pid: undefined }, { where: { id: ids } });
     }
+    async stopInstance(instanceId) {
+        const instance = await runningInstance_1.RunningInstanceModel.findOne({
+            where: { id: instanceId, status: runningInstance_1.InstanceStatus.running },
+        });
+        if (!instance) {
+            return { code: 400, message: (0, i18n_1.t)('实例不存在或已停止') };
+        }
+        if (instance.pid) {
+            try {
+                await (0, util_1.killTask)(instance.pid);
+            }
+            catch (error) {
+                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 } });
+        // 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 },
+        });
+        if (otherRunning === 0) {
+            await cron_1.CrontabModel.update({ status: cron_1.CrontabStatus.idle, pid: undefined }, { where: { id: instance.cron_id } });
+        }
+        return { code: 200, message: (0, i18n_1.t)('实例已停止') };
+    }
     async runSingle(cronId) {
         return pLimit_1.default.manualRunWithCronLimit(() => {
             return new Promise(async (resolve) => {
@@ -445,6 +521,14 @@ 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());
@@ -459,9 +543,20 @@ let CronService = class CronService {
                 });
                 cp.on('exit', async (code) => {
                     this.logger.info('[panel][执行任务结束] 参数: %s, 退出码: %j', JSON.stringify(params), code);
-                    // Close the stream after task completion
                     await logStreamManager_1.logStreamManager.closeStream(absolutePath);
-                    await cron_1.CrontabModel.update({ status: cron_1.CrontabStatus.idle, pid: undefined }, { where: { id } });
+                    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 }));
                 });
             });
@@ -475,7 +570,9 @@ let CronService = class CronService {
     async enabled(ids) {
         await cron_1.CrontabModel.update({ isDisabled: 0 }, { where: { id: ids } });
         const docs = await cron_1.CrontabModel.findAll({ where: { id: ids } });
-        const crons = docs.map((doc) => ({
+        const crons = docs
+            .filter((x) => this.shouldUseCronClient(x))
+            .map((doc) => ({
             name: doc.name || '',
             id: String(doc.id),
             schedule: doc.schedule,
@@ -550,6 +647,9 @@ let CronService = class CronService {
                 .replace(/;? *\n/g, ';')
                 .trim()}' `;
         }
+        if (tab.work_dir) {
+            commandVariable += `work_dir='${tab.work_dir.replace(/'/g, "'\\''")}' `;
+        }
         const crontab_job_string = `${commandVariable}${command}`;
         return crontab_job_string;
     }
@@ -574,6 +674,15 @@ let CronService = class CronService {
             }
         });
         await (0, utils_1.writeFileWithLock)(config_1.default.crontabFile, crontab_string);
+        if (this.schedulerMode === 'system') {
+            try {
+                (0, child_process_1.execSync)(`crontab ${config_1.default.crontabFile}`);
+            }
+            catch (error) {
+                const errorMsg = error.message || String(error);
+                this.logger.error('[crontab] Failed to update system crontab:', errorMsg);
+            }
+        }
         await cron_1.CrontabModel.update({ saved: true }, { where: {} });
     }
     importCrontab() {
@@ -611,7 +720,8 @@ let CronService = class CronService {
     async autosave_crontab() {
         const tabs = await this.crontabs();
         const regularCrons = tabs.data
-            .filter((x) => x.isDisabled !== 1 && !this.isSpecialSchedule(x.schedule))
+            .filter((x) => x.isDisabled !== 1 &&
+            this.shouldUseCronClient(x))
             .map((doc) => ({
             name: doc.name || '',
             id: String(doc.id),
@@ -632,7 +742,7 @@ let CronService = class CronService {
         if (bootTasks.length > 0) {
             await cron_1.CrontabModel.update({ status: cron_1.CrontabStatus.queued }, { where: { id: bootTasks.map((t) => t.id) } });
             for (const task of bootTasks) {
-                await this.runSingle(task.id);
+                this.runSingle(task.id);
             }
         }
     }

package/static/build/services/env.js

@@ -33,7 +33,7 @@ let EnvService = class EnvService {
         if (envs &&
             envs.length > 0 &&
             typeof envs[envs.length - 1].position === 'number') {
-            position = envs[envs.length - 1].position;
+            position = this.getPrecisionPosition(envs[envs.length - 1].position);
         }
         const tabs = payloads.map((x) => {
             position = position - env_1.stepPosition;
@@ -90,7 +90,7 @@ let EnvService = class EnvService {
         return newDoc;
     }
     async checkPosition(position, edge = 0) {
-        const precisionPosition = parseFloat(position.toPrecision(16));
+        const precisionPosition = this.getPrecisionPosition(position);
         if (precisionPosition < env_1.minPosition ||
             precisionPosition > env_1.maxPosition ||
             Math.abs(precisionPosition - edge) < env_1.minPosition) {
@@ -103,7 +103,7 @@ let EnvService = class EnvService {
         }
     }
     getPrecisionPosition(position) {
-        return parseFloat(position.toPrecision(16));
+        return Math.trunc(parseFloat(position.toPrecision(16)));
     }
     async envs(searchText = '', query = {}) {
         let condition = Object.assign({}, query);
@@ -171,6 +171,34 @@ let EnvService = class EnvService {
     async unPin(ids) {
         await env_1.EnvModel.update({ isPinned: 0 }, { where: { id: ids } });
     }
+    async addLabels(ids, labels) {
+        await data_1.sequelize.transaction(async (transaction) => {
+            const docs = await env_1.EnvModel.findAll({
+                where: { id: ids },
+                transaction,
+            });
+            for (const doc of docs) {
+                const env = doc.get({ plain: true });
+                await env_1.EnvModel.update({ labels: Array.from(new Set([...(env.labels || []), ...labels])) }, { where: { id: env.id }, transaction });
+            }
+        });
+        return await this.find({ id: ids });
+    }
+    async removeLabels(ids, labels) {
+        await data_1.sequelize.transaction(async (transaction) => {
+            const docs = await env_1.EnvModel.findAll({
+                where: { id: ids },
+                transaction,
+            });
+            for (const doc of docs) {
+                const env = doc.get({ plain: true });
+                await env_1.EnvModel.update({
+                    labels: (env.labels || []).filter((label) => !labels.includes(label)),
+                }, { where: { id: env.id }, transaction });
+            }
+        });
+        return await this.find({ id: ids });
+    }
     async set_envs() {
         const envs = await this.envs('', {
             name: { [sequelize_1.Op.not]: null },

package/static/build/services/grpc.js

@@ -46,23 +46,49 @@ const util_1 = require("util");
 const config_1 = __importDefault(require("../config"));
 const metrics_1 = require("./metrics");
 const typedi_1 = require("typedi");
+const grpcCerts_1 = require("../config/grpcCerts");
 let GrpcServerService = class GrpcServerService {
     constructor() {
         this.server = new grpc_js_1.Server({ 'grpc.enable_http_proxy': 0 });
     }
+    formatGrpcAddress(host, port) {
+        if (host === '::') {
+            return `[::]:${port}`;
+        }
+        return `${host}:${port}`;
+    }
     async initialize() {
         try {
             this.server.addService(health_1.HealthService, { check: health_2.check });
             this.server.addService(cron_1.CronService, { addCron: addCron_1.addCron, delCron: delCron_1.delCron });
             this.server.addService(api_1.ApiService, Api);
+            const tlsConfig = await (0, grpcCerts_1.initGrpcCerts)();
+            const credentials = grpc_js_1.ServerCredentials.createSsl(Buffer.from(tlsConfig.caCert), [{ cert_chain: Buffer.from(tlsConfig.serverCert), private_key: Buffer.from(tlsConfig.serverKey) }], true);
             const grpcPort = config_1.default.grpcPort;
+            const hostsToTry = [
+                config_1.default.bindHostGrpc,
+                ...(config_1.default.bindHostGrpc !== '0.0.0.0' ? ['0.0.0.0'] : [])
+            ];
             const bindAsync = (0, util_1.promisify)(this.server.bindAsync).bind(this.server);
-            await bindAsync(`0.0.0.0:${grpcPort}`, grpc_js_1.ServerCredentials.createInsecure());
-            logger_1.default.debug(`✌️ gRPC service started successfully`);
-            metrics_1.metricsService.record('grpc_service_start', 1, {
-                port: grpcPort.toString(),
-            });
-            return grpcPort;
+            let lastError = null;
+            for (const host of hostsToTry) {
+                try {
+                    const address = this.formatGrpcAddress(host, grpcPort);
+                    await bindAsync(address, credentials);
+                    logger_1.default.debug(`✌️ gRPC service started successfully on ${address}`);
+                    metrics_1.metricsService.record('grpc_service_start', 1, {
+                        port: grpcPort.toString(),
+                        host
+                    });
+                    return grpcPort;
+                }
+                catch (err) {
+                    lastError = err;
+                    logger_1.default.warn(`Failed to bind gRPC on ${host}:${grpcPort}, trying next...`, err);
+                }
+            }
+            logger_1.default.error('Failed to start gRPC service on all hosts');
+            throw lastError || new Error('Failed to start gRPC service');
         }
         catch (err) {
             logger_1.default.error('Failed to start gRPC service:', err);