@whyour/qinglong 2.18.3-3 → 2.19.0-0

package/static/build/config/util.js

@@ -29,20 +29,21 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateLinuxMirrorFile = exports.detectOS = exports.setSystemTimezone = exports.rmPath = exports.safeJSONParse = exports.getUniqPath = exports.parseContentVersion = exports.parseVersion = exports.getPid = exports.killTask = exports.psTree = exports.parseBody = exports.parseHeaders = exports.promiseExecSuccess = exports.promiseExec = exports.readDir = exports.readDirs = exports.dirSort = exports.concurrentRun = exports.handleLogPath = exports.createFile = exports.fileExist = exports.getPlatform = exports.getNetIp = exports.getToken = exports.getLastModifyFilePath = exports.removeAnsi = exports.getFileContentByName = void 0;
+exports.updateLinuxMirrorFile = exports.detectOS = exports.isDemoEnv = exports.getUninstallCommand = exports.getInstallCommand = exports.setSystemTimezone = exports.rmPath = exports.safeJSONParse = exports.getUniqPath = exports.parseContentVersion = exports.parseVersion = exports.getPid = exports.killTask = exports.psTree = exports.parseBody = exports.parseHeaders = exports.promiseExecSuccess = exports.promiseExec = exports.readDir = exports.readDirs = exports.dirSort = exports.concurrentRun = exports.handleLogPath = exports.createFile = exports.fileExist = exports.getPlatform = exports.getNetIp = exports.getToken = exports.getLastModifyFilePath = exports.removeAnsi = exports.getFileContentByName = void 0;
 const fs = __importStar(require("fs/promises"));
 const path = __importStar(require("path"));
 const got_1 = __importDefault(require("got"));
 const iconv_lite_1 = __importDefault(require("iconv-lite"));
 const child_process_1 = require("child_process");
 const form_data_1 = __importDefault(require("form-data"));
-const pstree_remy_1 = __importDefault(require("pstree.remy"));
+const ps_tree_1 = __importDefault(require("ps-tree"));
 const util_1 = require("util");
 const js_yaml_1 = require("js-yaml");
 const index_1 = __importDefault(require("./index"));
 const const_1 = require("./const");
 const logger_1 = __importDefault(require("../loaders/logger"));
 const utils_1 = require("../shared/utils");
+const dependence_1 = require("../data/dependence");
 const os_1 = __importDefault(require("os"));
 __exportStar(require("./share"), exports);
 let osType;
