@whyour/qinglong 2.20.2-3 → 2.21.0-10

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,16 +104,25 @@ let CronService = class CronService {
         if ((0, util_1.isDemoEnv)()) {
             return doc;
         }
-        if (!this.isSpecialSchedule(doc.schedule)) {
-            await client_1.default.addCron([
-                {
-                    name: doc.name || '',
-                    id: String(doc.id),
-                    schedule: doc.schedule,
-                    command: this.makeCommand(doc),
-                    extra_schedules: doc.extra_schedules || [],
-                },
-            ]);
+        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 (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;
@@ -107,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)]);
-        if (!this.isSpecialSchedule(newDoc.schedule)) {
-            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.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)) {
+            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;
@@ -126,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,
@@ -148,12 +209,46 @@ 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();
+                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: instanceStatus,
+                    exit_code: exit_code !== null && exit_code !== void 0 ? exit_code : undefined,
+                }, {
+                    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 } });
         }
     }
     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) {
@@ -308,7 +403,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 +513,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(), 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 },
+        });
+        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) => {
@@ -459,9 +582,7 @@ 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 } });
                     resolve(Object.assign(Object.assign({}, params), { pid: cp.pid, code }));
                 });
             });
@@ -469,13 +590,20 @@ 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) {
         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,
@@ -485,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) {
@@ -550,6 +689,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 +716,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 +762,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),
@@ -623,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();
@@ -632,7 +792,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/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/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(`[boot] 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);