修复shell发送通知

发现有带&的消息都会漏掉&后面的内容，改为JSON发送

.env.example

@@ -1,4 +1,3 @@
-UPDATE_PORT=5300
 PUBLIC_PORT=5400
 CRON_PORT=5500
 BACK_PORT=5600
@@ -8,7 +7,6 @@ LOG_LEVEL='debug'
 
 SECRET='whyour'
 
-QINIU_AK=''
-QINIU_SK=''
-QINIU_SCOPE=''
-TEMP=''
+QINIU_AK = ''
+QINIU_SK = ''
+QINIU_SCOPE = ''

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,42 +0,0 @@
-name: "\U0001F41E Bug report"
-description: Create a report to help us improve
-body:
-  - type: input
-    id: version
-    attributes:
-      label: Qinglong version
-    validations:
-      required: true
-  - type: textarea
-    id: steps-to-reproduce
-    attributes:
-      label: Steps to reproduce
-      description: |
-        What do we need to do after opening your repro in order to make the bug happen? Clear and concise reproduction instructions are important for us to be able to triage your issue in a timely manner. Note that you can use [Markdown](https://guides.github.com/features/mastering-markdown/) to format lists and code.
-      placeholder: Steps to reproduce
-    validations:
-      required: true
-  - type: textarea
-    id: expected
-    attributes:
-      label: What is expected?
-    validations:
-      required: true
-  - type: textarea
-    id: actually-happening
-    attributes:
-      label: What is actually happening?
-    validations:
-      required: true
-  - type: textarea
-    id: system-info
-    attributes:
-      label: System Info
-      description: Output of `npx envinfo --system --binaries --browsers`
-      render: shell
-      placeholder: System, Binaries, Browsers
-  - type: textarea
-    id: additional-comments
-    attributes:
-      label: Any additional comments?
-      description: e.g. some background/context of how you ran into this bug.

.github/ISSUE_TEMPLATE/config.yml

@@ -1,8 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: Telegram Chat
-    url: https://t.me/jiao_long
-    about: Ask questions and discuss with other Qinglong users in real time.
-  - name: Questions & Discussions
-    url: https://github.com/whyour/qinglong/discussions/new?category=q-a
-    about: Use GitHub discussions for message-board style questions and discussions.

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,40 +0,0 @@
-name: "\U0001F680 New feature proposal"
-description: Suggest an idea for this project
-labels: [":sparkles: feature request"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for your interest in the project and taking the time to fill out this feature report!
-  - type: textarea
-    id: feature-description
-    attributes:
-      label: Clear and concise description of the problem
-      description: "Explain your use case, context, and rationale behind this feature request. More importantly, what is the **end user experience** you are trying to build that led to the need for this feature?"
-    validations:
-      required: true
-  - type: textarea
-    id: suggested-solution
-    attributes:
-      label: Suggested solution
-      description: "In module [xy] we could provide following implementation..."
-    validations:
-      required: true
-  - type: textarea
-    id: alternative
-    attributes:
-      label: Alternative
-      description: Clear and concise description of any alternative solutions or features you've considered.
-  - type: textarea
-    id: additional-context
-    attributes:
-      label: Additional context
-      description: Any other context or screenshots about the feature request here.
-  - type: checkboxes
-    id: checkboxes
-    attributes:
-      label: Validations
-      description: Before submitting the issue, please make sure you do the following
-      options:
-        - label: Check that there isn't already an issue that request the same feature to avoid creating a duplicate.
-          required: true

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,31 +0,0 @@
-## PR Type
-What kind of change does this PR introduce?
-
-<!-- Please check the one that applies to this PR using "x". -->
-
-- [ ] Bugfix
-- [ ] Feature
-- [ ] Code style update (formatting, local variables)
-- [ ] Refactoring (no functional changes, no api changes)
-- [ ] Other... Please describe:
-
-
-## What is the current behavior?
-<!-- Please describe the current behavior that you are modifying, or link to a relevant issue. -->
-
-Issue Number: N/A
-
-
-## What is the new behavior?
-
-
-## Does this PR introduce a breaking change?
-
-- [ ] Yes
-- [ ] No
-
-
-<!-- If this PR contains a breaking change, please describe the impact and migration path for existing applications below. -->
-
-
-## Other information

.github/config.yml

@@ -1,7 +0,0 @@
-# Comment to be posted to on PRs from first time contributors in your repository
-newPRWelcomeComment: |
-  💖 Thanks for opening this pull request! 💖
-  Please be patient and we will get back to you as soon as we can.
-# Comment to be posted to on pull requests merged by a first time user
-firstPRMergeComment: >
-  Congrats on merging your first pull request! 🎉🎉🎉

.github/workflows/build_docker_image.yml

@@ -2,55 +2,33 @@ name: Build And Push Docker Image
 
 on:
   push:
-    paths-ignore:
-      - "*.md"
     branches:
-      - "master"
-      - "develop"
+      - 'master'
+      - 'develop'
+    # Sequence of patterns matched against refs/tags
     tags:
-      - "v*"
+      - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10
   schedule:
-    - cron: "00 20 * * *"
+    # 参考 https://jasonet.co/posts/scheduled-actions/
+    # note: 这里是GMT时间，北京时间减去八小时即可。如北京时间 22:30 => GMT 14:30
+    # minute hour day month dayOfWeek
+    - cron: '00 14 * * *' # GMT 14:00 => 北京时间 22:00
+    #- cron: '30 16 * * *' # GMT 16:30（前一天） => 北京时间 00:30
   workflow_dispatch:
 
 jobs:
-  to_gitlab:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      - uses: pixta-dev/repository-mirroring-action@v1
-        with:
-          target_repo_url: git@gitlab.com:whyour/qinglong.git
-          ssh_private_key: ${{ secrets.GITLAB_SSH_PK }}
-
-  to_gitee:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      - uses: pixta-dev/repository-mirroring-action@v1
-        with:
-          target_repo_url: git@gitee.com:whyour/qinglong.git
-          ssh_private_key: ${{ secrets.GITLAB_SSH_PK }}
-
   build-static:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: pnpm/action-setup@v3
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v1
         with:
-          version: "8.3.1"
-
-      - uses: actions/setup-node@v4
-        with:
-          cache: "pnpm"
+          node-version: '14'
 
       - name: build front and back
         run: |
-          pnpm install --frozen-lockfile
+          npm i -g pnpm
+          pnpm install
           pnpm build:front
           pnpm build:back
 
@@ -58,9 +36,6 @@ jobs:
         env:
           GITHUB_REPO: github.com/${{ github.repository_owner }}/qinglong-static
           GITHUB_BRANCH: ${{ github.ref_name }}
-          REPO_GITEE: git@gitee.com:whyour/qinglong-static.git
-          REPO_GITLAB: git@gitlab.com:whyour/qinglong-static.git
-          PRIVATE_KEY: ${{ secrets.GITLAB_SSH_PK }}
         run: |
           mkdir -p tmp
           cd ./tmp
@@ -71,50 +46,36 @@ jobs:
           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}
 
-          mkdir -p ~/.ssh
-          echo "${PRIVATE_KEY}" > ~/.ssh/id_rsa
-          chmod 600 ~/.ssh/id_rsa
-
-          export GIT_SSH_COMMAND="ssh -v -i ~/.ssh/id_rsa -o StrictHostKeyChecking=no -l git"
-          git remote add gitee "${REPO_GITEE}"
-          git remote add gitlab "${REPO_GITLAB}"
-          git gc
-          git push --force --quiet gitee ${GITHUB_BRANCH}:${GITHUB_BRANCH}
-          git push --force --quiet gitlab ${GITHUB_BRANCH}:${GITHUB_BRANCH}
-
   build:
     needs: build-static
 
-    # 由于 ubuntu-latest 中使用 linux6.x 内核 linux/s390x npm 无法使用
-    runs-on: ubuntu-20.04
-    # runs-on: self-hosted
+    runs-on: ubuntu-latest
 
     permissions:
       packages: write
       contents: read
 
     steps:
-      - uses: actions/checkout@v4
-      - uses: pnpm/action-setup@v3
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v1
         with:
-          version: "8.3.1"
-      - uses: actions/setup-node@v4
-        with:
-          cache: "pnpm"
+          node-version: '14'
 
-      - name: Setup timezone
-        uses: szenius/set-timezone@v2.0
+      - name: Set time zone
+        uses: szenius/set-timezone@v1.0
         with:
-          timezoneLinux: Asia/Shanghai
+          timezoneLinux: "Asia/Shanghai"
+          timezoneMacos: "Asia/Shanghai"
+          timezoneWindows: "China Standard Time"
 
       - name: Login to DockerHub
-        uses: docker/login-action@v3
+        uses: docker/login-action@v1
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Login to GHCR
-        uses: docker/login-action@v3
+        uses: docker/login-action@v1
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
@@ -122,114 +83,37 @@ jobs:
 
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@v5
+        uses: docker/metadata-action@v3
         with:
           images: |
             ${{ github.repository }}
             ghcr.io/${{ github.repository }}
           # generate Docker tags based on the following events/attributes
           #   nightly, master, pr-2, 1.2.3, 1.2, 1
-          flavor: |
-            latest=false
           tags: |
             type=schedule,pattern=nightly
             type=edge
+            type=ref,event=branch
             type=ref,event=pr
-            type=ref,event=branch,enable=${{ github.ref != format('refs/heads/{0}', 'master') }}
-            type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'master') }}
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}.{{minor}}
             type=semver,pattern={{major}}
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
+        uses: docker/setup-qemu-action@v1
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v1
 
       - name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v2
         with:
           build-args: |
             MAINTAINER=${{ github.repository_owner }}
             QL_BRANCH=${{ github.ref_name }}
-            SOURCE_COMMIT=${{ github.sha }}
-          network: host
-          platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x,linux/386
-          # platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/s390x,linux/386
-          context: .
-          file: ./docker/Dockerfile
+          platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
+          context: docker/
           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-20.04
-
-    permissions:
-      packages: write
-      contents: read
-
-    steps:
-      - uses: actions/checkout@v4
-      - uses: pnpm/action-setup@v3
-        with:
-          version: "8.3.1"
-      - uses: actions/setup-node@v4
-        with:
-          cache: "pnpm"
-
-      - name: Setup timezone
-        uses: szenius/set-timezone@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
-          platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x,linux/386
-          context: .
-          file: ./docker/310.Dockerfile
-          push: true
-          tags: whyour/qinglong:python3.10
-          cache-from: type=registry,ref=whyour/qinglong:cache-python3.10
-          cache-to: type=registry,ref=whyour/qinglong:cache-python3.10,mode=max
-
-      - name: Image digest
-        run: |
-          echo ${{ steps.docker_build_310.outputs.digest }}

.github/workflows/docker.yml

@@ -0,0 +1,31 @@
+name: PublishDockerImage
+on:
+  workflow_dispatch:
+
+jobs:
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout base
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Docker login
+        env:
+          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+        run: |
+          echo "${DOCKER_PASSWORD}" | docker login --username "${DOCKER_USERNAME}" --password-stdin
+
+      - name: Docker buildx image and push on master branch
+        env:
+          SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
+        run: |
+          docker buildx build --build-arg SSH_PRIVATE_KEY="${SSH_PRIVATE_KEY}" --output "type=image,push=true" --platform=linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x --tag whyour/qinglong:latest docker/

.gitignore

@@ -5,6 +5,7 @@
 /npm-debug.log*
 /yarn-error.log
 /yarn.lock
+/pnpm-lock.yaml
 /package-lock.json
 
 # production
@@ -22,8 +23,10 @@
 .env
 .history
 .version.ts
-/.tmp
-__pycache__
-/shell/preload/env.*
-/shell/preload/notify.*
-/shell/preload/*-notify.json
+
+/config
+/log
+/db
+/manual_log
+/scripts
+/bak

.npmrc

@@ -1 +1 @@
-strict-peer-dependencies=false
+sentrycli_cdnurl=https://cdn.npm.taobao.org/dist/sentry-cli

.prettierignore

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

.umirc.ts

@@ -1,39 +1,32 @@
-import { defineConfig } from '@umijs/max';
+import { defineConfig } from 'umi';
 const CompressionPlugin = require('compression-webpack-plugin');
 
-const baseUrl = process.env.QlBaseUrl || '/';
 export default defineConfig({
   hash: true,
-  jsMinifier: 'terser',
-  antd: {},
-  locale: {
-    antd: true,
-    title: true,
-    baseNavigator: true,
-  },
+  layout: false,
   outputPath: 'static/dist',
-  fastRefresh: true,
-  favicons: [`https://qn.whyour.cn/favicon.svg`],
-  publicPath: process.env.NODE_ENV === 'production' ? './' : '/',
+  nodeModulesTransform: {
+    type: 'none',
+  },
+  fastRefresh: {},
+  esbuild: {},
+  webpack5: {},
+  dynamicImport: {
+    loading: '@/components/pageLoading',
+  },
+  favicon: '/images/g5.ico',
   proxy: {
-    [`${baseUrl}api/update`]: {
-      target: 'http://127.0.0.1:5300/',
-      changeOrigin: true,
-      pathRewrite: { [`^${baseUrl}api/update`]: '/api' },
-    },
-    [`${baseUrl}api/public`]: {
+    '/api/public': {
       target: 'http://127.0.0.1:5400/',
       changeOrigin: true,
-      pathRewrite: { [`^${baseUrl}api/public`]: '/api' },
     },
-    [`${baseUrl}api`]: {
+    '/api': {
       target: 'http://127.0.0.1:5600/',
       changeOrigin: true,
       ws: true,
-      pathRewrite: { [`^${baseUrl}api`]: '/api' },
     },
   },
-  chainWebpack: ((config: any) => {
+  chainWebpack: (config) => {
     config.plugin('compression-webpack-plugin').use(
       new CompressionPlugin({
         algorithm: 'gzip',
@@ -42,13 +35,13 @@ export default defineConfig({
         minRatio: 0.6,
       }),
     );
-  }) as any,
-  headScripts: [`./api/env.js`],
-  copy: [
-    {
-      from: 'node_modules/monaco-editor/min/vs',
-      to: 'static/dist/monaco-editor/min/vs',
-    },
+  },
+  externals: {
+    react: 'window.React',
+    'react-dom': 'window.ReactDOM',
+  },
+  scripts: [
+    'https://gw.alipayobjects.com/os/lib/react/16.13.1/umd/react.production.min.js',
+    'https://gw.alipayobjects.com/os/lib/react-dom/16.13.1/umd/react-dom.production.min.js',
   ],
-  npmClient: 'pnpm',
 });

LICENSE

@@ -1,201 +1,22 @@
-                              Apache License
-                        Version 2.0, January 2004
-                    http://www.apache.org/licenses/
+MIT LICENSE
 
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+Copyright (c) 2021-present whyour
 
-1. Definitions.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
 
-  "License" shall mean the terms and conditions for use, reproduction,
-  and distribution as defined by Sections 1 through 9 of this document.
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
 
-  "Licensor" shall mean the copyright owner or entity authorized by
-  the copyright owner that is granting the License.
-
-  "Legal Entity" shall mean the union of the acting entity and all
-  other entities that control, are controlled by, or are under common
-  control with that entity. For the purposes of this definition,
-  "control" means (i) the power, direct or indirect, to cause the
-  direction or management of such entity, whether by contract or
-  otherwise, or (ii) ownership of fifty percent (50%) or more of the
-  outstanding shares, or (iii) beneficial ownership of such entity.
-
-  "You" (or "Your") shall mean an individual or Legal Entity
-  exercising permissions granted by this License.
-
-  "Source" form shall mean the preferred form for making modifications,
-  including but not limited to software source code, documentation
-  source, and configuration files.
-
-  "Object" form shall mean any form resulting from mechanical
-  transformation or translation of a Source form, including but
-  not limited to compiled object code, generated documentation,
-  and conversions to other media types.
-
-  "Work" shall mean the work of authorship, whether in Source or
-  Object form, made available under the License, as indicated by a
-  copyright notice that is included in or attached to the work
-  (an example is provided in the Appendix below).
-
-  "Derivative Works" shall mean any work, whether in Source or Object
-  form, that is based on (or derived from) the Work and for which the
-  editorial revisions, annotations, elaborations, or other modifications
-  represent, as a whole, an original work of authorship. For the purposes
-  of this License, Derivative Works shall not include works that remain
-  separable from, or merely link (or bind by name) to the interfaces of,
-  the Work and Derivative Works thereof.
-
-  "Contribution" shall mean any work of authorship, including
-  the original version of the Work and any modifications or additions
-  to that Work or Derivative Works thereof, that is intentionally
-  submitted to Licensor for inclusion in the Work by the copyright owner
-  or by an individual or Legal Entity authorized to submit on behalf of
-  the copyright owner. For the purposes of this definition, "submitted"
-  means any form of electronic, verbal, or written communication sent
-  to the Licensor or its representatives, including but not limited to
-  communication on electronic mailing lists, source code control systems,
-  and issue tracking systems that are managed by, or on behalf of, the
-  Licensor for the purpose of discussing and improving the Work, but
-  excluding communication that is conspicuously marked or otherwise
-  designated in writing by the copyright owner as "Not a Contribution."
-
-  "Contributor" shall mean Licensor and any individual or Legal Entity
-  on behalf of whom a Contribution has been received by Licensor and
-  subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-  this License, each Contributor hereby grants to You a perpetual,
-  worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-  copyright license to reproduce, prepare Derivative Works of,
-  publicly display, publicly perform, sublicense, and distribute the
-  Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-  this License, each Contributor hereby grants to You a perpetual,
-  worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-  (except as stated in this section) patent license to make, have made,
-  use, offer to sell, sell, import, and otherwise transfer the Work,
-  where such license applies only to those patent claims licensable
-  by such Contributor that are necessarily infringed by their
-  Contribution(s) alone or by combination of their Contribution(s)
-  with the Work to which such Contribution(s) was submitted. If You
-  institute patent litigation against any entity (including a
-  cross-claim or counterclaim in a lawsuit) alleging that the Work
-  or a Contribution incorporated within the Work constitutes direct
-  or contributory patent infringement, then any patent licenses
-  granted to You under this License for that Work shall terminate
-  as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
-  Work or Derivative Works thereof in any medium, with or without
-  modifications, and in Source or Object form, provided that You
-  meet the following conditions:
-
-  (a) You must give any other recipients of the Work or
-      Derivative Works a copy of this License; and
-
-  (b) You must cause any modified files to carry prominent notices
-      stating that You changed the files; and
-
-  (c) You must retain, in the Source form of any Derivative Works
-      that You distribute, all copyright, patent, trademark, and
-      attribution notices from the Source form of the Work,
-      excluding those notices that do not pertain to any part of
-      the Derivative Works; and
-
-  (d) If the Work includes a "NOTICE" text file as part of its
-      distribution, then any Derivative Works that You distribute must
-      include a readable copy of the attribution notices contained
-      within such NOTICE file, excluding those notices that do not
-      pertain to any part of the Derivative Works, in at least one
-      of the following places: within a NOTICE text file distributed
-      as part of the Derivative Works; within the Source form or
-      documentation, if provided along with the Derivative Works; or,
-      within a display generated by the Derivative Works, if and
-      wherever such third-party notices normally appear. The contents
-      of the NOTICE file are for informational purposes only and
-      do not modify the License. You may add Your own attribution
-      notices within Derivative Works that You distribute, alongside
-      or as an addendum to the NOTICE text from the Work, provided
-      that such additional attribution notices cannot be construed
-      as modifying the License.
-
-  You may add Your own copyright statement to Your modifications and
-  may provide additional or different license terms and conditions
-  for use, reproduction, or distribution of Your modifications, or
-  for any such Derivative Works as a whole, provided Your use,
-  reproduction, and distribution of the Work otherwise complies with
-  the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-  any Contribution intentionally submitted for inclusion in the Work
-  by You to the Licensor shall be under the terms and conditions of
-  this License, without any additional terms or conditions.
-  Notwithstanding the above, nothing herein shall supersede or modify
-  the terms of any separate license agreement you may have executed
-  with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-  names, trademarks, service marks, or product names of the Licensor,
-  except as required for reasonable and customary use in describing the
-  origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-  agreed to in writing, Licensor provides the Work (and each
-  Contributor provides its Contributions) on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-  implied, including, without limitation, any warranties or conditions
-  of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-  PARTICULAR PURPOSE. You are solely responsible for determining the
-  appropriateness of using or redistributing the Work and assume any
-  risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-  whether in tort (including negligence), contract, or otherwise,
-  unless required by applicable law (such as deliberate and grossly
-  negligent acts) or agreed to in writing, shall any Contributor be
-  liable to You for damages, including any direct, indirect, special,
-  incidental, or consequential damages of any character arising as a
-  result of this License or out of the use or inability to use the
-  Work (including but not limited to damages for loss of goodwill,
-  work stoppage, computer failure or malfunction, or any and all
-  other commercial damages or losses), even if such Contributor
-  has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-  the Work or Derivative Works thereof, You may choose to offer,
-  and charge a fee for, acceptance of support, warranty, indemnity,
-  or other liability obligations and/or rights consistent with this
-  License. However, in accepting such obligations, You may act only
-  on Your own behalf and on Your sole responsibility, not on behalf
-  of any other Contributor, and only if You agree to indemnify,
-  defend, and hold each Contributor harmless for any liability
-  incurred by, or claims asserted against, such Contributor by reason
-  of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-  To apply the Apache License to your work, attach the following
-  boilerplate notice, with the fields enclosed by brackets "{}"
-  replaced with your own identifying information. (Don't include
-  the brackets!)  The text should be enclosed in the appropriate
-  comment syntax for the file format. We also recommend that a
-  file or class name and description of purpose be included on the
-  same "printed page" as the copyright notice for easier
-  identification within third-party archives.
-
-Copyright 2021 WHYOUR <https://github.com/whyour>.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

README-en.md

@@ -1,222 +0,0 @@
-<div align="center">
-<img width="100" src="https://user-images.githubusercontent.com/22700758/191449379-f9f56204-0e31-4a16-be5a-331f52696a73.png">
-
-<h1 align="center">Qinglong</h1>
-
-[简体中文](./README.md) | English
-
-Timed task management platform supporting Python3, JavaScript, Shell, Typescript
-
-[![npm version][npm-version-image]][npm-version-url] [![docker pulls][docker-pulls-image]][docker-pulls-url] [![docker stars][docker-stars-image]][docker-stars-url] [![docker image size][docker-image-size-image]][docker-image-size-url]
-
-[npm-version-image]: https://img.shields.io/npm/v/@whyour/qinglong?style=flat
-[npm-version-url]: https://www.npmjs.com/package/@whyour/qinglong?activeTab=readme
-[docker-pulls-image]: https://img.shields.io/docker/pulls/whyour/qinglong?style=flat
-[docker-pulls-url]: https://hub.docker.com/r/whyour/qinglong
-[docker-stars-image]: https://img.shields.io/docker/stars/whyour/qinglong?style=flat
-[docker-stars-url]: https://hub.docker.com/r/whyour/qinglong
-[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.ninesix.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.ninesix.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)
-
-## Features
-
-- Support for multiple scripting languages (python3, javaScript, shell, typescript)
-- Support online management of scripts, environment variables, configuration files
-- Support online view task log
-- Support second-level task setting
-- Support system level notification
-- Support dark mode
-- Support cell phone operation
-
-## Version
-
-### docker
-
-The `latest` image is built on `alpine` and the `debian` image is built on `debian-slim`. If you need to use a dependency that is not supported by `alpine`, it is recommended that you use the `debian` image.
-
-```bash
-docker pull whyour/qinglong:latest
-docker pull whyour/qinglong:debian
-```
-
-### npm
-
-The npm version supports `debian/ubuntu/alpine` systems and requires `node/npm/python3/pip3/pnpm` to be installed.
-
-```bash
-npm i @whyour/qinglong
-```
-
-## 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
-```
-
-### BaoTa Panel one-click deployment (Recommended)
-
-1. To install Pagoda Panel, go to the official website of [BaoTa Panel](https://www.bt.cn/u/EcDAFU), select the official version of the script to download and install.
-
-2. After installation, login to Pagoda Panel, click `Docker` in the menu bar, the first time you enter, you will be prompted to install `Docker` service, click Install Now, follow the prompts to complete the installation.
-
-3. After the installation is complete, find `Qinglong Panel` in the app shop, click Install, configure the domain name and other basic information to complete the installation.
-
-### 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
-```
-
-### Npm (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/pnpm yourself
-
-```bash
-# Debian/Ubuntu
-curl -sL https://deb.nodesource.com/setup_20.x | sudo -E bash -
-```
-
-```bash
-npm install -g node-pre-gyp pnpm@8.3.1
-npm install -g @whyour/qinglong
-qinglong
-# Add the environment variables QL_DIR and QL_DATA_DIR when prompted, QL_DATA_DIR must end with /data.
-export QL_DIR=""
-export QL_DATA_DIR=""
-# Run again
-qinglong
-```
-
-## Built-in commands
-
-- task
-
-```bash
-# Execute in sequence, if a random delay is set, it will be randomly delayed by a certain number of seconds
-task <file_path>                                             
-# Execute in sequence, regardless of whether a random delay is set, all run immediately, 
-# and the foreground will output the day, while recorded in the log file
-task <file_path> now                                         
-# Concurrent execution, regardless of whether a random delay is set, are run immediately, 
-# the foreground does not generate the day, directly recorded in the log file, and can be specified account execution
-task <file_path> conc <env_name> <account_number>(Optional) 
-# Specify the account to execute and run immediately regardless of whether a random delay is set 
-task <file_path> desi <env_name> <account_number>       
-# Set task timeout   
-task -m <max_time> <file_path>
-# Use -- to split, -- followed by a parameter that is passed to the script, as in the following example, the script receives the parameter -u whyour -p password
-task <file_path> -- -u whyour -p password
-```
-
-- ql
-
-```bash
-# Update and restart Green Dragon
-ql update                                                    
-# Run custom scripts extra.sh
-ql extra                                                     
-# Adding a single script file
-ql raw <file_url>                                             
-# Add a specific script for a single repository
-ql repo <repo_url> <whitelist> <blacklist> <dependence> <branch>   
-# Delete old logs
-ql rmlog <days>                                              
-# Start bot
-ql bot                                                       
-# Detecting the Green Dragon environment and repairing it
-ql check                                                     
-# Reset the number of login errors
-ql resetlet                                                  
-# Disable two-step login
-ql resettfa                                                  
-```
-
-| **Parameter** | **Description** |
-|---|---|
-| file_url | Script address |
-| repo_url | Repository address |
-| whitelist | The whitelist when pulling the repository, i.e., the string contained in the path of the script to be pulled |
-| blacklist | Blacklisting when pulling repositories, i.e. strings that are not included in the path of the script to be pulled |
-| dependence | Pulling the dependencies needed for the repository will be copied directly from the repository to the repository directory under scripts, regardless of the blacklist |
-| extensions | Pull the branch of the repository |
-| branch | Number of days of logs to be kept |
-| days | File path for task execution |
-| file_path | The name of the environment variable that needs to be concurrent or specified at the time of task execution |
-
-## Development
-
-```bash
-git clone https://github.com/whyour/qinglong.git
-cd qinglong
-cp .env.example .env
-# Recommended use pnpm https://pnpm.io/zh/installation
-npm install -g pnpm@8.3.1
-pnpm install
-pnpm start
-```
-
-Open your browser and visit <http://127.0.0.1:5700>
-
-## Links
-
-- [nevinee](https://gitee.com/evine)
-- [crontab-ui](https://github.com/alseambusher/crontab-ui)
-- [Ant Design](https://ant.design)
-- [Ant Design Pro](https://pro.ant.design/)
-- [Umijs](https://umijs.org)
-- [darkreader](https://github.com/darkreader/darkreader)
-- [admin-server](https://github.com/sunpu007/admin-server)
-
-## Name Origin
-
-The Green Dragon, also known as the Canglong, is one of the four elephants and one of the [four spirits of the heavens](https://zh.wikipedia.org/wiki/%E5%A4%A9%E4%B9%8B%E5%9B%9B%E7%81%B5) in traditional Chinese culture. According to the Five Elements, it is a spirit animal representing the East as a green dragon, the five elements are wood, and the season represented is spring, with the eight trigrams dominating vibration. Like the Ying Long, the Cang Long has feathered wings. According to the Zhang Guo Xing Zong (Zhang Guo Xing Zong), "a true dragon is one that has complementary wings".
-
-In the Book of the Later Han Dynasty (後漢書-律曆志下), it is written: "The sun is in the sky, a cold and a summer, the four seasons are ready, all things are changed, the regency moves, and the green dragon moves to the star, which is called the year. (The Year of the Star)
-
-Among the [twenty-eight Chinese constellations](https://zh.wikipedia.org/wiki/%E4%BA%8C%E5%8D%81%E5%85%AB%E5%AE%BF), the Green Dragon is the generic name for the seven eastern constellations (Horn, Hyper, Diao, Fang, Heart, Tail and Minchi). It is known in Taoism as "Mengzhang" and in different Taoist scriptures as "Dijun", "Shengjian", "Shenjian" and He is also known in different Daoist scriptures as "Dijun", "Shengjun", "Shenjun" and "Ghost Catcher"[1], and is the guardian deity of Daoism, together with the White Tiger Supervisor of Soldiers.

README.md

@@ -1,31 +1,30 @@
-<div align="center">
-<img width="100" src="https://user-images.githubusercontent.com/22700758/191449379-f9f56204-0e31-4a16-be5a-331f52696a73.png">
+<p align="center">
+  <a href="https://github.com/whyour/qinglong">
+    <img width="150" src="https://z3.ax1x.com/2021/11/18/I7MpAe.png">
+  </a>
+</p>
 
 <h1 align="center">青龙</h1>
 
-简体中文 | [English](./README-en.md)
+<div align="center">
 
-支持 Python3、JavaScript、Shell、Typescript 的定时任务管理平台
+支持python3、javaScript、shell、typescript 的定时任务管理面板（A timed task management panel that supports typescript, javaScript, python3, and shell.）
 
-Timed task management platform supporting Python3, JavaScript, Shell, Typescript
+[![docker version][docker-version-image]][docker-version-url] [![docker pulls][docker-pulls-image]][docker-pulls-url] [![docker stars][docker-stars-image]][docker-stars-url] [![docker image size][docker-image-size-image]][docker-image-size-url]
 
-[![npm version][npm-version-image]][npm-version-url] [![docker pulls][docker-pulls-image]][docker-pulls-url] [![docker stars][docker-stars-image]][docker-stars-url] [![docker image size][docker-image-size-image]][docker-image-size-url]
-
-[npm-version-image]: https://img.shields.io/npm/v/@whyour/qinglong?style=flat
-[npm-version-url]: https://www.npmjs.com/package/@whyour/qinglong?activeTab=readme
 [docker-pulls-image]: https://img.shields.io/docker/pulls/whyour/qinglong?style=flat
 [docker-pulls-url]: https://hub.docker.com/r/whyour/qinglong
+[docker-version-image]: https://img.shields.io/docker/v/whyour/qinglong?style=flat
+[docker-version-url]: https://hub.docker.com/r/whyour/qinglong/tags?page=1&ordering=last_updated
 [docker-stars-image]: https://img.shields.io/docker/stars/whyour/qinglong?style=flat
 [docker-stars-url]: https://hub.docker.com/r/whyour/qinglong
 [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.ninesix.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.ninesix.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)
+[![](https://user-images.githubusercontent.com/22700758/161788855-c4e51cb8-d4e9-44fe-bb17-ee1a56c8549b.png)](https://whyour.cn)
+
+简体中文 | [English](./README-en.md)
 
 ## 功能
 
@@ -37,58 +36,67 @@ Timed task management platform supporting Python3, JavaScript, Shell, Typescript
 - 支持暗黑模式
 - 支持手机端操作
 
-## 版本
-
-### docker
-
-`latest` 镜像是基于 `alpine` 构建，`debian` 镜像是基于 `debian-slim` 构建。如果需要使用 `alpine` 不支持的依赖，建议使用 `debian` 镜像
-
-```bash
-docker pull whyour/qinglong:latest
-docker pull whyour/qinglong:debian
-```
-
-### npm
-
-npm 版本支持 `debian/ubuntu/alpine` 系统，需要自行安装 `node/npm/python3/pip3/pnpm`
-
-```bash
-npm i @whyour/qinglong
-```
-
 ## 部署
 
-### docker (推荐)
+### 本机部署
 
 ```bash
-# curl -sSL get.docker.com | sh
+# 待完善
+```
+
+### podman 部署
+
+1. podman 安装
+
+```bash
+https://podman.io/getting-started/installation
+```
+
+2. 启动容器
+
+```bash
+podman run -dit \
+  --network bridge \
+  -v $PWD/ql:/ql/data \
+  -p 5700:5700 \
+  --name qinglong \
+  --hostname qinglong \
+  --restart unless-stopped \
+  docker.io/whyour/qinglong:latest
+```
+
+### docker 部署
+
+1. docker 安装
+
+```bash
+sudo curl -sSL get.docker.com | sh
+```
+
+2. 启动容器
+
+```bash
 docker run -dit \
-  -v $PWD/ql/data:/ql/data \
-  # 冒号后面的 5700 为默认端口，如果设置了 QlPort, 需要跟 QlPort 保持一致
+  -v $PWD/ql:/ql/data \
   -p 5700:5700 \
-  # 部署路径非必须，比如 /test
-  -e QlBaseUrl="/" \
-  # 部署端口非必须，当使用 host 模式时，可以设置服务启动后的端口，默认 5700
-  -e QlPort="5700" \
   --name qinglong \
   --hostname qinglong \
   --restart unless-stopped \
   whyour/qinglong:latest
 ```
 
-### 宝塔面板一键部署（推荐）
+### docker-compose 部署
 
-1. 安装宝塔面板，前往 [宝塔面板](https://www.bt.cn/u/EcDAFU) 官网，选择正式版的脚本下载安装
-
-2. 安装后登录宝塔面板，在菜单栏中点击 `Docker`，首次进入会提示安装`Docker`服务，点击立即安装，按提示完成安装
-
-3. 安装完成后在应用商店中找到`青龙面板`，点击安装，配置域名等基本信息即可完成安装
-
-### docker-compose (推荐)
+1. 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 && cd $_
+sudo curl -L https://github.com/docker/compose/releases/download/1.16.1/docker-compose-`uname -s`-`uname -m` -o /usr/local/bin/docker-compose
+```
+
+2. 启动容器
+
+```bash
+mkdir qinglong
 wget https://raw.githubusercontent.com/whyour/qinglong/master/docker/docker-compose.yml
 
 # 启动
@@ -97,49 +105,30 @@ docker-compose up -d
 docker-compose down
 ```
 
-### podman (推荐)
+## 使用
+
+1. 内置命令
 
 ```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
-```
+# 更新并重启青龙
+ql update                                                    
+# 运行自定义脚本extra.sh
+ql extra                                                     
+# 添加单个脚本文件
+ql raw <file_url>                                             
+# 添加单个仓库的指定脚本
+ql repo <repo_url> <whitelist> <blacklist> <dependence> <branch>   
+# 删除旧日志
+ql rmlog <days>                                              
+# 启动tg-bot
+ql bot                                                       
+# 检测青龙环境并修复
+ql check                                                     
+# 重置登录错误次数
+ql resetlet                                                  
+# 禁用两步登录
+ql resettfa                                                  
 
-### npm (本地)
-
-建议使用纯净系统安装，避免系统原有数据丢失，需要自己安装 node/npm/python3/pip3/pnpm
-
-```bash
-# Debian/Ubuntu
-curl -sL https://deb.nodesource.com/setup_20.x | sudo -E bash -
-```
-
-```bash
-npm install -g node-pre-gyp pnpm@8.3.1
-npm install -g @whyour/qinglong
-qinglong
-# 根据提示增加环境变量 QL_DIR 和 QL_DATA_DIR，QL_DATA_DIR 必须以 /data 结尾
-export QL_DIR=""
-export QL_DATA_DIR=""
-# 再次执行
-qinglong
-```
-
-## 内置命令
-
-- task
-
-```bash
 # 依次执行，如果设置了随机延迟，将随机延迟一定秒数
 task <file_path>                                             
 # 依次执行，无论是否设置了随机延迟，均立即运行，前台会输出日，同时记录在日志文件中
@@ -147,61 +136,21 @@ 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
+task <file_path> desi <env_name> <account_number>         
 ```
 
-- ql
+2. 参数说明
 
-```bash
-# 更新并重启青龙
-ql update
-# 运行自定义脚本extra.sh
-ql extra
-# 添加单个脚本文件
-ql raw <file_url>
-# 添加单个仓库的指定脚本
-ql repo <repo_url> <whitelist> <blacklist> <dependence> <branch> <extensions>
-# 删除旧日志
-ql rmlog <days>
-# 启动tg-bot
-ql bot
-# 检测青龙环境并修复
-ql check
-# 重置登录错误次数
-ql resetlet                                                  
-# 禁用两步登录
-ql resettfa
-```
-
-| **参数**   | **说明**                                                                                    |
-|------------|---------------------------------------------------------------------------------------------|
-| file_url   | 脚本地址                                                                                    |
-| repo_url   | 仓库地址                                                                                    |
-| whitelist  | 拉取仓库时的白名单，即就是需要拉取的脚本的路径包含的字符串，多个竖线分割                    |
-| blacklist  | 拉取仓库时的黑名单，即就是需要拉取的脚本的路径不包含的字符串，多个竖线分割                  |
-| dependence | 拉取仓库需要的依赖文件，会直接从仓库拷贝到scripts下的仓库目录，不受黑名单影响，多个竖线分割 |
-| extensions | 拉取仓库的文件后缀，多个竖线分割                                                            |
-| branch     | 拉取仓库的分支                                                                              |
-| days       | 需要保留的日志的天数                                                                        |
-| file_path  | 任务执行时的文件路径                                                                        |
-
-## 开发
-
-```bash
-git clone https://github.com/whyour/qinglong.git
-cd qinglong
-cp .env.example .env
-# 推荐使用 pnpm https://pnpm.io/zh/installation
-npm install -g pnpm@8.3.1
-pnpm install
-pnpm start
-```
-
-打开你的浏览器，访问 <http://127.0.0.1:5700>
+* file_url: 脚本地址
+* repo_url: 仓库地址
+* whitelist: 拉取仓库时的白名单，即就是需要拉取的脚本的路径包含的字符串
+* blacklist: 拉取仓库时的黑名单，即就是需要拉取的脚本的路径不包含的字符串
+* dependence: 拉取仓库需要的依赖文件，会直接从仓库拷贝到scripts下的仓库目录，不受黑名单影响
+* branch: 拉取仓库的分支
+* days: 需要保留的日志的天数
+* file_path: 任务执行时的文件路径
+* env_name: 任务执行时需要并发或者指定时的环境变量名称
+* account_number: 任务执行时指定某个环境变量需要执行的账号序号
 
 ## 链接
 
@@ -209,10 +158,28 @@ pnpm start
 - [crontab-ui](https://github.com/alseambusher/crontab-ui)
 - [Ant Design](https://ant.design)
 - [Ant Design Pro](https://pro.ant.design/)
-- [Umijs](https://umijs.org)
+- [Umijs3.0](https://umijs.org)
 - [darkreader](https://github.com/darkreader/darkreader)
 - [admin-server](https://github.com/sunpu007/admin-server)
 
+## 开发
+
+```bash
+$ git clone git@github.com:whyour/qinglong.git
+$ cd qinglong
+$ cp .env.example .env
+# 推荐使用 pnpm https://pnpm.io/zh/installation
+$ npm install -g pnpm
+$ pnpm install
+$ pnpm start
+```
+
+打开你的浏览器，访问 http://127.0.0.1:5700
+
+## 交流
+
+[telegram频道](https://t.me/jiao_long)
+
 ## 名称来源
 
 青龙，又名苍龙，在中国传统文化中是四象之一、[天之四灵](https://zh.wikipedia.org/wiki/%E5%A4%A9%E4%B9%8B%E5%9B%9B%E7%81%B5)之一，根据五行学说，它是代表东方的灵兽，为青色的龙，五行属木，代表的季节是春季，八卦主震。苍龙与应龙一样，都是身具羽翼。《张果星宗》称“又有辅翼，方为真龙”。

back/api/config.ts

@@ -1,38 +1,21 @@
+import { getFileContentByName, getLastModifyFilePath } from '../config/util';
 import { Router, Request, Response, NextFunction } from 'express';
 import { Container } from 'typedi';
 import { Logger } from 'winston';
 import config from '../config';
-import * as fs from 'fs/promises';
+import * as fs from 'fs';
 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) => {
   app.use('/configs', route);
 
-  route.get(
-    '/sample',
-    async (req: Request, res: Response, next: NextFunction) => {
-      try {
-        res.send({
-          code: 200,
-          data: SAMPLE_FILES,
-        });
-      } catch (e) {
-        return next(e);
-      }
-    },
-  );
-
   route.get(
     '/files',
     async (req: Request, res: Response, next: NextFunction) => {
       const logger: Logger = Container.get('logger');
       try {
-        const fileList = await fs.readdir(config.configPath, 'utf-8');
+        const fileList = fs.readdirSync(config.configPath, 'utf-8');
         res.send({
           code: 200,
           data: fileList
@@ -42,18 +25,33 @@ export default (app: Router) => {
             }),
         });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
   );
 
   route.get(
-    '/detail',
+    '/:file',
     async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
       try {
-        const configService = Container.get(ConfigService);
-        await configService.getFile(req.query.path as string, res);
+        let content = '';
+        if (config.blackFileList.includes(req.params.file)) {
+          res.send({ code: 403, message: '文件无法访问' });
+        }
+        if (req.params.file.includes('sample')) {
+          content = getFileContentByName(
+            `${config.samplePath}${req.params.file}`,
+          );
+        } else {
+          content = getFileContentByName(
+            `${config.configPath}${req.params.file}`,
+          );
+        }
+        res.send({ code: 200, data: content });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -74,25 +72,11 @@ export default (app: Router) => {
         if (config.blackFileList.includes(name)) {
           res.send({ code: 403, message: '文件无法访问' });
         }
-        let path = join(config.configPath, name);
-        if (name.startsWith('data/scripts/')) {
-          path = join(config.rootPath, name);
-        }
-        await writeFileWithLock(path, content);
+        const path = `${config.configPath}${name}`;
+        fs.writeFileSync(path, content);
         res.send({ code: 200, message: '保存成功' });
       } catch (e) {
-        return next(e);
-      }
-    },
-  );
-
-  route.get(
-    '/:file',
-    async (req: Request, res: Response, next: NextFunction) => {
-      try {
-        const configService = Container.get(ConfigService);
-        await configService.getFile(req.params.file, res);
-      } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },

back/api/cron.ts

@@ -2,7 +2,6 @@ import { Router, Request, Response, NextFunction } from 'express';
 import { Container } from 'typedi';
 import { Logger } from 'winston';
 import CronService from '../services/cron';
-import CronViewService from '../services/cronView';
 import { celebrate, Joi } from 'celebrate';
 import cron_parser from 'cron-parser';
 const route = Router();
@@ -10,141 +9,11 @@ const route = Router();
 export default (app: Router) => {
   app.use('/crons', route);
 
-  route.get(
-    '/views',
-    async (req: Request, res: Response, next: NextFunction) => {
-      try {
-        const cronViewService = Container.get(CronViewService);
-        const data = await cronViewService.list();
-        return res.send({ code: 200, data });
-      } catch (e) {
-        return next(e);
-      }
-    },
-  );
-
-  route.post(
-    '/views',
-    celebrate({
-      body: Joi.object({
-        name: Joi.string().required(),
-        sorts: Joi.array().optional().allow(null),
-        filters: Joi.array().optional(),
-        filterRelation: Joi.string().optional(),
-      }),
-    }),
-    async (req: Request, res: Response, next: NextFunction) => {
-      try {
-        const cronViewService = Container.get(CronViewService);
-        const data = await cronViewService.create(req.body);
-        return res.send({ code: 200, data });
-      } catch (e) {
-        return next(e);
-      }
-    },
-  );
-
-  route.put(
-    '/views',
-    celebrate({
-      body: Joi.object({
-        name: Joi.string().required(),
-        id: Joi.number().required(),
-        sorts: Joi.array().optional().allow(null),
-        filters: Joi.array().optional(),
-        filterRelation: Joi.string().optional(),
-      }),
-    }),
-    async (req: Request, res: Response, next: NextFunction) => {
-      try {
-        const cronViewService = Container.get(CronViewService);
-        if (req.body.type === 1) {
-          return res.send({ code: 400, message: '参数错误' });
-        } else {
-          const data = await cronViewService.update(req.body);
-          return res.send({ code: 200, data });
-        }
-      } catch (e) {
-        return next(e);
-      }
-    },
-  );
-
-  route.delete(
-    '/views',
-    celebrate({
-      body: Joi.array().items(Joi.number().required()),
-    }),
-    async (req: Request, res: Response, next: NextFunction) => {
-      try {
-        const cronViewService = Container.get(CronViewService);
-        const data = await cronViewService.remove(req.body);
-        return res.send({ code: 200, data });
-      } catch (e) {
-        return next(e);
-      }
-    },
-  );
-
-  route.put(
-    '/views/move',
-    celebrate({
-      body: Joi.object({
-        fromIndex: Joi.number().required(),
-        toIndex: Joi.number().required(),
-        id: Joi.number().required(),
-      }),
-    }),
-    async (req: Request<{ id: number }>, res: Response, next: NextFunction) => {
-      try {
-        const cronViewService = Container.get(CronViewService);
-        const data = await cronViewService.move(req.body);
-        return res.send({ code: 200, data });
-      } catch (e) {
-        return next(e);
-      }
-    },
-  );
-
-  route.put(
-    '/views/disable',
-    celebrate({
-      body: Joi.array().items(Joi.number().required()),
-    }),
-    async (req: Request, res: Response, next: NextFunction) => {
-      const logger: Logger = Container.get('logger');
-      try {
-        const cronViewService = Container.get(CronViewService);
-        const data = await cronViewService.disabled(req.body);
-        return res.send({ code: 200, data });
-      } catch (e) {
-        return next(e);
-      }
-    },
-  );
-
-  route.put(
-    '/views/enable',
-    celebrate({
-      body: Joi.array().items(Joi.number().required()),
-    }),
-    async (req: Request, res: Response, next: NextFunction) => {
-      const logger: Logger = Container.get('logger');
-      try {
-        const cronViewService = Container.get(CronViewService);
-        const data = await cronViewService.enabled(req.body);
-        return res.send({ code: 200, data });
-      } catch (e) {
-        return next(e);
-      }
-    },
-  );
-
   route.get('/', async (req: Request, res: Response, next: NextFunction) => {
     const logger: Logger = Container.get('logger');
     try {
       const cronService = Container.get(CronService);
-      const data = await cronService.crontabs(req.query as any);
+      const data = await cronService.crontabs(req.query.searchValue as string);
       return res.send({ code: 200, data });
     } catch (e) {
       logger.error('🔥 error: %o', e);
@@ -152,21 +21,6 @@ export default (app: Router) => {
     }
   });
 
-  route.get(
-    '/detail',
-    async (req: Request, res: Response, next: NextFunction) => {
-      const logger: Logger = Container.get('logger');
-      try {
-        const cronService = Container.get(CronService);
-        const data = await cronService.find(req.query as any);
-        return res.send({ code: 200, data });
-      } catch (e) {
-        logger.error('🔥 error: %o', e);
-        return next(e);
-      }
-    },
-  );
-
   route.post(
     '/',
     celebrate({
@@ -175,10 +29,6 @@ export default (app: Router) => {
         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) => {
@@ -192,6 +42,7 @@ export default (app: Router) => {
           return res.send({ code: 400, message: 'param schedule error' });
         }
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -209,6 +60,7 @@ export default (app: Router) => {
         const data = await cronService.run(req.body);
         return res.send({ code: 200, data });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -226,6 +78,7 @@ export default (app: Router) => {
         const data = await cronService.stop(req.body);
         return res.send({ code: 200, data });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -249,6 +102,7 @@ export default (app: Router) => {
         );
         return res.send({ code: 200, data });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -269,6 +123,7 @@ export default (app: Router) => {
         const data = await cronService.addLabels(req.body.ids, req.body.labels);
         return res.send({ code: 200, data });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -286,6 +141,7 @@ export default (app: Router) => {
         const data = await cronService.disabled(req.body);
         return res.send({ code: 200, data });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -303,6 +159,7 @@ export default (app: Router) => {
         const data = await cronService.enabled(req.body);
         return res.send({ code: 200, data });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -322,6 +179,7 @@ export default (app: Router) => {
         const data = await cronService.log(req.params.id);
         return res.send({ code: 200, data });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -332,13 +190,9 @@ export default (app: Router) => {
     celebrate({
       body: Joi.object({
         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),
+        command: Joi.string().optional(),
+        schedule: Joi.string().optional(),
+        name: Joi.string().optional(),
         id: Joi.number().required(),
       }),
     }),
@@ -356,6 +210,7 @@ export default (app: Router) => {
           return res.send({ code: 400, message: 'param schedule error' });
         }
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -373,6 +228,7 @@ export default (app: Router) => {
         const data = await cronService.remove(req.body);
         return res.send({ code: 200, data });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -390,6 +246,7 @@ export default (app: Router) => {
         const data = await cronService.pin(req.body);
         return res.send({ code: 200, data });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -407,6 +264,7 @@ export default (app: Router) => {
         const data = await cronService.unPin(req.body);
         return res.send({ code: 200, data });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -421,6 +279,7 @@ export default (app: Router) => {
         const data = await cronService.import_crontab();
         return res.send({ code: 200, data });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -440,6 +299,7 @@ export default (app: Router) => {
         const data = await cronService.getDb({ id: req.params.id });
         return res.send({ code: 200, data });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -451,22 +311,24 @@ export default (app: Router) => {
       body: Joi.object({
         ids: Joi.array().items(Joi.number().required()),
         status: Joi.string().required(),
-        pid: Joi.string().optional().allow(null),
-        log_path: Joi.string().optional().allow(null),
-        last_running_time: Joi.number().optional().allow(null),
-        last_execution_time: Joi.number().optional().allow(null),
+        pid: Joi.string().optional(),
+        log_path: Joi.string().optional(),
+        last_running_time: Joi.number().optional(),
+        last_execution_time: Joi.number().optional(),
       }),
     }),
     async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
       try {
         const cronService = Container.get(CronService);
         const data = await cronService.status({
           ...req.body,
-          status: req.body.status ? parseInt(req.body.status) : undefined,
-          pid: req.body.pid ? parseInt(req.body.pid) : undefined,
+          status: parseInt(req.body.status),
+          pid: parseInt(req.body.pid) || '',
         });
         return res.send({ code: 200, data });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -486,6 +348,7 @@ export default (app: Router) => {
         const data = await cronService.logs(req.params.id);
         return res.send({ code: 200, data });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },

back/api/dependence.ts

@@ -38,6 +38,7 @@ export default (app: Router) => {
         const data = await dependenceService.create(req.body);
         return res.send({ code: 200, data });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -60,6 +61,7 @@ export default (app: Router) => {
         const data = await dependenceService.update(req.body);
         return res.send({ code: 200, data });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -77,6 +79,7 @@ export default (app: Router) => {
         const data = await dependenceService.remove(req.body);
         return res.send({ code: 200, data });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -91,9 +94,10 @@ export default (app: Router) => {
       const logger: Logger = Container.get('logger');
       try {
         const dependenceService = Container.get(DependenceService);
-        const data = await dependenceService.remove(req.body, true);
+        const data = await dependenceService.removeDb(req.body);
         return res.send({ code: 200, data });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -113,6 +117,7 @@ export default (app: Router) => {
         const data = await dependenceService.getDb({ id: req.params.id });
         return res.send({ code: 200, data });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -130,22 +135,7 @@ export default (app: Router) => {
         const data = await dependenceService.reInstall(req.body);
         return res.send({ code: 200, data });
       } catch (e) {
-        return next(e);
-      }
-    },
-  );
-
-  route.put(
-    '/cancel',
-    celebrate({
-      body: Joi.array().items(Joi.number().required()),
-    }),
-    async (req: Request, res: Response, next: NextFunction) => {
-      try {
-        const dependenceService = Container.get(DependenceService);
-        await dependenceService.cancel(req.body);
-        return res.send({ code: 200 });
-      } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },

back/api/env.ts

@@ -3,22 +3,8 @@ import { Container } from 'typedi';
 import EnvService from '../services/env';
 import { Logger } from 'winston';
 import { celebrate, Joi } from 'celebrate';
-import multer from 'multer';
-import config from '../config';
-import fs from 'fs';
-import { safeJSONParse } from '../config/util';
 const route = Router();
 
-const storage = multer.diskStorage({
-  destination: function (req, file, cb) {
-    cb(null, config.scriptPath);
-  },
-  filename: function (req, file, cb) {
-    cb(null, file.originalname);
-  },
-});
-const upload = multer({ storage: storage });
-
 export default (app: Router) => {
   app.use('/envs', route);
 
@@ -40,9 +26,7 @@ export default (app: Router) => {
       body: Joi.array().items(
         Joi.object({
           value: Joi.string().required(),
-          name: Joi.string()
-            .required()
-            .pattern(/^[a-zA-Z_][0-9a-zA-Z_]*$/),
+          name: Joi.string().required(),
           remarks: Joi.string().optional().allow(''),
         }),
       ),
@@ -51,12 +35,10 @@ 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) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -79,6 +61,7 @@ export default (app: Router) => {
         const data = await envService.update(req.body);
         return res.send({ code: 200, data });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -96,6 +79,7 @@ export default (app: Router) => {
         const data = await envService.remove(req.body);
         return res.send({ code: 200, data });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -113,11 +97,13 @@ export default (app: Router) => {
       }),
     }),
     async (req: Request<{ id: number }>, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
       try {
         const envService = Container.get(EnvService);
         const data = await envService.move(req.params.id, req.body);
         return res.send({ code: 200, data });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -135,6 +121,7 @@ export default (app: Router) => {
         const data = await envService.disabled(req.body);
         return res.send({ code: 200, data });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -152,6 +139,7 @@ export default (app: Router) => {
         const data = await envService.enabled(req.body);
         return res.send({ code: 200, data });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -172,6 +160,7 @@ export default (app: Router) => {
         const data = await envService.updateNames(req.body);
         return res.send({ code: 200, data });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -188,42 +177,10 @@ export default (app: Router) => {
       const logger: Logger = Container.get('logger');
       try {
         const envService = Container.get(EnvService);
-        const data = await envService.getDb({ id: req.params.id });
+        const data = await envService.getDb(req.params.id);
         return res.send({ code: 200, data });
       } catch (e) {
-        return next(e);
-      }
-    },
-  );
-
-  route.post(
-    '/upload',
-    upload.single('env'),
-    async (req: Request, res: Response, next: NextFunction) => {
-      const logger: Logger = Container.get('logger');
-      try {
-        const envService = Container.get(EnvService);
-        const fileContent = await fs.promises.readFile(req!.file!.path, 'utf8');
-        const parseContent = safeJSONParse(fileContent);
-        const data = Array.isArray(parseContent)
-          ? parseContent
-          : [parseContent];
-        if (data.every((x) => x.name && x.value)) {
-          const result = await envService.create(
-            data.map((x) => ({
-              name: x.name,
-              value: x.value,
-              remarks: x.remarks,
-            })),
-          );
-          return res.send({ code: 200, data: result });
-        } else {
-          return res.send({
-            code: 400,
-            message: '每条数据 name 或者 value 字段不能为空，参考导出文件格式',
-          });
-        }
-      } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },

back/api/index.ts

@@ -8,7 +8,6 @@ import script from './script';
 import open from './open';
 import dependence from './dependence';
 import system from './system';
-import subscription from './subscription';
 
 export default () => {
   const app = Router();
@@ -21,7 +20,6 @@ export default () => {
   open(app);
   dependence(app);
   system(app);
-  subscription(app);
 
   return app;
 };

back/api/log.ts

@@ -1,12 +1,10 @@
 import { Router, Request, Response, NextFunction } from 'express';
 import { Container } from 'typedi';
 import { Logger } from 'winston';
+import * as fs from 'fs';
 import config from '../config';
-import { getFileContentByName, readDirs, rmPath } from '../config/util';
-import { join, resolve } from 'path';
-import { celebrate, Joi } from 'celebrate';
+import { getFileContentByName } from '../config/util';
 const route = Router();
-const blacklist = ['.tmp'];
 
 export default (app: Router) => {
   app.use('/logs', route);
@@ -14,11 +12,29 @@ export default (app: Router) => {
   route.get('/', async (req: Request, res: Response, next: NextFunction) => {
     const logger: Logger = Container.get('logger');
     try {
-      const result = await readDirs(config.logPath, config.logPath, blacklist);
-      res.send({
-        code: 200,
-        data: result,
-      });
+      const fileList = fs.readdirSync(config.logPath, 'utf-8');
+      const dirs = [];
+      for (let i = 0; i < fileList.length; i++) {
+        const stat = fs.lstatSync(config.logPath + fileList[i]);
+        if (stat.isDirectory()) {
+          const fileListTmp = fs.readdirSync(
+            `${config.logPath}/${fileList[i]}`,
+            'utf-8',
+          );
+          dirs.push({
+            name: fileList[i],
+            isDir: true,
+            files: fileListTmp.reverse(),
+          });
+        } else {
+          dirs.push({
+            name: fileList[i],
+            isDir: false,
+            files: [],
+          });
+        }
+      }
+      res.send({ code: 200, dirs });
     } catch (e) {
       logger.error('🔥 error: %o', e);
       return next(e);
@@ -26,24 +42,17 @@ export default (app: Router) => {
   });
 
   route.get(
-    '/detail',
+    '/:dir/:file',
     async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
       try {
-        const finalPath = resolve(
-          config.logPath,
-          (req.query.path as string) || '',
-          (req.query.file as string) || '',
+        const { dir, file } = req.params;
+        const content = getFileContentByName(
+          `${config.logPath}/${dir}/${file}`,
         );
-
-        if (
-          blacklist.includes(req.query.path as string) ||
-          !finalPath.startsWith(config.logPath)
-        ) {
-          return res.send({ code: 403, message: '暂无权限' });
-        }
-        const content = await getFileContentByName(finalPath);
         res.send({ code: 200, data: content });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -52,46 +61,13 @@ export default (app: Router) => {
   route.get(
     '/:file',
     async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
       try {
-        const finalPath = resolve(
-          config.logPath,
-          (req.query.path as string) || '',
-          (req.params.file as string) || '',
-        );
-        if (
-          blacklist.includes(req.path) ||
-          !finalPath.startsWith(config.logPath)
-        ) {
-          return res.send({ code: 403, message: '暂无权限' });
-        }
-        const content = await getFileContentByName(finalPath);
+        const { file } = req.params;
+        const content = getFileContentByName(`${config.logPath}/${file}`);
         res.send({ code: 200, data: content });
       } catch (e) {
-        return next(e);
-      }
-    },
-  );
-
-  route.delete(
-    '/',
-    celebrate({
-      body: Joi.object({
-        filename: Joi.string().required(),
-        path: Joi.string().allow(''),
-        type: Joi.string().optional(),
-      }),
-    }),
-    async (req: Request, res: Response, next: NextFunction) => {
-      try {
-        let { filename, path, type } = req.body as {
-          filename: string;
-          path: string;
-          type: string;
-        };
-        const filePath = join(config.logPath, path, filename);
-        await rmPath(filePath);
-        res.send({ code: 200 });
-      } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },

back/api/open.ts

@@ -16,6 +16,7 @@ export default (app: Router) => {
         const data = await openService.list();
         return res.send({ code: 200, data });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -25,7 +26,7 @@ export default (app: Router) => {
     '/apps',
     celebrate({
       body: Joi.object({
-        name: Joi.string().optional().allow('').disallow('system'),
+        name: Joi.string().optional().allow(''),
         scopes: Joi.array().items(Joi.string().required()),
       }),
     }),
@@ -36,6 +37,7 @@ export default (app: Router) => {
         const data = await openService.create(req.body);
         return res.send({ code: 200, data });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -57,6 +59,7 @@ export default (app: Router) => {
         const data = await openService.update(req.body);
         return res.send({ code: 200, data });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -74,6 +77,7 @@ export default (app: Router) => {
         const data = await openService.remove(req.body);
         return res.send({ code: 200, data });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -93,6 +97,7 @@ export default (app: Router) => {
         const data = await openService.resetSecret(req.params.id);
         return res.send({ code: 200, data });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -113,6 +118,7 @@ export default (app: Router) => {
         const result = await openService.authToken(req.query as any);
         return res.send(result);
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },

back/api/script.ts

@@ -1,82 +1,79 @@
-import { fileExist, readDirs, readDir, rmPath } from '../config/util';
+import {
+  fileExist,
+  getFileContentByName,
+  getLastModifyFilePath,
+} from '../config/util';
 import { Router, Request, Response, NextFunction } from 'express';
 import { Container } from 'typedi';
 import { Logger } from 'winston';
 import config from '../config';
-import * as fs from 'fs/promises';
+import * as fs from 'fs';
 import { celebrate, Joi } from 'celebrate';
-import path, { join, parse } from 'path';
+import path, { join } from 'path';
 import ScriptService from '../services/script';
-import multer from 'multer';
-import { writeFileWithLock } from '../shared/utils';
 const route = Router();
 
-const storage = multer.diskStorage({
-  destination: function (req, file, cb) {
-    cb(null, config.scriptPath);
-  },
-  filename: function (req, file, cb) {
-    cb(null, file.originalname);
-  },
-});
-const upload = multer({ storage: storage });
-
 export default (app: Router) => {
   app.use('/scripts', route);
 
-  route.get('/', async (req: Request, res: Response, next: NextFunction) => {
-    const logger: Logger = Container.get('logger');
-    try {
-      let result = [];
-      const blacklist = [
-        'node_modules',
-        '.git',
-        '.pnpm',
-        'pnpm-lock.yaml',
-        'yarn.lock',
-        'package-lock.json',
-      ];
-      if (req.query.path) {
-        const targetPath = path.join(
-          config.scriptPath,
-          req.query.path as string,
-        );
-        result = await readDir(targetPath, config.scriptPath, blacklist);
-      } else {
-        result = await readDirs(
-          config.scriptPath,
-          config.scriptPath,
-          blacklist,
-          (a, b) => {
-            if (a.type === b.type) {
-              return a.title.localeCompare(b.title);
-            } else {
-              return a.type === 'directory' ? -1 : 1;
-            }
-          },
-        );
-      }
-      res.send({
-        code: 200,
-        data: result,
-      });
-    } catch (e) {
-      logger.error('🔥 error: %o', e);
-      return next(e);
-    }
-  });
-
   route.get(
-    '/detail',
+    '/files',
     async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
       try {
-        const scriptService = Container.get(ScriptService);
-        const content = await scriptService.getFile(
-          req.query.path as string,
-          req.query.file as string,
-        );
-        res.send({ code: 200, data: content });
+        const fileList = fs.readdirSync(config.scriptPath, 'utf-8');
+
+        let result = [];
+        for (let i = 0; i < fileList.length; i++) {
+          const fileOrDir = fileList[i];
+          const fPath = path.join(config.scriptPath, fileOrDir);
+          const dirStat = fs.statSync(fPath);
+          if (['node_modules'].includes(fileOrDir)) {
+            continue;
+          }
+
+          if (dirStat.isDirectory()) {
+            const childFileList = fs.readdirSync(fPath, 'utf-8');
+            let children = [];
+            for (let j = 0; j < childFileList.length; j++) {
+              const childFile = childFileList[j];
+              const sPath = path.join(config.scriptPath, fileOrDir, childFile);
+              const _fileExist = await fileExist(sPath);
+              if (_fileExist && fs.statSync(sPath).isFile()) {
+                const statObj = fs.statSync(sPath);
+                children.push({
+                  title: childFile,
+                  value: childFile,
+                  key: `${fileOrDir}/${childFile}`,
+                  mtime: statObj.mtimeMs,
+                  parent: fileOrDir,
+                });
+              }
+            }
+            result.push({
+              title: fileOrDir,
+              value: fileOrDir,
+              key: fileOrDir,
+              mtime: dirStat.mtimeMs,
+              disabled: true,
+              children: children.sort((a, b) => b.mtime - a.mtime),
+            });
+          } else {
+            result.push({
+              title: fileOrDir,
+              value: fileOrDir,
+              key: fileOrDir,
+              mtime: dirStat.mtimeMs,
+            });
+          }
+        }
+
+        res.send({
+          code: 200,
+          data: result,
+        });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -85,14 +82,17 @@ export default (app: Router) => {
   route.get(
     '/:file',
     async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
       try {
-        const scriptService = Container.get(ScriptService);
-        const content = await scriptService.getFile(
+        const filePath = join(
+          config.scriptPath,
           req.query.path as string,
           req.params.file,
         );
+        const content = getFileContentByName(filePath);
         res.send({ code: 200, data: content });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -100,19 +100,23 @@ 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().allow(''),
+        originFilename: Joi.string().allow(''),
+      }),
+    }),
     async (req: Request, res: Response, next: NextFunction) => {
       const logger: Logger = Container.get('logger');
       try {
-        let { filename, path, content, originFilename, directory } =
-          req.body as {
-            filename: string;
-            path: string;
-            content: string;
-            originFilename: string;
-            directory: string;
-          };
-
+        let { filename, path, content, originFilename } = req.body as {
+          filename: string;
+          path: string;
+          content: string;
+          originFilename: string;
+        };
         if (!path) {
           path = config.scriptPath;
         }
@@ -120,46 +124,35 @@ export default (app: Router) => {
           path += '/';
         }
         if (!path.startsWith('/')) {
-          path = join(config.scriptPath, path);
+          path = `${config.scriptPath}${path}`;
         }
         if (config.writePathList.every((x) => !path.startsWith(x))) {
           return res.send({
             code: 430,
-            message: '文件路径禁止访问',
+            data: '文件路径禁止访问',
           });
         }
-
-        if (req.file) {
-          await fs.rename(req.file.path, join(path, filename));
-          return res.send({ code: 200 });
-        }
-
-        if (directory) {
-          await fs.mkdir(join(path, directory), { recursive: true });
-          return res.send({ code: 200 });
-        }
-
         if (!originFilename) {
           originFilename = filename;
         }
-        const originFilePath = join(
-          path,
-          `${originFilename.replace(/\//g, '')}`,
-        );
-        const filePath = join(path, `${filename.replace(/\//g, '')}`);
-        const fileExists = await fileExist(filePath);
-        if (fileExists) {
-          await fs.copyFile(
+        const originFilePath = `${path}${originFilename.replace(/\//g, '')}`;
+        const filePath = `${path}${filename.replace(/\//g, '')}`;
+        if (fs.existsSync(originFilePath)) {
+          if (!fs.existsSync(config.bakPath)) {
+            fs.mkdirSync(config.bakPath);
+          }
+          fs.copyFileSync(
             originFilePath,
-            join(config.bakPath, originFilename.replace(/\//g, '')),
+            `${config.bakPath}${originFilename.replace(/\//g, '')}`,
           );
           if (filename !== originFilename) {
-            await rmPath(originFilePath);
+            fs.unlinkSync(originFilePath);
           }
         }
-        await writeFileWithLock(filePath, content);
+        fs.writeFileSync(filePath, content);
         return res.send({ code: 200 });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -171,7 +164,7 @@ export default (app: Router) => {
       body: Joi.object({
         filename: Joi.string().required(),
         path: Joi.string().optional().allow(''),
-        content: Joi.string().required().allow(''),
+        content: Joi.string().required(),
       }),
     }),
     async (req: Request, res: Response, next: NextFunction) => {
@@ -183,9 +176,10 @@ export default (app: Router) => {
           path: string;
         };
         const filePath = join(config.scriptPath, path, filename);
-        await writeFileWithLock(filePath, content);
+        fs.writeFileSync(filePath, content);
         return res.send({ code: 200 });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -197,21 +191,20 @@ export default (app: Router) => {
       body: Joi.object({
         filename: Joi.string().required(),
         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, type } = req.body as {
+        let { filename, path } = req.body as {
           filename: string;
           path: string;
-          type: string;
         };
         const filePath = join(config.scriptPath, path, filename);
-        await rmPath(filePath);
+        fs.unlinkSync(filePath);
         res.send({ code: 200 });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -230,7 +223,7 @@ export default (app: Router) => {
         let { filename } = req.body as {
           filename: string;
         };
-        const filePath = join(config.scriptPath, filename);
+        const filePath = `${config.scriptPath}${filename}`;
         // const stats = fs.statSync(filePath);
         // res.set({
         //   'Content-Type': 'application/octet-stream', //告诉浏览器这是一个二进制文件
@@ -242,6 +235,7 @@ export default (app: Router) => {
           return next(err);
         });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -252,22 +246,22 @@ export default (app: Router) => {
     celebrate({
       body: Joi.object({
         filename: Joi.string().required(),
-        content: Joi.string().optional().allow(''),
         path: Joi.string().optional().allow(''),
       }),
     }),
     async (req: Request, res: Response, next: NextFunction) => {
       const logger: Logger = Container.get('logger');
       try {
-        let { filename, content, path } = req.body;
-        const { name, ext } = parse(filename);
-        const filePath = join(config.scriptPath, path, `${name}.swap${ext}`);
-        await writeFileWithLock(filePath, content || '');
-
+        let { filename, path } = req.body as {
+          filename: string;
+          path: string;
+        };
+        const filePath = join(path, filename);
         const scriptService = Container.get(ScriptService);
         const result = await scriptService.runScript(filePath);
         res.send(result);
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -279,50 +273,21 @@ export default (app: Router) => {
       body: Joi.object({
         filename: Joi.string().required(),
         path: Joi.string().optional().allow(''),
-        pid: Joi.number().optional().allow(''),
       }),
     }),
     async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
       try {
-        let { filename, path, pid } = req.body;
-        const { name, ext } = parse(filename);
-        const filePath = join(config.scriptPath, path, `${name}.swap${ext}`);
-        const logPath = join(config.logPath, path, `${name}.swap`);
-
-        const scriptService = Container.get(ScriptService);
-        const result = await scriptService.stopScript(filePath, pid);
-        setTimeout(() => {
-          rmPath(logPath);
-        }, 3000);
-        res.send(result);
-      } catch (e) {
-        return next(e);
-      }
-    },
-  );
-
-  route.put(
-    '/rename',
-    celebrate({
-      body: Joi.object({
-        filename: Joi.string().required(),
-        path: Joi.string().allow(''),
-        newFilename: Joi.string().required(),
-      }),
-    }),
-    async (req: Request, res: Response, next: NextFunction) => {
-      try {
-        let { filename, path, type, newFilename } = req.body as {
+        let { filename, path } = req.body as {
           filename: string;
           path: string;
-          type: string;
-          newFilename: string;
         };
-        const filePath = join(config.scriptPath, path, filename);
-        const newPath = join(config.scriptPath, path, newFilename);
-        await fs.rename(filePath, newPath);
-        res.send({ code: 200 });
+        const filePath = join(path, filename);
+        const scriptService = Container.get(ScriptService);
+        const result = await scriptService.stopScript(filePath);
+        res.send(result);
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },

back/api/subscription.ts

@@ -1,294 +0,0 @@
-import { Router, Request, Response, NextFunction } from 'express';
-import { Container } from 'typedi';
-import { Logger } from 'winston';
-import SubscriptionService from '../services/subscription';
-import { celebrate, Joi } from 'celebrate';
-import cron_parser from 'cron-parser';
-const route = Router();
-
-export default (app: Router) => {
-  app.use('/subscriptions', route);
-
-  route.get('/', async (req: Request, res: Response, next: NextFunction) => {
-    const logger: Logger = Container.get('logger');
-    try {
-      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) {
-      logger.error('🔥 error: %o', e);
-      return next(e);
-    }
-  });
-
-  route.post(
-    '/',
-    celebrate({
-      body: Joi.object({
-        type: Joi.string().required(),
-        schedule: Joi.string().optional().allow('').allow(null),
-        interval_schedule: Joi.object({
-          type: Joi.string().required(),
-          value: Joi.number().min(1).required(),
-        })
-          .optional()
-          .allow('')
-          .allow(null),
-        name: Joi.string().optional().allow('').allow(null),
-        url: Joi.string().required(),
-        whitelist: Joi.string().optional().allow('').allow(null),
-        blacklist: Joi.string().optional().allow('').allow(null),
-        branch: Joi.string().optional().allow('').allow(null),
-        dependences: Joi.string().optional().allow('').allow(null),
-        pull_type: Joi.string().optional().allow('').allow(null),
-        pull_option: Joi.object().optional().allow('').allow(null),
-        extensions: Joi.string().optional().allow('').allow(null),
-        sub_before: Joi.string().optional().allow('').allow(null),
-        sub_after: Joi.string().optional().allow('').allow(null),
-        schedule_type: Joi.string().required(),
-        alias: Joi.string().required(),
-        proxy: Joi.string().optional().allow('').allow(null),
-        autoAddCron: Joi.boolean().optional().allow('').allow(null),
-        autoDelCron: Joi.boolean().optional().allow('').allow(null),
-      }),
-    }),
-    async (req: Request, res: Response, next: NextFunction) => {
-      const logger: Logger = Container.get('logger');
-      try {
-        if (
-          !req.body.schedule ||
-          cron_parser.parseExpression(req.body.schedule).hasNext()
-        ) {
-          const subscriptionService = Container.get(SubscriptionService);
-          const data = await subscriptionService.create(req.body);
-          return res.send({ code: 200, data });
-        } else {
-          return res.send({ code: 400, message: 'param schedule error' });
-        }
-      } catch (e) {
-        return next(e);
-      }
-    },
-  );
-
-  route.put(
-    '/run',
-    celebrate({
-      body: Joi.array().items(Joi.number().required()),
-    }),
-    async (req: Request, res: Response, next: NextFunction) => {
-      const logger: Logger = Container.get('logger');
-      try {
-        const subscriptionService = Container.get(SubscriptionService);
-        const data = await subscriptionService.run(req.body);
-        return res.send({ code: 200, data });
-      } catch (e) {
-        return next(e);
-      }
-    },
-  );
-
-  route.put(
-    '/stop',
-    celebrate({
-      body: Joi.array().items(Joi.number().required()),
-    }),
-    async (req: Request, res: Response, next: NextFunction) => {
-      const logger: Logger = Container.get('logger');
-      try {
-        const subscriptionService = Container.get(SubscriptionService);
-        const data = await subscriptionService.stop(req.body);
-        return res.send({ code: 200, data });
-      } catch (e) {
-        return next(e);
-      }
-    },
-  );
-
-  route.put(
-    '/disable',
-    celebrate({
-      body: Joi.array().items(Joi.number().required()),
-    }),
-    async (req: Request, res: Response, next: NextFunction) => {
-      const logger: Logger = Container.get('logger');
-      try {
-        const subscriptionService = Container.get(SubscriptionService);
-        const data = await subscriptionService.disabled(req.body);
-        return res.send({ code: 200, data });
-      } catch (e) {
-        return next(e);
-      }
-    },
-  );
-
-  route.put(
-    '/enable',
-    celebrate({
-      body: Joi.array().items(Joi.number().required()),
-    }),
-    async (req: Request, res: Response, next: NextFunction) => {
-      const logger: Logger = Container.get('logger');
-      try {
-        const subscriptionService = Container.get(SubscriptionService);
-        const data = await subscriptionService.enabled(req.body);
-        return res.send({ code: 200, data });
-      } catch (e) {
-        return next(e);
-      }
-    },
-  );
-
-  route.get(
-    '/:id/log',
-    celebrate({
-      params: Joi.object({
-        id: Joi.number().required(),
-      }),
-    }),
-    async (req: Request<{ id: number }>, res: Response, next: NextFunction) => {
-      const logger: Logger = Container.get('logger');
-      try {
-        const subscriptionService = Container.get(SubscriptionService);
-        const data = await subscriptionService.log(req.params.id);
-        return res.send({ code: 200, data });
-      } catch (e) {
-        return next(e);
-      }
-    },
-  );
-
-  route.put(
-    '/',
-    celebrate({
-      body: Joi.object({
-        type: Joi.string().required(),
-        schedule: Joi.string().optional().allow('').allow(null),
-        interval_schedule: Joi.object().optional().allow('').allow(null),
-        name: Joi.string().optional().allow('').allow(null),
-        url: Joi.string().required(),
-        whitelist: Joi.string().optional().allow('').allow(null),
-        blacklist: Joi.string().optional().allow('').allow(null),
-        branch: Joi.string().optional().allow('').allow(null),
-        dependences: Joi.string().optional().allow('').allow(null),
-        pull_type: Joi.string().optional().allow('').allow(null),
-        pull_option: Joi.object().optional().allow('').allow(null),
-        schedule_type: Joi.string().optional().allow('').allow(null),
-        extensions: Joi.string().optional().allow('').allow(null),
-        sub_before: Joi.string().optional().allow('').allow(null),
-        sub_after: Joi.string().optional().allow('').allow(null),
-        alias: Joi.string().required(),
-        proxy: Joi.string().optional().allow('').allow(null),
-        autoAddCron: Joi.boolean().optional().allow('').allow(null),
-        autoDelCron: Joi.boolean().optional().allow('').allow(null),
-        id: Joi.number().required(),
-      }),
-    }),
-    async (req: Request, res: Response, next: NextFunction) => {
-      const logger: Logger = Container.get('logger');
-      try {
-        if (
-          !req.body.schedule ||
-          typeof req.body.schedule === 'object' ||
-          cron_parser.parseExpression(req.body.schedule).hasNext()
-        ) {
-          const subscriptionService = Container.get(SubscriptionService);
-          const data = await subscriptionService.update(req.body);
-          return res.send({ code: 200, data });
-        } else {
-          return res.send({ code: 400, message: 'param schedule error' });
-        }
-      } catch (e) {
-        return next(e);
-      }
-    },
-  );
-
-  route.delete(
-    '/',
-    celebrate({
-      body: Joi.array().items(Joi.number().required()),
-      query: Joi.object({
-        force: Joi.boolean().optional(),
-        t: Joi.number(),
-      }),
-    }),
-    async (req: Request, res: Response, next: NextFunction) => {
-      const logger: Logger = Container.get('logger');
-      try {
-        const subscriptionService = Container.get(SubscriptionService);
-        const data = await subscriptionService.remove(req.body, req.query);
-        return res.send({ code: 200, data });
-      } catch (e) {
-        return next(e);
-      }
-    },
-  );
-
-  route.get(
-    '/:id',
-    celebrate({
-      params: Joi.object({
-        id: Joi.number().required(),
-      }),
-    }),
-    async (req: Request<{ id: number }>, res: Response, next: NextFunction) => {
-      const logger: Logger = Container.get('logger');
-      try {
-        const subscriptionService = Container.get(SubscriptionService);
-        const data = await subscriptionService.getDb({ id: req.params.id });
-        return res.send({ code: 200, data });
-      } catch (e) {
-        return next(e);
-      }
-    },
-  );
-
-  route.put(
-    '/status',
-    celebrate({
-      body: Joi.object({
-        ids: Joi.array().items(Joi.number().required()),
-        status: Joi.string().required(),
-        pid: Joi.string().optional(),
-        log_path: Joi.string().optional(),
-      }),
-    }),
-    async (req: Request, res: Response, next: NextFunction) => {
-      const logger: Logger = Container.get('logger');
-      try {
-        const subscriptionService = Container.get(SubscriptionService);
-        const data = await subscriptionService.status({
-          ...req.body,
-          status: parseInt(req.body.status),
-          pid: parseInt(req.body.pid) || '',
-        });
-        return res.send({ code: 200, data });
-      } catch (e) {
-        return next(e);
-      }
-    },
-  );
-
-  route.get(
-    '/:id/logs',
-    celebrate({
-      params: Joi.object({
-        id: Joi.number().required(),
-      }),
-    }),
-    async (req: Request<{ id: number }>, res: Response, next: NextFunction) => {
-      const logger: Logger = Container.get('logger');
-      try {
-        const subscriptionService = Container.get(SubscriptionService);
-        const data = await subscriptionService.logs(req.params.id);
-        return res.send({ code: 200, data });
-      } catch (e) {
-        return next(e);
-      }
-    },
-  );
-};

back/api/system.ts

@@ -1,30 +1,13 @@
 import { Router, Request, Response, NextFunction } from 'express';
 import { Container } from 'typedi';
 import { Logger } from 'winston';
-import * as fs from 'fs/promises';
+import * as fs from 'fs';
 import config from '../config';
 import SystemService from '../services/system';
 import { celebrate, Joi } from 'celebrate';
 import UserService from '../services/user';
-import {
-  getUniqPath,
-  handleLogPath,
-  parseVersion,
-  promiseExec,
-} from '../config/util';
-import dayjs from 'dayjs';
-import multer from 'multer';
-
+import { EnvModel } from '../data/env';
 const route = Router();
-const storage = multer.diskStorage({
-  destination: function (req, file, cb) {
-    cb(null, config.tmpPath);
-  },
-  filename: function (req, file, cb) {
-    cb(null, 'data.tgz');
-  },
-});
-const upload = multer({ storage: storage });
 
 export default (app: Router) => {
   app.use('/system', route);
@@ -33,15 +16,19 @@ export default (app: Router) => {
     const logger: Logger = Container.get('logger');
     try {
       const userService = Container.get(UserService);
-      const authInfo = await userService.getAuthInfo();
-      const { version, changeLog, changeLogLink, publishTime } =
-        await parseVersion(config.versionFile);
+      const authInfo = await userService.getUserInfo();
+      const envCount = await EnvModel.count();
+      const versionRegx = /.*export const version = \'(.*)\'\;/;
+
+      const currentVersionFile = fs.readFileSync(config.versionFile, 'utf8');
+      const version = currentVersionFile.match(versionRegx)![1];
 
       let isInitialized = true;
       if (
         Object.keys(authInfo).length === 2 &&
         authInfo.username === 'admin' &&
-        authInfo.password === 'admin'
+        authInfo.password === 'admin' &&
+        envCount === 0
       ) {
         isInitialized = false;
       }
@@ -50,10 +37,6 @@ export default (app: Router) => {
         data: {
           isInitialized,
           version,
-          publishTime: dayjs(publishTime).unix(),
-          branch: process.env.QL_BRANCH || 'master',
-          changeLog,
-          changeLogLink,
         },
       });
     } catch (e) {
@@ -63,122 +46,37 @@ export default (app: Router) => {
   });
 
   route.get(
-    '/config',
+    '/log/remove',
     async (req: Request, res: Response, next: NextFunction) => {
       const logger: Logger = Container.get('logger');
       try {
         const systemService = Container.get(SystemService);
-        const data = await systemService.getSystemConfig();
+        const data = await systemService.getLogRemoveFrequency();
         res.send({ code: 200, data });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
   );
 
   route.put(
-    '/config/log-remove-frequency',
+    '/log/remove',
     celebrate({
       body: Joi.object({
-        logRemoveFrequency: Joi.number().allow(null),
+        frequency: Joi.number().required(),
       }),
     }),
     async (req: Request, res: Response, next: NextFunction) => {
+      const logger: Logger = Container.get('logger');
       try {
         const systemService = Container.get(SystemService);
-        const result = await systemService.updateLogRemoveFrequency(req.body);
+        const result = await systemService.updateLogRemoveFrequency(
+          req.body.frequency,
+        );
         res.send(result);
       } catch (e) {
-        return next(e);
-      }
-    },
-  );
-
-  route.put(
-    '/config/cron-concurrency',
-    celebrate({
-      body: Joi.object({
-        cronConcurrency: Joi.number().allow(null),
-      }),
-    }),
-    async (req: Request, res: Response, next: NextFunction) => {
-      try {
-        const systemService = Container.get(SystemService);
-        const result = await systemService.updateCronConcurrency(req.body);
-        res.send(result);
-      } catch (e) {
-        return next(e);
-      }
-    },
-  );
-
-  route.put(
-    '/config/dependence-proxy',
-    celebrate({
-      body: Joi.object({
-        dependenceProxy: Joi.string().allow('').allow(null),
-      }),
-    }),
-    async (req: Request, res: Response, next: NextFunction) => {
-      try {
-        const systemService = Container.get(SystemService);
-        const result = await systemService.updateDependenceProxy(req.body);
-        res.send(result);
-      } catch (e) {
-        return next(e);
-      }
-    },
-  );
-
-  route.put(
-    '/config/node-mirror',
-    celebrate({
-      body: Joi.object({
-        nodeMirror: Joi.string().allow('').allow(null),
-      }),
-    }),
-    async (req: Request, res: Response, next: NextFunction) => {
-      try {
-        const systemService = Container.get(SystemService);
-        res.setHeader('Content-type', 'application/octet-stream');
-        await systemService.updateNodeMirror(req.body, res);
-      } catch (e) {
-        return next(e);
-      }
-    },
-  );
-
-  route.put(
-    '/config/python-mirror',
-    celebrate({
-      body: Joi.object({
-        pythonMirror: Joi.string().allow('').allow(null),
-      }),
-    }),
-    async (req: Request, res: Response, next: NextFunction) => {
-      try {
-        const systemService = Container.get(SystemService);
-        const result = await systemService.updatePythonMirror(req.body);
-        res.send(result);
-      } catch (e) {
-        return next(e);
-      }
-    },
-  );
-
-  route.put(
-    '/config/linux-mirror',
-    celebrate({
-      body: Joi.object({
-        linuxMirror: Joi.string().allow('').allow(null),
-      }),
-    }),
-    async (req: Request, res: Response, next: NextFunction) => {
-      try {
-        const systemService = Container.get(SystemService);
-        res.setHeader('Content-type', 'application/octet-stream');
-        await systemService.updateLinuxMirror(req.body, res);
-      } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -193,6 +91,7 @@ export default (app: Router) => {
         const result = await systemService.checkUpdate();
         res.send(result);
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -207,25 +106,7 @@ export default (app: Router) => {
         const result = await systemService.updateSystem();
         res.send(result);
       } catch (e) {
-        return next(e);
-      }
-    },
-  );
-
-  route.put(
-    '/reload',
-    celebrate({
-      body: Joi.object({
-        type: Joi.string().optional().allow('').allow(null),
-      }),
-    }),
-    async (req: Request, res: Response, next: NextFunction) => {
-      const logger: Logger = Container.get('logger');
-      try {
-        const systemService = Container.get(SystemService);
-        const result = await systemService.reloadSystem(req.body.type);
-        res.send(result);
-      } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -246,152 +127,7 @@ export default (app: Router) => {
         const result = await systemService.notify(req.body);
         res.send(result);
       } catch (e) {
-        return next(e);
-      }
-    },
-  );
-
-  route.put(
-    '/command-run',
-    celebrate({
-      body: Joi.object({
-        command: Joi.string().required(),
-      }),
-    }),
-    async (req: Request, res: Response, next: NextFunction) => {
-      try {
-        const systemService = Container.get(SystemService);
-        const command = req.body.command;
-        const idStr = `cat ${config.crontabFile} | grep -E "${command}" | perl -pe "s|.*ID=(.*) ${command}.*|\\1|" | head -1 | awk -F " " '{print $1}' | xargs echo -n`;
-        let id = await promiseExec(idStr);
-        const uniqPath = await getUniqPath(command, id);
-        const logTime = dayjs().format('YYYY-MM-DD-HH-mm-ss-SSS');
-        const logPath = `${uniqPath}/${logTime}.log`;
-        res.setHeader('Content-type', 'application/octet-stream');
-        await systemService.run(
-          { ...req.body, logPath },
-          {
-            onStart: async (cp, startTime) => {
-              res.setHeader('QL-Task-Pid', `${cp.pid}`);
-            },
-            onEnd: async (cp, endTime, diff) => {
-              res.end();
-            },
-            onError: async (message: string) => {
-              res.write(`\n${message}`);
-              const absolutePath = await handleLogPath(logPath);
-              await fs.appendFile(absolutePath, `\n${message}`);
-            },
-            onLog: async (message: string) => {
-              res.write(`\n${message}`);
-              const absolutePath = await handleLogPath(logPath);
-              await fs.appendFile(absolutePath, `\n${message}`);
-            },
-          },
-        );
-      } catch (e) {
-        return next(e);
-      }
-    },
-  );
-
-  route.put(
-    '/command-stop',
-    celebrate({
-      body: Joi.object({
-        command: Joi.string().optional(),
-        pid: Joi.number().optional(),
-      }),
-    }),
-    async (req: Request, res: Response, next: NextFunction) => {
-      try {
-        const systemService = Container.get(SystemService);
-        const result = await systemService.stop(req.body);
-        res.send(result);
-      } catch (e) {
-        return next(e);
-      }
-    },
-  );
-
-  route.put(
-    '/data/export',
-    async (req: Request, res: Response, next: NextFunction) => {
-      try {
-        const systemService = Container.get(SystemService);
-        await systemService.exportData(res);
-      } catch (e) {
-        return next(e);
-      }
-    },
-  );
-
-  route.put(
-    '/data/import',
-    upload.single('data'),
-    async (req: Request, res: Response, next: NextFunction) => {
-      try {
-        const systemService = Container.get(SystemService);
-        const result = await systemService.importData();
-        res.send(result);
-      } catch (e) {
-        return next(e);
-      }
-    },
-  );
-
-  route.get(
-    '/log',
-    celebrate({
-      query: {
-        startTime: Joi.string().allow('').optional(),
-        endTime: Joi.string().allow('').optional(),
-        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(),
-      }),
-    }),
-    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) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },

back/api/user.ts

@@ -1,36 +1,18 @@
 import { Router, Request, Response, NextFunction } from 'express';
 import { Container } from 'typedi';
 import { Logger } from 'winston';
+import * as fs from 'fs';
+import config from '../config';
 import UserService from '../services/user';
 import { celebrate, Joi } from 'celebrate';
-import multer from 'multer';
-import path from 'path';
-import { v4 as uuidV4 } from 'uuid';
-import rateLimit from 'express-rate-limit';
-import config from '../config';
+import { getFileContentByName } from '../config/util';
 const route = Router();
 
-const storage = multer.diskStorage({
-  destination: function (req, file, cb) {
-    cb(null, config.uploadPath);
-  },
-  filename: function (req, file, cb) {
-    const ext = path.parse(file.originalname).ext;
-    const key = uuidV4();
-    cb(null, key + ext);
-  },
-});
-const upload = multer({ storage: storage });
-
 export default (app: Router) => {
   app.use('/user', route);
 
   route.post(
     '/login',
-    rateLimit({
-      windowMs: 15 * 60 * 1000,
-      max: 100,
-    }),
     celebrate({
       body: Joi.object({
         username: Joi.string().required(),
@@ -44,6 +26,7 @@ export default (app: Router) => {
         const data = await userService.login({ ...req.body }, req);
         return res.send(data);
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -58,6 +41,7 @@ export default (app: Router) => {
         await userService.logout(req.platform);
         res.send({ code: 200 });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -74,13 +58,11 @@ export default (app: Router) => {
     async (req: Request, res: Response, next: NextFunction) => {
       const logger: Logger = Container.get('logger');
       try {
-        if (process.env.DeployEnv === 'demo') {
-          return res.send({ code: 450, message: '未知错误' });
-        }
         const userService = Container.get(UserService);
         await userService.updateUsernameAndPassword(req.body);
         res.send({ code: 200, message: '更新成功' });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -90,12 +72,11 @@ 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: {
           username: authInfo.username,
-          avatar: authInfo.avatar,
           twoFactorActivated: authInfo.twoFactorActivated,
         },
       });
@@ -114,6 +95,7 @@ export default (app: Router) => {
         const data = await userService.initTwoFactor();
         res.send({ code: 200, data });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -133,6 +115,7 @@ export default (app: Router) => {
         const data = await userService.activeTwoFactor(req.body.code);
         res.send({ code: 200, data });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -147,6 +130,7 @@ export default (app: Router) => {
         const data = await userService.deactiveTwoFactor();
         res.send({ code: 200, data });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -168,6 +152,7 @@ export default (app: Router) => {
         const data = await userService.twoFactorLogin(req.body, req);
         res.send(data);
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -182,6 +167,7 @@ export default (app: Router) => {
         const data = await userService.getLoginLog();
         res.send({ code: 200, data });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -196,6 +182,7 @@ export default (app: Router) => {
         const data = await userService.getNotificationMode();
         res.send({ code: 200, data });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -210,6 +197,7 @@ export default (app: Router) => {
         const result = await userService.updateNotificationMode(req.body);
         res.send(result);
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -230,6 +218,7 @@ export default (app: Router) => {
         await userService.updateUsernameAndPassword(req.body);
         res.send({ code: 200, message: '更新成功' });
       } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },
@@ -244,21 +233,7 @@ export default (app: Router) => {
         const result = await userService.updateNotificationMode(req.body);
         res.send(result);
       } catch (e) {
-        return next(e);
-      }
-    },
-  );
-
-  route.put(
-    '/avatar',
-    upload.single('avatar'),
-    async (req: Request, res: Response, next: NextFunction) => {
-      const logger: Logger = Container.get('logger');
-      try {
-        const userService = Container.get(UserService);
-        const result = await userService.updateAvatar(req.file!.filename);
-        res.send(result);
-      } catch (e) {
+        logger.error('🔥 error: %o', e);
         return next(e);
       }
     },

back/app.ts

@@ -1,27 +1,32 @@
-import './loaders/sentry'
 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/db').default();
-
   await require('./loaders/initFile').default();
 
+  await require('./loaders/sentry').default({ expressApp: app });
+
+  await require('./loaders/db').default();
+
   await require('./loaders/app').default({ expressApp: app });
 
   const server = app
-    .listen(config.port, '0.0.0.0', () => {
-      Logger.debug(`✌️ 后端服务启动成功！`);
-      console.debug(`✌️ 后端服务启动成功！`);
-      process.send?.('ready');
+    .listen(config.port, () => {
+      Logger.info(`
+      ################################################
+      🛡️  Server listening on port: ${config.port} 🛡️
+      ################################################
+    `);
     })
     .on('error', (err) => {
       Logger.error(err);
-      console.error(err);
       process.exit(1);
     });
 

back/config/const.ts

@@ -1,25 +0,0 @@
-export const LOG_END_SYMBOL = '　　　　　';
-
-export const TASK_COMMAND = 'task';
-export const QL_COMMAND = 'ql';
-
-export const TASK_PREFIX = `${TASK_COMMAND} `;
-export const QL_PREFIX = `${QL_COMMAND} `;
-
-export const SAMPLE_FILES = [
-  {
-    title: 'config.sample.sh',
-    value: 'sample/config.sample.sh',
-    target: 'config.sh',
-  },
-  {
-    title: 'notify.js',
-    value: 'sample/notify.js',
-    target: 'data/scripts/sendNotify.js',
-  },
-  {
-    title: 'notify.py',
-    value: 'sample/notify.py',
-    target: 'data/scripts/notify.py',
-  },
-];

back/config/index.ts

@@ -1,49 +1,22 @@
 import dotenv from 'dotenv';
 import path from 'path';
-import { createRandomString } from './share';
+import { createRandomString } from './util';
 
 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, '../');
-  }
-  process.env.QL_DIR = qlHomePath.replace(/\/$/g, '');
-}
+const lastVersionFile = 'http://qn.whyour.cn/version.ts?v=2.12.1';
 
-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/');
-
-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 envFound = dotenv.config();
+const rootPath = process.cwd();
+const dataPath = path.join(rootPath, 'data/');
 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 envFile = path.join(preloadPath, 'env.sh');
-const jsEnvFile = path.join(preloadPath, 'env.js');
-const pyEnvFile = path.join(preloadPath, 'env.py');
-const jsNotifyFile = path.join(preloadPath, 'notify.js');
-const pyNotifyFile = path.join(preloadPath, 'notify.py');
+const envFile = path.join(configPath, 'env.sh');
 const confFile = path.join(configPath, 'config.sh');
 const crontabFile = path.join(configPath, 'crontab.list');
 const authConfigFile = path.join(configPath, 'auth.json');
@@ -51,15 +24,11 @@ const extraFile = path.join(configPath, 'extra.sh');
 const confBakDir = path.join(dataPath, 'config/bak/');
 const sampleFile = path.join(samplePath, 'config.sample.sh');
 const sqliteFile = path.join(samplePath, 'database.sqlite');
-const systemNotifyFile = path.join(preloadPath, 'system-notify.json');
 
 const authError = '错误的用户名密码，请重试';
 const loginFaild = '请先登录!';
 const configString = 'config sample crontab shareCode diy';
-const versionFile = path.join(rootPath, 'version.yaml');
-const dataTgzFile = path.join(tmpPath, 'data.tgz');
-const shareShellFile = path.join(shellPath, 'share.sh');
-const dependenceProxyFile = path.join(configPath, 'dependence-proxy.sh');
+const versionFile = path.join(rootPath, 'src/version.ts');
 
 if (envFound.error) {
   throw new Error("⚠️  Couldn't find .env file  ⚠️");
@@ -69,7 +38,6 @@ export default {
   port: parseInt(process.env.BACK_PORT as string, 10),
   cronPort: parseInt(process.env.CRON_PORT as string, 10),
   publicPort: parseInt(process.env.PUBLIC_PORT as string, 10),
-  updatePort: parseInt(process.env.UPDATE_PORT as string, 10),
   secret: process.env.SECRET || createRandomString(16, 32),
   logs: {
     level: process.env.LOG_LEVEL || 'silly',
@@ -78,11 +46,6 @@ export default {
     prefix: '/api',
   },
   rootPath,
-  tmpPath,
-  dataPath,
-  dataTgzFile,
-  shareShellFile,
-  dependenceProxyFile,
   configString,
   loginFaild,
   authError,
@@ -94,26 +57,16 @@ export default {
   sampleFile,
   confFile,
   envFile,
-  jsEnvFile,
-  pyEnvFile,
-  jsNotifyFile,
-  pyNotifyFile,
   dbPath,
-  uploadPath,
   configPath,
   scriptPath,
-  repoPath,
   samplePath,
   blackFileList: [
     'auth.json',
     'config.sh.sample',
     'cookie.sh',
     'crontab.list',
-    'dependence-proxy.sh',
     'env.sh',
-    'env.js',
-    'env.py',
-    'token.json',
   ],
   writePathList: [configPath, scriptPath],
   bakPath,
@@ -124,16 +77,8 @@ export default {
     '/api/system',
     '/api/user/init',
     '/api/user/notification/init',
-    '/open/user/login',
-    '/open/user/two-factor/login',
-    '/open/system',
-    '/open/user/init',
-    '/open/user/notification/init',
   ],
   versionFile,
   lastVersionFile,
   sqliteFile,
-  sshdPath,
-  systemLogPath,
-  systemNotifyFile,
 };

back/config/serverEnv.ts

@@ -1,28 +0,0 @@
-import { Request, Response } from 'express';
-import pick from 'lodash/pick';
-
-let pickedEnv: Record<string, string>;
-
-function getPickedEnv() {
-  if (pickedEnv) return pickedEnv;
-  const picked = pick(process.env, ['QlBaseUrl', 'DeployEnv', 'QL_DIR']);
-  if (picked.QlBaseUrl) {
-    if (!picked.QlBaseUrl.startsWith('/')) {
-      picked.QlBaseUrl = `/${picked.QlBaseUrl}`;
-    }
-    if (!picked.QlBaseUrl.endsWith('/')) {
-      picked.QlBaseUrl = `${picked.QlBaseUrl}/`;
-    }
-  }
-  pickedEnv = picked as Record<string, string>;
-  return picked;
-}
-
-export function serveEnv(_req: Request, res: Response) {
-  res.type('.js');
-  res.send(
-    Object.entries(getPickedEnv())
-      .map(([k, v]) => `window.__ENV__${k}=${JSON.stringify(v)};`)
-      .join('\n'),
-  );
-}

back/config/share.ts

@@ -1,84 +0,0 @@
-export function createRandomString(min: number, max: number): string {
-  const num = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9'];
-  const english = [
-    'a',
-    'b',
-    'c',
-    'd',
-    'e',
-    'f',
-    'g',
-    'h',
-    'i',
-    'j',
-    'k',
-    'l',
-    'm',
-    'n',
-    'o',
-    'p',
-    'q',
-    'r',
-    's',
-    't',
-    'u',
-    'v',
-    'w',
-    'x',
-    'y',
-    'z',
-  ];
-  const ENGLISH = [
-    'A',
-    'B',
-    'C',
-    'D',
-    'E',
-    'F',
-    'G',
-    'H',
-    'I',
-    'J',
-    'K',
-    'L',
-    'M',
-    'N',
-    'O',
-    'P',
-    'Q',
-    'R',
-    'S',
-    'T',
-    'U',
-    'V',
-    'W',
-    'X',
-    'Y',
-    'Z',
-  ];
-  const special = ['-', '_'];
-  const config = num.concat(english).concat(ENGLISH).concat(special);
-
-  const arr = [];
-  arr.push(getOne(num));
-  arr.push(getOne(english));
-  arr.push(getOne(ENGLISH));
-  arr.push(getOne(special));
-
-  const len = min + Math.floor(Math.random() * (max - min + 1));
-
-  for (let i = 4; i < len; i++) {
-    arr.push(config[Math.floor(Math.random() * config.length)]);
-  }
-
-  const newArr = [];
-  for (let j = 0; j < len; j++) {
-    newArr.push(arr.splice(Math.random() * arr.length, 1)[0]);
-  }
-
-  function getOne(arr: any[]) {
-    return arr[Math.floor(Math.random() * arr.length)];
-  }
-
-  return newArr.join('');
-}

back/config/subscription.ts

@@ -1,46 +0,0 @@
-import { Subscription } from '../data/subscription';
-import isNil from 'lodash/isNil';
-
-export function formatUrl(doc: Subscription) {
-  let url = doc.url;
-  let host = '';
-  if (doc.type === 'private-repo') {
-    if (doc.pull_type === 'ssh-key') {
-      host = doc.url!.replace(/.*\@([^\:]+)\:.*/, '$1');
-      url = doc.url!.replace(host, doc.alias);
-    } else {
-      host = doc.url!.replace(/.*\:\/\/([^\/]+)\/.*/, '$1');
-      const { username, password } = doc.pull_option as any;
-      url = doc.url!.replace(host, `${username}:${password}@${host}`);
-    }
-  }
-  return { url, host };
-}
-
-export function formatCommand(doc: Subscription, url?: string) {
-  let command = `SUB_ID=${doc.id} ql `;
-  let _url = url || formatUrl(doc).url;
-  const {
-    type,
-    whitelist,
-    blacklist,
-    dependences,
-    branch,
-    extensions,
-    proxy,
-    autoAddCron,
-    autoDelCron,
-  } = doc;
-  if (type === 'file') {
-    command += `raw "${_url}" "${proxy || ''}" "${
-      isNil(autoAddCron) ? true : Boolean(autoAddCron)
-    }" "${isNil(autoDelCron) ? true : Boolean(autoDelCron)}"`;
-  } else {
-    command += `repo "${_url}" "${whitelist || ''}" "${blacklist || ''}" "${
-      dependences || ''
-    }" "${branch || ''}" "${extensions || ''}" "${proxy || ''}" "${
-      isNil(autoAddCron) ? true : Boolean(autoAddCron)
-    }" "${isNil(autoDelCron) ? true : Boolean(autoDelCron)}"`;
-  }
-  return command;
-}

back/config/util.ts

@@ -1,37 +1,24 @@
-import * as fs from 'fs/promises';
+import * as fs from 'fs';
 import * as path from 'path';
 import got from 'got';
 import iconv from 'iconv-lite';
-import { exec } from 'child_process';
-import FormData from 'form-data';
-import psTreeFun from 'pstree.remy';
-import { promisify } from 'util';
-import { load } from 'js-yaml';
-import config from './index';
-import { TASK_COMMAND } from './const';
-import Logger from '../loaders/logger';
-import { writeFileWithLock } from '../shared/utils';
 
-export * from './share';
-
-export async function getFileContentByName(fileName: string) {
-  const _exsit = await fileExist(fileName);
-  if (_exsit) {
-    return await fs.readFile(fileName, 'utf8');
+export function getFileContentByName(fileName: string) {
+  if (fs.existsSync(fileName)) {
+    return fs.readFileSync(fileName, 'utf8');
   }
   return '';
 }
 
-export async function getLastModifyFilePath(dir: string) {
+export function getLastModifyFilePath(dir: string) {
   let filePath = '';
 
-  const _exsit = await fileExist(dir);
-  if (_exsit) {
-    const arr = await fs.readdir(dir);
+  if (fs.existsSync(dir)) {
+    const arr = fs.readdirSync(dir);
 
-    arr.forEach(async (item) => {
+    arr.forEach((item) => {
       const fullpath = path.join(dir, item);
-      const stats = await fs.lstat(fullpath);
+      const stats = fs.statSync(fullpath);
       if (stats.isFile()) {
         if (stats.mtimeMs >= 0) {
           filePath = fullpath;
@@ -42,6 +29,91 @@ export async function getLastModifyFilePath(dir: string) {
   return filePath;
 }
 
+export function createRandomString(min: number, max: number): string {
+  const num = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9'];
+  const english = [
+    'a',
+    'b',
+    'c',
+    'd',
+    'e',
+    'f',
+    'g',
+    'h',
+    'i',
+    'j',
+    'k',
+    'l',
+    'm',
+    'n',
+    'o',
+    'p',
+    'q',
+    'r',
+    's',
+    't',
+    'u',
+    'v',
+    'w',
+    'x',
+    'y',
+    'z',
+  ];
+  const ENGLISH = [
+    'A',
+    'B',
+    'C',
+    'D',
+    'E',
+    'F',
+    'G',
+    'H',
+    'I',
+    'J',
+    'K',
+    'L',
+    'M',
+    'N',
+    'O',
+    'P',
+    'Q',
+    'R',
+    'S',
+    'T',
+    'U',
+    'V',
+    'W',
+    'X',
+    'Y',
+    'Z',
+  ];
+  const special = ['-', '_'];
+  const config = num.concat(english).concat(ENGLISH).concat(special);
+
+  const arr = [];
+  arr.push(getOne(num));
+  arr.push(getOne(english));
+  arr.push(getOne(ENGLISH));
+  arr.push(getOne(special));
+
+  const len = min + Math.floor(Math.random() * (max - min + 1));
+
+  for (let i = 4; i < len; i++) {
+    arr.push(config[Math.floor(Math.random() * config.length)]);
+  }
+
+  const newArr = [];
+  for (let j = 0; j < len; j++) {
+    newArr.push(arr.splice(Math.random() * arr.length, 1)[0]);
+  }
+
+  function getOne(arr: any[]) {
+    return arr[Math.floor(Math.random() * arr.length)];
+  }
+
+  return newArr.join('');
+}
+
 export function getToken(req: any) {
   const { authorization = '' } = req.headers;
   if (authorization && authorization.split(' ')[0] === 'Bearer') {
@@ -62,8 +134,7 @@ export async function getNetIp(req: any) {
       ...req.ips,
       req.socket.remoteAddress,
     ]),
-  ].filter(Boolean);
-
+  ];
   let ip = ipArray[0];
 
   if (ipArray.length > 1) {
@@ -84,42 +155,34 @@ export async function getNetIp(req: any) {
       break;
     }
   }
-
   ip = ip.substr(ip.lastIndexOf(':') + 1, ip.length);
   if (ip.includes('127.0') || ip.includes('192.168') || ip.includes('10.7')) {
     ip = '';
   }
-
-  if (!ip) {
-    return { address: `获取失败`, ip };
-  }
-
   try {
-    const csdnApi = got
-      .get(`https://searchplugin.csdn.net/api/v1/ip/get?ip=${ip}`, {
-        timeout: 10000,
-        retry: 0,
-      })
+    const baiduApi = got
+      .get(`https://www.cip.cc/${ip}`, { timeout: 10000, retry: 0 })
       .text();
-    const pconlineApi = got
+    const ipApi = 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;
+    const [data, ipApiBody] = await await Promise.all<any>([baiduApi, ipApi]);
+
+    const ipRegx = /.*IP	:(.*)\n/;
+    const addrRegx = /.*数据二	:(.*)\n/;
+    if (data && ipRegx.test(data) && addrRegx.test(data)) {
+      const ip = data.match(ipRegx)[1];
+      const addr = data.match(addrRegx)[1];
+      return { address: addr, ip };
+    } else if (ipApiBody) {
+      const { addr, ip } = JSON.parse(iconv.decode(ipApiBody, 'GBK'));
+      return { address: `${addr}`, ip };
+    } else {
+      return { address: `获取失败`, ip };
     }
-    return { address, ip };
   } catch (error) {
     return { address: `获取失败`, ip };
   }
@@ -146,14 +209,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 (system === 'android' || system === 'ios' || system === 'openharmony' || testUa(/mobile/g)) {
+  } else if (system === 'android' || system === 'ios' || testUa(/mobile/g)) {
     platform = 'mobile';
   }
 
@@ -161,29 +222,14 @@ export function getPlatform(userAgent: string): 'mobile' | 'desktop' {
 }
 
 export async function fileExist(file: any) {
-  try {
-    await fs.access(file);
-    return true;
-  } catch (error) {
-    return false;
-  }
-}
-
-export async function createFile(file: string, data: string = '') {
-  await fs.mkdir(path.dirname(file), { recursive: true });
-  await writeFileWithLock(file, data);
-}
-
-export async function handleLogPath(
-  logPath: string,
-  data: string = '',
-): Promise<string> {
-  const absolutePath = path.resolve(config.logPath, logPath);
-  const logFileExist = await fileExist(absolutePath);
-  if (!logFileExist) {
-    await createFile(absolutePath, data);
-  }
-  return absolutePath;
+  return new Promise((resolve) => {
+    try {
+      fs.accessSync(file);
+      resolve(true);
+    } catch (error) {
+      resolve(false);
+    }
+  });
 }
 
 export async function concurrentRun(
@@ -222,314 +268,3 @@ export async function concurrentRun(
 
   return replyList;
 }
-
-enum FileType {
-  'directory',
-  'file',
-}
-
-interface IFile {
-  title: string;
-  key: string;
-  type: 'directory' | 'file';
-  parent: string;
-  mtime: number;
-  size?: number;
-  children?: IFile[];
-}
-
-export function dirSort(a: IFile, b: IFile): number {
-  if (a.type === 'file' && b.type === 'file') {
-    return b.mtime - a.mtime;
-  } else if (a.type === 'directory' && b.type === 'directory') {
-    return a.title.localeCompare(b.title);
-  } else {
-    return a.type === 'directory' ? -1 : 1;
-  }
-}
-
-export async function readDirs(
-  dir: string,
-  baseDir: string = '',
-  blacklist: string[] = [],
-  sort: (a: IFile, b: IFile) => number = dirSort,
-): Promise<IFile[]> {
-  const relativePath = path.relative(baseDir, dir);
-  const files = await fs.readdir(dir);
-  const result: IFile[] = [];
-
-  for (const file of files) {
-    const subPath = path.join(dir, file);
-    const stats = await fs.lstat(subPath);
-    const key = path.join(relativePath, file);
-
-    if (blacklist.includes(file) || stats.isSymbolicLink()) {
-      continue;
-    }
-
-    if (stats.isDirectory()) {
-      const children = await readDirs(subPath, baseDir, blacklist, sort);
-      result.push({
-        title: file,
-        key,
-        type: 'directory',
-        parent: relativePath,
-        mtime: stats.mtime.getTime(),
-        children: children.sort(sort),
-      });
-    } else {
-      result.push({
-        title: file,
-        type: 'file',
-        key,
-        parent: relativePath,
-        size: stats.size,
-        mtime: stats.mtime.getTime(),
-      });
-    }
-  }
-
-  return result.sort(sort);
-}
-
-export async function readDir(
-  dir: string,
-  baseDir: string = '',
-  blacklist: string[] = [],
-) {
-  const relativePath = path.relative(baseDir, dir);
-  const files = await fs.readdir(dir);
-  const result: any = files
-    .filter((x) => !blacklist.includes(x))
-    .map(async (file: string) => {
-      const subPath = path.join(dir, file);
-      const stats = await fs.lstat(subPath);
-      const key = path.join(relativePath, file);
-      return {
-        title: file,
-        type: stats.isDirectory() ? 'directory' : 'file',
-        key,
-        parent: relativePath,
-      };
-    });
-  return result;
-}
-
-export async function promiseExec(command: string): Promise<string> {
-  try {
-    const { stderr, stdout } = await promisify(exec)(command, {
-      maxBuffer: 200 * 1024 * 1024,
-      encoding: 'utf8',
-    });
-    return stdout || stderr;
-  } catch (error) {
-    return JSON.stringify(error);
-  }
-}
-
-export async function promiseExecSuccess(command: string): Promise<string> {
-  try {
-    const { stdout } = await promisify(exec)(command, {
-      maxBuffer: 200 * 1024 * 1024,
-      encoding: 'utf8',
-    });
-    return stdout || '';
-  } catch (error) {
-    return '';
-  }
-}
-
-export function parseHeaders(headers: string) {
-  if (!headers) return {};
-
-  const parsed: any = {};
-  let key;
-  let val;
-  let i;
-
-  headers &&
-    headers.split('\n').forEach(function parser(line) {
-      i = line.indexOf(':');
-      key = line.substring(0, i).trim().toLowerCase();
-      val = line.substring(i + 1).trim();
-
-      if (!key) {
-        return;
-      }
-
-      parsed[key] = parsed[key] ? parsed[key] + ', ' + val : val;
-    });
-
-  return parsed;
-}
-
-function parseString(
-  input: string,
-  valueFormatFn?: (v: string) => string,
-): Record<string, string> {
-  const regex = /(\w+):\s*((?:(?!\n\w+:).)*)/g;
-  const matches: Record<string, string> = {};
-
-  let match;
-  while ((match = regex.exec(input)) !== null) {
-    const [, key, value] = match;
-    const _key = key.trim();
-    if (!_key || matches[_key]) {
-      continue;
-    }
-
-    let _value = value.trim();
-
-    try {
-      _value = valueFormatFn ? valueFormatFn(_value) : _value;
-      const jsonValue = JSON.parse(_value);
-      matches[_key] = jsonValue;
-    } catch (error) {
-      matches[_key] = _value;
-    }
-  }
-
-  return matches;
-}
-
-export function parseBody(
-  body: string,
-  contentType:
-    | 'application/json'
-    | 'multipart/form-data'
-    | 'application/x-www-form-urlencoded'
-    | 'text/plain',
-  valueFormatFn?: (v: string) => string,
-) {
-  if (contentType === 'text/plain' || !body) {
-    return valueFormatFn && body ? valueFormatFn(body) : body;
-  }
-
-  const parsed = parseString(body, valueFormatFn);
-
-  switch (contentType) {
-    case 'multipart/form-data':
-      return Object.keys(parsed).reduce((p, c) => {
-        p.append(c, parsed[c]);
-        return p;
-      }, new FormData());
-    case 'application/x-www-form-urlencoded':
-      return Object.keys(parsed).reduce((p, c) => {
-        return p ? `${p}&${c}=${parsed[c]}` : `${c}=${parsed[c]}`;
-      });
-  }
-
-  return parsed;
-}
-
-export function psTree(pid: number): Promise<number[]> {
-  return new Promise((resolve, reject) => {
-    psTreeFun(pid, (err: any, pids: number[]) => {
-      if (err) {
-        reject(err);
-      }
-      resolve(pids.filter((x) => !isNaN(x)));
-    });
-  });
-}
-
-export async function killTask(pid: number) {
-  const pids = await psTree(pid);
-
-  if (pids.length) {
-    try {
-      [pid, ...pids].reverse().forEach((x) => {
-        process.kill(x, 15);
-      });
-    } catch (error) {}
-  } else {
-    process.kill(pid, 2);
-  }
-}
-
-export async function getPid(cmd: string) {
-  const taskCommand = `ps -eo pid,command | grep "${cmd}" | grep -v grep | awk '{print $1}' | head -1 | xargs echo -n`;
-  const pid = await promiseExec(taskCommand);
-  return pid ? Number(pid) : undefined;
-}
-
-interface IVersion {
-  version: string;
-  changeLogLink: string;
-  changeLog: string;
-  publishTime: string;
-}
-
-export async function parseVersion(path: string): Promise<IVersion> {
-  return load(await fs.readFile(path, 'utf8')) as IVersion;
-}
-
-export function parseContentVersion(content: string): IVersion {
-  return load(content) as IVersion;
-}
-
-export async function getUniqPath(
-  command: string,
-  id: string,
-): Promise<string> {
-  let suffix = '';
-  if (/^\d+$/.test(id)) {
-    suffix = `_${id}`;
-  }
-
-  let items = command.split(/ +/);
-
-  const maxTimeCommandIndex = items.findIndex((x) => x === '-m');
-  if (maxTimeCommandIndex !== -1) {
-    items = items.slice(maxTimeCommandIndex + 2);
-  }
-
-  let str = items[0];
-  if (items[0] === TASK_COMMAND) {
-    str = items[1];
-  }
-
-  const dotIndex = str.lastIndexOf('.');
-
-  if (dotIndex !== -1) {
-    str = str.slice(0, dotIndex);
-  }
-
-  const slashIndex = str.lastIndexOf('/');
-
-  let tempStr = '';
-  if (slashIndex !== -1) {
-    tempStr = str.slice(0, slashIndex);
-    const _slashIndex = tempStr.lastIndexOf('/');
-    if (_slashIndex !== -1) {
-      tempStr = tempStr.slice(_slashIndex + 1);
-    }
-    str = `${tempStr}_${str.slice(slashIndex + 1)}`;
-  }
-
-  return `${str}${suffix}`;
-}
-
-export function safeJSONParse(value?: string) {
-  if (!value) {
-    return {};
-  }
-
-  try {
-    return JSON.parse(value);
-  } catch (error) {
-    Logger.error('[JSON.parse失败]', error);
-    return {};
-  }
-}
-
-export async function rmPath(path: string) {
-  try {
-    const _exsit = await fileExist(path);
-    if (_exsit) {
-      await fs.rm(path, { force: true, recursive: true, maxRetries: 5 });
-    }
-  } catch (error) {
-    Logger.error('[rmPath失败]', error);
-  }
-}

back/data/auth.ts

@@ -0,0 +1,38 @@
+import { sequelize } from '.';
+import { DataTypes, Model, ModelDefined } from 'sequelize';
+
+export class AuthInfo {
+  ip?: string;
+  type: AuthDataType;
+  info?: any;
+  id?: number;
+
+  constructor(options: AuthInfo) {
+    this.ip = options.ip;
+    this.info = options.info;
+    this.type = options.type;
+    this.id = options.id;
+  }
+}
+
+export enum LoginStatus {
+  'success',
+  'fail',
+}
+
+export enum AuthDataType {
+  'loginLog' = 'loginLog',
+  'authToken' = 'authToken',
+  'notification' = 'notification',
+  'removeLogFrequency' = 'removeLogFrequency',
+}
+
+interface AuthInstance extends Model<AuthInfo, AuthInfo>, AuthInfo {}
+export const AuthModel = sequelize.define<AuthInstance>('Auth', {
+  ip: DataTypes.STRING,
+  type: DataTypes.STRING,
+  info: {
+    type: DataTypes.JSON,
+    allowNull: true,
+  },
+});

back/data/cron.ts

@@ -17,19 +17,15 @@ export class Crontab {
   labels?: string[];
   last_running_time?: number;
   last_execution_time?: number;
-  sub_id?: number;
-  extra_schedules?: Array<{ schedule: string }>;
-  task_before?: string;
-  task_after?: string;
 
   constructor(options: Crontab) {
     this.name = options.name;
-    this.command = options.command.trim();
+    this.command = options.command;
     this.schedule = options.schedule;
     this.saved = options.saved;
     this.id = options.id;
     this.status =
-      typeof options.status === 'number' && CrontabStatus[options.status]
+      options.status && CrontabStatus[options.status]
         ? options.status
         : CrontabStatus.idle;
     this.timestamp = new Date().toString();
@@ -38,24 +34,20 @@ export class Crontab {
     this.isDisabled = options.isDisabled || 0;
     this.log_path = options.log_path || '';
     this.isPinned = options.isPinned || 0;
-    this.labels = options.labels || [];
+    this.labels = options.labels || [''];
     this.last_running_time = options.last_running_time || 0;
     this.last_execution_time = options.last_execution_time || 0;
-    this.sub_id = options.sub_id;
-    this.extra_schedules = options.extra_schedules;
-    this.task_before = options.task_before;
-    this.task_after = options.task_after;
   }
 }
 
 export enum CrontabStatus {
-  'running' = 0,
-  'queued' = 0.5,
-  'idle' = 1,
+  'running',
+  'idle',
   'disabled',
+  'queued',
 }
 
-export interface CronInstance extends Model<Crontab, Crontab>, Crontab { }
+interface CronInstance extends Model<Crontab, Crontab>, Crontab {}
 export const CrontabModel = sequelize.define<CronInstance>('Crontab', {
   name: {
     unique: 'compositeIndex',
@@ -80,8 +72,4 @@ export const CrontabModel = sequelize.define<CronInstance>('Crontab', {
   labels: DataTypes.JSON,
   last_running_time: DataTypes.NUMBER,
   last_execution_time: DataTypes.NUMBER,
-  sub_id: { type: DataTypes.NUMBER, allowNull: true },
-  extra_schedules: DataTypes.JSON,
-  task_before: DataTypes.STRING,
-  task_after: DataTypes.STRING,
 });

back/data/cronView.ts

@@ -1,62 +0,0 @@
-import { sequelize } from '.';
-import { DataTypes, Model } from 'sequelize';
-
-export enum CronViewType {
-  '系统' = 1,
-  '个人',
-}
-
-interface SortType {
-  type: 'ASC' | 'DESC';
-  value: string;
-}
-
-interface FilterType {
-  property: string;
-  operation: string;
-  value: string;
-}
-
-export class CrontabView {
-  name?: string;
-  id?: number;
-  position?: number;
-  isDisabled?: 1 | 0;
-  filters?: FilterType[];
-  sorts?: SortType[];
-  filterRelation?: 'and' | 'or';
-  type?: CronViewType;
-
-  constructor(options: CrontabView) {
-    this.name = options.name;
-    this.id = options.id;
-    this.position = options.position;
-    this.isDisabled = options.isDisabled || 0;
-    this.filters = options.filters;
-    this.sorts = options.sorts;
-    this.filterRelation = options.filterRelation;
-    this.type = options.type || CronViewType.个人;
-  }
-}
-
-export interface CronViewInstance
-  extends Model<CrontabView, CrontabView>,
-    CrontabView {}
-export const CrontabViewModel = sequelize.define<CronViewInstance>(
-  'CrontabView',
-  {
-    name: {
-      unique: 'name',
-      type: DataTypes.STRING,
-    },
-    position: DataTypes.NUMBER,
-    isDisabled: DataTypes.NUMBER,
-    filters: DataTypes.JSON,
-    sorts: DataTypes.JSON,
-    filterRelation: {
-      type: DataTypes.STRING,
-      allowNull: true,
-    },
-    type: DataTypes.NUMBER,
-  },
-);

back/data/dependence.ts

@@ -4,21 +4,18 @@ import { DataTypes, Model, ModelDefined } from 'sequelize';
 export class Dependence {
   timestamp?: string;
   id?: number;
-  status: DependenceStatus;
-  type: DependenceTypes;
-  name: string;
+  status?: DependenceStatus;
+  type?: DependenceTypes;
+  name?: number;
   log?: string[];
   remark?: string;
 
   constructor(options: Dependence) {
     this.id = options.id;
-    this.status =
-      typeof options.status === 'number' && DependenceStatus[options.status]
-        ? options.status
-        : DependenceStatus.queued;
+    this.status = options.status || DependenceStatus.installing;
     this.type = options.type || DependenceTypes.nodejs;
     this.timestamp = new Date().toString();
-    this.name = options.name.trim();
+    this.name = options.name;
     this.log = options.log || [];
     this.remark = options.remark || '';
   }
@@ -31,8 +28,6 @@ export enum DependenceStatus {
   'removing',
   'removed',
   'removeFailed',
-  'queued',
-  'cancelled',
 }
 
 export enum DependenceTypes {
@@ -42,30 +37,18 @@ export enum DependenceTypes {
 }
 
 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 {
-  '@',
-  '==',
-  '=',
+  'npm i -g --force',
+  'pip3 install',
+  'apk add --no-cache -f',
 }
 
 export enum unInstallDependenceCommandTypes {
-  'pnpm remove -g',
-  'pip3 uninstall --disable-pip-version-check --root-user-action=ignore -y',
-  'apk del',
+  'npm uninstall -g --force',
+  'pip3 uninstall -y',
+  'apk del -f',
 }
 
-export interface DependenceInstance
+interface DependenceInstance
   extends Model<Dependence, Dependence>,
     Dependence {}
 export const DependenceModel = sequelize.define<DependenceInstance>(

back/data/env.ts

@@ -13,10 +13,7 @@ export class Env {
   constructor(options: Env) {
     this.value = options.value;
     this.id = options.id;
-    this.status =
-      typeof options.status === 'number' && EnvStatus[options.status]
-        ? options.status
-        : EnvStatus.normal;
+    this.status = options.status || EnvStatus.normal;
     this.timestamp = new Date().toString();
     this.position = options.position;
     this.name = options.name;
@@ -29,12 +26,9 @@ export enum EnvStatus {
   'disabled',
 }
 
-export const maxPosition = 9000000000000000;
-export const initPosition = 4500000000000000;
-export const stepPosition = 10000000000;
-export const minPosition = 100;
+export const initEnvPosition = 9999999999;
 
-export interface EnvInstance extends Model<Env, Env>, Env {}
+interface EnvInstance extends Model<Env, Env>, Env {}
 export const EnvModel = sequelize.define<EnvInstance>('Env', {
   value: { type: DataTypes.STRING, unique: 'compositeIndex' },
   timestamp: DataTypes.STRING,

back/data/index.ts

@@ -1,23 +1,15 @@
-import { Sequelize, Transaction } from 'sequelize';
+import { Sequelize } from 'sequelize';
 import config from '../config/index';
-import { join } from 'path';
 
 export const sequelize = new Sequelize({
   dialect: 'sqlite',
-  storage: join(config.dbPath, 'database.sqlite'),
+  storage: `${config.dbPath}database.sqlite`,
   logging: false,
-  retry: {
-    max: 10,
-    match: ['SQLITE_BUSY: database is locked'],
-  },
   pool: {
-    max: 5,
-    min: 2,
+    max: 6,
+    min: 0,
     idle: 30000,
-    acquire: 30000,
-    evict: 10000,
   },
-  transactionType: Transaction.TYPES.IMMEDIATE,
 });
 
 export type ResponseType<T> = { code: number; data?: T; message?: string };

back/data/notify.ts

@@ -1,27 +1,16 @@
-import { IncomingHttpHeaders } from 'http';
-
 export enum NotificationMode {
   'gotify' = 'gotify',
   'goCqHttpBot' = 'goCqHttpBot',
   'serverChan' = 'serverChan',
   'pushDeer' = 'pushDeer',
   'bark' = 'bark',
-  'chat' = 'chat',
   'telegramBot' = 'telegramBot',
   'dingtalkBot' = 'dingtalkBot',
   'weWorkBot' = 'weWorkBot',
   'weWorkApp' = 'weWorkApp',
-  '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 {
@@ -46,22 +35,13 @@ export class ServerChanNotification extends NotificationBaseInfo {
 
 export class PushDeerNotification extends NotificationBaseInfo {
   public pushDeerKey = '';
-  public pushDeerUrl = '';
-}
-
-export class ChatNotification extends NotificationBaseInfo {
-  public chatUrl = '';
-  public chatToken = '';
 }
 
 export class BarkNotification extends NotificationBaseInfo {
   public barkPush = '';
-  public barkIcon = 'https://qn.whyour.cn/logo.png';
+  public barkIcon = 'http://qn.whyour.cn/logo.png';
   public barkSound = '';
   public barkGroup = 'qinglong';
-  public barkLevel = 'active';
-  public barkUrl = '';
-  public barkArchive=""
 }
 
 export class TelegramBotNotification extends NotificationBaseInfo {
@@ -70,7 +50,7 @@ export class TelegramBotNotification extends NotificationBaseInfo {
   public telegramBotProxyHost = '';
   public telegramBotProxyPort = '';
   public telegramBotProxyAuth = '';
-  public telegramBotApiHost = 'https://api.telegram.org';
+  public telegramBotApiHost = 'api.telegram.org';
 }
 
 export class DingtalkBotNotification extends NotificationBaseInfo {
@@ -80,18 +60,10 @@ export class DingtalkBotNotification extends NotificationBaseInfo {
 
 export class WeWorkBotNotification extends NotificationBaseInfo {
   public weWorkBotKey = '';
-  public weWorkOrigin = '';
 }
 
 export class WeWorkAppNotification extends NotificationBaseInfo {
   public weWorkAppKey = '';
-  public weWorkOrigin = '';
-}
-
-export class AibotkNotification extends NotificationBaseInfo {
-  public aibotkKey: string = '';
-  public aibotkType: 'room' | 'contact' = 'room';
-  public aibotkName: string = '';
 }
 
 export class IGotNotification extends NotificationBaseInfo {
@@ -101,17 +73,6 @@ 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 {
@@ -120,63 +81,16 @@ export class EmailNotification extends NotificationBaseInfo {
   public emailPass: string = '';
 }
 
-export class PushMeNotification extends NotificationBaseInfo {
-  public pushMeKey: string = '';
-  public pushMeUrl: string = '';
-}
-
-export class ChronocatNotification extends NotificationBaseInfo {
-  public chronocatURL: string = '';
-  public chronocatQQ: string = '';
-  public chronocatToken: string = '';
-}
-
-export class WebhookNotification extends NotificationBaseInfo {
-  public webhookHeaders: string = '';
-  public webhookBody: string = '';
-  public webhookUrl: string = '';
-  public webhookMethod: 'GET' | 'POST' | 'PUT' = 'GET';
-  public webhookContentType:
-    | 'application/json'
-    | 'multipart/form-data'
-    | 'application/x-www-form-urlencoded' = 'application/json';
-}
-
-export class LarkNotification extends NotificationBaseInfo {
-  public larkKey = '';
-}
-
-export class NtfyNotification extends NotificationBaseInfo {
-  public ntfyUrl = '';
-  public ntfyTopic = '';
-  public ntfyPriority = '';
-}
-
-export class WxPusherBotNotification extends NotificationBaseInfo {
-  public wxPusherBotAppToken = '';
-  public wxPusherBotTopicIds = '';
-  public wxPusherBotUids = '';
-}
-
 export interface NotificationInfo
   extends GoCqHttpBotNotification,
     GotifyNotification,
     ServerChanNotification,
     PushDeerNotification,
-    ChatNotification,
     BarkNotification,
     TelegramBotNotification,
     DingtalkBotNotification,
     WeWorkBotNotification,
     WeWorkAppNotification,
-    AibotkNotification,
     IGotNotification,
     PushPlusNotification,
-    WePlusBotNotification,
-    EmailNotification,
-    PushMeNotification,
-    WebhookNotification,
-    ChronocatNotification,
-    LarkNotification,
-    NtfyNotification,
-    WxPusherBotNotification {}
+    EmailNotification {}

back/data/open.ts

@@ -24,9 +24,16 @@ 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 enum CrontabStatus {
+  'running',
+  'idle',
+  'disabled',
+  'queued',
+}
+
+interface AppInstance extends Model<App, App>, App {}
 export const AppModel = sequelize.define<AppInstance>('App', {
   name: { type: DataTypes.STRING, unique: 'name' },
   scopes: DataTypes.JSON,

back/data/sock.ts

@@ -13,10 +13,5 @@ export class SockMessage {
 export type SockMessageType =
   | 'ping'
   | 'installDependence'
-  | 'uninstallDependence'
   | 'updateSystemVersion'
-  | 'manuallyRunScript'
-  | 'runSubscriptionEnd'
-  | 'reloadSystem'
-  | 'updateNodeMirror'
-  | 'updateLinuxMirror';
+  | 'manuallyRunScript';

back/data/subscription.ts

@@ -1,115 +0,0 @@
-import { sequelize } from '.';
-import { DataTypes, Model, ModelDefined } from 'sequelize';
-import { SimpleIntervalSchedule } from 'toad-scheduler';
-
-type SimpleIntervalScheduleUnit = keyof SimpleIntervalSchedule;
-export class Subscription {
-  id?: number;
-  name?: string;
-  type?: 'public-repo' | 'private-repo' | 'file';
-  schedule_type?: 'crontab' | 'interval';
-  schedule?: string;
-  interval_schedule?: { type: SimpleIntervalScheduleUnit; value: number };
-  url?: string;
-  whitelist?: string;
-  blacklist?: string;
-  dependences?: string;
-  branch?: string;
-  status?: SubscriptionStatus;
-  pull_type?: 'ssh-key' | 'user-pwd';
-  pull_option?:
-    | { private_key: string }
-    | { username: string; password: string };
-  pid?: number;
-  is_disabled?: 1 | 0;
-  log_path?: string;
-  alias: string;
-  command?: string;
-  extensions?: string;
-  sub_before?: string;
-  sub_after?: string;
-  proxy?: string;
-  autoAddCron?: 1 | 0;
-  autoDelCron?: 1 | 0;
-
-  constructor(options: Subscription) {
-    this.id = options.id;
-    this.name = options.name || options.alias;
-    this.type = options.type;
-    this.schedule = options.schedule;
-    this.status = this.status =
-      typeof options.status === 'number' && SubscriptionStatus[options.status]
-        ? options.status
-        : SubscriptionStatus.idle;
-    this.url = options.url;
-    this.whitelist = options.whitelist;
-    this.blacklist = options.blacklist;
-    this.dependences = options.dependences;
-    this.branch = options.branch;
-    this.pull_type = options.pull_type;
-    this.pull_option = options.pull_option;
-    this.pid = options.pid;
-    this.is_disabled = options.is_disabled;
-    this.log_path = options.log_path;
-    this.schedule_type = options.schedule_type;
-    this.alias = options.alias;
-    this.interval_schedule = options.interval_schedule;
-    this.extensions = options.extensions;
-    this.sub_before = options.sub_before;
-    this.sub_after = options.sub_after;
-    this.proxy = options.proxy;
-    this.autoAddCron = options.autoAddCron ? 1 : 0;
-    this.autoDelCron = options.autoDelCron ? 1 : 0;
-  }
-}
-
-export enum SubscriptionStatus {
-  'running',
-  'idle',
-  'disabled',
-  'queued',
-}
-
-export interface SubscriptionInstance
-  extends Model<Subscription, Subscription>,
-    Subscription {}
-export const SubscriptionModel = sequelize.define<SubscriptionInstance>(
-  'Subscription',
-  {
-    name: {
-      unique: 'compositeIndex',
-      type: DataTypes.STRING,
-    },
-    url: {
-      unique: 'compositeIndex',
-      type: DataTypes.STRING,
-    },
-    schedule: {
-      unique: 'compositeIndex',
-      type: DataTypes.STRING,
-    },
-    interval_schedule: {
-      unique: 'compositeIndex',
-      type: DataTypes.JSON,
-    },
-    type: DataTypes.STRING,
-    whitelist: DataTypes.STRING,
-    blacklist: DataTypes.STRING,
-    status: DataTypes.NUMBER,
-    dependences: DataTypes.STRING,
-    extensions: DataTypes.STRING,
-    sub_before: DataTypes.STRING,
-    sub_after: DataTypes.STRING,
-    branch: DataTypes.STRING,
-    pull_type: DataTypes.STRING,
-    pull_option: DataTypes.JSON,
-    pid: DataTypes.NUMBER,
-    is_disabled: DataTypes.NUMBER,
-    log_path: DataTypes.STRING,
-    schedule_type: DataTypes.STRING,
-    alias: { type: DataTypes.STRING, unique: 'alias' },
-    proxy: { type: DataTypes.STRING, allowNull: true },
-    autoAddCron: { type: DataTypes.NUMBER, allowNull: true },
-    autoDelCron: { type: DataTypes.NUMBER, allowNull: true },
-  },
-);

back/data/system.ts

@@ -1,81 +0,0 @@
-import { sequelize } from '.';
-import { DataTypes, Model, ModelDefined } from 'sequelize';
-import { NotificationInfo } from './notify';
-
-export class SystemInfo {
-  ip?: string;
-  type: AuthDataType;
-  info?: SystemModelInfo;
-  id?: number;
-
-  constructor(options: SystemInfo) {
-    this.ip = options.ip;
-    this.info = options.info;
-    this.type = options.type;
-    this.id = options.id;
-  }
-}
-
-export enum LoginStatus {
-  'success',
-  'fail',
-}
-
-export enum AuthDataType {
-  'loginLog' = 'loginLog',
-  'authToken' = 'authToken',
-  'notification' = 'notification',
-  'removeLogFrequency' = 'removeLogFrequency',
-  'systemConfig' = 'systemConfig',
-  'authConfig' = 'authConfig',
-}
-
-export interface SystemConfigInfo {
-  logRemoveFrequency?: number;
-  cronConcurrency?: number;
-  dependenceProxy?: string;
-  nodeMirror?: string;
-  pythonMirror?: string;
-  linuxMirror?: string;
-}
-
-export interface LoginLogInfo {
-  timestamp?: number;
-  address?: string;
-  ip?: string;
-  platform?: string;
-  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 &
-  Partial<AuthInfo>;
-
-export interface SystemInstance
-  extends Model<SystemInfo, SystemInfo>,
-    SystemInfo {}
-export const SystemModel = sequelize.define<SystemInstance>('Auth', {
-  ip: DataTypes.STRING,
-  type: DataTypes.STRING,
-  info: {
-    type: DataTypes.JSON,
-    allowNull: true,
-  },
-});

back/index.d.ts

@@ -3,5 +3,3 @@ declare namespace Express {
     platform: 'desktop' | 'mobile';
   }
 }
-
-declare module 'pstree.remy';

back/loaders/app.ts

@@ -1,29 +1,22 @@
 import expressLoader from './express';
-import depInjectorLoader from './depInjector';
+import dependencyInjectorLoader from './dependencyInjector';
 import Logger from './logger';
 import initData from './initData';
 import { Application } from 'express';
 import linkDeps from './deps';
-import initTask from './initTask';
 
 export default async ({ expressApp }: { expressApp: Application }) => {
-  depInjectorLoader();
-  Logger.info('✌️ Dependency loaded');
-  console.log('✌️ Dependency loaded');
+  await dependencyInjectorLoader({
+    models: [],
+  });
+  Logger.info('✌️ Dependency Injector loaded');
+
+  await expressLoader({ app: expressApp });
+  Logger.info('✌️ Express loaded');
 
   await initData();
-  Logger.info('✌️ Init data loaded');
-  console.log('✌️ Init data loaded');
+  Logger.info('✌️ init data loaded');
 
   await linkDeps();
-  Logger.info('✌️ Link deps loaded');
-  console.log('✌️ Link deps loaded');
-
-  initTask();
-  Logger.info('✌️ Init task loaded');
-  console.log('✌️ Init task loaded');
-
-  expressLoader({ app: expressApp });
-  Logger.info('✌️ Express loaded');
-  console.log('✌️ Express loaded');
+  Logger.info('✌️ link deps');
 };

back/loaders/db.ts

@@ -5,59 +5,26 @@ 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 { AuthModel } from '../data/auth';
 import { sequelize } from '../data';
+import { fileExist } from '../config/util';
+import config from '../config';
 
 export default async () => {
   try {
     await CrontabModel.sync();
     await DependenceModel.sync();
     await AppModel.sync();
-    await SystemModel.sync();
+    await AuthModel.sync();
     await EnvModel.sync();
-    await SubscriptionModel.sync();
-    await CrontabViewModel.sync();
+    await sequelize.sync();
 
-    // 初始化新增字段
-    try {
-      await sequelize.query(
-        'alter table CrontabViews add column filterRelation VARCHAR(255)',
-      );
-    } catch (error) {}
-    try {
-      await sequelize.query(
-        'alter table Subscriptions add column proxy VARCHAR(255)',
-      );
-    } catch (error) {}
-    try {
-      await sequelize.query('alter table CrontabViews add column type NUMBER');
-    } catch (error) {}
-    try {
-      await sequelize.query(
-        'alter table Subscriptions add column autoAddCron NUMBER',
-      );
-    } catch (error) {}
-    try {
-      await sequelize.query(
-        'alter table Subscriptions add column autoDelCron NUMBER',
-      );
-    } catch (error) {}
-    try {
-      await sequelize.query('alter table Crontabs add column sub_id NUMBER');
-    } catch (error) { }
-    try {
-      await sequelize.query('alter table Crontabs add column extra_schedules JSON');
-    } catch (error) { }
-    try {
-      await sequelize.query('alter table Crontabs add column task_before TEXT');
-    } catch (error) { }
-    try {
-      await sequelize.query('alter table Crontabs add column task_after TEXT');
-    } catch (error) { }
+    // try {
+    //   const queryInterface = sequelize.getQueryInterface();
+    //   await queryInterface.addIndex('Crontabs', ['command'], { unique: true });
+    //   await queryInterface.addIndex('Envs', ['name', 'value'], { unique: true });
+    //   await queryInterface.addIndex('Apps', ['name'], { unique: true });
+    // } catch (error) { }
 
     // 2.10-2.11 升级
     const cronDbFile = path.join(config.rootPath, 'db/crontab.db');
@@ -75,7 +42,7 @@ export default async () => {
     const dependenceCount = await DependenceModel.count();
     const envCount = await EnvModel.count();
     const appCount = await AppModel.count();
-    const authCount = await SystemModel.count();
+    const authCount = await AuthModel.count();
     if (crondbExist && cronCount === 0) {
       const cronDb = new DataStore({
         filename: cronDbFile,
@@ -127,14 +94,13 @@ export default async () => {
       });
       authDb.persistence.compactDatafile();
       authDb.find({}).exec(async (err, docs) => {
-        await SystemModel.bulkCreate(docs, { ignoreDuplicates: true });
+        await AuthModel.bulkCreate(docs, { ignoreDuplicates: true });
       });
     }
 
-    console.log('✌️ DB loaded');
     Logger.info('✌️ DB loaded');
   } catch (error) {
-    console.error('✌️ DB load failed');
-    Logger.error(error);
+    Logger.info('✌️ DB load failed');
+    Logger.info(error);
   }
 };

back/loaders/dependencyInjector.ts

@@ -1,8 +1,12 @@
 import { Container } from 'typedi';
 import LoggerInstance from './logger';
 
-export default () => {
+export default ({ models }: { models: { name: string; model: any }[] }) => {
   try {
+    models.forEach((m) => {
+      Container.set(m.name, m.model);
+    });
+
     Container.set('logger', LoggerInstance);
   } catch (e) {
     LoggerInstance.error('🔥 Error on dependency injector loader: %o', e);

back/loaders/deps.ts

@@ -1,49 +1,23 @@
 import path from 'path';
-import fs from 'fs/promises';
+import fs from 'fs';
 import chokidar from 'chokidar';
 import config from '../config/index';
-import { fileExist, promiseExec, rmPath } from '../config/util';
 
-async function linkToNodeModule(src: string, dst?: string) {
+function linkToNodeModule(src: string, dst?: string) {
   const target = path.join(config.rootPath, 'node_modules', dst || src);
   const source = path.join(config.rootPath, src);
 
-  try {
-    const stats = await fs.lstat(target);
-    if (!stats) {
-      await fs.symlink(source, target, 'dir');
+  fs.lstat(target, (err, stat) => {
+    if (!stat) {
+      fs.symlink(source, target, 'dir', (err) => {
+        if (err) throw err;
+      });
     }
-  } catch (error) {}
-}
-
-async function linkCommand() {
-  const commandPath = await promiseExec('which node');
-  const commandDir = path.dirname(commandPath);
-  const linkShell = [
-    {
-      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 fs.symlink(source, tmpTarget);
-    await fs.rename(tmpTarget, target);
-  }
+  });
 }
 
 export default async (src: string = 'deps') => {
-  await linkCommand();
-  await linkToNodeModule(src);
+  linkToNodeModule(src);
 
   const source = path.join(config.rootPath, src);
   const watcher = chokidar.watch(source, {

back/loaders/express.ts

@@ -1,40 +1,39 @@
-import express, { Request, Response, NextFunction, Application } from 'express';
+import { Request, Response, NextFunction, Application } from 'express';
 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 from 'express-jwt';
+import fs from 'fs';
 import { getPlatform, getToken } from '../config/util';
+import Container from 'typedi';
+import OpenService from '../services/open';
 import rewrite from 'express-urlrewrite';
+import UserService from '../services/user';
+import handler from 'serve-handler';
 import * as Sentry from '@sentry/node';
-import { errors } from 'celebrate';
-import { createProxyMiddleware } from 'http-proxy-middleware';
-import { serveEnv } from '../config/serverEnv';
-import Logger from './logger';
-import { IKeyvStore, shareStore } from '../shared/store';
+import { EnvModel } from '../data/env';
 
 export default ({ app }: { app: Application }) => {
-  app.set('trust proxy', 'loopback');
+  app.enable('trust proxy');
   app.use(cors());
-  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': '' },
-      logger: Logger,
-    }),
-  );
 
+  app.use((req, res, next) => {
+    if (req.path.startsWith('/api') || req.path.startsWith('/open')) {
+      next();
+    } else {
+      return handler(req, res, {
+        public: 'static/dist',
+        rewrites: [{ source: '**', destination: '/index.html' }],
+      });
+    }
+  });
   app.use(bodyParser.json({ limit: '50mb' }));
   app.use(bodyParser.urlencoded({ limit: '50mb', extended: true }));
 
   app.use(
-    expressjwt({
-      secret: config.secret,
+    jwt({
+      secret: config.secret as string,
       algorithms: ['HS384'],
     }).unless({
       path: [...config.apiWhiteList, /^\/open\//],
@@ -54,10 +53,8 @@ export default ({ app }: { app: Application }) => {
   app.use(async (req, res, next) => {
     const headerToken = getToken(req);
     if (req.path.startsWith('/open/')) {
-      const apps = await shareStore.getApps();
-      const doc = apps?.filter((x) =>
-        x.tokens?.find((y) => y.value === headerToken),
-      )?.[0];
+      const openService = Container.get(OpenService);
+      const doc = await openService.findTokenByValue(headerToken);
       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,24 +73,29 @@ export default ({ app }: { app: Application }) => {
     if (
       !headerToken &&
       originPath &&
-      config.apiWhiteList.includes(originPath)
+      config.apiWhiteList.includes(originPath) &&
+      originPath !== '/api/crons/status'
+    ) {
+      return next();
+    }
+    const remoteAddress = req.socket.remoteAddress;
+    if (
+      remoteAddress === '::ffff:127.0.0.1' &&
+      originPath === '/api/crons/status'
     ) {
       return next();
     }
 
-    const authInfo = await shareStore.getAuthInfo();
-    if (authInfo && headerToken) {
-      const { token = '', tokens = {} } = authInfo;
+    const data = fs.readFileSync(config.authConfigFile, 'utf8');
+    if (data) {
+      const { token = '', tokens = {} } = JSON.parse(data);
       if (headerToken === token || tokens[req.platform] === headerToken) {
         return next();
       }
     }
 
-    const errorCode = headerToken ? 'invalid_token' : 'credentials_required';
-    const errorMessage = headerToken
-      ? 'jwt malformed'
-      : 'No authorization token was found';
-    const err = new UnauthorizedError(errorCode, { message: errorMessage });
+    const err: any = new Error('UnauthorizedError');
+    err.status = 401;
     next(err);
   });
 
@@ -101,14 +103,16 @@ export default ({ app }: { app: Application }) => {
     if (!['/api/user/init', '/api/user/notification/init'].includes(req.path)) {
       return next();
     }
-    const authInfo =
-      (await shareStore.getAuthInfo()) || ({} as IKeyvStore['authInfo']);
+    const userService = Container.get(UserService);
+    const authInfo = await userService.getUserInfo();
+    const envCount = await EnvModel.count();
 
     let isInitialized = true;
     if (
       Object.keys(authInfo).length === 2 &&
       authInfo.username === 'admin' &&
-      authInfo.password === 'admin'
+      authInfo.password === 'admin' &&
+      envCount === 0
     ) {
       isInitialized = false;
     }
@@ -129,9 +133,7 @@ export default ({ app }: { app: Application }) => {
     next(err);
   });
 
-  app.use(errors());
-
-  Sentry.setupExpressErrorHandler(app);
+  app.use(Sentry.Handlers.errorHandler());
 
   app.use(
     (
@@ -150,27 +152,6 @@ export default ({ app }: { app: Application }) => {
     },
   );
 
-  app.use(
-    (
-      err: Error & { errors: any[] },
-      req: Request,
-      res: Response,
-      next: NextFunction,
-    ) => {
-      if (err.name.includes('Sequelize')) {
-        return res
-          .status(500)
-          .send({
-            code: 400,
-            message: `${err.name} ${err.message}`,
-            validation: err.errors,
-          })
-          .end();
-      }
-      return next(err);
-    },
-  );
-
   app.use(
     (
       err: Error & { status: number },
@@ -178,6 +159,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

@@ -4,122 +4,43 @@ import { Container } from 'typedi';
 import { Crontab, CrontabModel, CrontabStatus } from '../data/cron';
 import CronService from '../services/cron';
 import EnvService from '../services/env';
-import { DependenceModel, DependenceStatus } from '../data/dependence';
+import _ from 'lodash';
+import { DependenceModel } from '../data/dependence';
 import { Op } from 'sequelize';
-import config from '../config';
-import { CrontabViewModel, CronViewType } from '../data/cronView';
-import { initPosition } from '../data/env';
-import { AuthDataType, SystemModel } from '../data/system';
 import SystemService from '../services/system';
-import UserService from '../services/user';
-import { writeFile, readFile } from 'fs/promises';
-import { safeJSONParse } from '../config/util';
-import OpenService from '../services/open';
-import { shareStore } from '../shared/store';
-import Logger from './logger';
+import ScheduleService from '../services/schedule';
+import config from '../config';
 
 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 [systemConfig] = await SystemModel.findOrCreate({
-    where: { type: AuthDataType.systemConfig },
-  });
-  const [notifyConfig] = 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 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,
-    });
-  }
-
-  // 初始化通知配置
-  if (notifyConfig.info) {
-    await writeFile(config.systemNotifyFile, JSON.stringify(notifyConfig.info));
-  }
-
-  const installDependencies = () => {
-    // 初始化时安装所有处于安装中，安装成功，安装失败的依赖
-    DependenceModel.findAll({
-      where: {},
-      order: [
-        ['type', 'DESC'],
-        ['createdAt', 'DESC'],
-      ],
-      raw: true,
-    }).then(async (docs) => {
-      await DependenceModel.update(
-        { status: DependenceStatus.queued, log: [] },
-        { where: { id: docs.map((x) => x.id!) } },
-      );
-      setTimeout(() => {
-        dependenceService.installDependenceOneByOne(docs);
-      }, 5000);
-    });
-  };
-
-  // 初始化更新 linux/python/nodejs 镜像源配置
-  if (systemConfig.info?.pythonMirror) {
-    systemService.updatePythonMirror({
-      pythonMirror: systemConfig.info?.pythonMirror,
-    });
-  }
-  if (systemConfig.info?.linuxMirror) {
-    systemService.updateLinuxMirror(
-      {
-        linuxMirror: systemConfig.info?.linuxMirror,
-      },
-      undefined,
-      () => installDependencies(),
-    );
-  } else {
-    installDependencies();
-  }
-  if (systemConfig.info?.nodeMirror) {
-    systemService.updateNodeMirror({
-      nodeMirror: systemConfig.info?.nodeMirror,
-    });
-  }
-
-  // 初始化新增默认全部任务视图
-  CrontabViewModel.findAll({
-    where: { type: CronViewType.系统, name: '全部任务' },
-    raw: true,
-  }).then((docs) => {
-    if (docs.length === 0) {
-      CrontabViewModel.create({
-        name: '全部任务',
-        type: CronViewType.系统,
-        position: initPosition / 2,
-      });
-    }
-  });
+  const scheduleService = Container.get(ScheduleService);
 
   // 初始化更新所有任务状态为空闲
-  await CrontabModel.update({ status: CrontabStatus.idle }, { where: {} });
+  await CrontabModel.update(
+    { status: CrontabStatus.idle },
+    { where: { status: [CrontabStatus.running, CrontabStatus.queued] } },
+  );
 
-  // 初始化时执行一次所有的 ql repo 任务
+  // 初始化时安装所有处于安装中，安装成功，安装失败的依赖
+  DependenceModel.findAll({ where: {} }).then(async (docs) => {
+    const groups = _.groupBy(docs, 'type');
+    for (const key in groups) {
+      if (Object.prototype.hasOwnProperty.call(groups, key)) {
+        const group = groups[key];
+        const depIds = group.map((x) => x.id);
+        for (const dep of depIds) {
+          if (dep) {
+            await dependenceService.reInstall([dep]);
+          }
+        }
+      }
+    }
+  });
+
+  // 初始化时执行一次所有的ql repo 任务
   CrontabModel.findAll({
     where: {
       isDisabled: { [Op.ne]: 1 },
@@ -161,7 +82,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/`,
                 '',
               )}`,
@@ -172,7 +93,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/`,
                 '',
               )}`,
@@ -183,7 +104,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/`,
                 '',
               )}`,
@@ -199,10 +120,33 @@ export default async () => {
   await cronService.autosave_crontab();
   await envService.set_envs();
 
-  const authInfo = await userService.getAuthInfo();
-  const apps = await openService.findApps();
-  await shareStore.updateAuthInfo(authInfo);
-  if (apps?.length) {
-    await shareStore.updateApps(apps);
+  // 运行删除日志任务
+  const data = await systemService.getLogRemoveFrequency();
+  if (data && data.info && data.info.frequency) {
+    const cron = {
+      id: data.id,
+      name: '删除日志',
+      command: `ql rmlog ${data.info.frequency}`,
+    };
+    await scheduleService.createIntervalTask(cron, {
+      days: data.info.frequency,
+      runImmediately: true,
+    });
   }
 };
+
+function randomSchedule(from: number, to: number) {
+  const result: any[] = [];
+  const arr = [...Array(from).keys()];
+  let count = arr.length;
+  for (let i = 0; i < to; i++) {
+    const index = ~~(Math.random() * count) + i;
+    if (result.includes(arr[index])) {
+      continue;
+    }
+    result[i] = arr[index];
+    arr[index] = arr[i];
+    count--;
+  }
+  return result;
+}

back/loaders/initFile.ts

@@ -1,126 +1,48 @@
-import fs from 'fs/promises';
+import fs from 'fs';
 import path from 'path';
-import os from 'os';
+import dotenv from 'dotenv';
 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/');
-
-if (process.env.QL_DATA_DIR) {
-  dataPath = process.env.QL_DATA_DIR.replace(/\/$/g, '');
-}
-
-const preloadPath = path.join(rootPath, 'shell/preload/');
+const rootPath = process.cwd();
+const dataPath = path.join(rootPath, 'data/');
 const configPath = path.join(dataPath, 'config/');
 const scriptPath = path.join(dataPath, 'scripts/');
 const logPath = path.join(dataPath, 'log/');
-const uploadPath = path.join(dataPath, 'upload/');
-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 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, 'notify.js');
-const pyNotifyFile = path.join(preloadPath, '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,
-  },
-];
+const sampleAuthFile = path.join(samplePath, 'auth.sample.json');
 
 export default async () => {
-  for (const dirPath of directories) {
-    if (!(await fileExist(dirPath))) {
-      await fs.mkdir(dirPath);
-    }
+  const authFileExist = await fileExist(authConfigFile);
+  const confFileExist = await fileExist(confFile);
+  const scriptDirExist = await fileExist(scriptPath);
+  const logDirExist = await fileExist(logPath);
+  const configDirExist = await fileExist(configPath);
+
+  if (!configDirExist) {
+    fs.mkdirSync(configPath);
   }
 
-  for (const item of files) {
-    const exists = await fileExist(item.target);
-    if (!item.checkExistence || !exists) {
-      if (!item.content && !item.source) {
-        throw new Error(
-          `Neither content nor source specified for ${item.target}`,
-        );
-      }
-      const content = item.content || (await fs.readFile(item.source!));
-      await writeFileWithLock(item.target, content);
-    }
+  if (!authFileExist) {
+    fs.writeFileSync(authConfigFile, fs.readFileSync(sampleAuthFile));
   }
 
+  if (!confFileExist) {
+    fs.writeFileSync(confFile, fs.readFileSync(sampleConfigFile));
+  }
+
+  if (!scriptDirExist) {
+    fs.mkdirSync(scriptPath);
+  }
+
+  if (!logDirExist) {
+    fs.mkdirSync(logPath);
+  }
+
+  dotenv.config({ path: confFile });
+
   Logger.info('✌️ Init file down');
-  console.log('✌️ Init file down');
 };

back/loaders/initTask.ts

@@ -1,63 +0,0 @@
-import { Container } from 'typedi';
-import SystemService from '../services/system';
-import ScheduleService, { ScheduleTaskType } from '../services/schedule';
-import SubscriptionService from '../services/subscription';
-import config from '../config';
-import { fileExist } from '../config/util';
-import { join } from 'path';
-
-export default async () => {
-  const systemService = Container.get(SystemService);
-  const scheduleService = Container.get(ScheduleService);
-  const subscriptionService = Container.get(SubscriptionService);
-
-  // 生成内置token
-  let tokenCommand = `ts-node-transpile-only ${join(
-    config.rootPath,
-    'back/token.ts',
-  )}`;
-  const tokenFile = join(config.rootPath, 'static/build/token.js');
-
-  if (await fileExist(tokenFile)) {
-    tokenCommand = `node ${tokenFile}`;
-  }
-  const cron = {
-    id: NaN,
-    name: '生成token',
-    command: tokenCommand,
-    runOrigin: 'system',
-  } as ScheduleTaskType;
-  await scheduleService.cancelIntervalTask(cron);
-  scheduleService.createIntervalTask(
-    cron,
-    {
-      days: 28,
-    },
-    true,
-  );
-
-  // 运行删除日志任务
-  const data = await systemService.getSystemConfig();
-  if (data && data.info && data.info.logRemoveFrequency) {
-    const rmlogCron = {
-      id: data.id as number,
-      name: '删除日志',
-      command: `ql rmlog ${data.info.logRemoveFrequency}`,
-      runOrigin: 'system' as const,
-    };
-    await scheduleService.cancelIntervalTask(rmlogCron);
-    scheduleService.createIntervalTask(
-      rmlogCron,
-      {
-        days: data.info.logRemoveFrequency,
-      },
-      true,
-    );
-  }
-
-  await subscriptionService.setSshConfig();
-  const subs = await subscriptionService.list();
-  for (const sub of subs) {
-    subscriptionService.handleTask(sub.get({ plain: true }), !sub.is_disabled);
-  }
-};

back/loaders/logger.ts

@@ -1,38 +1,32 @@
 import winston from 'winston';
-import 'winston-daily-rotate-file';
 import config from '../config';
-import path from 'path';
 
-const levelMap: Record<string, string> = {
-  info: '\ue6f5',
-  warn: '\ue880',
-  error: '\ue602',
-  debug: '\ue67f'
+const transports = [];
+if (process.env.NODE_ENV !== 'development') {
+  transports.push(new winston.transports.Console());
+} else {
+  transports.push(
+    new winston.transports.Console({
+      format: winston.format.combine(
+        winston.format.cli(),
+        winston.format.splat(),
+      ),
+    }),
+  );
 }
 
-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 LoggerInstance = winston.createLogger({
   level: config.logs.level,
   levels: winston.config.npm.levels,
-  transports: [
-    new winston.transports.DailyRotateFile({
-      filename: path.join(config.systemLogPath, '%DATE%.log'),
-      ...defaultOptions,
-    })
-  ],
+  format: winston.format.combine(
+    winston.format.timestamp({
+      format: 'YYYY-MM-DD HH:mm:ss',
+    }),
+    winston.format.errors({ stack: true }),
+    winston.format.splat(),
+    winston.format.json(),
+  ),
+  transports,
 });
 
 export default LoggerInstance;

back/loaders/sentry.ts

@@ -1,26 +1,21 @@
+import { Application } from 'express';
 import * as Sentry from '@sentry/node';
+import * as Tracing from '@sentry/tracing';
 import Logger from './logger';
-import fs from 'fs';
-import config from '../config';
-import { parseContentVersion } from '../config/util';
 
-let version = '1.0.0';
-try {
-  const content = fs.readFileSync(config.versionFile, 'utf-8');
-  ({ version } = parseContentVersion(content));
-} catch (error) {}
+export default ({ expressApp }: { expressApp: Application }) => {
+  Sentry.init({
+    dsn: 'https://f4b5b55fb3c645b29a5dc2d70a1a4ef4@o1098464.ingest.sentry.io/6122819',
+    integrations: [
+      new Sentry.Integrations.Http({ tracing: true }),
+      new Tracing.Integrations.Express({ app: expressApp }),
+    ],
 
-Sentry.init({
-  ignoreErrors: [
-    /SequelizeUniqueConstraintError/i,
-    /Validation error/i,
-    /UnauthorizedError/i,
-    /celebrate request validation failed/i,
-  ],
-  dsn: 'https://8b5c84cfef3e22541bc84de0ed00497b@o1098464.ingest.sentry.io/6122819',
-  tracesSampleRate: 0.5,
-  release: version,
-});
+    tracesSampleRate: 1.0,
+  });
 
-Logger.info('✌️ Sentry loaded');
-console.log('✌️ Sentry loaded');
+  expressApp.use(Sentry.Handlers.requestHandler());
+  expressApp.use(Sentry.Handlers.tracingHandler());
+
+  Logger.info('✌️ Sentry loaded');
+};

back/loaders/server.ts

@@ -6,11 +6,11 @@ export default async ({ server }: { server: Server }) => {
   await Sock({ server });
   Logger.info('✌️ Sock loaded');
 
-  process.on('uncaughtException', (error) => {
-    Logger.error('Uncaught exception:', error);
-  });
-
-  process.on('unhandledRejection', (reason, promise) => {
-    Logger.error('Unhandled rejection:', reason, promise);
+  process.on('SIGINT', () => {
+    Logger.info('✌️ Server need close');
+    server.close(() => {
+      Logger.info('✌️ Server closed');
+      process.exit(0);
+    });
   });
 };

back/loaders/sock.ts

@@ -1,25 +1,28 @@
 import sockJs from 'sockjs';
 import { Server } from 'http';
+import Logger from './logger';
 import { Container } from 'typedi';
 import SockService from '../services/sock';
+import config from '../config/index';
+import fs from 'fs';
 import { getPlatform } from '../config/util';
-import { shareStore } from '../shared/store';
 
 export default async ({ server }: { server: Server }) => {
   const echo = sockJs.createServer({ prefix: '/api/ws', log: () => {} });
   const sockService = Container.get(SockService);
 
-  echo.on('connection', async (conn) => {
+  echo.on('connection', (conn) => {
     if (!conn.headers || !conn.url || !conn.pathname) {
       conn.close('404');
     }
 
-    const authInfo = await shareStore.getAuthInfo();
+    const data = fs.readFileSync(config.authConfigFile, 'utf8');
     const platform = getPlatform(conn.headers['user-agent'] || '') || 'desktop';
     const headerToken = conn.url.replace(`${conn.pathname}?token=`, '');
-    if (authInfo) {
-      const { token = '', tokens = {} } = authInfo;
+    if (data) {
+      const { token = '', tokens = {} } = JSON.parse(data);
       if (headerToken === token || tokens[platform] === headerToken) {
+        conn.write(JSON.stringify({ type: 'ping', message: 'hanhh' }));
         sockService.addClient(conn);
 
         conn.on('data', (message) => {
@@ -31,6 +34,8 @@ export default async ({ server }: { server: Server }) => {
         });
 
         return;
+      } else {
+        conn.write(JSON.stringify({ type: 'ping', message: 'whyour' }));
       }
     }
 

back/loaders/update.ts

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

back/protos/cron.proto

@@ -1,26 +0,0 @@
-syntax = "proto3";
-
-package com.ql.cron;
-
-service Cron {
-  rpc addCron(AddCronRequest) returns (AddCronResponse);
-  rpc delCron(DeleteCronRequest) returns (DeleteCronResponse);
-}
-
-message ISchedule { string schedule = 1; }
-
-message ICron {
-  string id = 1;
-  string schedule = 2;
-  string command = 3;
-  repeated ISchedule extra_schedules = 4;
-  string name = 5;
-}
-
-message AddCronRequest { repeated ICron crons = 1; }
-
-message AddCronResponse {}
-
-message DeleteCronRequest { repeated string ids = 1; }
-
-message DeleteCronResponse {}

back/protos/cron.ts

@@ -1,502 +0,0 @@
-/* eslint-disable */
-import {
-  CallOptions,
-  ChannelCredentials,
-  Client,
-  ClientOptions,
-  ClientUnaryCall,
-  handleUnaryCall,
-  makeGenericClientConstructor,
-  Metadata,
-  ServiceError,
-  UntypedServiceImplementation,
-} from "@grpc/grpc-js";
-import _m0 from "protobufjs/minimal";
-
-export const protobufPackage = "com.ql.cron";
-
-export interface ISchedule {
-  schedule: string;
-}
-
-export interface ICron {
-  id: string;
-  schedule: string;
-  command: string;
-  extraSchedules: ISchedule[];
-  name: string;
-}
-
-export interface AddCronRequest {
-  crons: ICron[];
-}
-
-export interface AddCronResponse {
-}
-
-export interface DeleteCronRequest {
-  ids: string[];
-}
-
-export interface DeleteCronResponse {
-}
-
-function createBaseISchedule(): ISchedule {
-  return { schedule: "" };
-}
-
-export const ISchedule = {
-  encode(message: ISchedule, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
-    if (message.schedule !== "") {
-      writer.uint32(10).string(message.schedule);
-    }
-    return writer;
-  },
-
-  decode(input: _m0.Reader | Uint8Array, length?: number): ISchedule {
-    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:
-          if (tag !== 10) {
-            break;
-          }
-
-          message.schedule = reader.string();
-          continue;
-      }
-      if ((tag & 7) === 4 || tag === 0) {
-        break;
-      }
-      reader.skipType(tag & 7);
-    }
-    return message;
-  },
-
-  fromJSON(object: any): ISchedule {
-    return { schedule: isSet(object.schedule) ? String(object.schedule) : "" };
-  },
-
-  toJSON(message: ISchedule): unknown {
-    const obj: any = {};
-    message.schedule !== undefined && (obj.schedule = message.schedule);
-    return obj;
-  },
-
-  create<I extends Exact<DeepPartial<ISchedule>, I>>(base?: I): ISchedule {
-    return ISchedule.fromPartial(base ?? {});
-  },
-
-  fromPartial<I extends Exact<DeepPartial<ISchedule>, I>>(object: I): ISchedule {
-    const message = createBaseISchedule();
-    message.schedule = object.schedule ?? "";
-    return message;
-  },
-};
-
-function createBaseICron(): ICron {
-  return { id: "", schedule: "", command: "", extraSchedules: [], name: "" };
-}
-
-export const ICron = {
-  encode(message: ICron, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
-    if (message.id !== "") {
-      writer.uint32(10).string(message.id);
-    }
-    if (message.schedule !== "") {
-      writer.uint32(18).string(message.schedule);
-    }
-    if (message.command !== "") {
-      writer.uint32(26).string(message.command);
-    }
-    for (const v of message.extraSchedules) {
-      ISchedule.encode(v!, writer.uint32(34).fork()).ldelim();
-    }
-    if (message.name !== "") {
-      writer.uint32(42).string(message.name);
-    }
-    return writer;
-  },
-
-  decode(input: _m0.Reader | Uint8Array, length?: number): ICron {
-    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:
-          if (tag !== 10) {
-            break;
-          }
-
-          message.id = reader.string();
-          continue;
-        case 2:
-          if (tag !== 18) {
-            break;
-          }
-
-          message.schedule = reader.string();
-          continue;
-        case 3:
-          if (tag !== 26) {
-            break;
-          }
-
-          message.command = reader.string();
-          continue;
-        case 4:
-          if (tag !== 34) {
-            break;
-          }
-
-          message.extraSchedules.push(ISchedule.decode(reader, reader.uint32()));
-          continue;
-        case 5:
-          if (tag !== 42) {
-            break;
-          }
-
-          message.name = reader.string();
-          continue;
-      }
-      if ((tag & 7) === 4 || tag === 0) {
-        break;
-      }
-      reader.skipType(tag & 7);
-    }
-    return message;
-  },
-
-  fromJSON(object: any): ICron {
-    return {
-      id: isSet(object.id) ? String(object.id) : "",
-      schedule: isSet(object.schedule) ? String(object.schedule) : "",
-      command: isSet(object.command) ? String(object.command) : "",
-      extraSchedules: Array.isArray(object?.extraSchedules)
-        ? object.extraSchedules.map((e: any) => ISchedule.fromJSON(e))
-        : [],
-      name: isSet(object.name) ? String(object.name) : "",
-    };
-  },
-
-  toJSON(message: ICron): unknown {
-    const obj: any = {};
-    message.id !== undefined && (obj.id = message.id);
-    message.schedule !== undefined && (obj.schedule = message.schedule);
-    message.command !== undefined && (obj.command = message.command);
-    if (message.extraSchedules) {
-      obj.extraSchedules = message.extraSchedules.map((e) => e ? ISchedule.toJSON(e) : undefined);
-    } else {
-      obj.extraSchedules = [];
-    }
-    message.name !== undefined && (obj.name = message.name);
-    return obj;
-  },
-
-  create<I extends Exact<DeepPartial<ICron>, I>>(base?: I): ICron {
-    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.extraSchedules = object.extraSchedules?.map((e) => ISchedule.fromPartial(e)) || [];
-    message.name = object.name ?? "";
-    return message;
-  },
-};
-
-function createBaseAddCronRequest(): AddCronRequest {
-  return { crons: [] };
-}
-
-export const AddCronRequest = {
-  encode(message: AddCronRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
-    for (const v of message.crons) {
-      ICron.encode(v!, writer.uint32(10).fork()).ldelim();
-    }
-    return writer;
-  },
-
-  decode(input: _m0.Reader | Uint8Array, length?: number): AddCronRequest {
-    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:
-          if (tag !== 10) {
-            break;
-          }
-
-          message.crons.push(ICron.decode(reader, reader.uint32()));
-          continue;
-      }
-      if ((tag & 7) === 4 || tag === 0) {
-        break;
-      }
-      reader.skipType(tag & 7);
-    }
-    return message;
-  },
-
-  fromJSON(object: any): AddCronRequest {
-    return { crons: Array.isArray(object?.crons) ? object.crons.map((e: any) => ICron.fromJSON(e)) : [] };
-  },
-
-  toJSON(message: AddCronRequest): unknown {
-    const obj: any = {};
-    if (message.crons) {
-      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 ?? {});
-  },
-
-  fromPartial<I extends Exact<DeepPartial<AddCronRequest>, I>>(object: I): AddCronRequest {
-    const message = createBaseAddCronRequest();
-    message.crons = object.crons?.map((e) => ICron.fromPartial(e)) || [];
-    return message;
-  },
-};
-
-function createBaseAddCronResponse(): AddCronResponse {
-  return {};
-}
-
-export const AddCronResponse = {
-  encode(_: AddCronResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
-    return writer;
-  },
-
-  decode(input: _m0.Reader | Uint8Array, length?: number): AddCronResponse {
-    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) {
-      const tag = reader.uint32();
-      switch (tag >>> 3) {
-      }
-      if ((tag & 7) === 4 || tag === 0) {
-        break;
-      }
-      reader.skipType(tag & 7);
-    }
-    return message;
-  },
-
-  fromJSON(_: any): AddCronResponse {
-    return {};
-  },
-
-  toJSON(_: AddCronResponse): unknown {
-    const obj: any = {};
-    return obj;
-  },
-
-  create<I extends Exact<DeepPartial<AddCronResponse>, I>>(base?: I): AddCronResponse {
-    return AddCronResponse.fromPartial(base ?? {});
-  },
-
-  fromPartial<I extends Exact<DeepPartial<AddCronResponse>, I>>(_: I): AddCronResponse {
-    const message = createBaseAddCronResponse();
-    return message;
-  },
-};
-
-function createBaseDeleteCronRequest(): DeleteCronRequest {
-  return { ids: [] };
-}
-
-export const DeleteCronRequest = {
-  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: _m0.Reader | Uint8Array, length?: number): DeleteCronRequest {
-    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:
-          if (tag !== 10) {
-            break;
-          }
-
-          message.ids.push(reader.string());
-          continue;
-      }
-      if ((tag & 7) === 4 || tag === 0) {
-        break;
-      }
-      reader.skipType(tag & 7);
-    }
-    return message;
-  },
-
-  fromJSON(object: any): DeleteCronRequest {
-    return { ids: Array.isArray(object?.ids) ? object.ids.map((e: any) => String(e)) : [] };
-  },
-
-  toJSON(message: DeleteCronRequest): unknown {
-    const obj: any = {};
-    if (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 ?? {});
-  },
-
-  fromPartial<I extends Exact<DeepPartial<DeleteCronRequest>, I>>(object: I): DeleteCronRequest {
-    const message = createBaseDeleteCronRequest();
-    message.ids = object.ids?.map((e) => e) || [];
-    return message;
-  },
-};
-
-function createBaseDeleteCronResponse(): DeleteCronResponse {
-  return {};
-}
-
-export const DeleteCronResponse = {
-  encode(_: DeleteCronResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
-    return writer;
-  },
-
-  decode(input: _m0.Reader | Uint8Array, length?: number): DeleteCronResponse {
-    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) {
-      const tag = reader.uint32();
-      switch (tag >>> 3) {
-      }
-      if ((tag & 7) === 4 || tag === 0) {
-        break;
-      }
-      reader.skipType(tag & 7);
-    }
-    return message;
-  },
-
-  fromJSON(_: any): DeleteCronResponse {
-    return {};
-  },
-
-  toJSON(_: DeleteCronResponse): unknown {
-    const obj: any = {};
-    return obj;
-  },
-
-  create<I extends Exact<DeepPartial<DeleteCronResponse>, I>>(base?: I): DeleteCronResponse {
-    return DeleteCronResponse.fromPartial(base ?? {});
-  },
-
-  fromPartial<I extends Exact<DeepPartial<DeleteCronResponse>, I>>(_: I): DeleteCronResponse {
-    const message = createBaseDeleteCronResponse();
-    return message;
-  },
-};
-
-export type CronService = typeof CronService;
-export const CronService = {
-  addCron: {
-    path: "/com.ql.cron.Cron/addCron",
-    requestStream: false,
-    responseStream: false,
-    requestSerialize: (value: AddCronRequest) => Buffer.from(AddCronRequest.encode(value).finish()),
-    requestDeserialize: (value: Buffer) => AddCronRequest.decode(value),
-    responseSerialize: (value: AddCronResponse) => Buffer.from(AddCronResponse.encode(value).finish()),
-    responseDeserialize: (value: Buffer) => AddCronResponse.decode(value),
-  },
-  delCron: {
-    path: "/com.ql.cron.Cron/delCron",
-    requestStream: false,
-    responseStream: false,
-    requestSerialize: (value: DeleteCronRequest) => Buffer.from(DeleteCronRequest.encode(value).finish()),
-    requestDeserialize: (value: Buffer) => DeleteCronRequest.decode(value),
-    responseSerialize: (value: DeleteCronResponse) => Buffer.from(DeleteCronResponse.encode(value).finish()),
-    responseDeserialize: (value: Buffer) => DeleteCronResponse.decode(value),
-  },
-} as const;
-
-export interface CronServer extends UntypedServiceImplementation {
-  addCron: handleUnaryCall<AddCronRequest, AddCronResponse>;
-  delCron: handleUnaryCall<DeleteCronRequest, DeleteCronResponse>;
-}
-
-export interface CronClient extends Client {
-  addCron(
-    request: AddCronRequest,
-    callback: (error: ServiceError | null, response: AddCronResponse) => void,
-  ): ClientUnaryCall;
-  addCron(
-    request: AddCronRequest,
-    metadata: Metadata,
-    callback: (error: ServiceError | null, response: AddCronResponse) => void,
-  ): ClientUnaryCall;
-  addCron(
-    request: AddCronRequest,
-    metadata: Metadata,
-    options: Partial<CallOptions>,
-    callback: (error: ServiceError | null, response: AddCronResponse) => void,
-  ): ClientUnaryCall;
-  delCron(
-    request: DeleteCronRequest,
-    callback: (error: ServiceError | null, response: DeleteCronResponse) => void,
-  ): ClientUnaryCall;
-  delCron(
-    request: DeleteCronRequest,
-    metadata: Metadata,
-    callback: (error: ServiceError | null, response: DeleteCronResponse) => void,
-  ): ClientUnaryCall;
-  delCron(
-    request: DeleteCronRequest,
-    metadata: Metadata,
-    options: Partial<CallOptions>,
-    callback: (error: ServiceError | null, response: DeleteCronResponse) => void,
-  ): ClientUnaryCall;
-}
-
-export const CronClient = makeGenericClientConstructor(CronService, "com.ql.cron.Cron") as unknown as {
-  new (address: string, credentials: ChannelCredentials, options?: Partial<ClientOptions>): CronClient;
-  service: typeof CronService;
-};
-
-type Builtin = Date | Function | Uint8Array | string | number | boolean | undefined;
-
-export type DeepPartial<T> = T extends Builtin ? T
-  : T extends Array<infer U> ? Array<DeepPartial<U>> : T extends ReadonlyArray<infer U> ? ReadonlyArray<DeepPartial<U>>
-  : T extends {} ? { [K in keyof T]?: DeepPartial<T[K]> }
-  : Partial<T>;
-
-type KeysOfUnion<T> = T extends T ? keyof T : never;
-export type Exact<P, I extends P> = P extends Builtin ? P
-  : P & { [K in keyof P]: Exact<P[K], I[K]> } & { [K in Exclude<keyof I, KeysOfUnion<P>>]: never };
-
-function isSet(value: any): boolean {
-  return value !== null && value !== undefined;
-}

back/protos/health.proto

@@ -1,22 +0,0 @@
-syntax = "proto3";
-
-package com.ql.health;
-
-message HealthCheckRequest {
-  string service = 1;
-}
-
-message HealthCheckResponse {
-  enum ServingStatus {
-    UNKNOWN = 0;
-    SERVING = 1;
-    NOT_SERVING = 2;
-    SERVICE_UNKNOWN = 3;
-  }
-  ServingStatus status = 1;
-}
-
-service Health {
-  rpc Check(HealthCheckRequest) returns (HealthCheckResponse);
-  rpc Watch(HealthCheckRequest) returns (stream HealthCheckResponse);
-}

back/protos/health.ts

@@ -1,254 +0,0 @@
-/* eslint-disable */
-import {
-  CallOptions,
-  ChannelCredentials,
-  Client,
-  ClientOptions,
-  ClientReadableStream,
-  ClientUnaryCall,
-  handleServerStreamingCall,
-  handleUnaryCall,
-  makeGenericClientConstructor,
-  Metadata,
-  ServiceError,
-  UntypedServiceImplementation,
-} from "@grpc/grpc-js";
-import _m0 from "protobufjs/minimal";
-
-export const protobufPackage = "com.ql.health";
-
-export interface HealthCheckRequest {
-  service: string;
-}
-
-export interface HealthCheckResponse {
-  status: HealthCheckResponse_ServingStatus;
-}
-
-export enum HealthCheckResponse_ServingStatus {
-  UNKNOWN = 0,
-  SERVING = 1,
-  NOT_SERVING = 2,
-  SERVICE_UNKNOWN = 3,
-  UNRECOGNIZED = -1,
-}
-
-export function healthCheckResponse_ServingStatusFromJSON(object: any): HealthCheckResponse_ServingStatus {
-  switch (object) {
-    case 0:
-    case "UNKNOWN":
-      return HealthCheckResponse_ServingStatus.UNKNOWN;
-    case 1:
-    case "SERVING":
-      return HealthCheckResponse_ServingStatus.SERVING;
-    case 2:
-    case "NOT_SERVING":
-      return HealthCheckResponse_ServingStatus.NOT_SERVING;
-    case 3:
-    case "SERVICE_UNKNOWN":
-      return HealthCheckResponse_ServingStatus.SERVICE_UNKNOWN;
-    case -1:
-    case "UNRECOGNIZED":
-    default:
-      return HealthCheckResponse_ServingStatus.UNRECOGNIZED;
-  }
-}
-
-export function healthCheckResponse_ServingStatusToJSON(object: HealthCheckResponse_ServingStatus): string {
-  switch (object) {
-    case HealthCheckResponse_ServingStatus.UNKNOWN:
-      return "UNKNOWN";
-    case HealthCheckResponse_ServingStatus.SERVING:
-      return "SERVING";
-    case HealthCheckResponse_ServingStatus.NOT_SERVING:
-      return "NOT_SERVING";
-    case HealthCheckResponse_ServingStatus.SERVICE_UNKNOWN:
-      return "SERVICE_UNKNOWN";
-    case HealthCheckResponse_ServingStatus.UNRECOGNIZED:
-    default:
-      return "UNRECOGNIZED";
-  }
-}
-
-function createBaseHealthCheckRequest(): HealthCheckRequest {
-  return { service: "" };
-}
-
-export const HealthCheckRequest = {
-  encode(message: HealthCheckRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
-    if (message.service !== "") {
-      writer.uint32(10).string(message.service);
-    }
-    return writer;
-  },
-
-  decode(input: _m0.Reader | Uint8Array, length?: number): HealthCheckRequest {
-    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:
-          if (tag !== 10) {
-            break;
-          }
-
-          message.service = reader.string();
-          continue;
-      }
-      if ((tag & 7) === 4 || tag === 0) {
-        break;
-      }
-      reader.skipType(tag & 7);
-    }
-    return message;
-  },
-
-  fromJSON(object: any): HealthCheckRequest {
-    return { service: isSet(object.service) ? String(object.service) : "" };
-  },
-
-  toJSON(message: HealthCheckRequest): unknown {
-    const obj: any = {};
-    message.service !== undefined && (obj.service = message.service);
-    return obj;
-  },
-
-  create<I extends Exact<DeepPartial<HealthCheckRequest>, I>>(base?: I): HealthCheckRequest {
-    return HealthCheckRequest.fromPartial(base ?? {});
-  },
-
-  fromPartial<I extends Exact<DeepPartial<HealthCheckRequest>, I>>(object: I): HealthCheckRequest {
-    const message = createBaseHealthCheckRequest();
-    message.service = object.service ?? "";
-    return message;
-  },
-};
-
-function createBaseHealthCheckResponse(): HealthCheckResponse {
-  return { status: 0 };
-}
-
-export const HealthCheckResponse = {
-  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: _m0.Reader | Uint8Array, length?: number): HealthCheckResponse {
-    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:
-          if (tag !== 8) {
-            break;
-          }
-
-          message.status = reader.int32() as any;
-          continue;
-      }
-      if ((tag & 7) === 4 || tag === 0) {
-        break;
-      }
-      reader.skipType(tag & 7);
-    }
-    return message;
-  },
-
-  fromJSON(object: any): HealthCheckResponse {
-    return { status: isSet(object.status) ? healthCheckResponse_ServingStatusFromJSON(object.status) : 0 };
-  },
-
-  toJSON(message: HealthCheckResponse): unknown {
-    const obj: any = {};
-    message.status !== undefined && (obj.status = healthCheckResponse_ServingStatusToJSON(message.status));
-    return obj;
-  },
-
-  create<I extends Exact<DeepPartial<HealthCheckResponse>, I>>(base?: I): HealthCheckResponse {
-    return HealthCheckResponse.fromPartial(base ?? {});
-  },
-
-  fromPartial<I extends Exact<DeepPartial<HealthCheckResponse>, I>>(object: I): HealthCheckResponse {
-    const message = createBaseHealthCheckResponse();
-    message.status = object.status ?? 0;
-    return message;
-  },
-};
-
-export type HealthService = typeof HealthService;
-export const HealthService = {
-  check: {
-    path: "/com.ql.health.Health/Check",
-    requestStream: false,
-    responseStream: false,
-    requestSerialize: (value: HealthCheckRequest) => Buffer.from(HealthCheckRequest.encode(value).finish()),
-    requestDeserialize: (value: Buffer) => HealthCheckRequest.decode(value),
-    responseSerialize: (value: HealthCheckResponse) => Buffer.from(HealthCheckResponse.encode(value).finish()),
-    responseDeserialize: (value: Buffer) => HealthCheckResponse.decode(value),
-  },
-  watch: {
-    path: "/com.ql.health.Health/Watch",
-    requestStream: false,
-    responseStream: true,
-    requestSerialize: (value: HealthCheckRequest) => Buffer.from(HealthCheckRequest.encode(value).finish()),
-    requestDeserialize: (value: Buffer) => HealthCheckRequest.decode(value),
-    responseSerialize: (value: HealthCheckResponse) => Buffer.from(HealthCheckResponse.encode(value).finish()),
-    responseDeserialize: (value: Buffer) => HealthCheckResponse.decode(value),
-  },
-} as const;
-
-export interface HealthServer extends UntypedServiceImplementation {
-  check: handleUnaryCall<HealthCheckRequest, HealthCheckResponse>;
-  watch: handleServerStreamingCall<HealthCheckRequest, HealthCheckResponse>;
-}
-
-export interface HealthClient extends Client {
-  check(
-    request: HealthCheckRequest,
-    callback: (error: ServiceError | null, response: HealthCheckResponse) => void,
-  ): ClientUnaryCall;
-  check(
-    request: HealthCheckRequest,
-    metadata: Metadata,
-    callback: (error: ServiceError | null, response: HealthCheckResponse) => void,
-  ): ClientUnaryCall;
-  check(
-    request: HealthCheckRequest,
-    metadata: Metadata,
-    options: Partial<CallOptions>,
-    callback: (error: ServiceError | null, response: HealthCheckResponse) => void,
-  ): ClientUnaryCall;
-  watch(request: HealthCheckRequest, options?: Partial<CallOptions>): ClientReadableStream<HealthCheckResponse>;
-  watch(
-    request: HealthCheckRequest,
-    metadata?: Metadata,
-    options?: Partial<CallOptions>,
-  ): ClientReadableStream<HealthCheckResponse>;
-}
-
-export const HealthClient = makeGenericClientConstructor(HealthService, "com.ql.health.Health") as unknown as {
-  new (address: string, credentials: ChannelCredentials, options?: Partial<ClientOptions>): HealthClient;
-  service: typeof HealthService;
-};
-
-type Builtin = Date | Function | Uint8Array | string | number | boolean | undefined;
-
-export type DeepPartial<T> = T extends Builtin ? T
-  : T extends Array<infer U> ? Array<DeepPartial<U>> : T extends ReadonlyArray<infer U> ? ReadonlyArray<DeepPartial<U>>
-  : T extends {} ? { [K in keyof T]?: DeepPartial<T[K]> }
-  : Partial<T>;
-
-type KeysOfUnion<T> = T extends T ? keyof T : never;
-export type Exact<P, I extends P> = P extends Builtin ? P
-  : P & { [K in keyof P]: Exact<P[K], I[K]> } & { [K in Exclude<keyof I, KeysOfUnion<P>>]: never };
-
-function isSet(value: any): boolean {
-  return value !== null && value !== undefined;
-}

back/public.ts

@@ -1,35 +1,34 @@
 import express from 'express';
+import { exec } from 'child_process';
 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.get('/api/public/panel/log', (req, res) => {
+  exec(
+    'pm2 logs panel --lines 500 --nostream --timestamp',
+    (err, stdout, stderr) => {
+      if (err || stderr) {
+        return res.send({ code: 400, data: err || stderr });
+      }
+      return res.send({ code: 200, data: stdout });
+    },
+  );
 });
 
 app
-  .listen(config.publicPort, '0.0.0.0', async () => {
+  .listen(config.publicPort, async () => {
+    await require('./loaders/sentry').default({ expressApp: app });
     await require('./loaders/db').default();
 
-    Logger.debug(`✌️ 公共服务启动成功！`);
-    console.debug(`✌️ 公共服务启动成功！`);
-    process.send?.('ready');
+    Logger.info(`
+      ################################################
+      🛡️  Public listening on port: ${config.publicPort} 🛡️
+      ################################################
+    `);
   })
   .on('error', (err) => {
     Logger.error(err);
-    console.error(err);
     process.exit(1);
   });

back/schedule.ts

@@ -0,0 +1,55 @@
+import schedule from 'node-schedule';
+import express from 'express';
+import { exec } from 'child_process';
+import Logger from './loaders/logger';
+import { CrontabModel, CrontabStatus } from './data/cron';
+import config from './config';
+
+const app = express();
+
+const run = async () => {
+  CrontabModel.findAll({ where: {} })
+    .then((docs) => {
+      if (docs && docs.length > 0) {
+        for (let i = 0; i < docs.length; i++) {
+          const task = docs[i];
+          const _schedule = task.schedule && task.schedule.split(/ +/);
+          if (
+            _schedule &&
+            _schedule.length > 5 &&
+            task.status !== CrontabStatus.disabled &&
+            !task.isDisabled
+          ) {
+            schedule.scheduleJob(task.schedule, function () {
+              let command = task.command as string;
+              if (!command.includes('task ') && !command.includes('ql ')) {
+                command = `task ${command}`;
+              }
+              exec(command);
+            });
+          }
+        }
+      }
+    })
+    .catch((err) => {
+      Logger.error(err);
+      process.exit(1);
+    });
+};
+
+app
+  .listen(config.cronPort, async () => {
+    await require('./loaders/sentry').default({ expressApp: app });
+    await require('./loaders/db').default();
+
+    await run();
+    Logger.info(`
+      ################################################
+      🛡️  Schedule listening on port: ${config.cronPort} 🛡️
+      ################################################
+    `);
+  })
+  .on('error', (err) => {
+    Logger.error(err);
+    process.exit(1);
+  });

back/schedule/addCron.ts

@@ -1,57 +0,0 @@
-import { ServerUnaryCall, sendUnaryData } from '@grpc/grpc-js';
-import { AddCronRequest, AddCronResponse } from '../protos/cron';
-import nodeSchedule from 'node-schedule';
-import { scheduleStacks } from './data';
-import { runCron } from '../shared/runCron';
-import Logger from '../loaders/logger';
-
-const addCron = (
-  call: ServerUnaryCall<AddCronRequest, AddCronResponse>,
-  callback: sendUnaryData<AddCronResponse>,
-) => {
-  for (const item of call.request.crons) {
-    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',
-      id,
-      name,
-      schedule,
-      command,
-    );
-
-    if (extraSchedules?.length) {
-      extraSchedules.forEach((x) => {
-        Logger.info(
-          '[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);
-      }),
-      ...(extraSchedules?.length
-        ? extraSchedules.map((x) =>
-            nodeSchedule.scheduleJob(id, x.schedule, async () => {
-              Logger.info(`[schedule][准备运行任务] 命令: ${command}`);
-              runCron(command, item);
-            }),
-          )
-        : []),
-    ]);
-  }
-
-  callback(null, null);
-};
-
-export { addCron };

back/schedule/client.ts

@@ -1,41 +0,0 @@
-import { credentials } from '@grpc/grpc-js';
-import {
-  AddCronRequest,
-  AddCronResponse,
-  CronClient,
-  DeleteCronRequest,
-  DeleteCronResponse,
-} from '../protos/cron';
-import config from '../config';
-
-class Client {
-  private client = new CronClient(
-    `0.0.0.0:${config.cronPort}`,
-    credentials.createInsecure(),
-    { 'grpc.enable_http_proxy': 0 },
-  );
-
-  addCron(request: AddCronRequest['crons']): Promise<AddCronResponse> {
-    return new Promise((resolve, reject) => {
-      this.client.addCron({ crons: request }, (err, res) => {
-        if (err) {
-          reject(err);
-        }
-        resolve(res);
-      });
-    });
-  }
-
-  delCron(request: DeleteCronRequest['ids']): Promise<DeleteCronResponse> {
-    return new Promise((resolve, reject) => {
-      this.client.delCron({ ids: request }, (err, res) => {
-        if (err) {
-          reject(err);
-        }
-        resolve(res);
-      });
-    });
-  }
-}
-
-export default new Client();

back/schedule/data.ts

@@ -1,6 +0,0 @@
-import nodeSchedule from 'node-schedule';
-import { ToadScheduler } from 'toad-scheduler';
-
-export const scheduleStacks = new Map<string, nodeSchedule.Job[]>();
-
-export const intervalSchedule = new ToadScheduler();

back/schedule/delCron.ts

@@ -1,24 +0,0 @@
-import { ServerUnaryCall, sendUnaryData } from '@grpc/grpc-js';
-import { DeleteCronRequest, DeleteCronResponse } from '../protos/cron';
-import { scheduleStacks } from './data';
-import Logger from '../loaders/logger';
-
-const delCron = (
-  call: ServerUnaryCall<DeleteCronRequest, DeleteCronResponse>,
-  callback: sendUnaryData<DeleteCronResponse>,
-) => {
-  for (const id of call.request.ids) {
-    if (scheduleStacks.has(id)) {
-      Logger.info(
-        '[schedule][取消定时任务], 任务ID: %s',
-        id,
-      );
-      scheduleStacks.get(id)?.forEach(x => x.cancel());
-      scheduleStacks.delete(id);
-    }
-  }
-
-  callback(null, null);
-};
-
-export { delCron };

back/schedule/health.ts

@@ -1,35 +0,0 @@
-import { ServerUnaryCall, sendUnaryData } from '@grpc/grpc-js';
-import { HealthCheckRequest, HealthCheckResponse } from '../protos/health';
-import config from '../config';
-import { promiseExec } from '../config/util';
-
-const check = async (
-  call: ServerUnaryCall<HealthCheckRequest, HealthCheckResponse>,
-  callback: sendUnaryData<HealthCheckResponse>,
-) => {
-  switch (call.request.service) {
-    case 'cron':
-      const res = await promiseExec(
-        `curl -s --noproxy '*' http://0.0.0.0:${config.port}/api/system`,
-      );
-
-      if (res.includes('200')) {
-        return callback(null, { status: 1 });
-      }
-
-      const panelErrLog = await promiseExec(
-        `tail -n 300 ~/.pm2/logs/panel-error.log`,
-      );
-      const scheduleErrLog = await promiseExec(
-        `tail -n 300 ~/.pm2/logs/schedule-error.log`,
-      );
-      return callback(
-        new Error(`${scheduleErrLog || ''}\n${panelErrLog || ''}\n${res}`.trim()),
-      );
-
-    default:
-      return callback(null, { status: 1 });
-  }
-};
-
-export { check };

back/schedule/index.ts

@@ -1,24 +0,0 @@
-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;
-    }
-    Logger.debug(`✌️ 定时服务启动成功！`);
-    console.debug(`✌️ 定时服务启动成功！`);
-    process.send?.('ready');
-  },
-);

back/services/config.ts

@@ -1,42 +0,0 @@
-import { Service, Inject } from 'typedi';
-import path, { join } from 'path';
-import config from '../config';
-import { getFileContentByName } from '../config/util';
-import { Response } from 'express';
-import got from 'got';
-
-@Service()
-export default class ConfigService {
-  constructor() {}
-
-  public async getFile(filePath: string, res: Response) {
-    let content = '';
-    const avaliablePath = [config.rootPath, config.configPath].map((x) =>
-      path.resolve(x, filePath),
-    );
-
-    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 got.get(
-        `https://gitlab.com/whyour/qinglong/-/raw/master/${filePath}`,
-      );
-      content = res.body;
-    } else if (filePath.startsWith('data/scripts/')) {
-      content = await getFileContentByName(join(config.rootPath, filePath));
-    } else {
-      content = await getFileContentByName(join(config.configPath, filePath));
-    }
-
-    res.send({ code: 200, data: content });
-  }
-}

back/services/cron.ts

@@ -2,34 +2,22 @@ import { Service, Inject } from 'typedi';
 import winston from 'winston';
 import config from '../config';
 import { Crontab, CrontabModel, CrontabStatus } from '../data/cron';
-import { exec, execSync } from 'child_process';
-import fs from 'fs/promises';
+import { exec, execSync, spawn } from 'child_process';
+import fs from 'fs';
 import cron_parser from 'cron-parser';
-import {
-  getFileContentByName,
-  fileExist,
-  killTask,
-  getUniqPath,
-  safeJSONParse,
-} from '../config/util';
-import { Op, where, col as colFn, FindOptions, fn, Order } from 'sequelize';
+import { getFileContentByName, concurrentRun, fileExist } from '../config/util';
+import { promises, existsSync } from 'fs';
+import { promisify } from 'util';
+import { Op } from 'sequelize';
 import path from 'path';
-import { TASK_PREFIX, QL_PREFIX } from '../config/const';
-import cronClient from '../schedule/client';
-import taskLimit from '../shared/pLimit';
-import { spawn } from 'cross-spawn';
-import dayjs from 'dayjs';
-import pickBy from 'lodash/pickBy';
-import omit from 'lodash/omit';
-import { writeFileWithLock } from '../shared/utils';
 
 @Service()
 export default class CronService {
   constructor(@Inject('logger') private logger: winston.Logger) {}
 
-  private isNodeCron(cron: Crontab) {
-    const { schedule, extra_schedules } = cron;
-    if (Number(schedule?.split(/ +/).length) > 5 || extra_schedules?.length) {
+  private isSixCron(cron: Crontab) {
+    const { schedule } = cron;
+    if (schedule?.split(/ +/).length === 6) {
       return true;
     }
     return false;
@@ -39,18 +27,7 @@ export default class CronService {
     const tab = new Crontab(payload);
     tab.saved = false;
     const doc = await this.insert(tab);
-    if (this.isNodeCron(doc)) {
-      await cronClient.addCron([
-        {
-          name: doc.name || '',
-          id: String(doc.id),
-          schedule: doc.schedule!,
-          command: this.makeCommand(doc),
-          extraSchedules: doc.extra_schedules || [],
-        },
-      ]);
-    }
-    await this.set_crontab();
+    await this.set_crontab(this.isSixCron(doc));
     return doc;
   }
 
@@ -59,28 +36,9 @@ export default class CronService {
   }
 
   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) {
-      return newDoc;
-    }
-    if (this.isNodeCron(doc)) {
-      await cronClient.delCron([String(doc.id)]);
-    }
-    if (this.isNodeCron(newDoc)) {
-      await cronClient.addCron([
-        {
-          name: doc.name || '',
-          id: String(newDoc.id),
-          schedule: newDoc.schedule!,
-          command: this.makeCommand(newDoc),
-          extraSchedules: newDoc.extra_schedules || [],
-        },
-      ]);
-    }
-    await this.set_crontab();
+    payload.saved = false;
+    const newDoc = await this.updateDb(payload);
+    await this.set_crontab(this.isSixCron(newDoc));
     return newDoc;
   }
 
@@ -104,7 +62,7 @@ export default class CronService {
     last_running_time: number;
     last_execution_time: number;
   }) {
-    let options: any = {
+    const options: any = {
       status,
       pid,
       log_path,
@@ -114,28 +72,12 @@ export default class CronService {
       options.last_running_time = last_running_time;
     }
 
-    for (const id of ids) {
-      let cron;
-      try {
-        cron = await this.getDb({ id });
-      } catch (err) {}
-      if (!cron) {
-        continue;
-      }
-      if (status === CrontabStatus.idle && log_path !== cron.log_path) {
-        options = omit(options, ['status', 'log_path', 'pid']);
-      }
-      await CrontabModel.update(
-        { ...pickBy(options, (v) => v === 0 || !!v) },
-        { where: { id } },
-      );
-    }
+    return await CrontabModel.update({ ...options }, { where: { id: ids } });
   }
 
   public async remove(ids: number[]) {
     await CrontabModel.destroy({ where: { id: ids } });
-    await cronClient.delCron(ids.map(String));
-    await this.set_crontab();
+    await this.set_crontab(true);
   }
 
   public async pin(ids: number[]) {
@@ -170,80 +112,9 @@ export default class CronService {
     }
   }
 
-  private formatViewQuery(query: any, viewQuery: any) {
-    if (viewQuery.filters && viewQuery.filters.length > 0) {
-      const primaryOperate = viewQuery.filterRelation === 'or' ? Op.or : Op.and;
-      if (!query[primaryOperate]) {
-        query[primaryOperate] = [];
-      }
-      for (const col of viewQuery.filters) {
-        const { property, value, operation } = col;
-        let q: any = {};
-        let operate2 = null;
-        let operate = null;
-        switch (operation) {
-          case 'Reg':
-            operate = Op.like;
-            operate2 = Op.or;
-            break;
-          case 'NotReg':
-            operate = Op.notLike;
-            operate2 = Op.and;
-            break;
-          case 'In':
-            q[Op.or] = [
-              {
-                [property]: Array.isArray(value) ? value : [value],
-              },
-              property === 'status' && value.includes(2)
-                ? { isDisabled: 1 }
-                : {},
-            ];
-            break;
-          case 'Nin':
-            q[Op.and] = [
-              {
-                [property]: {
-                  [Op.notIn]: Array.isArray(value) ? value : [value],
-                },
-              },
-              property === 'status' && value.includes(2)
-                ? { isDisabled: { [Op.ne]: 1 } }
-                : {},
-            ];
-            break;
-          default:
-            break;
-        }
-        if (operate && operate2) {
-          q[property] = {
-            [Op.or]: [
-              {
-                [operate2]: [
-                  { [operate]: `%${value}%` },
-                  { [operate]: `%${encodeURI(value)}%` },
-                ],
-              },
-              {
-                [operate2]: [
-                  where(colFn(property), operate, `%${value}%`),
-                  where(colFn(property), operate, `%${encodeURI(value)}%`),
-                ],
-              },
-            ],
-          };
-        }
-        query[primaryOperate].push(q);
-      }
-    }
-  }
-
-  private formatSearchText(query: any, searchText: string | undefined) {
+  public async crontabs(searchText?: string): Promise<Crontab[]> {
+    let query = {};
     if (searchText) {
-      if (!query[Op.and]) {
-        query[Op.and] = [];
-      }
-      let q: any = {};
       const textArray = searchText.split(':');
       switch (textArray[0]) {
         case 'name':
@@ -251,141 +122,55 @@ export default class CronService {
         case 'schedule':
         case 'label':
           const column = textArray[0] === 'label' ? 'labels' : textArray[0];
-          q[column] = {
-            [Op.or]: [
-              { [Op.like]: `%${textArray[1]}%` },
-              { [Op.like]: `%${encodeURI(textArray[1])}%` },
-            ],
+          query = {
+            [column]: {
+              [Op.or]: [
+                { [Op.like]: `%${textArray[1]}%` },
+                { [Op.like]: `%${encodeURIComponent(textArray[1])}%` },
+              ],
+            },
           };
           break;
         default:
           const reg = {
             [Op.or]: [
               { [Op.like]: `%${searchText}%` },
-              { [Op.like]: `%${encodeURI(searchText)}%` },
+              { [Op.like]: `%${encodeURIComponent(searchText)}%` },
+            ],
+          };
+          query = {
+            [Op.or]: [
+              {
+                name: reg,
+              },
+              {
+                command: reg,
+              },
+              {
+                schedule: reg,
+              },
+              {
+                labels: reg,
+              },
             ],
           };
-          q[Op.or] = [
-            {
-              name: reg,
-            },
-            {
-              command: reg,
-            },
-            {
-              schedule: reg,
-            },
-            {
-              labels: reg,
-            },
-          ];
           break;
       }
-      query[Op.and].push(q);
     }
-  }
-
-  private formatFilterQuery(query: any, filterQuery: any) {
-    if (filterQuery) {
-      if (!query[Op.and]) {
-        query[Op.and] = [];
-      }
-      const filterKeys: any = Object.keys(filterQuery);
-      for (const key of filterKeys) {
-        let q: any = {};
-        if (!filterQuery[key]) continue;
-        if (key === 'status') {
-          if (filterQuery[key].includes(CrontabStatus.disabled)) {
-            q = { [Op.or]: [{ [key]: filterQuery[key] }, { isDisabled: 1 }] };
-          } else {
-            q = { [Op.and]: [{ [key]: filterQuery[key] }, { isDisabled: 0 }] };
-          }
-        } else {
-          q[key] = filterQuery[key];
-        }
-        query[Op.and].push(q);
-      }
-    }
-  }
-
-  private formatViewSort(order: string[][], viewQuery: any) {
-    if (viewQuery.sorts && viewQuery.sorts.length > 0) {
-      for (const { property, type } of viewQuery.sorts) {
-        order.unshift([property, type]);
-      }
-    }
-  }
-
-  public async find({
-    log_path,
-  }: {
-    log_path: string;
-  }): Promise<Crontab | null> {
     try {
-      const result = await CrontabModel.findOne({ where: { log_path } });
-      return result;
+      const result = await CrontabModel.findAll({
+        where: query,
+        order: [['createdAt', 'DESC']],
+      });
+      return result as any;
     } catch (error) {
       throw error;
     }
   }
 
-  public async crontabs(params?: {
-    searchValue: string;
-    page: string;
-    size: string;
-    sorter: string;
-    filters: string;
-    queryString: string;
-  }): Promise<{ data: Crontab[]; total: number }> {
-    const searchText = params?.searchValue;
-    const page = Number(params?.page || '0');
-    const size = Number(params?.size || '0');
-    const viewQuery = safeJSONParse(params?.queryString);
-    const filterQuery = safeJSONParse(params?.filters);
-    const sorterQuery = safeJSONParse(params?.sorter);
-
-    let query: any = {};
-    let order = [
-      ['isPinned', 'DESC'],
-      ['isDisabled', 'ASC'],
-      ['status', 'ASC'],
-      ['createdAt', 'DESC'],
-    ];
-
-    this.formatViewQuery(query, viewQuery);
-    this.formatSearchText(query, searchText);
-    this.formatFilterQuery(query, filterQuery);
-    this.formatViewSort(order, viewQuery);
-
-    if (sorterQuery) {
-      const { field, type } = sorterQuery;
-      if (field && type) {
-        order.unshift([field, type]);
-      }
-    }
-    let condition: FindOptions<Crontab> = {
-      where: query,
-      order: order as Order,
-    };
-    if (page && size) {
-      condition.offset = (page - 1) * size;
-      condition.limit = size;
-    }
-    try {
-      const result = await CrontabModel.findAll(condition);
-      const count = await CrontabModel.count({ where: query });
-      return { data: result, total: count };
-    } catch (error) {
-      throw error;
-    }
-  }
-
-  public async getDb(query: FindOptions<Crontab>['where']): Promise<Crontab> {
+  public async getDb(query: any): Promise<Crontab> {
     const doc: any = await CrontabModel.findOne({ where: { ...query } });
-    if (!doc) {
-      throw new Error(`Cron ${JSON.stringify(query)} not found`);
-    }
-    return doc.get({ plain: true });
+    return doc && (doc.get({ plain: true }) as Crontab);
   }
 
   public async run(ids: number[]) {
@@ -393,9 +178,10 @@ export default class CronService {
       { status: CrontabStatus.queued },
       { where: { id: ids } },
     );
-    ids.forEach((id) => {
-      this.runSingle(id);
-    });
+    concurrentRun(
+      ids.map((id) => async () => await this.runSingle(id)),
+      10,
+    );
   }
 
   public async stop(ids: number[]) {
@@ -403,11 +189,23 @@ export default class CronService {
     for (const doc of docs) {
       if (doc.pid) {
         try {
-          await killTask(doc.pid);
+          process.kill(-doc.pid);
         } catch (error) {
-          this.logger.error(error);
+          this.logger.silly(error);
         }
       }
+      const err = await this.killTask(doc.command);
+      const absolutePath = path.resolve(config.logPath, `${doc.log_path}`);
+      const logFileExist = doc.log_path && (await fileExist(absolutePath));
+      if (logFileExist) {
+        const str = err ? `\n${err}` : '';
+        fs.appendFileSync(
+          `${absolutePath}`,
+          `${str}\n## 执行结束...  ${new Date()
+            .toLocaleString('zh', { hour12: false })
+            .replace(' 24:', ' 00:')} `,
+        );
+      }
     }
 
     await CrontabModel.update(
@@ -416,102 +214,111 @@ export default class CronService {
     );
   }
 
-  private async runSingle(cronId: number): Promise<number | void> {
-    return taskLimit.manualRunWithCronLimit(() => {
-      return new Promise(async (resolve: any) => {
-        const cron = await this.getDb({ id: cronId });
-        const params = {
-          name: cron.name,
-          command: cron.command,
-          schedule: cron.schedule,
-          extraSchedules: cron.extra_schedules,
-        };
-        if (cron.status !== CrontabStatus.queued) {
-          resolve(params);
-          return;
+  public async killTask(name: string) {
+    let taskCommand = `ps -ef | grep "${name}" | grep -v grep | awk '{print $1}'`;
+    const execAsync = promisify(exec);
+    try {
+      let pid = (await execAsync(taskCommand)).stdout;
+      if (pid) {
+        pid = (await execAsync(`pstree -p ${pid}`)).stdout;
+      } else {
+        return;
+      }
+      let pids = pid.match(/\(\d+/g);
+      const killLogs = [];
+      if (pids && pids.length > 0) {
+        // node 执行脚本时还会有10个子进程，但是ps -ef中不存在，所以截取前三个
+        for (const id of pids) {
+          const c = `kill -9 ${id.slice(1)}`;
+          try {
+            const { stdout, stderr } = await execAsync(c);
+            if (stderr) {
+              killLogs.push(stderr);
+            }
+            if (stdout) {
+              killLogs.push(stdout);
+            }
+          } catch (error: any) {
+            killLogs.push(error.message);
+          }
         }
+      }
+      return killLogs.length > 0 ? JSON.stringify(killLogs) : '';
+    } catch (e) {
+      return JSON.stringify(e);
+    }
+  }
 
+  private async runSingle(cronId: number): Promise<number> {
+    return new Promise(async (resolve: any) => {
+      const cron = await this.getDb({ id: cronId });
+      if (cron.status !== CrontabStatus.queued) {
+        resolve();
+        return;
+      }
+
+      let { id, command, log_path } = cron;
+      const absolutePath = path.resolve(config.logPath, `${log_path}`);
+      const logFileExist = log_path && (await fileExist(absolutePath));
+
+      this.logger.silly('Running job');
+      this.logger.silly('ID: ' + id);
+      this.logger.silly('Original command: ' + command);
+
+      let cmdStr = command;
+      if (!cmdStr.includes('task ') && !cmdStr.includes('ql ')) {
+        cmdStr = `task ${cmdStr}`;
+      }
+      if (cmdStr.endsWith('.js')) {
+        cmdStr = `${cmdStr} now`;
+      }
+
+      const cp = spawn(cmdStr, { shell: '/bin/bash' });
+
+      await CrontabModel.update(
+        { status: CrontabStatus.running, pid: cp.pid },
+        { where: { id } },
+      );
+      cp.stderr.on('data', (data) => {
+        if (logFileExist) {
+          fs.appendFileSync(`${absolutePath}`, `${data}`);
+        }
+      });
+      cp.on('error', (err) => {
+        if (logFileExist) {
+          fs.appendFileSync(`${absolutePath}`, `${JSON.stringify(err)}`);
+        }
+      });
+
+      cp.on('exit', async (code, signal) => {
         this.logger.info(
-          `[panel][开始执行任务] 参数: ${JSON.stringify(params)}`,
+          `${command} pid: ${cp.pid} exit ${code} signal ${signal}`,
         );
-
-        let { id, command, log_path } = cron;
-        const uniqPath = await getUniqPath(command, `${id}`);
-        const logTime = dayjs().format('YYYY-MM-DD-HH-mm-ss-SSS');
-        const logDirPath = path.resolve(config.logPath, `${uniqPath}`);
-        if (log_path?.split('/')?.every((x) => x !== uniqPath)) {
-          await fs.mkdir(logDirPath, { recursive: true });
-        }
-        const logPath = `${uniqPath}/${logTime}.log`;
-        const absolutePath = path.resolve(config.logPath, `${logPath}`);
-        const cp = spawn(
-          `real_log_path=${logPath} no_delay=true ${this.makeCommand(
-            cron,
-            true,
-          )}`,
-          { shell: '/bin/bash' },
-        );
-
         await CrontabModel.update(
-          { status: CrontabStatus.running, pid: cp.pid, log_path: logPath },
+          { status: CrontabStatus.idle, pid: undefined },
           { where: { id } },
         );
-        cp.stdout.on('data', async (data) => {
-          await fs.appendFile(absolutePath, data.toString());
-        });
-        cp.stderr.on('data', async (data) => {
-          this.logger.info(
-            '[panel][执行任务失败] 命令: %s, 错误信息: %j',
-            command,
-            data.toString(),
-          );
-          await fs.appendFile(absolutePath, data.toString());
-        });
-        cp.on('error', async (err) => {
-          this.logger.error(
-            '[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 } },
-          );
-          resolve({ ...params, pid: cp.pid, code });
-        });
+        resolve();
+      });
+      cp.on('close', async (code) => {
+        this.logger.info(`${command} pid: ${cp.pid} closed ${code}`);
+        await CrontabModel.update(
+          { status: CrontabStatus.idle, pid: undefined },
+          { where: { id } },
+        );
+        resolve();
       });
     });
   }
 
   public async disabled(ids: number[]) {
     await CrontabModel.update({ isDisabled: 1 }, { where: { id: ids } });
-    await cronClient.delCron(ids.map(String));
-    await this.set_crontab();
+    await this.set_crontab(true);
   }
 
   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))
-      .map((doc) => ({
-        name: doc.name || '',
-        id: String(doc.id),
-        schedule: doc.schedule!,
-        command: this.makeCommand(doc),
-        extraSchedules: doc.extra_schedules || [],
-      }));
-    await cronClient.addCron(sixCron);
-    await this.set_crontab();
+    await this.set_crontab(true);
   }
 
   public async log(id: number) {
@@ -523,88 +330,130 @@ export default class CronService {
     const absolutePath = path.resolve(config.logPath, `${doc.log_path}`);
     const logFileExist = doc.log_path && (await fileExist(absolutePath));
     if (logFileExist) {
-      return await getFileContentByName(`${absolutePath}`);
+      return getFileContentByName(`${absolutePath}`);
+    }
+    const [, commandStr, url] = doc.command.split(/ +/);
+    let logPath = this.getKey(commandStr);
+    const isQlCommand = doc.command.startsWith('ql ');
+    const key =
+      (url && ['repo', 'raw'].includes(commandStr) && this.getKey(url)) ||
+      logPath;
+    if (isQlCommand) {
+      logPath = 'update';
+    }
+    let logDir = `${config.logPath}${logPath}`;
+    if (existsSync(logDir)) {
+      let files = await promises.readdir(logDir);
+      if (isQlCommand) {
+        files = files.filter((x) => x.includes(key));
+      }
+      return getFileContentByName(`${logDir}/${files[files.length - 1]}`);
     } else {
-      return '任务未运行';
+      return '';
     }
   }
 
   public async logs(id: number) {
     const doc = await this.getDb({ id });
-    if (!doc || !doc.log_path) {
+    if (!doc) {
       return [];
     }
 
-    const relativeDir = path.dirname(`${doc.log_path}`);
-    const dir = path.resolve(config.logPath, relativeDir);
-    const dirExist = await fileExist(dir);
-    if (dirExist) {
-      let files = await fs.readdir(dir);
-      return (
-        await Promise.all(
-          files.map(async (x) => ({
+    if (doc.log_path) {
+      const relativeDir = path.dirname(`${doc.log_path}`);
+      const dir = path.resolve(config.logPath, relativeDir);
+      if (existsSync(dir)) {
+        let files = await promises.readdir(dir);
+        return files
+          .map((x) => ({
             filename: x,
             directory: relativeDir.replace(config.logPath, ''),
-            time: (await fs.lstat(`${dir}/${x}`)).mtime.getTime(),
-          })),
-        )
-      ).sort((a, b) => b.time - a.time);
+            time: fs.statSync(`${dir}/${x}`).mtime.getTime(),
+          }))
+          .sort((a, b) => b.time - a.time);
+      }
+    }
+
+    const [, commandStr, url] = doc.command.split(/ +/);
+    let logPath = this.getKey(commandStr);
+    const isQlCommand = doc.command.startsWith('ql ');
+    const key =
+      (url && ['repo', 'raw'].includes(commandStr) && this.getKey(url)) ||
+      logPath;
+    if (isQlCommand) {
+      logPath = 'update';
+    }
+    let logDir = `${config.logPath}${logPath}`;
+    if (existsSync(logDir)) {
+      let files = await promises.readdir(logDir);
+      if (isQlCommand) {
+        files = files.filter((x) => x.includes(key));
+      }
+      return files
+        .map((x) => ({
+          filename: x,
+          directory: logPath,
+          time: fs.statSync(`${logDir}/${x}`).mtime.getTime(),
+        }))
+        .sort((a, b) => b.time - a.time);
     } else {
       return [];
     }
   }
 
-  private makeCommand(tab: Crontab, realTime?: boolean) {
-    let command = tab.command.trim();
-    if (!command.startsWith(TASK_PREFIX) && !command.startsWith(QL_PREFIX)) {
-      command = `${TASK_PREFIX}${tab.command}`;
-    }
-    let commandVariable = `real_time=${Boolean(realTime)} no_tee=true 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()}' `;
-    }
+  private getKey(command: string): string {
+    const start =
+      command.lastIndexOf('/') !== -1 ? command.lastIndexOf('/') + 1 : 0;
+    const end =
+      command.lastIndexOf('.') !== -1
+        ? command.lastIndexOf('.')
+        : command.length;
 
-    const crontab_job_string = `${commandVariable}${command}`;
+    const tmpStr = command.substring(0, start - 1);
+    let index = 0;
+    if (tmpStr.lastIndexOf('/') !== -1 && tmpStr.startsWith('http')) {
+      index = tmpStr.lastIndexOf('/');
+    } else if (tmpStr.lastIndexOf(':') !== -1 && tmpStr.startsWith('git@')) {
+      index = tmpStr.lastIndexOf(':');
+    }
+    if (index) {
+      return `${tmpStr.substring(index + 1)}_${command.substring(start, end)}`;
+    } else {
+      return command.substring(start, end);
+    }
+  }
+
+  private make_command(tab: Crontab) {
+    const crontab_job_string = `ID=${tab.id} ${tab.command}`;
     return crontab_job_string;
   }
 
-  private async set_crontab(data?: { data: Crontab[]; total: number }) {
-    const tabs = data ?? (await this.crontabs());
+  private async set_crontab(needReloadSchedule: boolean = false) {
+    const tabs = await this.crontabs();
     var crontab_string = '';
-    tabs.data.forEach((tab) => {
+    tabs.forEach((tab) => {
       const _schedule = tab.schedule && tab.schedule.split(/ +/);
-      if (
-        tab.isDisabled === 1 ||
-        _schedule!.length !== 5 ||
-        tab.extra_schedules?.length
-      ) {
+      if (tab.isDisabled === 1 || _schedule!.length !== 5) {
         crontab_string += '# ';
         crontab_string += tab.schedule;
         crontab_string += ' ';
-        crontab_string += this.makeCommand(tab);
+        crontab_string += this.make_command(tab);
         crontab_string += '\n';
       } else {
         crontab_string += tab.schedule;
         crontab_string += ' ';
-        crontab_string += this.makeCommand(tab);
+        crontab_string += this.make_command(tab);
         crontab_string += '\n';
       }
     });
 
-    await writeFileWithLock(config.crontabFile, crontab_string);
+    this.logger.silly(crontab_string);
+    fs.writeFileSync(config.crontabFile, crontab_string);
 
     execSync(`crontab ${config.crontabFile}`);
+    if (needReloadSchedule) {
+      exec(`pm2 reload schedule`);
+    }
     await CrontabModel.update({ saved: true }, { where: {} });
   }
 
@@ -642,19 +491,7 @@ export default class CronService {
     });
   }
 
-  public async autosave_crontab() {
-    const tabs = await this.crontabs();
-    this.set_crontab(tabs);
-
-    const sixCron = tabs.data
-      .filter((x) => this.isNodeCron(x) && x.isDisabled !== 1)
-      .map((doc) => ({
-        name: doc.name || '',
-        id: String(doc.id),
-        schedule: doc.schedule!,
-        command: this.makeCommand(doc),
-        extraSchedules: doc.extra_schedules || [],
-      }));
-    await cronClient.addCron(sixCron);
+  public autosave_crontab() {
+    return this.set_crontab();
   }
 }

back/services/cronView.ts

@@ -1,125 +0,0 @@
-import { Service, Inject } from 'typedi';
-import winston from 'winston';
-import { CrontabView, CrontabViewModel } from '../data/cronView';
-import {
-  initPosition,
-  maxPosition,
-  minPosition,
-  stepPosition,
-} from '../data/env';
-import { FindOptions } from 'sequelize';
-
-@Service()
-export default class CronViewService {
-  constructor(@Inject('logger') private logger: winston.Logger) {}
-
-  public async create(payload: CrontabView): Promise<CrontabView> {
-    let position = initPosition;
-    const views = await this.list();
-    if (views && views.length > 0 && views[views.length - 1].position) {
-      position = views[views.length - 1].position as number;
-    }
-    position = position / 2;
-    const tab = new CrontabView({ ...payload, position });
-    const doc = await this.insert(tab);
-
-    await this.checkPosition(tab.position!);
-    return doc;
-  }
-
-  public async insert(payload: CrontabView): Promise<CrontabView> {
-    return await CrontabViewModel.create(payload, { returning: true });
-  }
-
-  public async update(payload: CrontabView): Promise<CrontabView> {
-    const doc = await this.getDb({ id: payload.id });
-    const tab = new CrontabView({ ...doc, ...payload });
-    const newDoc = await this.updateDb(tab);
-    return newDoc;
-  }
-
-  public async updateDb(payload: CrontabView): Promise<CrontabView> {
-    await CrontabViewModel.update(payload, { where: { id: payload.id } });
-    return await this.getDb({ id: payload.id });
-  }
-
-  public async remove(ids: number[]) {
-    await CrontabViewModel.destroy({ where: { id: ids } });
-  }
-
-  public async list(): Promise<CrontabView[]> {
-    try {
-      const result = await CrontabViewModel.findAll({
-        where: {},
-        order: [['position', 'DESC']],
-      });
-      return result;
-    } catch (error) {
-      throw error;
-    }
-  }
-
-  public async getDb(
-    query: FindOptions<CrontabView>['where'],
-  ): Promise<CrontabView> {
-    const doc: any = await CrontabViewModel.findOne({ where: { ...query } });
-    if (!doc) {
-      throw new Error(`CronView ${JSON.stringify(query)} not found`);
-    }
-    return doc.get({ plain: true });
-  }
-
-  public async disabled(ids: number[]) {
-    await CrontabViewModel.update({ isDisabled: 1 }, { where: { id: ids } });
-  }
-
-  public async enabled(ids: number[]) {
-    await CrontabViewModel.update({ isDisabled: 0 }, { where: { id: ids } });
-  }
-
-  private async checkPosition(position: number) {
-    const precisionPosition = parseFloat(position.toPrecision(16));
-    if (precisionPosition < minPosition || precisionPosition > maxPosition) {
-      const envs = await this.list();
-      let position = initPosition;
-      for (const env of envs) {
-        position = position - stepPosition;
-        await this.updateDb({ id: env.id, position });
-      }
-    }
-  }
-
-  private getPrecisionPosition(position: number): number {
-    return parseFloat(position.toPrecision(16));
-  }
-
-  public async move({
-    id,
-    fromIndex,
-    toIndex,
-  }: {
-    fromIndex: number;
-    toIndex: number;
-    id: number;
-  }): Promise<CrontabView> {
-    let targetPosition: number;
-    const isUpward = fromIndex > toIndex;
-    const views = await this.list();
-    if (toIndex === 0 || toIndex === views.length - 1) {
-      targetPosition = isUpward
-        ? views[0].position! * 2
-        : views[toIndex].position! / 2;
-    } else {
-      targetPosition = isUpward
-        ? (views[toIndex].position! + views[toIndex - 1].position!) / 2
-        : (views[toIndex].position! + views[toIndex + 1].position!) / 2;
-    }
-    const newDoc = await this.update({
-      id,
-      position: this.getPrecisionPosition(targetPosition),
-    });
-
-    await this.checkPosition(targetPosition);
-    return newDoc;
-  }
-}

back/services/dependence.ts

@@ -8,20 +8,11 @@ import {
   DependenceTypes,
   unInstallDependenceCommandTypes,
   DependenceModel,
-  GetDependenceCommandTypes,
-  versionDependenceCommandTypes,
 } from '../data/dependence';
-import { spawn } from 'cross-spawn';
+import _ from 'lodash';
+import { spawn } from 'child_process';
 import SockService from './sock';
-import { FindOptions, Op } from 'sequelize';
-import {
-  fileExist,
-  getPid,
-  killTask,
-  promiseExecSuccess,
-} from '../config/util';
-import dayjs from 'dayjs';
-import taskLimit from '../shared/pLimit';
+import { Op } from 'sequelize';
 
 @Service()
 export default class DependenceService {
@@ -32,11 +23,11 @@ export default class DependenceService {
 
   public async create(payloads: Dependence[]): Promise<Dependence[]> {
     const tabs = payloads.map((x) => {
-      const tab = new Dependence({ ...x, status: DependenceStatus.queued });
+      const tab = new Dependence({ ...x, status: DependenceStatus.installing });
       return tab;
     });
     const docs = await this.insert(tabs);
-    this.installDependenceOneByOne(docs);
+    this.installOrUninstallDependencies(docs);
     return docs;
   }
 
@@ -53,10 +44,10 @@ export default class DependenceService {
     const tab = new Dependence({
       ...doc,
       ...other,
-      status: DependenceStatus.queued,
+      status: DependenceStatus.installing,
     });
     const newDoc = await this.updateDb(tab);
-    this.installDependenceOneByOne([newDoc]);
+    this.installOrUninstallDependencies([newDoc]);
     return newDoc;
   }
 
@@ -65,24 +56,13 @@ export default class DependenceService {
     return await this.getDb({ id: payload.id });
   }
 
-  public async remove(ids: number[], force = false): Promise<Dependence[]> {
+  public async remove(ids: number[]) {
+    await DependenceModel.update(
+      { status: DependenceStatus.removing, log: [] },
+      { where: { id: ids } },
+    );
     const docs = await DependenceModel.findAll({ where: { id: ids } });
-    const unInstalledDeps = docs.filter(
-      (x) => x.status !== DependenceStatus.installed,
-    );
-    const installedDeps = docs.filter(
-      (x) => x.status === DependenceStatus.installed,
-    );
-    await this.removeDb(unInstalledDeps.map((x) => x.id!));
-
-    if (installedDeps.length) {
-      await DependenceModel.update(
-        { status: DependenceStatus.queued, log: [] },
-        { where: { id: ids } },
-      );
-
-      this.installDependenceOneByOne(docs, false, force);
-    }
+    this.installOrUninstallDependencies(docs, false);
     return docs;
   }
 
@@ -91,23 +71,13 @@ export default class DependenceService {
   }
 
   public async dependencies(
-    {
-      searchValue,
-      type,
-      status,
-    }: { searchValue: string; type: string; status: string },
-    sort: any = [],
+    { searchValue, type }: { searchValue: string; type: string },
+    sort: any = { position: -1 },
     query: any = {},
   ): Promise<Dependence[]> {
-    let condition = {
-      ...query,
-      type: DependenceTypes[type as any],
-    };
-    if (status) {
-      condition.status = status.split(',').map(Number);
-    }
+    let condition = { ...query, type: DependenceTypes[type as any] };
     if (searchValue) {
-      const encodeText = encodeURI(searchValue);
+      const encodeText = encodeURIComponent(searchValue);
       const reg = {
         [Op.or]: [
           { [Op.like]: `%${searchValue}%` },
@@ -121,267 +91,139 @@ export default class DependenceService {
       };
     }
     try {
-      const result = await this.find(condition, sort);
+      const result = await this.find(condition);
       return result as any;
     } catch (error) {
       throw error;
     }
   }
 
-  public installDependenceOneByOne(
-    docs: Dependence[],
-    isInstall: boolean = true,
-    force: boolean = false,
-  ) {
-    docs.forEach((dep) => {
-      this.installOrUninstallDependency(dep, isInstall, force);
-    });
-  }
-
   public async reInstall(ids: number[]): Promise<Dependence[]> {
     await DependenceModel.update(
-      { status: DependenceStatus.queued, log: [] },
+      { status: DependenceStatus.installing, log: [] },
       { where: { id: ids } },
     );
 
     const docs = await DependenceModel.findAll({ where: { id: ids } });
-    this.installDependenceOneByOne(docs, true, true);
+    await this.installOrUninstallDependencies(docs);
     return docs;
   }
 
-  public async cancel(ids: number[]) {
-    const docs = await DependenceModel.findAll({ where: { id: ids } });
-    for (const doc of docs) {
-      taskLimit.removeQueuedDependency(doc);
-      const depInstallCommand = InstallDependenceCommandTypes[doc.type];
-      const depUnInstallCommand = unInstallDependenceCommandTypes[doc.type];
-      const installCmd = `${depInstallCommand} ${doc.name.trim()}`;
-      const unInstallCmd = `${depUnInstallCommand} ${doc.name.trim()}`;
-      const pids = await Promise.all([
-        getPid(installCmd),
-        getPid(unInstallCmd),
-      ]);
-      for (const pid of pids) {
-        pid && (await killTask(pid));
-      }
-    }
-    await DependenceModel.update(
-      { status: DependenceStatus.cancelled },
-      { where: { id: ids } },
-    );
-  }
-
-  private async find(query: any, sort: any = []): Promise<Dependence[]> {
-    const docs = await DependenceModel.findAll({
-      where: { ...query },
-      order: [...sort, ['createdAt', 'DESC']],
-    });
+  private async find(query: any, sort?: any): Promise<Dependence[]> {
+    const docs = await DependenceModel.findAll({ where: { ...query } });
     return docs;
   }
 
-  public async getDb(
-    query: FindOptions<Dependence>['where'],
-  ): Promise<Dependence> {
+  public async getDb(query: any): Promise<Dependence> {
     const doc: any = await DependenceModel.findOne({ where: { ...query } });
-    if (!doc) {
-      throw new Error(`Dependency ${JSON.stringify(query)} not found`);
-    }
-    return doc.get({ plain: true });
+    return doc && (doc.get({ plain: true }) as Dependence);
   }
 
   private async updateLog(ids: number[], log: string): Promise<void> {
-    taskLimit.updateDepLog(async () => {
-      const docs = await DependenceModel.findAll({ where: { id: ids } });
-      for (const doc of docs) {
-        const newLog = doc?.log ? [...doc.log, log] : [log];
-        await DependenceModel.update(
-          { log: newLog },
-          { where: { id: doc.id } },
-        );
-      }
-      return null;
-    });
+    const doc = await DependenceModel.findOne({ where: { id: ids } });
+    const newLog = doc?.log ? [...doc.log, log] : [log];
+    await DependenceModel.update({ log: newLog }, { where: { id: ids } });
   }
 
-  public installOrUninstallDependency(
-    dependency: Dependence,
+  public installOrUninstallDependencies(
+    dependencies: Dependence[],
     isInstall: boolean = true,
-    force: boolean = false,
   ) {
-    return taskLimit.runDependeny(dependency, () => {
-      return new Promise(async (resolve) => {
-        if (taskLimit.firstDependencyId !== dependency.id) {
-          return resolve(null);
-        }
-
-        taskLimit.removeQueuedDependency(dependency);
-
-        const depIds = [dependency.id!];
-        const status = isInstall
-          ? DependenceStatus.installing
-          : DependenceStatus.removing;
-        await DependenceModel.update({ status }, { where: { id: depIds } });
-
-        const socketMessageType = isInstall
-          ? 'installDependence'
-          : 'uninstallDependence';
-        let depName = dependency.name.trim();
-        const depRunCommand = (
-          isInstall
-            ? InstallDependenceCommandTypes
-            : unInstallDependenceCommandTypes
-        )[dependency.type];
-        const actionText = isInstall ? '安装' : '删除';
-        const startTime = dayjs();
-
-        const message = `开始${actionText}依赖 ${depName}，开始时间 ${startTime.format(
-          'YYYY-MM-DD HH:mm:ss',
-        )}\n\n`;
+    return new Promise(async (resolve) => {
+      if (dependencies.length === 0) {
+        resolve(null);
+        return;
+      }
+      const depNames = dependencies.map((x) => x.name).join(' ');
+      const depRunCommand = (
+        isInstall
+          ? InstallDependenceCommandTypes
+          : unInstallDependenceCommandTypes
+      )[dependencies[0].type as any];
+      const actionText = isInstall ? '安装' : '删除';
+      const depIds = dependencies.map((x) => x.id) as number[];
+      const cp = spawn(`${depRunCommand} ${depNames}`, { shell: '/bin/bash' });
+      const startTime = Date.now();
+      this.sockService.sendMessage({
+        type: 'installDependence',
+        message: `开始${actionText}依赖 ${depNames}，开始时间 ${new Date(
+          startTime,
+        ).toLocaleString()}`,
+        references: depIds,
+      });
+      await this.updateLog(
+        depIds,
+        `开始${actionText}依赖 ${depNames}，开始时间 ${new Date(
+          startTime,
+        ).toLocaleString()}\n`,
+      );
+      cp.stdout.on('data', async (data) => {
         this.sockService.sendMessage({
-          type: socketMessageType,
-          message,
+          type: 'installDependence',
+          message: data.toString(),
           references: depIds,
         });
-        this.updateLog(depIds, message);
+        await this.updateLog(depIds, data.toString());
+      });
 
-        // 判断是否已经安装过依赖
-        if (isInstall && !force) {
-          const getCommandPrefix = GetDependenceCommandTypes[dependency.type];
-          const depVersionStr = versionDependenceCommandTypes[dependency.type];
-          let depVersion = '';
-          if (depName.includes(depVersionStr)) {
-            const symbolRegx = new RegExp(
-              `(.*)${depVersionStr}([0-9\\.\\-\\+a-zA-Z]*)`,
-            );
-            const [, _depName, _depVersion] = depName.match(symbolRegx) || [];
-            if (_depVersion && _depName) {
-              depName = _depName;
-              depVersion = _depVersion;
-            }
-          }
-          const isNodeDependence = dependency.type === DependenceTypes.nodejs;
-          const isLinuxDependence = dependency.type === DependenceTypes.linux;
-          const isPythonDependence =
-            dependency.type === DependenceTypes.python3;
-          const depInfo = (
-            await promiseExecSuccess(
-              isNodeDependence
-                ? `${getCommandPrefix} | grep "${depName}" | head -1`
-                : `${getCommandPrefix} ${depName}`,
-            )
-          )
-            .replace(/\s{2,}/, ' ')
-            .replace(/\s+$/, '');
+      cp.stderr.on('data', async (data) => {
+        this.sockService.sendMessage({
+          type: 'installDependence',
+          message: data.toString(),
+          references: depIds,
+        });
+        await this.updateLog(depIds, data.toString());
+      });
 
-          if (
-            depInfo &&
-            ((isNodeDependence && depInfo.split(' ')?.[0] === depName) ||
-              (isLinuxDependence &&
-                depInfo.toLocaleLowerCase().includes('installed')) ||
-              isPythonDependence) &&
-            (!depVersion || depInfo.includes(depVersion))
-          ) {
-            const endTime = dayjs();
-            const _message = `检测到已经安装 ${depName}\n\n${depInfo}\n\n跳过安装\n\n依赖${actionText}成功，结束时间 ${endTime.format(
-              'YYYY-MM-DD HH:mm:ss',
-            )}，耗时 ${endTime.diff(startTime, 'second')} 秒`;
-            this.sockService.sendMessage({
-              type: socketMessageType,
-              message: _message,
-              references: depIds,
-            });
-            this.updateLog(depIds, _message);
-            await DependenceModel.update(
-              { status: DependenceStatus.installed },
-              { where: { id: depIds } },
-            );
-            return resolve(null);
-          }
+      cp.on('error', async (err) => {
+        this.sockService.sendMessage({
+          type: 'installDependence',
+          message: JSON.stringify(err),
+          references: depIds,
+        });
+        await this.updateLog(depIds, JSON.stringify(err));
+        resolve(null);
+      });
+
+      cp.on('close', async (code) => {
+        const endTime = Date.now();
+        const isSucceed = code === 0;
+        const resultText = isSucceed ? '成功' : '失败';
+
+        this.sockService.sendMessage({
+          type: 'installDependence',
+          message: `依赖${actionText}${resultText}，结束时间 ${new Date(
+            endTime,
+          ).toLocaleString()}，耗时 ${(endTime - startTime) / 1000} 秒`,
+          references: depIds,
+        });
+        await this.updateLog(
+          depIds,
+          `依赖${actionText}${resultText}，结束时间 ${new Date(
+            endTime,
+          ).toLocaleString()}，耗时 ${(endTime - startTime) / 1000} 秒`,
+        );
+
+        let status = null;
+        if (isSucceed) {
+          status = isInstall
+            ? DependenceStatus.installed
+            : DependenceStatus.removed;
+        } else {
+          status = isInstall
+            ? DependenceStatus.installFailed
+            : DependenceStatus.removeFailed;
         }
-        const dependenceProxyFileExist = await fileExist(
-          config.dependenceProxyFile,
-        );
-        const proxyStr = dependenceProxyFileExist
-          ? `source ${config.dependenceProxyFile} &&`
-          : '';
-        const cp = spawn(
-          `${proxyStr} ${depRunCommand} ${dependency.name.trim()}`,
-          {
-            shell: '/bin/bash',
-          },
-        );
+        await DependenceModel.update({ status }, { where: { id: depIds } });
 
-        cp.stdout.on('data', async (data) => {
-          this.sockService.sendMessage({
-            type: socketMessageType,
-            message: data.toString(),
-            references: depIds,
-          });
-          this.updateLog(depIds, data.toString());
-        });
-
-        cp.stderr.on('data', async (data) => {
-          this.sockService.sendMessage({
-            type: socketMessageType,
-            message: data.toString(),
-            references: depIds,
-          });
-          this.updateLog(depIds, data.toString());
-        });
-
-        cp.on('error', async (err) => {
-          this.sockService.sendMessage({
-            type: socketMessageType,
-            message: JSON.stringify(err),
-            references: depIds,
-          });
-          this.updateLog(depIds, JSON.stringify(err));
-        });
-
-        cp.on('exit', async (code) => {
-          const endTime = dayjs();
-          const isSucceed = code === 0;
-          const resultText = isSucceed ? '成功' : '失败';
-
-          const message = `\n依赖${actionText}${resultText}，结束时间 ${endTime.format(
-            'YYYY-MM-DD HH:mm:ss',
-          )}，耗时 ${endTime.diff(startTime, 'second')} 秒`;
-          this.sockService.sendMessage({
-            type: socketMessageType,
-            message,
-            references: depIds,
-          });
-          this.updateLog(depIds, message);
-
-          let status: number;
-          if (isSucceed) {
-            status = isInstall
-              ? DependenceStatus.installed
-              : DependenceStatus.removed;
-          } else {
-            status = isInstall
-              ? DependenceStatus.installFailed
-              : DependenceStatus.removeFailed;
-          }
-          const docs = await DependenceModel.findAll({ where: { id: depIds } });
-          const _docIds = docs
-            .filter((x) => x.status !== DependenceStatus.cancelled)
-            .map((x) => x.id!);
-
-          if (_docIds.length > 0) {
-            await DependenceModel.update(
-              { status },
-              { where: { id: _docIds } },
-            );
-          }
-
-          // 如果删除依赖成功或者强制删除
-          if ((isSucceed || force) && !isInstall) {
+        // 如果删除依赖成功，3秒后删除数据库记录
+        if (isSucceed && !isInstall) {
+          setTimeout(() => {
             this.removeDb(depIds);
-          }
+          }, 5000);
+        }
 
-          resolve(null);
-        });
+        resolve(null);
       });
     });
   }

back/services/env.ts

@@ -1,19 +1,11 @@
 import { Service, Inject } from 'typedi';
 import winston from 'winston';
+import { getFileContentByName } from '../config/util';
 import config from '../config';
-import * as fs from 'fs/promises';
-import {
-  Env,
-  EnvModel,
-  EnvStatus,
-  initPosition,
-  maxPosition,
-  minPosition,
-  stepPosition,
-} from '../data/env';
-import groupBy from 'lodash/groupBy';
-import { FindOptions, Op } from 'sequelize';
-import { writeFileWithLock } from '../shared/utils';
+import * as fs from 'fs';
+import { Env, EnvModel, EnvStatus, initEnvPosition } from '../data/env';
+import _ from 'lodash';
+import { Op } from 'sequelize';
 
 @Service()
 export default class EnvService {
@@ -21,22 +13,17 @@ export default class EnvService {
 
   public async create(payloads: Env[]): Promise<Env[]> {
     const envs = await this.envs();
-    let position = initPosition;
-    if (
-      envs &&
-      envs.length > 0 &&
-      typeof envs[envs.length - 1].position === 'number'
-    ) {
-      position = envs[envs.length - 1].position!;
+    let position = initEnvPosition;
+    if (envs && envs.length > 0 && envs[envs.length - 1].position) {
+      position = envs[envs.length - 1].position as number;
     }
     const tabs = payloads.map((x) => {
-      position = position - stepPosition;
+      position = position / 2;
       const tab = new Env({ ...x, position });
       return tab;
     });
     const docs = await this.insert(tabs);
     await this.set_envs();
-    await this.checkPosition(tabs[tabs.length - 1].position!);
     return docs;
   }
 
@@ -50,9 +37,7 @@ export default class EnvService {
   }
 
   public async update(payload: Env): Promise<Env> {
-    const doc = await this.getDb({ id: payload.id });
-    const tab = new Env({ ...doc, ...payload });
-    const newDoc = await this.updateDb(tab);
+    const newDoc = await this.updateDb(payload);
     await this.set_envs();
     return newDoc;
   }
@@ -82,47 +67,28 @@ export default class EnvService {
     const envs = await this.envs();
     if (toIndex === 0 || toIndex === envs.length - 1) {
       targetPosition = isUpward
-        ? envs[0].position! + stepPosition
-        : envs[toIndex].position! - stepPosition;
+        ? envs[0].position * 2
+        : envs[toIndex].position / 2;
     } else {
       targetPosition = isUpward
-        ? (envs[toIndex].position! + envs[toIndex - 1].position!) / 2
-        : (envs[toIndex].position! + envs[toIndex + 1].position!) / 2;
+        ? (envs[toIndex].position + envs[toIndex - 1].position) / 2
+        : (envs[toIndex].position + envs[toIndex + 1].position) / 2;
     }
-
     const newDoc = await this.update({
       id,
-      position: this.getPrecisionPosition(targetPosition),
+      position: targetPosition,
     });
-
-    await this.checkPosition(targetPosition, envs[toIndex].position!);
     return newDoc;
   }
 
-  private async checkPosition(position: number, edge: number = 0) {
-    const precisionPosition = parseFloat(position.toPrecision(16));
-    if (
-      precisionPosition < minPosition ||
-      precisionPosition > maxPosition ||
-      Math.abs(precisionPosition - edge) < minPosition
-    ) {
-      const envs = await this.envs();
-      let position = initPosition;
-      for (const env of envs) {
-        position = position - stepPosition;
-        await this.updateDb({ id: env.id, position });
-      }
-    }
-  }
-
-  private getPrecisionPosition(position: number): number {
-    return parseFloat(position.toPrecision(16));
-  }
-
-  public async envs(searchText: string = '', query: any = {}): Promise<Env[]> {
+  public async envs(
+    searchText: string = '',
+    sort: any = { position: -1 },
+    query: any = {},
+  ): Promise<Env[]> {
     let condition = { ...query };
     if (searchText) {
-      const encodeText = encodeURI(searchText);
+      const encodeText = encodeURIComponent(searchText);
       const reg = {
         [Op.or]: [
           { [Op.like]: `%${searchText}%` },
@@ -146,10 +112,7 @@ export default class EnvService {
       };
     }
     try {
-      const result = await this.find(condition, [
-        ['position', 'DESC'],
-        ['createdAt', 'ASC'],
-      ]);
+      const result = await this.find(condition, [['position', 'DESC']]);
       return result as any;
     } catch (error) {
       throw error;
@@ -164,12 +127,9 @@ export default class EnvService {
     return docs;
   }
 
-  public async getDb(query: FindOptions<Env>['where']): Promise<Env> {
+  public async getDb(query: any): Promise<Env> {
     const doc: any = await EnvModel.findOne({ where: { ...query } });
-    if (!doc) {
-      throw new Error(`Env ${JSON.stringify(query)} not found`);
-    }
-    return doc.get({ plain: true });
+    return doc && (doc.get({ plain: true }) as Env);
   }
 
   public async disabled(ids: string[]) {
@@ -191,43 +151,33 @@ export default class EnvService {
   }
 
   public async set_envs() {
-    const envs = await this.envs('', {
-      name: { [Op.not]: null },
-      status: EnvStatus.normal,
-    });
-    const groups = groupBy(envs, 'name');
+    const envs = await this.envs(
+      '',
+      { position: -1 },
+      { name: { [Op.not]: null } },
+    );
+    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];
 
         // 忽略不符合bash要求的环境变量名称
-        if (/^[a-zA-Z_][0-9a-zA-Z_]*$/.test(key)) {
-          let value = group
-            .map((x) => x.value)
+        if (/^[a-zA-Z_][0-9a-zA-Z_]+$/.test(key)) {
+          let value = _(group)
+            .filter((x) => x.status !== EnvStatus.disabled)
+            .map('value')
             .join('&')
-            .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`;
+            .replace(/ /g, '');
+          if (/"/.test(value)) {
+            value = `'${value}'`;
+          } else {
+            value = `"${value}"`;
+          }
+          env_string += `export ${key}=${value}\n`;
         }
       }
     }
-    await writeFileWithLock(config.envFile, env_string);
-    await writeFileWithLock(config.jsEnvFile, js_env_string);
-    await writeFileWithLock(config.pyEnvFile, py_env_string);
+    fs.writeFileSync(config.envFile, env_string);
   }
 }

back/services/notify.ts

@@ -1,14 +1,11 @@
-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, safeJSONParse } from '../config/util';
 import { NotificationInfo } from '../data/notify';
+import { Service, Inject } from 'typedi';
+import winston from 'winston';
 import UserService from './user';
-import { readFile } from 'fs/promises';
-import config from '../config';
+import got from 'got';
+import nodemailer from 'nodemailer';
+import crypto from 'crypto';
+import { HttpProxyAgent, HttpsProxyAgent } from 'hpagent';
 
 @Service()
 export default class NotificationService {
@@ -20,55 +17,22 @@ export default class NotificationService {
     ['goCqHttpBot', this.goCqHttpBot],
     ['serverChan', this.serverChan],
     ['pushDeer', this.pushDeer],
-    ['chat', this.chat],
     ['bark', this.bark],
     ['telegramBot', this.telegramBot],
     ['dingtalkBot', this.dingtalkBot],
     ['weWorkBot', this.weWorkBot],
     ['weWorkApp', this.weWorkApp],
-    ['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 timeout = 10000;
   private title = '';
   private content = '';
   private params!: Omit<NotificationInfo, 'type'>;
-  private gotOption = {
-    timeout: 10000,
-    retry: 1,
-  };
 
-  constructor() {}
-
-  public async externalNotify(
-    title: string,
-    content: string,
-  ): Promise<boolean | undefined> {
-    const { type, ...rest } = safeJSONParse(
-      await readFile(config.systemNotifyFile, 'utf-8'),
-    );
-    if (type) {
-      this.title = title;
-      this.content = content;
-      this.params = rest;
-      const notificationModeAction = this.modeMap.get(type);
-      try {
-        return await notificationModeAction?.call(this);
-      } catch (error: any) {
-        throw error;
-      }
-    }
-    return false;
-  }
+  constructor(@Inject('logger') private logger: winston.Logger) {}
 
   public async notify(
     title: string,
@@ -83,7 +47,7 @@ export default class NotificationService {
       try {
         return await notificationModeAction?.call(this);
       } catch (error: any) {
-        throw error;
+        return false;
       }
     }
     return false;
@@ -106,163 +70,89 @@ export default class NotificationService {
   }
 
   private async gotify() {
-    const { gotifyUrl, gotifyToken, gotifyPriority = 1 } = this.params;
-    try {
-      const res: any = await got
-        .post(`${gotifyUrl}/message?token=${gotifyToken}`, {
-          ...this.gotOption,
-          body: `title=${encodeURIComponent(
-            this.title,
-          )}&message=${encodeURIComponent(
-            this.content,
-          )}&priority=${gotifyPriority}`,
-          headers: {
-            'Content-Type': 'application/x-www-form-urlencoded',
-          },
-        })
-        .json();
-      if (typeof res.id === 'number') {
-        return true;
-      } else {
-        throw new Error(JSON.stringify(res));
-      }
-    } catch (error: any) {
-      throw new Error(error.response ? error.response.body : error);
-    }
+    const { gotifyUrl, gotifyToken, gotifyPriority } = this.params;
+    const res: any = await got
+      .post(`${gotifyUrl}/message?token=${gotifyToken}`, {
+        timeout: this.timeout,
+        retry: 0,
+        body: `title=${encodeURIComponent(
+          this.title,
+        )}&message=${encodeURIComponent(
+          this.content,
+        )}&priority=${gotifyPriority}`,
+        headers: {
+          'Content-Type': 'application/x-www-form-urlencoded',
+        },
+      })
+      .json();
+    return typeof res.id === 'number';
   }
 
   private async goCqHttpBot() {
     const { goCqHttpBotQq, goCqHttpBotToken, goCqHttpBotUrl } = this.params;
-    try {
-      const res: any = await got
-        .post(`${goCqHttpBotUrl}?${goCqHttpBotQq}`, {
-          ...this.gotOption,
-          json: { message: `${this.title}\n${this.content}` },
-          headers: { Authorization: 'Bearer ' + goCqHttpBotToken },
-        })
-        .json();
-      if (res.retcode === 0) {
-        return true;
-      } else {
-        throw new Error(JSON.stringify(res));
-      }
-    } catch (error: any) {
-      throw new Error(error.response ? error.response.body : error);
-    }
+    const res: any = await got
+      .post(`${goCqHttpBotUrl}?${goCqHttpBotQq}`, {
+        timeout: this.timeout,
+        retry: 0,
+        json: { message: `${this.title}\n${this.content}` },
+        headers: { Authorization: 'Bearer ' + goCqHttpBotToken },
+      })
+      .json();
+    return res.retcode === 0;
   }
 
   private async serverChan() {
     const { serverChanKey } = this.params;
-    const matchResult = serverChanKey.match(/^sctp(\d+)t/i);
-    const url = matchResult && matchResult[1]
-      ? `https://${matchResult[1]}.push.ft07.com/send/${serverChanKey}.send`
-      : `https://sctapi.ftqq.com/${serverChanKey}.send`;
-
-    try {
-      const res: any = await got
-        .post(url, {
-          ...this.gotOption,
-          body: `title=${encodeURIComponent(this.title)}&desp=${encodeURIComponent(this.content)}`,
-          headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-        })
-        .json();
-      if (res.errno === 0 || res.data.errno === 0) {
-        return true;
-      } else {
-        throw new Error(JSON.stringify(res));
-      }
-    } catch (error: any) {
-      throw new Error(error.response ? error.response.body : error);
-    }
+    const url = serverChanKey.startsWith('SCT')
+      ? `https://sctapi.ftqq.com/${serverChanKey}.send`
+      : `https://sc.ftqq.com/${serverChanKey}.send`;
+    const res: any = await got
+      .post(url, {
+        timeout: this.timeout,
+        retry: 0,
+        body: `title=${this.title}&desp=${this.content}`,
+        headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+      })
+      .json();
+    return res.errno === 0 || res.data.errno === 0;
   }
 
   private async pushDeer() {
-    const { pushDeerKey, pushDeerUrl } = this.params;
-    const url = pushDeerUrl || `https://api2.pushdeer.com/message/push`;
-    try {
-      const res: any = await got
-        .post(url, {
-          ...this.gotOption,
-          body: `pushkey=${pushDeerKey}&text=${encodeURIComponent(
-            this.title,
-          )}&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
-      ) {
-        return true;
-      } else {
-        throw new Error(JSON.stringify(res));
-      }
-    } catch (error: any) {
-      throw new Error(error.response ? error.response.body : error);
-    }
-  }
-
-  private async chat() {
-    const { chatUrl, chatToken } = this.params;
-    const url = `${chatUrl}${chatToken}`;
-    try {
-      const res: any = await got
-        .post(url, {
-          ...this.gotOption,
-          body: `payload={"text":"${this.title}\n${this.content}"}`,
-          headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-        })
-        .json();
-      if (res.success) {
-        return true;
-      } else {
-        throw new Error(JSON.stringify(res));
-      }
-    } catch (error: any) {
-      throw new Error(error.response ? error.response.body : error);
-    }
+    const { pushDeerKey } = this.params;
+    const url = `https://api2.pushdeer.com/message/push`;
+    const res: any = await got
+      .post(url, {
+        timeout: this.timeout,
+        retry: 0,
+        body: `pushkey=${pushDeerKey}&text=${encodeURIComponent(
+          this.title,
+        )}&desp=${encodeURIComponent(this.content)}&type=markdown`,
+        headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+      })
+      .json();
+    return (
+      res.content.result.length !== undefined && res.content.result.length > 0
+    );
   }
 
   private async bark() {
-    let {
-      barkPush,
-      barkIcon = '',
-      barkSound = '',
-      barkGroup = '',
-      barkLevel = '',
-      barkUrl = '',
-      barkArchive = '',
-    } = this.params;
-    if (!barkPush.startsWith('http')) {
+    let { barkPush, barkIcon, barkSound, barkGroup } = this.params;
+    if (!barkPush.startsWith('http') && !barkPush.startsWith('https')) {
       barkPush = `https://api.day.app/${barkPush}`;
     }
-    const url = `${barkPush}`;
-    const body = {
-      title: this.title,
-      body: this.content,
-      icon: barkIcon,
-      sound: barkSound,
-      group: barkGroup,
-      isArchive: barkArchive,
-      level: barkLevel,
-      url: barkUrl,
-    };
-    try {
-      const res: any = await got
-        .post(url, {
-          ...this.gotOption,
-          json: body,
-          headers: { 'Content-Type': 'application/json' },
-        })
-        .json();
-      if (res.code === 200) {
-        return true;
-      } else {
-        throw new Error(JSON.stringify(res));
-      }
-    } catch (error: any) {
-      throw new Error(error.response ? error.response.body : error);
-    }
+    const url = `${barkPush}/${encodeURIComponent(
+      this.title,
+    )}/${encodeURIComponent(
+      this.content,
+    )}?icon=${barkIcon}?sound=${barkSound}&group=${barkGroup}`;
+    const res: any = await got
+      .get(url, {
+        timeout: this.timeout,
+        retry: 0,
+        headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+      })
+      .json();
+    return res.code === 200;
   }
 
   private async telegramBot() {
@@ -275,8 +165,8 @@ export default class NotificationService {
       telegramBotUserId,
     } = this.params;
     const authStr = telegramBotProxyAuth ? `${telegramBotProxyAuth}@` : '';
-    const url = `${
-      telegramBotApiHost ? telegramBotApiHost : 'https://api.telegram.org'
+    const url = `https://${
+      telegramBotApiHost ? telegramBotApiHost : 'api.telegram.org'
     }/bot${telegramBotToken}/sendMessage`;
     let agent;
     if (telegramBotProxyHost && telegramBotProxyPort) {
@@ -294,23 +184,16 @@ export default class NotificationService {
         https: httpsAgent,
       };
     }
-    try {
-      const res: any = await got
-        .post(url, {
-          ...this.gotOption,
-          body: `chat_id=${telegramBotUserId}&text=${this.title}\n\n${this.content}&disable_web_page_preview=true`,
-          headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-          agent,
-        })
-        .json();
-      if (res.ok) {
-        return true;
-      } else {
-        throw new Error(JSON.stringify(res));
-      }
-    } catch (error: any) {
-      throw new Error(error.response ? error.response.body : error);
-    }
+    const res: any = await got
+      .post(url, {
+        timeout: this.timeout,
+        retry: 0,
+        body: `chat_id=${telegramBotUserId}&text=${this.title}\n\n${this.content}&disable_web_page_preview=true`,
+        headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+        agent,
+      })
+      .json();
+    return !!res.ok;
   }
 
   private async dingtalkBot() {
@@ -324,63 +207,48 @@ export default class NotificationService {
       secretParam = `&timestamp=${dateNow}&sign=${result}`;
     }
     const url = `https://oapi.dingtalk.com/robot/send?access_token=${dingtalkBotToken}${secretParam}`;
-    try {
-      const res: any = await got
-        .post(url, {
-          ...this.gotOption,
-          json: {
-            msgtype: 'text',
-            text: {
-              content: ` ${this.title}\n\n${this.content}`,
-            },
+    const res: any = await got
+      .post(url, {
+        timeout: this.timeout,
+        retry: 0,
+        json: {
+          msgtype: 'text',
+          text: {
+            content: ` ${this.title}\n\n${this.content}`,
           },
-        })
-        .json();
-      if (res.errcode === 0) {
-        return true;
-      } else {
-        throw new Error(JSON.stringify(res));
-      }
-    } catch (error: any) {
-      throw new Error(error.response ? error.response.body : error);
-    }
+        },
+      })
+      .json();
+    return res.errcode === 0;
   }
 
   private async weWorkBot() {
-    const { weWorkBotKey, weWorkOrigin = 'https://qyapi.weixin.qq.com' } =
-      this.params;
-    const url = `${weWorkOrigin}/cgi-bin/webhook/send?key=${weWorkBotKey}`;
-    try {
-      const res: any = await got
-        .post(url, {
-          ...this.gotOption,
-          json: {
-            msgtype: 'text',
-            text: {
-              content: ` ${this.title}\n\n${this.content}`,
-            },
+    const { weWorkBotKey } = this.params;
+    const url = `https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=${weWorkBotKey}`;
+    const res: any = await got
+      .post(url, {
+        timeout: this.timeout,
+        retry: 0,
+        json: {
+          msgtype: 'text',
+          text: {
+            content: ` ${this.title}\n\n${this.content}`,
           },
-        })
-        .json();
-      if (res.errcode === 0) {
-        return true;
-      } else {
-        throw new Error(JSON.stringify(res));
-      }
-    } catch (error: any) {
-      throw new Error(error.response ? error.response.body : error);
-    }
+        },
+      })
+      .json();
+    return res.errcode === 0;
   }
 
   private async weWorkApp() {
-    const { weWorkAppKey, weWorkOrigin = 'https://qyapi.weixin.qq.com' } =
-      this.params;
+    const { weWorkAppKey } = this.params;
     const [corpid, corpsecret, touser, agentid, thumb_media_id = '1'] =
       weWorkAppKey.split(',');
-    const url = `${weWorkOrigin}/cgi-bin/gettoken`;
-    const tokenRes: any = await got
+    const url = `https://qyapi.weixin.qq.com/cgi-bin/gettoken`;
+    const { access_token } = await got
       .post(url, {
-        ...this.gotOption,
+        timeout: this.timeout,
+        retry: 0,
         json: {
           corpid,
           corpsecret,
@@ -426,431 +294,78 @@ export default class NotificationService {
         break;
     }
 
-    try {
-      const res: any = await got
-        .post(
-          `${weWorkOrigin}/cgi-bin/message/send?access_token=${tokenRes.access_token}`,
-          {
-            ...this.gotOption,
-            json: {
-              touser,
-              agentid,
-              safe: '0',
-              ...options,
-            },
-          },
-        )
-        .json();
-
-      if (res.errcode === 0) {
-        return true;
-      } else {
-        throw new Error(JSON.stringify(res));
-      }
-    } catch (error: any) {
-      throw new Error(error.response ? error.response.body : error);
-    }
-  }
-
-  private async aibotk() {
-    const { aibotkKey, aibotkType, aibotkName } = this.params;
-    let url = '';
-    let json = {};
-    switch (aibotkType) {
-      case 'room':
-        url = 'https://api-bot.aibotk.com/openapi/v1/chat/room';
-        json = {
-          apiKey: `${aibotkKey}`,
-          roomName: `${aibotkName}`,
-          message: {
-            type: 1,
-            content: `【青龙快讯】\n\n${this.title}\n${this.content}`,
-          },
-        };
-        break;
-      case 'contact':
-        url = 'https://api-bot.aibotk.com/openapi/v1/chat/contact';
-        json = {
-          apiKey: `${aibotkKey}`,
-          name: `${aibotkName}`,
-          message: {
-            type: 1,
-            content: `【青龙快讯】\n\n${this.title}\n${this.content}`,
-          },
-        };
-        break;
-    }
-
-    try {
-      const res: any = await got
-        .post(url, {
-          ...this.gotOption,
+    const res: any = await got
+      .post(
+        `https://qyapi.weixin.qq.com/cgi-bin/message/send?access_token=${access_token}`,
+        {
+          timeout: this.timeout,
+          retry: 0,
           json: {
-            ...json,
+            touser,
+            agentid,
+            safe: '0',
+            ...options,
           },
-        })
-        .json();
-      if (res.code === 0) {
-        return true;
-      } else {
-        throw new Error(JSON.stringify(res));
-      }
-    } catch (error: any) {
-      throw new Error(error.response ? error.response.body : error);
-    }
+        },
+      )
+      .json();
+
+    return res.errcode === 0;
   }
 
   private async iGot() {
     const { iGotPushKey } = this.params;
     const url = `https://push.hellyw.com/${iGotPushKey.toLowerCase()}`;
-    try {
-      const res: any = await got
-        .post(url, {
-          ...this.gotOption,
-          body: `title=${this.title}&content=${this.content}`,
-          headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-        })
-        .json();
+    const res: any = await got
+      .post(url, {
+        timeout: this.timeout,
+        retry: 0,
+        body: `title=${this.title}&content=${this.content}`,
+        headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+      })
+      .json();
 
-      if (res.ret === 0) {
-        return true;
-      } else {
-        throw new Error(JSON.stringify(res));
-      }
-    } catch (error: any) {
-      throw new Error(error.response ? error.response.body : error);
-    }
- }
+    return res.ret === 0;
+  }
 
   private async pushPlus() {
-    const { pushPlusToken, pushPlusUser, pushplusWebhook, pushPlusTemplate, pushplusChannel, pushplusCallbackUrl, pushplusTo} = this.params;
+    const { pushPlusToken, pushPlusUser } = this.params;
     const url = `https://www.pushplus.plus/send`;
-    try {
-      let body = {
-        ...this.gotOption,
+    const res: any = await got
+      .post(url, {
+        timeout: this.timeout,
+        retry: 0,
         json: {
           token: `${pushPlusToken}`,
           title: `${this.title}`,
           content: `${this.content.replace(/[\n\r]/g, '<br>')}`,
           topic: `${pushPlusUser || ''}`,
-          template: `${pushPlusTemplate || 'html'}`,
-          channel: `${pushplusChannel || 'wechat'}`,
-          webhook: `${pushplusWebhook || ''}`,
-          callbackUrl: `${pushplusCallbackUrl || ''}`,
-          to: `${pushplusTo || ''}`
         },
-      }
+      })
+      .json();
 
-      const res: any = await got
-        .post(url, body)
-        .json();
-
-      if (res.code === 200) {
-        return true;
-      } else {
-        throw new Error(JSON.stringify(res));
-      }
-    } catch (error: any) {
-      throw new Error(error.response ? error.response.body : error);
-    }
-  }
-
-  private async wePlusBot() {
-    const { wePlusBotToken, wePlusBotReceiver, wePlusBotVersion } = this.params;
-
-    let content = this.content;
-    let template = 'txt';
-    if (this.content.length > 800) {
-      template = 'html';
-      content = content.replace(/[\n\r]/g, '<br>');
-    }
-
-    const url = `https://www.weplusbot.com/send`;
-    try {
-      const res: any = await got
-        .post(url, {
-          ...this.gotOption,
-          json: {
-            token: `${wePlusBotToken}`,
-            title: `${this.title}`,
-            template: `${template}`,
-            content: `${content}`,
-            receiver: `${wePlusBotReceiver || ''}`,
-            version: `${wePlusBotVersion || 'pro'}`,
-          },
-        })
-        .json();
-
-      if (res.code === 200) {
-        return true;
-      } else {
-        throw new Error(JSON.stringify(res));
-      }
-    } catch (error: any) {
-      throw new Error(error.response ? error.response.body : error);
-    }
-  }
-
-  private async lark() {
-    let { larkKey } = this.params;
-
-    if (!larkKey.startsWith('http')) {
-      larkKey = `https://open.feishu.cn/open-apis/bot/v2/hook/${larkKey}`;
-    }
-
-    try {
-      const res: any = await got
-        .post(larkKey, {
-          ...this.gotOption,
-          json: {
-            msg_type: 'text',
-            content: { text: `${this.title}\n\n${this.content}` },
-          },
-          headers: { 'Content-Type': 'application/json' },
-        })
-        .json();
-      if (res.StatusCode === 0 || res.code === 0) {
-        return true;
-      } else {
-        throw new Error(JSON.stringify(res));
-      }
-    } catch (error: any) {
-      throw new Error(error.response ? error.response.body : error);
-    }
+    return res.code === 200;
   }
 
   private async email() {
     const { emailPass, emailService, emailUser } = this.params;
+    const transporter = nodemailer.createTransport({
+      service: emailService,
+      auth: {
+        user: emailUser,
+        pass: emailPass,
+      },
+    });
 
-    try {
-      const transporter = nodemailer.createTransport({
-        service: emailService,
-        auth: {
-          user: emailUser,
-          pass: emailPass,
-        },
-      });
+    const info = await transporter.sendMail({
+      from: `"青龙快讯" <${emailUser}>`,
+      to: `${emailUser}`,
+      subject: `${this.title}`,
+      html: `${this.content.replace(/\n/g, '<br/>')}`,
+    });
 
-      const info = await transporter.sendMail({
-        from: `"青龙快讯" <${emailUser}>`,
-        to: `${emailUser}`,
-        subject: `${this.title}`,
-        html: `${this.content.replace(/\n/g, '<br/>')}`,
-      });
+    transporter.close();
 
-      transporter.close();
-
-      if (info.messageId) {
-        return true;
-      } else {
-        throw new Error(JSON.stringify(info));
-      }
-    } catch (error: any) {
-      throw error;
-    }
-  }
-
-  private async pushMe() {
-    const { pushMeKey, pushMeUrl } = this.params;
-    try {
-      const res: any = await got.post(pushMeUrl || 'https://push.i-i.me/', {
-        ...this.gotOption,
-        json: {
-          push_key: pushMeKey,
-          title: this.title,
-          content: this.content,
-        },
-        headers: { 'Content-Type': 'application/json' },
-      });
-      if (res.body === 'success') {
-        return true;
-      } else {
-        throw new Error(res.body);
-      }
-    } catch (error: any) {
-      throw new Error(error.response ? error.response.body : error);
-    }
-  }
-
-  private async ntfy() {
-    const { ntfyUrl, ntfyTopic, ntfyPriority } = this.params;
-    // 编码函数
-    const encodeRfc2047 = (text: string, charset: string = 'UTF-8'): string => {
-      const encodedText = Buffer.from(text).toString('base64');
-      return `=?${charset}?B?${encodedText}?=`;
-  };
-    try {
-        const encodedTitle = encodeRfc2047(this.title);
-        const res: any = await got
-          .post(`${ntfyUrl || 'https://ntfy.sh'}/${ntfyTopic}`, {
-              ...this.gotOption,
-              body: `${this.content}`,
-              headers: { 'Title': encodedTitle, 'Priority': `${ntfyPriority || '3'}` },
-          });
-          if (res.statusCode === 200) {
-            return true;
-          } else {
-            throw new Error(JSON.stringify(res));
-          }
-    } 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: any = await got
-        .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
-          },
-        })
-        .json();
-
-      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);
-    }
-  }
-
-  
-  private async chronocat() {
-    const { chronocatURL, chronocatQQ, chronocatToken } = this.params;
-    try {
-      const user_ids = chronocatQQ
-        .match(/user_id=(\d+)/g)
-        ?.map((match: any) => match.split('=')[1]);
-      const group_ids = chronocatQQ
-        .match(/group_id=(\d+)/g)
-        ?.map((match: any) => match.split('=')[1]);
-
-      const url = `${chronocatURL}/api/message/send`;
-      const headers = {
-        'Content-Type': 'application/json',
-        Authorization: `Bearer ${chronocatToken}`,
-      };
-
-      for (const [chat_type, ids] of [
-        [1, user_ids],
-        [2, group_ids],
-      ]) {
-        if (!ids) {
-          continue;
-        }
-        let _ids: any = ids;
-        for (const chat_id of _ids) {
-          const data = {
-            peer: {
-              chatType: chat_type,
-              peerUin: chat_id,
-            },
-            elements: [
-              {
-                elementType: 1,
-                textElement: {
-                  content: `${this.title}\n\n${this.content}`,
-                },
-              },
-            ],
-          };
-          const res: any = await got.post(url, {
-            ...this.gotOption,
-            json: data,
-            headers,
-          });
-          if (res.statusCode === 200) {
-            return true;
-          } else {
-            throw new Error(res.body);
-          }
-        }
-      }
-      return false;
-    } catch (error: any) {
-      throw new Error(error.response ? error.response.body : error);
-    }
-  }
-
-  private async webhook() {
-    const {
-      webhookUrl,
-      webhookBody,
-      webhookHeaders,
-      webhookMethod,
-      webhookContentType,
-    } = this.params;
-
-    if (!webhookUrl.includes('$title') && !webhookBody.includes('$title')) {
-      throw new Error('Url 或者 Body 中必须包含 $title');
-    }
-
-    const headers = parseHeaders(webhookHeaders);
-    const body = parseBody(webhookBody, webhookContentType, (v) =>
-      v?.replaceAll('$title', this.title)?.replaceAll('$content', this.content),
-    );
-    const bodyParam = this.formatBody(webhookContentType, body);
-    const options = {
-      method: webhookMethod,
-      headers,
-      ...this.gotOption,
-      allowGetBody: true,
-      ...bodyParam,
-    };
-    try {
-      const formatUrl = webhookUrl
-        ?.replaceAll('$title', encodeURIComponent(this.title))
-        ?.replaceAll('$content', encodeURIComponent(this.content));
-      const res = await got(formatUrl, options);
-      if (String(res.statusCode).startsWith('20')) {
-        return true;
-      } else {
-        throw new Error(JSON.stringify(res));
-      }
-    } catch (error: any) {
-      throw new Error(error.response ? error.response.body : error);
-    }
-  }
-
-  private formatBody(contentType: string, body: any): object {
-    if (!body) return {};
-    switch (contentType) {
-      case 'application/json':
-        return { json: body };
-      case 'multipart/form-data':
-        return { form: body };
-      case 'application/x-www-form-urlencoded':
-      case 'text/plain':
-        return { body };
-    }
-    return {};
+    return !!info.messageId;
   }
 }

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({});
-    await shareStore.updateApps(apps);
-    return apps?.find((x) => x.id === payload.id) as App;
+    return await this.getDb({ id: payload.id });
   }
 
-  public async getDb(query: Record<string, any>): Promise<App> {
-    const doc = await AppModel.findOne({ where: query });
-    if (!doc) {
-      throw new Error(`App ${JSON.stringify(query)} not found`);
-    }
-    return doc.get({ plain: true });
+  public async getDb(query: any): Promise<App> {
+    const doc: any = await AppModel.findOne({ where: query });
+    return doc && (doc.get({ plain: true }) as App);
   }
 
   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,11 +71,11 @@ export default class OpenService {
   public async list(
     searchText: string = '',
     sort: any = {},
-    query: Record<string, any> = {},
+    query: any = {},
   ): Promise<App[]> {
     let condition = { ...query };
     if (searchText) {
-      const encodeText = encodeURI(searchText);
+      const encodeText = encodeURIComponent(searchText);
       const reg = {
         [Op.or]: [
           { [Op.like]: `%${searchText}%` },
@@ -98,15 +90,13 @@ export default class OpenService {
     }
     try {
       const result = await this.find(condition);
-      return result
-        .filter((x) => x.name !== 'system')
-        .map((x) => ({ ...x, tokens: [] }));
+      return result.map((x) => ({ ...x, tokens: [] }));
     } catch (error) {
       throw error;
     }
   }
 
-  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 }));
   }
@@ -127,7 +117,7 @@ export default class OpenService {
         (x) => x.expiration >= timestamp,
       );
       let tokens = invalidTokens;
-      if (invalidTokens.length >= 5) {
+      if (invalidTokens.length > 5) {
         tokens = [
           ...invalidTokens.slice(0, 4),
           { ...invalidTokens[4], expiration },
@@ -140,8 +130,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,32 +139,7 @@ export default class OpenService {
         },
       };
     } else {
-      return { code: 400, message: 'client_id 或 client_seret 有误' };
+      return { code: 400, message: 'client_id或client_seret有误' };
     }
   }
-
-  public async generateSystemToken(): Promise<{
-    value: string;
-    expiration: number;
-  }> {
-    let systemApp = (
-      await AppModel.findOne({
-        where: { name: 'system' },
-      })
-    )?.get({ plain: true });
-    if (!systemApp) {
-      systemApp = await this.create({
-        name: 'system',
-        scopes: ['crons', 'system'],
-      } as App);
-    }
-    const { data } = await this.authToken({
-      client_id: systemApp.client_id,
-      client_secret: systemApp.client_secret,
-    });
-    return {
-      ...data,
-      value: data.token,
-    };
-  }
 }

back/services/schedule.ts

@@ -1,39 +1,14 @@
 import { Service, Inject } from 'typedi';
 import winston from 'winston';
 import nodeSchedule from 'node-schedule';
-import { ChildProcessWithoutNullStreams } from 'child_process';
+import { Crontab } from '../data/cron';
+import { exec } from 'child_process';
 import {
   ToadScheduler,
-  LongIntervalJob,
-  SimpleIntervalSchedule,
+  SimpleIntervalJob,
   Task,
+  SimpleIntervalSchedule,
 } from 'toad-scheduler';
-import dayjs from 'dayjs';
-import taskLimit from '../shared/pLimit';
-import { spawn } from 'cross-spawn';
-
-export interface ScheduleTaskType {
-  id?: number;
-  command: string;
-  name?: string;
-  schedule?: string;
-  runOrigin: 'subscription' | 'system' | 'script';
-}
-
-export interface TaskCallbacks {
-  onBefore?: (startTime: dayjs.Dayjs) => Promise<void>;
-  onStart?: (
-    cp: ChildProcessWithoutNullStreams,
-    startTime: dayjs.Dayjs,
-  ) => Promise<void>;
-  onEnd?: (
-    cp: ChildProcessWithoutNullStreams,
-    endTime: dayjs.Dayjs,
-    diff: number,
-  ) => Promise<void>;
-  onLog?: (message: string) => Promise<void>;
-  onError?: (message: string) => Promise<void>;
-}
 
 @Service()
 export default class ScheduleService {
@@ -41,105 +16,14 @@ export default class ScheduleService {
 
   private intervalSchedule = new ToadScheduler();
 
-  private taskLimitMap = {
-    system: 'runWithSystemLimit' as const,
-    script: 'runWithScriptLimit' as const,
-    subscription: 'runWithSubscriptionLimit' as const,
-  };
+  private maxBuffer = 200 * 1024 * 1024;
 
   constructor(@Inject('logger') private logger: winston.Logger) {}
 
-  async runTask(
-    command: string,
-    callbacks: TaskCallbacks = {},
-    params: {
-      schedule?: string;
-      name?: string;
-      command?: string;
-      id: string;
-      runOrigin: 'subscription' | 'system' | 'script';
-    },
-    completionTime: 'start' | 'end' = 'end',
-  ) {
-    const { runOrigin, ...others } = params;
-
-    return taskLimit[this.taskLimitMap[runOrigin]](others, () => {
-      return new Promise(async (resolve, reject) => {
-        this.logger.info(
-          `[panel][开始执行任务] 参数: ${JSON.stringify({
-            ...others,
-            command,
-          })}`,
-        );
-
-        try {
-          const startTime = dayjs();
-          await callbacks.onBefore?.(startTime);
-
-          const cp = spawn(command, { shell: '/bin/bash' });
-
-          callbacks.onStart?.(cp, startTime);
-          completionTime === 'start' && resolve(cp.pid);
-
-          cp.stdout.on('data', async (data) => {
-            await callbacks.onLog?.(data.toString());
-          });
-
-          cp.stderr.on('data', async (data) => {
-            this.logger.info(
-              '[panel][执行任务失败] 命令: %s, 错误信息: %j',
-              command,
-              data.toString(),
-            );
-            await callbacks.onError?.(data.toString());
-          });
-
-          cp.on('error', async (err) => {
-            this.logger.error(
-              '[panel][创建任务失败] 命令: %s, 错误信息: %j',
-              command,
-              err,
-            );
-            await callbacks.onError?.(JSON.stringify(err));
-          });
-
-          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 });
-          });
-        } catch (error) {
-          this.logger.error(
-            '[panel][执行任务失败] 命令: %s, 错误信息: %j',
-            command,
-            error,
-          );
-          await callbacks.onError?.(JSON.stringify(error));
-        }
-      });
-    });
-  }
-
-  async createCronTask(
-    { id = 0, command, name, schedule = '', runOrigin }: ScheduleTaskType,
-    callbacks?: TaskCallbacks,
-    runImmediately = false,
-  ) {
+  async createCronTask({ id = 0, command, name, schedule = '' }: Crontab) {
     const _id = this.formatId(id);
     this.logger.info(
-      '[panel][创建cron任务], 任务ID: %s, cron: %s, 任务名: %s, 执行命令: %s',
+      '[创建cron任务]，任务ID: %s，cron: %s，任务名: %s，执行命令: %s',
       _id,
       schedule,
       name,
@@ -148,94 +32,105 @@ export default class ScheduleService {
 
     this.scheduleStacks.set(
       _id,
-      nodeSchedule.scheduleJob(_id, schedule, async () => {
-        this.runTask(command, callbacks, {
-          name,
-          schedule,
-          command,
-          id: _id,
-          runOrigin,
-        });
+      nodeSchedule.scheduleJob(id + '', schedule, async () => {
+        try {
+          exec(
+            command,
+            { maxBuffer: this.maxBuffer },
+            async (error, stdout, stderr) => {
+              if (error) {
+                await this.logger.info(
+                  '执行任务%s失败，时间：%s, 错误信息：%j',
+                  command,
+                  new Date().toLocaleString(),
+                  error,
+                );
+              }
+
+              if (stderr) {
+                await this.logger.info(
+                  '执行任务%s失败，时间：%s, 错误信息：%j',
+                  command,
+                  new Date().toLocaleString(),
+                  stderr,
+                );
+              }
+            },
+          );
+        } catch (error) {
+          await this.logger.info(
+            '执行任务%s失败，时间：%s, 错误信息：%j',
+            command,
+            new Date().toLocaleString(),
+            error,
+          );
+        } finally {
+        }
       }),
     );
-
-    if (runImmediately) {
-      this.runTask(command, callbacks, {
-        name,
-        schedule,
-        command,
-        id: _id,
-        runOrigin,
-      });
-    }
   }
 
-  async cancelCronTask({ id = 0, name }: ScheduleTaskType) {
+  async cancelCronTask({ id = 0, name }: Crontab) {
     const _id = this.formatId(id);
-    this.logger.info('[panel][取消定时任务], 任务名: %s', name);
-    if (this.scheduleStacks.has(_id)) {
-      this.scheduleStacks.get(_id)?.cancel();
-      this.scheduleStacks.delete(_id);
-    }
+    this.logger.info('[取消定时任务]，任务名：%s', name);
+    this.scheduleStacks.has(_id) && this.scheduleStacks.get(_id)?.cancel();
   }
 
   async createIntervalTask(
-    { id = 0, command, name = '', runOrigin }: ScheduleTaskType,
+    { id = 0, command, name = '' }: Crontab,
     schedule: SimpleIntervalSchedule,
-    runImmediately = true,
-    callbacks?: TaskCallbacks,
   ) {
     const _id = this.formatId(id);
     this.logger.info(
-      '[panel][创建interval任务], 任务ID: %s, 任务名: %s, 执行命令: %s',
+      '[创建interval任务]，任务ID: %s，任务名: %s，执行命令: %s',
       _id,
       name,
       command,
     );
-    const task = new Task(
-      name,
-      () => {
-        this.runTask(command, callbacks, {
-          name,
+    const task = new Task(name, async () => {
+      try {
+        exec(
           command,
-          id: _id,
-          runOrigin,
-        });
-      },
-      (err) => {
-        this.logger.error(
-          '[panel][执行任务失败] 命令: %s, 错误信息: %j',
-          command,
-          err,
-        );
-      },
-    );
+          { maxBuffer: this.maxBuffer },
+          async (error, stdout, stderr) => {
+            if (error) {
+              await this.logger.info(
+                '执行任务%s失败，时间：%s, 错误信息：%j',
+                command,
+                new Date().toLocaleString(),
+                error,
+              );
+            }
 
-    const job = new LongIntervalJob(
-      { runImmediately: false, ...schedule },
-      task,
-      { id: _id },
-    );
+            if (stderr) {
+              await this.logger.info(
+                '执行任务%s失败，时间：%s, 错误信息：%j',
+                command,
+                new Date().toLocaleString(),
+                stderr,
+              );
+            }
+          },
+        );
+      } catch (error) {
+        await this.logger.info(
+          '执行任务%s失败，时间：%s, 错误信息：%j',
+          command,
+          new Date().toLocaleString(),
+          error,
+        );
+      } finally {
+      }
+    });
+
+    const job = new SimpleIntervalJob({ ...schedule }, task, _id);
 
     this.intervalSchedule.addIntervalJob(job);
-
-    if (runImmediately) {
-      this.runTask(command, callbacks, {
-        name,
-        command,
-        id: _id,
-        runOrigin,
-      });
-    }
   }
 
-  async cancelIntervalTask({ id = 0, name }: ScheduleTaskType) {
+  async cancelIntervalTask({ id = 0, name }: Crontab) {
     const _id = this.formatId(id);
-    this.logger.info(
-      '[panel][取消interval任务], 任务ID: %s, 任务名: %s',
-      _id,
-      name,
-    );
+    this.logger.info('[取消interval任务]，任务ID: %s，任务名：%s', _id, name);
     this.intervalSchedule.removeById(_id);
   }
 

back/services/script.ts

@@ -1,13 +1,8 @@
 import { Service, Inject } from 'typedi';
 import winston from 'winston';
-import path, { join } from 'path';
+import { spawn } from 'child_process';
 import SockService from './sock';
 import CronService from './cron';
-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 {
@@ -15,63 +10,52 @@ export default class ScriptService {
     @Inject('logger') private logger: winston.Logger,
     private sockService: SockService,
     private cronService: CronService,
-    private scheduleService: ScheduleService,
   ) {}
 
-  private taskCallbacks(filePath: string): TaskCallbacks {
-    return {
-      onEnd: async (cp, endTime, diff) => {
-        await rmPath(filePath);
-      },
-      onError: async (message: string) => {
-        this.sockService.sendMessage({
-          type: 'manuallyRunScript',
-          message,
-        });
-      },
-      onLog: async (message: string) => {
-        this.sockService.sendMessage({
-          type: 'manuallyRunScript',
-          message,
-        });
-      },
-    };
-  }
+  public async runScript(path: string) {
+    const cp = spawn(`task -l ${path} now`, { shell: '/bin/bash' });
 
-  public async runScript(filePath: string) {
-    const relativePath = path.relative(config.scriptPath, filePath);
-    const command = `${TASK_COMMAND} ${relativePath} now`;
-    const pid = await this.scheduleService.runTask(
-      `real_time=true ${command}`,
-      this.taskCallbacks(filePath),
-      { command, id: relativePath.replace(/ /g, '-'), runOrigin: 'script' },
-      'start',
-    );
+    cp.stdout.on('data', (data) => {
+      this.sockService.sendMessage({
+        type: 'manuallyRunScript',
+        message: data.toString(),
+      });
+    });
 
-    return { code: 200, data: pid };
-  }
+    cp.stderr.on('data', (data) => {
+      this.sockService.sendMessage({
+        type: 'manuallyRunScript',
+        message: data.toString(),
+      });
+    });
 
-  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 {
-      await killTask(pid);
-    } catch (error) {}
+    cp.on('error', (err) => {
+      this.sockService.sendMessage({
+        type: 'manuallyRunScript',
+        message: JSON.stringify(err),
+      });
+    });
+
+    cp.on('close', (err) => {
+      this.sockService.sendMessage({
+        type: 'manuallyRunScript',
+        message: `执行结束`,
+      });
+    });
 
     return { code: 200 };
   }
 
-  public async getFile(filePath: string, fileName: string) {
-    const finalPath = path.resolve(config.scriptPath, filePath, fileName);
+  public async stopScript(path: string) {
+    const err = await this.cronService.killTask(`task -l ${path} now`);
+    const str = err ? `\n${err}` : '';
+    this.sockService.sendMessage({
+      type: 'manuallyRunScript',
+      message: `${str}\n## 执行结束...  ${new Date()
+        .toLocaleString('zh', { hour12: false })
+        .replace(' 24:', ' 00:')} `,
+    });
 
-    if (!finalPath.startsWith(config.scriptPath)) {
-      return '';
-    }
-
-    const content = await getFileContentByName(finalPath);
-    return content;
+    return { code: 200 };
   }
 }

back/services/sock.ts

@@ -7,7 +7,7 @@ import { SockMessage } from '../data/sock';
 export default class SockService {
   private clients: Connection[] = [];
 
-  constructor(@Inject('logger') private logger: winston.Logger) { }
+  constructor(@Inject('logger') private logger: winston.Logger) {}
 
   public getClients() {
     return this.clients;

back/services/sshKey.ts

@@ -1,130 +0,0 @@
-import { Service, Inject } from 'typedi';
-import winston from 'winston';
-import fs from 'fs/promises';
-import os from 'os';
-import path from 'path';
-import { Subscription } from '../data/subscription';
-import { formatUrl } from '../config/subscription';
-import config from '../config';
-import { fileExist, rmPath } from '../config/util';
-import { writeFileWithLock } from '../shared/utils';
-
-@Service()
-export default class SshKeyService {
-  private homedir = os.homedir();
-  private sshPath = config.sshdPath;
-  private sshConfigFilePath = path.resolve(this.homedir, '.ssh', 'config');
-  private sshConfigHeader = `Include ${path.join(this.sshPath, '*.config')}`;
-
-  constructor(@Inject('logger') private logger: winston.Logger) {
-    this.initSshConfigFile();
-  }
-
-  private async initSshConfigFile() {
-    let config = '';
-    const _exist = await fileExist(this.sshConfigFilePath);
-    if (_exist) {
-      config = await fs.readFile(this.sshConfigFilePath, { encoding: 'utf-8' });
-    } else {
-      await writeFileWithLock(this.sshConfigFilePath, '');
-    }
-    if (!config.includes(this.sshConfigHeader)) {
-      await writeFileWithLock(
-        this.sshConfigFilePath,
-        `${this.sshConfigHeader}\n\n${config}`,
-      );
-    }
-  }
-
-  private async generatePrivateKeyFile(
-    alias: string,
-    key: string,
-  ): Promise<void> {
-    try {
-      await writeFileWithLock(
-        path.join(this.sshPath, alias),
-        `${key}${os.EOL}`,
-        {
-          encoding: 'utf8',
-          mode: '400',
-        },
-      );
-    } catch (error) {
-      this.logger.error('生成私钥文件失败', error);
-    }
-  }
-
-  private async removePrivateKeyFile(alias: string): Promise<void> {
-    try {
-      const filePath = path.join(this.sshPath, alias);
-      await rmPath(filePath);
-    } catch (error) {
-      this.logger.error('删除私钥文件失败', error);
-    }
-  }
-
-  private async generateSingleSshConfig(
-    alias: string,
-    host: string,
-    proxy?: string,
-  ) {
-    if (host === 'github.com') {
-      host = `ssh.github.com\n    Port 443\n    HostkeyAlgorithms +ssh-rsa`;
-    }
-    const proxyStr = proxy
-      ? `    ProxyCommand nc -v -x ${proxy} %h %p 2>/dev/null\n`
-      : '';
-    const config = `Host ${alias}\n    Hostname ${host}\n    IdentityFile ${path.join(
-      this.sshPath,
-      alias,
-    )}\n    StrictHostKeyChecking no\n${proxyStr}`;
-    await writeFileWithLock(
-      `${path.join(this.sshPath, `${alias}.config`)}`,
-      config,
-    );
-  }
-
-  private async removeSshConfig(alias: string) {
-    try {
-      const filePath = path.join(this.sshPath, `${alias}.config`);
-      await rmPath(filePath);
-    } catch (error) {
-      this.logger.error(`删除ssh配置文件${alias}失败`, error);
-    }
-  }
-
-  public async addSSHKey(
-    key: string,
-    alias: string,
-    host: string,
-    proxy?: string,
-  ): Promise<void> {
-    await this.generatePrivateKeyFile(alias, key);
-    await this.generateSingleSshConfig(alias, host, proxy);
-  }
-
-  public async removeSSHKey(
-    alias: string,
-    host: string,
-    proxy?: string,
-  ): Promise<void> {
-    await this.removePrivateKeyFile(alias);
-    await this.removeSshConfig(alias);
-  }
-
-  public async setSshConfig(docs: Subscription[]) {
-    for (const doc of docs) {
-      if (doc.type === 'private-repo' && doc.pull_type === 'ssh-key') {
-        const { alias, proxy } = doc;
-        const { host } = formatUrl(doc);
-        await this.removePrivateKeyFile(alias);
-        await this.removeSshConfig(alias);
-        await this.generatePrivateKeyFile(
-          alias,
-          (doc.pull_option as any).private_key,
-        );
-        await this.generateSingleSshConfig(alias, host, proxy);
-      }
-    }
-  }
-}

back/services/subscription.ts

@@ -1,394 +0,0 @@
-import { Service, Inject } from 'typedi';
-import winston from 'winston';
-import config from '../config';
-import {
-  Subscription,
-  SubscriptionInstance,
-  SubscriptionModel,
-  SubscriptionStatus,
-} from '../data/subscription';
-import { ChildProcessWithoutNullStreams } from 'child_process';
-import {
-  getFileContentByName,
-  concurrentRun,
-  fileExist,
-  createFile,
-  killTask,
-  handleLogPath,
-  promiseExec,
-  rmPath,
-} from '../config/util';
-import fs from 'fs/promises';
-import { FindOptions, Op } from 'sequelize';
-import path, { join } from 'path';
-import ScheduleService, { TaskCallbacks } from './schedule';
-import { SimpleIntervalSchedule } from 'toad-scheduler';
-import SockService from './sock';
-import SshKeyService from './sshKey';
-import dayjs from 'dayjs';
-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 {
-  constructor(
-    @Inject('logger') private logger: winston.Logger,
-    private scheduleService: ScheduleService,
-    private sockService: SockService,
-    private sshKeyService: SshKeyService,
-    private crontabService: CrontabService,
-  ) {}
-
-  public async list(
-    searchText?: string,
-    ids?: string,
-  ): Promise<SubscriptionInstance[]> {
-    let query = {};
-    const subIds = JSON.parse(ids || '[]');
-    if (searchText) {
-      const reg = {
-        [Op.or]: [
-          { [Op.like]: `%${searchText}%` },
-          { [Op.like]: `%${encodeURI(searchText)}%` },
-        ],
-      };
-      query = {
-        [Op.or]: [
-          {
-            name: reg,
-          },
-          {
-            url: reg,
-          },
-        ],
-      };
-    }
-    try {
-      const result = await SubscriptionModel.findAll({
-        where: { ...query, ...(ids ? { id: subIds } : undefined) },
-        order: [
-          ['is_disabled', 'ASC'],
-          ['createdAt', 'DESC'],
-        ],
-      });
-      return result;
-    } catch (error) {
-      throw error;
-    }
-  }
-
-  public async handleTask(
-    doc: Subscription,
-    needCreate = true,
-    runImmediately = false,
-  ) {
-    const { url } = formatUrl(doc);
-
-    doc.command = formatCommand(doc, url as string);
-
-    if (doc.schedule_type === 'crontab') {
-      this.scheduleService.cancelCronTask(doc as any);
-      needCreate &&
-        (await this.scheduleService.createCronTask(
-          { ...doc, runOrigin: 'subscription' } as any,
-          this.taskCallbacks(doc),
-          runImmediately,
-        ));
-    } else if (doc.interval_schedule) {
-      this.scheduleService.cancelIntervalTask(doc as any);
-      const { type, value } = doc.interval_schedule;
-      needCreate &&
-        (await this.scheduleService.createIntervalTask(
-          { ...doc, runOrigin: 'subscription' } as any,
-          { [type]: value } as SimpleIntervalSchedule,
-          runImmediately,
-          this.taskCallbacks(doc),
-        ));
-    }
-  }
-
-  public async setSshConfig() {
-    const docs = await SubscriptionModel.findAll();
-    await this.sshKeyService.setSshConfig(docs);
-  }
-
-  private taskCallbacks(doc: Subscription): TaskCallbacks {
-    return {
-      onBefore: async (startTime) => {
-        const logTime = startTime.format('YYYY-MM-DD-HH-mm-ss');
-        const logPath = `${doc.alias}/${logTime}.log`;
-        await SubscriptionModel.update(
-          {
-            status: SubscriptionStatus.running,
-            log_path: logPath,
-          },
-          { where: { id: doc.id } },
-        );
-        const absolutePath = await handleLogPath(
-          logPath as string,
-          `## 开始执行... ${startTime.format('YYYY-MM-DD HH:mm:ss')}\n`,
-        );
-
-        // 执行sub_before
-        let beforeStr = '';
-        try {
-          if (doc.sub_before) {
-            await fs.appendFile(absolutePath, `\n## 执行before命令...\n\n`);
-            beforeStr = await promiseExec(doc.sub_before);
-          }
-        } catch (error: any) {
-          beforeStr =
-            (error.stderr && error.stderr.toString()) || JSON.stringify(error);
-        }
-        if (beforeStr) {
-          await fs.appendFile(absolutePath, `${beforeStr}\n`);
-        }
-      },
-      onStart: async (cp: ChildProcessWithoutNullStreams, startTime) => {
-        await SubscriptionModel.update(
-          {
-            pid: cp.pid,
-          },
-          { where: { id: doc.id } },
-        );
-      },
-      onEnd: async (cp, endTime, diff) => {
-        const sub = await this.getDb({ id: doc.id });
-        const absolutePath = await handleLogPath(sub.log_path as string);
-
-        // 执行 sub_after
-        let afterStr = '';
-        try {
-          if (sub.sub_after) {
-            await fs.appendFile(absolutePath, `\n\n## 执行after命令...\n\n`);
-            afterStr = await promiseExec(sub.sub_after);
-          }
-        } catch (error: any) {
-          afterStr =
-            (error.stderr && error.stderr.toString()) || JSON.stringify(error);
-        }
-        if (afterStr) {
-          await fs.appendFile(absolutePath, `${afterStr}\n`);
-        }
-
-        await fs.appendFile(
-          absolutePath,
-          `\n## 执行结束... ${endTime.format(
-            'YYYY-MM-DD HH:mm:ss',
-          )}  耗时 ${diff} 秒${LOG_END_SYMBOL}`,
-        );
-
-        await SubscriptionModel.update(
-          { status: SubscriptionStatus.idle, pid: undefined },
-          { where: { id: sub.id } },
-        );
-
-        this.sockService.sendMessage({
-          type: 'runSubscriptionEnd',
-          message: '订阅执行完成',
-          references: [doc.id as number],
-        });
-      },
-      onError: async (message: string) => {
-        const sub = await this.getDb({ id: doc.id });
-        const absolutePath = await handleLogPath(sub.log_path as string);
-        await fs.appendFile(absolutePath, `\n${message}`);
-      },
-      onLog: async (message: string) => {
-        const sub = await this.getDb({ id: doc.id });
-        const absolutePath = await handleLogPath(sub.log_path as string);
-        await fs.appendFile(absolutePath, `\n${message}`);
-      },
-    };
-  }
-
-  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.setSshConfig();
-    return doc;
-  }
-
-  public async insert(payload: Subscription): Promise<SubscriptionInstance> {
-    return await SubscriptionModel.create(payload, { returning: true });
-  }
-
-  public async update(payload: Subscription): Promise<Subscription> {
-    const doc = await this.getDb({ id: payload.id });
-    const tab = new Subscription({ ...doc, ...payload });
-    const newDoc = await this.updateDb(tab);
-    await this.handleTask(newDoc, !newDoc.is_disabled);
-    await this.setSshConfig();
-    return newDoc;
-  }
-
-  public async updateDb(payload: Subscription): Promise<Subscription> {
-    await SubscriptionModel.update(payload, { where: { id: payload.id } });
-    return await this.getDb({ id: payload.id });
-  }
-
-  public async status({
-    ids,
-    status,
-    pid,
-    log_path,
-    last_running_time = 0,
-    last_execution_time = 0,
-  }: {
-    ids: number[];
-    status: SubscriptionStatus;
-    pid: number;
-    log_path: string;
-    last_running_time: number;
-    last_execution_time: number;
-  }) {
-    const options: any = {
-      status,
-      pid,
-      log_path,
-      last_execution_time,
-    };
-    if (last_running_time > 0) {
-      options.last_running_time = last_running_time;
-    }
-
-    return await SubscriptionModel.update(
-      { ...options },
-      { where: { id: ids } },
-    );
-  }
-
-  public async remove(ids: number[], query: { force?: boolean }) {
-    const docs = await SubscriptionModel.findAll({ where: { id: ids } });
-    for (const doc of docs) {
-      await this.handleTask(doc.get({ plain: true }), false);
-    }
-    await SubscriptionModel.destroy({ where: { id: ids } });
-    await this.setSshConfig();
-
-    if (query?.force === true) {
-      const crons = await CrontabModel.findAll({ where: { sub_id: ids } });
-      if (crons?.length) {
-        await this.crontabService.remove(crons.map((x) => x.id!));
-      }
-      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);
-      }
-    }
-  }
-
-  public async getDb(
-    query: FindOptions<Subscription>['where'],
-  ): Promise<Subscription> {
-    const doc = await SubscriptionModel.findOne({ where: { ...query } });
-    if (!doc) {
-      throw new Error(`Subscription ${JSON.stringify(query)} not found`);
-    }
-    return doc.get({ plain: true });
-  }
-
-  public async run(ids: number[]) {
-    await SubscriptionModel.update(
-      { status: SubscriptionStatus.queued },
-      { where: { id: ids } },
-    );
-    ids.forEach((id) => {
-      this.runSingle(id);
-    });
-  }
-
-  public async stop(ids: number[]) {
-    const docs = await SubscriptionModel.findAll({ where: { id: ids } });
-    for (const doc of docs) {
-      if (doc.pid) {
-        try {
-          await killTask(doc.pid);
-        } catch (error) {
-          this.logger.error(error);
-        }
-      }
-    }
-
-    await SubscriptionModel.update(
-      { status: SubscriptionStatus.idle, pid: undefined },
-      { where: { id: ids } },
-    );
-  }
-
-  private async runSingle(subscriptionId: number) {
-    const subscription = await this.getDb({ id: subscriptionId });
-    if (subscription.status !== SubscriptionStatus.queued) {
-      return;
-    }
-
-    const command = formatCommand(subscription);
-
-    this.scheduleService.runTask(command, this.taskCallbacks(subscription), {
-      name: subscription.name,
-      schedule: subscription.schedule,
-      command,
-      id: String(subscription.id),
-      runOrigin: 'subscription',
-    });
-  }
-
-  public async disabled(ids: number[]) {
-    await SubscriptionModel.update({ is_disabled: 1 }, { where: { id: ids } });
-    const docs = await SubscriptionModel.findAll({ where: { id: ids } });
-    await this.setSshConfig();
-    for (const doc of docs) {
-      await this.handleTask(doc.get({ plain: true }), false);
-    }
-  }
-
-  public async enabled(ids: number[]) {
-    await SubscriptionModel.update({ is_disabled: 0 }, { where: { id: ids } });
-    const docs = await SubscriptionModel.findAll({ where: { id: ids } });
-    await this.setSshConfig();
-    for (const doc of docs) {
-      await this.handleTask(doc.get({ plain: true }));
-    }
-  }
-
-  public async log(id: number) {
-    const doc = await this.getDb({ id });
-    if (!doc || !doc.log_path) {
-      return '';
-    }
-
-    const absolutePath = await handleLogPath(doc.log_path as string);
-    return await getFileContentByName(absolutePath);
-  }
-
-  public async logs(id: number) {
-    const doc = await this.getDb({ id });
-    if (!doc) {
-      return [];
-    }
-
-    if (doc.log_path) {
-      const relativeDir = path.dirname(`${doc.log_path}`);
-      const dir = path.resolve(config.logPath, relativeDir);
-      const _exist = await fileExist(dir);
-      if (_exist) {
-        let files = await fs.readdir(dir);
-        return (
-          await Promise.all(
-            files.map(async (x) => ({
-              filename: x,
-              directory: relativeDir.replace(config.logPath, ''),
-              time: (await fs.lstat(`${dir}/${x}`)).mtime.getTime(),
-            })),
-          )
-        ).sort((a, b) => b.time - a.time);
-      }
-    }
-  }
-}

back/services/system.ts

@@ -1,41 +1,15 @@
-import { spawn } from 'cross-spawn';
-import { Response } from 'express';
-import fs from 'fs';
-import got from 'got';
-import sum from 'lodash/sum';
-import path from 'path';
-import { Inject, Service } from 'typedi';
+import { Service, Inject } from 'typedi';
 import winston from 'winston';
 import config from '../config';
-import { TASK_COMMAND } from '../config/const';
-import {
-  getPid,
-  killTask,
-  parseContentVersion,
-  parseVersion,
-  promiseExec,
-  readDirs,
-  rmPath,
-} from '../config/util';
-import {
-  DependenceModel,
-  DependenceStatus,
-  DependenceTypes,
-} from '../data/dependence';
+import * as fs from 'fs';
+import _ from 'lodash';
+import { AuthDataType, AuthInfo, AuthModel, LoginStatus } from '../data/auth';
 import { NotificationInfo } from '../data/notify';
-import {
-  AuthDataType,
-  SystemInfo,
-  SystemInstance,
-  SystemModel,
-  SystemModelInfo,
-} from '../data/system';
-import taskLimit from '../shared/pLimit';
 import NotificationService from './notify';
-import ScheduleService, { TaskCallbacks } from './schedule';
+import ScheduleService from './schedule';
+import { spawn } from 'child_process';
 import SockService from './sock';
-import os from 'os';
-import dayjs from 'dayjs';
+import got from 'got';
 
 @Service()
 export default class SystemService {
@@ -48,24 +22,20 @@ export default class SystemService {
     private sockService: SockService,
   ) {}
 
-  public async getSystemConfig() {
-    const doc = await this.getDb({ type: AuthDataType.systemConfig });
+  public async getLogRemoveFrequency() {
+    const doc = await this.getDb({ type: AuthDataType.removeLogFrequency });
+    return doc || {};
+  }
+
+  private async updateAuthDb(payload: AuthInfo): Promise<any> {
+    await AuthModel.upsert({ ...payload });
+    const doc = await this.getDb({ type: payload.type });
     return doc;
   }
 
-  private async updateAuthDb(payload: SystemInfo): Promise<SystemInfo> {
-    const { id, ...others } = payload;
-    await SystemModel.update(others, { where: { id } });
-    const doc = await this.getDb({ id });
-    return doc;
-  }
-
-  public async getDb(query: any): Promise<SystemInfo> {
-    const doc = await SystemModel.findOne({ where: query });
-    if (!doc) {
-      throw new Error(`System ${JSON.stringify(query)} not found`);
-    }
-    return doc.get({ plain: true });
+  public async getDb(query: any): Promise<any> {
+    const doc: any = await AuthModel.findOne({ where: { ...query } });
+    return doc && (doc.get({ plain: true }) as any);
   }
 
   public async updateNotificationMode(notificationInfo: NotificationInfo) {
@@ -82,225 +52,64 @@ export default class SystemService {
       });
       return { code: 200, data: { ...result, code } };
     } else {
-      return { code: 400, message: '通知发送失败，请检查参数' };
+      return { code: 400, data: '通知发送失败，请检查参数' };
     }
   }
 
-  public async updateLogRemoveFrequency(info: SystemModelInfo) {
-    const oDoc = await this.getSystemConfig();
+  public async updateLogRemoveFrequency(frequency: number) {
     const result = await this.updateAuthDb({
-      ...oDoc,
-      info: { ...oDoc.info, ...info },
+      type: AuthDataType.removeLogFrequency,
+      info: { frequency },
     });
     const cron = {
-      id: result.id as number,
+      id: result.id,
       name: '删除日志',
-      command: `ql rmlog ${info.logRemoveFrequency}`,
-      runOrigin: 'system' as const,
+      command: `ql rmlog ${frequency}`,
     };
-    if (oDoc.info?.logRemoveFrequency) {
-      await this.scheduleService.cancelIntervalTask(cron);
+    await this.scheduleService.cancelIntervalTask(cron);
+    if (frequency > 0) {
+      await this.scheduleService.createIntervalTask(cron, {
+        days: frequency,
+        runImmediately: true,
+      });
     }
-    if (info.logRemoveFrequency && info.logRemoveFrequency > 0) {
-      this.scheduleService.createIntervalTask(
-        cron,
-        {
-          days: info.logRemoveFrequency,
-        },
-        true,
-      );
-    }
-    return { code: 200, data: info };
-  }
-
-  public async updateCronConcurrency(info: SystemModelInfo) {
-    const oDoc = await this.getSystemConfig();
-    await this.updateAuthDb({
-      ...oDoc,
-      info: { ...oDoc.info, ...info },
-    });
-    if (info.cronConcurrency) {
-      await taskLimit.setCustomLimit(info.cronConcurrency);
-    }
-    return { code: 200, data: info };
-  }
-
-  public async updateDependenceProxy(info: SystemModelInfo) {
-    const oDoc = await this.getSystemConfig();
-    await this.updateAuthDb({
-      ...oDoc,
-      info: { ...oDoc.info, ...info },
-    });
-    if (info.dependenceProxy) {
-      await fs.promises.writeFile(
-        config.dependenceProxyFile,
-        `export http_proxy="${info.dependenceProxy}"\nexport https_proxy="${info.dependenceProxy}"`,
-      );
-    } else {
-      await fs.promises.rm(config.dependenceProxyFile);
-    }
-    return { code: 200, data: info };
-  }
-
-  public async updateNodeMirror(info: SystemModelInfo, res?: Response) {
-    const oDoc = await this.getSystemConfig();
-    await this.updateAuthDb({
-      ...oDoc,
-      info: { ...oDoc.info, ...info },
-    });
-    let cmd = 'pnpm config delete registry';
-    if (info.nodeMirror) {
-      cmd = `pnpm config set registry ${info.nodeMirror}`;
-    }
-    let command = `cd && ${cmd}`;
-    const docs = await DependenceModel.findAll({
-      where: {
-        type: DependenceTypes.nodejs,
-        status: DependenceStatus.installed,
-      },
-    });
-    if (docs.length > 0) {
-      command += ` && pnpm i -g`;
-    }
-    this.scheduleService.runTask(
-      command,
-      {
-        onStart: async (cp) => {
-          res?.setHeader('QL-Task-Pid', `${cp.pid}`);
-          res?.end();
-        },
-        onEnd: async () => {
-          this.sockService.sendMessage({
-            type: 'updateNodeMirror',
-            message: 'update node mirror end',
-          });
-        },
-        onError: async (message: string) => {
-          this.sockService.sendMessage({ type: 'updateNodeMirror', message });
-        },
-        onLog: async (message: string) => {
-          this.sockService.sendMessage({ type: 'updateNodeMirror', message });
-        },
-      },
-      {
-        command,
-        id: 'update-node-mirror',
-        runOrigin: 'system',
-      },
-    );
-  }
-
-  public async updatePythonMirror(info: SystemModelInfo) {
-    const oDoc = await this.getSystemConfig();
-    await this.updateAuthDb({
-      ...oDoc,
-      info: { ...oDoc.info, ...info },
-    });
-    let cmd = 'pip config unset global.index-url';
-    if (info.pythonMirror) {
-      cmd = `pip3 config set global.index-url ${info.pythonMirror}`;
-    }
-    await promiseExec(cmd);
-    return { code: 200, data: info };
-  }
-
-  public async updateLinuxMirror(
-    info: SystemModelInfo,
-    res?: Response,
-    onEnd?: () => void,
-  ) {
-    const oDoc = await this.getSystemConfig();
-    await this.updateAuthDb({
-      ...oDoc,
-      info: { ...oDoc.info, ...info },
-    });
-    let defaultDomain = 'https://dl-cdn.alpinelinux.org';
-    let targetDomain = 'https://dl-cdn.alpinelinux.org';
-    if (os.platform() !== 'linux') {
-      return;
-    }
-    const content = await fs.promises.readFile('/etc/apk/repositories', {
-      encoding: 'utf-8',
-    });
-    const domainMatch = content.match(/(http.*)\/alpine\/.*/);
-    if (domainMatch) {
-      defaultDomain = domainMatch[1];
-    }
-    if (info.linuxMirror) {
-      targetDomain = info.linuxMirror;
-    }
-    const command = `sed -i 's/${defaultDomain.replace(
-      /\//g,
-      '\\/',
-    )}/${targetDomain.replace(
-      /\//g,
-      '\\/',
-    )}/g' /etc/apk/repositories && apk update -f`;
-
-    this.scheduleService.runTask(
-      command,
-      {
-        onStart: async (cp) => {
-          res?.setHeader('QL-Task-Pid', `${cp.pid}`);
-          res?.end();
-        },
-        onEnd: async () => {
-          this.sockService.sendMessage({
-            type: 'updateLinuxMirror',
-            message: 'update linux mirror end',
-          });
-          onEnd?.();
-        },
-        onError: async (message: string) => {
-          this.sockService.sendMessage({ type: 'updateLinuxMirror', message });
-        },
-        onLog: async (message: string) => {
-          this.sockService.sendMessage({ type: 'updateLinuxMirror', message });
-        },
-      },
-      {
-        command,
-        id: 'update-linux-mirror',
-        runOrigin: 'system',
-      },
-    );
+    return { code: 200, data: { ...cron } };
   }
 
   public async checkUpdate() {
     try {
-      const currentVersionContent = await parseVersion(config.versionFile);
+      const versionRegx = /.*export const version = \'(.*)\'\;/;
+      const logRegx = /.*export const changeLog = \`((.*\n.*)+)\`;/;
 
-      let lastVersionContent;
+      const currentVersionFile = fs.readFileSync(config.versionFile, 'utf8');
+      const currentVersion = currentVersionFile.match(versionRegx)![1];
+
+      let lastVersion = '';
+      let lastLog = '';
       try {
-        const result = await got.get(
-          `${config.lastVersionFile}?t=${Date.now()}`,
-          {
-            timeout: 30000,
-          },
-        );
-        lastVersionContent = parseContentVersion(result.body);
+        const result = await got.get(config.lastVersionFile, {
+          timeout: 6000,
+          retry: 0,
+        });
+        const lastVersionFileContent = result.body;
+        lastVersion = lastVersionFileContent.match(versionRegx)![1];
+        lastLog = lastVersionFileContent.match(logRegx)
+          ? lastVersionFileContent.match(logRegx)![1]
+          : '';
       } catch (error) {}
 
-      if (!lastVersionContent) {
-        lastVersionContent = currentVersionContent;
-      }
-
       return {
         code: 200,
         data: {
-          hasNewVersion: this.checkHasNewVersion(
-            currentVersionContent.version,
-            lastVersionContent.version,
-          ),
-          lastVersion: lastVersionContent.version,
-          lastLog: lastVersionContent.changeLog,
-          lastLogLink: lastVersionContent.changeLogLink,
+          hasNewVersion: this.checkHasNewVersion(currentVersion, lastVersion),
+          lastVersion,
+          lastLog,
         },
       };
     } catch (error: any) {
       return {
         code: 400,
-        message: error.message,
+        data: error.message,
       };
     }
   }
@@ -325,8 +134,12 @@ export default class SystemService {
   }
 
   public async updateSystem() {
-    const cp = spawn('real_time=true ql update false', { shell: '/bin/bash' });
+    const cp = spawn('ql -l update', { shell: '/bin/bash' });
 
+    this.sockService.sendMessage({
+      type: 'updateSystemVersion',
+      message: `开始更新系统`,
+    });
     cp.stdout.on('data', (data) => {
       this.sockService.sendMessage({
         type: 'updateSystemVersion',
@@ -351,124 +164,12 @@ export default class SystemService {
     return { code: 200 };
   }
 
-  public async reloadSystem(target?: 'system' | 'data') {
-    const cmd = `real_time=true ql reload ${target || ''}`;
-    const cp = spawn(cmd, { shell: '/bin/bash' });
-    cp.unref();
-    return { code: 200 };
-  }
-
   public async notify({ title, content }: { title: string; content: string }) {
     const isSuccess = await this.notificationService.notify(title, content);
     if (isSuccess) {
-      return { code: 200, message: '通知发送成功' };
+      return { code: 200, data: '通知发送成功' };
     } else {
-      return { code: 400, message: '通知发送失败，请检查系统设置/通知配置' };
-    }
-  }
-
-  public async run({ command }: { command: string }, callback: TaskCallbacks) {
-    if (!command.startsWith(TASK_COMMAND)) {
-      command = `${TASK_COMMAND} ${command}`;
-    }
-    this.scheduleService.runTask(`real_time=true ${command}`, callback, {
-      command,
-      id: command.replace(/ /g, '-'),
-      runOrigin: 'system',
-    });
-  }
-
-  public async stop({ command, pid }: { command: string; pid: number }) {
-    if (!pid && !command) {
-      return { code: 400, message: '参数错误' };
-    }
-
-    if (pid) {
-      await killTask(pid);
-      return { code: 200 };
-    }
-
-    if (!command.startsWith(TASK_COMMAND)) {
-      command = `${TASK_COMMAND} ${command}`;
-    }
-    const _pid = await getPid(command);
-    if (_pid) {
-      await killTask(_pid);
-      return { code: 200 };
-    } else {
-      return { code: 400, message: '任务未找到' };
-    }
-  }
-
-  public async exportData(res: Response) {
-    try {
-      await promiseExec(
-        `cd ${config.dataPath} && cd ../ && tar -zcvf ${config.dataTgzFile} data/`,
-      );
-      res.download(config.dataTgzFile);
-    } catch (error: any) {
-      return res.send({ code: 400, message: error.message });
-    }
-  }
-
-  public async importData() {
-    try {
-      await promiseExec(`rm -rf ${path.join(config.tmpPath, 'data')}`);
-      const res = await promiseExec(
-        `cd ${config.tmpPath} && tar -zxvf ${config.dataTgzFile}`,
-      );
-      return { code: 200, data: res };
-    } catch (error: any) {
-      return { code: 400, message: error.message };
-    }
-  }
-
-  public async getSystemLog(
-    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
-      .reverse()
-      .filter((x) => x.title.endsWith('.log'))
-      .filter((x) => x.mtime >= startTime && x.mtime <= endTime);
-
-    res.set({
-      'Content-Length': sum(logs.map((x) => x.size)),
-    });
-    (function sendFiles(res, fileNames) {
-      if (fileNames.length === 0) {
-        res.end();
-        return;
-      }
-
-      const currentLog = fileNames.shift();
-      if (currentLog) {
-        const currentFileStream = fs.createReadStream(
-          path.join(config.systemLogPath, currentLog.title),
-        );
-        currentFileStream.on('end', () => {
-          sendFiles(res, fileNames);
-        });
-        currentFileStream.pipe(res, { end: false });
-      }
-    })(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));
+      return { code: 400, data: '通知发送失败，请检查参数' };
     }
   }
 }

back/services/user.ts

@@ -1,35 +1,19 @@
 import { Service, Inject } from 'typedi';
 import winston from 'winston';
-import {
-  createFile,
-  createRandomString,
-  fileExist,
-  getNetIp,
-  getPlatform,
-  safeJSONParse,
-} from '../config/util';
+import { createRandomString, getNetIp, getPlatform } from '../config/util';
 import config from '../config';
-import * as fs from 'fs/promises';
+import * as fs from 'fs';
+import _ from 'lodash';
 import jwt from 'jsonwebtoken';
 import { authenticator } from '@otplib/preset-default';
-import {
-  AuthDataType,
-  SystemInfo,
-  SystemModel,
-  SystemModelInfo,
-  LoginStatus,
-  AuthInfo,
-} from '../data/system';
+import { AuthDataType, AuthInfo, AuthModel, LoginStatus } from '../data/auth';
 import { NotificationInfo } from '../data/notify';
 import NotificationService from './notify';
 import { Request } from 'express';
 import ScheduleService from './schedule';
+import { spawn } from 'child_process';
 import SockService from './sock';
-import dayjs from 'dayjs';
-import IP2Region from 'ip2region';
-import requestIp from 'request-ip';
-import uniq from 'lodash/uniq';
-import { shareStore } from '../shared/store';
+import got from 'got';
 
 @Service()
 export default class UserService {
@@ -50,155 +34,151 @@ export default class UserService {
     req: Request,
     needTwoFactor = true,
   ): Promise<any> {
+    if (!fs.existsSync(config.authConfigFile)) {
+      return this.initAuthInfo();
+    }
+
     let { username, password } = payloads;
-    const content = await this.getAuthInfo();
+    const content = this.getAuthInfo();
     const timestamp = Date.now();
-    let {
-      username: cUsername,
-      password: cPassword,
-      retries = 0,
-      lastlogon,
-      lastip,
-      lastaddr,
-      twoFactorActivated,
-      tokens = {},
-      platform,
-    } = content;
-    const retriesTime = Math.pow(3, retries) * 1000;
-    if (retries > 2 && timestamp - lastlogon < retriesTime) {
-      const waitTime = Math.ceil(
-        (retriesTime - (timestamp - lastlogon)) / 1000,
-      );
-      return {
-        code: 410,
-        message: `失败次数过多，请${waitTime}秒后重试`,
-        data: waitTime,
-      };
-    }
+    if (content) {
+      let {
+        username: cUsername,
+        password: cPassword,
+        retries = 0,
+        lastlogon,
+        lastip,
+        lastaddr,
+        twoFactorActivated,
+        twoFactorActived,
+        tokens = {},
+        platform,
+      } = content;
+      // patch old field
+      twoFactorActivated = twoFactorActivated || twoFactorActived;
 
-    if (
-      username === cUsername &&
-      password === cPassword &&
-      twoFactorActivated &&
-      needTwoFactor
-    ) {
-      await this.updateAuthInfo(content, {
-        isTwoFactorChecking: true,
-      });
-      return {
-        code: 420,
-        message: '',
-      };
-    }
+      if (
+        (cUsername === 'admin' && cPassword === 'admin') ||
+        !cUsername ||
+        !cPassword
+      ) {
+        return this.initAuthInfo();
+      }
 
-    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',
-      });
-
-      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));
+      if (retries > 2 && Date.now() - lastlogon < Math.pow(3, retries) * 1000) {
         return {
           code: 410,
-          message: `失败次数过多，请${waitTime}秒后重试`,
-          data: waitTime,
+          message: `失败次数过多，请${Math.round(
+            (Math.pow(3, retries) * 1000 - Date.now() + lastlogon) / 1000,
+          )}秒后重试`,
+          data: Math.round(
+            (Math.pow(3, retries) * 1000 - Date.now() + lastlogon) / 1000,
+          ),
+        };
+      }
+
+      const { ip, address } = await getNetIp(req);
+      if (username === cUsername && password === cPassword) {
+        if (twoFactorActivated && needTwoFactor) {
+          this.updateAuthInfo(content, {
+            isTwoFactorChecking: true,
+          });
+          return {
+            code: 420,
+            message: '请输入两步验证token',
+          };
+        }
+
+        const data = createRandomString(50, 100);
+        const expiration = twoFactorActivated ? 30 : 3;
+        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,
+        });
+        await this.notificationService.notify(
+          '登录通知',
+          `你于${new Date(timestamp).toLocaleString()}在 ${address} ${
+            req.platform
+          }端 登录成功，ip地址 ${ip}`,
+        );
+        await this.getLoginLog();
+        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,
+        });
+        await this.notificationService.notify(
+          '登录通知',
+          `你于${new Date(timestamp).toLocaleString()}在 ${address} ${
+            req.platform
+          }端 登录失败，ip地址 ${ip}`,
+        );
+        await this.getLoginLog();
+        await this.insertDb({
+          type: AuthDataType.loginLog,
+          info: {
+            timestamp,
+            address,
+            ip,
+            platform: req.platform,
+            status: LoginStatus.fail,
+          },
+        });
         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, {
+    const authInfo = this.getAuthInfo();
+    this.updateAuthInfo(authInfo, {
       token: '',
       tokens: { ...authInfo.tokens, [platform]: '' },
     });
   }
 
-  public async getLoginLog(): Promise<Array<SystemModelInfo | undefined>> {
-    const docs = await SystemModel.findAll({
+  public async getLoginLog(): Promise<AuthInfo[]> {
+    const docs = await AuthModel.findAll({
       where: { type: AuthDataType.loginLog },
     });
     if (docs && docs.length > 0) {
-      const result = docs.sort(
-        (a, b) => b.info!.timestamp! - a.info!.timestamp!,
-      );
+      const result = docs.sort((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 },
+        await AuthModel.destroy({
+          where: { id: result[result.length - 1].id },
         });
       }
       return result.map((x) => x.info);
@@ -206,11 +186,26 @@ export default class UserService {
     return [];
   }
 
-  private async insertDb(payload: SystemInfo): Promise<SystemInfo> {
-    const doc = await SystemModel.create({ ...payload }, { returning: true });
+  private async insertDb(payload: AuthInfo): Promise<AuthInfo> {
+    const doc = await AuthModel.create({ ...payload }, { returning: true });
     return doc;
   }
 
+  private initAuthInfo() {
+    const newPassword = createRandomString(16, 22);
+    fs.writeFileSync(
+      config.authConfigFile,
+      JSON.stringify({
+        username: 'admin',
+        password: newPassword,
+      }),
+    );
+    return {
+      code: 100,
+      message: '已初始化密码，请前往auth.json查看并重新登录',
+    };
+  }
+
   public async updateUsernameAndPassword({
     username,
     password,
@@ -221,33 +216,36 @@ export default class UserService {
     if (password === 'admin') {
       return { code: 400, message: '密码不能设置为admin' };
     }
-    const authInfo = await this.getAuthInfo();
-    await this.updateAuthInfo(authInfo, { username, password });
+    const authInfo = this.getAuthInfo();
+    this.updateAuthInfo(authInfo, { username, password });
     return { code: 200, message: '更新成功' };
   }
 
-  public async updateAvatar(avatar: string) {
-    const authInfo = await this.getAuthInfo();
-    await this.updateAuthInfo(authInfo, { avatar });
-    return { code: 200, data: avatar, message: '更新成功' };
+  public getUserInfo(): Promise<any> {
+    return new Promise((resolve) => {
+      fs.readFile(config.authConfigFile, 'utf8', (err, data) => {
+        if (err) console.log(err);
+        resolve(JSON.parse(data));
+      });
+    });
   }
 
-  public async initTwoFactor() {
+  public initTwoFactor() {
     const secret = authenticator.generateSecret();
-    const authInfo = await this.getAuthInfo();
+    const authInfo = 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 };
   }
 
-  public async activeTwoFactor(code: string) {
-    const authInfo = await this.getAuthInfo();
+  public activeTwoFactor(code: string) {
+    const authInfo = this.getAuthInfo();
     const isValid = authenticator.verify({
       token: code,
       secret: authInfo.twoFactorSecret,
     });
     if (isValid) {
-      await this.updateAuthInfo(authInfo, { twoFactorActivated: true });
+      this.updateAuthInfo(authInfo, { twoFactorActivated: true });
     }
     return isValid;
   }
@@ -260,7 +258,7 @@ export default class UserService {
     }: { username: string; password: string; code: string },
     req: any,
   ) {
-    const authInfo = await this.getAuthInfo();
+    const authInfo = this.getAuthInfo();
     const { isTwoFactorChecking, twoFactorSecret } = authInfo;
     if (!isTwoFactorChecking) {
       return { code: 450, message: '未知错误' };
@@ -273,7 +271,7 @@ export default class UserService {
       return this.login({ username, password }, req, false);
     } else {
       const { ip, address } = await getNetIp(req);
-      await this.updateAuthInfo(authInfo, {
+      this.updateAuthInfo(authInfo, {
         lastip: ip,
         lastaddr: address,
         platform: req.platform,
@@ -282,58 +280,50 @@ export default class UserService {
     }
   }
 
-  public async deactiveTwoFactor() {
-    const authInfo = await this.getAuthInfo();
-    await this.updateAuthInfo(authInfo, {
+  public deactiveTwoFactor() {
+    const authInfo = this.getAuthInfo();
+    this.updateAuthInfo(authInfo, {
       twoFactorActivated: false,
+      twoFactorActived: false,
       twoFactorSecret: '',
     });
     return true;
   }
 
-  public async getAuthInfo() {
-    const authInfo = await shareStore.getAuthInfo();
-    if (authInfo) {
-      return authInfo;
-    }
-    const doc = await this.getDb({ type: AuthDataType.authConfig });
-    return (doc.info || {}) as AuthInfo;
+  private getAuthInfo() {
+    const content = fs.readFileSync(config.authConfigFile, 'utf8');
+    return JSON.parse(content || '{}');
   }
 
-  private async updateAuthInfo(authInfo: AuthInfo, info: Partial<AuthInfo>) {
-    const result = { ...authInfo, ...info };
-    await shareStore.updateAuthInfo(result);
-    await this.updateAuthDb({
-      type: AuthDataType.authConfig,
-      info: result,
-    });
+  private updateAuthInfo(authInfo: any, info: any) {
+    fs.writeFileSync(
+      config.authConfigFile,
+      JSON.stringify({ ...authInfo, ...info }),
+    );
   }
 
   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> {
-    let doc = await SystemModel.findOne({ where: { type: payload.type } });
+  private async updateAuthDb(payload: AuthInfo): Promise<any> {
+    let doc = await AuthModel.findOne({ type: payload.type });
     if (doc) {
-      const updateResult = await SystemModel.update(payload, {
+      const updateResult = await AuthModel.update(payload, {
         where: { id: doc.id },
         returning: true,
       });
       doc = updateResult[1][0];
     } else {
-      doc = await SystemModel.create(payload, { returning: true });
+      doc = await AuthModel.create(payload, { returning: true });
     }
     return doc;
   }
 
-  public async getDb(query: any): Promise<SystemInfo> {
-    const doc = await SystemModel.findOne({ where: { ...query } });
-    if (!doc) {
-      throw new Error(`${JSON.stringify(query)} not found`);
-    }
-    return doc.get({ plain: true });
+  public async getDb(query: any): Promise<any> {
+    const doc: any = await AuthModel.findOne({ where: { ...query } });
+    return doc && (doc.get({ plain: true }) as any);
   }
 
   public async updateNotificationMode(notificationInfo: NotificationInfo) {
@@ -350,16 +340,7 @@ export default class UserService {
       });
       return { code: 200, data: { ...result, code } };
     } else {
-      return { code: 400, message: '通知发送失败，请检查参数' };
+      return { code: 400, data: '通知发送失败，请检查参数' };
     }
   }
-
-  public async resetAuthInfo(info: Partial<AuthInfo>) {
-    const { retries, twoFactorActivated } = info;
-    const authInfo = await this.getAuthInfo();
-    await this.updateAuthInfo(authInfo, {
-      retries,
-      twoFactorActivated,
-    });
-  }
 }

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

@@ -1,193 +0,0 @@
-import PQueue, { QueueAddOptions } from 'p-queue-cjs';
-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';
-
-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),
-  });
-
-  get cronLimitActiveCount() {
-    return this.cronLimit.pending;
-  }
-
-  get cronLimitPendingCount() {
-    return this.cronLimit.size;
-  }
-
-  get firstDependencyId() {
-    return [...this.queuedDependencyIds.values()][0];
-  }
-
-  private notificationService: NotificationService = new NotificationService();
-
-  constructor() {
-    this.setCustomLimit();
-    this.handleEvents();
-  }
-
-  private handleEvents() {
-    this.cronLimit.on('add', () => {
-      Logger.info(
-        `[schedule][任务加入队列] 运行中任务数: ${this.cronLimitActiveCount}, 等待中任务数: ${this.cronLimitPendingCount}`,
-      );
-    });
-    this.cronLimit.on('active', () => {
-      Logger.info(
-        `[schedule][开始处理任务] 运行中任务数: ${
-          this.cronLimitActiveCount + 1
-        }, 等待中任务数: ${this.cronLimitPendingCount}`,
-      );
-    });
-    this.cronLimit.on('completed', (param) => {
-      Logger.info(`[schedule][任务处理成功] 参数 ${JSON.stringify(param)}`);
-    });
-    this.cronLimit.on('error', (error) => {
-      Logger.error(`[schedule][任务处理错误] 参数 ${JSON.stringify(error)}`);
-    });
-    this.cronLimit.on('next', () => {
-      Logger.info(
-        `[schedule][任务处理结束] 运行中任务数: ${this.cronLimitActiveCount}, 等待中任务数: ${this.cronLimitPendingCount}`,
-      );
-    });
-    this.cronLimit.on('idle', () => {
-      Logger.info(`[schedule][任务队列] 空闲中...`);
-    });
-  }
-
-  public removeQueuedDependency(dependency: Dependence) {
-    if (this.queuedDependencyIds.has(dependency.id!)) {
-      this.queuedDependencyIds.delete(dependency.id!);
-    }
-  }
-
-  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();
-    const doc = await SystemModel.findOne({
-      where: { type: AuthDataType.systemConfig },
-    });
-    if (doc?.info?.cronConcurrency) {
-      this.cronLimit.concurrency = doc.info.cronConcurrency;
-      this.manualCronoLimit.concurrency = doc.info.cronConcurrency;
-    }
-  }
-
-  public async runWithCronLimit<T>(
-    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.notificationService.externalNotify(
-          '任务重复运行',
-          `任务：${cron.name}，命令：${cron.command}，定时：${cron.schedule}，处于运行中的超过 5 个，请检查定时设置`,
-        );
-      }
-      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);
-  }
-
-  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 runDependeny<T>(
-    dependency: Dependence,
-    fn: IDependencyFn<T>,
-    options?: Partial<QueueAddOptions>,
-  ): Promise<T | void> {
-    this.queuedDependencyIds.add(dependency.id!);
-    fn.dependency = dependency;
-    return this.dependenyLimit.add(fn, options);
-  }
-
-  public updateDepLog<T>(
-    fn: () => Promise<T>,
-    options?: Partial<QueueAddOptions>,
-  ): Promise<T | void> {
-    return this.updateLogLimit.add(fn, options);
-  }
-}
-
-export default new TaskLimit();

back/shared/runCron.ts

@@ -1,46 +0,0 @@
-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> {
-  return taskLimit.runWithCronLimit(cron, () => {
-    return new Promise(async (resolve: any) => {
-      Logger.info(
-        `[schedule][开始执行任务] 参数 ${JSON.stringify({
-          ...cron,
-          command: cmd,
-        })}`,
-      );
-      const cp = spawn(cmd, { shell: '/bin/bash' });
-
-      cp.stderr.on('data', (data) => {
-        Logger.info(
-          '[schedule][执行任务失败] 命令: %s, 错误信息: %j',
-          cmd,
-          data.toString(),
-        );
-      });
-      cp.on('error', (err) => {
-        Logger.error(
-          '[schedule][创建任务失败] 命令: %s, 错误信息: %j',
-          cmd,
-          err,
-        );
-      });
-
-      cp.on('exit', async (code) => {
-        taskLimit.removeQueuedCron(cron.id);
-        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,27 +0,0 @@
-import { lock } from 'proper-lockfile';
-import { writeFile, open } from 'fs/promises';
-import { fileExist } from '../config/util';
-
-export async function writeFileWithLock(
-  path: string,
-  content: string | Buffer,
-  options: Parameters<typeof writeFile>[2] = {},
-) {
-  if (typeof options === 'string') {
-    options = { encoding: options };
-  }
-  if (!(await fileExist(path))) {
-    const fileHandle = await open(path, 'w');
-    fileHandle.close();
-  }
-  const release = await lock(path, {
-    retries: {
-      retries: 10,
-      factor: 2,
-      minTimeout: 100,
-      maxTimeout: 3000,
-    },
-  });
-  await writeFile(path, content, { encoding: 'utf8', ...options });
-  await release();
-}

back/token.ts

@@ -1,32 +0,0 @@
-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');
-
-async function getToken() {
-  try {
-    Container.set('logger', LoggerInstance);
-    const openService = Container.get(OpenService);
-    const appToken = await openService.generateSystemToken();
-    console.log(appToken.value);
-    await writeFile({
-      value: appToken.value,
-      expiration: appToken.expiration,
-    });
-  } catch (error) {
-    console.log(error);
-  }
-}
-
-async function writeFile(data: any) {
-  await writeFileWithLock(tokenFile, `${JSON.stringify(data)}${os.EOL}`);
-}
-
-getToken();

back/update.ts

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

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

docker/Dockerfile

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

docker/docker-compose.yml

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

docker/docker-entrypoint.sh

@@ -2,42 +2,54 @@
 
 dir_shell=/ql/shell
 . $dir_shell/share.sh
-. $dir_shell/env.sh
+link_shell
 
 echo -e "======================1. 检测配置文件========================\n"
-import_config "$@"
 make_dir /etc/nginx/conf.d
 make_dir /run/nginx
-init_nginx
-fix_config
-
+cp -fv $nginx_conf /etc/nginx/nginx.conf
+cp -fv $nginx_app_conf /etc/nginx/conf.d/front.conf
 pm2 l &>/dev/null
+echo
 
 echo -e "======================2. 安装依赖========================\n"
-patch_version
+update_depend
+echo
 
 echo -e "======================3. 启动nginx========================\n"
 nginx -s reload 2>/dev/null || nginx -c /etc/nginx/nginx.conf
 echo -e "nginx启动成功...\n"
 
-echo -e "======================4. 启动pm2服务========================\n"
-reload_update
-reload_pm2
+echo -e "======================4. 启动面板监控========================\n"
+pm2 delete public &>/dev/null
+pm2 start $dir_static/build/public.js -n public --source-map-support --time
+echo -e "监控服务启动成功...\n"
+
+echo -e "======================5. 启动控制面板========================\n"
+pm2 delete panel &>/dev/null
+pm2 start $dir_static/build/app.js -n panel --source-map-support --time
+echo -e "控制面板启动成功...\n"
+
+echo -e "======================6. 启动定时任务========================\n"
+pm2 delete schedule &>/dev/null
+pm2 start $dir_static/build/schedule.js -n schedule --source-map-support --time
+echo -e "定时任务启动成功...\n"
 
 if [[ $AutoStartBot == true ]]; then
-  echo -e "======================5. 启动bot========================\n"
-  nohup ql bot >$dir_log/bot.log 2>&1 &
+  echo -e "======================7. 启动bot========================\n"
+  nohup ql bot >>$dir_log/start.log 2>&1 &
   echo -e "bot后台启动中...\n"
 fi
 
 if [[ $EnableExtraShell == true ]]; then
-  echo -e "====================6. 执行自定义脚本========================\n"
-  nohup ql extra >$dir_log/extra.log 2>&1 &
+  echo -e "======================8. 执行自定义脚本========================\n"
+  nohup ql extra >>$dir_log/start.log 2>&1 &
   echo -e "自定义脚本后台执行中...\n"
 fi
 
 echo -e "############################################################\n"
 echo -e "容器启动成功..."
+echo -e "\n请先访问5700端口，登录成功面板之后再执行添加定时任务..."
 echo -e "############################################################\n"
 
 crond -f >/dev/null

docker/front.conf

@@ -1,90 +1,57 @@
-upstream baseApi {
+upstream api {
   server 0.0.0.0:5600;
 }
 
-upstream publicApi {
+upstream public {
   server 0.0.0.0:5400;
 }
 
-upstream updateApi {
-  server 0.0.0.0:5300;
-}
-
-map $http_upgrade $connection_upgrade {
+map $http_upgrade $connection_upgrade { 
   default keep-alive;
   'websocket' upgrade;
 }
 
 server {
-  IPV4_CONFIG
-  IPV6_CONFIG
+  listen 5700;
+  root /ql/static/dist;
   ssl_session_timeout 5m;
 
-  location QL_BASE_URLapi/update/ {
+  location /api/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://updateApi/api/;
-    proxy_buffering off;
-    proxy_redirect default;
-    proxy_connect_timeout 1800;
-    proxy_send_timeout 1800;
-    proxy_read_timeout 1800;
+    proxy_pass http://public;
   }
 
-  location QL_BASE_URLapi/public/ {
+  location /api {
     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_pass http://api;
 
     proxy_set_header Upgrade $http_upgrade;
     proxy_set_header Connection $connection_upgrade;
   }
 
-  location QL_BASE_URLopen/ {
+  location /open {
     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;
+    proxy_pass http://api;
   }
 
   gzip on;
-  gzip_static 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_proxied  any;
   gzip_vary on;
   gzip_comp_level 6;
   gzip_buffers 16 8k;
-  gzip_http_version 1.0;
-  QL_ROOT_CONFIG
+  gzip_http_version 1.0;  
 
-  location QL_BASE_URL_LOCATION {
-    QL_ALIAS_CONFIG
-    index index.html index.htm;
-    try_files $uri QL_BASE_URLindex.html;
+  location / {
+    index  index.html index.htm;
+    try_files $uri $uri/ /index.html;
   }
 
   location ~ .*\.(html)$ {

docker/nginx.conf

@@ -5,41 +5,41 @@ error_log /var/log/nginx/error.log warn;
 include /etc/nginx/modules/*.conf;
 
 events {
-  worker_connections 1024;
+	worker_connections 1024;
 }
 
 http {
-  include /etc/nginx/mime.types;
-  default_type application/octet-stream;
+	include /etc/nginx/mime.types;
+	default_type application/octet-stream;
 
-  server_tokens off;
+	server_tokens off;
 
-  client_max_body_size 4096m;
-  client_body_buffer_size 20m;
+	client_max_body_size 20m;
+	client_body_buffer_size 20m;
 
-  keepalive_timeout 65;
+	keepalive_timeout 65;
 
-  sendfile on;
+	sendfile on;
 
-  tcp_nodelay on;
+	tcp_nodelay on;
 
-  ssl_prefer_server_ciphers on;
+	ssl_prefer_server_ciphers on;
 
-  ssl_session_cache shared:SSL:2m;
+	ssl_session_cache shared:SSL:2m;
 
-  gzip on;
-  gzip_static on;
+	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_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"';
+	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;
+	access_log /var/log/nginx/access.log main;
+	include /etc/nginx/conf.d/*.conf;
 }

ecosystem.config.js

@@ -1,42 +0,0 @@
-module.exports = {
-  apps: [
-    {
-      name: 'schedule',
-      max_restarts: 10,
-      kill_timeout: 15000,
-      wait_ready: true,
-      listen_timeout: 10000,
-      source_map_support: true,
-      time: true,
-      script: 'static/build/schedule/index.js',
-      env: {
-        http_proxy: '',
-        https_proxy: '',
-        HTTP_PROXY: '',
-        HTTPS_PROXY: '',
-        all_proxy: '',
-        ALL_PROXY: '',
-      },
-    },
-    {
-      name: 'public',
-      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',
-    },
-  ],
-};