@whyour/qinglong 2.18.3-3 → 2.19.0-0

package/shell/share.sh

@@ -72,7 +72,17 @@ original_name=(
 )
 
 init_env() {
-  export NODE_PATH=/usr/local/bin:/usr/local/pnpm-global/5/node_modules:/usr/local/lib/node_modules:/root/.local/share/pnpm/global/5/node_modules
+  local pnpm_global_path=$(pnpm root -g 2>/dev/null)
+  export NODE_PATH="/usr/local/bin:/usr/local/lib/node_modules${pnpm_global_path:+:${pnpm_global_path}}"
+
+  # 如果存在 pnpm 全局路径，创建软链接
+  if [[ -n "$pnpm_global_path" ]]; then
+    # 确保目标目录存在
+    mkdir -p "${dir_root}/node_modules"
+    # 链接全局模块到项目的 node_modules
+    ln -sf "${pnpm_global_path}/"* "${dir_root}/node_modules/" 2>/dev/null || true
+  fi
+
   export PYTHONUNBUFFERED=1
 }
 
@@ -170,67 +180,47 @@ fix_config() {
   make_dir $dir_dep
 
   if [[ ! -s $file_config_user ]]; then
-    echo -e "复制一份 $file_config_sample 为 $file_config_user，随后请按注释编辑你的配置文件：$file_config_user\n"
-    cp -fv $file_config_sample $file_config_user
-    echo
+    cp -f $file_config_sample $file_config_user
   fi
 
   if [[ ! -f $file_task_before ]]; then
-    echo -e "复制一份 $file_task_sample 为 $file_task_before\n"
-    cp -fv $file_task_sample $file_task_before
-    echo
+    cp -f $file_task_sample $file_task_before
   fi
 
   if [[ ! -f $file_task_after ]]; then
-    echo -e "复制一份 $file_task_sample 为 $file_task_after\n"
-    cp -fv $file_task_sample $file_task_after
-    echo
+    cp -f $file_task_sample $file_task_after
   fi
 
   if [[ ! -f $file_extra_shell ]]; then
-    echo -e "复制一份 $file_extra_sample 为 $file_extra_shell\n"
-    cp -fv $file_extra_sample $file_extra_shell
-    echo
+    cp -f $file_extra_sample $file_extra_shell
   fi
 
   if [[ ! -s $file_notify_py ]]; then
-    echo -e "复制一份 $file_notify_py_sample 为 $file_notify_py\n"
-    cp -fv $file_notify_py_sample $file_notify_py
-    echo
+    cp -f $file_notify_py_sample $file_notify_py
   fi
 
   if [[ ! -s $file_notify_js ]]; then
-    echo -e "复制一份 $file_notify_js_sample 为 $file_notify_js\n"
-    cp -fv $file_notify_js_sample $file_notify_js
-    echo
+    cp -f $file_notify_js_sample $file_notify_js
   fi
 
   if [[ ! -s $file_test_js ]]; then
-    cp -fv $file_test_js_sample $file_test_js
-    echo
+    cp -f $file_test_js_sample $file_test_js
   fi
 
   if [[ ! -s $file_test_py ]]; then
-    cp -fv $file_test_py_sample $file_test_py
-    echo
+    cp -f $file_test_py_sample $file_test_py
   fi
 
   if [[ -s /etc/nginx/conf.d/default.conf ]]; then
-    echo -e "检测到默认nginx配置文件，清空...\n"
     cat /dev/null >/etc/nginx/conf.d/default.conf
-    echo
   fi
 
   if [[ ! -s $dep_notify_js ]]; then
-    echo -e "复制一份 $file_notify_js_sample 为 $dep_notify_js\n"
-    cp -fv $file_notify_js_sample $dep_notify_js
-    echo
+    cp -f $file_notify_js_sample $dep_notify_js
   fi
 
   if [[ ! -s $dep_notify_py ]]; then
-    echo -e "复制一份 $file_notify_py_sample 为 $dep_notify_py\n"
-    cp -fv $file_notify_py_sample $dep_notify_py
-    echo
+    cp -f $file_notify_py_sample $dep_notify_py
   fi
 
 }
