修复文件校验

Co-authored-by: chensiyuan <chensiyuan@pushplus.plus>

.env.example

@@ -1,3 +1,4 @@
+UPDATE_PORT=5300
 PUBLIC_PORT=5400
 CRON_PORT=5500
 BACK_PORT=5600

.github/workflows/build_docker_image.yml

@@ -2,53 +2,52 @@ name: Build And Push Docker Image
 
 on:
   push:
+    paths-ignore:
+      - "*.md"
     branches:
-      - 'master'
+      - "master"
-      - 'develop'
+      - "develop"
+      - "test-cli"
     tags:
-      - 'v*'
+      - "v*"
   schedule:
-    - cron: '00 20 * * *'
+    - cron: "00 20 * * *"
   workflow_dispatch:
 
 jobs:
   to_gitlab:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - uses: pixta-dev/repository-mirroring-action@v1
         with:
-          target_repo_url:
+          target_repo_url: git@gitlab.com:whyour/qinglong.git
-            git@gitlab.com:whyour/qinglong.git
+          ssh_private_key: ${{ secrets.GITLAB_SSH_PK }}
-          ssh_private_key:
-            ${{ secrets.GITLAB_SSH_PK }}
 
   to_gitee:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - uses: pixta-dev/repository-mirroring-action@v1
         with:
-          target_repo_url:
+          target_repo_url: git@gitee.com:whyour/qinglong.git
-            git@gitee.com:whyour/qinglong.git
+          ssh_private_key: ${{ secrets.GITLAB_SSH_PK }}
-          ssh_private_key:
-            ${{ secrets.GITLAB_SSH_PK }}
 
   build-static:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
-      - uses: pnpm/action-setup@v2
+      - uses: pnpm/action-setup@v3
         with:
-          version: '8.3.1'
+          version: "8.3.1"
 
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
-          cache: 'pnpm'
+          cache: "pnpm"
 
       - name: build front and back
         run: |
@@ -80,6 +79,7 @@ jobs:
           export GIT_SSH_COMMAND="ssh -v -i ~/.ssh/id_rsa -o StrictHostKeyChecking=no -l git"
           git remote add gitee "${REPO_GITEE}"
           git remote add gitlab "${REPO_GITLAB}"
+          git gc
           git push --force --quiet gitee ${GITHUB_BRANCH}:${GITHUB_BRANCH}
           git push --force --quiet gitlab ${GITHUB_BRANCH}:${GITHUB_BRANCH}
 
@@ -88,6 +88,7 @@ jobs:
 
     # 由于 ubuntu-latest 中使用 linux6.x 内核 linux/s390x npm 无法使用
     runs-on: ubuntu-20.04
+    # runs-on: self-hosted
 
     permissions:
       packages: write
@@ -95,17 +96,17 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - uses: pnpm/action-setup@v2
+      - uses: pnpm/action-setup@v3
         with:
-          version: '8.3.1'
+          version: "8.3.1"
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
-          cache: 'pnpm'
+          cache: "pnpm"
 
       - name: Setup timezone
-        uses: zcong1993/setup-timezone@master
+        uses: szenius/set-timezone@v1.2
         with:
-          timezone: Asia/Shanghai
+          timezoneLinux: Asia/Shanghai
 
       - name: Login to DockerHub
         uses: docker/login-action@v3
@@ -157,6 +158,7 @@ jobs:
             SOURCE_COMMIT=${{ github.sha }}
           network: host
           platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x,linux/386
+          # platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/s390x,linux/386
           context: .
           file: ./docker/Dockerfile
           push: true
@@ -166,4 +168,69 @@ jobs:
           cache-to: type=registry,ref=whyour/qinglong:cache,mode=max
 
       - name: Image digest
-        run: echo ${{ steps.docker_build.outputs.digest }}
+        run: |
+          echo ${{ steps.docker_build.outputs.digest }}
+  
+  build310:
+    if: ${{ github.ref_name == 'master' }}
+    needs: build-static
+
+    runs-on: ubuntu-20.04
+
+    permissions:
+      packages: write
+      contents: read
+
+    steps:
+      - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v3
+        with:
+          version: "8.3.1"
+      - uses: actions/setup-node@v4
+        with:
+          cache: "pnpm"
+
+      - name: Setup timezone
+        uses: szenius/set-timezone@v1.2
+        with:
+          timezoneLinux: Asia/Shanghai
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Login to GHCR
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Build and push python3.10
+        id: docker_build_310
+        uses: docker/build-push-action@v5
+        with:
+          build-args: |
+            MAINTAINER=${{ github.repository_owner }}
+            QL_BRANCH=${{ github.ref_name }}
+            SOURCE_COMMIT=${{ github.sha }}
+          network: host
+          platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x,linux/386
+          context: .
+          file: ./docker/310.Dockerfile
+          push: true
+          tags: whyour/qinglong:python3.10
+          cache-from: type=registry,ref=whyour/qinglong:cache-python3.10
+          cache-to: type=registry,ref=whyour/qinglong:cache-python3.10,mode=max
+
+      - name: Image digest
+        run: |
+          echo ${{ steps.docker_build_310.outputs.digest }}

.gitignore

@@ -22,11 +22,4 @@
 .env
 .history
 .version.ts
-
-/config
-/log
-/db
-/manual_log
-/scripts
-/bak
 /.tmp

.npmrc

@@ -1,2 +1 @@
-sentrycli_cdnurl=https://npmmirror.com/mirrors/sentry-cli/
 strict-peer-dependencies=false

.prettierignore

@@ -21,12 +21,5 @@ src/.umi-production
 src/.umi-test
 .env.local
 .env
-history
 version.ts
-config
+/.tmp
-log
-db
-manual_log
-scripts
-bak
-.tmp

.umirc.ts

