@whyour/qinglong 2.19.2-2 → 2.20.0-2

package/shell/preload/client.js

@@ -5,7 +5,7 @@ const { join } = require('path');
 class GrpcClient {
   static #config = {
     protoPath: join(process.env.QL_DIR, 'back/protos/api.proto'),
-    serverAddress: '0.0.0.0:5500',
+    serverAddress: `0.0.0.0:${process.env.GRPC_PORT || '5500'}`,
     protoOptions: {
       keepCase: true,
       longs: String,
@@ -33,6 +33,11 @@ class GrpcClient {
     'createCron',
     'updateCron',
     'deleteCrons',
+    'getCrons',
+    'getCronById',
+    'enableCrons',
+    'disableCrons',
+    'runCrons',
   ];
 
   #client;

package/shell/pub.sh

@@ -11,16 +11,16 @@ ts-node-transpile-only sample/tool.ts
 
 string=$(cat version.yaml | grep "version" | egrep "[^ ]*" -o | egrep "\d\.*")
 version="v$string"
-echo -e "当前版本$version"
+echo -e "当前版本$version-debian"
 
 echo -e "删除已经存在的本地tag"
-git tag -d "$version" &>/dev/null
+git tag -d "$version-debian" &>/dev/null
 
 echo -e "删除已经存在的远程tag"
-git push origin :refs/tags/$version &>/dev/null
+git push origin :refs/tags/$version-debian &>/dev/null
 
 echo -e "创建新tag"
-git tag -a "$version" -m "release $version"
+git tag -a "$version-debian" -m "release $version-debian"
 
 echo -e "提交tag"
 git push --tags

package/shell/share.sh

@@ -48,8 +48,6 @@ export file_notify_py=$dir_scripts/notify.py
 export file_notify_js=$dir_scripts/sendNotify.js
 export file_test_js=$dir_scripts/ql_sample.js
 export file_test_py=$dir_scripts/ql_sample.py
-export nginx_app_conf=$dir_root/docker/front.conf
-export nginx_conf=$dir_root/docker/nginx.conf
 export dep_notify_py=$dir_dep/notify.py
 export dep_notify_js=$dir_dep/sendNotify.js
 
@@ -61,15 +59,10 @@ list_own_user=$dir_list_tmp/own_user.list
 list_own_add=$dir_list_tmp/own_add.list
 list_own_drop=$dir_list_tmp/own_drop.list
 
-## 软连接及其原始文件对应关系
 link_name=(
   task
   ql
 )
-original_name=(
-  task.sh
-  update.sh
-)
 
 init_env() {
   local pnpm_global_path=$(pnpm root -g 2>/dev/null)
@@ -86,15 +79,20 @@ init_env() {
   export PYTHONUNBUFFERED=1
 }
 
+load_ql_envs() {
+  ql_base_url=${QlBaseUrl:-"/"}
+  ql_port=${QlPort:-"5700"}
+  ql_grpc_port=${QlGrpcPort:-"5500"}
+  current_branch=${QL_BRANCH:-""}
+}
+
 import_config() {
   [[ -f $file_config_user ]] && . $file_config_user
 
-  ql_base_url=${QlBaseUrl:-"/"}
-  ql_port=${QlPort:-"5700"}
+  load_ql_envs
   command_timeout_time=${CommandTimeoutTime:-""}
   file_extensions=${RepoFileExtensions:-"js py"}
   proxy_url=${ProxyUrl:-""}
-  current_branch=${QL_BRANCH:-""}
 
   if [[ -n "${DefaultCronRule}" ]]; then
     default_cron="${DefaultCronRule}"
@@ -211,10 +209,6 @@ fix_config() {
     cp -f $file_test_py_sample $file_test_py
   fi
 
-  if [[ -s /etc/nginx/conf.d/default.conf ]]; then
-    cat /dev/null >/etc/nginx/conf.d/default.conf
-  fi
-
   if [[ ! -s $dep_notify_js ]]; then
     cp -f $file_notify_js_sample $dep_notify_js
   fi
@@ -278,14 +272,35 @@ random_range() {
 
 delete_pm2() {
   cd $dir_root
-  pm2 delete ecosystem.config.js
+  # Try to delete PM2 processes, but don't fail if PM2 is not available
+  pm2 delete ecosystem.config.js 2>/dev/null || true
+  # Also try to kill any directly spawned node processes
+  pkill -f "node.*static/build/app.js" 2>/dev/null || true
 }
 
 reload_pm2() {
   cd $dir_root
   restore_env_vars
-  pm2 flush &>/dev/null
-  pm2 startOrGracefulReload ecosystem.config.js --update-env
+  
+  # Try to start PM2, but handle failures gracefully
+  if pm2 flush &>/dev/null && pm2 startOrGracefulReload ecosystem.config.js --update-env; then
+    return 0
+  else
+    local exit_code=$?
+    echo "警告: PM2 启动失败 (退出码: $exit_code)，可能是由于硬件不兼容"
+    echo "正在尝试直接使用 Node.js 启动服务..."
+    
+    # Kill any existing node processes for qinglong
+    pkill -f "node.*static/build/app.js" 2>/dev/null || true
+    
+    # Start node directly in the background
+    nohup node static/build/app.js > $dir_log/qinglong.log 2>&1 &
+    local node_pid=$!
+    
+    echo "已使用 Node.js 直接启动服务 (PID: $node_pid)"
+    echo "注意: 使用此模式时，部分 PM2 管理功能将不可用"
+    return 0
+  fi
 }
 
 diff_time() {
@@ -334,44 +349,6 @@ format_timestamp() {
   fi
 }
 
-init_nginx() {
-  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=""
-  if [[ $ql_base_url != "/" ]]; then
-    if [[ $ql_base_url != /* ]]; then
-      ql_base_url="/$ql_base_url"
-    fi
-    if [[ $ql_base_url != */ ]]; then
-      ql_base_url="$ql_base_url/"
-    fi
-    location_url="^~${ql_base_url%*/}"
-    aliasStr="alias ${dir_static}/dist;"
-    if ! grep -q "<base href=\"$ql_base_url\">" "${dir_static}/dist/index.html"; then
-      awk -v text="<base href=\"$ql_base_url\">" '/<link/ && !inserted {print text; inserted=1} 1' "${dir_static}/dist/index.html" >temp.html
-      mv temp.html "${dir_static}/dist/index.html"
-    fi
-  else
-    rootStr="root ${dir_static}/dist;"
-  fi
-  sed -i "s,QL_ALIAS_CONFIG,${aliasStr},g" /etc/nginx/conf.d/front.conf
-  sed -i "s,QL_ROOT_CONFIG,${rootStr},g" /etc/nginx/conf.d/front.conf
-  sed -i "s,QL_BASE_URL_LOCATION,${location_url},g" /etc/nginx/conf.d/front.conf
-  sed -i "s,QL_BASE_URL,${ql_base_url},g" /etc/nginx/conf.d/front.conf
-
-  local ipv6=$(ip a | grep inet6)
-  local ipv6Str=""
-  if [[ $ipv6 ]]; then
-    ipv6Str="listen [::]:${ql_port} ipv6only=on;"
-  fi
-
-  local ipv4Str="listen ${ql_port};"
-  sed -i "s,IPV6_CONFIG,${ipv6Str},g" /etc/nginx/conf.d/front.conf
-  sed -i "s,IPV4_CONFIG,${ipv4Str},g" /etc/nginx/conf.d/front.conf
-}
-
 get_env_array() {
   exported_variables=()
   while IFS= read -r line; do

package/shell/start.sh

@@ -93,16 +93,15 @@ log_with_style() {
   printf "\n[%s] [%7s]  %s\n" "${timestamp}" "${level}" "${message}"
 }
 
-log_with_style "INFO" "🚀 1. 检测配置文件..."
+log_with_style "INFO" "🚀  1. 检测配置文件..."
 import_config "$@"
 make_dir /etc/nginx/conf.d
 make_dir /run/nginx
-init_nginx
 fix_config
 
 pm2 l &>/dev/null
 
-log_with_style "INFO" "🔄 2. 启动 nginx..."
+log_with_style "INFO" "🔄  2. 启动 nginx..."
 nginx -s reload 2>/dev/null || nginx -c /etc/nginx/nginx.conf
 
 log_with_style "INFO" "⚙️  3. 启动 pm2 服务..."

package/shell/task.sh

@@ -46,18 +46,22 @@ handle_log_path() {
 
   time=$(date "+$mtime_format")
   log_time=$(format_log_time "$mtime_format" "$time")
-  log_dir_tmp="${file_param##*/}"
-  if [[ $file_param =~ "/" ]]; then
-    if [[ $file_param == /* ]]; then
-      log_dir_tmp_path="${file_param:1}"
-    else
-      log_dir_tmp_path="${file_param}"
+  if [[ -z $log_name ]]; then
+    log_dir_tmp="${file_param##*/}"
+    if [[ $file_param =~ "/" ]]; then
+      if [[ $file_param == /* ]]; then
+        log_dir_tmp_path="${file_param:1}"
+      else
+        log_dir_tmp_path="${file_param}"
+      fi
     fi
+    log_dir_tmp_path="${log_dir_tmp_path%/*}"
+    log_dir_tmp_path="${log_dir_tmp_path##*/}"
+    [[ $log_dir_tmp_path ]] && log_dir_tmp="${log_dir_tmp_path}_${log_dir_tmp}"
+    log_dir="${log_dir_tmp%.*}${suffix}"
+  else
+    log_dir="$log_name"
   fi
-  log_dir_tmp_path="${log_dir_tmp_path%/*}"
-  log_dir_tmp_path="${log_dir_tmp_path##*/}"
-  [[ $log_dir_tmp_path ]] && log_dir_tmp="${log_dir_tmp_path}_${log_dir_tmp}"
-  log_dir="${log_dir_tmp%.*}${suffix}"
   log_path="$log_dir/$log_time.log"
 
   if [[ ${real_log_path:=} ]]; then
@@ -73,6 +77,11 @@ handle_log_path() {
   if [[ "${real_time:=}" == "true" ]]; then
     cmd=""
   fi
+
+  if [[ "${log_dir:=}" == "/dev/null" ]]; then
+    cmd=">> /dev/null"
+    log_path="/dev/null"
+  fi
 }
 
 format_params() {

package/shell/update.sh

@@ -3,6 +3,7 @@
 dir_shell=$QL_DIR/shell
 . $dir_shell/share.sh
 . $dir_shell/api.sh
+load_ql_envs
 . $dir_shell/env.sh
 
 send_mark=$dir_shell/send_mark

package/static/build/api/dependence.js

@@ -10,7 +10,13 @@ const celebrate_1 = require("celebrate");
 const route = (0, express_1.Router)();
 exports.default = (app) => {
     app.use('/dependencies', route);
-    route.get('/', async (req, res, next) => {
+    route.get('/', (0, celebrate_1.celebrate)({
+        query: celebrate_1.Joi.object({
+            searchValue: celebrate_1.Joi.string().optional().allow(''),
+            type: celebrate_1.Joi.string().optional().allow(''),
+            status: celebrate_1.Joi.string().optional().allow(''),
+        }),
+    }), async (req, res, next) => {
         const logger = typedi_1.Container.get('logger');
         try {
             const dependenceService = typedi_1.Container.get(dependence_1.default);

package/static/build/api/env.js

@@ -3,14 +3,14 @@ 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 = require("typedi");
-const env_1 = __importDefault(require("../services/env"));
 const celebrate_1 = require("celebrate");
+const express_1 = require("express");
+const fs_1 = __importDefault(require("fs"));
 const multer_1 = __importDefault(require("multer"));
+const typedi_1 = require("typedi");
 const config_1 = __importDefault(require("../config"));
-const fs_1 = __importDefault(require("fs"));
 const util_1 = require("../config/util");
+const env_1 = __importDefault(require("../services/env"));
 const route = (0, express_1.Router)();
 const storage = multer_1.default.diskStorage({
     destination: function (req, file, cb) {
@@ -164,6 +164,32 @@ exports.default = (app) => {
             return next(e);
         }
     });
+    route.put('/pin', (0, celebrate_1.celebrate)({
+        body: celebrate_1.Joi.array().items(celebrate_1.Joi.number().required()),
+    }), async (req, res, next) => {
+        const logger = typedi_1.Container.get('logger');
+        try {
+            const envService = typedi_1.Container.get(env_1.default);
+            const data = await envService.pin(req.body);
+            return res.send({ code: 200, data });
+        }
+        catch (e) {
+            return next(e);
+        }
+    });
+    route.put('/unpin', (0, celebrate_1.celebrate)({
+        body: celebrate_1.Joi.array().items(celebrate_1.Joi.number().required()),
+    }), async (req, res, next) => {
+        const logger = typedi_1.Container.get('logger');
+        try {
+            const envService = typedi_1.Container.get(env_1.default);
+            const data = await envService.unPin(req.body);
+            return res.send({ code: 200, data });
+        }
+        catch (e) {
+            return next(e);
+        }
+    });
     route.post('/upload', upload.single('env'), async (req, res, next) => {
         const logger = typedi_1.Container.get('logger');
         try {

package/static/build/api/script.js

@@ -48,7 +48,11 @@ const storage = multer_1.default.diskStorage({
 const upload = (0, multer_1.default)({ storage: storage });
 exports.default = (app) => {
     app.use('/scripts', route);
-    route.get('/', async (req, res, next) => {
+    route.get('/', (0, celebrate_1.celebrate)({
+        query: celebrate_1.Joi.object({
+            path: celebrate_1.Joi.string().optional().allow(''),
+        }),
+    }), async (req, res, next) => {
         const logger = typedi_1.Container.get('logger');
         try {
             let result = [];
@@ -83,27 +87,50 @@ exports.default = (app) => {
             return next(e);
         }
     });
-    route.get('/detail', async (req, res, next) => {
+    route.get('/detail', (0, celebrate_1.celebrate)({
+        query: celebrate_1.Joi.object({
+            path: celebrate_1.Joi.string().optional().allow(''),
+            file: celebrate_1.Joi.string().required(),
+        }),
+    }), async (req, res, next) => {
+        var _a;
         try {
             const scriptService = typedi_1.Container.get(script_1.default);
-            const content = await scriptService.getFile(req.query.path, req.query.file);
+            const content = await scriptService.getFile(((_a = req.query) === null || _a === void 0 ? void 0 : _a.path) || '', req.query.file);
             res.send({ code: 200, data: content });
         }
         catch (e) {
             return next(e);
         }
     });
-    route.get('/:file', async (req, res, next) => {
+    route.get('/:file', (0, celebrate_1.celebrate)({
+        params: celebrate_1.Joi.object({
+            file: celebrate_1.Joi.string().required(),
+        }),
+        query: celebrate_1.Joi.object({
+            path: celebrate_1.Joi.string().optional().allow(''),
+        }),
+    }), async (req, res, next) => {
+        var _a;
         try {
             const scriptService = typedi_1.Container.get(script_1.default);
-            const content = await scriptService.getFile(req.query.path, req.params.file);
+            const content = await scriptService.getFile(((_a = req.query) === null || _a === void 0 ? void 0 : _a.path) || '', req.params.file);
             res.send({ code: 200, data: content });
         }
         catch (e) {
             return next(e);
         }
     });
-    route.post('/', upload.single('file'), async (req, res, next) => {
+    route.post('/', upload.single('file'), (0, celebrate_1.celebrate)({
+        body: celebrate_1.Joi.object({
+            filename: celebrate_1.Joi.string().required(),
+            path: celebrate_1.Joi.string().optional().allow(''),
+            content: celebrate_1.Joi.string().optional().allow(''),
+            originFilename: celebrate_1.Joi.string().optional().allow(''),
+            directory: celebrate_1.Joi.string().optional().allow(''),
+            file: celebrate_1.Joi.string().optional().allow(''),
+        }),
+    }), async (req, res, next) => {
         try {
             let { filename, path, content, originFilename, directory } = req.body;
             if (!path) {
@@ -133,6 +160,7 @@ exports.default = (app) => {
                 originFilename = filename;
             }
             const originFilePath = (0, path_1.join)(path, `${originFilename.replace(/\//g, '')}`);
+            await fs.mkdir(path, { recursive: true });
             const filePath = (0, path_1.join)(path, `${filename.replace(/\//g, '')}`);
             const fileExists = await (0, util_1.fileExist)(filePath);
             if (fileExists) {
@@ -175,12 +203,15 @@ exports.default = (app) => {
     route.delete('/', (0, celebrate_1.celebrate)({
         body: celebrate_1.Joi.object({
             filename: celebrate_1.Joi.string().required(),
-            path: celebrate_1.Joi.string().allow(''),
+            path: celebrate_1.Joi.string().optional().allow(''),
             type: celebrate_1.Joi.string().optional(),
         }),
     }), async (req, res, next) => {
         try {
             let { filename, path } = req.body;
+            if (!path) {
+                path = '';
+            }
             const scriptService = typedi_1.Container.get(script_1.default);
             const filePath = scriptService.checkFilePath(path, filename);
             if (!filePath) {
@@ -235,6 +266,9 @@ exports.default = (app) => {
         const logger = typedi_1.Container.get('logger');
         try {
             let { filename, content, path } = req.body;
+            if (!path) {
+                path = '';
+            }
             const { name, ext } = (0, path_1.parse)(filename);
             const filePath = (0, path_1.join)(config_1.default.scriptPath, path, `${name}.swap${ext}`);
             await (0, utils_1.writeFileWithLock)(filePath, content || '');
@@ -255,6 +289,9 @@ exports.default = (app) => {
     }), async (req, res, next) => {
         try {
             let { filename, path, pid } = req.body;
+            if (!path) {
+                path = '';
+            }
             const { name, ext } = (0, path_1.parse)(filename);
             const filePath = (0, path_1.join)(config_1.default.scriptPath, path, `${name}.swap${ext}`);
             const logPath = (0, path_1.join)(config_1.default.logPath, path, `${name}.swap`);
@@ -277,7 +314,10 @@ exports.default = (app) => {
         }),
     }), async (req, res, next) => {
         try {
-            let { filename, path, type, newFilename } = req.body;
+            let { filename, path, newFilename } = req.body;
+            if (!path) {
+                path = '';
+            }
             const filePath = (0, path_1.join)(config_1.default.scriptPath, path, filename);
             const newPath = (0, path_1.join)(config_1.default.scriptPath, path, newFilename);
             await fs.rename(filePath, newPath);

package/static/build/api/subscription.js

@@ -7,7 +7,7 @@ const express_1 = require("express");
 const typedi_1 = require("typedi");
 const subscription_1 = __importDefault(require("../services/subscription"));
 const celebrate_1 = require("celebrate");
-const cron_parser_1 = __importDefault(require("cron-parser"));
+const cron_parser_1 = require("cron-parser");
 const route = (0, express_1.Router)();
 exports.default = (app) => {
     app.use('/subscriptions', route);
@@ -55,7 +55,7 @@ exports.default = (app) => {
         const logger = typedi_1.Container.get('logger');
         try {
             if (!req.body.schedule ||
-                cron_parser_1.default.parseExpression(req.body.schedule).hasNext()) {
+                cron_parser_1.CronExpressionParser.parse(req.body.schedule).hasNext()) {
                 const subscriptionService = typedi_1.Container.get(subscription_1.default);
                 const data = await subscriptionService.create(req.body);
                 return res.send({ code: 200, data });
@@ -163,7 +163,7 @@ exports.default = (app) => {
         try {
             if (!req.body.schedule ||
                 typeof req.body.schedule === 'object' ||
-                cron_parser_1.default.parseExpression(req.body.schedule).hasNext()) {
+                cron_parser_1.CronExpressionParser.parse(req.body.schedule).hasNext()) {
                 const subscriptionService = typedi_1.Container.get(subscription_1.default);
                 const data = await subscriptionService.update(req.body);
                 return res.send({ code: 200, data });

package/static/build/api/system.js

@@ -1,34 +1,10 @@
 "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 };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const express_1 = require("express");
 const typedi_1 = require("typedi");
-const fs = __importStar(require("fs/promises"));
 const config_1 = __importDefault(require("../config"));
 const system_1 = __importDefault(require("../services/system"));
 const celebrate_1 = require("celebrate");
@@ -36,6 +12,7 @@ const user_1 = __importDefault(require("../services/user"));
 const util_1 = require("../config/util");
 const dayjs_1 = __importDefault(require("dayjs"));
 const multer_1 = __importDefault(require("multer"));
+const logStreamManager_1 = require("../shared/logStreamManager");
 const route = (0, express_1.Router)();
 const storage = multer_1.default.diskStorage({
     destination: function (req, file, cb) {
@@ -245,17 +222,19 @@ exports.default = (app) => {
                     res.setHeader('QL-Task-Log', `${logPath}`);
                 },
                 onEnd: async (cp, endTime, diff) => {
+                    // Close the stream after task completion
+                    await logStreamManager_1.logStreamManager.closeStream(await (0, util_1.handleLogPath)(logPath));
                     res.end();
                 },
                 onError: async (message) => {
                     res.write(message);
                     const absolutePath = await (0, util_1.handleLogPath)(logPath);
-                    await fs.appendFile(absolutePath, message);
+                    await logStreamManager_1.logStreamManager.write(absolutePath, message);
                 },
                 onLog: async (message) => {
                     res.write(message);
                     const absolutePath = await (0, util_1.handleLogPath)(logPath);
-                    await fs.appendFile(absolutePath, message);
+                    await logStreamManager_1.logStreamManager.write(absolutePath, message);
                 },
             });
         }
@@ -357,6 +336,20 @@ exports.default = (app) => {
             return next(e);
         }
     });
+    route.put('/config/global-ssh-key', (0, celebrate_1.celebrate)({
+        body: celebrate_1.Joi.object({
+            globalSshKey: celebrate_1.Joi.string().allow('').allow(null),
+        }),
+    }), async (req, res, next) => {
+        try {
+            const systemService = typedi_1.Container.get(system_1.default);
+            const result = await systemService.updateGlobalSshKey(req.body);
+            res.send(result);
+        }
+        catch (e) {
+            return next(e);
+        }
+    });
     route.put('/config/dependence-clean', (0, celebrate_1.celebrate)({
         body: celebrate_1.Joi.object({
             type: celebrate_1.Joi.string().allow(''),

package/static/build/api/user.js

@@ -50,7 +50,8 @@ exports.default = (app) => {
         const logger = typedi_1.Container.get('logger');
         try {
             const userService = typedi_1.Container.get(user_1.default);
-            await userService.logout(req.platform);
+            const token = (0, util_1.getToken)(req);
+            await userService.logout(req.platform, token);
             res.send({ code: 200 });
         }
         catch (e) {