@@ -301,22 +302,47 @@ async function readDirs(dir, baseDir = '', blacklist = [], sort = dirSort) {
 }
 exports.readDirs = readDirs;
 async function readDir(dir, baseDir = '', blacklist = []) {
-    const relativePath = path.relative(baseDir, dir);
-    const files = await fs.readdir(dir);
-    const result = files
-        .filter((x) => !blacklist.includes(x))
-        .map(async (file) => {
-        const subPath = path.join(dir, file);
-        const stats = await fs.lstat(subPath);
-        const key = path.join(relativePath, file);
-        return {
-            title: file,
-            type: stats.isDirectory() ? 'directory' : 'file',
-            key,
-            parent: relativePath,
-        };
-    });
-    return result;
+    const absoluteDir = path.join(baseDir, dir);
+    const relativePath = path.relative(baseDir, absoluteDir);
+    try {
+        const files = await fs.readdir(absoluteDir);
+        const result = [];
+        for (const file of files) {
+            const subPath = path.join(absoluteDir, file);
+            const stats = await fs.lstat(subPath);
+            const key = path.join(relativePath, file);
+            if (blacklist.includes(file) || stats.isSymbolicLink()) {
+                continue;
+            }
+            if (stats.isDirectory()) {
+                result.push({
+                    title: file,
+                    type: 'directory',
+                    key,
+                    parent: relativePath,
+                    createTime: stats.birthtime.getTime(),
+                    children: [],
+                });
+            }
+            else {
+                result.push({
+                    title: file,
+                    type: 'file',
+                    key,
+                    parent: relativePath,
+                    size: stats.size,
+                    createTime: stats.birthtime.getTime(),
+                });
+            }
+        }
+        return result;
+    }
+    catch (error) {
+        if (error.code === 'ENOENT') {
+            return [];
+        }
+        throw error;
+    }
 }
 exports.readDir = readDir;
 async function promiseExec(command) {
@@ -408,11 +434,11 @@ function parseBody(body, contentType, valueFormatFn) {
 exports.parseBody = parseBody;
 function psTree(pid) {
     return new Promise((resolve, reject) => {
-        (0, pstree_remy_1.default)(pid, (err, pids) => {
+        (0, ps_tree_1.default)(pid, (err, children) => {
             if (err) {
                 reject(err);
             }
-            resolve(pids.filter((x) => !isNaN(x)));
+            resolve(children.map((x) => Number(x.PID)).filter((x) => !isNaN(x)));
         });
     });
 }
@@ -517,6 +543,32 @@ async function setSystemTimezone(timezone) {
     }
 }
 exports.setSystemTimezone = setSystemTimezone;
+function getInstallCommand(type, name) {
+    const baseCommands = {
+        [dependence_1.DependenceTypes.nodejs]: 'pnpm add -g',
+        [dependence_1.DependenceTypes.python3]: 'pip3 install --disable-pip-version-check --root-user-action=ignore',
+        [dependence_1.DependenceTypes.linux]: 'apt install -y',
+    };
+    let command = baseCommands[type];
+    if (type === dependence_1.DependenceTypes.python3 && const_1.PYTHON_INSTALL_DIR) {
+        command = `${command} --prefix=${const_1.PYTHON_INSTALL_DIR}`;
+    }
+    return `${command} ${name.trim()}`;
+}
+exports.getInstallCommand = getInstallCommand;
+function getUninstallCommand(type, name) {
+    const baseCommands = {
+        [dependence_1.DependenceTypes.nodejs]: 'pnpm remove -g',
+        [dependence_1.DependenceTypes.python3]: 'pip3 uninstall --disable-pip-version-check --root-user-action=ignore -y',
+        [dependence_1.DependenceTypes.linux]: 'apt remove -y',
+    };
+    return `${baseCommands[type]} ${name.trim()}`;
+}
+exports.getUninstallCommand = getUninstallCommand;
+function isDemoEnv() {
+    return process.env.DeployEnv === 'demo';
+}
+exports.isDemoEnv = isDemoEnv;
 async function getOSReleaseInfo() {
     const osRelease = await fs.readFile('/etc/os-release', 'utf8');
     return osRelease;

package/static/build/data/dependence.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DependenceModel = exports.unInstallDependenceCommandTypes = exports.versionDependenceCommandTypes = exports.GetDependenceCommandTypes = exports.InstallDependenceCommandTypes = exports.DependenceTypes = exports.DependenceStatus = exports.Dependence = void 0;
+exports.DependenceModel = exports.versionDependenceCommandTypes = exports.GetDependenceCommandTypes = exports.DependenceTypes = exports.DependenceStatus = exports.Dependence = void 0;
 const _1 = require(".");
 const sequelize_1 = require("sequelize");
 class Dependence {
@@ -35,12 +35,6 @@ var DependenceTypes;
     DependenceTypes[DependenceTypes["python3"] = 1] = "python3";
     DependenceTypes[DependenceTypes["linux"] = 2] = "linux";
 })(DependenceTypes || (exports.DependenceTypes = DependenceTypes = {}));
-var InstallDependenceCommandTypes;
-(function (InstallDependenceCommandTypes) {
-    InstallDependenceCommandTypes[InstallDependenceCommandTypes["pnpm add -g"] = 0] = "pnpm add -g";
-    InstallDependenceCommandTypes[InstallDependenceCommandTypes["pip3 install --disable-pip-version-check --root-user-action=ignore"] = 1] = "pip3 install --disable-pip-version-check --root-user-action=ignore";
-    InstallDependenceCommandTypes[InstallDependenceCommandTypes["apt-get install -y"] = 2] = "apt-get install -y";
-})(InstallDependenceCommandTypes || (exports.InstallDependenceCommandTypes = InstallDependenceCommandTypes = {}));
 var GetDependenceCommandTypes;
 (function (GetDependenceCommandTypes) {
     GetDependenceCommandTypes[GetDependenceCommandTypes["pnpm ls -g "] = 0] = "pnpm ls -g ";
@@ -53,12 +47,6 @@ var versionDependenceCommandTypes;
     versionDependenceCommandTypes[versionDependenceCommandTypes["=="] = 1] = "==";
     versionDependenceCommandTypes[versionDependenceCommandTypes["="] = 2] = "=";
 })(versionDependenceCommandTypes || (exports.versionDependenceCommandTypes = versionDependenceCommandTypes = {}));
-var unInstallDependenceCommandTypes;
-(function (unInstallDependenceCommandTypes) {
-    unInstallDependenceCommandTypes[unInstallDependenceCommandTypes["pnpm remove -g"] = 0] = "pnpm remove -g";
-    unInstallDependenceCommandTypes[unInstallDependenceCommandTypes["pip3 uninstall --disable-pip-version-check --root-user-action=ignore -y"] = 1] = "pip3 uninstall --disable-pip-version-check --root-user-action=ignore -y";
-    unInstallDependenceCommandTypes[unInstallDependenceCommandTypes["apt-get remove -y"] = 2] = "apt-get remove -y";
-})(unInstallDependenceCommandTypes || (exports.unInstallDependenceCommandTypes = unInstallDependenceCommandTypes = {}));
 exports.DependenceModel = _1.sequelize.define('Dependence', {
     name: sequelize_1.DataTypes.STRING,
     type: sequelize_1.DataTypes.NUMBER,

package/static/build/data/notify.js

@@ -160,6 +160,7 @@ class EmailNotification extends NotificationBaseInfo {
         this.emailService = '';
         this.emailUser = '';
         this.emailPass = '';
+        this.emailTo = '';
     }
 }
 exports.EmailNotification = EmailNotification;

package/static/build/loaders/app.js

@@ -9,21 +9,19 @@ const logger_1 = __importDefault(require("./logger"));
 const initData_1 = __importDefault(require("./initData"));
 const deps_1 = __importDefault(require("./deps"));
 const initTask_1 = __importDefault(require("./initTask"));
-exports.default = async ({ expressApp }) => {
+const initFile_1 = __importDefault(require("./initFile"));
+exports.default = async ({ app }) => {
     (0, depInjector_1.default)();
     logger_1.default.info('✌️ Dependency loaded');
-    console.log('✌️ Dependency loaded');
-    await (0, initData_1.default)();
-    logger_1.default.info('✌️ Init data loaded');
-    console.log('✌️ Init data loaded');
     await (0, deps_1.default)();
     logger_1.default.info('✌️ Link deps loaded');
-    console.log('✌️ Link deps loaded');
+    (0, initFile_1.default)();
+    logger_1.default.info('✌️ Init file loaded');
+    await (0, initData_1.default)();
+    logger_1.default.info('✌️ Init data loaded');
     (0, initTask_1.default)();
     logger_1.default.info('✌️ Init task loaded');
-    console.log('✌️ Init task loaded');
-    (0, express_1.default)({ app: expressApp });
+    (0, express_1.default)({ app });
     logger_1.default.info('✌️ Express loaded');
-    console.log('✌️ Express loaded');
 };
 //# sourceMappingURL=app.js.map

package/static/build/loaders/db.js

@@ -58,12 +58,10 @@ exports.default = async () => {
             await data_1.sequelize.query('alter table Crontabs add column task_after TEXT');
         }
         catch (error) { }
-        console.log('✌️ DB loaded');
         logger_1.default.info('✌️ DB loaded');
     }
     catch (error) {
-        console.error('✌️ DB load failed');
-        logger_1.default.error(error);
+        logger_1.default.error('✌️ DB load failed', error);
     }
 };
 //# sourceMappingURL=db.js.map

package/static/build/loaders/express.js

@@ -12,25 +12,17 @@ const express_jwt_1 = require("express-jwt");
 const util_1 = require("../config/util");
 const express_urlrewrite_1 = __importDefault(require("express-urlrewrite"));
 const celebrate_1 = require("celebrate");
-const http_proxy_middleware_1 = require("http-proxy-middleware");
 const serverEnv_1 = require("../config/serverEnv");
-const logger_1 = __importDefault(require("./logger"));
 const store_1 = require("../shared/store");
 exports.default = ({ app }) => {
     app.set('trust proxy', 'loopback');
     app.use((0, cors_1.default)());
     app.get(`${config_1.default.api.prefix}/env.js`, serverEnv_1.serveEnv);
     app.use(`${config_1.default.api.prefix}/static`, express_1.default.static(config_1.default.uploadPath));
-    app.use('/api/public', (0, http_proxy_middleware_1.createProxyMiddleware)({
-        target: `http://0.0.0.0:${config_1.default.publicPort}/api`,
-        changeOrigin: true,
-        pathRewrite: { '/api/public': '' },
-        logger: logger_1.default,
-    }));
     app.use(body_parser_1.default.json({ limit: '50mb' }));
     app.use(body_parser_1.default.urlencoded({ limit: '50mb', extended: true }));
     app.use((0, express_jwt_1.expressjwt)({
-        secret: config_1.default.secret,
+        secret: config_1.default.jwt.secret,
         algorithms: ['HS384'],
     }).unless({
         path: [...config_1.default.apiWhiteList, /^\/open\//],

package/static/build/loaders/initData.js

@@ -70,21 +70,20 @@ exports.default = async () => {
             type: system_1.AuthDataType.authConfig,
         });
     }
-    const installDependencies = () => {
-        // 初始化时安装所有处于安装中，安装成功，安装失败的依赖
-        dependence_2.DependenceModel.findAll({
+    const installDependencies = async () => {
+        const docs = await dependence_2.DependenceModel.findAll({
             where: {},
             order: [
                 ['type', 'DESC'],
                 ['createdAt', 'DESC'],
             ],
             raw: true,
-        }).then(async (docs) => {
-            await dependence_2.DependenceModel.update({ status: dependence_2.DependenceStatus.queued, log: [] }, { where: { id: docs.map((x) => x.id) } });
-            setTimeout(() => {
-                dependenceService.installDependenceOneByOne(docs);
-            }, 5000);
         });
+        await dependence_2.DependenceModel.update({ status: dependence_2.DependenceStatus.queued, log: [] }, { where: { id: docs.map((x) => x.id) } });
+        setTimeout(async () => {
+            await dependenceService.installDependenceOneByOne(docs);
+            require('./bootAfter').default();
+        }, 5000);
     };
     // 初始化更新 linux/python/nodejs 镜像源配置
     if ((_b = systemConfig.info) === null || _b === void 0 ? void 0 : _b.pythonMirror) {

package/static/build/loaders/initFile.js

@@ -115,6 +115,5 @@ exports.default = async () => {
         }
     }
     logger_1.default.info('✌️ Init file down');
-    console.log('✌️ Init file down');
 };
 //# sourceMappingURL=initFile.js.map

package/static/build/loaders/logger.js

@@ -8,24 +8,43 @@ require("winston-daily-rotate-file");
 const config_1 = __importDefault(require("../config"));
 const path_1 = __importDefault(require("path"));
 const levelMap = {
-    info: '\ue6f5',
-    warn: '\ue880',
-    error: '\ue602',
-    debug: '\ue67f'
-};
-const customFormat = winston_1.default.format.combine(winston_1.default.format.splat(), winston_1.default.format.timestamp({ format: "YYYY-MM-DD HH:mm:ss" }), winston_1.default.format.align(), winston_1.default.format.printf((i) => `[${levelMap[i.level]}${i.level}] [${[i.timestamp]}]: ${i.message}`));
-const defaultOptions = {
-    format: customFormat,
-    datePattern: "YYYY-MM-DD",
-    maxSize: "20m",
-    maxFiles: "7d",
+    info: 'ℹ️',
+    warn: '⚠️',
+    error: '❌',
+    debug: '🐛', // debug调试图标
 };
+const baseFormat = [
+    winston_1.default.format.splat(),
+    winston_1.default.format.timestamp({ format: 'YYYY-MM-DD HH:mm:ss' }),
+    winston_1.default.format.align(),
+];
+const consoleFormat = winston_1.default.format.combine(winston_1.default.format.colorize({ level: true }), ...baseFormat, winston_1.default.format.printf((info) => {
+    return `[${info.level} ${info.timestamp}]:${info.message}`;
+}));
+const plainFormat = winston_1.default.format.combine(winston_1.default.format.uncolorize(), ...baseFormat, winston_1.default.format.printf((info) => {
+    return `[${levelMap[info.level] || ''}${info.level} ${info.timestamp}]:${info.message}`;
+}));
+const consoleTransport = new winston_1.default.transports.Console({
+    format: consoleFormat,
+    level: 'debug',
+});
+const fileTransport = new winston_1.default.transports.DailyRotateFile({
+    filename: path_1.default.join(config_1.default.systemLogPath, '%DATE%.log'),
+    datePattern: 'YYYY-MM-DD',
+    maxSize: '20m',
+    maxFiles: '7d',
+    format: plainFormat,
+    level: config_1.default.logs.level || 'info',
+});
 const LoggerInstance = winston_1.default.createLogger({
-    level: config_1.default.logs.level,
+    level: 'debug',
     levels: winston_1.default.config.npm.levels,
-    transports: [
-        new winston_1.default.transports.DailyRotateFile(Object.assign({ filename: path_1.default.join(config_1.default.systemLogPath, '%DATE%.log') }, defaultOptions))
-    ],
+    transports: [consoleTransport, fileTransport],
+    exceptionHandlers: [consoleTransport, fileTransport],
+    rejectionHandlers: [consoleTransport, fileTransport],
+});
+LoggerInstance.on('error', (error) => {
+    console.error('Logger error:', error);
 });
 exports.default = LoggerInstance;
 //# sourceMappingURL=logger.js.map

package/static/build/middlewares/monitoring.js

@@ -0,0 +1,56 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getMetrics = exports.monitoringMiddleware = void 0;
+const logger_1 = __importDefault(require("../loaders/logger"));
+const perf_hooks_1 = require("perf_hooks");
+const metrics_1 = require("../services/metrics");
+const requestMetrics = [];
+const monitoringMiddleware = (req, res, next) => {
+    const start = perf_hooks_1.performance.now();
+    const originalEnd = res.end;
+    res.end = function (chunk, encoding, cb) {
+        const duration = perf_hooks_1.performance.now() - start;
+        const metric = {
+            method: req.method,
+            path: req.path,
+            duration,
+            statusCode: res.statusCode,
+            timestamp: Date.now(),
+            platform: req.platform,
+        };
+        requestMetrics.push(metric);
+        metrics_1.metricsService.record('http_request', duration, Object.assign({ method: req.method, path: req.path, statusCode: res.statusCode.toString() }, (req.platform && { platform: req.platform })));
+        if (requestMetrics.length > 1000) {
+            requestMetrics.shift();
+        }
+        if (duration > 1000) {
+            logger_1.default.warn(`Slow request detected: ${req.method} ${req.path} took ${duration.toFixed(2)}ms`);
+        }
+        return originalEnd.call(this, chunk, encoding, cb);
+    };
+    next();
+};
+exports.monitoringMiddleware = monitoringMiddleware;
+const getMetrics = () => {
+    return {
+        totalRequests: requestMetrics.length,
+        averageDuration: requestMetrics.reduce((acc, curr) => acc + curr.duration, 0) /
+            requestMetrics.length,
+        requestsByMethod: requestMetrics.reduce((acc, curr) => {
+            acc[curr.method] = (acc[curr.method] || 0) + 1;
+            return acc;
+        }, {}),
+        requestsByPlatform: requestMetrics.reduce((acc, curr) => {
+            if (curr.platform) {
+                acc[curr.platform] = (acc[curr.platform] || 0) + 1;
+            }
+            return acc;
+        }, {}),
+        recentRequests: requestMetrics.slice(-10),
+    };
+};
+exports.getMetrics = getMetrics;
+//# sourceMappingURL=monitoring.js.map

package/static/build/schedule/api.js

@@ -25,13 +25,6 @@ const cron_1 = __importDefault(require("../services/cron"));
 typedi_1.Container.set('logger', logger_1.default);
 const getEnvs = async (call, callback) => {
     try {
-        if (!call.request.searchValue) {
-            return callback(null, {
-                code: 400,
-                data: [],
-                message: 'searchValue is required',
-            });
-        }
         const envService = typedi_1.Container.get(env_1.default);
         const data = await envService.envs(call.request.searchValue);
         callback(null, {
@@ -60,9 +53,17 @@ const createEnv = async (call, callback) => {
 };
 exports.createEnv = createEnv;
 const updateEnv = async (call, callback) => {
+    var _a;
     try {
+        if (!((_a = call.request.env) === null || _a === void 0 ? void 0 : _a.id)) {
+            return callback(null, {
+                code: 400,
+                data: undefined,
+                message: 'id parameter is required',
+            });
+        }
         const envService = typedi_1.Container.get(env_1.default);
-        const data = await envService.update((0, pick_1.default)(call.request.env, ['id', 'name', 'value', 'remark']));
+        const data = await envService.update((0, pick_1.default)(call.request.env, ['id', 'name', 'value', 'remarks']));
         callback(null, { code: 200, data });
     }
     catch (e) {
@@ -72,6 +73,12 @@ const updateEnv = async (call, callback) => {
 exports.updateEnv = updateEnv;
 const deleteEnvs = async (call, callback) => {
     try {
+        if (!call.request.ids || call.request.ids.length === 0) {
+            return callback(null, {
+                code: 400,
+                message: 'ids parameter is required',
+            });
+        }
         const envService = typedi_1.Container.get(env_1.default);
         await envService.remove(call.request.ids);
         callback(null, { code: 200 });
@@ -83,6 +90,13 @@ const deleteEnvs = async (call, callback) => {
 exports.deleteEnvs = deleteEnvs;
 const moveEnv = async (call, callback) => {
     try {
+        if (!call.request.id) {
+            return callback(null, {
+                code: 400,
+                data: undefined,
+                message: 'id parameter is required',
+            });
+        }
         const envService = typedi_1.Container.get(env_1.default);
         const data = await envService.move(call.request.id, {
             fromIndex: call.request.fromIndex,
@@ -97,6 +111,12 @@ const moveEnv = async (call, callback) => {
 exports.moveEnv = moveEnv;
 const disableEnvs = async (call, callback) => {
     try {
+        if (!call.request.ids || call.request.ids.length === 0) {
+            return callback(null, {
+                code: 400,
+                message: 'ids parameter is required',
+            });
+        }
         const envService = typedi_1.Container.get(env_1.default);
         await envService.disabled(call.request.ids);
         callback(null, { code: 200 });
@@ -108,6 +128,12 @@ const disableEnvs = async (call, callback) => {
 exports.disableEnvs = disableEnvs;
 const enableEnvs = async (call, callback) => {
     try {
+        if (!call.request.ids || call.request.ids.length === 0) {
+            return callback(null, {
+                code: 400,
+                message: 'ids parameter is required',
+            });
+        }
         const envService = typedi_1.Container.get(env_1.default);
         await envService.enabled(call.request.ids);
         callback(null, { code: 200 });
@@ -119,6 +145,12 @@ const enableEnvs = async (call, callback) => {
 exports.enableEnvs = enableEnvs;
 const updateEnvNames = async (call, callback) => {
     try {
+        if (!call.request.ids || call.request.ids.length === 0) {
+            return callback(null, {
+                code: 400,
+                message: 'ids parameter is required',
+            });
+        }
         const envService = typedi_1.Container.get(env_1.default);
         await envService.updateNames({
             ids: call.request.ids,
@@ -133,6 +165,13 @@ const updateEnvNames = async (call, callback) => {
 exports.updateEnvNames = updateEnvNames;
 const getEnvById = async (call, callback) => {
     try {
+        if (!call.request.id) {
+            return callback(null, {
+                code: 400,
+                data: undefined,
+                message: 'id parameter is required',
+            });
+        }
         const envService = typedi_1.Container.get(env_1.default);
         const data = await envService.getDb({ id: call.request.id });
         callback(null, {

package/static/build/schedule/client.js

@@ -8,7 +8,7 @@ const cron_1 = require("../protos/cron");
 const config_1 = __importDefault(require("../config"));
 class Client {
     constructor() {
-        this.client = new cron_1.CronClient(`0.0.0.0:${config_1.default.cronPort}`, grpc_js_1.credentials.createInsecure(), { 'grpc.enable_http_proxy': 0 });
+        this.client = new cron_1.CronClient(`0.0.0.0:${config_1.default.grpcPort}`, grpc_js_1.credentials.createInsecure(), { 'grpc.enable_http_proxy': 0 });
     }
     addCron(request) {
         return new Promise((resolve, reject) => {

package/static/build/services/cron.js

@@ -58,6 +58,9 @@ let CronService = class CronService {
         const tab = new cron_1.Crontab(payload);
         tab.saved = false;
         const doc = await this.insert(tab);
+        if ((0, util_1.isDemoEnv)()) {
+            return doc;
+        }
         if (!this.isSpecialSchedule(doc.schedule)) {
             await client_1.default.addCron([
                 {
@@ -80,7 +83,7 @@ let CronService = class CronService {
         const tab = new cron_1.Crontab(Object.assign(Object.assign({}, doc), payload));
         tab.saved = false;
         const newDoc = await this.updateDb(tab);
-        if (doc.isDisabled === 1) {
+        if (doc.isDisabled === 1 || (0, util_1.isDemoEnv)()) {
             return newDoc;
         }
         await client_1.default.delCron([String(newDoc.id)]);
@@ -444,6 +447,9 @@ let CronService = class CronService {
             command: this.makeCommand(doc),
             extra_schedules: doc.extra_schedules || [],
         }));
+        if ((0, util_1.isDemoEnv)()) {
+            return;
+        }
         await client_1.default.addCron(crons);
         await this.setCrontab();
     }
@@ -506,11 +512,8 @@ let CronService = class CronService {
         const tabs = data !== null && data !== void 0 ? data : (await this.crontabs());
         var crontab_string = '';
         tabs.data.forEach((tab) => {
-            var _a;
-            const _schedule = tab.schedule && tab.schedule.split(/ +/);
             if (tab.isDisabled === 1 ||
-                _schedule.length !== 5 ||
-                ((_a = tab.extra_schedules) === null || _a === void 0 ? void 0 : _a.length) ||
+                this.isNodeCron(tab) ||
                 this.isSpecialSchedule(tab.schedule)) {
                 crontab_string += '# ';
                 crontab_string += tab.schedule;
@@ -558,7 +561,6 @@ let CronService = class CronService {
     }
     async autosave_crontab() {
         const tabs = await this.crontabs();
-        this.setCrontab(tabs);
         const regularCrons = tabs.data
             .filter((x) => x.isDisabled !== 1 && !this.isSpecialSchedule(x.schedule))
             .map((doc) => ({
@@ -568,7 +570,11 @@ let CronService = class CronService {
             command: this.makeCommand(doc),
             extra_schedules: doc.extra_schedules || [],
         }));
+        if ((0, util_1.isDemoEnv)()) {
+            return;
+        }
         await client_1.default.addCron(regularCrons);
+        this.setCrontab(tabs);
     }
     async bootTask() {
         const tabs = await this.crontabs();

package/static/build/services/dependence.js

@@ -109,6 +109,7 @@ let DependenceService = class DependenceService {
         docs.forEach((dep) => {
             this.installOrUninstallDependency(dep, isInstall, force);
         });
+        return pLimit_1.default.waitDependencyQueueDone();
     }
     async reInstall(ids) {
         await dependence_1.DependenceModel.update({ status: dependence_1.DependenceStatus.queued, log: [] }, { where: { id: ids } });
@@ -120,8 +121,8 @@ let DependenceService = class DependenceService {
         const docs = await dependence_1.DependenceModel.findAll({ where: { id: ids } });
         for (const doc of docs) {
             pLimit_1.default.removeQueuedDependency(doc);
-            let depInstallCommand = dependence_1.InstallDependenceCommandTypes[doc.type];
-            let depUnInstallCommand = dependence_1.unInstallDependenceCommandTypes[doc.type];
+            let depInstallCommand = (0, util_1.getInstallCommand)(doc.type, doc.name);
+            let depUnInstallCommand = (0, util_1.getUninstallCommand)(doc.type, doc.name);
             const isLinuxDependence = doc.type === dependence_1.DependenceTypes.linux;
             if (isLinuxDependence) {
                 const osType = await (0, util_2.detectOS)();
@@ -206,13 +207,13 @@ let DependenceService = class DependenceService {
                     ? dependence_1.DependenceStatus.installing
                     : dependence_1.DependenceStatus.removing;
                 await dependence_1.DependenceModel.update({ status }, { where: { id: depIds } });
-                let depRunCommand = (isInstall
-                    ? dependence_1.InstallDependenceCommandTypes
-                    : dependence_1.unInstallDependenceCommandTypes)[dependency.type];
+                let command = isInstall
+                    ? (0, util_1.getInstallCommand)(dependency.type, depName)
+                    : (0, util_1.getUninstallCommand)(dependency.type, depName);
                 if (isLinuxDependence) {
-                    depRunCommand = isInstall
-                        ? linuxCommand.install
-                        : linuxCommand.uninstall;
+                    command = isInstall
+                        ? `${linuxCommand.install} ${depName.trim()}`
+                        : `${linuxCommand.uninstall} ${depName.trim()}`;
                 }
                 const startTime = (0, dayjs_1.default)();
                 const message = `开始${actionText}依赖 ${depName}，开始时间 ${startTime.format('YYYY-MM-DD HH:mm:ss')}\n\n`;
@@ -265,7 +266,7 @@ let DependenceService = class DependenceService {
                 const proxyStr = dependenceProxyFileExist
                     ? `source ${config_1.default.dependenceProxyFile} &&`
                     : '';
-                const cp = (0, cross_spawn_1.spawn)(`${proxyStr} ${depRunCommand} ${dependency.name.trim()}`, {
+                const cp = (0, cross_spawn_1.spawn)(`${proxyStr} ${command}`, {
                     shell: '/bin/bash',
                 });
                 cp.stdout.on('data', async (data) => {