测试

.env.example

@@ -1,11 +1,14 @@
-GRPC_PORT=5500
+UPDATE_PORT=5300
-BACK_PORT=5700
+PUBLIC_PORT=5400
+CRON_PORT=5500
+BACK_PORT=5600
+PORT=5700
 
-LOG_LEVEL='info'
+LOG_LEVEL='debug'
 
-JWT_SECRET=
+SECRET='whyour'
-JWT_EXPIRES_IN=
 
-QINIU_AK=
+QINIU_AK=''
-QINIU_SK=
+QINIU_SK=''
-QINIU_SCOPE=
+QINIU_SCOPE=''
+TEMP=''

.github/agents/ql.agent.md

@@ -1,4 +0,0 @@
----
-name: Bug Fixer
-description: Fix this issue following our error handling pattern.
----

.github/workflows/build_docker_image.yml

@@ -2,47 +2,32 @@ name: Build And Push Docker Image
 
 on:
   push:
-    paths-ignore:
-      - "*.md"
     branches:
-      - "master"
+      - "npm-debug"
-      - "develop"
-    tags:
-      - "v*"
-  schedule:
-    - cron: "00 20 * * *"
   workflow_dispatch:
 
 jobs:
-  code_gitlab:
+  to_gitlab:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - uses: Yikun/hub-mirror-action@master
+      - uses: pixta-dev/repository-mirroring-action@v1
         with:
-          src: github/whyour
+          target_repo_url: git@gitlab.com:whyour/qinglong.git
-          dst: gitlab/whyour
+          ssh_private_key: ${{ secrets.GITLAB_SSH_PK }}
-          dst_key: ${{ secrets.GITLAB_SSH_PK }}
-          dst_token: ${{ secrets.GITLAB_TOKEN }}
-          static_list: "qinglong"
-          force_update: true
 
-  code_gitee:
+  to_gitee:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - uses: Yikun/hub-mirror-action@master
+      - uses: pixta-dev/repository-mirroring-action@v1
         with:
-          src: github/whyour
+          target_repo_url: git@gitee.com:whyour/qinglong.git
-          dst: gitee/whyour
+          ssh_private_key: ${{ secrets.GITLAB_SSH_PK }}
-          dst_key: ${{ secrets.GITLAB_SSH_PK }}
-          dst_token: ${{ secrets.GITEE_TOKEN }}
-          static_list: "qinglong"
-          force_update: true
 
   build-static:
     runs-on: ubuntu-latest
@@ -78,43 +63,24 @@ jobs:
           git config --local user.email 'github-actions[bot]@users.noreply.github.com'
           git commit --allow-empty -m "copy static at $(date +'%Y-%m-%d %H:%M:%S')"
           git push --force --quiet "https://${{ secrets.API_TOKEN }}@${GITHUB_REPO}.git" ${GITHUB_BRANCH}:${GITHUB_BRANCH}
-  
-  static_gitlab:
-    needs: build-static
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      - uses: Yikun/hub-mirror-action@master
-        with:
-          src: github/whyour
-          dst: gitlab/whyour
-          dst_key: ${{ secrets.GITLAB_SSH_PK }}
-          dst_token: ${{ secrets.GITLAB_TOKEN }}
-          static_list: "qinglong-static"
-          force_update: true
 
-  static_gitee:
+          mkdir -p ~/.ssh
-    needs: build-static
+          echo "${PRIVATE_KEY}" > ~/.ssh/id_rsa
-    runs-on: ubuntu-latest
+          chmod 600 ~/.ssh/id_rsa
-    steps:
+
-      - uses: actions/checkout@v4
+          export GIT_SSH_COMMAND="ssh -v -i ~/.ssh/id_rsa -o StrictHostKeyChecking=no -l git"
-        with:
+          git remote add gitee "${REPO_GITEE}"
-          fetch-depth: 0
+          git remote add gitlab "${REPO_GITLAB}"
-      - uses: Yikun/hub-mirror-action@master
+          git gc
-        with:
+          git push --force --quiet gitee ${GITHUB_BRANCH}:${GITHUB_BRANCH}
-          src: github/whyour
+          git push --force --quiet gitlab ${GITHUB_BRANCH}:${GITHUB_BRANCH}
-          dst: gitee/whyour
-          dst_key: ${{ secrets.GITLAB_SSH_PK }}
-          dst_token: ${{ secrets.GITEE_TOKEN }}
-          static_list: "qinglong-static"
-          force_update: true
 
   build:
     needs: build-static
 
-    runs-on: ubuntu-22.04
+    # 由于 ubuntu-latest 中使用 linux6.x 内核 linux/s390x npm 无法使用
+    runs-on: ubuntu-20.04
+    # runs-on: self-hosted
 
     permissions:
       packages: write
@@ -130,7 +96,7 @@ jobs:
           cache: "pnpm"
 
       - name: Setup timezone
-        uses: szenius/set-timezone@v2.0
+        uses: szenius/set-timezone@v1.2
         with:
           timezoneLinux: Asia/Shanghai
 
@@ -176,88 +142,22 @@ jobs:
 
       - name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v5
         with:
           build-args: |
             MAINTAINER=${{ github.repository_owner }}
             QL_BRANCH=${{ github.ref_name }}
             SOURCE_COMMIT=${{ github.sha }}
           network: host
-          # linux/s390x npm 暂不可用
+          platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x,linux/386
-          platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le,linux/386
+          # platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/s390x,linux/386
           context: .
           file: ./docker/Dockerfile
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=registry,ref=whyour/qinglong:cache
-          cache-to: type=registry,ref=whyour/qinglong:cache,mode=max
 
       - name: Image digest
         run: |
           echo ${{ steps.docker_build.outputs.digest }}
-
+  
-  build310:
-    if: ${{ github.ref_name == 'master' }}
-    needs: build-static
-
-    runs-on: ubuntu-22.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@v2.0
-        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@v6
-        with:
-          build-args: |
-            MAINTAINER=${{ github.repository_owner }}
-            QL_BRANCH=${{ github.ref_name }}
-            SOURCE_COMMIT=${{ github.sha }}
-          network: host
-          # linux/s390x npm 暂不可用
-          platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le,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,9 +22,4 @@
 .env
 .history
 .version.ts
-/.tmp
+/.tmp
-__pycache__
-/shell/preload/env.*
-/shell/preload/notify.*
-/shell/preload/*-notify.json
-/shell/preload/__ql_notify__.*

.prettierignore

@@ -2,22 +2,23 @@
 **/*.svg
 **/*.ejs
 **/*.html
-/.umi
+package.json
-/.umi-production
+.umi
-/.umi-test
+.umi-production
-/.history
+.umi-test
-/.tmp
+.history
-/node_modules
+.tmp
+node_modules
 npm-debug.log*
 yarn-error.log
 yarn.lock
 package-lock.json
-/static
+static
-/data
+data
 DS_Store
-/src/.umi
+src/.umi
-/src/.umi-production
+src/.umi-production
-/src/.umi-test
+src/.umi-test
 .env.local
 .env
 version.ts

.umirc.ts

@@ -16,8 +16,18 @@ 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,
+      pathRewrite: { [`^${baseUrl}api/public`]: '/api' },
+    },
     [`${baseUrl}api`]: {
-      target: 'http://127.0.0.1:5700/',
+      target: 'http://127.0.0.1:5600/',
       changeOrigin: true,
       ws: true,
       pathRewrite: { [`^${baseUrl}api`]: '/api' },
@@ -33,12 +43,19 @@ export default defineConfig({
       }),
     );
   }) as any,
-  headScripts: [`./api/env.js`],
+  externals: {
+    react: 'window.React',
+    'react-dom': 'window.ReactDOM',
+  },
+  headScripts: [
+    `./api/env.js`,
+    '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',
     },
   ],
-  npmClient: 'pnpm',
 });

README-en.md

@@ -18,9 +18,9 @@ Timed task management platform supporting Python3, JavaScript, Shell, Typescript
 [docker-image-size-image]: https://img.shields.io/docker/image-size/whyour/qinglong?style=flat
 [docker-image-size-url]: https://hub.docker.com/r/whyour/qinglong
 
