@whyour/qinglong 2.18.2-5 → 2.18.3-0

package/docker/310.Dockerfile

@@ -1,4 +1,4 @@
-FROM node:20-slim AS nodebuilder
+FROM node:22-slim AS nodebuilder
 
 FROM python:3.10-slim-bookworm AS builder
 COPY package.json .npmrc pnpm-lock.yaml /tmp/build/

package/docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:20-slim AS nodebuilder
+FROM node:22-slim AS nodebuilder
 
 FROM python:3.11-slim-bookworm AS builder
 COPY package.json .npmrc pnpm-lock.yaml /tmp/build/

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whyour/qinglong",
-  "version": "2.18.2-5",
+  "version": "2.18.3-0",
   "description": "Timed task management platform supporting Python3, JavaScript, Shell, Typescript",
   "repository": {
     "type": "git",

package/shell/preload/client.js

@@ -14,9 +14,6 @@ class GrpcClient {
     },
     grpcOptions: {
       'grpc.enable_http_proxy': 0,
-      'grpc.keepalive_time_ms': 120000,
-      'grpc.keepalive_timeout_ms': 20000,
-      'grpc.max_receive_message_length': 100 * 1024 * 1024,
     },
     defaultTimeout: 30000,
   };
@@ -59,23 +56,12 @@ class GrpcClient {
         grpc.credentials.createInsecure(),
         grpcOptions,
       );
-
-      this.#checkConnection();
     } catch (error) {
       console.error('Failed to initialize gRPC client:', error);
       process.exit(1);
     }
   }
 
-  #checkConnection() {
-    this.#client.waitForReady(Date.now() + 5000, (error) => {
-      if (error) {
-        console.error('gRPC client connection failed:', error);
-        process.exit(1);
-      }
-    });
-  }
-
   #promisifyMethod(methodName) {
     const capitalizedMethod =
       methodName.charAt(0).toUpperCase() + methodName.slice(1);

package/static/build/api/log.js

@@ -3,12 +3,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const celebrate_1 = require("celebrate");
 const express_1 = require("express");
 const typedi_1 = require("typedi");
 const config_1 = __importDefault(require("../config"));
 const util_1 = require("../config/util");
