@whyour/qinglong 0.15.6 → 0.17.0

package/shell/check.sh

@@ -81,6 +81,7 @@ main() {
   check_ql
   check_nginx
   check_pm2
+  reload_update
   reload_pm2
   echo -e "\n=====> 检测结束\n"
 }

package/shell/share.sh

@@ -298,7 +298,7 @@ git_clone_scripts() {
 
   set_proxy "$proxy"
 
-  git clone --depth=1 $part_cmd $url $dir
+  git clone -q --depth=1 $part_cmd $url $dir
   exit_status=$?
 
   unset_proxy
@@ -310,6 +310,11 @@ random_range() {
   echo $((RANDOM % ($end - $beg) + $beg))
 }
 
+delete_pm2() {
+  cd $dir_root
+  pm2 delete ecosystem.config.js
+}
+
 reload_pm2() {
   cd $dir_root
   restore_env_vars
@@ -317,6 +322,13 @@ 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"

package/shell/update.sh

@@ -34,7 +34,6 @@ output_list_add_drop() {
   if [[ -s $list ]]; then
     echo -e "检测到有${type}的定时任务:"
     cat $list
-    echo
   fi
 }
 
@@ -45,7 +44,7 @@ del_cron() {
   local path=$2
   local detail=""
   local ids=""
-  echo -e "开始尝试自动删除失效的定时任务..."
+  echo -e "\n开始尝试自动删除失效的定时任务..."
   for cron in $(cat $list_drop); do
     local id=$(cat $list_crontab_user | grep -E "$cmd_task.* $cron" | perl -pe "s|.*ID=(.*) $cmd_task.* $cron\.*|\1|" | head -1 | awk -F " " '{print $1}')
     if [[ $ids ]]; then
@@ -76,7 +75,7 @@ del_cron() {
 add_cron() {
   local list_add=$1
   local path=$2
-  echo -e "开始尝试自动添加定时任务..."
+  echo -e "\n开始尝试自动添加定时任务..."
   local detail=""
   cd $dir_scripts
   for file in $(cat $list_add); do
@@ -86,19 +85,20 @@ add_cron() {
       cron_line=$(
         perl -ne "{
                         print if /.*([\d\*]*[\*-\/,\d]*[\d\*] ){4,5}[\d\*]*[\*-\/,\d]*[\d\*]( |,|\").*$file_name/
-                    }" $file |
+                    }" $file 2>/dev/null |
           perl -pe "{
                         s|[^\d\*]*(([\d\*]*[\*-\/,\d]*[\d\*] ){4,5}[\d\*]*[\*-\/,\d]*[\d\*])( \|,\|\").*/?$file_name.*|\1|g;
                         s|\*([\d\*])(.*)|\1\2|g;
                         s|  | |g;
-                    }" | sort -u | head -1
+                    }" 2>/dev/null | sort -u | head -1
       )
-      cron_name=$(grep "new Env" $file | awk -F "\(" '{print $2}' | awk -F "\)" '{print $1}' | sed 's:.*\('\''\|"\)\([^"'\'']*\)\('\''\|"\).*:\2:' | sed 's:"::g' | sed "s:'::g" | head -1)
-      [[ -z $cron_name ]] && cron_name="$file_name"
       [[ -z $cron_line ]] && cron_line=$(grep "cron:" $file | awk -F ":" '{print $2}' | head -1 | xargs)
       [[ -z $cron_line ]] && cron_line=$(grep "cron " $file | awk -F "cron \"" '{print $2}' | awk -F "\" " '{print $1}' | head -1 | xargs)
       [[ -z $cron_line ]] && cron_line="$default_cron"
-      result=$(add_cron_api "$cron_line:$cmd_task $file:$cron_name:$SUB_ID")
+      cron_name=$(grep "new Env" $file | awk -F "\(" '{print $2}' | awk -F "\)" '{print $1}' | sed 's:.*\('\''\|"\)\([^"'\'']*\)\('\''\|"\).*:\2:' | sed 's:"::g' | sed "s:'::g" | head -1)
+      [[ -z $cron_name ]] && cron_name=$(grep "name:" $file | awk -F ":" '{print $2}' | head -1 | xargs)
+      [[ -z $cron_name ]] && cron_name=$(basename "$file_name")
+      result=$(add_cron_api "${cron_line}:${cmd_task} ${file}:${cron_name}:${SUB_ID}")
       echo -e "$result"
       if [[ $detail ]]; then
         detail="${detail}${result}\n"
@@ -135,10 +135,10 @@ update_repo() {
   git_clone_scripts "${formatUrl}" ${repo_path} "${branch}" "${proxy}"
 
   if [[ $exit_status -eq 0 ]]; then
-    echo -e "\n拉取 ${uniq_path} 成功...\n"
+    echo -e "拉取 ${uniq_path} 成功...\n"
     diff_scripts "$repo_path" "$author" "$path" "$blackword" "$dependence" "$extensions" "$autoAddCron" "$autoDelCron"
   else
-    echo -e "\n拉取 ${uniq_path} 失败，请检查日志...\n"
+    echo -e "拉取 ${uniq_path} 失败，请检查日志...\n"
   fi
 }
 
@@ -195,7 +195,7 @@ update_raw() {
       [[ -z $cron_line ]] && cron_line=$(grep "cron:" $raw_file_name | awk -F ":" '{print $2}' | head -1 | xargs)
       [[ -z $cron_line ]] && cron_line=$(grep "cron " $raw_file_name | awk -F "cron \"" '{print $2}' | awk -F "\" " '{print $1}' | head -1 | xargs)
       [[ -z $cron_line ]] && cron_line="$default_cron"
-      result=$(add_cron_api "$cron_line:$cmd_task $filename:$cron_name:$SUB_ID")
+      result=$(add_cron_api "${cron_line}:${cmd_task} ${filename}:${cron_name}:${SUB_ID}")
       echo -e "$result\n"
       notify_api "新增任务通知" "\n$result"
       # update_cron_api "$cron_line:$cmd_task $filename:$cron_name:$cron_id"
@@ -231,22 +231,25 @@ usage() {
 }
 
 reload_qinglong() {
+  delete_pm2
+
   local reload_target="${1}"
   local primary_branch="master"
-  if [[ "${QL_BRANCH}" == "develop" ]]; then
-    primary_branch="develop"
+  if [[ "${QL_BRANCH}" == "develop" ]] || [[ "${QL_BRANCH}" == "debian" ]] || [[ "${QL_BRANCH}" == "debian-dev" ]]; then
+    primary_branch="${QL_BRANCH}"
   fi
 
   if [[ "$reload_target" == 'system' ]]; then
-    cp -rf ${dir_tmp}/qinglong-${primary_branch}/* ${dir_root}/
+    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/*
-    cp -rf ${dir_tmp}/qinglong-static-${primary_branch}/* ${dir_static}/
+    mv -f ${dir_tmp}/qinglong-static-${primary_branch}/* ${dir_static}/
     cp -f $file_config_sample $dir_config/config.sample.sh
   fi
 
   if [[ "$reload_target" == 'data' ]]; then
-    rm -rf ${dir_root}/data
-    cp -rf ${dir_tmp}/data ${dir_root}/
+    rm -rf ${dir_root}/data/*
+    mv -f ${dir_tmp}/data/* ${dir_root}/data/
   fi
 
   reload_pm2
@@ -258,7 +261,7 @@ update_qinglong() {
   local mirror="gitee"
   local downloadQLUrl="https://gitee.com/whyour/qinglong/repository/archive"
   local downloadStaticUrl="https://gitee.com/whyour/qinglong-static/repository/archive"
-  local githubStatus=$(curl -s -m 2 -IL "https://google.com" | grep 200)
+  local githubStatus=$(curl -s --noproxy "*" -m 2 -IL "https://google.com" | grep 200)
   if [[ ! -z $githubStatus ]]; then
     mirror="github"
     downloadQLUrl="https://github.com/whyour/qinglong/archive/refs/heads"
@@ -310,9 +313,12 @@ check_update_dep() {
     echo -e "更新包下载成功..."
 
     if [[ "$needRestart" == 'true' ]]; then
-      cp -rf ${dir_tmp}/qinglong-${primary_branch}/* ${dir_root}/
+      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/*
-      cp -rf ${dir_tmp}/qinglong-static-${primary_branch}/* ${dir_static}/
+      mv -f ${dir_tmp}/qinglong-static-${primary_branch}/* ${dir_static}/
       cp -f $file_config_sample $dir_config/config.sample.sh
 
       reload_pm2
@@ -417,9 +423,15 @@ gen_list_repo() {
   fi
 
   for file in ${files}; do
+    dirPath=$(dirname "$file")
     filename=$(basename "$file")
-    cp -f $file "$dir_scripts/${uniq_path}/${filename}"
-    echo "${uniq_path}/${filename}" >>"$dir_list_tmp/${uniq_path}_scripts.list"
+    filePath="${uniq_path}/${filename}"
+    if [[ $dirPath ]] && [[ $dirPath != '.' ]]; then
+      mkdir -p "${dir_scripts}/${uniq_path}/${dirPath}"
+      filePath="${uniq_path}/${dirPath}/${filename}"
+    fi
+    cp -f $file "${dir_scripts}/$filePath"
+    echo "$filePath" >>"$dir_list_tmp/${uniq_path}_scripts.list"
     # cron_id=$(cat $list_crontab_user | grep -E "$cmd_task.* ${uniq_path}_${filename}" | perl -pe "s|.*ID=(.*) $cmd_task.* ${uniq_path}_${filename}\.*|\1|" | head -1 | awk -F " " '{print $1}')
     # if [[ $cron_id ]]; then
     #   result=$(update_cron_command_api "$cmd_task ${uniq_path}/${filename}:$cron_id")

package/static/build/api/dependence.js

@@ -111,5 +111,17 @@ exports.default = (app) => {
             return next(e);
         }
     });
+    route.put('/cancel', (0, celebrate_1.celebrate)({
+        body: celebrate_1.Joi.array().items(celebrate_1.Joi.number().required()),
+    }), async (req, res, next) => {
+        try {
+            const dependenceService = typedi_1.Container.get(dependence_1.default);
+            await dependenceService.cancel(req.body);
+            return res.send({ code: 200 });
+        }
+        catch (e) {
+            return next(e);
+        }
+    });
 };
 //# sourceMappingURL=dependence.js.map

package/static/build/config/index.js

@@ -56,6 +56,7 @@ 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',

package/static/build/config/util.js

@@ -352,30 +352,33 @@ function parseHeaders(headers) {
     return parsed;
 }
 exports.parseHeaders = parseHeaders;
-function parseBody(body, contentType) {
+function parseString(input, valueFormatFn) {
+    const regex = /(\w+):\s*((?:(?!\n\w+:).)*)/g;
+    const matches = {};
+    let match;
+    while ((match = regex.exec(input)) !== null) {
+        const [, key, value] = match;
+        const _key = key.trim();
+        if (!_key || matches[_key]) {
+            continue;
+        }
+        let _value = value.trim();
+        try {
+            _value = valueFormatFn ? valueFormatFn(_value) : _value;
+            const jsonValue = JSON.parse(_value);
+            matches[_key] = jsonValue;
+        }
+        catch (error) {
+            matches[_key] = _value;
+        }
+    }
+    return matches;
+}
+function parseBody(body, contentType, valueFormatFn) {
     if (contentType === 'text/plain' || !body) {
         return body;
     }
-    const parsed = {};
-    let key;
-    let val;
-    let i;
-    body &&
-        body.split('\n').forEach(function parser(line) {
-            i = line.indexOf(':');
-            key = line.substring(0, i).trim();
-            val = line.substring(i + 1).trim();
-            if (!key || parsed[key]) {
-                return;
-            }
-            try {
-                const jsonValue = JSON.parse(val);
-                parsed[key] = jsonValue;
-            }
-            catch (error) {
-                parsed[key] = val;
-            }
-        });
+    const parsed = parseString(body, valueFormatFn);
     switch (contentType) {
         case 'multipart/form-data':
             return Object.keys(parsed).reduce((p, c) => {
@@ -416,8 +419,8 @@ async function killTask(pid) {
     }
 }
 exports.killTask = killTask;
-async function getPid(name) {
-    const taskCommand = `ps -eo pid,command | grep "${name}" | grep -v grep | awk '{print $1}' | head -1 | xargs echo -n`;
+async function getPid(cmd) {
+    const taskCommand = `ps -eo pid,command | grep "${cmd}" | grep -v grep | awk '{print $1}' | head -1 | xargs echo -n`;
     const pid = await promiseExec(taskCommand);
     return pid ? Number(pid) : undefined;
 }

package/static/build/data/dependence.js

@@ -27,6 +27,7 @@ var DependenceStatus;
     DependenceStatus[DependenceStatus["removed"] = 4] = "removed";
     DependenceStatus[DependenceStatus["removeFailed"] = 5] = "removeFailed";
     DependenceStatus[DependenceStatus["queued"] = 6] = "queued";
+    DependenceStatus[DependenceStatus["cancelled"] = 7] = "cancelled";
 })(DependenceStatus || (exports.DependenceStatus = DependenceStatus = {}));
 var DependenceTypes;
 (function (DependenceTypes) {

package/static/build/loaders/server.js

@@ -8,27 +8,6 @@ const sock_1 = __importDefault(require("./sock"));
 exports.default = async ({ server }) => {
     await (0, sock_1.default)({ server });
     logger_1.default.info('✌️ Sock loaded');
-    let exitTime = 0;
-    let timer;
-    process.on('SIGINT', (singal) => {
-        logger_1.default.warn(`Server need close, singal ${singal}`);
-        console.warn(`Server need close, singal ${singal}`);
-        exitTime++;
-        if (exitTime >= 3) {
-            logger_1.default.warn('Forcing server close');
-            console.warn('Forcing server close');
-            clearTimeout(timer);
-            process.exit(1);
-        }
-        server.close(() => {
-            if (timer) {
-                clearTimeout(timer);
-            }
-            timer = setTimeout(() => {
-                process.exit();
-            }, 15000);
-        });
-    });
     process.on('uncaughtException', (error) => {
         logger_1.default.error('Uncaught exception:', error);
     });

package/static/build/loaders/update.js

@@ -0,0 +1,79 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const body_parser_1 = __importDefault(require("body-parser"));
+const celebrate_1 = require("celebrate");
+const cors_1 = __importDefault(require("cors"));
+const express_jwt_1 = __importDefault(require("express-jwt"));
+const typedi_1 = __importDefault(require("typedi"));
+const config_1 = __importDefault(require("../config"));
+const system_1 = __importDefault(require("../services/system"));
+const logger_1 = __importDefault(require("./logger"));
+exports.default = ({ app }) => {
+    app.set('trust proxy', 'loopback');
+    app.use((0, cors_1.default)());
+    app.use(body_parser_1.default.json({ limit: '50mb' }));
+    app.use(body_parser_1.default.urlencoded({ limit: '50mb', extended: true }));
+    app.use((0, express_jwt_1.default)({
+        secret: config_1.default.secret,
+        algorithms: ['HS384'],
+    }));
+    app.put('/api/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);
+        }
+    });
+    app.put('/api/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);
+        }
+    });
+    app.put('/api/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);
+        }
+    });
+    app.use((req, res, next) => {
+        const err = new Error('Not Found');
+        err['status'] = 404;
+        next(err);
+    });
+    app.use((0, celebrate_1.errors)());
+    app.use((err, req, res, next) => {
+        if (err.name === 'UnauthorizedError') {
+            return res
+                .status(err.status)
+                .send({ code: 401, message: err.message })
+                .end();
+        }
+        return next(err);
+    });
+    app.use((err, req, res, next) => {
+        res.status(err.status || 500);
+        res.json({
+            code: err.status || 500,
+            message: err.message,
+        });
+    });
+};
+//# sourceMappingURL=update.js.map

package/static/build/services/dependence.js

@@ -80,8 +80,11 @@ let DependenceService = class DependenceService {
     async removeDb(ids) {
         await dependence_1.DependenceModel.destroy({ where: { id: ids } });
     }
-    async dependencies({ searchValue, type }, sort = { position: -1 }, query = {}) {
+    async dependencies({ searchValue, type, status, }, sort = [], query = {}) {
         let condition = Object.assign(Object.assign({}, query), { type: dependence_1.DependenceTypes[type] });
+        if (status) {
+            condition.status = status.split(',').map(Number);
+        }
         if (searchValue) {
             const encodeText = encodeURI(searchValue);
             const reg = {
@@ -93,7 +96,7 @@ let DependenceService = class DependenceService {
             condition = Object.assign(Object.assign({}, condition), { name: reg });
         }
         try {
-            const result = await this.find(condition);
+            const result = await this.find(condition, sort);
             return result;
         }
         catch (error) {
@@ -111,6 +114,24 @@ let DependenceService = class DependenceService {
         this.installDependenceOneByOne(docs, true, true);
         return docs;
     }
+    async cancel(ids) {
+        const docs = await dependence_1.DependenceModel.findAll({ where: { id: ids } });
+        for (const doc of docs) {
+            pLimit_1.default.removeQueuedDependency(doc);
+            const depInstallCommand = dependence_1.InstallDependenceCommandTypes[doc.type];
+            const depUnInstallCommand = dependence_1.unInstallDependenceCommandTypes[doc.type];
+            const installCmd = `${depInstallCommand} ${doc.name.trim()}`;
+            const unInstallCmd = `${depUnInstallCommand} ${doc.name.trim()}`;
+            const pids = await Promise.all([
+                (0, util_1.getPid)(installCmd),
+                (0, util_1.getPid)(unInstallCmd),
+            ]);
+            for (const pid of pids) {
+                pid && (await (0, util_1.killTask)(pid));
+            }
+        }
+        await dependence_1.DependenceModel.update({ status: dependence_1.DependenceStatus.cancelled }, { where: { id: ids } });
+    }
     async find(query, sort = []) {
         const docs = await dependence_1.DependenceModel.findAll({
             where: Object.assign({}, query),
@@ -133,9 +154,13 @@ let DependenceService = class DependenceService {
         });
     }
     installOrUninstallDependency(dependency, isInstall = true, force = false) {
-        return pLimit_1.default.runOneByOne(() => {
+        return pLimit_1.default.runDependeny(dependency, () => {
             return new Promise(async (resolve) => {
                 var _a;
+                if (pLimit_1.default.firstDependencyId !== dependency.id) {
+                    return resolve(null);
+                }
+                pLimit_1.default.removeQueuedDependency(dependency);
                 const depIds = [dependency.id];
                 const status = isInstall
                     ? dependence_1.DependenceStatus.installing
@@ -249,7 +274,13 @@ let DependenceService = class DependenceService {
                             ? dependence_1.DependenceStatus.installFailed
                             : dependence_1.DependenceStatus.removeFailed;
                     }
-                    await dependence_1.DependenceModel.update({ status }, { where: { id: depIds } });
+                    const docs = await dependence_1.DependenceModel.findAll({ where: { id: depIds } });
+                    const _docIds = docs
+                        .filter((x) => x.status !== dependence_1.DependenceStatus.cancelled)
+                        .map((x) => x.id);
+                    if (_docIds.length > 0) {
+                        await dependence_1.DependenceModel.update({ status }, { where: { id: _docIds } });
+                    }
                     // 如果删除依赖成功或者强制删除
                     if ((isSucceed || force) && !isInstall) {
                         this.removeDb(depIds);

package/static/build/services/notify.js

@@ -561,16 +561,17 @@ let NotificationService = class NotificationService {
         }
     }
     async webhook() {
+        var _a;
         const { webhookUrl, webhookBody, webhookHeaders, webhookMethod, webhookContentType, } = this.params;
-        const { formatBody, formatUrl } = this.formatNotifyContent(webhookUrl, webhookBody);
-        if (!formatUrl && !formatBody) {
+        if (!webhookUrl.includes('$title') && !webhookBody.includes('$title')) {
             throw new Error('Url 或者 Body 中必须包含 $title');
         }
         const headers = (0, util_1.parseHeaders)(webhookHeaders);
-        const body = (0, util_1.parseBody)(formatBody, webhookContentType);
+        const body = (0, util_1.parseBody)(webhookBody, webhookContentType, (v) => { var _a; return (_a = v === null || v === void 0 ? void 0 : v.replaceAll('$title', this.title)) === null || _a === void 0 ? void 0 : _a.replaceAll('$content', this.content); });
         const bodyParam = this.formatBody(webhookContentType, body);
         const options = Object.assign(Object.assign(Object.assign({ method: webhookMethod, headers }, this.gotOption), { allowGetBody: true }), bodyParam);
         try {
+            const formatUrl = (_a = webhookUrl === null || webhookUrl === void 0 ? void 0 : webhookUrl.replaceAll('$title', encodeURIComponent(this.title))) === null || _a === void 0 ? void 0 : _a.replaceAll('$content', encodeURIComponent(this.content));
             const res = await (0, got_1.default)(formatUrl, options);
             if (String(res.statusCode).startsWith('20')) {
                 return true;
@@ -597,16 +598,6 @@ let NotificationService = class NotificationService {
         }
         return {};
     }
-    formatNotifyContent(url, body) {
-        var _a, _b;
-        if (!url.includes('$title') && !body.includes('$title')) {
-            return {};
-        }
-        return {
-            formatUrl: (_a = url === null || url === void 0 ? void 0 : url.replaceAll('$title', encodeURIComponent(this.title))) === null || _a === void 0 ? void 0 : _a.replaceAll('$content', encodeURIComponent(this.content)),
-            formatBody: (_b = body === null || body === void 0 ? void 0 : body.replaceAll('$title', this.title)) === null || _b === void 0 ? void 0 : _b.replaceAll('$content', this.content),
-        };
-    }
 };
 __decorate([
     (0, typedi_1.Inject)((type) => user_1.default),

package/static/build/services/system.js

@@ -15,23 +15,22 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const cross_spawn_1 = require("cross-spawn");
+const fs_1 = __importDefault(require("fs"));
+const got_1 = __importDefault(require("got"));
+const sum_1 = __importDefault(require("lodash/sum"));
+const path_1 = __importDefault(require("path"));
 const typedi_1 = require("typedi");
 const winston_1 = __importDefault(require("winston"));
 const config_1 = __importDefault(require("../config"));
+const const_1 = require("../config/const");
+const util_1 = require("../config/util");
+const dependence_1 = require("../data/dependence");
 const system_1 = require("../data/system");
+const pLimit_1 = __importDefault(require("../shared/pLimit"));
 const notify_1 = __importDefault(require("./notify"));
 const schedule_1 = __importDefault(require("./schedule"));
-const cross_spawn_1 = require("cross-spawn");
 const sock_1 = __importDefault(require("./sock"));
-const got_1 = __importDefault(require("got"));
-const util_1 = require("../config/util");
-const const_1 = require("../config/const");
-const pLimit_1 = __importDefault(require("../shared/pLimit"));
-const tar_1 = __importDefault(require("tar"));
-const path_1 = __importDefault(require("path"));
-const fs_1 = __importDefault(require("fs"));
-const sum_1 = __importDefault(require("lodash/sum"));
-const dependence_1 = require("../data/dependence");
 let SystemService = class SystemService {
     constructor(logger, scheduleService, sockService) {
         this.logger = logger;
@@ -112,7 +111,10 @@ let SystemService = class SystemService {
         }
         let command = `cd && ${cmd}`;
         const docs = await dependence_1.DependenceModel.findAll({
-            where: { type: dependence_1.DependenceTypes.nodejs, status: dependence_1.DependenceStatus.installed },
+            where: {
+                type: dependence_1.DependenceTypes.nodejs,
+                status: dependence_1.DependenceStatus.installed,
+            },
         });
         if (docs.length > 0) {
             command += ` && pnpm i -g`;
@@ -258,24 +260,7 @@ let SystemService = class SystemService {
     async reloadSystem(target) {
         const cmd = `real_time=true ql reload ${target || ''}`;
         const cp = (0, cross_spawn_1.spawn)(cmd, { shell: '/bin/bash' });
-        cp.stdout.on('data', (data) => {
-            this.sockService.sendMessage({
-                type: 'reloadSystem',
-                message: data.toString(),
-            });
-        });
-        cp.stderr.on('data', (data) => {
-            this.sockService.sendMessage({
-                type: 'reloadSystem',
-                message: data.toString(),
-            });
-        });
-        cp.on('error', (err) => {
-            this.sockService.sendMessage({
-                type: 'reloadSystem',
-                message: JSON.stringify(err),
-            });
-        });
+        cp.unref();
         return { code: 200 };
     }
     async notify({ title, content }) {
@@ -317,7 +302,7 @@ let SystemService = class SystemService {
     }
     async exportData(res) {
         try {
-            await tar_1.default.create({ gzip: true, file: config_1.default.dataTgzFile, cwd: config_1.default.rootPath }, ['data']);
+            await (0, util_1.promiseExec)(`cd ${config_1.default.rootPath} && tar -zcvf ${config_1.default.dataTgzFile} data/`);
             res.download(config_1.default.dataTgzFile);
         }
         catch (error) {
@@ -327,8 +312,8 @@ let SystemService = class SystemService {
     async importData() {
         try {
             await (0, util_1.promiseExec)(`rm -rf ${path_1.default.join(config_1.default.tmpPath, 'data')}`);
-            await tar_1.default.x({ file: config_1.default.dataTgzFile, cwd: config_1.default.tmpPath });
-            return { code: 200 };
+            const res = await (0, util_1.promiseExec)(`cd ${config_1.default.tmpPath} && tar -zxvf data.tgz`);
+            return { code: 200, data: res };
         }
         catch (error) {
             return { code: 400, message: error.message };

package/static/build/shared/pLimit.js

@@ -14,10 +14,16 @@ class TaskLimit {
     get cronLimitPendingCount() {
         return this.cronLimit.size;
     }
+    get firstDependencyId() {
+        return [...this.queuedDependencyIds.values()][0];
+    }
     constructor() {
-        this.oneLimit = new p_queue_cjs_1.default({ concurrency: 1 });
+        this.dependenyLimit = new p_queue_cjs_1.default({ concurrency: 1 });
+        this.queuedDependencyIds = new Set([]);
         this.updateLogLimit = new p_queue_cjs_1.default({ concurrency: 1 });
-        this.cronLimit = new p_queue_cjs_1.default({ concurrency: Math.max(os_1.default.cpus().length, 4) });
+        this.cronLimit = new p_queue_cjs_1.default({
+            concurrency: Math.max(os_1.default.cpus().length, 4),
+        });
         this.setCustomLimit();
         this.handleEvents();
     }
@@ -31,7 +37,7 @@ class TaskLimit {
         this.cronLimit.on('completed', (param) => {
             logger_1.default.info(`[schedule][任务处理成功] 参数 ${JSON.stringify(param)}`);
         });
-        this.cronLimit.on('error', error => {
+        this.cronLimit.on('error', (error) => {
             logger_1.default.error(`[schedule][任务处理错误] 参数 ${JSON.stringify(error)}`);
         });
         this.cronLimit.on('next', () => {
@@ -41,6 +47,11 @@ class TaskLimit {
             logger_1.default.info(`[schedule][任务队列] 空闲中...`);
         });
     }
+    removeQueuedDependency(dependency) {
+        if (this.queuedDependencyIds.has(dependency.id)) {
+            this.queuedDependencyIds.delete(dependency.id);
+        }
+    }
     async setCustomLimit(limit) {
         var _a;
         if (limit) {
@@ -58,8 +69,10 @@ class TaskLimit {
     async runWithCronLimit(fn, options) {
         return this.cronLimit.add(fn, options);
     }
-    runOneByOne(fn, options) {
-        return this.oneLimit.add(fn, options);
+    runDependeny(dependency, fn, options) {
+        this.queuedDependencyIds.add(dependency.id);
+        fn.dependency = dependency;
+        return this.dependenyLimit.add(fn, options);
     }
     updateDepLog(fn, options) {
         return this.updateLogLimit.add(fn, options);