@whyour/qinglong 2.19.2-2 → 2.20.0-2

package/static/build/app.js

@@ -41,6 +41,13 @@ class Application {
         this.isShuttingDown = false;
         this.workerMetadataMap = new Map();
         this.app = (0, express_1.default)();
+        // 创建一个全局中间件，删除查询参数中的t
+        this.app.use((req, res, next) => {
+            if (req.query.t) {
+                delete req.query.t;
+            }
+            next();
+        });
     }
     async start() {
         try {
@@ -60,21 +67,74 @@ class Application {
         }
     }
     startMasterProcess() {
-        this.forkWorker('http');
-        this.forkWorker('grpc');
+        // Fork gRPC worker first and wait for it to be ready
+        const grpcWorker = this.forkWorker('grpc');
+        // Wait for gRPC worker to signal it's ready before starting HTTP worker
+        this.waitForWorkerReady(grpcWorker, 30000)
+            .then(() => {
+            logger_1.default.info('✌️ gRPC worker is ready, starting HTTP worker');
+            this.httpWorker = this.forkWorker('http');
+        })
+            .catch((error) => {
+            logger_1.default.error('✌️ Failed to wait for gRPC worker:', error);
+            process.exit(1);
+        });
         cluster_1.default.on('exit', (worker, code, signal) => {
             const metadata = this.workerMetadataMap.get(worker.id);
             if (metadata) {
                 if (!this.isShuttingDown) {
-                    logger_1.default.error(`${metadata.serviceType} worker ${worker.process.pid} died (${signal || code}). Restarting...`);
-                    const newWorker = this.forkWorker(metadata.serviceType);
-                    logger_1.default.info(`Restarted ${metadata.serviceType} worker (New PID: ${newWorker.process.pid})`);
+                    logger_1.default.error(`✌️ ${metadata.serviceType} worker ${worker.process.pid} died (${signal || code}). Restarting...`);
+                    // If gRPC worker died, restart it and wait for it to be ready
+                    if (metadata.serviceType === 'grpc') {
+                        const newGrpcWorker = this.forkWorker('grpc');
+                        this.waitForWorkerReady(newGrpcWorker, 30000)
+                            .then(() => {
+                            logger_1.default.info('✌️ gRPC worker restarted and ready');
+                            // Re-register cron jobs by notifying the HTTP worker
+                            if (this.httpWorker) {
+                                try {
+                                    this.httpWorker.send('reregister-crons');
+                                    logger_1.default.info('✌️ Sent reregister-crons message to HTTP worker');
+                                }
+                                catch (error) {
+                                    logger_1.default.error('✌️ Failed to send reregister-crons message:', error);
+                                }
+                            }
+                        })
+                            .catch((error) => {
+                            logger_1.default.error('✌️ Failed to restart gRPC worker:', error);
+                            process.exit(1);
+                        });
+                    }
+                    else {
+                        // For HTTP worker, just restart it
+                        const newWorker = this.forkWorker(metadata.serviceType);
+                        this.httpWorker = newWorker;
+                        logger_1.default.info(`✌️ Restarted ${metadata.serviceType} worker (PID: ${newWorker.process.pid})`);
+                    }
                 }
                 this.workerMetadataMap.delete(worker.id);
             }
         });
         this.setupMasterShutdown();
     }
+    waitForWorkerReady(worker, timeoutMs) {
+        return new Promise((resolve, reject) => {
+            const messageHandler = (msg) => {
+                if (msg === 'ready') {
+                    worker.removeListener('message', messageHandler);
+                    clearTimeout(timeoutId);
+                    resolve();
+                }
+            };
+            worker.on('message', messageHandler);
+            // Timeout after specified milliseconds
+            const timeoutId = setTimeout(() => {
+                worker.removeListener('message', messageHandler);
+                reject(new Error(`Worker failed to start within ${timeoutMs / 1000} seconds`));
+            }, timeoutMs);
+        });
+    }
     forkWorker(serviceType) {
         const worker = cluster_1.default.fork({ SERVICE_TYPE: serviceType });
         this.workerMetadataMap.set(worker.id, {
@@ -86,10 +146,13 @@ class Application {
         return worker;
     }
     async initializeDatabase() {
-        await require('./loaders/db').default();
+        const dbLoader = await Promise.resolve().then(() => __importStar(require('./loaders/db')));
+        await dbLoader.default();
     }
     setupMiddlewares() {
-        this.app.use((0, helmet_1.default)());
+        this.app.use((0, helmet_1.default)({
+            contentSecurityPolicy: false,
+        }));
         this.app.use((0, cors_1.default)(config_1.default.cors));
         this.app.use((0, compression_1.default)());
         this.app.use(monitoring_1.monitoringMiddleware);
@@ -105,14 +168,14 @@ class Application {
                 if (worker) {
                     const exitPromise = new Promise((resolve) => {
                         worker.once('exit', () => {
-                            logger_1.default.info(`Worker ${worker.process.pid} exited`);
+                            logger_1.default.info(`✌️ Worker ${worker.process.pid} exited`);
                             resolve();
                         });
                         try {
                             worker.send('shutdown');
                         }
                         catch (error) {
-                            logger_1.default.warn(`Failed to send shutdown to worker ${worker.process.pid}:`, error);
+                            logger_1.default.warn(`✌️ Failed to send shutdown to worker ${worker.process.pid}:`, error);
                         }
                     });
                     workerPromises.push(exitPromise);
@@ -123,7 +186,7 @@ class Application {
                     Promise.all(workerPromises),
                     new Promise((resolve) => {
                         setTimeout(() => {
-                            logger_1.default.warn('Worker shutdown timeout reached');
+                            logger_1.default.warn('✌️ Worker shutdown timeout reached');
                             resolve();
                         }, 10000);
                     }),
@@ -131,7 +194,7 @@ class Application {
                 process.exit(0);
             }
             catch (error) {
-                logger_1.default.error('Error during worker shutdown:', error);
+                logger_1.default.error('✌️ Error during worker shutdown:', error);
                 process.exit(1);
             }
         };
@@ -142,7 +205,7 @@ class Application {
         var _a;
         const serviceType = process.env.SERVICE_TYPE;
         if (!serviceType || !['http', 'grpc'].includes(serviceType)) {
-            logger_1.default.error('Invalid SERVICE_TYPE:', serviceType);
+            logger_1.default.error('✌️ Invalid SERVICE_TYPE:', serviceType);
             process.exit(1);
         }
         logger_1.default.info(`✌️ ${serviceType} worker started (PID: ${process.pid})`);
@@ -156,7 +219,7 @@ class Application {
             (_a = process.send) === null || _a === void 0 ? void 0 : _a.call(process, 'ready');
         }
         catch (error) {
-            logger_1.default.error(`${serviceType} worker failed:`, error);
+            logger_1.default.error(`✌️ ${serviceType} worker failed:`, error);
             process.exit(1);
         }
     }
@@ -164,9 +227,11 @@ class Application {
         this.setupMiddlewares();
         const { HttpServerService } = await Promise.resolve().then(() => __importStar(require('./services/http')));
         this.httpServerService = typedi_1.Container.get(HttpServerService);
-        await require('./loaders/app').default({ app: this.app });
+        const appLoader = await Promise.resolve().then(() => __importStar(require('./loaders/app')));
+        await appLoader.default({ app: this.app });
         const server = await this.httpServerService.initialize(this.app, config_1.default.port);
-        await require('./loaders/server').default({ server });
+        const serverLoader = await Promise.resolve().then(() => __importStar(require('./loaders/server')));
+        await serverLoader.default({ server });
         this.setupWorkerShutdown('http');
     }
     async startGrpcService() {
@@ -176,10 +241,23 @@ class Application {
         this.setupWorkerShutdown('grpc');
     }
     setupWorkerShutdown(serviceType) {
-        process.on('message', (msg) => {
+        process.on('message', async (msg) => {
             if (msg === 'shutdown') {
                 this.gracefulShutdown(serviceType);
             }
+            else if (msg === 'reregister-crons' && serviceType === 'http') {
+                // Re-register cron jobs when gRPC worker restarts
+                try {
+                    logger_1.default.info('✌️ Received reregister-crons message, re-registering cron jobs...');
+                    const CronService = (await Promise.resolve().then(() => __importStar(require('./services/cron')))).default;
+                    const cronService = typedi_1.Container.get(CronService);
+                    await cronService.autosave_crontab();
+                    logger_1.default.info('✌️ Cron jobs re-registered successfully');
+                }
+                catch (error) {
+                    logger_1.default.error('✌️ Failed to re-register cron jobs:', error);
+                }
+            }
         });
         const shutdown = () => this.gracefulShutdown(serviceType);
         process.on('SIGTERM', shutdown);
@@ -200,14 +278,14 @@ class Application {
             process.exit(0);
         }
         catch (error) {
-            logger_1.default.error(`[${serviceType}] Error during shutdown:`, error);
+            logger_1.default.error(`✌️ [${serviceType}] Error during shutdown:`, error);
             process.exit(1);
         }
     }
 }
 const app = new Application();
 app.start().catch((error) => {
-    logger_1.default.error('Application failed to start:', error);
+    logger_1.default.error('🙅‍♀️ Application failed to start:', error);
     process.exit(1);
 });
 //# sourceMappingURL=app.js.map

package/static/build/config/index.js

@@ -9,7 +9,7 @@ dotenv_1.default.config({
     path: path_1.default.join(__dirname, '../../.env'),
 });
 const config = {
-    port: parseInt(process.env.BACK_PORT || '5600', 10),
+    port: parseInt(process.env.BACK_PORT || '5700', 10),
     grpcPort: parseInt(process.env.GRPC_PORT || '5500', 10),
     nodeEnv: process.env.NODE_ENV || 'development',
     isDevelopment: process.env.NODE_ENV === 'development',
@@ -136,5 +136,5 @@ exports.default = Object.assign(Object.assign({}, config), { jwt: config.jwt, ro
     sqliteFile,
     sshdPath,
     systemLogPath,
-    dependenceCachePath });
+    dependenceCachePath, maxTokensPerPlatform: 10 });
 //# sourceMappingURL=index.js.map

package/static/build/config/util.js

@@ -29,7 +29,7 @@ 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.isDemoEnv = exports.getUninstallCommand = exports.getInstallCommand = exports.getGetCommand = 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.getToken = exports.getLastModifyFilePath = exports.removeAnsi = exports.getFileContentByName = void 0;
+exports.updateLinuxMirrorFile = exports.detectOS = exports.isDemoEnv = exports.getUninstallCommand = exports.getInstallCommand = exports.getGetCommand = exports.setSystemTimezone = exports.rmPath = exports.safeJSONParse = exports.getUniqPath = exports.parseContentVersion = exports.parseVersion = exports.killAllTasks = exports.getAllPids = 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.getToken = exports.getLastModifyFilePath = exports.removeAnsi = exports.getFileContentByName = void 0;
 const fs = __importStar(require("fs/promises"));
 const path = __importStar(require("path"));
 const child_process_1 = require("child_process");
@@ -395,6 +395,29 @@ async function getPid(cmd) {
     return pid ? Number(pid) : undefined;
 }
 exports.getPid = getPid;
+async function getAllPids(cmd) {
+    const taskCommand = `ps -eo pid,command | grep "${cmd}" | grep -v grep | awk '{print $1}'`;
+    const pidsStr = await promiseExec(taskCommand);
+    if (!pidsStr)
+        return [];
+    return pidsStr
+        .split('\n')
+        .map((p) => Number(p.trim()))
+        .filter((p) => !isNaN(p) && p > 0);
+}
+exports.getAllPids = getAllPids;
+async function killAllTasks(cmd) {
+    const pids = await getAllPids(cmd);
+    for (const pid of pids) {
+        try {
+            await killTask(pid);
+        }
+        catch (error) {
+            // Ignore errors if process already terminated
+        }
+    }
+}
+exports.killAllTasks = killAllTasks;
 async function parseVersion(path) {
     return (0, js_yaml_1.load)(await fs.readFile(path, 'utf8'));
 }

package/static/build/data/cron.js

@@ -27,6 +27,8 @@ class Crontab {
         this.extra_schedules = options.extra_schedules;
         this.task_before = options.task_before;
         this.task_after = options.task_after;
+        this.log_name = options.log_name;
+        this.allow_multiple_instances = options.allow_multiple_instances || 0;
     }
 }
 exports.Crontab = Crontab;
@@ -65,5 +67,7 @@ exports.CrontabModel = _1.sequelize.define('Crontab', {
     extra_schedules: sequelize_1.DataTypes.JSON,
     task_before: sequelize_1.DataTypes.STRING,
     task_after: sequelize_1.DataTypes.STRING,
+    log_name: sequelize_1.DataTypes.STRING,
+    allow_multiple_instances: sequelize_1.DataTypes.NUMBER,
 });
 //# sourceMappingURL=cron.js.map

package/static/build/data/env.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EnvModel = exports.minPosition = exports.stepPosition = exports.initPosition = exports.maxPosition = exports.EnvStatus = exports.Env = void 0;
-const _1 = require(".");
 const sequelize_1 = require("sequelize");
+const _1 = require(".");
 class Env {
     constructor(options) {
         this.value = options.value;
@@ -15,6 +15,7 @@ class Env {
         this.position = options.position;
         this.name = options.name;
         this.remarks = options.remarks || '';
+        this.isPinned = options.isPinned || 0;
     }
 }
 exports.Env = Env;
@@ -34,5 +35,6 @@ exports.EnvModel = _1.sequelize.define('Env', {
     position: sequelize_1.DataTypes.NUMBER,
     name: { type: sequelize_1.DataTypes.STRING, unique: 'compositeIndex' },
     remarks: sequelize_1.DataTypes.STRING,
+    isPinned: sequelize_1.DataTypes.NUMBER,
 });
 //# sourceMappingURL=env.js.map

package/static/build/data/notify.js

@@ -196,6 +196,7 @@ class LarkNotification extends NotificationBaseInfo {
     constructor() {
         super(...arguments);
         this.larkKey = '';
+        this.larkSecret = '';
     }
 }
 exports.LarkNotification = LarkNotification;

package/static/build/loaders/db.js

@@ -22,42 +22,36 @@ exports.default = async () => {
         await subscription_1.SubscriptionModel.sync();
         await cronView_1.CrontabViewModel.sync();
         // 初始化新增字段
-        try {
-            await data_1.sequelize.query('alter table CrontabViews add column filterRelation VARCHAR(255)');
+        const migrations = [
+            {
+                table: 'CrontabViews',
+                column: 'filterRelation',
+                type: 'VARCHAR(255)',
+            },
+            { table: 'Subscriptions', column: 'proxy', type: 'VARCHAR(255)' },
+            { table: 'CrontabViews', column: 'type', type: 'NUMBER' },
+            { table: 'Subscriptions', column: 'autoAddCron', type: 'NUMBER' },
+            { table: 'Subscriptions', column: 'autoDelCron', type: 'NUMBER' },
+            { table: 'Crontabs', column: 'sub_id', type: 'NUMBER' },
+            { table: 'Crontabs', column: 'extra_schedules', type: 'JSON' },
+            { table: 'Crontabs', column: 'task_before', type: 'TEXT' },
+            { table: 'Crontabs', column: 'task_after', type: 'TEXT' },
+            { table: 'Crontabs', column: 'log_name', type: 'VARCHAR(255)' },
+            {
+                table: 'Crontabs',
+                column: 'allow_multiple_instances',
+                type: 'NUMBER',
+            },
+            { table: 'Envs', column: 'isPinned', type: 'NUMBER' },
+        ];
+        for (const migration of migrations) {
+            try {
+                await data_1.sequelize.query(`alter table ${migration.table} add column ${migration.column} ${migration.type}`);
+            }
+            catch (error) {
+                // Column already exists or other error, continue
+            }
         }
-        catch (error) { }
-        try {
-            await data_1.sequelize.query('alter table Subscriptions add column proxy VARCHAR(255)');
-        }
-        catch (error) { }
-        try {
-            await data_1.sequelize.query('alter table CrontabViews add column type NUMBER');
-        }
-        catch (error) { }
-        try {
-            await data_1.sequelize.query('alter table Subscriptions add column autoAddCron NUMBER');
-        }
-        catch (error) { }
-        try {
-            await data_1.sequelize.query('alter table Subscriptions add column autoDelCron NUMBER');
-        }
-        catch (error) { }
-        try {
-            await data_1.sequelize.query('alter table Crontabs add column sub_id NUMBER');
-        }
-        catch (error) { }
-        try {
-            await data_1.sequelize.query('alter table Crontabs add column extra_schedules JSON');
-        }
-        catch (error) { }
-        try {
-            await data_1.sequelize.query('alter table Crontabs add column task_before TEXT');
-        }
-        catch (error) { }
-        try {
-            await data_1.sequelize.query('alter table Crontabs add column task_after TEXT');
-        }
-        catch (error) { }
         logger_1.default.info('✌️ DB loaded');
     }
     catch (error) {

package/static/build/loaders/deps.js

@@ -5,9 +5,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const path_1 = __importDefault(require("path"));
 const promises_1 = __importDefault(require("fs/promises"));
+const os_1 = __importDefault(require("os"));
 const chokidar_1 = __importDefault(require("chokidar"));
 const index_1 = __importDefault(require("../config/index"));
-const util_1 = require("../config/util");
+const logger_1 = __importDefault(require("./logger"));
 async function linkToNodeModule(src, dst) {
     const target = path_1.default.join(index_1.default.rootPath, 'node_modules', dst || src);
     const source = path_1.default.join(index_1.default.rootPath, src);
@@ -20,8 +21,17 @@ async function linkToNodeModule(src, dst) {
     catch (error) { }
 }
 async function linkCommand() {
-    const commandPath = await (0, util_1.promiseExec)('which node');
-    const commandDir = path_1.default.dirname(commandPath);
+    const homeDir = os_1.default.homedir();
+    let userBinDir = path_1.default.join(homeDir, 'bin');
+    try {
+        await promises_1.default.mkdir(userBinDir, { recursive: true });
+        await linkCommandToDir(userBinDir);
+    }
+    catch (error) {
+        logger_1.default.error('Linking command failed:', error);
+    }
+}
+async function linkCommandToDir(commandDir) {
     const linkShell = [
         {
             src: 'update.sh',
@@ -38,6 +48,13 @@ async function linkCommand() {
         const source = path_1.default.join(index_1.default.rootPath, 'shell', link.src);
         const target = path_1.default.join(commandDir, link.dest);
         const tmpTarget = path_1.default.join(commandDir, link.tmp);
+        try {
+            const stats = await promises_1.default.lstat(tmpTarget);
+            if (stats) {
+                await promises_1.default.unlink(tmpTarget);
+            }
+        }
+        catch (error) { }
         await promises_1.default.symlink(source, tmpTarget);
         await promises_1.default.rename(tmpTarget, target);
     }
@@ -51,7 +68,7 @@ exports.default = async (src = 'deps') => {
         persistent: true,
     });
     watcher
-        .on('add', (path) => linkToNodeModule(src))
-        .on('change', (path) => linkToNodeModule(src));
+        .on('add', () => linkToNodeModule(src))
+        .on('change', () => linkToNodeModule(src));
 };
 //# sourceMappingURL=deps.js.map

package/static/build/loaders/express.js

@@ -14,6 +14,8 @@ const express_urlrewrite_1 = __importDefault(require("express-urlrewrite"));
 const celebrate_1 = require("celebrate");
 const serverEnv_1 = require("../config/serverEnv");
 const store_1 = require("../shared/store");
+const auth_1 = require("../shared/auth");
+const path_1 = __importDefault(require("path"));
 exports.default = ({ app }) => {
     app.set('trust proxy', 'loopback');
     app.use((0, cors_1.default)());
@@ -21,11 +23,13 @@ exports.default = ({ app }) => {
     app.use(`${config_1.default.api.prefix}/static`, express_1.default.static(config_1.default.uploadPath));
     app.use(body_parser_1.default.json({ limit: '50mb' }));
     app.use(body_parser_1.default.urlencoded({ limit: '50mb', extended: true }));
+    const frontendPath = path_1.default.join(config_1.default.rootPath, 'static/dist');
+    app.use(express_1.default.static(frontendPath));
     app.use((0, express_jwt_1.expressjwt)({
         secret: config_1.default.jwt.secret,
         algorithms: ['HS384'],
     }).unless({
-        path: [...config_1.default.apiWhiteList, /^\/open\//],
+        path: [...config_1.default.apiWhiteList, /^\/(?!api\/).*/],
     }));
     app.use((req, res, next) => {
         if (!req.headers) {
@@ -39,6 +43,9 @@ exports.default = ({ app }) => {
     });
     app.use(async (req, res, next) => {
         var _a;
+        if (!['/open/', '/api/'].some((x) => req.path.startsWith(x))) {
+            return next();
+        }
         const headerToken = (0, util_1.getToken)(req);
         if (req.path.startsWith('/open/')) {
             const apps = await store_1.shareStore.getApps();
@@ -61,11 +68,8 @@ exports.default = ({ app }) => {
             return next();
         }
         const authInfo = await store_1.shareStore.getAuthInfo();
-        if (authInfo && headerToken) {
-            const { token = '', tokens = {} } = authInfo;
-            if (headerToken === token || tokens[req.platform] === headerToken) {
-                return next();
-            }
+        if ((0, auth_1.isValidToken)(authInfo, headerToken, req.platform)) {
+            return next();
         }
         const errorCode = headerToken ? 'invalid_token' : 'credentials_required';
         const errorMessage = headerToken
@@ -94,10 +98,15 @@ exports.default = ({ app }) => {
     });
     app.use((0, express_urlrewrite_1.default)('/open/*', '/api/$1'));
     app.use(config_1.default.api.prefix, (0, api_1.default)());
-    app.use((req, res, next) => {
-        const err = new Error('Not Found');
-        err['status'] = 404;
-        next(err);
+    app.get('*', (_, res, next) => {
+        const indexPath = path_1.default.join(frontendPath, 'index.html');
+        res.sendFile(indexPath, (err) => {
+            if (err) {
+                const err = new Error('Not Found');
+                err['status'] = 404;
+                next(err);
+            }
+        });
     });
     app.use((0, celebrate_1.errors)());
     app.use((err, req, res, next) => {

package/static/build/loaders/initData.js

@@ -1,4 +1,27 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -85,7 +108,8 @@ exports.default = async () => {
         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();
+            const bootAfterLoader = await Promise.resolve().then(() => __importStar(require('./bootAfter')));
+            bootAfterLoader.default();
         }, 5000);
     };
     // 初始化更新 linux/python/nodejs 镜像源配置

package/static/build/loaders/initTask.js

@@ -7,6 +7,7 @@ const typedi_1 = require("typedi");
 const system_1 = __importDefault(require("../services/system"));
 const schedule_1 = __importDefault(require("../services/schedule"));
 const subscription_1 = __importDefault(require("../services/subscription"));
+const sshKey_1 = __importDefault(require("../services/sshKey"));
 const config_1 = __importDefault(require("../config"));
 const util_1 = require("../config/util");
 const path_1 = require("path");
@@ -14,6 +15,7 @@ exports.default = async () => {
     const systemService = typedi_1.Container.get(system_1.default);
     const scheduleService = typedi_1.Container.get(schedule_1.default);
     const subscriptionService = typedi_1.Container.get(subscription_1.default);
+    const sshKeyService = typedi_1.Container.get(sshKey_1.default);
     // 生成内置token
     let tokenCommand = `ts-node-transpile-only ${(0, path_1.join)(config_1.default.rootPath, 'back/token.ts')}`;
     const tokenFile = (0, path_1.join)(config_1.default.rootPath, 'static/build/token.js');
@@ -46,6 +48,10 @@ exports.default = async () => {
             }, true);
         }
         systemService.updateTimezone(data.info);
+        // Apply global SSH key if configured
+        if (data.info.globalSshKey) {
+            await sshKeyService.addGlobalSSHKey(data.info.globalSshKey, 'global');
+        }
     }
     await subscriptionService.setSshConfig();
     const subs = await subscriptionService.list();

package/static/build/loaders/sock.js

@@ -8,6 +8,7 @@ const typedi_1 = require("typedi");
 const sock_1 = __importDefault(require("../services/sock"));
 const util_1 = require("../config/util");
 const store_1 = require("../shared/store");
+const auth_1 = require("../shared/auth");
 exports.default = async ({ server }) => {
     const echo = sockjs_1.default.createServer({ prefix: '/api/ws', log: () => { } });
     const sockService = typedi_1.Container.get(sock_1.default);
@@ -18,18 +19,15 @@ exports.default = async ({ server }) => {
         const authInfo = await store_1.shareStore.getAuthInfo();
         const platform = (0, util_1.getPlatform)(conn.headers['user-agent'] || '') || 'desktop';
         const headerToken = conn.url.replace(`${conn.pathname}?token=`, '');
-        if (authInfo) {
-            const { token = '', tokens = {} } = authInfo;
-            if (headerToken === token || tokens[platform] === headerToken) {
-                sockService.addClient(conn);
-                conn.on('data', (message) => {
-                    conn.write(message);
-                });
-                conn.on('close', function () {
-                    sockService.removeClient(conn);
-                });
-                return;
-            }
+        if ((0, auth_1.isValidToken)(authInfo, headerToken, platform)) {
+            sockService.addClient(conn);
+            conn.on('data', (message) => {
+                conn.write(message);
+            });
+            conn.on('close', function () {
+                sockService.removeClient(conn);
+            });
+            return;
         }
         conn.close('404');
     });