-const path_1 = require("path");
-const celebrate_1 = require("celebrate");
+const log_1 = __importDefault(require("../services/log"));
 const route = (0, express_1.Router)();
 const blacklist = ['.tmp'];
 exports.default = (app) => {
@@ -29,10 +29,13 @@ exports.default = (app) => {
     });
     route.get('/detail', async (req, res, next) => {
         try {
-            const finalPath = (0, path_1.resolve)(config_1.default.logPath, req.query.path || '', req.query.file || '');
-            if (blacklist.includes(req.query.path) ||
-                !finalPath.startsWith(config_1.default.logPath)) {
-                return res.send({ code: 403, message: '暂无权限' });
+            const logService = typedi_1.Container.get(log_1.default);
+            const finalPath = logService.checkFilePath(req.query.path || '', req.query.file || '');
+            if (!finalPath || blacklist.includes(req.query.path)) {
+                return res.send({
+                    code: 403,
+                    message: '暂无权限',
+                });
             }
             const content = await (0, util_1.getFileContentByName)(finalPath);
             res.send({ code: 200, data: (0, util_1.removeAnsi)(content) });
@@ -43,10 +46,13 @@ exports.default = (app) => {
     });
     route.get('/:file', async (req, res, next) => {
         try {
-            const finalPath = (0, path_1.resolve)(config_1.default.logPath, req.query.path || '', req.params.file || '');
-            if (blacklist.includes(req.path) ||
-                !finalPath.startsWith(config_1.default.logPath)) {
-                return res.send({ code: 403, message: '暂无权限' });
+            const logService = typedi_1.Container.get(log_1.default);
+            const finalPath = logService.checkFilePath(req.query.path || '', req.query.file || '');
+            if (!finalPath || blacklist.includes(req.query.path)) {
+                return res.send({
+                    code: 403,
+                    message: '暂无权限',
+                });
             }
             const content = await (0, util_1.getFileContentByName)(finalPath);
             res.send({ code: 200, data: content });
@@ -63,14 +69,47 @@ exports.default = (app) => {
         }),
     }), async (req, res, next) => {
         try {
-            let { filename, path, type } = req.body;
-            const filePath = (0, path_1.join)(config_1.default.logPath, path, filename);
-            await (0, util_1.rmPath)(filePath);
+            let { filename, path } = req.body;
+            const logService = typedi_1.Container.get(log_1.default);
+            const finalPath = logService.checkFilePath(filename, path);
+            if (!finalPath || blacklist.includes(path)) {
+                return res.send({
+                    code: 403,
+                    message: '暂无权限',
+                });
+            }
+            await (0, util_1.rmPath)(finalPath);
             res.send({ code: 200 });
         }
         catch (e) {
             return next(e);
         }
     });
+    route.post('/download', (0, celebrate_1.celebrate)({
+        body: celebrate_1.Joi.object({
+            filename: celebrate_1.Joi.string().required(),
+            path: celebrate_1.Joi.string().allow(''),
+        }),
+    }), async (req, res, next) => {
+        try {
+            let { filename, path } = req.body;
+            const logService = typedi_1.Container.get(log_1.default);
+            const filePath = logService.checkFilePath(path, filename);
+            if (!filePath) {
+                return res.send({
+                    code: 403,
+                    message: '暂无权限',
+                });
+            }
+            return res.download(filePath, filename, (err) => {
+                if (err) {
+                    return next(err);
+                }
+            });
+        }
+        catch (e) {
+            return next(e);
+        }
+    });
 };
 //# sourceMappingURL=log.js.map

package/static/build/api/script.js

@@ -105,7 +105,6 @@ exports.default = (app) => {
         }
     });
     route.post('/', upload.single('file'), async (req, res, next) => {
-        const logger = typedi_1.Container.get('logger');
         try {
             let { filename, path, content, originFilename, directory } = req.body;
             if (!path) {
@@ -119,8 +118,8 @@ exports.default = (app) => {
             }
             if (config_1.default.writePathList.every((x) => !path.startsWith(x))) {
                 return res.send({
-                    code: 430,
-                    message: '文件路径禁止访问',
+                    code: 403,
+                    message: '暂无权限',
                 });
             }
             if (req.file) {
@@ -157,10 +156,16 @@ exports.default = (app) => {
             content: celebrate_1.Joi.string().required().allow(''),
         }),
     }), async (req, res, next) => {
-        const logger = typedi_1.Container.get('logger');
         try {
             let { filename, content, path } = req.body;
-            const filePath = (0, path_1.join)(config_1.default.scriptPath, path, filename);
+            const scriptService = typedi_1.Container.get(script_1.default);
+            const filePath = scriptService.checkFilePath(path, filename);
+            if (!filePath) {
+                return res.send({
+                    code: 403,
+                    message: '暂无权限',
+                });
+            }
             await (0, utils_1.writeFileWithLock)(filePath, content);
             return res.send({ code: 200 });
         }
@@ -172,13 +177,18 @@ exports.default = (app) => {
         body: celebrate_1.Joi.object({
             filename: celebrate_1.Joi.string().required(),
             path: celebrate_1.Joi.string().allow(''),
-            type: celebrate_1.Joi.string().optional(),
         }),
     }), async (req, res, next) => {
-        const logger = typedi_1.Container.get('logger');
         try {
-            let { filename, path, type } = req.body;
-            const filePath = (0, path_1.join)(config_1.default.scriptPath, path, filename);
+            let { filename, path } = req.body;
+            const scriptService = typedi_1.Container.get(script_1.default);
+            const filePath = scriptService.checkFilePath(path, filename);
+            if (!filePath) {
+                return res.send({
+                    code: 403,
+                    message: '暂无权限',
+                });
+            }
             await (0, util_1.rmPath)(filePath);
             res.send({ code: 200 });
         }
@@ -189,21 +199,23 @@ exports.default = (app) => {
     route.post('/download', (0, celebrate_1.celebrate)({
         body: celebrate_1.Joi.object({
             filename: celebrate_1.Joi.string().required(),
+            path: celebrate_1.Joi.string().allow(''),
         }),
     }), async (req, res, next) => {
-        const logger = typedi_1.Container.get('logger');
         try {
-            let { filename } = req.body;
-            const filePath = (0, path_1.join)(config_1.default.scriptPath, filename);
-            // const stats = fs.statSync(filePath);
-            // res.set({
-            //   'Content-Type': 'application/octet-stream', //告诉浏览器这是一个二进制文件
-            //   'Content-Disposition': 'attachment; filename=' + filename, //告诉浏览器这是一个需要下载的文件
-            //   'Content-Length': stats.size  //文件大小
-            // });
-            // fs.createReadStream(filePath).pipe(res);
+            let { filename, path } = req.body;
+            const scriptService = typedi_1.Container.get(script_1.default);
+            const filePath = scriptService.checkFilePath(path, filename);
+            if (!filePath) {
+                return res.send({
+                    code: 403,
+                    message: '暂无权限',
+                });
+            }
             return res.download(filePath, filename, (err) => {
-                return next(err);
+                if (err) {
+                    return next(err);
+                }
             });
         }
         catch (e) {

package/static/build/loaders/initTask.js

@@ -32,17 +32,20 @@ exports.default = async () => {
     }, true);
     // 运行删除日志任务
     const data = await systemService.getSystemConfig();
-    if (data && data.info && data.info.logRemoveFrequency) {
-        const rmlogCron = {
-            id: data.id,
-            name: '删除日志',
-            command: `ql rmlog ${data.info.logRemoveFrequency}`,
-            runOrigin: 'system',
-        };
-        await scheduleService.cancelIntervalTask(rmlogCron);
-        scheduleService.createIntervalTask(rmlogCron, {
-            days: data.info.logRemoveFrequency,
-        }, true);
+    if (data && data.info) {
+        if (data.info.logRemoveFrequency) {
+            const rmlogCron = {
+                id: data.id,
+                name: '删除日志',
+                command: `ql rmlog ${data.info.logRemoveFrequency}`,
+                runOrigin: 'system',
+            };
+            await scheduleService.cancelIntervalTask(rmlogCron);
+            scheduleService.createIntervalTask(rmlogCron, {
+                days: data.info.logRemoveFrequency,
+            }, true);
+        }
+        systemService.updateTimezone(data.info);
     }
     await subscriptionService.setSshConfig();
     const subs = await subscriptionService.list();

package/static/build/services/log.js

@@ -0,0 +1,37 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const path_1 = __importDefault(require("path"));
+const typedi_1 = require("typedi");
+const winston_1 = __importDefault(require("winston"));
+const config_1 = __importDefault(require("../config"));
+let LogService = class LogService {
+    constructor(logger) {
+        this.logger = logger;
+    }
+    checkFilePath(filePath, fileName) {
+        const finalPath = path_1.default.resolve(config_1.default.logPath, filePath, fileName);
+        return finalPath.startsWith(config_1.default.logPath) ? finalPath : '';
+    }
+};
+LogService = __decorate([
+    (0, typedi_1.Service)(),
+    __param(0, (0, typedi_1.Inject)('logger')),
+    __metadata("design:paramtypes", [winston_1.default.Logger])
+], LogService);
+exports.default = LogService;
+//# sourceMappingURL=log.js.map

package/static/build/services/script.js

@@ -69,9 +69,13 @@ let ScriptService = class ScriptService {
         catch (error) { }
         return { code: 200 };
     }
-    async getFile(filePath, fileName) {
+    checkFilePath(filePath, fileName) {
         const finalPath = path_1.default.resolve(config_1.default.scriptPath, filePath, fileName);
-        if (!finalPath.startsWith(config_1.default.scriptPath)) {
+        return finalPath.startsWith(config_1.default.scriptPath) ? finalPath : '';
+    }
+    async getFile(filePath, fileName) {
+        const finalPath = this.checkFilePath(filePath, fileName);
+        if (!finalPath) {
             return '';
         }
         const content = await (0, util_1.getFileContentByName)(finalPath);