@@ -298,13 +288,6 @@ reload_pm2() {
   pm2 startOrGracefulReload ecosystem.config.js
 }
 
-reload_update() {
-  cd $dir_root
-  restore_env_vars
-  pm2 flush &>/dev/null
-  pm2 startOrGracefulReload other.config.js
-}
-
 diff_time() {
   local format="$1"
   local begin_time="$2"
@@ -351,44 +334,9 @@ format_timestamp() {
   fi
 }
 
-patch_version() {
-  git config --global pull.rebase false
-
-  if [[ -f "$dir_root/db/cookie.db" ]]; then
-    echo -e "检测到旧的db文件，拷贝为新db...\n"
-    mv $dir_root/db/cookie.db $dir_root/db/env.db
-    rm -rf $dir_root/db/cookie.db
-    echo
-  fi
-
-  if [[ -d "$dir_root/db" ]]; then
-    echo -e "检测到旧的db目录，拷贝到data目录...\n"
-    cp -rf $dir_root/config $dir_data
-    echo
-  fi
-
-  if [[ -d "$dir_root/scripts" ]]; then
-    echo -e "检测到旧的scripts目录，拷贝到data目录...\n"
-    cp -rf $dir_root/scripts $dir_data
-    echo
-  fi
-
-  if [[ -d "$dir_root/log" ]]; then
-    echo -e "检测到旧的log目录，拷贝到data目录...\n"
-    cp -rf $dir_root/log $dir_data
-    echo
-  fi
-
-  if [[ -d "$dir_root/config" ]]; then
-    echo -e "检测到旧的config目录，拷贝到data目录...\n"
-    cp -rf $dir_root/config $dir_data
-    echo
-  fi
-}
-
 init_nginx() {
-  cp -fv $nginx_conf /etc/nginx/nginx.conf
-  cp -fv $nginx_app_conf /etc/nginx/conf.d/front.conf
+  cp -f $nginx_conf /etc/nginx/nginx.conf
+  cp -f $nginx_app_conf /etc/nginx/conf.d/front.conf
   local location_url="/"
   local aliasStr=""
   local rootStr=""

package/shell/update.sh

@@ -212,20 +212,25 @@ run_extra_shell() {
 
 ## 脚本用法
 usage() {
-  echo -e "ql命令使用方法："
-  echo -e "1. $cmd_update update                                                                  # 更新并重启青龙"
-  echo -e "2. $cmd_update extra                                                                   # 运行自定义脚本"
-  echo -e "3. $cmd_update raw <fileurl>                                                            # 更新单个脚本文件"
-  echo -e "4. $cmd_update repo <repourl> <path> <blacklist> <dependence> <branch> <extensions>    # 更新单个仓库的脚本"
-  echo -e "5. $cmd_update rmlog <days>                                                            # 删除旧日志"
-  echo -e "6. $cmd_update bot                                                                     # 启动tg-bot"
-  echo -e "7. $cmd_update check                                                                   # 检测青龙环境并修复"
-  echo -e "8. $cmd_update resetlet                                                                # 重置登录错误次数"
-  echo -e "9. $cmd_update resettfa                                                                # 禁用两步登录"
+  echo -e "$cmd_update 命令使用方法："
+  echo -e "1.  $cmd_update update                                                                  # 更新并重启青龙"
+  echo -e "2.  $cmd_update extra                                                                   # 运行自定义脚本"
+  echo -e "3.  $cmd_update raw <fileurl>                                                           # 更新单个脚本文件"
+  echo -e "4.  $cmd_update repo <repourl> <path> <blacklist> <dependence> <branch> <extensions>    # 更新单个仓库的脚本"
+  echo -e "5.  $cmd_update rmlog <days>                                                            # 删除旧日志"
+  echo -e "6.  $cmd_update bot                                                                     # 启动tg-bot"
+  echo -e "7.  $cmd_update check                                                                   # 检测青龙环境并修复"
+  echo -e "8.  $cmd_update resetlet                                                                # 重置登录错误次数"
+  echo -e "9.  $cmd_update resettfa                                                                # 禁用两步登录"
+  echo -e "10. $cmd_update resetpwd                                                                # 修改登录密码"
+  echo -e "11. $cmd_update resetname                                                               # 修改登录用户名"
 }
 
 reload_qinglong() {
+  echo -e "[reload_qinglong] deleting Triggered at $(date)" >>${dir_log}/reload.log
+  sleep 3
   delete_pm2
+  echo -e "[reload_qinglong] deleted Triggered at $(date)" >>${dir_log}/reload.log
 
   local reload_target="${1}"
   local primary_branch="master"
@@ -245,8 +250,9 @@ reload_qinglong() {
     rm -rf ${dir_data}/*
     mv -f ${dir_tmp}/data/* ${dir_data}/
   fi
-
+  echo -e "[reload_qinglong] starting Triggered at $(date)" >>${dir_log}/reload.log
   reload_pm2
+  echo -e "[reload_qinglong] started Triggered at $(date)\n" >>${dir_log}/reload.log
 }
 
 ## 更新 qinglong
@@ -307,15 +313,7 @@ check_update_dep() {
     echo -e "更新包下载成功..."
 
     if [[ "$needRestart" == 'true' ]]; then
-      delete_pm2
-
-      rm -rf ${dir_root}/back ${dir_root}/cli ${dir_root}/docker ${dir_root}/sample ${dir_root}/shell ${dir_root}/src
-      mv -f ${dir_tmp}/qinglong-${primary_branch}/* ${dir_root}/
-      rm -rf $dir_static/*
-      mv -f ${dir_tmp}/qinglong-static-${primary_branch}/* ${dir_static}/
-      cp -f $file_config_sample $dir_config/config.sample.sh
-
-      reload_pm2
+      reload_qinglong "system"
     fi
   else
     echo -e "\n依赖检测安装失败，请检查网络...\n"
@@ -546,6 +544,9 @@ main() {
   resetpwd)
     eval update_auth_config "\\\"password\\\":\\\"$p2\\\"" "重置密码" $cmd
     ;;
+  resetname)
+    eval update_auth_config "\\\"username\\\":\\\"$p2\\\"" "重置用户名" $cmd
+    ;;
   *)
     eval echo -e "命令输入错误...\\\n" $cmd
     eval usage $cmd

package/static/build/api/health.js

@@ -0,0 +1,32 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const express_1 = require("express");
+const logger_1 = __importDefault(require("../loaders/logger"));
+const health_1 = require("../services/health");
+const typedi_1 = __importDefault(require("typedi"));
+const route = (0, express_1.Router)();
+exports.default = (app) => {
+    app.use('/', route);
+    route.get('/health', async (req, res) => {
+        try {
+            const healthService = typedi_1.default.get(health_1.HealthService);
+            const health = await healthService.check();
+            res.status(200).send({
+                code: 200,
+                data: health,
+            });
+        }
+        catch (err) {
+            logger_1.default.error('Health check failed:', err);
+            res.status(500).send({
+                code: 500,
+                message: 'Health check failed',
+                error: err.message,
+            });
+        }
+    });
+};
+//# sourceMappingURL=health.js.map

package/static/build/api/index.js

@@ -14,6 +14,8 @@ const open_1 = __importDefault(require("./open"));
 const dependence_1 = __importDefault(require("./dependence"));
 const system_1 = __importDefault(require("./system"));
 const subscription_1 = __importDefault(require("./subscription"));
+const update_1 = __importDefault(require("./update"));
+const health_1 = __importDefault(require("./health"));
 exports.default = () => {
     const app = (0, express_1.Router)();
     (0, user_1.default)(app);
@@ -26,6 +28,8 @@ exports.default = () => {
     (0, dependence_1.default)(app);
     (0, system_1.default)(app);
     (0, subscription_1.default)(app);
+    (0, update_1.default)(app);
+    (0, health_1.default)(app);
     return app;
 };
 //# sourceMappingURL=index.js.map

package/static/build/api/log.js

@@ -71,7 +71,7 @@ exports.default = (app) => {
         try {
             let { filename, path } = req.body;
             const logService = typedi_1.Container.get(log_1.default);
-            const finalPath = logService.checkFilePath(filename, path);
+            const finalPath = logService.checkFilePath(path, filename);
             if (!finalPath || blacklist.includes(path)) {
                 return res.send({
                     code: 403,

package/static/build/api/script.js

@@ -32,7 +32,7 @@ const typedi_1 = require("typedi");
 const config_1 = __importDefault(require("../config"));
 const fs = __importStar(require("fs/promises"));
 const celebrate_1 = require("celebrate");
-const path_1 = __importStar(require("path"));
+const path_1 = require("path");
 const script_1 = __importDefault(require("../services/script"));
 const multer_1 = __importDefault(require("multer"));
 const utils_1 = require("../shared/utils");
@@ -61,8 +61,7 @@ exports.default = (app) => {
                 'package-lock.json',
             ];
             if (req.query.path) {
-                const targetPath = path_1.default.join(config_1.default.scriptPath, req.query.path);
-                result = await (0, util_1.readDir)(targetPath, config_1.default.scriptPath, blacklist);
+                result = await (0, util_1.readDir)(req.query.path, config_1.default.scriptPath, blacklist);
             }
             else {
                 result = await (0, util_1.readDirs)(config_1.default.scriptPath, config_1.default.scriptPath, blacklist, (a, b) => {

package/static/build/api/system.js

@@ -326,6 +326,7 @@ exports.default = (app) => {
             retries: celebrate_1.Joi.number().optional(),
             twoFactorActivated: celebrate_1.Joi.boolean().optional(),
             password: celebrate_1.Joi.string().optional(),
+            username: celebrate_1.Joi.string().optional(),
         }),
     }), async (req, res, next) => {
         try {

package/static/build/api/update.js

@@ -0,0 +1,47 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const express_1 = require("express");
+const typedi_1 = __importDefault(require("typedi"));
+const logger_1 = __importDefault(require("../loaders/logger"));
+const system_1 = __importDefault(require("../services/system"));
+const route = (0, express_1.Router)();
+exports.default = (app) => {
+    app.use('/update', route);
+    route.put('/reload', async (req, res, next) => {
+        try {
+            const systemService = typedi_1.default.get(system_1.default);
+            const result = await systemService.reloadSystem();
+            res.send(result);
+        }
+        catch (e) {
+            logger_1.default.error('🔥 error: %o', e);
+            return next(e);
+        }
+    });
+    route.put('/system', async (req, res, next) => {
+        try {
+            const systemService = typedi_1.default.get(system_1.default);
+            const result = await systemService.reloadSystem('system');
+            res.send(result);
+        }
+        catch (e) {
+            logger_1.default.error('🔥 error: %o', e);
+            return next(e);
+        }
+    });
+    route.put('/data', async (req, res, next) => {
+        try {
+            const systemService = typedi_1.default.get(system_1.default);
+            const result = await systemService.reloadSystem('data');
+            res.send(result);
+        }
+        catch (e) {
+            logger_1.default.error('🔥 error: %o', e);
+            return next(e);
+        }
+    });
+};
+//# sourceMappingURL=update.js.map

package/static/build/api/user.js

@@ -12,6 +12,7 @@ const path_1 = __importDefault(require("path"));
 const uuid_1 = require("uuid");
 const express_rate_limit_1 = __importDefault(require("express-rate-limit"));
 const config_1 = __importDefault(require("../config"));
+const util_1 = require("../config/util");
 const route = (0, express_1.Router)();
 const storage = multer_1.default.diskStorage({
     destination: function (req, file, cb) {
@@ -62,9 +63,8 @@ exports.default = (app) => {
             password: celebrate_1.Joi.string().required(),
         }),
     }), async (req, res, next) => {
-        const logger = typedi_1.Container.get('logger');
         try {
-            if (process.env.DeployEnv === 'demo') {
+            if ((0, util_1.isDemoEnv)()) {
                 return res.send({ code: 450, message: '未知错误' });
             }
             const userService = typedi_1.Container.get(user_1.default);

package/static/build/app.js

@@ -3,29 +3,78 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-require("reflect-metadata"); // We need this in order to use @Decorators
-const config_1 = __importDefault(require("./config"));
+require("reflect-metadata");
+const compression_1 = __importDefault(require("compression"));
+const cors_1 = __importDefault(require("cors"));
 const express_1 = __importDefault(require("express"));
+const helmet_1 = __importDefault(require("helmet"));
+const typedi_1 = require("typedi");
+const config_1 = __importDefault(require("./config"));
 const logger_1 = __importDefault(require("./loaders/logger"));
-async function startServer() {
-    const app = (0, express_1.default)();
-    await require('./loaders/db').default();
-    await require('./loaders/initFile').default();
-    await require('./loaders/app').default({ expressApp: app });
-    const server = app
-        .listen(config_1.default.port, '0.0.0.0', () => {
+const monitoring_1 = require("./middlewares/monitoring");
+const grpc_1 = require("./services/grpc");
+const http_1 = require("./services/http");
+class Application {
+    constructor() {
+        this.isShuttingDown = false;
+        this.app = (0, express_1.default)();
+        this.httpServerService = typedi_1.Container.get(http_1.HttpServerService);
+        this.grpcServerService = typedi_1.Container.get(grpc_1.GrpcServerService);
+    }
+    async start() {
         var _a;
-        logger_1.default.debug(`✌️ 后端服务启动成功！`);
-        console.debug(`✌️ 后端服务启动成功！`);
-        (_a = process.send) === null || _a === void 0 ? void 0 : _a.call(process, 'ready');
-        require('./loaders/bootAfter').default();
-    })
-        .on('error', (err) => {
-        logger_1.default.error(err);
-        console.error(err);
-        process.exit(1);
-    });
-    await require('./loaders/server').default({ server });
+        try {
+            await this.initializeDatabase();
+            this.setupMiddlewares();
+            await this.initializeServices();
+            this.setupGracefulShutdown();
+            (_a = process.send) === null || _a === void 0 ? void 0 : _a.call(process, 'ready');
+        }
+        catch (error) {
+            logger_1.default.error('Failed to start application:', error);
+            process.exit(1);
+        }
+    }
+    async initializeDatabase() {
+        await require('./loaders/db').default();
+    }
+    setupMiddlewares() {
+        this.app.use((0, helmet_1.default)());
+        this.app.use((0, cors_1.default)(config_1.default.cors));
+        this.app.use((0, compression_1.default)());
+        this.app.use(monitoring_1.monitoringMiddleware);
+    }
+    async initializeServices() {
+        await this.grpcServerService.initialize();
+        await require('./loaders/app').default({ app: this.app });
+        this.server = await this.httpServerService.initialize(this.app, config_1.default.port);
+        await require('./loaders/server').default({ server: this.server });
+    }
+    setupGracefulShutdown() {
+        const shutdown = async () => {
+            if (this.isShuttingDown)
+                return;
+            this.isShuttingDown = true;
+            logger_1.default.info('Shutting down services...');
+            try {
+                await Promise.all([
+                    this.grpcServerService.shutdown(),
+                    this.httpServerService.shutdown(),
+                ]);
+                process.exit(0);
+            }
+            catch (error) {
+                logger_1.default.error('Error during shutdown:', error);
+                process.exit(1);
+            }
+        };
+        process.on('SIGTERM', shutdown);
+        process.on('SIGINT', shutdown);
+    }
 }
-startServer();
+const app = new Application();
+app.start().catch((error) => {
+    logger_1.default.error('Application failed to start:', error);
+    process.exit(1);
+});
 //# sourceMappingURL=app.js.map

package/static/build/config/const.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LINUX_DEPENDENCE_COMMAND = exports.SAMPLE_FILES = exports.QL_PREFIX = exports.TASK_PREFIX = exports.QL_COMMAND = exports.TASK_COMMAND = exports.LOG_END_SYMBOL = void 0;
+exports.LINUX_DEPENDENCE_COMMAND = exports.PYTHON_INSTALL_DIR = exports.SAMPLE_FILES = exports.QL_PREFIX = exports.TASK_PREFIX = exports.QL_COMMAND = exports.TASK_COMMAND = exports.LOG_END_SYMBOL = void 0;
 exports.LOG_END_SYMBOL = '　　　　　';
 exports.TASK_COMMAND = 'task';
 exports.QL_COMMAND = 'ql';
@@ -23,6 +23,7 @@ exports.SAMPLE_FILES = [
         target: 'data/scripts/notify.py',
     },
 ];
+exports.PYTHON_INSTALL_DIR = process.env.PYTHON_HOME;
 exports.LINUX_DEPENDENCE_COMMAND = {
     Debian: {
         install: 'apt-get install -y',

package/static/build/config/index.js

@@ -6,11 +6,35 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const dotenv_1 = __importDefault(require("dotenv"));
 const path_1 = __importDefault(require("path"));
 const share_1 = require("./share");
+dotenv_1.default.config({
+    path: path_1.default.join(__dirname, '../../.env'),
+});
+const config = {
+    port: parseInt(process.env.BACK_PORT || '5600', 10),
+    grpcPort: parseInt(process.env.GRPC_PORT || '5500', 10),
+    nodeEnv: process.env.NODE_ENV || 'development',
+    isDevelopment: process.env.NODE_ENV === 'development',
+    isProduction: process.env.NODE_ENV === 'production',
+    logs: {
+        level: process.env.LOG_LEVEL || 'silly',
+    },
+    api: {
+        prefix: '/api',
+    },
+    jwt: {
+        secret: process.env.JWT_SECRET || (0, share_1.createRandomString)(16, 32),
+        expiresIn: process.env.JWT_EXPIRES_IN,
+    },
+    cors: {
+        origin: process.env.CORS_ORIGIN
+            ? process.env.CORS_ORIGIN.split(',')
+            : ['*'],
+        methods: ['GET', 'POST', 'PUT', 'DELETE', 'OPTIONS'],
+    },
+};
 process.env.NODE_ENV = process.env.NODE_ENV || 'development';
 if (!process.env.QL_DIR) {
-    // 声明QL_DIR环境变量
     let qlHomePath = path_1.default.join(__dirname, '../../');
-    // 生产环境
     if (qlHomePath.endsWith('/static/')) {
         qlHomePath = path_1.default.join(qlHomePath, '../');
     }
@@ -58,19 +82,7 @@ const dependenceProxyFile = path_1.default.join(configPath, 'dependence-proxy.sh
 if (envFound.error) {
     throw new Error("⚠️  Couldn't find .env file  ⚠️");
 }
-exports.default = {
-    port: parseInt(process.env.BACK_PORT, 10),
-    cronPort: parseInt(process.env.CRON_PORT, 10),
-    publicPort: parseInt(process.env.PUBLIC_PORT, 10),
-    updatePort: parseInt(process.env.UPDATE_PORT, 10),
-    secret: process.env.SECRET || (0, share_1.createRandomString)(16, 32),
-    logs: {
-        level: process.env.LOG_LEVEL || 'silly',
-    },
-    api: {
-        prefix: '/api',
-    },
-    rootPath,
+exports.default = Object.assign(Object.assign({}, config), { jwt: config.jwt, rootPath,
     tmpPath,
     dataPath,
     dataTgzFile,
@@ -96,8 +108,7 @@ exports.default = {
     configPath,
     scriptPath,
     repoPath,
-    samplePath,
-    blackFileList: [
+    samplePath, blackFileList: [
         'auth.json',
         'config.sh.sample',
         'cookie.sh',
@@ -107,11 +118,9 @@ exports.default = {
         'env.js',
         'env.py',
         'token.json',
-    ],
-    writePathList: [configPath, scriptPath],
-    bakPath,
-    apiWhiteList: [
+    ], writePathList: [configPath, scriptPath], bakPath, apiWhiteList: [
         '/api/user/login',
+        '/api/health',
         '/open/auth/token',
         '/api/user/two-factor/login',
         '/api/system',
@@ -122,11 +131,9 @@ exports.default = {
         '/open/system',
         '/open/user/init',
         '/open/user/notification/init',
-    ],
-    versionFile,
+    ], versionFile,
     lastVersionFile,
     sqliteFile,
     sshdPath,
-    systemLogPath,
-};
+    systemLogPath });
 //# sourceMappingURL=index.js.map