-[Demo](http://demo.qinglong.online:4433/) / [Issues](https://github.com/whyour/qinglong/issues) / [Telegram Channel](https://t.me/jiao_long) / [Buy Me a Coffee](https://www.buymeacoffee.com/qinglong)
+[Demo](http://demo.dlww.cc:4433/) / [Issues](https://github.com/whyour/qinglong/issues) / [Telegram Channel](https://t.me/jiao_long) / [Buy Me a Coffee](https://www.buymeacoffee.com/qinglong)
 
-[演示](http://demo.qinglong.online:4433/) / [反馈](https://github.com/whyour/qinglong/issues) / [Telegram 频道](https://t.me/jiao_long) / [打赏开发者](https://user-images.githubusercontent.com/22700758/244744295-29cd0cd1-c8bb-4ea1-adf6-29bd390ad4dd.jpg)
+[演示](http://demo.dlww.cc:4433/) / [反馈](https://github.com/whyour/qinglong/issues) / [Telegram 频道](https://t.me/jiao_long) / [打赏开发者](https://user-images.githubusercontent.com/22700758/244744295-29cd0cd1-c8bb-4ea1-adf6-29bd390ad4dd.jpg)
 </div>
 
 ![cover](https://user-images.githubusercontent.com/22700758/244847235-8dc1ca21-e03f-4606-9458-0541fab60413.png)
@@ -48,34 +48,151 @@ docker pull whyour/qinglong:debian
 
 ### npm
 
-The npm version supports `debian/ubuntu/alpine` systems and requires `node/npm/python3/pip3/pnpm` to be installed.
+The npm version supports `debian/ubuntu/centos/alpine` systems and requires `node/python3` to be installed.
 
 ```bash
 npm i @whyour/qinglong
 ```
 
-## Deployment
-
-[View Documentation](https://qinglong.online/guide/getting-started/installation-guide)
-
-## Built-in API
-
-[View Documentation](https://qinglong.online/guide/user-guide/built-in-api)
-
 ## Built-in commands
 
-[View Documentation](https://qinglong.online/guide/user-guide/basic-explanation)
+- 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 |
+
+## Deployment
+
+### Docker (Recommended)
+
+```bash
+# curl -sSL get.docker.com | sh
+docker run -dit \
+  -v $PWD/ql/data:/ql/data \
+  # The 5700 after the colon is the default port, if QlPort is set, it needs to be the same as QlPort.
+  -p 5700:5700 \
+  # Deployment paths are not required, e.g. /test.
+  -e QlBaseUrl="/" \
+  # Deployment port is not required, when using host mode, you can set the port after service startup, default 5700
+  -e QlPort="5700" \
+  --name qinglong \
+  --hostname qinglong \
+  --restart unless-stopped \
+  whyour/qinglong:latest
+```
+
+### Docker-compose (Recommended)
+
+```bash
+# curl -L https://github.com/docker/compose/releases/download/1.16.1/docker-compose-`uname -s`-`uname -m` -o /usr/local/bin/docker-compose
+mkdir qinglong
+wget https://raw.githubusercontent.com/whyour/qinglong/master/docker/docker-compose.yml
+
+# start
+docker-compose up -d
+# stop
+docker-compose down
+```
+
+### Podman (Recommended)
+
+```bash
+# https://podman.io/getting-started/installation
+podman run -dit \
+  --network bridge \
+  -v $PWD/ql/data:/ql/data \
+  # The 5700 after the colon is the default port, if QlPort is set, it needs to be the same as QlPort.
+  -p 5700:5700 \
+  # Deployment paths are not required, e.g. /test.
+  -e QlBaseUrl="/" \
+  # Deployment port is not required, when using host mode, you can set the port after service startup, default 5700
+  -e QlPort="5700" \
+  --name qinglong \
+  --hostname qinglong \
+  docker.io/whyour/qinglong:latest
+```
+
+### Local
+
+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
+
+```bash
+# Debian/Ubuntu
+curl -sL https://deb.nodesource.com/setup_20.x | sudo -E bash -
+# Centos
+curl --silent --location https://rpm.nodesource.com/setup_20.x | sudo 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
+export QL_DIR=""
+export QL_DATA_DIR=""
+# Run again
+qinglong
+```
 
 ## Development
 
 ```bash
-git clone https://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

@@ -20,9 +20,9 @@ Timed task management platform supporting Python3, JavaScript, Shell, Typescript
 [docker-image-size-image]: https://img.shields.io/docker/image-size/whyour/qinglong?style=flat
 [docker-image-size-url]: https://hub.docker.com/r/whyour/qinglong
 
-[Demo](http://demo.qinglong.online:4433/) / [Issues](https://github.com/whyour/qinglong/issues) / [Telegram Channel](https://t.me/jiao_long) / [Buy Me a Coffee](https://www.buymeacoffee.com/qinglong)
+[Demo](http://demo.dlww.cc:4433/) / [Issues](https://github.com/whyour/qinglong/issues) / [Telegram Channel](https://t.me/jiao_long) / [Buy Me a Coffee](https://www.buymeacoffee.com/qinglong)
 
-[演示](http://demo.qinglong.online:4433/) / [反馈](https://github.com/whyour/qinglong/issues) / [Telegram 频道](https://t.me/jiao_long) / [打赏开发者](https://user-images.githubusercontent.com/22700758/244744295-29cd0cd1-c8bb-4ea1-adf6-29bd390ad4dd.jpg)
+[演示](http://demo.dlww.cc:4433/) / [反馈](https://github.com/whyour/qinglong/issues) / [Telegram 频道](https://t.me/jiao_long) / [打赏开发者](https://user-images.githubusercontent.com/22700758/244744295-29cd0cd1-c8bb-4ea1-adf6-29bd390ad4dd.jpg)
 </div>
 
 ![cover](https://user-images.githubusercontent.com/22700758/244847235-8dc1ca21-e03f-4606-9458-0541fab60413.png)
@@ -50,34 +50,149 @@ docker pull whyour/qinglong:debian
 
 ### npm
 
-npm 版本支持 `debian/ubuntu/alpine` 系统，需要自行安装 `node/npm/python3/pip3/pnpm`
+npm 版本支持 `debian/ubuntu/centos/alpine` 系统，需要自行安装 `node/python3`
 
 ```bash
 npm i @whyour/qinglong
 ```
 
-## 部署
-
-[查看文档](https://qinglong.online/guide/getting-started/installation-guide)
-
-## 内置 API
-
-[查看文档](https://qinglong.online/guide/user-guide/built-in-api)
-
 ## 内置命令
 
-[查看文档](https://qinglong.online/guide/user-guide/basic-explanation)
+- 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  | 任务执行时的文件路径                                                                        |
+
+## 部署
+
+### docker (推荐)
+
+```bash
+# curl -sSL get.docker.com | sh
+docker run -dit \
+  -v $PWD/ql/data:/ql/data \
+  # 冒号后面的 5700 为默认端口，如果设置了 QlPort, 需要跟 QlPort 保持一致
+  -p 5700:5700 \
+  # 部署路径非必须，比如 /test
+  -e QlBaseUrl="/" \
+  # 部署端口非必须，当使用 host 模式时，可以设置服务启动后的端口，默认 5700
+  -e QlPort="5700" \
+  --name qinglong \
+  --hostname qinglong \
+  --restart unless-stopped \
+  whyour/qinglong:latest
+```
+
+### docker-compose (推荐)
+
+```bash
+#  curl -L https://github.com/docker/compose/releases/download/1.16.1/docker-compose-`uname -s`-`uname -m` -o /usr/local/bin/docker-compose
+mkdir qinglong
+wget https://raw.githubusercontent.com/whyour/qinglong/master/docker/docker-compose.yml
+
+# 启动
+docker-compose up -d
+# 停止
+docker-compose down
+```
+
+### podman (推荐)
+
+```bash
+# https://podman.io/getting-started/installation
+podman run -dit \
+  --network bridge \
+  -v $PWD/ql/data:/ql/data \
+  # 冒号后面的 5700 为默认端口，如果设置了 QlPort, 需要跟 QlPort 保持一致
+  -p 5700:5700 \
+  # 部署路径非必须，比如 /test
+  -e QlBaseUrl="/" \
+  # 部署端口非必须，当使用 host 模式时，可以设置服务启动后的端口，默认 5700
+  -e QlPort="5700" \
+  --name qinglong \
+  --hostname qinglong \
+  docker.io/whyour/qinglong:latest
+```
+
+### 本机
+
+建议使用纯净系统安装，避免系统原有数据丢失，需要自己安装 node/npm/python3/pip3
+
+```bash
+# Debian/Ubuntu
+curl -sL https://deb.nodesource.com/setup_20.x | sudo -E bash -
+# Centos
+curl --silent --location https://rpm.nodesource.com/setup_20.x | sudo bash
+```
+
+```bash
+npm install -g node-pre-gyp pnpm@8.3.1
+npm install -g @whyour/qinglong
+qinglong
+# 根据提示增加环境变量 QL_DIR 和 QL_DATA_DIR
+export QL_DIR=""
+export QL_DATA_DIR=""
+# 再次执行
+qinglong
+```
 
 ## 开发
 
 ```bash
-git clone https://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>

SECURITY.md

@@ -1,5 +0,0 @@
-## Reporting a Vulnerability
-
-To report a vulnerability, please open a private vulnerability report at <https://github.com/whyour/qinglong/security>.
-
-While the discovery of new vulnerabilities is rare, we also recommend always using the latest versions of Qinglong to ensure your application remains as secure as possible.

back/api/config.ts

@@ -1,3 +1,4 @@
+import { getFileContentByName, getLastModifyFilePath } from '../config/util';
 import { Router, Request, Response, NextFunction } from 'express';
 import { Container } from 'typedi';
 import { Logger } from 'winston';
@@ -7,7 +8,6 @@ import { celebrate, Joi } from 'celebrate';
 import { join } from 'path';
 import { SAMPLE_FILES } from '../config/const';
 import ConfigService from '../services/config';
-import { writeFileWithLock } from '../shared/utils';
 const route = Router();
 
 export default (app: Router) => {
@@ -78,7 +78,7 @@ export default (app: Router) => {
         if (name.startsWith('data/scripts/')) {
           path = join(config.rootPath, name);
         }
-        await writeFileWithLock(path, content);
+        await fs.writeFile(path, content);
         res.send({ code: 200, message: '保存成功' });
       } catch (e) {
         return next(e);

back/api/cron.ts

@@ -4,8 +4,7 @@ import { Logger } from 'winston';
 import CronService from '../services/cron';
 import CronViewService from '../services/cronView';
 import { celebrate, Joi } from 'celebrate';
-import { commonCronSchema } from '../validation/schedule';
+import cron_parser from 'cron-parser';
-
 const route = Router();
 
 export default (app: Router) => {
@@ -171,14 +170,27 @@ export default (app: Router) => {
   route.post(
     '/',
     celebrate({
-      body: Joi.object(commonCronSchema),
+      body: Joi.object({
+        command: Joi.string().required(),
+        schedule: Joi.string().required(),
+        name: Joi.string().optional(),
+        labels: Joi.array().optional(),
+        sub_id: Joi.number().optional().allow(null),
+        extra_schedules: Joi.array().optional().allow(null),
+        task_before: Joi.string().optional().allow('').allow(null),
+        task_after: Joi.string().optional().allow('').allow(null),
+      }),
     }),
     async (req: Request, res: Response, next: NextFunction) => {
       const logger: Logger = Container.get('logger');
       try {
-        const cronService = Container.get(CronService);
+        if (cron_parser.parseExpression(req.body.schedule).hasNext()) {
-        const data = await cronService.create(req.body);
+          const cronService = Container.get(CronService);
-        return res.send({ code: 200, data });
+          const data = await cronService.create(req.body);
+          return res.send({ code: 200, data });
+        } else {
+          return res.send({ code: 400, message: 'param schedule error' });
+        }
       } catch (e) {
         return next(e);
       }
@@ -319,16 +331,30 @@ export default (app: Router) => {
     '/',
     celebrate({
       body: Joi.object({
-        ...commonCronSchema,
+        labels: Joi.array().optional().allow(null),
+        command: Joi.string().required(),
+        schedule: Joi.string().required(),
+        name: Joi.string().optional().allow(null),
+        sub_id: Joi.number().optional().allow(null),
+        extra_schedules: Joi.array().optional().allow(null),
+        task_before: Joi.string().optional().allow('').allow(null),
+        task_after: Joi.string().optional().allow('').allow(null),
         id: Joi.number().required(),
       }),
     }),
     async (req: Request, res: Response, next: NextFunction) => {
       const logger: Logger = Container.get('logger');
       try {
-        const cronService = Container.get(CronService);
+        if (
-        const data = await cronService.update(req.body);
+          !req.body.schedule ||
-        return res.send({ code: 200, data });
+          cron_parser.parseExpression(req.body.schedule).hasNext()
+        ) {
+          const cronService = Container.get(CronService);
+          const data = await cronService.update(req.body);
+          return res.send({ code: 200, data });
+        } else {
+          return res.send({ code: 400, message: 'param schedule error' });
+        }
       } catch (e) {
         return next(e);
       }
@@ -392,7 +418,7 @@ export default (app: Router) => {
       const logger: Logger = Container.get('logger');
       try {
         const cronService = Container.get(CronService);
-        const data = await cronService.importCrontab();
+        const data = await cronService.import_crontab();
         return res.send({ code: 200, data });
       } catch (e) {
         return next(e);

back/api/dependence.ts

@@ -8,28 +8,17 @@ const route = Router();
 export default (app: Router) => {
   app.use('/dependencies', route);
 
-  route.get(
+  route.get('/', async (req: Request, res: Response, next: NextFunction) => {
-    '/',
+    const logger: Logger = Container.get('logger');
-    celebrate({
+    try {
-      query: 
+      const dependenceService = Container.get(DependenceService);
-        Joi.object({
+      const data = await dependenceService.dependencies(req.query as any);
-          searchValue: Joi.string().optional().allow(''),
+      return res.send({ code: 200, data });
-          type: Joi.string().optional().allow(''),
+    } catch (e) {
-          status: Joi.string().optional().allow(''),
+      logger.error('🔥 error: %o', e);
-        }),
+      return next(e);
-    }),
+    }
-    async (req: Request, res: Response, next: NextFunction) => {
+  });
-      const logger: Logger = Container.get('logger');
-      try {
-        const dependenceService = Container.get(DependenceService);
-        const data = await dependenceService.dependencies(req.query as any);
-        return res.send({ code: 200, data });
-      } catch (e) {
-        logger.error('🔥 error: %o', e);
-        return next(e);
-      }
-    },
-  );
 
   route.post(
     '/',
@@ -43,6 +32,7 @@ export default (app: Router) => {
       ),
     }),
     async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
       try {
         const dependenceService = Container.get(DependenceService);
         const data = await dependenceService.create(req.body);
@@ -64,6 +54,7 @@ export default (app: Router) => {
       }),
     }),
     async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
       try {
         const dependenceService = Container.get(DependenceService);
         const data = await dependenceService.update(req.body);
@@ -80,6 +71,7 @@ export default (app: Router) => {
       body: Joi.array().items(Joi.number().required()),
     }),
     async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
       try {
         const dependenceService = Container.get(DependenceService);
         const data = await dependenceService.remove(req.body);
@@ -96,6 +88,7 @@ export default (app: Router) => {
       body: Joi.array().items(Joi.number().required()),
     }),
     async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
       try {
         const dependenceService = Container.get(DependenceService);
         const data = await dependenceService.remove(req.body, true);
@@ -114,6 +107,7 @@ export default (app: Router) => {
       }),
     }),
     async (req: Request<{ id: number }>, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
       try {
         const dependenceService = Container.get(DependenceService);
         const data = await dependenceService.getDb({ id: req.params.id });
@@ -130,6 +124,7 @@ export default (app: Router) => {
       body: Joi.array().items(Joi.number().required()),
     }),
     async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
       try {
         const dependenceService = Container.get(DependenceService);
         const data = await dependenceService.reInstall(req.body);

back/api/env.ts

@@ -51,9 +51,6 @@ 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) {
@@ -220,7 +217,7 @@ export default (app: Router) => {
         } else {
           return res.send({
             code: 400,
-            message: '每条数据 name 或者 value 字段不能为空，参考导出文件格式',
+            message: '文件缺少name或者value字段，参考导出文件格式',
           });
         }
       } catch (e) {

back/api/health.ts

@@ -1,27 +0,0 @@
-import { Router } from 'express';
-import Logger from '../loaders/logger';
-import { HealthService } from '../services/health';
-import Container from 'typedi';
-const route = Router();
-
-export default (app: Router) => {
-  app.use('/', route);
-
-  route.get('/health', async (req, res) => {
-    try {
-      const healthService = Container.get(HealthService);
-      const health = await healthService.check();
-      res.status(200).send({
-        code: 200,
-        data: health,
-      });
-    } catch (err: any) {
-      Logger.error('Health check failed:', err);
-      res.status(500).send({
-        code: 500,
-        message: 'Health check failed',
-        error: err.message,
-      });
-    }
-  });
-};

back/api/index.ts

@@ -9,8 +9,6 @@ import open from './open';
 import dependence from './dependence';
 import system from './system';
 import subscription from './subscription';
-import update from './update';
-import health from './health';
 
 export default () => {
   const app = Router();
@@ -24,8 +22,6 @@ export default () => {
   dependence(app);
   system(app);
   subscription(app);
-  update(app);
-  health(app);
 
   return app;
 };

back/api/log.ts

@@ -1,15 +1,11 @@
-import { celebrate, Joi } from 'celebrate';
+import { Router, Request, Response, NextFunction } from 'express';
-import { NextFunction, Request, Response, Router } from 'express';
 import { Container } from 'typedi';
 import { Logger } from 'winston';
+import * as fs from 'fs';
 import config from '../config';
-import {
+import { getFileContentByName, readDirs, rmPath } from '../config/util';
-  getFileContentByName,
+import { join } from 'path';
-  readDirs,
+import { celebrate, Joi } from 'celebrate';
-  removeAnsi,
-  rmPath,
-} from '../config/util';
-import LogService from '../services/log';
 const route = Router();
 const blacklist = ['.tmp'];
 
@@ -34,19 +30,16 @@ export default (app: Router) => {
     '/detail',
     async (req: Request, res: Response, next: NextFunction) => {
       try {
-        const logService = Container.get(LogService);
+        if (blacklist.includes(req.path)) {
-        const finalPath = logService.checkFilePath(
+          return res.send({ code: 403, message: '暂无权限' });
-          (req.query.path as string) || '',
-          (req.query.file as string) || '',
-        );
-        if (!finalPath || blacklist.includes(req.query.path as string)) {
-          return res.send({
-            code: 403,
-            message: '暂无权限',
-          });
         }
-        const content = await getFileContentByName(finalPath);
+        const filePath = join(
-        res.send({ code: 200, data: removeAnsi(content) });
+          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);
       }
@@ -57,18 +50,15 @@ export default (app: Router) => {
     '/:file',
     async (req: Request, res: Response, next: NextFunction) => {
       try {
-        const logService = Container.get(LogService);
+        if (blacklist.includes(req.path)) {
-        const finalPath = logService.checkFilePath(
+          return res.send({ code: 403, message: '暂无权限' });
-          (req.query.path as string) || '',
-          (req.params.file as string) || '',
-        );
-        if (!finalPath || blacklist.includes(req.query.path as string)) {
-          return res.send({
-            code: 403,
-            message: '暂无权限',
-          });
         }
-        const content = await getFileContentByName(finalPath);
+        const filePath = join(
+          config.logPath,
+          (req.query.path || '') as string,
+          req.params.file,
+        );
+        const content = await getFileContentByName(filePath);
         res.send({ code: 200, data: content });
       } catch (e) {
         return next(e);
@@ -87,56 +77,17 @@ export default (app: Router) => {
     }),
     async (req: Request, res: Response, next: NextFunction) => {
       try {
-        let { filename, path } = req.body as {
+        let { filename, path, type } = req.body as {
           filename: string;
           path: string;
+          type: string;
         };
-        const logService = Container.get(LogService);
+        const filePath = join(config.logPath, path, filename);
-        const finalPath = logService.checkFilePath(path, filename);
+        await rmPath(filePath);
-        if (!finalPath || blacklist.includes(path)) {
-          return res.send({
-            code: 403,
-            message: '暂无权限',
-          });
-        }
-        await rmPath(finalPath);
         res.send({ code: 200 });
       } catch (e) {
         return next(e);
       }
     },
   );
-
-  route.post(
-    '/download',
-    celebrate({
-      body: Joi.object({
-        filename: Joi.string().required(),
-        path: Joi.string().allow(''),
-      }),
-    }),
-    async (req: Request, res: Response, next: NextFunction) => {
-      try {
-        let { filename, path } = req.body as {
-          filename: string;
-          path: string;
-        };
-        const logService = Container.get(LogService);
-        const filePath = logService.checkFilePath(path, filename);
-        if (!filePath) {
-          return res.send({
-            code: 403,
-            message: '暂无权限',
-          });
-        }
-        return res.download(filePath, filename, (err) => {
-          if (err) {
-            return next(err);
-          }
-        });
-      } catch (e) {
-        return next(e);
-      }
-    },
-  );
 };

back/api/script.ts

@@ -1,4 +1,11 @@
-import { fileExist, readDirs, readDir, rmPath, IFile } from '../config/util';
+import {
+  fileExist,
+  getFileContentByName,
+  readDirs,
+  getLastModifyFilePath,
+  readDir,
+  rmPath,
+} from '../config/util';
 import { Router, Request, Response, NextFunction } from 'express';
 import { Container } from 'typedi';
 import { Logger } from 'winston';
@@ -8,7 +15,6 @@ import { celebrate, Joi } from 'celebrate';
 import path, { join, parse } from 'path';
 import ScriptService from '../services/script';
 import multer from 'multer';
-import { writeFileWithLock } from '../shared/utils';
 const route = Router();
 
 const storage = multer.diskStorage({
@@ -24,68 +30,55 @@ const upload = multer({ storage: storage });
 export default (app: Router) => {
   app.use('/scripts', route);
 
-  route.get(
+  route.get('/', async (req: Request, res: Response, next: NextFunction) => {
-    '/',
+    const logger: Logger = Container.get('logger');
-    celebrate({
+    try {
-      query: Joi.object({
+      let result = [];
-        path: Joi.string().optional().allow(''),
+      const blacklist = [
-      }),
+        'node_modules',
-    }),
+        '.git',
-    async (req: Request, res: Response, next: NextFunction) => {
+        '.pnpm',
-      const logger: Logger = Container.get('logger');
+        'pnpm-lock.yaml',
-      try {
+        'yarn.lock',
-        let result: IFile[] = [];
+        'package-lock.json',
-        const blacklist = [
+      ];
-          'node_modules',
+      if (req.query.path) {
-          '.git',
+        const targetPath = path.join(
-          '.pnpm',
+          config.scriptPath,
-          'pnpm-lock.yaml',
+          req.query.path as string,
-          'yarn.lock',
+        );
-          'package-lock.json',
+        result = await readDir(targetPath, config.scriptPath, blacklist);
-        ];
+      } else {
-        if (req.query.path) {
+        result = await readDirs(
-          result = await readDir(
+          config.scriptPath,
-            req.query.path as string,
+          config.scriptPath,
-            config.scriptPath,
+          blacklist,
-            blacklist,
+          (a, b) => {
-          );
+            if (a.type === b.type) {
-        } else {
+              return a.title.localeCompare(b.title);
-          result = await readDirs(
+            } else {
-            config.scriptPath,
+              return a.type === 'directory' ? -1 : 1;
-            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,
-          data: result,
-        });
-      } catch (e) {
-        logger.error('🔥 error: %o', e);
-        return next(e);
       }
-    });
+      res.send({
+        code: 200,
+        data: result,
+      });
+    } catch (e) {
+      logger.error('🔥 error: %o', e);
+      return next(e);
+    }
+  });
 
   route.get(
     '/detail',
-    celebrate({
-      query: Joi.object({
-        path: Joi.string().optional().allow(''),
-        file: Joi.string().required(),
-      }),
-    }),
     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.path as string,
           req.query.file as string,
         );
         res.send({ code: 200, data: content });
@@ -97,19 +90,11 @@ export default (app: Router) => {
 
   route.get(
     '/:file',
-    celebrate({
-      params: Joi.object({
-        file: Joi.string().required(),
-      }),
-      query: Joi.object({
-        path: Joi.string().optional().allow(''),
-      }),
-    }),
     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.path as string,
           req.params.file,
         );
         res.send({ code: 200, data: content });
@@ -122,16 +107,8 @@ export default (app: Router) => {
   route.post(
     '/',
     upload.single('file'),
-    celebrate({
-      body: Joi.object({
-        filename: Joi.string().required(),
-        path: Joi.string().optional().allow(''),
-        content: Joi.string().optional().allow(''),
-        originFilename: Joi.string().optional().allow(''),
-        directory: Joi.string().optional().allow(''),
-      }),
-    }),
     async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
       try {
         let { filename, path, content, originFilename, directory } =
           req.body as {
@@ -153,13 +130,13 @@ export default (app: Router) => {
         }
         if (config.writePathList.every((x) => !path.startsWith(x))) {
           return res.send({
-            code: 403,
+            code: 430,
-            message: '暂无权限',
+            message: '文件路径禁止访问',
           });
         }
 
         if (req.file) {
-          await fs.rename(req.file.path, join(path, filename));
+          await fs.rename(req.file.path, join(path, req.file.filename));
           return res.send({ code: 200 });
         }
 
@@ -186,7 +163,7 @@ export default (app: Router) => {
             await rmPath(originFilePath);
           }
         }
-        await writeFileWithLock(filePath, content);
+        await fs.writeFile(filePath, content);
         return res.send({ code: 200 });
       } catch (e) {
         return next(e);
@@ -204,21 +181,15 @@ export default (app: Router) => {
       }),
     }),
     async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
       try {
         let { filename, content, path } = req.body as {
           filename: string;
           content: string;
           path: string;
         };
-        const scriptService = Container.get(ScriptService);
+        const filePath = join(config.scriptPath, path, filename);
-        const filePath = scriptService.checkFilePath(path, filename);
+        await fs.writeFile(filePath, content);
-        if (!filePath) {
-          return res.send({
-            code: 403,
-            message: '暂无权限',
-          });
-        }
-        await writeFileWithLock(filePath, content);
         return res.send({ code: 200 });
       } catch (e) {
         return next(e);
@@ -231,27 +202,19 @@ export default (app: Router) => {
     celebrate({
       body: Joi.object({
         filename: Joi.string().required(),
-        path: Joi.string().optional().allow(''),
+        path: Joi.string().allow(''),
         type: Joi.string().optional(),
       }),
     }),
     async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
       try {
-        let { filename, path } = req.body as {
+        let { filename, path, type } = req.body as {
           filename: string;
           path: string;
+          type: string;
         };
-        if (!path) {
+        const filePath = join(config.scriptPath, path, filename);
-          path = '';
-        }
-        const scriptService = Container.get(ScriptService);
-        const filePath = scriptService.checkFilePath(path, filename);
-        if (!filePath) {
-          return res.send({
-            code: 403,
-            message: '暂无权限',
-          });
-        }
         await rmPath(filePath);
         res.send({ code: 200 });
       } catch (e) {
@@ -265,30 +228,24 @@ export default (app: Router) => {
     celebrate({
       body: Joi.object({
         filename: Joi.string().required(),
-        path: Joi.string().optional().allow(''),
       }),
     }),
     async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
       try {
-        let { filename, path } = req.body as {
+        let { filename } = req.body as {
           filename: string;
-          path: string;
         };
-        if (!path) {
+        const filePath = join(config.scriptPath, filename);
-          path = '';
+        // const stats = fs.statSync(filePath);
-        }
+        // res.set({
-        const scriptService = Container.get(ScriptService);
+        //   'Content-Type': 'application/octet-stream', //告诉浏览器这是一个二进制文件
-        const filePath = scriptService.checkFilePath(path, filename);
+        //   'Content-Disposition': 'attachment; filename=' + filename, //告诉浏览器这是一个需要下载的文件
-        if (!filePath) {
+        //   'Content-Length': stats.size  //文件大小
-          return res.send({
+        // });
-            code: 403,
+        // fs.createReadStream(filePath).pipe(res);
-            message: '暂无权限',
-          });
-        }
         return res.download(filePath, filename, (err) => {
-          if (err) {
+          return next(err);
-            return next(err);
-          }
         });
       } catch (e) {
         return next(e);
@@ -309,12 +266,9 @@ export default (app: Router) => {
       const logger: Logger = Container.get('logger');
       try {
         let { filename, content, path } = req.body;
-        if (!path) {
-          path = '';
-        }
         const { name, ext } = parse(filename);
         const filePath = join(config.scriptPath, path, `${name}.swap${ext}`);
-        await writeFileWithLock(filePath, content || '');
+        await fs.writeFile(filePath, content || '', { encoding: 'utf8' });
 
         const scriptService = Container.get(ScriptService);
         const result = await scriptService.runScript(filePath);
@@ -337,9 +291,6 @@ export default (app: Router) => {
     async (req: Request, res: Response, next: NextFunction) => {
       try {
         let { filename, path, pid } = req.body;
-        if (!path) {
-          path = '';
-        }
         const { name, ext } = parse(filename);
         const filePath = join(config.scriptPath, path, `${name}.swap${ext}`);
         const logPath = join(config.logPath, path, `${name}.swap`);
@@ -367,14 +318,12 @@ export default (app: Router) => {
     }),
     async (req: Request, res: Response, next: NextFunction) => {
       try {
-        let { filename, path, newFilename } = req.body as {
+        let { filename, path, type, newFilename } = req.body as {
           filename: string;
           path: string;
+          type: string;
           newFilename: string;
         };
-        if (!path) {
-          path = '';
-        }
         const filePath = join(config.scriptPath, path, filename);
         const newPath = join(config.scriptPath, path, newFilename);
         await fs.rename(filePath, newPath);

back/api/subscription.ts

@@ -15,7 +15,6 @@ export default (app: Router) => {
       const subscriptionService = Container.get(SubscriptionService);
       const data = await subscriptionService.list(
         req.query.searchValue as string,
-        req.query.ids as string,
       );
       return res.send({ code: 200, data });
     } catch (e) {
@@ -213,8 +212,8 @@ export default (app: Router) => {
       body: Joi.array().items(Joi.number().required()),
       query: Joi.object({
         force: Joi.boolean().optional(),
-        t: Joi.number(),
+        t: Joi.number()
-      }),
+      })
     }),
     async (req: Request, res: Response, next: NextFunction) => {
       const logger: Logger = Container.get('logger');

back/api/system.ts

@@ -33,7 +33,7 @@ export default (app: Router) => {
     const logger: Logger = Container.get('logger');
     try {
       const userService = Container.get(UserService);
-      const authInfo = await userService.getAuthInfo();
+      const authInfo = await userService.getUserInfo();
       const { version, changeLog, changeLogLink, publishTime } =
         await parseVersion(config.versionFile);
 
@@ -273,20 +273,19 @@ export default (app: Router) => {
           {
             onStart: async (cp, startTime) => {
               res.setHeader('QL-Task-Pid', `${cp.pid}`);
-              res.setHeader('QL-Task-Log', `${logPath}`);
             },
             onEnd: async (cp, endTime, diff) => {
               res.end();
             },
             onError: async (message: string) => {
-              res.write(message);
+              res.write(`\n${message}`);
               const absolutePath = await handleLogPath(logPath);
-              await fs.appendFile(absolutePath, message);
+              await fs.appendFile(absolutePath, `\n${message}`);
             },
             onLog: async (message: string) => {
-              res.write(message);
+              res.write(`\n${message}`);
               const absolutePath = await handleLogPath(logPath);
-              await fs.appendFile(absolutePath, message);
+              await fs.appendFile(absolutePath, `\n${message}`);
             },
           },
         );
@@ -317,15 +316,10 @@ export default (app: Router) => {
 
   route.put(
     '/data/export',
-    celebrate({
-      body: Joi.object({
-        type: Joi.array().items(Joi.string()).optional(),
-      }),
-    }),
     async (req: Request, res: Response, next: NextFunction) => {
       try {
         const systemService = Container.get(SystemService);
-        await systemService.exportData(res, req.body.type);
+        await systemService.exportData(res);
       } catch (e) {
         return next(e);
       }
@@ -346,98 +340,12 @@ export default (app: Router) => {
     },
   );
 
-  route.get(
+  route.get('/log', async (req: Request, res: Response, next: NextFunction) => {
-    '/log',
+    try {
-    celebrate({
+      const systemService = Container.get(SystemService);
-      query: {
+      await systemService.getSystemLog(res);
-        startTime: Joi.string().allow('').optional(),
+    } catch (e) {
-        endTime: Joi.string().allow('').optional(),
+      return next(e);
-        t: Joi.string().optional(),
+    }
-      },
+  });
-    }),
-    async (req: Request, res: Response, next: NextFunction) => {
-      try {
-        const systemService = Container.get(SystemService);
-        await systemService.getSystemLog(
-          res,
-          req.query as {
-            startTime?: string;
-            endTime?: string;
-          },
-        );
-      } catch (e) {
-        return next(e);
-      }
-    },
-  );
-
-  route.delete(
-    '/log',
-    async (req: Request, res: Response, next: NextFunction) => {
-      try {
-        const systemService = Container.get(SystemService);
-        await systemService.deleteSystemLog();
-        res.send({ code: 200 });
-      } catch (e) {
-        return next(e);
-      }
-    },
-  );
-
-  route.put(
-    '/auth/reset',
-    celebrate({
-      body: Joi.object({
-        retries: Joi.number().optional(),
-        twoFactorActivated: Joi.boolean().optional(),
-        password: Joi.string().optional(),
-        username: Joi.string().optional(),
-      }),
-    }),
-    async (req: Request, res: Response, next: NextFunction) => {
-      try {
-        const userService = Container.get(UserService);
-        await userService.resetAuthInfo(req.body);
-        res.send({ code: 200, message: '更新成功' });
-      } catch (e) {
-        return next(e);
-      }
-    },
-  );
-
-  route.put(
-    '/config/timezone',
-    celebrate({
-      body: Joi.object({
-        timezone: Joi.string().allow('').allow(null),
-      }),
-    }),
-    async (req: Request, res: Response, next: NextFunction) => {
-      try {
-        const systemService = Container.get(SystemService);
-        const result = await systemService.updateTimezone(req.body);
-        res.send(result);
-      } catch (e) {
-        return next(e);
-      }
-    },
-  );
-
-  route.put(
-    '/config/dependence-clean',
-    celebrate({
-      body: Joi.object({
-        type: Joi.string().allow(''),
-      }),
-    }),
-    async (req: Request, res: Response, next: NextFunction) => {
-      try {
-        const systemService = Container.get(SystemService);
-        const result = await systemService.cleanDependence(req.body.type);
-        res.send(result);
-      } catch (e) {
-        return next(e);
-      }
-    },
-  );
 };

back/api/update.ts

@@ -1,51 +0,0 @@
-import { NextFunction, Request, Response, Router } from 'express';
-import Container from 'typedi';
-import Logger from '../loaders/logger';
-import SystemService from '../services/system';
-const route = Router();
-
-export default (app: Router) => {
-  app.use('/update', route);
-
-  route.put(
-    '/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);
-      }
-    },
-  );
-
-  route.put(
-    '/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);
-      }
-    },
-  );
-
-  route.put(
-    '/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);
-      }
-    },
-  );
-};

back/api/user.ts

@@ -8,7 +8,6 @@ import path from 'path';
 import { v4 as uuidV4 } from 'uuid';
 import rateLimit from 'express-rate-limit';
 import config from '../config';
-import { isDemoEnv } from '../config/util';
 const route = Router();
 
 const storage = multer.diskStorage({
@@ -73,8 +72,9 @@ export default (app: Router) => {
       }),
     }),
     async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
       try {
-        if (isDemoEnv()) {
+        if (process.env.DeployEnv === 'demo') {
           return res.send({ code: 450, message: '未知错误' });
         }
         const userService = Container.get(UserService);
@@ -90,7 +90,7 @@ export default (app: Router) => {
     const logger: Logger = Container.get('logger');
     try {
       const userService = Container.get(UserService);
-      const authInfo = await userService.getAuthInfo();
+      const authInfo = await userService.getUserInfo();
       res.send({
         code: 200,
         data: {

back/app.ts

@@ -1,242 +1,32 @@
-import 'reflect-metadata';
+import 'reflect-metadata'; // We need this in order to use @Decorators
-import cluster, { type Worker } from 'cluster';
-import compression from 'compression';
-import cors from 'cors';
-import express from 'express';
-import helmet from 'helmet';
-import { Container } from 'typedi';
 import config from './config';
+import express from 'express';
 import Logger from './loaders/logger';
-import { monitoringMiddleware } from './middlewares/monitoring';
-import { type GrpcServerService } from './services/grpc';
-import { type HttpServerService } from './services/http';
 
-interface WorkerMetadata {
+async function startServer() {
-  id: number;
+  const app = express();
-  pid: number;
-  serviceType: string;
-  startTime: Date;
-}
 
-class Application {
+  await require('./loaders/db').default();
-  private app: express.Application;
-  private httpServerService?: HttpServerService;
-  private grpcServerService?: GrpcServerService;
-  private isShuttingDown = false;
-  private workerMetadataMap = new Map<number, WorkerMetadata>();
 
-  constructor() {
+  await require('./loaders/initFile').default();
-    this.app = express();
-    // 创建一个全局中间件，删除查询参数中的t
-    this.app.use((req: express.Request, res: express.Response, next: express.NextFunction) => {
-      if (req.query.t) {
-        delete req.query.t;
-      }
-      next();
-    });
-  }
 
-  async start() {
+  await require('./loaders/sentry').default({ expressApp: app });
-    try {
-      if (cluster.isPrimary) {
-        await this.initializeDatabase();
-      }
-      if (cluster.isPrimary) {
-        this.startMasterProcess();
-      } else {
-        await this.startWorkerProcess();
-      }
-    } catch (error) {
-      Logger.error('Failed to start application:', error);
-      process.exit(1);
-    }
-  }
 
-  private startMasterProcess() {
+  await require('./loaders/app').default({ expressApp: app });
-    this.forkWorker('http');
-    this.forkWorker('grpc');
-
-    cluster.on('exit', (worker, code, signal) => {
-      const metadata = this.workerMetadataMap.get(worker.id);
-      if (metadata) {
-        if (!this.isShuttingDown) {
-          Logger.error(
-            `${metadata.serviceType} worker ${worker.process.pid} died (${signal || code
-            }). Restarting...`,
-          );
-          const newWorker = this.forkWorker(metadata.serviceType);
-          Logger.info(
-            `Restarted ${metadata.serviceType} worker (New PID: ${newWorker.process.pid})`,
-          );
-        }
-
-        this.workerMetadataMap.delete(worker.id);
-      }
-    });
-
-    this.setupMasterShutdown();
-  }
-
-  private forkWorker(serviceType: string): Worker {
-    const worker = cluster.fork({ SERVICE_TYPE: serviceType });
-
-    this.workerMetadataMap.set(worker.id, {
-      id: worker.id,
-      pid: worker.process.pid!,
-      serviceType,
-      startTime: new Date(),
-    });
-
-    return worker;
-  }
-
-  private async initializeDatabase() {
-    const dbLoader = await import('./loaders/db');
-    await dbLoader.default();
-  }
-
-  private setupMiddlewares() {
-    this.app.use(helmet({
-      contentSecurityPolicy: false,
-    }));
-    this.app.use(cors(config.cors));
-    this.app.use(compression());
-    this.app.use(monitoringMiddleware);
-  }
-
-  private setupMasterShutdown() {
-    const shutdown = async () => {
-      if (this.isShuttingDown) return;
-      this.isShuttingDown = true;
-
-      const workers = Object.values(cluster.workers || {});
-      const workerPromises: Promise<void>[] = [];
-
-      workers.forEach((worker) => {
-        if (worker) {
-          const exitPromise = new Promise<void>((resolve) => {
-            worker.once('exit', () => {
-              Logger.info(`Worker ${worker.process.pid} exited`);
-              resolve();
-            });
-
-            try {
-              worker.send('shutdown');
-            } catch (error) {
-              Logger.warn(
-                `Failed to send shutdown to worker ${worker.process.pid}:`,
-                error,
-              );
-            }
-          });
-
-          workerPromises.push(exitPromise);
-        }
-      });
-
-      try {
-        await Promise.race([
-          Promise.all(workerPromises),
-          new Promise<void>((resolve) => {
-            setTimeout(() => {
-              Logger.warn('Worker shutdown timeout reached');
-              resolve();
-            }, 10000);
-          }),
-        ]);
-        process.exit(0);
-      } catch (error) {
-        Logger.error('Error during worker shutdown:', error);
-        process.exit(1);
-      }
-    };
-
-    process.on('SIGTERM', shutdown);
-    process.on('SIGINT', shutdown);
-  }
-
-  private async startWorkerProcess() {
-    const serviceType = process.env.SERVICE_TYPE;
-    if (!serviceType || !['http', 'grpc'].includes(serviceType)) {
-      Logger.error('Invalid SERVICE_TYPE:', serviceType);
-      process.exit(1);
-    }
-
-    Logger.info(`✌️ ${serviceType} worker started (PID: ${process.pid})`);
-
-    try {
-      if (serviceType === 'http') {
-        await this.startHttpService();
-      } else {
-        await this.startGrpcService();
-      }
 
+  const server = app
+    .listen(config.port, () => {
+      Logger.debug(`✌️ 后端服务启动成功！`);
+      console.debug(`✌️ 后端服务启动成功！`);
       process.send?.('ready');
-    } catch (error) {
+    })
-      Logger.error(`${serviceType} worker failed:`, error);
+    .on('error', (err) => {
+      Logger.error(err);
+      console.error(err);
       process.exit(1);
-    }
-  }
-
-  private async startHttpService() {
-    this.setupMiddlewares();
-
-    const { HttpServerService } = await import('./services/http');
-    this.httpServerService = Container.get(HttpServerService);
-
-    const appLoader = await import('./loaders/app');
-    await appLoader.default({ app: this.app });
-
-    const server = await this.httpServerService.initialize(
-      this.app,
-      config.port,
-    );
-
-    const serverLoader = await import('./loaders/server');
-    await (serverLoader.default as any)({ server });
-    this.setupWorkerShutdown('http');
-  }
-
-  private async startGrpcService() {
-    const { GrpcServerService } = await import('./services/grpc');
-    this.grpcServerService = Container.get(GrpcServerService);
-
-    await this.grpcServerService.initialize();
-    this.setupWorkerShutdown('grpc');
-  }
-
-  private setupWorkerShutdown(serviceType: string) {
-    process.on('message', (msg) => {
-      if (msg === 'shutdown') {
-        this.gracefulShutdown(serviceType);
-      }
     });
 
-    const shutdown = () => this.gracefulShutdown(serviceType);
+  await require('./loaders/server').default({ server });
-    process.on('SIGTERM', shutdown);
-    process.on('SIGINT', shutdown);
-  }
-
-  private async gracefulShutdown(serviceType: string) {
-    if (this.isShuttingDown) return;
-    this.isShuttingDown = true;
-
-    try {
-      if (serviceType === 'http') {
-        await this.httpServerService?.shutdown();
-      } else {
-        await this.grpcServerService?.shutdown();
-      }
-      process.exit(0);
-    } catch (error) {
-      Logger.error(`[${serviceType}] Error during shutdown:`, error);
-      process.exit(1);
-    }
-  }
 }
 
-const app = new Application();
+startServer();
-app.start().catch((error) => {
-  Logger.error('Application failed to start:', error);
-  process.exit(1);
-});

back/config/const.ts

@@ -23,29 +23,3 @@ export const SAMPLE_FILES = [
     target: 'data/scripts/notify.py',
   },
 ];
-
-export const PYTHON_INSTALL_DIR = process.env.PYTHON_HOME;
-
-export const NotificationModeStringMap = {
-  0: 'gotify',
-  1: 'goCqHttpBot',
-  2: 'serverChan',
-  3: 'pushDeer',
-  4: 'bark',
-  5: 'chat',
-  6: 'telegramBot',
-  7: 'dingtalkBot',
-  8: 'weWorkBot',
-  9: 'weWorkApp',
-  10: 'aibotk',
-  11: 'iGot',
-  12: 'pushPlus',
-  13: 'wePlusBot',
-  14: 'email',
-  15: 'pushMe',
-  16: 'feishu',
-  17: 'webhook',
-  18: 'chronocat',
-  19: 'ntfy',
-  20: 'wxPusherBot',
-} as const;

back/config/http.ts

@@ -1,68 +0,0 @@
-import { request as undiciRequest, Dispatcher } from 'undici';
-
-type RequestBaseOptions = {
-  dispatcher?: Dispatcher;
-  json?: Record<string, any>;
-  form?: string;
-  headers?: Record<string, string>;
-} & Omit<Dispatcher.RequestOptions<null>, 'origin' | 'path' | 'method'>;
-
-type RequestOptionsWithOptions = RequestBaseOptions &
-  Partial<Pick<Dispatcher.RequestOptions, 'method'>>;
-
-type ResponseTypeMap = {
-  json: Record<string, any>;
-  text: string;
-};
-
-type ResponseTypeKey = keyof ResponseTypeMap;
-
-async function request(
-  url: string,
-  options?: RequestOptionsWithOptions,
-): Promise<Dispatcher.ResponseData<null>> {
-  const { json, form, body, headers = {}, ...rest } = options || {};
-  const finalHeaders = { ...headers } as Record<string, string>;
-  let finalBody = body;
-
-  if (json) {
-    finalHeaders['content-type'] = 'application/json';
-    finalBody = JSON.stringify(json);
-  } else if (form) {
-    finalBody = form;
-    delete finalHeaders['content-type'];
-  }
-
-  const res = await undiciRequest(url, {
-    method: 'POST',
-    headers: finalHeaders,
-    body: finalBody,
-    ...rest,
-  });
-
-  return res;
-}
-
-async function post<T extends ResponseTypeKey = 'json'>(
-  url: string,
-  options?: RequestBaseOptions & { responseType?: T },
-): Promise<ResponseTypeMap[T]> {
-  const resp = await request(url, { ...options, method: 'POST' });
-
-  const rawText = await resp.body.text();
-
-  if (options?.responseType === 'text') {
-    return rawText as ResponseTypeMap[T];
-  }
-
-  try {
-    return JSON.parse(rawText) as ResponseTypeMap[T];
-  } catch {
-    return rawText as ResponseTypeMap[T];
-  }
-}
-
-export const httpClient = {
-  post,
-  request,
-};

back/config/index.ts

@@ -2,60 +2,12 @@ import dotenv from 'dotenv';
 import path from 'path';
 import { createRandomString } from './share';
 
-dotenv.config({
-  path: path.join(__dirname, '../../.env'),
-});
-
-interface Config {
-  port: number;
-  grpcPort: number;
-  nodeEnv: string;
-  isDevelopment: boolean;
-  isProduction: boolean;
-  jwt: {
-    secret: string;
-    expiresIn?: string;
-  };
-  cors: {
-    origin: string[];
-    methods: string[];
-  };
-  logs: {
-    level: string;
-  };
-  api: {
-    prefix: string;
-  };
-}
-
-const config: Config = {
-  port: parseInt(process.env.BACK_PORT || '5700', 10),
-  grpcPort: parseInt(process.env.GRPC_PORT || '5500', 10),
-  nodeEnv: process.env.NODE_ENV || 'development',
-  isDevelopment: process.env.NODE_ENV === 'development',
-  isProduction: process.env.NODE_ENV === 'production',
-  logs: {
-    level: process.env.LOG_LEVEL || 'silly',
-  },
-  api: {
-    prefix: '/api',
-  },
-  jwt: {
-    secret: process.env.JWT_SECRET || 'whyour-secret',
-    expiresIn: process.env.JWT_EXPIRES_IN,
-  },
-  cors: {
-    origin: process.env.CORS_ORIGIN
-      ? process.env.CORS_ORIGIN.split(',')
-      : ['*'],
-    methods: ['GET', 'POST', 'PUT', 'DELETE', 'OPTIONS'],
-  },
-};
-
 process.env.NODE_ENV = process.env.NODE_ENV || 'development';
 
 if (!process.env.QL_DIR) {
+  // 声明QL_DIR环境变量
   let qlHomePath = path.join(__dirname, '../../');
+  // 生产环境
   if (qlHomePath.endsWith('/static/')) {
     qlHomePath = path.join(qlHomePath, '../');
   }
@@ -67,32 +19,20 @@ 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') });
 
-let dataPath = path.join(rootPath, 'data/');
+const 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 preloadPath = path.join(shellPath, 'preload/');
 const tmpPath = path.join(rootPath, '.tmp/');
 const samplePath = path.join(rootPath, 'sample/');
 const configPath = path.join(dataPath, 'config/');
 const scriptPath = path.join(dataPath, 'scripts/');
-const repoPath = path.join(dataPath, 'repo/');
 const bakPath = path.join(dataPath, 'bak/');
 const logPath = path.join(dataPath, 'log/');
 const dbPath = path.join(dataPath, 'db/');
 const uploadPath = path.join(dataPath, 'upload/');
 const sshdPath = path.join(dataPath, 'ssh.d/');
 const systemLogPath = path.join(dataPath, 'syslog/');
-const dependenceCachePath = path.join(dataPath, 'dep_cache/');
 
-const envFile = path.join(preloadPath, 'env.sh');
+const envFile = path.join(configPath, 'env.sh');
-const jsEnvFile = path.join(preloadPath, 'env.js');
-const pyEnvFile = path.join(preloadPath, 'env.py');
-const jsNotifyFile = path.join(preloadPath, '__ql_notify__.js');
-const pyNotifyFile = path.join(preloadPath, '__ql_notify__.py');
 const confFile = path.join(configPath, 'config.sh');
 const crontabFile = path.join(configPath, 'crontab.list');
 const authConfigFile = path.join(configPath, 'auth.json');
@@ -114,8 +54,17 @@ if (envFound.error) {
 }
 
 export default {
-  ...config,
+  port: parseInt(process.env.BACK_PORT as string, 10),
-  jwt: config.jwt,
+  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',
+  },
+  api: {
+    prefix: '/api',
+  },
   rootPath,
   tmpPath,
   dataPath,
@@ -133,15 +82,10 @@ export default {
   sampleFile,
   confFile,
   envFile,
-  jsEnvFile,
-  pyEnvFile,
-  jsNotifyFile,
-  pyNotifyFile,
   dbPath,
   uploadPath,
   configPath,
   scriptPath,
-  repoPath,
   samplePath,
   blackFileList: [
     'auth.json',
@@ -150,15 +94,12 @@ export default {
     'crontab.list',
     'dependence-proxy.sh',
     'env.sh',
-    'env.js',
-    'env.py',
     'token.json',
   ],
   writePathList: [configPath, scriptPath],
   bakPath,
   apiWhiteList: [
     '/api/user/login',
-    '/api/health',
     '/open/auth/token',
     '/api/user/two-factor/login',
     '/api/system',
@@ -175,5 +116,4 @@ export default {
   sqliteFile,
   sshdPath,
   systemLogPath,
-  dependenceCachePath,
 };

back/config/serverEnv.ts

@@ -5,13 +5,13 @@ let pickedEnv: Record<string, string>;
 
 function getPickedEnv() {
   if (pickedEnv) return pickedEnv;
-  const picked = pick(process.env, ['QlBaseUrl', 'DeployEnv', 'QL_DIR']);
+  const picked = pick(process.env, ['QlBaseUrl', 'DeployEnv']);
   if (picked.QlBaseUrl) {
     if (!picked.QlBaseUrl.startsWith('/')) {
-      picked.QlBaseUrl = `/${picked.QlBaseUrl}`;
+      picked.QlBaseUrl = `/${picked.QlBaseUrl}`
     }
     if (!picked.QlBaseUrl.endsWith('/')) {
-      picked.QlBaseUrl = `${picked.QlBaseUrl}/`;
+      picked.QlBaseUrl = `${picked.QlBaseUrl}/`
     }
   }
   pickedEnv = picked as Record<string, string>;

back/config/subscription.ts

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

back/config/util.ts

@@ -1,15 +1,15 @@
 import * as fs from 'fs/promises';
 import * as path from 'path';
+import got from 'got';
+import iconv from 'iconv-lite';
 import { exec } from 'child_process';
-import psTreeFun from 'ps-tree';
+import FormData from 'form-data';
+import psTreeFun from 'pstree.remy';
 import { promisify } from 'util';
 import { load } from 'js-yaml';
 import config from './index';
-import { PYTHON_INSTALL_DIR, TASK_COMMAND } from './const';
+import { TASK_COMMAND } from './const';
 import Logger from '../loaders/logger';
-import { writeFileWithLock } from '../shared/utils';
-import { DependenceTypes } from '../data/dependence';
-import { FormData } from 'undici';
 
 export * from './share';
 
@@ -21,10 +21,6 @@ export async function getFileContentByName(fileName: string) {
   return '';
 }
 
-export function removeAnsi(text: string) {
-  return text.replace(/\x1b\[\d+m/g, '');
-}
-
 export async function getLastModifyFilePath(dir: string) {
   let filePath = '';
 
@@ -34,7 +30,7 @@ export async function getLastModifyFilePath(dir: string) {
 
     arr.forEach(async (item) => {
       const fullpath = path.join(dir, item);
-      const stats = await fs.lstat(fullpath);
+      const stats = await fs.stat(fullpath);
       if (stats.isFile()) {
         if (stats.mtimeMs >= 0) {
           filePath = fullpath;
@@ -56,6 +52,78 @@ export function getToken(req: any) {
   return '';
 }
 
+export async function getNetIp(req: any) {
+  const ipArray = [
+    ...new Set([
+      ...(req.headers['x-real-ip'] || '').split(','),
+      ...(req.headers['x-forwarded-for'] || '').split(','),
+      req.ip,
+      ...req.ips,
+      req.socket.remoteAddress,
+    ]),
+  ].filter(Boolean);
+
+  let ip = ipArray[0];
+
+  if (ipArray.length > 1) {
+    for (let i = 0; i < ipArray.length; i++) {
+      const ipNumArray = ipArray[i].split('.');
+      const tmp = ipNumArray[0] + '.' + ipNumArray[1];
+      if (
+        tmp === '192.168' ||
+        (ipNumArray[0] === '172' &&
+          ipNumArray[1] >= 16 &&
+          ipNumArray[1] <= 32) ||
+        tmp === '10.7' ||
+        tmp === '127.0'
+      ) {
+        continue;
+      }
+      ip = ipArray[i];
+      break;
+    }
+  }
+
+  ip = ip.substr(ip.lastIndexOf(':') + 1, ip.length);
+  if (ip.includes('127.0') || ip.includes('192.168') || ip.includes('10.7')) {
+    ip = '';
+  }
+
+  if (!ip) {
+    return { address: `获取失败`, ip };
+  }
+
+  try {
+    const csdnApi = got
+      .get(`https://searchplugin.csdn.net/api/v1/ip/get?ip=${ip}`, {
+        timeout: 10000,
+        retry: 0,
+      })
+      .text();
+    const pconlineApi = got
+      .get(`https://whois.pconline.com.cn/ipJson.jsp?ip=${ip}&json=true`, {
+        timeout: 10000,
+        retry: 0,
+      })
+      .buffer();
+    const [csdnBody, pconlineBody] = await await Promise.all<any>([
+      csdnApi,
+      pconlineApi,
+    ]);
+    const csdnRes = JSON.parse(csdnBody);
+    const pconlineRes = JSON.parse(iconv.decode(pconlineBody, 'GBK'));
+    let address = '';
+    if (csdnBody && csdnRes.code == 200) {
+      address = csdnRes.data.address;
+    } else if (pconlineRes && pconlineRes.addr) {
+      address = pconlineRes.addr;
+    }
+    return { address, ip };
+  } catch (error) {
+    return { address: `获取失败`, ip };
+  }
+}
+
 export function getPlatform(userAgent: string): 'mobile' | 'desktop' {
   const ua = userAgent.toLowerCase();
   const testUa = (regexp: RegExp) => regexp.test(ua);
@@ -77,19 +145,12 @@ export function getPlatform(userAgent: string): 'mobile' | 'desktop' {
     system = 'android'; // android系统
   } else if (testUa(/ios|iphone|ipad|ipod|iwatch/g)) {
     system = 'ios'; // ios系统
-  } else if (testUa(/openharmony/g)) {
-    system = 'openharmony'; // openharmony系统
   }
 
   let platform = 'desktop';
   if (system === 'windows' || system === 'macos' || system === 'linux') {
     platform = 'desktop';
-  } else if (
+  } else if (system === 'android' || system === 'ios' || testUa(/mobile/g)) {
-    system === 'android' ||
-    system === 'ios' ||
-    system === 'openharmony' ||
-    testUa(/mobile/g)
-  ) {
     platform = 'mobile';
   }
 
@@ -107,7 +168,7 @@ export async function fileExist(file: any) {
 
 export async function createFile(file: string, data: string = '') {
   await fs.mkdir(path.dirname(file), { recursive: true });
-  await writeFileWithLock(file, data);
+  await fs.writeFile(file, data);
 }
 
 export async function handleLogPath(
@@ -164,19 +225,19 @@ enum FileType {
   'file',
 }
 
-export interface IFile {
+interface IFile {
   title: string;
   key: string;
   type: 'directory' | 'file';
   parent: string;
-  createTime: number;
+  mtime: number;
   size?: number;
   children?: IFile[];
 }
 
 export function dirSort(a: IFile, b: IFile): number {
   if (a.type === 'file' && b.type === 'file') {
-    return b.createTime - a.createTime;
+    return b.mtime - a.mtime;
   } else if (a.type === 'directory' && b.type === 'directory') {
     return a.title.localeCompare(b.title);
   } else {
@@ -196,7 +257,7 @@ export async function readDirs(
 
   for (const file of files) {
     const subPath = path.join(dir, file);
-    const stats = await fs.lstat(subPath);
+    const stats = await fs.stat(subPath);
     const key = path.join(relativePath, file);
 
     if (blacklist.includes(file) || stats.isSymbolicLink()) {
@@ -210,7 +271,7 @@ export async function readDirs(
         key,
         type: 'directory',
         parent: relativePath,
-        createTime: stats.birthtime.getTime(),
+        mtime: stats.mtime.getTime(),
         children: children.sort(sort),
       });
     } else {
@@ -220,7 +281,7 @@ export async function readDirs(
         key,
         parent: relativePath,
         size: stats.size,
-        createTime: stats.birthtime.getTime(),
+        mtime: stats.mtime.getTime(),
       });
     }
   }
@@ -232,51 +293,23 @@ export async function readDir(
   dir: string,
   baseDir: string = '',
   blacklist: string[] = [],
-): Promise<IFile[]> {
+) {
-  const absoluteDir = path.join(baseDir, dir);
+  const relativePath = path.relative(baseDir, dir);
-  const relativePath = path.relative(baseDir, absoluteDir);
+  const files = await fs.readdir(dir);
-
+  const result: any = files
-  try {
+    .filter((x) => !blacklist.includes(x))
-    const files = await fs.readdir(absoluteDir);
+    .map(async (file: string) => {
-    const result: IFile[] = [];
+      const subPath = path.join(dir, file);
-
+      const stats = await fs.stat(subPath);
-    for (const file of files) {
-      const subPath = path.join(absoluteDir, file);
-      const stats = await fs.lstat(subPath);
       const key = path.join(relativePath, file);
-
+      return {
-      if (blacklist.includes(file) || stats.isSymbolicLink()) {
+        title: file,
-        continue;
+        type: stats.isDirectory() ? 'directory' : 'file',
-      }
+        key,
-
+        parent: relativePath,
-      if (stats.isDirectory()) {
+      };
-        result.push({
+    });
-          title: file,
+  return result;
-          type: 'directory',
-          key,
-          parent: relativePath,
-          createTime: stats.birthtime.getTime(),
-          children: [],
-        });
-      } else {
-        result.push({
-          title: file,
-          type: 'file',
-          key,
-          parent: relativePath,
-          size: stats.size,
-          createTime: stats.birthtime.getTime(),
-        });
-      }
-    }
-
-    return result;
-  } catch (error: any) {
-    if (error.code === 'ENOENT') {
-      return [];
-    }
-    throw error;
-  }
 }
 
 export async function promiseExec(command: string): Promise<string> {
@@ -307,9 +340,9 @@ export function parseHeaders(headers: string) {
   if (!headers) return {};
 
   const parsed: any = {};
-  let key: string;
+  let key;
-  let val: string;
+  let val;
-  let i: number;
+  let i;
 
   headers &&
     headers.split('\n').forEach(function parser(line) {
@@ -327,10 +360,7 @@ export function parseHeaders(headers: string) {
   return parsed;
 }
 
-function parseString(
+function parseString(input: string): Record<string, string> {
-  input: string,
-  valueFormatFn?: (v: string) => string,
-): Record<string, string> {
   const regex = /(\w+):\s*((?:(?!\n\w+:).)*)/g;
   const matches: Record<string, string> = {};
 
@@ -342,10 +372,9 @@ function parseString(
       continue;
     }
 
-    let _value = value.trim();
+    const _value = value.trim();
 
     try {
-      _value = valueFormatFn ? valueFormatFn(_value) : _value;
       const jsonValue = JSON.parse(_value);
       matches[_key] = jsonValue;
     } catch (error) {
@@ -363,13 +392,12 @@ export function parseBody(
     | 'multipart/form-data'
     | 'application/x-www-form-urlencoded'
     | 'text/plain',
-  valueFormatFn?: (v: string) => string,
 ) {
   if (contentType === 'text/plain' || !body) {
-    return valueFormatFn && body ? valueFormatFn(body) : body;
+    return body;
   }
 
-  const parsed = parseString(body, valueFormatFn);
+  const parsed = parseString(body);
 
   switch (contentType) {
     case 'multipart/form-data':
@@ -388,11 +416,11 @@ export function parseBody(
 
 export function psTree(pid: number): Promise<number[]> {
   return new Promise((resolve, reject) => {
-    psTreeFun(pid, (err: any, children) => {
+    psTreeFun(pid, (err: any, pids: number[]) => {
       if (err) {
         reject(err);
       }
-      resolve(children.map((x) => Number(x.PID)).filter((x) => !isNaN(x)));
+      resolve(pids.filter((x) => !isNaN(x)));
     });
   });
 }
@@ -428,7 +456,7 @@ export async function parseVersion(path: string): Promise<IVersion> {
   return load(await fs.readFile(path, 'utf8')) as IVersion;
 }
 
-export function parseContentVersion(content: string): IVersion {
+export async function parseContentVersion(content: string): Promise<IVersion> {
   return load(content) as IVersion;
 }
 
@@ -436,18 +464,13 @@ export async function getUniqPath(
   command: string,
   id: string,
 ): Promise<string> {
-  let suffix = '';
   if (/^\d+$/.test(id)) {
-    suffix = `_${id}`;
+    id = `_${id}`;
-  }
+  } else {
-
+    id = '';
-  let items = command.split(/ +/);
-
-  const maxTimeCommandIndex = items.findIndex((x) => x === '-m');
-  if (maxTimeCommandIndex !== -1) {
-    items = items.slice(maxTimeCommandIndex + 2);
   }
 
+  const items = command.split(/ +/);
   let str = items[0];
   if (items[0] === TASK_COMMAND) {
     str = items[1];
@@ -471,7 +494,7 @@ export async function getUniqPath(
     str = `${tempStr}_${str.slice(slashIndex + 1)}`;
   }
 
-  return `${str}${suffix}`;
+  return `${str}${id}`;
 }
 
 export function safeJSONParse(value?: string) {
@@ -482,7 +505,7 @@ export function safeJSONParse(value?: string) {
   try {
     return JSON.parse(value);
   } catch (error) {
-    Logger.error('[safeJSONParse失败]', error);
+    Logger.error('[JSON.parse失败]', error);
     return {};
   }
 }
@@ -497,75 +520,3 @@ export async function rmPath(path: string) {
     Logger.error('[rmPath失败]', error);
   }
 }
-
-export async function setSystemTimezone(timezone: string): Promise<boolean> {
-  try {
-    if (!(await fileExist(`/usr/share/zoneinfo/${timezone}`))) {
-      throw new Error('Invalid timezone');
-    }
-
-    await promiseExec(`ln -sf /usr/share/zoneinfo/${timezone} /etc/localtime`);
-    await promiseExec(`echo "${timezone}" > /etc/timezone`);
-
-    return true;
-  } catch (error) {
-    Logger.error('[setSystemTimezone失败]', error);
-    return false;
-  }
-}
-
-export function getGetCommand(type: DependenceTypes, name: string): string {
-  const baseCommands = {
-    [DependenceTypes.nodejs]: `pnpm ls -g  | grep "${name}" | head -1`,
-    [DependenceTypes.python3]: `
-    python3 -c "exec('''
-name='${name}'
-try:
-    from importlib.metadata import version
-    print(version(name))
-except:
-    import importlib.util as u
-    import importlib.metadata as m
-    spec=u.find_spec(name)
-    print(name if spec else '')
-''')"`,
-    [DependenceTypes.linux]: `apk info -es ${name}`,
-  };
-
-  return baseCommands[type];
-}
-
-export function getInstallCommand(type: DependenceTypes, name: string): string {
-  const baseCommands = {
-    [DependenceTypes.nodejs]: 'pnpm add -g',
-    [DependenceTypes.python3]:
-      'pip3 install --disable-pip-version-check --root-user-action=ignore',
-    [DependenceTypes.linux]: 'apk add --no-check-certificate',
-  };
-
-  let command = baseCommands[type];
-
-  if (type === DependenceTypes.python3 && PYTHON_INSTALL_DIR) {
-    command = `${command} --prefix=${PYTHON_INSTALL_DIR}`;
-  }
-
-  return `${command} ${name.trim()}`;
-}
-
-export function getUninstallCommand(
-  type: DependenceTypes,
-  name: string,
-): string {
-  const baseCommands = {
-    [DependenceTypes.nodejs]: 'pnpm remove -g',
-    [DependenceTypes.python3]:
-      'pip3 uninstall --disable-pip-version-check --root-user-action=ignore -y',
-    [DependenceTypes.linux]: 'apk del',
-  };
-
-  return `${baseCommands[type]} ${name.trim()}`;
-}
-
-export function isDemoEnv() {
-  return process.env.DeployEnv === 'demo';
-}

back/data/dependence.ts

@@ -41,12 +41,30 @@ export enum DependenceTypes {
   'linux',
 }
 
+export enum InstallDependenceCommandTypes {
+  'pnpm add -g',
+  'pip3 install --disable-pip-version-check --root-user-action=ignore',
+  'apk add --no-check-certificate',
+}
+
+export enum GetDependenceCommandTypes {
+  'pnpm ls -g ',
+  'pip3 show --disable-pip-version-check',
+  'apk info -es',
+}
+
 export enum versionDependenceCommandTypes {
   '@',
   '==',
   '=',
 }
 
+export enum unInstallDependenceCommandTypes {
+  'pnpm remove -g',
+  'pip3 uninstall --disable-pip-version-check --root-user-action=ignore -y',
+  'apk del',
+}
+
 export interface DependenceInstance
   extends Model<Dependence, Dependence>,
     Dependence {}

back/data/env.ts

@@ -20,7 +20,7 @@ export class Env {
     this.timestamp = new Date().toString();
     this.position = options.position;
     this.name = options.name;
-    this.remarks = options.remarks || '';
+    this.remarks = options.remarks;
   }
 }
 

back/data/notify.ts

@@ -1,3 +1,5 @@
+import { IncomingHttpHeaders } from 'http';
+
 export enum NotificationMode {
   'gotify' = 'gotify',
   'goCqHttpBot' = 'goCqHttpBot',
@@ -12,14 +14,11 @@ export enum NotificationMode {
   'aibotk' = 'aibotk',
   'iGot' = 'iGot',
   'pushPlus' = 'pushPlus',
-  'wePlusBot' = 'wePlusBot',
   'email' = 'email',
   'pushMe' = 'pushMe',
   'feishu' = 'feishu',
   'webhook' = 'webhook',
   'chronocat' = 'Chronocat',
-  'ntfy' = 'ntfy',
-  'wxPusherBot' = 'wxPusherBot',
 }
 
 abstract class NotificationBaseInfo {
@@ -47,8 +46,9 @@ export class PushDeerNotification extends NotificationBaseInfo {
   public pushDeerUrl = '';
 }
 
-export class synologyChatNotification extends NotificationBaseInfo {
+export class ChatNotification extends NotificationBaseInfo {
-  public synologyChatUrl = '';
+  public chatUrl = '';
+  public chatToken = '';
 }
 
 export class BarkNotification extends NotificationBaseInfo {
@@ -58,7 +58,6 @@ export class BarkNotification extends NotificationBaseInfo {
   public barkGroup = 'qinglong';
   public barkLevel = 'active';
   public barkUrl = '';
-  public barkArchive = '';
 }
 
 export class TelegramBotNotification extends NotificationBaseInfo {
@@ -98,29 +97,16 @@ export class IGotNotification extends NotificationBaseInfo {
 export class PushPlusNotification extends NotificationBaseInfo {
   public pushPlusToken = '';
   public pushPlusUser = '';
-  public pushPlusTemplate = '';
-  public pushplusChannel = '';
-  public pushplusWebhook = '';
-  public pushplusCallbackUrl = '';
-  public pushplusTo = '';
-}
-
-export class WePlusBotNotification extends NotificationBaseInfo {
-  public wePlusBotToken = '';
-  public wePlusBotReceiver = '';
-  public wePlusBotVersion = '';
 }
 
 export class EmailNotification extends NotificationBaseInfo {
   public emailService: string = '';
   public emailUser: string = '';
   public emailPass: string = '';
-  public emailTo: string = '';
 }
 
 export class PushMeNotification extends NotificationBaseInfo {
   public pushMeKey: string = '';
-  public pushMeUrl: string = '';
 }
 
 export class ChronocatNotification extends NotificationBaseInfo {
@@ -144,28 +130,12 @@ export class LarkNotification extends NotificationBaseInfo {
   public larkKey = '';
 }
 
-export class NtfyNotification extends NotificationBaseInfo {
-  public ntfyUrl = '';
-  public ntfyTopic = '';
-  public ntfyPriority = '';
-  public ntfyToken = '';
-  public ntfyUsername = '';
-  public ntfyPassword = '';
-  public ntfyActions = '';
-}
-
-export class WxPusherBotNotification extends NotificationBaseInfo {
-  public wxPusherBotAppToken = '';
-  public wxPusherBotTopicIds = '';
-  public wxPusherBotUids = '';
-}
-
 export interface NotificationInfo
   extends GoCqHttpBotNotification,
     GotifyNotification,
     ServerChanNotification,
     PushDeerNotification,
-    synologyChatNotification,
+    ChatNotification,
     BarkNotification,
     TelegramBotNotification,
     DingtalkBotNotification,
@@ -174,11 +144,9 @@ export interface NotificationInfo
     AibotkNotification,
     IGotNotification,
     PushPlusNotification,
-    WePlusBotNotification,
     EmailNotification,
     PushMeNotification,
     WebhookNotification,
     ChronocatNotification,
-    LarkNotification,
+    LarkNotification {}
-    NtfyNotification,
+    
-    WxPusherBotNotification {}

back/data/open.ts

@@ -24,7 +24,7 @@ export interface AppToken {
   expiration: number;
 }
 
-export type AppScope = 'envs' | 'crons' | 'configs' | 'scripts' | 'logs' | 'system';
+export type AppScope = 'envs' | 'crons' | 'configs' | 'scripts' | 'logs';
 
 export interface AppInstance extends Model<App, App>, App {}
 export const AppModel = sequelize.define<AppInstance>('App', {

back/data/system.ts

@@ -2,13 +2,13 @@ import { sequelize } from '.';
 import { DataTypes, Model, ModelDefined } from 'sequelize';
 import { NotificationInfo } from './notify';
 
-export class SystemInfo {
+export class AuthInfo {
   ip?: string;
   type: AuthDataType;
   info?: SystemModelInfo;
   id?: number;
 
-  constructor(options: SystemInfo) {
+  constructor(options: AuthInfo) {
     this.ip = options.ip;
     this.info = options.info;
     this.type = options.type;
@@ -27,7 +27,6 @@ export enum AuthDataType {
   'notification' = 'notification',
   'removeLogFrequency' = 'removeLogFrequency',
   'systemConfig' = 'systemConfig',
-  'authConfig' = 'authConfig',
 }
 
 export interface SystemConfigInfo {
@@ -37,7 +36,6 @@ export interface SystemConfigInfo {
   nodeMirror?: string;
   pythonMirror?: string;
   linuxMirror?: string;
-  timezone?: string;
 }
 
 export interface LoginLogInfo {
@@ -48,30 +46,11 @@ export interface LoginLogInfo {
   status?: LoginStatus;
 }
 
-export interface AuthInfo {
-  username: string;
-  password: string;
-  retries: number;
-  lastlogon: number;
-  lastip: string;
-  lastaddr: string;
-  platform: string;
-  isTwoFactorChecking: boolean;
-  token: string;
-  tokens: Record<string, string>;
-  twoFactorActivated: boolean;
-  twoFactorSecret: string;
-  avatar: string;
-}
-
 export type SystemModelInfo = SystemConfigInfo &
   Partial<NotificationInfo> &
-  LoginLogInfo &
+  LoginLogInfo;
-  Partial<AuthInfo>;
 
-export interface SystemInstance
+export interface SystemInstance extends Model<AuthInfo, AuthInfo>, AuthInfo { }
-  extends Model<SystemInfo, SystemInfo>,
-    SystemInfo {}
 export const SystemModel = sequelize.define<SystemInstance>('Auth', {
   ip: DataTypes.STRING,
   type: DataTypes.STRING,

back/index.d.ts

@@ -0,0 +1,7 @@
+declare namespace Express {
+  interface Request {
+    platform: 'desktop' | 'mobile';
+  }
+}
+
+declare module 'pstree.remy';

back/interface/schedule.ts

@@ -1,13 +0,0 @@
-export enum ScheduleType {
-  BOOT = '@boot',
-  ONCE = '@once',
-}
-
-export type ScheduleValidator = (schedule?: string) => boolean;
-export type CronSchedulerPayload = {
-  name: string;
-  id: string;
-  schedule: string;
-  command: string;
-  extra_schedules: Array<{ schedule: string }>;
-};

back/loaders/app.ts

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

back/loaders/bootAfter.ts

@@ -1,8 +0,0 @@
-import Container from 'typedi';
-import CronService from '../services/cron';
-
-export default async () => {
-  const cronService = Container.get(CronService);
-
-  await cronService.bootTask();
-};

back/loaders/db.ts

@@ -1,11 +1,15 @@
 import Logger from './logger';
+import path from 'path';
+import DataStore from 'nedb';
 import { EnvModel } from '../data/env';
 import { CrontabModel } from '../data/cron';
 import { DependenceModel } from '../data/dependence';
 import { AppModel } from '../data/open';
 import { SystemModel } from '../data/system';
+import { fileExist } from '../config/util';
 import { SubscriptionModel } from '../data/subscription';
 import { CrontabViewModel } from '../data/cronView';
+import config from '../config';
 import { sequelize } from '../data';
 
 export default async () => {
@@ -44,21 +48,93 @@ export default async () => {
     } catch (error) {}
     try {
       await sequelize.query('alter table Crontabs add column sub_id NUMBER');
-    } catch (error) {}
+    } catch (error) { }
     try {
-      await sequelize.query(
+      await sequelize.query('alter table Crontabs add column extra_schedules JSON');
-        'alter table Crontabs add column extra_schedules JSON',
+    } catch (error) { }
-      );
-    } catch (error) {}
     try {
       await sequelize.query('alter table Crontabs add column task_before TEXT');
-    } catch (error) {}
+    } catch (error) { }
     try {
       await sequelize.query('alter table Crontabs add column task_after TEXT');
-    } catch (error) {}
+    } catch (error) { }
 
+    // 2.10-2.11 升级
+    const cronDbFile = path.join(config.rootPath, 'db/crontab.db');
+    const envDbFile = path.join(config.rootPath, 'db/env.db');
+    const appDbFile = path.join(config.rootPath, 'db/app.db');
+    const authDbFile = path.join(config.rootPath, 'db/auth.db');
+    const dependenceDbFile = path.join(config.rootPath, 'db/dependence.db');
+    const crondbExist = await fileExist(cronDbFile);
+    const dependenceDbExist = await fileExist(dependenceDbFile);
+    const envDbExist = await fileExist(envDbFile);
+    const appDbExist = await fileExist(appDbFile);
+    const authDbExist = await fileExist(authDbFile);
+
+    const cronCount = await CrontabModel.count();
+    const dependenceCount = await DependenceModel.count();
+    const envCount = await EnvModel.count();
+    const appCount = await AppModel.count();
+    const authCount = await SystemModel.count();
+    if (crondbExist && cronCount === 0) {
+      const cronDb = new DataStore({
+        filename: cronDbFile,
+        autoload: true,
+      });
+      cronDb.persistence.compactDatafile();
+      cronDb.find({}).exec(async (err, docs) => {
+        await CrontabModel.bulkCreate(docs, { ignoreDuplicates: true });
+      });
+    }
+
+    if (dependenceDbExist && dependenceCount === 0) {
+      const dependenceDb = new DataStore({
+        filename: dependenceDbFile,
+        autoload: true,
+      });
+      dependenceDb.persistence.compactDatafile();
+      dependenceDb.find({}).exec(async (err, docs) => {
+        await DependenceModel.bulkCreate(docs, { ignoreDuplicates: true });
+      });
+    }
+
+    if (envDbExist && envCount === 0) {
+      const envDb = new DataStore({
+        filename: envDbFile,
+        autoload: true,
+      });
+      envDb.persistence.compactDatafile();
+      envDb.find({}).exec(async (err, docs) => {
+        await EnvModel.bulkCreate(docs, { ignoreDuplicates: true });
+      });
+    }
+
+    if (appDbExist && appCount === 0) {
+      const appDb = new DataStore({
+        filename: appDbFile,
+        autoload: true,
+      });
+      appDb.persistence.compactDatafile();
+      appDb.find({}).exec(async (err, docs) => {
+        await AppModel.bulkCreate(docs, { ignoreDuplicates: true });
+      });
+    }
+
+    if (authDbExist && authCount === 0) {
+      const authDb = new DataStore({
+        filename: authDbFile,
+        autoload: true,
+      });
+      authDb.persistence.compactDatafile();
+      authDb.find({}).exec(async (err, docs) => {
+        await SystemModel.bulkCreate(docs, { ignoreDuplicates: true });
+      });
+    }
+
+    console.log('✌️ DB loaded');
     Logger.info('✌️ DB loaded');
   } catch (error) {
-    Logger.error('✌️ DB load failed', error);
+    console.error('✌️ DB load failed');
+    Logger.error(error);
   }
 };

back/loaders/deps.ts

@@ -13,7 +13,7 @@ async function linkToNodeModule(src: string, dst?: string) {
     if (!stats) {
       await fs.symlink(source, target, 'dir');
     }
-  } catch (error) { }
+  } catch (error) {}
 }
 
 async function linkCommand() {
@@ -23,27 +23,18 @@ async function linkCommand() {
     {
       src: 'update.sh',
       dest: 'ql',
-      tmp: 'ql_tmp',
     },
     {
       src: 'task.sh',
       dest: 'task',
-      tmp: 'task_tmp',
     },
   ];
 
   for (const link of linkShell) {
     const source = path.join(config.rootPath, 'shell', link.src);
     const target = path.join(commandDir, link.dest);
-    const tmpTarget = path.join(commandDir, link.tmp);
+    await rmPath(target);
-    try {
+    await fs.symlink(source, target);
-      const stats = await fs.lstat(tmpTarget);
-      if (stats) {
-        await fs.unlink(tmpTarget);
-      }
-    } catch (error) { }
-    await fs.symlink(source, tmpTarget);
-    await fs.rename(tmpTarget, target);
   }
 }
 

back/loaders/express.ts

@@ -3,13 +3,19 @@ import bodyParser from 'body-parser';
 import cors from 'cors';
 import routes from '../api';
 import config from '../config';
-import { UnauthorizedError, expressjwt } from 'express-jwt';
+import jwt, { UnauthorizedError } from 'express-jwt';
-import { getPlatform, getToken } from '../config/util';
+import fs from 'fs/promises';
+import { getPlatform, getToken, safeJSONParse } from '../config/util';
+import Container from 'typedi';
+import OpenService from '../services/open';
 import rewrite from 'express-urlrewrite';
+import UserService from '../services/user';
+import * as Sentry from '@sentry/node';
+import { EnvModel } from '../data/env';
 import { errors } from 'celebrate';
+import { createProxyMiddleware } from 'http-proxy-middleware';
 import { serveEnv } from '../config/serverEnv';
-import { IKeyvStore, shareStore } from '../shared/store';
+import Logger from './logger';
-import path from 'path';
 
 export default ({ app }: { app: Application }) => {
   app.set('trust proxy', 'loopback');
@@ -17,18 +23,25 @@ export default ({ app }: { app: Application }) => {
   app.get(`${config.api.prefix}/env.js`, serveEnv);
   app.use(`${config.api.prefix}/static`, express.static(config.uploadPath));
 
+  app.use(
+    '/api/public',
+    createProxyMiddleware({
+      target: `http://0.0.0.0:${config.publicPort}/api`,
+      changeOrigin: true,
+      pathRewrite: { '/api/public': '' },
+      logProvider: () => Logger,
+    }),
+  );
+
   app.use(bodyParser.json({ limit: '50mb' }));
   app.use(bodyParser.urlencoded({ limit: '50mb', extended: true }));
 
-  const frontendPath = path.join(config.rootPath, 'static/dist');
-  app.use(express.static(frontendPath));
-
   app.use(
-    expressjwt({
+    jwt({
-      secret: config.jwt.secret,
+      secret: config.secret,
       algorithms: ['HS384'],
     }).unless({
-      path: [...config.apiWhiteList, /^\/(?!api\/).*/],
+      path: [...config.apiWhiteList, /^\/open\//],
     }),
   );
 
@@ -42,17 +55,11 @@ export default ({ app }: { app: Application }) => {
     return next();
   });
 
-  app.use(async (req: Request, res, next) => {
+  app.use(async (req, res, next) => {
-    if (!['/open/', '/api/'].some((x) => req.path.startsWith(x))) {
-      return next();
-    }
-
     const headerToken = getToken(req);
     if (req.path.startsWith('/open/')) {
-      const apps = await shareStore.getApps();
+      const openService = Container.get(OpenService);
-      const doc = apps?.filter((x) =>
+      const doc = await openService.findTokenByValue(headerToken);
-        x.tokens?.find((y) => y.value === headerToken),
-      )?.[0];
       if (doc && doc.tokens && doc.tokens.length > 0) {
         const currentToken = doc.tokens.find((x) => x.value === headerToken);
         const keyMatch = req.path.match(/\/open\/([a-z]+)\/*/);
@@ -76,9 +83,9 @@ export default ({ app }: { app: Application }) => {
       return next();
     }
 
-    const authInfo = await shareStore.getAuthInfo();
+    const data = await fs.readFile(config.authConfigFile, 'utf8');
-    if (authInfo && headerToken) {
+    if (data && headerToken) {
-      const { token = '', tokens = {} } = authInfo;
+      const { token = '', tokens = {} } = safeJSONParse(data);
       if (headerToken === token || tokens[req.platform] === headerToken) {
         return next();
       }
@@ -96,8 +103,8 @@ export default ({ app }: { app: Application }) => {
     if (!['/api/user/init', '/api/user/notification/init'].includes(req.path)) {
       return next();
     }
-    const authInfo =
+    const userService = Container.get(UserService);
-      (await shareStore.getAuthInfo()) || ({} as IKeyvStore['authInfo']);
+    const authInfo = await userService.getUserInfo();
 
     let isInitialized = true;
     if (
@@ -118,15 +125,10 @@ export default ({ app }: { app: Application }) => {
   app.use(rewrite('/open/*', '/api/$1'));
   app.use(config.api.prefix, routes());
 
-  app.get('*', (_, res, next) => {
+  app.use((req, res, next) => {
-    const indexPath = path.join(frontendPath, 'index.html');
+    const err: any = new Error('Not Found');
-    res.sendFile(indexPath, (err) => {
+    err['status'] = 404;
-      if (err) {
+    next(err);
-        const err: any = new Error('Not Found');
-        err['status'] = 404;
-        next(err);
-      }
-    });
   });
 
   app.use(errors());
@@ -160,8 +162,8 @@ export default ({ app }: { app: Application }) => {
           .status(500)
           .send({
             code: 400,
-            message: `${err.message}`,
+            message: `${err.name} ${err.message}`,
-            errors: err.errors,
+            validation: err.errors,
           })
           .end();
       }
@@ -176,6 +178,8 @@ export default ({ app }: { app: Application }) => {
       res: Response,
       next: NextFunction,
     ) => {
+      Sentry.captureException(err);
+
       res.status(err.status || 500);
       res.json({
         code: err.status || 500,

back/loaders/initData.ts

@@ -11,90 +11,35 @@ import { CrontabViewModel, CronViewType } from '../data/cronView';
 import { initPosition } from '../data/env';
 import { AuthDataType, SystemModel } from '../data/system';
 import SystemService from '../services/system';
-import UserService from '../services/user';
-import { writeFile, readFile } from 'fs/promises';
-import { createRandomString, fileExist, safeJSONParse } from '../config/util';
-import OpenService from '../services/open';
-import { shareStore } from '../shared/store';
-import Logger from './logger';
-import { AppModel } from '../data/open';
 
 export default async () => {
   const cronService = Container.get(CronService);
   const envService = Container.get(EnvService);
   const dependenceService = Container.get(DependenceService);
   const systemService = Container.get(SystemService);
-  const userService = Container.get(UserService);
-  const openService = Container.get(OpenService);
 
-  // 初始化增加系统配置
+  const installDependencies = () => {
-  let systemApp = (
+    // 初始化时安装所有处于安装中，安装成功，安装失败的依赖
-    await AppModel.findOne({
+    DependenceModel.findAll({
-      where: { name: 'system' },
-    })
-  )?.get({ plain: true });
-  if (!systemApp) {
-    systemApp = await AppModel.create({
-      name: 'system',
-      scopes: ['crons', 'system'],
-      client_id: createRandomString(12, 12),
-      client_secret: createRandomString(24, 24),
-    });
-  }
-  const [systemConfig] = await SystemModel.findOrCreate({
-    where: { type: AuthDataType.systemConfig },
-  });
-  await SystemModel.findOrCreate({
-    where: { type: AuthDataType.notification },
-  });
-  const [authConfig] = await SystemModel.findOrCreate({
-    where: { type: AuthDataType.authConfig },
-  });
-  if (!authConfig?.info) {
-    let authInfo = {
-      username: 'admin',
-      password: 'admin',
-    };
-    try {
-      const authFileExist = await fileExist(config.authConfigFile);
-      if (authFileExist) {
-        const content = await readFile(config.authConfigFile, 'utf8');
-        authInfo = safeJSONParse(content);
-      }
-    } catch (error) {
-      Logger.warn('Failed to read auth config file, using default credentials');
-    }
-    await SystemModel.upsert({
-      id: authConfig?.id,
-      info: authInfo,
-      type: AuthDataType.authConfig,
-    });
-  }
-
-  const installDependencies = async () => {
-    const docs = await 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);
     });
-
-    await DependenceModel.update(
-      { status: DependenceStatus.queued, log: [] },
-      { where: { id: docs.map((x) => x.id!) } },
-    );
-
-    setTimeout(async () => {
-      await dependenceService.installDependenceOneByOne(docs);
-
-      const bootAfterLoader = await import('./bootAfter');
-      bootAfterLoader.default();
-    }, 5000);
   };
 
   // 初始化更新 linux/python/nodejs 镜像源配置
+  const systemConfig = await systemService.getSystemConfig();
   if (systemConfig.info?.pythonMirror) {
     systemService.updatePythonMirror({
       pythonMirror: systemConfig.info?.pythonMirror,
@@ -176,7 +121,7 @@ export default async () => {
         if (doc.command.includes(`${config.rootPath}/log/`)) {
           await CrontabModel.update(
             {
-              command: `${config.dataPath}/log/${doc.command.replace(
+              command: `${config.rootPath}/data/log/${doc.command.replace(
                 `${config.rootPath}/log/`,
                 '',
               )}`,
@@ -187,7 +132,7 @@ export default async () => {
         if (doc.command.includes(`${config.rootPath}/config/`)) {
           await CrontabModel.update(
             {
-              command: `${config.dataPath}/config/${doc.command.replace(
+              command: `${config.rootPath}/data/config/${doc.command.replace(
                 `${config.rootPath}/config/`,
                 '',
               )}`,
@@ -198,7 +143,7 @@ export default async () => {
         if (doc.command.includes(`${config.rootPath}/db/`)) {
           await CrontabModel.update(
             {
-              command: `${config.dataPath}/db/${doc.command.replace(
+              command: `${config.rootPath}/data/db/${doc.command.replace(
                 `${config.rootPath}/db/`,
                 '',
               )}`,
@@ -214,10 +159,6 @@ export default async () => {
   await cronService.autosave_crontab();
   await envService.set_envs();
 
-  const authInfo = await userService.getAuthInfo();
+  // 初始化增加系统配置
-  const apps = await openService.findApps();
+  await SystemModel.upsert({ type: AuthDataType.systemConfig });
-  await shareStore.updateAuthInfo(authInfo);
-  if (apps?.length) {
-    await shareStore.updateApps(apps);
-  }
 };

back/loaders/initFile.ts

@@ -3,16 +3,9 @@ import path from 'path';
 import os from 'os';
 import Logger from './logger';
 import { fileExist } from '../config/util';
-import { writeFileWithLock } from '../shared/utils';
 
 const rootPath = process.env.QL_DIR as string;
-let dataPath = path.join(rootPath, 'data/');
+const dataPath = path.join(rootPath, 'data/');
-
-if (process.env.QL_DATA_DIR) {
-  dataPath = process.env.QL_DATA_DIR.replace(/\/$/g, '');
-}
-
-const preloadPath = path.join(rootPath, 'shell/preload/');
 const configPath = path.join(dataPath, 'config/');
 const scriptPath = path.join(dataPath, 'scripts/');
 const logPath = path.join(dataPath, 'log/');
@@ -21,107 +14,105 @@ const bakPath = path.join(dataPath, 'bak/');
 const samplePath = path.join(rootPath, 'sample/');
 const tmpPath = path.join(logPath, '.tmp/');
 const confFile = path.join(configPath, 'config.sh');
+const authConfigFile = path.join(configPath, 'auth.json');
 const sampleConfigFile = path.join(samplePath, 'config.sample.sh');
+const sampleAuthFile = path.join(samplePath, 'auth.sample.json');
 const sampleTaskShellFile = path.join(samplePath, 'task.sample.sh');
 const sampleNotifyJsFile = path.join(samplePath, 'notify.js');
 const sampleNotifyPyFile = path.join(samplePath, 'notify.py');
 const scriptNotifyJsFile = path.join(scriptPath, 'sendNotify.js');
 const scriptNotifyPyFile = path.join(scriptPath, 'notify.py');
-const jsNotifyFile = path.join(preloadPath, '__ql_notify__.js');
-const pyNotifyFile = path.join(preloadPath, '__ql_notify__.py');
 const TaskBeforeFile = path.join(configPath, 'task_before.sh');
-const TaskBeforeJsFile = path.join(configPath, 'task_before.js');
-const TaskBeforePyFile = path.join(configPath, 'task_before.py');
 const TaskAfterFile = path.join(configPath, 'task_after.sh');
 const homedir = os.homedir();
 const sshPath = path.resolve(homedir, '.ssh');
 const sshdPath = path.join(dataPath, 'ssh.d');
 const systemLogPath = path.join(dataPath, 'syslog');
 
-const directories = [
-  configPath,
-  scriptPath,
-  preloadPath,
-  logPath,
-  tmpPath,
-  uploadPath,
-  sshPath,
-  bakPath,
-  sshdPath,
-  systemLogPath,
-];
-
-const files = [
-  {
-    target: confFile,
-    source: sampleConfigFile,
-    checkExistence: true,
-  },
-  {
-    target: jsNotifyFile,
-    source: sampleNotifyJsFile,
-    checkExistence: false,
-  },
-  {
-    target: pyNotifyFile,
-    source: sampleNotifyPyFile,
-    checkExistence: false,
-  },
-  {
-    target: scriptNotifyJsFile,
-    source: sampleNotifyJsFile,
-    checkExistence: true,
-  },
-  {
-    target: scriptNotifyPyFile,
-    source: sampleNotifyPyFile,
-    checkExistence: true,
-  },
-  {
-    target: TaskBeforeFile,
-    source: sampleTaskShellFile,
-    checkExistence: true,
-  },
-  {
-    target: TaskBeforeJsFile,
-    content:
-      '// The JavaScript code that executes before the JavaScript task execution will execute.',
-    checkExistence: true,
-  },
-  {
-    target: TaskBeforePyFile,
-    content:
-      '# The Python code that executes before the Python task execution will execute.',
-    checkExistence: true,
-  },
-  {
-    target: TaskAfterFile,
-    source: sampleTaskShellFile,
-    checkExistence: true,
-  },
-];
-
 export default async () => {
-  for (const dirPath of directories) {
+  const authFileExist = await fileExist(authConfigFile);
-    if (!(await fileExist(dirPath))) {
+  const confFileExist = await fileExist(confFile);
-      await fs.mkdir(dirPath);
+  const scriptDirExist = await fileExist(scriptPath);
-    }
+  const logDirExist = await fileExist(logPath);
+  const configDirExist = await fileExist(configPath);
+  const uploadDirExist = await fileExist(uploadPath);
+  const sshDirExist = await fileExist(sshPath);
+  const bakDirExist = await fileExist(bakPath);
+  const sshdDirExist = await fileExist(sshdPath);
+  const systemLogDirExist = await fileExist(systemLogPath);
+  const tmpDirExist = await fileExist(tmpPath);
+  const scriptNotifyJsFileExist = await fileExist(scriptNotifyJsFile);
+  const scriptNotifyPyFileExist = await fileExist(scriptNotifyPyFile);
+  const TaskBeforeFileExist = await fileExist(TaskBeforeFile);
+  const TaskAfterFileExist = await fileExist(TaskAfterFile);
+
+  if (!configDirExist) {
+    await fs.mkdir(configPath);
   }
 
-  for (const item of files) {
+  if (!scriptDirExist) {
-    const exists = await fileExist(item.target);
+    await fs.mkdir(scriptPath);
-    if (!item.checkExistence || !exists) {
+  }
-      if (!item.content && !item.source) {
+
-        throw new Error(
+  if (!logDirExist) {
-          `Neither content nor source specified for ${item.target}`,
+    await fs.mkdir(logPath);
-        );
+  }
-      }
+
-      const content =
+  if (!tmpDirExist) {
-        item.content ||
+    await fs.mkdir(tmpPath);
-        (await fs.readFile(item.source!, { encoding: 'utf-8' }));
+  }
-      await writeFileWithLock(item.target, content);
+
-    }
+  if (!uploadDirExist) {
+    await fs.mkdir(uploadPath);
+  }
+
+  if (!sshDirExist) {
+    await fs.mkdir(sshPath);
+  }
+
+  if (!bakDirExist) {
+    await fs.mkdir(bakPath);
+  }
+
+  if (!sshdDirExist) {
+    await fs.mkdir(sshdPath);
+  }
+
+  if (!systemLogDirExist) {
+    await fs.mkdir(systemLogPath);
+  }
+
+  // 初始化文件
+  if (!authFileExist) {
+    await fs.writeFile(authConfigFile, await fs.readFile(sampleAuthFile));
+  }
+
+  if (!confFileExist) {
+    await fs.writeFile(confFile, await fs.readFile(sampleConfigFile));
+  }
+
+  if (!scriptNotifyJsFileExist) {
+    await fs.writeFile(
+      scriptNotifyJsFile,
+      await fs.readFile(sampleNotifyJsFile),
+    );
+  }
+
+  if (!scriptNotifyPyFileExist) {
+    await fs.writeFile(
+      scriptNotifyPyFile,
+      await fs.readFile(sampleNotifyPyFile),
+    );
+  }
+
+  if (!TaskBeforeFileExist) {
+    await fs.writeFile(TaskBeforeFile, await fs.readFile(sampleTaskShellFile));
+  }
+
+  if (!TaskAfterFileExist) {
+    await fs.writeFile(TaskAfterFile, await fs.readFile(sampleTaskShellFile));
   }
 
   Logger.info('✌️ Init file down');
+  console.log('✌️ Init file down');
 };

back/loaders/initTask.ts

@@ -12,10 +12,7 @@ export default async () => {
   const subscriptionService = Container.get(SubscriptionService);
 
   // 生成内置token
-  let tokenCommand = `ts-node-transpile-only ${join(
+  let tokenCommand = `tsx ${join(config.rootPath, 'back/token.ts')}`;
-    config.rootPath,
-    'back/token.ts',
-  )}`;
   const tokenFile = join(config.rootPath, 'static/build/token.js');
 
   if (await fileExist(tokenFile)) {
@@ -25,43 +22,30 @@ export default async () => {
     id: NaN,
     name: '生成token',
     command: tokenCommand,
-    runOrigin: 'system',
   } as ScheduleTaskType;
   await scheduleService.cancelIntervalTask(cron);
-  scheduleService.createIntervalTask(
+  scheduleService.createIntervalTask(cron, {
-    cron,
+    days: 28,
-    {
+  });
-      days: 28,
-    },
-    true,
-  );
 
   // 运行删除日志任务
   const data = await systemService.getSystemConfig();
-  if (data && data.info) {
+  if (data && data.info && data.info.logRemoveFrequency) {
-    if (data.info.logRemoveFrequency) {
+    const rmlogCron = {
-      const rmlogCron = {
+      id: data.id as number,
-        id: data.id as number,
+      name: '删除日志',
-        name: '删除日志',
+      command: `ql rmlog ${data.info.logRemoveFrequency}`,
-        command: `ql rmlog ${data.info.logRemoveFrequency}`,
+    };
-        runOrigin: 'system' as const,
+    await scheduleService.cancelIntervalTask(rmlogCron);
-      };
+    scheduleService.createIntervalTask(rmlogCron, {
-      await scheduleService.cancelIntervalTask(rmlogCron);
+      days: data.info.logRemoveFrequency,
-      scheduleService.createIntervalTask(
+    });
-        rmlogCron,
-        {
-          days: data.info.logRemoveFrequency,
-        },
-        true,
-      );
-    }
-
-    systemService.updateTimezone(data.info);
   }
 
+  // 运行所有订阅
   await subscriptionService.setSshConfig();
   const subs = await subscriptionService.list();
   for (const sub of subs) {
-    subscriptionService.handleTask(sub.get({ plain: true }), !sub.is_disabled);
+    subscriptionService.handleTask(sub, !sub.is_disabled, !sub.is_disabled);
   }
 };

back/loaders/logger.ts

@@ -4,60 +4,35 @@ import config from '../config';
 import path from 'path';
 
 const levelMap: Record<string, string> = {
-  info: 'ℹ️', // info图标
+  info: '🔵',
-  warn: '⚠️', // 警告图标
+  warn: '🟡',
-  error: '❌', // 错误图标
+  error: '🔴',
-  debug: '🐛', // debug调试图标
+  debug: '🔶'
+}
+
+const customFormat = winston.format.combine(
+  winston.format.splat(),
+  winston.format.timestamp({ format: "YYYY-MM-DD HH:mm:ss" }),
+  winston.format.align(),
+  winston.format.printf((i) => `[${levelMap[i.level]}${i.level}] [${[i.timestamp]}]: ${i.message}`),
+);
+
+const defaultOptions = {
+  format: customFormat,
+  datePattern: "YYYY-MM-DD",
+  maxSize: "20m",
+  maxFiles: "7d",
 };
 
-const baseFormat = [
-  winston.format.splat(),
-  winston.format.timestamp({ format: 'YYYY-MM-DD HH:mm:ss' }),
-  winston.format.align(),
-];
-
-const consoleFormat = winston.format.combine(
-  winston.format.colorize({ level: true }),
-  ...baseFormat,
-  winston.format.printf((info) => {
-    return `[${info.level} ${info.timestamp}]:${info.message}`;
-  }),
-);
-
-const plainFormat = winston.format.combine(
-  winston.format.uncolorize(),
-  ...baseFormat,
-  winston.format.printf((info) => {
-    return `[${levelMap[info.level] || ''}${info.level} ${info.timestamp}]:${
-      info.message
-    }`;
-  }),
-);
-
-const consoleTransport = new winston.transports.Console({
-  format: consoleFormat,
-  level: 'debug',
-});
-
-const fileTransport = new winston.transports.DailyRotateFile({
-  filename: path.join(config.systemLogPath, '%DATE%.log'),
-  datePattern: 'YYYY-MM-DD',
-  maxSize: '20m',
-  maxFiles: '7d',
-  format: plainFormat,
-  level: config.logs.level || 'info',
-});
-
 const LoggerInstance = winston.createLogger({
-  level: 'debug',
+  level: config.logs.level,
   levels: winston.config.npm.levels,
-  transports: [consoleTransport, fileTransport],
+  transports: [
-  exceptionHandlers: [consoleTransport, fileTransport],
+    new winston.transports.DailyRotateFile({
-  rejectionHandlers: [consoleTransport, fileTransport],
+      filename: path.join(config.systemLogPath, '%DATE%.log'),
-});
+      ...defaultOptions,
-
+    })
-LoggerInstance.on('error', (error) => {
+  ],
-  console.error('Logger error:', error);
 });
 
 export default LoggerInstance;

back/loaders/sentry.ts

@@ -0,0 +1,32 @@
+import { Application } from 'express';
+import * as Sentry from '@sentry/node';
+import Logger from './logger';
+import config from '../config';
+import fs from 'fs';
+import { parseVersion } from '../config/util';
+
+export default async ({ expressApp }: { expressApp: Application }) => {
+  const { version } = await parseVersion(config.versionFile);
+
+  Sentry.init({
+    ignoreErrors: [
+      /SequelizeUniqueConstraintError/i,
+      /Validation error/i,
+      /UnauthorizedError/i,
+      /celebrate request validation failed/i,
+    ],
+    dsn: 'https://8b5c84cfef3e22541bc84de0ed00497b@o1098464.ingest.sentry.io/6122819',
+    integrations: [
+      new Sentry.Integrations.Http({ tracing: true }),
+      new Sentry.Integrations.Express({ app: expressApp }),
+    ],
+    tracesSampleRate: 0.8,
+    release: version,
+  });
+
+  expressApp.use(Sentry.Handlers.requestHandler());
+  expressApp.use(Sentry.Handlers.tracingHandler());
+
+  Logger.info('✌️ Sentry loaded');
+  console.log('✌️ Sentry loaded');
+};

back/loaders/server.ts

@@ -5,6 +5,28 @@ 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

@@ -2,8 +2,9 @@ import sockJs from 'sockjs';
 import { Server } from 'http';
 import { Container } from 'typedi';
 import SockService from '../services/sock';
-import { getPlatform } from '../config/util';
+import config from '../config/index';
-import { shareStore } from '../shared/store';
+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: () => {} });
@@ -14,12 +15,13 @@ export default async ({ server }: { server: Server }) => {
       conn.close('404');
     }
 
-    const authInfo = await shareStore.getAuthInfo();
+    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 (authInfo) {
+    if (data) {
-      const { token = '', tokens = {} } = authInfo;
+      const { token = '', tokens = {} } = safeJSONParse(data);
       if (headerToken === token || tokens[platform] === headerToken) {
+        conn.write(JSON.stringify({ type: 'ping', message: 'hanhh' }));
         sockService.addClient(conn);
 
         conn.on('data', (message) => {
@@ -31,6 +33,8 @@ export default async ({ server }: { server: Server }) => {
         });
 
         return;
+      } else {
+        conn.write(JSON.stringify({ type: 'ping', message: 'whyour' }));
       }
     }
 

back/loaders/update.ts

@@ -0,0 +1,93 @@
+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 { Logger } from 'winston';
+import config from '../config';
+import SystemService from '../services/system';
+
+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/system',
+    async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
+      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) => {
+      const logger: Logger = Container.get('logger');
+      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/middlewares/monitoring.ts

@@ -1,80 +0,0 @@
-import { Request, Response, NextFunction } from 'express';
-import Logger from '../loaders/logger';
-import { performance } from 'perf_hooks';
-import { metricsService } from '../services/metrics';
-
-interface RequestMetrics {
-  method: string;
-  path: string;
-  duration: number;
-  statusCode: number;
-  timestamp: number;
-  platform?: string;
-}
-
-const requestMetrics: RequestMetrics[] = [];
-
-export const monitoringMiddleware = (
-  req: Request,
-  res: Response,
-  next: NextFunction,
-) => {
-  const start = performance.now();
-  const originalEnd = res.end;
-
-  res.end = function (chunk?: any, encoding?: any, cb?: any) {
-    const duration = performance.now() - start;
-    const metric: RequestMetrics = {
-      method: req.method,
-      path: req.path,
-      duration,
-      statusCode: res.statusCode,
-      timestamp: Date.now(),
-      platform: req.platform,
-    };
-
-    requestMetrics.push(metric);
-    metricsService.record('http_request', duration, {
-      method: req.method,
-      path: req.path,
-      statusCode: res.statusCode.toString(),
-      ...(req.platform && { platform: req.platform }),
-    });
-
-    if (requestMetrics.length > 1000) {
-      requestMetrics.shift();
-    }
-
-    if (duration > 1000) {
-      Logger.warn(
-        `Slow request detected: ${req.method} ${
-          req.path
-        } took ${duration.toFixed(2)}ms`,
-      );
-    }
-
-    return originalEnd.call(this, chunk, encoding, cb);
-  };
-
-  next();
-};
-
-export const getMetrics = () => {
-  return {
-    totalRequests: requestMetrics.length,
-    averageDuration:
-      requestMetrics.reduce((acc, curr) => acc + curr.duration, 0) /
-      requestMetrics.length,
-    requestsByMethod: requestMetrics.reduce((acc, curr) => {
-      acc[curr.method] = (acc[curr.method] || 0) + 1;
-      return acc;
-    }, {} as Record<string, number>),
-    requestsByPlatform: requestMetrics.reduce((acc, curr) => {
-      if (curr.platform) {
-        acc[curr.platform] = (acc[curr.platform] || 0) + 1;
-      }
-      return acc;
-    }, {} as Record<string, number>),
-    recentRequests: requestMetrics.slice(-10),
-  };
-};

back/protos/api.proto

@@ -1,257 +0,0 @@
-syntax = "proto3";
-
-package com.ql.api;
-
-message EnvItem {
-  optional int32 id = 1;
-  optional string name = 2;
-  optional string value = 3;
-  optional string remarks = 4;
-  optional int32 status = 5;
-  optional int64 position = 6;
-}
-
-message GetEnvsRequest { string searchValue = 1; }
-
-message CreateEnvRequest { repeated EnvItem envs = 1; }
-
-message UpdateEnvRequest { EnvItem env = 1; }
-
-message DeleteEnvsRequest { repeated int32 ids = 1; }
-
-message MoveEnvRequest {
-  int32 id = 1;
-  int32 fromIndex = 2;
-  int32 toIndex = 3;
-}
-
-message DisableEnvsRequest { repeated int32 ids = 1; }
-
-message EnableEnvsRequest { repeated int32 ids = 1; }
-
-message UpdateEnvNamesRequest {
-  repeated int32 ids = 1;
-  string name = 2;
-}
-
-message GetEnvByIdRequest { int32 id = 1; }
-
-message EnvsResponse {
-  int32 code = 1;
-  repeated EnvItem data = 2;
-  optional string message = 3;
-}
-
-message EnvResponse {
-  int32 code = 1;
-  EnvItem data = 2;
-  optional string message = 3;
-}
-
-message Response {
-  int32 code = 1;
-  optional string message = 2;
-}
-
-message ExtraScheduleItem { string schedule = 1; }
-
-message CronItem {
-  optional int32 id = 1;
-  optional string command = 2;
-  optional string schedule = 3;
-  optional string name = 4;
-  repeated string labels = 5;
-  optional int32 sub_id = 6;
-  repeated ExtraScheduleItem extra_schedules = 7;
-  optional string task_before = 8;
-  optional string task_after = 9;
-  optional int32 status = 10;
-  optional string log_path = 11;
-  optional int32 pid = 12;
-  optional int64 last_running_time = 13;
-  optional int64 last_execution_time = 14;
-}
-
-message CreateCronRequest {
-  string command = 1;
-  string schedule = 2;
-  optional string name = 3;
-  repeated string labels = 4;
-  optional int32 sub_id = 5;
-  repeated ExtraScheduleItem extra_schedules = 6;
-  optional string task_before = 7;
-  optional string task_after = 8;
-}
-
-message UpdateCronRequest {
-  int32 id = 1;
-  optional string command = 2;
-  optional string schedule = 3;
-  optional string name = 4;
-  repeated string labels = 5;
-  optional int32 sub_id = 6;
-  repeated ExtraScheduleItem extra_schedules = 7;
-  optional string task_before = 8;
-  optional string task_after = 9;
-}
-
-message DeleteCronsRequest { repeated int32 ids = 1; }
-
-message CronsResponse {
-  int32 code = 1;
-  repeated CronItem data = 2;
-  optional string message = 3;
-}
-
-message CronResponse {
-  int32 code = 1;
-  CronItem data = 2;
-  optional string message = 3;
-}
-
-message CronDetailRequest { string log_path = 1; }
-
-message CronDetailResponse {
-  int32 code = 1;
-  CronItem data = 2;
-  optional string message = 3;
-}
-
-enum NotificationMode {
-  gotify = 0;
-  goCqHttpBot = 1;
-  serverChan = 2;
-  pushDeer = 3;
-  bark = 4;
-  chat = 5;
-  telegramBot = 6;
-  dingtalkBot = 7;
-  weWorkBot = 8;
-  weWorkApp = 9;
-  aibotk = 10;
-  iGot = 11;
-  pushPlus = 12;
-  wePlusBot = 13;
-  email = 14;
-  pushMe = 15;
-  feishu = 16;
-  webhook = 17;
-  chronocat = 18;
-  ntfy = 19;
-  wxPusherBot = 20;
-}
-
-message NotificationInfo {
-  NotificationMode type = 1;
-
-  optional string gotifyUrl = 2;
-  optional string gotifyToken = 3;
-  optional int32 gotifyPriority = 4;
-
-  optional string goCqHttpBotUrl = 5;
-  optional string goCqHttpBotToken = 6;
-  optional string goCqHttpBotQq = 7;
-
-  optional string serverChanKey = 8;
-
-  optional string pushDeerKey = 9;
-  optional string pushDeerUrl = 10;
-
-  optional string synologyChatUrl = 11;
-
-  optional string barkPush = 12;
-  optional string barkIcon = 13;
-  optional string barkSound = 14;
-  optional string barkGroup = 15;
-  optional string barkLevel = 16;
-  optional string barkUrl = 17;
-  optional string barkArchive = 18;
-
-  optional string telegramBotToken = 19;
-  optional string telegramBotUserId = 20;
-  optional string telegramBotProxyHost = 21;
-  optional string telegramBotProxyPort = 22;
-  optional string telegramBotProxyAuth = 23;
-  optional string telegramBotApiHost = 24;
-
-  optional string dingtalkBotToken = 25;
-  optional string dingtalkBotSecret = 26;
-
-  optional string weWorkBotKey = 27;
-  optional string weWorkOrigin = 28;
-
-  optional string weWorkAppKey = 29;
-
-  optional string aibotkKey = 30;
-  optional string aibotkType = 31;
-  optional string aibotkName = 32;
-
-  optional string iGotPushKey = 33;
-
-  optional string pushPlusToken = 34;
-  optional string pushPlusUser = 35;
-  optional string pushPlusTemplate = 36;
-  optional string pushplusChannel = 37;
-  optional string pushplusWebhook = 38;
-  optional string pushplusCallbackUrl = 39;
-  optional string pushplusTo = 40;
-
-  optional string wePlusBotToken = 41;
-  optional string wePlusBotReceiver = 42;
-  optional string wePlusBotVersion = 43;
-
-  optional string emailService = 44;
-  optional string emailUser = 45;
-  optional string emailPass = 46;
-  optional string emailTo = 47;
-
-  optional string pushMeKey = 48;
-  optional string pushMeUrl = 49;
-
-  optional string chronocatURL = 50;
-  optional string chronocatQQ = 51;
-  optional string chronocatToken = 52;
-
-  optional string webhookHeaders = 53;
-  optional string webhookBody = 54;
-  optional string webhookUrl = 55;
-  optional string webhookMethod = 56;
-  optional string webhookContentType = 57;
-
-  optional string larkKey = 58;
-
-  optional string ntfyUrl = 59;
-  optional string ntfyTopic = 60;
-  optional string ntfyPriority = 61;
-  optional string ntfyToken = 62;
-  optional string ntfyUsername = 63;
-  optional string ntfyPassword = 64;
-  optional string ntfyActions = 65;
-
-  optional string wxPusherBotAppToken = 66;
-  optional string wxPusherBotTopicIds = 67;
-  optional string wxPusherBotUids = 68;
-}
-
-message SystemNotifyRequest {
-  string title = 1;
-  string content = 2;
-  optional NotificationInfo notificationInfo = 3;
-}
-
-service Api {
-  rpc GetEnvs(GetEnvsRequest) returns (EnvsResponse) {}
-  rpc CreateEnv(CreateEnvRequest) returns (EnvsResponse) {}
-  rpc UpdateEnv(UpdateEnvRequest) returns (EnvResponse) {}
-  rpc DeleteEnvs(DeleteEnvsRequest) returns (Response) {}
-  rpc MoveEnv(MoveEnvRequest) returns (EnvResponse) {}
-  rpc DisableEnvs(DisableEnvsRequest) returns (Response) {}
-  rpc EnableEnvs(EnableEnvsRequest) returns (Response) {}
-  rpc UpdateEnvNames(UpdateEnvNamesRequest) returns (Response) {}
-  rpc GetEnvById(GetEnvByIdRequest) returns (EnvResponse) {}
-  rpc SystemNotify(SystemNotifyRequest) returns (Response) {}
-  rpc GetCronDetail(CronDetailRequest) returns (CronDetailResponse) {}
-  rpc CreateCron(CreateCronRequest) returns (CronResponse) {}
-  rpc UpdateCron(UpdateCronRequest) returns (CronResponse) {}
-  rpc DeleteCrons(DeleteCronsRequest) returns (Response) {}
-}

back/protos/cron.ts

@@ -1,23 +1,17 @@
-// Code generated by protoc-gen-ts_proto. DO NOT EDIT.
-// versions:
-//   protoc-gen-ts_proto  v2.6.1
-//   protoc               v3.17.3
-// source: back/protos/cron.proto
-
 /* eslint-disable */
-import { BinaryReader, BinaryWriter } from "@bufbuild/protobuf/wire";
 import {
-  type CallOptions,
+  CallOptions,
   ChannelCredentials,
   Client,
-  type ClientOptions,
+  ClientOptions,
-  type ClientUnaryCall,
+  ClientUnaryCall,
-  type handleUnaryCall,
+  handleUnaryCall,
   makeGenericClientConstructor,
   Metadata,
-  type ServiceError,
+  ServiceError,
-  type UntypedServiceImplementation,
+  UntypedServiceImplementation,
 } from "@grpc/grpc-js";
+import _m0 from "protobufjs/minimal";
 
 export const protobufPackage = "com.ql.cron";
 
@@ -29,7 +23,7 @@ export interface ICron {
   id: string;
   schedule: string;
   command: string;
-  extra_schedules: ISchedule[];
+  extraSchedules: ISchedule[];
   name: string;
 }
 
@@ -51,53 +45,51 @@ function createBaseISchedule(): ISchedule {
   return { schedule: "" };
 }
 
-export const ISchedule: MessageFns<ISchedule> = {
+export const ISchedule = {
-  encode(message: ISchedule, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
+  encode(message: ISchedule, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.schedule !== "") {
       writer.uint32(10).string(message.schedule);
     }
     return writer;
   },
 
-  decode(input: BinaryReader | Uint8Array, length?: number): ISchedule {
+  decode(input: _m0.Reader | Uint8Array, length?: number): ISchedule {
-    const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
+    const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = createBaseISchedule();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
-        case 1: {
+        case 1:
           if (tag !== 10) {
             break;
           }
 
           message.schedule = reader.string();
           continue;
-        }
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
       }
-      reader.skip(tag & 7);
+      reader.skipType(tag & 7);
     }
     return message;
   },
 
   fromJSON(object: any): ISchedule {
-    return { schedule: isSet(object.schedule) ? globalThis.String(object.schedule) : "" };
+    return { schedule: isSet(object.schedule) ? String(object.schedule) : "" };
   },
 
   toJSON(message: ISchedule): unknown {
     const obj: any = {};
-    if (message.schedule !== "") {
+    message.schedule !== undefined && (obj.schedule = message.schedule);
-      obj.schedule = message.schedule;
-    }
     return obj;
   },
 
   create<I extends Exact<DeepPartial<ISchedule>, I>>(base?: I): ISchedule {
-    return ISchedule.fromPartial(base ?? ({} as any));
+    return ISchedule.fromPartial(base ?? {});
   },
+
   fromPartial<I extends Exact<DeepPartial<ISchedule>, I>>(object: I): ISchedule {
     const message = createBaseISchedule();
     message.schedule = object.schedule ?? "";
@@ -106,11 +98,11 @@ export const ISchedule: MessageFns<ISchedule> = {
 };
 
 function createBaseICron(): ICron {
-  return { id: "", schedule: "", command: "", extra_schedules: [], name: "" };
+  return { id: "", schedule: "", command: "", extraSchedules: [], name: "" };
 }
 
-export const ICron: MessageFns<ICron> = {
+export const ICron = {
-  encode(message: ICron, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
+  encode(message: ICron, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.id !== "") {
       writer.uint32(10).string(message.id);
     }
@@ -120,8 +112,8 @@ export const ICron: MessageFns<ICron> = {
     if (message.command !== "") {
       writer.uint32(26).string(message.command);
     }
-    for (const v of message.extra_schedules) {
+    for (const v of message.extraSchedules) {
-      ISchedule.encode(v!, writer.uint32(34).fork()).join();
+      ISchedule.encode(v!, writer.uint32(34).fork()).ldelim();
     }
     if (message.name !== "") {
       writer.uint32(42).string(message.name);
@@ -129,103 +121,93 @@ export const ICron: MessageFns<ICron> = {
     return writer;
   },
 
-  decode(input: BinaryReader | Uint8Array, length?: number): ICron {
+  decode(input: _m0.Reader | Uint8Array, length?: number): ICron {
-    const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
+    const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = createBaseICron();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
-        case 1: {
+        case 1:
           if (tag !== 10) {
             break;
           }
 
           message.id = reader.string();
           continue;
-        }
+        case 2:
-        case 2: {
           if (tag !== 18) {
             break;
           }
 
           message.schedule = reader.string();
           continue;
-        }
+        case 3:
-        case 3: {
           if (tag !== 26) {
             break;
           }
 
           message.command = reader.string();
           continue;
-        }
+        case 4:
-        case 4: {
           if (tag !== 34) {
             break;
           }
 
-          message.extra_schedules.push(ISchedule.decode(reader, reader.uint32()));
+          message.extraSchedules.push(ISchedule.decode(reader, reader.uint32()));
           continue;
-        }
+        case 5:
-        case 5: {
           if (tag !== 42) {
             break;
           }
 
           message.name = reader.string();
           continue;
-        }
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
       }
-      reader.skip(tag & 7);
+      reader.skipType(tag & 7);
     }
     return message;
   },
 
   fromJSON(object: any): ICron {
     return {
-      id: isSet(object.id) ? globalThis.String(object.id) : "",
+      id: isSet(object.id) ? String(object.id) : "",
-      schedule: isSet(object.schedule) ? globalThis.String(object.schedule) : "",
+      schedule: isSet(object.schedule) ? String(object.schedule) : "",
-      command: isSet(object.command) ? globalThis.String(object.command) : "",
+      command: isSet(object.command) ? String(object.command) : "",
-      extra_schedules: globalThis.Array.isArray(object?.extra_schedules)
+      extraSchedules: Array.isArray(object?.extraSchedules)
-        ? object.extra_schedules.map((e: any) => ISchedule.fromJSON(e))
+        ? object.extraSchedules.map((e: any) => ISchedule.fromJSON(e))
         : [],
-      name: isSet(object.name) ? globalThis.String(object.name) : "",
+      name: isSet(object.name) ? String(object.name) : "",
     };
   },
 
   toJSON(message: ICron): unknown {
     const obj: any = {};
-    if (message.id !== "") {
+    message.id !== undefined && (obj.id = message.id);
-      obj.id = message.id;
+    message.schedule !== undefined && (obj.schedule = message.schedule);
-    }
+    message.command !== undefined && (obj.command = message.command);
-    if (message.schedule !== "") {
+    if (message.extraSchedules) {
-      obj.schedule = message.schedule;
+      obj.extraSchedules = message.extraSchedules.map((e) => e ? ISchedule.toJSON(e) : undefined);
-    }
+    } else {
-    if (message.command !== "") {
+      obj.extraSchedules = [];
-      obj.command = message.command;
-    }
-    if (message.extra_schedules?.length) {
-      obj.extra_schedules = message.extra_schedules.map((e) => ISchedule.toJSON(e));
-    }
-    if (message.name !== "") {
-      obj.name = message.name;
     }
+    message.name !== undefined && (obj.name = message.name);
     return obj;
   },
 
   create<I extends Exact<DeepPartial<ICron>, I>>(base?: I): ICron {
-    return ICron.fromPartial(base ?? ({} as any));
+    return ICron.fromPartial(base ?? {});
   },
+
   fromPartial<I extends Exact<DeepPartial<ICron>, I>>(object: I): ICron {
     const message = createBaseICron();
     message.id = object.id ?? "";
     message.schedule = object.schedule ?? "";
     message.command = object.command ?? "";
-    message.extra_schedules = object.extra_schedules?.map((e) => ISchedule.fromPartial(e)) || [];
+    message.extraSchedules = object.extraSchedules?.map((e) => ISchedule.fromPartial(e)) || [];
     message.name = object.name ?? "";
     return message;
   },
@@ -235,53 +217,55 @@ function createBaseAddCronRequest(): AddCronRequest {
   return { crons: [] };
 }
 
-export const AddCronRequest: MessageFns<AddCronRequest> = {
+export const AddCronRequest = {
-  encode(message: AddCronRequest, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
+  encode(message: AddCronRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.crons) {
-      ICron.encode(v!, writer.uint32(10).fork()).join();
+      ICron.encode(v!, writer.uint32(10).fork()).ldelim();
     }
     return writer;
   },
 
-  decode(input: BinaryReader | Uint8Array, length?: number): AddCronRequest {
+  decode(input: _m0.Reader | Uint8Array, length?: number): AddCronRequest {
-    const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
+    const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = createBaseAddCronRequest();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
-        case 1: {
+        case 1:
           if (tag !== 10) {
             break;
           }
 
           message.crons.push(ICron.decode(reader, reader.uint32()));
           continue;
-        }
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
       }
-      reader.skip(tag & 7);
+      reader.skipType(tag & 7);
     }
     return message;
   },
 
   fromJSON(object: any): AddCronRequest {
-    return { crons: globalThis.Array.isArray(object?.crons) ? object.crons.map((e: any) => ICron.fromJSON(e)) : [] };
+    return { crons: Array.isArray(object?.crons) ? object.crons.map((e: any) => ICron.fromJSON(e)) : [] };
   },
 
   toJSON(message: AddCronRequest): unknown {
     const obj: any = {};
-    if (message.crons?.length) {
+    if (message.crons) {
-      obj.crons = message.crons.map((e) => ICron.toJSON(e));
+      obj.crons = message.crons.map((e) => e ? ICron.toJSON(e) : undefined);
+    } else {
+      obj.crons = [];
     }
     return obj;
   },
 
   create<I extends Exact<DeepPartial<AddCronRequest>, I>>(base?: I): AddCronRequest {
-    return AddCronRequest.fromPartial(base ?? ({} as any));
+    return AddCronRequest.fromPartial(base ?? {});
   },
+
   fromPartial<I extends Exact<DeepPartial<AddCronRequest>, I>>(object: I): AddCronRequest {
     const message = createBaseAddCronRequest();
     message.crons = object.crons?.map((e) => ICron.fromPartial(e)) || [];
@@ -293,13 +277,13 @@ function createBaseAddCronResponse(): AddCronResponse {
   return {};
 }
 
-export const AddCronResponse: MessageFns<AddCronResponse> = {
+export const AddCronResponse = {
-  encode(_: AddCronResponse, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
+  encode(_: AddCronResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
 
-  decode(input: BinaryReader | Uint8Array, length?: number): AddCronResponse {
+  decode(input: _m0.Reader | Uint8Array, length?: number): AddCronResponse {
-    const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
+    const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = createBaseAddCronResponse();
     while (reader.pos < end) {
@@ -309,7 +293,7 @@ export const AddCronResponse: MessageFns<AddCronResponse> = {
       if ((tag & 7) === 4 || tag === 0) {
         break;
       }
-      reader.skip(tag & 7);
+      reader.skipType(tag & 7);
     }
     return message;
   },
@@ -324,8 +308,9 @@ export const AddCronResponse: MessageFns<AddCronResponse> = {
   },
 
   create<I extends Exact<DeepPartial<AddCronResponse>, I>>(base?: I): AddCronResponse {
-    return AddCronResponse.fromPartial(base ?? ({} as any));
+    return AddCronResponse.fromPartial(base ?? {});
   },
+
   fromPartial<I extends Exact<DeepPartial<AddCronResponse>, I>>(_: I): AddCronResponse {
     const message = createBaseAddCronResponse();
     return message;
@@ -336,53 +321,55 @@ function createBaseDeleteCronRequest(): DeleteCronRequest {
   return { ids: [] };
 }
 
-export const DeleteCronRequest: MessageFns<DeleteCronRequest> = {
+export const DeleteCronRequest = {
-  encode(message: DeleteCronRequest, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
+  encode(message: DeleteCronRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     for (const v of message.ids) {
       writer.uint32(10).string(v!);
     }
     return writer;
   },
 
-  decode(input: BinaryReader | Uint8Array, length?: number): DeleteCronRequest {
+  decode(input: _m0.Reader | Uint8Array, length?: number): DeleteCronRequest {
-    const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
+    const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = createBaseDeleteCronRequest();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
-        case 1: {
+        case 1:
           if (tag !== 10) {
             break;
           }
 
           message.ids.push(reader.string());
           continue;
-        }
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
       }
-      reader.skip(tag & 7);
+      reader.skipType(tag & 7);
     }
     return message;
   },
 
   fromJSON(object: any): DeleteCronRequest {
-    return { ids: globalThis.Array.isArray(object?.ids) ? object.ids.map((e: any) => globalThis.String(e)) : [] };
+    return { ids: Array.isArray(object?.ids) ? object.ids.map((e: any) => String(e)) : [] };
   },
 
   toJSON(message: DeleteCronRequest): unknown {
     const obj: any = {};
-    if (message.ids?.length) {
+    if (message.ids) {
-      obj.ids = message.ids;
+      obj.ids = message.ids.map((e) => e);
+    } else {
+      obj.ids = [];
     }
     return obj;
   },
 
   create<I extends Exact<DeepPartial<DeleteCronRequest>, I>>(base?: I): DeleteCronRequest {
-    return DeleteCronRequest.fromPartial(base ?? ({} as any));
+    return DeleteCronRequest.fromPartial(base ?? {});
   },
+
   fromPartial<I extends Exact<DeepPartial<DeleteCronRequest>, I>>(object: I): DeleteCronRequest {
     const message = createBaseDeleteCronRequest();
     message.ids = object.ids?.map((e) => e) || [];
@@ -394,13 +381,13 @@ function createBaseDeleteCronResponse(): DeleteCronResponse {
   return {};
 }
 
-export const DeleteCronResponse: MessageFns<DeleteCronResponse> = {
+export const DeleteCronResponse = {
-  encode(_: DeleteCronResponse, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
+  encode(_: DeleteCronResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     return writer;
   },
 
-  decode(input: BinaryReader | Uint8Array, length?: number): DeleteCronResponse {
+  decode(input: _m0.Reader | Uint8Array, length?: number): DeleteCronResponse {
-    const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
+    const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = createBaseDeleteCronResponse();
     while (reader.pos < end) {
@@ -410,7 +397,7 @@ export const DeleteCronResponse: MessageFns<DeleteCronResponse> = {
       if ((tag & 7) === 4 || tag === 0) {
         break;
       }
-      reader.skip(tag & 7);
+      reader.skipType(tag & 7);
     }
     return message;
   },
@@ -425,8 +412,9 @@ export const DeleteCronResponse: MessageFns<DeleteCronResponse> = {
   },
 
   create<I extends Exact<DeepPartial<DeleteCronResponse>, I>>(base?: I): DeleteCronResponse {
-    return DeleteCronResponse.fromPartial(base ?? ({} as any));
+    return DeleteCronResponse.fromPartial(base ?? {});
   },
+
   fromPartial<I extends Exact<DeepPartial<DeleteCronResponse>, I>>(_: I): DeleteCronResponse {
     const message = createBaseDeleteCronResponse();
     return message;
@@ -496,14 +484,12 @@ export interface CronClient extends Client {
 export const CronClient = makeGenericClientConstructor(CronService, "com.ql.cron.Cron") as unknown as {
   new (address: string, credentials: ChannelCredentials, options?: Partial<ClientOptions>): CronClient;
   service: typeof CronService;
-  serviceName: string;
 };
 
 type Builtin = Date | Function | Uint8Array | string | number | boolean | undefined;
 
 export type DeepPartial<T> = T extends Builtin ? T
-  : T extends globalThis.Array<infer U> ? globalThis.Array<DeepPartial<U>>
+  : T extends Array<infer U> ? Array<DeepPartial<U>> : T extends ReadonlyArray<infer U> ? ReadonlyArray<DeepPartial<U>>
-  : T extends ReadonlyArray<infer U> ? ReadonlyArray<DeepPartial<U>>
   : T extends {} ? { [K in keyof T]?: DeepPartial<T[K]> }
   : Partial<T>;
 
@@ -514,12 +500,3 @@ export type Exact<P, I extends P> = P extends Builtin ? P
 function isSet(value: any): boolean {
   return value !== null && value !== undefined;
 }
-
-export interface MessageFns<T> {
-  encode(message: T, writer?: BinaryWriter): BinaryWriter;
-  decode(input: BinaryReader | Uint8Array, length?: number): T;
-  fromJSON(object: any): T;
-  toJSON(message: T): unknown;
-  create<I extends Exact<DeepPartial<T>, I>>(base?: I): T;
-  fromPartial<I extends Exact<DeepPartial<T>, I>>(object: I): T;
-}

back/protos/health.ts

@@ -1,25 +1,19 @@
-// Code generated by protoc-gen-ts_proto. DO NOT EDIT.
-// versions:
-//   protoc-gen-ts_proto  v2.6.1
-//   protoc               v3.17.3
-// source: back/protos/health.proto
-
 /* eslint-disable */
-import { BinaryReader, BinaryWriter } from "@bufbuild/protobuf/wire";
 import {
-  type CallOptions,
+  CallOptions,
   ChannelCredentials,
   Client,
-  type ClientOptions,
+  ClientOptions,
-  type ClientReadableStream,
+  ClientReadableStream,
-  type ClientUnaryCall,
+  ClientUnaryCall,
-  type handleServerStreamingCall,
+  handleServerStreamingCall,
-  type handleUnaryCall,
+  handleUnaryCall,
   makeGenericClientConstructor,
   Metadata,
-  type ServiceError,
+  ServiceError,
-  type UntypedServiceImplementation,
+  UntypedServiceImplementation,
 } from "@grpc/grpc-js";
+import _m0 from "protobufjs/minimal";
 
 export const protobufPackage = "com.ql.health";
 
@@ -80,53 +74,51 @@ function createBaseHealthCheckRequest(): HealthCheckRequest {
   return { service: "" };
 }
 
-export const HealthCheckRequest: MessageFns<HealthCheckRequest> = {
+export const HealthCheckRequest = {
-  encode(message: HealthCheckRequest, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
+  encode(message: HealthCheckRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.service !== "") {
       writer.uint32(10).string(message.service);
     }
     return writer;
   },
 
-  decode(input: BinaryReader | Uint8Array, length?: number): HealthCheckRequest {
+  decode(input: _m0.Reader | Uint8Array, length?: number): HealthCheckRequest {
-    const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
+    const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = createBaseHealthCheckRequest();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
-        case 1: {
+        case 1:
           if (tag !== 10) {
             break;
           }
 
           message.service = reader.string();
           continue;
-        }
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
       }
-      reader.skip(tag & 7);
+      reader.skipType(tag & 7);
     }
     return message;
   },
 
   fromJSON(object: any): HealthCheckRequest {
-    return { service: isSet(object.service) ? globalThis.String(object.service) : "" };
+    return { service: isSet(object.service) ? String(object.service) : "" };
   },
 
   toJSON(message: HealthCheckRequest): unknown {
     const obj: any = {};
-    if (message.service !== "") {
+    message.service !== undefined && (obj.service = message.service);
-      obj.service = message.service;
-    }
     return obj;
   },
 
   create<I extends Exact<DeepPartial<HealthCheckRequest>, I>>(base?: I): HealthCheckRequest {
-    return HealthCheckRequest.fromPartial(base ?? ({} as any));
+    return HealthCheckRequest.fromPartial(base ?? {});
   },
+
   fromPartial<I extends Exact<DeepPartial<HealthCheckRequest>, I>>(object: I): HealthCheckRequest {
     const message = createBaseHealthCheckRequest();
     message.service = object.service ?? "";
@@ -138,34 +130,33 @@ function createBaseHealthCheckResponse(): HealthCheckResponse {
   return { status: 0 };
 }
 
-export const HealthCheckResponse: MessageFns<HealthCheckResponse> = {
+export const HealthCheckResponse = {
-  encode(message: HealthCheckResponse, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
+  encode(message: HealthCheckResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
     if (message.status !== 0) {
       writer.uint32(8).int32(message.status);
     }
     return writer;
   },
 
-  decode(input: BinaryReader | Uint8Array, length?: number): HealthCheckResponse {
+  decode(input: _m0.Reader | Uint8Array, length?: number): HealthCheckResponse {
-    const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
+    const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = createBaseHealthCheckResponse();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
-        case 1: {
+        case 1:
           if (tag !== 8) {
             break;
           }
 
           message.status = reader.int32() as any;
           continue;
-        }
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
       }
-      reader.skip(tag & 7);
+      reader.skipType(tag & 7);
     }
     return message;
   },
@@ -176,15 +167,14 @@ export const HealthCheckResponse: MessageFns<HealthCheckResponse> = {
 
   toJSON(message: HealthCheckResponse): unknown {
     const obj: any = {};
-    if (message.status !== 0) {
+    message.status !== undefined && (obj.status = healthCheckResponse_ServingStatusToJSON(message.status));
-      obj.status = healthCheckResponse_ServingStatusToJSON(message.status);
-    }
     return obj;
   },
 
   create<I extends Exact<DeepPartial<HealthCheckResponse>, I>>(base?: I): HealthCheckResponse {
-    return HealthCheckResponse.fromPartial(base ?? ({} as any));
+    return HealthCheckResponse.fromPartial(base ?? {});
   },
+
   fromPartial<I extends Exact<DeepPartial<HealthCheckResponse>, I>>(object: I): HealthCheckResponse {
     const message = createBaseHealthCheckResponse();
     message.status = object.status ?? 0;
@@ -246,14 +236,12 @@ export interface HealthClient extends Client {
 export const HealthClient = makeGenericClientConstructor(HealthService, "com.ql.health.Health") as unknown as {
   new (address: string, credentials: ChannelCredentials, options?: Partial<ClientOptions>): HealthClient;
   service: typeof HealthService;
-  serviceName: string;
 };
 
 type Builtin = Date | Function | Uint8Array | string | number | boolean | undefined;
 
 export type DeepPartial<T> = T extends Builtin ? T
-  : T extends globalThis.Array<infer U> ? globalThis.Array<DeepPartial<U>>
+  : T extends Array<infer U> ? Array<DeepPartial<U>> : T extends ReadonlyArray<infer U> ? ReadonlyArray<DeepPartial<U>>
-  : T extends ReadonlyArray<infer U> ? ReadonlyArray<DeepPartial<U>>
   : T extends {} ? { [K in keyof T]?: DeepPartial<T[K]> }
   : Partial<T>;
 
@@ -264,12 +252,3 @@ export type Exact<P, I extends P> = P extends Builtin ? P
 function isSet(value: any): boolean {
   return value !== null && value !== undefined;
 }
-
-export interface MessageFns<T> {
-  encode(message: T, writer?: BinaryWriter): BinaryWriter;
-  decode(input: BinaryReader | Uint8Array, length?: number): T;
-  fromJSON(object: any): T;
-  toJSON(message: T): unknown;
-  create<I extends Exact<DeepPartial<T>, I>>(base?: I): T;
-  fromPartial<I extends Exact<DeepPartial<T>, I>>(object: I): T;
-}

back/public.ts

@@ -0,0 +1,36 @@
+import express from 'express';
+import Logger from './loaders/logger';
+import config from './config';
+import { HealthClient } from './protos/health';
+import { credentials } from '@grpc/grpc-js';
+
+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) => {
+  client.check({ service: 'cron' }, (err, response) => {
+    if (err) {
+      return res.status(200).send({ code: 500, error: err });
+    }
+    return res.status(200).send({ code: 200, data: response });
+  });
+});
+
+app
+  .listen(config.publicPort, async () => {
+    await require('./loaders/sentry').default({ expressApp: app });
+    await require('./loaders/db').default();
+
+    Logger.debug(`✌️ 公共服务启动成功！`);
+    console.debug(`✌️ 公共服务启动成功！`);
+    process.send?.('ready');
+  })
+  .on('error', (err) => {
+    Logger.error(err);
+    console.error(err);
+    process.exit(1);
+  });

back/schedule/addCron.ts

@@ -10,43 +10,43 @@ const addCron = (
   callback: sendUnaryData<AddCronResponse>,
 ) => {
   for (const item of call.request.crons) {
-    const { id, schedule, command, extra_schedules, name } = item;
+    const { id, schedule, command, extraSchedules, name } = item;
     if (scheduleStacks.has(id)) {
       scheduleStacks.get(id)?.forEach((x) => x.cancel());
     }
 
     Logger.info(
-      '[schedule][创建定时任务] 任务ID: %s, 名称: %s, cron: %s, 执行命令: %s',
+      '[schedule][创建定时任务], 任务ID: %s, 名称: %s, cron: %s, 执行命令: %s',
       id,
       name,
       schedule,
       command,
     );
 
-    if (extra_schedules?.length) {
+    if (extraSchedules?.length) {
-      extra_schedules.forEach((x) => {
+      extraSchedules.forEach(x => {
         Logger.info(
-          '[schedule][创建定时任务] 任务ID: %s, 名称: %s, cron: %s, 执行命令: %s',
+          '[schedule][创建定时任务], 任务ID: %s, 名称: %s, cron: %s, 执行命令: %s',
           id,
           name,
           x.schedule,
           command,
         );
-      });
+      })
     }
 
     scheduleStacks.set(id, [
       nodeSchedule.scheduleJob(id, schedule, async () => {
         Logger.info(`[schedule][准备运行任务] 命令: ${command}`);
-        runCron(command, item);
+        runCron(command, { name, schedule, extraSchedules });
       }),
-      ...(extra_schedules?.length
+      ...(extraSchedules?.length
-        ? extra_schedules.map((x) =>
+        ? extraSchedules.map((x) =>
-            nodeSchedule.scheduleJob(id, x.schedule, async () => {
+          nodeSchedule.scheduleJob(id, x.schedule, async () => {
-              Logger.info(`[schedule][准备运行任务] 命令: ${command}`);
+            Logger.info(`[schedule][准备运行任务] 命令: ${command}`);
-              runCron(command, item);
+            runCron(command, { name, schedule, extraSchedules });
-            }),
+          }),
-          )
+        )
         : []),
     ]);
   }

back/schedule/api.ts

@@ -1,325 +0,0 @@
-import 'reflect-metadata';
-import { Container } from 'typedi';
-import EnvService from '../services/env';
-import { sendUnaryData, ServerUnaryCall } from '@grpc/grpc-js';
-import {
-  CreateEnvRequest,
-  CronItem,
-  DeleteEnvsRequest,
-  DisableEnvsRequest,
-  EnableEnvsRequest,
-  EnvItem,
-  EnvResponse,
-  EnvsResponse,
-  GetEnvByIdRequest,
-  GetEnvsRequest,
-  MoveEnvRequest,
-  Response,
-  SystemNotifyRequest,
-  UpdateEnvNamesRequest,
-  UpdateEnvRequest,
-} from '../protos/api';
-import LoggerInstance from '../loaders/logger';
-import pick from 'lodash/pick';
-import SystemService from '../services/system';
-import CronService from '../services/cron';
-import {
-  CronDetailRequest,
-  CronDetailResponse,
-  CreateCronRequest,
-  UpdateCronRequest,
-  DeleteCronsRequest,
-  CronResponse,
-} from '../protos/api';
-import { NotificationInfo } from '../data/notify';
-
-Container.set('logger', LoggerInstance);
-
-export const getEnvs = async (
-  call: ServerUnaryCall<GetEnvsRequest, EnvsResponse>,
-  callback: sendUnaryData<EnvsResponse>,
-) => {
-  try {
-    const envService = Container.get(EnvService);
-    const data = await envService.envs(call.request.searchValue);
-    callback(null, {
-      code: 200,
-      data: data.map((x) => ({ ...x, remarks: x.remarks || '' })),
-    });
-  } catch (e: any) {
-    callback(null, {
-      code: 500,
-      data: [],
-      message: e.message,
-    });
-  }
-};
-
-export const createEnv = async (
-  call: ServerUnaryCall<CreateEnvRequest, EnvsResponse>,
-  callback: sendUnaryData<EnvsResponse>,
-) => {
-  try {
-    const envService = Container.get(EnvService);
-    const data = await envService.create(call.request.envs);
-    callback(null, { code: 200, data });
-  } catch (e: any) {
-    callback(e);
-  }
-};
-
-export const updateEnv = async (
-  call: ServerUnaryCall<UpdateEnvRequest, EnvResponse>,
-  callback: sendUnaryData<EnvResponse>,
-) => {
-  try {
-    if (!call.request.env?.id) {
-      return callback(null, {
-        code: 400,
-        data: undefined,
-        message: 'id parameter is required',
-      });
-    }
-
-    const envService = Container.get(EnvService);
-    const data = await envService.update(
-      pick(call.request.env, ['id', 'name', 'value', 'remarks']) as EnvItem,
-    );
-    callback(null, { code: 200, data });
-  } catch (e: any) {
-    callback(e);
-  }
-};
-
-export const deleteEnvs = async (
-  call: ServerUnaryCall<DeleteEnvsRequest, Response>,
-  callback: sendUnaryData<Response>,
-) => {
-  try {
-    if (!call.request.ids || call.request.ids.length === 0) {
-      return callback(null, {
-        code: 400,
-        message: 'ids parameter is required',
-      });
-    }
-
-    const envService = Container.get(EnvService);
-    await envService.remove(call.request.ids);
-    callback(null, { code: 200 });
-  } catch (e: any) {
-    callback(e);
-  }
-};
-
-export const moveEnv = async (
-  call: ServerUnaryCall<MoveEnvRequest, EnvResponse>,
-  callback: sendUnaryData<EnvResponse>,
-) => {
-  try {
-    if (!call.request.id) {
-      return callback(null, {
-        code: 400,
-        data: undefined,
-        message: 'id parameter is required',
-      });
-    }
-
-    const envService = Container.get(EnvService);
-    const data = await envService.move(call.request.id, {
-      fromIndex: call.request.fromIndex,
-      toIndex: call.request.toIndex,
-    });
-    callback(null, { code: 200, data });
-  } catch (e: any) {
-    callback(e);
-  }
-};
-
-export const disableEnvs = async (
-  call: ServerUnaryCall<DisableEnvsRequest, Response>,
-  callback: sendUnaryData<Response>,
-) => {
-  try {
-    if (!call.request.ids || call.request.ids.length === 0) {
-      return callback(null, {
-        code: 400,
-        message: 'ids parameter is required',
-      });
-    }
-
-    const envService = Container.get(EnvService);
-    await envService.disabled(call.request.ids);
-    callback(null, { code: 200 });
-  } catch (e: any) {
-    callback(e);
-  }
-};
-
-export const enableEnvs = async (
-  call: ServerUnaryCall<EnableEnvsRequest, Response>,
-  callback: sendUnaryData<Response>,
-) => {
-  try {
-    if (!call.request.ids || call.request.ids.length === 0) {
-      return callback(null, {
-        code: 400,
-        message: 'ids parameter is required',
-      });
-    }
-
-    const envService = Container.get(EnvService);
-    await envService.enabled(call.request.ids);
-    callback(null, { code: 200 });
-  } catch (e: any) {
-    callback(e);
-  }
-};
-
-export const updateEnvNames = async (
-  call: ServerUnaryCall<UpdateEnvNamesRequest, Response>,
-  callback: sendUnaryData<Response>,
-) => {
-  try {
-    if (!call.request.ids || call.request.ids.length === 0) {
-      return callback(null, {
-        code: 400,
-        message: 'ids parameter is required',
-      });
-    }
-
-    const envService = Container.get(EnvService);
-    await envService.updateNames({
-      ids: call.request.ids,
-      name: call.request.name,
-    });
-    callback(null, { code: 200 });
-  } catch (e: any) {
-    callback(e);
-  }
-};
-
-export const getEnvById = async (
-  call: ServerUnaryCall<GetEnvByIdRequest, EnvResponse>,
-  callback: sendUnaryData<EnvResponse>,
-) => {
-  try {
-    if (!call.request.id) {
-      return callback(null, {
-        code: 400,
-        data: undefined,
-        message: 'id parameter is required',
-      });
-    }
-
-    const envService = Container.get(EnvService);
-    const data = await envService.getDb({ id: call.request.id });
-    callback(null, {
-      code: 200,
-      data: { ...data, remarks: data.remarks || '' },
-    });
-  } catch (e: any) {
-    callback(e);
-  }
-};
-
-export const systemNotify = async (
-  call: ServerUnaryCall<SystemNotifyRequest, Response>,
-  callback: sendUnaryData<Response>,
-) => {
-  try {
-    const systemService = Container.get(SystemService);
-    const data = await systemService.notify({
-      title: call.request.title,
-      content: call.request.content,
-      notificationInfo: call.request.notificationInfo as unknown as NotificationInfo,
-    });
-    callback(null, data);
-  } catch (e: any) {
-    callback(e);
-  }
-};
-
-const normalizeCronData = (data: CronItem | null): CronItem | undefined => {
-  if (!data) return undefined;
-  return {
-    ...data,
-    sub_id: data.sub_id ?? undefined,
-    extra_schedules: data.extra_schedules ?? undefined,
-    pid: data.pid ?? undefined,
-    task_before: data.task_before ?? undefined,
-    task_after: data.task_after ?? undefined,
-  };
-};
-
-export const getCronDetail = async (
-  call: ServerUnaryCall<CronDetailRequest, CronDetailResponse>,
-  callback: sendUnaryData<CronDetailResponse>,
-) => {
-  try {
-    if (!call.request.log_path) {
-      return callback(null, {
-        code: 400,
-        data: undefined,
-        message: 'log_path is required',
-      });
-    }
-    const cronService = Container.get(CronService);
-    const data = (await cronService.find({
-      log_path: call.request.log_path,
-    })) as CronItem;
-    callback(null, { code: 200, data: normalizeCronData(data) });
-  } catch (e: any) {
-    callback(e);
-  }
-};
-
-export const createCron = async (
-  call: ServerUnaryCall<CreateCronRequest, CronResponse>,
-  callback: sendUnaryData<CronResponse>,
-) => {
-  try {
-    const cronService = Container.get(CronService);
-    const data = (await cronService.create(call.request)) as CronItem;
-    callback(null, { code: 200, data: normalizeCronData(data) });
-  } catch (e: any) {
-    callback(e);
-  }
-};
-
-export const updateCron = async (
-  call: ServerUnaryCall<UpdateCronRequest, CronResponse>,
-  callback: sendUnaryData<CronResponse>,
-) => {
-  try {
-    const cronService = Container.get(CronService);
-    const { id, ...fields } = call.request;
-
-    const updateRequest = {
-      id,
-      ...Object.entries(fields).reduce((acc: any, [key, value]) => {
-        if (value !== undefined) {
-          acc[key] = value;
-        }
-        return acc;
-      }, {}),
-    } as UpdateCronRequest;
-
-    const data = (await cronService.update(updateRequest)) as CronItem;
-    callback(null, { code: 200, data: normalizeCronData(data) });
-  } catch (e: any) {
-    callback(e);
-  }
-};
-
-export const deleteCrons = async (
-  call: ServerUnaryCall<DeleteCronsRequest, Response>,
-  callback: sendUnaryData<Response>,
-) => {
-  try {
-    const cronService = Container.get(CronService);
-    await cronService.remove(call.request.ids);
-    callback(null, { code: 200 });
-  } catch (e: any) {
-    callback(e);
-  }
-};

back/schedule/client.ts

@@ -10,7 +10,7 @@ import config from '../config';
 
 class Client {
   private client = new CronClient(
-    `0.0.0.0:${config.grpcPort}`,
+    `0.0.0.0:${config.cronPort}`,
     credentials.createInsecure(),
     { 'grpc.enable_http_proxy': 0 },
   );

back/schedule/delCron.ts

@@ -10,7 +10,7 @@ const delCron = (
   for (const id of call.request.ids) {
     if (scheduleStacks.has(id)) {
       Logger.info(
-        '[schedule][取消定时任务] 任务ID: %s',
+        '[schedule][取消定时任务], 任务ID: %s',
         id,
       );
       scheduleStacks.get(id)?.forEach(x => x.cancel());

back/schedule/index.ts

@@ -0,0 +1,25 @@
+import { Server, ServerCredentials } from '@grpc/grpc-js';
+import { CronService } from '../protos/cron';
+import { addCron } from './addCron';
+import { delCron } from './delCron';
+import { HealthService } from '../protos/health';
+import { check } from './health';
+import config from '../config';
+import Logger from '../loaders/logger';
+
+const server = new Server({ 'grpc.enable_http_proxy': 0 });
+server.addService(HealthService, { check });
+server.addService(CronService, { addCron, delCron });
+server.bindAsync(
+  `0.0.0.0:${config.cronPort}`,
+  ServerCredentials.createInsecure(),
+  (err, port) => {
+    if (err) {
+      throw err;
+    }
+    server.start();
+    Logger.debug(`✌️ 定时服务启动成功！`);
+    console.debug(`✌️ 定时服务启动成功！`);
+    process.send?.('ready');
+  },
+);

back/services/config.ts

@@ -3,7 +3,7 @@ import path, { join } from 'path';
 import config from '../config';
 import { getFileContentByName } from '../config/util';
 import { Response } from 'express';
-import { request } from 'undici';
+import got from 'got';
 
 @Service()
 export default class ConfigService {
@@ -11,26 +11,14 @@ export default class ConfigService {
 
   public async getFile(filePath: string, res: Response) {
     let content = '';
-    const avaliablePath = [config.rootPath, config.configPath].map((x) =>
+    if (config.blackFileList.includes(filePath) || !filePath) {
-      path.resolve(x, filePath),
+      res.send({ code: 403, message: '文件无法访问' });
-    );
-
-    if (
-      config.blackFileList.includes(filePath) ||
-      avaliablePath.every(
-        (x) =>
-          !x.startsWith(config.scriptPath) && !x.startsWith(config.configPath),
-      ) ||
-      !filePath
-    ) {
-      return res.send({ code: 403, message: '文件无法访问' });
     }
-
     if (filePath.startsWith('sample/')) {
-      const res = await request(
+      const res = await got.get(
         `https://gitlab.com/whyour/qinglong/-/raw/master/${filePath}`,
       );
-      content = await res.body.text();
+      content = res.body;
     } else if (filePath.startsWith('data/scripts/')) {
       content = await getFileContentByName(join(config.rootPath, filePath));
     } else {

back/services/cron.ts

@@ -11,9 +11,8 @@ import {
   killTask,
   getUniqPath,
   safeJSONParse,
-  isDemoEnv,
 } from '../config/util';
-import { Op, where, col as colFn, FindOptions, fn, Order } from 'sequelize';
+import { Op, where, col as colFn, FindOptions, fn } from 'sequelize';
 import path from 'path';
 import { TASK_PREFIX, QL_PREFIX } from '../config/const';
 import cronClient from '../schedule/client';
@@ -22,8 +21,6 @@ import { spawn } from 'cross-spawn';
 import dayjs from 'dayjs';
 import pickBy from 'lodash/pickBy';
 import omit from 'lodash/omit';
-import { writeFileWithLock } from '../shared/utils';
-import { ScheduleType } from '../interface/schedule';
 
 @Service()
 export default class CronService {
@@ -37,40 +34,22 @@ export default class CronService {
     return false;
   }
 
-  private isOnceSchedule(schedule?: string) {
-    return schedule?.startsWith(ScheduleType.ONCE);
-  }
-
-  private isBootSchedule(schedule?: string) {
-    return schedule?.startsWith(ScheduleType.BOOT);
-  }
-
-  private isSpecialSchedule(schedule?: string) {
-    return this.isOnceSchedule(schedule) || this.isBootSchedule(schedule);
-  }
-
   public async create(payload: Crontab): Promise<Crontab> {
     const tab = new Crontab(payload);
     tab.saved = false;
     const doc = await this.insert(tab);
-
+    if (this.isNodeCron(doc)) {
-    if (isDemoEnv()) {
-      return doc;
-    }
-
-    if (this.isNodeCron(doc) && !this.isSpecialSchedule(doc.schedule)) {
       await cronClient.addCron([
         {
           name: doc.name || '',
           id: String(doc.id),
           schedule: doc.schedule!,
           command: this.makeCommand(doc),
-          extra_schedules: doc.extra_schedules || [],
+          extraSchedules: doc.extra_schedules || [],
         },
       ]);
     }
-
+    await this.set_crontab();
-    await this.setCrontab();
     return doc;
   }
 
@@ -78,33 +57,29 @@ export default class CronService {
     return await CrontabModel.create(payload, { returning: true });
   }
 
-  public async update(payload: Partial<Crontab>): Promise<Crontab> {
+  public async update(payload: Crontab): Promise<Crontab> {
     const doc = await this.getDb({ id: payload.id });
     const tab = new Crontab({ ...doc, ...payload });
     tab.saved = false;
     const newDoc = await this.updateDb(tab);
-
+    if (doc.isDisabled === 1) {
-    if (doc.isDisabled === 1 || isDemoEnv()) {
       return newDoc;
     }
-
     if (this.isNodeCron(doc)) {
       await cronClient.delCron([String(doc.id)]);
     }
-
+    if (this.isNodeCron(newDoc)) {
-    if (this.isNodeCron(newDoc) && !this.isSpecialSchedule(newDoc.schedule)) {
       await cronClient.addCron([
         {
           name: doc.name || '',
           id: String(newDoc.id),
           schedule: newDoc.schedule!,
           command: this.makeCommand(newDoc),
-          extra_schedules: newDoc.extra_schedules || [],
+          extraSchedules: newDoc.extra_schedules || [],
         },
       ]);
     }
-
+    await this.set_crontab();
-    await this.setCrontab();
     return newDoc;
   }
 
@@ -139,13 +114,7 @@ export default class CronService {
     }
 
     for (const id of ids) {
-      let cron;
+      const cron = await this.getDb({ id });
-      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']);
       }
@@ -159,7 +128,7 @@ export default class CronService {
   public async remove(ids: number[]) {
     await CrontabModel.destroy({ where: { id: ids } });
     await cronClient.delCron(ids.map(String));
-    await this.setCrontab();
+    await this.set_crontab();
   }
 
   public async pin(ids: number[]) {
@@ -203,8 +172,8 @@ export default class CronService {
       for (const col of viewQuery.filters) {
         const { property, value, operation } = col;
         let q: any = {};
-        let operate2: any = null;
+        let operate2 = null;
-        let operate: any = null;
+        let operate = null;
         switch (operation) {
           case 'Reg':
             operate = Op.like;
@@ -215,38 +184,21 @@ export default class CronService {
             operate2 = Op.and;
             break;
           case 'In':
-            if (
+            q[Op.or] = [
-              property === 'status' &&
+              {
-              !value.includes(CrontabStatus.disabled)
+                [property]: Array.isArray(value) ? value : [value],
-            ) {
+              },
-              q[Op.and] = [
+              property === 'status' && value.includes(2)
-                { [property]: Array.isArray(value) ? value : [value] },
+                ? { isDisabled: 1 }
-                { isDisabled: 0 },
+                : {},
-              ];
+            ];
-            } else {
-              q[Op.or] = [
-                {
-                  [property]: Array.isArray(value) ? value : [value],
-                },
-                property === 'status' && value.includes(CrontabStatus.disabled)
-                  ? { isDisabled: 1 }
-                  : {},
-              ];
-            }
             break;
           case 'Nin':
             q[Op.and] = [
               {
-                [Op.or]: [
+                [property]: {
-                  {
+                  [Op.notIn]: Array.isArray(value) ? value : [value],
-                    [property]: {
+                },
-                      [Op.notIn]: Array.isArray(value) ? value : [value],
-                    },
-                  },
-                  {
-                    [property]: { [Op.is]: null },
-                  },
-                ],
               },
               property === 'status' && value.includes(2)
                 ? { isDisabled: { [Op.ne]: 1 } }
@@ -361,10 +313,10 @@ export default class CronService {
     log_path,
   }: {
     log_path: string;
-  }): Promise<Crontab | undefined> {
+  }): Promise<Crontab | null> {
     try {
       const result = await CrontabModel.findOne({ where: { log_path } });
-      return result?.get({ plain: true });
+      return result;
     } catch (error) {
       throw error;
     }
@@ -404,9 +356,9 @@ export default class CronService {
         order.unshift([field, type]);
       }
     }
-    let condition: FindOptions<Crontab> = {
+    let condition: any = {
       where: query,
-      order: order as Order,
+      order: order,
     };
     if (page && size) {
       condition.offset = (page - 1) * size;
@@ -415,7 +367,7 @@ export default class CronService {
     try {
       const result = await CrontabModel.findAll(condition);
       const count = await CrontabModel.count({ where: query });
-      return { data: result.map((x) => x.get({ plain: true })), total: count };
+      return { data: result, total: count };
     } catch (error) {
       throw error;
     }
@@ -423,10 +375,7 @@ export default class CronService {
 
   public async getDb(query: FindOptions<Crontab>['where']): Promise<Crontab> {
     const doc: any = await CrontabModel.findOne({ where: { ...query } });
-    if (!doc) {
+    return doc && (doc.get({ plain: true }) as Crontab);
-      throw new Error(`Cron ${JSON.stringify(query)} not found`);
-    }
-    return doc.get({ plain: true });
   }
 
   public async run(ids: number[]) {
@@ -458,14 +407,14 @@ export default class CronService {
   }
 
   private async runSingle(cronId: number): Promise<number | void> {
-    return taskLimit.manualRunWithCronLimit(() => {
+    return taskLimit.runWithCronLimit(() => {
       return new Promise(async (resolve: any) => {
         const cron = await this.getDb({ id: cronId });
         const params = {
           name: cron.name,
           command: cron.command,
           schedule: cron.schedule,
-          extra_schedules: cron.extra_schedules,
+          extraSchedules: cron.extra_schedules,
         };
         if (cron.status !== CrontabStatus.queued) {
           resolve(params);
@@ -473,7 +422,7 @@ export default class CronService {
         }
 
         this.logger.info(
-          `[panel][开始执行任务] 参数: ${JSON.stringify(params)}`,
+          `[panel][开始执行任务] 参数 ${JSON.stringify(params)}`,
         );
 
         let { id, command, log_path } = cron;
@@ -485,11 +434,9 @@ export default class CronService {
         }
         const logPath = `${uniqPath}/${logTime}.log`;
         const absolutePath = path.resolve(config.logPath, `${logPath}`);
+
         const cp = spawn(
-          `real_log_path=${logPath} no_delay=true ${this.makeCommand(
+          `real_log_path=${logPath} no_delay=true ${this.makeCommand(cron)}`,
-            cron,
-            true,
-          )}`,
           { shell: '/bin/bash' },
         );
 
@@ -497,32 +444,14 @@ export default class CronService {
           { status: CrontabStatus.running, pid: cp.pid, log_path: logPath },
           { where: { id } },
         );
-        cp.stdout.on('data', async (data) => {
-          await fs.appendFile(absolutePath, data.toString());
-        });
         cp.stderr.on('data', async (data) => {
-          this.logger.info(
+          await fs.appendFile(`${absolutePath}`, `${data.toString()}`);
-            '[panel][执行任务失败] 命令: %s, 错误信息: %j',
-            command,
-            data.toString(),
-          );
-          await fs.appendFile(absolutePath, data.toString());
         });
         cp.on('error', async (err) => {
-          this.logger.error(
+          await fs.appendFile(`${absolutePath}`, `${JSON.stringify(err)}`);
-            '[panel][创建任务失败] 命令: %s, 错误信息: %j',
-            command,
-            err,
-          );
-          await fs.appendFile(absolutePath, JSON.stringify(err));
         });
 
         cp.on('exit', async (code) => {
-          this.logger.info(
-            '[panel][执行任务结束] 参数: %s, 退出码: %j',
-            JSON.stringify(params),
-            code,
-          );
           await CrontabModel.update(
             { status: CrontabStatus.idle, pid: undefined },
             { where: { id } },
@@ -536,27 +465,23 @@ export default class CronService {
   public async disabled(ids: number[]) {
     await CrontabModel.update({ isDisabled: 1 }, { where: { id: ids } });
     await cronClient.delCron(ids.map(String));
-    await this.setCrontab();
+    await this.set_crontab();
   }
 
   public async enabled(ids: number[]) {
     await CrontabModel.update({ isDisabled: 0 }, { where: { id: ids } });
     const docs = await CrontabModel.findAll({ where: { id: ids } });
     const sixCron = docs
-      .filter((x) => this.isNodeCron(x) && !this.isSpecialSchedule(x.schedule))
+      .filter((x) => this.isNodeCron(x))
       .map((doc) => ({
         name: doc.name || '',
         id: String(doc.id),
         schedule: doc.schedule!,
         command: this.makeCommand(doc),
-        extra_schedules: doc.extra_schedules || [],
+        extraSchedules: doc.extra_schedules || [],
       }));
-
-    if (isDemoEnv()) {
-      return;
-    }
     await cronClient.addCron(sixCron);
-    await this.setCrontab();
+    await this.set_crontab();
   }
 
   public async log(id: number) {
@@ -570,10 +495,7 @@ export default class CronService {
     if (logFileExist) {
       return await getFileContentByName(`${absolutePath}`);
     } else {
-      return typeof doc.status === 'number' &&
+      return '任务未运行';
-        [CrontabStatus.queued, CrontabStatus.running].includes(doc.status)
-        ? '运行中...'
-        : '日志不存在...';
     }
   }
 
@@ -593,7 +515,7 @@ export default class CronService {
           files.map(async (x) => ({
             filename: x,
             directory: relativeDir.replace(config.logPath, ''),
-            time: (await fs.lstat(`${dir}/${x}`)).birthtimeMs,
+            time: (await fs.stat(`${dir}/${x}`)).mtime.getTime(),
           })),
         )
       ).sort((a, b) => b.time - a.time);
@@ -602,24 +524,20 @@ export default class CronService {
     }
   }
 
-  private makeCommand(tab: Crontab, realTime?: boolean) {
+  private makeCommand(tab: Crontab) {
     let command = tab.command.trim();
     if (!command.startsWith(TASK_PREFIX) && !command.startsWith(QL_PREFIX)) {
       command = `${TASK_PREFIX}${tab.command}`;
     }
-    let commandVariable = `real_time=${Boolean(realTime)} no_tee=true ID=${
+    let commandVariable = `no_tee=true ID=${tab.id} `;
-      tab.id
-    } `;
     if (tab.task_before) {
       commandVariable += `task_before='${tab.task_before
         .replace(/'/g, "'\\''")
-        .replace(/;? *\n/g, ';')
         .trim()}' `;
     }
     if (tab.task_after) {
       commandVariable += `task_after='${tab.task_after
         .replace(/'/g, "'\\''")
-        .replace(/;? *\n/g, ';')
         .trim()}' `;
     }
 
@@ -627,14 +545,15 @@ export default class CronService {
     return crontab_job_string;
   }
 
-  private async setCrontab(data?: { data: Crontab[]; total: number }) {
+  private async set_crontab(data?: { data: Crontab[]; total: number }) {
     const tabs = data ?? (await this.crontabs());
     var crontab_string = '';
     tabs.data.forEach((tab) => {
+      const _schedule = tab.schedule && tab.schedule.split(/ +/);
       if (
         tab.isDisabled === 1 ||
-        this.isNodeCron(tab) ||
+        _schedule!.length !== 5 ||
-        this.isSpecialSchedule(tab.schedule)
+        tab.extra_schedules?.length
       ) {
         crontab_string += '# ';
         crontab_string += tab.schedule;
@@ -649,13 +568,13 @@ export default class CronService {
       }
     });
 
-    await writeFileWithLock(config.crontabFile, crontab_string);
+    await fs.writeFile(config.crontabFile, crontab_string);
 
     execSync(`crontab ${config.crontabFile}`);
     await CrontabModel.update({ saved: true }, { where: {} });
   }
 
-  public importCrontab() {
+  public import_crontab() {
     exec('crontab -l', (error, stdout, stderr) => {
       const lines = stdout.split('\n');
       const namePrefix = new Date().getTime();
@@ -691,42 +610,17 @@ export default class CronService {
 
   public async autosave_crontab() {
     const tabs = await this.crontabs();
-    const regularCrons = tabs.data
+    this.set_crontab(tabs);
-      .filter(
+
-        (x) =>
+    const sixCron = tabs.data
-          x.isDisabled !== 1 &&
+      .filter((x) => this.isNodeCron(x) && x.isDisabled !== 1)
-          this.isNodeCron(x) &&
-          !this.isSpecialSchedule(x.schedule),
-      )
       .map((doc) => ({
         name: doc.name || '',
         id: String(doc.id),
         schedule: doc.schedule!,
         command: this.makeCommand(doc),
-        extra_schedules: doc.extra_schedules || [],
+        extraSchedules: doc.extra_schedules || [],
       }));
-
+    await cronClient.addCron(sixCron);
-    if (isDemoEnv()) {
-      await writeFileWithLock(config.crontabFile, '');
-      return;
-    }
-    await cronClient.addCron(regularCrons);
-    this.setCrontab(tabs);
-  }
-
-  public async bootTask() {
-    const tabs = await this.crontabs();
-    const bootTasks = tabs.data.filter(
-      (x) => !x.isDisabled && this.isBootSchedule(x.schedule),
-    );
-    if (bootTasks.length > 0) {
-      await CrontabModel.update(
-        { status: CrontabStatus.queued },
-        { where: { id: bootTasks.map((t) => t.id!) } },
-      );
-      for (const task of bootTasks) {
-        await this.runSingle(task.id!);
-      }
-    }
   }
 }

back/services/cronView.ts

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

back/services/dependence.ts

@@ -3,9 +3,12 @@ import winston from 'winston';
 import config from '../config';
 import {
   Dependence,
+  InstallDependenceCommandTypes,
   DependenceStatus,
   DependenceTypes,
+  unInstallDependenceCommandTypes,
   DependenceModel,
+  GetDependenceCommandTypes,
   versionDependenceCommandTypes,
 } from '../data/dependence';
 import { spawn } from 'cross-spawn';
@@ -16,9 +19,6 @@ import {
   getPid,
   killTask,
   promiseExecSuccess,
-  getInstallCommand,
-  getUninstallCommand,
-  getGetCommand,
 } from '../config/util';
 import dayjs from 'dayjs';
 import taskLimit from '../shared/pLimit';
@@ -28,7 +28,7 @@ export default class DependenceService {
   constructor(
     @Inject('logger') private logger: winston.Logger,
     private sockService: SockService,
-  ) { }
+  ) {}
 
   public async create(payloads: Dependence[]): Promise<Dependence[]> {
     const tabs = payloads.map((x) => {
@@ -67,9 +67,6 @@ export default class DependenceService {
 
   public async remove(ids: number[], force = false): Promise<Dependence[]> {
     const docs = await DependenceModel.findAll({ where: { id: ids } });
-    for (const doc of docs) {
-      taskLimit.removeQueuedDependency(doc);
-    }
     const unInstalledDeps = docs.filter(
       (x) => x.status !== DependenceStatus.installed,
     );
@@ -98,32 +95,34 @@ export default class DependenceService {
       searchValue,
       type,
       status,
-    }: {
+    }: { searchValue: string; type: string; status: string },
-      searchValue: string;
-      type: keyof typeof DependenceTypes;
-      status: string;
-    },
     sort: any = [],
     query: any = {},
   ): Promise<Dependence[]> {
-    let condition = query;
+    let condition = {
-    if (DependenceTypes[type]) {
+      ...query,
-      condition.type = DependenceTypes[type];
+      type: DependenceTypes[type as any],
-    }
+    };
     if (status) {
       condition.status = status.split(',').map(Number);
     }
     if (searchValue) {
       const encodeText = encodeURI(searchValue);
-      condition.name = {
+      const reg = {
         [Op.or]: [
           { [Op.like]: `%${searchValue}%` },
           { [Op.like]: `%${encodeText}%` },
         ],
       };
+
+      condition = {
+        ...condition,
+        name: reg,
+      };
     }
     try {
-      return await this.find(condition, sort);
+      const result = await this.find(condition, sort);
+      return result as any;
     } catch (error) {
       throw error;
     }
@@ -133,12 +132,10 @@ export default class DependenceService {
     docs: Dependence[],
     isInstall: boolean = true,
     force: boolean = false,
-  ): Promise<void> {
+  ) {
     docs.forEach((dep) => {
       this.installOrUninstallDependency(dep, isInstall, force);
     });
-
-    return taskLimit.waitDependencyQueueDone();
   }
 
   public async reInstall(ids: number[]): Promise<Dependence[]> {
@@ -148,9 +145,6 @@ export default class DependenceService {
     );
 
     const docs = await DependenceModel.findAll({ where: { id: ids } });
-    for (const doc of docs) {
-      taskLimit.removeQueuedDependency(doc);
-    }
     this.installDependenceOneByOne(docs, true, true);
     return docs;
   }
@@ -159,11 +153,13 @@ export default class DependenceService {
     const docs = await DependenceModel.findAll({ where: { id: ids } });
     for (const doc of docs) {
       taskLimit.removeQueuedDependency(doc);
-      const depInstallCommand = getInstallCommand(doc.type, doc.name);
+      const depInstallCommand = InstallDependenceCommandTypes[doc.type];
-      const depUnInstallCommand = getUninstallCommand(doc.type, doc.name);
+      const depUnInstallCommand = unInstallDependenceCommandTypes[doc.type];
+      const installCmd = `${depInstallCommand} ${doc.name.trim()}`;
+      const unInstallCmd = `${depUnInstallCommand} ${doc.name.trim()}`;
       const pids = await Promise.all([
-        getPid(depInstallCommand),
+        getPid(installCmd),
-        getPid(depUnInstallCommand),
+        getPid(unInstallCmd),
       ]);
       for (const pid of pids) {
         pid && (await killTask(pid));
@@ -187,10 +183,7 @@ export default class DependenceService {
     query: FindOptions<Dependence>['where'],
   ): Promise<Dependence> {
     const doc: any = await DependenceModel.findOne({ where: { ...query } });
-    if (!doc) {
+    return doc && (doc.get({ plain: true }) as Dependence);
-      throw new Error(`Dependency ${JSON.stringify(query)} not found`);
-    }
-    return doc.get({ plain: true });
   }
 
   private async updateLog(ids: number[], log: string): Promise<void> {
@@ -230,9 +223,11 @@ export default class DependenceService {
           ? 'installDependence'
           : 'uninstallDependence';
         let depName = dependency.name.trim();
-        const command = isInstall
+        const depRunCommand = (
-          ? getInstallCommand(dependency.type, depName)
+          isInstall
-          : getUninstallCommand(dependency.type, depName);
+            ? InstallDependenceCommandTypes
+            : unInstallDependenceCommandTypes
+        )[dependency.type];
         const actionText = isInstall ? '安装' : '删除';
         const startTime = dayjs();
 
@@ -248,7 +243,7 @@ export default class DependenceService {
 
         // 判断是否已经安装过依赖
         if (isInstall && !force) {
-          const getCommand = getGetCommand(dependency.type, depName);
+          const getCommandPrefix = GetDependenceCommandTypes[dependency.type];
           const depVersionStr = versionDependenceCommandTypes[dependency.type];
           let depVersion = '';
           if (depName.includes(depVersionStr)) {
@@ -265,7 +260,13 @@ export default class DependenceService {
           const isLinuxDependence = dependency.type === DependenceTypes.linux;
           const isPythonDependence =
             dependency.type === DependenceTypes.python3;
-          const depInfo = (await promiseExecSuccess(getCommand))
+          const depInfo = (
+            await promiseExecSuccess(
+              isNodeDependence
+                ? `${getCommandPrefix} | grep "${depName}" | head -1`
+                : `${getCommandPrefix} ${depName}`,
+            )
+          )
             .replace(/\s{2,}/, ' ')
             .replace(/\s+$/, '');
 
@@ -300,9 +301,12 @@ export default class DependenceService {
         const proxyStr = dependenceProxyFileExist
           ? `source ${config.dependenceProxyFile} &&`
           : '';
-        const cp = spawn(`${proxyStr} ${command}`, {
+        const cp = spawn(
-          shell: '/bin/bash',
+          `${proxyStr} ${depRunCommand} ${dependency.name.trim()}`,
-        });
+          {
+            shell: '/bin/bash',
+          },
+        );
 
         cp.stdout.on('data', async (data) => {
           this.sockService.sendMessage({
@@ -346,7 +350,7 @@ export default class DependenceService {
           });
           this.updateLog(depIds, message);
 
-          let status: number;
+          let status = null;
           if (isSucceed) {
             status = isInstall
               ? DependenceStatus.installed

back/services/env.ts

@@ -13,7 +13,6 @@ import {
 } from '../data/env';
 import groupBy from 'lodash/groupBy';
 import { FindOptions, Op } from 'sequelize';
-import { writeFileWithLock } from '../shared/utils';
 
 @Service()
 export default class EnvService {
@@ -41,7 +40,7 @@ export default class EnvService {
   }
 
   public async insert(payloads: Env[]): Promise<Env[]> {
-    const result: Env[] = [];
+    const result = [];
     for (const env of payloads) {
       const doc = await EnvModel.create(env, { returning: true });
       result.push(doc);
@@ -62,7 +61,7 @@ export default class EnvService {
     return await this.getDb({ id: payload.id });
   }
 
-  public async remove(ids: number[]) {
+  public async remove(ids: string[]) {
     await EnvModel.destroy({ where: { id: ids } });
     await this.set_envs();
   }
@@ -150,7 +149,7 @@ export default class EnvService {
         ['position', 'DESC'],
         ['createdAt', 'ASC'],
       ]);
-      return result;
+      return result as any;
     } catch (error) {
       throw error;
     }
@@ -161,18 +160,15 @@ export default class EnvService {
       where: { ...query },
       order: [...sort],
     });
-    return docs.map((x) => x.get({ plain: true }));
+    return docs;
   }
 
   public async getDb(query: FindOptions<Env>['where']): Promise<Env> {
     const doc: any = await EnvModel.findOne({ where: { ...query } });
-    if (!doc) {
+    return doc && (doc.get({ plain: true }) as Env);
-      throw new Error(`Env ${JSON.stringify(query)} not found`);
-    }
-    return doc.get({ plain: true });
   }
 
-  public async disabled(ids: number[]) {
+  public async disabled(ids: string[]) {
     await EnvModel.update(
       { status: EnvStatus.disabled },
       { where: { id: ids } },
@@ -180,12 +176,12 @@ export default class EnvService {
     await this.set_envs();
   }
 
-  public async enabled(ids: number[]) {
+  public async enabled(ids: string[]) {
     await EnvModel.update({ status: EnvStatus.normal }, { where: { id: ids } });
     await this.set_envs();
   }
 
-  public async updateNames({ ids, name }: { ids: number[]; name: string }) {
+  public async updateNames({ ids, name }: { ids: string[]; name: string }) {
     await EnvModel.update({ name }, { where: { id: ids } });
     await this.set_envs();
   }
@@ -197,8 +193,6 @@ 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];
@@ -211,23 +205,9 @@ export default class EnvService {
             .replace(/'/g, "'\\''")
             .trim();
           env_string += `export ${key}='${value}'\n`;
-          const _env_value = `${group
-            .map((x) => x.value)
-            .join('&')
-            .replace(/\\/g, '\\\\')}`;
-          js_env_string += `process.env.${key}=\`${_env_value.replace(
-            /\`/g,
-            '\\`',
-          )}\`;\n`;
-          py_env_string += `os.environ['${key}']='''${_env_value.replace(
-            /\'/g,
-            "\\'",
-          )}'''\n`;
         }
       }
     }
-    await writeFileWithLock(config.envFile, env_string);
+    await fs.writeFile(config.envFile, env_string);
-    await writeFileWithLock(config.jsEnvFile, js_env_string);
-    await writeFileWithLock(config.pyEnvFile, py_env_string);
   }
 }

back/services/grpc.ts

@@ -1,64 +0,0 @@
-import { Server, ServerCredentials } from '@grpc/grpc-js';
-import { CronService } from '../protos/cron';
-import { HealthService } from '../protos/health';
-import { ApiService } from '../protos/api';
-import { addCron } from '../schedule/addCron';
-import { delCron } from '../schedule/delCron';
-import { check } from '../schedule/health';
-import * as Api from '../schedule/api';
-import Logger from '../loaders/logger';
-import { promisify } from 'util';
-import config from '../config';
-import { metricsService } from './metrics';
-import { Service } from 'typedi';
-
-@Service()
-export class GrpcServerService {
-  private server: Server = new Server({ 'grpc.enable_http_proxy': 0 });
-
-  async initialize() {
-    try {
-      this.server.addService(HealthService, { check });
-      this.server.addService(CronService, { addCron, delCron });
-      this.server.addService(ApiService, Api);
-
-      const grpcPort = config.grpcPort;
-      const bindAsync = promisify(this.server.bindAsync).bind(this.server);
-      await bindAsync(
-        `0.0.0.0:${grpcPort}`,
-        ServerCredentials.createInsecure(),
-      );
-      Logger.debug(`✌️ gRPC service started successfully`);
-
-      metricsService.record('grpc_service_start', 1, {
-        port: grpcPort.toString(),
-      });
-
-      return grpcPort;
-    } catch (err) {
-      Logger.error('Failed to start gRPC service:', err);
-      throw err;
-    }
-  }
-
-  async shutdown() {
-    try {
-      if (this.server) {
-        await new Promise((resolve) => {
-          this.server.tryShutdown(() => {
-            Logger.debug('gRPC service stopped');
-            metricsService.record('grpc_service_stop', 1);
-            resolve(null);
-          });
-        });
-      }
-    } catch (err) {
-      Logger.error('Error while shutting down gRPC service:', err);
-      throw err;
-    }
-  }
-
-  getServer() {
-    return this.server;
-  }
-}

back/services/health.ts

@@ -1,72 +0,0 @@
-import { Service } from 'typedi';
-import Logger from '../loaders/logger';
-import { GrpcServerService } from './grpc';
-import { HttpServerService } from './http';
-
-interface HealthStatus {
-  status: 'ok' | 'error';
-  services: {
-    http: boolean;
-    grpc: boolean;
-  };
-  metrics: {
-    uptime: number;
-    memory: {
-      used: number;
-      total: number;
-    };
-  };
-}
-
-@Service()
-export class HealthService {
-  private startTime = Date.now();
-
-  constructor(
-    private grpcServerService: GrpcServerService,
-    private httpServerService: HttpServerService,
-  ) {}
-
-  async check(): Promise<HealthStatus> {
-    const status: HealthStatus = {
-      status: 'ok',
-      services: {
-        http: true,
-        grpc: true,
-      },
-      metrics: {
-        uptime: Math.floor((Date.now() - this.startTime) / 1000),
-        memory: {
-          used: process.memoryUsage().heapUsed,
-          total: process.memoryUsage().heapTotal,
-        },
-      },
-    };
-
-    try {
-      const httpServer = this.httpServerService.getServer();
-      if (!httpServer) {
-        status.services.http = false;
-        status.status = 'error';
-      }
-    } catch (err) {
-      status.services.http = false;
-      status.status = 'error';
-      Logger.error('HTTP server check failed:', err);
-    }
-
-    try {
-      const grpcServer = this.grpcServerService.getServer();
-      if (!grpcServer) {
-        status.services.grpc = false;
-        status.status = 'error';
-      }
-    } catch (err) {
-      status.services.grpc = false;
-      status.status = 'error';
-      Logger.error('gRPC server check failed:', err);
-    }
-
-    return status;
-  }
-}

back/services/http.ts

@@ -1,53 +0,0 @@
-import express from 'express';
-import Logger from '../loaders/logger';
-import { metricsService } from './metrics';
-import { Service } from 'typedi';
-import { Server } from 'http';
-
-@Service()
-export class HttpServerService {
-  private server?: Server = undefined;
-
-  async initialize(expressApp: express.Application, port: number) {
-    try {
-      return new Promise((resolve, reject) => {
-        this.server = expressApp.listen(port, '0.0.0.0', () => {
-          Logger.debug(`✌️ HTTP service started successfully`);
-          metricsService.record('http_service_start', 1, {
-            port: port.toString(),
-          });
-          resolve(this.server);
-        });
-
-        this.server?.on('error', (err: Error) => {
-          Logger.error('Failed to start HTTP service:', err);
-          reject(err);
-        });
-      });
-    } catch (err) {
-      Logger.error('Failed to start HTTP service:', err);
-      throw err;
-    }
-  }
-
-  async shutdown() {
-    try {
-      if (this.server) {
-        await new Promise((resolve) => {
-          this.server?.close(() => {
-            Logger.debug('HTTP service stopped');
-            metricsService.record('http_service_stop', 1);
-            resolve(null);
-          });
-        });
-      }
-    } catch (err) {
-      Logger.error('Error while shutting down HTTP service:', err);
-      throw err;
-    }
-  }
-
-  getServer() {
-    return this.server;
-  }
-}

back/services/log.ts

@@ -1,14 +0,0 @@
-import path from 'path';
-import { Inject, Service } from 'typedi';
-import winston from 'winston';
-import config from '../config';
-
-@Service()
-export default class LogService {
-  constructor(@Inject('logger') private logger: winston.Logger) {}
-
-  public checkFilePath(filePath: string, fileName: string) {
-    const finalPath = path.resolve(config.logPath, filePath, fileName);
-    return finalPath.startsWith(config.logPath) ? finalPath : '';
-  }
-}

back/services/metrics.ts

@@ -1,92 +0,0 @@
-import { performance } from 'perf_hooks';
-import Logger from '../loaders/logger';
-
-interface Metric {
-  name: string;
-  value: number;
-  timestamp: number;
-  tags?: Record<string, string>;
-}
-
-class MetricsService {
-  private metrics: Metric[] = [];
-  private static instance: MetricsService;
-
-  private constructor() {
-    // 定期清理旧数据
-    setInterval(() => {
-      const oneHourAgo = Date.now() - 3600000;
-      this.metrics = this.metrics.filter(m => m.timestamp > oneHourAgo);
-    }, 60000);
-  }
-
-  static getInstance(): MetricsService {
-    if (!MetricsService.instance) {
-      MetricsService.instance = new MetricsService();
-    }
-    return MetricsService.instance;
-  }
-
-  record(name: string, value: number, tags?: Record<string, string>) {
-    this.metrics.push({
-      name,
-      value,
-      timestamp: Date.now(),
-      tags,
-    });
-  }
-
-  measure(name: string, fn: () => void, tags?: Record<string, string>) {
-    const start = performance.now();
-    try {
-      fn();
-    } finally {
-      const duration = performance.now() - start;
-      this.record(name, duration, tags);
-    }
-  }
-
-  async measureAsync(name: string, fn: () => Promise<void>, tags?: Record<string, string>) {
-    const start = performance.now();
-    try {
-      await fn();
-    } finally {
-      const duration = performance.now() - start;
-      this.record(name, duration, tags);
-    }
-  }
-
-  getMetrics(name?: string, tags?: Record<string, string>) {
-    let filtered = this.metrics;
-    
-    if (name) {
-      filtered = filtered.filter(m => m.name === name);
-    }
-    
-    if (tags) {
-      filtered = filtered.filter(m => {
-        if (!m.tags) return false;
-        return Object.entries(tags).every(([key, value]) => m.tags![key] === value);
-      });
-    }
-
-    return {
-      count: filtered.length,
-      average: filtered.reduce((acc, curr) => acc + curr.value, 0) / filtered.length,
-      min: Math.min(...filtered.map(m => m.value)),
-      max: Math.max(...filtered.map(m => m.value)),
-      metrics: filtered,
-    };
-  }
-
-  report() {
-    const report = {
-      timestamp: Date.now(),
-      metrics: this.getMetrics(),
-    };
-    Logger.info('性能指标报告:', report);
-    return report;
-  }
-}
-
-export const metricsService = MetricsService.getInstance(); 

back/services/notify.ts

@@ -1,11 +1,12 @@
 import crypto from 'crypto';
+import got from 'got';
+import { HttpProxyAgent, HttpsProxyAgent } from 'hpagent';
 import nodemailer from 'nodemailer';
 import { Inject, Service } from 'typedi';
+import winston from 'winston';
 import { parseBody, parseHeaders } from '../config/util';
 import { NotificationInfo } from '../data/notify';
 import UserService from './user';
-import { httpClient } from '../config/http';
-import { ProxyAgent } from 'undici';
 
 @Service()
 export default class NotificationService {
@@ -26,14 +27,11 @@ 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],
     ['lark', this.lark],
     ['chronocat', this.chronocat],
-    ['ntfy', this.ntfy],
-    ['wxPusherBot', this.wxPusherBot],
   ]);
 
   private title = '';
@@ -44,31 +42,22 @@ export default class NotificationService {
     retry: 1,
   };
 
-  constructor() {}
+  constructor(@Inject('logger') private logger: winston.Logger) {}
 
   public async notify(
     title: string,
     content: string,
-    notificationInfo?: NotificationInfo,
   ): Promise<boolean | undefined> {
-    let { type, ...rest } = await this.userService.getNotificationMode();
+    const { type, ...rest } = await this.userService.getNotificationMode();
-    if (notificationInfo?.type) {
-      type = notificationInfo?.type;
-    }
     if (type) {
       this.title = title;
       this.content = content;
-      let params = rest;
+      this.params = rest;
-      if (notificationInfo) {
-        const { type: _, ...others } = notificationInfo;
-        params = { ...rest, ...others };
-      }
-      this.params = params;
       const notificationModeAction = this.modeMap.get(type);
       try {
         return await notificationModeAction?.call(this);
       } catch (error: any) {
-        console.error(error);
+        throw error;
       }
     }
     return false;
@@ -93,9 +82,8 @@ export default class NotificationService {
   private async gotify() {
     const { gotifyUrl, gotifyToken, gotifyPriority = 1 } = this.params;
     try {
-      const res = await httpClient.post(
+      const res: any = await got
-        `${gotifyUrl}/message?token=${gotifyToken}`,
+        .post(`${gotifyUrl}/message?token=${gotifyToken}`, {
-        {
           ...this.gotOption,
           body: `title=${encodeURIComponent(
             this.title,
@@ -105,8 +93,8 @@ export default class NotificationService {
           headers: {
             'Content-Type': 'application/x-www-form-urlencoded',
           },
-        },
+        })
-      );
+        .json();
       if (typeof res.id === 'number') {
         return true;
       } else {
@@ -120,11 +108,13 @@ export default class NotificationService {
   private async goCqHttpBot() {
     const { goCqHttpBotQq, goCqHttpBotToken, goCqHttpBotUrl } = this.params;
     try {
-      const res = await httpClient.post(`${goCqHttpBotUrl}?${goCqHttpBotQq}`, {
+      const res: any = await got
-        ...this.gotOption,
+        .post(`${goCqHttpBotUrl}?${goCqHttpBotQq}`, {
-        json: { message: `${this.title}\n${this.content}` },
+          ...this.gotOption,
-        headers: { Authorization: 'Bearer ' + goCqHttpBotToken },
+          json: { message: `${this.title}\n${this.content}` },
-      });
+          headers: { Authorization: 'Bearer ' + goCqHttpBotToken },
+        })
+        .json();
       if (res.retcode === 0) {
         return true;
       } else {
@@ -137,20 +127,17 @@ export default class NotificationService {
 
   private async serverChan() {
     const { serverChanKey } = this.params;
-    const matchResult = serverChanKey.match(/^sctp(\d+)t/i);
+    const url = serverChanKey.startsWith('SCT')
-    const url =
+      ? `https://sctapi.ftqq.com/${serverChanKey}.send`
-      matchResult && matchResult[1]
+      : `https://sc.ftqq.com/${serverChanKey}.send`;
-        ? `https://${matchResult[1]}.push.ft07.com/send/${serverChanKey}.send`
-        : `https://sctapi.ftqq.com/${serverChanKey}.send`;
-
     try {
-      const res = await httpClient.post(url, {
+      const res: any = await got
-        ...this.gotOption,
+        .post(url, {
-        body: `title=${encodeURIComponent(
+          ...this.gotOption,
-          this.title,
+          body: `title=${this.title}&desp=${this.content}`,
-        )}&desp=${encodeURIComponent(this.content)}`,
+          headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-        headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+        })
-      });
+        .json();
       if (res.errno === 0 || res.data.errno === 0) {
         return true;
       } else {
@@ -165,13 +152,15 @@ export default class NotificationService {
     const { pushDeerKey, pushDeerUrl } = this.params;
     const url = pushDeerUrl || `https://api2.pushdeer.com/message/push`;
     try {
-      const res = await httpClient.post(url, {
+      const res: any = await got
-        ...this.gotOption,
+        .post(url, {
-        body: `pushkey=${pushDeerKey}&text=${encodeURIComponent(
+          ...this.gotOption,
-          this.title,
+          body: `pushkey=${pushDeerKey}&text=${encodeURIComponent(
-        )}&desp=${encodeURIComponent(this.content)}&type=markdown`,
+            this.title,
-        headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+          )}&desp=${encodeURIComponent(this.content)}&type=markdown`,
-      });
+          headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+        })
+        .json();
       if (
         res.content.result.length !== undefined &&
         res.content.result.length > 0
@@ -186,13 +175,16 @@ export default class NotificationService {
   }
 
   private async chat() {
-    const { synologyChatUrl } = this.params;
+    const { chatUrl, chatToken } = this.params;
+    const url = `${chatUrl}${chatToken}`;
     try {
-      const res = await httpClient.post(synologyChatUrl, {
+      const res: any = await got
-        ...this.gotOption,
+        .post(url, {
-        body: `payload={"text":"${this.title}\n${this.content}"}`,
+          ...this.gotOption,
-        headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+          body: `payload={"text":"${this.title}\n${this.content}"}`,
-      });
+          headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+        })
+        .json();
       if (res.success) {
         return true;
       } else {
@@ -204,35 +196,24 @@ export default class NotificationService {
   }
 
   private async bark() {
-    let {
+    let { barkPush, barkIcon, barkSound, barkGroup, barkLevel, barkUrl } =
-      barkPush,
+      this.params;
-      barkIcon = '',
-      barkSound = '',
-      barkGroup = '',
-      barkLevel = '',
-      barkUrl = '',
-      barkArchive = '',
-    } = this.params;
     if (!barkPush.startsWith('http')) {
       barkPush = `https://api.day.app/${barkPush}`;
     }
-    const url = `${barkPush}`;
+    const url = `${barkPush}/${encodeURIComponent(
-    const body = {
+      this.title,
-      title: this.title,
+    )}/${encodeURIComponent(
-      body: this.content,
+      this.content,
-      icon: barkIcon,
+    )}?icon=${barkIcon}&sound=${barkSound}&group=${barkGroup}&level=${barkLevel}&url=${barkUrl}`;
-      sound: barkSound,
+
-      group: barkGroup,
-      isArchive: barkArchive,
-      level: barkLevel,
-      url: barkUrl,
-    };
     try {
-      const res = await httpClient.post(url, {
+      const res: any = await got
-        ...this.gotOption,
+        .get(url, {
-        json: body,
+          ...this.gotOption,
-        headers: { 'Content-Type': 'application/json' },
+          headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-      });
+        })
+        .json();
       if (res.code === 200) {
         return true;
       } else {
@@ -258,17 +239,29 @@ export default class NotificationService {
     }/bot${telegramBotToken}/sendMessage`;
     let agent;
     if (telegramBotProxyHost && telegramBotProxyPort) {
-      agent = new ProxyAgent({
+      const options: any = {
-        uri: `http://${authStr}${telegramBotProxyHost}:${telegramBotProxyPort}`,
+        keepAlive: true,
-      });
+        keepAliveMsecs: 1000,
+        maxSockets: 256,
+        maxFreeSockets: 256,
+        proxy: `http://${authStr}${telegramBotProxyHost}:${telegramBotProxyPort}`,
+      };
+      const httpAgent = new HttpProxyAgent(options);
+      const httpsAgent = new HttpsProxyAgent(options);
+      agent = {
+        http: httpAgent,
+        https: httpsAgent,
+      };
     }
     try {
-      const res = await httpClient.post(url, {
+      const res: any = await got
-        ...this.gotOption,
+        .post(url, {
-        body: `chat_id=${telegramBotUserId}&text=${this.title}\n\n${this.content}&disable_web_page_preview=true`,
+          ...this.gotOption,
-        headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+          body: `chat_id=${telegramBotUserId}&text=${this.title}\n\n${this.content}&disable_web_page_preview=true`,
-        dispatcher: agent,
+          headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-      });
+          agent,
+        })
+        .json();
       if (res.ok) {
         return true;
       } else {
@@ -291,15 +284,17 @@ export default class NotificationService {
     }
     const url = `https://oapi.dingtalk.com/robot/send?access_token=${dingtalkBotToken}${secretParam}`;
     try {
-      const res = await httpClient.post(url, {
+      const res: any = await got
-        ...this.gotOption,
+        .post(url, {
-        json: {
+          ...this.gotOption,
-          msgtype: 'text',
+          json: {
-          text: {
+            msgtype: 'text',
-            content: ` ${this.title}\n\n${this.content}`,
+            text: {
+              content: ` ${this.title}\n\n${this.content}`,
+            },
           },
-        },
+        })
-      });
+        .json();
       if (res.errcode === 0) {
         return true;
       } else {
@@ -315,15 +310,17 @@ export default class NotificationService {
       this.params;
     const url = `${weWorkOrigin}/cgi-bin/webhook/send?key=${weWorkBotKey}`;
     try {
-      const res = await httpClient.post(url, {
+      const res: any = await got
-        ...this.gotOption,
+        .post(url, {
-        json: {
+          ...this.gotOption,
-          msgtype: 'text',
+          json: {
-          text: {
+            msgtype: 'text',
-            content: ` ${this.title}\n\n${this.content}`,
+            text: {
+              content: ` ${this.title}\n\n${this.content}`,
+            },
           },
-        },
+        })
-      });
+        .json();
       if (res.errcode === 0) {
         return true;
       } else {
@@ -340,13 +337,15 @@ export default class NotificationService {
     const [corpid, corpsecret, touser, agentid, thumb_media_id = '1'] =
       weWorkAppKey.split(',');
     const url = `${weWorkOrigin}/cgi-bin/gettoken`;
-    const tokenRes = await httpClient.post(url, {
+    const tokenRes: any = await got
-      ...this.gotOption,
+      .post(url, {
-      json: {
+        ...this.gotOption,
-        corpid,
+        json: {
-        corpsecret,
+          corpid,
-      },
+          corpsecret,
-    });
+        },
+      })
+      .json();
 
     let options: any = {
       msgtype: 'mpnews',
@@ -387,18 +386,20 @@ export default class NotificationService {
     }
 
     try {
-      const res = await httpClient.post(
+      const res: any = await got
-        `${weWorkOrigin}/cgi-bin/message/send?access_token=${tokenRes.access_token}`,
+        .post(
-        {
+          `${weWorkOrigin}/cgi-bin/message/send?access_token=${tokenRes.access_token}`,
-          ...this.gotOption,
+          {
-          json: {
+            ...this.gotOption,
-            touser,
+            json: {
-            agentid,
+              touser,
-            safe: '0',
+              agentid,
-            ...options,
+              safe: '0',
+              ...options,
+            },
           },
-        },
+        )
-      );
+        .json();
 
       if (res.errcode === 0) {
         return true;
@@ -440,12 +441,14 @@ export default class NotificationService {
     }
 
     try {
-      const res = await httpClient.post(url, {
+      const res: any = await got
-        ...this.gotOption,
+        .post(url, {
-        json: {
+          ...this.gotOption,
-          ...json,
+          json: {
-        },
+            ...json,
-      });
+          },
+        })
+        .json();
       if (res.code === 0) {
         return true;
       } else {
@@ -460,11 +463,13 @@ export default class NotificationService {
     const { iGotPushKey } = this.params;
     const url = `https://push.hellyw.com/${iGotPushKey.toLowerCase()}`;
     try {
-      const res = await httpClient.post(url, {
+      const res: any = await got
-        ...this.gotOption,
+        .post(url, {
-        body: `title=${this.title}&content=${this.content}`,
+          ...this.gotOption,
-        headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+          body: `title=${this.title}&content=${this.content}`,
-      });
+          headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+        })
+        .json();
 
       if (res.ret === 0) {
         return true;
@@ -477,67 +482,20 @@ export default class NotificationService {
   }
 
   private async pushPlus() {
-    const {
+    const { pushPlusToken, pushPlusUser } = this.params;
-      pushPlusToken,
-      pushPlusUser,
-      pushplusWebhook,
-      pushPlusTemplate,
-      pushplusChannel,
-      pushplusCallbackUrl,
-      pushplusTo,
-    } = this.params;
     const url = `https://www.pushplus.plus/send`;
     try {
-      let body = {
+      const res: any = await got
-        ...this.gotOption,
+        .post(url, {
-        json: {
+          ...this.gotOption,
-          token: `${pushPlusToken}`,
+          json: {
-          title: `${this.title}`,
+            token: `${pushPlusToken}`,
-          content: `${this.content.replace(/[\n\r]/g, '<br>')}`,
+            title: `${this.title}`,
-          topic: `${pushPlusUser || ''}`,
+            content: `${this.content.replace(/[\n\r]/g, '<br>')}`,
-          template: `${pushPlusTemplate || 'html'}`,
+            topic: `${pushPlusUser || ''}`,
-          channel: `${pushplusChannel || 'wechat'}`,
+          },
-          webhook: `${pushplusWebhook || ''}`,
+        })
-          callbackUrl: `${pushplusCallbackUrl || ''}`,
+        .json();
-          to: `${pushplusTo || ''}`,
-        },
-      };
-
-      const res = await httpClient.post(url, body);
-
-      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 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 = await httpClient.post(url, {
-        ...this.gotOption,
-        json: {
-          token: `${wePlusBotToken}`,
-          title: `${this.title}`,
-          template: `${template}`,
-          content: `${content}`,
-          receiver: `${wePlusBotReceiver || ''}`,
-          version: `${wePlusBotVersion || 'pro'}`,
-        },
-      });
 
       if (res.code === 200) {
         return true;
@@ -557,15 +515,17 @@ export default class NotificationService {
     }
 
     try {
-      const res = await httpClient.post(larkKey, {
+      const res: any = await got
-        ...this.gotOption,
+        .post(larkKey, {
-        json: {
+          ...this.gotOption,
-          msg_type: 'text',
+          json: {
-          content: { text: `${this.title}\n\n${this.content}` },
+            msg_type: 'text',
-        },
+            content: { text: `${this.title}\n\n${this.content}` },
-        headers: { 'Content-Type': 'application/json' },
+          },
-      });
+          headers: { 'Content-Type': 'application/json' },
-      if (res.StatusCode === 0 || res.code === 0) {
+        })
+        .json();
+      if (res.StatusCode === 0) {
         return true;
       } else {
         throw new Error(JSON.stringify(res));
@@ -576,7 +536,7 @@ export default class NotificationService {
   }
 
   private async email() {
-    const { emailPass, emailService, emailUser, emailTo } = this.params;
+    const { emailPass, emailService, emailUser } = this.params;
 
     try {
       const transporter = nodemailer.createTransport({
@@ -589,7 +549,7 @@ export default class NotificationService {
 
       const info = await transporter.sendMail({
         from: `"青龙快讯" <${emailUser}>`,
-        to: emailTo ? emailTo.split(';') : emailUser,
+        to: `${emailUser}`,
         subject: `${this.title}`,
         html: `${this.content.replace(/\n/g, '<br/>')}`,
       });
@@ -607,124 +567,23 @@ export default class NotificationService {
   }
 
   private async pushMe() {
-    const { pushMeKey, pushMeUrl } = this.params;
+    const { pushMeKey } = this.params;
     try {
-      const res = await httpClient.post<'text'>(
+      const res: any = await got.post(
-        pushMeUrl || 'https://push.i-i.me/',
+        `https://push.i-i.me/?push_key=${pushMeKey}`,
         {
           ...this.gotOption,
           json: {
-            push_key: pushMeKey,
             title: this.title,
             content: this.content,
           },
           headers: { 'Content-Type': 'application/json' },
         },
       );
-      if (res === 'success') {
+      if (res.body === 'success') {
         return true;
       } else {
-        throw new Error(res);
+        throw new Error(res.body);
-      }
-    } catch (error: any) {
-      throw new Error(error.response ? error.response.body : error);
-    }
-  }
-
-  private async ntfy() {
-    const {
-      ntfyUrl,
-      ntfyTopic,
-      ntfyPriority,
-      ntfyToken,
-      ntfyUsername,
-      ntfyPassword,
-      ntfyActions,
-    } = this.params;
-    // 编码函数
-    const encodeRfc2047 = (text: string, charset: string = 'UTF-8'): string => {
-      const encodedText = Buffer.from(text).toString('base64');
-      return `=?${charset}?B?${encodedText}?=`;
-    };
-    try {
-      const headers: Record<string, string> = {
-        Title: encodeRfc2047(this.title),
-        Priority: `${ntfyPriority || '3'}`,
-        Icon: 'https://qn.whyour.cn/logo.png',
-      };
-      if (ntfyToken) {
-        headers['Authorization'] = `Bearer ${ntfyToken}`;
-      } else if (ntfyUsername && ntfyPassword) {
-        headers['Authorization'] = `Basic ${Buffer.from(
-          `${ntfyUsername}:${ntfyPassword}`,
-        ).toString('base64')}`;
-      }
-      if (ntfyActions) {
-        headers['Actions'] = encodeRfc2047(ntfyActions);
-      }
-      const res = await httpClient.request(
-        `${ntfyUrl || 'https://ntfy.sh'}/${ntfyTopic}`,
-        {
-          ...this.gotOption,
-          body: `${this.content}`,
-          headers: headers,
-          method: 'POST',
-        },
-      );
-      if (res.statusCode === 200) {
-        return true;
-      } else {
-        throw new Error(await res.body.text());
-      }
-    } catch (error: any) {
-      throw new Error(error.response ? error.response.body : error);
-    }
-  }
-
-  private async wxPusherBot() {
-    const { wxPusherBotAppToken, wxPusherBotTopicIds, wxPusherBotUids } =
-      this.params;
-    // 处理 topicIds，将分号分隔的字符串转为数组
-    const topicIds = wxPusherBotTopicIds
-      ? wxPusherBotTopicIds
-          .split(';')
-          .map((id) => id.trim())
-          .filter((id) => id)
-          .map((id) => parseInt(id))
-      : [];
-
-    // 处理 uids，将分号分隔的字符串转为数组
-    const uids = wxPusherBotUids
-      ? wxPusherBotUids
-          .split(';')
-          .map((uid) => uid.trim())
-          .filter((uid) => uid)
-      : [];
-
-    // topic_ids 和 uids 至少要有一个
-    if (!topicIds.length && !uids.length) {
-      throw new Error('wxPusher 服务的 TopicIds 和 Uids 至少配置一个才行');
-    }
-
-    const url = `https://wxpusher.zjiecode.com/api/send/message`;
-    try {
-      const res = await httpClient.post(url, {
-        ...this.gotOption,
-        json: {
-          appToken: wxPusherBotAppToken,
-          content: `<h1>${this.title}</h1><br/><div style='white-space: pre-wrap;'>${this.content}</div>`,
-          summary: this.title,
-          contentType: 2,
-          topicIds: topicIds,
-          uids: uids,
-          verifyPayType: 0,
-        },
-      });
-
-      if (res.code === 1000) {
-        return true;
-      } else {
-        throw new Error(JSON.stringify(res));
       }
     } catch (error: any) {
       throw new Error(error.response ? error.response.body : error);
@@ -770,16 +629,15 @@ export default class NotificationService {
               },
             ],
           };
-          const res = await httpClient.request(url, {
+          const res: any = await got.post(url, {
             ...this.gotOption,
             json: data,
             headers,
-            method: 'POST',
           });
           if (res.statusCode === 200) {
             return true;
           } else {
-            throw new Error(await res.body.text());
+            throw new Error(res.body);
           }
         }
       }
@@ -798,14 +656,17 @@ export default class NotificationService {
       webhookContentType,
     } = this.params;
 
-    if (!webhookUrl?.includes('$title') && !webhookBody?.includes('$title')) {
+    const { formatBody, formatUrl } = this.formatNotifyContent(
+      webhookUrl,
+      webhookBody,
+    );
+
+    if (!formatUrl && !formatBody) {
       throw new Error('Url 或者 Body 中必须包含 $title');
     }
 
     const headers = parseHeaders(webhookHeaders);
-    const body = parseBody(webhookBody, webhookContentType, (v) =>
+    const body = parseBody(formatBody, webhookContentType);
-      v?.replaceAll('$title', this.title)?.replaceAll('$content', this.content),
-    );
     const bodyParam = this.formatBody(webhookContentType, body);
     const options = {
       method: webhookMethod,
@@ -814,17 +675,12 @@ export default class NotificationService {
       allowGetBody: true,
       ...bodyParam,
     };
-
     try {
-      const formatUrl = webhookUrl
+      const res = await got(formatUrl, options);
-        ?.replaceAll('$title', encodeURIComponent(this.title))
-        ?.replaceAll('$content', encodeURIComponent(this.content));
-      const res = await httpClient.request(formatUrl, options);
-      const text = await res.body.text();
       if (String(res.statusCode).startsWith('20')) {
         return true;
       } else {
-        throw new Error(await res.body.text());
+        throw new Error(JSON.stringify(res));
       }
     } catch (error: any) {
       throw new Error(error.response ? error.response.body : error);
@@ -844,4 +700,19 @@ export default class NotificationService {
     }
     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

@@ -1,18 +1,19 @@
 import { Service, Inject } from 'typedi';
 import winston from 'winston';
 import { createRandomString } from '../config/util';
+import config from '../config';
 import { App, AppModel } from '../data/open';
 import { v4 as uuidV4 } from 'uuid';
 import sequelize, { Op } from 'sequelize';
-import { shareStore } from '../shared/store';
 
 @Service()
 export default class OpenService {
   constructor(@Inject('logger') private logger: winston.Logger) {}
 
-  public async findApps(): Promise<App[] | null> {
+  public async findTokenByValue(token: string): Promise<App | null> {
     const docs = await this.find({});
-    return docs;
+    const doc = docs.filter((x) => x.tokens?.find((y) => y.value === token));
+    return doc[0];
   }
 
   public async create(payload: App): Promise<App> {
@@ -20,14 +21,12 @@ export default class OpenService {
     tab.client_id = createRandomString(12, 12);
     tab.client_secret = createRandomString(24, 24);
     const doc = await this.insert(tab);
-    const apps = await this.find({});
-    await shareStore.updateApps(apps);
     return { ...doc, tokens: [] };
   }
 
   public async insert(payload: App): Promise<App> {
     const doc = await AppModel.create(payload, { returning: true });
-    return doc.get({ plain: true });
+    return doc.get({ plain: true }) as App;
   }
 
   public async update(payload: App): Promise<App> {
@@ -35,33 +34,26 @@ export default class OpenService {
       name: payload.name,
       scopes: payload.scopes,
       id: payload.id,
-    } as App);
+    } as any);
     return { ...newDoc, tokens: [] };
   }
 
-  private async updateDb(payload: Partial<App>): Promise<App> {
+  private async updateDb(payload: App): Promise<App> {
     await AppModel.update(payload, { where: { id: payload.id } });
-    const apps = await this.find({});
+    return await this.getDb({ id: payload.id });
-    await shareStore.updateApps(apps);
-    return apps?.find((x) => x.id === payload.id) as App;
   }
 
-  public async getDb(query: Record<string, any>): Promise<App> {
+  public async getDb(query: any): Promise<App> {
-    const doc = await AppModel.findOne({ where: query });
+    const doc: any = await AppModel.findOne({ where: query });
-    if (!doc) {
+    return doc && (doc.get({ plain: true }) as App);
-      throw new Error(`App ${JSON.stringify(query)} not found`);
-    }
-    return doc.get({ plain: true });
   }
 
   public async remove(ids: number[]) {
     await AppModel.destroy({ where: { id: ids } });
-    const apps = await this.find({});
-    await shareStore.updateApps(apps);
   }
 
   public async resetSecret(id: number): Promise<App> {
-    const tab: Partial<App> = {
+    const tab: any = {
       client_secret: createRandomString(24, 24),
       tokens: [],
       id,
@@ -79,7 +71,7 @@ export default class OpenService {
   public async list(
     searchText: string = '',
     sort: any = {},
-    query: Record<string, any> = {},
+    query: any = {},
   ): Promise<App[]> {
     let condition = { ...query };
     if (searchText) {
@@ -106,7 +98,7 @@ export default class OpenService {
     }
   }
 
-  private async find(query: Record<string, any>, sort?: any): Promise<App[]> {
+  private async find(query: any, sort?: any): Promise<App[]> {
     const docs = await AppModel.findAll({ where: { ...query } });
     return docs.map((x) => x.get({ plain: true }));
   }
@@ -140,8 +132,6 @@ export default class OpenService {
         { tokens },
         { where: { client_id, client_secret } },
       );
-      const apps = await this.find({});
-      await shareStore.updateApps(apps);
       return {
         code: 200,
         data: {
@@ -151,7 +141,7 @@ export default class OpenService {
         },
       };
     } else {
-      return { code: 400, message: 'client_id 或 client_seret 有误' };
+      return { code: 400, message: 'client_id或client_seret有误' };
     }
   }
 
@@ -159,15 +149,14 @@ export default class OpenService {
     value: string;
     expiration: number;
   }> {
-    const apps = await shareStore.getApps();
+    let systemApp = (await AppModel.findOne({
-    const systemApp = apps?.find((x) => x.name === 'system');
+      where: { name: 'system' },
+    })) as App;
     if (!systemApp) {
-      throw new Error('system app not found');
+      systemApp = await this.create({
-    }
+        name: 'system',
-    const now = Math.round(Date.now() / 1000);
+        scopes: ['crons', 'system'],
-    const currentToken = systemApp.tokens?.find((x) => x.expiration > now);
+      } as App);
-    if (currentToken) {
-      return currentToken;
     }
     const { data } = await this.authToken({
       client_id: systemApp.client_id,

back/services/schedule.ts

@@ -13,11 +13,10 @@ import taskLimit from '../shared/pLimit';
 import { spawn } from 'cross-spawn';
 
 export interface ScheduleTaskType {
-  id?: number;
+  id: number;
   command: string;
   name?: string;
   schedule?: string;
-  runOrigin: 'subscription' | 'system' | 'script';
 }
 
 export interface TaskCallbacks {
@@ -41,13 +40,9 @@ export default class ScheduleService {
 
   private intervalSchedule = new ToadScheduler();
 
-  private taskLimitMap = {
+  private maxBuffer = 200 * 1024 * 1024;
-    system: 'runWithSystemLimit' as const,
-    script: 'runWithScriptLimit' as const,
-    subscription: 'runWithSubscriptionLimit' as const,
-  };
 
-  constructor(@Inject('logger') private logger: winston.Logger) {}
+  constructor(@Inject('logger') private logger: winston.Logger) { }
 
   async runTask(
     command: string,
@@ -56,21 +51,12 @@ export default class ScheduleService {
       schedule?: string;
       name?: string;
       command?: string;
-      id: string;
-      runOrigin: 'subscription' | 'system' | 'script';
     },
     completionTime: 'start' | 'end' = 'end',
   ) {
-    const { runOrigin, ...others } = params;
+    return taskLimit.runWithCronLimit(() => {
-
-    return taskLimit[this.taskLimitMap[runOrigin]](others, () => {
       return new Promise(async (resolve, reject) => {
-        this.logger.info(
+        this.logger.info(`[panel][开始执行任务] 参数 ${JSON.stringify({ ...params, command })}`);
-          `[panel][开始执行任务] 参数: ${JSON.stringify({
-            ...others,
-            command,
-          })}`,
-        );
 
         try {
           const startTime = dayjs();
@@ -104,21 +90,13 @@ export default class ScheduleService {
           });
 
           cp.on('exit', async (code) => {
-            this.logger.info(
-              '[panel][执行任务结束] 参数: %s, 退出码: %j',
-              JSON.stringify({
-                ...others,
-                command,
-              }),
-              code,
-            );
             const endTime = dayjs();
             await callbacks.onEnd?.(
               cp,
               endTime,
               endTime.diff(startTime, 'seconds'),
             );
-            resolve({ ...others, pid: cp.pid, code });
+            resolve({ ...params, pid: cp.pid, code });
           });
         } catch (error) {
           this.logger.error(
@@ -133,13 +111,13 @@ export default class ScheduleService {
   }
 
   async createCronTask(
-    { id = 0, command, name, schedule = '', runOrigin }: ScheduleTaskType,
+    { id = 0, command, name, schedule = '' }: ScheduleTaskType,
     callbacks?: TaskCallbacks,
     runImmediately = false,
   ) {
     const _id = this.formatId(id);
     this.logger.info(
-      '[panel][创建cron任务] 任务ID: %s, cron: %s, 任务名: %s, 执行命令: %s',
+      '[panel][创建cron任务], 任务ID: %s, cron: %s, 任务名: %s, 执行命令: %s',
       _id,
       schedule,
       name,
@@ -153,8 +131,6 @@ export default class ScheduleService {
           name,
           schedule,
           command,
-          id: _id,
-          runOrigin,
         });
       }),
     );
@@ -164,15 +140,13 @@ export default class ScheduleService {
         name,
         schedule,
         command,
-        id: _id,
-        runOrigin,
       });
     }
   }
 
   async cancelCronTask({ id = 0, name }: ScheduleTaskType) {
     const _id = this.formatId(id);
-    this.logger.info('[panel][取消定时任务] 任务名: %s', name);
+    this.logger.info('[panel][取消定时任务], 任务名: %s', name);
     if (this.scheduleStacks.has(_id)) {
       this.scheduleStacks.get(_id)?.cancel();
       this.scheduleStacks.delete(_id);
@@ -180,14 +154,14 @@ export default class ScheduleService {
   }
 
   async createIntervalTask(
-    { id = 0, command, name = '', runOrigin }: ScheduleTaskType,
+    { id = 0, command, name = '' }: ScheduleTaskType,
     schedule: SimpleIntervalSchedule,
     runImmediately = true,
     callbacks?: TaskCallbacks,
   ) {
     const _id = this.formatId(id);
     this.logger.info(
-      '[panel][创建interval任务] 任务ID: %s, 任务名: %s, 执行命令: %s',
+      '[panel][创建interval任务], 任务ID: %s, 任务名: %s, 执行命令: %s',
       _id,
       name,
       command,
@@ -198,13 +172,11 @@ export default class ScheduleService {
         this.runTask(command, callbacks, {
           name,
           command,
-          id: _id,
-          runOrigin,
         });
       },
       (err) => {
         this.logger.error(
-          '[panel][执行任务失败] 命令: %s, 错误信息: %j',
+          '[执行任务失败] 命令: %s, 错误信息: %j',
           command,
           err,
         );
@@ -214,7 +186,7 @@ export default class ScheduleService {
     const job = new LongIntervalJob(
       { runImmediately: false, ...schedule },
       task,
-      { id: _id },
+      _id,
     );
 
     this.intervalSchedule.addIntervalJob(job);
@@ -223,19 +195,13 @@ export default class ScheduleService {
       this.runTask(command, callbacks, {
         name,
         command,
-        id: _id,
-        runOrigin,
       });
     }
   }
 
   async cancelIntervalTask({ id = 0, name }: ScheduleTaskType) {
     const _id = this.formatId(id);
-    this.logger.info(
+    this.logger.info('[取消interval任务], 任务ID: %s, 任务名: %s', _id, name);
-      '[panel][取消interval任务] 任务ID: %s, 任务名: %s',
-      _id,
-      name,
-    );
     this.intervalSchedule.removeById(_id);
   }
 

back/services/script.ts

@@ -7,7 +7,6 @@ import ScheduleService, { TaskCallbacks } from './schedule';
 import config from '../config';
 import { TASK_COMMAND } from '../config/const';
 import { getFileContentByName, getPid, killTask, rmPath } from '../config/util';
-import taskLimit from '../shared/pLimit';
 
 @Service()
 export default class ScriptService {
@@ -42,9 +41,9 @@ export default class ScriptService {
     const relativePath = path.relative(config.scriptPath, filePath);
     const command = `${TASK_COMMAND} ${relativePath} now`;
     const pid = await this.scheduleService.runTask(
-      `real_time=true ${command}`,
+      command,
       this.taskCallbacks(filePath),
-      { command, id: relativePath.replace(/ /g, '-'), runOrigin: 'script' },
+      { command },
       'start',
     );
 
@@ -54,7 +53,6 @@ export default class ScriptService {
   public async stopScript(filePath: string, pid: number) {
     if (!pid) {
       const relativePath = path.relative(config.scriptPath, filePath);
-      taskLimit.removeQueuedCron(relativePath.replace(/ /g, '-'));
       pid = (await getPid(`${TASK_COMMAND} ${relativePath} now`)) as number;
     }
     try {
@@ -64,19 +62,9 @@ export default class ScriptService {
     return { code: 200 };
   }
 
-  public checkFilePath(filePath: string, fileName: string) {
-    const finalPath = path.resolve(config.scriptPath, filePath, fileName);
-    return finalPath.startsWith(config.scriptPath) ? finalPath : '';
-  }
-
   public async getFile(filePath: string, fileName: string) {
-    const finalPath = this.checkFilePath(filePath, fileName);
+    const _filePath = join(config.scriptPath, filePath, fileName);
-
+    const content = await getFileContentByName(_filePath);
-    if (!finalPath) {
-      return '';
-    }
-
-    const content = await getFileContentByName(finalPath);
     return content;
   }
 }

back/services/sshKey.ts

@@ -7,7 +7,6 @@ import { Subscription } from '../data/subscription';
 import { formatUrl } from '../config/subscription';
 import config from '../config';
 import { fileExist, rmPath } from '../config/util';
-import { writeFileWithLock } from '../shared/utils';
 
 @Service()
 export default class SshKeyService {
@@ -26,13 +25,13 @@ export default class SshKeyService {
     if (_exist) {
       config = await fs.readFile(this.sshConfigFilePath, { encoding: 'utf-8' });
     } else {
-      await writeFileWithLock(this.sshConfigFilePath, '', { mode: 0o600 });
+      await fs.writeFile(this.sshConfigFilePath, '');
     }
     if (!config.includes(this.sshConfigHeader)) {
-      await writeFileWithLock(
+      await fs.writeFile(
         this.sshConfigFilePath,
         `${this.sshConfigHeader}\n\n${config}`,
-        { mode: 0o600 },
+        { encoding: 'utf-8' },
       );
     }
   }
@@ -42,13 +41,10 @@ export default class SshKeyService {
     key: string,
   ): Promise<void> {
     try {
-      await writeFileWithLock(
+      await fs.writeFile(path.join(this.sshPath, alias), `${key}${os.EOL}`, {
-        path.join(this.sshPath, alias),
+        encoding: 'utf8',
-        `${key}${os.EOL}`,
+        mode: '400',
-        {
+      });
-          mode: 0o400,
-        },
-      );
     } catch (error) {
       this.logger.error('生成私钥文件失败', error);
     }
@@ -78,12 +74,11 @@ export default class SshKeyService {
       this.sshPath,
       alias,
     )}\n    StrictHostKeyChecking no\n${proxyStr}`;
-    await writeFileWithLock(
+    await fs.writeFile(
       `${path.join(this.sshPath, `${alias}.config`)}`,
       config,
       {
         encoding: 'utf8',
-        mode: 0o600,
       },
     );
   }
@@ -107,11 +102,7 @@ export default class SshKeyService {
     await this.generateSingleSshConfig(alias, host, proxy);
   }
 
-  public async removeSSHKey(
+  public async removeSSHKey(alias: string, host: string, proxy?: string): Promise<void> {
-    alias: string,
-    host: string,
-    proxy?: string,
-  ): Promise<void> {
     await this.removePrivateKeyFile(alias);
     await this.removeSshConfig(alias);
   }

back/services/subscription.ts

@@ -3,7 +3,6 @@ import winston from 'winston';
 import config from '../config';
 import {
   Subscription,
-  SubscriptionInstance,
   SubscriptionModel,
   SubscriptionStatus,
 } from '../data/subscription';
@@ -30,7 +29,6 @@ import { LOG_END_SYMBOL } from '../config/const';
 import { formatCommand, formatUrl } from '../config/subscription';
 import { CrontabModel } from '../data/cron';
 import CrontabService from './cron';
-import taskLimit from '../shared/pLimit';
 
 @Service()
 export default class SubscriptionService {
@@ -42,12 +40,8 @@ export default class SubscriptionService {
     private crontabService: CrontabService,
   ) {}
 
-  public async list(
+  public async list(searchText?: string): Promise<Subscription[]> {
-    searchText?: string,
-    ids?: string,
-  ): Promise<SubscriptionInstance[]> {
     let query = {};
-    const subIds = JSON.parse(ids || '[]');
     if (searchText) {
       const reg = {
         [Op.or]: [
@@ -68,7 +62,7 @@ export default class SubscriptionService {
     }
     try {
       const result = await SubscriptionModel.findAll({
-        where: { ...query, ...(ids ? { id: subIds } : undefined) },
+        where: query,
         order: [
           ['is_disabled', 'ASC'],
           ['createdAt', 'DESC'],
@@ -93,16 +87,16 @@ export default class SubscriptionService {
       this.scheduleService.cancelCronTask(doc as any);
       needCreate &&
         (await this.scheduleService.createCronTask(
-          { ...doc, runOrigin: 'subscription' } as any,
+          doc as any,
           this.taskCallbacks(doc),
           runImmediately,
         ));
-    } else if (doc.interval_schedule) {
+    } else {
       this.scheduleService.cancelIntervalTask(doc as any);
-      const { type, value } = doc.interval_schedule;
+      const { type, value } = doc.interval_schedule as any;
       needCreate &&
         (await this.scheduleService.createIntervalTask(
-          { ...doc, runOrigin: 'subscription' } as any,
+          doc as any,
           { [type]: value } as SimpleIntervalSchedule,
           runImmediately,
           this.taskCallbacks(doc),
@@ -208,12 +202,12 @@ export default class SubscriptionService {
   public async create(payload: Subscription): Promise<Subscription> {
     const tab = new Subscription(payload);
     const doc = await this.insert(tab);
-    await this.handleTask(doc.get({ plain: true }));
+    await this.handleTask(doc);
     await this.setSshConfig();
     return doc;
   }
 
-  public async insert(payload: Subscription): Promise<SubscriptionInstance> {
+  public async insert(payload: Subscription): Promise<Subscription> {
     return await SubscriptionModel.create(payload, { returning: true });
   }
 
@@ -262,10 +256,10 @@ export default class SubscriptionService {
     );
   }
 
-  public async remove(ids: number[], query: { force?: boolean }) {
+  public async remove(ids: number[], query: any) {
     const docs = await SubscriptionModel.findAll({ where: { id: ids } });
     for (const doc of docs) {
-      await this.handleTask(doc.get({ plain: true }), false);
+      await this.handleTask(doc, false);
     }
     await SubscriptionModel.destroy({ where: { id: ids } });
     await this.setSshConfig();
@@ -277,9 +271,7 @@ export default class SubscriptionService {
       }
       for (const doc of docs) {
         const filePath = join(config.scriptPath, doc.alias);
-        const repoPath = join(config.repoPath, doc.alias);
         await rmPath(filePath);
-        await rmPath(repoPath);
       }
     }
   }
@@ -287,11 +279,8 @@ export default class SubscriptionService {
   public async getDb(
     query: FindOptions<Subscription>['where'],
   ): Promise<Subscription> {
-    const doc = await SubscriptionModel.findOne({ where: { ...query } });
+    const doc: any = await SubscriptionModel.findOne({ where: { ...query } });
-    if (!doc) {
+    return doc && (doc.get({ plain: true }) as Subscription);
-      throw new Error(`Subscription ${JSON.stringify(query)} not found`);
-    }
-    return doc.get({ plain: true });
   }
 
   public async run(ids: number[]) {
@@ -334,8 +323,6 @@ export default class SubscriptionService {
       name: subscription.name,
       schedule: subscription.schedule,
       command,
-      id: String(subscription.id),
-      runOrigin: 'subscription',
     });
   }
 
@@ -344,7 +331,7 @@ export default class SubscriptionService {
     const docs = await SubscriptionModel.findAll({ where: { id: ids } });
     await this.setSshConfig();
     for (const doc of docs) {
-      await this.handleTask(doc.get({ plain: true }), false);
+      await this.handleTask(doc, false);
     }
   }
 
@@ -353,7 +340,7 @@ export default class SubscriptionService {
     const docs = await SubscriptionModel.findAll({ where: { id: ids } });
     await this.setSshConfig();
     for (const doc of docs) {
-      await this.handleTask(doc.get({ plain: true }));
+      await this.handleTask(doc);
     }
   }
 
@@ -384,7 +371,7 @@ export default class SubscriptionService {
             files.map(async (x) => ({
               filename: x,
               directory: relativeDir.replace(config.logPath, ''),
-              time: (await fs.lstat(`${dir}/${x}`)).birthtimeMs,
+              time: (await fs.stat(`${dir}/${x}`)).mtime.getTime(),
             })),
           )
         ).sort((a, b) => b.time - a.time);

back/services/system.ts

@@ -1,13 +1,20 @@
-import { spawn } from 'cross-spawn';
 import { Response } from 'express';
-import fs from 'fs';
+import { Service, Inject } from 'typedi';
-import { Agent, request } from 'undici';
-import sum from 'lodash/sum';
-import path from 'path';
-import { Inject, Service } from 'typedi';
 import winston from 'winston';
 import config from '../config';
-import { NotificationModeStringMap, TASK_COMMAND } from '../config/const';
+import {
+  AuthDataType,
+  AuthInfo,
+  SystemInstance,
+  SystemModel,
+  SystemModelInfo,
+} from '../data/system';
+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,
@@ -15,28 +22,14 @@ import {
   parseVersion,
   promiseExec,
   readDirs,
-  rmPath,
-  setSystemTimezone,
 } from '../config/util';
-import {
+import { TASK_COMMAND } from '../config/const';
-  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 NotificationService from './notify';
+import tar from 'tar';
-import ScheduleService, { TaskCallbacks } from './schedule';
+import path from 'path';
-import SockService from './sock';
+import fs from 'fs';
-import os from 'os';
+import sum from 'lodash/sum';
-import dayjs from 'dayjs';
+import { DependenceModel, DependenceStatus, DependenceTypes } from '../data/dependence';
 
 @Service()
 export default class SystemService {
@@ -47,29 +40,22 @@ 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 {
+    return doc || ({} as SystemInstance);
-      ...doc,
-      info: { ...doc.info, timezone: doc.info?.timezone || 'Asia/Shanghai' },
-    };
   }
 
-  private async updateAuthDb(payload: SystemInfo): Promise<SystemInfo> {
+  private async updateAuthDb(payload: AuthInfo): Promise<SystemInstance> {
-    const { id, ...others } = payload;
+    await SystemModel.upsert({ ...payload });
-    await SystemModel.update(others, { where: { id } });
+    const doc = await this.getDb({ type: payload.type });
-    const doc = await this.getDb({ id });
     return doc;
   }
 
-  public async getDb(query: any): Promise<SystemInfo> {
+  public async getDb(query: any): Promise<SystemInstance> {
-    const doc = await SystemModel.findOne({ where: query });
+    const doc: any = await SystemModel.findOne({ where: { ...query } });
-    if (!doc) {
+    return doc && doc.get({ plain: true });
-      throw new Error(`System ${JSON.stringify(query)} not found`);
-    }
-    return doc.get({ plain: true });
   }
 
   public async updateNotificationMode(notificationInfo: NotificationInfo) {
@@ -97,22 +83,17 @@ export default class SystemService {
       info: { ...oDoc.info, ...info },
     });
     const cron = {
-      id: result.id as number,
+      id: result.id || NaN,
       name: '删除日志',
       command: `ql rmlog ${info.logRemoveFrequency}`,
-      runOrigin: 'system' as const,
     };
     if (oDoc.info?.logRemoveFrequency) {
       await this.scheduleService.cancelIntervalTask(cron);
     }
     if (info.logRemoveFrequency && info.logRemoveFrequency > 0) {
-      this.scheduleService.createIntervalTask(
+      this.scheduleService.createIntervalTask(cron, {
-        cron,
+        days: info.logRemoveFrequency,
-        {
+      });
-          days: info.logRemoveFrequency,
-        },
-        true,
-      );
     }
     return { code: 200, data: info };
   }
@@ -158,10 +139,7 @@ export default class SystemService {
     }
     let command = `cd && ${cmd}`;
     const docs = await DependenceModel.findAll({
-      where: {
+      where: { type: DependenceTypes.nodejs, status: DependenceStatus.installed },
-        type: DependenceTypes.nodejs,
-        status: DependenceStatus.installed,
-      },
     });
     if (docs.length > 0) {
       command += ` && pnpm i -g`;
@@ -188,8 +166,6 @@ export default class SystemService {
       },
       {
         command,
-        id: 'update-node-mirror',
-        runOrigin: 'system',
       },
     );
   }
@@ -220,9 +196,6 @@ export default class SystemService {
     });
     let defaultDomain = 'https://dl-cdn.alpinelinux.org';
     let targetDomain = 'https://dl-cdn.alpinelinux.org';
-    if (os.platform() !== 'linux') {
-      return;
-    }
     const content = await fs.promises.readFile('/etc/apk/repositories', {
       encoding: 'utf-8',
     });
@@ -264,8 +237,6 @@ export default class SystemService {
       },
       {
         command,
-        id: 'update-linux-mirror',
-        runOrigin: 'system',
       },
     );
   }
@@ -276,18 +247,14 @@ export default class SystemService {
 
       let lastVersionContent;
       try {
-        const { body } = await request(
+        const result = await got.get(
           `${config.lastVersionFile}?t=${Date.now()}`,
           {
-            dispatcher: new Agent({
+            timeout: 30000,
-              keepAliveTimeout: 30000,
-              keepAliveMaxTimeout: 30000,
-            }),
           },
         );
-        const text = await body.text();
+        lastVersionContent = await parseContentVersion(result.body);
-        lastVersionContent = parseContentVersion(text);
+      } catch (error) {}
-      } catch (error) { }
 
       if (!lastVersionContent) {
         lastVersionContent = currentVersionContent;
@@ -359,41 +326,36 @@ export default class SystemService {
     return { code: 200 };
   }
 
-  public async reloadSystem(target?: 'system' | 'data') {
+  public async reloadSystem(target: 'system' | 'data') {
     const cmd = `real_time=true ql reload ${target || ''}`;
-    const cp = spawn(cmd, {
+    const cp = spawn(cmd, { shell: '/bin/bash' });
-      shell: '/bin/bash',
+
-      detached: true,
+    cp.stdout.on('data', (data) => {
-      stdio: 'ignore',
+      this.sockService.sendMessage({
+        type: 'reloadSystem',
+        message: data.toString(),
+      });
     });
-    cp.unref();
+
-    setTimeout(() => {
+    cp.stderr.on('data', (data) => {
-      process.exit(0);
+      this.sockService.sendMessage({
+        type: 'reloadSystem',
+        message: data.toString(),
+      });
     });
+
+    cp.on('error', (err) => {
+      this.sockService.sendMessage({
+        type: 'reloadSystem',
+        message: JSON.stringify(err),
+      });
+    });
+
     return { code: 200 };
   }
 
-  public async notify({
+  public async notify({ title, content }: { title: string; content: string }) {
-    title,
+    const isSuccess = await this.notificationService.notify(title, content);
-    content,
-    notificationInfo,
-  }: {
-    title: string;
-    content: string;
-    notificationInfo?: NotificationInfo;
-  }) {
-    const typeString =
-      typeof notificationInfo?.type === 'number'
-        ? NotificationModeStringMap[notificationInfo.type]
-        : undefined;
-    if (notificationInfo && typeString) {
-      notificationInfo.type = typeString;
-    }
-    const isSuccess = await this.notificationService.notify(
-      title,
-      content,
-      notificationInfo,
-    );
     if (isSuccess) {
       return { code: 200, message: '通知发送成功' };
     } else {
@@ -401,16 +363,20 @@ export default class SystemService {
     }
   }
 
-  public async run({ command, logPath }: { command: string; logPath?: string }, callback: TaskCallbacks) {
+  public async run(
+    { command, logPath }: { command: string; logPath: string },
+    callback: TaskCallbacks,
+  ) {
     if (!command.startsWith(TASK_COMMAND)) {
       command = `${TASK_COMMAND} ${command}`;
     }
-    const logPathPrefix = logPath ? `real_log_path=${logPath}` : ''
+    this.scheduleService.runTask(
-    this.scheduleService.runTask(`${logPathPrefix} real_time=true ${command}`, callback, {
+      `real_log_path=${logPath} real_time=true ${command}`,
-      command,
+      callback,
-      id: command.replace(/ /g, '-'),
+      {
-      runOrigin: 'system',
+        command,
-    });
+      },
+    );
   }
 
   public async stop({ command, pid }: { command: string; pid: number }) {
@@ -435,16 +401,11 @@ export default class SystemService {
     }
   }
 
-  public async exportData(res: Response, type?: string[]) {
+  public async exportData(res: Response) {
     try {
-      let dataDirs = ['db', 'upload'];
+      await tar.create(
-      if (type && type.length) {
+        { gzip: true, file: config.dataTgzFile, cwd: config.rootPath },
-        dataDirs = dataDirs.concat(type.filter((x) => x !== 'base'));
+        ['data'],
-      }
-      const dataPaths = dataDirs.map((dir) => `data/${dir}`);
-      await promiseExec(
-        `cd ${config.dataPath} && cd ../ && tar -zcvf ${config.dataTgzFile
-        } ${dataPaths.join(' ')}`,
       );
       res.download(config.dataTgzFile);
     } catch (error: any) {
@@ -455,34 +416,16 @@ export default class SystemService {
   public async importData() {
     try {
       await promiseExec(`rm -rf ${path.join(config.tmpPath, 'data')}`);
-      const res = await promiseExec(
+      await tar.x({ file: config.dataTgzFile, cwd: config.tmpPath });
-        `cd ${config.tmpPath} && tar -zxvf ${config.dataTgzFile}`,
+      return { code: 200 };
-      );
-      return { code: 200, data: res };
     } catch (error: any) {
       return { code: 400, message: error.message };
     }
   }
 
-  public async getSystemLog(
+  public async getSystemLog(res: Response) {
-    res: Response,
-    query: {
-      startTime?: string;
-      endTime?: string;
-    },
-  ) {
-    const startTime = dayjs(query.startTime || undefined)
-      .startOf('d')
-      .valueOf();
-    const endTime = dayjs(query.endTime || undefined)
-      .endOf('d')
-      .valueOf();
     const result = await readDirs(config.systemLogPath, config.systemLogPath);
-    const logs = result
+    const logs = result.reverse().filter((x) => x.title.endsWith('.log'));
-      .reverse()
-      .filter((x) => x.title.endsWith('.log'))
-      .filter((x) => x.createTime >= startTime && x.createTime <= endTime);
-
     res.set({
       'Content-Length': sum(logs.map((x) => x.size)),
     });
@@ -504,40 +447,4 @@ export default class SystemService {
       }
     })(res, logs);
   }
-
-  public async deleteSystemLog() {
-    const result = await readDirs(config.systemLogPath, config.systemLogPath);
-    const logs = result.reverse().filter((x) => x.title.endsWith('.log'));
-    for (const log of logs) {
-      await rmPath(path.join(config.systemLogPath, log.title));
-    }
-  }
-
-  public async updateTimezone(info: SystemModelInfo) {
-    if (!info.timezone) {
-      info.timezone = 'Asia/Shanghai';
-    }
-    const oDoc = await this.getSystemConfig();
-    await this.updateAuthDb({
-      ...oDoc,
-      info: { ...oDoc.info, ...info },
-    });
-    const success = await setSystemTimezone(info.timezone);
-    if (success) {
-      return { code: 200, data: info };
-    } else {
-      return { code: 400, message: '设置时区失败' };
-    }
-  }
-
-  public async cleanDependence(type: 'node' | 'python3') {
-    if (!type || !['node', 'python3'].includes(type)) {
-      return { code: 400, message: '参数错误' };
-    }
-    try {
-      const finalPath = path.join(config.dependenceCachePath, type);
-      await fs.promises.rm(finalPath, { recursive: true });
-    } catch (error) { }
-    return { code: 200 };
-  }
 }

back/services/user.ts

@@ -1,16 +1,22 @@
 import { Service, Inject } from 'typedi';
 import winston from 'winston';
-import { createRandomString } from '../config/util';
+import {
+  createRandomString,
+  fileExist,
+  getNetIp,
+  getPlatform,
+  safeJSONParse,
+} from '../config/util';
 import config from '../config';
+import * as fs from 'fs/promises';
 import jwt from 'jsonwebtoken';
 import { authenticator } from '@otplib/preset-default';
 import {
   AuthDataType,
-  SystemInfo,
+  AuthInfo,
   SystemModel,
   SystemModelInfo,
   LoginStatus,
-  AuthInfo,
 } from '../data/system';
 import { NotificationInfo } from '../data/notify';
 import NotificationService from './notify';
@@ -21,9 +27,6 @@ import dayjs from 'dayjs';
 import IP2Region from 'ip2region';
 import requestIp from 'request-ip';
 import uniq from 'lodash/uniq';
-import pickBy from 'lodash/pickBy';
-import isNil from 'lodash/isNil';
-import { shareStore } from '../shared/store';
 
 @Service()
 export default class UserService {
@@ -44,145 +47,159 @@ export default class UserService {
     req: Request,
     needTwoFactor = true,
   ): Promise<any> {
+    const _exist = await fileExist(config.authConfigFile);
+    if (!_exist) {
+      return this.initAuthInfo();
+    }
+
     let { username, password } = payloads;
     const content = await this.getAuthInfo();
     const timestamp = Date.now();
-    let {
+    if (content) {
-      username: cUsername,
+      let {
-      password: cPassword,
+        username: cUsername,
-      retries = 0,
+        password: cPassword,
-      lastlogon,
+        retries = 0,
-      lastip,
+        lastlogon,
-      lastaddr,
+        lastip,
-      twoFactorActivated,
+        lastaddr,
-      tokens = {},
+        twoFactorActivated,
-      platform,
+        twoFactorActived,
-    } = content;
+        tokens = {},
-    const retriesTime = Math.pow(3, retries) * 1000;
+        platform,
-    if (retries > 2 && timestamp - lastlogon < retriesTime) {
+      } = content;
-      const waitTime = Math.ceil(
+      // patch old field
-        (retriesTime - (timestamp - lastlogon)) / 1000,
+      twoFactorActivated = twoFactorActivated || twoFactorActived;
-      );
-      return {
-        code: 410,
-        message: `失败次数过多，请${waitTime}秒后重试`,
-        data: waitTime,
-      };
-    }
 
-    if (
+      if (
-      username === cUsername &&
+        (cUsername === 'admin' && cPassword === 'admin') ||
-      password === cPassword &&
+        !cUsername ||
-      twoFactorActivated &&
+        !cPassword
-      needTwoFactor
+      ) {
-    ) {
+        return this.initAuthInfo();
-      await this.updateAuthInfo(content, {
+      }
-        isTwoFactorChecking: true,
-      });
-      return {
-        code: 420,
-        message: '',
-      };
-    }
 
-    const ip = requestIp.getClientIp(req) || '';
+      const retriesTime = Math.pow(3, retries) * 1000;
-    const query = new IP2Region();
+      if (retries > 2 && timestamp - lastlogon < retriesTime) {
-    const ipAddress = query.search(ip);
+        const waitTime = Math.ceil(
-    let address = '';
+          (retriesTime - (timestamp - lastlogon)) / 1000,
-    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 ? '60d' : '20d';
-      let token = jwt.sign({ data }, config.jwt.secret, {
-        expiresIn: config.jwt.expiresIn || expiration,
-        algorithm: 'HS384',
-      });
-
-      await this.updateAuthInfo(content, {
-        token,
-        tokens: {
-          ...tokens,
-          [req.platform]: token,
-        },
-        lastlogon: timestamp,
-        retries: 0,
-        lastip: ip,
-        lastaddr: address,
-        platform: req.platform,
-        isTwoFactorChecking: false,
-      });
-      this.notificationService.notify(
-        '登录通知',
-        `你于${dayjs(timestamp).format('YYYY-MM-DD HH:mm:ss')}在 ${address} ${
-          req.platform
-        }端 登录成功，ip地址 ${ip}`,
-      );
-      await this.insertDb({
-        type: AuthDataType.loginLog,
-        info: {
-          timestamp,
-          address,
-          ip,
-          platform: req.platform,
-          status: LoginStatus.success,
-        },
-      });
-      this.getLoginLog();
-      return {
-        code: 200,
-        data: {
-          token,
-          lastip,
-          lastaddr,
-          lastlogon,
-          retries,
-          platform,
-        },
-      };
-    } else {
-      await this.updateAuthInfo(content, {
-        retries: retries + 1,
-        lastlogon: timestamp,
-        lastip: ip,
-        lastaddr: address,
-        platform: req.platform,
-      });
-      this.notificationService.notify(
-        '登录通知',
-        `你于${dayjs(timestamp).format('YYYY-MM-DD HH:mm:ss')}在 ${address} ${
-          req.platform
-        }端 登录失败，ip地址 ${ip}`,
-      );
-      await this.insertDb({
-        type: AuthDataType.loginLog,
-        info: {
-          timestamp,
-          address,
-          ip,
-          platform: req.platform,
-          status: LoginStatus.fail,
-        },
-      });
-      this.getLoginLog();
-      if (retries > 2) {
-        const waitTime = Math.round(Math.pow(3, retries + 1));
         return {
           code: 410,
           message: `失败次数过多，请${waitTime}秒后重试`,
           data: waitTime,
         };
-      } else {
-        return { code: 400, message: config.authError };
       }
+
+      if (
+        username === cUsername &&
+        password === cPassword &&
+        twoFactorActivated &&
+        needTwoFactor
+      ) {
+        this.updateAuthInfo(content, {
+          isTwoFactorChecking: true,
+        });
+        return {
+          code: 420,
+          message: '',
+        };
+      }
+
+      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;
+        let token = jwt.sign({ data }, config.secret as any, {
+          expiresIn: 60 * 60 * 24 * expiration,
+          algorithm: 'HS384',
+        });
+
+        this.updateAuthInfo(content, {
+          token,
+          tokens: {
+            ...tokens,
+            [req.platform]: token,
+          },
+          lastlogon: timestamp,
+          retries: 0,
+          lastip: ip,
+          lastaddr: address,
+          platform: req.platform,
+          isTwoFactorChecking: false,
+        });
+        this.notificationService.notify(
+          '登录通知',
+          `你于${dayjs(timestamp).format('YYYY-MM-DD HH:mm:ss')}在 ${address} ${
+            req.platform
+          }端 登录成功，ip地址 ${ip}`,
+        );
+        await this.insertDb({
+          type: AuthDataType.loginLog,
+          info: {
+            timestamp,
+            address,
+            ip,
+            platform: req.platform,
+            status: LoginStatus.success,
+          },
+        });
+        return {
+          code: 200,
+          data: { token, lastip, lastaddr, lastlogon, retries, platform },
+        };
+      } else {
+        this.updateAuthInfo(content, {
+          retries: retries + 1,
+          lastlogon: timestamp,
+          lastip: ip,
+          lastaddr: address,
+          platform: req.platform,
+        });
+        this.notificationService.notify(
+          '登录通知',
+          `你于${dayjs(timestamp).format('YYYY-MM-DD HH:mm:ss')}在 ${address} ${
+            req.platform
+          }端 登录失败，ip地址 ${ip}`,
+        );
+        await this.insertDb({
+          type: AuthDataType.loginLog,
+          info: {
+            timestamp,
+            address,
+            ip,
+            platform: req.platform,
+            status: LoginStatus.fail,
+          },
+        });
+        if (retries > 2) {
+          const waitTime = Math.round(Math.pow(3, retries + 1));
+          return {
+            code: 410,
+            message: `失败次数过多，请${waitTime}秒后重试`,
+            data: waitTime,
+          };
+        } else {
+          return { code: 400, message: config.authError };
+        }
+      }
+    } else {
+      return this.initAuthInfo();
     }
   }
 
   public async logout(platform: string): Promise<any> {
     const authInfo = await this.getAuthInfo();
-    await this.updateAuthInfo(authInfo, {
+    this.updateAuthInfo(authInfo, {
       token: '',
       tokens: { ...authInfo.tokens, [platform]: '' },
     });
@@ -197,9 +214,8 @@ export default class UserService {
         (a, b) => b.info!.timestamp! - a.info!.timestamp!,
       );
       if (result.length > 100) {
-        const ids = result.slice(100).map((x) => x.id!);
         await SystemModel.destroy({
-          where: { id: ids },
+          where: { id: result[result.length - 1].id },
         });
       }
       return result.map((x) => x.info);
@@ -207,11 +223,25 @@ export default class UserService {
     return [];
   }
 
-  private async insertDb(payload: SystemInfo): Promise<SystemInfo> {
+  private async insertDb(payload: AuthInfo): Promise<AuthInfo> {
     const doc = await SystemModel.create({ ...payload }, { returning: true });
     return doc;
   }
 
+  private async initAuthInfo() {
+    await fs.writeFile(
+      config.authConfigFile,
+      JSON.stringify({
+        username: 'admin',
+        password: 'admin',
+      }),
+    );
+    return {
+      code: 100,
+      message: '未找到认证文件，重新初始化',
+    };
+  }
+
   public async updateUsernameAndPassword({
     username,
     password,
@@ -223,21 +253,35 @@ export default class UserService {
       return { code: 400, message: '密码不能设置为admin' };
     }
     const authInfo = await this.getAuthInfo();
-    await this.updateAuthInfo(authInfo, { username, password });
+    this.updateAuthInfo(authInfo, { username, password });
     return { code: 200, message: '更新成功' };
   }
 
   public async updateAvatar(avatar: string) {
     const authInfo = await this.getAuthInfo();
-    await this.updateAuthInfo(authInfo, { avatar });
+    this.updateAuthInfo(authInfo, { avatar });
     return { code: 200, data: avatar, message: '更新成功' };
   }
 
+  public async getUserInfo(): Promise<any> {
+    const authFileExist = await fileExist(config.authConfigFile);
+    if (!authFileExist) {
+      await fs.writeFile(
+        config.authConfigFile,
+        JSON.stringify({
+          username: 'admin',
+          password: 'admin',
+        }),
+      );
+    }
+    return await this.getAuthInfo();
+  }
+
   public async initTwoFactor() {
     const secret = authenticator.generateSecret();
     const authInfo = await this.getAuthInfo();
     const otpauth = authenticator.keyuri(authInfo.username, 'qinglong', secret);
-    await this.updateAuthInfo(authInfo, { twoFactorSecret: secret });
+    this.updateAuthInfo(authInfo, { twoFactorSecret: secret });
     return { secret, url: otpauth };
   }
 
@@ -248,7 +292,7 @@ export default class UserService {
       secret: authInfo.twoFactorSecret,
     });
     if (isValid) {
-      await this.updateAuthInfo(authInfo, { twoFactorActivated: true });
+      this.updateAuthInfo(authInfo, { twoFactorActivated: true });
     }
     return isValid;
   }
@@ -273,17 +317,8 @@ export default class UserService {
     if (isValid) {
       return this.login({ username, password }, req, false);
     } else {
-      const ip = requestIp.getClientIp(req) || '';
+      const { ip, address } = await getNetIp(req);
-      const query = new IP2Region();
+      this.updateAuthInfo(authInfo, {
-      const ipAddress = query.search(ip);
-      let address = '';
-      if (ipAddress) {
-        const { country, province, city, isp } = ipAddress;
-        address = uniq([country, province, city, isp])
-          .filter(Boolean)
-          .join(' ');
-      }
-      await this.updateAuthInfo(authInfo, {
         lastip: ip,
         lastaddr: address,
         platform: req.platform,
@@ -294,38 +329,33 @@ export default class UserService {
 
   public async deactiveTwoFactor() {
     const authInfo = await this.getAuthInfo();
-    await this.updateAuthInfo(authInfo, {
+    this.updateAuthInfo(authInfo, {
       twoFactorActivated: false,
+      twoFactorActived: false,
       twoFactorSecret: '',
     });
     return true;
   }
 
-  public async getAuthInfo() {
+  private async getAuthInfo() {
-    const authInfo = await shareStore.getAuthInfo();
+    const content = await fs.readFile(config.authConfigFile, 'utf8');
-    if (authInfo) {
+    return safeJSONParse(content);
-      return authInfo;
-    }
-    const doc = await this.getDb({ type: AuthDataType.authConfig });
-    return (doc.info || {}) as AuthInfo;
   }
 
-  private async updateAuthInfo(authInfo: AuthInfo, info: Partial<AuthInfo>) {
+  private async updateAuthInfo(authInfo: any, info: any) {
-    const result = { ...authInfo, ...info };
+    await fs.writeFile(
-    await shareStore.updateAuthInfo(result);
+      config.authConfigFile,
-    await this.updateAuthDb({
+      JSON.stringify({ ...authInfo, ...info }),
-      type: AuthDataType.authConfig,
+    );
-      info: result,
-    });
   }
 
   public async getNotificationMode(): Promise<NotificationInfo> {
     const doc = await this.getDb({ type: AuthDataType.notification });
-    return (doc.info || {}) as NotificationInfo;
+    return (doc && doc.info) || {};
   }
 
-  private async updateAuthDb(payload: SystemInfo): Promise<any> {
+  private async updateAuthDb(payload: AuthInfo): Promise<any> {
-    let doc = await SystemModel.findOne({ where: { type: payload.type } });
+    let doc = await SystemModel.findOne({ type: payload.type });
     if (doc) {
       const updateResult = await SystemModel.update(payload, {
         where: { id: doc.id },
@@ -338,12 +368,9 @@ export default class UserService {
     return doc;
   }
 
-  public async getDb(query: any): Promise<SystemInfo> {
+  public async getDb(query: any): Promise<any> {
-    const doc = await SystemModel.findOne({ where: { ...query } });
+    const doc: any = await SystemModel.findOne({ where: { ...query } });
-    if (!doc) {
+    return doc && (doc.get({ plain: true }) as any);
-      throw new Error(`${JSON.stringify(query)} not found`);
-    }
-    return doc.get({ plain: true });
   }
 
   public async updateNotificationMode(notificationInfo: NotificationInfo) {
@@ -363,20 +390,4 @@ export default class UserService {
       return { code: 400, message: '通知发送失败，请检查参数' };
     }
   }
-
-  public async resetAuthInfo(info: Partial<AuthInfo>) {
-    const { retries, twoFactorActivated, password, username } = info;
-    const authInfo = await this.getAuthInfo();
-    const payload = pickBy(
-      {
-        retries,
-        twoFactorActivated,
-        password,
-        username,
-      },
-      (x) => !isNil(x),
-    );
-
-    await this.updateAuthInfo(authInfo, payload);
-  }
 }

back/shared/interface.ts

@@ -1,33 +0,0 @@
-import { Dependence } from '../data/dependence';
-import { ICron } from '../protos/cron';
-
-export type Override<
-  T,
-  K extends Partial<{ [P in keyof T]: any }> | string,
-> = K extends string
-  ? Omit<T, K> & { [P in keyof T]: T[P] | unknown }
-  : Omit<T, keyof K> & K;
-
-export type TCron = Override<Partial<ICron>, { id: string }>;
-
-export interface IDependencyFn<T> {
-  (): Promise<T>;
-  dependency?: Dependence;
-}
-
-export interface ICronFn<T> {
-  (): Promise<T>;
-  cron?: TCron;
-}
-
-export interface ISchedule {
-  schedule?: string;
-  name?: string;
-  command?: string;
-  id: string;
-}
-
-export interface IScheduleFn<T> {
-  (): Promise<T>;
-  schedule?: ISchedule;
-}

back/shared/pLimit.ts

@@ -3,44 +3,18 @@ import os from 'os';
 import { AuthDataType, SystemModel } from '../data/system';
 import Logger from '../loaders/logger';
 import { Dependence } from '../data/dependence';
-import NotificationService from '../services/notify';
-import {
-  ICronFn,
-  IDependencyFn,
-  ISchedule,
-  IScheduleFn,
-  TCron,
-} from './interface';
-import config from '../config';
-import { credentials } from '@grpc/grpc-js';
-import { ApiClient } from '../protos/api';
 
+interface IDependencyFn<T> {
+  (): Promise<T>;
+  dependency?: Dependence;
+}
 class TaskLimit {
   private dependenyLimit = new PQueue({ concurrency: 1 });
   private queuedDependencyIds = new Set<number>([]);
-  private queuedCrons = new Map<string, ICronFn<any>[]>();
-  private repeatCronNotifyMap = new Map<string, number>();
   private updateLogLimit = new PQueue({ concurrency: 1 });
   private cronLimit = new PQueue({
     concurrency: Math.max(os.cpus().length, 4),
   });
-  private manualCronoLimit = new PQueue({
-    concurrency: Math.max(os.cpus().length, 4),
-  });
-  private subscriptionLimit = new PQueue({
-    concurrency: Math.max(os.cpus().length, 4),
-  });
-  private scriptLimit = new PQueue({
-    concurrency: Math.max(os.cpus().length, 4),
-  });
-  private systemLimit = new PQueue({
-    concurrency: Math.max(os.cpus().length, 4),
-  });
-  private client = new ApiClient(
-    `0.0.0.0:${config.grpcPort}`,
-    credentials.createInsecure(),
-    { 'grpc.enable_http_proxy': 0 },
-  );
 
   get cronLimitActiveCount() {
     return this.cronLimit.pending;
@@ -54,8 +28,6 @@ class TaskLimit {
     return [...this.queuedDependencyIds.values()][0];
   }
 
-  private notificationService: NotificationService = new NotificationService();
-
   constructor() {
     this.setCustomLimit();
     this.handleEvents();
@@ -96,20 +68,9 @@ class TaskLimit {
     }
   }
 
-  public removeQueuedCron(id: string) {
-    if (this.queuedCrons.has(id)) {
-      const runs = this.queuedCrons.get(id);
-      if (runs && runs.length > 0) {
-        runs.pop();
-        this.queuedCrons.set(id, runs);
-      }
-    }
-  }
-
   public async setCustomLimit(limit?: number) {
     if (limit) {
       this.cronLimit.concurrency = limit;
-      this.manualCronoLimit.concurrency = limit;
       return;
     }
     await SystemModel.sync();
@@ -118,88 +79,14 @@ class TaskLimit {
     });
     if (doc?.info?.cronConcurrency) {
       this.cronLimit.concurrency = doc.info.cronConcurrency;
-      this.manualCronoLimit.concurrency = doc.info.cronConcurrency;
     }
   }
 
   public async runWithCronLimit<T>(
-    cron: TCron,
-    fn: ICronFn<T>,
-    options?: Partial<QueueAddOptions>,
-  ): Promise<T | void> {
-    fn.cron = cron;
-    let runs = this.queuedCrons.get(cron.id);
-    const result = runs?.length ? [...runs, fn] : [fn];
-    const repeatTimes = this.repeatCronNotifyMap.get(cron.id) || 0;
-    if (result?.length > 5) {
-      if (repeatTimes < 3) {
-        this.repeatCronNotifyMap.set(cron.id, repeatTimes + 1);
-        this.client.systemNotify(
-          {
-            title: '任务重复运行',
-            content: `任务：${cron.name}，命令：${cron.command}，定时：${cron.schedule}，处于运行中的超过 5 个，请检查定时设置`,
-          },
-          (err, res) => {
-            if (err) {
-              Logger.error(
-                `[schedule][任务重复运行] 通知失败 ${JSON.stringify(err)}`,
-              );
-            }
-          },
-        );
-      }
-      Logger.warn(`[schedule][任务重复运行] 参数 ${JSON.stringify(cron)}`);
-      return;
-    }
-    this.queuedCrons.set(cron.id, result);
-    return this.cronLimit.add(fn, options);
-  }
-
-  public async manualRunWithCronLimit<T>(
     fn: () => Promise<T>,
     options?: Partial<QueueAddOptions>,
   ): Promise<T | void> {
-    return this.manualCronoLimit.add(fn, options);
+    return this.cronLimit.add(fn, options);
-  }
-
-  public async runWithSubscriptionLimit<T>(
-    schedule: TCron,
-    fn: IScheduleFn<T>,
-    options?: Partial<QueueAddOptions>,
-  ): Promise<T | void> {
-    fn.schedule = schedule;
-    return this.subscriptionLimit.add(fn, options);
-  }
-
-  public async runWithSystemLimit<T>(
-    schedule: TCron,
-    fn: IScheduleFn<T>,
-    options?: Partial<QueueAddOptions>,
-  ): Promise<T | void> {
-    fn.schedule = schedule;
-    return this.systemLimit.add(fn, options);
-  }
-
-  public async runWithScriptLimit<T>(
-    schedule: ISchedule,
-    fn: IScheduleFn<T>,
-    options?: Partial<QueueAddOptions>,
-  ): Promise<T | void> {
-    fn.schedule = schedule;
-    return this.scriptLimit.add(fn, options);
-  }
-
-  public async waitDependencyQueueDone(): Promise<void> {
-    if (this.dependenyLimit.size === 0 && this.dependenyLimit.pending === 0) {
-      return;
-    }
-    return new Promise((resolve) => {
-      const onIdle = () => {
-        this.dependenyLimit.removeListener('idle', onIdle);
-        resolve();
-      };
-      this.dependenyLimit.on('idle', onIdle);
-    });
   }
 
   public runDependeny<T>(

back/shared/runCron.ts

@@ -1,17 +1,11 @@
 import { spawn } from 'cross-spawn';
 import taskLimit from './pLimit';
 import Logger from '../loaders/logger';
-import { ICron } from '../protos/cron';
 
-export function runCron(cmd: string, cron: ICron): Promise<number | void> {
+export function runCron(cmd: string, options?: { schedule: string; extraSchedules: Array<{ schedule: string }>; name: string }): Promise<number | void> {
-  return taskLimit.runWithCronLimit(cron, () => {
+  return taskLimit.runWithCronLimit(() => {
     return new Promise(async (resolve: any) => {
-      Logger.info(
+      Logger.info(`[schedule][开始执行任务] 参数 ${JSON.stringify({ ...options, command: cmd })}`);
-        `[schedule][开始执行任务] 参数 ${JSON.stringify({
-          ...cron,
-          command: cmd,
-        })}`,
-      );
       const cp = spawn(cmd, { shell: '/bin/bash' });
 
       cp.stderr.on('data', (data) => {
@@ -30,16 +24,7 @@ export function runCron(cmd: string, cron: ICron): Promise<number | void> {
       });
 
       cp.on('exit', async (code) => {
-        taskLimit.removeQueuedCron(cron.id);
+        resolve({ ...options, command: cmd, pid: cp.pid, code });
-        Logger.info(
-          '[schedule][执行任务结束] 参数: %s, 退出码: %j',
-          JSON.stringify({
-            ...cron,
-            command: cmd,
-          }),
-          code,
-        );
-        resolve({ ...cron, command: cmd, pid: cp.pid, code });
       });
     });
   });

back/shared/store.ts

@@ -1,34 +0,0 @@
-import { AuthInfo } from '../data/system';
-import { App } from '../data/open';
-import Keyv from 'keyv';
-import KeyvSqlite from '@keyv/sqlite';
-import config from '../config';
-import path from 'path';
-
-export enum EKeyv {
-  'apps' = 'apps',
-  'authInfo' = 'authInfo',
-}
-
-export interface IKeyvStore {
-  apps: App[];
-  authInfo: AuthInfo;
-}
-
-const keyvSqlite = new KeyvSqlite(path.join(config.dbPath, 'keyv.sqlite'));
-export const keyvStore = new Keyv<IKeyvStore>({ store: keyvSqlite });
-
-export const shareStore = {
-  getAuthInfo() {
-    return keyvStore.get<IKeyvStore['authInfo']>(EKeyv.authInfo);
-  },
-  updateAuthInfo(value: IKeyvStore['authInfo']) {
-    return keyvStore.set<IKeyvStore['authInfo']>(EKeyv.authInfo, value);
-  },
-  getApps() {
-    return keyvStore.get<IKeyvStore['apps']>(EKeyv.apps);
-  },
-  updateApps(apps: App[]) {
-    return keyvStore.set<IKeyvStore['apps']>(EKeyv.apps, apps);
-  },
-};

back/shared/utils.ts

@@ -1,47 +0,0 @@
-import { lock } from 'proper-lockfile';
-import os from 'os';
-import path from 'path';
-import { writeFile, open, chmod } from 'fs/promises';
-import { fileExist } from '../config/util';
-
-function getUniqueLockPath(filePath: string) {
-  const sanitizedPath = filePath
-    .replace(/[<>:"/\\|?*]/g, '_')
-    .replace(/^_/, '');
-  return path.join(os.tmpdir(), `${sanitizedPath}.ql_lock`);
-}
-
-export async function writeFileWithLock(
-  filePath: string,
-  content: string,
-  options: Parameters<typeof writeFile>[2] = {},
-) {
-  if (typeof options === 'string') {
-    options = { encoding: options };
-  }
-  let isNewFile = false;
-  if (!(await fileExist(filePath))) {
-    // Create the file with the specified mode if provided, otherwise use default
-    const fileMode = options?.mode || 0o666;
-    const fileHandle = await open(filePath, 'w', fileMode);
-    await fileHandle.close();
-    isNewFile = true;
-  }
-  const lockfilePath = getUniqueLockPath(filePath);
-
-  const release = await lock(filePath, {
-    retries: {
-      retries: 10,
-      factor: 2,
-      minTimeout: 100,
-      maxTimeout: 3000,
-    },
-    lockfilePath,
-  });
-  await writeFile(filePath, content, { encoding: 'utf8', ...options });
-  // Only chmod if the file already existed (not just created with the correct mode)
-  if (!isNewFile && options?.mode) {
-    await chmod(filePath, options.mode);
-  }
-  await release();
-}

back/token.ts

@@ -2,10 +2,10 @@ import 'reflect-metadata';
 import OpenService from './services/open';
 import { Container } from 'typedi';
 import LoggerInstance from './loaders/logger';
+import fs from 'fs';
 import config from './config';
 import path from 'path';
 import os from 'os';
-import { writeFileWithLock } from './shared/utils';
 
 const tokenFile = path.join(config.configPath, 'token.json');
 
@@ -25,7 +25,16 @@ async function getToken() {
 }
 
 async function writeFile(data: any) {
-  await writeFileWithLock(tokenFile, `${JSON.stringify(data)}${os.EOL}`);
+  return new Promise<void>((resolve, reject) => {
+    fs.writeFile(
+      tokenFile,
+      `${JSON.stringify(data)}${os.EOL}`,
+      { encoding: 'utf8' },
+      () => {
+        resolve();
+      },
+    );
+  });
 }
 
 getToken();

back/types/express.d.ts

@@ -1,11 +0,0 @@
-/// <reference types="express" />
-
-export {};
-
-declare global {
-  namespace Express {
-    interface Request {
-      platform: 'desktop' | 'mobile';
-    }
-  }
-} 

back/update.ts

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

back/validation/schedule.ts

@@ -1,40 +0,0 @@
-import { Joi } from 'celebrate';
-import cron_parser from 'cron-parser';
-import { ScheduleType } from '../interface/schedule';
-
-const validateSchedule = (value: string, helpers: any) => {
-  if (
-    value.startsWith(ScheduleType.ONCE) ||
-    value.startsWith(ScheduleType.BOOT)
-  ) {
-    return value;
-  }
-
-  try {
-    if (cron_parser.parseExpression(value).hasNext()) {
-      return value;
-    }
-  } catch (e) {
-    return helpers.error('any.invalid');
-  }
-  return helpers.error('any.invalid');
-};
-
-export const scheduleSchema = Joi.string()
-  .required()
-  .custom(validateSchedule)
-  .messages({
-    'any.invalid': '无效的定时规则',
-    'string.empty': '定时规则不能为空',
-  });
-
-export const commonCronSchema = {
-  name: Joi.string().optional(),
-  command: Joi.string().required(),
-  schedule: scheduleSchema,
-  labels: Joi.array().optional(),
-  sub_id: Joi.number().optional().allow(null),
-  extra_schedules: Joi.array().optional().allow(null),
-  task_before: Joi.string().optional().allow('').allow(null),
-  task_after: Joi.string().optional().allow('').allow(null),
-};

cli/commands/update.ts

@@ -0,0 +1,13 @@
+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/index.ts

@@ -0,0 +1,13 @@
+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;

docker/310.Dockerfile

@@ -1,32 +1,27 @@
-FROM python:3.10-alpine3.18 AS builder
+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 ts-node \
+  && npm i -g pnpm@8.3.1 \
   && cd /tmp/build \
   && pnpm install --prod
 
-FROM python:3.10-alpine
+FROM python:3.10-alpine3.18
 
 ARG QL_MAINTAINER="whyour"
 LABEL maintainer="${QL_MAINTAINER}"
 ARG QL_URL=https://github.com/${QL_MAINTAINER}/qinglong.git
 ARG QL_BRANCH=develop
-ARG PYTHON_SHORT_VERSION=3.10
 
-ENV QL_DIR=/ql \
+ENV PNPM_HOME=/root/.local/share/pnpm \
-  QL_BRANCH=${QL_BRANCH} \
+  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 \$ "
+  PS1="\u@\h:\w \$ " \
-
+  QL_DIR=/ql \
-VOLUME /ql/data
+  QL_BRANCH=${QL_BRANCH}
-  
-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 \
@@ -39,6 +34,7 @@ RUN set -x \
   tzdata \
   perl \
   openssl \
+  nginx \
   nodejs \
   jq \
   openssh \
@@ -50,10 +46,14 @@ RUN set -x \
   && 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.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 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
@@ -67,22 +67,11 @@ RUN git clone --depth=1 -b ${QL_BRANCH} ${QL_URL} ${QL_DIR} \
   && cp -rf /static/* ${QL_DIR}/static \
   && rm -rf /static
 
-ENV PNPM_HOME=${QL_DIR}/data/dep_cache/node \
-  PYTHON_HOME=${QL_DIR}/data/dep_cache/python3 \
-  PYTHONUSERBASE=${QL_DIR}/data/dep_cache/python3
-
-ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${PNPM_HOME}:${PYTHON_HOME}/bin \
-  NODE_PATH=/usr/local/bin:/usr/local/lib/node_modules:${PNPM_HOME}/global/5/node_modules \
-  PIP_CACHE_DIR=${PYTHON_HOME}/pip \
-  PYTHONPATH=${PYTHON_HOME}:${PYTHON_HOME}/lib/python${PYTHON_SHORT_VERSION}:${PYTHON_HOME}/lib/python${PYTHON_SHORT_VERSION}/site-packages
-
-RUN pip3 install --prefix ${PYTHON_HOME} requests
-
 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:5700/api/health || exit 1
+  CMD curl -sf --noproxy '*' http://127.0.0.1:5400/api/health || exit 1
 
 ENTRYPOINT ["./docker/docker-entrypoint.sh"]

docker/Dockerfile

@@ -1,9 +1,9 @@
-FROM python:3.11-alpine3.18 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 pm2 ts-node \
+  && npm i -g pnpm@8.3.1 pm2 tsx \
   && cd /tmp/build \
   && pnpm install --prod
 
@@ -13,13 +13,15 @@ ARG QL_MAINTAINER="whyour"
 LABEL maintainer="${QL_MAINTAINER}"
 ARG QL_URL=https://github.com/${QL_MAINTAINER}/qinglong.git
 ARG QL_BRANCH=develop
-ARG PYTHON_SHORT_VERSION=3.11
 
-ENV QL_DIR=/ql \
+ENV PNPM_HOME=/root/.local/share/pnpm \
-  QL_BRANCH=${QL_BRANCH} \
+  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 \$ "
+  PS1="\u@\h:\w \$ " \
+  QL_DIR=/ql \
+  QL_BRANCH=${QL_BRANCH}
 
 VOLUME /ql/data
   
@@ -39,6 +41,7 @@ RUN set -x \
   tzdata \
   perl \
   openssl \
+  nginx \
   nodejs \
   jq \
   openssh \
@@ -50,9 +53,11 @@ RUN set -x \
   && 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.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
 
@@ -67,22 +72,11 @@ RUN git clone --depth=1 -b ${QL_BRANCH} ${QL_URL} ${QL_DIR} \
   && cp -rf /static/* ${QL_DIR}/static \
   && rm -rf /static
 
-ENV PNPM_HOME=${QL_DIR}/data/dep_cache/node \
-  PYTHON_HOME=${QL_DIR}/data/dep_cache/python3 \
-  PYTHONUSERBASE=${QL_DIR}/data/dep_cache/python3
-
-ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${PNPM_HOME}:${PYTHON_HOME}/bin \
-  NODE_PATH=/usr/local/bin:/usr/local/lib/node_modules:${PNPM_HOME}/global/5/node_modules \
-  PIP_CACHE_DIR=${PYTHON_HOME}/pip \
-  PYTHONPATH=${PYTHON_HOME}:${PYTHON_HOME}/lib/python${PYTHON_SHORT_VERSION}:${PYTHON_HOME}/lib/python${PYTHON_SHORT_VERSION}/site-packages
-
-RUN pip3 install --prefix ${PYTHON_HOME} requests
-
 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:5700/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-compose.yml

@@ -1,10 +1,15 @@
+version: '2'
 services:
   web:
-    image: whyour/qinglong:latest # 基于 Debian 的版本：whyour/qinglong:debian  
+    # alpine 基础镜像版本
+    image: whyour/qinglong:latest
+    # debian-slim 基础镜像版本
+    # image: whyour/qinglong:debian  
     volumes:
       - ./data:/ql/data
     ports:
-      - "5700:5700"
+      - "0.0.0.0:5700:5700"
     environment:
-      QlBaseUrl: '/' # 部署路径非必须，以斜杠开头和结尾，比如 /test/
+      # 部署路径非必须，以斜杠开头和结尾，比如 /test/
+      QlBaseUrl: '/'
     restart: unless-stopped

docker/docker-entrypoint.sh

@@ -1,37 +1,43 @@
 #!/bin/bash
 
 dir_shell=/ql/shell
-. $dir_shell/share.sh
 . $dir_shell/env.sh
+. $dir_shell/share.sh
+link_shell
 
-log_with_style() {
+echo -e "======================1. 检测配置文件========================\n"
-  local level="$1"
+make_dir /etc/nginx/conf.d
-  local message="$2"
+make_dir /run/nginx
-  local timestamp=$(date '+%Y-%m-%d %H:%M:%S')
+init_nginx
-
-  printf "\n[%s] [%7s]  %s\n" "${timestamp}" "${level}" "${message}"
-}
-
-log_with_style "INFO" "🚀 1. 检测配置文件..."
-import_config "$@"
 fix_config
 
 pm2 l &>/dev/null
 
-log_with_style "INFO" "⚙️  2. 启动 pm2 服务..."
+echo -e "======================2. 安装依赖========================\n"
+patch_version
+
+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_pm2
 
 if [[ $AutoStartBot == true ]]; then
-  log_with_style "INFO" "🤖 3. 启动 bot..."
+  echo -e "======================5. 启动bot========================\n"
   nohup ql bot >$dir_log/bot.log 2>&1 &
+  echo -e "bot后台启动中...\n"
 fi
 
 if [[ $EnableExtraShell == true ]]; then
-  log_with_style "INFO" "🛠️ 4. 执行自定义脚本..."
+  echo -e "====================6. 执行自定义脚本========================\n"
   nohup ql extra >$dir_log/extra.log 2>&1 &
+  echo -e "自定义脚本后台执行中...\n"
 fi
 
-log_with_style "SUCCESS" "🎉 容器启动成功!"
+echo -e "############################################################\n"
+echo -e "容器启动成功..."
+echo -e "############################################################\n"
 
 crond -f >/dev/null
 

docker/front.conf

@@ -0,0 +1,93 @@
+upstream baseApi {
+  server 0.0.0.0:5600;
+}
+
+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;
+}
+
+server {
+  IPV4_CONFIG
+  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/ {
+    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://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;
+  }
+
+  location QL_BASE_URLopen/ {
+    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://baseApi/open/;
+    proxy_buffering off;
+    proxy_redirect default;
+    proxy_connect_timeout 1800;
+    proxy_send_timeout 1800;
+    proxy_read_timeout 1800;
+  }
+
+  gzip on;
+  gzip_static on;
+  gzip_types text/plain application/json application/javascript application/x-javascript text/css application/xml text/javascript;
+  gzip_proxied any;
+  gzip_vary on;
+  gzip_comp_level 6;
+  gzip_buffers 16 8k;
+  gzip_http_version 1.0;
+  QL_ROOT_CONFIG
+
+  location QL_BASE_URL_LOCATION {
+    QL_ALIAS_CONFIG
+    index index.html index.htm;
+    try_files $uri QL_BASE_URLindex.html;
+  }
+
+  location ~ .*\.(html)$ {
+    add_header Cache-Control no-cache;
+  }
+}

docker/nginx.conf

@@ -0,0 +1,45 @@
+user root;
+worker_processes auto;
+pcre_jit on;
+error_log /var/log/nginx/error.log warn;
+include /etc/nginx/modules/*.conf;
+
+events {
+  worker_connections 1024;
+}
+
+http {
+  include /etc/nginx/mime.types;
+  default_type application/octet-stream;
+
+  server_tokens off;
+
+  client_max_body_size 4096m;
+  client_body_buffer_size 20m;
+
+  keepalive_timeout 65;
+
+  sendfile on;
+
+  tcp_nodelay on;
+
+  ssl_prefer_server_ciphers on;
+
+  ssl_session_cache shared:SSL:2m;
+
+  gzip on;
+  gzip_static on;
+  gzip_types text/plain application/json application/javascript application/x-javascript text/css application/xml text/javascript;
+  gzip_proxied any;
+  gzip_vary on;
+  gzip_comp_level 6;
+  gzip_buffers 16 8k;
+  gzip_http_version 1.0;
+
+  log_format main '$remote_addr - $remote_user [$time_local] "$request" '
+  '$status $body_bytes_sent "$http_referer" '
+  '"$http_user_agent" "$http_x_forwarded_for"';
+
+  access_log /var/log/nginx/access.log main;
+  include /etc/nginx/conf.d/*.conf;
+}

ecosystem.config.js

@@ -1,14 +1,23 @@
 module.exports = {
   apps: [
     {
-      name: 'qinglong',
+      name: 'update',
-      max_restarts: 5,
+      max_restarts: 10,
-      kill_timeout: 1000,
+      kill_timeout: 15000,
       wait_ready: true,
-      listen_timeout: 5000,
+      listen_timeout: 10000,
+      time: true,
+      script: 'static/build/update.js',
+    },
+    {
+      name: 'schedule',
+      max_restarts: 10,
+      kill_timeout: 15000,
+      wait_ready: true,
+      listen_timeout: 10000,
       source_map_support: true,
       time: true,
-      script: 'static/build/app.js',
+      script: 'static/build/schedule/index.js',
       env: {
         http_proxy: '',
         https_proxy: '',
@@ -18,5 +27,25 @@ module.exports = {
         ALL_PROXY: '',
       },
     },
+    {
+      name: 'public',
+      max_restarts: 10,
+      kill_timeout: 15000,
+      wait_ready: true,
+      listen_timeout: 10000,
+      source_map_support: true,
+      time: true,
+      script: 'static/build/public.js',
+    },
+    {
+      name: 'panel',
+      max_restarts: 10,
+      kill_timeout: 15000,
+      wait_ready: true,
+      listen_timeout: 10000,
+      source_map_support: true,
+      time: true,
+      script: 'static/build/app.js',
+    },
   ],
 };

nodemon.json

@@ -1,15 +1,5 @@
 {
-  "watch": [
+  "watch": ["back", ".env"],
-    "back",
-    ".env"
-  ],
   "ext": "js,ts,json",
-  "env": {
+  "exec": "ts-node -P tsconfig.back.json ./back/app.ts"
-    "NODE_ENV": "development",
+}
-    "TS_NODE_PROJECT": "./back/tsconfig.json"
-  },
-  "verbose": true,
-  "execMap": {
-    "ts": "node --require ts-node/register"
-  }
-}

package.json

@@ -2,12 +2,18 @@
   "private": true,
   "scripts": {
     "start": "concurrently -n w: npm:start:*",
-    "start:back": "nodemon ./back/app.ts",
     "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",
-    "build:back": "tsc -p back/tsconfig.json",
+    "build:back": "tsc -p tsconfig.back.json",
     "panel": "npm run build:back && node static/build/app.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,snakeToCamel=false",
+    "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",
@@ -48,66 +54,61 @@
         "react-dom": "18",
         "dva-core": "2"
       }
-    },
-    "overrides": {
-      "sqlite3": "git+https://github.com/whyour/node-sqlite3.git#v1.0.3"
     }
   },
   "dependencies": {
-    "@grpc/grpc-js": "^1.14.0",
+    "@grpc/grpc-js": "^1.8.13",
-    "@grpc/proto-loader": "^0.8.0",
     "@otplib/preset-default": "^12.0.1",
-    "body-parser": "^1.20.3",
+    "@sentry/node": "^7.12.1",
-    "celebrate": "^15.0.3",
+    "body-parser": "^1.19.2",
-    "chokidar": "^4.0.1",
+    "celebrate": "^15.0.1",
+    "chokidar": "^3.5.3",
     "cors": "^2.8.5",
-    "cron-parser": "^4.9.0",
+    "cron-parser": "^4.2.1",
-    "cross-spawn": "^7.0.6",
+    "cross-spawn": "^7.0.3",
-    "dayjs": "^1.11.13",
+    "dayjs": "^1.11.2",
-    "dotenv": "^16.4.6",
+    "dotenv": "^16.0.0",
-    "express": "^4.21.2",
+    "express": "^4.17.3",
-    "express-jwt": "^8.4.1",
+    "express-jwt": "^6.1.1",
-    "express-rate-limit": "^7.4.1",
+    "express-rate-limit": "^7.0.0",
-    "express-urlrewrite": "^2.0.3",
+    "express-urlrewrite": "^1.4.0",
-    "undici": "^7.9.0",
+    "form-data": "^4.0.0",
+    "got": "^11.8.2",
     "hpagent": "^1.2.0",
-    "http-proxy-middleware": "^3.0.3",
+    "http-proxy-middleware": "^2.0.6",
     "iconv-lite": "^0.6.3",
     "js-yaml": "^4.1.0",
-    "jsonwebtoken": "^9.0.2",
+    "jsonwebtoken": "^8.5.1",
     "lodash": "^4.17.21",
     "multer": "1.4.5-lts.1",
+    "nedb": "^1.8.0",
     "node-schedule": "^2.1.0",
-    "nodemailer": "^6.9.16",
+    "nodemailer": "^6.7.2",
     "p-queue-cjs": "7.3.4",
-    "@bufbuild/protobuf": "^2.10.0",
+    "protobufjs": "^7.2.3",
-    "ps-tree": "^1.2.0",
+    "pstree.remy": "^1.1.8",
-    "reflect-metadata": "^0.2.2",
+    "reflect-metadata": "^0.1.13",
-    "sequelize": "^6.37.5",
+    "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",
-    "toad-scheduler": "^3.0.1",
+    "tar": "^6.1.15",
+    "toad-scheduler": "^1.6.0",
     "typedi": "^0.10.0",
-    "uuid": "^11.0.3",
+    "uuid": "^8.3.2",
-    "winston": "^3.17.0",
+    "winston": "^3.6.0",
-    "winston-daily-rotate-file": "^5.0.0",
+    "winston-daily-rotate-file": "^4.7.1",
+    "yargs": "^17.3.1",
+    "tough-cookie": "^4.0.0",
     "request-ip": "3.3.0",
-    "ip2region": "2.3.0",
+    "ip2region": "2.3.0"
-    "keyv": "^5.2.3",
-    "@keyv/sqlite": "^4.0.1",
-    "proper-lockfile": "^4.1.2",
-    "compression": "^1.7.4",
-    "helmet": "^8.1.0"
   },
   "devDependencies": {
-    "moment": "2.30.1",
+    "@ant-design/icons": "^4.7.0",
-    "@ant-design/icons": "^5.0.1",
     "@ant-design/pro-layout": "6.38.22",
-    "@codemirror/view": "^6.34.1",
-    "@codemirror/state": "^6.4.1",
     "@monaco-editor/react": "4.2.1",
-    "@react-hook/resize-observer": "^2.0.2",
+    "@react-hook/resize-observer": "^1.2.6",
-    "react-router-dom": "6.26.1",
+    "@sentry/react": "^7.12.1",
     "@types/body-parser": "^1.19.2",
     "@types/cors": "^2.8.12",
     "@types/cross-spawn": "^6.0.2",
@@ -118,6 +119,7 @@
     "@types/jsonwebtoken": "^8.5.8",
     "@types/lodash": "^4.14.185",
     "@types/multer": "^1.4.7",
+    "@types/nedb": "^1.8.12",
     "@types/node": "^17.0.21",
     "@types/node-schedule": "^1.3.2",
     "@types/nodemailer": "^6.4.4",
@@ -128,22 +130,21 @@
     "@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",
-    "@types/proper-lockfile": "^4.1.4",
-    "@types/ps-tree": "^1.1.6",
     "@uiw/codemirror-extensions-langs": "^4.21.9",
     "@uiw/react-codemirror": "^4.21.9",
-    "@umijs/max": "^4.4.4",
+    "@umijs/max": "^4.0.72",
     "@umijs/ssr-darkreader": "^4.9.45",
     "ahooks": "^3.7.8",
     "ansi-to-react": "^6.1.6",
-    "antd": "^4.24.16",
+    "antd": "^4.24.8",
-    "antd-img-crop": "^4.23.0",
+    "antd-img-crop": "^4.2.3",
     "axios": "^1.4.0",
     "compression-webpack-plugin": "9.2.0",
     "concurrently": "^7.0.0",
-    "react-hotkeys-hook": "^4.6.1",
+    "react-hotkeys-hook": "^4.4.1",
     "file-saver": "2.0.2",
     "lint-staged": "^13.0.3",
     "monaco-editor": "0.33.0",
@@ -154,23 +155,24 @@
     "qrcode.react": "^1.0.1",
     "query-string": "^7.1.1",
     "rc-tween-one": "^3.0.6",
-    "rc-virtual-list": "3.15.0",
+    "rc-virtual-list": "3.5.3",
-    "react": "18.3.1",
+    "react": "18.2.0",
     "react-copy-to-clipboard": "^5.1.0",
     "react-diff-viewer": "^3.1.1",
-    "react-dnd": "^16.0.1",
+    "react-dnd": "^14.0.2",
-    "react-dnd-html5-backend": "^16.0.1",
+    "react-dnd-html5-backend": "^14.0.0",
-    "react-dom": "18.3.1",
+    "react-dom": "18.2.0",
-    "react-intl-universal": "^2.12.0",
+    "react-intl-universal": "^2.6.21",
     "react-split-pane": "^0.1.92",
     "sockjs-client": "^1.6.0",
-    "ts-node": "^10.9.2",
+    "ts-node": "^10.6.0",
-    "ts-proto": "^2.6.1",
+    "ts-proto": "^1.146.0",
     "tslib": "^2.4.0",
+    "tsx": "^3.12.3",
     "typescript": "5.2.2",
     "vh-check": "^2.0.5",
     "virtualizedtableforantd4": "1.3.0",
-    "@types/compression": "^1.7.2",
+    "webpack": "^5.70.0",
-    "@types/helmet": "^4.0.0"
+    "yorkie": "^2.0.0"
   }
 }

sample/config.sample.sh

@@ -8,7 +8,7 @@ AutoAddCron="true"
 DefaultCronRule=""
 
 ## ql repo命令拉取脚本时需要拉取的文件后缀，直接写文件后缀名即可
-RepoFileExtensions="js mjs py pyc"
+RepoFileExtensions="js py"
 
 ## 代理地址，支持HTTP/SOCK5，例如 http://127.0.0.1:7890
 ProxyUrl=""
@@ -43,7 +43,7 @@ BotRepoUrl=""
 
 ## 通知环境变量
 ## 1. Server酱
-## https://sct.ftqq.com/r/13363
+## https://sct.ftqq.com
 ## 下方填写 SCHKEY 值或 SendKey 值
 export PUSH_KEY=""
 
@@ -56,12 +56,6 @@ 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
@@ -117,29 +111,8 @@ export PUSH_PLUS_TOKEN=""
 ## 下方填写您的一对多推送的 "群组编码" ，（一对多推送下面->您的群组(如无则新建)->群组编码）
 ## 1. 需订阅者扫描二维码 2、如果您是创建群组所属人，也需点击“查看二维码”扫描绑定，否则不能接受群组消息推送
 export PUSH_PLUS_USER=""
-## 发送模板，支持html,txt,json,markdown,cloudMonitor,jenkins,route,pay
-export PUSH_PLUS_TEMPLATE="html"
-## 发送渠道，支持wechat,webhook,cp,mail,sms
-export PUSH_PLUS_CHANNEL="wechat"
-## webhook编码，可在pushplus公众号上扩展配置出更多渠道
-export PUSH_PLUS_WEBHOOK=""
-## 发送结果回调地址，会把推送最终结果通知到这个地址上
-export PUSH_PLUS_CALLBACKURL=""
-## 好友令牌，微信公众号渠道填写好友令牌，企业微信渠道填写企业微信用户id
-export PUSH_PLUS_TO=""
 
-## 9. 微加机器人
+## 9. go-cqhttp
-## 官方网站：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群
@@ -148,7 +121,7 @@ export GOBOT_URL=""
 export GOBOT_TOKEN=""
 export GOBOT_QQ=""
 
-## 11. gotify
+## 10. gotify
 ## gotify_url 填写gotify地址,如https://push.example.de:8080
 ## gotify_token 填写gotify的消息应用token
 ## gotify_priority 填写推送消息优先级,默认为0
@@ -156,17 +129,17 @@ export GOTIFY_URL=""
 export GOTIFY_TOKEN=""
 export GOTIFY_PRIORITY=0
 
-## 12. PushDeer
+## 11. PushDeer
 ## deer_key 填写PushDeer的key
 export DEER_KEY=""
 
-## 13. Chat
+## 12. Chat
 ## chat_url 填写synology chat地址，http://IP:PORT/webapi/***token=
 ## chat_token 填写后面的token
 export CHAT_URL=""
 export CHAT_TOKEN=""
 
-## 14. aibotk
+## 13. aibotk
 ## 官方说明文档：http://wechat.aibotk.com/oapi/oapi?from=ql
 ## aibotk_key (必填)填写智能微秘书个人中心的apikey
 export AIBOTK_KEY=""
@@ -175,7 +148,22 @@ export AIBOTK_TYPE=""
 ## aibotk_name (必填)填写群名或用户昵称，和上面的type类型要对应
 export AIBOTK_NAME=""
 
-## 15. CHRONOCAT
+## 14. 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 登录密码，也可能为特殊口令，视具体邮件服务商说明而定
+export SMTP_PASSWORD=""
+## smtp_name 填写 SMTP 收发件人姓名，可随意填写
+export SMTP_NAME=""
+
+## 15. PushMe
+## 官方说明文档：https://push.i-i.me/
+## PUSHME_KEY (必填)填写PushMe APP上获取的push_key
+export PUSHME_KEY=""
+
+## 13. CHRONOCAT
 ## CHRONOCAT_URL 推送 http://127.0.0.1:16530
 ## CHRONOCAT_TOKEN 填写在CHRONOCAT文件生成的访问密钥
 ## CHRONOCAT_QQ 个人:user_id=个人QQ 群则填入group_id=QQ群 多个用英文;隔开同时支持个人和群 如：user_id=xxx;group_id=xxxx;group_id=xxxxx
@@ -184,79 +172,4 @@ export CHRONOCAT_URL=""
 export CHRONOCAT_QQ=""
 export CHRONOCAT_TOKEN=""
 
-## 16. SMTP
-## JavaScript 参数
-## 邮箱服务名称，比如126、163、Gmail、QQ等，支持列表 https://github.com/nodemailer/nodemailer/blob/master/lib/well-known/services.json
-export SMTP_SERVICE=""
-
-## Python 参数
-## SMTP 发送邮件服务器，形如 smtp.exmail.qq.com:465
-export SMTP_SERVER=""
-## SMTP 发送邮件服务器是否使用 SSL，填写 true 或 false
-export SMTP_SSL=""
-
-## smtp_email 填写 SMTP 收发件邮箱，通知将会由自己发给自己
-export SMTP_EMAIL=""
-## smtp_password 填写 SMTP 登录密码，也可能为特殊口令，视具体邮件服务商说明而定
-export SMTP_PASSWORD=""
-## smtp_name 填写 SMTP 收发件人姓名，可随意填写
-export SMTP_NAME=""
-
-## 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=""
-
-## 18. 飞书机器人
-## 官方文档：https://www.feishu.cn/hc/zh-CN/articles/360024984973
-## FSKEY 飞书机器人的 FSKEY
-export FSKEY=""
-
-## 19. Qmsg酱
-## 官方文档：https://qmsg.zendee.cn/docs/api/
-## qmsg 酱的 QMSG_KEY
-## qmsg 酱的 QMSG_TYPE send 为私聊，group 为群聊
-export QMSG_KEY=""
-export QMSG_TYPE=""
-
-## 20.Ntfy
-## 官方文档: https://docs.ntfy.sh
-## ntfy_url 填写ntfy地址,如https://ntfy.sh
-## ntfy_topic 填写ntfy的消息应用topic
-## ntfy_priority 填写推送消息优先级,默认为3
-## ntfy_token 填写推送token,可选
-## ntfy_username 填写推送用户名称,可选
-## ntfy_password 填写推送用户密码,可选
-## ntfy_actions 填写推送用户动作,可选
-export NTFY_URL=""
-export NTFY_TOPIC=""
-export NTFY_PRIORITY="3"
-export NTFY_TOKEN=""
-export NTFY_USERNAME=""
-export NTFY_PASSWORD=""
-export NTFY_ACTIONS=""
-
-## 21. wxPusher
-## 官方文档: https://wxpusher.zjiecode.com/docs/
-## 管理后台: https://wxpusher.zjiecode.com/admin/
-## wxPusher 的 appToken
-export WXPUSHER_APP_TOKEN=""
-## wxPusher 的 topicIds，多个用英文分号;分隔 topic_ids 与 uids 至少配置一个才行
-export WXPUSHER_TOPIC_IDS=""
-## wxPusher 的 用户ID，多个用英文分号;分隔 topic_ids 与 uids 至少配置一个才行
-export WXPUSHER_UIDS=""
-
-## 22. 自定义通知
-## 自定义通知 接收回调的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 变量名= 声明即可