@whyour/qinglong 0.13.3 → 0.14.1

package/shell/update.sh

@@ -138,7 +138,7 @@ update_repo() {
     echo -e "\n拉取 ${uniq_path} 成功...\n"
     diff_scripts "$repo_path" "$author" "$path" "$blackword" "$dependence" "$extensions" "$autoAddCron" "$autoDelCron"
   else
-    echo -e "\n拉取 ${uniq_path} 失败，请检查网络...\n"
+    echo -e "\n拉取 ${uniq_path} 失败，请检查日志...\n"
   fi
 }
 
@@ -245,6 +245,7 @@ reload_qinglong() {
   fi
 
   if [[ "$reload_target" == 'data' ]]; then
+    rm -rf ${dir_root}/data
     cp -rf ${dir_tmp}/data ${dir_root}/
   fi
 
@@ -300,11 +301,6 @@ update_qinglong_static() {
 
 check_update_dep() {
   echo -e "\n开始检测依赖...\n"
-  if [[ ! -s $dir_scripts/package.json ]] || [[ $(diff $dir_sample/package.json $dir_scripts/package.json) ]]; then
-    cp -f $dir_sample/package.json $dir_scripts/package.json
-    npm_install_2 $dir_scripts
-  fi
-
   if [[ $(diff $dir_root/package.json ${dir_tmp}/qinglong-${primary_branch}/package.json) ]]; then
     npm_install_2 "${dir_tmp}/qinglong-${primary_branch}"
   fi
@@ -476,8 +472,10 @@ main() {
   local log_path="${log_dir}/${log_time}.log"
   local file_path="$dir_log/$log_path"
 
-  cmd=">> $file_path 2>&1"
-  [[ "$show_log" == "true" ]] && cmd=""
+  cmd="2>&1 | tee -a $file_path"
+  if [[ "$no_tee" == "true" ]]; then
+    cmd=">> $file_path 2>&1"
+  fi
 
   local time_format="%Y-%m-%d %H:%M:%S"
   local time=$(date "+$time_format")
@@ -490,11 +488,6 @@ main() {
     eval echo -e "\#\# 开始执行... $begin_time\\\n" $cmd
   fi
 
-  if [[ "$show_log" == "true" ]] && [[ $ID ]]; then
-    eval echo -e "请移除 -l 参数" $cmd
-    exit 1
-  fi
-
   case $p1 in
   update)
     fix_config
@@ -559,10 +552,6 @@ main() {
   if [[ "$p1" != "repo" ]] && [[ "$p1" != "raw" ]]; then
     eval echo -e "\\\n\#\# 执行结束... $end_time  耗时 $diff_time 秒　　　　　" $cmd
   fi
-
-  if [[ -f $file_path ]]; then
-    cat $file_path
-  fi
 }
 
 main "$@"

package/static/build/api/config.js

@@ -30,16 +30,29 @@ const util_1 = require("../config/util");
 const express_1 = require("express");
 const typedi_1 = require("typedi");
 const config_1 = __importDefault(require("../config"));
-const fs = __importStar(require("fs"));
+const fs = __importStar(require("fs/promises"));
 const celebrate_1 = require("celebrate");
 const path_1 = require("path");
+const const_1 = require("../config/const");
+const got_1 = __importDefault(require("got"));
 const route = (0, express_1.Router)();
 exports.default = (app) => {
     app.use('/configs', route);
+    route.get('/samples', async (req, res, next) => {
+        try {
+            res.send({
+                code: 200,
+                data: const_1.SAMPLE_FILES,
+            });
+        }
+        catch (e) {
+            return next(e);
+        }
+    });
     route.get('/files', async (req, res, next) => {
         const logger = typedi_1.Container.get('logger');
         try {
-            const fileList = fs.readdirSync(config_1.default.configPath, 'utf-8');
+            const fileList = await fs.readdir(config_1.default.configPath, 'utf-8');
             res.send({
                 code: 200,
                 data: fileList
@@ -60,11 +73,15 @@ exports.default = (app) => {
             if (config_1.default.blackFileList.includes(req.params.file)) {
                 res.send({ code: 403, message: '文件无法访问' });
             }
-            if (req.params.file.includes('sample')) {
-                content = (0, util_1.getFileContentByName)((0, path_1.join)(config_1.default.samplePath, req.params.file));
+            if (req.params.file.startsWith('sample/')) {
+                const res = await got_1.default.get(`https://gitlab.com/whyour/qinglong/-/raw/master/${req.params.file}`);
+                content = res.body;
+            }
+            else if (req.params.file.startsWith('data/scripts/')) {
+                content = await (0, util_1.getFileContentByName)((0, path_1.join)(config_1.default.rootPath, req.params.file));
             }
             else {
-                content = (0, util_1.getFileContentByName)((0, path_1.join)(config_1.default.configPath, req.params.file));
+                content = await (0, util_1.getFileContentByName)((0, path_1.join)(config_1.default.configPath, req.params.file));
             }
             res.send({ code: 200, data: content });
         }
@@ -85,7 +102,7 @@ exports.default = (app) => {
                 res.send({ code: 403, message: '文件无法访问' });
             }
             const path = (0, path_1.join)(config_1.default.configPath, name);
-            fs.writeFileSync(path, content);
+            await fs.writeFile(path, content);
             res.send({ code: 200, message: '保存成功' });
         }
         catch (e) {

package/static/build/api/log.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"));
 const config_1 = __importDefault(require("../config"));
 const util_1 = require("../config/util");
 const path_1 = require("path");
@@ -40,7 +16,7 @@ exports.default = (app) => {
     route.get('/', async (req, res, next) => {
         const logger = typedi_1.Container.get('logger');
         try {
-            const result = (0, util_1.readDirs)(config_1.default.logPath, config_1.default.logPath, blacklist);
+            const result = await (0, util_1.readDirs)(config_1.default.logPath, config_1.default.logPath, blacklist);
             res.send({
                 code: 200,
                 data: result,
@@ -58,7 +34,7 @@ exports.default = (app) => {
                 return res.send({ code: 403, message: '暂无权限' });
             }
             const filePath = (0, path_1.join)(config_1.default.logPath, (req.query.path || ''), req.params.file);
-            const content = (0, util_1.getFileContentByName)(filePath);
+            const content = await (0, util_1.getFileContentByName)(filePath);
             res.send({ code: 200, data: content });
         }
         catch (e) {
@@ -75,12 +51,7 @@ exports.default = (app) => {
         try {
             let { filename, path, type } = req.body;
             const filePath = (0, path_1.join)(config_1.default.logPath, path, filename);
-            if (type === 'directory') {
-                await (0, util_1.emptyDir)(filePath);
-            }
-            else {
-                fs.unlinkSync(filePath);
-            }
+            await (0, util_1.rmPath)(filePath);
             res.send({ code: 200 });
         }
         catch (e) {

package/static/build/api/script.js

@@ -30,7 +30,7 @@ const util_1 = require("../config/util");
 const express_1 = require("express");
 const typedi_1 = require("typedi");
 const config_1 = __importDefault(require("../config"));
-const fs = __importStar(require("fs"));
+const fs = __importStar(require("fs/promises"));
 const celebrate_1 = require("celebrate");
 const path_1 = __importStar(require("path"));
 const script_1 = __importDefault(require("../services/script"));
@@ -51,13 +51,27 @@ exports.default = (app) => {
         const logger = typedi_1.Container.get('logger');
         try {
             let result = [];
-            const blacklist = ['node_modules', '.git', '.pnpm'];
+            const blacklist = [
+                'node_modules',
+                '.git',
+                '.pnpm',
+                'pnpm-lock.yaml',
+                'yarn.lock',
+                'package-lock.json',
+            ];
             if (req.query.path) {
                 const targetPath = path_1.default.join(config_1.default.scriptPath, req.query.path);
-                result = (0, util_1.readDir)(targetPath, config_1.default.scriptPath, blacklist);
+                result = await (0, util_1.readDir)(targetPath, config_1.default.scriptPath, blacklist);
             }
             else {
-                result = (0, util_1.readDirs)(config_1.default.scriptPath, config_1.default.scriptPath, blacklist);
+                result = await (0, util_1.readDirs)(config_1.default.scriptPath, config_1.default.scriptPath, blacklist, (a, b) => {
+                    if (a.type === b.type) {
+                        return a.title.localeCompare(b.title);
+                    }
+                    else {
+                        return a.type === 'directory' ? -1 : 1;
+                    }
+                });
             }
             res.send({
                 code: 200,
@@ -73,7 +87,7 @@ exports.default = (app) => {
         const logger = typedi_1.Container.get('logger');
         try {
             const filePath = (0, path_1.join)(config_1.default.scriptPath, req.query.path, req.params.file);
-            const content = (0, util_1.getFileContentByName)(filePath);
+            const content = await (0, util_1.getFileContentByName)(filePath);
             res.send({ code: 200, data: content });
         }
         catch (e) {
@@ -100,11 +114,11 @@ exports.default = (app) => {
                 });
             }
             if (req.file) {
-                fs.renameSync(req.file.path, (0, path_1.join)(path, req.file.filename));
+                await fs.rename(req.file.path, (0, path_1.join)(path, req.file.filename));
                 return res.send({ code: 200 });
             }
             if (directory) {
-                fs.mkdirSync((0, path_1.join)(path, directory), { recursive: true });
+                await fs.mkdir((0, path_1.join)(path, directory), { recursive: true });
                 return res.send({ code: 200 });
             }
             if (!originFilename) {
@@ -112,13 +126,14 @@ exports.default = (app) => {
             }
             const originFilePath = (0, path_1.join)(path, `${originFilename.replace(/\//g, '')}`);
             const filePath = (0, path_1.join)(path, `${filename.replace(/\//g, '')}`);
-            if (fs.existsSync(originFilePath)) {
-                fs.copyFileSync(originFilePath, (0, path_1.join)(config_1.default.bakPath, originFilename.replace(/\//g, '')));
+            const fileExists = await (0, util_1.fileExist)(filePath);
+            if (fileExists) {
+                await fs.copyFile(originFilePath, (0, path_1.join)(config_1.default.bakPath, originFilename.replace(/\//g, '')));
                 if (filename !== originFilename) {
-                    fs.unlinkSync(originFilePath);
+                    await (0, util_1.rmPath)(originFilePath);
                 }
             }
-            fs.writeFileSync(filePath, content);
+            await fs.writeFile(filePath, content);
             return res.send({ code: 200 });
         }
         catch (e) {
@@ -136,7 +151,7 @@ exports.default = (app) => {
         try {
             let { filename, content, path } = req.body;
             const filePath = (0, path_1.join)(config_1.default.scriptPath, path, filename);
-            fs.writeFileSync(filePath, content);
+            await fs.writeFile(filePath, content);
             return res.send({ code: 200 });
         }
         catch (e) {
@@ -154,12 +169,7 @@ exports.default = (app) => {
         try {
             let { filename, path, type } = req.body;
             const filePath = (0, path_1.join)(config_1.default.scriptPath, path, filename);
-            if (type === 'directory') {
-                await (0, util_1.emptyDir)(filePath);
-            }
-            else {
-                fs.unlinkSync(filePath);
-            }
+            await (0, util_1.rmPath)(filePath);
             res.send({ code: 200 });
         }
         catch (e) {
@@ -202,7 +212,7 @@ exports.default = (app) => {
             let { filename, content, path } = req.body;
             const { name, ext } = (0, path_1.parse)(filename);
             const filePath = (0, path_1.join)(config_1.default.scriptPath, path, `${name}.swap${ext}`);
-            fs.writeFileSync(filePath, content || '', { encoding: 'utf8' });
+            await fs.writeFile(filePath, content || '', { encoding: 'utf8' });
             const scriptService = typedi_1.Container.get(script_1.default);
             const result = await scriptService.runScript(filePath);
             res.send(result);
@@ -226,7 +236,7 @@ exports.default = (app) => {
             const scriptService = typedi_1.Container.get(script_1.default);
             const result = await scriptService.stopScript(filePath, pid);
             setTimeout(() => {
-                (0, util_1.emptyDir)(logPath);
+                (0, util_1.rmPath)(logPath);
             }, 3000);
             res.send(result);
         }
@@ -245,7 +255,7 @@ exports.default = (app) => {
             let { filename, path, type, newFilename } = req.body;
             const filePath = (0, path_1.join)(config_1.default.scriptPath, path, filename);
             const newPath = (0, path_1.join)(config_1.default.scriptPath, path, newFilename);
-            fs.renameSync(filePath, newPath);
+            await fs.rename(filePath, newPath);
             res.send({ code: 200 });
         }
         catch (e) {

package/static/build/api/system.js

@@ -28,7 +28,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const express_1 = require("express");
 const typedi_1 = require("typedi");
-const fs = __importStar(require("fs"));
+const fs = __importStar(require("fs/promises"));
 const config_1 = __importDefault(require("../config"));
 const system_1 = __importDefault(require("../services/system"));
 const celebrate_1 = require("celebrate");
@@ -88,22 +88,90 @@ exports.default = (app) => {
             return next(e);
         }
     });
-    route.put('/config', (0, celebrate_1.celebrate)({
+    route.put('/config/log-remove-frequency', (0, celebrate_1.celebrate)({
         body: celebrate_1.Joi.object({
-            logRemoveFrequency: celebrate_1.Joi.number().optional().allow(null),
-            cronConcurrency: celebrate_1.Joi.number().optional().allow(null),
+            logRemoveFrequency: celebrate_1.Joi.number().allow(null),
+        }),
+    }), async (req, res, next) => {
+        try {
+            const systemService = typedi_1.Container.get(system_1.default);
+            const result = await systemService.updateLogRemoveFrequency(req.body);
+            res.send(result);
+        }
+        catch (e) {
+            return next(e);
+        }
+    });
+    route.put('/config/cron-concurrency', (0, celebrate_1.celebrate)({
+        body: celebrate_1.Joi.object({
+            cronConcurrency: celebrate_1.Joi.number().allow(null),
+        }),
+    }), async (req, res, next) => {
+        try {
+            const systemService = typedi_1.Container.get(system_1.default);
+            const result = await systemService.updateCronConcurrency(req.body);
+            res.send(result);
+        }
+        catch (e) {
+            return next(e);
+        }
+    });
+    route.put('/config/dependence-proxy', (0, celebrate_1.celebrate)({
+        body: celebrate_1.Joi.object({
+            dependenceProxy: 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.updateDependenceProxy(req.body);
+            res.send(result);
+        }
+        catch (e) {
+            return next(e);
+        }
+    });
+    route.put('/config/node-mirror', (0, celebrate_1.celebrate)({
+        body: celebrate_1.Joi.object({
+            nodeMirror: celebrate_1.Joi.string().allow('').allow(null),
+        }),
+    }), async (req, res, next) => {
+        try {
+            const systemService = typedi_1.Container.get(system_1.default);
+            res.setHeader('Content-type', 'application/octet-stream');
+            await systemService.updateNodeMirror(req.body, res);
+        }
+        catch (e) {
+            return next(e);
+        }
+    });
+    route.put('/config/python-mirror', (0, celebrate_1.celebrate)({
+        body: celebrate_1.Joi.object({
+            pythonMirror: celebrate_1.Joi.string().allow('').allow(null),
         }),
     }), async (req, res, next) => {
-        const logger = typedi_1.Container.get('logger');
         try {
             const systemService = typedi_1.Container.get(system_1.default);
-            const result = await systemService.updateSystemConfig(req.body);
+            const result = await systemService.updatePythonMirror(req.body);
             res.send(result);
         }
         catch (e) {
             return next(e);
         }
     });
+    route.put('/config/linux-mirror', (0, celebrate_1.celebrate)({
+        body: celebrate_1.Joi.object({
+            linuxMirror: celebrate_1.Joi.string().allow('').allow(null),
+        }),
+    }), async (req, res, next) => {
+        try {
+            const systemService = typedi_1.Container.get(system_1.default);
+            res.setHeader('Content-type', 'application/octet-stream');
+            await systemService.updateLinuxMirror(req.body, res);
+        }
+        catch (e) {
+            return next(e);
+        }
+    });
     route.put('/update-check', async (req, res, next) => {
         const logger = typedi_1.Container.get('logger');
         try {
@@ -181,12 +249,12 @@ exports.default = (app) => {
                 onError: async (message) => {
                     res.write(`\n${message}`);
                     const absolutePath = await (0, util_1.handleLogPath)(logPath);
-                    fs.appendFileSync(absolutePath, `\n${message}`);
+                    await fs.appendFile(absolutePath, `\n${message}`);
                 },
                 onLog: async (message) => {
                     res.write(`\n${message}`);
                     const absolutePath = await (0, util_1.handleLogPath)(logPath);
-                    fs.appendFileSync(absolutePath, `\n${message}`);
+                    await fs.appendFile(absolutePath, `\n${message}`);
                 },
             });
         }

package/static/build/config/const.js

@@ -1,9 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.QL_PREFIX = exports.TASK_PREFIX = exports.QL_COMMAND = exports.TASK_COMMAND = exports.LOG_END_SYMBOL = void 0;
+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';
 exports.TASK_PREFIX = `${exports.TASK_COMMAND} `;
 exports.QL_PREFIX = `${exports.QL_COMMAND} `;
+exports.SAMPLE_FILES = [
+    {
+        title: 'config.sample.sh',
+        value: 'sample/config.sample.sh',
+        target: 'config.sh',
+    },
+    {
+        title: 'notify.js',
+        value: 'sample/notify.js',
+        target: 'data/scripts/sendNotify.js',
+    },
+    {
+        title: 'notify.py',
+        value: 'sample/notify.py',
+        target: 'data/scripts/notify.py',
+    },
+];
 //# sourceMappingURL=const.js.map

package/static/build/config/index.js

@@ -48,6 +48,7 @@ const configString = 'config sample crontab shareCode diy';
 const versionFile = path_1.default.join(rootPath, 'version.yaml');
 const dataTgzFile = path_1.default.join(tmpPath, 'data.tgz');
 const shareShellFile = path_1.default.join(shellPath, 'share.sh');
+const dependenceProxyFile = path_1.default.join(configPath, 'dependence-proxy.sh');
 if (envFound.error) {
     throw new Error("⚠️  Couldn't find .env file  ⚠️");
 }
@@ -67,6 +68,7 @@ exports.default = {
     dataPath,
     dataTgzFile,
     shareShellFile,
+    dependenceProxyFile,
     configString,
     loginFaild,
     authError,
@@ -88,6 +90,7 @@ exports.default = {
         'config.sh.sample',
         'cookie.sh',
         'crontab.list',
+        'dependence-proxy.sh',
         'env.sh',
         'token.json',
     ],