@@ -16,6 +16,11 @@ export default defineConfig({
   favicons: [`https://qn.whyour.cn/favicon.svg`],
   publicPath: process.env.NODE_ENV === 'production' ? './' : '/',
   proxy: {
+    [`${baseUrl}api/update`]: {
+      target: 'http://127.0.0.1:5300/',
+      changeOrigin: true,
+      pathRewrite: { [`^${baseUrl}api/update`]: '/api' },
+    },
     [`${baseUrl}api/public`]: {
       target: 'http://127.0.0.1:5400/',
       changeOrigin: true,
@@ -47,4 +52,10 @@ export default defineConfig({
     'https://gw.alipayobjects.com/os/lib/react/18.2.0/umd/react.production.min.js',
     'https://gw.alipayobjects.com/os/lib/react-dom/18.2.0/umd/react-dom.production.min.js',
   ],
+  copy: [
+    {
+      from: 'node_modules/monaco-editor/min/vs',
+      to: 'static/dist/monaco-editor/min/vs',
+    },
+  ],
 });

README-en.md

@@ -48,72 +48,12 @@ docker pull whyour/qinglong:debian
 
 ### npm
 
-The npm version supports `debian/ubuntu/centos/alpine` systems and requires `node/python3` to be installed.
+The npm version supports `debian/ubuntu/alpine` systems and requires `node/npm/python3/pip3/pnpm` to be installed.
 
 ```bash
 npm i @whyour/qinglong
 ```
 
-## Built-in commands
-
-1. task
-
-```bash
-# Execute in sequence, if a random delay is set, it will be randomly delayed by a certain number of seconds
-task <file_path>                                             
-# Execute in sequence, regardless of whether a random delay is set, all run immediately, 
-# and the foreground will output the day, while recorded in the log file
-task <file_path> now                                         
-# Concurrent execution, regardless of whether a random delay is set, are run immediately, 
-# the foreground does not generate the day, directly recorded in the log file, and can be specified account execution
-task <file_path> conc <env_name> <account_number>(Optional) 
-# Specify the account to execute and run immediately regardless of whether a random delay is set 
-task <file_path> desi <env_name> <account_number>       
-# Set task timeout   
-task -m <max_time> <file_path>
-# Print task log in real time, no need to carry this parameter when creating timed tasks
-task -l <file_path>
-# Use -- to split, -- followed by a parameter that is passed to the script, as in the following example, the script receives the parameter -u whyour -p password
-task <file_path> -- -u whyour -p password
-```
-
-1. ql
-
-```bash
-# Update and restart Green Dragon
-ql update                                                    
-# Run custom scripts extra.sh
-ql extra                                                     
-# Adding a single script file
-ql raw <file_url>                                             
-# Add a specific script for a single repository
-ql repo <repo_url> <whitelist> <blacklist> <dependence> <branch>   
-# Delete old logs
-ql rmlog <days>                                              
-# Start bot
-ql bot                                                       
-# Detecting the Green Dragon environment and repairing it
-ql check                                                     
-# Reset the number of login errors
-ql resetlet                                                  
-# Disable two-step login
-ql resettfa                                                  
-```
-
-1. parameter description
-
-- file_url: Script address
-- repo_url: Repository address
-- whitelist: The whitelist when pulling the repository, i.e., the string contained in the path of the script to be pulled
-- blacklist: Blacklisting when pulling repositories, i.e. strings that are not included in the path of the script to be pulled
-- dependence: Pulling the dependencies needed for the repository will be copied directly from the repository to the repository directory under scripts, regardless of the blacklist
-- branch: Pull the branch of the repository
-- days: Number of days of logs to be kept
-- file_path: File path for task execution
-- env_name: The name of the environment variable that needs to be concurrent or specified at the time of task execution
-- account_number: Specify the account number of an environment variable to be executed when the task is executed
-- max_time: Timeout, suffix "s" for seconds (default), "m" for minutes, "h" for hours, "d" for days
-
 ## Deployment
 
 ### Docker (Recommended)
@@ -165,11 +105,17 @@ podman run -dit \
   docker.io/whyour/qinglong:latest
 ```
 
-### Local
+### Npm
 
-It is recommended to use a pure system installation to avoid losing the original system data, you need to install node/npm/python3/pip3 yourself
+It is recommended to use a pure system installation to avoid losing the original system data, you need to install node/npm/python3/pip3/pnpm yourself
 
 ```bash
+# Debian/Ubuntu
+curl -sL https://deb.nodesource.com/setup_20.x | sudo -E bash -
+```
+
+```bash
+npm install -g node-pre-gyp pnpm@8.3.1
 npm install -g @whyour/qinglong
 qinglong
 # Add the environment variables QL_DIR and QL_DATA_DIR when prompted
@@ -179,16 +125,72 @@ export QL_DATA_DIR=""
 qinglong
 ```
 
+## Built-in commands
+
+- task
+
+```bash
+# Execute in sequence, if a random delay is set, it will be randomly delayed by a certain number of seconds
+task <file_path>                                             
+# Execute in sequence, regardless of whether a random delay is set, all run immediately, 
+# and the foreground will output the day, while recorded in the log file
+task <file_path> now                                         
+# Concurrent execution, regardless of whether a random delay is set, are run immediately, 
+# the foreground does not generate the day, directly recorded in the log file, and can be specified account execution
+task <file_path> conc <env_name> <account_number>(Optional) 
+# Specify the account to execute and run immediately regardless of whether a random delay is set 
+task <file_path> desi <env_name> <account_number>       
+# Set task timeout   
+task -m <max_time> <file_path>
+# Use -- to split, -- followed by a parameter that is passed to the script, as in the following example, the script receives the parameter -u whyour -p password
+task <file_path> -- -u whyour -p password
+```
+
+- ql
+
+```bash
+# Update and restart Green Dragon
+ql update                                                    
+# Run custom scripts extra.sh
+ql extra                                                     
+# Adding a single script file
+ql raw <file_url>                                             
+# Add a specific script for a single repository
+ql repo <repo_url> <whitelist> <blacklist> <dependence> <branch>   
+# Delete old logs
+ql rmlog <days>                                              
+# Start bot
+ql bot                                                       
+# Detecting the Green Dragon environment and repairing it
+ql check                                                     
+# Reset the number of login errors
+ql resetlet                                                  
+# Disable two-step login
+ql resettfa                                                  
+```
+
+| **Parameter** | **Description** |
+|---|---|
+| file_url | Script address |
+| repo_url | Repository address |
+| whitelist | The whitelist when pulling the repository, i.e., the string contained in the path of the script to be pulled |
+| blacklist | Blacklisting when pulling repositories, i.e. strings that are not included in the path of the script to be pulled |
+| dependence | Pulling the dependencies needed for the repository will be copied directly from the repository to the repository directory under scripts, regardless of the blacklist |
+| extensions | Pull the branch of the repository |
+| branch | Number of days of logs to be kept |
+| days | File path for task execution |
+| file_path | The name of the environment variable that needs to be concurrent or specified at the time of task execution |
+
 ## Development
 
 ```bash
-$ git clone git@github.com:whyour/qinglong.git
+git clone https://github.com/whyour/qinglong.git
-$ cd qinglong
+cd qinglong
-$ cp .env.example .env
+cp .env.example .env
 # Recommended use pnpm https://pnpm.io/zh/installation
-$ npm install -g pnpm@8.3.1
+npm install -g pnpm@8.3.1
-$ pnpm install
+pnpm install
-$ pnpm start
+pnpm start
 ```
 
 Open your browser and visit <http://127.0.0.1:5700>

README.md

@@ -50,71 +50,12 @@ docker pull whyour/qinglong:debian
 
 ### npm
 
-npm 版本支持 `debian/ubuntu/centos/alpine` 系统，需要自行安装 `node/python3`
+npm 版本支持 `debian/ubuntu/alpine` 系统，需要自行安装 `node/npm/python3/pip3/pnpm`
 
 ```bash
 npm i @whyour/qinglong
 ```
 
-## 内置命令
-
-1. task
-
-```bash
-# 依次执行，如果设置了随机延迟，将随机延迟一定秒数
-task <file_path>                                             
-# 依次执行，无论是否设置了随机延迟，均立即运行，前台会输出日，同时记录在日志文件中
-task <file_path> now                                         
-# 并发执行，无论是否设置了随机延迟，均立即运行，前台不产生日，直接记录在日志文件中，且可指定账号执行
-task <file_path> conc <env_name> <account_number>(可选的) 
-# 指定账号执行，无论是否设置了随机延迟，均立即运行 
-task <file_path> desi <env_name> <account_number>      
-# 设置任务超时时间   
-task -m <max_time> <file_path>
-# 实时打印任务日志，创建定时任务时，不用携带此参数
-task -l <file_path>
-# 使用 -- 分割，-- 后面的参数会传给脚本，下面的例子，脚本就可接收到参数 -u whyour -p password
-task <file_path> -- -u whyour -p password
-```
-
-1. ql
-
-```bash
-# 更新并重启青龙
-ql update
-# 运行自定义脚本extra.sh
-ql extra
-# 添加单个脚本文件
-ql raw <file_url>
-# 添加单个仓库的指定脚本
-ql repo <repo_url> <whitelist> <blacklist> <dependence> <branch> <extensions>
-# 删除旧日志
-ql rmlog <days>
-# 启动tg-bot
-ql bot
-# 检测青龙环境并修复
-ql check
-# 重置登录错误次数
-ql resetlet                                                  
-# 禁用两步登录
-ql resettfa
-```
-
-1. 参数说明
-
-- file_url: 脚本地址
-- repo_url: 仓库地址
-- whitelist: 拉取仓库时的白名单，即就是需要拉取的脚本的路径包含的字符串，多个竖线分割
-- blacklist: 拉取仓库时的黑名单，即就是需要拉取的脚本的路径不包含的字符串，多个竖线分割
-- dependence: 拉取仓库需要的依赖文件，会直接从仓库拷贝到scripts下的仓库目录，不受黑名单影响，多个竖线分割
-- extensions: 拉取仓库的文件后缀，多个竖线分割
-- branch: 拉取仓库的分支
-- days: 需要保留的日志的天数
-- file_path: 任务执行时的文件路径
-- env_name: 任务执行时需要并发或者指定时的环境变量名称
-- account_number: 任务执行时指定某个环境变量需要执行的账号序号
-- max_time: 超时时间，后缀"s"代表秒(默认值), "m"代表分, "h"代表小时, "d"代表天
-
 ## 部署
 
 ### docker (推荐)
@@ -166,11 +107,17 @@ podman run -dit \
   docker.io/whyour/qinglong:latest
 ```
 
-### 本机
+### npm
 
-建议使用纯净系统安装，避免系统原有数据丢失，需要自己安装 node/npm/python3/pip3
+建议使用纯净系统安装，避免系统原有数据丢失，需要自己安装 node/npm/python3/pip3/pnpm
 
 ```bash
+# Debian/Ubuntu
+curl -sL https://deb.nodesource.com/setup_20.x | sudo -E bash -
+```
+
+```bash
+npm install -g node-pre-gyp pnpm@8.3.1
 npm install -g @whyour/qinglong
 qinglong
 # 根据提示增加环境变量 QL_DIR 和 QL_DATA_DIR
@@ -180,19 +127,73 @@ export QL_DATA_DIR=""
 qinglong
 ```
 
+## 内置命令
+
+- task
+
+```bash
+# 依次执行，如果设置了随机延迟，将随机延迟一定秒数
+task <file_path>                                             
+# 依次执行，无论是否设置了随机延迟，均立即运行，前台会输出日，同时记录在日志文件中
+task <file_path> now                                         
+# 并发执行，无论是否设置了随机延迟，均立即运行，前台不产生日，直接记录在日志文件中，且可指定账号执行
+task <file_path> conc <env_name> <account_number>(可选的) 
+# 指定账号执行，无论是否设置了随机延迟，均立即运行 
+task <file_path> desi <env_name> <account_number>      
+# 设置任务超时时间   
+task -m <max_time> <file_path>
+# 使用 -- 分割，-- 后面的参数会传给脚本，下面的例子，脚本就可接收到参数 -u whyour -p password
+task <file_path> -- -u whyour -p password
+```
+
+- ql
+
+```bash
+# 更新并重启青龙
+ql update
+# 运行自定义脚本extra.sh
+ql extra
+# 添加单个脚本文件
+ql raw <file_url>
+# 添加单个仓库的指定脚本
+ql repo <repo_url> <whitelist> <blacklist> <dependence> <branch> <extensions>
+# 删除旧日志
+ql rmlog <days>
+# 启动tg-bot
+ql bot
+# 检测青龙环境并修复
+ql check
+# 重置登录错误次数
+ql resetlet                                                  
+# 禁用两步登录
+ql resettfa
+```
+
+| **参数**   | **说明**                                                                                    |
+|------------|---------------------------------------------------------------------------------------------|
+| file_url   | 脚本地址                                                                                    |
+| repo_url   | 仓库地址                                                                                    |
+| whitelist  | 拉取仓库时的白名单，即就是需要拉取的脚本的路径包含的字符串，多个竖线分割                    |
+| blacklist  | 拉取仓库时的黑名单，即就是需要拉取的脚本的路径不包含的字符串，多个竖线分割                  |
+| dependence | 拉取仓库需要的依赖文件，会直接从仓库拷贝到scripts下的仓库目录，不受黑名单影响，多个竖线分割 |
+| extensions | 拉取仓库的文件后缀，多个竖线分割                                                            |
+| branch     | 拉取仓库的分支                                                                              |
+| days       | 需要保留的日志的天数                                                                        |
+| file_path  | 任务执行时的文件路径                                                                        |
+
 ## 开发
 
 ```bash
-$ git clone git@github.com:whyour/qinglong.git
+git clone https://github.com/whyour/qinglong.git
-$ cd qinglong
+cd qinglong
-$ cp .env.example .env
+cp .env.example .env
 # 推荐使用 pnpm https://pnpm.io/zh/installation
-$ npm install -g pnpm@8.3.1
+npm install -g pnpm@8.3.1
-$ pnpm install
+pnpm install
-$ pnpm start
+pnpm start
 ```
 
-打开你的浏览器，访问 http://127.0.0.1:5700
+打开你的浏览器，访问 <http://127.0.0.1:5700>
 
 ## 链接
 

back/api/config.ts

@@ -3,20 +3,36 @@ import { Router, Request, Response, NextFunction } from 'express';
 import { Container } from 'typedi';
 import { Logger } from 'winston';
 import config from '../config';
-import * as fs from 'fs';
+import * as fs from 'fs/promises';
 import { celebrate, Joi } from 'celebrate';
 import { join } from 'path';
+import { SAMPLE_FILES } from '../config/const';
+import ConfigService from '../services/config';
 const route = Router();
 
 export default (app: Router) => {
   app.use('/configs', route);
 
+  route.get(
+    '/sample',
+    async (req: Request, res: Response, next: NextFunction) => {
+      try {
+        res.send({
+          code: 200,
+          data: SAMPLE_FILES,
+        });
+      } catch (e) {
+        return next(e);
+      }
+    },
+  );
+
   route.get(
     '/files',
     async (req: Request, res: Response, next: NextFunction) => {
       const logger: Logger = Container.get('logger');
       try {
-        const fileList = fs.readdirSync(config.configPath, 'utf-8');
+        const fileList = await fs.readdir(config.configPath, 'utf-8');
         res.send({
           code: 200,
           data: fileList
@@ -32,24 +48,11 @@ export default (app: Router) => {
   );
 
   route.get(
-    '/:file',
+    '/detail',
     async (req: Request, res: Response, next: NextFunction) => {
-      const logger: Logger = Container.get('logger');
       try {
-        let content = '';
+        const configService = Container.get(ConfigService);
-        if (config.blackFileList.includes(req.params.file)) {
+        await configService.getFile(req.query.path as string, res);
-          res.send({ code: 403, message: '文件无法访问' });
-        }
-        if (req.params.file.includes('sample')) {
-          content = getFileContentByName(
-            join(config.samplePath, req.params.file),
-          );
-        } else {
-          content = getFileContentByName(
-            join(config.configPath, req.params.file),
-          );
-        }
-        res.send({ code: 200, data: content });
       } catch (e) {
         return next(e);
       }
@@ -71,12 +74,27 @@ export default (app: Router) => {
         if (config.blackFileList.includes(name)) {
           res.send({ code: 403, message: '文件无法访问' });
         }
-        const path = join(config.configPath, name);
+        let path = join(config.configPath, name);
-        fs.writeFileSync(path, content);
+        if (name.startsWith('data/scripts/')) {
+          path = join(config.rootPath, name);
+        }
+        await fs.writeFile(path, content);
         res.send({ code: 200, message: '保存成功' });
       } catch (e) {
         return next(e);
       }
     },
   );
+
+  route.get(
+    '/:file',
+    async (req: Request, res: Response, next: NextFunction) => {
+      try {
+        const configService = Container.get(ConfigService);
+        await configService.getFile(req.params.file, res);
+      } catch (e) {
+        return next(e);
+      }
+    },
+  );
 };

back/api/dependence.ts

@@ -134,4 +134,20 @@ export default (app: Router) => {
       }
     },
   );
+
+  route.put(
+    '/cancel',
+    celebrate({
+      body: Joi.array().items(Joi.number().required()),
+    }),
+    async (req: Request, res: Response, next: NextFunction) => {
+      try {
+        const dependenceService = Container.get(DependenceService);
+        await dependenceService.cancel(req.body);
+        return res.send({ code: 200 });
+      } catch (e) {
+        return next(e);
+      }
+    },
+  );
 };

back/api/env.ts

@@ -51,6 +51,9 @@ export default (app: Router) => {
       const logger: Logger = Container.get('logger');
       try {
         const envService = Container.get(EnvService);
+        if (!req.body?.length) {
+          return res.send({ code: 400, message: '参数不正确' });
+        }
         const data = await envService.create(req.body);
         return res.send({ code: 200, data });
       } catch (e) {
@@ -217,7 +220,7 @@ export default (app: Router) => {
         } else {
           return res.send({
             code: 400,
-            message: '文件缺少name或者value字段，参考导出文件格式',
+            message: '每条数据 name 或者 value 字段不能为空，参考导出文件格式',
           });
         }
       } catch (e) {

back/api/log.ts

@@ -3,7 +3,7 @@ import { Container } from 'typedi';
 import { Logger } from 'winston';
 import * as fs from 'fs';
 import config from '../config';
-import { emptyDir, getFileContentByName, readDirs } from '../config/util';
+import { getFileContentByName, readDirs, rmPath } from '../config/util';
 import { join } from 'path';
 import { celebrate, Joi } from 'celebrate';
 const route = Router();
@@ -15,7 +15,7 @@ export default (app: Router) => {
   route.get('/', async (req: Request, res: Response, next: NextFunction) => {
     const logger: Logger = Container.get('logger');
     try {
-      const result = readDirs(config.logPath, config.logPath, blacklist);
+      const result = await readDirs(config.logPath, config.logPath, blacklist);
       res.send({
         code: 200,
         data: result,
@@ -26,10 +26,29 @@ export default (app: Router) => {
     }
   });
 
+  route.get(
+    '/detail',
+    async (req: Request, res: Response, next: NextFunction) => {
+      try {
+        if (blacklist.includes(req.path)) {
+          return res.send({ code: 403, message: '暂无权限' });
+        }
+        const filePath = join(
+          config.logPath,
+          (req.query.path || '') as string,
+          req.query.file as string,
+        );
+        const content = await getFileContentByName(filePath);
+        res.send({ code: 200, data: content });
+      } catch (e) {
+        return next(e);
+      }
+    },
+  );
+
   route.get(
     '/:file',
     async (req: Request, res: Response, next: NextFunction) => {
-      const logger: Logger = Container.get('logger');
       try {
         if (blacklist.includes(req.path)) {
           return res.send({ code: 403, message: '暂无权限' });
@@ -39,7 +58,7 @@ export default (app: Router) => {
           (req.query.path || '') as string,
           req.params.file,
         );
-        const content = getFileContentByName(filePath);
+        const content = await getFileContentByName(filePath);
         res.send({ code: 200, data: content });
       } catch (e) {
         return next(e);
@@ -64,11 +83,7 @@ export default (app: Router) => {
           type: string;
         };
         const filePath = join(config.logPath, path, filename);
-        if (type === 'directory') {
+        await rmPath(filePath);
-          await emptyDir(filePath);
-        } else {
-          fs.unlinkSync(filePath);
-        }
         res.send({ code: 200 });
       } catch (e) {
         return next(e);

back/api/script.ts

@@ -4,13 +4,13 @@ import {
   readDirs,
   getLastModifyFilePath,
   readDir,
-  emptyDir,
+  rmPath,
 } from '../config/util';
 import { Router, Request, Response, NextFunction } from 'express';
 import { Container } from 'typedi';
 import { Logger } from 'winston';
 import config from '../config';
-import * as fs from 'fs';
+import * as fs from 'fs/promises';
 import { celebrate, Joi } from 'celebrate';
 import path, { join, parse } from 'path';
 import ScriptService from '../services/script';
@@ -34,15 +34,33 @@ export default (app: Router) => {
     const logger: Logger = 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.join(
           config.scriptPath,
           req.query.path as string,
         );
-        result = readDir(targetPath, config.scriptPath, blacklist);
+        result = await readDir(targetPath, config.scriptPath, blacklist);
       } else {
-        result = readDirs(config.scriptPath, config.scriptPath, blacklist);
+        result = await readDirs(
+          config.scriptPath,
+          config.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,
@@ -54,17 +72,31 @@ export default (app: Router) => {
     }
   });
 
+  route.get(
+    '/detail',
+    async (req: Request, res: Response, next: NextFunction) => {
+      try {
+        const scriptService = Container.get(ScriptService);
+        const content = await scriptService.getFile(
+          req.query.path as string,
+          req.query.file as string,
+        );
+        res.send({ code: 200, data: content });
+      } catch (e) {
+        return next(e);
+      }
+    },
+  );
+
   route.get(
     '/:file',
     async (req: Request, res: Response, next: NextFunction) => {
-      const logger: Logger = Container.get('logger');
       try {
-        const filePath = join(
+        const scriptService = Container.get(ScriptService);
-          config.scriptPath,
+        const content = await scriptService.getFile(
           req.query.path as string,
           req.params.file,
         );
-        const content = getFileContentByName(filePath);
         res.send({ code: 200, data: content });
       } catch (e) {
         return next(e);
@@ -104,12 +136,12 @@ export default (app: Router) => {
         }
 
         if (req.file) {
-          fs.renameSync(req.file.path, join(path, req.file.filename));
+          await fs.rename(req.file.path, join(path, filename));
           return res.send({ code: 200 });
         }
 
         if (directory) {
-          fs.mkdirSync(join(path, directory), { recursive: true });
+          await fs.mkdir(join(path, directory), { recursive: true });
           return res.send({ code: 200 });
         }
 
@@ -121,16 +153,17 @@ export default (app: Router) => {
           `${originFilename.replace(/\//g, '')}`,
         );
         const filePath = join(path, `${filename.replace(/\//g, '')}`);
-        if (fs.existsSync(originFilePath)) {
+        const fileExists = await fileExist(filePath);
-          fs.copyFileSync(
+        if (fileExists) {
+          await fs.copyFile(
             originFilePath,
             join(config.bakPath, originFilename.replace(/\//g, '')),
           );
           if (filename !== originFilename) {
-            fs.unlinkSync(originFilePath);
+            await rmPath(originFilePath);
           }
         }
-        fs.writeFileSync(filePath, content);
+        await fs.writeFile(filePath, content);
         return res.send({ code: 200 });
       } catch (e) {
         return next(e);
@@ -156,7 +189,7 @@ export default (app: Router) => {
           path: string;
         };
         const filePath = join(config.scriptPath, path, filename);
-        fs.writeFileSync(filePath, content);
+        await fs.writeFile(filePath, content);
         return res.send({ code: 200 });
       } catch (e) {
         return next(e);
@@ -182,11 +215,7 @@ export default (app: Router) => {
           type: string;
         };
         const filePath = join(config.scriptPath, path, filename);
-        if (type === 'directory') {
+        await rmPath(filePath);
-          await emptyDir(filePath);
-        } else {
-          fs.unlinkSync(filePath);
-        }
         res.send({ code: 200 });
       } catch (e) {
         return next(e);
@@ -239,7 +268,7 @@ export default (app: Router) => {
         let { filename, content, path } = req.body;
         const { name, ext } = parse(filename);
         const filePath = join(config.scriptPath, path, `${name}.swap${ext}`);
-        fs.writeFileSync(filePath, content || '', { encoding: 'utf8' });
+        await fs.writeFile(filePath, content || '', { encoding: 'utf8' });
 
         const scriptService = Container.get(ScriptService);
         const result = await scriptService.runScript(filePath);
@@ -269,7 +298,7 @@ export default (app: Router) => {
         const scriptService = Container.get(ScriptService);
         const result = await scriptService.stopScript(filePath, pid);
         setTimeout(() => {
-          emptyDir(logPath);
+          rmPath(logPath);
         }, 3000);
         res.send(result);
       } catch (e) {
@@ -297,7 +326,7 @@ export default (app: Router) => {
         };
         const filePath = join(config.scriptPath, path, filename);
         const newPath = join(config.scriptPath, path, newFilename);
-        fs.renameSync(filePath, newPath);
+        await fs.rename(filePath, newPath);
         res.send({ code: 200 });
       } catch (e) {
         return next(e);

back/api/system.ts

@@ -1,12 +1,11 @@
 import { Router, Request, Response, NextFunction } from 'express';
 import { Container } from 'typedi';
 import { Logger } from 'winston';
-import * as fs from 'fs';
+import * as fs from 'fs/promises';
 import config from '../config';
 import SystemService from '../services/system';
 import { celebrate, Joi } from 'celebrate';
 import UserService from '../services/user';
-import { EnvModel } from '../data/env';
 import {
   getUniqPath,
   handleLogPath,
@@ -78,18 +77,16 @@ export default (app: Router) => {
   );
 
   route.put(
-    '/config',
+    '/config/log-remove-frequency',
     celebrate({
       body: Joi.object({
-        logRemoveFrequency: Joi.number().optional().allow(null),
+        logRemoveFrequency: Joi.number().allow(null),
-        cronConcurrency: Joi.number().optional().allow(null),
       }),
     }),
     async (req: Request, res: Response, next: NextFunction) => {
-      const logger: Logger = Container.get('logger');
       try {
         const systemService = Container.get(SystemService);
-        const result = await systemService.updateSystemConfig(req.body);
+        const result = await systemService.updateLogRemoveFrequency(req.body);
         res.send(result);
       } catch (e) {
         return next(e);
@@ -97,6 +94,96 @@ export default (app: Router) => {
     },
   );
 
+  route.put(
+    '/config/cron-concurrency',
+    celebrate({
+      body: Joi.object({
+        cronConcurrency: Joi.number().allow(null),
+      }),
+    }),
+    async (req: Request, res: Response, next: NextFunction) => {
+      try {
+        const systemService = Container.get(SystemService);
+        const result = await systemService.updateCronConcurrency(req.body);
+        res.send(result);
+      } catch (e) {
+        return next(e);
+      }
+    },
+  );
+
+  route.put(
+    '/config/dependence-proxy',
+    celebrate({
+      body: Joi.object({
+        dependenceProxy: Joi.string().allow('').allow(null),
+      }),
+    }),
+    async (req: Request, res: Response, next: NextFunction) => {
+      try {
+        const systemService = Container.get(SystemService);
+        const result = await systemService.updateDependenceProxy(req.body);
+        res.send(result);
+      } catch (e) {
+        return next(e);
+      }
+    },
+  );
+
+  route.put(
+    '/config/node-mirror',
+    celebrate({
+      body: Joi.object({
+        nodeMirror: Joi.string().allow('').allow(null),
+      }),
+    }),
+    async (req: Request, res: Response, next: NextFunction) => {
+      try {
+        const systemService = Container.get(SystemService);
+        res.setHeader('Content-type', 'application/octet-stream');
+        await systemService.updateNodeMirror(req.body, res);
+      } catch (e) {
+        return next(e);
+      }
+    },
+  );
+
+  route.put(
+    '/config/python-mirror',
+    celebrate({
+      body: Joi.object({
+        pythonMirror: Joi.string().allow('').allow(null),
+      }),
+    }),
+    async (req: Request, res: Response, next: NextFunction) => {
+      try {
+        const systemService = Container.get(SystemService);
+        const result = await systemService.updatePythonMirror(req.body);
+        res.send(result);
+      } catch (e) {
+        return next(e);
+      }
+    },
+  );
+
+  route.put(
+    '/config/linux-mirror',
+    celebrate({
+      body: Joi.object({
+        linuxMirror: Joi.string().allow('').allow(null),
+      }),
+    }),
+    async (req: Request, res: Response, next: NextFunction) => {
+      try {
+        const systemService = Container.get(SystemService);
+        res.setHeader('Content-type', 'application/octet-stream');
+        await systemService.updateLinuxMirror(req.body, res);
+      } catch (e) {
+        return next(e);
+      }
+    },
+  );
+
   route.put(
     '/update-check',
     async (req: Request, res: Response, next: NextFunction) => {
@@ -129,7 +216,7 @@ export default (app: Router) => {
     '/reload',
     celebrate({
       body: Joi.object({
-        type: Joi.string().required(),
+        type: Joi.string().optional().allow('').allow(null),
       }),
     }),
     async (req: Request, res: Response, next: NextFunction) => {
@@ -174,7 +261,7 @@ export default (app: Router) => {
     async (req: Request, res: Response, next: NextFunction) => {
       try {
         const systemService = Container.get(SystemService);
-        const command = req.body.command
+        const command = req.body.command;
         const idStr = `cat ${config.crontabFile} | grep -E "${command}" | perl -pe "s|.*ID=(.*) ${command}.*|\\1|" | head -1 | awk -F " " '{print $1}' | xargs echo -n`;
         let id = await promiseExec(idStr);
         const uniqPath = await getUniqPath(command, id);
@@ -193,12 +280,12 @@ export default (app: Router) => {
             onError: async (message: string) => {
               res.write(`\n${message}`);
               const absolutePath = await handleLogPath(logPath);
-              fs.appendFileSync(absolutePath, `\n${message}`);
+              await fs.appendFile(absolutePath, `\n${message}`);
             },
             onLog: async (message: string) => {
               res.write(`\n${message}`);
               const absolutePath = await handleLogPath(logPath);
-              fs.appendFileSync(absolutePath, `\n${message}`);
+              await fs.appendFile(absolutePath, `\n${message}`);
             },
           },
         );
@@ -253,16 +340,12 @@ export default (app: Router) => {
     },
   );
 
-  route.get(
+  route.get('/log', async (req: Request, res: Response, next: NextFunction) => {
-    '/log',
+    try {
-    async (req: Request, res: Response, next: NextFunction) => {
+      const systemService = Container.get(SystemService);
-      try {
+      await systemService.getSystemLog(res);
-        const systemService = Container.get(SystemService);
+    } catch (e) {
-        await systemService.getSystemLog(res);
+      return next(e);
-      } catch (e) {
+    }
-        return next(e);
+  });
-      }
-    },
-  );
-
 };

back/api/user.ts

@@ -74,6 +74,9 @@ export default (app: Router) => {
     async (req: Request, res: Response, next: NextFunction) => {
       const logger: Logger = Container.get('logger');
       try {
+        if (process.env.DeployEnv === 'demo') {
+          return res.send({ code: 450, message: '未知错误' });
+        }
         const userService = Container.get(UserService);
         await userService.updateUsernameAndPassword(req.body);
         res.send({ code: 200, message: '更新成功' });

back/app.ts

@@ -15,7 +15,7 @@ async function startServer() {
   await require('./loaders/app').default({ expressApp: app });
 
   const server = app
-    .listen(config.port, () => {
+    .listen(config.port, '0.0.0.0', () => {
       Logger.debug(`✌️ 后端服务启动成功！`);
       console.debug(`✌️ 后端服务启动成功！`);
       process.send?.('ready');

back/config/const.ts

@@ -5,3 +5,21 @@ export const QL_COMMAND = 'ql';
 
 export const TASK_PREFIX = `${TASK_COMMAND} `;
 export const QL_PREFIX = `${QL_COMMAND} `;
+
+export const 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',
+  },
+];

back/config/index.ts

@@ -19,7 +19,12 @@ const lastVersionFile = `https://qn.whyour.cn/version.yaml`;
 const rootPath = process.env.QL_DIR as string;
 const envFound = dotenv.config({ path: path.join(rootPath, '.env') });
 
-const dataPath = path.join(rootPath, 'data/');
+let dataPath = path.join(rootPath, 'data/');
+
+if (process.env.QL_DATA_DIR) {
+  dataPath = process.env.QL_DATA_DIR.replace(/\/$/g, '');
+}
+
 const shellPath = path.join(rootPath, 'shell/');
 const tmpPath = path.join(rootPath, '.tmp/');
 const samplePath = path.join(rootPath, 'sample/');
@@ -33,6 +38,8 @@ const sshdPath = path.join(dataPath, 'ssh.d/');
 const systemLogPath = path.join(dataPath, 'syslog/');
 
 const envFile = path.join(configPath, 'env.sh');
+const jsEnvFile = path.join(configPath, 'env.js');
+const pyEnvFile = path.join(configPath, 'env.py');
 const confFile = path.join(configPath, 'config.sh');
 const crontabFile = path.join(configPath, 'crontab.list');
 const authConfigFile = path.join(configPath, 'auth.json');
@@ -47,6 +54,7 @@ const configString = 'config sample crontab shareCode diy';
 const versionFile = path.join(rootPath, 'version.yaml');
 const dataTgzFile = path.join(tmpPath, 'data.tgz');
 const shareShellFile = path.join(shellPath, 'share.sh');
+const dependenceProxyFile = path.join(configPath, 'dependence-proxy.sh');
 
 if (envFound.error) {
   throw new Error("⚠️  Couldn't find .env file  ⚠️");
@@ -56,6 +64,7 @@ export default {
   port: parseInt(process.env.BACK_PORT as string, 10),
   cronPort: parseInt(process.env.CRON_PORT as string, 10),
   publicPort: parseInt(process.env.PUBLIC_PORT as string, 10),
+  updatePort: parseInt(process.env.UPDATE_PORT as string, 10),
   secret: process.env.SECRET || createRandomString(16, 32),
   logs: {
     level: process.env.LOG_LEVEL || 'silly',
@@ -68,6 +77,7 @@ export default {
   dataPath,
   dataTgzFile,
   shareShellFile,
+  dependenceProxyFile,
   configString,
   loginFaild,
   authError,
@@ -79,6 +89,8 @@ export default {
   sampleFile,
   confFile,
   envFile,
+  jsEnvFile,
+  pyEnvFile,
   dbPath,
   uploadPath,
   configPath,
@@ -89,7 +101,10 @@ export default {
     'config.sh.sample',
     'cookie.sh',
     'crontab.list',
+    'dependence-proxy.sh',
     'env.sh',
+    'env.js',
+    'env.py',
     'token.json',
   ],
   writePathList: [configPath, scriptPath],

back/config/subscription.ts

@@ -32,7 +32,9 @@ export function formatCommand(doc: Subscription, url?: string) {
     autoDelCron,
   } = doc;
   if (type === 'file') {
-    command += `raw "${_url}"`;
+    command += `raw "${_url}" "${proxy || ''}" "${
+      isNil(autoAddCron) ? true : Boolean(autoAddCron)
+    }" "${isNil(autoDelCron) ? true : Boolean(autoDelCron)}"`;
   } else {
     command += `repo "${_url}" "${whitelist || ''}" "${blacklist || ''}" "${
       dependences || ''

back/config/util.ts

@@ -1,4 +1,4 @@
-import * as fs from 'fs';
+import * as fs from 'fs/promises';
 import * as path from 'path';
 import got from 'got';
 import iconv from 'iconv-lite';
@@ -13,22 +13,24 @@ import Logger from '../loaders/logger';
 
 export * from './share';
 
-export function getFileContentByName(fileName: string) {
+export async function getFileContentByName(fileName: string) {
-  if (fs.existsSync(fileName)) {
+  const _exsit = await fileExist(fileName);
-    return fs.readFileSync(fileName, 'utf8');
+  if (_exsit) {
+    return await fs.readFile(fileName, 'utf8');
   }
   return '';
 }
 
-export function getLastModifyFilePath(dir: string) {
+export async function getLastModifyFilePath(dir: string) {
   let filePath = '';
 
-  if (fs.existsSync(dir)) {
+  const _exsit = await fileExist(dir);
-    const arr = fs.readdirSync(dir);
+  if (_exsit) {
+    const arr = await fs.readdir(dir);
 
-    arr.forEach((item) => {
+    arr.forEach(async (item) => {
       const fullpath = path.join(dir, item);
-      const stats = fs.statSync(fullpath);
+      const stats = await fs.lstat(fullpath);
       if (stats.isFile()) {
         if (stats.mtimeMs >= 0) {
           filePath = fullpath;
@@ -59,7 +61,8 @@ export async function getNetIp(req: any) {
       ...req.ips,
       req.socket.remoteAddress,
     ]),
-  ];
+  ].filter(Boolean);
+
   let ip = ipArray[0];
 
   if (ipArray.length > 1) {
@@ -80,6 +83,7 @@ export async function getNetIp(req: any) {
       break;
     }
   }
+
   ip = ip.substr(ip.lastIndexOf(':') + 1, ip.length);
   if (ip.includes('127.0') || ip.includes('192.168') || ip.includes('10.7')) {
     ip = '';
@@ -90,29 +94,31 @@ export async function getNetIp(req: any) {
   }
 
   try {
-    const baiduApi = got
+    const csdnApi = got
-      .get(`https://www.cip.cc/${ip}`, { timeout: 10000, retry: 0 })
+      .get(`https://searchplugin.csdn.net/api/v1/ip/get?ip=${ip}`, {
+        timeout: 10000,
+        retry: 0,
+      })
       .text();
-    const ipApi = got
+    const pconlineApi = got
       .get(`https://whois.pconline.com.cn/ipJson.jsp?ip=${ip}&json=true`, {
         timeout: 10000,
         retry: 0,
       })
       .buffer();
-    const [data, ipApiBody] = await await Promise.all<any>([baiduApi, ipApi]);
+    const [csdnBody, pconlineBody] = await await Promise.all<any>([
-
+      csdnApi,
-    const ipRegx = /.*IP	:(.*)\n/;
+      pconlineApi,
-    const addrRegx = /.*数据二	:(.*)\n/;
+    ]);
-    if (data && ipRegx.test(data) && addrRegx.test(data)) {
+    const csdnRes = JSON.parse(csdnBody);
-      const ip = data.match(ipRegx)[1];
+    const pconlineRes = JSON.parse(iconv.decode(pconlineBody, 'GBK'));
-      const addr = data.match(addrRegx)[1];
+    let address = '';
-      return { address: addr, ip };
+    if (csdnBody && csdnRes.code == 200) {
-    } else if (ipApiBody) {
+      address = csdnRes.data.address;
-      const { addr, ip } = JSON.parse(iconv.decode(ipApiBody, 'GBK'));
+    } else if (pconlineRes && pconlineRes.addr) {
-      return { address: `${addr}`, ip };
+      address = pconlineRes.addr;
-    } else {
-      return { address: `获取失败`, ip };
     }
+    return { address, ip };
   } catch (error) {
     return { address: `获取失败`, ip };
   }
@@ -152,22 +158,17 @@ export function getPlatform(userAgent: string): 'mobile' | 'desktop' {
 }
 
 export async function fileExist(file: any) {
-  return new Promise((resolve) => {
+  try {
-    try {
+    await fs.access(file);
-      fs.accessSync(file);
+    return true;
-      resolve(true);
+  } catch (error) {
-    } catch (error) {
+    return false;
-      resolve(false);
+  }
-    }
-  });
 }
 
 export async function createFile(file: string, data: string = '') {
-  return new Promise((resolve) => {
+  await fs.mkdir(path.dirname(file), { recursive: true });
-    fs.mkdirSync(path.dirname(file), { recursive: true });
+  await fs.writeFile(file, data);
-    fs.writeFileSync(file, data);
-    resolve(true);
-  });
 }
 
 export async function handleLogPath(
@@ -235,63 +236,71 @@ interface IFile {
 }
 
 export function dirSort(a: IFile, b: IFile): number {
-  if (a.type !== b.type) {
+  if (a.type === 'file' && b.type === 'file') {
-    return FileType[a.type] < FileType[b.type] ? -1 : 1
+    return b.mtime - a.mtime;
-  } else if (a.mtime !== b.mtime) {
+  } else if (a.type === 'directory' && b.type === 'directory') {
-    return a.mtime > b.mtime ? -1 : 1
+    return a.title.localeCompare(b.title);
   } else {
-    return 0;
+    return a.type === 'directory' ? -1 : 1;
   }
 }
 
-export function readDirs(
+export async function readDirs(
   dir: string,
   baseDir: string = '',
   blacklist: string[] = [],
-): IFile[] {
+  sort: (a: IFile, b: IFile) => number = dirSort,
+): Promise<IFile[]> {
   const relativePath = path.relative(baseDir, dir);
-  const files = fs.readdirSync(dir);
+  const files = await fs.readdir(dir);
-  const result: IFile[] = files
+  const result: IFile[] = [];
-    .filter((x) => !blacklist.includes(x))
+
-    .map((file: string) => {
+  for (const file of files) {
-      const subPath = path.join(dir, file);
+    const subPath = path.join(dir, file);
-      const stats = fs.statSync(subPath);
+    const stats = await fs.lstat(subPath);
-      const key = path.join(relativePath, file);
+    const key = path.join(relativePath, file);
-      if (stats.isDirectory()) {
+
-        return {
+    if (blacklist.includes(file) || stats.isSymbolicLink()) {
-          title: file,
+      continue;
-          key,
+    }
-          type: 'directory',
+
-          parent: relativePath,
+    if (stats.isDirectory()) {
-          mtime: stats.mtime.getTime(),
+      const children = await readDirs(subPath, baseDir, blacklist, sort);
-          children: readDirs(subPath, baseDir).sort(dirSort),
+      result.push({
-        };
+        title: file,
-      }
+        key,
-      return {
+        type: 'directory',
+        parent: relativePath,
+        mtime: stats.mtime.getTime(),
+        children: children.sort(sort),
+      });
+    } else {
+      result.push({
         title: file,
         type: 'file',
-        isLeaf: true,
         key,
         parent: relativePath,
         size: stats.size,
         mtime: stats.mtime.getTime(),
-      };
+      });
-    });
+    }
-  return result.sort(dirSort);
+  }
+
+  return result.sort(sort);
 }
 
-export function readDir(
+export async function readDir(
   dir: string,
   baseDir: string = '',
   blacklist: string[] = [],
 ) {
   const relativePath = path.relative(baseDir, dir);
-  const files = fs.readdirSync(dir);
+  const files = await fs.readdir(dir);
   const result: any = files
     .filter((x) => !blacklist.includes(x))
-    .map((file: string) => {
+    .map(async (file: string) => {
       const subPath = path.join(dir, file);
-      const stats = fs.statSync(subPath);
+      const stats = await fs.lstat(subPath);
       const key = path.join(relativePath, file);
       return {
         title: file,
@@ -303,27 +312,12 @@ export function readDir(
   return result;
 }
 
-export async function emptyDir(path: string) {
-  const pathExist = await fileExist(path);
-  if (!pathExist) {
-    return;
-  }
-  const files = fs.readdirSync(path);
-  for (const file of files) {
-    const filePath = `${path}/${file}`;
-    const stats = fs.statSync(filePath);
-    if (stats.isDirectory()) {
-      await emptyDir(filePath);
-    } else {
-      fs.unlinkSync(filePath);
-    }
-  }
-  fs.rmdirSync(path);
-}
-
 export async function promiseExec(command: string): Promise<string> {
   try {
-    const { stderr, stdout } = await promisify(exec)(command, { maxBuffer: 200 * 1024 * 1024, encoding: 'utf8' });
+    const { stderr, stdout } = await promisify(exec)(command, {
+      maxBuffer: 200 * 1024 * 1024,
+      encoding: 'utf8',
+    });
     return stdout || stderr;
   } catch (error) {
     return JSON.stringify(error);
@@ -332,7 +326,10 @@ export async function promiseExec(command: string): Promise<string> {
 
 export async function promiseExecSuccess(command: string): Promise<string> {
   try {
-    const { stdout } = await promisify(exec)(command, { maxBuffer: 200 * 1024 * 1024, encoding: 'utf8' });
+    const { stdout } = await promisify(exec)(command, {
+      maxBuffer: 200 * 1024 * 1024,
+      encoding: 'utf8',
+    });
     return stdout || '';
   } catch (error) {
     return '';
@@ -363,37 +360,49 @@ export function parseHeaders(headers: string) {
   return parsed;
 }
 
+function parseString(
+  input: string,
+  valueFormatFn?: (v: string) => string,
+): Record<string, string> {
+  const regex = /(\w+):\s*((?:(?!\n\w+:).)*)/g;
+  const matches: Record<string, string> = {};
+
+  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;
+}
+
 export function parseBody(
   body: string,
   contentType:
     | 'application/json'
     | 'multipart/form-data'
-    | 'application/x-www-form-urlencoded',
+    | 'application/x-www-form-urlencoded'
+    | 'text/plain',
+  valueFormatFn?: (v: string) => string,
 ) {
-  if (!body) return '';
+  if (contentType === 'text/plain' || !body) {
+    return valueFormatFn && body ? valueFormatFn(body) : body;
+  }
 
-  const parsed: any = {};
+  const parsed = parseString(body, valueFormatFn);
-  let key;
-  let val;
-  let i;
-
-  body &&
-    body.split('\n').forEach(function parser(line) {
-      i = line.indexOf(':');
-      key = line.substring(0, i).trim().toLowerCase();
-      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;
-      }
-    });
 
   switch (contentType) {
     case 'multipart/form-data':
@@ -429,14 +438,14 @@ export async function killTask(pid: number) {
       [pid, ...pids].reverse().forEach((x) => {
         process.kill(x, 15);
       });
-    } catch (error) { }
+    } catch (error) {}
   } else {
     process.kill(pid, 2);
   }
 }
 
-export async function getPid(name: string) {
+export async function getPid(cmd: string) {
-  const taskCommand = `ps -eo pid,command | grep "${name}" | grep -v grep | awk '{print $1}' | head -1 | xargs echo -n`;
+  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;
 }
@@ -449,14 +458,17 @@ interface IVersion {
 }
 
 export async function parseVersion(path: string): Promise<IVersion> {
-  return load(await promisify(fs.readFile)(path, 'utf8')) as IVersion;
+  return load(await fs.readFile(path, 'utf8')) as IVersion;
 }
 
 export async function parseContentVersion(content: string): Promise<IVersion> {
   return load(content) as IVersion;
 }
 
-export async function getUniqPath(command: string, id: string): Promise<string> {
+export async function getUniqPath(
+  command: string,
+  id: string,
+): Promise<string> {
   if (/^\d+$/.test(id)) {
     id = `_${id}`;
   } else {
@@ -498,7 +510,18 @@ export function safeJSONParse(value?: string) {
   try {
     return JSON.parse(value);
   } catch (error) {
-    Logger.error('[JSON.parse失败]', error)
+    Logger.error('[JSON.parse失败]', error);
     return {};
   }
 }
+
+export async function rmPath(path: string) {
+  try {
+    const _exsit = await fileExist(path);
+    if (_exsit) {
+      await fs.rm(path, { force: true, recursive: true, maxRetries: 5 });
+    }
+  } catch (error) {
+    Logger.error('[rmPath失败]', error);
+  }
+}

back/data/dependence.ts

@@ -32,6 +32,7 @@ export enum DependenceStatus {
   'removed',
   'removeFailed',
   'queued',
+  'cancelled',
 }
 
 export enum DependenceTypes {

back/data/notify.ts

@@ -14,6 +14,7 @@ export enum NotificationMode {
   'aibotk' = 'aibotk',
   'iGot' = 'iGot',
   'pushPlus' = 'pushPlus',
+  'wePlusBot' = 'wePlusBot',
   'email' = 'email',
   'pushMe' = 'pushMe',
   'feishu' = 'feishu',
@@ -58,6 +59,7 @@ export class BarkNotification extends NotificationBaseInfo {
   public barkGroup = 'qinglong';
   public barkLevel = 'active';
   public barkUrl = '';
+  public barkArchive=""
 }
 
 export class TelegramBotNotification extends NotificationBaseInfo {
@@ -66,7 +68,7 @@ export class TelegramBotNotification extends NotificationBaseInfo {
   public telegramBotProxyHost = '';
   public telegramBotProxyPort = '';
   public telegramBotProxyAuth = '';
-  public telegramBotApiHost = 'api.telegram.org';
+  public telegramBotApiHost = 'https://api.telegram.org';
 }
 
 export class DingtalkBotNotification extends NotificationBaseInfo {
@@ -99,6 +101,12 @@ export class PushPlusNotification extends NotificationBaseInfo {
   public pushPlusUser = '';
 }
 
+export class WePlusBotNotification extends NotificationBaseInfo {
+  public wePlusBotToken = '';
+  public wePlusBotReceiver = '';
+  public wePlusBotVersion = '';
+}
+
 export class EmailNotification extends NotificationBaseInfo {
   public emailService: string = '';
   public emailUser: string = '';
@@ -107,12 +115,13 @@ export class EmailNotification extends NotificationBaseInfo {
 
 export class PushMeNotification extends NotificationBaseInfo {
   public pushMeKey: string = '';
+  public pushMeUrl: string = '';
 }
 
 export class ChronocatNotification extends NotificationBaseInfo {
   public chronocatURL: string = '';
   public chronocatQQ: string = '';
-  public chronocatToekn: string = '';
+  public chronocatToken: string = '';
 }
 
 export class WebhookNotification extends NotificationBaseInfo {
@@ -144,6 +153,7 @@ export interface NotificationInfo
     AibotkNotification,
     IGotNotification,
     PushPlusNotification,
+    WePlusBotNotification,
     EmailNotification,
     PushMeNotification,
     WebhookNotification,

back/data/sock.ts

@@ -17,4 +17,6 @@ export type SockMessageType =
   | 'updateSystemVersion'
   | 'manuallyRunScript'
   | 'runSubscriptionEnd'
-  | 'reloadSystem';
+  | 'reloadSystem'
+  | 'updateNodeMirror'
+  | 'updateLinuxMirror';

back/data/system.ts

@@ -2,13 +2,13 @@ import { sequelize } from '.';
 import { DataTypes, Model, ModelDefined } from 'sequelize';
 import { NotificationInfo } from './notify';
 
-export class AuthInfo {
+export class SystemInfo {
   ip?: string;
   type: AuthDataType;
-  info?: AuthModelInfo;
+  info?: SystemModelInfo;
   id?: number;
 
-  constructor(options: AuthInfo) {
+  constructor(options: SystemInfo) {
     this.ip = options.ip;
     this.info = options.info;
     this.type = options.type;
@@ -32,6 +32,10 @@ export enum AuthDataType {
 export interface SystemConfigInfo {
   logRemoveFrequency?: number;
   cronConcurrency?: number;
+  dependenceProxy?: string;
+  nodeMirror?: string;
+  pythonMirror?: string;
+  linuxMirror?: string;
 }
 
 export interface LoginLogInfo {
@@ -42,12 +46,12 @@ export interface LoginLogInfo {
   status?: LoginStatus;
 }
 
-export type AuthModelInfo = SystemConfigInfo &
+export type SystemModelInfo = SystemConfigInfo &
   Partial<NotificationInfo> &
   LoginLogInfo;
 
-export interface AuthInstance extends Model<AuthInfo, AuthInfo>, AuthInfo {}
+export interface SystemInstance extends Model<SystemInfo, SystemInfo>, SystemInfo { }
-export const AuthModel = sequelize.define<AuthInstance>('Auth', {
+export const SystemModel = sequelize.define<SystemInstance>('Auth', {
   ip: DataTypes.STRING,
   type: DataTypes.STRING,
   info: {

back/loaders/app.ts

@@ -7,28 +7,23 @@ import linkDeps from './deps';
 import initTask from './initTask';
 
 export default async ({ expressApp }: { expressApp: Application }) => {
-  try {
+  depInjectorLoader();
-    depInjectorLoader();
+  Logger.info('✌️ Dependency loaded');
-    Logger.info('✌️ Dependency Injector loaded');
+  console.log('✌️ Dependency loaded');
-    console.log('✌️ Dependency Injector loaded');
 
-    expressLoader({ app: expressApp });
+  await initData();
-    Logger.info('✌️ Express loaded');
+  Logger.info('✌️ Init data loaded');
-    console.log('✌️ Express loaded');
+  console.log('✌️ Init data loaded');
 
-    await initData();
+  await linkDeps();
-    Logger.info('✌️ init data loaded');
+  Logger.info('✌️ Link deps loaded');
-    console.log('✌️ init data loaded');
+  console.log('✌️ Link deps loaded');
 
-    await linkDeps();
+  initTask();
-    Logger.info('✌️ link deps loaded');
+  Logger.info('✌️ Init task loaded');
-    console.log('✌️ link deps loaded');
+  console.log('✌️ Init task loaded');
 
-    initTask();
+  expressLoader({ app: expressApp });
-    Logger.info('✌️ init task loaded');
+  Logger.info('✌️ Express loaded');
-    console.log('✌️ init task loaded');
+  console.log('✌️ Express loaded');
-  } catch (error) {
-    Logger.error(`✌️ depInjectorLoader expressLoader initData linkDeps failed, ${error}`);
-    console.error(`✌️ depInjectorLoader expressLoader initData linkDeps failed ${error}`);
-  }
 };

back/loaders/db.ts

@@ -5,7 +5,7 @@ import { EnvModel } from '../data/env';
 import { CrontabModel } from '../data/cron';
 import { DependenceModel } from '../data/dependence';
 import { AppModel } from '../data/open';
-import { AuthModel } from '../data/auth';
+import { SystemModel } from '../data/system';
 import { fileExist } from '../config/util';
 import { SubscriptionModel } from '../data/subscription';
 import { CrontabViewModel } from '../data/cronView';
@@ -17,7 +17,7 @@ export default async () => {
     await CrontabModel.sync();
     await DependenceModel.sync();
     await AppModel.sync();
-    await AuthModel.sync();
+    await SystemModel.sync();
     await EnvModel.sync();
     await SubscriptionModel.sync();
     await CrontabViewModel.sync();
@@ -75,7 +75,7 @@ export default async () => {
     const dependenceCount = await DependenceModel.count();
     const envCount = await EnvModel.count();
     const appCount = await AppModel.count();
-    const authCount = await AuthModel.count();
+    const authCount = await SystemModel.count();
     if (crondbExist && cronCount === 0) {
       const cronDb = new DataStore({
         filename: cronDbFile,
@@ -127,7 +127,7 @@ export default async () => {
       });
       authDb.persistence.compactDatafile();
       authDb.find({}).exec(async (err, docs) => {
-        await AuthModel.bulkCreate(docs, { ignoreDuplicates: true });
+        await SystemModel.bulkCreate(docs, { ignoreDuplicates: true });
       });
     }
 

back/loaders/deps.ts

@@ -1,49 +1,58 @@
 import path from 'path';
-import fs from 'fs';
+import fs from 'fs/promises';
 import chokidar from 'chokidar';
 import config from '../config/index';
-import { promiseExec } from '../config/util';
+import { fileExist, promiseExec, rmPath } from '../config/util';
 
-function linkToNodeModule(src: string, dst?: string) {
+async function linkToNodeModule(src: string, dst?: string) {
   const target = path.join(config.rootPath, 'node_modules', dst || src);
   const source = path.join(config.rootPath, src);
 
-  fs.lstat(target, (err, stat) => {
+  try {
-    if (!stat) {
+    const stats = await fs.lstat(target);
-      fs.symlink(source, target, 'dir', (err) => {
+    if (!stats) {
-        if (err) throw err;
+      await fs.symlink(source, target, 'dir');
-      });
     }
-  });
+  } catch (error) {}
 }
 
 async function linkCommand() {
   const commandPath = await promiseExec('which node');
   const commandDir = path.dirname(commandPath);
-  const linkShell = [
+  const oldLinkShell = [
     {
       src: 'update.sh',
       dest: 'ql',
-    },
+      tmp: 'ql_tmp',
-    {
-      src: 'task.sh',
-      dest: 'task',
     },
   ];
+  // const newLinkShell = [
+  //   {
+  //     src: 'task.mjs',
+  //     dest: 'task',
+  //     tmp: 'task_tmp',
+  //   },
+  // ];
 
-  for (const link of linkShell) {
+  for (const link of oldLinkShell) {
     const source = path.join(config.rootPath, 'shell', link.src);
     const target = path.join(commandDir, link.dest);
-    if (fs.existsSync(target)) {
+    const tmpTarget = path.join(commandDir, link.tmp);
-      fs.unlinkSync(target);
+    await fs.symlink(source, tmpTarget);
-    }
+    await fs.rename(tmpTarget, target);
-    fs.symlink(source, target, (err) => { });
   }
+  // for (const link of newLinkShell) {
+  //   const source = path.join(config.rootPath, 'cli', link.src);
+  //   const target = path.join(commandDir, link.dest);
+  //   const tmpTarget = path.join(commandDir, link.tmp);
+  //   await fs.symlink(source, tmpTarget);
+  //   await fs.rename(tmpTarget, target);
+  // }
 }
 
 export default async (src: string = 'deps') => {
   await linkCommand();
-  linkToNodeModule(src);
+  await linkToNodeModule(src);
 
   const source = path.join(config.rootPath, src);
   const watcher = chokidar.watch(source, {

back/loaders/express.ts

@@ -4,7 +4,7 @@ import cors from 'cors';
 import routes from '../api';
 import config from '../config';
 import jwt, { UnauthorizedError } from 'express-jwt';
-import fs from 'fs';
+import fs from 'fs/promises';
 import { getPlatform, getToken, safeJSONParse } from '../config/util';
 import Container from 'typedi';
 import OpenService from '../services/open';
@@ -18,7 +18,7 @@ import { serveEnv } from '../config/serverEnv';
 import Logger from './logger';
 
 export default ({ app }: { app: Application }) => {
-  app.enable('trust proxy');
+  app.set('trust proxy', 'loopback');
   app.use(cors());
   app.get(`${config.api.prefix}/env.js`, serveEnv);
   app.use(`${config.api.prefix}/static`, express.static(config.uploadPath));
@@ -29,7 +29,7 @@ export default ({ app }: { app: Application }) => {
       target: `http://0.0.0.0:${config.publicPort}/api`,
       changeOrigin: true,
       pathRewrite: { '/api/public': '' },
-      logProvider: () => Logger
+      logProvider: () => Logger,
     }),
   );
 
@@ -83,7 +83,7 @@ export default ({ app }: { app: Application }) => {
       return next();
     }
 
-    const data = fs.readFileSync(config.authConfigFile, 'utf8');
+    const data = await fs.readFile(config.authConfigFile, 'utf8');
     if (data && headerToken) {
       const { token = '', tokens = {} } = safeJSONParse(data);
       if (headerToken === token || tokens[req.platform] === headerToken) {
@@ -105,7 +105,6 @@ export default ({ app }: { app: Application }) => {
     }
     const userService = Container.get(UserService);
     const authInfo = await userService.getUserInfo();
-    const envCount = await EnvModel.count();
 
     let isInitialized = true;
     if (

back/loaders/initData.ts

@@ -9,11 +9,62 @@ import { Op } from 'sequelize';
 import config from '../config';
 import { CrontabViewModel, CronViewType } from '../data/cronView';
 import { initPosition } from '../data/env';
+import { AuthDataType, SystemModel } from '../data/system';
+import SystemService from '../services/system';
 
 export default async () => {
   const cronService = Container.get(CronService);
   const envService = Container.get(EnvService);
   const dependenceService = Container.get(DependenceService);
+  const systemService = Container.get(SystemService);
+
+  // 初始化增加系统配置
+  await SystemModel.upsert({ type: AuthDataType.systemConfig });
+  await SystemModel.upsert({ type: AuthDataType.notification });
+
+  const installDependencies = () => {
+    // 初始化时安装所有处于安装中，安装成功，安装失败的依赖
+    DependenceModel.findAll({
+      where: {},
+      order: [
+        ['type', 'DESC'],
+        ['createdAt', 'DESC'],
+      ],
+      raw: true,
+    }).then(async (docs) => {
+      await DependenceModel.update(
+        { status: DependenceStatus.queued, log: [] },
+        { where: { id: docs.map((x) => x.id!) } },
+      );
+      setTimeout(() => {
+        dependenceService.installDependenceOneByOne(docs);
+      }, 5000);
+    });
+  };
+
+  // 初始化更新 linux/python/nodejs 镜像源配置
+  const systemConfig = await systemService.getSystemConfig();
+  if (systemConfig.info?.pythonMirror) {
+    systemService.updatePythonMirror({
+      pythonMirror: systemConfig.info?.pythonMirror,
+    });
+  }
+  if (systemConfig.info?.linuxMirror) {
+    systemService.updateLinuxMirror(
+      {
+        linuxMirror: systemConfig.info?.linuxMirror,
+      },
+      undefined,
+      () => installDependencies(),
+    );
+  } else {
+    installDependencies();
+  }
+  if (systemConfig.info?.nodeMirror) {
+    systemService.updateNodeMirror({
+      nodeMirror: systemConfig.info?.nodeMirror,
+    });
+  }
 
   // 初始化新增默认全部任务视图
   CrontabViewModel.findAll({
@@ -32,22 +83,6 @@ export default async () => {
   // 初始化更新所有任务状态为空闲
   await CrontabModel.update({ status: CrontabStatus.idle }, { where: {} });
 
-  // 初始化时安装所有处于安装中，安装成功，安装失败的依赖
-  DependenceModel.findAll({
-    where: {},
-    order: [
-      ['type', 'DESC'],
-      ['createdAt', 'DESC'],
-    ],
-    raw: true,
-  }).then(async (docs) => {
-    await DependenceModel.update(
-      { status: DependenceStatus.queued, log: [] },
-      { where: { id: docs.map((x) => x.id!) } },
-    );
-    dependenceService.installDependenceOneByOne(docs);
-  });
-
   // 初始化时执行一次所有的 ql repo 任务
   CrontabModel.findAll({
     where: {
@@ -90,7 +125,7 @@ export default async () => {
         if (doc.command.includes(`${config.rootPath}/log/`)) {
           await CrontabModel.update(
             {
-              command: `${config.rootPath}/data/log/${doc.command.replace(
+              command: `${config.dataPath}/log/${doc.command.replace(
                 `${config.rootPath}/log/`,
                 '',
               )}`,
@@ -101,7 +136,7 @@ export default async () => {
         if (doc.command.includes(`${config.rootPath}/config/`)) {
           await CrontabModel.update(
             {
-              command: `${config.rootPath}/data/config/${doc.command.replace(
+              command: `${config.dataPath}/config/${doc.command.replace(
                 `${config.rootPath}/config/`,
                 '',
               )}`,
@@ -112,7 +147,7 @@ export default async () => {
         if (doc.command.includes(`${config.rootPath}/db/`)) {
           await CrontabModel.update(
             {
-              command: `${config.rootPath}/data/db/${doc.command.replace(
+              command: `${config.dataPath}/db/${doc.command.replace(
                 `${config.rootPath}/db/`,
                 '',
               )}`,

back/loaders/initFile.ts

@@ -1,12 +1,16 @@
-import fs from 'fs';
+import fs from 'fs/promises';
 import path from 'path';
 import os from 'os';
-import dotenv from 'dotenv';
 import Logger from './logger';
 import { fileExist } from '../config/util';
 
 const rootPath = process.env.QL_DIR as string;
-const dataPath = path.join(rootPath, 'data/');
+let dataPath = path.join(rootPath, 'data/');
+
+if (process.env.QL_DATA_DIR) {
+  dataPath = process.env.QL_DATA_DIR.replace(/\/$/g, '');
+}
+
 const configPath = path.join(dataPath, 'config/');
 const scriptPath = path.join(dataPath, 'scripts/');
 const logPath = path.join(dataPath, 'log/');
@@ -48,68 +52,72 @@ export default async () => {
   const TaskAfterFileExist = await fileExist(TaskAfterFile);
 
   if (!configDirExist) {
-    fs.mkdirSync(configPath);
+    await fs.mkdir(configPath);
   }
 
   if (!scriptDirExist) {
-    fs.mkdirSync(scriptPath);
+    await fs.mkdir(scriptPath);
   }
 
   if (!logDirExist) {
-    fs.mkdirSync(logPath);
+    await fs.mkdir(logPath);
   }
 
   if (!tmpDirExist) {
-    fs.mkdirSync(tmpPath);
+    await fs.mkdir(tmpPath);
   }
 
   if (!uploadDirExist) {
-    fs.mkdirSync(uploadPath);
+    await fs.mkdir(uploadPath);
   }
 
   if (!sshDirExist) {
-    fs.mkdirSync(sshPath);
+    await fs.mkdir(sshPath);
   }
 
   if (!bakDirExist) {
-    fs.mkdirSync(bakPath);
+    await fs.mkdir(bakPath);
   }
 
   if (!sshdDirExist) {
-    fs.mkdirSync(sshdPath);
+    await fs.mkdir(sshdPath);
   }
 
   if (!systemLogDirExist) {
-    fs.mkdirSync(systemLogPath);
+    await fs.mkdir(systemLogPath);
   }
 
   // 初始化文件
   if (!authFileExist) {
-    fs.writeFileSync(authConfigFile, fs.readFileSync(sampleAuthFile));
+    await fs.writeFile(authConfigFile, await fs.readFile(sampleAuthFile));
   }
 
   if (!confFileExist) {
-    fs.writeFileSync(confFile, fs.readFileSync(sampleConfigFile));
+    await fs.writeFile(confFile, await fs.readFile(sampleConfigFile));
   }
 
   if (!scriptNotifyJsFileExist) {
-    fs.writeFileSync(scriptNotifyJsFile, fs.readFileSync(sampleNotifyJsFile));
+    await fs.writeFile(
+      scriptNotifyJsFile,
+      await fs.readFile(sampleNotifyJsFile),
+    );
   }
 
   if (!scriptNotifyPyFileExist) {
-    fs.writeFileSync(scriptNotifyPyFile, fs.readFileSync(sampleNotifyPyFile));
+    await fs.writeFile(
+      scriptNotifyPyFile,
+      await fs.readFile(sampleNotifyPyFile),
+    );
   }
 
   if (!TaskBeforeFileExist) {
-    fs.writeFileSync(TaskBeforeFile, fs.readFileSync(sampleTaskShellFile));
+    await fs.writeFile(TaskBeforeFile, await fs.readFile(sampleTaskShellFile));
   }
 
   if (!TaskAfterFileExist) {
-    fs.writeFileSync(TaskAfterFile, fs.readFileSync(sampleTaskShellFile));
+    await fs.writeFile(TaskAfterFile, await fs.readFile(sampleTaskShellFile));
   }
 
-  dotenv.config({ path: confFile });
-
   Logger.info('✌️ Init file down');
   console.log('✌️ Init file down');
 };

back/loaders/sentry.ts

@@ -1,6 +1,5 @@
 import { Application } from 'express';
 import * as Sentry from '@sentry/node';
-import * as Tracing from '@sentry/tracing';
 import Logger from './logger';
 import config from '../config';
 import fs from 'fs';
@@ -16,10 +15,10 @@ export default async ({ expressApp }: { expressApp: Application }) => {
       /UnauthorizedError/i,
       /celebrate request validation failed/i,
     ],
-    dsn: 'https://f4b5b55fb3c645b29a5dc2d70a1a4ef4@o1098464.ingest.sentry.io/6122819',
+    dsn: 'https://8b5c84cfef3e22541bc84de0ed00497b@o1098464.ingest.sentry.io/6122819',
     integrations: [
       new Sentry.Integrations.Http({ tracing: true }),
-      new Tracing.Integrations.Express({ app: expressApp }),
+      new Sentry.Integrations.Express({ app: expressApp }),
     ],
     tracesSampleRate: 0.8,
     release: version,

back/loaders/server.ts

@@ -5,28 +5,6 @@ import Sock from './sock';
 export default async ({ server }: { server: Server }) => {
   await Sock({ server });
   Logger.info('✌️ Sock loaded');
-  let exitTime = 0;
-  let timer: NodeJS.Timeout;
-
-  process.on('SIGINT', (singal) => {
-    Logger.warn(`Server need close, singal ${singal}`);
-    console.warn(`Server need close, singal ${singal}`);
-    exitTime++;
-    if (exitTime >= 3) {
-      Logger.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.error('Uncaught exception:', error);

back/loaders/sock.ts

@@ -1,22 +1,21 @@
 import sockJs from 'sockjs';
 import { Server } from 'http';
-import Logger from './logger';
 import { Container } from 'typedi';
 import SockService from '../services/sock';
 import config from '../config/index';
-import fs from 'fs';
+import fs from 'fs/promises';
 import { getPlatform, safeJSONParse } from '../config/util';
 
 export default async ({ server }: { server: Server }) => {
   const echo = sockJs.createServer({ prefix: '/api/ws', log: () => {} });
   const sockService = Container.get(SockService);
 
-  echo.on('connection', (conn) => {
+  echo.on('connection', async (conn) => {
     if (!conn.headers || !conn.url || !conn.pathname) {
       conn.close('404');
     }
 
-    const data = fs.readFileSync(config.authConfigFile, 'utf8');
+    const data = await fs.readFile(config.authConfigFile, 'utf8');
     const platform = getPlatform(conn.headers['user-agent'] || '') || 'desktop';
     const headerToken = conn.url.replace(`${conn.pathname}?token=`, '');
     if (data) {

back/loaders/update.ts

@@ -0,0 +1,106 @@
+import bodyParser from 'body-parser';
+import { errors } from 'celebrate';
+import cors from 'cors';
+import { Application, NextFunction, Request, Response } from 'express';
+import jwt from 'express-jwt';
+import Container from 'typedi';
+import config from '../config';
+import SystemService from '../services/system';
+import Logger from './logger';
+
+export default ({ app }: { app: Application }) => {
+  app.set('trust proxy', 'loopback');
+  app.use(cors());
+
+  app.use(bodyParser.json({ limit: '50mb' }));
+  app.use(bodyParser.urlencoded({ limit: '50mb', extended: true }));
+
+  app.use(
+    jwt({
+      secret: config.secret,
+      algorithms: ['HS384'],
+    }),
+  );
+
+  app.put(
+    '/api/reload',
+    async (req: Request, res: Response, next: NextFunction) => {
+      try {
+        const systemService = Container.get(SystemService);
+        const result = await systemService.reloadSystem();
+        res.send(result);
+      } catch (e) {
+        Logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
+
+  app.put(
+    '/api/system',
+    async (req: Request, res: Response, next: NextFunction) => {
+      try {
+        const systemService = Container.get(SystemService);
+        const result = await systemService.reloadSystem('system');
+        res.send(result);
+      } catch (e) {
+        Logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
+
+  app.put(
+    '/api/data',
+    async (req: Request, res: Response, next: NextFunction) => {
+      try {
+        const systemService = Container.get(SystemService);
+        const result = await systemService.reloadSystem('data');
+        res.send(result);
+      } catch (e) {
+        Logger.error('🔥 error: %o', e);
+        return next(e);
+      }
+    },
+  );
+
+  app.use((req, res, next) => {
+    const err: any = new Error('Not Found');
+    err['status'] = 404;
+    next(err);
+  });
+
+  app.use(errors());
+
+  app.use(
+    (
+      err: Error & { status: number },
+      req: Request,
+      res: Response,
+      next: NextFunction,
+    ) => {
+      if (err.name === 'UnauthorizedError') {
+        return res
+          .status(err.status)
+          .send({ code: 401, message: err.message })
+          .end();
+      }
+      return next(err);
+    },
+  );
+
+  app.use(
+    (
+      err: Error & { status: number },
+      req: Request,
+      res: Response,
+      next: NextFunction,
+    ) => {
+      res.status(err.status || 500);
+      res.json({
+        code: err.status || 500,
+        message: err.message,
+      });
+    },
+  );
+};

back/public.ts

@@ -8,6 +8,7 @@ const app = express();
 const client = new HealthClient(
   `0.0.0.0:${config.cronPort}`,
   credentials.createInsecure(),
+  { 'grpc.enable_http_proxy': 0 },
 );
 
 app.get('/api/health', (req, res) => {
@@ -20,7 +21,7 @@ app.get('/api/health', (req, res) => {
 });
 
 app
-  .listen(config.publicPort, async () => {
+  .listen(config.publicPort, '0.0.0.0', async () => {
     await require('./loaders/sentry').default({ expressApp: app });
     await require('./loaders/db').default();
 

back/schedule/client.ts

@@ -12,6 +12,7 @@ class Client {
   private client = new CronClient(
     `0.0.0.0:${config.cronPort}`,
     credentials.createInsecure(),
+    { 'grpc.enable_http_proxy': 0 },
   );
 
   addCron(request: AddCronRequest['crons']): Promise<AddCronResponse> {

back/schedule/health.ts

@@ -10,7 +10,7 @@ const check = async (
   switch (call.request.service) {
     case 'cron':
       const res = await promiseExec(
-        `curl -s http://0.0.0.0:${config.port}/api/system`,
+        `curl -s --noproxy '*' http://0.0.0.0:${config.port}/api/system`,
       );
 
       if (res.includes('200')) {

back/schedule/index.ts

@@ -7,7 +7,7 @@ import { check } from './health';
 import config from '../config';
 import Logger from '../loaders/logger';
 
-const server = new Server();
+const server = new Server({ 'grpc.enable_http_proxy': 0 });
 server.addService(HealthService, { check });
 server.addService(CronService, { addCron, delCron });
 server.bindAsync(

back/services/config.ts

@@ -0,0 +1,30 @@
+import { Service, Inject } from 'typedi';
+import path, { join } from 'path';
+import config from '../config';
+import { getFileContentByName } from '../config/util';
+import { Response } from 'express';
+import got from 'got';
+
+@Service()
+export default class ConfigService {
+  constructor() {}
+
+  public async getFile(filePath: string, res: Response) {
+    let content = '';
+    if (config.blackFileList.includes(filePath) || !filePath) {
+      res.send({ code: 403, message: '文件无法访问' });
+    }
+    if (filePath.startsWith('sample/')) {
+      const res = await got.get(
+        `https://gitlab.com/whyour/qinglong/-/raw/master/${filePath}`,
+      );
+      content = res.body;
+    } else if (filePath.startsWith('data/scripts/')) {
+      content = await getFileContentByName(join(config.rootPath, filePath));
+    } else {
+      content = await getFileContentByName(join(config.configPath, filePath));
+    }
+
+    res.send({ code: 200, data: content });
+  }
+}

back/services/cron.ts

@@ -3,10 +3,15 @@ import winston from 'winston';
 import config from '../config';
 import { Crontab, CrontabModel, CrontabStatus } from '../data/cron';
 import { exec, execSync } from 'child_process';
-import fs from 'fs';
+import fs from 'fs/promises';
 import cron_parser from 'cron-parser';
-import { getFileContentByName, fileExist, killTask, getUniqPath, safeJSONParse } from '../config/util';
+import {
-import { promises, existsSync } from 'fs';
+  getFileContentByName,
+  fileExist,
+  killTask,
+  getUniqPath,
+  safeJSONParse,
+} from '../config/util';
 import { Op, where, col as colFn, FindOptions, fn } from 'sequelize';
 import path from 'path';
 import { TASK_PREFIX, QL_PREFIX } from '../config/const';
@@ -19,11 +24,11 @@ import omit from 'lodash/omit';
 
 @Service()
 export default class CronService {
-  constructor(@Inject('logger') private logger: winston.Logger) { }
+  constructor(@Inject('logger') private logger: winston.Logger) {}
 
-  private isSixCron(cron: Crontab) {
+  private isNodeCron(cron: Crontab) {
-    const { schedule } = cron;
+    const { schedule, extra_schedules } = cron;
-    if (Number(schedule?.split(/ +/).length) > 5) {
+    if (Number(schedule?.split(/ +/).length) > 5 || extra_schedules?.length) {
       return true;
     }
     return false;
@@ -33,9 +38,15 @@ export default class CronService {
     const tab = new Crontab(payload);
     tab.saved = false;
     const doc = await this.insert(tab);
-    if (this.isSixCron(doc) || doc.extra_schedules?.length) {
+    if (this.isNodeCron(doc)) {
       await cronClient.addCron([
-        { name: doc.name || '', id: String(doc.id), schedule: doc.schedule!, command: this.makeCommand(doc), extraSchedules: doc.extra_schedules || [] },
+        {
+          name: doc.name || '',
+          id: String(doc.id),
+          schedule: doc.schedule!,
+          command: this.makeCommand(doc),
+          extraSchedules: doc.extra_schedules || [],
+        },
       ]);
     }
     await this.set_crontab();
@@ -54,17 +65,17 @@ export default class CronService {
     if (doc.isDisabled === 1) {
       return newDoc;
     }
-    if (this.isSixCron(doc) || doc.extra_schedules?.length) {
+    if (this.isNodeCron(doc)) {
       await cronClient.delCron([String(doc.id)]);
     }
-    if (this.isSixCron(newDoc) || newDoc.extra_schedules?.length) {
+    if (this.isNodeCron(newDoc)) {
       await cronClient.addCron([
         {
           name: doc.name || '',
           id: String(newDoc.id),
           schedule: newDoc.schedule!,
           command: this.makeCommand(newDoc),
-          extraSchedules: newDoc.extra_schedules || []
+          extraSchedules: newDoc.extra_schedules || [],
         },
       ]);
     }
@@ -103,11 +114,20 @@ export default class CronService {
     }
 
     for (const id of ids) {
-      const cron = await this.getDb({ id });
+      let cron;
+      try {
+        cron = await this.getDb({ id });
+      } catch (err) {}
+      if (!cron) {
+        continue;
+      }
       if (status === CrontabStatus.idle && log_path !== cron.log_path) {
         options = omit(options, ['status', 'log_path', 'pid']);
       }
-      await CrontabModel.update({ ...pickBy(options, (v) => v === 0 || !!v) }, { where: { id } });
+      await CrontabModel.update(
+        { ...pickBy(options, (v) => v === 0 || !!v) },
+        { where: { id } },
+      );
     }
   }
 
@@ -361,7 +381,10 @@ export default class CronService {
 
   public async getDb(query: FindOptions<Crontab>['where']): Promise<Crontab> {
     const doc: any = await CrontabModel.findOne({ where: { ...query } });
-    return doc && (doc.get({ plain: true }) as Crontab);
+    if (!doc) {
+      throw new Error(`Cron ${JSON.stringify(query)} not found`);
+    }
+    return doc.get({ plain: true });
   }
 
   public async run(ids: number[]) {
@@ -393,38 +416,53 @@ export default class CronService {
   }
 
   private async runSingle(cronId: number): Promise<number | void> {
-    return taskLimit.runWithCronLimit(() => {
+    return taskLimit.manualRunWithCronLimit(() => {
       return new Promise(async (resolve: any) => {
         const cron = await this.getDb({ id: cronId });
-        const params = { name: cron.name, command: cron.command, schedule: cron.schedule, extraSchedules: cron.extra_schedules };
+        const params = {
+          name: cron.name,
+          command: cron.command,
+          schedule: cron.schedule,
+          extraSchedules: cron.extra_schedules,
+        };
         if (cron.status !== CrontabStatus.queued) {
           resolve(params);
           return;
         }
 
-        this.logger.info(`[panel][开始执行任务] 参数 ${JSON.stringify(params)}`);
+        this.logger.info(
+          `[panel][开始执行任务] 参数 ${JSON.stringify(params)}`,
+        );
 
         let { id, command, log_path } = cron;
         const uniqPath = await getUniqPath(command, `${id}`);
         const logTime = dayjs().format('YYYY-MM-DD-HH-mm-ss-SSS');
         const logDirPath = path.resolve(config.logPath, `${uniqPath}`);
-        if (log_path?.split('/')?.every(x => x !== uniqPath)) {
+        if (log_path?.split('/')?.every((x) => x !== uniqPath)) {
-          fs.mkdirSync(logDirPath, { recursive: true });
+          await fs.mkdir(logDirPath, { recursive: true });
         }
         const logPath = `${uniqPath}/${logTime}.log`;
         const absolutePath = path.resolve(config.logPath, `${logPath}`);
-
+        const cp = spawn(
-        const cp = spawn(`real_log_path=${logPath} no_delay=true ${this.makeCommand(cron)}`, { shell: '/bin/bash' });
+          `real_log_path=${logPath} no_delay=true ${this.makeCommand(
+            cron,
+            true,
+          )}`,
+          { shell: '/bin/bash' },
+        );
 
         await CrontabModel.update(
           { status: CrontabStatus.running, pid: cp.pid, log_path: logPath },
           { where: { id } },
         );
-        cp.stderr.on('data', (data) => {
+        cp.stdout.on('data', async (data) => {
-          fs.appendFileSync(`${absolutePath}`, `${data.toString()}`);
+          await fs.appendFile(absolutePath, data.toString());
         });
-        cp.on('error', (err) => {
+        cp.stderr.on('data', async (data) => {
-          fs.appendFileSync(`${absolutePath}`, `${JSON.stringify(err)}`);
+          await fs.appendFile(absolutePath, data.toString());
+        });
+        cp.on('error', async (err) => {
+          await fs.appendFile(absolutePath, JSON.stringify(err));
         });
 
         cp.on('exit', async (code) => {
@@ -448,13 +486,13 @@ export default class CronService {
     await CrontabModel.update({ isDisabled: 0 }, { where: { id: ids } });
     const docs = await CrontabModel.findAll({ where: { id: ids } });
     const sixCron = docs
-      .filter((x) => this.isSixCron(x))
+      .filter((x) => this.isNodeCron(x))
       .map((doc) => ({
         name: doc.name || '',
         id: String(doc.id),
         schedule: doc.schedule!,
         command: this.makeCommand(doc),
-        extraSchedules: doc.extra_schedules || []
+        extraSchedules: doc.extra_schedules || [],
       }));
     await cronClient.addCron(sixCron);
     await this.set_crontab();
@@ -469,7 +507,7 @@ export default class CronService {
     const absolutePath = path.resolve(config.logPath, `${doc.log_path}`);
     const logFileExist = doc.log_path && (await fileExist(absolutePath));
     if (logFileExist) {
-      return getFileContentByName(`${absolutePath}`);
+      return await getFileContentByName(`${absolutePath}`);
     } else {
       return '任务未运行';
     }
@@ -483,32 +521,39 @@ export default class CronService {
 
     const relativeDir = path.dirname(`${doc.log_path}`);
     const dir = path.resolve(config.logPath, relativeDir);
-    if (existsSync(dir)) {
+    const dirExist = await fileExist(dir);
-      let files = await promises.readdir(dir);
+    if (dirExist) {
-      return files
+      let files = await fs.readdir(dir);
-        .map((x) => ({
+      return (
-          filename: x,
+        await Promise.all(
-          directory: relativeDir.replace(config.logPath, ''),
+          files.map(async (x) => ({
-          time: fs.statSync(`${dir}/${x}`).mtime.getTime(),
+            filename: x,
-        }))
+            directory: relativeDir.replace(config.logPath, ''),
-        .sort((a, b) => b.time - a.time);
+            time: (await fs.lstat(`${dir}/${x}`)).mtime.getTime(),
+          })),
+        )
+      ).sort((a, b) => b.time - a.time);
     } else {
       return [];
     }
   }
 
-  private makeCommand(tab: Crontab) {
+  private makeCommand(tab: Crontab, realTime?: boolean) {
     let command = tab.command.trim();
     if (!command.startsWith(TASK_PREFIX) && !command.startsWith(QL_PREFIX)) {
       command = `${TASK_PREFIX}${tab.command}`;
     }
-    let commandVariable = `no_tee=true ID=${tab.id} `
+    let commandVariable = `real_time=${Boolean(realTime)} no_tee=true ID=${
+      tab.id
+    } `;
     if (tab.task_before) {
-      commandVariable += `task_before='${tab.task_before.replace(/'/g, "'\\''")
+      commandVariable += `task_before='${tab.task_before
+        .replace(/'/g, "'\\''")
         .trim()}' `;
     }
     if (tab.task_after) {
-      commandVariable += `task_after='${tab.task_after.replace(/'/g, "'\\''")
+      commandVariable += `task_after='${tab.task_after
+        .replace(/'/g, "'\\''")
         .trim()}' `;
     }
 
@@ -521,7 +566,11 @@ export default class CronService {
     var crontab_string = '';
     tabs.data.forEach((tab) => {
       const _schedule = tab.schedule && tab.schedule.split(/ +/);
-      if (tab.isDisabled === 1 || _schedule!.length !== 5 || tab.extra_schedules?.length) {
+      if (
+        tab.isDisabled === 1 ||
+        _schedule!.length !== 5 ||
+        tab.extra_schedules?.length
+      ) {
         crontab_string += '# ';
         crontab_string += tab.schedule;
         crontab_string += ' ';
@@ -535,7 +584,7 @@ export default class CronService {
       }
     });
 
-    fs.writeFileSync(config.crontabFile, crontab_string);
+    await fs.writeFile(config.crontabFile, crontab_string);
 
     execSync(`crontab ${config.crontabFile}`);
     await CrontabModel.update({ saved: true }, { where: {} });
@@ -580,13 +629,13 @@ export default class CronService {
     this.set_crontab(tabs);
 
     const sixCron = tabs.data
-      .filter((x) => this.isSixCron(x) && x.isDisabled !== 1)
+      .filter((x) => this.isNodeCron(x) && x.isDisabled !== 1)
       .map((doc) => ({
         name: doc.name || '',
         id: String(doc.id),
         schedule: doc.schedule!,
         command: this.makeCommand(doc),
-        extraSchedules: doc.extra_schedules || []
+        extraSchedules: doc.extra_schedules || [],
       }));
     await cronClient.addCron(sixCron);
   }

back/services/cronView.ts

@@ -63,7 +63,10 @@ export default class CronViewService {
     query: FindOptions<CrontabView>['where'],
   ): Promise<CrontabView> {
     const doc: any = await CrontabViewModel.findOne({ where: { ...query } });
-    return doc && (doc.get({ plain: true }) as CrontabView);
+    if (!doc) {
+      throw new Error(`CronView ${JSON.stringify(query)} not found`);
+    }
+    return doc.get({ plain: true });
   }
 
   public async disabled(ids: number[]) {

back/services/dependence.ts

@@ -14,7 +14,12 @@ import {
 import { spawn } from 'cross-spawn';
 import SockService from './sock';
 import { FindOptions, Op } from 'sequelize';
-import { promiseExecSuccess } from '../config/util';
+import {
+  fileExist,
+  getPid,
+  killTask,
+  promiseExecSuccess,
+} from '../config/util';
 import dayjs from 'dayjs';
 import taskLimit from '../shared/pLimit';
 
@@ -61,12 +66,23 @@ export default class DependenceService {
   }
 
   public async remove(ids: number[], force = false): Promise<Dependence[]> {
-    await DependenceModel.update(
-      { status: DependenceStatus.queued, log: [] },
-      { where: { id: ids } },
-    );
     const docs = await DependenceModel.findAll({ where: { id: ids } });
-    this.installDependenceOneByOne(docs, false, force);
+    const unInstalledDeps = docs.filter(
+      (x) => x.status !== DependenceStatus.installed,
+    );
+    const installedDeps = docs.filter(
+      (x) => x.status === DependenceStatus.installed,
+    );
+    await this.removeDb(unInstalledDeps.map((x) => x.id!));
+
+    if (installedDeps.length) {
+      await DependenceModel.update(
+        { status: DependenceStatus.queued, log: [] },
+        { where: { id: ids } },
+      );
+
+      this.installDependenceOneByOne(docs, false, force);
+    }
     return docs;
   }
 
@@ -75,11 +91,21 @@ export default class DependenceService {
   }
 
   public async dependencies(
-    { searchValue, type }: { searchValue: string; type: string },
+    {
-    sort: any = { position: -1 },
+      searchValue,
+      type,
+      status,
+    }: { searchValue: string; type: string; status: string },
+    sort: any = [],
     query: any = {},
   ): Promise<Dependence[]> {
-    let condition = { ...query, type: DependenceTypes[type as any] };
+    let condition = {
+      ...query,
+      type: DependenceTypes[type as any],
+    };
+    if (status) {
+      condition.status = status.split(',').map(Number);
+    }
     if (searchValue) {
       const encodeText = encodeURI(searchValue);
       const reg = {
@@ -95,7 +121,7 @@ export default class DependenceService {
       };
     }
     try {
-      const result = await this.find(condition);
+      const result = await this.find(condition, sort);
       return result as any;
     } catch (error) {
       throw error;
@@ -119,10 +145,32 @@ export default class DependenceService {
     );
 
     const docs = await DependenceModel.findAll({ where: { id: ids } });
-    this.installDependenceOneByOne(docs);
+    this.installDependenceOneByOne(docs, true, true);
     return docs;
   }
 
+  public async cancel(ids: number[]) {
+    const docs = await DependenceModel.findAll({ where: { id: ids } });
+    for (const doc of docs) {
+      taskLimit.removeQueuedDependency(doc);
+      const depInstallCommand = InstallDependenceCommandTypes[doc.type];
+      const depUnInstallCommand = unInstallDependenceCommandTypes[doc.type];
+      const installCmd = `${depInstallCommand} ${doc.name.trim()}`;
+      const unInstallCmd = `${depUnInstallCommand} ${doc.name.trim()}`;
+      const pids = await Promise.all([
+        getPid(installCmd),
+        getPid(unInstallCmd),
+      ]);
+      for (const pid of pids) {
+        pid && (await killTask(pid));
+      }
+    }
+    await DependenceModel.update(
+      { status: DependenceStatus.cancelled },
+      { where: { id: ids } },
+    );
+  }
+
   private async find(query: any, sort: any = []): Promise<Dependence[]> {
     const docs = await DependenceModel.findAll({
       where: { ...query },
@@ -135,7 +183,10 @@ export default class DependenceService {
     query: FindOptions<Dependence>['where'],
   ): Promise<Dependence> {
     const doc: any = await DependenceModel.findOne({ where: { ...query } });
-    return doc && (doc.get({ plain: true }) as Dependence);
+    if (!doc) {
+      throw new Error(`Dependency ${JSON.stringify(query)} not found`);
+    }
+    return doc.get({ plain: true });
   }
 
   private async updateLog(ids: number[], log: string): Promise<void> {
@@ -157,8 +208,14 @@ export default class DependenceService {
     isInstall: boolean = true,
     force: boolean = false,
   ) {
-    return taskLimit.runOneByOne(() => {
+    return taskLimit.runDependeny(dependency, () => {
       return new Promise(async (resolve) => {
+        if (taskLimit.firstDependencyId !== dependency.id) {
+          return resolve(null);
+        }
+
+        taskLimit.removeQueuedDependency(dependency);
+
         const depIds = [dependency.id!];
         const status = isInstall
           ? DependenceStatus.installing
@@ -188,7 +245,7 @@ export default class DependenceService {
         this.updateLog(depIds, message);
 
         // 判断是否已经安装过依赖
-        if (isInstall) {
+        if (isInstall && !force) {
           const getCommandPrefix = GetDependenceCommandTypes[dependency.type];
           const depVersionStr = versionDependenceCommandTypes[dependency.type];
           let depVersion = '';
@@ -241,10 +298,18 @@ export default class DependenceService {
             return resolve(null);
           }
         }
-
+        const dependenceProxyFileExist = await fileExist(
-        const cp = spawn(`${depRunCommand} ${dependency.name.trim()}`, {
+          config.dependenceProxyFile,
-          shell: '/bin/bash',
+        );
-        });
+        const proxyStr = dependenceProxyFileExist
+          ? `source ${config.dependenceProxyFile} &&`
+          : '';
+        const cp = spawn(
+          `${proxyStr} ${depRunCommand} ${dependency.name.trim()}`,
+          {
+            shell: '/bin/bash',
+          },
+        );
 
         cp.stdout.on('data', async (data) => {
           this.sockService.sendMessage({
@@ -298,7 +363,17 @@ export default class DependenceService {
               ? DependenceStatus.installFailed
               : DependenceStatus.removeFailed;
           }
-          await DependenceModel.update({ status }, { where: { id: depIds } });
+          const docs = await DependenceModel.findAll({ where: { id: depIds } });
+          const _docIds = docs
+            .filter((x) => x.status !== DependenceStatus.cancelled)
+            .map((x) => x.id!);
+
+          if (_docIds.length > 0) {
+            await DependenceModel.update(
+              { status },
+              { where: { id: _docIds } },
+            );
+          }
 
           // 如果删除依赖成功或者强制删除
           if ((isSucceed || force) && !isInstall) {

back/services/env.ts

@@ -1,7 +1,7 @@
 import { Service, Inject } from 'typedi';
 import winston from 'winston';
 import config from '../config';
-import * as fs from 'fs';
+import * as fs from 'fs/promises';
 import {
   Env,
   EnvModel,
@@ -165,7 +165,10 @@ export default class EnvService {
 
   public async getDb(query: FindOptions<Env>['where']): Promise<Env> {
     const doc: any = await EnvModel.findOne({ where: { ...query } });
-    return doc && (doc.get({ plain: true }) as Env);
+    if (!doc) {
+      throw new Error(`Env ${JSON.stringify(query)} not found`);
+    }
+    return doc.get({ plain: true });
   }
 
   public async disabled(ids: string[]) {
@@ -193,6 +196,8 @@ export default class EnvService {
     });
     const groups = groupBy(envs, 'name');
     let env_string = '';
+    let js_env_string = '';
+    let py_env_string = 'import os\n';
     for (const key in groups) {
       if (Object.prototype.hasOwnProperty.call(groups, key)) {
         const group = groups[key];
@@ -205,9 +210,18 @@ export default class EnvService {
             .replace(/'/g, "'\\''")
             .trim();
           env_string += `export ${key}='${value}'\n`;
+          const _env_value = `'${group
+            .map((x) => x.value)
+            .join('&')
+            .replace(/\\/g, '\\\\')
+            .replace(/'/g, "\\'")}'`;
+          js_env_string += `process.env.${key}=${_env_value};\n`;
+          py_env_string += `os.environ['${key}']=${_env_value}\n`;
         }
       }
     }
-    fs.writeFileSync(config.envFile, env_string);
+    await fs.writeFile(config.envFile, env_string);
+    await fs.writeFile(config.jsEnvFile, js_env_string);
+    await fs.writeFile(config.pyEnvFile, py_env_string);
   }
 }

back/services/notify.ts

@@ -27,6 +27,7 @@ export default class NotificationService {
     ['aibotk', this.aibotk],
     ['iGot', this.iGot],
     ['pushPlus', this.pushPlus],
+    ['wePlusBot', this.wePlusBot],
     ['email', this.email],
     ['pushMe', this.pushMe],
     ['webhook', this.webhook],
@@ -57,7 +58,7 @@ export default class NotificationService {
       try {
         return await notificationModeAction?.call(this);
       } catch (error: any) {
-        return false;
+        throw error;
       }
     }
     return false;
@@ -196,22 +197,35 @@ export default class NotificationService {
   }
 
   private async bark() {
-    let { barkPush, barkIcon, barkSound, barkGroup, barkLevel, barkUrl } =
+    let {
-      this.params;
+      barkPush,
+      barkIcon = '',
+      barkSound = '',
+      barkGroup = '',
+      barkLevel = '',
+      barkUrl = '',
+      barkArchive = '',
+    } = this.params;
     if (!barkPush.startsWith('http')) {
       barkPush = `https://api.day.app/${barkPush}`;
     }
-    const url = `${barkPush}/${encodeURIComponent(
+    const url = `${barkPush}`;
-      this.title,
+    const body = {
-    )}/${encodeURIComponent(
+      title: this.title,
-      this.content,
+      body: this.content,
-    )}?icon=${barkIcon}&sound=${barkSound}&group=${barkGroup}&level=${barkLevel}&url=${barkUrl}`;
+      icon: barkIcon,
-
+      sound: barkSound,
+      group: barkGroup,
+      isArchive: barkArchive,
+      level: barkLevel,
+      url: barkUrl,
+    };
     try {
       const res: any = await got
-        .get(url, {
+        .post(url, {
           ...this.gotOption,
-          headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+          json: body,
+          headers: { 'Content-Type': 'application/json' },
         })
         .json();
       if (res.code === 200) {
@@ -234,8 +248,8 @@ export default class NotificationService {
       telegramBotUserId,
     } = this.params;
     const authStr = telegramBotProxyAuth ? `${telegramBotProxyAuth}@` : '';
-    const url = `https://${
+    const url = `${
-      telegramBotApiHost ? telegramBotApiHost : 'api.telegram.org'
+      telegramBotApiHost ? telegramBotApiHost : 'https://api.telegram.org'
     }/bot${telegramBotToken}/sendMessage`;
     let agent;
     if (telegramBotProxyHost && telegramBotProxyPort) {
@@ -507,6 +521,42 @@ export default class NotificationService {
     }
   }
 
+  private async wePlusBot() {
+    const { wePlusBotToken, wePlusBotReceiver, wePlusBotVersion } = this.params;
+
+    let content = this.content;
+    let template = 'txt';
+    if (this.content.length > 800) {
+      template = 'html';
+      content = content.replace(/[\n\r]/g, '<br>');
+    }
+
+    const url = `https://www.weplusbot.com/send`;
+    try {
+      const res: any = await got
+        .post(url, {
+          ...this.gotOption,
+          json: {
+            token: `${wePlusBotToken}`,
+            title: `${this.title}`,
+            template: `${template}`,
+            content: `${content}`,
+            receiver: `${wePlusBotReceiver || ''}`,
+            version: `${wePlusBotVersion || 'pro'}`,
+          },
+        })
+        .json();
+
+      if (res.code === 200) {
+        return true;
+      } else {
+        throw new Error(JSON.stringify(res));
+      }
+    } catch (error: any) {
+      throw new Error(error.response ? error.response.body : error);
+    }
+  }
+
   private async lark() {
     let { larkKey } = this.params;
 
@@ -525,7 +575,7 @@ export default class NotificationService {
           headers: { 'Content-Type': 'application/json' },
         })
         .json();
-      if (res.StatusCode === 0) {
+      if (res.StatusCode === 0 || res.code === 0) {
         return true;
       } else {
         throw new Error(JSON.stringify(res));
@@ -562,24 +612,22 @@ export default class NotificationService {
         throw new Error(JSON.stringify(info));
       }
     } catch (error: any) {
-      throw new Error(error.response ? error.response.body : error);
+      throw error;
     }
   }
 
   private async pushMe() {
-    const { pushMeKey } = this.params;
+    const { pushMeKey, pushMeUrl } = this.params;
     try {
-      const res: any = await got.post(
+      const res: any = await got.post(pushMeUrl || 'https://push.i-i.me/', {
-        `https://push.i-i.me/?push_key=${pushMeKey}`,
+        ...this.gotOption,
-        {
+        json: {
-          ...this.gotOption,
+          push_key: pushMeKey,
-          json: {
+          title: this.title,
-            title: this.title,
+          content: this.content,
-            content: this.content,
-          },
-          headers: { 'Content-Type': 'application/json' },
         },
-      );
+        headers: { 'Content-Type': 'application/json' },
+      });
       if (res.body === 'success') {
         return true;
       } else {
@@ -591,7 +639,7 @@ export default class NotificationService {
   }
 
   private async chronocat() {
-    const { chronocatURL, chronocatQQ, chronocatToekn } = this.params;
+    const { chronocatURL, chronocatQQ, chronocatToken } = this.params;
     try {
       const user_ids = chronocatQQ
         .match(/user_id=(\d+)/g)
@@ -603,7 +651,7 @@ export default class NotificationService {
       const url = `${chronocatURL}/api/message/send`;
       const headers = {
         'Content-Type': 'application/json',
-        Authorization: `Bearer ${chronocatToekn}`,
+        Authorization: `Bearer ${chronocatToken}`,
       };
 
       for (const [chat_type, ids] of [
@@ -634,7 +682,7 @@ export default class NotificationService {
             json: data,
             headers,
           });
-          if (res.body === 'success') {
+          if (res.statusCode === 200) {
             return true;
           } else {
             throw new Error(res.body);
@@ -656,15 +704,14 @@ export default class NotificationService {
       webhookContentType,
     } = this.params;
 
-    const { formatBody, formatUrl } = this.formatNotifyContent(
+    if (!webhookUrl.includes('$title') && !webhookBody.includes('$title')) {
-      webhookUrl,
+      throw new Error('Url 或者 Body 中必须包含 $title');
-      webhookBody,
-    );
-    if (!formatUrl && !formatBody) {
-      return false;
     }
+
     const headers = parseHeaders(webhookHeaders);
-    const body = parseBody(formatBody, webhookContentType);
+    const body = parseBody(webhookBody, webhookContentType, (v) =>
+      v?.replaceAll('$title', this.title)?.replaceAll('$content', this.content),
+    );
     const bodyParam = this.formatBody(webhookContentType, body);
     const options = {
       method: webhookMethod,
@@ -674,6 +721,9 @@ export default class NotificationService {
       ...bodyParam,
     };
     try {
+      const formatUrl = webhookUrl
+        ?.replaceAll('$title', encodeURIComponent(this.title))
+        ?.replaceAll('$content', encodeURIComponent(this.content));
       const res = await got(formatUrl, options);
       if (String(res.statusCode).startsWith('20')) {
         return true;
@@ -693,23 +743,9 @@ export default class NotificationService {
       case 'multipart/form-data':
         return { form: body };
       case 'application/x-www-form-urlencoded':
+      case 'text/plain':
         return { body };
     }
     return {};
   }
-
-  private formatNotifyContent(url: string, body: string) {
-    if (!url.includes('$title') && !body.includes('$title')) {
-      return {};
-    }
-
-    return {
-      formatUrl: url
-        ?.replaceAll('$title', encodeURIComponent(this.title))
-        ?.replaceAll('$content', encodeURIComponent(this.content)),
-      formatBody: body
-        ?.replaceAll('$title', this.title)
-        ?.replaceAll('$content', this.content),
-    };
-  }
 }

back/services/open.ts

@@ -26,7 +26,7 @@ export default class OpenService {
 
   public async insert(payload: App): Promise<App> {
     const doc = await AppModel.create(payload, { returning: true });
-    return doc.get({ plain: true }) as App;
+    return doc.get({ plain: true });
   }
 
   public async update(payload: App): Promise<App> {
@@ -45,7 +45,10 @@ export default class OpenService {
 
   public async getDb(query: any): Promise<App> {
     const doc: any = await AppModel.findOne({ where: query });
-    return doc && (doc.get({ plain: true }) as App);
+    if (!doc) {
+      throw new Error(`App ${JSON.stringify(query)} not found`);
+    }
+    return doc.get({ plain: true });
   }
 
   public async remove(ids: number[]) {

back/services/schedule.ts

@@ -13,7 +13,7 @@ import taskLimit from '../shared/pLimit';
 import { spawn } from 'cross-spawn';
 
 export interface ScheduleTaskType {
-  id: number;
+  id?: number;
   command: string;
   name?: string;
   schedule?: string;

back/services/script.ts

@@ -1,13 +1,12 @@
 import { Service, Inject } from 'typedi';
 import winston from 'winston';
-import fs from 'fs';
+import path, { join } from 'path';
-import path from 'path';
 import SockService from './sock';
 import CronService from './cron';
 import ScheduleService, { TaskCallbacks } from './schedule';
 import config from '../config';
 import { TASK_COMMAND } from '../config/const';
-import { getPid, killTask } from '../config/util';
+import { getFileContentByName, getPid, killTask, rmPath } from '../config/util';
 
 @Service()
 export default class ScriptService {
@@ -16,14 +15,12 @@ export default class ScriptService {
     private sockService: SockService,
     private cronService: CronService,
     private scheduleService: ScheduleService,
-  ) { }
+  ) {}
 
   private taskCallbacks(filePath: string): TaskCallbacks {
     return {
       onEnd: async (cp, endTime, diff) => {
-        try {
+        await rmPath(filePath);
-          fs.unlinkSync(filePath);
-        } catch (error) { }
       },
       onError: async (message: string) => {
         this.sockService.sendMessage({
@@ -42,9 +39,9 @@ export default class ScriptService {
 
   public async runScript(filePath: string) {
     const relativePath = path.relative(config.scriptPath, filePath);
-    const command = `${TASK_COMMAND} -l ${relativePath} now`;
+    const command = `${TASK_COMMAND} ${relativePath} now`;
     const pid = await this.scheduleService.runTask(
-      command,
+      `real_time=true ${command}`,
       this.taskCallbacks(filePath),
       { command },
       'start',
@@ -56,12 +53,21 @@ export default class ScriptService {
   public async stopScript(filePath: string, pid: number) {
     if (!pid) {
       const relativePath = path.relative(config.scriptPath, filePath);
-      pid = await getPid(`${TASK_COMMAND} -l ${relativePath} now`) as number;
+      pid = (await getPid(`${TASK_COMMAND} ${relativePath} now`)) as number;
     }
     try {
       await killTask(pid);
-    } catch (error) { }
+    } catch (error) {}
 
     return { code: 200 };
   }
+
+  public async getFile(filePath: string, fileName: string) {
+    let _filePath = join(config.scriptPath, filePath, fileName);
+    if (filePath.startsWith(config.dataPath)) {
+      _filePath = join(filePath, fileName);
+    }
+    const content = await getFileContentByName(_filePath);
+    return content;
+  }
 }

back/services/sshKey.ts

@@ -1,11 +1,12 @@
 import { Service, Inject } from 'typedi';
 import winston from 'winston';
-import fs, { existsSync } from 'fs';
+import fs from 'fs/promises';
 import os from 'os';
 import path from 'path';
 import { Subscription } from '../data/subscription';
 import { formatUrl } from '../config/subscription';
 import config from '../config';
+import { fileExist, rmPath } from '../config/util';
 
 @Service()
 export default class SshKeyService {
@@ -18,15 +19,16 @@ export default class SshKeyService {
     this.initSshConfigFile();
   }
 
-  private initSshConfigFile() {
+  private async initSshConfigFile() {
     let config = '';
-    if (existsSync(this.sshConfigFilePath)) {
+    const _exist = await fileExist(this.sshConfigFilePath);
-      config = fs.readFileSync(this.sshConfigFilePath, { encoding: 'utf-8' });
+    if (_exist) {
+      config = await fs.readFile(this.sshConfigFilePath, { encoding: 'utf-8' });
     } else {
-      fs.writeFileSync(this.sshConfigFilePath, '');
+      await fs.writeFile(this.sshConfigFilePath, '');
     }
     if (!config.includes(this.sshConfigHeader)) {
-      fs.writeFileSync(
+      await fs.writeFile(
         this.sshConfigFilePath,
         `${this.sshConfigHeader}\n\n${config}`,
         { encoding: 'utf-8' },
@@ -34,9 +36,12 @@ export default class SshKeyService {
     }
   }
 
-  private generatePrivateKeyFile(alias: string, key: string): void {
+  private async generatePrivateKeyFile(
+    alias: string,
+    key: string,
+  ): Promise<void> {
     try {
-      fs.writeFileSync(path.join(this.sshPath, alias), `${key}${os.EOL}`, {
+      await fs.writeFile(path.join(this.sshPath, alias), `${key}${os.EOL}`, {
         encoding: 'utf8',
         mode: '400',
       });
@@ -45,18 +50,20 @@ export default class SshKeyService {
     }
   }
 
-  private removePrivateKeyFile(alias: string): void {
+  private async removePrivateKeyFile(alias: string): Promise<void> {
     try {
       const filePath = path.join(this.sshPath, alias);
-      if (existsSync(filePath)) {
+      await rmPath(filePath);
-        fs.unlinkSync(filePath);
-      }
     } catch (error) {
       this.logger.error('删除私钥文件失败', error);
     }
   }
 
-  private generateSingleSshConfig(alias: string, host: string, proxy?: string) {
+  private async generateSingleSshConfig(
+    alias: string,
+    host: string,
+    proxy?: string,
+  ) {
     if (host === 'github.com') {
       host = `ssh.github.com\n    Port 443\n    HostkeyAlgorithms +ssh-rsa`;
     }
@@ -67,49 +74,51 @@ export default class SshKeyService {
       this.sshPath,
       alias,
     )}\n    StrictHostKeyChecking no\n${proxyStr}`;
-    fs.writeFileSync(`${path.join(this.sshPath, `${alias}.config`)}`, config, {
+    await fs.writeFile(
-      encoding: 'utf8',
+      `${path.join(this.sshPath, `${alias}.config`)}`,
-    });
+      config,
+      {
+        encoding: 'utf8',
+      },
+    );
   }
 
-  private removeSshConfig(alias: string) {
+  private async removeSshConfig(alias: string) {
     try {
       const filePath = path.join(this.sshPath, `${alias}.config`);
-      if (existsSync(filePath)) {
+      await rmPath(filePath);
-        fs.unlinkSync(filePath);
-      }
     } catch (error) {
       this.logger.error(`删除ssh配置文件${alias}失败`, error);
     }
   }
 
-  public addSSHKey(
+  public async addSSHKey(
     key: string,
     alias: string,
     host: string,
     proxy?: string,
-  ): void {
+  ): Promise<void> {
-    this.generatePrivateKeyFile(alias, key);
+    await this.generatePrivateKeyFile(alias, key);
-    this.generateSingleSshConfig(alias, host, proxy);
+    await this.generateSingleSshConfig(alias, host, proxy);
   }
 
-  public removeSSHKey(alias: string, host: string, proxy?: string): void {
+  public async removeSSHKey(alias: string, host: string, proxy?: string): Promise<void> {
-    this.removePrivateKeyFile(alias);
+    await this.removePrivateKeyFile(alias);
-    this.removeSshConfig(alias);
+    await this.removeSshConfig(alias);
   }
 
-  public setSshConfig(docs: Subscription[]) {
+  public async setSshConfig(docs: Subscription[]) {
     for (const doc of docs) {
       if (doc.type === 'private-repo' && doc.pull_type === 'ssh-key') {
         const { alias, proxy } = doc;
         const { host } = formatUrl(doc);
-        this.removePrivateKeyFile(alias);
+        await this.removePrivateKeyFile(alias);
-        this.removeSshConfig(alias);
+        await this.removeSshConfig(alias);
-        this.generatePrivateKeyFile(
+        await this.generatePrivateKeyFile(
           alias,
           (doc.pull_option as any).private_key,
         );
-        this.generateSingleSshConfig(alias, host, proxy);
+        await this.generateSingleSshConfig(alias, host, proxy);
       }
     }
   }

back/services/subscription.ts

@@ -7,7 +7,6 @@ import {
   SubscriptionStatus,
 } from '../data/subscription';
 import { ChildProcessWithoutNullStreams } from 'child_process';
-import fs from 'fs';
 import {
   getFileContentByName,
   concurrentRun,
@@ -16,9 +15,9 @@ import {
   killTask,
   handleLogPath,
   promiseExec,
-  emptyDir,
+  rmPath,
 } from '../config/util';
-import { promises, existsSync } from 'fs';
+import fs from 'fs/promises';
 import { FindOptions, Op } from 'sequelize';
 import path, { join } from 'path';
 import ScheduleService, { TaskCallbacks } from './schedule';
@@ -39,7 +38,7 @@ export default class SubscriptionService {
     private sockService: SockService,
     private sshKeyService: SshKeyService,
     private crontabService: CrontabService,
-  ) { }
+  ) {}
 
   public async list(searchText?: string): Promise<Subscription[]> {
     let query = {};
@@ -92,9 +91,9 @@ export default class SubscriptionService {
           this.taskCallbacks(doc),
           runImmediately,
         ));
-    } else {
+    } else if (doc.interval_schedule) {
       this.scheduleService.cancelIntervalTask(doc as any);
-      const { type, value } = doc.interval_schedule as any;
+      const { type, value } = doc.interval_schedule;
       needCreate &&
         (await this.scheduleService.createIntervalTask(
           doc as any,
@@ -107,7 +106,7 @@ export default class SubscriptionService {
 
   public async setSshConfig() {
     const docs = await SubscriptionModel.findAll();
-    this.sshKeyService.setSshConfig(docs);
+    await this.sshKeyService.setSshConfig(docs);
   }
 
   private taskCallbacks(doc: Subscription): TaskCallbacks {
@@ -131,7 +130,7 @@ export default class SubscriptionService {
         let beforeStr = '';
         try {
           if (doc.sub_before) {
-            fs.appendFileSync(absolutePath, `\n## 执行before命令...\n\n`);
+            await fs.appendFile(absolutePath, `\n## 执行before命令...\n\n`);
             beforeStr = await promiseExec(doc.sub_before);
           }
         } catch (error: any) {
@@ -139,7 +138,7 @@ export default class SubscriptionService {
             (error.stderr && error.stderr.toString()) || JSON.stringify(error);
         }
         if (beforeStr) {
-          fs.appendFileSync(absolutePath, `${beforeStr}\n`);
+          await fs.appendFile(absolutePath, `${beforeStr}\n`);
         }
       },
       onStart: async (cp: ChildProcessWithoutNullStreams, startTime) => {
@@ -158,7 +157,7 @@ export default class SubscriptionService {
         let afterStr = '';
         try {
           if (sub.sub_after) {
-            fs.appendFileSync(absolutePath, `\n\n## 执行after命令...\n\n`);
+            await fs.appendFile(absolutePath, `\n\n## 执行after命令...\n\n`);
             afterStr = await promiseExec(sub.sub_after);
           }
         } catch (error: any) {
@@ -166,10 +165,10 @@ export default class SubscriptionService {
             (error.stderr && error.stderr.toString()) || JSON.stringify(error);
         }
         if (afterStr) {
-          fs.appendFileSync(absolutePath, `${afterStr}\n`);
+          await fs.appendFile(absolutePath, `${afterStr}\n`);
         }
 
-        fs.appendFileSync(
+        await fs.appendFile(
           absolutePath,
           `\n## 执行结束... ${endTime.format(
             'YYYY-MM-DD HH:mm:ss',
@@ -190,12 +189,12 @@ export default class SubscriptionService {
       onError: async (message: string) => {
         const sub = await this.getDb({ id: doc.id });
         const absolutePath = await handleLogPath(sub.log_path as string);
-        fs.appendFileSync(absolutePath, `\n${message}`);
+        await fs.appendFile(absolutePath, `\n${message}`);
       },
       onLog: async (message: string) => {
         const sub = await this.getDb({ id: doc.id });
         const absolutePath = await handleLogPath(sub.log_path as string);
-        fs.appendFileSync(absolutePath, `\n${message}`);
+        await fs.appendFile(absolutePath, `\n${message}`);
       },
     };
   }
@@ -257,7 +256,7 @@ export default class SubscriptionService {
     );
   }
 
-  public async remove(ids: number[], query: any) {
+  public async remove(ids: number[], query: { force?: boolean }) {
     const docs = await SubscriptionModel.findAll({ where: { id: ids } });
     for (const doc of docs) {
       await this.handleTask(doc, false);
@@ -268,11 +267,11 @@ export default class SubscriptionService {
     if (query?.force === true) {
       const crons = await CrontabModel.findAll({ where: { sub_id: ids } });
       if (crons?.length) {
-        await this.crontabService.remove(crons.map(x => x.id!))
+        await this.crontabService.remove(crons.map((x) => x.id!));
       }
       for (const doc of docs) {
         const filePath = join(config.scriptPath, doc.alias);
-        emptyDir(filePath);
+        await rmPath(filePath);
       }
     }
   }
@@ -280,8 +279,11 @@ export default class SubscriptionService {
   public async getDb(
     query: FindOptions<Subscription>['where'],
   ): Promise<Subscription> {
-    const doc: any = await SubscriptionModel.findOne({ where: { ...query } });
+    const doc = await SubscriptionModel.findOne({ where: { ...query } });
-    return doc && (doc.get({ plain: true }) as Subscription);
+    if (!doc) {
+      throw new Error(`Subscription ${JSON.stringify(query)} not found`);
+    }
+    return doc.get({ plain: true });
   }
 
   public async run(ids: number[]) {
@@ -323,7 +325,7 @@ export default class SubscriptionService {
     this.scheduleService.runTask(command, this.taskCallbacks(subscription), {
       name: subscription.name,
       schedule: subscription.schedule,
-      command
+      command,
     });
   }
 
@@ -352,7 +354,7 @@ export default class SubscriptionService {
     }
 
     const absolutePath = await handleLogPath(doc.log_path as string);
-    return getFileContentByName(absolutePath);
+    return await getFileContentByName(absolutePath);
   }
 
   public async logs(id: number) {
@@ -364,15 +366,18 @@ export default class SubscriptionService {
     if (doc.log_path) {
       const relativeDir = path.dirname(`${doc.log_path}`);
       const dir = path.resolve(config.logPath, relativeDir);
-      if (existsSync(dir)) {
+      const _exist = await fileExist(dir);
-        let files = await promises.readdir(dir);
+      if (_exist) {
-        return files
+        let files = await fs.readdir(dir);
-          .map((x) => ({
+        return (
-            filename: x,
+          await Promise.all(
-            directory: relativeDir.replace(config.logPath, ''),
+            files.map(async (x) => ({
-            time: fs.statSync(`${dir}/${x}`).mtime.getTime(),
+              filename: x,
-          }))
+              directory: relativeDir.replace(config.logPath, ''),
-          .sort((a, b) => b.time - a.time);
+              time: (await fs.lstat(`${dir}/${x}`)).mtime.getTime(),
+            })),
+          )
+        ).sort((a, b) => b.time - a.time);
       }
     }
   }

back/services/system.ts

@@ -1,20 +1,13 @@
+import { spawn } from 'cross-spawn';
 import { Response } from 'express';
-import { Service, Inject } from 'typedi';
+import fs from 'fs';
+import got from 'got';
+import sum from 'lodash/sum';
+import path from 'path';
+import { Inject, Service } from 'typedi';
 import winston from 'winston';
 import config from '../config';
-import {
+import { TASK_COMMAND } from '../config/const';
-  AuthDataType,
-  AuthInfo,
-  AuthInstance,
-  AuthModel,
-  AuthModelInfo,
-} from '../data/auth';
-import { NotificationInfo } from '../data/notify';
-import NotificationService from './notify';
-import ScheduleService, { TaskCallbacks } from './schedule';
-import { spawn } from 'cross-spawn';
-import SockService from './sock';
-import got from 'got';
 import {
   getPid,
   killTask,
@@ -23,12 +16,23 @@ import {
   promiseExec,
   readDirs,
 } from '../config/util';
-import { TASK_COMMAND } from '../config/const';
+import {
+  DependenceModel,
+  DependenceStatus,
+  DependenceTypes,
+} from '../data/dependence';
+import { NotificationInfo } from '../data/notify';
+import {
+  AuthDataType,
+  SystemInfo,
+  SystemInstance,
+  SystemModel,
+  SystemModelInfo,
+} from '../data/system';
 import taskLimit from '../shared/pLimit';
-import tar from 'tar';
+import NotificationService from './notify';
-import path from 'path';
+import ScheduleService, { TaskCallbacks } from './schedule';
-import fs from 'fs';
+import SockService from './sock';
-import sum from 'lodash/sum';
 
 @Service()
 export default class SystemService {
@@ -39,22 +43,25 @@ export default class SystemService {
     @Inject('logger') private logger: winston.Logger,
     private scheduleService: ScheduleService,
     private sockService: SockService,
-  ) { }
+  ) {}
 
   public async getSystemConfig() {
     const doc = await this.getDb({ type: AuthDataType.systemConfig });
-    return doc || ({} as AuthInstance);
+    return doc;
   }
 
-  private async updateAuthDb(payload: AuthInfo): Promise<AuthInstance> {
+  private async updateAuthDb(payload: SystemInfo): Promise<SystemInfo> {
-    await AuthModel.upsert({ ...payload });
+    await SystemModel.upsert({ ...payload });
     const doc = await this.getDb({ type: payload.type });
     return doc;
   }
 
-  public async getDb(query: any): Promise<AuthInstance> {
+  public async getDb(query: any): Promise<SystemInfo> {
-    const doc: any = await AuthModel.findOne({ where: { ...query } });
+    const doc = await SystemModel.findOne({ where: { ...query } });
-    return doc && doc.get({ plain: true });
+    if (!doc) {
+      throw new Error(`System ${JSON.stringify(query)} not found`);
+    }
+    return doc.get({ plain: true });
   }
 
   public async updateNotificationMode(notificationInfo: NotificationInfo) {
@@ -75,32 +82,174 @@ export default class SystemService {
     }
   }
 
-  public async updateSystemConfig(info: AuthModelInfo) {
+  public async updateLogRemoveFrequency(info: SystemModelInfo) {
     const oDoc = await this.getSystemConfig();
     const result = await this.updateAuthDb({
       ...oDoc,
-      type: AuthDataType.systemConfig,
+      info: { ...oDoc.info, ...info },
-      info,
     });
-    if (info.logRemoveFrequency) {
+    const cron = {
-      const cron = {
+      id: result.id || NaN,
-        id: result.id || NaN,
+      name: '删除日志',
-        name: '删除日志',
+      command: `ql rmlog ${info.logRemoveFrequency}`,
-        command: `ql rmlog ${info.logRemoveFrequency}`,
+    };
-      };
+    if (oDoc.info?.logRemoveFrequency) {
       await this.scheduleService.cancelIntervalTask(cron);
-      if (info.logRemoveFrequency > 0) {
-        this.scheduleService.createIntervalTask(cron, {
-          days: info.logRemoveFrequency,
-        });
-      }
     }
+    if (info.logRemoveFrequency && info.logRemoveFrequency > 0) {
+      this.scheduleService.createIntervalTask(cron, {
+        days: info.logRemoveFrequency,
+      });
+    }
+    return { code: 200, data: info };
+  }
+
+  public async updateCronConcurrency(info: SystemModelInfo) {
+    const oDoc = await this.getSystemConfig();
+    await this.updateAuthDb({
+      ...oDoc,
+      info: { ...oDoc.info, ...info },
+    });
     if (info.cronConcurrency) {
       await taskLimit.setCustomLimit(info.cronConcurrency);
     }
     return { code: 200, data: info };
   }
 
+  public async updateDependenceProxy(info: SystemModelInfo) {
+    const oDoc = await this.getSystemConfig();
+    await this.updateAuthDb({
+      ...oDoc,
+      info: { ...oDoc.info, ...info },
+    });
+    if (info.dependenceProxy) {
+      await fs.promises.writeFile(
+        config.dependenceProxyFile,
+        `export http_proxy="${info.dependenceProxy}"\nexport https_proxy="${info.dependenceProxy}"`,
+      );
+    } else {
+      await fs.promises.rm(config.dependenceProxyFile);
+    }
+    return { code: 200, data: info };
+  }
+
+  public async updateNodeMirror(info: SystemModelInfo, res?: Response) {
+    const oDoc = await this.getSystemConfig();
+    await this.updateAuthDb({
+      ...oDoc,
+      info: { ...oDoc.info, ...info },
+    });
+    let cmd = 'pnpm config delete registry';
+    if (info.nodeMirror) {
+      cmd = `pnpm config set registry ${info.nodeMirror}`;
+    }
+    let command = `cd && ${cmd}`;
+    const docs = await DependenceModel.findAll({
+      where: {
+        type: DependenceTypes.nodejs,
+        status: DependenceStatus.installed,
+      },
+    });
+    if (docs.length > 0) {
+      command += ` && pnpm i -g`;
+    }
+    this.scheduleService.runTask(
+      command,
+      {
+        onStart: async (cp) => {
+          res?.setHeader('QL-Task-Pid', `${cp.pid}`);
+          res?.end();
+        },
+        onEnd: async () => {
+          this.sockService.sendMessage({
+            type: 'updateNodeMirror',
+            message: 'update node mirror end',
+          });
+        },
+        onError: async (message: string) => {
+          this.sockService.sendMessage({ type: 'updateNodeMirror', message });
+        },
+        onLog: async (message: string) => {
+          this.sockService.sendMessage({ type: 'updateNodeMirror', message });
+        },
+      },
+      {
+        command,
+      },
+    );
+  }
+
+  public async updatePythonMirror(info: SystemModelInfo) {
+    const oDoc = await this.getSystemConfig();
+    await this.updateAuthDb({
+      ...oDoc,
+      info: { ...oDoc.info, ...info },
+    });
+    let cmd = 'pip config unset global.index-url';
+    if (info.pythonMirror) {
+      cmd = `pip3 config set global.index-url ${info.pythonMirror}`;
+    }
+    await promiseExec(cmd);
+    return { code: 200, data: info };
+  }
+
+  public async updateLinuxMirror(
+    info: SystemModelInfo,
+    res?: Response,
+    onEnd?: () => void,
+  ) {
+    const oDoc = await this.getSystemConfig();
+    await this.updateAuthDb({
+      ...oDoc,
+      info: { ...oDoc.info, ...info },
+    });
+    let defaultDomain = 'https://dl-cdn.alpinelinux.org';
+    let targetDomain = 'https://dl-cdn.alpinelinux.org';
+    const content = await fs.promises.readFile('/etc/apk/repositories', {
+      encoding: 'utf-8',
+    });
+    const domainMatch = content.match(/(http.*)\/alpine\/.*/);
+    if (domainMatch) {
+      defaultDomain = domainMatch[1];
+    }
+    if (info.linuxMirror) {
+      targetDomain = info.linuxMirror;
+    }
+    const command = `sed -i 's/${defaultDomain.replace(
+      /\//g,
+      '\\/',
+    )}/${targetDomain.replace(
+      /\//g,
+      '\\/',
+    )}/g' /etc/apk/repositories && apk update -f`;
+
+    this.scheduleService.runTask(
+      command,
+      {
+        onStart: async (cp) => {
+          res?.setHeader('QL-Task-Pid', `${cp.pid}`);
+          res?.end();
+        },
+        onEnd: async () => {
+          this.sockService.sendMessage({
+            type: 'updateLinuxMirror',
+            message: 'update linux mirror end',
+          });
+          onEnd?.();
+        },
+        onError: async (message: string) => {
+          this.sockService.sendMessage({ type: 'updateLinuxMirror', message });
+        },
+        onLog: async (message: string) => {
+          this.sockService.sendMessage({ type: 'updateLinuxMirror', message });
+        },
+      },
+      {
+        command,
+      },
+    );
+  }
+
   public async checkUpdate() {
     try {
       const currentVersionContent = await parseVersion(config.versionFile);
@@ -114,7 +263,7 @@ export default class SystemService {
           },
         );
         lastVersionContent = await parseContentVersion(result.body);
-      } catch (error) { }
+      } catch (error) {}
 
       if (!lastVersionContent) {
         lastVersionContent = currentVersionContent;
@@ -160,7 +309,7 @@ export default class SystemService {
   }
 
   public async updateSystem() {
-    const cp = spawn('ql -l update false', { shell: '/bin/bash' });
+    const cp = spawn('real_time=true ql update false', { shell: '/bin/bash' });
 
     cp.stdout.on('data', (data) => {
       this.sockService.sendMessage({
@@ -186,30 +335,10 @@ export default class SystemService {
     return { code: 200 };
   }
 
-  public async reloadSystem(target: 'system' | 'data') {
+  public async reloadSystem(target?: 'system' | 'data') {
-    const cp = spawn(`ql -l reload ${target || ''}`, { shell: '/bin/bash' });
+    const cmd = `real_time=true ql reload ${target || ''}`;
-
+    const cp = spawn(cmd, { shell: '/bin/bash' });
-    cp.stdout.on('data', (data) => {
+    cp.unref();
-      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),
-      });
-    });
-
     return { code: 200 };
   }
 
@@ -222,20 +351,13 @@ export default class SystemService {
     }
   }
 
-  public async run(
+  public async run({ command }: { command: string }, callback: TaskCallbacks) {
-    { command, logPath }: { command: string; logPath: string },
-    callback: TaskCallbacks,
-  ) {
     if (!command.startsWith(TASK_COMMAND)) {
       command = `${TASK_COMMAND} ${command}`;
     }
-    this.scheduleService.runTask(
+    this.scheduleService.runTask(`real_time=true ${command}`, callback, {
-      `real_log_path=${logPath} real_time=true ${command}`,
+      command,
-      callback,
+    });
-      {
-        command,
-      }
-    );
   }
 
   public async stop({ command, pid }: { command: string; pid: number }) {
@@ -262,9 +384,8 @@ export default class SystemService {
 
   public async exportData(res: Response) {
     try {
-      await tar.create(
+      await promiseExec(
-        { gzip: true, file: config.dataTgzFile, cwd: config.rootPath },
+        `cd ${config.rootPath} && tar -zcvf ${config.dataTgzFile} data/`,
-        ['data'],
       );
       res.download(config.dataTgzFile);
     } catch (error: any) {
@@ -275,15 +396,17 @@ export default class SystemService {
   public async importData() {
     try {
       await promiseExec(`rm -rf ${path.join(config.tmpPath, 'data')}`);
-      await tar.x({ file: config.dataTgzFile, cwd: config.tmpPath });
+      const res = await promiseExec(
-      return { code: 200 };
+        `cd ${config.tmpPath} && tar -zxvf data.tgz`,
+      );
+      return { code: 200, data: res };
     } catch (error: any) {
       return { code: 400, message: error.message };
     }
   }
 
   public async getSystemLog(res: Response) {
-    const result = readDirs(config.systemLogPath, config.systemLogPath);
+    const result = await readDirs(config.systemLogPath, config.systemLogPath);
     const logs = result.reverse().filter((x) => x.title.endsWith('.log'));
     res.set({
       'Content-Length': sum(logs.map((x) => x.size)),

back/services/user.ts

@@ -1,6 +1,7 @@
 import { Service, Inject } from 'typedi';
 import winston from 'winston';
 import {
+  createFile,
   createRandomString,
   fileExist,
   getNetIp,
@@ -8,22 +9,25 @@ import {
   safeJSONParse,
 } from '../config/util';
 import config from '../config';
-import * as fs from 'fs';
+import * as fs from 'fs/promises';
 import jwt from 'jsonwebtoken';
 import { authenticator } from '@otplib/preset-default';
 import {
   AuthDataType,
-  AuthInfo,
+  SystemInfo,
-  AuthModel,
+  SystemModel,
-  AuthModelInfo,
+  SystemModelInfo,
   LoginStatus,
-} from '../data/auth';
+} from '../data/system';
 import { NotificationInfo } from '../data/notify';
 import NotificationService from './notify';
 import { Request } from 'express';
 import ScheduleService from './schedule';
 import SockService from './sock';
 import dayjs from 'dayjs';
+import IP2Region from 'ip2region';
+import requestIp from 'request-ip';
+import uniq from 'lodash/uniq';
 
 @Service()
 export default class UserService {
@@ -44,12 +48,13 @@ export default class UserService {
     req: Request,
     needTwoFactor = true,
   ): Promise<any> {
-    if (!fs.existsSync(config.authConfigFile)) {
+    const _exist = await fileExist(config.authConfigFile);
+    if (!_exist) {
       return this.initAuthInfo();
     }
 
     let { username, password } = payloads;
-    const content = this.getAuthInfo();
+    const content = await this.getAuthInfo();
     const timestamp = Date.now();
     if (content) {
       let {
@@ -102,7 +107,16 @@ export default class UserService {
         };
       }
 
-      const { ip, address } = await getNetIp(req);
+      const ip = requestIp.getClientIp(req) || '';
+      const query = new IP2Region();
+      const ipAddress = query.search(ip);
+      let address = '';
+      if (ipAddress) {
+        const { country, province, city, isp } = ipAddress;
+        address = uniq([country, province, city, isp])
+          .filter(Boolean)
+          .join(' ');
+      }
       if (username === cUsername && password === cPassword) {
         const data = createRandomString(50, 100);
         const expiration = twoFactorActivated ? 60 : 20;
@@ -124,13 +138,12 @@ export default class UserService {
           platform: req.platform,
           isTwoFactorChecking: false,
         });
-        await this.notificationService.notify(
+        this.notificationService.notify(
           '登录通知',
           `你于${dayjs(timestamp).format('YYYY-MM-DD HH:mm:ss')}在 ${address} ${
             req.platform
           }端 登录成功，ip地址 ${ip}`,
         );
-        await this.getLoginLog();
         await this.insertDb({
           type: AuthDataType.loginLog,
           info: {
@@ -153,13 +166,12 @@ export default class UserService {
           lastaddr: address,
           platform: req.platform,
         });
-        await this.notificationService.notify(
+        this.notificationService.notify(
           '登录通知',
           `你于${dayjs(timestamp).format('YYYY-MM-DD HH:mm:ss')}在 ${address} ${
             req.platform
           }端 登录失败，ip地址 ${ip}`,
         );
-        await this.getLoginLog();
         await this.insertDb({
           type: AuthDataType.loginLog,
           info: {
@@ -187,15 +199,15 @@ export default class UserService {
   }
 
   public async logout(platform: string): Promise<any> {
-    const authInfo = this.getAuthInfo();
+    const authInfo = await this.getAuthInfo();
     this.updateAuthInfo(authInfo, {
       token: '',
       tokens: { ...authInfo.tokens, [platform]: '' },
     });
   }
 
-  public async getLoginLog(): Promise<Array<AuthModelInfo | undefined>> {
+  public async getLoginLog(): Promise<Array<SystemModelInfo | undefined>> {
-    const docs = await AuthModel.findAll({
+    const docs = await SystemModel.findAll({
       where: { type: AuthDataType.loginLog },
     });
     if (docs && docs.length > 0) {
@@ -203,7 +215,7 @@ export default class UserService {
         (a, b) => b.info!.timestamp! - a.info!.timestamp!,
       );
       if (result.length > 100) {
-        await AuthModel.destroy({
+        await SystemModel.destroy({
           where: { id: result[result.length - 1].id },
         });
       }
@@ -212,13 +224,13 @@ export default class UserService {
     return [];
   }
 
-  private async insertDb(payload: AuthInfo): Promise<AuthInfo> {
+  private async insertDb(payload: SystemInfo): Promise<SystemInfo> {
-    const doc = await AuthModel.create({ ...payload }, { returning: true });
+    const doc = await SystemModel.create({ ...payload }, { returning: true });
     return doc;
   }
 
-  private initAuthInfo() {
+  private async initAuthInfo() {
-    fs.writeFileSync(
+    await fs.writeFile(
       config.authConfigFile,
       JSON.stringify({
         username: 'admin',
@@ -241,13 +253,13 @@ export default class UserService {
     if (password === 'admin') {
       return { code: 400, message: '密码不能设置为admin' };
     }
-    const authInfo = this.getAuthInfo();
+    const authInfo = await this.getAuthInfo();
     this.updateAuthInfo(authInfo, { username, password });
     return { code: 200, message: '更新成功' };
   }
 
   public async updateAvatar(avatar: string) {
-    const authInfo = this.getAuthInfo();
+    const authInfo = await this.getAuthInfo();
     this.updateAuthInfo(authInfo, { avatar });
     return { code: 200, data: avatar, message: '更新成功' };
   }
@@ -255,7 +267,7 @@ export default class UserService {
   public async getUserInfo(): Promise<any> {
     const authFileExist = await fileExist(config.authConfigFile);
     if (!authFileExist) {
-      fs.writeFileSync(
+      await createFile(
         config.authConfigFile,
         JSON.stringify({
           username: 'admin',
@@ -263,19 +275,19 @@ export default class UserService {
         }),
       );
     }
-    return this.getAuthInfo();
+    return await this.getAuthInfo();
   }
 
-  public initTwoFactor() {
+  public async initTwoFactor() {
     const secret = authenticator.generateSecret();
-    const authInfo = this.getAuthInfo();
+    const authInfo = await this.getAuthInfo();
     const otpauth = authenticator.keyuri(authInfo.username, 'qinglong', secret);
     this.updateAuthInfo(authInfo, { twoFactorSecret: secret });
     return { secret, url: otpauth };
   }
 
-  public activeTwoFactor(code: string) {
+  public async activeTwoFactor(code: string) {
-    const authInfo = this.getAuthInfo();
+    const authInfo = await this.getAuthInfo();
     const isValid = authenticator.verify({
       token: code,
       secret: authInfo.twoFactorSecret,
@@ -294,7 +306,7 @@ export default class UserService {
     }: { username: string; password: string; code: string },
     req: any,
   ) {
-    const authInfo = this.getAuthInfo();
+    const authInfo = await this.getAuthInfo();
     const { isTwoFactorChecking, twoFactorSecret } = authInfo;
     if (!isTwoFactorChecking) {
       return { code: 450, message: '未知错误' };
@@ -316,8 +328,8 @@ export default class UserService {
     }
   }
 
-  public deactiveTwoFactor() {
+  public async deactiveTwoFactor() {
-    const authInfo = this.getAuthInfo();
+    const authInfo = await this.getAuthInfo();
     this.updateAuthInfo(authInfo, {
       twoFactorActivated: false,
       twoFactorActived: false,
@@ -326,13 +338,13 @@ export default class UserService {
     return true;
   }
 
-  private getAuthInfo() {
+  private async getAuthInfo() {
-    const content = fs.readFileSync(config.authConfigFile, 'utf8');
+    const content = await fs.readFile(config.authConfigFile, 'utf8');
     return safeJSONParse(content);
   }
 
-  private updateAuthInfo(authInfo: any, info: any) {
+  private async updateAuthInfo(authInfo: any, info: any) {
-    fs.writeFileSync(
+    await fs.writeFile(
       config.authConfigFile,
       JSON.stringify({ ...authInfo, ...info }),
     );
@@ -340,26 +352,29 @@ export default class UserService {
 
   public async getNotificationMode(): Promise<NotificationInfo> {
     const doc = await this.getDb({ type: AuthDataType.notification });
-    return (doc && doc.info) || {};
+    return (doc.info || {}) as NotificationInfo;
   }
 
-  private async updateAuthDb(payload: AuthInfo): Promise<any> {
+  private async updateAuthDb(payload: SystemInfo): Promise<any> {
-    let doc = await AuthModel.findOne({ type: payload.type });
+    let doc = await SystemModel.findOne({ type: payload.type });
     if (doc) {
-      const updateResult = await AuthModel.update(payload, {
+      const updateResult = await SystemModel.update(payload, {
         where: { id: doc.id },
         returning: true,
       });
       doc = updateResult[1][0];
     } else {
-      doc = await AuthModel.create(payload, { returning: true });
+      doc = await SystemModel.create(payload, { returning: true });
     }
     return doc;
   }
 
-  public async getDb(query: any): Promise<any> {
+  public async getDb(query: any): Promise<SystemInfo> {
-    const doc: any = await AuthModel.findOne({ where: { ...query } });
+    const doc = await SystemModel.findOne({ where: { ...query } });
-    return doc && (doc.get({ plain: true }) as any);
+    if (!doc) {
+      throw new Error(`${JSON.stringify(query)} not found`);
+    }
+    return doc.get({ plain: true });
   }
 
   public async updateNotificationMode(notificationInfo: NotificationInfo) {

back/shared/pLimit.ts

@@ -1,12 +1,23 @@
 import PQueue, { QueueAddOptions } from 'p-queue-cjs';
 import os from 'os';
-import { AuthDataType, AuthModel } from '../data/auth';
+import { AuthDataType, SystemModel } from '../data/system';
 import Logger from '../loaders/logger';
+import { Dependence } from '../data/dependence';
 
+interface IDependencyFn<T> {
+  (): Promise<T>;
+  dependency?: Dependence;
+}
 class TaskLimit {
-  private oneLimit = new PQueue({ concurrency: 1 });
+  private dependenyLimit = new PQueue({ concurrency: 1 });
+  private queuedDependencyIds = new Set<number>([]);
   private updateLogLimit = new PQueue({ concurrency: 1 });
-  private cronLimit = new PQueue({ concurrency: Math.max(os.cpus().length, 4) });
+  private cronLimit = new PQueue({
+    concurrency: Math.max(os.cpus().length, 4),
+  });
+  private manualCronoLimit = new PQueue({
+    concurrency: Math.max(os.cpus().length, 4),
+  });
 
   get cronLimitActiveCount() {
     return this.cronLimit.pending;
@@ -16,6 +27,10 @@ class TaskLimit {
     return this.cronLimit.size;
   }
 
+  get firstDependencyId() {
+    return [...this.queuedDependencyIds.values()][0];
+  }
+
   constructor() {
     this.setCustomLimit();
     this.handleEvents();
@@ -26,21 +41,19 @@ class TaskLimit {
       Logger.info(
         `[schedule][任务加入队列] 运行中任务数: ${this.cronLimitActiveCount}, 等待中任务数: ${this.cronLimitPendingCount}`,
       );
-    })
+    });
     this.cronLimit.on('active', () => {
       Logger.info(
-        `[schedule][开始处理任务] 运行中任务数: ${this.cronLimitActiveCount + 1}, 等待中任务数: ${this.cronLimitPendingCount}`,
+        `[schedule][开始处理任务] 运行中任务数: ${
-      );
+          this.cronLimitActiveCount + 1
-    })
+        }, 等待中任务数: ${this.cronLimitPendingCount}`,
-    this.cronLimit.on('completed', (param) => {
-      Logger.info(
-        `[schedule][任务处理成功] 参数 ${JSON.stringify(param)}`,
       );
     });
-    this.cronLimit.on('error', error => {
+    this.cronLimit.on('completed', (param) => {
-      Logger.error(
+      Logger.info(`[schedule][任务处理成功] 参数 ${JSON.stringify(param)}`);
-        `[schedule][任务处理错误] 参数 ${JSON.stringify(error)}`,
+    });
-      );
+    this.cronLimit.on('error', (error) => {
+      Logger.error(`[schedule][任务处理错误] 参数 ${JSON.stringify(error)}`);
     });
     this.cronLimit.on('next', () => {
       Logger.info(
@@ -48,35 +61,60 @@ class TaskLimit {
       );
     });
     this.cronLimit.on('idle', () => {
-      Logger.info(
+      Logger.info(`[schedule][任务队列] 空闲中...`);
-        `[schedule][任务队列] 空闲中...`,
-      );
     });
   }
 
+  public removeQueuedDependency(dependency: Dependence) {
+    if (this.queuedDependencyIds.has(dependency.id!)) {
+      this.queuedDependencyIds.delete(dependency.id!);
+    }
+  }
+
   public async setCustomLimit(limit?: number) {
     if (limit) {
       this.cronLimit.concurrency = limit;
+      this.manualCronoLimit.concurrency = limit;
       return;
     }
-    await AuthModel.sync();
+    await SystemModel.sync();
-    const doc = await AuthModel.findOne({
+    const doc = await SystemModel.findOne({
       where: { type: AuthDataType.systemConfig },
     });
     if (doc?.info?.cronConcurrency) {
       this.cronLimit.concurrency = doc.info.cronConcurrency;
+      this.manualCronoLimit.concurrency = doc.info.cronConcurrency;
     }
   }
 
-  public async runWithCronLimit<T>(fn: () => Promise<T>, options?: Partial<QueueAddOptions>): Promise<T | void> {
+  public async runWithCronLimit<T>(
+    fn: () => Promise<T>,
+    options?: Partial<QueueAddOptions>,
+  ): Promise<T | void> {
     return this.cronLimit.add(fn, options);
   }
 
-  public runOneByOne<T>(fn: () => Promise<T>, options?: Partial<QueueAddOptions>): Promise<T | void> {
+  public async manualRunWithCronLimit<T>(
-    return this.oneLimit.add(fn, options);
+    fn: () => Promise<T>,
+    options?: Partial<QueueAddOptions>,
+  ): Promise<T | void> {
+    return this.manualCronoLimit.add(fn, options);
   }
 
-  public updateDepLog<T>(fn: () => Promise<T>, options?: Partial<QueueAddOptions>): Promise<T | void> {
+  public runDependeny<T>(
+    dependency: Dependence,
+    fn: IDependencyFn<T>,
+    options?: Partial<QueueAddOptions>,
+  ): Promise<T | void> {
+    this.queuedDependencyIds.add(dependency.id!);
+    fn.dependency = dependency;
+    return this.dependenyLimit.add(fn, options);
+  }
+
+  public updateDepLog<T>(
+    fn: () => Promise<T>,
+    options?: Partial<QueueAddOptions>,
+  ): Promise<T | void> {
     return this.updateLogLimit.add(fn, options);
   }
 }

back/update.ts

@@ -0,0 +1,27 @@
+import 'reflect-metadata'; // We need this in order to use @Decorators
+import config from './config';
+import express from 'express';
+import depInjectorLoader from './loaders/depInjector';
+import Logger from './loaders/logger';
+
+
+async function startServer() {
+  const app = express();
+  depInjectorLoader();
+
+  await require('./loaders/update').default({ app });
+
+  app
+    .listen(config.updatePort, '0.0.0.0', () => {
+      Logger.debug(`✌️ 更新服务启动成功！`);
+      console.debug(`✌️ 更新服务启动成功！`);
+      process.send?.('ready');
+    })
+    .on('error', (err) => {
+      Logger.error(err);
+      console.error(err);
+      process.exit(1);
+    });
+}
+
+startServer();

cli/api.mjs

@@ -0,0 +1,274 @@
+#!/usr/bin/env zx
+import path from 'path';
+
+const dir_root = process.env.QL_DIR;
+const file_auth_token = path.join(dir_root, 'static/auth.json');
+const token_file = path.join(dir_root, 'static/build/token.js');
+
+let token;
+
+const createToken = async () => {
+  let tokenCommand = `tsx ${dir_root}/back/token.ts`;
+  if (await fs.exists(token_file)) {
+    tokenCommand = `node ${token_file}`;
+  }
+  token = (await $([tokenCommand])).stdout.trim();
+};
+
+const getToken = async () => {
+  if (fs.existsSync(file_auth_token)) {
+    const authTokenData = JSON.parse(fs.readFileSync(file_auth_token, 'utf8'));
+    token = authTokenData.value;
+    const expiration = authTokenData.expiration;
+    const currentTimeStamp = Math.floor(Date.now() / 1000);
+    if (currentTimeStamp >= expiration) {
+      await createToken();
+    }
+  } else {
+    await createToken();
+  }
+};
+
+export const addCronApi = async (schedule, command, name, subId = null) => {
+  const currentTimeStamp = Math.floor(Date.now() / 1000);
+  const data = {
+    name,
+    command,
+    schedule,
+    sub_id: subId,
+  };
+
+  try {
+    const response = await fetch(
+      `http://0.0.0.0:5600/open/crons?t=${currentTimeStamp}`,
+      {
+        method: 'POST',
+        headers: {
+          Accept: 'application/json',
+          Authorization: `Bearer ${token}`,
+          'User-Agent': 'Mozilla/5.0',
+          'Content-Type': 'application/json;charset=UTF-8',
+        },
+        body: JSON.stringify(data),
+      },
+    );
+
+    const responseData = await response.json();
+    const { code, message } = responseData;
+    if (code === 200) {
+      console.log(`${name} -> 添加成功`);
+    } else {
+      console.log(`${name} -> 添加失败(${message})`);
+    }
+  } catch (error) {
+    console.error(`${name} -> 添加失败(${error.message})`);
+  }
+};
+
+export const updateCronApi = async (schedule, command, name, id) => {
+  const currentTimeStamp = Math.floor(Date.now() / 1000);
+  const data = {
+    name,
+    command,
+    schedule,
+    id,
+  };
+
+  try {
+    const response = await fetch(
+      `http://0.0.0.0:5600/open/crons?t=${currentTimeStamp}`,
+      {
+        method: 'PUT',
+        headers: {
+          Accept: 'application/json',
+          Authorization: `Bearer ${token}`,
+          'User-Agent': 'Mozilla/5.0',
+          'Content-Type': 'application/json;charset=UTF-8',
+        },
+        body: JSON.stringify(data),
+      },
+    );
+
+    const responseData = await response.json();
+    const { code, message } = responseData;
+    if (code === 200) {
+      console.log(`${name} -> 更新成功`);
+    } else {
+      console.log(`${name} -> 更新失败(${message})`);
+    }
+  } catch (error) {
+    console.error(`${name} -> 更新失败(${error.message})`);
+  }
+};
+
+export const updateCronCommandApi = async (command, id) => {
+  const currentTimeStamp = Math.floor(Date.now() / 1000);
+  const data = {
+    command,
+    id,
+  };
+
+  try {
+    const response = await fetch(
+      `http://0.0.0.0:5600/open/crons?t=${currentTimeStamp}`,
+      {
+        method: 'PUT',
+        headers: {
+          Accept: 'application/json',
+          Authorization: `Bearer ${token}`,
+          'User-Agent': 'Mozilla/5.0',
+          'Content-Type': 'application/json;charset=UTF-8',
+        },
+        body: JSON.stringify(data),
+      },
+    );
+
+    const responseData = await response.json();
+    const { code, message } = responseData;
+    if (code === 200) {
+      console.log(`${command} -> 更新成功`);
+    } else {
+      console.log(`${command} -> 更新失败(${message})`);
+    }
+  } catch (error) {
+    console.error(`${command} -> 更新失败(${error.message})`);
+  }
+};
+
+export const delCronApi = async (ids) => {
+  const currentTimeStamp = Math.floor(Date.now() / 1000);
+
+  try {
+    const response = await fetch(
+      `http://0.0.0.0:5600/open/crons?t=${currentTimeStamp}`,
+      {
+        method: 'DELETE',
+        headers: {
+          Accept: 'application/json',
+          Authorization: `Bearer ${token}`,
+          'User-Agent': 'Mozilla/5.0',
+          'Content-Type': 'application/json;charset=UTF-8',
+        },
+        body: JSON.stringify(ids),
+      },
+    );
+
+    const responseData = await response.json();
+    const { code, message } = responseData;
+    if (code === 200) {
+      console.log('成功');
+    } else {
+      console.log(`失败(${message})`);
+    }
+  } catch (error) {
+    console.error(`删除失败(${error.message})`);
+  }
+};
+
+export const updateCron = async (
+  ids,
+  status,
+  pid,
+  logPath,
+  lastExecutingTime = 0,
+  runningTime = 0,
+) => {
+  const currentTimeStamp = Math.floor(Date.now() / 1000);
+  const data = {
+    ids,
+    status,
+    pid,
+    log_path: logPath,
+    last_execution_time: lastExecutingTime,
+    last_running_time: runningTime,
+  };
+
+  try {
+    const response = await fetch(
+      `http://0.0.0.0:5600/open/crons/status?t=${currentTimeStamp}`,
+      {
+        method: 'PUT',
+        headers: {
+          Accept: 'application/json',
+          Authorization: `Bearer ${token}`,
+          'User-Agent': 'Mozilla/5.0',
+          'Content-Type': 'application/json;charset=UTF-8',
+        },
+        body: JSON.stringify(data),
+      },
+    );
+
+    const responseData = await response.json();
+    const { code, message } = responseData;
+    if (code !== 200) {
+      console.log(`更新任务状态失败(${message})`);
+    }
+  } catch (error) {
+    console.error(`更新任务状态失败(${error.message})`);
+  }
+};
+
+export const notifyApi = async (title, content) => {
+  const currentTimeStamp = Math.floor(Date.now() / 1000);
+  const data = {
+    title,
+    content,
+  };
+
+  try {
+    const response = await fetch(
+      `http://0.0.0.0:5600/open/system/notify?t=${currentTimeStamp}`,
+      {
+        method: 'PUT',
+        headers: {
+          Accept: 'application/json',
+          Authorization: `Bearer ${token}`,
+          'User-Agent': 'Mozilla/5.0',
+          'Content-Type': 'application/json;charset=UTF-8',
+        },
+        body: JSON.stringify(data),
+      },
+    );
+
+    const responseData = await response.json();
+    const { code, message } = responseData;
+    if (code === 200) {
+      console.log('通知发送成功🎉');
+    } else {
+      console.log(`通知失败(${message})`);
+    }
+  } catch (error) {
+    console.error(`通知失败(${error.message})`);
+  }
+};
+
+export const findCronApi = async (params) => {
+  const currentTimeStamp = Math.floor(Date.now() / 1000);
+
+  try {
+    const response = await fetch(
+      `http://0.0.0.0:5600/open/crons/detail?${params}&t=${currentTimeStamp}`,
+      {
+        headers: {
+          Accept: 'application/json',
+          Authorization: `Bearer ${token}`,
+          'User-Agent': 'Mozilla/5.0',
+          'Content-Type': 'application/json;charset=UTF-8',
+        },
+      },
+    );
+
+    const responseData = await response.json();
+    const { data } = responseData;
+    if (data === 'null') {
+      console.log('');
+    } else {
+      const { name } = data;
+      console.log(name);
+    }
+  } catch (error) {
+    console.error(`查找失败(${error.message})`);
+  }
+};
+
+await getToken();

cli/commands/update.ts

@@ -1,13 +0,0 @@
-import { CommandModule } from 'yargs';
-export const updateCommand: CommandModule = {
-  command: 'update',
-  describe: 'Update and restart qinglong',
-  builder: (yargs) => {
-    return yargs.option('repositority', {
-      type: 'string',
-      alias: 'r',
-      describe: `Specify the release warehouse address of the package`,
-    });
-  },
-  handler: async (argv) => {},
-};

cli/env.mjs

@@ -0,0 +1,22 @@
+#!/usr/bin/env zx
+
+import 'zx/globals';
+let initialVars = [];
+
+export const storeEnvVars = async () => {
+  const stdout = (await $`env`).lines();
+  initialVars = stdout.map((line) => line.split('=')[0]);
+};
+
+export const restoreEnvVars = async () => {
+  const stdout = (await $`env`).lines();
+  const currentVars = stdout.map((line) => line.split('=')[0]);
+
+  for (const key of currentVars) {
+    if (!initialVars.includes(key)) {
+      await $`unset ${key}`;
+    }
+  }
+};
+
+await storeEnvVars();

cli/index.ts

@@ -1,13 +0,0 @@
-import * as yargs from 'yargs';
-import { green, red } from 'chalk';
-import { updateCommand } from './commands/update';
-
-yargs
-  .usage('Usage: ql [command] <options>')
-  .command(updateCommand)
-  .fail((err) => {
-    console.error(`${red(err)}`);
-  })
-  .alias('h', 'help')
-  .showHelp()
-  .recommendCommands().argv;

cli/otask.mjs

@@ -0,0 +1,302 @@
+#!/usr/bin/env zx
+
+import {
+  dirScripts,
+  dirLog,
+  handleTaskStart,
+  runTaskBefore,
+  runTaskAfter,
+  handleTaskEnd,
+  globalState,
+  formatLogTime,
+} from './share.mjs';
+import { basename, dirname } from 'path';
+
+function defineProgram(fileParam) {
+  if (fileParam.endsWith('.js') || fileParam.endsWith('.mjs')) {
+    return 'node';
+  } else if (fileParam.endsWith('.py') || fileParam.endsWith('.pyc')) {
+    return 'python3';
+  } else if (fileParam.endsWith('.sh')) {
+    return 'bash';
+  } else if (fileParam.endsWith('.ts')) {
+    return $`command -v tsx`
+      .then(() => 'tsx')
+      .catch(() => 'ts-node-transpile-only');
+  } else {
+    return '';
+  }
+}
+
+async function randomDelay(fileParam) {
+  const randomDelayMax = process.env.RandomDelay;
+  if (randomDelayMax && randomDelayMax > 0) {
+    const fileExtensions = process.env.RandomDelayFileExtensions || 'js';
+    const ignoredMinutes = process.env.RandomDelayIgnoredMinutes || '0 30';
+    const currentMin = new Date().getMinutes();
+
+    if (
+      fileExtensions.split(' ').some((ext) => fileParam.endsWith(`.${ext}`))
+    ) {
+      if (
+        ignoredMinutes.split(' ').some((min) => parseInt(min) === currentMin)
+      ) {
+        return;
+      }
+      const delaySecond = Math.floor(Math.random() * randomDelayMax) + 1;
+      console.log(
+        `任务随机延迟 ${delaySecond} 秒，配置文件参数 RandomDelay 置空可取消延迟`,
+      );
+      await sleep(delaySecond * 1000);
+    }
+  }
+}
+
+async function genArrayScripts() {
+  const arrayScripts = [];
+  const arrayScriptsName = [];
+  const files = await fs.readdir(dirScripts);
+
+  for (const file of files) {
+    if (file.endsWith('.js') && file !== 'sendNotify.js') {
+      arrayScripts.push(file);
+      const content = await fs.readFile(`${dirScripts}/${file}`, 'utf8');
+      const match = content.match(/new Env\(['"]([^'"]+)['"]\)/);
+      arrayScriptsName.push(match ? match[1] : '<未识别出活动名称>');
+    }
+  }
+
+  return { arrayScripts, arrayScriptsName };
+}
+
+async function usage() {
+  const { arrayScripts, arrayScriptsName } = await genArrayScripts();
+  console.log(
+    `task命令运行本程序自动添加进crontab的脚本，需要输入脚本的绝对路径或去掉 “${dirScripts}/” 目录后的相对路径（定时任务中请写作相对路径），用法为：`,
+  );
+  console.log(
+    `1.$cmdTask <fileName>                                             # 依次执行，如果设置了随机延迟，将随机延迟一定秒数`,
+  );
+  console.log(
+    `2.$cmdTask <fileName> now                                         # 依次执行，无论是否设置了随机延迟，均立即运行，前台会输出日志，同时记录在日志文件中`,
+  );
+  console.log(
+    `3.$cmdTask <fileName> conc <环境变量名称> <账号编号，空格分隔>(可选的)  # 并发执行，无论是否设置了随机延迟，均立即运行，前台不产生日志，直接记录在日志文件中，且可指定账号执行`,
+  );
+  console.log(
+    `4.$cmdTask <fileName> desi <环境变量名称> <账号编号，空格分隔>         # 指定账号执行，无论是否设置了随机延迟，均立即运行`,
+  );
+  if (arrayScripts.length > 0) {
+    console.log(`\n当前有以下脚本可以运行:`);
+    arrayScripts.forEach((script, i) =>
+      console.log(`${i + 1}. ${arrayScriptsName[i]}：${script}`),
+    );
+  } else {
+    console.log(`\n暂无脚本可以执行`);
+  }
+}
+
+export function parseDuration(d) {
+  if (typeof d == 'number') {
+    if (isNaN(d) || d < 0) throw new Error(`Invalid duration: "${d}".`);
+    return d;
+  } else if (/\d+s/.test(d)) {
+    return +d.slice(0, -1) * 1000;
+  } else if (/\d+ms/.test(d)) {
+    return +d.slice(0, -2);
+  } else if (/\d+m/.test(d)) {
+    return +d.slice(0, -1) * 1000 * 60;
+  } else if (/\d+h/.test(d)) {
+    return +d.slice(0, -1) * 1000 * 60 * 60;
+  } else if (/\d+d/.test(d)) {
+    return +d.slice(0, -1) * 1000 * 60 * 60 * 24;
+  }
+  throw new Error(`Unknown duration: "${d}".`);
+}
+
+async function runWithTimeout(command) {
+  if (globalState.commandTimeoutTime) {
+    const timeoutNumber = parseDuration(globalState.commandTimeoutTime);
+    await $([command]).timeout(timeoutNumber).nothrow().pipe(process.stdout);
+  } else {
+    await $([command]).nothrow().pipe(process.stdout);
+  }
+}
+
+async function runNormal(fileParam, scriptParams) {
+  if (
+    !scriptParams.includes('now') &&
+    process.env.realTime !== 'true' &&
+    process.env.noDelay !== 'true'
+  ) {
+    await randomDelay(fileParam);
+  }
+  cd(dirScripts);
+  const relativePath = dirname(fileParam);
+  if (!fileParam.startsWith('/') && relativePath) {
+    cd(relativePath);
+    fileParam = fileParam.replace(`${relativePath}/`, '');
+  }
+  await runWithTimeout(
+    `${globalState.whichProgram} ${fileParam} ${scriptParams}`,
+  );
+}
+
+async function runConcurrent(fileParam, envParam, numParam, scriptParams) {
+  if (!envParam || !numParam) {
+    console.log(`缺少并发运行的环境变量参数 task xxx.js conc Test 1 3`);
+    return;
+  }
+
+  const array = (process.env[envParam] || '').split('&');
+  const runArr = expandRange(numParam, array.length);
+  const arrayRun = runArr.map((i) => array[i - 1]).filter(Boolean);
+
+  const singleLogTime = formatLogTime(new Date());
+
+  cd(dirScripts);
+  const relativePath = dirname(fileParam);
+  if (relativePath && fileParam.includes('/')) {
+    cd(relativePath);
+    fileParam = fileParam.replace(`${relativePath}/`, '');
+  }
+
+  await Promise.all(
+    arrayRun.map(async (env, i) => {
+      const singleLogPath = `${dirLog}/${globalState.logDir}/${singleLogTime}_${
+        i + 1
+      }.log`;
+      await runWithTimeout(
+        `${envParam}="${env.replace('"', '\\"')}" ${
+          globalState.whichProgram
+        } ${fileParam} ${scriptParams} &>${singleLogPath}`,
+      );
+    }),
+  );
+
+  for (let i = 0; i < arrayRun.length; i++) {
+    const singleLogPath = `${dirLog}/${globalState.logDir}/${singleLogTime}_${
+      i + 1
+    }.log`;
+    const log = await fs.readFile(singleLogPath, 'utf8');
+    console.log(log);
+    await fs.unlink(singleLogPath);
+  }
+}
+
+async function runDesignated(fileParam, envParam, numParam, scriptParams) {
+  if (!envParam || !numParam) {
+    console.log(`缺少单独运行的参数 task xxx.js desi Test 1 3`);
+    return;
+  }
+
+  const array = (process.env[envParam] || '').split('&');
+  const runArr = expandRange(numParam, array.length);
+  const arrayRun = runArr.map((i) => array[i - 1]).filter(Boolean);
+  const cookieStr = arrayRun.join('&');
+  cd(dirScripts);
+  const relativePath = dirname(fileParam);
+  if (relativePath && fileParam.includes('/')) {
+    cd(relativePath);
+    fileParam = fileParam.replace(`${relativePath}/`, '');
+  }
+
+  console.log('cookieStr', cookieStr.length, arrayRun.length);
+  // ${envParam}="${cookieStr.replace('"', '\\"')}"
+  await runWithTimeout(
+    `${globalState.whichProgram} ${fileParam} ${scriptParams}`,
+  );
+}
+
+async function runElse(fileParam, scriptParams) {
+  cd(dirScripts);
+  const relativePath = dirname(fileParam);
+  if (relativePath && fileParam.includes('/')) {
+    cd(relativePath);
+    fileParam = fileParam.replace(`${relativePath}/`, './');
+  }
+
+  await runWithTimeout(
+    `${globalState.whichProgram} ${fileParam} ${scriptParams}`,
+  );
+}
+
+function expandRange(rangeStr, max) {
+  const tempRangeStr = rangeStr
+    .replace(/-max/g, `-${max}`)
+    .replace(/max-/g, `${max}-`);
+
+  return tempRangeStr.split(' ').flatMap((part) => {
+    const rangeMatch = part.match(/^(\d+)([-~_])(\d+)$/);
+    if (rangeMatch) {
+      const [, start, , end] = rangeMatch.map(Number);
+      return Array.from({ length: end - start + 1 }, (_, i) => start + i);
+    }
+    return Number(part);
+  });
+}
+
+async function main(taskShellParams, scriptParams) {
+  const [fileParam, action, envParam, ...others] = taskShellParams;
+  if (taskShellParams.length === 0) {
+    return await usage();
+  }
+  if (fileParam && /\.(js|py|pyc|sh|ts)$/.test(fileParam)) {
+    const filePath = fileParam.startsWith('/')
+      ? fileParam
+      : path.join(dirScripts, fileParam);
+    if (!(await fs.exists(filePath))) {
+      console.log(`文件不存在 ${fileParam}`);
+      return;
+    }
+    switch (action) {
+      case undefined:
+        return await runNormal(fileParam, scriptParams);
+      case 'now':
+        return await runNormal(fileParam, scriptParams);
+      case 'conc':
+        return await runConcurrent(
+          fileParam,
+          envParam,
+          others.join(' '),
+          scriptParams,
+        );
+      case 'desi':
+        return await runDesignated(
+          fileParam,
+          envParam,
+          others.join(' '),
+          scriptParams,
+        );
+    }
+  }
+  await runElse(fileParam, taskShellParams.slice(1).concat(scriptParams));
+}
+
+async function run() {
+  const taskArgv = minimist(process.argv.slice(3), {
+    '--': true,
+  });
+  const { _: taskShellParams, m, '--': scriptParams, GlobalState } = taskArgv;
+  const cacheState = JSON.parse(GlobalState || '{}');
+  for (const key in cacheState) {
+    globalState[key] = cacheState[key];
+  }
+  if (m) {
+    globalState.commandTimeoutTime = m;
+  }
+  globalState.whichProgram = await defineProgram(taskShellParams[0]);
+
+  await handleTaskStart();
+  await runTaskBefore();
+  await main(taskShellParams, scriptParams);
+  await runTaskAfter();
+  await handleTaskEnd();
+}
+
+async function singleHandle() {}
+
+const signals = ['SIGINT', 'SIGTERM', 'SIGHUP', 'SIGQUIT', 'SIGTSTP'];
+signals.forEach((sig) => process.on(sig, singleHandle));
+
+await run();

cli/share.mjs

@@ -0,0 +1,500 @@
+#!/usr/bin/env zx
+import 'zx/globals';
+// $.verbose = true;
+
+import { updateCron, notifyApi } from './api.mjs';
+import { restoreEnvVars } from './env.mjs';
+
+export const dirRoot = process.env.QL_DIR;
+export const dirTmp = path.join(dirRoot, '.tmp');
+export const dirData = process.env.QL_DATA_DIR
+  ? process.env.QL_DATA_DIR.endsWith('/')
+    ? process.env.QL_DATA_DIR.slice(-1)
+    : process.env.QL_DATA_DIR
+  : path.join(dirRoot, 'data');
+export const dirShell = path.join(dirRoot, 'shell');
+export const dirCli = path.join(dirRoot, 'cli');
+export const dirSample = path.join(dirRoot, 'sample');
+export const dirStatic = path.join(dirRoot, 'static');
+export const dirConfig = path.join(dirData, 'config');
+export const dirScripts = path.join(dirData, 'scripts');
+export const dirRepo = path.join(dirData, 'repo');
+export const dirRaw = path.join(dirData, 'raw');
+export const dirLog = path.join(dirData, 'log');
+export const dirDb = path.join(dirData, 'db');
+export const dirDep = path.join(dirData, 'deps');
+export const dirListTmp = path.join(dirLog, '.tmp');
+export const dirUpdateLog = path.join(dirLog, 'update');
+export const qlStaticRepo = path.join(dirRepo, 'static');
+
+export const fileConfigSample = path.join(dirSample, 'config.sample.sh');
+export const fileEnv = path.join(dirConfig, 'env.sh');
+export const jsFileEnv = path.join(dirConfig, 'env.js');
+export const fileConfigUser = path.join(dirConfig, 'config.sh');
+export const fileAuthSample = path.join(dirSample, 'auth.sample.json');
+export const fileAuthUser = path.join(dirConfig, 'auth.json');
+export const fileAuthToken = path.join(dirConfig, 'token.json');
+export const fileExtraShell = path.join(dirConfig, 'extra.sh');
+export const fileTaskBefore = path.join(dirConfig, 'task_before.sh');
+export const fileTaskAfter = path.join(dirConfig, 'task_after.sh');
+export const fileTaskSample = path.join(dirSample, 'task.sample.sh');
+export const fileExtraSample = path.join(dirSample, 'extra.sample.sh');
+export const fileNotifyJsSample = path.join(dirSample, 'notify.js');
+export const fileNotifyPySample = path.join(dirSample, 'notify.py');
+export const fileTestJsSample = path.join(dirSample, 'ql_sample.js');
+export const fileTestPySample = path.join(dirSample, 'ql_sample.py');
+export const fileNotifyPy = path.join(dirScripts, 'notify.py');
+export const fileNotifyJs = path.join(dirScripts, 'sendNotify.js');
+export const fileTestJs = path.join(dirScripts, 'ql_sample.js');
+export const fileTestPy = path.join(dirScripts, 'ql_sample.py');
+export const nginxAppConf = path.join(dirRoot, 'docker/front.conf');
+export const nginxConf = path.join(dirRoot, 'docker/nginx.conf');
+export const depNotifyPy = path.join(dirDep, 'notify.py');
+export const depNotifyJs = path.join(dirDep, 'sendNotify.js');
+
+export const listCrontabUser = path.join(dirConfig, 'crontab.list');
+export const listCrontabSample = path.join(dirSample, 'crontab.sample.list');
+export const listOwnScripts = path.join(dirListTmp, 'own_scripts.list');
+export const listOwnUser = path.join(dirListTmp, 'own_user.list');
+export const listOwnAdd = path.join(dirListTmp, 'own_add.list');
+export const listOwnDrop = path.join(dirListTmp, 'own_drop.list');
+
+export const globalState = {};
+
+export const initEnv = () => {
+  $.prefix +=
+    '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;';
+  $.prefix += 'export PYTHONUNBUFFERED=1;';
+  $.prefix += 'export TERM=xterm-color;';
+};
+
+export const importConfig = async () => {
+  if (await fs.exists(fileConfigUser)) {
+    $.prefix += (await fs.readFile(fileConfigUser, 'utf8'));
+  }
+  // if (process.env.LOAD_ENV !== 'false' && (await fs.exists(fileEnv))) {
+  //   $.prefix += (await fs.readFile(fileEnv, 'utf8'));
+  // }
+  require(jsFileEnv)
+
+  globalState.qlBaseUrl = process.env.QlBaseUrl || '/';
+  globalState.qlPort = process.env.QlPort || '5700';
+  globalState.commandTimeoutTime = process.env.CommandTimeoutTime;
+  globalState.fileExtensions = process.env.RepoFileExtensions || 'js py';
+  globalState.proxyUrl = process.env.ProxyUrl || '';
+  globalState.currentBranch = process.env.QL_BRANCH;
+
+  if (process.env.DefaultCronRule) {
+    globalState.defaultCron = process.env.DefaultCronRule;
+  } else {
+    globalState.defaultCron = `${Math.floor(Math.random() * 60)} ${Math.floor(
+      Math.random() * 24,
+    )} * * *`;
+  }
+
+  globalState.cpuWarn = process.env.CpuWarn;
+  globalState.memWarn = process.env.MemoryWarn;
+  globalState.diskWarn = process.env.DiskWarn;
+};
+
+export const setProxy = (proxy) => {
+  if (proxy) {
+    globalState.proxyUrl = proxy;
+  }
+  if (globalState.proxyUrl) {
+    $`export http_proxy=${globalState.proxyUrl}`;
+    $`export https_proxy=${globalState.proxyUrl}`;
+  }
+};
+
+export const unsetProxy = () => {
+  $`unset http_proxy`;
+  $`unset https_proxy`;
+};
+
+export const makeDir = async (dir) => {
+  if (!(await fs.exists(dir))) {
+    await fs.mkdir(dir, { recursive: true });
+  }
+};
+
+export const detectTermux = () => {
+  globalState.isTermux = process.env.PATH?.includes('com.termux') ? 1 : 0;
+};
+
+export const detectMacos = () => {
+  globalState.isMacos = os.type() === 'Darwin' ? 1 : 0;
+};
+
+export const genRandomNum = (number) => {
+  return Math.floor(Math.random() * number);
+};
+
+export const fixConfig = async () => {
+  await makeDir(dirTmp);
+  await makeDir(dirStatic);
+  await makeDir(dirData);
+  await makeDir(dirConfig);
+  await makeDir(dirLog);
+  await makeDir(dirDb);
+  await makeDir(dirScripts);
+  await makeDir(dirListTmp);
+  await makeDir(dirRepo);
+  await makeDir(dirRaw);
+  await makeDir(dirUpdateLog);
+  await makeDir(dirDep);
+
+  if (!(await fs.exists(fileConfigUser))) {
+    console.log(
+      `复制一份 ${fileConfigSample} 为 ${fileConfigUser}，随后请按注释编辑你的配置文件：${fileConfigUser}`,
+    );
+    await fs.copyFile(fileConfigSample, fileConfigUser);
+  }
+
+  if (!(await fs.exists(fileEnv))) {
+    console.log(
+      '检测到config配置目录下不存在env.sh，创建一个空文件用于初始化...',
+    );
+    await fs.writeFile(fileEnv, '');
+  }
+
+  if (!(await fs.exists(fileTaskBefore))) {
+    console.log(`复制一份 ${fileTaskSample} 为 ${fileTaskBefore}`);
+    await fs.copyFile(fileTaskSample, fileTaskBefore);
+  }
+
+  if (!(await fs.exists(fileTaskAfter))) {
+    console.log(`复制一份 ${fileTaskSample} 为 ${fileTaskAfter}`);
+    await fs.copyFile(fileTaskSample, fileTaskAfter);
+  }
+
+  if (!(await fs.exists(fileExtraShell))) {
+    console.log(`复制一份 ${fileExtraSample} 为 ${fileExtraShell}`);
+    await fs.copyFile(fileExtraSample, fileExtraShell);
+  }
+
+  if (!(await fs.exists(fileAuthUser))) {
+    console.log(`复制一份 ${fileAuthSample} 为 ${fileAuthUser}`);
+    await fs.copyFile(fileAuthSample, fileAuthUser);
+  }
+
+  if (!(await fs.exists(fileNotifyPy))) {
+    console.log(`复制一份 ${fileNotifyPySample} 为 ${fileNotifyPy}`);
+    await fs.copyFile(fileNotifyPySample, fileNotifyPy);
+  }
+
+  if (!(await fs.exists(fileNotifyJs))) {
+    console.log(`复制一份 ${fileNotifyJsSample} 为 ${fileNotifyJs}`);
+    await fs.copyFile(fileNotifyJsSample, fileNotifyJs);
+  }
+
+  if (!(await fs.exists(fileTestJs))) {
+    await fs.copyFile(fileTestJsSample, fileTestJs);
+  }
+
+  if (!(await fs.exists(fileTestPy))) {
+    await fs.copyFile(fileTestPySample, fileTestPy);
+  }
+
+  if (await fs.exists('/etc/nginx/conf.d/default.conf')) {
+    console.log('检测到你可能未修改过默认nginx配置，将帮你删除');
+    await fs.unlink('/etc/nginx/conf.d/default.conf');
+  }
+  if (!(await fs.exists(depNotifyJs))) {
+    console.log(`复制一份 ${fileNotifyJsSample} 为 ${depNotifyJs}`);
+    await fs.copyFile(fileNotifyJsSample, depNotifyJs);
+  }
+
+  if (!(await fs.exists(depNotifyPy))) {
+    console.log(`复制一份 ${fileNotifyPySample} 为 ${depNotifyPy}`);
+    await fs.copyFile(fileNotifyPySample, depNotifyPy);
+  }
+};
+
+export const npmInstallSub = async () => {
+  if (globalState.isTermux === 1) {
+    await $`npm install --production --no-bin-links`;
+  } else if (!(await $`command -v pnpm`)) {
+    await $`npm install --production`;
+  } else {
+    await $`pnpm install --loglevel error --production`;
+  }
+};
+
+export const npmInstall = async (dirWork) => {
+  const dirCurrent = process.cwd();
+
+  await $`cd ${dirWork}`;
+  console.log(`安装 ${dirWork} 依赖包...`);
+  await npmInstallSub();
+  await $`cd ${dirCurrent}`;
+};
+
+export const diffAndCopy = async (copySource, copyTo) => {
+  if (
+    !(await fs.exists(copyTo)) ||
+    (await $`diff ${copySource} ${copyTo}`).exitCode !== 0
+  ) {
+    await fs.copyFile(copySource, copyTo);
+  }
+};
+
+export const gitCloneScripts = async (url, dir, branch, proxy) => {
+  const partCmd = branch ? `-b ${branch}` : '';
+  console.log(`开始拉取仓库 ${globalState.uniqPath} 到 ${dir}`);
+
+  setProxy(proxy);
+
+  const res = await $`git clone -q --depth=1 ${partCmd} ${url} ${dir}`;
+  globalState.exitStatus = res.exitCode;
+
+  unsetProxy();
+};
+
+export const randomRange = (begin, end) => {
+  return Math.floor(Math.random() * (end - begin) + begin);
+};
+
+export const deletePm2 = async () => {
+  await $`cd ${dirRoot}`;
+  await $`pm2 delete ecosystem.config.js`;
+};
+
+export const reloadPm2 = async () => {
+  await $`cd ${dirRoot}`;
+  restoreEnvVars();
+  await $`pm2 flush &>/dev/null`;
+  await $`pm2 startOrGracefulReload ecosystem.config.js`;
+};
+
+export const reloadUpdate = async () => {
+  await $`cd ${dirRoot}`;
+  restoreEnvVars();
+  await $`pm2 flush &>/dev/null`;
+  await $`pm2 startOrGracefulReload other.config.js`;
+};
+
+export const diffTime = (beginTime, endTime) => {
+  let diffTime;
+  if (globalState.isMacos === 1) {
+    diffTime = (+new Date(endTime) - +new Date(beginTime)) / 1000;
+  } else {
+    diffTime =
+      (new Date(endTime).getTime() - new Date(beginTime).getTime()) / 1000;
+  }
+  return diffTime;
+};
+
+export const formatTime = (time) => {
+  // 秒
+  return new Date(time).toLocaleString();
+};
+
+function pad(n, min = 10) {
+  return n < min ? '0' + n : n;
+}
+
+export function formatDate(date) {
+  const year = date.getFullYear();
+  const month = pad(date.getMonth() + 1);
+  const day = pad(date.getDate());
+  const hour = pad(date.getHours());
+  const minute = pad(date.getMinutes());
+  const second = pad(date.getSeconds());
+
+  return `${year}-${month}-${day} ${hour}:${minute}:${second}`;
+}
+
+export const formatLogTime = (date) => {
+  const year = date.getFullYear();
+  const month = pad(date.getMonth() + 1);
+  const day = pad(date.getDate());
+  const hour = pad(date.getHours());
+  const minute = pad(date.getMinutes());
+  const second = pad(date.getSeconds());
+  const milliSecond = pad(date.getMilliseconds(), 100);
+
+  return `${year}-${month}-${day}-${hour}-${minute}-${second}-${milliSecond}`;
+};
+
+export const formatTimestamp = (date) => {
+  return Math.floor(date.getTime() / 1000);
+};
+
+export const patchVersion = async () => {
+  await $`git config --global pull.rebase false`;
+
+  if (await fs.exists(path.join(dirRoot, 'db/cookie.db'))) {
+    console.log('检测到旧的db文件，拷贝为新db...');
+    await $`mv ${path.join(dirRoot, 'db/cookie.db')} ${path.join(
+      dirRoot,
+      'db/env.db',
+    )}`;
+    await $`rm -rf ${path.join(dirRoot, 'db/cookie.db')}`;
+  }
+
+  if (await fs.exists(path.join(dirRoot, 'db'))) {
+    console.log('检测到旧的db目录，拷贝到data目录...');
+    await $`cp -rf ${path.join(dirRoot, 'config')} ${dirData}`;
+  }
+
+  if (await fs.exists(path.join(dirRoot, 'scripts'))) {
+    console.log('检测到旧的scripts目录，拷贝到data目录...');
+    await $`cp -rf ${path.join(dirRoot, 'scripts')} ${dirData}`;
+  }
+
+  if (await fs.exists(path.join(dirRoot, 'log'))) {
+    console.log('检测到旧的log目录，拷贝到data目录...');
+    await $`cp -rf ${path.join(dirRoot, 'log')} ${dirData}`;
+  }
+
+  if (await fs.exists(path.join(dirRoot, 'config'))) {
+    console.log('检测到旧的config目录，拷贝到data目录...');
+    await $`cp -rf ${path.join(dirRoot, 'config')} ${dirData}`;
+  }
+};
+
+export const initNginx = async () => {
+  await fs.copyFile(nginxConf, '/etc/nginx/nginx.conf');
+  await fs.copyFile(nginxAppConf, '/etc/nginx/conf.d/front.conf');
+  let locationUrl = '/';
+  let aliasStr = '';
+  let rootStr = '';
+  let qlBaseUrl = globalState.qlBaseUrl;
+  let qlPort = globalState.qlPort;
+  if (qlBaseUrl !== '/') {
+    if (!qlBaseUrl.startsWith('/')) {
+      qlBaseUrl = `/${qlBaseUrl}`;
+    }
+    if (!qlBaseUrl.endsWith('/')) {
+      qlBaseUrl = `${qlBaseUrl}/`;
+    }
+    locationUrl = `^~${qlBaseUrl.slice(0, -1)}`;
+    aliasStr = `alias ${path.join(dirStatic, 'dist')};`;
+    const file = await fs.readFile(
+      path.join(dirStatic, 'dist/index.html'),
+      'utf8',
+    );
+    if (!file.includes(`<base href="${qlBaseUrl}">`)) {
+      await fs.writeFile(
+        path.join(dirStatic, 'dist/index.html'),
+        `<base href="${qlBaseUrl}">\n${file}`,
+      );
+    }
+  } else {
+    rootStr = `root ${path.join(dirStatic, 'dist')};`;
+  }
+  await $`sed -i "s,QL_ALIAS_CONFIG,${aliasStr},g" /etc/nginx/conf.d/front.conf`;
+  await $`sed -i "s,QL_ROOT_CONFIG,${rootStr},g" /etc/nginx/conf.d/front.conf`;
+  await $`sed -i "s,QL_BASE_URL_LOCATION,${locationUrl},g" /etc/nginx/conf.d/front.conf`;
+  let ipv6Str = '';
+  const ipv6 = await $`ip a | grep inet6`;
+  if (ipv6.stdout.trim()) {
+    ipv6Str = 'listen [::]:${qlPort} ipv6only=on;';
+  }
+  const ipv4Str = `listen ${qlPort};`;
+  await $`sed -i "s,IPV6_CONFIG,${ipv6Str},g" /etc/nginx/conf.d/front.conf`;
+  await $`sed -i "s,IPV4_CONFIG,${ipv4Str},g" /etc/nginx/conf.d/front.conf`;
+};
+
+async function checkServer() {
+  const cpuWarn = parseInt(process.env.cpuWarn || '0');
+  const memWarn = parseInt(process.env.memWarn || '0');
+  const diskWarn = parseInt(process.env.diskWarn || '0');
+
+  if (cpuWarn && memWarn && diskWarn) {
+    const topResult = await $`top -b -n 1`;
+    const cpuUse = parseInt(
+      topResult.stdout.match(/CPU\s+(\d+)\%/)?.[1] || '0',
+    );
+    const memFree = parseInt(
+      (await $`free -m`).stdout.match(/Mem:\s+(\d+)/)?.[1] || '0',
+    );
+    const memTotal = parseInt(
+      (await $`free -m`).stdout.match(/Mem:\s+\d+\s+(\d+)/)?.[1] || '0',
+    );
+    const diskUse = parseInt(
+      (await $`df -P`).stdout.match(/\/dev.*\s+(\d+)\%/)?.[1] || '0',
+    );
+    if (memFree && memTotal && diskUse && cpuUse) {
+      const memUse = Math.floor((memFree * 100) / memTotal);
+
+      if (cpuUse > cpuWarn || memFree < memWarn || diskUse > diskWarn) {
+        const resource = topResult.stdout
+          .split('\n')
+          .slice(7, 17)
+          .map((line) => line.replace(/\s+/g, ' '))
+          .join('\\n');
+        await notifyApi(
+          '服务器资源异常警告',
+          `当前CPU占用 ${cpuUse}% 内存占用 ${memUse}% 磁盘占用 ${diskUse}% \n资源占用详情 \n\n ${resource}`,
+        );
+      }
+    }
+  }
+}
+
+export const handleTaskStart = async () => {
+  if (globalState.ID) {
+    await updateCron(
+      [globalState.ID],
+      '0',
+      String(process.pid),
+      globalState.logPath,
+      globalState.beginTimestamp,
+    );
+  }
+  console.log(`## 开始执行... ${globalState.beginTime}\n`);
+};
+
+export const runTaskBefore = async () => {
+  if (globalState.isMacos === 0) {
+    await checkServer();
+  }
+  await $`. ${fileTaskBefore} "$@"`;
+
+  if (globalState.taskBefore) {
+    console.log('执行前置命令');
+    await $`eval ${globalState.taskBefore}`;
+    console.log('执行前置命令结束');
+  }
+};
+
+export const runTaskAfter = async () => {
+  await $`. ${fileTaskAfter} "$@"`;
+
+  if (globalState.taskAfter) {
+    console.log('执行后置命令');
+    await $`eval "${globalState.taskAfter}"`;
+    console.log('执行后置命令结束');
+  }
+};
+
+export const handleTaskEnd = async () => {
+  const etime = new Date();
+  const endTime = formatDate(etime);
+  const endTimestamp = formatTimestamp(etime);
+  let diffTime = endTimestamp - globalState.beginTimestamp;
+
+  if (diffTime === 0) {
+    diffTime = 1;
+  }
+
+  if (globalState.ID) {
+    await updateCron(
+      [globalState.ID],
+      '1',
+      `${process.pid}`,
+      globalState.logPath,
+      globalState.beginTimestamp,
+      diffTime,
+    );
+  }
+
+  console.log(`\n## 执行结束... ${endTime}  耗时 ${diffTime} 秒`);
+};
+
+initEnv();
+detectTermux();
+detectMacos();
+await importConfig();

cli/task.mjs

@@ -0,0 +1,94 @@
+#!/usr/bin/env zx
+import 'zx/globals';
+
+import { PassThrough } from 'node:stream';
+import {
+  listCrontabUser,
+  formatLogTime,
+  formatTimestamp,
+  formatDate,
+  dirLog,
+  dirCli,
+  globalState,
+  handleTaskEnd,
+} from './share.mjs';
+import './api.mjs';
+
+// $.verbose = true;
+
+async function singleHandle() {}
+
+const signals = ['SIGINT', 'SIGTERM', 'SIGHUP', 'SIGQUIT', 'SIGTSTP'];
+signals.forEach((sig) => process.on(sig, singleHandle));
+
+export async function handleLogPath(fileParam) {
+  let ID = $.env.ID;
+  if (!ID) {
+    const grepResult =
+      await $`grep -E "task.* ${fileParam}" ${listCrontabUser}`.nothrow();
+    ID = grepResult.stdout.match(/ID=(\d+)/)?.[1];
+  }
+  globalState.ID = ID;
+
+  const suffix = ID && parseInt(ID, 10) > 0 ? `_${ID}` : '';
+  globalState.time = new Date();
+  const logTime = formatLogTime(globalState.time);
+  let logDirTmp = path.basename(fileParam);
+  let logDirTmpPath = '';
+
+  if (fileParam.includes('/')) {
+    logDirTmpPath = path.isAbsolute(fileParam)
+      ? fileParam.substring(1)
+      : fileParam;
+    logDirTmpPath = path.basename(path.dirname(logDirTmpPath));
+  }
+
+  if (logDirTmpPath) {
+    logDirTmp = `${logDirTmpPath}_${logDirTmp}`;
+  }
+
+  const logDir = `${logDirTmp.replace(/\.[^/.]+$/, '')}${suffix}`;
+  globalState.logDir = logDir;
+  globalState.logPath = `${logDir}/${logTime}.log`;
+  if ($.env.real_log_path) {
+    globalState.logPath = realLogPath;
+  }
+
+  await $`mkdir -p ${dirLog}/${logDir}`;
+}
+
+export function initBeginTime() {
+  globalState.beginTime = formatDate(globalState.time);
+  globalState.beginTimestamp = formatTimestamp(globalState.time);
+}
+
+async function main() {
+  const taskArgv = minimist(process.argv.slice(3), {
+    '--': true,
+  });
+  const {
+    _: [scriptFile],
+  } = taskArgv;
+
+  await handleLogPath(scriptFile);
+  initBeginTime();
+
+  cd(`${dirCli}`);
+  const logStream = fs.createWriteStream(`${dirLog}/${globalState.logPath}`);
+  const passThrough = new PassThrough();
+  passThrough.pipe(logStream);
+  const p = $`./otask.mjs ${process.argv.slice(
+    3,
+  )} --GlobalState=${JSON.stringify(globalState)} 2>&1`.nothrow();
+  p.stdout.pipe(passThrough).pipe(process.stdout);
+  await p;
+}
+
+main()
+  .then(() => {
+    process.exit(0);
+  })
+  .catch((err) => {
+    console.error(err);
+    process.exit(1);
+  });

docker/310.Dockerfile

@@ -0,0 +1,82 @@
+FROM python:3.10-alpine3.18 as builder
+COPY package.json .npmrc pnpm-lock.yaml /tmp/build/
+RUN set -x \
+  && apk update \
+  && apk add nodejs npm git \
+  && npm i -g pnpm@8.3.1 pm2 tsx \
+  && cd /tmp/build \
+  && pnpm install --prod
+
+FROM python:3.10-alpine
+
+ARG QL_MAINTAINER="whyour"
+LABEL maintainer="${QL_MAINTAINER}"
+ARG QL_URL=https://github.com/${QL_MAINTAINER}/qinglong.git
+ARG QL_BRANCH=develop
+
+ENV PNPM_HOME=/root/.local/share/pnpm \
+  PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/root/.local/share/pnpm:/root/.local/share/pnpm/global/5/node_modules:$PNPM_HOME \
+  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 \
+  LANG=C.UTF-8 \
+  SHELL=/bin/bash \
+  PS1="\u@\h:\w \$ " \
+  QL_DIR=/ql \
+  QL_BRANCH=${QL_BRANCH}
+
+VOLUME /ql/data
+  
+EXPOSE 5700
+
+COPY --from=builder /usr/local/lib/node_modules/. /usr/local/lib/node_modules/
+COPY --from=builder /usr/local/bin/. /usr/local/bin/
+
+RUN set -x \
+  && apk update -f \
+  && apk upgrade \
+  && apk --no-cache add -f bash \
+  coreutils \
+  git \
+  curl \
+  wget \
+  tzdata \
+  perl \
+  openssl \
+  nginx \
+  nodejs \
+  jq \
+  openssh \
+  procps \
+  netcat-openbsd \
+  unzip \
+  npm \
+  && rm -rf /var/cache/apk/* \
+  && apk update \
+  && ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
+  && echo "Asia/Shanghai" > /etc/timezone \
+  && git config --global user.email "qinglong@@users.noreply.github.com" \
+  && git config --global user.name "qinglong" \
+  && git config --global http.postBuffer 524288000 \
+  && rm -rf /root/.pnpm-store \
+  && rm -rf /root/.local/share/pnpm/store \
+  && rm -rf /root/.cache \
+  && ulimit -c 0
+
+ARG SOURCE_COMMIT
+RUN git clone --depth=1 -b ${QL_BRANCH} ${QL_URL} ${QL_DIR} \
+  && cd ${QL_DIR} \
+  && cp -f .env.example .env \
+  && chmod 777 ${QL_DIR}/shell/*.sh \
+  && chmod 777 ${QL_DIR}/docker/*.sh \
+  && git clone --depth=1 -b ${QL_BRANCH} https://github.com/${QL_MAINTAINER}/qinglong-static.git /static \
+  && mkdir -p ${QL_DIR}/static \
+  && cp -rf /static/* ${QL_DIR}/static \
+  && rm -rf /static
+
+COPY --from=builder /tmp/build/node_modules/. /ql/node_modules/
+
+WORKDIR ${QL_DIR}
+
+HEALTHCHECK --interval=5s --timeout=2s --retries=20 \
+  CMD curl -sf --noproxy '*' http://127.0.0.1:5400/api/health || exit 1
+
+ENTRYPOINT ["./docker/docker-entrypoint.sh"]

docker/Dockerfile

@@ -1,13 +1,13 @@
-FROM python:3.10-alpine as builder
+FROM python:3.11-alpine3.18 as builder
 COPY package.json .npmrc pnpm-lock.yaml /tmp/build/
 RUN set -x \
   && apk update \
   && apk add nodejs npm git \
-  && npm i -g pnpm@8.3.1 \
+  && npm i -g pnpm@8.3.1 pm2 tsx \
   && cd /tmp/build \
-  && pnpm --registry https://registry.npmmirror.com install --prod
+  && pnpm install --prod
 
-FROM python:3.10-alpine
+FROM python:3.11-alpine
 
 ARG QL_MAINTAINER="whyour"
 LABEL maintainer="${QL_MAINTAINER}"
@@ -23,8 +23,14 @@ ENV PNPM_HOME=/root/.local/share/pnpm \
   QL_DIR=/ql \
   QL_BRANCH=${QL_BRANCH}
 
+VOLUME /ql/data
+  
+EXPOSE 5700
+
+COPY --from=builder /usr/local/lib/node_modules/. /usr/local/lib/node_modules/
+COPY --from=builder /usr/local/bin/. /usr/local/bin/
+
 RUN set -x \
-  && sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories \
   && apk update -f \
   && apk upgrade \
   && apk --no-cache add -f bash \
@@ -41,6 +47,7 @@ RUN set -x \
   openssh \
   procps \
   netcat-openbsd \
+  unzip \
   npm \
   && rm -rf /var/cache/apk/* \
   && apk update \
@@ -49,13 +56,10 @@ RUN set -x \
   && git config --global user.email "qinglong@@users.noreply.github.com" \
   && git config --global user.name "qinglong" \
   && git config --global http.postBuffer 524288000 \
-  && npm install -g pnpm@8.3.1 \
-  && cd && pnpm config set registry https://registry.npmmirror.com \
-  && pnpm add -g pm2 tsx \
   && rm -rf /root/.pnpm-store \
   && rm -rf /root/.local/share/pnpm/store \
   && rm -rf /root/.cache \
-  && rm -rf /root/.npm
+  && ulimit -c 0
 
 ARG SOURCE_COMMIT
 RUN git clone --depth=1 -b ${QL_BRANCH} ${QL_URL} ${QL_DIR} \
@@ -73,6 +77,6 @@ COPY --from=builder /tmp/build/node_modules/. /ql/node_modules/
 WORKDIR ${QL_DIR}
 
 HEALTHCHECK --interval=5s --timeout=2s --retries=20 \
-  CMD curl -sf http://127.0.0.1:5400/api/health || exit 1
+  CMD curl -sf --noproxy '*' http://127.0.0.1:5400/api/health || exit 1
 
 ENTRYPOINT ["./docker/docker-entrypoint.sh"]

docker/docker-entrypoint.sh

@@ -1,8 +1,8 @@
 #!/bin/bash
 
 dir_shell=/ql/shell
+. $dir_shell/env.sh
 . $dir_shell/share.sh
-link_shell
 
 echo -e "======================1. 检测配置文件========================\n"
 make_dir /etc/nginx/conf.d
@@ -14,37 +14,24 @@ pm2 l &>/dev/null
 
 echo -e "======================2. 安装依赖========================\n"
 patch_version
-if [[ $PipMirror ]]; then
-  pip3 config set global.index-url $PipMirror
-fi
-current_npm_registry=$(cd && pnpm config get registry)
-is_equal_registry=$(echo $current_npm_registry | grep "${NpmMirror}")
-if [[ "$is_equal_registry" == "" ]]; then
-  cd && pnpm config set registry $NpmMirror
-  pnpm install -g
-fi
-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
-echo
 
 echo -e "======================3. 启动nginx========================\n"
 nginx -s reload 2>/dev/null || nginx -c /etc/nginx/nginx.conf
 echo -e "nginx启动成功...\n"
 
 echo -e "======================4. 启动pm2服务========================\n"
+reload_update
 reload_pm2
 
 if [[ $AutoStartBot == true ]]; then
   echo -e "======================5. 启动bot========================\n"
-  nohup ql -l bot >$dir_log/bot.log 2>&1 &
+  nohup ql bot >$dir_log/bot.log 2>&1 &
   echo -e "bot后台启动中...\n"
 fi
 
 if [[ $EnableExtraShell == true ]]; then
   echo -e "====================6. 执行自定义脚本========================\n"
-  nohup ql -l extra >$dir_log/extra.log 2>&1 &
+  nohup ql extra >$dir_log/extra.log 2>&1 &
   echo -e "自定义脚本后台执行中...\n"
 fi
 

docker/front.conf

@@ -6,6 +6,10 @@ upstream publicApi {
   server 0.0.0.0:5400;
 }
 
+upstream updateApi {
+  server 0.0.0.0:5300;
+}
+
 map $http_upgrade $connection_upgrade {
   default keep-alive;
   'websocket' upgrade;
@@ -16,12 +20,28 @@ server {
   IPV6_CONFIG
   ssl_session_timeout 5m;
 
+  location QL_BASE_URLapi/update/ {
+    proxy_set_header Host $http_host;
+    proxy_set_header X-Real-IP $remote_addr;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_pass http://updateApi/api/;
+    proxy_buffering off;
+    proxy_redirect default;
+    proxy_connect_timeout 1800;
+    proxy_send_timeout 1800;
+    proxy_read_timeout 1800;
+  }
+
   location QL_BASE_URLapi/public/ {
     proxy_set_header Host $http_host;
     proxy_set_header X-Real-IP $remote_addr;
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
     proxy_pass http://publicApi/api/;
     proxy_buffering off;
+    proxy_redirect default;
+    proxy_connect_timeout 1800;
+    proxy_send_timeout 1800;
+    proxy_read_timeout 1800;
   }
 
   location QL_BASE_URLapi/ {
@@ -30,6 +50,10 @@ server {
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
     proxy_pass http://baseApi/api/;
     proxy_buffering off;
+    proxy_redirect default;
+    proxy_connect_timeout 1800;
+    proxy_send_timeout 1800;
+    proxy_read_timeout 1800;
 
     proxy_set_header Upgrade $http_upgrade;
     proxy_set_header Connection $connection_upgrade;
@@ -41,6 +65,10 @@ server {
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
     proxy_pass http://baseApi/open/;
     proxy_buffering off;
+    proxy_redirect default;
+    proxy_connect_timeout 1800;
+    proxy_send_timeout 1800;
+    proxy_read_timeout 1800;
   }
 
   gzip on;

ecosystem.config.js

@@ -9,6 +9,14 @@ module.exports = {
       source_map_support: true,
       time: true,
       script: 'static/build/schedule/index.js',
+      env: {
+        http_proxy: '',
+        https_proxy: '',
+        HTTP_PROXY: '',
+        HTTPS_PROXY: '',
+        all_proxy: '',
+        ALL_PROXY: '',
+      },
     },
     {
       name: 'public',

other.config.js

@@ -0,0 +1,13 @@
+module.exports = {
+  apps: [
+    {
+      name: 'update',
+      max_restarts: 10,
+      kill_timeout: 15000,
+      wait_ready: true,
+      listen_timeout: 10000,
+      time: true,
+      script: 'static/build/update.js',
+    },
+  ],
+};

package.json

@@ -4,6 +4,7 @@
     "start": "concurrently -n w: npm:start:*",
     "start:front": "max dev",
     "start:back": "nodemon",
+    "start:update": "ts-node -P tsconfig.back.json ./back/update.ts",
     "start:public": "ts-node -P tsconfig.back.json ./back/public.ts",
     "start:rpc": "ts-node -P tsconfig.back.json ./back/schedule/index.ts",
     "build:front": "max build",
@@ -11,12 +12,16 @@
     "panel": "npm run build:back && node static/build/app.js",
     "schedule": "npm run build:back && node static/build/schedule/index.js",
     "public": "npm run build:back && node static/build/public.js",
+    "update": "npm run build:back && node static/build/update.js",
     "gen:proto": "protoc --experimental_allow_proto3_optional --plugin=./node_modules/.bin/protoc-gen-ts_proto ./back/protos/*.proto --ts_proto_out=./ --ts_proto_opt=outputServices=grpc-js,env=node,esModuleInterop=true",
     "prettier": "prettier --write '**/*.{js,jsx,tsx,ts,less,md,json}'",
     "postinstall": "max setup 2>/dev/null || true",
     "test": "umi-test",
     "test:coverage": "umi-test --coverage"
   },
+  "bin": {
+    "task": "./cli/task.mjs"
+  },
   "gitHooks": {
     "pre-commit": "lint-staged"
   },
@@ -58,7 +63,6 @@
     "@grpc/grpc-js": "^1.8.13",
     "@otplib/preset-default": "^12.0.1",
     "@sentry/node": "^7.12.1",
-    "@sentry/tracing": "^7.12.1",
     "body-parser": "^1.19.2",
     "celebrate": "^15.0.1",
     "chokidar": "^3.5.3",
@@ -79,25 +83,27 @@
     "js-yaml": "^4.1.0",
     "jsonwebtoken": "^8.5.1",
     "lodash": "^4.17.21",
-    "multer": "^1.4.4",
+    "multer": "1.4.5-lts.1",
     "nedb": "^1.8.0",
     "node-schedule": "^2.1.0",
     "nodemailer": "^6.7.2",
     "p-queue-cjs": "7.3.4",
-    "protobufjs": "^7.2.3",
+    "protobufjs": "^7.3.0",
     "pstree.remy": "^1.1.8",
     "reflect-metadata": "^0.1.13",
     "sequelize": "^6.25.5",
     "serve-handler": "^6.1.3",
     "sockjs": "^0.3.24",
     "sqlite3": "git+https://github.com/whyour/node-sqlite3.git#v1.0.3",
-    "tar": "^6.1.15",
     "toad-scheduler": "^1.6.0",
     "typedi": "^0.10.0",
     "uuid": "^8.3.2",
     "winston": "^3.6.0",
     "winston-daily-rotate-file": "^4.7.1",
-    "yargs": "^17.3.1"
+    "zx": "^8.1.4",
+    "tough-cookie": "^4.0.0",
+    "request-ip": "3.3.0",
+    "ip2region": "2.3.0"
   },
   "devDependencies": {
     "@ant-design/icons": "^4.7.0",
@@ -110,7 +116,7 @@
     "@types/cross-spawn": "^6.0.2",
     "@types/express": "^4.17.13",
     "@types/express-jwt": "^6.0.4",
-    "@types/file-saver": "^2.0.5",
+    "@types/file-saver": "2.0.2",
     "@types/js-yaml": "^4.0.5",
     "@types/jsonwebtoken": "^8.5.8",
     "@types/lodash": "^4.14.185",
@@ -126,8 +132,8 @@
     "@types/serve-handler": "^6.1.1",
     "@types/sockjs": "^0.3.33",
     "@types/sockjs-client": "^1.5.1",
-    "@types/tar": "^6.1.5",
     "@types/uuid": "^8.3.4",
+    "@types/request-ip": "0.0.41",
     "@uiw/codemirror-extensions-langs": "^4.21.9",
     "@uiw/react-codemirror": "^4.21.9",
     "@umijs/max": "^4.0.72",
@@ -139,11 +145,13 @@
     "axios": "^1.4.0",
     "compression-webpack-plugin": "9.2.0",
     "concurrently": "^7.0.0",
-    "file-saver": "^2.0.5",
+    "react-hotkeys-hook": "^4.4.1",
+    "file-saver": "2.0.2",
     "lint-staged": "^13.0.3",
     "monaco-editor": "0.33.0",
-    "nodemon": "^2.0.15",
+    "nodemon": "^3.0.1",
     "prettier": "^2.5.1",
+    "pretty-bytes": "6.1.1",
     "qiniu": "^7.4.0",
     "qrcode.react": "^1.0.1",
     "query-string": "^7.1.1",
@@ -161,7 +169,7 @@
     "ts-node": "^10.6.0",
     "ts-proto": "^1.146.0",
     "tslib": "^2.4.0",
-    "tsx": "^3.12.3",
+    "tsx": "^4.7.3",
     "typescript": "5.2.2",
     "vh-check": "^2.0.5",
     "virtualizedtableforantd4": "1.3.0",

sample/config.sample.sh

@@ -21,20 +21,19 @@ DiskWarn=90
 ## 设置定时任务执行的超时时间，例如1h，后缀"s"代表秒(默认值), "m"代表分, "h"代表小时, "d"代表天
 CommandTimeoutTime=""
 
-## 在运行 task 命令时，随机延迟启动任务的最大延迟时间
+## 在运行 task 命令时，随机延迟启动任务的最大延迟时间，如 RandomDelay="300" ，表示任务将在 1-300 秒内随机延迟一个秒数，然后再运行，取消延迟赋值为空
-## 默认给javascript任务加随机延迟，如 RandomDelay="300" ，表示任务将在 1-300 秒内随机延迟一个秒数，然后再运行，取消延迟赋值为空
+RandomDelay=""
-RandomDelay="300"
 
 ## 需要随机延迟运行任务的文件后缀，直接写后缀名即可，多个后缀用空格分开，例如: js py ts
 ## 默认仅给javascript任务加随机延迟，其它任务按定时规则准点运行。全部任务随机延迟赋值为空
-RandomDelayFileExtensions="js"
+RandomDelayFileExtensions=""
 
 ## 每小时的第几分钟准点运行任务，当在这些时间运行任务时将忽略 RandomDelay 配置，不会被随机延迟
 ## 默认是第0分钟和第30分钟，例如21:00或21:30分的任务将会准点运行。不需要准点运行赋值为空
-RandomDelayIgnoredMinutes="0 30"
+RandomDelayIgnoredMinutes=""
 
-## 如果你自己会写shell脚本，并且希望在每次运行 ql update 命令时，额外运行你的 shell 脚本，请赋值为 "true"，默认为true
+## 如果你自己会写shell脚本，并且希望在每次容器启动时，额外运行你的 shell 脚本，请赋值为 "true"
-EnableExtraShell="true"
+EnableExtraShell=""
 
 ## 是否自动启动bot，默认不启动，设置为true时自动启动，目前需要自行克隆bot仓库所需代码，存到ql/repo目录下，文件夹命名为dockerbot
 AutoStartBot=""
@@ -42,12 +41,6 @@ AutoStartBot=""
 ## 是否使用第三方bot，默认不使用，使用时填入仓库地址，存到ql/repo目录下，文件夹命名为diybot
 BotRepoUrl=""
 
-## 安装python依赖时指定pip源
-PipMirror="https://pypi.doubanio.com/simple/"
-
-## 安装node依赖时指定npm源
-NpmMirror="https://registry.npmmirror.com"
-
 ## 通知环境变量
 ## 1. Server酱
 ## https://sct.ftqq.com
@@ -63,6 +56,12 @@ export BARK_ICON="https://qn.whyour.cn/logo.png"
 export BARK_SOUND=""
 ## 下方填写推送消息分组，默认为"QingLong"
 export BARK_GROUP="QingLong"
+## bark 推送时效性
+export BARK_LEVEL="active"
+## bark 推送是否存档
+export BARK_ARCHIVE=""
+## bark 推送跳转 URL
+export BARK_URL=""
 
 ## 3. Telegram
 ## 下方填写自己申请@BotFather的Token，如10xxx4:AAFcqxxxxgER5uw
@@ -119,7 +118,18 @@ export PUSH_PLUS_TOKEN=""
 ## 1. 需订阅者扫描二维码 2、如果您是创建群组所属人，也需点击“查看二维码”扫描绑定，否则不能接受群组消息推送
 export PUSH_PLUS_USER=""
 
-## 9. go-cqhttp
+## 9. 微加机器人
+## 官方网站：http://www.weplusbot.com
+## 下方填写您的Token；微信扫描登录后在"我的"->"设置"->"令牌"中获取
+export WE_PLUS_BOT_TOKEN=""
+## 消息接收人；
+## 个人版填写接收消息的群编码，不填发送给自己的微信号
+## 专业版不填默认发给机器人自己，发送给好友填写wxid，发送给微信群填写群编码
+export WE_PLUS_BOT_RECEIVER=""
+## 调用版本；分为专业版和个人版，专业版填写pro，个人版填写personal
+export WE_PLUS_BOT_VERSION="pro"
+
+## 10. go-cqhttp
 ## gobot_url 推送到个人QQ: http://127.0.0.1/send_private_msg  群：http://127.0.0.1/send_group_msg
 ## gobot_token 填写在go-cqhttp文件设置的访问密钥
 ## gobot_qq 如果GOBOT_URL设置 /send_private_msg 则需要填入 user_id=个人QQ 相反如果是 /send_group_msg 则需要填入 group_id=QQ群
@@ -128,7 +138,7 @@ export GOBOT_URL=""
 export GOBOT_TOKEN=""
 export GOBOT_QQ=""
 
-## 10. gotify
+## 11. gotify
 ## gotify_url 填写gotify地址,如https://push.example.de:8080
 ## gotify_token 填写gotify的消息应用token
 ## gotify_priority 填写推送消息优先级,默认为0
@@ -136,17 +146,17 @@ export GOTIFY_URL=""
 export GOTIFY_TOKEN=""
 export GOTIFY_PRIORITY=0
 
-## 11. PushDeer
+## 12. PushDeer
 ## deer_key 填写PushDeer的key
 export DEER_KEY=""
 
-## 12. Chat
+## 13. Chat
 ## chat_url 填写synology chat地址，http://IP:PORT/webapi/***token=
 ## chat_token 填写后面的token
 export CHAT_URL=""
 export CHAT_TOKEN=""
 
-## 13. aibotk
+## 14. aibotk
 ## 官方说明文档：http://wechat.aibotk.com/oapi/oapi?from=ql
 ## aibotk_key (必填)填写智能微秘书个人中心的apikey
 export AIBOTK_KEY=""
@@ -155,12 +165,18 @@ export AIBOTK_TYPE=""
 ## aibotk_name (必填)填写群名或用户昵称，和上面的type类型要对应
 export AIBOTK_NAME=""
 
-## 14. SMTP
+## 15. CHRONOCAT
-## 暂时只支持在 Python 中调用 notify.py 以发送 SMTP 邮件通知
+## CHRONOCAT_URL 推送 http://127.0.0.1:16530
-## smtp_server 填写 SMTP 发送邮件服务器，形如 smtp.exmail.qq.com:465
+## CHRONOCAT_TOKEN 填写在CHRONOCAT文件生成的访问密钥
-export SMTP_SERVER=""
+## CHRONOCAT_QQ 个人:user_id=个人QQ 群则填入group_id=QQ群 多个用英文;隔开同时支持个人和群 如：user_id=xxx;group_id=xxxx;group_id=xxxxx
-## smtp_ssl 填写 SMTP 发送邮件服务器是否使用 SSL，内容应为 true 或 false
+## CHRONOCAT相关API https://chronocat.vercel.app/install/docker/official/
-export SMTP_SSL="false"
+export CHRONOCAT_URL=""
+export CHRONOCAT_QQ=""
+export CHRONOCAT_TOKEN=""
+
+## 16. SMTP
+## 邮箱服务名称，比如126、163、Gmail、QQ等，支持列表 https://github.com/nodemailer/nodemailer/blob/master/lib/well-known/services.json
+export SMTP_SERVICE=""
 ## smtp_email 填写 SMTP 收发件邮箱，通知将会由自己发给自己
 export SMTP_EMAIL=""
 ## smtp_password 填写 SMTP 登录密码，也可能为特殊口令，视具体邮件服务商说明而定
@@ -168,18 +184,34 @@ export SMTP_PASSWORD=""
 ## smtp_name 填写 SMTP 收发件人姓名，可随意填写
 export SMTP_NAME=""
 
-## 15. PushMe
+## 17. PushMe
 ## 官方说明文档：https://push.i-i.me/
 ## PUSHME_KEY (必填)填写PushMe APP上获取的push_key
+## PUSHME_URL (选填)填写自建的PushMeServer消息服务接口地址，例如：http://127.0.0.1:3010，不填则使用官方接口服务
 export PUSHME_KEY=""
+export PUSHME_URL=""
 
-## 13. CHRONOCAT
+## 18. 飞书机器人
-## CHRONOCAT_URL 推送 http://127.0.0.1:16530
+## 官方文档：https://www.feishu.cn/hc/zh-CN/articles/360024984973
-## CHRONOCAT_TOKEN 填写在CHRONOCAT文件生成的访问密钥
+## FSKEY 飞书机器人的 FSKEY
-## CHRONOCAT_QQ 个人:user_id=个人QQ 群则填入group_id=QQ群 多个用英文;隔开同时支持个人和群 如：user_id=xxx;group_id=xxxx;group_id=xxxxx
+export FSKEY=""
-## CHRONOCAT相关API https://chronocat.vercel.app/install/docker/official/
+
-export CHRONOCAT_URL="" 
+## 19. Qmsg酱
-export CHRONOCAT_QQ="" #
+## 官方文档：https://qmsg.zendee.cn/docs/api/
-export CHRONOCAT_TOKEN=""
+## qmsg 酱的 QMSG_KEY
+## qmsg 酱的 QMSG_TYPE send 为私聊，group 为群聊
+export QMSG_KEY=""
+export QMSG_TYPE=""
+
+## 20. 自定义通知
+## 自定义通知 接收回调的URL
+export WEBHOOK_URL=""
+## WEBHOOK_BODY 和 WEBHOOK_HEADERS 多个参数时，直接换行或者使用 $'\n' 连接多行字符串，比如 export dd="line 1"$'\n'"line 2"
+export WEBHOOK_BODY=""
+export WEBHOOK_HEADERS=""
+## 支持 GET/POST/PUT
+export WEBHOOK_METHOD=""
+## 支持 text/plain、application/json、multipart/form-data、application/x-www-form-urlencoded
+export WEBHOOK_CONTENT_TYPE=""
 
 ## 其他需要的变量，脚本中需要的变量使用 export 变量名= 声明即可

sample/notify.py

@@ -33,7 +33,7 @@ def print(text, *args, **kw):
 # 通知服务
 # fmt: off
 push_config = {
-    'HITOKOTO': False,                  # 启用一言（随机句子）
+    'HITOKOTO': True,                  # 启用一言（随机句子）
 
     'BARK_PUSH': '',                    # bark IP 或设备码，例：https://api.day.app/DxHcxxxxxRxxxxxxcm/
     'BARK_ARCHIVE': '',                 # bark 推送是否存档
@@ -43,7 +43,7 @@ push_config = {
     'BARK_LEVEL': '',                   # bark 推送时效性
     'BARK_URL': '',                     # bark 推送跳转URL
 
-    'CONSOLE': True,                    # 控制台输出
+    'CONSOLE': False,                    # 控制台输出
 
     'DD_BOT_SECRET': '',                # 钉钉机器人的 DD_BOT_SECRET
     'DD_BOT_TOKEN': '',                 # 钉钉机器人的 DD_BOT_TOKEN
@@ -75,6 +75,10 @@ push_config = {
     'PUSH_PLUS_TOKEN': '',              # push+ 微信推送的用户令牌
     'PUSH_PLUS_USER': '',               # push+ 微信推送的群组编码
 
+    'WE_PLUS_BOT_TOKEN': '',            # 微加机器人的用户令牌
+    'WE_PLUS_BOT_RECEIVER': '',         # 微加机器人的消息接收者
+    'WE_PLUS_BOT_VERSION': 'pro',          # 微加机器人的调用版本
+
     'QMSG_KEY': '',                     # qmsg 酱的 QMSG_KEY
     'QMSG_TYPE': '',                    # qmsg 酱的 QMSG_TYPE
 
@@ -101,7 +105,8 @@ push_config = {
     'SMTP_PASSWORD': '',                # SMTP 登录密码，也可能为特殊口令，视具体邮件服务商说明而定
     'SMTP_NAME': '',                    # SMTP 收发件人姓名，可随意填写
 
-    'PUSHME_KEY': '',                   # PushMe 酱的 PUSHME_KEY
+    'PUSHME_KEY': '',                   # PushMe 的 PUSHME_KEY
+    'PUSHME_URL': '',                   # PushMe 的 PUSHME_URL
 
     'CHRONOCAT_QQ': '',                 # qq号
     'CHRONOCAT_TOKEN': '',              # CHRONOCAT 的token
@@ -113,10 +118,8 @@ push_config = {
     'WEBHOOK_METHOD': '',               # 自定义通知 请求方法
     'WEBHOOK_CONTENT_TYPE': ''          # 自定义通知 content-type
 }
-notify_function = []
 # fmt: on
 
-# 首先读取 面板变量 或者 github action 运行变量
 for k in push_config:
     if os.getenv(k):
         v = os.getenv(k)
@@ -133,9 +136,9 @@ def bark(title: str, content: str) -> None:
     print("bark 服务启动")
 
     if push_config.get("BARK_PUSH").startswith("http"):
-        url = f'{push_config.get("BARK_PUSH")}/{urllib.parse.quote_plus(title)}/{urllib.parse.quote_plus(content)}'
+        url = f'{push_config.get("BARK_PUSH")}'
     else:
-        url = f'https://api.day.app/{push_config.get("BARK_PUSH")}/{urllib.parse.quote_plus(title)}/{urllib.parse.quote_plus(content)}'
+        url = f'https://api.day.app/{push_config.get("BARK_PUSH")}'
 
     bark_params = {
         "BARK_ARCHIVE": "isArchive",
@@ -145,7 +148,10 @@ def bark(title: str, content: str) -> None:
         "BARK_LEVEL": "level",
         "BARK_URL": "url",
     }
-    params = ""
+    data = {
+        "title": title,
+        "body": content,
+    }
     for pair in filter(
         lambda pairs: pairs[0].startswith("BARK_")
         and pairs[0] != "BARK_PUSH"
@@ -153,10 +159,11 @@ def bark(title: str, content: str) -> None:
         and bark_params.get(pairs[0]),
         push_config.items(),
     ):
-        params += f"{bark_params.get(pair[0])}={pair[1]}&"
+        data[bark_params.get(pair[0])] = pair[1]
-    if params:
+    headers = {"Content-Type": "application/json;charset=utf-8"}
-        url = url + "?" + params.rstrip("&")
+    response = requests.post(
-    response = requests.get(url).json()
+        url=url, data=json.dumps(data), headers=headers, timeout=15
+    ).json()
 
     if response["code"] == 200:
         print("bark 推送成功！")
@@ -214,7 +221,7 @@ def feishu_bot(title: str, content: str) -> None:
     data = {"msg_type": "text", "content": {"text": f"{title}\n\n{content}"}}
     response = requests.post(url, data=json.dumps(data)).json()
 
-    if response.get("StatusCode") == 0:
+    if response.get("StatusCode") == 0 or response.get("code") == 0:
         print("飞书 推送成功！")
     else:
         print("飞书 推送失败！错误信息如下：\n", response)
@@ -382,6 +389,38 @@ def pushplus_bot(title: str, content: str) -> None:
             print("PUSHPLUS 推送失败！")
 
 
+def weplus_bot(title: str, content: str) -> None:
+    """
+    通过 微加机器人 推送消息。
+    """
+    if not push_config.get("WE_PLUS_BOT_TOKEN"):
+        print("微加机器人 服务的 WE_PLUS_BOT_TOKEN 未设置!!\n取消推送")
+        return
+    print("微加机器人 服务启动")
+
+    template = "txt"
+    if len(content) > 800:
+        template = "html"
+
+    url = "https://www.weplusbot.com/send"
+    data = {
+        "token": push_config.get("WE_PLUS_BOT_TOKEN"),
+        "title": title,
+        "content": content,
+        "template": template,
+        "receiver": push_config.get("WE_PLUS_BOT_RECEIVER"),
+        "version": push_config.get("WE_PLUS_BOT_VERSION"),
+    }
+    body = json.dumps(data).encode(encoding="utf-8")
+    headers = {"Content-Type": "application/json"}
+    response = requests.post(url=url, data=body, headers=headers).json()
+
+    if response["code"] == 200:
+        print("微加机器人 推送成功！")
+    else:
+        print("微加机器人 推送失败！")
+
+
 def qmsg_bot(title: str, content: str) -> None:
     """
     使用 qmsg 推送消息。
@@ -534,7 +573,7 @@ def telegram_bot(title: str, content: str) -> None:
     print("tg 服务启动")
 
     if push_config.get("TG_API_HOST"):
-        url = f"https://{push_config.get('TG_API_HOST')}/bot{push_config.get('TG_BOT_TOKEN')}/sendMessage"
+        url = f"{push_config.get('TG_API_HOST')}/bot{push_config.get('TG_BOT_TOKEN')}/sendMessage"
     else:
         url = (
             f"https://api.telegram.org/bot{push_config.get('TG_BOT_TOKEN')}/sendMessage"
@@ -578,7 +617,9 @@ def aibotk(title: str, content: str) -> None:
         or not push_config.get("AIBOTK_TYPE")
         or not push_config.get("AIBOTK_NAME")
     ):
-        print("智能微秘书 的 AIBOTK_KEY 或者 AIBOTK_TYPE 或者 AIBOTK_NAME 未设置!!\n取消推送")
+        print(
+            "智能微秘书 的 AIBOTK_KEY 或者 AIBOTK_TYPE 或者 AIBOTK_NAME 未设置!!\n取消推送"
+        )
         return
     print("智能微秘书 服务启动")
 
@@ -667,10 +708,17 @@ def pushme(title: str, content: str) -> None:
         return
     print("PushMe 服务启动")
 
-    url = f'https://push.i-i.me/?push_key={push_config.get("PUSHME_KEY")}'
+    url = (
+        push_config.get("PUSHME_URL")
+        if push_config.get("PUSHME_URL")
+        else "https://push.i-i.me/"
+    )
     data = {
+        "push_key": push_config.get("PUSHME_KEY"),
         "title": title,
         "content": content,
+        "date": push_config.get("date") if push_config.get("date") else "",
+        "type": push_config.get("type") if push_config.get("type") else "",
     }
     response = requests.post(url, data=data)
 
@@ -748,32 +796,29 @@ def parse_headers(headers):
     return parsed
 
 
-def parse_body(body, content_type):
+def parse_string(input_string, value_format_fn=None):
-    if not body:
+    matches = {}
-        return ""
+    pattern = r"(\w+):\s*((?:(?!\n\w+:).)*)"
-
+    regex = re.compile(pattern)
-    parsed = {}
+    for match in regex.finditer(input_string):
-    lines = body.split("\n")
+        key, value = match.group(1).strip(), match.group(2).strip()
-
-    for line in lines:
-        i = line.find(":")
-        if i == -1:
-            continue
-
-        key = line[:i].strip().lower()
-        val = line[i + 1 :].strip()
-
-        if not key or key in parsed:
-            continue
-
         try:
-            json_value = json.loads(val)
+            value = value_format_fn(value) if value_format_fn else value
-            parsed[key] = json_value
+            json_value = json.loads(value)
+            matches[key] = json_value
         except:
-            parsed[key] = val
+            matches[key] = value
+    return matches
+
+
+def parse_body(body, content_type, value_format_fn=None):
+    if not body or content_type == "text/plain":
+        return value_format_fn(body) if value_format_fn and body else body
+
+    parsed = parse_string(body, value_format_fn)
 
     if content_type == "application/x-www-form-urlencoded":
-        data = urlencode(parsed, doseq=True)
+        data = urllib.parse.urlencode(parsed, doseq=True)
         return data
 
     if content_type == "application/json":
@@ -783,18 +828,6 @@ def parse_body(body, content_type):
     return parsed
 
 
-def format_notify_content(url, body, title, content):
-    if "$title" not in url and "$title" not in body:
-        return {}
-
-    formatted_url = url.replace("$title", urllib.parse.quote_plus(title)).replace(
-        "$content", urllib.parse.quote_plus(content)
-    )
-    formatted_body = body.replace("$title", title).replace("$content", content)
-
-    return formatted_url, formatted_body
-
-
 def custom_notify(title: str, content: str) -> None:
     """
     通过 自定义通知 推送消息。
@@ -811,18 +844,21 @@ def custom_notify(title: str, content: str) -> None:
     WEBHOOK_BODY = push_config.get("WEBHOOK_BODY")
     WEBHOOK_HEADERS = push_config.get("WEBHOOK_HEADERS")
 
-    formatUrl, formatBody = format_notify_content(
+    if "$title" not in WEBHOOK_URL and "$title" not in WEBHOOK_BODY:
-        WEBHOOK_URL, WEBHOOK_BODY, title, content
-    )
-
-    if not formatUrl and not formatBody:
         print("请求头或者请求体中必须包含 $title 和 $content")
         return
 
     headers = parse_headers(WEBHOOK_HEADERS)
-    body = parse_body(formatBody, WEBHOOK_CONTENT_TYPE)
+    body = parse_body(
+        WEBHOOK_BODY,
+        WEBHOOK_CONTENT_TYPE,
+        lambda v: v.replace("$title", title).replace("$content", content),
+    )
+    formatted_url = WEBHOOK_URL.replace(
+        "$title", urllib.parse.quote_plus(title)
+    ).replace("$content", urllib.parse.quote_plus(content))
     response = requests.request(
-        method=WEBHOOK_METHOD, url=formatUrl, headers=headers, timeout=15, data=body
+        method=WEBHOOK_METHOD, url=formatted_url, headers=headers, timeout=15, data=body
     )
 
     if response.status_code == 200:
@@ -841,63 +877,78 @@ def one() -> str:
     return res["hitokoto"] + "    ----" + res["from"]
 
 
-if push_config.get("BARK_PUSH"):
+def add_notify_function():
-    notify_function.append(bark)
+    notify_function = []
-if push_config.get("CONSOLE"):
+    if push_config.get("BARK_PUSH"):
-    notify_function.append(console)
+        notify_function.append(bark)
-if push_config.get("DD_BOT_TOKEN") and push_config.get("DD_BOT_SECRET"):
+    if push_config.get("CONSOLE"):
-    notify_function.append(dingding_bot)
+        notify_function.append(console)
-if push_config.get("FSKEY"):
+    if push_config.get("DD_BOT_TOKEN") and push_config.get("DD_BOT_SECRET"):
-    notify_function.append(feishu_bot)
+        notify_function.append(dingding_bot)
-if push_config.get("GOBOT_URL") and push_config.get("GOBOT_QQ"):
+    if push_config.get("FSKEY"):
-    notify_function.append(go_cqhttp)
+        notify_function.append(feishu_bot)
-if push_config.get("GOTIFY_URL") and push_config.get("GOTIFY_TOKEN"):
+    if push_config.get("GOBOT_URL") and push_config.get("GOBOT_QQ"):
-    notify_function.append(gotify)
+        notify_function.append(go_cqhttp)
-if push_config.get("IGOT_PUSH_KEY"):
+    if push_config.get("GOTIFY_URL") and push_config.get("GOTIFY_TOKEN"):
-    notify_function.append(iGot)
+        notify_function.append(gotify)
-if push_config.get("PUSH_KEY"):
+    if push_config.get("IGOT_PUSH_KEY"):
-    notify_function.append(serverJ)
+        notify_function.append(iGot)
-if push_config.get("DEER_KEY"):
+    if push_config.get("PUSH_KEY"):
-    notify_function.append(pushdeer)
+        notify_function.append(serverJ)
-if push_config.get("CHAT_URL") and push_config.get("CHAT_TOKEN"):
+    if push_config.get("DEER_KEY"):
-    notify_function.append(chat)
+        notify_function.append(pushdeer)
-if push_config.get("PUSH_PLUS_TOKEN"):
+    if push_config.get("CHAT_URL") and push_config.get("CHAT_TOKEN"):
-    notify_function.append(pushplus_bot)
+        notify_function.append(chat)
-if push_config.get("QMSG_KEY") and push_config.get("QMSG_TYPE"):
+    if push_config.get("PUSH_PLUS_TOKEN"):
-    notify_function.append(qmsg_bot)
+        notify_function.append(pushplus_bot)
-if push_config.get("QYWX_AM"):
+    if push_config.get("WE_PLUS_BOT_TOKEN"):
-    notify_function.append(wecom_app)
+        notify_function.append(weplus_bot)
-if push_config.get("QYWX_KEY"):
+    if push_config.get("QMSG_KEY") and push_config.get("QMSG_TYPE"):
-    notify_function.append(wecom_bot)
+        notify_function.append(qmsg_bot)
-if push_config.get("TG_BOT_TOKEN") and push_config.get("TG_USER_ID"):
+    if push_config.get("QYWX_AM"):
-    notify_function.append(telegram_bot)
+        notify_function.append(wecom_app)
-if (
+    if push_config.get("QYWX_KEY"):
-    push_config.get("AIBOTK_KEY")
+        notify_function.append(wecom_bot)
-    and push_config.get("AIBOTK_TYPE")
+    if push_config.get("TG_BOT_TOKEN") and push_config.get("TG_USER_ID"):
-    and push_config.get("AIBOTK_NAME")
+        notify_function.append(telegram_bot)
-):
+    if (
-    notify_function.append(aibotk)
+        push_config.get("AIBOTK_KEY")
-if (
+        and push_config.get("AIBOTK_TYPE")
-    push_config.get("SMTP_SERVER")
+        and push_config.get("AIBOTK_NAME")
-    and push_config.get("SMTP_SSL")
+    ):
-    and push_config.get("SMTP_EMAIL")
+        notify_function.append(aibotk)
-    and push_config.get("SMTP_PASSWORD")
+    if (
-    and push_config.get("SMTP_NAME")
+        push_config.get("SMTP_SERVER")
-):
+        and push_config.get("SMTP_SSL")
-    notify_function.append(smtp)
+        and push_config.get("SMTP_EMAIL")
-if push_config.get("PUSHME_KEY"):
+        and push_config.get("SMTP_PASSWORD")
-    notify_function.append(pushme)
+        and push_config.get("SMTP_NAME")
-if (
+    ):
-    push_config.get("CHRONOCAT_URL")
+        notify_function.append(smtp)
-    and push_config.get("CHRONOCAT_QQ")
+    if push_config.get("PUSHME_KEY"):
-    and push_config.get("CHRONOCAT_TOKEN")
+        notify_function.append(pushme)
-):
+    if (
-    notify_function.append(chronocat)
+        push_config.get("CHRONOCAT_URL")
-if push_config.get("WEBHOOK_URL") and push_config.get("WEBHOOK_METHOD"):
+        and push_config.get("CHRONOCAT_QQ")
-    notify_function.append(custom_notify)
+        and push_config.get("CHRONOCAT_TOKEN")
+    ):
+        notify_function.append(chronocat)
+    if push_config.get("WEBHOOK_URL") and push_config.get("WEBHOOK_METHOD"):
+        notify_function.append(custom_notify)
+
+    if not notify_function:
+        print(f"无推送渠道，请检查通知变量是否正确")
+    return notify_function
 
 
-def send(title: str, content: str) -> None:
+def send(title: str, content: str, ignore_default_config: bool = False, **kwargs):
+    if kwargs:
+        global push_config
+        if ignore_default_config:
+            push_config = kwargs  # 清空从环境变量获取的配置
+        else:
+            push_config.update(kwargs)
+
     if not content:
         print(f"{title} 推送内容为空！")
         return
@@ -910,10 +961,9 @@ def send(title: str, content: str) -> None:
             return
 
     hitokoto = push_config.get("HITOKOTO")
+    content += "\n\n" + one() if hitokoto != "false" else ""
 
-    text = one() if hitokoto else ""
+    notify_function = add_notify_function()
-    content += "\n\n" + text
-
     ts = [
         threading.Thread(target=mode, args=(title, content), name=mode.__name__)
         for mode in notify_function

sample/package.json

@@ -1,12 +0,0 @@
-{
-  "name": "dependence",
-  "author": "",
-  "license": "ISC",
-  "dependencies": {
-    "got": "^11.5.1",
-    "nodemailer": "^6.8.0",
-    "tough-cookie": "^4.0.0",
-    "tunnel": "0.0.6",
-    "ws": "^7.4.3"
-  }
-}

sample/ql_sample.js

@@ -0,0 +1,11 @@
+/**
+ * 任务名称
+ * name: script name
+ * 定时规则
+ * cron: 1 9 * * *
+ */
+const { sendNotify } = require('./sendNotify.js'); // commonjs
+// import { sendNotify } from './sendNotify'; // es6
+
+console.log('test scripts');
+sendNotify('test scripts', 'test desc');

sample/ql_sample.py

@@ -0,0 +1,10 @@
+"""
+任务名称
+name: script name
+定时规则
+cron: 1 9 * * *
+"""
+import notify
+
+print("test script")
+notify.send('test script', 'test desc')

shell/api.sh

@@ -49,7 +49,7 @@ add_cron_api() {
       -H "Origin: http://0.0.0.0:5700" \
       -H "Referer: http://0.0.0.0:5700/crontab" \
       -H "Accept-Language: en-US,en;q=0.9,zh-CN;q=0.8,zh;q=0.7" \
-      --data-raw "{\"name\":\"$name\",\"command\":\"$command\",\"schedule\":\"$schedule\",\"sub_id\":$sub_id}" \
+      --data-raw "{\"name\":\"${name//\"/\\\"}\",\"command\":\"${command//\"/\\\"}\",\"schedule\":\"$schedule\",\"sub_id\":$sub_id}" \
       --compressed
   )
   code=$(echo "$api" | jq -r .code)
@@ -85,7 +85,7 @@ update_cron_api() {
       -H "Origin: http://0.0.0.0:5700" \
       -H "Referer: http://0.0.0.0:5700/crontab" \
       -H "Accept-Language: en-US,en;q=0.9,zh-CN;q=0.8,zh;q=0.7" \
-      --data-raw "{\"name\":\"$name\",\"command\":\"$command\",\"schedule\":\"$schedule\",\"id\":\"$id\"}" \
+      --data-raw "{\"name\":\"${name//\"/\\\"}\",\"command\":\"${command//\"/\\\"}\",\"schedule\":\"$schedule\",\"id\":\"$id\"}" \
       --compressed
   )
   code=$(echo "$api" | jq -r .code)
@@ -117,7 +117,7 @@ update_cron_command_api() {
       -H "Origin: http://0.0.0.0:5700" \
       -H "Referer: http://0.0.0.0:5700/crontab" \
       -H "Accept-Language: en-US,en;q=0.9,zh-CN;q=0.8,zh;q=0.7" \
-      --data-raw "{\"command\":\"$command\",\"id\":\"$id\"}" \
+      --data-raw "{\"command\":\"${command//\"/\\\"}\",\"id\":\"$id\"}" \
       --compressed
   )
   code=$(echo "$api" | jq -r .code)
@@ -196,7 +196,7 @@ notify_api() {
       -H "Origin: http://0.0.0.0:5700" \
       -H "Referer: http://0.0.0.0:5700/crontab" \
       -H "Accept-Language: en-US,en;q=0.9,zh-CN;q=0.8,zh;q=0.7" \
-      --data-raw "{\"title\":\"$title\",\"content\":\"$content\"}" \
+      --data-raw "{\"title\":\"${title//\"/\\\"}\",\"content\":\"${content//\"/\\\"}\"}" \
       --compressed
   )
   code=$(echo "$api" | jq -r .code)

shell/bot.sh

@@ -25,9 +25,6 @@ fi
 echo -e "\nbot文件下载成功...\n"
 
 echo -e "3、安装python3依赖...\n"
-if [[ $PipMirror ]]; then
-  pip3 config set global.index-url $PipMirror
-fi
 cp -f "$repo_path/jbot/requirements.txt" "$dir_data"
 
 cd $dir_data

shell/check.sh

@@ -9,9 +9,6 @@ reset_env() {
   npm_install_2 $dir_root
   echo -e "---> 青龙依赖安装完成\n"
 
-  echo -e "---> 3. 开始安装脚本依赖\n"
-  cp -f $dir_sample/package.json $dir_scripts/package.json
-  npm_install_2 $dir_scripts
   echo -e "---> 脚本依赖安装完成\n"
 }
 
@@ -76,23 +73,15 @@ check_pm2() {
 
 main() {
   echo -e "=====> 开始检测"
-  npm i -g pnpm@8.3.1
+  npm i -g pnpm@8.3.1 pm2 tsx
   patch_version
 
-  if [[ $PipMirror ]]; then
-    pip3 config set global.index-url $PipMirror
-  fi
-  if [[ $NpmMirror ]]; then
-    cd && pnpm config set registry $NpmMirror
-    pnpm install -g
-  fi
-
-  pnpm add -g pm2 tsx
   reset_env
   copy_dep
   check_ql
   check_nginx
   check_pm2
+  reload_update
   reload_pm2
   echo -e "\n=====> 检测结束\n"
 }

shell/env.sh

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+store_env_vars() {
+  initial_vars=($(env | cut -d= -f1))
+}
+
+restore_env_vars() {
+  for key in $(env | cut -d= -f1); do
+    if ! [[ " ${initial_vars[@]} " =~ " $key " ]]; then
+      unset "$key"
+    fi
+  done
+}
+
+store_env_vars

shell/share.sh

@@ -4,6 +4,11 @@
 dir_root=$QL_DIR
 dir_tmp=$dir_root/.tmp
 dir_data=$dir_root/data
+
+if [[ $QL_DATA_DIR ]]; then
+  dir_data="${QL_DATA_DIR%/}"
+fi
+
 dir_shell=$dir_root/shell
 dir_sample=$dir_root/sample
 dir_static=$dir_root/static
@@ -19,7 +24,6 @@ dir_update_log=$dir_log/update
 ql_static_repo=$dir_repo/static
 
 ## 文件
-file_ecosystem_js=$dir_root/ecosystem.config.js
 file_config_sample=$dir_sample/config.sample.sh
 file_env=$dir_config/env.sh
 file_sharecode=$dir_config/sharecode.sh
@@ -34,8 +38,12 @@ file_task_sample=$dir_sample/task.sample.sh
 file_extra_sample=$dir_sample/extra.sample.sh
 file_notify_js_sample=$dir_sample/notify.js
 file_notify_py_sample=$dir_sample/notify.py
+file_test_js_sample=$dir_sample/ql_sample.js
+file_test_py_sample=$dir_sample/ql_sample.py
 file_notify_py=$dir_scripts/notify.py
 file_notify_js=$dir_scripts/sendNotify.js
+file_test_js=$dir_scripts/ql_sample.js
+file_test_py=$dir_scripts/ql_sample.py
 nginx_app_conf=$dir_root/docker/front.conf
 nginx_conf=$dir_root/docker/nginx.conf
 dep_notify_py=$dir_dep/notify.py
@@ -51,11 +59,11 @@ list_own_drop=$dir_list_tmp/own_drop.list
 
 ## 软连接及其原始文件对应关系
 link_name=(
-  task
+  # task
   ql
 )
 original_name=(
-  task.sh
+  # task.sh
   update.sh
 )
 
@@ -66,13 +74,15 @@ init_env() {
 
 import_config() {
   [[ -f $file_config_user ]] && . $file_config_user
-  [[ -f $file_env ]] && . $file_env
+  if [[ $LOAD_ENV != 'false' ]] && [[ -f $file_env ]]; then
+    . $file_env
+  fi
 
   ql_base_url=${QlBaseUrl:-"/"}
   ql_port=${QlPort:-"5700"}
   command_timeout_time=${CommandTimeoutTime:-""}
-  proxy_url=${ProxyUrl:-""}
   file_extensions=${RepoFileExtensions:-"js py"}
+  proxy_url=${ProxyUrl:-""}
   current_branch=${QL_BRANCH}
 
   if [[ -n "${DefaultCronRule}" ]]; then
@@ -126,53 +136,6 @@ gen_random_num() {
   echo $((${RANDOM} % $divi))
 }
 
-link_shell_sub() {
-  local link_path="$1"
-  local original_path="$2"
-  if [[ ! -L $link_path ]] || [[ $(readlink -f $link_path) != $original_path ]]; then
-    rm -f $link_path 2>/dev/null
-    ln -sf $original_path $link_path
-  fi
-}
-
-link_shell() {
-  if [[ $is_termux -eq 1 ]]; then
-    local path="/data/data/com.termux/files/usr/bin/"
-  elif [[ $PATH == */usr/local/bin* ]] && [[ -d /usr/local/bin ]]; then
-    local path="/usr/local/bin/"
-  else
-    local path=""
-    echo -e "脚本功能受限，请自行添加命令的软连接...\n"
-  fi
-  if [[ $path ]]; then
-    for ((i = 0; i < ${#link_name[*]}; i++)); do
-      link_shell_sub "$path${link_name[i]}" "$dir_shell/${original_name[i]}"
-    done
-  fi
-}
-
-define_cmd() {
-  local cmd_prefix cmd_suffix
-  if type task &>/dev/null; then
-    cmd_suffix=""
-    if [[ -f "$dir_shell/task.sh" ]]; then
-      cmd_prefix=""
-    else
-      cmd_prefix="bash "
-    fi
-  else
-    cmd_suffix=".sh"
-    if [[ -f "$dir_shell/task.sh" ]]; then
-      cmd_prefix="$dir_shell/"
-    else
-      cmd_prefix="bash $dir_shell/"
-    fi
-  fi
-  for ((i = 0; i < ${#link_name[*]}; i++)); do
-    export cmd_${link_name[i]}="${cmd_prefix}${link_name[i]}${cmd_suffix}"
-  done
-}
-
 fix_config() {
   make_dir $dir_tmp
   make_dir $dir_static
@@ -235,6 +198,16 @@ fix_config() {
     echo
   fi
 
+  if [[ ! -s $file_test_js ]]; then
+    cp -fv $file_test_js_sample $file_test_js
+    echo
+  fi
+
+  if [[ ! -s $file_test_py ]]; then
+    cp -fv $file_test_py_sample $file_test_py
+    echo
+  fi
+
   if [[ -s /etc/nginx/conf.d/default.conf ]]; then
     echo -e "检测到默认nginx配置文件，清空...\n"
     cat /dev/null >/etc/nginx/conf.d/default.conf
@@ -294,7 +267,7 @@ git_clone_scripts() {
 
   set_proxy "$proxy"
 
-  git clone --depth=1 $part_cmd $url $dir 2>&1
+  git clone -q --depth=1 $part_cmd $url $dir
   exit_status=$?
 
   unset_proxy
@@ -306,10 +279,23 @@ 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
   pm2 flush &>/dev/null
-  env ALL_PROXY= HTTP_PROXY= HTTPS_PROXY= all_proxy= http_proxy= https_proxy= pm2 startOrGracefulReload $file_ecosystem_js --update-env
+  pm2 startOrGracefulReload ecosystem.config.js
+}
+
+reload_update() {
+  cd $dir_root
+  restore_env_vars
+  pm2 flush &>/dev/null
+  pm2 startOrGracefulReload other.config.js
 }
 
 diff_time() {
@@ -361,8 +347,6 @@ format_timestamp() {
 patch_version() {
   git config --global pull.rebase false
 
-  cp -f $dir_root/.env.example $dir_root/.env
-
   if [[ -f "$dir_root/db/cookie.db" ]]; then
     echo -e "检测到旧的db文件，拷贝为新db...\n"
     mv $dir_root/db/cookie.db $dir_root/db/env.db
@@ -372,25 +356,25 @@ patch_version() {
 
   if [[ -d "$dir_root/db" ]]; then
     echo -e "检测到旧的db目录，拷贝到data目录...\n"
-    cp -rf $dir_root/config $dir_root/data
+    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_root/data
+    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_root/data
+    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_root/data
+    cp -rf $dir_root/config $dir_data
     echo
   fi
 }
@@ -475,6 +459,5 @@ handle_task_end() {
 init_env
 detect_termux
 detect_macos
-define_cmd
 
 import_config $1

shell/update.sh

@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
 dir_shell=$QL_DIR/shell
+. $dir_shell/env.sh
 . $dir_shell/share.sh
 . $dir_shell/api.sh
 
@@ -33,7 +34,6 @@ output_list_add_drop() {
   if [[ -s $list ]]; then
     echo -e "检测到有${type}的定时任务:"
     cat $list
-    echo
   fi
 }
 
@@ -44,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
@@ -75,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
@@ -85,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"
@@ -134,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
 }
 
@@ -155,21 +156,15 @@ update_raw() {
     autoDelCron=${AutoDelCron}
   fi
 
-  local proxyStr=""
-  if [[ $proxy ]]; then
-    if [[ $url == http:* ]]; then
-      proxyStr="-e \"http_proxy=${proxy}\""
-    elif [[ $url == https:* ]]; then
-      proxyStr="-e \"http_proxy=${proxy};https_proxy=${proxy}\""
-    fi
-  fi
-
   local raw_url="$url"
   local suffix="${raw_url##*.}"
   local raw_file_name="${uniq_path}.${suffix}"
   echo -e "开始下载：${raw_url} \n\n保存路径：$dir_raw/${raw_file_name}\n"
 
-  wget -q --no-check-certificate $proxyStr -O "$dir_raw/${raw_file_name}.new" ${raw_url}
+  set_proxy "$proxy"
+  wget -q --no-check-certificate -O "$dir_raw/${raw_file_name}.new" ${raw_url}
+  exit_status=$?
+  unset_proxy
 
   if [[ $? -eq 0 ]]; then
     mv "$dir_raw/${raw_file_name}.new" "$dir_raw/${raw_file_name}"
@@ -194,7 +189,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"
@@ -230,33 +225,37 @@ usage() {
 }
 
 reload_qinglong() {
+  delete_pm2
+
   local reload_target="${1}"
   local primary_branch="master"
-  if [[ "${QL_BRANCH}" == "develop" ]]; then
+  if [[ "${QL_BRANCH}" == "develop" ]] || [[ "${QL_BRANCH}" == "debian" ]] || [[ "${QL_BRANCH}" == "debian-dev" ]]; then
-    primary_branch="develop"
+    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
-    cp -rf ${dir_tmp}/data ${dir_root}/
+    rm -rf ${dir_data}/*
+    mv -f ${dir_tmp}/data/* ${dir_data}/
   fi
 
   reload_pm2
 }
 
-## 更新qinglong
+## 更新 qinglong
 update_qinglong() {
   rm -rf ${dir_tmp}/*
   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"
@@ -265,8 +264,8 @@ update_qinglong() {
   echo -e "使用 ${mirror} 源更新...\n"
 
   local primary_branch="master"
-  if [[ "${QL_BRANCH}" == "develop" ]]; then
+  if [[ "${QL_BRANCH}" == "develop" ]] || [[ "${QL_BRANCH}" == "debian" ]] || [[ "${QL_BRANCH}" == "debian-dev" ]]; then
-    primary_branch="develop"
+    primary_branch="${QL_BRANCH}"
   fi
 
   wget -cqO "${dir_tmp}/ql.zip" "${downloadQLUrl}/${primary_branch}.zip"
@@ -299,11 +298,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
@@ -313,9 +307,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
@@ -420,9 +417,15 @@ gen_list_repo() {
   fi
 
   for file in ${files}; do
+    dirPath=$(dirname "$file")
     filename=$(basename "$file")
-    cp -f $file "$dir_scripts/${uniq_path}/${filename}"
+    filePath="${uniq_path}/${filename}"
-    echo "${uniq_path}/${filename}" >>"$dir_list_tmp/${uniq_path}_scripts.list"
+    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")
@@ -475,8 +478,13 @@ main() {
   local log_path="${log_dir}/${log_time}.log"
   local file_path="$dir_log/$log_path"
 
-  cmd=">> $file_path 2>&1"
+  cmd="2>&1 | tee -a $file_path"
-  [[ "$show_log" == "true" ]] && cmd=""
+  if [[ "$no_tee" == "true" ]]; then
+    cmd=">> $file_path 2>&1"
+  fi
+  if [[ "$real_time" == "true" ]]; then
+    cmd=""
+  fi
 
   local time_format="%Y-%m-%d %H:%M:%S"
   local time=$(date "+$time_format")
@@ -489,11 +497,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
@@ -518,7 +521,7 @@ main() {
   raw)
     get_uniq_path "$p2"
     if [[ -n $p2 ]]; then
-      update_raw "$p2" "$p3" "$p4"
+      update_raw "$p2" "$p3" "$p4" "$p5"
     else
       eval echo -e "命令输入错误...\\\n" $cmd
       eval usage $cmd
@@ -558,10 +561,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 "$@"

src/components/iconfont.tsx

@@ -1,7 +1,7 @@
 import { createFromIconfontCN } from '@ant-design/icons';
 
 const IconFont = createFromIconfontCN({
-  scriptUrl: ['//at.alicdn.com/t/c/font_3354854_ob5y15ewlyq.js'],
+  scriptUrl: ['//at.alicdn.com/t/c/font_3354854_lc939gab1iq.js'],
 });
 
 export default IconFont;

src/locales/en-US.json

@@ -100,12 +100,14 @@
   "删除中": "Deleting",
   "已删除": "Deleted",
   "删除失败": "Deletion Failed",
+  "已取消": "Cancelled",
   "序号": "Number",
   "备注": "Remarks",
   "更新时间": "Update Time",
   "创建时间": "Creation Time",
   "确认删除依赖": "Confirm to delete the dependency",
   "确认重新安装": "Confirm to reinstall",
+  "确认取消安装": "Confirm to cancel install",
   "确认删除选中的依赖吗": "Confirm to delete the selected dependencies?",
   "确认重新安装选中的依赖吗": "Confirm to reinstall the selected dependencies?",
   "请输入名称": "Please enter a name",
@@ -141,7 +143,7 @@
   "服务启动超时": "Service startup timeout",
   "请先按如下方式修复：": "Please fix it as follows:",
   "1. 宿主机执行 docker run --rm -v\n                  /var/run/docker.sock:/var/run/docker.sock\n                  containrrr/watchtower -cR <容器名>": "1. Execute 'docker run --rm -v /var/run/docker.sock:/var/run/docker.sock containrrr/watchtower -cR <container_name>' on the host machine",
-  "2. 容器内执行 ql -l check、ql -l update": "2. Execute 'ql -l check' and 'ql -l update' inside the container",
+  "2. 容器内执行 ql check、ql update": "2. Execute 'ql check' and 'ql update' inside the container",
   "3. 如果无法解决，容器内执行 pm2 logs，拷贝执行结果": "3. If the problem persists, execute 'pm2 logs' inside the container and copy the results",
   "提交 issue": "Submit an issue",
   "启动中，请稍后...": "Starting, please wait...",
@@ -237,6 +239,7 @@
   "系统将在": "The system will restart in",
   "秒后自动刷新": "seconds and automatically refresh",
   "检查更新": "Check for Updates",
+  "重新启动": "Reboot",
   "确认删除应用": "Confirm to delete the application",
   "确认重置": "Confirm to reset",
   "确认重置应用": "Confirm to reset the application",
@@ -333,6 +336,7 @@
   "企业微信应用": "WeChat Work App",
   "智能微秘书": "Smart WeChat Assistant",
   "群晖chat": "Synology Chat",
+  "微加机器人": "WePlusBot",
   "邮箱": "Email",
   "飞书机器人": "Feishu Bot",
   "自定义通知": "Custom Notification",
@@ -354,6 +358,7 @@
   "BARK推送消息的分组，默认为qinglong": "BARK push message grouping, default is qinglong",
   "BARK推送消息的时效性，默认为active": "BARK push message redirecting URL",
   "BARK推送消息的跳转URL": "BARK push message grouping, default is qinglong",
+  "BARK是否保存推送消息": "Does BARK save push messages",
   "telegram机器人的token，例如：1077xxx4424:AAFjv0FcqxxxxxxgEMGfi22B4yh15R5uw": "Telegram Bot token, e.g., 1077xxx4424:AAFjv0FcqxxxxxxgEMGfi22B4yh15R5uw",
   "telegram用户的id，例如：129xxx206": "Telegram user ID, e.g., 129xxx206",
   "代理IP": "Proxy IP",
@@ -374,11 +379,15 @@
   "iGot的信息推送key，例如：https://push.hellyw.com/XXXXXXXX": "iGot information push key, e.g., https://push.hellyw.com/XXXXXXXX",
   "微信扫码登录后一对一推送或一对多推送下面的token(您的Token)，不提供PUSH_PLUS_USER则默认为一对一推送，参考 https://www.pushplus.plus/": "After WeChat scan login, one-to-one or one-to-many push using the provided token (your Token). If PUSH_PLUS_USER is not provided, it defaults to one-to-one push. See reference at https://www.pushplus.plus/",
   "一对多推送的“群组编码”（一对多推送下面->您的群组(如无则创建)->群组编码，如果您是创建群组人。也需点击“查看二维码”扫描绑定，否则不能接受群组消息推送）": "The 'group code' for one-to-many push (one-to-many push -> your group (if none, create one) -> group code). If you are the creator of the group, you need to click 'View QR code' to scan and bind, otherwise, you won't receive group messages.",
+  "用户令牌，扫描登录后 我的—>设置->令牌 中获取，参考 https://www.weplusbot.com/": "Token, which can be obtained after scanning and logging in, is available under 'My Account' -> 'Settings' -> 'Tokens'. Please refer to the instructions for detailed steps: https://www.weplusbot.com/",
+  "消息接收人": "message recipient",
+  "调用版本；专业版填写pro，个人版填写personal，为空默认使用专业版": "Version, you can specify 'pro' for the Professional version and 'personal' for the Personal version. If left blank, it will default to the Professional version.",
   "飞书群组机器人：https://www.feishu.cn/hc/zh-CN/articles/360024984973": "Feishu group bot: https://www.feishu.cn/hc/zh-CN/articles/360024984973",
-  "邮箱服务名称，比如126、163、Gmail、QQ等，支持列表https://nodemailer.com/smtp/well-known/": "Email service name, e.g., 126, 163, Gmail, QQ, etc. Supported list: https://nodemailer.com/smtp/well-known/",
+  "邮箱服务名称，比如126、163、Gmail、QQ等，支持列表https://github.com/nodemailer/nodemailer/blob/master/lib/well-known/services.json": "Email service name, e.g., 126, 163, Gmail, QQ, etc. Supported list: https://github.com/nodemailer/nodemailer/blob/master/lib/well-known/services.json",
   "邮箱地址": "Email Address",
-  "邮箱SMTP授权码": "Email SMTP Authorization Code",
+  "SMTP 登录密码，也可能为特殊口令，视具体邮件服务商说明而定": "The SMTP login password may also be a special passphrase, depending on the specific email service provider's instructions",
   "PushMe的Key，https://push.i-i.me/": "PushMe key, https://push.i-i.me/",
+  "自建的PushMeServer消息接口地址，例如：http://127.0.0.1:3010，不填则使用官方消息接口": "The self built PushMeServer message interface address, for example: http://127.0.0.1:3010 If left blank, use the official message interface",
   "请求方法": "Request Method",
   "请求头Content-Type": "Request Header Content-Type",
   "请求链接以http或者https开头。url或者body中必须包含$title，$content可选，对应api内容的位置": "Request URL should start with http or https. URL or body must contain $title, $content is optional and corresponds to the API content position.",
@@ -393,6 +402,7 @@
   "系统": "System",
   "个人": "Personal",
   "重新安装": "Reinstall",
+  "取消安装": "Cancel Install",
   "强制删除": "Force Delete",
   "全部任务": "All Tasks",
   "关联订阅": "Associate Subscription",
@@ -422,7 +432,7 @@
   "创建变量成功": "Variable created successfully",
   "编辑变量": "Edit Variable",
   "加载中...": "Loading...",
-  "夹下所以日志": "Folder and All Subfiles",
+  "夹下所有日志": "Folder and All Subfiles",
   "创建文件夹成功": "Folder created successfully",
   "创建文件成功": "File created successfully",
   "夹及其子文件": "Folder and Its Subfiles",
@@ -466,5 +476,15 @@
   "个人:user_id=个人QQ 群则填入group_id=QQ群 多个用英文;隔开同时支持个人和群 如：user_id=xxx;group_id=xxxx;group_id=xxxxx": "Individuals: user_id=individual QQ Groups fill in group_id=QQ Groups more than one with English; separated by the same time to support individuals and groups such as: user_id=xxx;group_id=xxxx;group_id=xxxxx",
   "docker安装在持久化config目录下的chronocat.yml文件可找到": "The docker installation can be found in the persistence config directory in the chronocat.yml file",
   "请选择": "Please select",
-  "请输入": "Please input"
+  "请输入": "Please input",
+  "依赖设置": "Dependence Settings",
+  "Node 软件包镜像源": "Node Software Package Mirror Source",
+  "Python 软件包镜像源": "Python Software Package Mirror Source",
+  "Linux 软件包镜像源": "Linux Software Package Mirror Source",
+  "代理与镜像源二选一即可": "Either Proxy or Mirror Source can be chosen",
+  "代理地址, 支持HTTP(S)/SOCK5": "Proxy Address, supports HTTP(S)/SOCK5",
+  "NPM 镜像源": "NPM Mirror Source",
+  "PyPI 镜像源": "PyPI Mirror Source",
+  "alpine linux 镜像源": "Alpine Linux Mirror Source",
+  "如果恢复失败，可进入容器执行": "If recovery fails, you can enter the container and execute"
 }

src/locales/zh-CN.json

@@ -100,12 +100,14 @@
   "删除中": "删除中",
   "已删除": "已删除",
   "删除失败": "删除失败",
+  "已取消": "已取消",
   "序号": "序号",
   "备注": "备注",
   "更新时间": "更新时间",
   "创建时间": "创建时间",
   "确认删除依赖": "确认删除依赖",
   "确认重新安装": "确认重新安装",
+  "确认取消安装": "确认取消安装",
   "确认删除选中的依赖吗": "确认删除选中的依赖吗",
   "确认重新安装选中的依赖吗": "确认重新安装选中的依赖吗",
   "请输入名称": "请输入名称",
@@ -141,7 +143,7 @@
   "服务启动超时": "服务启动超时",
   "请先按如下方式修复：": "请先按如下方式修复：",
   "1. 宿主机执行 docker run --rm -v\n                  /var/run/docker.sock:/var/run/docker.sock\n                  containrrr/watchtower -cR <容器名>": "1. 宿主机执行 docker run --rm -v\n                  /var/run/docker.sock:/var/run/docker.sock\n                  containrrr/watchtower -cR <容器名>",
-  "2. 容器内执行 ql -l check、ql -l update": "2. 容器内执行 ql -l check、ql -l update",
+  "2. 容器内执行 ql check、ql update": "2. 容器内执行 ql check、ql update",
   "3. 如果无法解决，容器内执行 pm2 logs，拷贝执行结果": "3. 如果无法解决，容器内执行 pm2 logs，拷贝执行结果",
   "提交 issue": "提交 issue",
   "启动中，请稍后...": "启动中，请稍后...",
@@ -237,6 +239,7 @@
   "系统将在": "系统将在",
   "秒后自动刷新": "秒后自动刷新",
   "检查更新": "检查更新",
+  "重新启动": "重新启动",
   "确认删除应用": "确认删除应用",
   "确认重置": "确认重置",
   "确认重置应用": "确认重置应用",
@@ -333,6 +336,7 @@
   "企业微信应用": "企业微信应用",
   "智能微秘书": "智能微秘书",
   "群晖chat": "群晖chat",
+  "微加机器人": "微加机器人",
   "邮箱": "邮箱",
   "飞书机器人": "飞书机器人",
   "自定义通知": "自定义通知",
@@ -354,6 +358,7 @@
   "BARK推送消息的分组，默认为qinglong": "BARK推送消息的分组，默认为qinglong",
   "BARK推送消息的时效性，默认为active": "BARK推送消息的时效性，默认为active",
   "BARK推送消息的跳转URL": "BARK推送消息的跳转URL",
+  "BARK是否保存推送消息": "BARK是否保存推送消息",
   "telegram机器人的token，例如：1077xxx4424:AAFjv0FcqxxxxxxgEMGfi22B4yh15R5uw": "telegram机器人的token，例如：1077xxx4424:AAFjv0FcqxxxxxxgEMGfi22B4yh15R5uw",
   "telegram用户的id，例如：129xxx206": "telegram用户的id，例如：129xxx206",
   "代理IP": "代理IP",
@@ -374,11 +379,15 @@
   "iGot的信息推送key，例如：https://push.hellyw.com/XXXXXXXX": "iGot的信息推送key，例如：https://push.hellyw.com/XXXXXXXX",
   "微信扫码登录后一对一推送或一对多推送下面的token(您的Token)，不提供PUSH_PLUS_USER则默认为一对一推送，参考 https://www.pushplus.plus/": "微信扫码登录后一对一推送或一对多推送下面的token(您的Token)，不提供PUSH_PLUS_USER则默认为一对一推送，参考 https://www.pushplus.plus/",
   "一对多推送的“群组编码”（一对多推送下面->您的群组(如无则创建)->群组编码，如果您是创建群组人。也需点击“查看二维码”扫描绑定，否则不能接受群组消息推送）": "一对多推送的“群组编码”（一对多推送下面->您的群组(如无则创建)->群组编码，如果您是创建群组人。也需点击“查看二维码”扫描绑定，否则不能接受群组消息推送）",
+  "用户令牌，扫描登录后 我的—>设置->令牌 中获取，参考 https://www.weplusbot.com/": "用户令牌，扫描登录后 我的—>设置->令牌 中获取，参考 https://www.weplusbot.com/",
+  "消息接收人": "消息接收人",
+  "调用版本；专业版填写pro，个人版填写personal，为空默认使用专业版": "调用版本；专业版填写pro，个人版填写personal，为空默认使用专业版",
   "飞书群组机器人：https://www.feishu.cn/hc/zh-CN/articles/360024984973": "飞书群组机器人：https://www.feishu.cn/hc/zh-CN/articles/360024984973",
-  "邮箱服务名称，比如126、163、Gmail、QQ等，支持列表https://nodemailer.com/smtp/well-known/": "邮箱服务名称，比如126、163、Gmail、QQ等，支持列表https://nodemailer.com/smtp/well-known/",
+  "邮箱服务名称，比如126、163、Gmail、QQ等，支持列表https://github.com/nodemailer/nodemailer/blob/master/lib/well-known/services.json": "邮箱服务名称，比如126、163、Gmail、QQ等，支持列表https://github.com/nodemailer/nodemailer/blob/master/lib/well-known/services.json",
   "邮箱地址": "邮箱地址",
-  "邮箱SMTP授权码": "邮箱SMTP授权码",
+  "SMTP 登录密码，也可能为特殊口令，视具体邮件服务商说明而定": "SMTP 登录密码，也可能为特殊口令，视具体邮件服务商说明而定",
   "PushMe的Key，https://push.i-i.me/": "PushMe的Key，https://push.i-i.me/",
+  "自建的PushMeServer消息接口地址，例如：http://127.0.0.1:3010，不填则使用官方消息接口": "自建的PushMeServer消息接口地址，例如：http://127.0.0.1:3010，不填则使用官方消息接口",
   "请求方法": "请求方法",
   "请求头Content-Type": "请求头Content-Type",
   "请求链接以http或者https开头。url或者body中必须包含$title，$content可选，对应api内容的位置": "请求链接以http或者https开头。url或者body中必须包含$title，$content可选，对应api内容的位置",
@@ -393,6 +402,7 @@
   "系统": "系统",
   "个人": "个人",
   "重新安装": "重新安装",
+  "取消安装": "取消安装",
   "强制删除": "强制删除",
   "全部任务": "全部任务",
   "关联订阅": "关联订阅",
@@ -422,7 +432,7 @@
   "创建变量成功": "创建变量成功",
   "编辑变量": "编辑变量",
   "加载中...": "加载中...",
-  "夹下所以日志": "夹下所以日志",
+  "夹下所有日志": "夹下所有日志",
   "创建文件夹成功": "创建文件夹成功",
   "创建文件成功": "创建文件成功",
   "夹及其子文件": "夹及其子文件",
@@ -466,5 +476,15 @@
   "个人:user_id=个人QQ 群则填入group_id=QQ群 多个用英文;隔开同时支持个人和群 如：user_id=xxx;group_id=xxxx;group_id=xxxxx": "个人:user_id=个人QQ 群则填入group_id=QQ群 多个用英文;隔开同时支持个人和群 如：user_id=xxx;group_id=xxxx;group_id=xxxxx",
   "docker安装在持久化config目录下的chronocat.yml文件可找到": "docker安装在持久化config目录下的chronocat.yml文件可找到",
   "请选择": "请选择",
-  "请输入": "请输入"
+  "请输入": "请输入",
+  "依赖设置": "依赖设置",
+  "Node 软件包镜像源": "Node 软件包镜像源",
+  "Python 软件包镜像源": "Python 软件包镜像源",
+  "Linux 软件包镜像源": "Linux 软件包镜像源",
+  "代理与镜像源二选一即可": "代理与镜像源二选一即可",
+  "代理地址, 支持HTTP(S)/SOCK5": "代理地址, 支持HTTP(S)/SOCK5",
+  "NPM 镜像源": "NPM 镜像源",
+  "PyPI 镜像源": "PyPI 镜像源",
+  "alpine linux 镜像源": "alpine linux 镜像源",
+  "如果恢复失败，可进入容器执行": "如果恢复失败，可进入容器执行"
 }

src/pages/config/index.tsx

@@ -1,4 +1,4 @@
-import intl from 'react-intl-universal'
+import intl from 'react-intl-universal';
 import React, {
   PureComponent,
   Fragment,
@@ -15,6 +15,8 @@ import CodeMirror from '@uiw/react-codemirror';
 import { useOutletContext } from '@umijs/max';
 import { SharedContext } from '@/layouts';
 import { langs } from '@uiw/codemirror-extensions-langs';
+import { useHotkeys } from 'react-hotkeys-hook';
+import { getEditorMode } from '@/utils';
 
 const Config = () => {
   const { headerStyle, isPhone, theme } = useOutletContext<SharedContext>();
@@ -25,13 +27,16 @@ const Config = () => {
   const [data, setData] = useState<any[]>([]);
   const editorRef = useRef<any>(null);
   const [confirmLoading, setConfirmLoading] = useState(false);
+  const [language, setLanguage] = useState<string>('shell');
 
   const getConfig = (name: string) => {
-    request.get(`${config.apiPrefix}configs/${name}`).then(({ code, data }) => {
+    request
-      if (code === 200) {
+      .get(`${config.apiPrefix}configs/detail?path=${encodeURIComponent(name)}`)
-        setValue(data);
+      .then(({ code, data }) => {
-      }
+        if (code === 200) {
-    });
+          setValue(data);
+        }
+      });
   };
 
   const getFiles = () => {
@@ -66,8 +71,18 @@ const Config = () => {
     setSelect(value);
     setTitle(node.value);
     getConfig(node.value);
+    const newMode = getEditorMode(value);
+    setLanguage(newMode);
   };
 
+  useHotkeys(
+    'mod+s',
+    (e) => {
+      updateConfig();
+    },
+    { enableOnFormTags: ['textarea'], preventDefault: true },
+  );
+
   useEffect(() => {
     getFiles();
     getConfig('config.sh');
@@ -113,7 +128,7 @@ const Config = () => {
         />
       ) : (
         <Editor
-          defaultLanguage="shell"
+          language={language}
           value={value}
           theme={theme}
           options={{
@@ -121,6 +136,7 @@ const Config = () => {
             lineNumbersMinChars: 3,
             folding: false,
             glyphMargin: false,
+            accessibilitySupport: 'off'
           }}
           onMount={(editor) => {
             editorRef.current = editor;

src/pages/crontab/detail.tsx

@@ -107,10 +107,10 @@ const CronDetailModal = ({
         value={value}
         options={{
           fontSize: 12,
+          minimap: { enabled: false },
           lineNumbersMinChars: 3,
-          fontFamily: 'Source Code Pro',
           glyphMargin: false,
-          wordWrap: 'on',
+          accessibilitySupport: 'off',
         }}
         onMount={(editor, monaco) => {
           editorRef.current = editor;
@@ -120,21 +120,17 @@ const CronDetailModal = ({
   };
 
   const onClickItem = (item: LogItem) => {
-    const url = `${config.apiPrefix}logs/${item.filename}?path=${
+    const url = `${config.apiPrefix}logs/detail?file=${item.filename}&path=${
       item.directory || ''
     }`;
     localStorage.setItem('logCron', url);
     setLogUrl(url);
-    request
+    request.get(url).then(({ code, data }) => {
-      .get(
+      if (code === 200) {
-        `${config.apiPrefix}logs/${item.filename}?path=${item.directory || ''}`,
+        setLog(data);
-      )
+        setIsLogModalVisible(true);
-      .then(({ code, data }) => {
+      }
-        if (code === 200) {
+    });
-          setLog(data);
-          setIsLogModalVisible(true);
-        }
-      });
   };
 
   const onTabChange = (key: string) => {
@@ -160,14 +156,15 @@ const CronDetailModal = ({
       const [s, p] = result;
       setScriptInfo({ parent: p, filename: s });
       request
-        .get(`${config.apiPrefix}scripts/${s}?path=${p || ''}`)
+        .get(`${config.apiPrefix}scripts/detail?file=${s}&path=${p || ''}`)
         .then(({ code, data }) => {
           if (code === 200) {
             setValue(data);
           }
         });
-    } else if (result) {
+    } else {
       setValidTabs([validTabs[0]]);
+      setActiveTabKey('log');
     }
   };
 
@@ -178,8 +175,9 @@ const CronDetailModal = ({
         <>
           {intl.get('确认保存文件')}
           <Text style={{ wordBreak: 'break-all' }} type="warning">
+            {' '}
             {scriptInfo.filename}
-          </Text>{' '}
+          </Text>
           {intl.get('，保存后不可恢复')}
         </>
       ),
@@ -362,8 +360,18 @@ const CronDetailModal = ({
     <Modal
       title={
         <div className="crontab-title-wrapper">
-          <div>
+          <div style={{ minWidth: 0, display: 'flex', alignItems: 'center' }}>
-            <span>{currentCron.name}</span>
+            <Typography.Text
+              style={{ width: 200, boxSizing: 'content-box' }}
+              ellipsis={{
+                onEllipsis(ellipsis) {
+                  return ellipsis;
+                },
+                tooltip: currentCron.name,
+              }}
+            >
+              {currentCron.name}
+            </Typography.Text>
             {currentCron.labels?.length > 0 && currentCron.labels[0] !== '' && (
               <Divider type="vertical"></Divider>
             )}

src/pages/crontab/index.less

@@ -6,9 +6,9 @@
   .card-wrapper {
     .ant-card:last-child {
       .ant-card-body {
-        min-height: 300px;
+        min-height: 0;
-        height: calc(90vh - 367px);
+        height: calc(80vh - 314px);
-        height: calc(90vh - var(--vh-offset, 0px) - 367px);
+        height: calc(80vh - var(--vh-offset, 0px) - 314px);
         overflow-y: auto;
 
         > div {
@@ -21,6 +21,9 @@
   .ant-modal-body {
     background: #eee;
     padding: 12px;
+    max-height: calc(80vh - 57px);
+    max-height: calc(80vh - var(--vh-offset, 57px));
+    word-wrap: unset;
   }
 
   .ant-card-body {
@@ -78,6 +81,7 @@
     display: flex;
     align-items: center;
     justify-content: space-between;
+    gap: 24px;
 
     .operations {
       display: flex;

src/pages/crontab/index.tsx

@@ -57,6 +57,7 @@ import { useVT } from 'virtualizedtableforantd4';
 import { ICrontab, OperationName, OperationPath, CrontabStatus } from './type';
 import Name from '@/components/name';
 import dayjs from 'dayjs';
+import { noop } from 'lodash';
 
 const { Text, Paragraph, Link } = Typography;
 const { Search } = Input;
@@ -75,18 +76,16 @@ const Crontab = () => {
           style={{
             wordBreak: 'break-all',
             marginBottom: 0,
-            color: '#1890ff'
+            color: '#1890ff',
+            cursor: 'pointer',
           }}
           ellipsis={{ tooltip: text, rows: 2 }}
+          onClick={() => {
+            setDetailCron(record);
+            setIsDetailModalVisible(true);
+          }}
         >
-          <Link
+          <Link>{record.name || '-'}</Link>
-            onClick={() => {
-              setDetailCron(record);
-              setIsDetailModalVisible(true);
-            }}
-          >
-            {record.name || '-'}
-          </Link>
         </Paragraph>
       ),
       sorter: {
@@ -272,9 +271,14 @@ const Crontab = () => {
         record.sub_id ? (
           <Name
             service={() =>
-              request.get(`${config.apiPrefix}subscriptions/${record.sub_id}`)
+              request.get(`${config.apiPrefix}subscriptions/${record.sub_id}`, {
+                onError: noop,
+              })
             }
-            options={{ ready: record?.sub_id, cacheKey: record.sub_id }}
+            options={{
+              ready: record?.sub_id,
+              cacheKey: record.sub_id,
+            }}
           />
         ) : (
           '-'

src/pages/dependence/index.tsx

@@ -22,6 +22,7 @@ import {
   FileTextOutlined,
   CloseCircleOutlined,
   ClockCircleOutlined,
+  MinusCircleOutlined,
 } from '@ant-design/icons';
 import config from '@/utils/config';
 import { PageContainer } from '@ant-design/pro-layout';
@@ -36,20 +37,12 @@ import { SharedContext } from '@/layouts';
 import useTableScrollHeight from '@/hooks/useTableScrollHeight';
 import dayjs from 'dayjs';
 import WebSocketManager from '@/utils/websocket';
+import { DependenceStatus, Status } from './type';
+import IconFont from '@/components/iconfont';
 
 const { Text } = Typography;
 const { Search } = Input;
 
-enum Status {
-  '安装中',
-  '已安装',
-  '安装失败',
-  '删除中',
-  '已删除',
-  '删除失败',
-  '队列中',
-}
-
 enum StatusColor {
   'processing',
   'success',
@@ -85,6 +78,10 @@ const StatusMap: Record<number, { icon: React.ReactNode; color: string }> = {
     icon: <ClockCircleOutlined />,
     color: 'default',
   },
+  7: {
+    icon: <MinusCircleOutlined />,
+    color: 'default',
+  },
 };
 
 const Dependence = () => {
@@ -108,8 +105,41 @@ const Dependence = () => {
       key: 'status',
       width: 120,
       dataIndex: 'status',
+      filters: [
+        {
+          text: intl.get('队列中'),
+          value: DependenceStatus.queued,
+        },
+        {
+          text: intl.get('安装中'),
+          value: DependenceStatus.installing,
+        },
+        {
+          text: intl.get('已安装'),
+          value: DependenceStatus.installed,
+        },
+        {
+          text: intl.get('安装失败'),
+          value: DependenceStatus.installFailed,
+        },
+        {
+          text: intl.get('删除中'),
+          value: DependenceStatus.removing,
+        },
+        {
+          text: intl.get('已删除'),
+          value: DependenceStatus.removed,
+        },
+        {
+          text: intl.get('删除失败'),
+          value: DependenceStatus.removeFailed,
+        },
+        {
+          text: intl.get('已取消'),
+          value: DependenceStatus.cancelled,
+        },
+      ],
       render: (text: string, record: any, index: number) => {
-        console.log(record.status);
         return (
           <Space size="middle" style={{ cursor: 'text' }}>
             <Tag
@@ -155,35 +185,46 @@ const Dependence = () => {
         const isPc = !isPhone;
         return (
           <Space size="middle">
-            <Tooltip title={isPc ? intl.get('日志') : ''}>
+            {![Status.队列中, Status.已取消].includes(record.status) && (
-              <a
+              <Tooltip title={isPc ? intl.get('日志') : ''}>
-                onClick={() => {
+                <a
-                  setLogDependence({ ...record, timestamp: Date.now() });
+                  onClick={() => {
-                }}
+                    setLogDependence({ ...record, timestamp: Date.now() });
-              >
+                  }}
-                <FileTextOutlined />
+                >
-              </a>
+                  <FileTextOutlined />
-            </Tooltip>
+                </a>
-            {record.status !== Status.安装中 &&
+              </Tooltip>
-              record.status !== Status.删除中 && (
+            )}
-                <>
+            {[Status.队列中, Status.安装中, Status.删除中].includes(
-                  <Tooltip title={isPc ? intl.get('重新安装') : ''}>
+              record.status,
-                    <a onClick={() => reInstallDependence(record, index)}>
+            ) ? (
-                      <BugOutlined />
+              <Tooltip title={isPc ? intl.get('取消安装') : ''}>
-                    </a>
+                <a onClick={() => cancelDependence(record)}>
-                  </Tooltip>
+                  <IconFont type="ql-icon-quxiaoanzhuang" />
+                </a>
+              </Tooltip>
+            ) : (
+              <>
+                <Tooltip title={isPc ? intl.get('重新安装') : ''}>
+                  <a onClick={() => reInstallDependence(record, index)}>
+                    <BugOutlined />
+                  </a>
+                </Tooltip>
+                {Status.已安装 === record.status && (
                   <Tooltip title={isPc ? intl.get('删除') : ''}>
                     <a onClick={() => deleteDependence(record, index)}>
                       <DeleteOutlined />
                     </a>
                   </Tooltip>
-                  <Tooltip title={isPc ? intl.get('强制删除') : ''}>
+                )}
-                    <a onClick={() => deleteDependence(record, index, true)}>
+                <Tooltip title={isPc ? intl.get('强制删除') : ''}>
-                      <DeleteFilled />
+                  <a onClick={() => deleteDependence(record, index, true)}>
-                    </a>
+                    <DeleteFilled />
-                  </Tooltip>
+                  </a>
-                </>
+                </Tooltip>
-              )}
+              </>
+            )}
           </Space>
         );
       },
@@ -201,11 +242,15 @@ const Dependence = () => {
   const tableRef = useRef<HTMLDivElement>(null);
   const tableScrollHeight = useTableScrollHeight(tableRef, 59);
 
-  const getDependencies = () => {
+  const getDependencies = (status?: number[]) => {
     setLoading(true);
     request
       .get(
-        `${config.apiPrefix}dependencies?searchValue=${searchText}&type=${type}`,
+        `${
+          config.apiPrefix
+        }dependencies?searchValue=${searchText}&type=${type}&status=${
+          status || ''
+        }`,
       )
       .then(({ code, data }) => {
         if (code === 200) {
@@ -290,6 +335,31 @@ const Dependence = () => {
     });
   };
 
+  const cancelDependence = (record: any) => {
+    Modal.confirm({
+      title: intl.get('确认取消安装'),
+      content: (
+        <>
+          {intl.get('确认取消安装')}{' '}
+          <Text style={{ wordBreak: 'break-all' }} type="warning">
+            {record.name}
+          </Text>{' '}
+          {intl.get('吗')}
+        </>
+      ),
+      onOk() {
+        request
+          .put(`${config.apiPrefix}dependencies/cancel`, [record.id])
+          .then(() => {
+            getDependencies();
+          });
+      },
+      onCancel() {
+        console.log('Cancel');
+      },
+    });
+  };
+
   const handleCancel = (dependence?: any[]) => {
     setIsModalVisible(false);
     dependence && handleDependence(dependence);
@@ -421,7 +491,7 @@ const Dependence = () => {
             }
             return _result;
           });
-        }, 5000);
+        }, 300);
         return;
       }
     }
@@ -539,6 +609,9 @@ const Dependence = () => {
             size="middle"
             scroll={{ x: 768, y: tableScrollHeight }}
             loading={loading}
+            onChange={(pagination, filters) => {
+              getDependencies(filters?.status as number[]);
+            }}
           />
         </DndProvider>
       </div>

src/pages/dependence/logModal.tsx

@@ -10,6 +10,7 @@ import {
 import { PageLoading } from '@ant-design/pro-layout';
 import Ansi from 'ansi-to-react';
 import WebSocketManager from '@/utils/websocket';
+import { Status } from './type';
 
 const DependenceLogModal = ({
   dependence,
@@ -96,7 +97,11 @@ const DependenceLogModal = ({
 
   const handleMessage = (payload: any) => {
     const { message, references } = payload;
-    if (references.length > 0 && references.includes(dependence.id)) {
+    if (
+      references.length > 0 &&
+      references.includes(dependence.id) &&
+      [Status.删除中, Status.安装中].includes(dependence.status)
+    ) {
       if (message.includes('结束时间')) {
         setExecuting(false);
         setIsRemoveFailed(message.includes('删除失败'));
@@ -108,11 +113,13 @@ const DependenceLogModal = ({
   useEffect(() => {
     const ws = WebSocketManager.getInstance();
     ws.subscribe('installDependence', handleMessage);
+    ws.subscribe('uninstallDependence', handleMessage);
 
     return () => {
       ws.unsubscribe('installDependence', handleMessage);
+      ws.unsubscribe('uninstallDependence', handleMessage);
     };
-  }, []);
+  }, [dependence]);
 
   useEffect(() => {
     setIsPhone(document.body.clientWidth < 768);

src/pages/dependence/type.ts

@@ -0,0 +1,21 @@
+export enum DependenceStatus {
+  'installing',
+  'installed',
+  'installFailed',
+  'removing',
+  'removed',
+  'removeFailed',
+  'queued',
+  'cancelled',
+}
+
+export enum Status {
+  '安装中',
+  '已安装',
+  '安装失败',
+  '删除中',
+  '已删除',
+  '删除失败',
+  '队列中',
+  '已取消',
+}

src/pages/diff/index.tsx

@@ -9,22 +9,24 @@ import { DiffEditor } from '@monaco-editor/react';
 import ReactDiffViewer from 'react-diff-viewer';
 import { useOutletContext } from '@umijs/max';
 import { SharedContext } from '@/layouts';
+import { getEditorMode } from '@/utils';
 
 const { Option } = Select;
 
 const Diff = () => {
   const { headerStyle, isPhone, theme } = useOutletContext<SharedContext>();
-  const [origin, setOrigin] = useState('config.sample.sh');
+  const [origin, setOrigin] = useState('sample/config.sample.sh');
   const [current, setCurrent] = useState('config.sh');
   const [originValue, setOriginValue] = useState('');
   const [currentValue, setCurrentValue] = useState('');
   const [loading, setLoading] = useState(true);
   const [files, setFiles] = useState<any[]>([]);
   const editorRef = useRef<any>(null);
+  const [language, setLanguage] = useState<string>('shell');
 
   const getConfig = () => {
     request
-      .get(`${config.apiPrefix}configs/${current}`)
+      .get(`${config.apiPrefix}configs/detail?path=${encodeURIComponent(current)}`)
       .then(({ code, data }) => {
         if (code === 200) {
           setCurrentValue(data);
@@ -34,7 +36,7 @@ const Diff = () => {
 
   const getSample = () => {
     request
-      .get(`${config.apiPrefix}configs/${origin}`)
+      .get(`${config.apiPrefix}configs/detail?path=${encodeURIComponent(origin)}`)
       .then(({ code, data }) => {
         if (code === 200) {
           setOriginValue(data);
@@ -62,7 +64,7 @@ const Diff = () => {
   const getFiles = () => {
     setLoading(true);
     request
-      .get(`${config.apiPrefix}configs/files`)
+      .get(`${config.apiPrefix}configs/sample`)
       .then(({ code, data }) => {
         if (code === 200) {
           setFiles(data);
@@ -71,12 +73,11 @@ const Diff = () => {
       .finally(() => setLoading(false));
   };
 
-  const originFileChange = (value: string) => {
+  const originFileChange = (value: string, op) => {
+    setCurrent(op.extra.target);
     setOrigin(value);
-  };
+    const newMode = getEditorMode(value);
-
+    setLanguage(newMode);
-  const currentFileChange = (value: string) => {
-    setCurrent(value);
   };
 
   useEffect(() => {
@@ -112,7 +113,7 @@ const Diff = () => {
           <Form.Item label={intl.get('源文件')}>
             <Select value={origin} onChange={originFileChange}>
               {files.map((x) => (
-                <Option key={x.value} value={x.value}>
+                <Option key={x.value} value={x.value} extra={x}>
                   {x.title}
                 </Option>
               ))}
@@ -121,13 +122,7 @@ const Diff = () => {
         </Col>
         <Col span={12}>
           <Form.Item label={intl.get('当前文件')}>
-            <Select value={current} onChange={currentFileChange}>
+            <span className="ant-form-text">{current}</span>
-              {files.map((x) => (
-                <Option key={x.value} value={x.value}>
-                  {x.title}
-                </Option>
-              ))}
-            </Select>
           </Form.Item>
         </Col>
       </Row>
@@ -159,7 +154,7 @@ const Diff = () => {
         />
       ) : (
         <DiffEditor
-          language={'shell'}
+          language={language}
           original={originValue}
           modified={currentValue}
           options={{

src/pages/error/index.tsx

@@ -71,7 +71,7 @@ const Error = () => {
                   /var/run/docker.sock:/var/run/docker.sock
                   containrrr/watchtower -cR <容器名>
                 </div>
-                <div>{intl.get('2. 容器内执行 ql -l check、ql -l update')}</div>
+                <div>{intl.get('2. 容器内执行 ql check、ql update')}</div>
                 <div>
                   {intl.get(
                     '3. 如果无法解决，容器内执行 pm2 logs，拷贝执行结果'

src/pages/initialization/index.tsx

@@ -95,6 +95,53 @@ const Initialization = () => {
         </div>
       ),
     },
+    {
+      title: intl.get('通知设置'),
+      content: (
+        <Form onFinish={submitNotification} layout="vertical">
+          <Form.Item
+            label={intl.get('通知方式')}
+            name="type"
+            rules={[{ required: true, message: intl.get('请选择通知方式') }]}
+            style={{ maxWidth: 350 }}
+          >
+            <Select
+              onChange={notificationModeChange}
+              placeholder={intl.get('请选择通知方式')}
+            >
+              {config.notificationModes
+                .filter((x) => x.value !== 'closed')
+                .map((x) => (
+                  <Option key={x.value} value={x.value}>
+                    {x.label}
+                  </Option>
+                ))}
+            </Select>
+          </Form.Item>
+          {fields.map((x) => (
+            <Form.Item
+              key={x.label}
+              label={x.label}
+              name={x.label}
+              extra={x.tip}
+              rules={[{ required: x.required }]}
+              style={{ maxWidth: 400 }}
+            >
+              <Input.TextArea
+                autoSize={{ minRows: 1, maxRows: 5 }}
+                placeholder={`请输入${x.label}`}
+              />
+            </Form.Item>
+          ))}
+          <Button type="primary" htmlType="submit" loading={loading}>
+            {intl.get('保存')}
+          </Button>
+          <Button type="link" htmlType="button" onClick={() => next()}>
+            {intl.get('跳过')}
+          </Button>
+        </Form>
+      ),
+    },
     {
       title: intl.get('账户设置'),
       content: (
@@ -152,53 +199,6 @@ const Initialization = () => {
         </Form>
       ),
     },
-    {
-      title: intl.get('通知设置'),
-      content: (
-        <Form onFinish={submitNotification} layout="vertical">
-          <Form.Item
-            label={intl.get('通知方式')}
-            name="type"
-            rules={[{ required: true, message: intl.get('请选择通知方式') }]}
-            style={{ maxWidth: 350 }}
-          >
-            <Select
-              onChange={notificationModeChange}
-              placeholder={intl.get('请选择通知方式')}
-            >
-              {config.notificationModes
-                .filter((x) => x.value !== 'closed')
-                .map((x) => (
-                  <Option key={x.value} value={x.value}>
-                    {x.label}
-                  </Option>
-                ))}
-            </Select>
-          </Form.Item>
-          {fields.map((x) => (
-            <Form.Item
-              key={x.label}
-              label={x.label}
-              name={x.label}
-              extra={x.tip}
-              rules={[{ required: x.required }]}
-              style={{ maxWidth: 400 }}
-            >
-              <Input.TextArea
-                autoSize={{ minRows: 1, maxRows: 5 }}
-                placeholder={`请输入${x.label}`}
-              />
-            </Form.Item>
-          ))}
-          <Button type="primary" htmlType="submit" loading={loading}>
-            {intl.get('保存')}
-          </Button>
-          <Button type="link" htmlType="button" onClick={() => next()}>
-            {intl.get('跳过')}
-          </Button>
-        </Form>
-      ),
-    },
     {
       title: intl.get('完成安装'),
       content: (

src/pages/log/index.tsx

@@ -1,4 +1,4 @@
-import intl from 'react-intl-universal'
+import intl from 'react-intl-universal';
 import { useState, useEffect, useCallback, Key, useRef } from 'react';
 import {
   TreeSelect,
@@ -25,13 +25,14 @@ import { depthFirstSearch } from '@/utils';
 import debounce from 'lodash/debounce';
 import uniq from 'lodash/uniq';
 import useFilterTreeData from '@/hooks/useFilterTreeData';
+import prettyBytes from 'pretty-bytes';
 
 const { Text } = Typography;
 
 const Log = () => {
   const { headerStyle, isPhone, theme } = useOutletContext<SharedContext>();
   const [value, setValue] = useState(intl.get('请选择日志文件'));
-  const [select, setSelect] = useState<string>('');
+  const [select, setSelect] = useState<string>(intl.get('请选择日志文件'));
   const [data, setData] = useState<any[]>([]);
   const [loading, setLoading] = useState(false);
   const [height, setHeight] = useState<number>();
@@ -54,7 +55,11 @@ const Log = () => {
 
   const getLog = (node: any) => {
     request
-      .get(`${config.apiPrefix}logs/${node.title}?path=${node.parent || ''}`)
+      .get(
+        `${config.apiPrefix}logs/detail?file=${node.title}&path=${
+          node.parent || ''
+        }`,
+      )
       .then(({ code, data }) => {
         if (code === 200) {
           setValue(data);
@@ -63,13 +68,13 @@ const Log = () => {
   };
 
   const onSelect = (value: any, node: any) => {
-    setCurrentNode(node);
-    setSelect(value);
-
     if (node.key === select || !value) {
       return;
     }
 
+    setCurrentNode(node);
+    setSelect(value);
+
     if (node.type === 'directory') {
       setValue(intl.get('请选择日志文件'));
       return;
@@ -115,9 +120,11 @@ const Log = () => {
         <>
           {intl.get('确认删除')}
           <Text style={{ wordBreak: 'break-all' }} type="warning">
-            {select}
+            {' '}
+            {select}{' '}
           </Text>
-          {intl.get('文件')}{currentNode.type === 'directory' ? intl.get('夹下所以日志') : ''}
+          {intl.get('文件')}
+          {currentNode.type === 'directory' ? intl.get('夹下所有日志') : ''}
           {intl.get('，删除后不可恢复')}
         </>
       ),
@@ -181,7 +188,24 @@ const Log = () => {
   return (
     <PageContainer
       className="ql-container-wrapper log-wrapper"
-      title={select}
+      title={
+        <>
+          {select}
+          {currentNode?.type === 'file' && (
+            <span
+              style={{
+                marginLeft: 6,
+                fontSize: 12,
+                color: '#999',
+                display: 'inline-block',
+                height: 14,
+              }}
+            >
+              {prettyBytes(currentNode.size)}
+            </span>
+          )}
+        </>
+      }
       loading={loading}
       extra={
         isPhone
@@ -266,11 +290,10 @@ const Log = () => {
               options={{
                 readOnly: true,
                 fontSize: 12,
+                minimap: { enabled: false },
                 lineNumbersMinChars: 3,
-                fontFamily: 'Source Code Pro',
                 folding: false,
                 glyphMargin: false,
-                wordWrap: 'on',
               }}
             />
           </SplitPane>

src/pages/script/editModal.tsx

@@ -36,7 +36,7 @@ const EditModal = ({
   const [value, setValue] = useState('');
   const [language, setLanguage] = useState<string>('javascript');
   const [cNode, setCNode] = useState<any>();
-  const [selectedKey, setSelectedKey] = useState<string>('');
+  const [selectedKey, setSelectedKey] = useState<string>();
   const [saveModalVisible, setSaveModalVisible] = useState<boolean>(false);
   const [settingModalVisible, setSettingModalVisible] =
     useState<boolean>(false);
@@ -67,7 +67,11 @@ const EditModal = ({
 
   const getDetail = (node: any) => {
     request
-      .get(`${config.apiPrefix}scripts/${node.title}?path=${node.parent || ''}`)
+      .get(
+        `${config.apiPrefix}scripts/detail?file=${node.title}&path=${
+          node.parent || ''
+        }`,
+      )
       .then(({ code, data }) => {
         if (code === 200) {
           setValue(data);
@@ -148,7 +152,7 @@ const EditModal = ({
         <>
           <TreeSelect
             treeExpandAction="click"
-            style={{ marginRight: 8, width: 150 }}
+            style={{ marginRight: 8, width: 300 }}
             value={selectedKey}
             dropdownStyle={{ maxHeight: 400, overflow: 'auto' }}
             treeData={treeData}
@@ -156,6 +160,7 @@ const EditModal = ({
             fieldNames={{ value: 'key', label: 'title' }}
             showSearch
             onSelect={onSelect}
+            treeLine={{ showLeafIcon: true }}
           />
           <Select
             value={language}
@@ -237,6 +242,7 @@ const EditModal = ({
             minimap: { enabled: false },
             lineNumbersMinChars: 3,
             glyphMargin: false,
+            accessibilitySupport: 'off'
           }}
           onMount={(editor) => {
             editorRef.current = editor;

src/pages/script/editNameModal.tsx

@@ -39,8 +39,8 @@ const EditScriptNameModal = ({
     setLoading(true);
     const { path = '', filename: inputFilename, directory = '' } = values;
     const formData = new FormData();
-    formData.append('file', file as any);
+    formData.append('file', file || '');
-    formData.append('filename', inputFilename);
+    formData.append('filename', file?.name || inputFilename);
     formData.append('path', path);
     formData.append('content', '');
     formData.append('directory', directory);

src/pages/script/index.tsx

@@ -44,14 +44,14 @@ import uniq from 'lodash/uniq';
 import IconFont from '@/components/iconfont';
 import RenameModal from './renameModal';
 import { langs } from '@uiw/codemirror-extensions-langs';
-
+import { useHotkeys } from 'react-hotkeys-hook';
+import prettyBytes from 'pretty-bytes';
 const { Text } = Typography;
 
 const Script = () => {
-  const { headerStyle, isPhone, theme } =
+  const { headerStyle, isPhone, theme } = useOutletContext<SharedContext>();
-    useOutletContext<SharedContext>();
   const [value, setValue] = useState(intl.get('请选择脚本文件'));
-  const [select, setSelect] = useState<string>('');
+  const [select, setSelect] = useState<string>(intl.get('请选择脚本文件'));
   const [data, setData] = useState<any[]>([]);
   const [loading, setLoading] = useState(false);
   const [mode, setMode] = useState('');
@@ -84,9 +84,9 @@ const Script = () => {
   const getDetail = (node: any) => {
     request
       .get(
-        `${config.apiPrefix}scripts/${encodeURIComponent(node.title)}?path=${
+        `${config.apiPrefix}scripts/detail?file=${encodeURIComponent(
-          node.parent || ''
+          node.title,
-        }`,
+        )}&path=${node.parent || ''}`,
       )
       .then(({ code, data }) => {
         if (code === 200) {
@@ -115,13 +115,13 @@ const Script = () => {
   };
 
   const onSelect = (value: any, node: any) => {
-    setSelect(node.key);
-    setCurrentNode(node);
-
     if (node.key === select || !value) {
       return;
     }
 
+    setSelect(node.key);
+    setCurrentNode(node);
+
     if (node.type === 'directory') {
       setValue(intl.get('请选择脚本文件'));
       return;
@@ -135,6 +135,10 @@ const Script = () => {
 
   const onTreeSelect = useCallback(
     (keys: Key[], e: any) => {
+      const node = e.node;
+      if (node.key === select && isEditing) {
+        return;
+      }
       const content = editorRef.current
         ? editorRef.current.getValue().replace(/\r\n/g, '\n')
         : value;
@@ -155,7 +159,7 @@ const Script = () => {
         onSelect(keys[0], e.node);
       }
     },
-    [value],
+    [value, select, isEditing],
   );
 
   const onSearch = useCallback(
@@ -187,6 +191,14 @@ const Script = () => {
     setExpandedKeys(expKeys);
   };
 
+  const onDoubleClick = (e: any, node: any) => {
+    if (node.type === 'file') {
+      setSelect(node.key);
+      setCurrentNode(node);
+      setIsEditing(true);
+    }
+  };
+
   const editFile = () => {
     setTimeout(() => {
       setIsEditing(true);
@@ -206,8 +218,9 @@ const Script = () => {
         <>
           {intl.get('确认保存文件')}
           <Text style={{ wordBreak: 'break-all' }} type="warning">
+            {' '}
             {currentNode.title}
-          </Text>{' '}
+          </Text>
           {intl.get('，保存后不可恢复')}
         </>
       ),
@@ -246,7 +259,8 @@ const Script = () => {
         <>
           {intl.get('确认删除')}
           <Text style={{ wordBreak: 'break-all' }} type="warning">
-            {select}
+            {' '}
+            {select}{' '}
           </Text>
           {intl.get('文件')}
           {currentNode.type === 'directory' ? intl.get('夹及其子文件') : ''}
@@ -352,7 +366,7 @@ const Script = () => {
   };
 
   const initState = () => {
-    setSelect('');
+    setSelect(intl.get('请选择脚本文件'));
     setCurrentNode(null);
     setValue(intl.get('请选择脚本文件'));
   };
@@ -367,6 +381,46 @@ const Script = () => {
     }
   }, [treeDom.current, data]);
 
+  useHotkeys(
+    'mod+s',
+    (e) => {
+      if (isEditing) {
+        saveFile();
+      }
+    },
+    { enableOnFormTags: ['textarea'], preventDefault: true },
+  );
+
+  useHotkeys(
+    'mod+d',
+    (e) => {
+      if (currentNode.title) {
+        deleteFile();
+      }
+    },
+    { preventDefault: true },
+  );
+
+  useHotkeys(
+    'mod+o',
+    (e) => {
+      if (!isEditing) {
+        addFile();
+      }
+    },
+    { preventDefault: true },
+  );
+
+  useHotkeys(
+    'mod+e',
+    (e) => {
+      if (currentNode.title) {
+        cancelEdit();
+      }
+    },
+    { preventDefault: true },
+  );
+
   const action = (key: string | number) => {
     switch (key) {
       case 'save':
@@ -441,7 +495,24 @@ const Script = () => {
   return (
     <PageContainer
       className="ql-container-wrapper log-wrapper"
-      title={select}
+      title={
+        <>
+          {select}
+          {currentNode?.type === 'file' && (
+            <span
+              style={{
+                marginLeft: 6,
+                fontSize: 12,
+                color: '#999',
+                display: 'inline-block',
+                height: 14,
+              }}
+            >
+              {prettyBytes(currentNode.size)}
+            </span>
+          )}
+        </>
+      }
       loading={loading}
       extra={
         isPhone
@@ -543,6 +614,7 @@ const Script = () => {
                       onExpand={onExpand}
                       showLine={{ showLeafIcon: true }}
                       onSelect={onTreeSelect}
+                      onDoubleClick={onDoubleClick}
                     ></Tree>
                   </div>
                 </>
@@ -571,6 +643,7 @@ const Script = () => {
                 fontSize: 12,
                 lineNumbersMinChars: 3,
                 glyphMargin: false,
+                accessibilitySupport: 'off'
               }}
               onMount={(editor) => {
                 editorRef.current = editor;
@@ -591,15 +664,17 @@ const Script = () => {
             }}
           />
         )}
-        {isLogModalVisible && <EditModal
+        {isLogModalVisible && (
-          visible={isLogModalVisible}
+          <EditModal
-          treeData={data}
+            visible={isLogModalVisible}
-          currentNode={currentNode}
+            treeData={data}
-          content={value}
+            currentNode={currentNode}
-          handleCancel={() => {
+            content={value}
-            setIsLogModalVisible(false);
+            handleCancel={() => {
-          }}
+              setIsLogModalVisible(false);
-        />}
+            }}
+          />
+        )}
         <EditScriptNameModal
           visible={isAddFileModalVisible}
           treeData={data}

src/pages/script/renameModal.tsx

@@ -62,7 +62,12 @@ const RenameModal = ({
       onCancel={() => handleCancel()}
       confirmLoading={loading}
     >
-      <Form form={form} layout="vertical" name="edit_name_modal">
+      <Form
+        form={form}
+        initialValues={{ name: currentNode?.title }}
+        layout="vertical"
+        name="edit_name_modal"
+      >
         <Form.Item
           name="name"
           rules={[{ required: true, message: intl.get('请输入新名称') }]}

src/pages/script/saveModal.tsx

@@ -26,6 +26,8 @@ const SaveModal = ({
           message.success(intl.get('保存文件成功'));
           handleCancel(data);
         }
+      })
+      .finally(() => {
         setLoading(false);
       });
   };

src/pages/setting/checkUpdate.tsx

@@ -1,10 +1,11 @@
-import intl from 'react-intl-universal';
+import { disableBody } from '@/utils';
-import React, { useEffect, useState, useRef, useCallback } from 'react';
-import { Statistic, Modal, Tag, Button, Spin, message } from 'antd';
-import { request } from '@/utils/http';
 import config from '@/utils/config';
+import { request } from '@/utils/http';
 import WebSocketManager from '@/utils/websocket';
 import Ansi from 'ansi-to-react';
+import { Button, Modal, Statistic, message } from 'antd';
+import { useCallback, useEffect, useRef, useState } from 'react';
+import intl from 'react-intl-universal';
 
 const { Countdown } = Statistic;
 
@@ -77,7 +78,11 @@ const CheckUpdate = ({ systemInfo }: any) => {
           </div>
         </>
       ),
-      content: <pre><Ansi>{lastLog}</Ansi></pre>,
+      content: (
+        <pre>
+          <Ansi>{lastLog}</Ansi>
+        </pre>
+      ),
       okText: intl.get('下载更新'),
       cancelText: intl.get('以后再说'),
       onOk() {
@@ -102,10 +107,42 @@ const CheckUpdate = ({ systemInfo }: any) => {
       okButtonProps: { disabled: true },
       title: intl.get('下载更新中...'),
       centered: true,
-      content: <pre><Ansi>{value}</Ansi></pre>,
+      content: (
+        <pre>
+          <Ansi>{value}</Ansi>
+        </pre>
+      ),
     });
   };
 
+  const reloadSystem = (type?: string) => {
+    request
+      .put(`${config.apiPrefix}update/${type}`)
+      .then((_data: any) => {
+        message.success({
+          content: (
+            <span>
+              {intl.get('系统将在')}
+              <Countdown
+                className="inline-countdown"
+                format="ss"
+                value={Date.now() + 1000 * 30}
+              />
+              {intl.get('秒后自动刷新')}
+            </span>
+          ),
+          duration: 30,
+        });
+        disableBody();
+        setTimeout(() => {
+          window.location.reload();
+        }, 30000);
+      })
+      .catch((error: any) => {
+        console.log(error);
+      });
+  };
+
   const showReloadModal = () => {
     Modal.confirm({
       width: 600,
@@ -115,30 +152,7 @@ const CheckUpdate = ({ systemInfo }: any) => {
       content: intl.get('系统安装包下载成功，确认重启'),
       okText: intl.get('重启'),
       onOk() {
-        request
+        reloadSystem('system');
-          .put(`${config.apiPrefix}system/reload`, { type: 'system' })
-          .then((_data: any) => {
-            message.success({
-              content: (
-                <span>
-                  {intl.get('系统将在')}
-                  <Countdown
-                    className="inline-countdown"
-                    format="ss"
-                    value={Date.now() + 1000 * 30}
-                  />
-                  {intl.get('秒后自动刷新')}
-                </span>
-              ),
-              duration: 30,
-            });
-            setTimeout(() => {
-              window.location.reload();
-            }, 30000);
-          })
-          .catch((error: any) => {
-            console.log(error);
-          });
       },
       onCancel() {
         modalRef.current.update({
@@ -206,6 +220,13 @@ const CheckUpdate = ({ systemInfo }: any) => {
       <Button type="primary" onClick={checkUpgrade}>
         {intl.get('检查更新')}
       </Button>
+      <Button
+        type="primary"
+        onClick={() => reloadSystem('reload')}
+        style={{ marginLeft: 8 }}
+      >
+        {intl.get('重新启动')}
+      </Button>
     </>
   );
 };